mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-10 04:02:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds JSUList, JKRDisposer, and JKRHeap. (#4)

Browse Source 
* Added JSUList, JKRDisposer, and JKRHeap.

JSUList: Decompiled JSUPtrLink and JSUPtrList with their respected
functions. The templated class JSUList is left.

JKRDisposer: Constructor matched but the destructor is close but
not yet a match.

JKRHeap: No functions matches yet. JKRHeap.cpp now includes
"operator delete" which makes it possible to forward compile
destructors.

* moved files from src/ to libs/
This commit is contained in:
Jonathan Wase
2020-11-29 17:47:00 +01:00
committed by GitHub
parent 68a46e15cb
commit 635fbc34ec
385 changed files with 4633 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/d_a_alink.s
+56 -56
View File
@@ -7316,7 +7316,7 @@ daAlink_c_NS_initDemoBck:
/* 800A3FD0 000A0F10 7C 7E 1B 79 */ or. r30, r3, r3
/* 800A3FD4 000A0F14 41 82 00 78 */ beq lbl_800A404C
/* 800A3FD8 000A0F18 38 60 00 1C */ li r3, 0x1c
/* 800A3FDC 000A0F1C 48 22 AC 71 */ bl __nw
/* 800A3FDC 000A0F1C 48 22 AC 71 */ bl __nw__FUl
/* 800A3FE0 000A0F20 7C 7F 1B 79 */ or. r31, r3, r3
/* 800A3FE4 000A0F24 41 82 00 20 */ beq lbl_800A4004
/* 800A3FE8 000A0F28 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -7496,7 +7496,7 @@ lbl_800A424C:
/* 800A4260 000A11A0 48 00 05 A8 */ b lbl_800A4808
lbl_800A4264:
/* 800A4264 000A11A4 38 60 00 6C */ li r3, 0x6c
/* 800A4268 000A11A8 48 22 A9 E5 */ bl __nw
/* 800A4268 000A11A8 48 22 A9 E5 */ bl __nw__FUl
/* 800A426C 000A11AC 7C 60 1B 79 */ or. r0, r3, r3
/* 800A4270 000A11B0 41 82 00 0C */ beq lbl_800A427C
/* 800A4274 000A11B4 48 09 C9 15 */ bl daAlinkHIO_c
@@ -7561,7 +7561,7 @@ lbl_800A4328:
/* 800A4348 000A1288 48 00 04 C0 */ b lbl_800A4808
lbl_800A434C:
/* 800A434C 000A128C 38 60 05 10 */ li r3, 0x510
/* 800A4350 000A1290 48 22 A9 75 */ bl __nwa
/* 800A4350 000A1290 48 22 A9 75 */ bl __nwa__FUl
/* 800A4354 000A1294 38 80 00 00 */ li r4, 0
/* 800A4358 000A1298 38 A0 00 00 */ li r5, 0
/* 800A435C 000A129C 38 C0 00 20 */ li r6, 0x20
@@ -7573,14 +7573,14 @@ lbl_800A434C:
/* 800A4374 000A12B4 48 00 04 94 */ b lbl_800A4808
lbl_800A4378:
/* 800A4378 000A12B8 38 60 02 80 */ li r3, 0x280
/* 800A437C 000A12BC 48 22 A9 49 */ bl __nwa
/* 800A437C 000A12BC 48 22 A9 49 */ bl __nwa__FUl
/* 800A4380 000A12C0 7C 7B 1B 79 */ or. r27, r3, r3
/* 800A4384 000A12C4 40 82 00 0C */ bne lbl_800A4390
/* 800A4388 000A12C8 38 60 00 00 */ li r3, 0
/* 800A438C 000A12CC 48 00 04 7C */ b lbl_800A4808
lbl_800A4390:
/* 800A4390 000A12D0 38 60 00 24 */ li r3, 0x24
/* 800A4394 000A12D4 48 22 A8 B9 */ bl __nw
/* 800A4394 000A12D4 48 22 A8 B9 */ bl __nw__FUl
/* 800A4398 000A12D8 28 03 00 00 */ cmplwi r3, 0
/* 800A439C 000A12DC 41 82 00 34 */ beq lbl_800A43D0
/* 800A43A0 000A12E0 93 83 00 1C */ stw r28, 0x1c(r3)
@@ -7604,7 +7604,7 @@ lbl_800A43D0:
/* 800A43E4 000A1324 48 00 04 24 */ b lbl_800A4808
lbl_800A43E8:
/* 800A43E8 000A1328 38 60 00 10 */ li r3, 0x10
/* 800A43EC 000A132C 48 22 A8 61 */ bl __nw
/* 800A43EC 000A132C 48 22 A8 61 */ bl __nw__FUl
/* 800A43F0 000A1330 28 03 00 00 */ cmplwi r3, 0
/* 800A43F4 000A1334 41 82 00 94 */ beq lbl_800A4488
/* 800A43F8 000A1338 80 BF 20 60 */ lwz r5, 0x2060(r31)
@@ -7655,7 +7655,7 @@ lbl_800A4488:
/* 800A449C 000A13DC 48 00 03 6C */ b lbl_800A4808
lbl_800A44A0:
/* 800A44A0 000A13E0 38 60 00 10 */ li r3, 0x10
/* 800A44A4 000A13E4 48 22 A7 A9 */ bl __nw
/* 800A44A4 000A13E4 48 22 A7 A9 */ bl __nw__FUl
/* 800A44A8 000A13E8 28 03 00 00 */ cmplwi r3, 0
/* 800A44AC 000A13EC 41 82 00 94 */ beq lbl_800A4540
/* 800A44B0 000A13F0 80 BF 20 60 */ lwz r5, 0x2060(r31)
@@ -7709,7 +7709,7 @@ lbl_800A4558:
/* 800A455C 000A149C 3B 60 00 00 */ li r27, 0
lbl_800A4560:
/* 800A4560 000A14A0 38 60 01 08 */ li r3, 0x108
/* 800A4564 000A14A4 48 22 A6 E9 */ bl __nw
/* 800A4564 000A14A4 48 22 A6 E9 */ bl __nw__FUl
/* 800A4568 000A14A8 7C 7D 1B 79 */ or. r29, r3, r3
/* 800A456C 000A14AC 41 82 00 CC */ beq lbl_800A4638
/* 800A4570 000A14B0 3C 60 80 3D */ lis r3, lbl_803CEE60@ha
@@ -7807,7 +7807,7 @@ lbl_800A4654:
lbl_800A4688:
/* 800A4688 000A15C8 38 60 08 00 */ li r3, 0x800
/* 800A468C 000A15CC 38 80 00 20 */ li r4, 0x20
/* 800A4690 000A15D0 48 22 A6 5D */ bl __nwa_X1_
/* 800A4690 000A15D0 48 22 A6 5D */ bl __nwa__FUli
/* 800A4694 000A15D4 90 7F 2D 78 */ stw r3, 0x2d78(r31)
/* 800A4698 000A15D8 80 1F 2D 78 */ lwz r0, 0x2d78(r31)
/* 800A469C 000A15DC 28 00 00 00 */ cmplwi r0, 0
@@ -7871,7 +7871,7 @@ lbl_800A4768:
/* 800A476C 000A16AC 28 00 00 00 */ cmplwi r0, 0
/* 800A4770 000A16B0 41 82 00 94 */ beq lbl_800A4804
/* 800A4774 000A16B4 38 60 00 18 */ li r3, 0x18
/* 800A4778 000A16B8 48 22 A4 D5 */ bl __nw
/* 800A4778 000A16B8 48 22 A4 D5 */ bl __nw__FUl
/* 800A477C 000A16BC 7C 7B 1B 79 */ or. r27, r3, r3
/* 800A4780 000A16C0 41 82 00 20 */ beq lbl_800A47A0
/* 800A4784 000A16C4 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -7971,7 +7971,7 @@ lbl_800A4808:
/* 800A48C4 000A1804 7F E0 07 35 */ extsh. r0, r31
/* 800A48C8 000A1808 40 81 00 0C */ ble lbl_800A48D4
/* 800A48CC 000A180C 7F C3 F3 78 */ mr r3, r30
/* 800A48D0 000A1810 48 22 A4 6D */ bl __dl
/* 800A48D0 000A1810 48 22 A4 6D */ bl __dl__FPv
lbl_800A48D4:
/* 800A48D4 000A1814 7F C3 F3 78 */ mr r3, r30
/* 800A48D8 000A1818 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -39187,7 +39187,7 @@ daAlink_c_NS_loadAramBmd:
/* 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
/* 800BFE78 000BCDB8 48 20 EE 75 */ bl __nwa_X1_
/* 800BFE78 000BCDB8 48 20 EE 75 */ bl __nwa__FUli
/* 800BFE7C 000BCDBC 7C 7E 1B 78 */ mr r30, r3
/* 800BFE80 000BCDC0 7F E3 FB 78 */ mr r3, r31
/* 800BFE84 000BCDC4 7F C4 F3 78 */ mr r4, r30
@@ -39237,7 +39237,7 @@ daAlink_c_NS_loadAram:
/* 800BFF1C 000BCE5C 7C BE 2B 78 */ mr r30, r5
/* 800BFF20 000BCE60 7F C3 F3 78 */ mr r3, r30
/* 800BFF24 000BCE64 38 80 00 20 */ li r4, 0x20
/* 800BFF28 000BCE68 48 20 ED C5 */ bl __nwa_X1_
/* 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
@@ -55217,7 +55217,7 @@ lbl_800CE1DC:
/* 800CE1DC 000CB11C 7F C0 07 35 */ extsh. r0, r30
/* 800CE1E0 000CB120 40 81 00 0C */ ble lbl_800CE1EC
/* 800CE1E4 000CB124 7F E3 FB 78 */ mr r3, r31
/* 800CE1E8 000CB128 48 20 0B 55 */ bl __dl
/* 800CE1E8 000CB128 48 20 0B 55 */ bl __dl__FPv
lbl_800CE1EC:
/* 800CE1EC 000CB12C 7F E3 FB 78 */ mr r3, r31
/* 800CE1F0 000CB130 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57105,7 +57105,7 @@ daAlink_c_NS_firePointEff_c_NS_dtor:
/* 800CFC50 000CCB90 41 82 00 10 */ beq lbl_800CFC60
/* 800CFC54 000CCB94 7C 80 07 35 */ extsh. r0, r4
/* 800CFC58 000CCB98 40 81 00 08 */ ble lbl_800CFC60
/* 800CFC5C 000CCB9C 48 1F F0 E1 */ bl __dl
/* 800CFC5C 000CCB9C 48 1F F0 E1 */ bl __dl__FPv
lbl_800CFC60:
/* 800CFC60 000CCBA0 7F E3 FB 78 */ mr r3, r31
/* 800CFC64 000CCBA4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57126,7 +57126,7 @@ LIGHT_INFLUENCE_NS_dtor:
/* 800CFC90 000CCBD0 41 82 00 10 */ beq lbl_800CFCA0
/* 800CFC94 000CCBD4 7C 80 07 35 */ extsh. r0, r4
/* 800CFC98 000CCBD8 40 81 00 08 */ ble lbl_800CFCA0
/* 800CFC9C 000CCBDC 48 1F F0 A1 */ bl __dl
/* 800CFC9C 000CCBDC 48 1F F0 A1 */ bl __dl__FPv
lbl_800CFCA0:
/* 800CFCA0 000CCBE0 7F E3 FB 78 */ mr r3, r31
/* 800CFCA4 000CCBE4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57144,7 +57144,7 @@ daAlink_footData_c_NS_dtor:
/* 800CFCCC 000CCC0C 41 82 00 10 */ beq lbl_800CFCDC
/* 800CFCD0 000CCC10 7C 80 07 35 */ extsh. r0, r4
/* 800CFCD4 000CCC14 40 81 00 08 */ ble lbl_800CFCDC
/* 800CFCD8 000CCC18 48 1F F0 65 */ bl __dl
/* 800CFCD8 000CCC18 48 1F F0 65 */ bl __dl__FPv
lbl_800CFCDC:
/* 800CFCDC 000CCC1C 7F E3 FB 78 */ mr r3, r31
/* 800CFCE0 000CCC20 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57171,7 +57171,7 @@ daAlink_footData_c:
/* 800CFD2C 000CCC6C 7F E0 07 35 */ extsh. r0, r31
/* 800CFD30 000CCC70 40 81 00 0C */ ble lbl_800CFD3C
/* 800CFD34 000CCC74 7F C3 F3 78 */ mr r3, r30
/* 800CFD38 000CCC78 48 1F F0 05 */ bl __dl
/* 800CFD38 000CCC78 48 1F F0 05 */ bl __dl__FPv
lbl_800CFD3C:
/* 800CFD3C 000CCC7C 7F C3 F3 78 */ mr r3, r30
/* 800CFD40 000CCC80 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57212,7 +57212,7 @@ lbl_800CFDC8:
/* 800CFDC8 000CCD08 7F E0 07 35 */ extsh. r0, r31
/* 800CFDCC 000CCD0C 40 81 00 0C */ ble lbl_800CFDD8
/* 800CFDD0 000CCD10 7F C3 F3 78 */ mr r3, r30
/* 800CFDD4 000CCD14 48 1F EF 69 */ bl __dl
/* 800CFDD4 000CCD14 48 1F EF 69 */ bl __dl__FPv
lbl_800CFDD8:
/* 800CFDD8 000CCD18 7F C3 F3 78 */ mr r3, r30
/* 800CFDDC 000CCD1C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57245,7 +57245,7 @@ lbl_800CFE40:
/* 800CFE40 000CCD80 7C 80 07 35 */ extsh. r0, r4
/* 800CFE44 000CCD84 40 81 00 0C */ ble lbl_800CFE50
/* 800CFE48 000CCD88 7F E3 FB 78 */ mr r3, r31
/* 800CFE4C 000CCD8C 48 1F EE F1 */ bl __dl
/* 800CFE4C 000CCD8C 48 1F EE F1 */ bl __dl__FPv
lbl_800CFE50:
/* 800CFE50 000CCD90 7F E3 FB 78 */ mr r3, r31
/* 800CFE54 000CCD94 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -57264,7 +57264,7 @@ lbl_800CFE50:
/* 800CFE88 000CCDC8 90 1F 00 00 */ stw r0, 0(r31)
/* 800CFE8C 000CCDCC 7C 80 07 35 */ extsh. r0, r4
/* 800CFE90 000CCDD0 40 81 00 08 */ ble lbl_800CFE98
/* 800CFE94 000CCDD4 48 1F EE A9 */ bl __dl
/* 800CFE94 000CCDD4 48 1F EE A9 */ bl __dl__FPv
lbl_800CFE98:
/* 800CFE98 000CCDD8 7F E3 FB 78 */ mr r3, r31
/* 800CFE9C 000CCDDC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -58267,7 +58267,7 @@ lbl_800D0C40:
/* 800D0C40 000CDB80 7F E0 07 35 */ extsh. r0, r31
/* 800D0C44 000CDB84 40 81 00 0C */ ble lbl_800D0C50
/* 800D0C48 000CDB88 7F C3 F3 78 */ mr r3, r30
/* 800D0C4C 000CDB8C 48 1F E0 F1 */ bl __dl
/* 800D0C4C 000CDB8C 48 1F E0 F1 */ bl __dl__FPv
lbl_800D0C50:
/* 800D0C50 000CDB90 7F C3 F3 78 */ mr r3, r30
/* 800D0C54 000CDB94 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -58298,7 +58298,7 @@ dBgS_ObjAcch_NS_dtor:
/* 800D0CB0 000CDBF0 7F E0 07 35 */ extsh. r0, r31
/* 800D0CB4 000CDBF4 40 81 00 0C */ ble lbl_800D0CC0
/* 800D0CB8 000CDBF8 7F C3 F3 78 */ mr r3, r30
/* 800D0CBC 000CDBFC 48 1F E0 81 */ bl __dl
/* 800D0CBC 000CDBFC 48 1F E0 81 */ bl __dl__FPv
lbl_800D0CC0:
/* 800D0CC0 000CDC00 7F C3 F3 78 */ mr r3, r30
/* 800D0CC4 000CDC04 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -58324,7 +58324,7 @@ lbl_800D0D10:
/* 800D0D10 000CDC50 7C 80 07 35 */ extsh. r0, r4
/* 800D0D14 000CDC54 40 81 00 0C */ ble lbl_800D0D20
/* 800D0D18 000CDC58 7F E3 FB 78 */ mr r3, r31
/* 800D0D1C 000CDC5C 48 1F E0 21 */ bl __dl
/* 800D0D1C 000CDC5C 48 1F E0 21 */ bl __dl__FPv
lbl_800D0D20:
/* 800D0D20 000CDC60 7F E3 FB 78 */ mr r3, r31
/* 800D0D24 000CDC64 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -121840,7 +121840,7 @@ daAlink_c_NS_setHookshotModel:
/* 80108C20 00105B60 4B FB 72 29 */ bl daAlink_c_NS_loadAramBmd
/* 80108C24 00105B64 90 7E 07 68 */ stw r3, 0x768(r30)
/* 80108C28 00105B68 38 60 00 10 */ li r3, 0x10
/* 80108C2C 00105B6C 48 1C 60 21 */ bl __nw
/* 80108C2C 00105B6C 48 1C 60 21 */ bl __nw__FUl
/* 80108C30 00105B70 28 03 00 00 */ cmplwi r3, 0
/* 80108C34 00105B74 41 82 00 2C */ beq lbl_80108C60
/* 80108C38 00105B78 3C 80 80 3D */ lis r4, lbl_803CD97C@ha
@@ -121856,7 +121856,7 @@ daAlink_c_NS_setHookshotModel:
lbl_80108C60:
/* 80108C60 00105BA0 90 7E 07 70 */ stw r3, 0x770(r30)
/* 80108C64 00105BA4 38 60 00 20 */ li r3, 0x20
/* 80108C68 00105BA8 48 1C 5F E5 */ bl __nw
/* 80108C68 00105BA8 48 1C 5F E5 */ bl __nw__FUl
/* 80108C6C 00105BAC 7C 60 1B 79 */ or. r0, r3, r3
/* 80108C70 00105BB0 41 82 00 0C */ beq lbl_80108C7C
/* 80108C74 00105BB4 48 1B 5B D1 */ bl Z2SoundObjSimple
@@ -121864,7 +121864,7 @@ lbl_80108C60:
lbl_80108C7C:
/* 80108C7C 00105BBC 90 1E 07 6C */ stw r0, 0x76c(r30)
/* 80108C80 00105BC0 38 60 00 70 */ li r3, 0x70
/* 80108C84 00105BC4 48 1C 5F C9 */ bl __nw
/* 80108C84 00105BC4 48 1C 5F C9 */ bl __nw__FUl
/* 80108C88 00105BC8 7C 60 1B 79 */ or. r0, r3, r3
/* 80108C8C 00105BCC 41 82 00 0C */ beq lbl_80108C98
/* 80108C90 00105BD0 4B F6 F2 CD */ bl dBgS_ObjLinChk
@@ -132834,7 +132834,7 @@ daAlink_c_NS_setIronBallModel:
/* 80112844 0010F784 4B FA D6 05 */ bl daAlink_c_NS_loadAramBmd
/* 80112848 0010F788 90 7F 07 68 */ stw r3, 0x768(r31)
/* 8011284C 0010F78C 38 60 00 10 */ li r3, 0x10
/* 80112850 0010F790 48 1B C3 FD */ bl __nw
/* 80112850 0010F790 48 1B C3 FD */ bl __nw__FUl
/* 80112854 0010F794 28 03 00 00 */ cmplwi r3, 0
/* 80112858 0010F798 41 82 00 2C */ beq lbl_80112884
/* 8011285C 0010F79C 3C 80 80 3D */ lis r4, lbl_803CD97C@ha
@@ -132850,7 +132850,7 @@ daAlink_c_NS_setIronBallModel:
lbl_80112884:
/* 80112884 0010F7C4 90 7F 07 70 */ stw r3, 0x770(r31)
/* 80112888 0010F7C8 38 60 04 D8 */ li r3, 0x4d8
/* 8011288C 0010F7CC 48 1B C4 39 */ bl __nwa
/* 8011288C 0010F7CC 48 1B C4 39 */ bl __nwa__FUl
/* 80112890 0010F7D0 3C 80 80 01 */ lis r4, cXyz@ha
/* 80112894 0010F7D4 38 84 25 DC */ addi r4, r4, cXyz@l
/* 80112898 0010F7D8 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha
@@ -132860,7 +132860,7 @@ lbl_80112884:
/* 801128A8 0010F7E8 48 24 F6 6D */ bl func_80361F14
/* 801128AC 0010F7EC 90 7F 38 40 */ stw r3, 0x3840(r31)
/* 801128B0 0010F7F0 38 60 02 74 */ li r3, 0x274
/* 801128B4 0010F7F4 48 1B C4 11 */ bl __nwa
/* 801128B4 0010F7F4 48 1B C4 11 */ bl __nwa__FUl
.global csXyz
/* 801128B8 0010F7F8 3C 80 80 11 */ lis r4, csXyz@ha
.global csXyz
@@ -132874,7 +132874,7 @@ lbl_80112884:
/* 801128D0 0010F810 48 24 F6 45 */ bl func_80361F14
/* 801128D4 0010F814 90 7F 38 44 */ stw r3, 0x3844(r31)
/* 801128D8 0010F818 38 60 04 D8 */ li r3, 0x4d8
/* 801128DC 0010F81C 48 1B C3 E9 */ bl __nwa
/* 801128DC 0010F81C 48 1B C3 E9 */ bl __nwa__FUl
/* 801128E0 0010F820 3C 80 80 01 */ lis r4, cXyz@ha
/* 801128E4 0010F824 38 84 25 DC */ addi r4, r4, cXyz@l
/* 801128E8 0010F828 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha
@@ -132884,7 +132884,7 @@ lbl_80112884:
/* 801128F8 0010F838 48 24 F6 1D */ bl func_80361F14
/* 801128FC 0010F83C 90 7F 38 48 */ stw r3, 0x3848(r31)
/* 80112900 0010F840 38 60 00 40 */ li r3, 0x40
/* 80112904 0010F844 48 1B C3 49 */ bl __nw
/* 80112904 0010F844 48 1B C3 49 */ bl __nw__FUl
/* 80112908 0010F848 7C 60 1B 79 */ or. r0, r3, r3
/* 8011290C 0010F84C 41 82 00 0C */ beq lbl_80112918
/* 80112910 0010F850 4B F6 35 9D */ bl dBgS_AcchCir
@@ -132892,7 +132892,7 @@ lbl_80112884:
lbl_80112918:
/* 80112918 0010F858 90 1F 07 74 */ stw r0, 0x774(r31)
/* 8011291C 0010F85C 38 60 01 D8 */ li r3, 0x1d8
/* 80112920 0010F860 48 1B C3 2D */ bl __nw
/* 80112920 0010F860 48 1B C3 2D */ bl __nw__FUl
/* 80112924 0010F864 7C 7D 1B 79 */ or. r29, r3, r3
/* 80112928 0010F868 41 82 00 2C */ beq lbl_80112954
/* 8011292C 0010F86C 4B F6 37 75 */ bl dBgS_Acch
@@ -132908,7 +132908,7 @@ lbl_80112918:
lbl_80112954:
/* 80112954 0010F894 93 BF 07 78 */ stw r29, 0x778(r31)
/* 80112958 0010F898 38 60 00 20 */ li r3, 0x20
/* 8011295C 0010F89C 48 1B C2 F1 */ bl __nw
/* 8011295C 0010F89C 48 1B C2 F1 */ bl __nw__FUl
/* 80112960 0010F8A0 7C 60 1B 79 */ or. r0, r3, r3
/* 80112964 0010F8A4 41 82 00 0C */ beq lbl_80112970
/* 80112968 0010F8A8 48 1A BE DD */ bl Z2SoundObjSimple
@@ -132916,7 +132916,7 @@ lbl_80112954:
lbl_80112970:
/* 80112970 0010F8B0 90 1F 07 6C */ stw r0, 0x76c(r31)
/* 80112974 0010F8B4 38 60 00 70 */ li r3, 0x70
/* 80112978 0010F8B8 48 1B C2 D5 */ bl __nw
/* 80112978 0010F8B8 48 1B C2 D5 */ bl __nw__FUl
/* 8011297C 0010F8BC 7C 60 1B 79 */ or. r0, r3, r3
/* 80112980 0010F8C0 41 82 00 0C */ beq lbl_8011298C
/* 80112984 0010F8C4 4B F6 55 D9 */ bl dBgS_ObjLinChk
@@ -132932,7 +132932,7 @@ lbl_8011298C:
/* 801129A8 0010F8E8 60 00 00 02 */ ori r0, r0, 2
/* 801129AC 0010F8EC 90 03 00 6C */ stw r0, 0x6c(r3)
/* 801129B0 0010F8F0 38 60 00 70 */ li r3, 0x70
/* 801129B4 0010F8F4 48 1B C2 99 */ bl __nw
/* 801129B4 0010F8F4 48 1B C2 99 */ bl __nw__FUl
/* 801129B8 0010F8F8 7C 60 1B 79 */ or. r0, r3, r3
/* 801129BC 0010F8FC 41 82 00 0C */ beq lbl_801129C8
/* 801129C0 0010F900 4B F6 55 9D */ bl dBgS_ObjLinChk
@@ -132940,7 +132940,7 @@ lbl_8011298C:
lbl_801129C8:
/* 801129C8 0010F908 90 1F 07 80 */ stw r0, 0x780(r31)
/* 801129CC 0010F90C 38 60 00 38 */ li r3, 0x38
/* 801129D0 0010F910 48 1B C2 7D */ bl __nw
/* 801129D0 0010F910 48 1B C2 7D */ bl __nw__FUl
/* 801129D4 0010F914 90 7F 2F 1C */ stw r3, 0x2f1c(r31)
/* 801129D8 0010F918 80 7F 2F 1C */ lwz r3, 0x2f1c(r31)
/* 801129DC 0010F91C 80 9F 07 78 */ lwz r4, 0x778(r31)
@@ -154622,7 +154622,7 @@ daAlink_lockCursor_c_NS_create:
/* 80125F58 00122E98 98 1E 00 04 */ stb r0, 4(r30)
/* 80125F5C 00122E9C D0 1E 00 30 */ stfs f0, 0x30(r30)
/* 80125F60 00122EA0 38 60 01 18 */ li r3, 0x118
/* 80125F64 00122EA4 48 1A 8C E9 */ bl __nw
/* 80125F64 00122EA4 48 1A 8C E9 */ bl __nw__FUl
/* 80125F68 00122EA8 7C 60 1B 79 */ or. r0, r3, r3
/* 80125F6C 00122EAC 41 82 00 0C */ beq lbl_80125F78
/* 80125F70 00122EB0 48 1D 25 29 */ bl J2DScreen
@@ -175918,7 +175918,7 @@ daAlink_c_NS_setWolfBallModel:
/* 80138E3C 00135D7C 80 7D 07 18 */ lwz r3, 0x718(r29)
/* 80138E40 00135D80 48 1F 23 95 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_
/* 80138E44 00135D84 38 60 00 20 */ li r3, 0x20
/* 80138E48 00135D88 48 19 5E 05 */ bl __nw
/* 80138E48 00135D88 48 19 5E 05 */ bl __nw__FUl
/* 80138E4C 00135D8C 7C 60 1B 79 */ or. r0, r3, r3
/* 80138E50 00135D90 41 82 00 0C */ beq lbl_80138E5C
/* 80138E54 00135D94 48 18 59 F1 */ bl Z2SoundObjSimple
@@ -183958,7 +183958,7 @@ daAlink_c_NS_loadModelDVD:
/* 801400E0 0013D020 38 7F 06 2C */ addi r3, r31, 0x62c
/* 801400E4 0013D024 48 12 65 41 */ bl cPhs_Reset
/* 801400E8 0013D028 80 7F 06 38 */ lwz r3, 0x638(r31)
/* 801400EC 0013D02C 48 18 E4 E1 */ bl JKRHeap_NS_freeAll
/* 801400EC 0013D02C 48 18 E4 E1 */ bl freeAll__7JKRHeapFv
/* 801400F0 0013D030 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31)
/* 801400F4 0013D034 28 00 01 4D */ cmplwi r0, 0x14d
/* 801400F8 0013D038 41 82 00 0C */ beq lbl_80140104
@@ -184095,7 +184095,7 @@ daAlink_c_NS_loadShieldModelDVD:
/* 801402BC 0013D1FC 38 7F 06 3C */ addi r3, r31, 0x63c
/* 801402C0 0013D200 48 12 63 65 */ bl cPhs_Reset
/* 801402C4 0013D204 80 7F 06 48 */ lwz r3, 0x648(r31)
/* 801402C8 0013D208 48 18 E3 05 */ bl JKRHeap_NS_freeAll
/* 801402C8 0013D208 48 18 E3 05 */ bl freeAll__7JKRHeapFv
/* 801402CC 0013D20C 7F E3 FB 78 */ mr r3, r31
/* 801402D0 0013D210 4B FF FC C1 */ bl daAlink_c_NS_setShieldArcName
/* 801402D4 0013D214 48 00 00 4C */ b lbl_80140320
@@ -184396,7 +184396,7 @@ daAlink_c_NS_initStatusWindow:
/* 801406C8 0013D608 90 03 05 78 */ stw r0, 0x578(r3)
/* 801406CC 0013D60C 38 60 14 00 */ li r3, 0x1400
/* 801406D0 0013D610 38 80 00 20 */ li r4, 0x20
/* 801406D4 0013D614 48 18 E6 19 */ bl __nwa_X1_
/* 801406D4 0013D614 48 18 E6 19 */ bl __nwa__FUli
/* 801406D8 0013D618 7C 7A 1B 78 */ mr r26, r3
/* 801406DC 0013D61C 80 1D 05 74 */ lwz r0, 0x574(r29)
/* 801406E0 0013D620 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
@@ -184437,7 +184437,7 @@ lbl_8014074C:
/* 80140760 0013D6A0 57 86 04 3E */ clrlwi r6, r28, 0x10
/* 80140764 0013D6A4 48 19 57 69 */ bl JKRArchive_NS_readIdxResource
/* 80140768 0013D6A8 38 60 00 1C */ li r3, 0x1c
/* 8014076C 0013D6AC 48 18 E4 E1 */ bl __nw
/* 8014076C 0013D6AC 48 18 E4 E1 */ bl __nw__FUl
/* 80140770 0013D6B0 7C 7C 1B 79 */ or. r28, r3, r3
/* 80140774 0013D6B4 41 82 00 20 */ beq lbl_80140794
/* 80140778 0013D6B8 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -184463,7 +184463,7 @@ lbl_80140794:
/* 801407C4 0013D704 4B EC D0 19 */ bl mDoExt_bckAnm_NS_init
/* 801407C8 0013D708 38 60 04 00 */ li r3, 0x400
/* 801407CC 0013D70C 38 80 00 20 */ li r4, 0x20
/* 801407D0 0013D710 48 18 E5 1D */ bl __nwa_X1_
/* 801407D0 0013D710 48 18 E5 1D */ bl __nwa__FUli
/* 801407D4 0013D714 7C 7C 1B 78 */ mr r28, r3
/* 801407D8 0013D718 80 7B 5C AC */ lwz r3, 0x5cac(r27)
/* 801407DC 0013D71C 7F 84 E3 78 */ mr r4, r28
@@ -184484,7 +184484,7 @@ lbl_80140794:
/* 80140818 0013D758 48 1E F3 B1 */ bl J3DMaterialTable_NS_entryTexNoAnimator
/* 8014081C 0013D75C 38 60 04 00 */ li r3, 0x400
/* 80140820 0013D760 38 80 00 20 */ li r4, 0x20
/* 80140824 0013D764 48 18 E4 C9 */ bl __nwa_X1_
/* 80140824 0013D764 48 18 E4 C9 */ bl __nwa__FUli
/* 80140828 0013D768 7C 7C 1B 78 */ mr r28, r3
/* 8014082C 0013D76C 80 7B 5C AC */ lwz r3, 0x5cac(r27)
/* 80140830 0013D770 7F 84 E3 78 */ mr r4, r28
@@ -184741,7 +184741,7 @@ daAlinkHIO_wolf_c_NS_dtor:
/* 80140BAC 0013DAEC 41 82 00 10 */ beq lbl_80140BBC
/* 80140BB0 0013DAF0 7C 80 07 35 */ extsh. r0, r4
/* 80140BB4 0013DAF4 40 81 00 08 */ ble lbl_80140BBC
/* 80140BB8 0013DAF8 48 18 E1 85 */ bl __dl
/* 80140BB8 0013DAF8 48 18 E1 85 */ bl __dl__FPv
lbl_80140BBC:
/* 80140BBC 0013DAFC 7F E3 FB 78 */ mr r3, r31
/* 80140BC0 0013DB00 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184760,7 +184760,7 @@ daAlinkHIO_cut_c_NS_dtor:
/* 80140BE8 0013DB28 41 82 00 10 */ beq lbl_80140BF8
/* 80140BEC 0013DB2C 7C 80 07 35 */ extsh. r0, r4
/* 80140BF0 0013DB30 40 81 00 08 */ ble lbl_80140BF8
/* 80140BF4 0013DB34 48 18 E1 49 */ bl __dl
/* 80140BF4 0013DB34 48 18 E1 49 */ bl __dl__FPv
lbl_80140BF8:
/* 80140BF8 0013DB38 7F E3 FB 78 */ mr r3, r31
/* 80140BFC 0013DB3C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184788,7 +184788,7 @@ lbl_80140BF8:
/* 80140C54 0013DB94 7F E0 07 35 */ extsh. r0, r31
/* 80140C58 0013DB98 40 81 00 0C */ ble lbl_80140C64
/* 80140C5C 0013DB9C 7F C3 F3 78 */ mr r3, r30
/* 80140C60 0013DBA0 48 18 E0 DD */ bl __dl
/* 80140C60 0013DBA0 48 18 E0 DD */ bl __dl__FPv
lbl_80140C64:
/* 80140C64 0013DBA4 7F C3 F3 78 */ mr r3, r30
/* 80140C68 0013DBA8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184812,7 +184812,7 @@ lbl_80140C64:
/* 80140CB0 0013DBF0 7F E0 07 35 */ extsh. r0, r31
/* 80140CB4 0013DBF4 40 81 00 0C */ ble lbl_80140CC0
/* 80140CB8 0013DBF8 7F C3 F3 78 */ mr r3, r30
/* 80140CBC 0013DBFC 48 18 E0 81 */ bl __dl
/* 80140CBC 0013DBFC 48 18 E0 81 */ bl __dl__FPv
lbl_80140CC0:
/* 80140CC0 0013DC00 7F C3 F3 78 */ mr r3, r30
/* 80140CC4 0013DC04 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184832,7 +184832,7 @@ lbl_80140CC0:
/* 80140CFC 0013DC3C 90 1F 00 00 */ stw r0, 0(r31)
/* 80140D00 0013DC40 7C 80 07 35 */ extsh. r0, r4
/* 80140D04 0013DC44 40 81 00 08 */ ble lbl_80140D0C
/* 80140D08 0013DC48 48 18 E0 35 */ bl __dl
/* 80140D08 0013DC48 48 18 E0 35 */ bl __dl__FPv
lbl_80140D0C:
/* 80140D0C 0013DC4C 7F E3 FB 78 */ mr r3, r31
/* 80140D10 0013DC50 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184859,7 +184859,7 @@ lbl_80140D58:
/* 80140D58 0013DC98 7C 80 07 35 */ extsh. r0, r4
/* 80140D5C 0013DC9C 40 81 00 0C */ ble lbl_80140D68
/* 80140D60 0013DCA0 7F E3 FB 78 */ mr r3, r31
/* 80140D64 0013DCA4 48 18 DF D9 */ bl __dl
/* 80140D64 0013DCA4 48 18 DF D9 */ bl __dl__FPv
lbl_80140D68:
/* 80140D68 0013DCA8 7F E3 FB 78 */ mr r3, r31
/* 80140D6C 0013DCAC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184909,7 +184909,7 @@ mDoExt_AnmRatioPack_NS_dtor:
/* 80140E04 0013DD44 41 82 00 10 */ beq lbl_80140E14
/* 80140E08 0013DD48 7C 80 07 35 */ extsh. r0, r4
/* 80140E0C 0013DD4C 40 81 00 08 */ ble lbl_80140E14
/* 80140E10 0013DD50 48 18 DF 2D */ bl __dl
/* 80140E10 0013DD50 48 18 DF 2D */ bl __dl__FPv
lbl_80140E14:
/* 80140E14 0013DD54 7F E3 FB 78 */ mr r3, r31
/* 80140E18 0013DD58 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184948,7 +184948,7 @@ dBgS_LinkRoofChk_NS_dtor:
/* 80140E8C 0013DDCC 7F E0 07 35 */ extsh. r0, r31
/* 80140E90 0013DDD0 40 81 00 0C */ ble lbl_80140E9C
/* 80140E94 0013DDD4 7F C3 F3 78 */ mr r3, r30
/* 80140E98 0013DDD8 48 18 DE A5 */ bl __dl
/* 80140E98 0013DDD8 48 18 DE A5 */ bl __dl__FPv
lbl_80140E9C:
/* 80140E9C 0013DDDC 7F C3 F3 78 */ mr r3, r30
/* 80140EA0 0013DDE0 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -184981,7 +184981,7 @@ dBgS_LinkGndChk_NS_dtor:
/* 80140F04 0013DE44 7F E0 07 35 */ extsh. r0, r31
/* 80140F08 0013DE48 40 81 00 0C */ ble lbl_80140F14
/* 80140F0C 0013DE4C 7F C3 F3 78 */ mr r3, r30
/* 80140F10 0013DE50 48 18 DE 2D */ bl __dl
/* 80140F10 0013DE50 48 18 DE 2D */ bl __dl__FPv
lbl_80140F14:
/* 80140F14 0013DE54 7F C3 F3 78 */ mr r3, r30
/* 80140F18 0013DE58 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -185012,7 +185012,7 @@ dBgS_LinkAcch_NS_dtor:
/* 80140F74 0013DEB4 7F E0 07 35 */ extsh. r0, r31
/* 80140F78 0013DEB8 40 81 00 0C */ ble lbl_80140F84
/* 80140F7C 0013DEBC 7F C3 F3 78 */ mr r3, r30
/* 80140F80 0013DEC0 48 18 DD BD */ bl __dl
/* 80140F80 0013DEC0 48 18 DD BD */ bl __dl__FPv
lbl_80140F84:
/* 80140F84 0013DEC4 7F C3 F3 78 */ mr r3, r30
/* 80140F88 0013DEC8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -185101,7 +185101,7 @@ dCcD_Cyl:
/* 801410C4 0013E004 90 1F 00 18 */ stw r0, 0x18(r31)
/* 801410C8 0013E008 7C 80 07 35 */ extsh. r0, r4
/* 801410CC 0013E00C 40 81 00 08 */ ble lbl_801410D4
/* 801410D0 0013E010 48 18 DC 6D */ bl __dl
/* 801410D0 0013E010 48 18 DC 6D */ bl __dl__FPv
lbl_801410D4:
/* 801410D4 0013E014 7F E3 FB 78 */ mr r3, r31
/* 801410D8 0013E018 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/d_a_itembase.s
+5 -5
View File
@@ -91,7 +91,7 @@ lbl_80144830:
/* 80144850 00141790 4B EF 7A 9D */ bl dRes_control_c_NS_getRes
/* 80144854 00141794 7C 75 1B 78 */ mr r21, r3
/* 80144858 00141798 38 60 00 18 */ li r3, 0x18
/* 8014485C 0014179C 48 18 A3 F1 */ bl __nw
/* 8014485C 0014179C 48 18 A3 F1 */ bl __nw__FUl
/* 80144860 001417A0 7C 77 1B 79 */ or. r23, r3, r3
/* 80144864 001417A4 41 82 00 20 */ beq lbl_80144884
/* 80144868 001417A8 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -131,7 +131,7 @@ lbl_801448C4:
/* 801448E4 00141824 4B EF 7A 09 */ bl dRes_control_c_NS_getRes
/* 801448E8 00141828 7C 75 1B 78 */ mr r21, r3
/* 801448EC 0014182C 38 60 00 18 */ li r3, 0x18
/* 801448F0 00141830 48 18 A3 5D */ bl __nw
/* 801448F0 00141830 48 18 A3 5D */ bl __nw__FUl
/* 801448F4 00141834 7C 77 1B 79 */ or. r23, r3, r3
/* 801448F8 00141838 41 82 00 20 */ beq lbl_80144918
/* 801448FC 0014183C 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -171,7 +171,7 @@ lbl_80144958:
/* 80144978 001418B8 4B EF 79 75 */ bl dRes_control_c_NS_getRes
/* 8014497C 001418BC 7C 75 1B 78 */ mr r21, r3
/* 80144980 001418C0 38 60 00 1C */ li r3, 0x1c
/* 80144984 001418C4 48 18 A2 C9 */ bl __nw
/* 80144984 001418C4 48 18 A2 C9 */ bl __nw__FUl
/* 80144988 001418C8 7C 77 1B 79 */ or. r23, r3, r3
/* 8014498C 001418CC 41 82 00 20 */ beq lbl_801449AC
/* 80144990 001418D0 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -222,7 +222,7 @@ lbl_801449EC:
/* 80144A38 00141978 3A C0 00 00 */ li r22, 0
lbl_80144A3C:
/* 80144A3C 0014197C 38 60 00 18 */ li r3, 0x18
/* 80144A40 00141980 48 18 A2 0D */ bl __nw
/* 80144A40 00141980 48 18 A2 0D */ bl __nw__FUl
/* 80144A44 00141984 7C 77 1B 79 */ or. r23, r3, r3
/* 80144A48 00141988 41 82 00 20 */ beq lbl_80144A68
/* 80144A4C 0014198C 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -262,7 +262,7 @@ lbl_80144AA8:
/* 80144AC8 00141A08 4B EF 78 25 */ bl dRes_control_c_NS_getRes
/* 80144ACC 00141A0C 7C 75 1B 78 */ mr r21, r3
/* 80144AD0 00141A10 38 60 00 18 */ li r3, 0x18
/* 80144AD4 00141A14 48 18 A1 79 */ bl __nw
/* 80144AD4 00141A14 48 18 A1 79 */ bl __nw__FUl
/* 80144AD8 00141A18 7C 77 1B 79 */ or. r23, r3, r3
/* 80144ADC 00141A1C 41 82 00 20 */ beq lbl_80144AFC
/* 80144AE0 00141A20 3C 80 80 3A */ lis r4, lbl_803A3354@ha
asm/d/a/d_a_npc.s
+17 -17
View File
@@ -8050,7 +8050,7 @@ lbl_8014C9F4:
/* 8014CBCC 00149B0C 90 1F 00 14 */ stw r0, 0x14(r31)
/* 8014CBD0 00149B10 7C 80 07 35 */ extsh. r0, r4
/* 8014CBD4 00149B14 40 81 00 08 */ ble lbl_8014CBDC
/* 8014CBD8 00149B18 48 18 21 65 */ bl __dl
/* 8014CBD8 00149B18 48 18 21 65 */ bl __dl__FPv
lbl_8014CBDC:
/* 8014CBDC 00149B1C 7F E3 FB 78 */ mr r3, r31
/* 8014CBE0 00149B20 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8375,7 +8375,7 @@ lbl_8014D064:
/* 8014D07C 00149FBC 7F E0 07 35 */ extsh. r0, r31
/* 8014D080 00149FC0 40 81 00 0C */ ble lbl_8014D08C
/* 8014D084 00149FC4 7F C3 F3 78 */ mr r3, r30
/* 8014D088 00149FC8 48 18 1C B5 */ bl __dl
/* 8014D088 00149FC8 48 18 1C B5 */ bl __dl__FPv
lbl_8014D08C:
/* 8014D08C 00149FCC 7F C3 F3 78 */ mr r3, r30
/* 8014D090 00149FD0 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8401,7 +8401,7 @@ lbl_8014D08C:
/* 8014D0E0 0014A020 90 1F 00 20 */ stw r0, 0x20(r31)
/* 8014D0E4 0014A024 7C 80 07 35 */ extsh. r0, r4
/* 8014D0E8 0014A028 40 81 00 08 */ ble lbl_8014D0F0
/* 8014D0EC 0014A02C 48 18 1C 51 */ bl __dl
/* 8014D0EC 0014A02C 48 18 1C 51 */ bl __dl__FPv
lbl_8014D0F0:
/* 8014D0F0 0014A030 7F E3 FB 78 */ mr r3, r31
/* 8014D0F4 0014A034 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8420,7 +8420,7 @@ lbl_8014D0F0:
/* 8014D128 0014A068 90 1F 00 04 */ stw r0, 4(r31)
/* 8014D12C 0014A06C 7C 80 07 35 */ extsh. r0, r4
/* 8014D130 0014A070 40 81 00 08 */ ble lbl_8014D138
/* 8014D134 0014A074 48 18 1C 09 */ bl __dl
/* 8014D134 0014A074 48 18 1C 09 */ bl __dl__FPv
lbl_8014D138:
/* 8014D138 0014A078 7F E3 FB 78 */ mr r3, r31
/* 8014D13C 0014A07C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8484,7 +8484,7 @@ lbl_8014D220:
/* 8014D220 0014A160 7F C0 07 35 */ extsh. r0, r30
/* 8014D224 0014A164 40 81 00 0C */ ble lbl_8014D230
/* 8014D228 0014A168 7F E3 FB 78 */ mr r3, r31
/* 8014D22C 0014A16C 48 18 1B 11 */ bl __dl
/* 8014D22C 0014A16C 48 18 1B 11 */ bl __dl__FPv
lbl_8014D230:
/* 8014D230 0014A170 7F E3 FB 78 */ mr r3, r31
/* 8014D234 0014A174 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8552,7 +8552,7 @@ lbl_8014D300:
/* 8014D300 0014A240 7F E0 07 35 */ extsh. r0, r31
/* 8014D304 0014A244 40 81 00 0C */ ble lbl_8014D310
/* 8014D308 0014A248 7F C3 F3 78 */ mr r3, r30
/* 8014D30C 0014A24C 48 18 1A 31 */ bl __dl
/* 8014D30C 0014A24C 48 18 1A 31 */ bl __dl__FPv
lbl_8014D310:
/* 8014D310 0014A250 7F C3 F3 78 */ mr r3, r30
/* 8014D314 0014A254 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -10228,7 +10228,7 @@ lbl_8014EA98:
/* 8014EAA4 0014B9E4 7F E0 07 35 */ extsh. r0, r31
/* 8014EAA8 0014B9E8 40 81 00 0C */ ble lbl_8014EAB4
/* 8014EAAC 0014B9EC 7F C3 F3 78 */ mr r3, r30
/* 8014EAB0 0014B9F0 48 18 02 8D */ bl __dl
/* 8014EAB0 0014B9F0 48 18 02 8D */ bl __dl__FPv
lbl_8014EAB4:
/* 8014EAB4 0014B9F4 7F C3 F3 78 */ mr r3, r30
/* 8014EAB8 0014B9F8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -10975,7 +10975,7 @@ lbl_8014F54C:
/* 8014F564 0014C4A4 48 00 00 94 */ b lbl_8014F5F8
lbl_8014F568:
/* 8014F568 0014C4A8 38 60 00 C0 */ li r3, 0xc0
/* 8014F56C 0014C4AC 48 17 F6 E1 */ bl __nw
/* 8014F56C 0014C4AC 48 17 F6 E1 */ bl __nw__FUl
/* 8014F570 0014C4B0 7C 60 1B 79 */ or. r0, r3, r3
/* 8014F574 0014C4B4 41 82 00 0C */ beq lbl_8014F580
/* 8014F578 0014C4B8 4B F2 C3 F9 */ bl dBgW
@@ -11973,7 +11973,7 @@ lbl_801502D4:
/* 80150390 0014D2D0 7F E0 07 35 */ extsh. r0, r31
/* 80150394 0014D2D4 40 81 00 0C */ ble lbl_801503A0
/* 80150398 0014D2D8 7F C3 F3 78 */ mr r3, r30
/* 8015039C 0014D2DC 48 17 E9 A1 */ bl __dl
/* 8015039C 0014D2DC 48 17 E9 A1 */ bl __dl__FPv
lbl_801503A0:
/* 801503A0 0014D2E0 7F C3 F3 78 */ mr r3, r30
/* 801503A4 0014D2E4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -12009,7 +12009,7 @@ lbl_801503A0:
/* 8015041C 0014D35C 90 1F 00 00 */ stw r0, 0(r31)
/* 80150420 0014D360 7C 80 07 35 */ extsh. r0, r4
/* 80150424 0014D364 40 81 00 08 */ ble lbl_8015042C
/* 80150428 0014D368 48 17 E9 15 */ bl __dl
/* 80150428 0014D368 48 17 E9 15 */ bl __dl__FPv
lbl_8015042C:
/* 8015042C 0014D36C 7F E3 FB 78 */ mr r3, r31
/* 80150430 0014D370 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -12076,7 +12076,7 @@ lbl_801504F8:
/* 801504F8 0014D438 7F E0 07 35 */ extsh. r0, r31
/* 801504FC 0014D43C 40 81 00 0C */ ble lbl_80150508
/* 80150500 0014D440 7F C3 F3 78 */ mr r3, r30
/* 80150504 0014D444 48 17 E8 39 */ bl __dl
/* 80150504 0014D444 48 17 E8 39 */ bl __dl__FPv
lbl_80150508:
/* 80150508 0014D448 7F C3 F3 78 */ mr r3, r30
/* 8015050C 0014D44C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -12096,7 +12096,7 @@ lbl_80150508:
/* 80150544 0014D484 90 1F 00 00 */ stw r0, 0(r31)
/* 80150548 0014D488 7C 80 07 35 */ extsh. r0, r4
/* 8015054C 0014D48C 40 81 00 08 */ ble lbl_80150554
/* 80150550 0014D490 48 17 E7 ED */ bl __dl
/* 80150550 0014D490 48 17 E7 ED */ bl __dl__FPv
lbl_80150554:
/* 80150554 0014D494 7F E3 FB 78 */ mr r3, r31
/* 80150558 0014D498 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -18066,7 +18066,7 @@ daNpcF_getDistTableIdx:
/* 80155B88 00152AC8 7F E0 07 35 */ extsh. r0, r31
/* 80155B8C 00152ACC 40 81 00 0C */ ble lbl_80155B98
/* 80155B90 00152AD0 7F C3 F3 78 */ mr r3, r30
/* 80155B94 00152AD4 48 17 91 A9 */ bl __dl
/* 80155B94 00152AD4 48 17 91 A9 */ bl __dl__FPv
lbl_80155B98:
/* 80155B98 00152AD8 7F C3 F3 78 */ mr r3, r30
/* 80155B9C 00152ADC 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -18248,7 +18248,7 @@ lbl_80155E08:
/* 80155E14 00152D54 7F E0 07 35 */ extsh. r0, r31
/* 80155E18 00152D58 40 81 00 0C */ ble lbl_80155E24
/* 80155E1C 00152D5C 7F C3 F3 78 */ mr r3, r30
/* 80155E20 00152D60 48 17 8F 1D */ bl __dl
/* 80155E20 00152D60 48 17 8F 1D */ bl __dl__FPv
lbl_80155E24:
/* 80155E24 00152D64 7F C3 F3 78 */ mr r3, r30
/* 80155E28 00152D68 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -18270,7 +18270,7 @@ daNpcF_ActorMngr_c_NS_dtor:
/* 80155E60 00152DA0 90 1F 00 04 */ stw r0, 4(r31)
/* 80155E64 00152DA4 7C 80 07 35 */ extsh. r0, r4
/* 80155E68 00152DA8 40 81 00 08 */ ble lbl_80155E70
/* 80155E6C 00152DAC 48 17 8E D1 */ bl __dl
/* 80155E6C 00152DAC 48 17 8E D1 */ bl __dl__FPv
lbl_80155E70:
/* 80155E70 00152DB0 7F E3 FB 78 */ mr r3, r31
/* 80155E74 00152DB4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -18355,7 +18355,7 @@ lbl_80155F84:
/* 80155F84 00152EC4 7F E0 07 35 */ extsh. r0, r31
/* 80155F88 00152EC8 40 81 00 0C */ ble lbl_80155F94
/* 80155F8C 00152ECC 7F C3 F3 78 */ mr r3, r30
/* 80155F90 00152ED0 48 17 8D AD */ bl __dl
/* 80155F90 00152ED0 48 17 8D AD */ bl __dl__FPv
lbl_80155F94:
/* 80155F94 00152ED4 7F C3 F3 78 */ mr r3, r30
/* 80155F98 00152ED8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -18380,7 +18380,7 @@ lbl_80155F94:
/* 80155FE4 00152F24 7F E0 07 35 */ extsh. r0, r31
/* 80155FE8 00152F28 40 81 00 0C */ ble lbl_80155FF4
/* 80155FEC 00152F2C 7F C3 F3 78 */ mr r3, r30
/* 80155FF0 00152F30 48 17 8D 4D */ bl __dl
/* 80155FF0 00152F30 48 17 8D 4D */ bl __dl__FPv
lbl_80155FF4:
/* 80155FF4 00152F34 7F C3 F3 78 */ mr r3, r30
/* 80155FF8 00152F38 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/d_a_player.s
+8 -8
View File
@@ -687,7 +687,7 @@ lbl_8015ED80:
/* 8015ED80 0015BCC0 7F E0 07 35 */ extsh. r0, r31
/* 8015ED84 0015BCC4 40 81 00 0C */ ble lbl_8015ED90
/* 8015ED88 0015BCC8 7F C3 F3 78 */ mr r3, r30
/* 8015ED8C 0015BCCC 48 16 FF B1 */ bl __dl
/* 8015ED8C 0015BCCC 48 16 FF B1 */ bl __dl__FPv
lbl_8015ED90:
/* 8015ED90 0015BCD0 7F C3 F3 78 */ mr r3, r30
/* 8015ED94 0015BCD4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -715,7 +715,7 @@ daPy_anmHeap_c_NS_mallocBuffer:
/* 8015EDD4 0015BD14 7C 7F 1B 78 */ mr r31, r3
/* 8015EDD8 0015BD18 80 63 00 08 */ lwz r3, 8(r3)
/* 8015EDDC 0015BD1C 38 80 00 20 */ li r4, 0x20
/* 8015EDE0 0015BD20 48 16 FF 0D */ bl __nwa_X1_
/* 8015EDE0 0015BD20 48 16 FF 0D */ bl __nwa__FUli
/* 8015EDE4 0015BD24 90 7F 00 0C */ stw r3, 0xc(r31)
/* 8015EDE8 0015BD28 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 8015EDEC 0015BD2C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -763,13 +763,13 @@ lbl_8015EE60:
/* 8015EE74 0015BDB4 2C 1E 00 04 */ cmpwi r30, 4
/* 8015EE78 0015BDB8 40 82 00 10 */ bne lbl_8015EE88
/* 8015EE7C 0015BDBC 7F E3 FB 78 */ mr r3, r31
/* 8015EE80 0015BDC0 48 16 FE 45 */ bl __nwa
/* 8015EE80 0015BDC0 48 16 FE 45 */ bl __nwa__FUl
/* 8015EE84 0015BDC4 48 00 00 D8 */ b lbl_8015EF5C
lbl_8015EE88:
/* 8015EE88 0015BDC8 2C 1E 00 03 */ cmpwi r30, 3
/* 8015EE8C 0015BDCC 40 82 00 54 */ bne lbl_8015EEE0
/* 8015EE90 0015BDD0 38 60 00 2C */ li r3, 0x2c
/* 8015EE94 0015BDD4 48 16 FD B9 */ bl __nw
/* 8015EE94 0015BDD4 48 16 FD B9 */ bl __nw__FUl
/* 8015EE98 0015BDD8 7C 7F 1B 79 */ or. r31, r3, r3
/* 8015EE9C 0015BDDC 41 82 00 C0 */ beq lbl_8015EF5C
/* 8015EEA0 0015BDE0 38 80 00 00 */ li r4, 0
@@ -792,7 +792,7 @@ lbl_8015EEE0:
/* 8015EEE0 0015BE20 2C 1E 00 00 */ cmpwi r30, 0
/* 8015EEE4 0015BE24 40 82 00 44 */ bne lbl_8015EF28
/* 8015EEE8 0015BE28 38 60 00 28 */ li r3, 0x28
/* 8015EEEC 0015BE2C 48 16 FD 61 */ bl __nw
/* 8015EEEC 0015BE2C 48 16 FD 61 */ bl __nw__FUl
/* 8015EEF0 0015BE30 7C 7F 1B 79 */ or. r31, r3, r3
/* 8015EEF4 0015BE34 41 82 00 68 */ beq lbl_8015EF5C
/* 8015EEF8 0015BE38 38 80 00 00 */ li r4, 0
@@ -811,14 +811,14 @@ lbl_8015EF28:
/* 8015EF28 0015BE68 2C 1E 00 01 */ cmpwi r30, 1
/* 8015EF2C 0015BE6C 40 82 00 1C */ bne lbl_8015EF48
/* 8015EF30 0015BE70 38 60 00 2C */ li r3, 0x2c
/* 8015EF34 0015BE74 48 16 FD 19 */ bl __nw
/* 8015EF34 0015BE74 48 16 FD 19 */ bl __nw__FUl
/* 8015EF38 0015BE78 28 03 00 00 */ cmplwi r3, 0
/* 8015EF3C 0015BE7C 41 82 00 20 */ beq lbl_8015EF5C
/* 8015EF40 0015BE80 48 1C BF 99 */ bl J3DAnmTexPattern
/* 8015EF44 0015BE84 48 00 00 18 */ b lbl_8015EF5C
lbl_8015EF48:
/* 8015EF48 0015BE88 38 60 00 7C */ li r3, 0x7c
/* 8015EF4C 0015BE8C 48 16 FD 01 */ bl __nw
/* 8015EF4C 0015BE8C 48 16 FD 01 */ bl __nw__FUl
/* 8015EF50 0015BE90 28 03 00 00 */ cmplwi r3, 0
/* 8015EF54 0015BE94 41 82 00 08 */ beq lbl_8015EF5C
/* 8015EF58 0015BE98 48 1C AF 05 */ bl J3DAnmTextureSRTKey
@@ -986,7 +986,7 @@ daPy_anmHeap_c_NS_setAnimeHeap:
/* 8015F174 0015C0B4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015F178 0015C0B8 7C 7F 1B 78 */ mr r31, r3
/* 8015F17C 0015C0BC 80 63 00 10 */ lwz r3, 0x10(r3)
/* 8015F180 0015C0C0 48 16 F4 4D */ bl JKRHeap_NS_freeAll
/* 8015F180 0015C0C0 48 16 F4 4D */ bl freeAll__7JKRHeapFv
/* 8015F184 0015C0C4 80 7F 00 10 */ lwz r3, 0x10(r31)
/* 8015F188 0015C0C8 4B EB 00 45 */ bl mDoExt_setCurrentHeap
/* 8015F18C 0015C0CC 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/npc/d_a_npc_cd.s
+6 -6
View File
@@ -35,7 +35,7 @@ lbl_80156048:
/* 80156078 00152FB8 48 00 14 AD */ bl daNpcCd_c_NS_getNpcMdlDataP
/* 8015607C 00152FBC 7C 7F 1B 78 */ mr r31, r3
/* 80156080 00152FC0 38 60 00 58 */ li r3, 0x58
/* 80156084 00152FC4 48 17 8B C9 */ bl __nw
/* 80156084 00152FC4 48 17 8B C9 */ bl __nw__FUl
/* 80156088 00152FC8 7C 60 1B 79 */ or. r0, r3, r3
/* 8015608C 00152FCC 41 82 00 48 */ beq lbl_801560D4
/* 80156090 00152FD0 38 1D 05 90 */ addi r0, r29, 0x590
@@ -1638,7 +1638,7 @@ daNpcCd_HIO_Child_c_NS_dtor:
/* 801577E4 00154724 7F E0 07 35 */ extsh. r0, r31
/* 801577E8 00154728 40 81 00 0C */ ble lbl_801577F4
/* 801577EC 0015472C 7F C3 F3 78 */ mr r3, r30
/* 801577F0 00154730 48 17 75 4D */ bl __dl
/* 801577F0 00154730 48 17 75 4D */ bl __dl__FPv
lbl_801577F4:
/* 801577F4 00154734 7F C3 F3 78 */ mr r3, r30
/* 801577F8 00154738 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1660,7 +1660,7 @@ daNpcCd_HIO_Jnt_c_NS_dtor:
/* 80157830 00154770 90 1F 00 00 */ stw r0, 0(r31)
/* 80157834 00154774 7C 80 07 35 */ extsh. r0, r4
/* 80157838 00154778 40 81 00 08 */ ble lbl_80157840
/* 8015783C 0015477C 48 17 75 01 */ bl __dl
/* 8015783C 0015477C 48 17 75 01 */ bl __dl__FPv
lbl_80157840:
/* 80157840 00154780 7F E3 FB 78 */ mr r3, r31
/* 80157844 00154784 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1719,7 +1719,7 @@ lbl_801578F4:
/* 801578F4 00154834 7C 80 07 35 */ extsh. r0, r4
/* 801578F8 00154838 40 81 00 0C */ ble lbl_80157904
/* 801578FC 0015483C 7F E3 FB 78 */ mr r3, r31
/* 80157900 00154840 48 17 74 3D */ bl __dl
/* 80157900 00154840 48 17 74 3D */ bl __dl__FPv
lbl_80157904:
/* 80157904 00154844 7F E3 FB 78 */ mr r3, r31
/* 80157908 00154848 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1738,7 +1738,7 @@ lbl_80157904:
/* 8015793C 0015487C 90 1F 00 00 */ stw r0, 0(r31)
/* 80157940 00154880 7C 80 07 35 */ extsh. r0, r4
/* 80157944 00154884 40 81 00 08 */ ble lbl_8015794C
/* 80157948 00154888 48 17 73 F5 */ bl __dl
/* 80157948 00154888 48 17 73 F5 */ bl __dl__FPv
lbl_8015794C:
/* 8015794C 0015488C 7F E3 FB 78 */ mr r3, r31
/* 80157950 00154890 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1788,7 +1788,7 @@ lbl_801579E4:
/* 801579E4 00154924 7F E0 07 35 */ extsh. r0, r31
/* 801579E8 00154928 40 81 00 0C */ ble lbl_801579F4
/* 801579EC 0015492C 7F C3 F3 78 */ mr r3, r30
/* 801579F0 00154930 48 17 73 4D */ bl __dl
/* 801579F0 00154930 48 17 73 4D */ bl __dl__FPv
lbl_801579F4:
/* 801579F4 00154934 7F C3 F3 78 */ mr r3, r30
/* 801579F8 00154938 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/npc/d_a_npc_cd2.s
+6 -6
View File
@@ -45,7 +45,7 @@ lbl_80157CEC:
/* 80157D44 00154C84 3B 63 00 84 */ addi r27, r3, 0x11020084@l
lbl_80157D48:
/* 80157D48 00154C88 38 60 00 58 */ li r3, 0x58
/* 80157D4C 00154C8C 48 17 6F 01 */ bl __nw
/* 80157D4C 00154C8C 48 17 6F 01 */ bl __nw__FUl
/* 80157D50 00154C90 7C 60 1B 79 */ or. r0, r3, r3
/* 80157D54 00154C94 41 82 00 40 */ beq lbl_80157D94
/* 80157D58 00154C98 38 1C 05 94 */ addi r0, r28, 0x594
@@ -98,7 +98,7 @@ lbl_80157DD0:
/* 80157E08 00154D48 28 1E 00 00 */ cmplwi r30, 0
/* 80157E0C 00154D4C 41 82 00 7C */ beq lbl_80157E88
/* 80157E10 00154D50 38 60 00 18 */ li r3, 0x18
/* 80157E14 00154D54 48 17 6E 39 */ bl __nw
/* 80157E14 00154D54 48 17 6E 39 */ bl __nw__FUl
/* 80157E18 00154D58 7C 7B 1B 79 */ or. r27, r3, r3
/* 80157E1C 00154D5C 41 82 00 20 */ beq lbl_80157E3C
/* 80157E20 00154D60 3C 80 80 3A */ lis r4, lbl_803A3354@ha
@@ -2941,7 +2941,7 @@ daNpcCd2_HIO_WChild_c_NS_dtor:
/* 8015A6BC 001575FC 7F E0 07 35 */ extsh. r0, r31
/* 8015A6C0 00157600 40 81 00 0C */ ble lbl_8015A6CC
/* 8015A6C4 00157604 7F C3 F3 78 */ mr r3, r30
/* 8015A6C8 00157608 48 17 46 75 */ bl __dl
/* 8015A6C8 00157608 48 17 46 75 */ bl __dl__FPv
lbl_8015A6CC:
/* 8015A6CC 0015760C 7F C3 F3 78 */ mr r3, r30
/* 8015A6D0 00157610 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -2963,7 +2963,7 @@ daNpcCd2_HIO_Jnt_c_NS_dtor:
/* 8015A708 00157648 90 1F 00 00 */ stw r0, 0(r31)
/* 8015A70C 0015764C 7C 80 07 35 */ extsh. r0, r4
/* 8015A710 00157650 40 81 00 08 */ ble lbl_8015A718
/* 8015A714 00157654 48 17 46 29 */ bl __dl
/* 8015A714 00157654 48 17 46 29 */ bl __dl__FPv
lbl_8015A718:
/* 8015A718 00157658 7F E3 FB 78 */ mr r3, r31
/* 8015A71C 0015765C 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3029,7 +3029,7 @@ daNpcCd2_HIO_MChild_c_NS_dtor:
/* 8015A7DC 0015771C 7F E0 07 35 */ extsh. r0, r31
/* 8015A7E0 00157720 40 81 00 0C */ ble lbl_8015A7EC
/* 8015A7E4 00157724 7F C3 F3 78 */ mr r3, r30
/* 8015A7E8 00157728 48 17 45 55 */ bl __dl
/* 8015A7E8 00157728 48 17 45 55 */ bl __dl__FPv
lbl_8015A7EC:
/* 8015A7EC 0015772C 7F C3 F3 78 */ mr r3, r30
/* 8015A7F0 00157730 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -3108,7 +3108,7 @@ lbl_8015A8E0:
/* 8015A8E0 00157820 7F E0 07 35 */ extsh. r0, r31
/* 8015A8E4 00157824 40 81 00 0C */ ble lbl_8015A8F0
/* 8015A8E8 00157828 7F C3 F3 78 */ mr r3, r30
/* 8015A8EC 0015782C 48 17 44 51 */ bl __dl
/* 8015A8EC 0015782C 48 17 44 51 */ bl __dl__FPv
lbl_8015A8F0:
/* 8015A8F0 00157830 7F C3 F3 78 */ mr r3, r30
/* 8015A8F4 00157834 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/obj/d_a_obj_item.s
+1 -1
View File
@@ -906,7 +906,7 @@ Z2SoundObjSimple_NS_dtor:
/* 8015BA70 001589B0 7F E0 07 35 */ extsh. r0, r31
/* 8015BA74 001589B4 40 81 00 0C */ ble lbl_8015BA80
/* 8015BA78 001589B8 7F C3 F3 78 */ mr r3, r30
/* 8015BA7C 001589BC 48 17 32 C1 */ bl __dl
/* 8015BA7C 001589BC 48 17 32 C1 */ bl __dl__FPv
lbl_8015BA80:
/* 8015BA80 001589C0 7F C3 F3 78 */ mr r3, r30
/* 8015BA84 001589C4 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/a/obj/ss/d_a_obj_ss_base.s
+1 -1
View File
@@ -41,7 +41,7 @@
/* 8015E484 0015B3C4 7F E0 07 35 */ extsh. r0, r31
/* 8015E488 0015B3C8 40 81 00 0C */ ble lbl_8015E494
/* 8015E48C 0015B3CC 7F C3 F3 78 */ mr r3, r30
/* 8015E490 0015B3D0 48 17 08 AD */ bl __dl
/* 8015E490 0015B3D0 48 17 08 AD */ bl __dl__FPv
lbl_8015E494:
/* 8015E494 0015B3D4 7F C3 F3 78 */ mr r3, r30
/* 8015E498 0015B3D8 83 E1 00 0C */ lwz r31, 0xc(r1)