diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index 504db70b62..33415ba19d 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -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 diff --git a/asm/Z2AudioLib/Z2SceneMgr.s b/asm/Z2AudioLib/Z2SceneMgr.s index c608a4861d..8bd6433ffd 100644 --- a/asm/Z2AudioLib/Z2SceneMgr.s +++ b/asm/Z2AudioLib/Z2SceneMgr.s @@ -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 diff --git a/asm/Z2AudioLib/Z2StatusMgr.s b/asm/Z2AudioLib/Z2StatusMgr.s index 0a9c24b0b9..d0aaf55978 100644 --- a/asm/Z2AudioLib/Z2StatusMgr.s +++ b/asm/Z2AudioLib/Z2StatusMgr.s @@ -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 diff --git a/asm/bss.s b/asm/bss.s index c38c5b0a50..17de91e82e 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -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: diff --git a/asm/c/c_damagereaction.s b/asm/c/c_damagereaction.s index b282c5d017..e6d6f8403f 100644 --- a/asm/c/c_damagereaction.s +++ b/asm/c/c_damagereaction.s @@ -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 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index 4f3924bc99..334354a68e 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -56,8 +56,8 @@ daAlink_matAnm_c_NS_init: /* 8009D920 0009A860 7C 7E 1B 78 */ mr r30, r3 /* 8009D924 0009A864 7C 9F 23 78 */ mr r31, r4 /* 8009D928 0009A868 48 28 EA 9D */ bl J3DMaterialAnm_NS_calc -/* 8009D92C 0009A86C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009D930 0009A870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009D92C 0009A86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009D930 0009A870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009D934 0009A874 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8009D938 0009A878 80 03 05 78 */ lwz r0, 0x578(r3) /* 8009D93C 0009A87C 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 @@ -146,8 +146,8 @@ daAlink_c_NS_checkStageName: /* 8009DA64 0009A9A4 7C 08 02 A6 */ mflr r0 /* 8009DA68 0009A9A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8009DA6C 0009A9AC 7C 64 1B 78 */ mr r4, r3 -/* 8009DA70 0009A9B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009DA74 0009A9B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009DA70 0009A9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009DA74 0009A9B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009DA78 0009A9B8 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8009DA7C 0009A9BC 48 2C AF 19 */ bl strcmp /* 8009DA80 0009A9C0 7C 60 00 34 */ cntlzw r0, r3 @@ -3487,8 +3487,8 @@ lbl_800A09A4: /* 800A09A4 0009D8E4 83 5F 28 10 */ lwz r26, 0x2810(r31) /* 800A09A8 0009D8E8 48 00 02 64 */ b lbl_800A0C0C lbl_800A09AC: -/* 800A09AC 0009D8EC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800A09B0 0009D8F0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800A09AC 0009D8EC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800A09B0 0009D8F0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800A09B4 0009D8F4 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800A09B8 0009D8F8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800A09BC 0009D8FC 41 82 00 D8 */ beq lbl_800A0A94 @@ -3521,8 +3521,8 @@ lbl_800A0A10: lbl_800A0A24: /* 800A0A24 0009D964 2C 19 02 C3 */ cmpwi r25, 0x2c3 /* 800A0A28 0009D968 40 82 00 34 */ bne lbl_800A0A5C -/* 800A0A2C 0009D96C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A0A30 0009D970 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A0A2C 0009D96C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A0A30 0009D970 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A0A34 0009D974 88 9A 05 69 */ lbz r4, 0x569(r26) /* 800A0A38 0009D978 88 1A 04 BA */ lbz r0, 0x4ba(r26) /* 800A0A3C 0009D97C 7C 05 07 74 */ extsb r5, r0 @@ -3697,8 +3697,8 @@ lbl_800A0C84: /* 800A0C88 0009DBC8 48 07 4F 99 */ bl daAlink_c_NS_checkEventRun /* 800A0C8C 0009DBCC 2C 03 00 00 */ cmpwi r3, 0 /* 800A0C90 0009DBD0 40 82 06 20 */ bne lbl_800A12B0 -/* 800A0C94 0009DBD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A0C98 0009DBD8 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 800A0C94 0009DBD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A0C98 0009DBD8 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 800A0C9C 0009DBDC 80 1A 5F 1C */ lwz r0, 0x5f1c(r26) /* 800A0CA0 0009DBE0 74 00 02 01 */ andis. r0, r0, 0x201 /* 800A0CA4 0009DBE4 41 82 00 20 */ beq lbl_800A0CC4 @@ -4134,8 +4134,8 @@ lbl_800A12B0: /* 800A12CC 0009E20C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800A12D0 0009E210 28 00 00 01 */ cmplwi r0, 1 /* 800A12D4 0009E214 41 82 00 24 */ beq lbl_800A12F8 -/* 800A12D8 0009E218 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A12DC 0009E21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A12D8 0009E218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A12DC 0009E21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A12E0 0009E220 38 63 00 28 */ addi r3, r3, 0x28 /* 800A12E4 0009E224 38 80 00 03 */ li r4, 3 /* 800A12E8 0009E228 4B F9 19 05 */ bl isTransformLV__21dSv_player_status_b_cCFi @@ -4514,8 +4514,8 @@ lbl_800A180C: /* 800A180C 0009E74C 7C A3 2B 78 */ mr r3, r5 lbl_800A1810: /* 800A1810 0009E750 7C 63 07 34 */ extsh r3, r3 -/* 800A1814 0009E754 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800A1818 0009E758 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800A1814 0009E754 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800A1818 0009E758 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800A181C 0009E75C 80 84 5F 1C */ lwz r4, 0x5f1c(r4) /* 800A1820 0009E760 54 84 01 8D */ rlwinm. r4, r4, 0, 6, 6 /* 800A1824 0009E764 41 82 00 40 */ beq lbl_800A1864 @@ -5194,8 +5194,8 @@ daAlink_c_NS_commonLineCheck: /* 800A21AC 0009F0EC 38 7F 1B 48 */ addi r3, r31, 0x1b48 /* 800A21B0 0009F0F0 7F E6 FB 78 */ mr r6, r31 /* 800A21B4 0009F0F4 4B FD 5B B1 */ bl dBgS_LinChk_NS_Set -/* 800A21B8 0009F0F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A21BC 0009F0FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A21B8 0009F0F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A21BC 0009F0FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A21C0 0009F100 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A21C4 0009F104 38 9F 1B 48 */ addi r4, r31, 0x1b48 /* 800A21C8 0009F108 4B FD 21 ED */ bl cBgS_NS_LineCross @@ -5215,16 +5215,16 @@ daAlink_c_NS_getMoveBGActorName: /* 800A21F4 0009F134 7C 7E 1B 78 */ mr r30, r3 /* 800A21F8 0009F138 2C 04 00 00 */ cmpwi r4, 0 /* 800A21FC 0009F13C 40 82 00 20 */ bne lbl_800A221C -/* 800A2200 0009F140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A2204 0009F144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A2200 0009F140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A2204 0009F144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A2208 0009F148 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A220C 0009F14C 7F C4 F3 78 */ mr r4, r30 /* 800A2210 0009F150 4B FD 24 51 */ bl cBgS_NS_ChkPolySafe /* 800A2214 0009F154 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A2218 0009F158 41 82 00 4C */ beq lbl_800A2264 lbl_800A221C: -/* 800A221C 0009F15C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A2220 0009F160 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A221C 0009F15C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A2220 0009F160 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A2224 0009F164 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800A2228 0009F168 7F E3 FB 78 */ mr r3, r31 /* 800A222C 0009F16C 7F C4 F3 78 */ mr r4, r30 @@ -5267,8 +5267,8 @@ daAlink_c_NS_checkGoronRide: /* 800A22AC 0009F1EC 7C 60 07 34 */ extsh r0, r3 /* 800A22B0 0009F1F0 2C 00 00 21 */ cmpwi r0, 0x21 /* 800A22B4 0009F1F4 40 82 00 1C */ bne lbl_800A22D0 -/* 800A22B8 0009F1F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A22BC 0009F1FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A22B8 0009F1F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A22BC 0009F1FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A22C0 0009F200 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A22C4 0009F204 A0 9F 1A 62 */ lhz r4, 0x1a62(r31) /* 800A22C8 0009F208 4B FD 23 51 */ bl cBgS_NS_GetActorPointer @@ -6572,8 +6572,8 @@ lbl_800A3554: /* 800A3558 000A0498 3B 80 00 00 */ li r28, 0 /* 800A355C 000A049C 3B 00 00 00 */ li r24, 0 /* 800A3560 000A04A0 3B E0 00 00 */ li r31, 0 -/* 800A3564 000A04A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A3568 000A04A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A3564 000A04A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A3568 000A04A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A356C 000A04AC 3A E3 0F 38 */ addi r23, r3, 0xf38 /* 800A3570 000A04B0 C3 C2 93 A4 */ lfs f30, lbl_80452DA4-_SDA2_BASE_(r2) lbl_800A3574: @@ -6919,8 +6919,8 @@ lbl_800A3A28: /* 800A3A48 000A0988 4B F6 89 ED */ bl mDoMtx_YrotM /* 800A3A4C 000A098C 3A E0 00 00 */ li r23, 0 /* 800A3A50 000A0990 3B 60 00 00 */ li r27, 0 -/* 800A3A54 000A0994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A3A58 000A0998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A3A54 000A0994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A3A58 000A0998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A3A5C 000A099C 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 800A3A60 000A09A0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A3A64 000A09A4 3B 23 D4 70 */ addi r25, r3, lbl_803DD470@l @@ -7207,8 +7207,8 @@ daAlink_c_NS_initModel_X1_: /* 800A3E48 000A0D88 7C BF 2B 78 */ mr r31, r5 /* 800A3E4C 000A0D8C 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ /* 800A3E50 000A0D90 54 84 04 3E */ clrlwi r4, r4, 0x10 -/* 800A3E54 000A0D94 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A3E58 000A0D98 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A3E54 000A0D94 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A3E58 000A0D98 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A3E5C 000A0D9C 3C A5 00 02 */ addis r5, r5, 2 /* 800A3E60 000A0DA0 38 C0 00 80 */ li r6, 0x80 /* 800A3E64 000A0DA4 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -7236,8 +7236,8 @@ daAlink_c_NS_initModelEnv: /* 800A3EB0 000A0DF0 7C BF 2B 78 */ mr r31, r5 /* 800A3EB4 000A0DF4 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ /* 800A3EB8 000A0DF8 54 84 04 3E */ clrlwi r4, r4, 0x10 -/* 800A3EBC 000A0DFC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A3EC0 000A0E00 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A3EBC 000A0DFC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A3EC0 000A0E00 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A3EC4 000A0E04 3C A5 00 02 */ addis r5, r5, 2 /* 800A3EC8 000A0E08 38 C0 00 80 */ li r6, 0x80 /* 800A3ECC 000A0E0C 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -7269,8 +7269,8 @@ daAlink_c_NS_initDemoModel: /* 800A3F28 000A0E68 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 800A3F2C 000A0E6C 38 63 61 94 */ addi r3, r3, lbl_80406194@l /* 800A3F30 000A0E70 7C A4 2B 78 */ mr r4, r5 -/* 800A3F34 000A0E74 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A3F38 000A0E78 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A3F34 000A0E74 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A3F38 000A0E78 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A3F3C 000A0E7C 3C A5 00 02 */ addis r5, r5, 2 /* 800A3F40 000A0E80 38 C0 00 80 */ li r6, 0x80 /* 800A3F44 000A0E84 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -7307,8 +7307,8 @@ daAlink_c_NS_initDemoBck: /* 800A3FAC 000A0EEC 7C 7D 1B 78 */ mr r29, r3 /* 800A3FB0 000A0EF0 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 800A3FB4 000A0EF4 38 63 61 94 */ addi r3, r3, lbl_80406194@l -/* 800A3FB8 000A0EF8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A3FBC 000A0EFC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A3FB8 000A0EF8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A3FBC 000A0EFC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A3FC0 000A0F00 3C A5 00 02 */ addis r5, r5, 2 /* 800A3FC4 000A0F04 38 C0 00 80 */ li r6, 0x80 /* 800A3FC8 000A0F08 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -7368,8 +7368,8 @@ daAlink_c_NS_createHeap: /* 800A4084 000A0FC4 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 800A4088 000A0FC8 38 63 03 34 */ addi r3, r3, 0x334 /* 800A408C 000A0FCC 38 80 00 5D */ li r4, 0x5d -/* 800A4090 000A0FD0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A4094 000A0FD4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A4090 000A0FD0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A4094 000A0FD4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A4098 000A0FD8 3F C5 00 02 */ addis r30, r5, 2 /* 800A409C 000A0FDC 3B DE C2 F8 */ addi r30, r30, -15624 /* 800A40A0 000A0FE0 7F C5 F3 78 */ mr r5, r30 @@ -7836,8 +7836,8 @@ lbl_800A46DC: /* 800A46EC 000A162C 38 60 00 00 */ li r3, 0 /* 800A46F0 000A1630 48 00 01 18 */ b lbl_800A4808 lbl_800A46F4: -/* 800A46F4 000A1634 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A46F8 000A1638 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A46F4 000A1634 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A46F8 000A1638 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A46FC 000A163C 80 63 5C AC */ lwz r3, 0x5cac(r3) /* 800A4700 000A1640 80 9F 21 4C */ lwz r4, 0x214c(r31) /* 800A4704 000A1644 38 A0 0C 00 */ li r5, 0xc00 @@ -8004,8 +8004,8 @@ daAlink_c_NS_setSelectEquipItem: /* 800A4930 000A1870 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A4934 000A1874 40 82 01 C0 */ bne lbl_800A4AF4 /* 800A4938 000A1878 83 DC 06 B8 */ lwz r30, 0x6b8(r28) -/* 800A493C 000A187C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A4940 000A1880 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800A493C 000A187C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A4940 000A1880 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800A4944 000A1884 88 1F 00 14 */ lbz r0, 0x14(r31) /* 800A4948 000A1888 28 00 00 3F */ cmplwi r0, 0x3f /* 800A494C 000A188C 40 82 00 18 */ bne lbl_800A4964 @@ -8207,8 +8207,8 @@ daAlink_c_NS_checkBoarStart: /* 800A4C00 000A1B40 54 00 06 BE */ clrlwi r0, r0, 0x1a /* 800A4C04 000A1B44 2C 00 00 03 */ cmpwi r0, 3 /* 800A4C08 000A1B48 40 82 00 1C */ bne lbl_800A4C24 -/* 800A4C0C 000A1B4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A4C10 000A1B50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A4C0C 000A1B4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A4C10 000A1B50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A4C14 000A1B54 A8 03 0D B8 */ lha r0, 0xdb8(r3) /* 800A4C18 000A1B58 7C 00 07 35 */ extsh. r0, r0 /* 800A4C1C 000A1B5C 40 82 00 08 */ bne lbl_800A4C24 @@ -8240,8 +8240,8 @@ daAlink_c_NS_checkCanoeStart: /* 800A4C74 000A1BB4 80 1E 00 B0 */ lwz r0, 0xb0(r30) /* 800A4C78 000A1BB8 54 00 06 BF */ clrlwi. r0, r0, 0x1a /* 800A4C7C 000A1BBC 40 82 00 1C */ bne lbl_800A4C98 -/* 800A4C80 000A1BC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A4C84 000A1BC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A4C80 000A1BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A4C84 000A1BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A4C88 000A1BC8 A8 03 0D B8 */ lha r0, 0xdb8(r3) /* 800A4C8C 000A1BCC 2C 00 00 02 */ cmpwi r0, 2 /* 800A4C90 000A1BD0 40 82 00 08 */ bne lbl_800A4C98 @@ -8275,11 +8275,11 @@ daAlink_c_NS_playerInit: /* 800A4CF0 000A1C30 40 82 00 30 */ bne lbl_800A4D20 /* 800A4CF4 000A1C34 38 60 00 25 */ li r3, 0x25 /* 800A4CF8 000A1C38 38 80 00 01 */ li r4, 1 -/* 800A4CFC 000A1C3C 4B FF 31 E5 */ bl checkItemGet +/* 800A4CFC 000A1C3C 4B FF 31 E5 */ bl checkItemGet__FUci /* 800A4D00 000A1C40 2C 03 00 00 */ cmpwi r3, 0 /* 800A4D04 000A1C44 41 82 00 1C */ beq lbl_800A4D20 -/* 800A4D08 000A1C48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A4D0C 000A1C4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A4D08 000A1C48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A4D0C 000A1C4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A4D10 000A1C50 38 63 00 9C */ addi r3, r3, 0x9c /* 800A4D14 000A1C54 38 80 00 12 */ li r4, 0x12 /* 800A4D18 000A1C58 38 A0 00 2D */ li r5, 0x2d @@ -8543,8 +8543,8 @@ lbl_800A508C: /* 800A50DC 000A201C B0 17 2F E8 */ sth r0, 0x2fe8(r23) /* 800A50E0 000A2020 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ /* 800A50E4 000A2024 38 80 00 59 */ li r4, 0x59 -/* 800A50E8 000A2028 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800A50EC 000A202C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800A50E8 000A2028 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800A50EC 000A202C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800A50F0 000A2030 3F 05 00 02 */ addis r24, r5, 2 /* 800A50F4 000A2034 3B 18 C2 F8 */ addi r24, r24, -15624 /* 800A50F8 000A2038 7F 05 C3 78 */ mr r5, r24 @@ -8611,8 +8611,8 @@ lbl_800A508C: /* 800A51EC 000A212C 80 17 00 B0 */ lwz r0, 0xb0(r23) /* 800A51F0 000A2130 54 05 A6 FE */ rlwinm r5, r0, 0x14, 0x1b, 0x1f /* 800A51F4 000A2134 54 04 46 3E */ srwi r4, r0, 0x18 -/* 800A51F8 000A2138 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A51FC 000A213C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A51F8 000A2138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A51FC 000A213C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5200 000A2140 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 800A5204 000A2144 2C 00 FF FE */ cmpwi r0, -2 /* 800A5208 000A2148 41 82 00 10 */ beq lbl_800A5218 @@ -8620,8 +8620,8 @@ lbl_800A508C: /* 800A5210 000A2150 2C 00 FF FD */ cmpwi r0, -3 /* 800A5214 000A2154 40 82 00 20 */ bne lbl_800A5234 lbl_800A5218: -/* 800A5218 000A2158 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A521C 000A215C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5218 000A2158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A521C 000A215C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5220 000A2160 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5224 000A2164 38 80 FF FF */ li r4, -1 /* 800A5228 000A2168 4B FA 11 C9 */ bl dEvent_exception_c_NS_setStartDemo @@ -8735,8 +8735,8 @@ lbl_800A539C: /* 800A53A0 000A22E0 4B FA 10 51 */ bl dEvent_exception_c_NS_setStartDemo /* 800A53A4 000A22E4 90 77 31 88 */ stw r3, 0x3188(r23) lbl_800A53A8: -/* 800A53A8 000A22E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A53AC 000A22EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A53A8 000A22E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A53AC 000A22EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A53B0 000A22F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800A53B4 000A22F4 4B FA 16 A5 */ bl dEvent_manager_c_NS_orderStartDemo /* 800A53B8 000A22F8 38 00 00 FF */ li r0, 0xff @@ -8850,8 +8850,8 @@ daAlink_c_NS_setStartProcInit: /* 800A553C 000A247C 3B 40 00 00 */ li r26, 0 /* 800A5540 000A2480 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 800A5544 000A2484 54 1C A6 FE */ rlwinm r28, r0, 0x14, 0x1b, 0x1f -/* 800A5548 000A2488 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800A554C 000A248C 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 800A5548 000A2488 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800A554C 000A248C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 800A5550 000A2490 80 1E 0D D0 */ lwz r0, 0xdd0(r30) /* 800A5554 000A2494 54 1B 07 3E */ clrlwi r27, r0, 0x1c /* 800A5558 000A2498 83 3E 5D B8 */ lwz r25, 0x5db8(r30) @@ -8999,8 +8999,8 @@ lbl_800A5754: /* 800A5760 000A26A0 48 07 9C 01 */ bl daAlink_c_NS_procDungeonWarpSceneStartInit /* 800A5764 000A26A4 48 00 05 48 */ b lbl_800A5CAC lbl_800A5768: -/* 800A5768 000A26A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A576C 000A26AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5768 000A26A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A576C 000A26AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5770 000A26B0 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 800A5774 000A26B4 2C 00 FF FC */ cmpwi r0, -4 /* 800A5778 000A26B8 40 82 00 18 */ bne lbl_800A5790 @@ -9145,8 +9145,8 @@ lbl_800A593C: lbl_800A5964: /* 800A5964 000A28A4 2C 1C 00 03 */ cmpwi r28, 3 /* 800A5968 000A28A8 40 82 00 24 */ bne lbl_800A598C -/* 800A596C 000A28AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5970 000A28B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A596C 000A28AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5970 000A28B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5974 000A28B4 A8 03 0D D4 */ lha r0, 0xdd4(r3) /* 800A5978 000A28B8 B0 18 04 E6 */ sth r0, 0x4e6(r24) /* 800A597C 000A28BC A8 18 04 E6 */ lha r0, 0x4e6(r24) @@ -9162,8 +9162,8 @@ lbl_800A598C: /* 800A59A0 000A28E0 40 82 00 1C */ bne lbl_800A59BC /* 800A59A4 000A28E4 2C 1C 00 00 */ cmpwi r28, 0 /* 800A59A8 000A28E8 41 82 00 14 */ beq lbl_800A59BC -/* 800A59AC 000A28EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A59B0 000A28F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A59AC 000A28EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A59B0 000A28F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A59B4 000A28F4 C0 03 0D CC */ lfs f0, 0xdcc(r3) /* 800A59B8 000A28F8 D0 18 33 98 */ stfs f0, 0x3398(r24) lbl_800A59BC: @@ -9197,8 +9197,8 @@ lbl_800A59BC: /* 800A5A28 000A2968 88 18 04 E2 */ lbz r0, 0x4e2(r24) /* 800A5A2C 000A296C 7C 00 07 75 */ extsb. r0, r0 /* 800A5A30 000A2970 40 82 00 24 */ bne lbl_800A5A54 -/* 800A5A34 000A2974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5A38 000A2978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5A34 000A2974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5A38 000A2978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5A3C 000A297C A8 03 0D B8 */ lha r0, 0xdb8(r3) /* 800A5A40 000A2980 2C 00 00 23 */ cmpwi r0, 0x23 /* 800A5A44 000A2984 40 82 00 10 */ bne lbl_800A5A54 @@ -9216,8 +9216,8 @@ lbl_800A5A60: /* 800A5A6C 000A29AC D0 19 05 2C */ stfs f0, 0x52c(r25) /* 800A5A70 000A29B0 48 00 00 14 */ b lbl_800A5A84 lbl_800A5A74: -/* 800A5A74 000A29B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5A78 000A29B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5A74 000A29B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5A78 000A29B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5A7C 000A29BC C0 03 0D CC */ lfs f0, 0xdcc(r3) /* 800A5A80 000A29C0 D0 19 05 2C */ stfs f0, 0x52c(r25) lbl_800A5A84: @@ -9312,8 +9312,8 @@ lbl_800A5BB4: /* 800A5BBC 000A2AFC 28 1B 00 03 */ cmplwi r27, 3 /* 800A5BC0 000A2B00 40 82 00 74 */ bne lbl_800A5C34 lbl_800A5BC4: -/* 800A5BC4 000A2B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5BC8 000A2B08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5BC4 000A2B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5BC8 000A2B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5BCC 000A2B0C C0 03 0D CC */ lfs f0, 0xdcc(r3) /* 800A5BD0 000A2B10 D0 18 06 18 */ stfs f0, 0x618(r24) /* 800A5BD4 000A2B14 A8 18 04 E6 */ lha r0, 0x4e6(r24) @@ -9414,8 +9414,8 @@ lbl_800A5D04: /* 800A5D18 000A2C58 38 00 00 01 */ li r0, 1 /* 800A5D1C 000A2C5C 98 0D 8A 50 */ stb r0, lbl_80450FD0-_SDA_BASE_(r13) lbl_800A5D20: -/* 800A5D20 000A2C60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5D24 000A2C64 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 800A5D20 000A2C60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5D24 000A2C64 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 800A5D28 000A2C68 80 1C 0D D0 */ lwz r0, 0xdd0(r28) /* 800A5D2C 000A2C6C 54 1B 07 3E */ clrlwi r27, r0, 0x1c /* 800A5D30 000A2C70 80 1F 00 B0 */ lwz r0, 0xb0(r31) @@ -9450,8 +9450,8 @@ lbl_800A5D9C: /* 800A5DA0 000A2CE0 80 0D 8A 4C */ lwz r0, lbl_80450FCC-_SDA_BASE_(r13) /* 800A5DA4 000A2CE4 2C 00 00 00 */ cmpwi r0, 0 /* 800A5DA8 000A2CE8 40 82 02 D8 */ bne lbl_800A6080 -/* 800A5DAC 000A2CEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5DB0 000A2CF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5DAC 000A2CEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5DB0 000A2CF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5DB4 000A2CF4 88 03 00 13 */ lbz r0, 0x13(r3) /* 800A5DB8 000A2CF8 28 00 00 2E */ cmplwi r0, 0x2e /* 800A5DBC 000A2CFC 40 82 00 28 */ bne lbl_800A5DE4 @@ -9474,16 +9474,16 @@ lbl_800A5DE4: /* 800A5DFC 000A2D3C 38 60 00 2F */ li r3, 0x2f /* 800A5E00 000A2D40 4B F8 90 B1 */ bl dComIfGs_setSelectEquipClothes lbl_800A5E04: -/* 800A5E04 000A2D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5E08 000A2D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5E04 000A2D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5E08 000A2D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5E0C 000A2D4C 93 E3 5D AC */ stw r31, 0x5dac(r3) /* 800A5E10 000A2D50 93 E3 5D B4 */ stw r31, 0x5db4(r3) /* 800A5E14 000A2D54 7F E3 FB 78 */ mr r3, r31 /* 800A5E18 000A2D58 4B F7 3A AD */ bl fopAcM_setStageLayer /* 800A5E1C 000A2D5C 28 1B 00 07 */ cmplwi r27, 7 /* 800A5E20 000A2D60 40 82 00 34 */ bne lbl_800A5E54 -/* 800A5E24 000A2D64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5E28 000A2D68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5E24 000A2D64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5E28 000A2D68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5E2C 000A2D6C C0 03 0E D8 */ lfs f0, 0xed8(r3) /* 800A5E30 000A2D70 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800A5E34 000A2D74 C0 03 0E DC */ lfs f0, 0xedc(r3) @@ -9549,8 +9549,8 @@ lbl_800A5F00: lbl_800A5F10: /* 800A5F10 000A2E50 38 00 FF FF */ li r0, -1 /* 800A5F14 000A2E54 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 800A5F18 000A2E58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5F1C 000A2E5C 3B 03 61 C0 */ addi r24, r3, lbl_804061C0@l +/* 800A5F18 000A2E58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5F1C 000A2E5C 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l /* 800A5F20 000A2E60 88 18 56 B4 */ lbz r0, 0x56b4(r24) /* 800A5F24 000A2E64 28 00 00 00 */ cmplwi r0, 0 /* 800A5F28 000A2E68 40 82 00 0C */ bne lbl_800A5F34 @@ -9605,8 +9605,8 @@ lbl_800A5FB0: lbl_800A5FD8: /* 800A5FD8 000A2F18 38 18 56 B8 */ addi r0, r24, 0x56b8 /* 800A5FDC 000A2F1C 90 1F 27 E0 */ stw r0, 0x27e0(r31) -/* 800A5FE0 000A2F20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A5FE4 000A2F24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A5FE0 000A2F20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A5FE4 000A2F24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5FE8 000A2F28 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 800A5FEC 000A2F2C 7C 00 07 74 */ extsb r0, r0 /* 800A5FF0 000A2F30 90 1F 31 7C */ stw r0, 0x317c(r31) @@ -9649,8 +9649,8 @@ lbl_800A6078: /* 800A607C 000A2FBC 90 1F 29 00 */ stw r0, 0x2900(r31) lbl_800A6080: /* 800A6080 000A2FC0 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800A6084 000A2FC4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800A6088 000A2FC8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800A6084 000A2FC4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800A6088 000A2FC8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800A608C 000A2FCC 3B 64 0F 38 */ addi r27, r4, 0xf38 /* 800A6090 000A2FD0 7F 64 DB 78 */ mr r4, r27 /* 800A6094 000A2FD4 4B FD 0A 19 */ bl dBgS_Acch_NS_CrrPos @@ -9747,8 +9747,8 @@ lbl_800A61A4: lbl_800A61BC: /* 800A61BC 000A30FC 2C 1D 00 00 */ cmpwi r29, 0 /* 800A61C0 000A3100 41 82 00 20 */ beq lbl_800A61E0 -/* 800A61C4 000A3104 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A61C8 000A3108 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A61C4 000A3104 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A61C8 000A3108 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A61CC 000A310C 80 03 5D B8 */ lwz r0, 0x5db8(r3) /* 800A61D0 000A3110 28 00 00 00 */ cmplwi r0, 0 /* 800A61D4 000A3114 40 82 00 0C */ bne lbl_800A61E0 @@ -9764,8 +9764,8 @@ lbl_800A61E0: lbl_800A61F4: /* 800A61F4 000A3134 38 00 00 00 */ li r0, 0 /* 800A61F8 000A3138 90 0D 8A 4C */ stw r0, lbl_80450FCC-_SDA_BASE_(r13) -/* 800A61FC 000A313C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A6200 000A3140 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A61FC 000A313C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A6200 000A3140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6204 000A3144 38 63 0D B4 */ addi r3, r3, 0xdb4 /* 800A6208 000A3148 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800A620C 000A314C A8 BF 04 E6 */ lha r5, 0x4e6(r31) @@ -9981,8 +9981,8 @@ lbl_800A64FC: /* 800A651C 000A345C 7F 04 C3 78 */ mr r4, r24 /* 800A6520 000A3460 3C A0 80 10 */ lis r5, 0x800FFFFF@ha /* 800A6524 000A3464 38 A5 FF FF */ addi r5, r5, 0x800FFFFF@l -/* 800A6528 000A3468 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 800A652C 000A346C 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 800A6528 000A3468 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 800A652C 000A346C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 800A6530 000A3470 80 C6 5D B4 */ lwz r6, 0x5db4(r6) /* 800A6534 000A3474 38 C6 04 D0 */ addi r6, r6, 0x4d0 /* 800A6538 000A3478 88 ED 87 E4 */ lbz r7, lbl_80450D64-_SDA_BASE_(r13) @@ -10001,8 +10001,8 @@ lbl_800A6550: /* 800A6568 000A34A8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 800A656C 000A34AC 2C 00 00 11 */ cmpwi r0, 0x11 /* 800A6570 000A34B0 40 82 00 80 */ bne lbl_800A65F0 -/* 800A6574 000A34B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A6578 000A34B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A6574 000A34B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A6578 000A34B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A657C 000A34BC 3B 03 00 CC */ addi r24, r3, 0xcc /* 800A6580 000A34C0 7F 03 C3 78 */ mr r3, r24 /* 800A6584 000A34C4 38 80 00 2C */ li r4, 0x2c @@ -10019,16 +10019,16 @@ lbl_800A6550: /* 800A65B0 000A34F0 4B F8 D9 19 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800A65B4 000A34F4 2C 03 00 00 */ cmpwi r3, 0 /* 800A65B8 000A34F8 40 82 00 20 */ bne lbl_800A65D8 -/* 800A65BC 000A34FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A65C0 000A3500 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A65BC 000A34FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A65C0 000A3500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A65C4 000A3504 38 80 00 6F */ li r4, 0x6f /* 800A65C8 000A3508 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 800A65CC 000A350C 7C 05 07 74 */ extsb r5, r0 /* 800A65D0 000A3510 4B F8 EC 31 */ bl onSwitch__10dSv_info_cFii /* 800A65D4 000A3514 48 00 00 1C */ b lbl_800A65F0 lbl_800A65D8: -/* 800A65D8 000A3518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A65DC 000A351C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A65D8 000A3518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A65DC 000A351C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A65E0 000A3520 38 80 00 6F */ li r4, 0x6f /* 800A65E4 000A3524 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 800A65E8 000A3528 7C 05 07 74 */ extsb r5, r0 @@ -10062,8 +10062,8 @@ daAlink_c_NS_setRoomInfo: /* 800A6644 000A3584 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 800A6648 000A3588 28 00 01 58 */ cmplwi r0, 0x158 /* 800A664C 000A358C 41 82 00 4C */ beq lbl_800A6698 -/* 800A6650 000A3590 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A6654 000A3594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A6650 000A3590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A6654 000A3594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6658 000A3598 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A665C 000A359C 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 800A6660 000A35A0 4B FC EA A1 */ bl dBgS_NS_GetRoomId @@ -10086,8 +10086,8 @@ lbl_800A6698: /* 800A669C 000A35DC 7C 00 07 74 */ extsb r0, r0 /* 800A66A0 000A35E0 7C 1F 03 78 */ mr r31, r0 lbl_800A66A4: -/* 800A66A4 000A35E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A66A8 000A35E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A66A4 000A35E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A66A8 000A35E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A66AC 000A35EC 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800A66B0 000A35F0 7F A3 EB 78 */ mr r3, r29 /* 800A66B4 000A35F4 38 9E 1A 60 */ addi r4, r30, 0x1a60 @@ -10225,8 +10225,8 @@ lbl_800A6830: /* 800A6894 000A37D4 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800A6898 000A37D8 38 81 00 2C */ addi r4, r1, 0x2c /* 800A689C 000A37DC 48 1C 14 8D */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800A68A0 000A37E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A68A4 000A37E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A68A0 000A37E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A68A4 000A37E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A68A8 000A37E8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800A68AC 000A37EC 7F C3 F3 78 */ mr r3, r30 /* 800A68B0 000A37F0 38 9F 1D 08 */ addi r4, r31, 0x1d08 @@ -10447,8 +10447,8 @@ daAlink_c_NS_setStepsOffset: /* 800A6BCC 000A3B0C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800A6BD0 000A3B10 38 81 00 24 */ addi r4, r1, 0x24 /* 800A6BD4 000A3B14 48 1C 11 55 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800A6BD8 000A3B18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A6BDC 000A3B1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A6BD8 000A3B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A6BDC 000A3B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6BE0 000A3B20 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A6BE4 000A3B24 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800A6BE8 000A3B28 4B FC D8 B9 */ bl cBgS_NS_GroundCross @@ -11181,8 +11181,8 @@ lbl_800A7634: /* 800A7640 000A4580 80 1E 19 9C */ lwz r0, 0x199c(r30) /* 800A7644 000A4584 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800A7648 000A4588 41 82 02 98 */ beq lbl_800A78E0 -/* 800A764C 000A458C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A7650 000A4590 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A764C 000A458C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A7650 000A4590 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A7654 000A4594 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800A7658 000A4598 7F A3 EB 78 */ mr r3, r29 /* 800A765C 000A459C 38 9E 1A 60 */ addi r4, r30, 0x1a60 @@ -11540,8 +11540,8 @@ daAlink_c_NS_checkWindWallRate: /* 800A7B44 000A4A84 4B FF A6 55 */ bl daAlink_c_NS_commonLineCheck /* 800A7B48 000A4A88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7B4C 000A4A8C 41 82 01 48 */ beq lbl_800A7C94 -/* 800A7B50 000A4A90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A7B54 000A4A94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A7B50 000A4A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A7B54 000A4A94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A7B58 000A4A98 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A7B5C 000A4A9C 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800A7B60 000A4AA0 4B FC D2 A1 */ bl dBgS_NS_GetWallCode @@ -12183,8 +12183,8 @@ lbl_800A843C: /* 800A8454 000A5394 38 9F 48 F8 */ addi r4, r31, 0x48f8 /* 800A8458 000A5398 38 BE 05 38 */ addi r5, r30, 0x538 /* 800A845C 000A539C 48 29 E9 11 */ bl PSMTXMultVec -/* 800A8460 000A53A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A8464 000A53A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A8460 000A53A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A8464 000A53A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A8468 000A53A8 80 83 5F 18 */ lwz r4, 0x5f18(r3) /* 800A846C 000A53AC 54 80 04 A5 */ rlwinm. r0, r4, 0, 0x12, 0x12 /* 800A8470 000A53B0 41 82 01 24 */ beq lbl_800A8594 @@ -12622,8 +12622,8 @@ lbl_800A8A8C: /* 800A8AA8 000A59E8 D0 1F 05 58 */ stfs f0, 0x558(r31) /* 800A8AAC 000A59EC 48 00 01 F8 */ b lbl_800A8CA4 lbl_800A8AB0: -/* 800A8AB0 000A59F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A8AB4 000A59F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A8AB0 000A59F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A8AB4 000A59F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A8AB8 000A59F8 80 63 5F 1C */ lwz r3, 0x5f1c(r3) /* 800A8ABC 000A59FC 54 60 01 8D */ rlwinm. r0, r3, 0, 6, 6 /* 800A8AC0 000A5A00 41 82 00 58 */ beq lbl_800A8B18 @@ -13009,8 +13009,8 @@ lbl_800A9010: /* 800A9030 000A5F70 48 02 7E 69 */ bl daAlink_c_NS_checkSwordEquipAnime /* 800A9034 000A5F74 2C 03 00 00 */ cmpwi r3, 0 /* 800A9038 000A5F78 41 82 00 24 */ beq lbl_800A905C -/* 800A903C 000A5F7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A9040 000A5F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A903C 000A5F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A9040 000A5F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A9044 000A5F84 88 03 00 15 */ lbz r0, 0x15(r3) /* 800A9048 000A5F88 28 00 00 FF */ cmplwi r0, 0xff /* 800A904C 000A5F8C 40 82 00 10 */ bne lbl_800A905C @@ -13122,8 +13122,8 @@ lbl_800A91BC: /* 800A91C0 000A6100 48 02 7C D9 */ bl daAlink_c_NS_checkSwordEquipAnime /* 800A91C4 000A6104 2C 03 00 00 */ cmpwi r3, 0 /* 800A91C8 000A6108 41 82 00 24 */ beq lbl_800A91EC -/* 800A91CC 000A610C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A91D0 000A6110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A91CC 000A610C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A91D0 000A6110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A91D4 000A6114 88 03 00 15 */ lbz r0, 0x15(r3) /* 800A91D8 000A6118 28 00 00 FF */ cmplwi r0, 0xff /* 800A91DC 000A611C 40 82 00 10 */ bne lbl_800A91EC @@ -13378,8 +13378,8 @@ lbl_800A954C: /* 800A9550 000A6490 80 9F 06 B8 */ lwz r4, 0x6b8(r31) /* 800A9554 000A6494 48 02 2D 09 */ bl daAlink_c_NS_modelCalc lbl_800A9558: -/* 800A9558 000A6498 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A955C 000A649C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A9558 000A6498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A955C 000A649C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A9560 000A64A0 88 03 00 14 */ lbz r0, 0x14(r3) /* 800A9564 000A64A4 28 00 00 FF */ cmplwi r0, 0xff /* 800A9568 000A64A8 40 82 00 0C */ bne lbl_800A9574 @@ -13455,8 +13455,8 @@ lbl_800A9648: /* 800A9660 000A65A0 80 9F 06 78 */ lwz r4, 0x678(r31) /* 800A9664 000A65A4 38 84 00 24 */ addi r4, r4, 0x24 /* 800A9668 000A65A8 48 29 CE 49 */ bl PSMTXCopy -/* 800A966C 000A65AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A9670 000A65B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A966C 000A65AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A9670 000A65B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A9674 000A65B4 88 03 00 15 */ lbz r0, 0x15(r3) /* 800A9678 000A65B8 28 00 00 FF */ cmplwi r0, 0xff /* 800A967C 000A65BC 41 82 00 2C */ beq lbl_800A96A8 @@ -13519,8 +13519,8 @@ lbl_800A96FC: /* 800A9750 000A6690 80 9F 06 78 */ lwz r4, 0x678(r31) /* 800A9754 000A6694 38 84 00 24 */ addi r4, r4, 0x24 /* 800A9758 000A6698 48 29 CD 59 */ bl PSMTXCopy -/* 800A975C 000A669C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800A9760 000A66A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800A975C 000A669C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800A9760 000A66A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A9764 000A66A4 88 03 00 15 */ lbz r0, 0x15(r3) /* 800A9768 000A66A8 28 00 00 FF */ cmplwi r0, 0xff /* 800A976C 000A66AC 40 82 00 2C */ bne lbl_800A9798 @@ -14248,8 +14248,8 @@ lbl_800AA140: /* 800AA220 000A7160 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800AA224 000A7164 28 00 01 23 */ cmplwi r0, 0x123 /* 800AA228 000A7168 41 82 00 64 */ beq lbl_800AA28C -/* 800AA22C 000A716C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA230 000A7170 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA22C 000A716C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA230 000A7170 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA234 000A7174 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800AA238 000A7178 38 00 00 FF */ li r0, 0xff /* 800AA23C 000A717C 90 01 00 08 */ stw r0, 8(r1) @@ -14375,13 +14375,13 @@ lbl_800AA3E4: /* 800AA3E8 000A7328 38 81 00 74 */ addi r4, r1, 0x74 /* 800AA3EC 000A732C 4B FD A5 69 */ bl dCcD_Cyl_NS_MoveCAt lbl_800AA3F0: -/* 800AA3F0 000A7330 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA3F4 000A7334 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA3F0 000A7330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA3F4 000A7334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA3F8 000A7338 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA3FC 000A733C 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA400 000A7340 48 1B A7 A9 */ bl cCcS_NS_Set -/* 800AA404 000A7344 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA408 000A7348 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA404 000A7344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA408 000A7348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA40C 000A734C 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA410 000A7350 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA414 000A7354 38 A0 00 01 */ li r5, 1 @@ -14481,8 +14481,8 @@ lbl_800AA554: /* 800AA580 000A74C0 D0 1F 15 40 */ stfs f0, 0x1540(r31) /* 800AA584 000A74C4 3B 40 00 00 */ li r26, 0 /* 800AA588 000A74C8 3B C0 00 00 */ li r30, 0 -/* 800AA58C 000A74CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA590 000A74D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA58C 000A74CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA590 000A74D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA594 000A74D4 3B A3 23 3C */ addi r29, r3, 0x233c /* 800AA598 000A74D8 3B 83 4B 88 */ addi r28, r3, 0x4b88 lbl_800AA59C: @@ -14529,8 +14529,8 @@ daAlink_c_NS_checkNoCollisionCorret: /* 800AA62C 000A756C 48 06 B5 F5 */ bl daAlink_c_NS_checkEventRun /* 800AA630 000A7570 2C 03 00 00 */ cmpwi r3, 0 /* 800AA634 000A7574 41 82 00 50 */ beq lbl_800AA684 -/* 800AA638 000A7578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA63C 000A757C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA638 000A7578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA63C 000A757C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA640 000A7580 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800AA644 000A7584 4B F9 DD A5 */ bl dEvent_manager_c_NS_getRunEventName /* 800AA648 000A7588 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -14688,13 +14688,13 @@ lbl_800AA850: /* 800AA85C 000A779C 38 7F 12 14 */ addi r3, r31, 0x1214 /* 800AA860 000A77A0 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800AA864 000A77A4 48 1C 49 79 */ bl cM3dGCyl_NS_SetC -/* 800AA868 000A77A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA86C 000A77AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA868 000A77A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA86C 000A77AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA870 000A77B0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA874 000A77B4 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA878 000A77B8 48 1B A3 31 */ bl cCcS_NS_Set -/* 800AA87C 000A77BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA880 000A77C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA87C 000A77BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA880 000A77C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA884 000A77C4 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA888 000A77C8 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA88C 000A77CC 38 A0 00 01 */ li r5, 1 @@ -14768,13 +14768,13 @@ lbl_800AA97C: /* 800AA980 000A78C0 38 81 00 08 */ addi r4, r1, 8 /* 800AA984 000A78C4 4B FD 9F D1 */ bl dCcD_Cyl_NS_MoveCAt lbl_800AA988: -/* 800AA988 000A78C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA98C 000A78CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA988 000A78C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA98C 000A78CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA990 000A78D0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AA994 000A78D4 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA998 000A78D8 48 1B A2 11 */ bl cCcS_NS_Set -/* 800AA99C 000A78DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AA9A0 000A78E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AA99C 000A78DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AA9A0 000A78E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA9A4 000A78E4 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA9A8 000A78E8 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA9AC 000A78EC 38 A0 00 01 */ li r5, 1 @@ -14915,8 +14915,8 @@ lbl_800AAB10: /* 800AAB94 000A7AD4 D0 1E 12 B4 */ stfs f0, 0x12b4(r30) /* 800AAB98 000A7AD8 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 800AAB9C 000A7ADC D0 1E 12 B8 */ stfs f0, 0x12b8(r30) -/* 800AABA0 000A7AE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AABA4 000A7AE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AABA0 000A7AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AABA4 000A7AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AABA8 000A7AE8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AABAC 000A7AEC 38 9E 12 2C */ addi r4, r30, 0x122c /* 800AABB0 000A7AF0 48 1B 9F F9 */ bl cCcS_NS_Set @@ -14985,8 +14985,8 @@ lbl_800AABC4: /* 800AACA4 000A7BE4 D0 1E 12 B4 */ stfs f0, 0x12b4(r30) /* 800AACA8 000A7BE8 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 800AACAC 000A7BEC D0 1E 12 B8 */ stfs f0, 0x12b8(r30) -/* 800AACB0 000A7BF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AACB4 000A7BF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AACB0 000A7BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AACB4 000A7BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AACB8 000A7BF8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AACBC 000A7BFC 38 9E 12 2C */ addi r4, r30, 0x122c /* 800AACC0 000A7C00 48 1B 9E E9 */ bl cCcS_NS_Set @@ -15018,8 +15018,8 @@ lbl_800AACC8: /* 800AAD24 000A7C64 38 7E 12 14 */ addi r3, r30, 0x1214 /* 800AAD28 000A7C68 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800AAD2C 000A7C6C 48 1C 44 B1 */ bl cM3dGCyl_NS_SetC -/* 800AAD30 000A7C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AAD34 000A7C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AAD30 000A7C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AAD34 000A7C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAD38 000A7C78 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAD3C 000A7C7C 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AAD40 000A7C80 48 1B 9E 69 */ bl cCcS_NS_Set @@ -15107,13 +15107,13 @@ lbl_800AADA8: /* 800AAE78 000A7DB8 D0 1E 16 80 */ stfs f0, 0x1680(r30) /* 800AAE7C 000A7DBC C0 01 00 BC */ lfs f0, 0xbc(r1) /* 800AAE80 000A7DC0 D0 1E 16 84 */ stfs f0, 0x1684(r30) -/* 800AAE84 000A7DC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AAE88 000A7DC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AAE84 000A7DC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AAE88 000A7DC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAE8C 000A7DCC 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAE90 000A7DD0 38 9E 15 F8 */ addi r4, r30, 0x15f8 /* 800AAE94 000A7DD4 48 1B 9D 15 */ bl cCcS_NS_Set -/* 800AAE98 000A7DD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AAE9C 000A7DDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AAE98 000A7DD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AAE9C 000A7DDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAEA0 000A7DE0 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AAEA4 000A7DE4 38 9E 15 F8 */ addi r4, r30, 0x15f8 /* 800AAEA8 000A7DE8 38 A0 00 01 */ li r5, 1 @@ -15174,8 +15174,8 @@ lbl_800AAEC0: /* 800AAF7C 000A7EBC D0 1E 10 40 */ stfs f0, 0x1040(r30) /* 800AAF80 000A7EC0 C0 01 00 B0 */ lfs f0, 0xb0(r1) /* 800AAF84 000A7EC4 D0 1E 10 44 */ stfs f0, 0x1044(r30) -/* 800AAF88 000A7EC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AAF8C 000A7ECC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AAF88 000A7EC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AAF8C 000A7ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AAF90 000A7ED0 38 63 23 3C */ addi r3, r3, 0x233c /* 800AAF94 000A7ED4 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AAF98 000A7ED8 48 1B 9C 11 */ bl cCcS_NS_Set @@ -15310,8 +15310,8 @@ lbl_800AB154: /* 800AB15C 000A809C 38 BE 37 E0 */ addi r5, r30, 0x37e0 /* 800AB160 000A80A0 7F C6 F3 78 */ mr r6, r30 /* 800AB164 000A80A4 4B FC CC 01 */ bl dBgS_LinChk_NS_Set -/* 800AB168 000A80A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB16C 000A80AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB168 000A80A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB16C 000A80AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB170 000A80B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800AB174 000A80B4 38 9E 1B B8 */ addi r4, r30, 0x1bb8 /* 800AB178 000A80B8 4B FC 92 3D */ bl cBgS_NS_LineCross @@ -15350,8 +15350,8 @@ lbl_800AB190: /* 800AB1F4 000A8134 38 A1 00 C0 */ addi r5, r1, 0xc0 /* 800AB1F8 000A8138 7F C6 F3 78 */ mr r6, r30 /* 800AB1FC 000A813C 4B FC CB 69 */ bl dBgS_LinChk_NS_Set -/* 800AB200 000A8140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB204 000A8144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB200 000A8140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB204 000A8144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB208 000A8148 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800AB20C 000A814C 38 9E 1B B8 */ addi r4, r30, 0x1bb8 /* 800AB210 000A8150 4B FC 91 A5 */ bl cBgS_NS_LineCross @@ -15383,8 +15383,8 @@ lbl_800AB234: /* 800AB274 000A81B4 D0 1E 12 B4 */ stfs f0, 0x12b4(r30) /* 800AB278 000A81B8 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 800AB27C 000A81BC D0 1E 12 B8 */ stfs f0, 0x12b8(r30) -/* 800AB280 000A81C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB284 000A81C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB280 000A81C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB284 000A81C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB288 000A81C8 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB28C 000A81CC 38 9E 12 2C */ addi r4, r30, 0x122c /* 800AB290 000A81D0 48 1B 99 19 */ bl cCcS_NS_Set @@ -15406,8 +15406,8 @@ lbl_800AB2B0: /* 800AB2C4 000A8204 4E 80 04 21 */ bctrl /* 800AB2C8 000A8208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AB2CC 000A820C 41 82 00 AC */ beq lbl_800AB378 -/* 800AB2D0 000A8210 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB2D4 000A8214 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB2D0 000A8210 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB2D4 000A8214 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB2D8 000A8218 A0 03 00 08 */ lhz r0, 8(r3) /* 800AB2DC 000A821C 28 00 00 00 */ cmplwi r0, 0 /* 800AB2E0 000A8220 41 82 00 8C */ beq lbl_800AB36C @@ -15435,13 +15435,13 @@ lbl_800AB324: /* 800AB334 000A8274 38 9E 36 0C */ addi r4, r30, 0x360c /* 800AB338 000A8278 4B FD 97 41 */ bl dCcD_Sph_NS_StartCAt lbl_800AB33C: -/* 800AB33C 000A827C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB340 000A8280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB33C 000A827C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB340 000A8280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB344 000A8284 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB348 000A8288 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB34C 000A828C 48 1B 98 5D */ bl cCcS_NS_Set -/* 800AB350 000A8290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB354 000A8294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB350 000A8290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB354 000A8294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB358 000A8298 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB35C 000A829C 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB360 000A82A0 38 A0 00 01 */ li r5, 1 @@ -15484,14 +15484,14 @@ lbl_800AB3D4: /* 800AB3E4 000A8324 60 00 00 01 */ ori r0, r0, 1 /* 800AB3E8 000A8328 90 1E 0F B8 */ stw r0, 0xfb8(r30) lbl_800AB3EC: -/* 800AB3EC 000A832C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB3F0 000A8330 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB3EC 000A832C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB3F0 000A8330 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB3F4 000A8334 3B A3 23 3C */ addi r29, r3, 0x233c /* 800AB3F8 000A8338 7F A3 EB 78 */ mr r3, r29 /* 800AB3FC 000A833C 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB400 000A8340 48 1B 97 A9 */ bl cCcS_NS_Set -/* 800AB404 000A8344 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB408 000A8348 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB404 000A8344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB408 000A8348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB40C 000A834C 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB410 000A8350 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB414 000A8354 38 A0 00 01 */ li r5, 1 @@ -15643,13 +15643,13 @@ lbl_800AB5D0: /* 800AB638 000A8578 D0 1E 10 40 */ stfs f0, 0x1040(r30) /* 800AB63C 000A857C C0 01 00 E0 */ lfs f0, 0xe0(r1) /* 800AB640 000A8580 D0 1E 10 44 */ stfs f0, 0x1044(r30) -/* 800AB644 000A8584 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB648 000A8588 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB644 000A8584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB648 000A8588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB64C 000A858C 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB650 000A8590 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB654 000A8594 48 1B 95 55 */ bl cCcS_NS_Set -/* 800AB658 000A8598 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB65C 000A859C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB658 000A8598 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB65C 000A859C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB660 000A85A0 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB664 000A85A4 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB668 000A85A8 38 A0 00 01 */ li r5, 1 @@ -15691,13 +15691,13 @@ lbl_800AB6D0: /* 800AB6F0 000A8630 38 7E 12 14 */ addi r3, r30, 0x1214 /* 800AB6F4 000A8634 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800AB6F8 000A8638 48 1C 3A E5 */ bl cM3dGCyl_NS_SetC -/* 800AB6FC 000A863C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB700 000A8640 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB6FC 000A863C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB700 000A8640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB704 000A8644 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB708 000A8648 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AB70C 000A864C 48 1B 94 9D */ bl cCcS_NS_Set -/* 800AB710 000A8650 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB714 000A8654 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB710 000A8650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB714 000A8654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB718 000A8658 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB71C 000A865C 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AB720 000A8660 38 A0 00 01 */ li r5, 1 @@ -15722,8 +15722,8 @@ lbl_800AB734: /* 800AB768 000A86A8 38 7E 10 F0 */ addi r3, r30, 0x10f0 /* 800AB76C 000A86AC 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800AB770 000A86B0 4B FD 91 99 */ bl dCcD_Cyl_NS_StartCAt -/* 800AB774 000A86B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB778 000A86B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB774 000A86B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB778 000A86B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB77C 000A86BC 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB780 000A86C0 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AB784 000A86C4 48 1B 94 25 */ bl cCcS_NS_Set @@ -15755,8 +15755,8 @@ lbl_800AB7C4: /* 800AB7E0 000A8720 38 7E 10 F0 */ addi r3, r30, 0x10f0 /* 800AB7E4 000A8724 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800AB7E8 000A8728 4B FD 91 6D */ bl dCcD_Cyl_NS_MoveCAt -/* 800AB7EC 000A872C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AB7F0 000A8730 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AB7EC 000A872C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AB7F0 000A8730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB7F4 000A8734 38 63 23 3C */ addi r3, r3, 0x233c /* 800AB7F8 000A8738 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AB7FC 000A873C 48 1B 93 AD */ bl cCcS_NS_Set @@ -16448,14 +16448,14 @@ lbl_800AC198: /* 800AC1A0 000A90E0 7C 03 02 14 */ add r0, r3, r0 /* 800AC1A4 000A90E4 B0 1E 30 6C */ sth r0, 0x306c(r30) lbl_800AC1A8: -/* 800AC1A8 000A90E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AC1AC 000A90EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AC1A8 000A90E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AC1AC 000A90EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AC1B0 000A90F0 3B A3 23 3C */ addi r29, r3, 0x233c /* 800AC1B4 000A90F4 7F A3 EB 78 */ mr r3, r29 /* 800AC1B8 000A90F8 38 9E 08 50 */ addi r4, r30, 0x850 /* 800AC1BC 000A90FC 48 1B 89 ED */ bl cCcS_NS_Set -/* 800AC1C0 000A9100 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AC1C4 000A9104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AC1C0 000A9100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AC1C4 000A9104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AC1C8 000A9108 3B 83 4B 88 */ addi r28, r3, 0x4b88 /* 800AC1CC 000A910C 7F 83 E3 78 */ mr r3, r28 /* 800AC1D0 000A9110 38 9E 08 50 */ addi r4, r30, 0x850 @@ -19298,8 +19298,8 @@ lbl_800AE908: /* 800AE958 000AB898 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AE95C 000AB89C D0 01 00 40 */ stfs f0, 0x40(r1) /* 800AE960 000AB8A0 D0 21 00 44 */ stfs f1, 0x44(r1) -/* 800AE964 000AB8A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AE968 000AB8A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AE964 000AB8A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AE968 000AB8A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AE96C 000AB8AC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800AE970 000AB8B0 38 80 00 01 */ li r4, 1 /* 800AE974 000AB8B4 38 A0 00 0F */ li r5, 0xf @@ -19327,8 +19327,8 @@ lbl_800AE984: /* 800AE9C8 000AB908 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AE9CC 000AB90C D0 01 00 34 */ stfs f0, 0x34(r1) /* 800AE9D0 000AB910 D0 21 00 38 */ stfs f1, 0x38(r1) -/* 800AE9D4 000AB914 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AE9D8 000AB918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AE9D4 000AB914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AE9D8 000AB918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AE9DC 000AB91C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800AE9E0 000AB920 38 80 00 01 */ li r4, 1 /* 800AE9E4 000AB924 38 A0 00 0F */ li r5, 0xf @@ -19828,8 +19828,8 @@ lbl_800AF070: /* 800AF0AC 000ABFEC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AF0B0 000ABFF0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800AF0B4 000ABFF4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800AF0B8 000ABFF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AF0BC 000ABFFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AF0B8 000ABFF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AF0BC 000ABFFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AF0C0 000AC000 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800AF0C4 000AC004 38 80 00 01 */ li r4, 1 /* 800AF0C8 000AC008 38 A0 00 0F */ li r5, 0xf @@ -20070,8 +20070,8 @@ lbl_800AF3F4: /* 800AF430 000AC370 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AF434 000AC374 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800AF438 000AC378 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800AF43C 000AC37C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AF440 000AC380 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AF43C 000AC37C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AF440 000AC380 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AF444 000AC384 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800AF448 000AC388 38 80 00 01 */ li r4, 1 /* 800AF44C 000AC38C 38 A0 00 0F */ li r5, 0xf @@ -20414,8 +20414,8 @@ lbl_800AF8EC: /* 800AF8EC 000AC82C A0 1D 06 04 */ lhz r0, 0x604(r29) /* 800AF8F0 000AC830 2C 00 00 00 */ cmpwi r0, 0 /* 800AF8F4 000AC834 40 82 00 18 */ bne lbl_800AF90C -/* 800AF8F8 000AC838 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800AF8FC 000AC83C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800AF8F8 000AC838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800AF8FC 000AC83C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AF900 000AC840 A0 03 00 02 */ lhz r0, 2(r3) /* 800AF904 000AC844 28 00 00 04 */ cmplwi r0, 4 /* 800AF908 000AC848 40 81 00 10 */ ble lbl_800AF918 @@ -20979,8 +20979,8 @@ daAlink_c_NS_getGroundAngle: /* 800B00A8 000ACFE8 48 2B 21 35 */ bl _savegpr_29 /* 800B00AC 000ACFEC 7C 9D 23 78 */ mr r29, r4 /* 800B00B0 000ACFF0 7C BE 2B 78 */ mr r30, r5 -/* 800B00B4 000ACFF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B00B8 000ACFF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B00B4 000ACFF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B00B8 000ACFF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B00BC 000ACFFC 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800B00C0 000AD000 7F E3 FB 78 */ mr r3, r31 /* 800B00C4 000AD004 4B FC 45 9D */ bl cBgS_NS_ChkPolySafe @@ -21035,8 +21035,8 @@ daAlink_c_NS_getRoofAngle: /* 800B016C 000AD0AC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800B0170 000AD0B0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800B0174 000AD0B4 90 01 00 18 */ stw r0, 0x18(r1) -/* 800B0178 000AD0B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B017C 000AD0BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B0178 000AD0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B017C 000AD0BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B0180 000AD0C0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800B0184 000AD0C4 7F E3 FB 78 */ mr r3, r31 /* 800B0188 000AD0C8 38 A1 00 08 */ addi r5, r1, 8 @@ -21196,8 +21196,8 @@ lbl_800B0364: /* 800B03BC 000AD2FC A8 18 30 0C */ lha r0, 0x300c(r24) /* 800B03C0 000AD300 2C 00 00 04 */ cmpwi r0, 4 /* 800B03C4 000AD304 40 82 00 80 */ bne lbl_800B0444 -/* 800B03C8 000AD308 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B03CC 000AD30C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B03C8 000AD308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B03CC 000AD30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B03D0 000AD310 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 800B03D4 000AD314 7F 23 CB 78 */ mr r3, r25 /* 800B03D8 000AD318 38 98 1E 2C */ addi r4, r24, 0x1e2c @@ -21269,8 +21269,8 @@ lbl_800B0494: lbl_800B04D4: /* 800B04D4 000AD414 3B 20 00 00 */ li r25, 0 /* 800B04D8 000AD418 3B 80 00 00 */ li r28, 0 -/* 800B04DC 000AD41C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B04E0 000AD420 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B04DC 000AD41C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B04E0 000AD420 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B04E4 000AD424 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800B04E8 000AD428 48 00 01 40 */ b lbl_800B0628 lbl_800B04EC: @@ -22390,8 +22390,8 @@ daAlink_c_NS_setWaterY: /* 800B14D4 000AE414 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800B14D8 000AE418 60 00 00 80 */ ori r0, r0, 0x80 /* 800B14DC 000AE41C 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800B14E0 000AE420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B14E4 000AE424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B14E0 000AE420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B14E4 000AE424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B14E8 000AE428 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B14EC 000AE42C 38 9F 1A F0 */ addi r4, r31, 0x1af0 /* 800B14F0 000AE430 4B FC 39 61 */ bl dBgS_NS_GetPolyAtt0 @@ -22464,8 +22464,8 @@ lbl_800B15CC: /* 800B15D8 000AE518 41 82 01 1C */ beq lbl_800B16F4 /* 800B15DC 000AE51C C0 0D 87 58 */ lfs f0, lbl_80450CD8-_SDA_BASE_(r13) /* 800B15E0 000AE520 D0 1F 33 B8 */ stfs f0, 0x33b8(r31) -/* 800B15E4 000AE524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B15E8 000AE528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B15E4 000AE524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B15E8 000AE528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B15EC 000AE52C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B15F0 000AE530 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 800B15F4 000AE534 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l @@ -22519,8 +22519,8 @@ lbl_800B16A0: /* 800B16AC 000AE5EC 40 80 00 38 */ bge lbl_800B16E4 /* 800B16B0 000AE5F0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 800B16B4 000AE5F4 7C 09 07 74 */ extsb r9, r0 -/* 800B16B8 000AE5F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B16BC 000AE5FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B16B8 000AE5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B16BC 000AE5FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B16C0 000AE600 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800B16C4 000AE604 38 9F 31 A8 */ addi r4, r31, 0x31a8 /* 800B16C8 000AE608 3C A0 80 3F */ lis r5, lbl_803F1D80@ha @@ -23205,8 +23205,8 @@ daAlink_c_NS_getSlidePolygon: /* 800B2018 000AEF58 88 1D 2F A8 */ lbz r0, 0x2fa8(r29) /* 800B201C 000AEF5C 28 00 00 06 */ cmplwi r0, 6 /* 800B2020 000AEF60 41 82 01 B0 */ beq lbl_800B21D0 -/* 800B2024 000AEF64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B2028 000AEF68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2024 000AEF64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B2028 000AEF68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B202C 000AEF6C 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800B2030 000AEF70 7F 83 E3 78 */ mr r3, r28 /* 800B2034 000AEF74 38 9D 1A 60 */ addi r4, r29, 0x1a60 @@ -23291,8 +23291,8 @@ lbl_800B2154: /* 800B2154 000AF094 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800B2158 000AF098 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B215C 000AF09C 40 82 00 74 */ bne lbl_800B21D0 -/* 800B2160 000AF0A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B2164 000AF0A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2160 000AF0A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B2164 000AF0A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2168 000AF0A8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800B216C 000AF0AC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 800B2170 000AF0B0 40 82 00 60 */ bne lbl_800B21D0 @@ -23433,8 +23433,8 @@ lbl_800B234C: /* 800B235C 000AF29C 4E 80 04 21 */ bctrl /* 800B2360 000AF2A0 28 03 00 00 */ cmplwi r3, 0 /* 800B2364 000AF2A4 41 82 00 28 */ beq lbl_800B238C -/* 800B2368 000AF2A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B236C 000AF2AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2368 000AF2A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B236C 000AF2AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2370 000AF2B0 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800B2374 000AF2B4 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800B2378 000AF2B8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) @@ -23787,8 +23787,8 @@ lbl_800B27FC: /* 800B282C 000AF76C 28 03 00 00 */ cmplwi r3, 0 /* 800B2830 000AF770 41 82 00 24 */ beq lbl_800B2854 /* 800B2834 000AF774 A8 1E 06 06 */ lha r0, 0x606(r30) -/* 800B2838 000AF778 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B283C 000AF77C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2838 000AF778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B283C 000AF77C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2840 000AF780 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800B2844 000AF784 B0 03 16 FC */ sth r0, 0x16fc(r3) /* 800B2848 000AF788 48 00 00 0C */ b lbl_800B2854 @@ -23840,8 +23840,8 @@ lbl_800B28BC: /* 800B28E4 000AF824 D0 1E 33 AC */ stfs f0, 0x33ac(r30) /* 800B28E8 000AF828 38 00 00 00 */ li r0, 0 /* 800B28EC 000AF82C B0 1E 2F E0 */ sth r0, 0x2fe0(r30) -/* 800B28F0 000AF830 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B28F4 000AF834 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B28F0 000AF830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B28F4 000AF834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B28F8 000AF838 98 03 5E B8 */ stb r0, 0x5eb8(r3) /* 800B28FC 000AF83C 80 1E 05 78 */ lwz r0, 0x578(r30) /* 800B2900 000AF840 60 00 00 80 */ ori r0, r0, 0x80 @@ -23912,8 +23912,8 @@ lbl_800B29CC: lbl_800B29EC: /* 800B29EC 000AF92C C0 1E 33 A8 */ lfs f0, 0x33a8(r30) /* 800B29F0 000AF930 D0 1E 33 AC */ stfs f0, 0x33ac(r30) -/* 800B29F4 000AF934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B29F8 000AF938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B29F4 000AF934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B29F8 000AF938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B29FC 000AF93C 80 1E 31 7C */ lwz r0, 0x317c(r30) /* 800B2A00 000AF940 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800B2A04 000AF944 7C 63 02 14 */ add r3, r3, r0 @@ -24240,8 +24240,8 @@ lbl_800B2E5C: /* 800B2E74 000AFDB4 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 800B2E78 000AFDB8 90 1E 05 78 */ stw r0, 0x578(r30) /* 800B2E7C 000AFDBC 38 00 00 01 */ li r0, 1 -/* 800B2E80 000AFDC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B2E84 000AFDC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2E80 000AFDC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B2E84 000AFDC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2E88 000AFDC8 98 03 5E B8 */ stb r0, 0x5eb8(r3) lbl_800B2E8C: /* 800B2E8C 000AFDCC 39 61 00 20 */ addi r11, r1, 0x20 @@ -24287,8 +24287,8 @@ lbl_800B2F0C: /* 800B2F1C 000AFE5C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B2F20 000AFE60 40 81 00 28 */ ble lbl_800B2F48 lbl_800B2F24: -/* 800B2F24 000AFE64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B2F28 000AFE68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2F24 000AFE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B2F28 000AFE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2F2C 000AFE6C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800B2F30 000AFE70 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 /* 800B2F34 000AFE74 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -24300,8 +24300,8 @@ lbl_800B2F48: /* 800B2F48 000AFE88 80 1F 28 38 */ lwz r0, 0x2838(r31) /* 800B2F4C 000AFE8C 28 00 00 00 */ cmplwi r0, 0 /* 800B2F50 000AFE90 40 82 00 18 */ bne lbl_800B2F68 -/* 800B2F54 000AFE94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B2F58 000AFE98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B2F54 000AFE94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B2F58 000AFE98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B2F5C 000AFE9C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800B2F60 000AFEA0 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 /* 800B2F64 000AFEA4 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -24358,8 +24358,8 @@ lbl_800B2FF8: /* 800B3014 000AFF54 90 1F 27 F4 */ stw r0, 0x27f4(r31) /* 800B3018 000AFF58 48 00 01 20 */ b lbl_800B3138 lbl_800B301C: -/* 800B301C 000AFF5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3020 000AFF60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B301C 000AFF5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3020 000AFF60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3024 000AFF64 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800B3028 000AFF68 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 800B302C 000AFF6C 41 82 00 18 */ beq lbl_800B3044 @@ -24505,8 +24505,8 @@ lbl_800B3204: .global daAlink_c_NS_setRStatus daAlink_c_NS_setRStatus: -/* 800B3220 000B0160 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3224 000B0164 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3220 000B0160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3224 000B0164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3228 000B0168 98 83 5E 1C */ stb r4, 0x5e1c(r3) /* 800B322C 000B016C 38 00 00 00 */ li r0, 0 /* 800B3230 000B0170 98 03 5E 42 */ stb r0, 0x5e42(r3) @@ -24514,8 +24514,8 @@ daAlink_c_NS_setRStatus: .global daAlink_c_NS_setRStatusEmphasys daAlink_c_NS_setRStatusEmphasys: -/* 800B3238 000B0178 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B323C 000B017C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3238 000B0178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B323C 000B017C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3240 000B0180 98 83 5E 1C */ stb r4, 0x5e1c(r3) /* 800B3244 000B0184 38 00 00 02 */ li r0, 2 /* 800B3248 000B0188 98 03 5E 42 */ stb r0, 0x5e42(r3) @@ -24523,8 +24523,8 @@ daAlink_c_NS_setRStatusEmphasys: .global daAlink_c_NS_setDoStatus daAlink_c_NS_setDoStatus: -/* 800B3250 000B0190 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3254 000B0194 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3250 000B0190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3254 000B0194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3258 000B0198 98 83 5E 24 */ stb r4, 0x5e24(r3) /* 800B325C 000B019C 38 00 00 00 */ li r0, 0 /* 800B3260 000B01A0 98 03 5E 4A */ stb r0, 0x5e4a(r3) @@ -24532,8 +24532,8 @@ daAlink_c_NS_setDoStatus: .global daAlink_c_NS_setDoStatusEmphasys daAlink_c_NS_setDoStatusEmphasys: -/* 800B3268 000B01A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B326C 000B01AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3268 000B01A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B326C 000B01AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3270 000B01B0 98 83 5E 24 */ stb r4, 0x5e24(r3) /* 800B3274 000B01B4 38 00 00 02 */ li r0, 2 /* 800B3278 000B01B8 98 03 5E 4A */ stb r0, 0x5e4a(r3) @@ -24541,8 +24541,8 @@ daAlink_c_NS_setDoStatusEmphasys: .global daAlink_c_NS_setDoStatusContinuation daAlink_c_NS_setDoStatusContinuation: -/* 800B3280 000B01C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3284 000B01C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3280 000B01C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3284 000B01C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3288 000B01C8 98 83 5E 24 */ stb r4, 0x5e24(r3) /* 800B328C 000B01CC 38 00 00 04 */ li r0, 4 /* 800B3290 000B01D0 98 03 5E 4A */ stb r0, 0x5e4a(r3) @@ -24550,8 +24550,8 @@ daAlink_c_NS_setDoStatusContinuation: .global daAlink_c_NS_setBStatus daAlink_c_NS_setBStatus: -/* 800B3298 000B01D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B329C 000B01DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3298 000B01D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B329C 000B01DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B32A0 000B01E0 98 83 5E 1D */ stb r4, 0x5e1d(r3) /* 800B32A4 000B01E4 38 00 00 00 */ li r0, 0 /* 800B32A8 000B01E8 98 03 5E 43 */ stb r0, 0x5e43(r3) @@ -24618,8 +24618,8 @@ daAlink_c_NS_setTiredVoice: /* 800B3374 000B02B4 48 27 50 B9 */ bl J3DFrameCtrl_NS_checkPass /* 800B3378 000B02B8 2C 03 00 00 */ cmpwi r3, 0 /* 800B337C 000B02BC 41 82 00 54 */ beq lbl_800B33D0 -/* 800B3380 000B02C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3384 000B02C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3380 000B02C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3384 000B02C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3388 000B02C8 A0 03 00 02 */ lhz r0, 2(r3) /* 800B338C 000B02CC 28 00 00 02 */ cmplwi r0, 2 /* 800B3390 000B02D0 41 81 00 24 */ bgt lbl_800B33B4 @@ -24677,8 +24677,8 @@ lbl_800B342C: /* 800B3448 000B0388 A0 1F 06 04 */ lhz r0, 0x604(r31) /* 800B344C 000B038C 2C 00 00 00 */ cmpwi r0, 0 /* 800B3450 000B0390 40 82 00 18 */ bne lbl_800B3468 -/* 800B3454 000B0394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3458 000B0398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3454 000B0394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3458 000B0398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B345C 000B039C A0 03 00 02 */ lhz r0, 2(r3) /* 800B3460 000B03A0 28 00 00 04 */ cmplwi r0, 4 /* 800B3464 000B03A4 40 81 00 10 */ ble lbl_800B3474 @@ -25332,8 +25332,8 @@ lbl_800B3D1C: /* 800B3D40 000B0C80 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B3D44 000B0C84 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B3D48 000B0C88 40 80 00 28 */ bge lbl_800B3D70 -/* 800B3D4C 000B0C8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B3D50 000B0C90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B3D4C 000B0C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B3D50 000B0C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3D54 000B0C94 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B3D58 000B0C98 38 9E 1E 4C */ addi r4, r30, 0x1e4c /* 800B3D5C 000B0C9C 4B FC 09 05 */ bl cBgS_NS_ChkPolySafe @@ -26206,8 +26206,8 @@ daAlink_c_NS_notTalk: /* 800B495C 000B189C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B4960 000B18A0 93 C1 00 08 */ stw r30, 8(r1) /* 800B4964 000B18A4 7C 7E 1B 78 */ mr r30, r3 -/* 800B4968 000B18A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B496C 000B18AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B4968 000B18A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B496C 000B18AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B4970 000B18B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B4974 000B18B4 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 800B4978 000B18B8 4B FB FC E9 */ bl cBgS_NS_ChkPolySafe @@ -26388,8 +26388,8 @@ lbl_800B4BB8: lbl_800B4BBC: /* 800B4BBC 000B1AFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4BC0 000B1B00 40 82 06 A4 */ bne lbl_800B5264 -/* 800B4BC4 000B1B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B4BC8 000B1B08 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800B4BC4 000B1B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B4BC8 000B1B08 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800B4BCC 000B1B0C 88 1E 5E 24 */ lbz r0, 0x5e24(r30) /* 800B4BD0 000B1B10 28 00 00 00 */ cmplwi r0, 0 /* 800B4BD4 000B1B14 40 82 06 90 */ bne lbl_800B5264 @@ -27433,8 +27433,8 @@ lbl_800B5A64: /* 800B5A68 000B29A8 48 03 AF 19 */ bl daAlink_c_NS_procHorseWaitInit /* 800B5A6C 000B29AC 48 00 01 40 */ b lbl_800B5BAC lbl_800B5A70: -/* 800B5A70 000B29B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B5A74 000B29B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B5A70 000B29B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B5A74 000B29B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B5A78 000B29B8 80 63 5F 1C */ lwz r3, 0x5f1c(r3) /* 800B5A7C 000B29BC 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf /* 800B5A80 000B29C0 41 82 00 1C */ beq lbl_800B5A9C @@ -27594,8 +27594,8 @@ lbl_800B5C90: /* 800B5C98 000B2BD8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B5C9C 000B2BDC D0 01 00 0C */ stfs f0, 0xc(r1) /* 800B5CA0 000B2BE0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800B5CA4 000B2BE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B5CA8 000B2BE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B5CA4 000B2BE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B5CA8 000B2BE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B5CAC 000B2BEC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B5CB0 000B2BF0 38 A0 00 0F */ li r5, 0xf /* 800B5CB4 000B2BF4 38 C1 00 08 */ addi r6, r1, 8 @@ -27755,8 +27755,8 @@ lbl_800B5E98: /* 800B5EEC 000B2E2C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B5EF0 000B2E30 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800B5EF4 000B2E34 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800B5EF8 000B2E38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B5EFC 000B2E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B5EF8 000B2E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B5EFC 000B2E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B5F00 000B2E40 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B5F04 000B2E44 38 80 00 01 */ li r4, 1 /* 800B5F08 000B2E48 38 A0 00 0F */ li r5, 0xf @@ -28059,8 +28059,8 @@ lbl_800B62C0: /* 800B6338 000B3278 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800B633C 000B327C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800B6340 000B3280 90 01 00 44 */ stw r0, 0x44(r1) -/* 800B6344 000B3284 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6348 000B3288 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6344 000B3284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6348 000B3288 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B634C 000B328C 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800B6350 000B3290 7F A3 EB 78 */ mr r3, r29 /* 800B6354 000B3294 38 9A 1D 08 */ addi r4, r26, 0x1d08 @@ -28170,8 +28170,8 @@ lbl_800B64C4: lbl_800B64CC: /* 800B64CC 000B340C C3 62 93 B4 */ lfs f27, lbl_80452DB4-_SDA2_BASE_(r2) lbl_800B64D0: -/* 800B64D0 000B3410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B64D4 000B3414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B64D0 000B3410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B64D4 000B3414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B64D8 000B3418 A0 03 00 02 */ lhz r0, 2(r3) /* 800B64DC 000B341C 28 00 00 00 */ cmplwi r0, 0 /* 800B64E0 000B3420 40 82 00 18 */ bne lbl_800B64F8 @@ -28584,8 +28584,8 @@ lbl_800B6A84: /* 800B6AA4 000B39E4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B6AA8 000B39E8 D0 01 00 30 */ stfs f0, 0x30(r1) /* 800B6AAC 000B39EC D0 21 00 34 */ stfs f1, 0x34(r1) -/* 800B6AB0 000B39F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6AB4 000B39F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6AB0 000B39F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6AB4 000B39F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6AB8 000B39F8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B6ABC 000B39FC 38 80 00 02 */ li r4, 2 /* 800B6AC0 000B3A00 38 A0 00 01 */ li r5, 1 @@ -28610,8 +28610,8 @@ lbl_800B6AF4: /* 800B6B04 000B3A44 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B6B08 000B3A48 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800B6B0C 000B3A4C D0 21 00 28 */ stfs f1, 0x28(r1) -/* 800B6B10 000B3A50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6B14 000B3A54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6B10 000B3A50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6B14 000B3A54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6B18 000B3A58 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B6B1C 000B3A5C 38 80 00 02 */ li r4, 2 /* 800B6B20 000B3A60 38 A0 00 01 */ li r5, 1 @@ -28635,8 +28635,8 @@ lbl_800B6B38: /* 800B6B64 000B3AA4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B6B68 000B3AA8 D0 01 00 18 */ stfs f0, 0x18(r1) /* 800B6B6C 000B3AAC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 800B6B70 000B3AB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6B74 000B3AB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6B70 000B3AB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6B74 000B3AB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6B78 000B3AB8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B6B7C 000B3ABC 38 80 00 02 */ li r4, 2 /* 800B6B80 000B3AC0 38 A0 00 01 */ li r5, 1 @@ -28667,8 +28667,8 @@ lbl_800B6BBC: /* 800B6BDC 000B3B1C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B6BE0 000B3B20 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800B6BE4 000B3B24 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800B6BE8 000B3B28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6BEC 000B3B2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6BE8 000B3B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6BEC 000B3B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6BF0 000B3B30 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B6BF4 000B3B34 38 80 00 02 */ li r4, 2 /* 800B6BF8 000B3B38 38 A0 00 01 */ li r5, 1 @@ -28758,8 +28758,8 @@ lbl_800B6CE4: lbl_800B6D28: /* 800B6D28 000B3C68 28 1D 00 00 */ cmplwi r29, 0 /* 800B6D2C 000B3C6C 41 82 00 A0 */ beq lbl_800B6DCC -/* 800B6D30 000B3C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6D34 000B3C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6D30 000B3C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6D34 000B3C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6D38 000B3C78 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 800B6D3C 000B3C7C C0 24 04 D4 */ lfs f1, 0x4d4(r4) /* 800B6D40 000B3C80 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) @@ -28782,8 +28782,8 @@ lbl_800B6D28: /* 800B6D84 000B3CC4 4B F7 45 25 */ bl dComIfGp_checkItemGet__FUci /* 800B6D88 000B3CC8 2C 03 00 00 */ cmpwi r3, 0 /* 800B6D8C 000B3CCC 41 82 00 1C */ beq lbl_800B6DA8 -/* 800B6D90 000B3CD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B6D94 000B3CD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B6D90 000B3CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B6D94 000B3CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B6D98 000B3CD8 A0 03 00 08 */ lhz r0, 8(r3) /* 800B6D9C 000B3CDC 28 00 00 00 */ cmplwi r0, 0 /* 800B6DA0 000B3CE0 41 82 00 08 */ beq lbl_800B6DA8 @@ -29075,8 +29075,8 @@ lbl_800B7154: .global daAlink_c_NS_setFastShotTimer daAlink_c_NS_setFastShotTimer: -/* 800B7168 000B40A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800B716C 000B40AC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800B7168 000B40A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800B716C 000B40AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800B7170 000B40B0 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800B7174 000B40B4 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800B7178 000B40B8 4C 82 00 20 */ bnelr @@ -29103,8 +29103,8 @@ lbl_800B71BC: /* 800B71BC 000B40FC 80 03 05 7C */ lwz r0, 0x57c(r3) /* 800B71C0 000B4100 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 800B71C4 000B4104 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800B71C8 000B4108 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B71CC 000B410C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B71C8 000B4108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B71CC 000B410C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B71D0 000B4110 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B71D4 000B4114 38 80 00 1F */ li r4, 0x1f /* 800B71D8 000B4118 4B FB 8B BD */ bl dVibration_c_NS_StopQuake @@ -29121,8 +29121,8 @@ daAlink_c_NS_cancelUpperItemReadyAnime: /* 800B71F4 000B4134 90 01 00 24 */ stw r0, 0x24(r1) /* 800B71F8 000B4138 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800B71FC 000B413C 7C 7F 1B 78 */ mr r31, r3 -/* 800B7200 000B4140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7204 000B4144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7200 000B4140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7204 000B4144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7208 000B4148 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B720C 000B414C 28 00 00 12 */ cmplwi r0, 0x12 /* 800B7210 000B4150 41 82 00 0C */ beq lbl_800B721C @@ -29592,8 +29592,8 @@ lbl_800B784C: /* 800B785C 000B479C 7F A4 EB 78 */ mr r4, r29 /* 800B7860 000B47A0 4B FF B9 F1 */ bl daAlink_c_NS_setDoStatus /* 800B7864 000B47A4 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 800B7868 000B47A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B786C 000B47AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7868 000B47A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B786C 000B47AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7870 000B47B0 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B7874 000B47B4 7C 04 00 40 */ cmplw r4, r0 /* 800B7878 000B47B8 40 82 00 10 */ bne lbl_800B7888 @@ -29602,8 +29602,8 @@ lbl_800B784C: /* 800B7884 000B47C4 40 82 00 30 */ bne lbl_800B78B4 lbl_800B7888: /* 800B7888 000B47C8 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 800B788C 000B47CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7890 000B47D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B788C 000B47CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7890 000B47D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7894 000B47D4 88 03 5E 1D */ lbz r0, 0x5e1d(r3) /* 800B7898 000B47D8 7C 04 00 40 */ cmplw r4, r0 /* 800B789C 000B47DC 40 82 02 C4 */ bne lbl_800B7B60 @@ -29867,8 +29867,8 @@ daAlink_c_NS_orderTalk: /* 800B7C20 000B4B60 38 60 00 00 */ li r3, 0 /* 800B7C24 000B4B64 48 00 01 10 */ b lbl_800B7D34 lbl_800B7C28: -/* 800B7C28 000B4B68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7C2C 000B4B6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7C28 000B4B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7C2C 000B4B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7C30 000B4B70 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B7C34 000B4B74 28 00 00 1C */ cmplwi r0, 0x1c /* 800B7C38 000B4B78 41 82 00 2C */ beq lbl_800B7C64 @@ -29960,8 +29960,8 @@ daAlink_searchBouDoor: /* 800B7D6C 000B4CAC 88 1F 0F 80 */ lbz r0, 0xf80(r31) /* 800B7D70 000B4CB0 28 00 00 04 */ cmplwi r0, 4 /* 800B7D74 000B4CB4 40 82 01 E4 */ bne lbl_800B7F58 -/* 800B7D78 000B4CB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7D7C 000B4CBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7D78 000B4CB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7D7C 000B4CBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7D80 000B4CC0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 800B7D84 000B4CC4 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) /* 800B7D88 000B4CC8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) @@ -30065,14 +30065,14 @@ lbl_800B7EA0: /* 800B7EEC 000B4E2C 54 00 10 3A */ slwi r0, r0, 2 /* 800B7EF0 000B4E30 7C 04 00 2E */ lwzx r0, r4, r0 /* 800B7EF4 000B4E34 90 1F 01 00 */ stw r0, 0x100(r31) -/* 800B7EF8 000B4E38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7EFC 000B4E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7EF8 000B4E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7EFC 000B4E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7F00 000B4E40 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B7F04 000B4E44 80 9F 01 00 */ lwz r4, 0x100(r31) /* 800B7F08 000B4E48 4B F8 E8 F9 */ bl dEvent_manager_c_NS_setObjectArchive lbl_800B7F0C: -/* 800B7F0C 000B4E4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B7F10 000B4E50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B7F0C 000B4E4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B7F10 000B4E50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7F14 000B4E54 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B7F18 000B4E58 7F E4 FB 78 */ mr r4, r31 /* 800B7F1C 000B4E5C 80 BF 05 70 */ lwz r5, 0x570(r31) @@ -30119,8 +30119,8 @@ daAlink_searchKolin: /* 800B7FA8 000B4EE8 88 1E 0F 84 */ lbz r0, 0xf84(r30) /* 800B7FAC 000B4EEC 28 00 00 0B */ cmplwi r0, 0xb /* 800B7FB0 000B4EF0 40 82 00 E4 */ bne lbl_800B8094 -/* 800B7FB4 000B4EF4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800B7FB8 000B4EF8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800B7FB4 000B4EF4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800B7FB8 000B4EF8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800B7FBC 000B4EFC 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 800B7FC0 000B4F00 4B F6 27 51 */ bl fopAcM_searchActorAngleY /* 800B7FC4 000B4F04 38 80 00 03 */ li r4, 3 @@ -30152,14 +30152,14 @@ lbl_800B7FDC: /* 800B8028 000B4F68 54 00 10 3A */ slwi r0, r0, 2 /* 800B802C 000B4F6C 7C 04 00 2E */ lwzx r0, r4, r0 /* 800B8030 000B4F70 90 1E 01 00 */ stw r0, 0x100(r30) -/* 800B8034 000B4F74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8038 000B4F78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8034 000B4F74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8038 000B4F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B803C 000B4F7C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B8040 000B4F80 80 9E 01 00 */ lwz r4, 0x100(r30) /* 800B8044 000B4F84 4B F8 E7 BD */ bl dEvent_manager_c_NS_setObjectArchive lbl_800B8048: -/* 800B8048 000B4F88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B804C 000B4F8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8048 000B4F88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B804C 000B4F8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8050 000B4F90 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B8054 000B4F94 7F C4 F3 78 */ mr r4, r30 /* 800B8058 000B4F98 80 BE 05 70 */ lwz r5, 0x570(r30) @@ -30230,8 +30230,8 @@ lbl_800B8134: /* 800B8134 000B5074 80 1F 28 38 */ lwz r0, 0x2838(r31) /* 800B8138 000B5078 28 00 00 00 */ cmplwi r0, 0 /* 800B813C 000B507C 40 82 00 E4 */ bne lbl_800B8220 -/* 800B8140 000B5080 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8144 000B5084 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8140 000B5080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8144 000B5084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8148 000B5088 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800B814C 000B508C 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 800B8150 000B5090 40 82 00 D0 */ bne lbl_800B8220 @@ -30282,8 +30282,8 @@ lbl_800B81D0: /* 800B81FC 000B513C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8200 000B5140 41 82 00 20 */ beq lbl_800B8220 lbl_800B8204: -/* 800B8204 000B5144 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8208 000B5148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8204 000B5144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8208 000B5148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B820C 000B514C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800B8210 000B5150 38 80 61 40 */ li r4, 0x6140 /* 800B8214 000B5154 4B F7 C7 A9 */ bl isEventBit__11dSv_event_cCFUs @@ -30296,16 +30296,16 @@ lbl_800B8228: /* 800B8228 000B5168 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800B822C 000B516C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800B8230 000B5170 41 82 01 28 */ beq lbl_800B8358 -/* 800B8234 000B5174 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8238 000B5178 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800B8234 000B5174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8238 000B5178 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800B823C 000B517C 38 64 5B 48 */ addi r3, r4, 0x5b48 /* 800B8240 000B5180 80 84 5B 50 */ lwz r4, 0x5b50(r4) /* 800B8244 000B5184 4B FB B6 89 */ bl dAttHint_c_NS_convPId /* 800B8248 000B5188 7C 7E 1B 79 */ or. r30, r3, r3 /* 800B824C 000B518C 41 82 00 1C */ beq lbl_800B8268 /* 800B8250 000B5190 38 00 00 08 */ li r0, 8 -/* 800B8254 000B5194 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8258 000B5198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8254 000B5194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8258 000B5198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B825C 000B519C 98 03 5E 33 */ stb r0, 0x5e33(r3) /* 800B8260 000B51A0 38 00 00 00 */ li r0, 0 /* 800B8264 000B51A4 98 03 5E 4E */ stb r0, 0x5e4e(r3) @@ -30346,8 +30346,8 @@ lbl_800B82E4: /* 800B82E4 000B5224 80 1F 28 00 */ lwz r0, 0x2800(r31) /* 800B82E8 000B5228 28 00 00 00 */ cmplwi r0, 0 /* 800B82EC 000B522C 41 82 00 38 */ beq lbl_800B8324 -/* 800B82F0 000B5230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B82F4 000B5234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B82F0 000B5230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B82F4 000B5234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B82F8 000B5238 90 03 5E F0 */ stw r0, 0x5ef0(r3) /* 800B82FC 000B523C 38 00 00 00 */ li r0, 0 /* 800B8300 000B5240 90 03 5E F4 */ stw r0, 0x5ef4(r3) @@ -30435,8 +30435,8 @@ lbl_800B841C: /* 800B841C 000B535C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800B8420 000B5360 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B8424 000B5364 41 82 04 4C */ beq lbl_800B8870 -/* 800B8428 000B5368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B842C 000B536C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8428 000B5368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B842C 000B536C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8430 000B5370 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B8434 000B5374 28 00 00 89 */ cmplwi r0, 0x89 /* 800B8438 000B5378 40 82 00 14 */ bne lbl_800B844C @@ -30758,8 +30758,8 @@ lbl_800B8870: /* 800B8870 000B57B0 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800B8874 000B57B4 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 /* 800B8878 000B57B8 41 82 00 94 */ beq lbl_800B890C -/* 800B887C 000B57BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8880 000B57C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B887C 000B57BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8880 000B57C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8884 000B57C4 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B8888 000B57C8 28 00 00 91 */ cmplwi r0, 0x91 /* 800B888C 000B57CC 40 82 00 80 */ bne lbl_800B890C @@ -31167,8 +31167,8 @@ lbl_800B8E00: /* 800B8E0C 000B5D4C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800B8E10 000B5D50 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B8E14 000B5D54 41 82 00 8C */ beq lbl_800B8EA0 -/* 800B8E18 000B5D58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8E1C 000B5D5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8E18 000B5D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8E1C 000B5D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8E20 000B5D60 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B8E24 000B5D64 28 00 00 13 */ cmplwi r0, 0x13 /* 800B8E28 000B5D68 40 82 00 14 */ bne lbl_800B8E3C @@ -31187,8 +31187,8 @@ lbl_800B8E54: /* 800B8E54 000B5D94 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800B8E58 000B5D98 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B8E5C 000B5D9C 41 82 00 44 */ beq lbl_800B8EA0 -/* 800B8E60 000B5DA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8E64 000B5DA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8E60 000B5DA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8E64 000B5DA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8E68 000B5DA8 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B8E6C 000B5DAC 28 00 00 2A */ cmplwi r0, 0x2a /* 800B8E70 000B5DB0 40 82 00 30 */ bne lbl_800B8EA0 @@ -31240,8 +31240,8 @@ lbl_800B8F10: /* 800B8F1C 000B5E5C 41 82 00 08 */ beq lbl_800B8F24 /* 800B8F20 000B5E60 48 00 00 D8 */ b lbl_800B8FF8 lbl_800B8F24: -/* 800B8F24 000B5E64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8F28 000B5E68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8F24 000B5E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8F28 000B5E68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8F2C 000B5E6C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800B8F30 000B5E70 38 80 29 08 */ li r4, 0x2908 /* 800B8F34 000B5E74 4B F7 BA 89 */ bl isEventBit__11dSv_event_cCFUs @@ -31264,8 +31264,8 @@ lbl_800B8F4C: /* 800B8F74 000B5EB4 38 03 0C 52 */ addi r0, r3, 0x00070C52@l /* 800B8F78 000B5EB8 7C 80 00 39 */ and. r0, r4, r0 /* 800B8F7C 000B5EBC 40 82 00 78 */ bne lbl_800B8FF4 -/* 800B8F80 000B5EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8F84 000B5EC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8F80 000B5EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8F84 000B5EC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8F88 000B5EC8 88 03 00 15 */ lbz r0, 0x15(r3) /* 800B8F8C 000B5ECC 28 00 00 FF */ cmplwi r0, 0xff /* 800B8F90 000B5ED0 41 82 00 64 */ beq lbl_800B8FF4 @@ -31279,8 +31279,8 @@ lbl_800B8F4C: /* 800B8FB0 000B5EF0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800B8FB4 000B5EF4 41 82 00 40 */ beq lbl_800B8FF4 lbl_800B8FB8: -/* 800B8FB8 000B5EF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B8FBC 000B5EFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B8FB8 000B5EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B8FBC 000B5EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B8FC0 000B5F00 88 03 5E 1C */ lbz r0, 0x5e1c(r3) /* 800B8FC4 000B5F04 28 00 00 00 */ cmplwi r0, 0 /* 800B8FC8 000B5F08 40 82 00 2C */ bne lbl_800B8FF4 @@ -31320,8 +31320,8 @@ daAlink_c_NS_checkMoveDoAction: /* 800B9030 000B5F70 88 03 2F 8D */ lbz r0, 0x2f8d(r3) /* 800B9034 000B5F74 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B9038 000B5F78 41 82 00 F4 */ beq lbl_800B912C -/* 800B903C 000B5F7C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800B9040 000B5F80 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800B903C 000B5F7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800B9040 000B5F80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800B9044 000B5F84 88 04 5E 24 */ lbz r0, 0x5e24(r4) /* 800B9048 000B5F88 28 00 00 19 */ cmplwi r0, 0x19 /* 800B904C 000B5F8C 40 82 00 74 */ bne lbl_800B90C0 @@ -31614,8 +31614,8 @@ daAlink_c_NS_swordEquip: /* 800B9404 000B6344 48 2A 8D D9 */ bl _savegpr_29 /* 800B9408 000B6348 7C 7F 1B 78 */ mr r31, r3 /* 800B940C 000B634C 7C 9D 23 78 */ mr r29, r4 -/* 800B9410 000B6350 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9414 000B6354 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9410 000B6350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9414 000B6354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9418 000B6358 88 03 00 14 */ lbz r0, 0x14(r3) /* 800B941C 000B635C 28 00 00 FF */ cmplwi r0, 0xff /* 800B9420 000B6360 41 82 01 48 */ beq lbl_800B9568 @@ -31689,8 +31689,8 @@ lbl_800B94CC: /* 800B9518 000B6458 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 800B951C 000B645C 7C 00 07 75 */ extsb. r0, r0 /* 800B9520 000B6460 40 82 00 20 */ bne lbl_800B9540 -/* 800B9524 000B6464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9528 000B6468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9524 000B6464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9528 000B6468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B952C 000B646C 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 800B9530 000B6470 7C 00 07 75 */ extsb. r0, r0 /* 800B9534 000B6474 40 82 00 0C */ bne lbl_800B9540 @@ -31785,8 +31785,8 @@ daAlink_c_NS_itemEquip: /* 800B9660 000B65A0 41 82 00 34 */ beq lbl_800B9694 lbl_800B9664: /* 800B9664 000B65A4 B0 83 2F DE */ sth r4, 0x2fde(r3) -/* 800B9668 000B65A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800B966C 000B65AC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800B9668 000B65A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800B966C 000B65AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800B9670 000B65B0 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800B9674 000B65B4 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 /* 800B9678 000B65B8 90 04 5F 18 */ stw r0, 0x5f18(r4) @@ -32027,8 +32027,8 @@ daAlink_c_NS_checkItemChangeFromButton: lbl_800B99AC: /* 800B99AC 000B68EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B99B0 000B68F0 40 82 03 60 */ bne lbl_800B9D10 -/* 800B99B4 000B68F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B99B8 000B68F8 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800B99B4 000B68F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B99B8 000B68F8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800B99BC 000B68FC 88 1F 00 14 */ lbz r0, 0x14(r31) /* 800B99C0 000B6900 28 00 00 FF */ cmplwi r0, 0xff /* 800B99C4 000B6904 41 82 00 88 */ beq lbl_800B9A4C @@ -32127,8 +32127,8 @@ lbl_800B9B10: /* 800B9B1C 000B6A5C 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800B9B20 000B6A60 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B9B24 000B6A64 41 82 00 84 */ beq lbl_800B9BA8 -/* 800B9B28 000B6A68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9B2C 000B6A6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9B28 000B6A68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9B2C 000B6A6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9B30 000B6A70 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B9B34 000B6A74 28 00 00 04 */ cmplwi r0, 4 /* 800B9B38 000B6A78 40 82 00 70 */ bne lbl_800B9BA8 @@ -32229,8 +32229,8 @@ lbl_800B9C90: /* 800B9C94 000B6BD4 48 05 BF 8D */ bl daAlink_c_NS_checkEventRun /* 800B9C98 000B6BD8 2C 03 00 00 */ cmpwi r3, 0 /* 800B9C9C 000B6BDC 41 82 00 2C */ beq lbl_800B9CC8 -/* 800B9CA0 000B6BE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9CA4 000B6BE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9CA0 000B6BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9CA4 000B6BE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9CA8 000B6BE8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B9CAC 000B6BEC 4B F8 E7 3D */ bl dEvent_manager_c_NS_getRunEventName /* 800B9CB0 000B6BF0 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -32240,8 +32240,8 @@ lbl_800B9C90: /* 800B9CC0 000B6C00 2C 03 00 00 */ cmpwi r3, 0 /* 800B9CC4 000B6C04 41 82 00 4C */ beq lbl_800B9D10 lbl_800B9CC8: -/* 800B9CC8 000B6C08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9CCC 000B6C0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9CC8 000B6C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9CCC 000B6C0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9CD0 000B6C10 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B9CD4 000B6C14 4B F8 E7 15 */ bl dEvent_manager_c_NS_getRunEventName /* 800B9CD8 000B6C18 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -32297,8 +32297,8 @@ lbl_800B9D80: /* 800B9D80 000B6CC0 80 7F 31 A0 */ lwz r3, 0x31a0(r31) /* 800B9D84 000B6CC4 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 /* 800B9D88 000B6CC8 41 82 00 50 */ beq lbl_800B9DD8 -/* 800B9D8C 000B6CCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800B9D90 000B6CD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800B9D8C 000B6CCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800B9D90 000B6CD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9D94 000B6CD4 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800B9D98 000B6CD8 28 00 00 00 */ cmplwi r0, 0 /* 800B9D9C 000B6CDC 40 82 00 FC */ bne lbl_800B9E98 @@ -33003,8 +33003,8 @@ lbl_800BA738: /* 800BA738 000B7678 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800BA73C 000B767C 28 00 01 03 */ cmplwi r0, 0x103 /* 800BA740 000B7680 40 82 00 3C */ bne lbl_800BA77C -/* 800BA744 000B7684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BA748 000B7688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BA744 000B7684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BA748 000B7688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BA74C 000B768C 88 03 00 14 */ lbz r0, 0x14(r3) /* 800BA750 000B7690 28 00 00 3F */ cmplwi r0, 0x3f /* 800BA754 000B7694 40 82 00 18 */ bne lbl_800BA76C @@ -33107,8 +33107,8 @@ lbl_800BA8A8: /* 800BA8A8 000B77E8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800BA8AC 000B77EC 28 00 01 03 */ cmplwi r0, 0x103 /* 800BA8B0 000B77F0 40 82 00 44 */ bne lbl_800BA8F4 -/* 800BA8B4 000B77F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BA8B8 000B77F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BA8B4 000B77F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BA8B8 000B77F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BA8BC 000B77FC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800BA8C0 000B7800 28 00 00 3F */ cmplwi r0, 0x3f /* 800BA8C4 000B7804 40 82 00 18 */ bne lbl_800BA8DC @@ -33167,8 +33167,8 @@ lbl_800BA94C: /* 800BA978 000B78B8 38 03 0C 52 */ addi r0, r3, 0x00070C52@l /* 800BA97C 000B78BC 7C 80 00 39 */ and. r0, r4, r0 /* 800BA980 000B78C0 40 82 00 C0 */ bne lbl_800BAA40 -/* 800BA984 000B78C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BA988 000B78C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BA984 000B78C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BA988 000B78C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BA98C 000B78CC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BA990 000B78D0 38 9D 1A 60 */ addi r4, r29, 0x1a60 /* 800BA994 000B78D4 4B FB 9C CD */ bl cBgS_NS_ChkPolySafe @@ -33884,8 +33884,8 @@ daAlink_c_NS_setMagicArmorBrk: /* 800BB350 000B8290 3C 80 80 3B */ lis r4, lbl_803B2D94@ha /* 800BB354 000B8294 38 84 2D 94 */ addi r4, r4, lbl_803B2D94@l /* 800BB358 000B8298 7C 84 E8 2E */ lwzx r4, r4, r29 -/* 800BB35C 000B829C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800BB360 000B82A0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800BB35C 000B829C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800BB360 000B82A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800BB364 000B82A4 3F C5 00 02 */ addis r30, r5, 2 /* 800BB368 000B82A8 3B DE C2 F8 */ addi r30, r30, -15624 /* 800BB36C 000B82AC 7F C5 F3 78 */ mr r5, r30 @@ -33938,8 +33938,8 @@ daAlink_c_NS_checkMagicArmorHeavy: /* 800BB41C 000B835C 48 00 49 E1 */ bl daAlink_c_NS_checkMagicArmorWearAbility /* 800BB420 000B8360 2C 03 00 00 */ cmpwi r3, 0 /* 800BB424 000B8364 41 82 00 1C */ beq lbl_800BB440 -/* 800BB428 000B8368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BB42C 000B836C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BB428 000B8368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BB42C 000B836C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BB430 000B8370 A0 03 00 04 */ lhz r0, 4(r3) /* 800BB434 000B8374 28 00 00 00 */ cmplwi r0, 0 /* 800BB438 000B8378 40 82 00 08 */ bne lbl_800BB440 @@ -34462,8 +34462,8 @@ lbl_800BBB6C: /* 800BBB98 000B8AD8 38 7D 1D 08 */ addi r3, r29, 0x1d08 /* 800BBB9C 000B8ADC 38 81 00 14 */ addi r4, r1, 0x14 /* 800BBBA0 000B8AE0 48 1A C1 89 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800BBBA4 000B8AE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BBBA8 000B8AE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BBBA4 000B8AE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BBBA8 000B8AE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BBBAC 000B8AEC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BBBB0 000B8AF0 38 9D 1D 08 */ addi r4, r29, 0x1d08 /* 800BBBB4 000B8AF4 4B FB 88 ED */ bl cBgS_NS_GroundCross @@ -34944,8 +34944,8 @@ lbl_800BC234: /* 800BC28C 000B91CC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800BC290 000B91D0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800BC294 000B91D4 90 01 01 38 */ stw r0, 0x138(r1) -/* 800BC298 000B91D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BC29C 000B91DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BC298 000B91D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BC29C 000B91DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BC2A0 000B91E0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BC2A4 000B91E4 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BC2A8 000B91E8 38 A1 01 28 */ addi r5, r1, 0x128 @@ -35099,8 +35099,8 @@ lbl_800BC4BC: /* 800BC4C8 000B9408 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800BC4CC 000B940C 28 00 01 42 */ cmplwi r0, 0x142 /* 800BC4D0 000B9410 41 82 00 18 */ beq lbl_800BC4E8 -/* 800BC4D4 000B9414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BC4D8 000B9418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BC4D4 000B9414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BC4D8 000B9418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BC4DC 000B941C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800BC4E0 000B9420 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800BC4E4 000B9424 41 82 00 10 */ beq lbl_800BC4F4 @@ -35458,8 +35458,8 @@ lbl_800BCA00: /* 800BCA00 000B9940 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 800BCA04 000B9944 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800BCA08 000B9948 41 82 00 B8 */ beq lbl_800BCAC0 -/* 800BCA0C 000B994C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BCA10 000B9950 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BCA0C 000B994C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BCA10 000B9950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BCA14 000B9954 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BCA18 000B9958 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BCA1C 000B995C 4B FB 7C 45 */ bl cBgS_NS_ChkPolySafe @@ -36093,8 +36093,8 @@ lbl_800BD2A4: /* 800BD308 000BA248 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800BD30C 000BA24C 90 01 01 24 */ stw r0, 0x124(r1) /* 800BD310 000BA250 3B 40 00 00 */ li r26, 0 -/* 800BD314 000BA254 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BD318 000BA258 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BD314 000BA254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BD318 000BA258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BD31C 000BA25C 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800BD320 000BA260 3B 9F 1B 78 */ addi r28, r31, 0x1b78 /* 800BD324 000BA264 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -36687,8 +36687,8 @@ lbl_800BDB94: /* 800BDB98 000BAAD8 C0 1F 1A 08 */ lfs f0, 0x1a08(r31) /* 800BDB9C 000BAADC FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800BDBA0 000BAAE0 41 82 00 2C */ beq lbl_800BDBCC -/* 800BDBA4 000BAAE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BDBA8 000BAAE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BDBA4 000BAAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BDBA8 000BAAE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BDBAC 000BAAEC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BDBB0 000BAAF0 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BDBB4 000BAAF4 38 A1 00 90 */ addi r5, r1, 0x90 @@ -36839,8 +36839,8 @@ lbl_800BDDB4: /* 800BDDB8 000BACF8 80 FE 00 B0 */ lwz r7, 0xb0(r30) /* 800BDDBC 000BACFC 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 800BDDC0 000BAD00 7C 06 07 74 */ extsb r6, r0 -/* 800BDDC4 000BAD04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BDDC8 000BAD08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BDDC4 000BAD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BDDC8 000BAD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BDDCC 000BAD0C 38 63 0E D8 */ addi r3, r3, 0xed8 /* 800BDDD0 000BAD10 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800BDDD4 000BAD14 A8 BE 04 E6 */ lha r5, 0x4e6(r30) @@ -36978,8 +36978,8 @@ daAlink_c_NS_startRestartRoom: /* 800BDF90 000BAED0 40 82 02 C0 */ bne lbl_800BE250 /* 800BDF94 000BAED4 2C 1F 00 00 */ cmpwi r31, 0 /* 800BDF98 000BAED8 40 82 00 2C */ bne lbl_800BDFC4 -/* 800BDF9C 000BAEDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BDFA0 000BAEE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BDF9C 000BAEDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BDFA0 000BAEE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BDFA4 000BAEE4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800BDFA8 000BAEE8 7F 84 E3 78 */ mr r4, r28 /* 800BDFAC 000BAEEC 38 A0 00 00 */ li r5, 0 @@ -37021,8 +37021,8 @@ lbl_800BE030: /* 800BE030 000BAF70 48 05 AA A1 */ bl daAlink_c_NS_checkFinalBattle /* 800BE034 000BAF74 2C 03 00 00 */ cmpwi r3, 0 /* 800BE038 000BAF78 40 82 01 08 */ bne lbl_800BE140 -/* 800BE03C 000BAF7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BE040 000BAF80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BE03C 000BAF7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BE040 000BAF80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE044 000BAF84 38 83 0D BC */ addi r4, r3, 0xdbc /* 800BE048 000BAF88 38 7C 37 80 */ addi r3, r28, 0x3780 /* 800BE04C 000BAF8C 48 28 93 51 */ bl PSVECSquareDistance @@ -37098,8 +37098,8 @@ lbl_800BE134: lbl_800BE140: /* 800BE140 000BB080 3B E0 00 00 */ li r31, 0 lbl_800BE144: -/* 800BE144 000BB084 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BE148 000BB088 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BE144 000BB084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BE148 000BB088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE14C 000BB08C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800BE150 000BB090 38 80 20 08 */ li r4, 0x2008 /* 800BE154 000BB094 4B F7 68 69 */ bl isEventBit__11dSv_event_cCFUs @@ -37140,8 +37140,8 @@ lbl_800BE1CC: /* 800BE1D0 000BB110 7F C4 F3 78 */ mr r4, r30 /* 800BE1D4 000BB114 38 A1 00 08 */ addi r5, r1, 8 /* 800BE1D8 000BB118 4B FF FC 49 */ bl daAlink_c_NS_setLastSceneDamage -/* 800BE1DC 000BB11C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BE1E0 000BB120 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BE1DC 000BB11C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BE1E0 000BB120 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE1E4 000BB124 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 800BE1E8 000BB128 7C 03 07 74 */ extsb r3, r0 /* 800BE1EC 000BB12C 7F E4 FB 78 */ mr r4, r31 @@ -37470,8 +37470,8 @@ lbl_800BE64C: /* 800BE660 000BB5A0 3B C0 FF FF */ li r30, -1 /* 800BE664 000BB5A4 48 00 00 24 */ b lbl_800BE688 lbl_800BE668: -/* 800BE668 000BB5A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BE66C 000BB5AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BE668 000BB5A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BE66C 000BB5AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE670 000BB5B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BE674 000BB5B4 38 9D 1A 60 */ addi r4, r29, 0x1a60 /* 800BE678 000BB5B8 4B FB 65 21 */ bl dBgS_NS_GetExitId @@ -37511,8 +37511,8 @@ lbl_800BE6E8: /* 800BE6F0 000BB630 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800BE6F4 000BB634 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 800BE6F8 000BB638 40 82 01 48 */ bne lbl_800BE840 -/* 800BE6FC 000BB63C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BE700 000BB640 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BE6FC 000BB63C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BE700 000BB640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE704 000BB644 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800BE708 000BB648 7F A4 EB 78 */ mr r4, r29 /* 800BE70C 000BB64C 38 A0 00 00 */ li r5, 0 @@ -37889,8 +37889,8 @@ lbl_800BEC34: /* 800BEC44 000BBB84 4E 80 04 21 */ bctrl /* 800BEC48 000BBB88 28 03 00 00 */ cmplwi r3, 0 /* 800BEC4C 000BBB8C 41 82 00 D0 */ beq lbl_800BED1C -/* 800BEC50 000BBB90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BEC54 000BBB94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BEC50 000BBB90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BEC54 000BBB94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BEC58 000BBB98 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BEC5C 000BBB9C 38 9C 1A 60 */ addi r4, r28, 0x1a60 /* 800BEC60 000BBBA0 4B FB 60 0D */ bl dBgS_NS_GetHorseNoEntry @@ -37968,8 +37968,8 @@ lbl_800BED4C: /* 800BED68 000BBCA8 C3 C2 92 AC */ lfs f30, lbl_80452CAC-_SDA2_BASE_(r2) /* 800BED6C 000BBCAC 48 00 00 94 */ b lbl_800BEE00 lbl_800BED70: -/* 800BED70 000BBCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BED74 000BBCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BED70 000BBCB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BED74 000BBCB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BED78 000BBCB8 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800BED7C 000BBCBC C3 E3 17 8C */ lfs f31, 0x178c(r3) /* 800BED80 000BBCC0 C3 C2 92 B8 */ lfs f30, lbl_80452CB8-_SDA2_BASE_(r2) @@ -38052,8 +38052,8 @@ lbl_800BEE5C: /* 800BEE84 000BBDC4 A0 1C 31 06 */ lhz r0, 0x3106(r28) /* 800BEE88 000BBDC8 28 00 00 00 */ cmplwi r0, 0 /* 800BEE8C 000BBDCC 40 82 00 2C */ bne lbl_800BEEB8 -/* 800BEE90 000BBDD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BEE94 000BBDD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BEE90 000BBDD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BEE94 000BBDD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BEE98 000BBDD8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800BEE9C 000BBDDC 7F 84 E3 78 */ mr r4, r28 /* 800BEEA0 000BBDE0 38 A0 00 00 */ li r5, 0 @@ -38114,8 +38114,8 @@ lbl_800BEF58: /* 800BEF6C 000BBEAC A8 DC 04 E6 */ lha r6, 0x4e6(r28) /* 800BEF70 000BBEB0 4B F6 81 8D */ bl dStage_changeSceneExitId /* 800BEF74 000BBEB4 7C 7D 1B 78 */ mr r29, r3 -/* 800BEF78 000BBEB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BEF7C 000BBEBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BEF78 000BBEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BEF7C 000BBEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BEF80 000BBEC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BEF84 000BBEC4 38 9C 1A 60 */ addi r4, r28, 0x1a60 /* 800BEF88 000BBEC8 4B FB 60 59 */ bl dBgS_NS_GetRoomPathId @@ -38159,8 +38159,8 @@ lbl_800BF008: /* 800BF010 000BBF50 B0 7C 06 06 */ sth r3, 0x606(r28) /* 800BF014 000BBF54 2C 1E 00 00 */ cmpwi r30, 0 /* 800BF018 000BBF58 41 82 00 38 */ beq lbl_800BF050 -/* 800BF01C 000BBF5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BF020 000BBF60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BF01C 000BBF5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BF020 000BBF60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF024 000BBF64 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 800BF028 000BBF68 38 00 00 03 */ li r0, 3 /* 800BF02C 000BBF6C 98 04 16 B8 */ stb r0, 0x16b8(r4) @@ -38520,8 +38520,8 @@ daAlink_c_NS_checkSightLine: /* 800BF51C 000BC45C 7C 7D 1B 78 */ mr r29, r3 /* 800BF520 000BC460 FF E0 08 90 */ fmr f31, f1 /* 800BF524 000BC464 7C 9E 23 78 */ mr r30, r4 -/* 800BF528 000BC468 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BF52C 000BC46C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BF528 000BC468 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BF52C 000BC46C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF530 000BC470 80 1D 31 7C */ lwz r0, 0x317c(r29) /* 800BF534 000BC474 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800BF538 000BC478 7C 63 02 14 */ add r3, r3, r0 @@ -38603,8 +38603,8 @@ lbl_800BF608: /* 800BF658 000BC598 38 BD 37 E0 */ addi r5, r29, 0x37e0 /* 800BF65C 000BC59C 7F A6 EB 78 */ mr r6, r29 /* 800BF660 000BC5A0 4B FB 87 05 */ bl dBgS_LinChk_NS_Set -/* 800BF664 000BC5A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BF668 000BC5A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BF664 000BC5A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BF668 000BC5A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF66C 000BC5AC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BF670 000BC5B0 38 9D 1B B8 */ addi r4, r29, 0x1bb8 /* 800BF674 000BC5B4 4B FB 4D 41 */ bl cBgS_NS_LineCross @@ -38664,8 +38664,8 @@ lbl_800BF728: /* 800BF730 000BC670 7F C5 F3 78 */ mr r5, r30 /* 800BF734 000BC674 7F A6 EB 78 */ mr r6, r29 /* 800BF738 000BC678 4B FB 86 2D */ bl dBgS_LinChk_NS_Set -/* 800BF73C 000BC67C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BF740 000BC680 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BF73C 000BC67C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BF740 000BC680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF744 000BC684 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BF748 000BC688 7F 84 E3 78 */ mr r4, r28 /* 800BF74C 000BC68C 4B FB 4C 69 */ bl cBgS_NS_LineCross @@ -39000,8 +39000,8 @@ lbl_800BFBC8: /* 800BFBE8 000BCB28 4E 80 04 21 */ bctrl /* 800BFBEC 000BCB2C 28 03 00 00 */ cmplwi r3, 0 /* 800BFBF0 000BCB30 41 82 00 5C */ beq lbl_800BFC4C -/* 800BFBF4 000BCB34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BFBF8 000BCB38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BFBF4 000BCB34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BFBF8 000BCB38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BFBFC 000BCB3C 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800BFC00 000BCB40 38 00 00 00 */ li r0, 0 /* 800BFC04 000BCB44 88 63 16 B4 */ lbz r3, 0x16b4(r3) @@ -39132,8 +39132,8 @@ daAlink_c_NS_checkZoraWearAbility: /* 800BFDB8 000BCCF8 80 03 05 74 */ lwz r0, 0x574(r3) /* 800BFDBC 000BCCFC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800BFDC0 000BCD00 40 82 00 1C */ bne lbl_800BFDDC -/* 800BFDC4 000BCD04 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800BFDC8 000BCD08 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800BFDC4 000BCD04 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800BFDC8 000BCD08 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800BFDCC 000BCD0C 88 04 00 13 */ lbz r0, 0x13(r4) /* 800BFDD0 000BCD10 28 00 00 31 */ cmplwi r0, 0x31 /* 800BFDD4 000BCD14 40 82 00 08 */ bne lbl_800BFDDC @@ -39156,8 +39156,8 @@ daAlink_c_NS_checkMagicArmorWearAbility: /* 800BFE04 000BCD44 80 03 05 74 */ lwz r0, 0x574(r3) /* 800BFE08 000BCD48 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800BFE0C 000BCD4C 40 82 00 1C */ bne lbl_800BFE28 -/* 800BFE10 000BCD50 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800BFE14 000BCD54 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800BFE10 000BCD50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800BFE14 000BCD54 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800BFE18 000BCD58 88 04 00 13 */ lbz r0, 0x13(r4) /* 800BFE1C 000BCD5C 28 00 00 30 */ cmplwi r0, 0x30 /* 800BFE20 000BCD60 40 82 00 08 */ bne lbl_800BFE28 @@ -39182,8 +39182,8 @@ daAlink_c_NS_loadAramBmd: /* 800BFE58 000BCD98 48 2A 23 81 */ bl _savegpr_28 /* 800BFE5C 000BCD9C 7C 9C 23 78 */ mr r28, r4 /* 800BFE60 000BCDA0 7C BD 2B 78 */ mr r29, r5 -/* 800BFE64 000BCDA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BFE68 000BCDA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BFE64 000BCDA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BFE68 000BCDA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BFE6C 000BCDAC 83 E3 5C AC */ lwz r31, 0x5cac(r3) /* 800BFE70 000BCDB0 7F A3 EB 78 */ mr r3, r29 /* 800BFE74 000BCDB4 38 80 00 20 */ li r4, 0x20 @@ -39239,8 +39239,8 @@ daAlink_c_NS_loadAram: /* 800BFF24 000BCE64 38 80 00 20 */ li r4, 0x20 /* 800BFF28 000BCE68 48 20 ED C5 */ bl __nwa__FUli /* 800BFF2C 000BCE6C 7C 7F 1B 78 */ mr r31, r3 -/* 800BFF30 000BCE70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800BFF34 000BCE74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800BFF30 000BCE70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800BFF34 000BCE74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BFF38 000BCE78 80 63 5C AC */ lwz r3, 0x5cac(r3) /* 800BFF3C 000BCE7C 7F E4 FB 78 */ mr r4, r31 /* 800BFF40 000BCE80 7F C5 F3 78 */ mr r5, r30 @@ -39494,8 +39494,8 @@ daAlink_c_NS_checkField: /* 800C0284 000BD1C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800C0288 000BD1C8 7C 08 02 A6 */ mflr r0 /* 800C028C 000BD1CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C0290 000BD1D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0294 000BD1D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C0290 000BD1D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0294 000BD1D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0298 000BD1D8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C029C 000BD1DC 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C02A0 000BD1E0 7D 89 03 A6 */ mtctr r12 @@ -39514,8 +39514,8 @@ daAlink_c_NS_checkBossRoom: /* 800C02C8 000BD208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800C02CC 000BD20C 7C 08 02 A6 */ mflr r0 /* 800C02D0 000BD210 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C02D4 000BD214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C02D8 000BD218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C02D4 000BD214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C02D8 000BD218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C02DC 000BD21C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C02E0 000BD220 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C02E4 000BD224 7D 89 03 A6 */ mtctr r12 @@ -39535,8 +39535,8 @@ daAlink_c_NS_checkDungeon: /* 800C0310 000BD250 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800C0314 000BD254 7C 08 02 A6 */ mflr r0 /* 800C0318 000BD258 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C031C 000BD25C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0320 000BD260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C031C 000BD25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0320 000BD260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0324 000BD264 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C0328 000BD268 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C032C 000BD26C 7D 89 03 A6 */ mtctr r12 @@ -39556,8 +39556,8 @@ daAlink_c_NS_checkCastleTown: /* 800C0358 000BD298 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800C035C 000BD29C 7C 08 02 A6 */ mflr r0 /* 800C0360 000BD2A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C0364 000BD2A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0368 000BD2A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C0364 000BD2A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0368 000BD2A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C036C 000BD2AC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C0370 000BD2B0 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C0374 000BD2B4 7D 89 03 A6 */ mtctr r12 @@ -39577,8 +39577,8 @@ daAlink_c_NS_checkCloudSea: /* 800C03A0 000BD2E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800C03A4 000BD2E4 7C 08 02 A6 */ mflr r0 /* 800C03A8 000BD2E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C03AC 000BD2EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C03B0 000BD2F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C03AC 000BD2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C03B0 000BD2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C03B4 000BD2F4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C03B8 000BD2F8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C03BC 000BD2FC 7D 89 03 A6 */ mtctr r12 @@ -39600,8 +39600,8 @@ daAlink_c_NS_checkRoomOnly: /* 800C03F0 000BD330 90 01 00 14 */ stw r0, 0x14(r1) /* 800C03F4 000BD334 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C03F8 000BD338 3B E0 00 01 */ li r31, 1 -/* 800C03FC 000BD33C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0400 000BD340 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C03FC 000BD33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0400 000BD340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0404 000BD344 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800C0408 000BD348 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800C040C 000BD34C 7D 89 03 A6 */ mtctr r12 @@ -40017,8 +40017,8 @@ lbl_800C096C: /* 800C0970 000BD8B0 40 82 00 5C */ bne lbl_800C09CC /* 800C0974 000BD8B4 7F 83 E3 78 */ mr r3, r28 /* 800C0978 000BD8B8 48 00 E4 0D */ bl daAlink_c_NS_procCoSubjectivityInit -/* 800C097C 000BD8BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0980 000BD8C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C097C 000BD8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0980 000BD8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0984 000BD8C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800C0988 000BD8C8 64 00 00 20 */ oris r0, r0, 0x20 /* 800C098C 000BD8CC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -40058,8 +40058,8 @@ lbl_800C09F8: /* 800C0A08 000BD948 7F 83 E3 78 */ mr r3, r28 /* 800C0A0C 000BD94C 7F E4 FB 78 */ mr r4, r31 /* 800C0A10 000BD950 4B FF 8C 31 */ bl daAlink_c_NS_itemEquip -/* 800C0A14 000BD954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0A18 000BD958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C0A14 000BD954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0A18 000BD958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0A1C 000BD95C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800C0A20 000BD960 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800C0A24 000BD964 41 82 00 5C */ beq lbl_800C0A80 @@ -40245,16 +40245,16 @@ lbl_800C0C90: /* 800C0CB0 000BDBF0 4B FD CD B1 */ bl daAlink_c_NS_checkStageName /* 800C0CB4 000BDBF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0CB8 000BDBF8 41 82 00 44 */ beq lbl_800C0CFC -/* 800C0CBC 000BDBFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0CC0 000BDC00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C0CBC 000BDBFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0CC0 000BDC00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0CC4 000BDC04 38 80 00 4D */ li r4, 0x4d /* 800C0CC8 000BDC08 88 1C 04 BA */ lbz r0, 0x4ba(r28) /* 800C0CCC 000BDC0C 7C 05 07 74 */ extsb r5, r0 /* 800C0CD0 000BDC10 4B F7 46 91 */ bl isSwitch__10dSv_info_cCFii /* 800C0CD4 000BDC14 2C 03 00 00 */ cmpwi r3, 0 /* 800C0CD8 000BDC18 41 82 00 24 */ beq lbl_800C0CFC -/* 800C0CDC 000BDC1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C0CE0 000BDC20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C0CDC 000BDC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C0CE0 000BDC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0CE4 000BDC24 38 80 00 18 */ li r4, 0x18 /* 800C0CE8 000BDC28 88 1C 04 BA */ lbz r0, 0x4ba(r28) /* 800C0CEC 000BDC2C 7C 05 07 74 */ extsb r5, r0 @@ -40723,8 +40723,8 @@ lbl_800C1354: /* 800C135C 000BE29C 41 82 00 84 */ beq lbl_800C13E0 /* 800C1360 000BE2A0 28 00 01 03 */ cmplwi r0, 0x103 /* 800C1364 000BE2A4 40 82 00 58 */ bne lbl_800C13BC -/* 800C1368 000BE2A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C136C 000BE2AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C1368 000BE2A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C136C 000BE2AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1370 000BE2B0 88 03 00 14 */ lbz r0, 0x14(r3) /* 800C1374 000BE2B4 28 00 00 3F */ cmplwi r0, 0x3f /* 800C1378 000BE2B8 40 82 00 24 */ bne lbl_800C139C @@ -40781,8 +40781,8 @@ lbl_800C1404: /* 800C1434 000BE374 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800C1438 000BE378 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800C143C 000BE37C 90 01 00 30 */ stw r0, 0x30(r1) -/* 800C1440 000BE380 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C1444 000BE384 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C1440 000BE380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C1444 000BE384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1448 000BE388 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800C144C 000BE38C 3C 80 80 3F */ lis r4, lbl_803F1C48@ha /* 800C1450 000BE390 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l @@ -41005,8 +41005,8 @@ lbl_800C1750: /* 800C1760 000BE6A0 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800C1764 000BE6A4 41 82 02 40 */ beq lbl_800C19A4 lbl_800C1768: -/* 800C1768 000BE6A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C176C 000BE6AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C1768 000BE6A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C176C 000BE6AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1770 000BE6B0 A0 03 00 08 */ lhz r0, 8(r3) /* 800C1774 000BE6B4 28 00 00 00 */ cmplwi r0, 0 /* 800C1778 000BE6B8 41 82 01 50 */ beq lbl_800C18C8 @@ -41031,8 +41031,8 @@ lbl_800C17A0: /* 800C17BC 000BE6FC 80 1C 05 8C */ lwz r0, 0x58c(r28) /* 800C17C0 000BE700 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800C17C4 000BE704 40 82 00 24 */ bne lbl_800C17E8 -/* 800C17C8 000BE708 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C17CC 000BE70C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 800C17C8 000BE708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C17CC 000BE70C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800C17D0 000BE710 80 85 5D D4 */ lwz r4, 0x5dd4(r5) /* 800C17D4 000BE714 38 7F 11 24 */ addi r3, r31, 0x1124 /* 800C17D8 000BE718 A8 03 00 48 */ lha r0, 0x48(r3) @@ -41045,8 +41045,8 @@ lbl_800C17E8: /* 800C17F0 000BE730 40 82 00 48 */ bne lbl_800C1838 /* 800C17F4 000BE734 3B 60 03 62 */ li r27, 0x362 /* 800C17F8 000BE738 3B 5C 2F 20 */ addi r26, r28, 0x2f20 -/* 800C17FC 000BE73C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C1800 000BE740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C17FC 000BE73C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C1800 000BE740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1804 000BE744 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800C1808 000BE748 38 63 02 10 */ addi r3, r3, 0x210 /* 800C180C 000BE74C 80 9C 31 C4 */ lwz r4, 0x31c4(r28) @@ -41064,8 +41064,8 @@ lbl_800C1838: /* 800C1838 000BE778 3B 60 02 BC */ li r27, 0x2bc /* 800C183C 000BE77C 3B 40 00 00 */ li r26, 0 lbl_800C1840: -/* 800C1840 000BE780 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C1844 000BE784 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C1840 000BE780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C1844 000BE784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1848 000BE788 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800C184C 000BE78C 38 00 00 FF */ li r0, 0xff /* 800C1850 000BE790 90 01 00 08 */ stw r0, 8(r1) @@ -41398,8 +41398,8 @@ daAlink_c_NS_setFrontRollCrashShock: /* 800C1D10 000BEC50 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800C1D14 000BEC54 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800C1D18 000BEC58 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 800C1D1C 000BEC5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C1D20 000BEC60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C1D1C 000BEC5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C1D20 000BEC60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C1D24 000BEC64 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C1D28 000BEC68 38 80 00 05 */ li r4, 5 /* 800C1D2C 000BEC6C 38 A0 00 0F */ li r5, 0xf @@ -41534,8 +41534,8 @@ lbl_800C1F04: /* 800C1F08 000BEE48 40 82 00 4C */ bne lbl_800C1F54 /* 800C1F0C 000BEE4C 3B 80 00 00 */ li r28, 0 /* 800C1F10 000BEE50 3B C0 00 00 */ li r30, 0 -/* 800C1F14 000BEE54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C1F18 000BEE58 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800C1F14 000BEE54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C1F18 000BEE58 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_800C1F1C: /* 800C1F1C 000BEE5C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800C1F20 000BEE60 38 63 02 10 */ addi r3, r3, 0x210 @@ -41679,8 +41679,8 @@ lbl_800C20E0: /* 800C2108 000BF048 4B FF 50 89 */ bl daAlink_c_NS_cancelItemUseQuake /* 800C210C 000BF04C 48 00 01 44 */ b lbl_800C2250 lbl_800C2110: -/* 800C2110 000BF050 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800C2114 000BF054 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800C2110 000BF050 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800C2114 000BF054 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800C2118 000BF058 80 04 5F 1C */ lwz r0, 0x5f1c(r4) /* 800C211C 000BF05C 74 00 02 01 */ andis. r0, r0, 0x201 /* 800C2120 000BF060 41 82 00 38 */ beq lbl_800C2158 @@ -41757,8 +41757,8 @@ lbl_800C2210: /* 800C2220 000BF160 28 00 01 42 */ cmplwi r0, 0x142 /* 800C2224 000BF164 40 82 00 1C */ bne lbl_800C2240 lbl_800C2228: -/* 800C2228 000BF168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C222C 000BF16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C2228 000BF168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C222C 000BF16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C2230 000BF170 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C2234 000BF174 38 80 00 1F */ li r4, 0x1f /* 800C2238 000BF178 4B FA DB 5D */ bl dVibration_c_NS_StopQuake @@ -42304,8 +42304,8 @@ lbl_800C29B0: /* 800C29C4 000BF904 7F 23 CB 78 */ mr r3, r25 /* 800C29C8 000BF908 48 04 5E 61 */ bl daAlink_c_NS_cancelHookshotCarry lbl_800C29CC: -/* 800C29CC 000BF90C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C29D0 000BF910 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800C29CC 000BF90C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C29D0 000BF910 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800C29D4 000BF914 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 800C29D8 000BF918 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800C29DC 000BF91C 41 82 00 1C */ beq lbl_800C29F8 @@ -42316,8 +42316,8 @@ lbl_800C29CC: /* 800C29F0 000BF930 28 00 00 5A */ cmplwi r0, 0x5a /* 800C29F4 000BF934 40 82 00 2C */ bne lbl_800C2A20 lbl_800C29F8: -/* 800C29F8 000BF938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C29FC 000BF93C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C29F8 000BF938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C29FC 000BF93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C2A00 000BF940 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800C2A04 000BF944 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800C2A08 000BF948 41 82 00 B8 */ beq lbl_800C2AC0 @@ -42407,8 +42407,8 @@ lbl_800C2B38: /* 800C2B44 000BFA84 7C 80 00 38 */ and r0, r4, r0 /* 800C2B48 000BFA88 90 1F 5F 18 */ stw r0, 0x5f18(r31) lbl_800C2B4C: -/* 800C2B4C 000BFA8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C2B50 000BFA90 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 800C2B4C 000BFA8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C2B50 000BFA90 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800C2B54 000BFA94 80 85 5F 1C */ lwz r4, 0x5f1c(r5) /* 800C2B58 000BFA98 3C 60 F8 05 */ lis r3, 0xF8048487@ha /* 800C2B5C 000BFA9C 38 03 84 87 */ addi r0, r3, 0xF8048487@l @@ -42487,8 +42487,8 @@ lbl_800C2C64: /* 800C2C68 000BFBA8 98 19 08 28 */ stb r0, 0x828(r25) lbl_800C2C6C: /* 800C2C6C 000BFBAC 38 00 00 00 */ li r0, 0 -/* 800C2C70 000BFBB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C2C74 000BFBB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C2C70 000BFBB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C2C74 000BFBB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C2C78 000BFBB8 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800C2C7C 000BFBBC 7F 23 CB 78 */ mr r3, r25 /* 800C2C80 000BFBC0 48 01 BD 69 */ bl daAlink_c_NS_checkBowAnime @@ -43601,8 +43601,8 @@ lbl_800C3BB8: /* 800C3BD0 000C0B10 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800C3BD4 000C0B14 28 00 00 05 */ cmplwi r0, 5 /* 800C3BD8 000C0B18 40 82 00 1C */ bne lbl_800C3BF4 -/* 800C3BDC 000C0B1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C3BE0 000C0B20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C3BDC 000C0B1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C3BE0 000C0B20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C3BE4 000C0B24 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C3BE8 000C0B28 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800C3BEC 000C0B2C 4B F8 45 91 */ bl dEvent_manager_c_NS_cutEnd @@ -43651,8 +43651,8 @@ lbl_800C3C70: /* 800C3C78 000C0BB8 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3C7C 000C0BBC C0 24 00 18 */ lfs f1, 0x18(r4) /* 800C3C80 000C0BC0 4B FE A1 95 */ bl daAlink_c_NS_setBlendMoveAnime -/* 800C3C84 000C0BC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C3C88 000C0BC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C3C84 000C0BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C3C88 000C0BC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C3C8C 000C0BCC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800C3C90 000C0BD0 60 00 08 00 */ ori r0, r0, 0x800 /* 800C3C94 000C0BD4 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -44095,8 +44095,8 @@ lbl_800C42D4: /* 800C42E4 000C1224 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800C42E8 000C1228 28 00 00 10 */ cmplwi r0, 0x10 /* 800C42EC 000C122C 40 82 00 1C */ bne lbl_800C4308 -/* 800C42F0 000C1230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C42F4 000C1234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C42F0 000C1230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C42F4 000C1234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C42F8 000C1238 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C42FC 000C123C 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800C4300 000C1240 4B F8 3E 7D */ bl dEvent_manager_c_NS_cutEnd @@ -44180,8 +44180,8 @@ lbl_800C43FC: /* 800C440C 000C134C 3C A0 80 39 */ lis r5, lbl_8038D8CC@ha /* 800C4410 000C1350 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l /* 800C4414 000C1354 4B FE 8C E1 */ bl daAlink_c_NS_setSingleAnimeParam -/* 800C4418 000C1358 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C441C 000C135C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C4418 000C1358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C441C 000C135C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4420 000C1360 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800C4424 000C1364 60 00 01 00 */ ori r0, r0, 0x100 /* 800C4428 000C1368 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -44218,8 +44218,8 @@ lbl_800C448C: /* 800C44A0 000C13E0 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l /* 800C44A4 000C13E4 38 A5 00 14 */ addi r5, r5, 0x14 /* 800C44A8 000C13E8 4B FE 8C 4D */ bl daAlink_c_NS_setSingleAnimeParam -/* 800C44AC 000C13EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C44B0 000C13F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C44AC 000C13EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C44B0 000C13F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C44B4 000C13F4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800C44B8 000C13F8 60 00 02 00 */ ori r0, r0, 0x200 /* 800C44BC 000C13FC 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -44725,8 +44725,8 @@ lbl_800C4BE4: /* 800C4BF4 000C1B34 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800C4BF8 000C1B38 28 00 00 28 */ cmplwi r0, 0x28 /* 800C4BFC 000C1B3C 40 82 00 1C */ bne lbl_800C4C18 -/* 800C4C00 000C1B40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C4C04 000C1B44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C4C00 000C1B40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C4C04 000C1B44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4C08 000C1B48 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C4C0C 000C1B4C 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800C4C10 000C1B50 4B F8 35 6D */ bl dEvent_manager_c_NS_cutEnd @@ -44807,8 +44807,8 @@ lbl_800C4CF8: /* 800C4D24 000C1C64 80 1E 18 C0 */ lwz r0, 0x18c0(r30) /* 800C4D28 000C1C68 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800C4D2C 000C1C6C 41 82 01 0C */ beq lbl_800C4E38 -/* 800C4D30 000C1C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C4D34 000C1C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C4D30 000C1C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C4D34 000C1C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4D38 000C1C78 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800C4D3C 000C1C7C 7F A3 EB 78 */ mr r3, r29 /* 800C4D40 000C1C80 38 9E 18 B0 */ addi r4, r30, 0x18b0 @@ -44888,8 +44888,8 @@ lbl_800C4E38: /* 800C4E54 000C1D94 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800C4E58 000C1D98 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800C4E5C 000C1D9C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800C4E60 000C1DA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C4E64 000C1DA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C4E60 000C1DA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C4E64 000C1DA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4E68 000C1DA8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C4E6C 000C1DAC 38 80 00 01 */ li r4, 1 /* 800C4E70 000C1DB0 38 A0 00 01 */ li r5, 1 @@ -45380,8 +45380,8 @@ lbl_800C555C: /* 800C556C 000C24AC 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800C5570 000C24B0 28 00 00 49 */ cmplwi r0, 0x49 /* 800C5574 000C24B4 40 82 00 1C */ bne lbl_800C5590 -/* 800C5578 000C24B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C557C 000C24BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C5578 000C24B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C557C 000C24BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5580 000C24C0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C5584 000C24C4 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800C5588 000C24C8 4B F8 2B F5 */ bl dEvent_manager_c_NS_cutEnd @@ -45456,8 +45456,8 @@ lbl_800C5668: /* 800C5684 000C25C4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800C5688 000C25C8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800C568C 000C25CC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800C5690 000C25D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C5694 000C25D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C5690 000C25D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C5694 000C25D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5698 000C25D8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C569C 000C25DC 38 80 00 01 */ li r4, 1 /* 800C56A0 000C25E0 38 A0 00 01 */ li r5, 1 @@ -45498,8 +45498,8 @@ daAlink_c_NS_backJumpSpeedDec: /* 800C5714 000C2654 80 03 19 9C */ lwz r0, 0x199c(r3) /* 800C5718 000C2658 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800C571C 000C265C 41 82 00 74 */ beq lbl_800C5790 -/* 800C5720 000C2660 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C5724 000C2664 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C5720 000C2660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C5724 000C2664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5728 000C2668 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800C572C 000C266C 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800C5730 000C2670 4B FA EF 31 */ bl cBgS_NS_ChkPolySafe @@ -45785,8 +45785,8 @@ lbl_800C5B20: /* 800C5B3C 000C2A7C 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800C5B40 000C2A80 28 00 00 10 */ cmplwi r0, 0x10 /* 800C5B44 000C2A84 40 82 00 1C */ bne lbl_800C5B60 -/* 800C5B48 000C2A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C5B4C 000C2A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C5B48 000C2A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C5B4C 000C2A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5B50 000C2A90 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C5B54 000C2A94 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800C5B58 000C2A98 4B F8 26 25 */ bl dEvent_manager_c_NS_cutEnd @@ -46861,8 +46861,8 @@ lbl_800C6A94: /* 800C6A98 000C39D8 80 1C 31 A0 */ lwz r0, 0x31a0(r28) /* 800C6A9C 000C39DC 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 800C6AA0 000C39E0 41 82 00 1C */ beq lbl_800C6ABC -/* 800C6AA4 000C39E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C6AA8 000C39E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C6AA4 000C39E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C6AA8 000C39E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C6AAC 000C39EC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800C6AB0 000C39F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800C6AB4 000C39F4 40 82 00 08 */ bne lbl_800C6ABC @@ -46937,8 +46937,8 @@ lbl_800C6B9C: /* 800C6BB4 000C3AF4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800C6BB8 000C3AF8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800C6BBC 000C3AFC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800C6BC0 000C3B00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C6BC4 000C3B04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C6BC0 000C3B00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C6BC4 000C3B04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C6BC8 000C3B08 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C6BCC 000C3B0C 38 80 00 06 */ li r4, 6 /* 800C6BD0 000C3B10 38 A0 00 1F */ li r5, 0x1f @@ -47072,8 +47072,8 @@ lbl_800C6D90: /* 800C6DA4 000C3CE4 4B FE EF 29 */ bl daAlink_c_NS_checkLandAction /* 800C6DA8 000C3CE8 48 00 01 58 */ b lbl_800C6F00 lbl_800C6DAC: -/* 800C6DAC 000C3CEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C6DB0 000C3CF0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800C6DAC 000C3CEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C6DB0 000C3CF0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800C6DB4 000C3CF4 A0 1E 00 02 */ lhz r0, 2(r30) /* 800C6DB8 000C3CF8 28 00 00 00 */ cmplwi r0, 0 /* 800C6DBC 000C3CFC 41 82 01 2C */ beq lbl_800C6EE8 @@ -47290,8 +47290,8 @@ lbl_800C70B0: /* 800C70B8 000C3FF8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800C70BC 000C3FFC D0 01 00 0C */ stfs f0, 0xc(r1) /* 800C70C0 000C4000 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800C70C4 000C4004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C70C8 000C4008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C70C4 000C4004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C70C8 000C4008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C70CC 000C400C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C70D0 000C4010 38 A0 00 0F */ li r5, 0xf /* 800C70D4 000C4014 38 C1 00 08 */ addi r6, r1, 8 @@ -47797,8 +47797,8 @@ daAlink_c_NS_procCoMetamorphoseInit: /* 800C780C 000C474C 48 29 A9 C9 */ bl _savegpr_27 /* 800C7810 000C4750 7C 7E 1B 78 */ mr r30, r3 /* 800C7814 000C4754 3B A0 00 00 */ li r29, 0 -/* 800C7818 000C4758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C781C 000C475C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C7818 000C4758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C781C 000C475C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7820 000C4760 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800C7824 000C4764 38 7F 3F 90 */ addi r3, r31, 0x3f90 /* 800C7828 000C4768 38 00 00 00 */ li r0, 0 @@ -47917,8 +47917,8 @@ lbl_800C7954: /* 800C79C8 000C4908 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800C79CC 000C490C 28 00 00 01 */ cmplwi r0, 1 /* 800C79D0 000C4910 41 82 00 24 */ beq lbl_800C79F4 -/* 800C79D4 000C4914 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C79D8 000C4918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C79D4 000C4914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C79D8 000C4918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C79DC 000C491C 38 63 00 28 */ addi r3, r3, 0x28 /* 800C79E0 000C4920 38 80 00 03 */ li r4, 3 /* 800C79E4 000C4924 4B F6 B2 09 */ bl isTransformLV__21dSv_player_status_b_cCFi @@ -48114,8 +48114,8 @@ lbl_800C7C44: /* 800C7CA8 000C4BE8 4B FE DC 45 */ bl daAlink_c_NS_checkWaitAction /* 800C7CAC 000C4BEC 48 00 00 18 */ b lbl_800C7CC4 lbl_800C7CB0: -/* 800C7CB0 000C4BF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C7CB4 000C4BF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C7CB0 000C4BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C7CB4 000C4BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7CB8 000C4BF8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7CBC 000C4BFC 80 9D 31 84 */ lwz r4, 0x3184(r29) /* 800C7CC0 000C4C00 4B F8 04 BD */ bl dEvent_manager_c_NS_cutEnd @@ -48158,8 +48158,8 @@ lbl_800C7CF8: /* 800C7D44 000C4C84 28 00 00 3A */ cmplwi r0, 0x3a /* 800C7D48 000C4C88 40 82 00 70 */ bne lbl_800C7DB8 lbl_800C7D4C: -/* 800C7D4C 000C4C8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C7D50 000C4C90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C7D4C 000C4C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C7D50 000C4C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7D54 000C4C94 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7D58 000C4C98 80 9D 31 84 */ lwz r4, 0x3184(r29) /* 800C7D5C 000C4C9C 4B F8 04 21 */ bl dEvent_manager_c_NS_cutEnd @@ -48307,8 +48307,8 @@ lbl_800C7F40: /* 800C7F74 000C4EB4 4B FE D9 79 */ bl daAlink_c_NS_checkWaitAction /* 800C7F78 000C4EB8 48 00 03 50 */ b lbl_800C82C8 lbl_800C7F7C: -/* 800C7F7C 000C4EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C7F80 000C4EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C7F7C 000C4EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C7F80 000C4EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7F84 000C4EC4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7F88 000C4EC8 80 9D 31 84 */ lwz r4, 0x3184(r29) /* 800C7F8C 000C4ECC 4B F8 01 F1 */ bl dEvent_manager_c_NS_cutEnd @@ -48346,8 +48346,8 @@ lbl_800C7FE8: /* 800C8000 000C4F40 A8 1D 30 10 */ lha r0, 0x3010(r29) /* 800C8004 000C4F44 2C 00 00 00 */ cmpwi r0, 0 /* 800C8008 000C4F48 41 82 00 18 */ beq lbl_800C8020 -/* 800C800C 000C4F4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C8010 000C4F50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C800C 000C4F4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C8010 000C4F50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C8014 000C4F54 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800C8018 000C4F58 38 80 5E 40 */ li r4, 0x5e40 /* 800C801C 000C4F5C 4B F6 C9 71 */ bl onEventBit__11dSv_event_cFUs @@ -48641,8 +48641,8 @@ lbl_800C841C: /* 800C842C 000C536C C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) /* 800C8430 000C5370 4B FE 4B B1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed lbl_800C8434: -/* 800C8434 000C5374 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C8438 000C5378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C8434 000C5374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C8438 000C5378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C843C 000C537C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C8440 000C5380 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800C8444 000C5384 4B F7 FD 39 */ bl dEvent_manager_c_NS_cutEnd @@ -48992,8 +48992,8 @@ lbl_800C88FC: /* 800C892C 000C586C 48 07 8A E5 */ bl daPy_py_c_NS_checkNoResetFlg0 /* 800C8930 000C5870 28 03 00 00 */ cmplwi r3, 0 /* 800C8934 000C5874 41 82 02 14 */ beq lbl_800C8B48 -/* 800C8938 000C5878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C893C 000C587C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C8938 000C5878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C893C 000C587C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C8940 000C5880 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800C8944 000C5884 7F 83 E3 78 */ mr r3, r28 /* 800C8948 000C5888 38 9F 1D C0 */ addi r4, r31, 0x1dc0 @@ -49081,8 +49081,8 @@ lbl_800C8A4C: /* 800C8A80 000C59C0 C0 1F 1A 08 */ lfs f0, 0x1a08(r31) /* 800C8A84 000C59C4 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800C8A88 000C59C8 41 82 00 C0 */ beq lbl_800C8B48 -/* 800C8A8C 000C59CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800C8A90 000C59D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800C8A8C 000C59CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800C8A90 000C59D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C8A94 000C59D4 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800C8A98 000C59D8 7F A3 EB 78 */ mr r3, r29 /* 800C8A9C 000C59DC 38 9F 1A 60 */ addi r4, r31, 0x1a60 @@ -49949,8 +49949,8 @@ lbl_800C96CC: /* 800C96E4 000C6624 38 7F 19 70 */ addi r3, r31, 0x1970 /* 800C96E8 000C6628 48 00 69 F5 */ bl dBgS_Acch_NS_ClrGroundHit /* 800C96EC 000C662C 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C96F0 000C6630 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800C96F4 000C6634 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800C96F0 000C6630 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800C96F4 000C6634 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800C96F8 000C6638 3B A4 0F 38 */ addi r29, r4, 0xf38 /* 800C96FC 000C663C 7F A4 EB 78 */ mr r4, r29 /* 800C9700 000C6640 4B FA D3 AD */ bl dBgS_Acch_NS_CrrPos @@ -51694,8 +51694,8 @@ daAlink_c_NS_setDrawHand: /* 800CB000 000C7F40 80 1D 05 78 */ lwz r0, 0x578(r29) /* 800CB004 000C7F44 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 800CB008 000C7F48 41 82 00 40 */ beq lbl_800CB048 -/* 800CB00C 000C7F4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CB010 000C7F50 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800CB00C 000C7F4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CB010 000C7F50 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800CB014 000C7F54 88 64 00 14 */ lbz r3, 0x14(r4) /* 800CB018 000C7F58 38 03 FF 01 */ addi r0, r3, -255 /* 800CB01C 000C7F5C 20 00 00 00 */ subfic r0, r0, 0 @@ -52030,8 +52030,8 @@ daAlink_c_NS_checkSwordDraw: /* 800CB494 000C83D4 3B E0 00 00 */ li r31, 0 /* 800CB498 000C83D8 7F E5 FB 78 */ mr r5, r31 /* 800CB49C 000C83DC 7F E6 FB 78 */ mr r6, r31 -/* 800CB4A0 000C83E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800CB4A4 000C83E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800CB4A0 000C83E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800CB4A4 000C83E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800CB4A8 000C83E8 88 04 00 14 */ lbz r0, 0x14(r4) /* 800CB4AC 000C83EC 28 00 00 FF */ cmplwi r0, 0xff /* 800CB4B0 000C83F0 41 82 00 14 */ beq lbl_800CB4C4 @@ -52053,8 +52053,8 @@ lbl_800CB4DC: /* 800CB4E8 000C8428 80 03 05 74 */ lwz r0, 0x574(r3) /* 800CB4EC 000C842C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CB4F0 000C8430 41 82 00 24 */ beq lbl_800CB514 -/* 800CB4F4 000C8434 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CB4F8 000C8438 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CB4F4 000C8434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CB4F8 000C8438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CB4FC 000C843C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CB500 000C8440 38 80 0C 08 */ li r4, 0xc08 /* 800CB504 000C8444 4B F6 94 B9 */ bl isEventBit__11dSv_event_cCFUs @@ -52084,8 +52084,8 @@ daAlink_c_NS_checkShieldDraw: /* 800CB550 000C8490 3B E0 00 00 */ li r31, 0 /* 800CB554 000C8494 7F E5 FB 78 */ mr r5, r31 /* 800CB558 000C8498 7F E6 FB 78 */ mr r6, r31 -/* 800CB55C 000C849C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800CB560 000C84A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800CB55C 000C849C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800CB560 000C84A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800CB564 000C84A4 88 04 00 15 */ lbz r0, 0x15(r4) /* 800CB568 000C84A8 28 00 00 FF */ cmplwi r0, 0xff /* 800CB56C 000C84AC 41 82 00 14 */ beq lbl_800CB580 @@ -52107,8 +52107,8 @@ lbl_800CB598: /* 800CB5A4 000C84E4 80 03 05 74 */ lwz r0, 0x574(r3) /* 800CB5A8 000C84E8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CB5AC 000C84EC 41 82 00 24 */ beq lbl_800CB5D0 -/* 800CB5B0 000C84F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CB5B4 000C84F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CB5B0 000C84F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CB5B4 000C84F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CB5B8 000C84F8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CB5BC 000C84FC 38 80 0C 08 */ li r4, 0xc08 /* 800CB5C0 000C8500 4B F6 93 FD */ bl isEventBit__11dSv_event_cCFUs @@ -52154,8 +52154,8 @@ lbl_800CB630: /* 800CB648 000C8588 48 01 45 81 */ bl daAlink_c_NS_checkBowGrabLeftHand /* 800CB64C 000C858C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CB650 000C8590 40 82 00 24 */ bne lbl_800CB674 -/* 800CB654 000C8594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CB658 000C8598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CB654 000C8594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CB658 000C8598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CB65C 000C859C 88 03 00 15 */ lbz r0, 0x15(r3) /* 800CB660 000C85A0 28 00 00 FF */ cmplwi r0, 0xff /* 800CB664 000C85A4 41 82 00 10 */ beq lbl_800CB674 @@ -52202,8 +52202,8 @@ lbl_800CB680: /* 800CB6FC 000C863C B0 7E 2F F6 */ sth r3, 0x2ff6(r30) /* 800CB700 000C8640 7F C3 F3 78 */ mr r3, r30 /* 800CB704 000C8644 4B F5 04 11 */ bl fopAcM_getTalkEventPartner -/* 800CB708 000C8648 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800CB70C 000C864C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800CB708 000C8648 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800CB70C 000C864C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800CB710 000C8650 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800CB714 000C8654 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 800CB718 000C8658 41 82 00 0C */ beq lbl_800CB724 @@ -52619,8 +52619,8 @@ lbl_800CBCC8: /* 800CBCD8 000C8C18 4E 80 04 21 */ bctrl /* 800CBCDC 000C8C1C 28 03 00 00 */ cmplwi r3, 0 /* 800CBCE0 000C8C20 41 82 00 30 */ beq lbl_800CBD10 -/* 800CBCE4 000C8C24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBCE8 000C8C28 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 800CBCE4 000C8C24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBCE8 000C8C28 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800CBCEC 000C8C2C 80 65 5D B8 */ lwz r3, 0x5db8(r5) /* 800CBCF0 000C8C30 80 83 17 34 */ lwz r4, 0x1734(r3) /* 800CBCF4 000C8C34 7C 9E 23 78 */ mr r30, r4 @@ -52692,15 +52692,15 @@ lbl_800CBDC0: /* 800CBDD8 000C8D18 80 1D 05 7C */ lwz r0, 0x57c(r29) /* 800CBDDC 000C8D1C 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 800CBDE0 000C8D20 40 82 00 1C */ bne lbl_800CBDFC -/* 800CBDE4 000C8D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBDE8 000C8D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CBDE4 000C8D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBDE8 000C8D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CBDEC 000C8D2C 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CBDF0 000C8D30 7F C4 F3 78 */ mr r4, r30 /* 800CBDF4 000C8D34 80 BD 06 B8 */ lwz r5, 0x6b8(r29) /* 800CBDF8 000C8D38 4B F8 A1 25 */ bl dDlst_shadowControl_c_NS_addReal lbl_800CBDFC: -/* 800CBDFC 000C8D3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBE00 000C8D40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CBDFC 000C8D3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBE00 000C8D40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CBE04 000C8D44 88 03 00 14 */ lbz r0, 0x14(r3) /* 800CBE08 000C8D48 28 00 00 3F */ cmplwi r0, 0x3f /* 800CBE0C 000C8D4C 41 82 00 14 */ beq lbl_800CBE20 @@ -52713,8 +52713,8 @@ lbl_800CBE20: /* 800CBE24 000C8D64 4B FF F7 19 */ bl daAlink_c_NS_checkShieldDraw /* 800CBE28 000C8D68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBE2C 000C8D6C 41 82 00 1C */ beq lbl_800CBE48 -/* 800CBE30 000C8D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBE34 000C8D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CBE30 000C8D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBE34 000C8D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CBE38 000C8D78 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CBE3C 000C8D7C 7F C4 F3 78 */ mr r4, r30 /* 800CBE40 000C8D80 80 BD 06 78 */ lwz r5, 0x678(r29) @@ -52747,8 +52747,8 @@ lbl_800CBEA0: lbl_800CBEA4: /* 800CBEA4 000C8DE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBEA8 000C8DE8 40 82 02 F0 */ bne lbl_800CC198 -/* 800CBEAC 000C8DEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBEB0 000C8DF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CBEAC 000C8DEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBEB0 000C8DF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CBEB4 000C8DF4 3B 83 61 C0 */ addi r28, r3, 0x61c0 /* 800CBEB8 000C8DF8 7F 83 E3 78 */ mr r3, r28 /* 800CBEBC 000C8DFC 7F C4 F3 78 */ mr r4, r30 @@ -52768,8 +52768,8 @@ lbl_800CBEE4: /* 800CBEF0 000C8E30 4B F8 A0 2D */ bl dDlst_shadowControl_c_NS_addReal /* 800CBEF4 000C8E34 48 00 02 A4 */ b lbl_800CC198 lbl_800CBEF8: -/* 800CBEF8 000C8E38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CBEFC 000C8E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CBEF8 000C8E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CBEFC 000C8E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CBF00 000C8E40 3B E3 61 C0 */ addi r31, r3, 0x61c0 /* 800CBF04 000C8E44 7F E3 FB 78 */ mr r3, r31 /* 800CBF08 000C8E48 7F C4 F3 78 */ mr r4, r30 @@ -52868,8 +52868,8 @@ lbl_800CC038: /* 800CC064 000C8FA4 48 03 C9 B5 */ bl daAlink_c_NS_checkHookshotWait /* 800CC068 000C8FA8 2C 03 00 00 */ cmpwi r3, 0 /* 800CC06C 000C8FAC 41 82 00 28 */ beq lbl_800CC094 -/* 800CC070 000C8FB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC074 000C8FB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC070 000C8FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC074 000C8FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC078 000C8FB8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800CC07C 000C8FBC 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 800CC080 000C8FC0 40 82 00 14 */ bne lbl_800CC094 @@ -52892,8 +52892,8 @@ lbl_800CC094: /* 800CC0C0 000C9000 7F C4 F3 78 */ mr r4, r30 /* 800CC0C4 000C9004 80 BD 07 10 */ lwz r5, 0x710(r29) /* 800CC0C8 000C9008 4B F8 9E 55 */ bl dDlst_shadowControl_c_NS_addReal -/* 800CC0CC 000C900C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC0D0 000C9010 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC0CC 000C900C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC0D0 000C9010 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC0D4 000C9014 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800CC0D8 000C9018 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 800CC0DC 000C901C 40 82 00 14 */ bne lbl_800CC0F0 @@ -52967,14 +52967,14 @@ lbl_800CC198: /* 800CC1C4 000C9104 80 A3 05 24 */ lwz r5, 0x524(r3) /* 800CC1C8 000C9108 28 05 00 00 */ cmplwi r5, 0 /* 800CC1CC 000C910C 41 82 00 18 */ beq lbl_800CC1E4 -/* 800CC1D0 000C9110 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC1D4 000C9114 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC1D0 000C9110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC1D4 000C9114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC1D8 000C9118 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CC1DC 000C911C 7F C4 F3 78 */ mr r4, r30 /* 800CC1E0 000C9120 4B F8 9D 3D */ bl dDlst_shadowControl_c_NS_addReal lbl_800CC1E4: -/* 800CC1E4 000C9124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC1E8 000C9128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC1E4 000C9124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC1E8 000C9128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC1EC 000C912C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800CC1F0 000C9130 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 800CC1F4 000C9134 41 82 00 50 */ beq lbl_800CC244 @@ -52994,8 +52994,8 @@ lbl_800CC1E4: /* 800CC224 000C9164 80 A3 05 24 */ lwz r5, 0x524(r3) /* 800CC228 000C9168 28 05 00 00 */ cmplwi r5, 0 /* 800CC22C 000C916C 41 82 00 18 */ beq lbl_800CC244 -/* 800CC230 000C9170 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC234 000C9174 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC230 000C9170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC234 000C9174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC238 000C9178 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CC23C 000C917C 7F C4 F3 78 */ mr r4, r30 /* 800CC240 000C9180 4B F8 9C DD */ bl dDlst_shadowControl_c_NS_addReal @@ -53245,8 +53245,8 @@ lbl_800CC490: /* 800CC5BC 000C94FC 4E 80 04 21 */ bctrl /* 800CC5C0 000C9500 48 00 02 04 */ b lbl_800CC7C4 lbl_800CC5C4: -/* 800CC5C4 000C9504 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC5C8 000C9508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC5C4 000C9504 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC5C8 000C9508 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC5CC 000C950C 88 03 00 13 */ lbz r0, 0x13(r3) /* 800CC5D0 000C9510 28 00 00 2E */ cmplwi r0, 0x2e /* 800CC5D4 000C9514 40 82 00 84 */ bne lbl_800CC658 @@ -53434,8 +53434,8 @@ lbl_800CC880: /* 800CC880 000C97C0 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800CC884 000C97C4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800CC888 000C97C8 41 82 00 68 */ beq lbl_800CC8F0 -/* 800CC88C 000C97CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CC890 000C97D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CC88C 000C97CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CC890 000C97D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC894 000C97D4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800CC898 000C97D8 38 63 02 10 */ addi r3, r3, 0x210 /* 800CC89C 000C97DC 80 9C 31 C4 */ lwz r4, 0x31c4(r28) @@ -53820,8 +53820,8 @@ lbl_800CCE28: /* 800CCE28 000C9D68 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800CCE2C 000C9D6C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CCE30 000C9D70 41 82 01 50 */ beq lbl_800CCF80 -/* 800CCE34 000C9D74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CCE38 000C9D78 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800CCE34 000C9D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CCE38 000C9D78 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800CCE3C 000C9D7C 80 04 5F 88 */ lwz r0, 0x5f88(r4) /* 800CCE40 000C9D80 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800CCE44 000C9D84 3B 63 4A C8 */ addi r27, r3, lbl_80434AC8@l @@ -53832,8 +53832,8 @@ lbl_800CCE28: /* 800CCE58 000C9D98 80 9C 06 50 */ lwz r4, 0x650(r28) /* 800CCE5C 000C9D9C 7F C5 F3 78 */ mr r5, r30 /* 800CCE60 000C9DA0 4B FF F4 81 */ bl daAlink_c_NS_modelDraw -/* 800CCE64 000C9DA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CCE68 000C9DA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CCE64 000C9DA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CCE68 000C9DA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCE6C 000C9DAC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CCE70 000C9DB0 38 80 05 10 */ li r4, 0x510 /* 800CCE74 000C9DB4 4B F6 7B 49 */ bl isEventBit__11dSv_event_cCFUs @@ -53884,8 +53884,8 @@ lbl_800CCF0C: /* 800CCF18 000C9E58 A0 1C 2F DC */ lhz r0, 0x2fdc(r28) /* 800CCF1C 000C9E5C 28 00 01 09 */ cmplwi r0, 0x109 /* 800CCF20 000C9E60 40 82 00 1C */ bne lbl_800CCF3C -/* 800CCF24 000C9E64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CCF28 000C9E68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CCF24 000C9E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CCF28 000C9E68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCF2C 000C9E6C 80 03 5F B0 */ lwz r0, 0x5fb0(r3) /* 800CCF30 000C9E70 90 1B 00 48 */ stw r0, 0x48(r27) /* 800CCF34 000C9E74 90 1B 00 4C */ stw r0, 0x4c(r27) @@ -53903,8 +53903,8 @@ lbl_800CCF54: /* 800CCF5C 000C9E9C 7F C5 F3 78 */ mr r5, r30 /* 800CCF60 000C9EA0 4B FF F3 81 */ bl daAlink_c_NS_modelDraw lbl_800CCF64: -/* 800CCF64 000C9EA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CCF68 000C9EA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CCF64 000C9EA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CCF68 000C9EA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCF6C 000C9EAC 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 800CCF70 000C9EB0 90 1B 00 48 */ stw r0, 0x48(r27) /* 800CCF74 000C9EB4 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -53913,8 +53913,8 @@ lbl_800CCF64: lbl_800CCF80: /* 800CCF80 000C9EC0 7F 83 E3 78 */ mr r3, r28 /* 800CCF84 000C9EC4 4B FF E0 45 */ bl daAlink_c_NS_setDrawHand -/* 800CCF88 000C9EC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CCF8C 000C9ECC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CCF88 000C9EC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CCF8C 000C9ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCF90 000C9ED0 3B E3 5D 7C */ addi r31, r3, 0x5d7c /* 800CCF94 000C9ED4 80 1C 31 7C */ lwz r0, 0x317c(r28) /* 800CCF98 000C9ED8 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -54099,8 +54099,8 @@ lbl_800CD1EC: /* 800CD220 000CA160 7F E5 FB 78 */ mr r5, r31 /* 800CD224 000CA164 4B FF F0 BD */ bl daAlink_c_NS_modelDraw lbl_800CD228: -/* 800CD228 000CA168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD22C 000CA16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CD228 000CA168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD22C 000CA16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD230 000CA170 88 03 00 14 */ lbz r0, 0x14(r3) /* 800CD234 000CA174 28 00 00 3F */ cmplwi r0, 0x3f /* 800CD238 000CA178 41 82 00 14 */ beq lbl_800CD24C @@ -54356,8 +54356,8 @@ lbl_800CD5B0: /* 800CD5B4 000CA4F4 28 00 00 42 */ cmplwi r0, 0x42 /* 800CD5B8 000CA4F8 40 82 00 1C */ bne lbl_800CD5D4 lbl_800CD5BC: -/* 800CD5BC 000CA4FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD5C0 000CA500 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CD5BC 000CA4FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD5C0 000CA500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD5C4 000CA504 80 63 5F 88 */ lwz r3, 0x5f88(r3) /* 800CD5C8 000CA508 80 9C 07 70 */ lwz r4, 0x770(r28) /* 800CD5CC 000CA50C 38 A0 00 00 */ li r5, 0 @@ -54399,8 +54399,8 @@ lbl_800CD634: /* 800CD650 000CA590 3A E0 00 00 */ li r23, 0 /* 800CD654 000CA594 3B A0 00 00 */ li r29, 0 /* 800CD658 000CA598 3B E0 00 00 */ li r31, 0 -/* 800CD65C 000CA59C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD660 000CA5A0 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 800CD65C 000CA59C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD660 000CA5A0 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 800CD664 000CA5A4 AB 41 00 12 */ lha r26, 0x12(r1) /* 800CD668 000CA5A8 AB 21 00 14 */ lha r25, 0x14(r1) /* 800CD66C 000CA5AC AB 01 00 16 */ lha r24, 0x16(r1) @@ -54449,8 +54449,8 @@ lbl_800CD6F8: /* 800CD708 000CA648 4E 80 04 21 */ bctrl /* 800CD70C 000CA64C 28 03 00 00 */ cmplwi r3, 0 /* 800CD710 000CA650 40 82 00 38 */ bne lbl_800CD748 -/* 800CD714 000CA654 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD718 000CA658 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CD714 000CA654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD718 000CA658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD71C 000CA65C 80 1C 31 7C */ lwz r0, 0x317c(r28) /* 800CD720 000CA660 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CD724 000CA664 7C 63 02 14 */ add r3, r3, r0 @@ -54466,8 +54466,8 @@ lbl_800CD748: /* 800CD748 000CA688 80 1C 22 04 */ lwz r0, 0x2204(r28) /* 800CD74C 000CA68C 2C 00 00 00 */ cmpwi r0, 0 /* 800CD750 000CA690 40 81 00 20 */ ble lbl_800CD770 -/* 800CD754 000CA694 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD758 000CA698 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800CD754 000CA694 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD758 000CA698 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800CD75C 000CA69C 38 64 5F 64 */ addi r3, r4, 0x5f64 /* 800CD760 000CA6A0 80 84 5F 84 */ lwz r4, 0x5f84(r4) /* 800CD764 000CA6A4 38 BC 21 F0 */ addi r5, r28, 0x21f0 @@ -54504,8 +54504,8 @@ daAlink_c_NS_dtor: /* 800CD7CC 000CA70C 3C 60 80 3B */ lis r3, lbl_803B32B8@ha /* 800CD7D0 000CA710 38 03 32 B8 */ addi r0, r3, lbl_803B32B8@l /* 800CD7D4 000CA714 90 1F 06 28 */ stw r0, 0x628(r31) -/* 800CD7D8 000CA718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD7DC 000CA71C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 800CD7D8 000CA718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD7DC 000CA71C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800CD7E0 000CA720 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 800CD7E4 000CA724 3C 60 00 40 */ lis r3, 0x00400030@ha /* 800CD7E8 000CA728 38 03 00 30 */ addi r0, r3, 0x00400030@l @@ -54537,8 +54537,8 @@ lbl_800CD83C: /* 800CD84C 000CA78C 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 800CD850 000CA790 90 1F 05 78 */ stw r0, 0x578(r31) /* 800CD854 000CA794 38 00 00 01 */ li r0, 1 -/* 800CD858 000CA798 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD85C 000CA79C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CD858 000CA798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD85C 000CA79C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD860 000CA7A0 98 03 5E B8 */ stb r0, 0x5eb8(r3) lbl_800CD864: /* 800CD864 000CA7A4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -54573,8 +54573,8 @@ lbl_800CD8C8: /* 800CD8C8 000CA808 38 7F 2F 5C */ addi r3, r31, 0x2f5c /* 800CD8CC 000CA80C 48 0D A0 61 */ bl dKy_plight_cut /* 800CD8D0 000CA810 38 00 00 00 */ li r0, 0 -/* 800CD8D4 000CA814 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CD8D8 000CA818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CD8D4 000CA814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CD8D8 000CA818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD8DC 000CA81C 90 03 5D AC */ stw r0, 0x5dac(r3) /* 800CD8E0 000CA820 90 03 5D B4 */ stw r0, 0x5db4(r3) /* 800CD8E4 000CA824 38 7F 37 B0 */ addi r3, r31, 0x37b0 @@ -55534,8 +55534,8 @@ daAlink_c_NS_checkSubjectAction: /* 800CE648 000CB588 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800CE64C 000CB58C 64 00 04 00 */ oris r0, r0, 0x400 /* 800CE650 000CB590 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800CE654 000CB594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CE658 000CB598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CE654 000CB594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CE658 000CB598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CE65C 000CB59C 80 1F 31 7C */ lwz r0, 0x317c(r31) /* 800CE660 000CB5A0 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CE664 000CB5A4 7C 63 02 14 */ add r3, r3, r0 @@ -55705,8 +55705,8 @@ daAlink_c_NS_setBodyAngleToCamera: /* 800CE8A8 000CB7E8 90 01 00 44 */ stw r0, 0x44(r1) /* 800CE8AC 000CB7EC 93 E1 00 3C */ stw r31, 0x3c(r1) /* 800CE8B0 000CB7F0 7C 7F 1B 78 */ mr r31, r3 -/* 800CE8B4 000CB7F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CE8B8 000CB7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CE8B4 000CB7F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CE8B8 000CB7F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CE8BC 000CB7FC 80 1F 31 7C */ lwz r0, 0x317c(r31) /* 800CE8C0 000CB800 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CE8C4 000CB804 7C 63 02 14 */ add r3, r3, r0 @@ -55733,8 +55733,8 @@ daAlink_c_NS_setBodyAngleToCamera: /* 800CE918 000CB858 C0 02 92 AC */ lfs f0, lbl_80452CAC-_SDA2_BASE_(r2) /* 800CE91C 000CB85C EC 84 00 32 */ fmuls f4, f4, f0 lbl_800CE920: -/* 800CE920 000CB860 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CE924 000CB864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CE920 000CB860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CE924 000CB864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CE928 000CB868 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800CE92C 000CB86C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800CE930 000CB870 41 82 00 18 */ beq lbl_800CE948 @@ -55809,8 +55809,8 @@ lbl_800CEA0C: /* 800CEA38 000CB978 38 E0 04 00 */ li r7, 0x400 /* 800CEA3C 000CB97C 48 1A 1B 05 */ bl cLib_addCalcAngleS lbl_800CEA40: -/* 800CEA40 000CB980 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEA44 000CB984 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEA40 000CB980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEA44 000CB984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEA48 000CB988 80 83 5F 18 */ lwz r4, 0x5f18(r3) /* 800CEA4C 000CB98C 3C 60 00 20 */ lis r3, 0x00202000@ha /* 800CEA50 000CB990 38 03 20 00 */ addi r0, r3, 0x00202000@l @@ -55866,8 +55866,8 @@ daAlink_c_NS_setSubjectMode: /* 800CEAF4 000CBA34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800CEAF8 000CBA38 7C 08 02 A6 */ mflr r0 /* 800CEAFC 000CBA3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CEB00 000CBA40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEB04 000CBA44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEB00 000CBA40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEB04 000CBA44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEB08 000CBA48 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800CEB0C 000CBA4C 60 00 20 00 */ ori r0, r0, 0x2000 /* 800CEB10 000CBA50 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -55902,8 +55902,8 @@ daAlink_c_NS_subjectCancelTrigger: /* 800CEB78 000CBAB8 4B FF 1A 1D */ bl daAlink_c_NS_checkNotBattleStage /* 800CEB7C 000CBABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CEB80 000CBAC0 40 82 00 30 */ bne lbl_800CEBB0 -/* 800CEB84 000CBAC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEB88 000CBAC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEB84 000CBAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEB88 000CBAC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEB8C 000CBACC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800CEB90 000CBAD0 28 00 00 FF */ cmplwi r0, 0xff /* 800CEB94 000CBAD4 41 82 00 1C */ beq lbl_800CEBB0 @@ -55961,8 +55961,8 @@ daAlink_c_NS_checkSubjectEnd: /* 800CEC4C 000CBB8C 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800CEC50 000CBB90 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 800CEC54 000CBB94 40 82 00 24 */ bne lbl_800CEC78 -/* 800CEC58 000CBB98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEC5C 000CBB9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEC58 000CBB98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEC5C 000CBB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEC60 000CBBA0 80 1E 31 7C */ lwz r0, 0x317c(r30) /* 800CEC64 000CBBA4 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CEC68 000CBBA8 7C 63 02 14 */ add r3, r3, r0 @@ -56036,8 +56036,8 @@ daAlink_searchPeepObj: /* 800CED50 000CBC90 90 01 00 14 */ stw r0, 0x14(r1) /* 800CED54 000CBC94 7C 60 1B 78 */ mr r0, r3 /* 800CED58 000CBC98 7C 85 23 78 */ mr r5, r4 -/* 800CED5C 000CBC9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CED60 000CBCA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CED5C 000CBC9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CED60 000CBCA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CED64 000CBCA4 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 800CED68 000CBCA8 7C 04 03 78 */ mr r4, r0 /* 800CED6C 000CBCAC 4B FF FF 79 */ bl daAlink_c_NS_searchPeepObj @@ -56125,8 +56125,8 @@ lbl_800CEE88: /* 800CEE90 000CBDD0 4B FF FD 49 */ bl daAlink_c_NS_checkSubjectEnd /* 800CEE94 000CBDD4 2C 03 00 00 */ cmpwi r3, 0 /* 800CEE98 000CBDD8 40 82 00 2C */ bne lbl_800CEEC4 -/* 800CEE9C 000CBDDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEEA0 000CBDE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEE9C 000CBDDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEEA0 000CBDE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEEA4 000CBDE4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800CEEA8 000CBDE8 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800CEEAC 000CBDEC 41 82 00 58 */ beq lbl_800CEF04 @@ -56219,8 +56219,8 @@ lbl_800CEFC8: /* 800CEFDC 000CBF1C C0 45 00 94 */ lfs f2, 0x94(r5) /* 800CEFE0 000CBF20 4B FD E0 01 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed lbl_800CEFE4: -/* 800CEFE4 000CBF24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CEFE8 000CBF28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CEFE4 000CBF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CEFE8 000CBF28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CEFEC 000CBF2C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800CEFF0 000CBF30 64 00 00 10 */ oris r0, r0, 0x10 /* 800CEFF4 000CBF34 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -56332,8 +56332,8 @@ lbl_800CF154: /* 800CF170 000CC0B0 4B FE C6 01 */ bl daAlink_c_NS_setSpecialGravity /* 800CF174 000CC0B4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CF178 000CC0B8 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800CF17C 000CC0BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CF180 000CC0C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CF17C 000CC0BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CF180 000CC0C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CF184 000CC0C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800CF188 000CC0C8 60 00 20 00 */ ori r0, r0, 0x2000 /* 800CF18C 000CC0CC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -56374,8 +56374,8 @@ lbl_800CF1E8: /* 800CF20C 000CC14C 88 03 05 6D */ lbz r0, 0x56d(r3) /* 800CF210 000CC150 98 1F 2F AD */ stb r0, 0x2fad(r31) lbl_800CF214: -/* 800CF214 000CC154 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CF218 000CC158 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CF214 000CC154 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CF218 000CC158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CF21C 000CC15C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800CF220 000CC160 7F E4 FB 78 */ mr r4, r31 /* 800CF224 000CC164 38 A0 00 00 */ li r5, 0 @@ -56452,8 +56452,8 @@ lbl_800CF244: /* 800CF33C 000CC27C 7C 64 02 14 */ add r3, r4, r0 /* 800CF340 000CC280 4E 80 00 20 */ blr /* 800CF344 000CC284 38 A0 00 01 */ li r5, 1 -/* 800CF348 000CC288 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800CF34C 000CC28C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800CF348 000CC288 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800CF34C 000CC28C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800CF350 000CC290 80 03 31 7C */ lwz r0, 0x317c(r3) /* 800CF354 000CC294 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CF358 000CC298 7C 84 02 14 */ add r4, r4, r0 @@ -57286,8 +57286,8 @@ dComIfGp_att_getCatghTarget: /* 800CFEC4 000CCE04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800CFEC8 000CCE08 7C 08 02 A6 */ mflr r0 /* 800CFECC 000CCE0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CFED0 000CCE10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CFED4 000CCE14 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800CFED0 000CCE10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CFED4 000CCE14 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800CFED8 000CCE18 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 800CFEDC 000CCE1C 80 84 5B 64 */ lwz r4, 0x5b64(r4) /* 800CFEE0 000CCE20 4B FA 3A AD */ bl dAttCatch_c_NS_convPId @@ -57316,15 +57316,15 @@ lbl_800CFF1C: .global dComIfGs_getLife dComIfGs_getLife: -/* 800CFF2C 000CCE6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CFF30 000CCE70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CFF2C 000CCE6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CFF30 000CCE70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CFF34 000CCE74 A0 63 00 02 */ lhz r3, 2(r3) /* 800CFF38 000CCE78 4E 80 00 20 */ blr .global dComIfGp_getRStatus dComIfGp_getRStatus: -/* 800CFF3C 000CCE7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800CFF40 000CCE80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800CFF3C 000CCE7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800CFF40 000CCE80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CFF44 000CCE84 88 63 5E 1C */ lbz r3, 0x5e1c(r3) /* 800CFF48 000CCE88 4E 80 00 20 */ blr @@ -57356,8 +57356,8 @@ lbl_800CFF88: .global dComIfGp_setItemLifeCount dComIfGp_setItemLifeCount: -/* 800CFFA4 000CCEE4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800CFFA8 000CCEE8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800CFFA4 000CCEE4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800CFFA8 000CCEE8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800CFFAC 000CCEEC C0 04 5D C0 */ lfs f0, 0x5dc0(r4) /* 800CFFB0 000CCEF0 EC 00 08 2A */ fadds f0, f0, f1 /* 800CFFB4 000CCEF4 D0 04 5D C0 */ stfs f0, 0x5dc0(r4) @@ -57426,8 +57426,8 @@ dComIfGp_evmng_startCheck: /* 800D0060 000CCFA0 7C 08 02 A6 */ mflr r0 /* 800D0064 000CCFA4 90 01 00 14 */ stw r0, 0x14(r1) /* 800D0068 000CCFA8 7C 64 1B 78 */ mr r4, r3 -/* 800D006C 000CCFAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D0070 000CCFB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D006C 000CCFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D0070 000CCFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D0074 000CCFB4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D0078 000CCFB8 4B F7 79 C1 */ bl dEvent_manager_c_NS_startCheckOld /* 800D007C 000CCFBC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -57511,8 +57511,8 @@ daAlink_c_NS_checkSpecialDemoMode: .global daAlink_c_NS_setMidnaTalkStatus daAlink_c_NS_setMidnaTalkStatus: -/* 800D014C 000CD08C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D0150 000CD090 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D014C 000CD08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D0150 000CD090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D0154 000CD094 98 83 5E 33 */ stb r4, 0x5e33(r3) /* 800D0158 000CD098 38 00 00 00 */ li r0, 0 /* 800D015C 000CD09C 98 03 5E 4E */ stb r0, 0x5e4e(r3) @@ -57520,8 +57520,8 @@ daAlink_c_NS_setMidnaTalkStatus: .global daAlink_c_NS_set3DStatus daAlink_c_NS_set3DStatus: -/* 800D0164 000CD0A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D0168 000CD0A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D0164 000CD0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D0168 000CD0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D016C 000CD0AC 98 83 5E 26 */ stb r4, 0x5e26(r3) /* 800D0170 000CD0B0 98 A3 5E 2D */ stb r5, 0x5e2d(r3) /* 800D0174 000CD0B4 38 00 00 00 */ li r0, 0 @@ -57546,8 +57546,8 @@ daAlink_c_NS_checkModeFlg: /* 800D01A8 000CD0E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800D01AC 000CD0EC 7C 08 02 A6 */ mflr r0 /* 800D01B0 000CD0F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D01B4 000CD0F4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800D01B8 000CD0F8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800D01B4 000CD0F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800D01B8 000CD0F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800D01BC 000CD0FC 80 04 0D D0 */ lwz r0, 0xdd0(r4) /* 800D01C0 000CD100 54 04 07 3E */ clrlwi r4, r0, 0x1c /* 800D01C4 000CD104 80 03 00 B0 */ lwz r0, 0xb0(r3) @@ -58343,8 +58343,8 @@ daAlink_searchNightStalker: /* 800D0D50 000CDC90 A8 03 00 08 */ lha r0, 8(r3) /* 800D0D54 000CDC94 2C 00 01 B4 */ cmpwi r0, 0x1b4 /* 800D0D58 000CDC98 40 82 00 7C */ bne lbl_800D0DD4 -/* 800D0D5C 000CDC9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D0D60 000CDCA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D0D5C 000CDC9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D0D60 000CDCA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D0D64 000CDCA4 83 E3 5D B4 */ lwz r31, 0x5db4(r3) /* 800D0D68 000CDCA8 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) /* 800D0D6C 000CDCAC C0 1F 04 D0 */ lfs f0, 0x4d0(r31) @@ -58397,8 +58397,8 @@ daAlink_c_NS_checkLightSwordMtrl: /* 800D0E10 000CDD50 90 01 00 14 */ stw r0, 0x14(r1) /* 800D0E14 000CDD54 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D0E18 000CDD58 7C 7F 1B 78 */ mr r31, r3 -/* 800D0E1C 000CDD5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D0E20 000CDD60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D0E1C 000CDD5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D0E20 000CDD60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D0E24 000CDD64 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D0E28 000CDD68 28 00 00 49 */ cmplwi r0, 0x49 /* 800D0E2C 000CDD6C 40 82 00 4C */ bne lbl_800D0E78 @@ -58636,8 +58636,8 @@ lbl_800D1120: /* 800D1130 000CE070 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800D1134 000CE074 28 00 00 FF */ cmplwi r0, 0xff /* 800D1138 000CE078 40 82 01 14 */ bne lbl_800D124C -/* 800D113C 000CE07C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1140 000CE080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D113C 000CE07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1140 000CE080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D1144 000CE084 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D1148 000CE088 38 80 2A 80 */ li r4, 0x2a80 /* 800D114C 000CE08C 4B F6 38 71 */ bl isEventBit__11dSv_event_cCFUs @@ -58653,8 +58653,8 @@ lbl_800D1164: /* 800D1170 000CE0B0 88 1F 2F AA */ lbz r0, 0x2faa(r31) /* 800D1174 000CE0B4 28 00 00 00 */ cmplwi r0, 0 /* 800D1178 000CE0B8 40 82 00 D4 */ bne lbl_800D124C -/* 800D117C 000CE0BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1180 000CE0C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D117C 000CE0BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1180 000CE0C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D1184 000CE0C4 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D1188 000CE0C8 28 00 00 FF */ cmplwi r0, 0xff /* 800D118C 000CE0CC 41 82 00 C0 */ beq lbl_800D124C @@ -58734,8 +58734,8 @@ daAlink_c_NS_setSwordModel: /* 800D1298 000CE1D8 48 1E 4B ED */ bl Z2SeqMgr_NS_bgmSetSwordUsing /* 800D129C 000CE1DC 38 00 00 00 */ li r0, 0 /* 800D12A0 000CE1E0 98 1F 2F 94 */ stb r0, 0x2f94(r31) -/* 800D12A4 000CE1E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D12A8 000CE1E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D12A4 000CE1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D12A8 000CE1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D12AC 000CE1EC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D12B0 000CE1F0 28 00 00 3F */ cmplwi r0, 0x3f /* 800D12B4 000CE1F4 40 82 00 28 */ bne lbl_800D12DC @@ -58950,8 +58950,8 @@ daAlink_c_NS_setCylAtParam: /* 800D1568 000CE4A8 7C FE 3B 78 */ mr r30, r7 /* 800D156C 000CE4AC 7D 1F 43 78 */ mr r31, r8 /* 800D1570 000CE4B0 FF E0 10 90 */ fmr f31, f2 -/* 800D1574 000CE4B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1578 000CE4B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D1574 000CE4B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1578 000CE4B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D157C 000CE4BC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D1580 000CE4C0 28 00 00 3F */ cmplwi r0, 0x3f /* 800D1584 000CE4C4 40 82 00 24 */ bne lbl_800D15A8 @@ -59051,8 +59051,8 @@ daAlink_c_NS_setSwordAtParam: /* 800D16C8 000CE608 80 1A 12 84 */ lwz r0, 0x1284(r26) /* 800D16CC 000CE60C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 800D16D0 000CE610 90 1A 12 84 */ stw r0, 0x1284(r26) -/* 800D16D4 000CE614 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800D16D8 000CE618 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800D16D4 000CE614 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800D16D8 000CE618 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800D16DC 000CE61C 88 04 00 14 */ lbz r0, 0x14(r4) /* 800D16E0 000CE620 28 00 00 3F */ cmplwi r0, 0x3f /* 800D16E4 000CE624 40 82 00 24 */ bne lbl_800D1708 @@ -59205,8 +59205,8 @@ lbl_800D18D0: /* 800D18D8 000CE818 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D18DC 000CE81C D0 01 00 0C */ stfs f0, 0xc(r1) /* 800D18E0 000CE820 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D18E4 000CE824 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D18E8 000CE828 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D18E4 000CE824 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D18E8 000CE828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D18EC 000CE82C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D18F0 000CE830 38 A0 00 1F */ li r5, 0x1f /* 800D18F4 000CE834 38 C1 00 08 */ addi r6, r1, 8 @@ -59345,8 +59345,8 @@ lbl_800D1AB8: /* 800D1AC4 000CEA04 4B FD 06 D5 */ bl daAlink_c_NS_commonLineCheck /* 800D1AC8 000CEA08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1ACC 000CEA0C 41 82 03 2C */ beq lbl_800D1DF8 -/* 800D1AD0 000CEA10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1AD4 000CEA14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D1AD0 000CEA10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1AD4 000CEA14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D1AD8 000CEA18 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800D1ADC 000CEA1C 7F 83 E3 78 */ mr r3, r28 /* 800D1AE0 000CEA20 38 9E 1B 5C */ addi r4, r30, 0x1b5c @@ -59388,8 +59388,8 @@ lbl_800D1B48: /* 800D1B68 000CEAA8 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800D1B6C 000CEAAC 4B FA 32 E5 */ bl dBgS_NS_GetPolyAtt0 /* 800D1B70 000CEAB0 7C 7C 1B 78 */ mr r28, r3 -/* 800D1B74 000CEAB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1B78 000CEAB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D1B74 000CEAB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1B78 000CEAB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D1B7C 000CEABC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D1B80 000CEAC0 28 00 00 3F */ cmplwi r0, 0x3f /* 800D1B84 000CEAC4 41 82 02 0C */ beq lbl_800D1D90 @@ -59520,8 +59520,8 @@ lbl_800D1D1C: /* 800D1D40 000CEC80 48 0D 67 45 */ bl dKy_SordFlush_set lbl_800D1D44: /* 800D1D44 000CEC84 38 DE 1B 78 */ addi r6, r30, 0x1b78 -/* 800D1D48 000CEC88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D1D4C 000CEC8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D1D48 000CEC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D1D4C 000CEC8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D1D50 000CEC90 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800D1D54 000CEC94 38 80 00 00 */ li r4, 0 /* 800D1D58 000CEC98 90 81 00 08 */ stw r4, 8(r1) @@ -59861,8 +59861,8 @@ daAlink_c_NS_commonCutAction: /* 800D21F0 000CF130 38 80 00 01 */ li r4, 1 /* 800D21F4 000CF134 4B FF F2 3D */ bl daAlink_c_NS_resetCombo lbl_800D21F8: -/* 800D21F8 000CF138 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D21FC 000CF13C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D21F8 000CF138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D21FC 000CF13C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2200 000CF140 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800D2204 000CF144 28 00 00 04 */ cmplwi r0, 4 /* 800D2208 000CF148 40 82 00 10 */ bne lbl_800D2218 @@ -60318,8 +60318,8 @@ daAlink_c_NS_checkDoCutAction: /* 800D27F8 000CF738 88 03 2F 8E */ lbz r0, 0x2f8e(r3) /* 800D27FC 000CF73C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800D2800 000CF740 41 82 00 38 */ beq lbl_800D2838 -/* 800D2804 000CF744 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D2808 000CF748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D2804 000CF744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D2808 000CF748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D280C 000CF74C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2810 000CF750 38 80 2A 40 */ li r4, 0x2a40 /* 800D2814 000CF754 4B F6 21 A9 */ bl isEventBit__11dSv_event_cCFUs @@ -60368,8 +60368,8 @@ daAlink_c_NS_checkCutBackState: /* 800D28A0 000CF7E0 93 C1 00 08 */ stw r30, 8(r1) /* 800D28A4 000CF7E4 7C 7E 1B 78 */ mr r30, r3 /* 800D28A8 000CF7E8 3B E0 00 01 */ li r31, 1 -/* 800D28AC 000CF7EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D28B0 000CF7F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D28AC 000CF7EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D28B0 000CF7F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D28B4 000CF7F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D28B8 000CF7F8 38 80 29 02 */ li r4, 0x2902 /* 800D28BC 000CF7FC 4B F6 21 01 */ bl isEventBit__11dSv_event_cCFUs @@ -60414,8 +60414,8 @@ lbl_800D2944: /* 800D2944 000CF884 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800D2948 000CF888 41 82 00 40 */ beq lbl_800D2988 /* 800D294C 000CF88C 3B E0 00 01 */ li r31, 1 -/* 800D2950 000CF890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D2954 000CF894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D2950 000CF890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D2954 000CF894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2958 000CF898 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D295C 000CF89C 38 80 29 01 */ li r4, 0x2901 /* 800D2960 000CF8A0 4B F6 20 5D */ bl isEventBit__11dSv_event_cCFUs @@ -60472,8 +60472,8 @@ daAlink_c_NS_checkDownAttackState: /* 800D2A10 000CF950 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800D2A14 000CF954 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D2A18 000CF958 40 82 00 44 */ bne lbl_800D2A5C -/* 800D2A1C 000CF95C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D2A20 000CF960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D2A1C 000CF95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D2A20 000CF960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2A24 000CF964 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2A28 000CF968 38 80 29 04 */ li r4, 0x2904 /* 800D2A2C 000CF96C 4B F6 1F 91 */ bl isEventBit__11dSv_event_cCFUs @@ -60530,8 +60530,8 @@ daAlink_c_NS_checkCutLargeTurnState: /* 800D2AD4 000CFA14 3B C0 00 01 */ li r30, 1 /* 800D2AD8 000CFA18 3B A0 00 00 */ li r29, 0 /* 800D2ADC 000CFA1C 7F DF F3 78 */ mr r31, r30 -/* 800D2AE0 000CFA20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D2AE4 000CFA24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D2AE0 000CFA20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D2AE4 000CFA24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2AE8 000CFA28 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2AEC 000CFA2C 38 80 2A 20 */ li r4, 0x2a20 /* 800D2AF0 000CFA30 4B F6 1E CD */ bl isEventBit__11dSv_event_cCFUs @@ -60544,8 +60544,8 @@ daAlink_c_NS_checkCutLargeTurnState: lbl_800D2B0C: /* 800D2B0C 000CFA4C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800D2B10 000CFA50 41 82 00 28 */ beq lbl_800D2B38 -/* 800D2B14 000CFA54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D2B18 000CFA58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D2B14 000CFA54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D2B18 000CFA58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2B1C 000CFA5C A3 E3 00 02 */ lhz r31, 2(r3) /* 800D2B20 000CFA60 4B F5 B1 89 */ bl dComIfGs_getMaxLifeGauge /* 800D2B24 000CFA64 54 63 04 3E */ clrlwi r3, r3, 0x10 @@ -60989,8 +60989,8 @@ lbl_800D30E0: /* 800D312C 000D006C 4B FF F1 D9 */ bl daAlink_c_NS_setSwordComboVoice /* 800D3130 000D0070 38 00 00 00 */ li r0, 0 /* 800D3134 000D0074 B0 1D 30 12 */ sth r0, 0x3012(r29) -/* 800D3138 000D0078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D313C 000D007C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D3138 000D0078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D313C 000D007C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D3140 000D0080 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D3144 000D0084 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D3148 000D0088 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -61100,8 +61100,8 @@ lbl_800D32A4: /* 800D32CC 000D020C 28 00 00 54 */ cmplwi r0, 0x54 /* 800D32D0 000D0210 40 82 00 1C */ bne lbl_800D32EC lbl_800D32D4: -/* 800D32D4 000D0214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D32D8 000D0218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D32D4 000D0214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D32D8 000D0218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D32DC 000D021C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D32E0 000D0220 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D32E4 000D0224 4B F7 4E 99 */ bl dEvent_manager_c_NS_cutEnd @@ -61436,8 +61436,8 @@ lbl_800D376C: lbl_800D3774: /* 800D3774 000D06B4 38 00 00 00 */ li r0, 0 /* 800D3778 000D06B8 B0 1C 30 12 */ sth r0, 0x3012(r28) -/* 800D377C 000D06BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D3780 000D06C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D377C 000D06BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D3780 000D06C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D3784 000D06C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D3788 000D06C8 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D378C 000D06CC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -61590,8 +61590,8 @@ lbl_800D3998: /* 800D39A4 000D08E4 28 00 00 54 */ cmplwi r0, 0x54 /* 800D39A8 000D08E8 40 82 00 1C */ bne lbl_800D39C4 lbl_800D39AC: -/* 800D39AC 000D08EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D39B0 000D08F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D39AC 000D08EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D39B0 000D08F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D39B4 000D08F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D39B8 000D08F8 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D39BC 000D08FC 4B F7 47 C1 */ bl dEvent_manager_c_NS_cutEnd @@ -61790,8 +61790,8 @@ lbl_800D3BF8: /* 800D3C78 000D0BB8 B0 1E 30 12 */ sth r0, 0x3012(r30) /* 800D3C7C 000D0BBC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) /* 800D3C80 000D0BC0 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800D3C84 000D0BC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D3C88 000D0BC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D3C84 000D0BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D3C88 000D0BC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D3C8C 000D0BCC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D3C90 000D0BD0 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D3C94 000D0BD4 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -61979,8 +61979,8 @@ lbl_800D3EF8: /* 800D3F38 000D0E78 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800D3F3C 000D0E7C 28 00 00 52 */ cmplwi r0, 0x52 /* 800D3F40 000D0E80 40 82 00 1C */ bne lbl_800D3F5C -/* 800D3F44 000D0E84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D3F48 000D0E88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D3F44 000D0E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D3F48 000D0E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D3F4C 000D0E8C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D3F50 000D0E90 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D3F54 000D0E94 4B F7 42 29 */ bl dEvent_manager_c_NS_cutEnd @@ -62160,8 +62160,8 @@ lbl_800D41B4: /* 800D41BC 000D10FC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D41C0 000D1100 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800D41C4 000D1104 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D41C8 000D1108 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D41CC 000D110C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D41C8 000D1108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D41CC 000D110C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D41D0 000D1110 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D41D4 000D1114 38 A0 00 1F */ li r5, 0x1f /* 800D41D8 000D1118 38 C1 00 08 */ addi r6, r1, 8 @@ -62298,8 +62298,8 @@ lbl_800D4370: /* 800D43B4 000D12F4 4B FF D1 79 */ bl daAlink_c_NS_setCutType /* 800D43B8 000D12F8 7F C3 F3 78 */ mr r3, r30 /* 800D43BC 000D12FC 4B FF DF 49 */ bl daAlink_c_NS_setSwordComboVoice -/* 800D43C0 000D1300 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D43C4 000D1304 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D43C0 000D1300 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D43C4 000D1304 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D43C8 000D1308 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D43CC 000D130C 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D43D0 000D1310 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -62336,8 +62336,8 @@ lbl_800D4370: /* 800D444C 000D138C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D4450 000D1390 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800D4454 000D1394 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D4458 000D1398 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D445C 000D139C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4458 000D1398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D445C 000D139C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4460 000D13A0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D4464 000D13A4 38 80 00 05 */ li r4, 5 /* 800D4468 000D13A8 38 A0 00 1F */ li r5, 0x1f @@ -62741,8 +62741,8 @@ lbl_800D49DC: /* 800D4A0C 000D194C B0 1C 04 DE */ sth r0, 0x4de(r28) /* 800D4A10 000D1950 38 80 00 00 */ li r4, 0 /* 800D4A14 000D1954 90 9C 31 80 */ stw r4, 0x3180(r28) -/* 800D4A18 000D1958 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D4A1C 000D195C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4A18 000D1958 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D4A1C 000D195C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4A20 000D1960 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D4A24 000D1964 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D4A28 000D1968 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -62829,8 +62829,8 @@ lbl_800D4B58: /* 800D4B58 000D1A98 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800D4B5C 000D1A9C 28 00 00 24 */ cmplwi r0, 0x24 /* 800D4B60 000D1AA0 40 82 00 1C */ bne lbl_800D4B7C -/* 800D4B64 000D1AA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D4B68 000D1AA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4B64 000D1AA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D4B68 000D1AA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4B6C 000D1AAC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D4B70 000D1AB0 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800D4B74 000D1AB4 4B F7 36 09 */ bl dEvent_manager_c_NS_cutEnd @@ -63055,8 +63055,8 @@ lbl_800D4E60: /* 800D4E88 000D1DC8 38 63 DB 84 */ addi r3, r3, lbl_8038DB84@l /* 800D4E8C 000D1DCC C0 03 00 5C */ lfs f0, 0x5c(r3) /* 800D4E90 000D1DD0 D0 1E 05 94 */ stfs f0, 0x594(r30) -/* 800D4E94 000D1DD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D4E98 000D1DD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4E94 000D1DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D4E98 000D1DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4E9C 000D1DDC 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D4EA0 000D1DE0 28 00 00 3F */ cmplwi r0, 0x3f /* 800D4EA4 000D1DE4 41 82 00 10 */ beq lbl_800D4EB4 @@ -63071,8 +63071,8 @@ lbl_800D4EBC: /* 800D4EC0 000D1E00 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800D4EC4 000D1E04 64 00 10 00 */ oris r0, r0, 0x1000 /* 800D4EC8 000D1E08 90 1E 05 74 */ stw r0, 0x574(r30) -/* 800D4ECC 000D1E0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D4ED0 000D1E10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4ECC 000D1E0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D4ED0 000D1E10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4ED4 000D1E14 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800D4ED8 000D1E18 64 00 40 00 */ oris r0, r0, 0x4000 /* 800D4EDC 000D1E1C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -63095,8 +63095,8 @@ lbl_800D4EBC: /* 800D4F20 000D1E60 7C 7F 1B 78 */ mr r31, r3 /* 800D4F24 000D1E64 38 80 00 00 */ li r4, 0 /* 800D4F28 000D1E68 4B FD E8 0D */ bl daAlink_c_NS_setShapeAngleToAtnActor -/* 800D4F2C 000D1E6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D4F30 000D1E70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D4F2C 000D1E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D4F30 000D1E70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4F34 000D1E74 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D4F38 000D1E78 28 00 00 3F */ cmplwi r0, 0x3f /* 800D4F3C 000D1E7C 41 82 00 10 */ beq lbl_800D4F4C @@ -63198,8 +63198,8 @@ lbl_800D5088: lbl_800D509C: /* 800D509C 000D1FDC 2C 1E 00 00 */ cmpwi r30, 0 /* 800D50A0 000D1FE0 41 82 02 FC */ beq lbl_800D539C -/* 800D50A4 000D1FE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D50A8 000D1FE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D50A4 000D1FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D50A8 000D1FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D50AC 000D1FEC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D50B0 000D1FF0 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800D50B4 000D1FF4 4B F7 30 C9 */ bl dEvent_manager_c_NS_cutEnd @@ -63705,8 +63705,8 @@ lbl_800D57A8: /* 800D57B8 000D26F8 7F E3 FB 78 */ mr r3, r31 /* 800D57BC 000D26FC 38 80 00 27 */ li r4, 0x27 /* 800D57C0 000D2700 4B FF BD 6D */ bl daAlink_c_NS_setCutType -/* 800D57C4 000D2704 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D57C8 000D2708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D57C4 000D2704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D57C8 000D2708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D57CC 000D270C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800D57D0 000D2710 64 00 00 40 */ oris r0, r0, 0x40 /* 800D57D4 000D2714 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -63832,8 +63832,8 @@ lbl_800D5968: /* 800D5990 000D28D0 38 C0 00 00 */ li r6, 0 /* 800D5994 000D28D4 48 19 1A 61 */ bl csXyz_X1_ /* 800D5998 000D28D8 38 DE 05 68 */ addi r6, r30, 0x568 -/* 800D599C 000D28DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D59A0 000D28E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D599C 000D28DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D59A0 000D28E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D59A4 000D28E4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800D59A8 000D28E8 38 80 00 03 */ li r4, 3 /* 800D59AC 000D28EC 38 A0 00 00 */ li r5, 0 @@ -63852,8 +63852,8 @@ lbl_800D59C0: /* 800D59DC 000D291C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D59E0 000D2920 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D59E4 000D2924 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 800D59E8 000D2928 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D59EC 000D292C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D59E8 000D2928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D59EC 000D292C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D59F0 000D2930 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D59F4 000D2934 38 80 00 04 */ li r4, 4 /* 800D59F8 000D2938 38 A0 00 1F */ li r5, 0x1f @@ -63894,8 +63894,8 @@ lbl_800D5A24: /* 800D5A7C 000D29BC 90 1F 05 84 */ stw r0, 0x584(r31) /* 800D5A80 000D29C0 38 00 00 00 */ li r0, 0 /* 800D5A84 000D29C4 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800D5A88 000D29C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D5A8C 000D29CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D5A88 000D29C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D5A8C 000D29CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D5A90 000D29D0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800D5A94 000D29D4 64 00 00 40 */ oris r0, r0, 0x40 /* 800D5A98 000D29D8 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -63957,8 +63957,8 @@ lbl_800D5B60: /* 800D5B6C 000D2AAC 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800D5B70 000D2AB0 28 00 00 51 */ cmplwi r0, 0x51 /* 800D5B74 000D2AB4 40 82 00 1C */ bne lbl_800D5B90 -/* 800D5B78 000D2AB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D5B7C 000D2ABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D5B78 000D2AB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D5B7C 000D2ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D5B80 000D2AC0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D5B84 000D2AC4 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800D5B88 000D2AC8 4B F7 25 F5 */ bl dEvent_manager_c_NS_cutEnd @@ -64402,8 +64402,8 @@ daAlink_c_NS_procCutHeadLandInit: /* 800D61C4 000D3104 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800D61C8 000D3108 28 00 00 53 */ cmplwi r0, 0x53 /* 800D61CC 000D310C 40 82 00 1C */ bne lbl_800D61E8 -/* 800D61D0 000D3110 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D61D4 000D3114 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D61D0 000D3110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D61D4 000D3114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D61D8 000D3118 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D61DC 000D311C 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D61E0 000D3120 4B F7 1F 9D */ bl dEvent_manager_c_NS_cutEnd @@ -64807,8 +64807,8 @@ daAlink_c_NS_procCutLargeJumpLandInit: /* 800D6794 000D36D4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D6798 000D36D8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800D679C 000D36DC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D67A0 000D36E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D67A4 000D36E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D67A0 000D36E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D67A4 000D36E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D67A8 000D36E8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D67AC 000D36EC 38 80 00 03 */ li r4, 3 /* 800D67B0 000D36F0 38 A0 00 1F */ li r5, 0x1f @@ -64859,8 +64859,8 @@ lbl_800D6850: /* 800D6860 000D37A0 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800D6864 000D37A4 28 00 00 56 */ cmplwi r0, 0x56 /* 800D6868 000D37A8 40 82 00 1C */ bne lbl_800D6884 -/* 800D686C 000D37AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D6870 000D37B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D686C 000D37AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D6870 000D37B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6874 000D37B4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6878 000D37B8 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800D687C 000D37BC 4B F7 19 01 */ bl dEvent_manager_c_NS_cutEnd @@ -65052,8 +65052,8 @@ lbl_800D6B08: /* 800D6B24 000D3A64 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800D6B28 000D3A68 28 00 00 1E */ cmplwi r0, 0x1e /* 800D6B2C 000D3A6C 40 82 00 1C */ bne lbl_800D6B48 -/* 800D6B30 000D3A70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D6B34 000D3A74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D6B30 000D3A70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D6B34 000D3A74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6B38 000D3A78 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6B3C 000D3A7C 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D6B40 000D3A80 4B F7 16 3D */ bl dEvent_manager_c_NS_cutEnd @@ -65128,8 +65128,8 @@ lbl_800D6C10: /* 800D6C38 000D3B78 D0 1F 00 10 */ stfs f0, 0x10(r31) /* 800D6C3C 000D3B7C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D6C40 000D3B80 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 800D6C44 000D3B84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D6C48 000D3B88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D6C44 000D3B84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D6C48 000D3B88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6C4C 000D3B8C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6C50 000D3B90 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800D6C54 000D3B94 4B F7 15 29 */ bl dEvent_manager_c_NS_cutEnd @@ -65351,8 +65351,8 @@ daAlink_c_NS_checkNoLandDamageSlidePolygon: /* 800D6F50 000D3E90 38 60 00 01 */ li r3, 1 /* 800D6F54 000D3E94 48 00 00 74 */ b lbl_800D6FC8 lbl_800D6F58: -/* 800D6F58 000D3E98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D6F5C 000D3E9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D6F58 000D3E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D6F5C 000D3E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6F60 000D3EA0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800D6F64 000D3EA4 7F E3 FB 78 */ mr r3, r31 /* 800D6F68 000D3EA8 38 9E 1A 60 */ addi r4, r30, 0x1a60 @@ -65453,8 +65453,8 @@ daAlink_c_NS_checkCaughtEscapeCutTurn: /* 800D70B4 000D3FF4 80 03 19 9C */ lwz r0, 0x199c(r3) /* 800D70B8 000D3FF8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800D70BC 000D3FFC 41 82 00 8C */ beq lbl_800D7148 -/* 800D70C0 000D4000 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D70C4 000D4004 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D70C0 000D4000 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D70C4 000D4004 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D70C8 000D4008 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D70CC 000D400C 28 00 00 FF */ cmplwi r0, 0xff /* 800D70D0 000D4010 40 82 00 10 */ bne lbl_800D70E0 @@ -65611,8 +65611,8 @@ daAlink_c_NS_setDamagePoint: /* 800D72D4 000D4214 7C 9E 23 79 */ or. r30, r4, r4 /* 800D72D8 000D4218 7C DF 33 78 */ mr r31, r6 /* 800D72DC 000D421C 41 81 00 48 */ bgt lbl_800D7324 -/* 800D72E0 000D4220 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D72E4 000D4224 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D72E0 000D4220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D72E4 000D4224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D72E8 000D4228 C0 43 5D C0 */ lfs f2, 0x5dc0(r3) /* 800D72EC 000D422C 7C 1E 00 D0 */ neg r0, r30 /* 800D72F0 000D4230 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -65665,8 +65665,8 @@ lbl_800D739C: /* 800D73A0 000D42E0 48 00 04 29 */ bl daAlink_c_NS_checkMagicArmorNoDamage /* 800D73A4 000D42E4 2C 03 00 00 */ cmpwi r3, 0 /* 800D73A8 000D42E8 41 82 00 24 */ beq lbl_800D73CC -/* 800D73AC 000D42EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D73B0 000D42F0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800D73AC 000D42EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D73B0 000D42F0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800D73B4 000D42F4 80 64 5D C4 */ lwz r3, 0x5dc4(r4) /* 800D73B8 000D42F8 7C 1E 00 D0 */ neg r0, r30 /* 800D73BC 000D42FC 1C 00 00 0A */ mulli r0, r0, 0xa @@ -65674,8 +65674,8 @@ lbl_800D739C: /* 800D73C4 000D4304 90 04 5D C4 */ stw r0, 0x5dc4(r4) /* 800D73C8 000D4308 48 00 00 40 */ b lbl_800D7408 lbl_800D73CC: -/* 800D73CC 000D430C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D73D0 000D4310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D73CC 000D430C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D73D0 000D4310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D73D4 000D4314 C0 43 5D C0 */ lfs f2, 0x5dc0(r3) /* 800D73D8 000D4318 7C 1E 00 D0 */ neg r0, r30 /* 800D73DC 000D431C C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -65935,8 +65935,8 @@ daAlink_c_NS_checkIcePolygonDamage: /* 800D7770 000D46B0 90 01 00 14 */ stw r0, 0x14(r1) /* 800D7774 000D46B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D7778 000D46B8 7C 7F 1B 78 */ mr r31, r3 -/* 800D777C 000D46BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D7780 000D46C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D777C 000D46BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D7780 000D46C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D7784 000D46C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800D7788 000D46C8 7F E4 FB 78 */ mr r4, r31 /* 800D778C 000D46CC 4B F9 D6 C5 */ bl dBgS_NS_GetPolyAtt0 @@ -66013,8 +66013,8 @@ lbl_800D7860: /* 800D787C 000D47BC 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 800D7880 000D47C0 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800D7884 000D47C4 41 82 00 88 */ beq lbl_800D790C -/* 800D7888 000D47C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D788C 000D47CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D7888 000D47C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D788C 000D47CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D7890 000D47D0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800D7894 000D47D4 7F C3 F3 78 */ mr r3, r30 /* 800D7898 000D47D8 38 9F 1A 60 */ addi r4, r31, 0x1a60 @@ -66059,8 +66059,8 @@ lbl_800D790C: /* 800D792C 000D486C 4B FD 9B 5D */ bl daAlink_c_NS_checkWaterPolygonUnder /* 800D7930 000D4870 2C 03 00 00 */ cmpwi r3, 0 /* 800D7934 000D4874 41 82 00 3C */ beq lbl_800D7970 -/* 800D7938 000D4878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D793C 000D487C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D7938 000D4878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D793C 000D487C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D7940 000D4880 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800D7944 000D4884 38 9F 1A F0 */ addi r4, r31, 0x1af0 /* 800D7948 000D4888 4B F9 CD 19 */ bl cBgS_NS_ChkPolySafe @@ -66110,8 +66110,8 @@ lbl_800D79E0: /* 800D79E8 000D4928 41 82 00 94 */ beq lbl_800D7A7C /* 800D79EC 000D492C 3B BF 18 B0 */ addi r29, r31, 0x18b0 /* 800D79F0 000D4930 3B 80 00 00 */ li r28, 0 -/* 800D79F4 000D4934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D79F8 000D4938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D79F4 000D4934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D79F8 000D4938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D79FC 000D493C 3B C3 0F 38 */ addi r30, r3, 0xf38 lbl_800D7A00: /* 800D7A00 000D4940 80 1D 00 10 */ lwz r0, 0x10(r29) @@ -66649,8 +66649,8 @@ lbl_800D8150: /* 800D8164 000D50A4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8168 000D50A8 D0 01 00 AC */ stfs f0, 0xac(r1) /* 800D816C 000D50AC D0 21 00 B0 */ stfs f1, 0xb0(r1) -/* 800D8170 000D50B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D8174 000D50B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8170 000D50B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D8174 000D50B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8178 000D50B8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D817C 000D50BC 38 80 00 02 */ li r4, 2 /* 800D8180 000D50C0 38 A0 00 1F */ li r5, 0x1f @@ -66696,8 +66696,8 @@ lbl_800D820C: /* 800D8214 000D5154 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8218 000D5158 D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 800D821C 000D515C D0 21 00 A4 */ stfs f1, 0xa4(r1) -/* 800D8220 000D5160 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D8224 000D5164 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8220 000D5160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D8224 000D5164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8228 000D5168 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D822C 000D516C 38 80 00 02 */ li r4, 2 /* 800D8230 000D5170 38 A0 00 1F */ li r5, 0x1f @@ -66724,8 +66724,8 @@ lbl_800D8274: /* 800D827C 000D51BC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8280 000D51C0 D0 01 00 94 */ stfs f0, 0x94(r1) /* 800D8284 000D51C4 D0 21 00 98 */ stfs f1, 0x98(r1) -/* 800D8288 000D51C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D828C 000D51CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8288 000D51C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D828C 000D51CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8290 000D51D0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D8294 000D51D4 38 80 00 02 */ li r4, 2 /* 800D8298 000D51D8 38 A0 00 1F */ li r5, 0x1f @@ -66812,8 +66812,8 @@ lbl_800D839C: /* 800D83BC 000D52FC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D83C0 000D5300 D0 01 00 88 */ stfs f0, 0x88(r1) /* 800D83C4 000D5304 D0 21 00 8C */ stfs f1, 0x8c(r1) -/* 800D83C8 000D5308 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D83CC 000D530C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D83C8 000D5308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D83CC 000D530C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D83D0 000D5310 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D83D4 000D5314 38 80 00 04 */ li r4, 4 /* 800D83D8 000D5318 38 A0 00 1F */ li r5, 0x1f @@ -66904,8 +66904,8 @@ lbl_800D84D8: /* 800D850C 000D544C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8510 000D5450 D0 01 00 7C */ stfs f0, 0x7c(r1) /* 800D8514 000D5454 D0 21 00 80 */ stfs f1, 0x80(r1) -/* 800D8518 000D5458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D851C 000D545C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8518 000D5458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D851C 000D545C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8520 000D5460 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D8524 000D5464 38 80 00 05 */ li r4, 5 /* 800D8528 000D5468 38 A0 00 01 */ li r5, 1 @@ -66923,8 +66923,8 @@ lbl_800D8538: /* 800D8554 000D5494 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8558 000D5498 D0 01 00 70 */ stfs f0, 0x70(r1) /* 800D855C 000D549C D0 21 00 74 */ stfs f1, 0x74(r1) -/* 800D8560 000D54A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D8564 000D54A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8560 000D54A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D8564 000D54A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8568 000D54A8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D856C 000D54AC 38 80 00 04 */ li r4, 4 /* 800D8570 000D54B0 38 A0 00 01 */ li r5, 1 @@ -66939,8 +66939,8 @@ lbl_800D8580: /* 800D8590 000D54D0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8594 000D54D4 D0 01 00 64 */ stfs f0, 0x64(r1) /* 800D8598 000D54D8 D0 21 00 68 */ stfs f1, 0x68(r1) -/* 800D859C 000D54DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D85A0 000D54E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D859C 000D54DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D85A0 000D54E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D85A4 000D54E4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D85A8 000D54E8 38 80 00 02 */ li r4, 2 /* 800D85AC 000D54EC 38 A0 00 01 */ li r5, 1 @@ -66953,8 +66953,8 @@ lbl_800D85BC: /* 800D85C4 000D5504 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D85C8 000D5508 D0 01 00 58 */ stfs f0, 0x58(r1) /* 800D85CC 000D550C D0 21 00 5C */ stfs f1, 0x5c(r1) -/* 800D85D0 000D5510 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D85D4 000D5514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D85D0 000D5510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D85D4 000D5514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D85D8 000D5518 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D85DC 000D551C 38 80 00 03 */ li r4, 3 /* 800D85E0 000D5520 38 A0 00 01 */ li r5, 1 @@ -67098,8 +67098,8 @@ lbl_800D87C0: /* 800D87D4 000D5714 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D87D8 000D5718 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 800D87DC 000D571C D0 21 00 50 */ stfs f1, 0x50(r1) -/* 800D87E0 000D5720 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D87E4 000D5724 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D87E0 000D5720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D87E4 000D5724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D87E8 000D5728 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D87EC 000D572C 38 80 00 04 */ li r4, 4 /* 800D87F0 000D5730 38 A0 00 1F */ li r5, 0x1f @@ -67117,8 +67117,8 @@ lbl_800D8800: /* 800D881C 000D575C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8820 000D5760 D0 01 00 40 */ stfs f0, 0x40(r1) /* 800D8824 000D5764 D0 21 00 44 */ stfs f1, 0x44(r1) -/* 800D8828 000D5768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D882C 000D576C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8828 000D5768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D882C 000D576C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8830 000D5770 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D8834 000D5774 38 80 00 08 */ li r4, 8 /* 800D8838 000D5778 38 A0 00 1F */ li r5, 0x1f @@ -67136,8 +67136,8 @@ lbl_800D8848: /* 800D8864 000D57A4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D8868 000D57A8 D0 01 00 34 */ stfs f0, 0x34(r1) /* 800D886C 000D57AC D0 21 00 38 */ stfs f1, 0x38(r1) -/* 800D8870 000D57B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D8874 000D57B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8870 000D57B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D8874 000D57B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8878 000D57B8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D887C 000D57BC 38 80 00 04 */ li r4, 4 /* 800D8880 000D57C0 38 A0 00 1F */ li r5, 0x1f @@ -67150,8 +67150,8 @@ lbl_800D8890: /* 800D8898 000D57D8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D889C 000D57DC D0 01 00 28 */ stfs f0, 0x28(r1) /* 800D88A0 000D57E0 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 800D88A4 000D57E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D88A8 000D57E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D88A4 000D57E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D88A8 000D57E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D88AC 000D57EC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D88B0 000D57F0 38 80 00 02 */ li r4, 2 /* 800D88B4 000D57F4 38 A0 00 1F */ li r5, 0x1f @@ -67538,8 +67538,8 @@ lbl_800D8E14: /* 800D8E24 000D5D64 4E 80 04 21 */ bctrl /* 800D8E28 000D5D68 28 03 00 00 */ cmplwi r3, 0 /* 800D8E2C 000D5D6C 41 82 00 C8 */ beq lbl_800D8EF4 -/* 800D8E30 000D5D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D8E34 000D5D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D8E30 000D5D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D8E34 000D5D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D8E38 000D5D78 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 800D8E3C 000D5D7C A8 04 17 08 */ lha r0, 0x1708(r4) /* 800D8E40 000D5D80 7C 00 07 35 */ extsh. r0, r0 @@ -68199,8 +68199,8 @@ lbl_800D9764: /* 800D97A4 000D66E4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800D97A8 000D66E8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800D97AC 000D66EC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D97B0 000D66F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D97B4 000D66F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D97B0 000D66F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D97B4 000D66F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D97B8 000D66F8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D97BC 000D66FC 38 80 00 06 */ li r4, 6 /* 800D97C0 000D6700 38 A0 00 1F */ li r5, 0x1f @@ -68511,8 +68511,8 @@ lbl_800D9BEC: /* 800D9BF4 000D6B34 80 15 05 78 */ lwz r0, 0x578(r21) /* 800D9BF8 000D6B38 54 00 01 D1 */ rlwinm. r0, r0, 0, 7, 8 /* 800D9BFC 000D6B3C 41 82 00 40 */ beq lbl_800D9C3C -/* 800D9C00 000D6B40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800D9C04 000D6B44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800D9C00 000D6B40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800D9C04 000D6B44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D9C08 000D6B48 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800D9C0C 000D6B4C 28 03 00 00 */ cmplwi r3, 0 /* 800D9C10 000D6B50 41 82 00 2C */ beq lbl_800D9C3C @@ -69046,8 +69046,8 @@ lbl_800DA384: /* 800DA390 000D72D0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DA394 000D72D4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DA398 000D72D8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DA39C 000D72DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DA3A0 000D72E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DA39C 000D72DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DA3A0 000D72E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DA3A4 000D72E4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DA3A8 000D72E8 38 80 00 06 */ li r4, 6 /* 800DA3AC 000D72EC 38 A0 00 1F */ li r5, 0x1f @@ -69257,8 +69257,8 @@ lbl_800DA6A4: /* 800DA6B0 000D75F0 28 00 00 09 */ cmplwi r0, 9 /* 800DA6B4 000D75F4 40 82 00 1C */ bne lbl_800DA6D0 lbl_800DA6B8: -/* 800DA6B8 000D75F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DA6BC 000D75FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DA6B8 000D75F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DA6BC 000D75FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DA6C0 000D7600 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800DA6C4 000D7604 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800DA6C8 000D7608 4B F6 DA B5 */ bl dEvent_manager_c_NS_cutEnd @@ -69381,8 +69381,8 @@ lbl_800DA868: /* 800DA868 000D77A8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800DA86C 000D77AC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800DA870 000D77B0 90 01 00 34 */ stw r0, 0x34(r1) -/* 800DA874 000D77B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DA878 000D77B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DA874 000D77B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DA878 000D77B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DA87C 000D77BC 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800DA880 000D77C0 7F C3 F3 78 */ mr r3, r30 /* 800DA884 000D77C4 38 98 1B 5C */ addi r4, r24, 0x1b5c @@ -69803,8 +69803,8 @@ daAlink_c_NS_procLandDamageInit: /* 800DAE68 000D7DA8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DAE6C 000D7DAC D0 01 00 30 */ stfs f0, 0x30(r1) /* 800DAE70 000D7DB0 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 800DAE74 000D7DB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DAE78 000D7DB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DAE74 000D7DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DAE78 000D7DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DAE7C 000D7DBC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DAE80 000D7DC0 38 80 00 06 */ li r4, 6 /* 800DAE84 000D7DC4 38 A0 00 1F */ li r5, 0x1f @@ -69817,8 +69817,8 @@ lbl_800DAE94: /* 800DAE9C 000D7DDC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DAEA0 000D7DE0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800DAEA4 000D7DE4 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 800DAEA8 000D7DE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DAEAC 000D7DEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DAEA8 000D7DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DAEAC 000D7DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DAEB0 000D7DF0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DAEB4 000D7DF4 38 80 00 02 */ li r4, 2 /* 800DAEB8 000D7DF8 38 A0 00 0F */ li r5, 0xf @@ -69845,8 +69845,8 @@ lbl_800DAEE8: /* 800DAF04 000D7E44 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DAF08 000D7E48 D0 01 00 18 */ stfs f0, 0x18(r1) /* 800DAF0C 000D7E4C D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 800DAF10 000D7E50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DAF14 000D7E54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DAF10 000D7E50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DAF14 000D7E54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DAF18 000D7E58 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DAF1C 000D7E5C 38 80 00 04 */ li r4, 4 /* 800DAF20 000D7E60 38 A0 00 1F */ li r5, 0x1f @@ -69871,8 +69871,8 @@ lbl_800DAF48: /* 800DAF64 000D7EA4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DAF68 000D7EA8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DAF6C 000D7EAC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DAF70 000D7EB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DAF74 000D7EB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DAF70 000D7EB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DAF74 000D7EB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DAF78 000D7EB8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DAF7C 000D7EBC 38 80 00 05 */ li r4, 5 /* 800DAF80 000D7EC0 38 A0 00 1F */ li r5, 0x1f @@ -70006,8 +70006,8 @@ daAlink_c_NS_procCoElecDamageInit: /* 800DB158 000D8098 7C 9F 23 78 */ mr r31, r4 /* 800DB15C 000D809C 7C BC 2B 78 */ mr r28, r5 /* 800DB160 000D80A0 7C DD 33 78 */ mr r29, r6 -/* 800DB164 000D80A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB168 000D80A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB164 000D80A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB168 000D80A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB16C 000D80AC 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800DB170 000D80B0 7F 64 DB 78 */ mr r4, r27 /* 800DB174 000D80B4 38 A0 00 00 */ li r5, 0 @@ -70081,8 +70081,8 @@ lbl_800DB234: /* 800DB268 000D81A8 4B FD 96 69 */ bl daAlink_c_NS_setJumpMode /* 800DB26C 000D81AC 48 00 00 70 */ b lbl_800DB2DC lbl_800DB270: -/* 800DB270 000D81B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB274 000D81B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB270 000D81B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB274 000D81B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB278 000D81B8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DB27C 000D81BC 64 00 00 10 */ oris r0, r0, 0x10 /* 800DB280 000D81C0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -70109,8 +70109,8 @@ lbl_800DB270: /* 800DB2D4 000D8214 38 03 40 00 */ addi r0, r3, 0x4000 /* 800DB2D8 000D8218 B0 1B 30 80 */ sth r0, 0x3080(r27) lbl_800DB2DC: -/* 800DB2DC 000D821C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB2E0 000D8220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB2DC 000D821C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB2E0 000D8220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB2E4 000D8224 80 1B 31 7C */ lwz r0, 0x317c(r27) /* 800DB2E8 000D8228 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800DB2EC 000D822C 7C 63 02 14 */ add r3, r3, r0 @@ -70181,8 +70181,8 @@ lbl_800DB3D8: /* 800DB3E0 000D8320 38 03 80 00 */ addi r0, r3, -32768 /* 800DB3E4 000D8324 B0 1B 30 10 */ sth r0, 0x3010(r27) lbl_800DB3E8: -/* 800DB3E8 000D8328 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB3EC 000D832C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB3E8 000D8328 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB3EC 000D832C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB3F0 000D8330 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DB3F4 000D8334 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 /* 800DB3F8 000D8338 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -70228,8 +70228,8 @@ lbl_800DB47C: /* 800DB490 000D83D0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DB494 000D83D4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DB498 000D83D8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DB49C 000D83DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB4A0 000D83E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB49C 000D83DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB4A0 000D83E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB4A4 000D83E4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DB4A8 000D83E8 38 80 00 05 */ li r4, 5 /* 800DB4AC 000D83EC 38 A0 00 01 */ li r5, 1 @@ -70254,8 +70254,8 @@ lbl_800DB4DC: lbl_800DB4F0: /* 800DB4F0 000D8430 7F E3 FB 78 */ mr r3, r31 /* 800DB4F4 000D8434 48 03 C7 9D */ bl daAlink_c_NS_resetSpecialEvent -/* 800DB4F8 000D8438 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DB4FC 000D843C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DB4F8 000D8438 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DB4FC 000D843C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB500 000D8440 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DB504 000D8444 38 80 00 1F */ li r4, 0x1f /* 800DB508 000D8448 4B F9 48 8D */ bl dVibration_c_NS_StopQuake @@ -70821,8 +70821,8 @@ daAlink_c_NS_setScreamWaitAnime: /* 800DBCE0 000D8C20 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DBCE4 000D8C24 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DBCE8 000D8C28 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DBCEC 000D8C2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DBCF0 000D8C30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DBCEC 000D8C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DBCF0 000D8C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DBCF4 000D8C34 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DBCF8 000D8C38 38 80 00 05 */ li r4, 5 /* 800DBCFC 000D8C3C 38 A0 00 01 */ li r5, 1 @@ -70970,8 +70970,8 @@ daAlink_c_NS_procCoLavaReturnInit: /* 800DBEE8 000D8E28 48 28 62 F5 */ bl _savegpr_29 /* 800DBEEC 000D8E2C 7C 7E 1B 78 */ mr r30, r3 /* 800DBEF0 000D8E30 7C 9F 23 78 */ mr r31, r4 -/* 800DBEF4 000D8E34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DBEF8 000D8E38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DBEF4 000D8E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DBEF8 000D8E38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DBEFC 000D8E3C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800DBF00 000D8E40 7F C4 F3 78 */ mr r4, r30 /* 800DBF04 000D8E44 38 A0 00 00 */ li r5, 0 @@ -71107,8 +71107,8 @@ lbl_800DC0C0: /* 800DC0E8 000D9028 D0 01 00 20 */ stfs f0, 0x20(r1) /* 800DC0EC 000D902C D0 21 00 24 */ stfs f1, 0x24(r1) /* 800DC0F0 000D9030 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 800DC0F4 000D9034 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DC0F8 000D9038 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800DC0F4 000D9034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DC0F8 000D9038 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800DC0FC 000D903C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800DC100 000D9040 38 80 00 00 */ li r4, 0 /* 800DC104 000D9044 90 81 00 08 */ stw r4, 8(r1) @@ -71222,8 +71222,8 @@ daAlink_c_NS_procCoSwimFreezeReturnInit: /* 800DC294 000D91D4 7C 7F 1B 78 */ mr r31, r3 /* 800DC298 000D91D8 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800DC29C 000D91DC 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l -/* 800DC2A0 000D91E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DC2A4 000D91E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DC2A0 000D91E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DC2A4 000D91E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DC2A8 000D91E8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800DC2AC 000D91EC 7F E4 FB 78 */ mr r4, r31 /* 800DC2B0 000D91F0 38 A0 00 00 */ li r5, 0 @@ -71624,14 +71624,14 @@ lbl_800DC820: /* 800DC828 000D9768 42 00 FF B4 */ bdnz lbl_800DC7DC /* 800DC82C 000D976C 7F E0 07 35 */ extsh. r0, r31 /* 800DC830 000D9770 41 82 00 7C */ beq lbl_800DC8AC -/* 800DC834 000D9774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DC838 000D9778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DC834 000D9774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DC838 000D9778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DC83C 000D977C 88 03 00 15 */ lbz r0, 0x15(r3) /* 800DC840 000D9780 28 00 00 FF */ cmplwi r0, 0xff /* 800DC844 000D9784 41 82 00 5C */ beq lbl_800DC8A0 /* 800DC848 000D9788 38 60 00 43 */ li r3, 0x43 /* 800DC84C 000D978C 38 80 00 01 */ li r4, 1 -/* 800DC850 000D9790 4B FB B6 91 */ bl checkItemGet +/* 800DC850 000D9790 4B FB B6 91 */ bl checkItemGet__FUci /* 800DC854 000D9794 2C 03 00 00 */ cmpwi r3, 0 /* 800DC858 000D9798 41 82 00 48 */ beq lbl_800DC8A0 /* 800DC85C 000D979C 7F E0 07 34 */ extsh r0, r31 @@ -71640,8 +71640,8 @@ lbl_800DC820: /* 800DC868 000D97A8 40 82 00 08 */ bne lbl_800DC870 /* 800DC86C 000D97AC 38 80 00 11 */ li r4, 0x11 lbl_800DC870: -/* 800DC870 000D97B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DC874 000D97B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DC870 000D97B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DC874 000D97B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DC878 000D97B8 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 800DC87C 000D97BC 7C 00 FA 14 */ add r0, r0, r31 /* 800DC880 000D97C0 B0 03 5D F4 */ sth r0, 0x5df4(r3) @@ -71732,8 +71732,8 @@ lbl_800DC978: /* 800DC9A8 000D98E8 38 00 00 0A */ li r0, 0xa /* 800DC9AC 000D98EC 7C 7D 2A 14 */ add r3, r29, r5 /* 800DC9B0 000D98F0 98 03 2F 7C */ stb r0, 0x2f7c(r3) -/* 800DC9B4 000D98F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DC9B8 000D98F8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DC9B4 000D98F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DC9B8 000D98F8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DC9BC 000D98FC A8 64 5D F4 */ lha r3, 0x5df4(r4) /* 800DC9C0 000D9900 38 03 00 01 */ addi r0, r3, 1 /* 800DC9C4 000D9904 B0 04 5D F4 */ sth r0, 0x5df4(r4) @@ -72066,8 +72066,8 @@ lbl_800DCE50: /* 800DCE90 000D9DD0 28 00 00 16 */ cmplwi r0, 0x16 /* 800DCE94 000D9DD4 41 82 00 38 */ beq lbl_800DCECC /* 800DCE98 000D9DD8 3B A0 00 00 */ li r29, 0 -/* 800DCE9C 000D9DDC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800DCEA0 000D9DE0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800DCE9C 000D9DDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800DCEA0 000D9DE0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800DCEA4 000D9DE4 88 04 00 15 */ lbz r0, 0x15(r4) /* 800DCEA8 000D9DE8 28 00 00 FF */ cmplwi r0, 0xff /* 800DCEAC 000D9DEC 41 82 00 14 */ beq lbl_800DCEC0 @@ -72137,8 +72137,8 @@ daAlink_c_NS_checkGuardAccept: /* 800DCF80 000D9EC0 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800DCF84 000D9EC4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800DCF88 000D9EC8 41 82 00 1C */ beq lbl_800DCFA4 -/* 800DCF8C 000D9ECC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800DCF90 000D9ED0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800DCF8C 000D9ECC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800DCF90 000D9ED0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800DCF94 000D9ED4 88 04 00 15 */ lbz r0, 0x15(r4) /* 800DCF98 000D9ED8 28 00 00 FF */ cmplwi r0, 0xff /* 800DCF9C 000D9EDC 41 82 00 08 */ beq lbl_800DCFA4 @@ -73068,8 +73068,8 @@ lbl_800DDC50: /* 800DDC7C 000DABBC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DDC80 000DABC0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DDC84 000DABC4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DDC88 000DABC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DDC8C 000DABCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DDC88 000DABC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DDC8C 000DABCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDC90 000DABD0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DDC94 000DABD4 38 80 00 03 */ li r4, 3 /* 800DDC98 000DABD8 38 A0 00 01 */ li r5, 1 @@ -73085,8 +73085,8 @@ lbl_800DDCA4: /* 800DDCBC 000DABFC 4B FC 44 DD */ bl daAlink_c_NS_commonLineCheck /* 800DDCC0 000DAC00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DDCC4 000DAC04 41 82 00 54 */ beq lbl_800DDD18 -/* 800DDCC8 000DAC08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DDCCC 000DAC0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DDCC8 000DAC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DDCCC 000DAC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDCD0 000DAC10 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800DDCD4 000DAC14 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800DDCD8 000DAC18 4B F9 71 29 */ bl dBgS_NS_GetWallCode @@ -73128,8 +73128,8 @@ lbl_800DDD4C: /* 800DDD5C 000DAC9C 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800DDD60 000DACA0 28 00 00 4B */ cmplwi r0, 0x4b /* 800DDD64 000DACA4 40 82 00 1C */ bne lbl_800DDD80 -/* 800DDD68 000DACA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DDD6C 000DACAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DDD68 000DACA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DDD6C 000DACAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDD70 000DACB0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800DDD74 000DACB4 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800DDD78 000DACB8 4B F6 A4 05 */ bl dEvent_manager_c_NS_cutEnd @@ -73234,8 +73234,8 @@ lbl_800DDEA8: /* 800DDED0 000DAE10 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DDED4 000DAE14 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DDED8 000DAE18 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DDEDC 000DAE1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DDEE0 000DAE20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DDEDC 000DAE1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DDEE0 000DAE20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDEE4 000DAE24 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DDEE8 000DAE28 38 80 00 05 */ li r4, 5 /* 800DDEEC 000DAE2C 38 A0 00 1F */ li r5, 0x1f @@ -73542,8 +73542,8 @@ lbl_800DE328: /* 800DE330 000DB270 48 04 2E 91 */ bl daAlink_c_NS_setFootEffectProcType /* 800DE334 000DB274 38 00 00 04 */ li r0, 4 /* 800DE338 000DB278 98 1C 2F 9D */ stb r0, 0x2f9d(r28) -/* 800DE33C 000DB27C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DE340 000DB280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DE33C 000DB27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DE340 000DB280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DE344 000DB284 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DE348 000DB288 60 00 00 04 */ ori r0, r0, 4 /* 800DE34C 000DB28C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -73693,8 +73693,8 @@ lbl_800DE540: /* 800DE570 000DB4B0 40 81 00 24 */ ble lbl_800DE594 /* 800DE574 000DB4B4 7F C3 F3 78 */ mr r3, r30 /* 800DE578 000DB4B8 4B FF 55 65 */ bl daAlink_c_NS_procCutFinishJumpUpInit -/* 800DE57C 000DB4BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DE580 000DB4C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DE57C 000DB4BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DE580 000DB4C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DE584 000DB4C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DE588 000DB4C8 60 00 00 04 */ ori r0, r0, 4 /* 800DE58C 000DB4CC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -73727,8 +73727,8 @@ lbl_800DE5D4: /* 800DE5F0 000DB530 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DE5F4 000DB534 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DE5F8 000DB538 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DE5FC 000DB53C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DE600 000DB540 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DE5FC 000DB53C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DE600 000DB540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DE604 000DB544 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DE608 000DB548 38 80 00 01 */ li r4, 1 /* 800DE60C 000DB54C 38 A0 00 01 */ li r5, 1 @@ -73764,8 +73764,8 @@ daAlink_c_NS_getArrowFlyData: /* 800DE66C 000DB5AC D0 05 00 00 */ stfs f0, 0(r5) /* 800DE670 000DB5B0 4E 80 00 20 */ blr lbl_800DE674: -/* 800DE674 000DB5B4 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 800DE678 000DB5B8 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 800DE674 000DB5B4 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 800DE678 000DB5B8 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 800DE67C 000DB5BC 80 07 5F 18 */ lwz r0, 0x5f18(r7) /* 800DE680 000DB5C0 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800DE684 000DB5C4 41 82 00 20 */ beq lbl_800DE6A4 @@ -73940,8 +73940,8 @@ lbl_800DE8C4: /* 800DE8E0 000DB820 80 1D 05 78 */ lwz r0, 0x578(r29) /* 800DE8E4 000DB824 54 00 01 D1 */ rlwinm. r0, r0, 0, 7, 8 /* 800DE8E8 000DB828 41 82 00 20 */ beq lbl_800DE908 -/* 800DE8EC 000DB82C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DE8F0 000DB830 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DE8EC 000DB82C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DE8F0 000DB830 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DE8F4 000DB834 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800DE8F8 000DB838 28 03 00 00 */ cmplwi r3, 0 /* 800DE8FC 000DB83C 41 82 00 0C */ beq lbl_800DE908 @@ -74047,8 +74047,8 @@ daAlink_c_NS_makeArrow: /* 800DEA44 000DB984 90 01 00 24 */ stw r0, 0x24(r1) /* 800DEA48 000DB988 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800DEA4C 000DB98C 7C 7F 1B 78 */ mr r31, r3 -/* 800DEA50 000DB990 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DEA54 000DB994 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DEA50 000DB990 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DEA54 000DB994 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DEA58 000DB998 88 03 00 EC */ lbz r0, 0xec(r3) /* 800DEA5C 000DB99C 28 00 00 00 */ cmplwi r0, 0 /* 800DEA60 000DB9A0 41 82 00 68 */ beq lbl_800DEAC8 @@ -74118,8 +74118,8 @@ lbl_800DEB40: /* 800DEB48 000DBA88 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) /* 800DEB4C 000DBA8C 38 80 FF FF */ li r4, -1 /* 800DEB50 000DBA90 4B F4 FC ED */ bl dComIfGp_addSelectItemNum -/* 800DEB54 000DBA94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DEB58 000DBA98 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DEB54 000DBA94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DEB58 000DBA98 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DEB5C 000DBA9C A8 64 5D F4 */ lha r3, 0x5df4(r4) /* 800DEB60 000DBAA0 38 03 FF FF */ addi r0, r3, -1 /* 800DEB64 000DBAA4 B0 04 5D F4 */ sth r0, 0x5df4(r4) @@ -74141,15 +74141,15 @@ daAlink_c_NS_setBowOrSlingStatus: /* 800DEB8C 000DBACC A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800DEB90 000DBAD0 28 00 00 4B */ cmplwi r0, 0x4b /* 800DEB94 000DBAD4 40 82 00 1C */ bne lbl_800DEBB0 -/* 800DEB98 000DBAD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DEB9C 000DBADC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DEB98 000DBAD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DEB9C 000DBADC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DEBA0 000DBAE0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DEBA4 000DBAE4 60 00 00 40 */ ori r0, r0, 0x40 /* 800DEBA8 000DBAE8 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800DEBAC 000DBAEC 4E 80 00 20 */ blr lbl_800DEBB0: -/* 800DEBB0 000DBAF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DEBB4 000DBAF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DEBB0 000DBAF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DEBB4 000DBAF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DEBB8 000DBAF8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DEBBC 000DBAFC 60 00 10 00 */ ori r0, r0, 0x1000 /* 800DEBC0 000DBB00 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -74211,8 +74211,8 @@ lbl_800DEC68: /* 800DEC84 000DBBC4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DEC88 000DBBC8 28 00 00 5A */ cmplwi r0, 0x5a /* 800DEC8C 000DBBCC 40 82 00 A0 */ bne lbl_800DED2C -/* 800DEC90 000DBBD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DEC94 000DBBD4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DEC90 000DBBD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DEC94 000DBBD4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DEC98 000DBBD8 80 64 5F 18 */ lwz r3, 0x5f18(r4) /* 800DEC9C 000DBBDC 54 60 02 95 */ rlwinm. r0, r3, 0, 0xa, 0xa /* 800DECA0 000DBBE0 41 82 00 48 */ beq lbl_800DECE8 @@ -74592,8 +74592,8 @@ lbl_800DF184: /* 800DF1DC 000DC11C 28 00 00 4B */ cmplwi r0, 0x4b /* 800DF1E0 000DC120 40 82 00 68 */ bne lbl_800DF248 /* 800DF1E4 000DC124 3B A0 01 F1 */ li r29, 0x1f1 -/* 800DF1E8 000DC128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF1EC 000DC12C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DF1E8 000DC128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF1EC 000DC12C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DF1F0 000DC130 88 03 00 F4 */ lbz r0, 0xf4(r3) /* 800DF1F4 000DC134 28 00 00 00 */ cmplwi r0, 0 /* 800DF1F8 000DC138 41 82 00 68 */ beq lbl_800DF260 @@ -74610,8 +74610,8 @@ lbl_800DF184: /* 800DF224 000DC164 4B F3 AB E1 */ bl fopAcM_fastCreate /* 800DF228 000DC168 28 03 00 00 */ cmplwi r3, 0 /* 800DF22C 000DC16C 41 82 00 34 */ beq lbl_800DF260 -/* 800DF230 000DC170 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF234 000DC174 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DF230 000DC170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF234 000DC174 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF238 000DC178 A8 64 5D F6 */ lha r3, 0x5df6(r4) /* 800DF23C 000DC17C 38 03 FF FF */ addi r0, r3, -1 /* 800DF240 000DC180 B0 04 5D F6 */ sth r0, 0x5df6(r4) @@ -74647,8 +74647,8 @@ lbl_800DF284: /* 800DF2A8 000DC1E8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DF2AC 000DC1EC D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800DF2B0 000DC1F0 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 800DF2B4 000DC1F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF2B8 000DC1F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DF2B4 000DC1F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF2B8 000DC1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DF2BC 000DC1FC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DF2C0 000DC200 38 80 00 01 */ li r4, 1 /* 800DF2C4 000DC204 38 A0 00 01 */ li r5, 1 @@ -74708,8 +74708,8 @@ lbl_800DF380: /* 800DF388 000DC2C8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DF38C 000DC2CC D0 01 00 20 */ stfs f0, 0x20(r1) /* 800DF390 000DC2D0 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 800DF394 000DC2D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF398 000DC2D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DF394 000DC2D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF398 000DC2D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DF39C 000DC2DC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DF3A0 000DC2E0 38 A0 00 01 */ li r5, 1 /* 800DF3A4 000DC2E4 38 C1 00 1C */ addi r6, r1, 0x1c @@ -74727,8 +74727,8 @@ lbl_800DF380: /* 800DF3D4 000DC314 38 80 FF FF */ li r4, -1 /* 800DF3D8 000DC318 4B F4 F4 65 */ bl dComIfGp_addSelectItemNum lbl_800DF3DC: -/* 800DF3DC 000DC31C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF3E0 000DC320 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DF3DC 000DC31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF3E0 000DC320 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF3E4 000DC324 A8 64 5D F4 */ lha r3, 0x5df4(r4) /* 800DF3E8 000DC328 38 03 FF FF */ addi r0, r3, -1 /* 800DF3EC 000DC32C B0 04 5D F4 */ sth r0, 0x5df4(r4) @@ -74799,8 +74799,8 @@ lbl_800DF468: /* 800DF4E0 000DC420 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800DF4E4 000DC424 D0 01 00 14 */ stfs f0, 0x14(r1) /* 800DF4E8 000DC428 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 800DF4EC 000DC42C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF4F0 000DC430 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DF4EC 000DC42C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF4F0 000DC430 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DF4F4 000DC434 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DF4F8 000DC438 38 80 00 01 */ li r4, 1 /* 800DF4FC 000DC43C 38 A0 00 01 */ li r5, 1 @@ -74839,8 +74839,8 @@ lbl_800DF570: /* 800DF574 000DC4B4 38 80 00 02 */ li r4, 2 /* 800DF578 000DC4B8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 800DF57C 000DC4BC 4B FC E1 A9 */ bl daAlink_c_NS_resetUpperAnime -/* 800DF580 000DC4C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF584 000DC4C4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DF580 000DC4C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF584 000DC4C4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF588 000DC4C8 80 64 5F 18 */ lwz r3, 0x5f18(r4) /* 800DF58C 000DC4CC 38 00 EF BF */ li r0, -4161 /* 800DF590 000DC4D0 7C 60 00 38 */ and r0, r3, r0 @@ -74926,8 +74926,8 @@ lbl_800DF688: /* 800DF6AC 000DC5EC 38 80 00 02 */ li r4, 2 /* 800DF6B0 000DC5F0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 800DF6B4 000DC5F4 4B FC E0 71 */ bl daAlink_c_NS_resetUpperAnime -/* 800DF6B8 000DC5F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DF6BC 000DC5FC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800DF6B8 000DC5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DF6BC 000DC5FC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF6C0 000DC600 80 64 5F 18 */ lwz r3, 0x5f18(r4) /* 800DF6C4 000DC604 38 00 EF BF */ li r0, -4161 /* 800DF6C8 000DC608 7C 60 00 38 */ and r0, r3, r0 @@ -75202,8 +75202,8 @@ lbl_800DFA70: /* 800DFA74 000DC9B4 41 82 00 58 */ beq lbl_800DFACC /* 800DFA78 000DC9B8 2C 1F 00 00 */ cmpwi r31, 0 /* 800DFA7C 000DC9BC 41 82 00 50 */ beq lbl_800DFACC -/* 800DFA80 000DC9C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DFA84 000DC9C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DFA80 000DC9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DFA84 000DC9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DFA88 000DC9C8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DFA8C 000DC9CC 64 00 00 20 */ oris r0, r0, 0x20 /* 800DFA90 000DC9D0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -75382,8 +75382,8 @@ daAlink_c_NS_setBowSight: /* 800DFCEC 000DCC2C A0 03 1F BC */ lhz r0, 0x1fbc(r3) /* 800DFCF0 000DCC30 28 00 00 0A */ cmplwi r0, 0xa /* 800DFCF4 000DCC34 40 82 00 5C */ bne lbl_800DFD50 -/* 800DFCF8 000DCC38 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800DFCFC 000DCC3C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800DFCF8 000DCC38 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800DFCFC 000DCC3C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800DFD00 000DCC40 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800DFD04 000DCC44 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800DFD08 000DCC48 40 82 00 48 */ bne lbl_800DFD50 @@ -75591,8 +75591,8 @@ lbl_800DFFC0: /* 800DFFE4 000DCF24 88 03 20 68 */ lbz r0, 0x2068(r3) /* 800DFFE8 000DCF28 28 00 00 00 */ cmplwi r0, 0 /* 800DFFEC 000DCF2C 41 82 00 1C */ beq lbl_800E0008 -/* 800DFFF0 000DCF30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800DFFF4 000DCF34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800DFFF0 000DCF30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800DFFF4 000DCF34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DFFF8 000DCF38 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800DFFFC 000DCF3C 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc /* 800E0000 000DCF40 41 82 00 08 */ beq lbl_800E0008 @@ -75981,8 +75981,8 @@ daAlink_c_NS_setBoomerangReadyQuake: /* 800E0504 000DD444 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E0508 000DD448 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800E050C 000DD44C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E0510 000DD450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E0514 000DD454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E0510 000DD450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E0514 000DD454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E0518 000DD458 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800E051C 000DD45C 38 80 00 01 */ li r4, 1 /* 800E0520 000DD460 38 A0 00 01 */ li r5, 1 @@ -76141,8 +76141,8 @@ lbl_800E0734: /* 800E0740 000DD680 90 1D 28 34 */ stw r0, 0x2834(r29) /* 800E0744 000DD684 80 1D 28 28 */ lwz r0, 0x2828(r29) /* 800E0748 000DD688 90 1D 28 38 */ stw r0, 0x2838(r29) -/* 800E074C 000DD68C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E0750 000DD690 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800E074C 000DD68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E0750 000DD690 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800E0754 000DD694 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800E0758 000DD698 64 03 00 40 */ oris r3, r0, 0x40 /* 800E075C 000DD69C 90 64 5F 18 */ stw r3, 0x5f18(r4) @@ -76250,8 +76250,8 @@ lbl_800E08AC: /* 800E08D4 000DD814 93 C1 00 18 */ stw r30, 0x18(r1) /* 800E08D8 000DD818 7C 7F 1B 78 */ mr r31, r3 /* 800E08DC 000DD81C 7C 9E 23 78 */ mr r30, r4 -/* 800E08E0 000DD820 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800E08E4 000DD824 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800E08E0 000DD820 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800E08E4 000DD824 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800E08E8 000DD828 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800E08EC 000DD82C 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 /* 800E08F0 000DD830 90 04 5F 18 */ stw r0, 0x5f18(r4) @@ -76348,8 +76348,8 @@ lbl_800E09F8: /* 800E0A48 000DD988 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E0A4C 000DD98C D0 01 00 0C */ stfs f0, 0xc(r1) /* 800E0A50 000DD990 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E0A54 000DD994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E0A58 000DD998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E0A54 000DD994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E0A58 000DD998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E0A5C 000DD99C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800E0A60 000DD9A0 38 80 00 01 */ li r4, 1 /* 800E0A64 000DD9A4 38 A0 00 01 */ li r5, 1 @@ -76726,8 +76726,8 @@ lbl_800E0F3C: /* 800E0F60 000DDEA0 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 800E0F64 000DDEA4 C0 45 00 30 */ lfs f2, 0x30(r5) /* 800E0F68 000DDEA8 4B FC C0 79 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed -/* 800E0F6C 000DDEAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E0F70 000DDEB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E0F6C 000DDEAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E0F70 000DDEB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E0F74 000DDEB4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E0F78 000DDEB8 64 00 00 08 */ oris r0, r0, 8 /* 800E0F7C 000DDEBC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -76826,8 +76826,8 @@ lbl_800E10A8: /* 800E10BC 000DDFFC 38 84 E6 C8 */ addi r4, r4, lbl_8038E6C8@l /* 800E10C0 000DE000 C0 24 00 30 */ lfs f1, 0x30(r4) /* 800E10C4 000DE004 4B FC D9 AD */ bl daAlink_c_NS_setBlendAtnMoveAnime -/* 800E10C8 000DE008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E10CC 000DE00C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E10C8 000DE008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E10CC 000DE00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E10D0 000DE010 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E10D4 000DE014 64 00 00 08 */ oris r0, r0, 8 /* 800E10D8 000DE018 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -77103,8 +77103,8 @@ lbl_800E1444: /* 800E1474 000DE3B4 3B E0 00 01 */ li r31, 1 /* 800E1478 000DE3B8 7F FE FB 78 */ mr r30, r31 /* 800E147C 000DE3BC 3B A0 00 00 */ li r29, 0 -/* 800E1480 000DE3C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E1484 000DE3C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E1480 000DE3C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E1484 000DE3C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1488 000DE3C8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800E148C 000DE3CC 38 80 25 80 */ li r4, 0x2580 /* 800E1490 000DE3D0 4B F5 35 2D */ bl isEventBit__11dSv_event_cCFUs @@ -77125,8 +77125,8 @@ lbl_800E14BC: lbl_800E14C8: /* 800E14C8 000DE408 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 800E14CC 000DE40C 40 82 00 30 */ bne lbl_800E14FC -/* 800E14D0 000DE410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E14D4 000DE414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E14D0 000DE410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E14D4 000DE414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E14D8 000DE418 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800E14DC 000DE41C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800E14E0 000DE420 7D 89 03 A6 */ mtctr r12 @@ -77464,8 +77464,8 @@ daAlink_c_NS_throwCopyRod: /* 800E1980 000DE8C0 38 7F 28 24 */ addi r3, r31, 0x2824 /* 800E1984 000DE8C4 48 07 D3 79 */ bl daPy_actorKeep_c_NS_clearData lbl_800E1988: -/* 800E1988 000DE8C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E198C 000DE8CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E1988 000DE8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E198C 000DE8CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1990 000DE8D0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E1994 000DE8D4 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 800E1998 000DE8D8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -77534,8 +77534,8 @@ lbl_800E1A18: /* 800E1A88 000DE9C8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E1A8C 000DE9CC D0 01 00 0C */ stfs f0, 0xc(r1) /* 800E1A90 000DE9D0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E1A94 000DE9D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E1A98 000DE9D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E1A94 000DE9D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E1A98 000DE9D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1A9C 000DE9DC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800E1AA0 000DE9E0 38 80 00 01 */ li r4, 1 /* 800E1AA4 000DE9E4 38 A0 00 01 */ li r5, 1 @@ -77822,8 +77822,8 @@ lbl_800E1E4C: /* 800E1E70 000DEDB0 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 800E1E74 000DEDB4 C0 45 00 30 */ lfs f2, 0x30(r5) /* 800E1E78 000DEDB8 4B FC B1 69 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed -/* 800E1E7C 000DEDBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E1E80 000DEDC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E1E7C 000DEDBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E1E80 000DEDC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1E84 000DEDC4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E1E88 000DEDC8 60 00 00 80 */ ori r0, r0, 0x80 /* 800E1E8C 000DEDCC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -77919,8 +77919,8 @@ lbl_800E1FB0: /* 800E1FC4 000DEF04 38 84 E6 C8 */ addi r4, r4, lbl_8038E6C8@l /* 800E1FC8 000DEF08 C0 24 00 30 */ lfs f1, 0x30(r4) /* 800E1FCC 000DEF0C 4B FC CA A5 */ bl daAlink_c_NS_setBlendAtnMoveAnime -/* 800E1FD0 000DEF10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E1FD4 000DEF14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E1FD0 000DEF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E1FD4 000DEF14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1FD8 000DEF18 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E1FDC 000DEF1C 60 00 00 80 */ ori r0, r0, 0x80 /* 800E1FE0 000DEF20 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -78198,8 +78198,8 @@ lbl_800E2390: /* 800E23C4 000DF304 48 07 C1 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 800E23C8 000DF308 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E23CC 000DF30C 41 82 00 18 */ beq lbl_800E23E4 -/* 800E23D0 000DF310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E23D4 000DF314 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E23D0 000DF310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E23D4 000DF314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E23D8 000DF318 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E23DC 000DF31C 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800E23E0 000DF320 4B F6 5D 9D */ bl dEvent_manager_c_NS_cutEnd @@ -78278,8 +78278,8 @@ daAlink_c_NS_commonMagneLineCheck: /* 800E24C4 000DF404 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800E24C8 000DF408 7F E6 FB 78 */ mr r6, r31 /* 800E24CC 000DF40C 4B F9 58 99 */ bl dBgS_LinChk_NS_Set -/* 800E24D0 000DF410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E24D4 000DF414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E24D0 000DF410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E24D4 000DF414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E24D8 000DF418 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E24DC 000DF41C 38 9F 1D AC */ addi r4, r31, 0x1dac /* 800E24E0 000DF420 4B F9 1E D5 */ bl cBgS_NS_LineCross @@ -78377,8 +78377,8 @@ lbl_800E261C: /* 800E261C 000DF55C 80 9F 05 70 */ lwz r4, 0x570(r31) /* 800E2620 000DF560 54 80 02 11 */ rlwinm. r0, r4, 0, 8, 8 /* 800E2624 000DF564 41 82 00 28 */ beq lbl_800E264C -/* 800E2628 000DF568 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E262C 000DF56C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E2628 000DF568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E262C 000DF56C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2630 000DF570 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800E2634 000DF574 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800E2638 000DF578 40 82 00 14 */ bne lbl_800E264C @@ -78525,8 +78525,8 @@ daAlink_c_NS_setMagneBootsMtx: /* 800E2830 000DF770 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800E2834 000DF774 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800E2838 000DF778 90 01 00 68 */ stw r0, 0x68(r1) -/* 800E283C 000DF77C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E2840 000DF780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E283C 000DF77C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E2840 000DF780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2844 000DF784 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E2848 000DF788 38 A1 00 58 */ addi r5, r1, 0x58 /* 800E284C 000DF78C 4B F9 1E F9 */ bl cBgS_NS_GetTriPla @@ -78661,8 +78661,8 @@ lbl_800E29F0: /* 800E2A14 000DF954 7C 60 07 34 */ extsh r0, r3 /* 800E2A18 000DF958 2C 00 00 C6 */ cmpwi r0, 0xc6 /* 800E2A1C 000DF95C 40 82 00 1C */ bne lbl_800E2A38 -/* 800E2A20 000DF960 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E2A24 000DF964 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E2A20 000DF960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E2A24 000DF964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2A28 000DF968 38 80 00 93 */ li r4, 0x93 /* 800E2A2C 000DF96C 88 1D 04 BA */ lbz r0, 0x4ba(r29) /* 800E2A30 000DF970 7C 05 07 74 */ extsb r5, r0 @@ -78974,8 +78974,8 @@ lbl_800E2E64: /* 800E2E9C 000DFDDC 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800E2EA0 000DFDE0 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 800E2EA4 000DFDE4 48 18 4E 85 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800E2EA8 000DFDE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E2EAC 000DFDEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E2EA8 000DFDE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E2EAC 000DFDEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2EB0 000DFDF0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E2EB4 000DFDF4 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800E2EB8 000DFDF8 4B F9 15 E9 */ bl cBgS_NS_GroundCross @@ -79110,8 +79110,8 @@ daAlink_c_NS_procBootsEquipInit: /* 800E308C 000DFFCC 38 80 00 02 */ li r4, 2 /* 800E3090 000DFFD0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 800E3094 000DFFD4 4B FC A6 91 */ bl daAlink_c_NS_resetUpperAnime -/* 800E3098 000DFFD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E309C 000DFFDC 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 800E3098 000DFFD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E309C 000DFFDC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800E30A0 000DFFE0 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 800E30A4 000DFFE4 3C 60 00 40 */ lis r3, 0x00400030@ha /* 800E30A8 000DFFE8 38 03 00 30 */ addi r0, r3, 0x00400030@l @@ -79170,8 +79170,8 @@ lbl_800E3148: /* 800E3170 000E00B0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E3174 000E00B4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800E3178 000E00B8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E317C 000E00BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E3180 000E00C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E317C 000E00BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E3180 000E00C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E3184 000E00C4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800E3188 000E00C8 38 80 00 03 */ li r4, 3 /* 800E318C 000E00CC 38 A0 00 01 */ li r5, 1 @@ -79299,8 +79299,8 @@ lbl_800E334C: /* 800E334C 000E028C 7F E3 FB 78 */ mr r3, r31 /* 800E3350 000E0290 38 80 00 CC */ li r4, 0xcc /* 800E3354 000E0294 4B FD EC 19 */ bl daAlink_c_NS_commonProcInit -/* 800E3358 000E0298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E335C 000E029C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E3358 000E0298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E335C 000E029C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E3360 000E02A0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E3364 000E02A4 38 9F 1D C0 */ addi r4, r31, 0x1dc0 /* 800E3368 000E02A8 38 A1 00 50 */ addi r5, r1, 0x50 @@ -79383,8 +79383,8 @@ lbl_800E3440: /* 800E3490 000E03D0 40 81 00 08 */ ble lbl_800E3498 /* 800E3494 000E03D4 D0 3F 34 78 */ stfs f1, 0x3478(r31) lbl_800E3498: -/* 800E3498 000E03D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E349C 000E03DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E3498 000E03D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E349C 000E03DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E34A0 000E03E0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800E34A4 000E03E4 7F C3 F3 78 */ mr r3, r30 /* 800E34A8 000E03E8 38 9F 1E 2C */ addi r4, r31, 0x1e2c @@ -79712,8 +79712,8 @@ daAlink_c_NS_checkGrabLineCheck: /* 800E3930 000E0870 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800E3934 000E0874 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800E3938 000E0878 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E393C 000E087C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E3940 000E0880 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E393C 000E087C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E3940 000E0880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E3944 000E0884 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E3948 000E0888 3C 80 80 3F */ lis r4, lbl_803F1C48@ha /* 800E394C 000E088C 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l @@ -80950,8 +80950,8 @@ lbl_800E4A7C: /* 800E4A9C 000E19DC 38 7F 1E CC */ addi r3, r31, 0x1ecc /* 800E4AA0 000E19E0 38 81 00 F4 */ addi r4, r1, 0xf4 /* 800E4AA4 000E19E4 48 18 32 85 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800E4AA8 000E19E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E4AAC 000E19EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E4AA8 000E19E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E4AAC 000E19EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E4AB0 000E19F0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E4AB4 000E19F4 38 9F 1E CC */ addi r4, r31, 0x1ecc /* 800E4AB8 000E19F8 4B F8 F9 E9 */ bl cBgS_NS_GroundCross @@ -81040,8 +81040,8 @@ daAlink_c_NS_freeGrabItem: /* 800E4BEC 000E1B2C 83 C3 28 30 */ lwz r30, 0x2830(r3) /* 800E4BF0 000E1B30 28 1E 00 00 */ cmplwi r30, 0 /* 800E4BF4 000E1B34 41 82 01 44 */ beq lbl_800E4D38 -/* 800E4BF8 000E1B38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E4BFC 000E1B3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E4BF8 000E1B38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E4BFC 000E1B3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E4C00 000E1B40 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800E4C04 000E1B44 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 800E4C08 000E1B48 28 00 00 00 */ cmplwi r0, 0 @@ -81506,8 +81506,8 @@ lbl_800E5288: /* 800E5288 000E21C8 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800E528C 000E21CC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800E5290 000E21D0 41 82 00 34 */ beq lbl_800E52C4 -/* 800E5294 000E21D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E5298 000E21D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E5294 000E21D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E5298 000E21D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E529C 000E21DC 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800E52A0 000E21E0 28 00 00 06 */ cmplwi r0, 6 /* 800E52A4 000E21E4 40 82 00 20 */ bne lbl_800E52C4 @@ -81559,8 +81559,8 @@ lbl_800E5338: /* 800E5350 000E2290 2C 03 00 00 */ cmpwi r3, 0 /* 800E5354 000E2294 41 82 00 3C */ beq lbl_800E5390 lbl_800E5358: -/* 800E5358 000E2298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E535C 000E229C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E5358 000E2298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E535C 000E229C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E5360 000E22A0 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800E5364 000E22A4 28 00 00 14 */ cmplwi r0, 0x14 /* 800E5368 000E22A8 40 82 00 10 */ bne lbl_800E5378 @@ -81928,8 +81928,8 @@ daAlink_c_NS_putObjLineCheck: /* 800E5870 000E27B0 7F A5 EB 78 */ mr r5, r29 /* 800E5874 000E27B4 7F E6 FB 78 */ mr r6, r31 /* 800E5878 000E27B8 4B F9 24 ED */ bl dBgS_LinChk_NS_Set -/* 800E587C 000E27BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E5880 000E27C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E587C 000E27BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E5880 000E27C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E5884 000E27C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E5888 000E27C8 7F 84 E3 78 */ mr r4, r28 /* 800E588C 000E27CC 4B F8 EB 29 */ bl cBgS_NS_LineCross @@ -82149,8 +82149,8 @@ daAlink_c_NS_grabLineCheck: /* 800E5B80 000E2AC0 38 7F 1E 5C */ addi r3, r31, 0x1e5c /* 800E5B84 000E2AC4 80 DF 28 30 */ lwz r6, 0x2830(r31) /* 800E5B88 000E2AC8 4B F9 21 DD */ bl dBgS_LinChk_NS_Set -/* 800E5B8C 000E2ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E5B90 000E2AD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E5B8C 000E2ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E5B90 000E2AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E5B94 000E2AD4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E5B98 000E2AD8 38 9F 1E 5C */ addi r4, r31, 0x1e5c /* 800E5B9C 000E2ADC 4B F8 E8 19 */ bl cBgS_NS_LineCross @@ -83442,8 +83442,8 @@ lbl_800E6DC0: /* 800E6DC8 000E3D08 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E6DCC 000E3D0C D0 01 00 0C */ stfs f0, 0xc(r1) /* 800E6DD0 000E3D10 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E6DD4 000E3D14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E6DD8 000E3D18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E6DD4 000E3D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E6DD8 000E3D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E6DDC 000E3D1C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800E6DE0 000E3D20 38 80 00 01 */ li r4, 1 /* 800E6DE4 000E3D24 38 A0 00 0F */ li r5, 0xf @@ -83597,8 +83597,8 @@ lbl_800E6FC4: /* 800E700C 000E3F4C 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800E7010 000E3F50 28 00 00 0D */ cmplwi r0, 0xd /* 800E7014 000E3F54 40 82 00 1C */ bne lbl_800E7030 -/* 800E7018 000E3F58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E701C 000E3F5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E7018 000E3F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E701C 000E3F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7020 000E3F60 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E7024 000E3F64 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800E7028 000E3F68 4B F6 11 55 */ bl dEvent_manager_c_NS_cutEnd @@ -83784,8 +83784,8 @@ lbl_800E729C: /* 800E729C 000E41DC AB C5 00 08 */ lha r30, 8(r5) /* 800E72A0 000E41E0 2C 1E 00 60 */ cmpwi r30, 0x60 /* 800E72A4 000E41E4 40 82 00 38 */ bne lbl_800E72DC -/* 800E72A8 000E41E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E72AC 000E41EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E72A8 000E41E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E72AC 000E41EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E72B0 000E41F0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800E72B4 000E41F4 7F E4 FB 78 */ mr r4, r31 /* 800E72B8 000E41F8 38 A0 00 00 */ li r5, 0 @@ -83871,8 +83871,8 @@ lbl_800E73C0: /* 800E73E8 000E4328 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) /* 800E73EC 000E432C D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800E73F0 000E4330 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800E73F4 000E4334 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E73F8 000E4338 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E73F4 000E4334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E73F8 000E4338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E73FC 000E433C 38 80 00 3F */ li r4, 0x3f /* 800E7400 000E4340 80 BF 27 F4 */ lwz r5, 0x27f4(r31) /* 800E7404 000E4344 88 05 04 BA */ lbz r0, 0x4ba(r5) @@ -84283,8 +84283,8 @@ daAlink_c_NS_checkChainEmphasys: /* 800E79AC 000E48EC A8 05 00 08 */ lha r0, 8(r5) /* 800E79B0 000E48F0 2C 00 01 6F */ cmpwi r0, 0x16f /* 800E79B4 000E48F4 40 82 00 30 */ bne lbl_800E79E4 -/* 800E79B8 000E48F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E79BC 000E48FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E79B8 000E48F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E79BC 000E48FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E79C0 000E4900 80 05 00 B0 */ lwz r0, 0xb0(r5) /* 800E79C4 000E4904 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 800E79C8 000E4908 88 05 04 BA */ lbz r0, 0x4ba(r5) @@ -84630,8 +84630,8 @@ lbl_800E7E3C: /* 800E7E80 000E4DC0 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800E7E84 000E4DC4 28 00 00 43 */ cmplwi r0, 0x43 /* 800E7E88 000E4DC8 40 82 00 1C */ bne lbl_800E7EA4 -/* 800E7E8C 000E4DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E7E90 000E4DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E7E8C 000E4DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E7E90 000E4DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7E94 000E4DD4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E7E98 000E4DD8 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800E7E9C 000E4DDC 4B F6 02 E1 */ bl dEvent_manager_c_NS_cutEnd @@ -84652,16 +84652,16 @@ lbl_800E7EB8: .global daAlink_c_NS_setWallGrabStatus daAlink_c_NS_setWallGrabStatus: -/* 800E7ED0 000E4E10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E7ED4 000E4E14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E7ED0 000E4E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E7ED4 000E4E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7ED8 000E4E18 98 83 5E 1C */ stb r4, 0x5e1c(r3) /* 800E7EDC 000E4E1C 98 A3 5E 42 */ stb r5, 0x5e42(r3) /* 800E7EE0 000E4E20 4E 80 00 20 */ blr .global daAlink_c_NS_getWallGrabStatus daAlink_c_NS_getWallGrabStatus: -/* 800E7EE4 000E4E24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E7EE8 000E4E28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E7EE4 000E4E24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E7EE8 000E4E28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7EEC 000E4E2C 88 63 5E 1C */ lbz r3, 0x5e1c(r3) /* 800E7EF0 000E4E30 4E 80 00 20 */ blr @@ -84705,8 +84705,8 @@ daAlink_c_NS_setPushPullKeepData: /* 800E7F68 000E4EA8 41 82 00 08 */ beq lbl_800E7F70 /* 800E7F6C 000E4EAC 63 BD 00 04 */ ori r29, r29, 4 lbl_800E7F70: -/* 800E7F70 000E4EB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E7F74 000E4EB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E7F70 000E4EB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E7F74 000E4EB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7F78 000E4EB8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E7F7C 000E4EBC 38 9F 1E 1C */ addi r4, r31, 0x1e1c /* 800E7F80 000E4EC0 7F E5 FB 78 */ mr r5, r31 @@ -84904,8 +84904,8 @@ lbl_800E8218: /* 800E823C 000E517C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800E8240 000E5180 38 81 00 08 */ addi r4, r1, 8 /* 800E8244 000E5184 48 17 FA E5 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800E8248 000E5188 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E824C 000E518C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E8248 000E5188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E824C 000E518C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8250 000E5190 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8254 000E5194 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800E8258 000E5198 4B F8 C2 49 */ bl cBgS_NS_GroundCross @@ -85002,8 +85002,8 @@ daAlink_c_NS_getPushPullAnimeSpeed: /* 800E8374 000E52B4 7C 60 07 34 */ extsh r0, r3 /* 800E8378 000E52B8 2C 00 00 1D */ cmpwi r0, 0x1d /* 800E837C 000E52BC 40 82 00 2C */ bne lbl_800E83A8 -/* 800E8380 000E52C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E8384 000E52C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E8380 000E52C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E8384 000E52C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8388 000E52C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E838C 000E52CC A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) /* 800E8390 000E52D0 4B F8 C2 89 */ bl cBgS_NS_GetActorPointer @@ -85131,8 +85131,8 @@ lbl_800E84E8: /* 800E8544 000E5484 EC 01 00 2A */ fadds f0, f1, f0 /* 800E8548 000E5488 D0 1F 37 D0 */ stfs f0, 0x37d0(r31) lbl_800E854C: -/* 800E854C 000E548C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E8550 000E5490 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E854C 000E548C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E8550 000E5490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8554 000E5494 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E8558 000E5498 64 00 04 00 */ oris r0, r0, 0x400 /* 800E855C 000E549C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -85351,8 +85351,8 @@ lbl_800E885C: /* 800E8868 000E57A8 B3 DF 30 10 */ sth r30, 0x3010(r31) /* 800E886C 000E57AC A8 1F 30 08 */ lha r0, 0x3008(r31) /* 800E8870 000E57B0 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 800E8874 000E57B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E8878 000E57B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E8874 000E57B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E8878 000E57B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E887C 000E57BC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8880 000E57C0 A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) /* 800E8884 000E57C4 4B F8 BD 95 */ bl cBgS_NS_GetActorPointer @@ -85441,8 +85441,8 @@ lbl_800E89A4: /* 800E89B0 000E58F0 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800E89B4: /* 800E89B4 000E58F4 D0 3F 34 7C */ stfs f1, 0x347c(r31) -/* 800E89B8 000E58F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E89BC 000E58FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E89B8 000E58F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E89BC 000E58FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E89C0 000E5900 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E89C4 000E5904 64 00 04 00 */ oris r0, r0, 0x400 /* 800E89C8 000E5908 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -85731,8 +85731,8 @@ lbl_800E8DBC: /* 800E8DBC 000E5CFC D3 FF 1F DC */ stfs f31, 0x1fdc(r31) /* 800E8DC0 000E5D00 38 00 00 01 */ li r0, 1 /* 800E8DC4 000E5D04 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 800E8DC8 000E5D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E8DCC 000E5D0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E8DC8 000E5D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E8DCC 000E5D0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8DD0 000E5D10 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8DD4 000E5D14 A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) /* 800E8DD8 000E5D18 4B F8 B8 41 */ bl cBgS_NS_GetActorPointer @@ -85821,8 +85821,8 @@ lbl_800E8EF8: /* 800E8F04 000E5E44 C0 23 0A E0 */ lfs f1, lbl_80450AE0@l(r3) lbl_800E8F08: /* 800E8F08 000E5E48 D0 3F 34 7C */ stfs f1, 0x347c(r31) -/* 800E8F0C 000E5E4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E8F10 000E5E50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E8F0C 000E5E4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E8F10 000E5E50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8F14 000E5E54 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800E8F18 000E5E58 64 00 04 00 */ oris r0, r0, 0x400 /* 800E8F1C 000E5E5C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -86025,8 +86025,8 @@ daAlink_searchGoat: /* 800E91E4 000E6124 40 82 00 1C */ bne lbl_800E9200 /* 800E91E8 000E6128 38 00 00 01 */ li r0, 1 /* 800E91EC 000E612C B0 03 30 12 */ sth r0, 0x3012(r3) -/* 800E91F0 000E6130 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E91F4 000E6134 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E91F0 000E6130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E91F4 000E6134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E91F8 000E6138 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800E91FC 000E613C 4B F5 92 6D */ bl dEvt_control_c_NS_reset lbl_800E9200: @@ -86314,8 +86314,8 @@ lbl_800E95A8: /* 800E95F0 000E6530 38 81 00 20 */ addi r4, r1, 0x20 /* 800E95F4 000E6534 7C 85 23 78 */ mr r5, r4 /* 800E95F8 000E6538 48 25 D8 55 */ bl PSMTXMultVecSR -/* 800E95FC 000E653C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E9600 000E6540 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E95FC 000E653C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E9600 000E6540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E9604 000E6544 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800E9608 000E6548 28 00 00 15 */ cmplwi r0, 0x15 /* 800E960C 000E654C 40 82 00 34 */ bne lbl_800E9640 @@ -86562,8 +86562,8 @@ lbl_800E997C: /* 800E9980 000E68C0 38 80 00 01 */ li r4, 1 /* 800E9984 000E68C4 38 A0 00 00 */ li r5, 0 /* 800E9988 000E68C8 4B FD 79 55 */ bl daAlink_c_NS_deleteEquipItem -/* 800E998C 000E68CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E9990 000E68D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E998C 000E68CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E9990 000E68D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E9994 000E68D4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800E9998 000E68D8 7F C4 F3 78 */ mr r4, r30 /* 800E999C 000E68DC 38 A0 00 00 */ li r5, 0 @@ -86888,8 +86888,8 @@ lbl_800E9E04: lbl_800E9E30: /* 800E9E30 000E6D70 7F 83 E3 78 */ mr r3, r28 /* 800E9E34 000E6D74 4B FF E4 65 */ bl daAlink_c_NS_offGoatStopGame -/* 800E9E38 000E6D78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800E9E3C 000E6D7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800E9E38 000E6D78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800E9E3C 000E6D7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E9E40 000E6D80 3B 63 07 F0 */ addi r27, r3, 0x7f0 /* 800E9E44 000E6D84 7F 63 DB 78 */ mr r3, r27 /* 800E9E48 000E6D88 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -87095,8 +87095,8 @@ lbl_800EA10C: /* 800EA11C 000E705C 88 1C 05 6A */ lbz r0, 0x56a(r28) /* 800EA120 000E7060 28 00 00 2A */ cmplwi r0, 0x2a /* 800EA124 000E7064 40 82 00 20 */ bne lbl_800EA144 -/* 800EA128 000E7068 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EA12C 000E706C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EA128 000E7068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EA12C 000E706C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EA130 000E7070 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800EA134 000E7074 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800EA138 000E7078 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -87773,8 +87773,8 @@ lbl_800EAA78: /* 800EAA84 000E79C4 38 80 00 15 */ li r4, 0x15 /* 800EAA88 000E79C8 4B FC 87 E1 */ bl daAlink_c_NS_setDoStatusEmphasys /* 800EAA8C 000E79CC 38 00 00 05 */ li r0, 5 -/* 800EAA90 000E79D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EAA94 000E79D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EAA90 000E79D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EAA94 000E79D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EAA98 000E79D8 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EAA9C 000E79DC 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800EAAA0 000E79E0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -87816,8 +87816,8 @@ lbl_800EAB08: /* 800EAB24 000E7A64 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EAB28 000E7A68 38 00 00 04 */ li r0, 4 /* 800EAB2C 000E7A6C 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 800EAB30 000E7A70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EAB34 000E7A74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EAB30 000E7A70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EAB34 000E7A74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EAB38 000E7A78 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800EAB3C 000E7A7C 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 800EAB40 000E7A80 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -88330,8 +88330,8 @@ daAlink_c_NS_procSumouSideMoveInit: /* 800EB270 000E81B0 38 80 00 15 */ li r4, 0x15 /* 800EB274 000E81B4 4B FC 7F F5 */ bl daAlink_c_NS_setDoStatusEmphasys /* 800EB278 000E81B8 38 00 00 05 */ li r0, 5 -/* 800EB27C 000E81BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EB280 000E81C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EB27C 000E81BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EB280 000E81C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EB284 000E81C4 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EB288 000E81C8 38 00 00 0C */ li r0, 0xc /* 800EB28C 000E81CC 98 1F 2F 99 */ stb r0, 0x2f99(r31) @@ -88430,8 +88430,8 @@ lbl_800EB3DC: /* 800EB3E8 000E8328 38 80 00 15 */ li r4, 0x15 /* 800EB3EC 000E832C 4B FC 7E 7D */ bl daAlink_c_NS_setDoStatusEmphasys /* 800EB3F0 000E8330 38 00 00 05 */ li r0, 5 -/* 800EB3F4 000E8334 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EB3F8 000E8338 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EB3F4 000E8334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EB3F8 000E8338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EB3FC 000E833C 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EB400 000E8340 C0 3F 33 AC */ lfs f1, 0x33ac(r31) /* 800EB404 000E8344 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -88777,8 +88777,8 @@ lbl_800EB89C: /* 800EB8C0 000E8800 28 00 00 19 */ cmplwi r0, 0x19 /* 800EB8C4 000E8804 40 82 00 2C */ bne lbl_800EB8F0 /* 800EB8C8 000E8808 38 00 00 01 */ li r0, 1 -/* 800EB8CC 000E880C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EB8D0 000E8810 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EB8CC 000E880C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EB8D0 000E8810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EB8D4 000E8814 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EB8D8 000E8818 A8 7B 04 E6 */ lha r3, 0x4e6(r27) /* 800EB8DC 000E881C 38 03 D8 00 */ addi r0, r3, -10240 @@ -88792,8 +88792,8 @@ lbl_800EB8F0: /* 800EB8F8 000E8838 38 00 00 03 */ li r0, 3 /* 800EB8FC 000E883C 98 1B 2F 98 */ stb r0, 0x2f98(r27) /* 800EB900 000E8840 38 00 00 04 */ li r0, 4 -/* 800EB904 000E8844 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EB908 000E8848 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EB904 000E8844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EB908 000E8848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EB90C 000E884C 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EB910 000E8850 A8 7B 04 E6 */ lha r3, 0x4e6(r27) /* 800EB914 000E8854 38 03 28 00 */ addi r0, r3, 0x2800 @@ -89087,16 +89087,16 @@ lbl_800EBD14: /* 800EBD18 000E8C58 28 00 00 02 */ cmplwi r0, 2 /* 800EBD1C 000E8C5C 40 82 00 18 */ bne lbl_800EBD34 /* 800EBD20 000E8C60 38 00 00 01 */ li r0, 1 -/* 800EBD24 000E8C64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EBD28 000E8C68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EBD24 000E8C64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EBD28 000E8C68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EBD2C 000E8C6C 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800EBD30 000E8C70 48 00 00 1C */ b lbl_800EBD4C lbl_800EBD34: /* 800EBD34 000E8C74 28 00 00 03 */ cmplwi r0, 3 /* 800EBD38 000E8C78 40 82 00 14 */ bne lbl_800EBD4C /* 800EBD3C 000E8C7C 38 00 00 04 */ li r0, 4 -/* 800EBD40 000E8C80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EBD44 000E8C84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EBD40 000E8C80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EBD44 000E8C84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EBD48 000E8C88 98 03 5E 81 */ stb r0, 0x5e81(r3) lbl_800EBD4C: /* 800EBD4C 000E8C8C A8 7F 30 0C */ lha r3, 0x300c(r31) @@ -89777,8 +89777,8 @@ lbl_800EC6D0: /* 800EC6EC 000E962C 98 1E 2F 93 */ stb r0, 0x2f93(r30) /* 800EC6F0 000E9630 48 00 00 18 */ b lbl_800EC708 lbl_800EC6F4: -/* 800EC6F4 000E9634 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EC6F8 000E9638 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EC6F4 000E9634 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EC6F8 000E9638 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EC6FC 000E963C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800EC700 000E9640 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800EC704 000E9644 4B F5 BA 79 */ bl dEvent_manager_c_NS_cutEnd @@ -89819,8 +89819,8 @@ daAlink_searchCoach: .global daAlink_c_NS_checkHorseZeldaBowMode daAlink_c_NS_checkHorseZeldaBowMode: -/* 800EC76C 000E96AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EC770 000E96B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EC76C 000E96AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EC770 000E96B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EC774 000E96B4 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EC778 000E96B8 28 03 00 00 */ cmplwi r3, 0 /* 800EC77C 000E96BC 40 82 00 0C */ bne lbl_800EC788 @@ -89841,8 +89841,8 @@ lbl_800EC7A8: .global daAlink_c_NS_setHorseZeldaDamage daAlink_c_NS_setHorseZeldaDamage: -/* 800EC7B0 000E96F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EC7B4 000E96F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EC7B0 000E96F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EC7B4 000E96F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EC7B8 000E96F8 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EC7BC 000E96FC 28 03 00 00 */ cmplwi r3, 0 /* 800EC7C0 000E9700 4D 82 00 20 */ beqlr @@ -89883,8 +89883,8 @@ daAlink_c_NS_checkCowGame: /* 800EC834 000E9774 4B FB 12 2D */ bl daAlink_c_NS_checkStageName /* 800EC838 000E9778 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EC83C 000E977C 41 82 00 28 */ beq lbl_800EC864 -/* 800EC840 000E9780 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EC844 000E9784 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EC840 000E9780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EC844 000E9784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EC848 000E9788 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 800EC84C 000E978C 7C 00 07 74 */ extsb r0, r0 /* 800EC850 000E9790 2C 00 00 04 */ cmpwi r0, 4 @@ -90125,8 +90125,8 @@ daAlink_c_NS_initForceRideHorse: /* 800ECB74 000E9AB4 38 00 00 01 */ li r0, 1 /* 800ECB78 000E9AB8 98 1E 2F AA */ stb r0, 0x2faa(r30) /* 800ECB7C 000E9ABC 38 7E 28 14 */ addi r3, r30, 0x2814 -/* 800ECB80 000E9AC0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800ECB84 000E9AC4 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 800ECB80 000E9AC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800ECB84 000E9AC4 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 800ECB88 000E9AC8 80 9F 5D B8 */ lwz r4, 0x5db8(r31) /* 800ECB8C 000E9ACC 48 07 21 2D */ bl daPy_actorKeep_c_NS_setData /* 800ECB90 000E9AD0 3C 60 80 42 */ lis r3, lbl_8042558C@ha @@ -90159,8 +90159,8 @@ daAlink_c_NS_rideGetOff: /* 800ECBF0 000E9B30 4E 80 04 21 */ bctrl /* 800ECBF4 000E9B34 28 03 00 00 */ cmplwi r3, 0 /* 800ECBF8 000E9B38 41 82 00 34 */ beq lbl_800ECC2C -/* 800ECBFC 000E9B3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800ECC00 000E9B40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800ECBFC 000E9B3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800ECC00 000E9B40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800ECC04 000E9B44 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800ECC08 000E9B48 28 03 00 00 */ cmplwi r3, 0 /* 800ECC0C 000E9B4C 41 82 00 10 */ beq lbl_800ECC1C @@ -90417,8 +90417,8 @@ lbl_800ECF40: /* 800ECF54 000E9E94 38 21 00 10 */ addi r1, r1, 0x10 /* 800ECF58 000E9E98 4E 80 00 20 */ blr /* 800ECF5C 000E9E9C 38 A0 00 00 */ li r5, 0 -/* 800ECF60 000E9EA0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800ECF64 000E9EA4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800ECF60 000E9EA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800ECF64 000E9EA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800ECF68 000E9EA8 80 04 5F 18 */ lwz r0, 0x5f18(r4) /* 800ECF6C 000E9EAC 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800ECF70 000E9EB0 40 82 00 20 */ bne lbl_800ECF90 @@ -90689,8 +90689,8 @@ daAlink_c_NS_setHorseStirrup: /* 800ED31C 000EA25C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800ED320 000EA260 93 C1 00 08 */ stw r30, 8(r1) /* 800ED324 000EA264 7C 7E 1B 78 */ mr r30, r3 -/* 800ED328 000EA268 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800ED32C 000EA26C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800ED328 000EA268 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800ED32C 000EA26C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800ED330 000EA270 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800ED334 000EA274 28 1F 00 00 */ cmplwi r31, 0 /* 800ED338 000EA278 41 82 01 68 */ beq lbl_800ED4A0 @@ -90816,8 +90816,8 @@ daAlink_c_NS_setSyncHorsePos: /* 800ED4E8 000EA428 93 E1 00 2C */ stw r31, 0x2c(r1) /* 800ED4EC 000EA42C 93 C1 00 28 */ stw r30, 0x28(r1) /* 800ED4F0 000EA430 7C 7E 1B 78 */ mr r30, r3 -/* 800ED4F4 000EA434 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800ED4F8 000EA438 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800ED4F4 000EA434 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800ED4F8 000EA438 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800ED4FC 000EA43C 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800ED500 000EA440 28 1F 00 00 */ cmplwi r31, 0 /* 800ED504 000EA444 40 82 00 34 */ bne lbl_800ED538 @@ -90937,8 +90937,8 @@ lbl_800ED67C: /* 800ED6AC 000EA5EC B0 1E 04 E8 */ sth r0, 0x4e8(r30) /* 800ED6B0 000EA5F0 48 00 00 7C */ b lbl_800ED72C lbl_800ED6B4: -/* 800ED6B4 000EA5F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800ED6B8 000EA5F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800ED6B4 000EA5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800ED6B8 000EA5F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800ED6BC 000EA5FC 80 1E 31 7C */ lwz r0, 0x317c(r30) /* 800ED6C0 000EA600 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800ED6C4 000EA604 7C 63 02 14 */ add r3, r3, r0 @@ -91218,8 +91218,8 @@ daAlink_c_NS_setHorseTurnAnime: /* 800EDA84 000EA9C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EDA88 000EA9C8 93 C1 00 08 */ stw r30, 8(r1) /* 800EDA8C 000EA9CC 7C 7E 1B 78 */ mr r30, r3 -/* 800EDA90 000EA9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EDA94 000EA9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EDA90 000EA9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EDA94 000EA9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EDA98 000EA9D8 83 E3 5D B8 */ lwz r31, 0x5db8(r3) /* 800EDA9C 000EA9DC A0 1F 16 C4 */ lhz r0, 0x16c4(r31) /* 800EDAA0 000EA9E0 28 00 00 0C */ cmplwi r0, 0xc @@ -91281,8 +91281,8 @@ daAlink_c_NS_getBaseHorseAnime: /* 800EDB58 000EAA98 48 27 46 81 */ bl _savegpr_28 /* 800EDB5C 000EAA9C 7C 7C 1B 78 */ mr r28, r3 /* 800EDB60 000EAAA0 7C 9D 23 78 */ mr r29, r4 -/* 800EDB64 000EAAA4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EDB68 000EAAA8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EDB64 000EAAA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EDB68 000EAAA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EDB6C 000EAAAC 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EDB70 000EAAB0 4B FF F5 05 */ bl daAlink_c_NS_checkHorseNoUpperAnime /* 800EDB74 000EAAB4 2C 03 00 00 */ cmpwi r3, 0 @@ -91291,8 +91291,8 @@ daAlink_c_NS_getBaseHorseAnime: /* 800EDB80 000EAAC0 28 00 02 65 */ cmplwi r0, 0x265 /* 800EDB84 000EAAC4 40 82 00 70 */ bne lbl_800EDBF4 lbl_800EDB88: -/* 800EDB88 000EAAC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EDB8C 000EAACC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EDB88 000EAAC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EDB8C 000EAACC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EDB90 000EAAD0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800EDB94 000EAAD4 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800EDB98 000EAAD8 40 82 00 5C */ bne lbl_800EDBF4 @@ -91443,8 +91443,8 @@ daAlink_c_NS_checkHorseSpecialProc: /* 800EDD78 000EACB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EDD7C 000EACBC 93 C1 00 08 */ stw r30, 8(r1) /* 800EDD80 000EACC0 7C 7E 1B 78 */ mr r30, r3 -/* 800EDD84 000EACC4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EDD88 000EACC8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EDD84 000EACC4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EDD88 000EACC8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EDD8C 000EACCC 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EDD90 000EACD0 81 83 06 28 */ lwz r12, 0x628(r3) /* 800EDD94 000EACD4 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -91560,8 +91560,8 @@ daAlink_c_NS_setSyncHorse: /* 800EDF0C 000EAE4C 48 27 42 CD */ bl _savegpr_28 /* 800EDF10 000EAE50 7C 7D 1B 78 */ mr r29, r3 /* 800EDF14 000EAE54 7C 9E 23 78 */ mr r30, r4 -/* 800EDF18 000EAE58 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EDF1C 000EAE5C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EDF18 000EAE58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EDF1C 000EAE5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EDF20 000EAE60 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EDF24 000EAE64 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800EDF28 000EAE68 54 1C 07 FE */ clrlwi r28, r0, 0x1f @@ -92276,8 +92276,8 @@ daAlink_c_NS_setSyncRide: /* 800EE938 000EB878 88 1E 2F B2 */ lbz r0, 0x2fb2(r30) /* 800EE93C 000EB87C 28 00 00 00 */ cmplwi r0, 0 /* 800EE940 000EB880 40 82 00 50 */ bne lbl_800EE990 -/* 800EE944 000EB884 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EE948 000EB888 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EE944 000EB884 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EE948 000EB888 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EE94C 000EB88C 88 04 5E 24 */ lbz r0, 0x5e24(r4) /* 800EE950 000EB890 28 00 00 00 */ cmplwi r0, 0 /* 800EE954 000EB894 40 82 00 3C */ bne lbl_800EE990 @@ -92287,8 +92287,8 @@ daAlink_c_NS_setSyncRide: /* 800EE964 000EB8A4 4E 80 04 21 */ bctrl /* 800EE968 000EB8A8 28 03 00 00 */ cmplwi r3, 0 /* 800EE96C 000EB8AC 41 82 00 1C */ beq lbl_800EE988 -/* 800EE970 000EB8B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EE974 000EB8B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EE970 000EB8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EE974 000EB8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EE978 000EB8B8 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EE97C 000EB8BC A0 03 16 C4 */ lhz r0, 0x16c4(r3) /* 800EE980 000EB8C0 28 00 00 07 */ cmplwi r0, 7 @@ -92402,8 +92402,8 @@ daAlink_c_NS_setBaseHorseAnimeFrame: /* 800EEAFC 000EBA3C 39 61 00 20 */ addi r11, r1, 0x20 /* 800EEB00 000EBA40 48 27 36 D9 */ bl _savegpr_28 /* 800EEB04 000EBA44 7C 7D 1B 78 */ mr r29, r3 -/* 800EEB08 000EBA48 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EEB0C 000EBA4C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EEB08 000EBA48 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EEB0C 000EBA4C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EEB10 000EBA50 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EEB14 000EBA54 3B C0 00 00 */ li r30, 0 /* 800EEB18 000EBA58 A0 03 1F 5C */ lhz r0, 0x1f5c(r3) @@ -92599,8 +92599,8 @@ daAlink_c_NS_setBaseRideAnime: /* 800EEDBC 000EBCFC 4E 80 04 21 */ bctrl /* 800EEDC0 000EBD00 28 03 00 00 */ cmplwi r3, 0 /* 800EEDC4 000EBD04 41 82 00 4C */ beq lbl_800EEE10 -/* 800EEDC8 000EBD08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EEDCC 000EBD0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EEDC8 000EBD08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EEDCC 000EBD0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EEDD0 000EBD10 83 E3 5D B8 */ lwz r31, 0x5db8(r3) /* 800EEDD4 000EBD14 7F C3 F3 78 */ mr r3, r30 /* 800EEDD8 000EBD18 38 81 00 08 */ addi r4, r1, 8 @@ -92630,8 +92630,8 @@ lbl_800EEE18: .global daAlink_c_NS_checkHorseSwordUpSpped daAlink_c_NS_checkHorseSwordUpSpped: -/* 800EEE30 000EBD70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EEE34 000EBD74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EEE30 000EBD70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EEE34 000EBD74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EEE38 000EBD78 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EEE3C 000EBD7C C0 43 05 2C */ lfs f2, 0x52c(r3) /* 800EEE40 000EBD80 C0 22 94 D0 */ lfs f1, lbl_80452ED0-_SDA2_BASE_(r2) @@ -93144,8 +93144,8 @@ lbl_800EF51C: lbl_800EF534: /* 800EF534 000EC474 28 04 00 3E */ cmplwi r4, 0x3e /* 800EF538 000EC478 40 82 00 2C */ bne lbl_800EF564 -/* 800EF53C 000EC47C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EF540 000EC480 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EF53C 000EC47C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EF540 000EC480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EF544 000EC484 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EF548 000EC488 28 03 00 00 */ cmplwi r3, 0 /* 800EF54C 000EC48C 41 82 00 18 */ beq lbl_800EF564 @@ -93189,8 +93189,8 @@ daAlink_c_NS_checkHorseGetOff: /* 800EF5C8 000EC508 4E 80 04 21 */ bctrl /* 800EF5CC 000EC50C 28 03 00 00 */ cmplwi r3, 0 /* 800EF5D0 000EC510 41 82 00 1C */ beq lbl_800EF5EC -/* 800EF5D4 000EC514 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EF5D8 000EC518 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EF5D4 000EC514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EF5D8 000EC518 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EF5DC 000EC51C 80 03 5D B8 */ lwz r0, 0x5db8(r3) /* 800EF5E0 000EC520 28 00 00 00 */ cmplwi r0, 0 /* 800EF5E4 000EC524 41 82 00 08 */ beq lbl_800EF5EC @@ -93198,8 +93198,8 @@ daAlink_c_NS_checkHorseGetOff: lbl_800EF5EC: /* 800EF5EC 000EC52C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800EF5F0 000EC530 41 82 00 34 */ beq lbl_800EF624 -/* 800EF5F4 000EC534 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800EF5F8 000EC538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800EF5F4 000EC534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800EF5F8 000EC538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EF5FC 000EC53C 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800EF600 000EC540 C0 03 05 2C */ lfs f0, 0x52c(r3) /* 800EF604 000EC544 FC 00 02 10 */ fabs f0, f0 @@ -93258,8 +93258,8 @@ daAlink_c_NS_checkHorseGetOffAndSetDoStatus: /* 800EF6BC 000EC5FC 39 61 00 20 */ addi r11, r1, 0x20 /* 800EF6C0 000EC600 48 27 2B 19 */ bl _savegpr_28 /* 800EF6C4 000EC604 7C 7E 1B 78 */ mr r30, r3 -/* 800EF6C8 000EC608 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EF6CC 000EC60C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EF6C8 000EC608 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EF6CC 000EC60C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EF6D0 000EC610 83 84 5D B8 */ lwz r28, 0x5db8(r4) /* 800EF6D4 000EC614 3B E0 00 00 */ li r31, 0 /* 800EF6D8 000EC618 4B FF FE C1 */ bl daAlink_c_NS_checkHorseGetOff @@ -93388,8 +93388,8 @@ daAlink_c_NS_setHorseGetOff: /* 800EF894 000EC7D4 48 27 29 49 */ bl _savegpr_29 /* 800EF898 000EC7D8 7C 7D 1B 78 */ mr r29, r3 /* 800EF89C 000EC7DC 7C 9E 23 78 */ mr r30, r4 -/* 800EF8A0 000EC7E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800EF8A4 000EC7E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800EF8A0 000EC7E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800EF8A4 000EC7E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EF8A8 000EC7E8 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EF8AC 000EC7EC 88 04 5E 24 */ lbz r0, 0x5e24(r4) /* 800EF8B0 000EC7F0 28 00 00 32 */ cmplwi r0, 0x32 @@ -94238,8 +94238,8 @@ lbl_800F04F0: /* 800F0500 000ED440 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800F0504 000ED444 38 81 00 08 */ addi r4, r1, 8 /* 800F0508 000ED448 48 17 78 21 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800F050C 000ED44C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F0510 000ED450 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F050C 000ED44C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F0510 000ED450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0514 000ED454 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F0518 000ED458 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800F051C 000ED45C 4B F8 3F 85 */ bl cBgS_NS_GroundCross @@ -94474,8 +94474,8 @@ lbl_800F0804: /* 800F087C 000ED7BC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F0880 000ED7C0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800F0884 000ED7C4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800F0888 000ED7C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F088C 000ED7CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F0888 000ED7C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F088C 000ED7CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0890 000ED7D0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800F0894 000ED7D4 38 80 00 01 */ li r4, 1 /* 800F0898 000ED7D8 38 A0 00 0F */ li r5, 0xf @@ -94728,8 +94728,8 @@ lbl_800F0C18: /* 800F0C1C 000EDB5C 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc /* 800F0C20 000EDB60 41 82 00 30 */ beq lbl_800F0C50 /* 800F0C24 000EDB64 38 00 00 2D */ li r0, 0x2d -/* 800F0C28 000EDB68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F0C2C 000EDB6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F0C28 000EDB68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F0C2C 000EDB6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0C30 000EDB70 98 03 5E 26 */ stb r0, 0x5e26(r3) /* 800F0C34 000EDB74 38 00 00 05 */ li r0, 5 /* 800F0C38 000EDB78 98 03 5E 2D */ stb r0, 0x5e2d(r3) @@ -94787,8 +94787,8 @@ lbl_800F0CB4: /* 800F0CF0 000EDC30 39 61 00 20 */ addi r11, r1, 0x20 /* 800F0CF4 000EDC34 48 27 14 E9 */ bl _savegpr_29 /* 800F0CF8 000EDC38 7C 7E 1B 78 */ mr r30, r3 -/* 800F0CFC 000EDC3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F0D00 000EDC40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800F0CFC 000EDC3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F0D00 000EDC40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F0D04 000EDC44 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800F0D08 000EDC48 4B FF CD 1D */ bl daAlink_c_NS_setSyncRidePos /* 800F0D0C 000EDC4C 2C 03 00 00 */ cmpwi r3, 0 @@ -94885,8 +94885,8 @@ lbl_800F0E3C: /* 800F0E58 000EDD98 4B FF C2 1D */ bl daAlink_c_NS_checkHorseNoUpperAnime /* 800F0E5C 000EDD9C 2C 03 00 00 */ cmpwi r3, 0 /* 800F0E60 000EDDA0 41 82 00 70 */ beq lbl_800F0ED0 -/* 800F0E64 000EDDA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F0E68 000EDDA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F0E64 000EDDA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F0E68 000EDDA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0E6C 000EDDAC 88 03 00 15 */ lbz r0, 0x15(r3) /* 800F0E70 000EDDB0 28 00 00 FF */ cmplwi r0, 0xff /* 800F0E74 000EDDB4 41 82 00 14 */ beq lbl_800F0E88 @@ -95075,8 +95075,8 @@ lbl_800F10A8: /* 800F1104 000EE044 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F1108 000EE048 93 C1 00 08 */ stw r30, 8(r1) /* 800F110C 000EE04C 7C 7E 1B 78 */ mr r30, r3 -/* 800F1110 000EE050 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F1114 000EE054 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800F1110 000EE050 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F1114 000EE054 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F1118 000EE058 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800F111C 000EE05C 4B FF C9 09 */ bl daAlink_c_NS_setSyncRidePos /* 800F1120 000EE060 2C 03 00 00 */ cmpwi r3, 0 @@ -95151,8 +95151,8 @@ lbl_800F11D0: /* 800F1210 000EE150 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F1214 000EE154 93 C1 00 08 */ stw r30, 8(r1) /* 800F1218 000EE158 7C 7E 1B 78 */ mr r30, r3 -/* 800F121C 000EE15C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F1220 000EE160 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800F121C 000EE15C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F1220 000EE160 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F1224 000EE164 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800F1228 000EE168 4B FF C7 FD */ bl daAlink_c_NS_setSyncRidePos /* 800F122C 000EE16C 2C 03 00 00 */ cmpwi r3, 0 @@ -95541,8 +95541,8 @@ lbl_800F1774: /* 800F1784 000EE6C4 4B FE 0C 3D */ bl daAlink_c_NS_checkCutAction /* 800F1788 000EE6C8 48 00 00 F0 */ b lbl_800F1878 lbl_800F178C: -/* 800F178C 000EE6CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F1790 000EE6D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F178C 000EE6CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F1790 000EE6D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F1794 000EE6D4 88 03 00 15 */ lbz r0, 0x15(r3) /* 800F1798 000EE6D8 28 00 00 FF */ cmplwi r0, 0xff /* 800F179C 000EE6DC 41 82 00 14 */ beq lbl_800F17B0 @@ -95570,8 +95570,8 @@ lbl_800F17E4: /* 800F17E8 000EE728 C0 1F 34 84 */ lfs f0, 0x3484(r31) /* 800F17EC 000EE72C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F17F0 000EE730 40 81 00 40 */ ble lbl_800F1830 -/* 800F17F4 000EE734 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F17F8 000EE738 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F17F4 000EE734 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F17F8 000EE738 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F17FC 000EE73C 88 03 00 15 */ lbz r0, 0x15(r3) /* 800F1800 000EE740 28 00 00 FF */ cmplwi r0, 0xff /* 800F1804 000EE744 41 82 00 14 */ beq lbl_800F1818 @@ -95687,8 +95687,8 @@ lbl_800F1980: /* 800F1990 000EE8D0 48 06 CB 3D */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 800F1994 000EE8D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1998 000EE8D8 41 82 00 B0 */ beq lbl_800F1A48 -/* 800F199C 000EE8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F19A0 000EE8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F199C 000EE8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F19A0 000EE8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F19A4 000EE8E4 88 03 00 14 */ lbz r0, 0x14(r3) /* 800F19A8 000EE8E8 28 00 00 3F */ cmplwi r0, 0x3f /* 800F19AC 000EE8EC 41 82 00 10 */ beq lbl_800F19BC @@ -96461,8 +96461,8 @@ lbl_800F2480: /* 800F2490 000EF3D0 7F E3 FB 78 */ mr r3, r31 /* 800F2494 000EF3D4 38 80 00 01 */ li r4, 1 /* 800F2498 000EF3D8 4B FE DF 39 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed -/* 800F249C 000EF3DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F24A0 000EF3E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F249C 000EF3DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F24A0 000EF3E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F24A4 000EF3E4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F24A8 000EF3E8 64 00 00 08 */ oris r0, r0, 8 /* 800F24AC 000EF3EC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -96563,8 +96563,8 @@ lbl_800F25E0: /* 800F25F0 000EF530 7F E3 FB 78 */ mr r3, r31 /* 800F25F4 000EF534 38 80 00 00 */ li r4, 0 /* 800F25F8 000EF538 4B FE DD D9 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed -/* 800F25FC 000EF53C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2600 000EF540 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F25FC 000EF53C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2600 000EF540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2604 000EF544 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F2608 000EF548 64 00 00 08 */ oris r0, r0, 8 /* 800F260C 000EF54C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -96658,8 +96658,8 @@ lbl_800F2720: /* 800F2738 000EF678 48 01 69 B5 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed /* 800F273C 000EF67C 7F E3 FB 78 */ mr r3, r31 /* 800F2740 000EF680 48 01 69 31 */ bl daAlink_c_NS_setHookshotReadyMaterial -/* 800F2744 000EF684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2748 000EF688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2744 000EF684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2748 000EF688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F274C 000EF68C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F2750 000EF690 60 00 40 00 */ ori r0, r0, 0x4000 /* 800F2754 000EF694 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -96743,8 +96743,8 @@ lbl_800F2850: /* 800F2860 000EF7A0 7F E3 FB 78 */ mr r3, r31 /* 800F2864 000EF7A4 38 80 00 00 */ li r4, 0 /* 800F2868 000EF7A8 48 01 68 85 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed -/* 800F286C 000EF7AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2870 000EF7B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F286C 000EF7AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2870 000EF7B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2874 000EF7B4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F2878 000EF7B8 60 00 40 00 */ ori r0, r0, 0x4000 /* 800F287C 000EF7BC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -96809,8 +96809,8 @@ daAlink_c_NS_procHorseBottleDrinkInit: /* 800F2944 000EF884 93 C1 00 08 */ stw r30, 8(r1) /* 800F2948 000EF888 7C 7F 1B 78 */ mr r31, r3 /* 800F294C 000EF88C 7C 9E 23 78 */ mr r30, r4 -/* 800F2950 000EF890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2954 000EF894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2950 000EF890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2954 000EF894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2958 000EF898 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800F295C 000EF89C 7F E4 FB 78 */ mr r4, r31 /* 800F2960 000EF8A0 38 A0 00 00 */ li r5, 0 @@ -96846,8 +96846,8 @@ lbl_800F29B0: /* 800F29D0 000EF910 4E 80 04 21 */ bctrl /* 800F29D4 000EF914 28 03 00 00 */ cmplwi r3, 0 /* 800F29D8 000EF918 41 82 00 30 */ beq lbl_800F2A08 -/* 800F29DC 000EF91C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F29E0 000EF920 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F29DC 000EF91C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F29E0 000EF920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F29E4 000EF924 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 800F29E8 000EF928 38 00 00 03 */ li r0, 3 /* 800F29EC 000EF92C 98 04 16 B8 */ stb r0, 0x16b8(r4) @@ -96879,8 +96879,8 @@ lbl_800F2A14: /* 800F2A4C 000EF98C 7F E3 FB 78 */ mr r3, r31 /* 800F2A50 000EF990 7F C4 F3 78 */ mr r4, r30 /* 800F2A54 000EF994 48 01 BB 85 */ bl daAlink_c_NS_setBottleModel -/* 800F2A58 000EF998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2A5C 000EF99C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2A58 000EF998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2A5C 000EF99C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2A60 000EF9A0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800F2A64 000EF9A4 60 00 20 00 */ ori r0, r0, 0x2000 /* 800F2A68 000EF9A8 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -96953,8 +96953,8 @@ daAlink_c_NS_procHorseKandelaarPourInit: /* 800F2B54 000EFA94 90 01 00 14 */ stw r0, 0x14(r1) /* 800F2B58 000EFA98 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2B5C 000EFA9C 7C 7F 1B 78 */ mr r31, r3 -/* 800F2B60 000EFAA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2B64 000EFAA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2B60 000EFAA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2B64 000EFAA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2B68 000EFAA8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800F2B6C 000EFAAC 7F E4 FB 78 */ mr r4, r31 /* 800F2B70 000EFAB0 38 A0 00 00 */ li r5, 0 @@ -96993,8 +96993,8 @@ lbl_800F2BC0: /* 800F2BEC 000EFB2C 4E 80 04 21 */ bctrl /* 800F2BF0 000EFB30 28 03 00 00 */ cmplwi r3, 0 /* 800F2BF4 000EFB34 41 82 00 30 */ beq lbl_800F2C24 -/* 800F2BF8 000EFB38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2BFC 000EFB3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2BF8 000EFB38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2BFC 000EFB3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2C00 000EFB40 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 800F2C04 000EFB44 38 00 00 03 */ li r0, 3 /* 800F2C08 000EFB48 98 04 16 B8 */ stb r0, 0x16b8(r4) @@ -97046,8 +97046,8 @@ lbl_800F2C64: /* 800F2CB4 000EFBF4 4E 80 04 21 */ bctrl /* 800F2CB8 000EFBF8 28 03 00 00 */ cmplwi r3, 0 /* 800F2CBC 000EFBFC 41 82 00 28 */ beq lbl_800F2CE4 -/* 800F2CC0 000EFC00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2CC4 000EFC04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2CC0 000EFC00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2CC4 000EFC04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2CC8 000EFC08 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800F2CCC 000EFC0C 28 03 00 00 */ cmplwi r3, 0 /* 800F2CD0 000EFC10 41 82 00 14 */ beq lbl_800F2CE4 @@ -97084,8 +97084,8 @@ lbl_800F2D0C: /* 800F2D44 000EFC84 C0 1F 34 78 */ lfs f0, 0x3478(r31) /* 800F2D48 000EFC88 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F2D4C 000EFC8C D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 800F2D50 000EFC90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F2D54 000EFC94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F2D50 000EFC90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F2D54 000EFC94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2D58 000EFC98 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 800F2D5C 000EFC9C 38 00 00 02 */ li r0, 2 /* 800F2D60 000EFCA0 98 03 16 B8 */ stb r0, 0x16b8(r3) @@ -97256,8 +97256,8 @@ daAlink_c_NS_procHorseRunInit: /* 800F2FB4 000EFEF4 93 E1 00 2C */ stw r31, 0x2c(r1) /* 800F2FB8 000EFEF8 93 C1 00 28 */ stw r30, 0x28(r1) /* 800F2FBC 000EFEFC 7C 7E 1B 78 */ mr r30, r3 -/* 800F2FC0 000EFF00 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F2FC4 000EFF04 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800F2FC0 000EFF00 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F2FC4 000EFF04 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F2FC8 000EFF08 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800F2FCC 000EFF0C 4B FF A5 11 */ bl daAlink_c_NS_setSyncHorsePos /* 800F2FD0 000EFF10 2C 03 00 00 */ cmpwi r3, 0 @@ -97312,8 +97312,8 @@ lbl_800F307C: /* 800F3080 000EFFC0 2C 00 00 00 */ cmpwi r0, 0 /* 800F3084 000EFFC4 40 82 00 7C */ bne lbl_800F3100 /* 800F3088 000EFFC8 38 00 00 7A */ li r0, 0x7a -/* 800F308C 000EFFCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F3090 000EFFD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F308C 000EFFCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F3090 000EFFD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F3094 000EFFD4 98 03 5E 26 */ stb r0, 0x5e26(r3) /* 800F3098 000EFFD8 38 00 00 04 */ li r0, 4 /* 800F309C 000EFFDC 98 03 5E 2D */ stb r0, 0x5e2d(r3) @@ -97337,8 +97337,8 @@ lbl_800F30D4: /* 800F30D8 000F0018 2C 00 00 00 */ cmpwi r0, 0 /* 800F30DC 000F001C 40 82 00 24 */ bne lbl_800F3100 /* 800F30E0 000F0020 38 00 00 7A */ li r0, 0x7a -/* 800F30E4 000F0024 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F30E8 000F0028 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F30E4 000F0024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F30E8 000F0028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F30EC 000F002C 98 03 5E 26 */ stb r0, 0x5e26(r3) /* 800F30F0 000F0030 38 00 00 01 */ li r0, 1 /* 800F30F4 000F0034 98 03 5E 2D */ stb r0, 0x5e2d(r3) @@ -97793,8 +97793,8 @@ lbl_800F3740: /* 800F3778 000F06B8 48 06 AD 55 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 800F377C 000F06BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F3780 000F06C0 41 82 00 1C */ beq lbl_800F379C -/* 800F3784 000F06C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F3788 000F06C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F3784 000F06C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F3788 000F06C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F378C 000F06CC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800F3790 000F06D0 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 800F3794 000F06D4 4B F5 49 E9 */ bl dEvent_manager_c_NS_cutEnd @@ -97878,8 +97878,8 @@ lbl_800F3880: /* 800F38B0 000F07F0 48 06 AC 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 800F38B4 000F07F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F38B8 000F07F8 41 82 00 18 */ beq lbl_800F38D0 -/* 800F38BC 000F07FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F38C0 000F0800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F38BC 000F07FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F38C0 000F0800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F38C4 000F0804 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800F38C8 000F0808 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 800F38CC 000F080C 4B F5 48 B1 */ bl dEvent_manager_c_NS_cutEnd @@ -99482,8 +99482,8 @@ lbl_800F4F38: /* 800F4F38 000F1E78 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800F4F3C 000F1E7C 38 81 00 14 */ addi r4, r1, 0x14 /* 800F4F40 000F1E80 48 17 2D E9 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800F4F44 000F1E84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F4F48 000F1E88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F4F44 000F1E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F4F48 000F1E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F4F4C 000F1E8C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F4F50 000F1E90 38 9E 1D 08 */ addi r4, r30, 0x1d08 /* 800F4F54 000F1E94 4B F7 F5 4D */ bl cBgS_NS_GroundCross @@ -99883,8 +99883,8 @@ lbl_800F5504: /* 800F5504 000F2444 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800F5508 000F2448 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800F550C 000F244C 41 82 00 54 */ beq lbl_800F5560 -/* 800F5510 000F2450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F5514 000F2454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F5510 000F2450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F5514 000F2454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F5518 000F2458 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 800F551C 000F245C 28 00 00 16 */ cmplwi r0, 0x16 /* 800F5520 000F2460 40 82 00 40 */ bne lbl_800F5560 @@ -101810,8 +101810,8 @@ lbl_800F6FD0: /* 800F6FD8 000F3F18 7F E3 FB 78 */ mr r3, r31 /* 800F6FDC 000F3F1C 38 80 00 01 */ li r4, 1 /* 800F6FE0 000F3F20 4B FE 93 F1 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed -/* 800F6FE4 000F3F24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F6FE8 000F3F28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F6FE4 000F3F24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F6FE8 000F3F28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F6FEC 000F3F2C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F6FF0 000F3F30 64 00 00 08 */ oris r0, r0, 8 /* 800F6FF4 000F3F34 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -101906,8 +101906,8 @@ lbl_800F711C: /* 800F7124 000F4064 7F E3 FB 78 */ mr r3, r31 /* 800F7128 000F4068 38 80 00 00 */ li r4, 0 /* 800F712C 000F406C 4B FE 92 A5 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed -/* 800F7130 000F4070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7134 000F4074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7130 000F4070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7134 000F4074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7138 000F4078 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F713C 000F407C 64 00 00 08 */ oris r0, r0, 8 /* 800F7140 000F4080 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -101988,8 +101988,8 @@ lbl_800F7234: /* 800F723C 000F417C 7F E3 FB 78 */ mr r3, r31 /* 800F7240 000F4180 38 80 00 01 */ li r4, 1 /* 800F7244 000F4184 48 01 1E A9 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed -/* 800F7248 000F4188 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F724C 000F418C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7248 000F4188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F724C 000F418C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7250 000F4190 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F7254 000F4194 60 00 40 00 */ ori r0, r0, 0x4000 /* 800F7258 000F4198 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -102067,8 +102067,8 @@ lbl_800F7348: /* 800F7350 000F4290 7F E3 FB 78 */ mr r3, r31 /* 800F7354 000F4294 38 80 00 00 */ li r4, 0 /* 800F7358 000F4298 48 01 1D 95 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed -/* 800F735C 000F429C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7360 000F42A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F735C 000F429C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7360 000F42A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7364 000F42A4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F7368 000F42A8 60 00 40 00 */ ori r0, r0, 0x4000 /* 800F736C 000F42AC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -102124,8 +102124,8 @@ daAlink_c_NS_procCanoeBottleDrinkInit: /* 800F7414 000F4354 93 C1 00 08 */ stw r30, 8(r1) /* 800F7418 000F4358 7C 7F 1B 78 */ mr r31, r3 /* 800F741C 000F435C 7C 9E 23 78 */ mr r30, r4 -/* 800F7420 000F4360 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7424 000F4364 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7420 000F4360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7424 000F4364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7428 000F4368 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800F742C 000F436C 7F E4 FB 78 */ mr r4, r31 /* 800F7430 000F4370 38 A0 00 00 */ li r5, 0 @@ -102169,8 +102169,8 @@ lbl_800F7450: /* 800F74C4 000F4404 7F E3 FB 78 */ mr r3, r31 /* 800F74C8 000F4408 7F C4 F3 78 */ mr r4, r30 /* 800F74CC 000F440C 48 01 71 0D */ bl daAlink_c_NS_setBottleModel -/* 800F74D0 000F4410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F74D4 000F4414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F74D0 000F4410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F74D4 000F4414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F74D8 000F4418 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 800F74DC 000F441C 60 00 20 00 */ ori r0, r0, 0x2000 /* 800F74E0 000F4420 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -102241,8 +102241,8 @@ daAlink_c_NS_procCanoeKandelaarPourInit: /* 800F75C4 000F4504 90 01 00 14 */ stw r0, 0x14(r1) /* 800F75C8 000F4508 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F75CC 000F450C 7C 7F 1B 78 */ mr r31, r3 -/* 800F75D0 000F4510 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F75D4 000F4514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F75D0 000F4510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F75D4 000F4514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F75D8 000F4518 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800F75DC 000F451C 7F E4 FB 78 */ mr r4, r31 /* 800F75E0 000F4520 38 A0 00 00 */ li r5, 0 @@ -102423,8 +102423,8 @@ lbl_800F784C: /* 800F7860 000F47A0 41 82 00 48 */ beq lbl_800F78A8 /* 800F7864 000F47A4 38 00 00 FF */ li r0, 0xff /* 800F7868 000F47A8 B0 1F 30 1A */ sth r0, 0x301a(r31) -/* 800F786C 000F47AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7870 000F47B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F786C 000F47AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7870 000F47B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7874 000F47B4 38 63 00 9C */ addi r3, r3, 0x9c /* 800F7878 000F47B8 38 80 00 FF */ li r4, 0xff /* 800F787C 000F47BC 4B F3 C4 C5 */ bl setBaitItem__17dSv_player_item_cFUc @@ -102510,8 +102510,8 @@ daAlink_c_NS_procFishingFoodInit: /* 800F7990 000F48D0 90 01 00 14 */ stw r0, 0x14(r1) /* 800F7994 000F48D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7998 000F48D8 7C 7F 1B 78 */ mr r31, r3 -/* 800F799C 000F48DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F79A0 000F48E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F799C 000F48DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F79A0 000F48E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F79A4 000F48E4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800F79A8 000F48E8 7F E4 FB 78 */ mr r4, r31 /* 800F79AC 000F48EC 38 A0 00 00 */ li r5, 0 @@ -102624,8 +102624,8 @@ lbl_800F7AFC: /* 800F7B40 000F4A80 2C 00 00 01 */ cmpwi r0, 1 /* 800F7B44 000F4A84 40 82 00 20 */ bne lbl_800F7B64 lbl_800F7B48: -/* 800F7B48 000F4A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7B4C 000F4A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7B48 000F4A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7B4C 000F4A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7B50 000F4A90 38 63 00 9C */ addi r3, r3, 0x9c /* 800F7B54 000F4A94 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 800F7B58 000F4A98 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -102639,8 +102639,8 @@ lbl_800F7B70: /* 800F7B70 000F4AB0 A8 BE 30 1A */ lha r5, 0x301a(r30) /* 800F7B74 000F4AB4 2C 05 00 FF */ cmpwi r5, 0xff /* 800F7B78 000F4AB8 41 82 00 38 */ beq lbl_800F7BB0 -/* 800F7B7C 000F4ABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7B80 000F4AC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7B7C 000F4ABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7B80 000F4AC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7B84 000F4AC4 38 63 00 9C */ addi r3, r3, 0x9c /* 800F7B88 000F4AC8 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 800F7B8C 000F4ACC 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -102687,8 +102687,8 @@ lbl_800F7C18: /* 800F7C18 000F4B58 38 00 00 5B */ li r0, 0x5b /* 800F7C1C 000F4B5C B0 1E 2F DC */ sth r0, 0x2fdc(r30) lbl_800F7C20: -/* 800F7C20 000F4B60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7C24 000F4B64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7C20 000F4B60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7C24 000F4B64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7C28 000F4B68 38 63 00 9C */ addi r3, r3, 0x9c /* 800F7C2C 000F4B6C 7F E4 FB 78 */ mr r4, r31 /* 800F7C30 000F4B70 4B F3 C1 11 */ bl setBaitItem__17dSv_player_item_cFUc @@ -102755,8 +102755,8 @@ daAlink_c_NS_setCrawlMoveDirectionArrow: /* 800F7CF8 000F4C38 93 C1 00 08 */ stw r30, 8(r1) /* 800F7CFC 000F4C3C 7C 7E 1B 78 */ mr r30, r3 /* 800F7D00 000F4C40 3B E0 00 00 */ li r31, 0 -/* 800F7D04 000F4C44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7D08 000F4C48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7D04 000F4C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7D08 000F4C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7D0C 000F4C4C 80 1E 31 7C */ lwz r0, 0x317c(r30) /* 800F7D10 000F4C50 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800F7D14 000F4C54 7C 63 02 14 */ add r3, r3, r0 @@ -102839,8 +102839,8 @@ lbl_800F7E1C: /* 800F7E1C 000F4D5C 63 E0 00 02 */ ori r0, r31, 2 /* 800F7E20 000F4D60 54 1F 06 3E */ clrlwi r31, r0, 0x18 lbl_800F7E24: -/* 800F7E24 000F4D64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7E28 000F4D68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7E24 000F4D64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7E28 000F4D68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7E2C 000F4D6C 9B E3 5E 81 */ stb r31, 0x5e81(r3) /* 800F7E30 000F4D70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F7E34 000F4D74 83 C1 00 08 */ lwz r30, 8(r1) @@ -102900,8 +102900,8 @@ daAlink_c_NS_changeCrawlAutoMoveProc: /* 800F7F00 000F4E40 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800F7F04 000F4E44 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800F7F08 000F4E48 40 82 00 84 */ bne lbl_800F7F8C -/* 800F7F0C 000F4E4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F7F10 000F4E50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F7F0C 000F4E4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F7F10 000F4E50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7F14 000F4E54 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F7F18 000F4E58 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800F7F1C 000F4E5C 4B F7 CE E5 */ bl dBgS_NS_GetWallCode @@ -103104,14 +103104,14 @@ daAlink_c_NS_getCrawlMoveVec: /* 800F8200 000F5140 80 19 05 74 */ lwz r0, 0x574(r25) /* 800F8204 000F5144 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800F8208 000F5148 41 82 00 34 */ beq lbl_800F823C -/* 800F820C 000F514C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8210 000F5150 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F820C 000F514C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8210 000F5150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8214 000F5154 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F8218 000F5158 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 800F821C 000F515C 41 82 00 20 */ beq lbl_800F823C lbl_800F8220: -/* 800F8220 000F5160 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8224 000F5164 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8220 000F5160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8224 000F5164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8228 000F5168 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F822C 000F516C 38 99 1B 5C */ addi r4, r25, 0x1b5c /* 800F8230 000F5170 4B F7 CB D1 */ bl dBgS_NS_GetWallCode @@ -103121,8 +103121,8 @@ lbl_800F823C: /* 800F823C 000F517C 80 19 05 74 */ lwz r0, 0x574(r25) /* 800F8240 000F5180 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800F8244 000F5184 41 82 00 20 */ beq lbl_800F8264 -/* 800F8248 000F5188 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F824C 000F518C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8248 000F5188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F824C 000F518C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8250 000F5190 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8254 000F5194 38 99 1B 5C */ addi r4, r25, 0x1b5c /* 800F8258 000F5198 4B F7 CB A9 */ bl dBgS_NS_GetWallCode @@ -103132,8 +103132,8 @@ lbl_800F8264: /* 800F8264 000F51A4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800F8268 000F51A8 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800F826C 000F51AC 90 01 00 60 */ stw r0, 0x60(r1) -/* 800F8270 000F51B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8274 000F51B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8270 000F51B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8274 000F51B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8278 000F51B8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800F827C 000F51BC 7F E3 FB 78 */ mr r3, r31 /* 800F8280 000F51C0 38 99 1B 5C */ addi r4, r25, 0x1b5c @@ -103479,8 +103479,8 @@ daAlink_c_NS_checkCrawlSideWall: /* 800F8754 000F5694 D0 1B 00 04 */ stfs f0, 4(r27) /* 800F8758 000F5698 C0 1A 1B 80 */ lfs f0, 0x1b80(r26) /* 800F875C 000F569C D0 1B 00 08 */ stfs f0, 8(r27) -/* 800F8760 000F56A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8764 000F56A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8760 000F56A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8764 000F56A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8768 000F56A8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800F876C 000F56AC 7F E3 FB 78 */ mr r3, r31 /* 800F8770 000F56B0 38 9A 1B 5C */ addi r4, r26, 0x1b5c @@ -103593,8 +103593,8 @@ daAlink_c_NS_decideCrawlDoStatus: /* 800F8904 000F5844 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F8908 000F5848 93 C1 00 08 */ stw r30, 8(r1) /* 800F890C 000F584C 7C 7E 1B 78 */ mr r30, r3 -/* 800F8910 000F5850 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F8914 000F5854 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800F8910 000F5850 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F8914 000F5854 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F8918 000F5858 3B E4 5D 7C */ addi r31, r4, 0x5d7c /* 800F891C 000F585C 80 03 31 7C */ lwz r0, 0x317c(r3) /* 800F8920 000F5860 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -103610,8 +103610,8 @@ daAlink_c_NS_decideCrawlDoStatus: /* 800F8948 000F5888 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F894C 000F588C 40 81 00 7C */ ble lbl_800F89C8 lbl_800F8950: -/* 800F8950 000F5890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8954 000F5894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8950 000F5890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8954 000F5894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8958 000F5898 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F895C 000F589C 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 800F8960 000F58A0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -103662,8 +103662,8 @@ daAlink_c_NS_checkNotCrawlStand: /* 800F8A00 000F5940 D0 03 1D 9C */ stfs f0, 0x1d9c(r3) /* 800F8A04 000F5944 C0 04 00 08 */ lfs f0, 8(r4) /* 800F8A08 000F5948 D0 03 1D A0 */ stfs f0, 0x1da0(r3) -/* 800F8A0C 000F594C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8A10 000F5950 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8A0C 000F594C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8A10 000F5950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8A14 000F5954 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8A18 000F5958 38 9F 1D 5C */ addi r4, r31, 0x1d5c /* 800F8A1C 000F595C 4B F7 CA 81 */ bl dBgS_NS_RoofChk @@ -103973,8 +103973,8 @@ lbl_800F8E70: /* 800F8E7C 000F5DBC C0 21 00 28 */ lfs f1, 0x28(r1) /* 800F8E80 000F5DC0 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F8E84 000F5DC4 EF E1 00 28 */ fsubs f31, f1, f0 -/* 800F8E88 000F5DC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F8E8C 000F5DCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F8E88 000F5DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F8E8C 000F5DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8E90 000F5DD0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8E94 000F5DD4 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800F8E98 000F5DD8 4B F7 B6 09 */ bl cBgS_NS_GroundCross @@ -104309,8 +104309,8 @@ lbl_800F9330: /* 800F934C 000F628C D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800F9350 000F6290 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F9354 000F6294 D0 1F 33 CC */ stfs f0, 0x33cc(r31) -/* 800F9358 000F6298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F935C 000F629C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F9358 000F6298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F935C 000F629C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F9360 000F62A0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800F9364 000F62A4 64 00 08 00 */ oris r0, r0, 0x800 /* 800F9368 000F62A8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -104407,8 +104407,8 @@ lbl_800F94B4: /* 800F94BC 000F63FC 40 82 00 08 */ bne lbl_800F94C4 /* 800F94C0 000F6400 3B 20 00 01 */ li r25, 1 lbl_800F94C4: -/* 800F94C4 000F6404 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F94C8 000F6408 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800F94C4 000F6404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F94C8 000F6408 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800F94CC 000F640C 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 800F94D0 000F6410 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 800F94D4 000F6414 7F 63 DB 78 */ mr r3, r27 @@ -104777,8 +104777,8 @@ daAlink_c_NS_procCrawlAutoMoveInit: /* 800F9A10 000F6950 7C 7B 1B 78 */ mr r27, r3 /* 800F9A14 000F6954 7C 9C 23 78 */ mr r28, r4 /* 800F9A18 000F6958 7C BD 2B 78 */ mr r29, r5 -/* 800F9A1C 000F695C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800F9A20 000F6960 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 800F9A1C 000F695C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800F9A20 000F6960 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 800F9A24 000F6964 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 800F9A28 000F6968 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 800F9A2C 000F696C 38 80 00 37 */ li r4, 0x37 @@ -104881,8 +104881,8 @@ lbl_800F9B74: /* 800F9B9C 000F6ADC 2C 00 FF FF */ cmpwi r0, -1 /* 800F9BA0 000F6AE0 40 82 01 B8 */ bne lbl_800F9D58 /* 800F9BA4 000F6AE4 38 00 00 00 */ li r0, 0 -/* 800F9BA8 000F6AE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800F9BAC 000F6AEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800F9BA8 000F6AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800F9BAC 000F6AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F9BB0 000F6AF0 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800F9BB4 000F6AF4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 800F9BB8 000F6AF8 A8 1F 04 DE */ lha r0, 0x4de(r31) @@ -105317,8 +105317,8 @@ lbl_800FA19C: /* 800FA1C8 000F7108 D0 01 00 40 */ stfs f0, 0x40(r1) /* 800FA1CC 000F710C 3B 00 00 00 */ li r24, 0 /* 800FA1D0 000F7110 3B 80 00 00 */ li r28, 0 -/* 800FA1D4 000F7114 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FA1D8 000F7118 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FA1D4 000F7114 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FA1D8 000F7118 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA1DC 000F711C 3B 43 0F 38 */ addi r26, r3, 0xf38 /* 800FA1E0 000F7120 3B 3D 1B 78 */ addi r25, r29, 0x1b78 /* 800FA1E4 000F7124 3C 60 80 39 */ lis r3, lbl_803919F0@ha @@ -105423,8 +105423,8 @@ daAlink_c_NS_changeHangMoveProc: /* 800FA354 000F7294 80 03 19 9C */ lwz r0, 0x199c(r3) /* 800FA358 000F7298 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800FA35C 000F729C 41 82 00 24 */ beq lbl_800FA380 -/* 800FA360 000F72A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FA364 000F72A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FA360 000F72A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FA364 000F72A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA368 000F72A8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FA36C 000F72AC 7F E3 FB 78 */ mr r3, r31 /* 800FA370 000F72B0 38 9E 1A 60 */ addi r4, r30, 0x1a60 @@ -105630,8 +105630,8 @@ daAlink_c_NS_checkHangFootWall: /* 800FA654 000F7594 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800FA658 000F7598 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800FA65C 000F759C 90 01 00 30 */ stw r0, 0x30(r1) -/* 800FA660 000F75A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FA664 000F75A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FA660 000F75A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FA664 000F75A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA668 000F75A8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FA66C 000F75AC 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FA670 000F75B0 38 A1 00 20 */ addi r5, r1, 0x20 @@ -105700,8 +105700,8 @@ daAlink_c_NS_setHangGroundY: /* 800FA754 000F7694 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FA758 000F7698 38 81 00 08 */ addi r4, r1, 8 /* 800FA75C 000F769C 48 16 D5 CD */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800FA760 000F76A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FA764 000F76A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FA760 000F76A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FA764 000F76A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA768 000F76A8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FA76C 000F76AC 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800FA770 000F76B0 4B F7 9D 31 */ bl cBgS_NS_GroundCross @@ -105839,8 +105839,8 @@ lbl_800FA8BC: /* 800FA950 000F7890 EC 05 00 28 */ fsubs f0, f5, f0 /* 800FA954 000F7894 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FA958 000F7898 3B 80 00 00 */ li r28, 0 -/* 800FA95C 000F789C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FA960 000F78A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FA95C 000F789C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FA960 000F78A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA964 000F78A4 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FA968 000F78A8 C3 A2 93 3C */ lfs f29, lbl_80452D3C-_SDA2_BASE_(r2) lbl_800FA96C: @@ -106037,8 +106037,8 @@ lbl_800FABD4: /* 800FAC24 000F7B64 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FAC28 000F7B68 38 81 00 24 */ addi r4, r1, 0x24 /* 800FAC2C 000F7B6C 48 16 D0 FD */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800FAC30 000F7B70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FAC34 000F7B74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FAC30 000F7B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FAC34 000F7B74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FAC38 000F7B78 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FAC3C 000F7B7C 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800FAC40 000F7B80 4B F7 98 61 */ bl cBgS_NS_GroundCross @@ -106149,8 +106149,8 @@ lbl_800FADB0: /* 800FADD0 000F7D10 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FADD4 000F7D14 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800FADD8 000F7D18 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800FADDC 000F7D1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FADE0 000F7D20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FADDC 000F7D1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FADE0 000F7D20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FADE4 000F7D24 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FADE8 000F7D28 60 00 01 00 */ ori r0, r0, 0x100 /* 800FADEC 000F7D2C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -106256,8 +106256,8 @@ daAlink_c_NS_procHangFallStartInit: /* 800FAF5C 000F7E9C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FAF60 000F7EA0 38 81 00 08 */ addi r4, r1, 8 /* 800FAF64 000F7EA4 48 16 CD C5 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800FAF68 000F7EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FAF6C 000F7EAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FAF68 000F7EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FAF6C 000F7EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FAF70 000F7EB0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FAF74 000F7EB4 7F C3 F3 78 */ mr r3, r30 /* 800FAF78 000F7EB8 38 9F 1D 08 */ addi r4, r31, 0x1d08 @@ -106378,8 +106378,8 @@ lbl_800FB0F0: /* 800FB12C 000F806C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FB130 000F8070 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800FB134 000F8074 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800FB138 000F8078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FB13C 000F807C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FB138 000F8078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FB13C 000F807C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB140 000F8080 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FB144 000F8084 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB148 000F8088 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -106446,8 +106446,8 @@ lbl_800FB20C: /* 800FB228 000F8168 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800FB22C 000F816C D0 01 00 0C */ stfs f0, 0xc(r1) /* 800FB230 000F8170 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800FB234 000F8174 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FB238 000F8178 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FB234 000F8174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FB238 000F8178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB23C 000F817C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800FB240 000F8180 38 80 00 01 */ li r4, 1 /* 800FB244 000F8184 38 A0 00 01 */ li r5, 1 @@ -106494,8 +106494,8 @@ daAlink_c_NS_procHangUpInit: /* 800FB2D0 000F8210 38 A5 E1 B8 */ addi r5, r5, lbl_8038E1B8@l /* 800FB2D4 000F8214 38 A5 00 14 */ addi r5, r5, 0x14 /* 800FB2D8 000F8218 4B FB 1E 1D */ bl daAlink_c_NS_setSingleAnimeParam -/* 800FB2DC 000F821C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FB2E0 000F8220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FB2DC 000F821C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FB2E0 000F8220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB2E4 000F8224 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FB2E8 000F8228 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB2EC 000F822C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -106647,8 +106647,8 @@ lbl_800FB4F4: /* 800FB504 000F8444 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FB508 000F8448 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800FB50C 000F844C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800FB510 000F8450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FB514 000F8454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FB510 000F8450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FB514 000F8454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB518 000F8458 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FB51C 000F845C 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB520 000F8460 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -106802,8 +106802,8 @@ lbl_800FB734: /* 800FB738 000F8678 38 03 C0 00 */ addi r0, r3, -16384 /* 800FB73C 000F867C B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800FB740: -/* 800FB740 000F8680 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FB744 000F8684 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FB740 000F8680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FB744 000F8684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB748 000F8688 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FB74C 000F868C 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB750 000F8690 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -107003,8 +107003,8 @@ lbl_800FB98C: /* 800FBA38 000F8978 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800FBA3C 000F897C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800FBA40 000F8980 90 01 00 3C */ stw r0, 0x3c(r1) -/* 800FBA44 000F8984 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FBA48 000F8988 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FBA44 000F8984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FBA48 000F8988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FBA4C 000F898C 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800FBA50 000F8990 7F A3 EB 78 */ mr r3, r29 /* 800FBA54 000F8994 38 9E 1B 5C */ addi r4, r30, 0x1b5c @@ -107151,8 +107151,8 @@ lbl_800FBC0C: /* 800FBC58 000F8B98 C0 1E 1F E0 */ lfs f0, 0x1fe0(r30) /* 800FBC5C 000F8B9C D0 1E 33 DC */ stfs f0, 0x33dc(r30) lbl_800FBC60: -/* 800FBC60 000F8BA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FBC64 000F8BA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FBC60 000F8BA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FBC64 000F8BA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FBC68 000F8BA8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FBC6C 000F8BAC 60 00 02 00 */ ori r0, r0, 0x200 /* 800FBC70 000F8BB0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -107388,8 +107388,8 @@ lbl_800FBF5C: /* 800FBFAC 000F8EEC 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FBFB0 000F8EF0 38 81 00 24 */ addi r4, r1, 0x24 /* 800FBFB4 000F8EF4 48 16 BD 75 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800FBFB8 000F8EF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FBFBC 000F8EFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FBFB8 000F8EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FBFBC 000F8EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FBFC0 000F8F00 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FBFC4 000F8F04 7F C3 F3 78 */ mr r3, r30 /* 800FBFC8 000F8F08 38 9F 1D 08 */ addi r4, r31, 0x1d08 @@ -107441,8 +107441,8 @@ lbl_800FC01C: /* 800FC078 000F8FB8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FC07C 000F8FBC D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800FC080 000F8FC0 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800FC084 000F8FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FC088 000F8FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FC084 000F8FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FC088 000F8FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FC08C 000F8FCC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FC090 000F8FD0 60 00 01 00 */ ori r0, r0, 0x100 /* 800FC094 000F8FD4 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -108133,8 +108133,8 @@ lbl_800FCA44: /* 800FCA44 000F9984 A8 1D 30 0C */ lha r0, 0x300c(r29) /* 800FCA48 000F9988 2C 00 00 00 */ cmpwi r0, 0 /* 800FCA4C 000F998C 41 82 01 C4 */ beq lbl_800FCC10 -/* 800FCA50 000F9990 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FCA54 000F9994 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 800FCA50 000F9990 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FCA54 000F9994 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 800FCA58 000F9998 88 1C 5E 24 */ lbz r0, 0x5e24(r28) /* 800FCA5C 000F999C 28 00 00 30 */ cmplwi r0, 0x30 /* 800FCA60 000F99A0 40 82 00 10 */ bne lbl_800FCA70 @@ -108392,8 +108392,8 @@ lbl_800FCDB0: /* 800FCDE8 000F9D28 A0 1F 05 8E */ lhz r0, 0x58e(r31) /* 800FCDEC 000F9D2C 60 00 00 02 */ ori r0, r0, 2 /* 800FCDF0 000F9D30 B0 1F 05 8E */ sth r0, 0x58e(r31) -/* 800FCDF4 000F9D34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FCDF8 000F9D38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FCDF4 000F9D34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FCDF8 000F9D38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FCDFC 000F9D3C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800FCE00 000F9D40 A8 1D 30 0A */ lha r0, 0x300a(r29) /* 800FCE04 000F9D44 54 04 04 3E */ clrlwi r4, r0, 0x10 @@ -108570,8 +108570,8 @@ daAlink_c_NS_setLadderPosInit: /* 800FD050 000F9F90 90 01 00 44 */ stw r0, 0x44(r1) /* 800FD054 000F9F94 93 E1 00 3C */ stw r31, 0x3c(r1) /* 800FD058 000F9F98 7C 7F 1B 78 */ mr r31, r3 -/* 800FD05C 000F9F9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FD060 000F9FA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FD05C 000F9F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FD060 000F9FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD064 000F9FA4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FD068 000F9FA8 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FD06C 000F9FAC 38 A1 00 20 */ addi r5, r1, 0x20 @@ -108844,8 +108844,8 @@ lbl_800FD434: /* 800FD43C 000FA37C 48 00 07 DD */ bl daAlink_c_NS_procLadderDownEndInit /* 800FD440 000FA380 48 00 00 4C */ b lbl_800FD48C lbl_800FD444: -/* 800FD444 000FA384 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FD448 000FA388 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FD444 000FA384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FD448 000FA388 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD44C 000FA38C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FD450 000FA390 38 9C 1B 5C */ addi r4, r28, 0x1b5c /* 800FD454 000FA394 4B F7 79 AD */ bl dBgS_NS_GetWallCode @@ -108881,8 +108881,8 @@ daAlink_c_NS_setMoveBGLadderCorrect: /* 800FD4B4 000FA3F4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800FD4B8 000FA3F8 93 C1 00 18 */ stw r30, 0x18(r1) /* 800FD4BC 000FA3FC 7C 7E 1B 78 */ mr r30, r3 -/* 800FD4C0 000FA400 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FD4C4 000FA404 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FD4C0 000FA400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FD4C4 000FA404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD4C8 000FA408 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FD4CC 000FA40C 7F E3 FB 78 */ mr r3, r31 /* 800FD4D0 000FA410 38 9E 1E 1C */ addi r4, r30, 0x1e1c @@ -109031,8 +109031,8 @@ lbl_800FD678: /* 800FD6D8 000FA618 D0 1F 35 8C */ stfs f0, 0x358c(r31) /* 800FD6DC 000FA61C C0 03 00 08 */ lfs f0, 8(r3) /* 800FD6E0 000FA620 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800FD6E4 000FA624 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FD6E8 000FA628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FD6E4 000FA624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FD6E8 000FA628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD6EC 000FA62C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FD6F0 000FA630 64 00 02 00 */ oris r0, r0, 0x200 /* 800FD6F4 000FA634 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -109156,8 +109156,8 @@ lbl_800FD85C: /* 800FD8AC 000FA7EC 38 00 00 01 */ li r0, 1 /* 800FD8B0 000FA7F0 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800FD8B4 000FA7F4 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 800FD8B8 000FA7F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FD8BC 000FA7FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FD8B8 000FA7F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FD8BC 000FA7FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD8C0 000FA800 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FD8C4 000FA804 64 00 02 00 */ oris r0, r0, 0x200 /* 800FD8C8 000FA808 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -109284,8 +109284,8 @@ lbl_800FDA08: /* 800FDA80 000FA9C0 D0 1F 35 8C */ stfs f0, 0x358c(r31) /* 800FDA84 000FA9C4 C0 03 00 08 */ lfs f0, 8(r3) /* 800FDA88 000FA9C8 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800FDA8C 000FA9CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FDA90 000FA9D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FDA8C 000FA9CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FDA90 000FA9D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FDA94 000FA9D4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FDA98 000FA9D8 64 00 02 00 */ oris r0, r0, 0x200 /* 800FDA9C 000FA9DC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -109425,8 +109425,8 @@ lbl_800FDC50: /* 800FDC90 000FABD0 38 00 00 00 */ li r0, 0 /* 800FDC94 000FABD4 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800FDC98 000FABD8 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 800FDC9C 000FABDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FDCA0 000FABE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FDC9C 000FABDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FDCA0 000FABE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FDCA4 000FABE4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FDCA8 000FABE8 64 00 02 00 */ oris r0, r0, 0x200 /* 800FDCAC 000FABEC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -109604,8 +109604,8 @@ lbl_800FDEE0: /* 800FDF0C 000FAE4C 38 00 00 01 */ li r0, 1 /* 800FDF10 000FAE50 B0 1B 30 0C */ sth r0, 0x300c(r27) /* 800FDF14 000FAE54 B0 1B 30 10 */ sth r0, 0x3010(r27) -/* 800FDF18 000FAE58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FDF1C 000FAE5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FDF18 000FAE58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FDF1C 000FAE5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FDF20 000FAE60 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FDF24 000FAE64 64 00 02 00 */ oris r0, r0, 0x200 /* 800FDF28 000FAE68 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -109704,8 +109704,8 @@ daAlink_c_NS_checkClimbCode: /* 800FE064 000FAFA4 39 61 00 20 */ addi r11, r1, 0x20 /* 800FE068 000FAFA8 48 26 41 69 */ bl _savegpr_26 /* 800FE06C 000FAFAC 7C 9A 23 78 */ mr r26, r4 -/* 800FE070 000FAFB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FE074 000FAFB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FE070 000FAFB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FE074 000FAFB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FE078 000FAFB8 3B 63 0F 38 */ addi r27, r3, 0xf38 /* 800FE07C 000FAFBC 7F 63 DB 78 */ mr r3, r27 /* 800FE080 000FAFC0 4B F7 65 A9 */ bl cBgS_NS_GetBgWBasePointer @@ -110017,8 +110017,8 @@ lbl_800FE484: /* 800FE4D4 000FB414 D0 1C 1D 98 */ stfs f0, 0x1d98(r28) /* 800FE4D8 000FB418 D0 7C 1D 9C */ stfs f3, 0x1d9c(r28) /* 800FE4DC 000FB41C D0 9C 1D A0 */ stfs f4, 0x1da0(r28) -/* 800FE4E0 000FB420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FE4E4 000FB424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FE4E0 000FB420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FE4E4 000FB424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FE4E8 000FB428 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FE4EC 000FB42C 7F E3 FB 78 */ mr r3, r31 /* 800FE4F0 000FB430 38 9C 1D 5C */ addi r4, r28, 0x1d5c @@ -110275,8 +110275,8 @@ daAlink_c_NS_setMoveBGClimbCorrect: /* 800FE874 000FB7B4 93 E1 00 4C */ stw r31, 0x4c(r1) /* 800FE878 000FB7B8 93 C1 00 48 */ stw r30, 0x48(r1) /* 800FE87C 000FB7BC 7C 7F 1B 78 */ mr r31, r3 -/* 800FE880 000FB7C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FE884 000FB7C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FE880 000FB7C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FE884 000FB7C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FE888 000FB7C8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FE88C 000FB7CC 7F C3 F3 78 */ mr r3, r30 /* 800FE890 000FB7D0 38 9F 1E 1C */ addi r4, r31, 0x1e1c @@ -110498,8 +110498,8 @@ daAlink_c_NS_checkBgCorrectClimbMove: /* 800FEBB8 000FBAF8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800FEBBC 000FBAFC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800FEBC0 000FBB00 90 01 00 24 */ stw r0, 0x24(r1) -/* 800FEBC4 000FBB04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FEBC8 000FBB08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FEBC4 000FBB04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FEBC8 000FBB08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FEBCC 000FBB0C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FEBD0 000FBB10 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800FEBD4 000FBB14 38 A1 00 14 */ addi r5, r1, 0x14 @@ -110578,8 +110578,8 @@ daAlink_c_NS_checkClimbRoof: /* 800FECDC 000FBC1C D0 3E 1D 98 */ stfs f1, 0x1d98(r30) /* 800FECE0 000FBC20 D0 1E 1D 9C */ stfs f0, 0x1d9c(r30) /* 800FECE4 000FBC24 D0 7E 1D A0 */ stfs f3, 0x1da0(r30) -/* 800FECE8 000FBC28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FECEC 000FBC2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FECE8 000FBC28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FECEC 000FBC2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FECF0 000FBC30 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FECF4 000FBC34 7F E3 FB 78 */ mr r3, r31 /* 800FECF8 000FBC38 38 9E 1D 5C */ addi r4, r30, 0x1d5c @@ -110647,8 +110647,8 @@ daAlink_c_NS_checkClimbGround: /* 800FEDDC 000FBD1C D0 04 00 04 */ stfs f0, 4(r4) /* 800FEDE0 000FBD20 D0 64 00 08 */ stfs f3, 8(r4) /* 800FEDE4 000FBD24 3B C0 00 00 */ li r30, 0 -/* 800FEDE8 000FBD28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FEDEC 000FBD2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FEDE8 000FBD28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FEDEC 000FBD2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FEDF0 000FBD30 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FEDF4 000FBD34 C0 02 93 2C */ lfs f0, lbl_80452D2C-_SDA2_BASE_(r2) /* 800FEDF8 000FBD38 EF 80 01 32 */ fmuls f28, f0, f4 @@ -110847,8 +110847,8 @@ lbl_800FF0A0: /* 800FF0D0 000FC010 D0 1E 1D 9C */ stfs f0, 0x1d9c(r30) /* 800FF0D4 000FC014 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 800FF0D8 000FC018 D0 1E 1D A0 */ stfs f0, 0x1da0(r30) -/* 800FF0DC 000FC01C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FF0E0 000FC020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FF0DC 000FC01C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FF0E0 000FC020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF0E4 000FC024 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FF0E8 000FC028 7F E3 FB 78 */ mr r3, r31 /* 800FF0EC 000FC02C 38 9E 1D 5C */ addi r4, r30, 0x1d5c @@ -110983,8 +110983,8 @@ daAlink_c_NS_setClimbStartNotGround: /* 800FF2CC 000FC20C 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800FF2D0 000FC210 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800FF2D4 000FC214 48 16 8A 55 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 800FF2D8 000FC218 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FF2DC 000FC21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FF2D8 000FC218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FF2DC 000FC21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF2E0 000FC220 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FF2E4 000FC224 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 800FF2E8 000FC228 4B F7 51 B9 */ bl cBgS_NS_GroundCross @@ -111162,8 +111162,8 @@ lbl_800FF51C: lbl_800FF560: /* 800FF560 000FC4A0 38 00 00 01 */ li r0, 1 /* 800FF564 000FC4A4 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 800FF568 000FC4A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FF56C 000FC4AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FF568 000FC4A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FF56C 000FC4AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF570 000FC4B0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FF574 000FC4B4 60 00 00 08 */ ori r0, r0, 8 /* 800FF578 000FC4B8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -111405,8 +111405,8 @@ lbl_800FF8BC: /* 800FF900 000FC840 7D 89 03 A6 */ mtctr r12 /* 800FF904 000FC844 4E 80 04 21 */ bctrl lbl_800FF908: -/* 800FF908 000FC848 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FF90C 000FC84C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FF908 000FC848 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FF90C 000FC84C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF910 000FC850 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FF914 000FC854 60 00 00 08 */ ori r0, r0, 8 /* 800FF918 000FC858 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -111625,8 +111625,8 @@ lbl_800FFBD4: /* 800FFC1C 000FCB5C 81 8C 01 14 */ lwz r12, 0x114(r12) /* 800FFC20 000FCB60 7D 89 03 A6 */ mtctr r12 /* 800FFC24 000FCB64 4E 80 04 21 */ bctrl -/* 800FFC28 000FCB68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FFC2C 000FCB6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FFC28 000FCB68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FFC2C 000FCB6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FFC30 000FCB70 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FFC34 000FCB74 60 00 00 08 */ ori r0, r0, 8 /* 800FFC38 000FCB78 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -111821,8 +111821,8 @@ lbl_800FFE90: /* 800FFEEC 000FCE2C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) /* 800FFEF0 000FCE30 EC 01 00 2A */ fadds f0, f1, f0 /* 800FFEF4 000FCE34 D0 1E 34 7C */ stfs f0, 0x347c(r30) -/* 800FFEF8 000FCE38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800FFEFC 000FCE3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800FFEF8 000FCE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800FFEFC 000FCE3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FFF00 000FCE40 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FFF04 000FCE44 60 00 00 08 */ ori r0, r0, 8 /* 800FFF08 000FCE48 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -112045,8 +112045,8 @@ lbl_80100218: /* 80100220 000FD160 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80100224 000FD164 D0 1D 33 F0 */ stfs f0, 0x33f0(r29) lbl_80100228: -/* 80100228 000FD168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010022C 000FD16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80100228 000FD168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010022C 000FD16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100230 000FD170 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80100234 000FD174 60 00 00 08 */ ori r0, r0, 8 /* 80100238 000FD178 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -112187,8 +112187,8 @@ daAlink_c_NS_procClimbToRoofInit: /* 8010042C 000FD36C D0 1F 05 2C */ stfs f0, 0x52c(r31) /* 80100430 000FD370 38 00 00 0A */ li r0, 0xa /* 80100434 000FD374 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80100438 000FD378 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010043C 000FD37C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80100438 000FD378 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010043C 000FD37C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100440 000FD380 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80100444 000FD384 60 00 00 08 */ ori r0, r0, 8 /* 80100448 000FD388 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -112257,8 +112257,8 @@ lbl_8010048C: /* 80100540 000FD480 D0 1F 1D 9C */ stfs f0, 0x1d9c(r31) /* 80100544 000FD484 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80100548 000FD488 D0 1F 1D A0 */ stfs f0, 0x1da0(r31) -/* 8010054C 000FD48C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80100550 000FD490 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010054C 000FD48C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80100550 000FD490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100554 000FD494 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80100558 000FD498 38 9F 1D 5C */ addi r4, r31, 0x1d5c /* 8010055C 000FD49C 4B F7 4F 41 */ bl dBgS_NS_RoofChk @@ -112386,8 +112386,8 @@ lbl_80100694: /* 80100700 000FD640 D0 1E 1D 98 */ stfs f0, 0x1d98(r30) /* 80100704 000FD644 D0 7E 1D 9C */ stfs f3, 0x1d9c(r30) /* 80100708 000FD648 D0 9E 1D A0 */ stfs f4, 0x1da0(r30) -/* 8010070C 000FD64C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80100710 000FD650 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010070C 000FD64C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80100710 000FD650 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100714 000FD654 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80100718 000FD658 7F E3 FB 78 */ mr r3, r31 /* 8010071C 000FD65C 38 9E 1D 5C */ addi r4, r30, 0x1d5c @@ -112424,8 +112424,8 @@ daAlink_c_NS_commonRoofHangProc: /* 80100784 000FD6C4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80100788 000FD6C8 93 C1 00 18 */ stw r30, 0x18(r1) /* 8010078C 000FD6CC 7C 7E 1B 78 */ mr r30, r3 -/* 80100790 000FD6D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80100794 000FD6D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80100790 000FD6D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80100794 000FD6D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100798 000FD6D8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8010079C 000FD6DC 7F E3 FB 78 */ mr r3, r31 /* 801007A0 000FD6E0 38 9E 1E 2C */ addi r4, r30, 0x1e2c @@ -112808,8 +112808,8 @@ lbl_80100CC0: /* 80100CF8 000FDC38 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100CFC 000FDC3C D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80100D00 000FDC40 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80100D04 000FDC44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80100D08 000FDC48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80100D04 000FDC44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80100D08 000FDC48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100D0C 000FDC4C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80100D10 000FDC50 64 00 00 10 */ oris r0, r0, 0x10 /* 80100D14 000FDC54 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -112927,8 +112927,8 @@ lbl_80100E90: /* 80100EA4 000FDDE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100EA8 000FDDE8 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80100EAC 000FDDEC D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80100EB0 000FDDF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80100EB4 000FDDF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80100EB0 000FDDF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80100EB4 000FDDF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100EB8 000FDDF8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80100EBC 000FDDFC 64 00 00 10 */ oris r0, r0, 0x10 /* 80100EC0 000FDE00 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -113101,8 +113101,8 @@ lbl_80101074: /* 80101134 000FE074 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80101138 000FE078 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8010113C 000FE07C 90 01 00 30 */ stw r0, 0x30(r1) -/* 80101140 000FE080 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101144 000FE084 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80101140 000FE080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101144 000FE084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80101148 000FE088 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010114C 000FE08C 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 80101150 000FE090 38 A1 00 20 */ addi r5, r1, 0x20 @@ -113212,8 +113212,8 @@ lbl_8010126C: /* 801012CC 000FE20C D0 1E 35 8C */ stfs f0, 0x358c(r30) /* 801012D0 000FE210 C0 03 00 08 */ lfs f0, 8(r3) /* 801012D4 000FE214 D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 801012D8 000FE218 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801012DC 000FE21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801012D8 000FE218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801012DC 000FE21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801012E0 000FE220 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 801012E4 000FE224 64 00 00 10 */ oris r0, r0, 0x10 /* 801012E8 000FE228 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -113361,8 +113361,8 @@ lbl_801014D8: /* 801014F4 000FE434 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801014F8 000FE438 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801014FC 000FE43C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80101500 000FE440 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101504 000FE444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80101500 000FE440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101504 000FE444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80101508 000FE448 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010150C 000FE44C 64 00 00 10 */ oris r0, r0, 0x10 /* 80101510 000FE450 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -113844,8 +113844,8 @@ lbl_80101B8C: lbl_80101B94: /* 80101B94 000FEAD4 3B C0 00 01 */ li r30, 1 lbl_80101B98: -/* 80101B98 000FEAD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101B9C 000FEADC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80101B98 000FEAD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101B9C 000FEADC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80101BA0 000FEAE0 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) /* 80101BA4 000FEAE4 28 00 00 00 */ cmplwi r0, 0 /* 80101BA8 000FEAE8 41 82 00 8C */ beq lbl_80101C34 @@ -113859,8 +113859,8 @@ lbl_80101B98: lbl_80101BC8: /* 80101BC8 000FEB08 2C 1E 00 00 */ cmpwi r30, 0 /* 80101BCC 000FEB0C 41 82 00 40 */ beq lbl_80101C0C -/* 80101BD0 000FEB10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101BD4 000FEB14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80101BD0 000FEB10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101BD4 000FEB14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80101BD8 000FEB18 80 83 5D E8 */ lwz r4, 0x5de8(r3) /* 80101BDC 000FEB1C 80 03 5D EC */ lwz r0, 0x5dec(r3) /* 80101BE0 000FEB20 7C 00 22 14 */ add r0, r0, r4 @@ -113880,8 +113880,8 @@ lbl_80101C0C: /* 80101C10 000FEB50 48 01 40 11 */ bl daAlink_c_NS_checkEventRun /* 80101C14 000FEB54 2C 03 00 00 */ cmpwi r3, 0 /* 80101C18 000FEB58 40 82 00 64 */ bne lbl_80101C7C -/* 80101C1C 000FEB5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101C20 000FEB60 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80101C1C 000FEB5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101C20 000FEB60 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80101C24 000FEB64 80 64 5D EC */ lwz r3, 0x5dec(r4) /* 80101C28 000FEB68 38 03 FF FF */ addi r0, r3, -1 /* 80101C2C 000FEB6C 90 04 5D EC */ stw r0, 0x5dec(r4) @@ -113902,8 +113902,8 @@ lbl_80101C34: lbl_80101C64: /* 80101C64 000FEBA4 38 00 00 01 */ li r0, 1 /* 80101C68 000FEBA8 98 1F 5E B7 */ stb r0, 0x5eb7(r31) -/* 80101C6C 000FEBAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101C70 000FEBB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80101C6C 000FEBAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101C70 000FEBB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80101C74 000FEBB4 80 03 5D E8 */ lwz r0, 0x5de8(r3) /* 80101C78 000FEBB8 90 03 5D E0 */ stw r0, 0x5de0(r3) lbl_80101C7C: @@ -113917,8 +113917,8 @@ lbl_80101C7C: .global daAlink_c_NS_offOxygenTimer daAlink_c_NS_offOxygenTimer: /* 80101C94 000FEBD4 38 00 00 00 */ li r0, 0 -/* 80101C98 000FEBD8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80101C9C 000FEBDC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80101C98 000FEBD8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80101C9C 000FEBDC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80101CA0 000FEBE0 98 04 5E B7 */ stb r0, 0x5eb7(r4) /* 80101CA4 000FEBE4 80 04 5D E8 */ lwz r0, 0x5de8(r4) /* 80101CA8 000FEBE8 90 04 5D E0 */ stw r0, 0x5de0(r4) @@ -113932,8 +113932,8 @@ daAlink_c_NS_checkPossibleWaterInMode: /* 80101CBC 000FEBFC 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 80101CC0 000FEC00 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 80101CC4 000FEC04 40 82 00 24 */ bne lbl_80101CE8 -/* 80101CC8 000FEC08 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80101CCC 000FEC0C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80101CC8 000FEC08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80101CCC 000FEC0C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80101CD0 000FEC10 80 04 5F 1C */ lwz r0, 0x5f1c(r4) /* 80101CD4 000FEC14 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80101CD8 000FEC18 40 82 00 10 */ bne lbl_80101CE8 @@ -114060,8 +114060,8 @@ lbl_80101E14: /* 80101E88 000FEDC8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80101E8C 000FEDCC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80101E90 000FEDD0 90 01 00 84 */ stw r0, 0x84(r1) -/* 80101E94 000FEDD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80101E98 000FEDD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80101E94 000FEDD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80101E98 000FEDD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80101E9C 000FEDDC 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80101EA0 000FEDE0 7F C3 F3 78 */ mr r3, r30 /* 80101EA4 000FEDE4 38 9C 1B 5C */ addi r4, r28, 0x1b5c @@ -114453,8 +114453,8 @@ daAlink_c_NS_setSpeedAndAngleSwim: /* 80102410 000FF350 4E 80 04 21 */ bctrl /* 80102414 000FF354 2C 03 00 00 */ cmpwi r3, 0 /* 80102418 000FF358 40 82 01 0C */ bne lbl_80102524 -/* 8010241C 000FF35C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80102420 000FF360 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010241C 000FF35C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80102420 000FF360 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80102424 000FF364 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 80102428 000FF368 28 00 00 00 */ cmplwi r0, 0 /* 8010242C 000FF36C 40 82 00 F8 */ bne lbl_80102524 @@ -114787,8 +114787,8 @@ lbl_801028D4: /* 801028D4 000FF814 7F E3 FB 78 */ mr r3, r31 /* 801028D8 000FF818 FC 20 F8 90 */ fmr f1, f31 /* 801028DC 000FF81C 4B FB 10 49 */ bl daAlink_c_NS_setNormalSpeedF -/* 801028E0 000FF820 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801028E4 000FF824 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801028E0 000FF820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801028E4 000FF824 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801028E8 000FF828 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 801028EC 000FF82C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 801028F0 000FF830 41 82 00 0C */ beq lbl_801028FC @@ -115037,8 +115037,8 @@ lbl_80102C34: /* 80102C44 000FFB84 4B FF EE 65 */ bl daAlink_c_NS_getSwimMaxFallSpeed /* 80102C48 000FFB88 FF C0 08 90 */ fmr f30, f1 lbl_80102C4C: -/* 80102C4C 000FFB8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80102C50 000FFB90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80102C4C 000FFB8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80102C50 000FFB90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80102C54 000FFB94 80 63 5F 1C */ lwz r3, 0x5f1c(r3) /* 80102C58 000FFB98 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf /* 80102C5C 000FFB9C 41 82 00 0C */ beq lbl_80102C68 @@ -115136,8 +115136,8 @@ lbl_80102D84: /* 80102DA8 000FFCE8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80102DAC 000FFCEC D0 01 00 0C */ stfs f0, 0xc(r1) /* 80102DB0 000FFCF0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80102DB4 000FFCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80102DB8 000FFCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80102DB4 000FFCF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80102DB8 000FFCF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80102DBC 000FFCFC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80102DC0 000FFD00 38 80 00 02 */ li r4, 2 /* 80102DC4 000FFD04 38 A0 00 01 */ li r5, 1 @@ -116376,8 +116376,8 @@ lbl_80103EC0: .global daAlink_c_NS_checkSwimButtonAccept daAlink_c_NS_checkSwimButtonAccept: /* 80103EE0 00100E20 38 60 00 00 */ li r3, 0 -/* 80103EE4 00100E24 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80103EE8 00100E28 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80103EE4 00100E24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80103EE8 00100E28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80103EEC 00100E2C 88 04 5E 24 */ lbz r0, 0x5e24(r4) /* 80103EF0 00100E30 28 00 00 41 */ cmplwi r0, 0x41 /* 80103EF4 00100E34 41 82 00 0C */ beq lbl_80103F00 @@ -116389,8 +116389,8 @@ lbl_80103F00: .global daAlink_c_NS_checkUpSwimButtonAccept daAlink_c_NS_checkUpSwimButtonAccept: -/* 80103F08 00100E48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80103F0C 00100E4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80103F08 00100E48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80103F0C 00100E4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80103F10 00100E50 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 80103F14 00100E54 20 00 00 97 */ subfic r0, r0, 0x97 /* 80103F18 00100E58 7C 00 00 34 */ cntlzw r0, r0 @@ -116570,8 +116570,8 @@ lbl_80104138: /* 80104170 001010B0 3C A0 80 39 */ lis r5, lbl_8038ED2C@ha /* 80104174 001010B4 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 80104178 001010B8 4B FA 8F 7D */ bl daAlink_c_NS_setSingleAnimeParam -/* 8010417C 001010BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104180 001010C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010417C 001010BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104180 001010C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104184 001010C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104188 001010C8 64 00 00 10 */ oris r0, r0, 0x10 /* 8010418C 001010CC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -116766,8 +116766,8 @@ lbl_80104414: /* 80104448 00101388 38 00 00 00 */ li r0, 0 /* 8010444C 0010138C B0 1F 30 80 */ sth r0, 0x3080(r31) lbl_80104450: -/* 80104450 00101390 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104454 00101394 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104450 00101390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104454 00101394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104458 00101398 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010445C 0010139C 64 00 00 10 */ oris r0, r0, 0x10 /* 80104460 001013A0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -116993,8 +116993,8 @@ lbl_8010474C: lbl_80104778: /* 80104778 001016B8 7F E3 FB 78 */ mr r3, r31 /* 8010477C 001016BC 4B FF D1 B9 */ bl daAlink_c_NS_swimDeleteItem -/* 80104780 001016C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104784 001016C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104780 001016C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104784 001016C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104788 001016C8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010478C 001016CC 64 00 00 10 */ oris r0, r0, 0x10 /* 80104790 001016D0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -117068,8 +117068,8 @@ lbl_80104860: /* 80104890 001017D0 48 00 00 C9 */ bl daAlink_c_NS_procSwimDiveInit /* 80104894 001017D4 48 00 00 AC */ b lbl_80104940 lbl_80104898: -/* 80104898 001017D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010489C 001017DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104898 001017D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010489C 001017DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801048A0 001017E0 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 801048A4 001017E4 28 00 00 09 */ cmplwi r0, 9 /* 801048A8 001017E8 40 82 00 48 */ bne lbl_801048F0 @@ -117181,8 +117181,8 @@ lbl_801049FC: /* 80104A2C 0010196C D0 1F 34 80 */ stfs f0, 0x3480(r31) /* 80104A30 00101970 38 00 00 00 */ li r0, 0 /* 80104A34 00101974 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80104A38 00101978 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104A3C 0010197C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104A38 00101978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104A3C 0010197C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104A40 00101980 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104A44 00101984 64 00 00 10 */ oris r0, r0, 0x10 /* 80104A48 00101988 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -117393,8 +117393,8 @@ lbl_80104D10: /* 80104D40 00101C80 B0 1F 30 D0 */ sth r0, 0x30d0(r31) /* 80104D44 00101C84 7F E3 FB 78 */ mr r3, r31 /* 80104D48 00101C88 48 00 43 29 */ bl daAlink_c_NS_setHookshotReadyMaterial -/* 80104D4C 00101C8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104D50 00101C90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104D4C 00101C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104D50 00101C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104D54 00101C94 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104D58 00101C98 64 00 00 10 */ oris r0, r0, 0x10 /* 80104D5C 00101C9C 60 00 40 00 */ ori r0, r0, 0x4000 @@ -117475,15 +117475,15 @@ lbl_80104E3C: /* 80104E6C 00101DAC 7F E3 FB 78 */ mr r3, r31 /* 80104E70 00101DB0 48 00 3F 45 */ bl daAlink_c_NS_setHookshotSight lbl_80104E74: -/* 80104E74 00101DB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104E78 00101DB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104E74 00101DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104E78 00101DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104E7C 00101DBC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104E80 00101DC0 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 80104E84 00101DC4 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 80104E88 00101DC8 48 00 00 18 */ b lbl_80104EA0 lbl_80104E8C: -/* 80104E8C 00101DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104E90 00101DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104E8C 00101DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104E90 00101DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104E94 00101DD4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104E98 00101DD8 64 00 00 04 */ oris r0, r0, 4 /* 80104E9C 00101DDC 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -117558,8 +117558,8 @@ lbl_80104F78: /* 80104F88 00101EC8 38 00 00 00 */ li r0, 0 /* 80104F8C 00101ECC B0 1F 30 10 */ sth r0, 0x3010(r31) /* 80104F90 00101ED0 B0 1F 30 D0 */ sth r0, 0x30d0(r31) -/* 80104F94 00101ED4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80104F98 00101ED8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80104F94 00101ED4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80104F98 00101ED8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104F9C 00101EDC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80104FA0 00101EE0 64 00 00 10 */ oris r0, r0, 0x10 /* 80104FA4 00101EE4 60 00 40 00 */ ori r0, r0, 0x4000 @@ -117728,8 +117728,8 @@ daAlink_c_NS_procSwimDamageInit: /* 801051E0 00102120 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 801051E4 00102124 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801051E8 00102128 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 801051EC 0010212C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801051F0 00102130 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801051EC 0010212C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801051F0 00102130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801051F4 00102134 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 801051F8 00102138 38 80 00 02 */ li r4, 2 /* 801051FC 0010213C 38 A0 00 1F */ li r5, 0x1f @@ -118351,8 +118351,8 @@ daAlink_c_NS_checkSnowCodePolygon: /* 80105AC0 00102A00 7C 08 02 A6 */ mflr r0 /* 80105AC4 00102A04 90 01 00 14 */ stw r0, 0x14(r1) /* 80105AC8 00102A08 7C 64 1B 78 */ mr r4, r3 -/* 80105ACC 00102A0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80105AD0 00102A10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80105ACC 00102A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80105AD0 00102A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80105AD4 00102A14 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80105AD8 00102A18 4B F6 F1 E5 */ bl dBgS_NS_GetSpecialCode /* 80105ADC 00102A1C 38 80 00 01 */ li r4, 1 @@ -118506,8 +118506,8 @@ lbl_80105CEC: /* 80105CEC 00102C2C 80 1B 19 9C */ lwz r0, 0x199c(r27) /* 80105CF0 00102C30 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80105CF4 00102C34 41 82 01 80 */ beq lbl_80105E74 -/* 80105CF8 00102C38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80105CFC 00102C3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80105CF8 00102C38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80105CFC 00102C3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80105D00 00102C40 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80105D04 00102C44 7F A3 EB 78 */ mr r3, r29 /* 80105D08 00102C48 38 9B 1A 60 */ addi r4, r27, 0x1a60 @@ -118833,8 +118833,8 @@ lbl_8010616C: /* 801061A0 001030E0 80 1B 19 9C */ lwz r0, 0x199c(r27) /* 801061A4 001030E4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 801061A8 001030E8 41 82 02 FC */ beq lbl_801064A4 -/* 801061AC 001030EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801061B0 001030F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801061AC 001030EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801061B0 001030F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801061B4 001030F4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801061B8 001030F8 38 9B 1A 60 */ addi r4, r27, 0x1a60 /* 801061BC 001030FC 4B F6 E4 A5 */ bl cBgS_NS_ChkPolySafe @@ -119238,8 +119238,8 @@ daAlink_c_NS_setBoardLandAnime: /* 80106738 00103678 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010673C 0010367C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80106740 00103680 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80106744 00103684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80106748 00103688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80106744 00103684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80106748 00103688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010674C 0010368C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80106750 00103690 38 80 00 02 */ li r4, 2 /* 80106754 00103694 38 A0 00 0F */ li r5, 0xf @@ -121516,8 +121516,8 @@ daAlink_c_NS_checkHookshotStickBG: /* 801087BC 001056FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801087C0 00105700 93 C1 00 08 */ stw r30, 8(r1) /* 801087C4 00105704 7C 9E 23 78 */ mr r30, r4 -/* 801087C8 00105708 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801087CC 0010570C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801087C8 00105708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801087CC 0010570C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801087D0 00105710 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801087D4 00105714 7F E3 FB 78 */ mr r3, r31 /* 801087D8 00105718 4B F6 CA 21 */ bl dBgS_NS_ChkPolyHSStick @@ -121721,8 +121721,8 @@ daAlink_c_NS_setHookshotCatchNow: /* 80108A58 00105998 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80108A5C 0010599C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80108A60 001059A0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80108A64 001059A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80108A68 001059A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80108A64 001059A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80108A68 001059A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80108A6C 001059AC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80108A70 001059B0 38 80 00 04 */ li r4, 4 /* 80108A74 001059B4 38 A0 00 01 */ li r5, 1 @@ -121732,8 +121732,8 @@ daAlink_c_NS_setHookshotCatchNow: /* 80108A84 001059C4 7C 08 03 A6 */ mtlr r0 /* 80108A88 001059C8 38 21 00 20 */ addi r1, r1, 0x20 /* 80108A8C 001059CC 4E 80 00 20 */ blr -/* 80108A90 001059D0 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80108A94 001059D4 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80108A90 001059D0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80108A94 001059D4 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80108A98 001059D8 80 06 5F 1C */ lwz r0, 0x5f1c(r6) /* 80108A9C 001059DC 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 80108AA0 001059E0 41 82 00 48 */ beq lbl_80108AE8 @@ -122157,8 +122157,8 @@ daAlink_c_NS_setHookshotReadyMaterial: /* 80109070 00105FB0 80 03 05 78 */ lwz r0, 0x578(r3) /* 80109074 00105FB4 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc /* 80109078 00105FB8 40 82 00 18 */ bne lbl_80109090 -/* 8010907C 00105FBC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80109080 00105FC0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8010907C 00105FBC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80109080 00105FC0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80109084 00105FC4 88 04 00 13 */ lbz r0, 0x13(r4) /* 80109088 00105FC8 28 00 00 2E */ cmplwi r0, 0x2e /* 8010908C 00105FCC 40 82 00 10 */ bne lbl_8010909C @@ -122245,8 +122245,8 @@ daAlink_c_NS_initHookshotReady: /* 80109198 001060D8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010919C 001060DC D0 01 00 0C */ stfs f0, 0xc(r1) /* 801091A0 001060E0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 801091A4 001060E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801091A8 001060E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801091A4 001060E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801091A8 001060E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801091AC 001060EC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 801091B0 001060F0 38 80 00 01 */ li r4, 1 /* 801091B4 001060F4 38 A0 00 01 */ li r5, 1 @@ -122422,8 +122422,8 @@ lbl_80109400: /* 80109414 00106354 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80109418 00106358 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8010941C 0010635C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80109420 00106360 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80109424 00106364 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80109420 00106360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80109424 00106364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80109428 00106368 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010942C 0010636C 38 80 00 01 */ li r4, 1 /* 80109430 00106370 38 A0 00 01 */ li r5, 1 @@ -122461,8 +122461,8 @@ lbl_8010948C: /* 801094A4 001063E4 38 80 00 02 */ li r4, 2 /* 801094A8 001063E8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 801094AC 001063EC 4B FA 42 79 */ bl daAlink_c_NS_resetUpperAnime -/* 801094B0 001063F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801094B4 001063F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801094B0 001063F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801094B4 001063F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801094B8 001063F8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 801094BC 001063FC 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 /* 801094C0 00106400 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -122804,8 +122804,8 @@ lbl_801098C8: /* 80109958 00106898 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 8010995C 0010689C 48 00 01 2C */ b lbl_80109A88 lbl_80109960: -/* 80109960 001068A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80109964 001068A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80109960 001068A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80109964 001068A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80109968 001068A8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8010996C 001068AC 7F C3 F3 78 */ mr r3, r30 /* 80109970 001068B0 7F A4 EB 78 */ mr r4, r29 @@ -122925,8 +122925,8 @@ lbl_80109B10: /* 80109B14 00106A54 B0 1F 30 1A */ sth r0, 0x301a(r31) /* 80109B18 00106A58 48 00 00 AC */ b lbl_80109BC4 lbl_80109B1C: -/* 80109B1C 00106A5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80109B20 00106A60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80109B1C 00106A5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80109B20 00106A60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80109B24 00106A64 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80109B28 00106A68 7F A3 EB 78 */ mr r3, r29 /* 80109B2C 00106A6C 38 9F 1E 2C */ addi r4, r31, 0x1e2c @@ -123684,8 +123684,8 @@ lbl_8010A5DC: /* 8010A5F4 00107534 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010A5F8 00107538 D0 01 01 20 */ stfs f0, 0x120(r1) /* 8010A5FC 0010753C D0 21 01 24 */ stfs f1, 0x124(r1) -/* 8010A600 00107540 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010A604 00107544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010A600 00107540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010A604 00107544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010A608 00107548 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010A60C 0010754C 38 80 00 01 */ li r4, 1 /* 8010A610 00107550 38 A0 00 01 */ li r5, 1 @@ -123700,8 +123700,8 @@ lbl_8010A620: /* 8010A630 00107570 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010A634 00107574 D0 01 01 14 */ stfs f0, 0x114(r1) /* 8010A638 00107578 D0 21 01 18 */ stfs f1, 0x118(r1) -/* 8010A63C 0010757C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010A640 00107580 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010A63C 0010757C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010A640 00107580 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010A644 00107584 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010A648 00107588 38 80 00 01 */ li r4, 1 /* 8010A64C 0010758C 38 A0 00 01 */ li r5, 1 @@ -123939,8 +123939,8 @@ lbl_8010A944: /* 8010A9A4 001078E4 38 A1 01 64 */ addi r5, r1, 0x164 /* 8010A9A8 001078E8 7F E6 FB 78 */ mr r6, r31 /* 8010A9AC 001078EC 4B F6 D3 B9 */ bl dBgS_LinChk_NS_Set -/* 8010A9B0 001078F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010A9B4 001078F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010A9B0 001078F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010A9B4 001078F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010A9B8 001078F8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8010A9BC 001078FC 7F A3 EB 78 */ mr r3, r29 /* 8010A9C0 00107900 38 9F 1B B8 */ addi r4, r31, 0x1bb8 @@ -123958,8 +123958,8 @@ lbl_8010A944: /* 8010A9F0 00107930 B0 1F 30 1A */ sth r0, 0x301a(r31) /* 8010A9F4 00107934 3C 60 00 04 */ lis r3, 0x00040009@ha /* 8010A9F8 00107938 3B 83 00 09 */ addi r28, r3, 0x00040009@l -/* 8010A9FC 0010793C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010AA00 00107940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010A9FC 0010793C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010AA00 00107940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010AA04 00107944 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010AA08 00107948 74 00 02 01 */ andis. r0, r0, 0x201 /* 8010AA0C 0010794C 41 82 00 20 */ beq lbl_8010AA2C @@ -124119,8 +124119,8 @@ lbl_8010AC20: /* 8010AC40 00107B80 38 00 FF FF */ li r0, -1 /* 8010AC44 00107B84 90 01 00 0C */ stw r0, 0xc(r1) /* 8010AC48 00107B88 90 61 00 10 */ stw r3, 0x10(r1) -/* 8010AC4C 00107B8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010AC50 00107B90 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 8010AC4C 00107B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010AC50 00107B90 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8010AC54 00107B94 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 8010AC58 00107B98 7F 64 DB 78 */ mr r4, r27 /* 8010AC5C 00107B9C 38 BF 1B CC */ addi r5, r31, 0x1bcc @@ -124241,8 +124241,8 @@ lbl_8010ADEC: /* 8010ADFC 00107D3C 38 00 00 00 */ li r0, 0 /* 8010AE00 00107D40 B0 01 00 34 */ sth r0, 0x34(r1) /* 8010AE04 00107D44 38 DF 1B E8 */ addi r6, r31, 0x1be8 -/* 8010AE08 00107D48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010AE0C 00107D4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010AE08 00107D48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010AE0C 00107D4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010AE10 00107D50 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8010AE14 00107D54 38 80 00 09 */ li r4, 9 /* 8010AE18 00107D58 38 A0 00 00 */ li r5, 0 @@ -124399,8 +124399,8 @@ lbl_8010B014: /* 8010B03C 00107F7C 38 BF 37 EC */ addi r5, r31, 0x37ec /* 8010B040 00107F80 7F E6 FB 78 */ mr r6, r31 /* 8010B044 00107F84 4B F6 CD 21 */ bl dBgS_LinChk_NS_Set -/* 8010B048 00107F88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B04C 00107F8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B048 00107F88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B04C 00107F8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B050 00107F90 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 8010B054 00107F94 7F 23 CB 78 */ mr r3, r25 /* 8010B058 00107F98 80 9F 07 7C */ lwz r4, 0x77c(r31) @@ -124449,8 +124449,8 @@ lbl_8010B0D0: /* 8010B100 00108040 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8010B104 00108044 7D 89 03 A6 */ mtctr r12 /* 8010B108 00108048 4E 80 04 21 */ bctrl -/* 8010B10C 0010804C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B110 00108050 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B10C 0010804C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B110 00108050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B114 00108054 80 63 5F 1C */ lwz r3, 0x5f1c(r3) /* 8010B118 00108058 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf /* 8010B11C 0010805C 41 82 00 2C */ beq lbl_8010B148 @@ -124650,8 +124650,8 @@ daAlink_c_NS_hookshotRoofTurn: /* 8010B3D4 00108314 48 25 6E 09 */ bl _savegpr_29 /* 8010B3D8 00108318 7C 7E 1B 78 */ mr r30, r3 /* 8010B3DC 0010831C 3B E0 00 00 */ li r31, 0 -/* 8010B3E0 00108320 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B3E4 00108324 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B3E0 00108320 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B3E4 00108324 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B3E8 00108328 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010B3EC 0010832C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 8010B3F0 00108330 40 82 01 C4 */ bne lbl_8010B5B4 @@ -124770,8 +124770,8 @@ lbl_8010B588: /* 8010B590 001084D0 2C 03 00 00 */ cmpwi r3, 0 /* 8010B594 001084D4 40 82 00 20 */ bne lbl_8010B5B4 /* 8010B598 001084D8 38 00 00 78 */ li r0, 0x78 -/* 8010B59C 001084DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B5A0 001084E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B59C 001084DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B5A0 001084E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B5A4 001084E4 98 03 5E 3E */ stb r0, 0x5e3e(r3) /* 8010B5A8 001084E8 9B A3 5E 2E */ stb r29, 0x5e2e(r3) /* 8010B5AC 001084EC 38 00 00 00 */ li r0, 0 @@ -124787,8 +124787,8 @@ lbl_8010B5B4: /* 8010B5D0 00108510 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010B5D4 00108514 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8010B5D8 00108518 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8010B5DC 0010851C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B5E0 00108520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B5DC 0010851C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B5E0 00108520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B5E4 00108524 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010B5E8 00108528 38 80 00 01 */ li r4, 1 /* 8010B5EC 0010852C 38 A0 00 01 */ li r5, 1 @@ -124899,8 +124899,8 @@ daAlink_c_NS_checkNextHookPoint: lbl_8010B768: /* 8010B768 001086A8 2C 03 00 04 */ cmpwi r3, 4 /* 8010B76C 001086AC 40 82 00 B8 */ bne lbl_8010B824 -/* 8010B770 001086B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B774 001086B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B770 001086B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B774 001086B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B778 001086B8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010B77C 001086BC 38 9F 1E 2C */ addi r4, r31, 0x1e2c /* 8010B780 001086C0 4B F6 8E E1 */ bl cBgS_NS_ChkPolySafe @@ -124923,8 +124923,8 @@ lbl_8010B7B4: /* 8010B7C0 00108700 48 00 05 D1 */ bl daAlink_c_NS_procHookshotFlyInit /* 8010B7C4 00108704 48 00 00 70 */ b lbl_8010B834 lbl_8010B7C8: -/* 8010B7C8 00108708 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8010B7CC 0010870C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8010B7C8 00108708 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8010B7CC 0010870C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8010B7D0 00108710 80 04 5F 1C */ lwz r0, 0x5f1c(r4) /* 8010B7D4 00108714 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 8010B7D8 00108718 41 82 00 4C */ beq lbl_8010B824 @@ -124971,8 +124971,8 @@ daAlink_c_NS_checkLandHookshotHang: /* 8010B868 001087A8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 8010B86C 001087AC 38 9F 38 34 */ addi r4, r31, 0x3834 /* 8010B870 001087B0 48 15 C4 B9 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8010B874 001087B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B878 001087B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B874 001087B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B878 001087B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B87C 001087BC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010B880 001087C0 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 8010B884 001087C4 4B F6 8C 1D */ bl cBgS_NS_GroundCross @@ -125018,8 +125018,8 @@ lbl_8010B908: /* 8010B910 00108850 4B FB 48 55 */ bl daAlink_c_NS_checkSetItemTrigger /* 8010B914 00108854 2C 03 00 00 */ cmpwi r3, 0 /* 8010B918 00108858 41 82 00 34 */ beq lbl_8010B94C -/* 8010B91C 0010885C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010B920 00108860 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010B91C 0010885C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010B920 00108860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B924 00108864 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010B928 00108868 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 8010B92C 0010886C 41 82 00 14 */ beq lbl_8010B940 @@ -125092,8 +125092,8 @@ lbl_8010B9D4: /* 8010BA14 00108954 38 BF 38 04 */ addi r5, r31, 0x3804 /* 8010BA18 00108958 7F E6 FB 78 */ mr r6, r31 /* 8010BA1C 0010895C 4B F6 C3 49 */ bl dBgS_LinChk_NS_Set -/* 8010BA20 00108960 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BA24 00108964 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BA20 00108960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BA24 00108964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BA28 00108968 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010BA2C 0010896C 38 9F 1B B8 */ addi r4, r31, 0x1bb8 /* 8010BA30 00108970 4B F6 89 85 */ bl cBgS_NS_LineCross @@ -125161,8 +125161,8 @@ lbl_8010BAD4: /* 8010BB04 00108A44 C0 45 00 44 */ lfs f2, 0x44(r5) /* 8010BB08 00108A48 4B FA 14 D9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed lbl_8010BB0C: -/* 8010BB0C 00108A4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BB10 00108A50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BB0C 00108A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BB10 00108A50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BB14 00108A54 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010BB18 00108A58 60 00 40 00 */ ori r0, r0, 0x4000 /* 8010BB1C 00108A5C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -125210,15 +125210,15 @@ lbl_8010BB74: /* 8010BBBC 00108AFC 7F E3 FB 78 */ mr r3, r31 /* 8010BBC0 00108B00 4B FF D1 F5 */ bl daAlink_c_NS_setHookshotSight lbl_8010BBC4: -/* 8010BBC4 00108B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BBC8 00108B08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BBC4 00108B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BBC8 00108B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BBCC 00108B0C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010BBD0 00108B10 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 8010BBD4 00108B14 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 8010BBD8 00108B18 48 00 00 18 */ b lbl_8010BBF0 lbl_8010BBDC: -/* 8010BBDC 00108B1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BBE0 00108B20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BBDC 00108B1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BBE0 00108B20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BBE4 00108B24 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010BBE8 00108B28 64 00 00 04 */ oris r0, r0, 4 /* 8010BBEC 00108B2C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -125263,8 +125263,8 @@ lbl_8010BC50: /* 8010BC70 00108BB0 C0 24 00 44 */ lfs f1, 0x44(r4) /* 8010BC74 00108BB4 4B FA 2D FD */ bl daAlink_c_NS_setBlendAtnMoveAnime lbl_8010BC78: -/* 8010BC78 00108BB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BC7C 00108BBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BC78 00108BB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BC7C 00108BBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BC80 00108BC0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010BC84 00108BC4 60 00 40 00 */ ori r0, r0, 0x4000 /* 8010BC88 00108BC8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -125373,8 +125373,8 @@ lbl_8010BDDC: /* 8010BDFC 00108D3C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010BE00 00108D40 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010BE04 00108D44 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8010BE08 00108D48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010BE0C 00108D4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010BE08 00108D48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010BE0C 00108D4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BE10 00108D50 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010BE14 00108D54 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 8010BE18 00108D58 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -125713,8 +125713,8 @@ lbl_8010C2C0: /* 8010C2C8 00109208 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010C2CC 0010920C D0 01 00 68 */ stfs f0, 0x68(r1) /* 8010C2D0 00109210 D0 21 00 6C */ stfs f1, 0x6c(r1) -/* 8010C2D4 00109214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C2D8 00109218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C2D4 00109214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C2D8 00109218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C2DC 0010921C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010C2E0 00109220 38 80 00 01 */ li r4, 1 /* 8010C2E4 00109224 38 A0 00 01 */ li r5, 1 @@ -125746,8 +125746,8 @@ lbl_8010C340: /* 8010C344 00109284 A8 19 30 0C */ lha r0, 0x300c(r25) /* 8010C348 00109288 2C 00 00 04 */ cmpwi r0, 4 /* 8010C34C 0010928C 40 82 00 5C */ bne lbl_8010C3A8 -/* 8010C350 00109290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C354 00109294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C350 00109290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C354 00109294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C358 00109298 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 8010C35C 0010929C 7F 03 C3 78 */ mr r3, r24 /* 8010C360 001092A0 38 99 1E 2C */ addi r4, r25, 0x1e2c @@ -125792,8 +125792,8 @@ lbl_8010C3A8: /* 8010C3F8 00109338 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010C3FC 0010933C D0 01 00 5C */ stfs f0, 0x5c(r1) /* 8010C400 00109340 D0 21 00 60 */ stfs f1, 0x60(r1) -/* 8010C404 00109344 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C408 00109348 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C404 00109344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C408 00109348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C40C 0010934C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010C410 00109350 38 80 00 01 */ li r4, 1 /* 8010C414 00109354 38 A0 00 01 */ li r5, 1 @@ -125866,8 +125866,8 @@ lbl_8010C4CC: /* 8010C518 00109458 38 79 1D 08 */ addi r3, r25, 0x1d08 /* 8010C51C 0010945C 38 81 00 94 */ addi r4, r1, 0x94 /* 8010C520 00109460 48 15 B8 09 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8010C524 00109464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C528 00109468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C524 00109464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C528 00109468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C52C 0010946C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010C530 00109470 38 99 1D 08 */ addi r4, r25, 0x1d08 /* 8010C534 00109474 4B F6 7F 6D */ bl cBgS_NS_GroundCross @@ -125922,8 +125922,8 @@ lbl_8010C5CC: lbl_8010C5E4: /* 8010C5E4 00109524 2C 1C 00 00 */ cmpwi r28, 0 /* 8010C5E8 00109528 41 82 00 A0 */ beq lbl_8010C688 -/* 8010C5EC 0010952C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C5F0 00109530 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C5EC 0010952C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C5F0 00109530 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C5F4 00109534 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010C5F8 00109538 38 99 1E 2C */ addi r4, r25, 0x1e2c /* 8010C5FC 0010953C 4B F6 87 61 */ bl dBgS_NS_GetMonkeyBarsCode @@ -126015,8 +126015,8 @@ lbl_8010C714: /* 8010C744 00109684 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010C748 00109688 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8010C74C 0010968C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8010C750 00109690 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C754 00109694 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C750 00109690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C754 00109694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C758 00109698 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010C75C 0010969C 38 80 00 01 */ li r4, 1 /* 8010C760 001096A0 38 A0 00 01 */ li r5, 1 @@ -126182,8 +126182,8 @@ lbl_8010C9B0: /* 8010C9B0 001098F0 C0 02 96 00 */ lfs f0, lbl_80453000-_SDA2_BASE_(r2) /* 8010C9B4 001098F4 D0 1C 2B 98 */ stfs f0, 0x2b98(r28) /* 8010C9B8 001098F8 B3 FC 30 12 */ sth r31, 0x3012(r28) -/* 8010C9BC 001098FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010C9C0 00109900 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010C9BC 001098FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010C9C0 00109900 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C9C4 00109904 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010C9C8 00109908 64 00 00 01 */ oris r0, r0, 1 /* 8010C9CC 0010990C 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -126202,8 +126202,8 @@ lbl_8010C9B0: /* 8010CA00 00109940 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010CA04 00109944 93 C1 00 08 */ stw r30, 8(r1) /* 8010CA08 00109948 7C 7F 1B 78 */ mr r31, r3 -/* 8010CA0C 0010994C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8010CA10 00109950 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8010CA0C 0010994C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8010CA10 00109950 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8010CA14 00109954 3B C4 5D 7C */ addi r30, r4, 0x5d7c /* 8010CA18 00109958 80 03 31 7C */ lwz r0, 0x317c(r3) /* 8010CA1C 0010995C 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -126214,8 +126214,8 @@ lbl_8010C9B0: /* 8010CA30 00109970 4B FC 21 A9 */ bl daAlink_c_NS_checkSubjectEnd /* 8010CA34 00109974 2C 03 00 00 */ cmpwi r3, 0 /* 8010CA38 00109978 41 82 00 34 */ beq lbl_8010CA6C -/* 8010CA3C 0010997C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010CA40 00109980 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010CA3C 0010997C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010CA40 00109980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010CA44 00109984 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010CA48 00109988 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 8010CA4C 0010998C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -126227,8 +126227,8 @@ lbl_8010C9B0: /* 8010CA64 001099A4 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 8010CA68 001099A8 48 00 00 7C */ b lbl_8010CAE4 lbl_8010CA6C: -/* 8010CA6C 001099AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010CA70 001099B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010CA6C 001099AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010CA70 001099B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010CA74 001099B4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010CA78 001099B8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 8010CA7C 001099BC 41 82 00 68 */ beq lbl_8010CAE4 @@ -126413,8 +126413,8 @@ lbl_8010CCBC: /* 8010CD00 00109C40 4B FF E9 45 */ bl daAlink_c_NS_initHookshotRoofWaitActor /* 8010CD04 00109C44 7F C3 F3 78 */ mr r3, r30 /* 8010CD08 00109C48 4B FF C4 69 */ bl daAlink_c_NS_initHookshotReady -/* 8010CD0C 00109C4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010CD10 00109C50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010CD0C 00109C4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010CD10 00109C50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010CD14 00109C54 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010CD18 00109C58 64 00 00 01 */ oris r0, r0, 1 /* 8010CD1C 00109C5C 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -126464,8 +126464,8 @@ lbl_8010CDA8: lbl_8010CDC4: /* 8010CDC4 00109D04 38 00 00 00 */ li r0, 0 /* 8010CDC8 00109D08 98 1F 20 68 */ stb r0, 0x2068(r31) -/* 8010CDCC 00109D0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010CDD0 00109D10 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8010CDCC 00109D0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010CDD0 00109D10 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8010CDD4 00109D14 80 1E 5F 18 */ lwz r0, 0x5f18(r30) /* 8010CDD8 00109D18 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 8010CDDC 00109D1C 90 1E 5F 18 */ stw r0, 0x5f18(r30) @@ -126619,8 +126619,8 @@ lbl_8010CFA8: /* 8010CFF0 00109F30 4B FF E6 55 */ bl daAlink_c_NS_initHookshotRoofWaitActor /* 8010CFF4 00109F34 C0 02 96 00 */ lfs f0, lbl_80453000-_SDA2_BASE_(r2) /* 8010CFF8 00109F38 D0 1E 2B 98 */ stfs f0, 0x2b98(r30) -/* 8010CFFC 00109F3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D000 00109F40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010CFFC 00109F3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D000 00109F40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D004 00109F44 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010D008 00109F48 64 00 00 01 */ oris r0, r0, 1 /* 8010D00C 00109F4C 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -126704,8 +126704,8 @@ lbl_8010D108: /* 8010D130 0010A070 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010D134 0010A074 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8010D138 0010A078 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8010D13C 0010A07C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D140 0010A080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D13C 0010A07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D140 0010A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D144 0010A084 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010D148 0010A088 38 80 00 03 */ li r4, 3 /* 8010D14C 0010A08C 38 A0 00 01 */ li r5, 1 @@ -126830,8 +126830,8 @@ lbl_8010D300: /* 8010D308 0010A248 38 00 00 01 */ li r0, 1 /* 8010D30C 0010A24C B0 1D 30 0C */ sth r0, 0x300c(r29) lbl_8010D310: -/* 8010D310 0010A250 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D314 0010A254 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D310 0010A250 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D314 0010A254 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D318 0010A258 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010D31C 0010A25C 64 00 02 00 */ oris r0, r0, 0x200 /* 8010D320 0010A260 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -126868,8 +126868,8 @@ lbl_8010D36C: /* 8010D398 0010A2D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010D39C 0010A2DC 93 C1 00 08 */ stw r30, 8(r1) /* 8010D3A0 0010A2E0 7C 7F 1B 78 */ mr r31, r3 -/* 8010D3A4 0010A2E4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8010D3A8 0010A2E8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8010D3A4 0010A2E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8010D3A8 0010A2E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8010D3AC 0010A2EC 3B C4 5D 7C */ addi r30, r4, 0x5d7c /* 8010D3B0 0010A2F0 80 03 31 7C */ lwz r0, 0x317c(r3) /* 8010D3B4 0010A2F4 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -126880,8 +126880,8 @@ lbl_8010D36C: /* 8010D3C8 0010A308 4B FC 18 11 */ bl daAlink_c_NS_checkSubjectEnd /* 8010D3CC 0010A30C 2C 03 00 00 */ cmpwi r3, 0 /* 8010D3D0 0010A310 41 82 00 30 */ beq lbl_8010D400 -/* 8010D3D4 0010A314 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D3D8 0010A318 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D3D4 0010A314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D3D8 0010A318 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D3DC 0010A31C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010D3E0 0010A320 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 8010D3E4 0010A324 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -126892,8 +126892,8 @@ lbl_8010D36C: /* 8010D3F8 0010A338 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 8010D3FC 0010A33C 48 00 00 C0 */ b lbl_8010D4BC lbl_8010D400: -/* 8010D400 0010A340 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D404 0010A344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D400 0010A340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D404 0010A344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D408 0010A348 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010D40C 0010A34C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 8010D410 0010A350 41 82 00 AC */ beq lbl_8010D4BC @@ -127060,15 +127060,15 @@ lbl_8010D628: /* 8010D650 0010A590 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D654 0010A594 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010D658 0010A598 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8010D65C 0010A59C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D660 0010A5A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D65C 0010A59C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D660 0010A5A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D664 0010A5A4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010D668 0010A5A8 64 00 02 00 */ oris r0, r0, 0x200 /* 8010D66C 0010A5AC 90 03 5F 1C */ stw r0, 0x5f1c(r3) /* 8010D670 0010A5B0 7F E3 FB 78 */ mr r3, r31 /* 8010D674 0010A5B4 4B FF BA FD */ bl daAlink_c_NS_initHookshotReady -/* 8010D678 0010A5B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D67C 0010A5BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010D678 0010A5B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D67C 0010A5BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D680 0010A5C0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8010D684 0010A5C4 60 00 40 00 */ ori r0, r0, 0x4000 /* 8010D688 0010A5C8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -127110,8 +127110,8 @@ lbl_8010D6FC: lbl_8010D714: /* 8010D714 0010A654 38 00 00 00 */ li r0, 0 /* 8010D718 0010A658 98 1D 20 68 */ stb r0, 0x2068(r29) -/* 8010D71C 0010A65C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010D720 0010A660 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 8010D71C 0010A65C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010D720 0010A660 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8010D724 0010A664 80 1C 5F 18 */ lwz r0, 0x5f18(r28) /* 8010D728 0010A668 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 8010D72C 0010A66C 90 1C 5F 18 */ stw r0, 0x5f18(r28) @@ -127625,8 +127625,8 @@ lbl_8010DE54: .global daAlink_c_NS_setSpinnerStatus daAlink_c_NS_setSpinnerStatus: -/* 8010DE64 0010ADA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010DE68 0010ADA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010DE64 0010ADA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010DE68 0010ADA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010DE6C 0010ADAC 98 83 5E 24 */ stb r4, 0x5e24(r3) /* 8010DE70 0010ADB0 98 A3 5E 4A */ stb r5, 0x5e4a(r3) /* 8010DE74 0010ADB4 4E 80 00 20 */ blr @@ -128563,8 +128563,8 @@ lbl_8010EB88: /* 8010EBA8 0010BAE8 41 82 01 E8 */ beq lbl_8010ED90 /* 8010EBAC 0010BAEC 28 03 00 7D */ cmplwi r3, 0x7d /* 8010EBB0 0010BAF0 40 82 00 24 */ bne lbl_8010EBD4 -/* 8010EBB4 0010BAF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EBB8 0010BAF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EBB4 0010BAF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EBB8 0010BAF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EBBC 0010BAFC C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8010EBC0 0010BB00 C0 02 93 8C */ lfs f0, lbl_80452D8C-_SDA2_BASE_(r2) /* 8010EBC4 0010BB04 EC 01 00 2A */ fadds f0, f1, f0 @@ -128574,8 +128574,8 @@ lbl_8010EB88: lbl_8010EBD4: /* 8010EBD4 0010BB14 28 03 00 7E */ cmplwi r3, 0x7e /* 8010EBD8 0010BB18 40 82 00 24 */ bne lbl_8010EBFC -/* 8010EBDC 0010BB1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EBE0 0010BB20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EBDC 0010BB1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EBE0 0010BB20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EBE4 0010BB24 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8010EBE8 0010BB28 C0 02 94 04 */ lfs f0, lbl_80452E04-_SDA2_BASE_(r2) /* 8010EBEC 0010BB2C EC 01 00 2A */ fadds f0, f1, f0 @@ -128585,8 +128585,8 @@ lbl_8010EBD4: lbl_8010EBFC: /* 8010EBFC 0010BB3C 28 03 00 7F */ cmplwi r3, 0x7f /* 8010EC00 0010BB40 40 82 00 24 */ bne lbl_8010EC24 -/* 8010EC04 0010BB44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EC08 0010BB48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EC04 0010BB44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EC08 0010BB48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EC0C 0010BB4C C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8010EC10 0010BB50 C0 02 94 28 */ lfs f0, lbl_80452E28-_SDA2_BASE_(r2) /* 8010EC14 0010BB54 EC 01 00 2A */ fadds f0, f1, f0 @@ -128608,8 +128608,8 @@ lbl_8010EC24: /* 8010EC50 0010BB90 90 01 00 10 */ stw r0, 0x10(r1) /* 8010EC54 0010BB94 C8 01 00 10 */ lfd f0, 0x10(r1) /* 8010EC58 0010BB98 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8010EC5C 0010BB9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EC60 0010BBA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EC5C 0010BB9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EC60 0010BBA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EC64 0010BBA4 C0 03 5D C0 */ lfs f0, 0x5dc0(r3) /* 8010EC68 0010BBA8 EC 00 08 2A */ fadds f0, f0, f1 /* 8010EC6C 0010BBAC D0 03 5D C0 */ stfs f0, 0x5dc0(r3) @@ -128624,8 +128624,8 @@ lbl_8010EC7C: /* 8010EC8C 0010BBCC 28 03 00 69 */ cmplwi r3, 0x69 /* 8010EC90 0010BBD0 40 82 00 28 */ bne lbl_8010ECB8 lbl_8010EC94: -/* 8010EC94 0010BBD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EC98 0010BBD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EC94 0010BBD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EC98 0010BBD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EC9C 0010BBDC C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8010ECA0 0010BBE0 C0 02 94 28 */ lfs f0, lbl_80452E28-_SDA2_BASE_(r2) /* 8010ECA4 0010BBE4 EC 01 00 2A */ fadds f0, f1, f0 @@ -128639,8 +128639,8 @@ lbl_8010ECB8: /* 8010ECC0 0010BC00 28 03 00 65 */ cmplwi r3, 0x65 /* 8010ECC4 0010BC04 40 82 00 28 */ bne lbl_8010ECEC lbl_8010ECC8: -/* 8010ECC8 0010BC08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010ECCC 0010BC0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010ECC8 0010BC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010ECCC 0010BC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010ECD0 0010BC10 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8010ECD4 0010BC14 C0 02 93 1C */ lfs f0, lbl_80452D1C-_SDA2_BASE_(r2) /* 8010ECD8 0010BC18 EC 01 00 2A */ fadds f0, f1, f0 @@ -128664,8 +128664,8 @@ lbl_8010ED04: /* 8010ED18 0010BC58 90 01 00 10 */ stw r0, 0x10(r1) /* 8010ED1C 0010BC5C C8 01 00 10 */ lfd f0, 0x10(r1) /* 8010ED20 0010BC60 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8010ED24 0010BC64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010ED28 0010BC68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010ED24 0010BC64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010ED28 0010BC68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010ED2C 0010BC6C C0 03 5D C0 */ lfs f0, 0x5dc0(r3) /* 8010ED30 0010BC70 EC 00 08 2A */ fadds f0, f0, f1 /* 8010ED34 0010BC74 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) @@ -128686,8 +128686,8 @@ lbl_8010ED54: /* 8010ED68 0010BCA8 90 01 00 10 */ stw r0, 0x10(r1) /* 8010ED6C 0010BCAC C8 01 00 10 */ lfd f0, 0x10(r1) /* 8010ED70 0010BCB0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8010ED74 0010BCB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010ED78 0010BCB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010ED74 0010BCB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010ED78 0010BCB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010ED7C 0010BCBC C0 03 5D C0 */ lfs f0, 0x5dc0(r3) /* 8010ED80 0010BCC0 EC 00 08 2A */ fadds f0, f0, f1 /* 8010ED84 0010BCC4 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) @@ -128725,8 +128725,8 @@ lbl_8010EDE8: /* 8010EDF8 0010BD38 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010EDFC 0010BD3C 7C 00 18 40 */ cmplw r0, r3 /* 8010EE00 0010BD40 40 82 03 20 */ bne lbl_8010F120 -/* 8010EE04 0010BD44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EE08 0010BD48 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8010EE04 0010BD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EE08 0010BD48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8010EE0C 0010BD4C A0 7F 00 02 */ lhz r3, 2(r31) /* 8010EE10 0010BD50 A0 1F 5E 16 */ lhz r0, 0x5e16(r31) /* 8010EE14 0010BD54 7C 00 18 40 */ cmplw r0, r3 @@ -128766,8 +128766,8 @@ lbl_8010EE88: /* 8010EE94 0010BDD4 A0 1D 06 04 */ lhz r0, 0x604(r29) /* 8010EE98 0010BDD8 2C 00 00 05 */ cmpwi r0, 5 /* 8010EE9C 0010BDDC 40 82 05 A4 */ bne lbl_8010F440 -/* 8010EEA0 0010BDE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010EEA4 0010BDE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010EEA0 0010BDE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010EEA4 0010BDE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010EEA8 0010BDE8 38 63 00 9C */ addi r3, r3, 0x9c /* 8010EEAC 0010BDEC 88 9D 2F 9C */ lbz r4, 0x2f9c(r29) /* 8010EEB0 0010BDF0 38 A0 00 65 */ li r5, 0x65 @@ -128930,8 +128930,8 @@ lbl_8010F0D4: /* 8010F0E0 0010C020 A0 1D 06 04 */ lhz r0, 0x604(r29) /* 8010F0E4 0010C024 2C 00 00 05 */ cmpwi r0, 5 /* 8010F0E8 0010C028 40 82 00 18 */ bne lbl_8010F100 -/* 8010F0EC 0010C02C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F0F0 0010C030 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F0EC 0010C02C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F0F0 0010C030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F0F4 0010C034 38 63 00 9C */ addi r3, r3, 0x9c /* 8010F0F8 0010C038 88 9D 2F 9C */ lbz r4, 0x2f9c(r29) /* 8010F0FC 0010C03C 4B F2 45 C1 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc @@ -129007,8 +129007,8 @@ lbl_8010F1D8: /* 8010F1F8 0010C138 A8 9D 30 18 */ lha r4, 0x3018(r29) /* 8010F1FC 0010C13C 7C 80 07 35 */ extsh. r0, r4 /* 8010F200 0010C140 40 81 00 3C */ ble lbl_8010F23C -/* 8010F204 0010C144 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F208 0010C148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F204 0010C144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F208 0010C148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F20C 0010C14C C0 43 5D C0 */ lfs f2, 0x5dc0(r3) /* 8010F210 0010C150 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 8010F214 0010C154 6C 80 80 00 */ xoris r0, r4, 0x8000 @@ -129067,8 +129067,8 @@ lbl_8010F29C: /* 8010F2DC 0010C21C FC 80 18 90 */ fmr f4, f3 /* 8010F2E0 0010C220 39 00 00 00 */ li r8, 0 /* 8010F2E4 0010C224 48 19 C6 A1 */ bl Z2SeMgr_NS_seStart -/* 8010F2E8 0010C228 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F2EC 0010C22C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8010F2E8 0010C228 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F2EC 0010C22C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8010F2F0 0010C230 A0 64 00 02 */ lhz r3, 2(r4) /* 8010F2F4 0010C234 A8 BD 30 18 */ lha r5, 0x3018(r29) /* 8010F2F8 0010C238 7C 05 00 D0 */ neg r0, r5 @@ -129256,8 +129256,8 @@ daAlink_c_NS_procBottleDrinkInit: /* 8010F580 0010C4C0 38 60 00 01 */ li r3, 1 /* 8010F584 0010C4C4 48 00 00 FC */ b lbl_8010F680 lbl_8010F588: -/* 8010F588 0010C4C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F58C 0010C4CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F588 0010C4C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F58C 0010C4CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F590 0010C4D0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8010F594 0010C4D4 7F E4 FB 78 */ mr r4, r31 /* 8010F598 0010C4D8 38 A0 00 00 */ li r5, 0 @@ -129291,8 +129291,8 @@ lbl_8010F5C0: /* 8010F600 0010C540 7F E3 FB 78 */ mr r3, r31 /* 8010F604 0010C544 7F C4 F3 78 */ mr r4, r30 /* 8010F608 0010C548 4B FF EF D1 */ bl daAlink_c_NS_setBottleModel -/* 8010F60C 0010C54C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F610 0010C550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F60C 0010C54C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F610 0010C550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F614 0010C554 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010F618 0010C558 60 00 20 00 */ ori r0, r0, 0x2000 /* 8010F61C 0010C55C 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -129337,8 +129337,8 @@ lbl_8010F680: /* 8010F6AC 0010C5EC A8 03 30 0E */ lha r0, 0x300e(r3) /* 8010F6B0 0010C5F0 2C 00 00 00 */ cmpwi r0, 0 /* 8010F6B4 0010C5F4 41 82 00 1C */ beq lbl_8010F6D0 -/* 8010F6B8 0010C5F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F6BC 0010C5FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F6B8 0010C5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F6BC 0010C5FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F6C0 0010C600 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8010F6C4 0010C604 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8010F6C8 0010C608 4B F3 8A B5 */ bl dEvent_manager_c_NS_cutEnd @@ -129364,8 +129364,8 @@ daAlink_c_NS_procBottleOpenInit: /* 8010F704 0010C644 48 25 2A D9 */ bl _savegpr_29 /* 8010F708 0010C648 7C 7E 1B 78 */ mr r30, r3 /* 8010F70C 0010C64C 7C 9F 23 78 */ mr r31, r4 -/* 8010F710 0010C650 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F714 0010C654 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F710 0010C650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F714 0010C654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F718 0010C658 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8010F71C 0010C65C 7F C4 F3 78 */ mr r4, r30 /* 8010F720 0010C660 38 A0 00 00 */ li r5, 0 @@ -129399,8 +129399,8 @@ lbl_8010F740: /* 8010F78C 0010C6CC 7F C3 F3 78 */ mr r3, r30 /* 8010F790 0010C6D0 7F E4 FB 78 */ mr r4, r31 /* 8010F794 0010C6D4 4B FF EE 45 */ bl daAlink_c_NS_setBottleModel -/* 8010F798 0010C6D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010F79C 0010C6DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010F798 0010C6D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010F79C 0010C6DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F7A0 0010C6E0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8010F7A4 0010C6E4 60 00 40 00 */ ori r0, r0, 0x4000 /* 8010F7A8 0010C6E8 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -129635,8 +129635,8 @@ lbl_8010FADC: /* 8010FB00 0010CA40 48 22 01 C5 */ bl J3DMaterialTable_NS_entryTexMtxAnimator /* 8010FB04 0010CA44 38 00 00 02 */ li r0, 2 /* 8010FB08 0010CA48 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8010FB0C 0010CA4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010FB10 0010CA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010FB0C 0010CA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010FB10 0010CA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010FB14 0010CA54 38 63 00 9C */ addi r3, r3, 0x9c /* 8010FB18 0010CA58 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) /* 8010FB1C 0010CA5C 4B F2 3B A1 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc @@ -129764,8 +129764,8 @@ lbl_8010FCA0: /* 8010FCD8 0010CC18 48 04 EF E1 */ bl daPy_actorKeep_c_NS_setData /* 8010FCDC 0010CC1C 48 00 00 1C */ b lbl_8010FCF8 lbl_8010FCE0: -/* 8010FCE0 0010CC20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010FCE4 0010CC24 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8010FCE0 0010CC20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010FCE4 0010CC24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8010FCE8 0010CC28 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 8010FCEC 0010CC2C 80 84 5B 64 */ lwz r4, 0x5b64(r4) /* 8010FCF0 0010CC30 4B F6 3C 9D */ bl dAttCatch_c_NS_convPId @@ -129828,8 +129828,8 @@ lbl_8010FD90: /* 8010FDB4 0010CCF4 80 1D 05 78 */ lwz r0, 0x578(r29) /* 8010FDB8 0010CCF8 64 00 10 00 */ oris r0, r0, 0x1000 /* 8010FDBC 0010CCFC 90 1D 05 78 */ stw r0, 0x578(r29) -/* 8010FDC0 0010CD00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010FDC4 0010CD04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010FDC0 0010CD00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010FDC4 0010CD04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010FDC8 0010CD08 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8010FDCC 0010CD0C 38 63 02 10 */ addi r3, r3, 0x210 /* 8010FDD0 0010CD10 80 9D 31 C4 */ lwz r4, 0x31c4(r29) @@ -129957,8 +129957,8 @@ lbl_8010FF40: /* 8010FFA0 0010CEE0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010FFA4 0010CEE4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8010FFA8 0010CEE8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8010FFAC 0010CEEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010FFB0 0010CEF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8010FFAC 0010CEEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010FFB0 0010CEF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010FFB4 0010CEF4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8010FFB8 0010CEF8 38 80 00 01 */ li r4, 1 /* 8010FFBC 0010CEFC 38 A0 00 01 */ li r5, 1 @@ -129967,8 +129967,8 @@ lbl_8010FF40: /* 8010FFC8 0010CF08 38 00 00 01 */ li r0, 1 /* 8010FFCC 0010CF0C B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_8010FFD0: -/* 8010FFD0 0010CF10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8010FFD4 0010CF14 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8010FFD0 0010CF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8010FFD4 0010CF14 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8010FFD8 0010CF18 80 1D 5F 1C */ lwz r0, 0x5f1c(r29) /* 8010FFDC 0010CF1C 64 00 04 00 */ oris r0, r0, 0x400 /* 8010FFE0 0010CF20 90 1D 5F 1C */ stw r0, 0x5f1c(r29) @@ -130004,8 +130004,8 @@ lbl_8011002C: /* 80110050 0010CF90 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 80110054 0010CF94 28 00 00 48 */ cmplwi r0, 0x48 /* 80110058 0010CF98 41 82 01 24 */ beq lbl_8011017C -/* 8011005C 0010CF9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110060 0010CFA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011005C 0010CF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110060 0010CFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110064 0010CFA4 8B A3 4F B6 */ lbz r29, 0x4fb6(r3) /* 80110068 0010CFA8 28 1D 00 67 */ cmplwi r29, 0x67 /* 8011006C 0010CFAC 40 82 00 20 */ bne lbl_8011008C @@ -130017,8 +130017,8 @@ lbl_8011002C: /* 80110084 0010CFC4 40 82 00 08 */ bne lbl_8011008C /* 80110088 0010CFC8 3B A0 00 6B */ li r29, 0x6b lbl_8011008C: -/* 8011008C 0010CFCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110090 0010CFD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011008C 0010CFCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110090 0010CFD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110094 0010CFD4 38 63 00 9C */ addi r3, r3, 0x9c /* 80110098 0010CFD8 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) /* 8011009C 0010CFDC 57 A5 06 3E */ clrlwi r5, r29, 0x18 @@ -130097,8 +130097,8 @@ lbl_80110188: /* 801101A4 0010D0E4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801101A8 0010D0E8 28 00 00 60 */ cmplwi r0, 0x60 /* 801101AC 0010D0EC 40 82 00 70 */ bne lbl_8011021C -/* 801101B0 0010D0F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801101B4 0010D0F4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 801101B0 0010D0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801101B4 0010D0F4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 801101B8 0010D0F8 38 7D 5B 54 */ addi r3, r29, 0x5b54 /* 801101BC 0010D0FC 80 9D 5B 64 */ lwz r4, 0x5b64(r29) /* 801101C0 0010D100 4B F6 37 CD */ bl dAttCatch_c_NS_convPId @@ -130208,10 +130208,10 @@ daAlink_c_NS_procBottleGetInit: /* 8011033C 0010D27C 2C 1E 00 00 */ cmpwi r30, 0 /* 80110340 0010D280 41 82 00 30 */ beq lbl_80110370 /* 80110344 0010D284 38 60 00 48 */ li r3, 0x48 -/* 80110348 0010D288 4B F8 7B 45 */ bl execItemGet +/* 80110348 0010D288 4B F8 7B 45 */ bl execItemGet__FUc /* 8011034C 0010D28C 3B C0 00 F8 */ li r30, 0xf8 -/* 80110350 0010D290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110354 0010D294 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80110350 0010D290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110354 0010D294 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80110358 0010D298 A0 04 00 06 */ lhz r0, 6(r4) /* 8011035C 0010D29C 80 64 5D D4 */ lwz r3, 0x5dd4(r4) /* 80110360 0010D2A0 7C 00 00 D0 */ neg r0, r0 @@ -130219,8 +130219,8 @@ daAlink_c_NS_procBottleGetInit: /* 80110368 0010D2A8 90 04 5D D4 */ stw r0, 0x5dd4(r4) /* 8011036C 0010D2AC 48 00 00 30 */ b lbl_8011039C lbl_80110370: -/* 80110370 0010D2B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110374 0010D2B4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80110370 0010D2B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110374 0010D2B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80110378 0010D2B8 A0 64 00 06 */ lhz r3, 6(r4) /* 8011037C 0010D2BC 80 04 5D D4 */ lwz r0, 0x5dd4(r4) /* 80110380 0010D2C0 7C 00 1A 14 */ add r0, r0, r3 @@ -130245,8 +130245,8 @@ lbl_801103AC: /* 801103C0 0010D300 4B F9 CD 35 */ bl daAlink_c_NS_setSingleAnimeParam /* 801103C4 0010D304 A3 DF 2F DC */ lhz r30, 0x2fdc(r31) lbl_801103C8: -/* 801103C8 0010D308 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801103CC 0010D30C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801103C8 0010D308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801103CC 0010D30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801103D0 0010D310 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 801103D4 0010D314 64 00 04 00 */ oris r0, r0, 0x400 /* 801103D8 0010D318 60 00 10 00 */ ori r0, r0, 0x1000 @@ -130318,8 +130318,8 @@ lbl_801104C4: /* 801104C4 0010D404 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 801104C8 0010D408 28 00 00 76 */ cmplwi r0, 0x76 /* 801104CC 0010D40C 40 82 00 30 */ bne lbl_801104FC -/* 801104D0 0010D410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801104D4 0010D414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801104D0 0010D410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801104D4 0010D414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801104D8 0010D418 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 801104DC 0010D41C 7F C3 F3 78 */ mr r3, r30 /* 801104E0 0010D420 38 80 4A 40 */ li r4, 0x4a40 @@ -130437,8 +130437,8 @@ daAlink_searchTagKtOnFire: /* 80110674 0010D5B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80110678 0010D5B8 93 C1 00 08 */ stw r30, 8(r1) /* 8011067C 0010D5BC 7C 7E 1B 78 */ mr r30, r3 -/* 80110680 0010D5C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110684 0010D5C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80110680 0010D5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110684 0010D5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110688 0010D5C8 83 E3 5D B4 */ lwz r31, 0x5db4(r3) /* 8011068C 0010D5CC A8 1E 00 08 */ lha r0, 8(r30) /* 80110690 0010D5D0 2C 00 01 68 */ cmpwi r0, 0x168 @@ -130602,8 +130602,8 @@ lbl_801108AC: /* 801108B4 0010D7F4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 801108B8 0010D7F8 28 00 00 B7 */ cmplwi r0, 0xb7 /* 801108BC 0010D7FC 40 82 00 28 */ bne lbl_801108E4 -/* 801108C0 0010D800 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801108C4 0010D804 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801108C0 0010D800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801108C4 0010D804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801108C8 0010D808 A0 03 00 08 */ lhz r0, 8(r3) /* 801108CC 0010D80C 28 00 00 00 */ cmplwi r0, 0 /* 801108D0 0010D810 40 82 00 0C */ bne lbl_801108DC @@ -130924,8 +130924,8 @@ daAlink_c_NS_preKandelaarDraw: /* 80110D4C 0010DC8C 38 7F 36 0C */ addi r3, r31, 0x360c /* 80110D50 0010DC90 38 81 00 10 */ addi r4, r1, 0x10 /* 80110D54 0010DC94 4B F0 45 BD */ bl mDoLib_project -/* 80110D58 0010DC98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110D5C 0010DC9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80110D58 0010DC98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110D5C 0010DC9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110D60 0010DCA0 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 80110D64 0010DCA4 28 03 00 00 */ cmplwi r3, 0 /* 80110D68 0010DCA8 41 82 00 0C */ beq lbl_80110D74 @@ -130948,8 +130948,8 @@ lbl_80110D78: /* 80110DA4 0010DCE4 EC 00 18 28 */ fsubs f0, f0, f3 /* 80110DA8 0010DCE8 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 80110DAC 0010DCEC 40 80 00 38 */ bge lbl_80110DE4 -/* 80110DB0 0010DCF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110DB4 0010DCF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80110DB0 0010DCF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110DB4 0010DCF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110DB8 0010DCF8 3C 63 00 02 */ addis r3, r3, 2 /* 80110DBC 0010DCFC FC 00 08 1E */ fctiwz f0, f1 /* 80110DC0 0010DD00 D8 01 00 20 */ stfd f0, 0x20(r1) @@ -130965,8 +130965,8 @@ lbl_80110DE4: /* 80110DE4 0010DD24 38 00 00 00 */ li r0, 0 /* 80110DE8 0010DD28 90 1F 32 C8 */ stw r0, 0x32c8(r31) lbl_80110DEC: -/* 80110DEC 0010DD2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80110DF0 0010DD30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80110DEC 0010DD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80110DF0 0010DD30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110DF4 0010DD34 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 80110DF8 0010DD38 C3 E3 00 C8 */ lfs f31, 0xc8(r3) /* 80110DFC 0010DD3C C3 C3 00 CC */ lfs f30, 0xcc(r3) @@ -131129,8 +131129,8 @@ lbl_80111018: /* 80111038 0010DF78 4B FF D5 A1 */ bl daAlink_c_NS_setBottleModel /* 8011103C 0010DF7C 38 00 00 00 */ li r0, 0 /* 80111040 0010DF80 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 80111044 0010DF84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111048 0010DF88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111044 0010DF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111048 0010DF88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011104C 0010DF8C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80111050 0010DF90 60 00 20 00 */ ori r0, r0, 0x2000 /* 80111054 0010DF94 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -131213,8 +131213,8 @@ lbl_80111160: /* 80111168 0010E0A8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011116C 0010E0AC 4B F9 BE 45 */ bl daAlink_c_NS_setSingleAnimeBaseMorf lbl_80111170: -/* 80111170 0010E0B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111174 0010E0B4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80111170 0010E0B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111174 0010E0B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80111178 0010E0B8 A0 64 00 06 */ lhz r3, 6(r4) /* 8011117C 0010E0BC 80 04 5D D4 */ lwz r0, 0x5dd4(r4) /* 80111180 0010E0C0 7C 00 1A 14 */ add r0, r0, r3 @@ -131243,8 +131243,8 @@ lbl_801111C4: /* 801111D4 0010E114 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 801111D8 0010E118 7C 00 18 40 */ cmplw r0, r3 /* 801111DC 0010E11C 40 82 00 C8 */ bne lbl_801112A4 -/* 801111E0 0010E120 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801111E4 0010E124 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801111E0 0010E120 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801111E4 0010E124 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801111E8 0010E128 A0 64 00 08 */ lhz r3, 8(r4) /* 801111EC 0010E12C 80 04 5D D8 */ lwz r0, 0x5dd8(r4) /* 801111F0 0010E130 7C 00 18 00 */ cmpw r0, r3 @@ -131289,8 +131289,8 @@ lbl_80111280: /* 80111280 0010E1C0 C0 02 93 14 */ lfs f0, lbl_80452D14-_SDA2_BASE_(r2) /* 80111284 0010E1C4 80 7E 07 2C */ lwz r3, 0x72c(r30) /* 80111288 0010E1C8 D0 03 00 08 */ stfs f0, 8(r3) -/* 8011128C 0010E1CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111290 0010E1D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011128C 0010E1CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111290 0010E1D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111294 0010E1D4 38 63 00 9C */ addi r3, r3, 0x9c /* 80111298 0010E1D8 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) /* 8011129C 0010E1DC 4B F2 24 21 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc @@ -131336,8 +131336,8 @@ daAlink_c_NS_initKandelaarSwing: /* 80111320 0010E260 A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 80111324 0010E264 28 00 00 48 */ cmplwi r0, 0x48 /* 80111328 0010E268 40 82 00 74 */ bne lbl_8011139C -/* 8011132C 0010E26C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111330 0010E270 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011132C 0010E26C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111330 0010E270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111334 0010E274 A0 03 00 08 */ lhz r0, 8(r3) /* 80111338 0010E278 28 00 00 00 */ cmplwi r0, 0 /* 8011133C 0010E27C 41 82 00 34 */ beq lbl_80111370 @@ -131379,8 +131379,8 @@ lbl_8011139C: /* 801113C4 0010E304 48 00 48 5D */ bl daAlink_c_NS_checkEventRun /* 801113C8 0010E308 2C 03 00 00 */ cmpwi r3, 0 /* 801113CC 0010E30C 40 82 00 28 */ bne lbl_801113F4 -/* 801113D0 0010E310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801113D4 0010E314 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801113D0 0010E310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801113D4 0010E314 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801113D8 0010E318 80 85 5D D4 */ lwz r4, 0x5dd4(r5) /* 801113DC 0010E31C 3C 60 80 39 */ lis r3, lbl_8038E77C@ha /* 801113E0 0010E320 38 63 E7 7C */ addi r3, r3, lbl_8038E77C@l @@ -131416,8 +131416,8 @@ daAlink_c_NS_procKandelaarSwingInit: /* 80111448 0010E388 90 01 00 14 */ stw r0, 0x14(r1) /* 8011144C 0010E38C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80111450 0010E390 7C 7F 1B 78 */ mr r31, r3 -/* 80111454 0010E394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111458 0010E398 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80111454 0010E394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111458 0010E398 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8011145C 0010E39C 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 80111460 0010E3A0 80 84 5B 64 */ lwz r4, 0x5b64(r4) /* 80111464 0010E3A4 4B F6 25 29 */ bl dAttCatch_c_NS_convPId @@ -131535,8 +131535,8 @@ lbl_801115B8: /* 801115F8 0010E538 80 1E 06 14 */ lwz r0, 0x614(r30) /* 801115FC 0010E53C 28 00 00 27 */ cmplwi r0, 0x27 /* 80111600 0010E540 40 82 00 1C */ bne lbl_8011161C -/* 80111604 0010E544 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111608 0010E548 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111604 0010E544 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111608 0010E548 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011160C 0010E54C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80111610 0010E550 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 80111614 0010E554 4B F3 6B 69 */ bl dEvent_manager_c_NS_cutEnd @@ -131576,8 +131576,8 @@ daAlink_c_NS_procKandelaarPourInit: /* 80111684 0010E5C4 90 01 00 14 */ stw r0, 0x14(r1) /* 80111688 0010E5C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011168C 0010E5CC 7C 7F 1B 78 */ mr r31, r3 -/* 80111690 0010E5D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111694 0010E5D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111690 0010E5D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111694 0010E5D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111698 0010E5D8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011169C 0010E5DC 7F E4 FB 78 */ mr r4, r31 /* 801116A0 0010E5E0 38 A0 00 00 */ li r5, 0 @@ -131627,8 +131627,8 @@ lbl_80111710: /* 80111748 0010E688 4E 80 00 20 */ blr .global daAlink_searchWhistle daAlink_searchWhistle: -/* 8011174C 0010E68C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80111750 0010E690 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8011174C 0010E68C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80111750 0010E690 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80111754 0010E694 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80111758 0010E698 80 84 31 98 */ lwz r4, 0x3198(r4) /* 8011175C 0010E69C A8 03 00 08 */ lha r0, 8(r3) @@ -131661,8 +131661,8 @@ daAlink_c_NS_setGrassWhistleModel: /* 801117B4 0010E6F4 57 C0 08 3C */ slwi r0, r30, 1 /* 801117B8 0010E6F8 38 82 96 20 */ addi r4, r2, lbl_80453020-_SDA2_BASE_ /* 801117BC 0010E6FC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801117C0 0010E700 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801117C4 0010E704 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801117C0 0010E700 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801117C4 0010E704 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801117C8 0010E708 3C A5 00 02 */ addis r5, r5, 2 /* 801117CC 0010E70C 38 C0 00 80 */ li r6, 0x80 /* 801117D0 0010E710 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -131874,8 +131874,8 @@ daAlink_c_NS_procGrassWhistleWaitInit: /* 80111AD4 0010EA14 40 82 00 08 */ bne lbl_80111ADC /* 80111AD8 0010EA18 38 C3 FF FF */ addi r6, r3, -1 lbl_80111ADC: -/* 80111ADC 0010EA1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111AE0 0010EA20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111ADC 0010EA1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111AE0 0010EA20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111AE4 0010EA24 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80111AE8 0010EA28 38 7F 3F 90 */ addi r3, r31, 0x3f90 /* 80111AEC 0010EA2C 7F 24 CB 78 */ mr r4, r25 @@ -131984,8 +131984,8 @@ lbl_80111C68: /* 80111C6C 0010EBAC A8 19 04 E6 */ lha r0, 0x4e6(r25) /* 80111C70 0010EBB0 B0 19 04 DE */ sth r0, 0x4de(r25) lbl_80111C74: -/* 80111C74 0010EBB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111C78 0010EBB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111C74 0010EBB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111C78 0010EBB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111C7C 0010EBBC 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80111C80 0010EBC0 64 00 04 00 */ oris r0, r0, 0x400 /* 80111C84 0010EBC4 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -132037,8 +132037,8 @@ lbl_80111D1C: /* 80111D2C 0010EC6C A8 1F 30 08 */ lha r0, 0x3008(r31) /* 80111D30 0010EC70 2C 00 00 00 */ cmpwi r0, 0 /* 80111D34 0010EC74 40 82 01 1C */ bne lbl_80111E50 -/* 80111D38 0010EC78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111D3C 0010EC7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111D38 0010EC78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111D3C 0010EC7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111D40 0010EC80 83 A3 5D B8 */ lwz r29, 0x5db8(r3) .global daAlink_searchWhistle /* 80111D44 0010EC84 3C 60 80 11 */ lis r3, daAlink_searchWhistle@ha @@ -132148,8 +132148,8 @@ lbl_80111EA0: /* 80111EB4 0010EDF4 38 80 00 02 */ li r4, 2 /* 80111EB8 0010EDF8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 80111EBC 0010EDFC 4B F9 B8 69 */ bl daAlink_c_NS_resetUpperAnime -/* 80111EC0 0010EE00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111EC4 0010EE04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111EC0 0010EE00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111EC4 0010EE04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111EC8 0010EE08 A0 03 4F A4 */ lhz r0, 0x4fa4(r3) /* 80111ECC 0010EE0C 60 00 00 06 */ ori r0, r0, 6 /* 80111ED0 0010EE10 B0 03 4F A4 */ sth r0, 0x4fa4(r3) @@ -132165,8 +132165,8 @@ lbl_80111EA0: /* 80111EF8 0010EE38 4E 80 04 21 */ bctrl /* 80111EFC 0010EE3C 38 00 00 64 */ li r0, 0x64 /* 80111F00 0010EE40 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80111F04 0010EE44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111F08 0010EE48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111F04 0010EE44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111F08 0010EE48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111F0C 0010EE4C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80111F10 0010EE50 7F C3 F3 78 */ mr r3, r30 /* 80111F14 0010EE54 38 80 4A 40 */ li r4, 0x4a40 @@ -132195,8 +132195,8 @@ lbl_80111F48: /* 80111F6C 0010EEAC A8 1F 30 0C */ lha r0, 0x300c(r31) /* 80111F70 0010EEB0 2C 00 00 01 */ cmpwi r0, 1 /* 80111F74 0010EEB4 40 82 00 60 */ bne lbl_80111FD4 -/* 80111F78 0010EEB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80111F7C 0010EEBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80111F78 0010EEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80111F7C 0010EEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111F80 0010EEC0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80111F84 0010EEC4 38 80 47 20 */ li r4, 0x4720 /* 80111F88 0010EEC8 4B F2 2A 05 */ bl onEventBit__11dSv_event_cFUs @@ -132279,8 +132279,8 @@ lbl_8011208C: /* 8011208C 0010EFCC 7F C3 F3 78 */ mr r3, r30 /* 80112090 0010EFD0 38 80 00 00 */ li r4, 0 /* 80112094 0010EFD4 4B FA 12 05 */ bl daAlink_c_NS_setBStatus -/* 80112098 0010EFD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011209C 0010EFDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80112098 0010EFD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011209C 0010EFDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801120A0 0010EFE0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 801120A4 0010EFE4 64 00 04 00 */ oris r0, r0, 0x400 /* 801120A8 0010EFE8 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -132304,8 +132304,8 @@ lbl_8011208C: /* 801120F0 0010F030 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 801120F4 0010F034 2C 00 00 02 */ cmpwi r0, 2 /* 801120F8 0010F038 40 81 00 40 */ ble lbl_80112138 -/* 801120FC 0010F03C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80112100 0010F040 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801120FC 0010F03C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80112100 0010F040 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80112104 0010F044 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 80112108 0010F048 28 04 00 00 */ cmplwi r4, 0 /* 8011210C 0010F04C 41 82 00 2C */ beq lbl_80112138 @@ -132394,8 +132394,8 @@ lbl_8011220C: /* 80112238 0010F178 48 04 C2 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011223C 0010F17C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80112240 0010F180 41 82 00 20 */ beq lbl_80112260 -/* 80112244 0010F184 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80112248 0010F188 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80112244 0010F184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80112248 0010F188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011224C 0010F18C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80112250 0010F190 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 80112254 0010F194 4B F3 5F 29 */ bl dEvent_manager_c_NS_cutEnd @@ -132473,8 +132473,8 @@ lbl_8011234C: /* 8011234C 0010F28C 48 00 38 D5 */ bl daAlink_c_NS_checkEventRun /* 80112350 0010F290 2C 03 00 00 */ cmpwi r3, 0 /* 80112354 0010F294 41 82 00 1C */ beq lbl_80112370 -/* 80112358 0010F298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011235C 0010F29C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80112358 0010F298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011235C 0010F29C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80112360 0010F2A0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80112364 0010F2A4 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 80112368 0010F2A8 4B F3 5E 15 */ bl dEvent_manager_c_NS_cutEnd @@ -133458,8 +133458,8 @@ lbl_8011313C: /* 8011315C 0011009C C0 1F 38 0C */ lfs f0, 0x380c(r31) /* 80113160 001100A0 D0 01 02 54 */ stfs f0, 0x254(r1) /* 80113164 001100A4 80 7F 07 78 */ lwz r3, 0x778(r31) -/* 80113168 001100A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8011316C 001100AC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80113168 001100A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8011316C 001100AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80113170 001100B0 38 84 0F 38 */ addi r4, r4, 0xf38 /* 80113174 001100B4 4B F6 39 39 */ bl dBgS_Acch_NS_CrrPos /* 80113178 001100B8 80 7F 07 78 */ lwz r3, 0x778(r31) @@ -134392,8 +134392,8 @@ lbl_80113EF0: /* 80113F08 00110E48 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80113F0C 00110E4C D0 01 00 BC */ stfs f0, 0xbc(r1) /* 80113F10 00110E50 D0 21 00 C0 */ stfs f1, 0xc0(r1) -/* 80113F14 00110E54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80113F18 00110E58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80113F14 00110E54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80113F18 00110E58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80113F1C 00110E5C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80113F20 00110E60 38 80 00 03 */ li r4, 3 /* 80113F24 00110E64 38 A0 00 01 */ li r5, 1 @@ -134852,8 +134852,8 @@ lbl_80114588: /* 801145A8 001114E8 80 7F 38 48 */ lwz r3, 0x3848(r31) /* 801145AC 001114EC C3 C3 00 04 */ lfs f30, 4(r3) /* 801145B0 001114F0 80 7F 07 78 */ lwz r3, 0x778(r31) -/* 801145B4 001114F4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801145B8 001114F8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801145B4 001114F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801145B8 001114F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801145BC 001114FC 3B 64 0F 38 */ addi r27, r4, 0xf38 /* 801145C0 00111500 7F 64 DB 78 */ mr r4, r27 /* 801145C4 00111504 4B F6 24 E9 */ bl dBgS_Acch_NS_CrrPos @@ -135377,8 +135377,8 @@ lbl_80114CDC: /* 80114D58 00111C98 2C 00 00 04 */ cmpwi r0, 4 /* 80114D5C 00111C9C 40 82 00 6C */ bne lbl_80114DC8 /* 80114D60 00111CA0 80 7F 07 78 */ lwz r3, 0x778(r31) -/* 80114D64 00111CA4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80114D68 00111CA8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80114D64 00111CA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80114D68 00111CA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80114D6C 00111CAC 3B 04 0F 38 */ addi r24, r4, 0xf38 /* 80114D70 00111CB0 7F 04 C3 78 */ mr r4, r24 /* 80114D74 00111CB4 4B F6 1D 39 */ bl dBgS_Acch_NS_CrrPos @@ -135421,8 +135421,8 @@ lbl_80114DC8: /* 80114E00 00111D40 38 BF 37 F8 */ addi r5, r31, 0x37f8 /* 80114E04 00111D44 7F E6 FB 78 */ mr r6, r31 /* 80114E08 00111D48 4B F6 2F 5D */ bl dBgS_LinChk_NS_Set -/* 80114E0C 00111D4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80114E10 00111D50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80114E0C 00111D4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80114E10 00111D50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80114E14 00111D54 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 80114E18 00111D58 7F 03 C3 78 */ mr r3, r24 /* 80114E1C 00111D5C 80 9F 07 7C */ lwz r4, 0x77c(r31) @@ -135463,8 +135463,8 @@ lbl_80114E94: /* 80114EA4 00111DE4 38 A1 00 DC */ addi r5, r1, 0xdc /* 80114EA8 00111DE8 7F E6 FB 78 */ mr r6, r31 /* 80114EAC 00111DEC 4B F6 2E B9 */ bl dBgS_LinChk_NS_Set -/* 80114EB0 00111DF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80114EB4 00111DF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80114EB0 00111DF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80114EB4 00111DF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80114EB8 00111DF8 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 80114EBC 00111DFC 7F 03 C3 78 */ mr r3, r24 /* 80114EC0 00111E00 80 9F 07 80 */ lwz r4, 0x780(r31) @@ -135572,8 +135572,8 @@ lbl_80114FFC: /* 80115030 00111F70 48 15 23 C5 */ bl csXyz_X1_ /* 80115034 00111F74 80 7F 07 80 */ lwz r3, 0x780(r31) /* 80115038 00111F78 38 C3 00 30 */ addi r6, r3, 0x30 -/* 8011503C 00111F7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115040 00111F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011503C 00111F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115040 00111F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115044 00111F84 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80115048 00111F88 38 80 00 09 */ li r4, 9 /* 8011504C 00111F8C 38 A0 00 00 */ li r5, 0 @@ -135931,8 +135931,8 @@ lbl_80115510: lbl_80115530: /* 80115530 00112470 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80115534 00112474 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80115538 00112478 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011553C 0011247C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115538 00112478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011553C 0011247C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115540 00112480 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80115544 00112484 60 00 04 00 */ ori r0, r0, 0x400 /* 80115548 00112488 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -136008,8 +136008,8 @@ lbl_80115634: /* 80115640 00112580 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80115644 00112584 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_80115648: -/* 80115648 00112588 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011564C 0011258C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115648 00112588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011564C 0011258C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115650 00112590 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80115654 00112594 60 00 04 00 */ ori r0, r0, 0x400 /* 80115658 00112598 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -136350,8 +136350,8 @@ lbl_80115AD0: /* 80115B34 00112A74 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80115B38 00112A78 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80115B3C 00112A7C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80115B40 00112A80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115B44 00112A84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115B40 00112A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115B44 00112A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115B48 00112A88 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80115B4C 00112A8C 38 80 00 03 */ li r4, 3 /* 80115B50 00112A90 38 A0 00 01 */ li r5, 1 @@ -136414,8 +136414,8 @@ lbl_80115C08: .global daAlink_c_NS_checkEventRun daAlink_c_NS_checkEventRun: /* 80115C20 00112B60 38 A0 00 00 */ li r5, 0 -/* 80115C24 00112B64 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80115C28 00112B68 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80115C24 00112B64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80115C28 00112B68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80115C2C 00112B6C 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 80115C30 00112B70 28 00 00 00 */ cmplwi r0, 0 /* 80115C34 00112B74 40 82 00 10 */ bne lbl_80115C44 @@ -136484,8 +136484,8 @@ daAlink_c_NS_createNpcTks: /* 80115D1C 00112C5C 7C 7C 1B 78 */ mr r28, r3 /* 80115D20 00112C60 7C 9D 23 78 */ mr r29, r4 /* 80115D24 00112C64 7C BE 2B 78 */ mr r30, r5 -/* 80115D28 00112C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115D2C 00112C6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115D28 00112C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115D2C 00112C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115D30 00112C70 80 03 0D D0 */ lwz r0, 0xdd0(r3) /* 80115D34 00112C74 54 1F 07 3E */ clrlwi r31, r0, 0x1c /* 80115D38 00112C78 2C 06 00 00 */ cmpwi r6, 0 @@ -136493,8 +136493,8 @@ daAlink_c_NS_createNpcTks: /* 80115D40 00112C80 4B FA A5 D1 */ bl daAlink_c_NS_checkDungeon /* 80115D44 00112C84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115D48 00112C88 41 82 01 5C */ beq lbl_80115EA4 -/* 80115D4C 00112C8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115D50 00112C90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115D4C 00112C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115D50 00112C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115D54 00112C94 3B 63 4E 20 */ addi r27, r3, 0x4e20 /* 80115D58 00112C98 7F 63 DB 78 */ mr r3, r27 /* 80115D5C 00112C9C 81 9B 00 00 */ lwz r12, 0(r27) @@ -136516,20 +136516,20 @@ daAlink_c_NS_createNpcTks: /* 80115D9C 00112CDC 41 82 01 08 */ beq lbl_80115EA4 /* 80115DA0 00112CE0 38 60 00 2D */ li r3, 0x2d /* 80115DA4 00112CE4 38 80 00 01 */ li r4, 1 -/* 80115DA8 00112CE8 4B F8 21 39 */ bl checkItemGet +/* 80115DA8 00112CE8 4B F8 21 39 */ bl checkItemGet__FUci /* 80115DAC 00112CEC 2C 03 00 00 */ cmpwi r3, 0 /* 80115DB0 00112CF0 40 82 00 24 */ bne lbl_80115DD4 /* 80115DB4 00112CF4 38 60 00 27 */ li r3, 0x27 /* 80115DB8 00112CF8 38 80 00 01 */ li r4, 1 -/* 80115DBC 00112CFC 4B F8 21 25 */ bl checkItemGet +/* 80115DBC 00112CFC 4B F8 21 25 */ bl checkItemGet__FUci /* 80115DC0 00112D00 2C 03 00 00 */ cmpwi r3, 0 /* 80115DC4 00112D04 41 82 00 E0 */ beq lbl_80115EA4 /* 80115DC8 00112D08 48 00 90 79 */ bl daAlink_c_NS_checkLv7DungeonShop /* 80115DCC 00112D0C 2C 03 00 00 */ cmpwi r3, 0 /* 80115DD0 00112D10 40 82 00 D4 */ bne lbl_80115EA4 lbl_80115DD4: -/* 80115DD4 00112D14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115DD8 00112D18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80115DD4 00112D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115DD8 00112D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80115DDC 00112D1C 3B 63 09 58 */ addi r27, r3, 0x958 /* 80115DE0 00112D20 7F 63 DB 78 */ mr r3, r27 /* 80115DE4 00112D24 38 80 00 06 */ li r4, 6 @@ -136601,8 +136601,8 @@ daAlink_c_NS_checkDemoAction: /* 80115ECC 00112E0C 39 61 00 20 */ addi r11, r1, 0x20 /* 80115ED0 00112E10 48 24 C3 09 */ bl _savegpr_28 /* 80115ED4 00112E14 7C 7D 1B 78 */ mr r29, r3 -/* 80115ED8 00112E18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80115EDC 00112E1C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80115ED8 00112E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80115EDC 00112E1C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80115EE0 00112E20 38 00 00 00 */ li r0, 0 /* 80115EE4 00112E24 88 7F 4F AD */ lbz r3, 0x4fad(r31) /* 80115EE8 00112E28 28 03 00 00 */ cmplwi r3, 0 @@ -136694,8 +136694,8 @@ lbl_80115F78: /* 80116024 00112F64 7C 80 00 39 */ and. r0, r4, r0 /* 80116028 00112F68 40 82 00 5C */ bne lbl_80116084 lbl_8011602C: -/* 8011602C 00112F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80116030 00112F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011602C 00112F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80116030 00112F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80116034 00112F74 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80116038 00112F78 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 8011603C 00112F7C 40 82 00 48 */ bne lbl_80116084 @@ -136870,8 +136870,8 @@ lbl_80116288: /* 801162AC 001131EC 4B F0 58 69 */ bl fopAcM_getTalkEventPartner /* 801162B0 001131F0 7C 03 F0 40 */ cmplw r3, r30 /* 801162B4 001131F4 40 82 00 38 */ bne lbl_801162EC -/* 801162B8 001131F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801162BC 001131FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801162B8 001131F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801162BC 001131FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801162C0 00113200 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 801162C4 00113204 88 04 16 B8 */ lbz r0, 0x16b8(r4) /* 801162C8 00113208 28 00 00 03 */ cmplwi r0, 3 @@ -136936,8 +136936,8 @@ lbl_80116388: /* 8011639C 001132DC 80 9D 06 0C */ lwz r4, 0x60c(r29) /* 801163A0 001132E0 2C 04 00 01 */ cmpwi r4, 1 /* 801163A4 001132E4 40 82 00 60 */ bne lbl_80116404 -/* 801163A8 001132E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801163AC 001132EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801163A8 001132E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801163AC 001132EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801163B0 001132F0 88 03 00 14 */ lbz r0, 0x14(r3) /* 801163B4 001132F4 28 00 00 FF */ cmplwi r0, 0xff /* 801163B8 001132F8 41 82 00 4C */ beq lbl_80116404 @@ -137639,8 +137639,8 @@ lbl_80116D40: lbl_80116D5C: /* 80116D5C 00113C9C 7F A3 EB 78 */ mr r3, r29 /* 80116D60 00113CA0 4B FD 5C DD */ bl daAlink_c_NS_commonInitForceRideRein -/* 80116D64 00113CA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80116D68 00113CA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80116D64 00113CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80116D68 00113CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80116D6C 00113CAC 80 03 5D B8 */ lwz r0, 0x5db8(r3) /* 80116D70 00113CB0 7C 1E 00 40 */ cmplw r30, r0 /* 80116D74 00113CB4 40 82 00 24 */ bne lbl_80116D98 @@ -137980,8 +137980,8 @@ daAlink_c_NS_setDemoData: /* 80117200 00114140 39 61 00 90 */ addi r11, r1, 0x90 /* 80117204 00114144 48 24 AF C1 */ bl func_803621C4 /* 80117208 00114148 7C 7F 1B 78 */ mr r31, r3 -/* 8011720C 0011414C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80117210 00114150 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8011720C 0011414C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80117210 00114150 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80117214 00114154 38 00 00 00 */ li r0, 0 /* 80117218 00114158 88 7E 4F AD */ lbz r3, 0x4fad(r30) /* 8011721C 0011415C 28 03 00 00 */ cmplwi r3, 0 @@ -138018,8 +138018,8 @@ lbl_80117270: /* 80117288 001141C8 90 01 00 18 */ stw r0, 0x18(r1) /* 8011728C 001141CC 3B 00 00 00 */ li r24, 0 /* 80117290 001141D0 3A E0 00 00 */ li r23, 0 -/* 80117294 001141D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80117298 001141D8 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80117294 001141D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80117298 001141D8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8011729C 001141DC 80 1D 5F 18 */ lwz r0, 0x5f18(r29) /* 801172A0 001141E0 54 00 02 D0 */ rlwinm r0, r0, 0, 0xb, 8 /* 801172A4 001141E4 90 1D 5F 18 */ stw r0, 0x5f18(r29) @@ -138236,8 +138236,8 @@ lbl_80117584: /* 80117598 001144D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011759C 001144DC 28 00 00 01 */ cmplwi r0, 1 /* 801175A0 001144E0 41 82 00 24 */ beq lbl_801175C4 -/* 801175A4 001144E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801175A8 001144E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801175A4 001144E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801175A8 001144E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801175AC 001144EC 38 63 00 28 */ addi r3, r3, 0x28 /* 801175B0 001144F0 38 80 00 03 */ li r4, 3 /* 801175B4 001144F4 4B F1 B6 39 */ bl isTransformLV__21dSv_player_status_b_cCFi @@ -138734,8 +138734,8 @@ daAlink_c_NS_resetSpecialEvent: /* 80117C9C 00114BDC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80117CA0 00114BE0 93 C1 00 08 */ stw r30, 8(r1) /* 80117CA4 00114BE4 7C 7E 1B 78 */ mr r30, r3 -/* 80117CA8 00114BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80117CAC 00114BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80117CA8 00114BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80117CAC 00114BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80117CB0 00114BF0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80117CB4 00114BF4 4B F2 A7 B5 */ bl dEvt_control_c_NS_reset /* 80117CB8 00114BF8 28 1E 00 00 */ cmplwi r30, 0 @@ -138807,8 +138807,8 @@ lbl_80117DA0: /* 80117DA0 00114CE0 80 1C 05 70 */ lwz r0, 0x570(r28) /* 80117DA4 00114CE4 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 80117DA8 00114CE8 90 1C 05 70 */ stw r0, 0x570(r28) -/* 80117DAC 00114CEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80117DB0 00114CF0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80117DAC 00114CEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80117DB0 00114CF0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80117DB4 00114CF4 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 80117DB8 00114CF8 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a /* 80117DBC 00114CFC 90 1F 5F 18 */ stw r0, 0x5f18(r31) @@ -138939,8 +138939,8 @@ lbl_80117F68: /* 80117F7C 00114EBC 3C 63 00 01 */ addis r3, r3, 1 /* 80117F80 00114EC0 38 03 80 00 */ addi r0, r3, -32768 /* 80117F84 00114EC4 B0 1C 2F E0 */ sth r0, 0x2fe0(r28) -/* 80117F88 00114EC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80117F8C 00114ECC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80117F88 00114EC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80117F8C 00114ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80117F90 00114ED0 80 1C 31 7C */ lwz r0, 0x317c(r28) /* 80117F94 00114ED4 1C 00 00 38 */ mulli r0, r0, 0x38 /* 80117F98 00114ED8 7C 63 02 14 */ add r3, r3, r0 @@ -139048,8 +139048,8 @@ daAlink_c_NS_getDemoLookActor: /* 801180F8 00115038 80 03 06 0C */ lwz r0, 0x60c(r3) /* 801180FC 0011503C 2C 00 00 01 */ cmpwi r0, 1 /* 80118100 00115040 40 82 00 1C */ bne lbl_8011811C -/* 80118104 00115044 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118108 00115048 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118104 00115044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118108 00115048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011810C 0011504C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80118110 00115050 80 83 00 C4 */ lwz r4, 0xc4(r3) /* 80118114 00115054 4B F2 B1 D9 */ bl dEvt_control_c_NS_convPId @@ -139057,8 +139057,8 @@ daAlink_c_NS_getDemoLookActor: lbl_8011811C: /* 8011811C 0011505C 2C 00 00 02 */ cmpwi r0, 2 /* 80118120 00115060 40 82 00 1C */ bne lbl_8011813C -/* 80118124 00115064 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118128 00115068 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118124 00115064 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118128 00115068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011812C 0011506C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80118130 00115070 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 80118134 00115074 4B F2 B1 B9 */ bl dEvt_control_c_NS_convPId @@ -139336,8 +139336,8 @@ lbl_80118488: /* 801184DC 0011541C 38 7D 1D 08 */ addi r3, r29, 0x1d08 /* 801184E0 00115420 7F C4 F3 78 */ mr r4, r30 /* 801184E4 00115424 48 14 F8 45 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 801184E8 00115428 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801184EC 0011542C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801184E8 00115428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801184EC 0011542C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801184F0 00115430 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801184F4 00115434 38 9D 1D 08 */ addi r4, r29, 0x1d08 /* 801184F8 00115438 4B F5 BF A9 */ bl cBgS_NS_GroundCross @@ -139388,8 +139388,8 @@ daAlink_c_NS_setShapeAngleToTalkActor: /* 80118598 001154D8 41 82 00 A4 */ beq lbl_8011863C /* 8011859C 001154DC 2C 1F 02 C3 */ cmpwi r31, 0x2c3 /* 801185A0 001154E0 40 82 00 24 */ bne lbl_801185C4 -/* 801185A4 001154E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801185A8 001154E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801185A4 001154E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801185A8 001154E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801185AC 001154EC 88 9E 05 69 */ lbz r4, 0x569(r30) /* 801185B0 001154F0 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 801185B4 001154F4 7C 05 07 74 */ extsb r5, r0 @@ -139499,8 +139499,8 @@ daAlink_c_NS_setTradeItemAnime: /* 80118714 00115654 80 9F 06 10 */ lwz r4, 0x610(r31) /* 80118718 00115658 48 00 00 10 */ b lbl_80118728 lbl_8011871C: -/* 8011871C 0011565C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80118720 00115660 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8011871C 0011565C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80118720 00115660 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80118724 00115664 88 84 4F B6 */ lbz r4, 0x4fb6(r4) lbl_80118728: /* 80118728 00115668 38 A0 00 03 */ li r5, 3 @@ -139511,8 +139511,8 @@ lbl_80118728: /* 8011873C 0011567C 39 3F 04 EC */ addi r9, r31, 0x4ec /* 80118740 00115680 4B F0 34 A9 */ bl fopAcM_createItemForPresentDemo /* 80118744 00115684 7C 64 1B 78 */ mr r4, r3 -/* 80118748 00115688 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011874C 0011568C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118748 00115688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011874C 0011568C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118750 00115690 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80118754 00115694 4B F2 AF 99 */ bl dEvt_control_c_NS_setPtI_Id lbl_80118758: @@ -139674,8 +139674,8 @@ daAlink_c_NS_setDemoRide: /* 80118954 00115894 90 01 00 14 */ stw r0, 0x14(r1) /* 80118958 00115898 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011895C 0011589C 7C 7F 1B 78 */ mr r31, r3 -/* 80118960 001158A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118964 001158A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118960 001158A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118964 001158A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118968 001158A8 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 8011896C 001158AC 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 80118970 001158B0 28 00 00 01 */ cmplwi r0, 1 @@ -139788,8 +139788,8 @@ daAlink_c_NS_checkFinalBattle: /* 80118AF0 00115A30 4B F8 4F 71 */ bl daAlink_c_NS_checkStageName /* 80118AF4 00115A34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80118AF8 00115A38 41 82 00 24 */ beq lbl_80118B1C -/* 80118AFC 00115A3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118B00 00115A40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118AFC 00115A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118B00 00115A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118B04 00115A44 38 63 09 78 */ addi r3, r3, 0x978 /* 80118B08 00115A48 38 80 00 01 */ li r4, 1 /* 80118B0C 00115A4C 4B F1 C0 DD */ bl isSwitch__12dSv_danBit_cCFi @@ -139823,8 +139823,8 @@ daAlink_c_NS_checkRestartDead: /* 80118B6C 00115AAC A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 80118B70 00115AB0 28 00 01 50 */ cmplwi r0, 0x150 /* 80118B74 00115AB4 41 82 00 64 */ beq lbl_80118BD8 -/* 80118B78 00115AB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118B7C 00115ABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118B78 00115AB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118B7C 00115ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118B80 00115AC0 A0 03 00 02 */ lhz r0, 2(r3) /* 80118B84 00115AC4 7C 1F 00 00 */ cmpw r31, r0 /* 80118B88 00115AC8 41 80 00 50 */ blt lbl_80118BD8 @@ -139832,8 +139832,8 @@ daAlink_c_NS_checkRestartDead: /* 80118B90 00115AD0 4B FB EC 39 */ bl daAlink_c_NS_checkMagicArmorNoDamage /* 80118B94 00115AD4 2C 03 00 00 */ cmpwi r3, 0 /* 80118B98 00115AD8 40 82 00 40 */ bne lbl_80118BD8 -/* 80118B9C 00115ADC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118BA0 00115AE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118B9C 00115ADC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118BA0 00115AE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118BA4 00115AE4 38 63 00 9C */ addi r3, r3, 0x9c /* 80118BA8 00115AE8 38 80 00 6C */ li r4, 0x6c /* 80118BAC 00115AEC 4B F1 AB 35 */ bl checkBottle__17dSv_player_item_cFUc @@ -139917,8 +139917,8 @@ daAlink_c_NS_checkDeadHP: /* 80118CB4 00115BF4 7F FE FB 78 */ mr r30, r31 /* 80118CB8 00115BF8 3B A0 00 00 */ li r29, 0 /* 80118CBC 00115BFC 7F A4 EB 78 */ mr r4, r29 -/* 80118CC0 00115C00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118CC4 00115C04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118CC0 00115C00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118CC4 00115C04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118CC8 00115C08 A0 03 00 02 */ lhz r0, 2(r3) /* 80118CCC 00115C0C 28 00 00 00 */ cmplwi r0, 0 /* 80118CD0 00115C10 40 82 00 14 */ bne lbl_80118CE4 @@ -139929,8 +139929,8 @@ daAlink_c_NS_checkDeadHP: lbl_80118CE4: /* 80118CE4 00115C24 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 80118CE8 00115C28 41 82 00 24 */ beq lbl_80118D0C -/* 80118CEC 00115C2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118CF0 00115C30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118CEC 00115C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118CF0 00115C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118CF4 00115C34 38 63 00 9C */ addi r3, r3, 0x9c /* 80118CF8 00115C38 38 80 00 6C */ li r4, 0x6c /* 80118CFC 00115C3C 4B F1 A9 E5 */ bl checkBottle__17dSv_player_item_cFUc @@ -139948,8 +139948,8 @@ lbl_80118D24: /* 80118D24 00115C64 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80118D28 00115C68 40 82 00 38 */ bne lbl_80118D60 /* 80118D2C 00115C6C 38 80 00 00 */ li r4, 0 -/* 80118D30 00115C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118D34 00115C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118D30 00115C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118D34 00115C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118D38 00115C78 88 03 5E B7 */ lbz r0, 0x5eb7(r3) /* 80118D3C 00115C7C 28 00 00 00 */ cmplwi r0, 0 /* 80118D40 00115C80 41 82 00 14 */ beq lbl_80118D54 @@ -140022,8 +140022,8 @@ lbl_80118DF0: /* 80118E34 00115D74 4E 80 04 21 */ bctrl /* 80118E38 00115D78 28 03 00 00 */ cmplwi r3, 0 /* 80118E3C 00115D7C 41 82 00 2C */ beq lbl_80118E68 -/* 80118E40 00115D80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118E44 00115D84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118E40 00115D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118E44 00115D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118E48 00115D88 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 80118E4C 00115D8C 88 03 16 B4 */ lbz r0, 0x16b4(r3) /* 80118E50 00115D90 28 00 00 04 */ cmplwi r0, 4 @@ -140059,8 +140059,8 @@ lbl_80118EB0: /* 80118EBC 00115DFC 38 00 00 00 */ li r0, 0 /* 80118EC0 00115E00 98 1F 05 6A */ stb r0, 0x56a(r31) lbl_80118EC4: -/* 80118EC4 00115E04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118EC8 00115E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118EC4 00115E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118EC8 00115E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118ECC 00115E0C 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80118ED0 00115E10 7F C3 F3 78 */ mr r3, r30 /* 80118ED4 00115E14 38 9F 1A 60 */ addi r4, r31, 0x1a60 @@ -140114,8 +140114,8 @@ lbl_80118F74: /* 80118F7C 00115EBC 48 00 75 B9 */ bl daAlink_c_NS_commonFallInit /* 80118F80 00115EC0 48 00 00 60 */ b lbl_80118FE0 lbl_80118F84: -/* 80118F84 00115EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80118F88 00115EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80118F84 00115EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80118F88 00115EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118F8C 00115ECC A0 03 00 02 */ lhz r0, 2(r3) /* 80118F90 00115ED0 28 00 00 00 */ cmplwi r0, 0 /* 80118F94 00115ED4 40 82 00 48 */ bne lbl_80118FDC @@ -140159,8 +140159,8 @@ daAlink_c_NS_setHighModelBck: /* 80119018 00115F58 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 8011901C 00115F5C 38 63 61 94 */ addi r3, r3, lbl_80406194@l /* 80119020 00115F60 7C A4 2B 78 */ mr r4, r5 -/* 80119024 00115F64 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80119028 00115F68 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80119024 00115F64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80119028 00115F68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8011902C 00115F6C 3C A5 00 02 */ addis r5, r5, 2 /* 80119030 00115F70 38 C0 00 80 */ li r6, 0x80 /* 80119034 00115F74 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -140204,8 +140204,8 @@ daAlink_c_NS_setHighModelFaceBtk: /* 801190B8 00115FF8 7C 7E 1B 78 */ mr r30, r3 /* 801190BC 00115FFC 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 801190C0 00116000 38 63 61 94 */ addi r3, r3, lbl_80406194@l -/* 801190C4 00116004 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801190C8 00116008 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801190C4 00116004 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801190C8 00116008 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801190CC 0011600C 3C A5 00 02 */ addis r5, r5, 2 /* 801190D0 00116010 38 C0 00 80 */ li r6, 0x80 /* 801190D4 00116014 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -140246,8 +140246,8 @@ daAlink_c_NS_setDemoBrk: /* 80119150 00116090 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 80119154 00116094 38 63 61 94 */ addi r3, r3, lbl_80406194@l /* 80119158 00116098 7C C4 33 78 */ mr r4, r6 -/* 8011915C 0011609C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80119160 001160A0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8011915C 0011609C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80119160 001160A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80119164 001160A4 3C A5 00 02 */ addis r5, r5, 2 /* 80119168 001160A8 38 C0 00 80 */ li r6, 0x80 /* 8011916C 001160AC 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -140564,8 +140564,8 @@ lbl_801195A8: /* 801195C4 00116504 7C 08 02 A6 */ mflr r0 /* 801195C8 00116508 90 01 00 14 */ stw r0, 0x14(r1) /* 801195CC 0011650C 7C 64 1B 78 */ mr r4, r3 -/* 801195D0 00116510 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801195D4 00116514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801195D0 00116510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801195D4 00116514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801195D8 00116518 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801195DC 0011651C 80 84 31 84 */ lwz r4, 0x3184(r4) /* 801195E0 00116520 4B F2 EB 9D */ bl dEvent_manager_c_NS_cutEnd @@ -140690,8 +140690,8 @@ lbl_80119790: lbl_801197A0: /* 801197A0 001166E0 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 801197A4 001166E4 41 82 05 58 */ beq lbl_80119CFC -/* 801197A8 001166E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801197AC 001166EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801197A8 001166E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801197AC 001166EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801197B0 001166F0 3F C3 00 02 */ addis r30, r3, 2 /* 801197B4 001166F4 3B DE C2 F8 */ addi r30, r30, -15624 /* 801197B8 001166F8 48 00 05 1C */ b lbl_80119CD4 @@ -141203,8 +141203,8 @@ lbl_80119EC0: /* 80119EE0 00116E20 38 A0 00 28 */ li r5, 0x28 /* 80119EE4 00116E24 4B EF 59 65 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf lbl_80119EE8: -/* 80119EE8 00116E28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80119EEC 00116E2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80119EE8 00116E28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80119EEC 00116E2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80119EF0 00116E30 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80119EF4 00116E34 64 00 08 00 */ oris r0, r0, 0x800 /* 80119EF8 00116E38 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -141224,8 +141224,8 @@ lbl_80119F00: lbl_80119F2C: /* 80119F2C 00116E6C 38 00 00 1E */ li r0, 0x1e /* 80119F30 00116E70 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80119F34 00116E74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80119F38 00116E78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80119F34 00116E74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80119F38 00116E78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80119F3C 00116E7C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80119F40 00116E80 60 00 00 10 */ ori r0, r0, 0x10 /* 80119F44 00116E84 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -141243,8 +141243,8 @@ lbl_80119F4C: /* 80119F70 00116EB0 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80119F74 00116EB4 93 C1 00 38 */ stw r30, 0x38(r1) /* 80119F78 00116EB8 7C 7F 1B 78 */ mr r31, r3 -/* 80119F7C 00116EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80119F80 00116EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80119F7C 00116EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80119F80 00116EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80119F84 00116EC4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80119F88 00116EC8 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 80119F8C 00116ECC 41 82 00 0C */ beq lbl_80119F98 @@ -141594,8 +141594,8 @@ lbl_8011A46C: /* 8011A470 001173B0 48 04 40 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011A474 001173B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011A478 001173B8 41 82 00 30 */ beq lbl_8011A4A8 -/* 8011A47C 001173BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A480 001173C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A47C 001173BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A480 001173C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A484 001173C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011A488 001173C8 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011A48C 001173CC 4B F2 DC F1 */ bl dEvent_manager_c_NS_cutEnd @@ -141723,8 +141723,8 @@ lbl_8011A64C: /* 8011A650 00117590 4B F9 EC 05 */ bl daAlink_c_NS_checkNoUpperAnime /* 8011A654 00117594 2C 03 00 00 */ cmpwi r3, 0 /* 8011A658 00117598 41 82 00 18 */ beq lbl_8011A670 -/* 8011A65C 0011759C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A660 001175A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A65C 0011759C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A660 001175A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A664 001175A4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011A668 001175A8 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011A66C 001175AC 4B F2 DB 11 */ bl dEvent_manager_c_NS_cutEnd @@ -141761,8 +141761,8 @@ lbl_8011A6B8: /* 8011A6D4 00117614 7C 84 00 2E */ lwzx r4, r4, r0 /* 8011A6D8 00117618 48 19 4D C5 */ bl Z2SeqMgr_NS_subBgmStart /* 8011A6DC 0011761C 38 00 00 01 */ li r0, 1 -/* 8011A6E0 00117620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A6E4 00117624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A6E0 00117620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A6E4 00117624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A6E8 00117628 98 03 5E B4 */ stb r0, 0x5eb4(r3) lbl_8011A6EC: /* 8011A6EC 0011762C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -141788,8 +141788,8 @@ lbl_8011A734: /* 8011A734 00117674 38 60 00 00 */ li r3, 0 /* 8011A738 00117678 48 00 00 48 */ b lbl_8011A780 lbl_8011A73C: -/* 8011A73C 0011767C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A740 00117680 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A73C 0011767C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A740 00117680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A744 00117684 A3 E3 00 04 */ lhz r31, 4(r3) /* 8011A748 00117688 4B F1 83 61 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 8011A74C 0011768C 54 65 04 3E */ clrlwi r5, r3, 0x10 @@ -141872,8 +141872,8 @@ lbl_8011A80C: /* 8011A85C 0011779C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 8011A860 001177A0 28 00 00 40 */ cmplwi r0, 0x40 /* 8011A864 001177A4 40 82 00 34 */ bne lbl_8011A898 -/* 8011A868 001177A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A86C 001177AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A868 001177A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A86C 001177AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A870 001177B0 38 63 00 CC */ addi r3, r3, 0xcc /* 8011A874 001177B4 38 80 00 40 */ li r4, 0x40 /* 8011A878 001177B8 4B F1 96 51 */ bl isFirstBit__21dSv_player_get_item_cCFUc @@ -141908,8 +141908,8 @@ lbl_8011A8AC: /* 8011A8E0 00117820 7C 1C 03 78 */ mr r28, r0 /* 8011A8E4 00117824 48 00 00 10 */ b lbl_8011A8F4 lbl_8011A8E8: -/* 8011A8E8 00117828 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A8EC 0011782C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A8E8 00117828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A8EC 0011782C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A8F0 00117830 8B 83 4F B7 */ lbz r28, 0x4fb7(r3) lbl_8011A8F4: /* 8011A8F4 00117834 38 7D 04 D0 */ addi r3, r29, 0x4d0 @@ -141925,8 +141925,8 @@ lbl_8011A8F4: /* 8011A91C 0011785C 3C 04 00 01 */ addis r0, r4, 1 /* 8011A920 00117860 28 00 FF FF */ cmplwi r0, 0xffff /* 8011A924 00117864 41 82 00 14 */ beq lbl_8011A938 -/* 8011A928 00117868 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011A92C 0011786C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011A928 00117868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011A92C 0011786C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A930 00117870 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011A934 00117874 4B F2 8D B9 */ bl dEvt_control_c_NS_setPtI_Id lbl_8011A938: @@ -142080,8 +142080,8 @@ lbl_8011AB38: /* 8011AB44 00117A84 B0 7D 30 0E */ sth r3, 0x300e(r29) /* 8011AB48 00117A88 48 00 00 70 */ b lbl_8011ABB8 lbl_8011AB4C: -/* 8011AB4C 00117A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011AB50 00117A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011AB4C 00117A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011AB50 00117A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011AB54 00117A94 80 1D 31 7C */ lwz r0, 0x317c(r29) /* 8011AB58 00117A98 1C 00 00 38 */ mulli r0, r0, 0x38 /* 8011AB5C 00117A9C 7C 63 02 14 */ add r3, r3, r0 @@ -142119,8 +142119,8 @@ lbl_8011ABB8: /* 8011ABD4 00117B14 90 1D 32 CC */ stw r0, 0x32cc(r29) /* 8011ABD8 00117B18 B0 1D 30 12 */ sth r0, 0x3012(r29) /* 8011ABDC 00117B1C 48 08 D5 8D */ bl dKy_Itemgetcol_chg_on -/* 8011ABE0 00117B20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011ABE4 00117B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011ABE0 00117B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011ABE4 00117B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ABE8 00117B28 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8011ABEC 00117B2C 64 00 04 00 */ oris r0, r0, 0x400 /* 8011ABF0 00117B30 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -142174,8 +142174,8 @@ lbl_8011AC94: /* 8011AC9C 00117BDC 7F 83 E3 78 */ mr r3, r28 /* 8011ACA0 00117BE0 4B FD 2D 85 */ bl daAlink_c_NS_setSyncRidePos lbl_8011ACA4: -/* 8011ACA4 00117BE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011ACA8 00117BE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011ACA4 00117BE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011ACA8 00117BE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ACAC 00117BEC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011ACB0 00117BF0 80 9C 31 84 */ lwz r4, 0x3184(r28) /* 8011ACB4 00117BF4 4B F2 D4 C9 */ bl dEvent_manager_c_NS_cutEnd @@ -142326,8 +142326,8 @@ lbl_8011AE98: /* 8011AED0 00117E10 7C 04 03 78 */ mr r4, r0 /* 8011AED4 00117E14 2C 00 00 21 */ cmpwi r0, 0x21 /* 8011AED8 00117E18 40 82 00 28 */ bne lbl_8011AF00 -/* 8011AEDC 00117E1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011AEE0 00117E20 A0 A3 61 C0 */ lhz r5, lbl_804061C0@l(r3) +/* 8011AEDC 00117E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011AEE0 00117E20 A0 A3 61 C0 */ lhz r5, g_dComIfG_gameInfo@l(r3) /* 8011AEE4 00117E24 38 60 00 05 */ li r3, 5 /* 8011AEE8 00117E28 7C 05 1B D6 */ divw r0, r5, r3 /* 8011AEEC 00117E2C 7C 00 19 D6 */ mullw r0, r0, r3 @@ -142397,8 +142397,8 @@ lbl_8011AFC8: /* 8011AFD0 00117F10 80 1C 06 10 */ lwz r0, 0x610(r28) /* 8011AFD4 00117F14 2C 00 00 01 */ cmpwi r0, 1 /* 8011AFD8 00117F18 40 82 03 FC */ bne lbl_8011B3D4 -/* 8011AFDC 00117F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011AFE0 00117F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011AFDC 00117F1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011AFE0 00117F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011AFE4 00117F24 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011AFE8 00117F28 80 9C 31 84 */ lwz r4, 0x3184(r28) /* 8011AFEC 00117F2C 4B F2 D1 91 */ bl dEvent_manager_c_NS_cutEnd @@ -142413,8 +142413,8 @@ lbl_8011AFF4: /* 8011B00C 00117F4C 80 1C 31 A0 */ lwz r0, 0x31a0(r28) /* 8011B010 00117F50 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 8011B014 00117F54 41 82 00 18 */ beq lbl_8011B02C -/* 8011B018 00117F58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B01C 00117F5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B018 00117F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B01C 00117F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B020 00117F60 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B024 00117F64 80 9C 31 84 */ lwz r4, 0x3184(r28) /* 8011B028 00117F68 4B F2 D1 55 */ bl dEvent_manager_c_NS_cutEnd @@ -142436,8 +142436,8 @@ lbl_8011B02C: /* 8011B064 00117FA4 80 1C 06 10 */ lwz r0, 0x610(r28) /* 8011B068 00117FA8 2C 00 00 01 */ cmpwi r0, 1 /* 8011B06C 00117FAC 40 82 00 78 */ bne lbl_8011B0E4 -/* 8011B070 00117FB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B074 00117FB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B070 00117FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B074 00117FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B078 00117FB8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B07C 00117FBC 80 9C 31 84 */ lwz r4, 0x3184(r28) /* 8011B080 00117FC0 4B F2 D0 FD */ bl dEvent_manager_c_NS_cutEnd @@ -142512,8 +142512,8 @@ lbl_8011B17C: /* 8011B17C 001180BC A8 9C 30 0C */ lha r4, 0x300c(r28) /* 8011B180 001180C0 2C 04 00 E0 */ cmpwi r4, 0xe0 /* 8011B184 001180C4 40 82 00 44 */ bne lbl_8011B1C8 -/* 8011B188 001180C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B18C 001180CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B188 001180C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B18C 001180CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B190 001180D0 88 03 01 0C */ lbz r0, 0x10c(r3) /* 8011B194 001180D4 28 00 00 14 */ cmplwi r0, 0x14 /* 8011B198 001180D8 40 82 00 10 */ bne lbl_8011B1A8 @@ -142533,8 +142533,8 @@ lbl_8011B1BC: lbl_8011B1C8: /* 8011B1C8 00118108 2C 04 00 21 */ cmpwi r4, 0x21 /* 8011B1CC 0011810C 40 82 00 30 */ bne lbl_8011B1FC -/* 8011B1D0 00118110 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B1D4 00118114 A0 83 61 C0 */ lhz r4, lbl_804061C0@l(r3) +/* 8011B1D0 00118110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B1D4 00118114 A0 83 61 C0 */ lhz r4, g_dComIfG_gameInfo@l(r3) /* 8011B1D8 00118118 38 60 00 05 */ li r3, 5 /* 8011B1DC 0011811C 7C 04 1B D6 */ divw r0, r4, r3 /* 8011B1E0 00118120 7C 00 19 D6 */ mullw r0, r0, r3 @@ -142576,8 +142576,8 @@ lbl_8011B234: /* 8011B264 001181A4 41 80 00 44 */ blt lbl_8011B2A8 /* 8011B268 001181A8 2C 00 00 D7 */ cmpwi r0, 0xd7 /* 8011B26C 001181AC 41 81 00 3C */ bgt lbl_8011B2A8 -/* 8011B270 001181B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B274 001181B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B270 001181B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B274 001181B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B278 001181B8 38 63 00 CC */ addi r3, r3, 0xcc /* 8011B27C 001181BC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8011B280 001181C0 4B F1 8C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc @@ -142616,8 +142616,8 @@ lbl_8011B2E8: /* 8011B2FC 0011823C 38 60 00 01 */ li r3, 1 /* 8011B300 00118240 48 00 00 D8 */ b lbl_8011B3D8 lbl_8011B304: -/* 8011B304 00118244 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B308 00118248 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B304 00118244 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B308 00118248 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B30C 0011824C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B310 00118250 80 9C 31 84 */ lwz r4, 0x3184(r28) /* 8011B314 00118254 4B F2 CE 69 */ bl dEvent_manager_c_NS_cutEnd @@ -142753,8 +142753,8 @@ lbl_8011B4EC: /* 8011B4EC 0011842C 38 00 00 01 */ li r0, 1 /* 8011B4F0 00118430 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_8011B4F4: -/* 8011B4F4 00118434 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B4F8 00118438 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B4F4 00118434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B4F8 00118438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B4FC 0011843C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B500 00118440 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011B504 00118444 4B F2 CC 79 */ bl dEvent_manager_c_NS_cutEnd @@ -142763,8 +142763,8 @@ lbl_8011B50C: /* 8011B50C 0011844C A8 1E 30 0C */ lha r0, 0x300c(r30) /* 8011B510 00118450 2C 00 00 00 */ cmpwi r0, 0 /* 8011B514 00118454 41 82 00 1C */ beq lbl_8011B530 -/* 8011B518 00118458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B51C 0011845C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B518 00118458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B51C 0011845C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B520 00118460 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B524 00118464 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011B528 00118468 4B F2 CC 55 */ bl dEvent_manager_c_NS_cutEnd @@ -142988,8 +142988,8 @@ lbl_8011B840: /* 8011B84C 0011878C 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 8011B850 00118790 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 /* 8011B854 00118794 90 1F 19 9C */ stw r0, 0x199c(r31) -/* 8011B858 00118798 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B85C 0011879C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B858 00118798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B85C 0011879C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B860 001187A0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B864 001187A4 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011B868 001187A8 4B F2 C9 15 */ bl dEvent_manager_c_NS_cutEnd @@ -143027,8 +143027,8 @@ lbl_8011B8D8: /* 8011B8DC 0011881C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 8011B8E0 00118820 48 00 00 18 */ b lbl_8011B8F8 lbl_8011B8E4: -/* 8011B8E4 00118824 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011B8E8 00118828 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011B8E4 00118824 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011B8E8 00118828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B8EC 0011882C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B8F0 00118830 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011B8F4 00118834 4B F2 C8 89 */ bl dEvent_manager_c_NS_cutEnd @@ -143149,8 +143149,8 @@ lbl_8011BA7C: /* 8011BA88 001189C8 38 E0 01 00 */ li r7, 0x100 /* 8011BA8C 001189CC 48 15 4A B5 */ bl cLib_addCalcAngleS lbl_8011BA90: -/* 8011BA90 001189D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011BA94 001189D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011BA90 001189D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011BA94 001189D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BA98 001189D8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BA9C 001189DC 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011BAA0 001189E0 4B F2 C6 DD */ bl dEvent_manager_c_NS_cutEnd @@ -143334,8 +143334,8 @@ lbl_8011BD04: /* 8011BD20 00118C60 90 01 00 14 */ stw r0, 0x14(r1) /* 8011BD24 00118C64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BD28 00118C68 7C 7F 1B 78 */ mr r31, r3 -/* 8011BD2C 00118C6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011BD30 00118C70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011BD2C 00118C6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011BD30 00118C70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BD34 00118C74 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BD38 00118C78 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011BD3C 00118C7C 4B F2 C4 41 */ bl dEvent_manager_c_NS_cutEnd @@ -143391,8 +143391,8 @@ lbl_8011BDDC: /* 8011BDF8 00118D38 90 01 00 14 */ stw r0, 0x14(r1) /* 8011BDFC 00118D3C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BE00 00118D40 7C 7F 1B 78 */ mr r31, r3 -/* 8011BE04 00118D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011BE08 00118D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011BE04 00118D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011BE08 00118D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BE0C 00118D4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BE10 00118D50 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011BE14 00118D54 4B F2 C3 69 */ bl dEvent_manager_c_NS_cutEnd @@ -143429,8 +143429,8 @@ daAlink_c_NS_procCoDeadInit: /* 8011BE80 00118DC0 38 60 00 01 */ li r3, 1 /* 8011BE84 00118DC4 48 00 03 18 */ b lbl_8011C19C lbl_8011BE88: -/* 8011BE88 00118DC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011BE8C 00118DCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011BE88 00118DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011BE8C 00118DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BE90 00118DD0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011BE94 00118DD4 7F C4 F3 78 */ mr r4, r30 /* 8011BE98 00118DD8 38 A0 00 00 */ li r5, 0 @@ -143496,8 +143496,8 @@ lbl_8011BF50: /* 8011BF74 00118EB4 7F C3 F3 78 */ mr r3, r30 /* 8011BF78 00118EB8 38 80 00 9D */ li r4, 0x9d /* 8011BF7C 00118EBC 4B F9 39 25 */ bl daAlink_c_NS_setFaceBasicTexture -/* 8011BF80 00118EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011BF84 00118EC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011BF80 00118EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011BF84 00118EC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BF88 00118EC8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011BF8C 00118ECC 64 00 00 10 */ oris r0, r0, 0x10 /* 8011BF90 00118ED0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -143555,8 +143555,8 @@ lbl_8011C03C: /* 8011C04C 00118F8C 4E 80 04 21 */ bctrl /* 8011C050 00118F90 28 03 00 00 */ cmplwi r3, 0 /* 8011C054 00118F94 41 82 00 30 */ beq lbl_8011C084 -/* 8011C058 00118F98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C05C 00118F9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C058 00118F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C05C 00118F9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C060 00118FA0 80 83 5D B8 */ lwz r4, 0x5db8(r3) /* 8011C064 00118FA4 38 00 00 03 */ li r0, 3 /* 8011C068 00118FA8 98 04 16 B8 */ stb r0, 0x16b8(r4) @@ -143583,8 +143583,8 @@ lbl_8011C0B0: /* 8011C0B0 00118FF0 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 8011C0B4 00118FF4 41 82 00 50 */ beq lbl_8011C104 /* 8011C0B8 00118FF8 3B E0 01 18 */ li r31, 0x118 -/* 8011C0BC 00118FFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C0C0 00119000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C0BC 00118FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C0C0 00119000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C0C4 00119004 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011C0C8 00119008 64 00 00 10 */ oris r0, r0, 0x10 /* 8011C0CC 0011900C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -143626,8 +143626,8 @@ lbl_8011C14C: /* 8011C14C 0011908C 38 80 00 00 */ li r4, 0 /* 8011C150 00119090 B0 9E 30 0E */ sth r4, 0x300e(r30) /* 8011C154 00119094 B0 9E 30 08 */ sth r4, 0x3008(r30) -/* 8011C158 00119098 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C15C 0011909C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C158 00119098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C15C 0011909C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C160 001190A0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011C164 001190A4 64 00 20 00 */ oris r0, r0, 0x2000 /* 8011C168 001190A8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -143825,8 +143825,8 @@ lbl_8011C41C: /* 8011C41C 0011935C A8 1D 30 0C */ lha r0, 0x300c(r29) /* 8011C420 00119360 2C 00 00 00 */ cmpwi r0, 0 /* 8011C424 00119364 41 82 01 EC */ beq lbl_8011C610 -/* 8011C428 00119368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C42C 0011936C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8011C428 00119368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C42C 0011936C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8011C430 00119370 88 04 5E 89 */ lbz r0, 0x5e89(r4) /* 8011C434 00119374 28 00 00 02 */ cmplwi r0, 2 /* 8011C438 00119378 40 82 01 D8 */ bne lbl_8011C610 @@ -143898,8 +143898,8 @@ lbl_8011C524: /* 8011C52C 0011946C 41 82 00 88 */ beq lbl_8011C5B4 /* 8011C530 00119470 2C 1C 00 32 */ cmpwi r28, 0x32 /* 8011C534 00119474 40 82 00 20 */ bne lbl_8011C554 -/* 8011C538 00119478 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C53C 0011947C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C538 00119478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C53C 0011947C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C540 00119480 38 63 09 58 */ addi r3, r3, 0x958 /* 8011C544 00119484 38 80 00 03 */ li r4, 3 /* 8011C548 00119488 4B F1 83 ED */ bl isDungeonItem__12dSv_memBit_cCFi @@ -143908,8 +143908,8 @@ lbl_8011C524: lbl_8011C554: /* 8011C554 00119494 2C 1C 00 33 */ cmpwi r28, 0x33 /* 8011C558 00119498 40 82 00 20 */ bne lbl_8011C578 -/* 8011C55C 0011949C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C560 001194A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C55C 0011949C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C560 001194A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C564 001194A4 38 63 09 58 */ addi r3, r3, 0x958 /* 8011C568 001194A8 38 80 00 07 */ li r4, 7 /* 8011C56C 001194AC 4B F1 83 C9 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -143922,8 +143922,8 @@ lbl_8011C578: /* 8011C584 001194C4 4B F8 14 DD */ bl daAlink_c_NS_checkStageName /* 8011C588 001194C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011C58C 001194CC 41 82 00 28 */ beq lbl_8011C5B4 -/* 8011C590 001194D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C594 001194D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C590 001194D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C594 001194D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C598 001194D8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8011C59C 001194DC 38 80 28 80 */ li r4, 0x2880 /* 8011C5A0 001194E0 4B F1 84 1D */ bl isEventBit__11dSv_event_cCFUs @@ -144070,8 +144070,8 @@ lbl_8011C79C: /* 8011C7A0 001196E0 48 04 1D 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011C7A4 001196E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011C7A8 001196E8 41 82 00 1C */ beq lbl_8011C7C4 -/* 8011C7AC 001196EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011C7B0 001196F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011C7AC 001196EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011C7B0 001196F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C7B4 001196F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011C7B8 001196F8 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011C7BC 001196FC 4B F2 B9 C1 */ bl dEvent_manager_c_NS_cutEnd @@ -144263,8 +144263,8 @@ lbl_8011CA38: /* 8011CA68 001199A8 38 00 00 04 */ li r0, 4 /* 8011CA6C 001199AC 98 04 2F 99 */ stb r0, 0x2f99(r4) lbl_8011CA70: -/* 8011CA70 001199B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011CA74 001199B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011CA70 001199B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011CA74 001199B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CA78 001199B8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CA7C 001199BC 80 84 31 84 */ lwz r4, 0x3184(r4) /* 8011CA80 001199C0 4B F2 B6 FD */ bl dEvent_manager_c_NS_cutEnd @@ -144345,8 +144345,8 @@ lbl_8011CB9C: /* 8011CB9C 00119ADC A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011CBA0 00119AE0 2C 00 00 00 */ cmpwi r0, 0 /* 8011CBA4 00119AE4 41 82 00 18 */ beq lbl_8011CBBC -/* 8011CBA8 00119AE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011CBAC 00119AEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011CBA8 00119AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011CBAC 00119AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CBB0 00119AF0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CBB4 00119AF4 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011CBB8 00119AF8 4B F2 B5 C5 */ bl dEvent_manager_c_NS_cutEnd @@ -144426,8 +144426,8 @@ lbl_8011CC94: /* 8011CCD4 00119C14 48 04 17 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011CCD8 00119C18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011CCDC 00119C1C 41 82 00 E8 */ beq lbl_8011CDC4 -/* 8011CCE0 00119C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011CCE4 00119C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011CCE0 00119C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011CCE4 00119C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CCE8 00119C28 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CCEC 00119C2C 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011CCF0 00119C30 4B F2 B4 8D */ bl dEvent_manager_c_NS_cutEnd @@ -144794,8 +144794,8 @@ lbl_8011D230: /* 8011D230 0011A170 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011D234 0011A174 2C 00 00 00 */ cmpwi r0, 0 /* 8011D238 0011A178 41 82 00 18 */ beq lbl_8011D250 -/* 8011D23C 0011A17C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D240 0011A180 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D23C 0011A17C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D240 0011A180 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D244 0011A184 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D248 0011A188 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011D24C 0011A18C 4B F2 AF 31 */ bl dEvent_manager_c_NS_cutEnd @@ -144923,8 +144923,8 @@ lbl_8011D40C: /* 8011D40C 0011A34C A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011D410 0011A350 2C 00 00 00 */ cmpwi r0, 0 /* 8011D414 0011A354 41 82 00 18 */ beq lbl_8011D42C -/* 8011D418 0011A358 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D41C 0011A35C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D418 0011A358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D41C 0011A35C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D420 0011A360 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D424 0011A364 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011D428 0011A368 4B F2 AD 55 */ bl dEvent_manager_c_NS_cutEnd @@ -144992,8 +144992,8 @@ lbl_8011D50C: /* 8011D50C 0011A44C A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011D510 0011A450 2C 00 00 00 */ cmpwi r0, 0 /* 8011D514 0011A454 41 82 00 18 */ beq lbl_8011D52C -/* 8011D518 0011A458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D51C 0011A45C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D518 0011A458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D51C 0011A45C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D520 0011A460 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D524 0011A464 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011D528 0011A468 4B F2 AC 55 */ bl dEvent_manager_c_NS_cutEnd @@ -145103,8 +145103,8 @@ lbl_8011D698: /* 8011D698 0011A5D8 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011D69C 0011A5DC 2C 00 00 00 */ cmpwi r0, 0 /* 8011D6A0 0011A5E0 41 82 00 18 */ beq lbl_8011D6B8 -/* 8011D6A4 0011A5E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D6A8 0011A5E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D6A4 0011A5E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D6A8 0011A5E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D6AC 0011A5EC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D6B0 0011A5F0 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011D6B4 0011A5F4 4B F2 AA C9 */ bl dEvent_manager_c_NS_cutEnd @@ -145193,8 +145193,8 @@ lbl_8011D7C0: /* 8011D7EC 0011A72C 48 04 0C E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011D7F0 0011A730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D7F4 0011A734 41 82 00 18 */ beq lbl_8011D80C -/* 8011D7F8 0011A738 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D7FC 0011A73C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D7F8 0011A738 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D7FC 0011A73C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D800 0011A740 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D804 0011A744 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011D808 0011A748 4B F2 A9 75 */ bl dEvent_manager_c_NS_cutEnd @@ -145270,8 +145270,8 @@ lbl_8011D8E4: /* 8011D914 0011A854 A8 03 30 0E */ lha r0, 0x300e(r3) /* 8011D918 0011A858 2C 00 00 00 */ cmpwi r0, 0 /* 8011D91C 0011A85C 41 82 00 20 */ beq lbl_8011D93C -/* 8011D920 0011A860 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011D924 0011A864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011D920 0011A860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011D924 0011A864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D928 0011A868 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D92C 0011A86C 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011D930 0011A870 4B F2 A8 4D */ bl dEvent_manager_c_NS_cutEnd @@ -145444,14 +145444,14 @@ lbl_8011DB88: /* 8011DBA8 0011AAE8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8011DBAC 0011AAEC 93 C1 00 38 */ stw r30, 0x38(r1) /* 8011DBB0 0011AAF0 7C 7E 1B 78 */ mr r30, r3 -/* 8011DBB4 0011AAF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011DBB8 0011AAF8 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8011DBB4 0011AAF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011DBB8 0011AAF8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8011DBBC 0011AAFC 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 8011DBC0 0011AB00 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011DBC4 0011AB04 4B F2 A5 B9 */ bl dEvent_manager_c_NS_cutEnd /* 8011DBC8 0011AB08 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8011DBCC 0011AB0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8011DBD0 0011AB10 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8011DBCC 0011AB0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8011DBD0 0011AB10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8011DBD4 0011AB14 80 84 4F 8C */ lwz r4, 0x4f8c(r4) /* 8011DBD8 0011AB18 4B F2 57 15 */ bl dEvt_control_c_NS_convPId /* 8011DBDC 0011AB1C 7C 7F 1B 79 */ or. r31, r3, r3 @@ -145674,8 +145674,8 @@ lbl_8011DEC4: /* 8011DEF8 0011AE38 48 04 05 D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011DEFC 0011AE3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011DF00 0011AE40 41 82 00 1C */ beq lbl_8011DF1C -/* 8011DF04 0011AE44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011DF08 0011AE48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011DF04 0011AE44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011DF08 0011AE48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011DF0C 0011AE4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011DF10 0011AE50 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011DF14 0011AE54 4B F2 A2 69 */ bl dEvent_manager_c_NS_cutEnd @@ -145733,8 +145733,8 @@ lbl_8011DFCC: lbl_8011DFD4: /* 8011DFD4 0011AF14 38 00 00 00 */ li r0, 0 /* 8011DFD8 0011AF18 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8011DFDC 0011AF1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011DFE0 0011AF20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011DFDC 0011AF1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011DFE0 0011AF20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011DFE4 0011AF24 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011DFE8 0011AF28 60 00 00 10 */ ori r0, r0, 0x10 /* 8011DFEC 0011AF2C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -145934,8 +145934,8 @@ lbl_8011E294: /* 8011E2A8 0011B1E8 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 8011E2AC 0011B1EC 2C 00 00 01 */ cmpwi r0, 1 /* 8011E2B0 0011B1F0 40 82 00 1C */ bne lbl_8011E2CC -/* 8011E2B4 0011B1F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E2B8 0011B1F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E2B4 0011B1F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E2B8 0011B1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E2BC 0011B1FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E2C0 0011B200 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011E2C4 0011B204 4B F2 9E B9 */ bl dEvent_manager_c_NS_cutEnd @@ -145985,8 +145985,8 @@ lbl_8011E350: /* 8011E360 0011B2A0 60 00 01 00 */ ori r0, r0, 0x100 /* 8011E364 0011B2A4 90 1F 05 84 */ stw r0, 0x584(r31) lbl_8011E368: -/* 8011E368 0011B2A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E36C 0011B2AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E368 0011B2A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E36C 0011B2AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E370 0011B2B0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E374 0011B2B4 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011E378 0011B2B8 4B F2 9E 05 */ bl dEvent_manager_c_NS_cutEnd @@ -146061,8 +146061,8 @@ daAlink_c_NS_procNotUseItemInit: /* 8011E458 0011B398 48 24 3D 85 */ bl _savegpr_29 /* 8011E45C 0011B39C 7C 7F 1B 78 */ mr r31, r3 /* 8011E460 0011B3A0 7C 9D 23 78 */ mr r29, r4 -/* 8011E464 0011B3A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E468 0011B3A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E464 0011B3A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E468 0011B3A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E46C 0011B3AC 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011E470 0011B3B0 7F E4 FB 78 */ mr r4, r31 /* 8011E474 0011B3B4 38 A0 00 00 */ li r5, 0 @@ -146111,8 +146111,8 @@ lbl_8011E4F0: /* 8011E518 0011B458 4B F6 A5 65 */ bl dCamera_c_NS_StartEventCamera /* 8011E51C 0011B45C 7F E3 FB 78 */ mr r3, r31 /* 8011E520 0011B460 4B FA 13 35 */ bl daAlink_c_NS_keepItemData -/* 8011E524 0011B464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E528 0011B468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E524 0011B464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E528 0011B468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E52C 0011B46C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8011E530 0011B470 64 00 04 00 */ oris r0, r0, 0x400 /* 8011E534 0011B474 60 00 08 00 */ ori r0, r0, 0x800 @@ -146155,8 +146155,8 @@ lbl_8011E564: /* 8011E5BC 0011B4FC 39 3F 04 EC */ addi r9, r31, 0x4ec /* 8011E5C0 0011B500 4B EF D6 29 */ bl fopAcM_createItemForPresentDemo /* 8011E5C4 0011B504 7C 64 1B 78 */ mr r4, r3 -/* 8011E5C8 0011B508 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E5CC 0011B50C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E5C8 0011B508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E5CC 0011B50C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E5D0 0011B510 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011E5D4 0011B514 4B F2 51 19 */ bl dEvt_control_c_NS_setPtI_Id /* 8011E5D8 0011B518 38 00 00 01 */ li r0, 1 @@ -146289,8 +146289,8 @@ lbl_8011E734: lbl_8011E7AC: /* 8011E7AC 0011B6EC 38 00 00 01 */ li r0, 1 /* 8011E7B0 0011B6F0 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8011E7B4 0011B6F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E7B8 0011B6F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E7B4 0011B6F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E7B8 0011B6F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E7BC 0011B6FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E7C0 0011B700 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011E7C4 0011B704 4B F2 99 B9 */ bl dEvent_manager_c_NS_cutEnd @@ -146299,8 +146299,8 @@ lbl_8011E7CC: /* 8011E7CC 0011B70C A8 1E 30 0C */ lha r0, 0x300c(r30) /* 8011E7D0 0011B710 2C 00 00 00 */ cmpwi r0, 0 /* 8011E7D4 0011B714 41 82 00 1C */ beq lbl_8011E7F0 -/* 8011E7D8 0011B718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011E7DC 0011B71C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011E7D8 0011B718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011E7DC 0011B71C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E7E0 0011B720 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E7E4 0011B724 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011E7E8 0011B728 4B F2 99 95 */ bl dEvent_manager_c_NS_cutEnd @@ -146562,8 +146562,8 @@ lbl_8011EB78: /* 8011EBA4 0011BAE4 48 03 F9 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011EBA8 0011BAE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011EBAC 0011BAEC 41 82 00 18 */ beq lbl_8011EBC4 -/* 8011EBB0 0011BAF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011EBB4 0011BAF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011EBB0 0011BAF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011EBB4 0011BAF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EBB8 0011BAF8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EBBC 0011BAFC 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8011EBC0 0011BB00 4B F2 95 BD */ bl dEvent_manager_c_NS_cutEnd @@ -146619,8 +146619,8 @@ lbl_8011EC4C: /* 8011EC7C 0011BBBC A8 03 30 0C */ lha r0, 0x300c(r3) /* 8011EC80 0011BBC0 2C 00 00 00 */ cmpwi r0, 0 /* 8011EC84 0011BBC4 41 82 00 1C */ beq lbl_8011ECA0 -/* 8011EC88 0011BBC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011EC8C 0011BBCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011EC88 0011BBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011EC8C 0011BBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EC90 0011BBD0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EC94 0011BBD4 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011EC98 0011BBD8 4B F2 94 E5 */ bl dEvent_manager_c_NS_cutEnd @@ -146636,8 +146636,8 @@ lbl_8011ECA0: /* 8011ECBC 0011BBFC 38 80 01 90 */ li r4, 0x190 /* 8011ECC0 0011BC00 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 8011ECC4 0011BC04 4B F8 E2 ED */ bl daAlink_c_NS_setSingleAnimeBaseMorf -/* 8011ECC8 0011BC08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011ECCC 0011BC0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011ECC8 0011BC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011ECCC 0011BC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ECD0 0011BC10 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011ECD4 0011BC14 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011ECD8 0011BC18 4B F2 94 A5 */ bl dEvent_manager_c_NS_cutEnd @@ -146700,8 +146700,8 @@ lbl_8011ED78: /* 8011EDAC 0011BCEC 48 03 F7 21 */ bl daPy_frameCtrl_c_NS_checkAnmEnd /* 8011EDB0 0011BCF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011EDB4 0011BCF4 41 82 00 1C */ beq lbl_8011EDD0 -/* 8011EDB8 0011BCF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011EDBC 0011BCFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011EDB8 0011BCF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011EDBC 0011BCFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EDC0 0011BD00 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EDC4 0011BD04 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8011EDC8 0011BD08 4B F2 93 B5 */ bl dEvent_manager_c_NS_cutEnd @@ -146772,8 +146772,8 @@ daAlink_c_NS_procDungeonWarpReadyInit: /* 8011EEA0 0011BDE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011EEA4 0011BDE4 93 C1 00 08 */ stw r30, 8(r1) /* 8011EEA8 0011BDE8 7C 7E 1B 78 */ mr r30, r3 -/* 8011EEAC 0011BDEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011EEB0 0011BDF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011EEAC 0011BDEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011EEB0 0011BDF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EEB4 0011BDF4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011EEB8 0011BDF8 7F C4 F3 78 */ mr r4, r30 /* 8011EEBC 0011BDFC 38 A0 00 00 */ li r5, 0 @@ -146988,8 +146988,8 @@ lbl_8011F1B4: /* 8011F1C0 0011C100 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8011F1C4 0011C104 2C 00 00 00 */ cmpwi r0, 0 /* 8011F1C8 0011C108 40 82 00 54 */ bne lbl_8011F21C -/* 8011F1CC 0011C10C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F1D0 0011C110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F1CC 0011C10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F1D0 0011C110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F1D4 0011C114 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8011F1D8 0011C118 38 80 00 00 */ li r4, 0 /* 8011F1DC 0011C11C 90 81 00 08 */ stw r4, 8(r1) @@ -147030,11 +147030,11 @@ lbl_8011F21C: /* 8011F264 0011C1A4 90 1F 05 70 */ stw r0, 0x570(r31) /* 8011F268 0011C1A8 38 60 00 25 */ li r3, 0x25 /* 8011F26C 0011C1AC 38 80 00 01 */ li r4, 1 -/* 8011F270 0011C1B0 4B F7 8C 71 */ bl checkItemGet +/* 8011F270 0011C1B0 4B F7 8C 71 */ bl checkItemGet__FUci /* 8011F274 0011C1B4 2C 03 00 00 */ cmpwi r3, 0 /* 8011F278 0011C1B8 41 82 00 4C */ beq lbl_8011F2C4 -/* 8011F27C 0011C1BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F280 0011C1C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F27C 0011C1BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F280 0011C1C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F284 0011C1C4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8011F288 0011C1C8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8011F28C 0011C1CC 7D 89 03 A6 */ mtctr r12 @@ -147363,8 +147363,8 @@ lbl_8011F70C: /* 8011F730 0011C670 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8011F734 0011C674 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 8011F738 0011C678 40 82 00 68 */ bne lbl_8011F7A0 -/* 8011F73C 0011C67C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F740 0011C680 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F73C 0011C67C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F740 0011C680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F744 0011C684 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011F748 0011C688 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8011F74C 0011C68C 40 82 00 54 */ bne lbl_8011F7A0 @@ -147385,8 +147385,8 @@ lbl_8011F780: /* 8011F780 0011C6C0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8011F784 0011C6C4 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8011F788 0011C6C8 40 82 00 18 */ bne lbl_8011F7A0 -/* 8011F78C 0011C6CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F790 0011C6D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F78C 0011C6CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F790 0011C6D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F794 0011C6D4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8011F798 0011C6D8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8011F79C 0011C6DC 41 82 00 18 */ beq lbl_8011F7B4 @@ -147430,8 +147430,8 @@ daAlink_c_NS_dungeonReturnWarp: /* 8011F81C 0011C75C 7C 64 1B 78 */ mr r4, r3 /* 8011F820 0011C760 38 61 00 10 */ addi r3, r1, 0x10 /* 8011F824 0011C764 48 24 93 09 */ bl strcpy -/* 8011F828 0011C768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F82C 0011C76C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F828 0011C768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F82C 0011C76C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F830 0011C770 3B E3 0D B4 */ addi r31, r3, 0xdb4 /* 8011F834 0011C774 7F E3 FB 78 */ mr r3, r31 /* 8011F838 0011C778 38 81 00 18 */ addi r4, r1, 0x18 @@ -147510,8 +147510,8 @@ lbl_8011F934: /* 8011F954 0011C894 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8011F958 0011C898 38 A3 01 88 */ addi r5, r3, lbl_80430188@l /* 8011F95C 0011C89C 38 85 00 40 */ addi r4, r5, 0x40 -/* 8011F960 0011C8A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011F964 0011C8A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011F960 0011C8A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011F964 0011C8A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011F968 0011C8A8 38 63 0E D8 */ addi r3, r3, 0xed8 /* 8011F96C 0011C8AC 88 A5 00 50 */ lbz r5, 0x50(r5) /* 8011F970 0011C8B0 88 1E 00 4E */ lbz r0, 0x4e(r30) @@ -147565,8 +147565,8 @@ daAlink_c_NS_checkWarpStart: /* 8011FA1C 0011C95C 41 82 01 8C */ beq lbl_8011FBA8 /* 8011FA20 0011C960 28 00 00 03 */ cmplwi r0, 3 /* 8011FA24 0011C964 41 82 00 2C */ beq lbl_8011FA50 -/* 8011FA28 0011C968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011FA2C 0011C96C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011FA28 0011C968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011FA2C 0011C96C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011FA30 0011C970 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8011FA34 0011C974 7F C4 F3 78 */ mr r4, r30 /* 8011FA38 0011C978 38 A0 00 00 */ li r5, 0 @@ -147649,8 +147649,8 @@ lbl_8011FB44: /* 8011FB4C 0011CA8C 88 1D 00 C0 */ lbz r0, 0xc0(r29) /* 8011FB50 0011CA90 28 00 00 01 */ cmplwi r0, 1 /* 8011FB54 0011CA94 40 82 00 40 */ bne lbl_8011FB94 -/* 8011FB58 0011CA98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011FB5C 0011CA9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011FB58 0011CA98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011FB5C 0011CA9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011FB60 0011CAA0 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8011FB64 0011CAA4 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8011FB68 0011CAA8 7D 89 03 A6 */ mtctr r12 @@ -147929,8 +147929,8 @@ lbl_8011FF30: /* 8011FF48 0011CE88 2C 00 00 32 */ cmpwi r0, 0x32 /* 8011FF4C 0011CE8C 40 82 00 CC */ bne lbl_80120018 /* 8011FF50 0011CE90 38 61 00 08 */ addi r3, r1, 8 -/* 8011FF54 0011CE94 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8011FF58 0011CE98 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8011FF54 0011CE94 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8011FF58 0011CE98 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8011FF5C 0011CE9C 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8011FF60 0011CEA0 48 24 8B CD */ bl strcpy /* 8011FF64 0011CEA4 38 C0 00 00 */ li r6, 0 @@ -147957,12 +147957,12 @@ lbl_8011FFA4: lbl_8011FFB0: /* 8011FFB0 0011CEF0 38 60 00 25 */ li r3, 0x25 /* 8011FFB4 0011CEF4 38 80 00 01 */ li r4, 1 -/* 8011FFB8 0011CEF8 4B F7 7F 29 */ bl checkItemGet +/* 8011FFB8 0011CEF8 4B F7 7F 29 */ bl checkItemGet__FUci /* 8011FFBC 0011CEFC 2C 03 00 00 */ cmpwi r3, 0 /* 8011FFC0 0011CF00 40 82 00 30 */ bne lbl_8011FFF0 /* 8011FFC4 0011CF04 38 60 00 27 */ li r3, 0x27 /* 8011FFC8 0011CF08 38 80 00 01 */ li r4, 1 -/* 8011FFCC 0011CF0C 4B F7 7F 15 */ bl checkItemGet +/* 8011FFCC 0011CF0C 4B F7 7F 15 */ bl checkItemGet__FUci /* 8011FFD0 0011CF10 2C 03 00 00 */ cmpwi r3, 0 /* 8011FFD4 0011CF14 41 82 00 44 */ beq lbl_80120018 /* 8011FFD8 0011CF18 4B F0 F2 D5 */ bl dComIfGs_getWarpStageName @@ -147972,14 +147972,14 @@ lbl_8011FFB0: /* 8011FFE8 0011CF28 2C 03 00 00 */ cmpwi r3, 0 /* 8011FFEC 0011CF2C 40 82 00 2C */ bne lbl_80120018 lbl_8011FFF0: -/* 8011FFF0 0011CF30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8011FFF4 0011CF34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8011FFF0 0011CF30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8011FFF4 0011CF34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011FFF8 0011CF38 38 63 00 9C */ addi r3, r3, 0x9c /* 8011FFFC 0011CF3C 38 80 00 12 */ li r4, 0x12 /* 80120000 0011CF40 38 A0 00 FF */ li r5, 0xff /* 80120004 0011CF44 4B F1 2F B5 */ bl setItem__17dSv_player_item_cFiUc -/* 80120008 0011CF48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012000C 0011CF4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80120008 0011CF48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012000C 0011CF4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80120010 0011CF50 38 00 FF FF */ li r0, -1 /* 80120014 0011CF54 98 03 00 98 */ stb r0, 0x98(r3) lbl_80120018: @@ -148183,8 +148183,8 @@ lbl_8012029C: /* 801202E0 0011D220 90 01 00 08 */ stw r0, 8(r1) /* 801202E4 0011D224 38 00 00 00 */ li r0, 0 /* 801202E8 0011D228 90 01 00 0C */ stw r0, 0xc(r1) -/* 801202EC 0011D22C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801202F0 0011D230 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801202EC 0011D22C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801202F0 0011D230 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801202F4 0011D234 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801202F8 0011D238 A8 9E 30 10 */ lha r4, 0x3010(r30) /* 801202FC 0011D23C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) @@ -148215,8 +148215,8 @@ lbl_80120350: /* 80120358 0011D298 48 00 01 DD */ bl daAlink_c_NS_commonFallInit /* 8012035C 0011D29C 48 00 00 CC */ b lbl_80120428 lbl_80120360: -/* 80120360 0011D2A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80120364 0011D2A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80120360 0011D2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80120364 0011D2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80120368 0011D2A8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012036C 0011D2AC 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 80120370 0011D2B0 4B F2 7E 0D */ bl dEvent_manager_c_NS_cutEnd @@ -148236,8 +148236,8 @@ lbl_80120384: /* 801203A0 0011D2E0 4E 80 04 21 */ bctrl /* 801203A4 0011D2E4 48 00 00 80 */ b lbl_80120424 lbl_801203A8: -/* 801203A8 0011D2E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801203AC 0011D2EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801203A8 0011D2E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801203AC 0011D2EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801203B0 0011D2F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801203B4 0011D2F4 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 801203B8 0011D2F8 4B F2 7D C5 */ bl dEvent_manager_c_NS_cutEnd @@ -148312,8 +148312,8 @@ daAlink_c_NS_commonGrabPutInit: /* 801204AC 0011D3EC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801204B0 0011D3F0 41 80 00 20 */ blt lbl_801204D0 lbl_801204B4: -/* 801204B4 0011D3F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801204B8 0011D3F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801204B4 0011D3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801204B8 0011D3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801204BC 0011D3FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801204C0 0011D400 80 84 31 84 */ lwz r4, 0x3184(r4) /* 801204C4 0011D404 4B F2 7C B9 */ bl dEvent_manager_c_NS_cutEnd @@ -148389,8 +148389,8 @@ daAlink_c_NS_setEmitter: /* 8012059C 0011D4DC 7C AA 2B 78 */ mr r10, r5 /* 801205A0 0011D4E0 7C C8 33 78 */ mr r8, r6 /* 801205A4 0011D4E4 7C E9 3B 78 */ mr r9, r7 -/* 801205A8 0011D4E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801205AC 0011D4EC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801205A8 0011D4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801205AC 0011D4EC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801205B0 0011D4F0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 801205B4 0011D4F4 38 00 00 FF */ li r0, 0xff /* 801205B8 0011D4F8 90 01 00 08 */ stw r0, 8(r1) @@ -148441,8 +148441,8 @@ daAlink_c_NS_setEmitterPolyColor: /* 80120660 0011D5A0 38 00 FF FF */ li r0, -1 /* 80120664 0011D5A4 90 01 00 10 */ stw r0, 0x10(r1) /* 80120668 0011D5A8 90 61 00 14 */ stw r3, 0x14(r1) -/* 8012066C 0011D5AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80120670 0011D5B0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8012066C 0011D5AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80120670 0011D5B0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80120674 0011D5B4 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120678 0011D5B8 80 84 00 00 */ lwz r4, 0(r4) /* 8012067C 0011D5BC 39 0A 01 0C */ addi r8, r10, 0x10c @@ -148476,8 +148476,8 @@ daAlink_c_NS_setEmitterColor: /* 801206E0 0011D620 7C AA 2B 78 */ mr r10, r5 /* 801206E4 0011D624 7C C8 33 78 */ mr r8, r6 /* 801206E8 0011D628 7C E9 3B 78 */ mr r9, r7 -/* 801206EC 0011D62C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801206F0 0011D630 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801206EC 0011D62C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801206F0 0011D630 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801206F4 0011D634 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 801206F8 0011D638 38 00 00 FF */ li r0, 0xff /* 801206FC 0011D63C 90 01 00 08 */ stw r0, 8(r1) @@ -148517,8 +148517,8 @@ daAlink_c_NS_stopDrawParticle: /* 80120778 0011D6B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8012077C 0011D6BC 7C 08 02 A6 */ mflr r0 /* 80120780 0011D6C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80120784 0011D6C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80120788 0011D6C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80120784 0011D6C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80120788 0011D6C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012078C 0011D6CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80120790 0011D6D0 38 63 02 10 */ addi r3, r3, 0x210 /* 80120794 0011D6D4 4B F2 B1 85 */ bl dPa_control_c_NS_level_c_NS_getEmitter @@ -149389,8 +149389,8 @@ lbl_801213FC: /* 80121410 0011E350 80 1B 19 9C */ lwz r0, 0x199c(r27) /* 80121414 0011E354 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80121418 0011E358 41 82 00 5C */ beq lbl_80121474 -/* 8012141C 0011E35C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80121420 0011E360 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012141C 0011E35C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80121420 0011E360 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80121424 0011E364 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121428 0011E368 38 9B 1A 60 */ addi r4, r27, 0x1a60 /* 8012142C 0011E36C 4B F5 38 E1 */ bl dBgS_NS_GetMagnetCode @@ -149568,13 +149568,13 @@ lbl_8012167C: /* 8012169C 0011E5DC 80 1B 05 7C */ lwz r0, 0x57c(r27) /* 801216A0 0011E5E0 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 801216A4 0011E5E4 41 82 00 70 */ beq lbl_80121714 -/* 801216A8 0011E5E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801216AC 0011E5EC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801216A8 0011E5E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801216AC 0011E5EC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801216B0 0011E5F0 38 64 01 14 */ addi r3, r4, 0x114 /* 801216B4 0011E5F4 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 801216B8 0011E5F8 4B F1 2C 89 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 801216BC 0011E5FC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801216C0 0011E600 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801216BC 0011E5FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801216C0 0011E600 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801216C4 0011E604 88 84 5E A1 */ lbz r4, 0x5ea1(r4) /* 801216C8 0011E608 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801216CC 0011E60C 7C 04 00 40 */ cmplw r4, r0 @@ -149669,8 +149669,8 @@ lbl_80121800: /* 80121818 0011E758 C0 1B 1F DC */ lfs f0, 0x1fdc(r27) /* 8012181C 0011E75C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80121820 0011E760 41 82 00 B8 */ beq lbl_801218D8 -/* 80121824 0011E764 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80121828 0011E768 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80121824 0011E764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80121828 0011E768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012182C 0011E76C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121830 0011E770 38 9B 1E 1C */ addi r4, r27, 0x1e1c /* 80121834 0011E774 4B F5 2E 2D */ bl cBgS_NS_ChkPolySafe @@ -149699,8 +149699,8 @@ lbl_80121868: /* 8012188C 0011E7CC 38 00 FF FF */ li r0, -1 /* 80121890 0011E7D0 90 01 00 10 */ stw r0, 0x10(r1) /* 80121894 0011E7D4 90 61 00 14 */ stw r3, 0x14(r1) -/* 80121898 0011E7D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012189C 0011E7DC 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 80121898 0011E7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012189C 0011E7DC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801218A0 0011E7E0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 801218A4 0011E7E4 80 9B 31 C0 */ lwz r4, 0x31c0(r27) /* 801218A8 0011E7E8 38 A0 03 33 */ li r5, 0x333 @@ -149737,8 +149737,8 @@ lbl_801218D8: /* 80121920 0011E860 38 7B 1D 08 */ addi r3, r27, 0x1d08 /* 80121924 0011E864 38 81 00 9C */ addi r4, r1, 0x9c /* 80121928 0011E868 48 14 64 01 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8012192C 0011E86C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80121930 0011E870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012192C 0011E86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80121930 0011E870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80121934 0011E874 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121938 0011E878 38 9B 1D 08 */ addi r4, r27, 0x1d08 /* 8012193C 0011E87C 4B F5 2B 65 */ bl cBgS_NS_GroundCross @@ -149783,8 +149783,8 @@ lbl_80121960: /* 801219D4 0011E914 38 0D 89 24 */ addi r0, r13, lbl_80450EA4-_SDA_BASE_ /* 801219D8 0011E918 90 03 00 F0 */ stw r0, 0xf0(r3) lbl_801219DC: -/* 801219DC 0011E91C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801219E0 0011E920 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801219DC 0011E91C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801219E0 0011E920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801219E4 0011E924 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 801219E8 0011E928 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 801219EC 0011E92C 41 82 00 54 */ beq lbl_80121A40 @@ -150864,8 +150864,8 @@ lbl_8012293C: /* 80122944 0011F884 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80122948 0011F888 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8012294C 0011F88C 40 81 01 BC */ ble lbl_80122B08 -/* 80122950 0011F890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80122954 0011F894 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80122950 0011F890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80122954 0011F894 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80122958 0011F898 88 1D 00 14 */ lbz r0, 0x14(r29) /* 8012295C 0011F89C 28 00 00 3F */ cmplwi r0, 0x3f /* 80122960 0011F8A0 41 82 00 8C */ beq lbl_801229EC @@ -150980,8 +150980,8 @@ lbl_80122AF4: /* 80122B00 0011FA40 4B F9 C5 ED */ bl daAlink_c_NS_seStartSwordCut /* 80122B04 0011FA44 48 00 00 90 */ b lbl_80122B94 lbl_80122B08: -/* 80122B08 0011FA48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80122B0C 0011FA4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80122B08 0011FA48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80122B0C 0011FA4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80122B10 0011FA50 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80122B14 0011FA54 38 63 02 10 */ addi r3, r3, 0x210 /* 80122B18 0011FA58 80 9F 32 1C */ lwz r4, 0x321c(r31) @@ -151652,8 +151652,8 @@ daAlink_c_NS_setCutLargeJumpLandEffect: /* 801234A8 001203E8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 801234AC 001203EC 38 81 00 38 */ addi r4, r1, 0x38 /* 801234B0 001203F0 48 14 48 79 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 801234B4 001203F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801234B8 001203F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801234B4 001203F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801234B8 001203F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801234BC 001203FC 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 801234C0 00120400 7F 83 E3 78 */ mr r3, r28 /* 801234C4 00120404 38 9F 1D 08 */ addi r4, r31, 0x1d08 @@ -151759,8 +151759,8 @@ lbl_80123610: /* 80123628 00120568 3B 80 00 00 */ li r28, 0 /* 8012362C 0012056C B3 81 00 28 */ sth r28, 0x28(r1) /* 80123630 00120570 3B 60 00 00 */ li r27, 0 -/* 80123634 00120574 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80123638 00120578 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80123634 00120574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80123638 00120578 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8012363C 0012057C 3C 60 80 39 */ lis r3, lbl_80391D38@ha /* 80123640 00120580 3B C3 1D 38 */ addi r30, r3, lbl_80391D38@l lbl_80123644: @@ -152018,8 +152018,8 @@ daAlink_c_NS_setWolfDigEffect: /* 801239CC 0012090C 39 61 00 30 */ addi r11, r1, 0x30 /* 801239D0 00120910 48 23 E8 09 */ bl _savegpr_28 /* 801239D4 00120914 7C 7F 1B 78 */ mr r31, r3 -/* 801239D8 00120918 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801239DC 0012091C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801239D8 00120918 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801239DC 0012091C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801239E0 00120920 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801239E4 00120924 38 9F 1E 2C */ addi r4, r31, 0x1e2c /* 801239E8 00120928 4B F5 0C 79 */ bl cBgS_NS_ChkPolySafe @@ -152082,8 +152082,8 @@ lbl_80123AA8: /* 80123AB8 001209F8 38 00 FF FF */ li r0, -1 /* 80123ABC 001209FC 90 01 00 10 */ stw r0, 0x10(r1) /* 80123AC0 00120A00 90 61 00 14 */ stw r3, 0x14(r1) -/* 80123AC4 00120A04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80123AC8 00120A08 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80123AC4 00120A04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80123AC8 00120A08 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80123ACC 00120A0C 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80123AD0 00120A10 80 9F 32 CC */ lwz r4, 0x32cc(r31) /* 80123AD4 00120A14 38 DF 1E 2C */ addi r6, r31, 0x1e2c @@ -152216,8 +152216,8 @@ daAlink_c_NS_setWolfLockAttackEffect: /* 80123C98 00120BD8 39 61 00 30 */ addi r11, r1, 0x30 /* 80123C9C 00120BDC 48 23 E5 35 */ bl _savegpr_26 /* 80123CA0 00120BE0 7C 7A 1B 78 */ mr r26, r3 -/* 80123CA4 00120BE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80123CA8 00120BE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80123CA4 00120BE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80123CA8 00120BE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80123CAC 00120BEC 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80123CB0 00120BF0 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 /* 80123CB4 00120BF4 41 82 00 0C */ beq lbl_80123CC0 @@ -152324,8 +152324,8 @@ lbl_80123E10: /* 80123E1C 00120D5C 7F C3 F3 78 */ mr r3, r30 /* 80123E20 00120D60 80 9E 32 8C */ lwz r4, 0x328c(r30) /* 80123E24 00120D64 4B FF C9 55 */ bl daAlink_c_NS_stopDrawParticle -/* 80123E28 00120D68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80123E2C 00120D6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80123E28 00120D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80123E2C 00120D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80123E30 00120D70 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80123E34 00120D74 38 63 02 10 */ addi r3, r3, 0x210 /* 80123E38 00120D78 80 9E 32 90 */ lwz r4, 0x3290(r30) @@ -152383,8 +152383,8 @@ daAlink_c_NS_setWolfBarrierHitEffect: /* 80123EEC 00120E2C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80123EF0 00120E30 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80123EF4 00120E34 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80123EF8 00120E38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80123EFC 00120E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80123EF8 00120E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80123EFC 00120E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80123F00 00120E40 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80123F04 00120E44 38 9F 00 14 */ addi r4, r31, 0x14 /* 80123F08 00120E48 38 A1 00 3C */ addi r5, r1, 0x3c @@ -152495,8 +152495,8 @@ lbl_80124078: lbl_8012407C: /* 8012407C 00120FBC 3B 60 00 00 */ li r27, 0 /* 80124080 00120FC0 3B BF 00 30 */ addi r29, r31, 0x30 -/* 80124084 00120FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80124088 00120FC8 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80124084 00120FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80124088 00120FC8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_8012408C: /* 8012408C 00120FCC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80124090 00120FD0 38 80 00 00 */ li r4, 0 @@ -152563,8 +152563,8 @@ daAlink_c_NS_setCutWaterDropEffect: /* 80124178 001210B8 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8012417C 001210BC C0 03 00 5C */ lfs f0, 0x5c(r3) /* 80124180 001210C0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80124184 001210C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80124188 001210C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80124184 001210C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80124188 001210C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012418C 001210CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80124190 001210D0 38 80 00 00 */ li r4, 0 /* 80124194 001210D4 90 81 00 08 */ stw r4, 8(r1) @@ -153186,8 +153186,8 @@ lbl_80124A18: /* 80124A64 001219A4 40 80 00 08 */ bge lbl_80124A6C /* 80124A68 001219A8 D3 FC 00 08 */ stfs f31, 8(r28) lbl_80124A6C: -/* 80124A6C 001219AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80124A70 001219B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80124A6C 001219AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80124A70 001219B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80124A74 001219B4 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80124A78 001219B8 C0 03 05 A8 */ lfs f0, 0x5a8(r3) /* 80124A7C 001219BC D0 21 00 08 */ stfs f1, 8(r1) @@ -153395,8 +153395,8 @@ lbl_80124D5C: /* 80124D6C 00121CAC 7C 00 07 35 */ extsh. r0, r0 /* 80124D70 00121CB0 41 82 00 A0 */ beq lbl_80124E10 /* 80124D74 00121CB4 3B BF 27 D4 */ addi r29, r31, 0x27d4 -/* 80124D78 00121CB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80124D7C 00121CBC 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80124D78 00121CB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80124D7C 00121CBC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80124D80 00121CC0 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80124D84 00121CC4 38 80 00 00 */ li r4, 0 /* 80124D88 00121CC8 90 81 00 08 */ stw r4, 8(r1) @@ -153890,8 +153890,8 @@ lbl_80125468: lbl_8012548C: /* 8012548C 001223CC 3B 80 00 00 */ li r28, 0 /* 80125490 001223D0 3B C0 00 00 */ li r30, 0 -/* 80125494 001223D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80125498 001223D8 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80125494 001223D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80125498 001223D8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l lbl_8012549C: /* 8012549C 001223DC 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 801254A0 001223E0 38 80 00 00 */ li r4, 0 @@ -154015,8 +154015,8 @@ daAlink_c_NS_setWoodShieldBurnOutEffect: /* 8012563C 0012257C 7C 7C 1B 78 */ mr r28, r3 /* 80125640 00122580 3B A0 00 00 */ li r29, 0 /* 80125644 00122584 3B E0 00 00 */ li r31, 0 -/* 80125648 00122588 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012564C 0012258C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80125648 00122588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012564C 0012258C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80125650: /* 80125650 00122590 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80125654 00122594 38 80 00 00 */ li r4, 0 @@ -154609,8 +154609,8 @@ daAlink_lockCursor_c_NS_create: /* 80125F24 00122E64 93 C1 00 08 */ stw r30, 8(r1) /* 80125F28 00122E68 7C 7E 1B 78 */ mr r30, r3 /* 80125F2C 00122E6C 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ -/* 80125F30 00122E70 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80125F34 00122E74 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80125F30 00122E70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80125F34 00122E74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80125F38 00122E78 3C 84 00 02 */ addis r4, r4, 2 /* 80125F3C 00122E7C 38 A0 00 80 */ li r5, 0x80 /* 80125F40 00122E80 38 84 C2 F8 */ addi r4, r4, -15624 @@ -155069,8 +155069,8 @@ lbl_8012660C: /* 8012660C 0012354C 80 7F 00 08 */ lwz r3, 8(r31) /* 80126610 00123550 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80126614 00123554 FC 40 08 90 */ fmr f2, f1 -/* 80126618 00123558 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8012661C 0012355C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80126618 00123558 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8012661C 0012355C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80126620 00123560 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 80126624 00123564 48 1D 28 B1 */ bl J2DScreen_NS_draw lbl_80126628: @@ -155101,8 +155101,8 @@ daAlink_sight_c_NS_create: lbl_8012667C: /* 8012667C 001235BC 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ /* 80126680 001235C0 38 80 00 5B */ li r4, 0x5b -/* 80126684 001235C4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80126688 001235C8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80126684 001235C4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80126688 001235C8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8012668C 001235CC 3C A5 00 02 */ addis r5, r5, 2 /* 80126690 001235D0 38 C0 00 80 */ li r6, 0x80 /* 80126694 001235D4 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -155299,8 +155299,8 @@ daAlink_c_NS_changeWolf: /* 80126950 00123890 7C 7C 1B 78 */ mr r28, r3 /* 80126954 00123894 38 62 92 50 */ addi r3, r2, lbl_80452C50-_SDA2_BASE_ /* 80126958 00123898 38 80 00 0E */ li r4, 0xe -/* 8012695C 0012389C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80126960 001238A0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8012695C 0012389C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80126960 001238A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80126964 001238A4 3F A5 00 02 */ addis r29, r5, 2 /* 80126968 001238A8 3B BD C2 F8 */ addi r29, r29, -15624 /* 8012696C 001238AC 7F A5 EB 78 */ mr r5, r29 @@ -155455,8 +155455,8 @@ lbl_801269D8: /* 80126BB8 00123AF8 7F 83 E3 78 */ mr r3, r28 /* 80126BBC 00123AFC 4B EE 86 11 */ bl mDoExt_setCurrentHeap /* 80126BC0 00123B00 38 00 00 01 */ li r0, 1 -/* 80126BC4 00123B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80126BC8 00123B08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80126BC4 00123B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80126BC8 00123B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80126BCC 00123B0C 98 03 00 1E */ stb r0, 0x1e(r3) /* 80126BD0 00123B10 80 7F 06 50 */ lwz r3, 0x650(r31) /* 80126BD4 00123B14 93 E3 00 14 */ stw r31, 0x14(r3) @@ -155664,8 +155664,8 @@ lbl_80126E70: /* 80126EF4 00123E34 90 1F 06 5C */ stw r0, 0x65c(r31) /* 80126EF8 00123E38 90 1F 06 7C */ stw r0, 0x67c(r31) /* 80126EFC 00123E3C 90 1F 06 80 */ stw r0, 0x680(r31) -/* 80126F00 00123E40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80126F04 00123E44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80126F00 00123E40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80126F04 00123E44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80126F08 00123E48 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80126F0C 00123E4C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80126F10 00123E50 7D 89 03 A6 */ mtctr r12 @@ -155713,8 +155713,8 @@ daAlink_c_NS_changeLink: /* 80126FAC 00123EEC 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 80126FB0 00123EF0 38 63 02 39 */ addi r3, r3, 0x239 /* 80126FB4 00123EF4 38 80 00 31 */ li r4, 0x31 -/* 80126FB8 00123EF8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80126FBC 00123EFC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80126FB8 00123EF8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80126FBC 00123EFC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80126FC0 00123F00 3F 45 00 02 */ addis r26, r5, 2 /* 80126FC4 00123F04 3B 5A C2 F8 */ addi r26, r26, -15624 /* 80126FC8 00123F08 7F 45 D3 78 */ mr r5, r26 @@ -155753,8 +155753,8 @@ daAlink_c_NS_changeLink: /* 8012704C 00123F8C 90 7F 06 5C */ stw r3, 0x65c(r31) /* 80127050 00123F90 48 00 03 48 */ b lbl_80127398 lbl_80127054: -/* 80127054 00123F94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80127058 00123F98 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80127054 00123F94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80127058 00123F98 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8012705C 00123F9C 88 05 00 13 */ lbz r0, 0x13(r5) /* 80127060 00123FA0 28 00 00 2E */ cmplwi r0, 0x2e /* 80127064 00123FA4 40 82 00 B8 */ bne lbl_8012711C @@ -155892,8 +155892,8 @@ lbl_801271CC: /* 8012726C 001241AC 38 C0 00 00 */ li r6, 0 /* 80127270 001241B0 4B F7 CB 0D */ bl daAlink_c_NS_initModel /* 80127274 001241B4 90 7F 06 5C */ stw r3, 0x65c(r31) -/* 80127278 001241B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012727C 001241BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80127278 001241B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012727C 001241BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80127280 001241C0 A0 03 00 04 */ lhz r0, 4(r3) /* 80127284 001241C4 28 00 00 00 */ cmplwi r0, 0 /* 80127288 001241C8 41 82 00 14 */ beq lbl_8012729C @@ -155971,8 +155971,8 @@ lbl_80127398: /* 80127398 001242D8 80 1F 05 78 */ lwz r0, 0x578(r31) /* 8012739C 001242DC 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 801273A0 001242E0 40 82 00 18 */ bne lbl_801273B8 -/* 801273A4 001242E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801273A8 001242E8 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801273A4 001242E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801273A8 001242E8 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801273AC 001242EC 88 05 00 13 */ lbz r0, 0x13(r5) /* 801273B0 001242F0 28 00 00 31 */ cmplwi r0, 0x31 /* 801273B4 001242F4 41 82 00 4C */ beq lbl_80127400 @@ -155981,8 +155981,8 @@ lbl_801273B8: /* 801273BC 001242FC 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 801273C0 00124300 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 801273C4 00124304 38 84 02 A7 */ addi r4, r4, 0x2a7 -/* 801273C8 00124308 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801273CC 0012430C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801273C8 00124308 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801273CC 0012430C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801273D0 00124310 3C A5 00 02 */ addis r5, r5, 2 /* 801273D4 00124314 38 C0 00 80 */ li r6, 0x80 /* 801273D8 00124318 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -156016,8 +156016,8 @@ lbl_8012743C: /* 80127440 00124380 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 80127444 00124384 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 80127448 00124388 38 84 02 BF */ addi r4, r4, 0x2bf -/* 8012744C 0012438C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80127450 00124390 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8012744C 0012438C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80127450 00124390 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80127454 00124394 3F 65 00 02 */ addis r27, r5, 2 /* 80127458 00124398 3B 7B C2 F8 */ addi r27, r27, -15624 /* 8012745C 0012439C 7F 65 DB 78 */ mr r5, r27 @@ -156100,8 +156100,8 @@ lbl_80127498: /* 80127588 001244C8 7F 83 E3 78 */ mr r3, r28 /* 8012758C 001244CC 4B EE 7C 41 */ bl mDoExt_setCurrentHeap /* 80127590 001244D0 38 00 00 00 */ li r0, 0 -/* 80127594 001244D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80127598 001244D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80127594 001244D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80127598 001244D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012759C 001244DC 98 03 00 1E */ stb r0, 0x1e(r3) /* 801275A0 001244E0 80 7F 06 50 */ lwz r3, 0x650(r31) /* 801275A4 001244E4 93 E3 00 14 */ stw r31, 0x14(r3) @@ -156140,8 +156140,8 @@ lbl_80127498: /* 80127628 00124568 3B 60 00 02 */ li r27, 2 /* 8012762C 0012456C 48 00 02 58 */ b lbl_80127884 lbl_80127630: -/* 80127630 00124570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80127634 00124574 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80127630 00124570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80127634 00124574 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80127638 00124578 88 64 00 13 */ lbz r3, 0x13(r4) /* 8012763C 0012457C 28 03 00 2E */ cmplwi r3, 0x2e /* 80127640 00124580 40 82 00 74 */ bne lbl_801276B4 @@ -156611,8 +156611,8 @@ daAlink_c_NS_wolfSenseTrigger: .global daAlink_c_NS_setWolfSenceStatus daAlink_c_NS_setWolfSenceStatus: -/* 80127D14 00124C54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80127D18 00124C58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80127D14 00124C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80127D18 00124C58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80127D1C 00124C5C 98 83 5E 5C */ stb r4, 0x5e5c(r3) /* 80127D20 00124C60 38 00 00 00 */ li r0, 0 /* 80127D24 00124C64 98 03 5E 5E */ stb r0, 0x5e5e(r3) @@ -156633,8 +156633,8 @@ daAlink_c_NS_wolfClawTrigger: .global daAlink_c_NS_setWolfDigStatus daAlink_c_NS_setWolfDigStatus: /* 80127D50 00124C90 38 00 00 0D */ li r0, 0xd -/* 80127D54 00124C94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80127D58 00124C98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80127D54 00124C94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80127D58 00124C98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80127D5C 00124C9C 98 03 5E 60 */ stb r0, 0x5e60(r3) /* 80127D60 00124CA0 98 83 5E 62 */ stb r4, 0x5e62(r3) /* 80127D64 00124CA4 4E 80 00 20 */ blr @@ -158654,8 +158654,8 @@ daAlink_c_NS_checkMidnaUseAbility: /* 80129960 001268A0 90 01 00 14 */ stw r0, 0x14(r1) /* 80129964 001268A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80129968 001268A8 3B E0 00 00 */ li r31, 0 -/* 8012996C 001268AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80129970 001268B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012996C 001268AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80129970 001268B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80129974 001268B4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80129978 001268B8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 8012997C 001268BC 40 82 00 10 */ bne lbl_8012998C @@ -158692,8 +158692,8 @@ daAlink_c_NS_checkWolfUseAbility: /* 801299E4 00126924 4B FF E2 C9 */ bl daAlink_c_NS_offWolfEyeUp /* 801299E8 00126928 48 00 00 84 */ b lbl_80129A6C lbl_801299EC: -/* 801299EC 0012692C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801299F0 00126930 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801299EC 0012692C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801299F0 00126930 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801299F4 00126934 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801299F8 00126938 38 80 43 08 */ li r4, 0x4308 /* 801299FC 0012693C 4B F0 AF C1 */ bl isEventBit__11dSv_event_cCFUs @@ -159336,8 +159336,8 @@ lbl_8012A2D4: /* 8012A2D4 00127214 80 1E 05 7C */ lwz r0, 0x57c(r30) /* 8012A2D8 00127218 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 8012A2DC 0012721C 41 82 00 2C */ beq lbl_8012A308 -/* 8012A2E0 00127220 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012A2E4 00127224 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012A2E0 00127220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012A2E4 00127224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012A2E8 00127228 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8012A2EC 0012722C 38 80 00 02 */ li r4, 2 /* 8012A2F0 00127230 38 A0 00 00 */ li r5, 0 @@ -159532,8 +159532,8 @@ lbl_8012A568: /* 8012A57C 001274BC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8012A580 001274C0 90 01 00 64 */ stw r0, 0x64(r1) /* 8012A584 001274C4 3B 80 00 00 */ li r28, 0 -/* 8012A588 001274C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012A58C 001274CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012A588 001274C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012A58C 001274CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012A590 001274D0 3B C3 0F 38 */ addi r30, r3, 0xf38 lbl_8012A594: /* 8012A594 001274D4 C0 5A 04 D8 */ lfs f2, 0x4d8(r26) @@ -160892,8 +160892,8 @@ lbl_8012B860: /* 8012B8C8 00128808 4B EE 0B 6D */ bl mDoMtx_YrotM /* 8012B8CC 0012880C 3A 60 00 00 */ li r19, 0 /* 8012B8D0 00128810 3B 00 00 00 */ li r24, 0 -/* 8012B8D4 00128814 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012B8D8 00128818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012B8D4 00128814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012B8D8 00128818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012B8DC 0012881C 3A A3 0F 38 */ addi r21, r3, 0xf38 /* 8012B8E0 00128820 C3 E2 93 00 */ lfs f31, lbl_80452D00-_SDA2_BASE_(r2) /* 8012B8E4 00128824 C3 62 93 A4 */ lfs f27, lbl_80452DA4-_SDA2_BASE_(r2) @@ -161383,8 +161383,8 @@ daAlink_c_NS_checkWolfWaitSlipPolygon: /* 8012BFB4 00128EF4 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8012BFB8 00128EF8 93 C1 00 38 */ stw r30, 0x38(r1) /* 8012BFBC 00128EFC 7C 7F 1B 78 */ mr r31, r3 -/* 8012BFC0 00128F00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012BFC4 00128F04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012BFC0 00128F00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012BFC4 00128F04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012BFC8 00128F08 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8012BFCC 00128F0C 7F C3 F3 78 */ mr r3, r30 /* 8012BFD0 00128F10 38 9F 1A 60 */ addi r4, r31, 0x1a60 @@ -161552,8 +161552,8 @@ daAlink_c_NS_setWolfWaitSlip: /* 8012C210 00129150 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8012C214 00129154 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8012C218 00129158 90 01 00 18 */ stw r0, 0x18(r1) -/* 8012C21C 0012915C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012C220 00129160 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012C21C 0012915C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012C220 00129160 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012C224 00129164 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8012C228 00129168 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 8012C22C 0012916C 38 A1 00 08 */ addi r5, r1, 8 @@ -161852,8 +161852,8 @@ lbl_8012C64C: /* 8012C664 001295A4 7D F6 07 34 */ extsh r22, r15 /* 8012C668 001295A8 3A 96 20 00 */ addi r20, r22, 0x2000 /* 8012C66C 001295AC 3B 36 E0 00 */ addi r25, r22, -8192 -/* 8012C670 001295B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012C674 001295B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012C670 001295B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012C674 001295B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012C678 001295B8 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 8012C67C 001295BC C3 C2 97 5C */ lfs f30, lbl_8045315C-_SDA2_BASE_(r2) /* 8012C680 001295C0 C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) @@ -162553,8 +162553,8 @@ daAlink_c_NS_procWolfMidnaRideShockInit: /* 8012D064 00129FA4 80 03 05 74 */ lwz r0, 0x574(r3) /* 8012D068 00129FA8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8012D06C 00129FAC 40 82 00 24 */ bne lbl_8012D090 -/* 8012D070 00129FB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012D074 00129FB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012D070 00129FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012D074 00129FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012D078 00129FB8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012D07C 00129FBC 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8012D080 00129FC0 4B F1 B0 FD */ bl dEvent_manager_c_NS_cutEnd @@ -162607,8 +162607,8 @@ lbl_8012D0F0: /* 8012D130 0012A070 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8012D134 0012A074 28 00 00 32 */ cmplwi r0, 0x32 /* 8012D138 0012A078 40 82 00 1C */ bne lbl_8012D154 -/* 8012D13C 0012A07C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012D140 0012A080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012D13C 0012A07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012D140 0012A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012D144 0012A084 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012D148 0012A088 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8012D14C 0012A08C 4B F1 B0 31 */ bl dEvent_manager_c_NS_cutEnd @@ -163201,8 +163201,8 @@ lbl_8012D990: /* 8012D998 0012A8D8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8012D99C 0012A8DC D0 01 00 18 */ stfs f0, 0x18(r1) /* 8012D9A0 0012A8E0 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8012D9A4 0012A8E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012D9A8 0012A8E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012D9A4 0012A8E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012D9A8 0012A8E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012D9AC 0012A8EC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8012D9B0 0012A8F0 38 80 00 05 */ li r4, 5 /* 8012D9B4 0012A8F4 38 A0 00 0F */ li r5, 0xf @@ -163543,8 +163543,8 @@ lbl_8012DE54: /* 8012DE6C 0012ADAC 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8012DE70 0012ADB0 28 00 00 05 */ cmplwi r0, 5 /* 8012DE74 0012ADB4 40 82 00 1C */ bne lbl_8012DE90 -/* 8012DE78 0012ADB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012DE7C 0012ADBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012DE78 0012ADB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012DE7C 0012ADBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012DE80 0012ADC0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012DE84 0012ADC4 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8012DE88 0012ADC8 4B F1 A2 F5 */ bl dEvent_manager_c_NS_cutEnd @@ -163582,8 +163582,8 @@ daAlink_c_NS_procWolfSideStepInit: /* 8012DEEC 0012AE2C 40 82 00 6C */ bne lbl_8012DF58 /* 8012DEF0 0012AE30 2C 1E 00 00 */ cmpwi r30, 0 /* 8012DEF4 0012AE34 40 82 00 64 */ bne lbl_8012DF58 -/* 8012DEF8 0012AE38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012DEFC 0012AE3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012DEF8 0012AE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012DEFC 0012AE3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012DF00 0012AE40 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8012DF04 0012AE44 38 80 0C 10 */ li r4, 0xc10 /* 8012DF08 0012AE48 4B F0 6A B5 */ bl isEventBit__11dSv_event_cCFUs @@ -163879,8 +163879,8 @@ lbl_8012E30C: /* 8012E32C 0012B26C 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8012E330 0012B270 28 00 00 10 */ cmplwi r0, 0x10 /* 8012E334 0012B274 40 82 00 1C */ bne lbl_8012E350 -/* 8012E338 0012B278 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012E33C 0012B27C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012E338 0012B278 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012E33C 0012B27C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012E340 0012B280 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012E344 0012B284 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8012E348 0012B288 4B F1 9E 35 */ bl dEvent_manager_c_NS_cutEnd @@ -164138,8 +164138,8 @@ lbl_8012E6D0: /* 8012E6E0 0012B620 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8012E6E4 0012B624 28 00 00 10 */ cmplwi r0, 0x10 /* 8012E6E8 0012B628 40 82 00 1C */ bne lbl_8012E704 -/* 8012E6EC 0012B62C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012E6F0 0012B630 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012E6EC 0012B62C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012E6F0 0012B630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012E6F4 0012B634 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012E6F8 0012B638 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8012E6FC 0012B63C 4B F1 9A 81 */ bl dEvent_manager_c_NS_cutEnd @@ -164657,8 +164657,8 @@ lbl_8012EE38: /* 8012EE50 0012BD90 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8012EE54 0012BD94 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8012EE58 0012BD98 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8012EE5C 0012BD9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012EE60 0012BDA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012EE5C 0012BD9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012EE60 0012BDA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012EE64 0012BDA4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8012EE68 0012BDA8 38 80 00 06 */ li r4, 6 /* 8012EE6C 0012BDAC 38 A0 00 1F */ li r5, 0x1f @@ -164891,8 +164891,8 @@ daAlink_c_NS_procWolfLandInit: /* 8012F1B0 0012C0F0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8012F1B4 0012C0F4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8012F1B8 0012C0F8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8012F1BC 0012C0FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012F1C0 0012C100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012F1BC 0012C0FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012F1C0 0012C100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012F1C4 0012C104 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8012F1C8 0012C108 38 80 00 01 */ li r4, 1 /* 8012F1CC 0012C10C 38 A0 00 0F */ li r5, 0xf @@ -165823,8 +165823,8 @@ lbl_8012FED0: /* 8012FF48 0012CE88 EC 00 08 28 */ fsubs f0, f0, f1 /* 8012FF4C 0012CE8C D0 04 00 08 */ stfs f0, 8(r4) lbl_8012FF50: -/* 8012FF50 0012CE90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8012FF54 0012CE94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8012FF50 0012CE90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8012FF54 0012CE94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012FF58 0012CE98 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8012FF5C 0012CE9C 60 00 02 00 */ ori r0, r0, 0x200 /* 8012FF60 0012CEA0 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -166058,8 +166058,8 @@ lbl_80130254: /* 801302B8 0012D1F8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 801302BC 0012D1FC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 801302C0 0012D200 90 01 00 18 */ stw r0, 0x18(r1) -/* 801302C4 0012D204 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801302C8 0012D208 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801302C4 0012D204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801302C8 0012D208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801302CC 0012D20C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801302D0 0012D210 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 801302D4 0012D214 38 A1 00 08 */ addi r5, r1, 8 @@ -166260,8 +166260,8 @@ daAlink_searchWolfHowl: /* 80130594 0012D4D4 7C 7C 1B 78 */ mr r28, r3 /* 80130598 0012D4D8 7C 9D 23 78 */ mr r29, r4 /* 8013059C 0012D4DC AB E3 00 08 */ lha r31, 8(r3) -/* 801305A0 0012D4E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801305A4 0012D4E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801305A0 0012D4E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801305A4 0012D4E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801305A8 0012D4E8 83 C3 5D B4 */ lwz r30, 0x5db4(r3) /* 801305AC 0012D4EC 2C 1F 00 F4 */ cmpwi r31, 0xf4 /* 801305B0 0012D4F0 40 82 00 18 */ bne lbl_801305C8 @@ -166372,8 +166372,8 @@ daAlink_c_NS_procWolfHowlDemoInit: /* 8013071C 0012D65C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80130720 0012D660 93 C1 00 28 */ stw r30, 0x28(r1) /* 80130724 0012D664 7C 7E 1B 78 */ mr r30, r3 -/* 80130728 0012D668 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013072C 0012D66C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80130728 0012D668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013072C 0012D66C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80130730 0012D670 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80130734 0012D674 7F C4 F3 78 */ mr r4, r30 /* 80130738 0012D678 38 A0 00 00 */ li r5, 0 @@ -166676,8 +166676,8 @@ lbl_80130B7C: /* 80130B7C 0012DABC 38 7E 28 0C */ addi r3, r30, 0x280c /* 80130B80 0012DAC0 48 02 E1 7D */ bl daPy_actorKeep_c_NS_clearData lbl_80130B84: -/* 80130B84 0012DAC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80130B88 0012DAC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80130B84 0012DAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80130B88 0012DAC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80130B8C 0012DACC 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80130B90 0012DAD0 64 00 04 00 */ oris r0, r0, 0x400 /* 80130B94 0012DAD4 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -166703,8 +166703,8 @@ lbl_80130B9C: /* 80130BE0 0012DB20 7C 7F 1B 78 */ mr r31, r3 /* 80130BE4 0012DB24 3B BF 1F D0 */ addi r29, r31, 0x1fd0 /* 80130BE8 0012DB28 83 83 28 10 */ lwz r28, 0x2810(r3) -/* 80130BEC 0012DB2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80130BF0 0012DB30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80130BEC 0012DB2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80130BF0 0012DB30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80130BF4 0012DB34 3B C3 4E C8 */ addi r30, r3, 0x4ec8 /* 80130BF8 0012DB38 A0 03 4F A2 */ lhz r0, 0x4fa2(r3) /* 80130BFC 0012DB3C 54 03 07 38 */ rlwinm r3, r0, 0, 0x1c, 0x1c @@ -168726,8 +168726,8 @@ lbl_801327E8: /* 80132838 0012F778 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013283C 0012F77C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80132840 0012F780 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80132844 0012F784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80132848 0012F788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80132844 0012F784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80132848 0012F788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013284C 0012F78C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80132850 0012F790 38 80 00 02 */ li r4, 2 /* 80132854 0012F794 38 A0 00 0F */ li r5, 0xf @@ -169046,8 +169046,8 @@ lbl_80132CB4: /* 80132CD0 0012FC10 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80132CD4 0012FC14 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80132CD8 0012FC18 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80132CDC 0012FC1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80132CE0 0012FC20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80132CDC 0012FC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80132CE0 0012FC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80132CE4 0012FC24 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80132CE8 0012FC28 38 80 00 02 */ li r4, 2 /* 80132CEC 0012FC2C 38 A0 00 0F */ li r5, 0xf @@ -169218,8 +169218,8 @@ lbl_80132F28: /* 80132F5C 0012FE9C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80132F60 0012FEA0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80132F64 0012FEA4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80132F68 0012FEA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80132F6C 0012FEAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80132F68 0012FEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80132F6C 0012FEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80132F70 0012FEB0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80132F74 0012FEB4 38 80 00 01 */ li r4, 1 /* 80132F78 0012FEB8 38 A0 00 0F */ li r5, 0xf @@ -170351,8 +170351,8 @@ lbl_80133F3C: /* 80133F3C 00130E7C 38 60 00 00 */ li r3, 0 /* 80133F40 00130E80 48 00 00 AC */ b lbl_80133FEC lbl_80133F44: -/* 80133F44 00130E84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80133F48 00130E88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80133F44 00130E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80133F48 00130E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80133F4C 00130E8C 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80133F50 00130E90 4B EE 7B C5 */ bl fopAcM_getTalkEventPartner /* 80133F54 00130E94 38 A0 00 00 */ li r5, 0 @@ -171299,8 +171299,8 @@ lbl_80134C24: /* 80134CB8 00131BF8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80134CBC 00131BFC D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80134CC0 00131C00 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80134CC4 00131C04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80134CC8 00131C08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80134CC4 00131C04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80134CC8 00131C08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80134CCC 00131C0C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80134CD0 00131C10 38 80 00 02 */ li r4, 2 /* 80134CD4 00131C14 38 A0 00 0F */ li r5, 0xf @@ -171424,8 +171424,8 @@ lbl_80134E54: /* 80134E78 00131DB8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80134E7C 00131DBC D0 01 00 0C */ stfs f0, 0xc(r1) /* 80134E80 00131DC0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80134E84 00131DC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80134E88 00131DC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80134E84 00131DC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80134E88 00131DC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80134E8C 00131DCC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80134E90 00131DD0 38 80 00 02 */ li r4, 2 /* 80134E94 00131DD4 38 A0 00 0F */ li r5, 0xf @@ -171757,8 +171757,8 @@ lbl_80135298: /* 80135314 00132254 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135318 00132258 38 81 00 08 */ addi r4, r1, 8 /* 8013531C 0013225C 48 13 2A 0D */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 80135320 00132260 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135324 00132264 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135320 00132260 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135324 00132264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135328 00132268 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8013532C 0013226C 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 80135330 00132270 4B F3 F1 71 */ bl cBgS_NS_GroundCross @@ -171865,8 +171865,8 @@ daAlink_c_NS_setWolfHangGroundY: /* 80135490 001323D0 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135494 001323D4 38 81 00 08 */ addi r4, r1, 8 /* 80135498 001323D8 48 13 28 91 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8013549C 001323DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801354A0 001323E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013549C 001323DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801354A0 001323E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801354A4 001323E4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801354A8 001323E8 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 801354AC 001323EC 4B F3 EF F5 */ bl cBgS_NS_GroundCross @@ -172198,8 +172198,8 @@ lbl_80135954: /* 80135954 00132894 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 80135958 00132898 38 81 00 30 */ addi r4, r1, 0x30 /* 8013595C 0013289C 48 13 23 CD */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 80135960 001328A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135964 001328A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135960 001328A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135964 001328A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135968 001328A8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8013596C 001328AC 7F A3 EB 78 */ mr r3, r29 /* 80135970 001328B0 38 9E 1D 08 */ addi r4, r30, 0x1d08 @@ -172285,8 +172285,8 @@ lbl_80135A64: /* 80135A94 001329D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80135A98 001329D8 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80135A9C 001329DC D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80135AA0 001329E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135AA4 001329E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135AA0 001329E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135AA4 001329E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135AA8 001329E8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80135AAC 001329EC 60 00 02 00 */ ori r0, r0, 0x200 /* 80135AB0 001329F0 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -172485,8 +172485,8 @@ lbl_80135D14: /* 80135D78 00132CB8 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 80135D7C 00132CBC 38 81 00 20 */ addi r4, r1, 0x20 /* 80135D80 00132CC0 48 13 1F A9 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 80135D84 00132CC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135D88 00132CC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135D84 00132CC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135D88 00132CC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135D8C 00132CCC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80135D90 00132CD0 38 9F 1D 08 */ addi r4, r31, 0x1d08 /* 80135D94 00132CD4 4B F3 E7 0D */ bl cBgS_NS_GroundCross @@ -172570,8 +172570,8 @@ lbl_80135EB4: /* 80135EBC 00132DFC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80135EC0 00132E00 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80135EC4 00132E04 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80135EC8 00132E08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135ECC 00132E0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135EC8 00132E08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135ECC 00132E0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135ED0 00132E10 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80135ED4 00132E14 60 00 01 00 */ ori r0, r0, 0x100 /* 80135ED8 00132E18 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -172613,8 +172613,8 @@ lbl_80135F44: /* 80135F60 00132EA0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80135F64 00132EA4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80135F68 00132EA8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80135F6C 00132EAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80135F70 00132EB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80135F6C 00132EAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80135F70 00132EB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135F74 00132EB4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80135F78 00132EB8 38 80 00 01 */ li r4, 1 /* 80135F7C 00132EBC 38 A0 00 01 */ li r5, 1 @@ -173216,8 +173216,8 @@ lbl_801367F8: /* 80136804 00133744 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80136808 00133748 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8013680C 0013374C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80136810 00133750 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80136814 00133754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80136810 00133750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80136814 00133754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136818 00133758 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013681C 0013375C 38 80 00 06 */ li r4, 6 /* 80136820 00133760 38 A0 00 1F */ li r5, 0x1f @@ -173455,8 +173455,8 @@ lbl_80136B78: /* 80136B84 00133AC4 28 00 00 09 */ cmplwi r0, 9 /* 80136B88 00133AC8 40 82 00 1C */ bne lbl_80136BA4 lbl_80136B8C: -/* 80136B8C 00133ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80136B90 00133AD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80136B8C 00133ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80136B90 00133AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136B94 00133AD4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80136B98 00133AD8 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 80136B9C 00133ADC 4B F1 15 E1 */ bl dEvent_manager_c_NS_cutEnd @@ -173528,8 +173528,8 @@ lbl_80136C5C: /* 80136C80 00133BC0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80136C84 00133BC4 D0 01 00 18 */ stfs f0, 0x18(r1) /* 80136C88 00133BC8 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80136C8C 00133BCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80136C90 00133BD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80136C8C 00133BCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80136C90 00133BD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136C94 00133BD4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80136C98 00133BD8 38 80 00 05 */ li r4, 5 /* 80136C9C 00133BDC 38 A0 00 1F */ li r5, 0x1f @@ -173556,8 +173556,8 @@ lbl_80136CE0: /* 80136CE8 00133C28 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80136CEC 00133C2C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80136CF0 00133C30 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80136CF4 00133C34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80136CF8 00133C38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80136CF4 00133C34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80136CF8 00133C38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136CFC 00133C3C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80136D00 00133C40 38 80 00 04 */ li r4, 4 /* 80136D04 00133C44 38 A0 00 1F */ li r5, 0x1f @@ -173706,8 +173706,8 @@ daAlink_c_NS_setWolfScreamWaitAnime: /* 80136F18 00133E58 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80136F1C 00133E5C D0 01 00 0C */ stfs f0, 0xc(r1) /* 80136F20 00133E60 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80136F24 00133E64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80136F28 00133E68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80136F24 00133E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80136F28 00133E68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136F2C 00133E6C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80136F30 00133E70 38 80 00 05 */ li r4, 5 /* 80136F34 00133E74 38 A0 00 01 */ li r5, 1 @@ -173889,8 +173889,8 @@ lbl_80137158: /* 801371B0 001340F0 80 03 05 74 */ lwz r0, 0x574(r3) /* 801371B4 001340F4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801371B8 001340F8 41 82 00 3C */ beq lbl_801371F4 -/* 801371BC 001340FC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801371C0 00134100 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801371BC 001340FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801371C0 00134100 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801371C4 00134104 80 84 5F 18 */ lwz r4, 0x5f18(r4) /* 801371C8 00134108 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 /* 801371CC 0013410C 41 82 00 28 */ beq lbl_801371F4 @@ -174132,8 +174132,8 @@ lbl_801374EC: /* 80137500 00134440 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80137504 00134444 38 00 00 1E */ li r0, 0x1e /* 80137508 00134448 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 8013750C 0013444C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80137510 00134450 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013750C 0013444C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80137510 00134450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80137514 00134454 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80137518 00134458 64 00 08 00 */ oris r0, r0, 0x800 /* 8013751C 0013445C 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -174231,8 +174231,8 @@ daAlink_c_NS_procWolfLieMoveInit: /* 8013766C 001345AC 4B FF 11 A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf /* 80137670 001345B0 7C 60 00 34 */ cntlzw r0, r3 /* 80137674 001345B4 54 1D DE 3E */ rlwinm r29, r0, 0x1b, 0x18, 0x1f -/* 80137678 001345B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013767C 001345BC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80137678 001345B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013767C 001345BC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80137680 001345C0 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 80137684 001345C4 54 1C 9F FE */ rlwinm r28, r0, 0x13, 0x1f, 0x1f /* 80137688 001345C8 7F 63 DB 78 */ mr r3, r27 @@ -174424,8 +174424,8 @@ lbl_80137938: /* 80137938 00134878 80 19 06 14 */ lwz r0, 0x614(r25) /* 8013793C 0013487C 28 00 00 2C */ cmplwi r0, 0x2c /* 80137940 00134880 40 82 00 18 */ bne lbl_80137958 -/* 80137944 00134884 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80137948 00134888 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80137944 00134884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80137948 00134888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013794C 0013488C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80137950 00134890 80 99 31 84 */ lwz r4, 0x3184(r25) /* 80137954 00134894 4B F1 08 29 */ bl dEvent_manager_c_NS_cutEnd @@ -174672,8 +174672,8 @@ daAlink_c_NS_procWolfLieAutoMoveInit: /* 80137CA4 00134BE4 7C 7B 1B 78 */ mr r27, r3 /* 80137CA8 00134BE8 7C 9C 23 78 */ mr r28, r4 /* 80137CAC 00134BEC 7C BD 2B 78 */ mr r29, r5 -/* 80137CB0 00134BF0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80137CB4 00134BF4 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 80137CB0 00134BF0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80137CB4 00134BF4 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80137CB8 00134BF8 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 80137CBC 00134BFC 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 80137CC0 00134C00 38 80 01 02 */ li r4, 0x102 @@ -174778,8 +174778,8 @@ lbl_80137E0C: /* 80137E38 00134D78 2C 00 FF FF */ cmpwi r0, -1 /* 80137E3C 00134D7C 40 82 01 A0 */ bne lbl_80137FDC /* 80137E40 00134D80 38 80 00 00 */ li r4, 0 -/* 80137E44 00134D84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80137E48 00134D88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80137E44 00134D84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80137E48 00134D88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80137E4C 00134D8C 98 83 5E 81 */ stb r4, 0x5e81(r3) /* 80137E50 00134D90 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 80137E54 00134D94 A8 1F 04 DE */ lha r0, 0x4de(r31) @@ -174996,8 +174996,8 @@ lbl_80138134: /* 80138140 00135080 38 84 F8 B4 */ addi r4, r4, lbl_8038F8B4@l /* 80138144 00135084 C0 44 00 54 */ lfs f2, 0x54(r4) /* 80138148 00135088 4B F7 B7 DD */ bl daAlink_c_NS_setNormalSpeedF -/* 8013814C 0013508C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80138150 00135090 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013814C 0013508C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80138150 00135090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80138154 00135094 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80138158 00135098 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8013815C 0013509C 41 82 00 0C */ beq lbl_80138168 @@ -175206,8 +175206,8 @@ daAlink_c_NS_procWolfSwimUpInit: /* 80138434 00135374 7F E3 FB 78 */ mr r3, r31 /* 80138438 00135378 38 80 00 8E */ li r4, 0x8e /* 8013843C 0013537C 4B F7 74 65 */ bl daAlink_c_NS_setFaceBasicTexture -/* 80138440 00135380 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80138444 00135384 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80138440 00135380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80138444 00135384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80138448 00135388 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8013844C 0013538C 64 00 00 10 */ oris r0, r0, 0x10 /* 80138450 00135390 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -175324,8 +175324,8 @@ lbl_801385D4: lbl_801385E0: /* 801385E0 00135520 FC 40 F8 90 */ fmr f2, f31 /* 801385E4 00135524 4B FF 10 F5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed -/* 801385E8 00135528 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801385EC 0013552C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801385E8 00135528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801385EC 0013552C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801385F0 00135530 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 801385F4 00135534 64 00 00 10 */ oris r0, r0, 0x10 /* 801385F8 00135538 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -175436,8 +175436,8 @@ daAlink_c_NS_procWolfSwimMoveInit: /* 8013876C 001356AC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80138770 001356B0 D0 1F 04 FC */ stfs f0, 0x4fc(r31) lbl_80138774: -/* 80138774 001356B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80138778 001356B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80138774 001356B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80138778 001356B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013877C 001356BC 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80138780 001356C0 64 00 00 10 */ oris r0, r0, 0x10 /* 80138784 001356C4 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -175851,8 +175851,8 @@ daAlink_c_NS_setWolfLockDomeModel: /* 80138D44 00135C84 38 63 F6 F4 */ addi r3, r3, lbl_8038F6F4@l /* 80138D48 00135C88 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 80138D4C 00135C8C D0 1E 34 90 */ stfs f0, 0x3490(r30) -/* 80138D50 00135C90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80138D54 00135C94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80138D50 00135C90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80138D54 00135C94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80138D58 00135C98 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80138D5C 00135C9C 64 00 00 80 */ oris r0, r0, 0x80 /* 80138D60 00135CA0 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -175894,8 +175894,8 @@ daAlink_c_NS_setWolfBallModel: /* 80138DDC 00135D1C 7C 7E 1B 78 */ mr r30, r3 /* 80138DE0 00135D20 38 62 92 90 */ addi r3, r2, lbl_80452C90-_SDA2_BASE_ /* 80138DE4 00135D24 38 80 00 25 */ li r4, 0x25 -/* 80138DE8 00135D28 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80138DEC 00135D2C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80138DE8 00135D28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80138DEC 00135D2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80138DF0 00135D30 3F E5 00 02 */ addis r31, r5, 2 /* 80138DF4 00135D34 3B FF C2 F8 */ addi r31, r31, -15624 /* 80138DF8 00135D38 7F E5 FB 78 */ mr r5, r31 @@ -176001,8 +176001,8 @@ daAlink_c_NS_resetWolfBallGrab: /* 80138F78 00135EB8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 80138F7C 00135EBC 4B F7 47 A9 */ bl daAlink_c_NS_resetUpperAnime lbl_80138F80: -/* 80138F80 00135EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80138F84 00135EC4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80138F80 00135EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80138F84 00135EC4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80138F88 00135EC8 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80138F8C 00135ECC 38 80 00 00 */ li r4, 0 /* 80138F90 00135ED0 90 81 00 08 */ stw r4, 8(r1) @@ -176237,8 +176237,8 @@ daAlink_searchWolfLockEnemy: /* 801392B0 001361F0 90 01 00 14 */ stw r0, 0x14(r1) /* 801392B4 001361F4 7C 60 1B 78 */ mr r0, r3 /* 801392B8 001361F8 7C 85 23 78 */ mr r5, r4 -/* 801392BC 001361FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801392C0 00136200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801392BC 001361FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801392C0 00136200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801392C4 00136204 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801392C8 00136208 7C 04 03 78 */ mr r4, r0 /* 801392CC 0013620C 4B FF FF 19 */ bl daAlink_c_NS_searchWolfLockEnemy @@ -176256,8 +176256,8 @@ daAlink_c_NS_checkWolfComboCnt: /* 801392F0 00136230 39 61 00 20 */ addi r11, r1, 0x20 /* 801392F4 00136234 48 22 8E E9 */ bl _savegpr_29 /* 801392F8 00136238 7C 7D 1B 78 */ mr r29, r3 -/* 801392FC 0013623C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139300 00136240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801392FC 0013623C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139300 00136240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139304 00136244 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80139308 00136248 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 /* 8013930C 0013624C 40 82 00 80 */ bne lbl_8013938C @@ -176566,8 +176566,8 @@ daAlink_c_NS_setWolfBiteDamage: /* 80139730 00136670 D0 01 00 18 */ stfs f0, 0x18(r1) /* 80139734 00136674 C0 03 02 9C */ lfs f0, 0x29c(r3) /* 80139738 00136678 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8013973C 0013667C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139740 00136680 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013973C 0013667C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139740 00136680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139744 00136684 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80139748 00136688 38 80 00 01 */ li r4, 1 /* 8013974C 0013668C 38 C1 00 14 */ addi r6, r1, 0x14 @@ -176581,8 +176581,8 @@ daAlink_c_NS_setWolfBiteDamage: /* 8013976C 001366AC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80139770 001366B0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80139774 001366B4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80139778 001366B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013977C 001366BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80139778 001366B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013977C 001366BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139780 001366C0 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80139784 001366C4 38 80 00 03 */ li r4, 3 /* 80139788 001366C8 38 A0 00 1F */ li r5, 0x1f @@ -176606,8 +176606,8 @@ daAlink_c_NS_checkWolfLockAttackChargeState: /* 801397C4 00136704 80 03 05 70 */ lwz r0, 0x570(r3) /* 801397C8 00136708 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801397CC 0013670C 41 82 00 24 */ beq lbl_801397F0 -/* 801397D0 00136710 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801397D4 00136714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801397D0 00136710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801397D4 00136714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801397D8 00136718 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801397DC 0013671C 38 80 05 01 */ li r4, 0x501 /* 801397E0 00136720 4B EF B1 DD */ bl isEventBit__11dSv_event_cCFUs @@ -176618,15 +176618,15 @@ lbl_801397F0: /* 801397F0 00136730 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 801397F4 00136734 41 82 00 50 */ beq lbl_80139844 /* 801397F8 00136738 3B A0 00 00 */ li r29, 0 -/* 801397FC 0013673C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139800 00136740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801397FC 0013673C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139800 00136740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139804 00136744 38 63 00 28 */ addi r3, r3, 0x28 /* 80139808 00136748 38 80 00 03 */ li r4, 3 /* 8013980C 0013674C 4B EF 93 E1 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 80139810 00136750 2C 03 00 00 */ cmpwi r3, 0 /* 80139814 00136754 41 82 00 24 */ beq lbl_80139838 -/* 80139818 00136758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013981C 0013675C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80139818 00136758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013981C 0013675C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139820 00136760 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80139824 00136764 38 80 1E 08 */ li r4, 0x1e08 /* 80139828 00136768 4B EF B1 95 */ bl isEventBit__11dSv_event_cCFUs @@ -176645,8 +176645,8 @@ lbl_80139844: /* 80139854 00136794 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80139858 00136798 28 00 00 01 */ cmplwi r0, 1 /* 8013985C 0013679C 41 82 00 24 */ beq lbl_80139880 -/* 80139860 001367A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139864 001367A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80139860 001367A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139864 001367A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139868 001367A8 38 63 00 28 */ addi r3, r3, 0x28 /* 8013986C 001367AC 38 80 00 03 */ li r4, 3 /* 80139870 001367B0 4B EF 93 7D */ bl isTransformLV__21dSv_player_status_b_cCFi @@ -176780,8 +176780,8 @@ lbl_801399FC: /* 80139A38 00136978 3C 80 00 01 */ lis r4, 0x00010037@ha /* 80139A3C 0013697C 38 84 00 37 */ addi r4, r4, 0x00010037@l /* 80139A40 00136980 4B F8 56 79 */ bl daAlink_c_NS_voiceStartLevel -/* 80139A44 00136984 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139A48 00136988 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80139A44 00136984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139A48 00136988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139A4C 0013698C 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80139A50 00136990 64 00 40 00 */ oris r0, r0, 0x4000 /* 80139A54 00136994 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -177111,8 +177111,8 @@ lbl_80139EB0: /* 80139EEC 00136E2C 81 8C 01 18 */ lwz r12, 0x118(r12) /* 80139EF0 00136E30 7D 89 03 A6 */ mtctr r12 /* 80139EF4 00136E34 4E 80 04 21 */ bctrl -/* 80139EF8 00136E38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80139EFC 00136E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80139EF8 00136E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80139EFC 00136E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139F00 00136E40 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80139F04 00136E44 38 80 05 20 */ li r4, 0x520 /* 80139F08 00136E48 4B EF AA B5 */ bl isEventBit__11dSv_event_cCFUs @@ -177496,8 +177496,8 @@ lbl_8013A420: /* 8013A45C 0013739C 80 1D 05 80 */ lwz r0, 0x580(r29) /* 8013A460 001373A0 60 00 00 02 */ ori r0, r0, 2 /* 8013A464 001373A4 90 1D 05 80 */ stw r0, 0x580(r29) -/* 8013A468 001373A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013A46C 001373AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013A468 001373A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013A46C 001373AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A470 001373B0 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8013A474 001373B4 60 00 00 02 */ ori r0, r0, 2 /* 8013A478 001373B8 90 03 5F 18 */ stw r0, 0x5f18(r3) @@ -177605,8 +177605,8 @@ lbl_8013A5D4: /* 8013A5F8 00137538 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013A5FC 0013753C D0 01 00 18 */ stfs f0, 0x18(r1) /* 8013A600 00137540 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8013A604 00137544 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013A608 00137548 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013A604 00137544 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013A608 00137548 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A60C 0013754C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013A610 00137550 38 80 00 01 */ li r4, 1 /* 8013A614 00137554 38 A0 00 0F */ li r5, 0xf @@ -177644,8 +177644,8 @@ lbl_8013A66C: /* 8013A688 001375C8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013A68C 001375CC D0 01 00 0C */ stfs f0, 0xc(r1) /* 8013A690 001375D0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8013A694 001375D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013A698 001375D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013A694 001375D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013A698 001375D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A69C 001375DC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013A6A0 001375E0 38 80 00 01 */ li r4, 1 /* 8013A6A4 001375E4 38 A0 00 0F */ li r5, 0xf @@ -177777,8 +177777,8 @@ daAlink_c_NS_procWolfJumpAttackKickInit: /* 8013A868 001377A8 81 8C 01 18 */ lwz r12, 0x118(r12) /* 8013A86C 001377AC 7D 89 03 A6 */ mtctr r12 /* 8013A870 001377B0 4E 80 04 21 */ bctrl -/* 8013A874 001377B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013A878 001377B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013A874 001377B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013A878 001377B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A87C 001377BC 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013A880 001377C0 64 00 00 20 */ oris r0, r0, 0x20 /* 8013A884 001377C4 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -177800,8 +177800,8 @@ daAlink_c_NS_procWolfJumpAttackKickInit: /* 8013A8C4 00137804 7F E3 FB 78 */ mr r3, r31 /* 8013A8C8 00137808 38 80 00 02 */ li r4, 2 /* 8013A8CC 0013780C 4B FF 3A CD */ bl daAlink_c_NS_procWolfBackJumpInit -/* 8013A8D0 00137810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013A8D4 00137814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013A8D0 00137810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013A8D4 00137814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A8D8 00137818 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013A8DC 0013781C 64 00 00 20 */ oris r0, r0, 0x20 /* 8013A8E0 00137820 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -178076,8 +178076,8 @@ daAlink_c_NS_procWolfJumpAttackNormalLandInit: /* 8013ACB8 00137BF8 B0 1E 30 7E */ sth r0, 0x307e(r30) /* 8013ACBC 00137BFC 2C 1F 00 00 */ cmpwi r31, 0 /* 8013ACC0 00137C00 41 82 00 18 */ beq lbl_8013ACD8 -/* 8013ACC4 00137C04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013ACC8 00137C08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013ACC4 00137C04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013ACC8 00137C08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013ACCC 00137C0C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013ACD0 00137C10 64 00 00 20 */ oris r0, r0, 0x20 /* 8013ACD4 00137C14 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -178348,8 +178348,8 @@ lbl_8013B090: /* 8013B0AC 00137FEC 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8013B0B0 00137FF0 28 00 00 2B */ cmplwi r0, 0x2b /* 8013B0B4 00137FF4 40 82 00 1C */ bne lbl_8013B0D0 -/* 8013B0B8 00137FF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013B0BC 00137FFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013B0B8 00137FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013B0BC 00137FFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013B0C0 00138000 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013B0C4 00138004 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8013B0C8 00138008 4B F0 D0 B5 */ bl dEvent_manager_c_NS_cutEnd @@ -178998,8 +178998,8 @@ daAlink_c_NS_procWolfDownAtLandInit: /* 8013BA00 00138940 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013BA04 00138944 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8013BA08 00138948 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8013BA0C 0013894C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013BA10 00138950 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013BA0C 0013894C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013BA10 00138950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013BA14 00138954 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013BA18 00138958 38 80 00 02 */ li r4, 2 /* 8013BA1C 0013895C 38 A0 00 0F */ li r5, 0xf @@ -179049,8 +179049,8 @@ lbl_8013BA70: /* 8013BAC8 00138A08 60 00 00 20 */ ori r0, r0, 0x20 /* 8013BACC 00138A0C B0 1D 05 8E */ sth r0, 0x58e(r29) /* 8013BAD0 00138A10 38 DD 05 68 */ addi r6, r29, 0x568 -/* 8013BAD4 00138A14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013BAD8 00138A18 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8013BAD4 00138A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013BAD8 00138A18 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8013BADC 00138A1C 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8013BAE0 00138A20 38 80 00 00 */ li r4, 0 /* 8013BAE4 00138A24 90 81 00 08 */ stw r4, 8(r1) @@ -179121,8 +179121,8 @@ lbl_8013BBC0: /* 8013BBE0 00138B20 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013BBE4 00138B24 D0 01 00 30 */ stfs f0, 0x30(r1) /* 8013BBE8 00138B28 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 8013BBEC 00138B2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013BBF0 00138B30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013BBEC 00138B2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013BBF0 00138B30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013BBF4 00138B34 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013BBF8 00138B38 38 80 00 02 */ li r4, 2 /* 8013BBFC 00138B3C 38 A0 00 0F */ li r5, 0xf @@ -179151,8 +179151,8 @@ lbl_8013BC48: /* 8013BC50 00138B90 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013BC54 00138B94 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8013BC58 00138B98 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8013BC5C 00138B9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013BC60 00138BA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013BC5C 00138B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013BC60 00138BA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013BC64 00138BA4 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013BC68 00138BA8 38 80 00 02 */ li r4, 2 /* 8013BC6C 00138BAC 38 A0 00 0F */ li r5, 0xf @@ -179205,8 +179205,8 @@ daAlink_c_NS_procWolfDownAtMissLandInit: /* 8013BD14 00138C54 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013BD18 00138C58 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8013BD1C 00138C5C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8013BD20 00138C60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013BD24 00138C64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013BD20 00138C60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013BD24 00138C64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013BD28 00138C68 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013BD2C 00138C6C 38 80 00 01 */ li r4, 1 /* 8013BD30 00138C70 38 A0 00 0F */ li r5, 0xf @@ -179647,8 +179647,8 @@ lbl_8013C2B0: /* 8013C354 00139294 81 8C 01 14 */ lwz r12, 0x114(r12) /* 8013C358 00139298 7D 89 03 A6 */ mtctr r12 /* 8013C35C 0013929C 4E 80 04 21 */ bctrl -/* 8013C360 001392A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013C364 001392A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013C360 001392A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013C364 001392A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013C368 001392A8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013C36C 001392AC 64 00 01 00 */ oris r0, r0, 0x100 /* 8013C370 001392B0 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -179924,8 +179924,8 @@ lbl_8013C72C: /* 8013C74C 0013968C D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8013C750 00139690 38 00 00 04 */ li r0, 4 /* 8013C754 00139694 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8013C758 00139698 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013C75C 0013969C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013C758 00139698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013C75C 0013969C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013C760 001396A0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013C764 001396A4 64 00 01 00 */ oris r0, r0, 0x100 /* 8013C768 001396A8 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -180053,8 +180053,8 @@ daAlink_c_NS_procWolfAttackReverseInit: /* 8013C92C 0013986C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013C930 00139870 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8013C934 00139874 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8013C938 00139878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013C93C 0013987C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013C938 00139878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013C93C 0013987C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013C940 00139880 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013C944 00139884 38 80 00 05 */ li r4, 5 /* 8013C948 00139888 38 A0 00 0F */ li r5, 0xf @@ -180369,8 +180369,8 @@ lbl_8013CD64: /* 8013CDB4 00139CF4 81 8C 01 14 */ lwz r12, 0x114(r12) /* 8013CDB8 00139CF8 7D 89 03 A6 */ mtctr r12 /* 8013CDBC 00139CFC 4E 80 04 21 */ bctrl -/* 8013CDC0 00139D00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013CDC4 00139D04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013CDC0 00139D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013CDC4 00139D04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013CDC8 00139D08 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013CDCC 00139D0C 64 00 00 20 */ oris r0, r0, 0x20 /* 8013CDD0 00139D10 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -181017,8 +181017,8 @@ lbl_8013D6EC: /* 8013D6FC 0013A63C 80 1F 06 14 */ lwz r0, 0x614(r31) /* 8013D700 0013A640 28 00 00 0D */ cmplwi r0, 0xd /* 8013D704 0013A644 40 82 00 1C */ bne lbl_8013D720 -/* 8013D708 0013A648 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013D70C 0013A64C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013D708 0013A648 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013D70C 0013A64C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013D710 0013A650 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013D714 0013A654 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8013D718 0013A658 4B F0 AA 65 */ bl dEvent_manager_c_NS_cutEnd @@ -181043,8 +181043,8 @@ lbl_8013D750: /* 8013D758 0013A698 80 1F 06 14 */ lwz r0, 0x614(r31) /* 8013D75C 0013A69C 28 00 00 0D */ cmplwi r0, 0xd /* 8013D760 0013A6A0 40 82 00 20 */ bne lbl_8013D780 -/* 8013D764 0013A6A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013D768 0013A6A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013D764 0013A6A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013D768 0013A6A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013D76C 0013A6AC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013D770 0013A6B0 80 9F 31 84 */ lwz r4, 0x3184(r31) /* 8013D774 0013A6B4 4B F0 AA 09 */ bl dEvent_manager_c_NS_cutEnd @@ -181369,8 +181369,8 @@ lbl_8013DBD4: lbl_8013DBFC: /* 8013DBFC 0013AB3C 3B E0 00 86 */ li r31, 0x86 lbl_8013DC00: -/* 8013DC00 0013AB40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013DC04 0013AB44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013DC00 0013AB40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013DC04 0013AB44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013DC08 0013AB48 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013DC0C 0013AB4C 4B F0 AC 21 */ bl dEvent_manager_c_NS_checkStartDemo /* 8013DC10 0013AB50 2C 03 00 00 */ cmpwi r3, 0 @@ -181597,8 +181597,8 @@ daAlink_c_NS_procWolfGanonCatchInit: /* 8013DF38 0013AE78 90 01 00 14 */ stw r0, 0x14(r1) /* 8013DF3C 0013AE7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013DF40 0013AE80 7C 7F 1B 78 */ mr r31, r3 -/* 8013DF44 0013AE84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013DF48 0013AE88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013DF44 0013AE84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013DF48 0013AE88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013DF4C 0013AE8C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013DF50 0013AE90 7F E4 FB 78 */ mr r4, r31 /* 8013DF54 0013AE94 38 A0 00 00 */ li r5, 0 @@ -182346,8 +182346,8 @@ lbl_8013E9B0: /* 8013E9E8 0013B928 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013E9EC 0013B92C D0 01 00 64 */ stfs f0, 0x64(r1) /* 8013E9F0 0013B930 D0 21 00 68 */ stfs f1, 0x68(r1) -/* 8013E9F4 0013B934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013E9F8 0013B938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013E9F4 0013B934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013E9F8 0013B938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013E9FC 0013B93C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 8013EA00 0013B940 38 80 00 07 */ li r4, 7 /* 8013EA04 0013B944 38 A0 00 03 */ li r5, 3 @@ -182607,8 +182607,8 @@ lbl_8013EDAC: lbl_8013EDB8: /* 8013EDB8 0013BCF8 2C 1F 00 00 */ cmpwi r31, 0 /* 8013EDBC 0013BCFC 41 82 00 3C */ beq lbl_8013EDF8 -/* 8013EDC0 0013BD00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013EDC4 0013BD04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013EDC0 0013BD00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013EDC4 0013BD04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013EDC8 0013BD08 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013EDCC 0013BD0C 7F C4 F3 78 */ mr r4, r30 /* 8013EDD0 0013BD10 38 A0 00 00 */ li r5, 0 @@ -182832,8 +182832,8 @@ lbl_8013F078: /* 8013F0E4 0013C024 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 8013F0E8 0013C028 38 81 00 08 */ addi r4, r1, 8 /* 8013F0EC 0013C02C 48 12 8C 3D */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8013F0F0 0013C030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F0F4 0013C034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F0F0 0013C030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F0F4 0013C034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F0F8 0013C038 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8013F0FC 0013C03C 7F E3 FB 78 */ mr r3, r31 /* 8013F100 0013C040 38 9E 1D 08 */ addi r4, r30, 0x1d08 @@ -182934,8 +182934,8 @@ lbl_8013F23C: /* 8013F25C 0013C19C D0 01 00 18 */ stfs f0, 0x18(r1) /* 8013F260 0013C1A0 C0 1F 37 D0 */ lfs f0, 0x37d0(r31) /* 8013F264 0013C1A4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8013F268 0013C1A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F26C 0013C1AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F268 0013C1A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F26C 0013C1AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F270 0013C1B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8013F274 0013C1B4 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 8013F278 0013C1B8 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -183103,8 +183103,8 @@ daAlink_c_NS_procWolfDigThroughInit: /* 8013F4CC 0013C40C B0 1D 06 04 */ sth r0, 0x604(r29) /* 8013F4D0 0013C410 48 00 00 3C */ b lbl_8013F50C lbl_8013F4D4: -/* 8013F4D4 0013C414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F4D8 0013C418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F4D4 0013C414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F4D8 0013C418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F4DC 0013C41C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013F4E0 0013C420 7F A4 EB 78 */ mr r4, r29 /* 8013F4E4 0013C424 38 A0 00 00 */ li r5, 0 @@ -183195,8 +183195,8 @@ lbl_8013F5C4: /* 8013F618 0013C558 4B ED E6 A5 */ bl fopAcM_gc_c_NS_gndCheck /* 8013F61C 0013C55C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013F620 0013C560 41 82 00 7C */ beq lbl_8013F69C -/* 8013F624 0013C564 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F628 0013C568 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F624 0013C564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F628 0013C568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F62C 0013C56C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8013F630 0013C570 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha /* 8013F634 0013C574 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l @@ -183235,8 +183235,8 @@ lbl_8013F69C: lbl_8013F6B0: /* 8013F6B0 0013C5F0 7C 1C 03 78 */ mr r28, r0 /* 8013F6B4 0013C5F4 3B E0 00 00 */ li r31, 0 -/* 8013F6B8 0013C5F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F6BC 0013C5FC 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8013F6B8 0013C5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F6BC 0013C5FC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_8013F6C0: /* 8013F6C0 0013C600 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8013F6C4 0013C604 38 80 00 00 */ li r4, 0 @@ -183333,8 +183333,8 @@ lbl_8013F818: /* 8013F828 0013C768 A8 1E 30 12 */ lha r0, 0x3012(r30) /* 8013F82C 0013C76C 2C 00 00 00 */ cmpwi r0, 0 /* 8013F830 0013C770 41 82 00 24 */ beq lbl_8013F854 -/* 8013F834 0013C774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F838 0013C778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F834 0013C774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F838 0013C778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F83C 0013C77C 38 63 0D B4 */ addi r3, r3, 0xdb4 /* 8013F840 0013C780 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8013F844 0013C784 A8 BE 04 E6 */ lha r5, 0x4e6(r30) @@ -183402,8 +183402,8 @@ daAlink_c_NS_setSmellSave: /* 8013F914 0013C854 90 01 00 14 */ stw r0, 0x14(r1) /* 8013F918 0013C858 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013F91C 0013C85C 7C 7F 1B 78 */ mr r31, r3 -/* 8013F920 0013C860 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F924 0013C864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F920 0013C860 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F924 0013C864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F928 0013C868 88 03 00 16 */ lbz r0, 0x16(r3) /* 8013F92C 0013C86C 28 00 00 B5 */ cmplwi r0, 0xb5 /* 8013F930 0013C870 40 82 00 10 */ bne lbl_8013F940 @@ -183417,8 +183417,8 @@ lbl_8013F940: /* 8013F94C 0013C88C A8 1F 30 12 */ lha r0, 0x3012(r31) /* 8013F950 0013C890 2C 00 00 B5 */ cmpwi r0, 0xb5 /* 8013F954 0013C894 40 82 00 1C */ bne lbl_8013F970 -/* 8013F958 0013C898 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F95C 0013C89C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F958 0013C898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F95C 0013C89C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F960 0013C8A0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F964 0013C8A4 38 80 2F 04 */ li r4, 0x2f04 /* 8013F968 0013C8A8 4B EF 50 25 */ bl onEventBit__11dSv_event_cFUs @@ -183426,8 +183426,8 @@ lbl_8013F940: lbl_8013F970: /* 8013F970 0013C8B0 2C 00 00 B4 */ cmpwi r0, 0xb4 /* 8013F974 0013C8B4 40 82 00 20 */ bne lbl_8013F994 -/* 8013F978 0013C8B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F97C 0013C8BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F978 0013C8B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F97C 0013C8BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F980 0013C8C0 38 80 00 66 */ li r4, 0x66 /* 8013F984 0013C8C4 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 8013F988 0013C8C8 7C 05 07 74 */ extsb r5, r0 @@ -183436,8 +183436,8 @@ lbl_8013F970: lbl_8013F994: /* 8013F994 0013C8D4 2C 00 00 B0 */ cmpwi r0, 0xb0 /* 8013F998 0013C8D8 40 82 00 20 */ bne lbl_8013F9B8 -/* 8013F99C 0013C8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F9A0 0013C8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F99C 0013C8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F9A0 0013C8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F9A4 0013C8E4 38 80 00 67 */ li r4, 0x67 /* 8013F9A8 0013C8E8 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 8013F9AC 0013C8EC 7C 05 07 74 */ extsb r5, r0 @@ -183446,8 +183446,8 @@ lbl_8013F994: lbl_8013F9B8: /* 8013F9B8 0013C8F8 2C 00 00 B3 */ cmpwi r0, 0xb3 /* 8013F9BC 0013C8FC 40 82 00 1C */ bne lbl_8013F9D8 -/* 8013F9C0 0013C900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F9C4 0013C904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F9C0 0013C900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F9C4 0013C904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F9C8 0013C908 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F9CC 0013C90C 38 80 61 20 */ li r4, 0x6120 /* 8013F9D0 0013C910 4B EF 4F BD */ bl onEventBit__11dSv_event_cFUs @@ -183455,8 +183455,8 @@ lbl_8013F9B8: lbl_8013F9D8: /* 8013F9D8 0013C918 2C 00 00 B2 */ cmpwi r0, 0xb2 /* 8013F9DC 0013C91C 40 82 00 18 */ bne lbl_8013F9F4 -/* 8013F9E0 0013C920 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013F9E4 0013C924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013F9E0 0013C920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013F9E4 0013C924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013F9E8 0013C928 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F9EC 0013C92C 38 80 62 10 */ li r4, 0x6210 /* 8013F9F0 0013C930 4B EF 4F 9D */ bl onEventBit__11dSv_event_cFUs @@ -183477,8 +183477,8 @@ daAlink_c_NS_procWolfGetSmellInit: /* 8013FA1C 0013C95C 90 01 00 14 */ stw r0, 0x14(r1) /* 8013FA20 0013C960 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013FA24 0013C964 7C 7F 1B 78 */ mr r31, r3 -/* 8013FA28 0013C968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FA2C 0013C96C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FA28 0013C968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FA2C 0013C96C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FA30 0013C970 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013FA34 0013C974 7F E4 FB 78 */ mr r4, r31 /* 8013FA38 0013C978 38 A0 00 00 */ li r5, 0 @@ -183548,8 +183548,8 @@ lbl_8013FA58: /* 8013FB34 0013CA74 80 03 04 9C */ lwz r0, 0x49c(r3) /* 8013FB38 0013CA78 60 00 08 00 */ ori r0, r0, 0x800 /* 8013FB3C 0013CA7C 90 03 04 9C */ stw r0, 0x49c(r3) -/* 8013FB40 0013CA80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FB44 0013CA84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FB40 0013CA80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FB44 0013CA84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FB48 0013CA88 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013FB4C 0013CA8C 64 00 04 00 */ oris r0, r0, 0x400 /* 8013FB50 0013CA90 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -183581,8 +183581,8 @@ lbl_8013FBA8: /* 8013FBA8 0013CAE8 80 1F 31 9C */ lwz r0, 0x319c(r31) /* 8013FBAC 0013CAEC 2C 00 00 00 */ cmpwi r0, 0 /* 8013FBB0 0013CAF0 41 80 00 20 */ blt lbl_8013FBD0 -/* 8013FBB4 0013CAF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FBB8 0013CAF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FBB4 0013CAF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FBB8 0013CAF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FBBC 0013CAFC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013FBC0 0013CB00 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 8013FBC4 0013CB04 4B EF 4D F9 */ bl isEventBit__11dSv_event_cCFUs @@ -183625,13 +183625,13 @@ lbl_8013FC10: /* 8013FC4C 0013CB8C A0 1E 06 04 */ lhz r0, 0x604(r30) /* 8013FC50 0013CB90 2C 00 00 05 */ cmpwi r0, 5 /* 8013FC54 0013CB94 40 82 00 90 */ bne lbl_8013FCE4 -/* 8013FC58 0013CB98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FC5C 0013CB9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FC58 0013CB98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FC5C 0013CB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FC60 0013CBA0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013FC64 0013CBA4 7F C4 F3 78 */ mr r4, r30 /* 8013FC68 0013CBA8 4B F0 28 B1 */ bl dEvt_control_c_NS_reset_X1_ -/* 8013FC6C 0013CBAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FC70 0013CBB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FC6C 0013CBAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FC70 0013CBB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FC74 0013CBB4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013FC78 0013CBB8 54 00 01 88 */ rlwinm r0, r0, 0, 6, 4 /* 8013FC7C 0013CBBC 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -183666,13 +183666,13 @@ lbl_8013FCE4: /* 8013FCE4 0013CC24 80 1E 06 0C */ lwz r0, 0x60c(r30) /* 8013FCE8 0013CC28 2C 00 00 00 */ cmpwi r0, 0 /* 8013FCEC 0013CC2C 40 82 00 3C */ bne lbl_8013FD28 -/* 8013FCF0 0013CC30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FCF4 0013CC34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FCF0 0013CC30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FCF4 0013CC34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FCF8 0013CC38 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013FCFC 0013CC3C 54 84 04 3E */ clrlwi r4, r4, 0x10 /* 8013FD00 0013CC40 4B EF 4C 8D */ bl onEventBit__11dSv_event_cFUs -/* 8013FD04 0013CC44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FD08 0013CC48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FD04 0013CC44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FD08 0013CC48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FD0C 0013CC4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013FD10 0013CC50 80 9E 31 84 */ lwz r4, 0x3184(r30) /* 8013FD14 0013CC54 4B F0 84 69 */ bl dEvent_manager_c_NS_cutEnd @@ -183719,8 +183719,8 @@ lbl_8013FDA4: /* 8013FDA4 0013CCE4 A0 1E 28 9E */ lhz r0, 0x289e(r30) /* 8013FDA8 0013CCE8 7C 00 07 35 */ extsh. r0, r0 /* 8013FDAC 0013CCEC 40 82 01 60 */ bne lbl_8013FF0C -/* 8013FDB0 0013CCF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FDB4 0013CCF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FDB0 0013CCF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FDB4 0013CCF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FDB8 0013CCF8 88 63 00 16 */ lbz r3, 0x16(r3) /* 8013FDBC 0013CCFC A8 1E 30 12 */ lha r0, 0x3012(r30) /* 8013FDC0 0013CD00 7C 00 18 00 */ cmpw r0, r3 @@ -183755,8 +183755,8 @@ lbl_8013FE18: /* 8013FE28 0013CD68 38 A0 FF FF */ li r5, -1 /* 8013FE2C 0013CD6C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) /* 8013FE30 0013CD70 4B FE 98 D5 */ bl daAlink_c_NS_setSingleAnimeWolf -/* 8013FE34 0013CD74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8013FE38 0013CD78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8013FE34 0013CD74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8013FE38 0013CD78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FE3C 0013CD7C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8013FE40 0013CD80 64 00 04 00 */ oris r0, r0, 0x400 /* 8013FE44 0013CD84 90 03 5F 1C */ stw r0, 0x5f1c(r3) @@ -183831,8 +183831,8 @@ daAlink_c_NS_setArcName: /* 8013FF34 0013CE74 90 03 06 34 */ stw r0, 0x634(r3) /* 8013FF38 0013CE78 4E 80 00 20 */ blr lbl_8013FF3C: -/* 8013FF3C 0013CE7C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8013FF40 0013CE80 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8013FF3C 0013CE7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8013FF40 0013CE80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8013FF44 0013CE84 88 04 00 13 */ lbz r0, 0x13(r4) /* 8013FF48 0013CE88 28 00 00 2E */ cmplwi r0, 0x2e /* 8013FF4C 0013CE8C 40 82 00 10 */ bne lbl_8013FF5C @@ -183858,8 +183858,8 @@ lbl_8013FF84: .global daAlink_c_NS_setShieldArcName daAlink_c_NS_setShieldArcName: -/* 8013FF90 0013CED0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8013FF94 0013CED4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8013FF90 0013CED0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8013FF94 0013CED4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8013FF98 0013CED8 88 04 00 15 */ lbz r0, 0x15(r4) /* 8013FF9C 0013CEDC 28 00 00 2A */ cmplwi r0, 0x2a /* 8013FFA0 0013CEE0 41 82 00 0C */ beq lbl_8013FFAC @@ -184051,8 +184051,8 @@ daAlink_c_NS_setShieldModel: /* 80140218 0013D158 7C 7F 1B 78 */ mr r31, r3 /* 8014021C 0013D15C 80 7E 06 44 */ lwz r3, 0x644(r30) /* 80140220 0013D160 38 80 00 03 */ li r4, 3 -/* 80140224 0013D164 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80140228 0013D168 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80140224 0013D164 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80140228 0013D168 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8014022C 0013D16C 3C A5 00 02 */ addis r5, r5, 2 /* 80140230 0013D170 38 C0 00 80 */ li r6, 0x80 /* 80140234 0013D174 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -184429,8 +184429,8 @@ lbl_80140740: /* 80140744 0013D684 38 80 00 00 */ li r4, 0 /* 80140748 0013D688 4B FF FB F1 */ bl daAlink_c_NS_changeModelDataDirect lbl_8014074C: -/* 8014074C 0013D68C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80140750 0013D690 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8014074C 0013D68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80140750 0013D690 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 80140754 0013D694 80 7B 5C AC */ lwz r3, 0x5cac(r27) /* 80140758 0013D698 7F 44 D3 78 */ mr r4, r26 /* 8014075C 0013D69C 38 A0 14 00 */ li r5, 0x1400 @@ -184645,8 +184645,8 @@ lbl_80140A58: /* 80140A68 0013D9A8 7F A3 EB 78 */ mr r3, r29 /* 80140A6C 0013D9AC 80 9D 06 B8 */ lwz r4, 0x6b8(r29) /* 80140A70 0013D9B0 4B F8 B8 29 */ bl daAlink_c_NS_basicModelDraw -/* 80140A74 0013D9B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80140A78 0013D9B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80140A74 0013D9B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80140A78 0013D9B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80140A7C 0013D9BC 88 03 00 14 */ lbz r0, 0x14(r3) /* 80140A80 0013D9C0 28 00 00 3F */ cmplwi r0, 0x3f /* 80140A84 0013D9C4 41 82 00 10 */ beq lbl_80140A94 @@ -185170,8 +185170,8 @@ daPy_py_c_NS_checkEndResetFlg2: .global dComIfGp_setBottleStatus dComIfGp_setBottleStatus: -/* 8014119C 0013E0DC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801411A0 0013E0E0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014119C 0013E0DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801411A0 0013E0E0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801411A4 0013E0E4 98 65 5E 20 */ stb r3, 0x5e20(r5) /* 801411A8 0013E0E8 98 85 5E 46 */ stb r4, 0x5e46(r5) /* 801411AC 0013E0EC 4E 80 00 20 */ blr @@ -185218,8 +185218,8 @@ dEvt_info_c_NS_offCondition: .global daPy_py_c_NS_checkShieldGet daPy_py_c_NS_checkShieldGet: -/* 80141210 0013E150 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141214 0013E154 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141210 0013E150 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141214 0013E154 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141218 0013E158 88 03 00 15 */ lbz r0, 0x15(r3) /* 8014121C 0013E15C 20 60 00 FF */ subfic r3, r0, 0xff /* 80141220 0013E160 30 03 FF FF */ addic r0, r3, -1 @@ -185233,8 +185233,8 @@ fopAcM_onSwitch: /* 80141234 0013E174 7C 08 02 A6 */ mflr r0 /* 80141238 0013E178 90 01 00 14 */ stw r0, 0x14(r1) /* 8014123C 0013E17C 7C 65 1B 78 */ mr r5, r3 -/* 80141240 0013E180 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141244 0013E184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141240 0013E180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141244 0013E184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141248 0013E188 88 05 04 BA */ lbz r0, 0x4ba(r5) /* 8014124C 0013E18C 7C 05 07 74 */ extsb r5, r0 /* 80141250 0013E190 4B EF 3F B1 */ bl onSwitch__10dSv_info_cFii @@ -185249,8 +185249,8 @@ dComIfGs_isItemFirstBit: /* 80141268 0013E1A8 7C 08 02 A6 */ mflr r0 /* 8014126C 0013E1AC 90 01 00 14 */ stw r0, 0x14(r1) /* 80141270 0013E1B0 7C 64 1B 78 */ mr r4, r3 -/* 80141274 0013E1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141278 0013E1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141274 0013E1B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141278 0013E1B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014127C 0013E1BC 38 63 00 CC */ addi r3, r3, 0xcc /* 80141280 0013E1C0 4B EF 2C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80141284 0013E1C4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -185266,8 +185266,8 @@ dStage_stagInfo_GetSaveTbl: .global dComIfGp_getStage dComIfGp_getStage: -/* 801412A0 0013E1E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801412A4 0013E1E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801412A0 0013E1E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801412A4 0013E1E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801412A8 0013E1E8 38 63 4E 20 */ addi r3, r3, 0x4e20 /* 801412AC 0013E1EC 4E 80 00 20 */ blr @@ -185305,15 +185305,15 @@ lbl_801412F0: .global dComIfGp_getEvent dComIfGp_getEvent: -/* 801412F8 0013E238 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801412FC 0013E23C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801412F8 0013E238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801412FC 0013E23C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141300 0013E240 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80141304 0013E244 4E 80 00 20 */ blr .global dComIfGp_checkPlayerStatus0 dComIfGp_checkPlayerStatus0: -/* 80141308 0013E248 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014130C 0013E24C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80141308 0013E248 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014130C 0013E24C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80141310 0013E250 54 60 20 36 */ slwi r0, r3, 4 /* 80141314 0013E254 7C 65 02 14 */ add r3, r5, r0 /* 80141318 0013E258 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -185322,8 +185322,8 @@ dComIfGp_checkPlayerStatus0: .global dComIfGp_checkPlayerStatus1 dComIfGp_checkPlayerStatus1: -/* 80141324 0013E264 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80141328 0013E268 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80141324 0013E264 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80141328 0013E268 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8014132C 0013E26C 54 60 20 36 */ slwi r0, r3, 4 /* 80141330 0013E270 7C 65 02 14 */ add r3, r5, r0 /* 80141334 0013E274 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -185338,8 +185338,8 @@ daPy_py_c_NS_checkEndResetFlg1: .global dComIfGp_getEventManager dComIfGp_getEventManager: -/* 8014134C 0013E28C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141350 0013E290 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014134C 0013E28C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141350 0013E290 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141354 0013E294 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80141358 0013E298 4E 80 00 20 */ blr @@ -185377,8 +185377,8 @@ dComIfGs_isEventBit: /* 801413A0 0013E2E0 7C 08 02 A6 */ mflr r0 /* 801413A4 0013E2E4 90 01 00 14 */ stw r0, 0x14(r1) /* 801413A8 0013E2E8 7C 64 1B 78 */ mr r4, r3 -/* 801413AC 0013E2EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801413B0 0013E2F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801413AC 0013E2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801413B0 0013E2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801413B4 0013E2F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801413B8 0013E2F8 4B EF 36 05 */ bl isEventBit__11dSv_event_cCFUs /* 801413BC 0013E2FC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -185394,8 +185394,8 @@ daPy_py_c_NS_checkWolf: .global daPy_py_c_NS_checkSwordGet daPy_py_c_NS_checkSwordGet: -/* 801413D8 0013E318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801413DC 0013E31C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801413D8 0013E318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801413DC 0013E31C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801413E0 0013E320 88 03 00 14 */ lbz r0, 0x14(r3) /* 801413E4 0013E324 20 60 00 FF */ subfic r3, r0, 0xff /* 801413E8 0013E328 30 03 FF FF */ addic r0, r3, -1 @@ -185423,8 +185423,8 @@ daPy_py_c_NS_checkNoResetFlg0: .global dComIfGp_getPlayerCameraID dComIfGp_getPlayerCameraID: -/* 8014141C 0013E35C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80141420 0013E360 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8014141C 0013E35C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80141420 0013E360 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80141424 0013E364 54 60 18 38 */ slwi r0, r3, 3 /* 80141428 0013E368 7C 64 02 14 */ add r3, r4, r0 /* 8014142C 0013E36C 88 63 5D B0 */ lbz r3, 0x5db0(r3) @@ -185433,8 +185433,8 @@ dComIfGp_getPlayerCameraID: .global dComIfGp_event_chkEventFlag dComIfGp_event_chkEventFlag: -/* 80141438 0013E378 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014143C 0013E37C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80141438 0013E378 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014143C 0013E37C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80141440 0013E380 A0 04 4F A0 */ lhz r0, 0x4fa0(r4) /* 80141444 0013E384 7C 60 00 38 */ and r0, r3, r0 /* 80141448 0013E388 54 03 04 3E */ clrlwi r3, r0, 0x10 @@ -185456,8 +185456,8 @@ dComIfGp_evmng_getMyStaffId: /* 80141470 0013E3B0 7C 67 1B 78 */ mr r7, r3 /* 80141474 0013E3B4 7C 80 23 78 */ mr r0, r4 /* 80141478 0013E3B8 7C A6 2B 78 */ mr r6, r5 -/* 8014147C 0013E3BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141480 0013E3C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014147C 0013E3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141480 0013E3C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141484 0013E3C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80141488 0013E3C8 7C E4 3B 78 */ mr r4, r7 /* 8014148C 0013E3CC 7C 05 03 78 */ mr r5, r0 @@ -185469,8 +185469,8 @@ dComIfGp_evmng_getMyStaffId: .global dComIfGp_event_runCheck dComIfGp_event_runCheck: -/* 801414A4 0013E3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801414A8 0013E3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801414A4 0013E3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801414A8 0013E3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801414AC 0013E3EC 88 63 4F AD */ lbz r3, 0x4fad(r3) /* 801414B0 0013E3F0 30 03 FF FF */ addic r0, r3, -1 /* 801414B4 0013E3F4 7C 00 19 10 */ subfe r0, r0, r3 @@ -185491,8 +185491,8 @@ daPy_py_c_NS_checkMagneBootsOn: .global dComIfGp_getHorseActor dComIfGp_getHorseActor: -/* 801414D8 0013E418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801414DC 0013E41C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801414D8 0013E418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801414DC 0013E41C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801414E0 0013E420 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 801414E4 0013E424 4E 80 00 20 */ blr @@ -185788,8 +185788,8 @@ daHorse_c_NS_getZeldaActor: .global dComIfGp_getDoStatus dComIfGp_getDoStatus: -/* 8014194C 0013E88C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141950 0013E890 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014194C 0013E88C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141950 0013E890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141954 0013E894 88 63 5E 24 */ lbz r3, 0x5e24(r3) /* 80141958 0013E898 4E 80 00 20 */ blr @@ -185817,15 +185817,15 @@ Z2CreatureLink_NS_setLinkState: .global dComIfGs_getRupee dComIfGs_getRupee: -/* 80141990 0013E8D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141994 0013E8D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141990 0013E8D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141994 0013E8D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141998 0013E8D8 A0 63 00 04 */ lhz r3, 4(r3) /* 8014199C 0013E8DC 4E 80 00 20 */ blr .global dComIfGp_setItemRupeeCount dComIfGp_setItemRupeeCount: -/* 801419A0 0013E8E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801419A4 0013E8E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801419A0 0013E8E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801419A4 0013E8E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801419A8 0013E8E8 80 04 5D C4 */ lwz r0, 0x5dc4(r4) /* 801419AC 0013E8EC 7C 00 1A 14 */ add r0, r0, r3 /* 801419B0 0013E8F0 90 04 5D C4 */ stw r0, 0x5dc4(r4) @@ -185875,15 +185875,15 @@ daMidna_c_NS_checkMidnaTired: /* 80141A24 0013E964 90 01 00 14 */ stw r0, 0x14(r1) /* 80141A28 0013E968 93 E1 00 0C */ stw r31, 0xc(r1) /* 80141A2C 0013E96C 3B E0 00 00 */ li r31, 0 -/* 80141A30 0013E970 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141A34 0013E974 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141A30 0013E970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141A34 0013E974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141A38 0013E978 38 63 00 28 */ addi r3, r3, 0x28 /* 80141A3C 0013E97C 38 80 00 03 */ li r4, 3 /* 80141A40 0013E980 4B EF 11 AD */ bl isTransformLV__21dSv_player_status_b_cCFi /* 80141A44 0013E984 2C 03 00 00 */ cmpwi r3, 0 /* 80141A48 0013E988 41 82 00 24 */ beq lbl_80141A6C -/* 80141A4C 0013E98C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80141A50 0013E990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80141A4C 0013E98C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80141A50 0013E990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80141A54 0013E994 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80141A58 0013E998 38 80 1E 08 */ li r4, 0x1e08 /* 80141A5C 0013E99C 4B EF 2F 61 */ bl isEventBit__11dSv_event_cCFUs diff --git a/asm/d/a/d_a_itembase.s b/asm/d/a/d_a_itembase.s index dbc65d1b2a..964f29e31a 100644 --- a/asm/d/a/d_a_itembase.s +++ b/asm/d/a/d_a_itembase.s @@ -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 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index af75e1d701..078f3ffabe 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -1779,8 +1779,8 @@ lbl_80146ED4: /* 801470C0 00144000 38 00 00 00 */ li r0, 0 /* 801470C4 00144004 90 1F 00 20 */ stw r0, 0x20(r31) /* 801470C8 00144008 48 00 02 44 */ b lbl_8014730C -/* 801470CC 0014400C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801470D0 00144010 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801470CC 0014400C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801470D0 00144010 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801470D4 00144014 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801470D8 00144018 38 03 05 50 */ addi r0, r3, 0x550 /* 801470DC 0014401C 90 1F 00 20 */ stw r0, 0x20(r31) @@ -1824,8 +1824,8 @@ lbl_80147148: /* 80147170 001440B0 C0 03 00 08 */ lfs f0, 8(r3) /* 80147174 001440B4 D0 1F 00 1C */ stfs f0, 0x1c(r31) /* 80147178 001440B8 48 00 01 94 */ b lbl_8014730C -/* 8014717C 001440BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80147180 001440C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014717C 001440BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80147180 001440C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80147184 001440C4 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 80147188 001440C8 7C 00 07 74 */ extsb r0, r0 /* 8014718C 001440CC 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -2834,8 +2834,8 @@ daNpcT_c_NS_getTrnsfrmAnmP: /* 80148060 00144FA0 90 01 00 14 */ stw r0, 0x14(r1) /* 80148064 00144FA4 7C 83 23 78 */ mr r3, r4 /* 80148068 00144FA8 7C A4 2B 78 */ mr r4, r5 -/* 8014806C 00144FAC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80148070 00144FB0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014806C 00144FAC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80148070 00144FB0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80148074 00144FB4 3C A5 00 02 */ addis r5, r5, 2 /* 80148078 00144FB8 38 C0 00 80 */ li r6, 0x80 /* 8014807C 00144FBC 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2852,8 +2852,8 @@ daNpcT_c_NS_getTrnsfrmKeyAnmP: /* 8014809C 00144FDC 90 01 00 14 */ stw r0, 0x14(r1) /* 801480A0 00144FE0 7C 83 23 78 */ mr r3, r4 /* 801480A4 00144FE4 7C A4 2B 78 */ mr r4, r5 -/* 801480A8 00144FE8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801480AC 00144FEC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801480A8 00144FE8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801480AC 00144FEC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801480B0 00144FF0 3C A5 00 02 */ addis r5, r5, 2 /* 801480B4 00144FF4 38 C0 00 80 */ li r6, 0x80 /* 801480B8 00144FF8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2870,8 +2870,8 @@ daNpcT_c_NS_getTexPtrnAnmP: /* 801480D8 00145018 90 01 00 14 */ stw r0, 0x14(r1) /* 801480DC 0014501C 7C 83 23 78 */ mr r3, r4 /* 801480E0 00145020 7C A4 2B 78 */ mr r4, r5 -/* 801480E4 00145024 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801480E8 00145028 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801480E4 00145024 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801480E8 00145028 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801480EC 0014502C 3C A5 00 02 */ addis r5, r5, 2 /* 801480F0 00145030 38 C0 00 80 */ li r6, 0x80 /* 801480F4 00145034 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2888,8 +2888,8 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 80148114 00145054 90 01 00 14 */ stw r0, 0x14(r1) /* 80148118 00145058 7C 83 23 78 */ mr r3, r4 /* 8014811C 0014505C 7C A4 2B 78 */ mr r4, r5 -/* 80148120 00145060 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80148124 00145064 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80148120 00145060 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80148124 00145064 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80148128 00145068 3C A5 00 02 */ addis r5, r5, 2 /* 8014812C 0014506C 38 C0 00 80 */ li r6, 0x80 /* 80148130 00145070 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2903,8 +2903,8 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 80148150 00145090 90 01 00 14 */ stw r0, 0x14(r1) /* 80148154 00145094 7C 83 23 78 */ mr r3, r4 /* 80148158 00145098 7C A4 2B 78 */ mr r4, r5 -/* 8014815C 0014509C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80148160 001450A0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014815C 0014509C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80148160 001450A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80148164 001450A4 3C A5 00 02 */ addis r5, r5, 2 /* 80148168 001450A8 38 C0 00 80 */ li r6, 0x80 /* 8014816C 001450AC 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2918,8 +2918,8 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 8014818C 001450CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80148190 001450D0 7C 83 23 78 */ mr r3, r4 /* 80148194 001450D4 7C A4 2B 78 */ mr r4, r5 -/* 80148198 001450D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014819C 001450DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80148198 001450D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014819C 001450DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801481A0 001450E0 3C A5 00 02 */ addis r5, r5, 2 /* 801481A4 001450E4 38 C0 00 80 */ li r6, 0x80 /* 801481A8 001450E8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -3202,8 +3202,8 @@ lbl_80148584: /* 8014859C 001454DC 38 9E 08 64 */ addi r4, r30, 0x864 /* 801485A0 001454E0 4B ED 21 2D */ bl fopAcM_posMoveF /* 801485A4 001454E4 38 7E 06 8C */ addi r3, r30, 0x68c -/* 801485A8 001454E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801485AC 001454EC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801485A8 001454E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801485AC 001454EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801485B0 001454F0 3B E4 0F 38 */ addi r31, r4, 0xf38 /* 801485B4 001454F4 7F E4 FB 78 */ mr r4, r31 /* 801485B8 001454F8 4B F2 E4 F5 */ bl dBgS_Acch_NS_CrrPos @@ -3361,8 +3361,8 @@ lbl_801487F8: /* 801487F8 00145738 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 801487FC 0014573C 40 82 00 18 */ bne lbl_80148814 lbl_80148800: -/* 80148800 00145740 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80148804 00145744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80148800 00145740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80148804 00145744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148808 00145748 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8014880C 0014574C 28 00 00 00 */ cmplwi r0, 0 /* 80148810 00145750 40 82 00 18 */ bne lbl_80148828 @@ -3560,8 +3560,8 @@ lbl_80148AA8: /* 80148AD4 00145A14 80 9F 00 04 */ lwz r4, 4(r31) /* 80148AD8 00145A18 38 B7 01 0C */ addi r5, r23, 0x10c /* 80148ADC 00145A1C 48 05 C2 C5 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI -/* 80148AE0 00145A20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80148AE4 00145A24 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80148AE0 00145A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80148AE4 00145A24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80148AE8 00145A28 80 04 5F 88 */ lwz r0, 0x5f88(r4) /* 80148AEC 00145A2C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80148AF0 00145A30 3B 03 4A C8 */ addi r24, r3, lbl_80434AC8@l @@ -3570,8 +3570,8 @@ lbl_80148AA8: /* 80148AFC 00145A3C 90 18 00 4C */ stw r0, 0x4c(r24) /* 80148B00 00145A40 80 77 05 78 */ lwz r3, 0x578(r23) /* 80148B04 00145A44 4B EC 86 BD */ bl mDoExt_McaMorfSO_NS_entryDL -/* 80148B08 00145A48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80148B0C 00145A4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80148B08 00145A48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80148B0C 00145A4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148B10 00145A50 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80148B14 00145A54 90 18 00 48 */ stw r0, 0x48(r24) /* 80148B18 00145A58 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -3678,8 +3678,8 @@ daNpcT_c_NS_setEnvTevColor: /* 80148C7C 00145BBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80148C80 00145BC0 93 C1 00 08 */ stw r30, 8(r1) /* 80148C84 00145BC4 7C 7E 1B 78 */ mr r30, r3 -/* 80148C88 00145BC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80148C8C 00145BCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80148C88 00145BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80148C8C 00145BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148C90 00145BD0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80148C94 00145BD4 7F E3 FB 78 */ mr r3, r31 /* 80148C98 00145BD8 38 9E 09 44 */ addi r4, r30, 0x944 @@ -3703,8 +3703,8 @@ daNpcT_c_NS_setRoomNo: /* 80148CD4 00145C14 90 01 00 14 */ stw r0, 0x14(r1) /* 80148CD8 00145C18 93 E1 00 0C */ stw r31, 0xc(r1) /* 80148CDC 00145C1C 7C 7F 1B 78 */ mr r31, r3 -/* 80148CE0 00145C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80148CE4 00145C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80148CE0 00145C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80148CE4 00145C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148CE8 00145C28 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80148CEC 00145C2C 38 9F 09 44 */ addi r4, r31, 0x944 /* 80148CF0 00145C30 4B F2 C4 11 */ bl dBgS_NS_GetRoomId @@ -4219,8 +4219,8 @@ daNpcT_c_NS_ctrlMsgAnm: /* 80149400 00146340 2C 00 FF FF */ cmpwi r0, -1 /* 80149404 00146344 41 82 00 EC */ beq lbl_801494F0 lbl_80149408: -/* 80149408 00146348 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014940C 0014634C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80149408 00146348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014940C 0014634C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80149410 00146350 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80149414 00146354 80 84 4F 94 */ lwz r4, 0x4f94(r4) /* 80149418 00146358 4B EF 9E D5 */ bl dEvt_control_c_NS_convPId @@ -4243,8 +4243,8 @@ lbl_80149448: /* 80149454 00146394 80 1E 0D 9C */ lwz r0, 0xd9c(r30) /* 80149458 00146398 7C 04 00 40 */ cmplw r4, r0 /* 8014945C 0014639C 41 82 00 24 */ beq lbl_80149480 -/* 80149460 001463A0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80149464 001463A4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80149460 001463A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80149464 001463A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80149468 001463A8 88 04 5E 7B */ lbz r0, 0x5e7b(r4) /* 8014946C 001463AC 90 1B 00 00 */ stw r0, 0(r27) /* 80149470 001463B0 88 04 5E 7A */ lbz r0, 0x5e7a(r4) @@ -4596,8 +4596,8 @@ lbl_80149960: /* 8014998C 001468CC 48 21 88 4D */ bl _savegpr_28 /* 80149990 001468D0 7C 7E 1B 78 */ mr r30, r3 /* 80149994 001468D4 3B E0 00 00 */ li r31, 0 -/* 80149998 001468D8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014999C 001468DC 3B A4 61 C0 */ addi r29, r4, lbl_804061C0@l +/* 80149998 001468D8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014999C 001468DC 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l /* 801499A0 001468E0 88 1D 4F AD */ lbz r0, 0x4fad(r29) /* 801499A4 001468E4 28 00 00 00 */ cmplwi r0, 0 /* 801499A8 001468E8 41 82 01 C4 */ beq lbl_80149B6C @@ -4898,8 +4898,8 @@ lbl_80149D68: /* 80149E0C 00146D4C 38 A1 00 18 */ addi r5, r1, 0x18 /* 80149E10 00146D50 7F 46 D3 78 */ mr r6, r26 /* 80149E14 00146D54 4B F2 DF 51 */ bl dBgS_LinChk_NS_Set -/* 80149E18 00146D58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80149E1C 00146D5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80149E18 00146D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80149E1C 00146D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80149E20 00146D60 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 80149E24 00146D64 7F 23 CB 78 */ mr r3, r25 /* 80149E28 00146D68 38 9A 0A E0 */ addi r4, r26, 0xae0 @@ -5107,14 +5107,14 @@ lbl_8014A0A0: /* 8014A124 00147064 54 00 10 3A */ slwi r0, r0, 2 /* 8014A128 00147068 7C 04 00 2E */ lwzx r0, r4, r0 /* 8014A12C 0014706C 90 1F 01 00 */ stw r0, 0x100(r31) -/* 8014A130 00147070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014A134 00147074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014A130 00147070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014A134 00147074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A138 00147078 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014A13C 0014707C 80 9F 01 00 */ lwz r4, 0x100(r31) /* 8014A140 00147080 4B EF C6 C1 */ bl dEvent_manager_c_NS_setObjectArchive lbl_8014A144: -/* 8014A144 00147084 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014A148 00147088 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014A144 00147084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014A148 00147088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A14C 0014708C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014A150 00147090 7F E4 FB 78 */ mr r4, r31 /* 8014A154 00147094 80 BF 05 70 */ lwz r5, 0x570(r31) @@ -5210,14 +5210,14 @@ daNpcT_c_NS_evtChange: /* 8014A29C 001471DC 54 00 10 3A */ slwi r0, r0, 2 /* 8014A2A0 001471E0 7C 04 00 2E */ lwzx r0, r4, r0 /* 8014A2A4 001471E4 90 1F 01 00 */ stw r0, 0x100(r31) -/* 8014A2A8 001471E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014A2AC 001471EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014A2A8 001471E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014A2AC 001471EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A2B0 001471F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014A2B4 001471F4 80 9F 01 00 */ lwz r4, 0x100(r31) /* 8014A2B8 001471F8 4B EF C5 49 */ bl dEvent_manager_c_NS_setObjectArchive lbl_8014A2BC: -/* 8014A2BC 001471FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014A2C0 00147200 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8014A2BC 001471FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014A2C0 00147200 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8014A2C4 00147204 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 8014A2C8 00147208 7F E4 FB 78 */ mr r4, r31 /* 8014A2CC 0014720C 80 BF 05 70 */ lwz r5, 0x570(r31) @@ -5661,8 +5661,8 @@ lbl_8014A8E8: /* 8014A930 00147870 D0 04 00 04 */ stfs f0, 4(r4) /* 8014A934 00147874 38 7E 09 30 */ addi r3, r30, 0x930 /* 8014A938 00147878 48 11 D3 F1 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8014A93C 0014787C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014A940 00147880 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014A93C 0014787C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014A940 00147880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A944 00147884 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014A948 00147888 38 9E 09 30 */ addi r4, r30, 0x930 /* 8014A94C 0014788C 4B F2 9B 55 */ bl cBgS_NS_GroundCross @@ -6151,8 +6151,8 @@ daNpcT_c_NS_chkWolfAction: /* 8014B02C 00147F6C 90 01 00 14 */ stw r0, 0x14(r1) /* 8014B030 00147F70 93 E1 00 0C */ stw r31, 0xc(r1) /* 8014B034 00147F74 93 C1 00 08 */ stw r30, 8(r1) -/* 8014B038 00147F78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014B03C 00147F7C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8014B038 00147F78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014B03C 00147F7C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8014B040 00147F80 80 7E 5D B4 */ lwz r3, 0x5db4(r30) /* 8014B044 00147F84 80 03 05 74 */ lwz r0, 0x574(r3) /* 8014B048 00147F88 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -6165,8 +6165,8 @@ daNpcT_c_NS_chkWolfAction: /* 8014B064 00147FA4 4E 80 04 21 */ bctrl /* 8014B068 00147FA8 2C 03 00 00 */ cmpwi r3, 0 /* 8014B06C 00147FAC 40 82 00 38 */ bne lbl_8014B0A4 -/* 8014B070 00147FB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014B074 00147FB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014B070 00147FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014B074 00147FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014B078 00147FB8 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8014B07C 00147FBC 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 8014B080 00147FC0 40 82 00 24 */ bne lbl_8014B0A4 @@ -6214,8 +6214,8 @@ lbl_8014B0B0: /* 8014B11C 0014805C 7C FE 3B 78 */ mr r30, r7 /* 8014B120 00148060 38 61 00 50 */ addi r3, r1, 0x50 /* 8014B124 00148064 7F 44 D3 78 */ mr r4, r26 -/* 8014B128 00148068 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014B12C 0014806C 3B E5 61 C0 */ addi r31, r5, lbl_804061C0@l +/* 8014B128 00148068 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014B12C 0014806C 3B E5 61 C0 */ addi r31, r5, g_dComIfG_gameInfo@l /* 8014B130 00148070 80 BF 5D AC */ lwz r5, 0x5dac(r31) /* 8014B134 00148074 48 00 02 B9 */ bl daNpcT_c_NS_getAttnPos /* 8014B138 00148078 C0 41 00 50 */ lfs f2, 0x50(r1) @@ -6224,8 +6224,8 @@ lbl_8014B0B0: /* 8014B144 00148084 D0 21 00 60 */ stfs f1, 0x60(r1) /* 8014B148 00148088 C0 01 00 58 */ lfs f0, 0x58(r1) /* 8014B14C 0014808C D0 01 00 64 */ stfs f0, 0x64(r1) -/* 8014B150 00148090 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014B154 00148094 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014B150 00148090 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014B154 00148094 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014B158 00148098 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8014B15C 0014809C 80 03 05 74 */ lwz r0, 0x574(r3) /* 8014B160 001480A0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -6361,8 +6361,8 @@ lbl_8014B300: /* 8014B358 00148298 28 03 00 00 */ cmplwi r3, 0 /* 8014B35C 0014829C 41 82 00 34 */ beq lbl_8014B390 /* 8014B360 001482A0 7F C3 F3 78 */ mr r3, r30 -/* 8014B364 001482A4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014B368 001482A8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8014B364 001482A4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014B368 001482A8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8014B36C 001482AC 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 8014B370 001482B0 38 A0 00 01 */ li r5, 1 /* 8014B374 001482B4 A8 DE 0D 7A */ lha r6, 0xd7a(r30) @@ -6374,8 +6374,8 @@ lbl_8014B300: /* 8014B38C 001482CC 48 00 00 34 */ b lbl_8014B3C0 lbl_8014B390: /* 8014B390 001482D0 7F C3 F3 78 */ mr r3, r30 -/* 8014B394 001482D4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014B398 001482D8 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 8014B394 001482D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014B398 001482D8 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 8014B39C 001482DC 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 8014B3A0 001482E0 38 A0 00 00 */ li r5, 0 /* 8014B3A4 001482E4 A8 DE 0D 7A */ lha r6, 0xd7a(r30) @@ -6420,8 +6420,8 @@ daNpcT_c_NS_getAttnPos: /* 8014B430 00148370 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8014B434 00148374 EC 00 08 28 */ fsubs f0, f0, f1 /* 8014B438 00148378 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8014B43C 0014837C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014B440 00148380 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014B43C 0014837C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014B440 00148380 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014B444 00148384 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8014B448 00148388 80 03 05 74 */ lwz r0, 0x574(r3) /* 8014B44C 0014838C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -6971,8 +6971,8 @@ daNpcT_c_NS_initTalk: /* 8014BC18 00148B58 38 C0 00 00 */ li r6, 0 /* 8014BC1C 00148B5C 48 0F E3 75 */ bl dMsgFlow_c_NS_init /* 8014BC20 00148B60 7F E3 FB 78 */ mr r3, r31 -/* 8014BC24 00148B64 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014BC28 00148B68 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8014BC24 00148B64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014BC28 00148B68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8014BC2C 00148B6C 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 8014BC30 00148B70 4B EC EA E1 */ bl fopAcM_searchActorAngleY /* 8014BC34 00148B74 B0 7F 0D C8 */ sth r3, 0xdc8(r31) @@ -7325,8 +7325,8 @@ daNpcT_c_NS_setHitodamaPrtcl: /* 8014C120 00149060 3B E0 00 00 */ li r31, 0 /* 8014C124 00149064 3B A0 00 00 */ li r29, 0 /* 8014C128 00149068 3B 80 00 00 */ li r28, 0 -/* 8014C12C 0014906C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014C130 00149070 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 8014C12C 0014906C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014C130 00149070 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l lbl_8014C134: /* 8014C134 00149074 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 8014C138 00149078 38 00 00 FF */ li r0, 0xff @@ -7594,8 +7594,8 @@ lbl_8014C4C8: /* 8014C518 00149458 7C BA 2B 78 */ mr r26, r5 /* 8014C51C 0014945C 7C DB 33 78 */ mr r27, r6 /* 8014C520 00149460 3B C0 00 00 */ li r30, 0 -/* 8014C524 00149464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014C528 00149468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014C524 00149464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014C528 00149468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014C52C 0014946C 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8014C530 00149470 4B ED 7E 55 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8014C534 00149474 7C 7F 1B 78 */ mr r31, r3 @@ -7652,8 +7652,8 @@ lbl_8014C5C4: /* 8014C5F0 00149530 48 21 5B E9 */ bl _savegpr_28 /* 8014C5F4 00149534 7C 7C 1B 78 */ mr r28, r3 /* 8014C5F8 00149538 3B C0 00 00 */ li r30, 0 -/* 8014C5FC 0014953C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014C600 00149540 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014C5FC 0014953C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014C600 00149540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014C604 00149544 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 8014C608 00149548 28 00 00 1C */ cmplwi r0, 0x1c /* 8014C60C 0014954C 40 82 00 D8 */ bne lbl_8014C6E4 @@ -7666,8 +7666,8 @@ lbl_8014C5C4: /* 8014C628 00149568 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014C62C 0014956C 41 82 00 B8 */ beq lbl_8014C6E4 /* 8014C630 00149570 3B A0 00 00 */ li r29, 0 -/* 8014C634 00149574 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014C638 00149578 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014C634 00149574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014C638 00149578 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014C63C 0014957C 3B E3 56 B8 */ addi r31, r3, 0x56b8 /* 8014C640 00149580 48 00 00 44 */ b lbl_8014C684 lbl_8014C644: @@ -7947,8 +7947,8 @@ lbl_8014C9F4: /* 8014CA30 00149970 7C 08 02 A6 */ mflr r0 /* 8014CA34 00149974 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CA38 00149978 7C 60 1B 78 */ mr r0, r3 -/* 8014CA3C 0014997C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CA40 00149980 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CA3C 0014997C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CA40 00149980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CA44 00149984 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8014CA48 00149988 54 00 08 3C */ slwi r0, r0, 1 /* 8014CA4C 0014998C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -7963,8 +7963,8 @@ lbl_8014C9F4: /* 8014CA70 001499B0 7C 08 02 A6 */ mflr r0 /* 8014CA74 001499B4 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CA78 001499B8 7C 60 1B 78 */ mr r0, r3 -/* 8014CA7C 001499BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CA80 001499C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CA7C 001499BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CA80 001499C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CA84 001499C4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8014CA88 001499C8 54 00 08 3C */ slwi r0, r0, 1 /* 8014CA8C 001499CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -7979,8 +7979,8 @@ lbl_8014C9F4: /* 8014CAB0 001499F0 7C 08 02 A6 */ mflr r0 /* 8014CAB4 001499F4 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CAB8 001499F8 7C 60 1B 78 */ mr r0, r3 -/* 8014CABC 001499FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CAC0 00149A00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CABC 001499FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CAC0 00149A00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CAC4 00149A04 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8014CAC8 00149A08 54 00 08 3C */ slwi r0, r0, 1 /* 8014CACC 00149A0C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -7995,8 +7995,8 @@ lbl_8014C9F4: /* 8014CAF0 00149A30 7C 08 02 A6 */ mflr r0 /* 8014CAF4 00149A34 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CAF8 00149A38 7C 60 1B 78 */ mr r0, r3 -/* 8014CAFC 00149A3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CB00 00149A40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CAFC 00149A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CB00 00149A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CB04 00149A44 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8014CB08 00149A48 54 00 08 3C */ slwi r0, r0, 1 /* 8014CB0C 00149A4C 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -8011,8 +8011,8 @@ lbl_8014C9F4: /* 8014CB30 00149A70 7C 08 02 A6 */ mflr r0 /* 8014CB34 00149A74 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CB38 00149A78 7C 60 1B 78 */ mr r0, r3 -/* 8014CB3C 00149A7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CB40 00149A80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CB3C 00149A7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CB40 00149A80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CB44 00149A84 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8014CB48 00149A88 54 00 08 3C */ slwi r0, r0, 1 /* 8014CB4C 00149A8C 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -8027,8 +8027,8 @@ lbl_8014C9F4: /* 8014CB70 00149AB0 7C 08 02 A6 */ mflr r0 /* 8014CB74 00149AB4 90 01 00 14 */ stw r0, 0x14(r1) /* 8014CB78 00149AB8 7C 60 1B 78 */ mr r0, r3 -/* 8014CB7C 00149ABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014CB80 00149AC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014CB7C 00149ABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014CB80 00149AC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014CB84 00149AC4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8014CB88 00149AC8 54 00 08 3C */ slwi r0, r0, 1 /* 8014CB8C 00149ACC 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -10255,8 +10255,8 @@ lbl_8014EAB4: /* 8014EB0C 0014BA4C 38 9F 08 9C */ addi r4, r31, 0x89c /* 8014EB10 0014BA50 4B EC BB BD */ bl fopAcM_posMoveF /* 8014EB14 0014BA54 38 7F 05 6C */ addi r3, r31, 0x56c -/* 8014EB18 0014BA58 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8014EB1C 0014BA5C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8014EB18 0014BA58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8014EB1C 0014BA5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8014EB20 0014BA60 38 84 0F 38 */ addi r4, r4, 0xf38 /* 8014EB24 0014BA64 4B F2 7F 89 */ bl dBgS_Acch_NS_CrrPos /* 8014EB28 0014BA68 80 1F 06 48 */ lwz r0, 0x648(r31) @@ -10401,8 +10401,8 @@ lbl_8014ED3C: /* 8014ED3C 0014BC7C 48 05 D8 41 */ bl dKy_darkworld_check /* 8014ED40 0014BC80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014ED44 0014BC84 41 82 00 48 */ beq lbl_8014ED8C -/* 8014ED48 0014BC88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014ED4C 0014BC8C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8014ED48 0014BC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014ED4C 0014BC8C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8014ED50 0014BC90 80 04 5F 88 */ lwz r0, 0x5f88(r4) /* 8014ED54 0014BC94 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8014ED58 0014BC98 3B 83 4A C8 */ addi r28, r3, lbl_80434AC8@l @@ -10411,8 +10411,8 @@ lbl_8014ED3C: /* 8014ED64 0014BCA4 90 1C 00 4C */ stw r0, 0x4c(r28) /* 8014ED68 0014BCA8 80 7D 07 54 */ lwz r3, 0x754(r29) /* 8014ED6C 0014BCAC 4B EC 24 55 */ bl mDoExt_McaMorfSO_NS_entryDL -/* 8014ED70 0014BCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014ED74 0014BCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014ED70 0014BCB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014ED74 0014BCB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014ED78 0014BCB8 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 8014ED7C 0014BCBC 90 1C 00 48 */ stw r0, 0x48(r28) /* 8014ED80 0014BCC0 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -10474,8 +10474,8 @@ lbl_8014EE1C: /* 8014EE4C 0014BD8C 90 01 00 14 */ stw r0, 0x14(r1) /* 8014EE50 0014BD90 7C 83 23 78 */ mr r3, r4 /* 8014EE54 0014BD94 7C A4 2B 78 */ mr r4, r5 -/* 8014EE58 0014BD98 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014EE5C 0014BD9C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014EE58 0014BD98 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014EE5C 0014BD9C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8014EE60 0014BDA0 3C A5 00 02 */ addis r5, r5, 2 /* 8014EE64 0014BDA4 38 C0 00 80 */ li r6, 0x80 /* 8014EE68 0014BDA8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -10531,8 +10531,8 @@ lbl_8014EE1C: /* 8014EF30 0014BE70 90 01 00 14 */ stw r0, 0x14(r1) /* 8014EF34 0014BE74 7C 83 23 78 */ mr r3, r4 /* 8014EF38 0014BE78 7C A4 2B 78 */ mr r4, r5 -/* 8014EF3C 0014BE7C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014EF40 0014BE80 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014EF3C 0014BE7C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014EF40 0014BE80 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8014EF44 0014BE84 3C A5 00 02 */ addis r5, r5, 2 /* 8014EF48 0014BE88 38 C0 00 80 */ li r6, 0x80 /* 8014EF4C 0014BE8C 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -10557,8 +10557,8 @@ lbl_8014EE1C: /* 8014EF98 0014BED8 7C 08 03 A6 */ mtlr r0 /* 8014EF9C 0014BEDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8014EFA0 0014BEE0 4E 80 00 20 */ blr -/* 8014EFA4 0014BEE4 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8014EFA8 0014BEE8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8014EFA4 0014BEE4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8014EFA8 0014BEE8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8014EFAC 0014BEEC 80 C6 5D B4 */ lwz r6, 0x5db4(r6) /* 8014EFB0 0014BEF0 80 06 05 74 */ lwz r0, 0x574(r6) /* 8014EFB4 0014BEF4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -10588,8 +10588,8 @@ lbl_8014EFE8: /* 8014F004 0014BF44 7C 7F 1B 78 */ mr r31, r3 /* 8014F008 0014BF48 28 05 00 00 */ cmplwi r5, 0 /* 8014F00C 0014BF4C 41 82 00 44 */ beq lbl_8014F050 -/* 8014F010 0014BF50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014F014 0014BF54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014F010 0014BF50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014F014 0014BF54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F018 0014BF58 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014F01C 0014BF5C 7F E4 FB 78 */ mr r4, r31 /* 8014F020 0014BF60 38 C0 00 FF */ li r6, 0xff @@ -10635,8 +10635,8 @@ daBaseNpc_c_NS_setEnvTevColor: /* 8014F0AC 0014BFEC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8014F0B0 0014BFF0 93 C1 00 08 */ stw r30, 8(r1) /* 8014F0B4 0014BFF4 7C 7E 1B 78 */ mr r30, r3 -/* 8014F0B8 0014BFF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014F0BC 0014BFFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014F0B8 0014BFF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014F0BC 0014BFFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F0C0 0014C000 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8014F0C4 0014C004 7F E3 FB 78 */ mr r3, r31 /* 8014F0C8 0014C008 38 9E 09 E8 */ addi r4, r30, 0x9e8 @@ -10660,8 +10660,8 @@ daBaseNpc_c_NS_setRoomNo: /* 8014F104 0014C044 90 01 00 14 */ stw r0, 0x14(r1) /* 8014F108 0014C048 93 E1 00 0C */ stw r31, 0xc(r1) /* 8014F10C 0014C04C 7C 7F 1B 78 */ mr r31, r3 -/* 8014F110 0014C050 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014F114 0014C054 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014F110 0014C050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014F114 0014C054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F118 0014C058 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F11C 0014C05C 38 9F 09 E8 */ addi r4, r31, 0x9e8 /* 8014F120 0014C060 4B F2 5F E1 */ bl dBgS_NS_GetRoomId @@ -10987,8 +10987,8 @@ lbl_8014F580: /* 8014F58C 0014C4CC 41 82 00 58 */ beq lbl_8014F5E4 /* 8014F590 0014C4D0 80 6D 8A 60 */ lwz r3, lbl_80450FE0-_SDA_BASE_(r13) /* 8014F594 0014C4D4 80 8D 8A 64 */ lwz r4, lbl_80450FE4-_SDA_BASE_(r13) -/* 8014F598 0014C4D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8014F59C 0014C4DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8014F598 0014C4D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8014F59C 0014C4DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8014F5A0 0014C4E0 3C A5 00 02 */ addis r5, r5, 2 /* 8014F5A4 0014C4E4 38 C0 00 80 */ li r6, 0x80 /* 8014F5A8 0014C4E8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -11059,8 +11059,8 @@ lbl_8014F694: /* 8014F694 0014C5D4 80 9B 0A 14 */ lwz r4, 0xa14(r27) /* 8014F698 0014C5D8 28 04 00 00 */ cmplwi r4, 0 /* 8014F69C 0014C5DC 41 82 00 28 */ beq lbl_8014F6C4 -/* 8014F6A0 0014C5E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014F6A4 0014C5E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014F6A0 0014C5E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014F6A4 0014C5E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F6A8 0014C5E8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F6AC 0014C5EC 7F 65 DB 78 */ mr r5, r27 /* 8014F6B0 0014C5F0 4B F2 53 59 */ bl dBgS_NS_Regist @@ -11101,8 +11101,8 @@ lbl_8014F6E4: /* 8014F734 0014C674 48 11 8A A1 */ bl ChkUsed__9cBgW_BgIdCFv /* 8014F738 0014C678 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014F73C 0014C67C 41 82 00 18 */ beq lbl_8014F754 -/* 8014F740 0014C680 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8014F744 0014C684 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8014F740 0014C680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8014F744 0014C684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F748 0014C688 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F74C 0014C68C 80 9E 0A 14 */ lwz r4, 0xa14(r30) /* 8014F750 0014C690 4B F2 4B 01 */ bl cBgS_NS_Release @@ -11877,8 +11877,8 @@ daBaseNpc_getGroundAngle: /* 80150240 0014D180 48 21 1F 9D */ bl _savegpr_29 /* 80150244 0014D184 7C 7D 1B 78 */ mr r29, r3 /* 80150248 0014D188 7C 9E 23 78 */ mr r30, r4 -/* 8015024C 0014D18C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80150250 0014D190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015024C 0014D18C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80150250 0014D190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80150254 0014D194 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80150258 0014D198 7F E3 FB 78 */ mr r3, r31 /* 8015025C 0014D19C 7F A4 EB 78 */ mr r4, r29 @@ -13991,8 +13991,8 @@ lbl_80151FF8: /* 8015205C 0014EF9C 38 9F 07 A8 */ addi r4, r31, 0x7a8 /* 80152060 0014EFA0 4B EC 86 6D */ bl fopAcM_posMoveF /* 80152064 0014EFA4 38 7F 05 D0 */ addi r3, r31, 0x5d0 -/* 80152068 0014EFA8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8015206C 0014EFAC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80152068 0014EFA8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8015206C 0014EFAC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80152070 0014EFB0 38 84 0F 38 */ addi r4, r4, 0xf38 /* 80152074 0014EFB4 4B F2 4A 39 */ bl dBgS_Acch_NS_CrrPos /* 80152078 0014EFB8 80 1F 06 AC */ lwz r0, 0x6ac(r31) @@ -14307,8 +14307,8 @@ lbl_801524FC: /* 801524FC 0014F43C 88 1A 09 F4 */ lbz r0, 0x9f4(r26) /* 80152500 0014F440 28 00 00 00 */ cmplwi r0, 0 /* 80152504 0014F444 41 82 00 48 */ beq lbl_8015254C -/* 80152508 0014F448 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015250C 0014F44C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80152508 0014F448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015250C 0014F44C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80152510 0014F450 80 04 5F 88 */ lwz r0, 0x5f88(r4) /* 80152514 0014F454 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80152518 0014F458 3B 63 4A C8 */ addi r27, r3, lbl_80434AC8@l @@ -14317,8 +14317,8 @@ lbl_801524FC: /* 80152524 0014F464 90 1B 00 4C */ stw r0, 0x4c(r27) /* 80152528 0014F468 80 7A 05 68 */ lwz r3, 0x568(r26) /* 8015252C 0014F46C 4B EB EC 95 */ bl mDoExt_McaMorfSO_NS_entryDL -/* 80152530 0014F470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80152534 0014F474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80152530 0014F470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80152534 0014F474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80152538 0014F478 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 8015253C 0014F47C 90 1B 00 48 */ stw r0, 0x48(r27) /* 80152540 0014F480 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -14385,8 +14385,8 @@ lbl_801525F0: /* 8015261C 0014F55C A8 05 00 0E */ lha r0, 0xe(r5) /* 80152620 0014F560 2C 00 00 FD */ cmpwi r0, 0xfd /* 80152624 0014F564 4C 82 00 20 */ bnelr -/* 80152628 0014F568 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8015262C 0014F56C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80152628 0014F568 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8015262C 0014F56C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80152630 0014F570 80 04 5D AC */ lwz r0, 0x5dac(r4) /* 80152634 0014F574 7C 00 28 40 */ cmplw r0, r5 /* 80152638 0014F578 40 82 00 10 */ bne lbl_80152648 @@ -14728,8 +14728,8 @@ lbl_80152A5C: /* 80152B34 0014FA74 90 01 00 14 */ stw r0, 0x14(r1) /* 80152B38 0014FA78 7C 83 23 78 */ mr r3, r4 /* 80152B3C 0014FA7C 7C A4 2B 78 */ mr r4, r5 -/* 80152B40 0014FA80 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80152B44 0014FA84 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80152B40 0014FA80 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80152B44 0014FA84 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80152B48 0014FA88 3C A5 00 02 */ addis r5, r5, 2 /* 80152B4C 0014FA8C 38 C0 00 80 */ li r6, 0x80 /* 80152B50 0014FA90 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -14743,8 +14743,8 @@ lbl_80152A5C: /* 80152B70 0014FAB0 90 01 00 14 */ stw r0, 0x14(r1) /* 80152B74 0014FAB4 7C 83 23 78 */ mr r3, r4 /* 80152B78 0014FAB8 7C A4 2B 78 */ mr r4, r5 -/* 80152B7C 0014FABC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80152B80 0014FAC0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80152B7C 0014FABC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80152B80 0014FAC0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80152B84 0014FAC4 3C A5 00 02 */ addis r5, r5, 2 /* 80152B88 0014FAC8 38 C0 00 80 */ li r6, 0x80 /* 80152B8C 0014FACC 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -14758,8 +14758,8 @@ lbl_80152A5C: /* 80152BAC 0014FAEC 90 01 00 14 */ stw r0, 0x14(r1) /* 80152BB0 0014FAF0 7C 83 23 78 */ mr r3, r4 /* 80152BB4 0014FAF4 7C A4 2B 78 */ mr r4, r5 -/* 80152BB8 0014FAF8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80152BBC 0014FAFC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80152BB8 0014FAF8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80152BBC 0014FAFC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80152BC0 0014FB00 3C A5 00 02 */ addis r5, r5, 2 /* 80152BC4 0014FB04 38 C0 00 80 */ li r6, 0x80 /* 80152BC8 0014FB08 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -14773,8 +14773,8 @@ lbl_80152A5C: /* 80152BE8 0014FB28 90 01 00 14 */ stw r0, 0x14(r1) /* 80152BEC 0014FB2C 7C 83 23 78 */ mr r3, r4 /* 80152BF0 0014FB30 7C A4 2B 78 */ mr r4, r5 -/* 80152BF4 0014FB34 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80152BF8 0014FB38 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80152BF4 0014FB34 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80152BF8 0014FB38 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80152BFC 0014FB3C 3C A5 00 02 */ addis r5, r5, 2 /* 80152C00 0014FB40 38 C0 00 80 */ li r6, 0x80 /* 80152C04 0014FB44 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -14882,8 +14882,8 @@ daNpcF_c_NS_setEnvTevColor: /* 80152D90 0014FCD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80152D94 0014FCD4 93 C1 00 08 */ stw r30, 8(r1) /* 80152D98 0014FCD8 7C 7E 1B 78 */ mr r30, r3 -/* 80152D9C 0014FCDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80152DA0 0014FCE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80152D9C 0014FCDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80152DA0 0014FCE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80152DA4 0014FCE4 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80152DA8 0014FCE8 7F E3 FB 78 */ mr r3, r31 /* 80152DAC 0014FCEC 38 9E 0A 58 */ addi r4, r30, 0xa58 @@ -14907,8 +14907,8 @@ daNpcF_c_NS_setRoomNo: /* 80152DE8 0014FD28 90 01 00 14 */ stw r0, 0x14(r1) /* 80152DEC 0014FD2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80152DF0 0014FD30 7C 7F 1B 78 */ mr r31, r3 -/* 80152DF4 0014FD34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80152DF8 0014FD38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80152DF4 0014FD34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80152DF8 0014FD38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80152DFC 0014FD3C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80152E00 0014FD40 38 9F 0A 58 */ addi r4, r31, 0xa58 /* 80152E04 0014FD44 4B F2 22 FD */ bl dBgS_NS_GetRoomId @@ -15568,8 +15568,8 @@ lbl_801536C0: /* 80153760 001506A0 2C 00 FF FF */ cmpwi r0, -1 /* 80153764 001506A4 41 82 00 EC */ beq lbl_80153850 lbl_80153768: -/* 80153768 001506A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015376C 001506AC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80153768 001506A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015376C 001506AC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80153770 001506B0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80153774 001506B4 80 84 4F 94 */ lwz r4, 0x4f94(r4) /* 80153778 001506B8 4B EE FB 75 */ bl dEvt_control_c_NS_convPId @@ -15592,8 +15592,8 @@ lbl_801537A8: /* 801537B4 001506F4 80 1E 09 A4 */ lwz r0, 0x9a4(r30) /* 801537B8 001506F8 7C 04 00 40 */ cmplw r4, r0 /* 801537BC 001506FC 41 82 00 24 */ beq lbl_801537E0 -/* 801537C0 00150700 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801537C4 00150704 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801537C0 00150700 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801537C4 00150704 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801537C8 00150708 88 04 5E 7B */ lbz r0, 0x5e7b(r4) /* 801537CC 0015070C 90 1B 00 00 */ stw r0, 0(r27) /* 801537D0 00150710 88 04 5E 7A */ lbz r0, 0x5e7a(r4) @@ -15660,8 +15660,8 @@ lbl_80153860: /* 801538A4 001507E4 7D 3F 4B 78 */ mr r31, r9 /* 801538A8 001507E8 28 05 00 00 */ cmplwi r5, 0 /* 801538AC 001507EC 41 82 00 40 */ beq lbl_801538EC -/* 801538B0 001507F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801538B4 001507F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801538B0 001507F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801538B4 001507F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801538B8 001507F8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801538BC 001507FC 7F 44 D3 78 */ mr r4, r26 /* 801538C0 00150800 38 C0 00 FF */ li r6, 0xff @@ -15717,14 +15717,14 @@ lbl_8015393C: /* 80153978 001508B8 28 04 00 00 */ cmplwi r4, 0 /* 8015397C 001508BC 41 82 00 1C */ beq lbl_80153998 /* 80153980 001508C0 90 9B 01 00 */ stw r4, 0x100(r27) -/* 80153984 001508C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80153988 001508C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80153984 001508C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80153988 001508C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015398C 001508CC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80153990 001508D0 80 9B 01 00 */ lwz r4, 0x100(r27) /* 80153994 001508D4 4B EF 2E 6D */ bl dEvent_manager_c_NS_setObjectArchive lbl_80153998: -/* 80153998 001508D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015399C 001508DC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80153998 001508D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015399C 001508DC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801539A0 001508E0 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 801539A4 001508E4 7F 64 DB 78 */ mr r4, r27 /* 801539A8 001508E8 7F 85 E3 78 */ mr r5, r28 @@ -16445,8 +16445,8 @@ lbl_80154354: /* 80154440 00151380 80 18 09 38 */ lwz r0, 0x938(r24) /* 80154444 00151384 2C 00 00 00 */ cmpwi r0, 0 /* 80154448 00151388 41 82 00 68 */ beq lbl_801544B0 -/* 8015444C 0015138C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80154450 00151390 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015444C 0015138C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80154450 00151390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80154454 00151394 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80154458 00151398 81 83 06 28 */ lwz r12, 0x628(r3) /* 8015445C 0015139C 81 8C 00 FC */ lwz r12, 0xfc(r12) @@ -16480,8 +16480,8 @@ lbl_801544B0: /* 801544C4 00151404 2C 19 00 00 */ cmpwi r25, 0 /* 801544C8 00151408 41 82 00 1C */ beq lbl_801544E4 /* 801544CC 0015140C 7F 03 C3 78 */ mr r3, r24 -/* 801544D0 00151410 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801544D4 00151414 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801544D0 00151410 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801544D4 00151414 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801544D8 00151418 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 801544DC 0015141C 4B EC 64 89 */ bl fopAcM_searchActorDistanceXZ /* 801544E0 00151420 FF 60 08 90 */ fmr f27, f1 @@ -16565,8 +16565,8 @@ lbl_801545E8: /* 801545FC 0015153C 40 82 00 34 */ bne lbl_80154630 /* 80154600 00151540 2C 19 00 00 */ cmpwi r25, 0 /* 80154604 00151544 41 82 00 2C */ beq lbl_80154630 -/* 80154608 00151548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015460C 0015154C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80154608 00151548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015460C 0015154C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80154610 00151550 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80154614 00151554 81 83 06 28 */ lwz r12, 0x628(r3) /* 80154618 00151558 81 8C 00 FC */ lwz r12, 0xfc(r12) @@ -16854,8 +16854,8 @@ lbl_801549B4: /* 80154A1C 0015195C 7C BD 2B 78 */ mr r29, r5 /* 80154A20 00151960 38 61 00 20 */ addi r3, r1, 0x20 /* 80154A24 00151964 7F 64 DB 78 */ mr r4, r27 -/* 80154A28 00151968 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80154A2C 0015196C 3B E5 61 C0 */ addi r31, r5, lbl_804061C0@l +/* 80154A28 00151968 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80154A2C 0015196C 3B E5 61 C0 */ addi r31, r5, g_dComIfG_gameInfo@l /* 80154A30 00151970 80 BF 5D AC */ lwz r5, 0x5dac(r31) /* 80154A34 00151974 4B FF FF 39 */ bl daNpcF_c_NS_getAttentionPos /* 80154A38 00151978 C0 01 00 20 */ lfs f0, 0x20(r1) @@ -17040,8 +17040,8 @@ daNpcF_c_NS_setHitodamaPrtcl: /* 80154CC8 00151C08 3B E0 00 00 */ li r31, 0 /* 80154CCC 00151C0C 3B A0 00 00 */ li r29, 0 /* 80154CD0 00151C10 3B 80 00 00 */ li r28, 0 -/* 80154CD4 00151C14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80154CD8 00151C18 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 80154CD4 00151C14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80154CD8 00151C18 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l lbl_80154CDC: /* 80154CDC 00151C1C 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 80154CE0 00151C20 38 00 00 FF */ li r0, 0xff @@ -17652,8 +17652,8 @@ daNpcF_getGroundAngle: /* 80155588 001524C8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8015558C 001524CC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80155590 001524D0 90 01 00 18 */ stw r0, 0x18(r1) -/* 80155594 001524D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155598 001524D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155594 001524D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155598 001524D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015559C 001524DC 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801555A0 001524E0 7F E3 FB 78 */ mr r3, r31 /* 801555A4 001524E4 7F A4 EB 78 */ mr r4, r29 @@ -17700,8 +17700,8 @@ lbl_8015561C: /* 80155638 00152578 7C 08 02 A6 */ mflr r0 /* 8015563C 0015257C 90 01 00 14 */ stw r0, 0x14(r1) /* 80155640 00152580 7C 60 1B 78 */ mr r0, r3 -/* 80155644 00152584 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155648 00152588 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155644 00152584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155648 00152588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015564C 0015258C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80155650 00152590 54 00 08 3C */ slwi r0, r0, 1 /* 80155654 00152594 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -17716,8 +17716,8 @@ lbl_8015561C: /* 80155678 001525B8 7C 08 02 A6 */ mflr r0 /* 8015567C 001525BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80155680 001525C0 7C 60 1B 78 */ mr r0, r3 -/* 80155684 001525C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155688 001525C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155684 001525C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155688 001525C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015568C 001525CC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80155690 001525D0 54 00 08 3C */ slwi r0, r0, 1 /* 80155694 001525D4 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -17732,8 +17732,8 @@ lbl_8015561C: /* 801556B8 001525F8 7C 08 02 A6 */ mflr r0 /* 801556BC 001525FC 90 01 00 14 */ stw r0, 0x14(r1) /* 801556C0 00152600 7C 60 1B 78 */ mr r0, r3 -/* 801556C4 00152604 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801556C8 00152608 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801556C4 00152604 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801556C8 00152608 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801556CC 0015260C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 801556D0 00152610 54 00 08 3C */ slwi r0, r0, 1 /* 801556D4 00152614 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -17748,8 +17748,8 @@ lbl_8015561C: /* 801556F8 00152638 7C 08 02 A6 */ mflr r0 /* 801556FC 0015263C 90 01 00 14 */ stw r0, 0x14(r1) /* 80155700 00152640 7C 60 1B 78 */ mr r0, r3 -/* 80155704 00152644 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155708 00152648 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155704 00152644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155708 00152648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015570C 0015264C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80155710 00152650 54 00 08 3C */ slwi r0, r0, 1 /* 80155714 00152654 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -17767,8 +17767,8 @@ daNpcF_offTmpBit: /* 80155738 00152678 7C 08 02 A6 */ mflr r0 /* 8015573C 0015267C 90 01 00 14 */ stw r0, 0x14(r1) /* 80155740 00152680 7C 60 1B 78 */ mr r0, r3 -/* 80155744 00152684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155748 00152688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155744 00152684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155748 00152688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015574C 0015268C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80155750 00152690 54 00 08 3C */ slwi r0, r0, 1 /* 80155754 00152694 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -17791,8 +17791,8 @@ daNpcF_getPlayerInfoFromPlayerList: /* 8015578C 001526CC 7C BA 2B 78 */ mr r26, r5 /* 80155790 001526D0 7C DB 33 78 */ mr r27, r6 /* 80155794 001526D4 3B C0 00 00 */ li r30, 0 -/* 80155798 001526D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015579C 001526DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155798 001526D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015579C 001526DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801557A0 001526E0 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 801557A4 001526E4 4B EC EB E1 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 801557A8 001526E8 7C 7F 1B 78 */ mr r31, r3 @@ -17849,8 +17849,8 @@ lbl_80155838: /* 80155864 001527A4 48 20 C9 75 */ bl _savegpr_28 /* 80155868 001527A8 7C 7C 1B 78 */ mr r28, r3 /* 8015586C 001527AC 3B C0 00 00 */ li r30, 0 -/* 80155870 001527B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80155874 001527B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80155870 001527B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80155874 001527B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80155878 001527B8 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8015587C 001527BC 7F 84 E3 78 */ mr r4, r28 /* 80155880 001527C0 81 83 06 28 */ lwz r12, 0x628(r3) @@ -17860,8 +17860,8 @@ lbl_80155838: /* 80155890 001527D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80155894 001527D4 41 82 00 B8 */ beq lbl_8015594C /* 80155898 001527D8 3B A0 00 00 */ li r29, 0 -/* 8015589C 001527DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801558A0 001527E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015589C 001527DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801558A0 001527E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801558A4 001527E4 3B E3 56 B8 */ addi r31, r3, 0x56b8 /* 801558A8 001527E8 48 00 00 44 */ b lbl_801558EC lbl_801558AC: diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index 95e8c892ee..305b96b493 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -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) diff --git a/asm/d/a/d_a_player.s b/asm/d/a/d_a_player.s index 9733e0ca18..8bf9aca28d 100644 --- a/asm/d/a/d_a_player.s +++ b/asm/d/a/d_a_player.s @@ -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 diff --git a/asm/d/a/no/chg/d_a_no_chg_room.s b/asm/d/a/no/chg/d_a_no_chg_room.s index 7dec7e270c..6f909e907b 100644 --- a/asm/d/a/no/chg/d_a_no_chg_room.s +++ b/asm/d/a/no/chg/d_a_no_chg_room.s @@ -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 diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index 0276477724..c686af4dfe 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -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 diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index 2fa6330580..4e41c53e16 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -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 diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index c485d7f27f..fc3b5d1229 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -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 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index ff0f908ec9..bfe3d079f0 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -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 diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index 691f93fb96..571cedc538 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -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 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index 89c8ec4112..5d26850135 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -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 diff --git a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s index fc9fb0fbed..8ffa2a85fc 100644 --- a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s +++ b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s @@ -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 diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index 6bc298bc12..b1276dd72f 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -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 diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index 054c246ed8..cf7263d0f9 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -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) diff --git a/asm/d/cam/d_cam_param.s b/asm/d/cam/d_cam_param.s index f662ca9c50..5864d141fe 100644 --- a/asm/d/cam/d_cam_param.s +++ b/asm/d/cam/d_cam_param.s @@ -288,8 +288,8 @@ dCamParam_c: /* 8008850C 0008544C 3C 60 80 3B */ lis r3, lbl_803AC50C@ha /* 80088510 00085450 38 03 C5 0C */ addi r0, r3, lbl_803AC50C@l /* 80088514 00085454 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 80088518 00085458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8008851C 0008545C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80088518 00085458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8008851C 0008545C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80088520 00085460 80 65 5D 88 */ lwz r3, 0x5d88(r5) /* 80088524 00085464 3C 80 80 38 */ lis r4, lbl_8037A7E0@ha /* 80088528 00085468 38 84 A7 E0 */ addi r4, r4, lbl_8037A7E0@l @@ -603,8 +603,8 @@ lbl_80088980: .global dCamSetup_c_NS_PlayerHideDist dCamSetup_c_NS_PlayerHideDist: -/* 80088988 000858C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8008898C 000858CC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80088988 000858C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8008898C 000858CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80088990 000858D0 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80088994 000858D4 80 04 05 74 */ lwz r0, 0x574(r4) /* 80088998 000858D8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index 5e561b3c03..bd8c92dc09 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -769,8 +769,8 @@ lbl_800869A0: /* 800869A4 000838E4 7F 43 D3 78 */ mr r3, r26 /* 800869A8 000838E8 48 1D D0 A1 */ bl cCcD_Obj_NS_GetAc /* 800869AC 000838EC 7C 65 1B 78 */ mr r5, r3 -/* 800869B0 000838F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800869B4 000838F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800869B0 000838F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800869B4 000838F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800869B8 000838F8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800869BC 000838FC 38 80 00 02 */ li r4, 2 /* 800869C0 00083900 7F C6 F3 78 */ mr r6, r30 @@ -801,8 +801,8 @@ lbl_80086A0C: /* 80086A10 00083950 7F 43 D3 78 */ mr r3, r26 /* 80086A14 00083954 48 1D D0 35 */ bl cCcD_Obj_NS_GetAc /* 80086A18 00083958 7C 65 1B 78 */ mr r5, r3 -/* 80086A1C 0008395C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80086A20 00083960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80086A1C 0008395C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80086A20 00083960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80086A24 00083964 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80086A28 00083968 7F 64 DB 78 */ mr r4, r27 /* 80086A2C 0008396C 7F C6 F3 78 */ mr r6, r30 @@ -828,8 +828,8 @@ lbl_80086A44: /* 80086A78 000839B8 7F 43 D3 78 */ mr r3, r26 /* 80086A7C 000839BC 48 1D CF CD */ bl cCcD_Obj_NS_GetAc /* 80086A80 000839C0 7C 65 1B 78 */ mr r5, r3 -/* 80086A84 000839C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80086A88 000839C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80086A84 000839C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80086A88 000839C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80086A8C 000839CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80086A90 000839D0 88 9A 00 BA */ lbz r4, 0xba(r26) /* 80086A94 000839D4 7F C6 F3 78 */ mr r6, r30 diff --git a/asm/d/cc/d_cc_uty.s b/asm/d/cc/d_cc_uty.s index 5b8fefdd2e..638ff61567 100644 --- a/asm/d/cc/d_cc_uty.s +++ b/asm/d/cc/d_cc_uty.s @@ -16,8 +16,8 @@ lbl_800873C0: .global cc_pl_cut_bit_get cc_pl_cut_bit_get: -/* 800873D4 00084314 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800873D8 00084318 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800873D4 00084314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800873D8 00084318 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800873DC 0008431C 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 800873E0 00084320 38 60 00 00 */ li r3, 0 /* 800873E4 00084324 88 04 05 68 */ lbz r0, 0x568(r4) @@ -660,8 +660,8 @@ lbl_80087BF0: /* 80087C24 00084B64 48 2D A5 A9 */ bl func_803621CC /* 80087C28 00084B68 7C 7B 1B 78 */ mr r27, r3 /* 80087C2C 00084B6C 7C 9C 23 78 */ mr r28, r4 -/* 80087C30 00084B70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80087C34 00084B74 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80087C30 00084B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80087C34 00084B74 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80087C38 00084B78 83 DF 5D AC */ lwz r30, 0x5dac(r31) /* 80087C3C 00084B7C 7F 83 E3 78 */ mr r3, r28 /* 80087C40 00084B80 4B FF FE 19 */ bl at_power_check @@ -834,8 +834,8 @@ lbl_80087E9C: /* 80087E9C 00084DDC 88 1C 00 20 */ lbz r0, 0x20(r28) /* 80087EA0 00084DE0 28 00 00 01 */ cmplwi r0, 1 /* 80087EA4 00084DE4 40 82 00 78 */ bne lbl_80087F1C -/* 80087EA8 00084DE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80087EAC 00084DEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80087EA8 00084DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80087EAC 00084DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80087EB0 00084DF0 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80087EB4 00084DF4 80 03 05 74 */ lwz r0, 0x574(r3) /* 80087EB8 00084DF8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -847,8 +847,8 @@ lbl_80087E9C: /* 80087ED0 00084E10 54 00 0C 3C */ rlwinm r0, r0, 1, 0x10, 0x1e /* 80087ED4 00084E14 B0 1C 00 1C */ sth r0, 0x1c(r28) lbl_80087ED8: -/* 80087ED8 00084E18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80087EDC 00084E1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80087ED8 00084E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80087EDC 00084E1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80087EE0 00084E20 88 03 00 14 */ lbz r0, 0x14(r3) /* 80087EE4 00084E24 28 00 00 3F */ cmplwi r0, 0x3f /* 80087EE8 00084E28 40 82 00 14 */ bne lbl_80087EFC diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index 4cc7d8d861..d2030f0aec 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -64,8 +64,8 @@ daSus_c_NS_data_c_NS_isSwitch: /* 80030FDC 0002DF1C 88 03 00 01 */ lbz r0, 1(r3) /* 80030FE0 0002DF20 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80030FE4 0002DF24 41 82 00 24 */ beq lbl_80031008 -/* 80030FE8 0002DF28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80030FEC 0002DF2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80030FE8 0002DF28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80030FEC 0002DF2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80030FF0 0002DF30 88 85 00 02 */ lbz r4, 2(r5) /* 80030FF4 0002DF34 88 A5 00 00 */ lbz r5, 0(r5) /* 80030FF8 0002DF38 7C A5 07 74 */ extsb r5, r5 @@ -73,8 +73,8 @@ daSus_c_NS_data_c_NS_isSwitch: /* 80031000 0002DF40 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 80031004 0002DF44 48 00 00 24 */ b lbl_80031028 lbl_80031008: -/* 80031008 0002DF48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003100C 0002DF4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031008 0002DF48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003100C 0002DF4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031010 0002DF50 88 85 00 02 */ lbz r4, 2(r5) /* 80031014 0002DF54 88 A5 00 00 */ lbz r5, 0(r5) /* 80031018 0002DF58 7C A5 07 74 */ extsb r5, r5 @@ -523,8 +523,8 @@ lbl_800315E8: /* 80031610 0002E550 7C 08 02 A6 */ mflr r0 /* 80031614 0002E554 90 01 00 14 */ stw r0, 0x14(r1) /* 80031618 0002E558 7C 65 1B 78 */ mr r5, r3 -/* 8003161C 0002E55C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031620 0002E560 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003161C 0002E55C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031620 0002E560 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031624 0002E564 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031628 0002E568 3C 80 00 01 */ lis r4, 0x0000FDFF@ha /* 8003162C 0002E56C 38 84 FD FF */ addi r4, r4, 0x0000FDFF@l @@ -539,8 +539,8 @@ lbl_800315E8: /* 80031650 0002E590 90 01 00 14 */ stw r0, 0x14(r1) /* 80031654 0002E594 93 E1 00 0C */ stw r31, 0xc(r1) /* 80031658 0002E598 3B E0 00 00 */ li r31, 0 -/* 8003165C 0002E59C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031660 0002E5A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003165C 0002E59C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031660 0002E5A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031664 0002E5A4 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 80031668 0002E5A8 3C 80 80 38 */ lis r4, lbl_803790B0@ha /* 8003166C 0002E5AC 38 84 90 B0 */ addi r4, r4, lbl_803790B0@l @@ -563,8 +563,8 @@ lbl_80031690: /* 800316AC 0002E5EC 7C 08 02 A6 */ mflr r0 /* 800316B0 0002E5F0 90 01 00 14 */ stw r0, 0x14(r1) /* 800316B4 0002E5F4 7C 65 1B 78 */ mr r5, r3 -/* 800316B8 0002E5F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800316BC 0002E5FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800316B8 0002E5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800316BC 0002E5FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800316C0 0002E600 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800316C4 0002E604 3C 80 00 01 */ lis r4, 0x0000FF0F@ha /* 800316C8 0002E608 38 84 FF 0F */ addi r4, r4, 0x0000FF0F@l @@ -579,8 +579,8 @@ daNpcKakashi_getSwdTutorialStep: /* 800316E0 0002E620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800316E4 0002E624 7C 08 02 A6 */ mflr r0 /* 800316E8 0002E628 90 01 00 14 */ stw r0, 0x14(r1) -/* 800316EC 0002E62C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800316F0 0002E630 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800316EC 0002E62C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800316F0 0002E630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800316F4 0002E634 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800316F8 0002E638 3C 80 00 01 */ lis r4, 0x0000FF0F@ha /* 800316FC 0002E63C 38 84 FF 0F */ addi r4, r4, 0x0000FF0F@l @@ -596,8 +596,8 @@ daNpcKakashi_getSwdTutorialResult: /* 80031718 0002E658 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003171C 0002E65C 7C 08 02 A6 */ mflr r0 /* 80031720 0002E660 90 01 00 14 */ stw r0, 0x14(r1) -/* 80031724 0002E664 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031728 0002E668 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031724 0002E664 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031728 0002E668 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003172C 0002E66C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031730 0002E670 38 80 00 40 */ li r4, 0x40 /* 80031734 0002E674 48 00 32 89 */ bl isEventBit__11dSv_event_cCFUs @@ -613,15 +613,15 @@ daNpcKakashi_getSwdTutorialResult: /* 8003175C 0002E69C 90 01 00 14 */ stw r0, 0x14(r1) /* 80031760 0002E6A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80031764 0002E6A4 41 82 00 1C */ beq lbl_80031780 -/* 80031768 0002E6A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003176C 0002E6AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031768 0002E6A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003176C 0002E6AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031770 0002E6B0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031774 0002E6B4 38 80 00 40 */ li r4, 0x40 /* 80031778 0002E6B8 48 00 32 15 */ bl onEventBit__11dSv_event_cFUs /* 8003177C 0002E6BC 48 00 00 18 */ b lbl_80031794 lbl_80031780: -/* 80031780 0002E6C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031784 0002E6C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031780 0002E6C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031784 0002E6C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031788 0002E6C8 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8003178C 0002E6CC 38 80 00 40 */ li r4, 0x40 /* 80031790 0002E6D0 48 00 32 15 */ bl offEventBit__11dSv_event_cFUs @@ -636,8 +636,8 @@ daNpcKakashi_getSuccessCount: /* 800317A4 0002E6E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800317A8 0002E6E8 7C 08 02 A6 */ mflr r0 /* 800317AC 0002E6EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800317B0 0002E6F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800317B4 0002E6F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800317B0 0002E6F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800317B4 0002E6F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800317B8 0002E6F8 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800317BC 0002E6FC 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 800317C0 0002E700 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l @@ -651,8 +651,8 @@ daNpcKakashi_getSuccessCount: /* 800317E0 0002E720 7C 08 02 A6 */ mflr r0 /* 800317E4 0002E724 90 01 00 14 */ stw r0, 0x14(r1) /* 800317E8 0002E728 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800317EC 0002E72C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800317F0 0002E730 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800317EC 0002E72C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800317F0 0002E730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800317F4 0002E734 3B E3 0D D8 */ addi r31, r3, 0xdd8 /* 800317F8 0002E738 7F E3 FB 78 */ mr r3, r31 /* 800317FC 0002E73C 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -673,8 +673,8 @@ daNpcKakashi_getSuccessCount: /* 80031838 0002E778 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003183C 0002E77C 7C 08 02 A6 */ mflr r0 /* 80031840 0002E780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80031844 0002E784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031848 0002E788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031844 0002E784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031848 0002E788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003184C 0002E78C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031850 0002E790 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 80031854 0002E794 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l @@ -901,8 +901,8 @@ daTagMagne_c_NS_checkMagnetCode: /* 80031B70 0002EAB0 38 60 00 00 */ li r3, 0 /* 80031B74 0002EAB4 48 00 00 6C */ b lbl_80031BE0 lbl_80031B78: -/* 80031B78 0002EAB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031B7C 0002EABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031B78 0002EAB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031B7C 0002EABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031B80 0002EAC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80031B84 0002EAC4 48 04 31 89 */ bl dBgS_NS_GetMagnetCode /* 80031B88 0002EAC8 7C 7F 1B 78 */ mr r31, r3 @@ -947,8 +947,8 @@ daTagMagne_c_NS_checkMagneA: /* 80031C04 0002EB44 88 83 05 68 */ lbz r4, 0x568(r3) /* 80031C08 0002EB48 28 04 00 FF */ cmplwi r4, 0xff /* 80031C0C 0002EB4C 41 82 00 20 */ beq lbl_80031C2C -/* 80031C10 0002EB50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031C14 0002EB54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031C10 0002EB50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031C14 0002EB54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031C18 0002EB58 88 05 04 BA */ lbz r0, 0x4ba(r5) /* 80031C1C 0002EB5C 7C 05 07 74 */ extsb r5, r0 /* 80031C20 0002EB60 48 00 37 41 */ bl isSwitch__10dSv_info_cCFii @@ -974,8 +974,8 @@ daTagMagne_c_NS_checkMagneB: /* 80031C58 0002EB98 88 83 05 69 */ lbz r4, 0x569(r3) /* 80031C5C 0002EB9C 28 04 00 FF */ cmplwi r4, 0xff /* 80031C60 0002EBA0 41 82 00 20 */ beq lbl_80031C80 -/* 80031C64 0002EBA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031C68 0002EBA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031C64 0002EBA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031C68 0002EBA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031C6C 0002EBAC 88 05 04 BA */ lbz r0, 0x4ba(r5) /* 80031C70 0002EBB0 7C 05 07 74 */ extsb r5, r0 /* 80031C74 0002EBB4 48 00 36 ED */ bl isSwitch__10dSv_info_cCFii @@ -1001,8 +1001,8 @@ daTagMagne_c_NS_checkMagneC: /* 80031CAC 0002EBEC 88 83 05 6A */ lbz r4, 0x56a(r3) /* 80031CB0 0002EBF0 28 04 00 FF */ cmplwi r4, 0xff /* 80031CB4 0002EBF4 41 82 00 20 */ beq lbl_80031CD4 -/* 80031CB8 0002EBF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80031CBC 0002EBFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80031CB8 0002EBF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80031CBC 0002EBFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031CC0 0002EC00 88 05 04 BA */ lbz r0, 0x4ba(r5) /* 80031CC4 0002EC04 7C 05 07 74 */ extsb r5, r0 /* 80031CC8 0002EC08 48 00 36 99 */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index 43032443d5..45f42b905c 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -36,8 +36,8 @@ lbl_8002B330: lbl_8002B338: /* 8002B338 00028278 38 00 00 07 */ li r0, 7 /* 8002B33C 0002827C 98 1E 4F 4C */ stb r0, 0x4f4c(r30) -/* 8002B340 00028280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B344 00028284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B340 00028280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B344 00028284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B348 00028288 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 8002B34C 0002828C 48 00 93 49 */ bl getVibration__19dSv_player_config_cFv /* 8002B350 00028290 98 7E 4F 5A */ stb r3, 0x4f5a(r30) @@ -158,8 +158,8 @@ lbl_8002B47C: /* 8002B4B4 000283F4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B4B8 000283F8 40 82 00 88 */ bne lbl_8002B540 lbl_8002B4BC: -/* 8002B4BC 000283FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B4C0 00028400 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B4BC 000283FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B4C0 00028400 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B4C4 00028404 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B4C8 00028408 7F A3 EB 78 */ mr r3, r29 /* 8002B4CC 0002840C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -201,8 +201,8 @@ lbl_8002B540: /* 8002B550 00028490 48 33 D4 45 */ bl strcmp /* 8002B554 00028494 2C 03 00 00 */ cmpwi r3, 0 /* 8002B558 00028498 40 82 00 90 */ bne lbl_8002B5E8 -/* 8002B55C 0002849C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B560 000284A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B55C 0002849C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B560 000284A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B564 000284A4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B568 000284A8 7F A3 EB 78 */ mr r3, r29 /* 8002B56C 000284AC 38 80 20 08 */ li r4, 0x2008 @@ -247,8 +247,8 @@ lbl_8002B5E8: /* 8002B5F8 00028538 48 33 D3 9D */ bl strcmp /* 8002B5FC 0002853C 2C 03 00 00 */ cmpwi r3, 0 /* 8002B600 00028540 40 82 00 58 */ bne lbl_8002B658 -/* 8002B604 00028544 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B608 00028548 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B604 00028544 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B608 00028548 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B60C 0002854C 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B610 00028550 7F A3 EB 78 */ mr r3, r29 /* 8002B614 00028554 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -285,8 +285,8 @@ lbl_8002B658: /* 8002B688 000285C8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B68C 000285CC 40 82 00 E8 */ bne lbl_8002B774 lbl_8002B690: -/* 8002B690 000285D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B694 000285D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B690 000285D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B694 000285D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B698 000285D8 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B69C 000285DC 7F A3 EB 78 */ mr r3, r29 /* 8002B6A0 000285E0 38 80 08 04 */ li r4, 0x804 @@ -372,8 +372,8 @@ lbl_8002B7AC: /* 8002B7C4 00028704 40 82 00 3C */ bne lbl_8002B800 /* 8002B7C8 00028708 2C 1E 00 01 */ cmpwi r30, 1 /* 8002B7CC 0002870C 40 82 00 34 */ bne lbl_8002B800 -/* 8002B7D0 00028710 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B7D4 00028714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B7D0 00028710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B7D4 00028714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B7D8 00028718 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002B7DC 0002871C 38 80 09 04 */ li r4, 0x904 /* 8002B7E0 00028720 48 00 91 DD */ bl isEventBit__11dSv_event_cCFUs @@ -385,8 +385,8 @@ lbl_8002B7AC: /* 8002B7F8 00028738 4B FF FB FD */ bl dComIfG_get_timelayer /* 8002B7FC 0002873C 48 00 0F 30 */ b lbl_8002C72C lbl_8002B800: -/* 8002B800 00028740 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B804 00028744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B800 00028740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B804 00028744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B808 00028748 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B80C 0002874C 7F A3 EB 78 */ mr r3, r29 /* 8002B810 00028750 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -419,8 +419,8 @@ lbl_8002B864: /* 8002B874 000287B4 48 33 D1 21 */ bl strcmp /* 8002B878 000287B8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B87C 000287BC 40 82 00 34 */ bne lbl_8002B8B0 -/* 8002B880 000287C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B884 000287C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B880 000287C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B884 000287C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B888 000287C8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002B88C 000287CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B890 000287D0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -439,8 +439,8 @@ lbl_8002B8B0: /* 8002B8C0 00028800 48 33 D0 D5 */ bl strcmp /* 8002B8C4 00028804 2C 03 00 00 */ cmpwi r3, 0 /* 8002B8C8 00028808 40 82 00 90 */ bne lbl_8002B958 -/* 8002B8CC 0002880C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B8D0 00028810 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B8CC 0002880C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B8D0 00028810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B8D4 00028814 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B8D8 00028818 7F A3 EB 78 */ mr r3, r29 /* 8002B8DC 0002881C 38 80 23 20 */ li r4, 0x2320 @@ -519,8 +519,8 @@ lbl_8002B9D0: /* 8002B9E8 00028928 40 82 00 78 */ bne lbl_8002BA60 /* 8002B9EC 0002892C 2C 1E 00 00 */ cmpwi r30, 0 /* 8002B9F0 00028930 40 82 00 70 */ bne lbl_8002BA60 -/* 8002B9F4 00028934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B9F8 00028938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B9F4 00028934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B9F8 00028938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B9FC 0002893C 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BA00 00028940 7F A3 EB 78 */ mr r3, r29 /* 8002BA04 00028944 38 80 3B 08 */ li r4, 0x3b08 @@ -558,8 +558,8 @@ lbl_8002BA60: /* 8002BA78 000289B8 40 82 00 34 */ bne lbl_8002BAAC /* 8002BA7C 000289BC 2C 1E 00 05 */ cmpwi r30, 5 /* 8002BA80 000289C0 40 82 00 2C */ bne lbl_8002BAAC -/* 8002BA84 000289C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BA88 000289C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BA84 000289C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BA88 000289C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BA8C 000289CC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BA90 000289D0 38 80 20 20 */ li r4, 0x2020 /* 8002BA94 000289D4 48 00 8F 29 */ bl isEventBit__11dSv_event_cCFUs @@ -569,8 +569,8 @@ lbl_8002BA60: /* 8002BAA4 000289E4 90 01 00 08 */ stw r0, 8(r1) /* 8002BAA8 000289E8 48 00 0C 84 */ b lbl_8002C72C lbl_8002BAAC: -/* 8002BAAC 000289EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BAB0 000289F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BAAC 000289EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BAB0 000289F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BAB4 000289F4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BAB8 000289F8 7F A3 EB 78 */ mr r3, r29 /* 8002BABC 000289FC 38 80 1E 08 */ li r4, 0x1e08 @@ -652,8 +652,8 @@ lbl_8002BBC8: /* 8002BBD8 00028B18 48 33 CD BD */ bl strcmp /* 8002BBDC 00028B1C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BBE0 00028B20 40 82 00 2C */ bne lbl_8002BC0C -/* 8002BBE4 00028B24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BBE8 00028B28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BBE4 00028B24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BBE8 00028B28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BBEC 00028B2C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BBF0 00028B30 38 80 20 08 */ li r4, 0x2008 /* 8002BBF4 00028B34 48 00 8D C9 */ bl isEventBit__11dSv_event_cCFUs @@ -670,8 +670,8 @@ lbl_8002BC0C: /* 8002BC1C 00028B5C 48 33 CD 79 */ bl strcmp /* 8002BC20 00028B60 2C 03 00 00 */ cmpwi r3, 0 /* 8002BC24 00028B64 40 82 00 34 */ bne lbl_8002BC58 -/* 8002BC28 00028B68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BC2C 00028B6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BC28 00028B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BC2C 00028B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BC30 00028B70 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BC34 00028B74 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BC38 00028B78 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -694,8 +694,8 @@ lbl_8002BC58: /* 8002BC78 00028BB8 40 82 00 34 */ bne lbl_8002BCAC /* 8002BC7C 00028BBC 38 00 00 08 */ li r0, 8 /* 8002BC80 00028BC0 90 01 00 08 */ stw r0, 8(r1) -/* 8002BC84 00028BC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BC88 00028BC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BC84 00028BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BC88 00028BC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BC8C 00028BCC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BC90 00028BD0 38 80 40 08 */ li r4, 0x4008 /* 8002BC94 00028BD4 48 00 8D 29 */ bl isEventBit__11dSv_event_cCFUs @@ -712,8 +712,8 @@ lbl_8002BCAC: /* 8002BCBC 00028BFC 48 33 CC D9 */ bl strcmp /* 8002BCC0 00028C00 2C 03 00 00 */ cmpwi r3, 0 /* 8002BCC4 00028C04 40 82 00 50 */ bne lbl_8002BD14 -/* 8002BCC8 00028C08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BCCC 00028C0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BCC8 00028C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BCCC 00028C0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BCD0 00028C10 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BCD4 00028C14 7F A3 EB 78 */ mr r3, r29 /* 8002BCD8 00028C18 38 80 0B 01 */ li r4, 0xb01 @@ -742,8 +742,8 @@ lbl_8002BD14: /* 8002BD2C 00028C6C 40 82 01 9C */ bne lbl_8002BEC8 /* 8002BD30 00028C70 2C 1E 00 00 */ cmpwi r30, 0 /* 8002BD34 00028C74 40 82 00 E4 */ bne lbl_8002BE18 -/* 8002BD38 00028C78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BD3C 00028C7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BD38 00028C78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BD3C 00028C7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BD40 00028C80 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BD44 00028C84 7F A3 EB 78 */ mr r3, r29 /* 8002BD48 00028C88 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -758,8 +758,8 @@ lbl_8002BD14: /* 8002BD6C 00028CAC 4B FF F6 89 */ bl dComIfG_get_timelayer /* 8002BD70 00028CB0 48 00 09 BC */ b lbl_8002C72C lbl_8002BD74: -/* 8002BD74 00028CB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BD78 00028CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BD74 00028CB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BD78 00028CB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BD7C 00028CBC 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BD80 00028CC0 38 80 00 00 */ li r4, 0 /* 8002BD84 00028CC4 48 00 6E 2D */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -806,8 +806,8 @@ lbl_8002BE0C: lbl_8002BE18: /* 8002BE18 00028D58 2C 1E 00 01 */ cmpwi r30, 1 /* 8002BE1C 00028D5C 40 82 09 10 */ bne lbl_8002C72C -/* 8002BE20 00028D60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BE24 00028D64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BE20 00028D60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BE24 00028D64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BE28 00028D68 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BE2C 00028D6C 38 80 00 00 */ li r4, 0 /* 8002BE30 00028D70 48 00 6D 81 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -817,8 +817,8 @@ lbl_8002BE18: /* 8002BE40 00028D80 90 01 00 08 */ stw r0, 8(r1) /* 8002BE44 00028D84 48 00 08 E8 */ b lbl_8002C72C lbl_8002BE48: -/* 8002BE48 00028D88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BE4C 00028D8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BE48 00028D88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BE4C 00028D8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BE50 00028D90 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BE54 00028D94 7F A3 EB 78 */ mr r3, r29 /* 8002BE58 00028D98 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -862,8 +862,8 @@ lbl_8002BEC8: /* 8002BEE0 00028E20 40 82 01 10 */ bne lbl_8002BFF0 /* 8002BEE4 00028E24 2C 1E 00 01 */ cmpwi r30, 1 /* 8002BEE8 00028E28 40 82 00 2C */ bne lbl_8002BF14 -/* 8002BEEC 00028E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BEF0 00028E30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BEEC 00028E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BEF0 00028E30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BEF4 00028E34 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BEF8 00028E38 38 80 00 00 */ li r4, 0 /* 8002BEFC 00028E3C 48 00 6C B5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -875,8 +875,8 @@ lbl_8002BEC8: lbl_8002BF14: /* 8002BF14 00028E54 2C 1E 00 02 */ cmpwi r30, 2 /* 8002BF18 00028E58 40 82 00 80 */ bne lbl_8002BF98 -/* 8002BF1C 00028E5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BF20 00028E60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BF1C 00028E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BF20 00028E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BF24 00028E64 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BF28 00028E68 7F A3 EB 78 */ mr r3, r29 /* 8002BF2C 00028E6C 38 80 07 80 */ li r4, 0x780 @@ -887,8 +887,8 @@ lbl_8002BF14: /* 8002BF40 00028E80 90 01 00 08 */ stw r0, 8(r1) /* 8002BF44 00028E84 48 00 07 E8 */ b lbl_8002C72C lbl_8002BF48: -/* 8002BF48 00028E88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BF4C 00028E8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BF48 00028E88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BF4C 00028E8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BF50 00028E90 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BF54 00028E94 38 80 00 00 */ li r4, 0 /* 8002BF58 00028E98 48 00 6C 59 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -911,8 +911,8 @@ lbl_8002BF70: lbl_8002BF98: /* 8002BF98 00028ED8 2C 1E 00 05 */ cmpwi r30, 5 /* 8002BF9C 00028EDC 40 82 07 90 */ bne lbl_8002C72C -/* 8002BFA0 00028EE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BFA4 00028EE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BFA0 00028EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BFA4 00028EE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BFA8 00028EE8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BFAC 00028EEC 38 80 06 01 */ li r4, 0x601 /* 8002BFB0 00028EF0 48 00 8A 0D */ bl isEventBit__11dSv_event_cCFUs @@ -922,8 +922,8 @@ lbl_8002BF98: /* 8002BFC0 00028F00 90 01 00 08 */ stw r0, 8(r1) /* 8002BFC4 00028F04 48 00 07 68 */ b lbl_8002C72C lbl_8002BFC8: -/* 8002BFC8 00028F08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002BFCC 00028F0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002BFC8 00028F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002BFCC 00028F0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002BFD0 00028F10 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BFD4 00028F14 38 80 00 00 */ li r4, 0 /* 8002BFD8 00028F18 48 00 6B D9 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -942,8 +942,8 @@ lbl_8002BFF0: /* 8002C008 00028F48 40 82 01 0C */ bne lbl_8002C114 /* 8002C00C 00028F4C 2C 1E 00 01 */ cmpwi r30, 1 /* 8002C010 00028F50 40 82 00 AC */ bne lbl_8002C0BC -/* 8002C014 00028F54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C018 00028F58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C014 00028F54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C018 00028F58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C01C 00028F5C 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C020 00028F60 38 80 00 00 */ li r4, 0 /* 8002C024 00028F64 48 00 6B 8D */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -953,8 +953,8 @@ lbl_8002BFF0: /* 8002C034 00028F74 90 01 00 08 */ stw r0, 8(r1) /* 8002C038 00028F78 48 00 06 F4 */ b lbl_8002C72C lbl_8002C03C: -/* 8002C03C 00028F7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C040 00028F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C03C 00028F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C040 00028F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C044 00028F84 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C048 00028F88 7F A3 EB 78 */ mr r3, r29 /* 8002C04C 00028F8C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -989,8 +989,8 @@ lbl_8002C0B0: /* 8002C0B4 00028FF4 90 01 00 08 */ stw r0, 8(r1) /* 8002C0B8 00028FF8 48 00 06 74 */ b lbl_8002C72C lbl_8002C0BC: -/* 8002C0BC 00028FFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C0C0 00029000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C0BC 00028FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C0C0 00029000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C0C4 00029004 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C0C8 00029008 38 80 00 00 */ li r4, 0 /* 8002C0CC 0002900C 48 00 6A E5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -1000,8 +1000,8 @@ lbl_8002C0BC: /* 8002C0DC 0002901C 90 01 00 08 */ stw r0, 8(r1) /* 8002C0E0 00029020 48 00 06 4C */ b lbl_8002C72C lbl_8002C0E4: -/* 8002C0E4 00029024 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C0E8 00029028 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C0E4 00029024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C0E8 00029028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C0EC 0002902C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C0F0 00029030 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C0F4 00029034 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -1020,8 +1020,8 @@ lbl_8002C114: /* 8002C124 00029064 48 33 C8 71 */ bl strcmp /* 8002C128 00029068 2C 03 00 00 */ cmpwi r3, 0 /* 8002C12C 0002906C 40 82 00 DC */ bne lbl_8002C208 -/* 8002C130 00029070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C134 00029074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C130 00029070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C134 00029074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C138 00029078 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C13C 0002907C 38 80 00 00 */ li r4, 0 /* 8002C140 00029080 48 00 6A 71 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -1033,8 +1033,8 @@ lbl_8002C114: /* 8002C158 00029098 4B FF F2 9D */ bl dComIfG_get_timelayer /* 8002C15C 0002909C 48 00 05 D0 */ b lbl_8002C72C lbl_8002C160: -/* 8002C160 000290A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C164 000290A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C160 000290A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C164 000290A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C168 000290A8 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C16C 000290AC 7F A3 EB 78 */ mr r3, r29 /* 8002C170 000290B0 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -1087,8 +1087,8 @@ lbl_8002C208: /* 8002C218 00029158 48 33 C7 7D */ bl strcmp /* 8002C21C 0002915C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C220 00029160 40 82 00 C4 */ bne lbl_8002C2E4 -/* 8002C224 00029164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C228 00029168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C224 00029164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C228 00029168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C22C 0002916C 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C230 00029170 7F A3 EB 78 */ mr r3, r29 /* 8002C234 00029174 38 80 1E 08 */ li r4, 0x1e08 @@ -1119,8 +1119,8 @@ lbl_8002C270: /* 8002C290 000291D0 90 01 00 08 */ stw r0, 8(r1) /* 8002C294 000291D4 48 00 04 98 */ b lbl_8002C72C lbl_8002C298: -/* 8002C298 000291D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C29C 000291DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C298 000291D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C29C 000291DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C2A0 000291E0 3B A3 0D D8 */ addi r29, r3, 0xdd8 /* 8002C2A4 000291E4 7F A3 EB 78 */ mr r3, r29 /* 8002C2A8 000291E8 38 80 06 01 */ li r4, 0x601 @@ -1149,8 +1149,8 @@ lbl_8002C2E4: /* 8002C2FC 0002923C 40 82 01 40 */ bne lbl_8002C43C /* 8002C300 00029240 2C 1E 00 08 */ cmpwi r30, 8 /* 8002C304 00029244 40 82 00 50 */ bne lbl_8002C354 -/* 8002C308 00029248 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C30C 0002924C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C308 00029248 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C30C 0002924C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C310 00029250 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C314 00029254 7F A3 EB 78 */ mr r3, r29 /* 8002C318 00029258 38 80 1E 08 */ li r4, 0x1e08 @@ -1172,8 +1172,8 @@ lbl_8002C334: lbl_8002C354: /* 8002C354 00029294 2C 1E 00 10 */ cmpwi r30, 0x10 /* 8002C358 00029298 40 82 00 90 */ bne lbl_8002C3E8 -/* 8002C35C 0002929C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C360 000292A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C35C 0002929C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C360 000292A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C364 000292A4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C368 000292A8 7F A3 EB 78 */ mr r3, r29 /* 8002C36C 000292AC 38 80 22 04 */ li r4, 0x2204 @@ -1213,8 +1213,8 @@ lbl_8002C3C8: lbl_8002C3E8: /* 8002C3E8 00029328 2C 1E 00 11 */ cmpwi r30, 0x11 /* 8002C3EC 0002932C 40 82 03 40 */ bne lbl_8002C72C -/* 8002C3F0 00029330 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C3F4 00029334 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C3F0 00029330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C3F4 00029334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C3F8 00029338 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C3FC 0002933C 7F A3 EB 78 */ mr r3, r29 /* 8002C400 00029340 38 80 1E 08 */ li r4, 0x1e08 @@ -1241,8 +1241,8 @@ lbl_8002C43C: /* 8002C44C 0002938C 48 33 C5 49 */ bl strcmp /* 8002C450 00029390 2C 03 00 00 */ cmpwi r3, 0 /* 8002C454 00029394 40 82 00 2C */ bne lbl_8002C480 -/* 8002C458 00029398 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C45C 0002939C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C458 00029398 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C45C 0002939C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C460 000293A0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C464 000293A4 38 80 23 20 */ li r4, 0x2320 /* 8002C468 000293A8 48 00 85 55 */ bl isEventBit__11dSv_event_cCFUs @@ -1261,8 +1261,8 @@ lbl_8002C480: /* 8002C498 000293D8 40 82 00 68 */ bne lbl_8002C500 /* 8002C49C 000293DC 2C 1E 00 05 */ cmpwi r30, 5 /* 8002C4A0 000293E0 40 82 00 38 */ bne lbl_8002C4D8 -/* 8002C4A4 000293E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C4A8 000293E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C4A4 000293E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C4A8 000293E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C4AC 000293EC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C4B0 000293F0 38 80 1E 08 */ li r4, 0x1e08 /* 8002C4B4 000293F4 48 00 85 09 */ bl isEventBit__11dSv_event_cCFUs @@ -1276,8 +1276,8 @@ lbl_8002C4CC: /* 8002C4D0 00029410 90 01 00 08 */ stw r0, 8(r1) /* 8002C4D4 00029414 48 00 02 58 */ b lbl_8002C72C lbl_8002C4D8: -/* 8002C4D8 00029418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C4DC 0002941C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C4D8 00029418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C4DC 0002941C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C4E0 00029420 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C4E4 00029424 38 80 22 10 */ li r4, 0x2210 /* 8002C4E8 00029428 48 00 84 D5 */ bl isEventBit__11dSv_event_cCFUs @@ -1294,8 +1294,8 @@ lbl_8002C500: /* 8002C510 00029450 48 33 C4 85 */ bl strcmp /* 8002C514 00029454 2C 03 00 00 */ cmpwi r3, 0 /* 8002C518 00029458 40 82 00 2C */ bne lbl_8002C544 -/* 8002C51C 0002945C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C520 00029460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C51C 0002945C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C520 00029460 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C524 00029464 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C528 00029468 38 80 20 08 */ li r4, 0x2008 /* 8002C52C 0002946C 48 00 84 91 */ bl isEventBit__11dSv_event_cCFUs @@ -1312,8 +1312,8 @@ lbl_8002C544: /* 8002C554 00029494 48 33 C4 41 */ bl strcmp /* 8002C558 00029498 2C 03 00 00 */ cmpwi r3, 0 /* 8002C55C 0002949C 40 82 00 70 */ bne lbl_8002C5CC -/* 8002C560 000294A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C564 000294A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C560 000294A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C564 000294A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C568 000294A8 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C56C 000294AC 7F A3 EB 78 */ mr r3, r29 /* 8002C570 000294B0 38 80 2B 08 */ li r4, 0x2b08 @@ -1349,8 +1349,8 @@ lbl_8002C5CC: /* 8002C5DC 0002951C 48 33 C3 B9 */ bl strcmp /* 8002C5E0 00029520 2C 03 00 00 */ cmpwi r3, 0 /* 8002C5E4 00029524 40 82 00 2C */ bne lbl_8002C610 -/* 8002C5E8 00029528 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C5EC 0002952C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C5E8 00029528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C5EC 0002952C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C5F0 00029530 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C5F4 00029534 38 80 45 10 */ li r4, 0x4510 /* 8002C5F8 00029538 48 00 83 C5 */ bl isEventBit__11dSv_event_cCFUs @@ -1367,8 +1367,8 @@ lbl_8002C610: /* 8002C620 00029560 48 33 C3 75 */ bl strcmp /* 8002C624 00029564 2C 03 00 00 */ cmpwi r3, 0 /* 8002C628 00029568 40 82 00 2C */ bne lbl_8002C654 -/* 8002C62C 0002956C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C630 00029570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C62C 0002956C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C630 00029570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C634 00029574 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C638 00029578 38 80 00 03 */ li r4, 3 /* 8002C63C 0002957C 48 00 65 B1 */ bl isTransformLV__21dSv_player_status_b_cCFi @@ -1443,8 +1443,8 @@ lbl_8002C72C: /* 8002C72C 0002966C 80 01 00 08 */ lwz r0, 8(r1) /* 8002C730 00029670 2C 00 00 0E */ cmpwi r0, 0xe /* 8002C734 00029674 40 82 02 00 */ bne lbl_8002C934 -/* 8002C738 00029678 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C73C 0002967C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C738 00029678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C73C 0002967C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C740 00029680 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C744 00029684 7F A3 EB 78 */ mr r3, r29 /* 8002C748 00029688 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -1610,14 +1610,14 @@ dComIfG_play_c_NS_getLayerNo: /* 8002C990 000298D0 7C 04 03 78 */ mr r4, r0 /* 8002C994 000298D4 2C 00 FF FF */ cmpwi r0, -1 /* 8002C998 000298D8 41 81 00 18 */ bgt lbl_8002C9B0 -/* 8002C99C 000298DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C9A0 000298E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002C99C 000298DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C9A0 000298E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002C9A4 000298E4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002C9A8 000298E8 7C 00 07 74 */ extsb r0, r0 /* 8002C9AC 000298EC 7C 04 03 78 */ mr r4, r0 lbl_8002C9B0: -/* 8002C9B0 000298F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002C9B4 000298F4 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8002C9B0 000298F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002C9B4 000298F4 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8002C9B8 000298F8 38 65 4E 00 */ addi r3, r5, 0x4e00 /* 8002C9BC 000298FC 88 05 4E 0B */ lbz r0, 0x4e0b(r5) /* 8002C9C0 00029900 7C 05 07 74 */ extsb r5, r0 @@ -1852,8 +1852,8 @@ dComIfG_changeOpeningScene: /* 8002CC68 00029BA8 7C 7E 1B 78 */ mr r30, r3 /* 8002CC6C 00029BAC 7C 9F 23 78 */ mr r31, r4 /* 8002CC70 00029BB0 38 00 00 00 */ li r0, 0 -/* 8002CC74 00029BB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002CC78 00029BB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002CC74 00029BB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002CC78 00029BB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002CC7C 00029BBC 98 03 4E 1C */ stb r0, 0x4e1c(r3) /* 8002CC80 00029BC0 3C 60 80 38 */ lis r3, lbl_80378F38@ha /* 8002CC84 00029BC4 38 63 8F 38 */ addi r3, r3, lbl_80378F38@l @@ -1862,8 +1862,8 @@ dComIfG_changeOpeningScene: /* 8002CC90 00029BD0 38 A0 00 00 */ li r5, 0 /* 8002CC94 00029BD4 38 C0 00 0A */ li r6, 0xa /* 8002CC98 00029BD8 48 00 08 BD */ bl dComIfGp_setNextStage_X1_ -/* 8002CC9C 00029BDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002CCA0 00029BE0 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8002CC9C 00029BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002CCA0 00029BE0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8002CCA4 00029BE4 38 65 4E 0E */ addi r3, r5, 0x4e0e /* 8002CCA8 00029BE8 88 05 4E 18 */ lbz r0, 0x4e18(r5) /* 8002CCAC 00029BEC 7C 04 07 74 */ extsb r4, r0 @@ -1871,8 +1871,8 @@ dComIfG_changeOpeningScene: /* 8002CCB4 00029BF4 7C 05 07 74 */ extsb r5, r0 /* 8002CCB8 00029BF8 4B FD A5 05 */ bl mDoAud_setSceneName /* 8002CCBC 00029BFC 38 00 00 00 */ li r0, 0 -/* 8002CCC0 00029C00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002CCC4 00029C04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002CCC0 00029C00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002CCC4 00029C04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002CCC8 00029C08 90 03 0D C8 */ stw r0, 0xdc8(r3) /* 8002CCCC 00029C0C 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) /* 8002CCD0 00029C10 80 03 00 04 */ lwz r0, 4(r3) @@ -1945,8 +1945,8 @@ lbl_8002CDA8: /* 8002CDC0 00029D00 90 01 00 14 */ stw r0, 0x14(r1) /* 8002CDC4 00029D04 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002CDC8 00029D08 7C 7F 1B 78 */ mr r31, r3 -/* 8002CDCC 00029D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002CDD0 00029D10 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002CDCC 00029D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002CDD0 00029D10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002CDD4 00029D14 3C 84 00 02 */ addis r4, r4, 2 /* 8002CDD8 00029D18 38 A0 00 80 */ li r5, 0x80 /* 8002CDDC 00029D1C 3C C0 80 38 */ lis r6, lbl_80378F38@ha @@ -1979,8 +1979,8 @@ lbl_8002CE24: /* 8002CE40 00029D80 90 01 00 14 */ stw r0, 0x14(r1) /* 8002CE44 00029D84 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002CE48 00029D88 7C 7F 1B 78 */ mr r31, r3 -/* 8002CE4C 00029D8C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002CE50 00029D90 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002CE4C 00029D8C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002CE50 00029D90 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002CE54 00029D94 3C 84 00 02 */ addis r4, r4, 2 /* 8002CE58 00029D98 38 A0 00 80 */ li r5, 0x80 /* 8002CE5C 00029D9C 38 84 C2 F8 */ addi r4, r4, -15624 @@ -2035,8 +2035,8 @@ lbl_8002CEEC: /* 8002CF04 00029E44 90 01 00 14 */ stw r0, 0x14(r1) /* 8002CF08 00029E48 7C 68 1B 78 */ mr r8, r3 /* 8002CF0C 00029E4C 80 63 00 00 */ lwz r3, 0(r3) -/* 8002CF10 00029E50 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002CF14 00029E54 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002CF10 00029E50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002CF14 00029E54 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002CF18 00029E58 3C 84 00 02 */ addis r4, r4, 2 /* 8002CF1C 00029E5C 38 A0 00 80 */ li r5, 0x80 /* 8002CF20 00029E60 3C C0 80 38 */ lis r6, lbl_80378F38@ha @@ -2059,8 +2059,8 @@ lbl_8002CF4C: /* 8002CF60 00029EA0 7C 08 02 A6 */ mflr r0 /* 8002CF64 00029EA4 90 01 00 14 */ stw r0, 0x14(r1) /* 8002CF68 00029EA8 80 63 00 00 */ lwz r3, 0(r3) -/* 8002CF6C 00029EAC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002CF70 00029EB0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002CF6C 00029EAC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002CF70 00029EB0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002CF74 00029EB4 3C 84 00 02 */ addis r4, r4, 2 /* 8002CF78 00029EB8 38 A0 00 80 */ li r5, 0x80 /* 8002CF7C 00029EBC 38 84 C2 F8 */ addi r4, r4, -15624 @@ -2120,8 +2120,8 @@ dComIfG_resDelete: /* 8002D02C 00029F6C 48 00 00 2C */ b lbl_8002D058 lbl_8002D030: /* 8002D030 00029F70 7C 83 23 78 */ mr r3, r4 -/* 8002D034 00029F74 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002D038 00029F78 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002D034 00029F74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002D038 00029F78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002D03C 00029F7C 3C 84 00 02 */ addis r4, r4, 2 /* 8002D040 00029F80 38 A0 00 80 */ li r5, 0x80 /* 8002D044 00029F84 38 84 C2 F8 */ addi r4, r4, -15624 @@ -2143,8 +2143,8 @@ dComIfGp_getReverb: /* 8002D074 00029FB4 90 01 00 14 */ stw r0, 0x14(r1) /* 8002D078 00029FB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002D07C 00029FBC 7C 7F 1B 78 */ mr r31, r3 -/* 8002D080 00029FC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D084 00029FC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D080 00029FC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D084 00029FC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D088 00029FC8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D08C 00029FCC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8002D090 00029FD0 7D 89 03 A6 */ mtctr r12 @@ -2187,14 +2187,14 @@ dComIfGd_setSimpleShadow: /* 8002D118 0002A058 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8002D11C 0002A05C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8002D120 0002A060 90 01 00 18 */ stw r0, 0x18(r1) -/* 8002D124 0002A064 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D128 0002A068 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D124 0002A064 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D128 0002A068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D12C 0002A06C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8002D130 0002A070 7F A4 EB 78 */ mr r4, r29 /* 8002D134 0002A074 38 A1 00 08 */ addi r5, r1, 8 /* 8002D138 0002A078 48 04 76 0D */ bl cBgS_NS_GetTriPla -/* 8002D13C 0002A07C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D140 0002A080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D13C 0002A07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D140 0002A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D144 0002A084 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 8002D148 0002A088 7F 84 E3 78 */ mr r4, r28 /* 8002D14C 0002A08C FC 20 E8 90 */ fmr f1, f29 @@ -2232,8 +2232,8 @@ lbl_8002D17C: /* 8002D1C4 0002A104 7C 9D 23 78 */ mr r29, r4 /* 8002D1C8 0002A108 7C BE 2B 78 */ mr r30, r5 /* 8002D1CC 0002A10C 7C DF 33 78 */ mr r31, r6 -/* 8002D1D0 0002A110 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D1D4 0002A114 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D1D0 0002A110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D1D4 0002A114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D1D8 0002A118 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D1DC 0002A11C 81 8C 01 2C */ lwz r12, 0x12c(r12) /* 8002D1E0 0002A120 7D 89 03 A6 */ mtctr r12 @@ -2279,8 +2279,8 @@ dComIfGp_getRoomCamera: /* 8002D260 0002A1A0 7C 08 02 A6 */ mflr r0 /* 8002D264 0002A1A4 90 01 00 14 */ stw r0, 0x14(r1) /* 8002D268 0002A1A8 7C 64 1B 78 */ mr r4, r3 -/* 8002D26C 0002A1AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D270 0002A1B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D26C 0002A1AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D270 0002A1B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D274 0002A1B4 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8002D278 0002A1B8 4B FF 71 0D */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8002D27C 0002A1BC 28 03 00 00 */ cmplwi r3, 0 @@ -2304,8 +2304,8 @@ dComIfGp_getRoomArrow: /* 8002D2B0 0002A1F0 7C 08 02 A6 */ mflr r0 /* 8002D2B4 0002A1F4 90 01 00 14 */ stw r0, 0x14(r1) /* 8002D2B8 0002A1F8 7C 64 1B 78 */ mr r4, r3 -/* 8002D2BC 0002A1FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D2C0 0002A200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D2BC 0002A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D2C0 0002A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D2C4 0002A204 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8002D2C8 0002A208 4B FF 70 BD */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8002D2CC 0002A20C 28 03 00 00 */ cmplwi r3, 0 @@ -2347,8 +2347,8 @@ dComIfGp_setNextStage: /* 8002D348 0002A288 41 80 00 08 */ blt lbl_8002D350 /* 8002D34C 0002A28C 3B 40 FF FF */ li r26, -1 lbl_8002D350: -/* 8002D350 0002A290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D354 0002A294 3A C3 61 C0 */ addi r22, r3, lbl_804061C0@l +/* 8002D350 0002A290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D354 0002A294 3A C3 61 C0 */ addi r22, r3, g_dComIfG_gameInfo@l /* 8002D358 0002A298 3B F6 00 64 */ addi r31, r22, 0x64 /* 8002D35C 0002A29C 88 16 00 7C */ lbz r0, 0x7c(r22) /* 8002D360 0002A2A0 28 00 00 00 */ cmplwi r0, 0 @@ -2370,8 +2370,8 @@ lbl_8002D350: /* 8002D3A0 0002A2E0 AA C3 04 E6 */ lha r22, 0x4e6(r3) /* 8002D3A4 0002A2E4 48 00 1A BD */ bl dComIfGp_getNowLevel /* 8002D3A8 0002A2E8 7C 68 1B 78 */ mr r8, r3 -/* 8002D3AC 0002A2EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D3B0 0002A2F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D3AC 0002A2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D3B0 0002A2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D3B4 0002A2F4 38 83 4E 00 */ addi r4, r3, 0x4e00 /* 8002D3B8 0002A2F8 7F E3 FB 78 */ mr r3, r31 /* 8002D3BC 0002A2FC 38 A1 00 18 */ addi r5, r1, 0x18 @@ -2407,8 +2407,8 @@ lbl_8002D424: /* 8002D428 0002A368 38 80 00 00 */ li r4, 0 /* 8002D42C 0002A36C 48 00 1C 15 */ bl dComIfGs_setKeyNum lbl_8002D430: -/* 8002D430 0002A370 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D434 0002A374 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D430 0002A370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D434 0002A374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D438 0002A378 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8002D43C 0002A37C 28 03 00 00 */ cmplwi r3, 0 /* 8002D440 0002A380 41 82 00 0C */ beq lbl_8002D44C @@ -2463,8 +2463,8 @@ lbl_8002D4E0: lbl_8002D4E8: /* 8002D4E8 0002A428 39 20 00 1A */ li r9, 0x1a lbl_8002D4EC: -/* 8002D4EC 0002A42C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D4F0 0002A430 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D4EC 0002A42C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D4F0 0002A430 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D4F4 0002A434 38 63 4E 0E */ addi r3, r3, 0x4e0e /* 8002D4F8 0002A438 7E E4 BB 78 */ mr r4, r23 /* 8002D4FC 0002A43C 7F 25 CB 78 */ mr r5, r25 @@ -2473,8 +2473,8 @@ lbl_8002D4EC: /* 8002D508 0002A448 7F 88 E3 78 */ mr r8, r28 /* 8002D50C 0002A44C 4B FF 69 1D */ bl dStage_nextStage_c_NS_set /* 8002D510 0002A450 80 01 00 08 */ lwz r0, 8(r1) -/* 8002D514 0002A454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D518 0002A458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D514 0002A454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D518 0002A458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D51C 0002A45C D3 E3 0D CC */ stfs f31, 0xdcc(r3) /* 8002D520 0002A460 90 03 0D D0 */ stw r0, 0xdd0(r3) /* 8002D524 0002A464 B3 A3 0D D4 */ sth r29, 0xdd4(r3) @@ -2520,8 +2520,8 @@ dComIfGs_isStageTbox: /* 8002D5A8 0002A4E8 93 C1 00 08 */ stw r30, 8(r1) /* 8002D5AC 0002A4EC 7C 7E 1B 78 */ mr r30, r3 /* 8002D5B0 0002A4F0 7C 9F 23 78 */ mr r31, r4 -/* 8002D5B4 0002A4F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D5B8 0002A4F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D5B4 0002A4F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D5B8 0002A4F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D5BC 0002A4FC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D5C0 0002A500 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D5C4 0002A504 7D 89 03 A6 */ mtctr r12 @@ -2530,16 +2530,16 @@ dComIfGs_isStageTbox: /* 8002D5D0 0002A510 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D5D4 0002A514 7C 1E 00 00 */ cmpw r30, r0 /* 8002D5D8 0002A518 40 82 00 1C */ bne lbl_8002D5F4 -/* 8002D5DC 0002A51C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D5E0 0002A520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D5DC 0002A51C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D5E0 0002A520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D5E4 0002A524 38 63 09 58 */ addi r3, r3, 0x958 /* 8002D5E8 0002A528 7F E4 FB 78 */ mr r4, r31 /* 8002D5EC 0002A52C 48 00 71 FD */ bl isTbox__12dSv_memBit_cCFi /* 8002D5F0 0002A530 48 00 00 20 */ b lbl_8002D610 lbl_8002D5F4: /* 8002D5F4 0002A534 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D5F8 0002A538 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D5FC 0002A53C 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D5F8 0002A538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D5FC 0002A53C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D600 0002A540 7C 60 22 14 */ add r3, r0, r4 /* 8002D604 0002A544 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D608 0002A548 7F E4 FB 78 */ mr r4, r31 @@ -2561,8 +2561,8 @@ dComIfGs_onStageSwitch: /* 8002D638 0002A578 93 C1 00 08 */ stw r30, 8(r1) /* 8002D63C 0002A57C 7C 7E 1B 78 */ mr r30, r3 /* 8002D640 0002A580 7C 9F 23 78 */ mr r31, r4 -/* 8002D644 0002A584 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D648 0002A588 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D644 0002A584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D648 0002A588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D64C 0002A58C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D650 0002A590 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D654 0002A594 7D 89 03 A6 */ mtctr r12 @@ -2571,15 +2571,15 @@ dComIfGs_onStageSwitch: /* 8002D660 0002A5A0 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D664 0002A5A4 7C 1E 00 00 */ cmpw r30, r0 /* 8002D668 0002A5A8 40 82 00 18 */ bne lbl_8002D680 -/* 8002D66C 0002A5AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D670 0002A5B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D66C 0002A5AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D670 0002A5B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D674 0002A5B4 7F E4 FB 78 */ mr r4, r31 /* 8002D678 0002A5B8 38 A0 FF FF */ li r5, -1 /* 8002D67C 0002A5BC 48 00 7B 85 */ bl onSwitch__10dSv_info_cFii lbl_8002D680: /* 8002D680 0002A5C0 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D684 0002A5C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D688 0002A5C8 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D684 0002A5C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D688 0002A5C8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D68C 0002A5CC 7C 60 22 14 */ add r3, r0, r4 /* 8002D690 0002A5D0 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D694 0002A5D4 7F E4 FB 78 */ mr r4, r31 @@ -2600,8 +2600,8 @@ dComIfGs_offStageSwitch: /* 8002D6C4 0002A604 93 C1 00 08 */ stw r30, 8(r1) /* 8002D6C8 0002A608 7C 7E 1B 78 */ mr r30, r3 /* 8002D6CC 0002A60C 7C 9F 23 78 */ mr r31, r4 -/* 8002D6D0 0002A610 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D6D4 0002A614 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D6D0 0002A610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D6D4 0002A614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D6D8 0002A618 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D6DC 0002A61C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D6E0 0002A620 7D 89 03 A6 */ mtctr r12 @@ -2610,15 +2610,15 @@ dComIfGs_offStageSwitch: /* 8002D6EC 0002A62C 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D6F0 0002A630 7C 1E 00 00 */ cmpw r30, r0 /* 8002D6F4 0002A634 40 82 00 18 */ bne lbl_8002D70C -/* 8002D6F8 0002A638 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D6FC 0002A63C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D6F8 0002A638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D6FC 0002A63C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D700 0002A640 7F E4 FB 78 */ mr r4, r31 /* 8002D704 0002A644 38 A0 FF FF */ li r5, -1 /* 8002D708 0002A648 48 00 7B A9 */ bl offSwitch__10dSv_info_cFii lbl_8002D70C: /* 8002D70C 0002A64C 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D710 0002A650 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D714 0002A654 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D710 0002A650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D714 0002A654 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D718 0002A658 7C 60 22 14 */ add r3, r0, r4 /* 8002D71C 0002A65C 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D720 0002A660 7F E4 FB 78 */ mr r4, r31 @@ -2639,8 +2639,8 @@ dComIfGs_isStageSwitch: /* 8002D750 0002A690 93 C1 00 08 */ stw r30, 8(r1) /* 8002D754 0002A694 7C 7E 1B 78 */ mr r30, r3 /* 8002D758 0002A698 7C 9F 23 78 */ mr r31, r4 -/* 8002D75C 0002A69C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D760 0002A6A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D75C 0002A69C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D760 0002A6A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D764 0002A6A4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D768 0002A6A8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D76C 0002A6AC 7D 89 03 A6 */ mtctr r12 @@ -2649,16 +2649,16 @@ dComIfGs_isStageSwitch: /* 8002D778 0002A6B8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D77C 0002A6BC 7C 1E 00 00 */ cmpw r30, r0 /* 8002D780 0002A6C0 40 82 00 1C */ bne lbl_8002D79C -/* 8002D784 0002A6C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D788 0002A6C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D784 0002A6C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D788 0002A6C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D78C 0002A6CC 7F E4 FB 78 */ mr r4, r31 /* 8002D790 0002A6D0 38 A0 FF FF */ li r5, -1 /* 8002D794 0002A6D4 48 00 7B CD */ bl isSwitch__10dSv_info_cCFii /* 8002D798 0002A6D8 48 00 00 20 */ b lbl_8002D7B8 lbl_8002D79C: /* 8002D79C 0002A6DC 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D7A0 0002A6E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D7A4 0002A6E4 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D7A0 0002A6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D7A4 0002A6E4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D7A8 0002A6E8 7C 60 22 14 */ add r3, r0, r4 /* 8002D7AC 0002A6EC 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D7B0 0002A6F0 7F E4 FB 78 */ mr r4, r31 @@ -2676,8 +2676,8 @@ lbl_8002D7B8: /* 8002D7DC 0002A71C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002D7E0 0002A720 93 C1 00 08 */ stw r30, 8(r1) /* 8002D7E4 0002A724 7C 7E 1B 78 */ mr r30, r3 -/* 8002D7E8 0002A728 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D7EC 0002A72C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D7E8 0002A728 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D7EC 0002A72C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D7F0 0002A730 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D7F4 0002A734 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D7F8 0002A738 7D 89 03 A6 */ mtctr r12 @@ -2686,8 +2686,8 @@ lbl_8002D7B8: /* 8002D804 0002A744 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D808 0002A748 7C 1E 00 00 */ cmpw r30, r0 /* 8002D80C 0002A74C 40 82 00 28 */ bne lbl_8002D834 -/* 8002D810 0002A750 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D814 0002A754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D810 0002A750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D814 0002A754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D818 0002A758 3B E3 09 58 */ addi r31, r3, 0x958 /* 8002D81C 0002A75C 7F E3 FB 78 */ mr r3, r31 /* 8002D820 0002A760 38 80 00 03 */ li r4, 3 @@ -2697,8 +2697,8 @@ lbl_8002D7B8: /* 8002D830 0002A770 48 00 70 E9 */ bl onDungeonItem__12dSv_memBit_cFi lbl_8002D834: /* 8002D834 0002A774 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D838 0002A778 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D83C 0002A77C 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D838 0002A778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D83C 0002A77C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D840 0002A780 7C 60 22 14 */ add r3, r0, r4 /* 8002D844 0002A784 3B E3 01 F0 */ addi r31, r3, 0x1f0 /* 8002D848 0002A788 7F E3 FB 78 */ mr r3, r31 @@ -2721,8 +2721,8 @@ dComIfGs_isDungeonItemWarp: /* 8002D880 0002A7C0 90 01 00 14 */ stw r0, 0x14(r1) /* 8002D884 0002A7C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002D888 0002A7C8 7C 7F 1B 78 */ mr r31, r3 -/* 8002D88C 0002A7CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D890 0002A7D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D88C 0002A7CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D890 0002A7D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D894 0002A7D4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8002D898 0002A7D8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8002D89C 0002A7DC 7D 89 03 A6 */ mtctr r12 @@ -2731,16 +2731,16 @@ dComIfGs_isDungeonItemWarp: /* 8002D8A8 0002A7E8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002D8AC 0002A7EC 7C 1F 00 00 */ cmpw r31, r0 /* 8002D8B0 0002A7F0 40 82 00 1C */ bne lbl_8002D8CC -/* 8002D8B4 0002A7F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D8B8 0002A7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D8B4 0002A7F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D8B8 0002A7F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D8BC 0002A7FC 38 63 09 58 */ addi r3, r3, 0x958 /* 8002D8C0 0002A800 38 80 00 06 */ li r4, 6 /* 8002D8C4 0002A804 48 00 70 71 */ bl isDungeonItem__12dSv_memBit_cCFi /* 8002D8C8 0002A808 48 00 00 20 */ b lbl_8002D8E8 lbl_8002D8CC: /* 8002D8CC 0002A80C 57 E4 28 34 */ slwi r4, r31, 5 -/* 8002D8D0 0002A810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D8D4 0002A814 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D8D0 0002A810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D8D4 0002A814 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D8D8 0002A818 7C 60 22 14 */ add r3, r0, r4 /* 8002D8DC 0002A81C 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8002D8E0 0002A820 38 80 00 06 */ li r4, 6 @@ -2754,26 +2754,26 @@ lbl_8002D8E8: .global dComIfGs_BossLife_public_Set dComIfGs_BossLife_public_Set: -/* 8002D8FC 0002A83C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002D900 0002A840 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002D8FC 0002A83C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002D900 0002A840 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002D904 0002A844 3C 84 00 02 */ addis r4, r4, 2 /* 8002D908 0002A848 98 64 DD FA */ stb r3, -0x2206(r4) /* 8002D90C 0002A84C 4E 80 00 20 */ blr -/* 8002D910 0002A850 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D914 0002A854 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D910 0002A850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D914 0002A854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D918 0002A858 3C 63 00 02 */ addis r3, r3, 2 /* 8002D91C 0002A85C 88 63 DD FA */ lbz r3, -0x2206(r3) /* 8002D920 0002A860 4E 80 00 20 */ blr -/* 8002D924 0002A864 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002D928 0002A868 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002D924 0002A864 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002D928 0002A868 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002D92C 0002A86C 3C 84 00 02 */ addis r4, r4, 2 /* 8002D930 0002A870 98 64 DD FA */ stb r3, -0x2206(r4) /* 8002D934 0002A874 4E 80 00 20 */ blr .global dComIfGs_sense_type_change_Get dComIfGs_sense_type_change_Get: -/* 8002D938 0002A878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D93C 0002A87C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002D938 0002A878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D93C 0002A87C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D940 0002A880 3C 63 00 02 */ addis r3, r3, 2 /* 8002D944 0002A884 88 63 DD FA */ lbz r3, -0x2206(r3) /* 8002D948 0002A888 4E 80 00 20 */ blr @@ -2796,8 +2796,8 @@ lbl_8002D978: /* 8002D978 0002A8B8 7C 83 23 78 */ mr r3, r4 /* 8002D97C 0002A8BC 48 00 00 35 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002D980 0002A8C0 54 64 28 34 */ slwi r4, r3, 5 -/* 8002D984 0002A8C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002D988 0002A8C8 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002D984 0002A8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002D988 0002A8C8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002D98C 0002A8CC 7C 60 22 14 */ add r3, r0, r4 /* 8002D990 0002A8D0 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002D994 0002A8D4 7F E4 FB 78 */ mr r4, r31 @@ -2837,8 +2837,8 @@ lbl_8002D9F8: /* 8002D9F8 0002A938 7C 83 23 78 */ mr r3, r4 /* 8002D9FC 0002A93C 4B FF FF B5 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DA00 0002A940 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DA04 0002A944 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DA08 0002A948 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DA04 0002A944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DA08 0002A948 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DA0C 0002A94C 7C 60 22 14 */ add r3, r0, r4 /* 8002DA10 0002A950 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DA14 0002A954 7F E4 FB 78 */ mr r4, r31 @@ -2870,8 +2870,8 @@ lbl_8002DA64: /* 8002DA64 0002A9A4 7C 83 23 78 */ mr r3, r4 /* 8002DA68 0002A9A8 4B FF FF 49 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DA6C 0002A9AC 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DA70 0002A9B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DA74 0002A9B4 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DA70 0002A9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DA74 0002A9B4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DA78 0002A9B8 7C 60 22 14 */ add r3, r0, r4 /* 8002DA7C 0002A9BC 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DA80 0002A9C0 7F E4 FB 78 */ mr r4, r31 @@ -2901,8 +2901,8 @@ lbl_8002DAC8: /* 8002DAC8 0002AA08 7C 83 23 78 */ mr r3, r4 /* 8002DACC 0002AA0C 4B FF FE E5 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DAD0 0002AA10 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DAD4 0002AA14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DAD8 0002AA18 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DAD4 0002AA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DAD8 0002AA18 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DADC 0002AA1C 7C 60 22 14 */ add r3, r0, r4 /* 8002DAE0 0002AA20 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DAE4 0002AA24 7F E4 FB 78 */ mr r4, r31 @@ -2932,8 +2932,8 @@ lbl_8002DB2C: /* 8002DB2C 0002AA6C 7C 83 23 78 */ mr r3, r4 /* 8002DB30 0002AA70 4B FF FE 81 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DB34 0002AA74 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DB38 0002AA78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DB3C 0002AA7C 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DB38 0002AA78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DB3C 0002AA7C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DB40 0002AA80 7C 60 22 14 */ add r3, r0, r4 /* 8002DB44 0002AA84 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DB48 0002AA88 7F E4 FB 78 */ mr r4, r31 @@ -2965,8 +2965,8 @@ lbl_8002DB98: /* 8002DB98 0002AAD8 7C 83 23 78 */ mr r3, r4 /* 8002DB9C 0002AADC 4B FF FE 15 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DBA0 0002AAE0 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DBA4 0002AAE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DBA8 0002AAE8 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DBA4 0002AAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DBA8 0002AAE8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DBAC 0002AAEC 7C 60 22 14 */ add r3, r0, r4 /* 8002DBB0 0002AAF0 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DBB4 0002AAF4 7F E4 FB 78 */ mr r4, r31 @@ -2998,8 +2998,8 @@ lbl_8002DC04: /* 8002DC04 0002AB44 7C 83 23 78 */ mr r3, r4 /* 8002DC08 0002AB48 4B FF FD A9 */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DC0C 0002AB4C 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DC10 0002AB50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DC14 0002AB54 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DC10 0002AB50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DC14 0002AB54 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DC18 0002AB58 7C 60 22 14 */ add r3, r0, r4 /* 8002DC1C 0002AB5C 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DC20 0002AB60 7F E4 FB 78 */ mr r4, r31 @@ -3031,8 +3031,8 @@ lbl_8002DC70: /* 8002DC70 0002ABB0 7C 83 23 78 */ mr r3, r4 /* 8002DC74 0002ABB4 4B FF FD 3D */ bl dStage_roomControl_c_NS_getZoneNo /* 8002DC78 0002ABB8 54 64 28 34 */ slwi r4, r3, 5 -/* 8002DC7C 0002ABBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DC80 0002ABC0 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DC7C 0002ABBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DC80 0002ABC0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DC84 0002ABC4 7C 60 22 14 */ add r3, r0, r4 /* 8002DC88 0002ABC8 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002DC8C 0002ABCC 7F E4 FB 78 */ mr r4, r31 @@ -3046,8 +3046,8 @@ lbl_8002DC94: .global dComIfGs_getMaxLifeGauge dComIfGs_getMaxLifeGauge: -/* 8002DCA8 0002ABE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DCAC 0002ABEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DCA8 0002ABE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DCAC 0002ABEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DCB0 0002ABF0 A0 63 00 00 */ lhz r3, 0(r3) /* 8002DCB4 0002ABF4 38 00 00 05 */ li r0, 5 /* 8002DCB8 0002ABF8 7C 03 03 D6 */ divw r0, r3, r0 @@ -3062,8 +3062,8 @@ dComIfGs_setSelectItemIndex: /* 8002DCD0 0002AC10 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002DCD4 0002AC14 7C 7F 1B 78 */ mr r31, r3 /* 8002DCD8 0002AC18 7C 85 23 78 */ mr r5, r4 -/* 8002DCDC 0002AC1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DCE0 0002AC20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DCDC 0002AC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DCE0 0002AC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DCE4 0002AC24 7F E4 FB 78 */ mr r4, r31 /* 8002DCE8 0002AC28 48 00 4D 61 */ bl setSelectItemIndex__21dSv_player_status_a_cFiUc /* 8002DCEC 0002AC2C 7F E3 FB 78 */ mr r3, r31 @@ -3081,8 +3081,8 @@ dComIfGs_setMixItemIndex: /* 8002DD10 0002AC50 90 01 00 14 */ stw r0, 0x14(r1) /* 8002DD14 0002AC54 7C 60 1B 78 */ mr r0, r3 /* 8002DD18 0002AC58 7C 85 23 78 */ mr r5, r4 -/* 8002DD1C 0002AC5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DD20 0002AC60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DD1C 0002AC5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DD20 0002AC60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DD24 0002AC64 7C 04 03 78 */ mr r4, r0 /* 8002DD28 0002AC68 48 00 4D 51 */ bl setMixItemIndex__21dSv_player_status_a_cFiUc /* 8002DD2C 0002AC6C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3098,8 +3098,8 @@ dComIfGs_getSelectMixItemNoArrowIndex: /* 8002DD48 0002AC88 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002DD4C 0002AC8C 93 C1 00 08 */ stw r30, 8(r1) /* 8002DD50 0002AC90 7C 7E 1B 78 */ mr r30, r3 -/* 8002DD54 0002AC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DD58 0002AC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DD54 0002AC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DD58 0002AC98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DD5C 0002AC9C 7F C4 F3 78 */ mr r4, r30 /* 8002DD60 0002ACA0 48 00 4C FD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DD64 0002ACA4 7C 7F 1B 78 */ mr r31, r3 @@ -3137,8 +3137,8 @@ dComIfGs_getMixItemIndex: /* 8002DDCC 0002AD0C 7C 08 02 A6 */ mflr r0 /* 8002DDD0 0002AD10 90 01 00 14 */ stw r0, 0x14(r1) /* 8002DDD4 0002AD14 7C 64 1B 78 */ mr r4, r3 -/* 8002DDD8 0002AD18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DDDC 0002AD1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DDD8 0002AD18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DDDC 0002AD1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DDE0 0002AD20 48 00 4C AD */ bl getMixItemIndex__21dSv_player_status_a_cCFi /* 8002DDE4 0002AD24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002DDE8 0002AD28 7C 08 03 A6 */ mtlr r0 @@ -3154,19 +3154,19 @@ dComIfGp_setSelectItem: /* 8002DE04 0002AD44 7C 7F 1B 78 */ mr r31, r3 /* 8002DE08 0002AD48 2C 1F 00 02 */ cmpwi r31, 2 /* 8002DE0C 0002AD4C 40 82 00 74 */ bne lbl_8002DE80 -/* 8002DE10 0002AD50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DE14 0002AD54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DE10 0002AD50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DE14 0002AD54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DE18 0002AD58 7F E4 FB 78 */ mr r4, r31 /* 8002DE1C 0002AD5C 48 00 4C 41 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DE20 0002AD60 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DE24 0002AD64 28 00 00 FF */ cmplwi r0, 0xff /* 8002DE28 0002AD68 41 82 00 40 */ beq lbl_8002DE68 -/* 8002DE2C 0002AD6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DE30 0002AD70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DE2C 0002AD6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DE30 0002AD70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DE34 0002AD74 7F E4 FB 78 */ mr r4, r31 /* 8002DE38 0002AD78 48 00 4C 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DE3C 0002AD7C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002DE40 0002AD80 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l +/* 8002DE3C 0002AD7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002DE40 0002AD80 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 8002DE44 0002AD84 7C 80 FA 14 */ add r4, r0, r31 /* 8002DE48 0002AD88 98 64 5E 6C */ stb r3, 0x5e6c(r4) /* 8002DE4C 0002AD8C 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3178,32 +3178,32 @@ dComIfGp_setSelectItem: /* 8002DE64 0002ADA4 48 00 00 A4 */ b lbl_8002DF08 lbl_8002DE68: /* 8002DE68 0002ADA8 38 80 00 FF */ li r4, 0xff -/* 8002DE6C 0002ADAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DE70 0002ADB0 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DE6C 0002ADAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DE70 0002ADB0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DE74 0002ADB4 7C 60 FA 14 */ add r3, r0, r31 /* 8002DE78 0002ADB8 98 83 5E 6C */ stb r4, 0x5e6c(r3) /* 8002DE7C 0002ADBC 48 00 00 8C */ b lbl_8002DF08 lbl_8002DE80: -/* 8002DE80 0002ADC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DE84 0002ADC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DE80 0002ADC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DE84 0002ADC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DE88 0002ADC8 7F E4 FB 78 */ mr r4, r31 /* 8002DE8C 0002ADCC 48 00 4B D1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DE90 0002ADD0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DE94 0002ADD4 28 00 00 FF */ cmplwi r0, 0xff /* 8002DE98 0002ADD8 41 82 00 5C */ beq lbl_8002DEF4 -/* 8002DE9C 0002ADDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DEA0 0002ADE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DE9C 0002ADDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DEA0 0002ADE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DEA4 0002ADE4 7F E4 FB 78 */ mr r4, r31 /* 8002DEA8 0002ADE8 48 00 4B B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DEAC 0002ADEC 7C 60 1B 78 */ mr r0, r3 -/* 8002DEB0 0002ADF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DEB4 0002ADF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DEB0 0002ADF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DEB4 0002ADF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DEB8 0002ADF8 38 63 00 9C */ addi r3, r3, 0x9c /* 8002DEBC 0002ADFC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8002DEC0 0002AE00 38 A0 00 00 */ li r5, 0 /* 8002DEC4 0002AE04 48 00 51 6D */ bl getItem__17dSv_player_item_cCFib -/* 8002DEC8 0002AE08 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002DECC 0002AE0C 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l +/* 8002DEC8 0002AE08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002DECC 0002AE0C 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 8002DED0 0002AE10 7C 80 FA 14 */ add r4, r0, r31 /* 8002DED4 0002AE14 98 64 5E 6C */ stb r3, 0x5e6c(r4) /* 8002DED8 0002AE18 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3215,8 +3215,8 @@ lbl_8002DE80: /* 8002DEF0 0002AE30 48 00 00 18 */ b lbl_8002DF08 lbl_8002DEF4: /* 8002DEF4 0002AE34 38 80 00 FF */ li r4, 0xff -/* 8002DEF8 0002AE38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DEFC 0002AE3C 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DEF8 0002AE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DEFC 0002AE3C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DF00 0002AE40 7C 60 FA 14 */ add r3, r0, r31 /* 8002DF04 0002AE44 98 83 5E 6C */ stb r4, 0x5e6c(r3) lbl_8002DF08: @@ -3234,8 +3234,8 @@ dComIfGp_getSelectItem: /* 8002DF28 0002AE68 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002DF2C 0002AE6C 93 C1 00 08 */ stw r30, 8(r1) /* 8002DF30 0002AE70 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002DF34 0002AE74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DF38 0002AE78 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002DF34 0002AE74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DF38 0002AE78 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002DF3C 0002AE7C 7C 60 F2 14 */ add r3, r0, r30 /* 8002DF40 0002AE80 8B E3 5E 6C */ lbz r31, 0x5e6c(r3) /* 8002DF44 0002AE84 41 82 00 0C */ beq lbl_8002DF50 @@ -3250,8 +3250,8 @@ lbl_8002DF50: /* 8002DF64 0002AEA4 7F C3 F3 78 */ mr r3, r30 /* 8002DF68 0002AEA8 4B FF FE 61 */ bl dComIfGs_getMixItemIndex /* 8002DF6C 0002AEAC 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8002DF70 0002AEB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002DF74 0002AEB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002DF70 0002AEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002DF74 0002AEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002DF78 0002AEB8 38 63 00 9C */ addi r3, r3, 0x9c /* 8002DF7C 0002AEBC 38 A0 00 00 */ li r5, 0 /* 8002DF80 0002AEC0 48 00 50 B1 */ bl getItem__17dSv_player_item_cCFib @@ -3320,8 +3320,8 @@ dComIfGp_mapShow: /* 8002E048 0002AF88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002E04C 0002AF8C 7C 08 02 A6 */ mflr r0 /* 8002E050 0002AF90 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E054 0002AF94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E058 0002AF98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E054 0002AF94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E058 0002AF98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E05C 0002AF9C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E060 0002AFA0 38 80 1D 01 */ li r4, 0x1d01 /* 8002E064 0002AFA4 48 00 69 41 */ bl offEventBit__11dSv_event_cFUs @@ -3335,8 +3335,8 @@ dComIfGp_mapHide: /* 8002E078 0002AFB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002E07C 0002AFBC 7C 08 02 A6 */ mflr r0 /* 8002E080 0002AFC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E084 0002AFC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E088 0002AFC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E084 0002AFC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E088 0002AFC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E08C 0002AFCC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E090 0002AFD0 38 80 1D 01 */ li r4, 0x1d01 /* 8002E094 0002AFD4 48 00 68 F9 */ bl onEventBit__11dSv_event_cFUs @@ -3350,8 +3350,8 @@ dComIfGp_checkMapShow: /* 8002E0A8 0002AFE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002E0AC 0002AFEC 7C 08 02 A6 */ mflr r0 /* 8002E0B0 0002AFF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E0B4 0002AFF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E0B8 0002AFF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E0B4 0002AFF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E0B8 0002AFF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E0BC 0002AFFC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E0C0 0002B000 38 80 1D 01 */ li r4, 0x1d01 /* 8002E0C4 0002B004 48 00 68 F9 */ bl isEventBit__11dSv_event_cCFUs @@ -3376,8 +3376,8 @@ dComIfGp_setHeapLockFlag: /* 8002E104 0002B044 28 00 00 08 */ cmplwi r0, 8 /* 8002E108 0002B048 40 82 00 44 */ bne lbl_8002E14C lbl_8002E10C: -/* 8002E10C 0002B04C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E110 0002B050 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8002E10C 0002B04C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E110 0002B050 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8002E114 0002B054 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8002E118 0002B058 28 00 00 00 */ cmplwi r0, 0 /* 8002E11C 0002B05C 40 82 00 08 */ bne lbl_8002E124 @@ -3388,8 +3388,8 @@ lbl_8002E124: /* 8002E12C 0002B06C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D /* 8002E130 0002B070 2C 03 00 00 */ cmpwi r3, 0 /* 8002E134 0002B074 41 80 00 38 */ blt lbl_8002E16C -/* 8002E138 0002B078 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002E13C 0002B07C 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l +/* 8002E138 0002B078 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002E13C 0002B07C 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 8002E140 0002B080 7C 60 1A 14 */ add r3, r0, r3 /* 8002E144 0002B084 9B C3 5E 90 */ stb r30, 0x5e90(r3) /* 8002E148 0002B088 48 00 00 24 */ b lbl_8002E16C @@ -3400,8 +3400,8 @@ lbl_8002E14C: /* 8002E158 0002B098 48 00 00 31 */ bl dComIfGp_offHeapLockFlag /* 8002E15C 0002B09C 48 00 00 10 */ b lbl_8002E16C lbl_8002E160: -/* 8002E160 0002B0A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E164 0002B0A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E160 0002B0A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E164 0002B0A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E168 0002B0A8 9B C3 5E 8F */ stb r30, 0x5e8f(r3) lbl_8002E16C: /* 8002E16C 0002B0AC 38 60 00 01 */ li r3, 1 @@ -3418,8 +3418,8 @@ dComIfGp_offHeapLockFlag: /* 8002E18C 0002B0CC 7C 08 02 A6 */ mflr r0 /* 8002E190 0002B0D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8002E194 0002B0D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002E198 0002B0D8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002E19C 0002B0DC 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 8002E198 0002B0D8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002E19C 0002B0DC 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 8002E1A0 0002B0E0 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8002E1A4 0002B0E4 28 00 00 05 */ cmplwi r0, 5 /* 8002E1A8 0002B0E8 40 82 00 64 */ bne lbl_8002E20C @@ -3432,13 +3432,13 @@ lbl_8002E1BC: /* 8002E1C0 0002B100 2C 03 00 00 */ cmpwi r3, 0 /* 8002E1C4 0002B104 41 80 00 18 */ blt lbl_8002E1DC /* 8002E1C8 0002B108 38 A0 00 00 */ li r5, 0 -/* 8002E1CC 0002B10C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002E1D0 0002B110 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l +/* 8002E1CC 0002B10C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002E1D0 0002B110 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 8002E1D4 0002B114 7C 60 1A 14 */ add r3, r0, r3 /* 8002E1D8 0002B118 98 A3 5E 90 */ stb r5, 0x5e90(r3) lbl_8002E1DC: -/* 8002E1DC 0002B11C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E1E0 0002B120 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E1DC 0002B11C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E1E0 0002B120 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E1E4 0002B124 88 03 5E 90 */ lbz r0, 0x5e90(r3) /* 8002E1E8 0002B128 28 00 00 00 */ cmplwi r0, 0 /* 8002E1EC 0002B12C 40 82 00 28 */ bne lbl_8002E214 @@ -3467,8 +3467,8 @@ dComIfGp_createSubExpHeap2D: /* 8002E234 0002B174 90 01 00 34 */ stw r0, 0x34(r1) /* 8002E238 0002B178 39 61 00 30 */ addi r11, r1, 0x30 /* 8002E23C 0002B17C 48 33 3F 95 */ bl _savegpr_26 -/* 8002E240 0002B180 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E244 0002B184 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8002E240 0002B180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E244 0002B184 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8002E248 0002B188 80 7D 5E BC */ lwz r3, 0x5ebc(r29) /* 8002E24C 0002B18C 48 2A 05 39 */ bl getTotalFreeSize__7JKRHeapFv /* 8002E250 0002B190 C8 22 83 10 */ lfd f1, lbl_80451D10-_SDA2_BASE_(r2) @@ -3484,8 +3484,8 @@ dComIfGp_createSubExpHeap2D: /* 8002E278 0002B1B8 7C 7B 1B 78 */ mr r27, r3 /* 8002E27C 0002B1BC 3B 40 00 00 */ li r26, 0 /* 8002E280 0002B1C0 3B E0 00 00 */ li r31, 0 -/* 8002E284 0002B1C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E288 0002B1C8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8002E284 0002B1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E288 0002B1C8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_8002E28C: /* 8002E28C 0002B1CC 7C 7E FA 14 */ add r3, r30, r31 /* 8002E290 0002B1D0 3B 83 5E C0 */ addi r28, r3, 0x5ec0 @@ -3518,8 +3518,8 @@ dComIfGp_destroySubExpHeap2D: /* 8002E2EC 0002B22C 48 33 3E E9 */ bl _savegpr_27 /* 8002E2F0 0002B230 3B 60 00 00 */ li r27, 0 /* 8002E2F4 0002B234 3B E0 00 00 */ li r31, 0 -/* 8002E2F8 0002B238 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E2FC 0002B23C 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8002E2F8 0002B238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E2FC 0002B23C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8002E300 0002B240 7F FE FB 78 */ mr r30, r31 lbl_8002E304: /* 8002E304 0002B244 7C 7D FA 14 */ add r3, r29, r31 @@ -3543,8 +3543,8 @@ lbl_8002E320: .global dComIfGp_checkEmptySubHeap2D dComIfGp_checkEmptySubHeap2D: -/* 8002E348 0002B288 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E34C 0002B28C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8002E348 0002B288 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E34C 0002B28C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8002E350 0002B290 88 05 5E 8F */ lbz r0, 0x5e8f(r5) /* 8002E354 0002B294 28 00 00 05 */ cmplwi r0, 5 /* 8002E358 0002B298 40 82 00 28 */ bne lbl_8002E380 @@ -3564,8 +3564,8 @@ lbl_8002E380: .global dComIfGp_searchUseSubHeap2D dComIfGp_searchUseSubHeap2D: -/* 8002E388 0002B2C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002E38C 0002B2CC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8002E388 0002B2C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002E38C 0002B2CC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8002E390 0002B2D0 88 05 5E 8F */ lbz r0, 0x5e8f(r5) /* 8002E394 0002B2D4 28 00 00 05 */ cmplwi r0, 5 /* 8002E398 0002B2D8 40 82 00 30 */ bne lbl_8002E3C8 @@ -3588,8 +3588,8 @@ lbl_8002E3C8: .global dComIfGp_getSubHeap2D dComIfGp_getSubHeap2D: -/* 8002E3D0 0002B310 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002E3D4 0002B314 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8002E3D0 0002B310 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002E3D4 0002B314 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8002E3D8 0002B318 88 05 5E 8F */ lbz r0, 0x5e8f(r5) /* 8002E3DC 0002B31C 28 00 00 05 */ cmplwi r0, 5 /* 8002E3E0 0002B320 40 82 00 40 */ bne lbl_8002E420 @@ -3601,8 +3601,8 @@ lbl_8002E3F0: /* 8002E3F4 0002B334 88 04 5E 90 */ lbz r0, 0x5e90(r4) /* 8002E3F8 0002B338 7C 03 00 00 */ cmpw r3, r0 /* 8002E3FC 0002B33C 40 82 00 1C */ bne lbl_8002E418 -/* 8002E400 0002B340 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E404 0002B344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E400 0002B340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E404 0002B344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E408 0002B348 54 C0 10 3A */ slwi r0, r6, 2 /* 8002E40C 0002B34C 7C 63 02 14 */ add r3, r3, r0 /* 8002E410 0002B350 80 63 5E C0 */ lwz r3, 0x5ec0(r3) @@ -3627,8 +3627,8 @@ dComIfGs_checkGetInsectNum: /* 8002E448 0002B388 7C 1A 03 78 */ mr r26, r0 /* 8002E44C 0002B38C 3B 20 00 00 */ li r25, 0 /* 8002E450 0002B390 3B E0 00 00 */ li r31, 0 -/* 8002E454 0002B394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E458 0002B398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E454 0002B394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E458 0002B398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E45C 0002B39C 3B A3 00 CC */ addi r29, r3, 0xcc /* 8002E460 0002B3A0 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 8002E464 0002B3A4 3C 60 80 3A */ lis r3, lbl_803A7288@ha @@ -3670,8 +3670,8 @@ dComIfGs_checkGetItem: /* 8002E4E0 0002B420 7C 7E 1B 78 */ mr r30, r3 /* 8002E4E4 0002B424 3B E0 00 00 */ li r31, 0 /* 8002E4E8 0002B428 3B 60 00 00 */ li r27, 0 -/* 8002E4EC 0002B42C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E4F0 0002B430 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E4EC 0002B42C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E4F0 0002B430 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E4F4 0002B434 3B 83 00 9C */ addi r28, r3, 0x9c /* 8002E4F8 0002B438 57 DD 06 3E */ clrlwi r29, r30, 0x18 lbl_8002E4FC: @@ -3689,8 +3689,8 @@ lbl_8002E524: /* 8002E524 0002B464 3B 7B 00 01 */ addi r27, r27, 1 /* 8002E528 0002B468 2C 1B 00 3C */ cmpwi r27, 0x3c /* 8002E52C 0002B46C 41 80 FF D0 */ blt lbl_8002E4FC -/* 8002E530 0002B470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E534 0002B474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E530 0002B470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E534 0002B474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E538 0002B478 88 63 00 13 */ lbz r3, 0x13(r3) /* 8002E53C 0002B47C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8002E540 0002B480 7C 00 18 40 */ cmplw r0, r3 @@ -3699,8 +3699,8 @@ lbl_8002E524: /* 8002E54C 0002B48C 38 03 00 01 */ addi r0, r3, 1 /* 8002E550 0002B490 54 1F 06 3E */ clrlwi r31, r0, 0x18 lbl_8002E554: -/* 8002E554 0002B494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E558 0002B498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E554 0002B494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E558 0002B498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E55C 0002B49C 88 63 00 14 */ lbz r3, 0x14(r3) /* 8002E560 0002B4A0 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8002E564 0002B4A4 7C 00 18 40 */ cmplw r0, r3 @@ -3709,8 +3709,8 @@ lbl_8002E554: /* 8002E570 0002B4B0 38 03 00 01 */ addi r0, r3, 1 /* 8002E574 0002B4B4 54 1F 06 3E */ clrlwi r31, r0, 0x18 lbl_8002E578: -/* 8002E578 0002B4B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E57C 0002B4BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E578 0002B4B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E57C 0002B4BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E580 0002B4C0 88 63 00 15 */ lbz r3, 0x15(r3) /* 8002E584 0002B4C4 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8002E588 0002B4C8 7C 00 18 40 */ cmplw r0, r3 @@ -3753,8 +3753,8 @@ lbl_8002E5F8: /* 8002E5FC 0002B53C 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex /* 8002E600 0002B540 38 03 FF F1 */ addi r0, r3, -15 /* 8002E604 0002B544 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E608 0002B548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E60C 0002B54C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E608 0002B548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E60C 0002B54C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E610 0002B550 38 63 00 EC */ addi r3, r3, 0xec /* 8002E614 0002B554 48 00 59 69 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8002E618 0002B558 54 64 06 3E */ clrlwi r4, r3, 0x18 @@ -3762,20 +3762,20 @@ lbl_8002E5F8: lbl_8002E620: /* 8002E620 0002B560 28 00 00 4B */ cmplwi r0, 0x4b /* 8002E624 0002B564 40 82 00 14 */ bne lbl_8002E638 -/* 8002E628 0002B568 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E62C 0002B56C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E628 0002B568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E62C 0002B56C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E630 0002B570 88 83 00 F4 */ lbz r4, 0xf4(r3) /* 8002E634 0002B574 48 00 00 3C */ b lbl_8002E670 lbl_8002E638: /* 8002E638 0002B578 28 00 00 76 */ cmplwi r0, 0x76 /* 8002E63C 0002B57C 40 82 00 34 */ bne lbl_8002E670 -/* 8002E640 0002B580 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E644 0002B584 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E640 0002B580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E644 0002B584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E648 0002B588 7F E4 FB 78 */ mr r4, r31 /* 8002E64C 0002B58C 48 00 44 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E650 0002B590 7C 64 1B 78 */ mr r4, r3 -/* 8002E654 0002B594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E658 0002B598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E654 0002B594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E658 0002B598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E65C 0002B59C 38 63 00 EC */ addi r3, r3, 0xec /* 8002E660 0002B5A0 38 04 FF F5 */ addi r0, r4, -11 /* 8002E664 0002B5A4 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -3810,8 +3810,8 @@ lbl_8002E6B4: /* 8002E6C4 0002B604 28 05 00 59 */ cmplwi r5, 0x59 /* 8002E6C8 0002B608 40 82 00 1C */ bne lbl_8002E6E4 lbl_8002E6CC: -/* 8002E6CC 0002B60C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E6D0 0002B610 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E6CC 0002B60C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E6D0 0002B610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E6D4 0002B614 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8002E6D8 0002B618 48 00 5A 21 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8002E6DC 0002B61C 54 63 06 3E */ clrlwi r3, r3, 0x18 @@ -3855,8 +3855,8 @@ lbl_8002E754: /* 8002E758 0002B698 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex /* 8002E75C 0002B69C 38 03 FF F1 */ addi r0, r3, -15 /* 8002E760 0002B6A0 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 8002E764 0002B6A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E768 0002B6A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E764 0002B6A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E768 0002B6A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E76C 0002B6AC 3B C3 00 F8 */ addi r30, r3, 0xf8 /* 8002E770 0002B6B0 7F C3 F3 78 */ mr r3, r30 /* 8002E774 0002B6B4 7F A4 EB 78 */ mr r4, r29 @@ -3870,8 +3870,8 @@ lbl_8002E754: /* 8002E794 0002B6D4 48 00 59 65 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8002E798 0002B6D8 54 7F 06 3E */ clrlwi r31, r3, 0x18 lbl_8002E79C: -/* 8002E79C 0002B6DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E7A0 0002B6E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E79C 0002B6DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E7A0 0002B6E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E7A4 0002B6E4 38 63 00 EC */ addi r3, r3, 0xec /* 8002E7A8 0002B6E8 7F 84 E3 78 */ mr r4, r28 /* 8002E7AC 0002B6EC 57 E5 06 3E */ clrlwi r5, r31, 0x18 @@ -3880,15 +3880,15 @@ lbl_8002E79C: lbl_8002E7B8: /* 8002E7B8 0002B6F8 28 00 00 4B */ cmplwi r0, 0x4b /* 8002E7BC 0002B6FC 40 82 00 14 */ bne lbl_8002E7D0 -/* 8002E7C0 0002B700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E7C4 0002B704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E7C0 0002B700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E7C4 0002B704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E7C8 0002B708 9B E3 00 F4 */ stb r31, 0xf4(r3) /* 8002E7CC 0002B70C 48 00 00 58 */ b lbl_8002E824 lbl_8002E7D0: /* 8002E7D0 0002B710 28 00 00 76 */ cmplwi r0, 0x76 /* 8002E7D4 0002B714 40 82 00 50 */ bne lbl_8002E824 -/* 8002E7D8 0002B718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E7DC 0002B71C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E7D8 0002B718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E7DC 0002B71C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E7E0 0002B720 7F 84 E3 78 */ mr r4, r28 /* 8002E7E4 0002B724 48 00 42 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E7E8 0002B728 38 03 FF F5 */ addi r0, r3, -11 @@ -3901,8 +3901,8 @@ lbl_8002E7D0: /* 8002E804 0002B744 4B FF FD B5 */ bl dComIfGs_getBottleMax /* 8002E808 0002B748 54 7F 06 3E */ clrlwi r31, r3, 0x18 lbl_8002E80C: -/* 8002E80C 0002B74C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E810 0002B750 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E80C 0002B74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E810 0002B750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E814 0002B754 38 63 00 EC */ addi r3, r3, 0xec /* 8002E818 0002B758 7F 84 E3 78 */ mr r4, r28 /* 8002E81C 0002B75C 57 E5 06 3E */ clrlwi r5, r31, 0x18 @@ -3937,8 +3937,8 @@ lbl_8002E878: /* 8002E87C 0002B7BC 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex /* 8002E880 0002B7C0 38 03 FF F1 */ addi r0, r3, -15 /* 8002E884 0002B7C4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E888 0002B7C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E88C 0002B7CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E888 0002B7C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E88C 0002B7CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E890 0002B7D0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8002E894 0002B7D4 7F E5 FB 78 */ mr r5, r31 /* 8002E898 0002B7D8 4B FF CA D5 */ bl dComIfG_play_c_NS_setItemBombNumCount @@ -3946,8 +3946,8 @@ lbl_8002E878: lbl_8002E8A0: /* 8002E8A0 0002B7E0 28 00 00 4B */ cmplwi r0, 0x4b /* 8002E8A4 0002B7E4 40 82 00 1C */ bne lbl_8002E8C0 -/* 8002E8A8 0002B7E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E8AC 0002B7EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E8A8 0002B7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E8AC 0002B7EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E8B0 0002B7F0 A8 03 5D F6 */ lha r0, 0x5df6(r3) /* 8002E8B4 0002B7F4 7C 00 FA 14 */ add r0, r0, r31 /* 8002E8B8 0002B7F8 B0 03 5D F6 */ sth r0, 0x5df6(r3) @@ -3955,13 +3955,13 @@ lbl_8002E8A0: lbl_8002E8C0: /* 8002E8C0 0002B800 28 00 00 76 */ cmplwi r0, 0x76 /* 8002E8C4 0002B804 40 82 00 34 */ bne lbl_8002E8F8 -/* 8002E8C8 0002B808 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E8CC 0002B80C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E8C8 0002B808 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E8CC 0002B80C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E8D0 0002B810 7F C4 F3 78 */ mr r4, r30 /* 8002E8D4 0002B814 48 00 41 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E8D8 0002B818 7C 64 1B 78 */ mr r4, r3 -/* 8002E8DC 0002B81C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E8E0 0002B820 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E8DC 0002B81C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E8E0 0002B820 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E8E4 0002B824 38 63 00 EC */ addi r3, r3, 0xec /* 8002E8E8 0002B828 38 04 FF F5 */ addi r0, r4, -11 /* 8002E8EC 0002B82C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -3991,8 +3991,8 @@ dComIfGd_setShadow: /* 8002E93C 0002B87C 38 60 00 00 */ li r3, 0 /* 8002E940 0002B880 48 00 00 24 */ b lbl_8002E964 lbl_8002E944: -/* 8002E944 0002B884 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E948 0002B888 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E944 0002B884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E948 0002B888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E94C 0002B88C 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 8002E950 0002B890 7D 44 53 78 */ mr r4, r10 /* 8002E954 0002B894 7D 25 4B 78 */ mr r5, r9 @@ -4011,8 +4011,8 @@ dComIfGs_gameStart: /* 8002E978 0002B8B8 7C 08 02 A6 */ mflr r0 /* 8002E97C 0002B8BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8002E980 0002B8C0 38 C0 00 00 */ li r6, 0 -/* 8002E984 0002B8C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002E988 0002B8C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002E984 0002B8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002E988 0002B8C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E98C 0002B8CC 98 C3 4E 1C */ stb r6, 0x4e1c(r3) /* 8002E990 0002B8D0 38 63 00 58 */ addi r3, r3, 0x58 /* 8002E994 0002B8D4 88 03 00 09 */ lbz r0, 9(r3) @@ -4049,8 +4049,8 @@ dComIfGp_calcNowRegion: /* 8002EA04 0002B944 90 0C 00 04 */ stw r0, 4(r12) /* 8002EA08 0002B948 7D 8B 63 78 */ mr r11, r12 /* 8002EA0C 0002B94C 48 33 37 C1 */ bl func_803621CC -/* 8002EA10 0002B950 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EA14 0002B954 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8002EA10 0002B950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EA14 0002B954 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8002EA18 0002B958 80 7F 5C 68 */ lwz r3, 0x5c68(r31) /* 8002EA1C 0002B95C 38 81 00 40 */ addi r4, r1, 0x40 /* 8002EA20 0002B960 38 A0 08 00 */ li r5, 0x800 @@ -4076,8 +4076,8 @@ lbl_8002EA68: /* 8002EA6C 0002B9AC 98 C4 03 F9 */ stb r6, 0x3f9(r4) /* 8002EA70 0002B9B0 38 63 04 04 */ addi r3, r3, 0x404 /* 8002EA74 0002B9B4 42 00 FF F4 */ bdnz lbl_8002EA68 -/* 8002EA78 0002B9B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EA7C 0002B9BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EA78 0002B9B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EA7C 0002B9BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EA80 0002B9C0 3B C3 00 64 */ addi r30, r3, 0x64 /* 8002EA84 0002B9C4 38 00 00 00 */ li r0, 0 /* 8002EA88 0002B9C8 98 03 00 7C */ stb r0, 0x7c(r3) @@ -4086,8 +4086,8 @@ lbl_8002EA68: /* 8002EA94 0002B9D4 48 00 5F 29 */ bl isEventBit__11dSv_event_cCFUs /* 8002EA98 0002B9D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002EA9C 0002B9DC 40 82 01 54 */ bne lbl_8002EBF0 -/* 8002EAA0 0002B9E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EAA4 0002B9E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EAA0 0002B9E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EAA4 0002B9E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EAA8 0002B9E8 3B 43 4E 00 */ addi r26, r3, 0x4e00 /* 8002EAAC 0002B9EC 7F 43 D3 78 */ mr r3, r26 /* 8002EAB0 0002B9F0 3C 80 80 38 */ lis r4, lbl_80378F38@ha @@ -4108,8 +4108,8 @@ lbl_8002EAD8: /* 8002EAE8 0002BA28 48 33 9E AD */ bl strcmp /* 8002EAEC 0002BA2C 2C 03 00 00 */ cmpwi r3, 0 /* 8002EAF0 0002BA30 40 82 00 60 */ bne lbl_8002EB50 -/* 8002EAF4 0002BA34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EAF8 0002BA38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EAF4 0002BA34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EAF8 0002BA38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EAFC 0002BA3C 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002EB00 0002BA40 2C 00 00 01 */ cmpwi r0, 1 /* 8002EB04 0002BA44 40 82 00 4C */ bne lbl_8002EB50 @@ -4218,8 +4218,8 @@ dComIfG_getNowCalcRegion: /* 8002EC68 0002BBA8 90 0C 00 04 */ stw r0, 4(r12) /* 8002EC6C 0002BBAC 7D 8B 63 78 */ mr r11, r12 /* 8002EC70 0002BBB0 48 33 35 5D */ bl func_803621CC -/* 8002EC74 0002BBB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EC78 0002BBB8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8002EC74 0002BBB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EC78 0002BBB8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8002EC7C 0002BBBC 80 7E 5C 68 */ lwz r3, 0x5c68(r30) /* 8002EC80 0002BBC0 38 81 00 60 */ addi r4, r1, 0x60 /* 8002EC84 0002BBC4 38 A0 08 00 */ li r5, 0x800 @@ -4293,8 +4293,8 @@ lbl_8002ED54: /* 8002ED74 0002BCB4 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 8002ED78 0002BCB8 41 82 00 48 */ beq lbl_8002EDC0 /* 8002ED7C 0002BCBC 38 00 FF FF */ li r0, -1 -/* 8002ED80 0002BCC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002ED84 0002BCC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002ED80 0002BCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002ED84 0002BCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002ED88 0002BCC8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8002ED8C 0002BCCC 28 03 00 00 */ cmplwi r3, 0 /* 8002ED90 0002BCD0 41 82 00 0C */ beq lbl_8002ED9C @@ -4303,8 +4303,8 @@ lbl_8002ED54: lbl_8002ED9C: /* 8002ED9C 0002BCDC 2C 00 00 00 */ cmpwi r0, 0 /* 8002EDA0 0002BCE0 40 80 00 14 */ bge lbl_8002EDB4 -/* 8002EDA4 0002BCE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EDA8 0002BCE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EDA4 0002BCE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EDA8 0002BCE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EDAC 0002BCEC 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002EDB0 0002BCF0 7C 00 07 74 */ extsb r0, r0 lbl_8002EDB4: @@ -4330,8 +4330,8 @@ dComIfGp_isLightDropMapVisible: /* 8002EDEC 0002BD2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002EDF0 0002BD30 93 C1 00 08 */ stw r30, 8(r1) /* 8002EDF4 0002BD34 3B C0 00 00 */ li r30, 0 -/* 8002EDF8 0002BD38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EDFC 0002BD3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EDF8 0002BD38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EDFC 0002BD3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EE00 0002BD40 3B E3 01 14 */ addi r31, r3, 0x114 lbl_8002EE04: /* 8002EE04 0002BD44 7F E3 FB 78 */ mr r3, r31 @@ -4363,8 +4363,8 @@ lbl_8002EE48: .global dComIfGp_getNowLevel dComIfGp_getNowLevel: /* 8002EE60 0002BDA0 38 00 FF FF */ li r0, -1 -/* 8002EE64 0002BDA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EE68 0002BDA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EE64 0002BDA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EE68 0002BDA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EE6C 0002BDAC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8002EE70 0002BDB0 28 03 00 00 */ cmplwi r3, 0 /* 8002EE74 0002BDB4 41 82 00 0C */ beq lbl_8002EE80 @@ -4373,8 +4373,8 @@ dComIfGp_getNowLevel: lbl_8002EE80: /* 8002EE80 0002BDC0 2C 00 00 00 */ cmpwi r0, 0 /* 8002EE84 0002BDC4 40 80 00 14 */ bge lbl_8002EE98 -/* 8002EE88 0002BDC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EE8C 0002BDCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EE88 0002BDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EE8C 0002BDCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EE90 0002BDD0 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002EE94 0002BDD4 7C 00 07 74 */ extsb r0, r0 lbl_8002EE98: @@ -4387,8 +4387,8 @@ lbl_8002EE98: .global dComIfGs_setSelectEquipClothes dComIfGs_setSelectEquipClothes: -/* 8002EEB0 0002BDF0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002EEB4 0002BDF4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002EEB0 0002BDF0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002EEB4 0002BDF4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002EEB8 0002BDF8 98 64 00 13 */ stb r3, 0x13(r4) /* 8002EEBC 0002BDFC 4E 80 00 20 */ blr @@ -4414,39 +4414,39 @@ lbl_8002EEFC: /* 8002EF00 0002BE40 41 82 00 5C */ beq lbl_8002EF5C /* 8002EF04 0002BE44 48 00 00 70 */ b lbl_8002EF74 lbl_8002EF08: -/* 8002EF08 0002BE48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EF0C 0002BE4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EF08 0002BE48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EF0C 0002BE4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EF10 0002BE50 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EF14 0002BE54 38 80 00 01 */ li r4, 1 /* 8002EF18 0002BE58 38 A0 00 00 */ li r5, 0 /* 8002EF1C 0002BE5C 48 00 52 CD */ bl setCollect__20dSv_player_collect_cFiUc /* 8002EF20 0002BE60 48 00 00 54 */ b lbl_8002EF74 lbl_8002EF24: -/* 8002EF24 0002BE64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EF28 0002BE68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EF24 0002BE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EF28 0002BE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EF2C 0002BE6C 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EF30 0002BE70 38 80 00 01 */ li r4, 1 /* 8002EF34 0002BE74 38 A0 00 01 */ li r5, 1 /* 8002EF38 0002BE78 48 00 52 B1 */ bl setCollect__20dSv_player_collect_cFiUc /* 8002EF3C 0002BE7C 48 00 00 38 */ b lbl_8002EF74 lbl_8002EF40: -/* 8002EF40 0002BE80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EF44 0002BE84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EF40 0002BE80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EF44 0002BE84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EF48 0002BE88 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EF4C 0002BE8C 38 80 00 01 */ li r4, 1 /* 8002EF50 0002BE90 38 A0 00 02 */ li r5, 2 /* 8002EF54 0002BE94 48 00 52 95 */ bl setCollect__20dSv_player_collect_cFiUc /* 8002EF58 0002BE98 48 00 00 1C */ b lbl_8002EF74 lbl_8002EF5C: -/* 8002EF5C 0002BE9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EF60 0002BEA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EF5C 0002BE9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EF60 0002BEA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EF64 0002BEA4 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EF68 0002BEA8 38 80 00 01 */ li r4, 1 /* 8002EF6C 0002BEAC 38 A0 00 03 */ li r5, 3 /* 8002EF70 0002BEB0 48 00 52 79 */ bl setCollect__20dSv_player_collect_cFiUc lbl_8002EF74: -/* 8002EF74 0002BEB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EF78 0002BEB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EF74 0002BEB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EF78 0002BEB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EF7C 0002BEBC 9B E3 00 14 */ stb r31, 0x14(r3) /* 8002EF80 0002BEC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002EF84 0002BEC4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4473,31 +4473,31 @@ lbl_8002EFC4: /* 8002EFC8 0002BF08 40 80 00 58 */ bge lbl_8002F020 /* 8002EFCC 0002BF0C 48 00 00 3C */ b lbl_8002F008 lbl_8002EFD0: -/* 8002EFD0 0002BF10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EFD4 0002BF14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EFD0 0002BF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EFD4 0002BF14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EFD8 0002BF18 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EFDC 0002BF1C 38 80 00 02 */ li r4, 2 /* 8002EFE0 0002BF20 38 A0 00 00 */ li r5, 0 /* 8002EFE4 0002BF24 48 00 52 05 */ bl setCollect__20dSv_player_collect_cFiUc /* 8002EFE8 0002BF28 48 00 00 38 */ b lbl_8002F020 lbl_8002EFEC: -/* 8002EFEC 0002BF2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002EFF0 0002BF30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002EFEC 0002BF2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002EFF0 0002BF30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002EFF4 0002BF34 38 63 01 00 */ addi r3, r3, 0x100 /* 8002EFF8 0002BF38 38 80 00 02 */ li r4, 2 /* 8002EFFC 0002BF3C 38 A0 00 01 */ li r5, 1 /* 8002F000 0002BF40 48 00 51 E9 */ bl setCollect__20dSv_player_collect_cFiUc /* 8002F004 0002BF44 48 00 00 1C */ b lbl_8002F020 lbl_8002F008: -/* 8002F008 0002BF48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F00C 0002BF4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F008 0002BF48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F00C 0002BF4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F010 0002BF50 38 63 01 00 */ addi r3, r3, 0x100 /* 8002F014 0002BF54 38 80 00 02 */ li r4, 2 /* 8002F018 0002BF58 38 A0 00 02 */ li r5, 2 /* 8002F01C 0002BF5C 48 00 51 CD */ bl setCollect__20dSv_player_collect_cFiUc lbl_8002F020: -/* 8002F020 0002BF60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F024 0002BF64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F020 0002BF60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F024 0002BF64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F028 0002BF68 9B E3 00 15 */ stb r31, 0x15(r3) /* 8002F02C 0002BF6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002F030 0002BF70 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4514,8 +4514,8 @@ dComIfGs_setKeyNum: /* 8002F050 0002BF90 48 33 31 8D */ bl _savegpr_29 /* 8002F054 0002BF94 7C 7D 1B 78 */ mr r29, r3 /* 8002F058 0002BF98 7C 9E 23 78 */ mr r30, r4 -/* 8002F05C 0002BF9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F060 0002BFA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F05C 0002BF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F060 0002BFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F064 0002BFA4 3B E3 4E 20 */ addi r31, r3, 0x4e20 /* 8002F068 0002BFA8 7F E3 FB 78 */ mr r3, r31 /* 8002F06C 0002BFAC 81 9F 00 00 */ lwz r12, 0(r31) @@ -4533,13 +4533,13 @@ dComIfGs_setKeyNum: /* 8002F09C 0002BFDC 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f /* 8002F0A0 0002BFE0 7C 1D 00 00 */ cmpw r29, r0 /* 8002F0A4 0002BFE4 40 82 00 10 */ bne lbl_8002F0B4 -/* 8002F0A8 0002BFE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F0AC 0002BFEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F0A8 0002BFE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F0AC 0002BFEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F0B0 0002BFF0 9B C3 09 74 */ stb r30, 0x974(r3) lbl_8002F0B4: /* 8002F0B4 0002BFF4 57 A4 28 34 */ slwi r4, r29, 5 -/* 8002F0B8 0002BFF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F0BC 0002BFFC 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002F0B8 0002BFF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F0BC 0002BFFC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8002F0C0 0002C000 7C 60 22 14 */ add r3, r0, r4 /* 8002F0C4 0002C004 9B C3 02 0C */ stb r30, 0x20c(r3) /* 8002F0C8 0002C008 39 61 00 20 */ addi r11, r1, 0x20 @@ -4560,8 +4560,8 @@ dComIfGs_setWarpItemData: /* 8002F0F8 0002C038 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8002F0FC 0002C03C C0 05 00 08 */ lfs f0, 8(r5) /* 8002F100 0002C040 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8002F104 0002C044 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F108 0002C048 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F104 0002C044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F108 0002C048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F10C 0002C04C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8002F110 0002C050 38 A1 00 08 */ addi r5, r1, 8 /* 8002F114 0002C054 48 00 00 15 */ bl dComIfG_play_c_NS_setWarpItemData @@ -4661,8 +4661,8 @@ dComIfGs_setLastWarpMarkItemData: /* 8002F268 0002C1A8 7C CA 33 78 */ mr r10, r6 /* 8002F26C 0002C1AC 7C E0 3B 78 */ mr r0, r7 /* 8002F270 0002C1B0 7D 09 43 78 */ mr r9, r8 -/* 8002F274 0002C1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F278 0002C1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F274 0002C1B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F278 0002C1B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F27C 0002C1BC 38 63 00 80 */ addi r3, r3, 0x80 /* 8002F280 0002C1C0 7F E4 FB 78 */ mr r4, r31 /* 8002F284 0002C1C4 7D 85 63 78 */ mr r5, r12 @@ -4678,37 +4678,37 @@ dComIfGs_setLastWarpMarkItemData: .global dComIfGs_getWarpStageName dComIfGs_getWarpStageName: -/* 8002F2AC 0002C1EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F2B0 0002C1F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F2AC 0002C1EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F2B0 0002C1F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F2B4 0002C1F4 38 63 00 8E */ addi r3, r3, 0x8e /* 8002F2B8 0002C1F8 4E 80 00 20 */ blr .global dComIfGs_getWarpPlayerPos dComIfGs_getWarpPlayerPos: -/* 8002F2BC 0002C1FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F2C0 0002C200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F2BC 0002C1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F2C0 0002C200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F2C4 0002C204 38 63 00 80 */ addi r3, r3, 0x80 /* 8002F2C8 0002C208 4E 80 00 20 */ blr .global dComIfGs_getWarpPlayerAngleY dComIfGs_getWarpPlayerAngleY: -/* 8002F2CC 0002C20C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F2D0 0002C210 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F2CC 0002C20C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F2D0 0002C210 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F2D4 0002C214 A8 63 00 8C */ lha r3, 0x8c(r3) /* 8002F2D8 0002C218 4E 80 00 20 */ blr .global dComIfGs_getWarpRoomNo dComIfGs_getWarpRoomNo: -/* 8002F2DC 0002C21C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F2E0 0002C220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F2DC 0002C21C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F2E0 0002C220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F2E4 0002C224 88 03 00 97 */ lbz r0, 0x97(r3) /* 8002F2E8 0002C228 7C 03 07 74 */ extsb r3, r0 /* 8002F2EC 0002C22C 4E 80 00 20 */ blr .global dComIfGs_getWarpMarkFlag dComIfGs_getWarpMarkFlag: -/* 8002F2F0 0002C230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F2F4 0002C234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F2F0 0002C230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F2F4 0002C234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F2F8 0002C238 88 03 00 98 */ lbz r0, 0x98(r3) /* 8002F2FC 0002C23C 7C 00 07 74 */ extsb r0, r0 /* 8002F300 0002C240 54 00 0F FE */ srwi r0, r0, 0x1f @@ -4806,8 +4806,8 @@ dComIfG_getStageRes: /* 8002F444 0002C384 3C 60 80 38 */ lis r3, lbl_80378F38@ha /* 8002F448 0002C388 38 63 8F 38 */ addi r3, r3, lbl_80378F38@l /* 8002F44C 0002C38C 38 63 01 60 */ addi r3, r3, 0x160 -/* 8002F450 0002C390 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8002F454 0002C394 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8002F450 0002C390 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8002F454 0002C394 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8002F458 0002C398 3C A5 00 02 */ addis r5, r5, 2 /* 8002F45C 0002C39C 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8002F460 0002C3A0 38 C0 00 40 */ li r6, 0x40 @@ -4826,8 +4826,8 @@ dComIfG_getOldStageRes: /* 8002F488 0002C3C8 3C 60 80 38 */ lis r3, lbl_80378F38@ha /* 8002F48C 0002C3CC 38 63 8F 38 */ addi r3, r3, lbl_80378F38@l /* 8002F490 0002C3D0 38 63 01 67 */ addi r3, r3, 0x167 -/* 8002F494 0002C3D4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8002F498 0002C3D8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8002F494 0002C3D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8002F498 0002C3D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8002F49C 0002C3DC 3C A5 00 02 */ addis r5, r5, 2 /* 8002F4A0 0002C3E0 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8002F4A4 0002C3E4 38 C0 00 40 */ li r6, 0x40 @@ -4863,16 +4863,16 @@ dComIfGp_ret_wp_set: .global dComIfGp_world_dark_set dComIfGp_world_dark_set: -/* 8002F504 0002C444 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002F508 0002C448 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002F504 0002C444 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002F508 0002C448 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002F50C 0002C44C 3C 84 00 02 */ addis r4, r4, 2 /* 8002F510 0002C450 98 64 DD F9 */ stb r3, -0x2207(r4) /* 8002F514 0002C454 4E 80 00 20 */ blr .global dComIfGp_world_dark_get dComIfGp_world_dark_get: -/* 8002F518 0002C458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F51C 0002C45C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F518 0002C458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F51C 0002C45C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F520 0002C460 3C 63 00 02 */ addis r3, r3, 2 /* 8002F524 0002C464 88 63 DD F9 */ lbz r3, -0x2207(r3) /* 8002F528 0002C468 4E 80 00 20 */ blr @@ -4883,8 +4883,8 @@ dComIfGp_world_dark_get: /* 8002F53C 0002C47C 48 33 2C A1 */ bl _savegpr_29 /* 8002F540 0002C480 7C 7D 1B 78 */ mr r29, r3 /* 8002F544 0002C484 7C 9E 23 78 */ mr r30, r4 -/* 8002F548 0002C488 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F54C 0002C48C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F548 0002C488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F54C 0002C48C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F550 0002C490 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F554 0002C494 7F E3 FB 78 */ mr r3, r31 /* 8002F558 0002C498 4B FF D6 65 */ bl dComIfG_play_c_NS_getTimerMode @@ -4924,8 +4924,8 @@ lbl_8002F5A8: /* 8002F5CC 0002C50C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002F5D0 0002C510 93 C1 00 08 */ stw r30, 8(r1) /* 8002F5D4 0002C514 7C 7E 1B 78 */ mr r30, r3 -/* 8002F5D8 0002C518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F5DC 0002C51C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F5D8 0002C518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F5DC 0002C51C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F5E0 0002C520 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F5E4 0002C524 7F E3 FB 78 */ mr r3, r31 /* 8002F5E8 0002C528 4B FF D5 D5 */ bl dComIfG_play_c_NS_getTimerMode @@ -4957,8 +4957,8 @@ lbl_8002F620: /* 8002F644 0002C584 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002F648 0002C588 93 C1 00 08 */ stw r30, 8(r1) /* 8002F64C 0002C58C 7C 7E 1B 78 */ mr r30, r3 -/* 8002F650 0002C590 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F654 0002C594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F650 0002C590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F654 0002C594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F658 0002C598 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F65C 0002C59C 7F E3 FB 78 */ mr r3, r31 /* 8002F660 0002C5A0 4B FF D5 5D */ bl dComIfG_play_c_NS_getTimerMode @@ -4991,8 +4991,8 @@ lbl_8002F698: /* 8002F6C0 0002C600 48 33 2B 1D */ bl _savegpr_29 /* 8002F6C4 0002C604 7C 7D 1B 78 */ mr r29, r3 /* 8002F6C8 0002C608 7C 9E 23 78 */ mr r30, r4 -/* 8002F6CC 0002C60C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F6D0 0002C610 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F6CC 0002C60C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F6D0 0002C610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F6D4 0002C614 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F6D8 0002C618 7F E3 FB 78 */ mr r3, r31 /* 8002F6DC 0002C61C 4B FF D4 E1 */ bl dComIfG_play_c_NS_getTimerMode @@ -5024,8 +5024,8 @@ lbl_8002F714: /* 8002F738 0002C678 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002F73C 0002C67C 93 C1 00 08 */ stw r30, 8(r1) /* 8002F740 0002C680 7C 7E 1B 78 */ mr r30, r3 -/* 8002F744 0002C684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F748 0002C688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F744 0002C684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F748 0002C688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F74C 0002C68C 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F750 0002C690 7F E3 FB 78 */ mr r3, r31 /* 8002F754 0002C694 4B FF D4 69 */ bl dComIfG_play_c_NS_getTimerMode @@ -5058,8 +5058,8 @@ dComIfG_TimerDeleteRequest: /* 8002F7A8 0002C6E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002F7AC 0002C6EC 93 C1 00 08 */ stw r30, 8(r1) /* 8002F7B0 0002C6F0 7C 7E 1B 78 */ mr r30, r3 -/* 8002F7B4 0002C6F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F7B8 0002C6F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F7B4 0002C6F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F7B8 0002C6F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F7BC 0002C6FC 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8002F7C0 0002C700 7F E3 FB 78 */ mr r3, r31 /* 8002F7C4 0002C704 4B FF D3 F9 */ bl dComIfG_play_c_NS_getTimerMode @@ -5093,20 +5093,20 @@ dComIfGs_Wolf_Change_Check: /* 8002F81C 0002C75C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002F820 0002C760 93 C1 00 08 */ stw r30, 8(r1) /* 8002F824 0002C764 3B E0 00 00 */ li r31, 0 -/* 8002F828 0002C768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F82C 0002C76C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F828 0002C768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F82C 0002C76C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F830 0002C770 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002F834 0002C774 38 80 0D 04 */ li r4, 0xd04 /* 8002F838 0002C778 48 00 51 85 */ bl isEventBit__11dSv_event_cCFUs /* 8002F83C 0002C77C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F840 0002C780 41 82 00 14 */ beq lbl_8002F854 -/* 8002F844 0002C784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F848 0002C788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F844 0002C784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F848 0002C788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F84C 0002C78C 8B E3 00 1E */ lbz r31, 0x1e(r3) /* 8002F850 0002C790 48 00 00 CC */ b lbl_8002F91C lbl_8002F854: -/* 8002F854 0002C794 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F858 0002C798 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F854 0002C794 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F858 0002C798 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F85C 0002C79C 3B C3 00 28 */ addi r30, r3, 0x28 /* 8002F860 0002C7A0 7F C3 F3 78 */ mr r3, r30 /* 8002F864 0002C7A4 38 80 00 00 */ li r4, 0 @@ -5159,8 +5159,8 @@ lbl_8002F8F0: /* 8002F914 0002C854 40 82 00 08 */ bne lbl_8002F91C /* 8002F918 0002C858 3B E0 00 01 */ li r31, 1 lbl_8002F91C: -/* 8002F91C 0002C85C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F920 0002C860 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F91C 0002C85C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F920 0002C860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F924 0002C864 3B C3 4E 00 */ addi r30, r3, 0x4e00 /* 8002F928 0002C868 7F C3 F3 78 */ mr r3, r30 /* 8002F92C 0002C86C 3C 80 80 38 */ lis r4, lbl_80378F38@ha @@ -5169,8 +5169,8 @@ lbl_8002F91C: /* 8002F938 0002C878 48 33 90 5D */ bl strcmp /* 8002F93C 0002C87C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F940 0002C880 40 82 00 40 */ bne lbl_8002F980 -/* 8002F944 0002C884 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F948 0002C888 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F944 0002C884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F948 0002C888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F94C 0002C88C 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002F950 0002C890 2C 00 00 02 */ cmpwi r0, 2 /* 8002F954 0002C894 40 82 00 2C */ bne lbl_8002F980 @@ -5192,8 +5192,8 @@ lbl_8002F980: /* 8002F990 0002C8D0 48 33 90 05 */ bl strcmp /* 8002F994 0002C8D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002F998 0002C8D8 40 82 00 3C */ bne lbl_8002F9D4 -/* 8002F99C 0002C8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002F9A0 0002C8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002F99C 0002C8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002F9A0 0002C8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002F9A4 0002C8E4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 8002F9A8 0002C8E8 2C 00 00 09 */ cmpwi r0, 9 /* 8002F9AC 0002C8EC 40 82 00 28 */ bne lbl_8002F9D4 @@ -5217,28 +5217,28 @@ lbl_8002F9D4: .global dComIfGs_PolyDamageOff_Set dComIfGs_PolyDamageOff_Set: -/* 8002F9F0 0002C930 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002F9F4 0002C934 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002F9F0 0002C930 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002F9F4 0002C934 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002F9F8 0002C938 3C 84 00 02 */ addis r4, r4, 2 /* 8002F9FC 0002C93C 98 64 DD FB */ stb r3, -0x2205(r4) /* 8002FA00 0002C940 4E 80 00 20 */ blr .global dComIfGs_PolyDamageOff_Check dComIfGs_PolyDamageOff_Check: -/* 8002FA04 0002C944 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FA08 0002C948 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FA04 0002C944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FA08 0002C948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FA0C 0002C94C 3C 63 00 02 */ addis r3, r3, 2 /* 8002FA10 0002C950 88 63 DD FB */ lbz r3, -0x2205(r3) /* 8002FA14 0002C954 4E 80 00 20 */ blr /* 8002FA18 0002C958 38 00 00 01 */ li r0, 1 -/* 8002FA1C 0002C95C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FA20 0002C960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FA1C 0002C95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FA20 0002C960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FA24 0002C964 3C 63 00 02 */ addis r3, r3, 2 /* 8002FA28 0002C968 98 03 DD FA */ stb r0, -0x2206(r3) /* 8002FA2C 0002C96C 4E 80 00 20 */ blr /* 8002FA30 0002C970 38 60 00 00 */ li r3, 0 -/* 8002FA34 0002C974 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002FA38 0002C978 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002FA34 0002C974 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002FA38 0002C978 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002FA3C 0002C97C 3C 84 00 02 */ addis r4, r4, 2 /* 8002FA40 0002C980 88 04 DD FA */ lbz r0, -0x2206(r4) /* 8002FA44 0002C984 2C 00 00 02 */ cmpwi r0, 2 @@ -5260,40 +5260,40 @@ dComIfGs_wolfeye_effect_check: /* 8002FA78 0002C9B8 4C 81 00 20 */ blelr /* 8002FA7C 0002C9BC 38 60 00 01 */ li r3, 1 /* 8002FA80 0002C9C0 4E 80 00 20 */ blr -/* 8002FA84 0002C9C4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002FA88 0002C9C8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002FA84 0002C9C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002FA88 0002C9C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002FA8C 0002C9CC 3C 84 00 02 */ addis r4, r4, 2 /* 8002FA90 0002C9D0 98 64 DD FC */ stb r3, -0x2204(r4) /* 8002FA94 0002C9D4 4E 80 00 20 */ blr .global dComIfGp_TargetWarpPt_set dComIfGp_TargetWarpPt_set: -/* 8002FA98 0002C9D8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002FA9C 0002C9DC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002FA98 0002C9D8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002FA9C 0002C9DC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002FAA0 0002C9E0 3C 84 00 02 */ addis r4, r4, 2 /* 8002FAA4 0002C9E4 98 64 DE 09 */ stb r3, -0x21f7(r4) /* 8002FAA8 0002C9E8 4E 80 00 20 */ blr .global dComIfGp_SelectWarpPt_set dComIfGp_SelectWarpPt_set: -/* 8002FAAC 0002C9EC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002FAB0 0002C9F0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002FAAC 0002C9EC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002FAB0 0002C9F0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002FAB4 0002C9F4 3C 84 00 02 */ addis r4, r4, 2 /* 8002FAB8 0002C9F8 98 64 DE 0A */ stb r3, -0x21f6(r4) /* 8002FABC 0002C9FC 4E 80 00 20 */ blr .global dComIfGp_TargetWarpPt_get dComIfGp_TargetWarpPt_get: -/* 8002FAC0 0002CA00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FAC4 0002CA04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FAC0 0002CA00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FAC4 0002CA04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FAC8 0002CA08 3C 63 00 02 */ addis r3, r3, 2 /* 8002FACC 0002CA0C 88 63 DE 09 */ lbz r3, -0x21f7(r3) /* 8002FAD0 0002CA10 4E 80 00 20 */ blr .global dComIfGp_SelectWarpPt_get dComIfGp_SelectWarpPt_get: -/* 8002FAD4 0002CA14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FAD8 0002CA18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FAD4 0002CA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FAD8 0002CA18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FADC 0002CA1C 3C 63 00 02 */ addis r3, r3, 2 /* 8002FAE0 0002CA20 88 63 DE 0A */ lbz r3, -0x21f6(r3) /* 8002FAE4 0002CA24 4E 80 00 20 */ blr @@ -5301,8 +5301,8 @@ dComIfGp_SelectWarpPt_get: .global dComIfGp_TransportWarp_check dComIfGp_TransportWarp_check: /* 8002FAE8 0002CA28 38 60 00 00 */ li r3, 0 -/* 8002FAEC 0002CA2C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002FAF0 0002CA30 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002FAEC 0002CA2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002FAF0 0002CA30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8002FAF4 0002CA34 3C 84 00 02 */ addis r4, r4, 2 /* 8002FAF8 0002CA38 88 A4 DE 09 */ lbz r5, -0x21f7(r4) /* 8002FAFC 0002CA3C 28 05 00 FF */ cmplwi r5, 0xff @@ -5366,8 +5366,8 @@ dComIfGs_onVisitedRoom: /* 8002FBC4 0002CB04 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 8002FBC8 0002CB08 28 1E 00 FF */ cmplwi r30, 0xff /* 8002FBCC 0002CB0C 41 82 00 30 */ beq lbl_8002FBFC -/* 8002FBD0 0002CB10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FBD4 0002CB14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FBD0 0002CB10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FBD4 0002CB14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FBD8 0002CB18 3B E3 00 64 */ addi r31, r3, 0x64 /* 8002FBDC 0002CB1C 7F E3 FB 78 */ mr r3, r31 /* 8002FBE0 0002CB20 7F C4 F3 78 */ mr r4, r30 @@ -5382,8 +5382,8 @@ lbl_8002FBFC: /* 8002FC00 0002CB40 7C 00 07 74 */ extsb r0, r0 /* 8002FC04 0002CB44 1C 00 04 04 */ mulli r0, r0, 0x404 /* 8002FC08 0002CB48 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 8002FC0C 0002CB4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FC10 0002CB50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FC0C 0002CB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FC10 0002CB50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FC14 0002CB54 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FC18 0002CB58 48 00 54 91 */ bl getSave2__10dSv_save_cFi /* 8002FC1C 0002CB5C 7F 84 E3 78 */ mr r4, r28 @@ -5407,8 +5407,8 @@ lbl_8002FC24: /* 8002FC60 0002CBA0 1C 00 04 04 */ mulli r0, r0, 0x404 /* 8002FC64 0002CBA4 7C 63 02 14 */ add r3, r3, r0 /* 8002FC68 0002CBA8 80 83 00 20 */ lwz r4, 0x20(r3) -/* 8002FC6C 0002CBAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FC70 0002CBB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FC6C 0002CBAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FC70 0002CBB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FC74 0002CBB4 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FC78 0002CBB8 48 00 54 31 */ bl getSave2__10dSv_save_cFi /* 8002FC7C 0002CBBC 7F E4 FB 78 */ mr r4, r31 @@ -5433,8 +5433,8 @@ dComIfGs_isVisitedRoom: /* 8002FCBC 0002CBFC 1C 00 04 04 */ mulli r0, r0, 0x404 /* 8002FCC0 0002CC00 7C 63 02 14 */ add r3, r3, r0 /* 8002FCC4 0002CC04 80 83 00 20 */ lwz r4, 0x20(r3) -/* 8002FCC8 0002CC08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FCCC 0002CC0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FCC8 0002CC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FCCC 0002CC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FCD0 0002CC10 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FCD4 0002CC14 48 00 53 D5 */ bl getSave2__10dSv_save_cFi /* 8002FCD8 0002CC18 7F E4 FB 78 */ mr r4, r31 @@ -5470,8 +5470,8 @@ dComIfGs_staffroll_next_go_check: /* 8002FD38 0002CC78 90 03 00 08 */ stw r0, 8(r3) /* 8002FD3C 0002CC7C 90 03 00 04 */ stw r0, 4(r3) /* 8002FD40 0002CC80 90 03 00 00 */ stw r0, 0(r3) -/* 8002FD44 0002CC84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002FD48 0002CC88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002FD44 0002CC84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002FD48 0002CC88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FD4C 0002CC8C 48 00 04 F9 */ bl dComIfG_inf_c .global dComIfG_inf_c_NS_dtor /* 8002FD50 0002CC90 3C 80 80 03 */ lis r4, dComIfG_inf_c_NS_dtor@ha diff --git a/asm/d/d_attention.s b/asm/d/d_attention.s index 92c0e17a7c..a18c501b40 100644 --- a/asm/d/d_attention.s +++ b/asm/d/d_attention.s @@ -55,8 +55,8 @@ dAttParam_c: /* 800700C8 0006D008 D0 1F 00 38 */ stfs f0, 0x38(r31) /* 800700CC 0006D00C C0 02 8C 58 */ lfs f0, lbl_80452658-_SDA2_BASE_(r2) /* 800700D0 0006D010 D0 1F 00 3C */ stfs f0, 0x3c(r31) -/* 800700D4 0006D014 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800700D8 0006D018 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800700D4 0006D014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800700D8 0006D018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800700DC 0006D01C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800700E0 0006D020 3C 80 80 38 */ lis r4, lbl_8037A770@ha /* 800700E4 0006D024 38 84 A7 70 */ addi r4, r4, lbl_8037A770@l @@ -210,8 +210,8 @@ dAttention_c: /* 800702C8 0006D208 38 63 A7 70 */ addi r3, r3, lbl_8037A770@l /* 800702CC 0006D20C 38 63 00 08 */ addi r3, r3, 8 /* 800702D0 0006D210 38 80 00 25 */ li r4, 0x25 -/* 800702D4 0006D214 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800702D8 0006D218 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800702D4 0006D214 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800702D8 0006D218 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800702DC 0006D21C 3F A5 00 02 */ addis r29, r5, 2 /* 800702E0 0006D220 3B BD C2 F8 */ addi r29, r29, -15624 /* 800702E4 0006D224 7F A5 EB 78 */ mr r5, r29 @@ -1100,8 +1100,8 @@ lbl_80070F34: lbl_80070F3C: /* 80070F3C 0006DE7C C3 E2 8C 50 */ lfs f31, lbl_80452650-_SDA2_BASE_(r2) /* 80070F40 0006DE80 C3 C2 8C 90 */ lfs f30, lbl_80452690-_SDA2_BASE_(r2) -/* 80070F44 0006DE84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80070F48 0006DE88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80070F44 0006DE84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80070F48 0006DE88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80070F4C 0006DE8C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80070F50 0006DE90 28 03 00 00 */ cmplwi r3, 0 /* 80070F54 0006DE94 41 82 00 38 */ beq lbl_80070F8C @@ -2239,8 +2239,8 @@ dAttention_c_NS_runDrawProc: /* 80071ED8 0006EE18 D0 1F 01 94 */ stfs f0, 0x194(r31) /* 80071EDC 0006EE1C 38 00 00 01 */ li r0, 1 /* 80071EE0 0006EE20 98 1F 01 9D */ stb r0, 0x19d(r31) -/* 80071EE4 0006EE24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80071EE8 0006EE28 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80071EE4 0006EE24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80071EE8 0006EE28 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80071EEC 0006EE2C 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 80071EF0 0006EE30 3C 60 36 A0 */ lis r3, 0x36A02311@ha /* 80071EF4 0006EE34 38 03 23 11 */ addi r0, r3, 0x36A02311@l @@ -2270,8 +2270,8 @@ lbl_80071F1C: /* 80071F4C 0006EE8C 64 00 40 00 */ oris r0, r0, 0x4000 /* 80071F50 0006EE90 90 1F 03 34 */ stw r0, 0x334(r31) lbl_80071F54: -/* 80071F54 0006EE94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80071F58 0006EE98 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80071F54 0006EE94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80071F58 0006EE98 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80071F5C 0006EE9C 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 80071F60 0006EEA0 3C 60 36 A0 */ lis r3, 0x36A02311@ha /* 80071F64 0006EEA4 38 03 23 11 */ addi r0, r3, 0x36A02311@l @@ -2399,8 +2399,8 @@ dAttention_c_NS_checkButton: /* 80072118 0006F058 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8007211C 0006F05C 7C 00 07 75 */ extsb. r0, r0 /* 80072120 0006F060 40 82 00 54 */ bne lbl_80072174 -/* 80072124 0006F064 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072128 0006F068 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072124 0006F064 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072128 0006F068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8007212C 0006F06C 38 63 09 78 */ addi r3, r3, 0x978 /* 80072130 0006F070 38 80 00 01 */ li r4, 1 /* 80072134 0006F074 4B FC 2A B5 */ bl isSwitch__12dSv_danBit_cCFi @@ -2420,8 +2420,8 @@ dAttention_c_NS_checkButton: /* 8007216C 0006F0AC 64 60 01 00 */ oris r0, r3, 0x100 /* 80072170 0006F0B0 90 1F 03 34 */ stw r0, 0x334(r31) lbl_80072174: -/* 80072174 0006F0B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072178 0006F0B8 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80072174 0006F0B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072178 0006F0B8 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8007217C 0006F0BC 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 80072180 0006F0C0 3C 60 36 A0 */ lis r3, 0x36A02311@ha /* 80072184 0006F0C4 38 03 23 11 */ addi r0, r3, 0x36A02311@l @@ -2984,8 +2984,8 @@ dAttention_c_NS_Run: /* 80072938 0006F878 80 03 03 34 */ lwz r0, 0x334(r3) /* 8007293C 0006F87C 54 00 00 12 */ rlwinm r0, r0, 0, 0, 9 /* 80072940 0006F880 90 03 03 34 */ stw r0, 0x334(r3) -/* 80072944 0006F884 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072948 0006F888 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072944 0006F884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072948 0006F888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8007294C 0006F88C 88 03 01 E2 */ lbz r0, 0x1e2(r3) /* 80072950 0006F890 7C 00 00 34 */ cntlzw r0, r0 /* 80072954 0006F894 54 04 D9 7E */ srwi r4, r0, 5 @@ -3009,8 +3009,8 @@ lbl_80072994: /* 80072994 0006F8D4 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80072998 0006F8D8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8007299C 0006F8DC 41 82 00 1C */ beq lbl_800729B8 -/* 800729A0 0006F8E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800729A4 0006F8E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800729A0 0006F8E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800729A4 0006F8E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800729A8 0006F8E8 80 03 5D AC */ lwz r0, 0x5dac(r3) /* 800729AC 0006F8EC 90 1F 00 00 */ stw r0, 0(r31) /* 800729B0 0006F8F0 38 00 00 00 */ li r0, 0 @@ -3018,8 +3018,8 @@ lbl_80072994: lbl_800729B8: /* 800729B8 0006F8F8 7F E3 FB 78 */ mr r3, r31 /* 800729BC 0006F8FC 4B FF EA 69 */ bl dAttention_c_NS_setOwnerAttentionPos -/* 800729C0 0006F900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800729C4 0006F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800729C0 0006F900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800729C4 0006F904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800729C8 0006F908 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 800729CC 0006F90C 28 00 00 00 */ cmplwi r0, 0 /* 800729D0 0006F910 40 82 00 10 */ bne lbl_800729E0 @@ -3132,8 +3132,8 @@ lbl_80072B34: /* 80072B54 0006FA94 88 1F 03 29 */ lbz r0, 0x329(r31) /* 80072B58 0006FA98 28 00 00 01 */ cmplwi r0, 1 /* 80072B5C 0006FA9C 40 82 00 28 */ bne lbl_80072B84 -/* 80072B60 0006FAA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072B64 0006FAA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072B60 0006FAA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072B64 0006FAA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80072B68 0006FAA8 80 1F 00 0C */ lwz r0, 0xc(r31) /* 80072B6C 0006FAAC 1C 00 00 38 */ mulli r0, r0, 0x38 /* 80072B70 0006FAB0 7C 63 02 14 */ add r3, r3, r0 @@ -3142,8 +3142,8 @@ lbl_80072B34: /* 80072B7C 0006FABC 90 03 5D 7C */ stw r0, 0x5d7c(r3) /* 80072B80 0006FAC0 48 00 00 24 */ b lbl_80072BA4 lbl_80072B84: -/* 80072B84 0006FAC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072B88 0006FAC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072B84 0006FAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072B88 0006FAC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80072B8C 0006FACC 80 1F 00 0C */ lwz r0, 0xc(r31) /* 80072B90 0006FAD0 1C 00 00 38 */ mulli r0, r0, 0x38 /* 80072B94 0006FAD4 7C 63 02 14 */ add r3, r3, r0 @@ -3181,8 +3181,8 @@ dAttention_c_NS_Draw: /* 80072C00 0006FB40 98 1F 03 13 */ stb r0, 0x313(r31) /* 80072C04 0006FB44 48 00 01 64 */ b lbl_80072D68 lbl_80072C08: -/* 80072C08 0006FB48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072C0C 0006FB4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072C08 0006FB48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072C0C 0006FB4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80072C10 0006FB50 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 80072C14 0006FB54 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 80072C18 0006FB58 38 81 00 0C */ addi r4, r1, 0xc @@ -3191,8 +3191,8 @@ lbl_80072C08: /* 80072C24 0006FB64 38 80 00 00 */ li r4, 0 /* 80072C28 0006FB68 48 00 09 15 */ bl dAttention_c_NS_LockonTarget /* 80072C2C 0006FB6C 7C 7E 1B 78 */ mr r30, r3 -/* 80072C30 0006FB70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80072C34 0006FB74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80072C30 0006FB70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80072C34 0006FB74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80072C38 0006FB78 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80072C3C 0006FB7C 28 00 00 00 */ cmplwi r0, 0 /* 80072C40 0006FB80 40 82 01 28 */ bne lbl_80072D68 @@ -3683,8 +3683,8 @@ dAttDraw_c_NS_draw: /* 80073334 00070274 7C 9D 00 2E */ lwzx r4, r29, r0 /* 80073338 00070278 38 84 00 24 */ addi r4, r4, 0x24 /* 8007333C 0007027C 48 2D 31 75 */ bl PSMTXCopy -/* 80073340 00070280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80073344 00070284 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 80073340 00070280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80073344 00070284 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 80073348 00070288 80 7B 61 B0 */ lwz r3, 0x61b0(r27) /* 8007334C 0007028C C0 42 8C B0 */ lfs f2, lbl_804526B0-_SDA2_BASE_(r2) /* 80073350 00070290 C0 22 8C 94 */ lfs f1, lbl_80452694-_SDA2_BASE_(r2) @@ -3786,8 +3786,8 @@ lbl_80073444: /* 800734C8 00070408 38 9F 00 58 */ addi r4, r31, 0x58 /* 800734CC 0007040C 4B F9 A2 DD */ bl mDoExt_brkAnm_NS_entry lbl_800734D0: -/* 800734D0 00070410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800734D4 00070414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800734D0 00070410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800734D4 00070414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800734D8 00070418 80 03 5F B4 */ lwz r0, 0x5fb4(r3) /* 800734DC 0007041C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800734E0 00070420 3B C3 4A C8 */ addi r30, r3, lbl_80434AC8@l @@ -3797,8 +3797,8 @@ lbl_800734D0: /* 800734F0 00070430 54 00 10 3A */ slwi r0, r0, 2 /* 800734F4 00070434 7C 7D 00 2E */ lwzx r3, r29, r0 /* 800734F8 00070438 4B F9 A7 CD */ bl mDoExt_modelUpdateDL -/* 800734FC 0007043C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80073500 00070440 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800734FC 0007043C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80073500 00070440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80073504 00070444 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80073508 00070448 90 1E 00 48 */ stw r0, 0x48(r30) /* 8007350C 0007044C 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -3820,8 +3820,8 @@ dAttention_c_NS_LockonTarget: /* 80073540 00070480 7C 08 02 A6 */ mflr r0 /* 80073544 00070484 90 01 00 14 */ stw r0, 0x14(r1) /* 80073548 00070488 7C 67 1B 78 */ mr r7, r3 -/* 8007354C 0007048C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80073550 00070490 38 C3 61 C0 */ addi r6, r3, lbl_804061C0@l +/* 8007354C 0007048C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80073550 00070490 38 C3 61 C0 */ addi r6, r3, g_dComIfG_gameInfo@l /* 80073554 00070494 80 A6 5F 18 */ lwz r5, 0x5f18(r6) /* 80073558 00070498 3C 60 36 A0 */ lis r3, 0x36A02311@ha /* 8007355C 0007049C 38 03 23 11 */ addi r0, r3, 0x36A02311@l @@ -3931,8 +3931,8 @@ lbl_800736B4: .global dAttention_c_NS_LockonTargetPId dAttention_c_NS_LockonTargetPId: -/* 800736CC 0007060C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800736D0 00070610 38 E5 61 C0 */ addi r7, r5, lbl_804061C0@l +/* 800736CC 0007060C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800736D0 00070610 38 E5 61 C0 */ addi r7, r5, g_dComIfG_gameInfo@l /* 800736D4 00070614 80 C7 5F 18 */ lwz r6, 0x5f18(r7) /* 800736D8 00070618 3C A0 36 A0 */ lis r5, 0x36A02311@ha /* 800736DC 0007061C 38 05 23 11 */ addi r0, r5, 0x36A02311@l @@ -4219,8 +4219,8 @@ dAttCatch_c_NS_proc: /* 80073A48 00070988 FF C0 18 90 */ fmr f30, f3 /* 80073A4C 0007098C 7C DE 33 78 */ mr r30, r6 /* 80073A50 00070990 7C FF 3B 78 */ mr r31, r7 -/* 80073A54 00070994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80073A58 00070998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80073A54 00070994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80073A58 00070998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80073A5C 0007099C 83 43 5D AC */ lwz r26, 0x5dac(r3) /* 80073A60 000709A0 80 1B 00 04 */ lwz r0, 4(r27) /* 80073A64 000709A4 7C 1F 00 00 */ cmpw r31, r0 @@ -4443,8 +4443,8 @@ dAttLook_c_NS_proc: /* 80073D44 00070C84 FF C0 18 90 */ fmr f30, f3 /* 80073D48 00070C88 7C BE 2B 78 */ mr r30, r5 /* 80073D4C 00070C8C 7C DF 33 78 */ mr r31, r6 -/* 80073D50 00070C90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80073D54 00070C94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80073D50 00070C90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80073D54 00070C94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80073D58 00070C98 83 63 5D AC */ lwz r27, 0x5dac(r3) /* 80073D5C 00070C9C 80 1C 00 04 */ lwz r0, 4(r28) /* 80073D60 00070CA0 7C 1F 00 00 */ cmpw r31, r0 diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 8c0dd95ed0..65f5dd707b 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -30,8 +30,8 @@ lbl_8015FA6C: lbl_8015FA70: /* 8015FA70 0015C9B0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8015FA74 0015C9B4 41 82 00 4C */ beq lbl_8015FAC0 -/* 8015FA78 0015C9B8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8015FA7C 0015C9BC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8015FA78 0015C9B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8015FA7C 0015C9BC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015FA80 0015C9C0 80 04 5D 7C */ lwz r0, 0x5d7c(r4) /* 8015FA84 0015C9C4 60 00 00 02 */ ori r0, r0, 2 /* 8015FA88 0015C9C8 90 04 5D 7C */ stw r0, 0x5d7c(r4) @@ -41,8 +41,8 @@ lbl_8015FA70: /* 8015FA98 0015C9D8 4E 80 04 21 */ bctrl /* 8015FA9C 0015C9DC 28 03 00 00 */ cmplwi r3, 0 /* 8015FAA0 0015C9E0 41 82 00 2C */ beq lbl_8015FACC -/* 8015FAA4 0015C9E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015FAA8 0015C9E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015FAA4 0015C9E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015FAA8 0015C9E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015FAAC 0015C9EC 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 8015FAB0 0015C9F0 80 03 04 9C */ lwz r0, 0x49c(r3) /* 8015FAB4 0015C9F4 64 00 01 00 */ oris r0, r0, 0x100 @@ -578,8 +578,8 @@ dCamera_c: /* 8016023C 0015D17C 4B F2 82 B5 */ bl dCamParam_c /* 80160240 0015D180 7F E3 FB 78 */ mr r3, r31 /* 80160244 0015D184 4B EB E0 C5 */ bl fopCamM_GetParam -/* 80160248 0015D188 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8016024C 0015D18C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80160248 0015D188 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8016024C 0015D18C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80160250 0015D190 3B 64 5D 79 */ addi r27, r4, 0x5d79 /* 80160254 0015D194 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80160258 0015D198 7F BB 00 AE */ lbzx r29, r27, r0 @@ -592,8 +592,8 @@ dCamera_c: /* 80160274 0015D1B4 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80160278 0015D1B8 7C 1B 00 AE */ lbzx r0, r27, r0 /* 8016027C 0015D1BC 7C 00 07 74 */ extsb r0, r0 -/* 80160280 0015D1C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160284 0015D1C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80160280 0015D1C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160284 0015D1C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80160288 0015D1C8 54 00 18 38 */ slwi r0, r0, 3 /* 8016028C 0015D1CC 7C 63 02 14 */ add r3, r3, r0 /* 80160290 0015D1D0 80 A3 5D AC */ lwz r5, 0x5dac(r3) @@ -641,8 +641,8 @@ dCamera_c_NS_dtor: /* 80160318 0015D258 7C 7E 1B 79 */ or. r30, r3, r3 /* 8016031C 0015D25C 7C 9F 23 78 */ mr r31, r4 /* 80160320 0015D260 41 82 01 34 */ beq lbl_80160454 -/* 80160324 0015D264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160328 0015D268 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80160324 0015D264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160328 0015D268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016032C 0015D26C 80 03 0D D0 */ lwz r0, 0xdd0(r3) /* 80160330 0015D270 54 00 07 3E */ clrlwi r0, r0, 0x1c /* 80160334 0015D274 28 00 00 07 */ cmplwi r0, 7 @@ -747,8 +747,8 @@ dCamera_c_NS_initialize: /* 8016048C 0015D3CC 7C BD 2B 78 */ mr r29, r5 /* 80160490 0015D3D0 7C DB 33 78 */ mr r27, r6 /* 80160494 0015D3D4 7C FA 3B 78 */ mr r26, r7 -/* 80160498 0015D3D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016049C 0015D3DC 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80160498 0015D3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016049C 0015D3DC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801604A0 0015D3E0 80 65 5D 88 */ lwz r3, 0x5d88(r5) /* 801604A4 0015D3E4 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801604A8 0015D3E8 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l @@ -778,8 +778,8 @@ dCamera_c_NS_initialize: /* 80160508 0015D448 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8016050C 0015D44C 7C 00 07 74 */ extsb r0, r0 /* 80160510 0015D450 90 1C 00 04 */ stw r0, 4(r28) -/* 80160514 0015D454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160518 0015D458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80160514 0015D454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160518 0015D458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016051C 0015D45C 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80160520 0015D460 3B DD 3E C8 */ addi r30, r29, 0x3ec8 /* 80160524 0015D464 7F C3 F3 78 */ mr r3, r30 @@ -1181,8 +1181,8 @@ lbl_80160610: /* 80160B3C 0015DA7C 90 1C 06 98 */ stw r0, 0x698(r28) /* 80160B40 0015DA80 38 80 00 00 */ li r4, 0 /* 80160B44 0015DA84 90 9C 06 9C */ stw r4, 0x69c(r28) -/* 80160B48 0015DA88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160B4C 0015DA8C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80160B48 0015DA88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160B4C 0015DA8C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80160B50 0015DA90 80 7E 5D B4 */ lwz r3, 0x5db4(r30) /* 80160B54 0015DA94 80 03 05 74 */ lwz r0, 0x574(r3) /* 80160B58 0015DA98 54 00 3F FE */ rlwinm r0, r0, 7, 0x1f, 0x1f @@ -1383,8 +1383,8 @@ lbl_80160E08: /* 80160E44 0015DD84 90 7C 06 8C */ stw r3, 0x68c(r28) /* 80160E48 0015DD88 48 00 00 48 */ b lbl_80160E90 lbl_80160E4C: -/* 80160E4C 0015DD8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160E50 0015DD90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80160E4C 0015DD8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160E50 0015DD90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80160E54 0015DD94 80 1C 01 7C */ lwz r0, 0x17c(r28) /* 80160E58 0015DD98 54 00 20 36 */ slwi r0, r0, 4 /* 80160E5C 0015DD9C 7C 63 02 14 */ add r3, r3, r0 @@ -1425,8 +1425,8 @@ lbl_80160E90: /* 80160EE0 0015DE20 38 7C 0A EC */ addi r3, r28, 0xaec /* 80160EE4 0015DE24 80 9C 06 7C */ lwz r4, 0x67c(r28) /* 80160EE8 0015DE28 4B F2 76 ED */ bl dCamParam_c_NS_Change -/* 80160EEC 0015DE2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160EF0 0015DE30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80160EEC 0015DE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160EF0 0015DE30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80160EF4 0015DE34 80 03 0D D0 */ lwz r0, 0xdd0(r3) /* 80160EF8 0015DE38 54 00 07 3E */ clrlwi r0, r0, 0x1c /* 80160EFC 0015DE3C 28 00 00 07 */ cmplwi r0, 7 @@ -1438,8 +1438,8 @@ lbl_80160E90: /* 80160F14 0015DE54 2C 00 FF FD */ cmpwi r0, -3 /* 80160F18 0015DE58 40 82 00 F4 */ bne lbl_8016100C lbl_80160F1C: -/* 80160F1C 0015DE5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80160F20 0015DE60 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80160F1C 0015DE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80160F20 0015DE60 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80160F24 0015DE64 C0 1D 0E EC */ lfs f0, 0xeec(r29) /* 80160F28 0015DE68 D0 1C 00 64 */ stfs f0, 0x64(r28) /* 80160F2C 0015DE6C C0 1D 0E F0 */ lfs f0, 0xef0(r29) @@ -1553,8 +1553,8 @@ lbl_80161064: /* 801610D4 0015E014 D0 1C 00 34 */ stfs f0, 0x34(r28) /* 801610D8 0015E018 C0 1C 00 6C */ lfs f0, 0x6c(r28) /* 801610DC 0015E01C D0 1C 00 38 */ stfs f0, 0x38(r28) -/* 801610E0 0015E020 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801610E4 0015E024 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 801610E0 0015E020 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801610E4 0015E024 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 801610E8 0015E028 C0 1D 0E EC */ lfs f0, 0xeec(r29) /* 801610EC 0015E02C D0 01 00 E0 */ stfs f0, 0xe0(r1) /* 801610F0 0015E030 C0 1D 0E F0 */ lfs f0, 0xef0(r29) @@ -1833,8 +1833,8 @@ dCamera_c_NS_Stay: .global dCamera_c_NS_ChangeModeOK dCamera_c_NS_ChangeModeOK: -/* 801614F4 0015E434 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801614F8 0015E438 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801614F4 0015E434 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801614F8 0015E438 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801614FC 0015E43C 80 05 51 84 */ lwz r0, 0x5184(r5) /* 80161500 0015E440 2C 00 00 00 */ cmpwi r0, 0 /* 80161504 0015E444 40 82 00 10 */ bne lbl_80161514 @@ -2301,8 +2301,8 @@ lbl_80161BBC: /* 80161BC8 0015EB08 2C 04 00 04 */ cmpwi r4, 4 /* 80161BCC 0015EB0C 40 82 01 50 */ bne lbl_80161D1C lbl_80161BD0: -/* 80161BD0 0015EB10 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80161BD4 0015EB14 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 80161BD0 0015EB10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80161BD4 0015EB14 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 80161BD8 0015EB18 80 9E 01 7C */ lwz r4, 0x17c(r30) /* 80161BDC 0015EB1C 54 84 20 36 */ slwi r4, r4, 4 /* 80161BE0 0015EB20 7C 85 22 14 */ add r4, r5, r4 @@ -2337,8 +2337,8 @@ lbl_80161C18: /* 80161C4C 0015EB8C 40 82 00 24 */ bne lbl_80161C70 /* 80161C50 0015EB90 38 00 00 00 */ li r0, 0 /* 80161C54 0015EB94 90 1E 09 40 */ stw r0, 0x940(r30) -/* 80161C58 0015EB98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80161C5C 0015EB9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80161C58 0015EB98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80161C5C 0015EB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80161C60 0015EBA0 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80161C64 0015EBA4 60 00 20 00 */ ori r0, r0, 0x2000 /* 80161C68 0015EBA8 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -2365,8 +2365,8 @@ lbl_80161C94: /* 80161CB0 0015EBF0 40 82 00 24 */ bne lbl_80161CD4 /* 80161CB4 0015EBF4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80161CB8 0015EBF8 41 82 00 1C */ beq lbl_80161CD4 -/* 80161CBC 0015EBFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80161CC0 0015EC00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80161CBC 0015EBFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80161CC0 0015EC00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80161CC4 0015EC04 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80161CC8 0015EC08 60 00 10 00 */ ori r0, r0, 0x1000 /* 80161CCC 0015EC0C 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -2505,8 +2505,8 @@ dCamera_c_NS_updateMonitor: /* 80161EA0 0015EDE0 88 1F 03 8D */ lbz r0, 0x38d(r31) /* 80161EA4 0015EDE4 28 00 00 00 */ cmplwi r0, 0 /* 80161EA8 0015EDE8 41 82 00 28 */ beq lbl_80161ED0 -/* 80161EAC 0015EDEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80161EB0 0015EDF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80161EAC 0015EDEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80161EB0 0015EDF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80161EB4 0015EDF4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80161EB8 0015EDF8 38 9F 03 40 */ addi r4, r31, 0x340 /* 80161EBC 0015EDFC 38 A0 00 01 */ li r5, 1 @@ -2657,8 +2657,8 @@ dCamera_c_NS_checkForceLockTarget: /* 801620BC 0015EFFC 80 1E 01 9C */ lwz r0, 0x19c(r30) /* 801620C0 0015F000 28 00 00 00 */ cmplwi r0, 0 /* 801620C4 0015F004 41 82 01 C4 */ beq lbl_80162288 -/* 801620C8 0015F008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801620CC 0015F00C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801620C8 0015F008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801620CC 0015F00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801620D0 0015F010 3B A3 56 B8 */ addi r29, r3, 0x56b8 /* 801620D4 0015F014 3B 80 00 01 */ li r28, 1 /* 801620D8 0015F018 7F A3 EB 78 */ mr r3, r29 @@ -2808,8 +2808,8 @@ dCamera_c_NS_Run: /* 801622C8 0015F208 39 61 00 90 */ addi r11, r1, 0x90 /* 801622CC 0015F20C 48 1F FF 01 */ bl func_803621CC /* 801622D0 0015F210 7C 7F 1B 78 */ mr r31, r3 -/* 801622D4 0015F214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801622D8 0015F218 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801622D4 0015F214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801622D8 0015F218 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801622DC 0015F21C 83 84 5D B4 */ lwz r28, 0x5db4(r4) /* 801622E0 0015F220 80 AD 8A 98 */ lwz r5, lbl_80451018-_SDA_BASE_(r13) /* 801622E4 0015F224 38 60 00 00 */ li r3, 0 @@ -2823,8 +2823,8 @@ dCamera_c_NS_Run: lbl_80162304: /* 80162304 0015F244 98 7F 01 94 */ stb r3, 0x194(r31) /* 80162308 0015F248 3B 60 00 00 */ li r27, 0 -/* 8016230C 0015F24C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80162310 0015F250 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8016230C 0015F24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80162310 0015F250 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80162314 0015F254 80 7D 5D 7C */ lwz r3, 0x5d7c(r29) /* 80162318 0015F258 38 00 F7 FB */ li r0, -2053 /* 8016231C 0015F25C 7C 60 00 38 */ and r0, r3, r0 @@ -2909,8 +2909,8 @@ lbl_8016242C: lbl_80162440: /* 80162440 0015F380 7F E3 FB 78 */ mr r3, r31 /* 80162444 0015F384 4B FF F9 F1 */ bl dCamera_c_NS_updateMonitor -/* 80162448 0015F388 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016244C 0015F38C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80162448 0015F388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016244C 0015F38C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80162450 0015F390 3B 3E 56 B8 */ addi r25, r30, 0x56b8 /* 80162454 0015F394 7F 23 CB 78 */ mr r3, r25 /* 80162458 0015F398 4B F1 13 8D */ bl dAttention_c_NS_LockonTruth @@ -3087,8 +3087,8 @@ lbl_801626C8: /* 801626CC 0015F60C A0 03 00 06 */ lhz r0, 6(r3) /* 801626D0 0015F610 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 801626D4 0015F614 41 82 00 B4 */ beq lbl_80162788 -/* 801626D8 0015F618 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801626DC 0015F61C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801626D8 0015F618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801626DC 0015F61C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801626E0 0015F620 80 1F 01 7C */ lwz r0, 0x17c(r31) /* 801626E4 0015F624 54 00 20 36 */ slwi r0, r0, 4 /* 801626E8 0015F628 7C 63 02 14 */ add r3, r3, r0 @@ -3369,8 +3369,8 @@ lbl_80162AB8: /* 80162AE4 0015FA24 D0 1F 00 50 */ stfs f0, 0x50(r31) /* 80162AE8 0015FA28 48 00 00 E4 */ b lbl_80162BCC lbl_80162AEC: -/* 80162AEC 0015FA2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80162AF0 0015FA30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80162AEC 0015FA2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80162AF0 0015FA30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80162AF4 0015FA34 A8 03 4E 76 */ lha r0, 0x4e76(r3) /* 80162AF8 0015FA38 7C 00 07 35 */ extsh. r0, r0 /* 80162AFC 0015FA3C 41 82 00 80 */ beq lbl_80162B7C @@ -3386,8 +3386,8 @@ lbl_80162AEC: /* 80162B24 0015FA64 A8 01 00 0C */ lha r0, 0xc(r1) /* 80162B28 0015FA68 B0 01 00 48 */ sth r0, 0x48(r1) /* 80162B2C 0015FA6C 38 61 00 10 */ addi r3, r1, 0x10 -/* 80162B30 0015FA70 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80162B34 0015FA74 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80162B30 0015FA70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80162B34 0015FA74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80162B38 0015FA78 A8 84 4E 78 */ lha r4, 0x4e78(r4) /* 80162B3C 0015FA7C 48 10 E4 5D */ bl cSAngle_X2_ /* 80162B40 0015FA80 38 61 00 08 */ addi r3, r1, 8 @@ -3538,8 +3538,8 @@ dCamera_c_NS_NotRun: /* 80162D4C 0015FC8C 39 61 00 20 */ addi r11, r1, 0x20 /* 80162D50 0015FC90 48 1F F4 8D */ bl _savegpr_29 /* 80162D54 0015FC94 7C 7E 1B 78 */ mr r30, r3 -/* 80162D58 0015FC98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80162D5C 0015FC9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80162D58 0015FC98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80162D5C 0015FC9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80162D60 0015FCA0 80 83 5D B4 */ lwz r4, 0x5db4(r3) /* 80162D64 0015FCA4 80 AD 8A 98 */ lwz r5, lbl_80451018-_SDA_BASE_(r13) /* 80162D68 0015FCA8 38 60 00 00 */ li r3, 0 @@ -3552,8 +3552,8 @@ dCamera_c_NS_NotRun: /* 80162D84 0015FCC4 38 60 00 01 */ li r3, 1 lbl_80162D88: /* 80162D88 0015FCC8 98 7E 01 94 */ stb r3, 0x194(r30) -/* 80162D8C 0015FCCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80162D90 0015FCD0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80162D8C 0015FCCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80162D90 0015FCD0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80162D94 0015FCD4 80 7F 5D 7C */ lwz r3, 0x5d7c(r31) /* 80162D98 0015FCD8 38 00 F7 FB */ li r0, -2053 /* 80162D9C 0015FCDC 7C 60 00 38 */ and r0, r3, r0 @@ -3568,8 +3568,8 @@ lbl_80162D88: /* 80162DC0 0015FD00 80 1F 5D 7C */ lwz r0, 0x5d7c(r31) /* 80162DC4 0015FD04 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 80162DC8 0015FD08 90 1F 5D 7C */ stw r0, 0x5d7c(r31) -/* 80162DCC 0015FD0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80162DD0 0015FD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80162DCC 0015FD0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80162DD0 0015FD10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80162DD4 0015FD14 80 03 51 84 */ lwz r0, 0x5184(r3) /* 80162DD8 0015FD18 2C 00 00 00 */ cmpwi r0, 0 /* 80162DDC 0015FD1C 40 82 00 10 */ bne lbl_80162DEC @@ -3810,8 +3810,8 @@ lbl_801630F4: lbl_8016310C: /* 8016310C 0016004C 2C 00 00 02 */ cmpwi r0, 2 /* 80163110 00160050 40 82 00 38 */ bne lbl_80163148 -/* 80163114 00160054 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80163118 00160058 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80163114 00160054 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80163118 00160058 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8016311C 0016005C 38 00 00 00 */ li r0, 0 /* 80163120 00160060 88 84 4F AD */ lbz r4, 0x4fad(r4) /* 80163124 00160064 28 04 00 00 */ cmplwi r4, 0 @@ -3860,8 +3860,8 @@ dCamera_c_NS_setStageMapToolData: /* 801631AC 001600EC 90 1E 08 1C */ stw r0, 0x81c(r30) /* 801631B0 001600F0 98 7E 08 23 */ stb r3, 0x823(r30) /* 801631B4 001600F4 B0 7E 08 20 */ sth r3, 0x820(r30) -/* 801631B8 001600F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801631BC 001600FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801631B8 001600F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801631BC 001600FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801631C0 00160100 37 63 4E 20 */ addic. r27, r3, 0x4e20 /* 801631C4 00160104 41 82 01 64 */ beq lbl_80163328 /* 801631C8 00160108 7F 63 DB 78 */ mr r3, r27 @@ -4160,8 +4160,8 @@ dCamera_c_NS_nextMode: /* 801635F4 00160534 48 1F EB D9 */ bl func_803621CC /* 801635F8 00160538 7C 7A 1B 78 */ mr r26, r3 /* 801635FC 0016053C 7C 9B 23 78 */ mr r27, r4 -/* 80163600 00160540 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80163604 00160544 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80163600 00160540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80163604 00160544 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80163608 00160548 3B BE 56 B8 */ addi r29, r30, 0x56b8 /* 8016360C 0016054C 7F 7C DB 78 */ mr r28, r27 /* 80163610 00160550 38 61 00 08 */ addi r3, r1, 8 @@ -4174,8 +4174,8 @@ dCamera_c_NS_nextMode: /* 8016362C 0016056C D0 21 00 18 */ stfs f1, 0x18(r1) /* 80163630 00160570 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80163634 00160574 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80163638 00160578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016363C 0016057C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80163638 00160578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016363C 0016057C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80163640 00160580 83 E3 5D B4 */ lwz r31, 0x5db4(r3) /* 80163644 00160584 80 1E 51 84 */ lwz r0, 0x5184(r30) /* 80163648 00160588 2C 00 00 00 */ cmpwi r0, 0 @@ -4214,8 +4214,8 @@ lbl_80163688: /* 801636C4 00160604 7C 9C 23 78 */ mr r28, r4 /* 801636C8 00160608 48 00 04 C8 */ b lbl_80163B90 lbl_801636CC: -/* 801636CC 0016060C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801636D0 00160610 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801636CC 0016060C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801636D0 00160610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801636D4 00160614 3B C3 5F 18 */ addi r30, r3, 0x5f18 /* 801636D8 00160618 80 1A 01 7C */ lwz r0, 0x17c(r26) /* 801636DC 0016061C 54 00 20 36 */ slwi r0, r0, 4 @@ -4316,8 +4316,8 @@ lbl_80163810: /* 80163830 00160770 98 1A 06 10 */ stb r0, 0x610(r26) /* 80163834 00160774 48 00 03 5C */ b lbl_80163B90 lbl_80163838: -/* 80163838 00160778 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016383C 0016077C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80163838 00160778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016383C 0016077C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80163840 00160780 3B 83 5F 1C */ addi r28, r3, 0x5f1c /* 80163844 00160784 80 1A 01 7C */ lwz r0, 0x17c(r26) /* 80163848 00160788 54 04 20 36 */ slwi r4, r0, 4 @@ -4635,8 +4635,8 @@ lbl_80163C7C: /* 80163C88 00160BC8 40 80 00 20 */ bge lbl_80163CA8 /* 80163C8C 00160BCC 48 00 00 30 */ b lbl_80163CBC lbl_80163C90: -/* 80163C90 00160BD0 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80163C94 00160BD4 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80163C90 00160BD0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80163C94 00160BD4 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80163C98 00160BD8 80 06 5D 7C */ lwz r0, 0x5d7c(r6) /* 80163C9C 00160BDC 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 80163CA0 00160BE0 90 06 5D 7C */ stw r0, 0x5d7c(r6) @@ -4714,8 +4714,8 @@ dCamera_c_NS_nextType: /* 80163DA4 00160CE4 41 82 00 08 */ beq lbl_80163DAC /* 80163DA8 00160CE8 7C 7C 1B 78 */ mr r28, r3 lbl_80163DAC: -/* 80163DAC 00160CEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80163DB0 00160CF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80163DAC 00160CEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80163DB0 00160CF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80163DB4 00160CF4 83 E3 5D B4 */ lwz r31, 0x5db4(r3) /* 80163DB8 00160CF8 3B 60 00 00 */ li r27, 0 /* 80163DBC 00160CFC 3B 40 00 00 */ li r26, 0 @@ -4748,8 +4748,8 @@ lbl_80163E10: /* 80163E20 00160D60 41 82 00 08 */ beq lbl_80163E28 /* 80163E24 00160D64 3B 20 00 01 */ li r25, 1 lbl_80163E28: -/* 80163E28 00160D68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80163E2C 00160D6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80163E28 00160D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80163E2C 00160D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80163E30 00160D70 3B C3 5F 18 */ addi r30, r3, 0x5f18 /* 80163E34 00160D74 80 17 01 7C */ lwz r0, 0x17c(r23) /* 80163E38 00160D78 54 00 20 36 */ slwi r0, r0, 4 @@ -4761,8 +4761,8 @@ lbl_80163E28: /* 80163E50 00160D90 4B FF D6 A5 */ bl dCamera_c_NS_ChangeModeOK /* 80163E54 00160D94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163E58 00160D98 41 82 00 4C */ beq lbl_80163EA4 -/* 80163E5C 00160D9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80163E60 00160DA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80163E5C 00160D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80163E60 00160DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80163E64 00160DA4 3A C3 56 B8 */ addi r22, r3, 0x56b8 /* 80163E68 00160DA8 3A A0 00 01 */ li r21, 1 /* 80163E6C 00160DAC 7E C3 B3 78 */ mr r3, r22 @@ -4959,8 +4959,8 @@ lbl_801640F8: /* 8016411C 0016105C 83 A3 00 70 */ lwz r29, 0x70(r3) /* 80164120 00161060 48 00 02 10 */ b lbl_80164330 lbl_80164124: -/* 80164124 00161064 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80164128 00161068 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80164124 00161064 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80164128 00161068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016412C 0016106C 80 17 01 7C */ lwz r0, 0x17c(r23) /* 80164130 00161070 54 04 20 36 */ slwi r4, r0, 4 /* 80164134 00161074 7C 63 22 14 */ add r3, r3, r4 @@ -5013,8 +5013,8 @@ lbl_801641D8: /* 801641D8 00161118 7C 1E 20 2E */ lwzx r0, r30, r4 /* 801641DC 0016111C 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 801641E0 00161120 41 82 00 8C */ beq lbl_8016426C -/* 801641E4 00161124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801641E8 00161128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801641E4 00161124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801641E8 00161128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801641EC 0016112C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 801641F0 00161130 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 801641F4 00161134 41 82 00 14 */ beq lbl_80164208 @@ -5135,14 +5135,14 @@ lbl_80164390: /* 80164398 001612D8 4B FF D1 5D */ bl dCamera_c_NS_ChangeModeOK /* 8016439C 001612DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801643A0 001612E0 40 82 00 18 */ bne lbl_801643B8 -/* 801643A4 001612E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801643A8 001612E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801643A4 001612E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801643A8 001612E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801643AC 001612EC 80 03 59 EC */ lwz r0, 0x59ec(r3) /* 801643B0 001612F0 64 00 00 40 */ oris r0, r0, 0x40 /* 801643B4 001612F4 90 03 59 EC */ stw r0, 0x59ec(r3) lbl_801643B8: -/* 801643B8 001612F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801643BC 001612FC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801643B8 001612F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801643BC 001612FC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801643C0 00161300 80 04 51 84 */ lwz r0, 0x5184(r4) /* 801643C4 00161304 2C 00 00 00 */ cmpwi r0, 0 /* 801643C8 00161308 40 82 00 10 */ bne lbl_801643D8 @@ -5370,8 +5370,8 @@ lbl_801646FC: /* 801646FC 0016163C 38 C0 00 01 */ li r6, 1 /* 80164700 00161640 48 00 00 20 */ b lbl_80164720 lbl_80164704: -/* 80164704 00161644 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80164708 00161648 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80164704 00161644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80164708 00161648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016470C 0016164C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80164710 00161650 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 80164714 00161654 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -5431,8 +5431,8 @@ dCamera_c_NS_onRoomChange: /* 801647D4 00161714 60 00 10 00 */ ori r0, r0, 0x1000 /* 801647D8 00161718 90 03 06 0C */ stw r0, 0x60c(r3) /* 801647DC 0016171C 3B E0 00 FF */ li r31, 0xff -/* 801647E0 00161720 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801647E4 00161724 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801647E0 00161720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801647E4 00161724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801647E8 00161728 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 801647EC 0016172C 4B EB FB 99 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 801647F0 00161730 28 03 00 00 */ cmplwi r3, 0 @@ -5478,8 +5478,8 @@ dCamera_c_NS_getParamTargetActor: /* 80164878 001617B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8016487C 001617BC 7C 08 02 A6 */ mflr r0 /* 80164880 001617C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80164884 001617C4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80164888 001617C8 38 C5 61 C0 */ addi r6, r5, lbl_804061C0@l +/* 80164884 001617C4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80164888 001617C8 38 C5 61 C0 */ addi r6, r5, g_dComIfG_gameInfo@l /* 8016488C 001617CC 80 E6 5D B4 */ lwz r7, 0x5db4(r6) /* 80164890 001617D0 80 03 06 84 */ lwz r0, 0x684(r3) /* 80164894 001617D4 1C 64 00 44 */ mulli r3, r4, 0x44 @@ -5543,8 +5543,8 @@ dCamera_c_NS_GetCameraTypeFromMapToolID: /* 80164954 00161894 48 1F D8 79 */ bl func_803621CC /* 80164958 00161898 7C 7C 1B 78 */ mr r28, r3 /* 8016495C 0016189C 7C 9D 23 78 */ mr r29, r4 -/* 80164960 001618A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80164964 001618A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80164960 001618A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80164964 001618A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80164968 001618A8 3B 43 4E 20 */ addi r26, r3, 0x4e20 /* 8016496C 001618AC 2C 05 FF FF */ cmpwi r5, -1 /* 80164970 001618B0 40 82 00 38 */ bne lbl_801649A8 @@ -6133,8 +6133,8 @@ dCamera_c_NS_pointInSight: /* 8016519C 001620DC 7C 9F 23 78 */ mr r31, r4 /* 801651A0 001620E0 80 63 00 00 */ lwz r3, 0(r3) /* 801651A4 001620E4 4B EB 91 65 */ bl fopCamM_GetParam -/* 801651A8 001620E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801651AC 001620EC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801651A8 001620E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801651AC 001620EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801651B0 001620F0 1C 03 00 38 */ mulli r0, r3, 0x38 /* 801651B4 001620F4 7C 64 02 14 */ add r3, r4, r0 /* 801651B8 001620F8 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -6198,8 +6198,8 @@ dCamera_c_NS_radiusActorInSight: /* 80165290 001621D0 FF 60 10 90 */ fmr f27, f2 /* 80165294 001621D4 80 63 00 00 */ lwz r3, 0(r3) /* 80165298 001621D8 4B EB 90 71 */ bl fopCamM_GetParam -/* 8016529C 001621DC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801652A0 001621E0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8016529C 001621DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801652A0 001621E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801652A4 001621E4 1C 03 00 38 */ mulli r0, r3, 0x38 /* 801652A8 001621E8 7C 64 02 14 */ add r3, r4, r0 /* 801652AC 001621EC 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -6579,8 +6579,8 @@ dCamera_c_NS_groundHeight: /* 80165814 00162754 38 61 00 5C */ addi r3, r1, 0x5c /* 80165818 00162758 7F C4 F3 78 */ mr r4, r30 /* 8016581C 0016275C 48 10 25 0D */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 80165820 00162760 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80165824 00162764 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80165820 00162760 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80165824 00162764 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165828 00162768 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8016582C 0016276C 7F E3 FB 78 */ mr r3, r31 /* 80165830 00162770 38 81 00 5C */ addi r4, r1, 0x5c @@ -6696,8 +6696,8 @@ lbl_801659A8: /* 801659AC 001628EC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 801659B0 001628F0 90 1F 00 6C */ stw r0, 0x6c(r31) lbl_801659B4: -/* 801659B4 001628F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801659B8 001628F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801659B4 001628F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801659B8 001628F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801659BC 001628FC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801659C0 00162900 7F E4 FB 78 */ mr r4, r31 /* 801659C4 00162904 4B F0 E9 F1 */ bl cBgS_NS_LineCross @@ -6740,8 +6740,8 @@ dCamera_c_NS_lineBGCheck_X1_: /* 80165A44 00162984 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80165A48 00162988 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80165A4C 0016298C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80165A50 00162990 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80165A54 00162994 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80165A50 00162990 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80165A54 00162994 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165A58 00162998 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80165A5C 0016299C 38 81 00 3C */ addi r4, r1, 0x3c /* 80165A60 001629A0 38 A1 00 14 */ addi r5, r1, 0x14 @@ -6824,8 +6824,8 @@ dCamera_c_NS_lineCollisionCheckBush: /* 80165B74 00162AB4 7C 9C 23 78 */ mr r28, r4 /* 80165B78 00162AB8 7C BD 2B 78 */ mr r29, r5 /* 80165B7C 00162ABC 3B C0 00 00 */ li r30, 0 -/* 80165B80 00162AC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80165B84 00162AC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80165B80 00162AC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80165B84 00162AC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165B88 00162AC8 3B E3 4B 88 */ addi r31, r3, 0x4b88 /* 80165B8C 00162ACC 7F E3 FB 78 */ mr r3, r31 /* 80165B90 00162AD0 4B F2 03 21 */ bl dCcMassS_Mng_NS_GetResultCam @@ -6971,8 +6971,8 @@ dCamera_c_NS_compWallMargin: /* 80165D94 00162CD4 48 10 98 D1 */ bl cM3dGSph_NS_Set /* 80165D98 00162CD8 D3 E1 00 2C */ stfs f31, 0x2c(r1) /* 80165D9C 00162CDC 3B 00 00 00 */ li r24, 0 -/* 80165DA0 00162CE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80165DA4 00162CE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80165DA0 00162CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80165DA4 00162CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165DA8 00162CE8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80165DAC 00162CEC 3B C1 00 08 */ addi r30, r1, 8 lbl_80165DB0: @@ -7141,8 +7141,8 @@ dCamera_c_NS_setView: /* 80165FF0 00162F30 FF E0 20 90 */ fmr f31, f4 /* 80165FF4 00162F34 80 63 00 00 */ lwz r3, 0(r3) /* 80165FF8 00162F38 4B EB 83 11 */ bl fopCamM_GetParam -/* 80165FFC 00162F3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80166000 00162F40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80165FFC 00162F3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80166000 00162F40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80166004 00162F44 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80166008 00162F48 7C 64 02 14 */ add r3, r4, r0 /* 8016600C 00162F4C 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -8032,8 +8032,8 @@ lbl_80166C50: /* 80166CEC 00163C2C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80166CF0 00163C30 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80166CF4 00163C34 90 01 04 1C */ stw r0, 0x41c(r1) -/* 80166CF8 00163C38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80166CFC 00163C3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80166CF8 00163C38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80166CFC 00163C3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80166D00 00163C40 3B 43 0F 38 */ addi r26, r3, 0xf38 /* 80166D04 00163C44 7F 43 D3 78 */ mr r3, r26 /* 80166D08 00163C48 38 81 05 68 */ addi r4, r1, 0x568 @@ -8742,8 +8742,8 @@ lbl_80167740: /* 80167750 00164690 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 80167754 00164694 41 82 01 E8 */ beq lbl_8016793C /* 80167758 00164698 3A C0 00 00 */ li r22, 0 -/* 8016775C 0016469C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80167760 001646A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8016775C 0016469C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80167760 001646A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167764 001646A4 3B 43 23 3C */ addi r26, r3, 0x233c /* 80167768 001646A8 3B 61 03 E4 */ addi r27, r1, 0x3e4 lbl_8016776C: @@ -8878,8 +8878,8 @@ lbl_8016793C: /* 8016794C 0016488C 38 61 04 20 */ addi r3, r1, 0x420 /* 80167950 00164890 38 81 03 94 */ addi r4, r1, 0x394 /* 80167954 00164894 48 10 03 D5 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 80167958 00164898 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016795C 0016489C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80167958 00164898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016795C 0016489C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167960 001648A0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80167964 001648A4 38 81 04 20 */ addi r4, r1, 0x420 /* 80167968 001648A8 4B F0 CB 39 */ bl cBgS_NS_GroundCross @@ -8936,8 +8936,8 @@ lbl_80167A14: /* 80167A2C 0016496C 4B FF E1 35 */ bl dCamera_c_NS_lineCollisionCheckBush /* 80167A30 00164970 54 60 07 7D */ rlwinm. r0, r3, 0, 0x1d, 0x1e /* 80167A34 00164974 41 82 00 44 */ beq lbl_80167A78 -/* 80167A38 00164978 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80167A3C 0016497C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80167A38 00164978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80167A3C 0016497C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167A40 00164980 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 80167A44 00164984 38 81 02 BC */ addi r4, r1, 0x2bc /* 80167A48 00164988 4B F1 E4 71 */ bl dCcMassS_Mng_NS_GetCamTopPos @@ -9177,8 +9177,8 @@ dCamera_c_NS_jutOutCheck: /* 80167D90 00164CD0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80167D94 00164CD4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80167D98 00164CD8 90 01 00 60 */ stw r0, 0x60(r1) -/* 80167D9C 00164CDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80167DA0 00164CE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80167D9C 00164CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80167DA0 00164CE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167DA4 00164CE4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80167DA8 00164CE8 38 81 00 78 */ addi r4, r1, 0x78 /* 80167DAC 00164CEC 38 A1 00 50 */ addi r5, r1, 0x50 @@ -9297,8 +9297,8 @@ dCamera_c_NS_getWaterSurfaceHeight: /* 80167F4C 00164E8C D0 01 00 A8 */ stfs f0, 0xa8(r1) /* 80167F50 00164E90 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80167F54 00164E94 D0 01 00 AC */ stfs f0, 0xac(r1) -/* 80167F58 00164E98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80167F5C 00164E9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80167F58 00164E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80167F5C 00164E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167F60 00164EA0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80167F64 00164EA4 7F E3 FB 78 */ mr r3, r31 /* 80167F68 00164EA8 38 81 00 68 */ addi r4, r1, 0x68 @@ -9358,8 +9358,8 @@ dCamera_c_NS_checkGroundInfo: /* 8016802C 00164F6C D0 01 00 84 */ stfs f0, 0x84(r1) /* 80168030 00164F70 C0 01 00 64 */ lfs f0, 0x64(r1) /* 80168034 00164F74 D0 01 00 88 */ stfs f0, 0x88(r1) -/* 80168038 00164F78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016803C 00164F7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80168038 00164F78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016803C 00164F7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80168040 00164F80 3B C3 5F 18 */ addi r30, r3, 0x5f18 /* 80168044 00164F84 80 1C 01 7C */ lwz r0, 0x17c(r28) /* 80168048 00164F88 54 00 20 36 */ slwi r0, r0, 4 @@ -9403,8 +9403,8 @@ lbl_80168098: /* 801680DC 0016501C D0 01 01 20 */ stfs f0, 0x120(r1) /* 801680E0 00165020 C0 01 00 7C */ lfs f0, 0x7c(r1) /* 801680E4 00165024 D0 01 01 24 */ stfs f0, 0x124(r1) -/* 801680E8 00165028 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801680EC 0016502C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801680E8 00165028 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801680EC 0016502C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801680F0 00165030 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801680F4 00165034 7F E3 FB 78 */ mr r3, r31 /* 801680F8 00165038 38 81 00 E0 */ addi r4, r1, 0xe0 @@ -9544,8 +9544,8 @@ lbl_80168284: /* 80168308 00165248 EC 01 00 2A */ fadds f0, f1, f0 /* 8016830C 0016524C FC 02 00 40 */ fcmpo cr0, f2, f0 /* 80168310 00165250 40 80 00 24 */ bge lbl_80168334 -/* 80168314 00165254 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80168318 00165258 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80168314 00165254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80168318 00165258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016831C 0016525C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80168320 00165260 60 00 08 00 */ ori r0, r0, 0x800 /* 80168324 00165264 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -9609,8 +9609,8 @@ lbl_801683F8: /* 801683FC 0016533C 98 1C 03 D0 */ stb r0, 0x3d0(r28) /* 80168400 00165340 48 00 00 C4 */ b lbl_801684C4 lbl_80168404: -/* 80168404 00165344 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80168408 00165348 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80168404 00165344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80168408 00165348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016840C 0016534C 80 1C 01 7C */ lwz r0, 0x17c(r28) /* 80168410 00165350 54 00 20 36 */ slwi r0, r0, 4 /* 80168414 00165354 7C 63 02 14 */ add r3, r3, r0 @@ -13924,8 +13924,8 @@ mDoCPd_c_NS_getHoldA: .global _unnamed_d_camera_cpp__NS_check_owner_action1 _unnamed_d_camera_cpp__NS_check_owner_action1: -/* 8016C330 00169270 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8016C334 00169274 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8016C330 00169270 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8016C334 00169274 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8016C338 00169278 54 60 20 36 */ slwi r0, r3, 4 /* 8016C33C 0016927C 7C 65 02 14 */ add r3, r5, r0 /* 8016C340 00169280 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -13934,8 +13934,8 @@ _unnamed_d_camera_cpp__NS_check_owner_action1: .global _unnamed_d_camera_cpp__NS_isPlayerCharging _unnamed_d_camera_cpp__NS_isPlayerCharging: -/* 8016C34C 0016928C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8016C350 00169290 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8016C34C 0016928C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8016C350 00169290 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8016C354 00169294 54 60 20 36 */ slwi r0, r3, 4 /* 8016C358 00169298 7C 64 02 14 */ add r3, r4, r0 /* 8016C35C 0016929C 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -13944,8 +13944,8 @@ _unnamed_d_camera_cpp__NS_isPlayerCharging: .global _unnamed_d_camera_cpp__NS_check_owner_action _unnamed_d_camera_cpp__NS_check_owner_action: -/* 8016C368 001692A8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8016C36C 001692AC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8016C368 001692A8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8016C36C 001692AC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8016C370 001692B0 54 60 20 36 */ slwi r0, r3, 4 /* 8016C374 001692B4 7C 65 02 14 */ add r3, r5, r0 /* 8016C378 001692B8 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -14362,8 +14362,8 @@ lbl_8016C990: /* 8016C990 001698D0 88 1E 03 8D */ lbz r0, 0x38d(r30) /* 8016C994 001698D4 28 00 00 00 */ cmplwi r0, 0 /* 8016C998 001698D8 41 82 00 28 */ beq lbl_8016C9C0 -/* 8016C99C 001698DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016C9A0 001698E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8016C99C 001698DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016C9A0 001698E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016C9A4 001698E4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8016C9A8 001698E8 38 9E 03 40 */ addi r4, r30, 0x340 /* 8016C9AC 001698EC 38 A0 00 01 */ li r5, 1 @@ -15222,8 +15222,8 @@ lbl_8016D62C: /* 8016D630 0016A570 41 82 00 8C */ beq lbl_8016D6BC /* 8016D634 0016A574 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 8016D638 0016A578 4B FD 3B B9 */ bl cM3dGPla -/* 8016D63C 0016A57C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016D640 0016A580 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8016D63C 0016A57C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016D640 0016A580 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016D644 0016A584 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8016D648 0016A588 38 81 03 68 */ addi r4, r1, 0x368 /* 8016D64C 0016A58C 38 A1 02 D0 */ addi r5, r1, 0x2d0 @@ -16173,8 +16173,8 @@ lbl_8016E440: .global dCamera_c_NS_getMsgCmdSpeaker dCamera_c_NS_getMsgCmdSpeaker: -/* 8016E448 0016B388 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016E44C 0016B38C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8016E448 0016B388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016E44C 0016B38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016E450 0016B390 38 83 5E E8 */ addi r4, r3, 0x5ee8 /* 8016E454 0016B394 38 60 00 00 */ li r3, 0 /* 8016E458 0016B398 80 A4 00 04 */ lwz r5, 4(r4) @@ -16200,8 +16200,8 @@ lbl_8016E47C: .global dCamera_c_NS_getMsgCmdCut dCamera_c_NS_getMsgCmdCut: -/* 8016E4A4 0016B3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8016E4A8 0016B3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8016E4A4 0016B3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8016E4A8 0016B3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016E4AC 0016B3EC 80 03 5E EC */ lwz r0, 0x5eec(r3) /* 8016E4B0 0016B3F0 2C 00 00 01 */ cmpwi r0, 1 /* 8016E4B4 0016B3F4 41 80 00 0C */ blt lbl_8016E4C0 @@ -23204,8 +23204,8 @@ _unnamed_d_camera_cpp__NS_lineCollisionCheck: /* 80174E64 00171DA4 7C A9 2B 78 */ mr r9, r5 /* 80174E68 00171DA8 7C C0 33 78 */ mr r0, r6 /* 80174E6C 00171DAC 7C E8 3B 78 */ mr r8, r7 -/* 80174E70 00171DB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80174E74 00171DB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80174E70 00171DB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80174E74 00171DB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80174E78 00171DB8 38 63 23 3C */ addi r3, r3, 0x233c /* 80174E7C 00171DBC 7D 64 5B 78 */ mr r4, r11 /* 80174E80 00171DC0 7D 45 53 78 */ mr r5, r10 @@ -23667,8 +23667,8 @@ lbl_80175508: /* 80175544 00172484 40 82 00 20 */ bne lbl_80175564 /* 80175548 00172488 38 00 00 00 */ li r0, 0 /* 8017554C 0017248C 90 1F 09 40 */ stw r0, 0x940(r31) -/* 80175550 00172490 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80175554 00172494 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80175550 00172490 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80175554 00172494 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80175558 00172498 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 8017555C 0017249C 60 00 20 00 */ ori r0, r0, 0x2000 /* 80175560 001724A0 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -23810,8 +23810,8 @@ lbl_80175744: /* 80175744 00172684 80 1F 01 A4 */ lwz r0, 0x1a4(r31) /* 80175748 00172688 2C 00 00 04 */ cmpwi r0, 4 /* 8017574C 0017268C 40 82 00 20 */ bne lbl_8017576C -/* 80175750 00172690 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80175754 00172694 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80175750 00172690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80175754 00172694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80175758 00172698 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 8017575C 0017269C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80175760 001726A0 41 82 00 0C */ beq lbl_8017576C @@ -23969,8 +23969,8 @@ lbl_80175924: /* 80175998 001728D8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8017599C 001728DC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 801759A0 001728E0 90 01 03 00 */ stw r0, 0x300(r1) -/* 801759A4 001728E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801759A8 001728E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801759A4 001728E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801759A8 001728E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801759AC 001728EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801759B0 001728F0 38 81 03 18 */ addi r4, r1, 0x318 /* 801759B4 001728F4 38 A1 02 F0 */ addi r5, r1, 0x2f0 @@ -24358,8 +24358,8 @@ lbl_80175F3C: /* 80175F6C 00172EAC EC 11 00 32 */ fmuls f0, f17, f0 /* 80175F70 00172EB0 EC 01 00 2A */ fadds f0, f1, f0 /* 80175F74 00172EB4 D0 1F 00 80 */ stfs f0, 0x80(r31) -/* 80175F78 00172EB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80175F7C 00172EBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80175F78 00172EB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80175F7C 00172EBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80175F80 00172EC0 D2 63 5D 80 */ stfs f19, 0x5d80(r3) /* 80175F84 00172EC4 EC 12 A0 28 */ fsubs f0, f18, f20 /* 80175F88 00172EC8 FC 00 02 10 */ fabs f0, f0 @@ -24374,8 +24374,8 @@ lbl_80175F3C: /* 80175FAC 00172EEC 4B FF 63 BD */ bl _unnamed_d_camera_cpp__NS_check_owner_action /* 80175FB0 00172EF0 28 03 00 00 */ cmplwi r3, 0 /* 80175FB4 00172EF4 41 82 00 20 */ beq lbl_80175FD4 -/* 80175FB8 00172EF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80175FBC 00172EFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80175FB8 00172EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80175FBC 00172EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80175FC0 00172F00 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80175FC4 00172F04 60 00 00 08 */ ori r0, r0, 8 /* 80175FC8 00172F08 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -26207,8 +26207,8 @@ lbl_80177B30: /* 80177B3C 00174A7C 88 18 03 8D */ lbz r0, 0x38d(r24) /* 80177B40 00174A80 28 00 00 00 */ cmplwi r0, 0 /* 80177B44 00174A84 41 82 00 28 */ beq lbl_80177B6C -/* 80177B48 00174A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80177B4C 00174A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80177B48 00174A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80177B4C 00174A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80177B50 00174A90 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80177B54 00174A94 38 98 03 40 */ addi r4, r24, 0x340 /* 80177B58 00174A98 38 A0 00 01 */ li r5, 1 @@ -26291,8 +26291,8 @@ lbl_80177B6C: /* 80177C88 00174BC8 41 82 00 50 */ beq lbl_80177CD8 /* 80177C8C 00174BCC 38 61 03 8C */ addi r3, r1, 0x38c /* 80177C90 00174BD0 4B FC 95 61 */ bl cM3dGPla -/* 80177C94 00174BD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80177C98 00174BD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80177C94 00174BD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80177C98 00174BD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80177C9C 00174BDC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80177CA0 00174BE0 38 81 03 B4 */ addi r4, r1, 0x3b4 /* 80177CA4 00174BE4 38 A1 03 8C */ addi r5, r1, 0x38c @@ -27589,8 +27589,8 @@ lbl_80178DA8: /* 80179024 00175F64 D0 01 01 74 */ stfs f0, 0x174(r1) /* 80179028 00175F68 C0 01 00 D0 */ lfs f0, 0xd0(r1) /* 8017902C 00175F6C D0 01 01 78 */ stfs f0, 0x178(r1) -/* 80179030 00175F70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80179034 00175F74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80179030 00175F70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80179034 00175F74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80179038 00175F78 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8017903C 00175F7C C0 03 37 EC */ lfs f0, 0x37ec(r3) /* 80179040 00175F80 D0 01 01 64 */ stfs f0, 0x164(r1) @@ -27833,8 +27833,8 @@ lbl_80179370: /* 801793A8 001762E8 88 1A 03 8D */ lbz r0, 0x38d(r26) /* 801793AC 001762EC 28 00 00 00 */ cmplwi r0, 0 /* 801793B0 001762F0 41 82 00 48 */ beq lbl_801793F8 -/* 801793B4 001762F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801793B8 001762F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801793B4 001762F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801793B8 001762F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801793BC 001762FC 3B 63 0F 38 */ addi r27, r3, 0xf38 /* 801793C0 00176300 7F 63 DB 78 */ mr r3, r27 /* 801793C4 00176304 38 9A 03 40 */ addi r4, r26, 0x340 @@ -31163,8 +31163,8 @@ lbl_8017C4C4: /* 8017C53C 0017947C 41 82 00 50 */ beq lbl_8017C58C /* 8017C540 00179480 38 61 04 7C */ addi r3, r1, 0x47c /* 8017C544 00179484 4B FC 4C AD */ bl cM3dGPla -/* 8017C548 00179488 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017C54C 0017948C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017C548 00179488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017C54C 0017948C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017C550 00179490 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8017C554 00179494 38 81 04 A4 */ addi r4, r1, 0x4a4 /* 8017C558 00179498 38 A1 04 7C */ addi r5, r1, 0x47c @@ -32776,8 +32776,8 @@ lbl_8017DD80: /* 8017DD88 0017ACC8 FC 40 F8 90 */ fmr f2, f31 /* 8017DD8C 0017ACCC 4B F0 A3 B1 */ bl dCamMath_NS_rationalBezierRatio lbl_8017DD90: -/* 8017DD90 0017ACD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017DD94 0017ACD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017DD90 0017ACD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017DD94 0017ACD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017DD98 0017ACD8 88 03 01 EA */ lbz r0, 0x1ea(r3) /* 8017DD9C 0017ACDC 28 00 00 00 */ cmplwi r0, 0 /* 8017DDA0 0017ACE0 41 82 00 08 */ beq lbl_8017DDA8 @@ -33139,8 +33139,8 @@ lbl_8017E2BC: /* 8017E2E4 0017B224 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8017E2E8 0017B228 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8017E2EC 0017B22C 90 01 01 48 */ stw r0, 0x148(r1) -/* 8017E2F0 0017B230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017E2F4 0017B234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017E2F0 0017B230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017E2F4 0017B234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017E2F8 0017B238 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8017E2FC 0017B23C 38 81 01 7C */ addi r4, r1, 0x17c /* 8017E300 0017B240 38 A1 01 38 */ addi r5, r1, 0x138 @@ -34829,8 +34829,8 @@ lbl_8017FBC4: /* 8017FBC4 0017CB04 80 1D 06 0C */ lwz r0, 0x60c(r29) /* 8017FBC8 0017CB08 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 8017FBCC 0017CB0C 40 82 01 98 */ bne lbl_8017FD64 -/* 8017FBD0 0017CB10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017FBD4 0017CB14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017FBD0 0017CB10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017FBD4 0017CB14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017FBD8 0017CB18 3B C3 4F F8 */ addi r30, r3, 0x4ff8 /* 8017FBDC 0017CB1C 80 03 51 84 */ lwz r0, 0x5184(r3) /* 8017FBE0 0017CB20 2C 00 00 00 */ cmpwi r0, 0 @@ -35008,8 +35008,8 @@ lbl_8017FE34: /* 8017FE60 0017CDA0 38 00 00 00 */ li r0, 0 /* 8017FE64 0017CDA4 98 1D 04 E8 */ stb r0, 0x4e8(r29) /* 8017FE68 0017CDA8 90 1D 05 D4 */ stw r0, 0x5d4(r29) -/* 8017FE6C 0017CDAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017FE70 0017CDB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017FE6C 0017CDAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017FE70 0017CDB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017FE74 0017CDB4 88 03 4F B3 */ lbz r0, 0x4fb3(r3) /* 8017FE78 0017CDB8 2C 00 FF FF */ cmpwi r0, -1 /* 8017FE7C 0017CDBC 41 82 00 10 */ beq lbl_8017FE8C @@ -35071,8 +35071,8 @@ lbl_8017FF30: /* 8017FF38 0017CE78 2C 1F 00 22 */ cmpwi r31, 0x22 /* 8017FF3C 0017CE7C 41 80 00 20 */ blt lbl_8017FF5C lbl_8017FF40: -/* 8017FF40 0017CE80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8017FF44 0017CE84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8017FF40 0017CE80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8017FF44 0017CE84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017FF48 0017CE88 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8017FF4C 0017CE8C 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 8017FF50 0017CE90 4B EC 82 2D */ bl dEvent_manager_c_NS_cutEnd @@ -35309,8 +35309,8 @@ lbl_8018026C: /* 80180294 0017D1D4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80180298 0017D1D8 2C 00 00 00 */ cmpwi r0, 0 /* 8018029C 0017D1DC 41 82 00 20 */ beq lbl_801802BC -/* 801802A0 0017D1E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801802A4 0017D1E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801802A0 0017D1E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801802A4 0017D1E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801802A8 0017D1E8 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 801802AC 0017D1EC 60 00 00 02 */ ori r0, r0, 2 /* 801802B0 0017D1F0 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -35327,15 +35327,15 @@ lbl_801802BC: /* 801802D8 0017D218 88 1D 01 58 */ lbz r0, 0x158(r29) /* 801802DC 0017D21C 28 00 00 00 */ cmplwi r0, 0 /* 801802E0 0017D220 41 82 00 1C */ beq lbl_801802FC -/* 801802E4 0017D224 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801802E8 0017D228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801802E4 0017D224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801802E8 0017D228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801802EC 0017D22C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 801802F0 0017D230 60 00 00 04 */ ori r0, r0, 4 /* 801802F4 0017D234 90 03 5D 7C */ stw r0, 0x5d7c(r3) /* 801802F8 0017D238 48 00 00 18 */ b lbl_80180310 lbl_801802FC: -/* 801802FC 0017D23C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80180300 0017D240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801802FC 0017D23C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80180300 0017D240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80180304 0017D244 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80180308 0017D248 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8018030C 0017D24C 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -35394,8 +35394,8 @@ lbl_80180394: /* 801803BC 0017D2FC 41 82 00 88 */ beq lbl_80180444 /* 801803C0 0017D300 38 00 00 01 */ li r0, 1 /* 801803C4 0017D304 98 1D 01 58 */ stb r0, 0x158(r29) -/* 801803C8 0017D308 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801803CC 0017D30C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801803C8 0017D308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801803CC 0017D30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801803D0 0017D310 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801803D4 0017D314 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 801803D8 0017D318 4B EC 7D A5 */ bl dEvent_manager_c_NS_cutEnd @@ -35721,8 +35721,8 @@ lbl_80180788: /* 80180870 0017D7B0 4B FE 50 51 */ bl dCamera_c_NS_lineBGCheck /* 80180874 0017D7B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80180878 0017D7B8 41 82 00 54 */ beq lbl_801808CC -/* 8018087C 0017D7BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80180880 0017D7C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018087C 0017D7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80180880 0017D7C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80180884 0017D7C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80180888 0017D7C8 38 81 00 C0 */ addi r4, r1, 0xc0 /* 8018088C 0017D7CC 38 A1 00 98 */ addi r5, r1, 0x98 @@ -35771,8 +35771,8 @@ lbl_801808CC: /* 80180934 0017D874 4B FE 4F 8D */ bl dCamera_c_NS_lineBGCheck /* 80180938 0017D878 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018093C 0017D87C 41 82 00 54 */ beq lbl_80180990 -/* 80180940 0017D880 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80180944 0017D884 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80180940 0017D880 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80180944 0017D884 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80180948 0017D888 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8018094C 0017D88C 38 81 00 C0 */ addi r4, r1, 0xc0 /* 80180950 0017D890 38 A1 00 98 */ addi r5, r1, 0x98 @@ -36440,8 +36440,8 @@ dCamera_c_NS_blureCamera: /* 801812B4 0017E1F4 41 82 00 8C */ beq lbl_80181340 /* 801812B8 0017E1F8 80 7F 00 00 */ lwz r3, 0(r31) /* 801812BC 0017E1FC 4B E9 D0 4D */ bl fopCamM_GetParam -/* 801812C0 0017E200 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801812C4 0017E204 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801812C0 0017E200 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801812C4 0017E204 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801812C8 0017E208 1C 03 00 38 */ mulli r0, r3, 0x38 /* 801812CC 0017E20C 7C 64 02 14 */ add r3, r4, r0 /* 801812D0 0017E210 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -36572,8 +36572,8 @@ dCamera_c_NS_onHorseDush: /* 801814AC 0017E3EC C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) /* 801814B0 0017E3F0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 801814B4 0017E3F4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 801814B8 0017E3F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801814BC 0017E3FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801814B8 0017E3F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801814BC 0017E3FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801814C0 0017E400 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 801814C4 0017E404 38 80 00 02 */ li r4, 2 /* 801814C8 0017E408 38 A0 00 01 */ li r5, 1 @@ -36686,8 +36686,8 @@ lbl_80181628: .global dCam_getCamera dCam_getCamera: -/* 80181630 0017E570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80181634 0017E574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80181630 0017E570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80181634 0017E574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80181638 0017E578 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8018163C 0017E57C 4E 80 00 20 */ blr @@ -36712,8 +36712,8 @@ preparation: /* 80181674 0017E5B4 93 C1 00 08 */ stw r30, 8(r1) /* 80181678 0017E5B8 7C 7E 1B 78 */ mr r30, r3 /* 8018167C 0017E5BC 4B E9 CC 8D */ bl fopCamM_GetParam -/* 80181680 0017E5C0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80181684 0017E5C4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80181680 0017E5C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80181684 0017E5C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80181688 0017E5C8 1F E3 00 38 */ mulli r31, r3, 0x38 /* 8018168C 0017E5CC 7C 64 FA 14 */ add r3, r4, r31 /* 80181690 0017E5D0 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -36732,8 +36732,8 @@ preparation: /* 801816C4 0017E604 4B F1 C1 B9 */ bl daAlink_c_NS_getE3Zhint /* 801816C8 0017E608 2C 03 00 00 */ cmpwi r3, 0 /* 801816CC 0017E60C 40 82 00 24 */ bne lbl_801816F0 -/* 801816D0 0017E610 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801816D4 0017E614 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 801816D0 0017E610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801816D4 0017E614 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 801816D8 0017E618 7C A0 FA 14 */ add r5, r0, r31 /* 801816DC 0017E61C 80 85 5D 7C */ lwz r4, 0x5d7c(r5) /* 801816E0 0017E620 3C 60 FF FF */ lis r3, 0xFFFEFFD4@ha @@ -36757,8 +36757,8 @@ view_setup: /* 80181718 0017E658 48 1E 0A C5 */ bl _savegpr_29 /* 8018171C 0017E65C 7C 7D 1B 78 */ mr r29, r3 /* 80181720 0017E660 4B E9 CB E9 */ bl fopCamM_GetParam -/* 80181724 0017E664 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80181728 0017E668 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80181724 0017E664 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80181728 0017E668 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8018172C 0017E66C 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80181730 0017E670 7C 64 02 14 */ add r3, r4, r0 /* 80181734 0017E674 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -36780,8 +36780,8 @@ view_setup: /* 80181774 0017E6B4 D0 1D 01 EC */ stfs f0, 0x1ec(r29) /* 80181778 0017E6B8 D0 1D 01 FC */ stfs f0, 0x1fc(r29) /* 8018177C 0017E6BC D0 1D 02 0C */ stfs f0, 0x20c(r29) -/* 80181780 0017E6C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80181784 0017E6C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80181780 0017E6C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80181784 0017E6C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80181788 0017E6C8 93 E3 61 A8 */ stw r31, 0x61a8(r3) /* 8018178C 0017E6CC 93 E3 61 AC */ stw r31, 0x61ac(r3) /* 80181790 0017E6D0 93 A3 61 B0 */ stw r29, 0x61b0(r3) @@ -36829,8 +36829,8 @@ store: /* 80181824 0017E764 3B 5B 02 48 */ addi r26, r27, 0x248 /* 80181828 0017E768 4B E9 CA E1 */ bl fopCamM_GetParam /* 8018182C 0017E76C 1F A3 00 38 */ mulli r29, r3, 0x38 -/* 80181830 0017E770 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80181834 0017E774 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80181830 0017E770 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80181834 0017E774 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80181838 0017E778 3B 80 00 00 */ li r28, 0 /* 8018183C 0017E77C C0 1B 00 E4 */ lfs f0, 0xe4(r27) /* 80181840 0017E780 D0 01 00 80 */ stfs f0, 0x80(r1) @@ -37218,8 +37218,8 @@ lbl_80181D08: /* 80181D5C 0017EC9C D3 FB 00 D0 */ stfs f31, 0xd0(r27) lbl_80181D60: /* 80181D60 0017ECA0 3B 5E 4E 20 */ addi r26, r30, 0x4e20 -/* 80181D64 0017ECA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80181D68 0017ECA8 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 80181D64 0017ECA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80181D68 0017ECA8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 80181D6C 0017ECAC 7C 60 EA 14 */ add r3, r0, r29 /* 80181D70 0017ECB0 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80181D74 0017ECB4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -37338,8 +37338,8 @@ dCamera_c_NS_Center: /* 80181F04 0017EE44 C0 82 9C FC */ lfs f4, lbl_804536FC-_SDA2_BASE_(r2) /* 80181F08 0017EE48 4B FE 40 AD */ bl dCamera_c_NS_setView lbl_80181F0C: -/* 80181F0C 0017EE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80181F10 0017EE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80181F0C 0017EE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80181F10 0017EE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80181F14 0017EE54 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80181F18 0017EE58 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 /* 80181F1C 0017EE5C 90 03 5D 7C */ stw r0, 0x5d7c(r3) @@ -37376,8 +37376,8 @@ lbl_80181F40: /* 80181F90 0017EED0 7F BB EB 78 */ mr r27, r29 /* 80181F94 0017EED4 3B DD 02 48 */ addi r30, r29, 0x248 /* 80181F98 0017EED8 4B E9 C3 71 */ bl fopCamM_GetParam -/* 80181F9C 0017EEDC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80181FA0 0017EEE0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80181F9C 0017EEDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80181FA0 0017EEE0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80181FA4 0017EEE4 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80181FA8 0017EEE8 7C 64 02 14 */ add r3, r4, r0 /* 80181FAC 0017EEEC 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -37437,8 +37437,8 @@ lbl_80181F40: /* 80182084 0017EFC4 38 DD 00 E4 */ addi r6, r29, 0xe4 /* 80182088 0017EFC8 C0 3D 00 D0 */ lfs f1, 0xd0(r29) /* 8018208C 0017EFCC C0 5D 00 D4 */ lfs f2, 0xd4(r29) -/* 80182090 0017EFD0 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80182094 0017EFD4 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80182090 0017EFD0 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80182094 0017EFD4 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80182098 0017EFD8 80 07 5D 7C */ lwz r0, 0x5d7c(r7) /* 8018209C 0017EFDC 54 07 CF FE */ rlwinm r7, r0, 0x19, 0x1f, 0x1f /* 801820A0 0017EFE0 7F 68 DB 78 */ mr r8, r27 @@ -37531,8 +37531,8 @@ lbl_8018217C: /* 801821EC 0017F12C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801821F0 0017F130 7C 7F 1B 78 */ mr r31, r3 /* 801821F4 0017F134 4B E9 C1 15 */ bl fopCamM_GetParam -/* 801821F8 0017F138 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801821FC 0017F13C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801821F8 0017F138 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801821FC 0017F13C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80182200 0017F140 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80182204 0017F144 7C 64 02 14 */ add r3, r4, r0 /* 80182208 0017F148 93 E3 5D 74 */ stw r31, 0x5d74(r3) @@ -37572,8 +37572,8 @@ lbl_8018217C: /* 80182290 0017F1D0 90 1F 02 38 */ stw r0, 0x238(r31) /* 80182294 0017F1D4 7F E3 FB 78 */ mr r3, r31 /* 80182298 0017F1D8 4B E9 C0 71 */ bl fopCamM_GetParam -/* 8018229C 0017F1DC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801822A0 0017F1E0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8018229C 0017F1DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801822A0 0017F1E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801822A4 0017F1E4 1C 03 00 38 */ mulli r0, r3, 0x38 /* 801822A8 0017F1E8 7C 64 02 14 */ add r3, r4, r0 /* 801822AC 0017F1EC 88 03 5D 79 */ lbz r0, 0x5d79(r3) @@ -37601,8 +37601,8 @@ lbl_801822D4: /* 80182300 0017F240 38 61 00 14 */ addi r3, r1, 0x14 /* 80182304 0017F244 38 81 00 08 */ addi r4, r1, 8 /* 80182308 0017F248 48 0E 5A 21 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8018230C 0017F24C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80182310 0017F250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018230C 0017F24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80182310 0017F250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182314 0017F254 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80182318 0017F258 7F A3 EB 78 */ mr r3, r29 /* 8018231C 0017F25C 38 81 00 14 */ addi r4, r1, 0x14 @@ -37619,8 +37619,8 @@ lbl_80182344: /* 80182344 0017F284 7F 83 E3 78 */ mr r3, r28 /* 80182348 0017F288 4B E9 75 7D */ bl fopAcM_setStageLayer /* 8018234C 0017F28C 38 00 00 01 */ li r0, 1 -/* 80182350 0017F290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80182354 0017F294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80182350 0017F290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80182354 0017F294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182358 0017F298 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 8018235C 0017F29C 28 1E 00 00 */ cmplwi r30, 0 /* 80182360 0017F2A0 41 82 00 10 */ beq lbl_80182370 @@ -37706,8 +37706,8 @@ lbl_80182434: /* 80182494 0017F3D4 38 80 FF FF */ li r4, -1 /* 80182498 0017F3D8 4B FD DE 6D */ bl dCamera_c_NS_dtor /* 8018249C 0017F3DC 38 00 00 00 */ li r0, 0 -/* 801824A0 0017F3E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801824A4 0017F3E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801824A0 0017F3E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801824A4 0017F3E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801824A8 0017F3E8 90 03 5D 74 */ stw r0, 0x5d74(r3) /* 801824AC 0017F3EC 38 60 00 01 */ li r3, 1 /* 801824B0 0017F3F0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -37985,8 +37985,8 @@ daAlink_c_NS_getHsSubChainTopPos: .global daAlink_getAlinkActorClass daAlink_getAlinkActorClass: -/* 80182878 0017F7B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018287C 0017F7BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80182878 0017F7B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018287C 0017F7BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182880 0017F7C0 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80182884 0017F7C4 4E 80 00 20 */ blr @@ -38009,8 +38009,8 @@ dComIfGs_isTmpBit: /* 801828A8 0017F7E8 7C 08 02 A6 */ mflr r0 /* 801828AC 0017F7EC 90 01 00 14 */ stw r0, 0x14(r1) /* 801828B0 0017F7F0 7C 64 1B 78 */ mr r4, r3 -/* 801828B4 0017F7F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801828B8 0017F7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801828B4 0017F7F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801828B8 0017F7F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801828BC 0017F7FC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 801828C0 0017F800 4B EB 20 FD */ bl isEventBit__11dSv_event_cCFUs /* 801828C4 0017F804 80 01 00 14 */ lwz r0, 0x14(r1) @@ -38091,8 +38091,8 @@ dAttention_c_NS_GetCheckObjectCount: .global dComIfGp_getAttention dComIfGp_getAttention: -/* 8018299C 0017F8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801829A0 0017F8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018299C 0017F8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801829A0 0017F8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801829A4 0017F8E4 38 63 56 B8 */ addi r3, r3, 0x56b8 /* 801829A8 0017F8E8 4E 80 00 20 */ blr @@ -38129,8 +38129,8 @@ cBgS_LinChk_NS_GetCross: .global dComIfG_Bgsp dComIfG_Bgsp: -/* 801829F8 0017F938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801829FC 0017F93C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801829F8 0017F938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801829FC 0017F93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182A00 0017F940 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80182A04 0017F944 4E 80 00 20 */ blr @@ -38173,8 +38173,8 @@ cSGlobe_NS_R: .global dComIfGp_evmng_cameraPlay dComIfGp_evmng_cameraPlay: -/* 80182A54 0017F994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80182A58 0017F998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80182A54 0017F994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80182A58 0017F998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182A5C 0017F99C 80 63 51 84 */ lwz r3, 0x5184(r3) /* 80182A60 0017F9A0 4E 80 00 20 */ blr @@ -38527,8 +38527,8 @@ daTagMwait_c_NS_checkEndMessage: /* 80182DA0 0017FCE0 7C 08 02 A6 */ mflr r0 /* 80182DA4 0017FCE4 90 01 00 14 */ stw r0, 0x14(r1) /* 80182DA8 0017FCE8 7C 65 1B 78 */ mr r5, r3 -/* 80182DAC 0017FCEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80182DB0 0017FCF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80182DAC 0017FCEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80182DB0 0017FCF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80182DB4 0017FCF4 88 85 05 69 */ lbz r4, 0x569(r5) /* 80182DB8 0017FCF8 88 05 04 BA */ lbz r0, 0x4ba(r5) /* 80182DBC 0017FCFC 7C 05 07 74 */ extsb r5, r0 diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index 1b49c6020d..eb36a6637a 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -515,8 +515,8 @@ lbl_800384CC: /* 800384D4 00035414 40 82 00 28 */ bne lbl_800384FC /* 800384D8 00035418 7C 86 3A 14 */ add r4, r6, r7 /* 800384DC 0003541C A0 84 00 02 */ lhz r4, 2(r4) -/* 800384E0 00035420 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800384E4 00035424 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800384E0 00035420 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800384E4 00035424 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800384E8 00035428 3C A5 00 02 */ addis r5, r5, 2 /* 800384EC 0003542C 38 C0 00 80 */ li r6, 0x80 /* 800384F0 00035430 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -622,8 +622,8 @@ lbl_80038650: /* 80038654 00035594 7E A3 AB 78 */ mr r3, r21 /* 80038658 00035598 54 96 04 3E */ clrlwi r22, r4, 0x10 /* 8003865C 0003559C 7E C4 B3 78 */ mr r4, r22 -/* 80038660 000355A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80038664 000355A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80038660 000355A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80038664 000355A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80038668 000355A8 3C A5 00 02 */ addis r5, r5, 2 /* 8003866C 000355AC 38 C0 00 80 */ li r6, 0x80 /* 80038670 000355B0 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -718,8 +718,8 @@ branchFile: /* 800387B4 000356F4 7C 64 1B 78 */ mr r4, r3 /* 800387B8 000356F8 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 800387BC 000356FC 38 63 61 94 */ addi r3, r3, lbl_80406194@l -/* 800387C0 00035700 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800387C4 00035704 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800387C0 00035700 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800387C4 00035704 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800387C8 00035708 3C A5 00 02 */ addis r5, r5, 2 /* 800387CC 0003570C 38 C0 00 80 */ li r6, 0x80 /* 800387D0 00035710 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -908,8 +908,8 @@ lbl_80038908: .global getView getView: -/* 80038A90 000359D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80038A94 000359D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80038A90 000359D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80038A94 000359D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80038A98 000359D8 88 03 5D 44 */ lbz r0, 0x5d44(r3) /* 80038A9C 000359DC 2C 00 00 00 */ cmpwi r0, 0 /* 80038AA0 000359E0 40 82 00 0C */ bne lbl_80038AAC @@ -2393,8 +2393,8 @@ dDemo_c_NS_reset: /* 80039F30 00036E70 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80039F34 00036E74 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80039F38 00036E78 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80039F3C 00036E7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80039F40 00036E80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80039F3C 00036E7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80039F40 00036E80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80039F44 00036E84 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80039F48 00036E88 38 80 00 00 */ li r4, 0 /* 80039F4C 00036E8C 90 81 00 08 */ stw r4, 8(r1) diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index 1031cb8c78..aa753d62fb 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -137,8 +137,8 @@ lbl_80051B38: /* 80051CB4 0004EBF4 A8 01 00 10 */ lha r0, 0x10(r1) /* 80051CB8 0004EBF8 B0 04 80 00 */ sth r0, -0x8000(r4) /* 80051CBC 0004EBFC B0 64 80 00 */ sth r3, -0x8000(r4) -/* 80051CC0 0004EC00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051CC4 0004EC04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051CC0 0004EC00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051CC4 0004EC04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80051CC8 0004EC08 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80051CCC 0004EC0C 81 83 00 00 */ lwz r12, 0(r3) /* 80051CD0 0004EC10 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -228,8 +228,8 @@ lbl_80051B38: /* 80051E20 0004ED60 B0 05 80 00 */ sth r0, -0x8000(r5) /* 80051E24 0004ED64 B0 65 80 00 */ sth r3, -0x8000(r5) /* 80051E28 0004ED68 B0 85 80 00 */ sth r4, -0x8000(r5) -/* 80051E2C 0004ED6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051E30 0004ED70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051E2C 0004ED6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051E30 0004ED70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80051E34 0004ED74 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80051E38 0004ED78 81 83 00 00 */ lwz r12, 0(r3) /* 80051E3C 0004ED7C 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -307,8 +307,8 @@ lbl_80051B38: /* 80051F5C 0004EE9C B0 83 80 00 */ sth r4, -0x8000(r3) /* 80051F60 0004EEA0 38 00 00 00 */ li r0, 0 /* 80051F64 0004EEA4 B0 03 80 00 */ sth r0, -0x8000(r3) -/* 80051F68 0004EEA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051F6C 0004EEAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051F68 0004EEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051F6C 0004EEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80051F70 0004EEB0 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80051F74 0004EEB4 81 83 00 00 */ lwz r12, 0(r3) /* 80051F78 0004EEB8 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -545,8 +545,8 @@ lbl_80051B38: /* 80052314 0004F254 B3 86 80 00 */ sth r28, -0x8000(r6) /* 80052318 0004F258 38 60 00 00 */ li r3, 0 /* 8005231C 0004F25C 48 30 E2 B5 */ bl GXSetClipMode -/* 80052320 0004F260 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80052324 0004F264 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80052320 0004F260 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80052324 0004F264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80052328 0004F268 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 8005232C 0004F26C 81 83 00 00 */ lwz r12, 0(r3) /* 80052330 0004F270 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -1043,8 +1043,8 @@ lbl_80052A24: lbl_80052A88: /* 80052A88 0004F9C8 38 60 00 00 */ li r3, 0 /* 80052A8C 0004F9CC 48 30 DB 45 */ bl GXSetClipMode -/* 80052A90 0004F9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80052A94 0004F9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80052A90 0004F9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80052A94 0004F9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80052A98 0004F9D8 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80052A9C 0004F9DC 81 83 00 00 */ lwz r12, 0(r3) /* 80052AA0 0004F9E0 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -1461,8 +1461,8 @@ lbl_80052C34: /* 800530EC 0005002C B3 85 80 00 */ sth r28, -0x8000(r5) /* 800530F0 00050030 B3 65 80 00 */ sth r27, -0x8000(r5) /* 800530F4 00050034 B3 05 80 00 */ sth r24, -0x8000(r5) -/* 800530F8 00050038 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800530FC 0005003C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800530F8 00050038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800530FC 0005003C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80053100 00050040 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80053104 00050044 81 83 00 00 */ lwz r12, 0(r3) /* 80053108 00050048 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -1787,8 +1787,8 @@ lbl_800533AC: /* 800535FC 0005053C B3 85 80 00 */ sth r28, -0x8000(r5) /* 80053600 00050540 B3 65 80 00 */ sth r27, -0x8000(r5) /* 80053604 00050544 B3 05 80 00 */ sth r24, -0x8000(r5) -/* 80053608 00050548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005360C 0005054C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80053608 00050548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005360C 0005054C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80053610 00050550 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80053614 00050554 81 83 00 00 */ lwz r12, 0(r3) /* 80053618 00050558 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -2038,8 +2038,8 @@ lbl_8005399C: /* 8005399C 000508DC 88 1F 00 04 */ lbz r0, 4(r31) /* 800539A0 000508E0 7C 05 00 00 */ cmpw r5, r0 /* 800539A4 000508E4 41 80 FF CC */ blt lbl_80053970 -/* 800539A8 000508E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800539AC 000508EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800539A8 000508E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800539AC 000508EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800539B0 000508F0 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 800539B4 000508F4 81 83 00 00 */ lwz r12, 0(r3) /* 800539B8 000508F8 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -2161,8 +2161,8 @@ dDlst_2D_c: /* 80053B74 00050AB4 38 64 00 08 */ addi r3, r4, 8 /* 80053B78 00050AB8 C0 24 01 20 */ lfs f1, 0x120(r4) /* 80053B7C 00050ABC C0 44 01 24 */ lfs f2, 0x124(r4) -/* 80053B80 00050AC0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80053B84 00050AC4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80053B80 00050AC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80053B84 00050AC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80053B88 00050AC8 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 80053B8C 00050ACC 48 2A 53 49 */ bl J2DScreen_NS_draw /* 80053B90 00050AD0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2488,8 +2488,8 @@ cM_rnd_c_NS_getValue: /* 8005404C 00050F8C D8 01 00 38 */ stfd f0, 0x38(r1) /* 80054050 00050F90 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80054054 00050F94 3B C0 00 00 */ li r30, 0 -/* 80054058 00050F98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005405C 00050F9C 3B 23 61 C0 */ addi r25, r3, lbl_804061C0@l +/* 80054058 00050F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005405C 00050F9C 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 80054060 00050FA0 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80054064 00050FA4 3B 43 9A 20 */ addi r26, r3, lbl_80439A20@l /* 80054068 00050FA8 CB E2 86 18 */ lfd f31, lbl_80452018-_SDA2_BASE_(r2) @@ -2622,8 +2622,8 @@ dDlst_effectLine_c_NS_update: /* 80054250 00051190 D0 43 00 2C */ stfs f2, 0x2c(r3) /* 80054254 00051194 D0 63 00 30 */ stfs f3, 0x30(r3) /* 80054258 00051198 D0 83 00 34 */ stfs f4, 0x34(r3) -/* 8005425C 0005119C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80054260 000511A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005425C 0005119C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80054260 000511A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80054264 000511A4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80054268 000511A8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8005426C 000511AC 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -3170,8 +3170,8 @@ lbl_800549E8: /* 80054A08 00051948 93 61 00 54 */ stw r27, 0x54(r1) /* 80054A0C 0005194C 93 81 00 58 */ stw r28, 0x58(r1) /* 80054A10 00051950 93 A1 00 5C */ stw r29, 0x5c(r1) -/* 80054A14 00051954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80054A18 00051958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80054A14 00051954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80054A18 00051958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80054A1C 0005195C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80054A20 00051960 38 81 00 20 */ addi r4, r1, 0x20 /* 80054A24 00051964 48 01 FE 1D */ bl cBgS_NS_ShdwDraw @@ -5349,8 +5349,8 @@ lbl_8005686C: /* 8005686C 000537AC C0 02 86 28 */ lfs f0, lbl_80452028-_SDA2_BASE_(r2) lbl_80056870: /* 80056870 000537B0 D0 0D 89 54 */ stfs f0, lbl_80450ED4-_SDA_BASE_(r13) -/* 80056874 000537B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056878 000537B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056874 000537B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056878 000537B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005687C 000537BC 80 A3 5D 30 */ lwz r5, 0x5d30(r3) /* 80056880 000537C0 3C 60 54 49 */ lis r3, 0x54494D47@ha /* 80056884 000537C4 38 63 4D 47 */ addi r3, r3, 0x54494D47@l @@ -5422,8 +5422,8 @@ lbl_80056954: /* 8005696C 000538AC C0 02 86 DC */ lfs f0, lbl_804520DC-_SDA2_BASE_(r2) /* 80056970 000538B0 EC 00 00 72 */ fmuls f0, f0, f1 /* 80056974 000538B4 D0 06 00 38 */ stfs f0, 0x38(r6) -/* 80056978 000538B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005697C 000538BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056978 000538B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005697C 000538BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056980 000538C0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80056984 000538C4 38 83 02 3C */ addi r4, r3, 0x23c /* 80056988 000538C8 38 A3 02 40 */ addi r5, r3, 0x240 diff --git a/asm/d/d_envse.s b/asm/d/d_envse.s index 40b5747789..5fb485444e 100644 --- a/asm/d/d_envse.s +++ b/asm/d/d_envse.s @@ -169,8 +169,8 @@ dEnvSe_c_NS_execute_common: lbl_80183020: /* 80183020 0017FF60 83 44 00 00 */ lwz r26, 0(r4) /* 80183024 0017FF64 83 E4 00 04 */ lwz r31, 4(r4) -/* 80183028 0017FF68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018302C 0017FF6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80183028 0017FF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018302C 0017FF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80183030 0017FF70 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 80183034 0017FF74 7C 00 07 74 */ extsb r0, r0 /* 80183038 0017FF78 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -486,8 +486,8 @@ dEnvSe_c_NS_execute: /* 80183494 001803D4 7C 7C 1B 78 */ mr r28, r3 /* 80183498 001803D8 8B CD 87 E4 */ lbz r30, lbl_80450D64-_SDA_BASE_(r13) /* 8018349C 001803DC 7F DE 07 74 */ extsb r30, r30 -/* 801834A0 001803E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801834A4 001803E4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801834A0 001803E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801834A4 001803E4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801834A8 001803E8 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 801834AC 001803EC 7F C4 F3 78 */ mr r4, r30 /* 801834B0 001803F0 4B EA 0E D5 */ bl dStage_roomControl_c_NS_getStatusRoomDt diff --git a/asm/d/d_event.s b/asm/d/d_event.s index d7a0aad35f..fe67dc0be6 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -14,8 +14,8 @@ _unnamed_d_event_cpp__NS_clear_tmpflag_for_message: /* 8004148C 0003E3CC 7C 08 02 A6 */ mflr r0 /* 80041490 0003E3D0 90 01 00 14 */ stw r0, 0x14(r1) /* 80041494 0003E3D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041498 0003E3D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004149C 0003E3DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041498 0003E3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004149C 0003E3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800414A0 0003E3E0 3B E3 0D D8 */ addi r31, r3, 0xdd8 /* 800414A4 0003E3E4 7F E3 FB 78 */ mr r3, r31 /* 800414A8 0003E3E8 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -118,8 +118,8 @@ dEvt_control_c_NS_orderOld: /* 800415FC 0003E53C 7C FD 3B 78 */ mr r29, r7 /* 80041600 0003E540 7D 1E 43 78 */ mr r30, r8 /* 80041604 0003E544 7D 3F 4B 78 */ mr r31, r9 -/* 80041608 0003E548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004160C 0003E54C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041608 0003E548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004160C 0003E54C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041610 0003E550 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041614 0003E554 7D 44 53 78 */ mr r4, r10 /* 80041618 0003E558 38 A0 00 FF */ li r5, 0xff @@ -173,8 +173,8 @@ dEvt_control_c_NS_order: /* 800416CC 0003E60C 88 83 00 1B */ lbz r4, 0x1b(r3) /* 800416D0 0003E610 28 04 00 FF */ cmplwi r4, 0xff /* 800416D4 0003E614 41 82 00 24 */ beq lbl_800416F8 -/* 800416D8 0003E618 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800416DC 0003E61C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800416D8 0003E618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800416DC 0003E61C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800416E0 0003E620 7E E5 BB 78 */ mr r5, r23 /* 800416E4 0003E624 4B FF 3C 7D */ bl isSwitch__10dSv_info_cCFii /* 800416E8 0003E628 2C 03 00 00 */ cmpwi r3, 0 @@ -276,8 +276,8 @@ dEvt_control_c_NS_setParam: /* 80041838 0003E778 B0 1E 00 DE */ sth r0, 0xde(r30) /* 8004183C 0003E77C A0 1F 00 04 */ lhz r0, 4(r31) /* 80041840 0003E780 B0 1E 00 DC */ sth r0, 0xdc(r30) -/* 80041844 0003E784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041848 0003E788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041844 0003E784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041848 0003E788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004184C 0003E78C 80 03 5D AC */ lwz r0, 0x5dac(r3) /* 80041850 0003E790 80 9F 00 08 */ lwz r4, 8(r31) /* 80041854 0003E794 7C 00 20 40 */ cmplw r0, r4 @@ -314,8 +314,8 @@ lbl_8004188C: /* 800418C8 0003E808 88 9D 00 1B */ lbz r4, 0x1b(r29) /* 800418CC 0003E80C 28 04 00 FF */ cmplwi r4, 0xff /* 800418D0 0003E810 41 82 00 14 */ beq lbl_800418E4 -/* 800418D4 0003E814 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800418D8 0003E818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800418D4 0003E814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800418D8 0003E818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800418DC 0003E81C 7F 85 E3 78 */ mr r5, r28 /* 800418E0 0003E820 4B FF 39 21 */ bl onSwitch__10dSv_info_cFii lbl_800418E4: @@ -366,8 +366,8 @@ dEvt_control_c_NS_afterFlagProc: /* 80041970 0003E8B0 A0 04 00 02 */ lhz r0, 2(r4) /* 80041974 0003E8B4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80041978 0003E8B8 41 82 00 20 */ beq lbl_80041998 -/* 8004197C 0003E8BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041980 0003E8C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004197C 0003E8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041980 0003E8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041984 0003E8C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041988 0003E8C8 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 8004198C 0003E8CC 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l @@ -443,8 +443,8 @@ lbl_80041A74: /* 80041A78 0003E9B8 40 82 00 38 */ bne lbl_80041AB0 lbl_80041A7C: /* 80041A7C 0003E9BC 80 AD 8A 98 */ lwz r5, lbl_80451018-_SDA_BASE_(r13) -/* 80041A80 0003E9C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041A84 0003E9C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041A80 0003E9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041A84 0003E9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041A88 0003E9C8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80041A8C 0003E9CC 80 03 05 74 */ lwz r0, 0x574(r3) /* 80041A90 0003E9D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -478,8 +478,8 @@ lbl_80041AB0: /* 80041AF8 0003EA38 B0 1F 00 DE */ sth r0, 0xde(r31) /* 80041AFC 0003EA3C 48 00 00 24 */ b lbl_80041B20 lbl_80041B00: -/* 80041B00 0003EA40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041B04 0003EA44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041B00 0003EA40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041B04 0003EA44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041B08 0003EA48 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041B0C 0003EA4C 7F C4 F3 78 */ mr r4, r30 /* 80041B10 0003EA50 38 A0 00 FF */ li r5, 0xff @@ -487,8 +487,8 @@ lbl_80041B00: /* 80041B18 0003EA58 48 00 59 FD */ bl dEvent_manager_c_NS_getEventIdx /* 80041B1C 0003EA5C B0 7F 00 DE */ sth r3, 0xde(r31) lbl_80041B20: -/* 80041B20 0003EA60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041B24 0003EA64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041B20 0003EA60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041B24 0003EA64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041B28 0003EA68 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041B2C 0003EA6C A8 9F 00 DE */ lha r4, 0xde(r31) /* 80041B30 0003EA70 48 00 5E 55 */ bl dEvent_manager_c_NS_order @@ -570,8 +570,8 @@ lbl_80041C0C: /* 80041C30 0003EB70 7F A3 EB 78 */ mr r3, r29 /* 80041C34 0003EB74 4B FE C2 E9 */ bl dComIfGp_getSelectItem /* 80041C38 0003EB78 98 7B 00 EE */ stb r3, 0xee(r27) -/* 80041C3C 0003EB7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041C40 0003EB80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041C3C 0003EB7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041C40 0003EB80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041C44 0003EB84 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80041C48 0003EB88 7F E3 FB 78 */ mr r3, r31 /* 80041C4C 0003EB8C 7F C4 F3 78 */ mr r4, r30 @@ -623,8 +623,8 @@ lbl_80041CD4: lbl_80041CE8: /* 80041CE8 0003EC28 7F E3 FB 78 */ mr r3, r31 /* 80041CEC 0003EC2C 4B FF FB 19 */ bl dEvt_control_c_NS_setParam -/* 80041CF0 0003EC30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041CF4 0003EC34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041CF0 0003EC30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041CF4 0003EC34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041CF8 0003EC38 88 03 5B 68 */ lbz r0, 0x5b68(r3) /* 80041CFC 0003EC3C 98 1F 00 EE */ stb r0, 0xee(r31) /* 80041D00 0003EC40 38 00 00 02 */ li r0, 2 @@ -668,8 +668,8 @@ lbl_80041D7C: /* 80041D7C 0003ECBC A8 9F 00 DE */ lha r4, 0xde(r31) /* 80041D80 0003ECC0 2C 04 FF FF */ cmpwi r4, -1 /* 80041D84 0003ECC4 41 82 00 20 */ beq lbl_80041DA4 -/* 80041D88 0003ECC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041D8C 0003ECCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041D88 0003ECC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041D8C 0003ECCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041D90 0003ECD0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041D94 0003ECD4 38 A0 00 01 */ li r5, 1 /* 80041D98 0003ECD8 48 00 50 15 */ bl dEvent_manager_c_NS_endProc @@ -740,14 +740,14 @@ lbl_80041E60: lbl_80041E7C: /* 80041E7C 0003EDBC 28 1F 00 00 */ cmplwi r31, 0 /* 80041E80 0003EDC0 41 82 00 18 */ beq lbl_80041E98 -/* 80041E84 0003EDC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041E88 0003EDC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041E84 0003EDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041E88 0003EDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041E8C 0003EDCC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041E90 0003EDD0 80 9F 01 00 */ lwz r4, 0x100(r31) /* 80041E94 0003EDD4 48 00 49 6D */ bl dEvent_manager_c_NS_setObjectArchive lbl_80041E98: -/* 80041E98 0003EDD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041E9C 0003EDDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041E98 0003EDD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041E9C 0003EDDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041EA0 0003EDE0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041EA4 0003EDE4 7F A4 EB 78 */ mr r4, r29 /* 80041EA8 0003EDE8 48 00 5A DD */ bl dEvent_manager_c_NS_order @@ -808,8 +808,8 @@ lbl_80041F60: /* 80041F60 0003EEA0 A8 9F 00 DE */ lha r4, 0xde(r31) /* 80041F64 0003EEA4 2C 04 FF FF */ cmpwi r4, -1 /* 80041F68 0003EEA8 41 82 00 20 */ beq lbl_80041F88 -/* 80041F6C 0003EEAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80041F70 0003EEB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80041F6C 0003EEAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80041F70 0003EEB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041F74 0003EEB4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041F78 0003EEB8 38 A0 00 01 */ li r5, 1 /* 80041F7C 0003EEBC 48 00 4E 31 */ bl dEvent_manager_c_NS_endProc @@ -878,8 +878,8 @@ dEvt_control_c_NS_doorCheck: /* 80042054 0003EF94 48 00 12 99 */ bl dEvt_control_c_NS_convPId /* 80042058 0003EF98 7C 7F 1B 79 */ or. r31, r3, r3 /* 8004205C 0003EF9C 41 82 00 18 */ beq lbl_80042074 -/* 80042060 0003EFA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042064 0003EFA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042060 0003EFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042064 0003EFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042068 0003EFA8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004206C 0003EFAC 80 9F 01 00 */ lwz r4, 0x100(r31) /* 80042070 0003EFB0 48 00 47 91 */ bl dEvent_manager_c_NS_setObjectArchive @@ -897,8 +897,8 @@ lbl_80042098: /* 80042098 0003EFD8 A8 9D 00 DE */ lha r4, 0xde(r29) /* 8004209C 0003EFDC 2C 04 FF FF */ cmpwi r4, -1 /* 800420A0 0003EFE0 41 82 00 30 */ beq lbl_800420D0 -/* 800420A4 0003EFE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800420A8 0003EFE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800420A4 0003EFE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800420A8 0003EFE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800420AC 0003EFEC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800420B0 0003EFF0 7F E3 FB 78 */ mr r3, r31 /* 800420B4 0003EFF4 48 00 54 09 */ bl dEvent_manager_c_NS_getEventData_X1_ @@ -956,8 +956,8 @@ dEvt_control_c_NS_itemCheck: /* 80042160 0003F0A0 41 82 00 44 */ beq lbl_800421A4 /* 80042164 0003F0A4 38 00 00 02 */ li r0, 2 /* 80042168 0003F0A8 98 1D 00 E4 */ stb r0, 0xe4(r29) -/* 8004216C 0003F0AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042170 0003F0B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004216C 0003F0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042170 0003F0B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042174 0003F0B4 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80042178 0003F0B8 7F E3 FB 78 */ mr r3, r31 /* 8004217C 0003F0BC 7F C4 F3 78 */ mr r4, r30 @@ -1011,8 +1011,8 @@ lbl_80042200: /* 8004221C 0003F15C 98 7F 00 ED */ stb r3, 0xed(r31) /* 80042220 0003F160 B0 1F 00 E0 */ sth r0, 0xe0(r31) /* 80042224 0003F164 98 1F 00 EE */ stb r0, 0xee(r31) -/* 80042228 0003F168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004222C 0003F16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042228 0003F168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004222C 0003F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042230 0003F170 38 63 51 88 */ addi r3, r3, 0x5188 /* 80042234 0003F174 38 80 FF FE */ li r4, -2 /* 80042238 0003F178 48 00 41 B9 */ bl dEvent_exception_c_NS_setStartDemo @@ -1070,8 +1070,8 @@ dEvt_control_c_NS_entry: /* 800422E4 0003F224 8B DD 00 E3 */ lbz r30, 0xe3(r29) /* 800422E8 0003F228 38 00 00 00 */ li r0, 0 /* 800422EC 0003F22C 98 1D 00 E2 */ stb r0, 0xe2(r29) -/* 800422F0 0003F230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800422F4 0003F234 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800422F0 0003F230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800422F4 0003F234 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_800422F8: /* 800422F8 0003F238 7F C0 07 74 */ extsb r0, r30 /* 800422FC 0003F23C 1C 60 00 18 */ mulli r3, r0, 0x18 @@ -1183,8 +1183,8 @@ dEvt_control_c_NS_reset: /* 8004248C 0003F3CC 80 9D 00 C4 */ lwz r4, 0xc4(r29) /* 80042490 0003F3D0 48 00 0E 5D */ bl dEvt_control_c_NS_convPId /* 80042494 0003F3D4 7C 7F 1B 78 */ mr r31, r3 -/* 80042498 0003F3D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004249C 0003F3DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042498 0003F3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004249C 0003F3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800424A0 0003F3E0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800424A4 0003F3E4 38 80 00 00 */ li r4, 0 /* 800424A8 0003F3E8 88 BD 00 EC */ lbz r5, 0xec(r29) @@ -1229,8 +1229,8 @@ dEvt_control_c_NS_reset_X1_: /* 80042534 0003F474 88 A3 00 EC */ lbz r5, 0xec(r3) /* 80042538 0003F478 28 05 00 FF */ cmplwi r5, 0xff /* 8004253C 0003F47C 41 82 00 50 */ beq lbl_8004258C -/* 80042540 0003F480 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042544 0003F484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042540 0003F480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042544 0003F484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042548 0003F488 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004254C 0003F48C 48 00 51 4D */ bl dEvent_manager_c_NS_getEventIdx_X1_ /* 80042550 0003F490 7C 7F 1B 78 */ mr r31, r3 @@ -1282,8 +1282,8 @@ dEv_defaultSkipProc: /* 800425EC 0003F52C 7C 08 02 A6 */ mflr r0 /* 800425F0 0003F530 90 01 00 14 */ stw r0, 0x14(r1) /* 800425F4 0003F534 7C 64 1B 78 */ mr r4, r3 -/* 800425F8 0003F538 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800425FC 0003F53C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800425F8 0003F538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800425FC 0003F53C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042600 0003F540 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80042604 0003F544 4B FF FF 15 */ bl dEvt_control_c_NS_reset_X1_ /* 80042608 0003F548 38 60 00 01 */ li r3, 1 @@ -1300,8 +1300,8 @@ dEv_defaultSkipZev: /* 8004262C 0003F56C 48 31 FB A5 */ bl _savegpr_26 /* 80042630 0003F570 7C 7F 1B 78 */ mr r31, r3 /* 80042634 0003F574 7C 9A 23 78 */ mr r26, r4 -/* 80042638 0003F578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004263C 0003F57C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80042638 0003F578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004263C 0003F57C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80042640 0003F580 3B BE 4E C8 */ addi r29, r30, 0x4ec8 /* 80042644 0003F584 3B 80 FF FF */ li r28, -1 /* 80042648 0003F588 7F A3 EB 78 */ mr r3, r29 @@ -1397,8 +1397,8 @@ dEv_defaultSkipStb: /* 80042788 0003F6C8 48 31 FA 49 */ bl _savegpr_26 /* 8004278C 0003F6CC 7C 7F 1B 78 */ mr r31, r3 /* 80042790 0003F6D0 7C 9A 23 78 */ mr r26, r4 -/* 80042794 0003F6D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042798 0003F6D8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80042794 0003F6D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042798 0003F6D8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8004279C 0003F6DC 3B BE 4E C8 */ addi r29, r30, 0x4ec8 /* 800427A0 0003F6E0 3B 80 FF FF */ li r28, -1 /* 800427A4 0003F6E4 7F A3 EB 78 */ mr r3, r29 @@ -1492,8 +1492,8 @@ dEv_noFinishSkipProc: /* 800428DC 0003F81C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800428E0 0003F820 7C 08 02 A6 */ mflr r0 /* 800428E4 0003F824 90 01 00 14 */ stw r0, 0x14(r1) -/* 800428E8 0003F828 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800428EC 0003F82C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800428E8 0003F828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800428EC 0003F82C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800428F0 0003F830 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 800428F4 0003F834 48 00 00 C1 */ bl dEvt_control_c_NS_offSkipFade /* 800428F8 0003F838 38 60 00 00 */ li r3, 0 @@ -1620,16 +1620,16 @@ lbl_80042A70: /* 80042A7C 0003F9BC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80042A80 0003F9C0 41 82 00 20 */ beq lbl_80042AA0 /* 80042A84 0003F9C4 38 00 00 43 */ li r0, 0x43 -/* 80042A88 0003F9C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042A8C 0003F9CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042A88 0003F9C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042A8C 0003F9CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042A90 0003F9D0 98 03 5E 40 */ stb r0, 0x5e40(r3) /* 80042A94 0003F9D4 38 00 00 01 */ li r0, 1 /* 80042A98 0003F9D8 98 03 5E 5A */ stb r0, 0x5e5a(r3) /* 80042A9C 0003F9DC 48 00 00 1C */ b lbl_80042AB8 lbl_80042AA0: /* 80042AA0 0003F9E0 38 00 00 4D */ li r0, 0x4d -/* 80042AA4 0003F9E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042AA8 0003F9E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042AA4 0003F9E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042AA8 0003F9E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042AAC 0003F9EC 98 03 5E 40 */ stb r0, 0x5e40(r3) /* 80042AB0 0003F9F0 38 00 00 01 */ li r0, 1 /* 80042AB4 0003F9F4 98 03 5E 5A */ stb r0, 0x5e5a(r3) @@ -1673,8 +1673,8 @@ lbl_80042B24: /* 80042B38 0003FA78 48 00 07 B5 */ bl dEvt_control_c_NS_convPId /* 80042B3C 0003FA7C 28 03 00 00 */ cmplwi r3, 0 /* 80042B40 0003FA80 40 82 00 10 */ bne lbl_80042B50 -/* 80042B44 0003FA84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042B48 0003FA88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042B44 0003FA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042B48 0003FA88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042B4C 0003FA8C 80 63 5D AC */ lwz r3, 0x5dac(r3) lbl_80042B50: /* 80042B50 0003FA90 80 9D 01 0C */ lwz r4, 0x10c(r29) @@ -1715,8 +1715,8 @@ dEvt_control_c_NS_Step: /* 80042BC8 0003FB08 39 61 00 20 */ addi r11, r1, 0x20 /* 80042BCC 0003FB0C 48 31 F6 0D */ bl _savegpr_28 /* 80042BD0 0003FB10 7C 7D 1B 78 */ mr r29, r3 -/* 80042BD4 0003FB14 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80042BD8 0003FB18 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 80042BD4 0003FB14 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80042BD8 0003FB18 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80042BDC 0003FB1C 3B DF 4F F8 */ addi r30, r31, 0x4ff8 /* 80042BE0 0003FB20 38 00 00 00 */ li r0, 0 /* 80042BE4 0003FB24 98 03 00 E7 */ stb r0, 0xe7(r3) @@ -1731,8 +1731,8 @@ dEvt_control_c_NS_Step: /* 80042C08 0003FB48 40 82 00 24 */ bne lbl_80042C2C /* 80042C0C 0003FB4C 38 00 00 05 */ li r0, 5 /* 80042C10 0003FB50 98 1D 00 E5 */ stb r0, 0xe5(r29) -/* 80042C14 0003FB54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042C18 0003FB58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042C14 0003FB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042C18 0003FB58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042C1C 0003FB5C 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 80042C20 0003FB60 28 00 00 00 */ cmplwi r0, 0 /* 80042C24 0003FB64 41 82 00 08 */ beq lbl_80042C2C @@ -1783,8 +1783,8 @@ lbl_80042CC0: /* 80042CC0 0003FC00 88 9D 00 E5 */ lbz r4, 0xe5(r29) /* 80042CC4 0003FC04 28 04 00 05 */ cmplwi r4, 5 /* 80042CC8 0003FC08 40 82 00 88 */ bne lbl_80042D50 -/* 80042CCC 0003FC0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042CD0 0003FC10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042CCC 0003FC0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042CD0 0003FC10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042CD4 0003FC14 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 80042CD8 0003FC18 7C 00 07 75 */ extsb. r0, r0 /* 80042CDC 0003FC1C 40 82 00 74 */ bne lbl_80042D50 @@ -1873,8 +1873,8 @@ lbl_80042DF4: /* 80042E04 0003FD44 4B FF F4 BD */ bl dEvt_control_c_NS_entry /* 80042E08 0003FD48 2C 03 00 00 */ cmpwi r3, 0 /* 80042E0C 0003FD4C 41 82 00 E8 */ beq lbl_80042EF4 -/* 80042E10 0003FD50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042E14 0003FD54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042E10 0003FD50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042E14 0003FD54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042E18 0003FD58 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 80042E1C 0003FD5C 28 00 00 00 */ cmplwi r0, 0 /* 80042E20 0003FD60 41 82 00 08 */ beq lbl_80042E28 @@ -1886,8 +1886,8 @@ lbl_80042E28: /* 80042E34 0003FD74 38 7F 5B D4 */ addi r3, r31, 0x5bd4 /* 80042E38 0003FD78 38 80 00 1F */ li r4, 0x1f /* 80042E3C 0003FD7C 48 02 CF 59 */ bl dVibration_c_NS_StopQuake -/* 80042E40 0003FD80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042E44 0003FD84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042E40 0003FD80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042E44 0003FD84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042E48 0003FD88 83 83 5D B4 */ lwz r28, 0x5db4(r3) /* 80042E4C 0003FD8C 48 13 E7 F5 */ bl dCam_getBody /* 80042E50 0003FD90 80 03 00 24 */ lwz r0, 0x24(r3) @@ -1970,8 +1970,8 @@ lbl_80042F38: /* 80042F64 0003FEA4 38 A0 00 07 */ li r5, 7 /* 80042F68 0003FEA8 48 32 5B 81 */ bl func_80368AE8 /* 80042F6C 0003FEAC 38 00 00 00 */ li r0, 0 -/* 80042F70 0003FEB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80042F74 0003FEB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80042F70 0003FEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80042F74 0003FEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042F78 0003FEB8 98 03 5F 63 */ stb r0, 0x5f63(r3) /* 80042F7C 0003FEBC 80 7D 01 2C */ lwz r3, 0x12c(r29) /* 80042F80 0003FEC0 4B FE CC 01 */ bl dComIfGs_onVisitedRoom @@ -2070,8 +2070,8 @@ lbl_800430AC: /* 800430B4 0003FFF4 38 60 00 01 */ li r3, 1 /* 800430B8 0003FFF8 48 00 00 9C */ b lbl_80043154 lbl_800430BC: -/* 800430BC 0003FFFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800430C0 00040000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800430BC 0003FFFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800430C0 00040000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800430C4 00040004 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800430C8 00040008 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 800430CC 0004000C 40 82 00 18 */ bne lbl_800430E4 @@ -2270,8 +2270,8 @@ dEvt_control_c_NS_getStbDemoData: /* 80043338 00040278 8C 03 61 94 */ lbzu r0, lbl_80406194@l(r3) /* 8004333C 0004027C 7C 00 07 75 */ extsb. r0, r0 /* 80043340 00040280 41 82 00 38 */ beq lbl_80043378 -/* 80043344 00040284 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80043348 00040288 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80043344 00040284 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80043348 00040288 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8004334C 0004028C 3C A5 00 02 */ addis r5, r5, 2 /* 80043350 00040290 38 C0 00 80 */ li r6, 0x80 /* 80043354 00040294 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2291,8 +2291,8 @@ lbl_8004337C: /* 80043380 000402C0 7C 63 07 74 */ extsb r3, r3 /* 80043384 000402C4 4B FE C1 39 */ bl dComIfG_getRoomArcName /* 80043388 000402C8 7F C4 F3 78 */ mr r4, r30 -/* 8004338C 000402CC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80043390 000402D0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8004338C 000402CC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80043390 000402D0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80043394 000402D4 3C A5 00 02 */ addis r5, r5, 2 /* 80043398 000402D8 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8004339C 000402DC 38 C0 00 40 */ li r6, 0x40 @@ -2347,8 +2347,8 @@ dEvt_info_c: /* 80043448 00040388 B0 1F 00 08 */ sth r0, 8(r31) /* 8004344C 0004038C 48 00 00 20 */ b lbl_8004346C lbl_80043450: -/* 80043450 00040390 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043454 00040394 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80043450 00040390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043454 00040394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80043458 00040398 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004345C 0004039C 38 A0 00 FF */ li r5, 0xff /* 80043460 000403A0 38 C0 FF FF */ li r6, -1 @@ -2372,8 +2372,8 @@ dEvt_info_c_NS_getEventName: /* 80043498 000403D8 38 60 00 00 */ li r3, 0 /* 8004349C 000403DC 48 00 00 20 */ b lbl_800434BC lbl_800434A0: -/* 800434A0 000403E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800434A4 000403E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800434A0 000403E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800434A4 000403E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800434A8 000403E8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800434AC 000403EC 48 00 40 11 */ bl dEvent_manager_c_NS_getEventData_X1_ /* 800434B0 000403F0 28 03 00 00 */ cmplwi r3, 0 @@ -2418,8 +2418,8 @@ dEvt_control_c_NS_searchMapEventData_X1_: /* 80043524 00040464 38 60 00 00 */ li r3, 0 /* 80043528 00040468 48 00 00 CC */ b lbl_800435F4 lbl_8004352C: -/* 8004352C 0004046C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043530 00040470 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8004352C 0004046C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043530 00040470 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80043534 00040474 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 80043538 00040478 4B FE 0E 4D */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8004353C 0004047C 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index e3323ea885..0e7bef6651 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -230,8 +230,8 @@ dGameover_c_NS__create: /* 8019B060 00197FA0 3C 80 80 39 */ lis r4, lbl_80394C28@ha /* 8019B064 00197FA4 38 84 4C 28 */ addi r4, r4, lbl_80394C28@l /* 8019B068 00197FA8 4B E9 1E 55 */ bl dComIfG_resLoad -/* 8019B06C 00197FAC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8019B070 00197FB0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8019B06C 00197FAC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8019B070 00197FB0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8019B074 00197FB4 88 04 5E B5 */ lbz r0, 0x5eb5(r4) /* 8019B078 00197FB8 28 00 00 00 */ cmplwi r0, 0 /* 8019B07C 00197FBC 40 82 00 2C */ bne lbl_8019B0A8 @@ -241,8 +241,8 @@ dGameover_c_NS__create: /* 8019B08C 00197FCC 28 00 00 06 */ cmplwi r0, 6 /* 8019B090 00197FD0 40 82 00 18 */ bne lbl_8019B0A8 lbl_8019B094: -/* 8019B094 00197FD4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8019B098 00197FD8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8019B094 00197FD4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8019B098 00197FD8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8019B09C 00197FDC 88 04 5E 1A */ lbz r0, 0x5e1a(r4) /* 8019B0A0 00197FE0 28 00 00 00 */ cmplwi r0, 0 /* 8019B0A4 00197FE4 41 82 00 0C */ beq lbl_8019B0B0 @@ -277,15 +277,15 @@ lbl_8019B0B0: lbl_8019B110: /* 8019B110 00198050 3C 60 80 39 */ lis r3, lbl_80394C28@ha /* 8019B114 00198054 38 63 4C 28 */ addi r3, r3, lbl_80394C28@l -/* 8019B118 00198058 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8019B11C 0019805C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8019B118 00198058 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8019B11C 0019805C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8019B120 00198060 3C 84 00 02 */ addis r4, r4, 2 /* 8019B124 00198064 38 A0 00 80 */ li r5, 0x80 /* 8019B128 00198068 38 84 C2 F8 */ addi r4, r4, -15624 /* 8019B12C 0019806C 4B EA 10 B9 */ bl dRes_control_c_NS_getResInfo /* 8019B130 00198070 7C 7C 1B 78 */ mr r28, r3 -/* 8019B134 00198074 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B138 00198078 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B134 00198074 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B138 00198078 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B13C 0019807C 80 03 5E BC */ lwz r0, 0x5ebc(r3) /* 8019B140 00198080 90 1D 01 10 */ stw r0, 0x110(r29) /* 8019B144 00198084 38 60 00 06 */ li r3, 6 @@ -315,8 +315,8 @@ lbl_8019B198: /* 8019B19C 001980DC 88 1F 00 C2 */ lbz r0, 0xc2(r31) /* 8019B1A0 001980E0 28 00 00 01 */ cmplwi r0, 1 /* 8019B1A4 001980E4 40 82 00 60 */ bne lbl_8019B204 -/* 8019B1A8 001980E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B1AC 001980EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B1A8 001980E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B1AC 001980EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B1B0 001980F0 38 63 5F 5C */ addi r3, r3, 0x5f5c /* 8019B1B4 001980F4 3C 80 80 39 */ lis r4, lbl_80394C28@ha /* 8019B1B8 001980F8 38 84 4C 28 */ addi r4, r4, lbl_80394C28@l @@ -324,14 +324,14 @@ lbl_8019B198: /* 8019B1C0 00198100 48 1C D7 D5 */ bl strcmp /* 8019B1C4 00198104 2C 03 00 00 */ cmpwi r3, 0 /* 8019B1C8 00198108 40 82 00 2C */ bne lbl_8019B1F4 -/* 8019B1CC 0019810C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B1D0 00198110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B1CC 0019810C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B1D0 00198110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B1D4 00198114 38 63 00 9C */ addi r3, r3, 0x9c /* 8019B1D8 00198118 38 80 00 12 */ li r4, 0x12 /* 8019B1DC 0019811C 38 A0 00 FF */ li r5, 0xff /* 8019B1E0 00198120 4B E9 7D D9 */ bl setItem__17dSv_player_item_cFiUc -/* 8019B1E4 00198124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B1E8 00198128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B1E4 00198124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B1E8 00198128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B1EC 0019812C 38 00 FF FF */ li r0, -1 /* 8019B1F0 00198130 98 03 00 98 */ stb r0, 0x98(r3) lbl_8019B1F4: @@ -623,8 +623,8 @@ lbl_8019B5DC: /* 8019B614 00198554 28 00 00 00 */ cmplwi r0, 0 /* 8019B618 00198558 40 82 00 2C */ bne lbl_8019B644 /* 8019B61C 0019855C 38 00 00 03 */ li r0, 3 -/* 8019B620 00198560 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B624 00198564 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B620 00198560 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B624 00198564 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B628 00198568 98 03 5E 89 */ stb r0, 0x5e89(r3) /* 8019B62C 0019856C 38 00 00 00 */ li r0, 0 /* 8019B630 00198570 98 03 5E B5 */ stb r0, 0x5eb5(r3) @@ -644,19 +644,19 @@ lbl_8019B644: /* 8019B664 001985A4 40 82 00 18 */ bne lbl_8019B67C lbl_8019B668: /* 8019B668 001985A8 38 00 00 01 */ li r0, 1 -/* 8019B66C 001985AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B670 001985B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B66C 001985AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B670 001985B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B674 001985B4 98 03 5E 89 */ stb r0, 0x5e89(r3) /* 8019B678 001985B8 48 00 00 14 */ b lbl_8019B68C lbl_8019B67C: /* 8019B67C 001985BC 38 00 00 02 */ li r0, 2 -/* 8019B680 001985C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B684 001985C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B680 001985C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B684 001985C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B688 001985C8 98 03 5E 89 */ stb r0, 0x5e89(r3) lbl_8019B68C: /* 8019B68C 001985CC 38 00 00 00 */ li r0, 0 -/* 8019B690 001985D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B694 001985D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B690 001985D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B694 001985D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B698 001985D8 98 03 5E B5 */ stb r0, 0x5eb5(r3) /* 8019B69C 001985DC 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 8019B6A0 001985E0 7F C3 F3 78 */ mr r3, r30 @@ -677,15 +677,15 @@ lbl_8019B68C: /* 8019B6DC 0019861C A0 84 01 C2 */ lhz r4, 0x1c2(r4) /* 8019B6E0 00198620 4B E9 92 C5 */ bl offEventBit__11dSv_event_cFUs lbl_8019B6E4: -/* 8019B6E4 00198624 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B6E8 00198628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B6E4 00198624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B6E8 00198628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B6EC 0019862C 38 63 00 CC */ addi r3, r3, 0xcc /* 8019B6F0 00198630 38 80 00 48 */ li r4, 0x48 /* 8019B6F4 00198634 4B E9 87 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8019B6F8 00198638 2C 03 00 00 */ cmpwi r3, 0 /* 8019B6FC 0019863C 41 82 00 54 */ beq lbl_8019B750 -/* 8019B700 00198640 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B704 00198644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B700 00198640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B704 00198644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B708 00198648 3B C3 00 9C */ addi r30, r3, 0x9c /* 8019B70C 0019864C 7F C3 F3 78 */ mr r3, r30 /* 8019B710 00198650 38 80 00 01 */ li r4, 1 @@ -701,8 +701,8 @@ lbl_8019B6E4: /* 8019B738 00198678 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019B73C 0019867C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8019B740 00198680 A0 03 00 B6 */ lhz r0, 0xb6(r3) -/* 8019B744 00198684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B748 00198688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B744 00198684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B748 00198688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B74C 0019868C B0 03 00 08 */ sth r0, 8(r3) lbl_8019B750: /* 8019B750 00198690 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -717,8 +717,8 @@ lbl_8019B760: /* 8019B770 001986B0 40 82 00 2C */ bne lbl_8019B79C /* 8019B774 001986B4 28 00 00 02 */ cmplwi r0, 2 /* 8019B778 001986B8 40 82 00 24 */ bne lbl_8019B79C -/* 8019B77C 001986BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B780 001986C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B77C 001986BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B780 001986C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B784 001986C4 88 03 5E 89 */ lbz r0, 0x5e89(r3) /* 8019B788 001986C8 28 00 00 01 */ cmplwi r0, 1 /* 8019B78C 001986CC 40 82 00 10 */ bne lbl_8019B79C @@ -748,8 +748,8 @@ dGameover_c_NS__draw: /* 8019B7D8 00198718 80 C3 01 04 */ lwz r6, 0x104(r3) /* 8019B7DC 0019871C 28 06 00 00 */ cmplwi r6, 0 /* 8019B7E0 00198720 41 82 00 28 */ beq lbl_8019B808 -/* 8019B7E4 00198724 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B7E8 00198728 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B7E4 00198724 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B7E8 00198728 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B7EC 0019872C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8019B7F0 00198730 28 00 00 00 */ cmplwi r0, 0 /* 8019B7F4 00198734 41 82 00 14 */ beq lbl_8019B808 @@ -767,8 +767,8 @@ lbl_8019B808: /* 8019B820 00198760 80 DF 01 00 */ lwz r6, 0x100(r31) /* 8019B824 00198764 28 06 00 00 */ cmplwi r6, 0 /* 8019B828 00198768 41 82 00 1C */ beq lbl_8019B844 -/* 8019B82C 0019876C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019B830 00198770 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019B82C 0019876C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019B830 00198770 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B834 00198774 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8019B838 00198778 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8019B83C 0019877C 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -936,8 +936,8 @@ lbl_8019BA54: /* 8019BA8C 001989CC 98 81 00 23 */ stb r4, 0x23(r1) /* 8019BA90 001989D0 38 00 00 FF */ li r0, 0xff /* 8019BA94 001989D4 98 01 00 1F */ stb r0, 0x1f(r1) -/* 8019BA98 001989D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019BA9C 001989DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019BA98 001989D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019BA9C 001989DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019BAA0 001989E0 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 8019BAA4 001989E4 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8019BAA8 001989E8 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1056,8 +1056,8 @@ lbl_8019BC48: /* 8019BC60 00198BA0 7D 89 03 A6 */ mtctr r12 /* 8019BC64 00198BA4 4E 80 04 21 */ bctrl lbl_8019BC68: -/* 8019BC68 00198BA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019BC6C 00198BAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019BC68 00198BA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019BC6C 00198BAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019BC70 00198BB0 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 8019BC74 00198BB4 81 83 00 00 */ lwz r12, 0(r3) /* 8019BC78 00198BB8 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1103,8 +1103,8 @@ dDlst_GameOverScrnDraw_c_NS_setBackAlpha: /* 8019BD08 00198C48 39 61 00 60 */ addi r11, r1, 0x60 /* 8019BD0C 00198C4C 48 1C 64 BD */ bl func_803621C8 /* 8019BD10 00198C50 7C 7E 1B 78 */ mr r30, r3 -/* 8019BD14 00198C54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019BD18 00198C58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019BD14 00198C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019BD18 00198C58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019BD1C 00198C5C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8019BD20 00198C60 7F E3 FB 78 */ mr r3, r31 /* 8019BD24 00198C64 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/d_insect.s b/asm/d/d_insect.s index 2b0d611a72..90013dda0d 100644 --- a/asm/d/d_insect.s +++ b/asm/d/d_insect.s @@ -92,8 +92,8 @@ lbl_8015E148: /* 8015E158 0015B098 3C 04 00 01 */ addis r0, r4, 1 /* 8015E15C 0015B09C 28 00 FF FF */ cmplwi r0, 0xffff /* 8015E160 0015B0A0 41 82 00 14 */ beq lbl_8015E174 -/* 8015E164 0015B0A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E168 0015B0A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015E164 0015B0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E168 0015B0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E16C 0015B0AC 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8015E170 0015B0B0 4B EE 55 7D */ bl dEvt_control_c_NS_setPtI_Id lbl_8015E174: @@ -111,8 +111,8 @@ lbl_8015E188: /* 8015E19C 0015B0DC B0 1F 00 FA */ sth r0, 0xfa(r31) /* 8015E1A0 0015B0E0 48 00 00 B4 */ b lbl_8015E254 lbl_8015E1A4: -/* 8015E1A4 0015B0E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E1A8 0015B0E8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8015E1A4 0015B0E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E1A8 0015B0E8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8015E1AC 0015B0EC 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 8015E1B0 0015B0F0 3C 80 80 39 */ lis r4, lbl_80393D98@ha /* 8015E1B4 0015B0F4 38 84 3D 98 */ addi r4, r4, lbl_80393D98@l @@ -121,8 +121,8 @@ lbl_8015E1A4: /* 8015E1C0 0015B100 41 82 00 94 */ beq lbl_8015E254 /* 8015E1C4 0015B104 38 7E 4E C8 */ addi r3, r30, 0x4ec8 /* 8015E1C8 0015B108 4B EE 42 A1 */ bl dEvt_control_c_NS_reset -/* 8015E1CC 0015B10C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E1D0 0015B110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015E1CC 0015B10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E1D0 0015B110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E1D4 0015B114 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8015E1D8 0015B118 A8 1F 05 82 */ lha r0, 0x582(r31) /* 8015E1DC 0015B11C 54 00 08 3C */ slwi r0, r0, 1 @@ -188,8 +188,8 @@ lbl_8015E254: /* 8015E2C0 0015B200 38 61 00 08 */ addi r3, r1, 8 /* 8015E2C4 0015B204 38 81 00 14 */ addi r4, r1, 0x14 /* 8015E2C8 0015B208 4B EB 70 49 */ bl mDoLib_project -/* 8015E2CC 0015B20C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E2D0 0015B210 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015E2CC 0015B20C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E2D0 0015B210 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E2D4 0015B214 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8015E2D8 0015B218 28 03 00 00 */ cmplwi r3, 0 /* 8015E2DC 0015B21C 41 82 00 0C */ beq lbl_8015E2E8 @@ -212,8 +212,8 @@ lbl_8015E2EC: /* 8015E318 0015B258 EC 00 18 28 */ fsubs f0, f0, f3 /* 8015E31C 0015B25C FC 02 00 40 */ fcmpo cr0, f2, f0 /* 8015E320 0015B260 40 80 00 38 */ bge lbl_8015E358 -/* 8015E324 0015B264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E328 0015B268 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015E324 0015B264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E328 0015B268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E32C 0015B26C 3C 63 00 02 */ addis r3, r3, 2 /* 8015E330 0015B270 FC 00 08 1E */ fctiwz f0, f1 /* 8015E334 0015B274 D8 01 00 20 */ stfd f0, 0x20(r1) @@ -229,8 +229,8 @@ lbl_8015E358: /* 8015E358 0015B298 38 00 00 00 */ li r0, 0 /* 8015E35C 0015B29C 90 1F 05 78 */ stw r0, 0x578(r31) lbl_8015E360: -/* 8015E360 0015B2A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8015E364 0015B2A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8015E360 0015B2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8015E364 0015B2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E368 0015B2A8 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 8015E36C 0015B2AC C3 E3 00 C8 */ lfs f31, 0xc8(r3) /* 8015E370 0015B2B0 C3 C3 00 CC */ lfs f30, 0xcc(r3) diff --git a/asm/d/d_item.s b/asm/d/d_item.s deleted file mode 100644 index bbcced3ceb..0000000000 --- a/asm/d/d_item.s +++ /dev/null @@ -1,4018 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 80097e8c - - -.global execItemGet -execItemGet: -/* 80097E8C 00094DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097E90 00094DD0 7C 08 02 A6 */ mflr r0 -/* 80097E94 00094DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097E98 00094DD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097E9C 00094DDC 7C 7F 1B 78 */ mr r31, r3 -/* 80097EA0 00094DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097EA4 00094DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80097EA8 00094DE8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80097EAC 00094DEC 7F E4 FB 78 */ mr r4, r31 -/* 80097EB0 00094DF0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc -/* 80097EB4 00094DF4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d -/* 80097EB8 00094DF8 3C 60 80 3B */ lis r3, lbl_803AF178@ha -/* 80097EBC 00094DFC 38 63 F1 78 */ addi r3, r3, lbl_803AF178@l -/* 80097EC0 00094E00 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097EC4 00094E04 7D 89 03 A6 */ mtctr r12 -/* 80097EC8 00094E08 4E 80 04 21 */ bctrl -/* 80097ECC 00094E0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097ED0 00094E10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097ED4 00094E14 7C 08 03 A6 */ mtlr r0 -/* 80097ED8 00094E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097EDC 00094E1C 4E 80 00 20 */ blr - -.global checkItemGet -checkItemGet: -/* 80097EE0 00094E20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097EE4 00094E24 7C 08 02 A6 */ mflr r0 -/* 80097EE8 00094E28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097EEC 00094E2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097EF0 00094E30 7C 9F 23 78 */ mr r31, r4 -/* 80097EF4 00094E34 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 80097EF8 00094E38 3C 60 80 3B */ lis r3, lbl_803AF578@ha -/* 80097EFC 00094E3C 38 63 F5 78 */ addi r3, r3, lbl_803AF578@l -/* 80097F00 00094E40 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097F04 00094E44 7D 89 03 A6 */ mtctr r12 -/* 80097F08 00094E48 4E 80 04 21 */ bctrl -/* 80097F0C 00094E4C 2C 03 FF FF */ cmpwi r3, -1 -/* 80097F10 00094E50 40 82 00 08 */ bne lbl_80097F18 -/* 80097F14 00094E54 7F E3 FB 78 */ mr r3, r31 -lbl_80097F18: -/* 80097F18 00094E58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097F1C 00094E5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097F20 00094E60 7C 08 03 A6 */ mtlr r0 -/* 80097F24 00094E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097F28 00094E68 4E 80 00 20 */ blr -/* 80097F2C 00094E6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097F30 00094E70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80097F34 00094E74 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) -/* 80097F38 00094E78 C0 02 91 D8 */ lfs f0, lbl_80452BD8-_SDA2_BASE_(r2) -/* 80097F3C 00094E7C EC 01 00 2A */ fadds f0, f1, f0 -/* 80097F40 00094E80 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80097F44 00094E84 38 00 00 00 */ li r0, 0 -/* 80097F48 00094E88 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 80097F4C 00094E8C 4E 80 00 20 */ blr -/* 80097F50 00094E90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097F54 00094E94 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097F58 00094E98 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F5C 00094E9C 38 03 00 01 */ addi r0, r3, 1 -/* 80097F60 00094EA0 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F64 00094EA4 4E 80 00 20 */ blr -/* 80097F68 00094EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097F6C 00094EAC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097F70 00094EB0 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F74 00094EB4 38 03 00 05 */ addi r0, r3, 5 -/* 80097F78 00094EB8 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F7C 00094EBC 4E 80 00 20 */ blr -/* 80097F80 00094EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097F84 00094EC4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097F88 00094EC8 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F8C 00094ECC 38 03 00 0A */ addi r0, r3, 0xa -/* 80097F90 00094ED0 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F94 00094ED4 4E 80 00 20 */ blr -/* 80097F98 00094ED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097F9C 00094EDC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097FA0 00094EE0 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FA4 00094EE4 38 03 00 14 */ addi r0, r3, 0x14 -/* 80097FA8 00094EE8 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FAC 00094EEC 4E 80 00 20 */ blr -/* 80097FB0 00094EF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097FB4 00094EF4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097FB8 00094EF8 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FBC 00094EFC 38 03 00 32 */ addi r0, r3, 0x32 -/* 80097FC0 00094F00 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FC4 00094F04 4E 80 00 20 */ blr -/* 80097FC8 00094F08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097FCC 00094F0C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097FD0 00094F10 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FD4 00094F14 38 03 00 64 */ addi r0, r3, 0x64 -/* 80097FD8 00094F18 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FDC 00094F1C 4E 80 00 20 */ blr -/* 80097FE0 00094F20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097FE4 00094F24 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80097FE8 00094F28 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FEC 00094F2C 38 03 00 C8 */ addi r0, r3, 0xc8 -/* 80097FF0 00094F30 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FF4 00094F34 4E 80 00 20 */ blr -/* 80097FF8 00094F38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80097FFC 00094F3C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80098000 00094F40 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 80098004 00094F44 38 03 00 04 */ addi r0, r3, 4 -/* 80098008 00094F48 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 8009800C 00094F4C 4E 80 00 20 */ blr -/* 80098010 00094F50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098014 00094F54 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80098018 00094F58 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 8009801C 00094F5C 38 03 00 08 */ addi r0, r3, 8 -/* 80098020 00094F60 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 80098024 00094F64 4E 80 00 20 */ blr -/* 80098028 00094F68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009802C 00094F6C 7C 08 02 A6 */ mflr r0 -/* 80098030 00094F70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098034 00094F74 38 60 00 70 */ li r3, 0x70 -/* 80098038 00094F78 38 80 00 05 */ li r4, 5 -/* 8009803C 00094F7C 48 00 39 05 */ bl addBombCount -/* 80098040 00094F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098044 00094F84 7C 08 03 A6 */ mtlr r0 -/* 80098048 00094F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009804C 00094F8C 4E 80 00 20 */ blr -/* 80098050 00094F90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098054 00094F94 7C 08 02 A6 */ mflr r0 -/* 80098058 00094F98 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009805C 00094F9C 38 60 00 70 */ li r3, 0x70 -/* 80098060 00094FA0 38 80 00 0A */ li r4, 0xa -/* 80098064 00094FA4 48 00 38 DD */ bl addBombCount -/* 80098068 00094FA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009806C 00094FAC 7C 08 03 A6 */ mtlr r0 -/* 80098070 00094FB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098074 00094FB4 4E 80 00 20 */ blr -/* 80098078 00094FB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009807C 00094FBC 7C 08 02 A6 */ mflr r0 -/* 80098080 00094FC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098084 00094FC4 38 60 00 70 */ li r3, 0x70 -/* 80098088 00094FC8 38 80 00 14 */ li r4, 0x14 -/* 8009808C 00094FCC 48 00 38 B5 */ bl addBombCount -/* 80098090 00094FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098094 00094FD4 7C 08 03 A6 */ mtlr r0 -/* 80098098 00094FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009809C 00094FDC 4E 80 00 20 */ blr -/* 800980A0 00094FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800980A4 00094FE4 7C 08 02 A6 */ mflr r0 -/* 800980A8 00094FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800980AC 00094FEC 38 60 00 70 */ li r3, 0x70 -/* 800980B0 00094FF0 38 80 00 1E */ li r4, 0x1e -/* 800980B4 00094FF4 48 00 38 8D */ bl addBombCount -/* 800980B8 00094FF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800980BC 00094FFC 7C 08 03 A6 */ mtlr r0 -/* 800980C0 00095000 38 21 00 10 */ addi r1, r1, 0x10 -/* 800980C4 00095004 4E 80 00 20 */ blr -/* 800980C8 00095008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800980CC 0009500C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800980D0 00095010 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 800980D4 00095014 38 03 00 0A */ addi r0, r3, 0xa -/* 800980D8 00095018 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 800980DC 0009501C 4E 80 00 20 */ blr -/* 800980E0 00095020 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800980E4 00095024 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800980E8 00095028 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 800980EC 0009502C 38 03 00 14 */ addi r0, r3, 0x14 -/* 800980F0 00095030 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 800980F4 00095034 4E 80 00 20 */ blr -/* 800980F8 00095038 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800980FC 0009503C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80098100 00095040 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 80098104 00095044 38 03 00 1E */ addi r0, r3, 0x1e -/* 80098108 00095048 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 8009810C 0009504C 4E 80 00 20 */ blr -/* 80098110 00095050 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098114 00095054 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80098118 00095058 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 8009811C 0009505C 38 03 00 01 */ addi r0, r3, 1 -/* 80098120 00095060 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 80098124 00095064 4E 80 00 20 */ blr -/* 80098128 00095068 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009812C 0009506C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80098130 00095070 A8 64 5D F6 */ lha r3, 0x5df6(r4) -/* 80098134 00095074 38 03 00 32 */ addi r0, r3, 0x32 -/* 80098138 00095078 B0 04 5D F6 */ sth r0, 0x5df6(r4) -/* 8009813C 0009507C 4E 80 00 20 */ blr -/* 80098140 00095080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098144 00095084 7C 08 02 A6 */ mflr r0 -/* 80098148 00095088 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009814C 0009508C 38 60 00 71 */ li r3, 0x71 -/* 80098150 00095090 38 80 00 05 */ li r4, 5 -/* 80098154 00095094 48 00 37 ED */ bl addBombCount -/* 80098158 00095098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009815C 0009509C 7C 08 03 A6 */ mtlr r0 -/* 80098160 000950A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098164 000950A4 4E 80 00 20 */ blr -/* 80098168 000950A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009816C 000950AC 7C 08 02 A6 */ mflr r0 -/* 80098170 000950B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098174 000950B4 38 60 00 71 */ li r3, 0x71 -/* 80098178 000950B8 38 80 00 0A */ li r4, 0xa -/* 8009817C 000950BC 48 00 37 C5 */ bl addBombCount -/* 80098180 000950C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098184 000950C4 7C 08 03 A6 */ mtlr r0 -/* 80098188 000950C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009818C 000950CC 4E 80 00 20 */ blr -/* 80098190 000950D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098194 000950D4 7C 08 02 A6 */ mflr r0 -/* 80098198 000950D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009819C 000950DC 38 60 00 71 */ li r3, 0x71 -/* 800981A0 000950E0 38 80 00 0F */ li r4, 0xf -/* 800981A4 000950E4 48 00 37 9D */ bl addBombCount -/* 800981A8 000950E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981AC 000950EC 7C 08 03 A6 */ mtlr r0 -/* 800981B0 000950F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800981B4 000950F4 4E 80 00 20 */ blr -/* 800981B8 000950F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800981BC 000950FC 7C 08 02 A6 */ mflr r0 -/* 800981C0 00095100 90 01 00 14 */ stw r0, 0x14(r1) -/* 800981C4 00095104 38 60 00 71 */ li r3, 0x71 -/* 800981C8 00095108 38 80 00 03 */ li r4, 3 -/* 800981CC 0009510C 48 00 37 75 */ bl addBombCount -/* 800981D0 00095110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981D4 00095114 7C 08 03 A6 */ mtlr r0 -/* 800981D8 00095118 38 21 00 10 */ addi r1, r1, 0x10 -/* 800981DC 0009511C 4E 80 00 20 */ blr -/* 800981E0 00095120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800981E4 00095124 7C 08 02 A6 */ mflr r0 -/* 800981E8 00095128 90 01 00 14 */ stw r0, 0x14(r1) -/* 800981EC 0009512C 38 60 00 72 */ li r3, 0x72 -/* 800981F0 00095130 38 80 00 05 */ li r4, 5 -/* 800981F4 00095134 48 00 37 4D */ bl addBombCount -/* 800981F8 00095138 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981FC 0009513C 7C 08 03 A6 */ mtlr r0 -/* 80098200 00095140 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098204 00095144 4E 80 00 20 */ blr -/* 80098208 00095148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009820C 0009514C 7C 08 02 A6 */ mflr r0 -/* 80098210 00095150 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098214 00095154 38 60 00 72 */ li r3, 0x72 -/* 80098218 00095158 38 80 00 0A */ li r4, 0xa -/* 8009821C 0009515C 48 00 37 25 */ bl addBombCount -/* 80098220 00095160 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098224 00095164 7C 08 03 A6 */ mtlr r0 -/* 80098228 00095168 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009822C 0009516C 4E 80 00 20 */ blr -/* 80098230 00095170 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098234 00095174 7C 08 02 A6 */ mflr r0 -/* 80098238 00095178 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009823C 0009517C 38 60 00 72 */ li r3, 0x72 -/* 80098240 00095180 38 80 00 03 */ li r4, 3 -/* 80098244 00095184 48 00 36 FD */ bl addBombCount -/* 80098248 00095188 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009824C 0009518C 7C 08 03 A6 */ mtlr r0 -/* 80098250 00095190 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098254 00095194 4E 80 00 20 */ blr -/* 80098258 00095198 4E 80 00 20 */ blr -/* 8009825C 0009519C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098260 000951A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098264 000951A4 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) -/* 80098268 000951A8 C0 02 91 DC */ lfs f0, lbl_80452BDC-_SDA2_BASE_(r2) -/* 8009826C 000951AC EC 01 00 2A */ fadds f0, f1, f0 -/* 80098270 000951B0 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80098274 000951B4 38 00 00 00 */ li r0, 0 -/* 80098278 000951B8 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 8009827C 000951BC 4E 80 00 20 */ blr -/* 80098280 000951C0 4E 80 00 20 */ blr -/* 80098284 000951C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098288 000951C8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 8009828C 000951CC A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 80098290 000951D0 38 03 00 01 */ addi r0, r3, 1 -/* 80098294 000951D4 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80098298 000951D8 4E 80 00 20 */ blr -/* 8009829C 000951DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800982A0 000951E0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800982A4 000951E4 A8 64 5D CA */ lha r3, 0x5dca(r4) -/* 800982A8 000951E8 38 03 00 01 */ addi r0, r3, 1 -/* 800982AC 000951EC B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 800982B0 000951F0 4E 80 00 20 */ blr -/* 800982B4 000951F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800982B8 000951F8 7C 08 02 A6 */ mflr r0 -/* 800982BC 000951FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800982C0 00095200 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800982C4 00095204 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800982C8 00095208 A8 64 5D CA */ lha r3, 0x5dca(r4) -/* 800982CC 0009520C 38 03 00 05 */ addi r0, r3, 5 -/* 800982D0 00095210 B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 800982D4 00095214 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge -/* 800982D8 00095218 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 800982DC 0009521C C8 22 91 E0 */ lfd f1, lbl_80452BE0-_SDA2_BASE_(r2) -/* 800982E0 00095220 90 01 00 0C */ stw r0, 0xc(r1) -/* 800982E4 00095224 3C 00 43 30 */ lis r0, 0x4330 -/* 800982E8 00095228 90 01 00 08 */ stw r0, 8(r1) -/* 800982EC 0009522C C8 01 00 08 */ lfd f0, 8(r1) -/* 800982F0 00095230 EC 20 08 28 */ fsubs f1, f0, f1 -/* 800982F4 00095234 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800982F8 00095238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800982FC 0009523C C0 03 5D C0 */ lfs f0, 0x5dc0(r3) -/* 80098300 00095240 EC 00 08 2A */ fadds f0, f0, f1 -/* 80098304 00095244 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80098308 00095248 38 00 00 00 */ li r0, 0 -/* 8009830C 0009524C 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 80098310 00095250 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 80098314 00095254 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80098318 00095258 7D 89 03 A6 */ mtctr r12 -/* 8009831C 0009525C 4E 80 04 21 */ bctrl -/* 80098320 00095260 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098324 00095264 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098328 00095268 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009832C 0009526C 38 80 00 04 */ li r4, 4 -/* 80098330 00095270 4B F9 C5 E9 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098334 00095274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098338 00095278 7C 08 03 A6 */ mtlr r0 -/* 8009833C 0009527C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098340 00095280 4E 80 00 20 */ blr -/* 80098344 00095284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098348 00095288 7C 08 02 A6 */ mflr r0 -/* 8009834C 0009528C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098350 00095290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098354 00095294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098358 00095298 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009835C 0009529C 38 80 00 00 */ li r4, 0 -/* 80098360 000952A0 4B F9 C5 B9 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098364 000952A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098368 000952A8 7C 08 03 A6 */ mtlr r0 -/* 8009836C 000952AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098370 000952B0 4E 80 00 20 */ blr -/* 80098374 000952B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098378 000952B8 7C 08 02 A6 */ mflr r0 -/* 8009837C 000952BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098380 000952C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098384 000952C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098388 000952C8 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009838C 000952CC 38 80 00 01 */ li r4, 1 -/* 80098390 000952D0 4B F9 C5 89 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098394 000952D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098398 000952D8 7C 08 03 A6 */ mtlr r0 -/* 8009839C 000952DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800983A0 000952E0 4E 80 00 20 */ blr -/* 800983A4 000952E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800983A8 000952E8 7C 08 02 A6 */ mflr r0 -/* 800983AC 000952EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800983B0 000952F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800983B4 000952F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800983B8 000952F8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800983BC 000952FC 38 80 00 06 */ li r4, 6 -/* 800983C0 00095300 4B F9 C5 59 */ bl onDungeonItem__12dSv_memBit_cFi -/* 800983C4 00095304 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800983C8 00095308 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800983CC 0009530C 38 63 00 9C */ addi r3, r3, 0x9c -/* 800983D0 00095310 38 80 00 12 */ li r4, 0x12 -/* 800983D4 00095314 38 A0 00 25 */ li r5, 0x25 -/* 800983D8 00095318 4B F9 AB E1 */ bl setItem__17dSv_player_item_cFiUc -/* 800983DC 0009531C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800983E0 00095320 7C 08 03 A6 */ mtlr r0 -/* 800983E4 00095324 38 21 00 10 */ addi r1, r1, 0x10 -/* 800983E8 00095328 4E 80 00 20 */ blr -/* 800983EC 0009532C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800983F0 00095330 7C 08 02 A6 */ mflr r0 -/* 800983F4 00095334 90 01 00 14 */ stw r0, 0x14(r1) -/* 800983F8 00095338 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800983FC 0009533C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098400 00095340 38 63 09 58 */ addi r3, r3, 0x958 -/* 80098404 00095344 38 80 00 02 */ li r4, 2 -/* 80098408 00095348 4B F9 C5 11 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8009840C 0009534C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098410 00095350 7C 08 03 A6 */ mtlr r0 -/* 80098414 00095354 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098418 00095358 4E 80 00 20 */ blr -/* 8009841C 0009535C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098420 00095360 7C 08 02 A6 */ mflr r0 -/* 80098424 00095364 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098428 00095368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009842C 0009536C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098430 00095370 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098434 00095374 38 80 00 12 */ li r4, 0x12 -/* 80098438 00095378 38 A0 00 27 */ li r5, 0x27 -/* 8009843C 0009537C 4B F9 AB 7D */ bl setItem__17dSv_player_item_cFiUc -/* 80098440 00095380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098444 00095384 7C 08 03 A6 */ mtlr r0 -/* 80098448 00095388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009844C 0009538C 4E 80 00 20 */ blr -/* 80098450 00095390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098454 00095394 7C 08 02 A6 */ mflr r0 -/* 80098458 00095398 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009845C 0009539C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098460 000953A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098464 000953A4 38 63 01 00 */ addi r3, r3, 0x100 -/* 80098468 000953A8 38 80 00 01 */ li r4, 1 -/* 8009846C 000953AC 38 A0 00 00 */ li r5, 0 -/* 80098470 000953B0 4B F9 BD 79 */ bl setCollect__20dSv_player_collect_cFiUc -/* 80098474 000953B4 38 60 00 28 */ li r3, 0x28 -/* 80098478 000953B8 4B F9 6A 49 */ bl dComIfGs_setSelectEquipSword -/* 8009847C 000953BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098480 000953C0 7C 08 03 A6 */ mtlr r0 -/* 80098484 000953C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098488 000953C8 4E 80 00 20 */ blr -/* 8009848C 000953CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098490 000953D0 7C 08 02 A6 */ mflr r0 -/* 80098494 000953D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098498 000953D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009849C 000953DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800984A0 000953E0 38 63 01 00 */ addi r3, r3, 0x100 -/* 800984A4 000953E4 38 80 00 01 */ li r4, 1 -/* 800984A8 000953E8 38 A0 00 01 */ li r5, 1 -/* 800984AC 000953EC 4B F9 BD 3D */ bl setCollect__20dSv_player_collect_cFiUc -/* 800984B0 000953F0 38 60 00 29 */ li r3, 0x29 -/* 800984B4 000953F4 4B F9 6A 0D */ bl dComIfGs_setSelectEquipSword -/* 800984B8 000953F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800984BC 000953FC 7C 08 03 A6 */ mtlr r0 -/* 800984C0 00095400 38 21 00 10 */ addi r1, r1, 0x10 -/* 800984C4 00095404 4E 80 00 20 */ blr -/* 800984C8 00095408 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800984CC 0009540C 7C 08 02 A6 */ mflr r0 -/* 800984D0 00095410 90 01 00 14 */ stw r0, 0x14(r1) -/* 800984D4 00095414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800984D8 00095418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800984DC 0009541C 38 63 01 00 */ addi r3, r3, 0x100 -/* 800984E0 00095420 38 80 00 02 */ li r4, 2 -/* 800984E4 00095424 38 A0 00 00 */ li r5, 0 -/* 800984E8 00095428 4B F9 BD 01 */ bl setCollect__20dSv_player_collect_cFiUc -/* 800984EC 0009542C 38 60 00 2A */ li r3, 0x2a -/* 800984F0 00095430 4B F9 6A A5 */ bl dComIfGs_setSelectEquipShield -/* 800984F4 00095434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800984F8 00095438 7C 08 03 A6 */ mtlr r0 -/* 800984FC 0009543C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098500 00095440 4E 80 00 20 */ blr -/* 80098504 00095444 4E 80 00 20 */ blr -/* 80098508 00095448 4E 80 00 20 */ blr -/* 8009850C 0009544C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098510 00095450 7C 08 02 A6 */ mflr r0 -/* 80098514 00095454 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098518 00095458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009851C 0009545C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098520 00095460 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098524 00095464 38 80 00 12 */ li r4, 0x12 -/* 80098528 00095468 38 A0 00 2D */ li r5, 0x2d -/* 8009852C 0009546C 4B F9 AA 8D */ bl setItem__17dSv_player_item_cFiUc -/* 80098530 00095470 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098534 00095474 7C 08 03 A6 */ mtlr r0 -/* 80098538 00095478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009853C 0009547C 4E 80 00 20 */ blr -/* 80098540 00095480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098544 00095484 7C 08 02 A6 */ mflr r0 -/* 80098548 00095488 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009854C 0009548C 38 60 00 2E */ li r3, 0x2e -/* 80098550 00095490 4B F9 69 61 */ bl dComIfGs_setSelectEquipClothes -/* 80098554 00095494 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098558 00095498 7C 08 03 A6 */ mtlr r0 -/* 8009855C 0009549C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098560 000954A0 4E 80 00 20 */ blr -/* 80098564 000954A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098568 000954A8 7C 08 02 A6 */ mflr r0 -/* 8009856C 000954AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098570 000954B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098574 000954B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098578 000954B8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8009857C 000954BC 38 80 00 00 */ li r4, 0 -/* 80098580 000954C0 38 A0 00 00 */ li r5, 0 -/* 80098584 000954C4 4B F9 BC 65 */ bl setCollect__20dSv_player_collect_cFiUc -/* 80098588 000954C8 38 60 00 2F */ li r3, 0x2f -/* 8009858C 000954CC 4B F9 69 25 */ bl dComIfGs_setSelectEquipClothes -/* 80098590 000954D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098594 000954D4 7C 08 03 A6 */ mtlr r0 -/* 80098598 000954D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009859C 000954DC 4E 80 00 20 */ blr -/* 800985A0 000954E0 4E 80 00 20 */ blr -/* 800985A4 000954E4 4E 80 00 20 */ blr -/* 800985A8 000954E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800985AC 000954EC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800985B0 000954F0 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 800985B4 000954F4 38 03 00 10 */ addi r0, r3, 0x10 -/* 800985B8 000954F8 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 800985BC 000954FC A8 64 5D D0 */ lha r3, 0x5dd0(r4) -/* 800985C0 00095500 38 03 00 10 */ addi r0, r3, 0x10 -/* 800985C4 00095504 B0 04 5D D0 */ sth r0, 0x5dd0(r4) -/* 800985C8 00095508 4E 80 00 20 */ blr -/* 800985CC 0009550C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800985D0 00095510 7C 08 02 A6 */ mflr r0 -/* 800985D4 00095514 90 01 00 14 */ stw r0, 0x14(r1) -/* 800985D8 00095518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800985DC 0009551C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800985E0 00095520 38 63 00 9C */ addi r3, r3, 0x9c -/* 800985E4 00095524 38 80 00 12 */ li r4, 0x12 -/* 800985E8 00095528 38 A0 00 25 */ li r5, 0x25 -/* 800985EC 0009552C 4B F9 A9 CD */ bl setItem__17dSv_player_item_cFiUc -/* 800985F0 00095530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800985F4 00095534 7C 08 03 A6 */ mtlr r0 -/* 800985F8 00095538 38 21 00 10 */ addi r1, r1, 0x10 -/* 800985FC 0009553C 4E 80 00 20 */ blr -/* 80098600 00095540 38 00 00 00 */ li r0, 0 -/* 80098604 00095544 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098608 00095548 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009860C 0009554C 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098610 00095550 4E 80 00 20 */ blr -/* 80098614 00095554 38 00 00 01 */ li r0, 1 -/* 80098618 00095558 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009861C 0009555C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098620 00095560 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098624 00095564 4E 80 00 20 */ blr -/* 80098628 00095568 38 00 00 02 */ li r0, 2 -/* 8009862C 0009556C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098630 00095570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098634 00095574 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098638 00095578 4E 80 00 20 */ blr -/* 8009863C 0009557C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098640 00095580 7C 08 02 A6 */ mflr r0 -/* 80098644 00095584 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098648 00095588 48 00 1A 81 */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009864C 0009558C 2C 03 00 00 */ cmpwi r3, 0 -/* 80098650 00095590 41 82 00 18 */ beq lbl_80098668 -/* 80098654 00095594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098658 00095598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009865C 0009559C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098660 000955A0 4B F9 B6 5D */ bl setRodTypeLevelUp__17dSv_player_item_cFv -/* 80098664 000955A4 48 00 00 1C */ b lbl_80098680 -lbl_80098668: -/* 80098668 000955A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009866C 000955AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098670 000955B0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098674 000955B4 38 80 00 14 */ li r4, 0x14 -/* 80098678 000955B8 38 A0 00 3D */ li r5, 0x3d -/* 8009867C 000955BC 4B F9 A9 3D */ bl setItem__17dSv_player_item_cFiUc -lbl_80098680: -/* 80098680 000955C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098684 000955C4 7C 08 03 A6 */ mtlr r0 -/* 80098688 000955C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009868C 000955CC 4E 80 00 20 */ blr -/* 80098690 000955D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098694 000955D4 7C 08 02 A6 */ mflr r0 -/* 80098698 000955D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009869C 000955DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800986A0 000955E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800986A4 000955E4 38 63 00 9C */ addi r3, r3, 0x9c -/* 800986A8 000955E8 38 80 00 05 */ li r4, 5 -/* 800986AC 000955EC 38 A0 00 3E */ li r5, 0x3e -/* 800986B0 000955F0 4B F9 A9 09 */ bl setItem__17dSv_player_item_cFiUc -/* 800986B4 000955F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800986B8 000955F8 7C 08 03 A6 */ mtlr r0 -/* 800986BC 000955FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800986C0 00095600 4E 80 00 20 */ blr -/* 800986C4 00095604 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800986C8 00095608 7C 08 02 A6 */ mflr r0 -/* 800986CC 0009560C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800986D0 00095610 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800986D4 00095614 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800986D8 00095618 38 63 01 00 */ addi r3, r3, 0x100 -/* 800986DC 0009561C 38 80 00 01 */ li r4, 1 -/* 800986E0 00095620 38 A0 00 02 */ li r5, 2 -/* 800986E4 00095624 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc -/* 800986E8 00095628 38 60 00 3F */ li r3, 0x3f -/* 800986EC 0009562C 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword -/* 800986F0 00095630 88 AD 87 E4 */ lbz r5, lbl_80450D64-_SDA_BASE_(r13) -/* 800986F4 00095634 7C A5 07 74 */ extsb r5, r5 -/* 800986F8 00095638 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800986FC 0009563C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098700 00095640 38 80 00 1C */ li r4, 0x1c -/* 80098704 00095644 4B F9 CA FD */ bl onSwitch__10dSv_info_cFii -/* 80098708 00095648 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009870C 0009564C 7C 08 03 A6 */ mtlr r0 -/* 80098710 00095650 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098714 00095654 4E 80 00 20 */ blr -/* 80098718 00095658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009871C 0009565C 7C 08 02 A6 */ mflr r0 -/* 80098720 00095660 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098724 00095664 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098728 00095668 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009872C 0009566C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098730 00095670 38 80 00 00 */ li r4, 0 -/* 80098734 00095674 38 A0 00 40 */ li r5, 0x40 -/* 80098738 00095678 4B F9 A8 81 */ bl setItem__17dSv_player_item_cFiUc -/* 8009873C 0009567C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098740 00095680 7C 08 03 A6 */ mtlr r0 -/* 80098744 00095684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098748 00095688 4E 80 00 20 */ blr -/* 8009874C 0009568C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098750 00095690 7C 08 02 A6 */ mflr r0 -/* 80098754 00095694 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098758 00095698 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009875C 0009569C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098760 000956A0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098764 000956A4 38 80 00 02 */ li r4, 2 -/* 80098768 000956A8 38 A0 00 41 */ li r5, 0x41 -/* 8009876C 000956AC 4B F9 A8 4D */ bl setItem__17dSv_player_item_cFiUc -/* 80098770 000956B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098774 000956B4 7C 08 03 A6 */ mtlr r0 -/* 80098778 000956B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009877C 000956BC 4E 80 00 20 */ blr -/* 80098780 000956C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098784 000956C4 7C 08 02 A6 */ mflr r0 -/* 80098788 000956C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009878C 000956CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098790 000956D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098794 000956D4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098798 000956D8 38 80 00 06 */ li r4, 6 -/* 8009879C 000956DC 38 A0 00 42 */ li r5, 0x42 -/* 800987A0 000956E0 4B F9 A8 19 */ bl setItem__17dSv_player_item_cFiUc -/* 800987A4 000956E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800987A8 000956E8 7C 08 03 A6 */ mtlr r0 -/* 800987AC 000956EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800987B0 000956F0 4E 80 00 20 */ blr -/* 800987B4 000956F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800987B8 000956F8 7C 08 02 A6 */ mflr r0 -/* 800987BC 000956FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800987C0 00095700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800987C4 00095704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800987C8 00095708 38 63 00 9C */ addi r3, r3, 0x9c -/* 800987CC 0009570C 38 80 00 04 */ li r4, 4 -/* 800987D0 00095710 38 A0 00 43 */ li r5, 0x43 -/* 800987D4 00095714 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc -/* 800987D8 00095718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800987DC 0009571C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800987E0 00095720 38 00 00 1E */ li r0, 0x1e -/* 800987E4 00095724 98 03 00 EC */ stb r0, 0xec(r3) -/* 800987E8 00095728 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 800987EC 0009572C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800987F0 00095730 7C 08 03 A6 */ mtlr r0 -/* 800987F4 00095734 38 21 00 10 */ addi r1, r1, 0x10 -/* 800987F8 00095738 4E 80 00 20 */ blr -/* 800987FC 0009573C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098800 00095740 7C 08 02 A6 */ mflr r0 -/* 80098804 00095744 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098808 00095748 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009880C 0009574C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098810 00095750 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098814 00095754 38 80 00 09 */ li r4, 9 -/* 80098818 00095758 38 A0 00 44 */ li r5, 0x44 -/* 8009881C 0009575C 4B F9 A7 9D */ bl setItem__17dSv_player_item_cFiUc -/* 80098820 00095760 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098824 00095764 7C 08 03 A6 */ mtlr r0 -/* 80098828 00095768 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009882C 0009576C 4E 80 00 20 */ blr -/* 80098830 00095770 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098834 00095774 7C 08 02 A6 */ mflr r0 -/* 80098838 00095778 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009883C 0009577C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098840 00095780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098844 00095784 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098848 00095788 38 80 00 03 */ li r4, 3 -/* 8009884C 0009578C 38 A0 00 45 */ li r5, 0x45 -/* 80098850 00095790 4B F9 A7 69 */ bl setItem__17dSv_player_item_cFiUc -/* 80098854 00095794 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098858 00095798 7C 08 03 A6 */ mtlr r0 -/* 8009885C 0009579C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098860 000957A0 4E 80 00 20 */ blr -/* 80098864 000957A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098868 000957A8 7C 08 02 A6 */ mflr r0 -/* 8009886C 000957AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098870 000957B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098874 000957B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098878 000957B8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009887C 000957BC 38 80 00 08 */ li r4, 8 -/* 80098880 000957C0 38 A0 00 46 */ li r5, 0x46 -/* 80098884 000957C4 4B F9 A7 35 */ bl setItem__17dSv_player_item_cFiUc -/* 80098888 000957C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009888C 000957CC 7C 08 03 A6 */ mtlr r0 -/* 80098890 000957D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098894 000957D4 4E 80 00 20 */ blr -/* 80098898 000957D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009889C 000957DC 7C 08 02 A6 */ mflr r0 -/* 800988A0 000957E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800988A4 000957E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800988A8 000957E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800988AC 000957EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800988B0 000957F0 3B E3 00 9C */ addi r31, r3, 0x9c -/* 800988B4 000957F4 7F E3 FB 78 */ mr r3, r31 -/* 800988B8 000957F8 38 80 00 09 */ li r4, 9 -/* 800988BC 000957FC 38 A0 00 FF */ li r5, 0xff -/* 800988C0 00095800 4B F9 A6 F9 */ bl setItem__17dSv_player_item_cFiUc -/* 800988C4 00095804 7F E3 FB 78 */ mr r3, r31 -/* 800988C8 00095808 38 80 00 0A */ li r4, 0xa -/* 800988CC 0009580C 38 A0 00 47 */ li r5, 0x47 -/* 800988D0 00095810 4B F9 A6 E9 */ bl setItem__17dSv_player_item_cFiUc -/* 800988D4 00095814 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800988D8 00095818 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800988DC 0009581C 7C 08 03 A6 */ mtlr r0 -/* 800988E0 00095820 38 21 00 10 */ addi r1, r1, 0x10 -/* 800988E4 00095824 4E 80 00 20 */ blr -/* 800988E8 00095828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800988EC 0009582C 7C 08 02 A6 */ mflr r0 -/* 800988F0 00095830 90 01 00 14 */ stw r0, 0x14(r1) -/* 800988F4 00095834 38 00 54 60 */ li r0, 0x5460 -/* 800988F8 00095838 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800988FC 0009583C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098900 00095840 B0 03 00 06 */ sth r0, 6(r3) -/* 80098904 00095844 B0 03 00 08 */ sth r0, 8(r3) -/* 80098908 00095848 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009890C 0009584C 38 80 00 01 */ li r4, 1 -/* 80098910 00095850 38 A0 00 48 */ li r5, 0x48 -/* 80098914 00095854 4B F9 A6 A5 */ bl setItem__17dSv_player_item_cFiUc -/* 80098918 00095858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009891C 0009585C 7C 08 03 A6 */ mtlr r0 -/* 80098920 00095860 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098924 00095864 4E 80 00 20 */ blr -/* 80098928 00095868 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009892C 0009586C 7C 08 02 A6 */ mflr r0 -/* 80098930 00095870 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098934 00095874 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098938 00095878 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009893C 0009587C 38 63 01 00 */ addi r3, r3, 0x100 -/* 80098940 00095880 38 80 00 01 */ li r4, 1 -/* 80098944 00095884 38 A0 00 03 */ li r5, 3 -/* 80098948 00095888 4B F9 B8 A1 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8009894C 0009588C 38 60 00 49 */ li r3, 0x49 -/* 80098950 00095890 38 80 00 00 */ li r4, 0 -/* 80098954 00095894 48 18 5B DD */ bl dMeter2Info_setSword -/* 80098958 00095898 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009895C 0009589C 7C 08 03 A6 */ mtlr r0 -/* 80098960 000958A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098964 000958A4 4E 80 00 20 */ blr -/* 80098968 000958A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009896C 000958AC 7C 08 02 A6 */ mflr r0 -/* 80098970 000958B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098974 000958B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098978 000958B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009897C 000958BC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098980 000958C0 38 80 00 14 */ li r4, 0x14 -/* 80098984 000958C4 38 A0 00 4A */ li r5, 0x4a -/* 80098988 000958C8 4B F9 A6 31 */ bl setItem__17dSv_player_item_cFiUc -/* 8009898C 000958CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098990 000958D0 7C 08 03 A6 */ mtlr r0 -/* 80098994 000958D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098998 000958D8 4E 80 00 20 */ blr -/* 8009899C 000958DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800989A0 000958E0 7C 08 02 A6 */ mflr r0 -/* 800989A4 000958E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800989A8 000958E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800989AC 000958EC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 800989B0 000958F0 A8 64 5D F6 */ lha r3, 0x5df6(r4) -/* 800989B4 000958F4 38 03 00 32 */ addi r0, r3, 0x32 -/* 800989B8 000958F8 B0 04 5D F6 */ sth r0, 0x5df6(r4) -/* 800989BC 000958FC 38 64 00 9C */ addi r3, r4, 0x9c -/* 800989C0 00095900 38 80 00 17 */ li r4, 0x17 -/* 800989C4 00095904 38 A0 00 4B */ li r5, 0x4b -/* 800989C8 00095908 4B F9 A5 F1 */ bl setItem__17dSv_player_item_cFiUc -/* 800989CC 0009590C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800989D0 00095910 7C 08 03 A6 */ mtlr r0 -/* 800989D4 00095914 38 21 00 10 */ addi r1, r1, 0x10 -/* 800989D8 00095918 4E 80 00 20 */ blr -/* 800989DC 0009591C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800989E0 00095920 7C 08 02 A6 */ mflr r0 -/* 800989E4 00095924 90 01 00 14 */ stw r0, 0x14(r1) -/* 800989E8 00095928 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800989EC 0009592C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800989F0 00095930 38 63 00 9C */ addi r3, r3, 0x9c -/* 800989F4 00095934 38 80 00 08 */ li r4, 8 -/* 800989F8 00095938 38 A0 00 46 */ li r5, 0x46 -/* 800989FC 0009593C 4B F9 A5 BD */ bl setItem__17dSv_player_item_cFiUc -/* 80098A00 00095940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A04 00095944 7C 08 03 A6 */ mtlr r0 -/* 80098A08 00095948 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A0C 0009594C 4E 80 00 20 */ blr -/* 80098A10 00095950 4E 80 00 20 */ blr -/* 80098A14 00095954 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A18 00095958 7C 08 02 A6 */ mflr r0 -/* 80098A1C 0009595C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A20 00095960 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098A24 00095964 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098A28 00095968 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A2C 0009596C 38 80 00 70 */ li r4, 0x70 -/* 80098A30 00095970 38 A0 00 1E */ li r5, 0x1e -/* 80098A34 00095974 4B F9 B0 D5 */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098A38 00095978 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A3C 0009597C 7C 08 03 A6 */ mtlr r0 -/* 80098A40 00095980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A44 00095984 4E 80 00 20 */ blr -/* 80098A48 00095988 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A4C 0009598C 7C 08 02 A6 */ mflr r0 -/* 80098A50 00095990 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A54 00095994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098A58 00095998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098A5C 0009599C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A60 000959A0 38 80 00 70 */ li r4, 0x70 -/* 80098A64 000959A4 38 A0 00 1E */ li r5, 0x1e -/* 80098A68 000959A8 4B F9 B0 A1 */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098A6C 000959AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A70 000959B0 7C 08 03 A6 */ mtlr r0 -/* 80098A74 000959B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A78 000959B8 4E 80 00 20 */ blr -/* 80098A7C 000959BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A80 000959C0 7C 08 02 A6 */ mflr r0 -/* 80098A84 000959C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A88 000959C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098A8C 000959CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098A90 000959D0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A94 000959D4 38 80 00 04 */ li r4, 4 -/* 80098A98 000959D8 38 A0 00 53 */ li r5, 0x53 -/* 80098A9C 000959DC 4B F9 A5 1D */ bl setItem__17dSv_player_item_cFiUc -/* 80098AA0 000959E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098AA4 000959E4 7C 08 03 A6 */ mtlr r0 -/* 80098AA8 000959E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098AAC 000959EC 4E 80 00 20 */ blr -/* 80098AB0 000959F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098AB4 000959F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098AB8 000959F8 38 00 00 3C */ li r0, 0x3c -/* 80098ABC 000959FC 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AC0 00095A00 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AC4 00095A04 4E 80 00 20 */ blr -/* 80098AC8 00095A08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098ACC 00095A0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098AD0 00095A10 38 00 00 3C */ li r0, 0x3c -/* 80098AD4 00095A14 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AD8 00095A18 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098ADC 00095A1C 4E 80 00 20 */ blr -/* 80098AE0 00095A20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098AE4 00095A24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098AE8 00095A28 38 00 00 64 */ li r0, 0x64 -/* 80098AEC 00095A2C 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AF0 00095A30 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AF4 00095A34 4E 80 00 20 */ blr -/* 80098AF8 00095A38 4E 80 00 20 */ blr -/* 80098AFC 00095A3C 4E 80 00 20 */ blr -/* 80098B00 00095A40 4E 80 00 20 */ blr -/* 80098B04 00095A44 4E 80 00 20 */ blr -/* 80098B08 00095A48 4E 80 00 20 */ blr -/* 80098B0C 00095A4C 4E 80 00 20 */ blr -/* 80098B10 00095A50 4E 80 00 20 */ blr -/* 80098B14 00095A54 4E 80 00 20 */ blr -/* 80098B18 00095A58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B1C 00095A5C 7C 08 02 A6 */ mflr r0 -/* 80098B20 00095A60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B24 00095A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098B28 00095A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098B2C 00095A6C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B30 00095A70 4B F9 A9 65 */ bl setEmptyBottle__17dSv_player_item_cFv -/* 80098B34 00095A74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B38 00095A78 7C 08 03 A6 */ mtlr r0 -/* 80098B3C 00095A7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098B40 00095A80 4E 80 00 20 */ blr -/* 80098B44 00095A84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B48 00095A88 7C 08 02 A6 */ mflr r0 -/* 80098B4C 00095A8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B50 00095A90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098B54 00095A94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098B58 00095A98 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B5C 00095A9C 38 80 00 61 */ li r4, 0x61 -/* 80098B60 00095AA0 4B F9 A8 F1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098B64 00095AA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B68 00095AA8 7C 08 03 A6 */ mtlr r0 -/* 80098B6C 00095AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098B70 00095AB0 4E 80 00 20 */ blr -/* 80098B74 00095AB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B78 00095AB8 7C 08 02 A6 */ mflr r0 -/* 80098B7C 00095ABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B80 00095AC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098B84 00095AC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098B88 00095AC8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B8C 00095ACC 38 80 00 62 */ li r4, 0x62 -/* 80098B90 00095AD0 4B F9 A8 C1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098B94 00095AD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B98 00095AD8 7C 08 03 A6 */ mtlr r0 -/* 80098B9C 00095ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098BA0 00095AE0 4E 80 00 20 */ blr -/* 80098BA4 00095AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098BA8 00095AE8 7C 08 02 A6 */ mflr r0 -/* 80098BAC 00095AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098BB0 00095AF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098BB4 00095AF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098BB8 00095AF8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098BBC 00095AFC 38 80 00 63 */ li r4, 0x63 -/* 80098BC0 00095B00 4B F9 A8 91 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098BC4 00095B04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098BC8 00095B08 7C 08 03 A6 */ mtlr r0 -/* 80098BCC 00095B0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098BD0 00095B10 4E 80 00 20 */ blr -/* 80098BD4 00095B14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098BD8 00095B18 7C 08 02 A6 */ mflr r0 -/* 80098BDC 00095B1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098BE0 00095B20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098BE4 00095B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098BE8 00095B28 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098BEC 00095B2C 38 80 00 64 */ li r4, 0x64 -/* 80098BF0 00095B30 4B F9 A8 61 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098BF4 00095B34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098BF8 00095B38 7C 08 03 A6 */ mtlr r0 -/* 80098BFC 00095B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C00 00095B40 4E 80 00 20 */ blr -/* 80098C04 00095B44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C08 00095B48 7C 08 02 A6 */ mflr r0 -/* 80098C0C 00095B4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C10 00095B50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098C14 00095B54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098C18 00095B58 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C1C 00095B5C 38 80 00 65 */ li r4, 0x65 -/* 80098C20 00095B60 4B F9 A8 F5 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80098C24 00095B64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C28 00095B68 7C 08 03 A6 */ mtlr r0 -/* 80098C2C 00095B6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C30 00095B70 4E 80 00 20 */ blr -/* 80098C34 00095B74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C38 00095B78 7C 08 02 A6 */ mflr r0 -/* 80098C3C 00095B7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C40 00095B80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098C44 00095B84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098C48 00095B88 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C4C 00095B8C 38 80 00 66 */ li r4, 0x66 -/* 80098C50 00095B90 4B F9 A8 01 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098C54 00095B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C58 00095B98 7C 08 03 A6 */ mtlr r0 -/* 80098C5C 00095B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C60 00095BA0 4E 80 00 20 */ blr -/* 80098C64 00095BA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C68 00095BA8 7C 08 02 A6 */ mflr r0 -/* 80098C6C 00095BAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C70 00095BB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098C74 00095BB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098C78 00095BB8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C7C 00095BBC 38 80 00 67 */ li r4, 0x67 -/* 80098C80 00095BC0 4B F9 A7 D1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098C84 00095BC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C88 00095BC8 7C 08 03 A6 */ mtlr r0 -/* 80098C8C 00095BCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C90 00095BD0 4E 80 00 20 */ blr -/* 80098C94 00095BD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C98 00095BD8 7C 08 02 A6 */ mflr r0 -/* 80098C9C 00095BDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098CA0 00095BE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098CA4 00095BE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098CA8 00095BE8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098CAC 00095BEC 38 80 00 66 */ li r4, 0x66 -/* 80098CB0 00095BF0 4B F9 A7 A1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098CB4 00095BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098CB8 00095BF8 7C 08 03 A6 */ mtlr r0 -/* 80098CBC 00095BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098CC0 00095C00 4E 80 00 20 */ blr -/* 80098CC4 00095C04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098CC8 00095C08 7C 08 02 A6 */ mflr r0 -/* 80098CCC 00095C0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098CD0 00095C10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098CD4 00095C14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098CD8 00095C18 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098CDC 00095C1C 38 80 00 61 */ li r4, 0x61 -/* 80098CE0 00095C20 4B F9 A7 71 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098CE4 00095C24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098CE8 00095C28 7C 08 03 A6 */ mtlr r0 -/* 80098CEC 00095C2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098CF0 00095C30 4E 80 00 20 */ blr -/* 80098CF4 00095C34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098CF8 00095C38 7C 08 02 A6 */ mflr r0 -/* 80098CFC 00095C3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D00 00095C40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098D04 00095C44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098D08 00095C48 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D0C 00095C4C 38 80 00 6A */ li r4, 0x6a -/* 80098D10 00095C50 4B F9 A7 41 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D14 00095C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D18 00095C58 7C 08 03 A6 */ mtlr r0 -/* 80098D1C 00095C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D20 00095C60 4E 80 00 20 */ blr -/* 80098D24 00095C64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D28 00095C68 7C 08 02 A6 */ mflr r0 -/* 80098D2C 00095C6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D30 00095C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098D34 00095C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098D38 00095C78 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D3C 00095C7C 38 80 00 6B */ li r4, 0x6b -/* 80098D40 00095C80 4B F9 A7 11 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D44 00095C84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D48 00095C88 7C 08 03 A6 */ mtlr r0 -/* 80098D4C 00095C8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D50 00095C90 4E 80 00 20 */ blr -/* 80098D54 00095C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D58 00095C98 7C 08 02 A6 */ mflr r0 -/* 80098D5C 00095C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D60 00095CA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098D64 00095CA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098D68 00095CA8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D6C 00095CAC 38 80 00 6C */ li r4, 0x6c -/* 80098D70 00095CB0 4B F9 A6 E1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D74 00095CB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D78 00095CB8 7C 08 03 A6 */ mtlr r0 -/* 80098D7C 00095CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D80 00095CC0 4E 80 00 20 */ blr -/* 80098D84 00095CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D88 00095CC8 7C 08 02 A6 */ mflr r0 -/* 80098D8C 00095CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D90 00095CD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098D94 00095CD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098D98 00095CD8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D9C 00095CDC 38 80 00 6B */ li r4, 0x6b -/* 80098DA0 00095CE0 4B F9 A6 B1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098DA4 00095CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098DA8 00095CE8 7C 08 03 A6 */ mtlr r0 -/* 80098DAC 00095CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098DB0 00095CF0 4E 80 00 20 */ blr -/* 80098DB4 00095CF4 4E 80 00 20 */ blr -/* 80098DB8 00095CF8 4E 80 00 20 */ blr -/* 80098DBC 00095CFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098DC0 00095D00 7C 08 02 A6 */ mflr r0 -/* 80098DC4 00095D04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098DC8 00095D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098DCC 00095D0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098DD0 00095D10 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098DD4 00095D14 38 80 00 70 */ li r4, 0x70 -/* 80098DD8 00095D18 38 A0 00 3C */ li r5, 0x3c -/* 80098DDC 00095D1C 4B F9 AD 2D */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098DE0 00095D20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098DE4 00095D24 7C 08 03 A6 */ mtlr r0 -/* 80098DE8 00095D28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098DEC 00095D2C 4E 80 00 20 */ blr -/* 80098DF0 00095D30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098DF4 00095D34 7C 08 02 A6 */ mflr r0 -/* 80098DF8 00095D38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098DFC 00095D3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80098E00 00095D40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098E04 00095D44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098E08 00095D48 3B E3 00 9C */ addi r31, r3, 0x9c -/* 80098E0C 00095D4C 7F E3 FB 78 */ mr r3, r31 -/* 80098E10 00095D50 4B F9 AC 79 */ bl setEmptyBombBag__17dSv_player_item_cFv -/* 80098E14 00095D54 7F E3 FB 78 */ mr r3, r31 -/* 80098E18 00095D58 38 80 00 71 */ li r4, 0x71 -/* 80098E1C 00095D5C 38 A0 00 01 */ li r5, 1 -/* 80098E20 00095D60 4B F9 AC 01 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb -/* 80098E24 00095D64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80098E28 00095D68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098E2C 00095D6C 7C 08 03 A6 */ mtlr r0 -/* 80098E30 00095D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098E34 00095D74 4E 80 00 20 */ blr -/* 80098E38 00095D78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098E3C 00095D7C 7C 08 02 A6 */ mflr r0 -/* 80098E40 00095D80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098E44 00095D84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80098E48 00095D88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098E4C 00095D8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098E50 00095D90 3B E3 00 9C */ addi r31, r3, 0x9c -/* 80098E54 00095D94 7F E3 FB 78 */ mr r3, r31 -/* 80098E58 00095D98 4B F9 AC 31 */ bl setEmptyBombBag__17dSv_player_item_cFv -/* 80098E5C 00095D9C 7F E3 FB 78 */ mr r3, r31 -/* 80098E60 00095DA0 38 80 00 72 */ li r4, 0x72 -/* 80098E64 00095DA4 38 A0 00 01 */ li r5, 1 -/* 80098E68 00095DA8 4B F9 AB B9 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb -/* 80098E6C 00095DAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80098E70 00095DB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098E74 00095DB4 7C 08 03 A6 */ mtlr r0 -/* 80098E78 00095DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098E7C 00095DBC 4E 80 00 20 */ blr -/* 80098E80 00095DC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098E84 00095DC4 7C 08 02 A6 */ mflr r0 -/* 80098E88 00095DC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098E8C 00095DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098E90 00095DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098E94 00095DD4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098E98 00095DD8 38 80 00 73 */ li r4, 0x73 -/* 80098E9C 00095DDC 4B F9 A5 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098EA0 00095DE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098EA4 00095DE4 7C 08 03 A6 */ mtlr r0 -/* 80098EA8 00095DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098EAC 00095DEC 4E 80 00 20 */ blr -/* 80098EB0 00095DF0 4E 80 00 20 */ blr -/* 80098EB4 00095DF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098EB8 00095DF8 7C 08 02 A6 */ mflr r0 -/* 80098EBC 00095DFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098EC0 00095E00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098EC4 00095E04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098EC8 00095E08 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098ECC 00095E0C 38 80 00 73 */ li r4, 0x73 -/* 80098ED0 00095E10 4B F9 A6 45 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80098ED4 00095E14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098ED8 00095E18 7C 08 03 A6 */ mtlr r0 -/* 80098EDC 00095E1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098EE0 00095E20 4E 80 00 20 */ blr - -.global item_func_BEE_CHILD -item_func_BEE_CHILD: -/* 80098EE4 00095E24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80098EE8 00095E28 7C 08 02 A6 */ mflr r0 -/* 80098EEC 00095E2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80098EF0 00095E30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098EF4 00095E34 48 2C 92 E9 */ bl _savegpr_29 -/* 80098EF8 00095E38 3B C0 00 FF */ li r30, 0xff -/* 80098EFC 00095E3C 3B A0 00 00 */ li r29, 0 -/* 80098F00 00095E40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098F04 00095E44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098F08 00095E48 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_80098F0C: -/* 80098F0C 00095E4C 7F E3 FB 78 */ mr r3, r31 -/* 80098F10 00095E50 38 9D 00 0B */ addi r4, r29, 0xb -/* 80098F14 00095E54 38 A0 00 01 */ li r5, 1 -/* 80098F18 00095E58 4B F9 A1 19 */ bl getItem__17dSv_player_item_cCFib -/* 80098F1C 00095E5C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80098F20 00095E60 28 00 00 60 */ cmplwi r0, 0x60 -/* 80098F24 00095E64 40 82 00 0C */ bne lbl_80098F30 -/* 80098F28 00095E68 7F BE EB 78 */ mr r30, r29 -/* 80098F2C 00095E6C 48 00 00 10 */ b lbl_80098F3C -lbl_80098F30: -/* 80098F30 00095E70 3B BD 00 01 */ addi r29, r29, 1 -/* 80098F34 00095E74 2C 1D 00 04 */ cmpwi r29, 4 -/* 80098F38 00095E78 41 80 FF D4 */ blt lbl_80098F0C -lbl_80098F3C: -/* 80098F3C 00095E7C 2C 1E 00 FF */ cmpwi r30, 0xff -/* 80098F40 00095E80 41 82 00 28 */ beq lbl_80098F68 -/* 80098F44 00095E84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098F48 00095E88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098F4C 00095E8C 38 63 00 EC */ addi r3, r3, 0xec -/* 80098F50 00095E90 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80098F54 00095E94 38 A0 00 0A */ li r5, 0xa -/* 80098F58 00095E98 4B F9 B0 35 */ bl setBottleNum__24dSv_player_item_record_cFUcUc -/* 80098F5C 00095E9C 7F E3 FB 78 */ mr r3, r31 -/* 80098F60 00095EA0 38 80 00 76 */ li r4, 0x76 -/* 80098F64 00095EA4 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -lbl_80098F68: -/* 80098F68 00095EA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098F6C 00095EAC 48 2C 92 BD */ bl _restgpr_29 -/* 80098F70 00095EB0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80098F74 00095EB4 7C 08 03 A6 */ mtlr r0 -/* 80098F78 00095EB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80098F7C 00095EBC 4E 80 00 20 */ blr -/* 80098F80 00095EC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098F84 00095EC4 7C 08 02 A6 */ mflr r0 -/* 80098F88 00095EC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098F8C 00095ECC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098F90 00095ED0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098F94 00095ED4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098F98 00095ED8 38 80 00 77 */ li r4, 0x77 -/* 80098F9C 00095EDC 4B F9 A4 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098FA0 00095EE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098FA4 00095EE4 7C 08 03 A6 */ mtlr r0 -/* 80098FA8 00095EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098FAC 00095EEC 4E 80 00 20 */ blr -/* 80098FB0 00095EF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098FB4 00095EF4 7C 08 02 A6 */ mflr r0 -/* 80098FB8 00095EF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098FBC 00095EFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098FC0 00095F00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098FC4 00095F04 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098FC8 00095F08 38 80 00 78 */ li r4, 0x78 -/* 80098FCC 00095F0C 4B F9 A4 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098FD0 00095F10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098FD4 00095F14 7C 08 03 A6 */ mtlr r0 -/* 80098FD8 00095F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098FDC 00095F1C 4E 80 00 20 */ blr -/* 80098FE0 00095F20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098FE4 00095F24 7C 08 02 A6 */ mflr r0 -/* 80098FE8 00095F28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098FEC 00095F2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80098FF0 00095F30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80098FF4 00095F34 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098FF8 00095F38 38 80 00 79 */ li r4, 0x79 -/* 80098FFC 00095F3C 4B F9 A4 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099000 00095F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099004 00095F44 7C 08 03 A6 */ mtlr r0 -/* 80099008 00095F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009900C 00095F4C 4E 80 00 20 */ blr -/* 80099010 00095F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099014 00095F54 7C 08 02 A6 */ mflr r0 -/* 80099018 00095F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009901C 00095F5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099020 00095F60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099024 00095F64 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099028 00095F68 38 80 00 7A */ li r4, 0x7a -/* 8009902C 00095F6C 4B F9 A4 25 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099030 00095F70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099034 00095F74 7C 08 03 A6 */ mtlr r0 -/* 80099038 00095F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009903C 00095F7C 4E 80 00 20 */ blr -/* 80099040 00095F80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099044 00095F84 7C 08 02 A6 */ mflr r0 -/* 80099048 00095F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009904C 00095F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099050 00095F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099054 00095F94 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099058 00095F98 38 80 00 7B */ li r4, 0x7b -/* 8009905C 00095F9C 4B F9 A3 F5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099060 00095FA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099064 00095FA4 7C 08 03 A6 */ mtlr r0 -/* 80099068 00095FA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009906C 00095FAC 4E 80 00 20 */ blr -/* 80099070 00095FB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099074 00095FB4 7C 08 02 A6 */ mflr r0 -/* 80099078 00095FB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009907C 00095FBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099080 00095FC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099084 00095FC4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099088 00095FC8 38 80 00 7C */ li r4, 0x7c -/* 8009908C 00095FCC 4B F9 A3 C5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099090 00095FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099094 00095FD4 7C 08 03 A6 */ mtlr r0 -/* 80099098 00095FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009909C 00095FDC 4E 80 00 20 */ blr -/* 800990A0 00095FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800990A4 00095FE4 7C 08 02 A6 */ mflr r0 -/* 800990A8 00095FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800990AC 00095FEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800990B0 00095FF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800990B4 00095FF4 38 63 00 9C */ addi r3, r3, 0x9c -/* 800990B8 00095FF8 38 80 00 7D */ li r4, 0x7d -/* 800990BC 00095FFC 4B F9 A3 95 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800990C0 00096000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800990C4 00096004 7C 08 03 A6 */ mtlr r0 -/* 800990C8 00096008 38 21 00 10 */ addi r1, r1, 0x10 -/* 800990CC 0009600C 4E 80 00 20 */ blr -/* 800990D0 00096010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800990D4 00096014 7C 08 02 A6 */ mflr r0 -/* 800990D8 00096018 90 01 00 14 */ stw r0, 0x14(r1) -/* 800990DC 0009601C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800990E0 00096020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800990E4 00096024 38 63 00 9C */ addi r3, r3, 0x9c -/* 800990E8 00096028 38 80 00 7E */ li r4, 0x7e -/* 800990EC 0009602C 4B F9 A3 65 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800990F0 00096030 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800990F4 00096034 7C 08 03 A6 */ mtlr r0 -/* 800990F8 00096038 38 21 00 10 */ addi r1, r1, 0x10 -/* 800990FC 0009603C 4E 80 00 20 */ blr -/* 80099100 00096040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099104 00096044 7C 08 02 A6 */ mflr r0 -/* 80099108 00096048 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009910C 0009604C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099110 00096050 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099114 00096054 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099118 00096058 38 80 00 7F */ li r4, 0x7f -/* 8009911C 0009605C 4B F9 A3 35 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099120 00096060 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099124 00096064 7C 08 03 A6 */ mtlr r0 -/* 80099128 00096068 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009912C 0009606C 4E 80 00 20 */ blr -/* 80099130 00096070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099134 00096074 7C 08 02 A6 */ mflr r0 -/* 80099138 00096078 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009913C 0009607C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099140 00096080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099144 00096084 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099148 00096088 38 80 00 15 */ li r4, 0x15 -/* 8009914C 0009608C 38 A0 00 80 */ li r5, 0x80 -/* 80099150 00096090 4B F9 9E 69 */ bl setItem__17dSv_player_item_cFiUc -/* 80099154 00096094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099158 00096098 7C 08 03 A6 */ mtlr r0 -/* 8009915C 0009609C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099160 000960A0 4E 80 00 20 */ blr -/* 80099164 000960A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099168 000960A8 7C 08 02 A6 */ mflr r0 -/* 8009916C 000960AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099170 000960B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099174 000960B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099178 000960B8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009917C 000960BC 38 80 00 15 */ li r4, 0x15 -/* 80099180 000960C0 38 A0 00 81 */ li r5, 0x81 -/* 80099184 000960C4 4B F9 9E 35 */ bl setItem__17dSv_player_item_cFiUc -/* 80099188 000960C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009918C 000960CC 7C 08 03 A6 */ mtlr r0 -/* 80099190 000960D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099194 000960D4 4E 80 00 20 */ blr -/* 80099198 000960D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009919C 000960DC 7C 08 02 A6 */ mflr r0 -/* 800991A0 000960E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800991A4 000960E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800991A8 000960E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800991AC 000960EC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800991B0 000960F0 3C 80 80 3A */ lis r4, lbl_803A7288@ha -/* 800991B4 000960F4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l -/* 800991B8 000960F8 A0 84 02 36 */ lhz r4, 0x236(r4) -/* 800991BC 000960FC 4B F9 B7 D1 */ bl onEventBit__11dSv_event_cFUs -/* 800991C0 00096100 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800991C4 00096104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800991C8 00096108 38 63 00 9C */ addi r3, r3, 0x9c -/* 800991CC 0009610C 38 80 00 15 */ li r4, 0x15 -/* 800991D0 00096110 38 A0 00 82 */ li r5, 0x82 -/* 800991D4 00096114 4B F9 9D E5 */ bl setItem__17dSv_player_item_cFiUc -/* 800991D8 00096118 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800991DC 0009611C 7C 08 03 A6 */ mtlr r0 -/* 800991E0 00096120 38 21 00 10 */ addi r1, r1, 0x10 -/* 800991E4 00096124 4E 80 00 20 */ blr -/* 800991E8 00096128 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800991EC 0009612C 7C 08 02 A6 */ mflr r0 -/* 800991F0 00096130 90 01 00 14 */ stw r0, 0x14(r1) -/* 800991F4 00096134 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800991F8 00096138 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800991FC 0009613C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099200 00096140 38 80 00 15 */ li r4, 0x15 -/* 80099204 00096144 38 A0 00 83 */ li r5, 0x83 -/* 80099208 00096148 4B F9 9D B1 */ bl setItem__17dSv_player_item_cFiUc -/* 8009920C 0009614C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099210 00096150 7C 08 03 A6 */ mtlr r0 -/* 80099214 00096154 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099218 00096158 4E 80 00 20 */ blr -/* 8009921C 0009615C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099220 00096160 7C 08 02 A6 */ mflr r0 -/* 80099224 00096164 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099228 00096168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009922C 0009616C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099230 00096170 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099234 00096174 38 80 00 15 */ li r4, 0x15 -/* 80099238 00096178 38 A0 00 84 */ li r5, 0x84 -/* 8009923C 0009617C 4B F9 9D 7D */ bl setItem__17dSv_player_item_cFiUc -/* 80099240 00096180 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099244 00096184 7C 08 03 A6 */ mtlr r0 -/* 80099248 00096188 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009924C 0009618C 4E 80 00 20 */ blr -/* 80099250 00096190 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099254 00096194 7C 08 02 A6 */ mflr r0 -/* 80099258 00096198 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009925C 0009619C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099260 000961A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099264 000961A4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099268 000961A8 38 80 00 13 */ li r4, 0x13 -/* 8009926C 000961AC 38 A0 00 90 */ li r5, 0x90 -/* 80099270 000961B0 4B F9 9D 49 */ bl setItem__17dSv_player_item_cFiUc -/* 80099274 000961B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099278 000961B8 7C 08 03 A6 */ mtlr r0 -/* 8009927C 000961BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099280 000961C0 4E 80 00 20 */ blr -/* 80099284 000961C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099288 000961C8 7C 08 02 A6 */ mflr r0 -/* 8009928C 000961CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099290 000961D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099294 000961D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099298 000961D8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009929C 000961DC 38 80 00 13 */ li r4, 0x13 -/* 800992A0 000961E0 38 A0 00 91 */ li r5, 0x91 -/* 800992A4 000961E4 4B F9 9D 15 */ bl setItem__17dSv_player_item_cFiUc -/* 800992A8 000961E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800992AC 000961EC 7C 08 03 A6 */ mtlr r0 -/* 800992B0 000961F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800992B4 000961F4 4E 80 00 20 */ blr -/* 800992B8 000961F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800992BC 000961FC 7C 08 02 A6 */ mflr r0 -/* 800992C0 00096200 90 01 00 14 */ stw r0, 0x14(r1) -/* 800992C4 00096204 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800992C8 00096208 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800992CC 0009620C 38 63 00 9C */ addi r3, r3, 0x9c -/* 800992D0 00096210 38 80 00 7B */ li r4, 0x7b -/* 800992D4 00096214 4B F9 A1 7D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800992D8 00096218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800992DC 0009621C 7C 08 03 A6 */ mtlr r0 -/* 800992E0 00096220 38 21 00 10 */ addi r1, r1, 0x10 -/* 800992E4 00096224 4E 80 00 20 */ blr -/* 800992E8 00096228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800992EC 0009622C 7C 08 02 A6 */ mflr r0 -/* 800992F0 00096230 90 01 00 14 */ stw r0, 0x14(r1) -/* 800992F4 00096234 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800992F8 00096238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800992FC 0009623C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099300 00096240 38 80 00 66 */ li r4, 0x66 -/* 80099304 00096244 4B F9 A2 11 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80099308 00096248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009930C 0009624C 7C 08 03 A6 */ mtlr r0 -/* 80099310 00096250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099314 00096254 4E 80 00 20 */ blr -/* 80099318 00096258 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009931C 0009625C 7C 08 02 A6 */ mflr r0 -/* 80099320 00096260 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099324 00096264 4B FF FB C1 */ bl item_func_BEE_CHILD -/* 80099328 00096268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009932C 0009626C 7C 08 03 A6 */ mtlr r0 -/* 80099330 00096270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099334 00096274 4E 80 00 20 */ blr -/* 80099338 00096278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009933C 0009627C 7C 08 02 A6 */ mflr r0 -/* 80099340 00096280 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099344 00096284 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099348 00096288 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009934C 0009628C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099350 00096290 38 80 00 9F */ li r4, 0x9f -/* 80099354 00096294 4B F9 A0 FD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099358 00096298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009935C 0009629C 7C 08 03 A6 */ mtlr r0 -/* 80099360 000962A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099364 000962A4 4E 80 00 20 */ blr -/* 80099368 000962A8 4E 80 00 20 */ blr -/* 8009936C 000962AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099370 000962B0 7C 08 02 A6 */ mflr r0 -/* 80099374 000962B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099378 000962B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009937C 000962BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099380 000962C0 38 63 01 14 */ addi r3, r3, 0x114 -/* 80099384 000962C4 38 80 00 00 */ li r4, 0 -/* 80099388 000962C8 4B F9 AF E1 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 8009938C 000962CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099390 000962D0 7C 08 03 A6 */ mtlr r0 -/* 80099394 000962D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099398 000962D8 4E 80 00 20 */ blr -/* 8009939C 000962DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800993A0 000962E0 7C 08 02 A6 */ mflr r0 -/* 800993A4 000962E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800993A8 000962E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800993AC 000962EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800993B0 000962F0 38 63 01 14 */ addi r3, r3, 0x114 -/* 800993B4 000962F4 38 80 00 01 */ li r4, 1 -/* 800993B8 000962F8 4B F9 AF B1 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 800993BC 000962FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800993C0 00096300 7C 08 03 A6 */ mtlr r0 -/* 800993C4 00096304 38 21 00 10 */ addi r1, r1, 0x10 -/* 800993C8 00096308 4E 80 00 20 */ blr -/* 800993CC 0009630C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800993D0 00096310 7C 08 02 A6 */ mflr r0 -/* 800993D4 00096314 90 01 00 14 */ stw r0, 0x14(r1) -/* 800993D8 00096318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800993DC 0009631C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800993E0 00096320 38 63 01 14 */ addi r3, r3, 0x114 -/* 800993E4 00096324 38 80 00 02 */ li r4, 2 -/* 800993E8 00096328 4B F9 AF 81 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 800993EC 0009632C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800993F0 00096330 7C 08 03 A6 */ mtlr r0 -/* 800993F4 00096334 38 21 00 10 */ addi r1, r1, 0x10 -/* 800993F8 00096338 4E 80 00 20 */ blr -/* 800993FC 0009633C 4E 80 00 20 */ blr -/* 80099400 00096340 4E 80 00 20 */ blr -/* 80099404 00096344 4E 80 00 20 */ blr -/* 80099408 00096348 4E 80 00 20 */ blr -/* 8009940C 0009634C 4E 80 00 20 */ blr -/* 80099410 00096350 4E 80 00 20 */ blr -/* 80099414 00096354 4E 80 00 20 */ blr -/* 80099418 00096358 4E 80 00 20 */ blr -/* 8009941C 0009635C 4E 80 00 20 */ blr -/* 80099420 00096360 4E 80 00 20 */ blr -/* 80099424 00096364 4E 80 00 20 */ blr -/* 80099428 00096368 4E 80 00 20 */ blr -/* 8009942C 0009636C 4E 80 00 20 */ blr -/* 80099430 00096370 4E 80 00 20 */ blr -/* 80099434 00096374 4E 80 00 20 */ blr -/* 80099438 00096378 4E 80 00 20 */ blr -/* 8009943C 0009637C 4E 80 00 20 */ blr -/* 80099440 00096380 4E 80 00 20 */ blr -/* 80099444 00096384 4E 80 00 20 */ blr -/* 80099448 00096388 4E 80 00 20 */ blr -/* 8009944C 0009638C 4E 80 00 20 */ blr -/* 80099450 00096390 4E 80 00 20 */ blr -/* 80099454 00096394 4E 80 00 20 */ blr -/* 80099458 00096398 4E 80 00 20 */ blr -/* 8009945C 0009639C 4E 80 00 20 */ blr -/* 80099460 000963A0 4E 80 00 20 */ blr -/* 80099464 000963A4 4E 80 00 20 */ blr -/* 80099468 000963A8 4E 80 00 20 */ blr -/* 8009946C 000963AC 4E 80 00 20 */ blr -/* 80099470 000963B0 4E 80 00 20 */ blr -/* 80099474 000963B4 4E 80 00 20 */ blr -/* 80099478 000963B8 4E 80 00 20 */ blr -/* 8009947C 000963BC 4E 80 00 20 */ blr -/* 80099480 000963C0 4E 80 00 20 */ blr -/* 80099484 000963C4 4E 80 00 20 */ blr -/* 80099488 000963C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009948C 000963CC 7C 08 02 A6 */ mflr r0 -/* 80099490 000963D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099494 000963D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099498 000963D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009949C 000963DC 38 63 00 9C */ addi r3, r3, 0x9c -/* 800994A0 000963E0 38 80 00 16 */ li r4, 0x16 -/* 800994A4 000963E4 38 A0 00 E9 */ li r5, 0xe9 -/* 800994A8 000963E8 4B F9 9B 11 */ bl setItem__17dSv_player_item_cFiUc -/* 800994AC 000963EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800994B0 000963F0 7C 08 03 A6 */ mtlr r0 -/* 800994B4 000963F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800994B8 000963F8 4E 80 00 20 */ blr -/* 800994BC 000963FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800994C0 00096400 7C 08 02 A6 */ mflr r0 -/* 800994C4 00096404 90 01 00 14 */ stw r0, 0x14(r1) -/* 800994C8 00096408 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800994CC 0009640C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800994D0 00096410 38 63 00 9C */ addi r3, r3, 0x9c -/* 800994D4 00096414 38 80 00 16 */ li r4, 0x16 -/* 800994D8 00096418 38 A0 00 EA */ li r5, 0xea -/* 800994DC 0009641C 4B F9 9A DD */ bl setItem__17dSv_player_item_cFiUc -/* 800994E0 00096420 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800994E4 00096424 7C 08 03 A6 */ mtlr r0 -/* 800994E8 00096428 38 21 00 10 */ addi r1, r1, 0x10 -/* 800994EC 0009642C 4E 80 00 20 */ blr -/* 800994F0 00096430 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800994F4 00096434 7C 08 02 A6 */ mflr r0 -/* 800994F8 00096438 90 01 00 14 */ stw r0, 0x14(r1) -/* 800994FC 0009643C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099500 00096440 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099504 00096444 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099508 00096448 38 80 00 16 */ li r4, 0x16 -/* 8009950C 0009644C 38 A0 00 EB */ li r5, 0xeb -/* 80099510 00096450 4B F9 9A A9 */ bl setItem__17dSv_player_item_cFiUc -/* 80099514 00096454 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099518 00096458 7C 08 03 A6 */ mtlr r0 -/* 8009951C 0009645C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099520 00096460 4E 80 00 20 */ blr -/* 80099524 00096464 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099528 00096468 7C 08 02 A6 */ mflr r0 -/* 8009952C 0009646C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099530 00096470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099534 00096474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099538 00096478 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009953C 0009647C 38 80 00 12 */ li r4, 0x12 -/* 80099540 00096480 38 A0 00 EC */ li r5, 0xec -/* 80099544 00096484 4B F9 9A 75 */ bl setItem__17dSv_player_item_cFiUc -/* 80099548 00096488 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009954C 0009648C 7C 08 03 A6 */ mtlr r0 -/* 80099550 00096490 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099554 00096494 4E 80 00 20 */ blr -/* 80099558 00096498 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009955C 0009649C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80099560 000964A0 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80099564 000964A4 38 03 00 32 */ addi r0, r3, 0x32 -/* 80099568 000964A8 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 8009956C 000964AC 4E 80 00 20 */ blr -/* 80099570 000964B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099574 000964B4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80099578 000964B8 A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 8009957C 000964BC 38 03 00 01 */ addi r0, r3, 1 -/* 80099580 000964C0 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80099584 000964C4 4E 80 00 20 */ blr -/* 80099588 000964C8 4E 80 00 20 */ blr -/* 8009958C 000964CC 4E 80 00 20 */ blr -/* 80099590 000964D0 4E 80 00 20 */ blr -/* 80099594 000964D4 4E 80 00 20 */ blr -/* 80099598 000964D8 4E 80 00 20 */ blr -/* 8009959C 000964DC 4E 80 00 20 */ blr -/* 800995A0 000964E0 4E 80 00 20 */ blr -/* 800995A4 000964E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800995A8 000964E8 7C 08 02 A6 */ mflr r0 -/* 800995AC 000964EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800995B0 000964F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800995B4 000964F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800995B8 000964F8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800995BC 000964FC 38 80 00 02 */ li r4, 2 -/* 800995C0 00096500 4B F9 B3 59 */ bl onDungeonItem__12dSv_memBit_cFi -/* 800995C4 00096504 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800995C8 00096508 7C 08 03 A6 */ mtlr r0 -/* 800995CC 0009650C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800995D0 00096510 4E 80 00 20 */ blr -/* 800995D4 00096514 4E 80 00 20 */ blr -/* 800995D8 00096518 4E 80 00 20 */ blr -/* 800995DC 0009651C 4E 80 00 20 */ blr -/* 800995E0 00096520 4E 80 00 20 */ blr -/* 800995E4 00096524 4E 80 00 20 */ blr -/* 800995E8 00096528 4E 80 00 20 */ blr -/* 800995EC 0009652C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800995F0 00096530 7C 08 02 A6 */ mflr r0 -/* 800995F4 00096534 90 01 00 14 */ stw r0, 0x14(r1) -/* 800995F8 00096538 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800995FC 0009653C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099600 00096540 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099604 00096544 38 80 00 02 */ li r4, 2 -/* 80099608 00096548 4B F9 B3 11 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8009960C 0009654C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099610 00096550 7C 08 03 A6 */ mtlr r0 -/* 80099614 00096554 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099618 00096558 4E 80 00 20 */ blr -/* 8009961C 0009655C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099620 00096560 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l -/* 80099624 00096564 A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 80099628 00096568 38 03 00 01 */ addi r0, r3, 1 -/* 8009962C 0009656C B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80099630 00096570 4E 80 00 20 */ blr -/* 80099634 00096574 4E 80 00 20 */ blr -/* 80099638 00096578 38 60 FF FF */ li r3, -1 -/* 8009963C 0009657C 4E 80 00 20 */ blr -/* 80099640 00096580 38 60 FF FF */ li r3, -1 -/* 80099644 00096584 4E 80 00 20 */ blr -/* 80099648 00096588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009964C 0009658C 7C 08 02 A6 */ mflr r0 -/* 80099650 00096590 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099654 00096594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099658 00096598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009965C 0009659C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099660 000965A0 38 80 00 01 */ li r4, 1 -/* 80099664 000965A4 4B F9 A8 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099668 000965A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009966C 000965AC 7C 08 03 A6 */ mtlr r0 -/* 80099670 000965B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099674 000965B4 4E 80 00 20 */ blr -/* 80099678 000965B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009967C 000965BC 7C 08 02 A6 */ mflr r0 -/* 80099680 000965C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099684 000965C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099688 000965C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009968C 000965CC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099690 000965D0 38 80 00 02 */ li r4, 2 -/* 80099694 000965D4 4B F9 A8 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099698 000965D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009969C 000965DC 7C 08 03 A6 */ mtlr r0 -/* 800996A0 000965E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800996A4 000965E4 4E 80 00 20 */ blr -/* 800996A8 000965E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800996AC 000965EC 7C 08 02 A6 */ mflr r0 -/* 800996B0 000965F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800996B4 000965F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800996B8 000965F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800996BC 000965FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800996C0 00096600 38 80 00 03 */ li r4, 3 -/* 800996C4 00096604 4B F9 A8 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800996C8 00096608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800996CC 0009660C 7C 08 03 A6 */ mtlr r0 -/* 800996D0 00096610 38 21 00 10 */ addi r1, r1, 0x10 -/* 800996D4 00096614 4E 80 00 20 */ blr -/* 800996D8 00096618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800996DC 0009661C 7C 08 02 A6 */ mflr r0 -/* 800996E0 00096620 90 01 00 14 */ stw r0, 0x14(r1) -/* 800996E4 00096624 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800996E8 00096628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800996EC 0009662C 38 63 00 CC */ addi r3, r3, 0xcc -/* 800996F0 00096630 38 80 00 04 */ li r4, 4 -/* 800996F4 00096634 4B F9 A7 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800996F8 00096638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800996FC 0009663C 7C 08 03 A6 */ mtlr r0 -/* 80099700 00096640 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099704 00096644 4E 80 00 20 */ blr -/* 80099708 00096648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009970C 0009664C 7C 08 02 A6 */ mflr r0 -/* 80099710 00096650 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099714 00096654 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099718 00096658 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009971C 0009665C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099720 00096660 38 80 00 05 */ li r4, 5 -/* 80099724 00096664 4B F9 A7 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099728 00096668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009972C 0009666C 7C 08 03 A6 */ mtlr r0 -/* 80099730 00096670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099734 00096674 4E 80 00 20 */ blr -/* 80099738 00096678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009973C 0009667C 7C 08 02 A6 */ mflr r0 -/* 80099740 00096680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099744 00096684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099748 00096688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009974C 0009668C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099750 00096690 38 80 00 06 */ li r4, 6 -/* 80099754 00096694 4B F9 A7 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099758 00096698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009975C 0009669C 7C 08 03 A6 */ mtlr r0 -/* 80099760 000966A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099764 000966A4 4E 80 00 20 */ blr -/* 80099768 000966A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009976C 000966AC 7C 08 02 A6 */ mflr r0 -/* 80099770 000966B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099774 000966B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099778 000966B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009977C 000966BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099780 000966C0 38 80 00 07 */ li r4, 7 -/* 80099784 000966C4 4B F9 A7 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099788 000966C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009978C 000966CC 7C 08 03 A6 */ mtlr r0 -/* 80099790 000966D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099794 000966D4 4E 80 00 20 */ blr -/* 80099798 000966D8 38 60 FF FF */ li r3, -1 -/* 8009979C 000966DC 4E 80 00 20 */ blr -/* 800997A0 000966E0 38 60 FF FF */ li r3, -1 -/* 800997A4 000966E4 4E 80 00 20 */ blr -/* 800997A8 000966E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800997AC 000966EC 7C 08 02 A6 */ mflr r0 -/* 800997B0 000966F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800997B4 000966F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800997B8 000966F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800997BC 000966FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800997C0 00096700 38 80 00 0A */ li r4, 0xa -/* 800997C4 00096704 4B F9 A7 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800997C8 00096708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800997CC 0009670C 7C 08 03 A6 */ mtlr r0 -/* 800997D0 00096710 38 21 00 10 */ addi r1, r1, 0x10 -/* 800997D4 00096714 4E 80 00 20 */ blr -/* 800997D8 00096718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800997DC 0009671C 7C 08 02 A6 */ mflr r0 -/* 800997E0 00096720 90 01 00 14 */ stw r0, 0x14(r1) -/* 800997E4 00096724 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800997E8 00096728 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800997EC 0009672C 38 63 00 CC */ addi r3, r3, 0xcc -/* 800997F0 00096730 38 80 00 0B */ li r4, 0xb -/* 800997F4 00096734 4B F9 A6 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800997F8 00096738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800997FC 0009673C 7C 08 03 A6 */ mtlr r0 -/* 80099800 00096740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099804 00096744 4E 80 00 20 */ blr -/* 80099808 00096748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009980C 0009674C 7C 08 02 A6 */ mflr r0 -/* 80099810 00096750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099814 00096754 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099818 00096758 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009981C 0009675C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099820 00096760 38 80 00 0C */ li r4, 0xc -/* 80099824 00096764 4B F9 A6 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099828 00096768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009982C 0009676C 7C 08 03 A6 */ mtlr r0 -/* 80099830 00096770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099834 00096774 4E 80 00 20 */ blr -/* 80099838 00096778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009983C 0009677C 7C 08 02 A6 */ mflr r0 -/* 80099840 00096780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099844 00096784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099848 00096788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009984C 0009678C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099850 00096790 38 80 00 0D */ li r4, 0xd -/* 80099854 00096794 4B F9 A6 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099858 00096798 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009985C 0009679C 7C 08 03 A6 */ mtlr r0 -/* 80099860 000967A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099864 000967A4 4E 80 00 20 */ blr -/* 80099868 000967A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009986C 000967AC 7C 08 02 A6 */ mflr r0 -/* 80099870 000967B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099874 000967B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099878 000967B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009987C 000967BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099880 000967C0 38 80 00 0E */ li r4, 0xe -/* 80099884 000967C4 4B F9 A6 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099888 000967C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009988C 000967CC 7C 08 03 A6 */ mtlr r0 -/* 80099890 000967D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099894 000967D4 4E 80 00 20 */ blr -/* 80099898 000967D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009989C 000967DC 7C 08 02 A6 */ mflr r0 -/* 800998A0 000967E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800998A4 000967E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800998A8 000967E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800998AC 000967EC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800998B0 000967F0 38 80 00 0F */ li r4, 0xf -/* 800998B4 000967F4 4B F9 A6 15 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800998B8 000967F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800998BC 000967FC 7C 08 03 A6 */ mtlr r0 -/* 800998C0 00096800 38 21 00 10 */ addi r1, r1, 0x10 -/* 800998C4 00096804 4E 80 00 20 */ blr -/* 800998C8 00096808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800998CC 0009680C 7C 08 02 A6 */ mflr r0 -/* 800998D0 00096810 90 01 00 14 */ stw r0, 0x14(r1) -/* 800998D4 00096814 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800998D8 00096818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800998DC 0009681C 38 63 00 CC */ addi r3, r3, 0xcc -/* 800998E0 00096820 38 80 00 10 */ li r4, 0x10 -/* 800998E4 00096824 4B F9 A5 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800998E8 00096828 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800998EC 0009682C 7C 08 03 A6 */ mtlr r0 -/* 800998F0 00096830 38 21 00 10 */ addi r1, r1, 0x10 -/* 800998F4 00096834 4E 80 00 20 */ blr -/* 800998F8 00096838 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800998FC 0009683C 7C 08 02 A6 */ mflr r0 -/* 80099900 00096840 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099904 00096844 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099908 00096848 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009990C 0009684C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099910 00096850 38 80 00 11 */ li r4, 0x11 -/* 80099914 00096854 4B F9 A5 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099918 00096858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009991C 0009685C 7C 08 03 A6 */ mtlr r0 -/* 80099920 00096860 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099924 00096864 4E 80 00 20 */ blr -/* 80099928 00096868 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009992C 0009686C 7C 08 02 A6 */ mflr r0 -/* 80099930 00096870 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099934 00096874 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099938 00096878 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009993C 0009687C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099940 00096880 38 80 00 12 */ li r4, 0x12 -/* 80099944 00096884 4B F9 A5 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099948 00096888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009994C 0009688C 7C 08 03 A6 */ mtlr r0 -/* 80099950 00096890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099954 00096894 4E 80 00 20 */ blr -/* 80099958 00096898 38 60 FF FF */ li r3, -1 -/* 8009995C 0009689C 4E 80 00 20 */ blr -/* 80099960 000968A0 38 60 FF FF */ li r3, -1 -/* 80099964 000968A4 4E 80 00 20 */ blr -/* 80099968 000968A8 38 60 FF FF */ li r3, -1 -/* 8009996C 000968AC 4E 80 00 20 */ blr -/* 80099970 000968B0 38 60 FF FF */ li r3, -1 -/* 80099974 000968B4 4E 80 00 20 */ blr -/* 80099978 000968B8 38 60 FF FF */ li r3, -1 -/* 8009997C 000968BC 4E 80 00 20 */ blr -/* 80099980 000968C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099984 000968C4 7C 08 02 A6 */ mflr r0 -/* 80099988 000968C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009998C 000968CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099990 000968D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099994 000968D4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099998 000968D8 38 80 00 1B */ li r4, 0x1b -/* 8009999C 000968DC 4B F9 A5 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800999A0 000968E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800999A4 000968E4 7C 08 03 A6 */ mtlr r0 -/* 800999A8 000968E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800999AC 000968EC 4E 80 00 20 */ blr -/* 800999B0 000968F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800999B4 000968F4 7C 08 02 A6 */ mflr r0 -/* 800999B8 000968F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800999BC 000968FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800999C0 00096900 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800999C4 00096904 38 63 00 CC */ addi r3, r3, 0xcc -/* 800999C8 00096908 38 80 00 1C */ li r4, 0x1c -/* 800999CC 0009690C 4B F9 A4 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800999D0 00096910 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800999D4 00096914 7C 08 03 A6 */ mtlr r0 -/* 800999D8 00096918 38 21 00 10 */ addi r1, r1, 0x10 -/* 800999DC 0009691C 4E 80 00 20 */ blr -/* 800999E0 00096920 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800999E4 00096924 7C 08 02 A6 */ mflr r0 -/* 800999E8 00096928 90 01 00 14 */ stw r0, 0x14(r1) -/* 800999EC 0009692C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800999F0 00096930 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800999F4 00096934 38 63 00 CC */ addi r3, r3, 0xcc -/* 800999F8 00096938 38 80 00 1D */ li r4, 0x1d -/* 800999FC 0009693C 4B F9 A4 CD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099A00 00096940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099A04 00096944 7C 08 03 A6 */ mtlr r0 -/* 80099A08 00096948 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099A0C 0009694C 4E 80 00 20 */ blr -/* 80099A10 00096950 38 60 FF FF */ li r3, -1 -/* 80099A14 00096954 4E 80 00 20 */ blr -/* 80099A18 00096958 38 60 FF FF */ li r3, -1 -/* 80099A1C 0009695C 4E 80 00 20 */ blr -/* 80099A20 00096960 38 60 FF FF */ li r3, -1 -/* 80099A24 00096964 4E 80 00 20 */ blr -/* 80099A28 00096968 38 60 FF FF */ li r3, -1 -/* 80099A2C 0009696C 4E 80 00 20 */ blr -/* 80099A30 00096970 38 60 FF FF */ li r3, -1 -/* 80099A34 00096974 4E 80 00 20 */ blr -/* 80099A38 00096978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099A3C 0009697C 7C 08 02 A6 */ mflr r0 -/* 80099A40 00096980 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099A44 00096984 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099A48 00096988 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099A4C 0009698C 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099A50 00096990 38 80 00 00 */ li r4, 0 -/* 80099A54 00096994 4B F9 AE E1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80099A58 00096998 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099A5C 0009699C 7C 08 03 A6 */ mtlr r0 -/* 80099A60 000969A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099A64 000969A4 4E 80 00 20 */ blr -/* 80099A68 000969A8 38 60 FF FF */ li r3, -1 -/* 80099A6C 000969AC 4E 80 00 20 */ blr -/* 80099A70 000969B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099A74 000969B4 7C 08 02 A6 */ mflr r0 -/* 80099A78 000969B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099A7C 000969BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099A80 000969C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099A84 000969C4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099A88 000969C8 38 80 00 12 */ li r4, 0x12 -/* 80099A8C 000969CC 38 A0 00 01 */ li r5, 1 -/* 80099A90 000969D0 4B F9 95 A1 */ bl getItem__17dSv_player_item_cCFib -/* 80099A94 000969D4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099A98 000969D8 20 00 00 25 */ subfic r0, r0, 0x25 -/* 80099A9C 000969DC 7C 00 00 34 */ cntlzw r0, r0 -/* 80099AA0 000969E0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099AA4 000969E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099AA8 000969E8 7C 08 03 A6 */ mtlr r0 -/* 80099AAC 000969EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099AB0 000969F0 4E 80 00 20 */ blr -/* 80099AB4 000969F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099AB8 000969F8 7C 08 02 A6 */ mflr r0 -/* 80099ABC 000969FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099AC0 00096A00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099AC4 00096A04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099AC8 00096A08 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099ACC 00096A0C 38 80 00 02 */ li r4, 2 -/* 80099AD0 00096A10 4B F9 AE 65 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80099AD4 00096A14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099AD8 00096A18 7C 08 03 A6 */ mtlr r0 -/* 80099ADC 00096A1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099AE0 00096A20 4E 80 00 20 */ blr -/* 80099AE4 00096A24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099AE8 00096A28 7C 08 02 A6 */ mflr r0 -/* 80099AEC 00096A2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099AF0 00096A30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099AF4 00096A34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099AF8 00096A38 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099AFC 00096A3C 38 80 00 12 */ li r4, 0x12 -/* 80099B00 00096A40 38 A0 00 01 */ li r5, 1 -/* 80099B04 00096A44 4B F9 95 2D */ bl getItem__17dSv_player_item_cCFib -/* 80099B08 00096A48 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099B0C 00096A4C 20 00 00 27 */ subfic r0, r0, 0x27 -/* 80099B10 00096A50 7C 00 00 34 */ cntlzw r0, r0 -/* 80099B14 00096A54 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099B18 00096A58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B1C 00096A5C 7C 08 03 A6 */ mtlr r0 -/* 80099B20 00096A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B24 00096A64 4E 80 00 20 */ blr -/* 80099B28 00096A68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B2C 00096A6C 7C 08 02 A6 */ mflr r0 -/* 80099B30 00096A70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B34 00096A74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099B38 00096A78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099B3C 00096A7C 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099B40 00096A80 38 80 00 01 */ li r4, 1 -/* 80099B44 00096A84 38 A0 00 00 */ li r5, 0 -/* 80099B48 00096A88 4B F9 A6 C1 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099B4C 00096A8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B50 00096A90 7C 08 03 A6 */ mtlr r0 -/* 80099B54 00096A94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B58 00096A98 4E 80 00 20 */ blr -/* 80099B5C 00096A9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B60 00096AA0 7C 08 02 A6 */ mflr r0 -/* 80099B64 00096AA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B68 00096AA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099B6C 00096AAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099B70 00096AB0 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099B74 00096AB4 38 80 00 01 */ li r4, 1 -/* 80099B78 00096AB8 38 A0 00 01 */ li r5, 1 -/* 80099B7C 00096ABC 4B F9 A6 8D */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099B80 00096AC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B84 00096AC4 7C 08 03 A6 */ mtlr r0 -/* 80099B88 00096AC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B8C 00096ACC 4E 80 00 20 */ blr -/* 80099B90 00096AD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B94 00096AD4 7C 08 02 A6 */ mflr r0 -/* 80099B98 00096AD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B9C 00096ADC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099BA0 00096AE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099BA4 00096AE4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099BA8 00096AE8 38 80 00 2A */ li r4, 0x2a -/* 80099BAC 00096AEC 4B F9 A3 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099BB0 00096AF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099BB4 00096AF4 7C 08 03 A6 */ mtlr r0 -/* 80099BB8 00096AF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099BBC 00096AFC 4E 80 00 20 */ blr -/* 80099BC0 00096B00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099BC4 00096B04 7C 08 02 A6 */ mflr r0 -/* 80099BC8 00096B08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099BCC 00096B0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099BD0 00096B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099BD4 00096B14 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099BD8 00096B18 38 80 00 2B */ li r4, 0x2b -/* 80099BDC 00096B1C 4B F9 A2 ED */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099BE0 00096B20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099BE4 00096B24 7C 08 03 A6 */ mtlr r0 -/* 80099BE8 00096B28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099BEC 00096B2C 4E 80 00 20 */ blr -/* 80099BF0 00096B30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099BF4 00096B34 7C 08 02 A6 */ mflr r0 -/* 80099BF8 00096B38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099BFC 00096B3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099C00 00096B40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099C04 00096B44 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099C08 00096B48 38 80 00 2C */ li r4, 0x2c -/* 80099C0C 00096B4C 4B F9 A2 BD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099C10 00096B50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C14 00096B54 7C 08 03 A6 */ mtlr r0 -/* 80099C18 00096B58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C1C 00096B5C 4E 80 00 20 */ blr -/* 80099C20 00096B60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C24 00096B64 7C 08 02 A6 */ mflr r0 -/* 80099C28 00096B68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099C2C 00096B6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099C30 00096B70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099C34 00096B74 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099C38 00096B78 38 80 00 12 */ li r4, 0x12 -/* 80099C3C 00096B7C 38 A0 00 01 */ li r5, 1 -/* 80099C40 00096B80 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib -/* 80099C44 00096B84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099C48 00096B88 20 00 00 2D */ subfic r0, r0, 0x2d -/* 80099C4C 00096B8C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099C50 00096B90 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099C54 00096B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C58 00096B98 7C 08 03 A6 */ mtlr r0 -/* 80099C5C 00096B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C60 00096BA0 4E 80 00 20 */ blr -/* 80099C64 00096BA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C68 00096BA8 7C 08 02 A6 */ mflr r0 -/* 80099C6C 00096BAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099C70 00096BB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099C74 00096BB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099C78 00096BB8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099C7C 00096BBC 38 80 00 2E */ li r4, 0x2e -/* 80099C80 00096BC0 4B F9 A2 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099C84 00096BC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C88 00096BC8 7C 08 03 A6 */ mtlr r0 -/* 80099C8C 00096BCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C90 00096BD0 4E 80 00 20 */ blr -/* 80099C94 00096BD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C98 00096BD8 7C 08 02 A6 */ mflr r0 -/* 80099C9C 00096BDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099CA0 00096BE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099CA4 00096BE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099CA8 00096BE8 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099CAC 00096BEC 38 80 00 00 */ li r4, 0 -/* 80099CB0 00096BF0 38 A0 00 00 */ li r5, 0 -/* 80099CB4 00096BF4 4B F9 A5 55 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099CB8 00096BF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099CBC 00096BFC 7C 08 03 A6 */ mtlr r0 -/* 80099CC0 00096C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099CC4 00096C04 4E 80 00 20 */ blr -/* 80099CC8 00096C08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099CCC 00096C0C 7C 08 02 A6 */ mflr r0 -/* 80099CD0 00096C10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099CD4 00096C14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099CD8 00096C18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099CDC 00096C1C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099CE0 00096C20 38 80 00 30 */ li r4, 0x30 -/* 80099CE4 00096C24 4B F9 A1 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099CE8 00096C28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099CEC 00096C2C 7C 08 03 A6 */ mtlr r0 -/* 80099CF0 00096C30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099CF4 00096C34 4E 80 00 20 */ blr -/* 80099CF8 00096C38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099CFC 00096C3C 7C 08 02 A6 */ mflr r0 -/* 80099D00 00096C40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D04 00096C44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099D08 00096C48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099D0C 00096C4C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099D10 00096C50 38 80 00 31 */ li r4, 0x31 -/* 80099D14 00096C54 4B F9 A1 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099D18 00096C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099D1C 00096C5C 7C 08 03 A6 */ mtlr r0 -/* 80099D20 00096C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099D24 00096C64 4E 80 00 20 */ blr -/* 80099D28 00096C68 38 60 FF FF */ li r3, -1 -/* 80099D2C 00096C6C 4E 80 00 20 */ blr -/* 80099D30 00096C70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099D34 00096C74 7C 08 02 A6 */ mflr r0 -/* 80099D38 00096C78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D3C 00096C7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099D40 00096C80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099D44 00096C84 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099D48 00096C88 38 80 00 12 */ li r4, 0x12 -/* 80099D4C 00096C8C 38 A0 00 01 */ li r5, 1 -/* 80099D50 00096C90 4B F9 92 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80099D54 00096C94 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099D58 00096C98 20 00 00 25 */ subfic r0, r0, 0x25 -/* 80099D5C 00096C9C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099D60 00096CA0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099D64 00096CA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099D68 00096CA8 7C 08 03 A6 */ mtlr r0 -/* 80099D6C 00096CAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099D70 00096CB0 4E 80 00 20 */ blr -/* 80099D74 00096CB4 38 60 FF FF */ li r3, -1 -/* 80099D78 00096CB8 4E 80 00 20 */ blr -/* 80099D7C 00096CBC 38 60 FF FF */ li r3, -1 -/* 80099D80 00096CC0 4E 80 00 20 */ blr -/* 80099D84 00096CC4 38 60 FF FF */ li r3, -1 -/* 80099D88 00096CC8 4E 80 00 20 */ blr -/* 80099D8C 00096CCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099D90 00096CD0 7C 08 02 A6 */ mflr r0 -/* 80099D94 00096CD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D98 00096CD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099D9C 00096CDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099DA0 00096CE0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099DA4 00096CE4 38 80 00 14 */ li r4, 0x14 -/* 80099DA8 00096CE8 38 A0 00 01 */ li r5, 1 -/* 80099DAC 00096CEC 4B F9 92 85 */ bl getItem__17dSv_player_item_cCFib -/* 80099DB0 00096CF0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099DB4 00096CF4 20 00 00 3D */ subfic r0, r0, 0x3d -/* 80099DB8 00096CF8 7C 00 00 34 */ cntlzw r0, r0 -/* 80099DBC 00096CFC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099DC0 00096D00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099DC4 00096D04 7C 08 03 A6 */ mtlr r0 -/* 80099DC8 00096D08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099DCC 00096D0C 4E 80 00 20 */ blr -/* 80099DD0 00096D10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099DD4 00096D14 7C 08 02 A6 */ mflr r0 -/* 80099DD8 00096D18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099DDC 00096D1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099DE0 00096D20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099DE4 00096D24 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099DE8 00096D28 38 80 00 3E */ li r4, 0x3e -/* 80099DEC 00096D2C 4B F9 A0 DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099DF0 00096D30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099DF4 00096D34 7C 08 03 A6 */ mtlr r0 -/* 80099DF8 00096D38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099DFC 00096D3C 4E 80 00 20 */ blr -/* 80099E00 00096D40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E04 00096D44 7C 08 02 A6 */ mflr r0 -/* 80099E08 00096D48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E0C 00096D4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099E10 00096D50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099E14 00096D54 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099E18 00096D58 38 80 00 3F */ li r4, 0x3f -/* 80099E1C 00096D5C 4B F9 A0 AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099E20 00096D60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099E24 00096D64 7C 08 03 A6 */ mtlr r0 -/* 80099E28 00096D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099E2C 00096D6C 4E 80 00 20 */ blr -/* 80099E30 00096D70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E34 00096D74 7C 08 02 A6 */ mflr r0 -/* 80099E38 00096D78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E3C 00096D7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099E40 00096D80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099E44 00096D84 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099E48 00096D88 38 80 00 00 */ li r4, 0 -/* 80099E4C 00096D8C 38 A0 00 01 */ li r5, 1 -/* 80099E50 00096D90 4B F9 91 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80099E54 00096D94 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099E58 00096D98 20 00 00 40 */ subfic r0, r0, 0x40 -/* 80099E5C 00096D9C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099E60 00096DA0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099E64 00096DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099E68 00096DA8 7C 08 03 A6 */ mtlr r0 -/* 80099E6C 00096DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099E70 00096DB0 4E 80 00 20 */ blr -/* 80099E74 00096DB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E78 00096DB8 7C 08 02 A6 */ mflr r0 -/* 80099E7C 00096DBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E80 00096DC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099E84 00096DC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099E88 00096DC8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099E8C 00096DCC 38 80 00 02 */ li r4, 2 -/* 80099E90 00096DD0 38 A0 00 01 */ li r5, 1 -/* 80099E94 00096DD4 4B F9 91 9D */ bl getItem__17dSv_player_item_cCFib -/* 80099E98 00096DD8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099E9C 00096DDC 20 00 00 41 */ subfic r0, r0, 0x41 -/* 80099EA0 00096DE0 7C 00 00 34 */ cntlzw r0, r0 -/* 80099EA4 00096DE4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099EA8 00096DE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099EAC 00096DEC 7C 08 03 A6 */ mtlr r0 -/* 80099EB0 00096DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099EB4 00096DF4 4E 80 00 20 */ blr -/* 80099EB8 00096DF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099EBC 00096DFC 7C 08 02 A6 */ mflr r0 -/* 80099EC0 00096E00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099EC4 00096E04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099EC8 00096E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099ECC 00096E0C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099ED0 00096E10 38 80 00 06 */ li r4, 6 -/* 80099ED4 00096E14 38 A0 00 01 */ li r5, 1 -/* 80099ED8 00096E18 4B F9 91 59 */ bl getItem__17dSv_player_item_cCFib -/* 80099EDC 00096E1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099EE0 00096E20 20 00 00 42 */ subfic r0, r0, 0x42 -/* 80099EE4 00096E24 7C 00 00 34 */ cntlzw r0, r0 -/* 80099EE8 00096E28 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099EEC 00096E2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099EF0 00096E30 7C 08 03 A6 */ mtlr r0 -/* 80099EF4 00096E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099EF8 00096E38 4E 80 00 20 */ blr -/* 80099EFC 00096E3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F00 00096E40 7C 08 02 A6 */ mflr r0 -/* 80099F04 00096E44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F08 00096E48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099F0C 00096E4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099F10 00096E50 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F14 00096E54 38 80 00 04 */ li r4, 4 -/* 80099F18 00096E58 38 A0 00 00 */ li r5, 0 -/* 80099F1C 00096E5C 4B F9 91 15 */ bl getItem__17dSv_player_item_cCFib -/* 80099F20 00096E60 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099F24 00096E64 20 00 00 43 */ subfic r0, r0, 0x43 -/* 80099F28 00096E68 7C 00 00 34 */ cntlzw r0, r0 -/* 80099F2C 00096E6C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099F30 00096E70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099F34 00096E74 7C 08 03 A6 */ mtlr r0 -/* 80099F38 00096E78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099F3C 00096E7C 4E 80 00 20 */ blr -/* 80099F40 00096E80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F44 00096E84 7C 08 02 A6 */ mflr r0 -/* 80099F48 00096E88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F4C 00096E8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099F50 00096E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099F54 00096E94 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F58 00096E98 38 80 00 09 */ li r4, 9 -/* 80099F5C 00096E9C 38 A0 00 01 */ li r5, 1 -/* 80099F60 00096EA0 4B F9 90 D1 */ bl getItem__17dSv_player_item_cCFib -/* 80099F64 00096EA4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099F68 00096EA8 20 00 00 44 */ subfic r0, r0, 0x44 -/* 80099F6C 00096EAC 7C 00 00 34 */ cntlzw r0, r0 -/* 80099F70 00096EB0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099F74 00096EB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099F78 00096EB8 7C 08 03 A6 */ mtlr r0 -/* 80099F7C 00096EBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099F80 00096EC0 4E 80 00 20 */ blr -/* 80099F84 00096EC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F88 00096EC8 7C 08 02 A6 */ mflr r0 -/* 80099F8C 00096ECC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F90 00096ED0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099F94 00096ED4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099F98 00096ED8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F9C 00096EDC 38 80 00 03 */ li r4, 3 -/* 80099FA0 00096EE0 38 A0 00 01 */ li r5, 1 -/* 80099FA4 00096EE4 4B F9 90 8D */ bl getItem__17dSv_player_item_cCFib -/* 80099FA8 00096EE8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099FAC 00096EEC 20 00 00 45 */ subfic r0, r0, 0x45 -/* 80099FB0 00096EF0 7C 00 00 34 */ cntlzw r0, r0 -/* 80099FB4 00096EF4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099FB8 00096EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099FBC 00096EFC 7C 08 03 A6 */ mtlr r0 -/* 80099FC0 00096F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099FC4 00096F04 4E 80 00 20 */ blr -/* 80099FC8 00096F08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099FCC 00096F0C 7C 08 02 A6 */ mflr r0 -/* 80099FD0 00096F10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099FD4 00096F14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80099FD8 00096F18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80099FDC 00096F1C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099FE0 00096F20 38 80 00 08 */ li r4, 8 -/* 80099FE4 00096F24 38 A0 00 01 */ li r5, 1 -/* 80099FE8 00096F28 4B F9 90 49 */ bl getItem__17dSv_player_item_cCFib -/* 80099FEC 00096F2C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099FF0 00096F30 20 00 00 46 */ subfic r0, r0, 0x46 -/* 80099FF4 00096F34 7C 00 00 34 */ cntlzw r0, r0 -/* 80099FF8 00096F38 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099FFC 00096F3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A000 00096F40 7C 08 03 A6 */ mtlr r0 -/* 8009A004 00096F44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A008 00096F48 4E 80 00 20 */ blr -/* 8009A00C 00096F4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A010 00096F50 7C 08 02 A6 */ mflr r0 -/* 8009A014 00096F54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A018 00096F58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A01C 00096F5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A020 00096F60 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A024 00096F64 38 80 00 0A */ li r4, 0xa -/* 8009A028 00096F68 38 A0 00 01 */ li r5, 1 -/* 8009A02C 00096F6C 4B F9 90 05 */ bl getItem__17dSv_player_item_cCFib -/* 8009A030 00096F70 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A034 00096F74 20 00 00 47 */ subfic r0, r0, 0x47 -/* 8009A038 00096F78 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A03C 00096F7C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A040 00096F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A044 00096F84 7C 08 03 A6 */ mtlr r0 -/* 8009A048 00096F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A04C 00096F8C 4E 80 00 20 */ blr -/* 8009A050 00096F90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A054 00096F94 7C 08 02 A6 */ mflr r0 -/* 8009A058 00096F98 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A05C 00096F9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A060 00096FA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A064 00096FA4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A068 00096FA8 38 80 00 01 */ li r4, 1 -/* 8009A06C 00096FAC 38 A0 00 01 */ li r5, 1 -/* 8009A070 00096FB0 4B F9 8F C1 */ bl getItem__17dSv_player_item_cCFib -/* 8009A074 00096FB4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A078 00096FB8 20 00 00 48 */ subfic r0, r0, 0x48 -/* 8009A07C 00096FBC 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A080 00096FC0 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A084 00096FC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A088 00096FC8 7C 08 03 A6 */ mtlr r0 -/* 8009A08C 00096FCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A090 00096FD0 4E 80 00 20 */ blr -/* 8009A094 00096FD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A098 00096FD8 7C 08 02 A6 */ mflr r0 -/* 8009A09C 00096FDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A0A0 00096FE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A0A4 00096FE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A0A8 00096FE8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8009A0AC 00096FEC 38 80 00 01 */ li r4, 1 -/* 8009A0B0 00096FF0 38 A0 00 03 */ li r5, 3 -/* 8009A0B4 00096FF4 4B F9 A1 55 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 8009A0B8 00096FF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A0BC 00096FFC 7C 08 03 A6 */ mtlr r0 -/* 8009A0C0 00097000 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A0C4 00097004 4E 80 00 20 */ blr - -.global item_getcheck_func_FISHING_ROD_1 -item_getcheck_func_FISHING_ROD_1: -/* 8009A0C8 00097008 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8009A0CC 0009700C 7C 08 02 A6 */ mflr r0 -/* 8009A0D0 00097010 90 01 00 24 */ stw r0, 0x24(r1) -/* 8009A0D4 00097014 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009A0D8 00097018 48 2C 80 F9 */ bl _savegpr_26 -/* 8009A0DC 0009701C 3B E0 00 01 */ li r31, 1 -/* 8009A0E0 00097020 7F FE FB 78 */ mr r30, r31 -/* 8009A0E4 00097024 7F FD FB 78 */ mr r29, r31 -/* 8009A0E8 00097028 7F FC FB 78 */ mr r28, r31 -/* 8009A0EC 0009702C 7F FB FB 78 */ mr r27, r31 -/* 8009A0F0 00097030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A0F4 00097034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A0F8 00097038 3B 43 00 9C */ addi r26, r3, 0x9c -/* 8009A0FC 0009703C 7F 43 D3 78 */ mr r3, r26 -/* 8009A100 00097040 38 80 00 14 */ li r4, 0x14 -/* 8009A104 00097044 38 A0 00 01 */ li r5, 1 -/* 8009A108 00097048 4B F9 8F 29 */ bl getItem__17dSv_player_item_cCFib -/* 8009A10C 0009704C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A110 00097050 28 00 00 4A */ cmplwi r0, 0x4a -/* 8009A114 00097054 41 82 00 24 */ beq lbl_8009A138 -/* 8009A118 00097058 7F 43 D3 78 */ mr r3, r26 -/* 8009A11C 0009705C 38 80 00 14 */ li r4, 0x14 -/* 8009A120 00097060 38 A0 00 01 */ li r5, 1 -/* 8009A124 00097064 4B F9 8F 0D */ bl getItem__17dSv_player_item_cCFib -/* 8009A128 00097068 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A12C 0009706C 28 00 00 5B */ cmplwi r0, 0x5b -/* 8009A130 00097070 41 82 00 08 */ beq lbl_8009A138 -/* 8009A134 00097074 3B 60 00 00 */ li r27, 0 -lbl_8009A138: -/* 8009A138 00097078 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 8009A13C 0009707C 40 82 00 24 */ bne lbl_8009A160 -/* 8009A140 00097080 7F 43 D3 78 */ mr r3, r26 -/* 8009A144 00097084 38 80 00 14 */ li r4, 0x14 -/* 8009A148 00097088 38 A0 00 01 */ li r5, 1 -/* 8009A14C 0009708C 4B F9 8E E5 */ bl getItem__17dSv_player_item_cCFib -/* 8009A150 00097090 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A154 00097094 28 00 00 5D */ cmplwi r0, 0x5d -/* 8009A158 00097098 41 82 00 08 */ beq lbl_8009A160 -/* 8009A15C 0009709C 3B 80 00 00 */ li r28, 0 -lbl_8009A160: -/* 8009A160 000970A0 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 8009A164 000970A4 40 82 00 24 */ bne lbl_8009A188 -/* 8009A168 000970A8 7F 43 D3 78 */ mr r3, r26 -/* 8009A16C 000970AC 38 80 00 14 */ li r4, 0x14 -/* 8009A170 000970B0 38 A0 00 01 */ li r5, 1 -/* 8009A174 000970B4 4B F9 8E BD */ bl getItem__17dSv_player_item_cCFib -/* 8009A178 000970B8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A17C 000970BC 28 00 00 5C */ cmplwi r0, 0x5c -/* 8009A180 000970C0 41 82 00 08 */ beq lbl_8009A188 -/* 8009A184 000970C4 3B A0 00 00 */ li r29, 0 -lbl_8009A188: -/* 8009A188 000970C8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8009A18C 000970CC 40 82 00 24 */ bne lbl_8009A1B0 -/* 8009A190 000970D0 7F 43 D3 78 */ mr r3, r26 -/* 8009A194 000970D4 38 80 00 14 */ li r4, 0x14 -/* 8009A198 000970D8 38 A0 00 01 */ li r5, 1 -/* 8009A19C 000970DC 4B F9 8E 95 */ bl getItem__17dSv_player_item_cCFib -/* 8009A1A0 000970E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A1A4 000970E4 28 00 00 5E */ cmplwi r0, 0x5e -/* 8009A1A8 000970E8 41 82 00 08 */ beq lbl_8009A1B0 -/* 8009A1AC 000970EC 3B C0 00 00 */ li r30, 0 -lbl_8009A1B0: -/* 8009A1B0 000970F0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8009A1B4 000970F4 40 82 00 24 */ bne lbl_8009A1D8 -/* 8009A1B8 000970F8 7F 43 D3 78 */ mr r3, r26 -/* 8009A1BC 000970FC 38 80 00 14 */ li r4, 0x14 -/* 8009A1C0 00097100 38 A0 00 01 */ li r5, 1 -/* 8009A1C4 00097104 4B F9 8E 6D */ bl getItem__17dSv_player_item_cCFib -/* 8009A1C8 00097108 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A1CC 0009710C 28 00 00 5F */ cmplwi r0, 0x5f -/* 8009A1D0 00097110 41 82 00 08 */ beq lbl_8009A1D8 -/* 8009A1D4 00097114 3B E0 00 00 */ li r31, 0 -lbl_8009A1D8: -/* 8009A1D8 00097118 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A1DC 0009711C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A1E0 00097120 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A1E4 00097124 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009A1E8 00097128 48 2C 80 35 */ bl _restgpr_26 -/* 8009A1EC 0009712C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8009A1F0 00097130 7C 08 03 A6 */ mtlr r0 -/* 8009A1F4 00097134 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009A1F8 00097138 4E 80 00 20 */ blr -/* 8009A1FC 0009713C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A200 00097140 7C 08 02 A6 */ mflr r0 -/* 8009A204 00097144 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A208 00097148 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A20C 0009714C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A210 00097150 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A214 00097154 38 80 00 17 */ li r4, 0x17 -/* 8009A218 00097158 38 A0 00 01 */ li r5, 1 -/* 8009A21C 0009715C 4B F9 8E 15 */ bl getItem__17dSv_player_item_cCFib -/* 8009A220 00097160 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A224 00097164 20 00 00 4B */ subfic r0, r0, 0x4b -/* 8009A228 00097168 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A22C 0009716C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A230 00097170 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A234 00097174 7C 08 03 A6 */ mtlr r0 -/* 8009A238 00097178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A23C 0009717C 4E 80 00 20 */ blr -/* 8009A240 00097180 38 60 FF FF */ li r3, -1 -/* 8009A244 00097184 4E 80 00 20 */ blr -/* 8009A248 00097188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A24C 0009718C 7C 08 02 A6 */ mflr r0 -/* 8009A250 00097190 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A254 00097194 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A258 00097198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A25C 0009719C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A260 000971A0 38 80 00 4F */ li r4, 0x4f -/* 8009A264 000971A4 4B F9 9C 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A268 000971A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A26C 000971AC 7C 08 03 A6 */ mtlr r0 -/* 8009A270 000971B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A274 000971B4 4E 80 00 20 */ blr -/* 8009A278 000971B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A27C 000971BC 7C 08 02 A6 */ mflr r0 -/* 8009A280 000971C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A284 000971C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A288 000971C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A28C 000971CC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A290 000971D0 38 80 00 50 */ li r4, 0x50 -/* 8009A294 000971D4 4B F9 9C 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A298 000971D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A29C 000971DC 7C 08 03 A6 */ mtlr r0 -/* 8009A2A0 000971E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A2A4 000971E4 4E 80 00 20 */ blr -/* 8009A2A8 000971E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A2AC 000971EC 7C 08 02 A6 */ mflr r0 -/* 8009A2B0 000971F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A2B4 000971F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A2B8 000971F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A2BC 000971FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A2C0 00097200 38 80 00 51 */ li r4, 0x51 -/* 8009A2C4 00097204 4B F9 9C 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A2C8 00097208 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A2CC 0009720C 7C 08 03 A6 */ mtlr r0 -/* 8009A2D0 00097210 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A2D4 00097214 4E 80 00 20 */ blr -/* 8009A2D8 00097218 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A2DC 0009721C 7C 08 02 A6 */ mflr r0 -/* 8009A2E0 00097220 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A2E4 00097224 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A2E8 00097228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A2EC 0009722C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A2F0 00097230 38 80 00 53 */ li r4, 0x53 -/* 8009A2F4 00097234 4B F9 9B D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A2F8 00097238 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A2FC 0009723C 7C 08 03 A6 */ mtlr r0 -/* 8009A300 00097240 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A304 00097244 4E 80 00 20 */ blr -/* 8009A308 00097248 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A30C 0009724C 7C 08 02 A6 */ mflr r0 -/* 8009A310 00097250 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A314 00097254 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A318 00097258 3B E0 00 00 */ li r31, 0 -/* 8009A31C 0009725C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A320 00097260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A324 00097264 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A328 00097268 38 80 00 04 */ li r4, 4 -/* 8009A32C 0009726C 38 A0 00 00 */ li r5, 0 -/* 8009A330 00097270 4B F9 8D 01 */ bl getItem__17dSv_player_item_cCFib -/* 8009A334 00097274 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A338 00097278 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A33C 0009727C 40 82 00 1C */ bne lbl_8009A358 -/* 8009A340 00097280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A344 00097284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A348 00097288 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A34C 0009728C 28 00 00 1E */ cmplwi r0, 0x1e -/* 8009A350 00097290 41 80 00 08 */ blt lbl_8009A358 -/* 8009A354 00097294 3B E0 00 01 */ li r31, 1 -lbl_8009A358: -/* 8009A358 00097298 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A35C 0009729C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A360 000972A0 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A364 000972A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A368 000972A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A36C 000972AC 7C 08 03 A6 */ mtlr r0 -/* 8009A370 000972B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A374 000972B4 4E 80 00 20 */ blr -/* 8009A378 000972B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A37C 000972BC 7C 08 02 A6 */ mflr r0 -/* 8009A380 000972C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A384 000972C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A388 000972C8 3B E0 00 00 */ li r31, 0 -/* 8009A38C 000972CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A390 000972D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A394 000972D4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A398 000972D8 38 80 00 04 */ li r4, 4 -/* 8009A39C 000972DC 38 A0 00 00 */ li r5, 0 -/* 8009A3A0 000972E0 4B F9 8C 91 */ bl getItem__17dSv_player_item_cCFib -/* 8009A3A4 000972E4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A3A8 000972E8 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A3AC 000972EC 40 82 00 1C */ bne lbl_8009A3C8 -/* 8009A3B0 000972F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A3B4 000972F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A3B8 000972F8 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A3BC 000972FC 28 00 00 3C */ cmplwi r0, 0x3c -/* 8009A3C0 00097300 41 80 00 08 */ blt lbl_8009A3C8 -/* 8009A3C4 00097304 3B E0 00 01 */ li r31, 1 -lbl_8009A3C8: -/* 8009A3C8 00097308 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A3CC 0009730C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A3D0 00097310 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A3D4 00097314 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A3D8 00097318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A3DC 0009731C 7C 08 03 A6 */ mtlr r0 -/* 8009A3E0 00097320 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A3E4 00097324 4E 80 00 20 */ blr -/* 8009A3E8 00097328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A3EC 0009732C 7C 08 02 A6 */ mflr r0 -/* 8009A3F0 00097330 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A3F4 00097334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A3F8 00097338 3B E0 00 00 */ li r31, 0 -/* 8009A3FC 0009733C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A400 00097340 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A404 00097344 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A408 00097348 38 80 00 04 */ li r4, 4 -/* 8009A40C 0009734C 38 A0 00 00 */ li r5, 0 -/* 8009A410 00097350 4B F9 8C 21 */ bl getItem__17dSv_player_item_cCFib -/* 8009A414 00097354 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A418 00097358 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A41C 0009735C 40 82 00 1C */ bne lbl_8009A438 -/* 8009A420 00097360 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A424 00097364 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A428 00097368 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A42C 0009736C 28 00 00 64 */ cmplwi r0, 0x64 -/* 8009A430 00097370 41 80 00 08 */ blt lbl_8009A438 -/* 8009A434 00097374 3B E0 00 01 */ li r31, 1 -lbl_8009A438: -/* 8009A438 00097378 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A43C 0009737C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A440 00097380 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A444 00097384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A448 00097388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A44C 0009738C 7C 08 03 A6 */ mtlr r0 -/* 8009A450 00097390 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A454 00097394 4E 80 00 20 */ blr -/* 8009A458 00097398 38 60 FF FF */ li r3, -1 -/* 8009A45C 0009739C 4E 80 00 20 */ blr -/* 8009A460 000973A0 38 60 FF FF */ li r3, -1 -/* 8009A464 000973A4 4E 80 00 20 */ blr -/* 8009A468 000973A8 38 60 FF FF */ li r3, -1 -/* 8009A46C 000973AC 4E 80 00 20 */ blr -/* 8009A470 000973B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A474 000973B4 7C 08 02 A6 */ mflr r0 -/* 8009A478 000973B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A47C 000973BC 4B FF FC 4D */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009A480 000973C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A484 000973C4 7C 08 03 A6 */ mtlr r0 -/* 8009A488 000973C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A48C 000973CC 4E 80 00 20 */ blr -/* 8009A490 000973D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A494 000973D4 7C 08 02 A6 */ mflr r0 -/* 8009A498 000973D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A49C 000973DC 4B FF FC 2D */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009A4A0 000973E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4A4 000973E4 7C 08 03 A6 */ mtlr r0 -/* 8009A4A8 000973E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4AC 000973EC 4E 80 00 20 */ blr -/* 8009A4B0 000973F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4B4 000973F4 7C 08 02 A6 */ mflr r0 -/* 8009A4B8 000973F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4BC 000973FC 4B FF FC 0D */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009A4C0 00097400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4C4 00097404 7C 08 03 A6 */ mtlr r0 -/* 8009A4C8 00097408 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4CC 0009740C 4E 80 00 20 */ blr -/* 8009A4D0 00097410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4D4 00097414 7C 08 02 A6 */ mflr r0 -/* 8009A4D8 00097418 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4DC 0009741C 4B FF FB ED */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009A4E0 00097420 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4E4 00097424 7C 08 03 A6 */ mtlr r0 -/* 8009A4E8 00097428 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4EC 0009742C 4E 80 00 20 */ blr -/* 8009A4F0 00097430 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4F4 00097434 7C 08 02 A6 */ mflr r0 -/* 8009A4F8 00097438 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4FC 0009743C 4B FF FB CD */ bl item_getcheck_func_FISHING_ROD_1 -/* 8009A500 00097440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A504 00097444 7C 08 03 A6 */ mtlr r0 -/* 8009A508 00097448 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A50C 0009744C 4E 80 00 20 */ blr -/* 8009A510 00097450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A514 00097454 7C 08 02 A6 */ mflr r0 -/* 8009A518 00097458 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A51C 0009745C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A520 00097460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A524 00097464 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A528 00097468 38 80 00 60 */ li r4, 0x60 -/* 8009A52C 0009746C 4B F9 91 B5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A530 00097470 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A534 00097474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A538 00097478 7C 08 03 A6 */ mtlr r0 -/* 8009A53C 0009747C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A540 00097480 4E 80 00 20 */ blr -/* 8009A544 00097484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A548 00097488 7C 08 02 A6 */ mflr r0 -/* 8009A54C 0009748C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A550 00097490 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A554 00097494 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A558 00097498 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A55C 0009749C 38 80 00 61 */ li r4, 0x61 -/* 8009A560 000974A0 4B F9 91 81 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A564 000974A4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A568 000974A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A56C 000974AC 7C 08 03 A6 */ mtlr r0 -/* 8009A570 000974B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A574 000974B4 4E 80 00 20 */ blr -/* 8009A578 000974B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A57C 000974BC 7C 08 02 A6 */ mflr r0 -/* 8009A580 000974C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A584 000974C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A588 000974C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A58C 000974CC 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A590 000974D0 38 80 00 62 */ li r4, 0x62 -/* 8009A594 000974D4 4B F9 91 4D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A598 000974D8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A59C 000974DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A5A0 000974E0 7C 08 03 A6 */ mtlr r0 -/* 8009A5A4 000974E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A5A8 000974E8 4E 80 00 20 */ blr -/* 8009A5AC 000974EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A5B0 000974F0 7C 08 02 A6 */ mflr r0 -/* 8009A5B4 000974F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A5B8 000974F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A5BC 000974FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A5C0 00097500 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A5C4 00097504 38 80 00 63 */ li r4, 0x63 -/* 8009A5C8 00097508 4B F9 91 19 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A5CC 0009750C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A5D0 00097510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A5D4 00097514 7C 08 03 A6 */ mtlr r0 -/* 8009A5D8 00097518 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A5DC 0009751C 4E 80 00 20 */ blr -/* 8009A5E0 00097520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A5E4 00097524 7C 08 02 A6 */ mflr r0 -/* 8009A5E8 00097528 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A5EC 0009752C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A5F0 00097530 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A5F4 00097534 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A5F8 00097538 38 80 00 64 */ li r4, 0x64 -/* 8009A5FC 0009753C 4B F9 90 E5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A600 00097540 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A604 00097544 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A608 00097548 7C 08 03 A6 */ mtlr r0 -/* 8009A60C 0009754C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A610 00097550 4E 80 00 20 */ blr -/* 8009A614 00097554 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A618 00097558 7C 08 02 A6 */ mflr r0 -/* 8009A61C 0009755C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A620 00097560 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A624 00097564 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A628 00097568 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A62C 0009756C 38 80 00 65 */ li r4, 0x65 -/* 8009A630 00097570 4B F9 90 B1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A634 00097574 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A638 00097578 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A63C 0009757C 7C 08 03 A6 */ mtlr r0 -/* 8009A640 00097580 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A644 00097584 4E 80 00 20 */ blr -/* 8009A648 00097588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A64C 0009758C 7C 08 02 A6 */ mflr r0 -/* 8009A650 00097590 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A654 00097594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A658 00097598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A65C 0009759C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A660 000975A0 38 80 00 66 */ li r4, 0x66 -/* 8009A664 000975A4 4B F9 90 7D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A668 000975A8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A66C 000975AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A670 000975B0 7C 08 03 A6 */ mtlr r0 -/* 8009A674 000975B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A678 000975B8 4E 80 00 20 */ blr -/* 8009A67C 000975BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A680 000975C0 7C 08 02 A6 */ mflr r0 -/* 8009A684 000975C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A688 000975C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A68C 000975CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A690 000975D0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A694 000975D4 38 80 00 67 */ li r4, 0x67 -/* 8009A698 000975D8 4B F9 90 49 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A69C 000975DC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A6A0 000975E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A6A4 000975E4 7C 08 03 A6 */ mtlr r0 -/* 8009A6A8 000975E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A6AC 000975EC 4E 80 00 20 */ blr -/* 8009A6B0 000975F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A6B4 000975F4 7C 08 02 A6 */ mflr r0 -/* 8009A6B8 000975F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A6BC 000975FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A6C0 00097600 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A6C4 00097604 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A6C8 00097608 38 80 00 68 */ li r4, 0x68 -/* 8009A6CC 0009760C 4B F9 90 15 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A6D0 00097610 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A6D4 00097614 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A6D8 00097618 7C 08 03 A6 */ mtlr r0 -/* 8009A6DC 0009761C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A6E0 00097620 4E 80 00 20 */ blr -/* 8009A6E4 00097624 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A6E8 00097628 7C 08 02 A6 */ mflr r0 -/* 8009A6EC 0009762C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A6F0 00097630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A6F4 00097634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A6F8 00097638 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A6FC 0009763C 38 80 00 69 */ li r4, 0x69 -/* 8009A700 00097640 4B F9 8F E1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A704 00097644 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A708 00097648 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A70C 0009764C 7C 08 03 A6 */ mtlr r0 -/* 8009A710 00097650 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A714 00097654 4E 80 00 20 */ blr -/* 8009A718 00097658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A71C 0009765C 7C 08 02 A6 */ mflr r0 -/* 8009A720 00097660 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A724 00097664 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A728 00097668 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A72C 0009766C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A730 00097670 38 80 00 6A */ li r4, 0x6a -/* 8009A734 00097674 4B F9 8F AD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A738 00097678 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A73C 0009767C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A740 00097680 7C 08 03 A6 */ mtlr r0 -/* 8009A744 00097684 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A748 00097688 4E 80 00 20 */ blr -/* 8009A74C 0009768C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A750 00097690 7C 08 02 A6 */ mflr r0 -/* 8009A754 00097694 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A758 00097698 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A75C 0009769C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A760 000976A0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A764 000976A4 38 80 00 6B */ li r4, 0x6b -/* 8009A768 000976A8 4B F9 8F 79 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A76C 000976AC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A770 000976B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A774 000976B4 7C 08 03 A6 */ mtlr r0 -/* 8009A778 000976B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A77C 000976BC 4E 80 00 20 */ blr -/* 8009A780 000976C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A784 000976C4 7C 08 02 A6 */ mflr r0 -/* 8009A788 000976C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A78C 000976CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A790 000976D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A794 000976D4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A798 000976D8 38 80 00 6C */ li r4, 0x6c -/* 8009A79C 000976DC 4B F9 8F 45 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A7A0 000976E0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A7A4 000976E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A7A8 000976E8 7C 08 03 A6 */ mtlr r0 -/* 8009A7AC 000976EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A7B0 000976F0 4E 80 00 20 */ blr -/* 8009A7B4 000976F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A7B8 000976F8 7C 08 02 A6 */ mflr r0 -/* 8009A7BC 000976FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A7C0 00097700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A7C4 00097704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A7C8 00097708 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A7CC 0009770C 38 80 00 6B */ li r4, 0x6b -/* 8009A7D0 00097710 4B F9 8F 11 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A7D4 00097714 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A7D8 00097718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A7DC 0009771C 7C 08 03 A6 */ mtlr r0 -/* 8009A7E0 00097720 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A7E4 00097724 4E 80 00 20 */ blr -/* 8009A7E8 00097728 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A7EC 0009772C 7C 08 02 A6 */ mflr r0 -/* 8009A7F0 00097730 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A7F4 00097734 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A7F8 00097738 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A7FC 0009773C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A800 00097740 38 80 00 6E */ li r4, 0x6e -/* 8009A804 00097744 4B F9 8E DD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A808 00097748 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A80C 0009774C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A810 00097750 7C 08 03 A6 */ mtlr r0 -/* 8009A814 00097754 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A818 00097758 4E 80 00 20 */ blr -/* 8009A81C 0009775C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A820 00097760 7C 08 02 A6 */ mflr r0 -/* 8009A824 00097764 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A828 00097768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A82C 0009776C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A830 00097770 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A834 00097774 38 80 00 6F */ li r4, 0x6f -/* 8009A838 00097778 4B F9 8E A9 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A83C 0009777C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A840 00097780 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A844 00097784 7C 08 03 A6 */ mtlr r0 -/* 8009A848 00097788 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A84C 0009778C 4E 80 00 20 */ blr -/* 8009A850 00097790 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A854 00097794 7C 08 02 A6 */ mflr r0 -/* 8009A858 00097798 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A85C 0009779C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A860 000977A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A864 000977A4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A868 000977A8 38 80 00 70 */ li r4, 0x70 -/* 8009A86C 000977AC 4B F9 96 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A870 000977B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A874 000977B4 7C 08 03 A6 */ mtlr r0 -/* 8009A878 000977B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A87C 000977BC 4E 80 00 20 */ blr -/* 8009A880 000977C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A884 000977C4 7C 08 02 A6 */ mflr r0 -/* 8009A888 000977C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A88C 000977CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A890 000977D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A894 000977D4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A898 000977D8 38 80 00 71 */ li r4, 0x71 -/* 8009A89C 000977DC 4B F9 96 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A8A0 000977E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A8A4 000977E4 7C 08 03 A6 */ mtlr r0 -/* 8009A8A8 000977E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A8AC 000977EC 4E 80 00 20 */ blr -/* 8009A8B0 000977F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A8B4 000977F4 7C 08 02 A6 */ mflr r0 -/* 8009A8B8 000977F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A8BC 000977FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A8C0 00097800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A8C4 00097804 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A8C8 00097808 38 80 00 72 */ li r4, 0x72 -/* 8009A8CC 0009780C 4B F9 95 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A8D0 00097810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A8D4 00097814 7C 08 03 A6 */ mtlr r0 -/* 8009A8D8 00097818 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A8DC 0009781C 4E 80 00 20 */ blr -/* 8009A8E0 00097820 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A8E4 00097824 7C 08 02 A6 */ mflr r0 -/* 8009A8E8 00097828 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A8EC 0009782C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A8F0 00097830 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A8F4 00097834 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A8F8 00097838 38 80 00 73 */ li r4, 0x73 -/* 8009A8FC 0009783C 4B F9 8D E5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A900 00097840 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A904 00097844 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A908 00097848 7C 08 03 A6 */ mtlr r0 -/* 8009A90C 0009784C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A910 00097850 4E 80 00 20 */ blr -/* 8009A914 00097854 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A918 00097858 7C 08 02 A6 */ mflr r0 -/* 8009A91C 0009785C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A920 00097860 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A924 00097864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A928 00097868 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A92C 0009786C 38 80 00 74 */ li r4, 0x74 -/* 8009A930 00097870 4B F9 8D B1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A934 00097874 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A938 00097878 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A93C 0009787C 7C 08 03 A6 */ mtlr r0 -/* 8009A940 00097880 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A944 00097884 4E 80 00 20 */ blr -/* 8009A948 00097888 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A94C 0009788C 7C 08 02 A6 */ mflr r0 -/* 8009A950 00097890 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A954 00097894 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A958 00097898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A95C 0009789C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A960 000978A0 38 80 00 75 */ li r4, 0x75 -/* 8009A964 000978A4 4B F9 95 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A968 000978A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A96C 000978AC 7C 08 03 A6 */ mtlr r0 -/* 8009A970 000978B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A974 000978B4 4E 80 00 20 */ blr -/* 8009A978 000978B8 38 60 FF FF */ li r3, -1 -/* 8009A97C 000978BC 4E 80 00 20 */ blr -/* 8009A980 000978C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A984 000978C4 7C 08 02 A6 */ mflr r0 -/* 8009A988 000978C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A98C 000978CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A990 000978D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A994 000978D4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A998 000978D8 38 80 00 77 */ li r4, 0x77 -/* 8009A99C 000978DC 4B F9 8D 45 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A9A0 000978E0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A9A4 000978E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A9A8 000978E8 7C 08 03 A6 */ mtlr r0 -/* 8009A9AC 000978EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A9B0 000978F0 4E 80 00 20 */ blr -/* 8009A9B4 000978F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A9B8 000978F8 7C 08 02 A6 */ mflr r0 -/* 8009A9BC 000978FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A9C0 00097900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A9C4 00097904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A9C8 00097908 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A9CC 0009790C 38 80 00 78 */ li r4, 0x78 -/* 8009A9D0 00097910 4B F9 8D 11 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A9D4 00097914 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A9D8 00097918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A9DC 0009791C 7C 08 03 A6 */ mtlr r0 -/* 8009A9E0 00097920 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A9E4 00097924 4E 80 00 20 */ blr -/* 8009A9E8 00097928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A9EC 0009792C 7C 08 02 A6 */ mflr r0 -/* 8009A9F0 00097930 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A9F4 00097934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009A9F8 00097938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009A9FC 0009793C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA00 00097940 38 80 00 79 */ li r4, 0x79 -/* 8009AA04 00097944 4B F9 8C DD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA08 00097948 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA0C 0009794C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA10 00097950 7C 08 03 A6 */ mtlr r0 -/* 8009AA14 00097954 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA18 00097958 4E 80 00 20 */ blr -/* 8009AA1C 0009795C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA20 00097960 7C 08 02 A6 */ mflr r0 -/* 8009AA24 00097964 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA28 00097968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AA2C 0009796C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AA30 00097970 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA34 00097974 38 80 00 7A */ li r4, 0x7a -/* 8009AA38 00097978 4B F9 8C A9 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA3C 0009797C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA40 00097980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA44 00097984 7C 08 03 A6 */ mtlr r0 -/* 8009AA48 00097988 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA4C 0009798C 4E 80 00 20 */ blr -/* 8009AA50 00097990 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA54 00097994 7C 08 02 A6 */ mflr r0 -/* 8009AA58 00097998 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA5C 0009799C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AA60 000979A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AA64 000979A4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA68 000979A8 38 80 00 7B */ li r4, 0x7b -/* 8009AA6C 000979AC 4B F9 8C 75 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA70 000979B0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA74 000979B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA78 000979B8 7C 08 03 A6 */ mtlr r0 -/* 8009AA7C 000979BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA80 000979C0 4E 80 00 20 */ blr -/* 8009AA84 000979C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA88 000979C8 7C 08 02 A6 */ mflr r0 -/* 8009AA8C 000979CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA90 000979D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AA94 000979D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AA98 000979D8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA9C 000979DC 38 80 00 7C */ li r4, 0x7c -/* 8009AAA0 000979E0 4B F9 8C 41 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AAA4 000979E4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AAA8 000979E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AAAC 000979EC 7C 08 03 A6 */ mtlr r0 -/* 8009AAB0 000979F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AAB4 000979F4 4E 80 00 20 */ blr -/* 8009AAB8 000979F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AABC 000979FC 7C 08 02 A6 */ mflr r0 -/* 8009AAC0 00097A00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AAC4 00097A04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AAC8 00097A08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AACC 00097A0C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AAD0 00097A10 38 80 00 7D */ li r4, 0x7d -/* 8009AAD4 00097A14 4B F9 93 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AAD8 00097A18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AADC 00097A1C 7C 08 03 A6 */ mtlr r0 -/* 8009AAE0 00097A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AAE4 00097A24 4E 80 00 20 */ blr -/* 8009AAE8 00097A28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AAEC 00097A2C 7C 08 02 A6 */ mflr r0 -/* 8009AAF0 00097A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AAF4 00097A34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AAF8 00097A38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AAFC 00097A3C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AB00 00097A40 38 80 00 7E */ li r4, 0x7e -/* 8009AB04 00097A44 4B F9 93 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AB08 00097A48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB0C 00097A4C 7C 08 03 A6 */ mtlr r0 -/* 8009AB10 00097A50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB14 00097A54 4E 80 00 20 */ blr -/* 8009AB18 00097A58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB1C 00097A5C 7C 08 02 A6 */ mflr r0 -/* 8009AB20 00097A60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB24 00097A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AB28 00097A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AB2C 00097A6C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AB30 00097A70 38 80 00 7F */ li r4, 0x7f -/* 8009AB34 00097A74 4B F9 93 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AB38 00097A78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB3C 00097A7C 7C 08 03 A6 */ mtlr r0 -/* 8009AB40 00097A80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB44 00097A84 4E 80 00 20 */ blr -/* 8009AB48 00097A88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB4C 00097A8C 7C 08 02 A6 */ mflr r0 -/* 8009AB50 00097A90 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB54 00097A94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AB58 00097A98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AB5C 00097A9C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AB60 00097AA0 38 80 00 15 */ li r4, 0x15 -/* 8009AB64 00097AA4 38 A0 00 01 */ li r5, 1 -/* 8009AB68 00097AA8 4B F9 84 C9 */ bl getItem__17dSv_player_item_cCFib -/* 8009AB6C 00097AAC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AB70 00097AB0 20 00 00 80 */ subfic r0, r0, 0x80 -/* 8009AB74 00097AB4 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AB78 00097AB8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AB7C 00097ABC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB80 00097AC0 7C 08 03 A6 */ mtlr r0 -/* 8009AB84 00097AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB88 00097AC8 4E 80 00 20 */ blr -/* 8009AB8C 00097ACC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB90 00097AD0 7C 08 02 A6 */ mflr r0 -/* 8009AB94 00097AD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB98 00097AD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AB9C 00097ADC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ABA0 00097AE0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ABA4 00097AE4 38 80 00 15 */ li r4, 0x15 -/* 8009ABA8 00097AE8 38 A0 00 01 */ li r5, 1 -/* 8009ABAC 00097AEC 4B F9 84 85 */ bl getItem__17dSv_player_item_cCFib -/* 8009ABB0 00097AF0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ABB4 00097AF4 20 00 00 81 */ subfic r0, r0, 0x81 -/* 8009ABB8 00097AF8 7C 00 00 34 */ cntlzw r0, r0 -/* 8009ABBC 00097AFC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009ABC0 00097B00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ABC4 00097B04 7C 08 03 A6 */ mtlr r0 -/* 8009ABC8 00097B08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ABCC 00097B0C 4E 80 00 20 */ blr -/* 8009ABD0 00097B10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ABD4 00097B14 7C 08 02 A6 */ mflr r0 -/* 8009ABD8 00097B18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ABDC 00097B1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009ABE0 00097B20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ABE4 00097B24 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ABE8 00097B28 38 80 00 15 */ li r4, 0x15 -/* 8009ABEC 00097B2C 38 A0 00 01 */ li r5, 1 -/* 8009ABF0 00097B30 4B F9 84 41 */ bl getItem__17dSv_player_item_cCFib -/* 8009ABF4 00097B34 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ABF8 00097B38 20 00 00 82 */ subfic r0, r0, 0x82 -/* 8009ABFC 00097B3C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC00 00097B40 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC04 00097B44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC08 00097B48 7C 08 03 A6 */ mtlr r0 -/* 8009AC0C 00097B4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC10 00097B50 4E 80 00 20 */ blr -/* 8009AC14 00097B54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AC18 00097B58 7C 08 02 A6 */ mflr r0 -/* 8009AC1C 00097B5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AC20 00097B60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AC24 00097B64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AC28 00097B68 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AC2C 00097B6C 38 80 00 15 */ li r4, 0x15 -/* 8009AC30 00097B70 38 A0 00 01 */ li r5, 1 -/* 8009AC34 00097B74 4B F9 83 FD */ bl getItem__17dSv_player_item_cCFib -/* 8009AC38 00097B78 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AC3C 00097B7C 20 00 00 83 */ subfic r0, r0, 0x83 -/* 8009AC40 00097B80 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC44 00097B84 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC48 00097B88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC4C 00097B8C 7C 08 03 A6 */ mtlr r0 -/* 8009AC50 00097B90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC54 00097B94 4E 80 00 20 */ blr -/* 8009AC58 00097B98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AC5C 00097B9C 7C 08 02 A6 */ mflr r0 -/* 8009AC60 00097BA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AC64 00097BA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AC68 00097BA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AC6C 00097BAC 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AC70 00097BB0 38 80 00 16 */ li r4, 0x16 -/* 8009AC74 00097BB4 38 A0 00 01 */ li r5, 1 -/* 8009AC78 00097BB8 4B F9 83 B9 */ bl getItem__17dSv_player_item_cCFib -/* 8009AC7C 00097BBC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AC80 00097BC0 20 00 00 84 */ subfic r0, r0, 0x84 -/* 8009AC84 00097BC4 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC88 00097BC8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC8C 00097BCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC90 00097BD0 7C 08 03 A6 */ mtlr r0 -/* 8009AC94 00097BD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC98 00097BD8 4E 80 00 20 */ blr -/* 8009AC9C 00097BDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ACA0 00097BE0 7C 08 02 A6 */ mflr r0 -/* 8009ACA4 00097BE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ACA8 00097BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009ACAC 00097BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ACB0 00097BF0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ACB4 00097BF4 38 80 00 13 */ li r4, 0x13 -/* 8009ACB8 00097BF8 38 A0 00 01 */ li r5, 1 -/* 8009ACBC 00097BFC 4B F9 83 75 */ bl getItem__17dSv_player_item_cCFib -/* 8009ACC0 00097C00 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ACC4 00097C04 20 00 00 90 */ subfic r0, r0, 0x90 -/* 8009ACC8 00097C08 7C 00 00 34 */ cntlzw r0, r0 -/* 8009ACCC 00097C0C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009ACD0 00097C10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ACD4 00097C14 7C 08 03 A6 */ mtlr r0 -/* 8009ACD8 00097C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ACDC 00097C1C 4E 80 00 20 */ blr -/* 8009ACE0 00097C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ACE4 00097C24 7C 08 02 A6 */ mflr r0 -/* 8009ACE8 00097C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ACEC 00097C2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009ACF0 00097C30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ACF4 00097C34 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ACF8 00097C38 38 80 00 13 */ li r4, 0x13 -/* 8009ACFC 00097C3C 38 A0 00 01 */ li r5, 1 -/* 8009AD00 00097C40 4B F9 83 31 */ bl getItem__17dSv_player_item_cCFib -/* 8009AD04 00097C44 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AD08 00097C48 20 00 00 91 */ subfic r0, r0, 0x91 -/* 8009AD0C 00097C4C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AD10 00097C50 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AD14 00097C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD18 00097C58 7C 08 03 A6 */ mtlr r0 -/* 8009AD1C 00097C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD20 00097C60 4E 80 00 20 */ blr -/* 8009AD24 00097C64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AD28 00097C68 7C 08 02 A6 */ mflr r0 -/* 8009AD2C 00097C6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AD30 00097C70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AD34 00097C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AD38 00097C78 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AD3C 00097C7C 38 80 00 9C */ li r4, 0x9c -/* 8009AD40 00097C80 4B F9 89 A1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AD44 00097C84 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AD48 00097C88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD4C 00097C8C 7C 08 03 A6 */ mtlr r0 -/* 8009AD50 00097C90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD54 00097C94 4E 80 00 20 */ blr -/* 8009AD58 00097C98 38 60 FF FF */ li r3, -1 -/* 8009AD5C 00097C9C 4E 80 00 20 */ blr -/* 8009AD60 00097CA0 38 60 FF FF */ li r3, -1 -/* 8009AD64 00097CA4 4E 80 00 20 */ blr -/* 8009AD68 00097CA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AD6C 00097CAC 7C 08 02 A6 */ mflr r0 -/* 8009AD70 00097CB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AD74 00097CB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AD78 00097CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AD7C 00097CBC 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AD80 00097CC0 38 80 00 9F */ li r4, 0x9f -/* 8009AD84 00097CC4 4B F9 89 5D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AD88 00097CC8 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AD8C 00097CCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD90 00097CD0 7C 08 03 A6 */ mtlr r0 -/* 8009AD94 00097CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD98 00097CD8 4E 80 00 20 */ blr -/* 8009AD9C 00097CDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ADA0 00097CE0 7C 08 02 A6 */ mflr r0 -/* 8009ADA4 00097CE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ADA8 00097CE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009ADAC 00097CEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ADB0 00097CF0 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009ADB4 00097CF4 38 80 00 A0 */ li r4, 0xa0 -/* 8009ADB8 00097CF8 4B F9 91 11 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009ADBC 00097CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ADC0 00097D00 7C 08 03 A6 */ mtlr r0 -/* 8009ADC4 00097D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ADC8 00097D08 4E 80 00 20 */ blr -/* 8009ADCC 00097D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ADD0 00097D10 7C 08 02 A6 */ mflr r0 -/* 8009ADD4 00097D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ADD8 00097D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009ADDC 00097D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009ADE0 00097D20 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009ADE4 00097D24 38 80 00 00 */ li r4, 0 -/* 8009ADE8 00097D28 4B F9 95 B5 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009ADEC 00097D2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ADF0 00097D30 7C 08 03 A6 */ mtlr r0 -/* 8009ADF4 00097D34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ADF8 00097D38 4E 80 00 20 */ blr -/* 8009ADFC 00097D3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AE00 00097D40 7C 08 02 A6 */ mflr r0 -/* 8009AE04 00097D44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AE08 00097D48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AE0C 00097D4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AE10 00097D50 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009AE14 00097D54 38 80 00 01 */ li r4, 1 -/* 8009AE18 00097D58 4B F9 95 85 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009AE1C 00097D5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AE20 00097D60 7C 08 03 A6 */ mtlr r0 -/* 8009AE24 00097D64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AE28 00097D68 4E 80 00 20 */ blr -/* 8009AE2C 00097D6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AE30 00097D70 7C 08 02 A6 */ mflr r0 -/* 8009AE34 00097D74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AE38 00097D78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AE3C 00097D7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AE40 00097D80 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009AE44 00097D84 38 80 00 02 */ li r4, 2 -/* 8009AE48 00097D88 4B F9 95 55 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009AE4C 00097D8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AE50 00097D90 7C 08 03 A6 */ mtlr r0 -/* 8009AE54 00097D94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AE58 00097D98 4E 80 00 20 */ blr -/* 8009AE5C 00097D9C 38 60 FF FF */ li r3, -1 -/* 8009AE60 00097DA0 4E 80 00 20 */ blr -/* 8009AE64 00097DA4 38 60 FF FF */ li r3, -1 -/* 8009AE68 00097DA8 4E 80 00 20 */ blr -/* 8009AE6C 00097DAC 38 60 FF FF */ li r3, -1 -/* 8009AE70 00097DB0 4E 80 00 20 */ blr -/* 8009AE74 00097DB4 38 60 FF FF */ li r3, -1 -/* 8009AE78 00097DB8 4E 80 00 20 */ blr -/* 8009AE7C 00097DBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AE80 00097DC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AE84 00097DC4 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AE88 00097DC8 20 00 00 B0 */ subfic r0, r0, 0xb0 -/* 8009AE8C 00097DCC 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AE90 00097DD0 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AE94 00097DD4 4E 80 00 20 */ blr -/* 8009AE98 00097DD8 38 60 FF FF */ li r3, -1 -/* 8009AE9C 00097DDC 4E 80 00 20 */ blr -/* 8009AEA0 00097DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AEA4 00097DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AEA8 00097DE8 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEAC 00097DEC 20 00 00 B2 */ subfic r0, r0, 0xb2 -/* 8009AEB0 00097DF0 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AEB4 00097DF4 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AEB8 00097DF8 4E 80 00 20 */ blr -/* 8009AEBC 00097DFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AEC0 00097E00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AEC4 00097E04 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEC8 00097E08 20 00 00 B3 */ subfic r0, r0, 0xb3 -/* 8009AECC 00097E0C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AED0 00097E10 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AED4 00097E14 4E 80 00 20 */ blr -/* 8009AED8 00097E18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AEDC 00097E1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AEE0 00097E20 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEE4 00097E24 20 00 00 B4 */ subfic r0, r0, 0xb4 -/* 8009AEE8 00097E28 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AEEC 00097E2C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AEF0 00097E30 4E 80 00 20 */ blr -/* 8009AEF4 00097E34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AEF8 00097E38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AEFC 00097E3C 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AF00 00097E40 20 00 00 B5 */ subfic r0, r0, 0xb5 -/* 8009AF04 00097E44 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AF08 00097E48 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AF0C 00097E4C 4E 80 00 20 */ blr -/* 8009AF10 00097E50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF14 00097E54 7C 08 02 A6 */ mflr r0 -/* 8009AF18 00097E58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF1C 00097E5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AF20 00097E60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AF24 00097E64 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF28 00097E68 38 80 00 C0 */ li r4, 0xc0 -/* 8009AF2C 00097E6C 4B F9 8F 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF30 00097E70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF34 00097E74 7C 08 03 A6 */ mtlr r0 -/* 8009AF38 00097E78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF3C 00097E7C 4E 80 00 20 */ blr -/* 8009AF40 00097E80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF44 00097E84 7C 08 02 A6 */ mflr r0 -/* 8009AF48 00097E88 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF4C 00097E8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AF50 00097E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AF54 00097E94 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF58 00097E98 38 80 00 C1 */ li r4, 0xc1 -/* 8009AF5C 00097E9C 4B F9 8F 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF60 00097EA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF64 00097EA4 7C 08 03 A6 */ mtlr r0 -/* 8009AF68 00097EA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF6C 00097EAC 4E 80 00 20 */ blr -/* 8009AF70 00097EB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF74 00097EB4 7C 08 02 A6 */ mflr r0 -/* 8009AF78 00097EB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF7C 00097EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AF80 00097EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AF84 00097EC4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF88 00097EC8 38 80 00 C2 */ li r4, 0xc2 -/* 8009AF8C 00097ECC 4B F9 8F 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF90 00097ED0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF94 00097ED4 7C 08 03 A6 */ mtlr r0 -/* 8009AF98 00097ED8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF9C 00097EDC 4E 80 00 20 */ blr -/* 8009AFA0 00097EE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AFA4 00097EE4 7C 08 02 A6 */ mflr r0 -/* 8009AFA8 00097EE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AFAC 00097EEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AFB0 00097EF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AFB4 00097EF4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AFB8 00097EF8 38 80 00 C3 */ li r4, 0xc3 -/* 8009AFBC 00097EFC 4B F9 8F 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AFC0 00097F00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AFC4 00097F04 7C 08 03 A6 */ mtlr r0 -/* 8009AFC8 00097F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AFCC 00097F0C 4E 80 00 20 */ blr -/* 8009AFD0 00097F10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AFD4 00097F14 7C 08 02 A6 */ mflr r0 -/* 8009AFD8 00097F18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AFDC 00097F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009AFE0 00097F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009AFE4 00097F24 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AFE8 00097F28 38 80 00 C4 */ li r4, 0xc4 -/* 8009AFEC 00097F2C 4B F9 8E DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AFF0 00097F30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AFF4 00097F34 7C 08 03 A6 */ mtlr r0 -/* 8009AFF8 00097F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AFFC 00097F3C 4E 80 00 20 */ blr -/* 8009B000 00097F40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B004 00097F44 7C 08 02 A6 */ mflr r0 -/* 8009B008 00097F48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B00C 00097F4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B010 00097F50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B014 00097F54 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B018 00097F58 38 80 00 C5 */ li r4, 0xc5 -/* 8009B01C 00097F5C 4B F9 8E AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B020 00097F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B024 00097F64 7C 08 03 A6 */ mtlr r0 -/* 8009B028 00097F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B02C 00097F6C 4E 80 00 20 */ blr -/* 8009B030 00097F70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B034 00097F74 7C 08 02 A6 */ mflr r0 -/* 8009B038 00097F78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B03C 00097F7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B040 00097F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B044 00097F84 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B048 00097F88 38 80 00 C6 */ li r4, 0xc6 -/* 8009B04C 00097F8C 4B F9 8E 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B050 00097F90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B054 00097F94 7C 08 03 A6 */ mtlr r0 -/* 8009B058 00097F98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B05C 00097F9C 4E 80 00 20 */ blr -/* 8009B060 00097FA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B064 00097FA4 7C 08 02 A6 */ mflr r0 -/* 8009B068 00097FA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B06C 00097FAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B070 00097FB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B074 00097FB4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B078 00097FB8 38 80 00 C7 */ li r4, 0xc7 -/* 8009B07C 00097FBC 4B F9 8E 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B080 00097FC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B084 00097FC4 7C 08 03 A6 */ mtlr r0 -/* 8009B088 00097FC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B08C 00097FCC 4E 80 00 20 */ blr -/* 8009B090 00097FD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B094 00097FD4 7C 08 02 A6 */ mflr r0 -/* 8009B098 00097FD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B09C 00097FDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B0A0 00097FE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B0A4 00097FE4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B0A8 00097FE8 38 80 00 C8 */ li r4, 0xc8 -/* 8009B0AC 00097FEC 4B F9 8E 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B0B0 00097FF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B0B4 00097FF4 7C 08 03 A6 */ mtlr r0 -/* 8009B0B8 00097FF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B0BC 00097FFC 4E 80 00 20 */ blr -/* 8009B0C0 00098000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B0C4 00098004 7C 08 02 A6 */ mflr r0 -/* 8009B0C8 00098008 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B0CC 0009800C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B0D0 00098010 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B0D4 00098014 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B0D8 00098018 38 80 00 C9 */ li r4, 0xc9 -/* 8009B0DC 0009801C 4B F9 8D ED */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B0E0 00098020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B0E4 00098024 7C 08 03 A6 */ mtlr r0 -/* 8009B0E8 00098028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B0EC 0009802C 4E 80 00 20 */ blr -/* 8009B0F0 00098030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B0F4 00098034 7C 08 02 A6 */ mflr r0 -/* 8009B0F8 00098038 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B0FC 0009803C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B100 00098040 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B104 00098044 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B108 00098048 38 80 00 CA */ li r4, 0xca -/* 8009B10C 0009804C 4B F9 8D BD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B110 00098050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B114 00098054 7C 08 03 A6 */ mtlr r0 -/* 8009B118 00098058 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B11C 0009805C 4E 80 00 20 */ blr -/* 8009B120 00098060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B124 00098064 7C 08 02 A6 */ mflr r0 -/* 8009B128 00098068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B12C 0009806C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B130 00098070 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B134 00098074 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B138 00098078 38 80 00 CB */ li r4, 0xcb -/* 8009B13C 0009807C 4B F9 8D 8D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B140 00098080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B144 00098084 7C 08 03 A6 */ mtlr r0 -/* 8009B148 00098088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B14C 0009808C 4E 80 00 20 */ blr -/* 8009B150 00098090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B154 00098094 7C 08 02 A6 */ mflr r0 -/* 8009B158 00098098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B15C 0009809C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B160 000980A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B164 000980A4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B168 000980A8 38 80 00 CC */ li r4, 0xcc -/* 8009B16C 000980AC 4B F9 8D 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B170 000980B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B174 000980B4 7C 08 03 A6 */ mtlr r0 -/* 8009B178 000980B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B17C 000980BC 4E 80 00 20 */ blr -/* 8009B180 000980C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B184 000980C4 7C 08 02 A6 */ mflr r0 -/* 8009B188 000980C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B18C 000980CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B190 000980D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B194 000980D4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B198 000980D8 38 80 00 CD */ li r4, 0xcd -/* 8009B19C 000980DC 4B F9 8D 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B1A0 000980E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B1A4 000980E4 7C 08 03 A6 */ mtlr r0 -/* 8009B1A8 000980E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B1AC 000980EC 4E 80 00 20 */ blr -/* 8009B1B0 000980F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B1B4 000980F4 7C 08 02 A6 */ mflr r0 -/* 8009B1B8 000980F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B1BC 000980FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B1C0 00098100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B1C4 00098104 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B1C8 00098108 38 80 00 CE */ li r4, 0xce -/* 8009B1CC 0009810C 4B F9 8C FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B1D0 00098110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B1D4 00098114 7C 08 03 A6 */ mtlr r0 -/* 8009B1D8 00098118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B1DC 0009811C 4E 80 00 20 */ blr -/* 8009B1E0 00098120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B1E4 00098124 7C 08 02 A6 */ mflr r0 -/* 8009B1E8 00098128 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B1EC 0009812C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B1F0 00098130 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B1F4 00098134 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B1F8 00098138 38 80 00 CF */ li r4, 0xcf -/* 8009B1FC 0009813C 4B F9 8C CD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B200 00098140 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B204 00098144 7C 08 03 A6 */ mtlr r0 -/* 8009B208 00098148 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B20C 0009814C 4E 80 00 20 */ blr -/* 8009B210 00098150 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B214 00098154 7C 08 02 A6 */ mflr r0 -/* 8009B218 00098158 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B21C 0009815C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B220 00098160 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B224 00098164 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B228 00098168 38 80 00 D0 */ li r4, 0xd0 -/* 8009B22C 0009816C 4B F9 8C 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B230 00098170 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B234 00098174 7C 08 03 A6 */ mtlr r0 -/* 8009B238 00098178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B23C 0009817C 4E 80 00 20 */ blr -/* 8009B240 00098180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B244 00098184 7C 08 02 A6 */ mflr r0 -/* 8009B248 00098188 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B24C 0009818C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B250 00098190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B254 00098194 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B258 00098198 38 80 00 D1 */ li r4, 0xd1 -/* 8009B25C 0009819C 4B F9 8C 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B260 000981A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B264 000981A4 7C 08 03 A6 */ mtlr r0 -/* 8009B268 000981A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B26C 000981AC 4E 80 00 20 */ blr -/* 8009B270 000981B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B274 000981B4 7C 08 02 A6 */ mflr r0 -/* 8009B278 000981B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B27C 000981BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B280 000981C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B284 000981C4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B288 000981C8 38 80 00 D2 */ li r4, 0xd2 -/* 8009B28C 000981CC 4B F9 8C 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B290 000981D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B294 000981D4 7C 08 03 A6 */ mtlr r0 -/* 8009B298 000981D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B29C 000981DC 4E 80 00 20 */ blr -/* 8009B2A0 000981E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B2A4 000981E4 7C 08 02 A6 */ mflr r0 -/* 8009B2A8 000981E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B2AC 000981EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B2B0 000981F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B2B4 000981F4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B2B8 000981F8 38 80 00 D3 */ li r4, 0xd3 -/* 8009B2BC 000981FC 4B F9 8C 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B2C0 00098200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B2C4 00098204 7C 08 03 A6 */ mtlr r0 -/* 8009B2C8 00098208 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B2CC 0009820C 4E 80 00 20 */ blr -/* 8009B2D0 00098210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B2D4 00098214 7C 08 02 A6 */ mflr r0 -/* 8009B2D8 00098218 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B2DC 0009821C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B2E0 00098220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B2E4 00098224 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B2E8 00098228 38 80 00 D4 */ li r4, 0xd4 -/* 8009B2EC 0009822C 4B F9 8B DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B2F0 00098230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B2F4 00098234 7C 08 03 A6 */ mtlr r0 -/* 8009B2F8 00098238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B2FC 0009823C 4E 80 00 20 */ blr -/* 8009B300 00098240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B304 00098244 7C 08 02 A6 */ mflr r0 -/* 8009B308 00098248 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B30C 0009824C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B310 00098250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B314 00098254 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B318 00098258 38 80 00 D5 */ li r4, 0xd5 -/* 8009B31C 0009825C 4B F9 8B AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B320 00098260 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B324 00098264 7C 08 03 A6 */ mtlr r0 -/* 8009B328 00098268 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B32C 0009826C 4E 80 00 20 */ blr -/* 8009B330 00098270 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B334 00098274 7C 08 02 A6 */ mflr r0 -/* 8009B338 00098278 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B33C 0009827C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B340 00098280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B344 00098284 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B348 00098288 38 80 00 D6 */ li r4, 0xd6 -/* 8009B34C 0009828C 4B F9 8B 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B350 00098290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B354 00098294 7C 08 03 A6 */ mtlr r0 -/* 8009B358 00098298 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B35C 0009829C 4E 80 00 20 */ blr -/* 8009B360 000982A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B364 000982A4 7C 08 02 A6 */ mflr r0 -/* 8009B368 000982A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B36C 000982AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B370 000982B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B374 000982B4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B378 000982B8 38 80 00 D7 */ li r4, 0xd7 -/* 8009B37C 000982BC 4B F9 8B 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B380 000982C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B384 000982C4 7C 08 03 A6 */ mtlr r0 -/* 8009B388 000982C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B38C 000982CC 4E 80 00 20 */ blr -/* 8009B390 000982D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B394 000982D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B398 000982D8 88 63 01 0C */ lbz r3, 0x10c(r3) -/* 8009B39C 000982DC 4E 80 00 20 */ blr -/* 8009B3A0 000982E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B3A4 000982E4 7C 08 02 A6 */ mflr r0 -/* 8009B3A8 000982E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B3AC 000982EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B3B0 000982F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B3B4 000982F4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B3B8 000982F8 38 80 00 16 */ li r4, 0x16 -/* 8009B3BC 000982FC 38 A0 00 01 */ li r5, 1 -/* 8009B3C0 00098300 4B F9 7C 71 */ bl getItem__17dSv_player_item_cCFib -/* 8009B3C4 00098304 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B3C8 00098308 20 00 00 E9 */ subfic r0, r0, 0xe9 -/* 8009B3CC 0009830C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B3D0 00098310 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B3D4 00098314 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B3D8 00098318 7C 08 03 A6 */ mtlr r0 -/* 8009B3DC 0009831C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B3E0 00098320 4E 80 00 20 */ blr -/* 8009B3E4 00098324 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B3E8 00098328 7C 08 02 A6 */ mflr r0 -/* 8009B3EC 0009832C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B3F0 00098330 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B3F4 00098334 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B3F8 00098338 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B3FC 0009833C 38 80 00 16 */ li r4, 0x16 -/* 8009B400 00098340 38 A0 00 01 */ li r5, 1 -/* 8009B404 00098344 4B F9 7C 2D */ bl getItem__17dSv_player_item_cCFib -/* 8009B408 00098348 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B40C 0009834C 20 00 00 EA */ subfic r0, r0, 0xea -/* 8009B410 00098350 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B414 00098354 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B418 00098358 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B41C 0009835C 7C 08 03 A6 */ mtlr r0 -/* 8009B420 00098360 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B424 00098364 4E 80 00 20 */ blr -/* 8009B428 00098368 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B42C 0009836C 7C 08 02 A6 */ mflr r0 -/* 8009B430 00098370 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B434 00098374 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B438 00098378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B43C 0009837C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B440 00098380 38 80 00 16 */ li r4, 0x16 -/* 8009B444 00098384 38 A0 00 01 */ li r5, 1 -/* 8009B448 00098388 4B F9 7B E9 */ bl getItem__17dSv_player_item_cCFib -/* 8009B44C 0009838C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B450 00098390 20 00 00 EB */ subfic r0, r0, 0xeb -/* 8009B454 00098394 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B458 00098398 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B45C 0009839C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B460 000983A0 7C 08 03 A6 */ mtlr r0 -/* 8009B464 000983A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B468 000983A8 4E 80 00 20 */ blr -/* 8009B46C 000983AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B470 000983B0 7C 08 02 A6 */ mflr r0 -/* 8009B474 000983B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B478 000983B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B47C 000983BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B480 000983C0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B484 000983C4 38 80 00 12 */ li r4, 0x12 -/* 8009B488 000983C8 38 A0 00 01 */ li r5, 1 -/* 8009B48C 000983CC 4B F9 7B A5 */ bl getItem__17dSv_player_item_cCFib -/* 8009B490 000983D0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B494 000983D4 20 00 00 EC */ subfic r0, r0, 0xec -/* 8009B498 000983D8 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B49C 000983DC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B4A0 000983E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B4A4 000983E4 7C 08 03 A6 */ mtlr r0 -/* 8009B4A8 000983E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B4AC 000983EC 4E 80 00 20 */ blr -/* 8009B4B0 000983F0 38 60 FF FF */ li r3, -1 -/* 8009B4B4 000983F4 4E 80 00 20 */ blr -/* 8009B4B8 000983F8 38 60 FF FF */ li r3, -1 -/* 8009B4BC 000983FC 4E 80 00 20 */ blr -/* 8009B4C0 00098400 38 60 FF FF */ li r3, -1 -/* 8009B4C4 00098404 4E 80 00 20 */ blr -/* 8009B4C8 00098408 38 60 FF FF */ li r3, -1 -/* 8009B4CC 0009840C 4E 80 00 20 */ blr -/* 8009B4D0 00098410 38 60 FF FF */ li r3, -1 -/* 8009B4D4 00098414 4E 80 00 20 */ blr -/* 8009B4D8 00098418 38 60 FF FF */ li r3, -1 -/* 8009B4DC 0009841C 4E 80 00 20 */ blr -/* 8009B4E0 00098420 38 60 FF FF */ li r3, -1 -/* 8009B4E4 00098424 4E 80 00 20 */ blr -/* 8009B4E8 00098428 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B4EC 0009842C 7C 08 02 A6 */ mflr r0 -/* 8009B4F0 00098430 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B4F4 00098434 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B4F8 00098438 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B4FC 0009843C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B500 00098440 38 80 00 F4 */ li r4, 0xf4 -/* 8009B504 00098444 4B F9 89 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B508 00098448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B50C 0009844C 7C 08 03 A6 */ mtlr r0 -/* 8009B510 00098450 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B514 00098454 4E 80 00 20 */ blr -/* 8009B518 00098458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B51C 0009845C 7C 08 02 A6 */ mflr r0 -/* 8009B520 00098460 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B524 00098464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B528 00098468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B52C 0009846C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B530 00098470 38 80 00 F5 */ li r4, 0xf5 -/* 8009B534 00098474 4B F9 89 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B538 00098478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B53C 0009847C 7C 08 03 A6 */ mtlr r0 -/* 8009B540 00098480 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B544 00098484 4E 80 00 20 */ blr -/* 8009B548 00098488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B54C 0009848C 7C 08 02 A6 */ mflr r0 -/* 8009B550 00098490 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B554 00098494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B558 00098498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B55C 0009849C 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009B560 000984A0 38 80 00 02 */ li r4, 2 -/* 8009B564 000984A4 4B F9 93 D1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8009B568 000984A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B56C 000984AC 7C 08 03 A6 */ mtlr r0 -/* 8009B570 000984B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B574 000984B4 4E 80 00 20 */ blr -/* 8009B578 000984B8 38 60 FF FF */ li r3, -1 -/* 8009B57C 000984BC 4E 80 00 20 */ blr -/* 8009B580 000984C0 38 60 FF FF */ li r3, -1 -/* 8009B584 000984C4 4E 80 00 20 */ blr -/* 8009B588 000984C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B58C 000984CC 7C 08 02 A6 */ mflr r0 -/* 8009B590 000984D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B594 000984D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B598 000984D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B59C 000984DC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B5A0 000984E0 38 80 00 F9 */ li r4, 0xf9 -/* 8009B5A4 000984E4 4B F9 89 25 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B5A8 000984E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B5AC 000984EC 7C 08 03 A6 */ mtlr r0 -/* 8009B5B0 000984F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B5B4 000984F4 4E 80 00 20 */ blr -/* 8009B5B8 000984F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B5BC 000984FC 7C 08 02 A6 */ mflr r0 -/* 8009B5C0 00098500 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B5C4 00098504 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B5C8 00098508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B5CC 0009850C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B5D0 00098510 38 80 00 FA */ li r4, 0xfa -/* 8009B5D4 00098514 4B F9 88 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B5D8 00098518 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B5DC 0009851C 7C 08 03 A6 */ mtlr r0 -/* 8009B5E0 00098520 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B5E4 00098524 4E 80 00 20 */ blr -/* 8009B5E8 00098528 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B5EC 0009852C 7C 08 02 A6 */ mflr r0 -/* 8009B5F0 00098530 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B5F4 00098534 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B5F8 00098538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B5FC 0009853C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B600 00098540 38 80 00 FB */ li r4, 0xfb -/* 8009B604 00098544 4B F9 88 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B608 00098548 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B60C 0009854C 7C 08 03 A6 */ mtlr r0 -/* 8009B610 00098550 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B614 00098554 4E 80 00 20 */ blr -/* 8009B618 00098558 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B61C 0009855C 7C 08 02 A6 */ mflr r0 -/* 8009B620 00098560 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B624 00098564 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B628 00098568 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B62C 0009856C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B630 00098570 38 80 00 FC */ li r4, 0xfc -/* 8009B634 00098574 4B F9 88 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B638 00098578 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B63C 0009857C 7C 08 03 A6 */ mtlr r0 -/* 8009B640 00098580 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B644 00098584 4E 80 00 20 */ blr -/* 8009B648 00098588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B64C 0009858C 7C 08 02 A6 */ mflr r0 -/* 8009B650 00098590 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B654 00098594 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B658 00098598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B65C 0009859C 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009B660 000985A0 38 80 00 02 */ li r4, 2 -/* 8009B664 000985A4 4B F9 92 D1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8009B668 000985A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B66C 000985AC 7C 08 03 A6 */ mtlr r0 -/* 8009B670 000985B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B674 000985B4 4E 80 00 20 */ blr -/* 8009B678 000985B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B67C 000985BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B680 000985C0 88 63 09 74 */ lbz r3, 0x974(r3) -/* 8009B684 000985C4 4E 80 00 20 */ blr - -.global isBomb -isBomb: -/* 8009B688 000985C8 38 A0 00 00 */ li r5, 0 -/* 8009B68C 000985CC 38 03 FF F6 */ addi r0, r3, -10 -/* 8009B690 000985D0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8009B694 000985D4 28 00 00 03 */ cmplwi r0, 3 -/* 8009B698 000985D8 40 81 00 30 */ ble lbl_8009B6C8 -/* 8009B69C 000985DC 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009B6A0 000985E0 20 04 00 70 */ subfic r0, r4, 0x70 -/* 8009B6A4 000985E4 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B6A8 000985E8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8009B6AC 000985EC 20 04 00 71 */ subfic r0, r4, 0x71 -/* 8009B6B0 000985F0 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B6B4 000985F4 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f -/* 8009B6B8 000985F8 7C 60 03 79 */ or. r0, r3, r0 -/* 8009B6BC 000985FC 40 82 00 0C */ bne lbl_8009B6C8 -/* 8009B6C0 00098600 28 04 00 72 */ cmplwi r4, 0x72 -/* 8009B6C4 00098604 40 82 00 08 */ bne lbl_8009B6CC -lbl_8009B6C8: -/* 8009B6C8 00098608 38 A0 00 01 */ li r5, 1 -lbl_8009B6CC: -/* 8009B6CC 0009860C 7C A3 2B 78 */ mr r3, r5 -/* 8009B6D0 00098610 4E 80 00 20 */ blr - -.global isArrow -isArrow: -/* 8009B6D4 00098614 38 A0 00 00 */ li r5, 0 -/* 8009B6D8 00098618 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009B6DC 0009861C 28 04 00 11 */ cmplwi r4, 0x11 -/* 8009B6E0 00098620 41 82 00 1C */ beq lbl_8009B6FC -/* 8009B6E4 00098624 38 03 FF F2 */ addi r0, r3, -14 -/* 8009B6E8 00098628 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8009B6EC 0009862C 28 00 00 01 */ cmplwi r0, 1 -/* 8009B6F0 00098630 40 81 00 0C */ ble lbl_8009B6FC -/* 8009B6F4 00098634 28 04 00 10 */ cmplwi r4, 0x10 -/* 8009B6F8 00098638 40 82 00 08 */ bne lbl_8009B700 -lbl_8009B6FC: -/* 8009B6FC 0009863C 38 A0 00 01 */ li r5, 1 -lbl_8009B700: -/* 8009B700 00098640 7C A3 2B 78 */ mr r3, r5 -/* 8009B704 00098644 4E 80 00 20 */ blr - -.global isBottleItem -isBottleItem: -/* 8009B708 00098648 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B70C 0009864C 2C 00 00 9D */ cmpwi r0, 0x9d -/* 8009B710 00098650 41 82 00 5C */ beq lbl_8009B76C -/* 8009B714 00098654 40 80 00 3C */ bge lbl_8009B750 -/* 8009B718 00098658 2C 00 00 75 */ cmpwi r0, 0x75 -/* 8009B71C 0009865C 41 82 00 58 */ beq lbl_8009B774 -/* 8009B720 00098660 40 80 00 24 */ bge lbl_8009B744 -/* 8009B724 00098664 2C 00 00 6D */ cmpwi r0, 0x6d -/* 8009B728 00098668 40 80 00 10 */ bge lbl_8009B738 -/* 8009B72C 0009866C 2C 00 00 60 */ cmpwi r0, 0x60 -/* 8009B730 00098670 40 80 00 3C */ bge lbl_8009B76C -/* 8009B734 00098674 48 00 00 40 */ b lbl_8009B774 -lbl_8009B738: -/* 8009B738 00098678 2C 00 00 73 */ cmpwi r0, 0x73 -/* 8009B73C 0009867C 40 80 00 30 */ bge lbl_8009B76C -/* 8009B740 00098680 48 00 00 34 */ b lbl_8009B774 -lbl_8009B744: -/* 8009B744 00098684 2C 00 00 80 */ cmpwi r0, 0x80 -/* 8009B748 00098688 40 80 00 2C */ bge lbl_8009B774 -/* 8009B74C 0009868C 48 00 00 20 */ b lbl_8009B76C -lbl_8009B750: -/* 8009B750 00098690 2C 00 00 EF */ cmpwi r0, 0xef -/* 8009B754 00098694 40 80 00 10 */ bge lbl_8009B764 -/* 8009B758 00098698 2C 00 00 9F */ cmpwi r0, 0x9f -/* 8009B75C 0009869C 41 82 00 10 */ beq lbl_8009B76C -/* 8009B760 000986A0 48 00 00 14 */ b lbl_8009B774 -lbl_8009B764: -/* 8009B764 000986A4 2C 00 00 F3 */ cmpwi r0, 0xf3 -/* 8009B768 000986A8 40 80 00 0C */ bge lbl_8009B774 -lbl_8009B76C: -/* 8009B76C 000986AC 38 60 00 01 */ li r3, 1 -/* 8009B770 000986B0 4E 80 00 20 */ blr -lbl_8009B774: -/* 8009B774 000986B4 38 60 00 00 */ li r3, 0 -/* 8009B778 000986B8 4E 80 00 20 */ blr - -.global isHeart -isHeart: -/* 8009B77C 000986BC 38 80 00 00 */ li r4, 0 -/* 8009B780 000986C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8009B784 000986C4 41 82 00 0C */ beq lbl_8009B790 -/* 8009B788 000986C8 28 00 00 1F */ cmplwi r0, 0x1f -/* 8009B78C 000986CC 40 82 00 08 */ bne lbl_8009B794 -lbl_8009B790: -/* 8009B790 000986D0 38 80 00 01 */ li r4, 1 -lbl_8009B794: -/* 8009B794 000986D4 7C 83 23 78 */ mr r3, r4 -/* 8009B798 000986D8 4E 80 00 20 */ blr -/* 8009B79C 000986DC 38 80 00 00 */ li r4, 0 -/* 8009B7A0 000986E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B7A4 000986E4 2C 00 00 D8 */ cmpwi r0, 0xd8 -/* 8009B7A8 000986E8 40 80 00 14 */ bge lbl_8009B7BC -/* 8009B7AC 000986EC 2C 00 00 C0 */ cmpwi r0, 0xc0 -/* 8009B7B0 000986F0 40 80 00 08 */ bge lbl_8009B7B8 -/* 8009B7B4 000986F4 48 00 00 08 */ b lbl_8009B7BC -lbl_8009B7B8: -/* 8009B7B8 000986F8 38 80 00 01 */ li r4, 1 -lbl_8009B7BC: -/* 8009B7BC 000986FC 7C 83 23 78 */ mr r3, r4 -/* 8009B7C0 00098700 4E 80 00 20 */ blr - -.global check_itemno -check_itemno: -/* 8009B7C4 00098704 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B7C8 00098708 7C 08 02 A6 */ mflr r0 -/* 8009B7CC 0009870C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B7D0 00098710 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009B7D4 00098714 7C 7F 1B 78 */ mr r31, r3 -/* 8009B7D8 00098718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B7DC 0009871C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B7E0 00098720 38 80 00 00 */ li r4, 0 -/* 8009B7E4 00098724 4B F9 73 15 */ bl isMagicFlag__21dSv_player_status_a_cCFUc -/* 8009B7E8 00098728 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B7EC 0009872C 40 82 00 1C */ bne lbl_8009B808 -/* 8009B7F0 00098730 2C 1F 00 08 */ cmpwi r31, 8 -/* 8009B7F4 00098734 41 82 00 0C */ beq lbl_8009B800 -/* 8009B7F8 00098738 2C 1F 00 09 */ cmpwi r31, 9 -/* 8009B7FC 0009873C 40 82 00 0C */ bne lbl_8009B808 -lbl_8009B800: -/* 8009B800 00098740 38 60 00 01 */ li r3, 1 -/* 8009B804 00098744 48 00 01 28 */ b lbl_8009B92C -lbl_8009B808: -/* 8009B808 00098748 2C 1F 00 11 */ cmpwi r31, 0x11 -/* 8009B80C 0009874C 40 82 00 28 */ bne lbl_8009B834 -/* 8009B810 00098750 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B814 00098754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B818 00098758 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B81C 0009875C 38 80 00 43 */ li r4, 0x43 -/* 8009B820 00098760 4B F9 86 A9 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B824 00098764 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B828 00098768 40 82 00 8C */ bne lbl_8009B8B4 -/* 8009B82C 0009876C 38 60 00 01 */ li r3, 1 -/* 8009B830 00098770 48 00 00 FC */ b lbl_8009B92C -lbl_8009B834: -/* 8009B834 00098774 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009B838 00098778 4B FF FE 9D */ bl isArrow -/* 8009B83C 0009877C 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B840 00098780 41 82 00 74 */ beq lbl_8009B8B4 -/* 8009B844 00098784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B848 00098788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B84C 0009878C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B850 00098790 38 80 00 43 */ li r4, 0x43 -/* 8009B854 00098794 4B F9 86 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B858 00098798 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B85C 0009879C 40 82 00 0C */ bne lbl_8009B868 -/* 8009B860 000987A0 38 60 00 01 */ li r3, 1 -/* 8009B864 000987A4 48 00 00 C8 */ b lbl_8009B92C -lbl_8009B868: -/* 8009B868 000987A8 38 60 00 00 */ li r3, 0 -/* 8009B86C 000987AC 4B F9 11 11 */ bl dComIfG_play_c_NS_getLayerNo -/* 8009B870 000987B0 2C 03 00 0D */ cmpwi r3, 0xd -/* 8009B874 000987B4 41 82 00 14 */ beq lbl_8009B888 -/* 8009B878 000987B8 38 60 00 00 */ li r3, 0 -/* 8009B87C 000987BC 4B F9 11 01 */ bl dComIfG_play_c_NS_getLayerNo -/* 8009B880 000987C0 2C 03 00 0E */ cmpwi r3, 0xe -/* 8009B884 000987C4 40 82 00 30 */ bne lbl_8009B8B4 -lbl_8009B888: -/* 8009B888 000987C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B88C 000987CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B890 000987D0 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8009B894 000987D4 3C 80 80 38 */ lis r4, lbl_8037B0D0@ha -/* 8009B898 000987D8 38 84 B0 D0 */ addi r4, r4, lbl_8037B0D0@l -/* 8009B89C 000987DC 38 A0 00 06 */ li r5, 6 -/* 8009B8A0 000987E0 48 2C D0 B5 */ bl func_80368954 -/* 8009B8A4 000987E4 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8A8 000987E8 41 82 00 0C */ beq lbl_8009B8B4 -/* 8009B8AC 000987EC 38 60 00 01 */ li r3, 1 -/* 8009B8B0 000987F0 48 00 00 7C */ b lbl_8009B92C -lbl_8009B8B4: -/* 8009B8B4 000987F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B8B8 000987F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B8BC 000987FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B8C0 00098800 38 80 00 50 */ li r4, 0x50 -/* 8009B8C4 00098804 4B F9 86 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B8C8 00098808 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8CC 0009880C 40 82 00 1C */ bne lbl_8009B8E8 -/* 8009B8D0 00098810 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009B8D4 00098814 4B FF FD B5 */ bl isBomb -/* 8009B8D8 00098818 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8DC 0009881C 41 82 00 0C */ beq lbl_8009B8E8 -/* 8009B8E0 00098820 38 60 00 01 */ li r3, 1 -/* 8009B8E4 00098824 48 00 00 48 */ b lbl_8009B92C -lbl_8009B8E8: -/* 8009B8E8 00098828 2C 1F 00 1F */ cmpwi r31, 0x1f -/* 8009B8EC 0009882C 40 82 00 08 */ bne lbl_8009B8F4 -/* 8009B8F0 00098830 3B E0 00 00 */ li r31, 0 -lbl_8009B8F4: -/* 8009B8F4 00098834 38 60 00 4B */ li r3, 0x4b -/* 8009B8F8 00098838 38 80 00 01 */ li r4, 1 -/* 8009B8FC 0009883C 4B FF C5 E5 */ bl checkItemGet -/* 8009B900 00098840 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B904 00098844 40 82 00 10 */ bne lbl_8009B914 -/* 8009B908 00098848 2C 1F 00 12 */ cmpwi r31, 0x12 -/* 8009B90C 0009884C 40 82 00 08 */ bne lbl_8009B914 -/* 8009B910 00098850 3B E0 00 01 */ li r31, 1 -lbl_8009B914: -/* 8009B914 00098854 2C 1F 00 08 */ cmpwi r31, 8 -/* 8009B918 00098858 41 82 00 0C */ beq lbl_8009B924 -/* 8009B91C 0009885C 2C 1F 00 09 */ cmpwi r31, 9 -/* 8009B920 00098860 40 82 00 08 */ bne lbl_8009B928 -lbl_8009B924: -/* 8009B924 00098864 3B E0 00 01 */ li r31, 1 -lbl_8009B928: -/* 8009B928 00098868 57 E3 06 3E */ clrlwi r3, r31, 0x18 -lbl_8009B92C: -/* 8009B92C 0009886C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009B930 00098870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B934 00098874 7C 08 03 A6 */ mtlr r0 -/* 8009B938 00098878 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B93C 0009887C 4E 80 00 20 */ blr - -.global addBombCount -addBombCount: -/* 8009B940 00098880 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8009B944 00098884 7C 08 02 A6 */ mflr r0 -/* 8009B948 00098888 90 01 00 54 */ stw r0, 0x54(r1) -/* 8009B94C 0009888C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8009B950 00098890 48 2C 68 69 */ bl func_803621B8 -/* 8009B954 00098894 7C 7E 1B 78 */ mr r30, r3 -/* 8009B958 00098898 7C 9F 23 78 */ mr r31, r4 -/* 8009B95C 0009889C 3B 20 00 00 */ li r25, 0 -/* 8009B960 000988A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009B964 000988A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009B968 000988A8 3B 43 00 9C */ addi r26, r3, 0x9c -/* 8009B96C 000988AC 3B 83 00 EC */ addi r28, r3, 0xec -/* 8009B970 000988B0 3B 61 00 08 */ addi r27, r1, 8 -/* 8009B974 000988B4 48 00 00 80 */ b lbl_8009B9F4 -lbl_8009B978: -/* 8009B978 000988B8 7F 43 D3 78 */ mr r3, r26 -/* 8009B97C 000988BC 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8009B980 000988C0 38 84 00 0F */ addi r4, r4, 0xf -/* 8009B984 000988C4 38 A0 00 00 */ li r5, 0 -/* 8009B988 000988C8 4B F9 76 A9 */ bl getItem__17dSv_player_item_cCFib -/* 8009B98C 000988CC 57 35 06 3E */ clrlwi r21, r25, 0x18 -/* 8009B990 000988D0 7C 7B A9 AE */ stbx r3, r27, r21 -/* 8009B994 000988D4 7C 7B A8 AE */ lbzx r3, r27, r21 -/* 8009B998 000988D8 28 03 00 50 */ cmplwi r3, 0x50 -/* 8009B99C 000988DC 40 82 00 18 */ bne lbl_8009B9B4 -/* 8009B9A0 000988E0 38 80 00 00 */ li r4, 0 -/* 8009B9A4 000988E4 56 A0 10 3A */ slwi r0, r21, 2 -/* 8009B9A8 000988E8 38 61 00 0C */ addi r3, r1, 0xc -/* 8009B9AC 000988EC 7C 83 01 2E */ stwx r4, r3, r0 -/* 8009B9B0 000988F0 48 00 00 40 */ b lbl_8009B9F0 -lbl_8009B9B4: -/* 8009B9B4 000988F4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8009B9B8 000988F8 7C 03 00 40 */ cmplw r3, r0 -/* 8009B9BC 000988FC 40 82 00 24 */ bne lbl_8009B9E0 -/* 8009B9C0 00098900 7F 83 E3 78 */ mr r3, r28 -/* 8009B9C4 00098904 7F 24 CB 78 */ mr r4, r25 -/* 8009B9C8 00098908 4B F9 85 B5 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8009B9CC 0009890C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009B9D0 00098910 56 A0 10 3A */ slwi r0, r21, 2 -/* 8009B9D4 00098914 38 61 00 0C */ addi r3, r1, 0xc -/* 8009B9D8 00098918 7C 83 01 2E */ stwx r4, r3, r0 -/* 8009B9DC 0009891C 48 00 00 14 */ b lbl_8009B9F0 -lbl_8009B9E0: -/* 8009B9E0 00098920 38 80 FF FF */ li r4, -1 -/* 8009B9E4 00098924 56 A0 10 3A */ slwi r0, r21, 2 -/* 8009B9E8 00098928 38 61 00 0C */ addi r3, r1, 0xc -/* 8009B9EC 0009892C 7C 83 01 2E */ stwx r4, r3, r0 -lbl_8009B9F0: -/* 8009B9F0 00098930 3B 39 00 01 */ addi r25, r25, 1 -lbl_8009B9F4: -/* 8009B9F4 00098934 57 20 06 3E */ clrlwi r0, r25, 0x18 -/* 8009B9F8 00098938 28 00 00 03 */ cmplwi r0, 3 -/* 8009B9FC 0009893C 41 80 FF 7C */ blt lbl_8009B978 -/* 8009BA00 00098940 3B 00 00 00 */ li r24, 0 -/* 8009BA04 00098944 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009BA08 00098948 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8009BA0C 0009894C 3B 63 00 F8 */ addi r27, r3, 0xf8 -/* 8009BA10 00098950 3B 23 0F 38 */ addi r25, r3, 0xf38 -/* 8009BA14 00098954 3B A1 00 08 */ addi r29, r1, 8 -/* 8009BA18 00098958 3B 81 00 0C */ addi r28, r1, 0xc -/* 8009BA1C 0009895C 48 00 01 94 */ b lbl_8009BBB0 -lbl_8009BA20: -/* 8009BA20 00098960 3A E0 FF FF */ li r23, -1 -/* 8009BA24 00098964 3A C0 FF FF */ li r22, -1 -/* 8009BA28 00098968 38 80 00 00 */ li r4, 0 -/* 8009BA2C 0009896C 48 00 00 24 */ b lbl_8009BA50 -lbl_8009BA30: -/* 8009BA30 00098970 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8009BA34 00098974 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 8009BA38 00098978 7C 1C 00 2E */ lwzx r0, r28, r0 -/* 8009BA3C 0009897C 2C 00 00 00 */ cmpwi r0, 0 -/* 8009BA40 00098980 40 82 00 0C */ bne lbl_8009BA4C -/* 8009BA44 00098984 7C 77 1B 78 */ mr r23, r3 -/* 8009BA48 00098988 3A C0 00 00 */ li r22, 0 -lbl_8009BA4C: -/* 8009BA4C 0009898C 38 84 00 01 */ addi r4, r4, 1 -lbl_8009BA50: -/* 8009BA50 00098990 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8009BA54 00098994 28 00 00 03 */ cmplwi r0, 3 -/* 8009BA58 00098998 41 80 FF D8 */ blt lbl_8009BA30 -/* 8009BA5C 0009899C 3A A0 00 00 */ li r21, 0 -/* 8009BA60 000989A0 48 00 00 44 */ b lbl_8009BAA4 -lbl_8009BA64: -/* 8009BA64 000989A4 56 A4 06 3E */ clrlwi r4, r21, 0x18 -/* 8009BA68 000989A8 56 A0 15 BA */ rlwinm r0, r21, 2, 0x16, 0x1d -/* 8009BA6C 000989AC 7E 9C 00 2E */ lwzx r20, r28, r0 -/* 8009BA70 000989B0 2C 14 00 00 */ cmpwi r20, 0 -/* 8009BA74 000989B4 40 81 00 2C */ ble lbl_8009BAA0 -/* 8009BA78 000989B8 7C 14 B0 00 */ cmpw r20, r22 -/* 8009BA7C 000989BC 40 81 00 24 */ ble lbl_8009BAA0 -/* 8009BA80 000989C0 7F 63 DB 78 */ mr r3, r27 -/* 8009BA84 000989C4 7C 9D 20 AE */ lbzx r4, r29, r4 -/* 8009BA88 000989C8 4B F9 86 71 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BA8C 000989CC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009BA90 000989D0 7C 14 00 00 */ cmpw r20, r0 -/* 8009BA94 000989D4 41 82 00 0C */ beq lbl_8009BAA0 -/* 8009BA98 000989D8 56 B7 06 3E */ clrlwi r23, r21, 0x18 -/* 8009BA9C 000989DC 7E 96 A3 78 */ mr r22, r20 -lbl_8009BAA0: -/* 8009BAA0 000989E0 3A B5 00 01 */ addi r21, r21, 1 -lbl_8009BAA4: -/* 8009BAA4 000989E4 56 A0 06 3E */ clrlwi r0, r21, 0x18 -/* 8009BAA8 000989E8 28 00 00 03 */ cmplwi r0, 3 -/* 8009BAAC 000989EC 41 80 FF B8 */ blt lbl_8009BA64 -/* 8009BAB0 000989F0 2C 17 FF FF */ cmpwi r23, -1 -/* 8009BAB4 000989F4 40 82 00 0C */ bne lbl_8009BAC0 -/* 8009BAB8 000989F8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009BABC 000989FC 48 00 01 04 */ b lbl_8009BBC0 -lbl_8009BAC0: -/* 8009BAC0 00098A00 2C 16 00 00 */ cmpwi r22, 0 -/* 8009BAC4 00098A04 40 82 00 68 */ bne lbl_8009BB2C -/* 8009BAC8 00098A08 7F 63 DB 78 */ mr r3, r27 -/* 8009BACC 00098A0C 7F C4 F3 78 */ mr r4, r30 -/* 8009BAD0 00098A10 4B F9 86 29 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BAD4 00098A14 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009BAD8 00098A18 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8009BADC 00098A1C 7C 03 00 40 */ cmplw r3, r0 -/* 8009BAE0 00098A20 41 80 00 20 */ blt lbl_8009BB00 -/* 8009BAE4 00098A24 7F 43 D3 78 */ mr r3, r26 -/* 8009BAE8 00098A28 7F C4 F3 78 */ mr r4, r30 -/* 8009BAEC 00098A2C 7F E5 FB 78 */ mr r5, r31 -/* 8009BAF0 00098A30 38 C0 00 01 */ li r6, 1 -/* 8009BAF4 00098A34 4B F9 7F 5D */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb -/* 8009BAF8 00098A38 38 60 00 00 */ li r3, 0 -/* 8009BAFC 00098A3C 48 00 00 C4 */ b lbl_8009BBC0 -lbl_8009BB00: -/* 8009BB00 00098A40 7F 43 D3 78 */ mr r3, r26 -/* 8009BB04 00098A44 7F C4 F3 78 */ mr r4, r30 -/* 8009BB08 00098A48 7F E5 FB 78 */ mr r5, r31 -/* 8009BB0C 00098A4C 38 C0 00 01 */ li r6, 1 -/* 8009BB10 00098A50 4B F9 7F 41 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb -/* 8009BB14 00098A54 7F 63 DB 78 */ mr r3, r27 -/* 8009BB18 00098A58 7F C4 F3 78 */ mr r4, r30 -/* 8009BB1C 00098A5C 4B F9 85 DD */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BB20 00098A60 7C 03 F8 50 */ subf r0, r3, r31 -/* 8009BB24 00098A64 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8009BB28 00098A68 48 00 00 6C */ b lbl_8009BB94 -lbl_8009BB2C: -/* 8009BB2C 00098A6C 7F 63 DB 78 */ mr r3, r27 -/* 8009BB30 00098A70 38 81 00 08 */ addi r4, r1, 8 -/* 8009BB34 00098A74 7E 84 B8 AE */ lbzx r20, r4, r23 -/* 8009BB38 00098A78 7E 84 A3 78 */ mr r4, r20 -/* 8009BB3C 00098A7C 4B F9 85 BD */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BB40 00098A80 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009BB44 00098A84 57 F5 06 3E */ clrlwi r21, r31, 0x18 -/* 8009BB48 00098A88 7C 16 AA 14 */ add r0, r22, r21 -/* 8009BB4C 00098A8C 7C 03 00 00 */ cmpw r3, r0 -/* 8009BB50 00098A90 41 80 00 1C */ blt lbl_8009BB6C -/* 8009BB54 00098A94 7F 23 CB 78 */ mr r3, r25 -/* 8009BB58 00098A98 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 8009BB5C 00098A9C 7E A5 AB 78 */ mr r5, r21 -/* 8009BB60 00098AA0 4B F8 F8 0D */ bl dComIfG_play_c_NS_setItemBombNumCount -/* 8009BB64 00098AA4 38 60 00 00 */ li r3, 0 -/* 8009BB68 00098AA8 48 00 00 58 */ b lbl_8009BBC0 -lbl_8009BB6C: -/* 8009BB6C 00098AAC 7F 23 CB 78 */ mr r3, r25 -/* 8009BB70 00098AB0 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 8009BB74 00098AB4 7E A5 AB 78 */ mr r5, r21 -/* 8009BB78 00098AB8 4B F8 F7 F5 */ bl dComIfG_play_c_NS_setItemBombNumCount -/* 8009BB7C 00098ABC 7F 63 DB 78 */ mr r3, r27 -/* 8009BB80 00098AC0 7E 84 A3 78 */ mr r4, r20 -/* 8009BB84 00098AC4 4B F9 85 75 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BB88 00098AC8 7C 16 18 50 */ subf r0, r22, r3 -/* 8009BB8C 00098ACC 7C 00 A8 50 */ subf r0, r0, r21 -/* 8009BB90 00098AD0 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_8009BB94: -/* 8009BB94 00098AD4 7F 63 DB 78 */ mr r3, r27 -/* 8009BB98 00098AD8 7C 9D B8 AE */ lbzx r4, r29, r23 -/* 8009BB9C 00098ADC 4B F9 85 5D */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8009BBA0 00098AE0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009BBA4 00098AE4 56 E0 10 3A */ slwi r0, r23, 2 -/* 8009BBA8 00098AE8 7C 7C 01 2E */ stwx r3, r28, r0 -/* 8009BBAC 00098AEC 3B 18 00 01 */ addi r24, r24, 1 -lbl_8009BBB0: -/* 8009BBB0 00098AF0 57 00 06 3E */ clrlwi r0, r24, 0x18 -/* 8009BBB4 00098AF4 28 00 00 03 */ cmplwi r0, 3 -/* 8009BBB8 00098AF8 41 80 FE 68 */ blt lbl_8009BA20 -/* 8009BBBC 00098AFC 57 E3 06 3E */ clrlwi r3, r31, 0x18 -lbl_8009BBC0: -/* 8009BBC0 00098B00 39 61 00 50 */ addi r11, r1, 0x50 -/* 8009BBC4 00098B04 48 2C 66 41 */ bl func_80362204 -/* 8009BBC8 00098B08 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8009BBCC 00098B0C 7C 08 03 A6 */ mtlr r0 -/* 8009BBD0 00098B10 38 21 00 50 */ addi r1, r1, 0x50 -/* 8009BBD4 00098B14 4E 80 00 20 */ blr - diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index d5b7ea77ed..f7f426e0a8 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -27,8 +27,8 @@ dKy_sense_pat_get: /* 8019C3C8 00199308 38 00 00 01 */ li r0, 1 lbl_8019C3CC: /* 8019C3CC 0019930C 7C 1E 03 78 */ mr r30, r0 -/* 8019C3D0 00199310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019C3D4 00199314 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019C3D0 00199310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019C3D4 00199314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019C3D8 00199318 3B E3 4E 00 */ addi r31, r3, 0x4e00 /* 8019C3DC 0019931C 7F E3 FB 78 */ mr r3, r31 /* 8019C3E0 00199320 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -40,8 +40,8 @@ lbl_8019C3CC: /* 8019C3F8 00199338 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8019C3FC 0019933C 7C 00 07 75 */ extsb. r0, r0 /* 8019C400 00199340 40 82 00 3C */ bne lbl_8019C43C -/* 8019C404 00199344 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019C408 00199348 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019C404 00199344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019C408 00199348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019C40C 0019934C 3B E3 09 58 */ addi r31, r3, 0x958 /* 8019C410 00199350 7F E3 FB 78 */ mr r3, r31 /* 8019C414 00199354 38 80 00 11 */ li r4, 0x11 @@ -865,8 +865,8 @@ dKy_twi_wolflight_set: /* 8019CFF8 00199F38 7C 7D 1B 78 */ mr r29, r3 /* 8019CFFC 00199F3C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019D000 00199F40 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 8019D004 00199F44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019D008 00199F48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019D004 00199F44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019D008 00199F48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019D00C 00199F4C 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 8019D010 00199F50 28 1E 00 00 */ cmplwi r30, 0 /* 8019D014 00199F54 41 82 01 74 */ beq lbl_8019D188 @@ -1519,8 +1519,8 @@ dKy_FiveSenses_fullthrottle_dark_static1: /* 8019D92C 0019A86C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8019D930 0019A870 4C 40 13 82 */ cror 2, 0, 2 /* 8019D934 0019A874 40 82 00 50 */ bne lbl_8019D984 -/* 8019D938 0019A878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019D93C 0019A87C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019D938 0019A878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019D93C 0019A87C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019D940 0019A880 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8019D944 0019A884 38 80 00 00 */ li r4, 0 /* 8019D948 0019A888 90 81 00 08 */ stw r4, 8(r1) @@ -1555,8 +1555,8 @@ lbl_8019D9A0: /* 8019D9B4 0019A8F4 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 8019D9B8 0019A8F8 4C 41 13 82 */ cror 2, 1, 2 /* 8019D9BC 0019A8FC 40 82 00 4C */ bne lbl_8019DA08 -/* 8019D9C0 0019A900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019D9C4 0019A904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019D9C0 0019A900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019D9C4 0019A904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019D9C8 0019A908 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8019D9CC 0019A90C 38 80 00 00 */ li r4, 0 /* 8019D9D0 0019A910 90 81 00 08 */ stw r4, 8(r1) @@ -1600,8 +1600,8 @@ lbl_8019DA4C: /* 8019DA58 0019A998 90 9F 0F 44 */ stw r4, 0xf44(r31) /* 8019DA5C 0019A99C 90 9F 0F 48 */ stw r4, 0xf48(r31) /* 8019DA60 0019A9A0 90 9F 0F 4C */ stw r4, 0xf4c(r31) -/* 8019DA64 0019A9A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019DA68 0019A9A8 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8019DA64 0019A9A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019DA68 0019A9A8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8019DA6C 0019A9AC 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 8019DA70 0019A9B0 90 81 00 08 */ stw r4, 8(r1) /* 8019DA74 0019A9B4 38 00 FF FF */ li r0, -1 @@ -1825,8 +1825,8 @@ dKy_light_influence_id: /* 8019DDA0 0019ACE0 3B 60 FF FF */ li r27, -1 /* 8019DDA4 0019ACE4 3B 20 FF FF */ li r25, -1 /* 8019DDA8 0019ACE8 C3 C2 A2 74 */ lfs f30, lbl_80453C74-_SDA2_BASE_(r2) -/* 8019DDAC 0019ACEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019DDB0 0019ACF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019DDAC 0019ACEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019DDB0 0019ACF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019DDB4 0019ACF4 3B C3 4E 00 */ addi r30, r3, 0x4e00 /* 8019DDB8 0019ACF8 7F C3 F3 78 */ mr r3, r30 /* 8019DDBC 0019ACFC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -2546,8 +2546,8 @@ plight_set: /* 8019E744 0019B684 48 1C 3A 8D */ bl _savegpr_26 /* 8019E748 0019B688 3B E0 00 00 */ li r31, 0 /* 8019E74C 0019B68C 3B C0 00 00 */ li r30, 0 -/* 8019E750 0019B690 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019E754 0019B694 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019E750 0019B690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019E754 0019B694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019E758 0019B698 3B 63 4E 20 */ addi r27, r3, 0x4e20 /* 8019E75C 0019B69C 7F 63 DB 78 */ mr r3, r27 /* 8019E760 0019B6A0 81 9B 00 00 */ lwz r12, 0(r27) @@ -2783,8 +2783,8 @@ undwater_init: /* 8019EAB8 0019B9F8 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 8019EABC 0019B9FC 38 63 01 73 */ addi r3, r3, 0x173 /* 8019EAC0 0019BA00 38 80 00 1D */ li r4, 0x1d -/* 8019EAC4 0019BA04 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8019EAC8 0019BA08 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8019EAC4 0019BA04 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8019EAC8 0019BA08 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8019EACC 0019BA0C 3F 85 00 02 */ addis r28, r5, 2 /* 8019EAD0 0019BA10 3B 9C C2 F8 */ addi r28, r28, -15624 /* 8019EAD4 0019BA14 7F 85 E3 78 */ mr r5, r28 @@ -2922,8 +2922,8 @@ envcolor_init: /* 8019ECA8 0019BBE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8019ECAC 0019BBEC 39 61 00 30 */ addi r11, r1, 0x30 /* 8019ECB0 0019BBF0 48 1C 35 1D */ bl func_803621CC -/* 8019ECB4 0019BBF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019ECB8 0019BBF8 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8019ECB4 0019BBF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019ECB8 0019BBF8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8019ECBC 0019BBFC 3B 3F 4E 20 */ addi r25, r31, 0x4e20 /* 8019ECC0 0019BC00 7F 23 CB 78 */ mr r3, r25 /* 8019ECC4 0019BC04 81 99 00 00 */ lwz r12, 0(r25) @@ -3148,8 +3148,8 @@ lbl_8019F000: /* 8019F00C 0019BF4C 90 03 12 9C */ stw r0, 0x129c(r3) /* 8019F010 0019BF50 90 03 12 A0 */ stw r0, 0x12a0(r3) /* 8019F014 0019BF54 98 03 12 C9 */ stb r0, 0x12c9(r3) -/* 8019F018 0019BF58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019F01C 0019BF5C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8019F018 0019BF58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019F01C 0019BF5C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8019F020 0019BF60 C3 FF 00 34 */ lfs f31, 0x34(r31) /* 8019F024 0019BF64 3C 60 80 43 */ lis r3, lbl_80430CD8@ha /* 8019F028 0019BF68 80 03 0C D8 */ lwz r0, lbl_80430CD8@l(r3) @@ -3531,8 +3531,8 @@ dScnKy_env_light_c_NS_setDaytime: /* 8019F508 0019C448 39 61 00 20 */ addi r11, r1, 0x20 /* 8019F50C 0019C44C 48 1C 2C D1 */ bl _savegpr_29 /* 8019F510 0019C450 7C 7E 1B 78 */ mr r30, r3 -/* 8019F514 0019C454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019F518 0019C458 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8019F514 0019C454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019F518 0019C458 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8019F51C 0019C45C A0 1F 00 38 */ lhz r0, 0x38(r31) /* 8019F520 0019C460 B0 1E 12 BE */ sth r0, 0x12be(r30) /* 8019F524 0019C464 C0 1F 00 34 */ lfs f0, 0x34(r31) @@ -3543,8 +3543,8 @@ dScnKy_env_light_c_NS_setDaytime: /* 8019F538 0019C478 48 00 D0 45 */ bl dKy_darkworld_check /* 8019F53C 0019C47C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019F540 0019C480 40 82 01 6C */ bne lbl_8019F6AC -/* 8019F544 0019C484 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019F548 0019C488 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019F544 0019C484 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019F548 0019C488 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019F54C 0019C48C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8019F550 0019C490 28 00 00 00 */ cmplwi r0, 0 /* 8019F554 0019C494 40 82 01 B4 */ bne lbl_8019F708 @@ -3569,8 +3569,8 @@ lbl_8019F578: /* 8019F59C 0019C4DC C0 1E 12 4C */ lfs f0, 0x124c(r30) /* 8019F5A0 0019C4E0 EC 01 00 2A */ fadds f0, f1, f0 /* 8019F5A4 0019C4E4 D0 1E 12 44 */ stfs f0, 0x1244(r30) -/* 8019F5A8 0019C4E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019F5AC 0019C4EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019F5A8 0019C4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019F5AC 0019C4EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019F5B0 0019C4F0 3B A3 4E 00 */ addi r29, r3, 0x4e00 /* 8019F5B4 0019C4F4 7F A3 EB 78 */ mr r3, r29 /* 8019F5B8 0019C4F8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -3713,8 +3713,8 @@ dScnKy_env_light_c_NS_setSunpos: /* 8019F7A4 0019C6E4 39 61 00 30 */ addi r11, r1, 0x30 /* 8019F7A8 0019C6E8 48 1C 2A 35 */ bl _savegpr_29 /* 8019F7AC 0019C6EC 7C 7D 1B 78 */ mr r29, r3 -/* 8019F7B0 0019C6F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019F7B4 0019C6F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019F7B0 0019C6F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019F7B4 0019C6F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019F7B8 0019C6F8 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 8019F7BC 0019C6FC 28 1E 00 00 */ cmplwi r30, 0 /* 8019F7C0 0019C700 41 82 02 20 */ beq lbl_8019F9E0 @@ -3880,8 +3880,8 @@ dScnKy_env_light_c_NS_getDaytime: .global dKy_getdaytime_hour dKy_getdaytime_hour: /* 8019FA10 0019C950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019FA14 0019C954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019FA18 0019C958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019FA14 0019C954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019FA18 0019C958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019FA1C 0019C95C C0 23 00 34 */ lfs f1, 0x34(r3) /* 8019FA20 0019C960 C0 02 A2 AC */ lfs f0, lbl_80453CAC-_SDA2_BASE_(r2) /* 8019FA24 0019C964 EC 01 00 24 */ fdivs f0, f1, f0 @@ -3894,8 +3894,8 @@ dKy_getdaytime_hour: .global dKy_getdaytime_minute dKy_getdaytime_minute: /* 8019FA3C 0019C97C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019FA40 0019C980 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019FA44 0019C984 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019FA40 0019C980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019FA44 0019C984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019FA48 0019C988 C0 03 00 34 */ lfs f0, 0x34(r3) /* 8019FA4C 0019C98C C0 62 A2 BC */ lfs f3, lbl_80453CBC-_SDA2_BASE_(r2) /* 8019FA50 0019C990 C0 42 A2 70 */ lfs f2, lbl_80453C70-_SDA2_BASE_(r2) @@ -4127,8 +4127,8 @@ lbl_8019FD90: /* 8019FD98 0019CCD8 88 13 12 D8 */ lbz r0, 0x12d8(r19) /* 8019FD9C 0019CCDC 28 00 00 00 */ cmplwi r0, 0 /* 8019FDA0 0019CCE0 41 82 00 6C */ beq lbl_8019FE0C -/* 8019FDA4 0019CCE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019FDA8 0019CCE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019FDA4 0019CCE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019FDA8 0019CCE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019FDAC 0019CCEC 3A 83 4E 00 */ addi r20, r3, 0x4e00 /* 8019FDB0 0019CCF0 7E 83 A3 78 */ mr r3, r20 /* 8019FDB4 0019CCF4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -4155,8 +4155,8 @@ lbl_8019FE04: /* 8019FE04 0019CD44 8A 11 00 09 */ lbz r16, 9(r17) /* 8019FE08 0019CD48 48 00 00 50 */ b lbl_8019FE58 lbl_8019FE0C: -/* 8019FE0C 0019CD4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019FE10 0019CD50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019FE0C 0019CD4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019FE10 0019CD50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019FE14 0019CD54 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8019FE18 0019CD58 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019FE1C 0019CD5C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -4164,8 +4164,8 @@ lbl_8019FE0C: /* 8019FE24 0019CD64 48 1C 8B 71 */ bl strcmp /* 8019FE28 0019CD68 2C 03 00 00 */ cmpwi r3, 0 /* 8019FE2C 0019CD6C 40 82 00 2C */ bne lbl_8019FE58 -/* 8019FE30 0019CD70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019FE34 0019CD74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019FE30 0019CD70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019FE34 0019CD74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019FE38 0019CD78 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8019FE3C 0019CD7C 28 03 00 00 */ cmplwi r3, 0 /* 8019FE40 0019CD80 41 82 00 18 */ beq lbl_8019FE58 @@ -4337,8 +4337,8 @@ lbl_801A004C: /* 801A007C 0019CFBC EC 01 00 2A */ fadds f0, f1, f0 /* 801A0080 0019CFC0 D0 1F 00 00 */ stfs f0, 0(r31) lbl_801A0084: -/* 801A0084 0019CFC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0088 0019CFC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A0084 0019CFC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0088 0019CFC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A008C 0019CFCC 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801A0090 0019CFD0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A0094 0019CFD4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -4369,8 +4369,8 @@ lbl_801A00F0: /* 801A00F0 0019D030 88 13 12 D8 */ lbz r0, 0x12d8(r19) /* 801A00F4 0019D034 28 00 00 00 */ cmplwi r0, 0 /* 801A00F8 0019D038 41 82 00 84 */ beq lbl_801A017C -/* 801A00FC 0019D03C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0100 0019D040 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A00FC 0019D03C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0100 0019D040 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0104 0019D044 3A 03 4E 00 */ addi r16, r3, 0x4e00 /* 801A0108 0019D048 7E 03 83 78 */ mr r3, r16 /* 801A010C 0019D04C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -4403,8 +4403,8 @@ lbl_801A0168: /* 801A0174 0019D0B4 7E 23 02 14 */ add r17, r3, r0 /* 801A0178 0019D0B8 48 00 00 5C */ b lbl_801A01D4 lbl_801A017C: -/* 801A017C 0019D0BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0180 0019D0C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A017C 0019D0BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0180 0019D0C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0184 0019D0C4 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801A0188 0019D0C8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A018C 0019D0CC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -4412,8 +4412,8 @@ lbl_801A017C: /* 801A0194 0019D0D4 48 1C 88 01 */ bl strcmp /* 801A0198 0019D0D8 2C 03 00 00 */ cmpwi r3, 0 /* 801A019C 0019D0DC 40 82 00 38 */ bne lbl_801A01D4 -/* 801A01A0 0019D0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A01A4 0019D0E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A01A0 0019D0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A01A4 0019D0E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A01A8 0019D0E8 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 801A01AC 0019D0EC 28 03 00 00 */ cmplwi r3, 0 /* 801A01B0 0019D0F0 41 82 00 24 */ beq lbl_801A01D4 @@ -4608,8 +4608,8 @@ dScnKy_env_light_c_NS_setLight: /* 801A0434 0019D374 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A0438 0019D378 38 83 CA 54 */ addi r4, r3, lbl_8042CA54@l /* 801A043C 0019D37C 3B 24 12 D2 */ addi r25, r4, 0x12d2 -/* 801A0440 0019D380 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0444 0019D384 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A0440 0019D380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0444 0019D384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0448 0019D388 81 C3 5D 74 */ lwz r14, 0x5d74(r3) /* 801A044C 0019D38C 38 00 00 00 */ li r0, 0 /* 801A0450 0019D390 B0 01 00 60 */ sth r0, 0x60(r1) @@ -4623,8 +4623,8 @@ dScnKy_env_light_c_NS_setLight: /* 801A0470 0019D3B0 41 82 00 A8 */ beq lbl_801A0518 /* 801A0474 0019D3B4 38 61 00 74 */ addi r3, r1, 0x74 /* 801A0478 0019D3B8 4B ED 75 89 */ bl dBgS_CamGndChk_Wtr -/* 801A047C 0019D3BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0480 0019D3C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A047C 0019D3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0480 0019D3C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0484 0019D3C4 88 03 00 13 */ lbz r0, 0x13(r3) /* 801A0488 0019D3C8 28 00 00 31 */ cmplwi r0, 0x31 /* 801A048C 0019D3CC 40 82 00 18 */ bne lbl_801A04A4 @@ -4646,8 +4646,8 @@ lbl_801A04A4: /* 801A04C8 0019D408 38 61 00 74 */ addi r3, r1, 0x74 /* 801A04CC 0019D40C 38 81 00 68 */ addi r4, r1, 0x68 /* 801A04D0 0019D410 48 0C 78 59 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 801A04D4 0019D414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A04D8 0019D418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A04D4 0019D414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A04D8 0019D418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A04DC 0019D41C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801A04E0 0019D420 38 81 00 74 */ addi r4, r1, 0x74 /* 801A04E4 0019D424 4B ED 3F BD */ bl cBgS_NS_GroundCross @@ -4744,8 +4744,8 @@ lbl_801A05C4: /* 801A0640 0019D580 3A 00 00 00 */ li r16, 0 /* 801A0644 0019D584 3A 20 00 00 */ li r17, 0 /* 801A0648 0019D588 3A 60 00 00 */ li r19, 0 -/* 801A064C 0019D58C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A0650 0019D590 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A064C 0019D58C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A0650 0019D590 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0654 0019D594 39 C3 4E 00 */ addi r14, r3, 0x4e00 /* 801A0658 0019D598 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A065C 0019D59C 3A 43 CA 54 */ addi r18, r3, lbl_8042CA54@l @@ -6588,8 +6588,8 @@ dScnKy_env_light_c_NS_settingTevStruct_plightcol_plus: /* 801A217C 0019F0BC 3B A0 00 00 */ li r29, 0 /* 801A2180 0019F0C0 3B 60 00 00 */ li r27, 0 /* 801A2184 0019F0C4 3B 20 00 00 */ li r25, 0 -/* 801A2188 0019F0C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A218C 0019F0CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A2188 0019F0C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A218C 0019F0CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A2190 0019F0D0 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 801A2194 0019F0D4 41 82 16 00 */ beq lbl_801A3794 /* 801A2198 0019F0D8 38 00 00 FF */ li r0, 0xff @@ -6754,8 +6754,8 @@ lbl_801A23A8: /* 801A23D4 0019F314 2C 03 00 01 */ cmpwi r3, 1 /* 801A23D8 0019F318 41 82 00 28 */ beq lbl_801A2400 lbl_801A23DC: -/* 801A23DC 0019F31C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A23E0 0019F320 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A23DC 0019F31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A23E0 0019F320 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A23E4 0019F324 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801A23E8 0019F328 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A23EC 0019F32C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -6764,8 +6764,8 @@ lbl_801A23DC: /* 801A23F8 0019F338 2C 03 00 00 */ cmpwi r3, 0 /* 801A23FC 0019F33C 40 82 04 58 */ bne lbl_801A2854 lbl_801A2400: -/* 801A2400 0019F340 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A2404 0019F344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A2400 0019F340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A2404 0019F344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A2408 0019F348 82 63 5D 74 */ lwz r19, 0x5d74(r3) /* 801A240C 0019F34C 3B 20 00 01 */ li r25, 1 /* 801A2410 0019F350 38 73 00 E4 */ addi r3, r19, 0xe4 @@ -6823,8 +6823,8 @@ lbl_801A24C0: /* 801A24DC 0019F41C C3 C2 A2 94 */ lfs f30, lbl_80453C94-_SDA2_BASE_(r2) /* 801A24E0 0019F420 3B A0 00 01 */ li r29, 1 /* 801A24E4 0019F424 3B 60 00 01 */ li r27, 1 -/* 801A24E8 0019F428 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A24EC 0019F42C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A24E8 0019F428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A24EC 0019F42C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A24F0 0019F430 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801A24F4 0019F434 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A24F8 0019F438 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -8016,8 +8016,8 @@ lbl_801A35E0: /* 801A35F0 001A0530 4E 80 04 21 */ bctrl /* 801A35F4 001A0534 2C 03 00 00 */ cmpwi r3, 0 /* 801A35F8 001A0538 40 82 00 38 */ bne lbl_801A3630 -/* 801A35FC 001A053C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A3600 001A0540 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801A35FC 001A053C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A3600 001A0540 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801A3604 001A0544 80 85 5F 18 */ lwz r4, 0x5f18(r5) /* 801A3608 001A0548 3C 60 02 00 */ lis r3, 0x02000308@ha /* 801A360C 001A054C 38 03 03 08 */ addi r0, r3, 0x02000308@l @@ -8212,8 +8212,8 @@ lbl_801A38B4: /* 801A38C0 001A0800 B0 1A 11 06 */ sth r0, 0x1106(r26) /* 801A38C4 001A0804 2C 1B 00 0E */ cmpwi r27, 0xe /* 801A38C8 001A0808 40 82 02 B0 */ bne lbl_801A3B78 -/* 801A38CC 001A080C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A38D0 001A0810 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A38CC 001A080C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A38D0 001A0810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A38D4 001A0814 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 801A38D8 001A0818 38 60 00 00 */ li r3, 0 /* 801A38DC 001A081C 98 7C 03 82 */ stb r3, 0x382(r28) @@ -8401,8 +8401,8 @@ lbl_801A3B78: /* 801A3B80 001A0AC0 2C 1B 00 0D */ cmpwi r27, 0xd /* 801A3B84 001A0AC4 40 82 02 F0 */ bne lbl_801A3E74 lbl_801A3B88: -/* 801A3B88 001A0AC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A3B8C 001A0ACC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A3B88 001A0AC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A3B8C 001A0ACC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A3B90 001A0AD0 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 801A3B94 001A0AD4 38 60 00 00 */ li r3, 0 /* 801A3B98 001A0AD8 B0 7C 03 58 */ sth r3, 0x358(r28) @@ -8656,8 +8656,8 @@ lbl_801A3F24: /* 801A3F3C 001A0E7C 7C 03 00 40 */ cmplw r3, r0 /* 801A3F40 001A0E80 41 82 00 60 */ beq lbl_801A3FA0 /* 801A3F44 001A0E84 9B 24 09 8C */ stb r25, 0x98c(r4) -/* 801A3F48 001A0E88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A3F4C 001A0E8C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801A3F48 001A0E88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A3F4C 001A0E8C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801A3F50 001A0E90 3B C5 4E 00 */ addi r30, r5, 0x4e00 /* 801A3F54 001A0E94 7F C3 F3 78 */ mr r3, r30 /* 801A3F58 001A0E98 7F 24 CB 78 */ mr r4, r25 @@ -9464,8 +9464,8 @@ lbl_801A4AEC: /* 801A4B2C 001A1A6C D0 03 00 04 */ stfs f0, 4(r3) /* 801A4B30 001A1A70 C0 19 03 6C */ lfs f0, 0x36c(r25) /* 801A4B34 001A1A74 D0 03 00 08 */ stfs f0, 8(r3) -/* 801A4B38 001A1A78 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801A4B3C 001A1A7C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801A4B38 001A1A78 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801A4B3C 001A1A7C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801A4B40 001A1A80 80 A4 61 B0 */ lwz r5, 0x61b0(r4) /* 801A4B44 001A1A84 28 05 00 00 */ cmplwi r5, 0 /* 801A4B48 001A1A88 41 82 00 18 */ beq lbl_801A4B60 @@ -9713,8 +9713,8 @@ dScnKy_env_light_c_NS_CalcTevColor: /* 801A4E9C 001A1DDC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801A4EA0 001A1DE0 93 C1 00 28 */ stw r30, 0x28(r1) /* 801A4EA4 001A1DE4 7C 7E 1B 78 */ mr r30, r3 -/* 801A4EA8 001A1DE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A4EAC 001A1DEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A4EA8 001A1DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A4EAC 001A1DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A4EB0 001A1DF0 83 E3 5D AC */ lwz r31, 0x5dac(r3) /* 801A4EB4 001A1DF4 28 1F 00 00 */ cmplwi r31, 0 /* 801A4EB8 001A1DF8 41 82 00 54 */ beq lbl_801A4F0C @@ -9922,8 +9922,8 @@ dScnKy_env_light_c_NS_SetBaseLight: /* 801A5180 001A20C0 7C 7D 1B 78 */ mr r29, r3 /* 801A5184 001A20C4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5188 001A20C8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801A518C 001A20CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5190 001A20D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A518C 001A20CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5190 001A20D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5194 001A20D4 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 801A5198 001A20D8 48 00 6F D1 */ bl dKy_SunMoon_Light_Check /* 801A519C 001A20DC 2C 03 00 01 */ cmpwi r3, 1 @@ -10023,8 +10023,8 @@ lbl_801A52DC: /* 801A52F0 001A2230 38 A3 CA 54 */ addi r5, r3, lbl_8042CA54@l /* 801A52F4 001A2234 88 85 12 CE */ lbz r4, 0x12ce(r5) /* 801A52F8 001A2238 98 85 12 CD */ stb r4, 0x12cd(r5) -/* 801A52FC 001A223C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5300 001A2240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A52FC 001A223C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5300 001A2240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5304 001A2244 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 801A5308 001A2248 28 00 00 00 */ cmplwi r0, 0 /* 801A530C 001A224C 40 82 00 28 */ bne lbl_801A5334 @@ -10209,8 +10209,8 @@ lbl_801A557C: /* 801A55B4 001A24F4 4B FF F9 71 */ bl dScnKy_env_light_c_NS_Sndpos /* 801A55B8 001A24F8 7F E3 FB 78 */ mr r3, r31 /* 801A55BC 001A24FC 4B FF F9 A9 */ bl dScnKy_env_light_c_NS_Eflight_flush_proc -/* 801A55C0 001A2500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A55C4 001A2504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A55C0 001A2500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A55C4 001A2504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A55C8 001A2508 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801A55CC 001A250C 28 03 00 00 */ cmplwi r3, 0 /* 801A55D0 001A2510 41 82 00 60 */ beq lbl_801A5630 @@ -10239,8 +10239,8 @@ lbl_801A5618: /* 801A5628 001A2568 38 60 00 02 */ li r3, 2 /* 801A562C 001A256C 48 00 76 C9 */ bl dKy_shadow_mode_reset lbl_801A5630: -/* 801A5630 001A2570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5634 001A2574 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801A5630 001A2570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5634 001A2574 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801A5638 001A2578 38 7E 4E 00 */ addi r3, r30, 0x4e00 /* 801A563C 001A257C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A5640 001A2580 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -10318,8 +10318,8 @@ dKy_undwater_filter_draw: /* 801A573C 001A267C 48 1B CA 9D */ bl _savegpr_28 /* 801A5740 001A2680 3C 60 80 43 */ lis r3, lbl_8042CA48@ha /* 801A5744 001A2684 3B E3 CA 48 */ addi r31, r3, lbl_8042CA48@l -/* 801A5748 001A2688 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A574C 001A268C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5748 001A2688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A574C 001A268C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5750 001A2690 83 A3 5D 74 */ lwz r29, 0x5d74(r3) /* 801A5754 001A2694 88 0D 8A EA */ lbz r0, lbl_8045106A-_SDA_BASE_(r13) /* 801A5758 001A2698 7C 00 07 75 */ extsb. r0, r0 @@ -10585,16 +10585,16 @@ lbl_801A5A34: /* 801A5B08 001A2A48 4B E6 7B D1 */ bl mDoExt_btkAnm_NS_entry /* 801A5B0C 001A2A4C 80 7D 10 5C */ lwz r3, 0x105c(r29) /* 801A5B10 001A2A50 4B E6 79 19 */ bl mDoExt_baseAnm_NS_play -/* 801A5B14 001A2A54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5B18 001A2A58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5B14 001A2A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5B18 001A2A58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5B1C 001A2A5C 80 03 5F AC */ lwz r0, 0x5fac(r3) /* 801A5B20 001A2A60 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801A5B24 001A2A64 3B A3 4A C8 */ addi r29, r3, lbl_80434AC8@l /* 801A5B28 001A2A68 90 1D 00 4C */ stw r0, 0x4c(r29) /* 801A5B2C 001A2A6C 80 7C 0F 30 */ lwz r3, 0xf30(r28) /* 801A5B30 001A2A70 4B E6 81 95 */ bl mDoExt_modelUpdateDL -/* 801A5B34 001A2A74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5B38 001A2A78 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801A5B34 001A2A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5B38 001A2A78 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801A5B3C 001A2A7C 80 04 5F 80 */ lwz r0, 0x5f80(r4) /* 801A5B40 001A2A80 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801A5B44 001A2A84 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -10659,16 +10659,16 @@ lbl_801A5C08: /* 801A5C28 001A2B68 93 E1 00 0C */ stw r31, 0xc(r1) /* 801A5C2C 001A2B6C 93 C1 00 08 */ stw r30, 8(r1) /* 801A5C30 001A2B70 3B E0 00 00 */ li r31, 0 -/* 801A5C34 001A2B74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5C38 001A2B78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5C34 001A2B74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5C38 001A2B78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5C3C 001A2B7C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801A5C40 001A2B80 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A5C44 001A2B84 7D 89 03 A6 */ mtctr r12 /* 801A5C48 001A2B88 4E 80 04 21 */ bctrl /* 801A5C4C 001A2B8C 28 03 00 00 */ cmplwi r3, 0 /* 801A5C50 001A2B90 41 82 00 3C */ beq lbl_801A5C8C -/* 801A5C54 001A2B94 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801A5C58 001A2B98 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801A5C54 001A2B94 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801A5C58 001A2B98 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801A5C5C 001A2B9C 88 04 4E 0A */ lbz r0, 0x4e0a(r4) /* 801A5C60 001A2BA0 7C 00 07 74 */ extsb r0, r0 /* 801A5C64 001A2BA4 2C 00 FF FF */ cmpwi r0, -1 @@ -10757,8 +10757,8 @@ lbl_801A5C8C: /* 801A5DAC 001A2CEC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801A5DB0 001A2CF0 41 82 00 14 */ beq lbl_801A5DC4 /* 801A5DB4 001A2CF4 3B E0 00 01 */ li r31, 1 -/* 801A5DB8 001A2CF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5DBC 001A2CFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5DB8 001A2CF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5DBC 001A2CFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5DC0 001A2D00 D0 23 00 34 */ stfs f1, 0x34(r3) lbl_801A5DC4: /* 801A5DC4 001A2D04 48 00 67 B9 */ bl dKy_darkworld_check @@ -10770,8 +10770,8 @@ lbl_801A5DC4: /* 801A5DDC 001A2D1C C0 04 12 74 */ lfs f0, 0x1274(r4) /* 801A5DE0 001A2D20 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801A5DE4 001A2D24 40 82 00 4C */ bne lbl_801A5E30 -/* 801A5DE8 001A2D28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5DEC 001A2D2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5DE8 001A2D28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5DEC 001A2D2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5DF0 001A2D30 C0 03 00 34 */ lfs f0, 0x34(r3) /* 801A5DF4 001A2D34 D0 04 12 74 */ stfs f0, 0x1274(r4) /* 801A5DF8 001A2D38 48 00 00 38 */ b lbl_801A5E30 @@ -10784,8 +10784,8 @@ lbl_801A5DFC: /* 801A5E10 001A2D50 41 82 00 20 */ beq lbl_801A5E30 /* 801A5E14 001A2D54 2C 1F 00 00 */ cmpwi r31, 0 /* 801A5E18 001A2D58 40 82 00 10 */ bne lbl_801A5E28 -/* 801A5E1C 001A2D5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A5E20 001A2D60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A5E1C 001A2D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A5E20 001A2D60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5E24 001A2D64 D0 23 00 34 */ stfs f1, 0x34(r3) lbl_801A5E28: /* 801A5E28 001A2D68 C0 02 A2 50 */ lfs f0, lbl_80453C50-_SDA2_BASE_(r2) @@ -11063,8 +11063,8 @@ dKy_lightswitch_check: /* 801A6218 001A3158 88 03 00 1E */ lbz r0, 0x1e(r3) /* 801A621C 001A315C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 801A6220 001A3160 40 82 00 24 */ bne lbl_801A6244 -/* 801A6224 001A3164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6228 001A3168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6224 001A3164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6228 001A3168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A622C 001A316C 7C A5 07 74 */ extsb r5, r5 /* 801A6230 001A3170 4B E8 F1 31 */ bl isSwitch__10dSv_info_cCFii /* 801A6234 001A3174 2C 03 00 00 */ cmpwi r3, 0 @@ -11072,8 +11072,8 @@ dKy_lightswitch_check: /* 801A623C 001A317C 3B E0 00 00 */ li r31, 0 /* 801A6240 001A3180 48 00 00 20 */ b lbl_801A6260 lbl_801A6244: -/* 801A6244 001A3184 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6248 001A3188 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6244 001A3184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6248 001A3188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A624C 001A318C 7C A5 07 74 */ extsb r5, r5 /* 801A6250 001A3190 4B E8 F1 11 */ bl isSwitch__10dSv_info_cCFii /* 801A6254 001A3194 2C 03 00 00 */ cmpwi r3, 0 @@ -11100,8 +11100,8 @@ dKy_setLight_nowroom_common: /* 801A6298 001A31D8 FF E0 08 90 */ fmr f31, f1 /* 801A629C 001A31DC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A62A0 001A31E0 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l -/* 801A62A4 001A31E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A62A8 001A31E8 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801A62A4 001A31E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A62A8 001A31E8 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801A62AC 001A31EC 83 25 5D 74 */ lwz r25, 0x5d74(r5) /* 801A62B0 001A31F0 7E DB 07 74 */ extsb r27, r22 /* 801A62B4 001A31F4 1C 9B 04 04 */ mulli r4, r27, 0x404 @@ -11752,8 +11752,8 @@ dKy_setLight_nowroom: /* 801A6C20 001A3B60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801A6C24 001A3B64 7C 08 02 A6 */ mflr r0 /* 801A6C28 001A3B68 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A6C2C 001A3B6C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801A6C30 001A3B70 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801A6C2C 001A3B6C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801A6C30 001A3B70 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801A6C34 001A3B74 80 04 5D 74 */ lwz r0, 0x5d74(r4) /* 801A6C38 001A3B78 28 00 00 00 */ cmplwi r0, 0 /* 801A6C3C 001A3B7C 41 82 00 0C */ beq lbl_801A6C48 @@ -11776,8 +11776,8 @@ dKy_setLight_nowroom_grass: /* 801A6C70 001A3BB0 48 1B B5 6D */ bl _savegpr_29 /* 801A6C74 001A3BB4 7C 7D 1B 78 */ mr r29, r3 /* 801A6C78 001A3BB8 FF E0 08 90 */ fmr f31, f1 -/* 801A6C7C 001A3BBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6C80 001A3BC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6C7C 001A3BBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6C80 001A3BC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A6C84 001A3BC4 3B C3 4E C4 */ addi r30, r3, 0x4ec4 /* 801A6C88 001A3BC8 7F C3 F3 78 */ mr r3, r30 /* 801A6C8C 001A3BCC 7F BF 07 74 */ extsb r31, r29 @@ -11846,8 +11846,8 @@ dKy_move_room_ratio: /* 801A6D68 001A3CA8 7C 7E 1B 78 */ mr r30, r3 /* 801A6D6C 001A3CAC 7C 9F 23 78 */ mr r31, r4 /* 801A6D70 001A3CB0 C3 E2 A2 48 */ lfs f31, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A6D74 001A3CB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6D78 001A3CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6D74 001A3CB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6D78 001A3CB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A6D7C 001A3CBC 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801A6D80 001A3CC0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A6D84 001A3CC4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -11939,8 +11939,8 @@ dKy_setLight_nowroom_actor: /* 801A6EC0 001A3E00 7C 77 1B 78 */ mr r23, r3 /* 801A6EC4 001A3E04 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A6EC8 001A3E08 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l -/* 801A6ECC 001A3E0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6ED0 001A3E10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6ECC 001A3E0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6ED0 001A3E10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A6ED4 001A3E14 83 63 5D 74 */ lwz r27, 0x5d74(r3) /* 801A6ED8 001A3E18 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801A6EDC 001A3E1C 38 03 4A C8 */ addi r0, r3, lbl_80434AC8@l @@ -11968,8 +11968,8 @@ lbl_801A6F14: /* 801A6F2C 001A3E6C 40 82 00 08 */ bne lbl_801A6F34 /* 801A6F30 001A3E70 48 00 06 68 */ b lbl_801A7598 lbl_801A6F34: -/* 801A6F34 001A3E74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A6F38 001A3E78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A6F34 001A3E74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A6F38 001A3E78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A6F3C 001A3E7C 3A 83 4E C4 */ addi r20, r3, 0x4ec4 /* 801A6F40 001A3E80 7E 83 A3 78 */ mr r3, r20 /* 801A6F44 001A3E84 88 81 00 08 */ lbz r4, 8(r1) @@ -13292,8 +13292,8 @@ dKy_Sound_set: /* 801A81E0 001A5120 7C 9A 23 78 */ mr r26, r4 /* 801A81E4 001A5124 7C BB 2B 78 */ mr r27, r5 /* 801A81E8 001A5128 7C DC 33 78 */ mr r28, r6 -/* 801A81EC 001A512C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801A81F0 001A5130 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801A81EC 001A512C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801A81F0 001A5130 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801A81F4 001A5134 83 C4 5D 74 */ lwz r30, 0x5d74(r4) /* 801A81F8 001A5138 3B A0 00 00 */ li r29, 0 /* 801A81FC 001A513C 38 9E 00 D8 */ addi r4, r30, 0xd8 @@ -13550,8 +13550,8 @@ GxFogSet_Sub: /* 801A8560 001A54A0 98 01 00 0E */ stb r0, 0xe(r1) /* 801A8564 001A54A4 88 03 00 03 */ lbz r0, 3(r3) /* 801A8568 001A54A8 98 01 00 0F */ stb r0, 0xf(r1) -/* 801A856C 001A54AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8570 001A54B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A856C 001A54AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8570 001A54B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A8574 001A54B4 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 801A8578 001A54B8 28 03 00 00 */ cmplwi r3, 0 /* 801A857C 001A54BC 41 82 00 38 */ beq lbl_801A85B4 @@ -13629,8 +13629,8 @@ dKy_GxFog_tevstr_set: /* 801A8674 001A55B4 98 01 00 0D */ stb r0, 0xd(r1) /* 801A8678 001A55B8 A8 03 03 54 */ lha r0, 0x354(r3) /* 801A867C 001A55BC 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A8680 001A55C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8684 001A55C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A8680 001A55C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8684 001A55C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A8688 001A55C8 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 801A868C 001A55CC 28 03 00 00 */ cmplwi r3, 0 /* 801A8690 001A55D0 41 82 00 38 */ beq lbl_801A86C8 @@ -13672,8 +13672,8 @@ lbl_801A86C8: /* 801A871C 001A565C 98 01 00 0D */ stb r0, 0xd(r1) /* 801A8720 001A5660 A8 03 03 54 */ lha r0, 0x354(r3) /* 801A8724 001A5664 98 01 00 0E */ stb r0, 0xe(r1) -/* 801A8728 001A5668 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A872C 001A566C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A8728 001A5668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A872C 001A566C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A8730 001A5670 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 801A8734 001A5674 28 03 00 00 */ cmplwi r3, 0 /* 801A8738 001A5678 41 82 00 38 */ beq lbl_801A8770 @@ -13972,8 +13972,8 @@ lbl_801A8B28: .global dKy_get_dayofweek dKy_get_dayofweek: -/* 801A8B38 001A5A78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8B3C 001A5A7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A8B38 001A5A78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8B3C 001A5A7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A8B40 001A5A80 A0 83 00 38 */ lhz r4, 0x38(r3) /* 801A8B44 001A5A84 38 60 00 07 */ li r3, 7 /* 801A8B48 001A5A88 7C 04 1B D6 */ divw r0, r4, r3 @@ -14000,15 +14000,15 @@ dKy_instant_timechg: /* 801A8B84 001A5AC4 4B FF 6E 85 */ bl dScnKy_env_light_c_NS_getDaytime /* 801A8B88 001A5AC8 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 801A8B8C 001A5ACC 40 80 00 1C */ bge lbl_801A8BA8 -/* 801A8B90 001A5AD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8B94 001A5AD4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801A8B90 001A5AD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8B94 001A5AD4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801A8B98 001A5AD8 A0 64 00 38 */ lhz r3, 0x38(r4) /* 801A8B9C 001A5ADC 38 03 00 01 */ addi r0, r3, 1 /* 801A8BA0 001A5AE0 B0 04 00 38 */ sth r0, 0x38(r4) /* 801A8BA4 001A5AE4 48 00 51 5D */ bl dKankyo_DayProc lbl_801A8BA8: -/* 801A8BA8 001A5AE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8BAC 001A5AEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801A8BA8 001A5AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8BAC 001A5AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A8BB0 001A5AF0 D3 E3 00 34 */ stfs f31, 0x34(r3) /* 801A8BB4 001A5AF4 CB E1 00 08 */ lfd f31, 8(r1) /* 801A8BB8 001A5AF8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -14209,8 +14209,8 @@ dKy_ParticleColor_get_base: /* 801A8E94 001A5DD4 3A E0 00 00 */ li r23, 0 /* 801A8E98 001A5DD8 3A C0 00 00 */ li r22, 0 /* 801A8E9C 001A5DDC 3A A0 00 00 */ li r21, 0 -/* 801A8EA0 001A5DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A8EA4 001A5DE4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801A8EA0 001A5DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A8EA4 001A5DE4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801A8EA8 001A5DE8 39 E4 4E C4 */ addi r15, r4, 0x4ec4 /* 801A8EAC 001A5DEC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A8EB0 001A5DF0 38 03 CA 54 */ addi r0, r3, lbl_8042CA54@l @@ -15225,8 +15225,8 @@ dKy_BossLight_set: /* 801A9D90 001A6CD0 7C B8 2B 78 */ mr r24, r5 /* 801A9D94 001A6CD4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A9D98 001A6CD8 3B 83 CA 54 */ addi r28, r3, lbl_8042CA54@l -/* 801A9D9C 001A6CDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801A9DA0 001A6CE0 3A A3 61 C0 */ addi r21, r3, lbl_804061C0@l +/* 801A9D9C 001A6CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801A9DA0 001A6CE0 3A A3 61 C0 */ addi r21, r3, g_dComIfG_gameInfo@l /* 801A9DA4 001A6CE4 83 75 5D 74 */ lwz r27, 0x5d74(r21) /* 801A9DA8 001A6CE8 3B 40 00 00 */ li r26, 0 /* 801A9DAC 001A6CEC C3 C2 A2 0C */ lfs f30, lbl_80453C0C-_SDA2_BASE_(r2) @@ -15885,8 +15885,8 @@ lbl_801AA63C: /* 801AA6BC 001A75FC 7C D9 33 78 */ mr r25, r6 /* 801AA6C0 001A7600 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AA6C4 001A7604 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801AA6C8 001A7608 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AA6CC 001A760C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AA6C8 001A7608 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AA6CC 001A760C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AA6D0 001A7610 83 83 5D 74 */ lwz r28, 0x5d74(r3) /* 801AA6D4 001A7614 3B 60 00 00 */ li r27, 0 /* 801AA6D8 001A7618 C3 E2 A2 0C */ lfs f31, lbl_80453C0C-_SDA2_BASE_(r2) @@ -16364,8 +16364,8 @@ dKy_twilight_camelight_set: /* 801AAD60 001A7CA0 48 1B 74 75 */ bl _savegpr_27 /* 801AAD64 001A7CA4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AAD68 001A7CA8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801AAD6C 001A7CAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AAD70 001A7CB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AAD6C 001A7CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AAD70 001A7CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AAD74 001A7CB4 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 801AAD78 001A7CB8 83 83 5D 74 */ lwz r28, 0x5d74(r3) /* 801AAD7C 001A7CBC 3B 63 4E 00 */ addi r27, r3, 0x4e00 @@ -16379,8 +16379,8 @@ dKy_twilight_camelight_set: /* 801AAD9C 001A7CDC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 801AADA0 001A7CE0 2C 00 00 03 */ cmpwi r0, 3 /* 801AADA4 001A7CE4 40 82 00 18 */ bne lbl_801AADBC -/* 801AADA8 001A7CE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AADAC 001A7CEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AADA8 001A7CE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AADAC 001A7CEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AADB0 001A7CF0 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 801AADB4 001A7CF4 2C 00 00 0C */ cmpwi r0, 0xc /* 801AADB8 001A7CF8 41 82 02 4C */ beq lbl_801AB004 @@ -16560,8 +16560,8 @@ dKy_WaterIn_Light_set: /* 801AB02C 001A7F6C 48 1B 71 A5 */ bl _savegpr_26 /* 801AB030 001A7F70 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB034 001A7F74 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801AB038 001A7F78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB03C 001A7F7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB038 001A7F78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB03C 001A7F7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB040 001A7F80 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 801AB044 001A7F84 83 63 5D 74 */ lwz r27, 0x5d74(r3) /* 801AB048 001A7F88 3B 40 00 01 */ li r26, 1 @@ -16740,8 +16740,8 @@ dKy_pol_efftype_get: /* 801AB2A8 001A81E8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB2AC 001A81EC 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801AB2B0 001A81F0 41 82 00 14 */ beq lbl_801AB2C4 -/* 801AB2B4 001A81F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB2B8 001A81F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB2B4 001A81F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB2B8 001A81F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB2BC 001A81FC 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801AB2C0 001A8200 40 82 00 0C */ bne lbl_801AB2CC lbl_801AB2C4: @@ -16777,8 +16777,8 @@ lbl_801AB320: /* 801AB330 001A8270 48 1B D6 65 */ bl strcmp /* 801AB334 001A8274 2C 03 00 00 */ cmpwi r3, 0 /* 801AB338 001A8278 40 82 00 2C */ bne lbl_801AB364 -/* 801AB33C 001A827C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB340 001A8280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB33C 001A827C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB340 001A8280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB344 001A8284 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB348 001A8288 38 80 00 03 */ li r4, 3 /* 801AB34C 001A828C 4B E8 95 E9 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -16819,8 +16819,8 @@ dKy_pol_efftype2_get: /* 801AB3C0 001A8300 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB3C4 001A8304 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801AB3C8 001A8308 41 82 00 14 */ beq lbl_801AB3DC -/* 801AB3CC 001A830C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB3D0 001A8310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB3CC 001A830C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB3D0 001A8310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB3D4 001A8314 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801AB3D8 001A8318 40 82 00 0C */ bne lbl_801AB3E4 lbl_801AB3DC: @@ -16856,8 +16856,8 @@ lbl_801AB438: /* 801AB448 001A8388 48 1B D5 4D */ bl strcmp /* 801AB44C 001A838C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB450 001A8390 40 82 00 2C */ bne lbl_801AB47C -/* 801AB454 001A8394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB458 001A8398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB454 001A8394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB458 001A8398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB45C 001A839C 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB460 001A83A0 38 80 00 03 */ li r4, 3 /* 801AB464 001A83A4 4B E8 94 D1 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -16898,8 +16898,8 @@ dKy_pol_sound_get: /* 801AB4D8 001A8418 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB4DC 001A841C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801AB4E0 001A8420 41 82 00 14 */ beq lbl_801AB4F4 -/* 801AB4E4 001A8424 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB4E8 001A8428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB4E4 001A8424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB4E8 001A8428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB4EC 001A842C 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801AB4F0 001A8430 40 82 00 0C */ bne lbl_801AB4FC lbl_801AB4F4: @@ -16962,8 +16962,8 @@ dKy_pol_argument_get: /* 801AB5B4 001A84F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB5B8 001A84F8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801AB5BC 001A84FC 41 82 00 14 */ beq lbl_801AB5D0 -/* 801AB5C0 001A8500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB5C4 001A8504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB5C0 001A8500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB5C4 001A8504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB5C8 001A8508 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801AB5CC 001A850C 40 82 00 0C */ bne lbl_801AB5D8 lbl_801AB5D0: @@ -17024,8 +17024,8 @@ dKy_pol_eff_prim_get: /* 801AB68C 001A85CC 41 82 00 1C */ beq lbl_801AB6A8 /* 801AB690 001A85D0 28 1E 00 00 */ cmplwi r30, 0 /* 801AB694 001A85D4 41 82 00 14 */ beq lbl_801AB6A8 -/* 801AB698 001A85D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB69C 001A85DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB698 001A85D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB69C 001A85DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB6A0 001A85E0 37 83 0F 38 */ addic. r28, r3, 0xf38 /* 801AB6A4 001A85E4 40 82 00 0C */ bne lbl_801AB6B0 lbl_801AB6A8: @@ -17061,8 +17061,8 @@ lbl_801AB704: /* 801AB714 001A8654 48 1B D2 81 */ bl strcmp /* 801AB718 001A8658 2C 03 00 00 */ cmpwi r3, 0 /* 801AB71C 001A865C 40 82 00 2C */ bne lbl_801AB748 -/* 801AB720 001A8660 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB724 001A8664 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB720 001A8660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB724 001A8664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB728 001A8668 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB72C 001A866C 38 80 00 03 */ li r4, 3 /* 801AB730 001A8670 4B E8 92 05 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17125,8 +17125,8 @@ dKy_pol_eff_env_get: /* 801AB7F4 001A8734 41 82 00 1C */ beq lbl_801AB810 /* 801AB7F8 001A8738 28 1E 00 00 */ cmplwi r30, 0 /* 801AB7FC 001A873C 41 82 00 14 */ beq lbl_801AB810 -/* 801AB800 001A8740 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB804 001A8744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB800 001A8740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB804 001A8744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB808 001A8748 37 83 0F 38 */ addic. r28, r3, 0xf38 /* 801AB80C 001A874C 40 82 00 0C */ bne lbl_801AB818 lbl_801AB810: @@ -17162,8 +17162,8 @@ lbl_801AB86C: /* 801AB87C 001A87BC 48 1B D1 19 */ bl strcmp /* 801AB880 001A87C0 2C 03 00 00 */ cmpwi r3, 0 /* 801AB884 001A87C4 40 82 00 2C */ bne lbl_801AB8B0 -/* 801AB888 001A87C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB88C 001A87CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB888 001A87C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB88C 001A87CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB890 001A87D0 38 63 09 58 */ addi r3, r3, 0x958 /* 801AB894 001A87D4 38 80 00 03 */ li r4, 3 /* 801AB898 001A87D8 4B E8 90 9D */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17227,8 +17227,8 @@ dKy_pol_eff2_prim_get: /* 801AB960 001A88A0 41 82 00 1C */ beq lbl_801AB97C /* 801AB964 001A88A4 28 1E 00 00 */ cmplwi r30, 0 /* 801AB968 001A88A8 41 82 00 14 */ beq lbl_801AB97C -/* 801AB96C 001A88AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB970 001A88B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB96C 001A88AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB970 001A88B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB974 001A88B4 37 83 0F 38 */ addic. r28, r3, 0xf38 /* 801AB978 001A88B8 40 82 00 0C */ bne lbl_801AB984 lbl_801AB97C: @@ -17264,8 +17264,8 @@ lbl_801AB9D8: /* 801AB9E8 001A8928 48 1B CF AD */ bl strcmp /* 801AB9EC 001A892C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB9F0 001A8930 40 82 00 2C */ bne lbl_801ABA1C -/* 801AB9F4 001A8934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AB9F8 001A8938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AB9F4 001A8934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AB9F8 001A8938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AB9FC 001A893C 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABA00 001A8940 38 80 00 03 */ li r4, 3 /* 801ABA04 001A8944 4B E8 8F 31 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17328,8 +17328,8 @@ dKy_pol_eff2_env_get: /* 801ABAC8 001A8A08 41 82 00 1C */ beq lbl_801ABAE4 /* 801ABACC 001A8A0C 28 1E 00 00 */ cmplwi r30, 0 /* 801ABAD0 001A8A10 41 82 00 14 */ beq lbl_801ABAE4 -/* 801ABAD4 001A8A14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABAD8 001A8A18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABAD4 001A8A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABAD8 001A8A18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABADC 001A8A1C 37 83 0F 38 */ addic. r28, r3, 0xf38 /* 801ABAE0 001A8A20 40 82 00 0C */ bne lbl_801ABAEC lbl_801ABAE4: @@ -17365,8 +17365,8 @@ lbl_801ABB40: /* 801ABB50 001A8A90 48 1B CE 45 */ bl strcmp /* 801ABB54 001A8A94 2C 03 00 00 */ cmpwi r3, 0 /* 801ABB58 001A8A98 40 82 00 2C */ bne lbl_801ABB84 -/* 801ABB5C 001A8A9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABB60 001A8AA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABB5C 001A8A9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABB60 001A8AA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABB64 001A8AA4 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABB68 001A8AA8 38 80 00 03 */ li r4, 3 /* 801ABB6C 001A8AAC 4B E8 8D C9 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17427,8 +17427,8 @@ dKy_pol_eff_alpha_get: /* 801ABC28 001A8B68 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABC2C 001A8B6C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801ABC30 001A8B70 41 82 00 14 */ beq lbl_801ABC44 -/* 801ABC34 001A8B74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABC38 001A8B78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABC34 001A8B74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABC38 001A8B78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABC3C 001A8B7C 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801ABC40 001A8B80 40 82 00 0C */ bne lbl_801ABC4C lbl_801ABC44: @@ -17464,8 +17464,8 @@ lbl_801ABCA0: /* 801ABCB0 001A8BF0 48 1B CC E5 */ bl strcmp /* 801ABCB4 001A8BF4 2C 03 00 00 */ cmpwi r3, 0 /* 801ABCB8 001A8BF8 40 82 00 2C */ bne lbl_801ABCE4 -/* 801ABCBC 001A8BFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABCC0 001A8C00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABCBC 001A8BFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABCC0 001A8C00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABCC4 001A8C04 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABCC8 001A8C08 38 80 00 03 */ li r4, 3 /* 801ABCCC 001A8C0C 4B E8 8C 69 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17517,8 +17517,8 @@ dKy_pol_eff_ratio_get: /* 801ABD64 001A8CA4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABD68 001A8CA8 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 801ABD6C 001A8CAC 41 82 00 14 */ beq lbl_801ABD80 -/* 801ABD70 001A8CB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABD74 001A8CB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABD70 001A8CB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABD74 001A8CB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABD78 001A8CB8 37 A3 0F 38 */ addic. r29, r3, 0xf38 /* 801ABD7C 001A8CBC 40 82 00 0C */ bne lbl_801ABD88 lbl_801ABD80: @@ -17554,8 +17554,8 @@ lbl_801ABDDC: /* 801ABDEC 001A8D2C 48 1B CB A9 */ bl strcmp /* 801ABDF0 001A8D30 2C 03 00 00 */ cmpwi r3, 0 /* 801ABDF4 001A8D34 40 82 00 2C */ bne lbl_801ABE20 -/* 801ABDF8 001A8D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABDFC 001A8D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABDF8 001A8D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABDFC 001A8D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABE00 001A8D40 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABE04 001A8D44 38 80 00 03 */ li r4, 3 /* 801ABE08 001A8D48 4B E8 8B 2D */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17615,8 +17615,8 @@ dKy_pol_eff2_alpha_get: /* 801ABEC0 001A8E00 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABEC4 001A8E04 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801ABEC8 001A8E08 41 82 00 14 */ beq lbl_801ABEDC -/* 801ABECC 001A8E0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABED0 001A8E10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABECC 001A8E0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABED0 001A8E10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABED4 001A8E14 37 C3 0F 38 */ addic. r30, r3, 0xf38 /* 801ABED8 001A8E18 40 82 00 0C */ bne lbl_801ABEE4 lbl_801ABEDC: @@ -17652,8 +17652,8 @@ lbl_801ABF38: /* 801ABF48 001A8E88 48 1B CA 4D */ bl strcmp /* 801ABF4C 001A8E8C 2C 03 00 00 */ cmpwi r3, 0 /* 801ABF50 001A8E90 40 82 00 2C */ bne lbl_801ABF7C -/* 801ABF54 001A8E94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ABF58 001A8E98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ABF54 001A8E94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ABF58 001A8E98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ABF5C 001A8E9C 38 63 09 58 */ addi r3, r3, 0x958 /* 801ABF60 001A8EA0 38 80 00 03 */ li r4, 3 /* 801ABF64 001A8EA4 4B E8 89 D1 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17705,8 +17705,8 @@ dKy_pol_eff2_ratio_get: /* 801ABFFC 001A8F3C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AC000 001A8F40 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 801AC004 001A8F44 41 82 00 14 */ beq lbl_801AC018 -/* 801AC008 001A8F48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC00C 001A8F4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC008 001A8F48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC00C 001A8F4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC010 001A8F50 37 A3 0F 38 */ addic. r29, r3, 0xf38 /* 801AC014 001A8F54 40 82 00 0C */ bne lbl_801AC020 lbl_801AC018: @@ -17742,8 +17742,8 @@ lbl_801AC074: /* 801AC084 001A8FC4 48 1B C9 11 */ bl strcmp /* 801AC088 001A8FC8 2C 03 00 00 */ cmpwi r3, 0 /* 801AC08C 001A8FCC 40 82 00 2C */ bne lbl_801AC0B8 -/* 801AC090 001A8FD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC094 001A8FD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC090 001A8FD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC094 001A8FD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC098 001A8FD8 38 63 09 58 */ addi r3, r3, 0x958 /* 801AC09C 001A8FDC 38 80 00 03 */ li r4, 3 /* 801AC0A0 001A8FE0 4B E8 88 95 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -17822,8 +17822,8 @@ dKy_SunMoon_Light_Check: /* 801AC194 001A90D4 48 00 03 E9 */ bl dKy_darkworld_check /* 801AC198 001A90D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AC19C 001A90DC 40 82 00 70 */ bne lbl_801AC20C -/* 801AC1A0 001A90E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC1A4 001A90E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC1A0 001A90E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC1A4 001A90E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC1A8 001A90E8 3B E3 4E 00 */ addi r31, r3, 0x4e00 /* 801AC1AC 001A90EC 7F E3 FB 78 */ mr r3, r31 /* 801AC1B0 001A90F0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -17866,8 +17866,8 @@ dKy_Outdoor_check: /* 801AC234 001A9174 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AC238 001A9178 3B E0 00 00 */ li r31, 0 /* 801AC23C 001A917C 38 00 00 00 */ li r0, 0 -/* 801AC240 001A9180 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC244 001A9184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC240 001A9180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC244 001A9184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC248 001A9188 34 63 4E 20 */ addic. r3, r3, 0x4e20 /* 801AC24C 001A918C 41 82 00 1C */ beq lbl_801AC268 /* 801AC250 001A9190 81 83 00 00 */ lwz r12, 0(r3) @@ -17895,8 +17895,8 @@ dKy_Indoor_check: /* 801AC294 001A91D4 90 01 00 14 */ stw r0, 0x14(r1) /* 801AC298 001A91D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AC29C 001A91DC 3B E0 00 00 */ li r31, 0 -/* 801AC2A0 001A91E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC2A4 001A91E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC2A0 001A91E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC2A4 001A91E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC2A8 001A91E8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801AC2AC 001A91EC 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801AC2B0 001A91F0 7D 89 03 A6 */ mtctr r12 @@ -17930,8 +17930,8 @@ dKy_depth_dist_set: /* 801AC304 001A9244 7C 7E 1B 78 */ mr r30, r3 /* 801AC308 001A9248 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AC30C 001A924C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801AC310 001A9250 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC314 001A9254 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC310 001A9250 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC314 001A9254 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC318 001A9258 83 A3 5D 74 */ lwz r29, 0x5d74(r3) /* 801AC31C 001A925C C0 1E 05 38 */ lfs f0, 0x538(r30) /* 801AC320 001A9260 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -18186,8 +18186,8 @@ lbl_801AC680: /* 801AC698 001A95D8 40 82 00 24 */ bne lbl_801AC6BC /* 801AC69C 001A95DC 2C 1B 00 01 */ cmpwi r27, 1 /* 801AC6A0 001A95E0 40 82 00 1C */ bne lbl_801AC6BC -/* 801AC6A4 001A95E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC6A8 001A95E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC6A4 001A95E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC6A8 001A95E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC6AC 001A95EC 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 801AC6B0 001A95F0 2C 00 00 0D */ cmpwi r0, 0xd /* 801AC6B4 001A95F4 40 82 00 08 */ bne lbl_801AC6BC @@ -18198,8 +18198,8 @@ lbl_801AC6BC: /* 801AC6C4 001A9604 88 03 00 04 */ lbz r0, 4(r3) /* 801AC6C8 001A9608 28 00 00 00 */ cmplwi r0, 0 /* 801AC6CC 001A960C 40 82 00 24 */ bne lbl_801AC6F0 -/* 801AC6D0 001A9610 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC6D4 001A9614 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC6D0 001A9610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC6D4 001A9614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC6D8 001A9618 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801AC6DC 001A961C 38 80 45 10 */ li r4, 0x4510 /* 801AC6E0 001A9620 4B E8 82 DD */ bl isEventBit__11dSv_event_cCFUs @@ -18250,8 +18250,8 @@ lbl_801AC73C: /* 801AC780 001A96C0 88 1D 00 04 */ lbz r0, 4(r29) /* 801AC784 001A96C4 98 01 00 08 */ stb r0, 8(r1) lbl_801AC788: -/* 801AC788 001A96C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC78C 001A96CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC788 001A96C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC78C 001A96CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC790 001A96D0 38 63 00 28 */ addi r3, r3, 0x28 /* 801AC794 001A96D4 88 81 00 08 */ lbz r4, 8(r1) /* 801AC798 001A96D8 4B E8 64 19 */ bl isDarkClearLV__21dSv_player_status_b_cCFi @@ -18350,8 +18350,8 @@ lbl_801AC89C: /* 801AC8D8 001A9818 98 01 00 08 */ stb r0, 8(r1) lbl_801AC8DC: /* 801AC8DC 001A981C 88 01 00 08 */ lbz r0, 8(r1) -/* 801AC8E0 001A9820 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC8E4 001A9824 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC8E0 001A9820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC8E4 001A9824 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC8E8 001A9828 98 03 4E 0C */ stb r0, 0x4e0c(r3) /* 801AC8EC 001A982C 48 00 00 14 */ b lbl_801AC900 lbl_801AC8F0: @@ -18381,8 +18381,8 @@ dKy_murky_set: /* 801AC93C 001A987C 38 83 CA 54 */ addi r4, r3, lbl_8042CA54@l /* 801AC940 001A9880 80 A4 0E 78 */ lwz r5, 0xe78(r4) /* 801AC944 001A9884 80 C4 0E 74 */ lwz r6, 0xe74(r4) -/* 801AC948 001A9888 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AC94C 001A988C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AC948 001A9888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AC94C 001A988C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AC950 001A9890 83 E3 5D 74 */ lwz r31, 0x5d74(r3) /* 801AC954 001A9894 A8 04 11 10 */ lha r0, 0x1110(r4) /* 801AC958 001A9898 B0 01 00 0C */ sth r0, 0xc(r1) @@ -18459,8 +18459,8 @@ lbl_801ACA08: /* 801ACA6C 001A99AC 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 801ACA70 001A99B0 B0 01 00 12 */ sth r0, 0x12(r1) lbl_801ACA74: -/* 801ACA74 001A99B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ACA78 001A99B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ACA74 001A99B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ACA78 001A99B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ACA7C 001A99BC 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801ACA80 001A99C0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ACA84 001A99C4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l @@ -18659,8 +18659,8 @@ dKy_shadow_mode_check: /* 801ACD4C 001A9C8C 48 1B 54 5D */ bl func_803621A8 /* 801ACD50 001A9C90 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801ACD54 001A9C94 3B A4 CA 54 */ addi r29, r4, lbl_8042CA54@l -/* 801ACD58 001A9C98 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801ACD5C 001A9C9C 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 801ACD58 001A9C98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801ACD5C 001A9C9C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 801ACD60 001A9CA0 88 1E 5D 70 */ lbz r0, 0x5d70(r30) /* 801ACD64 001A9CA4 7C 00 07 74 */ extsb r0, r0 /* 801ACD68 001A9CA8 3A DE 5D 74 */ addi r22, r30, 0x5d74 @@ -19734,8 +19734,8 @@ dKankyo_DayProc: /* 801ADD00 001AAC40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801ADD04 001AAC44 7C 08 02 A6 */ mflr r0 /* 801ADD08 001AAC48 90 01 00 14 */ stw r0, 0x14(r1) -/* 801ADD0C 001AAC4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ADD10 001AAC50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ADD0C 001AAC4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ADD10 001AAC50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ADD14 001AAC54 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 801ADD18 001AAC58 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 801ADD1C 001AAC5C 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l diff --git a/asm/d/d_kyeff.s b/asm/d/d_kyeff.s index 2ca785978c..f473a35823 100644 --- a/asm/d/d_kyeff.s +++ b/asm/d/d_kyeff.s @@ -18,8 +18,8 @@ dKyeff_c_NS_execute: /* 801ADD5C 001AAC9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801ADD60 001AACA0 7C 08 02 A6 */ mflr r0 /* 801ADD64 001AACA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801ADD68 001AACA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ADD6C 001AACAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ADD68 001AACA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ADD6C 001AACAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ADD70 001AACB0 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801ADD74 001AACB4 3C 80 80 39 */ lis r4, lbl_80394F38@ha /* 801ADD78 001AACB8 38 84 4F 38 */ addi r4, r4, lbl_80394F38@l @@ -61,8 +61,8 @@ lbl_801ADD8C: /* 801ADE04 001AAD44 7C 08 02 A6 */ mflr r0 /* 801ADE08 001AAD48 90 01 00 44 */ stw r0, 0x44(r1) /* 801ADE0C 001AAD4C 4B EA 96 D5 */ bl dKyw_wether_init -/* 801ADE10 001AAD50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ADE14 001AAD54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ADE10 001AAD50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ADE14 001AAD54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ADE18 001AAD58 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801ADE1C 001AAD5C 3C 80 80 39 */ lis r4, lbl_80394F38@ha /* 801ADE20 001AAD60 38 84 4F 38 */ addi r4, r4, lbl_80394F38@l diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 532851ce3c..9a5fc2f28a 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -268,8 +268,8 @@ renderingAmap_c_NS_getDispType: /* 800288C8 00025808 7C 08 02 A6 */ mflr r0 /* 800288CC 0002580C 90 01 00 14 */ stw r0, 0x14(r1) /* 800288D0 00025810 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800288D4 00025814 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800288D8 00025818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800288D4 00025814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800288D8 00025818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800288DC 0002581C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800288E0 00025820 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800288E4 00025824 7D 89 03 A6 */ mtctr r12 @@ -935,8 +935,8 @@ lbl_80029210: /* 80029240 00026180 88 9B 00 00 */ lbz r4, 0(r27) /* 80029244 00026184 28 04 00 FF */ cmplwi r4, 0xff /* 80029248 00026188 41 82 04 88 */ beq lbl_800296D0 -/* 8002924C 0002618C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029250 00026190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002924C 0002618C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029250 00026190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029254 00026194 38 63 09 58 */ addi r3, r3, 0x958 /* 80029258 00026198 48 00 B5 91 */ bl isTbox__12dSv_memBit_cCFi /* 8002925C 0002619C 2C 03 00 00 */ cmpwi r3, 0 @@ -963,8 +963,8 @@ lbl_8002929C: /* 800292A8 000261E8 28 04 00 FF */ cmplwi r4, 0xff /* 800292AC 000261EC 41 82 00 24 */ beq lbl_800292D0 /* 800292B0 000261F0 41 82 04 20 */ beq lbl_800296D0 -/* 800292B4 000261F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800292B8 000261F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800292B4 000261F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800292B8 000261F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800292BC 000261FC 88 BB 00 01 */ lbz r5, 1(r27) /* 800292C0 00026200 7C A5 07 74 */ extsb r5, r5 /* 800292C4 00026204 48 00 C0 9D */ bl isSwitch__10dSv_info_cCFii @@ -979,8 +979,8 @@ lbl_800292D0: /* 800292E4 00026224 40 82 03 EC */ bne lbl_800296D0 /* 800292E8 00026228 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 800292EC 0002622C 41 82 03 E4 */ beq lbl_800296D0 -/* 800292F0 00026230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800292F4 00026234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800292F0 00026230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800292F4 00026234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800292F8 00026238 38 63 09 58 */ addi r3, r3, 0x958 /* 800292FC 0002623C 88 9B 00 00 */ lbz r4, 0(r27) /* 80029300 00026240 48 00 B4 E9 */ bl isTbox__12dSv_memBit_cCFi @@ -996,8 +996,8 @@ lbl_800292D0: /* 80029328 00026268 48 00 5A B9 */ bl dComIfGp_isLightDropMapVisible /* 8002932C 0002626C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80029330 00026270 41 82 00 68 */ beq lbl_80029398 -/* 80029334 00026274 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029338 00026278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029334 00026274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029338 00026278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002933C 0002627C 88 03 4E 0C */ lbz r0, 0x4e0c(r3) /* 80029340 00026280 2C 00 00 02 */ cmpwi r0, 2 /* 80029344 00026284 40 82 00 50 */ bne lbl_80029394 @@ -1008,8 +1008,8 @@ lbl_800292D0: /* 80029358 00026298 2C 03 00 35 */ cmpwi r3, 0x35 /* 8002935C 0002629C 40 82 00 30 */ bne lbl_8002938C lbl_80029360: -/* 80029360 000262A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029364 000262A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029360 000262A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029364 000262A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029368 000262A8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002936C 000262AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80029370 000262B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -1031,8 +1031,8 @@ lbl_80029398: /* 800293A4 000262E4 88 9B 00 00 */ lbz r4, 0(r27) /* 800293A8 000262E8 28 04 00 FF */ cmplwi r4, 0xff /* 800293AC 000262EC 41 82 00 20 */ beq lbl_800293CC -/* 800293B0 000262F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800293B4 000262F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800293B0 000262F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800293B4 000262F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800293B8 000262F8 38 63 09 58 */ addi r3, r3, 0x958 /* 800293BC 000262FC 48 00 B4 2D */ bl isTbox__12dSv_memBit_cCFi /* 800293C0 00026300 2C 03 00 00 */ cmpwi r3, 0 @@ -1074,8 +1074,8 @@ lbl_80029434: /* 80029440 00026380 28 04 00 FF */ cmplwi r4, 0xff /* 80029444 00026384 41 82 00 20 */ beq lbl_80029464 /* 80029448 00026388 41 82 02 88 */ beq lbl_800296D0 -/* 8002944C 0002638C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029450 00026390 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002944C 0002638C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029450 00026390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029454 00026394 38 63 09 58 */ addi r3, r3, 0x958 /* 80029458 00026398 48 00 B3 91 */ bl isTbox__12dSv_memBit_cCFi /* 8002945C 0002639C 2C 03 00 00 */ cmpwi r3, 0 @@ -1085,8 +1085,8 @@ lbl_80029464: /* 80029468 000263A8 28 04 00 FF */ cmplwi r4, 0xff /* 8002946C 000263AC 41 82 00 24 */ beq lbl_80029490 /* 80029470 000263B0 41 82 02 60 */ beq lbl_800296D0 -/* 80029474 000263B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029478 000263B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029474 000263B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029478 000263B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002947C 000263BC 88 BB 00 01 */ lbz r5, 1(r27) /* 80029480 000263C0 7C A5 07 74 */ extsb r5, r5 /* 80029484 000263C4 48 00 BE DD */ bl isSwitch__10dSv_info_cCFii @@ -1105,16 +1105,16 @@ lbl_80029490: /* 800294B4 000263F4 28 04 00 FF */ cmplwi r4, 0xff /* 800294B8 000263F8 41 82 00 24 */ beq lbl_800294DC /* 800294BC 000263FC 41 82 02 14 */ beq lbl_800296D0 -/* 800294C0 00026400 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800294C4 00026404 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800294C0 00026400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800294C4 00026404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800294C8 00026408 88 BB 00 01 */ lbz r5, 1(r27) /* 800294CC 0002640C 7C A5 07 74 */ extsb r5, r5 /* 800294D0 00026410 48 00 BE 91 */ bl isSwitch__10dSv_info_cCFii /* 800294D4 00026414 2C 03 00 00 */ cmpwi r3, 0 /* 800294D8 00026418 41 82 01 F8 */ beq lbl_800296D0 lbl_800294DC: -/* 800294DC 0002641C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800294E0 00026420 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800294DC 0002641C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800294E0 00026420 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800294E4 00026424 38 63 09 58 */ addi r3, r3, 0x958 /* 800294E8 00026428 38 80 00 03 */ li r4, 3 /* 800294EC 0002642C 48 00 B4 49 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -1132,8 +1132,8 @@ lbl_800294DC: /* 8002951C 0002645C 28 04 00 FF */ cmplwi r4, 0xff /* 80029520 00026460 41 82 00 20 */ beq lbl_80029540 /* 80029524 00026464 41 82 01 AC */ beq lbl_800296D0 -/* 80029528 00026468 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002952C 0002646C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029528 00026468 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002952C 0002646C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029530 00026470 38 63 09 58 */ addi r3, r3, 0x958 /* 80029534 00026474 48 00 B2 B5 */ bl isTbox__12dSv_memBit_cCFi /* 80029538 00026478 2C 03 00 00 */ cmpwi r3, 0 @@ -1148,8 +1148,8 @@ lbl_80029540: /* 80029558 00026498 88 9B 00 00 */ lbz r4, 0(r27) /* 8002955C 0002649C 28 04 00 FF */ cmplwi r4, 0xff /* 80029560 000264A0 41 82 01 70 */ beq lbl_800296D0 -/* 80029564 000264A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029568 000264A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029564 000264A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029568 000264A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002956C 000264AC 38 63 09 58 */ addi r3, r3, 0x958 /* 80029570 000264B0 48 00 B2 79 */ bl isTbox__12dSv_memBit_cCFi /* 80029574 000264B4 2C 03 00 00 */ cmpwi r3, 0 @@ -1174,8 +1174,8 @@ lbl_80029540: /* 800295C0 00026500 28 04 00 FF */ cmplwi r4, 0xff /* 800295C4 00026504 41 82 00 20 */ beq lbl_800295E4 /* 800295C8 00026508 41 82 01 08 */ beq lbl_800296D0 -/* 800295CC 0002650C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800295D0 00026510 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800295CC 0002650C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800295D0 00026510 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800295D4 00026514 38 63 09 58 */ addi r3, r3, 0x958 /* 800295D8 00026518 48 00 B2 11 */ bl isTbox__12dSv_memBit_cCFi /* 800295DC 0002651C 2C 03 00 00 */ cmpwi r3, 0 @@ -1191,8 +1191,8 @@ lbl_800295E4: /* 80029600 00026540 28 04 00 FF */ cmplwi r4, 0xff /* 80029604 00026544 41 82 00 24 */ beq lbl_80029628 /* 80029608 00026548 41 82 00 C8 */ beq lbl_800296D0 -/* 8002960C 0002654C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029610 00026550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002960C 0002654C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029610 00026550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029614 00026554 88 BB 00 01 */ lbz r5, 1(r27) /* 80029618 00026558 7C A5 07 74 */ extsb r5, r5 /* 8002961C 0002655C 48 00 BD 45 */ bl isSwitch__10dSv_info_cCFii @@ -1209,8 +1209,8 @@ lbl_80029628: /* 80029644 00026584 28 04 00 FF */ cmplwi r4, 0xff /* 80029648 00026588 41 82 00 20 */ beq lbl_80029668 /* 8002964C 0002658C 41 82 00 84 */ beq lbl_800296D0 -/* 80029650 00026590 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029654 00026594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029650 00026590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029654 00026594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029658 00026598 38 63 09 58 */ addi r3, r3, 0x958 /* 8002965C 0002659C 48 00 B1 8D */ bl isTbox__12dSv_memBit_cCFi /* 80029660 000265A0 2C 03 00 00 */ cmpwi r3, 0 @@ -1222,8 +1222,8 @@ lbl_80029668: /* 80029674 000265B4 48 00 00 5C */ b lbl_800296D0 /* 80029678 000265B8 2C 19 00 01 */ cmpwi r25, 1 /* 8002967C 000265BC 40 82 00 54 */ bne lbl_800296D0 -/* 80029680 000265C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029684 000265C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029680 000265C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029684 000265C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029688 000265C8 3B 23 09 58 */ addi r25, r3, 0x958 /* 8002968C 000265CC 7F 23 CB 78 */ mr r3, r25 /* 80029690 000265D0 38 80 00 03 */ li r4, 3 @@ -1417,8 +1417,8 @@ dMap_c: /* 80029938 00026878 3C 60 80 38 */ lis r3, lbl_80378F24@ha /* 8002993C 0002687C 38 63 8F 24 */ addi r3, r3, lbl_80378F24@l /* 80029940 00026880 38 80 00 45 */ li r4, 0x45 -/* 80029944 00026884 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80029948 00026888 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80029944 00026884 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80029948 00026888 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8002994C 0002688C 3C A5 00 02 */ addis r5, r5, 2 /* 80029950 00026890 38 C0 00 80 */ li r6, 0x80 /* 80029954 00026894 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -1824,8 +1824,8 @@ lbl_80029EB8: /* 80029EFC 00026E3C 48 00 00 5C */ b lbl_80029F58 lbl_80029F00: /* 80029F00 00026E40 C3 E2 82 E4 */ lfs f31, lbl_80451CE4-_SDA2_BASE_(r2) -/* 80029F04 00026E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80029F08 00026E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80029F04 00026E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80029F08 00026E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80029F0C 00026E4C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80029F10 00026E50 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80029F14 00026E54 7D 89 03 A6 */ mtctr r12 @@ -2185,15 +2185,15 @@ lbl_8002A408: /* 8002A40C 0002734C 4B FF ED 55 */ bl renderingAmap_c_NS_getStayType /* 8002A410 00027350 2C 03 00 00 */ cmpwi r3, 0 /* 8002A414 00027354 40 82 00 AC */ bne lbl_8002A4C0 -/* 8002A418 00027358 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002A41C 0002735C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002A418 00027358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002A41C 0002735C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002A420 00027360 38 63 09 78 */ addi r3, r3, 0x978 /* 8002A424 00027364 38 80 00 32 */ li r4, 0x32 /* 8002A428 00027368 48 00 A7 C1 */ bl isSwitch__12dSv_danBit_cCFi /* 8002A42C 0002736C 2C 03 00 00 */ cmpwi r3, 0 /* 8002A430 00027370 41 82 00 90 */ beq lbl_8002A4C0 -/* 8002A434 00027374 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002A438 00027378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002A434 00027374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002A438 00027378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002A43C 0002737C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8002A440 00027380 3C 80 80 38 */ lis r4, lbl_80378F24@ha /* 8002A444 00027384 38 84 8F 24 */ addi r4, r4, lbl_80378F24@l diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 7bee58e9b0..65a20e3974 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -11,8 +11,8 @@ dMeter2_c_NS__create: /* 8021EA20 0021B960 39 61 00 30 */ addi r11, r1, 0x30 /* 8021EA24 0021B964 48 14 37 A9 */ bl func_803621CC /* 8021EA28 0021B968 7C 7F 1B 78 */ mr r31, r3 -/* 8021EA2C 0021B96C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EA30 0021B970 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8021EA2C 0021B96C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EA30 0021B970 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8021EA34 0021B974 38 7B 4E 20 */ addi r3, r27, 0x4e20 /* 8021EA38 0021B978 81 9B 4E 20 */ lwz r12, 0x4e20(r27) /* 8021EA3C 0021B97C 81 8C 00 BC */ lwz r12, 0xbc(r12) @@ -61,8 +61,8 @@ lbl_8021EAC4: /* 8021EADC 0021BA1C B0 7F 01 B6 */ sth r3, 0x1b6(r31) /* 8021EAE0 0021BA20 98 7F 01 E6 */ stb r3, 0x1e6(r31) /* 8021EAE4 0021BA24 98 7F 01 E7 */ stb r3, 0x1e7(r31) -/* 8021EAE8 0021BA28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EAEC 0021BA2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021EAE8 0021BA28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EAEC 0021BA2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021EAF0 0021BA30 3B A3 00 F8 */ addi r29, r3, 0xf8 /* 8021EAF4 0021BA34 88 03 00 F8 */ lbz r0, 0xf8(r3) /* 8021EAF8 0021BA38 98 1F 01 FB */ stb r0, 0x1fb(r31) @@ -94,8 +94,8 @@ lbl_8021EB20: /* 8021EB5C 0021BA9C 2C 19 00 03 */ cmpwi r25, 3 /* 8021EB60 0021BAA0 41 80 FF C0 */ blt lbl_8021EB20 /* 8021EB64 0021BAA4 3B 20 00 00 */ li r25, 0 -/* 8021EB68 0021BAA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EB6C 0021BAAC 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8021EB68 0021BAA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EB6C 0021BAAC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l lbl_8021EB70: /* 8021EB70 0021BAB0 7F 63 DB 78 */ mr r3, r27 /* 8021EB74 0021BAB4 7F 24 CB 78 */ mr r4, r25 @@ -132,8 +132,8 @@ lbl_8021EBD4: /* 8021EBE8 0021BB28 98 1F 01 EC */ stb r0, 0x1ec(r31) /* 8021EBEC 0021BB2C 98 1F 01 ED */ stb r0, 0x1ed(r31) /* 8021EBF0 0021BB30 98 1F 01 EE */ stb r0, 0x1ee(r31) -/* 8021EBF4 0021BB34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EBF8 0021BB38 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021EBF4 0021BB34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EBF8 0021BB38 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021EBFC 0021BB3C A0 04 00 02 */ lhz r0, 2(r4) /* 8021EC00 0021BB40 B0 1F 01 92 */ sth r0, 0x192(r31) /* 8021EC04 0021BB44 A8 1F 01 92 */ lha r0, 0x192(r31) @@ -167,8 +167,8 @@ lbl_8021EBD4: /* 8021EC74 0021BBB4 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 8021EC78 0021BBB8 4B E1 56 C9 */ bl getLightDropNum__16dSv_light_drop_cCFUc /* 8021EC7C 0021BBBC 98 7F 01 C2 */ stb r3, 0x1c2(r31) -/* 8021EC80 0021BBC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EC84 0021BBC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021EC80 0021BBC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EC84 0021BBC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021EC88 0021BBC8 88 03 5E A1 */ lbz r0, 0x5ea1(r3) /* 8021EC8C 0021BBCC 98 1F 01 C3 */ stb r0, 0x1c3(r31) /* 8021EC90 0021BBD0 A0 03 00 04 */ lhz r0, 4(r3) @@ -192,8 +192,8 @@ lbl_8021ECC4: /* 8021ECD4 0021BC14 42 00 FF F0 */ bdnz lbl_8021ECC4 /* 8021ECD8 0021BC18 C0 02 AF CC */ lfs f0, lbl_804549CC-_SDA2_BASE_(r2) /* 8021ECDC 0021BC1C D0 1F 01 44 */ stfs f0, 0x144(r31) -/* 8021ECE0 0021BC20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021ECE4 0021BC24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021ECE0 0021BC20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021ECE4 0021BC24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021ECE8 0021BC28 88 03 5E 1D */ lbz r0, 0x5e1d(r3) /* 8021ECEC 0021BC2C 98 1F 01 C5 */ stb r0, 0x1c5(r31) /* 8021ECF0 0021BC30 38 00 00 00 */ li r0, 0 @@ -215,8 +215,8 @@ lbl_8021ED14: /* 8021ED2C 0021BC6C D0 1F 01 58 */ stfs f0, 0x158(r31) /* 8021ED30 0021BC70 38 80 00 00 */ li r4, 0 /* 8021ED34 0021BC74 98 9F 01 E4 */ stb r4, 0x1e4(r31) -/* 8021ED38 0021BC78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021ED3C 0021BC7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021ED38 0021BC78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021ED3C 0021BC7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021ED40 0021BC80 88 03 00 14 */ lbz r0, 0x14(r3) /* 8021ED44 0021BC84 98 1F 01 E2 */ stb r0, 0x1e2(r31) /* 8021ED48 0021BC88 98 9F 01 E3 */ stb r4, 0x1e3(r31) @@ -251,8 +251,8 @@ lbl_8021ED98: /* 8021EDB8 0021BCF8 38 60 00 01 */ li r3, 1 /* 8021EDBC 0021BCFC 4B E0 F1 61 */ bl dComIfGp_getSelectItem /* 8021EDC0 0021BD00 98 7F 01 D4 */ stb r3, 0x1d4(r31) -/* 8021EDC4 0021BD04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EDC8 0021BD08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021EDC4 0021BD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EDC8 0021BD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021EDCC 0021BD0C 88 03 5E 5C */ lbz r0, 0x5e5c(r3) /* 8021EDD0 0021BD10 98 1F 01 D3 */ stb r0, 0x1d3(r31) /* 8021EDD4 0021BD14 88 03 5E 60 */ lbz r0, 0x5e60(r3) @@ -291,8 +291,8 @@ lbl_8021EE40: /* 8021EE50 0021BD90 42 00 FF F0 */ bdnz lbl_8021EE40 /* 8021EE54 0021BD94 38 80 00 00 */ li r4, 0 /* 8021EE58 0021BD98 B0 9F 01 90 */ sth r4, 0x190(r31) -/* 8021EE5C 0021BD9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021EE60 0021BDA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021EE5C 0021BD9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021EE60 0021BDA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021EE64 0021BDA4 88 03 5E 33 */ lbz r0, 0x5e33(r3) /* 8021EE68 0021BDA8 98 1F 01 C9 */ stb r0, 0x1c9(r31) /* 8021EE6C 0021BDAC 88 03 5E 26 */ lbz r0, 0x5e26(r3) @@ -496,16 +496,16 @@ dMeter2_c_NS__execute: /* 8021F140 0021C080 80 63 01 00 */ lwz r3, 0x100(r3) /* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap /* 8021F148 0021C088 7C 7F 1B 78 */ mr r31, r3 -/* 8021F14C 0021C08C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F150 0021C090 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F14C 0021C08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F150 0021C090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F154 0021C094 3B C3 01 00 */ addi r30, r3, 0x100 /* 8021F158 0021C098 7F C3 F3 78 */ mr r3, r30 /* 8021F15C 0021C09C 38 80 00 00 */ li r4, 0 /* 8021F160 0021C0A0 4B E1 51 31 */ bl isCollectMirror__20dSv_player_collect_cCFUc /* 8021F164 0021C0A4 2C 03 00 00 */ cmpwi r3, 0 /* 8021F168 0021C0A8 40 82 00 2C */ bne lbl_8021F194 -/* 8021F16C 0021C0AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F170 0021C0B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F16C 0021C0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F170 0021C0B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F174 0021C0B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8021F178 0021C0B8 38 80 54 20 */ li r4, 0x5420 /* 8021F17C 0021C0BC 4B E1 58 41 */ bl isEventBit__11dSv_event_cCFUs @@ -520,8 +520,8 @@ lbl_8021F194: /* 8021F19C 0021C0DC 4B E1 50 B1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc /* 8021F1A0 0021C0E0 2C 03 00 00 */ cmpwi r3, 0 /* 8021F1A4 0021C0E4 40 82 00 2C */ bne lbl_8021F1D0 -/* 8021F1A8 0021C0E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F1AC 0021C0EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F1A8 0021C0E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F1AC 0021C0EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F1B0 0021C0F0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8021F1B4 0021C0F4 38 80 54 10 */ li r4, 0x5410 /* 8021F1B8 0021C0F8 4B E1 58 05 */ bl isEventBit__11dSv_event_cCFUs @@ -590,8 +590,8 @@ lbl_8021F2A4: /* 8021F2A8 0021C1E8 48 00 3E 55 */ bl dMeter2_c_NS_moveSubContents /* 8021F2AC 0021C1EC 7F A3 EB 78 */ mr r3, r29 /* 8021F2B0 0021C1F0 48 00 3F 19 */ bl dMeter2_c_NS_move2DContents -/* 8021F2B4 0021C1F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F2B8 0021C1F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F2B4 0021C1F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F2B8 0021C1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F2BC 0021C1FC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8021F2C0 0021C200 28 00 00 00 */ cmplwi r0, 0 /* 8021F2C4 0021C204 40 82 00 1C */ bne lbl_8021F2E0 @@ -612,8 +612,8 @@ lbl_8021F2E0: /* 8021F2FC 0021C23C B0 03 00 AE */ sth r0, 0xae(r3) /* 8021F300 0021C240 38 00 00 00 */ li r0, 0 /* 8021F304 0021C244 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 8021F308 0021C248 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F30C 0021C24C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F308 0021C248 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F30C 0021C24C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F310 0021C250 98 03 5E 1F */ stb r0, 0x5e1f(r3) /* 8021F314 0021C254 98 03 5E 28 */ stb r0, 0x5e28(r3) /* 8021F318 0021C258 98 03 5E 45 */ stb r0, 0x5e45(r3) @@ -654,8 +654,8 @@ lbl_8021F394: /* 8021F394 0021C2D4 80 DF 01 10 */ lwz r6, 0x110(r31) /* 8021F398 0021C2D8 28 06 00 00 */ cmplwi r6, 0 /* 8021F39C 0021C2DC 41 82 00 1C */ beq lbl_8021F3B8 -/* 8021F3A0 0021C2E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F3A4 0021C2E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F3A0 0021C2E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F3A4 0021C2E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F3A8 0021C2E8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3AC 0021C2EC 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3B0 0021C2F0 38 A3 00 B0 */ addi r5, r3, 0xb0 @@ -670,16 +670,16 @@ lbl_8021F3B8: /* 8021F3D0 0021C310 A0 1F 01 B6 */ lhz r0, 0x1b6(r31) /* 8021F3D4 0021C314 28 00 00 00 */ cmplwi r0, 0 /* 8021F3D8 0021C318 41 82 00 38 */ beq lbl_8021F410 -/* 8021F3DC 0021C31C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F3E0 0021C320 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F3DC 0021C31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F3E0 0021C320 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F3E4 0021C324 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3E8 0021C328 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3EC 0021C32C 38 A3 00 B0 */ addi r5, r3, 0xb0 /* 8021F3F0 0021C330 4B E3 73 A5 */ bl dDlst_list_c_NS_set /* 8021F3F4 0021C334 48 00 00 1C */ b lbl_8021F410 lbl_8021F3F8: -/* 8021F3F8 0021C338 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F3FC 0021C33C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F3F8 0021C338 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F3FC 0021C33C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F400 0021C340 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F404 0021C344 38 83 00 AC */ addi r4, r3, 0xac /* 8021F408 0021C348 38 A3 00 B0 */ addi r5, r3, 0xb0 @@ -690,8 +690,8 @@ lbl_8021F410: /* 8021F418 0021C358 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 8021F41C 0021C35C 28 00 00 02 */ cmplwi r0, 2 /* 8021F420 0021C360 40 82 00 24 */ bne lbl_8021F444 -/* 8021F424 0021C364 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F428 0021C368 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F424 0021C364 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F428 0021C368 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F42C 0021C36C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F430 0021C370 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8021F434 0021C374 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -699,8 +699,8 @@ lbl_8021F410: /* 8021F43C 0021C37C 4B E3 73 59 */ bl dDlst_list_c_NS_set /* 8021F440 0021C380 48 00 00 20 */ b lbl_8021F460 lbl_8021F444: -/* 8021F444 0021C384 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F448 0021C388 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F444 0021C384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F448 0021C388 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F44C 0021C38C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F450 0021C390 38 83 00 AC */ addi r4, r3, 0xac /* 8021F454 0021C394 38 A3 00 B0 */ addi r5, r3, 0xb0 @@ -710,8 +710,8 @@ lbl_8021F460: /* 8021F460 0021C3A0 80 DF 01 18 */ lwz r6, 0x118(r31) /* 8021F464 0021C3A4 28 06 00 00 */ cmplwi r6, 0 /* 8021F468 0021C3A8 41 82 00 1C */ beq lbl_8021F484 -/* 8021F46C 0021C3AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F470 0021C3B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F46C 0021C3AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F470 0021C3B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F474 0021C3B4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F478 0021C3B8 38 83 00 AC */ addi r4, r3, 0xac /* 8021F47C 0021C3BC 38 A3 00 B0 */ addi r5, r3, 0xb0 @@ -930,8 +930,8 @@ lbl_8021F764: /* 8021F778 0021C6B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8021F77C 0021C6BC 4E 80 00 20 */ blr /* 8021F780 0021C6C0 38 00 00 01 */ li r0, 1 -/* 8021F784 0021C6C4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8021F788 0021C6C8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8021F784 0021C6C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8021F788 0021C6C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021F78C 0021C6CC B0 04 00 02 */ sth r0, 2(r4) /* 8021F790 0021C6D0 B0 03 01 92 */ sth r0, 0x192(r3) /* 8021F794 0021C6D4 C0 24 5D C0 */ lfs f1, 0x5dc0(r4) @@ -954,8 +954,8 @@ dMeter2_c_NS_checkStatus: /* 8021F7CC 0021C70C 90 03 01 24 */ stw r0, 0x124(r3) /* 8021F7D0 0021C710 80 03 01 28 */ lwz r0, 0x128(r3) /* 8021F7D4 0021C714 90 03 01 2C */ stw r0, 0x12c(r3) -/* 8021F7D8 0021C718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F7DC 0021C71C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021F7D8 0021C718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F7DC 0021C71C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021F7E0 0021C720 80 64 5D B4 */ lwz r3, 0x5db4(r4) /* 8021F7E4 0021C724 80 03 05 74 */ lwz r0, 0x574(r3) /* 8021F7E8 0021C728 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 @@ -973,8 +973,8 @@ lbl_8021F80C: /* 8021F814 0021C754 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021F818 0021C758 48 00 00 C4 */ b lbl_8021F8DC lbl_8021F81C: -/* 8021F81C 0021C75C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F820 0021C760 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F81C 0021C75C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F820 0021C760 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F824 0021C764 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 8021F828 0021C768 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8021F82C 0021C76C 41 82 00 20 */ beq lbl_8021F84C @@ -986,8 +986,8 @@ lbl_8021F81C: /* 8021F844 0021C784 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021F848 0021C788 48 00 00 94 */ b lbl_8021F8DC lbl_8021F84C: -/* 8021F84C 0021C78C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F850 0021C790 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F84C 0021C78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F850 0021C790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F854 0021C794 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8021F858 0021C798 28 00 00 00 */ cmplwi r0, 0 /* 8021F85C 0021C79C 41 82 00 80 */ beq lbl_8021F8DC @@ -1016,15 +1016,15 @@ lbl_8021F84C: /* 8021F8B8 0021C7F8 60 00 01 00 */ ori r0, r0, 0x100 /* 8021F8BC 0021C7FC 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021F8C0 0021C800 38 00 00 00 */ li r0, 0 -/* 8021F8C4 0021C804 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F8C8 0021C808 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F8C4 0021C804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F8C8 0021C808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F8CC 0021C80C 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021F8D0 0021C810 98 03 5E 43 */ stb r0, 0x5e43(r3) /* 8021F8D4 0021C814 98 03 5E 1C */ stb r0, 0x5e1c(r3) /* 8021F8D8 0021C818 98 03 5E 42 */ stb r0, 0x5e42(r3) lbl_8021F8DC: -/* 8021F8DC 0021C81C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F8E0 0021C820 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F8DC 0021C81C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F8E0 0021C820 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F8E4 0021C824 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 8021F8E8 0021C828 28 00 00 06 */ cmplwi r0, 6 /* 8021F8EC 0021C82C 41 82 00 68 */ beq lbl_8021F954 @@ -1047,15 +1047,15 @@ lbl_8021F8DC: /* 8021F930 0021C870 60 00 01 00 */ ori r0, r0, 0x100 /* 8021F934 0021C874 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021F938 0021C878 38 00 00 00 */ li r0, 0 -/* 8021F93C 0021C87C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F940 0021C880 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F93C 0021C87C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F940 0021C880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F944 0021C884 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021F948 0021C888 98 03 5E 43 */ stb r0, 0x5e43(r3) /* 8021F94C 0021C88C 98 03 5E 1C */ stb r0, 0x5e1c(r3) /* 8021F950 0021C890 98 03 5E 42 */ stb r0, 0x5e42(r3) lbl_8021F954: -/* 8021F954 0021C894 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F958 0021C898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F954 0021C894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F958 0021C898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F95C 0021C89C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8021F960 0021C8A0 28 00 00 00 */ cmplwi r0, 0 /* 8021F964 0021C8A4 40 82 02 1C */ bne lbl_8021FB80 @@ -1084,8 +1084,8 @@ lbl_8021F9A4: /* 8021F9B8 0021C8F8 64 00 00 10 */ oris r0, r0, 0x10 /* 8021F9BC 0021C8FC 90 1F 01 24 */ stw r0, 0x124(r31) lbl_8021F9C0: -/* 8021F9C0 0021C900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021F9C4 0021C904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021F9C0 0021C900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021F9C4 0021C904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F9C8 0021C908 38 83 5D 7C */ addi r4, r3, 0x5d7c /* 8021F9CC 0021C90C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 8021F9D0 0021C910 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd @@ -1106,8 +1106,8 @@ lbl_8021F9F4: /* 8021FA08 0021C948 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FA0C 0021C94C 48 00 01 74 */ b lbl_8021FB80 lbl_8021FA10: -/* 8021FA10 0021C950 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FA14 0021C954 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FA10 0021C950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FA14 0021C954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FA18 0021C958 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 8021FA1C 0021C95C 7C 00 07 74 */ extsb r0, r0 /* 8021FA20 0021C960 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -1125,8 +1125,8 @@ lbl_8021FA10: /* 8021FA50 0021C990 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FA54 0021C994 48 00 01 2C */ b lbl_8021FB80 lbl_8021FA58: -/* 8021FA58 0021C998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FA5C 0021C99C 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8021FA58 0021C998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FA5C 0021C99C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8021FA60 0021C9A0 80 7D 5D AC */ lwz r3, 0x5dac(r29) /* 8021FA64 0021C9A4 81 83 06 28 */ lwz r12, 0x628(r3) /* 8021FA68 0021C9A8 81 8C 01 90 */ lwz r12, 0x190(r12) @@ -1139,8 +1139,8 @@ lbl_8021FA58: /* 8021FA84 0021C9C4 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FA88 0021C9C8 48 00 00 F8 */ b lbl_8021FB80 lbl_8021FA8C: -/* 8021FA8C 0021C9CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FA90 0021C9D0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8021FA8C 0021C9CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FA90 0021C9D0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8021FA94 0021C9D4 80 1E 5F 18 */ lwz r0, 0x5f18(r30) /* 8021FA98 0021C9D8 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 8021FA9C 0021C9DC 40 82 00 20 */ bne lbl_8021FABC @@ -1195,8 +1195,8 @@ lbl_8021FB38: /* 8021FB48 0021CA88 4E 80 04 21 */ bctrl /* 8021FB4C 0021CA8C 2C 03 00 00 */ cmpwi r3, 0 /* 8021FB50 0021CA90 41 82 00 30 */ beq lbl_8021FB80 -/* 8021FB54 0021CA94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FB58 0021CA98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FB54 0021CA94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FB58 0021CA98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FB5C 0021CA9C 80 63 5D B8 */ lwz r3, 0x5db8(r3) /* 8021FB60 0021CAA0 28 03 00 00 */ cmplwi r3, 0 /* 8021FB64 0021CAA4 41 82 00 1C */ beq lbl_8021FB80 @@ -1230,8 +1230,8 @@ lbl_8021FB80: /* 8021FBD0 0021CB10 64 00 01 00 */ oris r0, r0, 0x100 /* 8021FBD4 0021CB14 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FBD8 0021CB18 38 00 00 12 */ li r0, 0x12 -/* 8021FBDC 0021CB1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FBE0 0021CB20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FBDC 0021CB1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FBE0 0021CB20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FBE4 0021CB24 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021FBE8 0021CB28 38 00 00 00 */ li r0, 0 /* 8021FBEC 0021CB2C 98 03 5E 43 */ stb r0, 0x5e43(r3) @@ -1244,8 +1244,8 @@ lbl_8021FB80: /* 8021FC08 0021CB48 60 00 00 20 */ ori r0, r0, 0x20 /* 8021FC0C 0021CB4C 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FC10 0021CB50 38 00 00 12 */ li r0, 0x12 -/* 8021FC14 0021CB54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FC18 0021CB58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FC14 0021CB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FC18 0021CB58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FC1C 0021CB5C 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021FC20 0021CB60 38 00 00 00 */ li r0, 0 /* 8021FC24 0021CB64 98 03 5E 43 */ stb r0, 0x5e43(r3) @@ -1258,8 +1258,8 @@ lbl_8021FB80: /* 8021FC40 0021CB80 64 00 04 00 */ oris r0, r0, 0x400 /* 8021FC44 0021CB84 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FC48 0021CB88 38 00 00 12 */ li r0, 0x12 -/* 8021FC4C 0021CB8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FC50 0021CB90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FC4C 0021CB8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FC50 0021CB90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FC54 0021CB94 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021FC58 0021CB98 38 00 00 00 */ li r0, 0 /* 8021FC5C 0021CB9C 98 03 5E 43 */ stb r0, 0x5e43(r3) @@ -1272,8 +1272,8 @@ lbl_8021FB80: /* 8021FC78 0021CBB8 64 00 08 00 */ oris r0, r0, 0x800 /* 8021FC7C 0021CBBC 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FC80 0021CBC0 38 00 00 12 */ li r0, 0x12 -/* 8021FC84 0021CBC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FC88 0021CBC8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021FC84 0021CBC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FC88 0021CBC8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021FC8C 0021CBCC 98 04 5E 1D */ stb r0, 0x5e1d(r4) /* 8021FC90 0021CBD0 38 60 00 00 */ li r3, 0 /* 8021FC94 0021CBD4 98 64 5E 43 */ stb r3, 0x5e43(r4) @@ -1287,8 +1287,8 @@ lbl_8021FB80: /* 8021FCB4 0021CBF4 64 00 10 00 */ oris r0, r0, 0x1000 /* 8021FCB8 0021CBF8 90 1F 01 24 */ stw r0, 0x124(r31) /* 8021FCBC 0021CBFC 38 00 00 00 */ li r0, 0 -/* 8021FCC0 0021CC00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FCC4 0021CC04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FCC0 0021CC00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FCC4 0021CC04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FCC8 0021CC08 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 8021FCCC 0021CC0C 98 03 5E 43 */ stb r0, 0x5e43(r3) /* 8021FCD0 0021CC10 98 03 5E 24 */ stb r0, 0x5e24(r3) @@ -1296,8 +1296,8 @@ lbl_8021FB80: /* 8021FCD8 0021CC18 98 03 5E 1C */ stb r0, 0x5e1c(r3) /* 8021FCDC 0021CC1C 98 03 5E 42 */ stb r0, 0x5e42(r3) lbl_8021FCE0: -/* 8021FCE0 0021CC20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FCE4 0021CC24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FCE0 0021CC20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FCE4 0021CC24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FCE8 0021CC28 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8021FCEC 0021CC2C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8021FCF0 0021CC30 7D 89 03 A6 */ mtctr r12 @@ -1344,8 +1344,8 @@ dMeter2_c_NS_moveLife: /* 8021FD74 0021CCB4 7C 7E 1B 78 */ mr r30, r3 /* 8021FD78 0021CCB8 38 C0 00 00 */ li r6, 0 /* 8021FD7C 0021CCBC 38 00 00 00 */ li r0, 0 -/* 8021FD80 0021CCC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FD84 0021CCC4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021FD80 0021CCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FD84 0021CCC4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021FD88 0021CCC8 A8 A4 5D CA */ lha r5, 0x5dca(r4) /* 8021FD8C 0021CCCC 7C A3 07 35 */ extsh. r3, r5 /* 8021FD90 0021CCD0 41 82 00 90 */ beq lbl_8021FE20 @@ -1367,8 +1367,8 @@ lbl_8021FDBC: /* 8021FDC8 0021CD08 54 00 10 3A */ slwi r0, r0, 2 /* 8021FDCC 0021CD0C 7C 06 07 34 */ extsh r6, r0 /* 8021FDD0 0021CD10 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 8021FDD4 0021CD14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FDD8 0021CD18 B4 03 61 C0 */ sthu r0, lbl_804061C0@l(r3) +/* 8021FDD4 0021CD14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FDD8 0021CD18 B4 03 61 C0 */ sthu r0, g_dComIfG_gameInfo@l(r3) /* 8021FDDC 0021CD1C A0 03 00 02 */ lhz r0, 2(r3) /* 8021FDE0 0021CD20 C0 43 5D C0 */ lfs f2, 0x5dc0(r3) /* 8021FDE4 0021CD24 7C 00 30 50 */ subf r0, r0, r6 @@ -1387,8 +1387,8 @@ lbl_8021FDBC: /* 8021FE18 0021CD58 B0 04 5D CA */ sth r0, 0x5dca(r4) /* 8021FE1C 0021CD5C 38 00 00 01 */ li r0, 1 lbl_8021FE20: -/* 8021FE20 0021CD60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FE24 0021CD64 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8021FE20 0021CD60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FE24 0021CD64 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8021FE28 0021CD68 C0 25 5D C0 */ lfs f1, 0x5dc0(r5) /* 8021FE2C 0021CD6C C0 02 AF C8 */ lfs f0, lbl_804549C8-_SDA2_BASE_(r2) /* 8021FE30 0021CD70 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -1403,8 +1403,8 @@ lbl_8021FE20: /* 8021FE54 0021CD94 54 00 10 3A */ slwi r0, r0, 2 /* 8021FE58 0021CD98 7C 06 07 34 */ extsh r6, r0 lbl_8021FE5C: -/* 8021FE5C 0021CD9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FE60 0021CDA0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021FE5C 0021CD9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FE60 0021CDA0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021FE64 0021CDA4 A0 04 00 02 */ lhz r0, 2(r4) /* 8021FE68 0021CDA8 C8 22 AF E0 */ lfd f1, lbl_804549E0-_SDA2_BASE_(r2) /* 8021FE6C 0021CDAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1445,8 +1445,8 @@ lbl_8021FEB8: lbl_8021FEF0: /* 8021FEF0 0021CE30 38 00 00 01 */ li r0, 1 lbl_8021FEF4: -/* 8021FEF4 0021CE34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FEF8 0021CE38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021FEF4 0021CE34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FEF8 0021CE38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021FEFC 0021CE3C A0 63 00 00 */ lhz r3, 0(r3) /* 8021FF00 0021CE40 A8 9E 01 94 */ lha r4, 0x194(r30) /* 8021FF04 0021CE44 7C 04 18 00 */ cmpw r4, r3 @@ -1466,8 +1466,8 @@ lbl_8021FF30: /* 8021FF38 0021CE78 B0 1E 01 94 */ sth r0, 0x194(r30) /* 8021FF3C 0021CE7C 38 00 00 01 */ li r0, 1 lbl_8021FF40: -/* 8021FF40 0021CE80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021FF44 0021CE84 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8021FF40 0021CE80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021FF44 0021CE84 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8021FF48 0021CE88 A0 7F 00 02 */ lhz r3, 2(r31) /* 8021FF4C 0021CE8C A8 9E 01 92 */ lha r4, 0x192(r30) /* 8021FF50 0021CE90 7C 04 18 00 */ cmpw r4, r3 @@ -1615,8 +1615,8 @@ lbl_8022014C: /* 80220150 0021D090 48 00 47 95 */ bl dMeter2_c_NS_alphaAnimeLife /* 80220154 0021D094 A8 1E 01 92 */ lha r0, 0x192(r30) /* 80220158 0021D098 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8022015C 0021D09C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220160 0021D0A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022015C 0021D09C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220160 0021D0A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80220164 0021D0A4 B0 03 5E 16 */ sth r0, 0x5e16(r3) /* 80220168 0021D0A8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022016C 0021D0AC 83 C1 00 28 */ lwz r30, 0x28(r1) @@ -1632,8 +1632,8 @@ dMeter2_c_NS_moveKantera: /* 80220188 0021D0C8 90 01 00 34 */ stw r0, 0x34(r1) /* 8022018C 0021D0CC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80220190 0021D0D0 7C 7F 1B 78 */ mr r31, r3 -/* 80220194 0021D0D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220198 0021D0D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80220194 0021D0D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220198 0021D0D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022019C 0021D0DC A0 83 00 06 */ lhz r4, 6(r3) /* 802201A0 0021D0E0 38 E0 00 00 */ li r7, 0 /* 802201A4 0021D0E4 39 00 00 00 */ li r8, 0 @@ -1651,8 +1651,8 @@ lbl_802201C8: /* 802201D0 0021D110 38 E0 00 00 */ li r7, 0 lbl_802201D4: /* 802201D4 0021D114 B0 E3 00 06 */ sth r7, 6(r3) -/* 802201D8 0021D118 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802201DC 0021D11C 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 802201D8 0021D118 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802201DC 0021D11C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 802201E0 0021D120 A0 05 00 08 */ lhz r0, 8(r5) /* 802201E4 0021D124 80 85 5D D4 */ lwz r4, 0x5dd4(r5) /* 802201E8 0021D128 7C 00 38 50 */ subf r0, r0, r7 @@ -1662,8 +1662,8 @@ lbl_802201D4: /* 802201F8 0021D138 90 03 5D DC */ stw r0, 0x5ddc(r3) /* 802201FC 0021D13C 39 00 00 01 */ li r8, 1 lbl_80220200: -/* 80220200 0021D140 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80220204 0021D144 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 80220200 0021D140 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80220204 0021D144 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 80220208 0021D148 80 C5 5D D4 */ lwz r6, 0x5dd4(r5) /* 8022020C 0021D14C 2C 06 00 00 */ cmpwi r6, 0 /* 80220210 0021D150 41 82 00 4C */ beq lbl_8022025C @@ -1671,8 +1671,8 @@ lbl_80220200: /* 80220218 0021D158 40 82 00 08 */ bne lbl_80220220 /* 8022021C 0021D15C A0 E3 00 06 */ lhz r7, 6(r3) lbl_80220220: -/* 80220220 0021D160 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80220224 0021D164 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80220220 0021D160 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80220224 0021D164 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80220228 0021D168 A0 04 00 08 */ lhz r0, 8(r4) /* 8022022C 0021D16C 7C 00 32 14 */ add r0, r0, r6 /* 80220230 0021D170 7C 00 38 00 */ cmpw r0, r7 @@ -1716,8 +1716,8 @@ lbl_80220294: lbl_802202B4: /* 802202B4 0021D1F4 39 00 00 01 */ li r8, 1 lbl_802202B8: -/* 802202B8 0021D1F8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802202BC 0021D1FC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 802202B8 0021D1F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802202BC 0021D1FC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 802202C0 0021D200 A0 05 00 08 */ lhz r0, 8(r5) /* 802202C4 0021D204 80 9F 01 9C */ lwz r4, 0x19c(r31) /* 802202C8 0021D208 7C 04 00 00 */ cmpw r4, r0 @@ -1731,8 +1731,8 @@ lbl_802202B8: /* 802202E8 0021D228 40 81 00 08 */ ble lbl_802202F0 /* 802202EC 0021D22C 90 1F 01 9C */ stw r0, 0x19c(r31) lbl_802202F0: -/* 802202F0 0021D230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802202F4 0021D234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802202F0 0021D230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802202F4 0021D234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802202F8 0021D238 88 03 5E B7 */ lbz r0, 0x5eb7(r3) /* 802202FC 0021D23C 28 00 00 00 */ cmplwi r0, 0 /* 80220300 0021D240 40 82 00 4C */ bne lbl_8022034C @@ -1873,8 +1873,8 @@ lbl_802204F0: /* 802204F0 0021D430 7F E3 FB 78 */ mr r3, r31 /* 802204F4 0021D434 48 00 45 11 */ bl dMeter2_c_NS_alphaAnimeKantera /* 802204F8 0021D438 80 1F 01 9C */ lwz r0, 0x19c(r31) -/* 802204FC 0021D43C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220500 0021D440 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802204FC 0021D43C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220500 0021D440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80220504 0021D444 90 03 5D D8 */ stw r0, 0x5dd8(r3) /* 80220508 0021D448 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022050C 0021D44C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1890,8 +1890,8 @@ dMeter2_c_NS_moveOxygen: /* 80220528 0021D468 39 61 00 40 */ addi r11, r1, 0x40 /* 8022052C 0021D46C 48 14 1C A9 */ bl _savegpr_27 /* 80220530 0021D470 7C 7E 1B 78 */ mr r30, r3 -/* 80220534 0021D474 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220538 0021D478 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80220534 0021D474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220538 0021D478 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8022053C 0021D47C 80 7F 5D E8 */ lwz r3, 0x5de8(r31) /* 80220540 0021D480 38 C0 00 00 */ li r6, 0 /* 80220544 0021D484 38 A0 00 00 */ li r5, 0 @@ -1910,8 +1910,8 @@ lbl_80220568: lbl_80220574: /* 80220574 0021D4B4 54 C0 04 3E */ clrlwi r0, r6, 0x10 /* 80220578 0021D4B8 90 1F 5D E8 */ stw r0, 0x5de8(r31) -/* 8022057C 0021D4BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220580 0021D4C0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8022057C 0021D4BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220580 0021D4C0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80220584 0021D4C4 80 64 5D EC */ lwz r3, 0x5dec(r4) /* 80220588 0021D4C8 80 04 5D E0 */ lwz r0, 0x5de0(r4) /* 8022058C 0021D4CC 7C 00 30 50 */ subf r0, r0, r6 @@ -1921,8 +1921,8 @@ lbl_80220574: /* 8022059C 0021D4DC 90 1F 5D F0 */ stw r0, 0x5df0(r31) /* 802205A0 0021D4E0 38 A0 00 01 */ li r5, 1 lbl_802205A4: -/* 802205A4 0021D4E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802205A8 0021D4E8 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 802205A4 0021D4E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802205A8 0021D4E8 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 802205AC 0021D4EC 80 9C 5D EC */ lwz r4, 0x5dec(r28) /* 802205B0 0021D4F0 2C 04 00 00 */ cmpwi r4, 0 /* 802205B4 0021D4F4 41 82 00 C0 */ beq lbl_80220674 @@ -1930,8 +1930,8 @@ lbl_802205A4: /* 802205BC 0021D4FC 40 82 00 08 */ bne lbl_802205C4 /* 802205C0 0021D500 80 DF 5D E8 */ lwz r6, 0x5de8(r31) lbl_802205C4: -/* 802205C4 0021D504 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802205C8 0021D508 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 802205C4 0021D504 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802205C8 0021D508 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 802205CC 0021D50C 80 BD 5D E0 */ lwz r5, 0x5de0(r29) /* 802205D0 0021D510 7F 65 22 14 */ add r27, r5, r4 /* 802205D4 0021D514 7C 1B 30 00 */ cmpw r27, r6 @@ -1943,8 +1943,8 @@ lbl_802205E4: /* 802205E8 0021D528 40 80 00 08 */ bge lbl_802205F0 /* 802205EC 0021D52C 3B 60 00 00 */ li r27, 0 lbl_802205F0: -/* 802205F0 0021D530 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802205F4 0021D534 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802205F0 0021D530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802205F4 0021D534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802205F8 0021D538 88 03 5E B7 */ lbz r0, 0x5eb7(r3) /* 802205FC 0021D53C 28 00 00 00 */ cmplwi r0, 0 /* 80220600 0021D540 41 82 00 60 */ beq lbl_80220660 @@ -2006,8 +2006,8 @@ lbl_802206CC: /* 802206CC 0021D60C 38 A0 00 01 */ li r5, 1 lbl_802206D0: /* 802206D0 0021D610 80 9E 01 A4 */ lwz r4, 0x1a4(r30) -/* 802206D4 0021D614 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802206D8 0021D618 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802206D4 0021D614 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802206D8 0021D618 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802206DC 0021D61C 80 03 5D E0 */ lwz r0, 0x5de0(r3) /* 802206E0 0021D620 7C 04 00 00 */ cmpw r4, r0 /* 802206E4 0021D624 41 82 00 E0 */ beq lbl_802207C4 @@ -2116,8 +2116,8 @@ lbl_80220858: /* 80220858 0021D798 7F C3 F3 78 */ mr r3, r30 /* 8022085C 0021D79C 48 00 43 51 */ bl dMeter2_c_NS_alphaAnimeOxygen /* 80220860 0021D7A0 80 1E 01 A4 */ lwz r0, 0x1a4(r30) -/* 80220864 0021D7A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80220864 0021D7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022086C 0021D7AC 90 03 5D E4 */ stw r0, 0x5de4(r3) /* 80220870 0021D7B0 39 61 00 40 */ addi r11, r1, 0x40 /* 80220874 0021D7B4 48 14 19 AD */ bl _restgpr_27 @@ -2149,21 +2149,21 @@ dMeter2_c_NS_moveLightDrop: /* 802208D0 0021D810 88 03 0F 24 */ lbz r0, 0xf24(r3) /* 802208D4 0021D814 28 00 00 00 */ cmplwi r0, 0 /* 802208D8 0021D818 41 82 00 34 */ beq lbl_8022090C -/* 802208DC 0021D81C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802208E0 0021D820 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802208DC 0021D81C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802208E0 0021D820 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802208E4 0021D824 38 64 01 14 */ addi r3, r4, 0x114 /* 802208E8 0021D828 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 802208EC 0021D82C 4B E1 3A 55 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 802208F0 0021D830 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802208F4 0021D834 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802208F0 0021D830 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802208F4 0021D834 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802208F8 0021D838 88 84 5E A1 */ lbz r4, 0x5ea1(r4) /* 802208FC 0021D83C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80220900 0021D840 7C 04 00 40 */ cmplw r4, r0 /* 80220904 0021D844 40 82 00 08 */ bne lbl_8022090C /* 80220908 0021D848 3B 80 00 02 */ li r28, 2 lbl_8022090C: -/* 8022090C 0021D84C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220910 0021D850 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8022090C 0021D84C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220910 0021D850 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80220914 0021D854 3B DF 01 14 */ addi r30, r31, 0x114 /* 80220918 0021D858 7F C3 F3 78 */ mr r3, r30 /* 8022091C 0021D85C 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) @@ -2175,8 +2175,8 @@ lbl_8022090C: /* 80220934 0021D874 7F C3 F3 78 */ mr r3, r30 /* 80220938 0021D878 88 9F 4E 0C */ lbz r4, 0x4e0c(r31) /* 8022093C 0021D87C 4B E1 3A 05 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 80220940 0021D880 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80220944 0021D884 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80220940 0021D880 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80220944 0021D884 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80220948 0021D888 88 84 5E A1 */ lbz r4, 0x5ea1(r4) /* 8022094C 0021D88C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80220950 0021D890 7C 04 00 40 */ cmplw r4, r0 @@ -2226,8 +2226,8 @@ lbl_802209E8: /* 802209F8 0021D938 3B A0 00 01 */ li r29, 1 lbl_802209FC: /* 802209FC 0021D93C 88 1B 01 C3 */ lbz r0, 0x1c3(r27) -/* 80220A00 0021D940 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220A04 0021D944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80220A00 0021D940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220A04 0021D944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80220A08 0021D948 88 63 5E A1 */ lbz r3, 0x5ea1(r3) /* 80220A0C 0021D94C 7C 00 18 40 */ cmplw r0, r3 /* 80220A10 0021D950 41 82 00 0C */ beq lbl_80220A1C @@ -2237,8 +2237,8 @@ lbl_80220A1C: /* 80220A1C 0021D95C 80 1B 01 24 */ lwz r0, 0x124(r27) /* 80220A20 0021D960 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80220A24 0021D964 40 82 00 58 */ bne lbl_80220A7C -/* 80220A28 0021D968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220A2C 0021D96C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80220A28 0021D968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220A2C 0021D96C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80220A30 0021D970 80 7E 5D AC */ lwz r3, 0x5dac(r30) /* 80220A34 0021D974 81 83 06 28 */ lwz r12, 0x628(r3) /* 80220A38 0021D978 81 8C 00 78 */ lwz r12, 0x78(r12) @@ -2384,13 +2384,13 @@ dMeter2_c_NS_moveRupee: /* 80220C3C 0021DB7C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80220C40 0021DB80 93 C1 00 18 */ stw r30, 0x18(r1) /* 80220C44 0021DB84 7C 7E 1B 78 */ mr r30, r3 -/* 80220C48 0021DB88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220C4C 0021DB8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80220C48 0021DB88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220C4C 0021DB8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80220C50 0021DB90 4B E1 1E 59 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 80220C54 0021DB94 7C 65 07 34 */ extsh r5, r3 /* 80220C58 0021DB98 3B E0 00 00 */ li r31, 0 -/* 80220C5C 0021DB9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220C60 0021DBA0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80220C5C 0021DB9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220C60 0021DBA0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80220C64 0021DBA4 80 64 5D C4 */ lwz r3, 0x5dc4(r4) /* 80220C68 0021DBA8 2C 03 00 00 */ cmpwi r3, 0 /* 80220C6C 0021DBAC 41 82 00 B0 */ beq lbl_80220D1C @@ -2441,8 +2441,8 @@ lbl_80220CE8: /* 80220D14 0021DC54 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 80220D18 0021DC58 98 1E 01 EA */ stb r0, 0x1ea(r30) lbl_80220D1C: -/* 80220D1C 0021DC5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80220D20 0021DC60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80220D1C 0021DC5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80220D20 0021DC60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80220D24 0021DC64 A0 03 00 04 */ lhz r0, 4(r3) /* 80220D28 0021DC68 A8 9E 01 B0 */ lha r4, 0x1b0(r30) /* 80220D2C 0021DC6C 7C 04 00 00 */ cmpw r4, r0 @@ -2664,8 +2664,8 @@ lbl_80221030: /* 80221048 0021DF88 D0 3E 02 94 */ stfs f1, 0x294(r30) /* 8022104C 0021DF8C 3B E0 00 01 */ li r31, 1 lbl_80221050: -/* 80221050 0021DF90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221054 0021DF94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221050 0021DF90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221054 0021DF94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221058 0021DF98 88 83 00 19 */ lbz r4, 0x19(r3) /* 8022105C 0021DF9C 88 7E 02 98 */ lbz r3, 0x298(r30) /* 80221060 0021DFA0 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -2698,8 +2698,8 @@ dMeter2_c_NS_moveKey: /* 802210B8 0021DFF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802210BC 0021DFFC 7C 7F 1B 78 */ mr r31, r3 /* 802210C0 0021E000 38 C0 00 00 */ li r6, 0 -/* 802210C4 0021E004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802210C8 0021E008 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802210C4 0021E004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802210C8 0021E008 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802210CC 0021E00C A8 64 5D C8 */ lha r3, 0x5dc8(r4) /* 802210D0 0021E010 7C 60 07 35 */ extsh. r0, r3 /* 802210D4 0021E014 41 82 00 40 */ beq lbl_80221114 @@ -2715,15 +2715,15 @@ lbl_802210F4: /* 802210F8 0021E038 40 80 00 08 */ bge lbl_80221100 /* 802210FC 0021E03C 38 A0 00 00 */ li r5, 0 lbl_80221100: -/* 80221100 0021E040 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221104 0021E044 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221100 0021E040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221104 0021E044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221108 0021E048 98 A3 09 74 */ stb r5, 0x974(r3) /* 8022110C 0021E04C 38 00 00 00 */ li r0, 0 /* 80221110 0021E050 B0 04 5D C8 */ sth r0, 0x5dc8(r4) lbl_80221114: /* 80221114 0021E054 A8 9F 01 B2 */ lha r4, 0x1b2(r31) -/* 80221118 0021E058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022111C 0021E05C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221118 0021E058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022111C 0021E05C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221120 0021E060 88 03 09 74 */ lbz r0, 0x974(r3) /* 80221124 0021E064 7C 04 00 00 */ cmpw r4, r0 /* 80221128 0021E068 41 82 00 28 */ beq lbl_80221150 @@ -2822,8 +2822,8 @@ dMeter2_c_NS_moveButtonA: /* 8022126C 0021E1AC 3B C0 00 00 */ li r30, 0 /* 80221270 0021E1B0 3B A0 00 00 */ li r29, 0 /* 80221274 0021E1B4 3B 80 00 00 */ li r28, 0 -/* 80221278 0021E1B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022127C 0021E1BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221278 0021E1B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022127C 0021E1BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221280 0021E1C0 88 83 5E 3C */ lbz r4, 0x5e3c(r3) /* 80221284 0021E1C4 28 04 00 00 */ cmplwi r4, 0 /* 80221288 0021E1C8 41 82 00 1C */ beq lbl_802212A4 @@ -2834,8 +2834,8 @@ dMeter2_c_NS_moveButtonA: /* 8022129C 0021E1DC 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 802212A0 0021E1E0 98 03 5E 57 */ stb r0, 0x5e57(r3) lbl_802212A4: -/* 802212A4 0021E1E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802212A8 0021E1E8 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802212A4 0021E1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802212A8 0021E1E8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802212AC 0021E1EC 80 7F 5D AC */ lwz r3, 0x5dac(r31) /* 802212B0 0021E1F0 38 00 00 00 */ li r0, 0 /* 802212B4 0021E1F4 88 63 05 6A */ lbz r3, 0x56a(r3) @@ -2847,8 +2847,8 @@ lbl_802212A4: lbl_802212CC: /* 802212CC 0021E20C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 802212D0 0021E210 41 82 00 50 */ beq lbl_80221320 -/* 802212D4 0021E214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802212D8 0021E218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802212D4 0021E214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802212D8 0021E218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802212DC 0021E21C 88 03 5E 24 */ lbz r0, 0x5e24(r3) /* 802212E0 0021E220 28 00 00 00 */ cmplwi r0, 0 /* 802212E4 0021E224 40 82 00 1C */ bne lbl_80221300 @@ -2869,8 +2869,8 @@ lbl_80221300: /* 8022131C 0021E25C 3B C0 00 01 */ li r30, 1 lbl_80221320: /* 80221320 0021E260 88 1B 01 C4 */ lbz r0, 0x1c4(r27) -/* 80221324 0021E264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221328 0021E268 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221324 0021E264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221328 0021E268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022132C 0021E26C 88 83 5E 24 */ lbz r4, 0x5e24(r3) /* 80221330 0021E270 7C 00 20 40 */ cmplw r0, r4 /* 80221334 0021E274 41 82 00 38 */ beq lbl_8022136C @@ -2883,15 +2883,15 @@ lbl_80221320: lbl_80221350: /* 80221350 0021E290 98 03 5E 24 */ stb r0, 0x5e24(r3) /* 80221354 0021E294 38 00 00 01 */ li r0, 1 -/* 80221358 0021E298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022135C 0021E29C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221358 0021E298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022135C 0021E29C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221360 0021E2A0 98 03 5E 4A */ stb r0, 0x5e4a(r3) lbl_80221364: /* 80221364 0021E2A4 3B A0 00 01 */ li r29, 1 /* 80221368 0021E2A8 3B C0 00 01 */ li r30, 1 lbl_8022136C: -/* 8022136C 0021E2AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221370 0021E2B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022136C 0021E2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221370 0021E2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221374 0021E2B4 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80221378 0021E2B8 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e /* 8022137C 0021E2BC 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f @@ -3222,8 +3222,8 @@ dMeter2_c_NS_moveButtonB: /* 8022181C 0021E75C 3B C0 00 00 */ li r30, 0 /* 80221820 0021E760 3B A0 00 00 */ li r29, 0 /* 80221824 0021E764 3B 80 00 00 */ li r28, 0 -/* 80221828 0021E768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022182C 0021E76C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221828 0021E768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022182C 0021E76C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221830 0021E770 88 83 5E 35 */ lbz r4, 0x5e35(r3) /* 80221834 0021E774 28 04 00 00 */ cmplwi r4, 0 /* 80221838 0021E778 41 82 00 1C */ beq lbl_80221854 @@ -3234,8 +3234,8 @@ dMeter2_c_NS_moveButtonB: /* 8022184C 0021E78C 98 03 5E 35 */ stb r0, 0x5e35(r3) /* 80221850 0021E790 98 03 5E 50 */ stb r0, 0x5e50(r3) lbl_80221854: -/* 80221854 0021E794 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221858 0021E798 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80221854 0021E794 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221858 0021E798 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8022185C 0021E79C 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 80221860 0021E7A0 38 00 00 00 */ li r0, 0 /* 80221864 0021E7A4 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -3247,8 +3247,8 @@ lbl_80221854: lbl_8022187C: /* 8022187C 0021E7BC 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80221880 0021E7C0 41 82 00 64 */ beq lbl_802218E4 -/* 80221884 0021E7C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221888 0021E7C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221884 0021E7C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221888 0021E7C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022188C 0021E7CC 88 03 5E 1D */ lbz r0, 0x5e1d(r3) /* 80221890 0021E7D0 28 00 00 00 */ cmplwi r0, 0 /* 80221894 0021E7D4 41 82 00 0C */ beq lbl_802218A0 @@ -3258,8 +3258,8 @@ lbl_802218A0: /* 802218A0 0021E7E0 38 00 00 44 */ li r0, 0x44 /* 802218A4 0021E7E4 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 802218A8 0021E7E8 38 00 00 00 */ li r0, 0 -/* 802218AC 0021E7EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802218B0 0021E7F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802218AC 0021E7EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802218B0 0021E7F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802218B4 0021E7F4 98 03 5E 43 */ stb r0, 0x5e43(r3) /* 802218B8 0021E7F8 3B 80 00 01 */ li r28, 1 /* 802218BC 0021E7FC 48 00 00 68 */ b lbl_80221924 @@ -3280,21 +3280,21 @@ lbl_802218E4: /* 802218F0 0021E830 80 1B 01 24 */ lwz r0, 0x124(r27) /* 802218F4 0021E834 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802218F8 0021E838 41 82 00 2C */ beq lbl_80221924 -/* 802218FC 0021E83C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221900 0021E840 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802218FC 0021E83C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221900 0021E840 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221904 0021E844 88 03 5E 1D */ lbz r0, 0x5e1d(r3) /* 80221908 0021E848 28 00 00 26 */ cmplwi r0, 0x26 /* 8022190C 0021E84C 40 82 00 18 */ bne lbl_80221924 lbl_80221910: /* 80221910 0021E850 38 00 00 00 */ li r0, 0 -/* 80221914 0021E854 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221918 0021E858 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221914 0021E854 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221918 0021E858 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022191C 0021E85C 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 80221920 0021E860 98 03 5E 43 */ stb r0, 0x5e43(r3) lbl_80221924: /* 80221924 0021E864 88 1B 01 C5 */ lbz r0, 0x1c5(r27) -/* 80221928 0021E868 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022192C 0021E86C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221928 0021E868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022192C 0021E86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221930 0021E870 88 83 5E 1D */ lbz r4, 0x5e1d(r3) /* 80221934 0021E874 7C 00 20 40 */ cmplw r0, r4 /* 80221938 0021E878 41 82 00 38 */ beq lbl_80221970 @@ -3307,15 +3307,15 @@ lbl_80221924: lbl_80221954: /* 80221954 0021E894 98 03 5E 1D */ stb r0, 0x5e1d(r3) /* 80221958 0021E898 38 00 00 01 */ li r0, 1 -/* 8022195C 0021E89C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221960 0021E8A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022195C 0021E89C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221960 0021E8A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221964 0021E8A4 98 03 5E 43 */ stb r0, 0x5e43(r3) lbl_80221968: /* 80221968 0021E8A8 3B A0 00 01 */ li r29, 1 /* 8022196C 0021E8AC 3B C0 00 01 */ li r30, 1 lbl_80221970: -/* 80221970 0021E8B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221974 0021E8B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221970 0021E8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221974 0021E8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221978 0021E8B8 88 03 5E 43 */ lbz r0, 0x5e43(r3) /* 8022197C 0021E8BC 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e /* 80221980 0021E8C0 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f @@ -3328,8 +3328,8 @@ lbl_80221970: /* 8022199C 0021E8DC 3B A0 00 01 */ li r29, 1 /* 802219A0 0021E8E0 3B C0 00 01 */ li r30, 1 lbl_802219A4: -/* 802219A4 0021E8E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802219A8 0021E8E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802219A4 0021E8E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802219A8 0021E8E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802219AC 0021E8EC 88 83 00 14 */ lbz r4, 0x14(r3) /* 802219B0 0021E8F0 88 7B 01 E2 */ lbz r3, 0x1e2(r27) /* 802219B4 0021E8F4 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -3701,8 +3701,8 @@ dMeter2_c_NS_moveButtonR: /* 80221EE0 0021EE20 80 A3 01 28 */ lwz r5, 0x128(r3) /* 80221EE4 0021EE24 28 05 00 00 */ cmplwi r5, 0 /* 80221EE8 0021EE28 41 82 00 38 */ beq lbl_80221F20 -/* 80221EEC 0021EE2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221EF0 0021EE30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221EEC 0021EE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221EF0 0021EE30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221EF4 0021EE34 88 83 00 16 */ lbz r4, 0x16(r3) /* 80221EF8 0021EE38 88 66 01 C7 */ lbz r3, 0x1c7(r6) /* 80221EFC 0021EE3C 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -3716,8 +3716,8 @@ lbl_80221F14: /* 80221F18 0021EE58 38 E0 00 01 */ li r7, 1 /* 80221F1C 0021EE5C 39 00 00 01 */ li r8, 1 lbl_80221F20: -/* 80221F20 0021EE60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221F24 0021EE64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221F20 0021EE60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221F24 0021EE64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221F28 0021EE68 88 83 5E 34 */ lbz r4, 0x5e34(r3) /* 80221F2C 0021EE6C 28 04 00 00 */ cmplwi r4, 0 /* 80221F30 0021EE70 41 82 00 1C */ beq lbl_80221F4C @@ -3729,8 +3729,8 @@ lbl_80221F20: /* 80221F48 0021EE88 98 03 5E 4F */ stb r0, 0x5e4f(r3) lbl_80221F4C: /* 80221F4C 0021EE8C 88 06 01 C8 */ lbz r0, 0x1c8(r6) -/* 80221F50 0021EE90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221F54 0021EE94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221F50 0021EE90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221F54 0021EE94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221F58 0021EE98 88 83 5E 1C */ lbz r4, 0x5e1c(r3) /* 80221F5C 0021EE9C 7C 00 20 40 */ cmplw r0, r4 /* 80221F60 0021EEA0 41 82 00 38 */ beq lbl_80221F98 @@ -3743,15 +3743,15 @@ lbl_80221F4C: lbl_80221F7C: /* 80221F7C 0021EEBC 98 03 5E 1C */ stb r0, 0x5e1c(r3) /* 80221F80 0021EEC0 38 00 00 01 */ li r0, 1 -/* 80221F84 0021EEC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221F88 0021EEC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221F84 0021EEC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221F88 0021EEC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221F8C 0021EECC 98 03 5E 42 */ stb r0, 0x5e42(r3) lbl_80221F90: /* 80221F90 0021EED0 38 E0 00 01 */ li r7, 1 /* 80221F94 0021EED4 39 00 00 01 */ li r8, 1 lbl_80221F98: -/* 80221F98 0021EED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80221F9C 0021EEDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80221F98 0021EED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80221F9C 0021EEDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80221FA0 0021EEE0 88 03 5E 42 */ lbz r0, 0x5e42(r3) /* 80221FA4 0021EEE4 54 04 07 BC */ rlwinm r4, r0, 0, 0x1e, 0x1e /* 80221FA8 0021EEE8 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f @@ -3896,8 +3896,8 @@ lbl_8022217C: /* 80222194 0021F0D4 D0 3F 03 38 */ stfs f1, 0x338(r31) /* 80222198 0021F0D8 38 00 00 01 */ li r0, 1 lbl_8022219C: -/* 8022219C 0021F0DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802221A0 0021F0E0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8022219C 0021F0DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802221A0 0021F0E0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802221A4 0021F0E4 88 A4 5E 41 */ lbz r5, 0x5e41(r4) /* 802221A8 0021F0E8 28 05 00 00 */ cmplwi r5, 0 /* 802221AC 0021F0EC 41 82 00 1C */ beq lbl_802221C8 @@ -3909,8 +3909,8 @@ lbl_8022219C: /* 802221C4 0021F104 98 64 5E 5B */ stb r3, 0x5e5b(r4) lbl_802221C8: /* 802221C8 0021F108 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 802221CC 0021F10C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802221D0 0021F110 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 802221CC 0021F10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802221D0 0021F110 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 802221D4 0021F114 88 7E 5E 33 */ lbz r3, 0x5e33(r30) /* 802221D8 0021F118 7C 04 18 40 */ cmplw r4, r3 /* 802221DC 0021F11C 40 82 00 0C */ bne lbl_802221E8 @@ -3926,8 +3926,8 @@ lbl_802221E8: lbl_80222200: /* 80222200 0021F140 98 1E 5E 33 */ stb r0, 0x5e33(r30) /* 80222204 0021F144 38 00 00 01 */ li r0, 1 -/* 80222208 0021F148 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022220C 0021F14C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80222208 0021F148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022220C 0021F14C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80222210 0021F150 98 03 5E 4E */ stb r0, 0x5e4e(r3) lbl_80222214: /* 80222214 0021F154 80 7F 01 0C */ lwz r3, 0x10c(r31) @@ -3939,8 +3939,8 @@ lbl_80222220: /* 80222228 0021F168 4B FF 78 5D */ bl dMeter2Draw_c_NS_setButtonIconMidonaAlpha /* 8022222C 0021F16C 38 00 00 00 */ li r0, 0 /* 80222230 0021F170 98 1E 5E 33 */ stb r0, 0x5e33(r30) -/* 80222234 0021F174 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222238 0021F178 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80222234 0021F174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222238 0021F178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022223C 0021F17C 98 03 5E 4E */ stb r0, 0x5e4e(r3) /* 80222240 0021F180 88 A3 5E 38 */ lbz r5, 0x5e38(r3) /* 80222244 0021F184 28 05 00 00 */ cmplwi r5, 0 @@ -3952,8 +3952,8 @@ lbl_80222220: /* 8022225C 0021F19C 98 03 5E 53 */ stb r0, 0x5e53(r3) lbl_80222260: /* 80222260 0021F1A0 88 1F 01 D1 */ lbz r0, 0x1d1(r31) -/* 80222264 0021F1A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222268 0021F1A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80222264 0021F1A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222268 0021F1A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022226C 0021F1AC 88 63 5E 20 */ lbz r3, 0x5e20(r3) /* 80222270 0021F1B0 7C 00 18 40 */ cmplw r0, r3 /* 80222274 0021F1B4 41 82 00 14 */ beq lbl_80222288 @@ -3975,8 +3975,8 @@ dMeter2_c_NS_moveButton3D: /* 802222A4 0021F1E4 7C 08 02 A6 */ mflr r0 /* 802222A8 0021F1E8 90 01 00 14 */ stw r0, 0x14(r1) /* 802222AC 0021F1EC 7C 67 1B 78 */ mr r7, r3 -/* 802222B0 0021F1F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802222B4 0021F1F4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802222B0 0021F1F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802222B4 0021F1F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802222B8 0021F1F8 88 A4 5E 3E */ lbz r5, 0x5e3e(r4) /* 802222BC 0021F1FC 28 05 00 00 */ cmplwi r5, 0 /* 802222C0 0021F200 41 82 00 3C */ beq lbl_802222FC @@ -3985,8 +3985,8 @@ dMeter2_c_NS_moveButton3D: /* 802222CC 0021F20C 40 82 00 08 */ bne lbl_802222D4 /* 802222D0 0021F210 38 C0 00 01 */ li r6, 1 lbl_802222D4: -/* 802222D4 0021F214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802222D8 0021F218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802222D4 0021F214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802222D8 0021F218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802222DC 0021F21C 88 03 5E 2E */ lbz r0, 0x5e2e(r3) /* 802222E0 0021F220 98 A3 5E 26 */ stb r5, 0x5e26(r3) /* 802222E4 0021F224 98 03 5E 2D */ stb r0, 0x5e2d(r3) @@ -3997,8 +3997,8 @@ lbl_802222D4: /* 802222F8 0021F238 98 04 5E 58 */ stb r0, 0x5e58(r4) lbl_802222FC: /* 802222FC 0021F23C 88 07 01 CA */ lbz r0, 0x1ca(r7) -/* 80222300 0021F240 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222304 0021F244 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80222300 0021F240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222304 0021F244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80222308 0021F248 88 83 5E 26 */ lbz r4, 0x5e26(r3) /* 8022230C 0021F24C 7C 00 20 40 */ cmplw r0, r4 /* 80222310 0021F250 41 82 00 44 */ beq lbl_80222354 @@ -4011,8 +4011,8 @@ lbl_802222FC: lbl_8022232C: /* 8022232C 0021F26C 98 03 5E 26 */ stb r0, 0x5e26(r3) /* 80222330 0021F270 38 00 00 05 */ li r0, 5 -/* 80222334 0021F274 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222338 0021F278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80222334 0021F274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222338 0021F278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022233C 0021F27C 98 03 5E 2D */ stb r0, 0x5e2d(r3) /* 80222340 0021F280 38 00 00 01 */ li r0, 1 /* 80222344 0021F284 98 03 5E 4B */ stb r0, 0x5e4b(r3) @@ -4034,8 +4034,8 @@ dMeter2_c_NS_moveButtonC: /* 80222370 0021F2B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80222374 0021F2B4 93 C1 00 08 */ stw r30, 8(r1) /* 80222378 0021F2B8 7C 7E 1B 78 */ mr r30, r3 -/* 8022237C 0021F2BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222380 0021F2C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022237C 0021F2BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222380 0021F2C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80222384 0021F2C4 88 A3 5E 3F */ lbz r5, 0x5e3f(r3) /* 80222388 0021F2C8 28 05 00 00 */ cmplwi r5, 0 /* 8022238C 0021F2CC 41 82 00 28 */ beq lbl_802223B4 @@ -4050,8 +4050,8 @@ dMeter2_c_NS_moveButtonC: /* 802223B0 0021F2F0 98 03 5E 59 */ stb r0, 0x5e59(r3) lbl_802223B4: /* 802223B4 0021F2F4 88 9E 01 CB */ lbz r4, 0x1cb(r30) -/* 802223B8 0021F2F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802223BC 0021F2FC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802223B8 0021F2F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802223BC 0021F2FC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802223C0 0021F300 88 1F 5E 2F */ lbz r0, 0x5e2f(r31) /* 802223C4 0021F304 7C 04 00 40 */ cmplw r4, r0 /* 802223C8 0021F308 40 82 00 74 */ bne lbl_8022243C @@ -4074,8 +4074,8 @@ lbl_802223B4: lbl_8022240C: /* 8022240C 0021F34C 28 04 00 07 */ cmplwi r4, 7 /* 80222410 0021F350 41 82 00 18 */ beq lbl_80222428 -/* 80222414 0021F354 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80222418 0021F358 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80222414 0021F354 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80222418 0021F358 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8022241C 0021F35C 88 04 5E 4C */ lbz r0, 0x5e4c(r4) /* 80222420 0021F360 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80222424 0021F364 40 82 00 18 */ bne lbl_8022243C @@ -4116,8 +4116,8 @@ dMeter2_c_NS_moveButtonS: /* 80222498 0021F3D8 7C 08 02 A6 */ mflr r0 /* 8022249C 0021F3DC 90 01 00 14 */ stw r0, 0x14(r1) /* 802224A0 0021F3E0 7C 65 1B 78 */ mr r5, r3 -/* 802224A4 0021F3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802224A8 0021F3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802224A4 0021F3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802224A8 0021F3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802224AC 0021F3EC 88 83 5E 40 */ lbz r4, 0x5e40(r3) /* 802224B0 0021F3F0 28 04 00 00 */ cmplwi r4, 0 /* 802224B4 0021F3F4 41 82 00 20 */ beq lbl_802224D4 @@ -4134,8 +4134,8 @@ lbl_802224D4: /* 802224DC 0021F41C 98 03 5E 4D */ stb r0, 0x5e4d(r3) lbl_802224E0: /* 802224E0 0021F420 88 05 01 CC */ lbz r0, 0x1cc(r5) -/* 802224E4 0021F424 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802224E8 0021F428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802224E4 0021F424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802224E8 0021F428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802224EC 0021F42C 88 63 5E 32 */ lbz r3, 0x5e32(r3) /* 802224F0 0021F430 7C 00 18 40 */ cmplw r0, r3 /* 802224F4 0021F434 41 82 00 14 */ beq lbl_80222508 @@ -4453,8 +4453,8 @@ lbl_8022293C: /* 80222944 0021F884 42 00 FF 94 */ bdnz lbl_802228D8 /* 80222948 0021F888 3B A0 00 00 */ li r29, 0 /* 8022294C 0021F88C 3B 40 00 00 */ li r26, 0 -/* 80222950 0021F890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80222954 0021F894 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80222950 0021F890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80222954 0021F894 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80222958 0021F898 3B 61 00 0C */ addi r27, r1, 0xc lbl_8022295C: /* 8022295C 0021F89C 80 7C 01 28 */ lwz r3, 0x128(r28) @@ -5491,8 +5491,8 @@ lbl_80223828: lbl_80223838: /* 80223838 00220778 54 80 01 8D */ rlwinm. r0, r4, 0, 6, 6 /* 8022383C 0022077C 41 82 00 A4 */ beq lbl_802238E0 -/* 80223840 00220780 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80223844 00220784 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80223840 00220780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80223844 00220784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80223848 00220788 3B C3 4E 00 */ addi r30, r3, 0x4e00 /* 8022384C 0022078C 7F C3 F3 78 */ mr r3, r30 /* 80223850 00220790 3C 80 80 3A */ lis r4, lbl_80399338@ha @@ -5534,8 +5534,8 @@ lbl_802238D0: /* 802238D8 00220818 98 1F 01 E5 */ stb r0, 0x1e5(r31) /* 802238DC 0022081C 48 00 02 D0 */ b lbl_80223BAC lbl_802238E0: -/* 802238E0 00220820 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802238E4 00220824 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802238E0 00220820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802238E4 00220824 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802238E8 00220828 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802238EC 0022082C 38 00 00 00 */ li r0, 0 /* 802238F0 00220830 88 63 05 6A */ lbz r3, 0x56a(r3) @@ -5751,8 +5751,8 @@ dMeter2_c_NS_check2DContents: /* 80223BD8 00220B18 80 03 01 18 */ lwz r0, 0x118(r3) /* 80223BDC 00220B1C 28 00 00 00 */ cmplwi r0, 0 /* 80223BE0 00220B20 40 82 00 FC */ bne lbl_80223CDC -/* 80223BE4 00220B24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80223BE8 00220B28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80223BE4 00220B24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80223BE8 00220B28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80223BEC 00220B2C 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80223BF0 00220B30 28 00 00 00 */ cmplwi r0, 0 /* 80223BF4 00220B34 41 82 00 0C */ beq lbl_80223C00 @@ -5818,8 +5818,8 @@ lbl_80223CD4: /* 80223CD4 00220C14 90 1F 01 18 */ stw r0, 0x118(r31) /* 80223CD8 00220C18 48 00 01 14 */ b lbl_80223DEC lbl_80223CDC: -/* 80223CDC 00220C1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80223CE0 00220C20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80223CDC 00220C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80223CE0 00220C20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80223CE4 00220C24 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80223CE8 00220C28 28 00 00 05 */ cmplwi r0, 5 /* 80223CEC 00220C2C 40 82 01 00 */ bne lbl_80223DEC @@ -5904,8 +5904,8 @@ dMeter2_c_NS_moveBombNum: /* 80223E10 00220D50 48 13 E3 A1 */ bl func_803621B0 /* 80223E14 00220D54 7C 75 1B 78 */ mr r21, r3 /* 80223E18 00220D58 3A E0 00 00 */ li r23, 0 -/* 80223E1C 00220D5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80223E20 00220D60 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80223E1C 00220D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80223E20 00220D60 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80223E24 00220D64 3B 7D 00 9C */ addi r27, r29, 0x9c /* 80223E28 00220D68 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80223E2C 00220D6C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l @@ -6027,8 +6027,8 @@ lbl_80223FD4: /* 80223FE0 00220F20 28 00 00 59 */ cmplwi r0, 0x59 /* 80223FE4 00220F24 40 82 00 6C */ bne lbl_80224050 /* 80223FE8 00220F28 3A 40 00 00 */ li r18, 0 -/* 80223FEC 00220F2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80223FF0 00220F30 3A 63 61 C0 */ addi r19, r3, lbl_804061C0@l +/* 80223FEC 00220F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80223FF0 00220F30 3A 63 61 C0 */ addi r19, r3, g_dComIfG_gameInfo@l /* 80223FF4 00220F34 3A 97 00 0F */ addi r20, r23, 0xf lbl_80223FF8: /* 80223FF8 00220F38 7E 63 9B 78 */ mr r3, r19 @@ -6148,8 +6148,8 @@ lbl_8022418C: /* 80224190 002210D0 2C 17 00 03 */ cmpwi r23, 3 /* 80224194 002210D4 41 80 FC A8 */ blt lbl_80223E3C /* 80224198 002210D8 3A 40 00 00 */ li r18, 0 -/* 8022419C 002210DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802241A0 002210E0 3B 03 61 C0 */ addi r24, r3, lbl_804061C0@l +/* 8022419C 002210DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802241A0 002210E0 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l lbl_802241A4: /* 802241A4 002210E4 7F 03 C3 78 */ mr r3, r24 /* 802241A8 002210E8 7E 44 93 78 */ mr r4, r18 @@ -6160,8 +6160,8 @@ lbl_802241A4: /* 802241BC 002210FC 7C 04 00 40 */ cmplw r4, r0 /* 802241C0 00221100 41 82 00 74 */ beq lbl_80224234 /* 802241C4 00221104 3A 80 00 00 */ li r20, 0 -/* 802241C8 00221108 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802241CC 0022110C 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l +/* 802241C8 00221108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802241CC 0022110C 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l lbl_802241D0: /* 802241D0 00221110 7E E3 BB 78 */ mr r3, r23 /* 802241D4 00221114 7E 44 93 78 */ mr r4, r18 @@ -6184,8 +6184,8 @@ lbl_80224214: /* 80224214 00221154 3A 94 00 01 */ addi r20, r20, 1 /* 80224218 00221158 2C 14 00 03 */ cmpwi r20, 3 /* 8022421C 0022115C 41 80 FF B4 */ blt lbl_802241D0 -/* 80224220 00221160 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224224 00221164 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224220 00221160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224224 00221164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224228 00221168 7E 44 93 78 */ mr r4, r18 /* 8022422C 0022116C 4B E0 E8 31 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80224230 00221170 7C 75 99 AE */ stbx r3, r21, r19 @@ -6209,8 +6209,8 @@ dMeter2_c_NS_moveBottleNum: /* 80224268 002211A8 48 13 DF 5D */ bl func_803621C4 /* 8022426C 002211AC 7C 7E 1B 78 */ mr r30, r3 /* 80224270 002211B0 3B E0 00 00 */ li r31, 0 -/* 80224274 002211B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224278 002211B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224274 002211B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224278 002211B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022427C 002211BC 3B 43 00 9C */ addi r26, r3, 0x9c /* 80224280 002211C0 3B 23 00 EC */ addi r25, r3, 0xec lbl_80224284: @@ -6231,8 +6231,8 @@ lbl_80224284: /* 802242BC 002211FC 7C 04 00 40 */ cmplw r4, r0 /* 802242C0 00221200 41 82 00 70 */ beq lbl_80224330 /* 802242C4 00221204 3A E0 00 00 */ li r23, 0 -/* 802242C8 00221208 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802242CC 0022120C 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 802242C8 00221208 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802242CC 0022120C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 802242D0 00221210 3B 9F 00 0B */ addi r28, r31, 0xb lbl_802242D4: /* 802242D4 00221214 7F 63 DB 78 */ mr r3, r27 @@ -6289,8 +6289,8 @@ dMeter2_c_NS_moveArrowNum: /* 8022438C 002212CC 28 00 00 01 */ cmplwi r0, 1 /* 80224390 002212D0 40 82 00 44 */ bne lbl_802243D4 lbl_80224394: -/* 80224394 002212D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224398 002212D8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80224394 002212D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224398 002212D8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8022439C 002212DC 88 04 00 EC */ lbz r0, 0xec(r4) /* 802243A0 002212E0 88 64 00 F8 */ lbz r3, 0xf8(r4) /* 802243A4 002212E4 7C 03 00 40 */ cmplw r3, r0 @@ -6299,16 +6299,16 @@ lbl_80224394: /* 802243B0 002212F0 7C 00 1A 14 */ add r0, r0, r3 /* 802243B4 002212F4 B0 04 5D F4 */ sth r0, 0x5df4(r4) lbl_802243B8: -/* 802243B8 002212F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802243BC 002212FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802243B8 002212F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802243BC 002212FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802243C0 00221300 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 802243C4 00221304 2C 00 00 00 */ cmpwi r0, 0 /* 802243C8 00221308 40 80 00 0C */ bge lbl_802243D4 /* 802243CC 0022130C 38 00 00 00 */ li r0, 0 /* 802243D0 00221310 B0 03 5D F4 */ sth r0, 0x5df4(r3) lbl_802243D4: -/* 802243D4 00221314 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802243D8 00221318 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 802243D4 00221314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802243D8 00221318 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 802243DC 0022131C A8 C5 5D F4 */ lha r6, 0x5df4(r5) /* 802243E0 00221320 7C C0 07 35 */ extsh. r0, r6 /* 802243E4 00221324 40 82 00 24 */ bne lbl_80224408 @@ -6321,8 +6321,8 @@ lbl_802243D4: /* 80224400 00221340 7C 00 18 40 */ cmplw r0, r3 /* 80224404 00221344 41 82 02 64 */ beq lbl_80224668 lbl_80224408: -/* 80224408 00221348 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022440C 0022134C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80224408 00221348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022440C 0022134C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80224410 00221350 88 04 00 EC */ lbz r0, 0xec(r4) /* 80224414 00221354 7C 00 32 14 */ add r0, r0, r6 /* 80224418 00221358 7C 06 07 35 */ extsh. r6, r0 @@ -6331,8 +6331,8 @@ lbl_80224408: /* 80224424 00221364 40 80 00 08 */ bge lbl_8022442C /* 80224428 00221368 38 C0 00 00 */ li r6, 0 lbl_8022442C: -/* 8022442C 0022136C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224430 00221370 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8022442C 0022136C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224430 00221370 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80224434 00221374 88 7F 00 F8 */ lbz r3, 0xf8(r31) /* 80224438 00221378 7C C0 07 34 */ extsh r0, r6 /* 8022443C 0022137C 7C 00 18 00 */ cmpw r0, r3 @@ -6508,8 +6508,8 @@ dMeter2_c_NS_movePachinkoNum: /* 802246A0 002215E0 4B FD 57 85 */ bl dMw_HIO_c_NS_getPachinkoFlag /* 802246A4 002215E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802246A8 002215E8 41 82 00 40 */ beq lbl_802246E8 -/* 802246AC 002215EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802246B0 002215F0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802246AC 002215EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802246B0 002215F0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802246B4 002215F4 88 04 00 F4 */ lbz r0, 0xf4(r4) /* 802246B8 002215F8 28 00 00 32 */ cmplwi r0, 0x32 /* 802246BC 002215FC 41 82 00 10 */ beq lbl_802246CC @@ -6517,16 +6517,16 @@ dMeter2_c_NS_movePachinkoNum: /* 802246C4 00221604 38 03 00 32 */ addi r0, r3, 0x32 /* 802246C8 00221608 B0 04 5D F6 */ sth r0, 0x5df6(r4) lbl_802246CC: -/* 802246CC 0022160C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802246D0 00221610 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802246CC 0022160C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802246D0 00221610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802246D4 00221614 A8 03 5D F6 */ lha r0, 0x5df6(r3) /* 802246D8 00221618 2C 00 00 00 */ cmpwi r0, 0 /* 802246DC 0022161C 40 80 00 0C */ bge lbl_802246E8 /* 802246E0 00221620 38 00 00 00 */ li r0, 0 /* 802246E4 00221624 B0 03 5D F6 */ sth r0, 0x5df6(r3) lbl_802246E8: -/* 802246E8 00221628 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802246EC 0022162C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802246E8 00221628 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802246EC 0022162C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802246F0 00221630 A8 A4 5D F6 */ lha r5, 0x5df6(r4) /* 802246F4 00221634 7C A0 07 35 */ extsh. r0, r5 /* 802246F8 00221638 40 82 00 20 */ bne lbl_80224718 @@ -6538,8 +6538,8 @@ lbl_802246E8: /* 80224710 00221650 7C 00 18 40 */ cmplw r0, r3 /* 80224714 00221654 41 82 01 B8 */ beq lbl_802248CC lbl_80224718: -/* 80224718 00221658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022471C 0022165C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224718 00221658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022471C 0022165C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224720 00221660 88 03 00 F4 */ lbz r0, 0xf4(r3) /* 80224724 00221664 7C 00 2A 14 */ add r0, r0, r5 /* 80224728 00221668 7C 05 07 35 */ extsh. r5, r0 @@ -6676,8 +6676,8 @@ dMeter2_c_NS_alphaAnimeLife: /* 80224900 00221840 40 82 00 C4 */ bne lbl_802249C4 /* 80224904 00221844 54 80 06 73 */ rlwinm. r0, r4, 0, 0x19, 0x19 /* 80224908 00221848 41 82 00 44 */ beq lbl_8022494C -/* 8022490C 0022184C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224910 00221850 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022490C 0022184C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224910 00221850 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224914 00221854 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80224918 00221858 28 00 00 00 */ cmplwi r0, 0 /* 8022491C 0022185C 41 82 00 10 */ beq lbl_8022492C @@ -6689,14 +6689,14 @@ lbl_8022492C: lbl_80224930: /* 80224930 00221870 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80224934 00221874 41 82 00 18 */ beq lbl_8022494C -/* 80224938 00221878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022493C 0022187C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224938 00221878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022493C 0022187C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224940 00221880 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80224944 00221884 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 80224948 00221888 41 82 00 7C */ beq lbl_802249C4 lbl_8022494C: -/* 8022494C 0022188C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224950 00221890 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022494C 0022188C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224950 00221890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224954 00221894 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80224958 00221898 38 00 00 00 */ li r0, 0 /* 8022495C 0022189C 88 63 05 6A */ lbz r3, 0x56a(r3) @@ -6754,8 +6754,8 @@ dMeter2_c_NS_alphaAnimeKantera: /* 80224A10 00221950 93 E1 00 0C */ stw r31, 0xc(r1) /* 80224A14 00221954 93 C1 00 08 */ stw r30, 8(r1) /* 80224A18 00221958 7C 7F 1B 78 */ mr r31, r3 -/* 80224A1C 0022195C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224A20 00221960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224A1C 0022195C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224A20 00221960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224A24 00221964 A0 03 00 06 */ lhz r0, 6(r3) /* 80224A28 00221968 28 00 00 00 */ cmplwi r0, 0 /* 80224A2C 0022196C 41 82 01 48 */ beq lbl_80224B74 @@ -6766,8 +6766,8 @@ dMeter2_c_NS_alphaAnimeKantera: /* 80224A40 00221980 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224A44 00221984 28 00 00 48 */ cmplwi r0, 0x48 /* 80224A48 00221988 40 82 01 2C */ bne lbl_80224B74 -/* 80224A4C 0022198C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224A50 00221990 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80224A4C 0022198C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224A50 00221990 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80224A54 00221994 80 7E 5D AC */ lwz r3, 0x5dac(r30) /* 80224A58 00221998 38 80 00 00 */ li r4, 0 /* 80224A5C 0022199C 81 83 06 28 */ lwz r12, 0x628(r3) @@ -6781,8 +6781,8 @@ dMeter2_c_NS_alphaAnimeKantera: /* 80224A7C 002219BC 40 82 00 F8 */ bne lbl_80224B74 /* 80224A80 002219C0 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 /* 80224A84 002219C4 41 82 00 30 */ beq lbl_80224AB4 -/* 80224A88 002219C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224A8C 002219CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224A88 002219C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224A8C 002219CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224A90 002219D0 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80224A94 002219D4 28 00 00 00 */ cmplwi r0, 0 /* 80224A98 002219D8 41 82 00 10 */ beq lbl_80224AA8 @@ -6795,8 +6795,8 @@ lbl_80224AAC: /* 80224AAC 002219EC 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80224AB0 002219F0 40 82 00 C4 */ bne lbl_80224B74 lbl_80224AB4: -/* 80224AB4 002219F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224AB8 002219F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224AB4 002219F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224AB8 002219F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224ABC 002219FC 88 03 5E B7 */ lbz r0, 0x5eb7(r3) /* 80224AC0 00221A00 28 00 00 00 */ cmplwi r0, 0 /* 80224AC4 00221A04 40 82 00 B0 */ bne lbl_80224B74 @@ -6814,8 +6814,8 @@ lbl_80224AE8: /* 80224AF0 00221A30 88 04 05 6A */ lbz r0, 0x56a(r4) /* 80224AF4 00221A34 28 00 00 2D */ cmplwi r0, 0x2d /* 80224AF8 00221A38 40 82 00 30 */ bne lbl_80224B28 -/* 80224AFC 00221A3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224B00 00221A40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224AFC 00221A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224B00 00221A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224B04 00221A44 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80224B08 00221A48 7F C3 F3 78 */ mr r3, r30 /* 80224B0C 00221A4C 4B E0 80 B1 */ bl dComIfG_play_c_NS_getTimerMode @@ -6871,8 +6871,8 @@ dMeter2_c_NS_alphaAnimeOxygen: /* 80224BB8 00221AF8 39 61 00 20 */ addi r11, r1, 0x20 /* 80224BBC 00221AFC 48 13 D6 21 */ bl _savegpr_29 /* 80224BC0 00221B00 7C 7E 1B 78 */ mr r30, r3 -/* 80224BC4 00221B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224BC8 00221B08 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80224BC4 00221B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224BC8 00221B08 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80224BCC 00221B0C 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) /* 80224BD0 00221B10 28 00 00 00 */ cmplwi r0, 0 /* 80224BD4 00221B14 41 82 00 F0 */ beq lbl_80224CC4 @@ -6893,8 +6893,8 @@ lbl_80224C08: /* 80224C08 00221B48 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80224C0C 00221B4C 40 82 00 B8 */ bne lbl_80224CC4 lbl_80224C10: -/* 80224C10 00221B50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224C14 00221B54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224C10 00221B50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224C14 00221B54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224C18 00221B58 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 80224C1C 00221B5C 38 00 00 00 */ li r0, 0 /* 80224C20 00221B60 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -6909,8 +6909,8 @@ lbl_80224C38: /* 80224C40 00221B80 88 04 05 6A */ lbz r0, 0x56a(r4) /* 80224C44 00221B84 28 00 00 2D */ cmplwi r0, 0x2d /* 80224C48 00221B88 40 82 00 30 */ bne lbl_80224C78 -/* 80224C4C 00221B8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224C50 00221B90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224C4C 00221B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224C50 00221B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224C54 00221B94 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80224C58 00221B98 7F A3 EB 78 */ mr r3, r29 /* 80224C5C 00221B9C 4B E0 7F 61 */ bl dComIfG_play_c_NS_getTimerMode @@ -7025,8 +7025,8 @@ dMeter2_c_NS_alphaAnimeRupee: /* 80224DE0 00221D20 40 82 01 58 */ bne lbl_80224F38 /* 80224DE4 00221D24 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 /* 80224DE8 00221D28 41 82 00 30 */ beq lbl_80224E18 -/* 80224DEC 00221D2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224DF0 00221D30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224DEC 00221D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224DF0 00221D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224DF4 00221D34 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80224DF8 00221D38 28 00 00 00 */ cmplwi r0, 0 /* 80224DFC 00221D3C 41 82 00 10 */ beq lbl_80224E0C @@ -7039,8 +7039,8 @@ lbl_80224E10: /* 80224E10 00221D50 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80224E14 00221D54 40 82 01 24 */ bne lbl_80224F38 lbl_80224E18: -/* 80224E18 00221D58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224E1C 00221D5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224E18 00221D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224E1C 00221D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224E20 00221D60 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 80224E24 00221D64 38 00 00 00 */ li r0, 0 /* 80224E28 00221D68 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -7055,15 +7055,15 @@ lbl_80224E40: /* 80224E48 00221D88 88 04 05 6A */ lbz r0, 0x56a(r4) /* 80224E4C 00221D8C 28 00 00 2D */ cmplwi r0, 0x2d /* 80224E50 00221D90 40 82 00 1C */ bne lbl_80224E6C -/* 80224E54 00221D94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224E58 00221D98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224E54 00221D94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224E58 00221D98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224E5C 00221D9C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80224E60 00221DA0 4B E0 7D 5D */ bl dComIfG_play_c_NS_getTimerMode /* 80224E64 00221DA4 2C 03 00 04 */ cmpwi r3, 4 /* 80224E68 00221DA8 41 82 00 D0 */ beq lbl_80224F38 lbl_80224E6C: -/* 80224E6C 00221DAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224E70 00221DB0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80224E6C 00221DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224E70 00221DB0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80224E74 00221DB4 38 7E 4E 00 */ addi r3, r30, 0x4e00 /* 80224E78 00221DB8 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 80224E7C 00221DBC 38 84 93 38 */ addi r4, r4, lbl_80399338@l @@ -7074,8 +7074,8 @@ lbl_80224E6C: /* 80224E90 00221DD0 88 1E 4F AD */ lbz r0, 0x4fad(r30) /* 80224E94 00221DD4 28 00 00 00 */ cmplwi r0, 0 /* 80224E98 00221DD8 41 82 00 18 */ beq lbl_80224EB0 -/* 80224E9C 00221DDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224EA0 00221DE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224E9C 00221DDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224EA0 00221DE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224EA4 00221DE4 A0 03 4F A4 */ lhz r0, 0x4fa4(r3) /* 80224EA8 00221DE8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 /* 80224EAC 00221DEC 48 00 00 08 */ b lbl_80224EB4 @@ -7149,8 +7149,8 @@ dMeter2_c_NS_alphaAnimeKey: /* 80224F90 00221ED0 40 82 01 2C */ bne lbl_802250BC /* 80224F94 00221ED4 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 /* 80224F98 00221ED8 41 82 00 30 */ beq lbl_80224FC8 -/* 80224F9C 00221EDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80224FA0 00221EE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224F9C 00221EDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80224FA0 00221EE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80224FA4 00221EE4 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80224FA8 00221EE8 28 00 00 00 */ cmplwi r0, 0 /* 80224FAC 00221EEC 41 82 00 10 */ beq lbl_80224FBC @@ -7176,8 +7176,8 @@ lbl_80224FC8: /* 80224FF0 00221F30 40 82 00 CC */ bne lbl_802250BC /* 80224FF4 00221F34 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0 /* 80224FF8 00221F38 40 82 00 C4 */ bne lbl_802250BC -/* 80224FFC 00221F3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225000 00221F40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80224FFC 00221F3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225000 00221F40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225004 00221F44 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 80225008 00221F48 38 00 00 00 */ li r0, 0 /* 8022500C 00221F4C 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -7192,8 +7192,8 @@ lbl_80225024: /* 8022502C 00221F6C 88 04 05 6A */ lbz r0, 0x56a(r4) /* 80225030 00221F70 28 00 00 2D */ cmplwi r0, 0x2d /* 80225034 00221F74 40 82 00 30 */ bne lbl_80225064 -/* 80225038 00221F78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022503C 00221F7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225038 00221F78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022503C 00221F7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225040 00221F80 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80225044 00221F84 7F C3 F3 78 */ mr r3, r30 /* 80225048 00221F88 4B E0 7B 75 */ bl dComIfG_play_c_NS_getTimerMode @@ -7258,8 +7258,8 @@ dMeter2_c_NS_alphaAnimeButton: /* 80225118 00222058 40 82 00 64 */ bne lbl_8022517C /* 8022511C 0022205C 54 85 05 EF */ rlwinm. r5, r4, 0, 0x17, 0x17 /* 80225120 00222060 41 82 00 1C */ beq lbl_8022513C -/* 80225124 00222064 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225128 00222068 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225124 00222064 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225128 00222068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022512C 0022206C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80225130 00222070 88 03 04 CF */ lbz r0, 0x4cf(r3) /* 80225134 00222074 28 00 00 00 */ cmplwi r0, 0 @@ -7295,8 +7295,8 @@ lbl_80225198: /* 8022519C 002220DC 40 82 00 78 */ bne lbl_80225214 /* 802251A0 002220E0 28 05 00 00 */ cmplwi r5, 0 /* 802251A4 002220E4 40 82 00 60 */ bne lbl_80225204 -/* 802251A8 002220E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802251AC 002220EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802251A8 002220E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802251AC 002220EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802251B0 002220F0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802251B4 002220F4 81 83 06 28 */ lwz r12, 0x628(r3) /* 802251B8 002220F8 81 8C 00 78 */ lwz r12, 0x78(r12) @@ -7307,8 +7307,8 @@ lbl_80225198: /* 802251CC 0022210C 80 1E 01 24 */ lwz r0, 0x124(r30) /* 802251D0 00222110 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 802251D4 00222114 41 82 00 40 */ beq lbl_80225214 -/* 802251D8 00222118 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802251DC 0022211C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802251D8 00222118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802251DC 0022211C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802251E0 00222120 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802251E4 00222124 28 00 00 00 */ cmplwi r0, 0 /* 802251E8 00222128 41 82 00 10 */ beq lbl_802251F8 @@ -7356,8 +7356,8 @@ lbl_80225274: /* 80225274 002221B4 80 1E 01 24 */ lwz r0, 0x124(r30) /* 80225278 002221B8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8022527C 002221BC 40 82 00 54 */ bne lbl_802252D0 -/* 80225280 002221C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225284 002221C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225280 002221C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225284 002221C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225288 002221C8 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8022528C 002221CC 81 83 06 28 */ lwz r12, 0x628(r3) /* 80225290 002221D0 81 8C 00 78 */ lwz r12, 0x78(r12) @@ -7365,8 +7365,8 @@ lbl_80225274: /* 80225298 002221D8 4E 80 04 21 */ bctrl /* 8022529C 002221DC 2C 03 00 00 */ cmpwi r3, 0 /* 802252A0 002221E0 40 82 00 30 */ bne lbl_802252D0 -/* 802252A4 002221E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802252A8 002221E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802252A4 002221E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802252A8 002221E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802252AC 002221EC 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802252B0 002221F0 28 00 00 00 */ cmplwi r0, 0 /* 802252B4 002221F4 41 82 00 10 */ beq lbl_802252C4 @@ -7528,8 +7528,8 @@ dMeter2_c_NS_alphaAnimeButtonCross: /* 802254DC 0022241C 40 82 00 F8 */ bne lbl_802255D4 /* 802254E0 00222420 54 80 06 73 */ rlwinm. r0, r4, 0, 0x19, 0x19 /* 802254E4 00222424 41 82 00 30 */ beq lbl_80225514 -/* 802254E8 00222428 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802254EC 0022242C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802254E8 00222428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802254EC 0022242C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802254F0 00222430 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802254F4 00222434 28 00 00 00 */ cmplwi r0, 0 /* 802254F8 00222438 41 82 00 10 */ beq lbl_80225508 @@ -7542,8 +7542,8 @@ lbl_8022550C: /* 8022550C 0022244C 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80225510 00222450 40 82 00 C4 */ bne lbl_802255D4 lbl_80225514: -/* 80225514 00222454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225518 00222458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225514 00222454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225518 00222458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022551C 0022245C 80 A3 5D AC */ lwz r5, 0x5dac(r3) /* 80225520 00222460 38 00 00 00 */ li r0, 0 /* 80225524 00222464 88 65 05 6A */ lbz r3, 0x56a(r5) @@ -7594,8 +7594,8 @@ lbl_8022553C: lbl_802255D4: /* 802255D4 00222514 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802255D8 00222518 4B FF 2D 61 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin -/* 802255DC 0022251C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802255E0 00222520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802255DC 0022251C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802255E0 00222520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802255E4 00222524 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) /* 802255E8 00222528 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 802255EC 0022252C 41 82 00 24 */ beq lbl_80225610 @@ -7681,8 +7681,8 @@ dMeter2_c_NS_isShowLightDrop: /* 80225708 00222648 80 1F 01 24 */ lwz r0, 0x124(r31) /* 8022570C 0022264C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 80225710 00222650 40 82 01 6C */ bne lbl_8022587C -/* 80225714 00222654 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225718 00222658 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80225714 00222654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225718 00222658 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8022571C 0022265C 38 7E 01 14 */ addi r3, r30, 0x114 /* 80225720 00222660 88 9E 4E 0C */ lbz r4, 0x4e0c(r30) /* 80225724 00222664 4B E0 EC 79 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc @@ -7702,8 +7702,8 @@ dMeter2_c_NS_isShowLightDrop: /* 8022575C 0022269C 80 1F 01 24 */ lwz r0, 0x124(r31) /* 80225760 002226A0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 80225764 002226A4 41 82 00 30 */ beq lbl_80225794 -/* 80225768 002226A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022576C 002226AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225768 002226A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022576C 002226AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225770 002226B0 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80225774 002226B4 28 00 00 00 */ cmplwi r0, 0 /* 80225778 002226B8 41 82 00 10 */ beq lbl_80225788 @@ -7716,8 +7716,8 @@ lbl_8022578C: /* 8022578C 002226CC 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 80225790 002226D0 40 82 00 EC */ bne lbl_8022587C lbl_80225794: -/* 80225794 002226D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225798 002226D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225794 002226D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225798 002226D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022579C 002226DC 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 802257A0 002226E0 38 00 00 00 */ li r0, 0 /* 802257A4 002226E4 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -7732,8 +7732,8 @@ lbl_802257BC: /* 802257C4 00222704 88 04 05 6A */ lbz r0, 0x56a(r4) /* 802257C8 00222708 28 00 00 2D */ cmplwi r0, 0x2d /* 802257CC 0022270C 40 82 00 30 */ bne lbl_802257FC -/* 802257D0 00222710 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802257D4 00222714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802257D0 00222710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802257D4 00222714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802257D8 00222718 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 802257DC 0022271C 7F C3 F3 78 */ mr r3, r30 /* 802257E0 00222720 4B E0 73 DD */ bl dComIfG_play_c_NS_getTimerMode @@ -7852,8 +7852,8 @@ dMeter2_c_NS_isKeyVisible: /* 80225964 002228A4 7C 08 02 A6 */ mflr r0 /* 80225968 002228A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8022596C 002228AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80225970 002228B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225974 002228B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225970 002228B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225974 002228B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225978 002228B8 3B E3 4E 20 */ addi r31, r3, 0x4e20 /* 8022597C 002228BC 7F E3 FB 78 */ mr r3, r31 /* 80225980 002228C0 81 9F 00 00 */ lwz r12, 0(r31) @@ -7871,8 +7871,8 @@ dMeter2_c_NS_isKeyVisible: /* 802259B0 002228F0 80 03 00 0C */ lwz r0, 0xc(r3) /* 802259B4 002228F4 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f /* 802259B8 002228F8 40 82 00 20 */ bne lbl_802259D8 -/* 802259BC 002228FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802259C0 00222900 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802259BC 002228FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802259C0 00222900 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802259C4 00222904 88 63 09 74 */ lbz r3, 0x974(r3) /* 802259C8 00222908 30 03 FF FF */ addic r0, r3, -1 /* 802259CC 0022290C 7C 00 19 10 */ subfe r0, r0, r3 @@ -7977,8 +7977,8 @@ lbl_80225A8C: /* 80225B20 00222A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80225B24 00222A64 93 E3 00 1C */ stw r31, 0x1c(r3) /* 80225B28 00222A68 38 00 00 01 */ li r0, 1 -/* 80225B2C 00222A6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225B30 00222A70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225B2C 00222A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225B30 00222A70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225B34 00222A74 98 03 5E B8 */ stb r0, 0x5eb8(r3) /* 80225B38 00222A78 38 60 03 14 */ li r3, 0x314 /* 80225B3C 00222A7C 38 80 00 00 */ li r4, 0 diff --git a/asm/d/d_model.s b/asm/d/d_model.s index b8326ac971..3dd80d9e6d 100644 --- a/asm/d/d_model.s +++ b/asm/d/d_model.s @@ -109,8 +109,8 @@ dMdl_c_NS_create: /* 8009C684 000995C4 88 03 00 1A */ lbz r0, 0x1a(r3) /* 8009C688 000995C8 28 00 00 00 */ cmplwi r0, 0 /* 8009C68C 000995CC 40 82 00 2C */ bne lbl_8009C6B8 -/* 8009C690 000995D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009C694 000995D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009C690 000995D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009C694 000995D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009C698 000995D8 80 63 5F 90 */ lwz r3, 0x5f90(r3) /* 8009C69C 000995DC 7F C4 F3 78 */ mr r4, r30 /* 8009C6A0 000995E0 38 A0 00 00 */ li r5, 0 diff --git a/asm/d/d_name.s b/asm/d/d_name.s index 77eefeac2c..1dad565ea0 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -2355,8 +2355,8 @@ dName_c_NS__draw: /* 8025056C 0024D4AC 39 61 00 20 */ addi r11, r1, 0x20 /* 80250570 0024D4B0 48 11 1C 69 */ bl _savegpr_28 /* 80250574 0024D4B4 7C 7C 1B 78 */ mr r28, r3 -/* 80250578 0024D4B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025057C 0024D4BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80250578 0024D4B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025057C 0024D4BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80250580 0024D4C0 3B E3 5F 64 */ addi r31, r3, 0x5f64 /* 80250584 0024D4C4 7F E3 FB 78 */ mr r3, r31 /* 80250588 0024D4C8 3B BF 01 B4 */ addi r29, r31, 0x1b4 @@ -2395,8 +2395,8 @@ dName_c_NS_screenSet: /* 80250600 0024D540 7C 60 1B 78 */ mr r0, r3 lbl_80250604: /* 80250604 0024D544 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80250608 0024D548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025060C 0024D54C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80250608 0024D548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025060C 0024D54C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80250610 0024D550 80 03 5C D4 */ lwz r0, 0x5cd4(r3) /* 80250614 0024D554 90 1F 00 08 */ stw r0, 8(r31) /* 80250618 0024D558 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -3151,8 +3151,8 @@ lbl_8025108C: /* 80251120 0024E060 38 84 00 50 */ addi r4, r4, 0x50 /* 80251124 0024E064 48 0F 53 8D */ bl PSMTXCopy lbl_80251128: -/* 80251128 0024E068 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025112C 0024E06C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80251128 0024E068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025112C 0024E06C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80251130 0024E070 80 83 5F 50 */ lwz r4, 0x5f50(r3) /* 80251134 0024E074 80 7E 00 04 */ lwz r3, 4(r30) /* 80251138 0024E078 C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index 652a1d17ba..276856d702 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -2320,8 +2320,8 @@ dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive: /* 8004B504 00048444 88 03 00 06 */ lbz r0, 6(r3) /* 8004B508 00048448 60 00 00 01 */ ori r0, r0, 1 /* 8004B50C 0004844C 98 03 00 06 */ stb r0, 6(r3) -/* 8004B510 00048450 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8004B514 00048454 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8004B510 00048450 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8004B514 00048454 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8004B518 00048458 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 8004B51C 0004845C 28 00 00 00 */ cmplwi r0, 0 /* 8004B520 00048460 41 82 00 14 */ beq lbl_8004B534 @@ -2473,8 +2473,8 @@ dPa_control_c_NS_level_c_NS_execute: /* 8004B71C 0004865C 40 82 00 6C */ bne lbl_8004B788 /* 8004B720 00048660 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 8004B724 00048664 40 82 00 18 */ bne lbl_8004B73C -/* 8004B728 00048668 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004B72C 0004866C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004B728 00048668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004B72C 0004866C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004B730 00048670 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8004B734 00048674 28 00 00 00 */ cmplwi r0, 0 /* 8004B738 00048678 40 82 00 3C */ bne lbl_8004B774 @@ -3340,8 +3340,8 @@ lbl_8004C29C: /* 8004C29C 000491DC 57 63 04 3E */ clrlwi r3, r27, 0x10 /* 8004C2A0 000491E0 28 03 00 03 */ cmplwi r3, 3 /* 8004C2A4 000491E4 40 82 01 A4 */ bne lbl_8004C448 -/* 8004C2A8 000491E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C2AC 000491EC 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8004C2A8 000491E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C2AC 000491EC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8004C2B0 000491F0 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C2B4 000491F4 38 80 00 00 */ li r4, 0 /* 8004C2B8 000491F8 90 81 00 08 */ stw r4, 8(r1) @@ -3457,8 +3457,8 @@ lbl_8004C448: /* 8004C468 000493A8 28 03 00 06 */ cmplwi r3, 6 /* 8004C46C 000493AC 40 82 00 C8 */ bne lbl_8004C534 lbl_8004C470: -/* 8004C470 000493B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C474 000493B4 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 8004C470 000493B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C474 000493B4 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8004C478 000493B8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8004C47C 000493BC 38 80 00 00 */ li r4, 0 /* 8004C480 000493C0 90 81 00 08 */ stw r4, 8(r1) @@ -3528,8 +3528,8 @@ lbl_8004C570: /* 8004C578 000494B8 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 8004C57C 000494BC D0 01 00 60 */ stfs f0, 0x60(r1) lbl_8004C580: -/* 8004C580 000494C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C584 000494C4 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8004C580 000494C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C584 000494C4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8004C588 000494C8 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C58C 000494CC 38 80 00 00 */ li r4, 0 /* 8004C590 000494D0 90 81 00 08 */ stw r4, 8(r1) @@ -3612,8 +3612,8 @@ lbl_8004C6B8: /* 8004C6C0 00049600 28 03 00 04 */ cmplwi r3, 4 /* 8004C6C4 00049604 40 82 01 5C */ bne lbl_8004C820 lbl_8004C6C8: -/* 8004C6C8 00049608 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C6CC 0004960C 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8004C6C8 00049608 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C6CC 0004960C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8004C6D0 00049610 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C6D4 00049614 38 80 00 00 */ li r4, 0 /* 8004C6D8 00049618 90 81 00 08 */ stw r4, 8(r1) @@ -3737,8 +3737,8 @@ lbl_8004C898: /* 8004C898 000497D8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8004C89C 000497DC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8004C8A0 000497E0 90 01 00 40 */ stw r0, 0x40(r1) -/* 8004C8A4 000497E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C8A8 000497E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004C8A4 000497E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C8A8 000497E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004C8AC 000497EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004C8B0 000497F0 7F 64 DB 78 */ mr r4, r27 /* 8004C8B4 000497F4 38 A1 00 30 */ addi r5, r1, 0x30 @@ -3830,8 +3830,8 @@ lbl_8004C9C8: lbl_8004C9E8: /* 8004C9E8 00049928 3A C0 00 00 */ li r22, 0 /* 8004C9EC 0004992C 3B 00 00 00 */ li r24, 0 -/* 8004C9F0 00049930 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004C9F4 00049934 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l +/* 8004C9F0 00049930 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004C9F4 00049934 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l lbl_8004C9F8: /* 8004C9F8 00049938 38 00 00 00 */ li r0, 0 /* 8004C9FC 0004993C 90 01 00 08 */ stw r0, 8(r1) @@ -4231,8 +4231,8 @@ dPa_control_c_NS_getPolyColor: /* 8004CFB0 00049EF0 7C DD 33 78 */ mr r29, r6 /* 8004CFB4 00049EF4 7C FE 3B 78 */ mr r30, r7 /* 8004CFB8 00049EF8 7D 1F 43 78 */ mr r31, r8 -/* 8004CFBC 00049EFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004CFC0 00049F00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004CFBC 00049EFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004CFC0 00049F00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004CFC4 00049F04 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004CFC8 00049F08 7F 44 D3 78 */ mr r4, r26 /* 8004CFCC 00049F0C 48 02 76 95 */ bl cBgS_NS_ChkPolySafe @@ -4866,8 +4866,8 @@ lbl_8004D850: /* 8004D8B4 0004A7F4 7E 63 9B 78 */ mr r3, r19 /* 8004D8B8 0004A7F8 48 15 DA F1 */ bl dKy_pol_efftype2_get /* 8004D8BC 0004A7FC 7C 7D 1B 78 */ mr r29, r3 -/* 8004D8C0 0004A800 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004D8C4 0004A804 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004D8C0 0004A800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004D8C4 0004A804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004D8C8 0004A808 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004D8CC 0004A80C 7E 64 9B 78 */ mr r4, r19 /* 8004D8D0 0004A810 48 02 75 81 */ bl dBgS_NS_GetPolyAtt0 @@ -4937,8 +4937,8 @@ dPa_control_c_NS_setCommonPoly: /* 8004D9B8 0004A8F8 7D 53 53 78 */ mr r19, r10 /* 8004D9BC 0004A8FC 8A 81 00 A3 */ lbz r20, 0xa3(r1) /* 8004D9C0 0004A900 3A A0 00 00 */ li r21, 0 -/* 8004D9C4 0004A904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004D9C8 0004A908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004D9C4 0004A904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004D9C8 0004A908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004D9CC 0004A90C 39 C3 0F 38 */ addi r14, r3, 0xf38 /* 8004D9D0 0004A910 7D C3 73 78 */ mr r3, r14 /* 8004D9D4 0004A914 7E 24 8B 78 */ mr r4, r17 @@ -4957,8 +4957,8 @@ lbl_8004D9EC: /* 8004DA04 0004A944 3B C0 00 00 */ li r30, 0 /* 8004DA08 0004A948 56 7C 00 00 */ rlwinm r28, r19, 0, 0, 0 /* 8004DA0C 0004A94C 56 7B 03 DE */ rlwinm r27, r19, 0, 0xf, 0xf -/* 8004DA10 0004A950 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004DA14 0004A954 39 C3 61 C0 */ addi r14, r3, lbl_804061C0@l +/* 8004DA10 0004A950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004DA14 0004A954 39 C3 61 C0 */ addi r14, r3, g_dComIfG_gameInfo@l lbl_8004DA18: /* 8004DA18 0004A958 7E 23 8B 78 */ mr r3, r17 /* 8004DA1C 0004A95C 7F 24 CB 78 */ mr r4, r25 diff --git a/asm/d/d_path.s b/asm/d/d_path.s index 283cfc02dd..1a6248d247 100644 --- a/asm/d/d_path.s +++ b/asm/d/d_path.s @@ -32,16 +32,16 @@ dPath_GetRoomPath: /* 800517FC 0004E73C 7C 7F 1B 78 */ mr r31, r3 /* 80051800 0004E740 2C 04 FF FF */ cmpwi r4, -1 /* 80051804 0004E744 40 82 00 20 */ bne lbl_80051824 -/* 80051808 0004E748 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005180C 0004E74C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051808 0004E748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005180C 0004E74C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80051810 0004E750 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80051814 0004E754 81 8C 00 E4 */ lwz r12, 0xe4(r12) /* 80051818 0004E758 7D 89 03 A6 */ mtctr r12 /* 8005181C 0004E75C 4E 80 04 21 */ bctrl /* 80051820 0004E760 48 00 00 34 */ b lbl_80051854 lbl_80051824: -/* 80051824 0004E764 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051828 0004E768 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051824 0004E764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051828 0004E768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005182C 0004E76C 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 80051830 0004E770 4B FD 2B 55 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 80051834 0004E774 28 03 00 00 */ cmplwi r3, 0 @@ -84,16 +84,16 @@ dPath_GetNextRoomPath: /* 800518A8 0004E7E8 7C 7F 1B 78 */ mr r31, r3 /* 800518AC 0004E7EC 2C 04 FF FF */ cmpwi r4, -1 /* 800518B0 0004E7F0 40 82 00 20 */ bne lbl_800518D0 -/* 800518B4 0004E7F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800518B8 0004E7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800518B4 0004E7F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800518B8 0004E7F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800518BC 0004E7FC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800518C0 0004E800 81 8C 00 E4 */ lwz r12, 0xe4(r12) /* 800518C4 0004E804 7D 89 03 A6 */ mtctr r12 /* 800518C8 0004E808 4E 80 04 21 */ bctrl /* 800518CC 0004E80C 48 00 00 34 */ b lbl_80051900 lbl_800518D0: -/* 800518D0 0004E810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800518D4 0004E814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800518D0 0004E810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800518D4 0004E814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800518D8 0004E818 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 800518DC 0004E81C 4B FD 2A A9 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 800518E0 0004E820 28 03 00 00 */ cmplwi r3, 0 @@ -145,8 +145,8 @@ dPath_GetPolyRoomPathVec: /* 80051970 0004E8B0 7C 7A 1B 78 */ mr r26, r3 /* 80051974 0004E8B4 7C 9E 23 78 */ mr r30, r4 /* 80051978 0004E8B8 7C BF 2B 78 */ mr r31, r5 -/* 8005197C 0004E8BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051980 0004E8C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005197C 0004E8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051980 0004E8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80051984 0004E8C4 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 80051988 0004E8C8 7F 83 E3 78 */ mr r3, r28 /* 8005198C 0004E8CC 7F 44 D3 78 */ mr r4, r26 @@ -176,8 +176,8 @@ lbl_800519E4: /* 800519E4 0004E924 88 9D 00 06 */ lbz r4, 6(r29) /* 800519E8 0004E928 28 04 00 FF */ cmplwi r4, 0xff /* 800519EC 0004E92C 41 82 00 24 */ beq lbl_80051A10 -/* 800519F0 0004E930 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800519F4 0004E934 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800519F0 0004E930 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800519F4 0004E934 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800519F8 0004E938 7F 65 DB 78 */ mr r5, r27 /* 800519FC 0004E93C 4B FE 39 65 */ bl isSwitch__10dSv_info_cCFii /* 80051A00 0004E940 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index 07bcdc31dc..a50c7be23d 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -425,8 +425,8 @@ addWarpMaterial: /* 8003A85C 0003779C 38 63 98 B8 */ addi r3, r3, lbl_803798B8@l /* 8003A860 000377A0 38 63 00 23 */ addi r3, r3, 0x23 /* 8003A864 000377A4 38 80 00 5D */ li r4, 0x5d -/* 8003A868 000377A8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8003A86C 000377AC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8003A868 000377A8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8003A86C 000377AC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8003A870 000377B0 3C A5 00 02 */ addis r5, r5, 2 /* 8003A874 000377B4 38 C0 00 80 */ li r6, 0x80 /* 8003A878 000377B8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -781,8 +781,8 @@ dRes_info_c_NS_setWarpSRT: /* 8003AD98 00037CD8 C0 1E 00 08 */ lfs f0, 8(r30) /* 8003AD9C 00037CDC FC 60 00 50 */ fneg f3, f0 /* 8003ADA0 00037CE0 48 30 BB 49 */ bl PSMTXTrans -/* 8003ADA4 00037CE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003ADA8 00037CE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003ADA4 00037CE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003ADA8 00037CE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003ADAC 00037CEC 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 8003ADB0 00037CF0 7C 00 07 74 */ extsb r0, r0 /* 8003ADB4 00037CF4 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -1236,8 +1236,8 @@ lbl_8003B38C: /* 8003B38C 000382CC 80 7E 00 14 */ lwz r3, 0x14(r30) /* 8003B390 000382D0 83 23 00 48 */ lwz r25, 0x48(r3) /* 8003B394 000382D4 3A A0 00 00 */ li r21, 0 -/* 8003B398 000382D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003B39C 000382DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003B398 000382D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003B39C 000382DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003B3A0 000382E0 3E E3 00 02 */ addis r23, r3, 2 /* 8003B3A4 000382E4 3A F7 C2 F8 */ addi r23, r23, -15624 /* 8003B3A8 000382E8 48 00 04 F8 */ b lbl_8003B8A0 @@ -1690,8 +1690,8 @@ dRes_info_c_NS_deleteArchiveRes: /* 8003B9B0 000388F0 80 63 00 14 */ lwz r3, 0x14(r3) /* 8003B9B4 000388F4 83 E3 00 48 */ lwz r31, 0x48(r3) /* 8003B9B8 000388F8 3B C0 00 00 */ li r30, 0 -/* 8003B9BC 000388FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003B9C0 00038900 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003B9BC 000388FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003B9C0 00038900 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003B9C4 00038904 3F 83 00 02 */ addis r28, r3, 2 /* 8003B9C8 00038908 3B 9C C2 F8 */ addi r28, r28, -15624 /* 8003B9CC 0003890C 48 00 00 A4 */ b lbl_8003BA70 @@ -2596,8 +2596,8 @@ dRes_control_c_NS_setStageRes: /* 8003C5E4 00039524 3C A0 80 38 */ lis r5, lbl_803798B8@ha /* 8003C5E8 00039528 38 A5 98 B8 */ addi r5, r5, lbl_803798B8@l /* 8003C5EC 0003952C 38 A5 03 1F */ addi r5, r5, 0x31f -/* 8003C5F0 00039530 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8003C5F4 00039534 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8003C5F0 00039530 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8003C5F4 00039534 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8003C5F8 00039538 38 C6 4E 00 */ addi r6, r6, 0x4e00 /* 8003C5FC 0003953C 4C C6 31 82 */ crclr 6 /* 8003C600 00039540 48 32 9F BD */ bl func_803665BC diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index 59b7420cb3..b7b5a2a069 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -43,8 +43,8 @@ dScope_c: /* 8019370C 0019064C 90 1D 00 58 */ stw r0, 0x58(r29) /* 80193710 00190650 90 1D 00 5C */ stw r0, 0x5c(r29) /* 80193714 00190654 9B DD 00 8D */ stb r30, 0x8d(r29) -/* 80193718 00190658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019371C 0019065C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80193718 00190658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019371C 0019065C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80193720 00190660 80 7F 5D 30 */ lwz r3, 0x5d30(r31) /* 80193724 00190664 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 80193728 00190668 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -368,8 +368,8 @@ lbl_80193B74: /* 80193BB8 00190AF8 7D 80 2A 14 */ add r12, r0, r5 /* 80193BBC 00190AFC 48 1C E4 C9 */ bl func_80362084 /* 80193BC0 00190B00 60 00 00 00 */ nop -/* 80193BC4 00190B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80193BC8 00190B08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80193BC4 00190B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80193BC8 00190B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80193BCC 00190B0C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80193BD0 00190B10 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80193BD4 00190B14 40 82 00 0C */ bne lbl_80193BE0 @@ -391,8 +391,8 @@ lbl_80193C08: /* 80193C0C 00190B4C 28 00 00 02 */ cmplwi r0, 2 /* 80193C10 00190B50 41 82 00 3C */ beq lbl_80193C4C /* 80193C14 00190B54 38 00 00 3D */ li r0, 0x3d -/* 80193C18 00190B58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80193C1C 00190B5C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80193C18 00190B58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80193C1C 00190B5C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80193C20 00190B60 98 04 5E 3F */ stb r0, 0x5e3f(r4) /* 80193C24 00190B64 38 00 00 0A */ li r0, 0xa /* 80193C28 00190B68 98 04 5E 31 */ stb r0, 0x5e31(r4) @@ -430,8 +430,8 @@ lbl_80193C4C: /* 80193CA4 00190BE4 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80193CA8 00190BE8 93 C1 00 28 */ stw r30, 0x28(r1) /* 80193CAC 00190BEC 7C 7E 1B 78 */ mr r30, r3 -/* 80193CB0 00190BF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80193CB4 00190BF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80193CB0 00190BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80193CB4 00190BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80193CB8 00190BF8 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80193CBC 00190BFC 81 83 00 00 */ lwz r12, 0(r3) /* 80193CC0 00190C00 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -448,8 +448,8 @@ lbl_80193C4C: /* 80193CEC 00190C2C FC 00 00 1E */ fctiwz f0, f0 /* 80193CF0 00190C30 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80193CF4 00190C34 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80193CF8 00190C38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80193CFC 00190C3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80193CF8 00190C38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80193CFC 00190C3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80193D00 00190C40 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 80193D04 00190C44 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 80193D08 00190C48 41 82 00 7C */ beq lbl_80193D84 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 7878026168..6438011ab0 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -302,8 +302,8 @@ dStage_roomControl_c_NS_init: /* 8002420C 0002114C 38 00 00 00 */ li r0, 0 /* 80024210 00021150 98 0D 87 E8 */ stb r0, lbl_80450D68-_SDA_BASE_(r13) /* 80024214 00021154 98 8D 80 70 */ stb r4, lbl_804505F0-_SDA_BASE_(r13) -/* 80024218 00021158 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8002421C 0002115C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80024218 00021158 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8002421C 0002115C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80024220 00021160 A8 04 4E 08 */ lha r0, 0x4e08(r4) /* 80024224 00021164 7C 00 07 35 */ extsh. r0, r0 /* 80024228 00021168 40 80 00 0C */ bge lbl_80024234 @@ -334,16 +334,16 @@ lbl_8002424C: /* 80024280 000211C0 41 80 00 40 */ blt lbl_800242C0 /* 80024284 000211C4 7C 60 07 74 */ extsb r0, r3 /* 80024288 000211C8 54 04 28 34 */ slwi r4, r0, 5 -/* 8002428C 000211CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024290 000211D0 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8002428C 000211CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024290 000211D0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 80024294 000211D4 7C 60 22 14 */ add r3, r0, r4 /* 80024298 000211D8 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8002429C 000211DC 48 01 0A 51 */ bl clearRoomSwitch__13dSv_zoneBit_cFv /* 800242A0 000211E0 88 1E 03 F7 */ lbz r0, 0x3f7(r30) /* 800242A4 000211E4 7C 00 07 74 */ extsb r0, r0 /* 800242A8 000211E8 54 04 28 34 */ slwi r4, r0, 5 -/* 800242AC 000211EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800242B0 000211F0 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 800242AC 000211EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800242B0 000211F0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 800242B4 000211F4 7C 60 22 14 */ add r3, r0, r4 /* 800242B8 000211F8 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 800242BC 000211FC 48 01 0A 3D */ bl clearRoomItem__13dSv_zoneBit_cFv @@ -385,8 +385,8 @@ dStage_roomControl_c_NS_initZone: /* 80024338 00021278 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002433C 0002127C 7C 08 02 A6 */ mflr r0 /* 80024340 00021280 90 01 00 14 */ stw r0, 0x14(r1) -/* 80024344 00021284 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024348 00021288 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80024344 00021284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024348 00021288 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002434C 0002128C 48 01 0E 01 */ bl initZone__10dSv_info_cFv /* 80024350 00021290 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 80024354 00021294 38 03 60 94 */ addi r0, r3, lbl_803F6094@l @@ -689,8 +689,8 @@ dStage_roomControl_c_NS_zoneCountCheck: /* 80024738 00021678 38 03 60 94 */ addi r0, r3, lbl_803F6094@l /* 8002473C 0002167C 7C 1E 03 78 */ mr r30, r0 /* 80024740 00021680 3B A0 00 00 */ li r29, 0 -/* 80024744 00021684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024748 00021688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80024744 00021684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024748 00021688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002474C 0002168C 3B E3 4E 20 */ addi r31, r3, 0x4e20 lbl_80024750: /* 80024750 00021690 88 7E 03 F7 */ lbz r3, 0x3f7(r30) @@ -701,16 +701,16 @@ lbl_80024750: /* 80024764 000216A4 40 81 00 A8 */ ble lbl_8002480C /* 80024768 000216A8 7C 60 07 74 */ extsb r0, r3 /* 8002476C 000216AC 54 04 28 34 */ slwi r4, r0, 5 -/* 80024770 000216B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024774 000216B4 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 80024770 000216B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024774 000216B4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 80024778 000216B8 7C 60 22 14 */ add r3, r0, r4 /* 8002477C 000216BC 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 80024780 000216C0 48 01 05 6D */ bl clearRoomSwitch__13dSv_zoneBit_cFv /* 80024784 000216C4 88 1E 03 F7 */ lbz r0, 0x3f7(r30) /* 80024788 000216C8 7C 00 07 74 */ extsb r0, r0 /* 8002478C 000216CC 54 04 28 34 */ slwi r4, r0, 5 -/* 80024790 000216D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024794 000216D4 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 80024790 000216D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024794 000216D4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 80024798 000216D8 7C 60 22 14 */ add r3, r0, r4 /* 8002479C 000216DC 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 800247A0 000216E0 48 01 05 59 */ bl clearRoomItem__13dSv_zoneBit_cFv @@ -735,8 +735,8 @@ lbl_80024750: /* 800247EC 0002172C 88 1E 03 F7 */ lbz r0, 0x3f7(r30) /* 800247F0 00021730 7C 00 07 74 */ extsb r0, r0 /* 800247F4 00021734 54 04 28 34 */ slwi r4, r0, 5 -/* 800247F8 00021738 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800247FC 0002173C 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 800247F8 00021738 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800247FC 0002173C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 80024800 00021740 7C 60 22 14 */ add r3, r0, r4 /* 80024804 00021744 98 A3 09 B4 */ stb r5, 0x9b4(r3) /* 80024808 00021748 98 BE 03 F7 */ stb r5, 0x3f7(r30) @@ -847,8 +847,8 @@ dStage_roomControl_c_NS_resetArchiveBank: /* 80024960 000218A0 39 61 00 20 */ addi r11, r1, 0x20 /* 80024964 000218A4 48 33 D8 75 */ bl _savegpr_28 /* 80024968 000218A8 7C 7D 1B 78 */ mr r29, r3 -/* 8002496C 000218AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024970 000218B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002496C 000218AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024970 000218B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80024974 000218B4 3F C3 00 02 */ addis r30, r3, 2 /* 80024978 000218B8 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 8002497C 000218BC 3B E3 8A 50 */ addi r31, r3, lbl_80378A50@l @@ -1008,14 +1008,14 @@ lbl_80024B70: /* 80024B88 00021AC8 3C 80 80 38 */ lis r4, lbl_80378A50@ha /* 80024B8C 00021ACC 38 84 8A 50 */ addi r4, r4, lbl_80378A50@l /* 80024B90 00021AD0 38 84 00 C6 */ addi r4, r4, 0xc6 -/* 80024B94 00021AD4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80024B98 00021AD8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80024B94 00021AD4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80024B98 00021AD8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80024B9C 00021ADC 38 A5 4E 00 */ addi r5, r5, 0x4e00 /* 80024BA0 00021AE0 54 C6 06 3E */ clrlwi r6, r6, 0x18 /* 80024BA4 00021AE4 4C C6 31 82 */ crclr 6 /* 80024BA8 00021AE8 48 34 19 35 */ bl func_803664DC -/* 80024BAC 00021AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024BB0 00021AF0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80024BAC 00021AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024BB0 00021AF0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80024BB4 00021AF4 80 7F 5C 68 */ lwz r3, 0x5c68(r31) /* 80024BB8 00021AF8 38 81 00 08 */ addi r4, r1, 8 /* 80024BBC 00021AFC 48 00 DB 7D */ bl dLib_getExpandSizeFromAramArchive @@ -1118,8 +1118,8 @@ dStage_roomInit: /* 80024D20 00021C60 48 33 D4 BD */ bl _savegpr_29 /* 80024D24 00021C64 7C 7D 1B 78 */ mr r29, r3 /* 80024D28 00021C68 4B FF F6 C1 */ bl dStage_roomControl_c_NS_setStayNo -/* 80024D2C 00021C6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80024D30 00021C70 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80024D2C 00021C6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80024D30 00021C70 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80024D34 00021C74 38 7E 4E 20 */ addi r3, r30, 0x4e20 /* 80024D38 00021C78 81 9E 4E 20 */ lwz r12, 0x4e20(r30) /* 80024D3C 00021C7C 81 8C 00 30 */ lwz r12, 0x30(r12) @@ -1355,8 +1355,8 @@ lbl_80024FE8: /* 80025054 00021F94 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80025058 00021F98 7D 89 03 A6 */ mtctr r12 /* 8002505C 00021F9C 4E 80 04 21 */ bctrl -/* 80025060 00021FA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80025064 00021FA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80025060 00021FA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80025064 00021FA4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80025068 00021FA8 80 1F 5D AC */ lwz r0, 0x5dac(r31) /* 8002506C 00021FAC 28 00 00 00 */ cmplwi r0, 0 /* 80025070 00021FB0 40 82 00 1C */ bne lbl_8002508C @@ -1372,8 +1372,8 @@ lbl_8002508C: lbl_80025094: /* 80025094 00021FD4 4B FF 4A 15 */ bl fopAcM_CreateAppend /* 80025098 00021FD8 7C 7D 1B 78 */ mr r29, r3 -/* 8002509C 00021FDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800250A0 00021FE0 38 C3 61 C0 */ addi r6, r3, lbl_804061C0@l +/* 8002509C 00021FDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800250A0 00021FE0 38 C3 61 C0 */ addi r6, r3, g_dComIfG_gameInfo@l /* 800250A4 00021FE4 A8 66 4E 08 */ lha r3, 0x4e08(r6) /* 800250A8 00021FE8 80 86 0D C8 */ lwz r4, 0xdc8(r6) /* 800250AC 00021FEC 2C 03 FF FE */ cmpwi r3, -2 @@ -1381,8 +1381,8 @@ lbl_80025094: /* 800250B4 00021FF4 2C 03 FF FD */ cmpwi r3, -3 /* 800250B8 00021FF8 40 82 00 48 */ bne lbl_80025100 lbl_800250BC: -/* 800250BC 00021FFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800250C0 00022000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800250BC 00021FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800250C0 00022000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800250C4 00022004 80 03 0E E4 */ lwz r0, 0xee4(r3) /* 800250C8 00022008 90 1D 00 00 */ stw r0, 0(r29) /* 800250CC 0002200C C0 03 0E D8 */ lfs f0, 0xed8(r3) @@ -1452,8 +1452,8 @@ lbl_80025178: /* 800251B4 000220F4 B0 1D 00 16 */ sth r0, 0x16(r29) /* 800251B8 000220F8 2C 03 FF FC */ cmpwi r3, -4 /* 800251BC 000220FC 40 82 00 18 */ bne lbl_800251D4 -/* 800251C0 00022100 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800251C4 00022104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800251C0 00022100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800251C4 00022104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800251C8 00022108 80 03 0E E4 */ lwz r0, 0xee4(r3) /* 800251CC 0002210C 90 1D 00 00 */ stw r0, 0(r29) /* 800251D0 00022110 48 00 00 38 */ b lbl_80025208 @@ -1474,8 +1474,8 @@ lbl_800251F0: /* 80025204 00022144 90 1D 00 00 */ stw r0, 0(r29) lbl_80025208: /* 80025208 00022148 38 00 00 00 */ li r0, 0 -/* 8002520C 0002214C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80025210 00022150 38 E3 61 C0 */ addi r7, r3, lbl_804061C0@l +/* 8002520C 0002214C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80025210 00022150 38 E3 61 C0 */ addi r7, r3, g_dComIfG_gameInfo@l /* 80025214 00022154 90 07 0D C8 */ stw r0, 0xdc8(r7) /* 80025218 00022158 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 8002521C 0002215C 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -1849,14 +1849,14 @@ dStage_stagInfo_GetParticleNo: /* 80025780 000226C0 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80025784 000226C4 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80025788 000226C8 38 63 00 E3 */ addi r3, r3, 0xe3 -/* 8002578C 000226CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80025790 000226D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8002578C 000226CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80025790 000226D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80025794 000226D4 3C 84 00 02 */ addis r4, r4, 2 /* 80025798 000226D8 38 84 D4 F8 */ addi r4, r4, -11016 /* 8002579C 000226DC 38 A0 00 40 */ li r5, 0x40 /* 800257A0 000226E0 48 01 69 F5 */ bl dRes_control_c_NS_deleteRes -/* 800257A4 000226E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800257A8 000226E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800257A4 000226E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800257A8 000226E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800257AC 000226EC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800257B0 000226F0 81 8C 01 34 */ lwz r12, 0x134(r12) /* 800257B4 000226F4 7D 89 03 A6 */ mtctr r12 @@ -1869,15 +1869,15 @@ lbl_800257BC: /* 800257CC 0002270C 4E 80 04 21 */ bctrl /* 800257D0 00022710 88 03 00 09 */ lbz r0, 9(r3) /* 800257D4 00022714 54 1F FE FE */ rlwinm r31, r0, 0x1f, 0x1b, 0x1f -/* 800257D8 00022718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800257DC 0002271C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800257D8 00022718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800257DC 0002271C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800257E0 00022720 7F E4 FB 78 */ mr r4, r31 /* 800257E4 00022724 48 00 F8 D9 */ bl getSave__10dSv_info_cFi /* 800257E8 00022728 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 800257EC 0002272C 38 63 07 EC */ addi r3, r3, lbl_804307EC@l /* 800257F0 00022730 48 23 6A 09 */ bl dSvBit_HIO_c_NS_init -/* 800257F4 00022734 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800257F8 00022738 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800257F4 00022734 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800257F8 00022738 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800257FC 0002273C 38 63 09 78 */ addi r3, r3, 0x978 /* 80025800 00022740 7F E4 07 74 */ extsb r4, r31 /* 80025804 00022744 48 00 F3 11 */ bl init__12dSv_danBit_cFSc @@ -1915,8 +1915,8 @@ lbl_800257BC: /* 80025884 000227C4 7C 9C 23 78 */ mr r28, r4 /* 80025888 000227C8 83 C4 00 08 */ lwz r30, 8(r4) /* 8002588C 000227CC 3B A0 00 00 */ li r29, 0 -/* 80025890 000227D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80025894 000227D4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80025890 000227D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80025894 000227D4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80025898 000227D8 48 00 00 98 */ b lbl_80025930 lbl_8002589C: /* 8002589C 000227DC 7F E3 FB 78 */ mr r3, r31 @@ -2039,8 +2039,8 @@ dStage_actorInit: /* 80025A50 00022990 7C 9C 23 78 */ mr r28, r4 /* 80025A54 00022994 83 C4 00 08 */ lwz r30, 8(r4) /* 80025A58 00022998 3B A0 00 00 */ li r29, 0 -/* 80025A5C 0002299C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80025A60 000229A0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80025A5C 0002299C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80025A60 000229A0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80025A64 000229A4 48 00 00 98 */ b lbl_80025AFC lbl_80025A68: /* 80025A68 000229A8 7F E3 FB 78 */ mr r3, r31 @@ -2101,8 +2101,8 @@ lbl_80025AFC: /* 80025B3C 00022A7C 7C 9C 23 78 */ mr r28, r4 /* 80025B40 00022A80 83 C4 00 08 */ lwz r30, 8(r4) /* 80025B44 00022A84 3B A0 00 00 */ li r29, 0 -/* 80025B48 00022A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80025B4C 00022A8C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80025B48 00022A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80025B4C 00022A8C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80025B50 00022A90 48 00 00 84 */ b lbl_80025BD4 lbl_80025B54: /* 80025B54 00022A94 7F E3 FB 78 */ mr r3, r31 @@ -2753,8 +2753,8 @@ readMult: /* 80026478 000233B8 7C BD 2B 78 */ mr r29, r5 /* 8002647C 000233BC 41 82 01 48 */ beq lbl_800265C4 /* 80026480 000233C0 83 FC 00 04 */ lwz r31, 4(r28) -/* 80026484 000233C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026488 000233C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026484 000233C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026488 000233C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002648C 000233CC 3B C3 4E 20 */ addi r30, r3, 0x4e20 /* 80026490 000233D0 7F C3 F3 78 */ mr r3, r30 /* 80026494 000233D4 81 9E 00 00 */ lwz r12, 0(r30) @@ -3119,8 +3119,8 @@ layerTableLoader: /* 800269D8 00023918 7C BD 2B 78 */ mr r29, r5 /* 800269DC 0002391C 48 00 00 18 */ b lbl_800269F4 lbl_800269E0: -/* 800269E0 00023920 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800269E4 00023924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800269E0 00023920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800269E4 00023924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800269E8 00023928 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 800269EC 0002392C 7C 00 07 74 */ extsb r0, r0 /* 800269F0 00023930 7C 1D 03 78 */ mr r29, r0 @@ -3138,8 +3138,8 @@ lbl_800269F4: /* 80026A1C 0002395C 38 A5 66 44 */ addi r5, r5, lbl_803A6644@l /* 80026A20 00023960 38 C0 00 01 */ li r6, 1 /* 80026A24 00023964 4B FF F6 91 */ bl dStage_dt_c_decode -/* 80026A28 00023968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026A2C 0002396C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026A28 00023968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026A2C 0002396C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026A30 00023970 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80026A34 00023974 81 8C 01 70 */ lwz r12, 0x170(r12) /* 80026A38 00023978 7D 89 03 A6 */ mtctr r12 @@ -3341,8 +3341,8 @@ dStage_infoCreate: /* 80026CF8 00023C38 38 63 01 19 */ addi r3, r3, 0x119 /* 80026CFC 00023C3C 48 00 87 39 */ bl dComIfG_getStageRes /* 80026D00 00023C40 7C 7E 1B 78 */ mr r30, r3 -/* 80026D04 00023C44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026D08 00023C48 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80026D04 00023C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026D08 00023C48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80026D0C 00023C4C 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 80026D10 00023C50 4B FF D4 D9 */ bl dStage_roomControl_c_NS_init /* 80026D14 00023C54 7F C3 F3 78 */ mr r3, r30 @@ -3365,13 +3365,13 @@ dStage_Create: /* 80026D4C 00023C8C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026D50 00023C90 38 63 01 19 */ addi r3, r3, 0x119 /* 80026D54 00023C94 48 00 86 E1 */ bl dComIfG_getStageRes -/* 80026D58 00023C98 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80026D5C 00023C9C 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 80026D58 00023C98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80026D5C 00023C9C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80026D60 00023CA0 38 9F 4E 20 */ addi r4, r31, 0x4e20 /* 80026D64 00023CA4 4B FF FD F5 */ bl dStage_dt_c_stageLoader /* 80026D68 00023CA8 48 00 A8 3D */ bl daSus_c_NS_execute -/* 80026D6C 00023CAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026D70 00023CB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026D6C 00023CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026D70 00023CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026D74 00023CB4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80026D78 00023CB8 7C 03 07 75 */ extsb. r3, r0 /* 80026D7C 00023CBC 41 80 00 08 */ blt lbl_80026D84 @@ -3419,15 +3419,15 @@ dStage_Delete: /* 80026E10 00023D50 8C 03 61 94 */ lbzu r0, lbl_80406194@l(r3) /* 80026E14 00023D54 7C 00 07 75 */ extsb. r0, r0 /* 80026E18 00023D58 41 82 00 1C */ beq lbl_80026E34 -/* 80026E1C 00023D5C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80026E20 00023D60 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80026E1C 00023D5C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80026E20 00023D60 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80026E24 00023D64 3C 84 00 02 */ addis r4, r4, 2 /* 80026E28 00023D68 38 A0 00 80 */ li r5, 0x80 /* 80026E2C 00023D6C 38 84 C2 F8 */ addi r4, r4, -15624 /* 80026E30 00023D70 48 01 53 65 */ bl dRes_control_c_NS_deleteRes lbl_80026E34: -/* 80026E34 00023D74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026E38 00023D78 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80026E34 00023D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026E38 00023D78 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80026E3C 00023D7C 3B DF 4E 20 */ addi r30, r31, 0x4e20 /* 80026E40 00023D80 7F C3 F3 78 */ mr r3, r30 /* 80026E44 00023D84 81 9E 00 00 */ lwz r12, 0(r30) @@ -3436,8 +3436,8 @@ lbl_80026E34: /* 80026E50 00023D90 4E 80 04 21 */ bctrl /* 80026E54 00023D94 88 03 00 09 */ lbz r0, 9(r3) /* 80026E58 00023D98 54 04 FE FE */ rlwinm r4, r0, 0x1f, 0x1b, 0x1f -/* 80026E5C 00023D9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026E60 00023DA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026E5C 00023D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026E60 00023DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026E64 00023DA4 48 00 E2 8D */ bl putSave__10dSv_info_cFi /* 80026E68 00023DA8 38 6D 87 F4 */ addi r3, r13, lbl_80450D74-_SDA_BASE_ /* 80026E6C 00023DAC 4B FF DC 51 */ bl dStage_roomControl_c_NS_roomDzs_c_NS_remove @@ -3445,8 +3445,8 @@ lbl_80026E34: /* 80026E74 00023DB4 80 03 00 00 */ lwz r0, 0(r3) /* 80026E78 00023DB8 2C 00 00 00 */ cmpwi r0, 0 /* 80026E7C 00023DBC 40 82 00 2C */ bne lbl_80026EA8 -/* 80026E80 00023DC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026E84 00023DC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026E80 00023DC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026E84 00023DC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026E88 00023DC8 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 80026E8C 00023DCC 7C 00 07 75 */ extsb. r0, r0 /* 80026E90 00023DD0 41 82 00 18 */ beq lbl_80026EA8 @@ -3469,8 +3469,8 @@ lbl_80026EA8: /* 80026ED0 00023E10 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026ED4 00023E14 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026ED8 00023E18 38 63 01 32 */ addi r3, r3, 0x132 -/* 80026EDC 00023E1C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80026EE0 00023E20 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80026EDC 00023E1C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80026EE0 00023E20 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80026EE4 00023E24 3C 84 00 02 */ addis r4, r4, 2 /* 80026EE8 00023E28 38 84 D4 F8 */ addi r4, r4, -11016 /* 80026EEC 00023E2C 38 A0 00 40 */ li r5, 0x40 @@ -3487,8 +3487,8 @@ lbl_80026F14: /* 80026F14 00023E54 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026F18 00023E58 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026F1C 00023E5C 38 63 01 32 */ addi r3, r3, 0x132 -/* 80026F20 00023E60 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80026F24 00023E64 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80026F20 00023E60 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80026F24 00023E64 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80026F28 00023E68 3C 84 00 02 */ addis r4, r4, 2 /* 80026F2C 00023E6C 3B A4 D4 F8 */ addi r29, r4, -11016 /* 80026F30 00023E70 7F A4 EB 78 */ mr r4, r29 @@ -3509,15 +3509,15 @@ lbl_80026F68: /* 80026F68 00023EA8 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026F6C 00023EAC 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026F70 00023EB0 38 63 01 39 */ addi r3, r3, 0x139 -/* 80026F74 00023EB4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80026F78 00023EB8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80026F74 00023EB4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80026F78 00023EB8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80026F7C 00023EBC 3F A4 00 02 */ addis r29, r4, 2 /* 80026F80 00023EC0 3B BD C2 F8 */ addi r29, r29, -15624 /* 80026F84 00023EC4 7F A4 EB 78 */ mr r4, r29 /* 80026F88 00023EC8 38 A0 00 80 */ li r5, 0x80 /* 80026F8C 00023ECC 48 01 52 09 */ bl dRes_control_c_NS_deleteRes -/* 80026F90 00023ED0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80026F94 00023ED4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80026F90 00023ED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80026F94 00023ED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026F98 00023ED8 80 63 5D 88 */ lwz r3, 0x5d88(r3) /* 80026F9C 00023EDC 7F A4 EB 78 */ mr r4, r29 /* 80026FA0 00023EE0 38 A0 00 80 */ li r5, 0x80 @@ -3553,8 +3553,8 @@ dStage_RoomCheck: /* 8002700C 00023F4C 7F E4 FB 78 */ mr r4, r31 /* 80027010 00023F50 48 00 00 1C */ b lbl_8002702C lbl_80027014: -/* 80027014 00023F54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80027018 00023F58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80027014 00023F54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80027018 00023F58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002701C 00023F5C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80027020 00023F60 38 84 00 14 */ addi r4, r4, 0x14 /* 80027024 00023F64 48 04 E0 DD */ bl dBgS_NS_GetRoomId @@ -3569,8 +3569,8 @@ lbl_8002703C: /* 80027040 00023F80 7C 00 07 74 */ extsb r0, r0 /* 80027044 00023F84 7C 04 00 00 */ cmpw r4, r0 /* 80027048 00023F88 41 82 00 14 */ beq lbl_8002705C -/* 8002704C 00023F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80027050 00023F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002704C 00023F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80027050 00023F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027054 00023F94 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 80027058 00023F98 4B FF D6 C5 */ bl dStage_roomControl_c_NS_zoneCountCheck lbl_8002705C: @@ -3579,8 +3579,8 @@ lbl_8002705C: /* 80027064 00023FA4 8B ED 87 E4 */ lbz r31, lbl_80450D64-_SDA_BASE_(r13) /* 80027068 00023FA8 7F FF 07 74 */ extsb r31, r31 lbl_8002706C: -/* 8002706C 00023FAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80027070 00023FB0 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8002706C 00023FAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80027070 00023FB0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80027074 00023FB4 38 7D 4E 20 */ addi r3, r29, 0x4e20 /* 80027078 00023FB8 81 9D 4E 20 */ lwz r12, 0x4e20(r29) /* 8002707C 00023FBC 81 8C 00 30 */ lwz r12, 0x30(r12) @@ -3631,8 +3631,8 @@ dStage_changeSceneExitId: /* 8002711C 0002405C 7C 9D 23 78 */ mr r29, r4 /* 80027120 00024060 7C BE 2B 78 */ mr r30, r5 /* 80027124 00024064 7C DF 33 78 */ mr r31, r6 -/* 80027128 00024068 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002712C 0002406C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80027128 00024068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002712C 0002406C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027130 00024070 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80027134 00024074 7C 04 03 78 */ mr r4, r0 /* 80027138 00024078 48 04 DA 61 */ bl dBgS_NS_GetExitId @@ -3667,16 +3667,16 @@ dStage_changeScene: /* 800271A0 000240E0 7C A4 07 74 */ extsb r4, r5 /* 800271A4 000240E4 2C 04 FF FF */ cmpwi r4, -1 /* 800271A8 000240E8 40 82 00 20 */ bne lbl_800271C8 -/* 800271AC 000240EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800271B0 000240F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800271AC 000240EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800271B0 000240F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800271B4 000240F4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 800271B8 000240F8 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 800271BC 000240FC 7D 89 03 A6 */ mtctr r12 /* 800271C0 00024100 4E 80 04 21 */ bctrl /* 800271C4 00024104 48 00 00 24 */ b lbl_800271E8 lbl_800271C8: -/* 800271C8 00024108 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800271CC 0002410C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800271C8 00024108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800271CC 0002410C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800271D0 00024110 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 800271D4 00024114 4B FF D1 B1 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 800271D8 00024118 81 83 00 00 */ lwz r12, 0(r3) @@ -3775,16 +3775,16 @@ dStage_changeScene4Event: /* 80027328 00024268 7C 84 07 74 */ extsb r4, r4 /* 8002732C 0002426C 2C 04 FF FF */ cmpwi r4, -1 /* 80027330 00024270 40 82 00 20 */ bne lbl_80027350 -/* 80027334 00024274 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80027338 00024278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80027334 00024274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80027338 00024278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002733C 0002427C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80027340 00024280 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 80027344 00024284 7D 89 03 A6 */ mtctr r12 /* 80027348 00024288 4E 80 04 21 */ bctrl /* 8002734C 0002428C 48 00 00 24 */ b lbl_80027370 lbl_80027350: -/* 80027350 00024290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80027354 00024294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80027350 00024290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80027354 00024294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027358 00024298 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8002735C 0002429C 4B FF D0 29 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 80027360 000242A0 81 83 00 00 */ lwz r12, 0(r3) @@ -3894,8 +3894,8 @@ dStage_restartRoom: /* 800274CC 0002440C 90 A1 00 08 */ stw r5, 8(r1) /* 800274D0 00024410 38 00 00 00 */ li r0, 0 /* 800274D4 00024414 90 01 00 0C */ stw r0, 0xc(r1) -/* 800274D8 00024418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800274DC 0002441C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800274D8 00024418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800274DC 0002441C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800274E0 00024420 38 7F 4E 00 */ addi r3, r31, 0x4e00 /* 800274E4 00024424 38 80 FF FF */ li r4, -1 /* 800274E8 00024428 88 1F 0D B4 */ lbz r0, 0xdb4(r31) diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 92ca2c439c..25980bd308 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -26,16 +26,16 @@ dTimer_c_NS__create: lbl_8025CA54: /* 8025CA54 00259994 3C 60 80 3A */ lis r3, lbl_8039A3D8@ha /* 8025CA58 00259998 38 63 A3 D8 */ addi r3, r3, lbl_8039A3D8@l -/* 8025CA5C 0025999C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025CA60 002599A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025CA5C 0025999C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025CA60 002599A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025CA64 002599A4 3C 84 00 02 */ addis r4, r4, 2 /* 8025CA68 002599A8 38 A0 00 80 */ li r5, 0x80 /* 8025CA6C 002599AC 38 84 C2 F8 */ addi r4, r4, -15624 /* 8025CA70 002599B0 4B DD F7 75 */ bl dRes_control_c_NS_getResInfo /* 8025CA74 002599B4 7C 7D 1B 78 */ mr r29, r3 /* 8025CA78 002599B8 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8025CA7C 002599BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025CA80 002599C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025CA7C 002599BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025CA80 002599C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025CA84 002599C4 90 03 5C E0 */ stw r0, 0x5ce0(r3) /* 8025CA88 002599C8 3C 60 00 01 */ lis r3, 0x00011000@ha /* 8025CA8C 002599CC 38 63 10 00 */ addi r3, r3, 0x00011000@l @@ -61,8 +61,8 @@ lbl_8025CAD0: /* 8025CAD8 00259A18 2C 04 00 0A */ cmpwi r4, 0xa /* 8025CADC 00259A1C 40 82 00 2C */ bne lbl_8025CB08 /* 8025CAE0 00259A20 83 BD 00 14 */ lwz r29, 0x14(r29) -/* 8025CAE4 00259A24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025CAE8 00259A28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025CAE4 00259A24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025CAE8 00259A28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025CAEC 00259A2C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025CAF0 00259A30 4B DD 00 CD */ bl dComIfG_play_c_NS_getTimerMode /* 8025CAF4 00259A34 7C 64 1B 78 */ mr r4, r3 @@ -89,8 +89,8 @@ lbl_8025CB2C: /* 8025CB38 00259A78 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 8025CB3C 00259A7C 2C 00 00 0A */ cmpwi r0, 0xa /* 8025CB40 00259A80 40 82 01 B0 */ bne lbl_8025CCF0 -/* 8025CB44 00259A84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025CB48 00259A88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025CB44 00259A84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025CB48 00259A88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025CB4C 00259A8C 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8025CB50 00259A90 7F C3 F3 78 */ mr r3, r30 /* 8025CB54 00259A94 4B DD 00 69 */ bl dComIfG_play_c_NS_getTimerMode @@ -226,8 +226,8 @@ lbl_8025CCF0: /* 8025CD44 00259C84 7F E3 FB 78 */ mr r3, r31 /* 8025CD48 00259C88 48 00 0C A9 */ bl dTimer_c_NS_getTimeMs /* 8025CD4C 00259C8C 7C 64 1B 78 */ mr r4, r3 -/* 8025CD50 00259C90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025CD54 00259C94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025CD50 00259C90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025CD54 00259C94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025CD58 00259C98 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8025CD5C 00259C9C 7F A3 EB 78 */ mr r3, r29 /* 8025CD60 00259CA0 4B DC FE 35 */ bl dComIfG_play_c_NS_setTimerNowTimeMs @@ -355,8 +355,8 @@ dTimer_c_NS__execute: /* 8025CF1C 00259E5C 80 03 01 54 */ lwz r0, 0x154(r3) /* 8025CF20 00259E60 2C 00 00 06 */ cmpwi r0, 6 /* 8025CF24 00259E64 40 82 00 1C */ bne lbl_8025CF40 -/* 8025CF28 00259E68 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025CF2C 00259E6C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025CF28 00259E68 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025CF2C 00259E6C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025CF30 00259E70 A0 04 00 02 */ lhz r0, 2(r4) /* 8025CF34 00259E74 28 00 00 00 */ cmplwi r0, 0 /* 8025CF38 00259E78 40 82 00 08 */ bne lbl_8025CF40 @@ -365,8 +365,8 @@ lbl_8025CF40: /* 8025CF40 00259E80 88 1F 01 6A */ lbz r0, 0x16a(r31) /* 8025CF44 00259E84 28 00 00 01 */ cmplwi r0, 1 /* 8025CF48 00259E88 41 82 02 20 */ beq lbl_8025D168 -/* 8025CF4C 00259E8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025CF50 00259E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025CF4C 00259E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025CF50 00259E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025CF54 00259E94 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025CF58 00259E98 28 00 00 00 */ cmplwi r0, 0 /* 8025CF5C 00259E9C 40 82 00 20 */ bne lbl_8025CF7C @@ -451,8 +451,8 @@ lbl_8025D068: /* 8025D074 00259FB4 7F E3 FB 78 */ mr r3, r31 /* 8025D078 00259FB8 48 00 09 79 */ bl dTimer_c_NS_getTimeMs /* 8025D07C 00259FBC 7C 64 1B 78 */ mr r4, r3 -/* 8025D080 00259FC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D084 00259FC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D080 00259FC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D084 00259FC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D088 00259FC8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8025D08C 00259FCC 7F C3 F3 78 */ mr r3, r30 /* 8025D090 00259FD0 4B DC FB 05 */ bl dComIfG_play_c_NS_setTimerNowTimeMs @@ -517,8 +517,8 @@ lbl_8025D168: /* 8025D168 0025A0A8 88 1F 01 6B */ lbz r0, 0x16b(r31) /* 8025D16C 0025A0AC 28 00 00 02 */ cmplwi r0, 2 /* 8025D170 0025A0B0 40 82 00 40 */ bne lbl_8025D1B0 -/* 8025D174 0025A0B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D178 0025A0B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D174 0025A0B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D178 0025A0B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D17C 0025A0BC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025D180 0025A0C0 28 00 00 00 */ cmplwi r0, 0 /* 8025D184 0025A0C4 40 82 00 2C */ bne lbl_8025D1B0 @@ -650,8 +650,8 @@ dTimer_c_NS__draw: /* 8025D344 0025A284 90 01 00 14 */ stw r0, 0x14(r1) /* 8025D348 0025A288 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025D34C 0025A28C 7C 7F 1B 78 */ mr r31, r3 -/* 8025D350 0025A290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D354 0025A294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D350 0025A290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D354 0025A294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D358 0025A298 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025D35C 0025A29C 28 00 00 00 */ cmplwi r0, 0 /* 8025D360 0025A2A0 40 82 00 20 */ bne lbl_8025D380 @@ -666,8 +666,8 @@ lbl_8025D380: /* 8025D380 0025A2C0 38 60 00 01 */ li r3, 1 /* 8025D384 0025A2C4 48 00 00 24 */ b lbl_8025D3A8 lbl_8025D388: -/* 8025D388 0025A2C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D38C 0025A2CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D388 0025A2C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D38C 0025A2CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D390 0025A2D0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8025D394 0025A2D4 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8025D398 0025A2D8 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -730,8 +730,8 @@ lbl_8025D44C: /* 8025D460 0025A3A0 7F E3 FB 78 */ mr r3, r31 /* 8025D464 0025A3A4 48 00 05 8D */ bl dTimer_c_NS_getTimeMs /* 8025D468 0025A3A8 7C 64 1B 78 */ mr r4, r3 -/* 8025D46C 0025A3AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D470 0025A3B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D46C 0025A3AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D470 0025A3B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D474 0025A3B4 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8025D478 0025A3B8 7F C3 F3 78 */ mr r3, r30 /* 8025D47C 0025A3BC 4B DC F7 19 */ bl dComIfG_play_c_NS_setTimerNowTimeMs @@ -745,8 +745,8 @@ lbl_8025D44C: /* 8025D49C 0025A3DC 4B DC F7 19 */ bl dComIfG_play_c_NS_setTimerMode /* 8025D4A0 0025A3E0 48 00 00 34 */ b lbl_8025D4D4 lbl_8025D4A4: -/* 8025D4A4 0025A3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D4A8 0025A3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D4A4 0025A3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D4A8 0025A3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D4AC 0025A3EC 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8025D4B0 0025A3F0 7F C3 F3 78 */ mr r3, r30 /* 8025D4B4 0025A3F4 38 80 00 00 */ li r4, 0 @@ -758,8 +758,8 @@ lbl_8025D4A4: /* 8025D4CC 0025A40C 38 80 FF FF */ li r4, -1 /* 8025D4D0 0025A410 4B DC F6 E5 */ bl dComIfG_play_c_NS_setTimerMode lbl_8025D4D4: -/* 8025D4D4 0025A414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D4D8 0025A418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D4D4 0025A414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D4D8 0025A418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D4DC 0025A41C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025D4E0 0025A420 38 80 00 00 */ li r4, 0 /* 8025D4E4 0025A424 4B DC F6 F1 */ bl dComIfG_play_c_NS_setTimerPtr @@ -768,8 +768,8 @@ lbl_8025D4D4: /* 8025D4F0 0025A430 38 84 A3 D8 */ addi r4, r4, lbl_8039A3D8@l /* 8025D4F4 0025A434 4B DC FB 15 */ bl dComIfG_resDelete /* 8025D4F8 0025A438 38 00 00 00 */ li r0, 0 -/* 8025D4FC 0025A43C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D500 0025A440 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D4FC 0025A43C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D500 0025A440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D504 0025A444 90 03 5C E0 */ stw r0, 0x5ce0(r3) /* 8025D508 0025A448 38 60 00 01 */ li r3, 1 /* 8025D50C 0025A44C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -941,8 +941,8 @@ dTimer_c_NS_stock_start: /* 8025D738 0025A678 90 7F 01 10 */ stw r3, 0x110(r31) /* 8025D73C 0025A67C 90 9F 01 1C */ stw r4, 0x11c(r31) /* 8025D740 0025A680 90 7F 01 18 */ stw r3, 0x118(r31) -/* 8025D744 0025A684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D748 0025A688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D744 0025A684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D748 0025A688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D74C 0025A68C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025D750 0025A690 4B DC F4 4D */ bl dComIfG_play_c_NS_getTimerNowTimeMs /* 8025D754 0025A694 80 FF 01 10 */ lwz r7, 0x110(r31) @@ -1118,8 +1118,8 @@ lbl_8025D950: /* 8025D99C 0025A8DC 7C C5 03 96 */ divwu r6, r5, r0 /* 8025D9A0 0025A8E0 38 A0 00 00 */ li r5, 0 /* 8025D9A4 0025A8E4 48 10 49 81 */ bl func_80362324 -/* 8025D9A8 0025A8E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025D9AC 0025A8EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025D9A8 0025A8E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025D9AC 0025A8EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D9B0 0025A8F0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025D9B4 0025A8F4 4B DC F1 E1 */ bl dComIfG_play_c_NS_setTimerNowTimeMs /* 8025D9B8 0025A8F8 2C 1F FF FF */ cmpwi r31, -1 @@ -2549,8 +2549,8 @@ dDlst_TimerScrnDraw_c_NS_changeNumberTexture: lbl_8025EE50: /* 8025EE50 0025BD90 3B C0 00 00 */ li r30, 0 lbl_8025EE54: -/* 8025EE54 0025BD94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025EE58 0025BD98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025EE54 0025BD94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025EE58 0025BD98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025EE5C 0025BD9C 83 E3 5D 30 */ lwz r31, 0x5d30(r3) /* 8025EE60 0025BDA0 7F 83 E3 78 */ mr r3, r28 /* 8025EE64 0025BDA4 7F C4 F3 78 */ mr r4, r30 @@ -2682,8 +2682,8 @@ lbl_8025F014: /* 8025F024 0025BF64 80 79 00 18 */ lwz r3, 0x18(r25) /* 8025F028 0025BF68 28 03 00 00 */ cmplwi r3, 0 /* 8025F02C 0025BF6C 41 82 01 3C */ beq lbl_8025F168 -/* 8025F030 0025BF70 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025F034 0025BF74 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025F030 0025BF70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025F034 0025BF74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025F038 0025BF78 88 04 4F AC */ lbz r0, 0x4fac(r4) /* 8025F03C 0025BF7C 28 00 00 01 */ cmplwi r0, 1 /* 8025F040 0025BF80 40 82 00 10 */ bne lbl_8025F050 @@ -3172,8 +3172,8 @@ lbl_8025F758: /* 8025F760 0025C6A0 3B 5A 00 04 */ addi r26, r26, 4 /* 8025F764 0025C6A4 41 80 FF C0 */ blt lbl_8025F724 lbl_8025F768: -/* 8025F768 0025C6A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025F76C 0025C6AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025F768 0025C6A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025F76C 0025C6AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025F770 0025C6B0 88 03 4F AC */ lbz r0, 0x4fac(r3) /* 8025F774 0025C6B4 28 00 00 01 */ cmplwi r0, 1 /* 8025F778 0025C6B8 40 82 00 10 */ bne lbl_8025F788 @@ -3419,8 +3419,8 @@ dDlst_TimerScrnDraw_c_NS_setShowType: /* 8025FAD4 0025CA14 93 C1 00 08 */ stw r30, 8(r1) /* 8025FAD8 0025CA18 7C 7E 1B 78 */ mr r30, r3 /* 8025FADC 0025CA1C 7C 9F 23 78 */ mr r31, r4 -/* 8025FAE0 0025CA20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025FAE4 0025CA24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025FAE0 0025CA20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025FAE4 0025CA24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025FAE8 0025CA28 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025FAEC 0025CA2C 4B DC D0 D9 */ bl dComIfG_play_c_NS_setTimerType /* 8025FAF0 0025CA30 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -4228,8 +4228,8 @@ lbl_8026067C: /* 802606B4 0025D5F4 39 61 00 50 */ addi r11, r1, 0x50 /* 802606B8 0025D5F8 48 10 1B 19 */ bl _savegpr_26 /* 802606BC 0025D5FC 7C 7B 1B 78 */ mr r27, r3 -/* 802606C0 0025D600 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802606C4 0025D604 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802606C0 0025D600 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802606C4 0025D604 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802606C8 0025D608 83 C3 5F 50 */ lwz r30, 0x5f50(r3) /* 802606CC 0025D60C 7F C3 F3 78 */ mr r3, r30 /* 802606D0 0025D610 81 9E 00 00 */ lwz r12, 0(r30) @@ -4840,8 +4840,8 @@ dTimer_createTimer: /* 80260FBC 0025DEFC FF A0 10 90 */ fmr f29, f2 /* 80260FC0 0025DF00 FF C0 18 90 */ fmr f30, f3 /* 80260FC4 0025DF04 FF E0 20 90 */ fmr f31, f4 -/* 80260FC8 0025DF08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80260FCC 0025DF0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80260FC8 0025DF08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80260FCC 0025DF0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80260FD0 0025DF10 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80260FD4 0025DF14 4B DC BB E9 */ bl dComIfG_play_c_NS_getTimerMode /* 80260FD8 0025DF18 2C 03 FF FF */ cmpwi r3, -1 @@ -4876,8 +4876,8 @@ dTimer_createStockTimer: /* 80261038 0025DF78 7C 08 02 A6 */ mflr r0 /* 8026103C 0025DF7C 90 01 00 14 */ stw r0, 0x14(r1) /* 80261040 0025DF80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261044 0025DF84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261048 0025DF88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261044 0025DF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261048 0025DF88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8026104C 0025DF8C 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80261050 0025DF90 7F E3 FB 78 */ mr r3, r31 /* 80261054 0025DF94 4B DC BB 69 */ bl dComIfG_play_c_NS_getTimerMode @@ -4933,8 +4933,8 @@ lbl_802610EC: /* 8026110C 0025E04C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80261110 0025E050 93 C1 00 28 */ stw r30, 0x28(r1) /* 80261114 0025E054 7C 9E 23 78 */ mr r30, r4 -/* 80261118 0025E058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8026111C 0025E05C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261118 0025E058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8026111C 0025E05C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261120 0025E060 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80261124 0025E064 7F E3 FB 78 */ mr r3, r31 /* 80261128 0025E068 4B DC BA B5 */ bl dComIfG_play_c_NS_getTimerPtr @@ -4972,8 +4972,8 @@ dTimer_createStart2D: /* 80261194 0025E0D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80261198 0025E0D8 93 C1 00 08 */ stw r30, 8(r1) /* 8026119C 0025E0DC 7C 9E 23 78 */ mr r30, r4 -/* 802611A0 0025E0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802611A4 0025E0E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802611A0 0025E0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802611A4 0025E0E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802611A8 0025E0E8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 802611AC 0025E0EC 7F E3 FB 78 */ mr r3, r31 /* 802611B0 0025E0F0 4B DC BA 2D */ bl dComIfG_play_c_NS_getTimerPtr @@ -4998,8 +4998,8 @@ lbl_802611D8: /* 802611F4 0025E134 7C 08 02 A6 */ mflr r0 /* 802611F8 0025E138 90 01 00 14 */ stw r0, 0x14(r1) /* 802611FC 0025E13C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261200 0025E140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261204 0025E144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261200 0025E140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261204 0025E144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261208 0025E148 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8026120C 0025E14C 7F E3 FB 78 */ mr r3, r31 /* 80261210 0025E150 4B DC B9 CD */ bl dComIfG_play_c_NS_getTimerPtr @@ -5021,8 +5021,8 @@ lbl_80261230: /* 80261248 0025E188 7C 08 02 A6 */ mflr r0 /* 8026124C 0025E18C 90 01 00 14 */ stw r0, 0x14(r1) /* 80261250 0025E190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261254 0025E194 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261258 0025E198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261254 0025E194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261258 0025E198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8026125C 0025E19C 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80261260 0025E1A0 7F E3 FB 78 */ mr r3, r31 /* 80261264 0025E1A4 4B DC B9 79 */ bl dComIfG_play_c_NS_getTimerPtr @@ -5044,8 +5044,8 @@ lbl_80261284: /* 8026129C 0025E1DC 7C 08 02 A6 */ mflr r0 /* 802612A0 0025E1E0 90 01 00 14 */ stw r0, 0x14(r1) /* 802612A4 0025E1E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802612A8 0025E1E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802612AC 0025E1EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802612A8 0025E1E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802612AC 0025E1EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802612B0 0025E1F0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 802612B4 0025E1F4 7F E3 FB 78 */ mr r3, r31 /* 802612B8 0025E1F8 4B DC B9 25 */ bl dComIfG_play_c_NS_getTimerPtr @@ -5066,8 +5066,8 @@ lbl_802612D8: /* 802612F0 0025E230 7C 08 02 A6 */ mflr r0 /* 802612F4 0025E234 90 01 00 14 */ stw r0, 0x14(r1) /* 802612F8 0025E238 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802612FC 0025E23C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261300 0025E240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802612FC 0025E23C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261300 0025E240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261304 0025E244 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80261308 0025E248 7F E3 FB 78 */ mr r3, r31 /* 8026130C 0025E24C 4B DC B8 D1 */ bl dComIfG_play_c_NS_getTimerPtr @@ -5088,8 +5088,8 @@ lbl_8026132C: /* 80261344 0025E284 7C 08 02 A6 */ mflr r0 /* 80261348 0025E288 90 01 00 14 */ stw r0, 0x14(r1) /* 8026134C 0025E28C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261350 0025E290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261354 0025E294 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261350 0025E290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261354 0025E294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261358 0025E298 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8026135C 0025E29C 7F E3 FB 78 */ mr r3, r31 /* 80261360 0025E2A0 4B DC B8 7D */ bl dComIfG_play_c_NS_getTimerPtr diff --git a/asm/d/d_tresure.s b/asm/d/d_tresure.s index 471aff1cc0..f54753556e 100644 --- a/asm/d/d_tresure.s +++ b/asm/d/d_tresure.s @@ -27,8 +27,8 @@ dTres_c_NS_create: /* 8009BC18 00098B58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009BC1C 00098B5C 7C 08 02 A6 */ mflr r0 /* 8009BC20 00098B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009BC24 00098B64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009BC28 00098B68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009BC24 00098B64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009BC28 00098B68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009BC2C 00098B6C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8009BC30 00098B70 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8009BC34 00098B74 7D 89 03 A6 */ mtctr r12 @@ -81,8 +81,8 @@ dTres_c_NS_addData: /* 8009BCC4 00098C04 48 2C 65 0D */ bl _savegpr_26 /* 8009BCC8 00098C08 7C 7B 1B 78 */ mr r27, r3 /* 8009BCCC 00098C0C 7C 9C 23 78 */ mr r28, r4 -/* 8009BCD0 00098C10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009BCD4 00098C14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009BCD0 00098C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009BCD4 00098C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009BCD8 00098C18 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8009BCDC 00098C1C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8009BCE0 00098C20 7D 89 03 A6 */ mtctr r12 @@ -198,8 +198,8 @@ dTres_c_NS_checkTreasureBox: /* 8009BE70 00098DB0 40 82 02 80 */ bne lbl_8009C0F0 /* 8009BE74 00098DB4 3B 60 00 00 */ li r27, 0 /* 8009BE78 00098DB8 3B 40 00 00 */ li r26, 0 -/* 8009BE7C 00098DBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009BE80 00098DC0 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 8009BE7C 00098DBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009BE80 00098DC0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8009BE84 00098DC4 3B C0 00 01 */ li r30, 1 lbl_8009BE88: /* 8009BE88 00098DC8 7F 83 E3 78 */ mr r3, r28 @@ -368,8 +368,8 @@ lbl_8009C0E0: /* 8009C0E8 00099028 4B FA 2C 79 */ bl dMapInfo_n_NS_correctionOriginPos /* 8009C0EC 0009902C 48 00 00 64 */ b lbl_8009C150 lbl_8009C0F0: -/* 8009C0F0 00099030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009C0F4 00099034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009C0F0 00099030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009C0F4 00099034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009C0F8 00099038 88 9D 00 10 */ lbz r4, 0x10(r29) /* 8009C0FC 0009903C 88 BD 00 01 */ lbz r5, 1(r29) /* 8009C100 00099040 7C A5 07 74 */ extsb r5, r5 @@ -496,8 +496,8 @@ lbl_8009C2A0: /* 8009C2B0 000991F0 48 00 00 B1 */ bl dTres_c_NS_getFirstData /* 8009C2B4 000991F4 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009C2B8 000991F8 41 82 00 8C */ beq lbl_8009C344 -/* 8009C2BC 000991FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009C2C0 00099200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009C2BC 000991FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009C2C0 00099200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009C2C4 00099204 3B C3 09 58 */ addi r30, r3, 0x958 /* 8009C2C8 00099208 7F C3 F3 78 */ mr r3, r30 /* 8009C2CC 0009920C 38 80 00 01 */ li r4, 1 @@ -510,8 +510,8 @@ lbl_8009C2A0: /* 8009C2E8 00099228 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8009C2EC 0009922C 28 04 00 FF */ cmplwi r4, 0xff /* 8009C2F0 00099230 41 82 00 54 */ beq lbl_8009C344 -/* 8009C2F4 00099234 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009C2F8 00099238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009C2F4 00099234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009C2F8 00099238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009C2FC 0009923C 88 1F 00 01 */ lbz r0, 1(r31) /* 8009C300 00099240 7C 05 07 74 */ extsb r5, r0 /* 8009C304 00099244 4B F9 90 5D */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/d/d_vibration.s b/asm/d/d_vibration.s index c8e0f2b7d2..4d2365affd 100644 --- a/asm/d/d_vibration.s +++ b/asm/d/d_vibration.s @@ -93,8 +93,8 @@ dVibration_c_NS_Run: /* 8006F27C 0006C1BC 7C 7F 1B 78 */ mr r31, r3 /* 8006F280 0006C1C0 38 00 00 01 */ li r0, 1 /* 8006F284 0006C1C4 90 03 00 8C */ stw r0, 0x8c(r3) -/* 8006F288 0006C1C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006F28C 0006C1CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006F288 0006C1C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006F28C 0006C1CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006F290 0006C1D0 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 8006F294 0006C1D4 4B FC 53 B1 */ bl checkVibration__19dSv_player_config_cCFv /* 8006F298 0006C1D8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -217,8 +217,8 @@ lbl_8006F404: /* 8006F434 0006C374 41 82 00 08 */ beq lbl_8006F43C /* 8006F438 0006C378 57 DE 07 32 */ rlwinm r30, r30, 0, 0x1c, 0x19 lbl_8006F43C: -/* 8006F43C 0006C37C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006F440 0006C380 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006F43C 0006C37C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006F440 0006C380 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006F444 0006C384 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8006F448 0006C388 28 03 00 00 */ cmplwi r3, 0 /* 8006F44C 0006C38C 41 82 01 F0 */ beq lbl_8006F63C @@ -254,8 +254,8 @@ lbl_8006F484: /* 8006F4C0 0006C400 41 82 00 08 */ beq lbl_8006F4C8 /* 8006F4C4 0006C404 57 BD 07 32 */ rlwinm r29, r29, 0, 0x1c, 0x19 lbl_8006F4C8: -/* 8006F4C8 0006C408 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006F4CC 0006C40C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006F4C8 0006C408 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006F4CC 0006C40C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006F4D0 0006C410 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8006F4D4 0006C414 28 03 00 00 */ cmplwi r3, 0 /* 8006F4D8 0006C418 41 82 01 64 */ beq lbl_8006F63C @@ -309,8 +309,8 @@ lbl_8006F568: /* 8006F590 0006C4D0 41 82 00 08 */ beq lbl_8006F598 /* 8006F594 0006C4D4 57 BD 07 32 */ rlwinm r29, r29, 0, 0x1c, 0x19 lbl_8006F598: -/* 8006F598 0006C4D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006F59C 0006C4DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006F598 0006C4D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006F59C 0006C4DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006F5A0 0006C4E0 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8006F5A4 0006C4E4 28 03 00 00 */ cmplwi r3, 0 /* 8006F5A8 0006C4E8 41 82 00 5C */ beq lbl_8006F604 @@ -342,8 +342,8 @@ lbl_8006F604: /* 8006F60C 0006C54C 90 1F 00 24 */ stw r0, 0x24(r31) /* 8006F610 0006C550 48 00 00 2C */ b lbl_8006F63C lbl_8006F614: -/* 8006F614 0006C554 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006F618 0006C558 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006F614 0006C554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006F618 0006C558 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006F61C 0006C55C 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 8006F620 0006C560 28 03 00 00 */ cmplwi r3, 0 /* 8006F624 0006C564 41 82 00 18 */ beq lbl_8006F63C @@ -662,8 +662,8 @@ dVibration_c_NS_StartShock: lbl_8006FAA0: /* 8006FAA0 0006C9E0 54 A0 07 FF */ clrlwi. r0, r5, 0x1f /* 8006FAA4 0006C9E4 41 82 00 50 */ beq lbl_8006FAF4 -/* 8006FAA8 0006C9E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006FAAC 0006C9EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006FAA8 0006C9E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006FAAC 0006C9EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006FAB0 0006C9F0 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 8006FAB4 0006C9F4 4B FC 4B 91 */ bl checkVibration__19dSv_player_config_cCFv /* 8006FAB8 0006C9F8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -726,8 +726,8 @@ dVibration_c_NS_StartQuake: lbl_8006FB8C: /* 8006FB8C 0006CACC 54 A0 07 FF */ clrlwi. r0, r5, 0x1f /* 8006FB90 0006CAD0 41 82 00 60 */ beq lbl_8006FBF0 -/* 8006FB94 0006CAD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006FB98 0006CAD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006FB94 0006CAD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006FB98 0006CAD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006FB9C 0006CADC 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 8006FBA0 0006CAE0 4B FC 4A A5 */ bl checkVibration__19dSv_player_config_cCFv /* 8006FBA4 0006CAE4 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -833,8 +833,8 @@ dVibration_c_NS_StartQuake_X1_: lbl_8006FD24: /* 8006FD24 0006CC64 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 8006FD28 0006CC68 41 82 00 50 */ beq lbl_8006FD78 -/* 8006FD2C 0006CC6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006FD30 0006CC70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006FD2C 0006CC6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006FD30 0006CC70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006FD34 0006CC74 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 8006FD38 0006CC78 4B FC 49 0D */ bl checkVibration__19dSv_player_config_cCFv /* 8006FD3C 0006CC7C 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/asm/d/error/d_error_msg.s b/asm/d/error/d_error_msg.s index edbc97507d..8f13461078 100644 --- a/asm/d/error/d_error_msg.s +++ b/asm/d/error/d_error_msg.s @@ -470,8 +470,8 @@ dDvdErrorMsg_c_NS_draw: /* 8009D264 0009A1A4 38 61 00 24 */ addi r3, r1, 0x24 /* 8009D268 0009A1A8 48 24 C5 4D */ bl J2DOrthoGraph_NS_setPort /* 8009D26C 0009A1AC 38 01 00 24 */ addi r0, r1, 0x24 -/* 8009D270 0009A1B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009D274 0009A1B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009D270 0009A1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009D274 0009A1B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009D278 0009A1B8 90 03 5F 50 */ stw r0, 0x5f50(r3) /* 8009D27C 0009A1BC 2C 1F 00 04 */ cmpwi r31, 4 /* 8009D280 0009A1C0 40 82 00 14 */ bne lbl_8009D294 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 20f3ef31d8..d465cd6362 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -10,8 +10,8 @@ _unnamed_d_ev_camera_cpp__NS_isStageEvent: /* 80088A00 00085940 90 01 00 14 */ stw r0, 0x14(r1) /* 80088A04 00085944 93 E1 00 0C */ stw r31, 0xc(r1) /* 80088A08 00085948 7C 7F 1B 78 */ mr r31, r3 -/* 80088A0C 0008594C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088A10 00085950 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088A0C 0008594C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088A10 00085950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088A14 00085954 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80088A18 00085958 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 80088A1C 0008595C 7D 89 03 A6 */ mtctr r12 @@ -152,8 +152,8 @@ lbl_80088BE4: /* 80088BEC 00085B2C 90 03 06 0C */ stw r0, 0x60c(r3) /* 80088BF0 00085B30 38 00 00 01 */ li r0, 1 /* 80088BF4 00085B34 98 03 04 E8 */ stb r0, 0x4e8(r3) -/* 80088BF8 00085B38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088BFC 00085B3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088BF8 00085B38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088BFC 00085B3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088C00 00085B40 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80088C04 00085B44 28 00 00 00 */ cmplwi r0, 0 /* 80088C08 00085B48 41 82 00 0C */ beq lbl_80088C14 @@ -242,8 +242,8 @@ lbl_80088D14: /* 80088D1C 00085C5C 90 1D 00 00 */ stw r0, 0(r29) /* 80088D20 00085C60 48 00 00 54 */ b lbl_80088D74 lbl_80088D24: -/* 80088D24 00085C64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088D28 00085C68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088D24 00085C64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088D28 00085C68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088D2C 00085C6C 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088D30 00085C70 7F E3 FB 78 */ mr r3, r31 /* 80088D34 00085C74 80 9C 04 EC */ lwz r4, 0x4ec(r28) @@ -300,8 +300,8 @@ lbl_80088DD4: /* 80088DE4 00085D24 D0 1D 00 00 */ stfs f0, 0(r29) /* 80088DE8 00085D28 48 00 00 54 */ b lbl_80088E3C lbl_80088DEC: -/* 80088DEC 00085D2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088DF0 00085D30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088DEC 00085D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088DF0 00085D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088DF4 00085D34 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088DF8 00085D38 7F E3 FB 78 */ mr r3, r31 /* 80088DFC 00085D3C 80 9C 04 EC */ lwz r4, 0x4ec(r28) @@ -358,8 +358,8 @@ lbl_80088E9C: /* 80088EAC 00085DEC 83 C3 05 24 */ lwz r30, 0x524(r3) /* 80088EB0 00085DF0 48 00 00 50 */ b lbl_80088F00 lbl_80088EB4: -/* 80088EB4 00085DF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088EB8 00085DF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088EB4 00085DF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088EB8 00085DF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088EBC 00085DFC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088EC0 00085E00 7F E3 FB 78 */ mr r3, r31 /* 80088EC4 00085E04 80 9B 04 EC */ lwz r4, 0x4ec(r27) @@ -415,8 +415,8 @@ lbl_80088F60: /* 80088F70 00085EB0 80 63 05 24 */ lwz r3, 0x524(r3) /* 80088F74 00085EB4 48 00 00 54 */ b lbl_80088FC8 lbl_80088F78: -/* 80088F78 00085EB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80088F7C 00085EBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80088F78 00085EB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80088F7C 00085EBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80088F80 00085EC0 3B C3 4F F8 */ addi r30, r3, 0x4ff8 /* 80088F84 00085EC4 7F C3 F3 78 */ mr r3, r30 /* 80088F88 00085EC8 80 9B 04 EC */ lwz r4, 0x4ec(r27) @@ -468,8 +468,8 @@ lbl_8008901C: /* 80089024 00085F64 80 63 05 28 */ lwz r3, 0x528(r3) /* 80089028 00085F68 48 00 00 4C */ b lbl_80089074 lbl_8008902C: -/* 8008902C 00085F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089030 00085F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8008902C 00085F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089030 00085F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80089034 00085F74 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80089038 00085F78 7F E3 FB 78 */ mr r3, r31 /* 8008903C 00085F7C 80 9D 04 EC */ lwz r4, 0x4ec(r29) @@ -523,8 +523,8 @@ lbl_800890D4: /* 800890E4 00086024 90 1C 00 00 */ stw r0, 0(r28) /* 800890E8 00086028 48 00 00 50 */ b lbl_80089138 lbl_800890EC: -/* 800890EC 0008602C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800890F0 00086030 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800890EC 0008602C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800890F0 00086030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800890F4 00086034 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800890F8 00086038 7F E3 FB 78 */ mr r3, r31 /* 800890FC 0008603C 80 9B 04 EC */ lwz r4, 0x4ec(r27) @@ -583,8 +583,8 @@ lbl_800891A4: /* 800891B4 000860F4 D0 1D 00 00 */ stfs f0, 0(r29) /* 800891B8 000860F8 48 00 00 50 */ b lbl_80089208 lbl_800891BC: -/* 800891BC 000860FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800891C0 00086100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800891BC 000860FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800891C0 00086100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800891C4 00086104 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800891C8 00086108 7F E3 FB 78 */ mr r3, r31 /* 800891CC 0008610C 80 9C 04 EC */ lwz r4, 0x4ec(r28) @@ -652,8 +652,8 @@ lbl_80089288: /* 800892A8 000861E8 D0 1C 00 08 */ stfs f0, 8(r28) /* 800892AC 000861EC 48 00 00 74 */ b lbl_80089320 lbl_800892B0: -/* 800892B0 000861F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800892B4 000861F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800892B0 000861F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800892B4 000861F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800892B8 000861F8 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800892BC 000861FC 7F E3 FB 78 */ mr r3, r31 /* 800892C0 00086200 80 9B 04 EC */ lwz r4, 0x4ec(r27) @@ -722,8 +722,8 @@ lbl_80089390: /* 800893A0 000862E0 48 2D F7 8D */ bl strcpy /* 800893A4 000862E4 48 00 00 5C */ b lbl_80089400 lbl_800893A8: -/* 800893A8 000862E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800893AC 000862EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800893A8 000862E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800893AC 000862EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800893B0 000862F0 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800893B4 000862F4 7F E3 FB 78 */ mr r3, r31 /* 800893B8 000862F8 80 9B 04 EC */ lwz r4, 0x4ec(r27) @@ -779,8 +779,8 @@ lbl_8008945C: /* 80089464 000863A4 80 63 05 28 */ lwz r3, 0x528(r3) /* 80089468 000863A8 48 00 00 44 */ b lbl_800894AC lbl_8008946C: -/* 8008946C 000863AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089470 000863B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8008946C 000863AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089470 000863B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80089474 000863B4 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80089478 000863B8 7F E3 FB 78 */ mr r3, r31 /* 8008947C 000863BC 80 9C 04 EC */ lwz r4, 0x4ec(r28) @@ -827,8 +827,8 @@ lbl_80089504: /* 80089504 00086444 3C 05 BF AD */ addis r0, r5, 0xbfad /* 80089508 00086448 28 00 54 41 */ cmplwi r0, 0x5441 /* 8008950C 0008644C 40 82 00 1C */ bne lbl_80089528 -/* 80089510 00086450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089514 00086454 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80089510 00086450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089514 00086454 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089518 00086458 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008951C 0008645C 80 84 4F 8C */ lwz r4, 0x4f8c(r4) /* 80089520 00086460 4B FB 9D CD */ bl dEvt_control_c_NS_convPId @@ -836,8 +836,8 @@ lbl_80089504: lbl_80089528: /* 80089528 00086468 28 04 41 52 */ cmplwi r4, 0x4152 /* 8008952C 0008646C 40 82 00 1C */ bne lbl_80089548 -/* 80089530 00086470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089534 00086474 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80089530 00086470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089534 00086474 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089538 00086478 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008953C 0008647C 80 84 4F 90 */ lwz r4, 0x4f90(r4) /* 80089540 00086480 4B FB 9D AD */ bl dEvt_control_c_NS_convPId @@ -846,8 +846,8 @@ lbl_80089548: /* 80089548 00086488 3C 85 BF AC */ addis r4, r5, 0xbfac /* 8008954C 0008648C 28 04 41 4C */ cmplwi r4, 0x414c /* 80089550 00086490 40 82 00 1C */ bne lbl_8008956C -/* 80089554 00086494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089558 00086498 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80089554 00086494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089558 00086498 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8008955C 0008649C 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089560 000864A0 80 84 4F 94 */ lwz r4, 0x4f94(r4) /* 80089564 000864A4 4B FB 9D 89 */ bl dEvt_control_c_NS_convPId @@ -856,8 +856,8 @@ lbl_8008956C: /* 8008956C 000864AC 3C 05 BF BC */ addis r0, r5, 0xbfbc /* 80089570 000864B0 28 00 4F 4F */ cmplwi r0, 0x4f4f /* 80089574 000864B4 40 82 00 1C */ bne lbl_80089590 -/* 80089578 000864B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8008957C 000864BC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80089578 000864B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8008957C 000864BC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089580 000864C0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089584 000864C4 80 84 4F 9C */ lwz r4, 0x4f9c(r4) /* 80089588 000864C8 4B FB 9D 65 */ bl dEvt_control_c_NS_convPId @@ -869,8 +869,8 @@ lbl_80089590: /* 8008959C 000864DC 28 00 54 45 */ cmplwi r0, 0x5445 /* 800895A0 000864E0 40 82 00 1C */ bne lbl_800895BC lbl_800895A4: -/* 800895A4 000864E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800895A8 000864E8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800895A4 000864E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800895A8 000864E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800895AC 000864EC 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800895B0 000864F0 80 84 4F 98 */ lwz r4, 0x4f98(r4) /* 800895B4 000864F4 4B FB 9D 39 */ bl dEvt_control_c_NS_convPId @@ -879,8 +879,8 @@ lbl_800895BC: /* 800895BC 000864FC 3C 05 B3 97 */ addis r0, r5, 0xb397 /* 800895C0 00086500 28 00 6E 6B */ cmplwi r0, 0x6e6b /* 800895C4 00086504 40 82 00 14 */ bne lbl_800895D8 -/* 800895C8 00086508 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800895CC 0008650C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800895C8 00086508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800895CC 0008650C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800895D0 00086510 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 800895D4 00086514 48 00 00 0C */ b lbl_800895E0 lbl_800895D8: @@ -918,8 +918,8 @@ lbl_80089640: /* 80089640 00086580 3C 05 BF AD */ addis r0, r5, 0xbfad /* 80089644 00086584 28 00 54 41 */ cmplwi r0, 0x5441 /* 80089648 00086588 40 82 00 1C */ bne lbl_80089664 -/* 8008964C 0008658C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089650 00086590 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8008964C 0008658C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089650 00086590 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089654 00086594 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089658 00086598 80 84 4F 8C */ lwz r4, 0x4f8c(r4) /* 8008965C 0008659C 4B FB 9C 91 */ bl dEvt_control_c_NS_convPId @@ -927,8 +927,8 @@ lbl_80089640: lbl_80089664: /* 80089664 000865A4 28 04 41 52 */ cmplwi r4, 0x4152 /* 80089668 000865A8 40 82 00 1C */ bne lbl_80089684 -/* 8008966C 000865AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089670 000865B0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8008966C 000865AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089670 000865B0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089674 000865B4 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089678 000865B8 80 84 4F 90 */ lwz r4, 0x4f90(r4) /* 8008967C 000865BC 4B FB 9C 71 */ bl dEvt_control_c_NS_convPId @@ -937,8 +937,8 @@ lbl_80089684: /* 80089684 000865C4 3C 85 BF AC */ addis r4, r5, 0xbfac /* 80089688 000865C8 28 04 41 4C */ cmplwi r4, 0x414c /* 8008968C 000865CC 40 82 00 1C */ bne lbl_800896A8 -/* 80089690 000865D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089694 000865D4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80089690 000865D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089694 000865D4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089698 000865D8 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008969C 000865DC 80 84 4F 94 */ lwz r4, 0x4f94(r4) /* 800896A0 000865E0 4B FB 9C 4D */ bl dEvt_control_c_NS_convPId @@ -947,8 +947,8 @@ lbl_800896A8: /* 800896A8 000865E8 3C 05 BF BC */ addis r0, r5, 0xbfbc /* 800896AC 000865EC 28 00 4F 4F */ cmplwi r0, 0x4f4f /* 800896B0 000865F0 40 82 00 1C */ bne lbl_800896CC -/* 800896B4 000865F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800896B8 000865F8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800896B4 000865F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800896B8 000865F8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800896BC 000865FC 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800896C0 00086600 80 84 4F 9C */ lwz r4, 0x4f9c(r4) /* 800896C4 00086604 4B FB 9C 29 */ bl dEvt_control_c_NS_convPId @@ -960,8 +960,8 @@ lbl_800896CC: /* 800896D8 00086618 28 00 54 45 */ cmplwi r0, 0x5445 /* 800896DC 0008661C 40 82 00 1C */ bne lbl_800896F8 lbl_800896E0: -/* 800896E0 00086620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800896E4 00086624 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800896E0 00086620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800896E4 00086624 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800896E8 00086628 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800896EC 0008662C 80 84 4F 98 */ lwz r4, 0x4f98(r4) /* 800896F0 00086630 4B FB 9B FD */ bl dEvt_control_c_NS_convPId @@ -970,8 +970,8 @@ lbl_800896F8: /* 800896F8 00086638 3C 05 B3 97 */ addis r0, r5, 0xb397 /* 800896FC 0008663C 28 00 6E 6B */ cmplwi r0, 0x6e6b /* 80089700 00086640 40 82 00 14 */ bne lbl_80089714 -/* 80089704 00086644 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80089708 00086648 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80089704 00086644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80089708 00086648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8008970C 0008664C 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80089710 00086650 48 00 00 0C */ b lbl_8008971C lbl_80089714: @@ -7742,8 +7742,8 @@ _unnamed_d_ev_camera_cpp__NS_lineCollisionCheck: /* 8008FAA8 0008C9E8 7C A9 2B 78 */ mr r9, r5 /* 8008FAAC 0008C9EC 7C C0 33 78 */ mr r0, r6 /* 8008FAB0 0008C9F0 7C E8 3B 78 */ mr r8, r7 -/* 8008FAB4 0008C9F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8008FAB8 0008C9F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8008FAB4 0008C9F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8008FAB8 0008C9F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8008FABC 0008C9FC 38 63 23 3C */ addi r3, r3, 0x233c /* 8008FAC0 0008CA00 7D 64 5B 78 */ mr r4, r11 /* 8008FAC4 0008CA04 7D 45 53 78 */ mr r5, r10 @@ -7902,8 +7902,8 @@ lbl_8008FCD4: /* 8008FD18 0008CC58 B0 1F 00 66 */ sth r0, 0x66(r31) /* 8008FD1C 0008CC5C 48 00 00 90 */ b lbl_8008FDAC lbl_8008FD20: -/* 8008FD20 0008CC60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8008FD24 0008CC64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8008FD20 0008CC60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8008FD24 0008CC64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8008FD28 0008CC68 C0 03 5D 8C */ lfs f0, 0x5d8c(r3) /* 8008FD2C 0008CC6C D0 1F 00 48 */ stfs f0, 0x48(r31) /* 8008FD30 0008CC70 C0 03 5D 90 */ lfs f0, 0x5d90(r3) @@ -8202,8 +8202,8 @@ lbl_80090154: /* 8009017C 0008D0BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80090180 0008D0C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80090184 0008D0C4 7C 7F 1B 78 */ mr r31, r3 -/* 80090188 0008D0C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009018C 0008D0CC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80090188 0008D0C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009018C 0008D0CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80090190 0008D0D0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80090194 0008D0D4 80 84 4F 8C */ lwz r4, 0x4f8c(r4) /* 80090198 0008D0D8 4B FB 31 55 */ bl dEvt_control_c_NS_convPId @@ -8259,8 +8259,8 @@ lbl_800901F0: /* 80090258 0008D198 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009025C 0008D19C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80090260 0008D1A0 38 A5 01 65 */ addi r5, r5, 0x165 -/* 80090264 0008D1A4 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80090268 0008D1A8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80090264 0008D1A4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80090268 0008D1A8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8009026C 0008D1AC 88 C6 4F B3 */ lbz r6, 0x4fb3(r6) /* 80090270 0008D1B0 4B FF 8E 1D */ bl dCamera_c_NS_getEvIntData_X1_ /* 80090274 0008D1B4 38 00 00 00 */ li r0, 0 @@ -8820,8 +8820,8 @@ lbl_80090AAC: /* 80090ABC 0008D9FC 3B C1 03 B8 */ addi r30, r1, 0x3b8 lbl_80090AC0: /* 80090AC0 0008DA00 3B 60 00 00 */ li r27, 0 -/* 80090AC4 0008DA04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80090AC8 0008DA08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80090AC4 0008DA04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80090AC8 0008DA08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80090ACC 0008DA0C 3B A3 5F 18 */ addi r29, r3, 0x5f18 /* 80090AD0 0008DA10 80 1A 01 7C */ lwz r0, 0x17c(r26) /* 80090AD4 0008DA14 54 00 20 36 */ slwi r0, r0, 4 @@ -8955,8 +8955,8 @@ lbl_80090C84: /* 80090CAC 0008DBEC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80090CB0 0008DBF0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80090CB4 0008DBF4 90 01 03 B4 */ stw r0, 0x3b4(r1) -/* 80090CB8 0008DBF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80090CBC 0008DBFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80090CB8 0008DBF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80090CBC 0008DBFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80090CC0 0008DC00 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80090CC4 0008DC04 38 9A 03 40 */ addi r4, r26, 0x340 /* 80090CC8 0008DC08 38 A1 03 A4 */ addi r5, r1, 0x3a4 @@ -9101,8 +9101,8 @@ lbl_80090ECC: /* 80090ECC 0008DE0C 80 1A 03 EC */ lwz r0, 0x3ec(r26) /* 80090ED0 0008DE10 2C 00 00 5A */ cmpwi r0, 0x5a /* 80090ED4 0008DE14 40 82 05 00 */ bne lbl_800913D4 -/* 80090ED8 0008DE18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80090EDC 0008DE1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80090ED8 0008DE18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80090EDC 0008DE1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80090EE0 0008DE20 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80090EE4 0008DE24 81 83 06 28 */ lwz r12, 0x628(r3) /* 80090EE8 0008DE28 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -9997,8 +9997,8 @@ lbl_80091C20: /* 80091C38 0008EB78 C0 02 8F F8 */ lfs f0, lbl_804529F8-_SDA2_BASE_(r2) /* 80091C3C 0008EB7C D0 1E 04 14 */ stfs f0, 0x414(r30) lbl_80091C40: -/* 80091C40 0008EB80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80091C44 0008EB84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80091C40 0008EB80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80091C44 0008EB84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80091C48 0008EB88 83 E3 5D B8 */ lwz r31, 0x5db8(r3) /* 80091C4C 0008EB8C 80 1E 03 E8 */ lwz r0, 0x3e8(r30) /* 80091C50 0008EB90 28 00 00 1D */ cmplwi r0, 0x1d @@ -10477,8 +10477,8 @@ lbl_80092328: .global dComIfGp_saveCameraPosition dComIfGp_saveCameraPosition: /* 8009236C 0008F2AC C0 04 00 00 */ lfs f0, 0(r4) -/* 80092370 0008F2B0 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80092374 0008F2B4 38 07 61 C0 */ addi r0, r7, lbl_804061C0@l +/* 80092370 0008F2B0 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80092374 0008F2B4 38 07 61 C0 */ addi r0, r7, g_dComIfG_gameInfo@l /* 80092378 0008F2B8 1C 63 00 38 */ mulli r3, r3, 0x38 /* 8009237C 0008F2BC 7C 60 1A 14 */ add r3, r0, r3 /* 80092380 0008F2C0 D0 03 5D 8C */ stfs f0, 0x5d8c(r3) @@ -10588,8 +10588,8 @@ lbl_800924B8: /* 80092508 0008F448 A8 1F 00 7C */ lha r0, 0x7c(r31) /* 8009250C 0008F44C C0 3F 00 80 */ lfs f1, 0x80(r31) /* 80092510 0008F450 C0 1F 00 64 */ lfs f0, 0x64(r31) -/* 80092514 0008F454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80092518 0008F458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80092514 0008F454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80092518 0008F458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009251C 0008F45C D0 03 5D 8C */ stfs f0, 0x5d8c(r3) /* 80092520 0008F460 C0 1F 00 68 */ lfs f0, 0x68(r31) /* 80092524 0008F464 D0 03 5D 90 */ stfs f0, 0x5d90(r3) @@ -10689,8 +10689,8 @@ lbl_80092688: /* 80092688 0008F5C8 80 1F 00 04 */ lwz r0, 4(r31) /* 8009268C 0008F5CC 2C 00 00 09 */ cmpwi r0, 9 /* 80092690 0008F5D0 40 82 00 5C */ bne lbl_800926EC -/* 80092694 0008F5D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80092698 0008F5D8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80092694 0008F5D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80092698 0008F5D8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8009269C 0008F5DC C0 04 5D 8C */ lfs f0, 0x5d8c(r4) /* 800926A0 0008F5E0 D0 1F 00 28 */ stfs f0, 0x28(r31) /* 800926A4 0008F5E4 C0 04 5D 90 */ lfs f0, 0x5d90(r4) @@ -11520,8 +11520,8 @@ lbl_800932B0: lbl_8009334C: /* 8009334C 0009028C 3B C0 00 00 */ li r30, 0 /* 80093350 00090290 3B 60 00 00 */ li r27, 0 -/* 80093354 00090294 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80093358 00090298 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80093354 00090294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80093358 00090298 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8009335C 0009029C 48 00 01 64 */ b lbl_800934C0 lbl_80093360: /* 80093360 000902A0 38 61 00 C0 */ addi r3, r1, 0xc0 @@ -11988,8 +11988,8 @@ lbl_80093A10: /* 80093A3C 0009097C D0 01 01 EC */ stfs f0, 0x1ec(r1) /* 80093A40 00090980 D0 21 01 F0 */ stfs f1, 0x1f0(r1) /* 80093A44 00090984 3B E1 02 00 */ addi r31, r1, 0x200 -/* 80093A48 00090988 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80093A4C 0009098C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80093A48 00090988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80093A4C 0009098C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80093A50 00090990 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80093A54 00090994 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) /* 80093A58 00090998 80 1D 01 90 */ lwz r0, 0x190(r29) @@ -12248,8 +12248,8 @@ lbl_80093DF0: /* 80093E28 00090D68 41 82 01 40 */ beq lbl_80093F68 /* 80093E2C 00090D6C 3B E0 00 00 */ li r31, 0 /* 80093E30 00090D70 3B 80 00 00 */ li r28, 0 -/* 80093E34 00090D74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80093E38 00090D78 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 80093E34 00090D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80093E38 00090D78 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 80093E3C 00090D7C 3B 61 02 0C */ addi r27, r1, 0x20c /* 80093E40 00090D80 48 00 00 C8 */ b lbl_80093F08 lbl_80093E44: @@ -13361,8 +13361,8 @@ lbl_80094D58: lbl_80094EF4: /* 80094EF4 00091E34 80 7E 00 00 */ lwz r3, 0(r30) /* 80094EF8 00091E38 4B F8 94 11 */ bl fopCamM_GetParam -/* 80094EFC 00091E3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80094F00 00091E40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80094EFC 00091E3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80094F00 00091E40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80094F04 00091E44 1C 03 00 38 */ mulli r0, r3, 0x38 /* 80094F08 00091E48 7C 64 02 14 */ add r3, r4, r0 /* 80094F0C 00091E4C 88 03 5D 78 */ lbz r0, 0x5d78(r3) @@ -13448,8 +13448,8 @@ lbl_80094FF0: /* 8009503C 00091F7C 3C 60 80 38 */ lis r3, lbl_8037AAF4@ha /* 80095040 00091F80 38 63 AA F4 */ addi r3, r3, lbl_8037AAF4@l /* 80095044 00091F84 3B 83 01 9B */ addi r28, r3, 0x19b -/* 80095048 00091F88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009504C 00091F8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80095048 00091F88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009504C 00091F8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80095050 00091F90 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80095054 00091F94 7F E3 FB 78 */ mr r3, r31 /* 80095058 00091F98 80 9D 04 EC */ lwz r4, 0x4ec(r29) @@ -14432,8 +14432,8 @@ lbl_80095E64: /* 80095E9C 00092DDC 40 82 01 18 */ bne lbl_80095FB4 /* 80095EA0 00092DE0 38 61 00 44 */ addi r3, r1, 0x44 /* 80095EA4 00092DE4 7F C4 F3 78 */ mr r4, r30 -/* 80095EA8 00092DE8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80095EAC 00092DEC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80095EA8 00092DE8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80095EAC 00092DEC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80095EB0 00092DF0 80 A5 5D B4 */ lwz r5, 0x5db4(r5) /* 80095EB4 00092DF4 48 00 18 A9 */ bl dCamera_c_NS_positionOf /* 80095EB8 00092DF8 C0 41 00 44 */ lfs f2, 0x44(r1) @@ -14445,8 +14445,8 @@ lbl_80095E64: /* 80095ED0 00092E10 D0 41 00 68 */ stfs f2, 0x68(r1) /* 80095ED4 00092E14 D0 21 00 6C */ stfs f1, 0x6c(r1) /* 80095ED8 00092E18 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 80095EDC 00092E1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80095EE0 00092E20 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80095EDC 00092E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80095EE0 00092E20 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80095EE4 00092E24 38 7F 4E C8 */ addi r3, r31, 0x4ec8 /* 80095EE8 00092E28 80 9F 4F 90 */ lwz r4, 0x4f90(r31) /* 80095EEC 00092E2C 4B FA D4 01 */ bl dEvt_control_c_NS_convPId @@ -14837,8 +14837,8 @@ lbl_80096400: /* 800964C4 00093404 D0 1F 00 78 */ stfs f0, 0x78(r31) /* 800964C8 00093408 48 00 00 30 */ b lbl_800964F8 lbl_800964CC: -/* 800964CC 0009340C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800964D0 00093410 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800964CC 0009340C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800964D0 00093410 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800964D4 00093414 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800964D8 00093418 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 800964DC 0009341C 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l @@ -15065,8 +15065,8 @@ lbl_800967D8: /* 80096830 00093770 38 79 04 10 */ addi r3, r25, 0x410 /* 80096834 00093774 38 81 01 78 */ addi r4, r1, 0x178 /* 80096838 00093778 48 1D B2 39 */ bl cSGlobe_NS_Val_X3_ -/* 8009683C 0009377C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80096840 00093780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009683C 0009377C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80096840 00093780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80096844 00093784 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80096848 00093788 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 8009684C 0009378C 41 82 00 24 */ beq lbl_80096870 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index db9bb29a18..803eebcc43 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -54,8 +54,8 @@ getTelopNo_X1_: /* 800437C4 00040704 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800437C8 00040708 7C 08 02 A6 */ mflr r0 /* 800437CC 0004070C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800437D0 00040710 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800437D4 00040714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800437D0 00040710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800437D4 00040714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800437D8 00040718 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800437DC 0004071C 4B FF FF 51 */ bl getTelopNo /* 800437E0 00040720 80 01 00 14 */ lwz r0, 0x14(r1) @@ -70,8 +70,8 @@ getStartTelopNo: /* 800437F8 00040738 90 01 00 24 */ stw r0, 0x24(r1) /* 800437FC 0004073C 39 61 00 20 */ addi r11, r1, 0x20 /* 80043800 00040740 48 31 E9 DD */ bl _savegpr_29 -/* 80043804 00040744 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043808 00040748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80043804 00040744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043808 00040748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004380C 0004074C 3B A3 4E 00 */ addi r29, r3, 0x4e00 /* 80043810 00040750 3B E3 5F 5C */ addi r31, r3, 0x5f5c /* 80043814 00040754 7F A3 EB 78 */ mr r3, r29 @@ -137,8 +137,8 @@ lbl_800438DC: /* 800438E4 00040824 A0 9E 00 06 */ lhz r4, 6(r30) /* 800438E8 00040828 28 04 FF FF */ cmplwi r4, 0xffff /* 800438EC 0004082C 41 82 00 28 */ beq lbl_80043914 -/* 800438F0 00040830 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800438F4 00040834 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800438F0 00040830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800438F4 00040834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800438F8 00040838 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800438FC 0004083C 4B FF 10 C1 */ bl isEventBit__11dSv_event_cCFUs /* 80043900 00040840 2C 03 00 00 */ cmpwi r3, 0 @@ -239,8 +239,8 @@ dEvDt_Next_Stage: /* 80043A4C 0004098C C3 E2 84 D0 */ lfs f31, lbl_80451ED0-_SDA2_BASE_(r2) /* 80043A50 00040990 3B 00 00 00 */ li r24, 0 /* 80043A54 00040994 FF C0 F8 90 */ fmr f30, f31 -/* 80043A58 00040998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043A5C 0004099C 3A 63 61 C0 */ addi r19, r3, lbl_804061C0@l +/* 80043A58 00040998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043A5C 0004099C 3A 63 61 C0 */ addi r19, r3, g_dComIfG_gameInfo@l /* 80043A60 000409A0 3B F3 4F F8 */ addi r31, r19, 0x4ff8 /* 80043A64 000409A4 7F E3 FB 78 */ mr r3, r31 /* 80043A68 000409A8 7E E4 BB 78 */ mr r4, r23 @@ -547,8 +547,8 @@ dEvDtEvent_c_NS_finishCheck: /* 80043E8C 00040DCC 7C 7C 1B 78 */ mr r28, r3 /* 80043E90 00040DD0 3B A0 00 00 */ li r29, 0 /* 80043E94 00040DD4 3B E0 00 00 */ li r31, 0 -/* 80043E98 00040DD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043E9C 00040DDC 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80043E98 00040DD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043E9C 00040DDC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80043EA0: /* 80043EA0 00040DE0 38 1F 00 88 */ addi r0, r31, 0x88 /* 80043EA4 00040DE4 7C 9C 00 2E */ lwzx r4, r28, r0 @@ -587,8 +587,8 @@ dEvDtEvent_c_NS_forceFinish: /* 80043F10 00040E50 7C 7C 1B 78 */ mr r28, r3 /* 80043F14 00040E54 3B A0 00 00 */ li r29, 0 /* 80043F18 00040E58 3B E0 00 00 */ li r31, 0 -/* 80043F1C 00040E5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043F20 00040E60 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80043F1C 00040E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043F20 00040E60 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80043F24: /* 80043F24 00040E64 38 1F 00 88 */ addi r0, r31, 0x88 /* 80043F28 00040E68 7C 9C 00 2E */ lwzx r4, r28, r0 @@ -650,8 +650,8 @@ dEvDtStaff_c_NS_specialProc_WaitStart: /* 80043FE0 00040F20 90 01 00 14 */ stw r0, 0x14(r1) /* 80043FE4 00040F24 93 E1 00 0C */ stw r31, 0xc(r1) /* 80043FE8 00040F28 7C 7F 1B 78 */ mr r31, r3 -/* 80043FEC 00040F2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80043FF0 00040F30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80043FEC 00040F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80043FF0 00040F30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80043FF4 00040F34 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80043FF8 00040F38 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 80043FFC 00040F3C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l @@ -685,8 +685,8 @@ dEvDtStaff_c_NS_specialProc_WaitProc: /* 80044058 00040F98 B0 03 00 36 */ sth r0, 0x36(r3) /* 8004405C 00040F9C 48 00 00 14 */ b lbl_80044070 lbl_80044060: -/* 80044060 00040FA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044064 00040FA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044060 00040FA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044064 00040FA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044068 00040FA8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004406C 00040FAC 48 00 41 11 */ bl dEvent_manager_c_NS_cutEnd lbl_80044070: @@ -717,8 +717,8 @@ dEvDtStaff_c_NS_specialProc: /* 800440C4 00041004 48 00 00 5C */ b lbl_80044120 /* 800440C8 00041008 48 00 1A 35 */ bl dEvDtStaff_c_NS_specialProcTimekeeper /* 800440CC 0004100C 48 00 00 54 */ b lbl_80044120 -/* 800440D0 00041010 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800440D4 00041014 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800440D0 00041010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800440D4 00041014 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800440D8 00041018 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800440DC 0004101C 80 9F 00 24 */ lwz r4, 0x24(r31) /* 800440E0 00041020 48 00 40 9D */ bl dEvent_manager_c_NS_cutEnd @@ -726,8 +726,8 @@ dEvDtStaff_c_NS_specialProc: /* 800440E8 00041028 48 00 1B 4D */ bl dEvDtStaff_c_NS_specialProcEffect /* 800440EC 0004102C 48 00 00 34 */ b lbl_80044120 /* 800440F0 00041030 48 00 0B C9 */ bl dEvDtStaff_c_NS_specialProcCreate -/* 800440F4 00041034 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800440F8 00041038 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800440F4 00041034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800440F8 00041038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800440FC 0004103C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80044100 00041040 80 9F 00 24 */ lwz r4, 0x24(r31) /* 80044104 00041044 48 00 40 79 */ bl dEvent_manager_c_NS_cutEnd @@ -757,8 +757,8 @@ dEvDtStaff_c_NS_init: /* 80044154 00041094 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80044158 00041098 2C 00 00 02 */ cmpwi r0, 2 /* 8004415C 0004109C 4C 82 00 20 */ bnelr -/* 80044160 000410A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044164 000410A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044160 000410A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044164 000410A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044168 000410A8 90 83 51 84 */ stw r4, 0x5184(r3) /* 8004416C 000410AC 4E 80 00 20 */ blr @@ -780,8 +780,8 @@ dEvDtStaff_c_NS_specialProcLight: /* 80044198 000410D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8004419C 000410DC 39 61 00 20 */ addi r11, r1, 0x20 /* 800441A0 000410E0 48 31 E0 3D */ bl _savegpr_29 -/* 800441A4 000410E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800441A8 000410E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800441A4 000410E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800441A8 000410E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800441AC 000410EC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800441B0 000410F0 7F E3 FB 78 */ mr r3, r31 /* 800441B4 000410F4 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -854,8 +854,8 @@ lbl_80044298: /* 800442B0 000411F0 48 00 3E 3D */ bl dEvent_manager_c_NS_getMySubstanceP /* 800442B4 000411F4 28 03 00 00 */ cmplwi r3, 0 /* 800442B8 000411F8 41 82 00 48 */ beq lbl_80044300 -/* 800442BC 000411FC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 800442C0 00041200 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 800442BC 000411FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 800442C0 00041200 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800442C4 00041204 C0 24 00 34 */ lfs f1, 0x34(r4) /* 800442C8 00041208 C0 02 84 E0 */ lfs f0, lbl_80451EE0-_SDA2_BASE_(r2) /* 800442CC 0004120C EC 20 00 72 */ fmuls f1, f0, f1 @@ -894,8 +894,8 @@ dEvDtStaff_c_NS_specialProcMessage: /* 80044334 00041274 48 31 DE 9D */ bl _savegpr_26 /* 80044338 00041278 7C 7B 1B 78 */ mr r27, r3 /* 8004433C 0004127C 3B 9B 00 08 */ addi r28, r27, 8 -/* 80044340 00041280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044344 00041284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044340 00041280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044344 00041284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044348 00041288 3B A3 4F F8 */ addi r29, r3, 0x4ff8 /* 8004434C 0004128C 7F A3 EB 78 */ mr r3, r29 /* 80044350 00041290 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -1373,8 +1373,8 @@ lbl_800449FC: lbl_80044A00: /* 80044A00 00041940 2C 00 00 00 */ cmpwi r0, 0 /* 80044A04 00041944 41 82 00 3C */ beq lbl_80044A40 -/* 80044A08 00041948 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044A0C 0004194C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044A08 00041948 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044A0C 0004194C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044A10 00041950 88 03 5E 89 */ lbz r0, 0x5e89(r3) /* 80044A14 00041954 28 00 00 01 */ cmplwi r0, 1 /* 80044A18 00041958 40 82 00 28 */ bne lbl_80044A40 @@ -1404,8 +1404,8 @@ dEvDtStaff_c_NS_specialProcSound: /* 80044A64 000419A4 39 61 00 20 */ addi r11, r1, 0x20 /* 80044A68 000419A8 48 31 D7 71 */ bl _savegpr_28 /* 80044A6C 000419AC 7C 7C 1B 78 */ mr r28, r3 -/* 80044A70 000419B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044A74 000419B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044A70 000419B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044A74 000419B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044A78 000419B8 3B A3 4F F8 */ addi r29, r3, 0x4ff8 /* 80044A7C 000419BC 7F A3 EB 78 */ mr r3, r29 /* 80044A80 000419C0 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -1570,8 +1570,8 @@ dEvDtStaff_c_NS_specialProcCreate: /* 80044CC0 00041C00 90 01 00 44 */ stw r0, 0x44(r1) /* 80044CC4 00041C04 39 61 00 40 */ addi r11, r1, 0x40 /* 80044CC8 00041C08 48 31 D5 11 */ bl _savegpr_28 -/* 80044CCC 00041C0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044CD0 00041C10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044CCC 00041C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044CD0 00041C10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044CD4 00041C14 3B C3 4F F8 */ addi r30, r3, 0x4ff8 /* 80044CD8 00041C18 7F C3 F3 78 */ mr r3, r30 /* 80044CDC 00041C1C 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -1636,8 +1636,8 @@ lbl_80044DA4: /* 80044DBC 00041CFC 48 00 33 31 */ bl dEvent_manager_c_NS_getMySubstanceP /* 80044DC0 00041D00 28 03 00 00 */ cmplwi r3, 0 /* 80044DC4 00041D04 40 82 00 2C */ bne lbl_80044DF0 -/* 80044DC8 00041D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044DCC 00041D0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044DC8 00041D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044DCC 00041D0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044DD0 00041D10 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80044DD4 00041D14 C0 03 04 D0 */ lfs f0, 0x4d0(r3) /* 80044DD8 00041D18 D0 01 00 1C */ stfs f0, 0x1c(r1) @@ -1723,8 +1723,8 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044EF0 00041E30 39 61 00 40 */ addi r11, r1, 0x40 /* 80044EF4 00041E34 48 31 D2 D5 */ bl func_803621C8 /* 80044EF8 00041E38 7C 7D 1B 78 */ mr r29, r3 -/* 80044EFC 00041E3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044F00 00041E40 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 80044EFC 00041E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044F00 00041E40 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 80044F04 00041E44 83 3B 5D B4 */ lwz r25, 0x5db4(r27) /* 80044F08 00041E48 3B 9B 4E C8 */ addi r28, r27, 0x4ec8 /* 80044F0C 00041E4C 3B DB 4F F8 */ addi r30, r27, 0x4ff8 @@ -1756,8 +1756,8 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044F74 00041EB4 48 00 31 79 */ bl dEvent_manager_c_NS_getMySubstanceP /* 80044F78 00041EB8 7C 64 1B 79 */ or. r4, r3, r3 /* 80044F7C 00041EBC 41 82 00 28 */ beq lbl_80044FA4 -/* 80044F80 00041EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044F84 00041EC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044F80 00041EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044F84 00041EC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044F88 00041EC8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80044F8C 00041ECC 80 04 00 00 */ lwz r0, 0(r4) /* 80044F90 00041ED0 54 00 08 3C */ slwi r0, r0, 1 @@ -1775,8 +1775,8 @@ lbl_80044FA4: /* 80044FBC 00041EFC 48 00 31 31 */ bl dEvent_manager_c_NS_getMySubstanceP /* 80044FC0 00041F00 7C 64 1B 79 */ or. r4, r3, r3 /* 80044FC4 00041F04 41 82 00 28 */ beq lbl_80044FEC -/* 80044FC8 00041F08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80044FCC 00041F0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80044FC8 00041F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80044FCC 00041F0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044FD0 00041F10 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80044FD4 00041F14 80 04 00 00 */ lwz r0, 0(r4) /* 80044FD8 00041F18 54 00 08 3C */ slwi r0, r0, 1 @@ -1841,8 +1841,8 @@ lbl_80045098: /* 800450B0 00041FF0 48 00 30 3D */ bl dEvent_manager_c_NS_getMySubstanceP /* 800450B4 00041FF4 7C 64 1B 79 */ or. r4, r3, r3 /* 800450B8 00041FF8 41 82 00 28 */ beq lbl_800450E0 -/* 800450BC 00041FFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800450C0 00042000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800450BC 00041FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800450C0 00042000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800450C4 00042004 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800450C8 00042008 80 04 00 00 */ lwz r0, 0(r4) /* 800450CC 0004200C 54 00 08 3C */ slwi r0, r0, 1 @@ -1860,8 +1860,8 @@ lbl_800450E0: /* 800450F8 00042038 48 00 2F F5 */ bl dEvent_manager_c_NS_getMySubstanceP /* 800450FC 0004203C 7C 64 1B 79 */ or. r4, r3, r3 /* 80045100 00042040 41 82 00 28 */ beq lbl_80045128 -/* 80045104 00042044 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80045108 00042048 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80045104 00042044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80045108 00042048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004510C 0004204C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80045110 00042050 80 04 00 00 */ lwz r0, 0(r4) /* 80045114 00042054 54 00 08 3C */ slwi r0, r0, 1 @@ -2223,8 +2223,8 @@ lbl_80045604: /* 80045630 00042570 41 82 00 08 */ beq lbl_80045638 /* 80045634 00042574 48 00 00 70 */ b lbl_800456A4 lbl_80045638: -/* 80045638 00042578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004563C 0004257C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80045638 00042578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004563C 0004257C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80045640 00042580 3B 23 07 F0 */ addi r25, r3, 0x7f0 /* 80045644 00042584 7F 23 CB 78 */ mr r3, r25 /* 80045648 00042588 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2392,15 +2392,15 @@ dEvDtStaff_c_NS_specialProcPackage: /* 8004588C 000427CC 39 61 00 30 */ addi r11, r1, 0x30 /* 80045890 000427D0 48 31 C9 3D */ bl func_803621CC /* 80045894 000427D4 7C 7B 1B 78 */ mr r27, r3 -/* 80045898 000427D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004589C 000427DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80045898 000427D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004589C 000427DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800458A0 000427E0 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 800458A4 000427E4 28 00 00 00 */ cmplwi r0, 0 /* 800458A8 000427E8 41 82 00 08 */ beq lbl_800458B0 /* 800458AC 000427EC 48 1F 27 C1 */ bl dMsgObject_c_NS_demoMessageGroup lbl_800458B0: -/* 800458B0 000427F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800458B4 000427F4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800458B0 000427F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800458B4 000427F4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800458B8 000427F8 3B 9E 4F F8 */ addi r28, r30, 0x4ff8 /* 800458BC 000427FC 7F 83 E3 78 */ mr r3, r28 /* 800458C0 00042800 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -2485,8 +2485,8 @@ lbl_800459B4: /* 800459EC 0004292C 48 00 27 01 */ bl dEvent_manager_c_NS_getMySubstanceP /* 800459F0 00042930 7C 64 1B 79 */ or. r4, r3, r3 /* 800459F4 00042934 41 82 00 28 */ beq lbl_80045A1C -/* 800459F8 00042938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800459FC 0004293C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800459F8 00042938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800459FC 0004293C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80045A00 00042940 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80045A04 00042944 80 04 00 00 */ lwz r0, 0(r4) /* 80045A08 00042948 54 00 08 3C */ slwi r0, r0, 1 @@ -2566,8 +2566,8 @@ dEvDtStaff_c_NS_specialProcTimekeeper: /* 80045B08 00042A48 39 61 00 20 */ addi r11, r1, 0x20 /* 80045B0C 00042A4C 48 31 C6 CD */ bl _savegpr_28 /* 80045B10 00042A50 7C 7E 1B 78 */ mr r30, r3 -/* 80045B14 00042A54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80045B18 00042A58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80045B14 00042A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80045B18 00042A58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80045B1C 00042A5C 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80045B20 00042A60 7F E3 FB 78 */ mr r3, r31 /* 80045B24 00042A64 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -2657,8 +2657,8 @@ dEvDtStaff_c_NS_specialProcEffect: /* 80045C50 00042B90 39 61 00 50 */ addi r11, r1, 0x50 /* 80045C54 00042B94 48 31 C5 75 */ bl func_803621C8 /* 80045C58 00042B98 7C 7B 1B 78 */ mr r27, r3 -/* 80045C5C 00042B9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80045C60 00042BA0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80045C5C 00042B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80045C60 00042BA0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80045C64 00042BA4 3B 9E 4F F8 */ addi r28, r30, 0x4ff8 /* 80045C68 00042BA8 7F 83 E3 78 */ mr r3, r28 /* 80045C6C 00042BAC 3C 80 80 38 */ lis r4, lbl_80379DD0@ha @@ -2977,8 +2977,8 @@ dEvDtCut_c_NS_startCheck: /* 800460BC 00042FFC 7C 7C 1B 78 */ mr r28, r3 /* 800460C0 00043000 3B A0 00 00 */ li r29, 0 /* 800460C4 00043004 3B E0 00 00 */ li r31, 0 -/* 800460C8 00043008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800460CC 0004300C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800460C8 00043008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800460CC 0004300C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_800460D0: /* 800460D0 00043010 38 1F 00 28 */ addi r0, r31, 0x28 /* 800460D4 00043014 7C 9C 00 2E */ lwzx r4, r28, r0 @@ -3157,8 +3157,8 @@ dEvDtBase_c_NS_advanceCutLocal: /* 80046320 00043260 1C 00 00 50 */ mulli r0, r0, 0x50 /* 80046324 00043264 7F C3 02 14 */ add r30, r3, r0 /* 80046328 00043268 80 9E 00 34 */ lwz r4, 0x34(r30) -/* 8004632C 0004326C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80046330 00043270 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8004632C 0004326C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80046330 00043270 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80046334 00043274 38 7F 51 B4 */ addi r3, r31, 0x51b4 /* 80046338 00043278 4B FF DA 29 */ bl dEvDtFlag_c_NS_flagCheck /* 8004633C 0004327C 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/d/event/d_event_lib.s b/asm/d/event/d_event_lib.s index 8c8f8dbf00..e462538d13 100644 --- a/asm/d/event/d_event_lib.s +++ b/asm/d/event/d_event_lib.s @@ -42,8 +42,8 @@ lbl_800488D4: /* 800488E4 00045824 41 82 00 28 */ beq lbl_8004890C /* 800488E8 00045828 2C 05 00 FF */ cmpwi r5, 0xff /* 800488EC 0004582C 40 82 00 20 */ bne lbl_8004890C -/* 800488F0 00045830 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800488F4 00045834 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800488F0 00045830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800488F4 00045834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800488F8 00045838 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800488FC 0004583C 80 9E 00 04 */ lwz r4, 4(r30) /* 80048900 00045840 7C 05 03 78 */ mr r5, r0 @@ -225,8 +225,8 @@ lbl_80048B08: /* 80048B5C 00045A9C 7C 7E 1B 78 */ mr r30, r3 /* 80048B60 00045AA0 80 63 00 04 */ lwz r3, 4(r3) /* 80048B64 00045AA4 A8 83 00 FC */ lha r4, 0xfc(r3) -/* 80048B68 00045AA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80048B6C 00045AAC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80048B68 00045AA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80048B6C 00045AAC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80048B70 00045AB0 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 80048B74 00045AB4 4B FF EF 05 */ bl dEvent_manager_c_NS_endCheck /* 80048B78 00045AB8 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index efaf8a0afc..94fab78bd9 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -30,8 +30,8 @@ dEvent_exception_c_NS_setStartDemo: /* 80046428 00043368 88 83 00 1B */ lbz r4, 0x1b(r3) /* 8004642C 0004336C 28 04 00 FF */ cmplwi r4, 0xff /* 80046430 00043370 41 82 00 24 */ beq lbl_80046454 -/* 80046434 00043374 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80046438 00043378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80046434 00043374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80046438 00043378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004643C 0004337C 7F E5 FB 78 */ mr r5, r31 /* 80046440 00043380 4B FE EF 21 */ bl isSwitch__10dSv_info_cCFii /* 80046444 00043384 2C 03 00 00 */ cmpwi r3, 0 @@ -63,8 +63,8 @@ dEvent_exception_c_NS_getEventName: /* 80046494 000433D4 7C 7E 1B 78 */ mr r30, r3 /* 80046498 000433D8 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8004649C 000433DC 7C 84 07 74 */ extsb r4, r4 -/* 800464A0 000433E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800464A4 000433E4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800464A0 000433E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800464A4 000433E4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800464A8 000433E8 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 800464AC 000433EC 4B FD DE D9 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 800464B0 000433F0 81 83 00 00 */ lwz r12, 0(r3) @@ -294,8 +294,8 @@ lbl_80046764: /* 800467A8 000436E8 38 63 01 1E */ addi r3, r3, 0x11e /* 800467AC 000436EC 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 800467B0 000436F0 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l -/* 800467B4 000436F4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800467B8 000436F8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800467B4 000436F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800467B8 000436F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800467BC 000436FC 3C A5 00 02 */ addis r5, r5, 2 /* 800467C0 00043700 38 C0 00 80 */ li r6, 0x80 /* 800467C4 00043704 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -328,8 +328,8 @@ dEvent_manager_c_NS_setObjectArchive: /* 80046824 00043764 7C 83 23 78 */ mr r3, r4 /* 80046828 00043768 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 8004682C 0004376C 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l -/* 80046830 00043770 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80046834 00043774 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80046830 00043770 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80046834 00043774 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80046838 00043778 3C A5 00 02 */ addis r5, r5, 2 /* 8004683C 0004377C 38 C0 00 80 */ li r6, 0x80 /* 80046840 00043780 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -369,8 +369,8 @@ dEvent_manager_c_NS_demoInit: /* 800468B4 000437F4 41 82 00 34 */ beq lbl_800468E8 /* 800468B8 000437F8 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 800468BC 000437FC 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l -/* 800468C0 00043800 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800468C4 00043804 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800468C0 00043800 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800468C4 00043804 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800468C8 00043808 3C A5 00 02 */ addis r5, r5, 2 /* 800468CC 0004380C 38 C0 00 80 */ li r6, 0x80 /* 800468D0 00043810 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -411,8 +411,8 @@ lbl_80046930: /* 80046944 00043884 38 61 00 08 */ addi r3, r1, 8 /* 80046948 00043888 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 8004694C 0004388C 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l -/* 80046950 00043890 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80046954 00043894 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80046950 00043890 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80046954 00043894 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80046958 00043898 3C A5 00 02 */ addis r5, r5, 2 /* 8004695C 0004389C 38 A5 D4 F8 */ addi r5, r5, -11016 /* 80046960 000438A0 38 C0 00 40 */ li r6, 0x40 @@ -546,8 +546,8 @@ lbl_80046ADC: /* 80046B24 00043A64 4B FD 4D BD */ bl fopAcM_orderMapToolAutoNextEvent /* 80046B28 00043A68 48 00 00 80 */ b lbl_80046BA8 lbl_80046B2C: -/* 80046B2C 00043A6C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80046B30 00043A70 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80046B2C 00043A6C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80046B30 00043A70 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80046B34 00043A74 A8 04 4E 08 */ lha r0, 0x4e08(r4) /* 80046B38 00043A78 2C 00 FF FE */ cmpwi r0, -2 /* 80046B3C 00043A7C 41 82 00 10 */ beq lbl_80046B4C @@ -555,8 +555,8 @@ lbl_80046B2C: /* 80046B44 00043A84 2C 00 FF FD */ cmpwi r0, -3 /* 80046B48 00043A88 40 82 00 60 */ bne lbl_80046BA8 lbl_80046B4C: -/* 80046B4C 00043A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80046B50 00043A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80046B4C 00043A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80046B50 00043A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80046B54 00043A94 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80046B58 00043A98 80 03 05 74 */ lwz r0, 0x574(r3) /* 80046B5C 00043A9C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -769,8 +769,8 @@ lbl_80046DE8: /* 80046E1C 00043D5C 90 1D 01 B4 */ stw r0, 0x1b4(r29) /* 80046E20 00043D60 38 00 FF FF */ li r0, -1 /* 80046E24 00043D64 B0 1D 01 AA */ sth r0, 0x1aa(r29) -/* 80046E28 00043D68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80046E2C 00043D6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80046E28 00043D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80046E2C 00043D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80046E30 00043D70 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 80046E34 00043D74 7F E3 FB 78 */ mr r3, r31 /* 80046E38 00043D78 38 80 00 00 */ li r4, 0 @@ -794,8 +794,8 @@ dEvent_manager_c_NS_Sequencer: /* 80046E70 00043DB0 39 61 00 70 */ addi r11, r1, 0x70 /* 80046E74 00043DB4 48 31 B3 55 */ bl func_803621C8 /* 80046E78 00043DB8 7C 7E 1B 78 */ mr r30, r3 -/* 80046E7C 00043DBC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80046E80 00043DC0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80046E7C 00043DBC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80046E80 00043DC0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80046E84 00043DC4 3B E4 4E C8 */ addi r31, r4, 0x4ec8 /* 80046E88 00043DC8 A8 83 01 AA */ lha r4, 0x1aa(r3) /* 80046E8C 00043DCC 48 00 06 31 */ bl dEvent_manager_c_NS_getEventData_X1_ @@ -844,8 +844,8 @@ lbl_80046F08: lbl_80046F30: /* 80046F30 00043E70 28 04 00 00 */ cmplwi r4, 0 /* 80046F34 00043E74 40 82 00 10 */ bne lbl_80046F44 -/* 80046F38 00043E78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80046F3C 00043E7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80046F38 00043E78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80046F3C 00043E7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80046F40 00043E80 80 83 5D AC */ lwz r4, 0x5dac(r3) lbl_80046F44: /* 80046F44 00043E84 28 04 00 00 */ cmplwi r4, 0 @@ -914,8 +914,8 @@ lbl_80046FE8: /* 80047010 00043F50 2C 1B 00 01 */ cmpwi r27, 1 /* 80047014 00043F54 41 82 01 C4 */ beq lbl_800471D8 /* 80047018 00043F58 3B 40 00 01 */ li r26, 1 -/* 8004701C 00043F5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80047020 00043F60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004701C 00043F5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80047020 00043F60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047024 00043F64 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80047028 00043F68 C0 03 05 50 */ lfs f0, 0x550(r3) /* 8004702C 00043F6C D0 01 00 44 */ stfs f0, 0x44(r1) @@ -1502,8 +1502,8 @@ lbl_80047810: lbl_80047820: /* 80047820 00044760 3B A0 00 0A */ li r29, 0xa /* 80047824 00044764 3B 20 01 68 */ li r25, 0x168 -/* 80047828 00044768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8004782C 0004476C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80047828 00044768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8004782C 0004476C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047830 00044770 3F C3 00 02 */ addis r30, r3, 2 /* 80047834 00044774 3B DE C2 F8 */ addi r30, r30, -15624 lbl_80047838: @@ -1682,8 +1682,8 @@ dEvent_manager_c_NS_endCheck: /* 80047A80 000449C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80047A84 000449C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80047A88 000449C8 7C 7F 1B 78 */ mr r31, r3 -/* 80047A8C 000449CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80047A90 000449D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80047A8C 000449CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80047A90 000449D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047A94 000449D4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80047A98 000449D8 4B FF BB 75 */ bl dEvt_control_c_NS_runningEventID /* 80047A9C 000449DC 7C 64 1B 78 */ mr r4, r3 @@ -1735,8 +1735,8 @@ dEvent_manager_c_NS_getMyStaffId: /* 80047B34 00044A74 7C 96 23 78 */ mr r22, r4 /* 80047B38 00044A78 7C D7 33 78 */ mr r23, r6 /* 80047B3C 00044A7C 3B 40 FF FF */ li r26, -1 -/* 80047B40 00044A80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80047B44 00044A84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80047B40 00044A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80047B44 00044A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047B48 00044A88 88 03 4F AC */ lbz r0, 0x4fac(r3) /* 80047B4C 00044A8C 28 00 00 00 */ cmplwi r0, 0 /* 80047B50 00044A90 40 82 00 0C */ bne lbl_80047B5C @@ -1889,8 +1889,8 @@ lbl_80047D34: .global dEvent_manager_c_NS_getIsAddvance dEvent_manager_c_NS_getIsAddvance: -/* 80047D4C 00044C8C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80047D50 00044C90 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80047D4C 00044C8C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80047D50 00044C90 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80047D54 00044C94 88 05 4F AC */ lbz r0, 0x4fac(r5) /* 80047D58 00044C98 28 00 00 00 */ cmplwi r0, 0 /* 80047D5C 00044C9C 40 82 00 0C */ bne lbl_80047D68 @@ -1960,8 +1960,8 @@ dEvent_manager_c_NS_getMyActIdx: /* 80047E24 00044D64 7C BD 2B 78 */ mr r29, r5 /* 80047E28 00044D68 7C DE 33 78 */ mr r30, r6 /* 80047E2C 00044D6C 7D 1F 43 78 */ mr r31, r8 -/* 80047E30 00044D70 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80047E34 00044D74 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80047E30 00044D70 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80047E34 00044D74 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80047E38 00044D78 88 05 4F AC */ lbz r0, 0x4fac(r5) /* 80047E3C 00044D7C 28 00 00 00 */ cmplwi r0, 0 /* 80047E40 00044D80 40 82 00 0C */ bne lbl_80047E4C @@ -2049,8 +2049,8 @@ lbl_80047F44: .global dEvent_manager_c_NS_getMyNowCutName dEvent_manager_c_NS_getMyNowCutName: -/* 80047F5C 00044E9C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80047F60 00044EA0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80047F5C 00044E9C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80047F60 00044EA0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80047F64 00044EA4 88 05 4F AC */ lbz r0, 0x4fac(r5) /* 80047F68 00044EA8 28 00 00 00 */ cmplwi r0, 0 /* 80047F6C 00044EAC 40 82 00 0C */ bne lbl_80047F78 @@ -2089,8 +2089,8 @@ dEvent_manager_c_NS_getMyDataP: /* 80047FD8 00044F18 48 31 A2 05 */ bl _savegpr_29 /* 80047FDC 00044F1C 7C 7E 1B 78 */ mr r30, r3 /* 80047FE0 00044F20 7C BF 2B 78 */ mr r31, r5 -/* 80047FE4 00044F24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80047FE8 00044F28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80047FE4 00044F24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80047FE8 00044F28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047FEC 00044F2C 88 03 4F AC */ lbz r0, 0x4fac(r3) /* 80047FF0 00044F30 28 00 00 00 */ cmplwi r0, 0 /* 80047FF4 00044F34 40 82 00 0C */ bne lbl_80048000 @@ -2216,8 +2216,8 @@ dEvent_manager_c_NS_cutEnd: /* 8004817C 000450BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048180 000450C0 7C 08 02 A6 */ mflr r0 /* 80048184 000450C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80048188 000450C8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8004818C 000450CC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80048188 000450C8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8004818C 000450CC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80048190 000450D0 88 05 4F AC */ lbz r0, 0x4fac(r5) /* 80048194 000450D4 28 00 00 00 */ cmplwi r0, 0 /* 80048198 000450D8 41 82 00 4C */ beq lbl_800481E4 @@ -2273,8 +2273,8 @@ dEvent_manager_c_NS_getEventPrio: /* 80048250 00045190 41 82 00 38 */ beq lbl_80048288 /* 80048254 00045194 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 80048258 00045198 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l -/* 8004825C 0004519C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80048260 000451A0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8004825C 0004519C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80048260 000451A0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80048264 000451A4 3C A5 00 02 */ addis r5, r5, 2 /* 80048268 000451A8 38 C0 00 80 */ li r6, 0x80 /* 8004826C 000451AC 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2497,8 +2497,8 @@ dEvent_manager_c_NS_specialCast_Shutter: /* 80048534 00045474 7C 7F 1B 78 */ mr r31, r3 /* 80048538 00045478 7C BD 2B 78 */ mr r29, r5 /* 8004853C 0004547C B0 81 00 08 */ sth r4, 8(r1) -/* 80048540 00045480 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80048544 00045484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80048540 00045480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80048544 00045484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80048548 00045488 80 03 5D AC */ lwz r0, 0x5dac(r3) /* 8004854C 0004548C 90 01 00 0C */ stw r0, 0xc(r1) .global findShutterCallBack @@ -2537,8 +2537,8 @@ dEvent_manager_c_NS_specialCast_Shutter: /* 800485CC 0004550C 7F E3 FB 78 */ mr r3, r31 /* 800485D0 00045510 38 81 00 10 */ addi r4, r1, 0x10 /* 800485D4 00045514 4B FF FD F1 */ bl dEvent_manager_c_NS_setGoal -/* 800485D8 00045518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800485DC 0004551C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800485D8 00045518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800485DC 0004551C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800485E0 00045520 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 800485E4 00045524 7F E3 FB 78 */ mr r3, r31 /* 800485E8 00045528 7F C4 F3 78 */ mr r4, r30 @@ -2615,8 +2615,8 @@ lbl_800486C8: lbl_800486E4: /* 800486E4 00045624 28 1F 00 00 */ cmplwi r31, 0 /* 800486E8 00045628 41 82 00 18 */ beq lbl_80048700 -/* 800486EC 0004562C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800486F0 00045630 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800486EC 0004562C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800486F0 00045630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800486F4 00045634 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) /* 800486F8 00045638 60 00 00 10 */ ori r0, r0, 0x10 /* 800486FC 0004563C B0 03 4F A0 */ sth r0, 0x4fa0(r3) @@ -2651,8 +2651,8 @@ dEv_talkman_get_action: /* 80048754 00045694 39 61 00 20 */ addi r11, r1, 0x20 /* 80048758 00045698 48 31 9A 81 */ bl _savegpr_28 /* 8004875C 0004569C 7C 7C 1B 78 */ mr r28, r3 -/* 80048760 000456A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80048764 000456A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80048760 000456A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80048764 000456A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80048768 000456A8 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 8004876C 000456AC 7F E3 FB 78 */ mr r3, r31 /* 80048770 000456B0 3C 80 80 38 */ lis r4, lbl_80379F60@ha @@ -2708,8 +2708,8 @@ lbl_800487D8: .global dEvent_manager_c_NS_checkStartDemo dEvent_manager_c_NS_checkStartDemo: -/* 8004882C 0004576C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80048830 00045770 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8004882C 0004576C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80048830 00045770 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80048834 00045774 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 80048838 00045778 28 00 00 00 */ cmplwi r0, 0 /* 8004883C 0004577C 40 82 00 0C */ bne lbl_80048848 diff --git a/asm/d/eye/d_eye_hl.s b/asm/d/eye/d_eye_hl.s index 39f8c128ff..b6657410dc 100644 --- a/asm/d/eye/d_eye_hl.s +++ b/asm/d/eye/d_eye_hl.s @@ -80,8 +80,8 @@ dEyeHL_mng_c_NS_update: /* 8009CA58 00099998 88 03 00 10 */ lbz r0, 0x10(r3) /* 8009CA5C 0009999C 28 00 00 00 */ cmplwi r0, 0 /* 8009CA60 000999A0 41 82 00 2C */ beq lbl_8009CA8C -/* 8009CA64 000999A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8009CA68 000999A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8009CA64 000999A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009CA68 000999A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009CA6C 000999AC 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8009CA70 000999B0 28 00 00 00 */ cmplwi r0, 0 /* 8009CA74 000999B4 40 82 00 24 */ bne lbl_8009CA98 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index f00095b101..126b1915dc 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -753,15 +753,15 @@ lbl_80184058: /* 80184070 00180FB0 7D 89 03 A6 */ mtctr r12 /* 80184074 00180FB4 4E 80 04 21 */ bctrl lbl_80184078: -/* 80184078 00180FB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018407C 00180FBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80184078 00180FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018407C 00180FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80184080 00180FC0 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 80184084 00180FC4 81 83 00 00 */ lwz r12, 0(r3) /* 80184088 00180FC8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8018408C 00180FCC 7D 89 03 A6 */ mtctr r12 /* 80184090 00180FD0 4E 80 04 21 */ bctrl -/* 80184094 00180FD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80184098 00180FD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80184094 00180FD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80184098 00180FD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018409C 00180FDC 80 63 5C B8 */ lwz r3, 0x5cb8(r3) /* 801840A0 00180FE0 81 83 00 00 */ lwz r12, 0(r3) /* 801840A4 00180FE4 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1038,16 +1038,16 @@ lbl_8018446C: /* 8018447C 001813BC 42 00 FF F0 */ bdnz lbl_8018446C /* 80184480 001813C0 38 00 00 00 */ li r0, 0 /* 80184484 001813C4 98 1F 02 65 */ stb r0, 0x265(r31) -/* 80184488 001813C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018448C 001813CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80184488 001813C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018448C 001813CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80184490 001813D0 4B EB 0B 3D */ bl init__10dSv_info_cFv -/* 80184494 001813D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80184498 001813D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80184494 001813D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80184498 001813D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018449C 001813DC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801844A0 001813E0 4B EA 6E 29 */ bl dComIfG_play_c_NS_itemInit /* 801844A4 001813E4 38 00 00 00 */ li r0, 0 -/* 801844A8 001813E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801844AC 001813EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801844A8 001813E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801844AC 001813EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801844B0 001813F0 98 03 0F 19 */ stb r0, 0xf19(r3) /* 801844B4 001813F4 98 1F 23 75 */ stb r0, 0x2375(r31) /* 801844B8 001813F8 7F E3 FB 78 */ mr r3, r31 @@ -2329,8 +2329,8 @@ lbl_80185740: /* 80185744 00182684 28 00 00 00 */ cmplwi r0, 0 /* 80185748 00182688 41 82 01 48 */ beq lbl_80185890 /* 8018574C 0018268C 38 00 00 80 */ li r0, 0x80 -/* 80185750 00182690 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80185754 00182694 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80185750 00182690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80185754 00182694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80185758 00182698 98 03 0F 19 */ stb r0, 0xf19(r3) /* 8018575C 0018269C 98 83 0F 18 */ stb r4, 0xf18(r3) /* 80185760 001826A0 38 00 00 A7 */ li r0, 0xa7 @@ -2392,8 +2392,8 @@ lbl_80185740: /* 80185840 00182780 38 A1 00 10 */ addi r5, r1, 0x10 /* 80185844 00182784 38 C0 00 00 */ li r6, 0 /* 80185848 00182788 48 09 6A 09 */ bl dMeter2Info_c_NS_getString -/* 8018584C 0018278C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80185850 00182790 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8018584C 0018278C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80185850 00182790 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80185854 00182794 38 7E 01 B4 */ addi r3, r30, 0x1b4 /* 80185858 00182798 38 81 00 10 */ addi r4, r1, 0x10 /* 8018585C 0018279C 48 1E 32 D1 */ bl strcpy @@ -2411,8 +2411,8 @@ lbl_80185740: /* 8018588C 001827CC 48 00 00 E4 */ b lbl_80185970 lbl_80185890: /* 80185890 001827D0 38 00 00 00 */ li r0, 0 -/* 80185894 001827D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80185898 001827D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80185894 001827D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80185898 001827D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018589C 001827DC 98 03 0F 19 */ stb r0, 0xf19(r3) /* 801858A0 001827E0 38 00 00 6D */ li r0, 0x6d /* 801858A4 001827E4 90 01 00 08 */ stw r0, 8(r1) @@ -3543,8 +3543,8 @@ dFile_select_c_NS_menuSelectStart: /* 80186934 00183874 88 1F 02 67 */ lbz r0, 0x267(r31) /* 80186938 00183878 28 00 00 01 */ cmplwi r0, 1 /* 8018693C 0018387C 40 82 00 3C */ bne lbl_80186978 -/* 80186940 00183880 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80186944 00183884 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80186940 00183880 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80186944 00183884 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80186948 00183888 38 9F 03 B8 */ addi r4, r31, 0x3b8 /* 8018694C 0018388C 88 BF 02 65 */ lbz r5, 0x265(r31) /* 80186950 00183890 4B EA F0 B5 */ bl card_to_memory__10dSv_info_cFPci @@ -3553,8 +3553,8 @@ dFile_select_c_NS_menuSelectStart: /* 8018695C 0018389C 38 00 00 2E */ li r0, 0x2e /* 80186960 001838A0 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80186964 001838A4 88 1F 02 65 */ lbz r0, 0x265(r31) -/* 80186968 001838A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018696C 001838AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80186968 001838A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018696C 001838AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80186970 001838B0 98 03 0F 18 */ stb r0, 0xf18(r3) /* 80186974 001838B4 48 00 00 F8 */ b lbl_80186A6C lbl_80186978: @@ -4288,8 +4288,8 @@ lbl_8018741C: /* 80187434 00184374 40 80 00 08 */ bge lbl_8018743C /* 80187438 00184378 48 00 00 AC */ b lbl_801874E4 lbl_8018743C: -/* 8018743C 0018437C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80187440 00184380 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018743C 0018437C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80187440 00184380 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80187444 00184384 88 03 0F 1A */ lbz r0, 0xf1a(r3) /* 80187448 00184388 28 00 00 01 */ cmplwi r0, 1 /* 8018744C 0018438C 40 82 00 18 */ bne lbl_80187464 @@ -4320,8 +4320,8 @@ lbl_80187464: /* 801874AC 001843EC 48 00 00 38 */ b lbl_801874E4 lbl_801874B0: /* 801874B0 001843F0 38 83 02 B5 */ addi r4, r3, 0x2b5 -/* 801874B4 001843F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801874B8 001843F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801874B4 001843F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801874B8 001843F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801874BC 001843FC 38 63 01 B4 */ addi r3, r3, 0x1b4 /* 801874C0 00184400 48 1E 16 6D */ bl strcpy /* 801874C4 00184404 80 7F 00 68 */ lwz r3, 0x68(r31) @@ -4424,8 +4424,8 @@ lbl_80187584: /* 80187640 00184580 38 A1 00 08 */ addi r5, r1, 8 /* 80187644 00184584 38 C0 00 00 */ li r6, 0 /* 80187648 00184588 48 09 4C 09 */ bl dMeter2Info_c_NS_getString -/* 8018764C 0018458C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80187650 00184590 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8018764C 0018458C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80187650 00184590 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80187654 00184594 38 7F 01 C5 */ addi r3, r31, 0x1c5 /* 80187658 00184598 38 81 00 08 */ addi r4, r1, 8 /* 8018765C 0018459C 48 1E 14 D1 */ bl strcpy @@ -4535,8 +4535,8 @@ lbl_801877CC: /* 801877E8 00184728 48 00 00 28 */ b lbl_80187810 lbl_801877EC: /* 801877EC 0018472C 38 83 02 B5 */ addi r4, r3, 0x2b5 -/* 801877F0 00184730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801877F4 00184734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801877F0 00184730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801877F4 00184734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801877F8 00184738 38 63 01 C5 */ addi r3, r3, 0x1c5 /* 801877FC 0018473C 48 1E 13 31 */ bl strcpy /* 80187800 00184740 38 00 00 01 */ li r0, 1 @@ -4586,8 +4586,8 @@ lbl_80187810: /* 801878AC 001847EC 38 A0 00 01 */ li r5, 1 /* 801878B0 001847F0 38 C0 00 01 */ li r6, 1 /* 801878B4 001847F4 48 00 58 31 */ bl dFile_select_c_NS_headerTxtSet -/* 801878B8 001847F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801878BC 001847FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801878B8 001847F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801878BC 001847FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801878C0 00184800 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801878C4 00184804 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801878C8 00184808 38 63 03 1C */ addi r3, r3, 0x31c @@ -7146,8 +7146,8 @@ lbl_80189E10: /* 80189E7C 00186DBC FC 80 18 90 */ fmr f4, f3 /* 80189E80 00186DC0 39 00 00 00 */ li r8, 0 /* 80189E84 00186DC4 48 12 26 89 */ bl Z2SeMgr_NS_seStartLevel -/* 80189E88 00186DC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80189E8C 00186DCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80189E88 00186DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80189E8C 00186DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80189E90 00186DD0 38 9F 03 B8 */ addi r4, r31, 0x3b8 /* 80189E94 00186DD4 88 BF 02 65 */ lbz r5, 0x265(r31) /* 80189E98 00186DD8 4B EA BD 39 */ bl initdata_to_card__10dSv_info_cFPci @@ -9223,8 +9223,8 @@ lbl_8018BD60: /* 8018BDDC 00188D1C 98 01 00 1F */ stb r0, 0x1f(r1) /* 8018BDE0 00188D20 38 00 00 FF */ li r0, 0xff /* 8018BDE4 00188D24 98 01 00 1B */ stb r0, 0x1b(r1) -/* 8018BDE8 00188D28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018BDEC 00188D2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018BDE8 00188D28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018BDEC 00188D2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018BDF0 00188D30 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 8018BDF4 00188D34 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8018BDF8 00188D38 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -11370,8 +11370,8 @@ dFile_select_c_NS__draw: /* 8018DD50 0018AC90 88 03 23 75 */ lbz r0, 0x2375(r3) /* 8018DD54 0018AC94 28 00 00 00 */ cmplwi r0, 0 /* 8018DD58 0018AC98 40 82 01 4C */ bne lbl_8018DEA4 -/* 8018DD5C 0018AC9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018DD60 0018ACA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018DD5C 0018AC9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018DD60 0018ACA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018DD64 0018ACA4 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 8018DD68 0018ACA8 7F C3 F3 78 */ mr r3, r30 /* 8018DD6C 0018ACAC 3B 9E 01 B4 */ addi r28, r30, 0x1b4 @@ -11466,8 +11466,8 @@ lbl_8018DEA4: /* 8018DEBC 0018ADFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018DEC0 0018AE00 7C 08 02 A6 */ mflr r0 /* 8018DEC4 0018AE04 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018DEC8 0018AE08 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8018DECC 0018AE0C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8018DEC8 0018AE08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8018DECC 0018AE0C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8018DED0 0018AE10 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8018DED4 0018AE14 80 63 00 04 */ lwz r3, 4(r3) /* 8018DED8 0018AE18 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) @@ -11483,8 +11483,8 @@ lbl_8018DEA4: /* 8018DF00 0018AE40 39 61 00 80 */ addi r11, r1, 0x80 /* 8018DF04 0018AE44 48 1D 42 D9 */ bl _savegpr_29 /* 8018DF08 0018AE48 7C 7D 1B 78 */ mr r29, r3 -/* 8018DF0C 0018AE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018DF10 0018AE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018DF0C 0018AE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018DF10 0018AE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018DF14 0018AE54 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8018DF18 0018AE58 80 7D 00 08 */ lwz r3, 8(r29) /* 8018DF1C 0018AE5C 38 03 00 80 */ addi r0, r3, 0x80 @@ -11549,8 +11549,8 @@ lbl_8018DEA4: /* 8018E008 0018AF48 39 61 00 50 */ addi r11, r1, 0x50 /* 8018E00C 0018AF4C 48 1D 41 D1 */ bl _savegpr_29 /* 8018E010 0018AF50 7C 7D 1B 78 */ mr r29, r3 -/* 8018E014 0018AF54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018E018 0018AF58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018E014 0018AF54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018E018 0018AF58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018E01C 0018AF5C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8018E020 0018AF60 80 7D 00 0C */ lwz r3, 0xc(r29) /* 8018E024 0018AF64 38 03 00 80 */ addi r0, r3, 0x80 @@ -11595,8 +11595,8 @@ lbl_8018DEA4: /* 8018E0C0 0018B000 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018E0C4 0018B004 7C 08 02 A6 */ mflr r0 /* 8018E0C8 0018B008 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018E0CC 0018B00C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8018E0D0 0018B010 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8018E0CC 0018B00C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8018E0D0 0018B010 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8018E0D4 0018B014 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8018E0D8 0018B018 80 63 00 04 */ lwz r3, 4(r3) /* 8018E0DC 0018B01C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) @@ -11609,8 +11609,8 @@ lbl_8018DEA4: /* 8018E0F8 0018B038 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018E0FC 0018B03C 7C 08 02 A6 */ mflr r0 /* 8018E100 0018B040 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018E104 0018B044 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8018E108 0018B048 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8018E104 0018B044 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8018E108 0018B048 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8018E10C 0018B04C 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8018E110 0018B050 80 63 00 04 */ lwz r3, 4(r3) /* 8018E114 0018B054 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) @@ -12084,8 +12084,8 @@ lbl_8018E7AC: /* 8018E7F4 0018B734 41 82 01 34 */ beq lbl_8018E928 /* 8018E7F8 0018B738 2C 03 00 01 */ cmpwi r3, 1 /* 8018E7FC 0018B73C 40 82 01 1C */ bne lbl_8018E918 -/* 8018E800 0018B740 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018E804 0018B744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018E800 0018B740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018E804 0018B744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018E808 0018B748 88 03 0F 1A */ lbz r0, 0xf1a(r3) /* 8018E80C 0018B74C 28 00 00 00 */ cmplwi r0, 0 /* 8018E810 0018B750 41 82 00 0C */ beq lbl_8018E81C @@ -12479,14 +12479,14 @@ lbl_8018ED68: /* 8018EDAC 0018BCEC 41 82 01 3C */ beq lbl_8018EEE8 /* 8018EDB0 0018BCF0 7F E3 FB 78 */ mr r3, r31 /* 8018EDB4 0018BCF4 48 00 14 A1 */ bl dFile_select_c_NS_setInitSaveData -/* 8018EDB8 0018BCF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018EDBC 0018BCFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018EDB8 0018BCF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018EDBC 0018BCFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018EDC0 0018BD00 38 9F 03 B8 */ addi r4, r31, 0x3b8 /* 8018EDC4 0018BD04 38 A0 00 00 */ li r5, 0 /* 8018EDC8 0018BD08 4B EA 6C 3D */ bl card_to_memory__10dSv_info_cFPci /* 8018EDCC 0018BD0C 38 80 00 01 */ li r4, 1 -/* 8018EDD0 0018BD10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018EDD4 0018BD14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8018EDD0 0018BD10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018EDD4 0018BD14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018EDD8 0018BD18 98 83 0F 1A */ stb r4, 0xf1a(r3) /* 8018EDDC 0018BD1C 38 00 00 00 */ li r0, 0 /* 8018EDE0 0018BD20 98 03 0F 18 */ stb r0, 0xf18(r3) @@ -12512,8 +12512,8 @@ lbl_8018EDF0: /* 8018EE2C 0018BD6C 38 A1 00 08 */ addi r5, r1, 8 /* 8018EE30 0018BD70 38 C0 00 00 */ li r6, 0 /* 8018EE34 0018BD74 48 08 D4 1D */ bl dMeter2Info_c_NS_getString -/* 8018EE38 0018BD78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8018EE3C 0018BD7C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8018EE38 0018BD78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8018EE3C 0018BD7C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8018EE40 0018BD80 38 7E 01 B4 */ addi r3, r30, 0x1b4 /* 8018EE44 0018BD84 38 81 00 08 */ addi r4, r1, 8 /* 8018EE48 0018BD88 48 1D 9C E5 */ bl strcpy @@ -13926,8 +13926,8 @@ dFile_select_c_NS_setInitSaveData: /* 80190264 0018D1A4 48 1D 1F 79 */ bl _savegpr_29 /* 80190268 0018D1A8 7C 7D 1B 78 */ mr r29, r3 /* 8019026C 0018D1AC 3B C0 00 00 */ li r30, 0 -/* 80190270 0018D1B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80190274 0018D1B4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80190270 0018D1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80190274 0018D1B4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_80190278: /* 80190278 0018D1B8 7F E3 FB 78 */ mr r3, r31 /* 8019027C 0018D1BC 38 9D 03 B8 */ addi r4, r29, 0x3b8 @@ -14171,8 +14171,8 @@ dFile_select3D_c_NS_draw: /* 801905C0 0018D500 80 03 00 08 */ lwz r0, 8(r3) /* 801905C4 0018D504 28 00 00 00 */ cmplwi r0, 0 /* 801905C8 0018D508 41 82 00 7C */ beq lbl_80190644 -/* 801905CC 0018D50C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801905D0 0018D510 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801905CC 0018D50C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801905D0 0018D510 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801905D4 0018D514 80 04 5F 98 */ lwz r0, 0x5f98(r4) /* 801905D8 0018D518 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801905DC 0018D51C 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -14195,8 +14195,8 @@ dFile_select3D_c_NS_draw: /* 80190620 0018D560 48 00 05 25 */ bl dFile_select3D_c_NS_animeEntry /* 80190624 0018D564 80 7E 00 08 */ lwz r3, 8(r30) /* 80190628 0018D568 4B E7 D6 9D */ bl mDoExt_modelUpdateDL -/* 8019062C 0018D56C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80190630 0018D570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019062C 0018D56C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80190630 0018D570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80190634 0018D574 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80190638 0018D578 90 1F 00 48 */ stw r0, 0x48(r31) /* 8019063C 0018D57C 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -14220,8 +14220,8 @@ dFile_select3D_c_NS_setJ3D: /* 80190674 0018D5B4 7C 80 23 78 */ mr r0, r4 /* 80190678 0018D5B8 7C BC 2B 78 */ mr r28, r5 /* 8019067C 0018D5BC 7C DB 33 78 */ mr r27, r6 -/* 80190680 0018D5C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80190684 0018D5C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80190680 0018D5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80190684 0018D5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80190688 0018D5C8 83 A3 5C B8 */ lwz r29, 0x5cb8(r3) /* 8019068C 0018D5CC 7F A3 EB 78 */ mr r3, r29 /* 80190690 0018D5D0 3C 80 42 4D */ lis r4, 0x424D4420@ha diff --git a/asm/d/file/sel/d_file_sel_warning.s b/asm/d/file/sel/d_file_sel_warning.s index c80a8578da..8163a5ffed 100644 --- a/asm/d/file/sel/d_file_sel_warning.s +++ b/asm/d/file/sel/d_file_sel_warning.s @@ -423,8 +423,8 @@ dFile_warning_c_NS__draw: /* 80192194 0018F0D4 7C 08 02 A6 */ mflr r0 /* 80192198 0018F0D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8019219C 0018F0DC 7C 66 1B 78 */ mr r6, r3 -/* 801921A0 0018F0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801921A4 0018F0E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801921A0 0018F0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801921A4 0018F0E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801921A8 0018F0E8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801921AC 0018F0EC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801921B0 0018F0F0 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -544,8 +544,8 @@ dFile_warning_c_NS_setFontColor: /* 80192354 0018F294 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80192358 0018F298 7C 08 02 A6 */ mflr r0 /* 8019235C 0018F29C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192360 0018F2A0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80192364 0018F2A4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80192360 0018F2A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80192364 0018F2A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80192368 0018F2A8 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8019236C 0018F2AC 80 63 00 04 */ lwz r3, 4(r3) /* 80192370 0018F2B0 C0 22 9F D8 */ lfs f1, lbl_804539D8-_SDA2_BASE_(r2) diff --git a/asm/d/k/d_k_wmark.s b/asm/d/k/d_k_wmark.s index 2c3384b445..a84ca5693f 100644 --- a/asm/d/k/d_k_wmark.s +++ b/asm/d/k/d_k_wmark.s @@ -74,8 +74,8 @@ lbl_802614F4: /* 80261510 0025E450 3C 60 80 3A */ lis r3, lbl_8039A494@ha /* 80261514 0025E454 38 63 A4 94 */ addi r3, r3, lbl_8039A494@l /* 80261518 0025E458 38 80 00 23 */ li r4, 0x23 -/* 8026151C 0025E45C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80261520 0025E460 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8026151C 0025E45C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80261520 0025E460 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80261524 0025E464 3C A5 00 02 */ addis r5, r5, 2 /* 80261528 0025E468 38 C0 00 80 */ li r6, 0x80 /* 8026152C 0025E46C 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -102,8 +102,8 @@ lbl_80261574: /* 80261574 0025E4B4 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 80261578 0025E4B8 2C 00 00 03 */ cmpwi r0, 3 /* 8026157C 0025E4BC 41 82 00 38 */ beq lbl_802615B4 -/* 80261580 0025E4C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261584 0025E4C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261580 0025E4C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261584 0025E4C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261588 0025E4C8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8026158C 0025E4CC 80 03 05 74 */ lwz r0, 0x574(r3) /* 80261590 0025E4D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -222,8 +222,8 @@ dkWmark_c_NS_setMatrix: /* 8026171C 0025E65C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80261720 0025E660 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80261724 0025E664 90 01 00 34 */ stw r0, 0x34(r1) -/* 80261728 0025E668 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8026172C 0025E66C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261728 0025E668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8026172C 0025E66C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261730 0025E670 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80261734 0025E674 7F C3 F3 78 */ mr r3, r30 /* 80261738 0025E678 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha diff --git a/asm/d/k/d_k_wpillar.s b/asm/d/k/d_k_wpillar.s index d1efaf207c..084b0ad775 100644 --- a/asm/d/k/d_k_wpillar.s +++ b/asm/d/k/d_k_wpillar.s @@ -60,8 +60,8 @@ lbl_80261C14: /* 80261C18 0025EB58 4B DB C0 A5 */ bl fopAcM_gc_c_NS_gndCheck /* 80261C1C 0025EB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80261C20 0025EB60 41 82 00 40 */ beq lbl_80261C60 -/* 80261C24 0025EB64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261C28 0025EB68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80261C24 0025EB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261C28 0025EB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80261C2C 0025EB6C 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80261C30 0025EB70 7F C3 F3 78 */ mr r3, r30 /* 80261C34 0025EB74 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha @@ -89,8 +89,8 @@ lbl_80261C6C: /* 80261C84 0025EBC4 38 BF 00 DC */ addi r5, r31, 0xdc /* 80261C88 0025EBC8 38 DF 01 4C */ addi r6, r31, 0x14c /* 80261C8C 0025EBCC 4B F4 1B 39 */ bl dScnKy_env_light_c_NS_settingTevStruct -/* 80261C90 0025EBD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80261C94 0025EBD4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80261C90 0025EBD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80261C94 0025EBD4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80261C98 0025EBD8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 80261C9C 0025EBDC 38 80 00 00 */ li r4, 0 /* 80261CA0 0025EBE0 90 81 00 08 */ stw r4, 8(r1) @@ -144,8 +144,8 @@ lbl_80261D40: /* 80261D58 0025EC98 41 82 01 04 */ beq lbl_80261E5C /* 80261D5C 0025EC9C 38 62 B5 F0 */ addi r3, r2, lbl_80454FF0-_SDA2_BASE_ /* 80261D60 0025ECA0 38 80 00 1C */ li r4, 0x1c -/* 80261D64 0025ECA4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80261D68 0025ECA8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80261D64 0025ECA4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80261D68 0025ECA8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80261D6C 0025ECAC 3F 85 00 02 */ addis r28, r5, 2 /* 80261D70 0025ECB0 3B 9C C2 F8 */ addi r28, r28, -15624 /* 80261D74 0025ECB4 7F 85 E3 78 */ mr r5, r28 @@ -402,8 +402,8 @@ dkWpillar_c_NS_draw: /* 80262104 0025F044 80 84 00 04 */ lwz r4, 4(r4) /* 80262108 0025F048 38 BE 01 4C */ addi r5, r30, 0x14c /* 8026210C 0025F04C 4B F4 2C 95 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI -/* 80262110 0025F050 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80262114 0025F054 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80262110 0025F050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80262114 0025F054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80262118 0025F058 80 03 5F 6C */ lwz r0, 0x5f6c(r3) /* 8026211C 0025F05C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80262120 0025F060 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -428,8 +428,8 @@ dkWpillar_c_NS_draw: /* 8026216C 0025F0AC 4B DA B6 3D */ bl mDoExt_brkAnm_NS_entry /* 80262170 0025F0B0 80 7E 00 F8 */ lwz r3, 0xf8(r30) /* 80262174 0025F0B4 4B DA BB 51 */ bl mDoExt_modelUpdateDL -/* 80262178 0025F0B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8026217C 0025F0BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80262178 0025F0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8026217C 0025F0BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80262180 0025F0C0 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80262184 0025F0C4 90 1F 00 48 */ stw r0, 0x48(r31) /* 80262188 0025F0C8 80 03 5F 84 */ lwz r0, 0x5f84(r3) diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index a0b3a5e9db..da0e380e63 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -290,8 +290,8 @@ dKyr_lenzflare_move: /* 8005BA60 000589A0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005BA64 000589A4 83 E3 0E 74 */ lwz r31, 0xe74(r3) /* 8005BA68 000589A8 83 C3 0E 78 */ lwz r30, 0xe78(r3) -/* 8005BA6C 000589AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005BA70 000589B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005BA6C 000589AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005BA70 000589B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005BA74 000589B4 83 83 5D 74 */ lwz r28, 0x5d74(r3) /* 8005BA78 000589B8 C0 3F 00 5C */ lfs f1, 0x5c(r31) /* 8005BA7C 000589BC C0 02 87 D0 */ lfs f0, lbl_804521D0-_SDA2_BASE_(r2) @@ -631,8 +631,8 @@ dKyr_sun_move: /* 8005BF40 00058E80 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l /* 8005BF44 00058E84 83 1D 0E 74 */ lwz r24, 0xe74(r29) /* 8005BF48 00058E88 82 FD 0E 78 */ lwz r23, 0xe78(r29) -/* 8005BF4C 00058E8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005BF50 00058E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005BF4C 00058E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005BF50 00058E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005BF54 00058E94 83 43 5D 74 */ lwz r26, 0x5d74(r3) /* 8005BF58 00058E98 C3 C2 87 B8 */ lfs f30, lbl_804521B8-_SDA2_BASE_(r2) /* 8005BF5C 00058E9C 88 0D 89 6C */ lbz r0, lbl_80450EEC-_SDA_BASE_(r13) @@ -645,8 +645,8 @@ lbl_8005BF74: /* 8005BF74 00058EB4 3A C0 00 00 */ li r22, 0 /* 8005BF78 00058EB8 3A A0 00 00 */ li r21, 0 /* 8005BF7C 00058EBC 3A 80 00 00 */ li r20, 0 -/* 8005BF80 00058EC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005BF84 00058EC4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8005BF80 00058EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005BF84 00058EC4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8005BF88 00058EC8 3B 3F 4E 20 */ addi r25, r31, 0x4e20 /* 8005BF8C 00058ECC 7F 23 CB 78 */ mr r3, r25 /* 8005BF90 00058ED0 81 99 00 00 */ lwz r12, 0(r25) @@ -776,8 +776,8 @@ lbl_8005C150: /* 8005C164 000590A4 3A 20 00 00 */ li r17, 0 /* 8005C168 000590A8 C0 02 88 28 */ lfs f0, lbl_80452228-_SDA2_BASE_(r2) /* 8005C16C 000590AC EF A0 E0 28 */ fsubs f29, f0, f28 -/* 8005C170 000590B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005C174 000590B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005C170 000590B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005C174 000590B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005C178 000590B8 3F 63 00 02 */ addis r27, r3, 2 /* 8005C17C 000590BC 3C 60 80 38 */ lis r3, lbl_8037A4C0@ha /* 8005C180 000590C0 3B E3 A4 C0 */ addi r31, r3, lbl_8037A4C0@l @@ -1484,8 +1484,8 @@ lbl_8005CB38: /* 8005CBC0 00059B00 C0 02 88 6C */ lfs f0, lbl_8045226C-_SDA2_BASE_(r2) /* 8005CBC4 00059B04 EC 02 00 28 */ fsubs f0, f2, f0 /* 8005CBC8 00059B08 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8005CBCC 00059B0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005CBD0 00059B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005CBCC 00059B0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005CBD0 00059B10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005CBD4 00059B14 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8005CBD8 00059B18 38 00 00 FF */ li r0, 0xff /* 8005CBDC 00059B1C 90 01 00 08 */ stw r0, 8(r1) @@ -1529,8 +1529,8 @@ dKyr_rain_init: /* 8005CC64 00059BA4 90 01 00 24 */ stw r0, 0x24(r1) /* 8005CC68 00059BA8 39 61 00 20 */ addi r11, r1, 0x20 /* 8005CC6C 00059BAC 48 30 55 71 */ bl _savegpr_29 -/* 8005CC70 00059BB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005CC74 00059BB4 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8005CC70 00059BB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005CC74 00059BB4 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8005CC78 00059BB8 83 A5 5D 74 */ lwz r29, 0x5d74(r5) /* 8005CC7C 00059BBC 3C 60 80 38 */ lis r3, lbl_8037A578@ha /* 8005CC80 00059BC0 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l @@ -1612,8 +1612,8 @@ lbl_8005CD70: .global rain_bg_chk rain_bg_chk: /* 8005CDA8 00059CE8 C0 22 88 78 */ lfs f1, lbl_80452278-_SDA2_BASE_(r2) -/* 8005CDAC 00059CEC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8005CDB0 00059CF0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8005CDAC 00059CEC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8005CDB0 00059CF0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8005CDB4 00059CF4 80 A5 5D 74 */ lwz r5, 0x5d74(r5) /* 8005CDB8 00059CF8 C0 05 00 E8 */ lfs f0, 0xe8(r5) /* 8005CDBC 00059CFC EC 01 00 2A */ fadds f0, f1, f0 @@ -1629,8 +1629,8 @@ overhead_bg_chk: /* 8005CDD8 00059D18 90 01 00 D4 */ stw r0, 0xd4(r1) /* 8005CDDC 00059D1C 39 61 00 D0 */ addi r11, r1, 0xd0 /* 8005CDE0 00059D20 48 30 53 FD */ bl _savegpr_29 -/* 8005CDE4 00059D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005CDE8 00059D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005CDE4 00059D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005CDE8 00059D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005CDEC 00059D2C 83 E3 5D 74 */ lwz r31, 0x5d74(r3) /* 8005CDF0 00059D30 3B C0 00 00 */ li r30, 0 /* 8005CDF4 00059D34 3B A1 00 64 */ addi r29, r1, 0x64 @@ -1673,8 +1673,8 @@ overhead_bg_chk: /* 8005CE88 00059DC8 D0 61 00 50 */ stfs f3, 0x50(r1) /* 8005CE8C 00059DCC D0 01 00 54 */ stfs f0, 0x54(r1) /* 8005CE90 00059DD0 D0 21 00 58 */ stfs f1, 0x58(r1) -/* 8005CE94 00059DD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005CE98 00059DD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005CE94 00059DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005CE98 00059DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005CE9C 00059DDC 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8005CEA0 00059DE0 7F A3 EB 78 */ mr r3, r29 /* 8005CEA4 00059DE4 38 81 00 14 */ addi r4, r1, 0x14 @@ -1745,8 +1745,8 @@ forward_overhead_bg_chk: /* 8005CF90 00059ED0 48 30 52 49 */ bl _savegpr_28 /* 8005CF94 00059ED4 7C 7D 1B 78 */ mr r29, r3 /* 8005CF98 00059ED8 FF E0 08 90 */ fmr f31, f1 -/* 8005CF9C 00059EDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005CFA0 00059EE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005CF9C 00059EDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005CFA0 00059EE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005CFA4 00059EE4 83 E3 5D 74 */ lwz r31, 0x5d74(r3) /* 8005CFA8 00059EE8 3B C0 00 00 */ li r30, 0 /* 8005CFAC 00059EEC 3B 81 00 70 */ addi r28, r1, 0x70 @@ -1810,8 +1810,8 @@ forward_overhead_bg_chk: /* 8005D094 00059FD4 D0 01 00 60 */ stfs f0, 0x60(r1) /* 8005D098 00059FD8 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8005D09C 00059FDC D0 01 00 64 */ stfs f0, 0x64(r1) -/* 8005D0A0 00059FE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005D0A4 00059FE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005D0A0 00059FE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005D0A4 00059FE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005D0A8 00059FE8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8005D0AC 00059FEC 7F A3 EB 78 */ mr r3, r29 /* 8005D0B0 00059FF0 38 81 00 20 */ addi r4, r1, 0x20 @@ -1889,8 +1889,8 @@ dKyr_rain_move: /* 8005D1B8 0005A0F8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005D1BC 0005A0FC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005D1C0 0005A100 83 43 0E 84 */ lwz r26, 0xe84(r3) -/* 8005D1C4 0005A104 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005D1C8 0005A108 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005D1C4 0005A104 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005D1C8 0005A108 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005D1CC 0005A10C 83 23 5D 74 */ lwz r25, 0x5d74(r3) /* 8005D1D0 0005A110 83 A3 5D AC */ lwz r29, 0x5dac(r3) /* 8005D1D4 0005A114 38 61 00 38 */ addi r3, r1, 0x38 @@ -1903,8 +1903,8 @@ dKyr_rain_move: /* 8005D1F0 0005A130 D0 01 00 D0 */ stfs f0, 0xd0(r1) /* 8005D1F4 0005A134 3A A0 00 00 */ li r21, 0 /* 8005D1F8 0005A138 3A 80 00 00 */ li r20, 0 -/* 8005D1FC 0005A13C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005D200 0005A140 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8005D1FC 0005A13C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005D200 0005A140 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8005D204 0005A144 38 7E 4E 20 */ addi r3, r30, 0x4e20 /* 8005D208 0005A148 81 9E 4E 20 */ lwz r12, 0x4e20(r30) /* 8005D20C 0005A14C 81 8C 00 BC */ lwz r12, 0xbc(r12) @@ -3518,8 +3518,8 @@ lbl_8005E880: .global d_krain_cut_turn_check d_krain_cut_turn_check: -/* 8005E8B0 0005B7F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005E8B4 0005B7F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005E8B0 0005B7F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005E8B4 0005B7F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005E8B8 0005B7F8 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8005E8BC 0005B7FC 38 60 00 00 */ li r3, 0 /* 8005E8C0 0005B800 28 04 00 00 */ cmplwi r4, 0 @@ -3566,8 +3566,8 @@ dKyr_housi_move: /* 8005E954 0005B894 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005E958 0005B898 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005E95C 0005B89C 83 43 0E B0 */ lwz r26, 0xeb0(r3) -/* 8005E960 0005B8A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005E964 0005B8A4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8005E960 0005B8A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005E964 0005B8A4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8005E968 0005B8A8 83 3E 5D 74 */ lwz r25, 0x5d74(r30) /* 8005E96C 0005B8AC 83 9E 5D AC */ lwz r28, 0x5dac(r30) /* 8005E970 0005B8B0 38 61 00 30 */ addi r3, r1, 0x30 @@ -3586,8 +3586,8 @@ dKyr_housi_move: /* 8005E9A4 0005B8E4 48 01 90 5D */ bl dBgS_CamGndChk_Wtr /* 8005E9A8 0005B8E8 C3 C2 89 20 */ lfs f30, lbl_80452320-_SDA2_BASE_(r2) /* 8005E9AC 0005B8EC 3B 00 00 00 */ li r24, 0 -/* 8005E9B0 0005B8F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005E9B4 0005B8F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005E9B0 0005B8F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005E9B4 0005B8F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005E9B8 0005B8F8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8005E9BC 0005B8FC 38 7F 3E C8 */ addi r3, r31, 0x3ec8 /* 8005E9C0 0005B900 3C 80 80 38 */ lis r4, lbl_8037A578@ha @@ -4878,8 +4878,8 @@ dKyr_snow_init: /* 8005FBE4 0005CB24 90 01 00 24 */ stw r0, 0x24(r1) /* 8005FBE8 0005CB28 39 61 00 20 */ addi r11, r1, 0x20 /* 8005FBEC 0005CB2C 48 30 25 F1 */ bl _savegpr_29 -/* 8005FBF0 0005CB30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005FBF4 0005CB34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005FBF0 0005CB30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005FBF4 0005CB34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005FBF8 0005CB38 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 8005FBFC 0005CB3C 38 60 6D 94 */ li r3, 0x6d94 /* 8005FC00 0005CB40 38 80 00 20 */ li r4, 0x20 @@ -4919,8 +4919,8 @@ lbl_8005FC5C: /* 8005FC74 0005CBB4 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l /* 8005FC78 0005CBB8 38 63 00 10 */ addi r3, r3, 0x10 /* 8005FC7C 0005CBBC 38 80 00 56 */ li r4, 0x56 -/* 8005FC80 0005CBC0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8005FC84 0005CBC4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8005FC80 0005CBC0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8005FC84 0005CBC4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8005FC88 0005CBC8 3C A5 00 02 */ addis r5, r5, 2 /* 8005FC8C 0005CBCC 38 C0 00 80 */ li r6, 0x80 /* 8005FC90 0005CBD0 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -5008,8 +5008,8 @@ dKyr_snow_move: /* 8005FDC4 0005CD04 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005FDC8 0005CD08 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005FDCC 0005CD0C 83 03 0E 94 */ lwz r24, 0xe94(r3) -/* 8005FDD0 0005CD10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005FDD4 0005CD14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005FDD0 0005CD10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005FDD4 0005CD14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005FDD8 0005CD18 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 8005FDDC 0005CD1C 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 8005FDE0 0005CD20 38 61 00 40 */ addi r3, r1, 0x40 @@ -5082,8 +5082,8 @@ lbl_8005FEC0: /* 8005FEE4 0005CE24 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8005FEE8 0005CE28 38 81 00 64 */ addi r4, r1, 0x64 /* 8005FEEC 0005CE2C 48 20 7E 3D */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8005FEF0 0005CE30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005FEF4 0005CE34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005FEF0 0005CE30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005FEF4 0005CE34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005FEF8 0005CE38 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8005FEFC 0005CE3C 7F C3 F3 78 */ mr r3, r30 /* 8005FF00 0005CE40 38 81 00 E0 */ addi r4, r1, 0xe0 @@ -6552,8 +6552,8 @@ lbl_80061398: /* 800613B0 0005E2F0 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l /* 800613B4 0005E2F4 38 63 00 10 */ addi r3, r3, 0x10 /* 800613B8 0005E2F8 38 80 00 4A */ li r4, 0x4a -/* 800613BC 0005E2FC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800613C0 0005E300 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800613BC 0005E2FC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800613C0 0005E300 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800613C4 0005E304 3C A5 00 02 */ addis r5, r5, 2 /* 800613C8 0005E308 38 C0 00 80 */ li r6, 0x80 /* 800613CC 0005E30C 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -6618,8 +6618,8 @@ cloud_shadow_move: /* 8006149C 0005E3DC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800614A0 0005E3E0 3B 63 CA 54 */ addi r27, r3, lbl_8042CA54@l /* 800614A4 0005E3E4 83 1B 0E C0 */ lwz r24, 0xec0(r27) -/* 800614A8 0005E3E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800614AC 0005E3EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800614A8 0005E3E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800614AC 0005E3EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800614B0 0005E3F0 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 800614B4 0005E3F4 83 43 5D AC */ lwz r26, 0x5dac(r3) /* 800614B8 0005E3F8 38 61 00 18 */ addi r3, r1, 0x18 @@ -6633,8 +6633,8 @@ cloud_shadow_move: /* 800614D8 0005E418 4B FF 96 09 */ bl dKyw_get_wind_vec /* 800614DC 0005E41C 7C 7C 1B 78 */ mr r28, r3 /* 800614E0 0005E420 4B FF 96 11 */ bl dKyw_get_wind_pow -/* 800614E4 0005E424 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800614E8 0005E428 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800614E4 0005E424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800614E8 0005E428 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800614EC 0005E42C 80 7F 61 B0 */ lwz r3, 0x61b0(r31) /* 800614F0 0005E430 28 03 00 00 */ cmplwi r3, 0 /* 800614F4 0005E434 41 82 0B 50 */ beq lbl_80062044 @@ -6757,8 +6757,8 @@ lbl_80061688: /* 800616A0 0005E5E0 3A A0 00 00 */ li r21, 0 /* 800616A4 0005E5E4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800616A8 0005E5E8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 800616AC 0005E5EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800616B0 0005E5F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800616AC 0005E5EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800616B0 0005E5F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800616B4 0005E5F4 3B 83 4E 00 */ addi r28, r3, 0x4e00 /* 800616B8 0005E5F8 C3 22 87 B8 */ lfs f25, lbl_804521B8-_SDA2_BASE_(r2) /* 800616BC 0005E5FC C3 42 88 98 */ lfs f26, lbl_80452298-_SDA2_BASE_(r2) @@ -7506,8 +7506,8 @@ vrkumo_move: /* 80062140 0005F080 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80062144 0005F084 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80062148 0005F088 83 63 0E D0 */ lwz r27, 0xed0(r3) -/* 8006214C 0005F08C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80062150 0005F090 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006214C 0005F08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80062150 0005F090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80062154 0005F094 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 80062158 0005F098 4B FF 89 89 */ bl dKyw_get_wind_vec /* 8006215C 0005F09C 7C 7E 1B 78 */ mr r30, r3 @@ -7529,8 +7529,8 @@ lbl_80062188: /* 80062198 0005F0D8 C2 A2 88 9C */ lfs f21, lbl_8045229C-_SDA2_BASE_(r2) /* 8006219C 0005F0DC FE C0 A8 90 */ fmr f22, f21 lbl_800621A0: -/* 800621A0 0005F0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800621A4 0005F0E4 3B 03 61 C0 */ addi r24, r3, lbl_804061C0@l +/* 800621A0 0005F0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800621A4 0005F0E4 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l /* 800621A8 0005F0E8 3B B8 4E 00 */ addi r29, r24, 0x4e00 /* 800621AC 0005F0EC 7F A3 EB 78 */ mr r3, r29 /* 800621B0 0005F0F0 3C 80 80 38 */ lis r4, lbl_8037A578@ha @@ -7559,8 +7559,8 @@ lbl_800621D0: /* 80062208 0005F148 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8006220C 0005F14C 7D 89 03 A6 */ mtctr r12 /* 80062210 0005F150 4E 80 04 21 */ bctrl -/* 80062214 0005F154 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80062218 0005F158 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80062214 0005F154 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80062218 0005F158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006221C 0005F15C 80 03 61 B0 */ lwz r0, 0x61b0(r3) /* 80062220 0005F160 28 00 00 00 */ cmplwi r0, 0 /* 80062224 0005F164 41 82 00 50 */ beq lbl_80062274 @@ -8241,8 +8241,8 @@ dKyr_draw_rev_moon: /* 80062BBC 0005FAFC 38 A3 CA 54 */ addi r5, r3, lbl_8042CA54@l /* 80062BC0 0005FB00 83 A5 0E 74 */ lwz r29, 0xe74(r5) /* 80062BC4 0005FB04 83 85 0E 78 */ lwz r28, 0xe78(r5) -/* 80062BC8 0005FB08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80062BCC 0005FB0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80062BC8 0005FB08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80062BCC 0005FB0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80062BD0 0005FB10 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 80062BD4 0005FB14 A3 23 00 38 */ lhz r25, 0x38(r3) /* 80062BD8 0005FB18 38 61 00 24 */ addi r3, r1, 0x24 @@ -8336,8 +8336,8 @@ lbl_80062CF8: /* 80062D28 0005FC68 98 01 00 1D */ stb r0, 0x1d(r1) /* 80062D2C 0005FC6C 98 01 00 1E */ stb r0, 0x1e(r1) /* 80062D30 0005FC70 98 61 00 1F */ stb r3, 0x1f(r1) -/* 80062D34 0005FC74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80062D38 0005FC78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80062D34 0005FC74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80062D38 0005FC78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80062D3C 0005FC7C 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 80062D40 0005FC80 28 03 00 00 */ cmplwi r3, 0 /* 80062D44 0005FC84 41 82 00 14 */ beq lbl_80062D58 @@ -8631,8 +8631,8 @@ lbl_80063138: /* 800631AC 000600EC 98 01 00 21 */ stb r0, 0x21(r1) /* 800631B0 000600F0 98 01 00 22 */ stb r0, 0x22(r1) /* 800631B4 000600F4 C2 E2 88 10 */ lfs f23, lbl_80452210-_SDA2_BASE_(r2) -/* 800631B8 000600F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800631BC 000600FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800631B8 000600F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800631BC 000600FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800631C0 00060100 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800631C4 00060104 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800631C8 00060108 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l @@ -8978,8 +8978,8 @@ dKyr_drawSun: /* 800636E4 00060624 3B 43 CA 54 */ addi r26, r3, lbl_8042CA54@l /* 800636E8 00060628 83 DA 0E 74 */ lwz r30, 0xe74(r26) /* 800636EC 0006062C 83 BA 0E 78 */ lwz r29, 0xe78(r26) -/* 800636F0 00060630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800636F4 00060634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800636F0 00060630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800636F4 00060634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800636F8 00060638 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 800636FC 0006063C C3 22 87 B8 */ lfs f25, lbl_804521B8-_SDA2_BASE_(r2) /* 80063700 00060640 3A C0 00 00 */ li r22, 0 @@ -9212,8 +9212,8 @@ lbl_80063A20: /* 80063A50 00060990 98 01 00 1D */ stb r0, 0x1d(r1) /* 80063A54 00060994 98 01 00 1E */ stb r0, 0x1e(r1) /* 80063A58 00060998 98 61 00 1F */ stb r3, 0x1f(r1) -/* 80063A5C 0006099C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80063A60 000609A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80063A5C 0006099C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80063A60 000609A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80063A64 000609A4 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 80063A68 000609A8 28 03 00 00 */ cmplwi r3, 0 /* 80063A6C 000609AC 41 82 00 14 */ beq lbl_80063A80 @@ -9920,8 +9920,8 @@ dKyr_drawLenzflare: /* 80064500 00061440 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 80064504 00061444 83 9E 0E 78 */ lwz r28, 0xe78(r30) /* 80064508 00061448 83 7E 0E 74 */ lwz r27, 0xe74(r30) -/* 8006450C 0006144C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80064510 00061450 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006450C 0006144C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80064510 00061450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80064514 00061454 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 80064518 00061458 88 0D 89 70 */ lbz r0, lbl_80450EF0-_SDA_BASE_(r13) /* 8006451C 0006145C 7C 00 07 75 */ extsb. r0, r0 @@ -9963,8 +9963,8 @@ lbl_80064550: /* 800645A4 000614E4 98 01 00 31 */ stb r0, 0x31(r1) /* 800645A8 000614E8 88 1B 00 76 */ lbz r0, 0x76(r27) /* 800645AC 000614EC 98 01 00 32 */ stb r0, 0x32(r1) -/* 800645B0 000614F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800645B4 000614F4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800645B0 000614F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800645B4 000614F4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800645B8 000614F8 80 7F 61 B0 */ lwz r3, 0x61b0(r31) /* 800645BC 000614FC 28 03 00 00 */ cmplwi r3, 0 /* 800645C0 00061500 41 82 0F C4 */ beq lbl_80065584 @@ -11109,8 +11109,8 @@ dKyr_drawRain: /* 800656C0 00062600 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800656C4 00062604 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800656C8 00062608 83 E3 0E 84 */ lwz r31, 0xe84(r3) -/* 800656CC 0006260C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800656D0 00062610 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800656CC 0006260C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800656D0 00062610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800656D4 00062614 82 83 5D 74 */ lwz r20, 0x5d74(r3) /* 800656D8 00062618 38 61 00 48 */ addi r3, r1, 0x48 /* 800656DC 0006261C 4B FF 54 25 */ bl dKyw_get_wind_vecpow @@ -11148,8 +11148,8 @@ lbl_80065714: /* 80065758 00062698 98 01 00 14 */ stb r0, 0x14(r1) /* 8006575C 0006269C 98 01 00 15 */ stb r0, 0x15(r1) /* 80065760 000626A0 98 01 00 16 */ stb r0, 0x16(r1) -/* 80065764 000626A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80065768 000626A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80065764 000626A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80065768 000626A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006576C 000626AC 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 80065770 000626B0 28 03 00 00 */ cmplwi r3, 0 /* 80065774 000626B4 41 82 08 4C */ beq lbl_80065FC0 @@ -11254,8 +11254,8 @@ lbl_8006578C: /* 800658FC 0006283C 48 2F A9 F1 */ bl GXSetCurrentMtx /* 80065900 00062840 3B C0 00 00 */ li r30, 0 /* 80065904 00062844 3B 80 00 00 */ li r28, 0 -/* 80065908 00062848 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006590C 0006284C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80065908 00062848 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006590C 0006284C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80065910 00062850 3A 63 4E 00 */ addi r19, r3, 0x4e00 /* 80065914 00062854 C0 02 89 34 */ lfs f0, lbl_80452334-_SDA2_BASE_(r2) /* 80065918 00062858 FC 20 00 50 */ fneg f1, f0 @@ -11757,8 +11757,8 @@ dKyr_drawSibuki: /* 80066080 00062FC0 48 2F C1 55 */ bl _savegpr_27 /* 80066084 00062FC4 7C 7B 1B 78 */ mr r27, r3 /* 80066088 00062FC8 7C 9C 23 78 */ mr r28, r4 -/* 8006608C 00062FCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80066090 00062FD0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8006608C 00062FCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80066090 00062FD0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80066094 00062FD4 83 DF 5D 74 */ lwz r30, 0x5d74(r31) /* 80066098 00062FD8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006609C 00062FDC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -11778,8 +11778,8 @@ dKyr_drawSibuki: /* 800660D4 00063014 48 00 00 08 */ b lbl_800660DC /* 800660D8 00063018 48 00 04 24 */ b lbl_800664FC lbl_800660DC: -/* 800660DC 0006301C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800660E0 00063020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800660DC 0006301C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800660E0 00063020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800660E4 00063024 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800660E8 00063028 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800660EC 0006302C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l @@ -12110,8 +12110,8 @@ lbl_800665C0: /* 800665C4 00063504 A8 1D 5D EC */ lha r0, 0x5dec(r29) /* 800665C8 00063508 2C 00 00 00 */ cmpwi r0, 0 /* 800665CC 0006350C 41 82 0E 64 */ beq lbl_80067430 -/* 800665D0 00063510 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800665D4 00063514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800665D0 00063510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800665D4 00063514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800665D8 00063518 3A C3 4E 00 */ addi r22, r3, 0x4e00 /* 800665DC 0006351C 7E C3 B3 78 */ mr r3, r22 /* 800665E0 00063520 3C 80 80 38 */ lis r4, lbl_8037A578@ha @@ -12220,8 +12220,8 @@ lbl_80066758: /* 8006675C 0006369C 90 01 00 1C */ stw r0, 0x1c(r1) /* 80066760 000636A0 80 02 8A D0 */ lwz r0, lbl_804524D0-_SDA2_BASE_(r2) /* 80066764 000636A4 90 01 00 18 */ stw r0, 0x18(r1) -/* 80066768 000636A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006676C 000636AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80066768 000636A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006676C 000636AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80066770 000636B0 80 63 5D 74 */ lwz r3, 0x5d74(r3) /* 80066774 000636B4 28 04 00 03 */ cmplwi r4, 3 /* 80066778 000636B8 40 82 00 30 */ bne lbl_800667A8 @@ -12247,8 +12247,8 @@ lbl_800667A8: /* 800667C4 00063704 48 14 34 F9 */ bl dKy_ParticleColor_get_bg /* 800667C8 00063708 C3 22 88 4C */ lfs f25, lbl_8045224C-_SDA2_BASE_(r2) lbl_800667CC: -/* 800667CC 0006370C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800667D0 00063710 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800667CC 0006370C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800667D0 00063710 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800667D4 00063714 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 800667D8 00063718 28 03 00 00 */ cmplwi r3, 0 /* 800667DC 0006371C 41 82 0C 54 */ beq lbl_80067430 @@ -12259,8 +12259,8 @@ lbl_800667CC: /* 800667F0 00063730 48 00 0C 40 */ b lbl_80067430 lbl_800667F4: /* 800667F4 00063734 3A 80 00 00 */ li r20, 0 -/* 800667F8 00063738 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800667FC 0006373C 3A 63 61 C0 */ addi r19, r3, lbl_804061C0@l +/* 800667F8 00063738 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800667FC 0006373C 3A 63 61 C0 */ addi r19, r3, g_dComIfG_gameInfo@l /* 80066800 00063740 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80066804 00063744 3A A3 CA 54 */ addi r21, r3, lbl_8042CA54@l /* 80066808 00063748 3C 60 80 38 */ lis r3, lbl_8037A578@ha @@ -13145,8 +13145,8 @@ dKyr_drawSnow: /* 80067530 00064470 7C 8F 23 78 */ mr r15, r4 /* 80067534 00064474 3C 60 80 42 */ lis r3, lbl_80424950@ha /* 80067538 00064478 3B C3 49 50 */ addi r30, r3, lbl_80424950@l -/* 8006753C 0006447C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80067540 00064480 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006753C 0006447C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80067540 00064480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80067544 00064484 83 A3 5D 74 */ lwz r29, 0x5d74(r3) /* 80067548 00064488 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006754C 0006448C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -13343,8 +13343,8 @@ lbl_800676E8: /* 80067830 00064770 38 00 00 78 */ li r0, 0x78 /* 80067834 00064774 98 01 00 33 */ stb r0, 0x33(r1) /* 80067838 00064778 98 01 00 2F */ stb r0, 0x2f(r1) -/* 8006783C 0006477C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80067840 00064780 39 C3 61 C0 */ addi r14, r3, lbl_804061C0@l +/* 8006783C 0006477C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80067840 00064780 39 C3 61 C0 */ addi r14, r3, g_dComIfG_gameInfo@l /* 80067844 00064784 80 6E 61 B0 */ lwz r3, 0x61b0(r14) /* 80067848 00064788 28 03 00 00 */ cmplwi r3, 0 /* 8006784C 0006478C 41 82 0C E8 */ beq lbl_80068534 @@ -13509,8 +13509,8 @@ lbl_80067AAC: lbl_80067AB0: /* 80067AB0 000649F0 3A 40 00 00 */ li r18, 0 /* 80067AB4 000649F4 3B 40 00 00 */ li r26, 0 -/* 80067AB8 000649F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80067ABC 000649FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80067AB8 000649F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80067ABC 000649FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80067AC0 00064A00 3A E3 4E 00 */ addi r23, r3, 0x4e00 /* 80067AC4 00064A04 57 76 06 3E */ clrlwi r22, r27, 0x18 /* 80067AC8 00064A08 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -14294,8 +14294,8 @@ dKyr_drawStar: /* 80068664 000655A4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80068668 000655A8 3B 83 CA 54 */ addi r28, r3, lbl_8042CA54@l /* 8006866C 000655AC 83 BC 0E A4 */ lwz r29, 0xea4(r28) -/* 80068670 000655B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80068674 000655B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80068670 000655B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80068674 000655B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80068678 000655B8 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 8006867C 000655BC 88 0D 89 9C */ lbz r0, lbl_80450F1C-_SDA_BASE_(r13) /* 80068680 000655C0 7C 00 07 75 */ extsb. r0, r0 @@ -14537,8 +14537,8 @@ lbl_800689C0: /* 800689C0 00065900 A8 1D 00 48 */ lha r0, 0x48(r29) /* 800689C4 00065904 2C 00 00 00 */ cmpwi r0, 0 /* 800689C8 00065908 41 82 0A C4 */ beq lbl_8006948C -/* 800689CC 0006590C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800689D0 00065910 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800689CC 0006590C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800689D0 00065910 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800689D4 00065914 3A E3 4E 00 */ addi r23, r3, 0x4e00 /* 800689D8 00065918 7E E3 BB 78 */ mr r3, r23 /* 800689DC 0006591C 3C 80 80 38 */ lis r4, lbl_8037A578@ha @@ -14592,8 +14592,8 @@ lbl_80068A7C: /* 80068A8C 000659CC 38 00 00 FF */ li r0, 0xff /* 80068A90 000659D0 98 01 00 16 */ stb r0, 0x16(r1) /* 80068A94 000659D4 98 01 00 17 */ stb r0, 0x17(r1) -/* 80068A98 000659D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80068A9C 000659DC 3A 83 61 C0 */ addi r20, r3, lbl_804061C0@l +/* 80068A98 000659D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80068A9C 000659DC 3A 83 61 C0 */ addi r20, r3, g_dComIfG_gameInfo@l /* 80068AA0 000659E0 80 74 61 B0 */ lwz r3, 0x61b0(r20) /* 80068AA4 000659E4 28 03 00 00 */ cmplwi r3, 0 /* 80068AA8 000659E8 41 82 09 E4 */ beq lbl_8006948C @@ -14846,8 +14846,8 @@ lbl_80068D54: /* 80068E6C 00065DAC C2 C2 87 B8 */ lfs f22, lbl_804521B8-_SDA2_BASE_(r2) /* 80068E70 00065DB0 3A C0 00 00 */ li r22, 0 /* 80068E74 00065DB4 3A A0 00 00 */ li r21, 0 -/* 80068E78 00065DB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80068E7C 00065DBC 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 80068E78 00065DB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80068E7C 00065DBC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 80068E80 00065DC0 C3 A2 87 E4 */ lfs f29, lbl_804521E4-_SDA2_BASE_(r2) /* 80068E84 00065DC4 C0 22 88 94 */ lfs f1, lbl_80452294-_SDA2_BASE_(r2) /* 80068E88 00065DC8 EC 17 05 F2 */ fmuls f0, f23, f23 @@ -15312,8 +15312,8 @@ drawCloudShadow: /* 80069548 00066488 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006954C 0006648C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80069550 00066490 83 A3 0E C0 */ lwz r29, 0xec0(r3) -/* 80069554 00066494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80069558 00066498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80069554 00066494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80069558 00066498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006955C 0006649C 3B C3 5D 74 */ addi r30, r3, 0x5d74 /* 80069560 000664A0 83 83 5D 74 */ lwz r28, 0x5d74(r3) /* 80069564 000664A4 88 0D 89 A4 */ lbz r0, lbl_80450F24-_SDA_BASE_(r13) @@ -15337,8 +15337,8 @@ lbl_80069580: /* 800695A8 000664E8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800695AC 000664EC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 800695B0 000664F0 48 2A 71 8D */ bl J3DSys_NS_reinitGX -/* 800695B4 000664F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800695B8 000664F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800695B4 000664F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800695B8 000664F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800695BC 000664FC 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 800695C0 00066500 28 03 00 00 */ cmplwi r3, 0 /* 800695C4 00066504 41 82 0A 94 */ beq lbl_8006A058 @@ -15604,8 +15604,8 @@ lbl_80069988: /* 800699BC 000668FC 80 9B 00 00 */ lwz r4, 0(r27) /* 800699C0 00066900 38 A0 00 01 */ li r5, 1 /* 800699C4 00066904 4B FF 1F 69 */ bl dKyr_set_btitex_common -/* 800699C8 00066908 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800699CC 0006690C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800699C8 00066908 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800699CC 0006690C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800699D0 00066910 88 03 5D 70 */ lbz r0, 0x5d70(r3) /* 800699D4 00066914 7C 00 07 74 */ extsb r0, r0 /* 800699D8 00066918 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -16084,8 +16084,8 @@ drawVrkumo: /* 8006A110 00067050 81 E3 0E 74 */ lwz r15, 0xe74(r3) /* 8006A114 00067054 80 03 0E D0 */ lwz r0, 0xed0(r3) /* 8006A118 00067058 90 01 01 A0 */ stw r0, 0x1a0(r1) -/* 8006A11C 0006705C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006A120 00067060 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006A11C 0006705C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006A120 00067060 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006A124 00067064 82 43 5D 74 */ lwz r18, 0x5d74(r3) /* 8006A128 00067068 3A 00 00 01 */ li r16, 1 /* 8006A12C 0006706C C2 E2 87 B8 */ lfs f23, lbl_804521B8-_SDA2_BASE_(r2) @@ -16093,8 +16093,8 @@ drawVrkumo: /* 8006A134 00067074 41 82 00 08 */ beq lbl_8006A13C /* 8006A138 00067078 C2 F2 0B 68 */ lfs f23, 0xb68(r18) lbl_8006A13C: -/* 8006A13C 0006707C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006A140 00067080 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l +/* 8006A13C 0006707C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006A140 00067080 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 8006A144 00067084 80 77 61 B0 */ lwz r3, 0x61b0(r23) /* 8006A148 00067088 28 03 00 00 */ cmplwi r3, 0 /* 8006A14C 0006708C 41 82 0F D4 */ beq lbl_8006B120 @@ -16120,8 +16120,8 @@ lbl_8006A164: /* 8006A198 000670D8 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8006A19C 000670DC 7C 84 07 75 */ extsb. r4, r4 /* 8006A1A0 000670E0 41 80 00 24 */ blt lbl_8006A1C4 -/* 8006A1A4 000670E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006A1A8 000670E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006A1A4 000670E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006A1A8 000670E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006A1AC 000670EC 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8006A1B0 000670F0 4B FB A1 D5 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8006A1B4 000670F4 81 83 00 00 */ lwz r12, 0(r3) @@ -16138,8 +16138,8 @@ lbl_8006A1C4: /* 8006A1DC 0006711C C0 02 8B 7C */ lfs f0, lbl_8045257C-_SDA2_BASE_(r2) /* 8006A1E0 00067120 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8006A1E4 00067124 40 80 00 78 */ bge lbl_8006A25C -/* 8006A1E8 00067128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006A1EC 0006712C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006A1E8 00067128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006A1EC 0006712C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006A1F0 00067130 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8006A1F4 00067134 28 00 00 00 */ cmplwi r0, 0 /* 8006A1F8 00067138 40 82 00 64 */ bne lbl_8006A25C @@ -16172,8 +16172,8 @@ lbl_8006A25C: /* 8006A260 000671A0 3B 03 CA 54 */ addi r24, r3, lbl_8042CA54@l /* 8006A264 000671A4 C0 02 8A 60 */ lfs f0, lbl_80452460-_SDA2_BASE_(r2) /* 8006A268 000671A8 EF C0 06 32 */ fmuls f30, f0, f24 -/* 8006A26C 000671AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006A270 000671B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006A26C 000671AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006A270 000671B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006A274 000671B4 3A C3 4E 00 */ addi r22, r3, 0x4e00 /* 8006A278 000671B8 3A A1 00 B4 */ addi r21, r1, 0xb4 /* 8006A27C 000671BC 3A 81 00 C0 */ addi r20, r1, 0xc0 @@ -17205,8 +17205,8 @@ dKyr_thunder_move: /* 8006B1C0 00068100 48 2F 70 15 */ bl _savegpr_27 /* 8006B1C4 00068104 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006B1C8 00068108 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 8006B1CC 0006810C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006B1D0 00068110 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 8006B1CC 0006810C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006B1D0 00068110 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8006B1D4 00068114 83 DC 5D 74 */ lwz r30, 0x5d74(r28) /* 8006B1D8 00068118 3B A0 00 00 */ li r29, 0 /* 8006B1DC 0006811C 3B 7C 4E 00 */ addi r27, r28, 0x4e00 @@ -17720,8 +17720,8 @@ dKyr_odour_move: /* 8006B94C 0006888C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006B950 00068890 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 8006B954 00068894 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8006B958 00068898 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006B95C 0006889C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006B958 00068898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006B95C 0006889C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006B960 000688A0 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 8006B964 000688A4 28 03 00 00 */ cmplwi r3, 0 /* 8006B968 000688A8 41 82 04 8C */ beq lbl_8006BDF4 @@ -18070,8 +18070,8 @@ lbl_8006BE60: /* 8006BE60 00068DA0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006BE64 00068DA4 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8006BE68 00068DA8 48 2A 48 D5 */ bl J3DSys_NS_reinitGX -/* 8006BE6C 00068DAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006BE70 00068DB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006BE6C 00068DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006BE70 00068DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006BE74 00068DB4 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 8006BE78 00068DB8 28 03 00 00 */ cmplwi r3, 0 /* 8006BE7C 00068DBC 41 82 08 EC */ beq lbl_8006C768 @@ -18093,8 +18093,8 @@ lbl_8006BE94: lbl_8006BEB8: /* 8006BEB8 00068DF8 38 60 00 01 */ li r3, 1 /* 8006BEBC 00068DFC 48 2F 47 15 */ bl GXSetClipMode -/* 8006BEC0 00068E00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006BEC4 00068E04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006BEC0 00068E00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006BEC4 00068E04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006BEC8 00068E08 88 03 00 16 */ lbz r0, 0x16(r3) /* 8006BECC 00068E0C 2C 00 00 B3 */ cmpwi r0, 0xb3 /* 8006BED0 00068E10 41 82 00 5C */ beq lbl_8006BF2C @@ -18185,8 +18185,8 @@ lbl_8006C004: /* 8006C008 00068F48 80 9C 00 00 */ lwz r4, 0(r28) /* 8006C00C 00068F4C 38 A0 00 01 */ li r5, 1 /* 8006C010 00068F50 4B FE F9 1D */ bl dKyr_set_btitex_common -/* 8006C014 00068F54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006C018 00068F58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006C014 00068F54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006C018 00068F58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C01C 00068F5C 88 03 5D 70 */ lbz r0, 0x5d70(r3) /* 8006C020 00068F60 7C 00 07 74 */ extsb r0, r0 /* 8006C024 00068F64 3B C3 5D 74 */ addi r30, r3, 0x5d74 @@ -18693,8 +18693,8 @@ dKyr_mud_init: /* 8006C7AC 000696EC 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l /* 8006C7B0 000696F0 38 63 00 10 */ addi r3, r3, 0x10 /* 8006C7B4 000696F4 38 80 00 53 */ li r4, 0x53 -/* 8006C7B8 000696F8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8006C7BC 000696FC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8006C7B8 000696F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8006C7BC 000696FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8006C7C0 00069700 3C A5 00 02 */ addis r5, r5, 2 /* 8006C7C4 00069704 38 C0 00 80 */ li r6, 0x80 /* 8006C7C8 00069708 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -18716,8 +18716,8 @@ lbl_8006C7F0: /* 8006C804 00069744 38 00 00 00 */ li r0, 0 /* 8006C808 00069748 80 7F 10 4C */ lwz r3, 0x104c(r31) /* 8006C80C 0006974C 90 03 00 10 */ stw r0, 0x10(r3) -/* 8006C810 00069750 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006C814 00069754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006C810 00069750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006C814 00069754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C818 00069758 38 63 09 58 */ addi r3, r3, 0x958 /* 8006C81C 0006975C 38 80 00 03 */ li r4, 3 /* 8006C820 00069760 4B FC 81 15 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -18756,8 +18756,8 @@ dKyr_mud_move: /* 8006C890 000697D0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006C894 000697D4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006C898 000697D8 83 C3 10 4C */ lwz r30, 0x104c(r3) -/* 8006C89C 000697DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006C8A0 000697E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006C89C 000697DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006C8A0 000697E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C8A4 000697E4 83 A3 5D 74 */ lwz r29, 0x5d74(r3) /* 8006C8A8 000697E8 38 61 00 14 */ addi r3, r1, 0x14 /* 8006C8AC 000697EC 4B FE E2 55 */ bl dKyw_get_wind_vecpow @@ -18787,8 +18787,8 @@ lbl_8006C904: /* 8006C904 00069844 80 03 10 48 */ lwz r0, 0x1048(r3) /* 8006C908 00069848 2C 00 00 00 */ cmpwi r0, 0 /* 8006C90C 0006984C 41 82 00 7C */ beq lbl_8006C988 -/* 8006C910 00069850 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006C914 00069854 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006C910 00069850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006C914 00069854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C918 00069858 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8006C91C 0006985C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006C920 00069860 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l @@ -19477,8 +19477,8 @@ lbl_8006D284: /* 8006D304 0006A244 98 01 00 16 */ stb r0, 0x16(r1) /* 8006D308 0006A248 38 00 00 FF */ li r0, 0xff /* 8006D30C 0006A24C 98 01 00 17 */ stb r0, 0x17(r1) -/* 8006D310 0006A250 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006D314 0006A254 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006D310 0006A250 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006D314 0006A254 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006D318 0006A258 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8006D31C 0006A25C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006D320 0006A260 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l @@ -19595,8 +19595,8 @@ lbl_8006D284: /* 8006D4DC 0006A41C 80 01 01 4C */ lwz r0, 0x14c(r1) /* 8006D4E0 0006A420 98 01 00 16 */ stb r0, 0x16(r1) lbl_8006D4E4: -/* 8006D4E4 0006A424 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006D4E8 0006A428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006D4E4 0006A424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006D4E8 0006A428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006D4EC 0006A42C 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 8006D4F0 0006A430 28 03 00 00 */ cmplwi r3, 0 /* 8006D4F4 0006A434 41 82 03 C8 */ beq lbl_8006D8BC @@ -19886,8 +19886,8 @@ dKyr_evil_init: /* 8006D940 0006A880 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l /* 8006D944 0006A884 38 63 00 10 */ addi r3, r3, 0x10 /* 8006D948 0006A888 38 80 00 53 */ li r4, 0x53 -/* 8006D94C 0006A88C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8006D950 0006A890 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8006D94C 0006A88C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8006D950 0006A890 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8006D954 0006A894 3F C5 00 02 */ addis r30, r5, 2 /* 8006D958 0006A898 3B DE C2 F8 */ addi r30, r30, -15624 /* 8006D95C 0006A89C 7F C5 F3 78 */ mr r5, r30 @@ -20031,8 +20031,8 @@ lbl_8006DB28: /* 8006DB54 0006AA94 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006DB58 0006AA98 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8006DB5C 0006AA9C 48 2A 2B E1 */ bl J3DSys_NS_reinitGX -/* 8006DB60 0006AAA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006DB64 0006AAA4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8006DB60 0006AAA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006DB64 0006AAA4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8006DB68 0006AAA8 80 7D 61 B0 */ lwz r3, 0x61b0(r29) /* 8006DB6C 0006AAAC 28 03 00 00 */ cmplwi r3, 0 /* 8006DB70 0006AAB0 41 82 08 58 */ beq lbl_8006E3C8 @@ -20183,8 +20183,8 @@ lbl_8006DB88: /* 8006DDB0 0006ACF0 48 2F 13 25 */ bl GXSetNumIndStages /* 8006DDB4 0006ACF4 3B 40 00 00 */ li r26, 0 /* 8006DDB8 0006ACF8 3A E0 00 00 */ li r23, 0 -/* 8006DDBC 0006ACFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006DDC0 0006AD00 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8006DDBC 0006ACFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006DDC0 0006AD00 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8006DDC4 0006AD04 3B 9E 4E 00 */ addi r28, r30, 0x4e00 /* 8006DDC8 0006AD08 C0 02 88 DC */ lfs f0, lbl_804522DC-_SDA2_BASE_(r2) /* 8006DDCC 0006AD0C FF E0 00 50 */ fneg f31, f0 @@ -20844,8 +20844,8 @@ lbl_8006E714: /* 8006E740 0006B680 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006E744 0006B684 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8006E748 0006B688 48 2A 1F F5 */ bl J3DSys_NS_reinitGX -/* 8006E74C 0006B68C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006E750 0006B690 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8006E74C 0006B68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006E750 0006B690 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8006E754 0006B694 80 7D 61 B0 */ lwz r3, 0x61b0(r29) /* 8006E758 0006B698 28 03 00 00 */ cmplwi r3, 0 /* 8006E75C 0006B69C 41 82 09 CC */ beq lbl_8006F128 @@ -20998,14 +20998,14 @@ lbl_8006E774: /* 8006E9A4 0006B8E4 48 2F 1C 2D */ bl GXSetClipMode /* 8006E9A8 0006B8E8 38 60 00 00 */ li r3, 0 /* 8006E9AC 0006B8EC 48 2F 07 29 */ bl GXSetNumIndStages -/* 8006E9B0 0006B8F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006E9B4 0006B8F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8006E9B0 0006B8F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006E9B4 0006B8F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006E9B8 0006B8F8 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 8006E9BC 0006B8FC 48 01 6C D5 */ bl dCcMassS_Mng_NS_Prepare /* 8006E9C0 0006B900 3B 60 00 00 */ li r27, 0 /* 8006E9C4 0006B904 3A E0 00 00 */ li r23, 0 -/* 8006E9C8 0006B908 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8006E9CC 0006B90C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8006E9C8 0006B908 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8006E9CC 0006B90C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8006E9D0 0006B910 C0 02 88 DC */ lfs f0, lbl_804522DC-_SDA2_BASE_(r2) /* 8006E9D4 0006B914 FF C0 00 50 */ fneg f30, f0 /* 8006E9D8 0006B918 3C 60 80 43 */ lis r3, lbl_8042CA54@ha diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index 3035796d31..f4bd7f38e9 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -14,8 +14,8 @@ dKyw_setDrawPacketList: /* 80056AC0 00053A00 38 60 00 00 */ li r3, 0 /* 80056AC4 00053A04 48 00 00 20 */ b lbl_80056AE4 lbl_80056AC8: -/* 80056AC8 00053A08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056ACC 00053A0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056AC8 00053A08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056ACC 00053A0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056AD0 00053A10 80 63 5F 94 */ lwz r3, 0x5f94(r3) /* 80056AD4 00053A14 7F E4 FB 78 */ mr r4, r31 /* 80056AD8 00053A18 38 A0 00 00 */ li r5, 0 @@ -39,8 +39,8 @@ dKyw_setDrawPacketListIndScreen: /* 80056B10 00053A50 38 60 00 00 */ li r3, 0 /* 80056B14 00053A54 48 00 00 20 */ b lbl_80056B34 lbl_80056B18: -/* 80056B18 00053A58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056B1C 00053A5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056B18 00053A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056B1C 00053A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056B20 00053A60 80 63 5F 6C */ lwz r3, 0x5f6c(r3) /* 80056B24 00053A64 7F E4 FB 78 */ mr r4, r31 /* 80056B28 00053A68 38 A0 00 00 */ li r5, 0 @@ -65,8 +65,8 @@ dKyw_setDrawPacketListSky: /* 80056B64 00053AA4 38 60 00 00 */ li r3, 0 /* 80056B68 00053AA8 48 00 00 58 */ b lbl_80056BC0 lbl_80056B6C: -/* 80056B6C 00053AAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056B70 00053AB0 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80056B6C 00053AAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056B70 00053AB0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80056B74 00053AB4 80 05 5F 64 */ lwz r0, 0x5f64(r5) /* 80056B78 00053AB8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056B7C 00053ABC 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -79,8 +79,8 @@ lbl_80056B6C: /* 80056B98 00053AD8 7F A4 EB 78 */ mr r4, r29 /* 80056B9C 00053ADC 38 A0 00 00 */ li r5, 0 /* 80056BA0 00053AE0 48 2C E8 ED */ bl J3DDrawBuffer_NS_entryImm -/* 80056BA4 00053AE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056BA8 00053AE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056BA4 00053AE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056BA8 00053AE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056BAC 00053AEC 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80056BB0 00053AF0 90 1E 00 00 */ stw r0, 0(r30) /* 80056BB4 00053AF4 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -106,8 +106,8 @@ dKyw_setDrawPacketListXluBg: /* 80056BF4 00053B34 38 60 00 00 */ li r3, 0 /* 80056BF8 00053B38 48 00 00 50 */ b lbl_80056C48 lbl_80056BFC: -/* 80056BFC 00053B3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056C00 00053B40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056BFC 00053B3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056C00 00053B40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056C04 00053B44 80 03 5F 74 */ lwz r0, 0x5f74(r3) /* 80056C08 00053B48 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056C0C 00053B4C 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -118,8 +118,8 @@ lbl_80056BFC: /* 80056C20 00053B60 7F A4 EB 78 */ mr r4, r29 /* 80056C24 00053B64 38 A0 00 00 */ li r5, 0 /* 80056C28 00053B68 48 2C E8 65 */ bl J3DDrawBuffer_NS_entryImm -/* 80056C2C 00053B6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80056C30 00053B70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80056C2C 00053B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80056C30 00053B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056C34 00053B74 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 80056C38 00053B78 90 1E 00 00 */ stw r0, 0(r30) /* 80056C3C 00053B7C 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -840,8 +840,8 @@ dKyw_wether_init: /* 8005757C 000544BC D0 03 0E 60 */ stfs f0, 0xe60(r3) /* 80057580 000544C0 48 00 2F FD */ bl dKyw_wind_init /* 80057584 000544C4 48 00 37 C1 */ bl dKyw_pntwind_init -/* 80057588 000544C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005758C 000544CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80057588 000544C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005758C 000544CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80057590 000544D0 3B C3 4E 00 */ addi r30, r3, 0x4e00 /* 80057594 000544D4 7F C3 F3 78 */ mr r3, r30 /* 80057598 000544D8 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -860,8 +860,8 @@ dKyw_wether_init: /* 800575CC 0005450C D0 01 00 28 */ stfs f0, 0x28(r1) /* 800575D0 00054510 D0 01 00 24 */ stfs f0, 0x24(r1) /* 800575D4 00054514 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800575D8 00054518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800575DC 0005451C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 800575D8 00054518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800575DC 0005451C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800575E0 00054520 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800575E4 00054524 38 80 00 00 */ li r4, 0 /* 800575E8 00054528 90 81 00 08 */ stw r4, 8(r1) @@ -1799,8 +1799,8 @@ wether_move_sun: /* 80058324 00055264 39 61 00 20 */ addi r11, r1, 0x20 /* 80058328 00055268 48 30 9E B1 */ bl _savegpr_28 /* 8005832C 0005526C 3B 80 00 00 */ li r28, 0 -/* 80058330 00055270 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80058334 00055274 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80058330 00055270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80058334 00055274 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80058338 00055278 A0 1D 5D 46 */ lhz r0, 0x5d46(r29) /* 8005833C 0005527C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80058340 00055280 41 82 05 3C */ beq lbl_8005887C @@ -1977,8 +1977,8 @@ lbl_8005850C: /* 800585D0 00055510 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800585D4 00055514 38 63 00 82 */ addi r3, r3, 0x82 /* 800585D8 00055518 38 80 00 56 */ li r4, 0x56 -/* 800585DC 0005551C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800585E0 00055520 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800585DC 0005551C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800585E0 00055520 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800585E4 00055524 3F 85 00 02 */ addis r28, r5, 2 /* 800585E8 00055528 3B 9C C2 F8 */ addi r28, r28, -15624 /* 800585EC 0005552C 7F 85 E3 78 */ mr r5, r28 @@ -2077,8 +2077,8 @@ lbl_8005871C: /* 80058754 00055694 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80058758 00055698 38 63 00 82 */ addi r3, r3, 0x82 /* 8005875C 0005569C 38 80 00 4A */ li r4, 0x4a -/* 80058760 000556A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80058764 000556A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80058760 000556A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80058764 000556A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80058768 000556A8 3F 85 00 02 */ addis r28, r5, 2 /* 8005876C 000556AC 3B 9C C2 F8 */ addi r28, r28, -15624 /* 80058770 000556B0 7F 85 E3 78 */ mr r5, r28 @@ -2237,8 +2237,8 @@ lbl_80058938: /* 8005899C 000558DC 48 25 2F E9 */ bl Z2SeMgr_NS_seStart /* 800589A0 000558E0 48 00 01 48 */ b lbl_80058AE8 lbl_800589A4: -/* 800589A4 000558E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800589A8 000558E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800589A4 000558E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800589A8 000558E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800589AC 000558EC 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 800589B0 000558F0 48 00 47 DD */ bl dKyr_rain_move /* 800589B4 000558F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -2248,8 +2248,8 @@ lbl_800589A4: /* 800589C4 00055904 40 82 00 A0 */ bne lbl_80058A64 /* 800589C8 00055908 28 1E 00 00 */ cmplwi r30, 0 /* 800589CC 0005590C 41 82 00 98 */ beq lbl_80058A64 -/* 800589D0 00055910 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800589D4 00055914 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800589D0 00055910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800589D4 00055914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800589D8 00055918 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800589DC 0005591C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800589E0 00055920 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l @@ -2382,8 +2382,8 @@ wether_move_star: /* 80058BA0 00055AE0 39 61 00 20 */ addi r11, r1, 0x20 /* 80058BA4 00055AE4 48 30 96 39 */ bl _savegpr_29 /* 80058BA8 00055AE8 3B C0 00 00 */ li r30, 0 -/* 80058BAC 00055AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80058BB0 00055AF0 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80058BAC 00055AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80058BB0 00055AF0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80058BB4 00055AF4 3B FD 4E 00 */ addi r31, r29, 0x4e00 /* 80058BB8 00055AF8 7F E3 FB 78 */ mr r3, r31 /* 80058BBC 00055AFC 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -2401,8 +2401,8 @@ wether_move_star: /* 80058BEC 00055B2C 40 82 00 08 */ bne lbl_80058BF4 /* 80058BF0 00055B30 48 00 03 08 */ b lbl_80058EF8 lbl_80058BF4: -/* 80058BF4 00055B34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80058BF8 00055B38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80058BF4 00055B34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80058BF8 00055B38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80058BFC 00055B3C A0 03 5D 46 */ lhz r0, 0x5d46(r3) /* 80058C00 00055B40 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80058C04 00055B44 41 82 00 18 */ beq lbl_80058C1C @@ -2628,8 +2628,8 @@ wether_move_housi: /* 80058F20 00055E60 90 01 00 24 */ stw r0, 0x24(r1) /* 80058F24 00055E64 39 61 00 20 */ addi r11, r1, 0x20 /* 80058F28 00055E68 48 30 92 B5 */ bl _savegpr_29 -/* 80058F2C 00055E6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80058F30 00055E70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80058F2C 00055E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80058F30 00055E70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80058F34 00055E74 3B E3 4E 00 */ addi r31, r3, 0x4e00 /* 80058F38 00055E78 7F E3 FB 78 */ mr r3, r31 /* 80058F3C 00055E7C 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -2681,8 +2681,8 @@ lbl_80058FC0: /* 80058FEC 00055F2C 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 80058FF0 00055F30 2C 00 00 01 */ cmpwi r0, 1 /* 80058FF4 00055F34 40 82 01 28 */ bne lbl_8005911C -/* 80058FF8 00055F38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80058FFC 00055F3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80058FF8 00055F38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80058FFC 00055F3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80059000 00055F40 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 80059004 00055F44 2C 00 00 09 */ cmpwi r0, 9 /* 80059008 00055F48 40 82 01 14 */ bne lbl_8005911C @@ -2703,8 +2703,8 @@ lbl_8005900C: /* 80059040 00055F80 48 30 F9 55 */ bl strcmp /* 80059044 00055F84 2C 03 00 00 */ cmpwi r3, 0 /* 80059048 00055F88 40 82 00 24 */ bne lbl_8005906C -/* 8005904C 00055F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80059050 00055F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005904C 00055F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80059050 00055F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80059054 00055F94 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80059058 00055F98 2C 00 00 01 */ cmpwi r0, 1 /* 8005905C 00055F9C 40 82 00 10 */ bne lbl_8005906C @@ -2719,8 +2719,8 @@ lbl_8005906C: /* 8005907C 00055FBC 48 30 F9 19 */ bl strcmp /* 80059080 00055FC0 2C 03 00 00 */ cmpwi r3, 0 /* 80059084 00055FC4 40 82 00 24 */ bne lbl_800590A8 -/* 80059088 00055FC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005908C 00055FCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80059088 00055FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005908C 00055FCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80059090 00055FD0 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80059094 00055FD4 7C 00 07 75 */ extsb. r0, r0 /* 80059098 00055FD8 40 82 00 10 */ bne lbl_800590A8 @@ -2735,8 +2735,8 @@ lbl_800590A8: /* 800590B8 00055FF8 48 30 F8 DD */ bl strcmp /* 800590BC 00055FFC 2C 03 00 00 */ cmpwi r3, 0 /* 800590C0 00056000 40 82 00 24 */ bne lbl_800590E4 -/* 800590C4 00056004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800590C8 00056008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800590C4 00056004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800590C8 00056008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800590CC 0005600C 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 800590D0 00056010 7C 00 07 75 */ extsb. r0, r0 /* 800590D4 00056014 40 82 00 10 */ bne lbl_800590E4 @@ -2751,8 +2751,8 @@ lbl_800590E4: /* 800590F4 00056034 48 30 F8 A1 */ bl strcmp /* 800590F8 00056038 2C 03 00 00 */ cmpwi r3, 0 /* 800590FC 0005603C 40 82 00 20 */ bne lbl_8005911C -/* 80059100 00056040 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80059104 00056044 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80059100 00056040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80059104 00056044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80059108 00056048 88 03 4E 0B */ lbz r0, 0x4e0b(r3) /* 8005910C 0005604C 2C 00 00 09 */ cmpwi r0, 9 /* 80059110 00056050 40 82 00 0C */ bne lbl_8005911C @@ -2815,8 +2815,8 @@ lbl_800591AC: /* 800591D4 00056114 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800591D8 00056118 38 63 00 82 */ addi r3, r3, 0x82 /* 800591DC 0005611C 38 80 00 5E */ li r4, 0x5e -/* 800591E0 00056120 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800591E4 00056124 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800591E0 00056120 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800591E4 00056124 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800591E8 00056128 3C A5 00 02 */ addis r5, r5, 2 /* 800591EC 0005612C 38 C0 00 80 */ li r6, 0x80 /* 800591F0 00056130 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2856,8 +2856,8 @@ lbl_80059258: /* 8005926C 000561AC 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059270 000561B0 38 63 00 82 */ addi r3, r3, 0x82 /* 80059274 000561B4 38 80 00 55 */ li r4, 0x55 -/* 80059278 000561B8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8005927C 000561BC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80059278 000561B8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8005927C 000561BC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80059280 000561C0 3C A5 00 02 */ addis r5, r5, 2 /* 80059284 000561C4 38 C0 00 80 */ li r6, 0x80 /* 80059288 000561C8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2872,8 +2872,8 @@ lbl_8005929C: /* 800592A8 000561E8 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800592AC 000561EC 38 63 00 82 */ addi r3, r3, 0x82 /* 800592B0 000561F0 38 80 00 55 */ li r4, 0x55 -/* 800592B4 000561F4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800592B8 000561F8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800592B4 000561F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800592B8 000561F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800592BC 000561FC 3C A5 00 02 */ addis r5, r5, 2 /* 800592C0 00056200 38 C0 00 80 */ li r6, 0x80 /* 800592C4 00056204 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -2886,8 +2886,8 @@ lbl_800592D8: /* 800592DC 0005621C 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800592E0 00056220 38 63 00 82 */ addi r3, r3, 0x82 /* 800592E4 00056224 38 80 00 56 */ li r4, 0x56 -/* 800592E8 00056228 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800592EC 0005622C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800592E8 00056228 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800592EC 0005622C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800592F0 00056230 3C A5 00 02 */ addis r5, r5, 2 /* 800592F4 00056234 38 C0 00 80 */ li r6, 0x80 /* 800592F8 00056238 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -3017,8 +3017,8 @@ lbl_80059490: /* 800594A8 000563E8 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800594AC 000563EC 38 63 00 82 */ addi r3, r3, 0x82 /* 800594B0 000563F0 38 80 00 53 */ li r4, 0x53 -/* 800594B4 000563F4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 800594B8 000563F8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 800594B4 000563F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 800594B8 000563F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 800594BC 000563FC 3C A5 00 02 */ addis r5, r5, 2 /* 800594C0 00056400 38 C0 00 80 */ li r6, 0x80 /* 800594C4 00056404 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -3133,8 +3133,8 @@ lbl_80059624: /* 8005963C 0005657C 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059640 00056580 38 63 00 82 */ addi r3, r3, 0x82 /* 80059644 00056584 38 80 00 53 */ li r4, 0x53 -/* 80059648 00056588 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8005964C 0005658C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80059648 00056588 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8005964C 0005658C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80059650 00056590 3C A5 00 02 */ addis r5, r5, 2 /* 80059654 00056594 38 C0 00 80 */ li r6, 0x80 /* 80059658 00056598 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -3231,8 +3231,8 @@ wether_move_vrkumo: /* 800597A4 000566E4 38 00 00 01 */ li r0, 1 /* 800597A8 000566E8 98 0D 89 60 */ stb r0, lbl_80450EE0-_SDA_BASE_(r13) lbl_800597AC: -/* 800597AC 000566EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800597B0 000566F0 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 800597AC 000566EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800597B0 000566F0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 800597B4 000566F4 A0 1D 5D 46 */ lhz r0, 0x5d46(r29) /* 800597B8 000566F8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800597BC 000566FC 41 82 02 38 */ beq lbl_800599F4 @@ -3401,8 +3401,8 @@ lbl_80059A04: /* 80059A18 00056958 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80059A1C 0005695C 90 03 0E C8 */ stw r0, 0xec8(r3) lbl_80059A20: -/* 80059A20 00056960 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80059A24 00056964 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80059A20 00056960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80059A24 00056964 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80059A28 00056968 38 7E 4E 20 */ addi r3, r30, 0x4e20 /* 80059A2C 0005696C 81 9E 4E 20 */ lwz r12, 0x4e20(r30) /* 80059A30 00056970 81 8C 00 30 */ lwz r12, 0x30(r12) @@ -3882,8 +3882,8 @@ dKyw_wether_move_draw: /* 8005A0CC 0005700C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A0D0 00057010 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A0D4 00057014 90 03 12 88 */ stw r0, 0x1288(r3) -/* 8005A0D8 00057018 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A0DC 0005701C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005A0D8 00057018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A0DC 0005701C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A0E0 00057020 3B E3 4E 00 */ addi r31, r3, 0x4e00 /* 8005A0E4 00057024 7F E3 FB 78 */ mr r3, r31 /* 8005A0E8 00057028 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -3934,8 +3934,8 @@ dKyw_wether_draw: /* 8005A17C 000570BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8005A180 000570C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8005A184 000570C4 93 C1 00 08 */ stw r30, 8(r1) -/* 8005A188 000570C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A18C 000570CC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8005A188 000570C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A18C 000570CC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8005A190 000570D0 3B DF 4E 00 */ addi r30, r31, 0x4e00 /* 8005A194 000570D4 7F C3 F3 78 */ mr r3, r30 /* 8005A198 000570D8 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -4066,8 +4066,8 @@ dKyw_wether_proc: /* 8005A348 00057288 90 01 00 14 */ stw r0, 0x14(r1) /* 8005A34C 0005728C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8005A350 00057290 93 C1 00 08 */ stw r30, 8(r1) -/* 8005A354 00057294 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A358 00057298 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005A354 00057294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A358 00057298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A35C 0005729C 3B E3 4E 00 */ addi r31, r3, 0x4e00 /* 8005A360 000572A0 7F E3 FB 78 */ mr r3, r31 /* 8005A364 000572A4 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -4340,8 +4340,8 @@ lbl_8005A724: /* 8005A72C 0005766C 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8005A730 00057670 7C 84 07 75 */ extsb. r4, r4 /* 8005A734 00057674 41 80 00 28 */ blt lbl_8005A75C -/* 8005A738 00057678 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A73C 0005767C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005A738 00057678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A73C 0005767C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A740 00057680 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8005A744 00057684 4B FC 9C 41 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8005A748 00057688 81 83 00 00 */ lwz r12, 0(r3) @@ -4359,8 +4359,8 @@ lbl_8005A75C: lbl_8005A774: /* 8005A774 000576B4 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8005A778 000576B8 7C 84 07 74 */ extsb r4, r4 -/* 8005A77C 000576BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A780 000576C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005A77C 000576BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A780 000576C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A784 000576C4 3B E3 4E C4 */ addi r31, r3, 0x4ec4 /* 8005A788 000576C8 7F E3 FB 78 */ mr r3, r31 /* 8005A78C 000576CC 4B FC 9B F9 */ bl dStage_roomControl_c_NS_getStatusRoomDt @@ -4501,8 +4501,8 @@ lbl_8005A95C: /* 8005A964 000578A4 40 81 00 08 */ ble lbl_8005A96C /* 8005A968 000578A8 FF E0 00 90 */ fmr f31, f0 lbl_8005A96C: -/* 8005A96C 000578AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8005A970 000578B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8005A96C 000578AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8005A970 000578B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A974 000578B4 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8005A978 000578B8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A97C 000578BC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l diff --git a/asm/d/kantera/icon/d_kantera_icon_meter.s b/asm/d/kantera/icon/d_kantera_icon_meter.s index 92d5487b6f..42d4c638a1 100644 --- a/asm/d/kantera/icon/d_kantera_icon_meter.s +++ b/asm/d/kantera/icon/d_kantera_icon_meter.s @@ -118,8 +118,8 @@ lbl_801AEAC4: /* 801AEAC8 001ABA08 3C 80 80 39 */ lis r4, lbl_80394F50@ha /* 801AEACC 001ABA0C 38 84 4F 50 */ addi r4, r4, lbl_80394F50@l /* 801AEAD0 001ABA10 3C A0 00 02 */ lis r5, 2 -/* 801AEAD4 001ABA14 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 801AEAD8 001ABA18 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 801AEAD4 001ABA14 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 801AEAD8 001ABA18 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 801AEADC 001ABA1C 80 C6 5D 30 */ lwz r6, 0x5d30(r6) /* 801AEAE0 001ABA20 48 14 9B 69 */ bl J2DScreen_NS_setPriority /* 801AEAE4 001ABA24 7F C3 F3 78 */ mr r3, r30 @@ -259,8 +259,8 @@ dKantera_icon_c_NS_setNowGauge: /* 801AECC4 001ABC04 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AECC8 001ABC08 93 C1 00 08 */ stw r30, 8(r1) /* 801AECCC 001ABC0C 7C 7E 1B 78 */ mr r30, r3 -/* 801AECD0 001ABC10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AECD4 001ABC14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AECD0 001ABC10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AECD4 001ABC14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AECD8 001ABC18 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801AECDC 001ABC1C 7F E3 FB 78 */ mr r3, r31 /* 801AECE0 001ABC20 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/ky/d_ky_thunder.s b/asm/d/ky/d_ky_thunder.s index a66f1a54b4..94bbc7f467 100644 --- a/asm/d/ky/d_ky_thunder.s +++ b/asm/d/ky/d_ky_thunder.s @@ -137,8 +137,8 @@ lbl_801AE094: /* 801AE13C 001AB07C 38 7F 01 08 */ addi r3, r31, 0x108 /* 801AE140 001AB080 38 84 00 58 */ addi r4, r4, 0x58 /* 801AE144 001AB084 4B E5 F6 65 */ bl mDoExt_brkAnm_NS_entry -/* 801AE148 001AB088 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AE14C 001AB08C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801AE148 001AB088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AE14C 001AB08C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801AE150 001AB090 80 04 5F 80 */ lwz r0, 0x5f80(r4) /* 801AE154 001AB094 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801AE158 001AB098 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -190,8 +190,8 @@ lbl_801AE1E0: /* 801AE20C 001AB14C 7F E3 FB 78 */ mr r3, r31 /* 801AE210 001AB150 4B E7 15 39 */ bl fopKyM_Delete lbl_801AE214: -/* 801AE214 001AB154 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AE218 001AB158 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AE214 001AB154 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AE218 001AB158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AE21C 001AB15C 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 801AE220 001AB160 28 03 00 00 */ cmplwi r3, 0 /* 801AE224 001AB164 41 82 00 30 */ beq lbl_801AE254 @@ -365,8 +365,8 @@ dThunder_c_NS_create: /* 801AE494 001AB3D4 7C 7D 1B 78 */ mr r29, r3 /* 801AE498 001AB3D8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AE49C 001AB3DC 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801AE4A0 001AB3E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AE4A4 001AB3E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AE4A0 001AB3E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AE4A4 001AB3E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AE4A8 001AB3E8 83 C3 5D 74 */ lwz r30, 0x5d74(r3) /* 801AE4AC 001AB3EC 7F BC EB 79 */ or. r28, r29, r29 /* 801AE4B0 001AB3F0 41 82 00 4C */ beq lbl_801AE4FC @@ -397,8 +397,8 @@ lbl_801AE4FC: /* 801AE510 001AB450 3C 60 80 39 */ lis r3, lbl_80394F40@ha /* 801AE514 001AB454 38 63 4F 40 */ addi r3, r3, lbl_80394F40@l /* 801AE518 001AB458 38 80 00 1E */ li r4, 0x1e -/* 801AE51C 001AB45C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801AE520 001AB460 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801AE51C 001AB45C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801AE520 001AB460 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801AE524 001AB464 3C A5 00 02 */ addis r5, r5, 2 /* 801AE528 001AB468 38 C0 00 80 */ li r6, 0x80 /* 801AE52C 001AB46C 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -409,8 +409,8 @@ lbl_801AE53C: /* 801AE53C 001AB47C 3C 60 80 39 */ lis r3, lbl_80394F40@ha /* 801AE540 001AB480 38 63 4F 40 */ addi r3, r3, lbl_80394F40@l /* 801AE544 001AB484 38 80 00 1F */ li r4, 0x1f -/* 801AE548 001AB488 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801AE54C 001AB48C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801AE548 001AB488 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801AE54C 001AB48C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801AE550 001AB490 3C A5 00 02 */ addis r5, r5, 2 /* 801AE554 001AB494 38 C0 00 80 */ li r6, 0x80 /* 801AE558 001AB498 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -431,8 +431,8 @@ lbl_801AE58C: /* 801AE58C 001AB4CC 3C 60 80 39 */ lis r3, lbl_80394F40@ha /* 801AE590 001AB4D0 38 63 4F 40 */ addi r3, r3, lbl_80394F40@l /* 801AE594 001AB4D4 38 80 00 2F */ li r4, 0x2f -/* 801AE598 001AB4D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801AE59C 001AB4DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801AE598 001AB4D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801AE59C 001AB4DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801AE5A0 001AB4E0 3C A5 00 02 */ addis r5, r5, 2 /* 801AE5A4 001AB4E4 38 C0 00 80 */ li r6, 0x80 /* 801AE5A8 001AB4E8 38 A5 C2 F8 */ addi r5, r5, -15624 @@ -497,8 +497,8 @@ lbl_801AE638: /* 801AE684 001AB5C4 C0 02 A4 C0 */ lfs f0, lbl_80453EC0-_SDA2_BASE_(r2) /* 801AE688 001AB5C8 D0 01 00 18 */ stfs f0, 0x18(r1) lbl_801AE68C: -/* 801AE68C 001AB5CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AE690 001AB5D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AE68C 001AB5CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AE690 001AB5D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AE694 001AB5D4 3B 63 4E 00 */ addi r27, r3, 0x4e00 /* 801AE698 001AB5D8 7F 63 DB 78 */ mr r3, r27 /* 801AE69C 001AB5DC 3C 80 80 39 */ lis r4, lbl_80394F40@ha diff --git a/asm/d/map/d_map_path.s b/asm/d/map/d_map_path.s index a8c17ffe5e..8b37494293 100644 --- a/asm/d/map/d_map_path.s +++ b/asm/d/map/d_map_path.s @@ -13,8 +13,8 @@ dMpath_n_NS_dTexObjAggregate_c_NS_create: /* 8003C870 000397B0 7C 7A 1B 78 */ mr r26, r3 /* 8003C874 000397B4 3B 60 00 00 */ li r27, 0 /* 8003C878 000397B8 3B E0 00 00 */ li r31, 0 -/* 8003C87C 000397BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003C880 000397C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003C87C 000397BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003C880 000397C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003C884 000397C4 3F 83 00 02 */ addis r28, r3, 2 /* 8003C888 000397C8 3C 60 80 38 */ lis r3, lbl_80379C4C@ha /* 8003C88C 000397CC 3B A3 9C 4C */ addi r29, r3, lbl_80379C4C@l @@ -782,8 +782,8 @@ dRenderingFDAmap_c_NS_postRenderingMap: /* 8003D384 0003A2C4 48 32 32 4D */ bl GXSetClipMode /* 8003D388 0003A2C8 38 60 00 01 */ li r3, 1 /* 8003D38C 0003A2CC 48 32 2A 4D */ bl GXSetDither -/* 8003D390 0003A2D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003D394 0003A2D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003D390 0003A2D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003D394 0003A2D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003D398 0003A2D8 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 8003D39C 0003A2DC 81 83 00 00 */ lwz r12, 0(r3) /* 8003D3A0 0003A2E0 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index 63985c7866..1c87150ab0 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -8,8 +8,8 @@ dMapInfo_n_NS_chkGetCompass: /* 8003ECA0 0003BBE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ECA4 0003BBE4 7C 08 02 A6 */ mflr r0 /* 8003ECA8 0003BBE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ECAC 0003BBEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003ECB0 0003BBF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003ECAC 0003BBEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003ECB0 0003BBF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003ECB4 0003BBF4 38 63 09 58 */ addi r3, r3, 0x958 /* 8003ECB8 0003BBF8 38 80 00 01 */ li r4, 1 /* 8003ECBC 0003BBFC 4B FF 5C 79 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -25,8 +25,8 @@ dMapInfo_n_NS_chkGetMap: /* 8003ECD8 0003BC18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ECDC 0003BC1C 7C 08 02 A6 */ mflr r0 /* 8003ECE0 0003BC20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003ECE4 0003BC24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003ECE8 0003BC28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003ECE4 0003BC24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003ECE8 0003BC28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003ECEC 0003BC2C 38 63 09 58 */ addi r3, r3, 0x958 /* 8003ECF0 0003BC30 38 80 00 00 */ li r4, 0 /* 8003ECF4 0003BC34 4B FF 5C 41 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -144,8 +144,8 @@ dMapInfo_n_NS_getMapPlayerPos: /* 8003EE68 0003BDA8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8003EE6C 0003BDAC 93 C1 00 18 */ stw r30, 0x18(r1) /* 8003EE70 0003BDB0 7C 7E 1B 78 */ mr r30, r3 -/* 8003EE74 0003BDB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003EE78 0003BDB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003EE74 0003BDB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003EE78 0003BDB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003EE7C 0003BDBC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8003EE80 0003BDC0 28 03 00 00 */ cmplwi r3, 0 /* 8003EE84 0003BDC4 41 82 00 20 */ beq lbl_8003EEA4 @@ -196,8 +196,8 @@ dMapInfo_n_NS_getMapPlayerAngleY: /* 8003EF20 0003BE60 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8003EF24 0003BE64 7C 00 07 74 */ extsb r0, r0 /* 8003EF28 0003BE68 38 60 00 00 */ li r3, 0 -/* 8003EF2C 0003BE6C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8003EF30 0003BE70 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003EF2C 0003BE6C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8003EF30 0003BE70 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8003EF34 0003BE74 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 8003EF38 0003BE78 28 04 00 00 */ cmplwi r4, 0 /* 8003EF3C 0003BE7C 41 82 00 08 */ beq lbl_8003EF44 @@ -229,8 +229,8 @@ dMapInfo_n_NS_getConstRestartIconPointer: /* 8003EF94 0003BED4 48 05 D3 CD */ bl dTres_c_NS_getFirstData /* 8003EF98 0003BED8 7C 7D 1B 78 */ mr r29, r3 /* 8003EF9C 0003BEDC 3B 80 00 00 */ li r28, 0 -/* 8003EFA0 0003BEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003EFA4 0003BEE4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8003EFA0 0003BEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003EFA4 0003BEE4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8003EFA8 0003BEE8 48 00 00 58 */ b lbl_8003F000 lbl_8003EFAC: /* 8003EFAC 0003BEEC 88 1D 00 01 */ lbz r0, 1(r29) @@ -245,8 +245,8 @@ lbl_8003EFAC: /* 8003EFD0 0003BF10 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8003EFD4 0003BF14 28 04 00 FF */ cmplwi r4, 0xff /* 8003EFD8 0003BF18 41 82 00 18 */ beq lbl_8003EFF0 -/* 8003EFDC 0003BF1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003EFE0 0003BF20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003EFDC 0003BF1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003EFE0 0003BF20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003EFE4 0003BF24 4B FF 63 7D */ bl isSwitch__10dSv_info_cCFii /* 8003EFE8 0003BF28 2C 03 00 00 */ cmpwi r3, 0 /* 8003EFEC 0003BF2C 40 82 00 24 */ bne lbl_8003F010 @@ -288,8 +288,8 @@ dMapInfo_n_NS_getMapRestartPos: /* 8003F064 0003BFA4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 8003F068 0003BFA8 48 00 00 24 */ b lbl_8003F08C lbl_8003F06C: -/* 8003F06C 0003BFAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003F070 0003BFB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003F06C 0003BFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003F070 0003BFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F074 0003BFB4 C0 03 0D BC */ lfs f0, 0xdbc(r3) /* 8003F078 0003BFB8 D0 01 00 08 */ stfs f0, 8(r1) /* 8003F07C 0003BFBC C0 03 0D C0 */ lfs f0, 0xdc0(r3) @@ -299,8 +299,8 @@ lbl_8003F06C: lbl_8003F08C: /* 8003F08C 0003BFCC 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 8003F090 0003BFD0 38 83 60 94 */ addi r4, r3, lbl_803F6094@l -/* 8003F094 0003BFD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003F098 0003BFD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003F094 0003BFD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003F098 0003BFD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F09C 0003BFDC 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 8003F0A0 0003BFE0 7C 00 07 74 */ extsb r0, r0 /* 8003F0A4 0003BFE4 1C 00 04 04 */ mulli r0, r0, 0x404 @@ -331,8 +331,8 @@ dMapInfo_n_NS_getMapRestartAngleY: /* 8003F0FC 0003C03C 7C 08 02 A6 */ mflr r0 /* 8003F100 0003C040 90 01 00 14 */ stw r0, 0x14(r1) /* 8003F104 0003C044 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003F108 0003C048 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003F10C 0003C04C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003F108 0003C048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003F10C 0003C04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F110 0003C050 AB E3 0D BA */ lha r31, 0xdba(r3) /* 8003F114 0003C054 4B FF FE 5D */ bl dMapInfo_n_NS_getConstRestartIconPointer /* 8003F118 0003C058 28 03 00 00 */ cmplwi r3, 0 @@ -353,8 +353,8 @@ lbl_8003F140: lbl_8003F150: /* 8003F150 0003C090 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 8003F154 0003C094 38 83 60 94 */ addi r4, r3, lbl_803F6094@l -/* 8003F158 0003C098 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003F15C 0003C09C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003F158 0003C098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003F15C 0003C09C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F160 0003C0A0 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 8003F164 0003C0A4 7C 00 07 74 */ extsb r0, r0 /* 8003F168 0003C0A8 1C 00 04 04 */ mulli r0, r0, 0x404 @@ -447,8 +447,8 @@ dMapInfo_n_NS_getFloorParameter: /* 8003F28C 0003C1CC 7C BD 2B 78 */ mr r29, r5 /* 8003F290 0003C1D0 7C DE 33 78 */ mr r30, r6 /* 8003F294 0003C1D4 7C FF 3B 78 */ mr r31, r7 -/* 8003F298 0003C1D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003F29C 0003C1DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003F298 0003C1D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003F29C 0003C1DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F2A0 0003C1E0 3B 43 4E 20 */ addi r26, r3, 0x4e20 /* 8003F2A4 0003C1E4 7F 43 D3 78 */ mr r3, r26 /* 8003F2A8 0003C1E8 81 9A 00 00 */ lwz r12, 0(r26) @@ -1098,8 +1098,8 @@ dMpath_c_NS_create: /* 8003FB70 0003CAB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FB74 0003CAB4 7C 08 02 A6 */ mflr r0 /* 8003FB78 0003CAB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003FB7C 0003CABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003FB80 0003CAC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003FB7C 0003CABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003FB80 0003CAC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003FB84 0003CAC4 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8003FB88 0003CAC8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8003FB8C 0003CACC 7D 89 03 A6 */ mtctr r12 @@ -1243,8 +1243,8 @@ renderingDAmap_c_NS_entry: /* 8003FD68 0003CCA8 D0 06 00 0C */ stfs f0, 0xc(r6) /* 8003FD6C 0003CCAC 90 86 00 2C */ stw r4, 0x2c(r6) /* 8003FD70 0003CCB0 98 A6 00 30 */ stb r5, 0x30(r6) -/* 8003FD74 0003CCB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003FD78 0003CCB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003FD74 0003CCB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003FD78 0003CCB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003FD7C 0003CCBC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8003FD80 0003CCC0 38 83 00 64 */ addi r4, r3, 0x64 /* 8003FD84 0003CCC4 38 A3 00 68 */ addi r5, r3, 0x68 @@ -1266,8 +1266,8 @@ lbl_8003FDC0: /* 8003FDC0 0003CD00 88 04 00 01 */ lbz r0, 1(r4) /* 8003FDC4 0003CD04 28 00 00 00 */ cmplwi r0, 0 /* 8003FDC8 0003CD08 40 82 00 24 */ bne lbl_8003FDEC -/* 8003FDCC 0003CD0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003FDD0 0003CD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003FDCC 0003CD0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003FDD0 0003CD10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003FDD4 0003CD14 7C A4 2B 78 */ mr r4, r5 /* 8003FDD8 0003CD18 80 A6 00 24 */ lwz r5, 0x24(r6) /* 8003FDDC 0003CD1C 4B FF 55 85 */ bl isSwitch__10dSv_info_cCFii @@ -1275,8 +1275,8 @@ lbl_8003FDC0: /* 8003FDE4 0003CD24 54 03 D9 7E */ srwi r3, r0, 5 /* 8003FDE8 0003CD28 48 00 00 20 */ b lbl_8003FE08 lbl_8003FDEC: -/* 8003FDEC 0003CD2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003FDF0 0003CD30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003FDEC 0003CD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003FDF0 0003CD30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003FDF4 0003CD34 7C A4 2B 78 */ mr r4, r5 /* 8003FDF8 0003CD38 80 A6 00 24 */ lwz r5, 0x24(r6) /* 8003FDFC 0003CD3C 4B FF 55 65 */ bl isSwitch__10dSv_info_cCFii @@ -1672,8 +1672,8 @@ renderingPlusDoorAndCursor_c_NS_afterDrawPath: /* 80040370 0003D2B0 3B A0 00 01 */ li r29, 1 /* 80040374 0003D2B4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80040378 0003D2B8 41 82 00 44 */ beq lbl_800403BC -/* 8004037C 0003D2BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80040380 0003D2C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8004037C 0003D2BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80040380 0003D2C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80040384 0003D2C4 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 80040388 0003D2C8 7C 1E 07 74 */ extsb r30, r0 /* 8004038C 0003D2CC 38 61 00 20 */ addi r3, r1, 0x20 @@ -1693,8 +1693,8 @@ lbl_800403BC: /* 800403C0 0003D300 41 82 00 68 */ beq lbl_80040428 /* 800403C4 0003D304 3B A0 00 1F */ li r29, 0x1f /* 800403C8 0003D308 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 800403CC 0003D30C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800403D0 0003D310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800403CC 0003D30C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800403D0 0003D310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800403D4 0003D314 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 800403D8 0003D318 7C 00 07 74 */ extsb r0, r0 /* 800403DC 0003D31C 7C 04 00 00 */ cmpw r4, r0 @@ -1738,8 +1738,8 @@ lbl_80040458: /* 80040468 0003D3A8 4E 80 04 21 */ bctrl /* 8004046C 0003D3AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040470 0003D3B0 41 82 00 58 */ beq lbl_800404C8 -/* 80040474 0003D3B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80040478 0003D3B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80040474 0003D3B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80040478 0003D3B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004047C 0003D3BC 80 03 5D AC */ lwz r0, 0x5dac(r3) /* 80040480 0003D3C0 28 00 00 00 */ cmplwi r0, 0 /* 80040484 0003D3C4 41 82 00 44 */ beq lbl_800404C8 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index c4dfff70b6..e4eb545e25 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -52,8 +52,8 @@ dMenu_Fmap_room_data_c_NS_isArrival: /* 8003D828 0003A768 7C 7F 1B 78 */ mr r31, r3 /* 8003D82C 0003A76C 80 63 00 0C */ lwz r3, 0xc(r3) /* 8003D830 0003A770 80 83 00 08 */ lwz r4, 8(r3) -/* 8003D834 0003A774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003D838 0003A778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003D834 0003A774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003D838 0003A778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003D83C 0003A77C 88 84 00 02 */ lbz r4, 2(r4) /* 8003D840 0003A780 4B FF 78 69 */ bl getSave2__10dSv_save_cFi /* 8003D844 0003A784 88 9F 00 10 */ lbz r4, 0x10(r31) @@ -154,8 +154,8 @@ dMenu_Fmap_stage_data_c_NS_isArrival: /* 8003D974 0003A8B4 83 C3 00 0C */ lwz r30, 0xc(r3) /* 8003D978 0003A8B8 80 63 00 08 */ lwz r3, 8(r3) /* 8003D97C 0003A8BC 8B A3 00 02 */ lbz r29, 2(r3) -/* 8003D980 0003A8C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003D984 0003A8C4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8003D980 0003A8C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003D984 0003A8C4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8003D988 0003A8C8 48 00 00 24 */ b lbl_8003D9AC lbl_8003D98C: /* 8003D98C 0003A8CC 7F E3 FB 78 */ mr r3, r31 @@ -348,8 +348,8 @@ lbl_8003DC08: /* 8003DC1C 0003AB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003DC20 0003AB60 41 82 02 30 */ beq lbl_8003DE50 lbl_8003DC24: -/* 8003DC24 0003AB64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003DC28 0003AB68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003DC24 0003AB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003DC28 0003AB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003DC2C 0003AB6C 80 81 00 38 */ lwz r4, 0x38(r1) /* 8003DC30 0003AB70 4B FF 74 79 */ bl getSave2__10dSv_save_cFi /* 8003DC34 0003AB74 88 99 00 10 */ lbz r4, 0x10(r25) @@ -723,8 +723,8 @@ dMenuFmapIconPointer_c_NS_init: /* 8003E134 0003B074 7C DD 33 78 */ mr r29, r6 /* 8003E138 0003B078 7C FE 3B 78 */ mr r30, r7 /* 8003E13C 0003B07C 7D 1F 43 78 */ mr r31, r8 -/* 8003E140 0003B080 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E144 0003B084 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E140 0003B080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E144 0003B084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E148 0003B088 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8003E14C 0003B08C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8003E150 0003B090 7D 89 03 A6 */ mtctr r12 @@ -768,8 +768,8 @@ dMenuFmapIconPointer_c_NS_getFirstData: /* 8003E1D4 0003B114 7C 7E 1B 78 */ mr r30, r3 /* 8003E1D8 0003B118 3B E0 00 00 */ li r31, 0 /* 8003E1DC 0003B11C 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E1E0 0003B120 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8003E1E4 0003B124 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003E1E0 0003B120 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8003E1E4 0003B124 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8003E1E8 0003B128 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8003E1EC 0003B12C 48 32 A7 A9 */ bl strcmp /* 8003E1F0 0003B130 2C 03 00 00 */ cmpwi r3, 0 @@ -838,8 +838,8 @@ dMenuFmapIconPointer_c_NS_getData: /* 8003E2D0 0003B210 7C 7E 1B 78 */ mr r30, r3 /* 8003E2D4 0003B214 3B E0 00 00 */ li r31, 0 /* 8003E2D8 0003B218 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E2DC 0003B21C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8003E2E0 0003B220 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003E2DC 0003B21C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8003E2E0 0003B220 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8003E2E4 0003B224 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8003E2E8 0003B228 48 32 A6 AD */ bl strcmp /* 8003E2EC 0003B22C 2C 03 00 00 */ cmpwi r3, 0 @@ -925,8 +925,8 @@ dMenuFmapIconPointer_c_NS_getNextData: /* 8003E3EC 0003B32C 7C 7E 1B 78 */ mr r30, r3 /* 8003E3F0 0003B330 3B E0 00 01 */ li r31, 1 /* 8003E3F4 0003B334 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E3F8 0003B338 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8003E3FC 0003B33C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003E3F8 0003B338 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8003E3FC 0003B33C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8003E400 0003B340 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8003E404 0003B344 48 32 A5 91 */ bl strcmp /* 8003E408 0003B348 2C 03 00 00 */ cmpwi r3, 0 @@ -1080,8 +1080,8 @@ lbl_8003E5F8: /* 8003E608 0003B548 90 05 00 00 */ stw r0, 0(r5) lbl_8003E60C: /* 8003E60C 0003B54C 80 7C 00 14 */ lwz r3, 0x14(r28) -/* 8003E610 0003B550 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8003E614 0003B554 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003E610 0003B550 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8003E614 0003B554 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8003E618 0003B558 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8003E61C 0003B55C 48 32 A3 79 */ bl strcmp /* 8003E620 0003B560 2C 03 00 00 */ cmpwi r3, 0 @@ -1201,8 +1201,8 @@ lbl_8003E768: /* 8003E7B8 0003B6F8 41 82 00 34 */ beq lbl_8003E7EC /* 8003E7BC 0003B6FC 7F 9B E3 78 */ mr r27, r28 /* 8003E7C0 0003B700 41 82 00 20 */ beq lbl_8003E7E0 -/* 8003E7C4 0003B704 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E7C8 0003B708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E7C4 0003B704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E7C8 0003B708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E7CC 0003B70C 7F A5 EB 78 */ mr r5, r29 /* 8003E7D0 0003B710 4B FF 6B 91 */ bl isSwitch__10dSv_info_cCFii /* 8003E7D4 0003B714 2C 03 00 00 */ cmpwi r3, 0 @@ -1239,8 +1239,8 @@ lbl_8003E834: /* 8003E840 0003B780 4B FF 05 A1 */ bl dComIfGp_isLightDropMapVisible /* 8003E844 0003B784 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E848 0003B788 41 82 00 6C */ beq lbl_8003E8B4 -/* 8003E84C 0003B78C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E850 0003B790 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E84C 0003B78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E850 0003B790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E854 0003B794 88 03 4E 0C */ lbz r0, 0x4e0c(r3) /* 8003E858 0003B798 2C 00 00 02 */ cmpwi r0, 2 /* 8003E85C 0003B79C 40 82 00 54 */ bne lbl_8003E8B0 @@ -1252,8 +1252,8 @@ lbl_8003E834: /* 8003E874 0003B7B4 2C 03 00 35 */ cmpwi r3, 0x35 /* 8003E878 0003B7B8 40 82 00 30 */ bne lbl_8003E8A8 lbl_8003E87C: -/* 8003E87C 0003B7BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E880 0003B7C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E87C 0003B7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E880 0003B7C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E884 0003B7C4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8003E888 0003B7C8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8003E88C 0003B7CC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -1292,8 +1292,8 @@ lbl_8003E8B4: /* 8003E904 0003B844 41 82 00 34 */ beq lbl_8003E938 /* 8003E908 0003B848 7F 9F E3 78 */ mr r31, r28 /* 8003E90C 0003B84C 41 82 00 20 */ beq lbl_8003E92C -/* 8003E910 0003B850 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E914 0003B854 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E910 0003B850 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E914 0003B854 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E918 0003B858 38 63 09 58 */ addi r3, r3, 0x958 /* 8003E91C 0003B85C 4B FF 5E CD */ bl isTbox__12dSv_memBit_cCFi /* 8003E920 0003B860 2C 03 00 00 */ cmpwi r3, 0 @@ -1313,8 +1313,8 @@ lbl_8003E938: /* 8003E950 0003B890 41 82 00 34 */ beq lbl_8003E984 /* 8003E954 0003B894 3B 60 00 00 */ li r27, 0 /* 8003E958 0003B898 41 82 00 20 */ beq lbl_8003E978 -/* 8003E95C 0003B89C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003E960 0003B8A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E95C 0003B89C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003E960 0003B8A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003E964 0003B8A4 7F A5 EB 78 */ mr r5, r29 /* 8003E968 0003B8A8 4B FF 69 F9 */ bl isSwitch__10dSv_info_cCFii /* 8003E96C 0003B8AC 2C 03 00 00 */ cmpwi r3, 0 @@ -1358,8 +1358,8 @@ lbl_8003E9E8: /* 8003E9F0 0003B930 80 1B 00 0C */ lwz r0, 0xc(r27) /* 8003E9F4 0003B934 7C 1E 00 00 */ cmpw r30, r0 /* 8003E9F8 0003B938 40 82 00 28 */ bne lbl_8003EA20 -/* 8003E9FC 0003B93C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003EA00 0003B940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003E9FC 0003B93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003EA00 0003B940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003EA04 0003B944 80 9B 00 2C */ lwz r4, 0x2c(r27) /* 8003EA08 0003B948 88 84 00 10 */ lbz r4, 0x10(r4) /* 8003EA0C 0003B94C 7F A5 EB 78 */ mr r5, r29 @@ -1398,8 +1398,8 @@ lbl_8003EA20: /* 8003EA8C 0003B9CC 41 82 00 68 */ beq lbl_8003EAF4 /* 8003EA90 0003B9D0 3B 60 00 00 */ li r27, 0 /* 8003EA94 0003B9D4 41 82 00 20 */ beq lbl_8003EAB4 -/* 8003EA98 0003B9D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003EA9C 0003B9DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003EA98 0003B9D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003EA9C 0003B9DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003EAA0 0003B9E0 7F A5 EB 78 */ mr r5, r29 /* 8003EAA4 0003B9E4 4B FF 68 BD */ bl isSwitch__10dSv_info_cCFii /* 8003EAA8 0003B9E8 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/d/menu/d_menu_calibration.s b/asm/d/menu/d_menu_calibration.s index 43e9f2101f..e5c0e7d855 100644 --- a/asm/d/menu/d_menu_calibration.s +++ b/asm/d/menu/d_menu_calibration.s @@ -652,8 +652,8 @@ lbl_801AF6FC: .global dMenu_Calibration_c_NS_setCalibrationValue dMenu_Calibration_c_NS_setCalibrationValue: -/* 801AF710 001AC650 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801AF714 001AC654 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 801AF710 001AC650 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801AF714 001AC654 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 801AF718 001AC658 80 83 00 E8 */ lwz r4, 0xe8(r3) /* 801AF71C 001AC65C 98 85 01 E8 */ stb r4, 0x1e8(r5) /* 801AF720 001AC660 A0 03 00 F4 */ lhz r0, 0xf4(r3) diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index d4b8971ac4..a755cbeadf 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -21,8 +21,8 @@ dMenu_Collect2D_c: /* 801AFD7C 001ACCBC 90 DF 00 14 */ stw r6, 0x14(r31) /* 801AFD80 001ACCC0 38 80 00 00 */ li r4, 0 /* 801AFD84 001ACCC4 90 9F 00 0C */ stw r4, 0xc(r31) -/* 801AFD88 001ACCC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AFD8C 001ACCCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AFD88 001ACCC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AFD8C 001ACCCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AFD90 001ACCD0 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801AFD94 001ACCD4 80 03 05 74 */ lwz r0, 0x574(r3) /* 801AFD98 001ACCD8 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 @@ -118,8 +118,8 @@ lbl_801AFEDC: /* 801AFEE4 001ACE24 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801AFEE8 001ACE28 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801AFEEC 001ACE2C 3C A0 01 02 */ lis r5, 0x102 -/* 801AFEF0 001ACE30 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 801AFEF4 001ACE34 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 801AFEF0 001ACE30 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 801AFEF4 001ACE34 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 801AFEF8 001ACE38 80 DE 5C B8 */ lwz r6, 0x5cb8(r30) /* 801AFEFC 001ACE3C 48 14 87 4D */ bl J2DScreen_NS_setPriority /* 801AFF00 001ACE40 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -165,8 +165,8 @@ lbl_801AFF54: /* 801AFF98 001ACED8 93 E3 00 04 */ stw r31, 4(r3) lbl_801AFF9C: /* 801AFF9C 001ACEDC 90 7F 00 88 */ stw r3, 0x88(r31) -/* 801AFFA0 001ACEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801AFFA4 001ACEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801AFFA0 001ACEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801AFFA4 001ACEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801AFFA8 001ACEE8 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801AFFAC 001ACEEC 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801AFFB0 001ACEF0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -562,8 +562,8 @@ lbl_801B050C: lbl_801B0534: /* 801B0534 001AD474 38 00 00 00 */ li r0, 0 /* 801B0538 001AD478 90 1F 01 68 */ stw r0, 0x168(r31) -/* 801B053C 001AD47C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B0540 001AD480 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B053C 001AD47C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B0540 001AD480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B0544 001AD484 80 63 5C B8 */ lwz r3, 0x5cb8(r3) /* 801B0548 001AD488 81 83 00 00 */ lwz r12, 0(r3) /* 801B054C 001AD48C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -595,8 +595,8 @@ dMenu_Collect2D_c_NS_initialize: .global dMenu_Collect2D_c_NS_isFishIconVisible dMenu_Collect2D_c_NS_isFishIconVisible: -/* 801B05A8 001AD4E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B05AC 001AD4EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B05A8 001AD4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B05AC 001AD4EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B05B0 001AD4F0 A0 03 01 6C */ lhz r0, 0x16c(r3) /* 801B05B4 001AD4F4 28 00 00 00 */ cmplwi r0, 0 /* 801B05B8 001AD4F8 40 82 00 54 */ bne lbl_801B060C @@ -633,8 +633,8 @@ dMenu_Collect2D_c_NS_isSkillIconVisible: /* 801B0620 001AD560 7C 08 02 A6 */ mflr r0 /* 801B0624 001AD564 90 01 00 14 */ stw r0, 0x14(r1) /* 801B0628 001AD568 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801B062C 001AD56C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B0630 001AD570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B062C 001AD56C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B0630 001AD570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B0634 001AD574 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801B0638 001AD578 7F E3 FB 78 */ mr r3, r31 /* 801B063C 001AD57C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -1207,8 +1207,8 @@ lbl_801B0A10: /* 801B0EEC 001ADE2C 98 1F 02 33 */ stb r0, 0x233(r31) /* 801B0EF0 001ADE30 98 1F 02 39 */ stb r0, 0x239(r31) /* 801B0EF4 001ADE34 3A 80 00 01 */ li r20, 1 -/* 801B0EF8 001ADE38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B0EFC 001ADE3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B0EF8 001ADE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B0EFC 001ADE3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B0F00 001ADE40 3A A3 00 CC */ addi r21, r3, 0xcc /* 801B0F04 001ADE44 7E A3 AB 78 */ mr r3, r21 /* 801B0F08 001ADE48 38 80 00 28 */ li r4, 0x28 @@ -1221,8 +1221,8 @@ lbl_801B0A10: /* 801B0F24 001ADE64 4B E8 2F A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B0F28 001ADE68 2C 03 00 00 */ cmpwi r3, 0 /* 801B0F2C 001ADE6C 41 82 00 24 */ beq lbl_801B0F50 -/* 801B0F30 001ADE70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B0F34 001ADE74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B0F30 001ADE70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B0F34 001ADE74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B0F38 001ADE78 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801B0F3C 001ADE7C 38 80 03 02 */ li r4, 0x302 /* 801B0F40 001ADE80 4B E8 3A 7D */ bl isEventBit__11dSv_event_cCFUs @@ -1273,8 +1273,8 @@ lbl_801B0FE0: /* 801B0FE8 001ADF28 4B E8 2E E1 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B0FEC 001ADF2C 2C 03 00 00 */ cmpwi r3, 0 /* 801B0FF0 001ADF30 41 82 00 70 */ beq lbl_801B1060 -/* 801B0FF4 001ADF34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B0FF8 001ADF38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B0FF4 001ADF34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B0FF8 001ADF38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B0FFC 001ADF3C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801B1000 001ADF40 38 80 03 02 */ li r4, 0x302 /* 801B1004 001ADF44 4B E8 39 B9 */ bl isEventBit__11dSv_event_cCFUs @@ -1318,8 +1318,8 @@ lbl_801B1090: /* 801B1094 001ADFD4 30 03 FF FF */ addic r0, r3, -1 /* 801B1098 001ADFD8 7C 00 19 10 */ subfe r0, r0, r3 /* 801B109C 001ADFDC 98 1F 02 45 */ stb r0, 0x245(r31) -/* 801B10A0 001ADFE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B10A4 001ADFE4 A0 03 61 C0 */ lhz r0, lbl_804061C0@l(r3) +/* 801B10A0 001ADFE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B10A4 001ADFE4 A0 03 61 C0 */ lhz r0, g_dComIfG_gameInfo@l(r3) /* 801B10A8 001ADFE8 28 00 00 0F */ cmplwi r0, 0xf /* 801B10AC 001ADFEC 40 81 00 10 */ ble lbl_801B10BC /* 801B10B0 001ADFF0 38 00 00 01 */ li r0, 1 @@ -1422,8 +1422,8 @@ lbl_801B1204: /* 801B1220 001AE160 98 9F 02 2F */ stb r4, 0x22f(r31) /* 801B1224 001AE164 98 9F 02 35 */ stb r4, 0x235(r31) /* 801B1228 001AE168 98 9F 02 3B */ stb r4, 0x23b(r31) -/* 801B122C 001AE16C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1230 001AE170 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B122C 001AE16C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1230 001AE170 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1234 001AE174 88 03 00 13 */ lbz r0, 0x13(r3) /* 801B1238 001AE178 28 00 00 2E */ cmplwi r0, 0x2e /* 801B123C 001AE17C 40 82 00 14 */ bne lbl_801B1250 @@ -1451,7 +1451,7 @@ lbl_801B1280: /* 801B128C 001AE1CC 98 1F 02 30 */ stb r0, 0x230(r31) /* 801B1290 001AE1D0 38 60 00 43 */ li r3, 0x43 /* 801B1294 001AE1D4 38 80 00 01 */ li r4, 1 -/* 801B1298 001AE1D8 4B EE 6C 49 */ bl checkItemGet +/* 801B1298 001AE1D8 4B EE 6C 49 */ bl checkItemGet__FUci /* 801B129C 001AE1DC 2C 03 00 00 */ cmpwi r3, 0 /* 801B12A0 001AE1E0 41 82 00 10 */ beq lbl_801B12B0 /* 801B12A4 001AE1E4 38 00 00 01 */ li r0, 1 @@ -1479,8 +1479,8 @@ lbl_801B12DC: /* 801B12EC 001AE22C 98 9F 02 48 */ stb r4, 0x248(r31) /* 801B12F0 001AE230 98 9F 02 4E */ stb r4, 0x24e(r31) /* 801B12F4 001AE234 98 9F 02 54 */ stb r4, 0x254(r31) -/* 801B12F8 001AE238 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B12FC 001AE23C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B12F8 001AE238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B12FC 001AE23C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1300 001AE240 88 03 00 16 */ lbz r0, 0x16(r3) /* 801B1304 001AE244 28 00 00 FF */ cmplwi r0, 0xff /* 801B1308 001AE248 41 82 00 10 */ beq lbl_801B1318 @@ -1490,8 +1490,8 @@ lbl_801B12DC: lbl_801B1318: /* 801B1318 001AE258 98 9F 02 31 */ stb r4, 0x231(r31) lbl_801B131C: -/* 801B131C 001AE25C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1320 001AE260 3A 83 61 C0 */ addi r20, r3, lbl_804061C0@l +/* 801B131C 001AE25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1320 001AE260 3A 83 61 C0 */ addi r20, r3, g_dComIfG_gameInfo@l /* 801B1324 001AE264 88 14 01 0C */ lbz r0, 0x10c(r20) /* 801B1328 001AE268 98 1F 02 37 */ stb r0, 0x237(r31) /* 801B132C 001AE26C 7F E3 FB 78 */ mr r3, r31 @@ -1631,8 +1631,8 @@ lbl_801B14D0: /* 801B1504 001AE444 38 00 01 95 */ li r0, 0x195 /* 801B1508 001AE448 B0 1F 01 C4 */ sth r0, 0x1c4(r31) /* 801B150C 001AE44C B0 7F 01 D0 */ sth r3, 0x1d0(r31) -/* 801B1510 001AE450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1514 001AE454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B1510 001AE450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1514 001AE454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1518 001AE458 4B E8 15 91 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B151C 001AE45C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801B1520 001AE460 28 00 01 2C */ cmplwi r0, 0x12c @@ -1641,8 +1641,8 @@ lbl_801B14D0: /* 801B152C 001AE46C B0 1F 01 8A */ sth r0, 0x18a(r31) /* 801B1530 001AE470 48 00 00 30 */ b lbl_801B1560 lbl_801B1534: -/* 801B1534 001AE474 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1538 001AE478 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B1534 001AE474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1538 001AE478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B153C 001AE47C 4B E8 15 6D */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B1540 001AE480 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801B1544 001AE484 28 00 02 58 */ cmplwi r0, 0x258 @@ -1654,8 +1654,8 @@ lbl_801B1558: /* 801B1558 001AE498 38 00 01 9B */ li r0, 0x19b /* 801B155C 001AE49C B0 1F 01 8A */ sth r0, 0x18a(r31) lbl_801B1560: -/* 801B1560 001AE4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1564 001AE4A4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801B1560 001AE4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1564 001AE4A4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801B1568 001AE4A8 88 1E 00 F8 */ lbz r0, 0xf8(r30) /* 801B156C 001AE4AC 28 00 00 1E */ cmplwi r0, 0x1e /* 801B1570 001AE4B0 40 82 00 10 */ bne lbl_801B1580 @@ -1790,8 +1790,8 @@ lbl_801B16B4: /* 801B1754 001AE694 48 08 6C 91 */ bl dMsgObject_c_NS_getSmellTypeMessageID /* 801B1758 001AE698 38 03 01 00 */ addi r0, r3, 0x100 /* 801B175C 001AE69C B0 1F 01 E0 */ sth r0, 0x1e0(r31) -/* 801B1760 001AE6A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1764 001AE6A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B1760 001AE6A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1764 001AE6A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1768 001AE6A8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801B176C 001AE6AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B1770 001AE6B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -2100,8 +2100,8 @@ lbl_801B1BB0: /* 801B1BE4 001AEB24 88 9E 00 F8 */ lbz r4, 0xf8(r30) /* 801B1BE8 001AEB28 7F E3 FB 78 */ mr r3, r31 /* 801B1BEC 001AEB2C 48 00 14 DD */ bl dMenu_Collect2D_c_NS_setArrowMaxNum -/* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1BF8 001AEB38 4B E8 0E B1 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B1BFC 001AEB3C 7C 64 1B 78 */ mr r4, r3 /* 801B1C00 001AEB40 7F E3 FB 78 */ mr r3, r31 @@ -2142,8 +2142,8 @@ dMenu_Collect2D_c_NS_animationSet: /* 801B1C80 001AEBC0 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B1C84 001AEBC4 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B1C88 001AEBC8 38 64 00 56 */ addi r3, r4, 0x56 -/* 801B1C8C 001AEBCC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B1C90 001AEBD0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801B1C8C 001AEBCC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B1C90 001AEBD0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B1C94 001AEBD4 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801B1C98 001AEBD8 48 12 25 D9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 801B1C9C 001AEBDC 48 15 6D D1 */ bl J2DAnmLoaderDataBase_NS_load @@ -3133,15 +3133,15 @@ lbl_801B2AA4: /* 801B2AA8 001AF9E8 40 80 02 44 */ bge lbl_801B2CEC /* 801B2AAC 001AF9EC 48 00 01 DC */ b lbl_801B2C88 lbl_801B2AB0: -/* 801B2AB0 001AF9F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2AB4 001AF9F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2AB0 001AF9F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2AB4 001AF9F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2AB8 001AF9F8 38 63 00 CC */ addi r3, r3, 0xcc /* 801B2ABC 001AF9FC 38 80 00 28 */ li r4, 0x28 /* 801B2AC0 001AFA00 4B E8 14 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B2AC4 001AFA04 2C 03 00 00 */ cmpwi r3, 0 /* 801B2AC8 001AFA08 41 82 00 6C */ beq lbl_801B2B34 -/* 801B2ACC 001AFA0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2AD0 001AFA10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2ACC 001AFA0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2AD0 001AFA10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2AD4 001AFA14 88 03 00 14 */ lbz r0, 0x14(r3) /* 801B2AD8 001AFA18 28 00 00 28 */ cmplwi r0, 0x28 /* 801B2ADC 001AFA1C 41 82 02 10 */ beq lbl_801B2CEC @@ -3167,8 +3167,8 @@ lbl_801B2AB0: /* 801B2B2C 001AFA6C 48 06 BE A5 */ bl dMeter2Info_set2DVibration /* 801B2B30 001AFA70 48 00 01 BC */ b lbl_801B2CEC lbl_801B2B34: -/* 801B2B34 001AFA74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2B38 001AFA78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2B34 001AFA74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2B38 001AFA78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2B3C 001AFA7C 88 03 00 14 */ lbz r0, 0x14(r3) /* 801B2B40 001AFA80 28 00 00 3F */ cmplwi r0, 0x3f /* 801B2B44 001AFA84 41 82 01 A8 */ beq lbl_801B2CEC @@ -3194,15 +3194,15 @@ lbl_801B2B34: /* 801B2B94 001AFAD4 48 06 BE 3D */ bl dMeter2Info_set2DVibration /* 801B2B98 001AFAD8 48 00 01 54 */ b lbl_801B2CEC lbl_801B2B9C: -/* 801B2B9C 001AFADC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2BA0 001AFAE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2B9C 001AFADC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2BA0 001AFAE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2BA4 001AFAE4 38 63 00 CC */ addi r3, r3, 0xcc /* 801B2BA8 001AFAE8 38 80 00 49 */ li r4, 0x49 /* 801B2BAC 001AFAEC 4B E8 13 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B2BB0 001AFAF0 2C 03 00 00 */ cmpwi r3, 0 /* 801B2BB4 001AFAF4 41 82 00 6C */ beq lbl_801B2C20 -/* 801B2BB8 001AFAF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2BBC 001AFAFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2BB8 001AFAF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2BBC 001AFAFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2BC0 001AFB00 88 03 00 14 */ lbz r0, 0x14(r3) /* 801B2BC4 001AFB04 28 00 00 49 */ cmplwi r0, 0x49 /* 801B2BC8 001AFB08 41 82 01 24 */ beq lbl_801B2CEC @@ -3228,8 +3228,8 @@ lbl_801B2B9C: /* 801B2C18 001AFB58 48 06 BD B9 */ bl dMeter2Info_set2DVibration /* 801B2C1C 001AFB5C 48 00 00 D0 */ b lbl_801B2CEC lbl_801B2C20: -/* 801B2C20 001AFB60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2C24 001AFB64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2C20 001AFB60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2C24 001AFB64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2C28 001AFB68 88 03 00 14 */ lbz r0, 0x14(r3) /* 801B2C2C 001AFB6C 28 00 00 29 */ cmplwi r0, 0x29 /* 801B2C30 001AFB70 41 82 00 BC */ beq lbl_801B2CEC @@ -3255,8 +3255,8 @@ lbl_801B2C20: /* 801B2C80 001AFBC0 48 06 BD 51 */ bl dMeter2Info_set2DVibration /* 801B2C84 001AFBC4 48 00 00 68 */ b lbl_801B2CEC lbl_801B2C88: -/* 801B2C88 001AFBC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2C8C 001AFBCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2C88 001AFBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2C8C 001AFBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2C90 001AFBD0 88 03 00 14 */ lbz r0, 0x14(r3) /* 801B2C94 001AFBD4 28 00 00 49 */ cmplwi r0, 0x49 /* 801B2C98 001AFBD8 41 82 00 54 */ beq lbl_801B2CEC @@ -3303,16 +3303,16 @@ dMenu_Collect2D_c_NS_changeShield: /* 801B2D2C 001AFC6C 40 80 00 08 */ bge lbl_801B2D34 /* 801B2D30 001AFC70 48 00 01 9C */ b lbl_801B2ECC lbl_801B2D34: -/* 801B2D34 001AFC74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2D38 001AFC78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2D34 001AFC74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2D38 001AFC78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2D3C 001AFC7C 3B E3 00 CC */ addi r31, r3, 0xcc /* 801B2D40 001AFC80 7F E3 FB 78 */ mr r3, r31 /* 801B2D44 001AFC84 38 80 00 2B */ li r4, 0x2b /* 801B2D48 001AFC88 4B E8 11 81 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B2D4C 001AFC8C 2C 03 00 00 */ cmpwi r3, 0 /* 801B2D50 001AFC90 41 82 00 7C */ beq lbl_801B2DCC -/* 801B2D54 001AFC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2D58 001AFC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2D54 001AFC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2D58 001AFC98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2D5C 001AFC9C 88 03 00 15 */ lbz r0, 0x15(r3) /* 801B2D60 001AFCA0 28 00 00 2B */ cmplwi r0, 0x2b /* 801B2D64 001AFCA4 41 82 01 68 */ beq lbl_801B2ECC @@ -3322,8 +3322,8 @@ lbl_801B2D34: /* 801B2D74 001AFCB4 7F C3 F3 78 */ mr r3, r30 /* 801B2D78 001AFCB8 38 80 00 00 */ li r4, 0 /* 801B2D7C 001AFCBC 48 00 0F 79 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield -/* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2D88 001AFCC8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B2D8C 001AFCCC 4B F8 D2 D9 */ bl daAlink_c_NS_setShieldChange /* 801B2D90 001AFCD0 38 00 00 4F */ li r0, 0x4f @@ -3347,8 +3347,8 @@ lbl_801B2DCC: /* 801B2DD4 001AFD14 4B E8 10 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801B2DD8 001AFD18 2C 03 00 00 */ cmpwi r3, 0 /* 801B2DDC 001AFD1C 41 82 00 F0 */ beq lbl_801B2ECC -/* 801B2DE0 001AFD20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2DE4 001AFD24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2DE0 001AFD20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2DE4 001AFD24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2DE8 001AFD28 88 03 00 15 */ lbz r0, 0x15(r3) /* 801B2DEC 001AFD2C 28 00 00 2A */ cmplwi r0, 0x2a /* 801B2DF0 001AFD30 41 82 00 DC */ beq lbl_801B2ECC @@ -3358,8 +3358,8 @@ lbl_801B2DCC: /* 801B2E00 001AFD40 7F C3 F3 78 */ mr r3, r30 /* 801B2E04 001AFD44 38 80 00 00 */ li r4, 0 /* 801B2E08 001AFD48 48 00 0E ED */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield -/* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E14 001AFD54 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B2E18 001AFD58 4B F8 D2 4D */ bl daAlink_c_NS_setShieldChange /* 801B2E1C 001AFD5C 38 00 00 4F */ li r0, 0x4f @@ -3378,8 +3378,8 @@ lbl_801B2DCC: /* 801B2E50 001AFD90 48 06 BB 81 */ bl dMeter2Info_set2DVibration /* 801B2E54 001AFD94 48 00 00 78 */ b lbl_801B2ECC lbl_801B2E58: -/* 801B2E58 001AFD98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2E5C 001AFD9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2E58 001AFD98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2E5C 001AFD9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E60 001AFDA0 88 03 00 15 */ lbz r0, 0x15(r3) /* 801B2E64 001AFDA4 28 00 00 2C */ cmplwi r0, 0x2c /* 801B2E68 001AFDA8 41 82 00 64 */ beq lbl_801B2ECC @@ -3389,8 +3389,8 @@ lbl_801B2E58: /* 801B2E78 001AFDB8 7F C3 F3 78 */ mr r3, r30 /* 801B2E7C 001AFDBC 38 80 00 01 */ li r4, 1 /* 801B2E80 001AFDC0 48 00 0E 75 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield -/* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E8C 001AFDCC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B2E90 001AFDD0 4B F8 D1 D5 */ bl daAlink_c_NS_setShieldChange /* 801B2E94 001AFDD4 38 00 00 4F */ li r0, 0x4f @@ -3434,8 +3434,8 @@ lbl_801B2F14: /* 801B2F18 001AFE58 40 80 01 9C */ bge lbl_801B30B4 /* 801B2F1C 001AFE5C 48 00 01 14 */ b lbl_801B3030 lbl_801B2F20: -/* 801B2F20 001AFE60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2F24 001AFE64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2F20 001AFE60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2F24 001AFE64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2F28 001AFE68 88 03 00 13 */ lbz r0, 0x13(r3) /* 801B2F2C 001AFE6C 28 00 00 2F */ cmplwi r0, 0x2f /* 801B2F30 001AFE70 41 82 01 84 */ beq lbl_801B30B4 @@ -3445,8 +3445,8 @@ lbl_801B2F20: /* 801B2F40 001AFE80 7F E3 FB 78 */ mr r3, r31 /* 801B2F44 001AFE84 38 80 00 00 */ li r4, 0 /* 801B2F48 001AFE88 48 00 10 95 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes -/* 801B2F4C 001AFE8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2F50 001AFE90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2F4C 001AFE8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2F50 001AFE90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2F54 001AFE94 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B2F58 001AFE98 38 80 00 00 */ li r4, 0 /* 801B2F5C 001AFE9C 81 83 06 28 */ lwz r12, 0x628(r3) @@ -3469,8 +3469,8 @@ lbl_801B2F20: /* 801B2FA0 001AFEE0 48 06 BA 31 */ bl dMeter2Info_set2DVibration /* 801B2FA4 001AFEE4 48 00 01 10 */ b lbl_801B30B4 lbl_801B2FA8: -/* 801B2FA8 001AFEE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2FAC 001AFEEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2FA8 001AFEE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2FAC 001AFEEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2FB0 001AFEF0 88 03 00 13 */ lbz r0, 0x13(r3) /* 801B2FB4 001AFEF4 28 00 00 31 */ cmplwi r0, 0x31 /* 801B2FB8 001AFEF8 41 82 00 FC */ beq lbl_801B30B4 @@ -3480,8 +3480,8 @@ lbl_801B2FA8: /* 801B2FC8 001AFF08 7F E3 FB 78 */ mr r3, r31 /* 801B2FCC 001AFF0C 38 80 00 01 */ li r4, 1 /* 801B2FD0 001AFF10 48 00 10 0D */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes -/* 801B2FD4 001AFF14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B2FD8 001AFF18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B2FD4 001AFF14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B2FD8 001AFF18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2FDC 001AFF1C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B2FE0 001AFF20 38 80 00 00 */ li r4, 0 /* 801B2FE4 001AFF24 81 83 06 28 */ lwz r12, 0x628(r3) @@ -3504,8 +3504,8 @@ lbl_801B2FA8: /* 801B3028 001AFF68 48 06 B9 A9 */ bl dMeter2Info_set2DVibration /* 801B302C 001AFF6C 48 00 00 88 */ b lbl_801B30B4 lbl_801B3030: -/* 801B3030 001AFF70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B3034 001AFF74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B3030 001AFF70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B3034 001AFF74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B3038 001AFF78 88 03 00 13 */ lbz r0, 0x13(r3) /* 801B303C 001AFF7C 28 00 00 30 */ cmplwi r0, 0x30 /* 801B3040 001AFF80 41 82 00 74 */ beq lbl_801B30B4 @@ -3515,8 +3515,8 @@ lbl_801B3030: /* 801B3050 001AFF90 7F E3 FB 78 */ mr r3, r31 /* 801B3054 001AFF94 38 80 00 02 */ li r4, 2 /* 801B3058 001AFF98 48 00 0F 85 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes -/* 801B305C 001AFF9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B3060 001AFFA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B305C 001AFF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B3060 001AFFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B3064 001AFFA4 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B3068 001AFFA8 38 80 00 00 */ li r4, 0 /* 801B306C 001AFFAC 81 83 06 28 */ lwz r12, 0x628(r3) @@ -3849,8 +3849,8 @@ dMenu_Collect2D_c_NS_setSmellType: /* 801B3534 001B0474 48 1A EC A5 */ bl _savegpr_28 /* 801B3538 001B0478 7C 7C 1B 78 */ mr r28, r3 /* 801B353C 001B047C 3B C0 FF FF */ li r30, -1 -/* 801B3540 001B0480 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B3544 001B0484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B3540 001B0480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B3544 001B0484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B3548 001B0488 88 03 00 16 */ lbz r0, 0x16(r3) /* 801B354C 001B048C 2C 00 00 B3 */ cmpwi r0, 0xb3 /* 801B3550 001B0490 41 82 00 40 */ beq lbl_801B3590 @@ -3932,8 +3932,8 @@ dMenu_Collect2D_c_NS_setHeartPiece: /* 801B364C 001B058C 39 61 00 20 */ addi r11, r1, 0x20 /* 801B3650 001B0590 48 1A EB 89 */ bl _savegpr_28 /* 801B3654 001B0594 7C 7C 1B 78 */ mr r28, r3 -/* 801B3658 001B0598 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B365C 001B059C A0 83 61 C0 */ lhz r4, lbl_804061C0@l(r3) +/* 801B3658 001B0598 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B365C 001B059C A0 83 61 C0 */ lhz r4, g_dComIfG_gameInfo@l(r3) /* 801B3660 001B05A0 38 60 00 05 */ li r3, 5 /* 801B3664 001B05A4 7C 04 1B D6 */ divw r0, r4, r3 /* 801B3668 001B05A8 7C 00 19 D6 */ mullw r0, r0, r3 @@ -4004,8 +4004,8 @@ lbl_801B3734: /* 801B3750 001B0690 7F E0 20 50 */ subf r31, r0, r4 /* 801B3754 001B0694 3B A0 00 00 */ li r29, 0 /* 801B3758 001B0698 40 81 00 7C */ ble lbl_801B37D4 -/* 801B375C 001B069C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B3760 001B06A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801B375C 001B069C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B3760 001B06A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B3764 001B06A4 83 A4 5D 30 */ lwz r29, 0x5d30(r4) /* 801B3768 001B06A8 48 06 AB 61 */ bl dMeter2Info_getNumberTextureName /* 801B376C 001B06AC 7C 65 1B 78 */ mr r5, r3 @@ -4055,8 +4055,8 @@ lbl_801B3800: /* 801B3814 001B0754 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 801B3818 001B0758 41 82 00 78 */ beq lbl_801B3890 lbl_801B381C: -/* 801B381C 001B075C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B3820 001B0760 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801B381C 001B075C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B3820 001B0760 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B3824 001B0764 83 A4 5D 30 */ lwz r29, 0x5d30(r4) /* 801B3828 001B0768 48 06 AA A1 */ bl dMeter2Info_getNumberTextureName /* 801B382C 001B076C 7C 65 1B 78 */ mr r5, r3 @@ -4097,8 +4097,8 @@ lbl_801B3890: /* 801B38B4 001B07F4 38 00 00 00 */ li r0, 0 /* 801B38B8 001B07F8 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_801B38BC: -/* 801B38BC 001B07FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B38C0 001B0800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B38BC 001B07FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B38C0 001B0800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B38C4 001B0804 83 A3 5D 30 */ lwz r29, 0x5d30(r3) /* 801B38C8 001B0808 7F E3 FB 78 */ mr r3, r31 /* 801B38CC 001B080C 48 06 A9 FD */ bl dMeter2Info_getNumberTextureName @@ -4180,8 +4180,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorSword: /* 801B39E8 001B0928 7C 9E 23 78 */ mr r30, r4 /* 801B39EC 001B092C 2C 1E FF FF */ cmpwi r30, -1 /* 801B39F0 001B0930 40 82 01 BC */ bne lbl_801B3BAC -/* 801B39F4 001B0934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B39F8 001B0938 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 801B39F4 001B0934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B39F8 001B0938 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 801B39FC 001B093C 88 85 00 14 */ lbz r4, 0x14(r5) /* 801B3A00 001B0940 88 7D 02 5B */ lbz r3, 0x25b(r29) /* 801B3A04 001B0944 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -4398,8 +4398,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorShield: /* 801B3D0C 001B0C4C 7C 9E 23 78 */ mr r30, r4 /* 801B3D10 001B0C50 2C 1E FF FF */ cmpwi r30, -1 /* 801B3D14 001B0C54 40 82 01 80 */ bne lbl_801B3E94 -/* 801B3D18 001B0C58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B3D1C 001B0C5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B3D18 001B0C58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B3D1C 001B0C5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B3D20 001B0C60 88 83 00 15 */ lbz r4, 0x15(r3) /* 801B3D24 001B0C64 88 7D 02 5C */ lbz r3, 0x25c(r29) /* 801B3D28 001B0C68 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -4598,8 +4598,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes: /* 801B3FF4 001B0F34 7C 9E 23 78 */ mr r30, r4 /* 801B3FF8 001B0F38 2C 1E FF FF */ cmpwi r30, -1 /* 801B3FFC 001B0F3C 40 82 01 94 */ bne lbl_801B4190 -/* 801B4000 001B0F40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B4004 001B0F44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B4000 001B0F40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B4004 001B0F44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B4008 001B0F48 88 83 00 13 */ lbz r4, 0x13(r3) /* 801B400C 001B0F4C 88 7D 02 5D */ lbz r3, 0x25d(r29) /* 801B4010 001B0F50 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -5368,8 +5368,8 @@ lbl_801B4B0C: lbl_801B4B1C: /* 801B4B1C 001B1A5C 28 05 00 00 */ cmplwi r5, 0 /* 801B4B20 001B1A60 40 82 00 34 */ bne lbl_801B4B54 -/* 801B4B24 001B1A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B4B28 001B1A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B4B24 001B1A64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B4B28 001B1A68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B4B2C 001B1A6C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B4B30 001B1A70 81 83 06 28 */ lwz r12, 0x628(r3) /* 801B4B34 001B1A74 81 8C 02 74 */ lwz r12, 0x274(r12) @@ -5383,8 +5383,8 @@ lbl_801B4B1C: lbl_801B4B54: /* 801B4B54 001B1A94 28 05 00 01 */ cmplwi r5, 1 /* 801B4B58 001B1A98 40 82 00 34 */ bne lbl_801B4B8C -/* 801B4B5C 001B1A9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B4B60 001B1AA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B4B5C 001B1A9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B4B60 001B1AA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B4B64 001B1AA4 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B4B68 001B1AA8 81 83 06 28 */ lwz r12, 0x628(r3) /* 801B4B6C 001B1AAC 81 8C 02 70 */ lwz r12, 0x270(r12) @@ -5398,8 +5398,8 @@ lbl_801B4B54: lbl_801B4B8C: /* 801B4B8C 001B1ACC 28 05 00 02 */ cmplwi r5, 2 /* 801B4B90 001B1AD0 40 82 02 6C */ bne lbl_801B4DFC -/* 801B4B94 001B1AD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B4B98 001B1AD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B4B94 001B1AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B4B98 001B1AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B4B9C 001B1ADC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801B4BA0 001B1AE0 81 83 06 28 */ lwz r12, 0x628(r3) /* 801B4BA4 001B1AE4 81 8C 02 6C */ lwz r12, 0x26c(r12) @@ -5411,8 +5411,8 @@ lbl_801B4B8C: /* 801B4BBC 001B1AFC 4B FF E3 29 */ bl dMenu_Collect2D_c_NS_changeClothe /* 801B4BC0 001B1B00 48 00 02 3C */ b lbl_801B4DFC lbl_801B4BC4: -/* 801B4BC4 001B1B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B4BC8 001B1B08 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801B4BC4 001B1B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B4BC8 001B1B08 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801B4BCC 001B1B0C 80 7E 5D AC */ lwz r3, 0x5dac(r30) /* 801B4BD0 001B1B10 81 83 06 28 */ lwz r12, 0x628(r3) /* 801B4BD4 001B1B14 81 8C 02 74 */ lwz r12, 0x274(r12) @@ -5759,8 +5759,8 @@ lbl_801B5074: /* 801B50C8 001B2008 48 11 9B 85 */ bl __nw__FUl /* 801B50CC 001B200C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B50D0 001B2010 41 82 00 1C */ beq lbl_801B50EC -/* 801B50D4 001B2014 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B50D8 001B2018 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801B50D4 001B2014 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B50D8 001B2018 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B50DC 001B201C 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801B50E0 001B2020 80 BE 00 10 */ lwz r5, 0x10(r30) /* 801B50E4 001B2024 48 02 CE 2D */ bl dMenu_Option_c @@ -6619,8 +6619,8 @@ dMenu_Collect2D_c_NS__draw: /* 801B5D7C 001B2CBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B5D80 001B2CC0 93 C1 00 08 */ stw r30, 8(r1) /* 801B5D84 001B2CC4 7C 7F 1B 78 */ mr r31, r3 -/* 801B5D88 001B2CC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B5D8C 001B2CCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B5D88 001B2CC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B5D8C 001B2CCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B5D90 001B2CD0 83 C3 5F 50 */ lwz r30, 0x5f50(r3) /* 801B5D94 001B2CD4 7F C3 F3 78 */ mr r3, r30 /* 801B5D98 001B2CD8 81 9E 00 00 */ lwz r12, 0(r30) @@ -6740,8 +6740,8 @@ dMenu_Collect2D_c_NS_drawTop: /* 801B5F4C 001B2E8C 7C 08 02 A6 */ mflr r0 /* 801B5F50 001B2E90 90 01 00 14 */ stw r0, 0x14(r1) /* 801B5F54 001B2E94 7C 66 1B 78 */ mr r6, r3 -/* 801B5F58 001B2E98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B5F5C 001B2E9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B5F58 001B2E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B5F5C 001B2E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B5F60 001B2EA0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801B5F64 001B2EA4 38 83 00 AC */ addi r4, r3, 0xac /* 801B5F68 001B2EA8 38 A3 00 B0 */ addi r5, r3, 0xb0 @@ -7119,8 +7119,8 @@ dMenu_Collect3D_c: /* 801B64A8 001B33E8 38 C0 00 74 */ li r6, 0x74 /* 801B64AC 001B33EC 38 E0 00 06 */ li r7, 6 /* 801B64B0 001B33F0 48 1A B8 B1 */ bl func_80361D60 -/* 801B64B4 001B33F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B64B8 001B33F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B64B4 001B33F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B64B8 001B33F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B64BC 001B33FC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B64C0 001B3400 80 03 05 74 */ lwz r0, 0x574(r3) /* 801B64C4 001B3404 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 @@ -7202,8 +7202,8 @@ dMenu_Collect3D_c_NS__create: /* 801B65D8 001B3518 90 7F 00 08 */ stw r3, 8(r31) /* 801B65DC 001B351C 80 7F 00 08 */ lwz r3, 8(r31) /* 801B65E0 001B3520 4B E5 8B ED */ bl mDoExt_setCurrentHeap -/* 801B65E4 001B3524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B65E8 001B3528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B65E4 001B3524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B65E8 001B3528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B65EC 001B352C 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B65F0 001B3530 28 03 00 00 */ cmplwi r3, 0 /* 801B65F4 001B3534 41 82 00 08 */ beq lbl_801B65FC @@ -7257,8 +7257,8 @@ dMenu_Collect3D_c_NS__delete: /* 801B6694 001B35D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B6698 001B35D8 7C 08 02 A6 */ mflr r0 /* 801B669C 001B35DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801B66A0 001B35E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B66A4 001B35E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B66A0 001B35E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B66A4 001B35E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B66A8 001B35E8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B66AC 001B35EC 28 03 00 00 */ cmplwi r3, 0 /* 801B66B0 001B35F0 41 82 00 08 */ beq lbl_801B66B8 @@ -7338,8 +7338,8 @@ lbl_801B67B0: /* 801B67B8 001B36F8 38 E0 00 80 */ li r7, 0x80 /* 801B67BC 001B36FC 48 0B 9D 85 */ bl cLib_addCalcAngleS lbl_801B67C0: -/* 801B67C0 001B3700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B67C4 001B3704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B67C0 001B3700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B67C4 001B3704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B67C8 001B3708 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B67CC 001B370C 28 03 00 00 */ cmplwi r3, 0 /* 801B67D0 001B3710 41 82 00 10 */ beq lbl_801B67E0 @@ -7462,8 +7462,8 @@ dMenu_Collect3D_c_NS_draw: /* 801B6978 001B38B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B697C 001B38BC 93 C1 00 08 */ stw r30, 8(r1) /* 801B6980 001B38C0 7C 7E 1B 78 */ mr r30, r3 -/* 801B6984 001B38C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B6988 001B38C8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801B6984 001B38C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B6988 001B38C8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801B698C 001B38CC 80 04 5F 98 */ lwz r0, 0x5f98(r4) /* 801B6990 001B38D0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801B6994 001B38D4 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -7495,8 +7495,8 @@ lbl_801B69B4: /* 801B69F8 001B3938 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801B69FC 001B393C 4B E5 72 C9 */ bl mDoExt_modelUpdateDL lbl_801B6A00: -/* 801B6A00 001B3940 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B6A04 001B3944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B6A00 001B3940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B6A04 001B3944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B6A08 001B3948 80 03 5F 80 */ lwz r0, 0x5f80(r3) /* 801B6A0C 001B394C 90 1F 00 48 */ stw r0, 0x48(r31) /* 801B6A10 001B3950 80 03 5F 84 */ lwz r0, 0x5f84(r3) @@ -7519,8 +7519,8 @@ dMenu_Collect3D_c_NS_setJ3D: /* 801B6A48 001B3988 7C 80 23 78 */ mr r0, r4 /* 801B6A4C 001B398C 7C BC 2B 78 */ mr r28, r5 /* 801B6A50 001B3990 7C DB 33 78 */ mr r27, r6 -/* 801B6A54 001B3994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B6A58 001B3998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B6A54 001B3994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B6A58 001B3998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B6A5C 001B399C 83 A3 5C B8 */ lwz r29, 0x5cb8(r3) /* 801B6A60 001B39A0 7F A3 EB 78 */ mr r3, r29 /* 801B6A64 001B39A4 3C 80 42 4D */ lis r4, 0x424D4420@ha @@ -8226,8 +8226,8 @@ dMenu_Collect3D_c_NS_getCrystalNum: /* 801B7444 001B4384 48 1A AD 99 */ bl _savegpr_29 /* 801B7448 001B4388 3B C0 00 00 */ li r30, 0 /* 801B744C 001B438C 3B A0 00 00 */ li r29, 0 -/* 801B7450 001B4390 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B7454 001B4394 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B7450 001B4390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B7454 001B4394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B7458 001B4398 3B E3 01 00 */ addi r31, r3, 0x100 lbl_801B745C: /* 801B745C 001B439C 7F E3 FB 78 */ mr r3, r31 @@ -8257,8 +8257,8 @@ dMenu_Collect3D_c_NS_getMirrorNum: /* 801B74AC 001B43EC 48 1A AD 31 */ bl _savegpr_29 /* 801B74B0 001B43F0 3B C0 00 00 */ li r30, 0 /* 801B74B4 001B43F4 3B A0 00 00 */ li r29, 0 -/* 801B74B8 001B43F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B74BC 001B43FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B74B8 001B43F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B74BC 001B43FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B74C0 001B4400 3B E3 01 00 */ addi r31, r3, 0x100 lbl_801B74C4: /* 801B74C4 001B4404 7F E3 FB 78 */ mr r3, r31 @@ -8292,16 +8292,16 @@ dMenu_Collect3D_c_NS_getMaskMdlVisible: /* 801B7524 001B4464 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B7528 001B4468 41 82 00 70 */ beq lbl_801B7598 lbl_801B752C: -/* 801B752C 001B446C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B7530 001B4470 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B752C 001B446C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B7530 001B4470 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B7534 001B4474 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801B7538 001B4478 7F E3 FB 78 */ mr r3, r31 /* 801B753C 001B447C 38 80 0C 01 */ li r4, 0xc01 /* 801B7540 001B4480 4B E7 D4 7D */ bl isEventBit__11dSv_event_cCFUs /* 801B7544 001B4484 2C 03 00 00 */ cmpwi r3, 0 /* 801B7548 001B4488 41 82 00 20 */ beq lbl_801B7568 -/* 801B754C 001B448C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B7550 001B4490 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B754C 001B448C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B7550 001B4490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B7554 001B4494 38 63 01 00 */ addi r3, r3, 0x100 /* 801B7558 001B4498 38 80 00 00 */ li r4, 0 /* 801B755C 001B449C 4B E7 CD 35 */ bl isCollectMirror__20dSv_player_collect_cCFUc @@ -8313,8 +8313,8 @@ lbl_801B7568: /* 801B7570 001B44B0 4B E7 D4 4D */ bl isEventBit__11dSv_event_cCFUs /* 801B7574 001B44B4 2C 03 00 00 */ cmpwi r3, 0 /* 801B7578 001B44B8 41 82 00 28 */ beq lbl_801B75A0 -/* 801B757C 001B44BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B7580 001B44C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B757C 001B44BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B7580 001B44C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B7584 001B44C4 38 63 01 00 */ addi r3, r3, 0x100 /* 801B7588 001B44C8 38 80 00 03 */ li r4, 3 /* 801B758C 001B44CC 4B E7 CC C1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc @@ -8324,8 +8324,8 @@ lbl_801B7598: /* 801B7598 001B44D8 38 60 00 00 */ li r3, 0 /* 801B759C 001B44DC 48 00 00 38 */ b lbl_801B75D4 lbl_801B75A0: -/* 801B75A0 001B44E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B75A4 001B44E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B75A0 001B44E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B75A4 001B44E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B75A8 001B44E8 38 63 01 00 */ addi r3, r3, 0x100 /* 801B75AC 001B44EC 38 80 00 03 */ li r4, 3 /* 801B75B0 001B44F0 4B E7 CC 9D */ bl isCollectCrystal__20dSv_player_collect_cCFUc @@ -8471,8 +8471,8 @@ dMenu_Collect3D_c_NS_calcViewMtx: /* 801B77B0 001B46F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B77B4 001B46F4 93 C1 00 08 */ stw r30, 8(r1) /* 801B77B8 001B46F8 7C 7E 1B 78 */ mr r30, r3 -/* 801B77BC 001B46FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B77C0 001B4700 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B77BC 001B46FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B77C0 001B4700 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B77C4 001B4704 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801B77C8 001B4708 7F E3 FB 78 */ mr r3, r31 /* 801B77CC 001B470C 81 9F 00 00 */ lwz r12, 0(r31) @@ -8698,8 +8698,8 @@ dMenu_Collect_c_NS_draw: /* 801B7AC8 001B4A08 90 01 00 14 */ stw r0, 0x14(r1) /* 801B7ACC 001B4A0C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B7AD0 001B4A10 7C 7F 1B 78 */ mr r31, r3 -/* 801B7AD4 001B4A14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B7AD8 001B4A18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B7AD4 001B4A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B7AD8 001B4A18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B7ADC 001B4A1C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801B7AE0 001B4A20 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801B7AE4 001B4A24 38 A3 01 B8 */ addi r5, r3, 0x1b8 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 9d06f26b9a..a76b892111 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -81,16 +81,16 @@ lbl_801B8018: /* 801B803C 001B4F7C 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8040 001B4F80 48 1B 0A ED */ bl strcpy /* 801B8044 001B4F84 38 61 00 08 */ addi r3, r1, 8 -/* 801B8048 001B4F88 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B804C 001B4F8C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801B8048 001B4F88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B804C 001B4F8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B8050 001B4F90 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 801B8054 001B4F94 48 1B 0A D9 */ bl strcpy /* 801B8058 001B4F98 88 01 00 0C */ lbz r0, 0xc(r1) /* 801B805C 001B4F9C 98 01 00 22 */ stb r0, 0x22(r1) /* 801B8060 001B4FA0 88 01 00 0D */ lbz r0, 0xd(r1) /* 801B8064 001B4FA4 98 01 00 23 */ stb r0, 0x23(r1) -/* 801B8068 001B4FA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B806C 001B4FAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B8068 001B4FA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B806C 001B4FAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B8070 001B4FB0 3B C3 09 58 */ addi r30, r3, 0x958 /* 801B8074 001B4FB4 7F C3 F3 78 */ mr r3, r30 /* 801B8078 001B4FB8 38 80 00 00 */ li r4, 0 @@ -145,8 +145,8 @@ dMenu_DmapBg_c_NS_mapScreenInit: /* 801B8124 001B5064 7C 7D 1B 78 */ mr r29, r3 /* 801B8128 001B5068 3B 40 00 00 */ li r26, 0 /* 801B812C 001B506C 3B C0 00 00 */ li r30, 0 -/* 801B8130 001B5070 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801B8134 001B5074 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 801B8130 001B5070 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801B8134 001B5074 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 801B8138 001B5078 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B813C 001B507C 3B 84 57 60 */ addi r28, r4, lbl_80395760@l lbl_801B8140: @@ -763,8 +763,8 @@ lbl_801B8A44: /* 801B8A50 001B5990 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8A54 001B5994 38 84 00 4D */ addi r4, r4, 0x4d /* 801B8A58 001B5998 3C A0 00 02 */ lis r5, 2 -/* 801B8A5C 001B599C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 801B8A60 001B59A0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 801B8A5C 001B599C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 801B8A60 001B59A0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 801B8A64 001B59A4 80 C6 5C C0 */ lwz r6, 0x5cc0(r6) /* 801B8A68 001B59A8 48 13 FB E1 */ bl J2DScreen_NS_setPriority /* 801B8A6C 001B59AC 80 7E 0C B4 */ lwz r3, 0xcb4(r30) @@ -1232,8 +1232,8 @@ dMenu_DmapBg_c_NS_createExplain: /* 801B9118 001B6058 7C 60 1B 79 */ or. r0, r3, r3 /* 801B911C 001B605C 41 82 00 24 */ beq lbl_801B9140 /* 801B9120 001B6060 80 9E 0C 9C */ lwz r4, 0xc9c(r30) -/* 801B9124 001B6064 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801B9128 001B6068 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801B9124 001B6064 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801B9128 001B6068 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801B912C 001B606C 80 A5 5C C0 */ lwz r5, 0x5cc0(r5) /* 801B9130 001B6070 80 DE 0C A0 */ lwz r6, 0xca0(r30) /* 801B9134 001B6074 38 E0 00 01 */ li r7, 1 @@ -1307,8 +1307,8 @@ lbl_801B920C: /* 801B9218 001B6158 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B921C 001B615C 38 84 00 70 */ addi r4, r4, 0x70 /* 801B9220 001B6160 3C A0 00 02 */ lis r5, 2 -/* 801B9224 001B6164 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 801B9228 001B6168 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 801B9224 001B6164 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 801B9228 001B6168 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 801B922C 001B616C 80 DE 5C C0 */ lwz r6, 0x5cc0(r30) /* 801B9230 001B6170 48 13 F4 19 */ bl J2DScreen_NS_setPriority /* 801B9234 001B6174 80 7F 0C A4 */ lwz r3, 0xca4(r31) @@ -1423,8 +1423,8 @@ lbl_801B9334: /* 801B93D8 001B6318 38 A5 00 6F */ addi r5, r5, 0x6f /* 801B93DC 001B631C 4C C6 31 82 */ crclr 6 /* 801B93E0 001B6320 48 14 73 6D */ bl J2DTextBox_NS_setString_X1_ -/* 801B93E4 001B6324 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801B93E8 001B6328 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801B93E4 001B6324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801B93E8 001B6328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B93EC 001B632C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801B93F0 001B6330 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801B93F4 001B6334 7D 89 03 A6 */ mtctr r12 @@ -2273,8 +2273,8 @@ dMenu_DmapBg_c_NS_dtor: /* 801BA0E4 001B7024 90 7F 00 00 */ stw r3, 0(r31) /* 801BA0E8 001B7028 38 03 00 0C */ addi r0, r3, 0xc /* 801BA0EC 001B702C 90 1F 00 04 */ stw r0, 4(r31) -/* 801BA0F0 001B7030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BA0F4 001B7034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BA0F0 001B7030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BA0F4 001B7034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BA0F8 001B7038 80 63 5C C0 */ lwz r3, 0x5cc0(r3) /* 801BA0FC 001B703C 81 83 00 00 */ lwz r12, 0(r3) /* 801BA100 001B7040 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -3006,8 +3006,8 @@ lbl_801BAAF4: /* 801BAB3C 001B7A7C 39 61 02 90 */ addi r11, r1, 0x290 /* 801BAB40 001B7A80 48 1A 76 9D */ bl _savegpr_29 /* 801BAB44 001B7A84 7C 7E 1B 78 */ mr r30, r3 -/* 801BAB48 001B7A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BAB4C 001B7A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BAB48 001B7A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BAB4C 001B7A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BAB50 001B7A90 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801BAB54 001B7A94 7F E3 FB 78 */ mr r3, r31 /* 801BAB58 001B7A98 81 9F 00 00 */ lwz r12, 0(r31) @@ -3830,8 +3830,8 @@ lbl_801BB768: /* 801BB784 001B86C4 3B 40 00 00 */ li r26, 0 /* 801BB788 001B86C8 3B 60 00 00 */ li r27, 0 /* 801BB78C 001B86CC 3B 20 00 00 */ li r25, 0 -/* 801BB790 001B86D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BB794 001B86D4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 801BB790 001B86D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BB794 001B86D4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l lbl_801BB798: /* 801BB798 001B86D8 38 60 00 6C */ li r3, 0x6c /* 801BB79C 001B86DC 48 11 34 B1 */ bl __nw__FUl @@ -4233,8 +4233,8 @@ lbl_801BBD60: /* 801BBD94 001B8CD4 7C 60 1B 78 */ mr r0, r3 lbl_801BBD98: /* 801BBD98 001B8CD8 90 1F 00 8C */ stw r0, 0x8c(r31) -/* 801BBD9C 001B8CDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BBDA0 001B8CE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BBD9C 001B8CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BBDA0 001B8CE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BBDA4 001B8CE4 3B A3 4E 20 */ addi r29, r3, 0x4e20 /* 801BBDA8 001B8CE8 7F A3 EB 78 */ mr r3, r29 /* 801BBDAC 001B8CEC 81 9D 00 00 */ lwz r12, 0(r29) @@ -4360,14 +4360,14 @@ lbl_801BBEB8: /* 801BBF70 001B8EB0 3B 00 00 00 */ li r24, 0 /* 801BBF74 001B8EB4 38 60 00 F9 */ li r3, 0xf9 /* 801BBF78 001B8EB8 38 80 00 01 */ li r4, 1 -/* 801BBF7C 001B8EBC 4B ED BF 65 */ bl checkItemGet +/* 801BBF7C 001B8EBC 4B ED BF 65 */ bl checkItemGet__FUci /* 801BBF80 001B8EC0 2C 03 00 00 */ cmpwi r3, 0 /* 801BBF84 001B8EC4 41 82 00 08 */ beq lbl_801BBF8C /* 801BBF88 001B8EC8 3B 00 00 01 */ li r24, 1 lbl_801BBF8C: /* 801BBF8C 001B8ECC 38 60 00 FA */ li r3, 0xfa /* 801BBF90 001B8ED0 38 80 00 01 */ li r4, 1 -/* 801BBF94 001B8ED4 4B ED BF 4D */ bl checkItemGet +/* 801BBF94 001B8ED4 4B ED BF 4D */ bl checkItemGet__FUci /* 801BBF98 001B8ED8 2C 03 00 00 */ cmpwi r3, 0 /* 801BBF9C 001B8EDC 41 82 00 10 */ beq lbl_801BBFAC /* 801BBFA0 001B8EE0 57 03 06 3E */ clrlwi r3, r24, 0x18 @@ -4376,7 +4376,7 @@ lbl_801BBF8C: lbl_801BBFAC: /* 801BBFAC 001B8EEC 38 60 00 FB */ li r3, 0xfb /* 801BBFB0 001B8EF0 38 80 00 01 */ li r4, 1 -/* 801BBFB4 001B8EF4 4B ED BF 2D */ bl checkItemGet +/* 801BBFB4 001B8EF4 4B ED BF 2D */ bl checkItemGet__FUci /* 801BBFB8 001B8EF8 2C 03 00 00 */ cmpwi r3, 0 /* 801BBFBC 001B8EFC 41 82 00 10 */ beq lbl_801BBFCC /* 801BBFC0 001B8F00 57 03 06 3E */ clrlwi r3, r24, 0x18 @@ -4452,8 +4452,8 @@ lbl_801BC090: /* 801BC0BC 001B8FFC 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801BC0C0 001B9000 48 00 04 50 */ b lbl_801BC510 lbl_801BC0C4: -/* 801BC0C4 001B9004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC0C8 001B9008 3B 23 61 C0 */ addi r25, r3, lbl_804061C0@l +/* 801BC0C4 001B9004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC0C8 001B9008 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 801BC0CC 001B900C 83 59 5D 30 */ lwz r26, 0x5d30(r25) /* 801BC0D0 001B9010 7F A3 EB 78 */ mr r3, r29 /* 801BC0D4 001B9014 48 06 21 F5 */ bl dMeter2Info_getNumberTextureName @@ -4600,8 +4600,8 @@ lbl_801BC228: /* 801BC304 001B9244 9B 9F 01 76 */ stb r28, 0x176(r31) /* 801BC308 001B9248 48 00 00 CC */ b lbl_801BC3D4 lbl_801BC30C: -/* 801BC30C 001B924C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC310 001B9250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BC30C 001B924C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC310 001B9250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BC314 001B9254 3B 03 09 58 */ addi r24, r3, 0x958 /* 801BC318 001B9258 7F 03 C3 78 */ mr r3, r24 /* 801BC31C 001B925C 38 80 00 02 */ li r4, 2 @@ -4622,11 +4622,11 @@ lbl_801BC30C: lbl_801BC358: /* 801BC358 001B9298 38 60 00 F4 */ li r3, 0xf4 /* 801BC35C 001B929C 38 80 00 01 */ li r4, 1 -/* 801BC360 001B92A0 4B ED BB 81 */ bl checkItemGet +/* 801BC360 001B92A0 4B ED BB 81 */ bl checkItemGet__FUci /* 801BC364 001B92A4 2C 03 00 00 */ cmpwi r3, 0 /* 801BC368 001B92A8 41 82 00 30 */ beq lbl_801BC398 -/* 801BC36C 001B92AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC370 001B92B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BC36C 001B92AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC370 001B92B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BC374 001B92B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801BC378 001B92B8 38 80 00 02 */ li r4, 2 /* 801BC37C 001B92BC 4B E7 86 41 */ bl isEventBit__11dSv_event_cCFUs @@ -4639,11 +4639,11 @@ lbl_801BC358: lbl_801BC398: /* 801BC398 001B92D8 38 60 00 F5 */ li r3, 0xf5 /* 801BC39C 001B92DC 38 80 00 01 */ li r4, 1 -/* 801BC3A0 001B92E0 4B ED BB 41 */ bl checkItemGet +/* 801BC3A0 001B92E0 4B ED BB 41 */ bl checkItemGet__FUci /* 801BC3A4 001B92E4 2C 03 00 00 */ cmpwi r3, 0 /* 801BC3A8 001B92E8 41 82 00 2C */ beq lbl_801BC3D4 -/* 801BC3AC 001B92EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC3B0 001B92F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BC3AC 001B92EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC3B0 001B92F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BC3B4 001B92F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801BC3B8 001B92F8 38 80 00 01 */ li r4, 1 /* 801BC3BC 001B92FC 4B E7 86 01 */ bl isEventBit__11dSv_event_cCFUs @@ -4723,8 +4723,8 @@ lbl_801BC454: /* 801BC4D8 001B9418 4E 80 04 21 */ bctrl /* 801BC4DC 001B941C 38 00 00 00 */ li r0, 0 /* 801BC4E0 001B9420 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801BC4E4 001B9424 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC4E8 001B9428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BC4E4 001B9424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC4E8 001B9428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BC4EC 001B942C 38 63 09 58 */ addi r3, r3, 0x958 /* 801BC4F0 001B9430 38 80 00 02 */ li r4, 2 /* 801BC4F4 001B9434 4B E7 84 41 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -4735,8 +4735,8 @@ lbl_801BC454: /* 801BC508 001B9448 7C 00 18 38 */ and r0, r0, r3 /* 801BC50C 001B944C 98 1F 01 76 */ stb r0, 0x176(r31) lbl_801BC510: -/* 801BC510 001B9450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BC514 001B9454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BC510 001B9450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BC514 001B9454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BC518 001B9458 3B 03 09 58 */ addi r24, r3, 0x958 /* 801BC51C 001B945C 7F 03 C3 78 */ mr r3, r24 /* 801BC520 001B9460 38 80 00 00 */ li r4, 0 @@ -5270,8 +5270,8 @@ lbl_801BCCAC: /* 801BCCD4 001B9C14 28 04 00 FF */ cmplwi r4, 0xff /* 801BCCD8 001B9C18 41 82 00 24 */ beq lbl_801BCCFC /* 801BCCDC 001B9C1C 41 82 00 4C */ beq lbl_801BCD28 -/* 801BCCE0 001B9C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BCCE4 001B9C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BCCE0 001B9C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BCCE4 001B9C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BCCE8 001B9C28 88 A1 00 08 */ lbz r5, 8(r1) /* 801BCCEC 001B9C2C 7C A5 07 74 */ extsb r5, r5 /* 801BCCF0 001B9C30 4B E7 86 71 */ bl isSwitch__10dSv_info_cCFii @@ -6220,8 +6220,8 @@ lbl_801BDA30: /* 801BDA3C 001BA97C 28 00 00 06 */ cmplwi r0, 6 /* 801BDA40 001BA980 40 82 00 A0 */ bne lbl_801BDAE0 /* 801BDA44 001BA984 3B 80 00 00 */ li r28, 0 -/* 801BDA48 001BA988 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BDA4C 001BA98C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BDA48 001BA988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BDA4C 001BA98C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BDA50 001BA990 3B A3 09 58 */ addi r29, r3, 0x958 /* 801BDA54 001BA994 7F A3 EB 78 */ mr r3, r29 /* 801BDA58 001BA998 38 80 00 67 */ li r4, 0x67 @@ -7345,8 +7345,8 @@ lbl_801BE928: /* 801BEAA8 001BB9E8 38 80 FF FF */ li r4, -1 /* 801BEAAC 001BB9EC 48 09 4F 6D */ bl CPaneMgr_NS_dtor lbl_801BEAB0: -/* 801BEAB0 001BB9F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801BEAB4 001BB9F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801BEAB0 001BB9F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801BEAB4 001BB9F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801BEAB8 001BB9F8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801BEABC 001BB9FC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801BEAC0 001BBA00 38 A3 01 B8 */ addi r5, r3, 0x1b8 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index 0e7bee3c3d..0d7f300f34 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -298,8 +298,8 @@ dMenu_Fishing_c_NS__draw: /* 801C5164 001C20A4 80 03 00 08 */ lwz r0, 8(r3) /* 801C5168 001C20A8 28 00 00 00 */ cmplwi r0, 0 /* 801C516C 001C20AC 41 82 00 80 */ beq lbl_801C51EC -/* 801C5170 001C20B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C5174 001C20B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C5170 001C20B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C5174 001C20B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C5178 001C20B8 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801C517C 001C20BC 80 7E 01 F0 */ lwz r3, 0x1f0(r30) /* 801C5180 001C20C0 38 80 00 FF */ li r4, 0xff @@ -361,8 +361,8 @@ dMenu_Fishing_c_NS_init: /* 801C5240 001C2180 7C 7C 1B 78 */ mr r28, r3 /* 801C5244 001C2184 3B A0 00 00 */ li r29, 0 /* 801C5248 001C2188 3B E0 00 00 */ li r31, 0 -/* 801C524C 001C218C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C5250 001C2190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C524C 001C218C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C5250 001C2190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C5254 001C2194 3B C3 01 6C */ addi r30, r3, 0x16c lbl_801C5258: /* 801C5258 001C2198 57 A3 06 3E */ clrlwi r3, r29, 0x18 @@ -616,8 +616,8 @@ dMenu_Fishing_c_NS_screenSetBase: /* 801C55EC 001C252C 7C 7F 1B 78 */ mr r31, r3 /* 801C55F0 001C2530 3C 60 80 39 */ lis r3, lbl_80395D90@ha /* 801C55F4 001C2534 3B C3 5D 90 */ addi r30, r3, lbl_80395D90@l -/* 801C55F8 001C2538 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C55FC 001C253C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C55F8 001C2538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C55FC 001C253C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C5600 001C2540 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801C5604 001C2544 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801C5608 001C2548 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1340,8 +1340,8 @@ dMenu_Fishing_c_NS_setFishParam: /* 801C6090 001C2FD0 57 04 06 3E */ clrlwi r4, r24, 0x18 /* 801C6094 001C2FD4 4B FF FF 85 */ bl dMenu_Fishing_c_NS_getFigure /* 801C6098 001C2FD8 57 05 06 3E */ clrlwi r5, r24, 0x18 -/* 801C609C 001C2FDC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801C60A0 001C2FE0 3B 24 61 C0 */ addi r25, r4, lbl_804061C0@l +/* 801C609C 001C2FDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801C60A0 001C2FE0 3B 24 61 C0 */ addi r25, r4, g_dComIfG_gameInfo@l /* 801C60A4 001C2FE4 57 40 10 3A */ slwi r0, r26, 2 /* 801C60A8 001C2FE8 7F FD 02 14 */ add r31, r29, r0 /* 801C60AC 001C2FEC 54 7A 06 3E */ clrlwi r26, r3, 0x18 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index a567b595ba..8c21b0ce06 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -27,8 +27,8 @@ dMenuFmap_getStartStageName: /* 801C6638 001C3578 39 61 00 20 */ addi r11, r1, 0x20 /* 801C663C 001C357C 48 19 BB 95 */ bl _savegpr_26 /* 801C6640 001C3580 7C 7A 1B 78 */ mr r26, r3 -/* 801C6644 001C3584 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C6648 001C3588 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801C6644 001C3584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C6648 001C3588 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801C664C 001C358C 38 7E 4E 20 */ addi r3, r30, 0x4e20 /* 801C6650 001C3590 81 9E 4E 20 */ lwz r12, 0x4e20(r30) /* 801C6654 001C3594 81 8C 00 BC */ lwz r12, 0xbc(r12) @@ -194,8 +194,8 @@ lbl_801C6820: /* 801C68AC 001C37EC 90 1D 00 64 */ stw r0, 0x64(r29) /* 801C68B0 001C37F0 48 00 00 14 */ b lbl_801C68C4 lbl_801C68B4: -/* 801C68B4 001C37F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C68B8 001C37F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C68B4 001C37F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C68B8 001C37F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C68BC 001C37FC 80 03 5C 68 */ lwz r0, 0x5c68(r3) /* 801C68C0 001C3800 90 1D 00 64 */ stw r0, 0x64(r29) lbl_801C68C4: @@ -450,8 +450,8 @@ lbl_801C6C44: /* 801C6C44 001C3B84 38 00 00 00 */ li r0, 0 /* 801C6C48 001C3B88 90 1E 00 B8 */ stw r0, 0xb8(r30) lbl_801C6C4C: -/* 801C6C4C 001C3B8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C6C50 001C3B90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C6C4C 001C3B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C6C50 001C3B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C6C54 001C3B94 80 63 5C BC */ lwz r3, 0x5cbc(r3) /* 801C6C58 001C3B98 81 83 00 00 */ lwz r12, 0(r3) /* 801C6C5C 001C3B9C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1225,8 +1225,8 @@ lbl_801C778C: /* 801C7798 001C46D8 7C 84 00 38 */ and r4, r4, r0 /* 801C779C 001C46DC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C77A0 001C46E0 98 83 12 39 */ stb r4, 0x1239(r3) -/* 801C77A4 001C46E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C77A8 001C46E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C77A4 001C46E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C77A8 001C46E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C77AC 001C46EC 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 801C77B0 001C46F0 7F C3 F3 78 */ mr r3, r30 /* 801C77B4 001C46F4 38 9E 01 B4 */ addi r4, r30, 0x1b4 @@ -1714,8 +1714,8 @@ lbl_801C7E94: /* 801C7EA4 001C4DE4 48 01 01 E5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept /* 801C7EA8 001C4DE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7EAC 001C4DEC 41 82 02 D4 */ beq lbl_801C8180 -/* 801C7EB0 001C4DF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C7EB4 001C4DF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C7EB0 001C4DF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C7EB4 001C4DF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C7EB8 001C4DF8 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801C7EBC 001C4DFC 7F E3 FB 78 */ mr r3, r31 /* 801C7EC0 001C4E00 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2268,8 +2268,8 @@ lbl_801C86D4: /* 801C86E4 001C5624 48 00 F9 A5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept /* 801C86E8 001C5628 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C86EC 001C562C 41 82 02 98 */ beq lbl_801C8984 -/* 801C86F0 001C5630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C86F4 001C5634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C86F0 001C5630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C86F4 001C5634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C86F8 001C5638 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801C86FC 001C563C 7F E3 FB 78 */ mr r3, r31 /* 801C8700 001C5640 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2670,8 +2670,8 @@ lbl_801C8C84: /* 801C8CE4 001C5C24 7C 7F 02 14 */ add r3, r31, r0 /* 801C8CE8 001C5C28 A0 63 00 0C */ lhz r3, 0xc(r3) /* 801C8CEC 001C5C2C 48 06 F7 B1 */ bl dMsgObject_c_NS_setPortalMessageID -/* 801C8CF0 001C5C30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C8CF4 001C5C34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C8CF0 001C5C30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C8CF4 001C5C34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C8CF8 001C5C38 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801C8CFC 001C5C3C 7F E3 FB 78 */ mr r3, r31 /* 801C8D00 001C5C40 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2729,8 +2729,8 @@ lbl_801C8DC8: /* 801C8DC8 001C5D08 88 1E 03 08 */ lbz r0, 0x308(r30) /* 801C8DCC 001C5D0C 28 00 00 06 */ cmplwi r0, 6 /* 801C8DD0 001C5D10 40 82 00 B4 */ bne lbl_801C8E84 -/* 801C8DD4 001C5D14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C8DD8 001C5D18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C8DD4 001C5D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C8DD8 001C5D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C8DDC 001C5D1C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801C8DE0 001C5D20 3C 80 80 39 */ lis r4, lbl_803960E8@ha /* 801C8DE4 001C5D24 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l @@ -2785,8 +2785,8 @@ lbl_801C8E84: /* 801C8E94 001C5DD4 88 03 00 BF */ lbz r0, 0xbf(r3) /* 801C8E98 001C5DD8 28 00 00 03 */ cmplwi r0, 3 /* 801C8E9C 001C5DDC 40 82 00 40 */ bne lbl_801C8EDC -/* 801C8EA0 001C5DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C8EA4 001C5DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C8EA0 001C5DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C8EA4 001C5DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C8EA8 001C5DE8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801C8EAC 001C5DEC 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801C8EB0 001C5DF0 7D 89 03 A6 */ mtctr r12 @@ -3378,8 +3378,8 @@ lbl_801C976C: /* 801C9770 001C66B0 80 9F 00 08 */ lwz r4, 8(r31) /* 801C9774 001C66B4 80 BF 00 0C */ lwz r5, 0xc(r31) /* 801C9778 001C66B8 48 00 DE C9 */ bl dMenu_Fmap2DTop_c_NS_createExplain -/* 801C977C 001C66BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C9780 001C66C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C977C 001C66BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C9780 001C66C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C9784 001C66C4 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 801C9788 001C66C8 7F C3 F3 78 */ mr r3, r30 /* 801C978C 001C66CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -4182,8 +4182,8 @@ lbl_801CA338: /* 801CA384 001C72C4 A8 7D 02 14 */ lha r3, 0x214(r29) /* 801CA388 001C72C8 38 03 00 01 */ addi r0, r3, 1 /* 801CA38C 001C72CC B0 1D 02 14 */ sth r0, 0x214(r29) -/* 801CA390 001C72D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CA394 001C72D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CA390 001C72D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CA394 001C72D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CA398 001C72D8 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 801CA39C 001C72DC 7F C3 F3 78 */ mr r3, r30 /* 801CA3A0 001C72E0 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -5761,8 +5761,8 @@ lbl_801CB9F8: /* 801CBA04 001C8944 90 01 00 C0 */ stw r0, 0xc0(r1) /* 801CBA08 001C8948 56 1A 15 BA */ rlwinm r26, r16, 2, 0x16, 0x1d /* 801CBA0C 001C894C 7F 6F D2 14 */ add r27, r15, r26 -/* 801CBA10 001C8950 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CBA14 001C8954 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 801CBA10 001C8950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CBA14 001C8954 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 801CBA18 001C8958 90 01 00 C4 */ stw r0, 0xc4(r1) /* 801CBA1C 001C895C 80 61 00 C0 */ lwz r3, 0xc0(r1) /* 801CBA20 001C8960 39 C3 FF FF */ addi r14, r3, -1 @@ -6233,8 +6233,8 @@ dMenu_Fmap_c_NS_readFieldMapData: /* 801CC0B0 001C8FF0 7C B9 2B 78 */ mr r25, r5 /* 801CC0B4 001C8FF4 7C DA 33 78 */ mr r26, r6 /* 801CC0B8 001C8FF8 80 63 00 64 */ lwz r3, 0x64(r3) -/* 801CC0BC 001C8FFC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801CC0C0 001C9000 3B A4 61 C0 */ addi r29, r4, lbl_804061C0@l +/* 801CC0BC 001C8FFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801CC0C0 001C9000 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l /* 801CC0C4 001C9004 80 1D 5C 68 */ lwz r0, 0x5c68(r29) /* 801CC0C8 001C9008 7C 03 00 40 */ cmplw r3, r0 /* 801CC0CC 001C900C 41 82 00 9C */ beq lbl_801CC168 @@ -6550,8 +6550,8 @@ dMenu_Fmap_c_NS_readRoomDzsData: /* 801CC534 001C9474 7C 9C 23 78 */ mr r28, r4 /* 801CC538 001C9478 7C DE 33 78 */ mr r30, r6 /* 801CC53C 001C947C 80 63 00 64 */ lwz r3, 0x64(r3) -/* 801CC540 001C9480 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801CC544 001C9484 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801CC540 001C9480 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801CC544 001C9484 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801CC548 001C9488 80 04 5C 68 */ lwz r0, 0x5c68(r4) /* 801CC54C 001C948C 7C 03 00 40 */ cmplw r3, r0 /* 801CC550 001C9490 41 82 00 54 */ beq lbl_801CC5A4 @@ -7002,8 +7002,8 @@ dMenu_Fmap_c_NS_drawIcon: /* 801CCB40 001C9A80 7F C3 F3 78 */ mr r3, r30 /* 801CCB44 001C9A84 48 00 03 55 */ bl dMenu_Fmap_c_NS_drawPlayEnterIcon lbl_801CCB48: -/* 801CCB48 001C9A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CCB4C 001C9A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CCB48 001C9A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CCB4C 001C9A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CCB50 001C9A90 88 03 00 7C */ lbz r0, 0x7c(r3) /* 801CCB54 001C9A94 28 00 00 00 */ cmplwi r0, 0 /* 801CCB58 001C9A98 41 82 00 44 */ beq lbl_801CCB9C @@ -7253,15 +7253,15 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCEA8 001C9DE8 93 C1 00 38 */ stw r30, 0x38(r1) /* 801CCEAC 001C9DEC 7C 7E 1B 78 */ mr r30, r3 /* 801CCEB0 001C9DF0 80 83 02 0C */ lwz r4, 0x20c(r3) -/* 801CCEB4 001C9DF4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 801CCEB8 001C9DF8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801CCEB4 001C9DF4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 801CCEB8 001C9DF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801CCEBC 001C9DFC 88 05 4E 0A */ lbz r0, 0x4e0a(r5) /* 801CCEC0 001C9E00 7C 05 07 74 */ extsb r5, r0 /* 801CCEC4 001C9E04 4B FF E3 FD */ bl dMenu_Fmap_c_NS_isRoomCheck /* 801CCEC8 001C9E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CCECC 001C9E0C 41 82 00 CC */ beq lbl_801CCF98 -/* 801CCED0 001C9E10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CCED4 001C9E14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CCED0 001C9E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CCED4 001C9E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CCED8 001C9E18 88 03 00 7C */ lbz r0, 0x7c(r3) /* 801CCEDC 001C9E1C 28 00 00 00 */ cmplwi r0, 0 /* 801CCEE0 001C9E20 41 82 00 48 */ beq lbl_801CCF28 @@ -7273,8 +7273,8 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCEF8 001C9E38 D0 01 00 20 */ stfs f0, 0x20(r1) /* 801CCEFC 001C9E3C C0 01 00 18 */ lfs f0, 0x18(r1) /* 801CCF00 001C9E40 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CCF04 001C9E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CCF08 001C9E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CCF04 001C9E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CCF08 001C9E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CCF0C 001C9E4C AB E3 0D BA */ lha r31, 0xdba(r3) /* 801CCF10 001C9E50 80 7E 00 8C */ lwz r3, 0x8c(r30) /* 801CCF14 001C9E54 4B FF 97 19 */ bl dMenuFmap_getStartStageName @@ -7699,8 +7699,8 @@ lbl_801CD4A0: /* 801CD4B0 001CA3F0 38 1F 00 01 */ addi r0, r31, 1 /* 801CD4B4 001CA3F4 7C 00 18 00 */ cmpw r0, r3 /* 801CD4B8 001CA3F8 40 82 00 DC */ bne lbl_801CD594 -/* 801CD4BC 001CA3FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CD4C0 001CA400 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CD4BC 001CA3FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CD4C0 001CA400 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CD4C4 001CA404 88 03 00 7C */ lbz r0, 0x7c(r3) /* 801CD4C8 001CA408 28 00 00 00 */ cmplwi r0, 0 /* 801CD4CC 001CA40C 41 82 00 3C */ beq lbl_801CD508 @@ -7795,8 +7795,8 @@ dMenu_Fmap_c_NS_tableArrowPosInit: lbl_801CD610: /* 801CD610 001CA550 2C 00 00 04 */ cmpwi r0, 4 /* 801CD614 001CA554 40 80 00 98 */ bge lbl_801CD6AC -/* 801CD618 001CA558 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CD61C 001CA55C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CD618 001CA558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CD61C 001CA55C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CD620 001CA560 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 801CD624 001CA564 7F A3 EB 78 */ mr r3, r29 /* 801CD628 001CA568 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -8042,8 +8042,8 @@ dMenu_Fmap_c_NS_getPlayerPos2D: /* 801CD964 001CA8A4 90 01 00 34 */ stw r0, 0x34(r1) /* 801CD968 001CA8A8 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801CD96C 001CA8AC 7C 7F 1B 78 */ mr r31, r3 -/* 801CD970 001CA8B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CD974 001CA8B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CD970 001CA8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CD974 001CA8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CD978 001CA8B8 88 03 00 7C */ lbz r0, 0x7c(r3) /* 801CD97C 001CA8BC 28 00 00 00 */ cmplwi r0, 0 /* 801CD980 001CA8C0 41 82 00 3C */ beq lbl_801CD9BC diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index e1a6ad8f3c..908bb26c4b 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -237,8 +237,8 @@ lbl_801CF6EC: /* 801CF8F8 001CC838 98 1F 12 3A */ stb r0, 0x123a(r31) /* 801CF8FC 001CC83C 98 9F 12 2F */ stb r4, 0x122f(r31) /* 801CF900 001CC840 38 7F 00 04 */ addi r3, r31, 4 -/* 801CF904 001CC844 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801CF908 001CC848 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 801CF904 001CC844 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801CF908 001CC848 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 801CF90C 001CC84C 80 9E 5C BC */ lwz r4, 0x5cbc(r30) /* 801CF910 001CC850 4B FF 2F C9 */ bl dMenuMapCommon_c_NS_initiate /* 801CF914 001CC854 38 60 01 18 */ li r3, 0x118 @@ -342,8 +342,8 @@ lbl_801CFA6C: /* 801CFA88 001CC9C8 7C 60 1B 78 */ mr r0, r3 lbl_801CFA8C: /* 801CFA8C 001CC9CC 90 1F 0C E0 */ stw r0, 0xce0(r31) -/* 801CFA90 001CC9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CFA94 001CC9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CFA90 001CC9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CFA94 001CC9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CFA98 001CC9D8 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801CFA9C 001CC9DC 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801CFAA0 001CC9E0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -672,8 +672,8 @@ lbl_801CFF18: /* 801CFF5C 001CCE9C 48 19 22 71 */ bl func_803621CC /* 801CFF60 001CCEA0 7C 7D 1B 78 */ mr r29, r3 /* 801CFF64 001CCEA4 48 00 3D 55 */ bl dMenu_Fmap2DBack_c_NS_calcBlink -/* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CFF6C 001CCEAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CFF6C 001CCEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CFF70 001CCEB0 83 C3 5F 50 */ lwz r30, 0x5f50(r3) /* 801CFF74 001CCEB4 7F C3 F3 78 */ mr r3, r30 /* 801CFF78 001CCEB8 81 9E 00 00 */ lwz r12, 0(r30) @@ -3271,8 +3271,8 @@ lbl_801D2590: /* 801D2598 001CF4D8 88 03 12 2C */ lbz r0, 0x122c(r3) /* 801D259C 001CF4DC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 801D25A0 001CF4E0 41 82 00 28 */ beq lbl_801D25C8 -/* 801D25A4 001CF4E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D25A8 001CF4E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D25A4 001CF4E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D25A8 001CF4E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D25AC 001CF4EC 38 63 00 64 */ addi r3, r3, 0x64 /* 801D25B0 001CF4F0 38 80 00 04 */ li r4, 4 /* 801D25B4 001CF4F4 4B E6 08 C5 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi @@ -3297,8 +3297,8 @@ lbl_801D25E8: /* 801D25F4 001CF534 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 801D25F8 001CF538 7C 60 00 39 */ and. r0, r3, r0 /* 801D25FC 001CF53C 41 82 00 28 */ beq lbl_801D2624 -/* 801D2600 001CF540 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D2604 001CF544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D2600 001CF540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D2604 001CF544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D2608 001CF548 38 63 00 64 */ addi r3, r3, 0x64 /* 801D260C 001CF54C 38 9F 00 01 */ addi r4, r31, 1 /* 801D2610 001CF550 4B E6 08 69 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi @@ -7040,8 +7040,8 @@ lbl_801D5C3C: /* 801D5C48 001D2B88 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801D5C4C 001D2B8C 38 84 00 85 */ addi r4, r4, 0x85 /* 801D5C50 001D2B90 3C A0 01 02 */ lis r5, 0x102 -/* 801D5C54 001D2B94 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 801D5C58 001D2B98 3B A6 61 C0 */ addi r29, r6, lbl_804061C0@l +/* 801D5C54 001D2B94 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 801D5C58 001D2B98 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 801D5C5C 001D2B9C 80 DD 5C BC */ lwz r6, 0x5cbc(r29) /* 801D5C60 001D2BA0 48 12 29 E9 */ bl J2DScreen_NS_setPriority /* 801D5C64 001D2BA4 80 7F 00 08 */ lwz r3, 8(r31) @@ -8164,8 +8164,8 @@ lbl_801D6C74: /* 801D6CA4 001D3BE4 93 E1 00 5C */ stw r31, 0x5c(r1) /* 801D6CA8 001D3BE8 93 C1 00 58 */ stw r30, 0x58(r1) /* 801D6CAC 001D3BEC 7C 7E 1B 78 */ mr r30, r3 -/* 801D6CB0 001D3BF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D6CB4 001D3BF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D6CB0 001D3BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D6CB4 001D3BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D6CB8 001D3BF8 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801D6CBC 001D3BFC 7F E3 FB 78 */ mr r3, r31 /* 801D6CC0 001D3C00 81 9F 00 00 */ lwz r12, 0(r31) @@ -9109,8 +9109,8 @@ lbl_801D79BC: /* 801D79CC 001D490C 38 60 00 00 */ li r3, 0 /* 801D79D0 001D4910 48 00 00 24 */ b lbl_801D79F4 lbl_801D79D4: -/* 801D79D4 001D4914 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D79D8 001D4918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D79D4 001D4914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D79D8 001D4918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D79DC 001D491C 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801D79E0 001D4920 38 80 00 00 */ li r4, 0 /* 801D79E4 001D4924 81 83 06 28 */ lwz r12, 0x628(r3) @@ -9195,8 +9195,8 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4: /* 801D7AEC 001D4A2C 38 60 00 00 */ li r3, 0 /* 801D7AF0 001D4A30 48 00 00 54 */ b lbl_801D7B44 lbl_801D7AF4: -/* 801D7AF4 001D4A34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D7AF8 001D4A38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D7AF4 001D4A34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D7AF8 001D4A38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D7AFC 001D4A3C 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801D7B00 001D4A40 7F E3 FB 78 */ mr r3, r31 /* 801D7B04 001D4A44 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -9229,8 +9229,8 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon: /* 801D7B5C 001D4A9C 7C 08 02 A6 */ mflr r0 /* 801D7B60 001D4AA0 90 01 00 14 */ stw r0, 0x14(r1) /* 801D7B64 001D4AA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D7B68 001D4AA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D7B6C 001D4AAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D7B68 001D4AA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D7B6C 001D4AAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D7B70 001D4AB0 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801D7B74 001D4AB4 7F E3 FB 78 */ mr r3, r31 /* 801D7B78 001D4AB8 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -9585,8 +9585,8 @@ dMenu_Fmap2DTop_c_NS_isWarpAccept: /* 801D8088 001D4FC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D808C 001D4FCC 7C 08 02 A6 */ mflr r0 /* 801D8090 001D4FD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D8094 001D4FD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D8098 001D4FD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D8094 001D4FD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D8098 001D4FD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D809C 001D4FDC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801D80A0 001D4FE0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D80A4 001D4FE4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 6885a81040..95d44837c8 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -36,8 +36,8 @@ dMenu_Insect_c: /* 801D8184 001D50C4 98 1F 00 FA */ stb r0, 0xfa(r31) /* 801D8188 001D50C8 98 1F 00 FB */ stb r0, 0xfb(r31) /* 801D818C 001D50CC 98 7F 00 F7 */ stb r3, 0xf7(r31) -/* 801D8190 001D50D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D8194 001D50D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D8190 001D50D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D8194 001D50D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D8198 001D50D8 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801D819C 001D50DC 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801D81A0 001D50E0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -348,8 +348,8 @@ lbl_801D85EC: /* 801D8608 001D5548 38 00 00 00 */ li r0, 0 /* 801D860C 001D554C 90 1E 00 08 */ stw r0, 8(r30) lbl_801D8610: -/* 801D8610 001D5550 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D8614 001D5554 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D8610 001D5550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D8614 001D5554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D8618 001D5558 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 801D861C 001D555C 81 83 00 00 */ lwz r12, 0(r3) /* 801D8620 001D5560 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -453,8 +453,8 @@ dMenu_Insect_c_NS__draw: /* 801D8778 001D56B8 80 03 00 08 */ lwz r0, 8(r3) /* 801D877C 001D56BC 28 00 00 00 */ cmplwi r0, 0 /* 801D8780 001D56C0 41 82 01 54 */ beq lbl_801D88D4 -/* 801D8784 001D56C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D8788 001D56C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D8784 001D56C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D8788 001D56C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D878C 001D56CC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801D8790 001D56D0 80 7E 00 60 */ lwz r3, 0x60(r30) /* 801D8794 001D56D4 38 80 00 FF */ li r4, 0xff @@ -1938,8 +1938,8 @@ dMenu_Insect_c_NS_getGetInsectNum: /* 801D9D68 001D6CA8 38 03 D8 7C */ addi r0, r3, lbl_803BD87C@l /* 801D9D6C 001D6CAC 7C 1D 03 78 */ mr r29, r0 /* 801D9D70 001D6CB0 3B 80 00 00 */ li r28, 0 -/* 801D9D74 001D6CB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D9D78 001D6CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D9D74 001D6CB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D9D78 001D6CB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D9D7C 001D6CBC 3B E3 00 CC */ addi r31, r3, 0xcc lbl_801D9D80: /* 801D9D80 001D6CC0 88 9D 00 00 */ lbz r4, 0(r29) @@ -1979,8 +1979,8 @@ dMenu_Insect_c_NS_isGetInsect: /* 801D9DEC 001D6D2C 90 01 00 14 */ stw r0, 0x14(r1) /* 801D9DF0 001D6D30 4B FF FF DD */ bl dMenu_Insect_c_NS_getInsectItemID /* 801D9DF4 001D6D34 7C 64 1B 78 */ mr r4, r3 -/* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D9E00 001D6D40 38 63 00 CC */ addi r3, r3, 0xcc /* 801D9E04 001D6D44 4B E5 A0 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801D9E08 001D6D48 30 03 FF FF */ addic r0, r3, -1 @@ -1995,8 +1995,8 @@ dMenu_Insect_c_NS_isGiveInsect: /* 801D9E20 001D6D60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9E24 001D6D64 7C 08 02 A6 */ mflr r0 /* 801D9E28 001D6D68 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9E2C 001D6D6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D9E30 001D6D70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D9E2C 001D6D6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D9E30 001D6D70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D9E34 001D6D74 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801D9E38 001D6D78 1C 05 00 06 */ mulli r0, r5, 6 /* 801D9E3C 001D6D7C 7C 04 02 14 */ add r0, r4, r0 @@ -2027,8 +2027,8 @@ dMenu_Insect_c_NS_isCatchInsect: /* 801D9E94 001D6DD4 41 80 00 2C */ blt lbl_801D9EC0 /* 801D9E98 001D6DD8 28 00 00 D7 */ cmplwi r0, 0xd7 /* 801D9E9C 001D6DDC 41 81 00 24 */ bgt lbl_801D9EC0 -/* 801D9EA0 001D6DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D9EA4 001D6DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D9EA0 001D6DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D9EA4 001D6DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D9EA8 001D6DE8 38 63 00 CC */ addi r3, r3, 0xcc /* 801D9EAC 001D6DEC 4B E5 A0 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801D9EB0 001D6DF0 30 03 FF FF */ addic r0, r3, -1 @@ -2053,8 +2053,8 @@ dMenu_Insect_c_NS_isGiveInsect_X1_: /* 801D9EE8 001D6E28 41 80 00 40 */ blt lbl_801D9F28 /* 801D9EEC 001D6E2C 28 04 00 D7 */ cmplwi r4, 0xd7 /* 801D9EF0 001D6E30 41 81 00 38 */ bgt lbl_801D9F28 -/* 801D9EF4 001D6E34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801D9EF8 001D6E38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801D9EF4 001D6E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801D9EF8 001D6E38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801D9EFC 001D6E3C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801D9F00 001D6E40 38 04 00 D1 */ addi r0, r4, 0xd1 /* 801D9F04 001D6E44 54 00 08 3C */ slwi r0, r0, 1 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index c8237aabd9..6f3f3c6355 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -388,8 +388,8 @@ lbl_801DD300: /* 801DD31C 001DA25C 38 00 00 00 */ li r0, 0 /* 801DD320 001DA260 90 1F 00 08 */ stw r0, 8(r31) lbl_801DD324: -/* 801DD324 001DA264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DD328 001DA268 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DD324 001DA264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DD328 001DA268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DD32C 001DA26C 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 801DD330 001DA270 81 83 00 00 */ lwz r12, 0(r3) /* 801DD334 001DA274 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -537,8 +537,8 @@ dMenu_Letter_c_NS__draw: /* 801DD534 001DA474 80 03 00 08 */ lwz r0, 8(r3) /* 801DD538 001DA478 28 00 00 00 */ cmplwi r0, 0 /* 801DD53C 001DA47C 41 82 03 D0 */ beq lbl_801DD90C -/* 801DD540 001DA480 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DD544 001DA484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DD540 001DA480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DD544 001DA484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DD548 001DA488 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801DD54C 001DA48C 80 7D 02 B4 */ lwz r3, 0x2b4(r29) /* 801DD550 001DA490 8B 83 00 B2 */ lbz r28, 0xb2(r3) @@ -824,8 +824,8 @@ dMenu_Letter_c_NS_letter_init_calc: /* 801DD970 001DA8B0 48 00 3D 09 */ bl dMenu_Letter_c_NS_getLetterNum /* 801DD974 001DA8B4 98 7F 03 75 */ stb r3, 0x375(r31) /* 801DD978 001DA8B8 38 C0 00 00 */ li r6, 0 -/* 801DD97C 001DA8BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DD980 001DA8C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DD97C 001DA8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DD980 001DA8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DD984 001DA8C4 38 A3 01 1C */ addi r5, r3, 0x11c /* 801DD988 001DA8C8 38 60 00 FF */ li r3, 0xff /* 801DD98C 001DA8CC 38 00 00 36 */ li r0, 0x36 @@ -1340,8 +1340,8 @@ lbl_801DE0A0: /* 801DE0F4 001DB034 38 03 00 01 */ addi r0, r3, 1 /* 801DE0F8 001DB038 1C 00 00 64 */ mulli r0, r0, 0x64 /* 801DE0FC 001DB03C 7C 04 02 14 */ add r0, r4, r0 -/* 801DE100 001DB040 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DE104 001DB044 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DE100 001DB040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DE104 001DB044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DE108 001DB048 90 03 5E 0C */ stw r0, 0x5e0c(r3) /* 801DE10C 001DB04C 80 7E 03 10 */ lwz r3, 0x310(r30) /* 801DE110 001DB050 38 80 04 D6 */ li r4, 0x4d6 @@ -1594,8 +1594,8 @@ lbl_801DE4BC: /* 801DE4C8 001DB408 38 63 00 04 */ addi r3, r3, 4 /* 801DE4CC 001DB40C 42 00 FF F0 */ bdnz lbl_801DE4BC lbl_801DE4D0: -/* 801DE4D0 001DB410 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DE4D4 001DB414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DE4D0 001DB410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DE4D4 001DB414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DE4D8 001DB418 3B 43 01 1C */ addi r26, r3, 0x11c /* 801DE4DC 001DB41C 7F 43 D3 78 */ mr r3, r26 /* 801DE4E0 001DB420 7F C4 F3 78 */ mr r4, r30 @@ -3129,8 +3129,8 @@ lbl_801DFB2C: /* 801DFBC8 001DCB08 38 03 00 01 */ addi r0, r3, 1 /* 801DFBCC 001DCB0C 1C 00 00 64 */ mulli r0, r0, 0x64 /* 801DFBD0 001DCB10 7C 04 02 14 */ add r0, r4, r0 -/* 801DFBD4 001DCB14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DFBD8 001DCB18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DFBD4 001DCB14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DFBD8 001DCB18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DFBDC 001DCB1C 90 03 5E 0C */ stw r0, 0x5e0c(r3) /* 801DFBE0 001DCB20 80 7F 03 10 */ lwz r3, 0x310(r31) /* 801DFBE4 001DCB24 38 80 04 D6 */ li r4, 0x4d6 @@ -3987,8 +3987,8 @@ lbl_801E0884: /* 801E08BC 001DD7FC 2C 1B 00 02 */ cmpwi r27, 2 /* 801E08C0 001DD800 3B DE 00 04 */ addi r30, r30, 4 /* 801E08C4 001DD804 41 80 FF 8C */ blt lbl_801E0850 -/* 801E08C8 001DD808 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E08CC 001DD80C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E08C8 001DD808 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E08CC 001DD80C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E08D0 001DD810 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801E08D4 001DD814 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801E08D8 001DD818 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -4452,8 +4452,8 @@ lbl_801E0F8C: /* 801E0F94 001DDED4 41 80 FF 28 */ blt lbl_801E0EBC /* 801E0F98 001DDED8 3B A0 00 00 */ li r29, 0 /* 801E0F9C 001DDEDC 3B 60 00 00 */ li r27, 0 -/* 801E0FA0 001DDEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E0FA4 001DDEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E0FA0 001DDEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E0FA4 001DDEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E0FA8 001DDEE8 3B E3 01 1C */ addi r31, r3, 0x11c lbl_801E0FAC: /* 801E0FAC 001DDEEC 88 1C 03 73 */ lbz r0, 0x373(r28) @@ -4570,8 +4570,8 @@ lbl_801E1140: /* 801E1148 001DE088 41 80 FF 28 */ blt lbl_801E1070 /* 801E114C 001DE08C 3B A0 00 00 */ li r29, 0 /* 801E1150 001DE090 3B 60 00 00 */ li r27, 0 -/* 801E1154 001DE094 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E1158 001DE098 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E1154 001DE094 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E1158 001DE098 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E115C 001DE09C 3B E3 01 1C */ addi r31, r3, 0x11c lbl_801E1160: /* 801E1160 001DE0A0 88 1C 03 73 */ lbz r0, 0x373(r28) @@ -4946,8 +4946,8 @@ dMenu_Letter_c_NS_getLetterNum: /* 801E16A0 001DE5E0 40 81 00 84 */ ble lbl_801E1724 /* 801E16A4 001DE5E4 3B 40 00 00 */ li r26, 0 /* 801E16A8 001DE5E8 3B E0 00 00 */ li r31, 0 -/* 801E16AC 001DE5EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E16B0 001DE5F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E16AC 001DE5EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E16B0 001DE5F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E16B4 001DE5F4 3B 83 01 1C */ addi r28, r3, 0x11c /* 801E16B8 001DE5F8 3C 60 80 3C */ lis r3, lbl_803BF81C@ha /* 801E16BC 001DE5FC 3B C3 F8 1C */ addi r30, r3, lbl_803BF81C@l diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index f2f3cbfafe..450d029102 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -490,8 +490,8 @@ lbl_801E2540: /* 801E2634 001DF574 7F E3 FB 78 */ mr r3, r31 /* 801E2638 001DF578 38 80 03 F9 */ li r4, 0x3f9 /* 801E263C 001DF57C 48 00 59 61 */ bl dMenu_Option_c_NS_setBButtonString -/* 801E2640 001DF580 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E2644 001DF584 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E2640 001DF580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E2644 001DF584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E2648 001DF588 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801E264C 001DF58C 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801E2650 001DF590 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1440,8 +1440,8 @@ lbl_801E33BC: /* 801E33DC 001E031C 90 1F 00 50 */ stw r0, 0x50(r31) lbl_801E33E0: /* 801E33E0 001E0320 38 00 00 00 */ li r0, 0 -/* 801E33E4 001E0324 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E33E8 001E0328 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E33E4 001E0324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E33E8 001E0328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E33EC 001E032C 90 03 5C C4 */ stw r0, 0x5cc4(r3) /* 801E33F0 001E0330 39 61 00 30 */ addi r11, r1, 0x30 /* 801E33F4 001E0334 48 17 EE 21 */ bl func_80362214 @@ -1648,8 +1648,8 @@ dMenu_Option_c_NS__draw: /* 801E36E4 001E0624 80 03 00 50 */ lwz r0, 0x50(r3) /* 801E36E8 001E0628 28 00 00 00 */ cmplwi r0, 0 /* 801E36EC 001E062C 41 82 01 C8 */ beq lbl_801E38B4 -/* 801E36F0 001E0630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E36F4 001E0634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E36F0 001E0630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E36F4 001E0634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E36F8 001E0638 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801E36FC 001E063C 80 7E 00 38 */ lwz r3, 0x38(r30) /* 801E3700 001E0640 38 80 00 FF */ li r4, 0xff @@ -1995,8 +1995,8 @@ lbl_801E3BE0: /* 801E3BE4 001E0B24 88 04 00 0C */ lbz r0, 0xc(r4) /* 801E3BE8 001E0B28 2C 00 00 00 */ cmpwi r0, 0 /* 801E3BEC 001E0B2C 41 82 00 58 */ beq lbl_801E3C44 -/* 801E3BF0 001E0B30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E3BF4 001E0B34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E3BF0 001E0B30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E3BF4 001E0B34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E3BF8 001E0B38 80 03 5C C4 */ lwz r0, 0x5cc4(r3) /* 801E3BFC 001E0B3C 28 00 00 00 */ cmplwi r0, 0 /* 801E3C00 001E0B40 40 82 00 4C */ bne lbl_801E3C4C @@ -3384,8 +3384,8 @@ lbl_801E5020: /* 801E5050 001E1F90 40 82 00 78 */ bne lbl_801E50C8 /* 801E5054 001E1F94 38 00 00 03 */ li r0, 3 /* 801E5058 001E1F98 98 1F 03 EC */ stb r0, 0x3ec(r31) -/* 801E505C 001E1F9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E5060 001E1FA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E505C 001E1F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E5060 001E1FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E5064 001E1FA4 3B C3 01 E0 */ addi r30, r3, 0x1e0 /* 801E5068 001E1FA8 88 1F 03 E4 */ lbz r0, 0x3e4(r31) /* 801E506C 001E1FAC 98 03 01 E2 */ stb r0, 0x1e2(r3) @@ -3400,8 +3400,8 @@ lbl_801E508C: /* 801E508C 001E1FCC 7F C3 F3 78 */ mr r3, r30 /* 801E5090 001E1FD0 88 9F 03 E9 */ lbz r4, 0x3e9(r31) /* 801E5094 001E1FD4 4B E4 F5 F9 */ bl setSound__19dSv_player_config_cFUc -/* 801E5098 001E1FD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E509C 001E1FDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E5098 001E1FD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E509C 001E1FDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E50A0 001E1FE0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801E50A4 001E1FE4 88 9F 03 EA */ lbz r4, 0x3ea(r31) /* 801E50A8 001E1FE8 4B E4 63 01 */ bl dComIfG_play_c_NS_setNowVibration @@ -3429,8 +3429,8 @@ lbl_801E50F0: /* 801E50F8 001E2038 40 82 00 88 */ bne lbl_801E5180 /* 801E50FC 001E203C 38 00 00 03 */ li r0, 3 /* 801E5100 001E2040 98 1F 03 EC */ stb r0, 0x3ec(r31) -/* 801E5104 001E2044 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E5108 001E2048 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E5104 001E2044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E5108 001E2048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E510C 001E204C 3B C3 01 E0 */ addi r30, r3, 0x1e0 /* 801E5110 001E2050 7F C3 F3 78 */ mr r3, r30 /* 801E5114 001E2054 4B E4 F5 71 */ bl getSound__19dSv_player_config_cFv @@ -6801,8 +6801,8 @@ dMenu_Option_c_NS_initialize: /* 801E8218 001E5158 90 01 00 14 */ stw r0, 0x14(r1) /* 801E821C 001E515C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801E8220 001E5160 7C 7F 1B 78 */ mr r31, r3 -/* 801E8224 001E5164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E8228 001E5168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E8224 001E5164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E8228 001E5168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E822C 001E516C 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 801E8230 001E5170 88 03 00 02 */ lbz r0, 2(r3) /* 801E8234 001E5174 98 1F 03 E4 */ stb r0, 0x3e4(r31) @@ -6819,8 +6819,8 @@ dMenu_Option_c_NS_initialize: /* 801E8260 001E51A0 4B FF FE 41 */ bl dMenu_Option_c_NS_isRumbleSupported /* 801E8264 001E51A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E8268 001E51A8 41 82 00 1C */ beq lbl_801E8284 -/* 801E826C 001E51AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E8270 001E51B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E826C 001E51AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E8270 001E51B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E8274 001E51B4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801E8278 001E51B8 4B E4 31 39 */ bl dComIfG_play_c_NS_getNowVibration /* 801E827C 001E51BC 98 7F 03 EA */ stb r3, 0x3ea(r31) diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 6efc378247..1b19b4fd3b 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -94,8 +94,8 @@ lbl_801E9224: /* 801E9258 001E6198 D0 3F 06 1C */ stfs f1, 0x61c(r31) /* 801E925C 001E619C D0 3F 06 20 */ stfs f1, 0x620(r31) /* 801E9260 001E61A0 D0 3F 06 24 */ stfs f1, 0x624(r31) -/* 801E9264 001E61A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E9268 001E61A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E9264 001E61A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E9268 001E61A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E926C 001E61AC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801E9270 001E61B0 80 03 05 74 */ lwz r0, 0x574(r3) /* 801E9274 001E61B4 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 @@ -273,8 +273,8 @@ lbl_801E94A4: /* 801E94F4 001E6434 38 A5 00 04 */ addi r5, r5, 4 /* 801E94F8 001E6438 41 80 FF 8C */ blt lbl_801E9484 /* 801E94FC 001E643C 3A 60 00 00 */ li r19, 0 -/* 801E9500 001E6440 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E9504 001E6444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801E9500 001E6440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E9504 001E6444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E9508 001E6448 3B A3 00 9C */ addi r29, r3, 0x9c lbl_801E950C: /* 801E950C 001E644C 7F A3 EB 78 */ mr r3, r29 @@ -310,8 +310,8 @@ lbl_801E955C: /* 801E9574 001E64B4 2C 13 00 18 */ cmpwi r19, 0x18 /* 801E9578 001E64B8 41 80 FF E4 */ blt lbl_801E955C /* 801E957C 001E64BC 3A C0 00 00 */ li r22, 0 -/* 801E9580 001E64C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E9584 001E64C4 3A A3 61 C0 */ addi r21, r3, lbl_804061C0@l +/* 801E9580 001E64C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E9584 001E64C4 3A A3 61 C0 */ addi r21, r3, g_dComIfG_gameInfo@l /* 801E9588 001E64C8 7E B3 AB 78 */ mr r19, r21 /* 801E958C 001E64CC 48 00 00 A0 */ b lbl_801E962C lbl_801E9590: @@ -454,8 +454,8 @@ lbl_801E973C: /* 801E9784 001E66C4 3A B5 00 0C */ addi r21, r21, 0xc /* 801E9788 001E66C8 3B 18 00 18 */ addi r24, r24, 0x18 /* 801E978C 001E66CC 41 80 FE F4 */ blt lbl_801E9680 -/* 801E9790 001E66D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801E9794 001E66D4 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 801E9790 001E66D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801E9794 001E66D4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 801E9798 001E66D8 82 7B 5D 30 */ lwz r19, 0x5d30(r27) /* 801E979C 001E66DC 38 60 00 00 */ li r3, 0 /* 801E97A0 001E66E0 48 03 4B 29 */ bl dMeter2Info_getNumberTextureName @@ -507,8 +507,8 @@ lbl_801E9838: /* 801E9848 001E6788 3C C0 80 39 */ lis r6, lbl_803978C8@ha /* 801E984C 001E678C 38 C6 78 C8 */ addi r6, r6, lbl_803978C8@l /* 801E9850 001E6790 3C E0 00 02 */ lis r7, 2 -/* 801E9854 001E6794 3D 00 80 40 */ lis r8, lbl_804061C0@ha -/* 801E9858 001E6798 3B 88 61 C0 */ addi r28, r8, lbl_804061C0@l +/* 801E9854 001E6794 3D 00 80 40 */ lis r8, g_dComIfG_gameInfo@ha +/* 801E9858 001E6798 3B 88 61 C0 */ addi r28, r8, g_dComIfG_gameInfo@l /* 801E985C 001E679C 81 1C 5C E8 */ lwz r8, 0x5ce8(r28) /* 801E9860 001E67A0 48 06 B9 25 */ bl dPaneClass_setPriority /* 801E9864 001E67A4 80 7F 00 58 */ lwz r3, 0x58(r31) @@ -1778,8 +1778,8 @@ lbl_801EAB04: lbl_801EAB2C: /* 801EAB2C 001E7A6C 38 00 00 00 */ li r0, 0 /* 801EAB30 001E7A70 90 1F 03 70 */ stw r0, 0x370(r31) -/* 801EAB34 001E7A74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EAB38 001E7A78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EAB34 001E7A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EAB38 001E7A78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EAB3C 001E7A7C 80 63 5C E8 */ lwz r3, 0x5ce8(r3) /* 801EAB40 001E7A80 81 83 00 00 */ lwz r12, 0(r3) /* 801EAB44 001E7A84 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1902,8 +1902,8 @@ dMenu_Ring_c_NS__draw: /* 801EACDC 001E7C1C 93 E1 00 9C */ stw r31, 0x9c(r1) /* 801EACE0 001E7C20 93 C1 00 98 */ stw r30, 0x98(r1) /* 801EACE4 001E7C24 7C 7E 1B 78 */ mr r30, r3 -/* 801EACE8 001E7C28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EACEC 001E7C2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EACE8 001E7C28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EACEC 001E7C2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EACF0 001E7C30 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801EACF4 001E7C34 7F E3 FB 78 */ mr r3, r31 /* 801EACF8 001E7C38 81 9F 00 00 */ lwz r12, 0(r31) @@ -2268,8 +2268,8 @@ lbl_801EB20C: /* 801EB22C 001E816C EC 01 00 2A */ fadds f0, f1, f0 /* 801EB230 001E8170 D0 03 00 58 */ stfs f0, 0x58(r3) /* 801EB234 001E8174 D0 43 00 5C */ stfs f2, 0x5c(r3) -/* 801EB238 001E8178 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EB23C 001E817C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EB238 001E8178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EB23C 001E817C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EB240 001E8180 38 63 00 9C */ addi r3, r3, 0x9c /* 801EB244 001E8184 88 9E 06 90 */ lbz r4, 0x690(r30) /* 801EB248 001E8188 38 A0 00 00 */ li r5, 0 @@ -2505,8 +2505,8 @@ lbl_801EB564: /* 801EB588 001E84C8 EC 01 00 2A */ fadds f0, f1, f0 /* 801EB58C 001E84CC D0 04 00 58 */ stfs f0, 0x58(r4) /* 801EB590 001E84D0 D0 44 00 5C */ stfs f2, 0x5c(r4) -/* 801EB594 001E84D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EB598 001E84D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EB594 001E84D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EB598 001E84D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EB59C 001E84DC 38 63 00 9C */ addi r3, r3, 0x9c /* 801EB5A0 001E84E0 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EB5A4 001E84E4 7C 9E 02 14 */ add r4, r30, r0 @@ -2961,8 +2961,8 @@ lbl_801EBBB4: /* 801EBBD4 001E8B14 88 1E 06 B3 */ lbz r0, 0x6b3(r30) /* 801EBBD8 001E8B18 28 00 00 00 */ cmplwi r0, 0 /* 801EBBDC 001E8B1C 40 82 01 18 */ bne lbl_801EBCF4 -/* 801EBBE0 001E8B20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBBE4 001E8B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBBE0 001E8B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBBE4 001E8B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBBE8 001E8B28 38 80 00 01 */ li r4, 1 /* 801EBBEC 001E8B2C 4B E4 6E 71 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBBF0 001E8B30 88 1E 06 A8 */ lbz r0, 0x6a8(r30) @@ -2971,8 +2971,8 @@ lbl_801EBBB4: /* 801EBBFC 001E8B3C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EBC00 001E8B40 7C 04 00 40 */ cmplw r4, r0 /* 801EBC04 001E8B44 40 82 00 64 */ bne lbl_801EBC68 -/* 801EBC08 001E8B48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBC0C 001E8B4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBC08 001E8B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBC0C 001E8B4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBC10 001E8B50 38 80 00 00 */ li r4, 0 /* 801EBC14 001E8B54 4B E4 6E 49 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBC18 001E8B58 7C 7A 1B 78 */ mr r26, r3 @@ -3006,8 +3006,8 @@ lbl_801EBC68: /* 801EBC7C 001E8BBC 88 03 06 90 */ lbz r0, 0x690(r3) /* 801EBC80 001E8BC0 7C 00 20 40 */ cmplw r0, r4 /* 801EBC84 001E8BC4 40 82 00 58 */ bne lbl_801EBCDC -/* 801EBC88 001E8BC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBC8C 001E8BCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBC88 001E8BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBC8C 001E8BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBC90 001E8BD0 38 80 00 00 */ li r4, 0 /* 801EBC94 001E8BD4 4B E4 6D C9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBC98 001E8BD8 7C 7B 1B 78 */ mr r27, r3 @@ -3039,8 +3039,8 @@ lbl_801EBCDC: lbl_801EBCF4: /* 801EBCF4 001E8C34 28 00 00 01 */ cmplwi r0, 1 /* 801EBCF8 001E8C38 40 82 01 14 */ bne lbl_801EBE0C -/* 801EBCFC 001E8C3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBD00 001E8C40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBCFC 001E8C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBD00 001E8C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBD04 001E8C44 38 80 00 00 */ li r4, 0 /* 801EBD08 001E8C48 4B E4 6D 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBD0C 001E8C4C 88 1E 06 A8 */ lbz r0, 0x6a8(r30) @@ -3049,8 +3049,8 @@ lbl_801EBCF4: /* 801EBD18 001E8C58 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EBD1C 001E8C5C 7C 04 00 40 */ cmplw r4, r0 /* 801EBD20 001E8C60 40 82 00 64 */ bne lbl_801EBD84 -/* 801EBD24 001E8C64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBD28 001E8C68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBD24 001E8C64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBD28 001E8C68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBD2C 001E8C6C 38 80 00 01 */ li r4, 1 /* 801EBD30 001E8C70 4B E4 6D 2D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBD34 001E8C74 7C 79 1B 78 */ mr r25, r3 @@ -3084,8 +3084,8 @@ lbl_801EBD84: /* 801EBD98 001E8CD8 88 03 06 90 */ lbz r0, 0x690(r3) /* 801EBD9C 001E8CDC 7C 00 20 40 */ cmplw r0, r4 /* 801EBDA0 001E8CE0 40 82 00 58 */ bne lbl_801EBDF8 -/* 801EBDA4 001E8CE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBDA8 001E8CE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBDA4 001E8CE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBDA8 001E8CE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBDAC 001E8CEC 38 80 00 01 */ li r4, 1 /* 801EBDB0 001E8CF0 4B E4 6C AD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBDB4 001E8CF4 7C 7C 1B 78 */ mr r28, r3 @@ -3241,8 +3241,8 @@ lbl_801EBFB8: /* 801EBFD0 001E8F10 D0 1E 05 38 */ stfs f0, 0x538(r30) /* 801EBFD4 001E8F14 C0 03 00 1C */ lfs f0, 0x1c(r3) /* 801EBFD8 001E8F18 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 801EBFDC 001E8F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EBFE0 001E8F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EBFDC 001E8F1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EBFE0 001E8F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EBFE4 001E8F24 38 80 00 00 */ li r4, 0 /* 801EBFE8 001E8F28 4B E4 6A 75 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBFEC 001E8F2C 88 9E 06 B4 */ lbz r4, 0x6b4(r30) @@ -3268,8 +3268,8 @@ lbl_801EC020: /* 801EC034 001E8F74 D0 1E 05 38 */ stfs f0, 0x538(r30) /* 801EC038 001E8F78 C0 03 00 14 */ lfs f0, 0x14(r3) /* 801EC03C 001E8F7C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 801EC040 001E8F80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC044 001E8F84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC040 001E8F80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC044 001E8F84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC048 001E8F88 38 80 00 01 */ li r4, 1 /* 801EC04C 001E8F8C 4B E4 6A 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC050 001E8F90 88 9E 06 B5 */ lbz r4, 0x6b5(r30) @@ -3406,8 +3406,8 @@ dMenu_Ring_c_NS_setScale: /* 801EC224 001E9164 3B E0 00 00 */ li r31, 0 /* 801EC228 001E9168 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801EC22C 001E916C 3B 83 FA FC */ addi r28, r3, lbl_8042FAFC@l -/* 801EC230 001E9170 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC234 001E9174 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC230 001E9170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC234 001E9174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC238 001E9178 3B 63 00 9C */ addi r27, r3, 0x9c /* 801EC23C 001E917C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801EC240 001E9180 3B A3 01 88 */ addi r29, r3, lbl_80430188@l @@ -3618,8 +3618,8 @@ dMenu_Ring_c_NS_setActiveCursor: /* 801EC510 001E9450 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801EC514 001E9454 93 C1 00 18 */ stw r30, 0x18(r1) /* 801EC518 001E9458 7C 7F 1B 78 */ mr r31, r3 -/* 801EC51C 001E945C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC520 001E9460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC51C 001E945C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC520 001E9460 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC524 001E9464 38 63 00 9C */ addi r3, r3, 0x9c /* 801EC528 001E9468 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801EC52C 001E946C 7C 9F 02 14 */ add r4, r31, r0 @@ -3777,8 +3777,8 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC760 001E96A0 39 61 00 40 */ addi r11, r1, 0x40 /* 801EC764 001E96A4 48 17 5A 71 */ bl _savegpr_27 /* 801EC768 001E96A8 7C 7B 1B 78 */ mr r27, r3 -/* 801EC76C 001E96AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC770 001E96B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC76C 001E96AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC770 001E96B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC774 001E96B4 38 63 00 9C */ addi r3, r3, 0x9c /* 801EC778 001E96B8 88 1B 06 A8 */ lbz r0, 0x6a8(r27) /* 801EC77C 001E96BC 7C 9B 02 14 */ add r4, r27, r0 @@ -3787,13 +3787,13 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC788 001E96C8 4B E4 68 A9 */ bl getItem__17dSv_player_item_cCFib /* 801EC78C 001E96CC 7C 7F 1B 78 */ mr r31, r3 /* 801EC790 001E96D0 3B 80 00 00 */ li r28, 0 -/* 801EC794 001E96D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC798 001E96D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC794 001E96D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC798 001E96D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC79C 001E96DC 38 80 00 00 */ li r4, 0 /* 801EC7A0 001E96E0 4B E4 62 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7A4 001E96E4 7C 7E 1B 78 */ mr r30, r3 -/* 801EC7A8 001E96E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC7AC 001E96EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC7A8 001E96E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC7AC 001E96EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC7B0 001E96F0 38 80 00 01 */ li r4, 1 /* 801EC7B4 001E96F4 4B E4 62 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7B8 001E96F8 7C 7D 1B 78 */ mr r29, r3 @@ -3804,8 +3804,8 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC7CC 001E970C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC7D0 001E9710 28 00 00 04 */ cmplwi r0, 4 /* 801EC7D4 001E9714 40 82 00 94 */ bne lbl_801EC868 -/* 801EC7D8 001E9718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC7DC 001E971C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC7D8 001E9718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC7DC 001E971C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC7E0 001E9720 38 80 00 00 */ li r4, 0 /* 801EC7E4 001E9724 4B E4 62 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7E8 001E9728 88 1B 06 A8 */ lbz r0, 0x6a8(r27) @@ -3846,8 +3846,8 @@ lbl_801EC868: /* 801EC870 001E97B0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC874 001E97B4 28 00 00 04 */ cmplwi r0, 4 /* 801EC878 001E97B8 40 82 00 94 */ bne lbl_801EC90C -/* 801EC87C 001E97BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC880 001E97C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC87C 001E97BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC880 001E97C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC884 001E97C4 38 80 00 01 */ li r4, 1 /* 801EC888 001E97C8 4B E4 61 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC88C 001E97CC 88 1B 06 A8 */ lbz r0, 0x6a8(r27) @@ -3893,8 +3893,8 @@ lbl_801EC924: /* 801EC924 001E9864 2C 00 00 73 */ cmpwi r0, 0x73 /* 801EC928 001E9868 40 80 01 98 */ bge lbl_801ECAC0 lbl_801EC92C: -/* 801EC92C 001E986C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC930 001E9870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC92C 001E986C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC930 001E9870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EC934 001E9874 38 80 00 00 */ li r4, 0 /* 801EC938 001E9878 4B E4 61 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC93C 001E987C 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3947,8 +3947,8 @@ lbl_801EC970: /* 801EC9F0 001E9930 98 BB 06 AB */ stb r5, 0x6ab(r27) /* 801EC9F4 001E9934 48 00 00 CC */ b lbl_801ECAC0 lbl_801EC9F8: -/* 801EC9F8 001E9938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EC9FC 001E993C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EC9F8 001E9938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EC9FC 001E993C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ECA00 001E9940 38 80 00 01 */ li r4, 1 /* 801ECA04 001E9944 4B E4 60 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801ECA08 001E9948 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -4110,8 +4110,8 @@ lbl_801ECC00: /* 801ECC4C 001E9B8C 3B A0 00 00 */ li r29, 0 /* 801ECC50 001E9B90 3B 40 00 00 */ li r26, 0 /* 801ECC54 001E9B94 3B 20 00 00 */ li r25, 0 -/* 801ECC58 001E9B98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ECC5C 001E9B9C 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l +/* 801ECC58 001E9B98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ECC5C 001E9B9C 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 801ECC60 001E9BA0 3A 77 00 9C */ addi r19, r23, 0x9c /* 801ECC64 001E9BA4 48 00 02 F4 */ b lbl_801ECF58 lbl_801ECC68: @@ -4380,8 +4380,8 @@ lbl_801ECFE4: /* 801ED044 001E9F84 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801ED048 001E9F88 3B C3 FA FC */ addi r30, r3, lbl_8042FAFC@l /* 801ED04C 001E9F8C 7F 57 A2 14 */ add r26, r23, r20 -/* 801ED050 001E9F90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ED054 001E9F94 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801ED050 001E9F90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ED054 001E9F94 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801ED058 001E9F98 3B 9F 00 9C */ addi r28, r31, 0x9c /* 801ED05C 001E9F9C 3B 79 06 90 */ addi r27, r25, 0x690 lbl_801ED060: @@ -4576,8 +4576,8 @@ lbl_801ED30C: /* 801ED328 001EA268 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801ED32C 001EA26C 93 C1 00 18 */ stw r30, 0x18(r1) /* 801ED330 001EA270 7C 7F 1B 78 */ mr r31, r3 -/* 801ED334 001EA274 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ED338 001EA278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ED334 001EA274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ED338 001EA278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ED33C 001EA27C 38 63 00 9C */ addi r3, r3, 0x9c /* 801ED340 001EA280 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801ED344 001EA284 7C 9F 02 14 */ add r4, r31, r0 @@ -4836,8 +4836,8 @@ lbl_801ED6B4: /* 801ED6F4 001EA634 C0 03 03 8C */ lfs f0, 0x38c(r3) /* 801ED6F8 001EA638 D0 04 00 58 */ stfs f0, 0x58(r4) /* 801ED6FC 001EA63C D0 24 00 5C */ stfs f1, 0x5c(r4) -/* 801ED700 001EA640 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ED704 001EA644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ED700 001EA640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ED704 001EA644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ED708 001EA648 38 63 00 9C */ addi r3, r3, 0x9c /* 801ED70C 001EA64C 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801ED710 001EA650 7C 9F 02 14 */ add r4, r31, r0 @@ -4924,8 +4924,8 @@ lbl_801ED7FC: /* 801ED834 001EA774 C0 03 03 8C */ lfs f0, 0x38c(r3) /* 801ED838 001EA778 D0 04 00 58 */ stfs f0, 0x58(r4) /* 801ED83C 001EA77C D0 24 00 5C */ stfs f1, 0x5c(r4) -/* 801ED840 001EA780 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801ED844 001EA784 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801ED840 001EA780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801ED844 001EA784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801ED848 001EA788 38 63 00 9C */ addi r3, r3, 0x9c /* 801ED84C 001EA78C 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801ED850 001EA790 7C 9F 02 14 */ add r4, r31, r0 @@ -5452,8 +5452,8 @@ dMenu_Ring_c_NS_getCursorPos: /* 801EDFEC 001EAF2C 48 17 41 ED */ bl _savegpr_28 /* 801EDFF0 001EAF30 7C 7C 1B 78 */ mr r28, r3 /* 801EDFF4 001EAF34 3B A0 00 00 */ li r29, 0 -/* 801EDFF8 001EAF38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EDFFC 001EAF3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EDFF8 001EAF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EDFFC 001EAF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE000 001EAF40 3B C3 00 9C */ addi r30, r3, 0x9c /* 801EE004 001EAF44 54 9F 06 3E */ clrlwi r31, r4, 0x18 /* 801EE008 001EAF48 48 00 00 28 */ b lbl_801EE030 @@ -5487,8 +5487,8 @@ dMenu_Ring_c_NS_getItemNum: /* 801EE05C 001EAF9C 7C 08 02 A6 */ mflr r0 /* 801EE060 001EAFA0 90 01 00 14 */ stw r0, 0x14(r1) /* 801EE064 001EAFA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801EE068 001EAFA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE06C 001EAFAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE068 001EAFA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE06C 001EAFAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE070 001EAFB0 38 63 00 9C */ addi r3, r3, 0x9c /* 801EE074 001EAFB4 54 9F 06 3E */ clrlwi r31, r4, 0x18 /* 801EE078 001EAFB8 7F E4 FB 78 */ mr r4, r31 @@ -5524,8 +5524,8 @@ lbl_801EE0E0: /* 801EE0E0 001EB020 38 80 00 00 */ li r4, 0 /* 801EE0E4 001EB024 48 00 00 60 */ b lbl_801EE144 lbl_801EE0E8: -/* 801EE0E8 001EB028 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE0EC 001EB02C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE0E8 001EB028 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE0EC 001EB02C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE0F0 001EB030 38 63 00 EC */ addi r3, r3, 0xec /* 801EE0F4 001EB034 38 1F FF F1 */ addi r0, r31, -15 /* 801EE0F8 001EB038 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -5533,8 +5533,8 @@ lbl_801EE0E8: /* 801EE100 001EB040 7C 64 1B 78 */ mr r4, r3 /* 801EE104 001EB044 48 00 00 40 */ b lbl_801EE144 lbl_801EE108: -/* 801EE108 001EB048 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE10C 001EB04C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE108 001EB048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE10C 001EB04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE110 001EB050 38 63 00 EC */ addi r3, r3, 0xec /* 801EE114 001EB054 38 1F FF F5 */ addi r0, r31, -11 /* 801EE118 001EB058 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -5542,13 +5542,13 @@ lbl_801EE108: /* 801EE120 001EB060 7C 64 1B 78 */ mr r4, r3 /* 801EE124 001EB064 48 00 00 20 */ b lbl_801EE144 lbl_801EE128: -/* 801EE128 001EB068 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE12C 001EB06C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE128 001EB068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE12C 001EB06C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE130 001EB070 88 83 00 EC */ lbz r4, 0xec(r3) /* 801EE134 001EB074 48 00 00 10 */ b lbl_801EE144 lbl_801EE138: -/* 801EE138 001EB078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE13C 001EB07C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE138 001EB078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE13C 001EB07C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE140 001EB080 88 83 00 F4 */ lbz r4, 0xf4(r3) lbl_801EE144: /* 801EE144 001EB084 7C 83 23 78 */ mr r3, r4 @@ -5563,8 +5563,8 @@ dMenu_Ring_c_NS_getItemMaxNum: /* 801EE15C 001EB09C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EE160 001EB0A0 7C 08 02 A6 */ mflr r0 /* 801EE164 001EB0A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EE168 001EB0A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE16C 001EB0AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE168 001EB0A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE16C 001EB0AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE170 001EB0B0 38 63 00 9C */ addi r3, r3, 0x9c /* 801EE174 001EB0B4 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 801EE178 001EB0B8 38 A0 00 00 */ li r5, 0 @@ -5600,8 +5600,8 @@ lbl_801EE1E0: /* 801EE1E0 001EB120 38 60 00 01 */ li r3, 1 /* 801EE1E4 001EB124 48 00 00 34 */ b lbl_801EE218 lbl_801EE1E8: -/* 801EE1E8 001EB128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE1EC 001EB12C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE1E8 001EB128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE1EC 001EB12C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE1F0 001EB130 38 63 00 F8 */ addi r3, r3, 0xf8 /* 801EE1F4 001EB134 4B E4 5F 05 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 801EE1F8 001EB138 48 00 00 20 */ b lbl_801EE218 @@ -5609,8 +5609,8 @@ lbl_801EE1FC: /* 801EE1FC 001EB13C 4B E4 03 BD */ bl dComIfGs_getBottleMax /* 801EE200 001EB140 48 00 00 18 */ b lbl_801EE218 lbl_801EE204: -/* 801EE204 001EB144 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE208 001EB148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE204 001EB144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE208 001EB148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE20C 001EB14C 88 63 00 F8 */ lbz r3, 0xf8(r3) /* 801EE210 001EB150 48 00 00 08 */ b lbl_801EE218 lbl_801EE214: @@ -5629,21 +5629,21 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE234 001EB174 39 61 00 20 */ addi r11, r1, 0x20 /* 801EE238 001EB178 48 17 3F A1 */ bl _savegpr_28 /* 801EE23C 001EB17C 7C 7D 1B 78 */ mr r29, r3 -/* 801EE240 001EB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE240 001EB180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE248 001EB188 38 80 00 00 */ li r4, 0 /* 801EE24C 001EB18C 4B E4 48 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE250 001EB190 7C 60 1B 78 */ mr r0, r3 -/* 801EE254 001EB194 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE258 001EB198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE254 001EB194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE258 001EB198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE25C 001EB19C 3B 83 00 9C */ addi r28, r3, 0x9c /* 801EE260 001EB1A0 7F 83 E3 78 */ mr r3, r28 /* 801EE264 001EB1A4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE268 001EB1A8 38 A0 00 00 */ li r5, 0 /* 801EE26C 001EB1AC 4B E4 4D C5 */ bl getItem__17dSv_player_item_cCFib /* 801EE270 001EB1B0 7C 7E 1B 78 */ mr r30, r3 -/* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE27C 001EB1BC 38 80 00 01 */ li r4, 1 /* 801EE280 001EB1C0 4B E4 47 DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE284 001EB1C4 7C 60 1B 78 */ mr r0, r3 @@ -5652,8 +5652,8 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE290 001EB1D0 38 A0 00 00 */ li r5, 0 /* 801EE294 001EB1D4 4B E4 4D 9D */ bl getItem__17dSv_player_item_cCFib /* 801EE298 001EB1D8 7C 7F 1B 78 */ mr r31, r3 -/* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE2A4 001EB1E4 38 80 00 02 */ li r4, 2 /* 801EE2A8 001EB1E8 4B E4 47 B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE2AC 001EB1EC 7C 60 1B 78 */ mr r0, r3 @@ -5661,8 +5661,8 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE2B4 001EB1F4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE2B8 001EB1F8 38 A0 00 00 */ li r5, 0 /* 801EE2BC 001EB1FC 4B E4 4D 75 */ bl getItem__17dSv_player_item_cCFib -/* 801EE2C0 001EB200 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE2C4 001EB204 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EE2C0 001EB200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE2C4 001EB204 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EE2C8 001EB208 38 80 00 03 */ li r4, 3 /* 801EE2CC 001EB20C 4B E4 47 91 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE2D0 001EB210 7C 60 1B 78 */ mr r0, r3 @@ -6017,8 +6017,8 @@ lbl_801EE760: /* 801EE794 001EB6D4 41 80 FF CC */ blt lbl_801EE760 /* 801EE798 001EB6D8 2C 1D 00 64 */ cmpwi r29, 0x64 /* 801EE79C 001EB6DC 40 80 00 BC */ bge lbl_801EE858 -/* 801EE7A0 001EB6E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE7A4 001EB6E4 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 801EE7A0 001EB6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE7A4 001EB6E4 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801EE7A8 001EB6E8 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801EE7AC 001EB6EC 38 00 00 0A */ li r0, 0xa /* 801EE7B0 001EB6F0 7C 7D 03 D6 */ divw r3, r29, r0 @@ -6064,8 +6064,8 @@ lbl_801EE760: /* 801EE850 001EB790 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801EE854 001EB794 48 00 01 18 */ b lbl_801EE96C lbl_801EE858: -/* 801EE858 001EB798 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EE85C 001EB79C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801EE858 001EB798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EE85C 001EB79C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801EE860 001EB7A0 83 7E 5D 30 */ lwz r27, 0x5d30(r30) /* 801EE864 001EB7A4 38 00 00 64 */ li r0, 0x64 /* 801EE868 001EB7A8 7C 7D 03 D6 */ divw r3, r29, r0 @@ -6216,8 +6216,8 @@ dMenu_Ring_c_NS_getItem: /* 801EEA90 001EB9D0 39 61 00 20 */ addi r11, r1, 0x20 /* 801EEA94 001EB9D4 48 17 37 49 */ bl _savegpr_29 /* 801EEA98 001EB9D8 7C BD 2B 78 */ mr r29, r5 -/* 801EEA9C 001EB9DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EEAA0 001EB9E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EEA9C 001EB9DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EEAA0 001EB9E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EEAA4 001EB9E4 3B C3 00 9C */ addi r30, r3, 0x9c /* 801EEAA8 001EB9E8 7F C3 F3 78 */ mr r3, r30 /* 801EEAAC 001EB9EC 38 A0 00 00 */ li r5, 0 @@ -6263,8 +6263,8 @@ lbl_801EEB30: /* 801EEB38 001EBA78 B0 03 06 8E */ sth r0, 0x68e(r3) lbl_801EEB3C: /* 801EEB3C 001EBA7C 88 03 06 CC */ lbz r0, 0x6cc(r3) -/* 801EEB40 001EBA80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EEB44 001EBA84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EEB40 001EBA80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EEB44 001EBA84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EEB48 001EBA88 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 801EEB4C 001EBA8C 38 00 00 00 */ li r0, 0 /* 801EEB50 001EBA90 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -6281,8 +6281,8 @@ dMenu_Ring_c_NS_isMixItemOn: /* 801EEB70 001EBAB0 80 03 06 2C */ lwz r0, 0x62c(r3) /* 801EEB74 001EBAB4 28 00 00 00 */ cmplwi r0, 0 /* 801EEB78 001EBAB8 40 82 01 04 */ bne lbl_801EEC7C -/* 801EEB7C 001EBABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EEB80 001EBAC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EEB7C 001EBABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EEB80 001EBAC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EEB84 001EBAC4 3B E3 00 9C */ addi r31, r3, 0x9c /* 801EEB88 001EBAC8 7F E3 FB 78 */ mr r3, r31 /* 801EEB8C 001EBACC 88 1E 06 A8 */ lbz r0, 0x6a8(r30) @@ -6309,8 +6309,8 @@ lbl_801EEBDC: /* 801EEBDC 001EBB1C 2C 00 00 73 */ cmpwi r0, 0x73 /* 801EEBE0 001EBB20 40 80 00 9C */ bge lbl_801EEC7C lbl_801EEBE4: -/* 801EEBE4 001EBB24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EEBE8 001EBB28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EEBE4 001EBB24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EEBE8 001EBB28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EEBEC 001EBB2C 38 80 00 00 */ li r4, 0 /* 801EEBF0 001EBB30 4B E4 3E 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EEBF4 001EBB34 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -6331,8 +6331,8 @@ lbl_801EEC28: /* 801EEC28 001EBB68 38 60 00 01 */ li r3, 1 /* 801EEC2C 001EBB6C 48 00 00 54 */ b lbl_801EEC80 lbl_801EEC30: -/* 801EEC30 001EBB70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EEC34 001EBB74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EEC30 001EBB70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EEC34 001EBB74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EEC38 001EBB78 38 80 00 01 */ li r4, 1 /* 801EEC3C 001EBB7C 4B E4 3E 21 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EEC40 001EBB80 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -6372,8 +6372,8 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EECAC 001EBBEC 80 03 06 2C */ lwz r0, 0x62c(r3) /* 801EECB0 001EBBF0 28 00 00 00 */ cmplwi r0, 0 /* 801EECB4 001EBBF4 40 82 00 B8 */ bne lbl_801EED6C -/* 801EECB8 001EBBF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EECBC 001EBBFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EECB8 001EBBF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EECBC 001EBBFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EECC0 001EBC00 38 63 00 9C */ addi r3, r3, 0x9c /* 801EECC4 001EBC04 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801EECC8 001EBC08 7C 9F 02 14 */ add r4, r31, r0 @@ -6388,8 +6388,8 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EECEC 001EBC2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EECF0 001EBC30 28 00 00 04 */ cmplwi r0, 4 /* 801EECF4 001EBC34 40 82 00 34 */ bne lbl_801EED28 -/* 801EECF8 001EBC38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EECFC 001EBC3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EECF8 001EBC38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EECFC 001EBC3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EED00 001EBC40 38 80 00 00 */ li r4, 0 /* 801EED04 001EBC44 4B E4 3D 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EED08 001EBC48 88 1F 06 A8 */ lbz r0, 0x6a8(r31) @@ -6406,8 +6406,8 @@ lbl_801EED28: /* 801EED30 001EBC70 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EED34 001EBC74 28 00 00 04 */ cmplwi r0, 4 /* 801EED38 001EBC78 40 82 00 34 */ bne lbl_801EED6C -/* 801EED3C 001EBC7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801EED40 001EBC80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801EED3C 001EBC7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801EED40 001EBC80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801EED44 001EBC84 38 80 00 01 */ li r4, 1 /* 801EED48 001EBC88 4B E4 3D 15 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EED4C 001EBC8C 88 1F 06 A8 */ lbz r0, 0x6a8(r31) diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index a7d0d49443..a3e181e003 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -1112,8 +1112,8 @@ lbl_801F05D0: /* 801F06C8 001ED608 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801F06CC 001ED60C 7D 89 03 A6 */ mtctr r12 /* 801F06D0 001ED610 4E 80 04 21 */ bctrl -/* 801F06D4 001ED614 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F06D8 001ED618 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F06D4 001ED614 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F06D8 001ED618 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F06DC 001ED61C 88 03 0F 18 */ lbz r0, 0xf18(r3) /* 801F06E0 001ED620 98 1F 00 54 */ stb r0, 0x54(r31) /* 801F06E4 001ED624 38 60 00 B8 */ li r3, 0xb8 @@ -3293,8 +3293,8 @@ lbl_801F2638: lbl_801F2658: /* 801F2658 001EF598 2C 00 00 01 */ cmpwi r0, 1 /* 801F265C 001EF59C 40 82 00 28 */ bne lbl_801F2684 -/* 801F2660 001EF5A0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801F2664 001EF5A4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801F2660 001EF5A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801F2664 001EF5A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F2668 001EF5A8 88 04 0F 19 */ lbz r0, 0xf19(r4) /* 801F266C 001EF5AC 60 00 00 01 */ ori r0, r0, 1 /* 801F2670 001EF5B0 98 04 0F 19 */ stb r0, 0xf19(r4) @@ -3427,19 +3427,19 @@ dMenu_save_c_NS_dataWrite: /* 801F284C 001EF78C 39 61 00 20 */ addi r11, r1, 0x20 /* 801F2850 001EF790 48 16 F9 8D */ bl _savegpr_29 /* 801F2854 001EF794 7C 7D 1B 78 */ mr r29, r3 -/* 801F2858 001EF798 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F285C 001EF79C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F2858 001EF798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F285C 001EF79C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F2860 001EF7A0 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801F2864 001EF7A4 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801F2868 001EF7A8 7D 89 03 A6 */ mtctr r12 /* 801F286C 001EF7AC 4E 80 04 21 */ bctrl /* 801F2870 001EF7B0 88 03 00 09 */ lbz r0, 9(r3) /* 801F2874 001EF7B4 54 04 FE FE */ rlwinm r4, r0, 0x1f, 0x1b, 0x1f -/* 801F2878 001EF7B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F287C 001EF7BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F2878 001EF7B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F287C 001EF7BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F2880 001EF7C0 4B E4 28 71 */ bl putSave__10dSv_info_cFi -/* 801F2884 001EF7C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F2888 001EF7C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F2884 001EF7C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F2888 001EF7C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F288C 001EF7CC 38 9D 01 D0 */ addi r4, r29, 0x1d0 /* 801F2890 001EF7D0 88 BD 00 54 */ lbz r5, 0x54(r29) /* 801F2894 001EF7D4 4B E4 2F 05 */ bl memory_to_card__10dSv_info_cFPci @@ -3550,8 +3550,8 @@ lbl_801F29F0: /* 801F2A28 001EF968 39 00 00 00 */ li r8, 0 /* 801F2A2C 001EF96C 48 0B 8F 59 */ bl Z2SeMgr_NS_seStart /* 801F2A30 001EF970 88 1F 00 54 */ lbz r0, 0x54(r31) -/* 801F2A34 001EF974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F2A38 001EF978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F2A34 001EF974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F2A38 001EF978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F2A3C 001EF97C 98 03 0F 18 */ stb r0, 0xf18(r3) /* 801F2A40 001EF980 38 00 00 00 */ li r0, 0 /* 801F2A44 001EF984 98 03 0F 1A */ stb r0, 0xf1a(r3) @@ -4001,8 +4001,8 @@ dMenu_save_c_NS_restartInit: /* 801F30BC 001EFFFC 7C 08 02 A6 */ mflr r0 /* 801F30C0 001F0000 90 01 00 14 */ stw r0, 0x14(r1) /* 801F30C4 001F0004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F30C8 001F0008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F30CC 001F000C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F30C8 001F0008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F30CC 001F000C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F30D0 001F0010 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801F30D4 001F0014 7F E3 FB 78 */ mr r3, r31 /* 801F30D8 001F0018 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -4022,15 +4022,15 @@ dMenu_save_c_NS_restartInit: /* 801F3110 001F0050 A0 84 01 C2 */ lhz r4, 0x1c2(r4) /* 801F3114 001F0054 4B E4 18 91 */ bl offEventBit__11dSv_event_cFUs lbl_801F3118: -/* 801F3118 001F0058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F3118 001F0058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F3120 001F0060 38 63 00 CC */ addi r3, r3, 0xcc /* 801F3124 001F0064 38 80 00 48 */ li r4, 0x48 /* 801F3128 001F0068 4B E4 0D A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 801F312C 001F006C 2C 03 00 00 */ cmpwi r3, 0 /* 801F3130 001F0070 41 82 00 54 */ beq lbl_801F3184 -/* 801F3134 001F0074 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F3138 001F0078 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F3134 001F0074 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F3138 001F0078 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F313C 001F007C 3B E3 00 9C */ addi r31, r3, 0x9c /* 801F3140 001F0080 7F E3 FB 78 */ mr r3, r31 /* 801F3144 001F0084 38 80 00 01 */ li r4, 1 @@ -4046,8 +4046,8 @@ lbl_801F3118: /* 801F316C 001F00AC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801F3170 001F00B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801F3174 001F00B4 A0 03 00 B6 */ lhz r0, 0xb6(r3) -/* 801F3178 001F00B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F317C 001F00BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F3178 001F00B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F317C 001F00BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F3180 001F00C0 B0 03 00 08 */ sth r0, 8(r3) lbl_801F3184: /* 801F3184 001F00C4 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -4441,8 +4441,8 @@ lbl_801F369C: /* 801F36F4 001F0634 7F E3 FB 78 */ mr r3, r31 /* 801F36F8 001F0638 38 80 00 01 */ li r4, 1 /* 801F36FC 001F063C 48 00 29 A9 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit -/* 801F3700 001F0640 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F3704 001F0644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F3700 001F0640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F3704 001F0644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F3708 001F0648 88 03 0F 18 */ lbz r0, 0xf18(r3) /* 801F370C 001F064C 98 1F 00 54 */ stb r0, 0x54(r31) /* 801F3710 001F0650 88 1F 00 54 */ lbz r0, 0x54(r31) @@ -7823,8 +7823,8 @@ dMenu_save_c_NS_setSaveData: /* 801F6808 001F3748 3B BB 01 D0 */ addi r29, r27, 0x1d0 /* 801F680C 001F374C 3B 80 00 00 */ li r28, 0 /* 801F6810 001F3750 3B 40 00 00 */ li r26, 0 -/* 801F6814 001F3754 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F6818 001F3758 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801F6814 001F3754 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F6818 001F3758 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_801F681C: /* 801F681C 001F375C 7F A3 EB 78 */ mr r3, r29 /* 801F6820 001F3760 4B E2 14 CD */ bl mDoMemCdRWm_TestCheckSumGameData @@ -7921,8 +7921,8 @@ dMenu_save_c_NS_setInitSaveData: /* 801F6964 001F38A4 48 16 B8 79 */ bl _savegpr_29 /* 801F6968 001F38A8 7C 7D 1B 78 */ mr r29, r3 /* 801F696C 001F38AC 3B C0 00 00 */ li r30, 0 -/* 801F6970 001F38B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F6974 001F38B4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801F6970 001F38B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F6974 001F38B4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_801F6978: /* 801F6978 001F38B8 7F E3 FB 78 */ mr r3, r31 /* 801F697C 001F38BC 38 9D 01 D0 */ addi r4, r29, 0x1d0 @@ -7952,8 +7952,8 @@ dMenu_save_c_NS__draw: /* 801F69D0 001F3910 80 63 21 8C */ lwz r3, 0x218c(r3) /* 801F69D4 001F3914 28 03 00 00 */ cmplwi r3, 0 /* 801F69D8 001F3918 41 82 00 14 */ beq lbl_801F69EC -/* 801F69DC 001F391C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801F69E0 001F3920 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801F69DC 001F391C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801F69E0 001F3920 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F69E4 001F3924 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 801F69E8 001F3928 48 04 6F 31 */ bl dMsgScrnExplain_c_NS_draw lbl_801F69EC: @@ -7976,8 +7976,8 @@ dMenu_save_c_NS__draw2: /* 801F6A20 001F3960 80 1A 21 8C */ lwz r0, 0x218c(r26) /* 801F6A24 001F3964 28 00 00 00 */ cmplwi r0, 0 /* 801F6A28 001F3968 41 82 00 20 */ beq lbl_801F6A48 -/* 801F6A2C 001F396C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F6A30 001F3970 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F6A2C 001F396C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F6A30 001F3970 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F6A34 001F3974 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801F6A38 001F3978 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801F6A3C 001F397C 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -7987,8 +7987,8 @@ lbl_801F6A48: /* 801F6A48 001F3988 88 1A 01 B0 */ lbz r0, 0x1b0(r26) /* 801F6A4C 001F398C 28 00 00 00 */ cmplwi r0, 0 /* 801F6A50 001F3990 41 82 00 64 */ beq lbl_801F6AB4 -/* 801F6A54 001F3994 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F6A58 001F3998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F6A54 001F3994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F6A58 001F3998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F6A5C 001F399C 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 801F6A60 001F39A0 7F C3 F3 78 */ mr r3, r30 /* 801F6A64 001F39A4 3B 9E 01 B4 */ addi r28, r30, 0x1b4 @@ -8028,8 +8028,8 @@ lbl_801F6AC4: /* 801F6AE0 001F3A20 7C 08 02 A6 */ mflr r0 /* 801F6AE4 001F3A24 90 01 00 14 */ stw r0, 0x14(r1) /* 801F6AE8 001F3A28 80 63 00 04 */ lwz r3, 4(r3) -/* 801F6AEC 001F3A2C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801F6AF0 001F3A30 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801F6AEC 001F3A2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801F6AF0 001F3A30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F6AF4 001F3A34 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 801F6AF8 001F3A38 48 04 6E 21 */ bl dMsgScrnExplain_c_NS_draw /* 801F6AFC 001F3A3C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -8042,8 +8042,8 @@ lbl_801F6AC4: /* 801F6B18 001F3A58 80 63 00 04 */ lwz r3, 4(r3) /* 801F6B1C 001F3A5C C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) /* 801F6B20 001F3A60 FC 40 08 90 */ fmr f2, f1 -/* 801F6B24 001F3A64 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801F6B28 001F3A68 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801F6B24 001F3A64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801F6B28 001F3A68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F6B2C 001F3A6C 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 801F6B30 001F3A70 48 10 23 A5 */ bl J2DScreen_NS_draw /* 801F6B34 001F3A74 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index e77441aa17..bc15f7a226 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -409,8 +409,8 @@ dMenu_Skill_c_NS__draw: /* 801F77C8 001F4708 80 03 00 08 */ lwz r0, 8(r3) /* 801F77CC 001F470C 28 00 00 00 */ cmplwi r0, 0 /* 801F77D0 001F4710 41 82 01 68 */ beq lbl_801F7938 -/* 801F77D4 001F4714 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F77D8 001F4718 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F77D4 001F4714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F77D8 001F4718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F77DC 001F471C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 801F77E0 001F4720 80 7D 01 58 */ lwz r3, 0x158(r29) /* 801F77E4 001F4724 8B C3 00 B2 */ lbz r30, 0xb2(r3) @@ -1783,8 +1783,8 @@ lbl_801F8C38: /* 801F8C3C 001F5B7C 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F8C40 001F5B80 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) /* 801F8C44 001F5B84 48 05 CB 8D */ bl CPaneMgrAlpha_NS_setAlphaRate -/* 801F8C48 001F5B88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F8C4C 001F5B8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F8C48 001F5B88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F8C4C 001F5B8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F8C50 001F5B90 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 801F8C54 001F5B94 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801F8C58 001F5B98 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -2358,8 +2358,8 @@ dMenu_Skill_c_NS_getSkillNum: /* 801F9484 001F63C4 3B 60 00 00 */ li r27, 0 /* 801F9488 001F63C8 3B 40 00 00 */ li r26, 0 /* 801F948C 001F63CC 3B E0 00 00 */ li r31, 0 -/* 801F9490 001F63D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F9494 001F63D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F9490 001F63D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F9494 001F63D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F9498 001F63D8 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 801F949C 001F63DC 3C 60 80 3C */ lis r3, lbl_803BE8A4@ha /* 801F94A0 001F63E0 3B A3 E8 A4 */ addi r29, r3, lbl_803BE8A4@l diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index 88dab3d625..744acecee4 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -778,16 +778,16 @@ lbl_801FAAE0: /* 801FAAE4 001F7A24 80 03 00 04 */ lwz r0, 4(r3) /* 801FAAE8 001F7A28 2C 00 00 01 */ cmpwi r0, 1 /* 801FAAEC 001F7A2C 40 82 04 D8 */ bne lbl_801FAFC4 -/* 801FAAF0 001F7A30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAAF4 001F7A34 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 801FAAF0 001F7A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAAF4 001F7A34 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 801FAAF8 001F7A38 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAAFC 001F7A3C 28 00 00 00 */ cmplwi r0, 0 /* 801FAB00 001F7A40 41 82 00 0C */ beq lbl_801FAB0C /* 801FAB04 001F7A44 28 00 00 05 */ cmplwi r0, 5 /* 801FAB08 001F7A48 40 82 04 BC */ bne lbl_801FAFC4 lbl_801FAB0C: -/* 801FAB0C 001F7A4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAB10 001F7A50 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801FAB0C 001F7A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAB10 001F7A50 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801FAB14 001F7A54 88 1F 5E 1A */ lbz r0, 0x5e1a(r31) /* 801FAB18 001F7A58 28 00 00 00 */ cmplwi r0, 0 /* 801FAB1C 001F7A5C 40 82 04 A8 */ bne lbl_801FAFC4 @@ -799,8 +799,8 @@ lbl_801FAB0C: /* 801FAB34 001F7A74 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 801FAB38 001F7A78 2C 00 00 08 */ cmpwi r0, 8 /* 801FAB3C 001F7A7C 41 82 04 88 */ beq lbl_801FAFC4 -/* 801FAB40 001F7A80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAB44 001F7A84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FAB40 001F7A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAB44 001F7A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FAB48 001F7A88 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 801FAB4C 001F7A8C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 801FAB50 001F7A90 40 82 04 74 */ bne lbl_801FAFC4 @@ -820,8 +820,8 @@ lbl_801FAB0C: /* 801FAB88 001F7AC8 88 0D 86 66 */ lbz r0, lbl_80450BE6-_SDA_BASE_(r13) /* 801FAB8C 001F7ACC 28 00 00 00 */ cmplwi r0, 0 /* 801FAB90 001F7AD0 40 82 04 34 */ bne lbl_801FAFC4 -/* 801FAB94 001F7AD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAB98 001F7AD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FAB94 001F7AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAB98 001F7AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FAB9C 001F7ADC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801FABA0 001F7AE0 81 83 06 28 */ lwz r12, 0x628(r3) /* 801FABA4 001F7AE4 81 8C 00 74 */ lwz r12, 0x74(r12) @@ -891,8 +891,8 @@ lbl_801FAC88: /* 801FAC90 001F7BD0 A0 03 00 B4 */ lhz r0, 0xb4(r3) /* 801FAC94 001F7BD4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 801FAC98 001F7BD8 41 82 00 4C */ beq lbl_801FACE4 -/* 801FAC9C 001F7BDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FACA0 001F7BE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FAC9C 001F7BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FACA0 001F7BE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FACA4 001F7BE4 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 801FACA8 001F7BE8 7C 00 07 75 */ extsb. r0, r0 /* 801FACAC 001F7BEC 40 82 00 38 */ bne lbl_801FACE4 @@ -945,8 +945,8 @@ lbl_801FAD44: /* 801FAD5C 001F7C9C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801FAD60 001F7CA0 48 02 49 8D */ bl dMeter2_c_NS_emphasisButtonDelete lbl_801FAD64: -/* 801FAD64 001F7CA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAD68 001F7CA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FAD64 001F7CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAD68 001F7CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FAD6C 001F7CAC 3B C3 4E 20 */ addi r30, r3, 0x4e20 /* 801FAD70 001F7CB0 7F C3 F3 78 */ mr r3, r30 /* 801FAD74 001F7CB4 81 9E 00 00 */ lwz r12, 0(r30) @@ -1072,8 +1072,8 @@ lbl_801FAF34: /* 801FAF34 001F7E74 48 02 37 55 */ bl dMeter2Info_isItemOpenCheck /* 801FAF38 001F7E78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FAF3C 001F7E7C 41 82 00 88 */ beq lbl_801FAFC4 -/* 801FAF40 001F7E80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FAF44 001F7E84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FAF40 001F7E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FAF44 001F7E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FAF48 001F7E88 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 801FAF4C 001F7E8C 7C 00 07 75 */ extsb. r0, r0 /* 801FAF50 001F7E90 40 82 00 74 */ bne lbl_801FAFC4 @@ -2061,8 +2061,8 @@ dMw_c_NS_dMw_capture_create: /* 801FBD88 001F8CC8 90 01 00 14 */ stw r0, 0x14(r1) /* 801FBD8C 001F8CCC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FBD90 001F8CD0 7C 7F 1B 78 */ mr r31, r3 -/* 801FBD94 001F8CD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FBD98 001F8CD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FBD94 001F8CD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FBD98 001F8CD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FBD9C 001F8CDC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 801FBDA0 001F8CE0 28 00 00 00 */ cmplwi r0, 0 /* 801FBDA4 001F8CE4 40 82 00 5C */ bne lbl_801FBE00 @@ -2104,8 +2104,8 @@ dMw_c_NS_dMw_capture_delete: /* 801FBE20 001F8D60 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FBE24 001F8D64 93 C1 00 08 */ stw r30, 8(r1) /* 801FBE28 001F8D68 7C 7E 1B 78 */ mr r30, r3 -/* 801FBE2C 001F8D6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FBE30 001F8D70 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801FBE2C 001F8D6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FBE30 001F8D70 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801FBE34 001F8D74 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) /* 801FBE38 001F8D78 28 00 00 00 */ cmplwi r0, 0 /* 801FBE3C 001F8D7C 41 82 00 40 */ beq lbl_801FBE7C @@ -2723,8 +2723,8 @@ dMw_c_NS_dMw_option_create: /* 801FC684 001F95C4 48 0D 25 C9 */ bl __nw__FUl /* 801FC688 001F95C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC68C 001F95CC 41 82 00 1C */ beq lbl_801FC6A8 -/* 801FC690 001F95D0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801FC694 001F95D4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801FC690 001F95D0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801FC694 001F95D4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801FC698 001F95D8 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801FC69C 001F95DC 80 BF 01 04 */ lwz r5, 0x104(r31) /* 801FC6A0 001F95E0 4B FE 58 71 */ bl dMenu_Option_c @@ -3236,8 +3236,8 @@ dMw_c_NS_dMw_isPush_S_Button: /* 801FCD38 001F9C78 80 03 00 04 */ lwz r0, 4(r3) /* 801FCD3C 001F9C7C 2C 00 00 01 */ cmpwi r0, 1 /* 801FCD40 001F9C80 40 82 00 80 */ bne lbl_801FCDC0 -/* 801FCD44 001F9C84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FCD48 001F9C88 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 801FCD44 001F9C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FCD48 001F9C88 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801FCD4C 001F9C8C 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 801FCD50 001F9C90 81 83 06 28 */ lwz r12, 0x628(r3) /* 801FCD54 001F9C94 81 8C 02 6C */ lwz r12, 0x26c(r12) @@ -3279,8 +3279,8 @@ lbl_801FCDC4: .global dMw_c_NS_isPauseReady dMw_c_NS_isPauseReady: -/* 801FCDD8 001F9D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FCDDC 001F9D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FCDD8 001F9D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FCDDC 001F9D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FCDE0 001F9D20 88 03 4F F0 */ lbz r0, 0x4ff0(r3) /* 801FCDE4 001F9D24 28 00 00 00 */ cmplwi r0, 0 /* 801FCDE8 001F9D28 40 82 00 10 */ bne lbl_801FCDF8 @@ -3426,8 +3426,8 @@ lbl_801FCFA8: /* 801FCFC8 001F9F08 38 00 00 00 */ li r0, 0 /* 801FCFCC 001F9F0C 98 03 01 48 */ stb r0, 0x148(r3) lbl_801FCFD0: -/* 801FCFD0 001F9F10 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 801FCFD4 001F9F14 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 801FCFD0 001F9F10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 801FCFD4 001F9F14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801FCFD8 001F9F18 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 801FCFDC 001F9F1C 28 00 00 00 */ cmplwi r0, 0 /* 801FCFE0 001F9F20 41 82 00 8C */ beq lbl_801FD06C @@ -3541,8 +3541,8 @@ dMw_c_NS__create: /* 801FD14C 001FA08C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FD150 001FA090 93 C1 00 08 */ stw r30, 8(r1) /* 801FD154 001FA094 7C 7E 1B 78 */ mr r30, r3 -/* 801FD158 001FA098 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD15C 001FA09C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD158 001FA098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD15C 001FA09C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD160 001FA0A0 80 03 5E BC */ lwz r0, 0x5ebc(r3) /* 801FD164 001FA0A4 90 1E 01 00 */ stw r0, 0x100(r30) /* 801FD168 001FA0A8 38 60 00 30 */ li r3, 0x30 @@ -3668,8 +3668,8 @@ lbl_801FD304: /* 801FD330 001FA270 7F C3 F3 78 */ mr r3, r30 /* 801FD334 001FA274 4B FF FB B5 */ bl dMw_c_NS_checkCStickTrigger lbl_801FD338: -/* 801FD338 001FA278 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD33C 001FA27C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD338 001FA278 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD33C 001FA27C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD340 001FA280 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 801FD344 001FA284 28 00 00 00 */ cmplwi r0, 0 /* 801FD348 001FA288 41 82 00 10 */ beq lbl_801FD358 @@ -3765,23 +3765,23 @@ dMw_c_NS__draw: /* 801FD48C 001FA3CC 88 06 00 06 */ lbz r0, 6(r6) /* 801FD490 001FA3D0 28 00 00 00 */ cmplwi r0, 0 /* 801FD494 001FA3D4 41 82 00 20 */ beq lbl_801FD4B4 -/* 801FD498 001FA3D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD49C 001FA3DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD498 001FA3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD49C 001FA3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD4A0 001FA3E0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD4A4 001FA3E4 38 83 00 AC */ addi r4, r3, 0xac /* 801FD4A8 001FA3E8 38 A3 00 B0 */ addi r5, r3, 0xb0 /* 801FD4AC 001FA3EC 4B E5 92 E9 */ bl dDlst_list_c_NS_set /* 801FD4B0 001FA3F0 48 00 00 1C */ b lbl_801FD4CC lbl_801FD4B4: -/* 801FD4B4 001FA3F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD4B8 001FA3F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD4B4 001FA3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD4B8 001FA3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD4BC 001FA3FC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD4C0 001FA400 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD4C4 001FA404 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801FD4C8 001FA408 4B E5 92 CD */ bl dDlst_list_c_NS_set lbl_801FD4CC: -/* 801FD4CC 001FA40C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD4D0 001FA410 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801FD4CC 001FA40C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD4D0 001FA410 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801FD4D4 001FA414 88 04 5E B5 */ lbz r0, 0x5eb5(r4) /* 801FD4D8 001FA418 28 00 00 01 */ cmplwi r0, 1 /* 801FD4DC 001FA41C 40 82 01 84 */ bne lbl_801FD660 @@ -3822,8 +3822,8 @@ lbl_801FD558: /* 801FD558 001FA498 80 DF 01 24 */ lwz r6, 0x124(r31) /* 801FD55C 001FA49C 28 06 00 00 */ cmplwi r6, 0 /* 801FD560 001FA4A0 41 82 00 1C */ beq lbl_801FD57C -/* 801FD564 001FA4A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD568 001FA4A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD564 001FA4A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD568 001FA4A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD56C 001FA4AC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD570 001FA4B0 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD574 001FA4B4 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -3832,8 +3832,8 @@ lbl_801FD57C: /* 801FD57C 001FA4BC 80 DF 01 28 */ lwz r6, 0x128(r31) /* 801FD580 001FA4C0 28 06 00 00 */ cmplwi r6, 0 /* 801FD584 001FA4C4 41 82 00 1C */ beq lbl_801FD5A0 -/* 801FD588 001FA4C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD58C 001FA4CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD588 001FA4C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD58C 001FA4CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD590 001FA4D0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD594 001FA4D4 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD598 001FA4D8 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -3842,8 +3842,8 @@ lbl_801FD5A0: /* 801FD5A0 001FA4E0 80 DF 01 2C */ lwz r6, 0x12c(r31) /* 801FD5A4 001FA4E4 28 06 00 00 */ cmplwi r6, 0 /* 801FD5A8 001FA4E8 41 82 00 1C */ beq lbl_801FD5C4 -/* 801FD5AC 001FA4EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD5B0 001FA4F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD5AC 001FA4EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD5B0 001FA4F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD5B4 001FA4F4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD5B8 001FA4F8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD5BC 001FA4FC 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -3852,8 +3852,8 @@ lbl_801FD5C4: /* 801FD5C4 001FA504 80 DF 01 30 */ lwz r6, 0x130(r31) /* 801FD5C8 001FA508 28 06 00 00 */ cmplwi r6, 0 /* 801FD5CC 001FA50C 41 82 00 1C */ beq lbl_801FD5E8 -/* 801FD5D0 001FA510 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD5D4 001FA514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD5D0 001FA510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD5D4 001FA514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD5D8 001FA518 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD5DC 001FA51C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD5E0 001FA520 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -3862,8 +3862,8 @@ lbl_801FD5E8: /* 801FD5E8 001FA528 80 DF 01 34 */ lwz r6, 0x134(r31) /* 801FD5EC 001FA52C 28 06 00 00 */ cmplwi r6, 0 /* 801FD5F0 001FA530 41 82 00 70 */ beq lbl_801FD660 -/* 801FD5F4 001FA534 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FD5F8 001FA538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FD5F4 001FA534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FD5F8 001FA538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FD5FC 001FA53C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD600 001FA540 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD604 001FA544 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -4520,8 +4520,8 @@ lbl_801FD8B0: /* 801FDFEC 001FAF2C 38 00 00 03 */ li r0, 3 /* 801FDFF0 001FAF30 98 1F 00 04 */ stb r0, 4(r31) /* 801FDFF4 001FAF34 38 00 00 01 */ li r0, 1 -/* 801FDFF8 001FAF38 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801FDFFC 001FAF3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801FDFF8 001FAF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801FDFFC 001FAF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FE000 001FAF40 98 03 5E B5 */ stb r0, 0x5eb5(r3) /* 801FE004 001FAF44 38 60 00 00 */ li r3, 0 /* 801FE008 001FAF48 38 80 00 00 */ li r4, 0 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index b73c8950e2..12ba8ff006 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -50,8 +50,8 @@ lbl_801C08CC: /* 801C08F4 001BD834 88 9D 00 00 */ lbz r4, 0(r29) /* 801C08F8 001BD838 28 04 00 FF */ cmplwi r4, 0xff /* 801C08FC 001BD83C 41 82 02 28 */ beq lbl_801C0B24 -/* 801C0900 001BD840 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0904 001BD844 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0900 001BD840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0904 001BD844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0908 001BD848 38 63 09 58 */ addi r3, r3, 0x958 /* 801C090C 001BD84C 4B E7 3E DD */ bl isTbox__12dSv_memBit_cCFi /* 801C0910 001BD850 2C 03 00 00 */ cmpwi r3, 0 @@ -60,8 +60,8 @@ lbl_801C08CC: /* 801C091C 001BD85C 48 00 02 08 */ b lbl_801C0B24 /* 801C0920 001BD860 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 801C0924 001BD864 41 82 02 00 */ beq lbl_801C0B24 -/* 801C0928 001BD868 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C092C 001BD86C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0928 001BD868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C092C 001BD86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0930 001BD870 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0934 001BD874 88 9D 00 00 */ lbz r4, 0(r29) /* 801C0938 001BD878 4B E7 3E B1 */ bl isTbox__12dSv_memBit_cCFi @@ -79,8 +79,8 @@ lbl_801C08CC: /* 801C0968 001BD8A8 28 04 00 FF */ cmplwi r4, 0xff /* 801C096C 001BD8AC 41 82 00 20 */ beq lbl_801C098C /* 801C0970 001BD8B0 41 82 01 B4 */ beq lbl_801C0B24 -/* 801C0974 001BD8B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0978 001BD8B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0974 001BD8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0978 001BD8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C097C 001BD8BC 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0980 001BD8C0 4B E7 3E 69 */ bl isTbox__12dSv_memBit_cCFi /* 801C0984 001BD8C4 2C 03 00 00 */ cmpwi r3, 0 @@ -90,8 +90,8 @@ lbl_801C098C: /* 801C0990 001BD8D0 28 04 00 FF */ cmplwi r4, 0xff /* 801C0994 001BD8D4 41 82 00 24 */ beq lbl_801C09B8 /* 801C0998 001BD8D8 41 82 01 8C */ beq lbl_801C0B24 -/* 801C099C 001BD8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C09A0 001BD8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C099C 001BD8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C09A0 001BD8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C09A4 001BD8E4 88 BD 00 01 */ lbz r5, 1(r29) /* 801C09A8 001BD8E8 7C A5 07 74 */ extsb r5, r5 /* 801C09AC 001BD8EC 4B E7 49 B5 */ bl isSwitch__10dSv_info_cCFii @@ -108,16 +108,16 @@ lbl_801C09B8: /* 801C09D4 001BD914 28 04 00 FF */ cmplwi r4, 0xff /* 801C09D8 001BD918 41 82 00 24 */ beq lbl_801C09FC /* 801C09DC 001BD91C 41 82 01 48 */ beq lbl_801C0B24 -/* 801C09E0 001BD920 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C09E4 001BD924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C09E0 001BD920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C09E4 001BD924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C09E8 001BD928 88 BD 00 01 */ lbz r5, 1(r29) /* 801C09EC 001BD92C 7C A5 07 74 */ extsb r5, r5 /* 801C09F0 001BD930 4B E7 49 71 */ bl isSwitch__10dSv_info_cCFii /* 801C09F4 001BD934 2C 03 00 00 */ cmpwi r3, 0 /* 801C09F8 001BD938 41 82 01 2C */ beq lbl_801C0B24 lbl_801C09FC: -/* 801C09FC 001BD93C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0A00 001BD940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C09FC 001BD93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0A00 001BD940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0A04 001BD944 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0A08 001BD948 38 80 00 03 */ li r4, 3 /* 801C0A0C 001BD94C 4B E7 3F 29 */ bl isDungeonItem__12dSv_memBit_cCFi @@ -131,8 +131,8 @@ lbl_801C09FC: /* 801C0A2C 001BD96C 28 04 00 FF */ cmplwi r4, 0xff /* 801C0A30 001BD970 41 82 00 20 */ beq lbl_801C0A50 /* 801C0A34 001BD974 41 82 00 F0 */ beq lbl_801C0B24 -/* 801C0A38 001BD978 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0A3C 001BD97C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0A38 001BD978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0A3C 001BD97C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0A40 001BD980 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0A44 001BD984 4B E7 3D A5 */ bl isTbox__12dSv_memBit_cCFi /* 801C0A48 001BD988 2C 03 00 00 */ cmpwi r3, 0 @@ -150,8 +150,8 @@ lbl_801C0A50: /* 801C0A74 001BD9B4 28 04 00 FF */ cmplwi r4, 0xff /* 801C0A78 001BD9B8 41 82 00 20 */ beq lbl_801C0A98 /* 801C0A7C 001BD9BC 41 82 00 A8 */ beq lbl_801C0B24 -/* 801C0A80 001BD9C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0A84 001BD9C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0A80 001BD9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0A84 001BD9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0A88 001BD9C8 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0A8C 001BD9CC 4B E7 3D 5D */ bl isTbox__12dSv_memBit_cCFi /* 801C0A90 001BD9D0 2C 03 00 00 */ cmpwi r3, 0 @@ -165,8 +165,8 @@ lbl_801C0A98: /* 801C0AAC 001BD9EC 28 04 00 FF */ cmplwi r4, 0xff /* 801C0AB0 001BD9F0 41 82 00 20 */ beq lbl_801C0AD0 /* 801C0AB4 001BD9F4 41 82 00 70 */ beq lbl_801C0B24 -/* 801C0AB8 001BD9F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0ABC 001BD9FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0AB8 001BD9F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0ABC 001BD9FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0AC0 001BDA00 38 63 09 58 */ addi r3, r3, 0x958 /* 801C0AC4 001BDA04 4B E7 3D 25 */ bl isTbox__12dSv_memBit_cCFi /* 801C0AC8 001BDA08 2C 03 00 00 */ cmpwi r3, 0 @@ -174,8 +174,8 @@ lbl_801C0A98: lbl_801C0AD0: /* 801C0AD0 001BDA10 3B E0 00 01 */ li r31, 1 /* 801C0AD4 001BDA14 48 00 00 50 */ b lbl_801C0B24 -/* 801C0AD8 001BDA18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C0ADC 001BDA1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C0AD8 001BDA18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C0ADC 001BDA1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C0AE0 001BDA20 3B C3 09 58 */ addi r30, r3, 0x958 /* 801C0AE4 001BDA24 7F C3 F3 78 */ mr r3, r30 /* 801C0AE8 001BDA28 38 80 00 03 */ li r4, 3 @@ -1377,8 +1377,8 @@ lbl_801C1B8C: lbl_801C1BCC: /* 801C1BCC 001BEB0C FF E0 00 90 */ fmr f31, f0 lbl_801C1BD0: -/* 801C1BD0 001BEB10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C1BD4 001BEB14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C1BD0 001BEB10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C1BD4 001BEB14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C1BD8 001BEB18 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801C1BDC 001BEB1C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801C1BE0 001BEB20 7D 89 03 A6 */ mtctr r12 diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index 62dc8680ce..fcd59e5b93 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -115,8 +115,8 @@ renderingFmap_c_NS_entry: /* 801CE1F0 001CB130 EC 00 10 28 */ fsubs f0, f0, f2 /* 801CE1F4 001CB134 EC 01 00 32 */ fmuls f0, f1, f0 /* 801CE1F8 001CB138 D0 06 00 0C */ stfs f0, 0xc(r6) -/* 801CE1FC 001CB13C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CE200 001CB140 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CE1FC 001CB13C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CE200 001CB140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CE204 001CB144 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801CE208 001CB148 38 83 00 64 */ addi r4, r3, 0x64 /* 801CE20C 001CB14C 38 A3 00 68 */ addi r5, r3, 0x68 @@ -135,8 +135,8 @@ renderingFmap_c_NS_isSwitchSpecialOff: /* 801CE234 001CB174 93 C1 00 08 */ stw r30, 8(r1) /* 801CE238 001CB178 7C 9E 23 78 */ mr r30, r4 /* 801CE23C 001CB17C 3B E0 00 00 */ li r31, 0 -/* 801CE240 001CB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CE244 001CB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CE240 001CB180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CE244 001CB184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CE248 001CB188 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801CE24C 001CB18C 3C 80 80 39 */ lis r4, lbl_8039623C@ha /* 801CE250 001CB190 38 84 62 3C */ addi r4, r4, lbl_8039623C@l @@ -194,8 +194,8 @@ lbl_801CE2EC: /* 801CE310 001CB250 88 1F 00 01 */ lbz r0, 1(r31) /* 801CE314 001CB254 28 00 00 00 */ cmplwi r0, 0 /* 801CE318 001CB258 40 82 00 24 */ bne lbl_801CE33C -/* 801CE31C 001CB25C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CE320 001CB260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CE31C 001CB25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CE320 001CB260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CE324 001CB264 88 9F 00 00 */ lbz r4, 0(r31) /* 801CE328 001CB268 80 BE 00 9C */ lwz r5, 0x9c(r30) /* 801CE32C 001CB26C 4B E6 70 35 */ bl isSwitch__10dSv_info_cCFii @@ -203,8 +203,8 @@ lbl_801CE2EC: /* 801CE334 001CB274 54 03 D9 7E */ srwi r3, r0, 5 /* 801CE338 001CB278 48 00 00 70 */ b lbl_801CE3A8 lbl_801CE33C: -/* 801CE33C 001CB27C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801CE340 001CB280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801CE33C 001CB27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801CE340 001CB280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CE344 001CB284 88 9F 00 00 */ lbz r4, 0(r31) /* 801CE348 001CB288 80 BE 00 9C */ lwz r5, 0x9c(r30) /* 801CE34C 001CB28C 4B E6 70 15 */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index d91f3b0d6e..5832bf6f5a 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -32,8 +32,8 @@ dMenu_ItemExplain_c: /* 801DA7B4 001D76F4 38 03 D9 F4 */ addi r0, r3, lbl_803BD9F4@l /* 801DA7B8 001D76F8 90 1F 00 00 */ stw r0, 0(r31) /* 801DA7BC 001D76FC 90 9F 00 04 */ stw r4, 4(r31) -/* 801DA7C0 001D7700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DA7C4 001D7704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DA7C0 001D7700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DA7C4 001D7704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DA7C8 001D7708 80 03 5C 98 */ lwz r0, 0x5c98(r3) /* 801DA7CC 001D770C 90 1F 00 08 */ stw r0, 8(r31) /* 801DA7D0 001D7710 93 DF 00 B8 */ stw r30, 0xb8(r31) @@ -49,8 +49,8 @@ dMenu_ItemExplain_c: /* 801DA7F8 001D7738 98 1F 00 E0 */ stb r0, 0xe0(r31) /* 801DA7FC 001D773C 98 1F 00 E7 */ stb r0, 0xe7(r31) /* 801DA800 001D7740 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DA804 001D7744 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DA808 001D7748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DA804 001D7744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DA808 001D7748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DA80C 001D774C 80 03 5C C0 */ lwz r0, 0x5cc0(r3) /* 801DA810 001D7750 7C 15 00 40 */ cmplw r21, r0 /* 801DA814 001D7754 40 82 00 10 */ bne lbl_801DA824 @@ -412,8 +412,8 @@ lbl_801DAD48: /* 801DAD5C 001D7C9C 80 63 00 04 */ lwz r3, 4(r3) /* 801DAD60 001D7CA0 80 9F 00 84 */ lwz r4, 0x84(r31) /* 801DAD64 001D7CA4 48 11 B9 09 */ bl J2DPane_NS_appendChild -/* 801DAD68 001D7CA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DAD6C 001D7CAC 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 801DAD68 001D7CA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DAD6C 001D7CAC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801DAD70 001D7CB0 82 DC 5D 30 */ lwz r22, 0x5d30(r28) /* 801DAD74 001D7CB4 38 60 00 00 */ li r3, 0 /* 801DAD78 001D7CB8 48 04 35 51 */ bl dMeter2Info_getNumberTextureName @@ -885,8 +885,8 @@ lbl_801DB40C: /* 801DB40C 001D834C 38 00 00 00 */ li r0, 0 /* 801DB410 001D8350 90 1F 00 9C */ stw r0, 0x9c(r31) lbl_801DB414: -/* 801DB414 001D8354 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DB418 001D8358 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DB414 001D8354 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DB418 001D8358 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DB41C 001D835C 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 801DB420 001D8360 81 83 00 00 */ lwz r12, 0(r3) /* 801DB424 001D8364 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1139,8 +1139,8 @@ dMenu_ItemExplain_c_NS_drawKantera: /* 801DB7B0 001D86F0 C0 22 A8 C4 */ lfs f1, lbl_804542C4-_SDA2_BASE_(r2) /* 801DB7B4 001D86F4 FC 40 08 90 */ fmr f2, f1 /* 801DB7B8 001D86F8 4B FD 34 3D */ bl dKantera_icon_c_NS_setScale -/* 801DB7BC 001D86FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DB7C0 001D8700 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DB7BC 001D86FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DB7C0 001D8700 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DB7C4 001D8704 A0 A3 00 08 */ lhz r5, 8(r3) /* 801DB7C8 001D8708 A0 83 00 06 */ lhz r4, 6(r3) /* 801DB7CC 001D870C 80 7F 00 6C */ lwz r3, 0x6c(r31) @@ -1186,8 +1186,8 @@ dMenu_ItemExplain_c_NS_open_init: /* 801DB85C 001D879C 3B 80 FF FF */ li r28, -1 /* 801DB860 001D87A0 28 00 00 26 */ cmplwi r0, 0x26 /* 801DB864 001D87A4 40 82 00 B4 */ bne lbl_801DB918 -/* 801DB868 001D87A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DB86C 001D87AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DB868 001D87A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DB86C 001D87AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DB870 001D87B0 3B C3 4E 20 */ addi r30, r3, 0x4e20 /* 801DB874 001D87B4 7F C3 F3 78 */ mr r3, r30 /* 801DB878 001D87B8 81 9E 00 00 */ lwz r12, 0(r30) @@ -1204,7 +1204,7 @@ lbl_801DB8A0: /* 801DB8A0 001D87E0 38 1E 00 F9 */ addi r0, r30, 0xf9 /* 801DB8A4 001D87E4 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 801DB8A8 001D87E8 38 80 00 01 */ li r4, 1 -/* 801DB8AC 001D87EC 4B EB C6 35 */ bl checkItemGet +/* 801DB8AC 001D87EC 4B EB C6 35 */ bl checkItemGet__FUci /* 801DB8B0 001D87F0 2C 03 00 00 */ cmpwi r3, 0 /* 801DB8B4 001D87F4 41 82 00 08 */ beq lbl_801DB8BC /* 801DB8B8 001D87F8 3B BD 00 01 */ addi r29, r29, 1 @@ -1944,8 +1944,8 @@ dMenu_ItemExplain_c_NS_openExplain: /* 801DC35C 001D929C 7C BD 2B 78 */ mr r29, r5 /* 801DC360 001D92A0 7C DE 33 78 */ mr r30, r6 /* 801DC364 001D92A4 7C FF 3B 78 */ mr r31, r7 -/* 801DC368 001D92A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC36C 001D92AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC368 001D92A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC36C 001D92AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC370 001D92B0 38 63 00 9C */ addi r3, r3, 0x9c /* 801DC374 001D92B4 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 801DC378 001D92B8 38 A0 00 00 */ li r5, 0 @@ -1987,8 +1987,8 @@ dMenu_ItemExplain_c_NS_openExplainDmap: /* 801DC3F4 001D9334 7F 1E C3 78 */ mr r30, r24 /* 801DC3F8 001D9338 3B A0 00 00 */ li r29, 0 /* 801DC3FC 001D933C 3A C0 00 00 */ li r22, 0 -/* 801DC400 001D9340 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC404 001D9344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC400 001D9340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC404 001D9344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC408 001D9348 3B E3 4E 20 */ addi r31, r3, 0x4e20 /* 801DC40C 001D934C 7F E3 FB 78 */ mr r3, r31 /* 801DC410 001D9350 81 9F 00 00 */ lwz r12, 0(r31) @@ -2007,7 +2007,7 @@ lbl_801DC440: /* 801DC440 001D9380 38 1E 00 F9 */ addi r0, r30, 0xf9 /* 801DC444 001D9384 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 801DC448 001D9388 38 80 00 01 */ li r4, 1 -/* 801DC44C 001D938C 4B EB BA 95 */ bl checkItemGet +/* 801DC44C 001D938C 4B EB BA 95 */ bl checkItemGet__FUci /* 801DC450 001D9390 2C 03 00 00 */ cmpwi r3, 0 /* 801DC454 001D9394 41 82 00 08 */ beq lbl_801DC45C /* 801DC458 001D9398 3A D6 00 01 */ addi r22, r22, 1 @@ -2030,8 +2030,8 @@ lbl_801DC48C: /* 801DC48C 001D93CC 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801DC490 001D93D0 28 00 00 50 */ cmplwi r0, 0x50 /* 801DC494 001D93D4 40 82 00 38 */ bne lbl_801DC4CC -/* 801DC498 001D93D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC49C 001D93DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC498 001D93D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC49C 001D93DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC4A0 001D93E0 38 63 00 CC */ addi r3, r3, 0xcc /* 801DC4A4 001D93E4 38 80 00 4F */ li r4, 0x4f /* 801DC4A8 001D93E8 4B E5 7A 21 */ bl isFirstBit__21dSv_player_get_item_cCFUc @@ -2092,8 +2092,8 @@ lbl_801DC54C: /* 801DC578 001D94B8 38 00 01 6D */ li r0, 0x16d /* 801DC57C 001D94BC 90 17 00 CC */ stw r0, 0xcc(r23) /* 801DC580 001D94C0 88 84 00 DC */ lbz r4, 0xdc(r4) -/* 801DC584 001D94C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC588 001D94C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC584 001D94C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC588 001D94C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC58C 001D94CC 38 63 00 EC */ addi r3, r3, 0xec /* 801DC590 001D94D0 4B E5 79 ED */ bl getBombNum__24dSv_player_item_record_cCFUc /* 801DC594 001D94D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -2108,8 +2108,8 @@ lbl_801DC5B0: /* 801DC5B0 001D94F0 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801DC5B4 001D94F4 28 00 00 46 */ cmplwi r0, 0x46 /* 801DC5B8 001D94F8 40 82 00 30 */ bne lbl_801DC5E8 -/* 801DC5BC 001D94FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC5C0 001D9500 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC5BC 001D94FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC5C0 001D9500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC5C4 001D9504 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 801DC5C8 001D9508 81 83 06 28 */ lwz r12, 0x628(r3) /* 801DC5CC 001D950C 81 8C 02 A0 */ lwz r12, 0x2a0(r12) @@ -2172,8 +2172,8 @@ lbl_801DC67C: /* 801DC69C 001D95DC 38 04 00 0F */ addi r0, r4, 0xf /* 801DC6A0 001D95E0 7C 03 00 00 */ cmpw r3, r0 /* 801DC6A4 001D95E4 40 82 00 30 */ bne lbl_801DC6D4 -/* 801DC6A8 001D95E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC6AC 001D95EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DC6A8 001D95E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC6AC 001D95EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DC6B0 001D95F0 38 63 00 EC */ addi r3, r3, 0xec /* 801DC6B4 001D95F4 4B E5 78 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 801DC6B8 001D95F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -2379,8 +2379,8 @@ lbl_801DC93C: /* 801DC970 001D98B0 41 80 FF CC */ blt lbl_801DC93C /* 801DC974 001D98B4 2C 1F 00 64 */ cmpwi r31, 0x64 /* 801DC978 001D98B8 40 80 00 BC */ bge lbl_801DCA34 -/* 801DC97C 001D98BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DC980 001D98C0 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 801DC97C 001D98BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DC980 001D98C0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801DC984 001D98C4 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801DC988 001D98C8 38 00 00 0A */ li r0, 0xa /* 801DC98C 001D98CC 7C 7F 03 D6 */ divw r3, r31, r0 @@ -2426,8 +2426,8 @@ lbl_801DC93C: /* 801DCA2C 001D996C 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801DCA30 001D9970 48 00 01 0C */ b lbl_801DCB3C lbl_801DCA34: -/* 801DCA34 001D9974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DCA38 001D9978 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 801DCA34 001D9974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DCA38 001D9978 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801DCA3C 001D997C 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801DCA40 001D9980 38 00 00 64 */ li r0, 0x64 /* 801DCA44 001D9984 7C 7F 03 D6 */ divw r3, r31, r0 @@ -2505,8 +2505,8 @@ dMenu_ItemExplain_c_NS_getWarpMarkFlag: /* 801DCB54 001D9A94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DCB58 001D9A98 7C 08 02 A6 */ mflr r0 /* 801DCB5C 001D9A9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DCB60 001D9AA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DCB64 001D9AA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DCB60 001D9AA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DCB64 001D9AA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DCB68 001D9AA8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 801DCB6C 001D9AAC 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801DCB70 001D9AB0 7D 89 03 A6 */ mtctr r12 @@ -2518,8 +2518,8 @@ dMenu_ItemExplain_c_NS_getWarpMarkFlag: /* 801DCB88 001D9AC8 4B E5 27 69 */ bl dComIfGs_getWarpMarkFlag /* 801DCB8C 001D9ACC 48 00 00 20 */ b lbl_801DCBAC lbl_801DCB90: -/* 801DCB90 001D9AD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801DCB94 001D9AD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801DCB90 001D9AD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801DCB94 001D9AD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DCB98 001D9AD8 88 03 00 98 */ lbz r0, 0x98(r3) /* 801DCB9C 001D9ADC 7C 00 07 74 */ extsb r0, r0 /* 801DCBA0 001D9AE0 54 00 0F FE */ srwi r0, r0, 0x1f diff --git a/asm/d/menu/map/d_menu_map_common.s b/asm/d/menu/map/d_menu_map_common.s index ab71a04d4b..adb90c73c1 100644 --- a/asm/d/menu/map/d_menu_map_common.s +++ b/asm/d/menu/map/d_menu_map_common.s @@ -1163,8 +1163,8 @@ lbl_801C3804: /* 801C3888 001C07C8 7C 60 1B 78 */ mr r0, r3 lbl_801C388C: /* 801C388C 001C07CC 90 1F 00 64 */ stw r0, 0x64(r31) -/* 801C3890 001C07D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801C3894 001C07D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801C3890 001C07D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801C3894 001C07D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C3898 001C07D8 80 03 5C BC */ lwz r0, 0x5cbc(r3) /* 801C389C 001C07DC 7C 1E 00 40 */ cmplw r30, r0 /* 801C38A0 001C07E0 40 82 00 2C */ bne lbl_801C38CC diff --git a/asm/d/menu/window/d_menu_window_HIO.s b/asm/d/menu/window/d_menu_window_HIO.s index 37473db27b..35da1a426b 100644 --- a/asm/d/menu/window/d_menu_window_HIO.s +++ b/asm/d/menu/window/d_menu_window_HIO.s @@ -106,8 +106,8 @@ lbl_801F9C44: /* 801F9C6C 001F6BAC 98 1F 00 F4 */ stb r0, 0xf4(r31) /* 801F9C70 001F6BB0 98 1F 00 EA */ stb r0, 0xea(r31) /* 801F9C74 001F6BB4 3B 60 00 00 */ li r27, 0 -/* 801F9C78 001F6BB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801F9C7C 001F6BBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801F9C78 001F6BB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801F9C7C 001F6BBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F9C80 001F6BC0 3B 83 00 CC */ addi r28, r3, 0xcc /* 801F9C84 001F6BC4 3B AD 81 CC */ addi r29, r13, lbl_8045074C-_SDA_BASE_ lbl_801F9C88: diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index ad1b51a0a1..01a66a76e0 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -97,8 +97,8 @@ dMeterButton_c_NS__execute: /* 80201470 001FE3B0 48 00 55 09 */ bl dMeterButton_c_NS_updateText /* 80201474 001FE3B4 38 00 00 00 */ li r0, 0 /* 80201478 001FE3B8 B0 0F 04 B0 */ sth r0, 0x4b0(r15) -/* 8020147C 001FE3BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80201480 001FE3C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020147C 001FE3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80201480 001FE3C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80201484 001FE3C4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80201488 001FE3C8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8020148C 001FE3CC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -590,8 +590,8 @@ lbl_80201B54: /* 80201B54 001FEA94 88 01 00 08 */ lbz r0, 8(r1) /* 80201B58 001FEA98 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80201B5C 001FEA9C 41 82 03 20 */ beq lbl_80201E7C -/* 80201B60 001FEAA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80201B64 001FEAA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80201B60 001FEAA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80201B64 001FEAA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80201B68 001FEAA8 89 C3 5E 2D */ lbz r14, 0x5e2d(r3) /* 80201B6C 001FEAAC 55 C0 07 FF */ clrlwi. r0, r14, 0x1f /* 80201B70 001FEAB0 41 82 00 64 */ beq lbl_80201BD4 @@ -800,8 +800,8 @@ lbl_80201E7C: /* 80201E7C 001FEDBC 88 01 00 09 */ lbz r0, 9(r1) /* 80201E80 001FEDC0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80201E84 001FEDC4 41 82 03 20 */ beq lbl_802021A4 -/* 80201E88 001FEDC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80201E8C 001FEDCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80201E88 001FEDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80201E8C 001FEDCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80201E90 001FEDD0 89 C3 5E 30 */ lbz r14, 0x5e30(r3) /* 80201E94 001FEDD4 55 C0 07 FF */ clrlwi. r0, r14, 0x1f /* 80201E98 001FEDD8 41 82 00 64 */ beq lbl_80201EFC @@ -1061,8 +1061,8 @@ lbl_802021FC: /* 80202264 001FF1A4 39 61 03 30 */ addi r11, r1, 0x330 /* 80202268 001FF1A8 48 15 FF 55 */ bl func_803621BC /* 8020226C 001FF1AC 7C 7E 1B 78 */ mr r30, r3 -/* 80202270 001FF1B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202274 001FF1B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80202270 001FF1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202274 001FF1B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202278 001FF1B8 82 A3 5F 50 */ lwz r21, 0x5f50(r3) /* 8020227C 001FF1BC 7E A3 AB 78 */ mr r3, r21 /* 80202280 001FF1C0 81 95 00 00 */ lwz r12, 0(r21) @@ -1136,8 +1136,8 @@ lbl_80202384: /* 80202384 001FF2C4 3B 60 00 00 */ li r27, 0 /* 80202388 001FF2C8 3B 40 00 00 */ li r26, 0 /* 8020238C 001FF2CC 3B 00 00 00 */ li r24, 0 -/* 80202390 001FF2D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202394 001FF2D4 3B 23 61 C0 */ addi r25, r3, lbl_804061C0@l +/* 80202390 001FF2D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202394 001FF2D4 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 80202398 001FF2D8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020239C 001FF2DC 3B E3 EB C8 */ addi r31, r3, lbl_8042EBC8@l /* 802023A0 001FF2E0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1633,15 +1633,15 @@ dMeterButton_c_NS__delete: /* 80202AC8 001FFA08 7C 00 19 10 */ subfe r0, r0, r3 /* 80202ACC 001FFA0C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80202AD0 001FFA10 40 82 00 1C */ bne lbl_80202AEC -/* 80202AD4 001FFA14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202AD8 001FFA18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80202AD4 001FFA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202AD8 001FFA18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202ADC 001FFA1C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80202AE0 001FFA20 48 03 46 D1 */ bl dMsgObject_c_NS_isMidonaTalkWait /* 80202AE4 001FFA24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202AE8 001FFA28 41 82 00 7C */ beq lbl_80202B64 lbl_80202AEC: -/* 80202AEC 001FFA2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202AF0 001FFA30 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80202AEC 001FFA2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202AF0 001FFA30 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80202AF4 001FFA34 80 7D 5D BC */ lwz r3, 0x5dbc(r29) /* 80202AF8 001FFA38 48 03 46 ED */ bl dMsgObject_c_NS_isPlaceMessage /* 80202AFC 001FFA3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1671,15 +1671,15 @@ lbl_80202AEC: /* 80202B5C 001FFA9C 28 00 00 11 */ cmplwi r0, 0x11 /* 80202B60 001FFAA0 40 82 00 40 */ bne lbl_80202BA0 lbl_80202B64: -/* 80202B64 001FFAA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202B68 001FFAA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80202B64 001FFAA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202B68 001FFAA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202B6C 001FFAAC 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80202B70 001FFAB0 81 83 00 00 */ lwz r12, 0(r3) /* 80202B74 001FFAB4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80202B78 001FFAB8 7D 89 03 A6 */ mtctr r12 /* 80202B7C 001FFABC 4E 80 04 21 */ bctrl -/* 80202B80 001FFAC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202B84 001FFAC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80202B80 001FFAC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202B84 001FFAC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202B88 001FFAC8 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 80202B8C 001FFACC 81 83 00 00 */ lwz r12, 0(r3) /* 80202B90 001FFAD0 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1690,8 +1690,8 @@ lbl_80202BA0: /* 80202BA0 001FFAE0 48 03 45 09 */ bl dMsgObject_c_NS_isGetItemMessage /* 80202BA4 001FFAE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202BA8 001FFAE8 41 82 00 20 */ beq lbl_80202BC8 -/* 80202BAC 001FFAEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80202BB0 001FFAF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80202BAC 001FFAEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80202BB0 001FFAF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202BB4 001FFAF4 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80202BB8 001FFAF8 81 83 00 00 */ lwz r12, 0(r3) /* 80202BBC 001FFAFC 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -2194,8 +2194,8 @@ lbl_80203240: lbl_80203284: /* 80203284 002001C4 38 00 00 00 */ li r0, 0 /* 80203288 002001C8 90 1F 00 D4 */ stw r0, 0xd4(r31) -/* 8020328C 002001CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203290 002001D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020328C 002001CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203290 002001D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203294 002001D4 80 63 5C 9C */ lwz r3, 0x5c9c(r3) /* 80203298 002001D8 81 83 00 00 */ lwz r12, 0(r3) /* 8020329C 002001DC 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -2302,8 +2302,8 @@ dMeterButton_c_NS_alphaAnimeButtonB: /* 80203408 00200348 40 82 00 50 */ bne lbl_80203458 /* 8020340C 0020034C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203410 00200350 41 82 00 30 */ beq lbl_80203440 -/* 80203414 00200354 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203418 00200358 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203414 00200354 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203418 00200358 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020341C 0020035C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203420 00200360 28 00 00 00 */ cmplwi r0, 0 /* 80203424 00200364 41 82 00 10 */ beq lbl_80203434 @@ -2375,8 +2375,8 @@ dMeterButton_c_NS_alphaAnimeButtonR: /* 80203504 00200444 40 82 00 58 */ bne lbl_8020355C /* 80203508 00200448 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 8020350C 0020044C 41 82 00 30 */ beq lbl_8020353C -/* 80203510 00200450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203514 00200454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203510 00200450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203514 00200454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203518 00200458 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020351C 0020045C 28 00 00 00 */ cmplwi r0, 0 /* 80203520 00200460 41 82 00 10 */ beq lbl_80203530 @@ -2454,8 +2454,8 @@ dMeterButton_c_NS_alphaAnimeButtonZ: /* 80203618 00200558 40 82 00 58 */ bne lbl_80203670 /* 8020361C 0020055C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203620 00200560 41 82 00 30 */ beq lbl_80203650 -/* 80203624 00200564 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203628 00200568 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203624 00200564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203628 00200568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020362C 0020056C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203630 00200570 28 00 00 00 */ cmplwi r0, 0 /* 80203634 00200574 41 82 00 10 */ beq lbl_80203644 @@ -2541,8 +2541,8 @@ lbl_80203730: /* 80203748 00200688 B0 1F 04 B0 */ sth r0, 0x4b0(r31) /* 8020374C 0020068C 48 00 00 50 */ b lbl_8020379C lbl_80203750: -/* 80203750 00200690 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203754 00200694 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203750 00200690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203754 00200694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203758 00200698 88 03 5E 4B */ lbz r0, 0x5e4b(r3) /* 8020375C 0020069C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80203760 002006A0 41 82 00 18 */ beq lbl_80203778 @@ -2697,8 +2697,8 @@ dMeterButton_c_NS_alphaAnimeButtonX: /* 80203960 002008A0 40 82 00 58 */ bne lbl_802039B8 /* 80203964 002008A4 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203968 002008A8 41 82 00 30 */ beq lbl_80203998 -/* 8020396C 002008AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203970 002008B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020396C 002008AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203970 002008B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203974 002008B4 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203978 002008B8 28 00 00 00 */ cmplwi r0, 0 /* 8020397C 002008BC 41 82 00 10 */ beq lbl_8020398C @@ -2776,8 +2776,8 @@ dMeterButton_c_NS_alphaAnimeButtonY: /* 80203A74 002009B4 40 82 00 58 */ bne lbl_80203ACC /* 80203A78 002009B8 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203A7C 002009BC 41 82 00 30 */ beq lbl_80203AAC -/* 80203A80 002009C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203A84 002009C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203A80 002009C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203A84 002009C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203A88 002009C8 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203A8C 002009CC 28 00 00 00 */ cmplwi r0, 0 /* 80203A90 002009D0 41 82 00 10 */ beq lbl_80203AA0 @@ -2855,8 +2855,8 @@ dMeterButton_c_NS_alphaAnimeButtonNun: /* 80203B88 00200AC8 40 82 00 58 */ bne lbl_80203BE0 /* 80203B8C 00200ACC 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203B90 00200AD0 41 82 00 30 */ beq lbl_80203BC0 -/* 80203B94 00200AD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203B98 00200AD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203B94 00200AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203B98 00200AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203B9C 00200ADC 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203BA0 00200AE0 28 00 00 00 */ cmplwi r0, 0 /* 80203BA4 00200AE4 41 82 00 10 */ beq lbl_80203BB4 @@ -2934,8 +2934,8 @@ dMeterButton_c_NS_alphaAnimeButtonRemo: /* 80203C9C 00200BDC 40 82 00 58 */ bne lbl_80203CF4 /* 80203CA0 00200BE0 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203CA4 00200BE4 41 82 00 30 */ beq lbl_80203CD4 -/* 80203CA8 00200BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203CAC 00200BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203CA8 00200BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203CAC 00200BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203CB0 00200BF0 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203CB4 00200BF4 28 00 00 00 */ cmplwi r0, 0 /* 80203CB8 00200BF8 41 82 00 10 */ beq lbl_80203CC8 @@ -3013,8 +3013,8 @@ dMeterButton_c_NS_alphaAnimeButtonRemo2: /* 80203DB0 00200CF0 40 82 00 58 */ bne lbl_80203E08 /* 80203DB4 00200CF4 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203DB8 00200CF8 41 82 00 30 */ beq lbl_80203DE8 -/* 80203DBC 00200CFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203DC0 00200D00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203DBC 00200CFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203DC0 00200D00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203DC4 00200D04 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203DC8 00200D08 28 00 00 00 */ cmplwi r0, 0 /* 80203DCC 00200D0C 41 82 00 10 */ beq lbl_80203DDC @@ -3089,8 +3089,8 @@ dMeterButton_c_NS_alphaAnimeButtonAR: /* 80203EB8 00200DF8 40 82 00 58 */ bne lbl_80203F10 /* 80203EBC 00200DFC 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203EC0 00200E00 41 82 00 30 */ beq lbl_80203EF0 -/* 80203EC4 00200E04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203EC8 00200E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203EC4 00200E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203EC8 00200E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203ECC 00200E0C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203ED0 00200E10 28 00 00 00 */ cmplwi r0, 0 /* 80203ED4 00200E14 41 82 00 10 */ beq lbl_80203EE4 @@ -3165,8 +3165,8 @@ dMeterButton_c_NS_alphaAnimeButton3DB: /* 80203FC0 00200F00 40 82 00 58 */ bne lbl_80204018 /* 80203FC4 00200F04 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80203FC8 00200F08 41 82 00 30 */ beq lbl_80203FF8 -/* 80203FCC 00200F0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80203FD0 00200F10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80203FCC 00200F0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80203FD0 00200F10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80203FD4 00200F14 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80203FD8 00200F18 28 00 00 00 */ cmplwi r0, 0 /* 80203FDC 00200F1C 41 82 00 10 */ beq lbl_80203FEC @@ -3241,8 +3241,8 @@ dMeterButton_c_NS_alphaAnimeButtonNURE: /* 802040C8 00201008 40 82 00 58 */ bne lbl_80204120 /* 802040CC 0020100C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 802040D0 00201010 41 82 00 30 */ beq lbl_80204100 -/* 802040D4 00201014 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802040D8 00201018 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802040D4 00201014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802040D8 00201018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802040DC 0020101C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802040E0 00201020 28 00 00 00 */ cmplwi r0, 0 /* 802040E4 00201024 41 82 00 10 */ beq lbl_802040F4 @@ -3317,8 +3317,8 @@ dMeterButton_c_NS_alphaAnimeButtonReel: /* 802041D0 00201110 40 82 00 58 */ bne lbl_80204228 /* 802041D4 00201114 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 802041D8 00201118 41 82 00 30 */ beq lbl_80204208 -/* 802041DC 0020111C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802041E0 00201120 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802041DC 0020111C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802041E0 00201120 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802041E4 00201124 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802041E8 00201128 28 00 00 00 */ cmplwi r0, 0 /* 802041EC 0020112C 41 82 00 10 */ beq lbl_802041FC @@ -3393,8 +3393,8 @@ dMeterButton_c_NS_alphaAnimeButtonReel2: /* 802042D8 00201218 40 82 00 58 */ bne lbl_80204330 /* 802042DC 0020121C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 802042E0 00201220 41 82 00 30 */ beq lbl_80204310 -/* 802042E4 00201224 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802042E8 00201228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802042E4 00201224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802042E8 00201228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802042EC 0020122C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802042F0 00201230 28 00 00 00 */ cmplwi r0, 0 /* 802042F4 00201234 41 82 00 10 */ beq lbl_80204304 @@ -3463,8 +3463,8 @@ dMeterButton_c_NS_alphaAnimeButtonAB: /* 802043C8 00201308 40 82 00 58 */ bne lbl_80204420 /* 802043CC 0020130C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 802043D0 00201310 41 82 00 30 */ beq lbl_80204400 -/* 802043D4 00201314 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802043D8 00201318 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802043D4 00201314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802043D8 00201318 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802043DC 0020131C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802043E0 00201320 28 00 00 00 */ cmplwi r0, 0 /* 802043E4 00201324 41 82 00 10 */ beq lbl_802043F4 @@ -3533,8 +3533,8 @@ dMeterButton_c_NS_alphaAnimeButtonTate: /* 802044B8 002013F8 40 82 00 58 */ bne lbl_80204510 /* 802044BC 002013FC 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 802044C0 00201400 41 82 00 30 */ beq lbl_802044F0 -/* 802044C4 00201404 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802044C8 00201408 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802044C4 00201404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802044C8 00201408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802044CC 0020140C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802044D0 00201410 28 00 00 00 */ cmplwi r0, 0 /* 802044D4 00201414 41 82 00 10 */ beq lbl_802044E4 @@ -3597,8 +3597,8 @@ dMeterButton_c_NS_alphaAnimeButtonNunZ: /* 80204590 002014D0 41 82 00 58 */ beq lbl_802045E8 /* 80204594 002014D4 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80204598 002014D8 41 82 00 30 */ beq lbl_802045C8 -/* 8020459C 002014DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802045A0 002014E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020459C 002014DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802045A0 002014E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802045A4 002014E4 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 802045A8 002014E8 28 00 00 00 */ cmplwi r0, 0 /* 802045AC 002014EC 41 82 00 10 */ beq lbl_802045BC @@ -3661,8 +3661,8 @@ dMeterButton_c_NS_alphaAnimeButtonNunC: /* 80204668 002015A8 41 82 00 58 */ beq lbl_802046C0 /* 8020466C 002015AC 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80204670 002015B0 41 82 00 30 */ beq lbl_802046A0 -/* 80204674 002015B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80204678 002015B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80204674 002015B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80204678 002015B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020467C 002015BC 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80204680 002015C0 28 00 00 00 */ cmplwi r0, 0 /* 80204684 002015C4 41 82 00 10 */ beq lbl_80204694 @@ -3731,8 +3731,8 @@ dMeterButton_c_NS_alphaAnimeButtonBin: /* 80204758 00201698 40 82 00 58 */ bne lbl_802047B0 /* 8020475C 0020169C 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 80204760 002016A0 41 82 00 30 */ beq lbl_80204790 -/* 80204764 002016A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80204768 002016A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80204764 002016A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80204768 002016A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020476C 002016AC 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 80204770 002016B0 28 00 00 00 */ cmplwi r0, 0 /* 80204774 002016B4 41 82 00 10 */ beq lbl_80204784 @@ -3794,8 +3794,8 @@ lbl_80204820: /* 80204828 00201768 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 8020482C 0020176C 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 80204830 00201770 3C A0 00 02 */ lis r5, 2 -/* 80204834 00201774 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80204838 00201778 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80204834 00201774 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80204838 00201778 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8020483C 0020177C 80 C6 5C 9C */ lwz r6, 0x5c9c(r6) /* 80204840 00201780 48 0F 3E 09 */ bl J2DScreen_NS_setPriority /* 80204844 00201784 80 7F 00 08 */ lwz r3, 8(r31) @@ -4267,8 +4267,8 @@ lbl_80204F20: /* 80204F40 00201E80 38 A0 00 20 */ li r5, 0x20 /* 80204F44 00201E84 48 0C 95 91 */ bl alloc__7JKRHeapFUli /* 80204F48 00201E88 90 7F 01 10 */ stw r3, 0x110(r31) -/* 80204F4C 00201E8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80204F50 00201E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80204F4C 00201E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80204F50 00201E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80204F54 00201E94 38 63 00 9C */ addi r3, r3, 0x9c /* 80204F58 00201E98 38 80 00 14 */ li r4, 0x14 /* 80204F5C 00201E9C 38 A0 00 00 */ li r5, 0 @@ -4799,8 +4799,8 @@ lbl_802053AC: /* 80205770 002026B0 D0 1F 01 40 */ stfs f0, 0x140(r31) /* 80205774 002026B4 C0 02 AD 8C */ lfs f0, lbl_8045478C-_SDA2_BASE_(r2) /* 80205778 002026B8 D0 1F 01 44 */ stfs f0, 0x144(r31) -/* 8020577C 002026BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80205780 002026C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020577C 002026BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80205780 002026C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80205784 002026C4 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 80205788 002026C8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8020578C 002026CC 41 82 00 0C */ beq lbl_80205798 @@ -4874,8 +4874,8 @@ lbl_80205874: /* 80205880 002027C0 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 80205884 002027C4 38 84 00 22 */ addi r4, r4, 0x22 /* 80205888 002027C8 3C A0 00 02 */ lis r5, 2 -/* 8020588C 002027CC 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80205890 002027D0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8020588C 002027CC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80205890 002027D0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205894 002027D4 80 C6 5C 70 */ lwz r6, 0x5c70(r6) /* 80205898 002027D8 48 0F 2D B1 */ bl J2DScreen_NS_setPriority /* 8020589C 002027DC 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -4970,8 +4970,8 @@ lbl_802059E8: /* 802059F4 00202934 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 802059F8 00202938 38 84 00 3F */ addi r4, r4, 0x3f /* 802059FC 0020293C 3C A0 00 02 */ lis r5, 2 -/* 80205A00 00202940 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80205A04 00202944 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80205A00 00202940 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80205A04 00202944 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205A08 00202948 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 80205A0C 0020294C 48 0F 2C 3D */ bl J2DScreen_NS_setPriority /* 80205A10 00202950 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -5202,8 +5202,8 @@ lbl_80205D5C: lbl_80205D60: /* 80205D60 00202CA0 3B E0 00 01 */ li r31, 1 lbl_80205D64: -/* 80205D64 00202CA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80205D68 00202CA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80205D64 00202CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80205D68 00202CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80205D6C 00202CAC 3B 63 4E 00 */ addi r27, r3, 0x4e00 /* 80205D70 00202CB0 7F 63 DB 78 */ mr r3, r27 /* 80205D74 00202CB4 3C 80 80 3A */ lis r4, lbl_803980E8@ha @@ -5246,8 +5246,8 @@ lbl_80205DF0: /* 80205DFC 00202D3C 40 82 00 08 */ bne lbl_80205E04 /* 80205E00 00202D40 C3 A2 AD 98 */ lfs f29, lbl_80454798-_SDA2_BASE_(r2) lbl_80205E04: -/* 80205E04 00202D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80205E08 00202D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80205E04 00202D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80205E08 00202D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80205E0C 00202D4C 88 03 5E 32 */ lbz r0, 0x5e32(r3) /* 80205E10 00202D50 28 00 00 43 */ cmplwi r0, 0x43 /* 80205E14 00202D54 41 82 00 0C */ beq lbl_80205E20 @@ -5327,8 +5327,8 @@ lbl_80205F10: /* 80205F20 00202E60 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80205F24 00202E64 41 82 00 40 */ beq lbl_80205F64 /* 80205F28 00202E68 D0 3D 04 F4 */ stfs f1, 0x4f4(r29) -/* 80205F2C 00202E6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80205F30 00202E70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80205F2C 00202E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80205F30 00202E70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80205F34 00202E74 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80205F38 00202E78 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80205F3C 00202E7C 40 82 00 28 */ bne lbl_80205F64 @@ -6320,8 +6320,8 @@ lbl_80206D5C: .global dMeterButton_c_NS_isFastSet dMeterButton_c_NS_isFastSet: -/* 80206D70 00203CB0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80206D74 00203CB4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80206D70 00203CB0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80206D74 00203CB4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80206D78 00203CB8 88 05 5E 4A */ lbz r0, 0x5e4a(r5) /* 80206D7C 00203CBC 54 05 07 FF */ clrlwi. r5, r0, 0x1f /* 80206D80 00203CC0 41 82 00 14 */ beq lbl_80206D94 @@ -6330,8 +6330,8 @@ dMeterButton_c_NS_isFastSet: /* 80206D8C 00203CCC 28 00 00 00 */ cmplwi r0, 0 /* 80206D90 00203CD0 41 82 02 C0 */ beq lbl_80207050 lbl_80206D94: -/* 80206D94 00203CD4 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80206D98 00203CD8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80206D94 00203CD4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80206D98 00203CD8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80206D9C 00203CDC 88 06 5E 43 */ lbz r0, 0x5e43(r6) /* 80206DA0 00203CE0 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80206DA4 00203CE4 41 82 00 14 */ beq lbl_80206DB8 @@ -6340,8 +6340,8 @@ lbl_80206D94: /* 80206DB0 00203CF0 28 06 00 01 */ cmplwi r6, 1 /* 80206DB4 00203CF4 41 82 02 9C */ beq lbl_80207050 lbl_80206DB8: -/* 80206DB8 00203CF8 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80206DBC 00203CFC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80206DB8 00203CF8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80206DBC 00203CFC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80206DC0 00203D00 88 C6 5E 42 */ lbz r6, 0x5e42(r6) /* 80206DC4 00203D04 54 C6 07 FF */ clrlwi. r6, r6, 0x1f /* 80206DC8 00203D08 41 82 00 14 */ beq lbl_80206DDC @@ -6350,8 +6350,8 @@ lbl_80206DB8: /* 80206DD4 00203D14 28 06 00 02 */ cmplwi r6, 2 /* 80206DD8 00203D18 41 82 02 78 */ beq lbl_80207050 lbl_80206DDC: -/* 80206DDC 00203D1C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80206DE0 00203D20 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80206DDC 00203D1C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80206DE0 00203D20 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80206DE4 00203D24 88 C6 5E 4E */ lbz r6, 0x5e4e(r6) /* 80206DE8 00203D28 54 C6 07 FF */ clrlwi. r6, r6, 0x1f /* 80206DEC 00203D2C 41 82 00 14 */ beq lbl_80206E00 @@ -6360,8 +6360,8 @@ lbl_80206DDC: /* 80206DF8 00203D38 28 06 00 03 */ cmplwi r6, 3 /* 80206DFC 00203D3C 41 82 02 54 */ beq lbl_80207050 lbl_80206E00: -/* 80206E00 00203D40 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80206E04 00203D44 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80206E00 00203D40 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80206E04 00203D44 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80206E08 00203D48 88 C6 5E 4B */ lbz r6, 0x5e4b(r6) /* 80206E0C 00203D4C 54 C6 07 FF */ clrlwi. r6, r6, 0x1f /* 80206E10 00203D50 41 82 00 14 */ beq lbl_80206E24 @@ -6370,8 +6370,8 @@ lbl_80206E00: /* 80206E1C 00203D5C 28 07 00 04 */ cmplwi r7, 4 /* 80206E20 00203D60 41 82 02 30 */ beq lbl_80207050 lbl_80206E24: -/* 80206E24 00203D64 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206E28 00203D68 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206E24 00203D64 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206E28 00203D68 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206E2C 00203D6C 88 E7 5E 4C */ lbz r7, 0x5e4c(r7) /* 80206E30 00203D70 54 E7 07 FF */ clrlwi. r7, r7, 0x1f /* 80206E34 00203D74 41 82 00 14 */ beq lbl_80206E48 @@ -6380,8 +6380,8 @@ lbl_80206E24: /* 80206E40 00203D80 28 07 00 05 */ cmplwi r7, 5 /* 80206E44 00203D84 41 82 02 0C */ beq lbl_80207050 lbl_80206E48: -/* 80206E48 00203D88 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206E4C 00203D8C 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206E48 00203D88 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206E4C 00203D8C 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206E50 00203D90 88 E7 5E 4D */ lbz r7, 0x5e4d(r7) /* 80206E54 00203D94 54 E7 07 FF */ clrlwi. r7, r7, 0x1f /* 80206E58 00203D98 41 82 00 14 */ beq lbl_80206E6C @@ -6390,8 +6390,8 @@ lbl_80206E48: /* 80206E64 00203DA4 28 07 00 06 */ cmplwi r7, 6 /* 80206E68 00203DA8 41 82 01 E8 */ beq lbl_80207050 lbl_80206E6C: -/* 80206E6C 00203DAC 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206E70 00203DB0 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206E6C 00203DAC 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206E70 00203DB0 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206E74 00203DB4 88 E7 5E 5E */ lbz r7, 0x5e5e(r7) /* 80206E78 00203DB8 54 E7 07 FF */ clrlwi. r7, r7, 0x1f /* 80206E7C 00203DBC 41 82 00 14 */ beq lbl_80206E90 @@ -6400,8 +6400,8 @@ lbl_80206E6C: /* 80206E88 00203DC8 28 07 00 07 */ cmplwi r7, 7 /* 80206E8C 00203DCC 41 82 01 C4 */ beq lbl_80207050 lbl_80206E90: -/* 80206E90 00203DD0 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206E94 00203DD4 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206E90 00203DD0 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206E94 00203DD4 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206E98 00203DD8 88 E7 5E 62 */ lbz r7, 0x5e62(r7) /* 80206E9C 00203DDC 54 E7 07 FF */ clrlwi. r7, r7, 0x1f /* 80206EA0 00203DE0 41 82 00 14 */ beq lbl_80206EB4 @@ -6410,8 +6410,8 @@ lbl_80206E90: /* 80206EAC 00203DEC 28 07 00 08 */ cmplwi r7, 8 /* 80206EB0 00203DF0 41 82 01 A0 */ beq lbl_80207050 lbl_80206EB4: -/* 80206EB4 00203DF4 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206EB8 00203DF8 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206EB4 00203DF4 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206EB8 00203DF8 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206EBC 00203DFC 88 E7 5E 45 */ lbz r7, 0x5e45(r7) /* 80206EC0 00203E00 54 E9 07 FF */ clrlwi. r9, r7, 0x1f /* 80206EC4 00203E04 41 82 00 14 */ beq lbl_80206ED8 @@ -6420,8 +6420,8 @@ lbl_80206EB4: /* 80206ED0 00203E10 28 07 00 09 */ cmplwi r7, 9 /* 80206ED4 00203E14 41 82 01 7C */ beq lbl_80207050 lbl_80206ED8: -/* 80206ED8 00203E18 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 80206EDC 00203E1C 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 80206ED8 00203E18 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 80206EDC 00203E1C 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 80206EE0 00203E20 88 E7 5E 47 */ lbz r7, 0x5e47(r7) /* 80206EE4 00203E24 54 E8 07 FF */ clrlwi. r8, r7, 0x1f /* 80206EE8 00203E28 41 82 00 14 */ beq lbl_80206EFC @@ -6501,8 +6501,8 @@ lbl_80206FCC: /* 80206FDC 00203F1C 28 00 00 12 */ cmplwi r0, 0x12 /* 80206FE0 00203F20 41 82 00 70 */ beq lbl_80207050 lbl_80206FE4: -/* 80206FE4 00203F24 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80206FE8 00203F28 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80206FE4 00203F24 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80206FE8 00203F28 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80206FEC 00203F2C 88 05 5E 65 */ lbz r0, 0x5e65(r5) /* 80206FF0 00203F30 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80206FF4 00203F34 41 82 00 14 */ beq lbl_80207008 @@ -6511,8 +6511,8 @@ lbl_80206FE4: /* 80207000 00203F40 28 00 00 13 */ cmplwi r0, 0x13 /* 80207004 00203F44 41 82 00 4C */ beq lbl_80207050 lbl_80207008: -/* 80207008 00203F48 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8020700C 00203F4C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80207008 00203F48 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8020700C 00203F4C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80207010 00203F50 88 05 5E 69 */ lbz r0, 0x5e69(r5) /* 80207014 00203F54 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207018 00203F58 41 82 00 14 */ beq lbl_8020702C @@ -6521,8 +6521,8 @@ lbl_80207008: /* 80207024 00203F64 28 00 00 14 */ cmplwi r0, 0x14 /* 80207028 00203F68 41 82 00 28 */ beq lbl_80207050 lbl_8020702C: -/* 8020702C 00203F6C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80207030 00203F70 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8020702C 00203F6C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80207030 00203F70 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80207034 00203F74 88 05 5E 46 */ lbz r0, 0x5e46(r5) /* 80207038 00203F78 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020703C 00203F7C 41 82 00 1C */ beq lbl_80207058 @@ -6549,8 +6549,8 @@ dMeterButton_c_NS_setAlphaButtonAAnimeMax: /* 8020707C 00203FBC C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207080 00203FC0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207084 00203FC4 41 82 00 B4 */ beq lbl_80207138 -/* 80207088 00203FC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020708C 00203FCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207088 00203FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020708C 00203FCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207090 00203FD0 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80207094 00203FD4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207098 00203FD8 41 82 00 20 */ beq lbl_802070B8 @@ -6655,8 +6655,8 @@ dMeterButton_c_NS_setAlphaButtonBAnimeMax: /* 802071F8 00204138 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802071FC 0020413C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207200 00204140 41 82 00 B4 */ beq lbl_802072B4 -/* 80207204 00204144 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207208 00204148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207204 00204144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207208 00204148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020720C 0020414C 88 03 5E 43 */ lbz r0, 0x5e43(r3) /* 80207210 00204150 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207214 00204154 41 82 00 20 */ beq lbl_80207234 @@ -6761,8 +6761,8 @@ dMeterButton_c_NS_setAlphaButtonRAnimeMax: /* 80207374 002042B4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207378 002042B8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020737C 002042BC 41 82 00 B4 */ beq lbl_80207430 -/* 80207380 002042C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207384 002042C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207380 002042C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207384 002042C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207388 002042C8 88 03 5E 42 */ lbz r0, 0x5e42(r3) /* 8020738C 002042CC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207390 002042D0 41 82 00 20 */ beq lbl_802073B0 @@ -6867,8 +6867,8 @@ dMeterButton_c_NS_setAlphaButtonZAnimeMax: /* 802074F0 00204430 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802074F4 00204434 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802074F8 00204438 41 82 00 B4 */ beq lbl_802075AC -/* 802074FC 0020443C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207500 00204440 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802074FC 0020443C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207500 00204440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207504 00204444 88 03 5E 4E */ lbz r0, 0x5e4e(r3) /* 80207508 00204448 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020750C 0020444C 41 82 00 20 */ beq lbl_8020752C @@ -6974,8 +6974,8 @@ dMeterButton_c_NS_setAlphaButton3DAnimeMax: /* 80207670 002045B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207674 002045B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207678 002045B8 41 82 00 B4 */ beq lbl_8020772C -/* 8020767C 002045BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207680 002045C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020767C 002045BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207680 002045C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207684 002045C4 88 03 5E 4B */ lbz r0, 0x5e4b(r3) /* 80207688 002045C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020768C 002045CC 41 82 00 20 */ beq lbl_802076AC @@ -7097,8 +7097,8 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMax: /* 80207814 00204754 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207818 00204758 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020781C 0020475C 41 82 00 B4 */ beq lbl_802078D0 -/* 80207820 00204760 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207824 00204764 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207820 00204760 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207824 00204764 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207828 00204768 88 03 5E 4C */ lbz r0, 0x5e4c(r3) /* 8020782C 0020476C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207830 00204770 41 82 00 20 */ beq lbl_80207850 @@ -7292,8 +7292,8 @@ dMeterButton_c_NS_setAlphaButtonSAnimeMax: /* 80207AD4 00204A14 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207AD8 00204A18 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207ADC 00204A1C 41 82 00 B4 */ beq lbl_80207B90 -/* 80207AE0 00204A20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207AE4 00204A24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207AE0 00204A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207AE4 00204A24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207AE8 00204A28 88 03 5E 4D */ lbz r0, 0x5e4d(r3) /* 80207AEC 00204A2C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207AF0 00204A30 41 82 00 20 */ beq lbl_80207B10 @@ -7398,8 +7398,8 @@ dMeterButton_c_NS_setAlphaButtonXAnimeMax: /* 80207C50 00204B90 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207C54 00204B94 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207C58 00204B98 41 82 00 B4 */ beq lbl_80207D0C -/* 80207C5C 00204B9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207C60 00204BA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207C5C 00204B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207C60 00204BA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207C64 00204BA4 88 03 5E 5E */ lbz r0, 0x5e5e(r3) /* 80207C68 00204BA8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207C6C 00204BAC 41 82 00 20 */ beq lbl_80207C8C @@ -7504,8 +7504,8 @@ dMeterButton_c_NS_setAlphaButtonYAnimeMax: /* 80207DCC 00204D0C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207DD0 00204D10 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207DD4 00204D14 41 82 00 B4 */ beq lbl_80207E88 -/* 80207DD8 00204D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207DDC 00204D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207DD8 00204D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207DDC 00204D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207DE0 00204D20 88 03 5E 62 */ lbz r0, 0x5e62(r3) /* 80207DE4 00204D24 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207DE8 00204D28 41 82 00 20 */ beq lbl_80207E08 @@ -7614,8 +7614,8 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMax: /* 80207F58 00204E98 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207F5C 00204E9C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207F60 00204EA0 41 82 00 B4 */ beq lbl_80208014 -/* 80207F64 00204EA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80207F68 00204EA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80207F64 00204EA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80207F68 00204EA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80207F6C 00204EAC 88 03 5E 45 */ lbz r0, 0x5e45(r3) /* 80207F70 00204EB0 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80207F74 00204EB4 41 82 00 20 */ beq lbl_80207F94 @@ -7724,8 +7724,8 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMax: /* 802080E4 00205024 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802080E8 00205028 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802080EC 0020502C 41 82 00 B4 */ beq lbl_802081A0 -/* 802080F0 00205030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802080F4 00205034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802080F0 00205030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802080F4 00205034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802080F8 00205038 88 03 5E 47 */ lbz r0, 0x5e47(r3) /* 802080FC 0020503C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80208100 00205040 41 82 00 20 */ beq lbl_80208120 @@ -7834,8 +7834,8 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax: /* 80208270 002051B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208274 002051B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208278 002051B8 41 82 00 B4 */ beq lbl_8020832C -/* 8020827C 002051BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80208280 002051C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020827C 002051BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80208280 002051C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80208284 002051C4 88 03 5E 47 */ lbz r0, 0x5e47(r3) /* 80208288 002051C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020828C 002051CC 41 82 00 20 */ beq lbl_802082AC @@ -7944,8 +7944,8 @@ dMeterButton_c_NS_setAlphaButtonARAnimeMax: /* 802083FC 0020533C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208400 00205340 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208404 00205344 41 82 00 C0 */ beq lbl_802084C4 -/* 80208408 00205348 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020840C 0020534C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80208408 00205348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020840C 0020534C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80208410 00205350 88 03 5E 43 */ lbz r0, 0x5e43(r3) /* 80208414 00205354 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80208418 00205358 40 82 00 10 */ bne lbl_80208428 @@ -8058,8 +8058,8 @@ dMeterButton_c_NS_setAlphaButton3DBAnimeMax: /* 80208594 002054D4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208598 002054D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020859C 002054DC 41 82 00 C0 */ beq lbl_8020865C -/* 802085A0 002054E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802085A4 002054E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802085A0 002054E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802085A4 002054E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802085A8 002054E8 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 802085AC 002054EC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802085B0 002054F0 40 82 00 10 */ bne lbl_802085C0 @@ -8172,8 +8172,8 @@ dMeterButton_c_NS_setAlphaButtonNUREAnimeMax: /* 8020872C 0020566C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208730 00205670 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208734 00205674 41 82 00 C0 */ beq lbl_802087F4 -/* 80208738 00205678 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020873C 0020567C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80208738 00205678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020873C 0020567C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80208740 00205680 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80208744 00205684 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80208748 00205688 40 82 00 10 */ bne lbl_80208758 @@ -8286,8 +8286,8 @@ dMeterButton_c_NS_setAlphaButtonReelAnimeMax: /* 802088C4 00205804 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802088C8 00205808 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802088CC 0020580C 41 82 00 C0 */ beq lbl_8020898C -/* 802088D0 00205810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802088D4 00205814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802088D0 00205810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802088D4 00205814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802088D8 00205818 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 802088DC 0020581C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802088E0 00205820 40 82 00 10 */ bne lbl_802088F0 @@ -8676,8 +8676,8 @@ dMeterButton_c_NS_setAlphaButtonNunZAnimeMax: /* 80208E40 00205D80 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208E44 00205D84 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208E48 00205D88 41 82 00 C0 */ beq lbl_80208F08 -/* 80208E4C 00205D8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80208E50 00205D90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80208E4C 00205D8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80208E50 00205D90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80208E54 00205D94 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80208E58 00205D98 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80208E5C 00205D9C 40 82 00 10 */ bne lbl_80208E6C @@ -8790,8 +8790,8 @@ dMeterButton_c_NS_setAlphaButtonNunCAnimeMax: /* 80208FD8 00205F18 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208FDC 00205F1C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208FE0 00205F20 41 82 00 C0 */ beq lbl_802090A0 -/* 80208FE4 00205F24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80208FE8 00205F28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80208FE4 00205F24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80208FE8 00205F28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80208FEC 00205F2C 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80208FF0 00205F30 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80208FF4 00205F34 40 82 00 10 */ bne lbl_80209004 @@ -8904,8 +8904,8 @@ dMeterButton_c_NS_setAlphaButtonBinAnimeMax: /* 80209170 002060B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80209174 002060B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209178 002060B8 41 82 00 C0 */ beq lbl_80209238 -/* 8020917C 002060BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80209180 002060C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020917C 002060BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80209180 002060C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80209184 002060C4 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80209188 002060C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020918C 002060CC 40 82 00 10 */ bne lbl_8020919C @@ -9640,8 +9640,8 @@ lbl_80209B7C: /* 80209BB0 00206AF0 D0 03 02 F4 */ stfs f0, 0x2f4(r3) /* 80209BB4 00206AF4 48 00 00 68 */ b lbl_80209C1C lbl_80209BB8: -/* 80209BB8 00206AF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80209BBC 00206AFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80209BB8 00206AF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80209BBC 00206AFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80209BC0 00206B00 88 03 5E 4B */ lbz r0, 0x5e4b(r3) /* 80209BC4 00206B04 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80209BC8 00206B08 41 82 00 14 */ beq lbl_80209BDC @@ -10037,8 +10037,8 @@ lbl_8020A12C: /* 8020A188 002070C8 C0 1B 05 24 */ lfs f0, 0x524(r27) /* 8020A18C 002070CC EC 00 00 72 */ fmuls f0, f0, f1 /* 8020A190 002070D0 D0 1E 01 EC */ stfs f0, 0x1ec(r30) -/* 8020A194 002070D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020A198 002070D8 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 8020A194 002070D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020A198 002070D8 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8020A19C 002070DC 88 1A 5E 2D */ lbz r0, 0x5e2d(r26) /* 8020A1A0 002070E0 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020A1A4 002070E4 41 82 00 44 */ beq lbl_8020A1E8 @@ -10083,8 +10083,8 @@ lbl_8020A234: /* 8020A238 00207178 7C 7B EA 14 */ add r3, r27, r29 /* 8020A23C 0020717C D0 03 03 04 */ stfs f0, 0x304(r3) /* 8020A240 00207180 48 00 02 50 */ b lbl_8020A490 -/* 8020A244 00207184 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020A248 00207188 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020A244 00207184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020A248 00207188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020A24C 0020718C 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 8020A250 00207190 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8020A254 00207194 41 82 00 48 */ beq lbl_8020A29C @@ -10641,8 +10641,8 @@ dMeterButton_c_NS_pikariCheck: /* 8020AA88 002079C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020AA8C 002079CC 39 00 00 00 */ li r8, 0 /* 8020AA90 002079D0 39 20 00 00 */ li r9, 0 -/* 8020AA94 002079D4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020AA98 002079D8 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8020AA94 002079D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020AA98 002079D8 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8020AA9C 002079DC 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 8020AAA0 002079E0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020AAA4 002079E4 38 00 00 02 */ li r0, 2 diff --git a/asm/d/meter/d_meter_haihai.s b/asm/d/meter/d_meter_haihai.s index e61ea1a3e3..308ca6f97c 100644 --- a/asm/d/meter/d_meter_haihai.s +++ b/asm/d/meter/d_meter_haihai.s @@ -81,8 +81,8 @@ lbl_8020AF9C: /* 8020AFA4 00207EE4 3C 80 80 3A */ lis r4, lbl_80398158@ha /* 8020AFA8 00207EE8 38 84 81 58 */ addi r4, r4, lbl_80398158@l /* 8020AFAC 00207EEC 3C A0 00 02 */ lis r5, 2 -/* 8020AFB0 00207EF0 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8020AFB4 00207EF4 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8020AFB0 00207EF0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8020AFB4 00207EF4 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8020AFB8 00207EF8 80 DE 5D 30 */ lwz r6, 0x5d30(r30) /* 8020AFBC 00207EFC 48 0E D6 8D */ bl J2DScreen_NS_setPriority /* 8020AFC0 00207F00 80 7F 00 04 */ lwz r3, 4(r31) @@ -206,8 +206,8 @@ lbl_8020B190: /* 8020B190 002080D0 88 1D 00 28 */ lbz r0, 0x28(r29) /* 8020B194 002080D4 28 00 00 04 */ cmplwi r0, 4 /* 8020B198 002080D8 40 82 00 50 */ bne lbl_8020B1E8 -/* 8020B19C 002080DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020B1A0 002080E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020B19C 002080DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020B1A0 002080E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020B1A4 002080E4 89 03 5E 81 */ lbz r8, 0x5e81(r3) /* 8020B1A8 002080E8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020B1AC 002080EC 38 C3 EB C8 */ addi r6, r3, lbl_8042EBC8@l @@ -229,8 +229,8 @@ lbl_8020B1C8: lbl_8020B1E8: /* 8020B1E8 00208128 28 00 00 01 */ cmplwi r0, 1 /* 8020B1EC 0020812C 40 82 00 58 */ bne lbl_8020B244 -/* 8020B1F0 00208130 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020B1F4 00208134 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020B1F0 00208130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020B1F4 00208134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020B1F8 00208138 89 03 5E 81 */ lbz r8, 0x5e81(r3) /* 8020B1FC 0020813C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020B200 00208140 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -251,8 +251,8 @@ lbl_8020B1E8: /* 8020B23C 0020817C D0 01 00 0C */ stfs f0, 0xc(r1) /* 8020B240 00208180 48 00 00 4C */ b lbl_8020B28C lbl_8020B244: -/* 8020B244 00208184 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020B248 00208188 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020B244 00208184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020B248 00208188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020B24C 0020818C 89 03 5E 81 */ lbz r8, 0x5e81(r3) /* 8020B250 00208190 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020B254 00208194 38 C3 EB C8 */ addi r6, r3, lbl_8042EBC8@l @@ -308,8 +308,8 @@ lbl_8020B2A0: /* 8020B310 00208250 80 7D 00 04 */ lwz r3, 4(r29) /* 8020B314 00208254 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020B318 00208258 FC 40 08 90 */ fmr f2, f1 -/* 8020B31C 0020825C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020B320 00208260 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020B31C 0020825C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020B320 00208260 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B324 00208264 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020B328 00208268 48 0E DB AD */ bl J2DScreen_NS_draw lbl_8020B32C: @@ -349,8 +349,8 @@ lbl_8020B33C: /* 8020B3AC 002082EC 80 7D 00 04 */ lwz r3, 4(r29) /* 8020B3B0 002082F0 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020B3B4 002082F4 FC 40 08 90 */ fmr f2, f1 -/* 8020B3B8 002082F8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020B3BC 002082FC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020B3B8 002082F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020B3BC 002082FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B3C0 00208300 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020B3C4 00208304 48 0E DB 11 */ bl J2DScreen_NS_draw lbl_8020B3C8: @@ -390,8 +390,8 @@ lbl_8020B3D8: /* 8020B448 00208388 80 7D 00 04 */ lwz r3, 4(r29) /* 8020B44C 0020838C C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020B450 00208390 FC 40 08 90 */ fmr f2, f1 -/* 8020B454 00208394 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020B458 00208398 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020B454 00208394 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020B458 00208398 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B45C 0020839C 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020B460 002083A0 48 0E DA 75 */ bl J2DScreen_NS_draw lbl_8020B464: @@ -431,8 +431,8 @@ lbl_8020B474: /* 8020B4E4 00208424 80 7D 00 04 */ lwz r3, 4(r29) /* 8020B4E8 00208428 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020B4EC 0020842C FC 40 08 90 */ fmr f2, f1 -/* 8020B4F0 00208430 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020B4F4 00208434 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020B4F0 00208430 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020B4F4 00208434 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B4F8 00208438 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020B4FC 0020843C 48 0E D9 D9 */ bl J2DScreen_NS_draw lbl_8020B500: @@ -803,8 +803,8 @@ dMeterHaihai_c_NS_drawHaihaiLeft: /* 8020BA1C 0020895C 80 7F 00 04 */ lwz r3, 4(r31) /* 8020BA20 00208960 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020BA24 00208964 FC 40 08 90 */ fmr f2, f1 -/* 8020BA28 00208968 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020BA2C 0020896C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020BA28 00208968 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020BA2C 0020896C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BA30 00208970 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020BA34 00208974 48 0E D4 A1 */ bl J2DScreen_NS_draw /* 8020BA38 00208978 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -845,8 +845,8 @@ dMeterHaihai_c_NS_drawHaihaiRight: /* 8020BAB8 002089F8 80 7F 00 04 */ lwz r3, 4(r31) /* 8020BABC 002089FC C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020BAC0 00208A00 FC 40 08 90 */ fmr f2, f1 -/* 8020BAC4 00208A04 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020BAC8 00208A08 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020BAC4 00208A04 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020BAC8 00208A08 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BACC 00208A0C 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020BAD0 00208A10 48 0E D4 05 */ bl J2DScreen_NS_draw /* 8020BAD4 00208A14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -887,8 +887,8 @@ dMeterHaihai_c_NS_drawHaihaiTop: /* 8020BB54 00208A94 80 7F 00 04 */ lwz r3, 4(r31) /* 8020BB58 00208A98 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020BB5C 00208A9C FC 40 08 90 */ fmr f2, f1 -/* 8020BB60 00208AA0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020BB64 00208AA4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020BB60 00208AA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020BB64 00208AA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BB68 00208AA8 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020BB6C 00208AAC 48 0E D3 69 */ bl J2DScreen_NS_draw /* 8020BB70 00208AB0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -929,8 +929,8 @@ dMeterHaihai_c_NS_drawHaihaiBottom: /* 8020BBF0 00208B30 80 7F 00 04 */ lwz r3, 4(r31) /* 8020BBF4 00208B34 C0 22 AD B0 */ lfs f1, lbl_804547B0-_SDA2_BASE_(r2) /* 8020BBF8 00208B38 FC 40 08 90 */ fmr f2, f1 -/* 8020BBFC 00208B3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020BC00 00208B40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020BBFC 00208B3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020BC00 00208B40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BC04 00208B44 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8020BC08 00208B48 48 0E D2 CD */ bl J2DScreen_NS_draw /* 8020BC0C 00208B4C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index 96c25a2cf6..3284da08bf 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -122,8 +122,8 @@ lbl_8020C4C8: /* 8020C4D0 00209410 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020C4D4 00209414 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l /* 8020C4D8 00209418 3C A0 00 02 */ lis r5, 2 -/* 8020C4DC 0020941C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8020C4E0 00209420 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8020C4DC 0020941C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8020C4E0 00209420 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8020C4E4 00209424 80 DE 5D 30 */ lwz r6, 0x5d30(r30) /* 8020C4E8 00209428 48 0E C1 61 */ bl J2DScreen_NS_setPriority /* 8020C4EC 0020942C 80 7F 00 08 */ lwz r3, 8(r31) @@ -248,8 +248,8 @@ lbl_8020C654: /* 8020C6B4 002095F4 D0 1F 01 00 */ stfs f0, 0x100(r31) /* 8020C6B8 002095F8 C0 1D 03 BC */ lfs f0, 0x3bc(r29) /* 8020C6BC 002095FC D0 1F 01 04 */ stfs f0, 0x104(r31) -/* 8020C6C0 00209600 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020C6C4 00209604 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020C6C0 00209600 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020C6C4 00209604 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020C6C8 00209608 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8020C6CC 0020960C 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020C6D0 00209610 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l @@ -356,8 +356,8 @@ lbl_8020C720: /* 8020C85C 0020979C 39 61 00 60 */ addi r11, r1, 0x60 /* 8020C860 002097A0 48 15 59 69 */ bl func_803621C8 /* 8020C864 002097A4 7C 7A 1B 78 */ mr r26, r3 -/* 8020C868 002097A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020C86C 002097AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020C868 002097A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020C86C 002097AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020C870 002097B0 83 A3 5F 50 */ lwz r29, 0x5f50(r3) /* 8020C874 002097B4 7F A3 EB 78 */ mr r3, r29 /* 8020C878 002097B8 81 9D 00 00 */ lwz r12, 0(r29) @@ -655,8 +655,8 @@ dMeterHakusha_c_NS_alphaAnimeHakusha: /* 8020CCBC 00209BFC 40 82 00 5C */ bne lbl_8020CD18 /* 8020CCC0 00209C00 54 80 01 8D */ rlwinm. r0, r4, 0, 6, 6 /* 8020CCC4 00209C04 41 82 00 54 */ beq lbl_8020CD18 -/* 8020CCC8 00209C08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020CCCC 00209C0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020CCC8 00209C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020CCCC 00209C0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020CCD0 00209C10 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8020CCD4 00209C14 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020CCD8 00209C18 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l @@ -669,8 +669,8 @@ dMeterHakusha_c_NS_alphaAnimeHakusha: /* 8020CCF4 00209C34 2C 03 00 04 */ cmpwi r3, 4 /* 8020CCF8 00209C38 41 82 00 20 */ beq lbl_8020CD18 lbl_8020CCFC: -/* 8020CCFC 00209C3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020CD00 00209C40 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8020CCFC 00209C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020CD00 00209C40 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8020CD04 00209C44 88 1E 5E 24 */ lbz r0, 0x5e24(r30) /* 8020CD08 00209C48 28 00 00 09 */ cmplwi r0, 9 /* 8020CD0C 00209C4C 41 82 00 20 */ beq lbl_8020CD2C @@ -953,8 +953,8 @@ lbl_8020D0B4: /* 8020D0F4 0020A034 D0 1C 01 00 */ stfs f0, 0x100(r28) /* 8020D0F8 0020A038 C0 1A 03 BC */ lfs f0, 0x3bc(r26) /* 8020D0FC 0020A03C D0 1C 01 04 */ stfs f0, 0x104(r28) -/* 8020D100 0020A040 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D104 0020A044 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020D100 0020A040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D104 0020A044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020D108 0020A048 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8020D10C 0020A04C 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020D110 0020A050 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index f5df1d46b2..46e179e596 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -11,8 +11,8 @@ dMeterMap_c_NS_isEnableDispMap: /* 8020D4A8 0020A3E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D4AC 0020A3EC 93 C1 00 08 */ stw r30, 8(r1) /* 8020D4B0 0020A3F0 3B C0 00 00 */ li r30, 0 -/* 8020D4B4 0020A3F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D4B8 0020A3F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020D4B4 0020A3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D4B8 0020A3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020D4BC 0020A3FC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8020D4C0 0020A400 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8020D4C4 0020A404 7D 89 03 A6 */ mtctr r12 @@ -53,8 +53,8 @@ dMeterMap_c_NS_getMapDispSizeTypeNo: /* 8020D53C 0020A47C 3B A0 00 07 */ li r29, 7 /* 8020D540 0020A480 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8020D544 0020A484 7C 84 07 74 */ extsb r4, r4 -/* 8020D548 0020A488 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D54C 0020A48C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8020D548 0020A488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D54C 0020A48C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8020D550 0020A490 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 8020D554 0020A494 4B E1 6E 31 */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 8020D558 0020A498 81 83 00 00 */ lwz r12, 0(r3) @@ -163,8 +163,8 @@ dMeterMap_c_NS_isEventRunCheck: /* 8020D6A0 0020A5E0 90 01 00 14 */ stw r0, 0x14(r1) /* 8020D6A4 0020A5E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D6A8 0020A5E8 7C 7F 1B 78 */ mr r31, r3 -/* 8020D6AC 0020A5EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D6B0 0020A5F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020D6AC 0020A5EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D6B0 0020A5F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020D6B4 0020A5F4 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020D6B8 0020A5F8 28 00 00 00 */ cmplwi r0, 0 /* 8020D6BC 0020A5FC 41 82 00 0C */ beq lbl_8020D6C8 @@ -182,8 +182,8 @@ lbl_8020D6C8: /* 8020D6E8 0020A628 48 00 00 30 */ b lbl_8020D718 lbl_8020D6EC: /* 8020D6EC 0020A62C 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 8020D6F0 0020A630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D6F4 0020A634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020D6F0 0020A630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D6F4 0020A634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020D6F8 0020A638 88 63 4F AD */ lbz r3, 0x4fad(r3) /* 8020D6FC 0020A63C 30 03 FF FF */ addic r0, r3, -1 /* 8020D700 0020A640 7C 00 19 10 */ subfe r0, r0, r3 @@ -345,8 +345,8 @@ dMeterMap_c_NS_isMapOpenCheck: /* 8020D900 0020A840 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020D904 0020A844 7C 08 02 A6 */ mflr r0 /* 8020D908 0020A848 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D90C 0020A84C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020D910 0020A850 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020D90C 0020A84C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020D910 0020A850 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020D914 0020A854 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8020D918 0020A858 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8020D91C 0020A85C 7D 89 03 A6 */ mtctr r12 @@ -498,8 +498,8 @@ lbl_8020DB08: /* 8020DB28 0020AA68 7C 60 1B 78 */ mr r0, r3 lbl_8020DB2C: /* 8020DB2C 0020AA6C 90 1F 00 04 */ stw r0, 4(r31) -/* 8020DB30 0020AA70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DB34 0020AA74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DB30 0020AA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DB34 0020AA74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DB38 0020AA78 3B C3 09 58 */ addi r30, r3, 0x958 /* 8020DB3C 0020AA7C 7F C3 F3 78 */ mr r3, r30 /* 8020DB40 0020AA80 38 80 00 01 */ li r4, 1 @@ -561,8 +561,8 @@ lbl_8020DC08: /* 8020DC0C 0020AB4C 98 1F 00 2E */ stb r0, 0x2e(r31) /* 8020DC10 0020AB50 B0 1F 00 28 */ sth r0, 0x28(r31) /* 8020DC14 0020AB54 90 1F 00 30 */ stw r0, 0x30(r31) -/* 8020DC18 0020AB58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DC1C 0020AB5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DC18 0020AB58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DC1C 0020AB5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DC20 0020AB60 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8020DC24 0020AB64 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8020DC28 0020AB68 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -632,8 +632,8 @@ dMeterMap_c_NS__move: /* 8020DD00 0020AC40 88 03 00 2B */ lbz r0, 0x2b(r3) /* 8020DD04 0020AC44 28 00 00 00 */ cmplwi r0, 0 /* 8020DD08 0020AC48 40 82 00 84 */ bne lbl_8020DD8C -/* 8020DD0C 0020AC4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DD10 0020AC50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DD0C 0020AC4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DD10 0020AC50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DD14 0020AC54 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 8020DD18 0020AC58 7F 83 E3 78 */ mr r3, r28 /* 8020DD1C 0020AC5C 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -642,8 +642,8 @@ dMeterMap_c_NS__move: /* 8020DD28 0020AC68 4B E2 6C 95 */ bl isEventBit__11dSv_event_cCFUs /* 8020DD2C 0020AC6C 2C 03 00 00 */ cmpwi r3, 0 /* 8020DD30 0020AC70 41 82 00 5C */ beq lbl_8020DD8C -/* 8020DD34 0020AC74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DD38 0020AC78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DD34 0020AC74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DD38 0020AC78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DD3C 0020AC7C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8020DD40 0020AC80 3C 80 80 3A */ lis r4, lbl_80398208@ha /* 8020DD44 0020AC84 38 84 82 08 */ addi r4, r4, lbl_80398208@l @@ -757,8 +757,8 @@ lbl_8020DE6C: /* 8020DEDC 0020AE1C 7F A4 EB 78 */ mr r4, r29 /* 8020DEE0 0020AE20 C0 61 00 18 */ lfs f3, 0x18(r1) /* 8020DEE4 0020AE24 4B E1 C4 49 */ bl dMap_c_NS__move -/* 8020DEE8 0020AE28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DEEC 0020AE2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DEE8 0020AE28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DEEC 0020AE2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DEF0 0020AE30 88 63 4F AD */ lbz r3, 0x4fad(r3) /* 8020DEF4 0020AE34 30 03 FF FF */ addic r0, r3, -1 /* 8020DEF8 0020AE38 7C 00 19 10 */ subfe r0, r0, r3 @@ -780,8 +780,8 @@ dMeterMap_c_NS__draw: /* 8020DF2C 0020AE6C 7C 7F 1B 78 */ mr r31, r3 /* 8020DF30 0020AE70 80 63 00 08 */ lwz r3, 8(r3) /* 8020DF34 0020AE74 4B E1 CC 21 */ bl dMap_c_NS__draw -/* 8020DF38 0020AE78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DF3C 0020AE7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DF38 0020AE78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DF3C 0020AE7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DF40 0020AE80 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8020DF44 0020AE84 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8020DF48 0020AE88 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -811,8 +811,8 @@ dMeterMap_c_NS__draw: /* 8020DFA8 0020AEE8 88 03 00 31 */ lbz r0, 0x31(r3) /* 8020DFAC 0020AEEC 28 00 00 00 */ cmplwi r0, 0 /* 8020DFB0 0020AEF0 41 82 00 8C */ beq lbl_8020E03C -/* 8020DFB4 0020AEF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020DFB8 0020AEF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020DFB4 0020AEF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020DFB8 0020AEF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DFBC 0020AEFC 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 8020DFC0 0020AF00 81 83 00 00 */ lwz r12, 0(r3) /* 8020DFC4 0020AF04 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -1076,8 +1076,8 @@ lbl_8020E37C: /* 8020E398 0020B2D8 7F A3 EB 78 */ mr r3, r29 /* 8020E39C 0020B2DC 48 00 06 31 */ bl dMeterMap_c_NS_keyCheck lbl_8020E3A0: -/* 8020E3A0 0020B2E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E3A4 0020B2E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E3A0 0020B2E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E3A4 0020B2E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E3A8 0020B2E8 3B C3 09 58 */ addi r30, r3, 0x958 /* 8020E3AC 0020B2EC 7F C3 F3 78 */ mr r3, r30 /* 8020E3B0 0020B2F0 38 80 00 01 */ li r4, 1 @@ -1176,8 +1176,8 @@ dMeterMap_c_NS_isShow: /* 8020E4EC 0020B42C 40 82 01 14 */ bne lbl_8020E600 /* 8020E4F0 0020B430 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19 /* 8020E4F4 0020B434 41 82 00 3C */ beq lbl_8020E530 -/* 8020E4F8 0020B438 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E4FC 0020B43C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E4F8 0020B438 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E4FC 0020B43C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E500 0020B440 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020E504 0020B444 28 00 00 00 */ cmplwi r0, 0 /* 8020E508 0020B448 41 82 00 10 */ beq lbl_8020E518 @@ -1193,8 +1193,8 @@ lbl_8020E51C: /* 8020E528 0020B468 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 8020E52C 0020B46C 41 82 00 D4 */ beq lbl_8020E600 lbl_8020E530: -/* 8020E530 0020B470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E534 0020B474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E530 0020B470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E534 0020B474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E538 0020B478 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8020E53C 0020B47C 38 00 00 00 */ li r0, 0 /* 8020E540 0020B480 88 64 05 6A */ lbz r3, 0x56a(r4) @@ -1264,8 +1264,8 @@ dMeterMap_c_NS_isFmapScreen: /* 8020E624 0020B564 7C 08 02 A6 */ mflr r0 /* 8020E628 0020B568 90 01 00 14 */ stw r0, 0x14(r1) /* 8020E62C 0020B56C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020E630 0020B570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E634 0020B574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E630 0020B570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E634 0020B574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E638 0020B578 3B E3 4E 20 */ addi r31, r3, 0x4e20 /* 8020E63C 0020B57C 7F E3 FB 78 */ mr r3, r31 /* 8020E640 0020B580 81 9F 00 00 */ lwz r12, 0(r31) @@ -1328,8 +1328,8 @@ dMeterMap_c_NS_isDmapScreen: /* 8020E70C 0020B64C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020E710 0020B650 7C 08 02 A6 */ mflr r0 /* 8020E714 0020B654 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020E718 0020B658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E71C 0020B65C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E718 0020B658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E71C 0020B65C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E720 0020B660 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8020E724 0020B664 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8020E728 0020B668 7D 89 03 A6 */ mtctr r12 @@ -1395,8 +1395,8 @@ lbl_8020E804: /* 8020E804 0020B744 4B FE B7 A9 */ bl dMw_LEFT_TRIGGER /* 8020E808 0020B748 2C 03 00 00 */ cmpwi r3, 0 /* 8020E80C 0020B74C 41 82 00 D8 */ beq lbl_8020E8E4 -/* 8020E810 0020B750 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E814 0020B754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E810 0020B750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E814 0020B754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E818 0020B758 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020E81C 0020B75C 28 00 00 00 */ cmplwi r0, 0 /* 8020E820 0020B760 40 82 00 C4 */ bne lbl_8020E8E4 @@ -1454,8 +1454,8 @@ lbl_8020E8E4: /* 8020E8E4 0020B824 4B FE B7 11 */ bl dMw_RIGHT_TRIGGER /* 8020E8E8 0020B828 2C 03 00 00 */ cmpwi r3, 0 /* 8020E8EC 0020B82C 41 82 00 CC */ beq lbl_8020E9B8 -/* 8020E8F0 0020B830 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020E8F4 0020B834 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020E8F0 0020B830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020E8F4 0020B834 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020E8F8 0020B838 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020E8FC 0020B83C 28 00 00 00 */ cmplwi r0, 0 /* 8020E900 0020B840 40 82 00 B8 */ bne lbl_8020E9B8 diff --git a/asm/d/meter/d_meter_string.s b/asm/d/meter/d_meter_string.s index c2a9e5e3e4..651681c7cb 100644 --- a/asm/d/meter/d_meter_string.s +++ b/asm/d/meter/d_meter_string.s @@ -19,8 +19,8 @@ dMeterString_c: /* 8020ED8C 0020BCCC 3C A0 80 3C */ lis r5, lbl_803BF308@ha /* 8020ED90 0020BCD0 38 05 F3 08 */ addi r0, r5, lbl_803BF308@l /* 8020ED94 0020BCD4 90 03 00 00 */ stw r0, 0(r3) -/* 8020ED98 0020BCD8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8020ED9C 0020BCDC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8020ED98 0020BCD8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8020ED9C 0020BCDC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8020EDA0 0020BCE0 80 05 5C E0 */ lwz r0, 0x5ce0(r5) /* 8020EDA4 0020BCE4 90 03 00 18 */ stw r0, 0x18(r3) /* 8020EDA8 0020BCE8 38 00 00 00 */ li r0, 0 @@ -101,8 +101,8 @@ lbl_8020EE54: /* 8020EEC8 0020BE08 38 00 00 01 */ li r0, 1 /* 8020EECC 0020BE0C 98 1F 00 28 */ stb r0, 0x28(r31) lbl_8020EED0: -/* 8020EED0 0020BE10 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020EED4 0020BE14 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020EED0 0020BE10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020EED4 0020BE14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020EED8 0020BE18 80 04 5C E0 */ lwz r0, 0x5ce0(r4) /* 8020EEDC 0020BE1C 28 00 00 00 */ cmplwi r0, 0 /* 8020EEE0 0020BE20 40 82 00 0C */ bne lbl_8020EEEC @@ -306,8 +306,8 @@ lbl_8020F198: /* 8020F1D8 0020C118 80 03 00 18 */ lwz r0, 0x18(r3) /* 8020F1DC 0020C11C 28 00 00 00 */ cmplwi r0, 0 /* 8020F1E0 0020C120 41 82 02 94 */ beq lbl_8020F474 -/* 8020F1E4 0020C124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8020F1E8 0020C128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8020F1E4 0020C124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8020F1E8 0020C128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020F1EC 0020C12C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8020F1F0 0020C130 28 00 00 00 */ cmplwi r0, 0 /* 8020F1F4 0020C134 40 82 02 80 */ bne lbl_8020F474 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index 19c45e1b51..fc97122d02 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -23,13 +23,13 @@ dMeter2Draw_c: /* 8020FAF0 0020CA30 90 03 05 48 */ stw r0, 0x548(r3) /* 8020FAF4 0020CA34 90 03 05 4C */ stw r0, 0x54c(r3) /* 8020FAF8 0020CA38 90 83 00 74 */ stw r4, 0x74(r3) -/* 8020FAFC 0020CA3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020FB00 0020CA40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020FAFC 0020CA3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020FB00 0020CA40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB04 0020CA44 80 64 5E C8 */ lwz r3, 0x5ec8(r4) /* 8020FB08 0020CA48 4B DF F6 C5 */ bl mDoExt_setCurrentHeap /* 8020FB0C 0020CA4C 7C 79 1B 78 */ mr r25, r3 -/* 8020FB10 0020CA50 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020FB14 0020CA54 3A E4 61 C0 */ addi r23, r4, lbl_804061C0@l +/* 8020FB10 0020CA50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020FB14 0020CA54 3A E4 61 C0 */ addi r23, r4, g_dComIfG_gameInfo@l /* 8020FB18 0020CA58 80 B7 5C F4 */ lwz r5, 0x5cf4(r23) /* 8020FB1C 0020CA5C 3C 80 52 4F */ lis r4, 0x524F4F54@ha /* 8020FB20 0020CA60 38 64 4F 54 */ addi r3, r4, 0x524F4F54@l @@ -39,8 +39,8 @@ dMeter2Draw_c: /* 8020FB30 0020CA70 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8020FB34 0020CA74 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8020FB38 0020CA78 90 64 00 10 */ stw r3, 0x10(r4) -/* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB44 0020CA84 83 44 5C F8 */ lwz r26, 0x5cf8(r4) /* 8020FB48 0020CA88 48 02 2E F5 */ bl dMsgObject_getGroupID /* 8020FB4C 0020CA8C 7C 60 07 34 */ extsh r0, r3 @@ -80,8 +80,8 @@ lbl_8020FBC4: /* 8020FBD0 0020CB10 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FBD4 0020CB14 38 84 00 7B */ addi r4, r4, 0x7b /* 8020FBD8 0020CB18 3C A0 00 02 */ lis r5, 2 -/* 8020FBDC 0020CB1C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8020FBE0 0020CB20 3A E6 61 C0 */ addi r23, r6, lbl_804061C0@l +/* 8020FBDC 0020CB1C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8020FBE0 0020CB20 3A E6 61 C0 */ addi r23, r6, g_dComIfG_gameInfo@l /* 8020FBE4 0020CB24 80 D7 5D 30 */ lwz r6, 0x5d30(r23) /* 8020FBE8 0020CB28 48 0E 8A 61 */ bl J2DScreen_NS_setPriority /* 8020FBEC 0020CB2C 80 7F 00 78 */ lwz r3, 0x78(r31) @@ -579,8 +579,8 @@ lbl_802102B0: /* 80210318 0020D258 3C 60 80 3C */ lis r3, lbl_803BF750@ha /* 8021031C 0020D25C 38 03 F7 50 */ addi r0, r3, lbl_803BF750@l /* 80210320 0020D260 90 1F 00 00 */ stw r0, 0(r31) -/* 80210324 0020D264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80210328 0020D268 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 80210324 0020D264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80210328 0020D268 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8021032C 0020D26C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26) /* 80210330 0020D270 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 80210334 0020D274 38 84 01 88 */ addi r4, r4, lbl_80430188@l @@ -597,8 +597,8 @@ lbl_802102B0: /* 80210360 0020D2A0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80210364 0020D2A4 7D 89 03 A6 */ mtctr r12 /* 80210368 0020D2A8 4E 80 04 21 */ bctrl -/* 8021036C 0020D2AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80210370 0020D2B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021036C 0020D2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80210370 0020D2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80210374 0020D2B4 80 63 5C D0 */ lwz r3, 0x5cd0(r3) /* 80210378 0020D2B8 81 83 00 00 */ lwz r12, 0(r3) /* 8021037C 0020D2BC 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1855,8 +1855,8 @@ lbl_80211504: /* 80211548 0020E488 39 61 00 E0 */ addi r11, r1, 0xe0 /* 8021154C 0020E48C 48 15 0C 71 */ bl func_803621BC /* 80211550 0020E490 7C 79 1B 78 */ mr r25, r3 -/* 80211554 0020E494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80211558 0020E498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80211554 0020E494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80211558 0020E498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021155C 0020E49C 82 A3 5F 50 */ lwz r21, 0x5f50(r3) /* 80211560 0020E4A0 7E A3 AB 78 */ mr r3, r21 /* 80211564 0020E4A4 81 95 00 00 */ lwz r12, 0(r21) @@ -1977,8 +1977,8 @@ lbl_80211700: /* 80211720 0020E660 2C 15 00 02 */ cmpwi r21, 2 /* 80211724 0020E664 3A F7 00 04 */ addi r23, r23, 4 /* 80211728 0020E668 41 80 FF D8 */ blt lbl_80211700 -/* 8021172C 0020E66C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80211730 0020E670 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021172C 0020E66C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80211730 0020E670 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80211734 0020E674 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80211738 0020E678 28 00 00 00 */ cmplwi r0, 0 /* 8021173C 0020E67C 40 82 01 60 */ bne lbl_8021189C @@ -2155,8 +2155,8 @@ lbl_802119AC: /* 802119B8 0020E8F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802119BC 0020E8FC 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 802119C0 0020E900 3B BE 0F 10 */ addi r29, r30, 0xf10 -/* 802119C4 0020E904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802119C8 0020E908 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802119C4 0020E904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802119C8 0020E908 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802119CC 0020E90C 3B 9F 01 14 */ addi r28, r31, 0x114 /* 802119D0 0020E910 C3 C2 AE 80 */ lfs f30, lbl_80454880-_SDA2_BASE_(r2) lbl_802119D4: @@ -2311,8 +2311,8 @@ dMeter2Draw_c_NS_initLife: /* 80211C00 0020EB40 7C 7C 1B 78 */ mr r28, r3 /* 80211C04 0020EB44 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 80211C08 0020EB48 3B C3 82 58 */ addi r30, r3, lbl_80398258@l -/* 80211C0C 0020EB4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80211C10 0020EB50 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80211C0C 0020EB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80211C10 0020EB50 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80211C14 0020EB54 A3 5F 00 02 */ lhz r26, 2(r31) /* 80211C18 0020EB58 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge /* 80211C1C 0020EB5C 54 63 04 3E */ clrlwi r3, r3, 0x10 @@ -2444,8 +2444,8 @@ lbl_80211DDC: /* 80211DF0 0020ED30 38 A3 EB C8 */ addi r5, r3, lbl_8042EBC8@l /* 80211DF4 0020ED34 C0 25 00 08 */ lfs f1, 8(r5) /* 80211DF8 0020ED38 C0 42 AE 80 */ lfs f2, lbl_80454880-_SDA2_BASE_(r2) -/* 80211DFC 0020ED3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80211E00 0020ED40 A0 83 61 C0 */ lhz r4, lbl_804061C0@l(r3) +/* 80211DFC 0020ED3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80211E00 0020ED40 A0 83 61 C0 */ lhz r4, g_dComIfG_gameInfo@l(r3) /* 80211E04 0020ED44 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 80211E08 0020ED48 28 00 00 32 */ cmplwi r0, 0x32 /* 80211E0C 0020ED4C 41 81 00 08 */ bgt lbl_80211E14 @@ -2576,8 +2576,8 @@ lbl_80211FA8: /* 80211FDC 0020EF1C 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 80211FE0 0020EF20 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 80211FE4 0020EF24 38 64 00 F0 */ addi r3, r4, 0xf0 -/* 80211FE8 0020EF28 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80211FEC 0020EF2C 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 80211FE8 0020EF28 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80211FEC 0020EF2C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 80211FF0 0020EF30 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80211FF4 0020EF34 48 0C 22 7D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 80211FF8 0020EF38 48 0F 6A 75 */ bl J2DAnmLoaderDataBase_NS_load @@ -2622,8 +2622,8 @@ lbl_80211FA8: /* 80212094 0020EFD4 38 A4 EB C8 */ addi r5, r4, lbl_8042EBC8@l /* 80212098 0020EFD8 C3 E5 00 08 */ lfs f31, 8(r5) /* 8021209C 0020EFDC C3 C2 AE 80 */ lfs f30, lbl_80454880-_SDA2_BASE_(r2) -/* 802120A0 0020EFE0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802120A4 0020EFE4 A0 04 61 C0 */ lhz r0, lbl_804061C0@l(r4) +/* 802120A0 0020EFE0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802120A4 0020EFE4 A0 04 61 C0 */ lhz r0, g_dComIfG_gameInfo@l(r4) /* 802120A8 0020EFE8 28 00 00 32 */ cmplwi r0, 0x32 /* 802120AC 0020EFEC 41 81 00 08 */ bgt lbl_802120B4 /* 802120B0 0020EFF0 C3 C5 00 0C */ lfs f30, 0xc(r5) @@ -2642,8 +2642,8 @@ lbl_802120CC: /* 802120DC 0020F01C 38 84 00 02 */ addi r4, r4, 2 /* 802120E0 0020F020 38 A5 00 04 */ addi r5, r5, 4 /* 802120E4 0020F024 42 00 FF E8 */ bdnz lbl_802120CC -/* 802120E8 0020F028 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802120EC 0020F02C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802120E8 0020F028 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802120EC 0020F02C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802120F0 0020F030 88 A4 00 1B */ lbz r5, 0x1b(r4) /* 802120F4 0020F034 88 84 00 1A */ lbz r4, 0x1a(r4) /* 802120F8 0020F038 7F E3 FB 78 */ mr r3, r31 @@ -2657,8 +2657,8 @@ lbl_802120CC: /* 80212118 0020F058 7F E3 FB 78 */ mr r3, r31 /* 8021211C 0020F05C 38 80 00 01 */ li r4, 1 /* 80212120 0020F060 48 00 32 61 */ bl dMeter2Draw_c_NS_setAlphaMagicChange -/* 80212124 0020F064 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80212128 0020F068 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80212124 0020F064 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80212128 0020F068 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021212C 0020F06C A0 A4 00 08 */ lhz r5, 8(r4) /* 80212130 0020F070 A0 84 00 06 */ lhz r4, 6(r4) /* 80212134 0020F074 7F E3 FB 78 */ mr r3, r31 @@ -2805,8 +2805,8 @@ lbl_80212318: /* 80212340 0020F280 C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80212344 0020F284 D0 1E 06 F8 */ stfs f0, 0x6f8(r30) /* 80212348 0020F288 3B 20 00 00 */ li r25, 0 -/* 8021234C 0020F28C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80212350 0020F290 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021234C 0020F28C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80212350 0020F290 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212354 0020F294 3B 43 01 14 */ addi r26, r3, 0x114 /* 80212358 0020F298 3B 60 00 FF */ li r27, 0xff /* 8021235C 0020F29C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2828,8 +2828,8 @@ lbl_80212390: /* 80212390 0020F2D0 3B 39 00 01 */ addi r25, r25, 1 /* 80212394 0020F2D4 2C 19 00 03 */ cmpwi r25, 3 /* 80212398 0020F2D8 41 80 FF D0 */ blt lbl_80212368 -/* 8021239C 0020F2DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802123A0 0020F2E0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021239C 0020F2DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802123A0 0020F2E0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802123A4 0020F2E4 8B 64 5E A1 */ lbz r27, 0x5ea1(r4) /* 802123A8 0020F2E8 7F 43 D3 78 */ mr r3, r26 /* 802123AC 0020F2EC 88 84 4E 0C */ lbz r4, 0x4e0c(r4) @@ -3028,15 +3028,15 @@ lbl_80212678: /* 8021267C 0020F5BC 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80212680 0020F5C0 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 80212684 0020F5C4 48 04 31 4D */ bl CPaneMgrAlpha_NS_setAlphaRate -/* 80212688 0020F5C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021268C 0020F5CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80212688 0020F5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021268C 0020F5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212690 0020F5D0 A0 03 00 04 */ lhz r0, 4(r3) /* 80212694 0020F5D4 7F E3 FB 78 */ mr r3, r31 /* 80212698 0020F5D8 7C 04 07 34 */ extsh r4, r0 /* 8021269C 0020F5DC 48 00 3C 91 */ bl dMeter2Draw_c_NS_drawRupee /* 802126A0 0020F5E0 7F E3 FB 78 */ mr r3, r31 -/* 802126A4 0020F5E4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802126A8 0020F5E8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802126A4 0020F5E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802126A8 0020F5E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802126AC 0020F5EC 88 84 09 74 */ lbz r4, 0x974(r4) /* 802126B0 0020F5F0 48 00 43 91 */ bl dMeter2Draw_c_NS_drawKey /* 802126B4 0020F5F4 7F E3 FB 78 */ mr r3, r31 @@ -3163,8 +3163,8 @@ lbl_80212844: /* 80212870 0020F7B0 98 1F 07 6B */ stb r0, 0x76b(r31) /* 80212874 0020F7B4 98 1F 07 6F */ stb r0, 0x76f(r31) /* 80212878 0020F7B8 38 00 00 FF */ li r0, 0xff -/* 8021287C 0020F7BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80212880 0020F7C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021287C 0020F7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80212880 0020F7C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212884 0020F7C4 98 03 00 17 */ stb r0, 0x17(r3) /* 80212888 0020F7C8 98 1F 07 70 */ stb r0, 0x770(r31) /* 8021288C 0020F7CC 88 03 00 17 */ lbz r0, 0x17(r3) @@ -3838,8 +3838,8 @@ lbl_8021323C: /* 8021326C 002101AC 7C 60 1B 78 */ mr r0, r3 lbl_80213270: /* 80213270 002101B0 90 1F 04 B8 */ stw r0, 0x4b8(r31) -/* 80213274 002101B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80213278 002101B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80213274 002101B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80213278 002101B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021327C 002101BC 83 43 5D 30 */ lwz r26, 0x5d30(r3) /* 80213280 002101C0 38 60 00 00 */ li r3, 0 /* 80213284 002101C4 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName @@ -3921,8 +3921,8 @@ lbl_80213364: /* 8021339C 002102DC D0 1F 05 80 */ stfs f0, 0x580(r31) /* 802133A0 002102E0 38 00 00 00 */ li r0, 0 /* 802133A4 002102E4 B0 1F 07 54 */ sth r0, 0x754(r31) -/* 802133A8 002102E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802133AC 002102EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802133A8 002102E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802133AC 002102EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133B0 002102F0 8B 43 5E 5C */ lbz r26, 0x5e5c(r3) /* 802133B4 002102F4 38 60 00 00 */ li r3, 0 /* 802133B8 002102F8 4B E1 AB 65 */ bl dComIfGp_getSelectItem @@ -3933,8 +3933,8 @@ lbl_80213364: /* 802133CC 0021030C 38 E0 00 01 */ li r7, 1 /* 802133D0 00210310 39 00 00 00 */ li r8, 0 /* 802133D4 00210314 48 00 46 E1 */ bl dMeter2Draw_c_NS_drawButtonXY -/* 802133D8 00210318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802133DC 0021031C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802133D8 00210318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802133DC 0021031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133E0 00210320 8B 43 5E 60 */ lbz r26, 0x5e60(r3) /* 802133E4 00210324 38 60 00 01 */ li r3, 1 /* 802133E8 00210328 4B E1 AB 35 */ bl dComIfGp_getSelectItem @@ -3946,8 +3946,8 @@ lbl_80213364: /* 80213400 00210340 39 00 00 00 */ li r8, 0 /* 80213404 00210344 48 00 46 B1 */ bl dMeter2Draw_c_NS_drawButtonXY /* 80213408 00210348 7F E3 FB 78 */ mr r3, r31 -/* 8021340C 0021034C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80213410 00210350 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8021340C 0021034C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80213410 00210350 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80213414 00210354 88 84 5E 24 */ lbz r4, 0x5e24(r4) /* 80213418 00210358 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 8021341C 0021035C FC 40 08 90 */ fmr f2, f1 @@ -3958,8 +3958,8 @@ lbl_80213364: /* 80213430 00210370 38 C0 00 00 */ li r6, 0 /* 80213434 00210374 48 00 39 79 */ bl dMeter2Draw_c_NS_drawButtonA /* 80213438 00210378 7F E3 FB 78 */ mr r3, r31 -/* 8021343C 0021037C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80213440 00210380 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8021343C 0021037C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80213440 00210380 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80213444 00210384 88 84 5E 1D */ lbz r4, 0x5e1d(r4) /* 80213448 00210388 38 A0 00 01 */ li r5, 1 /* 8021344C 0021038C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) @@ -3969,8 +3969,8 @@ lbl_80213364: /* 8021345C 0021039C C0 A2 AE 84 */ lfs f5, lbl_80454884-_SDA2_BASE_(r2) /* 80213460 002103A0 38 C0 00 00 */ li r6, 0 /* 80213464 002103A4 48 00 3C 81 */ bl dMeter2Draw_c_NS_drawButtonB -/* 80213468 002103A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021346C 002103AC 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80213468 002103A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021346C 002103AC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80213470 002103B0 88 85 00 16 */ lbz r4, 0x16(r5) /* 80213474 002103B4 7F E3 FB 78 */ mr r3, r31 /* 80213478 002103B8 88 A5 5E 1C */ lbz r5, 0x5e1c(r5) @@ -3978,24 +3978,24 @@ lbl_80213364: /* 80213480 002103C0 38 E0 00 00 */ li r7, 0 /* 80213484 002103C4 48 00 41 C9 */ bl dMeter2Draw_c_NS_drawButtonR /* 80213488 002103C8 7F E3 FB 78 */ mr r3, r31 -/* 8021348C 002103CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80213490 002103D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8021348C 002103CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80213490 002103D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80213494 002103D4 88 84 5E 33 */ lbz r4, 0x5e33(r4) /* 80213498 002103D8 48 00 42 55 */ bl dMeter2Draw_c_NS_drawButtonZ /* 8021349C 002103DC 7F E3 FB 78 */ mr r3, r31 -/* 802134A0 002103E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802134A4 002103E4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802134A0 002103E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802134A4 002103E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134A8 002103E8 88 84 5E 26 */ lbz r4, 0x5e26(r4) /* 802134AC 002103EC 48 00 44 59 */ bl dMeter2Draw_c_NS_drawButton3D /* 802134B0 002103F0 7F E3 FB 78 */ mr r3, r31 -/* 802134B4 002103F4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802134B8 002103F8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802134B4 002103F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802134B8 002103F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134BC 002103FC 88 84 5E 2F */ lbz r4, 0x5e2f(r4) /* 802134C0 00210400 38 A0 00 01 */ li r5, 1 /* 802134C4 00210404 48 00 44 91 */ bl dMeter2Draw_c_NS_drawButtonC /* 802134C8 00210408 7F E3 FB 78 */ mr r3, r31 -/* 802134CC 0021040C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802134D0 00210410 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802134CC 0021040C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802134D0 00210410 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134D4 00210414 88 84 5E 32 */ lbz r4, 0x5e32(r4) /* 802134D8 00210418 48 00 44 E9 */ bl dMeter2Draw_c_NS_drawButtonS /* 802134DC 0021041C 7F E3 FB 78 */ mr r3, r31 @@ -5126,8 +5126,8 @@ lbl_802145D0: /* 802145D0 00211510 80 79 00 80 */ lwz r3, 0x80(r25) /* 802145D4 00211514 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 802145D8 00211518 FC 40 08 90 */ fmr f2, f1 -/* 802145DC 0021151C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802145E0 00211520 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802145DC 0021151C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802145E0 00211520 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802145E4 00211524 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 802145E8 00211528 48 0E 48 ED */ bl J2DScreen_NS_draw lbl_802145EC: @@ -5236,8 +5236,8 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 80214778 002116B8 80 7B 00 80 */ lwz r3, 0x80(r27) /* 8021477C 002116BC C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 80214780 002116C0 FC 40 08 90 */ fmr f2, f1 -/* 80214784 002116C4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80214788 002116C8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80214784 002116C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80214788 002116C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021478C 002116CC 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 80214790 002116D0 48 0E 47 45 */ bl J2DScreen_NS_draw /* 80214794 002116D4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -5758,8 +5758,8 @@ dMeter2Draw_c_NS_drawKanteraScreen: /* 80214EC4 00211E04 48 14 D3 11 */ bl _savegpr_27 /* 80214EC8 00211E08 7C 7C 1B 78 */ mr r28, r3 /* 80214ECC 00211E0C 7C 9B 23 78 */ mr r27, r4 -/* 80214ED0 00211E10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80214ED4 00211E14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80214ED0 00211E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80214ED4 00211E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80214ED8 00211E18 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80214EDC 00211E1C 80 7C 01 CC */ lwz r3, 0x1cc(r28) /* 80214EE0 00211E20 54 9D 15 BA */ rlwinm r29, r4, 2, 0x16, 0x1d @@ -5817,8 +5817,8 @@ lbl_80214F40: lbl_80214FAC: /* 80214FAC 00211EEC 28 00 00 02 */ cmplwi r0, 2 /* 80214FB0 00211EF0 40 82 02 08 */ bne lbl_802151B8 -/* 80214FB4 00211EF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80214FB8 00211EF8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80214FB4 00211EF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80214FB8 00211EF8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80214FBC 00211EFC 80 04 5D E0 */ lwz r0, 0x5de0(r4) /* 80214FC0 00211F00 C8 42 AE A0 */ lfd f2, lbl_804548A0-_SDA2_BASE_(r2) /* 80214FC4 00211F04 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -6165,8 +6165,8 @@ dMeter2Draw_c_NS_drawKantera: /* 802154BC 002123FC EC C3 00 28 */ fsubs f6, f3, f0 /* 802154C0 00212400 C0 E2 AE 80 */ lfs f7, lbl_80454880-_SDA2_BASE_(r2) /* 802154C4 00212404 FC 80 38 90 */ fmr f4, f7 -/* 802154C8 00212408 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802154CC 0021240C 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 802154C8 00212408 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802154CC 0021240C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 802154D0 00212410 A0 06 00 06 */ lhz r0, 6(r6) /* 802154D4 00212414 54 06 04 3F */ clrlwi. r6, r0, 0x10 /* 802154D8 00212418 41 82 00 60 */ beq lbl_80215538 @@ -6400,8 +6400,8 @@ dMeter2Draw_c_NS_drawOxygen: /* 802157F4 00212734 EC A3 00 28 */ fsubs f5, f3, f0 /* 802157F8 00212738 C0 C2 AE 80 */ lfs f6, lbl_80454880-_SDA2_BASE_(r2) /* 802157FC 0021273C FC 80 30 90 */ fmr f4, f6 -/* 80215800 00212740 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80215804 00212744 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80215800 00212740 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80215804 00212744 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80215808 00212748 80 E6 5D E8 */ lwz r7, 0x5de8(r6) /* 8021580C 0021274C 2C 07 00 00 */ cmpwi r7, 0 /* 80215810 00212750 40 81 00 60 */ ble lbl_80215870 @@ -6807,8 +6807,8 @@ dMeter2Draw_c_NS_getNowLightDropRateCalc: /* 80215DA8 00212CE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80215DAC 00212CEC 7C 08 02 A6 */ mflr r0 /* 80215DB0 00212CF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80215DB4 00212CF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80215DB8 00212CF8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80215DB4 00212CF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80215DB8 00212CF8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80215DBC 00212CFC 38 64 01 14 */ addi r3, r4, 0x114 /* 80215DC0 00212D00 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 80215DC4 00212D04 4B E1 E5 7D */ bl getLightDropNum__16dSv_light_drop_cCFUc @@ -6819,8 +6819,8 @@ dMeter2Draw_c_NS_getNowLightDropRateCalc: /* 80215DD8 00212D18 90 81 00 08 */ stw r4, 8(r1) /* 80215DDC 00212D1C C8 01 00 08 */ lfd f0, 8(r1) /* 80215DE0 00212D20 EC 40 08 28 */ fsubs f2, f0, f1 -/* 80215DE4 00212D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80215DE8 00212D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80215DE4 00212D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80215DE8 00212D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80215DEC 00212D2C 88 03 5E A1 */ lbz r0, 0x5ea1(r3) /* 80215DF0 00212D30 90 01 00 14 */ stw r0, 0x14(r1) /* 80215DF4 00212D34 90 81 00 10 */ stw r4, 0x10(r1) @@ -6889,8 +6889,8 @@ lbl_80215EA8: /* 80215ED4 00212E14 41 80 FF D4 */ blt lbl_80215EA8 /* 80215ED8 00212E18 3B 40 00 00 */ li r26, 0 /* 80215EDC 00212E1C 3B C0 00 00 */ li r30, 0 -/* 80215EE0 00212E20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80215EE4 00212E24 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80215EE0 00212E20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80215EE4 00212E24 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80215EE8 00212E28 3B 9D 01 14 */ addi r28, r29, 0x114 lbl_80215EEC: /* 80215EEC 00212E2C 7F 83 E3 78 */ mr r3, r28 @@ -6954,8 +6954,8 @@ dMeter2Draw_c_NS_setAlphaLightDropAnimeMax: /* 80215FBC 00212EFC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80215FC0 00212F00 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80215FC4 00212F04 3B C3 00 E3 */ addi r30, r3, 0xe3 -/* 80215FC8 00212F08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80215FCC 00212F0C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80215FC8 00212F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80215FCC 00212F0C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80215FD0 00212F10 88 1F 4E 0C */ lbz r0, 0x4e0c(r31) /* 80215FD4 00212F14 7C 00 07 74 */ extsb r0, r0 /* 80215FD8 00212F18 7C 1E 00 AE */ lbzx r0, r30, r0 @@ -7138,8 +7138,8 @@ lbl_80216264: lbl_80216274: /* 80216274 002131B4 3B 20 00 00 */ li r25, 0 /* 80216278 002131B8 3B C0 00 00 */ li r30, 0 -/* 8021627C 002131BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80216280 002131C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021627C 002131BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80216280 002131C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80216284 002131C4 3B 63 01 14 */ addi r27, r3, 0x114 lbl_80216288: /* 80216288 002131C8 7F 63 DB 78 */ mr r3, r27 @@ -7985,8 +7985,8 @@ lbl_80216E64: /* 80216E74 00213DB4 C3 E3 00 CC */ lfs f31, 0xcc(r3) /* 80216E78 00213DB8 C3 C3 00 D0 */ lfs f30, 0xd0(r3) lbl_80216E7C: -/* 80216E7C 00213DBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80216E80 00213DC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80216E7C 00213DBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80216E80 00213DC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80216E84 00213DC4 88 63 5E 4A */ lbz r3, 0x5e4a(r3) /* 80216E88 00213DC8 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 80216E8C 00213DCC 40 82 00 0C */ bne lbl_80216E98 @@ -8031,8 +8031,8 @@ lbl_80216F10: /* 80216F10 00213E50 88 1F 00 00 */ lbz r0, 0(r31) /* 80216F14 00213E54 7C 00 07 75 */ extsb. r0, r0 /* 80216F18 00213E58 41 82 00 48 */ beq lbl_80216F60 -/* 80216F1C 00213E5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80216F20 00213E60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80216F1C 00213E5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80216F20 00213E60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80216F24 00213E64 88 83 5E 24 */ lbz r4, 0x5e24(r3) /* 80216F28 00213E68 88 03 5E 1D */ lbz r0, 0x5e1d(r3) /* 80216F2C 00213E6C 7C 04 00 40 */ cmplw r4, r0 @@ -8054,8 +8054,8 @@ lbl_80216F60: /* 80216F60 00213EA0 80 7C 03 4C */ lwz r3, 0x34c(r28) /* 80216F64 00213EA4 48 03 E6 A5 */ bl CPaneMgrAlpha_NS_hide lbl_80216F68: -/* 80216F68 00213EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80216F6C 00213EAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80216F68 00213EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80216F6C 00213EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80216F70 00213EB0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80216F74 00213EB4 38 00 00 00 */ li r0, 0 /* 80216F78 00213EB8 88 63 05 6A */ lbz r3, 0x56a(r3) @@ -8207,8 +8207,8 @@ lbl_80217188: /* 8021719C 002140DC 38 DA 07 62 */ addi r6, r26, 0x762 /* 802171A0 002140E0 48 00 31 55 */ bl dMeter2Draw_c_NS_getActionString /* 802171A4 002140E4 7C 7E 1B 78 */ mr r30, r3 -/* 802171A8 002140E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802171AC 002140EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802171A8 002140E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802171AC 002140EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802171B0 002140F0 88 63 5E 43 */ lbz r3, 0x5e43(r3) /* 802171B4 002140F4 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 802171B8 002140F8 40 82 00 0C */ bne lbl_802171C4 @@ -8225,8 +8225,8 @@ lbl_802171CC: /* 802171DC 0021411C 41 82 00 50 */ beq lbl_8021722C /* 802171E0 00214120 28 00 00 2E */ cmplwi r0, 0x2e /* 802171E4 00214124 41 82 00 48 */ beq lbl_8021722C -/* 802171E8 00214128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802171EC 0021412C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802171E8 00214128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802171EC 0021412C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802171F0 00214130 88 83 5E 24 */ lbz r4, 0x5e24(r3) /* 802171F4 00214134 28 04 00 00 */ cmplwi r4, 0 /* 802171F8 00214138 41 82 00 28 */ beq lbl_80217220 @@ -8315,8 +8315,8 @@ lbl_802172F8: /* 8021731C 0021425C 38 00 00 01 */ li r0, 1 /* 80217320 00214260 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80217324 00214264 3B E0 00 01 */ li r31, 1 -/* 80217328 00214268 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021732C 0021426C 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80217328 00214268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021732C 0021426C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80217330 00214270 88 85 00 14 */ lbz r4, 0x14(r5) /* 80217334 00214274 88 7A 07 6F */ lbz r3, 0x76f(r26) /* 80217338 00214278 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -8550,8 +8550,8 @@ dMeter2Draw_c_NS_drawButtonR: /* 802176A4 002145E4 38 A0 00 01 */ li r5, 1 /* 802176A8 002145E8 38 DE 07 6A */ addi r6, r30, 0x76a /* 802176AC 002145EC 48 00 2C 49 */ bl dMeter2Draw_c_NS_getActionString -/* 802176B0 002145F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802176B4 002145F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802176B0 002145F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802176B4 002145F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802176B8 002145F8 88 63 5E 42 */ lbz r3, 0x5e42(r3) /* 802176BC 002145FC 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 802176C0 00214600 40 82 00 0C */ bne lbl_802176CC @@ -8581,8 +8581,8 @@ dMeter2Draw_c_NS_drawButtonZ: /* 8021770C 0021464C 38 DF 07 64 */ addi r6, r31, 0x764 /* 80217710 00214650 48 00 2B E5 */ bl dMeter2Draw_c_NS_getActionString /* 80217714 00214654 7C 7D 1B 78 */ mr r29, r3 -/* 80217718 00214658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021771C 0021465C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80217718 00214658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021771C 0021465C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80217720 00214660 88 63 5E 4E */ lbz r3, 0x5e4e(r3) /* 80217724 00214664 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 80217728 00214668 40 82 00 0C */ bne lbl_80217734 @@ -8749,8 +8749,8 @@ dMeter2Draw_c_NS_drawButtonC: /* 80217978 002148B8 48 00 29 7D */ bl dMeter2Draw_c_NS_getActionString /* 8021797C 002148BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80217980 002148C0 41 82 00 28 */ beq lbl_802179A8 -/* 80217984 002148C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80217988 002148C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80217984 002148C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80217988 002148C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021798C 002148CC 88 63 5E 4C */ lbz r3, 0x5e4c(r3) /* 80217990 002148D0 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 80217994 002148D4 40 82 00 0C */ bne lbl_802179A0 @@ -8802,8 +8802,8 @@ dMeter2Draw_c_NS_drawButtonBin: /* 80217A28 00214968 7C 9C 23 78 */ mr r28, r4 /* 80217A2C 0021496C 3B C0 00 00 */ li r30, 0 /* 80217A30 00214970 3B A0 00 00 */ li r29, 0 -/* 80217A34 00214974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80217A38 00214978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80217A34 00214974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80217A38 00214978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80217A3C 0021497C 3B E3 00 9C */ addi r31, r3, 0x9c lbl_80217A40: /* 80217A40 00214980 7F E3 FB 78 */ mr r3, r31 @@ -8869,8 +8869,8 @@ dMeter2Draw_c_NS_drawButtonXY: /* 80217B1C 00214A5C 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80217B20 00214A60 2C 1B 00 00 */ cmpwi r27, 0 /* 80217B24 00214A64 40 82 00 20 */ bne lbl_80217B44 -/* 80217B28 00214A68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80217B2C 00214A6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80217B28 00214A68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80217B2C 00214A6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80217B30 00214A70 88 03 5E 5E */ lbz r0, 0x5e5e(r3) /* 80217B34 00214A74 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f /* 80217B38 00214A78 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f @@ -8879,8 +8879,8 @@ dMeter2Draw_c_NS_drawButtonXY: lbl_80217B44: /* 80217B44 00214A84 2C 1B 00 01 */ cmpwi r27, 1 /* 80217B48 00214A88 40 82 00 1C */ bne lbl_80217B64 -/* 80217B4C 00214A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80217B50 00214A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80217B4C 00214A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80217B50 00214A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80217B54 00214A94 88 03 5E 62 */ lbz r0, 0x5e62(r3) /* 80217B58 00214A98 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f /* 80217B5C 00214A9C 54 00 FF FE */ rlwinm r0, r0, 0x1f, 0x1f, 0x1f @@ -10420,8 +10420,8 @@ lbl_80219120: /* 8021912C 0021606C 40 82 00 34 */ bne lbl_80219160 /* 80219130 00216070 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80219134 00216074 38 83 01 88 */ addi r4, r3, lbl_80430188@l -/* 80219138 00216078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021913C 0021607C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80219138 00216078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021913C 0021607C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219140 00216080 88 03 4E 0C */ lbz r0, 0x4e0c(r3) /* 80219144 00216084 7C 00 07 74 */ extsb r0, r0 /* 80219148 00216088 7C 64 02 14 */ add r3, r4, r0 @@ -10774,8 +10774,8 @@ dMeter2Draw_c_NS_setButtonIconAAlpha: /* 8021963C 0021657C A0 1F 00 AE */ lhz r0, 0xae(r31) /* 80219640 00216580 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80219644 00216584 40 82 00 24 */ bne lbl_80219668 -/* 80219648 00216588 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021964C 0021658C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80219648 00216588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021964C 0021658C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219650 00216590 88 03 5E 4A */ lbz r0, 0x5e4a(r3) /* 80219654 00216594 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80219658 00216598 40 82 00 10 */ bne lbl_80219668 @@ -11122,8 +11122,8 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: /* 80219B64 00216AA4 48 00 20 51 */ bl dMeter2Draw_c_NS_getCanoeFishing /* 80219B68 00216AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219B6C 00216AAC 40 82 00 60 */ bne lbl_80219BCC -/* 80219B70 00216AB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80219B74 00216AB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80219B70 00216AB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80219B74 00216AB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219B78 00216AB8 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 80219B7C 00216ABC 7F 83 E3 78 */ mr r3, r28 /* 80219B80 00216AC0 38 80 05 40 */ li r4, 0x540 @@ -11150,8 +11150,8 @@ lbl_80219BCC: /* 80219BCC 00216B0C C3 A2 AE 80 */ lfs f29, lbl_80454880-_SDA2_BASE_(r2) /* 80219BD0 00216B10 48 00 00 E8 */ b lbl_80219CB8 lbl_80219BD4: -/* 80219BD4 00216B14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80219BD8 00216B18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80219BD4 00216B14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80219BD8 00216B18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219BDC 00216B1C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80219BE0 00216B20 28 00 00 00 */ cmplwi r0, 0 /* 80219BE4 00216B24 41 82 00 0C */ beq lbl_80219BF0 @@ -11622,8 +11622,8 @@ dMeter2Draw_c_NS_getNumberTexture: /* 8021A2A0 002171E0 7C 08 02 A6 */ mflr r0 /* 8021A2A4 002171E4 90 01 00 14 */ stw r0, 0x14(r1) /* 8021A2A8 002171E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8021A2AC 002171EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021A2B0 002171F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021A2AC 002171EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021A2B0 002171F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021A2B4 002171F4 83 E3 5D 30 */ lwz r31, 0x5d30(r3) /* 8021A2B8 002171F8 7C 83 23 78 */ mr r3, r4 /* 8021A2BC 002171FC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName @@ -12325,8 +12325,8 @@ lbl_8021AC88: /* 8021ACC0 00217C00 57 9C 06 3E */ clrlwi r28, r28, 0x18 /* 8021ACC4 00217C04 28 1C 00 64 */ cmplwi r28, 0x64 /* 8021ACC8 00217C08 40 80 00 C8 */ bge lbl_8021AD90 -/* 8021ACCC 00217C0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021ACD0 00217C10 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8021ACCC 00217C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021ACD0 00217C10 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8021ACD4 00217C14 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021ACD8 00217C18 38 00 00 0A */ li r0, 0xa /* 8021ACDC 00217C1C 7C 7C 03 D6 */ divw r3, r28, r0 @@ -12375,8 +12375,8 @@ lbl_8021AC88: /* 8021AD88 00217CC8 98 03 00 B0 */ stb r0, 0xb0(r3) /* 8021AD8C 00217CCC 48 00 01 24 */ b lbl_8021AEB0 lbl_8021AD90: -/* 8021AD90 00217CD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021AD94 00217CD4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8021AD90 00217CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021AD94 00217CD4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8021AD98 00217CD8 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021AD9C 00217CDC 38 00 00 64 */ li r0, 0x64 /* 8021ADA0 00217CE0 7C 7C 03 D6 */ divw r3, r28, r0 @@ -12574,8 +12574,8 @@ lbl_8021AFE0: /* 8021B078 00217FB8 C0 22 AE E4 */ lfs f1, lbl_804548E4-_SDA2_BASE_(r2) /* 8021B07C 00217FBC FC 40 08 90 */ fmr f2, f1 /* 8021B080 00217FC0 4B F9 3B 75 */ bl dKantera_icon_c_NS_setScale -/* 8021B084 00217FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021B088 00217FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021B084 00217FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021B088 00217FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021B08C 00217FCC A0 A3 00 08 */ lhz r5, 8(r3) /* 8021B090 00217FD0 A0 83 00 06 */ lhz r4, 6(r3) /* 8021B094 00217FD4 80 7F 00 AC */ lwz r3, 0xac(r31) @@ -12725,7 +12725,7 @@ lbl_8021B168: /* 8021B2B8 002181F8 48 00 00 98 */ b lbl_8021B350 lbl_8021B2BC: /* 8021B2BC 002181FC 7C 83 23 78 */ mr r3, r4 -/* 8021B2C0 00218200 4B E8 04 49 */ bl isBottleItem +/* 8021B2C0 00218200 4B E8 04 49 */ bl isBottleItem__FUc /* 8021B2C4 00218204 2C 03 00 00 */ cmpwi r3, 0 /* 8021B2C8 00218208 41 82 00 48 */ beq lbl_8021B310 /* 8021B2CC 0021820C C0 02 AF 1C */ lfs f0, lbl_8045491C-_SDA2_BASE_(r2) @@ -12879,7 +12879,7 @@ lbl_8021B3C8: /* 8021B504 00218444 48 00 00 98 */ b lbl_8021B59C lbl_8021B508: /* 8021B508 00218448 7C 83 23 78 */ mr r3, r4 -/* 8021B50C 0021844C 4B E8 01 FD */ bl isBottleItem +/* 8021B50C 0021844C 4B E8 01 FD */ bl isBottleItem__FUc /* 8021B510 00218450 2C 03 00 00 */ cmpwi r3, 0 /* 8021B514 00218454 41 82 00 48 */ beq lbl_8021B55C /* 8021B518 00218458 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) @@ -13038,7 +13038,7 @@ lbl_8021B614: /* 8021B764 002186A4 48 00 00 98 */ b lbl_8021B7FC lbl_8021B768: /* 8021B768 002186A8 7C 83 23 78 */ mr r3, r4 -/* 8021B76C 002186AC 4B E7 FF 9D */ bl isBottleItem +/* 8021B76C 002186AC 4B E7 FF 9D */ bl isBottleItem__FUc /* 8021B770 002186B0 2C 03 00 00 */ cmpwi r3, 0 /* 8021B774 002186B4 41 82 00 48 */ beq lbl_8021B7BC /* 8021B778 002186B8 C0 02 AF 50 */ lfs f0, lbl_80454950-_SDA2_BASE_(r2) @@ -13113,7 +13113,7 @@ dMeter2Draw_c_NS_setItemParamB: /* 8021B878 002187B8 48 00 02 DC */ b lbl_8021BB54 lbl_8021B87C: /* 8021B87C 002187BC 7F E3 FB 78 */ mr r3, r31 -/* 8021B880 002187C0 4B E7 FE 89 */ bl isBottleItem +/* 8021B880 002187C0 4B E7 FE 89 */ bl isBottleItem__FUc /* 8021B884 002187C4 2C 03 00 00 */ cmpwi r3, 0 /* 8021B888 002187C8 41 82 00 40 */ beq lbl_8021B8C8 /* 8021B88C 002187CC C0 02 AF 54 */ lfs f0, lbl_80454954-_SDA2_BASE_(r2) @@ -13332,8 +13332,8 @@ dMeter2Draw_c_NS_getCanoeFishing: /* 8021BBB4 00218AF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BBB8 00218AF8 7C 08 02 A6 */ mflr r0 /* 8021BBBC 00218AFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BBC0 00218B00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BBC4 00218B04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021BBC0 00218B00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BBC4 00218B04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021BBC8 00218B08 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8021BBCC 00218B0C 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8021BBD0 00218B10 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l @@ -13341,8 +13341,8 @@ dMeter2Draw_c_NS_getCanoeFishing: /* 8021BBD8 00218B18 48 14 CD BD */ bl strcmp /* 8021BBDC 00218B1C 2C 03 00 00 */ cmpwi r3, 0 /* 8021BBE0 00218B20 40 82 00 30 */ bne lbl_8021BC10 -/* 8021BBE4 00218B24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BBE8 00218B28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021BBE4 00218B24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BBE8 00218B28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021BBEC 00218B2C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8021BBF0 00218B30 81 83 06 28 */ lwz r12, 0x628(r3) /* 8021BBF4 00218B34 81 8C 01 90 */ lwz r12, 0x190(r12) @@ -13405,8 +13405,8 @@ lbl_8021BC9C: .global dMeter2Draw_c_NS_getPlayerSubject dMeter2Draw_c_NS_getPlayerSubject: -/* 8021BCAC 00218BEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BCB0 00218BF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021BCAC 00218BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BCB0 00218BF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021BCB4 00218BF4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8021BCB8 00218BF8 54 03 2F FE */ rlwinm r3, r0, 5, 0x1f, 0x1f /* 8021BCBC 00218BFC 4E 80 00 20 */ blr @@ -13419,8 +13419,8 @@ dMeter2Draw_c_NS_isBButtonShow: /* 8021BCCC 00218C0C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8021BCD0 00218C10 93 C1 00 08 */ stw r30, 8(r1) /* 8021BCD4 00218C14 7C 9E 23 78 */ mr r30, r4 -/* 8021BCD8 00218C18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BCDC 00218C1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021BCD8 00218C18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BCDC 00218C1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021BCE0 00218C20 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8021BCE4 00218C24 28 03 00 00 */ cmplwi r3, 0 /* 8021BCE8 00218C28 40 82 00 0C */ bne lbl_8021BCF4 @@ -13435,8 +13435,8 @@ lbl_8021BCF4: /* 8021BD08 00218C48 48 01 B3 E1 */ bl dMsgObject_c_NS_isHowlMessage /* 8021BD0C 00218C4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021BD10 00218C50 40 82 00 9C */ bne lbl_8021BDAC -/* 8021BD14 00218C54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BD18 00218C58 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8021BD14 00218C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BD18 00218C58 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8021BD1C 00218C5C 80 7F 5D AC */ lwz r3, 0x5dac(r31) /* 8021BD20 00218C60 81 83 06 28 */ lwz r12, 0x628(r3) /* 8021BD24 00218C64 81 8C 00 78 */ lwz r12, 0x78(r12) @@ -13459,8 +13459,8 @@ lbl_8021BCF4: /* 8021BD68 00218CA8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8021BD6C 00218CAC 40 82 00 40 */ bne lbl_8021BDAC lbl_8021BD70: -/* 8021BD70 00218CB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021BD74 00218CB4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8021BD70 00218CB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021BD74 00218CB4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8021BD78 00218CB8 88 64 4F AD */ lbz r3, 0x4fad(r4) /* 8021BD7C 00218CBC 30 03 FF FF */ addic r0, r3, -1 /* 8021BD80 00218CC0 7C 00 19 10 */ subfe r0, r0, r3 diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index a50be62bef..44aa6ee2d6 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -185,8 +185,8 @@ lbl_8021BFFC: /* 8021C07C 00218FBC 9B BF 00 E6 */ stb r29, 0xe6(r31) /* 8021C080 00218FC0 9B BF 00 F2 */ stb r29, 0xf2(r31) /* 8021C084 00218FC4 3B 60 00 00 */ li r27, 0 -/* 8021C088 00218FC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C08C 00218FCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C088 00218FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C08C 00218FCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C090 00218FD0 3B 83 01 14 */ addi r28, r3, 0x114 lbl_8021C094: /* 8021C094 00218FD4 7F 83 E3 78 */ mr r3, r28 @@ -213,8 +213,8 @@ lbl_8021C0BC: .global dMeter2Info_c_NS_setFloatingMessage dMeter2Info_c_NS_setFloatingMessage: -/* 8021C0E0 00219020 3C E0 80 40 */ lis r7, lbl_804061C0@ha -/* 8021C0E4 00219024 38 E7 61 C0 */ addi r7, r7, lbl_804061C0@l +/* 8021C0E0 00219020 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha +/* 8021C0E4 00219024 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 8021C0E8 00219028 88 07 4F AD */ lbz r0, 0x4fad(r7) /* 8021C0EC 0021902C 28 00 00 00 */ cmplwi r0, 0 /* 8021C0F0 00219030 41 82 00 0C */ beq lbl_8021C0FC @@ -238,8 +238,8 @@ lbl_8021C0FC: /* 8021C134 00219074 7C 9D 23 78 */ mr r29, r4 /* 8021C138 00219078 7C BE 2B 78 */ mr r30, r5 /* 8021C13C 0021907C 7C DF 33 78 */ mr r31, r6 -/* 8021C140 00219080 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C144 00219084 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C140 00219080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C144 00219084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C148 00219088 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8021C14C 0021908C 28 00 00 00 */ cmplwi r0, 0 /* 8021C150 00219090 41 82 00 0C */ beq lbl_8021C15C @@ -341,8 +341,8 @@ dMeter2Info_c_NS_getString: /* 8021C284 002191C4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C288 002191C8 28 03 00 00 */ cmplwi r3, 0 /* 8021C28C 002191CC 40 82 00 34 */ bne lbl_8021C2C0 -/* 8021C290 002191D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C294 002191D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C290 002191D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C294 002191D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C298 002191D8 80 A3 5C F4 */ lwz r5, 0x5cf4(r3) /* 8021C29C 002191DC 3C 60 52 4F */ lis r3, 0x524F4F54@ha /* 8021C2A0 002191E0 38 63 4F 54 */ addi r3, r3, 0x524F4F54@l @@ -388,8 +388,8 @@ lbl_8021C324: /* 8021C330 00219270 80 1C 00 10 */ lwz r0, 0x10(r28) /* 8021C334 00219274 28 00 00 00 */ cmplwi r0, 0 /* 8021C338 00219278 40 82 00 20 */ bne lbl_8021C358 -/* 8021C33C 0021927C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C340 00219280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C33C 0021927C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C340 00219280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C344 00219284 80 63 5C F4 */ lwz r3, 0x5cf4(r3) /* 8021C348 00219288 81 83 00 00 */ lwz r12, 0(r3) /* 8021C34C 0021928C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -421,8 +421,8 @@ dMeter2Info_c_NS_getStringKana: /* 8021C3A4 002192E4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C3A8 002192E8 28 03 00 00 */ cmplwi r3, 0 /* 8021C3AC 002192EC 40 82 00 34 */ bne lbl_8021C3E0 -/* 8021C3B0 002192F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C3B4 002192F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C3B0 002192F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C3B4 002192F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C3B8 002192F8 80 A3 5C F4 */ lwz r5, 0x5cf4(r3) /* 8021C3BC 002192FC 3C 60 52 4F */ lis r3, 0x524F4F54@ha /* 8021C3C0 00219300 38 63 4F 54 */ addi r3, r3, 0x524F4F54@l @@ -521,8 +521,8 @@ lbl_8021C4F8: /* 8021C504 00219444 80 1C 00 10 */ lwz r0, 0x10(r28) /* 8021C508 00219448 28 00 00 00 */ cmplwi r0, 0 /* 8021C50C 0021944C 40 82 00 20 */ bne lbl_8021C52C -/* 8021C510 00219450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C514 00219454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C510 00219450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C514 00219454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C518 00219458 80 63 5C F4 */ lwz r3, 0x5cf4(r3) /* 8021C51C 0021945C 81 83 00 00 */ lwz r12, 0(r3) /* 8021C520 00219460 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -554,8 +554,8 @@ dMeter2Info_c_NS_getStringKanji: /* 8021C578 002194B8 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C57C 002194BC 28 03 00 00 */ cmplwi r3, 0 /* 8021C580 002194C0 40 82 00 34 */ bne lbl_8021C5B4 -/* 8021C584 002194C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C588 002194C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C584 002194C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C588 002194C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C58C 002194CC 80 A3 5C F4 */ lwz r5, 0x5cf4(r3) /* 8021C590 002194D0 3C 60 52 4F */ lis r3, 0x524F4F54@ha /* 8021C594 002194D4 38 63 4F 54 */ addi r3, r3, 0x524F4F54@l @@ -621,8 +621,8 @@ lbl_8021C658: /* 8021C664 002195A4 80 1C 00 10 */ lwz r0, 0x10(r28) /* 8021C668 002195A8 28 00 00 00 */ cmplwi r0, 0 /* 8021C66C 002195AC 40 82 00 20 */ bne lbl_8021C68C -/* 8021C670 002195B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021C674 002195B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021C670 002195B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021C674 002195B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021C678 002195B8 80 63 5C F4 */ lwz r3, 0x5cf4(r3) /* 8021C67C 002195BC 81 83 00 00 */ lwz r12, 0(r3) /* 8021C680 002195C0 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -875,8 +875,8 @@ dMeter2Info_c_NS_resetWarpStatus: /* 8021C9DC 0021991C 88 03 00 C0 */ lbz r0, 0xc0(r3) /* 8021C9E0 00219920 28 00 00 02 */ cmplwi r0, 2 /* 8021C9E4 00219924 40 82 00 14 */ bne lbl_8021C9F8 -/* 8021C9E8 00219928 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8021C9EC 0021992C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8021C9E8 00219928 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8021C9EC 0021992C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021C9F0 00219930 38 00 FF FF */ li r0, -1 /* 8021C9F4 00219934 98 04 00 98 */ stb r0, 0x98(r4) lbl_8021C9F8: @@ -892,8 +892,8 @@ dMeter2Info_c_NS_warpInProc: /* 8021CA10 00219950 93 E1 00 0C */ stw r31, 0xc(r1) /* 8021CA14 00219954 38 60 00 00 */ li r3, 0 /* 8021CA18 00219958 4B E1 28 F9 */ bl dComIfGs_setWarpMarkFlag -/* 8021CA1C 0021995C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CA20 00219960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CA1C 0021995C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CA20 00219960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CA24 00219964 38 00 FF FF */ li r0, -1 /* 8021CA28 00219968 98 03 00 98 */ stb r0, 0x98(r3) /* 8021CA2C 0021996C 3B E3 00 9C */ addi r31, r3, 0x9c @@ -922,8 +922,8 @@ dMeter2Info_c_NS_warpOutProc: /* 8021CA78 002199B8 90 01 00 34 */ stw r0, 0x34(r1) /* 8021CA7C 002199BC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8021CA80 002199C0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8021CA84 002199C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CA88 002199C8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8021CA84 002199C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CA88 002199C8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8021CA8C 002199CC 38 7E 4E 20 */ addi r3, r30, 0x4e20 /* 8021CA90 002199D0 81 9E 4E 20 */ lwz r12, 0x4e20(r30) /* 8021CA94 002199D4 81 8C 00 BC */ lwz r12, 0xbc(r12) @@ -931,8 +931,8 @@ dMeter2Info_c_NS_warpOutProc: /* 8021CA9C 002199DC 4E 80 04 21 */ bctrl /* 8021CAA0 002199E0 88 03 00 09 */ lbz r0, 9(r3) /* 8021CAA4 002199E4 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8021CAA8 002199E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CAAC 002199EC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8021CAA8 002199E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CAAC 002199EC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8021CAB0 002199F0 98 1F 00 98 */ stb r0, 0x98(r31) /* 8021CAB4 002199F4 C0 1F 0D BC */ lfs f0, 0xdbc(r31) /* 8021CAB8 002199F8 D0 01 00 1C */ stfs f0, 0x1c(r1) @@ -1011,8 +1011,8 @@ lbl_8021CB9C: /* 8021CBC4 00219B04 38 E0 00 00 */ li r7, 0 /* 8021CBC8 00219B08 39 00 00 01 */ li r8, 1 /* 8021CBCC 00219B0C 4B E1 25 D1 */ bl dComIfGs_setWarpItemData_X1_ -/* 8021CBD0 00219B10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CBD4 00219B14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CBD0 00219B10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CBD4 00219B14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CBD8 00219B18 38 63 00 9C */ addi r3, r3, 0x9c /* 8021CBDC 00219B1C 38 80 00 12 */ li r4, 0x12 /* 8021CBE0 00219B20 38 A0 00 27 */ li r5, 0x27 @@ -1301,8 +1301,8 @@ dMeter2Info_c_NS_readItemTexture: /* 8021CF5C 00219E9C 56 80 06 3E */ clrlwi r0, r20, 0x18 /* 8021CF60 00219EA0 28 00 00 48 */ cmplwi r0, 0x48 /* 8021CF64 00219EA4 40 82 00 18 */ bne lbl_8021CF7C -/* 8021CF68 00219EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CF6C 00219EAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CF68 00219EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CF6C 00219EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CF70 00219EB0 A0 03 00 08 */ lhz r0, 8(r3) /* 8021CF74 00219EB4 28 00 00 00 */ cmplwi r0, 0 /* 8021CF78 00219EB8 41 82 00 10 */ beq lbl_8021CF88 @@ -1311,8 +1311,8 @@ lbl_8021CF7C: /* 8021CF80 00219EC0 28 00 00 F8 */ cmplwi r0, 0xf8 /* 8021CF84 00219EC4 40 82 00 24 */ bne lbl_8021CFA8 lbl_8021CF88: -/* 8021CF88 00219EC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CF8C 00219ECC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CF88 00219EC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CF8C 00219ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CF90 00219ED0 80 63 5C D0 */ lwz r3, 0x5cd0(r3) /* 8021CF94 00219ED4 7E C4 B3 78 */ mr r4, r22 /* 8021CF98 00219ED8 38 A0 0C 00 */ li r5, 0xc00 @@ -1322,8 +1322,8 @@ lbl_8021CF88: lbl_8021CFA8: /* 8021CFA8 00219EE8 28 00 00 46 */ cmplwi r0, 0x46 /* 8021CFAC 00219EEC 40 82 00 50 */ bne lbl_8021CFFC -/* 8021CFB0 00219EF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CFB4 00219EF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CFB0 00219EF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CFB4 00219EF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CFB8 00219EF8 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8021CFBC 00219EFC 81 83 06 28 */ lwz r12, 0x628(r3) /* 8021CFC0 00219F00 81 8C 02 A0 */ lwz r12, 0x2a0(r12) @@ -1333,8 +1333,8 @@ lbl_8021CFA8: /* 8021CFD0 00219F10 40 82 00 2C */ bne lbl_8021CFFC /* 8021CFD4 00219F14 2C 15 FF FF */ cmpwi r21, -1 /* 8021CFD8 00219F18 40 82 00 24 */ bne lbl_8021CFFC -/* 8021CFDC 00219F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021CFE0 00219F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021CFDC 00219F1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021CFE0 00219F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CFE4 00219F24 80 63 5C D0 */ lwz r3, 0x5cd0(r3) /* 8021CFE8 00219F28 7E C4 B3 78 */ mr r4, r22 /* 8021CFEC 00219F2C 38 A0 0C 00 */ li r5, 0xc00 @@ -1352,8 +1352,8 @@ lbl_8021CFFC: lbl_8021D018: /* 8021D018 00219F58 28 1A 00 00 */ cmplwi r26, 0 /* 8021D01C 00219F5C 40 82 00 34 */ bne lbl_8021D050 -/* 8021D020 00219F60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021D024 00219F64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021D020 00219F60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021D024 00219F64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021D028 00219F68 82 83 5C D0 */ lwz r20, 0x5cd0(r3) /* 8021D02C 00219F6C 7F E3 FB 78 */ mr r3, r31 /* 8021D030 00219F70 7F C4 F3 78 */ mr r4, r30 @@ -1367,8 +1367,8 @@ lbl_8021D018: lbl_8021D050: /* 8021D050 00219F90 2C 15 00 00 */ cmpwi r21, 0 /* 8021D054 00219F94 41 80 00 24 */ blt lbl_8021D078 -/* 8021D058 00219F98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021D05C 00219F9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021D058 00219F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021D05C 00219F9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021D060 00219FA0 80 63 5C D0 */ lwz r3, 0x5cd0(r3) /* 8021D064 00219FA4 7E C4 B3 78 */ mr r4, r22 /* 8021D068 00219FA8 38 A0 0C 00 */ li r5, 0xc00 @@ -1376,8 +1376,8 @@ lbl_8021D050: /* 8021D070 00219FB0 48 0B 8E 5D */ bl readIdxResource__10JKRArchiveFPvUlUl /* 8021D074 00219FB4 48 00 00 34 */ b lbl_8021D0A8 lbl_8021D078: -/* 8021D078 00219FB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021D07C 00219FBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021D078 00219FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021D07C 00219FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021D080 00219FC0 80 63 5C D0 */ lwz r3, 0x5cd0(r3) /* 8021D084 00219FC4 7E C4 B3 78 */ mr r4, r22 /* 8021D088 00219FC8 38 A0 0C 00 */ li r5, 0xc00 @@ -1441,8 +1441,8 @@ lbl_8021D120: lbl_8021D15C: /* 8021D15C 0021A09C 28 1A 00 00 */ cmplwi r26, 0 /* 8021D160 0021A0A0 40 82 00 78 */ bne lbl_8021D1D8 -/* 8021D164 0021A0A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021D168 0021A0A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021D164 0021A0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021D168 0021A0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021D16C 0021A0AC 82 83 5C D0 */ lwz r20, 0x5cd0(r3) /* 8021D170 0021A0B0 7F E3 FB 78 */ mr r3, r31 /* 8021D174 0021A0B4 7F C4 F3 78 */ mr r4, r30 @@ -1472,8 +1472,8 @@ lbl_8021D1D0: /* 8021D1D0 0021A110 3A 60 00 02 */ li r19, 2 /* 8021D1D4 0021A114 48 00 01 7C */ b lbl_8021D350 lbl_8021D1D8: -/* 8021D1D8 0021A118 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021D1DC 0021A11C 3A 83 61 C0 */ addi r20, r3, lbl_804061C0@l +/* 8021D1D8 0021A118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021D1DC 0021A11C 3A 83 61 C0 */ addi r20, r3, g_dComIfG_gameInfo@l /* 8021D1E0 0021A120 82 B4 5C D0 */ lwz r21, 0x5cd0(r20) /* 8021D1E4 0021A124 7F E3 FB 78 */ mr r3, r31 /* 8021D1E8 0021A128 7F C4 F3 78 */ mr r4, r30 @@ -2274,8 +2274,8 @@ dMeter2Info_c_NS_changeWater: /* 8021DD80 0021ACC0 54 00 08 3C */ slwi r0, r0, 1 /* 8021DD84 0021ACC4 7C 63 02 14 */ add r3, r3, r0 /* 8021DD88 0021ACC8 B0 83 00 9A */ sth r4, 0x9a(r3) -/* 8021DD8C 0021ACCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DD90 0021ACD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021DD8C 0021ACCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DD90 0021ACD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021DD94 0021ACD4 3B E3 00 9C */ addi r31, r3, 0x9c /* 8021DD98 0021ACD8 7F E3 FB 78 */ mr r3, r31 /* 8021DD9C 0021ACDC 7F C4 F3 78 */ mr r4, r30 @@ -2289,8 +2289,8 @@ dMeter2Info_c_NS_changeWater: /* 8021DDBC 0021ACFC 38 A0 00 67 */ li r5, 0x67 /* 8021DDC0 0021AD00 4B E1 51 F9 */ bl setItem__17dSv_player_item_cFiUc /* 8021DDC4 0021AD04 3B A0 00 00 */ li r29, 0 -/* 8021DDC8 0021AD08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DDCC 0021AD0C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8021DDC8 0021AD08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DDCC 0021AD0C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8021DDD0 0021AD10 57 9F 06 3E */ clrlwi r31, r28, 0x18 lbl_8021DDD4: /* 8021DDD4 0021AD14 7F C3 F3 78 */ mr r3, r30 @@ -2333,8 +2333,8 @@ lbl_8021DE48: /* 8021DE50 0021AD90 40 82 00 64 */ bne lbl_8021DEB4 /* 8021DE54 0021AD94 3B C0 00 00 */ li r30, 0 /* 8021DE58 0021AD98 3B E0 00 00 */ li r31, 0 -/* 8021DE5C 0021AD9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DE60 0021ADA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021DE5C 0021AD9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DE60 0021ADA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021DE64 0021ADA4 3B 63 00 9C */ addi r27, r3, 0x9c lbl_8021DE68: /* 8021DE68 0021ADA8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -2360,8 +2360,8 @@ lbl_8021DE98: lbl_8021DEB4: /* 8021DEB4 0021ADF4 9B 5C 00 DD */ stb r26, 0xdd(r28) /* 8021DEB8 0021ADF8 3B E0 00 00 */ li r31, 0 -/* 8021DEBC 0021ADFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DEC0 0021AE00 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8021DEBC 0021ADFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DEC0 0021AE00 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l lbl_8021DEC4: /* 8021DEC4 0021AE04 7F E3 FB 78 */ mr r3, r31 /* 8021DEC8 0021AE08 4B E0 FF 01 */ bl dComIfGs_getMixItemIndex @@ -2374,8 +2374,8 @@ lbl_8021DEC4: /* 8021DEE4 0021AE24 3B FF 00 01 */ addi r31, r31, 1 /* 8021DEE8 0021AE28 2C 1F 00 02 */ cmpwi r31, 2 /* 8021DEEC 0021AE2C 41 80 FF D8 */ blt lbl_8021DEC4 -/* 8021DEF0 0021AE30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DEF4 0021AE34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021DEF0 0021AE30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DEF4 0021AE34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021DEF8 0021AE38 3B E3 00 EC */ addi r31, r3, 0xec /* 8021DEFC 0021AE3C 7F E3 FB 78 */ mr r3, r31 /* 8021DF00 0021AE40 88 9C 00 DC */ lbz r4, 0xdc(r28) @@ -2383,8 +2383,8 @@ lbl_8021DEC4: /* 8021DF08 0021AE48 98 7C 00 CC */ stb r3, 0xcc(r28) /* 8021DF0C 0021AE4C 88 1F 00 00 */ lbz r0, 0(r31) /* 8021DF10 0021AE50 98 1C 00 CD */ stb r0, 0xcd(r28) -/* 8021DF14 0021AE54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DF18 0021AE58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021DF14 0021AE54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DF18 0021AE58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021DF1C 0021AE5C 3B C3 00 9C */ addi r30, r3, 0x9c /* 8021DF20 0021AE60 7F C3 F3 78 */ mr r3, r30 /* 8021DF24 0021AE64 38 80 00 04 */ li r4, 4 @@ -2418,8 +2418,8 @@ lbl_8021DF5C: /* 8021DF90 0021AED0 4B E1 50 29 */ bl setItem__17dSv_player_item_cFiUc /* 8021DF94 0021AED4 88 9C 00 DA */ lbz r4, 0xda(r28) /* 8021DF98 0021AED8 38 00 00 04 */ li r0, 4 -/* 8021DF9C 0021AEDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021DFA0 0021AEE0 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8021DF9C 0021AEDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021DFA0 0021AEE0 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8021DFA4 0021AEE4 98 1B 5E 7D */ stb r0, 0x5e7d(r27) /* 8021DFA8 0021AEE8 98 9B 5E 7E */ stb r4, 0x5e7e(r27) /* 8021DFAC 0021AEEC 7F C3 F3 78 */ mr r3, r30 @@ -2447,8 +2447,8 @@ lbl_8021DFEC: /* 8021E000 0021AF40 4B E1 4F B9 */ bl setItem__17dSv_player_item_cFiUc /* 8021E004 0021AF44 88 7C 00 DC */ lbz r3, 0xdc(r28) /* 8021E008 0021AF48 38 03 00 0F */ addi r0, r3, 0xf -/* 8021E00C 0021AF4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E010 0021AF50 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l +/* 8021E00C 0021AF4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E010 0021AF50 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 8021E014 0021AF54 98 1B 5E 7D */ stb r0, 0x5e7d(r27) /* 8021E018 0021AF58 38 00 00 70 */ li r0, 0x70 /* 8021E01C 0021AF5C 98 1B 5E 7E */ stb r0, 0x5e7e(r27) @@ -2484,8 +2484,8 @@ lbl_8021E084: /* 8021E090 0021AFD0 88 9C 00 DC */ lbz r4, 0xdc(r28) /* 8021E094 0021AFD4 38 A0 00 1E */ li r5, 0x1e /* 8021E098 0021AFD8 4B E1 5E D5 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8021E09C 0021AFDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E0A0 0021AFE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E09C 0021AFDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E0A0 0021AFE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E0A4 0021AFE4 88 03 00 F8 */ lbz r0, 0xf8(r3) /* 8021E0A8 0021AFE8 98 1F 00 00 */ stb r0, 0(r31) lbl_8021E0AC: @@ -2511,8 +2511,8 @@ dMeter2Info_c_NS_resetMiniGameItem: /* 8021E0EC 0021B02C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8021E0F0 0021B030 41 82 00 9C */ beq lbl_8021E18C /* 8021E0F4 0021B034 3B 60 00 00 */ li r27, 0 -/* 8021E0F8 0021B038 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E0FC 0021B03C 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8021E0F8 0021B038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E0FC 0021B03C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l lbl_8021E100: /* 8021E100 0021B040 7F 63 DB 78 */ mr r3, r27 /* 8021E104 0021B044 4B E0 FC C5 */ bl dComIfGs_getMixItemIndex @@ -2525,8 +2525,8 @@ lbl_8021E100: /* 8021E120 0021B060 3B 7B 00 01 */ addi r27, r27, 1 /* 8021E124 0021B064 2C 1B 00 02 */ cmpwi r27, 2 /* 8021E128 0021B068 41 80 FF D8 */ blt lbl_8021E100 -/* 8021E12C 0021B06C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E130 0021B070 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E12C 0021B06C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E130 0021B070 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E134 0021B074 3B 83 00 EC */ addi r28, r3, 0xec /* 8021E138 0021B078 7F 83 E3 78 */ mr r3, r28 /* 8021E13C 0021B07C 88 9E 00 DC */ lbz r4, 0xdc(r30) @@ -2534,8 +2534,8 @@ lbl_8021E100: /* 8021E144 0021B084 98 7E 00 D8 */ stb r3, 0xd8(r30) /* 8021E148 0021B088 88 1C 00 00 */ lbz r0, 0(r28) /* 8021E14C 0021B08C 98 1E 00 D9 */ stb r0, 0xd9(r30) -/* 8021E150 0021B090 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E154 0021B094 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E150 0021B090 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E154 0021B094 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E158 0021B098 3B 83 00 9C */ addi r28, r3, 0x9c /* 8021E15C 0021B09C 7F 83 E3 78 */ mr r3, r28 /* 8021E160 0021B0A0 38 80 00 04 */ li r4, 4 @@ -2562,8 +2562,8 @@ lbl_8021E190: /* 8021E1AC 0021B0EC 3B 7B 00 01 */ addi r27, r27, 1 /* 8021E1B0 0021B0F0 2C 1B 00 02 */ cmpwi r27, 2 /* 8021E1B4 0021B0F4 41 80 FF DC */ blt lbl_8021E190 -/* 8021E1B8 0021B0F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E1BC 0021B0FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E1B8 0021B0F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E1BC 0021B0FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E1C0 0021B100 3B 83 00 9C */ addi r28, r3, 0x9c /* 8021E1C4 0021B104 7F 83 E3 78 */ mr r3, r28 /* 8021E1C8 0021B108 38 80 00 04 */ li r4, 4 @@ -2571,8 +2571,8 @@ lbl_8021E190: /* 8021E1D0 0021B110 4B E1 4D E9 */ bl setItem__17dSv_player_item_cFiUc /* 8021E1D4 0021B114 88 9E 00 CE */ lbz r4, 0xce(r30) /* 8021E1D8 0021B118 38 00 00 04 */ li r0, 4 -/* 8021E1DC 0021B11C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E1E0 0021B120 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8021E1DC 0021B11C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E1E0 0021B120 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8021E1E4 0021B124 98 1D 5E 7D */ stb r0, 0x5e7d(r29) /* 8021E1E8 0021B128 98 9D 5E 7E */ stb r4, 0x5e7e(r29) /* 8021E1EC 0021B12C 7F 83 E3 78 */ mr r3, r28 @@ -2586,8 +2586,8 @@ lbl_8021E190: /* 8021E20C 0021B14C 38 04 00 0F */ addi r0, r4, 0xf /* 8021E210 0021B150 98 1D 5E 7D */ stb r0, 0x5e7d(r29) /* 8021E214 0021B154 98 7D 5E 7E */ stb r3, 0x5e7e(r29) -/* 8021E218 0021B158 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E21C 0021B15C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E218 0021B158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E21C 0021B15C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E220 0021B160 3B 83 00 EC */ addi r28, r3, 0xec /* 8021E224 0021B164 7F 83 E3 78 */ mr r3, r28 /* 8021E228 0021B168 88 BE 00 CC */ lbz r5, 0xcc(r30) @@ -2788,8 +2788,8 @@ lbl_8021E4D8: lbl_8021E4E0: /* 8021E4E0 0021B420 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8021E4E4 0021B424 41 82 00 24 */ beq lbl_8021E508 -/* 8021E4E8 0021B428 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E4EC 0021B42C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E4E8 0021B428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E4EC 0021B42C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E4F0 0021B430 88 83 00 13 */ lbz r4, 0x13(r3) /* 8021E4F4 0021B434 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8021E4F8 0021B438 28 00 00 FF */ cmplwi r0, 0xff @@ -2799,8 +2799,8 @@ lbl_8021E4E0: lbl_8021E508: /* 8021E508 0021B448 7F E3 FB 78 */ mr r3, r31 /* 8021E50C 0021B44C 4B E1 09 A5 */ bl dComIfGs_setSelectEquipClothes -/* 8021E510 0021B450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E514 0021B454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E510 0021B450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E514 0021B454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E518 0021B458 9B E3 5E 74 */ stb r31, 0x5e74(r3) /* 8021E51C 0021B45C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8021E520 0021B460 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2836,8 +2836,8 @@ lbl_8021E57C: lbl_8021E584: /* 8021E584 0021B4C4 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8021E588 0021B4C8 41 82 00 24 */ beq lbl_8021E5AC -/* 8021E58C 0021B4CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E590 0021B4D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E58C 0021B4CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E590 0021B4D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E594 0021B4D4 88 83 00 14 */ lbz r4, 0x14(r3) /* 8021E598 0021B4D8 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8021E59C 0021B4DC 28 00 00 FF */ cmplwi r0, 0xff @@ -2847,8 +2847,8 @@ lbl_8021E584: lbl_8021E5AC: /* 8021E5AC 0021B4EC 7F E3 FB 78 */ mr r3, r31 /* 8021E5B0 0021B4F0 4B E1 09 11 */ bl dComIfGs_setSelectEquipSword -/* 8021E5B4 0021B4F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E5B8 0021B4F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E5B4 0021B4F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E5B8 0021B4F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E5BC 0021B4FC 9B E3 5E 75 */ stb r31, 0x5e75(r3) /* 8021E5C0 0021B500 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8021E5C4 0021B504 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2877,8 +2877,8 @@ lbl_8021E608: lbl_8021E610: /* 8021E610 0021B550 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8021E614 0021B554 41 82 00 24 */ beq lbl_8021E638 -/* 8021E618 0021B558 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E61C 0021B55C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E618 0021B558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E61C 0021B55C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E620 0021B560 88 83 00 15 */ lbz r4, 0x15(r3) /* 8021E624 0021B564 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8021E628 0021B568 28 00 00 FF */ cmplwi r0, 0xff @@ -2888,8 +2888,8 @@ lbl_8021E610: lbl_8021E638: /* 8021E638 0021B578 7F E3 FB 78 */ mr r3, r31 /* 8021E63C 0021B57C 4B E1 09 59 */ bl dComIfGs_setSelectEquipShield -/* 8021E640 0021B580 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E644 0021B584 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E640 0021B580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E644 0021B584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E648 0021B588 9B E3 5E 76 */ stb r31, 0x5e76(r3) /* 8021E64C 0021B58C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8021E650 0021B590 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2915,8 +2915,8 @@ dMeter2Info_isMapOpenCheck: .global dMeter2Info_isItemOpenCheck dMeter2Info_isItemOpenCheck: -/* 8021E688 0021B5C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E68C 0021B5CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E688 0021B5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E68C 0021B5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E690 0021B5D0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8021E694 0021B5D4 88 63 05 6A */ lbz r3, 0x56a(r3) /* 8021E698 0021B5D8 28 03 00 2D */ cmplwi r3, 0x2d @@ -2951,8 +2951,8 @@ dMeter2Info_getRecieveLetterNum: /* 8021E6F4 0021B634 48 14 3A E9 */ bl _savegpr_29 /* 8021E6F8 0021B638 3B C0 00 00 */ li r30, 0 /* 8021E6FC 0021B63C 3B A0 00 00 */ li r29, 0 -/* 8021E700 0021B640 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E704 0021B644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E700 0021B640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E704 0021B644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E708 0021B648 3B E3 01 1C */ addi r31, r3, 0x11c lbl_8021E70C: /* 8021E70C 0021B64C 7F E3 FB 78 */ mr r3, r31 @@ -2985,8 +2985,8 @@ dMeter2Info_getNewLetterNum: /* 8021E768 0021B6A8 3B 80 00 00 */ li r28, 0 /* 8021E76C 0021B6AC 3B 60 00 00 */ li r27, 0 /* 8021E770 0021B6B0 3B E0 00 00 */ li r31, 0 -/* 8021E774 0021B6B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E778 0021B6B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E774 0021B6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E778 0021B6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E77C 0021B6BC 3B C3 01 1C */ addi r30, r3, 0x11c /* 8021E780 0021B6C0 3B A3 07 F0 */ addi r29, r3, 0x7f0 lbl_8021E784: @@ -3034,8 +3034,8 @@ dMeter2Info_setNewLetterSender: /* 8021E818 0021B758 3B E0 00 00 */ li r31, 0 /* 8021E81C 0021B75C 3B C0 00 00 */ li r30, 0 /* 8021E820 0021B760 3B A0 00 00 */ li r29, 0 -/* 8021E824 0021B764 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E828 0021B768 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E824 0021B764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E828 0021B768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E82C 0021B76C 3B 83 01 1C */ addi r28, r3, 0x11c /* 8021E830 0021B770 3B 63 07 F0 */ addi r27, r3, 0x7f0 lbl_8021E834: @@ -3098,8 +3098,8 @@ dMeter2Info_recieveLetter: /* 8021E8F8 0021B838 7C 7F 1B 78 */ mr r31, r3 /* 8021E8FC 0021B83C 3B C0 00 00 */ li r30, 0 /* 8021E900 0021B840 3B A0 00 00 */ li r29, 0 -/* 8021E904 0021B844 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8021E908 0021B848 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8021E904 0021B844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8021E908 0021B848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E90C 0021B84C 3B 83 01 1C */ addi r28, r3, 0x11c /* 8021E910 0021B850 3B 63 07 F0 */ addi r27, r3, 0x7f0 lbl_8021E914: diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 5fa20c34ac..85ca635c9a 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -398,8 +398,8 @@ lbl_80228AC4: .global getPohNum getPohNum: /* 80228ACC 00225A0C 38 60 00 00 */ li r3, 0 -/* 80228AD0 00225A10 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80228AD4 00225A14 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80228AD0 00225A10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80228AD4 00225A14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80228AD8 00225A18 88 04 01 0C */ lbz r0, 0x10c(r4) /* 80228ADC 00225A1C 28 00 00 14 */ cmplwi r0, 0x14 /* 80228AE0 00225A20 40 80 00 10 */ bge lbl_80228AF0 @@ -576,8 +576,8 @@ jmessage_tReference_NS_calcDistance: /* 80228D68 00225CA8 D0 1F 04 54 */ stfs f0, 0x454(r31) /* 80228D6C 00225CAC 48 00 00 60 */ b lbl_80228DCC lbl_80228D70: -/* 80228D70 00225CB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80228D74 00225CB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80228D70 00225CB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80228D74 00225CB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80228D78 00225CB8 80 A3 5D AC */ lwz r5, 0x5dac(r3) /* 80228D7C 00225CBC 38 61 00 14 */ addi r3, r1, 0x14 /* 80228D80 00225CC0 38 9F 04 14 */ addi r4, r31, 0x414 @@ -1125,8 +1125,8 @@ jmessage_tReference_NS_inputNumber: /* 802294CC 0022640C AB C3 01 74 */ lha r30, 0x174(r3) /* 802294D0 00226410 7F DD F3 78 */ mr r29, r30 /* 802294D4 00226414 3B 60 00 00 */ li r27, 0 -/* 802294D8 00226418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802294DC 0022641C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802294D8 00226418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802294DC 0022641C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802294E0 00226420 A0 1F 00 04 */ lhz r0, 4(r31) /* 802294E4 00226424 28 00 03 E8 */ cmplwi r0, 0x3e8 /* 802294E8 00226428 41 80 00 0C */ blt lbl_802294F4 @@ -2242,8 +2242,8 @@ lbl_8022A420: /* 8022A45C 0022739C 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022A460 002273A0 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022A464 002273A4 38 84 00 04 */ addi r4, r4, 4 -/* 8022A468 002273A8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022A46C 002273AC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022A468 002273A8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022A46C 002273AC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022A470 002273B0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022A474 002273B4 38 00 00 64 */ li r0, 0x64 /* 8022A478 002273B8 7C A5 03 D6 */ divw r5, r5, r0 @@ -2258,8 +2258,8 @@ lbl_8022A420: /* 8022A49C 002273DC 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022A4A0 002273E0 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022A4A4 002273E4 38 84 00 04 */ addi r4, r4, 4 -/* 8022A4A8 002273E8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022A4AC 002273EC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022A4A8 002273E8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022A4AC 002273EC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022A4B0 002273F0 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 8022A4B4 002273F4 38 A0 00 64 */ li r5, 0x64 /* 8022A4B8 002273F8 7C 06 2B D6 */ divw r0, r6, r5 @@ -2291,8 +2291,8 @@ lbl_8022A4F8: /* 8022A51C 0022745C 38 00 00 00 */ li r0, 0 /* 8022A520 00227460 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A524: -/* 8022A524 00227464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A528 00227468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A524 00227464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A528 00227468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A52C 0022746C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022A530 00227470 38 61 01 64 */ addi r3, r1, 0x164 /* 8022A534 00227474 48 13 E5 F9 */ bl strcpy @@ -2307,8 +2307,8 @@ lbl_8022A524: /* 8022A558 00227498 38 00 00 00 */ li r0, 0 /* 8022A55C 0022749C 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A560: -/* 8022A560 002274A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A564 002274A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A560 002274A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A564 002274A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A568 002274A8 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022A56C 002274AC 38 61 01 00 */ addi r3, r1, 0x100 /* 8022A570 002274B0 48 13 E5 BD */ bl strcpy @@ -2606,8 +2606,8 @@ lbl_8022A9B4: /* 8022A9BC 002278FC 40 82 00 08 */ bne lbl_8022A9C4 /* 8022A9C0 00227900 38 80 00 72 */ li r4, 0x72 lbl_8022A9C4: -/* 8022A9C4 00227904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A9C8 00227908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A9C4 00227904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A9C8 00227908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A9CC 0022790C 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8022A9D0 00227910 4B E0 97 29 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8022A9D4 00227914 7C 60 1B 78 */ mr r0, r3 @@ -2622,8 +2622,8 @@ lbl_8022A9C4: /* 8022A9F8 00227938 48 00 0A E9 */ bl jmessage_tMeasureProcessor_NS_push_word /* 8022A9FC 0022793C 38 60 00 01 */ li r3, 1 /* 8022AA00 00227940 48 00 06 98 */ b lbl_8022B098 -/* 8022AA04 00227944 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AA08 00227948 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AA04 00227944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AA08 00227948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AA0C 0022794C 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 8022AA10 00227950 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AA14 00227954 38 80 00 00 */ li r4, 0 @@ -2786,8 +2786,8 @@ lbl_8022AC74: /* 8022AC74 00227BB4 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8022AC78 00227BB8 28 00 00 02 */ cmplwi r0, 2 /* 8022AC7C 00227BBC 40 82 00 28 */ bne lbl_8022ACA4 -/* 8022AC80 00227BC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AC84 00227BC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AC80 00227BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AC84 00227BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AC88 00227BC8 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 8022AC8C 00227BCC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AC90 00227BD0 38 80 00 04 */ li r4, 4 @@ -2807,8 +2807,8 @@ lbl_8022ACA4: /* 8022ACC4 00227C04 48 00 02 54 */ b lbl_8022AF18 /* 8022ACC8 00227C08 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACCC 00227C0C 38 80 00 00 */ li r4, 0 -/* 8022ACD0 00227C10 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022ACD4 00227C14 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022ACD0 00227C10 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022ACD4 00227C14 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022ACD8 00227C18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022ACDC 00227C1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ACE0 00227C20 38 E0 00 01 */ li r7, 1 @@ -2816,8 +2816,8 @@ lbl_8022ACA4: /* 8022ACE8 00227C28 48 00 02 30 */ b lbl_8022AF18 /* 8022ACEC 00227C2C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACF0 00227C30 38 80 00 01 */ li r4, 1 -/* 8022ACF4 00227C34 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022ACF8 00227C38 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022ACF4 00227C34 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022ACF8 00227C38 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022ACFC 00227C3C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AD00 00227C40 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD04 00227C44 38 E0 00 01 */ li r7, 1 @@ -2855,13 +2855,13 @@ lbl_8022ACA4: /* 8022AD84 00227CC4 88 1D 00 00 */ lbz r0, 0(r29) /* 8022AD88 00227CC8 28 00 00 00 */ cmplwi r0, 0 /* 8022AD8C 00227CCC 40 82 00 14 */ bne lbl_8022ADA0 -/* 8022AD90 00227CD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AD94 00227CD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AD90 00227CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AD94 00227CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AD98 00227CD8 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 8022AD9C 00227CDC 48 00 00 10 */ b lbl_8022ADAC lbl_8022ADA0: -/* 8022ADA0 00227CE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022ADA4 00227CE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022ADA0 00227CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022ADA4 00227CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022ADA8 00227CE8 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_8022ADAC: /* 8022ADAC 00227CEC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -2896,15 +2896,15 @@ lbl_8022ADE8: /* 8022AE18 00227D58 48 00 01 00 */ b lbl_8022AF18 /* 8022AE1C 00227D5C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE20 00227D60 3C 80 00 01 */ lis r4, 1 -/* 8022AE24 00227D64 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AE28 00227D68 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AE24 00227D64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AE28 00227D68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AE2C 00227D6C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 8022AE30 00227D70 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE34 00227D74 38 E0 00 01 */ li r7, 1 /* 8022AE38 00227D78 48 00 DE B5 */ bl dMsgUnit_c_NS_setTag /* 8022AE3C 00227D7C 48 00 00 DC */ b lbl_8022AF18 -/* 8022AE40 00227D80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AE44 00227D84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AE40 00227D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AE44 00227D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AE48 00227D88 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8022AE4C 00227D8C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8022AE50 00227D90 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -2920,8 +2920,8 @@ lbl_8022ADE8: /* 8022AE78 00227DB8 48 00 00 A0 */ b lbl_8022AF18 /* 8022AE7C 00227DBC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE80 00227DC0 38 80 00 09 */ li r4, 9 -/* 8022AE84 00227DC4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AE88 00227DC8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AE84 00227DC4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AE88 00227DC8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AE8C 00227DCC 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AE90 00227DD0 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE94 00227DD4 38 E0 00 01 */ li r7, 1 @@ -2929,8 +2929,8 @@ lbl_8022ADE8: /* 8022AE9C 00227DDC 48 00 00 7C */ b lbl_8022AF18 /* 8022AEA0 00227DE0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEA4 00227DE4 38 80 00 0E */ li r4, 0xe -/* 8022AEA8 00227DE8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AEAC 00227DEC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AEA8 00227DE8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AEAC 00227DEC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AEB0 00227DF0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEB4 00227DF4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEB8 00227DF8 38 E0 00 01 */ li r7, 1 @@ -2939,8 +2939,8 @@ lbl_8022ADE8: /* 8022AEC4 00227E04 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEC8 00227E08 3C 80 00 01 */ lis r4, 0x00010001@ha /* 8022AECC 00227E0C 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 8022AED0 00227E10 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AED4 00227E14 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AED0 00227E10 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AED4 00227E14 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AED8 00227E18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEDC 00227E1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEE0 00227E20 38 E0 00 01 */ li r7, 1 @@ -3522,8 +3522,8 @@ lbl_8022B6B0: /* 8022B70C 0022864C 7F E3 FB 78 */ mr r3, r31 /* 8022B710 00228650 4B FF D6 19 */ bl jmessage_tReference_NS_calcDistance /* 8022B714 00228654 88 1D 00 10 */ lbz r0, 0x10(r29) -/* 8022B718 00228658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022B71C 0022865C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022B718 00228658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022B71C 0022865C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022B720 00228660 98 03 5E 7A */ stb r0, 0x5e7a(r3) /* 8022B724 00228664 88 1D 00 11 */ lbz r0, 0x11(r29) /* 8022B728 00228668 98 03 5E 7B */ stb r0, 0x5e7b(r3) @@ -3564,8 +3564,8 @@ lbl_8022B78C: /* 8022B7A0 002286E0 A0 1D 00 06 */ lhz r0, 6(r29) /* 8022B7A4 002286E4 28 00 00 00 */ cmplwi r0, 0 /* 8022B7A8 002286E8 41 82 00 24 */ beq lbl_8022B7CC -/* 8022B7AC 002286EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022B7B0 002286F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022B7AC 002286EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022B7B0 002286F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022B7B4 002286F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8022B7B8 002286F8 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8022B7BC 002286FC 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -3804,8 +3804,8 @@ lbl_8022BB10: /* 8022BB10 00228A50 38 00 00 07 */ li r0, 7 /* 8022BB14 00228A54 98 1F 12 4D */ stb r0, 0x124d(r31) lbl_8022BB18: -/* 8022BB18 00228A58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022BB1C 00228A5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022BB18 00228A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022BB1C 00228A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022BB20 00228A60 88 03 5E B4 */ lbz r0, 0x5eb4(r3) /* 8022BB24 00228A64 28 00 00 00 */ cmplwi r0, 0 /* 8022BB28 00228A68 41 82 00 0C */ beq lbl_8022BB34 @@ -3839,8 +3839,8 @@ lbl_8022BB5C: /* 8022BB8C 00228ACC 93 C1 00 18 */ stw r30, 0x18(r1) /* 8022BB90 00228AD0 7C 7E 1B 78 */ mr r30, r3 /* 8022BB94 00228AD4 83 E3 00 04 */ lwz r31, 4(r3) -/* 8022BB98 00228AD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022BB9C 00228ADC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8022BB98 00228AD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022BB9C 00228ADC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8022BBA0 00228AE0 88 04 5E B4 */ lbz r0, 0x5eb4(r4) /* 8022BBA4 00228AE4 28 00 00 00 */ cmplwi r0, 0 /* 8022BBA8 00228AE8 41 82 00 78 */ beq lbl_8022BC20 @@ -4333,8 +4333,8 @@ lbl_8022C244: /* 8022C280 002291C0 48 00 06 64 */ b lbl_8022C8E4 lbl_8022C284: /* 8022C284 002291C4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8022C288 002291C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022C28C 002291CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022C288 002291C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022C28C 002291CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022C290 002291D0 90 03 5E E8 */ stw r0, 0x5ee8(r3) /* 8022C294 002291D4 38 60 00 01 */ li r3, 1 /* 8022C298 002291D8 48 00 06 4C */ b lbl_8022C8E4 @@ -4657,8 +4657,8 @@ lbl_8022C6A8: /* 8022C734 00229674 80 1E 00 00 */ lwz r0, 0(r30) /* 8022C738 00229678 28 00 00 01 */ cmplwi r0, 1 /* 8022C73C 0022967C 40 82 00 20 */ bne lbl_8022C75C -/* 8022C740 00229680 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022C744 00229684 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022C740 00229680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022C744 00229684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022C748 00229688 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8022C74C 0022968C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8022C750 00229690 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -6357,8 +6357,8 @@ lbl_8022DEDC: /* 8022E02C 0022AF6C 48 00 0A B9 */ bl jmessage_tRenderingProcessor_NS_do_outfont /* 8022E030 0022AF70 38 60 00 01 */ li r3, 1 /* 8022E034 0022AF74 48 00 00 E0 */ b lbl_8022E114 -/* 8022E038 0022AF78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022E03C 0022AF7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022E038 0022AF78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022E03C 0022AF7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022E040 0022AF80 88 03 01 EB */ lbz r0, 0x1eb(r3) /* 8022E044 0022AF84 28 00 00 00 */ cmplwi r0, 0 /* 8022E048 0022AF88 40 82 00 18 */ bne lbl_8022E060 @@ -8503,14 +8503,14 @@ lbl_8022FED4: /* 8022FEE8 0022CE28 7C 06 00 2E */ lwzx r0, r6, r0 /* 8022FEEC 0022CE2C 7C 09 03 A6 */ mtctr r0 /* 8022FEF0 0022CE30 4E 80 04 20 */ bctr -/* 8022FEF4 0022CE34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FEF8 0022CE38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FEF4 0022CE34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FEF8 0022CE38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FEFC 0022CE3C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022FF00 0022CE40 7F E3 FB 78 */ mr r3, r31 /* 8022FF04 0022CE44 48 07 7C F5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF08 0022CE48 48 00 0A 58 */ b lbl_80230960 -/* 8022FF0C 0022CE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF10 0022CE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF0C 0022CE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF10 0022CE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF14 0022CE54 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022FF18 0022CE58 7F E3 FB 78 */ mr r3, r31 /* 8022FF1C 0022CE5C 48 07 7C DD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent @@ -8520,40 +8520,40 @@ lbl_8022FED4: /* 8022FF2C 0022CE6C 7F E3 FB 78 */ mr r3, r31 /* 8022FF30 0022CE70 48 07 7C C9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF34 0022CE74 48 00 0A 2C */ b lbl_80230960 -/* 8022FF38 0022CE78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF3C 0022CE7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF38 0022CE78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF3C 0022CE7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF40 0022CE80 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF44 0022CE84 48 00 73 89 */ bl dMsgObject_c_NS_getSmellName /* 8022FF48 0022CE88 7C 64 1B 78 */ mr r4, r3 /* 8022FF4C 0022CE8C 7F E3 FB 78 */ mr r3, r31 /* 8022FF50 0022CE90 48 07 7C A9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF54 0022CE94 48 00 0A 0C */ b lbl_80230960 -/* 8022FF58 0022CE98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF5C 0022CE9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF58 0022CE98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF5C 0022CE9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF60 0022CEA0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF64 0022CEA4 48 00 73 D1 */ bl dMsgObject_c_NS_getPortalName /* 8022FF68 0022CEA8 7C 64 1B 78 */ mr r4, r3 /* 8022FF6C 0022CEAC 7F E3 FB 78 */ mr r3, r31 /* 8022FF70 0022CEB0 48 07 7C 89 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF74 0022CEB4 48 00 09 EC */ b lbl_80230960 -/* 8022FF78 0022CEB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF7C 0022CEBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF78 0022CEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF7C 0022CEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF80 0022CEC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF84 0022CEC4 48 00 74 09 */ bl dMsgObject_c_NS_getBombName /* 8022FF88 0022CEC8 7C 64 1B 78 */ mr r4, r3 /* 8022FF8C 0022CECC 7F E3 FB 78 */ mr r3, r31 /* 8022FF90 0022CED0 48 07 7C 69 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF94 0022CED4 48 00 09 CC */ b lbl_80230960 -/* 8022FF98 0022CED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF9C 0022CEDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF98 0022CED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF9C 0022CEDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFA0 0022CEE0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FFA4 0022CEE4 48 00 74 79 */ bl dMsgObject_c_NS_getInsectName /* 8022FFA8 0022CEE8 7C 64 1B 78 */ mr r4, r3 /* 8022FFAC 0022CEEC 7F E3 FB 78 */ mr r3, r31 /* 8022FFB0 0022CEF0 48 07 7C 49 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FFB4 0022CEF4 48 00 09 AC */ b lbl_80230960 -/* 8022FFB8 0022CEF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FFBC 0022CEFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FFB8 0022CEF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FFBC 0022CEFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFC0 0022CF00 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FFC4 0022CF04 48 00 74 B5 */ bl dMsgObject_c_NS_getLetterName /* 8022FFC8 0022CF08 7C 64 1B 78 */ mr r4, r3 @@ -8564,8 +8564,8 @@ lbl_8022FED4: /* 8022FFDC 0022CF1C 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022FFE0 0022CF20 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022FFE4 0022CF24 38 84 00 04 */ addi r4, r4, 4 -/* 8022FFE8 0022CF28 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022FFEC 0022CF2C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022FFE8 0022CF28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022FFEC 0022CF2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022FFF0 0022CF30 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022FFF4 0022CF34 38 00 00 64 */ li r0, 0x64 /* 8022FFF8 0022CF38 7C A5 03 D6 */ divw r5, r5, r0 @@ -8579,8 +8579,8 @@ lbl_8022FED4: /* 80230018 0022CF58 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8023001C 0022CF5C 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 80230020 0022CF60 38 84 00 04 */ addi r4, r4, 4 -/* 80230024 0022CF64 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80230028 0022CF68 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230024 0022CF64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80230028 0022CF68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023002C 0022CF6C 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 80230030 0022CF70 38 A0 00 64 */ li r5, 0x64 /* 80230034 0022CF74 7C 06 2B D6 */ divw r0, r6, r5 @@ -8628,8 +8628,8 @@ lbl_802300A4: /* 802300D8 0022D018 2C 1E 00 04 */ cmpwi r30, 4 /* 802300DC 0022D01C 41 80 FF C8 */ blt lbl_802300A4 /* 802300E0 0022D020 48 00 08 80 */ b lbl_80230960 -/* 802300E4 0022D024 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802300E8 0022D028 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802300E4 0022D024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802300E8 0022D028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802300EC 0022D02C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802300F0 0022D030 48 00 73 E1 */ bl dMsgObject_c_NS_getSelectBombNum /* 802300F4 0022D034 7C 60 1B 78 */ mr r0, r3 @@ -8677,8 +8677,8 @@ lbl_80230190: /* 80230198 0022D0D8 40 82 00 08 */ bne lbl_802301A0 /* 8023019C 0022D0DC 38 80 00 72 */ li r4, 0x72 lbl_802301A0: -/* 802301A0 0022D0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802301A4 0022D0E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802301A0 0022D0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802301A4 0022D0E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802301A8 0022D0E8 38 63 00 F8 */ addi r3, r3, 0xf8 /* 802301AC 0022D0EC 4B E0 3F 4D */ bl getBombNum__21dSv_player_item_max_cCFUc /* 802301B0 0022D0F0 7C 60 1B 78 */ mr r0, r3 @@ -8697,8 +8697,8 @@ lbl_802301A0: /* 802301E4 0022D124 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802301E8 0022D128 4B FF F9 09 */ bl jmessage_string_tReference_NS_clearOutfontLength /* 802301EC 0022D12C 48 00 07 74 */ b lbl_80230960 -/* 802301F0 0022D130 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802301F4 0022D134 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802301F0 0022D130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802301F4 0022D134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802301F8 0022D138 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 802301FC 0022D13C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230200 0022D140 38 80 00 00 */ li r4, 0 @@ -8851,8 +8851,8 @@ lbl_8023043C: /* 8023043C 0022D37C 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80230440 0022D380 28 00 00 02 */ cmplwi r0, 2 /* 80230444 0022D384 40 82 00 28 */ bne lbl_8023046C -/* 80230448 0022D388 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023044C 0022D38C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230448 0022D388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023044C 0022D38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230450 0022D390 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 80230454 0022D394 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230458 0022D398 38 80 00 04 */ li r4, 4 @@ -8872,8 +8872,8 @@ lbl_8023046C: /* 8023048C 0022D3CC 48 00 02 5C */ b lbl_802306E8 /* 80230490 0022D3D0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230494 0022D3D4 38 80 00 00 */ li r4, 0 -/* 80230498 0022D3D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8023049C 0022D3DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230498 0022D3D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8023049C 0022D3DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802304A0 0022D3E0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304A4 0022D3E4 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304A8 0022D3E8 38 E0 00 01 */ li r7, 1 @@ -8881,8 +8881,8 @@ lbl_8023046C: /* 802304B0 0022D3F0 48 00 02 38 */ b lbl_802306E8 /* 802304B4 0022D3F4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802304B8 0022D3F8 38 80 00 01 */ li r4, 1 -/* 802304BC 0022D3FC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802304C0 0022D400 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802304BC 0022D3FC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802304C0 0022D400 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802304C4 0022D404 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304C8 0022D408 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304CC 0022D40C 38 E0 00 01 */ li r7, 1 @@ -8890,8 +8890,8 @@ lbl_8023046C: /* 802304D4 0022D414 48 00 02 14 */ b lbl_802306E8 /* 802304D8 0022D418 80 05 00 00 */ lwz r0, 0(r5) /* 802304DC 0022D41C 7C 1E 07 34 */ extsh r30, r0 -/* 802304E0 0022D420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802304E4 0022D424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802304E0 0022D420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802304E4 0022D424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802304E8 0022D428 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802304EC 0022D42C B0 03 01 76 */ sth r0, 0x176(r3) /* 802304F0 0022D430 48 00 84 39 */ bl dMsgObject_getFundRaising @@ -8922,13 +8922,13 @@ lbl_8023046C: /* 80230554 0022D494 88 05 00 00 */ lbz r0, 0(r5) /* 80230558 0022D498 28 00 00 00 */ cmplwi r0, 0 /* 8023055C 0022D49C 40 82 00 14 */ bne lbl_80230570 -/* 80230560 0022D4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230564 0022D4A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230560 0022D4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230564 0022D4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230568 0022D4A8 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 8023056C 0022D4AC 48 00 00 10 */ b lbl_8023057C lbl_80230570: -/* 80230570 0022D4B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230574 0022D4B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230570 0022D4B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230574 0022D4B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230578 0022D4B8 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_8023057C: /* 8023057C 0022D4BC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -8963,15 +8963,15 @@ lbl_802305B8: /* 802305E8 0022D528 48 00 01 00 */ b lbl_802306E8 /* 802305EC 0022D52C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802305F0 0022D530 3C 80 00 01 */ lis r4, 1 -/* 802305F4 0022D534 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802305F8 0022D538 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802305F4 0022D534 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802305F8 0022D538 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802305FC 0022D53C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80230600 0022D540 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230604 0022D544 38 E0 00 01 */ li r7, 1 /* 80230608 0022D548 48 00 86 E5 */ bl dMsgUnit_c_NS_setTag /* 8023060C 0022D54C 48 00 00 DC */ b lbl_802306E8 -/* 80230610 0022D550 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230614 0022D554 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230610 0022D550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230614 0022D554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230618 0022D558 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8023061C 0022D55C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80230620 0022D560 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -8987,8 +8987,8 @@ lbl_802305B8: /* 80230648 0022D588 48 00 00 A0 */ b lbl_802306E8 /* 8023064C 0022D58C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230650 0022D590 38 80 00 09 */ li r4, 9 -/* 80230654 0022D594 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80230658 0022D598 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230654 0022D594 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80230658 0022D598 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023065C 0022D59C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230660 0022D5A0 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230664 0022D5A4 38 E0 00 01 */ li r7, 1 @@ -8996,8 +8996,8 @@ lbl_802305B8: /* 8023066C 0022D5AC 48 00 00 7C */ b lbl_802306E8 /* 80230670 0022D5B0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230674 0022D5B4 38 80 00 0E */ li r4, 0xe -/* 80230678 0022D5B8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8023067C 0022D5BC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230678 0022D5B8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8023067C 0022D5BC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80230680 0022D5C0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230684 0022D5C4 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230688 0022D5C8 38 E0 00 01 */ li r7, 1 @@ -9006,8 +9006,8 @@ lbl_802305B8: /* 80230694 0022D5D4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230698 0022D5D8 3C 80 00 01 */ lis r4, 0x00010001@ha /* 8023069C 0022D5DC 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 802306A0 0022D5E0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802306A4 0022D5E4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802306A0 0022D5E0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802306A4 0022D5E4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802306A8 0022D5E8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802306AC 0022D5EC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802306B0 0022D5F0 38 E0 00 01 */ li r7, 1 @@ -9805,13 +9805,13 @@ lbl_80231208: /* 8023121C 0022E15C 7C 06 00 2E */ lwzx r0, r6, r0 /* 80231220 0022E160 7C 09 03 A6 */ mtctr r0 /* 80231224 0022E164 4E 80 04 20 */ bctr -/* 80231228 0022E168 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023122C 0022E16C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80231228 0022E168 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023122C 0022E16C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231230 0022E170 38 84 01 B4 */ addi r4, r4, 0x1b4 /* 80231234 0022E174 48 00 15 89 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231238 0022E178 48 00 0B 1C */ b lbl_80231D54 -/* 8023123C 0022E17C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80231240 0022E180 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023123C 0022E17C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80231240 0022E180 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231244 0022E184 38 84 01 C5 */ addi r4, r4, 0x1c5 /* 80231248 0022E188 48 00 15 75 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 8023124C 0022E18C 48 00 0B 08 */ b lbl_80231D54 @@ -9820,40 +9820,40 @@ lbl_80231208: /* 80231258 0022E198 7F E3 FB 78 */ mr r3, r31 /* 8023125C 0022E19C 48 00 15 61 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231260 0022E1A0 48 00 0A F4 */ b lbl_80231D54 -/* 80231264 0022E1A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231268 0022E1A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231264 0022E1A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231268 0022E1A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023126C 0022E1AC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231270 0022E1B0 48 00 60 5D */ bl dMsgObject_c_NS_getSmellName /* 80231274 0022E1B4 7C 64 1B 78 */ mr r4, r3 /* 80231278 0022E1B8 7F E3 FB 78 */ mr r3, r31 /* 8023127C 0022E1BC 48 00 15 41 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231280 0022E1C0 48 00 0A D4 */ b lbl_80231D54 -/* 80231284 0022E1C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231288 0022E1C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231284 0022E1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231288 0022E1C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023128C 0022E1CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231290 0022E1D0 48 00 60 A5 */ bl dMsgObject_c_NS_getPortalName /* 80231294 0022E1D4 7C 64 1B 78 */ mr r4, r3 /* 80231298 0022E1D8 7F E3 FB 78 */ mr r3, r31 /* 8023129C 0022E1DC 48 00 15 21 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312A0 0022E1E0 48 00 0A B4 */ b lbl_80231D54 -/* 802312A4 0022E1E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312A8 0022E1E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312A4 0022E1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312A8 0022E1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312AC 0022E1EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312B0 0022E1F0 48 00 60 DD */ bl dMsgObject_c_NS_getBombName /* 802312B4 0022E1F4 7C 64 1B 78 */ mr r4, r3 /* 802312B8 0022E1F8 7F E3 FB 78 */ mr r3, r31 /* 802312BC 0022E1FC 48 00 15 01 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312C0 0022E200 48 00 0A 94 */ b lbl_80231D54 -/* 802312C4 0022E204 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312C8 0022E208 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312C4 0022E204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312C8 0022E208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312CC 0022E20C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312D0 0022E210 48 00 61 4D */ bl dMsgObject_c_NS_getInsectName /* 802312D4 0022E214 7C 64 1B 78 */ mr r4, r3 /* 802312D8 0022E218 7F E3 FB 78 */ mr r3, r31 /* 802312DC 0022E21C 48 00 14 E1 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312E0 0022E220 48 00 0A 74 */ b lbl_80231D54 -/* 802312E4 0022E224 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312E8 0022E228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312E4 0022E224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312E8 0022E228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312EC 0022E22C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312F0 0022E230 48 00 61 89 */ bl dMsgObject_c_NS_getLetterName /* 802312F4 0022E234 7C 64 1B 78 */ mr r4, r3 @@ -9868,8 +9868,8 @@ lbl_80231208: /* 80231318 0022E258 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8023131C 0022E25C 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 80231320 0022E260 38 84 00 04 */ addi r4, r4, 4 -/* 80231324 0022E264 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231328 0022E268 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231324 0022E264 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231328 0022E268 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023132C 0022E26C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231330 0022E270 38 00 00 64 */ li r0, 0x64 /* 80231334 0022E274 7C A5 03 D6 */ divw r5, r5, r0 @@ -9883,8 +9883,8 @@ lbl_80231208: /* 80231354 0022E294 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 80231358 0022E298 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8023135C 0022E29C 38 84 00 04 */ addi r4, r4, 4 -/* 80231360 0022E2A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231364 0022E2A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231360 0022E2A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231364 0022E2A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231368 0022E2A8 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 8023136C 0022E2AC 38 A0 00 64 */ li r5, 0x64 /* 80231370 0022E2B0 7C 06 2B D6 */ divw r0, r6, r5 @@ -9964,8 +9964,8 @@ lbl_80231208: /* 80231498 0022E3D8 48 00 08 BC */ b lbl_80231D54 /* 8023149C 0022E3DC 38 80 00 1E */ li r4, 0x1e /* 802314A0 0022E3E0 48 00 0E 2D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont -/* 802314A4 0022E3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802314A8 0022E3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802314A4 0022E3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802314A8 0022E3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802314AC 0022E3EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802314B0 0022E3F0 A8 83 01 74 */ lha r4, 0x174(r3) /* 802314B4 0022E3F4 7F E3 FB 78 */ mr r3, r31 @@ -10013,8 +10013,8 @@ lbl_8023152C: /* 80231554 0022E494 38 80 00 1C */ li r4, 0x1c /* 80231558 0022E498 48 00 0D 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont /* 8023155C 0022E49C 48 00 07 F8 */ b lbl_80231D54 -/* 80231560 0022E4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231564 0022E4A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231560 0022E4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231564 0022E4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231568 0022E4A8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023156C 0022E4AC 48 00 5F 65 */ bl dMsgObject_c_NS_getSelectBombNum /* 80231570 0022E4B0 7C 60 1B 78 */ mr r0, r3 @@ -10052,8 +10052,8 @@ lbl_802315E4: /* 802315EC 0022E52C 40 82 00 08 */ bne lbl_802315F4 /* 802315F0 0022E530 38 80 00 72 */ li r4, 0x72 lbl_802315F4: -/* 802315F4 0022E534 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802315F8 0022E538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802315F4 0022E534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802315F8 0022E538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802315FC 0022E53C 38 63 00 F8 */ addi r3, r3, 0xf8 /* 80231600 0022E540 4B E0 2A F9 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 80231604 0022E544 7C 60 1B 78 */ mr r0, r3 @@ -10067,8 +10067,8 @@ lbl_802315F4: /* 80231624 0022E564 38 81 00 88 */ addi r4, r1, 0x88 /* 80231628 0022E568 48 00 11 95 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 8023162C 0022E56C 48 00 07 28 */ b lbl_80231D54 -/* 80231630 0022E570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231634 0022E574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231630 0022E570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231634 0022E574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231638 0022E578 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 8023163C 0022E57C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231640 0022E580 38 80 00 00 */ li r4, 0 @@ -10210,8 +10210,8 @@ lbl_80231854: /* 80231854 0022E794 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80231858 0022E798 28 00 00 02 */ cmplwi r0, 2 /* 8023185C 0022E79C 40 82 00 28 */ bne lbl_80231884 -/* 80231860 0022E7A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231864 0022E7A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231860 0022E7A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231864 0022E7A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231868 0022E7A8 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 8023186C 0022E7AC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231870 0022E7B0 38 80 00 04 */ li r4, 4 @@ -10231,8 +10231,8 @@ lbl_80231884: /* 802318A4 0022E7E4 48 00 02 5C */ b lbl_80231B00 /* 802318A8 0022E7E8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318AC 0022E7EC 38 80 00 00 */ li r4, 0 -/* 802318B0 0022E7F0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802318B4 0022E7F4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802318B0 0022E7F0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802318B4 0022E7F4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802318B8 0022E7F8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318BC 0022E7FC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318C0 0022E800 38 E0 00 01 */ li r7, 1 @@ -10240,8 +10240,8 @@ lbl_80231884: /* 802318C8 0022E808 48 00 02 38 */ b lbl_80231B00 /* 802318CC 0022E80C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318D0 0022E810 38 80 00 01 */ li r4, 1 -/* 802318D4 0022E814 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802318D8 0022E818 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802318D4 0022E814 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802318D8 0022E818 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802318DC 0022E81C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318E0 0022E820 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318E4 0022E824 38 E0 00 01 */ li r7, 1 @@ -10249,8 +10249,8 @@ lbl_80231884: /* 802318EC 0022E82C 48 00 02 14 */ b lbl_80231B00 /* 802318F0 0022E830 80 05 00 00 */ lwz r0, 0(r5) /* 802318F4 0022E834 7C 1E 07 34 */ extsh r30, r0 -/* 802318F8 0022E838 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802318FC 0022E83C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802318F8 0022E838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802318FC 0022E83C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231900 0022E840 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231904 0022E844 B0 03 01 76 */ sth r0, 0x176(r3) /* 80231908 0022E848 48 00 70 21 */ bl dMsgObject_getFundRaising @@ -10281,13 +10281,13 @@ lbl_80231884: /* 8023196C 0022E8AC 88 05 00 00 */ lbz r0, 0(r5) /* 80231970 0022E8B0 28 00 00 00 */ cmplwi r0, 0 /* 80231974 0022E8B4 40 82 00 14 */ bne lbl_80231988 -/* 80231978 0022E8B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023197C 0022E8BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231978 0022E8B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023197C 0022E8BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231980 0022E8C0 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 80231984 0022E8C4 48 00 00 10 */ b lbl_80231994 lbl_80231988: -/* 80231988 0022E8C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023198C 0022E8CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231988 0022E8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023198C 0022E8CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231990 0022E8D0 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_80231994: /* 80231994 0022E8D4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -10322,15 +10322,15 @@ lbl_802319D0: /* 80231A00 0022E940 48 00 01 00 */ b lbl_80231B00 /* 80231A04 0022E944 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A08 0022E948 3C 80 00 01 */ lis r4, 1 -/* 80231A0C 0022E94C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A10 0022E950 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A0C 0022E94C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A10 0022E950 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A14 0022E954 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80231A18 0022E958 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A1C 0022E95C 38 E0 00 01 */ li r7, 1 /* 80231A20 0022E960 48 00 72 CD */ bl dMsgUnit_c_NS_setTag /* 80231A24 0022E964 48 00 00 DC */ b lbl_80231B00 -/* 80231A28 0022E968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231A2C 0022E96C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231A28 0022E968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231A2C 0022E96C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231A30 0022E970 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80231A34 0022E974 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80231A38 0022E978 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -10346,8 +10346,8 @@ lbl_802319D0: /* 80231A60 0022E9A0 48 00 00 A0 */ b lbl_80231B00 /* 80231A64 0022E9A4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A68 0022E9A8 38 80 00 09 */ li r4, 9 -/* 80231A6C 0022E9AC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A70 0022E9B0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A6C 0022E9AC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A70 0022E9B0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A74 0022E9B4 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A78 0022E9B8 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A7C 0022E9BC 38 E0 00 01 */ li r7, 1 @@ -10355,8 +10355,8 @@ lbl_802319D0: /* 80231A84 0022E9C4 48 00 00 7C */ b lbl_80231B00 /* 80231A88 0022E9C8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A8C 0022E9CC 38 80 00 0E */ li r4, 0xe -/* 80231A90 0022E9D0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A94 0022E9D4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A90 0022E9D0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A94 0022E9D4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A98 0022E9D8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A9C 0022E9DC 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AA0 0022E9E0 38 E0 00 01 */ li r7, 1 @@ -10365,8 +10365,8 @@ lbl_802319D0: /* 80231AAC 0022E9EC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231AB0 0022E9F0 3C 80 00 01 */ lis r4, 0x00010001@ha /* 80231AB4 0022E9F4 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 80231AB8 0022E9F8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231ABC 0022E9FC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231AB8 0022E9F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231ABC 0022E9FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231AC0 0022EA00 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231AC4 0022EA04 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AC8 0022EA08 38 E0 00 01 */ li r7, 1 @@ -10508,8 +10508,8 @@ lbl_80231C24: /* 80231CD8 0022EC18 38 80 00 44 */ li r4, 0x44 /* 80231CDC 0022EC1C 48 00 05 F1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont /* 80231CE0 0022EC20 48 00 00 74 */ b lbl_80231D54 -/* 80231CE4 0022EC24 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80231CE8 0022EC28 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80231CE4 0022EC24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80231CE8 0022EC28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231CEC 0022EC2C 88 04 01 EB */ lbz r0, 0x1eb(r4) /* 80231CF0 0022EC30 28 00 00 00 */ cmplwi r0, 0 /* 80231CF4 0022EC34 40 82 00 10 */ bne lbl_80231D04 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 5e62cfd235..5868010643 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -68,8 +68,8 @@ dMsgFlow_c_NS_init: /* 80249FD4 00246F14 28 1E 00 00 */ cmplwi r30, 0 /* 80249FD8 00246F18 40 82 00 38 */ bne lbl_8024A010 /* 80249FDC 00246F1C 38 00 00 00 */ li r0, 0 -/* 80249FE0 00246F20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80249FE4 00246F24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249FE0 00246F20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80249FE4 00246F24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249FE8 00246F28 90 03 5E F0 */ stw r0, 0x5ef0(r3) /* 80249FEC 00246F2C 90 03 5E F4 */ stw r0, 0x5ef4(r3) /* 80249FF0 00246F30 90 03 5E F8 */ stw r0, 0x5ef8(r3) @@ -972,8 +972,8 @@ lbl_8024AC20: /* 8024AC34 00247B74 98 1E 00 25 */ stb r0, 0x25(r30) /* 8024AC38 00247B78 48 00 01 00 */ b lbl_8024AD38 lbl_8024AC3C: -/* 8024AC3C 00247B7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AC40 00247B80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024AC3C 00247B7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AC40 00247B80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024AC44 00247B84 80 63 5E EC */ lwz r3, 0x5eec(r3) /* 8024AC48 00247B88 80 1E 00 34 */ lwz r0, 0x34(r30) /* 8024AC4C 00247B8C 7C 03 00 00 */ cmpw r3, r0 @@ -1001,8 +1001,8 @@ lbl_8024AC58: /* 8024ACA0 00247BE0 88 1E 00 41 */ lbz r0, 0x41(r30) /* 8024ACA4 00247BE4 28 00 00 00 */ cmplwi r0, 0 /* 8024ACA8 00247BE8 41 82 00 14 */ beq lbl_8024ACBC -/* 8024ACAC 00247BEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024ACB0 00247BF0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024ACAC 00247BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024ACB0 00247BF0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024ACB4 00247BF4 88 64 5E 7A */ lbz r3, 0x5e7a(r4) /* 8024ACB8 00247BF8 8B E4 5E 7B */ lbz r31, 0x5e7b(r4) lbl_8024ACBC: @@ -1161,8 +1161,8 @@ lbl_8024AED8: /* 8024AEE0 00247E20 48 00 02 51 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024AEE4 00247E24 2C 03 00 00 */ cmpwi r3, 0 /* 8024AEE8 00247E28 40 82 00 60 */ bne lbl_8024AF48 -/* 8024AEEC 00247E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AEF0 00247E30 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8024AEEC 00247E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AEF0 00247E30 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8024AEF4 00247E34 80 65 5D B4 */ lwz r3, 0x5db4(r5) /* 8024AEF8 00247E38 A0 03 31 20 */ lhz r0, 0x3120(r3) /* 8024AEFC 00247E3C 28 00 FF FF */ cmplwi r0, 0xffff @@ -1204,8 +1204,8 @@ lbl_8024AF48: /* 8024AF80 00247EC0 88 1E 00 48 */ lbz r0, 0x48(r30) /* 8024AF84 00247EC4 28 00 00 00 */ cmplwi r0, 0 /* 8024AF88 00247EC8 40 82 00 54 */ bne lbl_8024AFDC -/* 8024AF8C 00247ECC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AF90 00247ED0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024AF8C 00247ECC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AF90 00247ED0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024AF94 00247ED4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8024AF98 00247ED8 4B FE C1 65 */ bl dMsgObject_c_NS_isMidonaMessage /* 8024AF9C 00247EDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1339,8 +1339,8 @@ dMsgFlow_c_NS_getParam_X2_: /* 8024B138 00248078 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B13C 0024807C 7C 08 02 A6 */ mflr r0 /* 8024B140 00248080 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B144 00248084 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B148 00248088 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B144 00248084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B148 00248088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B14C 0024808C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024B150 00248090 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B154 00248094 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e @@ -1358,8 +1358,8 @@ dMsgFlow_c_NS_getParam_X2_: /* 8024B184 002480C4 7C 08 02 A6 */ mflr r0 /* 8024B188 002480C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024B18C 002480CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024B190 002480D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B194 002480D4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8024B190 002480D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B194 002480D4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8024B198 002480D8 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 8024B19C 002480DC 80 03 05 74 */ lwz r0, 0x574(r3) /* 8024B1A0 002480E0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -1416,11 +1416,11 @@ lbl_8024B1F4: /* 8024B25C 0024819C A0 04 00 04 */ lhz r0, 4(r4) /* 8024B260 002481A0 28 00 00 00 */ cmplwi r0, 0 /* 8024B264 002481A4 40 82 00 30 */ bne lbl_8024B294 -/* 8024B268 002481A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B26C 002481AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B268 002481A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B26C 002481AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B270 002481B0 4B DE 78 39 */ bl getRupeeMax__21dSv_player_status_a_cCFv -/* 8024B274 002481B4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024B278 002481B8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024B274 002481B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024B278 002481B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024B27C 002481BC A0 84 00 04 */ lhz r4, 4(r4) /* 8024B280 002481C0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8024B284 002481C4 7C 00 20 50 */ subf r0, r0, r4 @@ -1428,8 +1428,8 @@ lbl_8024B1F4: /* 8024B28C 002481CC 7C 03 03 78 */ mr r3, r0 /* 8024B290 002481D0 48 00 00 20 */ b lbl_8024B2B0 lbl_8024B294: -/* 8024B294 002481D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B298 002481D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B294 002481D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B298 002481D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B29C 002481DC A0 63 00 04 */ lhz r3, 4(r3) /* 8024B2A0 002481E0 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 8024B2A4 002481E4 7C 00 18 50 */ subf r0, r0, r3 @@ -1479,8 +1479,8 @@ dMsgFlow_c_NS_query005: /* 8024B344 00248284 48 11 6E 91 */ bl _savegpr_27 /* 8024B348 00248288 7C BF 2B 78 */ mr r31, r5 /* 8024B34C 0024828C A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024B350 00248290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B354 00248294 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8024B350 00248290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B354 00248294 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8024B358 00248298 80 7D 5D AC */ lwz r3, 0x5dac(r29) /* 8024B35C 0024829C C0 03 05 50 */ lfs f0, 0x550(r3) /* 8024B360 002482A0 D0 01 00 20 */ stfs f0, 0x20(r1) @@ -1527,8 +1527,8 @@ lbl_8024B3E8: /* 8024B400 00248340 7F 63 DB 78 */ mr r3, r27 /* 8024B404 00248344 4B EF FC 0D */ bl dAttention_c_NS_getDistTable /* 8024B408 00248348 7C 67 1B 78 */ mr r7, r3 -/* 8024B40C 0024834C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B410 00248350 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B40C 0024834C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B410 00248350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B414 00248354 38 63 56 B8 */ addi r3, r3, 0x56b8 /* 8024B418 00248358 38 81 00 20 */ addi r4, r1, 0x20 /* 8024B41C 0024835C 7F 85 E3 78 */ mr r5, r28 @@ -1592,8 +1592,8 @@ lbl_8024B3E8: /* 8024B504 00248444 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B508 00248448 7C 08 02 A6 */ mflr r0 /* 8024B50C 0024844C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B510 00248450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B514 00248454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B510 00248450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B514 00248454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B518 00248458 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024B51C 0024845C A0 04 00 04 */ lhz r0, 4(r4) /* 8024B520 00248460 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e @@ -1610,8 +1610,8 @@ lbl_8024B3E8: /* 8024B54C 0024848C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B550 00248490 7C 08 02 A6 */ mflr r0 /* 8024B554 00248494 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B558 00248498 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B55C 0024849C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B558 00248498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B55C 0024849C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B560 002484A0 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B564 002484A4 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B568 002484A8 4B DE 92 81 */ bl isTbox__12dSv_memBit_cCFi @@ -1624,8 +1624,8 @@ lbl_8024B3E8: /* 8024B584 002484C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B588 002484C8 7C 08 02 A6 */ mflr r0 /* 8024B58C 002484CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B590 002484D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B594 002484D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B590 002484D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B594 002484D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B598 002484D8 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B59C 002484DC A0 84 00 04 */ lhz r4, 4(r4) /* 8024B5A0 002484E0 4B DE 92 C1 */ bl isSwitch__12dSv_memBit_cCFi @@ -1638,8 +1638,8 @@ lbl_8024B3E8: /* 8024B5BC 002484FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B5C0 00248500 7C 08 02 A6 */ mflr r0 /* 8024B5C4 00248504 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B5C8 00248508 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B5CC 0024850C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B5C8 00248508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B5CC 0024850C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B5D0 00248510 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B5D4 00248514 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B5D8 00248518 4B DE 93 15 */ bl isItem__12dSv_memBit_cCFi @@ -1652,8 +1652,8 @@ lbl_8024B3E8: /* 8024B5F4 00248534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B5F8 00248538 7C 08 02 A6 */ mflr r0 /* 8024B5FC 0024853C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B600 00248540 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B604 00248544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B600 00248540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B604 00248544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B608 00248548 38 63 09 78 */ addi r3, r3, 0x978 /* 8024B60C 0024854C A0 84 00 04 */ lhz r4, 4(r4) /* 8024B610 00248550 4B DE 95 D9 */ bl isSwitch__12dSv_danBit_cCFi @@ -1666,8 +1666,8 @@ lbl_8024B3E8: /* 8024B62C 0024856C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B630 00248570 7C 08 02 A6 */ mflr r0 /* 8024B634 00248574 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B638 00248578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B63C 0024857C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B638 00248578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B63C 0024857C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B640 00248580 38 63 09 78 */ addi r3, r3, 0x978 /* 8024B644 00248584 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B648 00248588 4B DE 96 2D */ bl isItem__12dSv_danBit_cCFi @@ -1776,37 +1776,37 @@ lbl_8024B7BC: /* 8024B7CC 0024870C 40 80 00 5C */ bge lbl_8024B828 /* 8024B7D0 00248710 48 00 00 3C */ b lbl_8024B80C lbl_8024B7D4: -/* 8024B7D4 00248714 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B7D8 00248718 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B7D4 00248714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B7D8 00248718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B7DC 0024871C 88 03 00 14 */ lbz r0, 0x14(r3) /* 8024B7E0 00248720 7C 1F 00 40 */ cmplw r31, r0 /* 8024B7E4 00248724 40 82 00 E4 */ bne lbl_8024B8C8 /* 8024B7E8 00248728 3B C0 00 01 */ li r30, 1 /* 8024B7EC 0024872C 48 00 00 DC */ b lbl_8024B8C8 lbl_8024B7F0: -/* 8024B7F0 00248730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B7F4 00248734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B7F0 00248730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B7F4 00248734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B7F8 00248738 88 03 00 15 */ lbz r0, 0x15(r3) /* 8024B7FC 0024873C 7C 1F 00 40 */ cmplw r31, r0 /* 8024B800 00248740 40 82 00 C8 */ bne lbl_8024B8C8 /* 8024B804 00248744 3B C0 00 01 */ li r30, 1 /* 8024B808 00248748 48 00 00 C0 */ b lbl_8024B8C8 lbl_8024B80C: -/* 8024B80C 0024874C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B810 00248750 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B80C 0024874C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B810 00248750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B814 00248754 88 03 00 13 */ lbz r0, 0x13(r3) /* 8024B818 00248758 7C 1F 00 40 */ cmplw r31, r0 /* 8024B81C 0024875C 40 82 00 AC */ bne lbl_8024B8C8 /* 8024B820 00248760 3B C0 00 01 */ li r30, 1 /* 8024B824 00248764 48 00 00 A4 */ b lbl_8024B8C8 lbl_8024B828: -/* 8024B828 00248768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B82C 0024876C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B828 00248768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B82C 0024876C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B830 00248770 38 80 00 00 */ li r4, 0 /* 8024B834 00248774 4B DE 72 29 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B838 00248778 7C 60 1B 78 */ mr r0, r3 -/* 8024B83C 0024877C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B840 00248780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B83C 0024877C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B840 00248780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B844 00248784 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024B848 00248788 7F A3 EB 78 */ mr r3, r29 /* 8024B84C 0024878C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -1815,8 +1815,8 @@ lbl_8024B828: /* 8024B858 00248798 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B85C 0024879C 7C 1F 00 40 */ cmplw r31, r0 /* 8024B860 002487A0 41 82 00 64 */ beq lbl_8024B8C4 -/* 8024B864 002487A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B868 002487A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B864 002487A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B868 002487A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B86C 002487AC 38 80 00 01 */ li r4, 1 /* 8024B870 002487B0 4B DE 71 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B874 002487B4 7C 60 1B 78 */ mr r0, r3 @@ -1827,8 +1827,8 @@ lbl_8024B828: /* 8024B888 002487C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B88C 002487CC 7C 1F 00 40 */ cmplw r31, r0 /* 8024B890 002487D0 41 82 00 34 */ beq lbl_8024B8C4 -/* 8024B894 002487D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B898 002487D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B894 002487D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B898 002487D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B89C 002487DC 38 80 00 02 */ li r4, 2 /* 8024B8A0 002487E0 4B DE 71 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B8A4 002487E4 7C 60 1B 78 */ mr r0, r3 @@ -1855,7 +1855,7 @@ lbl_8024B8C8: /* 8024B8F0 00248830 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B8F4 00248834 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8024B8F8 00248838 38 80 00 01 */ li r4, 1 -/* 8024B8FC 0024883C 4B E4 C5 E5 */ bl checkItemGet +/* 8024B8FC 0024883C 4B E4 C5 E5 */ bl checkItemGet__FUci /* 8024B900 00248840 7C 60 00 34 */ cntlzw r0, r3 /* 8024B904 00248844 54 03 DC 3E */ rlwinm r3, r0, 0x1b, 0x10, 0x1f /* 8024B908 00248848 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1865,8 +1865,8 @@ lbl_8024B8C8: /* 8024B918 00248858 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B91C 0024885C 7C 08 02 A6 */ mflr r0 /* 8024B920 00248860 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B924 00248864 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B928 00248868 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B924 00248864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B928 00248868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B92C 0024886C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024B930 00248870 38 80 00 FF */ li r4, 0xff /* 8024B934 00248874 4B DE 82 B9 */ bl checkBombBag__17dSv_player_item_cFUc @@ -1877,8 +1877,8 @@ lbl_8024B8C8: /* 8024B948 00248888 7C 08 03 A6 */ mtlr r0 /* 8024B94C 0024888C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024B950 00248890 4E 80 00 20 */ blr -/* 8024B954 00248894 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B958 00248898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B954 00248894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B958 00248898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B95C 0024889C 88 63 00 EC */ lbz r3, 0xec(r3) /* 8024B960 002488A0 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B964 002488A4 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -1891,8 +1891,8 @@ lbl_8024B8C8: /* 8024B980 002488C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024B984 002488C4 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B988 002488C8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8024B98C 002488CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B990 002488D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B98C 002488CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B990 002488D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B994 002488D4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024B998 002488D8 4B DE 7E 55 */ bl checkEmptyBottle__17dSv_player_item_cFv /* 8024B99C 002488DC 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -1922,12 +1922,12 @@ lbl_8024B8C8: /* 8024B9FC 0024893C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8024BA00 00248940 7C 1F 03 78 */ mr r31, r0 /* 8024BA04 00248944 40 82 00 10 */ bne lbl_8024BA14 -/* 8024BA08 00248948 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BA0C 0024894C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BA08 00248948 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BA0C 0024894C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BA10 00248950 8B E3 5E A1 */ lbz r31, 0x5ea1(r3) lbl_8024BA14: -/* 8024BA14 00248954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BA18 00248958 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024BA14 00248954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BA18 00248958 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024BA1C 0024895C 38 64 01 14 */ addi r3, r4, 0x114 /* 8024BA20 00248960 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 8024BA24 00248964 4B DE 89 1D */ bl getLightDropNum__16dSv_light_drop_cCFUc @@ -1963,8 +1963,8 @@ lbl_8024BA90: /* 8024BA98 002489D8 90 04 00 88 */ stw r0, 0x88(r4) /* 8024BA9C 002489DC 4E 80 00 20 */ blr /* 8024BAA0 002489E0 38 A0 00 01 */ li r5, 1 -/* 8024BAA4 002489E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BAA8 002489E8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024BAA4 002489E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BAA8 002489E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024BAAC 002489EC A0 04 00 08 */ lhz r0, 8(r4) /* 8024BAB0 002489F0 54 03 04 3F */ clrlwi. r3, r0, 0x10 /* 8024BAB4 002489F4 41 82 00 10 */ beq lbl_8024BAC4 @@ -1984,8 +1984,8 @@ lbl_8024BAD8: /* 8024BAE0 00248A20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024BAE4 00248A24 7C 08 02 A6 */ mflr r0 /* 8024BAE8 00248A28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BAEC 00248A2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BAF0 00248A30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BAEC 00248A2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BAF0 00248A30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BAF4 00248A34 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BAF8 00248A38 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BAFC 00248A3C 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2000,8 +2000,8 @@ lbl_8024BAD8: /* 8024BB20 00248A60 90 01 00 14 */ stw r0, 0x14(r1) /* 8024BB24 00248A64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BB28 00248A68 A3 E4 00 04 */ lhz r31, 4(r4) -/* 8024BB2C 00248A6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BB30 00248A70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BB2C 00248A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BB30 00248A70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BB34 00248A74 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024BB38 00248A78 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8024BB3C 00248A7C 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -2019,8 +2019,8 @@ lbl_8024BAD8: /* 8024BB6C 00248AAC 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BB70 00248AB0 4E 80 00 20 */ blr /* 8024BB74 00248AB4 38 A0 00 01 */ li r5, 1 -/* 8024BB78 00248AB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BB7C 00248ABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BB78 00248AB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BB7C 00248ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BB80 00248AC0 A0 63 00 02 */ lhz r3, 2(r3) /* 8024BB84 00248AC4 A0 04 00 04 */ lhz r0, 4(r4) /* 8024BB88 00248AC8 7C 03 00 00 */ cmpw r3, r0 @@ -2032,8 +2032,8 @@ lbl_8024BB94: /* 8024BB9C 00248ADC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024BBA0 00248AE0 7C 08 02 A6 */ mflr r0 /* 8024BBA4 00248AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BBA8 00248AE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BBAC 00248AEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BBA8 00248AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BBAC 00248AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BBB0 00248AF0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8024BBB4 00248AF4 38 80 00 01 */ li r4, 1 /* 8024BBB8 00248AF8 81 83 06 28 */ lwz r12, 0x628(r3) @@ -2048,8 +2048,8 @@ lbl_8024BB94: /* 8024BBDC 00248B1C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BBE0 00248B20 4E 80 00 20 */ blr /* 8024BBE4 00248B24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BBE8 00248B28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BBEC 00248B2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BBE8 00248B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BBEC 00248B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BBF0 00248B30 C0 23 00 34 */ lfs f1, 0x34(r3) /* 8024BBF4 00248B34 C0 02 B3 98 */ lfs f0, lbl_80454D98-_SDA2_BASE_(r2) /* 8024BBF8 00248B38 EC 00 00 72 */ fmuls f0, f0, f1 @@ -2060,8 +2060,8 @@ lbl_8024BB94: /* 8024BC0C 00248B4C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BC10 00248B50 4E 80 00 20 */ blr /* 8024BC14 00248B54 38 A0 00 00 */ li r5, 0 -/* 8024BC18 00248B58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BC1C 00248B5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BC18 00248B58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BC1C 00248B5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BC20 00248B60 88 63 00 1B */ lbz r3, 0x1b(r3) /* 8024BC24 00248B64 A0 04 00 04 */ lhz r0, 4(r4) /* 8024BC28 00248B68 7C 03 00 00 */ cmpw r3, r0 @@ -2076,8 +2076,8 @@ lbl_8024BC34: /* 8024BC48 00248B88 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024BC4C 00248B8C 4B DD 3D D9 */ bl fopMsgM_SearchByID /* 8024BC50 00248B90 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC54 00248B94 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024BC58 00248B98 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024BC54 00248B94 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024BC58 00248B98 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024BC5C 00248B9C 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 8024BC60 00248BA0 88 04 01 A2 */ lbz r0, 0x1a2(r4) /* 8024BC64 00248BA4 28 00 00 02 */ cmplwi r0, 2 @@ -2094,8 +2094,8 @@ lbl_8024BC70: /* 8024BC8C 00248BCC 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024BC90 00248BD0 4B DD 3D 95 */ bl fopMsgM_SearchByID /* 8024BC94 00248BD4 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC98 00248BD8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024BC9C 00248BDC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024BC98 00248BD8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024BC9C 00248BDC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024BCA0 00248BE0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 8024BCA4 00248BE4 88 04 01 A2 */ lbz r0, 0x1a2(r4) /* 8024BCA8 00248BE8 28 00 00 02 */ cmplwi r0, 2 @@ -2129,8 +2129,8 @@ lbl_8024BCF4: /* 8024BD10 00248C50 7C 04 03 78 */ mr r4, r0 /* 8024BD14 00248C54 48 00 00 24 */ b lbl_8024BD38 lbl_8024BD18: -/* 8024BD18 00248C58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BD1C 00248C5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BD18 00248C58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BD1C 00248C5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BD20 00248C60 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BD24 00248C64 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BD28 00248C68 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2139,8 +2139,8 @@ lbl_8024BD18: /* 8024BD34 00248C74 54 04 06 3E */ clrlwi r4, r0, 0x18 lbl_8024BD38: /* 8024BD38 00248C78 3B E0 00 00 */ li r31, 0 -/* 8024BD3C 00248C7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BD40 00248C80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BD3C 00248C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BD40 00248C80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BD44 00248C84 38 63 00 9C */ addi r3, r3, 0x9c /* 8024BD48 00248C88 38 04 00 0F */ addi r0, r4, 0xf /* 8024BD4C 00248C8C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -2179,22 +2179,22 @@ lbl_8024BD94: /* 8024BDBC 00248CFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BDC0 00248D00 93 C1 00 08 */ stw r30, 8(r1) /* 8024BDC4 00248D04 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BDC8 00248D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BDCC 00248D0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BDC8 00248D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BDCC 00248D0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BDD0 00248D10 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BDD4 00248D14 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BDD8 00248D18 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024BDDC 00248D1C 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs /* 8024BDE0 00248D20 7C 64 1B 78 */ mr r4, r3 -/* 8024BDE4 00248D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BDE8 00248D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BDE4 00248D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BDE8 00248D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BDEC 00248D2C 38 63 00 EC */ addi r3, r3, 0xec /* 8024BDF0 00248D30 38 04 FF FF */ addi r0, r4, -1 /* 8024BDF4 00248D34 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BDF8 00248D38 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BDFC 00248D3C 7C 7F 1B 78 */ mr r31, r3 -/* 8024BE00 00248D40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BE04 00248D44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BE00 00248D40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BE04 00248D44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BE08 00248D48 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BE0C 00248D4C 38 80 00 70 */ li r4, 0x70 /* 8024BE10 00248D50 4B DE 82 E9 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2236,8 +2236,8 @@ lbl_8024BE80: /* 8024BE9C 00248DDC 7C 1E 03 78 */ mr r30, r0 /* 8024BEA0 00248DE0 48 00 00 24 */ b lbl_8024BEC4 lbl_8024BEA4: -/* 8024BEA4 00248DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEA8 00248DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEA4 00248DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEA8 00248DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BEAC 00248DEC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BEB0 00248DF0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BEB4 00248DF4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2245,22 +2245,22 @@ lbl_8024BEA4: /* 8024BEBC 00248DFC 38 03 FF FF */ addi r0, r3, -1 /* 8024BEC0 00248E00 54 1E 06 3E */ clrlwi r30, r0, 0x18 lbl_8024BEC4: -/* 8024BEC4 00248E04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEC8 00248E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEC4 00248E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEC8 00248E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BECC 00248E0C 38 63 00 EC */ addi r3, r3, 0xec /* 8024BED0 00248E10 7F C4 F3 78 */ mr r4, r30 /* 8024BED4 00248E14 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BED8 00248E18 7C 7F 1B 78 */ mr r31, r3 -/* 8024BEDC 00248E1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEE0 00248E20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEDC 00248E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEE0 00248E20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BEE4 00248E24 38 63 00 9C */ addi r3, r3, 0x9c /* 8024BEE8 00248E28 38 1E 00 0F */ addi r0, r30, 0xf /* 8024BEEC 00248E2C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BEF0 00248E30 38 A0 00 00 */ li r5, 0 /* 8024BEF4 00248E34 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib /* 8024BEF8 00248E38 7C 64 1B 78 */ mr r4, r3 -/* 8024BEFC 00248E3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF00 00248E40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEFC 00248E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF00 00248E40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF04 00248E44 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BF08 00248E48 4B DE 81 F1 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024BF0C 00248E4C 57 E4 06 3F */ clrlwi. r4, r31, 0x18 @@ -2289,22 +2289,22 @@ lbl_8024BF34: /* 8024BF5C 00248E9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BF60 00248EA0 93 C1 00 08 */ stw r30, 8(r1) /* 8024BF64 00248EA4 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BF68 00248EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF6C 00248EAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BF68 00248EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF6C 00248EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF70 00248EB0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BF74 00248EB4 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BF78 00248EB8 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024BF7C 00248EBC 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs /* 8024BF80 00248EC0 7C 64 1B 78 */ mr r4, r3 -/* 8024BF84 00248EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF88 00248EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BF84 00248EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF88 00248EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF8C 00248ECC 38 63 00 EC */ addi r3, r3, 0xec /* 8024BF90 00248ED0 38 04 FF FF */ addi r0, r4, -1 /* 8024BF94 00248ED4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BF98 00248ED8 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BF9C 00248EDC 7C 7F 1B 78 */ mr r31, r3 -/* 8024BFA0 00248EE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BFA4 00248EE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BFA0 00248EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BFA4 00248EE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BFA8 00248EE8 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BFAC 00248EEC 38 80 00 71 */ li r4, 0x71 /* 8024BFB0 00248EF0 4B DE 81 49 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2332,14 +2332,14 @@ lbl_8024BF34: /* 8024C008 00248F48 3C 60 80 3A */ lis r3, lbl_80399CB0@ha /* 8024C00C 00248F4C 38 63 9C B0 */ addi r3, r3, lbl_80399CB0@l /* 8024C010 00248F50 38 63 00 10 */ addi r3, r3, 0x10 -/* 8024C014 00248F54 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C018 00248F58 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024C014 00248F54 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C018 00248F58 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024C01C 00248F5C 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 8024C020 00248F60 48 11 C9 75 */ bl strcmp /* 8024C024 00248F64 2C 03 00 00 */ cmpwi r3, 0 /* 8024C028 00248F68 40 82 00 28 */ bne lbl_8024C050 -/* 8024C02C 00248F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C030 00248F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C02C 00248F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C030 00248F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C034 00248F74 38 63 09 78 */ addi r3, r3, 0x978 /* 8024C038 00248F78 38 80 00 3C */ li r4, 0x3c /* 8024C03C 00248F7C 4B DE 8B AD */ bl isSwitch__12dSv_danBit_cCFi @@ -2379,22 +2379,22 @@ lbl_8024C08C: /* 8024C0B4 00248FF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024C0B8 00248FF8 93 C1 00 08 */ stw r30, 8(r1) /* 8024C0BC 00248FFC A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024C0C0 00249000 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0C4 00249004 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0C0 00249000 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0C4 00249004 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C0C8 00249008 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C0CC 0024900C 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024C0D0 00249010 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024C0D4 00249014 4B DE 89 31 */ bl getEventReg__11dSv_event_cCFUs /* 8024C0D8 00249018 7C 64 1B 78 */ mr r4, r3 -/* 8024C0DC 0024901C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0E0 00249020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0DC 0024901C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0E0 00249020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C0E4 00249024 38 63 00 EC */ addi r3, r3, 0xec /* 8024C0E8 00249028 38 04 FF FF */ addi r0, r4, -1 /* 8024C0EC 0024902C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024C0F0 00249030 4B DE 7E 8D */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024C0F4 00249034 7C 7F 1B 78 */ mr r31, r3 -/* 8024C0F8 00249038 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0FC 0024903C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0F8 00249038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0FC 0024903C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C100 00249040 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024C104 00249044 38 80 00 72 */ li r4, 0x72 /* 8024C108 00249048 4B DE 7F F1 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2415,8 +2415,8 @@ lbl_8024C08C: /* 8024C144 00249084 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024C148 00249088 7C 08 02 A6 */ mflr r0 /* 8024C14C 0024908C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C150 00249090 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C154 00249094 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C150 00249090 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C154 00249094 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C158 00249098 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8024C15C 0024909C 38 80 00 00 */ li r4, 0 /* 8024C160 002490A0 81 83 06 28 */ lwz r12, 0x628(r3) @@ -2473,8 +2473,8 @@ lbl_8024C204: /* 8024C218 00249158 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024C21C 0024915C 7C 08 02 A6 */ mflr r0 /* 8024C220 00249160 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C224 00249164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C228 00249168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C224 00249164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C228 00249168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C22C 0024916C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024C230 00249170 4B DE 75 25 */ bl checkInsectBottle__17dSv_player_item_cFv /* 8024C234 00249174 54 63 06 3E */ clrlwi r3, r3, 0x18 @@ -2506,8 +2506,8 @@ lbl_8024C288: /* 8024C294 002491D4 7C 08 03 A6 */ mtlr r0 /* 8024C298 002491D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8024C29C 002491DC 4E 80 00 20 */ blr -/* 8024C2A0 002491E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C2A4 002491E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C2A0 002491E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C2A4 002491E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C2A8 002491E8 88 03 01 0C */ lbz r0, 0x10c(r3) /* 8024C2AC 002491EC 28 00 00 00 */ cmplwi r0, 0 /* 8024C2B0 002491F0 40 82 00 0C */ bne lbl_8024C2BC @@ -2551,8 +2551,8 @@ lbl_8024C2F4: /* 8024C334 00249274 7C 08 03 A6 */ mtlr r0 /* 8024C338 00249278 38 21 00 10 */ addi r1, r1, 0x10 /* 8024C33C 0024927C 4E 80 00 20 */ blr -/* 8024C340 00249280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C344 00249284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C340 00249280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C344 00249284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C348 00249288 80 83 5E 0C */ lwz r4, 0x5e0c(r3) /* 8024C34C 0024928C 2C 04 00 00 */ cmpwi r4, 0 /* 8024C350 00249290 40 82 00 0C */ bne lbl_8024C35C @@ -2581,8 +2581,8 @@ lbl_8024C398: /* 8024C398 002492D8 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8024C39C 002492DC 4E 80 00 20 */ blr /* 8024C3A0 002492E0 38 A0 00 00 */ li r5, 0 -/* 8024C3A4 002492E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C3A8 002492E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C3A4 002492E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C3A8 002492E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C3AC 002492EC 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8024C3B0 002492F0 80 04 05 70 */ lwz r0, 0x570(r4) /* 8024C3B4 002492F4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 @@ -2596,8 +2596,8 @@ lbl_8024C3CC: /* 8024C3CC 0024930C 54 A3 06 3E */ clrlwi r3, r5, 0x18 /* 8024C3D0 00249310 4E 80 00 20 */ blr /* 8024C3D4 00249314 38 80 00 00 */ li r4, 0 -/* 8024C3D8 00249318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C3DC 0024931C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C3D8 00249318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C3DC 0024931C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C3E0 00249320 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8024C3E4 00249324 80 03 05 70 */ lwz r0, 0x570(r3) /* 8024C3E8 00249328 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -2617,8 +2617,8 @@ lbl_8024C3F4: /* 8024C41C 0024935C A0 01 00 08 */ lhz r0, 8(r1) /* 8024C420 00249360 28 00 00 00 */ cmplwi r0, 0 /* 8024C424 00249364 41 82 00 24 */ beq lbl_8024C448 -/* 8024C428 00249368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C42C 0024936C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C428 00249368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C42C 0024936C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C430 00249370 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C434 00249374 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C438 00249378 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2629,8 +2629,8 @@ lbl_8024C448: /* 8024C448 00249388 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C44C 0024938C 28 00 00 00 */ cmplwi r0, 0 /* 8024C450 00249390 41 82 00 24 */ beq lbl_8024C474 -/* 8024C454 00249394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C458 00249398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C454 00249394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C458 00249398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C45C 0024939C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C460 002493A0 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C464 002493A4 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2654,8 +2654,8 @@ lbl_8024C474: /* 8024C4A8 002493E8 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C4AC 002493EC 28 00 00 00 */ cmplwi r0, 0 /* 8024C4B0 002493F0 41 82 00 24 */ beq lbl_8024C4D4 -/* 8024C4B4 002493F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C4B8 002493F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C4B4 002493F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C4B8 002493F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C4BC 002493FC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C4C0 00249400 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C4C4 00249404 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2666,8 +2666,8 @@ lbl_8024C4D4: /* 8024C4D4 00249414 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C4D8 00249418 28 00 00 00 */ cmplwi r0, 0 /* 8024C4DC 0024941C 41 82 00 24 */ beq lbl_8024C500 -/* 8024C4E0 00249420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C4E4 00249424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C4E0 00249420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C4E4 00249424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C4E8 00249428 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C4EC 0024942C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C4F0 00249430 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2685,8 +2685,8 @@ lbl_8024C500: /* 8024C51C 0024945C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C520 00249460 38 84 00 04 */ addi r4, r4, 4 /* 8024C524 00249464 4B FF EC 0D */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C528 00249468 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C52C 0024946C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024C528 00249468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C52C 0024946C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024C530 00249470 80 04 5D C4 */ lwz r0, 0x5dc4(r4) /* 8024C534 00249474 7C 00 1A 14 */ add r0, r0, r3 /* 8024C538 00249478 90 04 5D C4 */ stw r0, 0x5dc4(r4) @@ -2700,8 +2700,8 @@ lbl_8024C500: /* 8024C558 00249498 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C55C 0024949C 38 84 00 04 */ addi r4, r4, 4 /* 8024C560 002494A0 4B FF EB D1 */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C564 002494A4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C568 002494A8 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C564 002494A4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C568 002494A8 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C56C 002494AC 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 8024C570 002494B0 7C 03 00 D0 */ neg r0, r3 /* 8024C574 002494B4 7C 04 02 14 */ add r0, r4, r0 @@ -2723,8 +2723,8 @@ lbl_8024C500: /* 8024C5B4 002494F4 90 01 00 08 */ stw r0, 8(r1) /* 8024C5B8 002494F8 C8 01 00 08 */ lfd f0, 8(r1) /* 8024C5BC 002494FC EC 20 08 28 */ fsubs f1, f0, f1 -/* 8024C5C0 00249500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C5C4 00249504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C5C0 00249500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C5C4 00249504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C5C8 00249508 C0 03 5D C0 */ lfs f0, 0x5dc0(r3) /* 8024C5CC 0024950C EC 00 08 2A */ fadds f0, f0, f1 /* 8024C5D0 00249510 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) @@ -2747,8 +2747,8 @@ lbl_8024C500: /* 8024C614 00249554 90 01 00 08 */ stw r0, 8(r1) /* 8024C618 00249558 C8 01 00 08 */ lfd f0, 8(r1) /* 8024C61C 0024955C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8024C620 00249560 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C624 00249564 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C620 00249560 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C624 00249564 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C628 00249568 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8024C62C 0024956C FC 00 00 50 */ fneg f0, f0 /* 8024C630 00249570 EC 01 00 2A */ fadds f0, f1, f0 @@ -2765,8 +2765,8 @@ lbl_8024C500: /* 8024C65C 0024959C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C660 002495A0 38 84 00 04 */ addi r4, r4, 4 /* 8024C664 002495A4 4B FF EA CD */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C668 002495A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C66C 002495AC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C668 002495A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C66C 002495AC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C670 002495B0 A8 85 5D CC */ lha r4, 0x5dcc(r5) /* 8024C674 002495B4 7C 60 07 34 */ extsh r0, r3 /* 8024C678 002495B8 7C 04 02 14 */ add r0, r4, r0 @@ -2781,8 +2781,8 @@ lbl_8024C500: /* 8024C69C 002495DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C6A0 002495E0 38 84 00 04 */ addi r4, r4, 4 /* 8024C6A4 002495E4 4B FF EA 8D */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C6A8 002495E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C6AC 002495EC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C6A8 002495E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C6AC 002495EC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C6B0 002495F0 A8 85 5D CC */ lha r4, 0x5dcc(r5) /* 8024C6B4 002495F4 7C 03 00 D0 */ neg r0, r3 /* 8024C6B8 002495F8 7C 00 07 34 */ extsh r0, r0 @@ -2843,8 +2843,8 @@ lbl_8024C730: /* 8024C78C 002496CC A0 01 00 08 */ lhz r0, 8(r1) /* 8024C790 002496D0 28 00 00 00 */ cmplwi r0, 0 /* 8024C794 002496D4 41 82 00 24 */ beq lbl_8024C7B8 -/* 8024C798 002496D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C79C 002496DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C798 002496D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C79C 002496DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C7A0 002496E0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C7A4 002496E4 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C7A8 002496E8 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2855,8 +2855,8 @@ lbl_8024C7B8: /* 8024C7B8 002496F8 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C7BC 002496FC 28 00 00 00 */ cmplwi r0, 0 /* 8024C7C0 00249700 41 82 00 24 */ beq lbl_8024C7E4 -/* 8024C7C4 00249704 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C7C8 00249708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C7C4 00249704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C7C8 00249708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C7CC 0024970C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C7D0 00249710 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C7D4 00249714 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2880,8 +2880,8 @@ lbl_8024C7E4: /* 8024C818 00249758 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C81C 0024975C 28 00 00 00 */ cmplwi r0, 0 /* 8024C820 00249760 41 82 00 24 */ beq lbl_8024C844 -/* 8024C824 00249764 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C828 00249768 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C824 00249764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C828 00249768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C82C 0024976C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C830 00249770 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C834 00249774 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2892,8 +2892,8 @@ lbl_8024C844: /* 8024C844 00249784 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C848 00249788 28 00 00 00 */ cmplwi r0, 0 /* 8024C84C 0024978C 41 82 00 24 */ beq lbl_8024C870 -/* 8024C850 00249790 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C854 00249794 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C850 00249790 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C854 00249794 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C858 00249798 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C85C 0024979C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C860 002497A0 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2954,15 +2954,15 @@ lbl_8024C92C: /* 8024C930 00249870 40 80 00 4C */ bge lbl_8024C97C /* 8024C934 00249874 48 00 00 40 */ b lbl_8024C974 lbl_8024C938: -/* 8024C938 00249878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C93C 0024987C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C938 00249878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C93C 0024987C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C940 00249880 38 63 09 58 */ addi r3, r3, 0x958 /* 8024C944 00249884 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024C948 00249888 4B DE 7E C9 */ bl onSwitch__12dSv_memBit_cFi /* 8024C94C 0024988C 48 00 00 30 */ b lbl_8024C97C lbl_8024C950: -/* 8024C950 00249890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C954 00249894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C950 00249890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C954 00249894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C958 00249898 38 63 09 78 */ addi r3, r3, 0x978 /* 8024C95C 0024989C A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024C960 002498A0 4B DE 82 39 */ bl onSwitch__12dSv_danBit_cFi @@ -3011,15 +3011,15 @@ lbl_8024C9F4: /* 8024C9F8 00249938 40 80 00 4C */ bge lbl_8024CA44 /* 8024C9FC 0024993C 48 00 00 40 */ b lbl_8024CA3C lbl_8024CA00: -/* 8024CA00 00249940 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CA04 00249944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CA00 00249940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CA04 00249944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CA08 00249948 38 63 09 58 */ addi r3, r3, 0x958 /* 8024CA0C 0024994C A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024CA10 00249950 4B DE 7E 29 */ bl offSwitch__12dSv_memBit_cFi /* 8024CA14 00249954 48 00 00 30 */ b lbl_8024CA44 lbl_8024CA18: -/* 8024CA18 00249958 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CA1C 0024995C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CA18 00249958 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CA1C 0024995C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CA20 00249960 38 63 09 78 */ addi r3, r3, 0x978 /* 8024CA24 00249964 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024CA28 00249968 4B DE 81 99 */ bl offSwitch__12dSv_danBit_cFi @@ -3080,8 +3080,8 @@ lbl_8024CAEC: /* 8024CAF0 00249A30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CAF4 00249A34 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CAF8 00249A38 98 03 00 E3 */ stb r0, 0xe3(r3) -/* 8024CAFC 00249A3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB00 00249A40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CAFC 00249A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB00 00249A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB04 00249A44 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB08 00249A48 38 80 00 00 */ li r4, 0 /* 8024CB0C 00249A4C 4B DE 78 5D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc @@ -3091,8 +3091,8 @@ lbl_8024CB14: /* 8024CB18 00249A58 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CB1C 00249A5C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CB20 00249A60 98 03 00 E4 */ stb r0, 0xe4(r3) -/* 8024CB24 00249A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB28 00249A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CB24 00249A64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB28 00249A68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB2C 00249A6C 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB30 00249A70 38 80 00 01 */ li r4, 1 /* 8024CB34 00249A74 4B DE 78 35 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc @@ -3102,15 +3102,15 @@ lbl_8024CB3C: /* 8024CB40 00249A80 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CB44 00249A84 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CB48 00249A88 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 8024CB4C 00249A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB50 00249A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CB4C 00249A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB50 00249A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB54 00249A94 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB58 00249A98 38 80 00 02 */ li r4, 2 /* 8024CB5C 00249A9C 4B DE 78 0D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc /* 8024CB60 00249AA0 48 00 00 0C */ b lbl_8024CB6C lbl_8024CB64: /* 8024CB64 00249AA4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB68 00249AA8 4B E4 B3 25 */ bl execItemGet +/* 8024CB68 00249AA8 4B E4 B3 25 */ bl execItemGet__FUc lbl_8024CB6C: /* 8024CB6C 00249AAC 38 60 00 01 */ li r3, 1 /* 8024CB70 00249AB0 48 00 00 2C */ b lbl_8024CB9C @@ -3120,7 +3120,7 @@ lbl_8024CB74: lbl_8024CB7C: /* 8024CB7C 00249ABC A0 01 00 08 */ lhz r0, 8(r1) /* 8024CB80 00249AC0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB84 00249AC4 4B E4 B3 09 */ bl execItemGet +/* 8024CB84 00249AC4 4B E4 B3 09 */ bl execItemGet__FUc /* 8024CB88 00249AC8 3B FF 00 01 */ addi r31, r31, 1 lbl_8024CB8C: /* 8024CB8C 00249ACC A0 01 00 0A */ lhz r0, 0xa(r1) @@ -3209,8 +3209,8 @@ lbl_8024CC88: /* 8024CCC4 00249C04 38 84 00 04 */ addi r4, r4, 4 /* 8024CCC8 00249C08 4B FF E4 69 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024CCCC 00249C0C 7C 7F 1B 78 */ mr r31, r3 -/* 8024CCD0 00249C10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CCD4 00249C14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CCD0 00249C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CCD4 00249C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CCD8 00249C18 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 8024CCDC 00249C1C 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8024CCE0 00249C20 88 1B 04 E2 */ lbz r0, 0x4e2(r27) @@ -3277,8 +3277,8 @@ lbl_8024CD68: /* 8024CDC4 00249D04 40 82 00 08 */ bne lbl_8024CDCC /* 8024CDC8 00249D08 38 60 00 64 */ li r3, 0x64 lbl_8024CDCC: -/* 8024CDCC 00249D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024CDD0 00249D10 38 C4 61 C0 */ addi r6, r4, lbl_804061C0@l +/* 8024CDCC 00249D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024CDD0 00249D10 38 C4 61 C0 */ addi r6, r4, g_dComIfG_gameInfo@l /* 8024CDD4 00249D14 A0 A6 00 06 */ lhz r5, 6(r6) /* 8024CDD8 00249D18 80 86 5D D4 */ lwz r4, 0x5dd4(r6) /* 8024CDDC 00249D1C C8 22 B3 A0 */ lfd f1, lbl_80454DA0-_SDA2_BASE_(r2) @@ -3319,44 +3319,44 @@ lbl_8024CDCC: /* 8024CE68 00249DA8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024CE6C 00249DAC 7C 09 03 A6 */ mtctr r0 /* 8024CE70 00249DB0 4E 80 04 20 */ bctr -/* 8024CE74 00249DB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CE78 00249DB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CE74 00249DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CE78 00249DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CE7C 00249DBC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE80 00249DC0 38 80 00 61 */ li r4, 0x61 /* 8024CE84 00249DC4 4B DE 65 CD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CE88 00249DC8 48 00 00 90 */ b lbl_8024CF18 -/* 8024CE8C 00249DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CE90 00249DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CE8C 00249DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CE90 00249DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CE94 00249DD4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE98 00249DD8 38 80 00 62 */ li r4, 0x62 /* 8024CE9C 00249DDC 4B DE 65 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEA0 00249DE0 48 00 00 78 */ b lbl_8024CF18 -/* 8024CEA4 00249DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEA8 00249DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEA4 00249DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEA8 00249DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEAC 00249DEC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEB0 00249DF0 38 80 00 63 */ li r4, 0x63 /* 8024CEB4 00249DF4 4B DE 65 9D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEB8 00249DF8 48 00 00 60 */ b lbl_8024CF18 -/* 8024CEBC 00249DFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEC0 00249E00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEBC 00249DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEC0 00249E00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEC4 00249E04 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEC8 00249E08 38 80 00 64 */ li r4, 0x64 /* 8024CECC 00249E0C 4B DE 65 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CED0 00249E10 48 00 00 48 */ b lbl_8024CF18 -/* 8024CED4 00249E14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CED8 00249E18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CED4 00249E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CED8 00249E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEDC 00249E1C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEE0 00249E20 38 80 00 65 */ li r4, 0x65 /* 8024CEE4 00249E24 4B DE 65 6D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEE8 00249E28 48 00 00 30 */ b lbl_8024CF18 -/* 8024CEEC 00249E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEF0 00249E30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEEC 00249E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEF0 00249E30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEF4 00249E34 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEF8 00249E38 38 80 00 66 */ li r4, 0x66 /* 8024CEFC 00249E3C 4B DE 65 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CF00 00249E40 48 00 00 18 */ b lbl_8024CF18 -/* 8024CF04 00249E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CF08 00249E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CF04 00249E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CF08 00249E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CF0C 00249E4C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CF10 00249E50 38 80 00 6B */ li r4, 0x6b /* 8024CF14 00249E54 4B DE 65 3D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc @@ -3382,8 +3382,8 @@ lbl_8024CF18: /* 8024CF60 00249EA0 38 84 00 04 */ addi r4, r4, 4 /* 8024CF64 00249EA4 4B FF E1 CD */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024CF68 00249EA8 7C 60 1B 78 */ mr r0, r3 -/* 8024CF6C 00249EAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CF70 00249EB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CF6C 00249EAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CF70 00249EB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CF74 00249EB4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024CF78 00249EB8 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024CF7C 00249EBC 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3457,8 +3457,8 @@ lbl_8024D060: /* 8024D07C 00249FBC 7C 1F 03 78 */ mr r31, r0 /* 8024D080 00249FC0 48 00 00 24 */ b lbl_8024D0A4 lbl_8024D084: -/* 8024D084 00249FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D088 00249FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D084 00249FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D088 00249FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D08C 00249FCC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D090 00249FD0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D094 00249FD4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3475,8 +3475,8 @@ lbl_8024D0A4: /* 8024D0BC 00249FFC 7C 03 00 2E */ lwzx r0, r3, r0 /* 8024D0C0 0024A000 7C 09 03 A6 */ mtctr r0 /* 8024D0C4 0024A004 4E 80 04 20 */ bctr -/* 8024D0C8 0024A008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D0CC 0024A00C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D0C8 0024A008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D0CC 0024A00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D0D0 0024A010 3B C3 00 9C */ addi r30, r3, 0x9c /* 8024D0D4 0024A014 7F C3 F3 78 */ mr r3, r30 /* 8024D0D8 0024A018 38 1F 00 0F */ addi r0, r31, 0xf @@ -3495,29 +3495,29 @@ lbl_8024D108: /* 8024D108 0024A048 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D10C 0024A04C 28 00 00 00 */ cmplwi r0, 0 /* 8024D110 0024A050 41 82 00 20 */ beq lbl_8024D130 -/* 8024D114 0024A054 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D118 0024A058 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D114 0024A054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D118 0024A058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D11C 0024A05C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D120 0024A060 7F E4 FB 78 */ mr r4, r31 /* 8024D124 0024A064 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D128 0024A068 4B DD E2 45 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D12C 0024A06C 48 00 02 7C */ b lbl_8024D3A8 lbl_8024D130: -/* 8024D130 0024A070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D134 0024A074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D130 0024A070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D134 0024A074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D138 0024A078 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D13C 0024A07C 38 80 00 70 */ li r4, 0x70 /* 8024D140 0024A080 4B DE 6F B9 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D144 0024A084 7C 60 1B 78 */ mr r0, r3 -/* 8024D148 0024A088 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D14C 0024A08C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D148 0024A088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D14C 0024A08C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D150 0024A090 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D154 0024A094 7F E4 FB 78 */ mr r4, r31 /* 8024D158 0024A098 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D15C 0024A09C 4B DD E2 11 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D160 0024A0A0 48 00 02 48 */ b lbl_8024D3A8 -/* 8024D164 0024A0A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D168 0024A0A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D164 0024A0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D168 0024A0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D16C 0024A0AC 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024D170 0024A0B0 7F A3 EB 78 */ mr r3, r29 /* 8024D174 0024A0B4 38 1F 00 0F */ addi r0, r31, 0xf @@ -3536,29 +3536,29 @@ lbl_8024D1A4: /* 8024D1A4 0024A0E4 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D1A8 0024A0E8 28 00 00 00 */ cmplwi r0, 0 /* 8024D1AC 0024A0EC 41 82 00 20 */ beq lbl_8024D1CC -/* 8024D1B0 0024A0F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1B4 0024A0F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1B0 0024A0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1B4 0024A0F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1B8 0024A0F8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1BC 0024A0FC 7F E4 FB 78 */ mr r4, r31 /* 8024D1C0 0024A100 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D1C4 0024A104 4B DD E1 A9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D1C8 0024A108 48 00 01 E0 */ b lbl_8024D3A8 lbl_8024D1CC: -/* 8024D1CC 0024A10C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1D0 0024A110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1CC 0024A10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1D0 0024A110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1D4 0024A114 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D1D8 0024A118 38 80 00 71 */ li r4, 0x71 /* 8024D1DC 0024A11C 4B DE 6F 1D */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D1E0 0024A120 7C 60 1B 78 */ mr r0, r3 -/* 8024D1E4 0024A124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1E8 0024A128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1E4 0024A124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1E8 0024A128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1EC 0024A12C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1F0 0024A130 7F E4 FB 78 */ mr r4, r31 /* 8024D1F4 0024A134 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D1F8 0024A138 4B DD E1 75 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D1FC 0024A13C 48 00 01 AC */ b lbl_8024D3A8 -/* 8024D200 0024A140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D204 0024A144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D200 0024A140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D204 0024A144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D208 0024A148 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024D20C 0024A14C 7F A3 EB 78 */ mr r3, r29 /* 8024D210 0024A150 38 1F 00 0F */ addi r0, r31, 0xf @@ -3577,90 +3577,90 @@ lbl_8024D240: /* 8024D240 0024A180 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D244 0024A184 28 00 00 00 */ cmplwi r0, 0 /* 8024D248 0024A188 41 82 00 20 */ beq lbl_8024D268 -/* 8024D24C 0024A18C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D250 0024A190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D24C 0024A18C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D250 0024A190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D254 0024A194 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D258 0024A198 7F E4 FB 78 */ mr r4, r31 /* 8024D25C 0024A19C 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D260 0024A1A0 4B DD E1 0D */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D264 0024A1A4 48 00 01 44 */ b lbl_8024D3A8 lbl_8024D268: -/* 8024D268 0024A1A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D26C 0024A1AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D268 0024A1A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D26C 0024A1AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D270 0024A1B0 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D274 0024A1B4 38 80 00 72 */ li r4, 0x72 /* 8024D278 0024A1B8 4B DE 6E 81 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D27C 0024A1BC 7C 60 1B 78 */ mr r0, r3 -/* 8024D280 0024A1C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D284 0024A1C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D280 0024A1C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D284 0024A1C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D288 0024A1C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D28C 0024A1CC 7F E4 FB 78 */ mr r4, r31 /* 8024D290 0024A1D0 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D294 0024A1D4 4B DD E0 D9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D298 0024A1D8 48 00 01 10 */ b lbl_8024D3A8 -/* 8024D29C 0024A1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2A0 0024A1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D29C 0024A1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2A0 0024A1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2A4 0024A1E4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D2A8 0024A1E8 7F E4 FB 78 */ mr r4, r31 /* 8024D2AC 0024A1EC A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D2B0 0024A1F0 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D2B4 0024A1F4 4B DD E0 B9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D2B8 0024A1F8 48 00 00 F0 */ b lbl_8024D3A8 -/* 8024D2BC 0024A1FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2C0 0024A200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2BC 0024A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2C0 0024A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2C4 0024A204 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D2C8 0024A208 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D2CC 0024A20C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D2D0 0024A210 38 A0 00 70 */ li r5, 0x70 /* 8024D2D4 0024A214 4B DE 5C E5 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D2D8 0024A218 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2DC 0024A21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2D8 0024A218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2DC 0024A21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2E0 0024A220 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D2E4 0024A224 38 80 00 70 */ li r4, 0x70 /* 8024D2E8 0024A228 4B DE 6E 11 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D2EC 0024A22C 7C 60 1B 78 */ mr r0, r3 -/* 8024D2F0 0024A230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2F4 0024A234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2F0 0024A230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2F4 0024A234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2F8 0024A238 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D2FC 0024A23C 7F E4 FB 78 */ mr r4, r31 /* 8024D300 0024A240 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D304 0024A244 4B DD E0 69 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D308 0024A248 48 00 00 A0 */ b lbl_8024D3A8 -/* 8024D30C 0024A24C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D310 0024A250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D30C 0024A24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D310 0024A250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D314 0024A254 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D318 0024A258 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D31C 0024A25C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D320 0024A260 38 A0 00 71 */ li r5, 0x71 /* 8024D324 0024A264 4B DE 5C 95 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D328 0024A268 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D32C 0024A26C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D328 0024A268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D32C 0024A26C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D330 0024A270 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D334 0024A274 38 80 00 71 */ li r4, 0x71 /* 8024D338 0024A278 4B DE 6D C1 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D33C 0024A27C 7C 60 1B 78 */ mr r0, r3 -/* 8024D340 0024A280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D344 0024A284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D340 0024A280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D344 0024A284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D348 0024A288 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D34C 0024A28C 7F E4 FB 78 */ mr r4, r31 /* 8024D350 0024A290 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D354 0024A294 4B DD E0 19 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D358 0024A298 48 00 00 50 */ b lbl_8024D3A8 -/* 8024D35C 0024A29C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D360 0024A2A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D35C 0024A29C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D360 0024A2A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D364 0024A2A4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D368 0024A2A8 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D36C 0024A2AC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D370 0024A2B0 38 A0 00 72 */ li r5, 0x72 /* 8024D374 0024A2B4 4B DE 5C 45 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D378 0024A2B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D37C 0024A2BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D378 0024A2B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D37C 0024A2BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D380 0024A2C0 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D384 0024A2C4 38 80 00 72 */ li r4, 0x72 /* 8024D388 0024A2C8 4B DE 6D 71 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D38C 0024A2CC 7C 60 1B 78 */ mr r0, r3 -/* 8024D390 0024A2D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D394 0024A2D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D390 0024A2D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D394 0024A2D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D398 0024A2D8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D39C 0024A2DC 7F E4 FB 78 */ mr r4, r31 /* 8024D3A0 0024A2E0 54 05 06 3E */ clrlwi r5, r0, 0x18 @@ -3678,8 +3678,8 @@ lbl_8024D3A8: /* 8024D3CC 0024A30C 90 01 00 24 */ stw r0, 0x24(r1) /* 8024D3D0 0024A310 39 61 00 20 */ addi r11, r1, 0x20 /* 8024D3D4 0024A314 48 11 4D FD */ bl _savegpr_26 -/* 8024D3D8 0024A318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D3DC 0024A31C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D3D8 0024A318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D3DC 0024A31C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D3E0 0024A320 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D3E4 0024A324 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D3E8 0024A328 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3690,8 +3690,8 @@ lbl_8024D3A8: /* 8024D3FC 0024A33C 4B FE B1 B9 */ bl dMsgObject_c_NS_getSelectBombBagID /* 8024D400 0024A340 7C 7F 1B 78 */ mr r31, r3 /* 8024D404 0024A344 4B FE B1 DD */ bl dMsgObject_c_NS_getSelectBombPrice -/* 8024D408 0024A348 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024D40C 0024A34C 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024D408 0024A348 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024D40C 0024A34C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024D410 0024A350 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 8024D414 0024A354 7C 60 07 34 */ extsh r0, r3 /* 8024D418 0024A358 7C 04 02 14 */ add r0, r4, r0 @@ -3700,8 +3700,8 @@ lbl_8024D3A8: /* 8024D424 0024A364 7F E4 FB 78 */ mr r4, r31 /* 8024D428 0024A368 38 A0 00 00 */ li r5, 0 /* 8024D42C 0024A36C 4B DE 6B 41 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8024D430 0024A370 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D434 0024A374 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D430 0024A370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D434 0024A374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D438 0024A378 3B C3 00 9C */ addi r30, r3, 0x9c /* 8024D43C 0024A37C 7F C3 F3 78 */ mr r3, r30 /* 8024D440 0024A380 57 E4 06 3E */ clrlwi r4, r31, 0x18 @@ -3720,8 +3720,8 @@ lbl_8024D3A8: /* 8024D474 0024A3B4 48 00 00 70 */ b lbl_8024D4E4 lbl_8024D478: /* 8024D478 0024A3B8 3B 60 00 00 */ li r27, 0 -/* 8024D47C 0024A3BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D480 0024A3C0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8024D47C 0024A3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D480 0024A3C0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_8024D484: /* 8024D484 0024A3C4 7F E3 FB 78 */ mr r3, r31 /* 8024D488 0024A3C8 7F 64 DB 78 */ mr r4, r27 @@ -3784,15 +3784,15 @@ lbl_8024D4E4: /* 8024D564 0024A4A4 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024D568 0024A4A8 7C 04 07 35 */ extsh. r4, r0 /* 8024D56C 0024A4AC 40 82 00 10 */ bne lbl_8024D57C -/* 8024D570 0024A4B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D574 0024A4B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D570 0024A4B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D574 0024A4B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D578 0024A4B8 88 83 00 F8 */ lbz r4, 0xf8(r3) lbl_8024D57C: /* 8024D57C 0024A4BC A0 01 00 08 */ lhz r0, 8(r1) /* 8024D580 0024A4C0 28 00 00 00 */ cmplwi r0, 0 /* 8024D584 0024A4C4 40 82 00 1C */ bne lbl_8024D5A0 -/* 8024D588 0024A4C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D58C 0024A4CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D588 0024A4C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D58C 0024A4CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D590 0024A4D0 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 8024D594 0024A4D4 7C 00 22 14 */ add r0, r0, r4 /* 8024D598 0024A4D8 B0 03 5D F4 */ sth r0, 0x5df4(r3) @@ -3933,8 +3933,8 @@ lbl_8024D768: /* 8024D794 0024A6D4 38 84 00 04 */ addi r4, r4, 4 /* 8024D798 0024A6D8 4B FF D9 99 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024D79C 0024A6DC 7C 60 1B 78 */ mr r0, r3 -/* 8024D7A0 0024A6E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D7A4 0024A6E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D7A0 0024A6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D7A4 0024A6E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D7A8 0024A6E8 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D7AC 0024A6EC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D7B0 0024A6F0 4B DE 64 7D */ bl setWarashibeItem__17dSv_player_item_cFUc @@ -3954,8 +3954,8 @@ lbl_8024D768: /* 8024D7E8 0024A728 2C 04 00 F5 */ cmpwi r4, 0xf5 /* 8024D7EC 0024A72C 40 82 00 1C */ bne lbl_8024D808 lbl_8024D7F0: -/* 8024D7F0 0024A730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D7F4 0024A734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D7F0 0024A730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D7F4 0024A734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D7F8 0024A738 38 63 00 CC */ addi r3, r3, 0xcc /* 8024D7FC 0024A73C 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8024D800 0024A740 4B DE 66 95 */ bl offFirstBit__21dSv_player_get_item_cFUc @@ -3966,8 +3966,8 @@ lbl_8024D808: /* 8024D810 0024A750 2C 04 00 91 */ cmpwi r4, 0x91 /* 8024D814 0024A754 40 82 00 20 */ bne lbl_8024D834 lbl_8024D818: -/* 8024D818 0024A758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D81C 0024A75C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D818 0024A758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D81C 0024A75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D820 0024A760 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D824 0024A764 38 80 00 13 */ li r4, 0x13 /* 8024D828 0024A768 38 A0 00 FF */ li r5, 0xff @@ -3980,8 +3980,8 @@ lbl_8024D834: /* 8024D840 0024A780 2C 04 00 83 */ cmpwi r4, 0x83 /* 8024D844 0024A784 40 82 00 18 */ bne lbl_8024D85C lbl_8024D848: -/* 8024D848 0024A788 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D84C 0024A78C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D848 0024A788 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D84C 0024A78C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D850 0024A790 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D854 0024A794 38 80 00 FF */ li r4, 0xff /* 8024D858 0024A798 4B DE 63 D5 */ bl setWarashibeItem__17dSv_player_item_cFUc @@ -4001,8 +4001,8 @@ lbl_8024D85C: /* 8024D88C 0024A7CC 4B FF D8 65 */ bl dMsgFlow_c_NS_getParam /* 8024D890 0024A7D0 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D894 0024A7D4 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D898 0024A7D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D89C 0024A7DC 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8024D898 0024A7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D89C 0024A7DC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8024D8A0 0024A7E0 7C 60 22 14 */ add r3, r0, r4 /* 8024D8A4 0024A7E4 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8A8 0024A7E8 A0 81 00 0A */ lhz r4, 0xa(r1) @@ -4022,8 +4022,8 @@ lbl_8024D85C: /* 8024D8E0 0024A820 4B FF D8 11 */ bl dMsgFlow_c_NS_getParam /* 8024D8E4 0024A824 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D8E8 0024A828 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D8EC 0024A82C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D8F0 0024A830 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8024D8EC 0024A82C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D8F0 0024A830 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8024D8F4 0024A834 7C 60 22 14 */ add r3, r0, r4 /* 8024D8F8 0024A838 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8FC 0024A83C A0 81 00 0A */ lhz r4, 0xa(r1) @@ -4068,50 +4068,50 @@ lbl_8024D85C: /* 8024D998 0024A8D8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024D99C 0024A8DC 7C 09 03 A6 */ mtctr r0 /* 8024D9A0 0024A8E0 4E 80 04 20 */ bctr -/* 8024D9A4 0024A8E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9A8 0024A8E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9A4 0024A8E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9A8 0024A8E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9AC 0024A8EC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9B0 0024A8F0 38 80 00 61 */ li r4, 0x61 /* 8024D9B4 0024A8F4 38 A0 00 60 */ li r5, 0x60 /* 8024D9B8 0024A8F8 4B DE 59 B9 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9BC 0024A8FC 48 00 00 A8 */ b lbl_8024DA64 -/* 8024D9C0 0024A900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9C4 0024A904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9C0 0024A900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9C4 0024A904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9C8 0024A908 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9CC 0024A90C 38 80 00 62 */ li r4, 0x62 /* 8024D9D0 0024A910 38 A0 00 60 */ li r5, 0x60 /* 8024D9D4 0024A914 4B DE 59 9D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9D8 0024A918 48 00 00 8C */ b lbl_8024DA64 -/* 8024D9DC 0024A91C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9E0 0024A920 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9DC 0024A91C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9E0 0024A920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9E4 0024A924 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9E8 0024A928 38 80 00 63 */ li r4, 0x63 /* 8024D9EC 0024A92C 38 A0 00 60 */ li r5, 0x60 /* 8024D9F0 0024A930 4B DE 59 81 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9F4 0024A934 48 00 00 70 */ b lbl_8024DA64 -/* 8024D9F8 0024A938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9FC 0024A93C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9F8 0024A938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9FC 0024A93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA00 0024A940 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA04 0024A944 38 80 00 64 */ li r4, 0x64 /* 8024DA08 0024A948 38 A0 00 60 */ li r5, 0x60 /* 8024DA0C 0024A94C 4B DE 59 65 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA10 0024A950 48 00 00 54 */ b lbl_8024DA64 -/* 8024DA14 0024A954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA18 0024A958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA14 0024A954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA18 0024A958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA1C 0024A95C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA20 0024A960 38 80 00 65 */ li r4, 0x65 /* 8024DA24 0024A964 38 A0 00 60 */ li r5, 0x60 /* 8024DA28 0024A968 4B DE 59 49 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA2C 0024A96C 48 00 00 38 */ b lbl_8024DA64 -/* 8024DA30 0024A970 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA34 0024A974 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA30 0024A970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA34 0024A974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA38 0024A978 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA3C 0024A97C 38 80 00 66 */ li r4, 0x66 /* 8024DA40 0024A980 38 A0 00 60 */ li r5, 0x60 /* 8024DA44 0024A984 4B DE 59 2D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA48 0024A988 48 00 00 1C */ b lbl_8024DA64 -/* 8024DA4C 0024A98C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA50 0024A990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA4C 0024A98C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA50 0024A990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA54 0024A994 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA58 0024A998 38 80 00 6B */ li r4, 0x6b /* 8024DA5C 0024A99C 38 A0 00 60 */ li r5, 0x60 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 8fc7734d82..e2fb0683f8 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -15,8 +15,8 @@ dMsgObject_searchSSItem: /* 80232A50 0022F990 93 E1 00 0C */ stw r31, 0xc(r1) /* 80232A54 0022F994 93 C1 00 08 */ stw r30, 8(r1) /* 80232A58 0022F998 7C 7E 1B 78 */ mr r30, r3 -/* 80232A5C 0022F99C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80232A60 0022F9A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80232A5C 0022F99C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80232A60 0022F9A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80232A64 0022F9A4 83 E4 5D AC */ lwz r31, 0x5dac(r4) /* 80232A68 0022F9A8 4B DE 62 79 */ bl fopAc_IsActor /* 80232A6C 0022F9AC 2C 03 00 00 */ cmpwi r3, 0 @@ -1101,8 +1101,8 @@ lbl_80233A74: /* 80233A74 002309B4 80 DE 01 04 */ lwz r6, 0x104(r30) /* 80233A78 002309B8 28 06 00 00 */ cmplwi r6, 0 /* 80233A7C 002309BC 41 82 00 50 */ beq lbl_80233ACC -/* 80233A80 002309C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233A84 002309C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233A80 002309C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233A84 002309C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233A88 002309C8 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80233A8C 002309CC 28 00 00 00 */ cmplwi r0, 0 /* 80233A90 002309D0 41 82 00 18 */ beq lbl_80233AA8 @@ -1260,8 +1260,8 @@ lbl_80233C88: /* 80233CAC 00230BEC 41 82 00 08 */ beq lbl_80233CB4 /* 80233CB0 00230BF0 90 7F 01 44 */ stw r3, 0x144(r31) lbl_80233CB4: -/* 80233CB4 00230BF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233CB8 00230BF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233CB4 00230BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233CB8 00230BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233CBC 00230BFC 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80233CC0 00230C00 28 00 00 05 */ cmplwi r0, 5 /* 80233CC4 00230C04 40 82 00 14 */ bne lbl_80233CD8 @@ -1271,8 +1271,8 @@ lbl_80233CB4: /* 80233CD4 00230C14 4B DF A4 B5 */ bl dComIfGp_offHeapLockFlag lbl_80233CD8: /* 80233CD8 00230C18 38 00 00 00 */ li r0, 0 -/* 80233CDC 00230C1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233CE0 00230C20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233CDC 00230C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233CE0 00230C20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233CE4 00230C24 90 03 5D BC */ stw r0, 0x5dbc(r3) /* 80233CE8 00230C28 38 60 00 01 */ li r3, 1 /* 80233CEC 00230C2C 39 61 00 30 */ addi r11, r1, 0x30 @@ -1311,8 +1311,8 @@ lbl_80233D44: /* 80233D60 00230CA0 41 82 00 2C */ beq lbl_80233D8C /* 80233D64 00230CA4 28 04 00 00 */ cmplwi r4, 0 /* 80233D68 00230CA8 41 82 00 24 */ beq lbl_80233D8C -/* 80233D6C 00230CAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233D70 00230CB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233D6C 00230CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233D70 00230CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233D74 00230CB4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80233D78 00230CB8 4B E0 F9 15 */ bl dEvt_control_c_NS_setPtT /* 80233D7C 00230CBC 38 00 00 01 */ li r0, 1 @@ -1339,8 +1339,8 @@ lbl_80233D8C: /* 80233DCC 00230D0C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233DD0 00230D10 7C 7C 02 14 */ add r3, r28, r0 /* 80233DD4 00230D14 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 80233DD8 00230D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233DDC 00230D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233DD8 00230D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233DDC 00230D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233DE0 00230D20 90 03 5E EC */ stw r0, 0x5eec(r3) /* 80233DE4 00230D24 80 9D 01 5C */ lwz r4, 0x15c(r29) /* 80233DE8 00230D28 28 04 03 E8 */ cmplwi r4, 0x3e8 @@ -1409,8 +1409,8 @@ dMsgObject_c_NS_setMessageIndexDemo: /* 80233EC8 00230E08 41 82 00 2C */ beq lbl_80233EF4 /* 80233ECC 00230E0C 28 04 00 00 */ cmplwi r4, 0 /* 80233ED0 00230E10 41 82 00 24 */ beq lbl_80233EF4 -/* 80233ED4 00230E14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233ED8 00230E18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233ED4 00230E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233ED8 00230E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233EDC 00230E1C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80233EE0 00230E20 4B E0 F7 AD */ bl dEvt_control_c_NS_setPtT /* 80233EE4 00230E24 38 00 00 01 */ li r0, 1 @@ -1435,8 +1435,8 @@ lbl_80233EF4: /* 80233F2C 00230E6C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233F30 00230E70 7C 7D 02 14 */ add r3, r29, r0 /* 80233F34 00230E74 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 80233F38 00230E78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233F3C 00230E7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233F38 00230E78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233F3C 00230E7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233F40 00230E80 90 03 5E EC */ stw r0, 0x5eec(r3) /* 80233F44 00230E84 38 00 00 00 */ li r0, 0 /* 80233F48 00230E88 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -1617,8 +1617,8 @@ lbl_8023417C: /* 80234180 002310C0 48 00 2F B9 */ bl dMsgObject_c_NS_isMidonaNormalTalkWait /* 80234184 002310C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234188 002310C8 41 82 01 7C */ beq lbl_80234304 -/* 8023418C 002310CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80234190 002310D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023418C 002310CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80234190 002310D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80234194 002310D4 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 80234198 002310D8 7C 00 07 74 */ extsb r0, r0 /* 8023419C 002310DC 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -1629,8 +1629,8 @@ lbl_8023417C: /* 802341B0 002310F0 48 00 37 85 */ bl dMsgObject_c_NS_isCameraCancelFlag /* 802341B4 002310F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802341B8 002310F8 40 82 00 18 */ bne lbl_802341D0 -/* 802341BC 002310FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802341C0 00231100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802341BC 002310FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802341C0 00231100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802341C4 00231104 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 802341C8 00231108 28 00 00 00 */ cmplwi r0, 0 /* 802341CC 0023110C 41 82 01 38 */ beq lbl_80234304 @@ -1640,8 +1640,8 @@ lbl_802341D0: /* 802341D8 00231118 41 82 00 70 */ beq lbl_80234248 /* 802341DC 0023111C 38 00 00 00 */ li r0, 0 /* 802341E0 00231120 98 1F 01 9D */ stb r0, 0x19d(r31) -/* 802341E4 00231124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802341E8 00231128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802341E4 00231124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802341E8 00231128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802341EC 0023112C 98 03 5E 86 */ stb r0, 0x5e86(r3) /* 802341F0 00231130 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802341F4 00231134 7F E3 FB 78 */ mr r3, r31 @@ -1693,8 +1693,8 @@ lbl_80234280: /* 802342A0 002311E0 48 00 00 64 */ b lbl_80234304 lbl_802342A4: /* 802342A4 002311E4 38 00 00 00 */ li r0, 0 -/* 802342A8 002311E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802342AC 002311EC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802342A8 002311E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802342AC 002311EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802342B0 002311F0 98 04 5E 86 */ stb r0, 0x5e86(r4) /* 802342B4 002311F4 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802342B8 002311F8 38 80 00 02 */ li r4, 2 @@ -2854,8 +2854,8 @@ lbl_80235380: /* 80235394 002322D4 28 00 00 00 */ cmplwi r0, 0 /* 80235398 002322D8 41 82 00 1C */ beq lbl_802353B4 /* 8023539C 002322DC 38 00 00 2A */ li r0, 0x2a -/* 802353A0 002322E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802353A4 002322E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802353A0 002322E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802353A4 002322E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802353A8 002322E8 98 03 5E 35 */ stb r0, 0x5e35(r3) /* 802353AC 002322EC 38 00 00 00 */ li r0, 0 /* 802353B0 002322F0 98 03 5E 50 */ stb r0, 0x5e50(r3) @@ -3244,8 +3244,8 @@ dMsgObject_c_NS_inputProc: /* 80235924 00232864 80 63 00 34 */ lwz r3, 0x34(r3) /* 80235928 00232868 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 8023592C 0023286C 41 82 01 58 */ beq lbl_80235A84 -/* 80235930 00232870 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235934 00232874 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235930 00232870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235934 00232874 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235938 00232878 3B A3 0D D8 */ addi r29, r3, 0xdd8 /* 8023593C 0023287C 7F A3 EB 78 */ mr r3, r29 /* 80235940 00232880 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -3256,8 +3256,8 @@ dMsgObject_c_NS_inputProc: /* 80235954 00232894 A8 1C 01 74 */ lha r0, 0x174(r28) /* 80235958 00232898 2C 00 00 00 */ cmpwi r0, 0 /* 8023595C 0023289C 40 81 00 30 */ ble lbl_8023598C -/* 80235960 002328A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235964 002328A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235960 002328A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235964 002328A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235968 002328A8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8023596C 002328AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80235970 002328B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -3268,8 +3268,8 @@ dMsgObject_c_NS_inputProc: /* 80235984 002328C4 38 00 00 01 */ li r0, 1 /* 80235988 002328C8 98 1C 04 D0 */ stb r0, 0x4d0(r28) lbl_8023598C: -/* 8023598C 002328CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235990 002328D0 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8023598C 002328CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235990 002328D0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80235994 002328D4 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 80235998 002328D8 A8 7C 01 74 */ lha r3, 0x174(r28) /* 8023599C 002328DC 7C 03 00 D0 */ neg r0, r3 @@ -3286,8 +3286,8 @@ lbl_8023598C: /* 802359C8 00232908 A8 1C 01 76 */ lha r0, 0x176(r28) /* 802359CC 0023290C 7C 03 00 00 */ cmpw r3, r0 /* 802359D0 00232910 41 80 00 9C */ blt lbl_80235A6C -/* 802359D4 00232914 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802359D8 00232918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802359D4 00232914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802359D8 00232918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802359DC 0023291C 3B 63 07 F0 */ addi r27, r3, 0x7f0 /* 802359E0 00232920 7F 63 DB 78 */ mr r3, r27 /* 802359E4 00232924 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -3339,8 +3339,8 @@ lbl_80235A6C: lbl_80235A84: /* 80235A84 002329C4 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 80235A88 002329C8 41 82 00 34 */ beq lbl_80235ABC -/* 80235A8C 002329CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235A90 002329D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235A8C 002329CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235A90 002329D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235A94 002329D4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80235A98 002329D8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80235A9C 002329DC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -3673,8 +3673,8 @@ lbl_80235F2C: /* 80235F44 00232E84 7F E3 FB 78 */ mr r3, r31 /* 80235F48 00232E88 48 00 18 01 */ bl dMsgObject_c_NS_updateEquipBombInfoLocal /* 80235F4C 00232E8C 38 00 00 FF */ li r0, 0xff -/* 80235F50 00232E90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235F54 00232E94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235F50 00232E90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235F54 00232E94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235F58 00232E98 98 03 5E 7C */ stb r0, 0x5e7c(r3) /* 80235F5C 00232E9C 38 00 FF FF */ li r0, -1 /* 80235F60 00232EA0 90 03 5E E8 */ stw r0, 0x5ee8(r3) @@ -3742,8 +3742,8 @@ lbl_80236028: /* 80236040 00232F80 88 9F 01 A5 */ lbz r4, 0x1a5(r31) /* 80236044 00232F84 28 04 00 00 */ cmplwi r4, 0 /* 80236048 00232F88 41 82 00 20 */ beq lbl_80236068 -/* 8023604C 00232F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236050 00232F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023604C 00232F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236050 00232F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236054 00232F94 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 80236058 00232F98 7C 00 22 14 */ add r0, r0, r4 /* 8023605C 00232F9C B0 03 5D F4 */ sth r0, 0x5df4(r3) @@ -3802,8 +3802,8 @@ lbl_8023610C: /* 80236110 00233050 88 03 12 46 */ lbz r0, 0x1246(r3) /* 80236114 00233054 98 1F 01 9A */ stb r0, 0x19a(r31) lbl_80236118: -/* 80236118 00233058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023611C 0023305C 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 80236118 00233058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023611C 0023305C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 80236120 00233060 88 1C 5E 8F */ lbz r0, 0x5e8f(r28) /* 80236124 00233064 28 00 00 08 */ cmplwi r0, 8 /* 80236128 00233068 41 82 00 2C */ beq lbl_80236154 @@ -4247,8 +4247,8 @@ lbl_80236774: lbl_8023677C: /* 8023677C 002336BC 28 1E 00 03 */ cmplwi r30, 3 /* 80236780 002336C0 40 82 00 F4 */ bne lbl_80236874 -/* 80236784 002336C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236788 002336C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236784 002336C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236788 002336C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023678C 002336CC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80236790 002336D0 38 63 05 38 */ addi r3, r3, 0x538 /* 80236794 002336D4 38 81 00 14 */ addi r4, r1, 0x14 @@ -4398,8 +4398,8 @@ lbl_80236978: /* 8023697C 002338BC 90 1E 01 04 */ stw r0, 0x104(r30) /* 80236980 002338C0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80236984 002338C4 41 82 00 20 */ beq lbl_802369A4 -/* 80236988 002338C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023698C 002338CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236988 002338C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023698C 002338CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236990 002338D0 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80236994 002338D4 28 00 00 05 */ cmplwi r0, 5 /* 80236998 002338D8 40 82 00 0C */ bne lbl_802369A4 @@ -4430,8 +4430,8 @@ dMsgObject_c_NS_isSend: /* 802369E8 00233928 93 C1 00 08 */ stw r30, 8(r1) /* 802369EC 0023392C 7C 7F 1B 78 */ mr r31, r3 /* 802369F0 00233930 38 00 00 00 */ li r0, 0 -/* 802369F4 00233934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802369F8 00233938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802369F4 00233934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802369F8 00233938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802369FC 0023393C 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80236A00 00233940 98 03 5E 57 */ stb r0, 0x5e57(r3) /* 80236A04 00233944 8B C3 5E 86 */ lbz r30, 0x5e86(r3) @@ -4589,8 +4589,8 @@ dMsgObject_c_NS_readMessageGroupLocal: /* 80236C04 00233B44 93 E1 00 0C */ stw r31, 0xc(r1) /* 80236C08 00233B48 93 C1 00 08 */ stw r30, 8(r1) /* 80236C0C 00233B4C 7C 9E 23 78 */ mr r30, r4 -/* 80236C10 00233B50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236C14 00233B54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236C10 00233B50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236C14 00233B54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236C18 00233B58 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80236C1C 00233B5C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80236C20 00233B60 7D 89 03 A6 */ mtctr r12 @@ -4672,8 +4672,8 @@ dMsgObject_c_NS_changeGroupLocal: /* 80236D1C 00233C5C 48 12 B4 C1 */ bl _savegpr_29 /* 80236D20 00233C60 7C 7E 1B 78 */ mr r30, r3 /* 80236D24 00233C64 7C 9F 23 78 */ mr r31, r4 -/* 80236D28 00233C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236D2C 00233C6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236D28 00233C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236D2C 00233C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236D30 00233C70 80 63 5E C8 */ lwz r3, 0x5ec8(r3) /* 80236D34 00233C74 4B DD 84 99 */ bl mDoExt_setCurrentHeap /* 80236D38 00233C78 7C 7D 1B 78 */ mr r29, r3 @@ -5494,8 +5494,8 @@ lbl_8023779C: /* 802377A0 002346E0 3B 60 00 00 */ li r27, 0 /* 802377A4 002346E4 3B A0 00 00 */ li r29, 0 /* 802377A8 002346E8 3B 40 00 00 */ li r26, 0 -/* 802377AC 002346EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802377B0 002346F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802377AC 002346EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802377B0 002346F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802377B4 002346F4 3B 23 00 9C */ addi r25, r3, 0x9c /* 802377B8 002346F8 3B 03 00 EC */ addi r24, r3, 0xec lbl_802377BC: @@ -5572,8 +5572,8 @@ lbl_802378A0: .global dMsgObject_c_NS_setShopWaitTimer dMsgObject_c_NS_setShopWaitTimer: -/* 802378B8 002347F8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802378BC 002347FC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802378B8 002347F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802378BC 002347FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802378C0 00234800 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802378C4 00234804 98 64 04 C9 */ stb r3, 0x4c9(r4) /* 802378C8 00234808 4E 80 00 20 */ blr @@ -5613,8 +5613,8 @@ lbl_80237918: .global dMsgObject_c_NS_isCameraCancelFlag dMsgObject_c_NS_isCameraCancelFlag: -/* 80237934 00234874 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237938 00234878 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237934 00234874 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237938 00234878 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023793C 0023487C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237940 00234880 88 63 01 9E */ lbz r3, 0x19e(r3) /* 80237944 00234884 30 03 FF FF */ addic r0, r3, -1 @@ -5623,8 +5623,8 @@ dMsgObject_c_NS_isCameraCancelFlag: .global dMsgObject_c_NS_onCameraCancelFlag dMsgObject_c_NS_onCameraCancelFlag: -/* 80237950 00234890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237954 00234894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237950 00234890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237954 00234894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237958 00234898 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023795C 0023489C 38 00 00 01 */ li r0, 1 /* 80237960 002348A0 98 03 01 9E */ stb r0, 0x19e(r3) @@ -5632,8 +5632,8 @@ dMsgObject_c_NS_onCameraCancelFlag: .global dMsgObject_c_NS_offCameraCancelFlag dMsgObject_c_NS_offCameraCancelFlag: -/* 80237968 002348A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023796C 002348AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237968 002348A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023796C 002348AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237970 002348B0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237974 002348B4 38 00 00 00 */ li r0, 0 /* 80237978 002348B8 98 03 01 9E */ stb r0, 0x19e(r3) @@ -5641,16 +5641,16 @@ dMsgObject_c_NS_offCameraCancelFlag: .global dMsgObject_c_NS_isKillMessageFlag dMsgObject_c_NS_isKillMessageFlag: -/* 80237980 002348C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237984 002348C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237980 002348C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237984 002348C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237988 002348C8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023798C 002348CC 88 63 04 D2 */ lbz r3, 0x4d2(r3) /* 80237990 002348D0 4E 80 00 20 */ blr .global dMsgObject_c_NS_onKillMessageFlag dMsgObject_c_NS_onKillMessageFlag: -/* 80237994 002348D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237998 002348D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237994 002348D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237998 002348D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023799C 002348DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802379A0 002348E0 38 00 00 01 */ li r0, 1 /* 802379A4 002348E4 98 03 04 D2 */ stb r0, 0x4d2(r3) @@ -5661,8 +5661,8 @@ dMsgObject_c_NS_setKillMessageFlag: /* 802379AC 002348EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802379B0 002348F0 7C 08 02 A6 */ mflr r0 /* 802379B4 002348F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802379B8 002348F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802379BC 002348FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802379B8 002348F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802379BC 002348FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802379C0 00234900 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802379C4 00234904 48 00 00 15 */ bl dMsgObject_c_NS_setKillMessageFlagLocal /* 802379C8 00234908 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5677,8 +5677,8 @@ dMsgObject_c_NS_setKillMessageFlagLocal: /* 802379E0 00234920 90 01 00 14 */ stw r0, 0x14(r1) /* 802379E4 00234924 93 E1 00 0C */ stw r31, 0xc(r1) /* 802379E8 00234928 7C 7F 1B 78 */ mr r31, r3 -/* 802379EC 0023492C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802379F0 00234930 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802379EC 0023492C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802379F0 00234930 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802379F4 00234934 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 802379F8 00234938 28 00 00 00 */ cmplwi r0, 0 /* 802379FC 0023493C 40 82 00 64 */ bne lbl_80237A60 @@ -5717,21 +5717,21 @@ lbl_80237A60: .global dMsgObject_c_NS_setTalkPartner dMsgObject_c_NS_setTalkPartner: -/* 80237A74 002349B4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237A78 002349B8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237A74 002349B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237A78 002349B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A7C 002349BC 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80237A80 002349C0 90 64 01 40 */ stw r3, 0x140(r4) /* 80237A84 002349C4 4E 80 00 20 */ blr .global dMsgObject_c_NS_setNowTalkFlowNo dMsgObject_c_NS_setNowTalkFlowNo: -/* 80237A88 002349C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237A8C 002349CC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237A88 002349C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237A8C 002349CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A90 002349D0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80237A94 002349D4 B0 64 01 70 */ sth r3, 0x170(r4) /* 80237A98 002349D8 4E 80 00 20 */ blr -/* 80237A9C 002349DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AA0 002349E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237A9C 002349DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AA0 002349E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AA4 002349E4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237AA8 002349E8 A8 63 01 70 */ lha r3, 0x170(r3) /* 80237AAC 002349EC 4E 80 00 20 */ blr @@ -5742,8 +5742,8 @@ dMsgObject_c_NS_setDemoMessage: /* 80237AB4 002349F4 7C 08 02 A6 */ mflr r0 /* 80237AB8 002349F8 90 01 00 14 */ stw r0, 0x14(r1) /* 80237ABC 002349FC 7C 64 1B 78 */ mr r4, r3 -/* 80237AC0 00234A00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AC4 00234A04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237AC0 00234A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AC4 00234A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AC8 00234A08 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237ACC 00234A0C 48 00 02 BD */ bl dMsgObject_c_NS_setDemoMessageLocal /* 80237AD0 00234A10 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5757,8 +5757,8 @@ dMsgObject_c_NS_setTalkHeap: /* 80237AE4 00234A24 7C 08 02 A6 */ mflr r0 /* 80237AE8 00234A28 90 01 00 14 */ stw r0, 0x14(r1) /* 80237AEC 00234A2C 7C 64 1B 78 */ mr r4, r3 -/* 80237AF0 00234A30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AF4 00234A34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237AF0 00234A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AF4 00234A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AF8 00234A38 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237AFC 00234A3C 48 00 00 15 */ bl dMsgObject_c_NS_setTalkHeapLocal /* 80237B00 00234A40 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5789,8 +5789,8 @@ lbl_80237B38: .global dMsgObject_c_NS_getTalkHeap dMsgObject_c_NS_getTalkHeap: -/* 80237B54 00234A94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237B58 00234A98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237B54 00234A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237B58 00234A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237B5C 00234A9C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237B60 00234AA0 80 63 01 44 */ lwz r3, 0x144(r3) /* 80237B64 00234AA4 4E 80 00 20 */ blr @@ -5874,8 +5874,8 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237C78 00234BB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237C7C 00234BBC 41 82 00 2C */ beq lbl_80237CA8 /* 80237C80 00234BC0 38 00 00 05 */ li r0, 5 -/* 80237C84 00234BC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237C88 00234BC8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80237C84 00234BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237C88 00234BC8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80237C8C 00234BCC 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80237C90 00234BD0 38 60 00 00 */ li r3, 0 /* 80237C94 00234BD4 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -5885,8 +5885,8 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237CA4 00234BE4 48 00 00 CC */ b lbl_80237D70 lbl_80237CA8: /* 80237CA8 00234BE8 38 00 00 23 */ li r0, 0x23 -/* 80237CAC 00234BEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237CB0 00234BF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237CAC 00234BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237CB0 00234BF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237CB4 00234BF4 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237CB8 00234BF8 38 00 00 00 */ li r0, 0 /* 80237CBC 00234BFC 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5909,8 +5909,8 @@ lbl_80237CC4: /* 80237CFC 00234C3C 40 82 00 20 */ bne lbl_80237D1C lbl_80237D00: /* 80237D00 00234C40 38 00 00 22 */ li r0, 0x22 -/* 80237D04 00234C44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D08 00234C48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237D04 00234C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D08 00234C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237D0C 00234C4C 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237D10 00234C50 38 00 00 00 */ li r0, 0 /* 80237D14 00234C54 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5922,8 +5922,8 @@ lbl_80237D1C: /* 80237D28 00234C68 28 00 00 15 */ cmplwi r0, 0x15 /* 80237D2C 00234C6C 40 82 00 2C */ bne lbl_80237D58 /* 80237D30 00234C70 38 00 00 22 */ li r0, 0x22 -/* 80237D34 00234C74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D38 00234C78 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80237D34 00234C74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D38 00234C78 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80237D3C 00234C7C 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80237D40 00234C80 38 60 00 00 */ li r3, 0 /* 80237D44 00234C84 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -5933,8 +5933,8 @@ lbl_80237D1C: /* 80237D54 00234C94 48 00 00 1C */ b lbl_80237D70 lbl_80237D58: /* 80237D58 00234C98 38 00 00 23 */ li r0, 0x23 -/* 80237D5C 00234C9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D60 00234CA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237D5C 00234C9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D60 00234CA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237D64 00234CA4 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237D68 00234CA8 38 00 00 00 */ li r0, 0 /* 80237D6C 00234CAC 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5956,8 +5956,8 @@ dMsgObject_c_NS_setDemoMessageLocal: /* 80237D9C 00234CDC 38 00 00 01 */ li r0, 1 /* 80237DA0 00234CE0 98 03 04 CC */ stb r0, 0x4cc(r3) /* 80237DA4 00234CE4 4B FF FB AD */ bl dMsgObject_c_NS_onCameraCancelFlag -/* 80237DA8 00234CE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237DAC 00234CEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237DA8 00234CE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237DAC 00234CEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237DB0 00234CF0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237DB4 00234CF4 7F E4 FB 78 */ mr r4, r31 /* 80237DB8 00234CF8 4B FF C3 71 */ bl dMsgObject_c_NS_getMessageIDAlways @@ -5972,8 +5972,8 @@ dMsgObject_c_NS_setDemoMessageLocal: .global dMsgObject_c_NS_getSmellTypeMessageIDLocal dMsgObject_c_NS_getSmellTypeMessageIDLocal: /* 80237DD8 00234D18 38 60 00 00 */ li r3, 0 -/* 80237DDC 00234D1C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237DE0 00234D20 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237DDC 00234D1C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237DE0 00234D20 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237DE4 00234D24 88 84 00 16 */ lbz r4, 0x16(r4) /* 80237DE8 00234D28 2C 04 00 B6 */ cmpwi r4, 0xb6 /* 80237DEC 00234D2C 4C 80 00 20 */ bgelr @@ -5991,13 +5991,13 @@ dMsgObject_c_NS_setSmellTypeLocal: /* 80237E10 00234D50 93 E1 00 0C */ stw r31, 0xc(r1) /* 80237E14 00234D54 7C 7F 1B 78 */ mr r31, r3 /* 80237E18 00234D58 98 83 01 A0 */ stb r4, 0x1a0(r3) -/* 80237E1C 00234D5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E20 00234D60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E1C 00234D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E20 00234D60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E24 00234D64 38 63 00 CC */ addi r3, r3, 0xcc /* 80237E28 00234D68 4B DF C0 39 */ bl onFirstBit__21dSv_player_get_item_cFUc /* 80237E2C 00234D6C 88 9F 01 A0 */ lbz r4, 0x1a0(r31) -/* 80237E30 00234D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E30 00234D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E38 00234D78 98 83 00 16 */ stb r4, 0x16(r3) /* 80237E3C 00234D7C 38 60 00 02 */ li r3, 2 /* 80237E40 00234D80 4B DF 5E 85 */ bl dComIfGs_setSelectItemIndex @@ -6024,8 +6024,8 @@ dMsgObject_c_NS_setSelectCursorPosLocal: /* 80237E7C 00234DBC 7C 9E 23 78 */ mr r30, r4 /* 80237E80 00234DC0 80 63 01 20 */ lwz r3, 0x120(r3) /* 80237E84 00234DC4 83 E3 00 04 */ lwz r31, 4(r3) -/* 80237E88 00234DC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E8C 00234DCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E88 00234DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E8C 00234DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E90 00234DD0 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80237E94 00234DD4 28 00 00 00 */ cmplwi r0, 0 /* 80237E98 00234DD8 40 82 00 50 */ bne lbl_80237EE8 @@ -6097,8 +6097,8 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F8C 00234ECC 39 61 00 20 */ addi r11, r1, 0x20 /* 80237F90 00234ED0 48 12 A2 4D */ bl _savegpr_29 /* 80237F94 00234ED4 7C 7E 1B 78 */ mr r30, r3 -/* 80237F98 00234ED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80237F98 00234ED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80237FA0 00234EE0 93 DF 5D BC */ stw r30, 0x5dbc(r31) /* 80237FA4 00234EE4 80 7F 5E C8 */ lwz r3, 0x5ec8(r31) /* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap @@ -6133,8 +6133,8 @@ dMsgObject_c_NS_readMessageGroup: /* 80238010 00234F50 7C 08 02 A6 */ mflr r0 /* 80238014 00234F54 90 01 00 14 */ stw r0, 0x14(r1) /* 80238018 00234F58 7C 64 1B 78 */ mr r4, r3 -/* 8023801C 00234F5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238020 00234F60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023801C 00234F5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238020 00234F60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238024 00234F64 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238028 00234F68 4B FF EB D1 */ bl dMsgObject_c_NS_readMessageGroupLocal /* 8023802C 00234F6C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6148,8 +6148,8 @@ dMsgObject_c_NS_changeFlowGroup: /* 80238040 00234F80 7C 08 02 A6 */ mflr r0 /* 80238044 00234F84 90 01 00 14 */ stw r0, 0x14(r1) /* 80238048 00234F88 7C 64 1B 78 */ mr r4, r3 -/* 8023804C 00234F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238050 00234F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023804C 00234F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238050 00234F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238054 00234F94 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238058 00234F98 4B FF EC 39 */ bl dMsgObject_c_NS_changeFlowGroupLocal /* 8023805C 00234F9C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6162,8 +6162,8 @@ dMsgObject_c_NS_demoMessageGroup: /* 8023806C 00234FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238070 00234FB0 7C 08 02 A6 */ mflr r0 /* 80238074 00234FB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238078 00234FB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023807C 00234FBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238078 00234FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023807C 00234FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238080 00234FC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238084 00234FC4 4B FF EC 51 */ bl dMsgObject_c_NS_demoMessageGroupLocal /* 80238088 00234FC8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6176,8 +6176,8 @@ dMsgObject_c_NS_endFlowGroup: /* 80238098 00234FD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023809C 00234FDC 7C 08 02 A6 */ mflr r0 /* 802380A0 00234FE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802380A4 00234FE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802380A8 00234FE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802380A4 00234FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802380A8 00234FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380AC 00234FEC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802380B0 00234FF0 4B FF EC 51 */ bl dMsgObject_c_NS_endFlowGroupLocal /* 802380B4 00234FF4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6191,8 +6191,8 @@ dMsgObject_c_NS_changeGroup: /* 802380C8 00235008 7C 08 02 A6 */ mflr r0 /* 802380CC 0023500C 90 01 00 14 */ stw r0, 0x14(r1) /* 802380D0 00235010 7C 64 1B 78 */ mr r4, r3 -/* 802380D4 00235014 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802380D8 00235018 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802380D4 00235014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802380D8 00235018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380DC 0023501C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802380E0 00235020 4B FF EC 2D */ bl dMsgObject_c_NS_changeGroupLocal /* 802380E4 00235024 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6217,8 +6217,8 @@ dMsgObject_c_NS_getString: /* 80238124 00235064 80 01 00 38 */ lwz r0, 0x38(r1) /* 80238128 00235068 91 41 00 08 */ stw r10, 8(r1) /* 8023812C 0023506C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80238130 00235070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238134 00235074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238130 00235070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238134 00235074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238138 00235078 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023813C 0023507C 7F 64 DB 78 */ mr r4, r27 /* 80238140 00235080 7F 85 E3 78 */ mr r5, r28 @@ -6237,21 +6237,21 @@ dMsgObject_c_NS_getString: .global dMsgObject_c_NS_getMsgDtPtr dMsgObject_c_NS_getMsgDtPtr: -/* 80238174 002350B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238178 002350B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238174 002350B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238178 002350B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023817C 002350BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238180 002350C0 80 63 01 30 */ lwz r3, 0x130(r3) /* 80238184 002350C4 4E 80 00 20 */ blr -/* 80238188 002350C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023818C 002350CC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80238188 002350C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023818C 002350CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238190 002350D0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80238194 002350D4 90 64 01 4C */ stw r3, 0x14c(r4) /* 80238198 002350D8 4E 80 00 20 */ blr .global dMsgObject_c_NS_getActor dMsgObject_c_NS_getActor: -/* 8023819C 002350DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381A0 002350E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023819C 002350DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381A0 002350E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381A4 002350E4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381A8 002350E8 28 03 00 00 */ cmplwi r3, 0 /* 802381AC 002350EC 40 82 00 0C */ bne lbl_802381B8 @@ -6260,18 +6260,18 @@ dMsgObject_c_NS_getActor: lbl_802381B8: /* 802381B8 002350F8 80 63 01 00 */ lwz r3, 0x100(r3) /* 802381BC 002350FC 4E 80 00 20 */ blr -/* 802381C0 00235100 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381C4 00235104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381C0 00235100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381C4 00235104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381C8 00235108 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381CC 0023510C 80 63 01 38 */ lwz r3, 0x138(r3) /* 802381D0 00235110 4E 80 00 20 */ blr -/* 802381D4 00235114 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381D8 00235118 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381D4 00235114 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381D8 00235118 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381DC 0023511C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381E0 00235120 80 63 01 60 */ lwz r3, 0x160(r3) /* 802381E4 00235124 4E 80 00 20 */ blr -/* 802381E8 00235128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381EC 0023512C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381E8 00235128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381EC 0023512C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381F0 00235130 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381F4 00235134 A0 63 01 64 */ lhz r3, 0x164(r3) /* 802381F8 00235138 4E 80 00 20 */ blr @@ -6282,8 +6282,8 @@ dMsgObject_c_NS_setStatus: /* 80238200 00235140 7C 08 02 A6 */ mflr r0 /* 80238204 00235144 90 01 00 14 */ stw r0, 0x14(r1) /* 80238208 00235148 7C 64 1B 78 */ mr r4, r3 -/* 8023820C 0023514C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238210 00235150 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023820C 0023514C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238210 00235150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238214 00235154 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238218 00235158 4B FF E6 CD */ bl dMsgObject_c_NS_setStatusLocal /* 8023821C 0023515C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6296,8 +6296,8 @@ dMsgObject_c_NS_getStatus: /* 8023822C 0023516C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238230 00235170 7C 08 02 A6 */ mflr r0 /* 80238234 00235174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238238 00235178 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023823C 0023517C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238238 00235178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023823C 0023517C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238240 00235180 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238244 00235184 4B FF E6 B5 */ bl dMsgObject_c_NS_getStatusLocal /* 80238248 00235188 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6307,8 +6307,8 @@ dMsgObject_c_NS_getStatus: .global dMsgObject_c_NS_getScrnDrawPtr dMsgObject_c_NS_getScrnDrawPtr: -/* 80238258 00235198 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023825C 0023519C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238258 00235198 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023825C 0023519C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238260 002351A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238264 002351A4 80 63 01 04 */ lwz r3, 0x104(r3) /* 80238268 002351A8 4E 80 00 20 */ blr @@ -6319,8 +6319,8 @@ dMsgObject_c_NS_setTalkActor: /* 80238270 002351B0 7C 08 02 A6 */ mflr r0 /* 80238274 002351B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80238278 002351B8 7C 64 1B 78 */ mr r4, r3 -/* 8023827C 002351BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238280 002351C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023827C 002351BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238280 002351C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238284 002351C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238288 002351C8 4B FF FC 89 */ bl dMsgObject_c_NS_setTalkActorLocal /* 8023828C 002351CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6333,8 +6333,8 @@ dMsgObject_c_NS_onMsgSendControl: /* 8023829C 002351DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382A0 002351E0 7C 08 02 A6 */ mflr r0 /* 802382A4 002351E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382A8 002351E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802382AC 002351EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802382A8 002351E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802382AC 002351EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382B0 002351F0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802382B4 002351F4 4B FF F2 6D */ bl dMsgObject_c_NS_onMsgSendControlLocal /* 802382B8 002351F8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6347,8 +6347,8 @@ dMsgObject_c_NS_offMsgSendControl: /* 802382C8 00235208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382CC 0023520C 7C 08 02 A6 */ mflr r0 /* 802382D0 00235210 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382D4 00235214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802382D8 00235218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802382D4 00235214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802382D8 00235218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382DC 0023521C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802382E0 00235220 4B FF F2 51 */ bl dMsgObject_c_NS_offMsgSendControlLocal /* 802382E4 00235224 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6361,8 +6361,8 @@ dMsgObject_c_NS_isMsgSendControl: /* 802382F4 00235234 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382F8 00235238 7C 08 02 A6 */ mflr r0 /* 802382FC 0023523C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238300 00235240 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238304 00235244 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238300 00235240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238304 00235244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238308 00235248 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023830C 0023524C 4B FF F2 45 */ bl dMsgObject_c_NS_isMsgSendControlLocal /* 80238310 00235250 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6375,8 +6375,8 @@ dMsgObject_c_NS_onMsgSend: /* 80238320 00235260 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238324 00235264 7C 08 02 A6 */ mflr r0 /* 80238328 00235268 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023832C 0023526C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238330 00235270 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023832C 0023526C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238330 00235270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238334 00235274 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238338 00235278 4B FF F2 25 */ bl dMsgObject_c_NS_onMsgSendLocal /* 8023833C 0023527C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6389,8 +6389,8 @@ dMsgObject_c_NS_offMsgSend: /* 8023834C 0023528C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238350 00235290 7C 08 02 A6 */ mflr r0 /* 80238354 00235294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238358 00235298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023835C 0023529C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238358 00235298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023835C 0023529C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238360 002352A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238364 002352A4 4B FF F2 09 */ bl dMsgObject_c_NS_offMsgSendLocal /* 80238368 002352A8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6403,8 +6403,8 @@ dMsgObject_c_NS_isMsgSend: /* 80238378 002352B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023837C 002352BC 7C 08 02 A6 */ mflr r0 /* 80238380 002352C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238384 002352C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238388 002352C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238384 002352C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238388 002352C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023838C 002352CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238390 002352D0 4B FF F1 ED */ bl dMsgObject_c_NS_isMsgSendLocal /* 80238394 002352D4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6417,8 +6417,8 @@ dMsgObject_c_NS_isMouthCheck: /* 802383A4 002352E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383A8 002352E8 7C 08 02 A6 */ mflr r0 /* 802383AC 002352EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383B0 002352F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383B4 002352F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383B0 002352F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383B4 002352F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383B8 002352F8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383BC 002352FC 4B FF F1 CD */ bl dMsgObject_c_NS_isMouthCheckLocal /* 802383C0 00235300 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6428,8 +6428,8 @@ dMsgObject_c_NS_isMouthCheck: .global dMsgObject_c_NS_getMessageID dMsgObject_c_NS_getMessageID: -/* 802383D0 00235310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383D4 00235314 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383D0 00235310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383D4 00235314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383D8 00235318 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383DC 0023531C 80 63 01 54 */ lwz r3, 0x154(r3) /* 802383E0 00235320 4E 80 00 20 */ blr @@ -6439,8 +6439,8 @@ dMsgObject_c_NS_getSmellTypeMessageID: /* 802383E4 00235324 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383E8 00235328 7C 08 02 A6 */ mflr r0 /* 802383EC 0023532C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383F0 00235330 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383F4 00235334 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383F0 00235330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383F4 00235334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383F8 00235338 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383FC 0023533C 4B FF F9 DD */ bl dMsgObject_c_NS_getSmellTypeMessageIDLocal /* 80238400 00235340 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6454,8 +6454,8 @@ dMsgObject_c_NS_setSmellType: /* 80238414 00235354 7C 08 02 A6 */ mflr r0 /* 80238418 00235358 90 01 00 14 */ stw r0, 0x14(r1) /* 8023841C 0023535C 7C 64 1B 78 */ mr r4, r3 -/* 80238420 00235360 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238424 00235364 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238420 00235360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238424 00235364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238428 00235368 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023842C 0023536C 4B FF F9 D9 */ bl dMsgObject_c_NS_setSmellTypeLocal /* 80238430 00235370 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6468,8 +6468,8 @@ dMsgObject_c_NS_getSelectCursorPos: /* 80238440 00235380 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238444 00235384 7C 08 02 A6 */ mflr r0 /* 80238448 00235388 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023844C 0023538C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238450 00235390 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023844C 0023538C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238450 00235390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238454 00235394 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238458 00235398 4B FF FA 01 */ bl dMsgObject_c_NS_getSelectCursorPosLocal /* 8023845C 0023539C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6483,8 +6483,8 @@ dMsgObject_c_NS_setSelectCursorPos: /* 80238470 002353B0 7C 08 02 A6 */ mflr r0 /* 80238474 002353B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80238478 002353B8 7C 64 1B 78 */ mr r4, r3 -/* 8023847C 002353BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238480 002353C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023847C 002353BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238480 002353C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238484 002353C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238488 002353C8 4B FF F9 E1 */ bl dMsgObject_c_NS_setSelectCursorPosLocal /* 8023848C 002353CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6494,61 +6494,61 @@ dMsgObject_c_NS_setSelectCursorPos: .global dMsgObject_c_NS_setPortalMessageID dMsgObject_c_NS_setPortalMessageID: -/* 8023849C 002353DC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384A0 002353E0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023849C 002353DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384A0 002353E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384A4 002353E4 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384A8 002353E8 B0 64 01 80 */ sth r3, 0x180(r4) /* 802384AC 002353EC 4E 80 00 20 */ blr -/* 802384B0 002353F0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384B4 002353F4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384B0 002353F0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384B4 002353F4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384B8 002353F8 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384BC 002353FC 98 64 01 94 */ stb r3, 0x194(r4) /* 802384C0 00235400 4E 80 00 20 */ blr .global dMsgObject_c_NS_setLetterNameID dMsgObject_c_NS_setLetterNameID: -/* 802384C4 00235404 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384C8 00235408 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384C4 00235404 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384C8 00235408 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384CC 0023540C 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384D0 00235410 B0 64 01 88 */ sth r3, 0x188(r4) /* 802384D4 00235414 4E 80 00 20 */ blr .global dMsgObject_c_NS_setArrowNum dMsgObject_c_NS_setArrowNum: -/* 802384D8 00235418 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384DC 0023541C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384D8 00235418 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384DC 0023541C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384E0 00235420 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384E4 00235424 98 64 01 A5 */ stb r3, 0x1a5(r4) /* 802384E8 00235428 4E 80 00 20 */ blr .global dMsgObject_c_NS_setMsgOutputType dMsgObject_c_NS_setMsgOutputType: -/* 802384EC 0023542C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384F0 00235430 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384EC 0023542C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384F0 00235430 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384F4 00235434 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384F8 00235438 98 64 04 C8 */ stb r3, 0x4c8(r4) /* 802384FC 0023543C 4E 80 00 20 */ blr .global dMsgObject_c_NS_getMsgOutputType dMsgObject_c_NS_getMsgOutputType: -/* 80238500 00235440 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238504 00235444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238500 00235440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238504 00235444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238508 00235448 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023850C 0023544C 88 63 04 C8 */ lbz r3, 0x4c8(r3) /* 80238510 00235450 4E 80 00 20 */ blr .global dMsgObject_c_NS_getWord dMsgObject_c_NS_getWord: -/* 80238514 00235454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238518 00235458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238514 00235454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238518 00235458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023851C 0023545C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238520 00235460 38 63 01 A6 */ addi r3, r3, 0x1a6 /* 80238524 00235464 4E 80 00 20 */ blr .global dMsgObject_c_NS_getSelectWord dMsgObject_c_NS_getSelectWord: -/* 80238528 00235468 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023852C 0023546C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80238528 00235468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023852C 0023546C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238530 00235470 80 04 5D BC */ lwz r0, 0x5dbc(r4) /* 80238534 00235474 1C 63 00 C8 */ mulli r3, r3, 0xc8 /* 80238538 00235478 38 63 02 6E */ addi r3, r3, 0x26e @@ -6561,8 +6561,8 @@ dMsgObject_c_NS_setSelectWordFlag: /* 80238548 00235488 7C 08 02 A6 */ mflr r0 /* 8023854C 0023548C 90 01 00 14 */ stw r0, 0x14(r1) /* 80238550 00235490 7C 64 1B 78 */ mr r4, r3 -/* 80238554 00235494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238558 00235498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238554 00235494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238558 00235498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023855C 0023549C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238560 002354A0 4B FF F3 6D */ bl dMsgObject_c_NS_setSelectWordFlagLocal /* 80238564 002354A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6572,8 +6572,8 @@ dMsgObject_c_NS_setSelectWordFlag: .global dMsgObject_c_NS_getSelectWordFlag dMsgObject_c_NS_getSelectWordFlag: -/* 80238574 002354B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238578 002354B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238574 002354B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238578 002354B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023857C 002354BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238580 002354C0 88 63 04 C6 */ lbz r3, 0x4c6(r3) /* 80238584 002354C4 4E 80 00 20 */ blr @@ -6583,8 +6583,8 @@ dMsgObject_c_NS_isHowlHearingMode: /* 80238588 002354C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023858C 002354CC 7C 08 02 A6 */ mflr r0 /* 80238590 002354D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238594 002354D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238598 002354D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238594 002354D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238598 002354D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023859C 002354DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385A0 002354E0 4B FF F3 35 */ bl dMsgObject_c_NS_isHowlHearingModeLocal /* 802385A4 002354E4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6597,8 +6597,8 @@ dMsgObject_c_NS_getSelectBombBagID: /* 802385B4 002354F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385B8 002354F8 7C 08 02 A6 */ mflr r0 /* 802385BC 002354FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802385C0 00235500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802385C4 00235504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802385C0 00235500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802385C4 00235504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385C8 00235508 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385CC 0023550C 4B FF F0 71 */ bl dMsgObject_c_NS_getSelectBombBagIDLocal /* 802385D0 00235510 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6611,8 +6611,8 @@ dMsgObject_c_NS_getSelectBombPrice: /* 802385E0 00235520 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385E4 00235524 7C 08 02 A6 */ mflr r0 /* 802385E8 00235528 90 01 00 14 */ stw r0, 0x14(r1) -/* 802385EC 0023552C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802385F0 00235530 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802385EC 0023552C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802385F0 00235530 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385F4 00235534 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385F8 00235538 4B FF F0 95 */ bl dMsgObject_c_NS_getSelectBombPriceLocal /* 802385FC 0023553C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6625,8 +6625,8 @@ dMsgObject_c_NS_setEquipBombInfo: /* 8023860C 0023554C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238610 00235550 7C 08 02 A6 */ mflr r0 /* 80238614 00235554 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238618 00235558 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023861C 0023555C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238618 00235558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023861C 0023555C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238620 00235560 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238624 00235564 4B FF F1 19 */ bl dMsgObject_c_NS_setEquipBombInfoLocal /* 80238628 00235568 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6636,16 +6636,16 @@ dMsgObject_c_NS_setEquipBombInfo: .global dMsgObject_c_NS_getItemEquipButton dMsgObject_c_NS_getItemEquipButton: -/* 80238638 00235578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023863C 0023557C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238638 00235578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023863C 0023557C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238640 00235580 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238644 00235584 88 63 01 A4 */ lbz r3, 0x1a4(r3) /* 80238648 00235588 4E 80 00 20 */ blr .global dMsgObject_c_NS_setSelectCancelPos dMsgObject_c_NS_setSelectCancelPos: -/* 8023864C 0023558C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80238650 00235590 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023864C 0023558C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80238650 00235590 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238654 00235594 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80238658 00235598 98 64 01 A1 */ stb r3, 0x1a1(r4) /* 8023865C 0023559C 4E 80 00 20 */ blr @@ -6657,8 +6657,8 @@ dMsgObject_getTotalPrice: /* 80238668 002355A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8023866C 002355AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238670 002355B0 93 C1 00 08 */ stw r30, 8(r1) -/* 80238674 002355B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238678 002355B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238674 002355B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238678 002355B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023867C 002355BC 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238680 002355C0 7F C3 F3 78 */ mr r3, r30 /* 80238684 002355C4 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6684,8 +6684,8 @@ dMsgObject_getTotalPrice: /* 802386D4 00235614 93 E1 00 0C */ stw r31, 0xc(r1) /* 802386D8 00235618 93 C1 00 08 */ stw r30, 8(r1) /* 802386DC 0023561C 7C 60 1B 78 */ mr r0, r3 -/* 802386E0 00235620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802386E4 00235624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802386E0 00235620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802386E4 00235624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802386E8 00235628 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802386EC 0023562C 7F C3 F3 78 */ mr r3, r30 /* 802386F0 00235630 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6710,8 +6710,8 @@ dMsgObject_getTotalPrice: /* 8023873C 0023567C 39 61 00 20 */ addi r11, r1, 0x20 /* 80238740 00235680 48 12 9A 9D */ bl _savegpr_29 /* 80238744 00235684 7C 7D 1B 78 */ mr r29, r3 -/* 80238748 00235688 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023874C 0023568C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238748 00235688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023874C 0023568C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238750 00235690 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238754 00235694 A8 03 01 7A */ lha r0, 0x17a(r3) /* 80238758 00235698 7C 00 EA 14 */ add r0, r0, r29 @@ -6722,8 +6722,8 @@ dMsgObject_getTotalPrice: /* 8023876C 002356AC 40 80 00 08 */ bge lbl_80238774 /* 80238770 002356B0 3B A0 00 00 */ li r29, 0 lbl_80238774: -/* 80238774 002356B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238778 002356B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238774 002356B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238778 002356B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023877C 002356BC 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238780 002356C0 7F C3 F3 78 */ mr r3, r30 /* 80238784 002356C4 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6750,8 +6750,8 @@ dMsgObject_getTotalPayment: /* 802387CC 0023570C 90 01 00 14 */ stw r0, 0x14(r1) /* 802387D0 00235710 93 E1 00 0C */ stw r31, 0xc(r1) /* 802387D4 00235714 93 C1 00 08 */ stw r30, 8(r1) -/* 802387D8 00235718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802387DC 0023571C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802387D8 00235718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802387DC 0023571C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802387E0 00235720 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802387E4 00235724 7F C3 F3 78 */ mr r3, r30 /* 802387E8 00235728 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6777,8 +6777,8 @@ dMsgObject_getTotalPayment: /* 80238838 00235778 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023883C 0023577C 93 C1 00 08 */ stw r30, 8(r1) /* 80238840 00235780 7C 60 1B 78 */ mr r0, r3 -/* 80238844 00235784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238848 00235788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238844 00235784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238848 00235788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023884C 0023578C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238850 00235790 7F C3 F3 78 */ mr r3, r30 /* 80238854 00235794 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6806,8 +6806,8 @@ dMsgObject_addTotalPayment: /* 802388A0 002357E0 39 61 00 20 */ addi r11, r1, 0x20 /* 802388A4 002357E4 48 12 99 39 */ bl _savegpr_29 /* 802388A8 002357E8 7C 7D 1B 78 */ mr r29, r3 -/* 802388AC 002357EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802388B0 002357F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802388AC 002357EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802388B0 002357F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802388B4 002357F4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802388B8 002357F8 A8 03 01 7C */ lha r0, 0x17c(r3) /* 802388BC 002357FC 7C 00 EA 14 */ add r0, r0, r29 @@ -6818,8 +6818,8 @@ dMsgObject_addTotalPayment: /* 802388D0 00235810 40 80 00 08 */ bge lbl_802388D8 /* 802388D4 00235814 3B A0 00 00 */ li r29, 0 lbl_802388D8: -/* 802388D8 00235818 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802388DC 0023581C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802388D8 00235818 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802388DC 0023581C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802388E0 00235820 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802388E4 00235824 7F C3 F3 78 */ mr r3, r30 /* 802388E8 00235828 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6846,8 +6846,8 @@ dMsgObject_getFundRaising: /* 80238930 00235870 90 01 00 14 */ stw r0, 0x14(r1) /* 80238934 00235874 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238938 00235878 93 C1 00 08 */ stw r30, 8(r1) -/* 8023893C 0023587C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238940 00235880 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023893C 0023587C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238940 00235880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238944 00235884 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238948 00235888 7F C3 F3 78 */ mr r3, r30 /* 8023894C 0023588C 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6876,8 +6876,8 @@ dMsgObject_setFundRaising: /* 8023899C 002358DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802389A0 002358E0 93 C1 00 08 */ stw r30, 8(r1) /* 802389A4 002358E4 7C 60 1B 78 */ mr r0, r3 -/* 802389A8 002358E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802389AC 002358EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802389A8 002358E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802389AC 002358EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802389B0 002358F0 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802389B4 002358F4 7F C3 F3 78 */ mr r3, r30 /* 802389B8 002358F8 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6911,8 +6911,8 @@ dMsgObject_addFundRaising: /* 80238A1C 0023595C 40 80 00 08 */ bge lbl_80238A24 /* 80238A20 00235960 3B A0 00 00 */ li r29, 0 lbl_80238A24: -/* 80238A24 00235964 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238A28 00235968 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238A24 00235964 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238A28 00235968 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238A2C 0023596C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238A30 00235970 7F C3 F3 78 */ mr r3, r30 /* 80238A34 00235974 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6939,8 +6939,8 @@ dMsgObject_getOffering: /* 80238A7C 002359BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80238A80 002359C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238A84 002359C4 93 C1 00 08 */ stw r30, 8(r1) -/* 80238A88 002359C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238A8C 002359CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238A88 002359C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238A8C 002359CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238A90 002359D0 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238A94 002359D4 7F C3 F3 78 */ mr r3, r30 /* 80238A98 002359D8 3C 80 00 01 */ lis r4, 0x0000F7FF@ha @@ -6975,8 +6975,8 @@ dMsgObject_addOffering: /* 80238B00 00235A40 40 80 00 08 */ bge lbl_80238B08 /* 80238B04 00235A44 38 00 00 00 */ li r0, 0 lbl_80238B08: -/* 80238B08 00235A48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238B0C 00235A4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238B08 00235A48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238B0C 00235A4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238B10 00235A50 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238B14 00235A54 7F C3 F3 78 */ mr r3, r30 /* 80238B18 00235A58 3C 80 00 01 */ lis r4, 0x0000F7FF@ha diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index 1ad5b00b52..12b7481f6b 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -180,8 +180,8 @@ lbl_80225E18: /* 80225E20 00222D60 3B DE 00 04 */ addi r30, r30, 4 /* 80225E24 00222D64 41 80 FF C8 */ blt lbl_80225DEC lbl_80225E28: -/* 80225E28 00222D68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225E2C 00222D6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225E28 00222D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225E2C 00222D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225E30 00222D70 80 03 5E BC */ lwz r0, 0x5ebc(r3) /* 80225E34 00222D74 28 00 00 00 */ cmplwi r0, 0 /* 80225E38 00222D78 40 82 00 18 */ bne lbl_80225E50 @@ -223,8 +223,8 @@ lbl_80225E88: /* 80225EBC 00222DFC 7C 7F 1B 78 */ mr r31, r3 /* 80225EC0 00222E00 3B A0 00 00 */ li r29, 0 /* 80225EC4 00222E04 3B 60 00 00 */ li r27, 0 -/* 80225EC8 00222E08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225ECC 00222E0C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80225EC8 00222E08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225ECC 00222E0C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80225ED0: /* 80225ED0 00222E10 2C 1D 00 29 */ cmpwi r29, 0x29 /* 80225ED4 00222E14 40 82 00 3C */ bne lbl_80225F10 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index b7c76ef969..3ddf6c153d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -31,8 +31,8 @@ lbl_80239104: /* 8023910C 0023604C 3C 80 80 3A */ lis r4, lbl_80399840@ha /* 80239110 00236050 38 84 98 40 */ addi r4, r4, lbl_80399840@l /* 80239114 00236054 3C A0 00 02 */ lis r5, 2 -/* 80239118 00236058 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, lbl_804061C0@l +/* 80239118 00236058 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, g_dComIfG_gameInfo@l /* 80239120 00236060 80 D4 5C 6C */ lwz r6, 0x5c6c(r20) /* 80239124 00236064 48 0B F5 25 */ bl J2DScreen_NS_setPriority /* 80239128 00236068 80 7F 00 04 */ lwz r3, 4(r31) @@ -918,8 +918,8 @@ dMsgScrn3Select_c_NS_draw: /* 80239DF8 00236D38 7C 7D 1B 78 */ mr r29, r3 /* 80239DFC 00236D3C FF C0 08 90 */ fmr f30, f1 /* 80239E00 00236D40 FF E0 10 90 */ fmr f31, f2 -/* 80239E04 00236D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80239E04 00236D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80239E0C 00236D4C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80239E10 00236D50 7F E3 FB 78 */ mr r3, r31 /* 80239E14 00236D54 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_arrow.s b/asm/d/msg/scrn/d_msg_scrn_arrow.s index 43cdb58337..ddf96aa811 100644 --- a/asm/d/msg/scrn/d_msg_scrn_arrow.s +++ b/asm/d/msg/scrn/d_msg_scrn_arrow.s @@ -26,8 +26,8 @@ lbl_8023B9F0: /* 8023B9F8 00238938 3C 80 80 3A */ lis r4, lbl_803998A0@ha /* 8023B9FC 0023893C 38 84 98 A0 */ addi r4, r4, lbl_803998A0@l /* 8023BA00 00238940 3C A0 00 02 */ lis r5, 2 -/* 8023BA04 00238944 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8023BA04 00238944 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023BA0C 0023894C 80 DE 5C 6C */ lwz r6, 0x5c6c(r30) /* 8023BA10 00238950 48 0B CC 39 */ bl J2DScreen_NS_setPriority /* 8023BA14 00238954 80 7F 00 04 */ lwz r3, 4(r31) @@ -281,8 +281,8 @@ dMsgScrnArrow_c_NS_draw: /* 8023BDC0 00238D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BDC4 00238D04 7C 08 02 A6 */ mflr r0 /* 8023BDC8 00238D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8023BDD4 00238D14 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8023BDD8 00238D18 80 63 00 04 */ lwz r3, 4(r3) /* 8023BDDC 00238D1C C0 22 B1 98 */ lfs f1, lbl_80454B98-_SDA2_BASE_(r2) diff --git a/asm/d/msg/scrn/d_msg_scrn_base.s b/asm/d/msg/scrn/d_msg_scrn_base.s index fdeea4a102..a124e23154 100644 --- a/asm/d/msg/scrn/d_msg_scrn_base.s +++ b/asm/d/msg/scrn/d_msg_scrn_base.s @@ -106,8 +106,8 @@ lbl_8023C1FC: /* 8023C240 00239180 80 C3 00 48 */ lwz r6, 0x48(r3) /* 8023C244 00239184 28 06 00 00 */ cmplwi r6, 0 /* 8023C248 00239188 41 82 00 1C */ beq lbl_8023C264 -/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023C254 00239194 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8023C258 00239198 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8023C25C 0023919C 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -123,8 +123,8 @@ lbl_8023C264: /* 8023C280 002391C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023C284 002391C4 93 C1 00 08 */ stw r30, 8(r1) /* 8023C288 002391C8 7C 7E 1B 78 */ mr r30, r3 -/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023C294 002391D4 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8023C298 002391D8 7F E3 FB 78 */ mr r3, r31 /* 8023C29C 002391DC 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index d07c39982b..ad67da710f 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -31,8 +31,8 @@ lbl_8023C618: /* 8023C620 00239560 3C 80 80 3A */ lis r4, lbl_803998F8@ha /* 8023C624 00239564 38 84 98 F8 */ addi r4, r4, lbl_803998F8@l /* 8023C628 00239568 3C A0 00 02 */ lis r5, 2 -/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023C634 00239574 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) /* 8023C638 00239578 48 0B C0 11 */ bl J2DScreen_NS_setPriority /* 8023C63C 0023957C 80 7E 00 04 */ lwz r3, 4(r30) @@ -301,8 +301,8 @@ lbl_8023CA20: /* 8023CA28 00239968 2C 1B 00 07 */ cmpwi r27, 7 /* 8023CA2C 0023996C 3B DE 00 04 */ addi r30, r30, 4 /* 8023CA30 00239970 41 80 FF CC */ blt lbl_8023C9FC -/* 8023CA34 00239974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023CA34 00239974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023CA3C 0023997C 80 63 5C 7C */ lwz r3, 0x5c7c(r3) /* 8023CA40 00239980 81 83 00 00 */ lwz r12, 0(r3) /* 8023CA44 00239984 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -397,8 +397,8 @@ lbl_8023CB84: /* 8023CBA0 00239AE0 90 01 00 14 */ stw r0, 0x14(r1) /* 8023CBA4 00239AE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023CBA8 00239AE8 7C 7F 1B 78 */ mr r31, r3 -/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023CBB4 00239AF4 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 8023CBB8 00239AF8 81 83 00 00 */ lwz r12, 0(r3) /* 8023CBBC 00239AFC 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 8686ca66c3..3b7198e501 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -72,8 +72,8 @@ lbl_8023CD74: /* 8023CD7C 00239CBC 3C 80 80 3A */ lis r4, lbl_80399910@ha /* 8023CD80 00239CC0 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CD84 00239CC4 3C A0 00 02 */ lis r5, 2 -/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CD90 00239CD0 80 C6 5C 70 */ lwz r6, 0x5c70(r6) /* 8023CD94 00239CD4 48 0B B8 B5 */ bl J2DScreen_NS_setPriority /* 8023CD98 00239CD8 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -99,8 +99,8 @@ lbl_8023CDD8: /* 8023CDE0 00239D20 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CDE4 00239D24 38 84 00 1D */ addi r4, r4, 0x1d /* 8023CDE8 00239D28 3C A0 00 02 */ lis r5, 2 -/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CDF4 00239D34 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 8023CDF8 00239D38 48 0B B8 51 */ bl J2DScreen_NS_setPriority /* 8023CDFC 00239D3C 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -181,8 +181,8 @@ lbl_8023CF14: /* 8023CF1C 00239E5C 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CF20 00239E60 38 84 00 45 */ addi r4, r4, 0x45 /* 8023CF24 00239E64 3C A0 00 02 */ lis r5, 2 -/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CF30 00239E70 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 8023CF34 00239E74 48 0B B7 15 */ bl J2DScreen_NS_setPriority /* 8023CF38 00239E78 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -460,8 +460,8 @@ lbl_8023D344: /* 8023D348 0023A288 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8023D34C 0023A28C 28 00 00 01 */ cmplwi r0, 1 /* 8023D350 0023A290 40 82 00 C8 */ bne lbl_8023D418 -/* 8023D354 0023A294 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D354 0023A294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D35C 0023A29C 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 8023D360 0023A2A0 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8023D364 0023A2A4 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -740,22 +740,22 @@ lbl_8023D750: /* 8023D750 0023A690 38 00 00 00 */ li r0, 0 /* 8023D754 0023A694 90 1E 00 38 */ stw r0, 0x38(r30) lbl_8023D758: -/* 8023D758 0023A698 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D758 0023A698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D760 0023A6A0 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 8023D764 0023A6A4 81 83 00 00 */ lwz r12, 0(r3) /* 8023D768 0023A6A8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023D76C 0023A6AC 7D 89 03 A6 */ mtctr r12 /* 8023D770 0023A6B0 4E 80 04 21 */ bctrl -/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D77C 0023A6BC 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 8023D780 0023A6C0 81 83 00 00 */ lwz r12, 0(r3) /* 8023D784 0023A6C4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023D788 0023A6C8 7D 89 03 A6 */ mtctr r12 /* 8023D78C 0023A6CC 4E 80 04 21 */ bctrl -/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D798 0023A6D8 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 8023D79C 0023A6DC 81 83 00 00 */ lwz r12, 0(r3) /* 8023D7A0 0023A6E0 81 8C 00 24 */ lwz r12, 0x24(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index eb3f4ca4a6..d54e5526db 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -37,8 +37,8 @@ lbl_802409D4: /* 802409DC 0023D91C 3C 80 80 3A */ lis r4, lbl_80399A20@ha /* 802409E0 0023D920 38 84 9A 20 */ addi r4, r4, lbl_80399A20@l /* 802409E4 0023D924 3C A0 00 02 */ lis r5, 2 -/* 802409E8 0023D928 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, lbl_804061C0@l +/* 802409E8 0023D928 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, g_dComIfG_gameInfo@l /* 802409F0 0023D930 80 DC 5C 80 */ lwz r6, 0x5c80(r28) /* 802409F4 0023D934 48 0B 7C 55 */ bl J2DScreen_NS_setPriority /* 802409F8 0023D938 80 7F 00 04 */ lwz r3, 4(r31) @@ -308,8 +308,8 @@ lbl_80240D8C: /* 80240DF8 0023DD38 98 9F 27 9A */ stb r4, 0x279a(r31) /* 80240DFC 0023DD3C C0 02 B2 50 */ lfs f0, lbl_80454C50-_SDA2_BASE_(r2) /* 80240E00 0023DD40 D0 1F 19 9C */ stfs f0, 0x199c(r31) -/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80240E0C 0023DD4C 80 7D 5D B4 */ lwz r3, 0x5db4(r29) /* 80240E10 0023DD50 A8 03 30 10 */ lha r0, 0x3010(r3) /* 80240E14 0023DD54 7C 00 07 35 */ extsh. r0, r0 @@ -702,8 +702,8 @@ lbl_8024135C: /* 802413F0 0023E330 81 8C 01 30 */ lwz r12, 0x130(r12) /* 802413F4 0023E334 7D 89 03 A6 */ mtctr r12 /* 802413F8 0023E338 4E 80 04 21 */ bctrl -/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 80241404 0023E344 80 7C 5D 30 */ lwz r3, 0x5d30(r28) /* 80241408 0023E348 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8024140C 0023E34C 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1116,8 +1116,8 @@ lbl_802419E0: lbl_80241A14: /* 80241A14 0023E954 38 00 00 00 */ li r0, 0 /* 80241A18 0023E958 90 1E 01 24 */ stw r0, 0x124(r30) -/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241A24 0023E964 80 63 5C 80 */ lwz r3, 0x5c80(r3) /* 80241A28 0023E968 81 83 00 00 */ lwz r12, 0(r3) /* 80241A2C 0023E96C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1263,8 +1263,8 @@ lbl_80241BC4: /* 80241C3C 0023EB7C 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80241C40 0023EB80 93 C1 00 38 */ stw r30, 0x38(r1) /* 80241C44 0023EB84 7C 7E 1B 78 */ mr r30, r3 -/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241C50 0023EB90 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80241C54 0023EB94 38 7E 21 14 */ addi r3, r30, 0x2114 /* 80241C58 0023EB98 38 9E 21 18 */ addi r4, r30, 0x2118 @@ -1341,8 +1341,8 @@ lbl_80241CB0: /* 80241D64 0023ECA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80241D68 0023ECA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80241D6C 0023ECAC 7C 7F 1B 78 */ mr r31, r3 -/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80241D78 0023ECB8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80241D7C 0023ECBC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80241D80 0023ECC0 28 00 00 00 */ cmplwi r0, 0 @@ -1388,8 +1388,8 @@ lbl_80241DE8: /* 80241E10 0023ED50 93 C1 00 08 */ stw r30, 8(r1) /* 80241E14 0023ED54 7C 7E 1B 78 */ mr r30, r3 /* 80241E18 0023ED58 48 00 1A 21 */ bl dMsgScrnHowl_c_NS_calcMain -/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80241E24 0023ED64 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 80241E28 0023ED68 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241E2C 0023ED6C 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1420,8 +1420,8 @@ lbl_80241E64: /* 80241E88 0023EDC8 90 01 00 14 */ stw r0, 0x14(r1) /* 80241E8C 0023EDCC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80241E90 0023EDD0 7C 7F 1B 78 */ mr r31, r3 -/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241E9C 0023EDDC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80241EA0 0023EDE0 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241EA4 0023EDE4 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1473,8 +1473,8 @@ lbl_80241F14: /* 80241F54 0023EE94 80 04 00 30 */ lwz r0, 0x30(r4) /* 80241F58 0023EE98 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80241F5C 0023EE9C 41 82 00 28 */ beq lbl_80241F84 -/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80241F68 0023EEA8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80241F6C 0023EEAC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80241F70 0023EEB0 28 00 00 00 */ cmplwi r0, 0 @@ -1491,8 +1491,8 @@ lbl_80241F84: /* 80241F98 0023EED8 40 82 00 08 */ bne lbl_80241FA0 /* 80241F9C 0023EEDC 3B C0 00 01 */ li r30, 1 lbl_80241FA0: -/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241FA8 0023EEE8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80241FAC 0023EEEC 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241FB0 0023EEF0 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1552,8 +1552,8 @@ lbl_80242014: .global dMsgScrnHowl_c_NS_isKeyCheck dMsgScrnHowl_c_NS_isKeyCheck: -/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80242088 0023EFC8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 8024208C 0023EFCC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80242090 0023EFD0 28 00 00 00 */ cmplwi r0, 0 @@ -1668,8 +1668,8 @@ dMsgScrnHowl_c_NS_drawWave: /* 8024221C 0023F15C 39 61 00 70 */ addi r11, r1, 0x70 /* 80242220 0023F160 48 11 FF 9D */ bl func_803621BC /* 80242224 0023F164 7C 79 1B 78 */ mr r25, r3 -/* 80242228 0023F168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242228 0023F168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242230 0023F170 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80242234 0023F174 80 79 00 C4 */ lwz r3, 0xc4(r25) /* 80242238 0023F178 48 01 20 B1 */ bl CPaneMgr_NS_getGlobalPosX @@ -1688,8 +1688,8 @@ dMsgScrnHowl_c_NS_drawWave: /* 8024226C 0023F1AC A8 79 21 28 */ lha r3, 0x2128(r25) /* 80242270 0023F1B0 38 03 FF FF */ addi r0, r3, -1 /* 80242274 0023F1B4 7F 9D 00 50 */ subf r28, r29, r0 -/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242280 0023F1C0 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80242284 0023F1C4 81 83 06 28 */ lwz r12, 0x628(r3) /* 80242288 0023F1C8 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -2064,8 +2064,8 @@ dMsgScrnHowl_c_NS_drawGuide: /* 802427FC 0023F73C 39 61 01 20 */ addi r11, r1, 0x120 /* 80242800 0023F740 48 11 F9 D5 */ bl _savegpr_27 /* 80242804 0023F744 7C 7C 1B 78 */ mr r28, r3 -/* 80242808 0023F748 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242808 0023F748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242810 0023F750 83 63 5F 50 */ lwz r27, 0x5f50(r3) /* 80242814 0023F754 80 7C 01 28 */ lwz r3, 0x128(r28) /* 80242818 0023F758 80 1C 01 2C */ lwz r0, 0x12c(r28) @@ -2606,8 +2606,8 @@ dMsgScrnHowl_c_NS_drawGuide2: /* 80243028 0023FF68 39 61 00 A0 */ addi r11, r1, 0xa0 /* 8024302C 0023FF6C 48 11 F1 9D */ bl func_803621C8 /* 80243030 0023FF70 7C 7A 1B 78 */ mr r26, r3 -/* 80243034 0023FF74 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80243034 0023FF74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024303C 0023FF7C 83 24 5F 50 */ lwz r25, 0x5f50(r4) /* 80243040 0023FF80 88 03 27 98 */ lbz r0, 0x2798(r3) /* 80243044 0023FF84 28 00 00 03 */ cmplwi r0, 3 @@ -2987,8 +2987,8 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802435D8 00240518 39 61 00 70 */ addi r11, r1, 0x70 /* 802435DC 0024051C 48 11 EC 01 */ bl _savegpr_29 /* 802435E0 00240520 7C 7F 1B 78 */ mr r31, r3 -/* 802435E4 00240524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802435E4 00240524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802435EC 0024052C 83 C3 5F 50 */ lwz r30, 0x5f50(r3) /* 802435F0 00240530 80 7F 01 28 */ lwz r3, 0x128(r31) /* 802435F4 00240534 80 1F 01 2C */ lwz r0, 0x12c(r31) @@ -3038,8 +3038,8 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802436A4 002405E4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802436A8 002405E8 7D 89 03 A6 */ mtctr r12 /* 802436AC 002405EC 4E 80 04 21 */ bctrl -/* 802436B0 002405F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802436B0 002405F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802436B8 002405F8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 802436BC 002405FC 81 83 06 28 */ lwz r12, 0x628(r3) /* 802436C0 00240600 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -3227,8 +3227,8 @@ lbl_80243964: /* 80243964 002408A4 88 1F 27 98 */ lbz r0, 0x2798(r31) /* 80243968 002408A8 28 00 00 03 */ cmplwi r0, 3 /* 8024396C 002408AC 41 82 00 74 */ beq lbl_802439E0 -/* 80243970 002408B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80243970 002408B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80243978 002408B8 80 7E 5D B4 */ lwz r3, 0x5db4(r30) /* 8024397C 002408BC 38 63 2D 84 */ addi r3, r3, 0x2d84 /* 80243980 002408C0 48 08 7C D1 */ bl Z2WolfHowlMgr_NS_getOnLineNum @@ -3257,8 +3257,8 @@ lbl_802439D0: /* 802439D8 00240918 7C 7F 02 14 */ add r3, r31, r0 /* 802439DC 0024091C 98 83 24 98 */ stb r4, 0x2498(r3) lbl_802439E0: -/* 802439E0 00240920 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802439E0 00240920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802439E8 00240928 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 802439EC 0024092C 81 83 06 28 */ lwz r12, 0x628(r3) /* 802439F0 00240930 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -3297,8 +3297,8 @@ dMsgScrnHowl_c_NS_calcGuide: /* 80243A68 002409A8 A0 03 21 38 */ lhz r0, 0x2138(r3) /* 80243A6C 002409AC 28 00 00 00 */ cmplwi r0, 0 /* 80243A70 002409B0 41 82 01 58 */ beq lbl_80243BC8 -/* 80243A74 002409B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80243A74 002409B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80243A7C 002409BC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80243A80 002409C0 80 03 2E 0C */ lwz r0, 0x2e0c(r3) /* 80243A84 002409C4 28 00 00 00 */ cmplwi r0, 0 @@ -3914,8 +3914,8 @@ dMsgScrnHowl_c_NS_getGuideDataSize: /* 80244318 00241258 7C 7C 1B 78 */ mr r28, r3 /* 8024431C 0024125C 8B C3 21 97 */ lbz r30, 0x2197(r3) /* 80244320 00241260 3B A0 00 00 */ li r29, 0 -/* 80244324 00241264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80244324 00241264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8024432C 0024126C 48 00 00 38 */ b lbl_80244364 lbl_80244330: /* 80244330 00241270 80 7F 5D B4 */ lwz r3, 0x5db4(r31) @@ -3956,8 +3956,8 @@ dMsgScrnHowl_c_NS_getGuideDataType: /* 802443AC 002412EC 7C 1E 03 78 */ mr r30, r0 /* 802443B0 002412F0 7C 1D 03 78 */ mr r29, r0 /* 802443B4 002412F4 3B 80 00 00 */ li r28, 0 -/* 802443B8 002412F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802443B8 002412F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802443C0 00241300 48 00 00 6C */ b lbl_8024442C lbl_802443C4: /* 802443C4 00241304 80 7F 5D B4 */ lwz r3, 0x5db4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 91a5a1aff9..f0ac004ee6 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -168,8 +168,8 @@ lbl_8023E9A8: /* 8023E9C8 0023B908 2C 00 00 3A */ cmpwi r0, 0x3a /* 8023E9CC 0023B90C 40 82 00 6C */ bne lbl_8023EA38 lbl_8023E9D0: -/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, lbl_804061C0@l(r4) +/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, g_dComIfG_gameInfo@l(r4) /* 8023E9D8 0023B918 38 80 00 05 */ li r4, 5 /* 8023E9DC 0023B91C 7C 05 23 D6 */ divw r0, r5, r4 /* 8023E9E0 0023B920 7C 00 21 D6 */ mullw r0, r0, r4 @@ -204,8 +204,8 @@ lbl_8023EA38: /* 8023EA38 0023B978 48 00 1E 6D */ bl dMsgScrnItem_c_NS_isOugiID /* 8023EA3C 0023B97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023EA40 0023B980 41 82 00 4C */ beq lbl_8023EA8C -/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8023EA4C 0023B98C 80 64 5C D0 */ lwz r3, 0x5cd0(r4) /* 8023EA50 0023B990 80 9F 00 D4 */ lwz r4, 0xd4(r31) /* 8023EA54 0023B994 38 A0 0C 00 */ li r5, 0xc00 @@ -285,8 +285,8 @@ lbl_8023EB58: /* 8023EB60 0023BAA0 3C 80 80 3A */ lis r4, lbl_80399990@ha /* 8023EB64 0023BAA4 38 84 99 90 */ addi r4, r4, lbl_80399990@l /* 8023EB68 0023BAA8 3C A0 01 02 */ lis r5, 0x102 -/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023EB74 0023BAB4 80 DE 5C 78 */ lwz r6, 0x5c78(r30) /* 8023EB78 0023BAB8 48 0B 9A D1 */ bl J2DScreen_NS_setPriority /* 8023EB7C 0023BABC 80 7F 00 04 */ lwz r3, 4(r31) @@ -1134,22 +1134,22 @@ lbl_8023F7EC: /* 8023F7F0 0023C730 2C 1A 00 03 */ cmpwi r26, 3 /* 8023F7F4 0023C734 3B BD 00 04 */ addi r29, r29, 4 /* 8023F7F8 0023C738 41 80 FF 9C */ blt lbl_8023F794 -/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F804 0023C744 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 8023F808 0023C748 81 83 00 00 */ lwz r12, 0(r3) /* 8023F80C 0023C74C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023F810 0023C750 7D 89 03 A6 */ mtctr r12 /* 8023F814 0023C754 4E 80 04 21 */ bctrl -/* 8023F818 0023C758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F818 0023C758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F820 0023C760 80 63 5C 78 */ lwz r3, 0x5c78(r3) /* 8023F824 0023C764 81 83 00 00 */ lwz r12, 0(r3) /* 8023F828 0023C768 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023F82C 0023C76C 7D 89 03 A6 */ mtctr r12 /* 8023F830 0023C770 4E 80 04 21 */ bctrl -/* 8023F834 0023C774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F834 0023C774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F83C 0023C77C 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 8023F840 0023C780 81 83 00 00 */ lwz r12, 0(r3) /* 8023F844 0023C784 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1355,8 +1355,8 @@ lbl_8023FA64: /* 8023FB38 0023CA78 39 61 00 30 */ addi r11, r1, 0x30 /* 8023FB3C 0023CA7C 48 12 26 91 */ bl func_803621CC /* 8023FB40 0023CA80 7C 7B 1B 78 */ mr r27, r3 -/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023FB4C 0023CA8C 83 A3 5F 50 */ lwz r29, 0x5f50(r3) /* 8023FB50 0023CA90 7F A3 EB 78 */ mr r3, r29 /* 8023FB54 0023CA94 81 9D 00 00 */ lwz r12, 0(r29) @@ -1801,8 +1801,8 @@ lbl_802401D8: /* 802401D8 0023D118 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802401DC 0023D11C 28 00 00 03 */ cmplwi r0, 3 /* 802401E0 0023D120 40 82 01 B0 */ bne lbl_80240390 -/* 802401E4 0023D124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802401E4 0023D124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802401EC 0023D12C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802401F0 0023D130 38 63 05 38 */ addi r3, r3, 0x538 /* 802401F4 0023D134 38 81 00 44 */ addi r4, r1, 0x44 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index a5db8ec945..a0c43fc642 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -42,8 +42,8 @@ lbl_802445CC: /* 802445D4 00241514 3C 80 80 3A */ lis r4, lbl_80399A80@ha /* 802445D8 00241518 38 84 9A 80 */ addi r4, r4, lbl_80399A80@l /* 802445DC 0024151C 3C A0 00 02 */ lis r5, 2 -/* 802445E0 00241520 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 802445E0 00241520 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 802445E8 00241528 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 802445EC 0024152C 48 0B 40 5D */ bl J2DScreen_NS_setPriority /* 802445F0 00241530 80 7F 00 04 */ lwz r3, 4(r31) @@ -428,22 +428,22 @@ lbl_80244B90: /* 80244B94 00241AD4 2C 1B 00 02 */ cmpwi r27, 2 /* 80244B98 00241AD8 3B BD 00 04 */ addi r29, r29, 4 /* 80244B9C 00241ADC 41 80 FF 9C */ blt lbl_80244B38 -/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BA8 00241AE8 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 80244BAC 00241AEC 81 83 00 00 */ lwz r12, 0(r3) /* 80244BB0 00241AF0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80244BB4 00241AF4 7D 89 03 A6 */ mtctr r12 /* 80244BB8 00241AF8 4E 80 04 21 */ bctrl -/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BC4 00241B04 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80244BC8 00241B08 81 83 00 00 */ lwz r12, 0(r3) /* 80244BCC 00241B0C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80244BD0 00241B10 7D 89 03 A6 */ mtctr r12 /* 80244BD4 00241B14 4E 80 04 21 */ bctrl -/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BE0 00241B20 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 80244BE4 00241B24 81 83 00 00 */ lwz r12, 0(r3) /* 80244BE8 00241B28 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -538,8 +538,8 @@ lbl_80244D08: /* 80244D3C 00241C7C 90 01 00 14 */ stw r0, 0x14(r1) /* 80244D40 00241C80 93 E1 00 0C */ stw r31, 0xc(r1) /* 80244D44 00241C84 7C 7F 1B 78 */ mr r31, r3 -/* 80244D48 00241C88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244D48 00241C88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244D50 00241C90 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80244D54 00241C94 81 83 00 00 */ lwz r12, 0(r3) /* 80244D58 00241C98 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index be3bbaf7fd..d2cffff568 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -43,8 +43,8 @@ lbl_80244EB0: /* 80244EB8 00241DF8 3C 80 80 3A */ lis r4, lbl_80399AB8@ha /* 80244EBC 00241DFC 38 84 9A B8 */ addi r4, r4, lbl_80399AB8@l /* 80244EC0 00241E00 3C A0 01 02 */ lis r5, 0x102 -/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, lbl_804061C0@l +/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 80244ECC 00241E0C 80 DD 5C 74 */ lwz r6, 0x5c74(r29) /* 80244ED0 00241E10 48 0B 37 79 */ bl J2DScreen_NS_setPriority /* 80244ED4 00241E14 80 7F 00 04 */ lwz r3, 4(r31) @@ -450,8 +450,8 @@ lbl_802454C4: /* 802454C8 00242408 2C 1B 00 03 */ cmpwi r27, 3 /* 802454CC 0024240C 3B BD 00 04 */ addi r29, r29, 4 /* 802454D0 00242410 41 80 FF 9C */ blt lbl_8024546C -/* 802454D4 00242414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802454D4 00242414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802454DC 0024241C 80 63 5C 74 */ lwz r3, 0x5c74(r3) /* 802454E0 00242420 81 83 00 00 */ lwz r12, 0(r3) /* 802454E4 00242424 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -540,8 +540,8 @@ lbl_802455D4: /* 80245624 00242564 93 E1 00 0C */ stw r31, 0xc(r1) /* 80245628 00242568 93 C1 00 08 */ stw r30, 8(r1) /* 8024562C 0024256C 7C 7E 1B 78 */ mr r30, r3 -/* 80245630 00242570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80245630 00242570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80245638 00242578 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8024563C 0024257C 7F E3 FB 78 */ mr r3, r31 /* 80245640 00242580 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_light.s b/asm/d/msg/scrn/d_msg_scrn_light.s index 085bbcd2ba..fa80397e0a 100644 --- a/asm/d/msg/scrn/d_msg_scrn_light.s +++ b/asm/d/msg/scrn/d_msg_scrn_light.s @@ -176,8 +176,8 @@ lbl_802459AC: /* 802459B4 002428F4 3C 80 80 3A */ lis r4, lbl_80399B08@ha /* 802459B8 002428F8 38 84 9B 08 */ addi r4, r4, lbl_80399B08@l /* 802459BC 002428FC 3C A0 00 02 */ lis r5, 2 -/* 802459C0 00242900 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 802459C0 00242900 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 802459C8 00242908 80 DE 5D 30 */ lwz r6, 0x5d30(r30) /* 802459CC 0024290C 48 0B 2C 7D */ bl J2DScreen_NS_setPriority /* 802459D0 00242910 80 7F 00 04 */ lwz r3, 4(r31) @@ -680,8 +680,8 @@ dMsgScrnLight_c_NS_drawCommon: /* 8024612C 0024306C FF 80 18 90 */ fmr f28, f3 /* 80246130 00243070 FF A0 20 90 */ fmr f29, f4 /* 80246134 00243074 FF C0 28 90 */ fmr f30, f5 -/* 80246138 00243078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246138 00243078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246140 00243080 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80246144 00243084 7F E3 FB 78 */ mr r3, r31 /* 80246148 00243088 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index ebdd1745f4..b4f5465756 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -51,8 +51,8 @@ lbl_80246464: /* 8024646C 002433AC 3C 80 80 3A */ lis r4, lbl_80399B78@ha /* 80246470 002433B0 38 84 9B 78 */ addi r4, r4, lbl_80399B78@l /* 80246474 002433B4 3C A0 00 02 */ lis r5, 2 -/* 80246478 002433B8 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80246478 002433B8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246480 002433C0 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) /* 80246484 002433C4 48 0B 21 C5 */ bl J2DScreen_NS_setPriority /* 80246488 002433C8 80 7F 00 04 */ lwz r3, 4(r31) @@ -341,8 +341,8 @@ lbl_802468BC: /* 802468C4 00243804 2C 1B 00 07 */ cmpwi r27, 7 /* 802468C8 00243808 3B DE 00 04 */ addi r30, r30, 4 /* 802468CC 0024380C 41 80 FF CC */ blt lbl_80246898 -/* 802468D0 00243810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802468D0 00243810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802468D8 00243818 80 63 5C 7C */ lwz r3, 0x5c7c(r3) /* 802468DC 0024381C 81 83 00 00 */ lwz r12, 0(r3) /* 802468E0 00243820 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -441,8 +441,8 @@ lbl_80246A30: /* 80246A4C 0024398C 90 01 00 14 */ stw r0, 0x14(r1) /* 80246A50 00243990 93 E1 00 0C */ stw r31, 0xc(r1) /* 80246A54 00243994 7C 7F 1B 78 */ mr r31, r3 -/* 80246A58 00243998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246A58 00243998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246A60 002439A0 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80246A64 002439A4 81 83 00 00 */ lwz r12, 0(r3) /* 80246A68 002439A8 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_staff.s b/asm/d/msg/scrn/d_msg_scrn_staff.s index 43164a4fac..493631d6e9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_staff.s +++ b/asm/d/msg/scrn/d_msg_scrn_staff.s @@ -32,8 +32,8 @@ lbl_80246B88: /* 80246B90 00243AD0 3C 80 80 3A */ lis r4, lbl_80399B98@ha /* 80246B94 00243AD4 38 84 9B 98 */ addi r4, r4, lbl_80399B98@l /* 80246B98 00243AD8 3C A0 00 02 */ lis r5, 2 -/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246BA4 00243AE4 80 C6 5C 84 */ lwz r6, 0x5c84(r6) /* 80246BA8 00243AE8 48 0B 1A A1 */ bl J2DScreen_NS_setPriority /* 80246BAC 00243AEC 80 7E 00 04 */ lwz r3, 4(r30) @@ -230,8 +230,8 @@ lbl_80246E80: /* 80246E88 00243DC8 2C 1C 00 06 */ cmpwi r28, 6 /* 80246E8C 00243DCC 3B FF 00 04 */ addi r31, r31, 4 /* 80246E90 00243DD0 41 80 FF CC */ blt lbl_80246E5C -/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246E9C 00243DDC 80 63 5C 84 */ lwz r3, 0x5c84(r3) /* 80246EA0 00243DE0 81 83 00 00 */ lwz r12, 0(r3) /* 80246EA4 00243DE4 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -290,8 +290,8 @@ lbl_80246F54: /* 80246F70 00243EB0 90 01 00 14 */ stw r0, 0x14(r1) /* 80246F74 00243EB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80246F78 00243EB8 7C 7F 1B 78 */ mr r31, r3 -/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246F84 00243EC4 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80246F88 00243EC8 81 83 00 00 */ lwz r12, 0(r3) /* 80246F8C 00243ECC 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index ebf1ea7d56..86f9a1eea9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -45,8 +45,8 @@ lbl_80247070: /* 80247078 00243FB8 3C 80 80 3A */ lis r4, lbl_80399BB0@ha /* 8024707C 00243FBC 38 84 9B B0 */ addi r4, r4, lbl_80399BB0@l /* 80247080 00243FC0 3C A0 00 02 */ lis r5, 2 -/* 80247084 00243FC4 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80247084 00243FC4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8024708C 00243FCC 80 C6 5C 70 */ lwz r6, 0x5c70(r6) /* 80247090 00243FD0 48 0B 15 B9 */ bl J2DScreen_NS_setPriority /* 80247094 00243FD4 80 7F 00 04 */ lwz r3, 4(r31) @@ -59,8 +59,8 @@ lbl_80247070: /* 802470B0 00243FF0 7C 60 1B 78 */ mr r0, r3 lbl_802470B4: /* 802470B4 00243FF4 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 802470C0 00244000 80 9E 5D BC */ lwz r4, 0x5dbc(r30) /* 802470C4 00244004 88 04 01 9A */ lbz r0, 0x19a(r4) /* 802470C8 00244008 28 00 00 08 */ cmplwi r0, 8 @@ -92,8 +92,8 @@ lbl_8024710C: /* 80247128 00244068 7C 60 1B 78 */ mr r0, r3 lbl_8024712C: /* 8024712C 0024406C 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80247130 00244070 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80247130 00244070 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80247138 00244078 88 04 5E 8F */ lbz r0, 0x5e8f(r4) /* 8024713C 0024407C 28 00 00 03 */ cmplwi r0, 3 /* 80247140 00244080 41 82 00 24 */ beq lbl_80247164 @@ -881,22 +881,22 @@ lbl_80247C98: /* 80247C9C 00244BDC 2C 1A 00 06 */ cmpwi r26, 6 /* 80247CA0 00244BE0 3B BD 00 04 */ addi r29, r29, 4 /* 80247CA4 00244BE4 41 80 FF 98 */ blt lbl_80247C3C -/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CB0 00244BF0 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 80247CB4 00244BF4 81 83 00 00 */ lwz r12, 0(r3) /* 80247CB8 00244BF8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80247CBC 00244BFC 7D 89 03 A6 */ mtctr r12 /* 80247CC0 00244C00 4E 80 04 21 */ bctrl -/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CCC 00244C0C 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80247CD0 00244C10 81 83 00 00 */ lwz r12, 0(r3) /* 80247CD4 00244C14 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80247CD8 00244C18 7D 89 03 A6 */ mtctr r12 /* 80247CDC 00244C1C 4E 80 04 21 */ bctrl -/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CE8 00244C28 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 80247CEC 00244C2C 81 83 00 00 */ lwz r12, 0(r3) /* 80247CF0 00244C30 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -999,8 +999,8 @@ lbl_80247E20: /* 80247E60 00244DA0 39 61 00 50 */ addi r11, r1, 0x50 /* 80247E64 00244DA4 48 11 A3 59 */ bl func_803621BC /* 80247E68 00244DA8 7C 78 1B 78 */ mr r24, r3 -/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247E74 00244DB4 83 63 5F 50 */ lwz r27, 0x5f50(r3) /* 80247E78 00244DB8 7F 63 DB 78 */ mr r3, r27 /* 80247E7C 00244DBC 81 9B 00 00 */ lwz r12, 0(r27) @@ -1018,8 +1018,8 @@ lbl_80247E20: /* 80247EAC 00244DEC 3A E0 00 00 */ li r23, 0 /* 80247EB0 00244DF0 3A C0 00 00 */ li r22, 0 /* 80247EB4 00244DF4 3A A0 00 00 */ li r21, 0 -/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80247EC0 00244E00 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80247EC4 00244E04 3B C3 02 8C */ addi r30, r3, lbl_8043028C@l /* 80247EC8 00244E08 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1120,8 +1120,8 @@ lbl_8024801C: /* 80248024 00244F64 41 80 FE B0 */ blt lbl_80247ED4 /* 80248028 00244F68 48 00 00 60 */ b lbl_80248088 lbl_8024802C: -/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80248034 00244F74 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80248038 00244F78 88 03 01 9A */ lbz r0, 0x19a(r3) /* 8024803C 00244F7C 28 00 00 08 */ cmplwi r0, 8 @@ -1368,8 +1368,8 @@ lbl_802483C0: /* 802483C0 00245300 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802483C4 00245304 28 00 00 03 */ cmplwi r0, 3 /* 802483C8 00245308 40 82 01 A4 */ bne lbl_8024856C -/* 802483CC 0024530C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802483CC 0024530C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802483D4 00245314 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802483D8 00245318 38 63 05 38 */ addi r3, r3, 0x538 /* 802483DC 0024531C 38 81 00 44 */ addi r4, r1, 0x44 @@ -1579,8 +1579,8 @@ lbl_802486B4: /* 802486D8 00245618 C0 42 B3 40 */ lfs f2, lbl_80454D40-_SDA2_BASE_(r2) /* 802486DC 0024561C 4B FF 16 BD */ bl dMsgScrn3Select_c_NS_translate lbl_802486E0: -/* 802486E0 00245620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802486E0 00245620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802486E8 00245628 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 802486EC 0024562C 28 00 00 02 */ cmplwi r0, 2 /* 802486F0 00245630 41 82 00 0C */ beq lbl_802486FC diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 69cbf12831..afd12b2e1e 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -52,8 +52,8 @@ lbl_802489E8: /* 802489F0 00245930 3C 80 80 3A */ lis r4, lbl_80399C30@ha /* 802489F4 00245934 38 84 9C 30 */ addi r4, r4, lbl_80399C30@l /* 802489F8 00245938 3C A0 01 02 */ lis r5, 0x102 -/* 802489FC 0024593C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, lbl_804061C0@l +/* 802489FC 0024593C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, g_dComIfG_gameInfo@l /* 80248A04 00245944 80 DB 5C 74 */ lwz r6, 0x5c74(r27) /* 80248A08 00245948 48 0A FC 41 */ bl J2DScreen_NS_setPriority /* 80248A0C 0024594C 80 7F 00 04 */ lwz r3, 4(r31) @@ -506,8 +506,8 @@ lbl_802490B4: /* 802490B8 00245FF8 2C 1B 00 03 */ cmpwi r27, 3 /* 802490BC 00245FFC 3B BD 00 04 */ addi r29, r29, 4 /* 802490C0 00246000 41 80 FF 9C */ blt lbl_8024905C -/* 802490C4 00246004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802490C4 00246004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802490CC 0024600C 80 63 5C 74 */ lwz r3, 0x5c74(r3) /* 802490D0 00246010 81 83 00 00 */ lwz r12, 0(r3) /* 802490D4 00246014 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -623,8 +623,8 @@ lbl_8024922C: /* 8024927C 002461BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80249280 002461C0 93 C1 00 08 */ stw r30, 8(r1) /* 80249284 002461C4 7C 7E 1B 78 */ mr r30, r3 -/* 80249288 002461C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249288 002461C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249290 002461D0 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80249294 002461D4 7F E3 FB 78 */ mr r3, r31 /* 80249298 002461D8 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 23bf4e779e..d0e401c29b 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -217,8 +217,8 @@ lbl_8024969C: /* 802496AC 002465EC 80 03 00 10 */ lwz r0, 0x10(r3) /* 802496B0 002465F0 28 00 00 00 */ cmplwi r0, 0 /* 802496B4 002465F4 40 82 00 20 */ bne lbl_802496D4 -/* 802496B8 002465F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802496BC 002465FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802496B8 002465F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802496BC 002465FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802496C0 00246600 80 63 5C F4 */ lwz r3, 0x5cf4(r3) /* 802496C4 00246604 81 83 00 00 */ lwz r12, 0(r3) /* 802496C8 00246608 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -252,8 +252,8 @@ dMsgStringBase_c_NS_getResource: /* 80249724 00246664 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 80249728 00246668 28 00 00 00 */ cmplwi r0, 0 /* 8024972C 0024666C 40 82 00 28 */ bne lbl_80249754 -/* 80249730 00246670 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80249734 00246674 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249730 00246670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80249734 00246674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249738 00246678 80 A3 5C F4 */ lwz r5, 0x5cf4(r3) /* 8024973C 0024667C 3C 60 52 4F */ lis r3, 0x524F4F54@ha /* 80249740 00246680 38 63 4F 54 */ addi r3, r3, 0x524F4F54@l diff --git a/asm/d/ovlp/d_ovlp_fade.s b/asm/d/ovlp/d_ovlp_fade.s index e9752e04bb..6232b5e9b7 100644 --- a/asm/d/ovlp/d_ovlp_fade.s +++ b/asm/d/ovlp/d_ovlp_fade.s @@ -133,8 +133,8 @@ dOvlpFd_FadeIn: /* 80252334 0024F274 2C 03 00 04 */ cmpwi r3, 4 /* 80252338 0024F278 40 82 00 60 */ bne lbl_80252398 lbl_8025233C: -/* 8025233C 0024F27C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252340 0024F280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025233C 0024F27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252340 0024F280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252344 0024F284 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 80252348 0024F288 2C 00 00 01 */ cmpwi r0, 1 /* 8025234C 0024F28C 40 82 00 08 */ bne lbl_80252354 diff --git a/asm/d/ovlp/d_ovlp_fade2.s b/asm/d/ovlp/d_ovlp_fade2.s index 37e2eb8043..2539748630 100644 --- a/asm/d/ovlp/d_ovlp_fade2.s +++ b/asm/d/ovlp/d_ovlp_fade2.s @@ -303,8 +303,8 @@ /* 80252920 0024F860 B0 05 80 00 */ sth r0, -0x8000(r5) /* 80252924 0024F864 98 85 80 00 */ stb r4, -0x8000(r5) /* 80252928 0024F868 98 65 80 00 */ stb r3, -0x8000(r5) -/* 8025292C 0024F86C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252930 0024F870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025292C 0024F86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252930 0024F870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252934 0024F874 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80252938 0024F878 C0 02 B4 24 */ lfs f0, lbl_80454E24-_SDA2_BASE_(r2) /* 8025293C 0024F87C D0 01 00 14 */ stfs f0, 0x14(r1) @@ -350,8 +350,8 @@ dOvlpFd2_c: /* 802529D0 0024F910 80 05 00 08 */ lwz r0, 8(r5) /* 802529D4 0024F914 90 03 00 D4 */ stw r0, 0xd4(r3) /* 802529D8 0024F918 38 00 00 00 */ li r0, 0 -/* 802529DC 0024F91C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802529E0 0024F920 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802529DC 0024F91C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802529E0 0024F920 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802529E4 0024F924 98 04 5E B8 */ stb r0, 0x5eb8(r4) /* 802529E8 0024F928 38 00 00 02 */ li r0, 2 /* 802529EC 0024F92C 98 03 01 1D */ stb r0, 0x11d(r3) @@ -382,8 +382,8 @@ dOvlpFd2_c: /* 80252A50 0024F990 98 1F 01 1D */ stb r0, 0x11d(r31) lbl_80252A54: /* 80252A54 0024F994 38 00 00 00 */ li r0, 0 -/* 80252A58 0024F998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252A5C 0024F99C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252A58 0024F998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252A5C 0024F99C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252A60 0024F9A0 98 03 5D 44 */ stb r0, 0x5d44(r3) lbl_80252A64: /* 80252A64 0024F9A4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -397,8 +397,8 @@ lbl_80252A64: /* 80252A84 0024F9C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80252A88 0024F9C8 7C 7F 1B 78 */ mr r31, r3 /* 80252A8C 0024F9CC 38 00 00 00 */ li r0, 0 -/* 80252A90 0024F9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252A94 0024F9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252A90 0024F9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252A94 0024F9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252A98 0024F9D8 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80252A9C 0024F9DC 38 7F 01 12 */ addi r3, r31, 0x112 /* 80252AA0 0024F9E0 38 80 07 D0 */ li r4, 0x7d0 @@ -502,8 +502,8 @@ lbl_80252B8C: /* 80252C18 0024FB58 38 80 00 00 */ li r4, 0 /* 80252C1C 0024FB5C 98 9F 01 1C */ stb r4, 0x11c(r31) /* 80252C20 0024FB60 38 00 00 01 */ li r0, 1 -/* 80252C24 0024FB64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252C28 0024FB68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252C24 0024FB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252C28 0024FB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252C2C 0024FB6C 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80252C30 0024FB70 98 83 5E B8 */ stb r4, 0x5eb8(r3) /* 80252C34 0024FB74 3C 60 80 3C */ lis r3, lbl_803C2D14@ha @@ -547,15 +547,15 @@ lbl_80252CC4: /* 80252CC4 0024FC04 7F E3 FB 78 */ mr r3, r31 /* 80252CC8 0024FC08 4B DC B8 55 */ bl fopOvlpM_Done /* 80252CCC 0024FC0C 38 00 00 01 */ li r0, 1 -/* 80252CD0 0024FC10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252CD4 0024FC14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252CD0 0024FC10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252CD4 0024FC14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252CD8 0024FC18 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80252CDC 0024FC1C 98 03 5E B8 */ stb r0, 0x5eb8(r3) /* 80252CE0 0024FC20 48 00 00 18 */ b lbl_80252CF8 lbl_80252CE4: /* 80252CE4 0024FC24 38 00 00 00 */ li r0, 0 -/* 80252CE8 0024FC28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252CEC 0024FC2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252CE8 0024FC28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252CEC 0024FC2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252CF0 0024FC30 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80252CF4 0024FC34 4B DC B7 91 */ bl fopOvlpM_SceneIsStop lbl_80252CF8: @@ -572,8 +572,8 @@ lbl_80252CF8: /* 80252D20 0024FC60 88 03 01 1C */ lbz r0, 0x11c(r3) /* 80252D24 0024FC64 28 00 00 00 */ cmplwi r0, 0 /* 80252D28 0024FC68 40 82 00 2C */ bne lbl_80252D54 -/* 80252D2C 0024FC6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252D30 0024FC70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252D2C 0024FC6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252D30 0024FC70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252D34 0024FC74 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80252D38 0024FC78 38 83 02 3C */ addi r4, r3, 0x23c /* 80252D3C 0024FC7C 38 A3 02 40 */ addi r5, r3, 0x240 @@ -583,8 +583,8 @@ lbl_80252CF8: /* 80252D4C 0024FC8C 98 1F 01 1C */ stb r0, 0x11c(r31) /* 80252D50 0024FC90 48 00 00 98 */ b lbl_80252DE8 lbl_80252D54: -/* 80252D54 0024FC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252D58 0024FC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252D54 0024FC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252D58 0024FC98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252D5C 0024FC9C 88 03 5D 44 */ lbz r0, 0x5d44(r3) /* 80252D60 0024FCA0 2C 00 00 00 */ cmpwi r0, 0 /* 80252D64 0024FCA4 40 82 00 84 */ bne lbl_80252DE8 @@ -613,8 +613,8 @@ lbl_80252D54: /* 80252DC0 0024FD00 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80252DC4 0024FD04 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80252DC8 0024FD08 48 0F 36 E9 */ bl PSMTXCopy -/* 80252DCC 0024FD0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80252DD0 0024FD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80252DCC 0024FD0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80252DD0 0024FD10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80252DD4 0024FD14 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80252DD8 0024FD18 38 83 02 3C */ addi r4, r3, 0x23c /* 80252DDC 0024FD1C 38 A3 02 40 */ addi r5, r3, 0x240 diff --git a/asm/d/ovlp/d_ovlp_fade3.s b/asm/d/ovlp/d_ovlp_fade3.s index 850ba1e938..74a16ec6f9 100644 --- a/asm/d/ovlp/d_ovlp_fade3.s +++ b/asm/d/ovlp/d_ovlp_fade3.s @@ -324,8 +324,8 @@ /* 802533CC 0025030C B0 05 80 00 */ sth r0, -0x8000(r5) /* 802533D0 00250310 98 85 80 00 */ stb r4, -0x8000(r5) /* 802533D4 00250314 98 65 80 00 */ stb r3, -0x8000(r5) -/* 802533D8 00250318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802533DC 0025031C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802533D8 00250318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802533DC 0025031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802533E0 00250320 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 802533E4 00250324 C0 02 B4 5C */ lfs f0, lbl_80454E5C-_SDA2_BASE_(r2) /* 802533E8 00250328 D0 01 00 14 */ stfs f0, 0x14(r1) @@ -376,8 +376,8 @@ dOvlpFd3_c: /* 80253490 002503D0 80 04 00 08 */ lwz r0, 8(r4) /* 80253494 002503D4 90 1F 00 D4 */ stw r0, 0xd4(r31) /* 80253498 002503D8 38 00 00 00 */ li r0, 0 -/* 8025349C 002503DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802534A0 002503E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025349C 002503DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802534A0 002503E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802534A4 002503E4 98 03 5E B8 */ stb r0, 0x5eb8(r3) /* 802534A8 002503E8 38 00 00 02 */ li r0, 2 /* 802534AC 002503EC 98 1F 01 1D */ stb r0, 0x11d(r31) @@ -439,8 +439,8 @@ lbl_80253500: /* 80253584 002504C4 98 1F 01 1D */ stb r0, 0x11d(r31) lbl_80253588: /* 80253588 002504C8 38 00 00 00 */ li r0, 0 -/* 8025358C 002504CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80253590 002504D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025358C 002504CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80253590 002504D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80253594 002504D4 98 03 5D 44 */ stb r0, 0x5d44(r3) lbl_80253598: /* 80253598 002504D8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -454,8 +454,8 @@ lbl_80253598: /* 802535B8 002504F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802535BC 002504FC 7C 7F 1B 78 */ mr r31, r3 /* 802535C0 00250500 38 00 00 00 */ li r0, 0 -/* 802535C4 00250504 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802535C8 00250508 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802535C4 00250504 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802535C8 00250508 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802535CC 0025050C 98 04 5D 44 */ stb r0, 0x5d44(r4) /* 802535D0 00250510 88 03 01 1D */ lbz r0, 0x11d(r3) /* 802535D4 00250514 7C 00 07 75 */ extsb. r0, r0 @@ -533,8 +533,8 @@ lbl_80253678: /* 802536E4 00250624 7C 03 02 14 */ add r0, r3, r0 /* 802536E8 00250628 B0 1F 01 10 */ sth r0, 0x110(r31) /* 802536EC 0025062C 38 00 00 01 */ li r0, 1 -/* 802536F0 00250630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802536F4 00250634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802536F0 00250630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802536F4 00250634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802536F8 00250638 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 802536FC 0025063C 3C 60 80 3C */ lis r3, lbl_803C2D94@ha /* 80253700 00250640 38 83 2D 94 */ addi r4, r3, lbl_803C2D94@l @@ -573,8 +573,8 @@ lbl_8025377C: /* 8025377C 002506BC 7F E3 FB 78 */ mr r3, r31 /* 80253780 002506C0 4B DC AD 9D */ bl fopOvlpM_Done /* 80253784 002506C4 38 00 00 01 */ li r0, 1 -/* 80253788 002506C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025378C 002506CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80253788 002506C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025378C 002506CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80253790 002506D0 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80253794 002506D4 98 03 5E B8 */ stb r0, 0x5eb8(r3) lbl_80253798: @@ -594,8 +594,8 @@ lbl_80253798: /* 802537CC 0025070C 88 1F 01 1C */ lbz r0, 0x11c(r31) /* 802537D0 00250710 28 00 00 00 */ cmplwi r0, 0 /* 802537D4 00250714 40 82 00 2C */ bne lbl_80253800 -/* 802537D8 00250718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802537DC 0025071C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802537D8 00250718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802537DC 0025071C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802537E0 00250720 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 802537E4 00250724 38 83 02 3C */ addi r4, r3, 0x23c /* 802537E8 00250728 38 A3 02 40 */ addi r5, r3, 0x240 @@ -605,8 +605,8 @@ lbl_80253798: /* 802537F8 00250738 98 1F 01 1C */ stb r0, 0x11c(r31) /* 802537FC 0025073C 48 00 00 6C */ b lbl_80253868 lbl_80253800: -/* 80253800 00250740 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80253804 00250744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80253800 00250740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80253804 00250744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80253808 00250748 88 03 5D 44 */ lbz r0, 0x5d44(r3) /* 8025380C 0025074C 2C 00 00 00 */ cmpwi r0, 0 /* 80253810 00250750 40 82 00 58 */ bne lbl_80253868 @@ -624,8 +624,8 @@ lbl_80253800: /* 80253840 00250780 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80253844 00250784 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80253848 00250788 48 0F 2C 69 */ bl PSMTXCopy -/* 8025384C 0025078C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80253850 00250790 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025384C 0025078C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80253850 00250790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80253854 00250794 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80253858 00250798 38 83 02 3C */ addi r4, r3, 0x23c /* 8025385C 0025079C 38 A3 02 40 */ addi r5, r3, 0x240 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index c97745008c..30dd434eab 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -41,8 +41,8 @@ dPaPo_c_NS_checkWaterIn: /* 80050D14 0004DC54 80 04 00 2C */ lwz r0, 0x2c(r4) /* 80050D18 0004DC58 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80050D1C 0004DC5C 41 82 01 24 */ beq lbl_80050E40 -/* 80050D20 0004DC60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80050D24 0004DC64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80050D20 0004DC60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80050D24 0004DC64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80050D28 0004DC68 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 80050D2C 0004DC6C 7F 23 CB 78 */ mr r3, r25 /* 80050D30 0004DC70 38 84 01 80 */ addi r4, r4, 0x180 @@ -89,8 +89,8 @@ lbl_80050DC8: /* 80050DD0 0004DD10 40 80 00 3C */ bge lbl_80050E0C /* 80050DD4 0004DD14 57 C0 03 9D */ rlwinm. r0, r30, 0, 0xe, 0xe /* 80050DD8 0004DD18 40 82 00 34 */ bne lbl_80050E0C -/* 80050DDC 0004DD1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80050DE0 0004DD20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80050DDC 0004DD1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80050DE0 0004DD20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80050DE4 0004DD24 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80050DE8 0004DD28 7F 44 D3 78 */ mr r4, r26 /* 80050DEC 0004DD2C 80 BA 00 28 */ lwz r5, 0x28(r26) @@ -177,8 +177,8 @@ lbl_80050EFC: /* 80050F00 0004DE40 38 00 00 00 */ li r0, 0 /* 80050F04 0004DE44 90 01 00 0C */ stw r0, 0xc(r1) /* 80050F08 0004DE48 90 C1 00 10 */ stw r6, 0x10(r1) -/* 80050F0C 0004DE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80050F10 0004DE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80050F0C 0004DE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80050F10 0004DE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80050F14 0004DE54 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80050F18 0004DE58 7C E6 3B 78 */ mr r6, r7 /* 80050F1C 0004DE5C 38 E1 00 18 */ addi r7, r1, 0x18 @@ -226,8 +226,8 @@ lbl_80050FA4: /* 80050FB4 0004DEF4 98 1F 00 00 */ stb r0, 0(r31) /* 80050FB8 0004DEF8 7C 9F 23 78 */ mr r31, r4 /* 80050FBC 0004DEFC 3B A0 00 00 */ li r29, 0 -/* 80050FC0 0004DF00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80050FC4 0004DF04 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80050FC0 0004DF00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80050FC4 0004DF04 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80050FC8: /* 80050FC8 0004DF08 80 9F 00 00 */ lwz r4, 0(r31) /* 80050FCC 0004DF0C 28 04 00 00 */ cmplwi r4, 0 @@ -570,8 +570,8 @@ dPaPoF_c_NS_clearFourAllID: /* 80051498 0004E3D8 7C 08 02 A6 */ mflr r0 /* 8005149C 0004E3DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800514A0 0004E3E0 7C 66 1B 78 */ mr r6, r3 -/* 800514A4 0004E3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800514A8 0004E3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800514A4 0004E3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800514A8 0004E3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800514AC 0004E3EC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800514B0 0004E3F0 38 63 02 10 */ addi r3, r3, 0x210 /* 800514B4 0004E3F4 54 80 20 36 */ slwi r0, r4, 4 @@ -588,8 +588,8 @@ dPaPoF_c_NS_clearFourAllID: /* 800514E0 0004E420 7C 08 02 A6 */ mflr r0 /* 800514E4 0004E424 90 01 00 14 */ stw r0, 0x14(r1) /* 800514E8 0004E428 7C 66 1B 78 */ mr r6, r3 -/* 800514EC 0004E42C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800514F0 0004E430 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800514EC 0004E42C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800514F0 0004E430 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800514F4 0004E434 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800514F8 0004E438 38 63 02 10 */ addi r3, r3, 0x210 /* 800514FC 0004E43C 54 80 20 36 */ slwi r0, r4, 4 @@ -606,8 +606,8 @@ dPaPoF_c_NS_clearFourAllID: /* 80051528 0004E468 7C 08 02 A6 */ mflr r0 /* 8005152C 0004E46C 90 01 00 14 */ stw r0, 0x14(r1) /* 80051530 0004E470 7C 66 1B 78 */ mr r6, r3 -/* 80051534 0004E474 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051538 0004E478 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051534 0004E474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051538 0004E478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005153C 0004E47C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80051540 0004E480 38 63 02 10 */ addi r3, r3, 0x210 /* 80051544 0004E484 54 80 20 36 */ slwi r0, r4, 4 @@ -630,8 +630,8 @@ dPaPoF_c_NS_clearFourAllID: /* 80051588 0004E4C8 7C 08 02 A6 */ mflr r0 /* 8005158C 0004E4CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80051590 0004E4D0 7C 66 1B 78 */ mr r6, r3 -/* 80051594 0004E4D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80051598 0004E4D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80051594 0004E4D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80051598 0004E4D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005159C 0004E4DC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800515A0 0004E4E0 38 63 02 10 */ addi r3, r3, 0x210 /* 800515A4 0004E4E4 54 80 20 36 */ slwi r0, r4, 4 @@ -648,8 +648,8 @@ dPaPoF_c_NS_clearFourAllID: /* 800515D0 0004E510 7C 08 02 A6 */ mflr r0 /* 800515D4 0004E514 90 01 00 14 */ stw r0, 0x14(r1) /* 800515D8 0004E518 7C 66 1B 78 */ mr r6, r3 -/* 800515DC 0004E51C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800515E0 0004E520 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800515DC 0004E51C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800515E0 0004E520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800515E4 0004E524 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800515E8 0004E528 38 63 02 10 */ addi r3, r3, 0x210 /* 800515EC 0004E52C 54 80 20 36 */ slwi r0, r4, 4 diff --git a/asm/d/s/d_s_logo.s b/asm/d/s/d_s_logo.s index c96cef0ed0..52e35d930c 100644 --- a/asm/d/s/d_s_logo.s +++ b/asm/d/s/d_s_logo.s @@ -142,8 +142,8 @@ dScnLogo_c_NS_draw: /* 80256270 002531B0 39 61 00 20 */ addi r11, r1, 0x20 /* 80256274 002531B4 48 10 BF 65 */ bl _savegpr_28 /* 80256278 002531B8 7C 7C 1B 78 */ mr r28, r3 -/* 8025627C 002531BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256280 002531C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025627C 002531BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256280 002531C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256284 002531C4 3B E3 5F 64 */ addi r31, r3, 0x5f64 /* 80256288 002531C8 7F E3 FB 78 */ mr r3, r31 /* 8025628C 002531CC 3B BF 01 B4 */ addi r29, r31, 0x1b4 @@ -189,8 +189,8 @@ lbl_80256304: /* 80256328 00253268 39 61 00 90 */ addi r11, r1, 0x90 /* 8025632C 0025326C 48 10 BE AD */ bl _savegpr_28 /* 80256330 00253270 7C 7D 1B 78 */ mr r29, r3 -/* 80256334 00253274 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256338 00253278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256334 00253274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256338 00253278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025633C 0025327C 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 80256340 00253280 7F C3 F3 78 */ mr r3, r30 /* 80256344 00253284 3B 9E 01 B4 */ addi r28, r30, 0x1b4 @@ -577,8 +577,8 @@ lbl_802568C8: /* 802568EC 0025382C 39 61 00 20 */ addi r11, r1, 0x20 /* 802568F0 00253830 48 10 B8 E9 */ bl _savegpr_28 /* 802568F4 00253834 7C 7F 1B 78 */ mr r31, r3 -/* 802568F8 00253838 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802568FC 0025383C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802568F8 00253838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802568FC 0025383C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256900 00253840 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 80256904 00253844 7F C3 F3 78 */ mr r3, r30 /* 80256908 00253848 3B 9E 01 B4 */ addi r28, r30, 0x1b4 @@ -668,8 +668,8 @@ lbl_80256A24: /* 80256A44 00253984 90 01 00 14 */ stw r0, 0x14(r1) /* 80256A48 00253988 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256A4C 0025398C 7C 7F 1B 78 */ mr r31, r3 -/* 80256A50 00253990 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256A54 00253994 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256A50 00253990 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256A54 00253994 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256A58 00253998 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256A5C 0025399C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256A60 002539A0 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -702,8 +702,8 @@ lbl_80256AAC: /* 80256AC8 00253A08 90 01 00 14 */ stw r0, 0x14(r1) /* 80256ACC 00253A0C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256AD0 00253A10 7C 7F 1B 78 */ mr r31, r3 -/* 80256AD4 00253A14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256AD8 00253A18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256AD4 00253A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256AD8 00253A18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256ADC 00253A1C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256AE0 00253A20 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256AE4 00253A24 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -786,8 +786,8 @@ lbl_80256BE0: /* 80256BFC 00253B3C 90 01 00 14 */ stw r0, 0x14(r1) /* 80256C00 00253B40 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256C04 00253B44 7C 7F 1B 78 */ mr r31, r3 -/* 80256C08 00253B48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256C0C 00253B4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256C08 00253B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256C0C 00253B4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256C10 00253B50 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256C14 00253B54 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256C18 00253B58 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -817,8 +817,8 @@ lbl_80256C54: /* 80256C74 00253BB4 39 61 00 30 */ addi r11, r1, 0x30 /* 80256C78 00253BB8 48 10 B5 61 */ bl _savegpr_28 /* 80256C7C 00253BBC 7C 7F 1B 78 */ mr r31, r3 -/* 80256C80 00253BC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256C84 00253BC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256C80 00253BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256C84 00253BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256C88 00253BC8 3B C3 5F 64 */ addi r30, r3, 0x5f64 /* 80256C8C 00253BCC 7F C3 F3 78 */ mr r3, r30 /* 80256C90 00253BD0 3B 9E 01 B4 */ addi r28, r30, 0x1b4 @@ -909,8 +909,8 @@ lbl_80256DAC: /* 80256DCC 00253D0C 90 01 00 14 */ stw r0, 0x14(r1) /* 80256DD0 00253D10 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256DD4 00253D14 7C 7F 1B 78 */ mr r31, r3 -/* 80256DD8 00253D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256DDC 00253D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256DD8 00253D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256DDC 00253D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256DE0 00253D20 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256DE4 00253D24 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256DE8 00253D28 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -943,8 +943,8 @@ lbl_80256E34: /* 80256E50 00253D90 90 01 00 14 */ stw r0, 0x14(r1) /* 80256E54 00253D94 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256E58 00253D98 7C 7F 1B 78 */ mr r31, r3 -/* 80256E5C 00253D9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256E60 00253DA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256E5C 00253D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256E60 00253DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256E64 00253DA4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256E68 00253DA8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256E6C 00253DAC 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -977,8 +977,8 @@ lbl_80256EB8: /* 80256ED4 00253E14 90 01 00 14 */ stw r0, 0x14(r1) /* 80256ED8 00253E18 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256EDC 00253E1C 7C 7F 1B 78 */ mr r31, r3 -/* 80256EE0 00253E20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256EE4 00253E24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256EE0 00253E20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256EE4 00253E24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256EE8 00253E28 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256EEC 00253E2C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256EF0 00253E30 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -1011,8 +1011,8 @@ lbl_80256F3C: /* 80256F58 00253E98 90 01 00 14 */ stw r0, 0x14(r1) /* 80256F5C 00253E9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256F60 00253EA0 7C 7F 1B 78 */ mr r31, r3 -/* 80256F64 00253EA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256F68 00253EA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256F64 00253EA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256F68 00253EA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256F6C 00253EAC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256F70 00253EB0 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256F74 00253EB4 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -1045,8 +1045,8 @@ lbl_80256FC0: /* 80256FDC 00253F1C 90 01 00 14 */ stw r0, 0x14(r1) /* 80256FE0 00253F20 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256FE4 00253F24 7C 7F 1B 78 */ mr r31, r3 -/* 80256FE8 00253F28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80256FEC 00253F2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80256FE8 00253F28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80256FEC 00253F2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80256FF0 00253F30 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80256FF4 00253F34 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256FF8 00253F38 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -1085,8 +1085,8 @@ lbl_80257044: /* 80257078 00253FB8 90 01 00 14 */ stw r0, 0x14(r1) /* 8025707C 00253FBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80257080 00253FC0 7C 7F 1B 78 */ mr r31, r3 -/* 80257084 00253FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80257088 00253FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80257084 00253FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80257088 00253FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025708C 00253FCC 3C 63 00 02 */ addis r3, r3, 2 /* 80257090 00253FD0 38 80 00 80 */ li r4, 0x80 /* 80257094 00253FD4 38 63 C2 F8 */ addi r3, r3, -15624 @@ -1356,8 +1356,8 @@ lbl_80257474: /* 80257478 002543B8 4B FF EC 81 */ bl dScnLogo_c_NS_preLoad_dyl_remove /* 8025747C 002543BC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257480 002543C0 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l -/* 80257484 002543C4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80257488 002543C8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80257484 002543C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80257488 002543C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025748C 002543CC 3F C4 00 02 */ addis r30, r4, 2 /* 80257490 002543D0 3B DE C2 F8 */ addi r30, r30, -15624 /* 80257494 002543D4 7F C4 F3 78 */ mr r4, r30 @@ -1372,14 +1372,14 @@ lbl_80257474: /* 802574B8 002543F8 48 07 70 49 */ bl free__7JKRHeapFPvP7JKRHeap /* 802574BC 002543FC 80 7F 02 9C */ lwz r3, 0x29c(r31) /* 802574C0 00254400 80 83 00 1C */ lwz r4, 0x1c(r3) -/* 802574C4 00254404 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802574C8 00254408 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802574C4 00254404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802574C8 00254408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802574CC 0025440C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 802574D0 00254410 4B DF 46 A9 */ bl dPa_control_c_NS_createCommon /* 802574D4 00254414 80 7F 02 20 */ lwz r3, 0x220(r31) /* 802574D8 00254418 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802574DC 0025441C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802574E0 00254420 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 802574DC 0025441C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802574E0 00254420 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 802574E4 00254424 90 05 5C 68 */ stw r0, 0x5c68(r5) /* 802574E8 00254428 80 7F 02 24 */ lwz r3, 0x224(r31) /* 802574EC 0025442C 80 03 00 1C */ lwz r0, 0x1c(r3) @@ -1432,8 +1432,8 @@ lbl_8025758C: /* 802575A4 002544E4 42 00 FF E8 */ bdnz lbl_8025758C /* 802575A8 002544E8 80 7F 02 90 */ lwz r3, 0x290(r31) /* 802575AC 002544EC 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 802575B0 002544F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802575B4 002544F4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 802575B0 002544F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802575B4 002544F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 802575B8 002544F8 90 04 5C A4 */ stw r0, 0x5ca4(r4) /* 802575BC 002544FC 80 7F 02 98 */ lwz r3, 0x298(r31) /* 802575C0 00254500 80 03 00 1C */ lwz r0, 0x1c(r3) @@ -1625,8 +1625,8 @@ lbl_80257830: /* 8025785C 0025479C 4B DB D5 01 */ bl mDoExt_setAraCacheSize /* 80257860 002547A0 80 7F 02 A0 */ lwz r3, 0x2a0(r31) /* 80257864 002547A4 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80257868 002547A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025786C 002547AC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80257868 002547A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025786C 002547AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80257870 002547B0 90 04 5F 54 */ stw r0, 0x5f54(r4) /* 80257874 002547B4 28 03 00 00 */ cmplwi r3, 0 /* 80257878 002547B8 41 82 00 18 */ beq lbl_80257890 @@ -1687,8 +1687,8 @@ lbl_802578F4: /* 80257948 00254888 98 03 00 0E */ stb r0, 0xe(r3) /* 8025794C 0025488C 88 01 00 0B */ lbz r0, 0xb(r1) /* 80257950 00254890 98 03 00 0F */ stb r0, 0xf(r3) -/* 80257954 00254894 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80257958 00254898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80257954 00254894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80257958 00254898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025795C 0025489C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80257960 002548A0 4B DD 50 79 */ bl dComIfG_play_c_NS_createParticle /* 80257964 002548A4 4B DB 73 ED */ bl mDoExt_getGameHeap @@ -1738,8 +1738,8 @@ lbl_80257A04: lbl_80257A0C: /* 80257A0C 0025494C 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257A10 00254950 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l -/* 80257A14 00254954 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80257A18 00254958 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80257A14 00254954 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80257A18 00254958 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80257A1C 0025495C 3C 84 00 02 */ addis r4, r4, 2 /* 80257A20 00254960 38 A0 00 80 */ li r5, 0x80 /* 80257A24 00254964 38 C3 00 0E */ addi r6, r3, 0xe @@ -1765,8 +1765,8 @@ lbl_80257A5C: /* 80257A70 002549B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80257A74 002549B4 7C 08 02 A6 */ mflr r0 /* 80257A78 002549B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80257A7C 002549BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80257A80 002549C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80257A7C 002549BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80257A80 002549C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80257A84 002549C4 3C 63 00 02 */ addis r3, r3, 2 /* 80257A88 002549C8 38 80 00 80 */ li r4, 0x80 /* 80257A8C 002549CC 38 63 C2 F8 */ addi r3, r3, -15624 @@ -1914,8 +1914,8 @@ dScnLogo_c_NS_logoInitGC: /* 80257C7C 00254BBC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257C80 00254BC0 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80257C84 00254BC4 38 80 00 04 */ li r4, 4 -/* 80257C88 00254BC8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80257C8C 00254BCC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80257C88 00254BC8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80257C8C 00254BCC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80257C90 00254BD0 3F C5 00 02 */ addis r30, r5, 2 /* 80257C94 00254BD4 3B DE C2 F8 */ addi r30, r30, -15624 /* 80257C98 00254BD8 7F C5 F3 78 */ mr r5, r30 @@ -2151,8 +2151,8 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258004 00254F44 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258008 00254F48 38 C3 9F FC */ addi r6, r3, lbl_80399FFC@l /* 8025800C 00254F4C 38 66 00 07 */ addi r3, r6, 7 -/* 80258010 00254F50 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80258014 00254F54 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80258010 00254F50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80258014 00254F54 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80258018 00254F58 3F C4 00 02 */ addis r30, r4, 2 /* 8025801C 00254F5C 3B DE C2 F8 */ addi r30, r30, -15624 /* 80258020 00254F60 7F C4 F3 78 */ mr r4, r30 @@ -2377,8 +2377,8 @@ dScnLogo_c_NS_dvdDataLoad: /* 8025838C 002552CC 38 C0 00 00 */ li r6, 0 /* 80258390 002552D0 4B DB DE 51 */ bl mDoDvdThd_mountXArchive_c_NS_create /* 80258394 002552D4 90 7F 02 98 */ stw r3, 0x298(r31) -/* 80258398 002552D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025839C 002552DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80258398 002552D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025839C 002552DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802583A0 002552E0 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 802583A4 002552E4 80 A3 00 08 */ lwz r5, 8(r3) /* 802583A8 002552E8 3C 60 80 3A */ lis r3, lbl_80399FFC@ha diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index ada89f76b0..8edd51ae81 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -23,8 +23,8 @@ dSn_HIO_c: /* 802587C8 00255708 38 C0 00 00 */ li r6, 0 /* 802587CC 0025570C 48 05 68 45 */ bl Z2SeqMgr_NS_bgmStart /* 802587D0 00255710 7F E3 FB 78 */ mr r3, r31 -/* 802587D4 00255714 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802587D8 00255718 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802587D4 00255714 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802587D8 00255718 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802587DC 0025571C 3C 84 00 02 */ addis r4, r4, 2 /* 802587E0 00255720 38 A0 00 80 */ li r5, 0x80 /* 802587E4 00255724 3C C0 80 3A */ lis r6, lbl_8039A2A8@ha @@ -46,8 +46,8 @@ lbl_8025880C: /* 80258820 00255760 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258824 00255764 7C 08 02 A6 */ mflr r0 /* 80258828 00255768 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025882C 0025576C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80258830 00255770 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025882C 0025576C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80258830 00255770 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80258834 00255774 3C 84 00 02 */ addis r4, r4, 2 /* 80258838 00255778 38 A0 00 80 */ li r5, 0x80 /* 8025883C 0025577C 38 84 C2 F8 */ addi r4, r4, -15624 @@ -113,8 +113,8 @@ dScnName_c_NS_create: /* 8025890C 0025584C 3C 60 80 3A */ lis r3, lbl_8039A2A8@ha /* 80258910 00255850 38 63 A2 A8 */ addi r3, r3, lbl_8039A2A8@l /* 80258914 00255854 38 63 00 0D */ addi r3, r3, 0xd -/* 80258918 00255858 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025891C 0025585C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80258918 00255858 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025891C 0025585C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80258920 00255860 3C 84 00 02 */ addis r4, r4, 2 /* 80258924 00255864 38 A0 00 80 */ li r5, 0x80 /* 80258928 00255868 38 84 C2 F8 */ addi r4, r4, -15624 @@ -137,8 +137,8 @@ lbl_80258950: /* 80258968 002558A8 38 00 00 00 */ li r0, 0 /* 8025896C 002558AC 80 7D 04 14 */ lwz r3, 0x414(r29) /* 80258970 002558B0 98 03 03 B0 */ stb r0, 0x3b0(r3) -/* 80258974 002558B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80258978 002558B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80258974 002558B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80258978 002558B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025897C 002558BC 98 03 0F 1A */ stb r0, 0xf1a(r3) lbl_80258980: /* 80258980 002558C0 38 60 00 1C */ li r3, 0x1c @@ -158,8 +158,8 @@ lbl_8025899C: /* 802589B4 002558F4 80 7D 01 D0 */ lwz r3, 0x1d0(r29) /* 802589B8 002558F8 48 07 5A 81 */ bl becomeCurrentHeap__7JKRHeapFv /* 802589BC 002558FC 38 00 00 01 */ li r0, 1 -/* 802589C0 00255900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802589C4 00255904 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802589C0 00255900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802589C4 00255904 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802589C8 00255908 98 1F 5D 44 */ stb r0, 0x5d44(r31) /* 802589CC 0025590C 80 8D 80 20 */ lwz r4, lbl_804505A0-_SDA_BASE_(r13) /* 802589D0 00255910 A0 04 00 06 */ lhz r0, 6(r4) @@ -190,8 +190,8 @@ lbl_8025899C: /* 80258A34 00255974 FC 80 F0 90 */ fmr f4, f30 /* 80258A38 00255978 4B DF 90 A5 */ bl dDlst_window_c_NS_setScissor /* 80258A3C 0025597C 38 80 00 00 */ li r4, 0 -/* 80258A40 00255980 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80258A44 00255984 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80258A40 00255980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80258A44 00255984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80258A48 00255988 98 83 5D 70 */ stb r4, 0x5d70(r3) /* 80258A4C 0025598C 38 00 00 02 */ li r0, 2 /* 80258A50 00255990 98 03 5D 71 */ stb r0, 0x5d71(r3) @@ -343,8 +343,8 @@ dScnName_c_NS_draw: /* 80258C64 00255BA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80258C68 00255BA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80258C6C 00255BAC 7C 7F 1B 78 */ mr r31, r3 -/* 80258C70 00255BB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80258C74 00255BB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80258C70 00255BB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80258C74 00255BB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80258C78 00255BB8 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 80258C7C 00255BBC 4B E1 65 ED */ bl dVibration_c_NS_Run /* 80258C80 00255BC0 88 1F 04 1C */ lbz r0, 0x41c(r31) @@ -400,8 +400,8 @@ lbl_80258D28: /* 80258D28 00255C68 3C 60 80 3A */ lis r3, lbl_8039A2A8@ha /* 80258D2C 00255C6C 38 63 A2 A8 */ addi r3, r3, lbl_8039A2A8@l /* 80258D30 00255C70 38 63 00 0D */ addi r3, r3, 0xd -/* 80258D34 00255C74 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80258D38 00255C78 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80258D34 00255C74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80258D38 00255C78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80258D3C 00255C7C 3C 84 00 02 */ addis r4, r4, 2 /* 80258D40 00255C80 38 A0 00 80 */ li r5, 0x80 /* 80258D44 00255C84 38 84 C2 F8 */ addi r4, r4, -15624 @@ -420,8 +420,8 @@ lbl_80258D60: /* 80258D74 00255CB4 2C 1D 00 04 */ cmpwi r29, 4 /* 80258D78 00255CB8 41 80 FF E8 */ blt lbl_80258D60 /* 80258D7C 00255CBC 38 00 00 00 */ li r0, 0 -/* 80258D80 00255CC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80258D84 00255CC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80258D80 00255CC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80258D84 00255CC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80258D88 00255CC8 98 03 5D 44 */ stb r0, 0x5d44(r3) /* 80258D8C 00255CCC 90 03 61 B0 */ stw r0, 0x61b0(r3) /* 80258D90 00255CD0 34 1F 01 D4 */ addic. r0, r31, 0x1d4 @@ -606,15 +606,15 @@ lbl_80258FC0: /* 80259028 00255F68 88 03 00 19 */ lbz r0, 0x19(r3) /* 8025902C 00255F6C 28 00 00 00 */ cmplwi r0, 0 /* 80259030 00255F70 41 82 00 B4 */ beq lbl_802590E4 -/* 80259034 00255F74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259038 00255F78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259034 00255F74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259038 00255F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025903C 00255F7C 80 03 01 A8 */ lwz r0, 0x1a8(r3) /* 80259040 00255F80 80 83 01 AC */ lwz r4, 0x1ac(r3) /* 80259044 00255F84 90 83 0F 34 */ stw r4, 0xf34(r3) /* 80259048 00255F88 90 03 0F 30 */ stw r0, 0xf30(r3) /* 8025904C 00255F8C 48 0E 96 B1 */ bl OSGetTime -/* 80259050 00255F90 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80259054 00255F94 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80259050 00255F90 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80259054 00255F94 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80259058 00255F98 90 85 0F 2C */ stw r4, 0xf2c(r5) /* 8025905C 00255F9C 90 65 0F 28 */ stw r3, 0xf28(r5) /* 80259060 00255FA0 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -626,8 +626,8 @@ lbl_80258FC0: /* 80259078 00255FB8 98 1F 04 1F */ stb r0, 0x41f(r31) /* 8025907C 00255FBC 38 00 00 05 */ li r0, 5 /* 80259080 00255FC0 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80259084 00255FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259088 00255FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259084 00255FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259088 00255FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025908C 00255FCC 3B E3 00 CC */ addi r31, r3, 0xcc /* 80259090 00255FD0 7F E3 FB 78 */ mr r3, r31 /* 80259094 00255FD4 38 80 00 01 */ li r4, 1 @@ -678,8 +678,8 @@ lbl_802590E4: /* 80259144 00256084 38 C0 00 05 */ li r6, 5 /* 80259148 00256088 4B DC 5B 99 */ bl fopScnM_ChangeReq /* 8025914C 0025608C 38 00 00 00 */ li r0, 0 -/* 80259150 00256090 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259154 00256094 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259150 00256090 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259154 00256094 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259158 00256098 98 03 4E 1C */ stb r0, 0x4e1c(r3) /* 8025915C 0025609C 80 7F 04 14 */ lwz r3, 0x414(r31) /* 80259160 002560A0 88 03 02 65 */ lbz r0, 0x265(r3) @@ -697,8 +697,8 @@ lbl_802590E4: lbl_80259190: /* 80259190 002560D0 4B F4 60 D5 */ bl dKy_clear_game_init /* 80259194 002560D4 38 00 FF FF */ li r0, -1 -/* 80259198 002560D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025919C 002560DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259198 002560D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025919C 002560DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802591A0 002560E0 98 03 09 78 */ stb r0, 0x978(r3) /* 802591A4 002560E4 38 00 00 00 */ li r0, 0 /* 802591A8 002560E8 90 03 0D C8 */ stw r0, 0xdc8(r3) @@ -727,8 +727,8 @@ lbl_802591AC: /* 80259200 00256140 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259204 00256144 7C 08 02 A6 */ mflr r0 /* 80259208 00256148 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025920C 0025614C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259210 00256150 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025920C 0025614C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259210 00256150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259214 00256154 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80259218 00256158 4B DF 2E 3D */ bl dPa_control_c_NS_cleanup /* 8025921C 0025615C 38 60 00 01 */ li r3, 1 diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index b05de02a87..e6e8308f8e 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -62,13 +62,13 @@ dScnPly_env_debugHIO_c: /* 802594B8 002563F8 39 61 00 40 */ addi r11, r1, 0x40 /* 802594BC 002563FC 48 10 8D 1D */ bl _savegpr_28 /* 802594C0 00256400 7C 7C 1B 78 */ mr r28, r3 -/* 802594C4 00256404 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802594C8 00256408 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802594C4 00256404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802594C8 00256408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802594CC 0025640C 3B A3 23 3C */ addi r29, r3, 0x233c /* 802594D0 00256410 7F A3 EB 78 */ mr r3, r29 /* 802594D4 00256414 4B E2 DD DD */ bl dCcS_NS_Move -/* 802594D8 00256418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802594DC 0025641C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802594D8 00256418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802594DC 0025641C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802594E0 00256420 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 802594E4 00256424 7F C3 F3 78 */ mr r3, r30 /* 802594E8 00256428 4B E1 B4 55 */ bl dBgS_NS_ClrMoveFlag @@ -79,8 +79,8 @@ dScnPly_env_debugHIO_c: /* 802594FC 0025643C 4B DD 38 49 */ bl dComIfG_resetToOpening /* 80259500 00256440 2C 03 00 00 */ cmpwi r3, 0 /* 80259504 00256444 40 82 01 A8 */ bne lbl_802596AC -/* 80259508 00256448 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025950C 0025644C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259508 00256448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025950C 0025644C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259510 00256450 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 80259514 00256454 7C 00 07 75 */ extsb. r0, r0 /* 80259518 00256458 41 82 01 94 */ beq lbl_802596AC @@ -195,8 +195,8 @@ lbl_8025967C: /* 802596A8 002565E8 98 03 00 0F */ stb r0, 0xf(r3) lbl_802596AC: /* 802596AC 002565EC 4B E4 32 15 */ bl dMdl_mng_c_NS_reset -/* 802596B0 002565F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802596B4 002565F4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802596B0 002565F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802596B4 002565F4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802596B8 002565F8 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) /* 802596BC 002565FC 28 00 00 00 */ cmplwi r0, 0 /* 802596C0 00256600 40 82 00 60 */ bne lbl_80259720 @@ -212,8 +212,8 @@ lbl_802596E4: /* 802596E4 00256624 4B DD 7E C1 */ bl daSus_c_NS_execute /* 802596E8 00256628 7F C3 F3 78 */ mr r3, r30 /* 802596EC 0025662C 4B E1 B2 BD */ bl dBgS_NS_Move -/* 802596F0 00256630 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802596F4 00256634 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 802596F0 00256630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802596F4 00256634 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 802596F8 00256638 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 802596FC 0025663C 4B DF 29 7D */ bl dPa_control_c_NS_calc3D /* 80259700 00256640 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -301,14 +301,14 @@ lbl_80259818: /* 8025982C 0025676C 48 00 00 3C */ b lbl_80259868 lbl_80259830: /* 80259830 00256770 4B F4 F2 A9 */ bl dKy_itudemo_se -/* 80259834 00256774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259838 00256778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259834 00256774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259838 00256778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025983C 0025677C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80259840 00256780 28 00 00 00 */ cmplwi r0, 0 /* 80259844 00256784 40 82 00 20 */ bne lbl_80259864 /* 80259848 00256788 4B DE 05 5D */ bl dDemo_c_NS_update -/* 8025984C 0025678C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259850 00256790 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8025984C 0025678C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259850 00256790 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80259854 00256794 38 7F 4E C8 */ addi r3, r31, 0x4ec8 /* 80259858 00256798 4B DE 93 65 */ bl dEvt_control_c_NS_Step /* 8025985C 0025679C 38 7F 56 B8 */ addi r3, r31, 0x56b8 @@ -324,8 +324,8 @@ lbl_80259868: /* 8025987C 002567BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259880 002567C0 7C 08 02 A6 */ mflr r0 /* 80259884 002567C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259888 002567C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025988C 002567CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259888 002567C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025988C 002567CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259890 002567D0 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80259894 002567D4 4B DF 27 C1 */ bl dPa_control_c_NS_cleanup /* 80259898 002567D8 38 60 00 01 */ li r3, 1 @@ -341,8 +341,8 @@ lbl_80259868: /* 802598C0 00256800 4B DD 7A FD */ bl daSus_c_NS_reset /* 802598C4 00256804 4B DE 63 AD */ bl dMpath_c_NS_remove /* 802598C8 00256808 4B E4 23 99 */ bl dTres_c_NS_remove -/* 802598CC 0025680C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802598D0 00256810 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802598CC 0025680C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802598D0 00256810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802598D4 00256814 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 802598D8 00256818 38 7F 47 80 */ addi r3, r31, 0x4780 /* 802598DC 0025681C 38 80 FF FF */ li r4, -1 @@ -354,20 +354,20 @@ lbl_80259868: /* 802598F4 00256834 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802598F8 00256838 7D 89 03 A6 */ mtctr r12 /* 802598FC 0025683C 4E 80 04 21 */ bctrl -/* 80259900 00256840 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259904 00256844 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259900 00256840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259904 00256844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259908 00256848 38 63 23 3C */ addi r3, r3, 0x233c /* 8025990C 0025684C 4B E2 C5 FD */ bl dCcS_NS_Dt /* 80259910 00256850 4B DC D4 E9 */ bl dStage_Delete /* 80259914 00256854 38 7F 3F 90 */ addi r3, r31, 0x3f90 /* 80259918 00256858 4B DE 98 D1 */ bl dEvt_control_c_NS_remove -/* 8025991C 0025685C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259920 00256860 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025991C 0025685C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259920 00256860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259924 00256864 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80259928 00256868 38 80 00 00 */ li r4, 0 /* 8025992C 0025686C 4B DF 26 A9 */ bl dPa_control_c_NS_removeScene -/* 80259930 00256870 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259934 00256874 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80259930 00256870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259934 00256874 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80259938 00256878 80 7D 5C F8 */ lwz r3, 0x5cf8(r29) /* 8025993C 0025687C 81 83 00 00 */ lwz r12, 0(r3) /* 80259940 00256880 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -379,14 +379,14 @@ lbl_80259868: /* 80259958 00256898 7D 89 03 A6 */ mtctr r12 /* 8025995C 0025689C 4E 80 04 21 */ bctrl /* 80259960 002568A0 4B DD FF B1 */ bl dDemo_c_NS_remove -/* 80259964 002568A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259968 002568A8 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80259964 002568A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259968 002568A8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8025996C 002568AC 80 7D 5E BC */ lwz r3, 0x5ebc(r29) /* 80259970 002568B0 4B DC 6A 71 */ bl fopMsgM_destroyExpHeap /* 80259974 002568B4 38 00 00 00 */ li r0, 0 /* 80259978 002568B8 90 1D 5E BC */ stw r0, 0x5ebc(r29) -/* 8025997C 002568BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259980 002568C0 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8025997C 002568BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259980 002568C0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80259984 002568C4 80 7D 5E C8 */ lwz r3, 0x5ec8(r29) /* 80259988 002568C8 4B DC 6A 59 */ bl fopMsgM_destroyExpHeap /* 8025998C 002568CC 38 00 00 00 */ li r0, 0 @@ -397,8 +397,8 @@ lbl_80259868: /* 802599A0 002568E0 3C 60 80 3E */ lis r3, lbl_803DD428@ha /* 802599A4 002568E4 38 63 D4 28 */ addi r3, r3, lbl_803DD428@l /* 802599A8 002568E8 4B DA FC 51 */ bl mDoGph_gInf_c_NS_bloom_c_NS_remove -/* 802599AC 002568EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802599B0 002568F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802599AC 002568EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802599B0 002568F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802599B4 002568F4 3B C0 00 00 */ li r30, 0 /* 802599B8 002568F8 9B C3 00 7C */ stb r30, 0x7c(r3) /* 802599BC 002568FC 9B C3 5D 44 */ stb r30, 0x5d44(r3) @@ -505,8 +505,8 @@ lbl_80259B10: /* 80259B24 00256A64 98 1F 01 D4 */ stb r0, 0x1d4(r31) /* 80259B28 00256A68 48 00 00 9C */ b lbl_80259BC4 lbl_80259B2C: -/* 80259B2C 00256A6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259B30 00256A70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259B2C 00256A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259B30 00256A70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259B34 00256A74 A8 03 4E 16 */ lha r0, 0x4e16(r3) /* 80259B38 00256A78 2C 00 FF FC */ cmpwi r0, -4 /* 80259B3C 00256A7C 41 82 00 70 */ beq lbl_80259BAC @@ -529,8 +529,8 @@ lbl_80259B2C: /* 80259B80 00256AC0 48 10 EE 15 */ bl strcmp /* 80259B84 00256AC4 2C 03 00 00 */ cmpwi r3, 0 /* 80259B88 00256AC8 40 82 00 3C */ bne lbl_80259BC4 -/* 80259B8C 00256ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259B90 00256AD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259B8C 00256ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259B90 00256AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259B94 00256AD4 88 03 4E 18 */ lbz r0, 0x4e18(r3) /* 80259B98 00256AD8 2C 00 00 01 */ cmpwi r0, 1 /* 80259B9C 00256ADC 40 82 00 28 */ bne lbl_80259BC4 @@ -546,8 +546,8 @@ lbl_80259BAC: /* 80259BC0 00256B00 48 00 00 28 */ b lbl_80259BE8 lbl_80259BC4: /* 80259BC4 00256B04 38 00 00 FF */ li r0, 0xff -/* 80259BC8 00256B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259BCC 00256B0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259BC8 00256B08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259BCC 00256B0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259BD0 00256B10 3C 63 00 02 */ addis r3, r3, 2 /* 80259BD4 00256B14 98 03 DD F8 */ stb r0, -0x2208(r3) /* 80259BD8 00256B18 38 00 00 00 */ li r0, 0 @@ -640,8 +640,8 @@ lbl_80259D04: /* 80259D0C 00256C4C 38 80 00 00 */ li r4, 0 /* 80259D10 00256C50 48 05 CB A1 */ bl setInDarkness__10Z2SceneMgrFb lbl_80259D14: -/* 80259D14 00256C54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259D18 00256C58 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80259D14 00256C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259D18 00256C58 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80259D1C 00256C5C 88 05 4E 0A */ lbz r0, 0x4e0a(r5) /* 80259D20 00256C60 7C 1F 07 74 */ extsb r31, r0 /* 80259D24 00256C64 3B C5 4E 00 */ addi r30, r5, 0x4e00 @@ -683,14 +683,14 @@ lbl_80259DA8: /* 80259DA8 00256CE8 38 00 FF FF */ li r0, -1 lbl_80259DAC: /* 80259DAC 00256CEC 90 0D 87 E0 */ stw r0, lbl_80450D60-_SDA_BASE_(r13) -/* 80259DB0 00256CF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259DB4 00256CF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259DB0 00256CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259DB4 00256CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259DB8 00256CF8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80259DBC 00256CFC 38 9F 3E D6 */ addi r4, r31, 0x3ed6 /* 80259DC0 00256D00 7F E3 FB 78 */ mr r3, r31 /* 80259DC4 00256D04 4B DD 15 F5 */ bl dComIfG_play_c_NS_setStartStage -/* 80259DC8 00256D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259DCC 00256D0C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80259DC8 00256D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259DCC 00256D0C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80259DD0 00256D10 88 1E 4E 0B */ lbz r0, 0x4e0b(r30) /* 80259DD4 00256D14 7C 00 07 75 */ extsb. r0, r0 /* 80259DD8 00256D18 40 80 00 48 */ bge lbl_80259E20 @@ -698,8 +698,8 @@ lbl_80259DAC: /* 80259DE0 00256D20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259DE4 00256D24 41 82 00 3C */ beq lbl_80259E20 /* 80259DE8 00256D28 38 7F 3E C8 */ addi r3, r31, 0x3ec8 -/* 80259DEC 00256D2C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80259DF0 00256D30 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80259DEC 00256D2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80259DF0 00256D30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80259DF4 00256D34 88 04 4E 0A */ lbz r0, 0x4e0a(r4) /* 80259DF8 00256D38 7C 04 07 74 */ extsb r4, r0 /* 80259DFC 00256D3C 88 1E 4E 0B */ lbz r0, 0x4e0b(r30) @@ -707,14 +707,14 @@ lbl_80259DAC: /* 80259E04 00256D44 4B DD 16 31 */ bl dComIfG_play_c_NS_getLayerNo_common_common /* 80259E08 00256D48 2C 03 00 00 */ cmpwi r3, 0 /* 80259E0C 00256D4C 40 80 00 14 */ bge lbl_80259E20 -/* 80259E10 00256D50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259E14 00256D54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259E10 00256D50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259E14 00256D54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259E18 00256D58 88 03 5D 45 */ lbz r0, 0x5d45(r3) /* 80259E1C 00256D5C 98 1E 4E 0B */ stb r0, 0x4e0b(r30) lbl_80259E20: /* 80259E20 00256D60 38 00 00 00 */ li r0, 0 -/* 80259E24 00256D64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259E28 00256D68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259E24 00256D64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259E28 00256D68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259E2C 00256D6C 98 03 4E 1C */ stb r0, 0x4e1c(r3) /* 80259E30 00256D70 3B BF 3E C8 */ addi r29, r31, 0x3ec8 /* 80259E34 00256D74 7F A3 EB 78 */ mr r3, r29 @@ -724,8 +724,8 @@ lbl_80259E20: /* 80259E44 00256D84 48 10 EB 51 */ bl strcmp /* 80259E48 00256D88 2C 03 00 00 */ cmpwi r3, 0 /* 80259E4C 00256D8C 40 82 00 3C */ bne lbl_80259E88 -/* 80259E50 00256D90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259E54 00256D94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259E50 00256D90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259E54 00256D94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259E58 00256D98 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80259E5C 00256D9C 2C 00 00 01 */ cmpwi r0, 1 /* 80259E60 00256DA0 40 82 00 28 */ bne lbl_80259E88 @@ -736,7 +736,7 @@ lbl_80259E20: /* 80259E74 00256DB4 38 80 00 00 */ li r4, 0 /* 80259E78 00256DB8 4B DD 8D 1D */ bl onDarkClearLV__21dSv_player_status_b_cFi /* 80259E7C 00256DBC 38 60 00 2F */ li r3, 0x2f -/* 80259E80 00256DC0 4B E3 E0 0D */ bl execItemGet +/* 80259E80 00256DC0 4B E3 E0 0D */ bl execItemGet__FUc /* 80259E84 00256DC4 48 00 00 E4 */ b lbl_80259F68 lbl_80259E88: /* 80259E88 00256DC8 7F A3 EB 78 */ mr r3, r29 @@ -746,8 +746,8 @@ lbl_80259E88: /* 80259E98 00256DD8 48 10 EA FD */ bl strcmp /* 80259E9C 00256DDC 2C 03 00 00 */ cmpwi r3, 0 /* 80259EA0 00256DE0 40 82 00 34 */ bne lbl_80259ED4 -/* 80259EA4 00256DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259EA8 00256DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259EA4 00256DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259EA8 00256DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259EAC 00256DEC 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80259EB0 00256DF0 7C 00 07 75 */ extsb. r0, r0 /* 80259EB4 00256DF4 40 82 00 20 */ bne lbl_80259ED4 @@ -766,8 +766,8 @@ lbl_80259ED4: /* 80259EE4 00256E24 48 10 EA B1 */ bl strcmp /* 80259EE8 00256E28 2C 03 00 00 */ cmpwi r3, 0 /* 80259EEC 00256E2C 40 82 00 34 */ bne lbl_80259F20 -/* 80259EF0 00256E30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259EF4 00256E34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259EF0 00256E30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259EF4 00256E34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259EF8 00256E38 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80259EFC 00256E3C 2C 00 00 01 */ cmpwi r0, 1 /* 80259F00 00256E40 40 82 00 20 */ bne lbl_80259F20 @@ -786,8 +786,8 @@ lbl_80259F20: /* 80259F30 00256E70 48 10 EA 65 */ bl strcmp /* 80259F34 00256E74 2C 03 00 00 */ cmpwi r3, 0 /* 80259F38 00256E78 40 82 00 30 */ bne lbl_80259F68 -/* 80259F3C 00256E7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259F40 00256E80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259F3C 00256E7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259F40 00256E80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259F44 00256E84 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80259F48 00256E88 2C 00 00 01 */ cmpwi r0, 1 /* 80259F4C 00256E8C 40 82 00 1C */ bne lbl_80259F68 @@ -805,8 +805,8 @@ lbl_80259F68: /* 80259F78 00256EB8 48 10 EA 1D */ bl strcmp /* 80259F7C 00256EBC 2C 03 00 00 */ cmpwi r3, 0 /* 80259F80 00256EC0 40 82 00 54 */ bne lbl_80259FD4 -/* 80259F84 00256EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259F88 00256EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259F84 00256EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259F88 00256EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259F8C 00256ECC 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80259F90 00256ED0 2C 00 00 01 */ cmpwi r0, 1 /* 80259F94 00256ED4 40 82 00 40 */ bne lbl_80259FD4 @@ -819,16 +819,16 @@ lbl_80259F68: /* 80259FB0 00256EF0 38 63 00 CC */ addi r3, r3, 0xcc /* 80259FB4 00256EF4 38 80 00 84 */ li r4, 0x84 /* 80259FB8 00256EF8 4B DD 9E A9 */ bl onFirstBit__21dSv_player_get_item_cFUc -/* 80259FBC 00256EFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80259FC0 00256F00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80259FBC 00256EFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80259FC0 00256F00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259FC4 00256F04 38 63 00 9C */ addi r3, r3, 0x9c /* 80259FC8 00256F08 38 80 00 15 */ li r4, 0x15 /* 80259FCC 00256F0C 38 A0 00 84 */ li r5, 0x84 /* 80259FD0 00256F10 4B DD 8F E9 */ bl setItem__17dSv_player_item_cFiUc lbl_80259FD4: /* 80259FD4 00256F14 7F A3 EB 78 */ mr r3, r29 -/* 80259FD8 00256F18 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80259FDC 00256F1C 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l +/* 80259FD8 00256F18 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80259FDC 00256F1C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80259FE0 00256F20 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 80259FE4 00256F24 7C 04 07 74 */ extsb r4, r0 /* 80259FE8 00256F28 4B F5 27 25 */ bl dKy_darkworld_stage_check @@ -955,8 +955,8 @@ lbl_8025A188: /* 8025A1A4 002570E4 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A1A8 002570E8 2C 00 00 32 */ cmpwi r0, 0x32 /* 8025A1AC 002570EC 40 82 00 24 */ bne lbl_8025A1D0 -/* 8025A1B0 002570F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A1B4 002570F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A1B0 002570F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A1B4 002570F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A1B8 002570F8 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A1BC 002570FC 2C 00 00 14 */ cmpwi r0, 0x14 /* 8025A1C0 00257100 40 82 00 10 */ bne lbl_8025A1D0 @@ -978,16 +978,16 @@ lbl_8025A1D0: /* 8025A1FC 0025713C 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A200 00257140 7C 00 07 75 */ extsb. r0, r0 /* 8025A204 00257144 40 82 00 38 */ bne lbl_8025A23C -/* 8025A208 00257148 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A20C 0025714C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A208 00257148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A20C 0025714C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A210 00257150 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A214 00257154 2C 00 00 18 */ cmpwi r0, 0x18 /* 8025A218 00257158 41 82 00 0C */ beq lbl_8025A224 /* 8025A21C 0025715C 7C 00 07 35 */ extsh. r0, r0 /* 8025A220 00257160 40 82 00 1C */ bne lbl_8025A23C lbl_8025A224: -/* 8025A224 00257164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A228 00257168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A224 00257164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A228 00257168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A22C 0025716C 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A230 00257170 38 80 00 00 */ li r4, 0 /* 8025A234 00257174 4B DD 89 9D */ bl onTransformLV__21dSv_player_status_b_cFi @@ -1003,8 +1003,8 @@ lbl_8025A23C: /* 8025A258 00257198 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A25C 0025719C 2C 00 00 02 */ cmpwi r0, 2 /* 8025A260 002571A0 40 82 00 28 */ bne lbl_8025A288 -/* 8025A264 002571A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A268 002571A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A264 002571A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A268 002571A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A26C 002571AC A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A270 002571B0 2C 00 00 0A */ cmpwi r0, 0xa /* 8025A274 002571B4 40 82 00 14 */ bne lbl_8025A288 @@ -1023,8 +1023,8 @@ lbl_8025A288: /* 8025A2A4 002571E4 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A2A8 002571E8 2C 00 00 09 */ cmpwi r0, 9 /* 8025A2AC 002571EC 40 82 00 28 */ bne lbl_8025A2D4 -/* 8025A2B0 002571F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A2B4 002571F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A2B0 002571F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A2B4 002571F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A2B8 002571F8 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A2BC 002571FC 2C 00 00 0A */ cmpwi r0, 0xa /* 8025A2C0 00257200 40 82 00 14 */ bne lbl_8025A2D4 @@ -1043,8 +1043,8 @@ lbl_8025A2D4: /* 8025A2F0 00257230 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A2F4 00257234 2C 00 00 0A */ cmpwi r0, 0xa /* 8025A2F8 00257238 40 82 00 38 */ bne lbl_8025A330 -/* 8025A2FC 0025723C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A300 00257240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A2FC 0025723C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A300 00257240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A304 00257244 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A308 00257248 2C 00 00 17 */ cmpwi r0, 0x17 /* 8025A30C 0025724C 41 82 00 10 */ beq lbl_8025A31C @@ -1052,8 +1052,8 @@ lbl_8025A2D4: /* 8025A314 00257254 2C 00 00 14 */ cmpwi r0, 0x14 /* 8025A318 00257258 40 82 00 18 */ bne lbl_8025A330 lbl_8025A31C: -/* 8025A31C 0025725C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A320 00257260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A31C 0025725C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A320 00257260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A324 00257264 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A328 00257268 38 80 00 03 */ li r4, 3 /* 8025A32C 0025726C 4B DD 88 A5 */ bl onTransformLV__21dSv_player_status_b_cFi @@ -1068,8 +1068,8 @@ lbl_8025A330: /* 8025A34C 0025728C 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A350 00257290 7C 00 07 75 */ extsb. r0, r0 /* 8025A354 00257294 40 82 00 40 */ bne lbl_8025A394 -/* 8025A358 00257298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A35C 0025729C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A358 00257298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A35C 0025729C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A360 002572A0 A8 03 4E 08 */ lha r0, 0x4e08(r3) /* 8025A364 002572A4 2C 00 00 02 */ cmpwi r0, 2 /* 8025A368 002572A8 40 82 00 2C */ bne lbl_8025A394 @@ -1099,8 +1099,8 @@ lbl_8025A394: /* 8025A3C4 00257304 4C C6 31 82 */ crclr 6 /* 8025A3C8 00257308 48 08 E2 01 */ bl JUTReportConsole_f /* 8025A3CC 0025730C 38 00 00 00 */ li r0, 0 -/* 8025A3D0 00257310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A3D4 00257314 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8025A3D0 00257310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A3D4 00257314 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8025A3D8 00257318 B0 04 5D 46 */ sth r0, 0x5d46(r4) /* 8025A3DC 0025731C 3C 60 80 3A */ lis r3, lbl_8039A2D8@ha /* 8025A3E0 00257320 38 63 A2 D8 */ addi r3, r3, lbl_8039A2D8@l @@ -1133,8 +1133,8 @@ lbl_8025A41C: /* 8025A448 00257388 3C 60 80 3A */ lis r3, lbl_8039A2D8@ha /* 8025A44C 0025738C 38 63 A2 D8 */ addi r3, r3, lbl_8039A2D8@l /* 8025A450 00257390 38 63 00 86 */ addi r3, r3, 0x86 -/* 8025A454 00257394 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025A458 00257398 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025A454 00257394 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025A458 00257398 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A45C 0025739C 3F E4 00 02 */ addis r31, r4, 2 /* 8025A460 002573A0 38 9F D4 F8 */ addi r4, r31, -11016 /* 8025A464 002573A4 38 A0 00 40 */ li r5, 0x40 @@ -1157,8 +1157,8 @@ lbl_8025A480: /* 8025A4A4 002573E4 4B DE 1B D5 */ bl dRes_control_c_NS_setRes /* 8025A4A8 002573E8 3C 60 80 3C */ lis r3, lbl_803C3188@ha /* 8025A4AC 002573EC 38 03 31 88 */ addi r0, r3, lbl_803C3188@l -/* 8025A4B0 002573F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A4B4 002573F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A4B0 002573F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A4B4 002573F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A4B8 002573F8 90 03 5D 88 */ stw r0, 0x5d88(r3) /* 8025A4BC 002573FC 3C 60 80 3A */ lis r3, lbl_8039A2D8@ha /* 8025A4C0 00257400 38 C3 A2 D8 */ addi r6, r3, lbl_8039A2D8@l @@ -1182,8 +1182,8 @@ lbl_8025A4E4: /* 8025A504 00257444 39 61 00 20 */ addi r11, r1, 0x20 /* 8025A508 00257448 48 10 7C D5 */ bl _savegpr_29 /* 8025A50C 0025744C 7C 7D 1B 78 */ mr r29, r3 -/* 8025A510 00257450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A514 00257454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A510 00257450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A514 00257454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A518 00257458 3C 63 00 02 */ addis r3, r3, 2 /* 8025A51C 0025745C 38 80 00 80 */ li r4, 0x80 /* 8025A520 00257460 38 63 C2 F8 */ addi r3, r3, -15624 @@ -1197,8 +1197,8 @@ lbl_8025A53C: /* 8025A53C 0025747C 38 60 00 00 */ li r3, 0 /* 8025A540 00257480 4B DD 24 3D */ bl dComIfG_play_c_NS_getLayerNo /* 8025A544 00257484 7C 7F 1B 78 */ mr r31, r3 -/* 8025A548 00257488 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A54C 0025748C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A548 00257488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A54C 0025748C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A550 00257490 3B C3 4E 20 */ addi r30, r3, 0x4e20 /* 8025A554 00257494 7F C3 F3 78 */ mr r3, r30 /* 8025A558 00257498 81 9E 00 00 */ lwz r12, 0(r30) @@ -1219,8 +1219,8 @@ lbl_8025A53C: /* 8025A594 002574D4 54 00 EE 3E */ rlwinm r0, r0, 0x1d, 0x18, 0x1f /* 8025A598 002574D8 7C 04 03 78 */ mr r4, r0 lbl_8025A59C: -/* 8025A59C 002574DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A5A0 002574E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A59C 002574DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A5A0 002574E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A5A4 002574E4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025A5A8 002574E8 38 BD 01 CC */ addi r5, r29, 0x1cc /* 8025A5AC 002574EC 4B DF 18 51 */ bl dPa_control_c_NS_readScene @@ -1281,8 +1281,8 @@ lbl_8025A640: /* 8025A670 002575B0 28 03 00 00 */ cmplwi r3, 0 /* 8025A674 002575B4 41 82 00 3C */ beq lbl_8025A6B0 /* 8025A678 002575B8 80 83 00 1C */ lwz r4, 0x1c(r3) -/* 8025A67C 002575BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A680 002575C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A67C 002575BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A680 002575C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A684 002575C4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025A688 002575C8 4B DF 18 29 */ bl dPa_control_c_NS_createScene /* 8025A68C 002575CC 80 7D 01 CC */ lwz r3, 0x1cc(r29) @@ -1295,8 +1295,8 @@ lbl_8025A640: /* 8025A6A8 002575E8 4E 80 04 21 */ bctrl /* 8025A6AC 002575EC 48 00 00 18 */ b lbl_8025A6C4 lbl_8025A6B0: -/* 8025A6B0 002575F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A6B4 002575F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A6B0 002575F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A6B4 002575F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A6B8 002575F8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025A6BC 002575FC 38 80 00 00 */ li r4, 0 /* 8025A6C0 00257600 4B DF 17 F1 */ bl dPa_control_c_NS_createScene @@ -1305,8 +1305,8 @@ lbl_8025A6C4: /* 8025A6C8 00257608 28 03 00 00 */ cmplwi r3, 0 /* 8025A6CC 0025760C 41 82 00 2C */ beq lbl_8025A6F8 /* 8025A6D0 00257610 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 8025A6D4 00257614 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025A6D8 00257618 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025A6D4 00257614 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025A6D8 00257618 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A6DC 0025761C 90 04 5C F8 */ stw r0, 0x5cf8(r4) /* 8025A6E0 00257620 41 82 00 18 */ beq lbl_8025A6F8 /* 8025A6E4 00257624 38 80 00 01 */ li r4, 1 @@ -1316,8 +1316,8 @@ lbl_8025A6C4: /* 8025A6F4 00257634 4E 80 04 21 */ bctrl lbl_8025A6F8: /* 8025A6F8 00257638 4B DD 42 F9 */ bl dComIfGp_calcNowRegion -/* 8025A6FC 0025763C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A700 00257640 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A6FC 0025763C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A700 00257640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A704 00257644 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8025A708 00257648 7F C3 F3 78 */ mr r3, r30 /* 8025A70C 0025764C 81 9E 14 00 */ lwz r12, 0x1400(r30) @@ -1338,14 +1338,14 @@ lbl_8025A6F8: /* 8025A748 00257688 3C 60 80 3F */ lis r3, lbl_803F1D80@ha /* 8025A74C 0025768C 38 63 1D 80 */ addi r3, r3, lbl_803F1D80@l /* 8025A750 00257690 48 00 D9 D1 */ bl cBgS_PolyInfo_NS_ClearPi -/* 8025A754 00257694 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A758 00257698 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A754 00257694 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A758 00257698 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A75C 0025769C 38 63 23 3C */ addi r3, r3, 0x233c /* 8025A760 002576A0 4B E2 B7 75 */ bl dCcS_NS_Ct /* 8025A764 002576A4 4B DD EF 15 */ bl dDemo_c_NS_create /* 8025A768 002576A8 38 A0 00 00 */ li r5, 0 -/* 8025A76C 002576AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A770 002576B0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8025A76C 002576AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A770 002576B0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8025A774 002576B4 90 BF 5D AC */ stw r5, 0x5dac(r31) /* 8025A778 002576B8 98 BF 5D B0 */ stb r5, 0x5db0(r31) /* 8025A77C 002576BC 7C A3 2B 78 */ mr r3, r5 @@ -1372,8 +1372,8 @@ lbl_8025A788: /* 8025A7CC 0025770C C0 82 B5 34 */ lfs f4, lbl_80454F34-_SDA2_BASE_(r2) /* 8025A7D0 00257710 4B DF 73 0D */ bl dDlst_window_c_NS_setScissor /* 8025A7D4 00257714 38 80 00 00 */ li r4, 0 -/* 8025A7D8 00257718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A7DC 0025771C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A7D8 00257718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A7DC 0025771C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A7E0 00257720 98 83 5D 70 */ stb r4, 0x5d70(r3) /* 8025A7E4 00257724 38 00 00 02 */ li r0, 2 /* 8025A7E8 00257728 98 03 5D 71 */ stb r0, 0x5d71(r3) @@ -1390,15 +1390,15 @@ lbl_8025A788: /* 8025A814 00257754 38 63 B8 00 */ addi r3, r3, 0x000BB800@l /* 8025A818 00257758 38 80 00 00 */ li r4, 0 /* 8025A81C 0025775C 4B DC 5B 81 */ bl fopMsgM_createExpHeap -/* 8025A820 00257760 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025A824 00257764 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025A820 00257760 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025A824 00257764 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A828 00257768 90 64 5E BC */ stw r3, 0x5ebc(r4) /* 8025A82C 0025776C 3C 60 00 01 */ lis r3, 0x0000A800@ha /* 8025A830 00257770 38 63 A8 00 */ addi r3, r3, 0x0000A800@l /* 8025A834 00257774 38 80 00 00 */ li r4, 0 /* 8025A838 00257778 4B DC 5B 65 */ bl fopMsgM_createExpHeap -/* 8025A83C 0025777C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025A840 00257780 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025A83C 0025777C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025A840 00257780 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A844 00257784 90 64 5E C8 */ stw r3, 0x5ec8(r4) /* 8025A848 00257788 A8 1D 00 08 */ lha r0, 8(r29) /* 8025A84C 0025778C 2C 00 00 0C */ cmpwi r0, 0xc @@ -1411,11 +1411,11 @@ lbl_8025A788: /* 8025A868 002577A8 39 00 00 00 */ li r8, 0 /* 8025A86C 002577AC 39 20 FF FF */ li r9, -1 /* 8025A870 002577B0 4B DB F5 29 */ bl fopAcM_create_X1_ -/* 8025A874 002577B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A878 002577B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A874 002577B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A878 002577B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A87C 002577BC 4B DD A7 51 */ bl init__10dSv_info_cFv -/* 8025A880 002577C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A884 002577C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A880 002577C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A884 002577C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A888 002577C8 38 00 00 00 */ li r0, 0 /* 8025A88C 002577CC 98 03 01 EB */ stb r0, 0x1eb(r3) /* 8025A890 002577D0 38 00 00 0C */ li r0, 0xc @@ -1429,8 +1429,8 @@ lbl_8025A788: /* 8025A8B0 002577F0 38 60 00 2C */ li r3, 0x2c /* 8025A8B4 002577F4 38 80 00 00 */ li r4, 0 /* 8025A8B8 002577F8 4B FC 3D 1D */ bl dMeter2Info_setShield -/* 8025A8BC 002577FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A8C0 00257800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A8BC 002577FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A8C0 00257800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A8C4 00257804 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8025A8C8 00257808 38 80 06 01 */ li r4, 0x601 /* 8025A8CC 0025780C 4B DD A0 C1 */ bl onEventBit__11dSv_event_cFUs @@ -1472,8 +1472,8 @@ lbl_8025A93C: /* 8025A954 00257894 98 8D 88 0D */ stb r4, lbl_80450D8D-_SDA_BASE_(r13) /* 8025A958 00257898 38 00 00 FF */ li r0, 0xff /* 8025A95C 0025789C 98 0D 88 0E */ stb r0, lbl_80450D8E-_SDA_BASE_(r13) -/* 8025A960 002578A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025A964 002578A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025A960 002578A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025A964 002578A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A968 002578A8 3C 63 00 02 */ addis r3, r3, 2 /* 8025A96C 002578AC 98 03 DD F8 */ stb r0, -0x2208(r3) /* 8025A970 002578B0 98 AD 86 66 */ stb r5, lbl_80450BE6-_SDA_BASE_(r13) diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index e91ec4174b..8174b40844 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -112,8 +112,8 @@ setArchiveBank: /* 8025AF7C 00257EBC 48 00 01 5C */ b lbl_8025B0D8 lbl_8025AF80: /* 8025AF80 00257EC0 83 CD 87 EC */ lwz r30, lbl_80450D6C-_SDA_BASE_(r13) -/* 8025AF84 00257EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025AF88 00257EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025AF84 00257EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025AF88 00257EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025AF8C 00257ECC 3F A3 00 02 */ addis r29, r3, 2 /* 8025AF90 00257ED0 3C 60 80 3A */ lis r3, lbl_8039A388@ha /* 8025AF94 00257ED4 3B E3 A3 88 */ addi r31, r3, lbl_8039A388@l @@ -294,8 +294,8 @@ loadDemoArchive: /* 8025B1EC 0025812C 88 03 61 94 */ lbz r0, lbl_80406194@l(r3) /* 8025B1F0 00258130 7C 00 07 75 */ extsb. r0, r0 /* 8025B1F4 00258134 40 82 00 DC */ bne lbl_8025B2D0 -/* 8025B1F8 00258138 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B1FC 0025813C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B1F8 00258138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B1FC 0025813C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B200 00258140 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8025B204 00258144 7F A4 EB 78 */ mr r4, r29 /* 8025B208 00258148 4B DC 91 7D */ bl dStage_roomControl_c_NS_getStatusRoomDt @@ -329,8 +329,8 @@ loadDemoArchive: /* 8025B278 002581B8 48 10 B2 65 */ bl func_803664DC /* 8025B27C 002581BC 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 8025B280 002581C0 38 63 61 94 */ addi r3, r3, lbl_80406194@l -/* 8025B284 002581C4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025B288 002581C8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025B284 002581C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025B288 002581C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B28C 002581CC 3C 84 00 02 */ addis r4, r4, 2 /* 8025B290 002581D0 38 A0 00 80 */ li r5, 0x80 /* 8025B294 002581D4 3C C0 80 3A */ lis r6, lbl_8039A388@ha @@ -421,8 +421,8 @@ lbl_8025B3B4: /* 8025B3B8 002582F8 8C 03 61 94 */ lbzu r0, lbl_80406194@l(r3) /* 8025B3BC 002582FC 7C 00 07 75 */ extsb. r0, r0 /* 8025B3C0 00258300 41 82 00 30 */ beq lbl_8025B3F0 -/* 8025B3C4 00258304 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025B3C8 00258308 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025B3C4 00258304 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025B3C8 00258308 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B3CC 0025830C 3C 84 00 02 */ addis r4, r4, 2 /* 8025B3D0 00258310 38 A0 00 80 */ li r5, 0x80 /* 8025B3D4 00258314 38 84 C2 F8 */ addi r4, r4, -15624 @@ -441,8 +441,8 @@ lbl_8025B3F0: /* 8025B404 00258344 39 00 00 00 */ li r8, 0 /* 8025B408 00258348 39 20 FF FF */ li r9, -1 /* 8025B40C 0025834C 4B DB E9 8D */ bl fopAcM_create_X1_ -/* 8025B410 00258350 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B414 00258354 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B410 00258350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B414 00258354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B418 00258358 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 8025B41C 0025835C 7F E3 FB 78 */ mr r3, r31 /* 8025B420 00258360 4B DE B4 69 */ bl dEvent_manager_c_NS_demoInit @@ -486,24 +486,24 @@ lbl_8025B498: /* 8025B4A0 002583E0 38 84 B1 50 */ addi r4, r4, deleteJugge@l /* 8025B4A4 002583E4 38 A0 00 00 */ li r5, 0 /* 8025B4A8 002583E8 4B DC 67 81 */ bl fpcLyIt_Judge -/* 8025B4AC 002583EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B4B0 002583F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B4AC 002583EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B4B0 002583F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B4B4 002583F4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025B4B8 002583F8 38 63 02 10 */ addi r3, r3, 0x210 /* 8025B4BC 002583FC 4B DF 04 2D */ bl dPa_control_c_NS_level_c_NS_allForceOnEventMove /* 8025B4C0 00258400 7F C3 F3 78 */ mr r3, r30 /* 8025B4C4 00258404 4B DD 24 ED */ bl dStage_roomControl_c_NS_getZoneNo /* 8025B4C8 00258408 54 64 28 34 */ slwi r4, r3, 5 -/* 8025B4CC 0025840C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B4D0 00258410 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8025B4CC 0025840C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B4D0 00258410 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8025B4D4 00258414 7C 60 22 14 */ add r3, r0, r4 /* 8025B4D8 00258418 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8025B4DC 0025841C 4B DD 98 11 */ bl clearRoomSwitch__13dSv_zoneBit_cFv /* 8025B4E0 00258420 7F C3 F3 78 */ mr r3, r30 /* 8025B4E4 00258424 4B DD 24 CD */ bl dStage_roomControl_c_NS_getZoneNo /* 8025B4E8 00258428 54 64 28 34 */ slwi r4, r3, 5 -/* 8025B4EC 0025842C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B4F0 00258430 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8025B4EC 0025842C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B4F0 00258430 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8025B4F4 00258434 7C 60 22 14 */ add r3, r0, r4 /* 8025B4F8 00258438 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8025B4FC 0025843C 4B DD 97 FD */ bl clearRoomItem__13dSv_zoneBit_cFv @@ -523,8 +523,8 @@ lbl_8025B518: /* 8025B528 00258468 38 84 B0 F0 */ addi r4, r4, objectDeleteJugge@l /* 8025B52C 0025846C 38 A0 00 00 */ li r5, 0 /* 8025B530 00258470 4B DC 66 F9 */ bl fpcLyIt_Judge -/* 8025B534 00258474 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B538 00258478 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B534 00258474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B538 00258478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B53C 0025847C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025B540 00258480 38 63 02 10 */ addi r3, r3, 0x210 /* 8025B544 00258484 4B DF 03 A5 */ bl dPa_control_c_NS_level_c_NS_allForceOnEventMove @@ -574,8 +574,8 @@ lbl_8025B5D8: /* 8025B5E4 00258524 88 1F 01 D5 */ lbz r0, 0x1d5(r31) /* 8025B5E8 00258528 28 00 00 00 */ cmplwi r0, 0 /* 8025B5EC 0025852C 41 82 00 6C */ beq lbl_8025B658 -/* 8025B5F0 00258530 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B5F4 00258534 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B5F0 00258530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B5F4 00258534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B5F8 00258538 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8025B5FC 0025853C 28 00 00 00 */ cmplwi r0, 0 /* 8025B600 00258540 40 82 00 58 */ bne lbl_8025B658 @@ -621,8 +621,8 @@ isReadRoom: /* 8025B684 002585C4 90 01 00 14 */ stw r0, 0x14(r1) /* 8025B688 002585C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025B68C 002585CC 7C 7F 1B 78 */ mr r31, r3 -/* 8025B690 002585D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B694 002585D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B690 002585D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B694 002585D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B698 002585D8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8025B69C 002585DC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8025B6A0 002585E0 7D 89 03 A6 */ mtctr r12 @@ -639,8 +639,8 @@ lbl_8025B6B8: /* 8025B6C8 00258608 48 00 00 60 */ b lbl_8025B728 lbl_8025B6CC: /* 8025B6CC 0025860C 80 83 00 04 */ lwz r4, 4(r3) -/* 8025B6D0 00258610 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B6D4 00258614 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B6D0 00258610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B6D4 00258614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B6D8 00258618 88 03 4E 18 */ lbz r0, 0x4e18(r3) /* 8025B6DC 0025861C 7C 00 07 74 */ extsb r0, r0 /* 8025B6E0 00258620 54 00 10 3A */ slwi r0, r0, 2 @@ -683,8 +683,8 @@ lbl_8025B728: /* 8025B764 002586A4 1C 1F 04 04 */ mulli r0, r31, 0x404 /* 8025B768 002586A8 7C 63 02 14 */ add r3, r3, r0 /* 8025B76C 002586AC 98 83 03 F4 */ stb r4, 0x3f4(r3) -/* 8025B770 002586B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B774 002586B4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8025B770 002586B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B774 002586B4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8025B778 002586B8 3B 9D 4E C4 */ addi r28, r29, 0x4ec4 /* 8025B77C 002586BC 7F 83 E3 78 */ mr r3, r28 /* 8025B780 002586C0 7F E4 FB 78 */ mr r4, r31 @@ -697,8 +697,8 @@ lbl_8025B728: /* 8025B79C 002586DC 80 03 00 00 */ lwz r0, 0(r3) /* 8025B7A0 002586E0 2C 00 00 00 */ cmpwi r0, 0 /* 8025B7A4 002586E4 40 82 00 54 */ bne lbl_8025B7F8 -/* 8025B7A8 002586E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B7AC 002586EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B7A8 002586E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B7AC 002586EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B7B0 002586F0 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 8025B7B4 002586F4 7C 00 07 75 */ extsb. r0, r0 /* 8025B7B8 002586F8 41 82 00 40 */ beq lbl_8025B7F8 @@ -707,8 +707,8 @@ lbl_8025B728: /* 8025B7C4 00258704 48 10 D1 D1 */ bl strcmp /* 8025B7C8 00258708 2C 03 00 00 */ cmpwi r3, 0 /* 8025B7CC 0025870C 40 82 00 2C */ bne lbl_8025B7F8 -/* 8025B7D0 00258710 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B7D4 00258714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B7D0 00258710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B7D4 00258714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B7D8 00258718 88 03 4E 18 */ lbz r0, 0x4e18(r3) /* 8025B7DC 0025871C 7C 00 07 74 */ extsb r0, r0 /* 8025B7E0 00258720 7C 1F 00 00 */ cmpw r31, r0 @@ -720,8 +720,8 @@ lbl_8025B728: lbl_8025B7F8: /* 8025B7F8 00258738 80 7E 00 B0 */ lwz r3, 0xb0(r30) /* 8025B7FC 0025873C 4B DD 3C C1 */ bl dComIfG_getRoomArcName -/* 8025B800 00258740 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025B804 00258744 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025B800 00258740 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025B804 00258744 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B808 00258748 3C 84 00 02 */ addis r4, r4, 2 /* 8025B80C 0025874C 38 84 D4 F8 */ addi r4, r4, -11016 /* 8025B810 00258750 38 A0 00 40 */ li r5, 0x40 @@ -775,8 +775,8 @@ lbl_8025B888: /* 8025B8C4 00258804 7F A3 EB 78 */ mr r3, r29 /* 8025B8C8 00258808 4B DD 3B F5 */ bl dComIfG_getRoomArcName /* 8025B8CC 0025880C 7C 7F 1B 78 */ mr r31, r3 -/* 8025B8D0 00258810 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025B8D4 00258814 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025B8D0 00258810 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025B8D4 00258814 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B8D8 00258818 3F C4 00 02 */ addis r30, r4, 2 /* 8025B8DC 0025881C 38 9E D4 F8 */ addi r4, r30, -11016 /* 8025B8E0 00258820 38 A0 00 40 */ li r5, 0x40 @@ -794,8 +794,8 @@ lbl_8025B888: /* 8025B910 00258850 38 60 00 00 */ li r3, 0 /* 8025B914 00258854 48 00 00 54 */ b lbl_8025B968 lbl_8025B918: -/* 8025B918 00258858 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B91C 0025885C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B918 00258858 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B91C 0025885C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B920 00258860 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 8025B924 00258864 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8025B928 00258868 7D 89 03 A6 */ mtctr r12 @@ -832,8 +832,8 @@ lbl_8025B968: /* 8025B998 002588D8 80 63 00 B0 */ lwz r3, 0xb0(r3) /* 8025B99C 002588DC 4B DD 3B 21 */ bl dComIfG_getRoomArcName /* 8025B9A0 002588E0 7C 7F 1B 78 */ mr r31, r3 -/* 8025B9A4 002588E4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025B9A8 002588E8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025B9A4 002588E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025B9A8 002588E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B9AC 002588EC 3C 84 00 02 */ addis r4, r4, 2 /* 8025B9B0 002588F0 3B C4 D4 F8 */ addi r30, r4, -11016 /* 8025B9B4 002588F4 7F C4 F3 78 */ mr r4, r30 @@ -853,16 +853,16 @@ lbl_8025B9DC: /* 8025B9E4 00258924 4B DD 1F CD */ bl dStage_roomControl_c_NS_getZoneNo /* 8025B9E8 00258928 2C 03 00 00 */ cmpwi r3, 0 /* 8025B9EC 0025892C 40 80 00 20 */ bge lbl_8025BA0C -/* 8025B9F0 00258930 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025B9F4 00258934 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025B9F0 00258930 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025B9F4 00258934 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B9F8 00258938 7F A4 EB 78 */ mr r4, r29 /* 8025B9FC 0025893C 4B DD 97 A9 */ bl createZone__10dSv_info_cFi /* 8025BA00 00258940 7C 64 1B 78 */ mr r4, r3 /* 8025BA04 00258944 7F A3 EB 78 */ mr r3, r29 /* 8025BA08 00258948 48 00 00 A5 */ bl dStage_roomControl_c_NS_setZoneNo lbl_8025BA0C: -/* 8025BA0C 0025894C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BA10 00258950 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BA0C 0025894C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BA10 00258950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BA14 00258954 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8025BA18 00258958 7F A4 EB 78 */ mr r4, r29 /* 8025BA1C 0025895C 4B DC 89 69 */ bl dStage_roomControl_c_NS_getStatusRoomDt @@ -930,8 +930,8 @@ dStage_roomControl_c_NS_setZoneNo: /* 8025BAF8 00258A38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025BAFC 00258A3C 7C 08 02 A6 */ mflr r0 /* 8025BB00 00258A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025BB04 00258A44 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8025BB08 00258A48 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8025BB04 00258A44 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8025BB08 00258A48 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025BB0C 00258A4C 80 04 5D AC */ lwz r0, 0x5dac(r4) /* 8025BB10 00258A50 28 00 00 00 */ cmplwi r0, 0 /* 8025BB14 00258A54 40 82 00 0C */ bne lbl_8025BB20 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index 594dead53c..e58b28c7e6 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -28,8 +28,8 @@ dSvBit_childSwDungeonHIO_c_NS_init: /* 8025BC58 00258B98 48 10 65 85 */ bl _savegpr_29 /* 8025BC5C 00258B9C 7C 7D 1B 78 */ mr r29, r3 /* 8025BC60 00258BA0 3B C0 00 00 */ li r30, 0 -/* 8025BC64 00258BA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BC68 00258BA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BC64 00258BA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BC68 00258BA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BC6C 00258BAC 3B E3 09 78 */ addi r31, r3, 0x978 lbl_8025BC70: /* 8025BC70 00258BB0 7F E3 FB 78 */ mr r3, r31 @@ -139,8 +139,8 @@ dSvBit_childItPerfectionHIO_c_NS_init: /* 8025BDB4 00258CF4 48 10 64 29 */ bl _savegpr_29 /* 8025BDB8 00258CF8 7C 7D 1B 78 */ mr r29, r3 /* 8025BDBC 00258CFC 3B C0 00 00 */ li r30, 0 -/* 8025BDC0 00258D00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BDC4 00258D04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BDC0 00258D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BDC4 00258D04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BDC8 00258D08 3B E3 09 58 */ addi r31, r3, 0x958 lbl_8025BDCC: /* 8025BDCC 00258D0C 7F E3 FB 78 */ mr r3, r31 @@ -186,8 +186,8 @@ dSvBit_childItDungeonHIO_c_NS_init: /* 8025BE50 00258D90 48 10 63 8D */ bl _savegpr_29 /* 8025BE54 00258D94 7C 7D 1B 78 */ mr r29, r3 /* 8025BE58 00258D98 3B C0 00 00 */ li r30, 0 -/* 8025BE5C 00258D9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BE60 00258DA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BE5C 00258D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BE60 00258DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BE64 00258DA4 3B E3 09 78 */ addi r31, r3, 0x978 lbl_8025BE68: /* 8025BE68 00258DA8 7F E3 FB 78 */ mr r3, r31 @@ -297,8 +297,8 @@ dSvBit_childTbPerfectionHIO_c_NS_init: /* 8025BFAC 00258EEC 48 10 62 31 */ bl _savegpr_29 /* 8025BFB0 00258EF0 7C 7D 1B 78 */ mr r29, r3 /* 8025BFB4 00258EF4 3B C0 00 00 */ li r30, 0 -/* 8025BFB8 00258EF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BFBC 00258EFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BFB8 00258EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BFBC 00258EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BFC0 00258F00 3B E3 09 58 */ addi r31, r3, 0x958 lbl_8025BFC4: /* 8025BFC4 00258F04 7F E3 FB 78 */ mr r3, r31 @@ -344,8 +344,8 @@ dSvBit_childDarknessHIO_c_NS_init: /* 8025C048 00258F88 48 10 61 95 */ bl _savegpr_29 /* 8025C04C 00258F8C 7C 7D 1B 78 */ mr r29, r3 /* 8025C050 00258F90 3B C0 00 00 */ li r30, 0 -/* 8025C054 00258F94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025C058 00258F98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025C054 00258F94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025C058 00258F98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025C05C 00258F9C 3B E3 00 28 */ addi r31, r3, 0x28 lbl_8025C060: /* 8025C060 00258FA0 7F E3 FB 78 */ mr r3, r31 @@ -391,8 +391,8 @@ dSvBit_childTransformHIO_c_NS_init: /* 8025C0E4 00259024 48 10 60 F9 */ bl _savegpr_29 /* 8025C0E8 00259028 7C 7D 1B 78 */ mr r29, r3 /* 8025C0EC 0025902C 3B C0 00 00 */ li r30, 0 -/* 8025C0F0 00259030 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025C0F4 00259034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025C0F0 00259030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025C0F4 00259034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025C0F8 00259038 3B E3 00 28 */ addi r31, r3, 0x28 lbl_8025C0FC: /* 8025C0FC 0025903C 7F E3 FB 78 */ mr r3, r31 @@ -439,8 +439,8 @@ dSvBit_childOtherHIO_c_NS_init: /* 8025C184 002590C4 39 61 00 20 */ addi r11, r1, 0x20 /* 8025C188 002590C8 48 10 60 55 */ bl _savegpr_29 /* 8025C18C 002590CC 7C 7D 1B 78 */ mr r29, r3 -/* 8025C190 002590D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025C194 002590D4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8025C190 002590D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025C194 002590D4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8025C198 002590D8 3B E4 01 14 */ addi r31, r4, 0x114 /* 8025C19C 002590DC 7F E3 FB 78 */ mr r3, r31 /* 8025C1A0 002590E0 88 84 4E 0C */ lbz r4, 0x4e0c(r4) @@ -498,8 +498,8 @@ dSvBit_HIO_c_NS_init: /* 8025C260 002591A0 4B FF FE 75 */ bl dSvBit_childTransformHIO_c_NS_init /* 8025C264 002591A4 38 7F 04 8C */ addi r3, r31, 0x48c /* 8025C268 002591A8 4B FF FF 11 */ bl dSvBit_childOtherHIO_c_NS_init -/* 8025C26C 002591AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025C270 002591B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025C26C 002591AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025C270 002591B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025C274 002591B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8025C278 002591B8 38 80 0D 04 */ li r4, 0xd04 /* 8025C27C 002591BC 4B DD 87 41 */ bl isEventBit__11dSv_event_cCFUs diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 9cfe7ed277..da0f6ec7e5 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -112,8 +112,8 @@ lbl_80194358: lbl_80194360: /* 80194360 001912A0 28 1D 00 00 */ cmplwi r29, 0 /* 80194364 001912A4 40 82 00 10 */ bne lbl_80194374 -/* 80194368 001912A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8019436C 001912AC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80194368 001912A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8019436C 001912AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80194370 001912B0 83 A4 5D 30 */ lwz r29, 0x5d30(r4) lbl_80194374: /* 80194374 001912B4 38 60 01 18 */ li r3, 0x118 @@ -735,8 +735,8 @@ lbl_80194C14: /* 80194C4C 00191B8C 48 0C 0B DD */ bl CPaneMgrAlpha_NS_getAlphaRate /* 80194C50 00191B90 7F C3 F3 78 */ mr r3, r30 /* 80194C54 00191B94 48 00 00 6D */ bl dSelect_cursor_c_NS_update -/* 80194C58 00191B98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80194C5C 00191B9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80194C58 00191B98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80194C5C 00191B9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80194C60 00191BA0 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80194C64 00191BA4 7F E3 FB 78 */ mr r3, r31 /* 80194C68 00191BA8 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/shop/d_shop_camera.s b/asm/d/shop/d_shop_camera.s index ff0eaaf4c7..1e9c61dbba 100644 --- a/asm/d/shop/d_shop_camera.s +++ b/asm/d/shop/d_shop_camera.s @@ -9,8 +9,8 @@ /* 80195CA8 00192BE8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80195CAC 00192BEC 7C 7F 1B 78 */ mr r31, r3 /* 80195CB0 00192BF0 48 00 06 5D */ bl ShopCam_action_c_NS_Save -/* 80195CB4 00192BF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80195CB8 00192BF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80195CB4 00192BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80195CB8 00192BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80195CBC 00192BFC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80195CC0 00192C00 80 03 05 70 */ lwz r0, 0x570(r3) /* 80195CC4 00192C04 64 00 08 00 */ oris r0, r0, 0x800 @@ -111,8 +111,8 @@ lbl_80195DDC: /* 80195E34 00192D74 39 61 00 90 */ addi r11, r1, 0x90 /* 80195E38 00192D78 48 1C C3 9D */ bl _savegpr_27 /* 80195E3C 00192D7C 7C 7B 1B 78 */ mr r27, r3 -/* 80195E40 00192D80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80195E44 00192D84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80195E40 00192D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80195E44 00192D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80195E48 00192D88 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 80195E4C 00192D8C 7C 00 07 74 */ extsb r0, r0 /* 80195E50 00192D90 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -448,8 +448,8 @@ lbl_80196298: .global ShopCam_action_c_NS_Save ShopCam_action_c_NS_Save: -/* 8019630C 0019324C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80196310 00193250 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8019630C 0019324C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80196310 00193250 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80196314 00193254 80 84 5D 74 */ lwz r4, 0x5d74(r4) /* 80196318 00193258 28 04 00 00 */ cmplwi r4, 0 /* 8019631C 0019325C 4D 82 00 20 */ beqlr @@ -496,8 +496,8 @@ ShopCam_action_c_NS_Save: /* 801963C0 00193300 93 E1 00 3C */ stw r31, 0x3c(r1) /* 801963C4 00193304 93 C1 00 38 */ stw r30, 0x38(r1) /* 801963C8 00193308 7C 7E 1B 78 */ mr r30, r3 -/* 801963CC 0019330C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801963D0 00193310 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 801963CC 0019330C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801963D0 00193310 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801963D4 00193314 80 64 5D AC */ lwz r3, 0x5dac(r4) /* 801963D8 00193318 80 03 05 70 */ lwz r0, 0x570(r3) /* 801963DC 0019331C 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 @@ -580,8 +580,8 @@ lbl_801964F8: /* 8019650C 0019344C A8 1F 00 D8 */ lha r0, 0xd8(r31) /* 80196510 00193450 2C 00 00 00 */ cmpwi r0, 0 /* 80196514 00193454 40 82 00 1C */ bne lbl_80196530 -/* 80196518 00193458 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019651C 0019345C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80196518 00193458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019651C 0019345C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80196520 00193460 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80196524 00193464 80 03 05 70 */ lwz r0, 0x570(r3) /* 80196528 00193468 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 74b1951fb4..7170c05882 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -58,8 +58,8 @@ dShopSystem_searchItemActor: /* 80197160 001940A0 7C 1E 03 78 */ mr r30, r0 /* 80197164 001940A4 28 1B 00 FF */ cmplwi r27, 0xff /* 80197168 001940A8 41 82 00 20 */ beq lbl_80197188 -/* 8019716C 001940AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80197170 001940B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019716C 001940AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80197170 001940B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80197174 001940B4 38 63 09 58 */ addi r3, r3, 0x958 /* 80197178 001940B8 7F 64 DB 78 */ mr r4, r27 /* 8019717C 001940BC 4B E9 D6 E5 */ bl isSwitch__12dSv_memBit_cCFi @@ -68,8 +68,8 @@ dShopSystem_searchItemActor: lbl_80197188: /* 80197188 001940C8 28 1C 00 FF */ cmplwi r28, 0xff /* 8019718C 001940CC 41 82 00 20 */ beq lbl_801971AC -/* 80197190 001940D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80197194 001940D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80197190 001940D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80197194 001940D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80197198 001940D8 38 63 09 58 */ addi r3, r3, 0x958 /* 8019719C 001940DC 7F 84 E3 78 */ mr r4, r28 /* 801971A0 001940E0 4B E9 D6 C1 */ bl isSwitch__12dSv_memBit_cCFi @@ -83,11 +83,11 @@ lbl_801971AC: /* 801971BC 001940FC 40 82 00 30 */ bne lbl_801971EC /* 801971C0 00194100 7F C3 F3 78 */ mr r3, r30 /* 801971C4 00194104 38 80 00 01 */ li r4, 1 -/* 801971C8 00194108 4B F0 0D 19 */ bl checkItemGet +/* 801971C8 00194108 4B F0 0D 19 */ bl checkItemGet__FUci /* 801971CC 0019410C 2C 03 00 00 */ cmpwi r3, 0 /* 801971D0 00194110 41 82 00 1C */ beq lbl_801971EC -/* 801971D4 00194114 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801971D8 00194118 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801971D4 00194114 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801971D8 00194118 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801971DC 0019411C 38 63 09 58 */ addi r3, r3, 0x958 /* 801971E0 00194120 7F 64 DB 78 */ mr r4, r27 /* 801971E4 00194124 4B E9 D6 2D */ bl onSwitch__12dSv_memBit_cFi @@ -471,8 +471,8 @@ lbl_80197714: /* 80197718 00194658 41 82 00 08 */ beq lbl_80197720 /* 8019771C 0019465C 48 00 00 D4 */ b lbl_801977F0 lbl_80197720: -/* 80197720 00194660 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80197724 00194664 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80197720 00194660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80197724 00194664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80197728 00194668 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8019772C 0019466C 88 03 01 A2 */ lbz r0, 0x1a2(r3) /* 80197730 00194670 28 00 00 00 */ cmplwi r0, 0 @@ -1733,8 +1733,8 @@ lbl_801988FC: /* 80198910 00195850 88 1F 0F 6E */ lbz r0, 0xf6e(r31) /* 80198914 00195854 28 00 00 00 */ cmplwi r0, 0 /* 80198918 00195858 41 82 00 20 */ beq lbl_80198938 -/* 8019891C 0019585C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80198920 00195860 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019891C 0019585C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80198920 00195860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80198924 00195864 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80198928 00195868 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8019892C 0019586C 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -1932,8 +1932,8 @@ lbl_80198BCC: /* 80198BF8 00195B38 7C 7E 1B 78 */ mr r30, r3 /* 80198BFC 00195B3C 3C 60 80 39 */ lis r3, lbl_80394C10@ha /* 80198C00 00195B40 38 63 4C 10 */ addi r3, r3, lbl_80394C10@l -/* 80198C04 00195B44 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80198C08 00195B48 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80198C04 00195B44 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80198C08 00195B48 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80198C0C 00195B4C 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 80198C10 00195B50 48 1C FD 85 */ bl strcmp /* 80198C14 00195B54 2C 03 00 00 */ cmpwi r3, 0 @@ -2265,8 +2265,8 @@ lbl_80199094: /* 801990DC 0019601C 28 00 00 00 */ cmplwi r0, 0 /* 801990E0 00196020 41 82 00 24 */ beq lbl_80199104 /* 801990E4 00196024 38 00 00 00 */ li r0, 0 -/* 801990E8 00196028 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801990EC 0019602C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801990E8 00196028 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801990EC 0019602C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801990F0 00196030 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 801990F4 00196034 98 03 5E 57 */ stb r0, 0x5e57(r3) /* 801990F8 00196038 98 03 5E 35 */ stb r0, 0x5e35(r3) @@ -2314,8 +2314,8 @@ lbl_80199194: /* 80199198 001960D8 2C 03 00 00 */ cmpwi r3, 0 /* 8019919C 001960DC 41 82 01 14 */ beq lbl_801992B0 /* 801991A0 001960E0 38 80 00 00 */ li r4, 0 -/* 801991A4 001960E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801991A8 001960E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801991A4 001960E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801991A8 001960E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801991AC 001960EC 98 83 5E 3C */ stb r4, 0x5e3c(r3) /* 801991B0 001960F0 98 83 5E 57 */ stb r4, 0x5e57(r3) /* 801991B4 001960F4 38 00 00 2A */ li r0, 0x2a @@ -2620,8 +2620,8 @@ lbl_80199604: /* 80199610 00196550 4B FF E0 61 */ bl dShopSystem_c_NS_checkController /* 80199614 00196554 7C 7F 1B 79 */ or. r31, r3, r3 /* 80199618 00196558 38 00 00 22 */ li r0, 0x22 -/* 8019961C 0019655C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80199620 00196560 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8019961C 0019655C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80199620 00196560 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80199624 00196564 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80199628 00196568 38 60 00 00 */ li r3, 0 /* 8019962C 0019656C 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -2743,8 +2743,8 @@ lbl_80199794: /* 801997E8 00196728 D0 1C 0F 44 */ stfs f0, 0xf44(r28) lbl_801997EC: /* 801997EC 0019672C 38 00 00 01 */ li r0, 1 -/* 801997F0 00196730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801997F4 00196734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801997F0 00196730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801997F4 00196734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801997F8 00196738 98 03 5E 86 */ stb r0, 0x5e86(r3) /* 801997FC 0019673C 2C 1F 00 01 */ cmpwi r31, 1 /* 80199800 00196740 40 82 00 54 */ bne lbl_80199854 @@ -3036,8 +3036,8 @@ lbl_80199BE0: /* 80199C1C 00196B5C 4B FF DA 55 */ bl dShopSystem_c_NS_checkController /* 80199C20 00196B60 7C 7F 1B 78 */ mr r31, r3 /* 80199C24 00196B64 38 00 00 22 */ li r0, 0x22 -/* 80199C28 00196B68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80199C2C 00196B6C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80199C28 00196B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80199C2C 00196B6C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80199C30 00196B70 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80199C34 00196B74 38 60 00 00 */ li r3, 0 /* 80199C38 00196B78 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -3108,8 +3108,8 @@ lbl_80199CF8: /* 80199D28 00196C68 7C 7E 1B 78 */ mr r30, r3 /* 80199D2C 00196C6C 7C BF 2B 78 */ mr r31, r5 /* 80199D30 00196C70 38 00 00 22 */ li r0, 0x22 -/* 80199D34 00196C74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80199D38 00196C78 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 80199D34 00196C74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80199D38 00196C78 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80199D3C 00196C7C 98 05 5E 3C */ stb r0, 0x5e3c(r5) /* 80199D40 00196C80 38 60 00 00 */ li r3, 0 /* 80199D44 00196C84 98 65 5E 57 */ stb r3, 0x5e57(r5) @@ -3561,8 +3561,8 @@ dShopSystem_c_NS_setSoldOut: /* 8019A3A8 001972E8 54 1F 06 3E */ clrlwi r31, r0, 0x18 /* 8019A3AC 001972EC 28 1F 00 FF */ cmplwi r31, 0xff /* 8019A3B0 001972F0 41 82 00 30 */ beq lbl_8019A3E0 -/* 8019A3B4 001972F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019A3B8 001972F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019A3B4 001972F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019A3B8 001972F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019A3BC 001972FC 3B A3 09 58 */ addi r29, r3, 0x958 /* 8019A3C0 00197300 7F A3 EB 78 */ mr r3, r29 /* 8019A3C4 00197304 7F E4 FB 78 */ mr r4, r31 @@ -3979,8 +3979,8 @@ lbl_8019A8F0: lbl_8019A974: /* 8019A974 001978B4 3A A0 00 00 */ li r21, 0 /* 8019A978 001978B8 3B E0 00 00 */ li r31, 0 -/* 8019A97C 001978BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019A980 001978C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019A97C 001978BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019A980 001978C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019A984 001978C4 3A E3 09 58 */ addi r23, r3, 0x958 /* 8019A988 001978C8 3C 60 80 3C */ lis r3, lbl_803BB8A4@ha /* 8019A98C 001978CC 3B 83 B8 A4 */ addi r28, r3, lbl_803BB8A4@l @@ -4034,8 +4034,8 @@ lbl_8019AA10: /* 8019AA40 00197980 4B FF BB 05 */ bl ShopCam_action_c_NS_setCamDataIdx /* 8019AA44 00197984 3A A0 00 00 */ li r21, 0 /* 8019AA48 00197988 3B E0 00 00 */ li r31, 0 -/* 8019AA4C 0019798C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8019AA50 00197990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8019AA4C 0019798C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8019AA50 00197990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019AA54 00197994 3A E3 09 58 */ addi r23, r3, 0x958 /* 8019AA58 00197998 3C 60 80 3C */ lis r3, lbl_803BB8A4@ha /* 8019AA5C 0019799C 3B 83 B8 A4 */ addi r28, r3, lbl_803BB8A4@l diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index 54a478f4d7..a1fc4d78b9 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -488,8 +488,8 @@ diff_model_c_NS_draw: /* 800492E4 00046224 88 1E 00 10 */ lbz r0, 0x10(r30) /* 800492E8 00046228 28 00 00 01 */ cmplwi r0, 1 /* 800492EC 0004622C 40 82 00 34 */ bne lbl_80049320 -/* 800492F0 00046230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800492F4 00046234 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800492F0 00046230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800492F4 00046234 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800492F8 00046238 80 04 5F 70 */ lwz r0, 0x5f70(r4) /* 800492FC 0004623C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80049300 00046240 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -506,8 +506,8 @@ lbl_80049320: /* 80049324 00046264 40 82 FF F0 */ bne lbl_80049314 /* 80049328 00046268 80 7E 00 04 */ lwz r3, 4(r30) /* 8004932C 0004626C 4B FC 49 99 */ bl mDoExt_modelUpdateDL -/* 80049330 00046270 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80049334 00046274 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80049330 00046270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80049334 00046274 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80049338 00046278 80 04 5F 80 */ lwz r0, 0x5f80(r4) /* 8004933C 0004627C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80049340 00046280 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l diff --git a/asm/data.s b/asm/data.s index b541d0be34..68a62eac31 100644 --- a/asm/data.s +++ b/asm/data.s @@ -839,11 +839,11 @@ lbl_803ADD88: .global lbl_803AED78 lbl_803AED78: .incbin "baserom.dol", 0x3ABD78, 0x400 -.global lbl_803AF178 -lbl_803AF178: +.global item_func_ptr +item_func_ptr: .incbin "baserom.dol", 0x3AC178, 0x400 -.global lbl_803AF578 -lbl_803AF578: +.global item_getcheck_func_ptr +item_getcheck_func_ptr: .incbin "baserom.dol", 0x3AC578, 0x400 .global lbl_803AF978 lbl_803AF978: diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index fcfb074c7a..9ba8415029 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -1347,8 +1347,8 @@ fopAcM_searchActorDistanceXZ2: /* 8001AB08 00017A48 7C 9C 23 78 */ mr r28, r4 /* 8001AB0C 00017A4C 7C BD 2B 78 */ mr r29, r5 /* 8001AB10 00017A50 FF C0 20 90 */ fmr f30, f4 -/* 8001AB14 00017A54 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001AB18 00017A58 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001AB14 00017A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001AB18 00017A58 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001AB1C 00017A5C 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 8001AB20 00017A60 7C 9E 23 78 */ mr r30, r4 /* 8001AB24 00017A64 80 7F 5D B4 */ lwz r3, 0x5db4(r31) @@ -1495,8 +1495,8 @@ lbl_8001AD20: lbl_8001AD34: /* 8001AD34 00017C74 C0 3E 05 20 */ lfs f1, 0x520(r30) /* 8001AD38 00017C78 FC 40 08 90 */ fmr f2, f1 -/* 8001AD3C 00017C7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001AD40 00017C80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001AD3C 00017C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001AD40 00017C80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001AD44 00017C84 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8001AD48 00017C88 28 00 00 00 */ cmplwi r0, 0 /* 8001AD4C 00017C8C 41 82 00 0C */ beq lbl_8001AD58 @@ -1709,8 +1709,8 @@ lbl_8001B040: .global event_second_actor event_second_actor: -/* 8001B058 00017F98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B05C 00017F9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B058 00017F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B05C 00017F9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B060 00017FA0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8001B064 00017FA4 4E 80 00 20 */ blr @@ -1721,8 +1721,8 @@ fopAcM_orderTalkEvent: /* 8001B070 00017FB0 90 01 00 14 */ stw r0, 0x14(r1) /* 8001B074 00017FB4 7C 68 1B 78 */ mr r8, r3 /* 8001B078 00017FB8 7C 89 23 78 */ mr r9, r4 -/* 8001B07C 00017FBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B080 00017FC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B07C 00017FBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B080 00017FC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B084 00017FC4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001B088 00017FC8 38 00 00 00 */ li r0, 0 /* 8001B08C 00017FCC 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -1768,8 +1768,8 @@ fopAcM_orderTalkItemBtnEvent: /* 8001B108 00018048 7C 6A 1B 78 */ mr r10, r3 /* 8001B10C 0001804C 7C 88 23 78 */ mr r8, r4 /* 8001B110 00018050 7C A9 2B 78 */ mr r9, r5 -/* 8001B114 00018054 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B118 00018058 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B114 00018054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B118 00018058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B11C 0001805C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001B120 00018060 38 00 00 00 */ li r0, 0 /* 8001B124 00018064 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -1817,8 +1817,8 @@ fopAcM_orderSpeakEvent: /* 8001B1A8 000180E8 7C 69 1B 78 */ mr r9, r3 /* 8001B1AC 000180EC 7C 87 23 78 */ mr r7, r4 /* 8001B1B0 000180F0 7C A6 2B 78 */ mr r6, r5 -/* 8001B1B4 000180F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B1B8 000180F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B1B4 000180F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B1B8 000180F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B1BC 000180FC 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001B1C0 00018100 38 00 00 00 */ li r0, 0 /* 8001B1C4 00018104 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -1849,8 +1849,8 @@ lbl_8001B20C: /* 8001B214 00018154 38 80 00 00 */ li r4, 0 /* 8001B218 00018158 7C E5 3B 78 */ mr r5, r7 /* 8001B21C 0001815C 38 E0 01 4F */ li r7, 0x14f -/* 8001B220 00018160 3D 00 80 40 */ lis r8, lbl_804061C0@ha -/* 8001B224 00018164 39 08 61 C0 */ addi r8, r8, lbl_804061C0@l +/* 8001B220 00018160 3D 00 80 40 */ lis r8, g_dComIfG_gameInfo@ha +/* 8001B224 00018164 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l /* 8001B228 00018168 81 08 5D AC */ lwz r8, 0x5dac(r8) /* 8001B22C 0001816C 39 40 FF FF */ li r10, -1 /* 8001B230 00018170 48 02 64 39 */ bl dEvt_control_c_NS_order @@ -1871,8 +1871,8 @@ fopAcM_orderDoorEvent: /* 8001B25C 0001819C 7C 9F 23 78 */ mr r31, r4 /* 8001B260 000181A0 7C BA 2B 78 */ mr r26, r5 /* 8001B264 000181A4 7C DB 33 78 */ mr r27, r6 -/* 8001B268 000181A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B26C 000181AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B268 000181A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B26C 000181AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B270 000181B0 3B 83 4E C8 */ addi r28, r3, 0x4ec8 /* 8001B274 000181B4 38 00 00 00 */ li r0, 0 /* 8001B278 000181B8 88 83 4F AD */ lbz r4, 0x4fad(r3) @@ -1937,8 +1937,8 @@ fopAcM_orderCatchEvent: /* 8001B33C 0001827C 90 01 00 14 */ stw r0, 0x14(r1) /* 8001B340 00018280 7C 68 1B 78 */ mr r8, r3 /* 8001B344 00018284 7C 89 23 78 */ mr r9, r4 -/* 8001B348 00018288 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B34C 0001828C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B348 00018288 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B34C 0001828C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B350 00018290 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001B354 00018294 38 00 00 00 */ li r0, 0 /* 8001B358 00018298 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -1989,8 +1989,8 @@ fopAcM_orderOtherEvent: /* 8001B3E8 00018328 7C BD 2B 78 */ mr r29, r5 /* 8001B3EC 0001832C 7C DE 33 78 */ mr r30, r6 /* 8001B3F0 00018330 7C FF 3B 78 */ mr r31, r7 -/* 8001B3F4 00018334 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B3F8 00018338 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B3F4 00018334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B3F8 00018338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B3FC 0001833C 3B 63 4E C8 */ addi r27, r3, 0x4ec8 /* 8001B400 00018340 38 00 00 00 */ li r0, 0 /* 8001B404 00018344 88 83 4F AD */ lbz r4, 0x4fad(r3) @@ -2069,8 +2069,8 @@ fopAcM_orderOtherEvent_X1_: /* 8001B4FC 0001843C 7C DC 33 78 */ mr r28, r6 /* 8001B500 00018440 7C FD 3B 78 */ mr r29, r7 /* 8001B504 00018444 7D 1E 43 78 */ mr r30, r8 -/* 8001B508 00018448 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B50C 0001844C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B508 00018448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B50C 0001844C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B510 00018450 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 8001B514 00018454 38 00 00 00 */ li r0, 0 /* 8001B518 00018458 88 83 4F AD */ lbz r4, 0x4fad(r3) @@ -2144,8 +2144,8 @@ fopAcM_orderChangeEventId: /* 8001B5FC 0001853C 7C 9B 23 78 */ mr r27, r4 /* 8001B600 00018540 7C BC 2B 78 */ mr r28, r5 /* 8001B604 00018544 7C DD 33 78 */ mr r29, r6 -/* 8001B608 00018548 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B60C 0001854C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001B608 00018548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B60C 0001854C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001B610 00018550 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 8001B614 00018554 7F 44 D3 78 */ mr r4, r26 /* 8001B618 00018558 7F 65 DB 78 */ mr r5, r27 @@ -2187,8 +2187,8 @@ fopAcM_orderOtherEventId: /* 8001B698 000185D8 7C BC 2B 78 */ mr r28, r5 /* 8001B69C 000185DC 7C DD 33 78 */ mr r29, r6 /* 8001B6A0 000185E0 7D 1E 43 78 */ mr r30, r8 -/* 8001B6A4 000185E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B6A8 000185E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B6A4 000185E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B6A8 000185E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B6AC 000185EC 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 8001B6B0 000185F0 38 00 00 00 */ li r0, 0 /* 8001B6B4 000185F4 88 83 4F AD */ lbz r4, 0x4fad(r3) @@ -2278,8 +2278,8 @@ fopAcM_orderMapToolEvent: /* 8001B7D4 00018714 7C DB 33 78 */ mr r27, r6 /* 8001B7D8 00018718 7C FC 3B 78 */ mr r28, r7 /* 8001B7DC 0001871C 7D 1D 43 78 */ mr r29, r8 -/* 8001B7E0 00018720 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B7E4 00018724 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l +/* 8001B7E0 00018720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B7E4 00018724 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 8001B7E8 00018728 3B F7 4E C8 */ addi r31, r23, 0x4ec8 /* 8001B7EC 0001872C 38 00 00 00 */ li r0, 0 /* 8001B7F0 00018730 88 77 4F AD */ lbz r3, 0x4fad(r23) @@ -2373,8 +2373,8 @@ fopAcM_orderMapToolAutoNextEvent: /* 8001B920 00018860 7C 9C 23 78 */ mr r28, r4 /* 8001B924 00018864 7C BD 2B 78 */ mr r29, r5 /* 8001B928 00018868 7C DE 33 78 */ mr r30, r6 -/* 8001B92C 0001886C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B930 00018870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B92C 0001886C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B930 00018870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B934 00018874 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 8001B938 00018878 38 00 00 00 */ li r0, 0 /* 8001B93C 0001887C 88 63 4F AD */ lbz r3, 0x4fad(r3) @@ -2429,8 +2429,8 @@ fopAcM_orderItemEvent: /* 8001B9DC 0001891C 7C 69 1B 78 */ mr r9, r3 /* 8001B9E0 00018920 7C 87 23 78 */ mr r7, r4 /* 8001B9E4 00018924 7C A6 2B 78 */ mr r6, r5 -/* 8001B9E8 00018928 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001B9EC 0001892C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001B9E8 00018928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001B9EC 0001892C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001B9F0 00018930 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001B9F4 00018934 38 00 00 00 */ li r0, 0 /* 8001B9F8 00018938 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -2462,8 +2462,8 @@ lbl_8001BA40: /* 8001BA4C 0001898C 7C E5 3B 78 */ mr r5, r7 /* 8001BA50 00018990 3C E0 00 01 */ lis r7, 0x0000FFFF@ha /* 8001BA54 00018994 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l -/* 8001BA58 00018998 3D 00 80 40 */ lis r8, lbl_804061C0@ha -/* 8001BA5C 0001899C 39 08 61 C0 */ addi r8, r8, lbl_804061C0@l +/* 8001BA58 00018998 3D 00 80 40 */ lis r8, g_dComIfG_gameInfo@ha +/* 8001BA5C 0001899C 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l /* 8001BA60 000189A0 81 08 5D AC */ lwz r8, 0x5dac(r8) /* 8001BA64 000189A4 39 40 FF FF */ li r10, -1 /* 8001BA68 000189A8 48 02 5C 01 */ bl dEvt_control_c_NS_order @@ -2480,8 +2480,8 @@ fopAcM_orderTreasureEvent: /* 8001BA84 000189C4 90 01 00 14 */ stw r0, 0x14(r1) /* 8001BA88 000189C8 7C 68 1B 78 */ mr r8, r3 /* 8001BA8C 000189CC 7C 89 23 78 */ mr r9, r4 -/* 8001BA90 000189D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BA94 000189D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001BA90 000189D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BA94 000189D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BA98 000189D8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001BA9C 000189DC 38 00 00 00 */ li r0, 0 /* 8001BAA0 000189E0 88 83 00 E5 */ lbz r4, 0xe5(r3) @@ -2525,8 +2525,8 @@ fopAcM_getTalkEventPartner: /* 8001BB14 00018A54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001BB18 00018A58 7C 08 02 A6 */ mflr r0 /* 8001BB1C 00018A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001BB20 00018A60 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BB24 00018A64 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8001BB20 00018A60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BB24 00018A64 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8001BB28 00018A68 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8001BB2C 00018A6C 80 84 4F 94 */ lwz r4, 0x4f94(r4) /* 8001BB30 00018A70 48 02 77 BD */ bl dEvt_control_c_NS_convPId @@ -2540,8 +2540,8 @@ fopAcM_getItemEventPartner: /* 8001BB44 00018A84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001BB48 00018A88 7C 08 02 A6 */ mflr r0 /* 8001BB4C 00018A8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001BB50 00018A90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BB54 00018A94 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8001BB50 00018A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BB54 00018A94 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8001BB58 00018A98 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8001BB5C 00018A9C 80 84 4F 98 */ lwz r4, 0x4f98(r4) /* 8001BB60 00018AA0 48 02 77 8D */ bl dEvt_control_c_NS_convPId @@ -2558,8 +2558,8 @@ fopAcM_getEventPartner: /* 8001BB80 00018AC0 39 61 00 20 */ addi r11, r1, 0x20 /* 8001BB84 00018AC4 48 34 66 59 */ bl _savegpr_29 /* 8001BB88 00018AC8 7C 7D 1B 78 */ mr r29, r3 -/* 8001BB8C 00018ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BB90 00018AD0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001BB8C 00018ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BB90 00018AD0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001BB94 00018AD4 3B DF 4E C8 */ addi r30, r31, 0x4ec8 /* 8001BB98 00018AD8 7F C3 F3 78 */ mr r3, r30 /* 8001BB9C 00018ADC 80 9F 4F 8C */ lwz r4, 0x4f8c(r31) @@ -2572,8 +2572,8 @@ fopAcM_getEventPartner: /* 8001BBB8 00018AF8 48 00 00 18 */ b lbl_8001BBD0 lbl_8001BBBC: /* 8001BBBC 00018AFC 7F C3 F3 78 */ mr r3, r30 -/* 8001BBC0 00018B00 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8001BBC4 00018B04 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8001BBC0 00018B00 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8001BBC4 00018B04 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8001BBC8 00018B08 80 84 4F 90 */ lwz r4, 0x4f90(r4) /* 8001BBCC 00018B0C 48 02 77 21 */ bl dEvt_control_c_NS_convPId lbl_8001BBD0: @@ -2598,8 +2598,8 @@ fopAcM_createItemForPresentDemo: /* 8001BC0C 00018B4C 7C FD 3B 78 */ mr r29, r7 /* 8001BC10 00018B50 7D 1E 43 78 */ mr r30, r8 /* 8001BC14 00018B54 7D 3F 4B 78 */ mr r31, r9 -/* 8001BC18 00018B58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BC1C 00018B5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001BC18 00018B58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BC1C 00018B5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BC20 00018B60 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001BC24 00018B64 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8001BC28 00018B68 48 02 7A FD */ bl dEvt_control_c_NS_setGtItm @@ -2637,8 +2637,8 @@ fopAcM_createItemForTrBoxDemo: /* 8001BC94 00018BD4 7C DD 33 78 */ mr r29, r6 /* 8001BC98 00018BD8 7C FE 3B 78 */ mr r30, r7 /* 8001BC9C 00018BDC 7D 1F 43 78 */ mr r31, r8 -/* 8001BCA0 00018BE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BCA4 00018BE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001BCA0 00018BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BCA4 00018BE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BCA8 00018BE8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001BCAC 00018BEC 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8001BCB0 00018BF0 48 02 7A 75 */ bl dEvt_control_c_NS_setGtItm @@ -2671,8 +2671,8 @@ fopAcM_getItemNoFromTableNo: /* 8001BD08 00018C48 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8001BD0C 00018C4C 93 C1 00 18 */ stw r30, 0x18(r1) /* 8001BD10 00018C50 7C 7E 1B 78 */ mr r30, r3 -/* 8001BD14 00018C54 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8001BD18 00018C58 38 C4 61 C0 */ addi r6, r4, lbl_804061C0@l +/* 8001BD14 00018C54 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8001BD18 00018C58 38 C4 61 C0 */ addi r6, r4, g_dComIfG_gameInfo@l /* 8001BD1C 00018C5C 83 E6 5F 54 */ lwz r31, 0x5f54(r6) /* 8001BD20 00018C60 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8001BD24 00018C64 28 05 00 FF */ cmplwi r5, 0xff @@ -2760,8 +2760,8 @@ lbl_8001BDFC: /* 8001BE4C 00018D8C 83 C4 00 04 */ lwz r30, 4(r4) /* 8001BE50 00018D90 3B A4 00 08 */ addi r29, r4, 8 /* 8001BE54 00018D94 3B 80 00 00 */ li r28, 0 -/* 8001BE58 00018D98 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8001BE5C 00018D9C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8001BE58 00018D98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8001BE5C 00018D9C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8001BE60 00018DA0 3A 64 4E 00 */ addi r19, r4, 0x4e00 /* 8001BE64 00018DA4 54 74 06 3E */ clrlwi r20, r3, 0x18 /* 8001BE68 00018DA8 48 00 00 48 */ b lbl_8001BEB0 @@ -2789,8 +2789,8 @@ lbl_8001BEB0: /* 8001BEB0 00018DF0 7C 1C F0 40 */ cmplw r28, r30 /* 8001BEB4 00018DF4 41 80 FF B8 */ blt lbl_8001BE6C lbl_8001BEB8: -/* 8001BEB8 00018DF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001BEBC 00018DFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001BEB8 00018DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001BEBC 00018DFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BEC0 00018E00 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8001BEC4 00018E04 81 83 06 28 */ lwz r12, 0x628(r3) /* 8001BEC8 00018E08 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -3086,7 +3086,7 @@ lbl_8001C2CC: /* 8001C2CC 0001920C 38 00 00 FF */ li r0, 0xff /* 8001C2D0 00019210 B0 01 00 0C */ sth r0, 0xc(r1) /* 8001C2D4 00019214 7F 83 E3 78 */ mr r3, r28 -/* 8001C2D8 00019218 48 07 F4 ED */ bl check_itemno +/* 8001C2D8 00019218 48 07 F4 ED */ bl check_itemno__Fi /* 8001C2DC 0001921C 57 44 C1 0E */ rlwinm r4, r26, 0x18, 4, 7 /* 8001C2E0 00019220 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8001C2E4 00019224 53 20 44 2E */ rlwimi r0, r25, 8, 0x10, 0x17 @@ -3203,7 +3203,7 @@ lbl_8001C46C: /* 8001C46C 000193AC 38 00 00 FF */ li r0, 0xff /* 8001C470 000193B0 B0 01 00 14 */ sth r0, 0x14(r1) /* 8001C474 000193B4 7F 83 E3 78 */ mr r3, r28 -/* 8001C478 000193B8 48 07 F3 4D */ bl check_itemno +/* 8001C478 000193B8 48 07 F3 4D */ bl check_itemno__Fi /* 8001C47C 000193BC 57 44 C1 0E */ rlwinm r4, r26, 0x18, 4, 7 /* 8001C480 000193C0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8001C484 000193C4 53 20 44 2E */ rlwimi r0, r25, 8, 0x10, 0x17 @@ -3312,7 +3312,7 @@ fopAcM_fastCreateItem: /* 8001C5F8 00019538 48 00 02 60 */ b lbl_8001C858 lbl_8001C5FC: /* 8001C5FC 0001953C 7F C3 F3 78 */ mr r3, r30 -/* 8001C600 00019540 48 07 F1 C5 */ bl check_itemno +/* 8001C600 00019540 48 07 F1 C5 */ bl check_itemno__Fi /* 8001C604 00019544 56 A4 C1 0E */ rlwinm r4, r21, 0x18, 4, 7 /* 8001C608 00019548 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8001C60C 0001954C 53 A3 44 2E */ rlwimi r3, r29, 8, 0x10, 0x17 @@ -3321,7 +3321,7 @@ lbl_8001C5FC: /* 8001C618 00019558 28 1A 00 00 */ cmplwi r26, 0 /* 8001C61C 0001955C 41 82 00 24 */ beq lbl_8001C640 /* 8001C620 00019560 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 8001C624 00019564 48 07 F1 59 */ bl isHeart +/* 8001C624 00019564 48 07 F1 59 */ bl isHeart__FUc /* 8001C628 00019568 2C 03 00 00 */ cmpwi r3, 0 /* 8001C62C 0001956C 41 82 00 14 */ beq lbl_8001C640 /* 8001C630 00019570 C0 22 82 30 */ lfs f1, lbl_80451C30-_SDA2_BASE_(r2) @@ -3608,8 +3608,8 @@ lbl_8001CA08: /* 8001CA40 00019980 80 63 03 FC */ lwz r3, 0x3fc(r3) /* 8001CA44 00019984 48 00 22 6D */ bl fopScnM_SearchByID /* 8001CA48 00019988 7C 7F 1B 78 */ mr r31, r3 -/* 8001CA4C 0001998C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001CA50 00019990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001CA4C 0001998C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001CA50 00019990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CA54 00019994 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8001CA58 00019998 81 83 06 28 */ lwz r12, 0x628(r3) /* 8001CA5C 0001999C 81 8C 00 FC */ lwz r12, 0xfc(r12) @@ -3696,8 +3696,8 @@ fopAcM_setCarryNow: /* 8001CB6C 00019AAC 41 82 00 20 */ beq lbl_8001CB8C /* 8001CB70 00019AB0 4B FF CD 55 */ bl fopAcM_setStageLayer /* 8001CB74 00019AB4 A0 9F 04 94 */ lhz r4, 0x494(r31) -/* 8001CB78 00019AB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001CB7C 00019ABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001CB78 00019AB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001CB7C 00019ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CB80 00019AC0 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 8001CB84 00019AC4 7C 05 07 74 */ extsb r5, r0 /* 8001CB88 00019AC8 48 01 8A BD */ bl onActor__10dSv_info_cFii @@ -3742,8 +3742,8 @@ lbl_8001CC10: /* 8001CC10 00019B50 38 00 00 00 */ li r0, 0 /* 8001CC14 00019B54 B0 1F 04 E8 */ sth r0, 0x4e8(r31) /* 8001CC18 00019B58 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 8001CC1C 00019B5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001CC20 00019B60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001CC1C 00019B5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001CC20 00019B60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CC24 00019B64 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8001CC28 00019B68 28 00 00 00 */ cmplwi r0, 0 /* 8001CC2C 00019B6C 41 82 00 1C */ beq lbl_8001CC48 @@ -3907,8 +3907,8 @@ lbl_8001CDDC: /* 8001CE6C 00019DAC 38 A1 00 08 */ addi r5, r1, 8 /* 8001CE70 00019DB0 7F C6 F3 78 */ mr r6, r30 /* 8001CE74 00019DB4 48 05 AE F1 */ bl dBgS_LinChk_NS_Set -/* 8001CE78 00019DB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001CE7C 00019DBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001CE78 00019DB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001CE7C 00019DBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CE80 00019DC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001CE84 00019DC4 38 81 00 20 */ addi r4, r1, 0x20 /* 8001CE88 00019DC8 48 05 75 2D */ bl cBgS_NS_LineCross @@ -3972,8 +3972,8 @@ lbl_8001CEB8: /* 8001CF68 00019EA8 38 A1 00 08 */ addi r5, r1, 8 /* 8001CF6C 00019EAC 7F E6 FB 78 */ mr r6, r31 /* 8001CF70 00019EB0 48 05 AD F5 */ bl dBgS_LinChk_NS_Set -/* 8001CF74 00019EB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001CF78 00019EB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001CF74 00019EB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001CF78 00019EB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CF7C 00019EBC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001CF80 00019EC0 38 81 00 2C */ addi r4, r1, 0x2c /* 8001CF84 00019EC4 48 05 74 31 */ bl cBgS_NS_LineCross @@ -3999,8 +3999,8 @@ lbl_8001CFB4: /* 8001CFCC 00019F0C 7C 08 03 A6 */ mtlr r0 /* 8001CFD0 00019F10 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8001CFD4 00019F14 4E 80 00 20 */ blr -/* 8001CFD8 00019F18 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001CFDC 00019F1C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8001CFD8 00019F18 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001CFDC 00019F1C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8001CFE0 00019F20 80 A5 5D AC */ lwz r5, 0x5dac(r5) /* 8001CFE4 00019F24 A8 A5 04 E6 */ lha r5, 0x4e6(r5) /* 8001CFE8 00019F28 A8 03 04 E6 */ lha r0, 0x4e6(r3) @@ -4055,8 +4055,8 @@ lbl_8001D018: /* 8001D0A8 00019FE8 38 00 FF FF */ li r0, -1 /* 8001D0AC 00019FEC 90 01 00 10 */ stw r0, 0x10(r1) /* 8001D0B0 00019FF0 90 61 00 14 */ stw r3, 0x14(r1) -/* 8001D0B4 00019FF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001D0B8 00019FF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001D0B4 00019FF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001D0B8 00019FF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D0BC 00019FFC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8001D0C0 0001A000 80 9B 00 00 */ lwz r4, 0(r27) /* 8001D0C4 0001A004 7F 85 E3 78 */ mr r5, r28 @@ -4096,8 +4096,8 @@ fopAcM_effHamonSet: /* 8001D13C 0001A07C D0 21 00 28 */ stfs f1, 0x28(r1) /* 8001D140 0001A080 3B A0 00 00 */ li r29, 0 /* 8001D144 0001A084 3B E0 00 00 */ li r31, 0 -/* 8001D148 0001A088 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001D14C 0001A08C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8001D148 0001A088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001D14C 0001A08C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_8001D150: /* 8001D150 0001A090 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8001D154 0001A094 38 00 00 FF */ li r0, 0xff @@ -4149,8 +4149,8 @@ lbl_8001D1C0: /* 8001D208 0001A148 93 E1 00 AC */ stw r31, 0xac(r1) /* 8001D20C 0001A14C 93 C1 00 A8 */ stw r30, 0xa8(r1) /* 8001D210 0001A150 7C 7E 1B 78 */ mr r30, r3 -/* 8001D214 0001A154 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001D218 0001A158 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001D214 0001A154 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001D218 0001A158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D21C 0001A15C 83 E3 5D AC */ lwz r31, 0x5dac(r3) /* 8001D220 0001A160 38 61 00 2C */ addi r3, r1, 0x2c /* 8001D224 0001A164 48 05 AA 45 */ bl dBgS_LinChk @@ -4185,8 +4185,8 @@ lbl_8001D1C0: /* 8001D298 0001A1D8 38 A1 00 08 */ addi r5, r1, 8 /* 8001D29C 0001A1DC 7F C6 F3 78 */ mr r6, r30 /* 8001D2A0 0001A1E0 48 05 AA C5 */ bl dBgS_LinChk_NS_Set -/* 8001D2A4 0001A1E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001D2A8 0001A1E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001D2A4 0001A1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001D2A8 0001A1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D2AC 0001A1EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001D2B0 0001A1F0 38 81 00 2C */ addi r4, r1, 0x2c /* 8001D2B4 0001A1F4 48 05 71 01 */ bl cBgS_NS_LineCross @@ -4634,8 +4634,8 @@ fopAcM_getWaterY: /* 8001D8A4 0001A7E4 48 00 04 E1 */ bl fopAcM_wt_c_NS_waterCheck /* 8001D8A8 0001A7E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001D8AC 0001A7EC 41 82 00 34 */ beq lbl_8001D8E0 -/* 8001D8B0 0001A7F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001D8B4 0001A7F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001D8B0 0001A7F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001D8B4 0001A7F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D8B8 0001A7F8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001D8BC 0001A7FC 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8001D8C0 0001A800 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l @@ -4755,8 +4755,8 @@ lbl_8001DA4C: /* 8001DA54 0001A994 38 60 00 00 */ li r3, 0 /* 8001DA58 0001A998 48 00 00 74 */ b lbl_8001DACC lbl_8001DA5C: -/* 8001DA5C 0001A99C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DA60 0001A9A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DA5C 0001A99C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DA60 0001A9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DA64 0001A9A4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DA68 0001A9A8 7F 64 DB 78 */ mr r4, r27 /* 8001DA6C 0001A9AC 48 05 6B F5 */ bl cBgS_NS_ChkPolySafe @@ -4802,8 +4802,8 @@ fopAcM_getPolygonAngle: /* 8001DAF4 0001AA34 48 34 46 E9 */ bl _savegpr_29 /* 8001DAF8 0001AA38 7C 7D 1B 78 */ mr r29, r3 /* 8001DAFC 0001AA3C 7C 9E 23 78 */ mr r30, r4 -/* 8001DB00 0001AA40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DB04 0001AA44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DB00 0001AA40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DB04 0001AA44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DB08 0001AA48 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8001DB0C 0001AA4C 7F E3 FB 78 */ mr r3, r31 /* 8001DB10 0001AA50 7F A4 EB 78 */ mr r4, r29 @@ -4919,8 +4919,8 @@ fopAcM_lc_c_NS_lineCheck: /* 8001DC88 0001ABC8 7C E4 3B 78 */ mr r4, r7 /* 8001DC8C 0001ABCC 7C 05 03 78 */ mr r5, r0 /* 8001DC90 0001ABD0 48 05 A0 D5 */ bl dBgS_LinChk_NS_Set -/* 8001DC94 0001ABD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DC98 0001ABD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DC94 0001ABD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DC98 0001ABD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DC9C 0001ABDC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DCA0 0001ABE0 3C 80 80 3F */ lis r4, lbl_803F1C48@ha /* 8001DCA4 0001ABE4 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l @@ -4939,8 +4939,8 @@ fopAcM_gc_c_NS_gndCheck: /* 8001DCCC 0001AC0C 3C 60 80 3F */ lis r3, lbl_803F1CC4@ha /* 8001DCD0 0001AC10 38 63 1C C4 */ addi r3, r3, lbl_803F1CC4@l /* 8001DCD4 0001AC14 48 24 A0 55 */ bl cBgS_GndChk_NS_SetPos_X1_ -/* 8001DCD8 0001AC18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DCDC 0001AC1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DCD8 0001AC18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DCDC 0001AC1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DCE0 0001AC20 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DCE4 0001AC24 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha /* 8001DCE8 0001AC28 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l @@ -4967,8 +4967,8 @@ fopAcM_gc_c_NS_gndCheck: /* 8001DD3C 0001AC7C D0 04 00 40 */ stfs f0, 0x40(r4) /* 8001DD40 0001AC80 C0 03 00 08 */ lfs f0, 8(r3) /* 8001DD44 0001AC84 D0 04 00 44 */ stfs f0, 0x44(r4) -/* 8001DD48 0001AC88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DD4C 0001AC8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DD48 0001AC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DD4C 0001AC8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DD50 0001AC90 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DD54 0001AC94 48 05 77 49 */ bl dBgS_NS_RoofChk /* 8001DD58 0001AC98 D0 2D 87 54 */ stfs f1, lbl_80450CD4-_SDA_BASE_(r13) @@ -5001,8 +5001,8 @@ fopAcM_wt_c_NS_waterCheck: /* 8001DDB8 0001ACF8 38 81 00 08 */ addi r4, r1, 8 /* 8001DDBC 0001ACFC EC 21 10 2A */ fadds f1, f1, f2 /* 8001DDC0 0001AD00 48 05 AD D1 */ bl dBgS_SplGrpChk_NS_Set -/* 8001DDC4 0001AD04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001DDC8 0001AD08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001DDC4 0001AD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001DDC8 0001AD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DDCC 0001AD0C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DDD0 0001AD10 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8001DDD4 0001AD14 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l diff --git a/asm/f/op/f_op_actor.s b/asm/f/op/f_op_actor.s index 28b49c6e0d..11c3fe6563 100644 --- a/asm/f/op/f_op_actor.s +++ b/asm/f/op/f_op_actor.s @@ -134,8 +134,8 @@ fopAc_IsActor: /* 80018D1C 00015C5C 93 C1 00 08 */ stw r30, 8(r1) /* 80018D20 00015C60 7C 7F 1B 78 */ mr r31, r3 /* 80018D24 00015C64 3B C0 00 01 */ li r30, 1 -/* 80018D28 00015C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80018D2C 00015C6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80018D28 00015C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80018D2C 00015C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80018D30 00015C70 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80018D34 00015C74 28 00 00 00 */ cmplwi r0, 0 /* 80018D38 00015C78 40 82 00 84 */ bne lbl_80018DBC @@ -189,8 +189,8 @@ lbl_80018DBC: /* 80018DE8 00015D28 93 C1 00 08 */ stw r30, 8(r1) /* 80018DEC 00015D2C 7C 7F 1B 78 */ mr r31, r3 /* 80018DF0 00015D30 3B C0 00 01 */ li r30, 1 -/* 80018DF4 00015D34 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80018DF8 00015D38 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80018DF4 00015D34 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80018DF8 00015D38 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80018DFC 00015D3C 88 04 5E B5 */ lbz r0, 0x5eb5(r4) /* 80018E00 00015D40 28 00 00 00 */ cmplwi r0, 0 /* 80018E04 00015D44 40 82 01 58 */ bne lbl_80018F5C @@ -204,8 +204,8 @@ lbl_80018DBC: /* 80018E24 00015D64 48 01 86 B1 */ bl daSus_c_NS_check_X1_ /* 80018E28 00015D68 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 80018E2C 00015D6C 48 02 A6 A1 */ bl dEvt_info_c_NS_beforeProc -/* 80018E30 00015D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80018E34 00015D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80018E30 00015D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80018E34 00015D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80018E38 00015D78 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80018E3C 00015D7C 7F E4 FB 78 */ mr r4, r31 /* 80018E40 00015D80 48 02 A1 69 */ bl dEvt_control_c_NS_moveApproval @@ -505,8 +505,8 @@ lbl_8001919C: /* 800192B0 000161F0 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 800192B4 000161F4 7C 84 07 75 */ extsb. r4, r4 /* 800192B8 000161F8 41 80 00 24 */ blt lbl_800192DC -/* 800192BC 000161FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800192C0 00016200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800192BC 000161FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800192C0 00016200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800192C4 00016204 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 800192C8 00016208 48 00 B0 BD */ bl dStage_roomControl_c_NS_getStatusRoomDt /* 800192CC 0001620C 81 83 00 00 */ lwz r12, 0(r3) @@ -518,8 +518,8 @@ lbl_800192DC: /* 800192E0 00016220 88 9F 04 BA */ lbz r4, 0x4ba(r31) /* 800192E4 00016224 7C 80 07 75 */ extsb. r0, r4 /* 800192E8 00016228 41 80 00 28 */ blt lbl_80019310 -/* 800192EC 0001622C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800192F0 00016230 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800192EC 0001622C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800192F0 00016230 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800192F4 00016234 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 800192F8 00016238 7C 84 07 74 */ extsb r4, r4 /* 800192FC 0001623C 48 00 B0 89 */ bl dStage_roomControl_c_NS_getStatusRoomDt @@ -536,8 +536,8 @@ lbl_80019310: /* 80019324 00016264 88 83 00 1B */ lbz r4, 0x1b(r3) /* 80019328 00016268 28 04 00 FF */ cmplwi r4, 0xff /* 8001932C 0001626C 41 82 00 70 */ beq lbl_8001939C -/* 80019330 00016270 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80019334 00016274 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80019330 00016270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80019334 00016274 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80019338 00016278 88 BF 04 BA */ lbz r5, 0x4ba(r31) /* 8001933C 0001627C 7C A5 07 74 */ extsb r5, r5 /* 80019340 00016280 48 01 C0 21 */ bl isSwitch__10dSv_info_cCFii @@ -552,8 +552,8 @@ lbl_80019360: /* 80019360 000162A0 88 83 00 1B */ lbz r4, 0x1b(r3) /* 80019364 000162A4 28 04 00 FF */ cmplwi r4, 0xff /* 80019368 000162A8 41 82 00 34 */ beq lbl_8001939C -/* 8001936C 000162AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80019370 000162B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001936C 000162AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80019370 000162B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80019374 000162B4 88 BF 04 BA */ lbz r5, 0x4ba(r31) /* 80019378 000162B8 7C A5 07 74 */ extsb r5, r5 /* 8001937C 000162BC 48 01 BF E5 */ bl isSwitch__10dSv_info_cCFii @@ -603,8 +603,8 @@ lbl_800193E4: /* 8001941C 0001635C 3C 60 80 38 */ lis r3, lbl_80378878@ha /* 80019420 00016360 38 63 88 78 */ addi r3, r3, lbl_80378878@l /* 80019424 00016364 38 80 00 25 */ li r4, 0x25 -/* 80019428 00016368 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001942C 0001636C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80019428 00016368 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001942C 0001636C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80019430 00016370 3F E5 00 02 */ addis r31, r5, 2 /* 80019434 00016374 3B FF C2 F8 */ addi r31, r31, -15624 /* 80019438 00016378 7F E5 FB 78 */ mr r5, r31 @@ -718,8 +718,8 @@ lbl_800195A4: /* 800195CC 0001650C C0 1D 00 00 */ lfs f0, 0(r29) /* 800195D0 00016510 D0 1D 00 08 */ stfs f0, 8(r29) /* 800195D4 00016514 D0 1D 00 04 */ stfs f0, 4(r29) -/* 800195D8 00016518 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800195DC 0001651C 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 800195D8 00016518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800195DC 0001651C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 800195E0 00016520 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 800195E4 00016524 38 00 00 FF */ li r0, 0xff /* 800195E8 00016528 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/f/op/f_op_camera.s b/asm/f/op/f_op_camera.s index 2cb88d209e..d18c7c239e 100644 --- a/asm/f/op/f_op_camera.s +++ b/asm/f/op/f_op_camera.s @@ -8,8 +8,8 @@ /* 8001E148 0001B088 90 01 00 14 */ stw r0, 0x14(r1) /* 8001E14C 0001B08C 7C 64 1B 78 */ mr r4, r3 /* 8001E150 0001B090 38 60 00 01 */ li r3, 1 -/* 8001E154 0001B094 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001E158 0001B098 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8001E154 0001B094 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001E158 0001B098 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8001E15C 0001B09C 88 05 5E B5 */ lbz r0, 0x5eb5(r5) /* 8001E160 0001B0A0 28 00 00 00 */ cmplwi r0, 0 /* 8001E164 0001B0A4 40 82 00 0C */ bne lbl_8001E170 @@ -24,8 +24,8 @@ lbl_8001E170: /* 8001E184 0001B0C4 7C 08 02 A6 */ mflr r0 /* 8001E188 0001B0C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8001E18C 0001B0CC 7C 64 1B 78 */ mr r4, r3 -/* 8001E190 0001B0D0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001E194 0001B0D4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8001E190 0001B0D0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001E194 0001B0D4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8001E198 0001B0D8 88 05 5E B5 */ lbz r0, 0x5eb5(r5) /* 8001E19C 0001B0DC 28 00 00 00 */ cmplwi r0, 0 /* 8001E1A0 0001B0E0 40 82 00 18 */ bne lbl_8001E1B8 diff --git a/asm/f/op/f_op_kankyo.s b/asm/f/op/f_op_kankyo.s index 505b6041a2..753f0e6399 100644 --- a/asm/f/op/f_op_kankyo.s +++ b/asm/f/op/f_op_kankyo.s @@ -7,8 +7,8 @@ /* 8001F288 0001C1C8 7C 08 02 A6 */ mflr r0 /* 8001F28C 0001C1CC 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F290 0001C1D0 7C 64 1B 78 */ mr r4, r3 -/* 8001F294 0001C1D4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001F298 0001C1D8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8001F294 0001C1D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001F298 0001C1D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8001F29C 0001C1DC 88 05 5E B5 */ lbz r0, 0x5eb5(r5) /* 8001F2A0 0001C1E0 28 00 00 00 */ cmplwi r0, 0 /* 8001F2A4 0001C1E4 40 82 00 0C */ bne lbl_8001F2B0 @@ -26,8 +26,8 @@ lbl_8001F2B0: /* 8001F2D0 0001C210 88 0D 8B A4 */ lbz r0, lbl_80451124-_SDA_BASE_(r13) /* 8001F2D4 0001C214 7C 00 07 75 */ extsb. r0, r0 /* 8001F2D8 0001C218 40 82 00 2C */ bne lbl_8001F304 -/* 8001F2DC 0001C21C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8001F2E0 0001C220 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8001F2DC 0001C21C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8001F2E0 0001C220 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8001F2E4 0001C224 88 05 5E B5 */ lbz r0, 0x5eb5(r5) /* 8001F2E8 0001C228 28 00 00 00 */ cmplwi r0, 0 /* 8001F2EC 0001C22C 41 82 00 10 */ beq lbl_8001F2FC diff --git a/asm/f/op/kankyo/f_op_kankyo_mng.s b/asm/f/op/kankyo/f_op_kankyo_mng.s index 38f08147d0..89ceb0fe2c 100644 --- a/asm/f/op/kankyo/f_op_kankyo_mng.s +++ b/asm/f/op/kankyo/f_op_kankyo_mng.s @@ -216,8 +216,8 @@ lbl_8001F8EC: /* 8001F92C 0001C86C D0 21 00 28 */ stfs f1, 0x28(r1) /* 8001F930 0001C870 3B A0 00 00 */ li r29, 0 /* 8001F934 0001C874 3B E0 00 00 */ li r31, 0 -/* 8001F938 0001C878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001F93C 0001C87C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8001F938 0001C878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001F93C 0001C87C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_8001F940: /* 8001F940 0001C880 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8001F944 0001C884 38 80 00 00 */ li r4, 0 diff --git a/asm/f/op/msg/f_op_msg_mng.s b/asm/f/op/msg/f_op_msg_mng.s index 21919143af..3a120db225 100644 --- a/asm/f/op/msg/f_op_msg_mng.s +++ b/asm/f/op/msg/f_op_msg_mng.s @@ -84,8 +84,8 @@ createAppend_X2_: /* 8001FAAC 0001C9EC 48 00 00 8C */ b lbl_8001FB38 lbl_8001FAB0: /* 8001FAB0 0001C9F0 93 5F 00 00 */ stw r26, 0(r31) -/* 8001FAB4 0001C9F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001FAB8 0001C9F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001FAB4 0001C9F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001FAB8 0001C9F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001FABC 0001C9FC 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 8001FAC0 0001CA00 28 00 00 00 */ cmplwi r0, 0 /* 8001FAC4 0001CA04 41 82 00 0C */ beq lbl_8001FAD0 @@ -276,8 +276,8 @@ fopMsgM_messageSet: /* 8001FD48 0001CC88 7C 7C 1B 78 */ mr r28, r3 /* 8001FD4C 0001CC8C 7C 9D 23 78 */ mr r29, r4 /* 8001FD50 0001CC90 7C BE 2B 78 */ mr r30, r5 -/* 8001FD54 0001CC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001FD58 0001CC98 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001FD54 0001CC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001FD58 0001CC98 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001FD5C 0001CC9C 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FD60 0001CCA0 28 00 00 08 */ cmplwi r0, 8 /* 8001FD64 0001CCA4 40 82 00 14 */ bne lbl_8001FD78 @@ -301,8 +301,8 @@ lbl_8001FD78: /* 8001FDA8 0001CCE8 48 00 00 C4 */ b lbl_8001FE6C lbl_8001FDAC: /* 8001FDAC 0001CCEC 38 00 00 FF */ li r0, 0xff -/* 8001FDB0 0001CCF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001FDB4 0001CCF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8001FDB0 0001CCF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001FDB4 0001CCF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001FDB8 0001CCF8 98 03 5E 7C */ stb r0, 0x5e7c(r3) /* 8001FDBC 0001CCFC 38 00 FF FF */ li r0, -1 /* 8001FDC0 0001CD00 90 03 5E E8 */ stw r0, 0x5ee8(r3) @@ -369,8 +369,8 @@ fopMsgM_messageSet_X1_: /* 8001FE94 0001CDD4 48 34 23 49 */ bl _savegpr_29 /* 8001FE98 0001CDD8 7C 7D 1B 78 */ mr r29, r3 /* 8001FE9C 0001CDDC 7C 9E 23 78 */ mr r30, r4 -/* 8001FEA0 0001CDE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001FEA4 0001CDE4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001FEA0 0001CDE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001FEA4 0001CDE4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001FEA8 0001CDE8 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FEAC 0001CDEC 28 00 00 08 */ cmplwi r0, 8 /* 8001FEB0 0001CDF0 40 82 00 14 */ bne lbl_8001FEC4 @@ -457,8 +457,8 @@ fopMsgM_messageSetDemo: /* 8001FFD4 0001CF14 93 C1 00 18 */ stw r30, 0x18(r1) /* 8001FFD8 0001CF18 7C 7E 1B 78 */ mr r30, r3 /* 8001FFDC 0001CF1C 48 21 80 BD */ bl dMsgObject_c_NS_endFlowGroup -/* 8001FFE0 0001CF20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8001FFE4 0001CF24 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001FFE0 0001CF20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8001FFE4 0001CF24 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001FFE8 0001CF28 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FFEC 0001CF2C 28 00 00 08 */ cmplwi r0, 8 /* 8001FFF0 0001CF30 40 82 00 14 */ bne lbl_80020004 diff --git a/asm/f/pc/f_pc_manager.s b/asm/f/pc/f_pc_manager.s index 91185b9915..5fda9e7ed7 100644 --- a/asm/f/pc/f_pc_manager.s +++ b/asm/f/pc/f_pc_manager.s @@ -72,8 +72,8 @@ fpcM_Management: /* 8002216C 0001F0AC 7C 7E 1B 78 */ mr r30, r3 /* 80022170 0001F0B0 7C 9F 23 78 */ mr r31, r4 /* 80022174 0001F0B4 48 24 EC D9 */ bl MtxInit -/* 80022178 0001F0B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002217C 0001F0BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80022178 0001F0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002217C 0001F0BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80022180 0001F0C0 3C 63 00 02 */ addis r3, r3, 2 /* 80022184 0001F0C4 38 63 C0 F4 */ addi r3, r3, -16140 /* 80022188 0001F0C8 48 03 3E F9 */ bl dDlst_peekZ_c_NS_peekData @@ -137,8 +137,8 @@ lbl_80022220: /* 8002224C 0001F18C 7D 89 03 A6 */ mtctr r12 /* 80022250 0001F190 4E 80 04 21 */ bctrl lbl_80022254: -/* 80022254 0001F194 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80022258 0001F198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80022254 0001F194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80022258 0001F198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002225C 0001F19C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80022260 0001F1A0 48 00 A8 65 */ bl dComIfG_play_c_NS_drawSimpleModel /* 80022264 0001F1A4 48 00 00 3C */ b lbl_800222A0 diff --git a/asm/m/Do/m_Do_MemCardRWmng.s b/asm/m/Do/m_Do_MemCardRWmng.s index 05473772e6..03bbc8a36f 100644 --- a/asm/m/Do/m_Do_MemCardRWmng.s +++ b/asm/m/Do/m_Do_MemCardRWmng.s @@ -304,8 +304,8 @@ mDoMemCdRWm_BuildHeader: /* 800178D4 00014814 80 E1 00 14 */ lwz r7, 0x14(r1) /* 800178D8 00014818 4C C6 31 82 */ crclr 6 /* 800178DC 0001481C 48 34 EC E1 */ bl func_803665BC -/* 800178E0 00014820 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800178E4 00014824 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 800178E0 00014820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800178E4 00014824 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 800178E8 00014828 80 7C 5C F0 */ lwz r3, 0x5cf0(r28) /* 800178EC 0001482C 3C 80 80 37 */ lis r4, lbl_80374408@ha /* 800178F0 00014830 38 84 44 08 */ addi r4, r4, lbl_80374408@l diff --git a/asm/m/Do/m_Do_audio.s b/asm/m/Do/m_Do_audio.s index d3258f121b..50bc17ed66 100644 --- a/asm/m/Do/m_Do_audio.s +++ b/asm/m/Do/m_Do_audio.s @@ -78,8 +78,8 @@ lbl_800070A8: /* 800070B4 00003FF4 4C C6 31 82 */ crclr 6 /* 800070B8 00003FF8 4B FF FB 55 */ bl OSReport_Error lbl_800070BC: -/* 800070BC 00003FFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800070C0 00004000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800070BC 00003FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800070C0 00004000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800070C4 00004004 38 83 07 F0 */ addi r4, r3, 0x7f0 /* 800070C8 00004008 3C 60 80 3E */ lis r3, lbl_803DBF4C@ha /* 800070CC 0000400C 38 63 BF 4C */ addi r3, r3, lbl_803DBF4C@l diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 614aba4c4a..a952d4e037 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -1606,8 +1606,8 @@ mDoExt_invisibleModel_NS_entryJoint: /* 8000E6EC 0000B62C 83 F9 00 04 */ lwz r31, 4(r25) /* 8000E6F0 0000B630 40 82 00 78 */ bne lbl_8000E768 /* 8000E6F4 0000B634 3B 60 00 00 */ li r27, 0 -/* 8000E6F8 0000B638 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000E6FC 0000B63C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8000E6F8 0000B638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000E6FC 0000B63C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8000E700 0000B640 3B 9E 5F 64 */ addi r28, r30, 0x5f64 /* 8000E704 0000B644 48 00 00 50 */ b lbl_8000E754 lbl_8000E708: @@ -1638,8 +1638,8 @@ lbl_8000E754: /* 8000E764 0000B6A4 48 00 00 44 */ b lbl_8000E7A8 lbl_8000E768: /* 8000E768 0000B6A8 3B 60 00 00 */ li r27, 0 -/* 8000E76C 0000B6AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000E770 0000B6B0 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 8000E76C 0000B6AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000E770 0000B6B0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8000E774 0000B6B4 3B 9E 5F 64 */ addi r28, r30, 0x5f64 /* 8000E778 0000B6B8 48 00 00 20 */ b lbl_8000E798 lbl_8000E77C: @@ -1673,8 +1673,8 @@ lbl_8000E7A8: /* 8000E7E0 0000B720 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l /* 8000E7E4 0000B724 83 DF 00 48 */ lwz r30, 0x48(r31) /* 8000E7E8 0000B728 83 BF 00 4C */ lwz r29, 0x4c(r31) -/* 8000E7EC 0000B72C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000E7F0 0000B730 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000E7EC 0000B72C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000E7F0 0000B730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000E7F4 0000B734 80 03 5F A8 */ lwz r0, 0x5fa8(r3) /* 8000E7F8 0000B738 90 1F 00 48 */ stw r0, 0x48(r31) /* 8000E7FC 0000B73C 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -6245,8 +6245,8 @@ lbl_800128E8: lbl_800128FC: /* 800128FC 0000F83C B0 92 00 14 */ sth r4, 0x14(r18) lbl_80012900: -/* 80012900 0000F840 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80012904 0000F844 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80012900 0000F840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80012904 0000F844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80012908 0000F848 83 E3 61 B0 */ lwz r31, 0x61b0(r3) /* 8001290C 0000F84C 83 B2 00 18 */ lwz r29, 0x18(r18) /* 80012910 0000F850 54 C0 04 3F */ clrlwi. r0, r6, 0x10 @@ -6620,8 +6620,8 @@ lbl_80012E94: lbl_80012EA8: /* 80012EA8 0000FDE8 B0 92 00 14 */ sth r4, 0x14(r18) lbl_80012EAC: -/* 80012EAC 0000FDEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80012EB0 0000FDF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80012EAC 0000FDEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80012EB0 0000FDF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80012EB4 0000FDF4 83 E3 61 B0 */ lwz r31, 0x61b0(r3) /* 80012EB8 0000FDF8 83 D2 00 18 */ lwz r30, 0x18(r18) /* 80012EBC 0000FDFC A0 12 00 14 */ lhz r0, 0x14(r18) @@ -7230,8 +7230,8 @@ lbl_800137D0: lbl_800137E4: /* 800137E4 00010724 B0 8F 00 34 */ sth r4, 0x34(r15) lbl_800137E8: -/* 800137E8 00010728 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800137EC 0001072C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800137E8 00010728 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800137EC 0001072C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800137F0 00010730 83 E3 61 B0 */ lwz r31, 0x61b0(r3) /* 800137F4 00010734 83 AF 00 38 */ lwz r29, 0x38(r15) /* 800137F8 00010738 54 C0 04 3F */ clrlwi. r0, r6, 0x10 @@ -7798,8 +7798,8 @@ lbl_80014028: lbl_8001403C: /* 8001403C 00010F7C B0 8F 00 34 */ sth r4, 0x34(r15) lbl_80014040: -/* 80014040 00010F80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80014044 00010F84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80014040 00010F80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80014044 00010F84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014048 00010F88 83 E3 61 B0 */ lwz r31, 0x61b0(r3) /* 8001404C 00010F8C 83 CF 00 38 */ lwz r30, 0x38(r15) /* 80014050 00010F90 A0 0F 00 34 */ lhz r0, 0x34(r15) @@ -8276,8 +8276,8 @@ lbl_800146EC: /* 80014754 00011694 80 03 00 10 */ lwz r0, 0x10(r3) /* 80014758 00011698 28 00 00 00 */ cmplwi r0, 0 /* 8001475C 0001169C 40 82 00 1C */ bne lbl_80014778 -/* 80014760 000116A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80014764 000116A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80014760 000116A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80014764 000116A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014768 000116A8 80 63 5F 90 */ lwz r3, 0x5f90(r3) /* 8001476C 000116AC 7F C4 F3 78 */ mr r4, r30 /* 80014770 000116B0 38 A0 00 00 */ li r5, 0 @@ -8439,8 +8439,8 @@ mDoExt_initFont0: /* 80014998 000118D8 7C 08 02 A6 */ mflr r0 /* 8001499C 000118DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800149A0 000118E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800149A4 000118E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800149A8 000118E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800149A4 000118E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800149A8 000118E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800149AC 000118EC 83 E3 5C A4 */ lwz r31, 0x5ca4(r3) /* 800149B0 000118F0 4B FF A3 D1 */ bl mDoExt_getZeldaHeap /* 800149B4 000118F4 7C 65 1B 78 */ mr r5, r3 @@ -8519,8 +8519,8 @@ mDoExt_initFont1: /* 80014AA8 000119E8 7C 08 02 A6 */ mflr r0 /* 80014AAC 000119EC 90 01 00 14 */ stw r0, 0x14(r1) /* 80014AB0 000119F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80014AB4 000119F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80014AB8 000119F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80014AB4 000119F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80014AB8 000119F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014ABC 000119FC 83 E3 5C A8 */ lwz r31, 0x5ca8(r3) /* 80014AC0 00011A00 4B FF A2 C1 */ bl mDoExt_getZeldaHeap /* 80014AC4 00011A04 7C 65 1B 78 */ mr r5, r3 @@ -8565,8 +8565,8 @@ mDoExt_initFont2: /* 80014B44 00011A84 7C 08 02 A6 */ mflr r0 /* 80014B48 00011A88 90 01 00 14 */ stw r0, 0x14(r1) /* 80014B4C 00011A8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80014B50 00011A90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80014B54 00011A94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80014B50 00011A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80014B54 00011A94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014B58 00011A98 83 E3 5C A8 */ lwz r31, 0x5ca8(r3) /* 80014B5C 00011A9C 4B FF A2 25 */ bl mDoExt_getZeldaHeap /* 80014B60 00011AA0 7C 65 1B 78 */ mr r5, r3 diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index d5ff5fc209..41fcee8ff9 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -427,8 +427,8 @@ lbl_80008384: /* 800083A0 000052E0 98 03 00 03 */ stb r0, 3(r3) /* 800083A4 000052E4 48 00 00 48 */ b lbl_800083EC lbl_800083A8: -/* 800083A8 000052E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800083AC 000052EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800083A8 000052E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800083AC 000052EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800083B0 000052F0 3C 63 00 02 */ addis r3, r3, 2 /* 800083B4 000052F4 88 83 DD F8 */ lbz r4, -0x2208(r3) /* 800083B8 000052F8 28 04 00 FF */ cmplwi r4, 0xff @@ -467,8 +467,8 @@ dScnPly_BeforeOfPaint: /* 80008424 00005364 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80008428 00005368 7C 08 02 A6 */ mflr r0 /* 8000842C 0000536C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80008430 00005370 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80008434 00005374 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80008430 00005370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80008434 00005374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80008438 00005378 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8000843C 0000537C 48 04 E0 FD */ bl dDlst_list_c_NS_reset /* 80008440 00005380 80 01 00 14 */ lwz r0, 0x14(r1) @@ -614,8 +614,8 @@ drawDepth2: /* 80008650 00005590 48 35 9B 5D */ bl func_803621AC /* 80008654 00005594 7C 7F 1B 78 */ mr r31, r3 /* 80008658 00005598 7C 99 23 78 */ mr r25, r4 -/* 8000865C 0000559C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80008660 000055A0 3A C3 61 C0 */ addi r22, r3, lbl_804061C0@l +/* 8000865C 0000559C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80008660 000055A0 3A C3 61 C0 */ addi r22, r3, g_dComIfG_gameInfo@l /* 80008664 000055A4 80 16 5D B4 */ lwz r0, 0x5db4(r22) /* 80008668 000055A8 28 00 00 00 */ cmplwi r0, 0 /* 8000866C 000055AC 41 82 0A F0 */ beq lbl_8000915C @@ -637,8 +637,8 @@ drawDepth2: /* 800086AC 000055EC 39 01 00 14 */ addi r8, r1, 0x14 /* 800086B0 000055F0 48 35 78 B1 */ bl GXProject lbl_800086B4: -/* 800086B4 000055F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800086B8 000055F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800086B4 000055F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800086B8 000055F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800086BC 000055FC 3A E3 5D 74 */ addi r23, r3, 0x5d74 /* 800086C0 00005600 82 23 5D 74 */ lwz r17, 0x5d74(r3) /* 800086C4 00005604 C3 C2 80 48 */ lfs f30, lbl_80451A48-_SDA2_BASE_(r2) @@ -650,8 +650,8 @@ lbl_800086B4: /* 800086DC 0000561C 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 800086E0 00005620 2C 00 00 07 */ cmpwi r0, 7 /* 800086E4 00005624 41 82 02 64 */ beq lbl_80008948 -/* 800086E8 00005628 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800086EC 0000562C 3A A3 61 C0 */ addi r21, r3, lbl_804061C0@l +/* 800086E8 00005628 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800086EC 0000562C 3A A3 61 C0 */ addi r21, r3, g_dComIfG_gameInfo@l /* 800086F0 00005630 88 15 5D B0 */ lbz r0, 0x5db0(r21) /* 800086F4 00005634 7C 00 07 74 */ extsb r0, r0 /* 800086F8 00005638 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -2438,8 +2438,8 @@ retry_captue_frame: /* 8000A1D8 00007118 54 00 00 38 */ rlwinm r0, r0, 0, 0, 0x1c /* 8000A1DC 0000711C 7C 1C 07 34 */ extsh r28, r0 /* 8000A1E0 00007120 83 6D 86 50 */ lwz r27, lbl_80450BD0-_SDA_BASE_(r13) -/* 8000A1E4 00007124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A1E8 00007128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000A1E4 00007124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A1E8 00007128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000A1EC 0000712C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8000A1F0 00007130 28 00 00 00 */ cmplwi r0, 0 /* 8000A1F4 00007134 40 82 00 84 */ bne lbl_8000A278 @@ -2699,8 +2699,8 @@ drawItem3D: /* 8000A5B4 000074F4 48 33 BE FD */ bl PSMTXCopy /* 8000A5B8 000074F8 38 60 00 01 */ li r3, 1 /* 8000A5BC 000074FC 48 35 60 15 */ bl GXSetClipMode -/* 8000A5C0 00007500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A5C4 00007504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000A5C0 00007500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A5C4 00007504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000A5C8 00007508 3B E3 5F 64 */ addi r31, r3, 0x5f64 /* 8000A5CC 0000750C 7F E3 FB 78 */ mr r3, r31 /* 8000A5D0 00007510 48 04 C1 7D */ bl dDlst_list_c_NS_drawOpaListItem3d @@ -2725,8 +2725,8 @@ drawItem3D: /* 8000A61C 0000755C F3 C1 03 C8 */ psq_st f30, 968(r1), 0, qr0 /* 8000A620 00007560 39 61 03 C0 */ addi r11, r1, 0x3c0 /* 8000A624 00007564 48 35 7B 99 */ bl func_803621BC -/* 8000A628 00007568 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A62C 0000756C 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 8000A628 00007568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A62C 0000756C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8000A630 00007570 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A634 00007574 28 03 00 00 */ cmplwi r3, 0 /* 8000A638 00007578 41 82 00 08 */ beq lbl_8000A640 @@ -2797,16 +2797,16 @@ lbl_8000A640: /* 8000A738 00007678 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 8000A73C 0000767C 48 2D F0 79 */ bl J2DOrthoGraph_NS_setPort /* 8000A740 00007680 38 01 02 A8 */ addi r0, r1, 0x2a8 -/* 8000A744 00007684 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A748 00007688 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8000A744 00007684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A748 00007688 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8000A74C 0000768C 90 05 5F 50 */ stw r0, 0x5f50(r5) /* 8000A750 00007690 3B E5 5F 64 */ addi r31, r5, 0x5f64 /* 8000A754 00007694 7F E3 FB 78 */ mr r3, r31 /* 8000A758 00007698 38 9F 00 54 */ addi r4, r31, 0x54 /* 8000A75C 0000769C 80 A5 5F C8 */ lwz r5, 0x5fc8(r5) /* 8000A760 000076A0 48 04 C0 65 */ bl dDlst_list_c_NS_draw -/* 8000A764 000076A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A768 000076A8 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l +/* 8000A764 000076A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A768 000076A8 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8000A76C 000076AC 88 1A 5D 44 */ lbz r0, 0x5d44(r26) /* 8000A770 000076B0 2C 00 00 00 */ cmpwi r0, 0 /* 8000A774 000076B4 41 82 07 84 */ beq lbl_8000AEF8 @@ -2887,8 +2887,8 @@ lbl_8000A818: /* 8000A898 000077D8 FC A0 18 90 */ fmr f5, f3 /* 8000A89C 000077DC FC C0 18 90 */ fmr f6, f3 /* 8000A8A0 000077E0 48 33 C3 79 */ bl C_MTXLightPerspective -/* 8000A8A4 000077E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000A8A8 000077E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000A8A4 000077E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000A8A8 000077E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000A8AC 000077EC 92 A3 5F 44 */ stw r21, 0x5f44(r3) /* 8000A8B0 000077F0 93 C3 5F 48 */ stw r30, 0x5f48(r3) /* 8000A8B4 000077F4 93 A3 5F 4C */ stw r29, 0x5f4c(r3) @@ -2905,25 +2905,25 @@ lbl_8000A818: /* 8000A8E0 00007820 80 9F 00 00 */ lwz r4, 0(r31) /* 8000A8E4 00007824 48 04 BD F1 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A8E8 00007828 7F E3 FB 78 */ mr r3, r31 -/* 8000A8EC 0000782C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A8F0 00007830 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A8EC 0000782C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A8F0 00007830 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A8F4 00007834 80 84 5F 68 */ lwz r4, 0x5f68(r4) /* 8000A8F8 00007838 48 04 BE 19 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000A8FC 0000783C 38 60 00 00 */ li r3, 0 /* 8000A900 00007840 48 35 5C D1 */ bl GXSetClipMode /* 8000A904 00007844 7F E3 FB 78 */ mr r3, r31 -/* 8000A908 00007848 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A90C 0000784C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A908 00007848 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A90C 0000784C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A910 00007850 80 84 5F 70 */ lwz r4, 0x5f70(r4) /* 8000A914 00007854 48 04 BD C1 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A918 00007858 7F E3 FB 78 */ mr r3, r31 -/* 8000A91C 0000785C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A920 00007860 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A91C 0000785C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A920 00007860 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A924 00007864 80 84 5F 78 */ lwz r4, 0x5f78(r4) /* 8000A928 00007868 48 04 BD AD */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A92C 0000786C 7F E3 FB 78 */ mr r3, r31 -/* 8000A930 00007870 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A934 00007874 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A930 00007870 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A934 00007874 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A938 00007878 80 84 5F B0 */ lwz r4, 0x5fb0(r4) /* 8000A93C 0000787C 48 04 BD 99 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A940 00007880 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -2944,28 +2944,28 @@ lbl_8000A970: /* 8000A974 000078B4 38 9E 01 40 */ addi r4, r30, 0x140 /* 8000A978 000078B8 48 04 B0 9D */ bl dDlst_shadowControl_c_NS_draw /* 8000A97C 000078BC 7F E3 FB 78 */ mr r3, r31 -/* 8000A980 000078C0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A984 000078C4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A980 000078C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A984 000078C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A988 000078C8 80 84 5F 80 */ lwz r4, 0x5f80(r4) /* 8000A98C 000078CC 48 04 BD 49 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A990 000078D0 7F E3 FB 78 */ mr r3, r31 -/* 8000A994 000078D4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A998 000078D8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A994 000078D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A998 000078D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A99C 000078DC 80 84 5F 88 */ lwz r4, 0x5f88(r4) /* 8000A9A0 000078E0 48 04 BD 35 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A9A4 000078E4 7F E3 FB 78 */ mr r3, r31 -/* 8000A9A8 000078E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A9AC 000078EC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A9A8 000078E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A9AC 000078EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9B0 000078F0 80 84 5F 90 */ lwz r4, 0x5f90(r4) /* 8000A9B4 000078F4 48 04 BD 21 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000A9B8 000078F8 7F E3 FB 78 */ mr r3, r31 -/* 8000A9BC 000078FC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A9C0 00007900 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A9BC 000078FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A9C0 00007900 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9C4 00007904 80 84 5F 74 */ lwz r4, 0x5f74(r4) /* 8000A9C8 00007908 48 04 BD 49 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000A9CC 0000790C 7F E3 FB 78 */ mr r3, r31 -/* 8000A9D0 00007910 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000A9D4 00007914 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000A9D0 00007910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000A9D4 00007914 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9D8 00007918 80 84 5F 7C */ lwz r4, 0x5f7c(r4) /* 8000A9DC 0000791C 48 04 BD 35 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000A9E0 00007920 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -2983,13 +2983,13 @@ lbl_8000A9F8: /* 8000AA0C 0000794C 48 04 17 7D */ bl dPa_control_c_NS_draw lbl_8000AA10: /* 8000AA10 00007950 7F E3 FB 78 */ mr r3, r31 -/* 8000AA14 00007954 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AA18 00007958 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AA14 00007954 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AA18 00007958 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AA1C 0000795C 80 84 5F 84 */ lwz r4, 0x5f84(r4) /* 8000AA20 00007960 48 04 BC F1 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000AA24 00007964 7F E3 FB 78 */ mr r3, r31 -/* 8000AA28 00007968 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AA2C 0000796C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AA28 00007968 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AA2C 0000796C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AA30 00007970 80 84 5F 8C */ lwz r4, 0x5f8c(r4) /* 8000AA34 00007974 48 04 BC DD */ bl dDlst_list_c_NS_drawXluDrawList /* 8000AA38 00007978 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -2997,8 +2997,8 @@ lbl_8000AA10: /* 8000AA40 00007980 48 30 5C FD */ bl J3DSys_NS_reinitGX /* 8000AA44 00007984 38 60 00 00 */ li r3, 0 /* 8000AA48 00007988 48 35 5B 89 */ bl GXSetClipMode -/* 8000AA4C 0000798C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000AA50 00007990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000AA4C 0000798C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000AA50 00007990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000AA54 00007994 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8000AA58 00007998 28 00 00 00 */ cmplwi r0, 0 /* 8000AA5C 0000799C 40 82 04 9C */ bne lbl_8000AEF8 @@ -3006,8 +3006,8 @@ lbl_8000AA10: /* 8000AA64 000079A4 4B FF F8 2D */ bl motionBlure /* 8000AA68 000079A8 7F C3 F3 78 */ mr r3, r30 /* 8000AA6C 000079AC 7F A4 EB 78 */ mr r4, r29 -/* 8000AA70 000079B0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8000AA74 000079B4 38 05 61 C0 */ addi r0, r5, lbl_804061C0@l +/* 8000AA70 000079B0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8000AA74 000079B4 38 05 61 C0 */ addi r0, r5, g_dComIfG_gameInfo@l /* 8000AA78 000079B8 7F 60 DA 14 */ add r27, r0, r27 /* 8000AA7C 000079BC C4 1B 5D 84 */ lfsu f0, 0x5d84(r27) /* 8000AA80 000079C0 FC 00 00 1E */ fctiwz f0, f0 @@ -3023,13 +3023,13 @@ lbl_8000AA10: /* 8000AAA8 000079E8 28 00 00 00 */ cmplwi r0, 0 /* 8000AAAC 000079EC 40 82 00 2C */ bne lbl_8000AAD8 /* 8000AAB0 000079F0 7F E3 FB 78 */ mr r3, r31 -/* 8000AAB4 000079F4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AAB8 000079F8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AAB4 000079F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AAB8 000079F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AABC 000079FC 80 84 5F A0 */ lwz r4, 0x5fa0(r4) /* 8000AAC0 00007A00 48 04 BC 15 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000AAC4 00007A04 7F E3 FB 78 */ mr r3, r31 -/* 8000AAC8 00007A08 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AACC 00007A0C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AAC8 00007A08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AACC 00007A0C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AAD0 00007A10 80 84 5F A4 */ lwz r4, 0x5fa4(r4) /* 8000AAD4 00007A14 48 04 BC 3D */ bl dDlst_list_c_NS_drawXluDrawList lbl_8000AAD8: @@ -3048,15 +3048,15 @@ lbl_8000AAF0: /* 8000AB04 00007A44 48 04 16 85 */ bl dPa_control_c_NS_draw lbl_8000AB08: /* 8000AB08 00007A48 7F E3 FB 78 */ mr r3, r31 -/* 8000AB0C 00007A4C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AB10 00007A50 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AB0C 00007A4C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AB10 00007A50 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AB14 00007A54 80 84 5F A8 */ lwz r4, 0x5fa8(r4) /* 8000AB18 00007A58 48 04 BB F9 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000AB1C 00007A5C 38 60 00 00 */ li r3, 0 /* 8000AB20 00007A60 48 35 5A B1 */ bl GXSetClipMode /* 8000AB24 00007A64 7F E3 FB 78 */ mr r3, r31 -/* 8000AB28 00007A68 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AB2C 00007A6C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AB28 00007A68 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AB2C 00007A6C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AB30 00007A70 80 84 5F 94 */ lwz r4, 0x5f94(r4) /* 8000AB34 00007A74 48 04 BB A1 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000AB38 00007A78 38 60 00 00 */ li r3, 0 @@ -3123,13 +3123,13 @@ lbl_8000ABE8: /* 8000AC10 00007B50 28 00 00 01 */ cmplwi r0, 1 /* 8000AC14 00007B54 40 82 00 2C */ bne lbl_8000AC40 /* 8000AC18 00007B58 7F E3 FB 78 */ mr r3, r31 -/* 8000AC1C 00007B5C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AC20 00007B60 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AC1C 00007B5C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AC20 00007B60 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC24 00007B64 80 84 5F A0 */ lwz r4, 0x5fa0(r4) /* 8000AC28 00007B68 48 04 BA AD */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000AC2C 00007B6C 7F E3 FB 78 */ mr r3, r31 -/* 8000AC30 00007B70 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AC34 00007B74 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AC30 00007B70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AC34 00007B74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC38 00007B78 80 84 5F A4 */ lwz r4, 0x5fa4(r4) /* 8000AC3C 00007B7C 48 04 BA D5 */ bl dDlst_list_c_NS_drawXluDrawList lbl_8000AC40: @@ -3143,8 +3143,8 @@ lbl_8000AC58: /* 8000AC58 00007B98 38 60 00 00 */ li r3, 0 /* 8000AC5C 00007B9C 48 35 59 75 */ bl GXSetClipMode /* 8000AC60 00007BA0 7F E3 FB 78 */ mr r3, r31 -/* 8000AC64 00007BA4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AC68 00007BA8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AC64 00007BA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AC68 00007BA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC6C 00007BAC 80 84 5F 6C */ lwz r4, 0x5f6c(r4) /* 8000AC70 00007BB0 48 04 BA 65 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000AC74 00007BB4 3B 3A 4E 00 */ addi r25, r26, 0x4e00 @@ -3199,8 +3199,8 @@ lbl_8000ACAC: /* 8000AD34 00007C74 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 8000AD38 00007C78 48 33 B7 79 */ bl PSMTXCopy /* 8000AD3C 00007C7C 7F E3 FB 78 */ mr r3, r31 -/* 8000AD40 00007C80 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AD44 00007C84 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AD40 00007C80 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AD44 00007C84 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AD48 00007C88 80 84 5F AC */ lwz r4, 0x5fac(r4) /* 8000AD4C 00007C8C 48 04 B9 C5 */ bl dDlst_list_c_NS_drawXluDrawList /* 8000AD50 00007C90 38 7E 01 40 */ addi r3, r30, 0x140 @@ -3256,8 +3256,8 @@ lbl_8000ADEC: /* 8000AE0C 00007D4C 38 80 00 00 */ li r4, 0 /* 8000AE10 00007D50 48 35 52 C5 */ bl GXSetProjection /* 8000AE14 00007D54 7F E3 FB 78 */ mr r3, r31 -/* 8000AE18 00007D58 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8000AE1C 00007D5C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8000AE18 00007D58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8000AE1C 00007D5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AE20 00007D60 80 84 5F B4 */ lwz r4, 0x5fb4(r4) /* 8000AE24 00007D64 48 04 B8 B1 */ bl dDlst_list_c_NS_drawOpaDrawList /* 8000AE28 00007D68 C0 02 80 38 */ lfs f0, lbl_80451A38-_SDA2_BASE_(r2) @@ -3356,8 +3356,8 @@ lbl_8000AEF8: /* 8000AF94 00007ED4 FC E0 28 90 */ fmr f7, f5 /* 8000AF98 00007ED8 FD 00 28 90 */ fmr f8, f5 /* 8000AF9C 00007EDC 48 33 BD 49 */ bl C_MTXLightOrtho -/* 8000AFA0 00007EE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000AFA4 00007EE4 3B 23 61 C0 */ addi r25, r3, lbl_804061C0@l +/* 8000AFA0 00007EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000AFA4 00007EE4 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 8000AFA8 00007EE8 88 19 5E B5 */ lbz r0, 0x5eb5(r25) /* 8000AFAC 00007EEC 28 00 00 00 */ cmplwi r0, 0 /* 8000AFB0 00007EF0 40 82 00 1C */ bne lbl_8000AFCC @@ -3379,8 +3379,8 @@ lbl_8000AFE4: /* 8000AFE8 00007F28 48 2D E7 CD */ bl J2DOrthoGraph_NS_setPort /* 8000AFEC 00007F2C 7F E3 FB 78 */ mr r3, r31 /* 8000AFF0 00007F30 38 9F 00 B4 */ addi r4, r31, 0xb4 -/* 8000AFF4 00007F34 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8000AFF8 00007F38 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8000AFF4 00007F34 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8000AFF8 00007F38 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000AFFC 00007F3C 80 A5 61 18 */ lwz r5, 0x6118(r5) /* 8000B000 00007F40 48 04 B7 C5 */ bl dDlst_list_c_NS_draw /* 8000B004 00007F44 4B FF F5 89 */ bl drawItem3D @@ -3388,14 +3388,14 @@ lbl_8000AFE4: /* 8000B00C 00007F4C 48 2D E7 A9 */ bl J2DOrthoGraph_NS_setPort /* 8000B010 00007F50 7F E3 FB 78 */ mr r3, r31 /* 8000B014 00007F54 38 9F 00 6C */ addi r4, r31, 0x6c -/* 8000B018 00007F58 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8000B01C 00007F5C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8000B018 00007F58 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8000B01C 00007F5C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000B020 00007F60 80 A5 60 10 */ lwz r5, 0x6010(r5) /* 8000B024 00007F64 48 04 B7 A1 */ bl dDlst_list_c_NS_draw /* 8000B028 00007F68 7F E3 FB 78 */ mr r3, r31 /* 8000B02C 00007F6C 38 9F 01 BC */ addi r4, r31, 0x1bc -/* 8000B030 00007F70 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8000B034 00007F74 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8000B030 00007F70 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8000B034 00007F74 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000B038 00007F78 80 A5 61 A0 */ lwz r5, 0x61a0(r5) /* 8000B03C 00007F7C 48 04 B7 89 */ bl dDlst_list_c_NS_draw /* 8000B040 00007F80 88 19 5E B5 */ lbz r0, 0x5eb5(r25) @@ -3408,8 +3408,8 @@ lbl_8000AFE4: /* 8000B05C 00007F9C 38 A0 00 0F */ li r5, 0xf /* 8000B060 00007FA0 48 04 11 29 */ bl dPa_control_c_NS_draw lbl_8000B064: -/* 8000B064 00007FA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000B068 00007FA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000B064 00007FA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000B068 00007FA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000B06C 00007FAC 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8000B070 00007FB0 3C 80 80 37 */ lis r4, lbl_80373DD0@ha /* 8000B074 00007FB4 38 84 3D D0 */ addi r4, r4, lbl_80373DD0@l @@ -3494,8 +3494,8 @@ mDoGph_Create: /* 8000B190 000080D0 48 00 3E 2D */ bl mDoExt_createSolidHeapToCurrent_X1_ /* 8000B194 000080D4 7C 7F 1B 78 */ mr r31, r3 /* 8000B198 000080D8 4B FF CC AD */ bl mDoGph_gInf_c_NS_create -/* 8000B19C 000080DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8000B1A0 000080E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8000B19C 000080DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8000B1A0 000080E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000B1A4 000080E4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8000B1A8 000080E8 48 04 B1 E9 */ bl dDlst_list_c_NS_init /* 8000B1AC 000080EC 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/m/Do/m_Do_lib.s b/asm/m/Do/m_Do_lib.s index 35c7d3c796..881ffaa7c0 100644 --- a/asm/m/Do/m_Do_lib.s +++ b/asm/m/Do/m_Do_lib.s @@ -137,8 +137,8 @@ mDoLib_project: /* 80015320 00012260 48 34 CE BD */ bl _savegpr_29 /* 80015324 00012264 7C 7D 1B 78 */ mr r29, r3 /* 80015328 00012268 7C 9E 23 78 */ mr r30, r4 -/* 8001532C 0001226C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80015330 00012270 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8001532C 0001226C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80015330 00012270 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80015334 00012274 80 7F 61 B0 */ lwz r3, 0x61b0(r31) /* 80015338 00012278 28 03 00 00 */ cmplwi r3, 0 /* 8001533C 0001227C 40 82 00 18 */ bne lbl_80015354 @@ -200,8 +200,8 @@ lbl_800153FC: /* 80015408 00012348 EC 00 00 F2 */ fmuls f0, f0, f3 /* 8001540C 0001234C D0 1E 00 08 */ stfs f0, 8(r30) lbl_80015410: -/* 80015410 00012350 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80015414 00012354 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80015410 00012350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80015414 00012354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80015418 00012358 80 63 61 AC */ lwz r3, 0x61ac(r3) /* 8001541C 0001235C C0 02 81 84 */ lfs f0, lbl_80451B84-_SDA2_BASE_(r2) /* 80015420 00012360 C0 23 00 00 */ lfs f1, 0(r3) @@ -268,8 +268,8 @@ mDoLib_pos2camera: /* 800154F4 00012434 90 01 00 14 */ stw r0, 0x14(r1) /* 800154F8 00012438 7C 60 1B 78 */ mr r0, r3 /* 800154FC 0001243C 7C 85 23 78 */ mr r5, r4 -/* 80015500 00012440 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80015504 00012444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80015500 00012440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80015504 00012444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80015508 00012448 80 63 61 B0 */ lwz r3, 0x61b0(r3) /* 8001550C 0001244C 28 03 00 00 */ cmplwi r3, 0 /* 80015510 00012450 40 82 00 18 */ bne lbl_80015528 diff --git a/asm/m/Do/machine/m_Do_machine_exception.s b/asm/m/Do/machine/m_Do_machine_exception.s index 0149b67898..92c046efb1 100644 --- a/asm/m/Do/machine/m_Do_machine_exception.s +++ b/asm/m/Do/machine/m_Do_machine_exception.s @@ -119,8 +119,8 @@ dispHeapInfo: /* 80017F1C 00014E5C 48 2B B2 FD */ bl JKRAramHeap_NS_dump lbl_80017F20: /* 80017F20 00014E60 48 24 A5 51 */ bl DynamicModuleControlBase_NS_dump -/* 80017F24 00014E64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80017F28 00014E68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80017F24 00014E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80017F28 00014E68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80017F2C 00014E6C 3C 63 00 02 */ addis r3, r3, 2 /* 80017F30 00014E70 38 63 C2 F8 */ addi r3, r3, -15624 /* 80017F34 00014E74 48 02 47 05 */ bl dRes_control_c_NS_dump @@ -154,8 +154,8 @@ dispGameInfo: /* 80017F98 00014ED8 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017F9C 00014EDC 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017FA0 00014EE0 38 63 00 A5 */ addi r3, r3, 0xa5 -/* 80017FA4 00014EE4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80017FA8 00014EE8 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 80017FA4 00014EE4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80017FA8 00014EE8 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 80017FAC 00014EEC 38 85 4E 00 */ addi r4, r5, 0x4e00 /* 80017FB0 00014EF0 88 05 4E 0A */ lbz r0, 0x4e0a(r5) /* 80017FB4 00014EF4 7C 05 07 74 */ extsb r5, r0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s index d128015a86..a6e1d10964 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s @@ -214,8 +214,8 @@ lbl_802C4160: /* 802C4198 002C10D8 FF C0 08 90 */ fmr f30, f1 /* 802C419C 002C10DC 48 00 01 30 */ b lbl_802C42CC lbl_802C41A0: -/* 802C41A0 002C10E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802C41A4 002C10E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802C41A0 002C10E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802C41A4 002C10E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802C41A8 002C10E8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 802C41AC 002C10EC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802C41B0 002C10F0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index caedb6d864..3c403a7669 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -1146,15 +1146,15 @@ lbl_802B7B58: /* 802B7BA4 002B4AE4 38 C0 04 4C */ li r6, 0x44c /* 802B7BA8 002B4AE8 38 E0 05 DC */ li r7, 0x5dc /* 802B7BAC 002B4AEC 48 00 7D D5 */ bl Z2SoundObjMgr_NS_setForceBattleArea -/* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e /* 802B7BBC 002B4AFC 38 A0 00 00 */ li r5, 0 /* 802B7BC0 002B4B00 4B D7 D7 A1 */ bl isSwitch__10dSv_info_cCFii /* 802B7BC4 002B4B04 2C 03 00 00 */ cmpwi r3, 0 /* 802B7BC8 002B4B08 41 82 00 3C */ beq lbl_802B7C04 -/* 802B7BCC 002B4B0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802B7BD0 002B4B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802B7BCC 002B4B0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802B7BD0 002B4B10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BD4 002B4B14 38 80 00 11 */ li r4, 0x11 /* 802B7BD8 002B4B18 38 A0 00 00 */ li r5, 0 /* 802B7BDC 002B4B1C 4B D7 D7 85 */ bl isSwitch__10dSv_info_cCFii diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s b/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s index 1df38370ea..3e1d245934 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s @@ -19,8 +19,8 @@ lbl_8002B260: /* 8002B270 000281B0 88 1F 4F 51 */ lbz r0, 0x4f51(r31) /* 8002B274 000281B4 28 00 00 02 */ cmplwi r0, 2 /* 8002B278 000281B8 40 82 00 14 */ bne lbl_8002B28C -/* 8002B27C 000281BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8002B27C 000281BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B284 000281C4 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8002B288 000281C8 4B FF 90 B1 */ bl dStage_roomControl_c_NS_initZone lbl_8002B28C: diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 211dd2befc..4b83ef050d 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -36,6 +36,27 @@ class dComIfG_camera_info_class { u8 unk[0x38]; }; +struct item_func{ + float hearts; //bf80 + u32 rupees; //bf84 + s16 small_keys; //bf88 + s16 kakera_heart; //bf8a + s16 magic; //bf8c + u16 unk; //bf8e + s16 magic_lv; //bf90 + u8 unk2[2]; //bf92/93 // removed stuff? + u32 unk3; //bf94 //related to lantern? + u32 unk4; //bf98 //related to lantern? + u32 unk5; //bf9c //related to lantern? + u32 unk6; //bfa0 //related to oxygen? + u32 unk7; //bfa4 //related to oxygen? + u32 unk8; //bfa8 //related to oxygen? + u32 unk9; //bfac //related to oxygen? + u32 unk10; //bfb0 //related to oxygen? + s16 arrows; //bfb4 + s16 seeds; //bfb6 +}; + // 16 bytes too big, figure out later class dComIfG_inf_c { public: @@ -61,7 +82,9 @@ class dComIfG_inf_c { /* 0x05B04 */ u8 unk10[0x244]; /* 0x05D48 */ dDlst_window_c draw_list_window; /* 0x05D74 */ dComIfG_camera_info_class camera_info_class; - /* 0x05DAC */ u8 unk11[0x190]; + /* 0x05DAC */ u8 unk11[0x14]; + /* 0x05DC0 */ item_func give_item; + /* 0x05DF8 */ u8 unk35[0x144]; /* 0x05F3C */ u32 unk12; /* 0x05F30 */ u32 unk13; /* 0x05F34 */ u32 unk14; diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192954.s b/include/d/d_file/d_file_sel_info/asm/func_80192954.s index cda4dcc668..c950046ee0 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192954.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192954.s @@ -15,8 +15,8 @@ /* 8019298C 0018F8CC 28 00 00 01 */ cmplwi r0, 1 /* 80192990 0018F8D0 40 82 00 8C */ bne lbl_80192A1C /* 80192994 0018F8D4 54 C6 06 3E */ clrlwi r6, r6, 0x18 -/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801929A0 0018F8E0 88 05 0F 18 */ lbz r0, 0xf18(r5) /* 801929A4 0018F8E4 7C 06 00 40 */ cmplw r6, r0 /* 801929A8 0018F8E8 40 82 00 74 */ bne lbl_80192A1C @@ -25,8 +25,8 @@ /* 801929B4 0018F8F4 48 00 00 ED */ bl setHeartCnt__12dFile_info_cFP10dSv_save_c /* 801929B8 0018F8F8 38 00 00 0C */ li r0, 0xc /* 801929BC 0018F8FC B0 1D 00 02 */ sth r0, 2(r29) -/* 801929C0 0018F900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801929C0 0018F900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801929C8 0018F908 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801929CC 0018F90C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801929D0 0018F910 48 1D 61 5D */ bl strcpy diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D60.s b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s index f544dc7ac6..f519d95d89 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192D60.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s @@ -2,8 +2,8 @@ /* 80192D64 0018FCA4 7C 08 02 A6 */ mflr r0 /* 80192D68 0018FCA8 90 01 00 14 */ stw r0, 0x14(r1) /* 80192D6C 0018FCAC 7C 66 1B 78 */ mr r6, r3 -/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80192D78 0018FCB8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80192D7C 0018FCBC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80192D80 0018FCC0 38 A3 01 B8 */ addi r5, r3, 0x1b8 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s index 449c515466..5b220f1702 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s @@ -4,8 +4,8 @@ /* 80192DA8 0018FCE8 39 61 00 50 */ addi r11, r1, 0x50 /* 80192DAC 0018FCEC 48 1C F4 31 */ bl _savegpr_29 /* 80192DB0 0018FCF0 7C 7D 1B 78 */ mr r29, r3 -/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80192DBC 0018FCFC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80192DC0 0018FD00 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80192DC4 0018FD04 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/d/d_item/d_item/asm/func_80097E8C.s b/include/d/d_item/d_item/asm/func_80097E8C.s new file mode 100644 index 0000000000..fdf96800f0 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80097E8C.s @@ -0,0 +1,21 @@ +/* 80097E8C 00094DCC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80097E90 00094DD0 7C 08 02 A6 */ mflr r0 +/* 80097E94 00094DD4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80097E98 00094DD8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80097E9C 00094DDC 7C 7F 1B 78 */ mr r31, r3 +/* 80097EA0 00094DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80097EA4 00094DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80097EA8 00094DE8 38 63 00 CC */ addi r3, r3, 0xcc +/* 80097EAC 00094DEC 7F E4 FB 78 */ mr r4, r31 +/* 80097EB0 00094DF0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc +/* 80097EB4 00094DF4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d +/* 80097EB8 00094DF8 3C 60 80 3B */ lis r3, item_func_ptr@ha +/* 80097EBC 00094DFC 38 63 F1 78 */ addi r3, r3, item_func_ptr@l +/* 80097EC0 00094E00 7D 83 00 2E */ lwzx r12, r3, r0 +/* 80097EC4 00094E04 7D 89 03 A6 */ mtctr r12 +/* 80097EC8 00094E08 4E 80 04 21 */ bctrl +/* 80097ECC 00094E0C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80097ED0 00094E10 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80097ED4 00094E14 7C 08 03 A6 */ mtlr r0 +/* 80097ED8 00094E18 38 21 00 10 */ addi r1, r1, 0x10 +/* 80097EDC 00094E1C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80097EE0.s b/include/d/d_item/d_item/asm/func_80097EE0.s new file mode 100644 index 0000000000..3cf5b0aa85 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80097EE0.s @@ -0,0 +1,20 @@ +/* 80097EE0 00094E20 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80097EE4 00094E24 7C 08 02 A6 */ mflr r0 +/* 80097EE8 00094E28 90 01 00 14 */ stw r0, 0x14(r1) +/* 80097EEC 00094E2C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80097EF0 00094E30 7C 9F 23 78 */ mr r31, r4 +/* 80097EF4 00094E34 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d +/* 80097EF8 00094E38 3C 60 80 3B */ lis r3, item_getcheck_func_ptr@ha +/* 80097EFC 00094E3C 38 63 F5 78 */ addi r3, r3, item_getcheck_func_ptr@l +/* 80097F00 00094E40 7D 83 00 2E */ lwzx r12, r3, r0 +/* 80097F04 00094E44 7D 89 03 A6 */ mtctr r12 +/* 80097F08 00094E48 4E 80 04 21 */ bctrl +/* 80097F0C 00094E4C 2C 03 FF FF */ cmpwi r3, -1 +/* 80097F10 00094E50 40 82 00 08 */ bne lbl_80097F18 +/* 80097F14 00094E54 7F E3 FB 78 */ mr r3, r31 +lbl_80097F18: +/* 80097F18 00094E58 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80097F1C 00094E5C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80097F20 00094E60 7C 08 03 A6 */ mtlr r0 +/* 80097F24 00094E64 38 21 00 10 */ addi r1, r1, 0x10 +/* 80097F28 00094E68 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_800982B4.s b/include/d/d_item/d_item/asm/func_800982B4.s new file mode 100644 index 0000000000..8fb01cbf4a --- /dev/null +++ b/include/d/d_item/d_item/asm/func_800982B4.s @@ -0,0 +1,36 @@ +/* 800982B4 000951F4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800982B8 000951F8 7C 08 02 A6 */ mflr r0 +/* 800982BC 000951FC 90 01 00 14 */ stw r0, 0x14(r1) +/* 800982C0 00095200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800982C4 00095204 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l +/* 800982C8 00095208 A8 64 5D CA */ lha r3, 0x5dca(r4) +/* 800982CC 0009520C 38 03 00 05 */ addi r0, r3, 5 +/* 800982D0 00095210 B0 04 5D CA */ sth r0, 0x5dca(r4) +/* 800982D4 00095214 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge +/* 800982D8 00095218 54 60 04 3E */ clrlwi r0, r3, 0x10 +/* 800982DC 0009521C C8 22 91 E0 */ lfd f1, lbl_80452BE0-_SDA2_BASE_(r2) +/* 800982E0 00095220 90 01 00 0C */ stw r0, 0xc(r1) +/* 800982E4 00095224 3C 00 43 30 */ lis r0, 0x4330 +/* 800982E8 00095228 90 01 00 08 */ stw r0, 8(r1) +/* 800982EC 0009522C C8 01 00 08 */ lfd f0, 8(r1) +/* 800982F0 00095230 EC 20 08 28 */ fsubs f1, f0, f1 +/* 800982F4 00095234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800982F8 00095238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 800982FC 0009523C C0 03 5D C0 */ lfs f0, 0x5dc0(r3) +/* 80098300 00095240 EC 00 08 2A */ fadds f0, f0, f1 +/* 80098304 00095244 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) +/* 80098308 00095248 38 00 00 00 */ li r0, 0 +/* 8009830C 0009524C 98 03 5E B6 */ stb r0, 0x5eb6(r3) +/* 80098310 00095250 85 83 4E 20 */ lwzu r12, 0x4e20(r3) +/* 80098314 00095254 81 8C 00 BC */ lwz r12, 0xbc(r12) +/* 80098318 00095258 7D 89 03 A6 */ mtctr r12 +/* 8009831C 0009525C 4E 80 04 21 */ bctrl +/* 80098320 00095260 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80098324 00095264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098328 00095268 38 63 09 58 */ addi r3, r3, 0x958 +/* 8009832C 0009526C 38 80 00 04 */ li r4, 4 +/* 80098330 00095270 4B F9 C5 E9 */ bl onDungeonItem__12dSv_memBit_cFi +/* 80098334 00095274 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80098338 00095278 7C 08 03 A6 */ mtlr r0 +/* 8009833C 0009527C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80098340 00095280 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_800986C4.s b/include/d/d_item/d_item/asm/func_800986C4.s new file mode 100644 index 0000000000..bd50cddf10 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_800986C4.s @@ -0,0 +1,21 @@ +/* 800986C4 00095604 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800986C8 00095608 7C 08 02 A6 */ mflr r0 +/* 800986CC 0009560C 90 01 00 14 */ stw r0, 0x14(r1) +/* 800986D0 00095610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800986D4 00095614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 800986D8 00095618 38 63 01 00 */ addi r3, r3, 0x100 +/* 800986DC 0009561C 38 80 00 01 */ li r4, 1 +/* 800986E0 00095620 38 A0 00 02 */ li r5, 2 +/* 800986E4 00095624 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc +/* 800986E8 00095628 38 60 00 3F */ li r3, 0x3f +/* 800986EC 0009562C 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword +/* 800986F0 00095630 88 AD 87 E4 */ lbz r5, lbl_80450D64-_SDA_BASE_(r13) +/* 800986F4 00095634 7C A5 07 74 */ extsb r5, r5 +/* 800986F8 00095638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800986FC 0009563C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098700 00095640 38 80 00 1C */ li r4, 0x1c +/* 80098704 00095644 4B F9 CA FD */ bl onSwitch__10dSv_info_cFii +/* 80098708 00095648 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009870C 0009564C 7C 08 03 A6 */ mtlr r0 +/* 80098710 00095650 38 21 00 10 */ addi r1, r1, 0x10 +/* 80098714 00095654 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_800987B4.s b/include/d/d_item/d_item/asm/func_800987B4.s new file mode 100644 index 0000000000..e82234991f --- /dev/null +++ b/include/d/d_item/d_item/asm/func_800987B4.s @@ -0,0 +1,18 @@ +/* 800987B4 000956F4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800987B8 000956F8 7C 08 02 A6 */ mflr r0 +/* 800987BC 000956FC 90 01 00 14 */ stw r0, 0x14(r1) +/* 800987C0 00095700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800987C4 00095704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 800987C8 00095708 38 63 00 9C */ addi r3, r3, 0x9c +/* 800987CC 0009570C 38 80 00 04 */ li r4, 4 +/* 800987D0 00095710 38 A0 00 43 */ li r5, 0x43 +/* 800987D4 00095714 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc +/* 800987D8 00095718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800987DC 0009571C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 800987E0 00095720 38 00 00 1E */ li r0, 0x1e +/* 800987E4 00095724 98 03 00 EC */ stb r0, 0xec(r3) +/* 800987E8 00095728 98 03 00 F8 */ stb r0, 0xf8(r3) +/* 800987EC 0009572C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800987F0 00095730 7C 08 03 A6 */ mtlr r0 +/* 800987F4 00095734 38 21 00 10 */ addi r1, r1, 0x10 +/* 800987F8 00095738 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80098AB0.s b/include/d/d_item/d_item/asm/func_80098AB0.s new file mode 100644 index 0000000000..18a7f8b31b --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80098AB0.s @@ -0,0 +1,6 @@ +/* 80098AB0 000959F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80098AB4 000959F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098AB8 000959F8 38 00 00 3C */ li r0, 0x3c +/* 80098ABC 000959FC 98 03 00 EC */ stb r0, 0xec(r3) +/* 80098AC0 00095A00 98 03 00 F8 */ stb r0, 0xf8(r3) +/* 80098AC4 00095A04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80098AE0.s b/include/d/d_item/d_item/asm/func_80098AE0.s new file mode 100644 index 0000000000..07a6029041 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80098AE0.s @@ -0,0 +1,6 @@ +/* 80098AE0 00095A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80098AE4 00095A24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098AE8 00095A28 38 00 00 64 */ li r0, 0x64 +/* 80098AEC 00095A2C 98 03 00 EC */ stb r0, 0xec(r3) +/* 80098AF0 00095A30 98 03 00 F8 */ stb r0, 0xf8(r3) +/* 80098AF4 00095A34 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80098EE4.s b/include/d/d_item/d_item/asm/func_80098EE4.s new file mode 100644 index 0000000000..989de506ed --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80098EE4.s @@ -0,0 +1,43 @@ +/* 80098EE4 00095E24 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80098EE8 00095E28 7C 08 02 A6 */ mflr r0 +/* 80098EEC 00095E2C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80098EF0 00095E30 39 61 00 20 */ addi r11, r1, 0x20 +/* 80098EF4 00095E34 48 2C 92 E9 */ bl _savegpr_29 +/* 80098EF8 00095E38 3B C0 00 FF */ li r30, 0xff +/* 80098EFC 00095E3C 3B A0 00 00 */ li r29, 0 +/* 80098F00 00095E40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80098F04 00095E44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098F08 00095E48 3B E3 00 9C */ addi r31, r3, 0x9c +lbl_80098F0C: +/* 80098F0C 00095E4C 7F E3 FB 78 */ mr r3, r31 +/* 80098F10 00095E50 38 9D 00 0B */ addi r4, r29, 0xb +/* 80098F14 00095E54 38 A0 00 01 */ li r5, 1 +/* 80098F18 00095E58 4B F9 A1 19 */ bl getItem__17dSv_player_item_cCFib +/* 80098F1C 00095E5C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80098F20 00095E60 28 00 00 60 */ cmplwi r0, 0x60 +/* 80098F24 00095E64 40 82 00 0C */ bne lbl_80098F30 +/* 80098F28 00095E68 7F BE EB 78 */ mr r30, r29 +/* 80098F2C 00095E6C 48 00 00 10 */ b lbl_80098F3C +lbl_80098F30: +/* 80098F30 00095E70 3B BD 00 01 */ addi r29, r29, 1 +/* 80098F34 00095E74 2C 1D 00 04 */ cmpwi r29, 4 +/* 80098F38 00095E78 41 80 FF D4 */ blt lbl_80098F0C +lbl_80098F3C: +/* 80098F3C 00095E7C 2C 1E 00 FF */ cmpwi r30, 0xff +/* 80098F40 00095E80 41 82 00 28 */ beq lbl_80098F68 +/* 80098F44 00095E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80098F48 00095E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80098F4C 00095E8C 38 63 00 EC */ addi r3, r3, 0xec +/* 80098F50 00095E90 57 C4 06 3E */ clrlwi r4, r30, 0x18 +/* 80098F54 00095E94 38 A0 00 0A */ li r5, 0xa +/* 80098F58 00095E98 4B F9 B0 35 */ bl setBottleNum__24dSv_player_item_record_cFUcUc +/* 80098F5C 00095E9C 7F E3 FB 78 */ mr r3, r31 +/* 80098F60 00095EA0 38 80 00 76 */ li r4, 0x76 +/* 80098F64 00095EA4 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc +lbl_80098F68: +/* 80098F68 00095EA8 39 61 00 20 */ addi r11, r1, 0x20 +/* 80098F6C 00095EAC 48 2C 92 BD */ bl _restgpr_29 +/* 80098F70 00095EB0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80098F74 00095EB4 7C 08 03 A6 */ mtlr r0 +/* 80098F78 00095EB8 38 21 00 20 */ addi r1, r1, 0x20 +/* 80098F7C 00095EBC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099A70.s b/include/d/d_item/d_item/asm/func_80099A70.s new file mode 100644 index 0000000000..7067b375e1 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099A70.s @@ -0,0 +1,17 @@ +/* 80099A70 000969B0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099A74 000969B4 7C 08 02 A6 */ mflr r0 +/* 80099A78 000969B8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099A7C 000969BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099A80 000969C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099A84 000969C4 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099A88 000969C8 38 80 00 12 */ li r4, 0x12 +/* 80099A8C 000969CC 38 A0 00 01 */ li r5, 1 +/* 80099A90 000969D0 4B F9 95 A1 */ bl getItem__17dSv_player_item_cCFib +/* 80099A94 000969D4 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099A98 000969D8 20 00 00 25 */ subfic r0, r0, 0x25 +/* 80099A9C 000969DC 7C 00 00 34 */ cntlzw r0, r0 +/* 80099AA0 000969E0 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099AA4 000969E4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099AA8 000969E8 7C 08 03 A6 */ mtlr r0 +/* 80099AAC 000969EC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099AB0 000969F0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099AE4.s b/include/d/d_item/d_item/asm/func_80099AE4.s new file mode 100644 index 0000000000..aff6a74b69 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099AE4.s @@ -0,0 +1,17 @@ +/* 80099AE4 00096A24 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099AE8 00096A28 7C 08 02 A6 */ mflr r0 +/* 80099AEC 00096A2C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099AF0 00096A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099AF4 00096A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099AF8 00096A38 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099AFC 00096A3C 38 80 00 12 */ li r4, 0x12 +/* 80099B00 00096A40 38 A0 00 01 */ li r5, 1 +/* 80099B04 00096A44 4B F9 95 2D */ bl getItem__17dSv_player_item_cCFib +/* 80099B08 00096A48 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099B0C 00096A4C 20 00 00 27 */ subfic r0, r0, 0x27 +/* 80099B10 00096A50 7C 00 00 34 */ cntlzw r0, r0 +/* 80099B14 00096A54 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099B18 00096A58 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099B1C 00096A5C 7C 08 03 A6 */ mtlr r0 +/* 80099B20 00096A60 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099B24 00096A64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099C20.s b/include/d/d_item/d_item/asm/func_80099C20.s new file mode 100644 index 0000000000..e1cd52aaea --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099C20.s @@ -0,0 +1,17 @@ +/* 80099C20 00096B60 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099C24 00096B64 7C 08 02 A6 */ mflr r0 +/* 80099C28 00096B68 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099C2C 00096B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099C30 00096B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099C34 00096B74 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099C38 00096B78 38 80 00 12 */ li r4, 0x12 +/* 80099C3C 00096B7C 38 A0 00 01 */ li r5, 1 +/* 80099C40 00096B80 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib +/* 80099C44 00096B84 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099C48 00096B88 20 00 00 2D */ subfic r0, r0, 0x2d +/* 80099C4C 00096B8C 7C 00 00 34 */ cntlzw r0, r0 +/* 80099C50 00096B90 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099C54 00096B94 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099C58 00096B98 7C 08 03 A6 */ mtlr r0 +/* 80099C5C 00096B9C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099C60 00096BA0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099D30.s b/include/d/d_item/d_item/asm/func_80099D30.s new file mode 100644 index 0000000000..a6e69f1e02 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099D30.s @@ -0,0 +1,17 @@ +/* 80099D30 00096C70 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099D34 00096C74 7C 08 02 A6 */ mflr r0 +/* 80099D38 00096C78 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099D3C 00096C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099D40 00096C80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099D44 00096C84 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099D48 00096C88 38 80 00 12 */ li r4, 0x12 +/* 80099D4C 00096C8C 38 A0 00 01 */ li r5, 1 +/* 80099D50 00096C90 4B F9 92 E1 */ bl getItem__17dSv_player_item_cCFib +/* 80099D54 00096C94 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099D58 00096C98 20 00 00 25 */ subfic r0, r0, 0x25 +/* 80099D5C 00096C9C 7C 00 00 34 */ cntlzw r0, r0 +/* 80099D60 00096CA0 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099D64 00096CA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099D68 00096CA8 7C 08 03 A6 */ mtlr r0 +/* 80099D6C 00096CAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099D70 00096CB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099D8C.s b/include/d/d_item/d_item/asm/func_80099D8C.s new file mode 100644 index 0000000000..92016f8fa3 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099D8C.s @@ -0,0 +1,17 @@ +/* 80099D8C 00096CCC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099D90 00096CD0 7C 08 02 A6 */ mflr r0 +/* 80099D94 00096CD4 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099D98 00096CD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099D9C 00096CDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099DA0 00096CE0 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099DA4 00096CE4 38 80 00 14 */ li r4, 0x14 +/* 80099DA8 00096CE8 38 A0 00 01 */ li r5, 1 +/* 80099DAC 00096CEC 4B F9 92 85 */ bl getItem__17dSv_player_item_cCFib +/* 80099DB0 00096CF0 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099DB4 00096CF4 20 00 00 3D */ subfic r0, r0, 0x3d +/* 80099DB8 00096CF8 7C 00 00 34 */ cntlzw r0, r0 +/* 80099DBC 00096CFC 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099DC0 00096D00 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099DC4 00096D04 7C 08 03 A6 */ mtlr r0 +/* 80099DC8 00096D08 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099DCC 00096D0C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099E30.s b/include/d/d_item/d_item/asm/func_80099E30.s new file mode 100644 index 0000000000..5245720bcb --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099E30.s @@ -0,0 +1,17 @@ +/* 80099E30 00096D70 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099E34 00096D74 7C 08 02 A6 */ mflr r0 +/* 80099E38 00096D78 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099E3C 00096D7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099E40 00096D80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099E44 00096D84 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099E48 00096D88 38 80 00 00 */ li r4, 0 +/* 80099E4C 00096D8C 38 A0 00 01 */ li r5, 1 +/* 80099E50 00096D90 4B F9 91 E1 */ bl getItem__17dSv_player_item_cCFib +/* 80099E54 00096D94 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099E58 00096D98 20 00 00 40 */ subfic r0, r0, 0x40 +/* 80099E5C 00096D9C 7C 00 00 34 */ cntlzw r0, r0 +/* 80099E60 00096DA0 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099E64 00096DA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099E68 00096DA8 7C 08 03 A6 */ mtlr r0 +/* 80099E6C 00096DAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099E70 00096DB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099E74.s b/include/d/d_item/d_item/asm/func_80099E74.s new file mode 100644 index 0000000000..546af449c5 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099E74.s @@ -0,0 +1,17 @@ +/* 80099E74 00096DB4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099E78 00096DB8 7C 08 02 A6 */ mflr r0 +/* 80099E7C 00096DBC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099E80 00096DC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099E84 00096DC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099E88 00096DC8 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099E8C 00096DCC 38 80 00 02 */ li r4, 2 +/* 80099E90 00096DD0 38 A0 00 01 */ li r5, 1 +/* 80099E94 00096DD4 4B F9 91 9D */ bl getItem__17dSv_player_item_cCFib +/* 80099E98 00096DD8 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099E9C 00096DDC 20 00 00 41 */ subfic r0, r0, 0x41 +/* 80099EA0 00096DE0 7C 00 00 34 */ cntlzw r0, r0 +/* 80099EA4 00096DE4 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099EA8 00096DE8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099EAC 00096DEC 7C 08 03 A6 */ mtlr r0 +/* 80099EB0 00096DF0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099EB4 00096DF4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099EB8.s b/include/d/d_item/d_item/asm/func_80099EB8.s new file mode 100644 index 0000000000..e345888375 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099EB8.s @@ -0,0 +1,17 @@ +/* 80099EB8 00096DF8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099EBC 00096DFC 7C 08 02 A6 */ mflr r0 +/* 80099EC0 00096E00 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099EC4 00096E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099EC8 00096E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099ECC 00096E0C 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099ED0 00096E10 38 80 00 06 */ li r4, 6 +/* 80099ED4 00096E14 38 A0 00 01 */ li r5, 1 +/* 80099ED8 00096E18 4B F9 91 59 */ bl getItem__17dSv_player_item_cCFib +/* 80099EDC 00096E1C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099EE0 00096E20 20 00 00 42 */ subfic r0, r0, 0x42 +/* 80099EE4 00096E24 7C 00 00 34 */ cntlzw r0, r0 +/* 80099EE8 00096E28 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099EEC 00096E2C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099EF0 00096E30 7C 08 03 A6 */ mtlr r0 +/* 80099EF4 00096E34 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099EF8 00096E38 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099EFC.s b/include/d/d_item/d_item/asm/func_80099EFC.s new file mode 100644 index 0000000000..3eac3ac79a --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099EFC.s @@ -0,0 +1,17 @@ +/* 80099EFC 00096E3C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099F00 00096E40 7C 08 02 A6 */ mflr r0 +/* 80099F04 00096E44 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099F08 00096E48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099F0C 00096E4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099F10 00096E50 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099F14 00096E54 38 80 00 04 */ li r4, 4 +/* 80099F18 00096E58 38 A0 00 00 */ li r5, 0 +/* 80099F1C 00096E5C 4B F9 91 15 */ bl getItem__17dSv_player_item_cCFib +/* 80099F20 00096E60 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099F24 00096E64 20 00 00 43 */ subfic r0, r0, 0x43 +/* 80099F28 00096E68 7C 00 00 34 */ cntlzw r0, r0 +/* 80099F2C 00096E6C 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099F30 00096E70 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099F34 00096E74 7C 08 03 A6 */ mtlr r0 +/* 80099F38 00096E78 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099F3C 00096E7C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099F40.s b/include/d/d_item/d_item/asm/func_80099F40.s new file mode 100644 index 0000000000..cc47afaf69 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099F40.s @@ -0,0 +1,17 @@ +/* 80099F40 00096E80 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099F44 00096E84 7C 08 02 A6 */ mflr r0 +/* 80099F48 00096E88 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099F4C 00096E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099F50 00096E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099F54 00096E94 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099F58 00096E98 38 80 00 09 */ li r4, 9 +/* 80099F5C 00096E9C 38 A0 00 01 */ li r5, 1 +/* 80099F60 00096EA0 4B F9 90 D1 */ bl getItem__17dSv_player_item_cCFib +/* 80099F64 00096EA4 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099F68 00096EA8 20 00 00 44 */ subfic r0, r0, 0x44 +/* 80099F6C 00096EAC 7C 00 00 34 */ cntlzw r0, r0 +/* 80099F70 00096EB0 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099F74 00096EB4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099F78 00096EB8 7C 08 03 A6 */ mtlr r0 +/* 80099F7C 00096EBC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099F80 00096EC0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099F84.s b/include/d/d_item/d_item/asm/func_80099F84.s new file mode 100644 index 0000000000..f8a09bfac3 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099F84.s @@ -0,0 +1,17 @@ +/* 80099F84 00096EC4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099F88 00096EC8 7C 08 02 A6 */ mflr r0 +/* 80099F8C 00096ECC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099F90 00096ED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099F94 00096ED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099F98 00096ED8 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099F9C 00096EDC 38 80 00 03 */ li r4, 3 +/* 80099FA0 00096EE0 38 A0 00 01 */ li r5, 1 +/* 80099FA4 00096EE4 4B F9 90 8D */ bl getItem__17dSv_player_item_cCFib +/* 80099FA8 00096EE8 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099FAC 00096EEC 20 00 00 45 */ subfic r0, r0, 0x45 +/* 80099FB0 00096EF0 7C 00 00 34 */ cntlzw r0, r0 +/* 80099FB4 00096EF4 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099FB8 00096EF8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80099FBC 00096EFC 7C 08 03 A6 */ mtlr r0 +/* 80099FC0 00096F00 38 21 00 10 */ addi r1, r1, 0x10 +/* 80099FC4 00096F04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_80099FC8.s b/include/d/d_item/d_item/asm/func_80099FC8.s new file mode 100644 index 0000000000..9108e0f92b --- /dev/null +++ b/include/d/d_item/d_item/asm/func_80099FC8.s @@ -0,0 +1,17 @@ +/* 80099FC8 00096F08 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80099FCC 00096F0C 7C 08 02 A6 */ mflr r0 +/* 80099FD0 00096F10 90 01 00 14 */ stw r0, 0x14(r1) +/* 80099FD4 00096F14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80099FD8 00096F18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 80099FDC 00096F1C 38 63 00 9C */ addi r3, r3, 0x9c +/* 80099FE0 00096F20 38 80 00 08 */ li r4, 8 +/* 80099FE4 00096F24 38 A0 00 01 */ li r5, 1 +/* 80099FE8 00096F28 4B F9 90 49 */ bl getItem__17dSv_player_item_cCFib +/* 80099FEC 00096F2C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80099FF0 00096F30 20 00 00 46 */ subfic r0, r0, 0x46 +/* 80099FF4 00096F34 7C 00 00 34 */ cntlzw r0, r0 +/* 80099FF8 00096F38 54 03 D9 7E */ srwi r3, r0, 5 +/* 80099FFC 00096F3C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A000 00096F40 7C 08 03 A6 */ mtlr r0 +/* 8009A004 00096F44 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A008 00096F48 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A00C.s b/include/d/d_item/d_item/asm/func_8009A00C.s new file mode 100644 index 0000000000..ac341e074e --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A00C.s @@ -0,0 +1,17 @@ +/* 8009A00C 00096F4C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A010 00096F50 7C 08 02 A6 */ mflr r0 +/* 8009A014 00096F54 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A018 00096F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A01C 00096F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A020 00096F60 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A024 00096F64 38 80 00 0A */ li r4, 0xa +/* 8009A028 00096F68 38 A0 00 01 */ li r5, 1 +/* 8009A02C 00096F6C 4B F9 90 05 */ bl getItem__17dSv_player_item_cCFib +/* 8009A030 00096F70 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A034 00096F74 20 00 00 47 */ subfic r0, r0, 0x47 +/* 8009A038 00096F78 7C 00 00 34 */ cntlzw r0, r0 +/* 8009A03C 00096F7C 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009A040 00096F80 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A044 00096F84 7C 08 03 A6 */ mtlr r0 +/* 8009A048 00096F88 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A04C 00096F8C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A050.s b/include/d/d_item/d_item/asm/func_8009A050.s new file mode 100644 index 0000000000..f0ed23ec33 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A050.s @@ -0,0 +1,17 @@ +/* 8009A050 00096F90 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A054 00096F94 7C 08 02 A6 */ mflr r0 +/* 8009A058 00096F98 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A05C 00096F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A060 00096FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A064 00096FA4 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A068 00096FA8 38 80 00 01 */ li r4, 1 +/* 8009A06C 00096FAC 38 A0 00 01 */ li r5, 1 +/* 8009A070 00096FB0 4B F9 8F C1 */ bl getItem__17dSv_player_item_cCFib +/* 8009A074 00096FB4 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A078 00096FB8 20 00 00 48 */ subfic r0, r0, 0x48 +/* 8009A07C 00096FBC 7C 00 00 34 */ cntlzw r0, r0 +/* 8009A080 00096FC0 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009A084 00096FC4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A088 00096FC8 7C 08 03 A6 */ mtlr r0 +/* 8009A08C 00096FCC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A090 00096FD0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A0C8.s b/include/d/d_item/d_item/asm/func_8009A0C8.s new file mode 100644 index 0000000000..89a02e809c --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A0C8.s @@ -0,0 +1,82 @@ +/* 8009A0C8 00097008 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8009A0CC 0009700C 7C 08 02 A6 */ mflr r0 +/* 8009A0D0 00097010 90 01 00 24 */ stw r0, 0x24(r1) +/* 8009A0D4 00097014 39 61 00 20 */ addi r11, r1, 0x20 +/* 8009A0D8 00097018 48 2C 80 F9 */ bl _savegpr_26 +/* 8009A0DC 0009701C 3B E0 00 01 */ li r31, 1 +/* 8009A0E0 00097020 7F FE FB 78 */ mr r30, r31 +/* 8009A0E4 00097024 7F FD FB 78 */ mr r29, r31 +/* 8009A0E8 00097028 7F FC FB 78 */ mr r28, r31 +/* 8009A0EC 0009702C 7F FB FB 78 */ mr r27, r31 +/* 8009A0F0 00097030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A0F4 00097034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A0F8 00097038 3B 43 00 9C */ addi r26, r3, 0x9c +/* 8009A0FC 0009703C 7F 43 D3 78 */ mr r3, r26 +/* 8009A100 00097040 38 80 00 14 */ li r4, 0x14 +/* 8009A104 00097044 38 A0 00 01 */ li r5, 1 +/* 8009A108 00097048 4B F9 8F 29 */ bl getItem__17dSv_player_item_cCFib +/* 8009A10C 0009704C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A110 00097050 28 00 00 4A */ cmplwi r0, 0x4a +/* 8009A114 00097054 41 82 00 24 */ beq lbl_8009A138 +/* 8009A118 00097058 7F 43 D3 78 */ mr r3, r26 +/* 8009A11C 0009705C 38 80 00 14 */ li r4, 0x14 +/* 8009A120 00097060 38 A0 00 01 */ li r5, 1 +/* 8009A124 00097064 4B F9 8F 0D */ bl getItem__17dSv_player_item_cCFib +/* 8009A128 00097068 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A12C 0009706C 28 00 00 5B */ cmplwi r0, 0x5b +/* 8009A130 00097070 41 82 00 08 */ beq lbl_8009A138 +/* 8009A134 00097074 3B 60 00 00 */ li r27, 0 +lbl_8009A138: +/* 8009A138 00097078 57 60 06 3F */ clrlwi. r0, r27, 0x18 +/* 8009A13C 0009707C 40 82 00 24 */ bne lbl_8009A160 +/* 8009A140 00097080 7F 43 D3 78 */ mr r3, r26 +/* 8009A144 00097084 38 80 00 14 */ li r4, 0x14 +/* 8009A148 00097088 38 A0 00 01 */ li r5, 1 +/* 8009A14C 0009708C 4B F9 8E E5 */ bl getItem__17dSv_player_item_cCFib +/* 8009A150 00097090 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A154 00097094 28 00 00 5D */ cmplwi r0, 0x5d +/* 8009A158 00097098 41 82 00 08 */ beq lbl_8009A160 +/* 8009A15C 0009709C 3B 80 00 00 */ li r28, 0 +lbl_8009A160: +/* 8009A160 000970A0 57 80 06 3F */ clrlwi. r0, r28, 0x18 +/* 8009A164 000970A4 40 82 00 24 */ bne lbl_8009A188 +/* 8009A168 000970A8 7F 43 D3 78 */ mr r3, r26 +/* 8009A16C 000970AC 38 80 00 14 */ li r4, 0x14 +/* 8009A170 000970B0 38 A0 00 01 */ li r5, 1 +/* 8009A174 000970B4 4B F9 8E BD */ bl getItem__17dSv_player_item_cCFib +/* 8009A178 000970B8 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A17C 000970BC 28 00 00 5C */ cmplwi r0, 0x5c +/* 8009A180 000970C0 41 82 00 08 */ beq lbl_8009A188 +/* 8009A184 000970C4 3B A0 00 00 */ li r29, 0 +lbl_8009A188: +/* 8009A188 000970C8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 +/* 8009A18C 000970CC 40 82 00 24 */ bne lbl_8009A1B0 +/* 8009A190 000970D0 7F 43 D3 78 */ mr r3, r26 +/* 8009A194 000970D4 38 80 00 14 */ li r4, 0x14 +/* 8009A198 000970D8 38 A0 00 01 */ li r5, 1 +/* 8009A19C 000970DC 4B F9 8E 95 */ bl getItem__17dSv_player_item_cCFib +/* 8009A1A0 000970E0 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A1A4 000970E4 28 00 00 5E */ cmplwi r0, 0x5e +/* 8009A1A8 000970E8 41 82 00 08 */ beq lbl_8009A1B0 +/* 8009A1AC 000970EC 3B C0 00 00 */ li r30, 0 +lbl_8009A1B0: +/* 8009A1B0 000970F0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 +/* 8009A1B4 000970F4 40 82 00 24 */ bne lbl_8009A1D8 +/* 8009A1B8 000970F8 7F 43 D3 78 */ mr r3, r26 +/* 8009A1BC 000970FC 38 80 00 14 */ li r4, 0x14 +/* 8009A1C0 00097100 38 A0 00 01 */ li r5, 1 +/* 8009A1C4 00097104 4B F9 8E 6D */ bl getItem__17dSv_player_item_cCFib +/* 8009A1C8 00097108 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A1CC 0009710C 28 00 00 5F */ cmplwi r0, 0x5f +/* 8009A1D0 00097110 41 82 00 08 */ beq lbl_8009A1D8 +/* 8009A1D4 00097114 3B E0 00 00 */ li r31, 0 +lbl_8009A1D8: +/* 8009A1D8 00097118 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009A1DC 0009711C 30 03 FF FF */ addic r0, r3, -1 +/* 8009A1E0 00097120 7C 60 19 10 */ subfe r3, r0, r3 +/* 8009A1E4 00097124 39 61 00 20 */ addi r11, r1, 0x20 +/* 8009A1E8 00097128 48 2C 80 35 */ bl _restgpr_26 +/* 8009A1EC 0009712C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8009A1F0 00097130 7C 08 03 A6 */ mtlr r0 +/* 8009A1F4 00097134 38 21 00 20 */ addi r1, r1, 0x20 +/* 8009A1F8 00097138 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A1FC.s b/include/d/d_item/d_item/asm/func_8009A1FC.s new file mode 100644 index 0000000000..4a5179a990 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A1FC.s @@ -0,0 +1,17 @@ +/* 8009A1FC 0009713C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A200 00097140 7C 08 02 A6 */ mflr r0 +/* 8009A204 00097144 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A208 00097148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A20C 0009714C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A210 00097150 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A214 00097154 38 80 00 17 */ li r4, 0x17 +/* 8009A218 00097158 38 A0 00 01 */ li r5, 1 +/* 8009A21C 0009715C 4B F9 8E 15 */ bl getItem__17dSv_player_item_cCFib +/* 8009A220 00097160 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A224 00097164 20 00 00 4B */ subfic r0, r0, 0x4b +/* 8009A228 00097168 7C 00 00 34 */ cntlzw r0, r0 +/* 8009A22C 0009716C 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009A230 00097170 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A234 00097174 7C 08 03 A6 */ mtlr r0 +/* 8009A238 00097178 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A23C 0009717C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A308.s b/include/d/d_item/d_item/asm/func_8009A308.s new file mode 100644 index 0000000000..b0f01c2652 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A308.s @@ -0,0 +1,29 @@ +/* 8009A308 00097248 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A30C 0009724C 7C 08 02 A6 */ mflr r0 +/* 8009A310 00097250 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A314 00097254 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8009A318 00097258 3B E0 00 00 */ li r31, 0 +/* 8009A31C 0009725C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A320 00097260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A324 00097264 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A328 00097268 38 80 00 04 */ li r4, 4 +/* 8009A32C 0009726C 38 A0 00 00 */ li r5, 0 +/* 8009A330 00097270 4B F9 8D 01 */ bl getItem__17dSv_player_item_cCFib +/* 8009A334 00097274 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A338 00097278 28 00 00 43 */ cmplwi r0, 0x43 +/* 8009A33C 0009727C 40 82 00 1C */ bne lbl_8009A358 +/* 8009A340 00097280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A344 00097284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A348 00097288 88 03 00 F8 */ lbz r0, 0xf8(r3) +/* 8009A34C 0009728C 28 00 00 1E */ cmplwi r0, 0x1e +/* 8009A350 00097290 41 80 00 08 */ blt lbl_8009A358 +/* 8009A354 00097294 3B E0 00 01 */ li r31, 1 +lbl_8009A358: +/* 8009A358 00097298 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009A35C 0009729C 30 03 FF FF */ addic r0, r3, -1 +/* 8009A360 000972A0 7C 60 19 10 */ subfe r3, r0, r3 +/* 8009A364 000972A4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8009A368 000972A8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A36C 000972AC 7C 08 03 A6 */ mtlr r0 +/* 8009A370 000972B0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A374 000972B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A378.s b/include/d/d_item/d_item/asm/func_8009A378.s new file mode 100644 index 0000000000..6f204a2683 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A378.s @@ -0,0 +1,29 @@ +/* 8009A378 000972B8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A37C 000972BC 7C 08 02 A6 */ mflr r0 +/* 8009A380 000972C0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A384 000972C4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8009A388 000972C8 3B E0 00 00 */ li r31, 0 +/* 8009A38C 000972CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A390 000972D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A394 000972D4 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A398 000972D8 38 80 00 04 */ li r4, 4 +/* 8009A39C 000972DC 38 A0 00 00 */ li r5, 0 +/* 8009A3A0 000972E0 4B F9 8C 91 */ bl getItem__17dSv_player_item_cCFib +/* 8009A3A4 000972E4 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A3A8 000972E8 28 00 00 43 */ cmplwi r0, 0x43 +/* 8009A3AC 000972EC 40 82 00 1C */ bne lbl_8009A3C8 +/* 8009A3B0 000972F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A3B4 000972F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A3B8 000972F8 88 03 00 F8 */ lbz r0, 0xf8(r3) +/* 8009A3BC 000972FC 28 00 00 3C */ cmplwi r0, 0x3c +/* 8009A3C0 00097300 41 80 00 08 */ blt lbl_8009A3C8 +/* 8009A3C4 00097304 3B E0 00 01 */ li r31, 1 +lbl_8009A3C8: +/* 8009A3C8 00097308 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009A3CC 0009730C 30 03 FF FF */ addic r0, r3, -1 +/* 8009A3D0 00097310 7C 60 19 10 */ subfe r3, r0, r3 +/* 8009A3D4 00097314 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8009A3D8 00097318 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A3DC 0009731C 7C 08 03 A6 */ mtlr r0 +/* 8009A3E0 00097320 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A3E4 00097324 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009A3E8.s b/include/d/d_item/d_item/asm/func_8009A3E8.s new file mode 100644 index 0000000000..0571e9f662 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009A3E8.s @@ -0,0 +1,29 @@ +/* 8009A3E8 00097328 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009A3EC 0009732C 7C 08 02 A6 */ mflr r0 +/* 8009A3F0 00097330 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009A3F4 00097334 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8009A3F8 00097338 3B E0 00 00 */ li r31, 0 +/* 8009A3FC 0009733C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A400 00097340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A404 00097344 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009A408 00097348 38 80 00 04 */ li r4, 4 +/* 8009A40C 0009734C 38 A0 00 00 */ li r5, 0 +/* 8009A410 00097350 4B F9 8C 21 */ bl getItem__17dSv_player_item_cCFib +/* 8009A414 00097354 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009A418 00097358 28 00 00 43 */ cmplwi r0, 0x43 +/* 8009A41C 0009735C 40 82 00 1C */ bne lbl_8009A438 +/* 8009A420 00097360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009A424 00097364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009A428 00097368 88 03 00 F8 */ lbz r0, 0xf8(r3) +/* 8009A42C 0009736C 28 00 00 64 */ cmplwi r0, 0x64 +/* 8009A430 00097370 41 80 00 08 */ blt lbl_8009A438 +/* 8009A434 00097374 3B E0 00 01 */ li r31, 1 +lbl_8009A438: +/* 8009A438 00097378 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009A43C 0009737C 30 03 FF FF */ addic r0, r3, -1 +/* 8009A440 00097380 7C 60 19 10 */ subfe r3, r0, r3 +/* 8009A444 00097384 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8009A448 00097388 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009A44C 0009738C 7C 08 03 A6 */ mtlr r0 +/* 8009A450 00097390 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009A454 00097394 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AB48.s b/include/d/d_item/d_item/asm/func_8009AB48.s new file mode 100644 index 0000000000..f70243508b --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AB48.s @@ -0,0 +1,17 @@ +/* 8009AB48 00097A88 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009AB4C 00097A8C 7C 08 02 A6 */ mflr r0 +/* 8009AB50 00097A90 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009AB54 00097A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AB58 00097A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AB5C 00097A9C 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009AB60 00097AA0 38 80 00 15 */ li r4, 0x15 +/* 8009AB64 00097AA4 38 A0 00 01 */ li r5, 1 +/* 8009AB68 00097AA8 4B F9 84 C9 */ bl getItem__17dSv_player_item_cCFib +/* 8009AB6C 00097AAC 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009AB70 00097AB0 20 00 00 80 */ subfic r0, r0, 0x80 +/* 8009AB74 00097AB4 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AB78 00097AB8 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AB7C 00097ABC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009AB80 00097AC0 7C 08 03 A6 */ mtlr r0 +/* 8009AB84 00097AC4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009AB88 00097AC8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AB8C.s b/include/d/d_item/d_item/asm/func_8009AB8C.s new file mode 100644 index 0000000000..6b48ead093 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AB8C.s @@ -0,0 +1,17 @@ +/* 8009AB8C 00097ACC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009AB90 00097AD0 7C 08 02 A6 */ mflr r0 +/* 8009AB94 00097AD4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009AB98 00097AD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AB9C 00097ADC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009ABA0 00097AE0 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009ABA4 00097AE4 38 80 00 15 */ li r4, 0x15 +/* 8009ABA8 00097AE8 38 A0 00 01 */ li r5, 1 +/* 8009ABAC 00097AEC 4B F9 84 85 */ bl getItem__17dSv_player_item_cCFib +/* 8009ABB0 00097AF0 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009ABB4 00097AF4 20 00 00 81 */ subfic r0, r0, 0x81 +/* 8009ABB8 00097AF8 7C 00 00 34 */ cntlzw r0, r0 +/* 8009ABBC 00097AFC 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009ABC0 00097B00 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009ABC4 00097B04 7C 08 03 A6 */ mtlr r0 +/* 8009ABC8 00097B08 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009ABCC 00097B0C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009ABD0.s b/include/d/d_item/d_item/asm/func_8009ABD0.s new file mode 100644 index 0000000000..758dab5246 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009ABD0.s @@ -0,0 +1,17 @@ +/* 8009ABD0 00097B10 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009ABD4 00097B14 7C 08 02 A6 */ mflr r0 +/* 8009ABD8 00097B18 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009ABDC 00097B1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009ABE0 00097B20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009ABE4 00097B24 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009ABE8 00097B28 38 80 00 15 */ li r4, 0x15 +/* 8009ABEC 00097B2C 38 A0 00 01 */ li r5, 1 +/* 8009ABF0 00097B30 4B F9 84 41 */ bl getItem__17dSv_player_item_cCFib +/* 8009ABF4 00097B34 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009ABF8 00097B38 20 00 00 82 */ subfic r0, r0, 0x82 +/* 8009ABFC 00097B3C 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AC00 00097B40 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AC04 00097B44 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009AC08 00097B48 7C 08 03 A6 */ mtlr r0 +/* 8009AC0C 00097B4C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009AC10 00097B50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AC14.s b/include/d/d_item/d_item/asm/func_8009AC14.s new file mode 100644 index 0000000000..4df5eee7f1 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AC14.s @@ -0,0 +1,17 @@ +/* 8009AC14 00097B54 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009AC18 00097B58 7C 08 02 A6 */ mflr r0 +/* 8009AC1C 00097B5C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009AC20 00097B60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AC24 00097B64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AC28 00097B68 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009AC2C 00097B6C 38 80 00 15 */ li r4, 0x15 +/* 8009AC30 00097B70 38 A0 00 01 */ li r5, 1 +/* 8009AC34 00097B74 4B F9 83 FD */ bl getItem__17dSv_player_item_cCFib +/* 8009AC38 00097B78 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009AC3C 00097B7C 20 00 00 83 */ subfic r0, r0, 0x83 +/* 8009AC40 00097B80 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AC44 00097B84 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AC48 00097B88 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009AC4C 00097B8C 7C 08 03 A6 */ mtlr r0 +/* 8009AC50 00097B90 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009AC54 00097B94 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AC58.s b/include/d/d_item/d_item/asm/func_8009AC58.s new file mode 100644 index 0000000000..d6127f3ecb --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AC58.s @@ -0,0 +1,17 @@ +/* 8009AC58 00097B98 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009AC5C 00097B9C 7C 08 02 A6 */ mflr r0 +/* 8009AC60 00097BA0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009AC64 00097BA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AC68 00097BA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AC6C 00097BAC 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009AC70 00097BB0 38 80 00 16 */ li r4, 0x16 +/* 8009AC74 00097BB4 38 A0 00 01 */ li r5, 1 +/* 8009AC78 00097BB8 4B F9 83 B9 */ bl getItem__17dSv_player_item_cCFib +/* 8009AC7C 00097BBC 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009AC80 00097BC0 20 00 00 84 */ subfic r0, r0, 0x84 +/* 8009AC84 00097BC4 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AC88 00097BC8 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AC8C 00097BCC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009AC90 00097BD0 7C 08 03 A6 */ mtlr r0 +/* 8009AC94 00097BD4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009AC98 00097BD8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AC9C.s b/include/d/d_item/d_item/asm/func_8009AC9C.s new file mode 100644 index 0000000000..a88c68c4fd --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AC9C.s @@ -0,0 +1,17 @@ +/* 8009AC9C 00097BDC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009ACA0 00097BE0 7C 08 02 A6 */ mflr r0 +/* 8009ACA4 00097BE4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009ACA8 00097BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009ACAC 00097BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009ACB0 00097BF0 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009ACB4 00097BF4 38 80 00 13 */ li r4, 0x13 +/* 8009ACB8 00097BF8 38 A0 00 01 */ li r5, 1 +/* 8009ACBC 00097BFC 4B F9 83 75 */ bl getItem__17dSv_player_item_cCFib +/* 8009ACC0 00097C00 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009ACC4 00097C04 20 00 00 90 */ subfic r0, r0, 0x90 +/* 8009ACC8 00097C08 7C 00 00 34 */ cntlzw r0, r0 +/* 8009ACCC 00097C0C 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009ACD0 00097C10 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009ACD4 00097C14 7C 08 03 A6 */ mtlr r0 +/* 8009ACD8 00097C18 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009ACDC 00097C1C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009ACE0.s b/include/d/d_item/d_item/asm/func_8009ACE0.s new file mode 100644 index 0000000000..5beaf71fdf --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009ACE0.s @@ -0,0 +1,17 @@ +/* 8009ACE0 00097C20 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009ACE4 00097C24 7C 08 02 A6 */ mflr r0 +/* 8009ACE8 00097C28 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009ACEC 00097C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009ACF0 00097C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009ACF4 00097C34 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009ACF8 00097C38 38 80 00 13 */ li r4, 0x13 +/* 8009ACFC 00097C3C 38 A0 00 01 */ li r5, 1 +/* 8009AD00 00097C40 4B F9 83 31 */ bl getItem__17dSv_player_item_cCFib +/* 8009AD04 00097C44 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009AD08 00097C48 20 00 00 91 */ subfic r0, r0, 0x91 +/* 8009AD0C 00097C4C 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AD10 00097C50 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AD14 00097C54 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009AD18 00097C58 7C 08 03 A6 */ mtlr r0 +/* 8009AD1C 00097C5C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009AD20 00097C60 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AE7C.s b/include/d/d_item/d_item/asm/func_8009AE7C.s new file mode 100644 index 0000000000..b0b0439a1c --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AE7C.s @@ -0,0 +1,7 @@ +/* 8009AE7C 00097DBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AE80 00097DC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AE84 00097DC4 88 03 00 16 */ lbz r0, 0x16(r3) +/* 8009AE88 00097DC8 20 00 00 B0 */ subfic r0, r0, 0xb0 +/* 8009AE8C 00097DCC 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AE90 00097DD0 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AE94 00097DD4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AEA0.s b/include/d/d_item/d_item/asm/func_8009AEA0.s new file mode 100644 index 0000000000..f6d22426a0 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AEA0.s @@ -0,0 +1,7 @@ +/* 8009AEA0 00097DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AEA4 00097DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AEA8 00097DE8 88 03 00 16 */ lbz r0, 0x16(r3) +/* 8009AEAC 00097DEC 20 00 00 B2 */ subfic r0, r0, 0xb2 +/* 8009AEB0 00097DF0 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AEB4 00097DF4 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AEB8 00097DF8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AEBC.s b/include/d/d_item/d_item/asm/func_8009AEBC.s new file mode 100644 index 0000000000..fb161ddb56 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AEBC.s @@ -0,0 +1,7 @@ +/* 8009AEBC 00097DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AEC0 00097E00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AEC4 00097E04 88 03 00 16 */ lbz r0, 0x16(r3) +/* 8009AEC8 00097E08 20 00 00 B3 */ subfic r0, r0, 0xb3 +/* 8009AECC 00097E0C 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AED0 00097E10 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AED4 00097E14 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AED8.s b/include/d/d_item/d_item/asm/func_8009AED8.s new file mode 100644 index 0000000000..0a6b12971b --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AED8.s @@ -0,0 +1,7 @@ +/* 8009AED8 00097E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AEDC 00097E1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AEE0 00097E20 88 03 00 16 */ lbz r0, 0x16(r3) +/* 8009AEE4 00097E24 20 00 00 B4 */ subfic r0, r0, 0xb4 +/* 8009AEE8 00097E28 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AEEC 00097E2C 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AEF0 00097E30 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009AEF4.s b/include/d/d_item/d_item/asm/func_8009AEF4.s new file mode 100644 index 0000000000..4fc8844f7f --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009AEF4.s @@ -0,0 +1,7 @@ +/* 8009AEF4 00097E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009AEF8 00097E38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009AEFC 00097E3C 88 03 00 16 */ lbz r0, 0x16(r3) +/* 8009AF00 00097E40 20 00 00 B5 */ subfic r0, r0, 0xb5 +/* 8009AF04 00097E44 7C 00 00 34 */ cntlzw r0, r0 +/* 8009AF08 00097E48 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009AF0C 00097E4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B3A0.s b/include/d/d_item/d_item/asm/func_8009B3A0.s new file mode 100644 index 0000000000..b5b8a5b25f --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B3A0.s @@ -0,0 +1,17 @@ +/* 8009B3A0 000982E0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009B3A4 000982E4 7C 08 02 A6 */ mflr r0 +/* 8009B3A8 000982E8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009B3AC 000982EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B3B0 000982F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B3B4 000982F4 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009B3B8 000982F8 38 80 00 16 */ li r4, 0x16 +/* 8009B3BC 000982FC 38 A0 00 01 */ li r5, 1 +/* 8009B3C0 00098300 4B F9 7C 71 */ bl getItem__17dSv_player_item_cCFib +/* 8009B3C4 00098304 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B3C8 00098308 20 00 00 E9 */ subfic r0, r0, 0xe9 +/* 8009B3CC 0009830C 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B3D0 00098310 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009B3D4 00098314 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009B3D8 00098318 7C 08 03 A6 */ mtlr r0 +/* 8009B3DC 0009831C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009B3E0 00098320 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B3E4.s b/include/d/d_item/d_item/asm/func_8009B3E4.s new file mode 100644 index 0000000000..53c607ae8f --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B3E4.s @@ -0,0 +1,17 @@ +/* 8009B3E4 00098324 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009B3E8 00098328 7C 08 02 A6 */ mflr r0 +/* 8009B3EC 0009832C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009B3F0 00098330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B3F4 00098334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B3F8 00098338 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009B3FC 0009833C 38 80 00 16 */ li r4, 0x16 +/* 8009B400 00098340 38 A0 00 01 */ li r5, 1 +/* 8009B404 00098344 4B F9 7C 2D */ bl getItem__17dSv_player_item_cCFib +/* 8009B408 00098348 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B40C 0009834C 20 00 00 EA */ subfic r0, r0, 0xea +/* 8009B410 00098350 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B414 00098354 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009B418 00098358 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009B41C 0009835C 7C 08 03 A6 */ mtlr r0 +/* 8009B420 00098360 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009B424 00098364 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B428.s b/include/d/d_item/d_item/asm/func_8009B428.s new file mode 100644 index 0000000000..8d6e1196c9 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B428.s @@ -0,0 +1,17 @@ +/* 8009B428 00098368 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009B42C 0009836C 7C 08 02 A6 */ mflr r0 +/* 8009B430 00098370 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009B434 00098374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B438 00098378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B43C 0009837C 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009B440 00098380 38 80 00 16 */ li r4, 0x16 +/* 8009B444 00098384 38 A0 00 01 */ li r5, 1 +/* 8009B448 00098388 4B F9 7B E9 */ bl getItem__17dSv_player_item_cCFib +/* 8009B44C 0009838C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B450 00098390 20 00 00 EB */ subfic r0, r0, 0xeb +/* 8009B454 00098394 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B458 00098398 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009B45C 0009839C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009B460 000983A0 7C 08 03 A6 */ mtlr r0 +/* 8009B464 000983A4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009B468 000983A8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B46C.s b/include/d/d_item/d_item/asm/func_8009B46C.s new file mode 100644 index 0000000000..53a6c178c6 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B46C.s @@ -0,0 +1,17 @@ +/* 8009B46C 000983AC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009B470 000983B0 7C 08 02 A6 */ mflr r0 +/* 8009B474 000983B4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009B478 000983B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B47C 000983BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B480 000983C0 38 63 00 9C */ addi r3, r3, 0x9c +/* 8009B484 000983C4 38 80 00 12 */ li r4, 0x12 +/* 8009B488 000983C8 38 A0 00 01 */ li r5, 1 +/* 8009B48C 000983CC 4B F9 7B A5 */ bl getItem__17dSv_player_item_cCFib +/* 8009B490 000983D0 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B494 000983D4 20 00 00 EC */ subfic r0, r0, 0xec +/* 8009B498 000983D8 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B49C 000983DC 54 03 D9 7E */ srwi r3, r0, 5 +/* 8009B4A0 000983E0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009B4A4 000983E4 7C 08 03 A6 */ mtlr r0 +/* 8009B4A8 000983E8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009B4AC 000983EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B688.s b/include/d/d_item/d_item/asm/func_8009B688.s new file mode 100644 index 0000000000..f497dc3d85 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B688.s @@ -0,0 +1,21 @@ +/* 8009B688 000985C8 38 A0 00 00 */ li r5, 0 +/* 8009B68C 000985CC 38 03 FF F6 */ addi r0, r3, -10 +/* 8009B690 000985D0 54 00 06 3E */ clrlwi r0, r0, 0x18 +/* 8009B694 000985D4 28 00 00 03 */ cmplwi r0, 3 +/* 8009B698 000985D8 40 81 00 30 */ ble lbl_8009B6C8 +/* 8009B69C 000985DC 54 64 06 3E */ clrlwi r4, r3, 0x18 +/* 8009B6A0 000985E0 20 04 00 70 */ subfic r0, r4, 0x70 +/* 8009B6A4 000985E4 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B6A8 000985E8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f +/* 8009B6AC 000985EC 20 04 00 71 */ subfic r0, r4, 0x71 +/* 8009B6B0 000985F0 7C 00 00 34 */ cntlzw r0, r0 +/* 8009B6B4 000985F4 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f +/* 8009B6B8 000985F8 7C 60 03 79 */ or. r0, r3, r0 +/* 8009B6BC 000985FC 40 82 00 0C */ bne lbl_8009B6C8 +/* 8009B6C0 00098600 28 04 00 72 */ cmplwi r4, 0x72 +/* 8009B6C4 00098604 40 82 00 08 */ bne lbl_8009B6CC +lbl_8009B6C8: +/* 8009B6C8 00098608 38 A0 00 01 */ li r5, 1 +lbl_8009B6CC: +/* 8009B6CC 0009860C 7C A3 2B 78 */ mr r3, r5 +/* 8009B6D0 00098610 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B708.s b/include/d/d_item/d_item/asm/func_8009B708.s new file mode 100644 index 0000000000..b6952f4821 --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B708.s @@ -0,0 +1,35 @@ +/* 8009B708 00098648 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B70C 0009864C 2C 00 00 9D */ cmpwi r0, 0x9d +/* 8009B710 00098650 41 82 00 5C */ beq lbl_8009B76C +/* 8009B714 00098654 40 80 00 3C */ bge lbl_8009B750 +/* 8009B718 00098658 2C 00 00 75 */ cmpwi r0, 0x75 +/* 8009B71C 0009865C 41 82 00 58 */ beq lbl_8009B774 +/* 8009B720 00098660 40 80 00 24 */ bge lbl_8009B744 +/* 8009B724 00098664 2C 00 00 6D */ cmpwi r0, 0x6d +/* 8009B728 00098668 40 80 00 10 */ bge lbl_8009B738 +/* 8009B72C 0009866C 2C 00 00 60 */ cmpwi r0, 0x60 +/* 8009B730 00098670 40 80 00 3C */ bge lbl_8009B76C +/* 8009B734 00098674 48 00 00 40 */ b lbl_8009B774 +lbl_8009B738: +/* 8009B738 00098678 2C 00 00 73 */ cmpwi r0, 0x73 +/* 8009B73C 0009867C 40 80 00 30 */ bge lbl_8009B76C +/* 8009B740 00098680 48 00 00 34 */ b lbl_8009B774 +lbl_8009B744: +/* 8009B744 00098684 2C 00 00 80 */ cmpwi r0, 0x80 +/* 8009B748 00098688 40 80 00 2C */ bge lbl_8009B774 +/* 8009B74C 0009868C 48 00 00 20 */ b lbl_8009B76C +lbl_8009B750: +/* 8009B750 00098690 2C 00 00 EF */ cmpwi r0, 0xef +/* 8009B754 00098694 40 80 00 10 */ bge lbl_8009B764 +/* 8009B758 00098698 2C 00 00 9F */ cmpwi r0, 0x9f +/* 8009B75C 0009869C 41 82 00 10 */ beq lbl_8009B76C +/* 8009B760 000986A0 48 00 00 14 */ b lbl_8009B774 +lbl_8009B764: +/* 8009B764 000986A4 2C 00 00 F3 */ cmpwi r0, 0xf3 +/* 8009B768 000986A8 40 80 00 0C */ bge lbl_8009B774 +lbl_8009B76C: +/* 8009B76C 000986AC 38 60 00 01 */ li r3, 1 +/* 8009B770 000986B0 4E 80 00 20 */ blr +lbl_8009B774: +/* 8009B774 000986B4 38 60 00 00 */ li r3, 0 +/* 8009B778 000986B8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B79C.s b/include/d/d_item/d_item/asm/func_8009B79C.s new file mode 100644 index 0000000000..52111fee9d --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B79C.s @@ -0,0 +1,12 @@ +/* 8009B79C 000986DC 38 80 00 00 */ li r4, 0 +/* 8009B7A0 000986E0 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009B7A4 000986E4 2C 00 00 D8 */ cmpwi r0, 0xd8 +/* 8009B7A8 000986E8 40 80 00 14 */ bge lbl_8009B7BC +/* 8009B7AC 000986EC 2C 00 00 C0 */ cmpwi r0, 0xc0 +/* 8009B7B0 000986F0 40 80 00 08 */ bge lbl_8009B7B8 +/* 8009B7B4 000986F4 48 00 00 08 */ b lbl_8009B7BC +lbl_8009B7B8: +/* 8009B7B8 000986F8 38 80 00 01 */ li r4, 1 +lbl_8009B7BC: +/* 8009B7BC 000986FC 7C 83 23 78 */ mr r3, r4 +/* 8009B7C0 00098700 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B7C4.s b/include/d/d_item/d_item/asm/func_8009B7C4.s new file mode 100644 index 0000000000..761489d83e --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B7C4.s @@ -0,0 +1,107 @@ +/* 8009B7C4 00098704 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8009B7C8 00098708 7C 08 02 A6 */ mflr r0 +/* 8009B7CC 0009870C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8009B7D0 00098710 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8009B7D4 00098714 7C 7F 1B 78 */ mr r31, r3 +/* 8009B7D8 00098718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B7DC 0009871C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B7E0 00098720 38 80 00 00 */ li r4, 0 +/* 8009B7E4 00098724 4B F9 73 15 */ bl isMagicFlag__21dSv_player_status_a_cCFUc +/* 8009B7E8 00098728 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B7EC 0009872C 40 82 00 1C */ bne lbl_8009B808 +/* 8009B7F0 00098730 2C 1F 00 08 */ cmpwi r31, 8 +/* 8009B7F4 00098734 41 82 00 0C */ beq lbl_8009B800 +/* 8009B7F8 00098738 2C 1F 00 09 */ cmpwi r31, 9 +/* 8009B7FC 0009873C 40 82 00 0C */ bne lbl_8009B808 +lbl_8009B800: +/* 8009B800 00098740 38 60 00 01 */ li r3, 1 +/* 8009B804 00098744 48 00 01 28 */ b lbl_8009B92C +lbl_8009B808: +/* 8009B808 00098748 2C 1F 00 11 */ cmpwi r31, 0x11 +/* 8009B80C 0009874C 40 82 00 28 */ bne lbl_8009B834 +/* 8009B810 00098750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B814 00098754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B818 00098758 38 63 00 CC */ addi r3, r3, 0xcc +/* 8009B81C 0009875C 38 80 00 43 */ li r4, 0x43 +/* 8009B820 00098760 4B F9 86 A9 */ bl isFirstBit__21dSv_player_get_item_cCFUc +/* 8009B824 00098764 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B828 00098768 40 82 00 8C */ bne lbl_8009B8B4 +/* 8009B82C 0009876C 38 60 00 01 */ li r3, 1 +/* 8009B830 00098770 48 00 00 FC */ b lbl_8009B92C +lbl_8009B834: +/* 8009B834 00098774 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009B838 00098778 4B FF FE 9D */ bl isArrow +/* 8009B83C 0009877C 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B840 00098780 41 82 00 74 */ beq lbl_8009B8B4 +/* 8009B844 00098784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B848 00098788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B84C 0009878C 38 63 00 CC */ addi r3, r3, 0xcc +/* 8009B850 00098790 38 80 00 43 */ li r4, 0x43 +/* 8009B854 00098794 4B F9 86 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc +/* 8009B858 00098798 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B85C 0009879C 40 82 00 0C */ bne lbl_8009B868 +/* 8009B860 000987A0 38 60 00 01 */ li r3, 1 +/* 8009B864 000987A4 48 00 00 C8 */ b lbl_8009B92C +lbl_8009B868: +/* 8009B868 000987A8 38 60 00 00 */ li r3, 0 +/* 8009B86C 000987AC 4B F9 11 11 */ bl dComIfG_play_c_NS_getLayerNo +/* 8009B870 000987B0 2C 03 00 0D */ cmpwi r3, 0xd +/* 8009B874 000987B4 41 82 00 14 */ beq lbl_8009B888 +/* 8009B878 000987B8 38 60 00 00 */ li r3, 0 +/* 8009B87C 000987BC 4B F9 11 01 */ bl dComIfG_play_c_NS_getLayerNo +/* 8009B880 000987C0 2C 03 00 0E */ cmpwi r3, 0xe +/* 8009B884 000987C4 40 82 00 30 */ bne lbl_8009B8B4 +lbl_8009B888: +/* 8009B888 000987C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B88C 000987CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B890 000987D0 38 63 4E 00 */ addi r3, r3, 0x4e00 +/* 8009B894 000987D4 3C 80 80 38 */ lis r4, lbl_8037B0D0@ha +/* 8009B898 000987D8 38 84 B0 D0 */ addi r4, r4, lbl_8037B0D0@l +/* 8009B89C 000987DC 38 A0 00 06 */ li r5, 6 +/* 8009B8A0 000987E0 48 2C D0 B5 */ bl func_80368954 +/* 8009B8A4 000987E4 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B8A8 000987E8 41 82 00 0C */ beq lbl_8009B8B4 +/* 8009B8AC 000987EC 38 60 00 01 */ li r3, 1 +/* 8009B8B0 000987F0 48 00 00 7C */ b lbl_8009B92C +lbl_8009B8B4: +/* 8009B8B4 000987F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B8B8 000987F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B8BC 000987FC 38 63 00 CC */ addi r3, r3, 0xcc +/* 8009B8C0 00098800 38 80 00 50 */ li r4, 0x50 +/* 8009B8C4 00098804 4B F9 86 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc +/* 8009B8C8 00098808 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B8CC 0009880C 40 82 00 1C */ bne lbl_8009B8E8 +/* 8009B8D0 00098810 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009B8D4 00098814 4B FF FD B5 */ bl isBomb +/* 8009B8D8 00098818 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B8DC 0009881C 41 82 00 0C */ beq lbl_8009B8E8 +/* 8009B8E0 00098820 38 60 00 01 */ li r3, 1 +/* 8009B8E4 00098824 48 00 00 48 */ b lbl_8009B92C +lbl_8009B8E8: +/* 8009B8E8 00098828 2C 1F 00 1F */ cmpwi r31, 0x1f +/* 8009B8EC 0009882C 40 82 00 08 */ bne lbl_8009B8F4 +/* 8009B8F0 00098830 3B E0 00 00 */ li r31, 0 +lbl_8009B8F4: +/* 8009B8F4 00098834 38 60 00 4B */ li r3, 0x4b +/* 8009B8F8 00098838 38 80 00 01 */ li r4, 1 +/* 8009B8FC 0009883C 4B FF C5 E5 */ bl checkItemGet__FUci +/* 8009B900 00098840 2C 03 00 00 */ cmpwi r3, 0 +/* 8009B904 00098844 40 82 00 10 */ bne lbl_8009B914 +/* 8009B908 00098848 2C 1F 00 12 */ cmpwi r31, 0x12 +/* 8009B90C 0009884C 40 82 00 08 */ bne lbl_8009B914 +/* 8009B910 00098850 3B E0 00 01 */ li r31, 1 +lbl_8009B914: +/* 8009B914 00098854 2C 1F 00 08 */ cmpwi r31, 8 +/* 8009B918 00098858 41 82 00 0C */ beq lbl_8009B924 +/* 8009B91C 0009885C 2C 1F 00 09 */ cmpwi r31, 9 +/* 8009B920 00098860 40 82 00 08 */ bne lbl_8009B928 +lbl_8009B924: +/* 8009B924 00098864 3B E0 00 01 */ li r31, 1 +lbl_8009B928: +/* 8009B928 00098868 57 E3 06 3E */ clrlwi r3, r31, 0x18 +lbl_8009B92C: +/* 8009B92C 0009886C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8009B930 00098870 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8009B934 00098874 7C 08 03 A6 */ mtlr r0 +/* 8009B938 00098878 38 21 00 10 */ addi r1, r1, 0x10 +/* 8009B93C 0009887C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/asm/func_8009B940.s b/include/d/d_item/d_item/asm/func_8009B940.s new file mode 100644 index 0000000000..b6dd3d166d --- /dev/null +++ b/include/d/d_item/d_item/asm/func_8009B940.s @@ -0,0 +1,185 @@ +/* 8009B940 00098880 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 8009B944 00098884 7C 08 02 A6 */ mflr r0 +/* 8009B948 00098888 90 01 00 54 */ stw r0, 0x54(r1) +/* 8009B94C 0009888C 39 61 00 50 */ addi r11, r1, 0x50 +/* 8009B950 00098890 48 2C 68 69 */ bl func_803621B8 +/* 8009B954 00098894 7C 7E 1B 78 */ mr r30, r3 +/* 8009B958 00098898 7C 9F 23 78 */ mr r31, r4 +/* 8009B95C 0009889C 3B 20 00 00 */ li r25, 0 +/* 8009B960 000988A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009B964 000988A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009B968 000988A8 3B 43 00 9C */ addi r26, r3, 0x9c +/* 8009B96C 000988AC 3B 83 00 EC */ addi r28, r3, 0xec +/* 8009B970 000988B0 3B 61 00 08 */ addi r27, r1, 8 +/* 8009B974 000988B4 48 00 00 80 */ b lbl_8009B9F4 +lbl_8009B978: +/* 8009B978 000988B8 7F 43 D3 78 */ mr r3, r26 +/* 8009B97C 000988BC 57 24 06 3E */ clrlwi r4, r25, 0x18 +/* 8009B980 000988C0 38 84 00 0F */ addi r4, r4, 0xf +/* 8009B984 000988C4 38 A0 00 00 */ li r5, 0 +/* 8009B988 000988C8 4B F9 76 A9 */ bl getItem__17dSv_player_item_cCFib +/* 8009B98C 000988CC 57 35 06 3E */ clrlwi r21, r25, 0x18 +/* 8009B990 000988D0 7C 7B A9 AE */ stbx r3, r27, r21 +/* 8009B994 000988D4 7C 7B A8 AE */ lbzx r3, r27, r21 +/* 8009B998 000988D8 28 03 00 50 */ cmplwi r3, 0x50 +/* 8009B99C 000988DC 40 82 00 18 */ bne lbl_8009B9B4 +/* 8009B9A0 000988E0 38 80 00 00 */ li r4, 0 +/* 8009B9A4 000988E4 56 A0 10 3A */ slwi r0, r21, 2 +/* 8009B9A8 000988E8 38 61 00 0C */ addi r3, r1, 0xc +/* 8009B9AC 000988EC 7C 83 01 2E */ stwx r4, r3, r0 +/* 8009B9B0 000988F0 48 00 00 40 */ b lbl_8009B9F0 +lbl_8009B9B4: +/* 8009B9B4 000988F4 57 C0 06 3E */ clrlwi r0, r30, 0x18 +/* 8009B9B8 000988F8 7C 03 00 40 */ cmplw r3, r0 +/* 8009B9BC 000988FC 40 82 00 24 */ bne lbl_8009B9E0 +/* 8009B9C0 00098900 7F 83 E3 78 */ mr r3, r28 +/* 8009B9C4 00098904 7F 24 CB 78 */ mr r4, r25 +/* 8009B9C8 00098908 4B F9 85 B5 */ bl getBombNum__24dSv_player_item_record_cCFUc +/* 8009B9CC 0009890C 54 64 06 3E */ clrlwi r4, r3, 0x18 +/* 8009B9D0 00098910 56 A0 10 3A */ slwi r0, r21, 2 +/* 8009B9D4 00098914 38 61 00 0C */ addi r3, r1, 0xc +/* 8009B9D8 00098918 7C 83 01 2E */ stwx r4, r3, r0 +/* 8009B9DC 0009891C 48 00 00 14 */ b lbl_8009B9F0 +lbl_8009B9E0: +/* 8009B9E0 00098920 38 80 FF FF */ li r4, -1 +/* 8009B9E4 00098924 56 A0 10 3A */ slwi r0, r21, 2 +/* 8009B9E8 00098928 38 61 00 0C */ addi r3, r1, 0xc +/* 8009B9EC 0009892C 7C 83 01 2E */ stwx r4, r3, r0 +lbl_8009B9F0: +/* 8009B9F0 00098930 3B 39 00 01 */ addi r25, r25, 1 +lbl_8009B9F4: +/* 8009B9F4 00098934 57 20 06 3E */ clrlwi r0, r25, 0x18 +/* 8009B9F8 00098938 28 00 00 03 */ cmplwi r0, 3 +/* 8009B9FC 0009893C 41 80 FF 7C */ blt lbl_8009B978 +/* 8009BA00 00098940 3B 00 00 00 */ li r24, 0 +/* 8009BA04 00098944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8009BA08 00098948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l +/* 8009BA0C 0009894C 3B 63 00 F8 */ addi r27, r3, 0xf8 +/* 8009BA10 00098950 3B 23 0F 38 */ addi r25, r3, 0xf38 +/* 8009BA14 00098954 3B A1 00 08 */ addi r29, r1, 8 +/* 8009BA18 00098958 3B 81 00 0C */ addi r28, r1, 0xc +/* 8009BA1C 0009895C 48 00 01 94 */ b lbl_8009BBB0 +lbl_8009BA20: +/* 8009BA20 00098960 3A E0 FF FF */ li r23, -1 +/* 8009BA24 00098964 3A C0 FF FF */ li r22, -1 +/* 8009BA28 00098968 38 80 00 00 */ li r4, 0 +/* 8009BA2C 0009896C 48 00 00 24 */ b lbl_8009BA50 +lbl_8009BA30: +/* 8009BA30 00098970 54 83 06 3E */ clrlwi r3, r4, 0x18 +/* 8009BA34 00098974 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d +/* 8009BA38 00098978 7C 1C 00 2E */ lwzx r0, r28, r0 +/* 8009BA3C 0009897C 2C 00 00 00 */ cmpwi r0, 0 +/* 8009BA40 00098980 40 82 00 0C */ bne lbl_8009BA4C +/* 8009BA44 00098984 7C 77 1B 78 */ mr r23, r3 +/* 8009BA48 00098988 3A C0 00 00 */ li r22, 0 +lbl_8009BA4C: +/* 8009BA4C 0009898C 38 84 00 01 */ addi r4, r4, 1 +lbl_8009BA50: +/* 8009BA50 00098990 54 80 06 3E */ clrlwi r0, r4, 0x18 +/* 8009BA54 00098994 28 00 00 03 */ cmplwi r0, 3 +/* 8009BA58 00098998 41 80 FF D8 */ blt lbl_8009BA30 +/* 8009BA5C 0009899C 3A A0 00 00 */ li r21, 0 +/* 8009BA60 000989A0 48 00 00 44 */ b lbl_8009BAA4 +lbl_8009BA64: +/* 8009BA64 000989A4 56 A4 06 3E */ clrlwi r4, r21, 0x18 +/* 8009BA68 000989A8 56 A0 15 BA */ rlwinm r0, r21, 2, 0x16, 0x1d +/* 8009BA6C 000989AC 7E 9C 00 2E */ lwzx r20, r28, r0 +/* 8009BA70 000989B0 2C 14 00 00 */ cmpwi r20, 0 +/* 8009BA74 000989B4 40 81 00 2C */ ble lbl_8009BAA0 +/* 8009BA78 000989B8 7C 14 B0 00 */ cmpw r20, r22 +/* 8009BA7C 000989BC 40 81 00 24 */ ble lbl_8009BAA0 +/* 8009BA80 000989C0 7F 63 DB 78 */ mr r3, r27 +/* 8009BA84 000989C4 7C 9D 20 AE */ lbzx r4, r29, r4 +/* 8009BA88 000989C8 4B F9 86 71 */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BA8C 000989CC 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8009BA90 000989D0 7C 14 00 00 */ cmpw r20, r0 +/* 8009BA94 000989D4 41 82 00 0C */ beq lbl_8009BAA0 +/* 8009BA98 000989D8 56 B7 06 3E */ clrlwi r23, r21, 0x18 +/* 8009BA9C 000989DC 7E 96 A3 78 */ mr r22, r20 +lbl_8009BAA0: +/* 8009BAA0 000989E0 3A B5 00 01 */ addi r21, r21, 1 +lbl_8009BAA4: +/* 8009BAA4 000989E4 56 A0 06 3E */ clrlwi r0, r21, 0x18 +/* 8009BAA8 000989E8 28 00 00 03 */ cmplwi r0, 3 +/* 8009BAAC 000989EC 41 80 FF B8 */ blt lbl_8009BA64 +/* 8009BAB0 000989F0 2C 17 FF FF */ cmpwi r23, -1 +/* 8009BAB4 000989F4 40 82 00 0C */ bne lbl_8009BAC0 +/* 8009BAB8 000989F8 57 E3 06 3E */ clrlwi r3, r31, 0x18 +/* 8009BABC 000989FC 48 00 01 04 */ b lbl_8009BBC0 +lbl_8009BAC0: +/* 8009BAC0 00098A00 2C 16 00 00 */ cmpwi r22, 0 +/* 8009BAC4 00098A04 40 82 00 68 */ bne lbl_8009BB2C +/* 8009BAC8 00098A08 7F 63 DB 78 */ mr r3, r27 +/* 8009BACC 00098A0C 7F C4 F3 78 */ mr r4, r30 +/* 8009BAD0 00098A10 4B F9 86 29 */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BAD4 00098A14 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 8009BAD8 00098A18 57 E0 06 3E */ clrlwi r0, r31, 0x18 +/* 8009BADC 00098A1C 7C 03 00 40 */ cmplw r3, r0 +/* 8009BAE0 00098A20 41 80 00 20 */ blt lbl_8009BB00 +/* 8009BAE4 00098A24 7F 43 D3 78 */ mr r3, r26 +/* 8009BAE8 00098A28 7F C4 F3 78 */ mr r4, r30 +/* 8009BAEC 00098A2C 7F E5 FB 78 */ mr r5, r31 +/* 8009BAF0 00098A30 38 C0 00 01 */ li r6, 1 +/* 8009BAF4 00098A34 4B F9 7F 5D */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb +/* 8009BAF8 00098A38 38 60 00 00 */ li r3, 0 +/* 8009BAFC 00098A3C 48 00 00 C4 */ b lbl_8009BBC0 +lbl_8009BB00: +/* 8009BB00 00098A40 7F 43 D3 78 */ mr r3, r26 +/* 8009BB04 00098A44 7F C4 F3 78 */ mr r4, r30 +/* 8009BB08 00098A48 7F E5 FB 78 */ mr r5, r31 +/* 8009BB0C 00098A4C 38 C0 00 01 */ li r6, 1 +/* 8009BB10 00098A50 4B F9 7F 41 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb +/* 8009BB14 00098A54 7F 63 DB 78 */ mr r3, r27 +/* 8009BB18 00098A58 7F C4 F3 78 */ mr r4, r30 +/* 8009BB1C 00098A5C 4B F9 85 DD */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BB20 00098A60 7C 03 F8 50 */ subf r0, r3, r31 +/* 8009BB24 00098A64 54 1F 06 3E */ clrlwi r31, r0, 0x18 +/* 8009BB28 00098A68 48 00 00 6C */ b lbl_8009BB94 +lbl_8009BB2C: +/* 8009BB2C 00098A6C 7F 63 DB 78 */ mr r3, r27 +/* 8009BB30 00098A70 38 81 00 08 */ addi r4, r1, 8 +/* 8009BB34 00098A74 7E 84 B8 AE */ lbzx r20, r4, r23 +/* 8009BB38 00098A78 7E 84 A3 78 */ mr r4, r20 +/* 8009BB3C 00098A7C 4B F9 85 BD */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BB40 00098A80 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 8009BB44 00098A84 57 F5 06 3E */ clrlwi r21, r31, 0x18 +/* 8009BB48 00098A88 7C 16 AA 14 */ add r0, r22, r21 +/* 8009BB4C 00098A8C 7C 03 00 00 */ cmpw r3, r0 +/* 8009BB50 00098A90 41 80 00 1C */ blt lbl_8009BB6C +/* 8009BB54 00098A94 7F 23 CB 78 */ mr r3, r25 +/* 8009BB58 00098A98 56 E4 06 3E */ clrlwi r4, r23, 0x18 +/* 8009BB5C 00098A9C 7E A5 AB 78 */ mr r5, r21 +/* 8009BB60 00098AA0 4B F8 F8 0D */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8009BB64 00098AA4 38 60 00 00 */ li r3, 0 +/* 8009BB68 00098AA8 48 00 00 58 */ b lbl_8009BBC0 +lbl_8009BB6C: +/* 8009BB6C 00098AAC 7F 23 CB 78 */ mr r3, r25 +/* 8009BB70 00098AB0 56 E4 06 3E */ clrlwi r4, r23, 0x18 +/* 8009BB74 00098AB4 7E A5 AB 78 */ mr r5, r21 +/* 8009BB78 00098AB8 4B F8 F7 F5 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8009BB7C 00098ABC 7F 63 DB 78 */ mr r3, r27 +/* 8009BB80 00098AC0 7E 84 A3 78 */ mr r4, r20 +/* 8009BB84 00098AC4 4B F9 85 75 */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BB88 00098AC8 7C 16 18 50 */ subf r0, r22, r3 +/* 8009BB8C 00098ACC 7C 00 A8 50 */ subf r0, r0, r21 +/* 8009BB90 00098AD0 54 1F 06 3E */ clrlwi r31, r0, 0x18 +lbl_8009BB94: +/* 8009BB94 00098AD4 7F 63 DB 78 */ mr r3, r27 +/* 8009BB98 00098AD8 7C 9D B8 AE */ lbzx r4, r29, r23 +/* 8009BB9C 00098ADC 4B F9 85 5D */ bl getBombNum__21dSv_player_item_max_cCFUc +/* 8009BBA0 00098AE0 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 8009BBA4 00098AE4 56 E0 10 3A */ slwi r0, r23, 2 +/* 8009BBA8 00098AE8 7C 7C 01 2E */ stwx r3, r28, r0 +/* 8009BBAC 00098AEC 3B 18 00 01 */ addi r24, r24, 1 +lbl_8009BBB0: +/* 8009BBB0 00098AF0 57 00 06 3E */ clrlwi r0, r24, 0x18 +/* 8009BBB4 00098AF4 28 00 00 03 */ cmplwi r0, 3 +/* 8009BBB8 00098AF8 41 80 FE 68 */ blt lbl_8009BA20 +/* 8009BBBC 00098AFC 57 E3 06 3E */ clrlwi r3, r31, 0x18 +lbl_8009BBC0: +/* 8009BBC0 00098B00 39 61 00 50 */ addi r11, r1, 0x50 +/* 8009BBC4 00098B04 48 2C 66 41 */ bl func_80362204 +/* 8009BBC8 00098B08 80 01 00 54 */ lwz r0, 0x54(r1) +/* 8009BBCC 00098B0C 7C 08 03 A6 */ mtlr r0 +/* 8009BBD0 00098B10 38 21 00 50 */ addi r1, r1, 0x50 +/* 8009BBD4 00098B14 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_item/d_item/d_item.h b/include/d/d_item/d_item/d_item.h new file mode 100644 index 0000000000..ea0e7e5ca0 --- /dev/null +++ b/include/d/d_item/d_item/d_item.h @@ -0,0 +1,9 @@ +#ifndef D_ITEM_H_ +#define D_ITEM_H_ + +int checkItemGet(u8,int); + +extern int (*item_func_ptr[256])(void); +extern int (*item_getcheck_func_ptr[256])(void); + +#endif \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_80032AF8.s b/include/d/d_save/d_save/asm/func_80032AF8.s index b7aacb506b..936bac4d23 100644 --- a/include/d/d_save/d_save/asm/func_80032AF8.s +++ b/include/d/d_save/d_save/asm/func_80032AF8.s @@ -3,8 +3,8 @@ /* 80032B00 0002FA40 90 01 00 14 */ stw r0, 0x14(r1) /* 80032B04 0002FA44 54 84 06 3F */ clrlwi. r4, r4, 0x18 /* 80032B08 0002FA48 40 82 00 1C */ bne lbl_80032B24 -/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304 /* 80032B1C 0002FA5C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs diff --git a/include/d/d_save/d_save/asm/func_80032FB8.s b/include/d/d_save/d_save/asm/func_80032FB8.s index 69e936634b..e02c5f750e 100644 --- a/include/d/d_save/d_save/asm/func_80032FB8.s +++ b/include/d/d_save/d_save/asm/func_80032FB8.s @@ -10,8 +10,8 @@ /* 80032FDC 0002FF1C 48 00 03 1D */ bl setLineUpItem__17dSv_player_item_cFv lbl_80032FE0: /* 80032FE0 0002FF20 3B C0 00 00 */ li r30, 0 -/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_80032FEC: /* 80032FEC 0002FF2C 7F E3 FB 78 */ mr r3, r31 /* 80032FF0 0002FF30 7F C4 F3 78 */ mr r4, r30 diff --git a/include/d/d_save/d_save/asm/func_80033030.s b/include/d/d_save/d_save/asm/func_80033030.s index 774618583b..701a2bac41 100644 --- a/include/d/d_save/d_save/asm/func_80033030.s +++ b/include/d/d_save/d_save/asm/func_80033030.s @@ -10,8 +10,8 @@ /* 80033054 0002FF94 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 80033058 0002FF98 41 82 02 7C */ beq lbl_800332D4 /* 8003305C 0002FF9C 3B C0 00 00 */ li r30, 0 -/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_80033068: /* 80033068 0002FFA8 7F E3 FB 78 */ mr r3, r31 /* 8003306C 0002FFAC 7F C4 F3 78 */ mr r4, r30 @@ -30,8 +30,8 @@ lbl_80033094: /* 8003309C 0002FFDC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800330A0 0002FFE0 28 00 00 FF */ cmplwi r0, 0xff /* 800330A4 0002FFE4 41 82 02 24 */ beq lbl_800332C8 -/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800330B0 0002FFF0 7F C4 F3 78 */ mr r4, r30 /* 800330B4 0002FFF4 4B FF F9 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 800330B8 0002FFF8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -162,8 +162,8 @@ lbl_80033254: lbl_8003325C: /* 8003325C 0003019C 2C 1E 00 03 */ cmpwi r30, 3 /* 80033260 000301A0 40 82 00 4C */ bne lbl_800332AC -/* 80033264 000301A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033264 000301A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003326C 000301AC 7F C4 F3 78 */ mr r4, r30 /* 80033270 000301B0 4B FF F7 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80033274 000301B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/include/d/d_save/d_save/asm/func_80033370.s b/include/d/d_save/d_save/asm/func_80033370.s index dedd1f2be8..1b4368fbfd 100644 --- a/include/d/d_save/d_save/asm/func_80033370.s +++ b/include/d/d_save/d_save/asm/func_80033370.s @@ -33,8 +33,8 @@ lbl_800333B4: /* 800333EC 0003032C 48 1E A8 D9 */ bl dMeter2Info_c_NS_setHotSpringTimer lbl_800333F0: /* 800333F0 00030330 3B A0 00 00 */ li r29, 0 -/* 800333F4 00030334 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800333F4 00030334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800333FC 0003033C 3B FF 00 0B */ addi r31, r31, 0xb lbl_80033400: /* 80033400 00030340 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_save/d_save/asm/func_80033494.s b/include/d/d_save/d_save/asm/func_80033494.s index 25e0eb3526..0e0b32d5c0 100644 --- a/include/d/d_save/d_save/asm/func_80033494.s +++ b/include/d/d_save/d_save/asm/func_80033494.s @@ -4,8 +4,8 @@ /* 800334A0 000303E0 39 61 00 20 */ addi r11, r1, 0x20 /* 800334A4 000303E4 48 32 ED 39 */ bl _savegpr_29 /* 800334A8 000303E8 3B A0 00 00 */ li r29, 0 -/* 800334AC 000303EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800334AC 000303EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800334B4 000303F4 3B E3 00 9C */ addi r31, r3, 0x9c lbl_800334B8: /* 800334B8 000303F8 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_save/d_save/asm/func_80033514.s b/include/d/d_save/d_save/asm/func_80033514.s index 75e5d706c0..e153d264e8 100644 --- a/include/d/d_save/d_save/asm/func_80033514.s +++ b/include/d/d_save/d_save/asm/func_80033514.s @@ -5,8 +5,8 @@ /* 80033524 00030464 48 32 EC B5 */ bl _savegpr_28 /* 80033528 00030468 7C 9C 23 78 */ mr r28, r4 /* 8003352C 0003046C 3B A0 00 00 */ li r29, 0 -/* 80033530 00030470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033530 00030470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033538 00030478 3B E3 00 9C */ addi r31, r3, 0x9c lbl_8003353C: /* 8003353C 0003047C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_save/d_save/asm/func_80033598.s b/include/d/d_save/d_save/asm/func_80033598.s index dae5d23e8d..d8ee00c32b 100644 --- a/include/d/d_save/d_save/asm/func_80033598.s +++ b/include/d/d_save/d_save/asm/func_80033598.s @@ -9,16 +9,16 @@ /* 800335B8 000304F8 7F C3 F3 78 */ mr r3, r30 /* 800335BC 000304FC 4B FF F3 5D */ bl dSv_item_rename__FUc /* 800335C0 00030500 7C 7E 1B 78 */ mr r30, r3 -/* 800335C4 00030504 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800335C4 00030504 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800335CC 0003050C 57 FF 06 3E */ clrlwi r31, r31, 0x18 /* 800335D0 00030510 7F E4 FB 78 */ mr r4, r31 /* 800335D4 00030514 4B FF F4 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 800335D8 00030518 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800335DC 0003051C 28 00 00 0B */ cmplwi r0, 0xb /* 800335E0 00030520 41 80 00 C4 */ blt lbl_800336A4 -/* 800335E4 00030524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800335E4 00030524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800335EC 0003052C 7F E4 FB 78 */ mr r4, r31 /* 800335F0 00030530 4B FF F4 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 800335F4 00030534 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -27,8 +27,8 @@ /* 80033600 00030540 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 80033604 00030544 28 00 00 6B */ cmplwi r0, 0x6b /* 80033608 00030548 40 82 00 24 */ bne lbl_8003362C -/* 8003360C 0003054C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003360C 0003054C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033614 00030554 7F E4 FB 78 */ mr r4, r31 /* 80033618 00030558 4B FF F4 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3 @@ -36,8 +36,8 @@ /* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80033628 00030568 48 1E A6 9D */ bl dMeter2Info_c_NS_setHotSpringTimer lbl_8003362C: -/* 8003362C 0003056C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003362C 0003056C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033634 00030574 7F E4 FB 78 */ mr r4, r31 /* 80033638 00030578 4B FF F4 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8003363C 0003057C 7C 60 1B 78 */ mr r0, r3 @@ -45,23 +45,23 @@ lbl_8003362C: /* 80033644 00030584 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80033648 00030588 7F C5 F3 78 */ mr r5, r30 /* 8003364C 0003058C 4B FF F9 6D */ bl setItem__17dSv_player_item_cFiUc -/* 80033650 00030590 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033650 00030590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033658 00030598 7F E4 FB 78 */ mr r4, r31 /* 8003365C 0003059C 4B FF F4 01 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80033660 000305A0 7C 60 1B 78 */ mr r0, r3 -/* 80033664 000305A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033664 000305A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003366C 000305AC 38 63 00 9C */ addi r3, r3, 0x9c /* 80033670 000305B0 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80033674 000305B4 7F C5 F3 78 */ mr r5, r30 /* 80033678 000305B8 4B FF F9 41 */ bl setItem__17dSv_player_item_cFiUc -/* 8003367C 000305BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003367C 000305BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033684 000305C4 7F E4 FB 78 */ mr r4, r31 /* 80033688 000305C8 4B FF F3 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8003368C 000305CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8003368C 000305CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80033694 000305D4 98 64 5E 7D */ stb r3, 0x5e7d(r4) /* 80033698 000305D8 9B C4 5E 7E */ stb r30, 0x5e7e(r4) /* 8003369C 000305DC 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_save/d_save/asm/func_80033754.s b/include/d/d_save/d_save/asm/func_80033754.s index 5bfe70dabf..96816339ca 100644 --- a/include/d/d_save/d_save/asm/func_80033754.s +++ b/include/d/d_save/d_save/asm/func_80033754.s @@ -5,8 +5,8 @@ /* 80033764 000306A4 48 32 EA 71 */ bl _savegpr_27 /* 80033768 000306A8 3B 60 00 00 */ li r27, 0 /* 8003376C 000306AC 3B E0 00 00 */ li r31, 0 -/* 80033770 000306B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033770 000306B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc /* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha diff --git a/include/d/d_save/d_save/asm/func_80033828.s b/include/d/d_save/d_save/asm/func_80033828.s index af0f1ce0bb..2b77ccdabd 100644 --- a/include/d/d_save/d_save/asm/func_80033828.s +++ b/include/d/d_save/d_save/asm/func_80033828.s @@ -22,21 +22,21 @@ lbl_80033854: /* 80033878 000307B8 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8003387C 000307BC 28 00 00 50 */ cmplwi r0, 0x50 /* 80033880 000307C0 41 82 00 30 */ beq lbl_800338B0 -/* 80033884 000307C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033884 000307C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003388C 000307CC 38 63 00 F8 */ addi r3, r3, 0xf8 /* 80033890 000307D0 7F C4 F3 78 */ mr r4, r30 /* 80033894 000307D4 48 00 08 65 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 80033898 000307D8 7C 65 1B 78 */ mr r5, r3 -/* 8003389C 000307DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003389C 000307DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec /* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 800338AC 000307EC 48 00 06 C1 */ bl setBombNum__24dSv_player_item_record_cFUcUc lbl_800338B0: /* 800338B0 000307F0 3B A0 00 00 */ li r29, 0 -/* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800338B4 000307F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800338BC 000307FC 3B FF 00 0F */ addi r31, r31, 0xf lbl_800338C0: /* 800338C0 00030800 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_save/d_save/asm/func_80033910.s b/include/d/d_save/d_save/asm/func_80033910.s index 151c618a2c..cc216fd60b 100644 --- a/include/d/d_save/d_save/asm/func_80033910.s +++ b/include/d/d_save/d_save/asm/func_80033910.s @@ -23,8 +23,8 @@ lbl_80033940: /* 80033964 000308A4 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80033968 000308A8 28 00 00 50 */ cmplwi r0, 0x50 /* 8003396C 000308AC 41 82 00 54 */ beq lbl_800339C0 -/* 80033970 000308B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033974 000308B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033970 000308B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033974 000308B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033978 000308B8 3B C3 00 F8 */ addi r30, r3, 0xf8 /* 8003397C 000308BC 7F C3 F3 78 */ mr r3, r30 /* 80033980 000308C0 7F 64 DB 78 */ mr r4, r27 @@ -38,16 +38,16 @@ lbl_80033940: /* 800339A0 000308E0 48 00 07 59 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 800339A4 000308E4 7C 7C 1B 78 */ mr r28, r3 lbl_800339A8: -/* 800339A8 000308E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800339AC 000308EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800339A8 000308E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800339AC 000308EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800339B0 000308F0 38 63 00 EC */ addi r3, r3, 0xec /* 800339B4 000308F4 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 800339B8 000308F8 7F 85 E3 78 */ mr r5, r28 /* 800339BC 000308FC 48 00 05 B1 */ bl setBombNum__24dSv_player_item_record_cFUcUc lbl_800339C0: /* 800339C0 00030900 3B A0 00 00 */ li r29, 0 -/* 800339C4 00030904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800339C8 00030908 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800339C4 00030904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800339C8 00030908 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 800339CC 0003090C 3B FF 00 0F */ addi r31, r31, 0xf lbl_800339D0: /* 800339D0 00030910 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_save/d_save/asm/func_80033A88.s b/include/d/d_save/d_save/asm/func_80033A88.s index 54764774b2..625168c64e 100644 --- a/include/d/d_save/d_save/asm/func_80033A88.s +++ b/include/d/d_save/d_save/asm/func_80033A88.s @@ -4,8 +4,8 @@ /* 80033A94 000309D4 39 61 00 20 */ addi r11, r1, 0x20 /* 80033A98 000309D8 48 32 E7 45 */ bl _savegpr_29 /* 80033A9C 000309DC 3B A0 00 00 */ li r29, 0 -/* 80033AA0 000309E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033AA4 000309E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033AA0 000309E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033AA4 000309E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033AA8 000309E8 3B E3 00 9C */ addi r31, r3, 0x9c lbl_80033AAC: /* 80033AAC 000309EC 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_save/d_save/asm/func_80033B08.s b/include/d/d_save/d_save/asm/func_80033B08.s index 4270e39cc5..55c80e0494 100644 --- a/include/d/d_save/d_save/asm/func_80033B08.s +++ b/include/d/d_save/d_save/asm/func_80033B08.s @@ -6,8 +6,8 @@ /* 80033B1C 00030A5C 7C 9B 23 78 */ mr r27, r4 /* 80033B20 00030A60 7C BE 2B 78 */ mr r30, r5 /* 80033B24 00030A64 3B E0 00 00 */ li r31, 0 -/* 80033B28 00030A68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033B2C 00030A6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033B28 00030A68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033B2C 00030A6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033B30 00030A70 3B A3 00 9C */ addi r29, r3, 0x9c lbl_80033B34: /* 80033B34 00030A74 7F A3 EB 78 */ mr r3, r29 @@ -26,8 +26,8 @@ lbl_80033B34: /* 80033B68 00030AA8 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80033B6C 00030AAC 28 00 00 50 */ cmplwi r0, 0x50 /* 80033B70 00030AB0 41 82 00 64 */ beq lbl_80033BD4 -/* 80033B74 00030AB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033B78 00030AB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033B74 00030AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033B78 00030AB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033B7C 00030ABC 3B 83 00 F8 */ addi r28, r3, 0xf8 /* 80033B80 00030AC0 7F 83 E3 78 */ mr r3, r28 /* 80033B84 00030AC4 7F 64 DB 78 */ mr r4, r27 @@ -41,8 +41,8 @@ lbl_80033B34: /* 80033BA4 00030AE4 48 00 05 55 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 80033BA8 00030AE8 7C 7E 1B 78 */ mr r30, r3 lbl_80033BAC: -/* 80033BAC 00030AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033BB0 00030AF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033BAC 00030AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033BB0 00030AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033BB4 00030AF4 38 63 00 EC */ addi r3, r3, 0xec /* 80033BB8 00030AF8 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 80033BBC 00030AFC 7F C5 F3 78 */ mr r5, r30 diff --git a/include/d/d_save/d_save/asm/func_80033C2C.s b/include/d/d_save/d_save/asm/func_80033C2C.s index 2cf4862eab..c61df03a78 100644 --- a/include/d/d_save/d_save/asm/func_80033C2C.s +++ b/include/d/d_save/d_save/asm/func_80033C2C.s @@ -4,15 +4,15 @@ /* 80033C38 00030B78 39 61 00 20 */ addi r11, r1, 0x20 /* 80033C3C 00030B7C 48 32 E5 A1 */ bl _savegpr_29 /* 80033C40 00030B80 7C 9D 23 78 */ mr r29, r4 -/* 80033C44 00030B84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033C48 00030B88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033C44 00030B84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033C48 00030B88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033C4C 00030B8C 38 63 00 9C */ addi r3, r3, 0x9c /* 80033C50 00030B90 38 80 00 15 */ li r4, 0x15 /* 80033C54 00030B94 7F A5 EB 78 */ mr r5, r29 /* 80033C58 00030B98 4B FF F3 61 */ bl setItem__17dSv_player_item_cFiUc /* 80033C5C 00030B9C 38 00 00 15 */ li r0, 0x15 -/* 80033C60 00030BA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033C64 00030BA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80033C60 00030BA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033C64 00030BA4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80033C68 00030BA8 98 1F 5E 7D */ stb r0, 0x5e7d(r31) /* 80033C6C 00030BAC 9B BF 5E 7E */ stb r29, 0x5e7e(r31) /* 80033C70 00030BB0 3B A0 00 00 */ li r29, 0 diff --git a/include/d/d_save/d_save/asm/func_80033D40.s b/include/d/d_save/d_save/asm/func_80033D40.s index 4deea5ca93..5313b2253a 100644 --- a/include/d/d_save/d_save/asm/func_80033D40.s +++ b/include/d/d_save/d_save/asm/func_80033D40.s @@ -15,8 +15,8 @@ lbl_80033D70: /* 80033D74 00030CB4 41 82 00 70 */ beq lbl_80033DE4 /* 80033D78 00030CB8 48 00 00 9C */ b lbl_80033E14 lbl_80033D7C: -/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033D84 00030CC4 38 63 00 CC */ addi r3, r3, 0xcc /* 80033D88 00030CC8 38 80 00 3D */ li r4, 0x3d /* 80033D8C 00030CCC 48 00 01 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc @@ -30,8 +30,8 @@ lbl_80033DA4: /* 80033DA8 00030CE8 98 1F 00 14 */ stb r0, 0x14(r31) /* 80033DAC 00030CEC 48 00 00 68 */ b lbl_80033E14 lbl_80033DB0: -/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033DB8 00030CF8 38 63 00 CC */ addi r3, r3, 0xcc /* 80033DBC 00030CFC 38 80 00 3D */ li r4, 0x3d /* 80033DC0 00030D00 48 00 01 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc @@ -45,8 +45,8 @@ lbl_80033DD8: /* 80033DDC 00030D1C 98 1F 00 14 */ stb r0, 0x14(r31) /* 80033DE0 00030D20 48 00 00 34 */ b lbl_80033E14 lbl_80033DE4: -/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033DEC 00030D2C 38 63 00 CC */ addi r3, r3, 0xcc /* 80033DF0 00030D30 38 80 00 3D */ li r4, 0x3d /* 80033DF4 00030D34 48 00 00 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc diff --git a/include/d/d_save/d_save/asm/func_80033F9C.s b/include/d/d_save/d_save/asm/func_80033F9C.s index f76bf7908d..2e8c8e3557 100644 --- a/include/d/d_save/d_save/asm/func_80033F9C.s +++ b/include/d/d_save/d_save/asm/func_80033F9C.s @@ -8,8 +8,8 @@ /* 80033FB8 00030EF8 88 7F 00 04 */ lbz r3, 4(r31) /* 80033FBC 00030EFC 7C A0 07 34 */ extsh r0, r5 /* 80033FC0 00030F00 7F C3 02 14 */ add r30, r3, r0 -/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80033FCC 00030F0C 38 63 00 9C */ addi r3, r3, 0x9c /* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb /* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18 diff --git a/include/d/d_save/d_save/asm/func_800340F8.s b/include/d/d_save/d_save/asm/func_800340F8.s index 07c147c55c..dc604e9b8f 100644 --- a/include/d/d_save/d_save/asm/func_800340F8.s +++ b/include/d/d_save/d_save/asm/func_800340F8.s @@ -6,8 +6,8 @@ /* 8003410C 0003104C 7C 7D 1B 78 */ mr r29, r3 /* 80034110 00031050 7C 9E 23 78 */ mr r30, r4 /* 80034114 00031054 3B E0 00 01 */ li r31, 1 -/* 80034118 00031058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80034118 00031058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80034120 00031060 38 63 00 CC */ addi r3, r3, 0xcc /* 80034124 00031064 38 80 00 4F */ li r4, 0x4f /* 80034128 00031068 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc diff --git a/include/d/d_save/d_save/asm/func_80034644.s b/include/d/d_save/d_save/asm/func_80034644.s index 2565eaaa8b..69b644fa95 100644 --- a/include/d/d_save/d_save/asm/func_80034644.s +++ b/include/d/d_save/d_save/asm/func_80034644.s @@ -4,8 +4,8 @@ /* 80034650 00031590 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13) /* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 80034658 00031598 41 82 00 18 */ beq lbl_80034670 -/* 8003465C 0003159C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003465C 0003159C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80034668 000315A8 4B FF 6D 49 */ bl dComIfG_play_c_NS_getNowVibration /* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674 diff --git a/include/d/d_save/d_save/asm/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s index 0f0ef93790..88a1e1dc4b 100644 --- a/include/d/d_save/d_save/asm/func_80035798.s +++ b/include/d/d_save/d_save/asm/func_80035798.s @@ -8,8 +8,8 @@ /* 800357B4 000326F4 3A C0 00 00 */ li r22, 0 /* 800357B8 000326F8 3B C0 00 00 */ li r30, 0 /* 800357BC 000326FC 3B E0 00 00 */ li r31, 0 -/* 800357C0 00032700 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800357C4 00032704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800357C0 00032700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800357C4 00032704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800357C8 00032708 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 800357CC 0003270C 7F A3 EB 78 */ mr r3, r29 /* 800357D0 00032710 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -38,15 +38,15 @@ /* 8003582C 0003276C 4B FF F1 79 */ bl offEventBit__11dSv_event_cFUs /* 80035830 00032770 3A C0 00 01 */ li r22, 1 lbl_80035834: -/* 80035834 00032774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035838 00032778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035834 00032774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035838 00032778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003583C 0003277C 38 63 00 CC */ addi r3, r3, 0xcc /* 80035840 00032780 38 80 00 48 */ li r4, 0x48 /* 80035844 00032784 4B FF E6 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80035848 00032788 2C 03 00 00 */ cmpwi r3, 0 /* 8003584C 0003278C 41 82 00 5C */ beq lbl_800358A8 -/* 80035850 00032790 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035854 00032794 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035850 00032790 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035854 00032794 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035858 00032798 3B 23 00 9C */ addi r25, r3, 0x9c /* 8003585C 0003279C 7F 23 CB 78 */ mr r3, r25 /* 80035860 000327A0 38 80 00 01 */ li r4, 1 @@ -59,8 +59,8 @@ lbl_80035834: /* 8003587C 000327BC 38 80 00 01 */ li r4, 1 /* 80035880 000327C0 38 A0 00 48 */ li r5, 0x48 /* 80035884 000327C4 4B FF D7 35 */ bl setItem__17dSv_player_item_cFiUc -/* 80035888 000327C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80035888 000327C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80035890 000327D0 A3 E4 00 08 */ lhz r31, 8(r4) /* 80035894 000327D4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80035898 000327D8 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -70,15 +70,15 @@ lbl_80035834: lbl_800358A8: /* 800358A8 000327E8 1C 18 0A 94 */ mulli r0, r24, 0xa94 /* 800358AC 000327EC 7F 9C 02 14 */ add r28, r28, r0 -/* 800358B0 000327F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800358B4 000327F4 3B 03 61 C0 */ addi r24, r3, lbl_804061C0@l +/* 800358B0 000327F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800358B4 000327F4 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l /* 800358B8 000327F8 83 38 0F 28 */ lwz r25, 0xf28(r24) /* 800358BC 000327FC 83 58 0F 2C */ lwz r26, 0xf2c(r24) /* 800358C0 00032800 48 30 CE 3D */ bl OSGetTime /* 800358C4 00032804 7C BA 20 10 */ subfc r5, r26, r4 /* 800358C8 00032808 7C 19 19 10 */ subfe r0, r25, r3 -/* 800358CC 0003280C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800358D0 00032810 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 800358CC 0003280C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800358D0 00032810 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800358D4 00032814 80 64 0F 30 */ lwz r3, 0xf30(r4) /* 800358D8 00032818 80 84 0F 34 */ lwz r4, 0xf34(r4) /* 800358DC 0003281C 7F 25 20 14 */ addc r25, r5, r4 @@ -136,14 +136,14 @@ lbl_800359A0: /* 800359A0 000328E0 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 800359A4 000328E4 28 00 00 01 */ cmplwi r0, 1 /* 800359A8 000328E8 40 82 00 28 */ bne lbl_800359D0 -/* 800359AC 000328EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800359B0 000328F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800359AC 000328EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800359B0 000328F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800359B4 000328F4 38 63 00 9C */ addi r3, r3, 0x9c /* 800359B8 000328F8 38 80 00 01 */ li r4, 1 /* 800359BC 000328FC 38 A0 00 FF */ li r5, 0xff /* 800359C0 00032900 4B FF D5 F9 */ bl setItem__17dSv_player_item_cFiUc -/* 800359C4 00032904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800359C8 00032908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800359C4 00032904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 800359C8 00032908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800359CC 0003290C B3 E3 00 08 */ sth r31, 8(r3) lbl_800359D0: /* 800359D0 00032910 3C 60 80 38 */ lis r3, lbl_80379234@ha diff --git a/include/d/d_save/d_save/asm/func_80035A04.s b/include/d/d_save/d_save/asm/func_80035A04.s index 1f4fedca28..d444f167a1 100644 --- a/include/d/d_save/d_save/asm/func_80035A04.s +++ b/include/d/d_save/d_save/asm/func_80035A04.s @@ -5,15 +5,15 @@ /* 80035A14 00032954 93 C1 00 08 */ stw r30, 8(r1) /* 80035A18 00032958 1C 05 0A 94 */ mulli r0, r5, 0xa94 /* 80035A1C 0003295C 7C 84 02 14 */ add r4, r4, r0 -/* 80035A20 00032960 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035A24 00032964 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035A20 00032960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035A24 00032964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035A28 00032968 38 A0 09 58 */ li r5, 0x958 /* 80035A2C 0003296C 4B FC DB 15 */ bl func_80003540 /* 80035A30 00032970 48 30 AB 61 */ bl OSGetSoundMode /* 80035A34 00032974 28 03 00 00 */ cmplwi r3, 0 /* 80035A38 00032978 40 82 00 28 */ bne lbl_80035A60 -/* 80035A3C 0003297C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035A40 00032980 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035A3C 0003297C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035A40 00032980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035A44 00032984 38 63 01 E0 */ addi r3, r3, 0x1e0 /* 80035A48 00032988 38 80 00 00 */ li r4, 0 /* 80035A4C 0003298C 4B FF EC 41 */ bl setSound__19dSv_player_config_cFUc @@ -22,8 +22,8 @@ /* 80035A58 00032998 48 29 7E 31 */ bl Z2AudioMgr_NS_setOutputMode /* 80035A5C 0003299C 48 00 00 4C */ b lbl_80035AA8 lbl_80035A60: -/* 80035A60 000329A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035A64 000329A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035A60 000329A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035A64 000329A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035A68 000329A8 3B E3 01 E0 */ addi r31, r3, 0x1e0 /* 80035A6C 000329AC 7F E3 FB 78 */ mr r3, r31 /* 80035A70 000329B0 4B FF EC 15 */ bl getSound__19dSv_player_config_cFv @@ -42,8 +42,8 @@ lbl_80035A90: /* 80035AA0 000329E0 38 80 00 01 */ li r4, 1 /* 80035AA4 000329E4 48 29 7D E5 */ bl Z2AudioMgr_NS_setOutputMode lbl_80035AA8: -/* 80035AA8 000329E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035AAC 000329EC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80035AA8 000329E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035AAC 000329EC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80035AB0 000329F0 A0 1F 00 02 */ lhz r0, 2(r31) /* 80035AB4 000329F4 28 00 00 0C */ cmplwi r0, 0xc /* 80035AB8 000329F8 40 80 00 0C */ bge lbl_80035AC4 @@ -53,8 +53,8 @@ lbl_80035AC4: /* 80035AC4 00032A04 38 60 00 06 */ li r3, 6 /* 80035AC8 00032A08 38 80 00 00 */ li r4, 0 /* 80035ACC 00032A0C 4B FF 95 75 */ bl dComIfGs_setKeyNum -/* 80035AD0 00032A10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035AD4 00032A14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035AD0 00032A10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035AD4 00032A14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035AD8 00032A18 3B C3 00 9C */ addi r30, r3, 0x9c /* 80035ADC 00032A1C 7F C3 F3 78 */ mr r3, r30 /* 80035AE0 00032A20 38 80 00 09 */ li r4, 9 @@ -96,12 +96,12 @@ lbl_80035B60: /* 80035B68 00032AA8 38 7F 01 E0 */ addi r3, r31, 0x1e0 /* 80035B6C 00032AAC 4B FF EB 29 */ bl getVibration__19dSv_player_config_cFv /* 80035B70 00032AB0 7C 64 1B 78 */ mr r4, r3 -/* 80035B74 00032AB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035B78 00032AB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035B74 00032AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035B78 00032AB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035B7C 00032ABC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80035B80 00032AC0 4B FF 58 29 */ bl dComIfG_play_c_NS_setNowVibration -/* 80035B84 00032AC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80035B88 00032AC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80035B84 00032AC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80035B88 00032AC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035B8C 00032ACC 38 83 00 58 */ addi r4, r3, 0x58 /* 80035B90 00032AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80035B94 00032AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 981b871e7d..0e51d65ca8 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -15,95 +15,298 @@ enum Wallets { }; enum ItemTable { - ORDON_SHIELD = 42, - WOODEN_SHIELD, - HYLIAN_SHIELD, - OOCCOOS_NOTE, - ORDON_CLOTHES, - HEROS_CLOTHES, - MAGIC_ARMOR, - ZORA_ARMOR, - HAWKEYE = 62, - WOODEN_SWORD, - GALE_BOOMERANG, - SPINNER, - BALL_AND_CHAIN, - HEROS_BOW, - CLAWSHOT, - IRON_BOOTS, - DOMINION_ROD, - DOUBLE_CLAWSHOTS, - LANTERN, - MASTER_SWORD, - FISHING_ROD, - SLINGSHOT, - DOMINION_ROD_2, // unused? - GIANT_BOMB_BAG = 79, - EMPTY_BOMBBAG, - BAG_AND_BOMBS, - UNUSED_BOMB_BAG, - FIRE_ARROW, // unused? - QUIVER, - BIG_QUIVER, - GIANT_QUIVER, - UNUSED_FISHING_ROD = 88, - HEROS_BOW_BOMBS, - HEROS_BOW_HAWKEYE, - ROD_BEE_LARVA, - ROD_CORAL_EARRING, - ROD_WORM, - ROD_CORAL_EARRING_BEE_LARVA, - ROD_CORAL_EARRING_WORM, - EMPTY_BOTTLE, - RED_POTION, - MAGIC_POTION, - BLUE_POTION, - MILK, - HALF_MILK, - LANTERN_OIL, - WATER, - LANTERN_OIL_2, // unused? - RED_POTION_2, // unused? - NASTY_SOUP, - HOT_SPRING_WATER, - FAIRY, - HOT_SPRING_WATER_2, // unused? - LANTERN_OIL_3, // unused? - LANTERN_OIL_4, // unused? - REGULAR_BOMBS, - WATER_BOMBS, - BOMBLINGS, - FAIRY_TEARS, - WORM, - FAIRY_TEARS_2, // unused? - BEE_LARVA, - RARE_CHU, - RED_CHU, - BLUE_CHU, - GREEN_CHU, - YELLOW_CHU, - PURPLE_CHU, - SIMPLE_SOUP, - GOOD_SOUP, - SUPERB_SOUP, - RENADOS_LETTER, - INVOICE, - WOODEN_STATUE, - ILIAS_CHARM, - HORSE_CALL, - AURUS_MEMO = 144, - ASHEIS_SKETCH, - LANTERN_2 = 156, // unused? - LANTERN_OIL_5, // unused? - BEE_LARVA_2, // unused? - BLACK_CHU_JELLY, // unused? - TEAR_OF_LIGHT, // unused? - VESSEL_OF_LIGHT, // unused? - VESSEL_OF_LIGHT_2, // unused? - ANCIENT_SKY_BOOK_EMPTY = 233, - ANCIENT_SKY_BOOK_PARTIAL, - ANCIENT_SKY_BOOK_FILLED, - NO_ITEM = 255 + AIR_LETTER = 234, + ANCIENT_DOCUMENT = 233, + ANCIENT_DOCUMENT2 = 235, + ARMOR = 48, + ARROW_1 = 17, + ARROW_10 = 14, + ARROW_20 = 15, + ARROW_30 = 16, + ARROW_LV1 = 84, + ARROW_LV2 = 85, + ARROW_LV3 = 86, + ASHS_SCRIBBLING = 145, + BEE_CHILD = 118, + BEE_ROD = 91, + BILL = 129, + BLUE_BOTTLE = 99, + BLUE_RUPEE = 2, + BOMB_10 = 11, + BOMB_20 = 12, + BOMB_30 = 13, + BOMB_5 = 10, + BOMB_ARROW = 89, + BOMB_BAG_LV1 = 80, + BOMB_BAG_LV2 = 79, + BOMB_INSECT_10 = 27, + BOMB_INSECT_20 = 28, + BOMB_INSECT_30 = 29, + BOMB_INSECT_5 = 26, + BOMB_IN_BAG = 81, + BOOMERANG = 64, + BOSSRIDER_KEY = 243, + BOSS_KEY = 38, + BOW = 67, + CHUCHU_BLACK = 159, + CHUCHU_BLUE = 121, + CHUCHU_GREEN = 122, + CHUCHU_PURPLE = 124, + CHUCHU_RARE = 119, + CHUCHU_RED = 120, + CHUCHU_YELLOW = 123, + CHUCHU_YELLOW2 = 156, + COMPUS = 36, + COPY_ROD = 70, + COPY_ROD_2 = 76, + DROP_BOTTLE = 117, + DROP_CONTAINER = 161, + DROP_CONTAINER02 = 162, + DROP_CONTAINER03 = 163, + DUNGEON_BACK = 39, + DUNGEON_EXIT = 37, + DUNGEON_EXIT_2 = 51, + EMPTY_BOTTLE = 96, + FAIRY = 108, + FAIRY_DROP = 115, + FILLED_CONTAINER = 164, + FISHING_ROD_1 = 74, + F_ANT = 213, + F_BEETLE = 193, + F_BUTTERFLY = 195, + F_DANGOMUSHI = 203, + F_DRAGONFLY = 211, + F_GRASSHOPPER = 199, + F_LADYBUG = 207, + F_MANTIS = 205, + F_MAYFLY = 215, + F_NANAFUSHI = 201, + F_SNAIL = 209, + F_STAG_BEETLE = 197, + GREEN_BOTTLE = 98, + GREEN_RUPEE = 1, + HALF_MILK_BOTTLE = 101, + HAWK_ARROW = 90, + HAWK_EYE = 62, + HEART = 0, + HOOKSHOT = 68, + HORSE_FLUTE = 132, + HOT_SPRING = 107, + HOT_SPRING_2 = 109, + HVY_BOOTS = 69, + HYLIA_SHIELD = 44, + IRIAS_PENDANT = 131, + IRONBALL = 66, + JEWEL_BEE_ROD = 94, + JEWEL_ROD = 92, + JEWEL_WORM_ROD = 95, + KAKERA_HEART = 33, + KANTERA = 72, + KANTERA2 = 248, + KEY_OF_CARAVAN = 252, + KEY_OF_FILONE = 254, + L2_KEY_PIECES1 = 249, + L2_KEY_PIECES2 = 250, + L2_KEY_PIECES3 = 251, + LETTER = 128, + LIGHT_ARROW = 83, + LIGHT_DROP = 160, + LIGHT_SWORD = 73, + LINKS_SAVINGS = 237, + LURE_ROD = 88, + LV1_SOUP = 125, + LV2_BOSS_KEY = 253, + LV2_SOUP = 126, + LV3_SOUP = 127, + LV5_BOSS_KEY = 246, + LV7_DUNGEON_EXIT = 236, + L_MAGIC = 9, + MAGIC_LV1 = 50, + MAP = 35, + MASTER_SWORD = 41, + MILK_BOTTLE = 100, + MIRROR_PIECE_2 = 165, + MIRROR_PIECE_3 = 166, + MIRROR_PIECE_4 = 167, + M_ANT = 212, + M_BEETLE = 192, + M_BUTTERFLY = 194, + M_DANGOMUSHI = 202, + M_DRAGONFLY = 210, + M_GRASSHOPPER = 198, + M_LADYBUG = 206, + M_MANTIS = 204, + M_MAYFLY = 214, + M_NANAFUSHI = 200, + M_SNAIL = 208, + M_STAG_BEETLE = 196, + NORMAL_BOMB = 112, + NO_ITEM = 255, + OIL = 111, + OIL2 = 110, + OIL_BOTTLE = 102, + OIL_BOTTLE3 = 157, + OIL_BOTTLE_2 = 104, + ORANGE_RUPEE = 6, + PACHINKO = 75, + PACHINKO_SHOT = 18, + POKE_BOMB = 114, + POU_FIRE1 = 239, + POU_FIRE2 = 240, + POU_FIRE3 = 241, + POU_FIRE4 = 242, + POU_SPIRIT = 224, + PURPLE_RUPEE = 5, + RAFRELS_MEMO = 144, + RECOVERY_FAILY = 30, + RED_BOTTLE = 97, + RED_BOTTLE_2 = 105, + RED_RUPEE = 4, + SHIELD = 43, + SHOP_BEE_CHILD = 158, + SILVER_RUPEE = 7, + SMALL_KEY = 32, + SMALL_KEY2 = 238, + SMELL_CHILDREN = 180, + SMELL_FISH = 179, + SMELL_MEDICINE = 181, + SMELL_POH = 178, + SMELL_PUMPKIN = 177, + SMELL_YELIA_POUCH = 176, + SPINNER = 65, + SURFBOARD = 247, + SWORD = 40, + S_MAGIC = 8, + TASTE = 245, + TKS_LETTER = 45, + TOMATO_PUREE = 244, + TRIPLE_HEART = 31, + UGLY_SOUP = 106, + UTAWA_HEART = 34, + WALLET_LV1 = 52, + WALLET_LV2 = 53, + WALLET_LV3 = 54, + WATER_BOMB = 113, + WATER_BOMB_10 = 23, + WATER_BOMB_20 = 24, + WATER_BOMB_30 = 25, + WATER_BOMB_5 = 22, + WATER_BOTTLE = 103, + WEARS_CASUAL = 46, + WEAR_KOKIRI = 47, + WEAR_ZORA = 49, + WOOD_SHIELD = 42, + WOOD_STATUE = 130, + WOOD_STICK = 63, + WORM = 116, + WORM_ROD = 93, + W_HOOKSHOT = 71, + YELLOW_RUPEE = 3, + ZORAS_JEWEL = 61, + noentry1 = 19, + noentry10 = 77, + noentry11 = 78, + noentry12 = 82, + noentry13 = 87, + noentry14 = 133, + noentry15 = 134, + noentry16 = 135, + noentry17 = 136, + noentry18 = 137, + noentry19 = 138, + noentry2 = 20, + noentry20 = 139, + noentry21 = 140, + noentry22 = 141, + noentry23 = 142, + noentry24 = 143, + noentry25 = 146, + noentry26 = 147, + noentry27 = 148, + noentry28 = 149, + noentry29 = 150, + noentry3 = 21, + noentry30 = 151, + noentry31 = 152, + noentry32 = 153, + noentry33 = 154, + noentry34 = 155, + noentry35 = 168, + noentry36 = 169, + noentry37 = 170, + noentry38 = 171, + noentry39 = 172, + noentry4 = 55, + noentry40 = 173, + noentry41 = 174, + noentry42 = 175, + noentry43 = 182, + noentry44 = 183, + noentry45 = 184, + noentry46 = 185, + noentry47 = 186, + noentry48 = 187, + noentry49 = 188, + noentry5 = 56, + noentry50 = 189, + noentry51 = 190, + noentry52 = 191, + noentry53 = 216, + noentry54 = 217, + noentry55 = 218, + noentry56 = 219, + noentry57 = 220, + noentry58 = 221, + noentry59 = 222, + noentry6 = 57, + noentry60 = 223, + noentry61 = 225, + noentry62 = 226, + noentry63 = 227, + noentry64 = 228, + noentry65 = 229, + noentry66 = 230, + noentry67 = 231, + noentry68 = 232, + noentry7 = 58, + noentry8 = 59, + noentry9 = 60 +}; + +enum EquipmentBits{ + CLOTHING_BITFIELD, + SWORD_BITFIELD, + SHIELD_BITFIELD +}; + +enum Swords{ + ORDON_SWORD_FLAG, + MASTER_SWORD_FLAG, + WOODEN_SWORD_FLAG, + LIGHT_SWORD_FLAG +}; + +enum Shields{ + ORDON_SHIELD_FLAG, + HYLIAN_SHIELD_FLAG, + WOODEN_SHIELD_FLAG +}; + +enum Armors{ + HEROS_CLOTHES_FLAG +}; + +enum DungeonItem{ + MAP_FLAG, + COMPASS_FLAG, + BOSS_KEY_FLAG, + OOCCOO_NOTE_FLAG = 6 +}; + +enum AreaVessel{ + FARON_VESSEL, + ELDIN_VESSEL, + LANAYRU_VESSEL }; class dSv_player_status_a_c { @@ -119,6 +322,13 @@ class dSv_player_status_a_c { inline u16& getCurrentHealth() { return current_health; } + inline void setWalletLV(u8 lv){ + current_wallet = lv; + } + void setLanternOil(u16 amount){ + max_lantern_oil = amount; + current_lantern_oil = amount; + } private: u16 max_health; @@ -284,6 +494,10 @@ class dSv_player_item_record_c { u8 addBottleNum(u8, short); u8 getBottleNum(u8) const; + void setBowAmount(u8 amount){ + bow = amount; + } + private: u8 bow; u8 bomb_bags[3]; @@ -298,6 +512,10 @@ class dSv_player_item_max_c { void setBombNum(u8, u8); u8 getBombNum(u8) const; + void setBowCapacity(u8 max){ + item_capacities[0] = max; + } + private: u8 item_capacities[8]; }; @@ -312,6 +530,10 @@ class dSv_player_collect_c { void onCollectMirror(u8); bool isCollectMirror(u8) const; + u8 getPoeCount(){ + return poe_count; + } + private: u8 unk0[8]; u8 unk8; @@ -424,6 +646,31 @@ class dSv_player_c { dSv_player_status_a_c getPlayerStatusA() { return player_status_a; } + dSv_player_item_c& getPlayerItem(){ + return player_item; + } + dSv_player_collect_c& getPlayerCollect(){ + return player_collect; + } + dSv_player_item_record_c& getPlayerItemRecord(){ + return player_item_record; + } + dSv_player_item_max_c& getPlayerItemMax(){ + return player_item_max; + } + dSv_light_drop_c& getLightDrop(){ + return light_drop; + } + dSv_player_get_item_c& getPlayerGetItem(){ + return player_get_item; + } + + void setPlayerStatusAWalletLV(u8 lv) { + player_status_a.setWalletLV(lv); + } + void setPlayerStatusAOil(u16 amount){ + player_status_a.setLanternOil(amount); + } private: dSv_player_status_a_c player_status_a; @@ -461,6 +708,10 @@ class dSv_memBit_c { void onDungeonItem(int); bool isDungeonItem(int) const; + u8 getSmallKeys(){ + return small_key_flags; + } + private: u32 area_flags_bitfields1[2]; u32 area_flags_bitfields2[4]; @@ -631,6 +882,11 @@ class dSv_save_c { void init(void); dSv_memory2_c* getSave2(int); inline dSv_player_c& getPlayer() {return player; } + dSv_event_c& getEventFlags() {return event_flags;} + + void setPlayerStatusAWallet(u8 lv){ + player.setPlayerStatusAWalletLV(lv); + } static const int STAGE_MAX = 4; diff --git a/include/d/d_save/d_save_HIO/asm/func_8025BBAC.s b/include/d/d_save/d_save_HIO/asm/func_8025BBAC.s index 7e0095196a..2423482859 100644 --- a/include/d/d_save/d_save_HIO/asm/func_8025BBAC.s +++ b/include/d/d_save/d_save_HIO/asm/func_8025BBAC.s @@ -5,8 +5,8 @@ /* 8025BBBC 00258AFC 48 10 66 21 */ bl _savegpr_29 /* 8025BBC0 00258B00 7C 7D 1B 78 */ mr r29, r3 /* 8025BBC4 00258B04 3B C0 00 00 */ li r30, 0 -/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BBD0 00258B10 3B E3 09 58 */ addi r31, r3, 0x958 lbl_8025BBD4: /* 8025BBD4 00258B14 7F E3 FB 78 */ mr r3, r31 diff --git a/include/functions.h b/include/functions.h index 107b362069..c745b8e2dd 100644 --- a/include/functions.h +++ b/include/functions.h @@ -61,7 +61,6 @@ extern "C" { void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8); void isFirstBit__21dSv_player_get_item_cCFUc(void); void setBombNum__24dSv_player_item_record_cFUcUc(void); - void getBombNum__21dSv_player_item_max_cCFUc(void); void setItem__17dSv_player_item_cFiUc(void); void dMeter2Info_c_NS_getString(void); void Z2AudioMgr_NS_setOutputMode(u32,unsigned long); @@ -162,7 +161,6 @@ extern "C" { void init__14dComIfG_play_cFv(void); void func_80003458(void); void dStage_roomControl_c_NS_initZone(void); - void checkItemGet(u8,int); void JUTWarningConsole(void); void JUTConsole_NS_print(void); void JUTConsole_NS_check(void); @@ -477,6 +475,34 @@ extern "C"{ void checkDownDamage__10e_wb_classFv(void); } +// d_item +extern "C"{ + void onFirstBit__21dSv_player_get_item_cFUc(u8); + void addBombCount(u8,u8); + void onDungeonItem__12dSv_memBit_cFi(int); + int dComIfGs_getMaxLifeGauge(void); + void dComIfGs_setSelectEquipSword(u8); + void dComIfGs_setSelectEquipShield(u8); + void dComIfGs_setSelectEquipClothes(u8); + int item_getcheck_func_FISHING_ROD_1(void); + void onSwitch__10dSv_info_cFii(int, int); + void setCollect__20dSv_player_collect_cFiUc(int, u8); + void dMeter2Info_setSword(u8, bool); + void setEmptyBottleItemIn__17dSv_player_item_cFUc(u8); + void setBottleNum__24dSv_player_item_record_cFUcUc(u8,u8); + void item_func_BEE_CHILD(void); + int func_80368954(char*,char*,u32); + void dComIfG_play_c_NS_getLayerNo(int); + u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8); + void func_80362204(void); + void dComIfG_play_c_NS_setItemBombNumCount(u8, s16); + void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool); + u32 getBombNum__21dSv_player_item_max_cCFUc(u8); + u8 getBombNum__24dSv_player_item_record_cCFUc(u8); + void func_803621B8(void); + int checkItemGet__FUci(u8,int); +} + // JSystem/JKernel/JKRThread extern "C" { void __ct__9JKRThreadFUlii(void); @@ -706,4 +732,4 @@ extern "C" { void setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl(void); void store__Q210JKRArchive8CArcNameFPCc(void); void store__Q210JKRArchive8CArcNameFPCcc(void); -}; \ No newline at end of file +}; diff --git a/include/m_Do/m_Do_main/asm/func_80005D4C.s b/include/m_Do/m_Do_main/asm/func_80005D4C.s index d6c2a7cece..46268ebcbe 100644 --- a/include/m_Do/m_Do_main/asm/func_80005D4C.s +++ b/include/m_Do/m_Do_main/asm/func_80005D4C.s @@ -201,8 +201,8 @@ lbl_80006014: /* 8000602C 00002F6C 48 2C D1 ED */ bl JKRAramHeap_NS_dump lbl_80006030: /* 80006030 00002F70 48 25 C4 41 */ bl DynamicModuleControlBase_NS_dump -/* 80006034 00002F74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80006038 00002F78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80006034 00002F74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80006038 00002F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000603C 00002F7C 3C 63 00 02 */ addis r3, r3, 2 /* 80006040 00002F80 38 63 C2 F8 */ addi r3, r3, -15624 /* 80006044 00002F84 48 03 65 F5 */ bl dRes_control_c_NS_dump diff --git a/include/m_Do/m_Do_main/asm/func_80006454.s b/include/m_Do/m_Do_main/asm/func_80006454.s index 6d9751625a..8c188e8d07 100644 --- a/include/m_Do/m_Do_main/asm/func_80006454.s +++ b/include/m_Do/m_Do_main/asm/func_80006454.s @@ -49,8 +49,8 @@ lbl_800064A8: /* 8000650C 0000344C 80 6D 86 F8 */ lwz r3, lbl_80450C78-_SDA_BASE_(r13) /* 80006510 00003450 98 83 00 11 */ stb r4, 0x11(r3) lbl_80006514: -/* 80006514 00003454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80006518 00003458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80006514 00003454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80006518 00003458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000651C 0000345C 48 02 66 C9 */ bl dComIfG_inf_c_NS_ct /* 80006520 00003460 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13) /* 80006524 00003464 7C 00 07 75 */ extsb. r0, r0 diff --git a/include/variables.h b/include/variables.h index 0766f9bd93..4b7a0b08e1 100644 --- a/include/variables.h +++ b/include/variables.h @@ -2,11 +2,9 @@ extern float lbl_80451D5C; extern u8 lbl_80379234[0x64]; -extern int lbl_804061C0; extern float lbl_80451D58; extern u8 lbl_803A7270[24]; extern u8 lbl_80430188[16]; -extern u8 lbl_803A7288; extern u8 lbl_80379235[16]; extern char lbl_803739A0[0x310]; extern u32 lbl_80451368; @@ -248,3 +246,16 @@ extern double lbl_80455FB0; // JKernel::@695 = 4.503601774854144 extern float lbl_80455FA8; // JKernel::@693 = 100.0 extern u8 lbl_80451420; // JKRArchive::sCurrentDirID extern u8 lbl_803CC288; // JKRArchive::__vt + +//d_item +extern float lbl_80452BD8; +extern float lbl_80452BDC; +extern double lbl_80452BE0; +extern u8 lbl_80450D64; +struct unkEvent{ //figure out what this is later + u8 unk0[0x235]; + u16 unk566; + u8 unk567[0x439]; +}; +extern unkEvent lbl_803A7288; +extern u8 lbl_8037B0D0[0x8]; \ No newline at end of file diff --git a/ldscript.lcf b/ldscript.lcf index 6c05765fe3..bea883229c 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -886,6 +886,383 @@ removeResourceAll__10JKRArchiveFv removeResource__10JKRArchiveFPv getExpandSize__10JKRArchiveCFPQ210JKRArchive12SDIFileEntry setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl + item_func_HEART__Fv + item_func_GREEN_RUPEE__Fv + item_func_BLUE_RUPEE__Fv + item_func_YELLOW_RUPEE__Fv + item_func_RED_RUPEE__Fv + item_func_PURPLE_RUPEE__Fv + item_func_ORANGE_RUPEE__Fv + item_func_SILVER_RUPEE__Fv + item_func_S_MAGIC__Fv + item_func_L_MAGIC__Fv + item_func_BOMB_5__Fv + item_func_BOMB_10__Fv + item_func_BOMB_20__Fv + item_func_BOMB_30__Fv + item_func_ARROW_10__Fv + item_func_ARROW_20__Fv + item_func_ARROW_30__Fv + item_func_ARROW_1__Fv + item_func_PACHINKO_SHOT__Fv + item_func_WATER_BOMB_5__Fv + item_func_WATER_BOMB_10__Fv + item_func_WATER_BOMB_20__Fv + item_func_WATER_BOMB_30__Fv + item_func_BOMB_INSECT_5__Fv + item_func_BOMB_INSECT_10__Fv + item_func_BOMB_INSECT_20__Fv + item_func_BOMB_INSECT_30__Fv + item_func_RECOVER_FAILY__Fv + item_func_TRIPLE_HEART__Fv + item_func_SMALL_KEY__Fv + item_func_KAKERA_HEART__Fv + item_func_UTUWA_HEART__Fv + item_func_MAP__Fv + item_func_COMPUS__Fv + item_func_DUNGEON_EXIT__Fv + item_func_BOSS_KEY__Fv + item_func_DUNGEON_BACK__Fv + item_func_SWORD__Fv + item_func_MASTER_SWORD__Fv + item_func_WOOD_SHIELD__Fv + item_func_SHIELD__Fv + item_func_HYLIA_SHIELD__Fv + item_func_TKS_LETTER__Fv + item_func_WEAR_CASUAL__Fv + item_func_WEAR_KOKIRI__Fv + item_func_ARMOR__Fv + item_func_WEAR_ZORA__Fv + item_func_MAGIC_LV1__Fv + item_func_DUNGEON_EXIT_2__Fv + item_func_WALLET_LV1__Fv + item_func_WALLET_LV2__Fv + item_func_WALLET_LV3__Fv + item_func_ZORAS_JEWEL__Fv + item_func_HAWK_EYE__Fv + item_func_WOOD_STICK__Fv + item_func_BOOMERANG__Fv + item_func_SPINNER__Fv + item_func_IRONBALL__Fv + item_func_BOW__Fv + item_func_HOOKSHOT__Fv + item_func_HVY_BOOTS__Fv + item_func_COPY_ROD__Fv + item_func_W_HOOKSHOT__Fv + item_func_KANTERA__Fv + item_func_LIGHT_SWORD__Fv + item_func_FISHING_ROD_1__Fv + item_func_PACHINKO__Fv + item_func_COPY_ROD_2__Fv + item_func_BOMB_BAG_LV2__Fv + item_func_BOMB_BAG_LV1__Fv + item_func_BOMB_IN_BAG__Fv + item_func_LIGHT_ARROW__Fv + item_func_ARROW_LV1__Fv + item_func_ARROW_LV2__Fv + item_func_ARROW_LV3__Fv + item_func_LURE_ROD__Fv + item_func_BOMB_ARROW__Fv + item_func_HAWK_ARROW__Fv + item_func_BEE_ROD__Fv + item_func_JEWEL_ROD__Fv + item_func_WORM_ROD__Fv + item_func_JEWEL_BEE_ROD__Fv + item_func_JEWEL_WORM_ROD__Fv + item_func_EMPTY_BOTTLE__Fv + item_func_RED_BOTTLE__Fv + item_func_GREEN_BOTTLE__Fv + item_func_BLUE_BOTTLE__Fv + item_func_MILK_BOTTLE__Fv + item_func_HALF_MILK_BOTTLE__Fv + item_func_OIL_BOTTLE__Fv + item_func_WATER_BOTTLE__Fv + item_func_OIL_BOTTLE2__Fv + item_func_RED_BOTTLE2__Fv + item_func_UGLY_SOUP__Fv + item_func_HOT_SPRING__Fv + item_func_FAIRY_BOTTLE__Fv + item_func_HOT_SPRING2__Fv + item_func_OIL2__Fv + item_func_OIL__Fv + item_func_NORMAL_BOMB__Fv + item_func_WATER_BOMB__Fv + item_func_POKE_BOMB__Fv + item_func_FAIRY_DROP__Fv + item_func_WORM__Fv + item_func_DROP_BOTTLE__Fv + item_func_BEE_CHILD__Fv + item_func_CHUCHU_RARE__Fv + item_func_CHUCHU_RED__Fv + item_func_CHUCHU_BLUE__Fv + item_func_CHUCHU_GREEN__Fv + item_func_CHUCHU_YELLOW__Fv + item_func_CHUCHU_PURPLE__Fv + item_func_LV1_SOUP__Fv + item_func_LV2_SOUP__Fv + item_func_LV3_SOUP__Fv + item_func_LETTER__Fv + item_func_BILL__Fv + item_func_WOOD_STATUE__Fv + item_func_IRIAS_PENDANT__Fv + item_func_HORSE_FLUTE__Fv + item_func_RAFRELS_MEMO__Fv + item_func_ASHS_SCRIBBLING__Fv + item_func_CHUCHU_YELLOW2__Fv + item_func_OIL_BOTTLE3__Fv + item_func_SHOP_BEE_CHILD__Fv + item_func_CHUCHU_BLACK__Fv + item_func_LIGHT_DROP__Fv + item_func_DROP_CONTAINER__Fv + item_func_DROP_CONTAINER02__Fv + item_func_DROP_CONTAINER03__Fv + item_func_FILLED_CONTAINER__Fv + item_func_MIRROR_PIECE_2__Fv + item_func_MIRROR_PIECE_3__Fv + item_func_MIRROR_PIECE_4__Fv + item_func_SMELL_YELIA_POUCH__Fv + item_func_SMELL_PUMPKIN__Fv + item_func_SMELL_POH__Fv + item_func_SMELL_FISH__Fv + item_func_SMELL_CHILDREN__Fv + item_func_SMELL_MEDICINE__Fv + item_func_M_BEETLE__Fv + item_func_F_BEETLE__Fv + item_func_M_BUTTERFLY__Fv + item_func_F_BUTTERFLY__Fv + item_func_M_STAG_BEETLE__Fv + item_func_F_STAG_BEETLE__Fv + item_func_M_GRASSHOPPER__Fv + item_func_F_GRASSHOPPER__Fv + item_func_M_NANAFUSHI__Fv + item_func_F_NANAFUSHI__Fv + item_func_M_DANGOMUSHI__Fv + item_func_F_DANGOMUSHI__Fv + item_func_M_MANTIS__Fv + item_func_F_MANTIS__Fv + item_func_M_LADYBUG__Fv + item_func_F_LADYBUG__Fv + item_func_M_SNAIL__Fv + item_func_F_SNAIL__Fv + item_func_M_DRAGONFLY__Fv + item_func_F_DRAGONFLY__Fv + item_func_M_ANT__Fv + item_func_F_ANT__Fv + item_func_M_MAYFLY__Fv + item_func_F_MAYFLY__Fv + item_func_POU_SPIRIT__Fv + item_func_ANCIENT_DOCUMENT__Fv + item_func_AIR_LETTER__Fv + item_func_ANCIENT_DOCUMENT2__Fv + item_func_LV7_DUNGEON_EXIT__Fv + item_func_LINKS_SAVINGS__Fv + item_func_SMALL_KEY2__Fv + item_func_POU_FIRE1__Fv + item_func_POU_FIRE2__Fv + item_func_POU_FIRE3__Fv + item_func_POU_FIRE4__Fv + item_func_BOSSRIDER_KEY__Fv + item_func_TOMATO_PUREE__Fv + item_func_TASTE__Fv + item_func_LV5_BOSS_KEY__Fv + item_func_SURFBOARD__Fv + item_func_KANTERA2__Fv + item_func_L2_KEY_PIECES1__Fv + item_func_L2_KEY_PIECES2__Fv + item_func_L2_KEY_PIECES3__Fv + item_func_KEY_OF_CARAVAN__Fv + item_func_LV2_BOSS_KEY__Fv + item_func_KEY_OF_FILONE__Fv + item_func_noentry__Fv + item_getcheck_func_noentry__Fv + item_getcheck_func_HEART__Fv + item_getcheck_func_GREEN_RUPEE__Fv + item_getcheck_func_BLUE_RUPEE__Fv + item_getcheck_func_YELLOW_RUPEE__Fv + item_getcheck_func_RED_RUPEE__Fv + item_getcheck_func_PURPLE_RUPEE__Fv + item_getcheck_func_ORANGE_RUPEE__Fv + item_getcheck_func_SILVER_RUPEE__Fv + item_getcheck_func_S_MAGIC__Fv + item_getcheck_func_L_MAGIC__Fv + item_getcheck_func_BOMB_5__Fv + item_getcheck_func_BOMB_10__Fv + item_getcheck_func_BOMB_20__Fv + item_getcheck_func_BOMB_30__Fv + item_getcheck_func_ARROW_10__Fv + item_getcheck_func_ARROW_20__Fv + item_getcheck_func_ARROW_30__Fv + item_getcheck_func_ARROW_1__Fv + item_getcheck_func_PACHINKO_SHOT__Fv + item_getcheck_func_WATER_BOMB_5__Fv + item_getcheck_func_WATER_BOMB_10__Fv + item_getcheck_func_WATER_BOMB_20__Fv + item_getcheck_func_WATER_BOMB_30__Fv + item_getcheck_func_BOMB_INSECT_5__Fv + item_getcheck_func_BOMB_INSECT_10__Fv + item_getcheck_func_BOMB_INSECT_20__Fv + item_getcheck_func_BOMB_INSECT_30__Fv + item_getcheck_func_RECOVER_FAILY__Fv + item_getcheck_func_TRIPLE_HEART__Fv + item_getcheck_func_SMALL_KEY__Fv + item_getcheck_func_KAKERA_HEART__Fv + item_getcheck_func_UTUWA_HEART__Fv + item_getcheck_func_MAP__Fv + item_getcheck_func_COMPUS__Fv + item_getcheck_func_DUNGEON_EXIT__Fv + item_getcheck_func_BOSS_KEY__Fv + item_getcheck_func_DUNGEON_BACK__Fv + item_getcheck_func_SWORD__Fv + item_getcheck_func_MASTER_SWORD__Fv + item_getcheck_func_WOOD_SHIELD__Fv + item_getcheck_func_SHIELD__Fv + item_getcheck_func_HYLIA_SHIELD__Fv + item_getcheck_func_TKS_LETTER__Fv + item_getcheck_func_WEAR_CASUAL__Fv + item_getcheck_func_WEAR_KOKIRI__Fv + item_getcheck_func_ARMOR__Fv + item_getcheck_func_WEAR_ZORA__Fv + item_getcheck_func_MAGIC_LV1__Fv + item_getcheck_func_DUNGEON_EXIT_2__Fv + item_getcheck_func_WALLET_LV1__Fv + item_getcheck_func_WALLET_LV2__Fv + item_getcheck_func_WALLET_LV3__Fv + item_getcheck_func_ZORAS_JEWEL__Fv + item_getcheck_func_HAWK_EYE__Fv + item_getcheck_func_WOOD_STICK__Fv + item_getcheck_func_BOOMERANG__Fv + item_getcheck_func_SPINNER__Fv + item_getcheck_func_IRONBALL__Fv + item_getcheck_func_BOW__Fv + item_getcheck_func_HOOKSHOT__Fv + item_getcheck_func_HVY_BOOTS__Fv + item_getcheck_func_COPY_ROD__Fv + item_getcheck_func_W_HOOKSHOT__Fv + item_getcheck_func_KANTERA__Fv + item_getcheck_func_LIGHT_SWORD__Fv + item_getcheck_func_FISHING_ROD_1__Fv + item_getcheck_func_PACHINKO__Fv + item_getcheck_func_COPY_ROD_2__Fv + item_getcheck_func_BOMB_BAG_LV2__Fv + item_getcheck_func_BOMB_BAG_LV1__Fv + item_getcheck_func_BOMB_IN_BAG__Fv + item_getcheck_func_LIGHT_ARROW__Fv + item_getcheck_func_ARROW_LV1__Fv + item_getcheck_func_ARROW_LV2__Fv + item_getcheck_func_ARROW_LV3__Fv + item_getcheck_func_LURE_ROD__Fv + item_getcheck_func_BOMB_ARROW__Fv + item_getcheck_func_HAWK_ARROW__Fv + item_getcheck_func_BEE_ROD__Fv + item_getcheck_func_JEWEL_ROD__Fv + item_getcheck_func_WORM_ROD__Fv + item_getcheck_func_JEWEL_BEE_ROD__Fv + item_getcheck_func_JEWEL_WORM_ROD__Fv + item_getcheck_func_EMPTY_BOTTLE__Fv + item_getcheck_func_RED_BOTTLE__Fv + item_getcheck_func_GREEN_BOTTLE__Fv + item_getcheck_func_BLUE_BOTTLE__Fv + item_getcheck_func_MILK_BOTTLE__Fv + item_getcheck_func_HALF_MILK_BOTTLE__Fv + item_getcheck_func_OIL_BOTTLE__Fv + item_getcheck_func_WATER_BOTTLE__Fv + item_getcheck_func_OIL_BOTTLE2__Fv + item_getcheck_func_RED_BOTTLE2__Fv + item_getcheck_func_UGLY_SOUP__Fv + item_getcheck_func_HOT_SPRING__Fv + item_getcheck_func_FAIRY_BOTTLE__Fv + item_getcheck_func_HOT_SPRING2__Fv + item_getcheck_func_OIL2__Fv + item_getcheck_func_OIL__Fv + item_getcheck_func_NORMAL_BOMB__Fv + item_getcheck_func_WATER_BOMB__Fv + item_getcheck_func_POKE_BOMB__Fv + item_getcheck_func_FAIRY_DROP__Fv + item_getcheck_func_WORM__Fv + item_getcheck_func_DROP_BOTTLE__Fv + item_getcheck_func_BEE_CHILD__Fv + item_getcheck_func_CHUCHU_RARE__Fv + item_getcheck_func_CHUCHU_RED__Fv + item_getcheck_func_CHUCHU_BLUE__Fv + item_getcheck_func_CHUCHU_GREEN__Fv + item_getcheck_func_CHUCHU_YELLOW__Fv + item_getcheck_func_CHUCHU_PURPLE__Fv + item_getcheck_func_LV1_SOUP__Fv + item_getcheck_func_LV2_SOUP__Fv + item_getcheck_func_LV3_SOUP__Fv + item_getcheck_func_LETTER__Fv + item_getcheck_func_BILL__Fv + item_getcheck_func_WOOD_STATUE__Fv + item_getcheck_func_IRIAS_PENDANT__Fv + item_getcheck_func_HORSE_FLUTE__Fv + item_getcheck_func_RAFRELS_MEMO__Fv + item_getcheck_func_ASHS_SCRIBBLING__Fv + item_getcheck_func_CHUCHU_YELLOW2__Fv + item_getcheck_func_OIL_BOTTLE3__Fv + item_getcheck_func_SHOP_BEE_CHILD__Fv + item_getcheck_func_CHUCHU_BLACK__Fv + item_getcheck_func_LIGHT_DROP__Fv + item_getcheck_func_DROP_CONTAINER__Fv + item_getcheck_func_DROP_CONTAINER02__Fv + item_getcheck_func_DROP_CONTAINER03__Fv + item_getcheck_func_FILLED_CONTAINER__Fv + item_getcheck_func_MIRROR_PIECE_2__Fv + item_getcheck_func_MIRROR_PIECE_3__Fv + item_getcheck_func_MIRROR_PIECE_4__Fv + item_getcheck_func_SMELL_YELIA_POUCH__Fv + item_getcheck_func_SMELL_PUMPKIN__Fv + item_getcheck_func_SMELL_POH__Fv + item_getcheck_func_SMELL_FISH__Fv + item_getcheck_func_SMELL_CHILDREN__Fv + item_getcheck_func_SMELL_MEDICINE__Fv + item_getcheck_func_M_BEETLE__Fv + item_getcheck_func_F_BEETLE__Fv + item_getcheck_func_M_BUTTERFLY__Fv + item_getcheck_func_F_BUTTERFLY__Fv + item_getcheck_func_M_STAG_BEETLE__Fv + item_getcheck_func_F_STAG_BEETLE__Fv + item_getcheck_func_M_GRASSHOPPER__Fv + item_getcheck_func_F_GRASSHOPPER__Fv + item_getcheck_func_M_NANAFUSHI__Fv + item_getcheck_func_F_NANAFUSHI__Fv + item_getcheck_func_M_DANGOMUSHI__Fv + item_getcheck_func_F_DANGOMUSHI__Fv + item_getcheck_func_M_MANTIS__Fv + item_getcheck_func_F_MANTIS__Fv + item_getcheck_func_M_LADYBUG__Fv + item_getcheck_func_F_LADYBUG__Fv + item_getcheck_func_M_SNAIL__Fv + item_getcheck_func_F_SNAIL__Fv + item_getcheck_func_M_DRAGONFLY__Fv + item_getcheck_func_F_DRAGONFLY__Fv + item_getcheck_func_M_ANT__Fv + item_getcheck_func_F_ANT__Fv + item_getcheck_func_M_MAYFLY__Fv + item_getcheck_func_F_MAYFLY__Fv + item_getcheck_func_POU_SPIRIT__Fv + item_getcheck_func_ANCIENT_DOCUMENT__Fv + item_getcheck_func_AIR_LETTER__Fv + item_getcheck_func_ANCIENT_DOCUMENT2__Fv + item_getcheck_func_LV7_DUNGEON_EXIT__Fv + item_getcheck_func_LINKS_SAVINGS__Fv + item_getcheck_func_SMALL_KEY2__Fv + item_getcheck_func_POU_FIRE1__Fv + item_getcheck_func_POU_FIRE2__Fv + item_getcheck_func_POU_FIRE3__Fv + item_getcheck_func_POU_FIRE4__Fv + item_getcheck_func_BOSSRIDER_KEY__Fv + item_getcheck_func_TOMATO_PUREE__Fv + item_getcheck_func_TASTE__Fv + item_getcheck_func_LV5_BOSS_KEY__Fv + item_getcheck_func_SURFBOARD__Fv + item_getcheck_func_KANTERA2__Fv + item_getcheck_func_L2_KEY_PIECES1__Fv + item_getcheck_func_L2_KEY_PIECES2__Fv + item_getcheck_func_L2_KEY_PIECES3__Fv + item_getcheck_func_KEY_OF_CARAVAN__Fv + item_getcheck_func_LV2_BOSS_KEY__Fv + item_getcheck_func_KEY_OF_FILONE__Fv + isInsect__FUc } /* .init 80003100 - 80005600 diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 7f8f1e4a97..d9cf8035da 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -1,4 +1,5 @@ #include "Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" void Z2CreatureLink::setLinkGroupInfo(u8 param1) { return; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index a695918833..c4e7eca956 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -1,6 +1,5 @@ #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h" - - +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" //Missing 2 instructions (beginning and end) #ifdef NONMATCHING diff --git a/obj_files.mk b/obj_files.mk index e02f067e19..9ce47234d8 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -142,7 +142,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/d/cam/d_cam_param.o \ $(BUILD_DIR)/asm/d/ev/d_ev_camera.o \ $(BUILD_DIR)/asm/d/spline/d_spline_path.o \ - $(BUILD_DIR)/asm/d/d_item.o \ + $(BUILD_DIR)/src/d/d_item/d_item.o \ $(BUILD_DIR)/asm/d/d_tresure.o \ $(BUILD_DIR)/asm/d/d_model.o \ $(BUILD_DIR)/asm/d/eye/d_eye_hl.o \ diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp index e4889f8ba5..2038bb021c 100644 --- a/src/d/d_com/d_com_inf_game.cpp +++ b/src/d/d_com/d_com_inf_game.cpp @@ -1,4 +1,5 @@ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_item/d_item/d_item.h" #include "global.h" asm void dComIfG_play_c::ct(void) { diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp index c1b72743df..7aaae896f0 100644 --- a/src/d/d_file/d_file_sel_info.cpp +++ b/src/d/d_file/d_file_sel_info.cpp @@ -1,4 +1,5 @@ #include "d/d_file/d_file_sel_info/d_file_sel_info.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" asm dFile_info_c::dFile_info_c(JKRArchive*,u8) { diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp index 4bf93c8658..1211adbd8f 100644 --- a/src/d/d_item/d_item.cpp +++ b/src/d/d_item/d_item.cpp @@ -1 +1,1763 @@ -// ok +#include "global.h" +#include "d/d_item/d_item/d_item.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" + +void execItemGet(u8 item_id){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().onFirstBit(item_id); + item_func_ptr[item_id](); +} + +int checkItemGet(u8 item_id, int param_2) { + int uVar2 = item_getcheck_func_ptr[item_id](); + if (uVar2 == -1) { + uVar2 = param_2; + } + return uVar2; +} + +void item_func_HEART(void){ + g_dComIfG_gameInfo.give_item.hearts += lbl_80452BD8; + g_dComIfG_gameInfo.unk35[0xBE] = 0; +} + +void item_func_GREEN_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 1; +} + +void item_func_BLUE_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 5; +} + +void item_func_YELLOW_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 10; +} + +void item_func_RED_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 20; +} + +void item_func_PURPLE_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 50; +} + +void item_func_ORANGE_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 100; +} + +void item_func_SILVER_RUPEE(void){ + g_dComIfG_gameInfo.give_item.rupees += 200; +} + +void item_func_S_MAGIC(void){ + g_dComIfG_gameInfo.give_item.magic += 4; +} + +void item_func_L_MAGIC(void){ + g_dComIfG_gameInfo.give_item.magic += 8; +} + +void item_func_BOMB_5(void){ + addBombCount(NORMAL_BOMB, 5); +} + +void item_func_BOMB_10(void){ + addBombCount(NORMAL_BOMB, 10); +} + +void item_func_BOMB_20(void){ + addBombCount(NORMAL_BOMB, 20); +} + +void item_func_BOMB_30(void){ + addBombCount(NORMAL_BOMB, 30); +} + +void item_func_ARROW_10(void){ + g_dComIfG_gameInfo.give_item.arrows += 10; +} + +void item_func_ARROW_20(void){ + g_dComIfG_gameInfo.give_item.arrows += 20; +} + +void item_func_ARROW_30(void){ + g_dComIfG_gameInfo.give_item.arrows += 30; +} + +void item_func_ARROW_1(void){ + g_dComIfG_gameInfo.give_item.arrows += 1; +} + +void item_func_PACHINKO_SHOT(void){ + g_dComIfG_gameInfo.give_item.seeds += 50; +} + +void item_func_WATER_BOMB_5(void){ + addBombCount(WATER_BOMB, 5); +} + +void item_func_WATER_BOMB_10(void){ + addBombCount(WATER_BOMB, 10); +} + +void item_func_WATER_BOMB_20(void){ + addBombCount(WATER_BOMB, 15); +} + +void item_func_WATER_BOMB_30(void){ + addBombCount(WATER_BOMB, 3); +} + +void item_func_BOMB_INSECT_5(void){ + addBombCount(POKE_BOMB, 5); +} + +void item_func_BOMB_INSECT_10(void){ + addBombCount(POKE_BOMB, 10); +} + +void item_func_BOMB_INSECT_20(void){ + addBombCount(POKE_BOMB, 3); +} + +void item_func_BOMB_INSECT_30(void){ + return; +} + +void item_func_RECOVER_FAILY(void){ + g_dComIfG_gameInfo.give_item.hearts += lbl_80452BDC; + g_dComIfG_gameInfo.unk35[0xBE] = 0; +} + +void item_func_TRIPLE_HEART(void){ + return; +} + +void item_func_SMALL_KEY(void){ + g_dComIfG_gameInfo.give_item.small_keys += 1; +} + +void item_func_KAKERA_HEART(void){ + g_dComIfG_gameInfo.give_item.kakera_heart += 1; +} + +asm void item_func_UTUWA_HEART(void){ + nofralloc + #include "d/d_item/d_item/asm/func_800982B4.s" +} + +void item_func_MAP(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(MAP_FLAG); +} + +void item_func_COMPUS(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(COMPASS_FLAG); +} + +void item_func_DUNGEON_EXIT(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(OOCCOO_NOTE_FLAG); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_EXIT); +} + +void item_func_BOSS_KEY(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG); +} + +void item_func_DUNGEON_BACK(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_BACK); +} + +void item_func_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG); + dComIfGs_setSelectEquipSword(40); +} + +void item_func_MASTER_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG); + dComIfGs_setSelectEquipSword(41); +} + +void item_func_WOOD_SHIELD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SHIELD_BITFIELD,ORDON_SHIELD_FLAG); + dComIfGs_setSelectEquipShield(42); +} + +void item_func_SHIELD(void){ + return; +} + +void item_func_HYLIA_SHIELD(void){ + return; +} + +void item_func_TKS_LETTER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,TKS_LETTER); +} + +void item_func_WEAR_CASUAL(void){ + dComIfGs_setSelectEquipClothes(WEARS_CASUAL); +} + +void item_func_WEAR_KOKIRI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(0,0); + dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); +} + +void item_func_ARMOR(void){ + return; +} + +void item_func_WEAR_ZORA(void){ + return; +} + +void item_func_MAGIC_LV1(void){ + g_dComIfG_gameInfo.give_item.magic += 16; + g_dComIfG_gameInfo.give_item.magic_lv += 16; +} + +void item_func_DUNGEON_EXIT_2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_EXIT); +} + +void item_func_WALLET_LV1(void){ + g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(WALLET); +} + +void item_func_WALLET_LV2(void){ + g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(BIG_WALLET); +} + +void item_func_WALLET_LV3(void){ + g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(GIANT_WALLET); +} + +void item_func_ZORAS_JEWEL(void){ + int checkFishingRod; + + checkFishingRod = item_getcheck_func_FISHING_ROD_1(); + if(checkFishingRod != 0){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setRodTypeLevelUp(); + } + else{ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(20,ZORAS_JEWEL); + } +} + +void item_func_HAWK_EYE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(5,HAWK_EYE); +} + +#ifdef NONMATCHING +void item_func_WOOD_STICK(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,WOODEN_SWORD_FLAG); + dComIfGs_setSelectEquipSword(WOOD_STICK); + //needs to be a onSwitch call here +} +#else +asm void item_func_WOOD_STICK(void) { + nofralloc + #include "d/d_item/d_item/asm/func_800986C4.s" +} +#endif + +void item_func_BOOMERANG(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(0,BOOMERANG); +} + +void item_func_SPINNER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(2,SPINNER); +} + +void item_func_IRONBALL(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(6,IRONBALL); +} + +// li r0, 0x1e instruction in wrong place +#ifdef NONMATCHING +void item_func_BOW(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(4,BOW); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(30); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(30); +} +#else +asm void item_func_BOW(void) { + nofralloc + #include "d/d_item/d_item/asm/func_800987B4.s" +} +#endif + +void item_func_HOOKSHOT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(9,HOOKSHOT); +} + +void item_func_HVY_BOOTS(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(3,HVY_BOOTS); +} + +void item_func_COPY_ROD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(8,COPY_ROD); +} + +void item_func_W_HOOKSHOT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(9,NO_ITEM); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(10,W_HOOKSHOT); +} + +void item_func_KANTERA(void){ + g_dComIfG_gameInfo.save_file.getPlayer().setPlayerStatusAOil(21600); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(1,KANTERA); +} + +void item_func_LIGHT_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG); + dMeter2Info_setSword(LIGHT_SWORD,0); +} + +void item_func_FISHING_ROD_1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(20,FISHING_ROD_1); +} + +void item_func_PACHINKO(void){ + g_dComIfG_gameInfo.give_item.seeds += 50; + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(23,PACHINKO); +} + +void item_func_COPY_ROD_2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(8,COPY_ROD); +} + +void item_func_BOMB_BAG_LV2(void){ + return; +} + +void item_func_BOMB_BAG_LV1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30); +} + +void item_func_BOMB_IN_BAG(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30); +} + +void item_func_LIGHT_ARROW(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(4,LIGHT_ARROW); +} + +// li r0, 0x3C instruction in wrong place +#ifdef NONMATCHING +void item_func_ARROW_LV1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(60); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(60); +} +#else +asm void item_func_ARROW_LV1(void) { + nofralloc + #include "d/d_item/d_item/asm/func_80098AB0.s" +} +#endif + +// li r0, 0x3C instruction in wrong place +#ifdef NONMATCHING +void item_func_ARROW_LV2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(60); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(60); +} +#else +asm void item_func_ARROW_LV2(void) { + nofralloc + #include "d/d_item/d_item/asm/func_80098AB0.s" // didnt bother splitting as its exactly the same as LV1 +} +#endif + +// li r0, 0x64 instruction in wrong place +#ifdef NONMATCHING +void item_func_ARROW_LV3(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(100); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(100); +} +#else +asm void item_func_ARROW_LV3(void) { + nofralloc + #include "d/d_item/d_item/asm/func_80098AE0.s" +} +#endif + +void item_func_LURE_ROD(void){ + return; +} + +void item_func_BOMB_ARROW(void){ + return; +} + +void item_func_HAWK_ARROW(void){ + return; +} + +void item_func_BEE_ROD(void){ + return; +} + +void item_func_JEWEL_ROD(void){ + return; +} + +void item_func_WORM_ROD(void){ + return; +} + +void item_func_JEWEL_BEE_ROD(void){ + return; +} + +void item_func_JEWEL_WORM_ROD(void){ + return; +} + +void item_func_EMPTY_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(); +} + +void item_func_RED_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE); +} + +void item_func_GREEN_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(GREEN_BOTTLE); +} + +void item_func_BLUE_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(BLUE_BOTTLE); +} + +void item_func_MILK_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(MILK_BOTTLE); +} + +void item_func_HALF_MILK_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(HALF_MILK_BOTTLE); +} + +void item_func_OIL_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE); +} + +void item_func_WATER_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(WATER_BOTTLE); +} + +void item_func_OIL_BOTTLE2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE); +} + +void item_func_RED_BOTTLE2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE); +} + +void item_func_UGLY_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(UGLY_SOUP); +} + +void item_func_HOT_SPRING(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING); +} + +void item_func_FAIRY_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY); +} + +void item_func_HOT_SPRING2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING); +} + +void item_func_OIL2(void){ + return; +} + +void item_func_OIL(void){ + return; +} + +void item_func_NORMAL_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,60); +} + +void item_func_WATER_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBagItemIn(WATER_BOMB,1); +} + +void item_func_POKE_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBagItemIn(POKE_BOMB,1); +} + +void item_func_FAIRY_DROP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY_DROP); +} + +void item_func_WORM(void){ + return; +} + +void item_func_DROP_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(FAIRY_DROP); +} + +asm void item_func_BEE_CHILD(void) { + nofralloc + #include "d/d_item/d_item/asm/func_80098EE4.s" +} + +void item_func_CHUCHU_RARE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RARE); +} + +void item_func_CHUCHU_RED(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RED); +} + +void item_func_CHUCHU_BLUE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLUE); +} + +void item_func_CHUCHU_GREEN(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_GREEN); +} + +void item_func_CHUCHU_YELLOW(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW); +} + +void item_func_CHUCHU_PURPLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_PURPLE); +} + +void item_func_LV1_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV1_SOUP); +} + +void item_func_LV2_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV2_SOUP); +} + +void item_func_LV3_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV3_SOUP); +} + +void item_func_LETTER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,LETTER); +} + +void item_func_BILL(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,BILL); +} + +void item_func_WOOD_STATUE(void){ + g_dComIfG_gameInfo.save_file.getEventFlags().onEventBit(lbl_803A7288.unk566); + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,WOOD_STATUE); +} + +void item_func_IRIAS_PENDANT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,IRIAS_PENDANT); +} + +void item_func_HORSE_FLUTE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,HORSE_FLUTE); +} + +void item_func_RAFRELS_MEMO(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(19,RAFRELS_MEMO); +} + +void item_func_ASHS_SCRIBBLING(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(19,ASHS_SCRIBBLING); +} + +void item_func_CHUCHU_YELLOW2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW); +} + +void item_func_OIL_BOTTLE3(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(OIL_BOTTLE); +} + +void item_func_SHOP_BEE_CHILD(void){ + item_func_BEE_CHILD(); +} + +void item_func_CHUCHU_BLACK(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLACK); +} + +void item_func_LIGHT_DROP(void){ + return; +} + +void item_func_DROP_CONTAINER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(FARON_VESSEL); +} + +void item_func_DROP_CONTAINER02(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(ELDIN_VESSEL); +} + +void item_func_DROP_CONTAINER03(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(LANAYRU_VESSEL); +} + +void item_func_FILLED_CONTAINER(void){ + return; +} + +void item_func_MIRROR_PIECE_2(void){ + return; +} + +void item_func_MIRROR_PIECE_3(void){ + return; +} + +void item_func_MIRROR_PIECE_4(void){ + return; +} + +void item_func_SMELL_YELIA_POUCH(void){ + return; +} + +void item_func_SMELL_PUMPKIN(void){ + return; +} + +void item_func_SMELL_POH(void){ + return; +} + +void item_func_SMELL_FISH(void){ + return; +} + +void item_func_SMELL_CHILDREN(void){ + return; +} + +void item_func_SMELL_MEDICINE(void){ + return; +} + +void item_func_M_BEETLE(void){ + return; +} + +void item_func_F_BEETLE(void){ + return; +} + +void item_func_M_BUTTERFLY(void){ + return; +} + +void item_func_F_BUTTERFLY(void){ + return; +} + +void item_func_M_STAG_BEETLE(void){ + return; +} + +void item_func_F_STAG_BEETLE(void){ + return; +} + +void item_func_M_GRASSHOPPER(void){ + return; +} + +void item_func_F_GRASSHOPPER(void){ + return; +} + +void item_func_M_NANAFUSHI(void){ + return; +} + +void item_func_F_NANAFUSHI(void){ + return; +} + +void item_func_M_DANGOMUSHI(void){ + return; +} + +void item_func_F_DANGOMUSHI(void){ + return; +} + +void item_func_M_MANTIS(void){ + return; +} + +void item_func_F_MANTIS(void){ + return; +} + +void item_func_M_LADYBUG(void){ + return; +} + +void item_func_F_LADYBUG(void){ + return; +} + +void item_func_M_SNAIL(void){ + return; +} + +void item_func_F_SNAIL(void){ + return; +} + +void item_func_M_DRAGONFLY(void){ + return; +} + +void item_func_F_DRAGONFLY(void){ + return; +} + +void item_func_M_ANT(void){ + return; +} + +void item_func_F_ANT(void){ + return; +} + +void item_func_M_MAYFLY(void){ + return; +} + +void item_func_F_MAYFLY(void){ + return; +} + +void item_func_POU_SPIRIT(void){ + return; +} + +void item_func_ANCIENT_DOCUMENT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,ANCIENT_DOCUMENT); +} + +void item_func_AIR_LETTER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,AIR_LETTER); +} + +void item_func_ANCIENT_DOCUMENT2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,ANCIENT_DOCUMENT2); +} + +void item_func_LV7_DUNGEON_EXIT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,LV7_DUNGEON_EXIT); +} + +void item_func_LINKS_SAVINGS(void){ + g_dComIfG_gameInfo.give_item.rupees += 50; +} + +void item_func_SMALL_KEY2(void){ + g_dComIfG_gameInfo.give_item.small_keys += 1; +} + +void item_func_POU_FIRE1(void){ + return; +} + +void item_func_POU_FIRE2(void){ + return; +} + +void item_func_POU_FIRE3(void){ + return; +} + +void item_func_POU_FIRE4(void){ + return; +} + +void item_func_BOSSRIDER_KEY(void){ + return; +} + +void item_func_TOMATO_PUREE(void){ + return; +} + +void item_func_TASTE(void){ + return; +} + +void item_func_LV5_BOSS_KEY(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG); +} + +void item_func_SURFBOARD(void){ + return; +} + +void item_func_KANTERA2(void){ + return; +} + +void item_func_L2_KEY_PIECES1(void){ + return; +} + +void item_func_L2_KEY_PIECES2(void){ + return; +} + +void item_func_L2_KEY_PIECES3(void){ + return; +} + +void item_func_KEY_OF_CARAVAN(void){ + return; +} + +void item_func_LV2_BOSS_KEY(void){ + g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG); +} + +void item_func_KEY_OF_FILONE(void){ + g_dComIfG_gameInfo.give_item.small_keys += 1; +} + +void item_func_noentry(void){ + return; +} + +int item_getcheck_func_noentry(void){ + return -1; +} + +int item_getcheck_func_HEART(void){ + return -1; +} + +void item_getcheck_func_GREEN_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(GREEN_RUPEE); +} + +void item_getcheck_func_BLUE_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BLUE_RUPEE); +} + +void item_getcheck_func_YELLOW_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(YELLOW_RUPEE); +} + +void item_getcheck_func_RED_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(RED_RUPEE); +} + +void item_getcheck_func_PURPLE_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(PURPLE_RUPEE); +} + +void item_getcheck_func_ORANGE_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ORANGE_RUPEE); +} + +void item_getcheck_func_SILVER_RUPEE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(SILVER_RUPEE); +} + +int item_getcheck_func_S_MAGIC(void){ + return -1; +} + +int item_getcheck_func_L_MAGIC(void){ + return -1; +} + +void item_getcheck_func_BOMB_5(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_5); +} + +void item_getcheck_func_BOMB_10(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_10); +} + +void item_getcheck_func_BOMB_20(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_20); +} + +void item_getcheck_func_BOMB_30(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_30); +} + +void item_getcheck_func_ARROW_10(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_10); +} + +void item_getcheck_func_ARROW_20(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_20); +} + +void item_getcheck_func_ARROW_30(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_30); +} + +void item_getcheck_func_ARROW_1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_1); +} + +void item_getcheck_func_PACHINKO_SHOT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(PACHINKO_SHOT); +} + +int item_getcheck_func_WATER_BOMB_5(void){ + return -1; +} + +int item_getcheck_func_WATER_BOMB_10(void){ + return -1; +} + +int item_getcheck_func_WATER_BOMB_20(void){ + return -1; +} + +int item_getcheck_func_WATER_BOMB_30(void){ + return -1; +} + +int item_getcheck_func_BOMB_INSECT_5(void){ + return -1; +} + +void item_getcheck_func_BOMB_INSECT_10(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_10); +} + +void item_getcheck_func_BOMB_INSECT_20(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_20); +} + +void item_getcheck_func_BOMB_INSECT_30(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_30); +} + +int item_getcheck_func_RECOVER_FAILY(void){ + return -1; +} + +int item_getcheck_func_TRIPLE_HEART(void){ + return -1; +} + +int item_getcheck_func_SMALL_KEY(void){ + return -1; +} + +int item_getcheck_func_KAKERA_HEART(void){ + return -1; +} + +int item_getcheck_func_UTUWA_HEART(void){ + return -1; +} + +bool item_getcheck_func_MAP(void){ + return g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(MAP_FLAG); +} + +int item_getcheck_func_COMPUS(void){ + return -1; +} + +asm int item_getcheck_func_DUNGEON_EXIT(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099A70.s" +} + +bool item_getcheck_func_BOSS_KEY(void){ + return g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG); +} + +asm int item_getcheck_func_DUNGEON_BACK(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099AE4.s" +} + +void item_getcheck_func_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG); +} + +void item_getcheck_func_MASTER_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG); +} + +void item_getcheck_func_WOOD_SHIELD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WOOD_SHIELD); +} + +void item_getcheck_func_SHIELD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(SHIELD); +} + +void item_getcheck_func_HYLIA_SHIELD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD); +} + +asm int item_getcheck_func_TKS_LETTER(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099C20.s" +} + +void item_getcheck_func_WEAR_CASUAL(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WEARS_CASUAL); +} + +void item_getcheck_func_WEAR_KOKIRI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(CLOTHING_BITFIELD,HEROS_CLOTHES_FLAG); +} + +void item_getcheck_func_ARMOR(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARMOR); +} + +void item_getcheck_func_WEAR_ZORA(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WEAR_ZORA); +} + +int item_getcheck_func_MAGIC_LV1(void){ + return -1; +} + +asm int item_getcheck_func_DUNGEON_EXIT_2(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099D30.s" +} + +int item_getcheck_func_WALLET_LV1(void){ + return -1; +} + +int item_getcheck_func_WALLET_LV2(void){ + return -1; +} + +int item_getcheck_func_WALLET_LV3(void){ + return -1; +} + +asm int item_getcheck_func_ZORAS_JEWEL(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099D8C.s" +} + +void item_getcheck_func_HAWK_EYE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(HAWK_EYE); +} + +void item_getcheck_func_WOOD_STICK(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK); +} + +asm int item_getcheck_func_BOOMERANG(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099E30.s" +} + +asm int item_getcheck_func_SPINNER(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099E74.s" +} + +asm int item_getcheck_func_IRONBALL(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099EB8.s" +} + +asm int item_getcheck_func_BOW(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099EFC.s" +} + +asm int item_getcheck_func_HOOKSHOT(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099F40.s" +} + +asm int item_getcheck_func_HVY_BOOTS(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099F84.s" +} + +asm int item_getcheck_func_COPY_ROD(void){ + nofralloc + #include "d/d_item/d_item/asm/func_80099FC8.s" +} + +asm int item_getcheck_func_W_HOOKSHOT(void){ + nofralloc + #include "d/d_item/d_item/asm/func_8009A00C.s" +} + +asm int item_getcheck_func_KANTERA(void){ + nofralloc + #include "d/d_item/d_item/asm/func_8009A050.s" +} + +void item_getcheck_func_LIGHT_SWORD(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG); +} + +asm int item_getcheck_func_FISHING_ROD_1(void){ + nofralloc + #include "d/d_item/d_item/asm/func_8009A0C8.s" +} + +asm int item_getcheck_func_PACHINKO(void){ + nofralloc + #include "d/d_item/d_item/asm/func_8009A1FC.s" +} + +int item_getcheck_func_COPY_ROD_2(void){ + return -1; +} + +void item_getcheck_func_BOMB_BAG_LV2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2); +} + +void item_getcheck_func_BOMB_BAG_LV1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV1); +} + +void item_getcheck_func_BOMB_IN_BAG(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_IN_BAG); +} + +void item_getcheck_func_LIGHT_ARROW(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LIGHT_ARROW); +} + +asm int item_getcheck_func_ARROW_LV1(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009A308.s" +} + +asm int item_getcheck_func_ARROW_LV2(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009A378.s" +} + +asm int item_getcheck_func_ARROW_LV3(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009A3E8.s" +} + +int item_getcheck_func_LURE_ROD(void){ + return -1; +} + +int item_getcheck_func_BOMB_ARROW(void){ + return -1; +} + +int item_getcheck_func_HAWK_ARROW(void){ + return -1; +} + +void item_getcheck_func_BEE_ROD(void){ + item_getcheck_func_FISHING_ROD_1(); +} + +void item_getcheck_func_JEWEL_ROD(void){ + item_getcheck_func_FISHING_ROD_1(); +} + +void item_getcheck_func_WORM_ROD(void){ + item_getcheck_func_FISHING_ROD_1(); +} + +void item_getcheck_func_JEWEL_BEE_ROD(void){ + item_getcheck_func_FISHING_ROD_1(); +} + +void item_getcheck_func_JEWEL_WORM_ROD(void){ + item_getcheck_func_FISHING_ROD_1(); +} + +int item_getcheck_func_EMPTY_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_RED_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(RED_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_GREEN_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_BLUE_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_MILK_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_HALF_MILK_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HALF_MILK_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_OIL_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_WATER_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE); + return bottle_check; +} + +int item_getcheck_func_OIL_BOTTLE2(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2); + return bottle_check; +} + +int item_getcheck_func_RED_BOTTLE2(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2); + return bottle_check; +} + +int item_getcheck_func_UGLY_SOUP(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(UGLY_SOUP); + return bottle_check; +} + +int item_getcheck_func_HOT_SPRING(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HOT_SPRING); + return bottle_check; +} + +int item_getcheck_func_FAIRY_BOTTLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(FAIRY); + return bottle_check; +} + +int item_getcheck_func_HOT_SPRING2(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HOT_SPRING); + return bottle_check; +} + +int item_getcheck_func_OIL2(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL2); + return bottle_check; +} + +int item_getcheck_func_OIL(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL); + return bottle_check; +} + +void item_getcheck_func_NORMAL_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(NORMAL_BOMB); +} + +void item_getcheck_func_WATER_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WATER_BOMB); +} + +void item_getcheck_func_POKE_BOMB(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(POKE_BOMB); +} + +int item_getcheck_func_FAIRY_DROP(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(FAIRY_DROP); + return bottle_check; +} + +int item_getcheck_func_WORM(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(WORM); + return bottle_check; +} + +void item_getcheck_func_DROP_BOTTLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(DROP_BOTTLE); +} + +int item_getcheck_func_BEE_CHILD(void) { + return -1; +} + +int item_getcheck_func_CHUCHU_RARE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE); + return bottle_check; +} + +int item_getcheck_func_CHUCHU_RED(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_RED); + return bottle_check; +} + +int item_getcheck_func_CHUCHU_BLUE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE); + return bottle_check; +} + +int item_getcheck_func_CHUCHU_GREEN(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN); + return bottle_check; +} + +int item_getcheck_func_CHUCHU_YELLOW(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW); + return bottle_check; +} + +int item_getcheck_func_CHUCHU_PURPLE(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_PURPLE); + return bottle_check; +} + +void item_getcheck_func_LV1_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV1_SOUP); +} + +void item_getcheck_func_LV2_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV2_SOUP); +} + +void item_getcheck_func_LV3_SOUP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP); +} + +asm int item_getcheck_func_LETTER(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AB48.s" +} + +asm int item_getcheck_func_BILL(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AB8C.s" +} + +asm int item_getcheck_func_WOOD_STATUE(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009ABD0.s" +} + +asm int item_getcheck_func_IRIAS_PENDANT(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AC14.s" +} + +asm int item_getcheck_func_HORSE_FLUTE(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AC58.s" +} + +asm int item_getcheck_func_RAFRELS_MEMO(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AC9C.s" +} + +asm int item_getcheck_func_ASHS_SCRIBBLING(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009ACE0.s" +} + +int item_getcheck_func_CHUCHU_YELLOW2(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW2); + return bottle_check; +} + +int item_getcheck_func_OIL_BOTTLE3(void){ + return -1; +} + +int item_getcheck_func_SHOP_BEE_CHILD(void){ + return -1; +} + +int item_getcheck_func_CHUCHU_BLACK(void){ + u8 bottle_check; + + bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK); + return bottle_check; +} + +void item_getcheck_func_LIGHT_DROP(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LIGHT_DROP); +} + +void item_getcheck_func_DROP_CONTAINER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(FARON_VESSEL); +} + +void item_getcheck_func_DROP_CONTAINER02(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(ELDIN_VESSEL); +} + +void item_getcheck_func_DROP_CONTAINER03(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(LANAYRU_VESSEL); +} + +int item_getcheck_func_FILLED_CONTAINER(void){ + return -1; +} + +int item_getcheck_func_MIRROR_PIECE_2(void){ + return -1; +} + +int item_getcheck_func_MIRROR_PIECE_3(void){ + return -1; +} + +int item_getcheck_func_MIRROR_PIECE_4(void){ + return -1; +} + +asm int item_getcheck_func_SMELL_YELIA_POUCH(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AE7C.s" +} + +int item_getcheck_func_SMELL_PUMPKIN(void){ + return -1; +} + +asm int item_getcheck_func_SMELL_POH(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AEA0.s" +} + +asm int item_getcheck_func_SMELL_FISH(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AEBC.s" +} + +asm int item_getcheck_func_SMELL_CHILDREN(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AED8.s" +} + +asm int item_getcheck_func_SMELL_MEDICINE(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009AEF4.s" +} + +void item_getcheck_func_M_BEETLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_BEETLE); +} + +void item_getcheck_func_F_BEETLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_BEETLE); +} + +void item_getcheck_func_M_BUTTERFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_BUTTERFLY); +} + +void item_getcheck_func_F_BUTTERFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_BUTTERFLY); +} + +void item_getcheck_func_M_STAG_BEETLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_STAG_BEETLE); +} + +void item_getcheck_func_F_STAG_BEETLE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_STAG_BEETLE); +} + +void item_getcheck_func_M_GRASSHOPPER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_GRASSHOPPER); +} + +void item_getcheck_func_F_GRASSHOPPER(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_GRASSHOPPER); +} + +void item_getcheck_func_M_NANAFUSHI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_NANAFUSHI); +} + +void item_getcheck_func_F_NANAFUSHI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_NANAFUSHI); +} + +void item_getcheck_func_M_DANGOMUSHI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_DANGOMUSHI); +} + +void item_getcheck_func_F_DANGOMUSHI(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_DANGOMUSHI); +} + +void item_getcheck_func_M_MANTIS(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_MANTIS); +} + +void item_getcheck_func_F_MANTIS(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_MANTIS); +} + +void item_getcheck_func_M_LADYBUG(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_LADYBUG); +} + +void item_getcheck_func_F_LADYBUG(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_LADYBUG); +} + +void item_getcheck_func_M_SNAIL(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_SNAIL); +} + +void item_getcheck_func_F_SNAIL(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_SNAIL); +} + +void item_getcheck_func_M_DRAGONFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_DRAGONFLY); +} + +void item_getcheck_func_F_DRAGONFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_DRAGONFLY); +} + +void item_getcheck_func_M_ANT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_ANT); +} + +void item_getcheck_func_F_ANT(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_ANT); +} + +void item_getcheck_func_M_MAYFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_MAYFLY); +} + +void item_getcheck_func_F_MAYFLY(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_MAYFLY); +} + +int item_getcheck_func_POU_SPIRIT(void){ + return g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().getPoeCount(); +} + +asm int item_getcheck_func_ANCIENT_DOCUMENT(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009B3A0.s" +} + +asm int item_getcheck_func_AIR_LETTER(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009B3E4.s" +} + +asm int item_getcheck_func_ANCIENT_DOCUMENT2(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009B428.s" +} + +asm int item_getcheck_func_LV7_DUNGEON_EXIT(void) { + nofralloc + #include "d/d_item/d_item/asm/func_8009B46C.s" +} + +int item_getcheck_func_LINKS_SAVINGS(void){ + return -1; +} + +int item_getcheck_func_SMALL_KEY2(void){ + return -1; +} + +int item_getcheck_func_POU_FIRE1(void){ + return -1; +} + +int item_getcheck_func_POU_FIRE2(void){ + return -1; +} + +int item_getcheck_func_POU_FIRE3(void){ + return -1; +} + +int item_getcheck_func_POU_FIRE4(void){ + return -1; +} + +int item_getcheck_func_BOSSRIDER_KEY(void){ + return -1; +} + +void item_getcheck_func_TOMATO_PUREE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(TOMATO_PUREE); +} + +void item_getcheck_func_TASTE(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(TASTE); +} + +void item_getcheck_func_LV5_BOSS_KEY(void){ + g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG); +} + +int item_getcheck_func_SURFBOARD(void){ + return -1; +} + +int item_getcheck_func_KANTERA2(void){ + return -1; +} + +void item_getcheck_func_L2_KEY_PIECES1(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES1); +} + +void item_getcheck_func_L2_KEY_PIECES2(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES2); +} + +void item_getcheck_func_L2_KEY_PIECES3(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES3); +} + +void item_getcheck_func_KEY_OF_CARAVAN(void){ + g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(KEY_OF_CARAVAN); +} + +void item_getcheck_func_LV2_BOSS_KEY(void){ + g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG); +} + +int item_getcheck_func_KEY_OF_FILONE(void){ + return g_dComIfG_gameInfo.memory.getTempFlags().getSmallKeys(); +} + +asm bool isBomb(u8 param1){ + nofralloc + #include "d/d_item/d_item/asm/func_8009B688.s" +} + +bool isArrow(u8 param1){ + bool is_arrow; + + is_arrow = false; + if(param1 == ARROW_1 || (u8)(param1 - ARROW_10) <= 1 || param1 == ARROW_30){ + is_arrow = true; + } + + return is_arrow; +} + +asm bool isBottleItem(u8 param1){ + nofralloc + #include "d/d_item/d_item/asm/func_8009B708.s" +} + +bool isHeart(u8 param1) { + bool is_heart; + + is_heart = false; + if(param1 == HEART || param1 == TRIPLE_HEART){ + is_heart = true; + } + return is_heart; +} + +//close +#ifdef NONMATCHING +bool isInsect(u8 param1) { + bool is_insect; + + is_insect = false; + if(param1 < noentry53 && param1 < M_BEETLE){ + is_insect = true; + } + return is_insect; +} +#else +asm bool isInsect(u8 param1){ + nofralloc + #include "d/d_item/d_item/asm/func_8009B79C.s" +} +#endif + +asm u32 check_itemno(int param1){ + nofralloc + #include "d/d_item/d_item/asm/func_8009B7C4.s" +} + +asm void addBombCount(u8 param1, u8 param2){ + nofralloc + #include "d/d_item/d_item/asm/func_8009B940.s" +} \ No newline at end of file diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index f831b6abd0..ef2faccd09 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -1,11 +1,12 @@ #include "d/d_save/d_save/d_save.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" u8 dSv_item_rename(u8 item_id) { switch (item_id) { - case LANTERN_OIL_2: return LANTERN_OIL; - case RED_POTION_2: return RED_POTION; - case LANTERN_OIL_3: return LANTERN_OIL_4; + case OIL_BOTTLE_2: return OIL_BOTTLE; + case RED_BOTTLE_2: return RED_BOTTLE; + case OIL2: return OIL; default: return item_id; } } @@ -28,7 +29,7 @@ void dSv_player_status_a_c::init() { this->equipment[i] = 0; } - this->equipment[0] = ORDON_CLOTHES; + this->equipment[0] = WEARS_CASUAL; this->equipment[1] = NO_ITEM; this->equipment[2] = NO_ITEM; this->equipment[3] = NO_ITEM; @@ -259,32 +260,32 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const { IVar1 = items[current_select_item_index]; current_select_item_index = dComIfGs_getMixItemIndex(select_item_index); IVar2 = items[current_select_item_index]; - if (((IVar1 == HEROS_BOW) && (IVar2 == REGULAR_BOMBS)) || - ((IVar2 == HEROS_BOW && (IVar1 == REGULAR_BOMBS)))) { + if (((IVar1 == BOW) && (IVar2 == NORMAL_BOMB)) || + ((IVar2 == BOW && (IVar1 == NORMAL_BOMB)))) { return 0x59; } - if (((IVar1 == HEROS_BOW) && (IVar2 == WATER_BOMBS)) || - ((IVar2 == HEROS_BOW && (IVar1 == WATER_BOMBS)))) { + if (((IVar1 == BOW) && (IVar2 == WATER_BOMB)) || + ((IVar2 == BOW && (IVar1 == WATER_BOMB)))) { return 0x59; } - if (((IVar1 == HEROS_BOW) && (IVar2 == BOMBLINGS)) || - ((IVar2 == HEROS_BOW && (IVar1 == BOMBLINGS)))) { + if (((IVar1 == BOW) && (IVar2 == POKE_BOMB)) || + ((IVar2 == BOW && (IVar1 == POKE_BOMB)))) { return 0x59; } - if (((IVar1 == HEROS_BOW) && (IVar2 == HAWKEYE)) || - ((IVar2 == HEROS_BOW && (IVar1 == HAWKEYE)))) { + if (((IVar1 == BOW) && (IVar2 == HAWK_EYE)) || + ((IVar2 == BOW && (IVar1 == HAWK_EYE)))) { return 0x5a; } - if (((IVar1 == FISHING_ROD) && (IVar2 == BEE_LARVA)) || - ((IVar2 == FISHING_ROD && (IVar1 == BEE_LARVA)))) { + if (((IVar1 == FISHING_ROD_1) && (IVar2 == BEE_CHILD)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == BEE_CHILD)))) { return 0x5b; } - if (((IVar1 == FISHING_ROD) && (IVar2 == ZORAS_JEWEL)) || - ((IVar2 == FISHING_ROD && (IVar1 == ZORAS_JEWEL)))) { + if (((IVar1 == FISHING_ROD_1) && (IVar2 == ZORAS_JEWEL)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == ZORAS_JEWEL)))) { return 0x5c; } - if (((IVar1 == FISHING_ROD) && (IVar2 == WORM)) || - ((IVar2 == FISHING_ROD && (IVar1 == WORM)))) { + if (((IVar1 == FISHING_ROD_1) && (IVar2 == WORM)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == WORM)))) { return 0x5d; } if (((select_item_index == 0x3) && @@ -449,11 +450,11 @@ asm void dSv_player_item_c::setBombBagItemIn(u8, u8, u8, bool) { } void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,bool param_2) { - setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2); + setBombBagItemIn(BOMB_BAG_LV1,param_1,param_2); } void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,u8 param_2, bool param_3) { - setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2,param_3); + setBombBagItemIn(BOMB_BAG_LV1,param_1,param_2,param_3); } // this is a few instructions off @@ -505,16 +506,16 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { int current_fishing_rod_item_id = this->items[0x14]; switch (current_fishing_rod_item_id) { - case ROD_BEE_LARVA: { - this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA; + case BEE_ROD: { + this->items[0x14] = JEWEL_BEE_ROD; break; } - case ROD_WORM: { - this->items[0x14] = ROD_CORAL_EARRING_WORM; + case WORM_ROD: { + this->items[0x14] = JEWEL_WORM_ROD; break; } - case FISHING_ROD: { - this->items[0x14] = ROD_CORAL_EARRING; + case FISHING_ROD_1: { + this->items[0x14] = JEWEL_ROD; break; } } @@ -528,16 +529,16 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { #ifdef NONMATCHING void dSv_player_item_c::setBaitItem(u8 param_1) { switch (param_1) { - case BEE_LARVA: { - isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA : this->items[0x14] = ROD_BEE_LARVA; + case BEE_CHILD: { + isFirstBit(61) ? this->items[0x14] = JEWEL_BEE_ROD : this->items[0x14] = BEE_ROD; break; } case WORM: { - isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_WORM : this->items[0x14] = ROD_WORM; + isFirstBit(61) ? this->items[0x14] = JEWEL_WORM_ROD : this->items[0x14] = WORM_ROD; break; } case NO_ITEM: { - isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING : this->items[0x14] = FISHING_ROD; + isFirstBit(61) ? this->items[0x14] = JEWEL_ROD : this->items[0x14] = FISHING_ROD_1; break; } } @@ -645,17 +646,17 @@ void dSv_player_item_max_c::init(void) { for (int i = 0; i < 7; i++) { this->item_capacities[i] = 30; } - setBombNum(REGULAR_BOMBS,30); - setBombNum(WATER_BOMBS,15); - setBombNum(BOMBLINGS,10); + setBombNum(NORMAL_BOMB,30); + setBombNum(WATER_BOMB,15); + setBombNum(POKE_BOMB,10); this->item_capacities[7] = 0; } void dSv_player_item_max_c::setBombNum(u8 bomb_id,u8 bomb_max) { switch (bomb_id) { - case REGULAR_BOMBS: this->item_capacities[1] = bomb_max; return; - case WATER_BOMBS: this->item_capacities[2] = bomb_max; return; - case BOMBLINGS: this->item_capacities[6] = bomb_max; return; + case NORMAL_BOMB: this->item_capacities[1] = bomb_max; return; + case WATER_BOMB: this->item_capacities[2] = bomb_max; return; + case POKE_BOMB: this->item_capacities[6] = bomb_max; return; } } @@ -670,9 +671,9 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const { } switch (param_1) { - case WATER_BOMBS: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3); - case REGULAR_BOMBS: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3); - case BOMBLINGS: return (u8)(this->unk_ammo_max[0x2] * iVar3); + case WATER_BOMB: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3); + case NORMAL_BOMB: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3); + case POKE_BOMB: return (u8)(this->unk_ammo_max[0x2] * iVar3); default: return 0; } } diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp index 27b43d0399..f5c7f1e294 100644 --- a/src/d/d_save/d_save_HIO.cpp +++ b/src/d/d_save/d_save_HIO.cpp @@ -1,4 +1,5 @@ #include "d/d_save/d_save_HIO/d_save_HIO.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" #ifdef NONMATCHING diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index c8625c7ae0..89fde48972 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -1,5 +1,5 @@ #include "m_Do/m_Do_main/m_Do_main.h" - +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" void version_check(void) {