diff --git a/asm/DynamicLink.s b/asm/DynamicLink.s index 5ffa4c795f..63d63f0dfa 100644 --- a/asm/DynamicLink.s +++ b/asm/DynamicLink.s @@ -47,7 +47,7 @@ lbl_8026224C: /* 80262258 0025F198 7F E0 07 35 */ extsh. r0, r31 /* 8026225C 0025F19C 40 81 00 0C */ ble lbl_80262268 /* 80262260 0025F1A0 7F C3 F3 78 */ mr r3, r30 -/* 80262264 0025F1A4 48 06 CA D9 */ bl __dl +/* 80262264 0025F1A4 48 06 CA D9 */ bl __dl__FPv lbl_80262268: /* 80262268 0025F1A8 7F C3 F3 78 */ mr r3, r30 /* 8026226C 0025F1AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -479,7 +479,7 @@ lbl_80262828: /* 8026282C 0025F76C 28 03 00 00 */ cmplwi r3, 0 /* 80262830 0025F770 41 82 00 14 */ beq lbl_80262844 /* 80262834 0025F774 38 80 00 00 */ li r4, 0 -/* 80262838 0025F778 48 06 BC C9 */ bl JKRHeap_NS_free +/* 80262838 0025F778 48 06 BC C9 */ bl free__7JKRHeapFPvP7JKRHeap /* 8026283C 0025F77C 38 00 00 00 */ li r0, 0 /* 80262840 0025F780 90 1C 00 10 */ stw r0, 0x10(r28) lbl_80262844: @@ -735,7 +735,7 @@ lbl_80262BB0: /* 80262BDC 0025FB1C 28 03 00 00 */ cmplwi r3, 0 /* 80262BE0 0025FB20 41 82 00 14 */ beq lbl_80262BF4 /* 80262BE4 0025FB24 38 80 00 00 */ li r4, 0 -/* 80262BE8 0025FB28 48 06 B9 19 */ bl JKRHeap_NS_free +/* 80262BE8 0025FB28 48 06 B9 19 */ bl free__7JKRHeapFPvP7JKRHeap /* 80262BEC 0025FB2C 38 00 00 00 */ li r0, 0 /* 80262BF0 0025FB30 90 1F 00 10 */ stw r0, 0x10(r31) lbl_80262BF4: @@ -796,14 +796,14 @@ lbl_80262C98: /* 80262CC4 0025FC04 54 1C 00 34 */ rlwinm r28, r0, 0, 0, 0x1a /* 80262CC8 0025FC08 7F C3 E2 14 */ add r30, r3, r28 /* 80262CCC 0025FC0C 38 80 00 00 */ li r4, 0 -/* 80262CD0 0025FC10 48 06 B9 E1 */ bl JKRHeap_NS_getSize +/* 80262CD0 0025FC10 48 06 B9 E1 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 80262CD4 0025FC14 2C 03 00 00 */ cmpwi r3, 0 /* 80262CD8 0025FC18 40 80 00 64 */ bge lbl_80262D3C /* 80262CDC 0025FC1C 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80262CE0 0025FC20 80 63 00 20 */ lwz r3, 0x20(r3) /* 80262CE4 0025FC24 38 80 00 20 */ li r4, 0x20 /* 80262CE8 0025FC28 38 A0 00 00 */ li r5, 0 -/* 80262CEC 0025FC2C 48 06 B7 89 */ bl JKRHeap_NS_alloc +/* 80262CEC 0025FC2C 48 06 B7 89 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80262CF0 0025FC30 7C 64 1B 79 */ or. r4, r3, r3 /* 80262CF4 0025FC34 40 82 00 1C */ bne lbl_80262D10 /* 80262CF8 0025FC38 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha @@ -846,7 +846,7 @@ lbl_80262D7C: /* 80262D80 0025FCC0 80 03 00 20 */ lwz r0, 0x20(r3) /* 80262D84 0025FCC4 7C 9C 02 14 */ add r4, r28, r0 /* 80262D88 0025FCC8 38 A0 00 00 */ li r5, 0 -/* 80262D8C 0025FCCC 48 06 B8 99 */ bl JKRHeap_NS_resize +/* 80262D8C 0025FCCC 48 06 B8 99 */ bl resize__7JKRHeapFPvUlP7JKRHeap /* 80262D90 0025FCD0 2C 03 00 00 */ cmpwi r3, 0 /* 80262D94 0025FCD4 40 80 00 F0 */ bge lbl_80262E84 /* 80262D98 0025FCD8 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha @@ -858,7 +858,7 @@ lbl_80262D7C: lbl_80262DB0: /* 80262DB0 0025FCF0 7C A3 2B 78 */ mr r3, r5 /* 80262DB4 0025FCF4 38 A0 00 00 */ li r5, 0 -/* 80262DB8 0025FCF8 48 06 B8 6D */ bl JKRHeap_NS_resize +/* 80262DB8 0025FCF8 48 06 B8 6D */ bl resize__7JKRHeapFPvUlP7JKRHeap /* 80262DBC 0025FCFC 2C 03 00 00 */ cmpwi r3, 0 /* 80262DC0 0025FD00 40 81 00 30 */ ble lbl_80262DF0 /* 80262DC4 0025FD04 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -877,7 +877,7 @@ lbl_80262DF0: /* 80262DF4 0025FD34 80 63 00 20 */ lwz r3, 0x20(r3) /* 80262DF8 0025FD38 38 80 00 20 */ li r4, 0x20 /* 80262DFC 0025FD3C 38 A0 00 00 */ li r5, 0 -/* 80262E00 0025FD40 48 06 B6 75 */ bl JKRHeap_NS_alloc +/* 80262E00 0025FD40 48 06 B6 75 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80262E04 0025FD44 7C 64 1B 79 */ or. r4, r3, r3 /* 80262E08 0025FD48 40 82 00 24 */ bne lbl_80262E2C /* 80262E0C 0025FD4C 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha @@ -904,7 +904,7 @@ lbl_80262E58: /* 80262E58 0025FD98 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80262E5C 0025FD9C 7F A4 EB 78 */ mr r4, r29 /* 80262E60 0025FDA0 38 A0 00 00 */ li r5, 0 -/* 80262E64 0025FDA4 48 06 B7 C1 */ bl JKRHeap_NS_resize +/* 80262E64 0025FDA4 48 06 B7 C1 */ bl resize__7JKRHeapFPvUlP7JKRHeap /* 80262E68 0025FDA8 2C 03 00 00 */ cmpwi r3, 0 /* 80262E6C 0025FDAC 40 80 00 18 */ bge lbl_80262E84 /* 80262E70 0025FDB0 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha @@ -938,7 +938,7 @@ lbl_80262ECC: /* 80262ED8 0025FE18 28 03 00 00 */ cmplwi r3, 0 /* 80262EDC 0025FE1C 41 82 00 14 */ beq lbl_80262EF0 /* 80262EE0 0025FE20 38 80 00 00 */ li r4, 0 -/* 80262EE4 0025FE24 48 06 B6 1D */ bl JKRHeap_NS_free +/* 80262EE4 0025FE24 48 06 B6 1D */ bl free__7JKRHeapFPvP7JKRHeap /* 80262EE8 0025FE28 38 00 00 00 */ li r0, 0 /* 80262EEC 0025FE2C 90 1F 00 14 */ stw r0, 0x14(r31) lbl_80262EF0: @@ -946,7 +946,7 @@ lbl_80262EF0: /* 80262EF4 0025FE34 28 03 00 00 */ cmplwi r3, 0 /* 80262EF8 0025FE38 41 82 00 14 */ beq lbl_80262F0C /* 80262EFC 0025FE3C 38 80 00 00 */ li r4, 0 -/* 80262F00 0025FE40 48 06 B6 01 */ bl JKRHeap_NS_free +/* 80262F00 0025FE40 48 06 B6 01 */ bl free__7JKRHeapFPvP7JKRHeap /* 80262F04 0025FE44 38 00 00 00 */ li r0, 0 /* 80262F08 0025FE48 90 1F 00 10 */ stw r0, 0x10(r31) lbl_80262F0C: @@ -998,7 +998,7 @@ lbl_80262F94: /* 80262FB8 0025FEF8 28 03 00 00 */ cmplwi r3, 0 /* 80262FBC 0025FEFC 41 82 00 14 */ beq lbl_80262FD0 /* 80262FC0 0025FF00 38 80 00 00 */ li r4, 0 -/* 80262FC4 0025FF04 48 06 B5 3D */ bl JKRHeap_NS_free +/* 80262FC4 0025FF04 48 06 B5 3D */ bl free__7JKRHeapFPvP7JKRHeap /* 80262FC8 0025FF08 38 00 00 00 */ li r0, 0 /* 80262FCC 0025FF0C 90 1E 00 14 */ stw r0, 0x14(r30) lbl_80262FD0: @@ -1025,13 +1025,13 @@ lbl_80262FE8: /* 8026301C 0025FF5C 28 03 00 00 */ cmplwi r3, 0 /* 80263020 0025FF60 41 82 00 34 */ beq lbl_80263054 /* 80263024 0025FF64 38 80 00 00 */ li r4, 0 -/* 80263028 0025FF68 48 06 B6 89 */ bl JKRHeap_NS_getSize +/* 80263028 0025FF68 48 06 B6 89 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 8026302C 0025FF6C 7C 7F 1B 78 */ mr r31, r3 /* 80263030 0025FF70 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80263034 0025FF74 28 03 00 00 */ cmplwi r3, 0 /* 80263038 0025FF78 41 82 00 0C */ beq lbl_80263044 /* 8026303C 0025FF7C 38 80 00 00 */ li r4, 0 -/* 80263040 0025FF80 48 06 B6 71 */ bl JKRHeap_NS_getSize +/* 80263040 0025FF80 48 06 B6 71 */ bl getSize__7JKRHeapFPvP7JKRHeap lbl_80263044: /* 80263044 0025FF84 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80263048 0025FF88 80 03 00 20 */ lwz r0, 0x20(r3) diff --git a/asm/J2DGraph/J2DAnimation.s b/asm/J2DGraph/J2DAnimation.s index 28c1e752d6..ccbf3a7fa5 100644 --- a/asm/J2DGraph/J2DAnimation.s +++ b/asm/J2DGraph/J2DAnimation.s @@ -1727,7 +1727,7 @@ lbl_8030BD98: /* 8030BDBC 00308CFC A3 83 00 00 */ lhz r28, 0(r3) /* 8030BDC0 00308D00 57 83 18 38 */ slwi r3, r28, 3 /* 8030BDC4 00308D04 38 63 00 10 */ addi r3, r3, 0x10 -/* 8030BDC8 00308D08 4B FC 2E FD */ bl __nwa +/* 8030BDC8 00308D08 4B FC 2E FD */ bl __nwa__FUl .global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer /* 8030BDCC 00308D0C 3C 80 80 31 */ lis r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer@ha .global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer @@ -1780,7 +1780,7 @@ lbl_8030BE60: /* 8030BE78 00308DB8 28 00 00 00 */ cmplwi r0, 0 /* 8030BE7C 00308DBC 41 82 00 3C */ beq lbl_8030BEB8 /* 8030BE80 00308DC0 38 60 00 18 */ li r3, 0x18 -/* 8030BE84 00308DC4 4B FC 2D C9 */ bl __nw +/* 8030BE84 00308DC4 4B FC 2D C9 */ bl __nw__FUl /* 8030BE88 00308DC8 7C 7C 1B 79 */ or. r28, r3, r3 /* 8030BE8C 00308DCC 41 82 00 20 */ beq lbl_8030BEAC /* 8030BE90 00308DD0 38 80 00 00 */ li r4, 0 @@ -2719,11 +2719,11 @@ J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor: /* 8030CB54 00309A94 7C 9F 23 78 */ mr r31, r4 /* 8030CB58 00309A98 41 82 00 1C */ beq lbl_8030CB74 /* 8030CB5C 00309A9C 80 7E 00 04 */ lwz r3, 4(r30) -/* 8030CB60 00309AA0 4B FC 21 DD */ bl __dl +/* 8030CB60 00309AA0 4B FC 21 DD */ bl __dl__FPv /* 8030CB64 00309AA4 7F E0 07 35 */ extsh. r0, r31 /* 8030CB68 00309AA8 40 81 00 0C */ ble lbl_8030CB74 /* 8030CB6C 00309AAC 7F C3 F3 78 */ mr r3, r30 -/* 8030CB70 00309AB0 4B FC 21 CD */ bl __dl +/* 8030CB70 00309AB0 4B FC 21 CD */ bl __dl__FPv lbl_8030CB74: /* 8030CB74 00309AB4 7F C3 F3 78 */ mr r3, r30 /* 8030CB78 00309AB8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2764,7 +2764,7 @@ lbl_8030CBF4: /* 8030CBF4 00309B34 7F E0 07 35 */ extsh. r0, r31 /* 8030CBF8 00309B38 40 81 00 0C */ ble lbl_8030CC04 /* 8030CBFC 00309B3C 7F C3 F3 78 */ mr r3, r30 -/* 8030CC00 00309B40 4B FC 21 3D */ bl __dl +/* 8030CC00 00309B40 4B FC 21 3D */ bl __dl__FPv lbl_8030CC04: /* 8030CC04 00309B44 7F C3 F3 78 */ mr r3, r30 /* 8030CC08 00309B48 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2794,7 +2794,7 @@ lbl_8030CC64: /* 8030CC64 00309BA4 7C 80 07 35 */ extsh. r0, r4 /* 8030CC68 00309BA8 40 81 00 0C */ ble lbl_8030CC74 /* 8030CC6C 00309BAC 7F E3 FB 78 */ mr r3, r31 -/* 8030CC70 00309BB0 4B FC 20 CD */ bl __dl +/* 8030CC70 00309BB0 4B FC 20 CD */ bl __dl__FPv lbl_8030CC74: /* 8030CC74 00309BB4 7F E3 FB 78 */ mr r3, r31 /* 8030CC78 00309BB8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2823,7 +2823,7 @@ lbl_8030CCD0: /* 8030CCD0 00309C10 7C 80 07 35 */ extsh. r0, r4 /* 8030CCD4 00309C14 40 81 00 0C */ ble lbl_8030CCE0 /* 8030CCD8 00309C18 7F E3 FB 78 */ mr r3, r31 -/* 8030CCDC 00309C1C 4B FC 20 61 */ bl __dl +/* 8030CCDC 00309C1C 4B FC 20 61 */ bl __dl__FPv lbl_8030CCE0: /* 8030CCE0 00309C20 7F E3 FB 78 */ mr r3, r31 /* 8030CCE4 00309C24 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2859,7 +2859,7 @@ lbl_8030CD54: /* 8030CD54 00309C94 7C 80 07 35 */ extsh. r0, r4 /* 8030CD58 00309C98 40 81 00 0C */ ble lbl_8030CD64 /* 8030CD5C 00309C9C 7F E3 FB 78 */ mr r3, r31 -/* 8030CD60 00309CA0 4B FC 1F DD */ bl __dl +/* 8030CD60 00309CA0 4B FC 1F DD */ bl __dl__FPv lbl_8030CD64: /* 8030CD64 00309CA4 7F E3 FB 78 */ mr r3, r31 /* 8030CD68 00309CA8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2900,7 +2900,7 @@ lbl_8030CDF0: /* 8030CDF0 00309D30 7C 80 07 35 */ extsh. r0, r4 /* 8030CDF4 00309D34 40 81 00 0C */ ble lbl_8030CE00 /* 8030CDF8 00309D38 7F E3 FB 78 */ mr r3, r31 -/* 8030CDFC 00309D3C 4B FC 1F 41 */ bl __dl +/* 8030CDFC 00309D3C 4B FC 1F 41 */ bl __dl__FPv lbl_8030CE00: /* 8030CE00 00309D40 7F E3 FB 78 */ mr r3, r31 /* 8030CE04 00309D44 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DAnmLoader.s b/asm/J2DGraph/J2DAnmLoader.s index ac86010eb4..7fd33e228a 100644 --- a/asm/J2DGraph/J2DAnmLoader.s +++ b/asm/J2DGraph/J2DAnmLoader.s @@ -83,7 +83,7 @@ lbl_80308B80: /* 80308B80 00305AC0 38 61 00 50 */ addi r3, r1, 0x50 /* 80308B84 00305AC4 48 00 07 0D */ bl J2DAnmKeyLoader_v15 /* 80308B88 00305AC8 38 60 00 2C */ li r3, 0x2c -/* 80308B8C 00305ACC 4B FC 60 C1 */ bl __nw +/* 80308B8C 00305ACC 4B FC 60 C1 */ bl __nw__FUl /* 80308B90 00305AD0 28 03 00 00 */ cmplwi r3, 0 /* 80308B94 00305AD4 41 82 00 50 */ beq lbl_80308BE4 /* 80308B98 00305AD8 3C 80 80 3B */ lis r4, lbl_803A8E04@ha @@ -120,7 +120,7 @@ lbl_80308C0C: /* 80308C0C 00305B4C 38 61 00 48 */ addi r3, r1, 0x48 /* 80308C10 00305B50 48 00 06 81 */ bl J2DAnmKeyLoader_v15 /* 80308C14 00305B54 38 60 00 44 */ li r3, 0x44 -/* 80308C18 00305B58 4B FC 60 35 */ bl __nw +/* 80308C18 00305B58 4B FC 60 35 */ bl __nw__FUl /* 80308C1C 00305B5C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80308C20 00305B60 41 82 00 78 */ beq lbl_80308C98 /* 80308C24 00305B64 3C 60 80 3B */ lis r3, lbl_803A8E04@ha @@ -170,7 +170,7 @@ lbl_80308CC8: /* 80308CC8 00305C08 38 61 00 40 */ addi r3, r1, 0x40 /* 80308CCC 00305C0C 48 00 05 C5 */ bl J2DAnmKeyLoader_v15 /* 80308CD0 00305C10 38 60 00 80 */ li r3, 0x80 -/* 80308CD4 00305C14 4B FC 5F 79 */ bl __nw +/* 80308CD4 00305C14 4B FC 5F 79 */ bl __nw__FUl /* 80308CD8 00305C18 7C 7E 1B 79 */ or. r30, r3, r3 /* 80308CDC 00305C1C 41 82 00 90 */ beq lbl_80308D6C /* 80308CE0 00305C20 3C 60 80 3B */ lis r3, lbl_803A8E04@ha @@ -223,7 +223,7 @@ lbl_80308D94: /* 80308D94 00305CD4 38 61 00 38 */ addi r3, r1, 0x38 /* 80308D98 00305CD8 48 00 04 F9 */ bl J2DAnmKeyLoader_v15 /* 80308D9C 00305CDC 38 60 00 74 */ li r3, 0x74 -/* 80308DA0 00305CE0 4B FC 5E AD */ bl __nw +/* 80308DA0 00305CE0 4B FC 5E AD */ bl __nw__FUl /* 80308DA4 00305CE4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80308DA8 00305CE8 41 82 00 98 */ beq lbl_80308E40 /* 80308DAC 00305CEC 3C 60 80 3B */ lis r3, lbl_803A8E04@ha @@ -278,7 +278,7 @@ lbl_80308E68: /* 80308E68 00305DA8 38 61 00 30 */ addi r3, r1, 0x30 /* 80308E6C 00305DAC 48 00 04 25 */ bl J2DAnmKeyLoader_v15 /* 80308E70 00305DB0 38 60 00 3C */ li r3, 0x3c -/* 80308E74 00305DB4 4B FC 5D D9 */ bl __nw +/* 80308E74 00305DB4 4B FC 5D D9 */ bl __nw__FUl /* 80308E78 00305DB8 28 03 00 00 */ cmplwi r3, 0 /* 80308E7C 00305DBC 41 82 00 9C */ beq lbl_80308F18 /* 80308E80 00305DC0 3C 80 80 3B */ lis r4, lbl_803A8E04@ha @@ -337,7 +337,7 @@ lbl_80308F40: /* 80308F40 00305E80 38 61 00 28 */ addi r3, r1, 0x28 /* 80308F44 00305E84 48 00 0D A5 */ bl J2DAnmFullLoader_v15 /* 80308F48 00305E88 38 60 00 28 */ li r3, 0x28 -/* 80308F4C 00305E8C 4B FC 5D 01 */ bl __nw +/* 80308F4C 00305E8C 4B FC 5D 01 */ bl __nw__FUl /* 80308F50 00305E90 28 03 00 00 */ cmplwi r3, 0 /* 80308F54 00305E94 41 82 00 4C */ beq lbl_80308FA0 /* 80308F58 00305E98 3C 80 80 3B */ lis r4, lbl_803A8E04@ha @@ -373,7 +373,7 @@ lbl_80308FC8: /* 80308FC8 00305F08 38 61 00 20 */ addi r3, r1, 0x20 /* 80308FCC 00305F0C 48 00 0D 1D */ bl J2DAnmFullLoader_v15 /* 80308FD0 00305F10 38 60 00 44 */ li r3, 0x44 -/* 80308FD4 00305F14 4B FC 5C 79 */ bl __nw +/* 80308FD4 00305F14 4B FC 5C 79 */ bl __nw__FUl /* 80308FD8 00305F18 7C 7E 1B 79 */ or. r30, r3, r3 /* 80308FDC 00305F1C 41 82 00 78 */ beq lbl_80309054 /* 80308FE0 00305F20 3C 60 80 3B */ lis r3, lbl_803A8E04@ha @@ -420,7 +420,7 @@ lbl_8030907C: /* 8030907C 00305FBC 38 61 00 18 */ addi r3, r1, 0x18 /* 80309080 00305FC0 48 00 0C 69 */ bl J2DAnmFullLoader_v15 /* 80309084 00305FC4 38 60 00 34 */ li r3, 0x34 -/* 80309088 00305FC8 4B FC 5B C5 */ bl __nw +/* 80309088 00305FC8 4B FC 5B C5 */ bl __nw__FUl /* 8030908C 00305FCC 7C 7E 1B 79 */ or. r30, r3, r3 /* 80309090 00305FD0 41 82 00 54 */ beq lbl_803090E4 /* 80309094 00305FD4 3C 60 80 3B */ lis r3, lbl_803A8E04@ha @@ -458,7 +458,7 @@ lbl_8030910C: /* 8030910C 0030604C 38 61 00 10 */ addi r3, r1, 0x10 /* 80309110 00306050 48 00 0B D9 */ bl J2DAnmFullLoader_v15 /* 80309114 00306054 38 60 00 1C */ li r3, 0x1c -/* 80309118 00306058 4B FC 5B 35 */ bl __nw +/* 80309118 00306058 4B FC 5B 35 */ bl __nw__FUl /* 8030911C 0030605C 28 03 00 00 */ cmplwi r3, 0 /* 80309120 00306060 41 82 00 44 */ beq lbl_80309164 /* 80309124 00306064 3C 80 80 3B */ lis r4, lbl_803A8E04@ha @@ -495,7 +495,7 @@ lbl_80309194: /* 80309194 003060D4 38 61 00 08 */ addi r3, r1, 8 /* 80309198 003060D8 48 00 0B 51 */ bl J2DAnmFullLoader_v15 /* 8030919C 003060DC 38 60 00 3C */ li r3, 0x3c -/* 803091A0 003060E0 4B FC 5A AD */ bl __nw +/* 803091A0 003060E0 4B FC 5A AD */ bl __nw__FUl /* 803091A4 003060E4 28 03 00 00 */ cmplwi r3, 0 /* 803091A8 003060E8 41 82 00 9C */ beq lbl_80309244 /* 803091AC 003060EC 3C 80 80 3B */ lis r4, lbl_803A8E04@ha @@ -592,7 +592,7 @@ lbl_803092E0: /* 803092E0 00306220 7C 80 07 35 */ extsh. r0, r4 /* 803092E4 00306224 40 81 00 0C */ ble lbl_803092F0 /* 803092E8 00306228 7F E3 FB 78 */ mr r3, r31 -/* 803092EC 0030622C 4B FC 5A 51 */ bl __dl +/* 803092EC 0030622C 4B FC 5A 51 */ bl __dl__FPv lbl_803092F0: /* 803092F0 00306230 7F E3 FB 78 */ mr r3, r31 /* 803092F4 00306234 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1333,7 +1333,7 @@ lbl_80309D38: /* 80309D38 00306C78 7C 80 07 35 */ extsh. r0, r4 /* 80309D3C 00306C7C 40 81 00 0C */ ble lbl_80309D48 /* 80309D40 00306C80 7F E3 FB 78 */ mr r3, r31 -/* 80309D44 00306C84 4B FC 4F F9 */ bl __dl +/* 80309D44 00306C84 4B FC 4F F9 */ bl __dl__FPv lbl_80309D48: /* 80309D48 00306C88 7F E3 FB 78 */ mr r3, r31 /* 80309D4C 00306C8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1776,7 +1776,7 @@ lbl_8030A38C: /* 8030A38C 003072CC 7C 80 07 35 */ extsh. r0, r4 /* 8030A390 003072D0 40 81 00 0C */ ble lbl_8030A39C /* 8030A394 003072D4 7F E3 FB 78 */ mr r3, r31 -/* 8030A398 003072D8 4B FC 49 A5 */ bl __dl +/* 8030A398 003072D8 4B FC 49 A5 */ bl __dl__FPv lbl_8030A39C: /* 8030A39C 003072DC 7F E3 FB 78 */ mr r3, r31 /* 8030A3A0 003072E0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1801,7 +1801,7 @@ lbl_8030A3E8: /* 8030A3E8 00307328 7C 80 07 35 */ extsh. r0, r4 /* 8030A3EC 0030732C 40 81 00 0C */ ble lbl_8030A3F8 /* 8030A3F0 00307330 7F E3 FB 78 */ mr r3, r31 -/* 8030A3F4 00307334 4B FC 49 49 */ bl __dl +/* 8030A3F4 00307334 4B FC 49 49 */ bl __dl__FPv lbl_8030A3F8: /* 8030A3F8 00307338 7F E3 FB 78 */ mr r3, r31 /* 8030A3FC 0030733C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1820,7 +1820,7 @@ lbl_8030A3F8: /* 8030A430 00307370 90 1F 00 00 */ stw r0, 0(r31) /* 8030A434 00307374 7C 80 07 35 */ extsh. r0, r4 /* 8030A438 00307378 40 81 00 08 */ ble lbl_8030A440 -/* 8030A43C 0030737C 4B FC 49 01 */ bl __dl +/* 8030A43C 0030737C 4B FC 49 01 */ bl __dl__FPv lbl_8030A440: /* 8030A440 00307380 7F E3 FB 78 */ mr r3, r31 /* 8030A444 00307384 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DGrafContext.s b/asm/J2DGraph/J2DGrafContext.s index 20b2b110ad..54c5fe88ee 100644 --- a/asm/J2DGraph/J2DGrafContext.s +++ b/asm/J2DGraph/J2DGrafContext.s @@ -755,7 +755,7 @@ J2DGrafContext_NS_lineTo: /* 802E95F4 002E6534 90 1F 00 00 */ stw r0, 0(r31) /* 802E95F8 002E6538 7C 80 07 35 */ extsh. r0, r4 /* 802E95FC 002E653C 40 81 00 08 */ ble lbl_802E9604 -/* 802E9600 002E6540 4B FE 57 3D */ bl __dl +/* 802E9600 002E6540 4B FE 57 3D */ bl __dl__FPv lbl_802E9604: /* 802E9604 002E6544 7F E3 FB 78 */ mr r3, r31 /* 802E9608 002E6548 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index 5875b14485..14c4fb4c41 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -210,7 +210,7 @@ lbl_802EB654: /* 802EB658 002E8598 7C 7C 00 2E */ lwzx r3, r28, r0 /* 802EB65C 002E859C 28 03 00 00 */ cmplwi r3, 0 /* 802EB660 002E85A0 41 82 00 08 */ beq lbl_802EB668 -/* 802EB664 002E85A4 4B FE 36 D9 */ bl __dl +/* 802EB664 002E85A4 4B FE 36 D9 */ bl __dl__FPv lbl_802EB668: /* 802EB668 002E85A8 3B DE 00 01 */ addi r30, r30, 1 /* 802EB66C 002E85AC 2C 1E 00 08 */ cmpwi r30, 8 @@ -219,7 +219,7 @@ lbl_802EB668: /* 802EB678 002E85B8 7F A0 07 35 */ extsh. r0, r29 /* 802EB67C 002E85BC 40 81 00 0C */ ble lbl_802EB688 /* 802EB680 002E85C0 7F 83 E3 78 */ mr r3, r28 -/* 802EB684 002E85C4 4B FE 36 B9 */ bl __dl +/* 802EB684 002E85C4 4B FE 36 B9 */ bl __dl__FPv lbl_802EB688: /* 802EB688 002E85C8 7F 83 E3 78 */ mr r3, r28 /* 802EB68C 002E85CC 39 61 00 20 */ addi r11, r1, 0x20 @@ -243,7 +243,7 @@ J2DTexGenBlock_NS_setTexMtx: /* 802EB6C8 002E8608 28 06 00 00 */ cmplwi r6, 0 /* 802EB6CC 002E860C 40 82 00 78 */ bne lbl_802EB744 /* 802EB6D0 002E8610 38 60 00 54 */ li r3, 0x54 -/* 802EB6D4 002E8614 4B FE 35 79 */ bl __nw +/* 802EB6D4 002E8614 4B FE 35 79 */ bl __nw__FUl /* 802EB6D8 002E8618 28 03 00 00 */ cmplwi r3, 0 /* 802EB6DC 002E861C 41 82 00 54 */ beq lbl_802EB730 /* 802EB6E0 002E8620 C0 1E 00 04 */ lfs f0, 4(r30) @@ -462,7 +462,7 @@ J2DTevBlock1: /* 802EB9D8 002E8918 4B FF 28 5D */ bl JUTTexture_NS_dtor lbl_802EB9DC: /* 802EB9DC 002E891C 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 802EB9E0 002E8920 4B FE 33 5D */ bl __dl +/* 802EB9E0 002E8920 4B FE 33 5D */ bl __dl__FPv /* 802EB9E4 002E8924 88 1E 00 5C */ lbz r0, 0x5c(r30) /* 802EB9E8 002E8928 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 802EB9EC 002E892C 41 82 00 24 */ beq lbl_802EBA10 @@ -484,7 +484,7 @@ lbl_802EBA24: /* 802EBA24 002E8964 7F E0 07 35 */ extsh. r0, r31 /* 802EBA28 002E8968 40 81 00 0C */ ble lbl_802EBA34 /* 802EBA2C 002E896C 7F C3 F3 78 */ mr r3, r30 -/* 802EBA30 002E8970 4B FE 33 0D */ bl __dl +/* 802EBA30 002E8970 4B FE 33 0D */ bl __dl__FPv lbl_802EBA34: /* 802EBA34 002E8974 7F C3 F3 78 */ mr r3, r30 /* 802EBA38 002E8978 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -623,7 +623,7 @@ lbl_802EBC38: /* 802EBC3C 002E8B7C 28 00 00 00 */ cmplwi r0, 0 /* 802EBC40 002E8B80 40 82 00 54 */ bne lbl_802EBC94 /* 802EBC44 002E8B84 38 60 00 40 */ li r3, 0x40 -/* 802EBC48 002E8B88 4B FE 30 05 */ bl __nw +/* 802EBC48 002E8B88 4B FE 30 05 */ bl __nw__FUl /* 802EBC4C 002E8B8C 28 03 00 00 */ cmplwi r3, 0 /* 802EBC50 002E8B90 41 82 00 1C */ beq lbl_802EBC6C /* 802EBC54 002E8B94 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -685,7 +685,7 @@ lbl_802EBD18: /* 802EBD18 002E8C58 28 03 00 00 */ cmplwi r3, 0 /* 802EBD1C 002E8C5C 40 82 00 64 */ bne lbl_802EBD80 /* 802EBD20 002E8C60 38 60 00 40 */ li r3, 0x40 -/* 802EBD24 002E8C64 4B FE 2F 29 */ bl __nw +/* 802EBD24 002E8C64 4B FE 2F 29 */ bl __nw__FUl /* 802EBD28 002E8C68 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EBD2C 002E8C6C 41 82 00 24 */ beq lbl_802EBD50 /* 802EBD30 002E8C70 38 00 00 00 */ li r0, 0 @@ -804,7 +804,7 @@ lbl_802EBEB8: /* 802EBEC4 002E8E04 28 1D 00 00 */ cmplwi r29, 0 /* 802EBEC8 002E8E08 41 82 00 60 */ beq lbl_802EBF28 /* 802EBECC 002E8E0C 38 60 00 40 */ li r3, 0x40 -/* 802EBED0 002E8E10 4B FE 2D 7D */ bl __nw +/* 802EBED0 002E8E10 4B FE 2D 7D */ bl __nw__FUl /* 802EBED4 002E8E14 7C 7E 1B 79 */ or. r30, r3, r3 /* 802EBED8 002E8E18 41 82 00 24 */ beq lbl_802EBEFC /* 802EBEDC 002E8E1C 38 00 00 00 */ li r0, 0 @@ -858,7 +858,7 @@ lbl_802EBF7C: /* 802EBF84 002E8EC4 28 1D 00 00 */ cmplwi r29, 0 /* 802EBF88 002E8EC8 41 82 00 5C */ beq lbl_802EBFE4 /* 802EBF8C 002E8ECC 38 60 00 40 */ li r3, 0x40 -/* 802EBF90 002E8ED0 4B FE 2C BD */ bl __nw +/* 802EBF90 002E8ED0 4B FE 2C BD */ bl __nw__FUl /* 802EBF94 002E8ED4 7C 7E 1B 79 */ or. r30, r3, r3 /* 802EBF98 002E8ED8 41 82 00 24 */ beq lbl_802EBFBC /* 802EBF9C 002E8EDC 38 00 00 00 */ li r0, 0 @@ -883,7 +883,7 @@ lbl_802EBFD4: /* 802EBFE0 002E8F20 98 1F 00 5C */ stb r0, 0x5c(r31) lbl_802EBFE4: /* 802EBFE4 002E8F24 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802EBFE8 002E8F28 4B FE 2D 55 */ bl __dl +/* 802EBFE8 002E8F28 4B FE 2D 55 */ bl __dl__FPv /* 802EBFEC 002E8F2C 38 00 00 00 */ li r0, 0 /* 802EBFF0 002E8F30 90 1F 00 54 */ stw r0, 0x54(r31) /* 802EBFF4 002E8F34 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -921,7 +921,7 @@ lbl_802EC060: /* 802EC068 002E8FA8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 /* 802EC06C 002E8FAC 98 1E 00 5C */ stb r0, 0x5c(r30) /* 802EC070 002E8FB0 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 802EC074 002E8FB4 4B FE 2C C9 */ bl __dl +/* 802EC074 002E8FB4 4B FE 2C C9 */ bl __dl__FPv /* 802EC078 002E8FB8 38 00 00 00 */ li r0, 0 /* 802EC07C 002E8FBC 90 1E 00 54 */ stw r0, 0x54(r30) /* 802EC080 002E8FC0 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -958,7 +958,7 @@ lbl_802EC0E4: /* 802EC0F0 002E9030 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 /* 802EC0F4 002E9034 98 1F 00 5C */ stb r0, 0x5c(r31) /* 802EC0F8 002E9038 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802EC0FC 002E903C 4B FE 2C 41 */ bl __dl +/* 802EC0FC 002E903C 4B FE 2C 41 */ bl __dl__FPv /* 802EC100 002E9040 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 802EC104 002E9044 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l /* 802EC108 002E9048 B0 1F 00 04 */ sth r0, 4(r31) @@ -981,7 +981,7 @@ lbl_802EC110: /* 802EC148 002E9088 48 00 00 78 */ b lbl_802EC1C0 lbl_802EC14C: /* 802EC14C 002E908C 38 60 00 70 */ li r3, 0x70 -/* 802EC150 002E9090 4B FE 2A FD */ bl __nw +/* 802EC150 002E9090 4B FE 2A FD */ bl __nw__FUl /* 802EC154 002E9094 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EC158 002E9098 41 82 00 14 */ beq lbl_802EC16C /* 802EC15C 002E909C 7F C4 F3 78 */ mr r4, r30 @@ -1072,7 +1072,7 @@ lbl_802EC284: /* 802EC290 002E91D0 28 03 00 00 */ cmplwi r3, 0 /* 802EC294 002E91D4 40 82 00 38 */ bne lbl_802EC2CC /* 802EC298 002E91D8 38 60 00 18 */ li r3, 0x18 -/* 802EC29C 002E91DC 4B FE 29 B1 */ bl __nw +/* 802EC29C 002E91DC 4B FE 29 B1 */ bl __nw__FUl /* 802EC2A0 002E91E0 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EC2A4 002E91E4 41 82 00 10 */ beq lbl_802EC2B4 /* 802EC2A8 002E91E8 38 80 00 00 */ li r4, 0 @@ -1097,7 +1097,7 @@ lbl_802EC2D4: /* 802EC2E8 002E9228 48 00 00 14 */ b lbl_802EC2FC lbl_802EC2EC: /* 802EC2EC 002E922C 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 802EC2F0 002E9230 4B FE 2A 4D */ bl __dl +/* 802EC2F0 002E9230 4B FE 2A 4D */ bl __dl__FPv /* 802EC2F4 002E9234 38 00 00 00 */ li r0, 0 /* 802EC2F8 002E9238 90 1D 00 54 */ stw r0, 0x54(r29) lbl_802EC2FC: @@ -1393,9 +1393,9 @@ lbl_802EC70C: /* 802EC720 002E9660 4B FF 1B 15 */ bl JUTTexture_NS_dtor lbl_802EC724: /* 802EC724 002E9664 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 802EC728 002E9668 4B FE 26 15 */ bl __dl +/* 802EC728 002E9668 4B FE 26 15 */ bl __dl__FPv /* 802EC72C 002E966C 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802EC730 002E9670 4B FE 26 0D */ bl __dl +/* 802EC730 002E9670 4B FE 26 0D */ bl __dl__FPv /* 802EC734 002E9674 88 1E 00 78 */ lbz r0, 0x78(r30) /* 802EC738 002E9678 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 802EC73C 002E967C 41 82 00 24 */ beq lbl_802EC760 @@ -1417,7 +1417,7 @@ lbl_802EC774: /* 802EC774 002E96B4 7F E0 07 35 */ extsh. r0, r31 /* 802EC778 002E96B8 40 81 00 0C */ ble lbl_802EC784 /* 802EC77C 002E96BC 7F C3 F3 78 */ mr r3, r30 -/* 802EC780 002E96C0 4B FE 25 BD */ bl __dl +/* 802EC780 002E96C0 4B FE 25 BD */ bl __dl__FPv lbl_802EC784: /* 802EC784 002E96C4 7F C3 F3 78 */ mr r3, r30 /* 802EC788 002E96C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1609,7 +1609,7 @@ lbl_802ECA50: /* 802ECA5C 002E999C 28 00 00 00 */ cmplwi r0, 0 /* 802ECA60 002E99A0 40 82 00 5C */ bne lbl_802ECABC /* 802ECA64 002E99A4 38 60 00 40 */ li r3, 0x40 -/* 802ECA68 002E99A8 4B FE 21 E5 */ bl __nw +/* 802ECA68 002E99A8 4B FE 21 E5 */ bl __nw__FUl /* 802ECA6C 002E99AC 28 03 00 00 */ cmplwi r3, 0 /* 802ECA70 002E99B0 41 82 00 1C */ beq lbl_802ECA8C /* 802ECA74 002E99B4 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -1720,7 +1720,7 @@ lbl_802ECBD4: /* 802ECBE0 002E9B20 28 1F 00 00 */ cmplwi r31, 0 /* 802ECBE4 002E9B24 40 82 00 BC */ bne lbl_802ECCA0 /* 802ECBE8 002E9B28 38 60 00 40 */ li r3, 0x40 -/* 802ECBEC 002E9B2C 4B FE 20 61 */ bl __nw +/* 802ECBEC 002E9B2C 4B FE 20 61 */ bl __nw__FUl /* 802ECBF0 002E9B30 7C 7E 1B 79 */ or. r30, r3, r3 /* 802ECBF4 002E9B34 41 82 00 24 */ beq lbl_802ECC18 /* 802ECBF8 002E9B38 38 00 00 00 */ li r0, 0 @@ -2011,7 +2011,7 @@ lbl_802ECFE4: /* 802ECFF8 002E9F38 28 1B 00 00 */ cmplwi r27, 0 /* 802ECFFC 002E9F3C 41 82 00 64 */ beq lbl_802ED060 /* 802ED000 002E9F40 38 60 00 40 */ li r3, 0x40 -/* 802ED004 002E9F44 4B FE 1C 49 */ bl __nw +/* 802ED004 002E9F44 4B FE 1C 49 */ bl __nw__FUl /* 802ED008 002E9F48 7C 7E 1B 79 */ or. r30, r3, r3 /* 802ED00C 002E9F4C 41 82 00 24 */ beq lbl_802ED030 /* 802ED010 002E9F50 38 00 00 00 */ li r0, 0 @@ -2070,7 +2070,7 @@ lbl_802ED0C4: /* 802ED0CC 002EA00C 28 1B 00 00 */ cmplwi r27, 0 /* 802ED0D0 002EA010 41 82 00 58 */ beq lbl_802ED128 /* 802ED0D4 002EA014 38 60 00 40 */ li r3, 0x40 -/* 802ED0D8 002EA018 4B FE 1B 75 */ bl __nw +/* 802ED0D8 002EA018 4B FE 1B 75 */ bl __nw__FUl /* 802ED0DC 002EA01C 7C 7C 1B 79 */ or. r28, r3, r3 /* 802ED0E0 002EA020 41 82 00 24 */ beq lbl_802ED104 /* 802ED0E4 002EA024 38 00 00 00 */ li r0, 0 @@ -2095,7 +2095,7 @@ lbl_802ED11C: lbl_802ED128: /* 802ED128 002EA068 7F 79 EA 14 */ add r27, r25, r29 /* 802ED12C 002EA06C 80 7B 00 6C */ lwz r3, 0x6c(r27) -/* 802ED130 002EA070 4B FE 1C 0D */ bl __dl +/* 802ED130 002EA070 4B FE 1C 0D */ bl __dl__FPv /* 802ED134 002EA074 38 00 00 00 */ li r0, 0 /* 802ED138 002EA078 90 1B 00 6C */ stw r0, 0x6c(r27) /* 802ED13C 002EA07C 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -2142,7 +2142,7 @@ lbl_802ED1C4: /* 802ED1D4 002EA114 7C 00 F0 78 */ andc r0, r0, r30 /* 802ED1D8 002EA118 98 1B 00 78 */ stb r0, 0x78(r27) /* 802ED1DC 002EA11C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 802ED1E0 002EA120 4B FE 1B 5D */ bl __dl +/* 802ED1E0 002EA120 4B FE 1B 5D */ bl __dl__FPv /* 802ED1E4 002EA124 38 00 00 00 */ li r0, 0 /* 802ED1E8 002EA128 90 1F 00 6C */ stw r0, 0x6c(r31) /* 802ED1EC 002EA12C 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -2184,7 +2184,7 @@ lbl_802ED270: /* 802ED270 002EA1B0 57 E0 10 3A */ slwi r0, r31, 2 /* 802ED274 002EA1B4 7C 7E 02 14 */ add r3, r30, r0 /* 802ED278 002EA1B8 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 802ED27C 002EA1BC 4B FE 1A C1 */ bl __dl +/* 802ED27C 002EA1BC 4B FE 1A C1 */ bl __dl__FPv /* 802ED280 002EA1C0 28 1F 00 00 */ cmplwi r31, 0 /* 802ED284 002EA1C4 40 82 00 1C */ bne lbl_802ED2A0 /* 802ED288 002EA1C8 80 1E 00 68 */ lwz r0, 0x68(r30) @@ -2227,7 +2227,7 @@ lbl_802ED2D8: /* 802ED314 002EA254 48 00 00 78 */ b lbl_802ED38C lbl_802ED318: /* 802ED318 002EA258 38 60 00 70 */ li r3, 0x70 -/* 802ED31C 002EA25C 4B FE 19 31 */ bl __nw +/* 802ED31C 002EA25C 4B FE 19 31 */ bl __nw__FUl /* 802ED320 002EA260 7C 7F 1B 79 */ or. r31, r3, r3 /* 802ED324 002EA264 41 82 00 14 */ beq lbl_802ED338 /* 802ED328 002EA268 7F C4 F3 78 */ mr r4, r30 @@ -2321,7 +2321,7 @@ lbl_802ED454: /* 802ED468 002EA3A8 28 03 00 00 */ cmplwi r3, 0 /* 802ED46C 002EA3AC 40 82 00 38 */ bne lbl_802ED4A4 /* 802ED470 002EA3B0 38 60 00 18 */ li r3, 0x18 -/* 802ED474 002EA3B4 4B FE 17 D9 */ bl __nw +/* 802ED474 002EA3B4 4B FE 17 D9 */ bl __nw__FUl /* 802ED478 002EA3B8 7C 7F 1B 79 */ or. r31, r3, r3 /* 802ED47C 002EA3BC 41 82 00 10 */ beq lbl_802ED48C /* 802ED480 002EA3C0 7F 64 DB 78 */ mr r4, r27 @@ -2349,7 +2349,7 @@ lbl_802ED4C8: /* 802ED4C8 002EA408 57 60 10 3A */ slwi r0, r27, 2 /* 802ED4CC 002EA40C 7F BA 02 14 */ add r29, r26, r0 /* 802ED4D0 002EA410 80 7D 00 6C */ lwz r3, 0x6c(r29) -/* 802ED4D4 002EA414 4B FE 18 69 */ bl __dl +/* 802ED4D4 002EA414 4B FE 18 69 */ bl __dl__FPv /* 802ED4D8 002EA418 38 00 00 00 */ li r0, 0 /* 802ED4DC 002EA41C 90 1D 00 6C */ stw r0, 0x6c(r29) lbl_802ED4E0: @@ -2735,7 +2735,7 @@ lbl_802EDA1C: lbl_802EDA3C: /* 802EDA3C 002EA97C 38 1F 00 9C */ addi r0, r31, 0x9c /* 802EDA40 002EA980 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EDA44 002EA984 4B FE 12 F9 */ bl __dl +/* 802EDA44 002EA984 4B FE 12 F9 */ bl __dl__FPv /* 802EDA48 002EA988 3B BD 00 01 */ addi r29, r29, 1 /* 802EDA4C 002EA98C 2C 1D 00 04 */ cmpwi r29, 4 /* 802EDA50 002EA990 3B FF 00 04 */ addi r31, r31, 4 @@ -2761,7 +2761,7 @@ lbl_802EDA98: /* 802EDA98 002EA9D8 7F 80 07 35 */ extsh. r0, r28 /* 802EDA9C 002EA9DC 40 81 00 0C */ ble lbl_802EDAA8 /* 802EDAA0 002EA9E0 7F 63 DB 78 */ mr r3, r27 -/* 802EDAA4 002EA9E4 4B FE 12 99 */ bl __dl +/* 802EDAA4 002EA9E4 4B FE 12 99 */ bl __dl__FPv lbl_802EDAA8: /* 802EDAA8 002EA9E8 7F 63 DB 78 */ mr r3, r27 /* 802EDAAC 002EA9EC 39 61 00 20 */ addi r11, r1, 0x20 @@ -2957,7 +2957,7 @@ lbl_802EDD6C: /* 802EDD78 002EACB8 28 00 00 00 */ cmplwi r0, 0 /* 802EDD7C 002EACBC 40 82 00 5C */ bne lbl_802EDDD8 /* 802EDD80 002EACC0 38 60 00 40 */ li r3, 0x40 -/* 802EDD84 002EACC4 4B FE 0E C9 */ bl __nw +/* 802EDD84 002EACC4 4B FE 0E C9 */ bl __nw__FUl /* 802EDD88 002EACC8 28 03 00 00 */ cmplwi r3, 0 /* 802EDD8C 002EACCC 41 82 00 1C */ beq lbl_802EDDA8 /* 802EDD90 002EACD0 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -3101,7 +3101,7 @@ lbl_802EDF60: /* 802EDF6C 002EAEAC 28 1F 00 00 */ cmplwi r31, 0 /* 802EDF70 002EAEB0 40 82 00 EC */ bne lbl_802EE05C /* 802EDF74 002EAEB4 38 60 00 40 */ li r3, 0x40 -/* 802EDF78 002EAEB8 4B FE 0C D5 */ bl __nw +/* 802EDF78 002EAEB8 4B FE 0C D5 */ bl __nw__FUl /* 802EDF7C 002EAEBC 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EDF80 002EAEC0 41 82 00 24 */ beq lbl_802EDFA4 /* 802EDF84 002EAEC4 38 00 00 00 */ li r0, 0 @@ -3462,7 +3462,7 @@ lbl_802EE468: /* 802EE47C 002EB3BC 28 1B 00 00 */ cmplwi r27, 0 /* 802EE480 002EB3C0 41 82 00 64 */ beq lbl_802EE4E4 /* 802EE484 002EB3C4 38 60 00 40 */ li r3, 0x40 -/* 802EE488 002EB3C8 4B FE 07 C5 */ bl __nw +/* 802EE488 002EB3C8 4B FE 07 C5 */ bl __nw__FUl /* 802EE48C 002EB3CC 7C 7E 1B 79 */ or. r30, r3, r3 /* 802EE490 002EB3D0 41 82 00 24 */ beq lbl_802EE4B4 /* 802EE494 002EB3D4 38 00 00 00 */ li r0, 0 @@ -3521,7 +3521,7 @@ lbl_802EE548: /* 802EE550 002EB490 28 1B 00 00 */ cmplwi r27, 0 /* 802EE554 002EB494 41 82 00 58 */ beq lbl_802EE5AC /* 802EE558 002EB498 38 60 00 40 */ li r3, 0x40 -/* 802EE55C 002EB49C 4B FE 06 F1 */ bl __nw +/* 802EE55C 002EB49C 4B FE 06 F1 */ bl __nw__FUl /* 802EE560 002EB4A0 7C 7C 1B 79 */ or. r28, r3, r3 /* 802EE564 002EB4A4 41 82 00 24 */ beq lbl_802EE588 /* 802EE568 002EB4A8 38 00 00 00 */ li r0, 0 @@ -3546,7 +3546,7 @@ lbl_802EE5A0: lbl_802EE5AC: /* 802EE5AC 002EB4EC 7F 79 EA 14 */ add r27, r25, r29 /* 802EE5B0 002EB4F0 80 7B 00 9C */ lwz r3, 0x9c(r27) -/* 802EE5B4 002EB4F4 4B FE 07 89 */ bl __dl +/* 802EE5B4 002EB4F4 4B FE 07 89 */ bl __dl__FPv /* 802EE5B8 002EB4F8 38 00 00 00 */ li r0, 0 /* 802EE5BC 002EB4FC 90 1B 00 9C */ stw r0, 0x9c(r27) /* 802EE5C0 002EB500 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -3593,7 +3593,7 @@ lbl_802EE648: /* 802EE658 002EB598 7C 00 F0 78 */ andc r0, r0, r30 /* 802EE65C 002EB59C 98 1B 00 B0 */ stb r0, 0xb0(r27) /* 802EE660 002EB5A0 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 802EE664 002EB5A4 4B FE 06 D9 */ bl __dl +/* 802EE664 002EB5A4 4B FE 06 D9 */ bl __dl__FPv /* 802EE668 002EB5A8 38 00 00 00 */ li r0, 0 /* 802EE66C 002EB5AC 90 1F 00 9C */ stw r0, 0x9c(r31) /* 802EE670 002EB5B0 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -3635,7 +3635,7 @@ lbl_802EE6F4: /* 802EE6F4 002EB634 57 E0 10 3A */ slwi r0, r31, 2 /* 802EE6F8 002EB638 7C 7E 02 14 */ add r3, r30, r0 /* 802EE6FC 002EB63C 80 63 00 9C */ lwz r3, 0x9c(r3) -/* 802EE700 002EB640 4B FE 06 3D */ bl __dl +/* 802EE700 002EB640 4B FE 06 3D */ bl __dl__FPv /* 802EE704 002EB644 57 E4 10 3A */ slwi r4, r31, 2 /* 802EE708 002EB648 57 E3 08 3C */ slwi r3, r31, 1 /* 802EE70C 002EB64C 20 1F 00 03 */ subfic r0, r31, 3 @@ -3688,7 +3688,7 @@ lbl_802EE780: /* 802EE7BC 002EB6FC 48 00 00 78 */ b lbl_802EE834 lbl_802EE7C0: /* 802EE7C0 002EB700 38 60 00 70 */ li r3, 0x70 -/* 802EE7C4 002EB704 4B FE 04 89 */ bl __nw +/* 802EE7C4 002EB704 4B FE 04 89 */ bl __nw__FUl /* 802EE7C8 002EB708 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EE7CC 002EB70C 41 82 00 14 */ beq lbl_802EE7E0 /* 802EE7D0 002EB710 7F C4 F3 78 */ mr r4, r30 @@ -3782,7 +3782,7 @@ lbl_802EE8FC: /* 802EE910 002EB850 28 03 00 00 */ cmplwi r3, 0 /* 802EE914 002EB854 40 82 00 38 */ bne lbl_802EE94C /* 802EE918 002EB858 38 60 00 18 */ li r3, 0x18 -/* 802EE91C 002EB85C 4B FE 03 31 */ bl __nw +/* 802EE91C 002EB85C 4B FE 03 31 */ bl __nw__FUl /* 802EE920 002EB860 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EE924 002EB864 41 82 00 10 */ beq lbl_802EE934 /* 802EE928 002EB868 7F 64 DB 78 */ mr r4, r27 @@ -3810,7 +3810,7 @@ lbl_802EE970: /* 802EE970 002EB8B0 57 60 10 3A */ slwi r0, r27, 2 /* 802EE974 002EB8B4 7F BA 02 14 */ add r29, r26, r0 /* 802EE978 002EB8B8 80 7D 00 9C */ lwz r3, 0x9c(r29) -/* 802EE97C 002EB8BC 4B FE 03 C1 */ bl __dl +/* 802EE97C 002EB8BC 4B FE 03 C1 */ bl __dl__FPv /* 802EE980 002EB8C0 38 00 00 00 */ li r0, 0 /* 802EE984 002EB8C4 90 1D 00 9C */ stw r0, 0x9c(r29) lbl_802EE988: @@ -4196,7 +4196,7 @@ lbl_802EEEC4: lbl_802EEEE4: /* 802EEEE4 002EBE24 38 1F 00 FC */ addi r0, r31, 0xfc /* 802EEEE8 002EBE28 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EEEEC 002EBE2C 4B FD FE 51 */ bl __dl +/* 802EEEEC 002EBE2C 4B FD FE 51 */ bl __dl__FPv /* 802EEEF0 002EBE30 3B BD 00 01 */ addi r29, r29, 1 /* 802EEEF4 002EBE34 2C 1D 00 08 */ cmpwi r29, 8 /* 802EEEF8 002EBE38 3B FF 00 04 */ addi r31, r31, 4 @@ -4222,7 +4222,7 @@ lbl_802EEF40: /* 802EEF40 002EBE80 7F 80 07 35 */ extsh. r0, r28 /* 802EEF44 002EBE84 40 81 00 0C */ ble lbl_802EEF50 /* 802EEF48 002EBE88 7F 63 DB 78 */ mr r3, r27 -/* 802EEF4C 002EBE8C 4B FD FD F1 */ bl __dl +/* 802EEF4C 002EBE8C 4B FD FD F1 */ bl __dl__FPv lbl_802EEF50: /* 802EEF50 002EBE90 7F 63 DB 78 */ mr r3, r27 /* 802EEF54 002EBE94 39 61 00 20 */ addi r11, r1, 0x20 @@ -4419,7 +4419,7 @@ lbl_802EF218: /* 802EF224 002EC164 28 00 00 00 */ cmplwi r0, 0 /* 802EF228 002EC168 40 82 00 5C */ bne lbl_802EF284 /* 802EF22C 002EC16C 38 60 00 40 */ li r3, 0x40 -/* 802EF230 002EC170 4B FD FA 1D */ bl __nw +/* 802EF230 002EC170 4B FD FA 1D */ bl __nw__FUl /* 802EF234 002EC174 28 03 00 00 */ cmplwi r3, 0 /* 802EF238 002EC178 41 82 00 1C */ beq lbl_802EF254 /* 802EF23C 002EC17C 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -4563,7 +4563,7 @@ lbl_802EF40C: /* 802EF418 002EC358 28 1F 00 00 */ cmplwi r31, 0 /* 802EF41C 002EC35C 40 82 00 EC */ bne lbl_802EF508 /* 802EF420 002EC360 38 60 00 40 */ li r3, 0x40 -/* 802EF424 002EC364 4B FD F8 29 */ bl __nw +/* 802EF424 002EC364 4B FD F8 29 */ bl __nw__FUl /* 802EF428 002EC368 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EF42C 002EC36C 41 82 00 24 */ beq lbl_802EF450 /* 802EF430 002EC370 38 00 00 00 */ li r0, 0 @@ -4923,7 +4923,7 @@ lbl_802EF910: /* 802EF924 002EC864 28 1B 00 00 */ cmplwi r27, 0 /* 802EF928 002EC868 41 82 00 64 */ beq lbl_802EF98C /* 802EF92C 002EC86C 38 60 00 40 */ li r3, 0x40 -/* 802EF930 002EC870 4B FD F3 1D */ bl __nw +/* 802EF930 002EC870 4B FD F3 1D */ bl __nw__FUl /* 802EF934 002EC874 7C 7E 1B 79 */ or. r30, r3, r3 /* 802EF938 002EC878 41 82 00 24 */ beq lbl_802EF95C /* 802EF93C 002EC87C 38 00 00 00 */ li r0, 0 @@ -4982,7 +4982,7 @@ lbl_802EF9F0: /* 802EF9F8 002EC938 28 1B 00 00 */ cmplwi r27, 0 /* 802EF9FC 002EC93C 41 82 00 58 */ beq lbl_802EFA54 /* 802EFA00 002EC940 38 60 00 40 */ li r3, 0x40 -/* 802EFA04 002EC944 4B FD F2 49 */ bl __nw +/* 802EFA04 002EC944 4B FD F2 49 */ bl __nw__FUl /* 802EFA08 002EC948 7C 7C 1B 79 */ or. r28, r3, r3 /* 802EFA0C 002EC94C 41 82 00 24 */ beq lbl_802EFA30 /* 802EFA10 002EC950 38 00 00 00 */ li r0, 0 @@ -5007,7 +5007,7 @@ lbl_802EFA48: lbl_802EFA54: /* 802EFA54 002EC994 7F 79 EA 14 */ add r27, r25, r29 /* 802EFA58 002EC998 80 7B 00 FC */ lwz r3, 0xfc(r27) -/* 802EFA5C 002EC99C 4B FD F2 E1 */ bl __dl +/* 802EFA5C 002EC99C 4B FD F2 E1 */ bl __dl__FPv /* 802EFA60 002EC9A0 38 00 00 00 */ li r0, 0 /* 802EFA64 002EC9A4 90 1B 00 FC */ stw r0, 0xfc(r27) /* 802EFA68 002EC9A8 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -5054,7 +5054,7 @@ lbl_802EFAF0: /* 802EFB00 002ECA40 7C 00 F0 78 */ andc r0, r0, r30 /* 802EFB04 002ECA44 98 1B 01 20 */ stb r0, 0x120(r27) /* 802EFB08 002ECA48 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 802EFB0C 002ECA4C 4B FD F2 31 */ bl __dl +/* 802EFB0C 002ECA4C 4B FD F2 31 */ bl __dl__FPv /* 802EFB10 002ECA50 38 00 00 00 */ li r0, 0 /* 802EFB14 002ECA54 90 1F 00 FC */ stw r0, 0xfc(r31) /* 802EFB18 002ECA58 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -5096,7 +5096,7 @@ lbl_802EFB9C: /* 802EFB9C 002ECADC 57 E0 10 3A */ slwi r0, r31, 2 /* 802EFBA0 002ECAE0 7C 7E 02 14 */ add r3, r30, r0 /* 802EFBA4 002ECAE4 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 802EFBA8 002ECAE8 4B FD F1 95 */ bl __dl +/* 802EFBA8 002ECAE8 4B FD F1 95 */ bl __dl__FPv /* 802EFBAC 002ECAEC 57 E4 10 3A */ slwi r4, r31, 2 /* 802EFBB0 002ECAF0 57 E3 08 3C */ slwi r3, r31, 1 /* 802EFBB4 002ECAF4 20 1F 00 07 */ subfic r0, r31, 7 @@ -5149,7 +5149,7 @@ lbl_802EFC28: /* 802EFC64 002ECBA4 48 00 00 70 */ b lbl_802EFCD4 lbl_802EFC68: /* 802EFC68 002ECBA8 38 60 00 70 */ li r3, 0x70 -/* 802EFC6C 002ECBAC 4B FD EF E1 */ bl __nw +/* 802EFC6C 002ECBAC 4B FD EF E1 */ bl __nw__FUl /* 802EFC70 002ECBB0 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EFC74 002ECBB4 41 82 00 14 */ beq lbl_802EFC88 /* 802EFC78 002ECBB8 7F C4 F3 78 */ mr r4, r30 @@ -5240,7 +5240,7 @@ lbl_802EFD98: /* 802EFDAC 002ECCEC 28 03 00 00 */ cmplwi r3, 0 /* 802EFDB0 002ECCF0 40 82 00 38 */ bne lbl_802EFDE8 /* 802EFDB4 002ECCF4 38 60 00 18 */ li r3, 0x18 -/* 802EFDB8 002ECCF8 4B FD EE 95 */ bl __nw +/* 802EFDB8 002ECCF8 4B FD EE 95 */ bl __nw__FUl /* 802EFDBC 002ECCFC 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EFDC0 002ECD00 41 82 00 10 */ beq lbl_802EFDD0 /* 802EFDC4 002ECD04 7F 64 DB 78 */ mr r4, r27 @@ -5268,7 +5268,7 @@ lbl_802EFE0C: /* 802EFE0C 002ECD4C 57 60 10 3A */ slwi r0, r27, 2 /* 802EFE10 002ECD50 7F BA 02 14 */ add r29, r26, r0 /* 802EFE14 002ECD54 80 7D 00 FC */ lwz r3, 0xfc(r29) -/* 802EFE18 002ECD58 4B FD EF 25 */ bl __dl +/* 802EFE18 002ECD58 4B FD EF 25 */ bl __dl__FPv /* 802EFE1C 002ECD5C 38 00 00 00 */ li r0, 0 /* 802EFE20 002ECD60 90 1D 00 FC */ stw r0, 0xfc(r29) lbl_802EFE24: @@ -5646,7 +5646,7 @@ lbl_802F0344: lbl_802F0364: /* 802F0364 002ED2A4 38 1F 01 8C */ addi r0, r31, 0x18c /* 802F0368 002ED2A8 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802F036C 002ED2AC 4B FD E9 D1 */ bl __dl +/* 802F036C 002ED2AC 4B FD E9 D1 */ bl __dl__FPv /* 802F0370 002ED2B0 3B BD 00 01 */ addi r29, r29, 1 /* 802F0374 002ED2B4 2C 1D 00 08 */ cmpwi r29, 8 /* 802F0378 002ED2B8 3B FF 00 04 */ addi r31, r31, 4 @@ -5672,7 +5672,7 @@ lbl_802F03C0: /* 802F03C0 002ED300 7F 80 07 35 */ extsh. r0, r28 /* 802F03C4 002ED304 40 81 00 0C */ ble lbl_802F03D0 /* 802F03C8 002ED308 7F 63 DB 78 */ mr r3, r27 -/* 802F03CC 002ED30C 4B FD E9 71 */ bl __dl +/* 802F03CC 002ED30C 4B FD E9 71 */ bl __dl__FPv lbl_802F03D0: /* 802F03D0 002ED310 7F 63 DB 78 */ mr r3, r27 /* 802F03D4 002ED314 39 61 00 20 */ addi r11, r1, 0x20 @@ -5869,7 +5869,7 @@ lbl_802F0698: /* 802F06A4 002ED5E4 28 00 00 00 */ cmplwi r0, 0 /* 802F06A8 002ED5E8 40 82 00 5C */ bne lbl_802F0704 /* 802F06AC 002ED5EC 38 60 00 40 */ li r3, 0x40 -/* 802F06B0 002ED5F0 4B FD E5 9D */ bl __nw +/* 802F06B0 002ED5F0 4B FD E5 9D */ bl __nw__FUl /* 802F06B4 002ED5F4 28 03 00 00 */ cmplwi r3, 0 /* 802F06B8 002ED5F8 41 82 00 1C */ beq lbl_802F06D4 /* 802F06BC 002ED5FC 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -6013,7 +6013,7 @@ lbl_802F088C: /* 802F0898 002ED7D8 28 1F 00 00 */ cmplwi r31, 0 /* 802F089C 002ED7DC 40 82 00 EC */ bne lbl_802F0988 /* 802F08A0 002ED7E0 38 60 00 40 */ li r3, 0x40 -/* 802F08A4 002ED7E4 4B FD E3 A9 */ bl __nw +/* 802F08A4 002ED7E4 4B FD E3 A9 */ bl __nw__FUl /* 802F08A8 002ED7E8 7C 7F 1B 79 */ or. r31, r3, r3 /* 802F08AC 002ED7EC 41 82 00 24 */ beq lbl_802F08D0 /* 802F08B0 002ED7F0 38 00 00 00 */ li r0, 0 @@ -6373,7 +6373,7 @@ lbl_802F0D90: /* 802F0DA4 002EDCE4 28 1B 00 00 */ cmplwi r27, 0 /* 802F0DA8 002EDCE8 41 82 00 64 */ beq lbl_802F0E0C /* 802F0DAC 002EDCEC 38 60 00 40 */ li r3, 0x40 -/* 802F0DB0 002EDCF0 4B FD DE 9D */ bl __nw +/* 802F0DB0 002EDCF0 4B FD DE 9D */ bl __nw__FUl /* 802F0DB4 002EDCF4 7C 7E 1B 79 */ or. r30, r3, r3 /* 802F0DB8 002EDCF8 41 82 00 24 */ beq lbl_802F0DDC /* 802F0DBC 002EDCFC 38 00 00 00 */ li r0, 0 @@ -6432,7 +6432,7 @@ lbl_802F0E70: /* 802F0E78 002EDDB8 28 1B 00 00 */ cmplwi r27, 0 /* 802F0E7C 002EDDBC 41 82 00 58 */ beq lbl_802F0ED4 /* 802F0E80 002EDDC0 38 60 00 40 */ li r3, 0x40 -/* 802F0E84 002EDDC4 4B FD DD C9 */ bl __nw +/* 802F0E84 002EDDC4 4B FD DD C9 */ bl __nw__FUl /* 802F0E88 002EDDC8 7C 7C 1B 79 */ or. r28, r3, r3 /* 802F0E8C 002EDDCC 41 82 00 24 */ beq lbl_802F0EB0 /* 802F0E90 002EDDD0 38 00 00 00 */ li r0, 0 @@ -6457,7 +6457,7 @@ lbl_802F0EC8: lbl_802F0ED4: /* 802F0ED4 002EDE14 7F 79 EA 14 */ add r27, r25, r29 /* 802F0ED8 002EDE18 80 7B 01 8C */ lwz r3, 0x18c(r27) -/* 802F0EDC 002EDE1C 4B FD DE 61 */ bl __dl +/* 802F0EDC 002EDE1C 4B FD DE 61 */ bl __dl__FPv /* 802F0EE0 002EDE20 38 00 00 00 */ li r0, 0 /* 802F0EE4 002EDE24 90 1B 01 8C */ stw r0, 0x18c(r27) /* 802F0EE8 002EDE28 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -6504,7 +6504,7 @@ lbl_802F0F70: /* 802F0F80 002EDEC0 7C 00 F0 78 */ andc r0, r0, r30 /* 802F0F84 002EDEC4 98 1B 01 B0 */ stb r0, 0x1b0(r27) /* 802F0F88 002EDEC8 80 7F 01 8C */ lwz r3, 0x18c(r31) -/* 802F0F8C 002EDECC 4B FD DD B1 */ bl __dl +/* 802F0F8C 002EDECC 4B FD DD B1 */ bl __dl__FPv /* 802F0F90 002EDED0 38 00 00 00 */ li r0, 0 /* 802F0F94 002EDED4 90 1F 01 8C */ stw r0, 0x18c(r31) /* 802F0F98 002EDED8 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -6546,7 +6546,7 @@ lbl_802F101C: /* 802F101C 002EDF5C 57 E0 10 3A */ slwi r0, r31, 2 /* 802F1020 002EDF60 7C 7E 02 14 */ add r3, r30, r0 /* 802F1024 002EDF64 80 63 01 8C */ lwz r3, 0x18c(r3) -/* 802F1028 002EDF68 4B FD DD 15 */ bl __dl +/* 802F1028 002EDF68 4B FD DD 15 */ bl __dl__FPv /* 802F102C 002EDF6C 57 E4 10 3A */ slwi r4, r31, 2 /* 802F1030 002EDF70 57 E3 08 3C */ slwi r3, r31, 1 /* 802F1034 002EDF74 20 1F 00 07 */ subfic r0, r31, 7 @@ -6599,7 +6599,7 @@ lbl_802F10A8: /* 802F10E4 002EE024 48 00 00 70 */ b lbl_802F1154 lbl_802F10E8: /* 802F10E8 002EE028 38 60 00 70 */ li r3, 0x70 -/* 802F10EC 002EE02C 4B FD DB 61 */ bl __nw +/* 802F10EC 002EE02C 4B FD DB 61 */ bl __nw__FUl /* 802F10F0 002EE030 7C 7F 1B 79 */ or. r31, r3, r3 /* 802F10F4 002EE034 41 82 00 14 */ beq lbl_802F1108 /* 802F10F8 002EE038 7F C4 F3 78 */ mr r4, r30 @@ -6690,7 +6690,7 @@ lbl_802F1218: /* 802F122C 002EE16C 28 03 00 00 */ cmplwi r3, 0 /* 802F1230 002EE170 40 82 00 38 */ bne lbl_802F1268 /* 802F1234 002EE174 38 60 00 18 */ li r3, 0x18 -/* 802F1238 002EE178 4B FD DA 15 */ bl __nw +/* 802F1238 002EE178 4B FD DA 15 */ bl __nw__FUl /* 802F123C 002EE17C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802F1240 002EE180 41 82 00 10 */ beq lbl_802F1250 /* 802F1244 002EE184 7F 64 DB 78 */ mr r4, r27 @@ -6718,7 +6718,7 @@ lbl_802F128C: /* 802F128C 002EE1CC 57 60 10 3A */ slwi r0, r27, 2 /* 802F1290 002EE1D0 7F BA 02 14 */ add r29, r26, r0 /* 802F1294 002EE1D4 80 7D 01 8C */ lwz r3, 0x18c(r29) -/* 802F1298 002EE1D8 4B FD DA A5 */ bl __dl +/* 802F1298 002EE1D8 4B FD DA A5 */ bl __dl__FPv /* 802F129C 002EE1DC 38 00 00 00 */ li r0, 0 /* 802F12A0 002EE1E0 90 1D 01 8C */ stw r0, 0x18c(r29) lbl_802F12A4: @@ -7445,7 +7445,7 @@ lbl_802F1CEC: /* 802F1CEC 002EEC2C 7F E0 07 35 */ extsh. r0, r31 /* 802F1CF0 002EEC30 40 81 00 0C */ ble lbl_802F1CFC /* 802F1CF4 002EEC34 7F C3 F3 78 */ mr r3, r30 -/* 802F1CF8 002EEC38 4B FD D0 45 */ bl __dl +/* 802F1CF8 002EEC38 4B FD D0 45 */ bl __dl__FPv lbl_802F1CFC: /* 802F1CFC 002EEC3C 7F C3 F3 78 */ mr r3, r30 /* 802F1D00 002EEC40 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DMaterial.s b/asm/J2DGraph/J2DMaterial.s index 91b4d67c83..19d613b928 100644 --- a/asm/J2DGraph/J2DMaterial.s +++ b/asm/J2DGraph/J2DMaterial.s @@ -115,7 +115,7 @@ lbl_802EA318: /* 802EA334 002E7274 4E 80 04 21 */ bctrl lbl_802EA338: /* 802EA338 002E7278 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 802EA33C 002E727C 4B FE 4A 01 */ bl __dl +/* 802EA33C 002E727C 4B FE 4A 01 */ bl __dl__FPv /* 802EA340 002E7280 38 7E 00 28 */ addi r3, r30, 0x28 /* 802EA344 002E7284 38 80 FF FF */ li r4, -1 /* 802EA348 002E7288 48 00 12 D9 */ bl J2DTexGenBlock_NS_dtor @@ -128,7 +128,7 @@ lbl_802EA360: /* 802EA360 002E72A0 7F E0 07 35 */ extsh. r0, r31 /* 802EA364 002E72A4 40 81 00 0C */ ble lbl_802EA370 /* 802EA368 002E72A8 7F C3 F3 78 */ mr r3, r30 -/* 802EA36C 002E72AC 4B FE 49 D1 */ bl __dl +/* 802EA36C 002E72AC 4B FE 49 D1 */ bl __dl__FPv lbl_802EA370: /* 802EA370 002E72B0 7F C3 F3 78 */ mr r3, r30 /* 802EA374 002E72B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -187,7 +187,7 @@ J2DMaterial_NS_createTevBlock: /* 802EA424 002E7364 2C 03 00 01 */ cmpwi r3, 1 /* 802EA428 002E7368 41 81 00 24 */ bgt lbl_802EA44C /* 802EA42C 002E736C 38 60 00 60 */ li r3, 0x60 -/* 802EA430 002E7370 4B FE 48 1D */ bl __nw +/* 802EA430 002E7370 4B FE 48 1D */ bl __nw__FUl /* 802EA434 002E7374 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA438 002E7378 41 82 00 0C */ beq lbl_802EA444 /* 802EA43C 002E737C 48 00 14 51 */ bl J2DTevBlock1 @@ -199,7 +199,7 @@ lbl_802EA44C: /* 802EA44C 002E738C 2C 03 00 02 */ cmpwi r3, 2 /* 802EA450 002E7390 40 82 00 24 */ bne lbl_802EA474 /* 802EA454 002E7394 38 60 00 7C */ li r3, 0x7c -/* 802EA458 002E7398 4B FE 47 F5 */ bl __nw +/* 802EA458 002E7398 4B FE 47 F5 */ bl __nw__FUl /* 802EA45C 002E739C 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA460 002E73A0 41 82 00 0C */ beq lbl_802EA46C /* 802EA464 002E73A4 48 00 21 55 */ bl J2DTevBlock2 @@ -211,7 +211,7 @@ lbl_802EA474: /* 802EA474 002E73B4 2C 03 00 04 */ cmpwi r3, 4 /* 802EA478 002E73B8 41 81 00 24 */ bgt lbl_802EA49C /* 802EA47C 002E73BC 38 60 00 B4 */ li r3, 0xb4 -/* 802EA480 002E73C0 4B FE 47 CD */ bl __nw +/* 802EA480 002E73C0 4B FE 47 CD */ bl __nw__FUl /* 802EA484 002E73C4 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA488 002E73C8 41 82 00 0C */ beq lbl_802EA494 /* 802EA48C 002E73CC 48 00 34 31 */ bl J2DTevBlock4 @@ -223,7 +223,7 @@ lbl_802EA49C: /* 802EA49C 002E73DC 2C 03 00 08 */ cmpwi r3, 8 /* 802EA4A0 002E73E0 41 81 00 24 */ bgt lbl_802EA4C4 /* 802EA4A4 002E73E4 38 60 01 24 */ li r3, 0x124 -/* 802EA4A8 002E73E8 4B FE 47 A5 */ bl __nw +/* 802EA4A8 002E73E8 4B FE 47 A5 */ bl __nw__FUl /* 802EA4AC 002E73EC 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4B0 002E73F0 41 82 00 0C */ beq lbl_802EA4BC /* 802EA4B4 002E73F4 48 00 48 B1 */ bl J2DTevBlock8 @@ -233,7 +233,7 @@ lbl_802EA4BC: /* 802EA4C0 002E7400 48 00 00 F4 */ b lbl_802EA5B4 lbl_802EA4C4: /* 802EA4C4 002E7404 38 60 01 B4 */ li r3, 0x1b4 -/* 802EA4C8 002E7408 4B FE 47 85 */ bl __nw +/* 802EA4C8 002E7408 4B FE 47 85 */ bl __nw__FUl /* 802EA4CC 002E740C 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4D0 002E7410 41 82 00 0C */ beq lbl_802EA4DC /* 802EA4D4 002E7414 48 00 5D 11 */ bl J2DTevBlock16 @@ -246,7 +246,7 @@ lbl_802EA4E4: /* 802EA4E8 002E7428 41 81 00 28 */ bgt lbl_802EA510 /* 802EA4EC 002E742C 38 60 00 60 */ li r3, 0x60 /* 802EA4F0 002E7430 38 80 FF FC */ li r4, -4 -/* 802EA4F4 002E7434 4B FE 47 81 */ bl __nw_X1_ +/* 802EA4F4 002E7434 4B FE 47 81 */ bl __nw__FUli /* 802EA4F8 002E7438 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4FC 002E743C 41 82 00 0C */ beq lbl_802EA508 /* 802EA500 002E7440 48 00 13 8D */ bl J2DTevBlock1 @@ -259,7 +259,7 @@ lbl_802EA510: /* 802EA514 002E7454 40 82 00 28 */ bne lbl_802EA53C /* 802EA518 002E7458 38 60 00 7C */ li r3, 0x7c /* 802EA51C 002E745C 38 80 FF FC */ li r4, -4 -/* 802EA520 002E7460 4B FE 47 55 */ bl __nw_X1_ +/* 802EA520 002E7460 4B FE 47 55 */ bl __nw__FUli /* 802EA524 002E7464 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA528 002E7468 41 82 00 0C */ beq lbl_802EA534 /* 802EA52C 002E746C 48 00 20 8D */ bl J2DTevBlock2 @@ -272,7 +272,7 @@ lbl_802EA53C: /* 802EA540 002E7480 41 81 00 28 */ bgt lbl_802EA568 /* 802EA544 002E7484 38 60 00 B4 */ li r3, 0xb4 /* 802EA548 002E7488 38 80 FF FC */ li r4, -4 -/* 802EA54C 002E748C 4B FE 47 29 */ bl __nw_X1_ +/* 802EA54C 002E748C 4B FE 47 29 */ bl __nw__FUli /* 802EA550 002E7490 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA554 002E7494 41 82 00 0C */ beq lbl_802EA560 /* 802EA558 002E7498 48 00 33 65 */ bl J2DTevBlock4 @@ -285,7 +285,7 @@ lbl_802EA568: /* 802EA56C 002E74AC 41 81 00 28 */ bgt lbl_802EA594 /* 802EA570 002E74B0 38 60 01 24 */ li r3, 0x124 /* 802EA574 002E74B4 38 80 FF FC */ li r4, -4 -/* 802EA578 002E74B8 4B FE 46 FD */ bl __nw_X1_ +/* 802EA578 002E74B8 4B FE 46 FD */ bl __nw__FUli /* 802EA57C 002E74BC 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA580 002E74C0 41 82 00 0C */ beq lbl_802EA58C /* 802EA584 002E74C4 48 00 47 E1 */ bl J2DTevBlock8 @@ -296,7 +296,7 @@ lbl_802EA58C: lbl_802EA594: /* 802EA594 002E74D4 38 60 01 B4 */ li r3, 0x1b4 /* 802EA598 002E74D8 38 80 FF FC */ li r4, -4 -/* 802EA59C 002E74DC 4B FE 46 D9 */ bl __nw_X1_ +/* 802EA59C 002E74DC 4B FE 46 D9 */ bl __nw__FUli /* 802EA5A0 002E74E0 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA5A4 002E74E4 41 82 00 0C */ beq lbl_802EA5B0 /* 802EA5A8 002E74E8 48 00 5C 3D */ bl J2DTevBlock16 @@ -320,7 +320,7 @@ J2DMaterial_NS_createIndBlock: /* 802EA5DC 002E751C 2C 03 00 00 */ cmpwi r3, 0 /* 802EA5E0 002E7520 41 82 00 A4 */ beq lbl_802EA684 /* 802EA5E4 002E7524 38 60 00 6C */ li r3, 0x6c -/* 802EA5E8 002E7528 4B FE 46 65 */ bl __nw +/* 802EA5E8 002E7528 4B FE 46 65 */ bl __nw__FUl /* 802EA5EC 002E752C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EA5F0 002E7530 41 82 00 8C */ beq lbl_802EA67C /* 802EA5F4 002E7534 3C 60 80 3D */ lis r3, lbl_803CCA40@ha @@ -372,7 +372,7 @@ lbl_802EA67C: /* 802EA680 002E75C0 48 00 01 08 */ b lbl_802EA788 lbl_802EA684: /* 802EA684 002E75C4 38 60 00 04 */ li r3, 4 -/* 802EA688 002E75C8 4B FE 45 C5 */ bl __nw +/* 802EA688 002E75C8 4B FE 45 C5 */ bl __nw__FUl /* 802EA68C 002E75CC 28 03 00 00 */ cmplwi r3, 0 /* 802EA690 002E75D0 41 82 00 F8 */ beq lbl_802EA788 /* 802EA694 002E75D4 3C 80 80 3D */ lis r4, lbl_803CCA40@ha @@ -387,7 +387,7 @@ lbl_802EA6B0: /* 802EA6B4 002E75F4 41 82 00 A8 */ beq lbl_802EA75C /* 802EA6B8 002E75F8 38 60 00 6C */ li r3, 0x6c /* 802EA6BC 002E75FC 38 80 FF FC */ li r4, -4 -/* 802EA6C0 002E7600 4B FE 45 B5 */ bl __nw_X1_ +/* 802EA6C0 002E7600 4B FE 45 B5 */ bl __nw__FUli /* 802EA6C4 002E7604 7C 7F 1B 79 */ or. r31, r3, r3 /* 802EA6C8 002E7608 41 82 00 8C */ beq lbl_802EA754 /* 802EA6CC 002E760C 3C 60 80 3D */ lis r3, lbl_803CCA40@ha @@ -440,7 +440,7 @@ lbl_802EA754: lbl_802EA75C: /* 802EA75C 002E769C 38 60 00 04 */ li r3, 4 /* 802EA760 002E76A0 38 80 FF FC */ li r4, -4 -/* 802EA764 002E76A4 4B FE 45 11 */ bl __nw_X1_ +/* 802EA764 002E76A4 4B FE 45 11 */ bl __nw__FUli /* 802EA768 002E76A8 28 03 00 00 */ cmplwi r3, 0 /* 802EA76C 002E76AC 41 82 00 1C */ beq lbl_802EA788 /* 802EA770 002E76B0 3C 80 80 3D */ lis r4, lbl_803CCA40@ha @@ -518,7 +518,7 @@ J2DMaterial_NS_makeAnmPointer: /* 802EA864 002E77A4 28 00 00 00 */ cmplwi r0, 0 /* 802EA868 002E77A8 40 82 00 20 */ bne lbl_802EA888 /* 802EA86C 002E77AC 38 60 00 44 */ li r3, 0x44 -/* 802EA870 002E77B0 4B FE 43 DD */ bl __nw +/* 802EA870 002E77B0 4B FE 43 DD */ bl __nw__FUl /* 802EA874 002E77B4 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA878 002E77B8 41 82 00 0C */ beq lbl_802EA884 /* 802EA87C 002E77BC 4B FF FF 21 */ bl J2DMaterial_NS_J2DMaterialAnmPointer @@ -1137,7 +1137,7 @@ lbl_802EB0B4: /* 802EB114 002E8054 90 1F 00 14 */ stw r0, 0x14(r31) /* 802EB118 002E8058 7C 80 07 35 */ extsh. r0, r4 /* 802EB11C 002E805C 40 81 00 08 */ ble lbl_802EB124 -/* 802EB120 002E8060 4B FE 3C 1D */ bl __dl +/* 802EB120 002E8060 4B FE 3C 1D */ bl __dl__FPv lbl_802EB124: /* 802EB124 002E8064 7F E3 FB 78 */ mr r3, r31 /* 802EB128 002E8068 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1156,7 +1156,7 @@ lbl_802EB124: /* 802EB15C 002E809C 90 1F 00 00 */ stw r0, 0(r31) /* 802EB160 002E80A0 7C 80 07 35 */ extsh. r0, r4 /* 802EB164 002E80A4 40 81 00 08 */ ble lbl_802EB16C -/* 802EB168 002E80A8 4B FE 3B D5 */ bl __dl +/* 802EB168 002E80A8 4B FE 3B D5 */ bl __dl__FPv lbl_802EB16C: /* 802EB16C 002E80AC 7F E3 FB 78 */ mr r3, r31 /* 802EB170 002E80B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1175,7 +1175,7 @@ lbl_802EB16C: /* 802EB1A4 002E80E4 90 1F 00 00 */ stw r0, 0(r31) /* 802EB1A8 002E80E8 7C 80 07 35 */ extsh. r0, r4 /* 802EB1AC 002E80EC 40 81 00 08 */ ble lbl_802EB1B4 -/* 802EB1B0 002E80F0 4B FE 3B 8D */ bl __dl +/* 802EB1B0 002E80F0 4B FE 3B 8D */ bl __dl__FPv lbl_802EB1B4: /* 802EB1B4 002E80F4 7F E3 FB 78 */ mr r3, r31 /* 802EB1B8 002E80F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1209,7 +1209,7 @@ lbl_802EB224: /* 802EB224 002E8164 7C 80 07 35 */ extsh. r0, r4 /* 802EB228 002E8168 40 81 00 0C */ ble lbl_802EB234 /* 802EB22C 002E816C 7F E3 FB 78 */ mr r3, r31 -/* 802EB230 002E8170 4B FE 3B 0D */ bl __dl +/* 802EB230 002E8170 4B FE 3B 0D */ bl __dl__FPv lbl_802EB234: /* 802EB234 002E8174 7F E3 FB 78 */ mr r3, r31 /* 802EB238 002E8178 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1248,7 +1248,7 @@ J2DIndTexCoordScale_NS_dtor: /* 802EB2A4 002E81E4 41 82 00 10 */ beq lbl_802EB2B4 /* 802EB2A8 002E81E8 7C 80 07 35 */ extsh. r0, r4 /* 802EB2AC 002E81EC 40 81 00 08 */ ble lbl_802EB2B4 -/* 802EB2B0 002E81F0 4B FE 3A 8D */ bl __dl +/* 802EB2B0 002E81F0 4B FE 3A 8D */ bl __dl__FPv lbl_802EB2B4: /* 802EB2B4 002E81F4 7F E3 FB 78 */ mr r3, r31 /* 802EB2B8 002E81F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1274,7 +1274,7 @@ J2DIndTexMtx_NS_dtor: /* 802EB2F8 002E8238 41 82 00 10 */ beq lbl_802EB308 /* 802EB2FC 002E823C 7C 80 07 35 */ extsh. r0, r4 /* 802EB300 002E8240 40 81 00 08 */ ble lbl_802EB308 -/* 802EB304 002E8244 4B FE 3A 39 */ bl __dl +/* 802EB304 002E8244 4B FE 3A 39 */ bl __dl__FPv lbl_802EB308: /* 802EB308 002E8248 7F E3 FB 78 */ mr r3, r31 /* 802EB30C 002E824C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s index 0a937fd1f6..6ab626b29a 100644 --- a/asm/J2DGraph/J2DMaterialFactory.s +++ b/asm/J2DGraph/J2DMaterialFactory.s @@ -946,7 +946,7 @@ J2DMaterialFactory_NS_newTexMtx: /* 802F3844 002F0784 28 00 FF FF */ cmplwi r0, 0xffff /* 802F3848 002F0788 41 82 00 7C */ beq lbl_802F38C4 /* 802F384C 002F078C 38 60 00 54 */ li r3, 0x54 -/* 802F3850 002F0790 4B FD B3 FD */ bl __nw +/* 802F3850 002F0790 4B FD B3 FD */ bl __nw__FUl /* 802F3854 002F0794 28 03 00 00 */ cmplwi r3, 0 /* 802F3858 002F0798 41 82 00 64 */ beq lbl_802F38BC /* 802F385C 002F079C 80 9D 00 24 */ lwz r4, 0x24(r29) diff --git a/asm/J2DGraph/J2DPane.s b/asm/J2DGraph/J2DPane.s index cdd9c7518d..ab14727974 100644 --- a/asm/J2DGraph/J2DPane.s +++ b/asm/J2DGraph/J2DPane.s @@ -16,10 +16,10 @@ J2DPane: /* 802F5C18 002F2B58 90 1E 00 00 */ stw r0, 0(r30) /* 802F5C1C 002F2B5C 3B FE 00 DC */ addi r31, r30, 0xdc /* 802F5C20 002F2B60 7F E3 FB 78 */ mr r3, r31 -/* 802F5C24 002F2B64 4B FE 62 F1 */ bl JSUPtrList_NS_initiate +/* 802F5C24 002F2B64 4B FE 62 F1 */ bl initiate__10JSUPtrListFv /* 802F5C28 002F2B68 38 7F 00 0C */ addi r3, r31, 0xc /* 802F5C2C 002F2B6C 7F C4 F3 78 */ mr r4, r30 -/* 802F5C30 002F2B70 4B FE 61 CD */ bl JSUPtrLink +/* 802F5C30 002F2B70 4B FE 61 CD */ bl __ct__10JSUPtrLinkFPv /* 802F5C34 002F2B74 38 80 00 00 */ li r4, 0 /* 802F5C38 002F2B78 90 9E 00 F8 */ stw r4, 0xf8(r30) /* 802F5C3C 002F2B7C 3C 60 50 41 */ lis r3, 0x50414E31@ha @@ -109,10 +109,10 @@ J2DPane_X1_: /* 802F5D74 002F2CB4 90 19 00 00 */ stw r0, 0(r25) /* 802F5D78 002F2CB8 3B 59 00 DC */ addi r26, r25, 0xdc /* 802F5D7C 002F2CBC 7F 43 D3 78 */ mr r3, r26 -/* 802F5D80 002F2CC0 4B FE 61 95 */ bl JSUPtrList_NS_initiate +/* 802F5D80 002F2CC0 4B FE 61 95 */ bl initiate__10JSUPtrListFv /* 802F5D84 002F2CC4 38 7A 00 0C */ addi r3, r26, 0xc /* 802F5D88 002F2CC8 7F 24 CB 78 */ mr r4, r25 -/* 802F5D8C 002F2CCC 4B FE 60 71 */ bl JSUPtrLink +/* 802F5D8C 002F2CCC 4B FE 60 71 */ bl __ct__10JSUPtrLinkFPv /* 802F5D90 002F2CD0 38 00 00 00 */ li r0, 0 /* 802F5D94 002F2CD4 90 19 00 F8 */ stw r0, 0xf8(r25) /* 802F5D98 002F2CD8 7F 23 CB 78 */ mr r3, r25 @@ -162,7 +162,7 @@ J2DPane_NS_initialize: /* 802F5E3C 002F2D7C 38 84 00 0C */ addi r4, r4, 0xc lbl_802F5E40: /* 802F5E40 002F2D80 38 7F 00 DC */ addi r3, r31, 0xdc -/* 802F5E44 002F2D84 4B FE 61 09 */ bl JSUPtrList_NS_append +/* 802F5E44 002F2D84 4B FE 61 09 */ bl append__10JSUPtrListFP10JSUPtrLink lbl_802F5E48: /* 802F5E48 002F2D88 7F C3 F3 78 */ mr r3, r30 /* 802F5E4C 002F2D8C 4B FF FE 6D */ bl J2DPane_NS_initiate @@ -197,10 +197,10 @@ J2DPane_X2_: /* 802F5EB4 002F2DF4 90 1B 00 00 */ stw r0, 0(r27) /* 802F5EB8 002F2DF8 3B 9B 00 DC */ addi r28, r27, 0xdc /* 802F5EBC 002F2DFC 7F 83 E3 78 */ mr r3, r28 -/* 802F5EC0 002F2E00 4B FE 60 55 */ bl JSUPtrList_NS_initiate +/* 802F5EC0 002F2E00 4B FE 60 55 */ bl initiate__10JSUPtrListFv /* 802F5EC4 002F2E04 38 7C 00 0C */ addi r3, r28, 0xc /* 802F5EC8 002F2E08 7F 64 DB 78 */ mr r4, r27 -/* 802F5ECC 002F2E0C 4B FE 5F 31 */ bl JSUPtrLink +/* 802F5ECC 002F2E0C 4B FE 5F 31 */ bl __ct__10JSUPtrLinkFPv /* 802F5ED0 002F2E10 38 00 00 00 */ li r0, 0 /* 802F5ED4 002F2E14 90 1B 00 F8 */ stw r0, 0xf8(r27) /* 802F5ED8 002F2E18 7F 63 DB 78 */ mr r3, r27 @@ -272,10 +272,10 @@ J2DPane_X3_: /* 802F5FC8 002F2F08 90 1B 00 00 */ stw r0, 0(r27) /* 802F5FCC 002F2F0C 3B 9B 00 DC */ addi r28, r27, 0xdc /* 802F5FD0 002F2F10 7F 83 E3 78 */ mr r3, r28 -/* 802F5FD4 002F2F14 4B FE 5F 41 */ bl JSUPtrList_NS_initiate +/* 802F5FD4 002F2F14 4B FE 5F 41 */ bl initiate__10JSUPtrListFv /* 802F5FD8 002F2F18 38 7C 00 0C */ addi r3, r28, 0xc /* 802F5FDC 002F2F1C 7F 64 DB 78 */ mr r4, r27 -/* 802F5FE0 002F2F20 4B FE 5E 1D */ bl JSUPtrLink +/* 802F5FE0 002F2F20 4B FE 5E 1D */ bl __ct__10JSUPtrLinkFPv /* 802F5FE4 002F2F24 38 00 00 00 */ li r0, 0 /* 802F5FE8 002F2F28 90 1B 00 F8 */ stw r0, 0xf8(r27) /* 802F5FEC 002F2F2C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 @@ -514,7 +514,7 @@ lbl_802F634C: /* 802F6368 002F32A8 38 84 00 0C */ addi r4, r4, 0xc lbl_802F636C: /* 802F636C 002F32AC 38 7E 00 DC */ addi r3, r30, 0xdc -/* 802F6370 002F32B0 4B FE 5B DD */ bl JSUPtrList_NS_append +/* 802F6370 002F32B0 4B FE 5B DD */ bl append__10JSUPtrListFP10JSUPtrLink lbl_802F6374: /* 802F6374 002F32B4 38 80 00 00 */ li r4, 0 /* 802F6378 002F32B8 98 9D 00 B1 */ stb r4, 0xb1(r29) @@ -705,18 +705,18 @@ lbl_802F6608: /* 802F661C 002F355C 41 82 00 10 */ beq lbl_802F662C /* 802F6620 002F3560 38 7D 00 E8 */ addi r3, r29, 0xe8 /* 802F6624 002F3564 38 80 00 00 */ li r4, 0 -/* 802F6628 002F3568 4B FE 57 ED */ bl JSUPtrLink_NS_dtor +/* 802F6628 002F3568 4B FE 57 ED */ bl __dt__10JSUPtrLinkFv lbl_802F662C: /* 802F662C 002F356C 34 1D 00 DC */ addic. r0, r29, 0xdc /* 802F6630 002F3570 41 82 00 10 */ beq lbl_802F6640 /* 802F6634 002F3574 38 7D 00 DC */ addi r3, r29, 0xdc /* 802F6638 002F3578 38 80 00 00 */ li r4, 0 -/* 802F663C 002F357C 4B FE 58 71 */ bl JSUPtrList_NS_dtor +/* 802F663C 002F357C 4B FE 58 71 */ bl __dt__10JSUPtrListFv lbl_802F6640: /* 802F6640 002F3580 7F C0 07 35 */ extsh. r0, r30 /* 802F6644 002F3584 40 81 00 0C */ ble lbl_802F6650 /* 802F6648 002F3588 7F A3 EB 78 */ mr r3, r29 -/* 802F664C 002F358C 4B FD 86 F1 */ bl __dl +/* 802F664C 002F358C 4B FD 86 F1 */ bl __dl__FPv lbl_802F6650: /* 802F6650 002F3590 7F A3 EB 78 */ mr r3, r29 /* 802F6654 002F3594 39 61 00 20 */ addi r11, r1, 0x20 @@ -747,7 +747,7 @@ lbl_802F6694: /* 802F66A8 002F35E8 38 84 00 0C */ addi r4, r4, 0xc lbl_802F66AC: /* 802F66AC 002F35EC 38 7C 00 DC */ addi r3, r28, 0xdc -/* 802F66B0 002F35F0 4B FE 58 9D */ bl JSUPtrList_NS_append +/* 802F66B0 002F35F0 4B FE 58 9D */ bl append__10JSUPtrListFP10JSUPtrLink /* 802F66B4 002F35F4 7C 7E 1B 78 */ mr r30, r3 /* 802F66B8 002F35F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F66BC 002F35FC 41 82 00 3C */ beq lbl_802F66F8 @@ -808,7 +808,7 @@ lbl_802F676C: /* 802F6774 002F36B4 38 84 00 0C */ addi r4, r4, 0xc lbl_802F6778: /* 802F6778 002F36B8 38 7C 00 DC */ addi r3, r28, 0xdc -/* 802F677C 002F36BC 4B FE 59 19 */ bl JSUPtrList_NS_insert +/* 802F677C 002F36BC 4B FE 59 19 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink /* 802F6780 002F36C0 7C 7E 1B 78 */ mr r30, r3 /* 802F6784 002F36C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F6788 002F36C8 41 82 00 3C */ beq lbl_802F67C4 @@ -2320,7 +2320,7 @@ lbl_802F7C5C: /* 802F7CB4 002F4BF4 38 84 00 0C */ addi r4, r4, 0xc lbl_802F7CB8: /* 802F7CB8 002F4BF8 38 7F 00 DC */ addi r3, r31, 0xdc -/* 802F7CBC 002F4BFC 4B FE 42 91 */ bl JSUPtrList_NS_append +/* 802F7CBC 002F4BFC 4B FE 42 91 */ bl append__10JSUPtrListFP10JSUPtrLink lbl_802F7CC0: /* 802F7CC0 002F4C00 38 60 00 00 */ li r3, 0 /* 802F7CC4 002F4C04 98 7E 00 B1 */ stb r3, 0xb1(r30) diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index c41005f981..086b861002 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -822,7 +822,7 @@ lbl_802FCBF4: /* 802FCC14 002F9B54 28 1D 00 00 */ cmplwi r29, 0 /* 802FCC18 002F9B58 41 82 00 44 */ beq lbl_802FCC5C /* 802FCC1C 002F9B5C 38 60 00 40 */ li r3, 0x40 -/* 802FCC20 002F9B60 4B FD 20 2D */ bl __nw +/* 802FCC20 002F9B60 4B FD 20 2D */ bl __nw__FUl /* 802FCC24 002F9B64 7C 77 1B 79 */ or. r23, r3, r3 /* 802FCC28 002F9B68 41 82 00 24 */ beq lbl_802FCC4C /* 802FCC2C 002F9B6C 38 00 00 00 */ li r0, 0 @@ -842,7 +842,7 @@ lbl_802FCC5C: /* 802FCC5C 002F9B9C 28 1C 00 00 */ cmplwi r28, 0 /* 802FCC60 002F9BA0 41 82 00 30 */ beq lbl_802FCC90 /* 802FCC64 002F9BA4 38 60 00 18 */ li r3, 0x18 -/* 802FCC68 002F9BA8 4B FD 1F E5 */ bl __nw +/* 802FCC68 002F9BA8 4B FD 1F E5 */ bl __nw__FUl /* 802FCC6C 002F9BAC 7C 77 1B 79 */ or. r23, r3, r3 /* 802FCC70 002F9BB0 41 82 00 10 */ beq lbl_802FCC80 /* 802FCC74 002F9BB4 38 80 00 00 */ li r4, 0 @@ -931,7 +931,7 @@ J2DPicture_NS_private_initiate: /* 802FCDA8 002F9CE8 28 03 00 00 */ cmplwi r3, 0 /* 802FCDAC 002F9CEC 40 82 00 64 */ bne lbl_802FCE10 /* 802FCDB0 002F9CF0 38 60 00 40 */ li r3, 0x40 -/* 802FCDB4 002F9CF4 4B FD 1E 99 */ bl __nw +/* 802FCDB4 002F9CF4 4B FD 1E 99 */ bl __nw__FUl /* 802FCDB8 002F9CF8 7C 7D 1B 79 */ or. r29, r3, r3 /* 802FCDBC 002F9CFC 41 82 00 24 */ beq lbl_802FCDE0 /* 802FCDC0 002F9D00 38 00 00 00 */ li r0, 0 @@ -974,7 +974,7 @@ lbl_802FCE34: /* 802FCE48 002F9D88 28 00 00 00 */ cmplwi r0, 0 /* 802FCE4C 002F9D8C 40 82 00 38 */ bne lbl_802FCE84 /* 802FCE50 002F9D90 38 60 00 18 */ li r3, 0x18 -/* 802FCE54 002F9D94 4B FD 1D F9 */ bl __nw +/* 802FCE54 002F9D94 4B FD 1D F9 */ bl __nw__FUl /* 802FCE58 002F9D98 7C 7D 1B 79 */ or. r29, r3, r3 /* 802FCE5C 002F9D9C 41 82 00 10 */ beq lbl_802FCE6C /* 802FCE60 002F9DA0 38 80 00 00 */ li r4, 0 @@ -1114,14 +1114,14 @@ lbl_802FD048: /* 802FD050 002F9F90 3B FF 00 04 */ addi r31, r31, 4 /* 802FD054 002F9F94 41 80 FF D4 */ blt lbl_802FD028 /* 802FD058 002F9F98 80 7B 01 2C */ lwz r3, 0x12c(r27) -/* 802FD05C 002F9F9C 4B FD 1C E1 */ bl __dl +/* 802FD05C 002F9F9C 4B FD 1C E1 */ bl __dl__FPv /* 802FD060 002F9FA0 7F 63 DB 78 */ mr r3, r27 /* 802FD064 002F9FA4 38 80 00 00 */ li r4, 0 /* 802FD068 002F9FA8 4B FF 95 25 */ bl J2DPane_NS_dtor /* 802FD06C 002F9FAC 7F 80 07 35 */ extsh. r0, r28 /* 802FD070 002F9FB0 40 81 00 0C */ ble lbl_802FD07C /* 802FD074 002F9FB4 7F 63 DB 78 */ mr r3, r27 -/* 802FD078 002F9FB8 4B FD 1C C5 */ bl __dl +/* 802FD078 002F9FB8 4B FD 1C C5 */ bl __dl__FPv lbl_802FD07C: /* 802FD07C 002F9FBC 7F 63 DB 78 */ mr r3, r27 /* 802FD080 002F9FC0 39 61 00 20 */ addi r11, r1, 0x20 @@ -1152,7 +1152,7 @@ lbl_802FD0D0: /* 802FD0DC 002FA01C 28 00 00 00 */ cmplwi r0, 0 /* 802FD0E0 002FA020 40 82 00 5C */ bne lbl_802FD13C /* 802FD0E4 002FA024 38 60 00 40 */ li r3, 0x40 -/* 802FD0E8 002FA028 4B FD 1B 65 */ bl __nw +/* 802FD0E8 002FA028 4B FD 1B 65 */ bl __nw__FUl /* 802FD0EC 002FA02C 28 03 00 00 */ cmplwi r3, 0 /* 802FD0F0 002FA030 41 82 00 1C */ beq lbl_802FD10C /* 802FD0F4 002FA034 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -1233,7 +1233,7 @@ lbl_802FD1F0: /* 802FD200 002FA140 28 03 00 00 */ cmplwi r3, 0 /* 802FD204 002FA144 40 82 00 BC */ bne lbl_802FD2C0 /* 802FD208 002FA148 38 60 00 40 */ li r3, 0x40 -/* 802FD20C 002FA14C 4B FD 1A 41 */ bl __nw +/* 802FD20C 002FA14C 4B FD 1A 41 */ bl __nw__FUl /* 802FD210 002FA150 7C 7F 1B 79 */ or. r31, r3, r3 /* 802FD214 002FA154 41 82 00 24 */ beq lbl_802FD238 /* 802FD218 002FA158 38 00 00 00 */ li r0, 0 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index 92f3638c6c..09c1296bda 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -233,7 +233,7 @@ lbl_80303994: /* 803039A0 003008E0 7F E0 07 35 */ extsh. r0, r31 /* 803039A4 003008E4 40 81 00 0C */ ble lbl_803039B0 /* 803039A8 003008E8 7F C3 F3 78 */ mr r3, r30 -/* 803039AC 003008EC 4B FC B3 91 */ bl __dl +/* 803039AC 003008EC 4B FC B3 91 */ bl __dl__FPv lbl_803039B0: /* 803039B0 003008F0 7F C3 F3 78 */ mr r3, r30 /* 803039B4 003008F4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index 9df17bf621..7168a0e302 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -101,7 +101,7 @@ J2DPrint_NS_dtor: /* 802F4440 002F1380 90 1F 00 00 */ stw r0, 0(r31) /* 802F4444 002F1384 7C 80 07 35 */ extsh. r0, r4 /* 802F4448 002F1388 40 81 00 08 */ ble lbl_802F4450 -/* 802F444C 002F138C 4B FD A8 F1 */ bl __dl +/* 802F444C 002F138C 4B FD A8 F1 */ bl __dl__FPv lbl_802F4450: /* 802F4450 002F1390 7F E3 FB 78 */ mr r3, r31 /* 802F4454 002F1394 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -257,12 +257,12 @@ J2DPrint_NS_setBuffer: /* 802F4678 002F15B8 88 0D 90 04 */ lbz r0, lbl_80451584-_SDA_BASE_(r13) /* 802F467C 002F15BC 28 00 00 00 */ cmplwi r0, 0 /* 802F4680 002F15C0 41 82 00 08 */ beq lbl_802F4688 -/* 802F4684 002F15C4 4B FD A6 B9 */ bl __dl +/* 802F4684 002F15C4 4B FD A6 B9 */ bl __dl__FPv lbl_802F4688: /* 802F4688 002F15C8 7F C3 F3 78 */ mr r3, r30 /* 802F468C 002F15CC 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802F4690 002F15D0 38 A0 00 00 */ li r5, 0 -/* 802F4694 002F15D4 4B FD A6 7D */ bl __nwa_X2_ +/* 802F4694 002F15D4 4B FD A6 7D */ bl __nwa__FUlP7JKRHeapi /* 802F4698 002F15D8 90 6D 90 00 */ stw r3, lbl_80451580-_SDA_BASE_(r13) /* 802F469C 002F15DC 93 CD 90 08 */ stw r30, lbl_80451588-_SDA_BASE_(r13) /* 802F46A0 002F15E0 38 00 00 01 */ li r0, 1 diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index 6ac5b63ea5..19fcef00af 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -65,7 +65,7 @@ J2DScreen: /* 802F857C 002F54BC 7F E0 07 35 */ extsh. r0, r31 /* 802F8580 002F54C0 40 81 00 0C */ ble lbl_802F858C /* 802F8584 002F54C4 7F C3 F3 78 */ mr r3, r30 -/* 802F8588 002F54C8 4B FD 67 B5 */ bl __dl +/* 802F8588 002F54C8 4B FD 67 B5 */ bl __dl__FPv lbl_802F858C: /* 802F858C 002F54CC 7F C3 F3 78 */ mr r3, r30 /* 802F8590 002F54D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -92,18 +92,18 @@ J2DScreen_NS_clean: /* 802F85D0 002F5510 B0 1F 01 02 */ sth r0, 0x102(r31) /* 802F85D4 002F5514 90 1F 01 04 */ stw r0, 0x104(r31) /* 802F85D8 002F5518 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 802F85DC 002F551C 4B FD 67 85 */ bl __dla +/* 802F85DC 002F551C 4B FD 67 85 */ bl __dla__FPv /* 802F85E0 002F5520 38 00 00 00 */ li r0, 0 /* 802F85E4 002F5524 90 1F 01 08 */ stw r0, 0x108(r31) /* 802F85E8 002F5528 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802F85EC 002F552C 4B FD 67 75 */ bl __dla +/* 802F85EC 002F552C 4B FD 67 75 */ bl __dla__FPv /* 802F85F0 002F5530 38 00 00 00 */ li r0, 0 /* 802F85F4 002F5534 90 1F 01 0C */ stw r0, 0x10c(r31) /* 802F85F8 002F5538 80 7F 01 10 */ lwz r3, 0x110(r31) /* 802F85FC 002F553C 28 03 00 00 */ cmplwi r3, 0 /* 802F8600 002F5540 41 82 00 34 */ beq lbl_802F8634 /* 802F8604 002F5544 80 63 00 04 */ lwz r3, 4(r3) -/* 802F8608 002F5548 4B FD 67 59 */ bl __dla +/* 802F8608 002F5548 4B FD 67 59 */ bl __dla__FPv /* 802F860C 002F554C 80 7F 01 10 */ lwz r3, 0x110(r31) /* 802F8610 002F5550 28 03 00 00 */ cmplwi r3, 0 /* 802F8614 002F5554 41 82 00 18 */ beq lbl_802F862C @@ -561,7 +561,7 @@ lbl_802F8C48: /* 802F8C54 002F5B94 48 00 00 E0 */ b lbl_802F8D34 lbl_802F8C58: /* 802F8C58 002F5B98 38 60 01 00 */ li r3, 0x100 -/* 802F8C5C 002F5B9C 4B FD 5F F1 */ bl __nw +/* 802F8C5C 002F5B9C 4B FD 5F F1 */ bl __nw__FUl /* 802F8C60 002F5BA0 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8C64 002F5BA4 41 82 00 18 */ beq lbl_802F8C7C /* 802F8C68 002F5BA8 7F A4 EB 78 */ mr r4, r29 @@ -574,7 +574,7 @@ lbl_802F8C7C: /* 802F8C80 002F5BC0 48 00 02 38 */ b lbl_802F8EB8 lbl_802F8C84: /* 802F8C84 002F5BC4 38 60 01 48 */ li r3, 0x148 -/* 802F8C88 002F5BC8 4B FD 5F C5 */ bl __nw +/* 802F8C88 002F5BC8 4B FD 5F C5 */ bl __nw__FUl /* 802F8C8C 002F5BCC 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8C90 002F5BD0 41 82 00 18 */ beq lbl_802F8CA8 /* 802F8C94 002F5BD4 7F A4 EB 78 */ mr r4, r29 @@ -587,7 +587,7 @@ lbl_802F8CA8: /* 802F8CAC 002F5BEC 48 00 02 0C */ b lbl_802F8EB8 lbl_802F8CB0: /* 802F8CB0 002F5BF0 38 60 01 50 */ li r3, 0x150 -/* 802F8CB4 002F5BF4 4B FD 5F 99 */ bl __nw +/* 802F8CB4 002F5BF4 4B FD 5F 99 */ bl __nw__FUl /* 802F8CB8 002F5BF8 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8CBC 002F5BFC 41 82 00 18 */ beq lbl_802F8CD4 /* 802F8CC0 002F5C00 7F A4 EB 78 */ mr r4, r29 @@ -600,7 +600,7 @@ lbl_802F8CD4: /* 802F8CD8 002F5C18 48 00 01 E0 */ b lbl_802F8EB8 lbl_802F8CDC: /* 802F8CDC 002F5C1C 38 60 01 38 */ li r3, 0x138 -/* 802F8CE0 002F5C20 4B FD 5F 6D */ bl __nw +/* 802F8CE0 002F5C20 4B FD 5F 6D */ bl __nw__FUl /* 802F8CE4 002F5C24 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8CE8 002F5C28 41 82 00 18 */ beq lbl_802F8D00 /* 802F8CEC 002F5C2C 7F A4 EB 78 */ mr r4, r29 @@ -613,7 +613,7 @@ lbl_802F8D00: /* 802F8D04 002F5C44 48 00 01 B4 */ b lbl_802F8EB8 lbl_802F8D08: /* 802F8D08 002F5C48 38 60 01 00 */ li r3, 0x100 -/* 802F8D0C 002F5C4C 4B FD 5F 41 */ bl __nw +/* 802F8D0C 002F5C4C 4B FD 5F 41 */ bl __nw__FUl /* 802F8D10 002F5C50 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8D14 002F5C54 41 82 00 18 */ beq lbl_802F8D2C /* 802F8D18 002F5C58 7F A4 EB 78 */ mr r4, r29 @@ -628,7 +628,7 @@ lbl_802F8D34: /* 802F8D34 002F5C74 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf /* 802F8D38 002F5C78 41 82 00 34 */ beq lbl_802F8D6C /* 802F8D3C 002F5C7C 38 60 01 80 */ li r3, 0x180 -/* 802F8D40 002F5C80 4B FD 5F 0D */ bl __nw +/* 802F8D40 002F5C80 4B FD 5F 0D */ bl __nw__FUl /* 802F8D44 002F5C84 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8D48 002F5C88 41 82 00 1C */ beq lbl_802F8D64 /* 802F8D4C 002F5C8C 7F A4 EB 78 */ mr r4, r29 @@ -642,7 +642,7 @@ lbl_802F8D64: /* 802F8D68 002F5CA8 48 00 01 50 */ b lbl_802F8EB8 lbl_802F8D6C: /* 802F8D6C 002F5CAC 38 60 01 48 */ li r3, 0x148 -/* 802F8D70 002F5CB0 4B FD 5E DD */ bl __nw +/* 802F8D70 002F5CB0 4B FD 5E DD */ bl __nw__FUl /* 802F8D74 002F5CB4 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8D78 002F5CB8 41 82 00 18 */ beq lbl_802F8D90 /* 802F8D7C 002F5CBC 7F A4 EB 78 */ mr r4, r29 @@ -657,7 +657,7 @@ lbl_802F8D98: /* 802F8D98 002F5CD8 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf /* 802F8D9C 002F5CDC 41 82 00 34 */ beq lbl_802F8DD0 /* 802F8DA0 002F5CE0 38 60 01 A0 */ li r3, 0x1a0 -/* 802F8DA4 002F5CE4 4B FD 5E A9 */ bl __nw +/* 802F8DA4 002F5CE4 4B FD 5E A9 */ bl __nw__FUl /* 802F8DA8 002F5CE8 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8DAC 002F5CEC 41 82 00 1C */ beq lbl_802F8DC8 /* 802F8DB0 002F5CF0 7F A4 EB 78 */ mr r4, r29 @@ -671,7 +671,7 @@ lbl_802F8DC8: /* 802F8DCC 002F5D0C 48 00 00 EC */ b lbl_802F8EB8 lbl_802F8DD0: /* 802F8DD0 002F5D10 38 60 01 50 */ li r3, 0x150 -/* 802F8DD4 002F5D14 4B FD 5E 79 */ bl __nw +/* 802F8DD4 002F5D14 4B FD 5E 79 */ bl __nw__FUl /* 802F8DD8 002F5D18 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8DDC 002F5D1C 41 82 00 18 */ beq lbl_802F8DF4 /* 802F8DE0 002F5D20 7F A4 EB 78 */ mr r4, r29 @@ -686,7 +686,7 @@ lbl_802F8DFC: /* 802F8DFC 002F5D3C 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf /* 802F8E00 002F5D40 41 82 00 34 */ beq lbl_802F8E34 /* 802F8E04 002F5D44 38 60 01 48 */ li r3, 0x148 -/* 802F8E08 002F5D48 4B FD 5E 45 */ bl __nw +/* 802F8E08 002F5D48 4B FD 5E 45 */ bl __nw__FUl /* 802F8E0C 002F5D4C 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8E10 002F5D50 41 82 00 1C */ beq lbl_802F8E2C /* 802F8E14 002F5D54 7F A4 EB 78 */ mr r4, r29 @@ -700,7 +700,7 @@ lbl_802F8E2C: /* 802F8E30 002F5D70 48 00 00 88 */ b lbl_802F8EB8 lbl_802F8E34: /* 802F8E34 002F5D74 38 60 01 38 */ li r3, 0x138 -/* 802F8E38 002F5D78 4B FD 5E 15 */ bl __nw +/* 802F8E38 002F5D78 4B FD 5E 15 */ bl __nw__FUl /* 802F8E3C 002F5D7C 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8E40 002F5D80 41 82 00 1C */ beq lbl_802F8E5C /* 802F8E44 002F5D84 7F A4 EB 78 */ mr r4, r29 @@ -721,7 +721,7 @@ lbl_802F8E64: /* 802F8E78 002F5DB8 80 1B 00 04 */ lwz r0, 4(r27) /* 802F8E7C 002F5DBC 7F 60 1A 14 */ add r27, r0, r3 /* 802F8E80 002F5DC0 38 60 01 00 */ li r3, 0x100 -/* 802F8E84 002F5DC4 4B FD 5D C9 */ bl __nw +/* 802F8E84 002F5DC4 4B FD 5D C9 */ bl __nw__FUl /* 802F8E88 002F5DC8 7C 60 1B 79 */ or. r0, r3, r3 /* 802F8E8C 002F5DCC 41 82 00 18 */ beq lbl_802F8EA4 /* 802F8E90 002F5DD0 7F A4 EB 78 */ mr r4, r29 @@ -1038,13 +1038,13 @@ J2DScreen_NS_getResReference: /* 802F9320 002F6260 57 80 02 DF */ rlwinm. r0, r28, 0, 0xb, 0xf /* 802F9324 002F6264 41 82 00 14 */ beq lbl_802F9338 /* 802F9328 002F6268 7F A3 EB 78 */ mr r3, r29 -/* 802F932C 002F626C 4B FD 59 99 */ bl __nwa +/* 802F932C 002F626C 4B FD 59 99 */ bl __nwa__FUl /* 802F9330 002F6270 7C 64 1B 78 */ mr r4, r3 /* 802F9334 002F6274 48 00 00 14 */ b lbl_802F9348 lbl_802F9338: /* 802F9338 002F6278 7F A3 EB 78 */ mr r3, r29 /* 802F933C 002F627C 38 80 FF FC */ li r4, -4 -/* 802F9340 002F6280 4B FD 59 AD */ bl __nwa_X1_ +/* 802F9340 002F6280 4B FD 59 AD */ bl __nwa__FUli /* 802F9344 002F6284 7C 64 1B 78 */ mr r4, r3 lbl_802F9348: /* 802F9348 002F6288 7C 9E 23 78 */ mr r30, r4 @@ -1100,7 +1100,7 @@ J2DScreen_NS_createMaterial: /* 802F9400 002F6340 A3 9F 01 02 */ lhz r28, 0x102(r31) /* 802F9404 002F6344 1C 7C 00 88 */ mulli r3, r28, 0x88 /* 802F9408 002F6348 38 63 00 10 */ addi r3, r3, 0x10 -/* 802F940C 002F634C 4B FD 58 B9 */ bl __nwa +/* 802F940C 002F634C 4B FD 58 B9 */ bl __nwa__FUl .global J2DMaterial /* 802F9410 002F6350 3C 80 80 2F */ lis r4, J2DMaterial@ha .global J2DMaterial @@ -1119,7 +1119,7 @@ lbl_802F9434: /* 802F9438 002F6378 1C 7C 00 88 */ mulli r3, r28, 0x88 /* 802F943C 002F637C 38 63 00 10 */ addi r3, r3, 0x10 /* 802F9440 002F6380 38 80 FF FC */ li r4, -4 -/* 802F9444 002F6384 4B FD 58 A9 */ bl __nwa_X1_ +/* 802F9444 002F6384 4B FD 58 A9 */ bl __nwa__FUli .global J2DMaterial /* 802F9448 002F6388 3C 80 80 2F */ lis r4, J2DMaterial@ha .global J2DMaterial @@ -1135,7 +1135,7 @@ lbl_802F9434: lbl_802F9468: /* 802F9468 002F63A8 80 61 00 10 */ lwz r3, 0x10(r1) /* 802F946C 002F63AC 38 80 FF FC */ li r4, -4 -/* 802F9470 002F63B0 4B FD 58 7D */ bl __nwa_X1_ +/* 802F9470 002F63B0 4B FD 58 7D */ bl __nwa__FUli /* 802F9474 002F63B4 7C 7C 1B 78 */ mr r28, r3 /* 802F9478 002F63B8 80 1F 01 04 */ lwz r0, 0x104(r31) /* 802F947C 002F63BC 28 00 00 00 */ cmplwi r0, 0 @@ -1197,7 +1197,7 @@ lbl_802F9540: /* 802F954C 002F648C 40 82 FF F0 */ bne lbl_802F953C /* 802F9550 002F6490 3B 43 00 01 */ addi r26, r3, 1 /* 802F9554 002F6494 57 43 04 3E */ clrlwi r3, r26, 0x10 -/* 802F9558 002F6498 4B FD 57 6D */ bl __nwa +/* 802F9558 002F6498 4B FD 57 6D */ bl __nwa__FUl /* 802F955C 002F649C 7C 7B 1B 79 */ or. r27, r3, r3 /* 802F9560 002F64A0 41 82 00 74 */ beq lbl_802F95D4 /* 802F9564 002F64A4 38 A0 00 00 */ li r5, 0 @@ -1213,7 +1213,7 @@ lbl_802F9580: /* 802F9584 002F64C4 7C 03 00 40 */ cmplw r3, r0 /* 802F9588 002F64C8 41 80 FF E8 */ blt lbl_802F9570 /* 802F958C 002F64CC 38 60 00 10 */ li r3, 0x10 -/* 802F9590 002F64D0 4B FD 56 BD */ bl __nw +/* 802F9590 002F64D0 4B FD 56 BD */ bl __nw__FUl /* 802F9594 002F64D4 7C 60 1B 79 */ or. r0, r3, r3 /* 802F9598 002F64D8 41 82 00 10 */ beq lbl_802F95A8 /* 802F959C 002F64DC 7F 64 DB 78 */ mr r4, r27 @@ -1225,16 +1225,16 @@ lbl_802F95A8: /* 802F95B0 002F64F0 28 00 00 00 */ cmplwi r0, 0 /* 802F95B4 002F64F4 40 82 00 10 */ bne lbl_802F95C4 /* 802F95B8 002F64F8 7F 63 DB 78 */ mr r3, r27 -/* 802F95BC 002F64FC 4B FD 57 A5 */ bl __dla +/* 802F95BC 002F64FC 4B FD 57 A5 */ bl __dla__FPv /* 802F95C0 002F6500 48 00 00 14 */ b lbl_802F95D4 lbl_802F95C4: /* 802F95C4 002F6504 7F 83 E3 78 */ mr r3, r28 -/* 802F95C8 002F6508 4B FD 57 99 */ bl __dla +/* 802F95C8 002F6508 4B FD 57 99 */ bl __dla__FPv /* 802F95CC 002F650C 38 60 00 01 */ li r3, 1 /* 802F95D0 002F6510 48 00 00 18 */ b lbl_802F95E8 lbl_802F95D4: /* 802F95D4 002F6514 7F 83 E3 78 */ mr r3, r28 -/* 802F95D8 002F6518 4B FD 57 89 */ bl __dla +/* 802F95D8 002F6518 4B FD 57 89 */ bl __dla__FPv /* 802F95DC 002F651C 7F E3 FB 78 */ mr r3, r31 /* 802F95E0 002F6520 4B FF EF C9 */ bl J2DScreen_NS_clean /* 802F95E4 002F6524 38 60 00 00 */ li r3, 0 diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index bbfc3c7397..ded4cdebcd 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -238,7 +238,7 @@ lbl_802FF9CC: /* 802FF9D4 002FC914 90 1B 01 24 */ stw r0, 0x124(r27) /* 802FF9D8 002FC918 57 43 04 3F */ clrlwi. r3, r26, 0x10 /* 802FF9DC 002FC91C 41 82 00 0C */ beq lbl_802FF9E8 -/* 802FF9E0 002FC920 4B FC F2 E5 */ bl __nwa +/* 802FF9E0 002FC920 4B FC F2 E5 */ bl __nwa__FUl /* 802FF9E4 002FC924 90 7B 01 24 */ stw r3, 0x124(r27) lbl_802FF9E8: /* 802FF9E8 002FC928 80 1B 01 24 */ lwz r0, 0x124(r27) @@ -419,7 +419,7 @@ J2DTextBox_NS_initiate: /* 802FFC80 002FCBC0 7D 1F 43 78 */ mr r31, r8 /* 802FFC84 002FCBC4 41 82 00 28 */ beq lbl_802FFCAC /* 802FFC88 002FCBC8 38 60 00 70 */ li r3, 0x70 -/* 802FFC8C 002FCBCC 4B FC EF C1 */ bl __nw +/* 802FFC8C 002FCBCC 4B FC EF C1 */ bl __nw__FUl /* 802FFC90 002FCBD0 7C 60 1B 79 */ or. r0, r3, r3 /* 802FFC94 002FCBD4 41 82 00 14 */ beq lbl_802FFCA8 /* 802FFC98 002FCBD8 7F 44 D3 78 */ mr r4, r26 @@ -475,7 +475,7 @@ lbl_802FFD50: /* 802FFD54 002FCC94 54 1E 04 3E */ clrlwi r30, r0, 0x10 lbl_802FFD58: /* 802FFD58 002FCC98 57 C3 04 3E */ clrlwi r3, r30, 0x10 -/* 802FFD5C 002FCC9C 4B FC EF 69 */ bl __nwa +/* 802FFD5C 002FCC9C 4B FC EF 69 */ bl __nwa__FUl /* 802FFD60 002FCCA0 90 7B 01 24 */ stw r3, 0x124(r27) /* 802FFD64 002FCCA4 57 DD 04 3F */ clrlwi. r29, r30, 0x10 /* 802FFD68 002FCCA8 41 82 00 30 */ beq lbl_802FFD98 @@ -595,7 +595,7 @@ J2DTextBox_NS_private_readStream: /* 802FFF18 002FCE58 7C 7B 1B 79 */ or. r27, r3, r3 /* 802FFF1C 002FCE5C 41 82 00 28 */ beq lbl_802FFF44 /* 802FFF20 002FCE60 38 60 00 70 */ li r3, 0x70 -/* 802FFF24 002FCE64 4B FC ED 29 */ bl __nw +/* 802FFF24 002FCE64 4B FC ED 29 */ bl __nw__FUl /* 802FFF28 002FCE68 7C 60 1B 79 */ or. r0, r3, r3 /* 802FFF2C 002FCE6C 41 82 00 14 */ beq lbl_802FFF40 /* 802FFF30 002FCE70 7F 64 DB 78 */ mr r4, r27 @@ -681,7 +681,7 @@ lbl_802FFF44: /* 80300068 002FCFA8 7C 1A 07 34 */ extsh r26, r0 /* 8030006C 002FCFAC 3B 7A 00 01 */ addi r27, r26, 1 /* 80300070 002FCFB0 7F 63 DB 78 */ mr r3, r27 -/* 80300074 002FCFB4 4B FC EC 51 */ bl __nwa +/* 80300074 002FCFB4 4B FC EC 51 */ bl __nwa__FUl /* 80300078 002FCFB8 90 7C 01 24 */ stw r3, 0x124(r28) /* 8030007C 002FCFBC 80 9C 01 24 */ lwz r4, 0x124(r28) /* 80300080 002FCFC0 28 04 00 00 */ cmplwi r4, 0 @@ -805,14 +805,14 @@ J2DTextBox_NS_dtor: /* 80300234 002FD174 4E 80 04 21 */ bctrl lbl_80300238: /* 80300238 002FD178 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 8030023C 002FD17C 4B FC EB 25 */ bl __dla +/* 8030023C 002FD17C 4B FC EB 25 */ bl __dla__FPv /* 80300240 002FD180 7F C3 F3 78 */ mr r3, r30 /* 80300244 002FD184 38 80 00 00 */ li r4, 0 /* 80300248 002FD188 4B FF 63 45 */ bl J2DPane_NS_dtor /* 8030024C 002FD18C 7F E0 07 35 */ extsh. r0, r31 /* 80300250 002FD190 40 81 00 0C */ ble lbl_8030025C /* 80300254 002FD194 7F C3 F3 78 */ mr r3, r30 -/* 80300258 002FD198 4B FC EA E5 */ bl __dl +/* 80300258 002FD198 4B FC EA E5 */ bl __dl__FPv lbl_8030025C: /* 8030025C 002FD19C 7F C3 F3 78 */ mr r3, r30 /* 80300260 002FD1A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1128,7 +1128,7 @@ lbl_803006A0: /* 803006D0 002FD610 38 01 00 08 */ addi r0, r1, 8 /* 803006D4 002FD614 90 01 00 70 */ stw r0, 0x70(r1) /* 803006D8 002FD618 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 803006DC 002FD61C 4B FC E6 85 */ bl __dla +/* 803006DC 002FD61C 4B FC E6 85 */ bl __dla__FPv /* 803006E0 002FD620 7F C3 F3 78 */ mr r3, r30 /* 803006E4 002FD624 48 06 85 01 */ bl func_80368BE4 /* 803006E8 002FD628 7C 7F 1B 78 */ mr r31, r3 @@ -1140,7 +1140,7 @@ lbl_803006FC: /* 803006FC 002FD63C 38 00 00 00 */ li r0, 0 /* 80300700 002FD640 B0 1D 01 32 */ sth r0, 0x132(r29) /* 80300704 002FD644 38 7F 00 01 */ addi r3, r31, 1 -/* 80300708 002FD648 4B FC E5 BD */ bl __nwa +/* 80300708 002FD648 4B FC E5 BD */ bl __nwa__FUl /* 8030070C 002FD64C 90 7D 01 24 */ stw r3, 0x124(r29) /* 80300710 002FD650 80 1D 01 24 */ lwz r0, 0x124(r29) /* 80300714 002FD654 28 00 00 00 */ cmplwi r0, 0 @@ -1194,7 +1194,7 @@ lbl_80300790: /* 803007C0 002FD700 38 01 00 08 */ addi r0, r1, 8 /* 803007C4 002FD704 90 01 00 70 */ stw r0, 0x70(r1) /* 803007C8 002FD708 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 803007CC 002FD70C 4B FC E5 95 */ bl __dla +/* 803007CC 002FD70C 4B FC E5 95 */ bl __dla__FPv /* 803007D0 002FD710 38 00 00 00 */ li r0, 0 /* 803007D4 002FD714 90 1F 01 24 */ stw r0, 0x124(r31) /* 803007D8 002FD718 7F C3 F3 78 */ mr r3, r30 @@ -1216,7 +1216,7 @@ lbl_8030080C: /* 80300810 002FD750 B0 1F 01 32 */ sth r0, 0x132(r31) /* 80300814 002FD754 57 83 04 3F */ clrlwi. r3, r28, 0x10 /* 80300818 002FD758 41 82 00 0C */ beq lbl_80300824 -/* 8030081C 002FD75C 4B FC E4 A9 */ bl __nwa +/* 8030081C 002FD75C 4B FC E4 A9 */ bl __nwa__FUl /* 80300820 002FD760 90 7F 01 24 */ stw r3, 0x124(r31) lbl_80300824: /* 80300824 002FD764 80 7F 01 24 */ lwz r3, 0x124(r31) diff --git a/asm/J2DGraph/J2DTextBoxEx.s b/asm/J2DGraph/J2DTextBoxEx.s index 6afc29875d..e4af20e912 100644 --- a/asm/J2DGraph/J2DTextBoxEx.s +++ b/asm/J2DGraph/J2DTextBoxEx.s @@ -169,7 +169,7 @@ lbl_80307458: /* 80307460 003043A0 90 1B 01 24 */ stw r0, 0x124(r27) /* 80307464 003043A4 57 43 04 3F */ clrlwi. r3, r26, 0x10 /* 80307468 003043A8 41 82 00 0C */ beq lbl_80307474 -/* 8030746C 003043AC 4B FC 78 59 */ bl __nwa +/* 8030746C 003043AC 4B FC 78 59 */ bl __nwa__FUl /* 80307470 003043B0 90 7B 01 24 */ stw r3, 0x124(r27) lbl_80307474: /* 80307474 003043B4 80 1B 01 24 */ lwz r0, 0x124(r27) @@ -245,7 +245,7 @@ lbl_80307574: /* 80307580 003044C0 7F E0 07 35 */ extsh. r0, r31 /* 80307584 003044C4 40 81 00 0C */ ble lbl_80307590 /* 80307588 003044C8 7F C3 F3 78 */ mr r3, r30 -/* 8030758C 003044CC 4B FC 77 B1 */ bl __dl +/* 8030758C 003044CC 4B FC 77 B1 */ bl __dl__FPv lbl_80307590: /* 80307590 003044D0 7F C3 F3 78 */ mr r3, r30 /* 80307594 003044D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index f5cc6c3811..2a7419ae01 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -540,7 +540,7 @@ J2DWindow_NS_private_readStream: /* 802FA288 002F71C8 7C 79 1B 79 */ or. r25, r3, r3 /* 802FA28C 002F71CC 41 82 00 38 */ beq lbl_802FA2C4 /* 802FA290 002F71D0 38 60 00 40 */ li r3, 0x40 -/* 802FA294 002F71D4 4B FD 49 B9 */ bl __nw +/* 802FA294 002F71D4 4B FD 49 B9 */ bl __nw__FUl /* 802FA298 002F71D8 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA29C 002F71DC 41 82 00 24 */ beq lbl_802FA2C0 /* 802FA2A0 002F71E0 38 00 00 00 */ li r0, 0 @@ -563,7 +563,7 @@ lbl_802FA2C4: /* 802FA2DC 002F721C 7C 79 1B 79 */ or. r25, r3, r3 /* 802FA2E0 002F7220 41 82 00 38 */ beq lbl_802FA318 /* 802FA2E4 002F7224 38 60 00 40 */ li r3, 0x40 -/* 802FA2E8 002F7228 4B FD 49 65 */ bl __nw +/* 802FA2E8 002F7228 4B FD 49 65 */ bl __nw__FUl /* 802FA2EC 002F722C 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA2F0 002F7230 41 82 00 24 */ beq lbl_802FA314 /* 802FA2F4 002F7234 38 00 00 00 */ li r0, 0 @@ -586,7 +586,7 @@ lbl_802FA318: /* 802FA330 002F7270 7C 79 1B 79 */ or. r25, r3, r3 /* 802FA334 002F7274 41 82 00 38 */ beq lbl_802FA36C /* 802FA338 002F7278 38 60 00 40 */ li r3, 0x40 -/* 802FA33C 002F727C 4B FD 49 11 */ bl __nw +/* 802FA33C 002F727C 4B FD 49 11 */ bl __nw__FUl /* 802FA340 002F7280 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA344 002F7284 41 82 00 24 */ beq lbl_802FA368 /* 802FA348 002F7288 38 00 00 00 */ li r0, 0 @@ -609,7 +609,7 @@ lbl_802FA36C: /* 802FA384 002F72C4 7C 79 1B 79 */ or. r25, r3, r3 /* 802FA388 002F72C8 41 82 00 38 */ beq lbl_802FA3C0 /* 802FA38C 002F72CC 38 60 00 40 */ li r3, 0x40 -/* 802FA390 002F72D0 4B FD 48 BD */ bl __nw +/* 802FA390 002F72D0 4B FD 48 BD */ bl __nw__FUl /* 802FA394 002F72D4 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA398 002F72D8 41 82 00 24 */ beq lbl_802FA3BC /* 802FA39C 002F72DC 38 00 00 00 */ li r0, 0 @@ -632,7 +632,7 @@ lbl_802FA3C0: /* 802FA3D8 002F7318 7C 79 1B 79 */ or. r25, r3, r3 /* 802FA3DC 002F731C 41 82 00 24 */ beq lbl_802FA400 /* 802FA3E0 002F7320 38 60 00 18 */ li r3, 0x18 -/* 802FA3E4 002F7324 4B FD 48 69 */ bl __nw +/* 802FA3E4 002F7324 4B FD 48 69 */ bl __nw__FUl /* 802FA3E8 002F7328 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA3EC 002F732C 41 82 00 10 */ beq lbl_802FA3FC /* 802FA3F0 002F7330 38 80 00 00 */ li r4, 0 @@ -685,7 +685,7 @@ lbl_802FA400: /* 802FA4A4 002F73E4 7C 7A 1B 79 */ or. r26, r3, r3 /* 802FA4A8 002F73E8 41 82 00 38 */ beq lbl_802FA4E0 /* 802FA4AC 002F73EC 38 60 00 40 */ li r3, 0x40 -/* 802FA4B0 002F73F0 4B FD 47 9D */ bl __nw +/* 802FA4B0 002F73F0 4B FD 47 9D */ bl __nw__FUl /* 802FA4B4 002F73F4 7C 7D 1B 79 */ or. r29, r3, r3 /* 802FA4B8 002F73F8 41 82 00 24 */ beq lbl_802FA4DC /* 802FA4BC 002F73FC 38 00 00 00 */ li r0, 0 @@ -971,7 +971,7 @@ J2DWindow_NS_dtor: /* 802FA8D4 002F7814 38 80 00 01 */ li r4, 1 /* 802FA8D8 002F7818 4B FE 39 5D */ bl JUTTexture_NS_dtor /* 802FA8DC 002F781C 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 802FA8E0 002F7820 4B FD 44 5D */ bl __dl +/* 802FA8E0 002F7820 4B FD 44 5D */ bl __dl__FPv /* 802FA8E4 002F7824 80 7E 01 10 */ lwz r3, 0x110(r30) /* 802FA8E8 002F7828 38 80 00 01 */ li r4, 1 /* 802FA8EC 002F782C 4B FE 39 49 */ bl JUTTexture_NS_dtor @@ -981,7 +981,7 @@ J2DWindow_NS_dtor: /* 802FA8FC 002F783C 7F E0 07 35 */ extsh. r0, r31 /* 802FA900 002F7840 40 81 00 0C */ ble lbl_802FA90C /* 802FA904 002F7844 7F C3 F3 78 */ mr r3, r30 -/* 802FA908 002F7848 4B FD 44 35 */ bl __dl +/* 802FA908 002F7848 4B FD 44 35 */ bl __dl__FPv lbl_802FA90C: /* 802FA90C 002F784C 7F C3 F3 78 */ mr r3, r30 /* 802FA910 002F7850 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index 6bdc72d4e6..91506280bd 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -366,7 +366,7 @@ lbl_803011F4: /* 80301200 002FE140 7F A0 07 35 */ extsh. r0, r29 /* 80301204 002FE144 40 81 00 0C */ ble lbl_80301210 /* 80301208 002FE148 7F 83 E3 78 */ mr r3, r28 -/* 8030120C 002FE14C 4B FC DB 31 */ bl __dl +/* 8030120C 002FE14C 4B FC DB 31 */ bl __dl__FPv lbl_80301210: /* 80301210 002FE150 7F 83 E3 78 */ mr r3, r28 /* 80301214 002FE154 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index c7e188e249..0e7d77ef6e 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -4051,7 +4051,7 @@ lbl_8032BC84: /* 8032BC84 00328BC4 7C 80 07 35 */ extsh. r0, r4 /* 8032BC88 00328BC8 40 81 00 0C */ ble lbl_8032BC94 /* 8032BC8C 00328BCC 7F E3 FB 78 */ mr r3, r31 -/* 8032BC90 00328BD0 4B FA 30 AD */ bl __dl +/* 8032BC90 00328BD0 4B FA 30 AD */ bl __dl__FPv lbl_8032BC94: /* 8032BC94 00328BD4 7F E3 FB 78 */ mr r3, r31 /* 8032BC98 00328BD8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4083,7 +4083,7 @@ lbl_8032BCF8: /* 8032BCF8 00328C38 7C 80 07 35 */ extsh. r0, r4 /* 8032BCFC 00328C3C 40 81 00 0C */ ble lbl_8032BD08 /* 8032BD00 00328C40 7F E3 FB 78 */ mr r3, r31 -/* 8032BD04 00328C44 4B FA 30 39 */ bl __dl +/* 8032BD04 00328C44 4B FA 30 39 */ bl __dl__FPv lbl_8032BD08: /* 8032BD08 00328C48 7F E3 FB 78 */ mr r3, r31 /* 8032BD0C 00328C4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4115,7 +4115,7 @@ lbl_8032BD6C: /* 8032BD6C 00328CAC 7C 80 07 35 */ extsh. r0, r4 /* 8032BD70 00328CB0 40 81 00 0C */ ble lbl_8032BD7C /* 8032BD74 00328CB4 7F E3 FB 78 */ mr r3, r31 -/* 8032BD78 00328CB8 4B FA 2F C5 */ bl __dl +/* 8032BD78 00328CB8 4B FA 2F C5 */ bl __dl__FPv lbl_8032BD7C: /* 8032BD7C 00328CBC 7F E3 FB 78 */ mr r3, r31 /* 8032BD80 00328CC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4155,7 +4155,7 @@ lbl_8032BDFC: /* 8032BDFC 00328D3C 7C 80 07 35 */ extsh. r0, r4 /* 8032BE00 00328D40 40 81 00 0C */ ble lbl_8032BE0C /* 8032BE04 00328D44 7F E3 FB 78 */ mr r3, r31 -/* 8032BE08 00328D48 4B FA 2F 35 */ bl __dl +/* 8032BE08 00328D48 4B FA 2F 35 */ bl __dl__FPv lbl_8032BE0C: /* 8032BE0C 00328D4C 7F E3 FB 78 */ mr r3, r31 /* 8032BE10 00328D50 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4193,7 +4193,7 @@ lbl_8032BE88: /* 8032BE88 00328DC8 7C 80 07 35 */ extsh. r0, r4 /* 8032BE8C 00328DCC 40 81 00 0C */ ble lbl_8032BE98 /* 8032BE90 00328DD0 7F E3 FB 78 */ mr r3, r31 -/* 8032BE94 00328DD4 4B FA 2E A9 */ bl __dl +/* 8032BE94 00328DD4 4B FA 2E A9 */ bl __dl__FPv lbl_8032BE98: /* 8032BE98 00328DD8 7F E3 FB 78 */ mr r3, r31 /* 8032BE9C 00328DDC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4231,7 +4231,7 @@ lbl_8032BF14: /* 8032BF14 00328E54 7C 80 07 35 */ extsh. r0, r4 /* 8032BF18 00328E58 40 81 00 0C */ ble lbl_8032BF24 /* 8032BF1C 00328E5C 7F E3 FB 78 */ mr r3, r31 -/* 8032BF20 00328E60 4B FA 2E 1D */ bl __dl +/* 8032BF20 00328E60 4B FA 2E 1D */ bl __dl__FPv lbl_8032BF24: /* 8032BF24 00328E64 7F E3 FB 78 */ mr r3, r31 /* 8032BF28 00328E68 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4265,7 +4265,7 @@ lbl_8032BF94: /* 8032BF94 00328ED4 7C 80 07 35 */ extsh. r0, r4 /* 8032BF98 00328ED8 40 81 00 0C */ ble lbl_8032BFA4 /* 8032BF9C 00328EDC 7F E3 FB 78 */ mr r3, r31 -/* 8032BFA0 00328EE0 4B FA 2D 9D */ bl __dl +/* 8032BFA0 00328EE0 4B FA 2D 9D */ bl __dl__FPv lbl_8032BFA4: /* 8032BFA4 00328EE4 7F E3 FB 78 */ mr r3, r31 /* 8032BFA8 00328EE8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4296,7 +4296,7 @@ lbl_8032C008: /* 8032C008 00328F48 7C 80 07 35 */ extsh. r0, r4 /* 8032C00C 00328F4C 40 81 00 0C */ ble lbl_8032C018 /* 8032C010 00328F50 7F E3 FB 78 */ mr r3, r31 -/* 8032C014 00328F54 4B FA 2D 29 */ bl __dl +/* 8032C014 00328F54 4B FA 2D 29 */ bl __dl__FPv lbl_8032C018: /* 8032C018 00328F58 7F E3 FB 78 */ mr r3, r31 /* 8032C01C 00328F5C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4330,7 +4330,7 @@ lbl_8032C088: /* 8032C088 00328FC8 7C 80 07 35 */ extsh. r0, r4 /* 8032C08C 00328FCC 40 81 00 0C */ ble lbl_8032C098 /* 8032C090 00328FD0 7F E3 FB 78 */ mr r3, r31 -/* 8032C094 00328FD4 4B FA 2C A9 */ bl __dl +/* 8032C094 00328FD4 4B FA 2C A9 */ bl __dl__FPv lbl_8032C098: /* 8032C098 00328FD8 7F E3 FB 78 */ mr r3, r31 /* 8032C09C 00328FDC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4357,7 +4357,7 @@ lbl_8032C0EC: /* 8032C0EC 0032902C 7C 80 07 35 */ extsh. r0, r4 /* 8032C0F0 00329030 40 81 00 0C */ ble lbl_8032C0FC /* 8032C0F4 00329034 7F E3 FB 78 */ mr r3, r31 -/* 8032C0F8 00329038 4B FA 2C 45 */ bl __dl +/* 8032C0F8 00329038 4B FA 2C 45 */ bl __dl__FPv lbl_8032C0FC: /* 8032C0FC 0032903C 7F E3 FB 78 */ mr r3, r31 /* 8032C100 00329040 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4390,7 +4390,7 @@ lbl_8032C168: /* 8032C168 003290A8 7C 80 07 35 */ extsh. r0, r4 /* 8032C16C 003290AC 40 81 00 0C */ ble lbl_8032C178 /* 8032C170 003290B0 7F E3 FB 78 */ mr r3, r31 -/* 8032C174 003290B4 4B FA 2B C9 */ bl __dl +/* 8032C174 003290B4 4B FA 2B C9 */ bl __dl__FPv lbl_8032C178: /* 8032C178 003290B8 7F E3 FB 78 */ mr r3, r31 /* 8032C17C 003290BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4430,7 +4430,7 @@ lbl_8032C1F8: /* 8032C1F8 00329138 7C 80 07 35 */ extsh. r0, r4 /* 8032C1FC 0032913C 40 81 00 0C */ ble lbl_8032C208 /* 8032C200 00329140 7F E3 FB 78 */ mr r3, r31 -/* 8032C204 00329144 4B FA 2B 39 */ bl __dl +/* 8032C204 00329144 4B FA 2B 39 */ bl __dl__FPv lbl_8032C208: /* 8032C208 00329148 7F E3 FB 78 */ mr r3, r31 /* 8032C20C 0032914C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4465,7 +4465,7 @@ lbl_8032C27C: /* 8032C27C 003291BC 7C 80 07 35 */ extsh. r0, r4 /* 8032C280 003291C0 40 81 00 0C */ ble lbl_8032C28C /* 8032C284 003291C4 7F E3 FB 78 */ mr r3, r31 -/* 8032C288 003291C8 4B FA 2A B5 */ bl __dl +/* 8032C288 003291C8 4B FA 2A B5 */ bl __dl__FPv lbl_8032C28C: /* 8032C28C 003291CC 7F E3 FB 78 */ mr r3, r31 /* 8032C290 003291D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4496,7 +4496,7 @@ lbl_8032C2F0: /* 8032C2F0 00329230 7C 80 07 35 */ extsh. r0, r4 /* 8032C2F4 00329234 40 81 00 0C */ ble lbl_8032C300 /* 8032C2F8 00329238 7F E3 FB 78 */ mr r3, r31 -/* 8032C2FC 0032923C 4B FA 2A 41 */ bl __dl +/* 8032C2FC 0032923C 4B FA 2A 41 */ bl __dl__FPv lbl_8032C300: /* 8032C300 00329240 7F E3 FB 78 */ mr r3, r31 /* 8032C304 00329244 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphAnimator/J3DJointTree.s b/asm/J3DGraphAnimator/J3DJointTree.s index ce2a089303..8cc7323f36 100644 --- a/asm/J3DGraphAnimator/J3DJointTree.s +++ b/asm/J3DGraphAnimator/J3DJointTree.s @@ -241,7 +241,7 @@ J3DMtxCalc_NS_setMtxBuffer: /* 80325D5C 00322C9C 7F E0 07 35 */ extsh. r0, r31 /* 80325D60 00322CA0 40 81 00 0C */ ble lbl_80325D6C /* 80325D64 00322CA4 7F C3 F3 78 */ mr r3, r30 -/* 80325D68 00322CA8 4B FA 8F D5 */ bl __dl +/* 80325D68 00322CA8 4B FA 8F D5 */ bl __dl__FPv lbl_80325D6C: /* 80325D6C 00322CAC 7F C3 F3 78 */ mr r3, r30 /* 80325D70 00322CB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index 034a4bfec5..5f853ae145 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -45,7 +45,7 @@ J3DMaterialTable_NS_dtor: /* 8032F624 0032C564 90 1F 00 00 */ stw r0, 0(r31) /* 8032F628 0032C568 7C 80 07 35 */ extsh. r0, r4 /* 8032F62C 0032C56C 40 81 00 08 */ ble lbl_8032F634 -/* 8032F630 0032C570 4B F9 F7 0D */ bl __dl +/* 8032F630 0032C570 4B F9 F7 0D */ bl __dl__FPv lbl_8032F634: /* 8032F634 0032C574 7F E3 FB 78 */ mr r3, r31 /* 8032F638 0032C578 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -376,7 +376,7 @@ lbl_8032FA60: /* 8032FA84 0032C9C4 28 03 00 00 */ cmplwi r3, 0 /* 8032FA88 0032C9C8 40 82 00 40 */ bne lbl_8032FAC8 /* 8032FA8C 0032C9CC 38 60 00 94 */ li r3, 0x94 -/* 8032FA90 0032C9D0 4B F9 F1 BD */ bl __nw +/* 8032FA90 0032C9D0 4B F9 F1 BD */ bl __nw__FUl /* 8032FA94 0032C9D4 7C 79 1B 79 */ or. r25, r3, r3 /* 8032FA98 0032C9D8 41 82 00 10 */ beq lbl_8032FAA8 /* 8032FA9C 0032C9DC 3C 80 80 3A */ lis r4, lbl_803A1F1C@ha diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index 6f750281e9..5fdf4b90ca 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -52,7 +52,7 @@ J3DModel_NS_entryModelData: /* 803271A4 003240E4 7C DC 33 78 */ mr r28, r6 /* 803271A8 003240E8 93 63 00 04 */ stw r27, 4(r3) /* 803271AC 003240EC 38 60 00 3C */ li r3, 0x3c -/* 803271B0 003240F0 4B FA 7A 9D */ bl __nw +/* 803271B0 003240F0 4B FA 7A 9D */ bl __nw__FUl /* 803271B4 003240F4 7C 7D 1B 79 */ or. r29, r3, r3 /* 803271B8 003240F8 41 82 00 14 */ beq lbl_803271CC /* 803271BC 003240FC 3C 80 80 3D */ lis r4, lbl_803CED44@ha @@ -166,7 +166,7 @@ J3DModel_NS_createShapePacket: /* 80327328 00324268 54 1D 04 3E */ clrlwi r29, r0, 0x10 /* 8032732C 0032426C 1C 7D 00 3C */ mulli r3, r29, 0x3c /* 80327330 00324270 38 63 00 10 */ addi r3, r3, 0x10 -/* 80327334 00324274 4B FA 79 91 */ bl __nwa +/* 80327334 00324274 4B FA 79 91 */ bl __nwa__FUl .global J3DShapePacket /* 80327338 00324278 3C 80 80 31 */ lis r4, J3DShapePacket@ha .global J3DShapePacket @@ -230,7 +230,7 @@ J3DModel_NS_createMatPacket: /* 803273F8 00324338 54 17 04 3E */ clrlwi r23, r0, 0x10 /* 803273FC 0032433C 54 03 32 B2 */ rlwinm r3, r0, 6, 0xa, 0x19 /* 80327400 00324340 38 63 00 10 */ addi r3, r3, 0x10 -/* 80327404 00324344 4B FA 78 C1 */ bl __nwa +/* 80327404 00324344 4B FA 78 C1 */ bl __nwa__FUl .global J3DMatPacket /* 80327408 00324348 3C 80 80 31 */ lis r4, J3DMatPacket@ha .global J3DMatPacket @@ -1353,7 +1353,7 @@ lbl_80328340: /* 80328388 003252C8 7F E0 07 35 */ extsh. r0, r31 /* 8032838C 003252CC 40 81 00 0C */ ble lbl_80328398 /* 80328390 003252D0 7F C3 F3 78 */ mr r3, r30 -/* 80328394 003252D4 4B FA 69 A9 */ bl __dl +/* 80328394 003252D4 4B FA 69 A9 */ bl __dl__FPv lbl_80328398: /* 80328398 003252D8 7F C3 F3 78 */ mr r3, r30 /* 8032839C 003252DC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1373,7 +1373,7 @@ lbl_80328398: /* 803283D4 00325314 90 1F 00 38 */ stw r0, 0x38(r31) /* 803283D8 00325318 7C 80 07 35 */ extsh. r0, r4 /* 803283DC 0032531C 40 81 00 08 */ ble lbl_803283E4 -/* 803283E0 00325320 4B FA 69 5D */ bl __dl +/* 803283E0 00325320 4B FA 69 5D */ bl __dl__FPv lbl_803283E4: /* 803283E4 00325324 7F E3 FB 78 */ mr r3, r31 /* 803283E8 00325328 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphAnimator/J3DModelData.s b/asm/J3DGraphAnimator/J3DModelData.s index ff2784548e..32ccb24dfa 100644 --- a/asm/J3DGraphAnimator/J3DModelData.s +++ b/asm/J3DGraphAnimator/J3DModelData.s @@ -290,7 +290,7 @@ lbl_8032611C: /* 80326154 00323094 90 1F 00 00 */ stw r0, 0(r31) /* 80326158 00323098 7C 80 07 35 */ extsh. r0, r4 /* 8032615C 0032309C 40 81 00 08 */ ble lbl_80326164 -/* 80326160 003230A0 4B FA 8B DD */ bl __dl +/* 80326160 003230A0 4B FA 8B DD */ bl __dl__FPv lbl_80326164: /* 80326164 003230A4 7F E3 FB 78 */ mr r3, r31 /* 80326168 003230A8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -330,7 +330,7 @@ lbl_803261E8: /* 803261E8 00323128 7F E0 07 35 */ extsh. r0, r31 /* 803261EC 0032312C 40 81 00 0C */ ble lbl_803261F8 /* 803261F0 00323130 7F C3 F3 78 */ mr r3, r30 -/* 803261F4 00323134 4B FA 8B 49 */ bl __dl +/* 803261F4 00323134 4B FA 8B 49 */ bl __dl__FPv lbl_803261F8: /* 803261F8 00323138 7F C3 F3 78 */ mr r3, r30 /* 803261FC 0032313C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index 1a8a515e93..7f79e7ccd1 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -116,11 +116,11 @@ J3DMtxBuffer_NS_createAnmMtx: /* 80326384 003232C4 28 00 00 00 */ cmplwi r0, 0 /* 80326388 003232C8 41 82 00 28 */ beq lbl_803263B0 /* 8032638C 003232CC 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80326390 003232D0 4B FA 89 35 */ bl __nwa +/* 80326390 003232D0 4B FA 89 35 */ bl __nwa__FUl /* 80326394 003232D4 90 7E 00 04 */ stw r3, 4(r30) /* 80326398 003232D8 A0 1F 00 2C */ lhz r0, 0x2c(r31) /* 8032639C 003232DC 1C 60 00 30 */ mulli r3, r0, 0x30 -/* 803263A0 003232E0 4B FA 89 25 */ bl __nwa +/* 803263A0 003232E0 4B FA 89 25 */ bl __nwa__FUl /* 803263A4 003232E4 90 7E 00 0C */ stw r3, 0xc(r30) /* 803263A8 003232E8 80 1E 00 0C */ lwz r0, 0xc(r30) /* 803263AC 003232EC 90 1E 00 34 */ stw r0, 0x34(r30) @@ -157,11 +157,11 @@ J3DMtxBuffer_NS_createWeightEnvelopeMtx: /* 80326410 00323350 28 00 00 00 */ cmplwi r0, 0 /* 80326414 00323354 41 82 00 20 */ beq lbl_80326434 /* 80326418 00323358 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8032641C 0032335C 4B FA 88 A9 */ bl __nwa +/* 8032641C 0032335C 4B FA 88 A9 */ bl __nwa__FUl /* 80326420 00323360 90 7E 00 08 */ stw r3, 8(r30) /* 80326424 00323364 A0 1F 00 2E */ lhz r0, 0x2e(r31) /* 80326428 00323368 1C 60 00 30 */ mulli r3, r0, 0x30 -/* 8032642C 0032336C 4B FA 88 99 */ bl __nwa +/* 8032642C 0032336C 4B FA 88 99 */ bl __nwa__FUl /* 80326430 00323370 90 7E 00 10 */ stw r3, 0x10(r30) lbl_80326434: /* 80326434 00323374 A0 7F 00 2E */ lhz r3, 0x2e(r31) @@ -221,11 +221,11 @@ J3DMtxBuffer_NS_createDoubleDrawMtx: /* 803264E8 00323428 7F 7C DB 78 */ mr r28, r27 lbl_803264EC: /* 803264EC 0032342C 7F 43 D3 78 */ mr r3, r26 -/* 803264F0 00323430 4B FA 87 D5 */ bl __nwa +/* 803264F0 00323430 4B FA 87 D5 */ bl __nwa__FUl /* 803264F4 00323434 7F 3D DA 14 */ add r25, r29, r27 /* 803264F8 00323438 90 79 00 14 */ stw r3, 0x14(r25) /* 803264FC 0032343C 7F 43 D3 78 */ mr r3, r26 -/* 80326500 00323440 4B FA 87 C5 */ bl __nwa +/* 80326500 00323440 4B FA 87 C5 */ bl __nwa__FUl /* 80326504 00323444 90 79 00 1C */ stw r3, 0x1c(r25) /* 80326508 00323448 93 99 00 24 */ stw r28, 0x24(r25) /* 8032650C 0032344C 3B 18 00 01 */ addi r24, r24, 1 @@ -269,13 +269,13 @@ lbl_8032657C: /* 80326588 003234C8 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 8032658C 003234CC 1C 60 00 30 */ mulli r3, r0, 0x30 /* 80326590 003234D0 38 80 00 20 */ li r4, 0x20 -/* 80326594 003234D4 4B FA 87 59 */ bl __nwa_X1_ +/* 80326594 003234D4 4B FA 87 59 */ bl __nwa__FUli /* 80326598 003234D8 80 99 00 14 */ lwz r4, 0x14(r25) /* 8032659C 003234DC 7C 64 D9 2E */ stwx r3, r4, r27 /* 803265A0 003234E0 A0 1E 00 44 */ lhz r0, 0x44(r30) /* 803265A4 003234E4 1C 60 00 24 */ mulli r3, r0, 0x24 /* 803265A8 003234E8 38 80 00 20 */ li r4, 0x20 -/* 803265AC 003234EC 4B FA 87 41 */ bl __nwa_X1_ +/* 803265AC 003234EC 4B FA 87 41 */ bl __nwa__FUli /* 803265B0 003234F0 80 99 00 1C */ lwz r4, 0x1c(r25) /* 803265B4 003234F4 7C 64 D9 2E */ stwx r3, r4, r27 lbl_803265B8: @@ -379,7 +379,7 @@ lbl_803266E4: /* 80326708 00323648 57 B3 13 BA */ rlwinm r19, r29, 2, 0xe, 0x1d lbl_8032670C: /* 8032670C 0032364C 7E 63 9B 78 */ mr r3, r19 -/* 80326710 00323650 4B FA 85 B5 */ bl __nwa +/* 80326710 00323650 4B FA 85 B5 */ bl __nwa__FUl /* 80326714 00323654 38 15 00 24 */ addi r0, r21, 0x24 /* 80326718 00323658 7C 77 01 2E */ stwx r3, r23, r0 /* 8032671C 0032365C 7C 17 00 2E */ lwzx r0, r23, r0 @@ -416,7 +416,7 @@ lbl_80326764: /* 80326788 003236C8 28 00 00 01 */ cmplwi r0, 1 /* 8032678C 003236CC 40 82 00 3C */ bne lbl_803267C8 /* 80326790 003236D0 7F C3 F3 78 */ mr r3, r30 -/* 80326794 003236D4 4B FA 85 31 */ bl __nwa +/* 80326794 003236D4 4B FA 85 31 */ bl __nwa__FUl /* 80326798 003236D8 7C 97 F8 2E */ lwzx r4, r23, r31 /* 8032679C 003236DC 7C 64 A9 2E */ stwx r3, r4, r21 /* 803267A0 003236E0 7C 77 F8 2E */ lwzx r3, r23, r31 @@ -467,7 +467,7 @@ lbl_8032683C: /* 8032683C 0032377C A0 18 00 44 */ lhz r0, 0x44(r24) /* 80326840 00323780 1C 60 00 24 */ mulli r3, r0, 0x24 /* 80326844 00323784 38 80 00 20 */ li r4, 0x20 -/* 80326848 00323788 4B FA 84 A5 */ bl __nwa_X1_ +/* 80326848 00323788 4B FA 84 A5 */ bl __nwa__FUli /* 8032684C 0032378C 7C 17 F0 2E */ lwzx r0, r23, r30 /* 80326850 00323790 7C 9F 00 2E */ lwzx r4, r31, r0 /* 80326854 00323794 7C 64 B1 2E */ stwx r3, r4, r22 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index 46726e65bd..05f893e2b8 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -244,7 +244,7 @@ lbl_8032CA34: /* 8032CA40 00329980 54 1E 04 3E */ clrlwi r30, r0, 0x10 /* 8032CA44 00329984 1C 7E 00 14 */ mulli r3, r30, 0x14 /* 8032CA48 00329988 38 63 00 10 */ addi r3, r3, 0x10 -/* 8032CA4C 0032998C 4B FA 22 79 */ bl __nwa +/* 8032CA4C 0032998C 4B FA 22 79 */ bl __nwa__FUl .global J3DSkinNList /* 8032CA50 00329990 3C 80 80 33 */ lis r4, J3DSkinNList@ha .global J3DSkinNList @@ -372,14 +372,14 @@ lbl_8032CBF4: /* 8032CC08 00329B48 28 00 00 00 */ cmplwi r0, 0 /* 8032CC0C 00329B4C 41 82 00 44 */ beq lbl_8032CC50 /* 8032CC10 00329B50 54 03 0B FC */ rlwinm r3, r0, 1, 0xf, 0x1e -/* 8032CC14 00329B54 4B FA 20 B1 */ bl __nwa +/* 8032CC14 00329B54 4B FA 20 B1 */ bl __nwa__FUl /* 8032CC18 00329B58 80 9C 00 24 */ lwz r4, 0x24(r28) /* 8032CC1C 00329B5C 7C 64 F9 2E */ stwx r3, r4, r31 /* 8032CC20 00329B60 80 7C 00 24 */ lwz r3, 0x24(r28) /* 8032CC24 00329B64 38 1F 00 10 */ addi r0, r31, 0x10 /* 8032CC28 00329B68 7C 03 02 2E */ lhzx r0, r3, r0 /* 8032CC2C 00329B6C 54 03 10 3A */ slwi r3, r0, 2 -/* 8032CC30 00329B70 4B FA 20 95 */ bl __nwa +/* 8032CC30 00329B70 4B FA 20 95 */ bl __nwa__FUl /* 8032CC34 00329B74 80 9C 00 24 */ lwz r4, 0x24(r28) /* 8032CC38 00329B78 38 1F 00 08 */ addi r0, r31, 8 /* 8032CC3C 00329B7C 7C 64 01 2E */ stwx r3, r4, r0 @@ -394,7 +394,7 @@ lbl_8032CC50: /* 8032CC5C 00329B9C 28 00 00 00 */ cmplwi r0, 0 /* 8032CC60 00329BA0 41 82 00 48 */ beq lbl_8032CCA8 /* 8032CC64 00329BA4 54 03 0B FC */ rlwinm r3, r0, 1, 0xf, 0x1e -/* 8032CC68 00329BA8 4B FA 20 5D */ bl __nwa +/* 8032CC68 00329BA8 4B FA 20 5D */ bl __nwa__FUl /* 8032CC6C 00329BAC 80 9C 00 24 */ lwz r4, 0x24(r28) /* 8032CC70 00329BB0 38 1F 00 04 */ addi r0, r31, 4 /* 8032CC74 00329BB4 7C 64 01 2E */ stwx r3, r4, r0 @@ -402,7 +402,7 @@ lbl_8032CC50: /* 8032CC7C 00329BBC 38 1F 00 12 */ addi r0, r31, 0x12 /* 8032CC80 00329BC0 7C 03 02 2E */ lhzx r0, r3, r0 /* 8032CC84 00329BC4 54 03 10 3A */ slwi r3, r0, 2 -/* 8032CC88 00329BC8 4B FA 20 3D */ bl __nwa +/* 8032CC88 00329BC8 4B FA 20 3D */ bl __nwa__FUl /* 8032CC8C 00329BCC 80 9C 00 24 */ lwz r4, 0x24(r28) /* 8032CC90 00329BD0 38 1F 00 0C */ addi r0, r31, 0xc /* 8032CC94 00329BD4 7C 64 01 2E */ stwx r3, r4, r0 @@ -610,7 +610,7 @@ J3DSkinDeform_NS_initMtxIndexArray: lbl_8032CF80: /* 8032CF80 00329EC0 80 10 00 88 */ lwz r0, 0x88(r16) /* 8032CF84 00329EC4 54 03 08 3C */ slwi r3, r0, 1 -/* 8032CF88 00329EC8 4B FA 1D 3D */ bl __nwa +/* 8032CF88 00329EC8 4B FA 1D 3D */ bl __nwa__FUl /* 8032CF8C 00329ECC 90 6F 00 04 */ stw r3, 4(r15) /* 8032CF90 00329ED0 80 0F 00 04 */ lwz r0, 4(r15) /* 8032CF94 00329ED4 28 00 00 00 */ cmplwi r0, 0 @@ -636,7 +636,7 @@ lbl_8032CFC8: /* 8032CFD8 00329F18 28 00 00 00 */ cmplwi r0, 0 /* 8032CFDC 00329F1C 41 82 00 54 */ beq lbl_8032D030 /* 8032CFE0 00329F20 54 03 08 3C */ slwi r3, r0, 1 -/* 8032CFE4 00329F24 4B FA 1C E1 */ bl __nwa +/* 8032CFE4 00329F24 4B FA 1C E1 */ bl __nwa__FUl /* 8032CFE8 00329F28 90 6F 00 08 */ stw r3, 8(r15) /* 8032CFEC 00329F2C 80 0F 00 08 */ lwz r0, 8(r15) /* 8032CFF0 00329F30 28 00 00 00 */ cmplwi r0, 0 @@ -664,12 +664,12 @@ lbl_8032D030: lbl_8032D038: /* 8032D038 00329F78 A0 10 00 2C */ lhz r0, 0x2c(r16) /* 8032D03C 00329F7C 1C 60 00 30 */ mulli r3, r0, 0x30 -/* 8032D040 00329F80 4B FA 1C 85 */ bl __nwa +/* 8032D040 00329F80 4B FA 1C 85 */ bl __nwa__FUl /* 8032D044 00329F84 90 6F 00 0C */ stw r3, 0xc(r15) /* 8032D048 00329F88 A0 10 00 44 */ lhz r0, 0x44(r16) /* 8032D04C 00329F8C 1C 60 00 24 */ mulli r3, r0, 0x24 /* 8032D050 00329F90 38 80 00 20 */ li r4, 0x20 -/* 8032D054 00329F94 4B FA 1C 99 */ bl __nwa_X1_ +/* 8032D054 00329F94 4B FA 1C 99 */ bl __nwa__FUli /* 8032D058 00329F98 90 6F 00 10 */ stw r3, 0x10(r15) /* 8032D05C 00329F9C 80 0F 00 0C */ lwz r0, 0xc(r15) /* 8032D060 00329FA0 28 00 00 00 */ cmplwi r0, 0 @@ -1926,7 +1926,7 @@ J3DVtxColorCalc_NS_calc: /* 8032E1D0 0032B110 90 1F 00 00 */ stw r0, 0(r31) /* 8032E1D4 0032B114 7C 80 07 35 */ extsh. r0, r4 /* 8032E1D8 0032B118 40 81 00 08 */ ble lbl_8032E1E0 -/* 8032E1DC 0032B11C 4B FA 0B 61 */ bl __dl +/* 8032E1DC 0032B11C 4B FA 0B 61 */ bl __dl__FPv lbl_8032E1E0: /* 8032E1E0 0032B120 7F E3 FB 78 */ mr r3, r31 /* 8032E1E4 0032B124 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DDrawBuffer.s b/asm/J3DGraphBase/J3DDrawBuffer.s index 73aa1e2fb3..eb63c0669f 100644 --- a/asm/J3DGraphBase/J3DDrawBuffer.s +++ b/asm/J3DGraphBase/J3DDrawBuffer.s @@ -43,7 +43,7 @@ J3DDrawBuffer_NS_allocBuffer: /* 80324F88 00321EC8 7C 9F 23 78 */ mr r31, r4 /* 80324F8C 00321ECC 54 83 10 3A */ slwi r3, r4, 2 /* 80324F90 00321ED0 38 80 00 20 */ li r4, 0x20 -/* 80324F94 00321ED4 4B FA 9D 59 */ bl __nwa_X1_ +/* 80324F94 00321ED4 4B FA 9D 59 */ bl __nwa__FUli /* 80324F98 00321ED8 90 7E 00 00 */ stw r3, 0(r30) /* 80324F9C 00321EDC 80 1E 00 00 */ lwz r0, 0(r30) /* 80324FA0 00321EE0 28 00 00 00 */ cmplwi r0, 0 @@ -87,13 +87,13 @@ J3DDrawBuffer_NS_dtor: /* 80325024 00321F64 41 82 00 28 */ beq lbl_8032504C /* 80325028 00321F68 48 00 00 41 */ bl J3DDrawBuffer_NS_frameInit /* 8032502C 00321F6C 80 7E 00 00 */ lwz r3, 0(r30) -/* 80325030 00321F70 4B FA 9D 31 */ bl __dla +/* 80325030 00321F70 4B FA 9D 31 */ bl __dla__FPv /* 80325034 00321F74 38 00 00 00 */ li r0, 0 /* 80325038 00321F78 90 1E 00 00 */ stw r0, 0(r30) /* 8032503C 00321F7C 7F E0 07 35 */ extsh. r0, r31 /* 80325040 00321F80 40 81 00 0C */ ble lbl_8032504C /* 80325044 00321F84 7F C3 F3 78 */ mr r3, r30 -/* 80325048 00321F88 4B FA 9C F5 */ bl __dl +/* 80325048 00321F88 4B FA 9C F5 */ bl __dl__FPv lbl_8032504C: /* 8032504C 00321F8C 7F C3 F3 78 */ mr r3, r30 /* 80325050 00321F90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index 19722e542b..da374a5650 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -10996,7 +10996,7 @@ lbl_80321AA4: /* 80321AA4 0031E9E4 7C 80 07 35 */ extsh. r0, r4 /* 80321AA8 0031E9E8 40 81 00 0C */ ble lbl_80321AB4 /* 80321AAC 0031E9EC 7F E3 FB 78 */ mr r3, r31 -/* 80321AB0 0031E9F0 4B FA D2 8D */ bl __dl +/* 80321AB0 0031E9F0 4B FA D2 8D */ bl __dl__FPv lbl_80321AB4: /* 80321AB4 0031E9F4 7F E3 FB 78 */ mr r3, r31 /* 80321AB8 0031E9F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11084,7 +11084,7 @@ lbl_80321BF8: /* 80321BF8 0031EB38 7C 80 07 35 */ extsh. r0, r4 /* 80321BFC 0031EB3C 40 81 00 0C */ ble lbl_80321C08 /* 80321C00 0031EB40 7F E3 FB 78 */ mr r3, r31 -/* 80321C04 0031EB44 4B FA D1 39 */ bl __dl +/* 80321C04 0031EB44 4B FA D1 39 */ bl __dl__FPv lbl_80321C08: /* 80321C08 0031EB48 7F E3 FB 78 */ mr r3, r31 /* 80321C0C 0031EB4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11326,7 +11326,7 @@ lbl_80321FB8: /* 80321FB8 0031EEF8 7C 80 07 35 */ extsh. r0, r4 /* 80321FBC 0031EEFC 40 81 00 0C */ ble lbl_80321FC8 /* 80321FC0 0031EF00 7F E3 FB 78 */ mr r3, r31 -/* 80321FC4 0031EF04 4B FA CD 79 */ bl __dl +/* 80321FC4 0031EF04 4B FA CD 79 */ bl __dl__FPv lbl_80321FC8: /* 80321FC8 0031EF08 7F E3 FB 78 */ mr r3, r31 /* 80321FCC 0031EF0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11571,7 +11571,7 @@ lbl_80322384: /* 80322384 0031F2C4 7C 80 07 35 */ extsh. r0, r4 /* 80322388 0031F2C8 40 81 00 0C */ ble lbl_80322394 /* 8032238C 0031F2CC 7F E3 FB 78 */ mr r3, r31 -/* 80322390 0031F2D0 4B FA C9 AD */ bl __dl +/* 80322390 0031F2D0 4B FA C9 AD */ bl __dl__FPv lbl_80322394: /* 80322394 0031F2D4 7F E3 FB 78 */ mr r3, r31 /* 80322398 0031F2D8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11814,7 +11814,7 @@ lbl_80322748: /* 80322748 0031F688 7C 80 07 35 */ extsh. r0, r4 /* 8032274C 0031F68C 40 81 00 0C */ ble lbl_80322758 /* 80322750 0031F690 7F E3 FB 78 */ mr r3, r31 -/* 80322754 0031F694 4B FA C5 E9 */ bl __dl +/* 80322754 0031F694 4B FA C5 E9 */ bl __dl__FPv lbl_80322758: /* 80322758 0031F698 7F E3 FB 78 */ mr r3, r31 /* 8032275C 0031F69C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11936,7 +11936,7 @@ lbl_80322928: /* 80322928 0031F868 7C 80 07 35 */ extsh. r0, r4 /* 8032292C 0031F86C 40 81 00 0C */ ble lbl_80322938 /* 80322930 0031F870 7F E3 FB 78 */ mr r3, r31 -/* 80322934 0031F874 4B FA C4 09 */ bl __dl +/* 80322934 0031F874 4B FA C4 09 */ bl __dl__FPv lbl_80322938: /* 80322938 0031F878 7F E3 FB 78 */ mr r3, r31 /* 8032293C 0031F87C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12137,7 +12137,7 @@ lbl_80322C44: /* 80322C44 0031FB84 7C 80 07 35 */ extsh. r0, r4 /* 80322C48 0031FB88 40 81 00 0C */ ble lbl_80322C54 /* 80322C4C 0031FB8C 7F E3 FB 78 */ mr r3, r31 -/* 80322C50 0031FB90 4B FA C0 ED */ bl __dl +/* 80322C50 0031FB90 4B FA C0 ED */ bl __dl__FPv lbl_80322C54: /* 80322C54 0031FB94 7F E3 FB 78 */ mr r3, r31 /* 80322C58 0031FB98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12189,7 +12189,7 @@ lbl_80322D0C: /* 80322D0C 0031FC4C 7C 80 07 35 */ extsh. r0, r4 /* 80322D10 0031FC50 40 81 00 0C */ ble lbl_80322D1C /* 80322D14 0031FC54 7F E3 FB 78 */ mr r3, r31 -/* 80322D18 0031FC58 4B FA C0 25 */ bl __dl +/* 80322D18 0031FC58 4B FA C0 25 */ bl __dl__FPv lbl_80322D1C: /* 80322D1C 0031FC5C 7F E3 FB 78 */ mr r3, r31 /* 80322D20 0031FC60 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12270,7 +12270,7 @@ lbl_80322E48: /* 80322E48 0031FD88 7C 80 07 35 */ extsh. r0, r4 /* 80322E4C 0031FD8C 40 81 00 0C */ ble lbl_80322E58 /* 80322E50 0031FD90 7F E3 FB 78 */ mr r3, r31 -/* 80322E54 0031FD94 4B FA BE E9 */ bl __dl +/* 80322E54 0031FD94 4B FA BE E9 */ bl __dl__FPv lbl_80322E58: /* 80322E58 0031FD98 7F E3 FB 78 */ mr r3, r31 /* 80322E5C 0031FD9C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12401,7 +12401,7 @@ lbl_8032304C: /* 8032304C 0031FF8C 7C 80 07 35 */ extsh. r0, r4 /* 80323050 0031FF90 40 81 00 0C */ ble lbl_8032305C /* 80323054 0031FF94 7F E3 FB 78 */ mr r3, r31 -/* 80323058 0031FF98 4B FA BC E5 */ bl __dl +/* 80323058 0031FF98 4B FA BC E5 */ bl __dl__FPv lbl_8032305C: /* 8032305C 0031FF9C 7F E3 FB 78 */ mr r3, r31 /* 80323060 0031FFA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12460,7 +12460,7 @@ lbl_80323130: /* 80323130 00320070 7C 80 07 35 */ extsh. r0, r4 /* 80323134 00320074 40 81 00 0C */ ble lbl_80323140 /* 80323138 00320078 7F E3 FB 78 */ mr r3, r31 -/* 8032313C 0032007C 4B FA BC 01 */ bl __dl +/* 8032313C 0032007C 4B FA BC 01 */ bl __dl__FPv lbl_80323140: /* 80323140 00320080 7F E3 FB 78 */ mr r3, r31 /* 80323144 00320084 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12552,7 +12552,7 @@ lbl_80323298: /* 80323298 003201D8 7C 80 07 35 */ extsh. r0, r4 /* 8032329C 003201DC 40 81 00 0C */ ble lbl_803232A8 /* 803232A0 003201E0 7F E3 FB 78 */ mr r3, r31 -/* 803232A4 003201E4 4B FA BA 99 */ bl __dl +/* 803232A4 003201E4 4B FA BA 99 */ bl __dl__FPv lbl_803232A8: /* 803232A8 003201E8 7F E3 FB 78 */ mr r3, r31 /* 803232AC 003201EC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12580,7 +12580,7 @@ lbl_80323300: /* 80323300 00320240 7C 80 07 35 */ extsh. r0, r4 /* 80323304 00320244 40 81 00 0C */ ble lbl_80323310 /* 80323308 00320248 7F E3 FB 78 */ mr r3, r31 -/* 8032330C 0032024C 4B FA BA 31 */ bl __dl +/* 8032330C 0032024C 4B FA BA 31 */ bl __dl__FPv lbl_80323310: /* 80323310 00320250 7F E3 FB 78 */ mr r3, r31 /* 80323314 00320254 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12608,7 +12608,7 @@ lbl_80323368: /* 80323368 003202A8 7C 80 07 35 */ extsh. r0, r4 /* 8032336C 003202AC 40 81 00 0C */ ble lbl_80323378 /* 80323370 003202B0 7F E3 FB 78 */ mr r3, r31 -/* 80323374 003202B4 4B FA B9 C9 */ bl __dl +/* 80323374 003202B4 4B FA B9 C9 */ bl __dl__FPv lbl_80323378: /* 80323378 003202B8 7F E3 FB 78 */ mr r3, r31 /* 8032337C 003202BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12720,7 +12720,7 @@ lbl_80323510: /* 80323510 00320450 7F E0 07 35 */ extsh. r0, r31 /* 80323514 00320454 40 81 00 0C */ ble lbl_80323520 /* 80323518 00320458 7F C3 F3 78 */ mr r3, r30 -/* 8032351C 0032045C 4B FA B8 21 */ bl __dl +/* 8032351C 0032045C 4B FA B8 21 */ bl __dl__FPv lbl_80323520: /* 80323520 00320460 7F C3 F3 78 */ mr r3, r30 /* 80323524 00320464 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DMaterial.s b/asm/J3DGraphBase/J3DMaterial.s index 2c9e56aafc..09d4dea096 100644 --- a/asm/J3DGraphBase/J3DMaterial.s +++ b/asm/J3DGraphBase/J3DMaterial.s @@ -26,7 +26,7 @@ lbl_803157D8: /* 803157E4 00312724 48 00 01 A0 */ b lbl_80315984 lbl_803157E8: /* 803157E8 00312728 38 60 00 20 */ li r3, 0x20 -/* 803157EC 0031272C 4B FB 94 61 */ bl __nw +/* 803157EC 0031272C 4B FB 94 61 */ bl __nw__FUl /* 803157F0 00312730 7C 7F 1B 79 */ or. r31, r3, r3 /* 803157F4 00312734 41 82 00 5C */ beq lbl_80315850 /* 803157F8 00312738 3C 60 80 3D */ lis r3, lbl_803CDEA0@ha @@ -60,7 +60,7 @@ lbl_80315850: /* 80315854 00312794 48 00 01 30 */ b lbl_80315984 lbl_80315858: /* 80315858 00312798 38 60 00 4C */ li r3, 0x4c -/* 8031585C 0031279C 4B FB 93 F1 */ bl __nw +/* 8031585C 0031279C 4B FB 93 F1 */ bl __nw__FUl /* 80315860 003127A0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315864 003127A4 41 82 00 78 */ beq lbl_803158DC /* 80315868 003127A8 3C 60 80 3D */ lis r3, lbl_803CDEA0@ha @@ -103,7 +103,7 @@ lbl_803158DC: /* 803158E0 00312820 48 00 00 A4 */ b lbl_80315984 lbl_803158E4: /* 803158E4 00312824 38 60 00 28 */ li r3, 0x28 -/* 803158E8 00312828 4B FB 93 65 */ bl __nw +/* 803158E8 00312828 4B FB 93 65 */ bl __nw__FUl /* 803158EC 0031282C 7C 7F 1B 79 */ or. r31, r3, r3 /* 803158F0 00312830 41 82 00 90 */ beq lbl_80315980 /* 803158F4 00312834 7F FE FB 78 */ mr r30, r31 @@ -174,7 +174,7 @@ J3DMaterial_NS_createTexGenBlock: /* 803159CC 0031290C 48 00 00 94 */ b lbl_80315A60 lbl_803159D0: /* 803159D0 00312910 38 60 00 6C */ li r3, 0x6c -/* 803159D4 00312914 4B FB 92 79 */ bl __nw +/* 803159D4 00312914 4B FB 92 79 */ bl __nw__FUl /* 803159D8 00312918 7C 7F 1B 79 */ or. r31, r3, r3 /* 803159DC 0031291C 41 82 00 7C */ beq lbl_80315A58 /* 803159E0 00312920 7F FE FB 78 */ mr r30, r31 @@ -214,7 +214,7 @@ lbl_80315A58: /* 80315A5C 0031299C 48 00 00 90 */ b lbl_80315AEC lbl_80315A60: /* 80315A60 003129A0 38 60 00 6C */ li r3, 0x6c -/* 80315A64 003129A4 4B FB 91 E9 */ bl __nw +/* 80315A64 003129A4 4B FB 91 E9 */ bl __nw__FUl /* 80315A68 003129A8 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315A6C 003129AC 41 82 00 7C */ beq lbl_80315AE8 /* 80315A70 003129B0 7F FE FB 78 */ mr r30, r31 @@ -269,7 +269,7 @@ J3DMaterial_NS_createTevBlock: /* 80315B18 00312A58 2C 03 00 01 */ cmpwi r3, 1 /* 80315B1C 00312A5C 41 81 00 90 */ bgt lbl_80315BAC /* 80315B20 00312A60 38 60 00 1C */ li r3, 0x1c -/* 80315B24 00312A64 4B FB 91 29 */ bl __nw +/* 80315B24 00312A64 4B FB 91 29 */ bl __nw__FUl /* 80315B28 00312A68 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315B2C 00312A6C 41 82 00 78 */ beq lbl_80315BA4 /* 80315B30 00312A70 3C 60 80 3D */ lis r3, lbl_803CE958@ha @@ -312,7 +312,7 @@ lbl_80315BAC: /* 80315BAC 00312AEC 2C 03 00 02 */ cmpwi r3, 2 /* 80315BB0 00312AF0 40 82 00 E4 */ bne lbl_80315C94 /* 80315BB4 00312AF4 38 60 00 6C */ li r3, 0x6c -/* 80315BB8 00312AF8 4B FB 90 95 */ bl __nw +/* 80315BB8 00312AF8 4B FB 90 95 */ bl __nw__FUl /* 80315BBC 00312AFC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315BC0 00312B00 41 82 00 CC */ beq lbl_80315C8C /* 80315BC4 00312B04 3C 60 80 3D */ lis r3, lbl_803CE958@ha @@ -382,7 +382,7 @@ lbl_80315C94: /* 80315C94 00312BD4 2C 03 00 04 */ cmpwi r3, 4 /* 80315C98 00312BD8 41 81 00 E4 */ bgt lbl_80315D7C /* 80315C9C 00312BDC 38 60 00 94 */ li r3, 0x94 -/* 80315CA0 00312BE0 4B FB 8F AD */ bl __nw +/* 80315CA0 00312BE0 4B FB 8F AD */ bl __nw__FUl /* 80315CA4 00312BE4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315CA8 00312BE8 41 82 00 CC */ beq lbl_80315D74 /* 80315CAC 00312BEC 3C 60 80 3D */ lis r3, lbl_803CE958@ha @@ -452,7 +452,7 @@ lbl_80315D7C: /* 80315D7C 00312CBC 2C 03 00 10 */ cmpwi r3, 0x10 /* 80315D80 00312CC0 41 81 00 E0 */ bgt lbl_80315E60 /* 80315D84 00312CC4 38 60 01 74 */ li r3, 0x174 -/* 80315D88 00312CC8 4B FB 8E C5 */ bl __nw +/* 80315D88 00312CC8 4B FB 8E C5 */ bl __nw__FUl /* 80315D8C 00312CCC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315D90 00312CD0 41 82 00 CC */ beq lbl_80315E5C /* 80315D94 00312CD4 3C 60 80 3D */ lis r3, lbl_803CE958@ha @@ -534,7 +534,7 @@ J3DMaterial_NS_createIndBlock: /* 80315E88 00312DC8 2C 03 00 00 */ cmpwi r3, 0 /* 80315E8C 00312DCC 41 82 00 98 */ beq lbl_80315F24 /* 80315E90 00312DD0 38 60 00 7C */ li r3, 0x7c -/* 80315E94 00312DD4 4B FB 8D B9 */ bl __nw +/* 80315E94 00312DD4 4B FB 8D B9 */ bl __nw__FUl /* 80315E98 00312DD8 7C 7F 1B 79 */ or. r31, r3, r3 /* 80315E9C 00312DDC 41 82 00 80 */ beq lbl_80315F1C /* 80315EA0 00312DE0 3C 60 80 3D */ lis r3, lbl_803CDDE8@ha @@ -583,7 +583,7 @@ lbl_80315F1C: /* 80315F20 00312E60 48 00 00 2C */ b lbl_80315F4C lbl_80315F24: /* 80315F24 00312E64 38 60 00 04 */ li r3, 4 -/* 80315F28 00312E68 4B FB 8D 25 */ bl __nw +/* 80315F28 00312E68 4B FB 8D 25 */ bl __nw__FUl /* 80315F2C 00312E6C 28 03 00 00 */ cmplwi r3, 0 /* 80315F30 00312E70 41 82 00 1C */ beq lbl_80315F4C /* 80315F34 00312E74 3C 80 80 3D */ lis r4, lbl_803CDDE8@ha @@ -611,7 +611,7 @@ J3DMaterial_NS_createPEBlock: /* 80315F7C 00312EBC 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 80315F80 00312EC0 41 82 00 30 */ beq lbl_80315FB0 /* 80315F84 00312EC4 38 60 00 04 */ li r3, 4 -/* 80315F88 00312EC8 4B FB 8C C5 */ bl __nw +/* 80315F88 00312EC8 4B FB 8C C5 */ bl __nw__FUl /* 80315F8C 00312ECC 28 03 00 00 */ cmplwi r3, 0 /* 80315F90 00312ED0 41 82 01 5C */ beq lbl_803160EC /* 80315F94 00312ED4 3C 80 80 3D */ lis r4, lbl_803CDD20@ha @@ -625,7 +625,7 @@ lbl_80315FB0: /* 80315FB0 00312EF0 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e /* 80315FB4 00312EF4 41 82 00 30 */ beq lbl_80315FE4 /* 80315FB8 00312EF8 38 60 00 04 */ li r3, 4 -/* 80315FBC 00312EFC 4B FB 8C 91 */ bl __nw +/* 80315FBC 00312EFC 4B FB 8C 91 */ bl __nw__FUl /* 80315FC0 00312F00 28 03 00 00 */ cmplwi r3, 0 /* 80315FC4 00312F04 41 82 01 28 */ beq lbl_803160EC /* 80315FC8 00312F08 3C 80 80 3D */ lis r4, lbl_803CDD20@ha @@ -639,7 +639,7 @@ lbl_80315FE4: /* 80315FE4 00312F24 54 80 07 7B */ rlwinm. r0, r4, 0, 0x1d, 0x1d /* 80315FE8 00312F28 41 82 00 30 */ beq lbl_80316018 /* 80315FEC 00312F2C 38 60 00 04 */ li r3, 4 -/* 80315FF0 00312F30 4B FB 8C 5D */ bl __nw +/* 80315FF0 00312F30 4B FB 8C 5D */ bl __nw__FUl /* 80315FF4 00312F34 28 03 00 00 */ cmplwi r3, 0 /* 80315FF8 00312F38 41 82 00 F4 */ beq lbl_803160EC /* 80315FFC 00312F3C 3C 80 80 3D */ lis r4, lbl_803CDD20@ha @@ -654,7 +654,7 @@ lbl_80316018: /* 8031601C 00312F5C 28 00 00 00 */ cmplwi r0, 0 /* 80316020 00312F60 40 82 00 6C */ bne lbl_8031608C /* 80316024 00312F64 38 60 00 40 */ li r3, 0x40 -/* 80316028 00312F68 4B FB 8C 25 */ bl __nw +/* 80316028 00312F68 4B FB 8C 25 */ bl __nw__FUl /* 8031602C 00312F6C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80316030 00312F70 41 82 00 B8 */ beq lbl_803160E8 /* 80316034 00312F74 3C 60 80 3D */ lis r3, lbl_803CDD20@ha @@ -684,7 +684,7 @@ lbl_8031608C: /* 80316090 00312FD0 28 00 00 00 */ cmplwi r0, 0 /* 80316094 00312FD4 40 82 00 54 */ bne lbl_803160E8 /* 80316098 00312FD8 38 60 00 10 */ li r3, 0x10 -/* 8031609C 00312FDC 4B FB 8B B1 */ bl __nw +/* 8031609C 00312FDC 4B FB 8B B1 */ bl __nw__FUl /* 803160A0 00312FE0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803160A4 00312FE4 41 82 00 44 */ beq lbl_803160E8 /* 803160A8 00312FE8 3C 80 80 3D */ lis r4, lbl_803CDD20@ha @@ -1654,7 +1654,7 @@ J3DMaterial_NS_newSharedDisplayList: /* 80316EB0 00313DF0 28 00 00 00 */ cmplwi r0, 0 /* 80316EB4 00313DF4 40 82 00 54 */ bne lbl_80316F08 /* 80316EB8 00313DF8 38 60 00 10 */ li r3, 0x10 -/* 80316EBC 00313DFC 4B FB 7D 91 */ bl __nw +/* 80316EBC 00313DFC 4B FB 7D 91 */ bl __nw__FUl /* 80316EC0 00313E00 28 03 00 00 */ cmplwi r3, 0 /* 80316EC4 00313E04 41 82 00 18 */ beq lbl_80316EDC /* 80316EC8 00313E08 38 00 00 00 */ li r0, 0 @@ -1698,7 +1698,7 @@ J3DMaterial_NS_newSingleSharedDisplayList: /* 80316F44 00313E84 28 00 00 00 */ cmplwi r0, 0 /* 80316F48 00313E88 40 82 00 54 */ bne lbl_80316F9C /* 80316F4C 00313E8C 38 60 00 10 */ li r3, 0x10 -/* 80316F50 00313E90 4B FB 7C FD */ bl __nw +/* 80316F50 00313E90 4B FB 7C FD */ bl __nw__FUl /* 80316F54 00313E94 28 03 00 00 */ cmplwi r3, 0 /* 80316F58 00313E98 41 82 00 18 */ beq lbl_80316F70 /* 80316F5C 00313E9C 38 00 00 00 */ li r0, 0 @@ -1826,7 +1826,7 @@ lbl_80317110: /* 80317110 00314050 7C 80 07 35 */ extsh. r0, r4 /* 80317114 00314054 40 81 00 0C */ ble lbl_80317120 /* 80317118 00314058 7F E3 FB 78 */ mr r3, r31 -/* 8031711C 0031405C 4B FB 7C 21 */ bl __dl +/* 8031711C 0031405C 4B FB 7C 21 */ bl __dl__FPv lbl_80317120: /* 80317120 00314060 7F E3 FB 78 */ mr r3, r31 /* 80317124 00314064 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1845,7 +1845,7 @@ lbl_80317120: /* 80317158 00314098 90 1F 00 00 */ stw r0, 0(r31) /* 8031715C 0031409C 7C 80 07 35 */ extsh. r0, r4 /* 80317160 003140A0 40 81 00 08 */ ble lbl_80317168 -/* 80317164 003140A4 4B FB 7B D9 */ bl __dl +/* 80317164 003140A4 4B FB 7B D9 */ bl __dl__FPv lbl_80317168: /* 80317168 003140A8 7F E3 FB 78 */ mr r3, r31 /* 8031716C 003140AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1870,7 +1870,7 @@ lbl_803171B4: /* 803171B4 003140F4 7C 80 07 35 */ extsh. r0, r4 /* 803171B8 003140F8 40 81 00 0C */ ble lbl_803171C4 /* 803171BC 003140FC 7F E3 FB 78 */ mr r3, r31 -/* 803171C0 00314100 4B FB 7B 7D */ bl __dl +/* 803171C0 00314100 4B FB 7B 7D */ bl __dl__FPv lbl_803171C4: /* 803171C4 00314104 7F E3 FB 78 */ mr r3, r31 /* 803171C8 00314108 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1889,7 +1889,7 @@ lbl_803171C4: /* 803171FC 0031413C 90 1F 00 00 */ stw r0, 0(r31) /* 80317200 00314140 7C 80 07 35 */ extsh. r0, r4 /* 80317204 00314144 40 81 00 08 */ ble lbl_8031720C -/* 80317208 00314148 4B FB 7B 35 */ bl __dl +/* 80317208 00314148 4B FB 7B 35 */ bl __dl__FPv lbl_8031720C: /* 8031720C 0031414C 7F E3 FB 78 */ mr r3, r31 /* 80317210 00314150 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1908,7 +1908,7 @@ lbl_8031720C: /* 80317244 00314184 90 1F 00 00 */ stw r0, 0(r31) /* 80317248 00314188 7C 80 07 35 */ extsh. r0, r4 /* 8031724C 0031418C 40 81 00 08 */ ble lbl_80317254 -/* 80317250 00314190 4B FB 7A ED */ bl __dl +/* 80317250 00314190 4B FB 7A ED */ bl __dl__FPv lbl_80317254: /* 80317254 00314194 7F E3 FB 78 */ mr r3, r31 /* 80317258 00314198 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1927,7 +1927,7 @@ lbl_80317254: /* 8031728C 003141CC 90 1F 00 00 */ stw r0, 0(r31) /* 80317290 003141D0 7C 80 07 35 */ extsh. r0, r4 /* 80317294 003141D4 40 81 00 08 */ ble lbl_8031729C -/* 80317298 003141D8 4B FB 7A A5 */ bl __dl +/* 80317298 003141D8 4B FB 7A A5 */ bl __dl__FPv lbl_8031729C: /* 8031729C 003141DC 7F E3 FB 78 */ mr r3, r31 /* 803172A0 003141E0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1946,7 +1946,7 @@ lbl_8031729C: /* 803172D4 00314214 90 1F 00 00 */ stw r0, 0(r31) /* 803172D8 00314218 7C 80 07 35 */ extsh. r0, r4 /* 803172DC 0031421C 40 81 00 08 */ ble lbl_803172E4 -/* 803172E0 00314220 4B FB 7A 5D */ bl __dl +/* 803172E0 00314220 4B FB 7A 5D */ bl __dl__FPv lbl_803172E4: /* 803172E4 00314224 7F E3 FB 78 */ mr r3, r31 /* 803172E8 00314228 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2016,7 +2016,7 @@ lbl_803173E4: /* 803173E4 00314324 7C 80 07 35 */ extsh. r0, r4 /* 803173E8 00314328 40 81 00 0C */ ble lbl_803173F4 /* 803173EC 0031432C 7F E3 FB 78 */ mr r3, r31 -/* 803173F0 00314330 4B FB 79 4D */ bl __dl +/* 803173F0 00314330 4B FB 79 4D */ bl __dl__FPv lbl_803173F4: /* 803173F4 00314334 7F E3 FB 78 */ mr r3, r31 /* 803173F8 00314338 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DPacket.s b/asm/J3DGraphBase/J3DPacket.s index 5fb3206238..64a6791ffb 100644 --- a/asm/J3DGraphBase/J3DPacket.s +++ b/asm/J3DGraphBase/J3DPacket.s @@ -15,11 +15,11 @@ J3DDisplayListObj_NS_newDisplayList: /* 803124A4 0030F3E4 90 03 00 0C */ stw r0, 0xc(r3) /* 803124A8 0030F3E8 80 63 00 0C */ lwz r3, 0xc(r3) /* 803124AC 0030F3EC 38 80 00 20 */ li r4, 0x20 -/* 803124B0 0030F3F0 4B FB C8 3D */ bl __nwa_X1_ +/* 803124B0 0030F3F0 4B FB C8 3D */ bl __nwa__FUli /* 803124B4 0030F3F4 90 7F 00 00 */ stw r3, 0(r31) /* 803124B8 0030F3F8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 803124BC 0030F3FC 38 80 00 20 */ li r4, 0x20 -/* 803124C0 0030F400 4B FB C8 2D */ bl __nwa_X1_ +/* 803124C0 0030F400 4B FB C8 2D */ bl __nwa__FUli /* 803124C4 0030F404 90 7F 00 04 */ stw r3, 4(r31) /* 803124C8 0030F408 38 00 00 00 */ li r0, 0 /* 803124CC 0030F40C 90 1F 00 08 */ stw r0, 8(r31) @@ -53,7 +53,7 @@ J3DDisplayListObj_NS_newSingleDisplayList: /* 80312524 0030F464 90 03 00 0C */ stw r0, 0xc(r3) /* 80312528 0030F468 80 63 00 0C */ lwz r3, 0xc(r3) /* 8031252C 0030F46C 38 80 00 20 */ li r4, 0x20 -/* 80312530 0030F470 4B FB C7 BD */ bl __nwa_X1_ +/* 80312530 0030F470 4B FB C7 BD */ bl __nwa__FUli /* 80312534 0030F474 90 7F 00 00 */ stw r3, 0(r31) /* 80312538 0030F478 80 1F 00 00 */ lwz r0, 0(r31) /* 8031253C 0030F47C 90 1F 00 04 */ stw r0, 4(r31) @@ -83,7 +83,7 @@ J3DDisplayListObj_NS_single_To_Double: /* 8031258C 0030F4CC 40 82 00 40 */ bne lbl_803125CC /* 80312590 0030F4D0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80312594 0030F4D4 38 80 00 20 */ li r4, 0x20 -/* 80312598 0030F4D8 4B FB C7 55 */ bl __nwa_X1_ +/* 80312598 0030F4D8 4B FB C7 55 */ bl __nwa__FUli /* 8031259C 0030F4DC 90 7F 00 04 */ stw r3, 4(r31) /* 803125A0 0030F4E0 80 7F 00 04 */ lwz r3, 4(r31) /* 803125A4 0030F4E4 28 03 00 00 */ cmplwi r3, 0 @@ -268,7 +268,7 @@ lbl_803127E4: /* 803127E4 0030F724 7C 80 07 35 */ extsh. r0, r4 /* 803127E8 0030F728 40 81 00 0C */ ble lbl_803127F4 /* 803127EC 0030F72C 7F E3 FB 78 */ mr r3, r31 -/* 803127F0 0030F730 4B FB C5 4D */ bl __dl +/* 803127F0 0030F730 4B FB C5 4D */ bl __dl__FPv lbl_803127F4: /* 803127F4 0030F734 7F E3 FB 78 */ mr r3, r31 /* 803127F8 0030F738 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -287,7 +287,7 @@ J3DDrawPacket_NS_newDisplayList: /* 80312820 0030F760 7C 7E 1B 78 */ mr r30, r3 /* 80312824 0030F764 7C 9F 23 78 */ mr r31, r4 /* 80312828 0030F768 38 60 00 10 */ li r3, 0x10 -/* 8031282C 0030F76C 4B FB C4 21 */ bl __nw +/* 8031282C 0030F76C 4B FB C4 21 */ bl __nw__FUl /* 80312830 0030F770 28 03 00 00 */ cmplwi r3, 0 /* 80312834 0030F774 41 82 00 18 */ beq lbl_8031284C /* 80312838 0030F778 38 00 00 00 */ li r0, 0 @@ -329,7 +329,7 @@ J3DDrawPacket_NS_newSingleDisplayList: /* 803128AC 0030F7EC 7C 7E 1B 78 */ mr r30, r3 /* 803128B0 0030F7F0 7C 9F 23 78 */ mr r31, r4 /* 803128B4 0030F7F4 38 60 00 10 */ li r3, 0x10 -/* 803128B8 0030F7F8 4B FB C3 95 */ bl __nw +/* 803128B8 0030F7F8 4B FB C3 95 */ bl __nw__FUl /* 803128BC 0030F7FC 28 03 00 00 */ cmplwi r3, 0 /* 803128C0 0030F800 41 82 00 18 */ beq lbl_803128D8 /* 803128C4 0030F804 38 00 00 00 */ li r0, 0 @@ -412,7 +412,7 @@ J3DMatPacket_NS_dtor: /* 803129D8 0030F918 7F E0 07 35 */ extsh. r0, r31 /* 803129DC 0030F91C 40 81 00 0C */ ble lbl_803129E8 /* 803129E0 0030F920 7F C3 F3 78 */ mr r3, r30 -/* 803129E4 0030F924 4B FB C3 59 */ bl __dl +/* 803129E4 0030F924 4B FB C3 59 */ bl __dl__FPv lbl_803129E8: /* 803129E8 0030F928 7F C3 F3 78 */ mr r3, r30 /* 803129EC 0030F92C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -550,7 +550,7 @@ J3DShapePacket_NS_dtor: /* 80312BA8 0030FAE8 7F E0 07 35 */ extsh. r0, r31 /* 80312BAC 0030FAEC 40 81 00 0C */ ble lbl_80312BB8 /* 80312BB0 0030FAF0 7F C3 F3 78 */ mr r3, r30 -/* 80312BB4 0030FAF4 4B FB C1 89 */ bl __dl +/* 80312BB4 0030FAF4 4B FB C1 89 */ bl __dl__FPv lbl_80312BB8: /* 80312BB8 0030FAF8 7F C3 F3 78 */ mr r3, r30 /* 80312BBC 0030FAFC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DShape.s b/asm/J3DGraphBase/J3DShape.s index 4d25ad5b87..c4e20c96ae 100644 --- a/asm/J3DGraphBase/J3DShape.s +++ b/asm/J3DGraphBase/J3DShape.s @@ -137,7 +137,7 @@ lbl_80314CFC: /* 80314D0C 00311C4C 41 82 00 84 */ beq lbl_80314D90 /* 80314D10 00311C50 38 05 00 02 */ addi r0, r5, 2 /* 80314D14 00311C54 54 03 18 38 */ slwi r3, r0, 3 -/* 80314D18 00311C58 4B FB 9F AD */ bl __nwa +/* 80314D18 00311C58 4B FB 9F AD */ bl __nwa__FUl /* 80314D1C 00311C5C 38 C0 00 00 */ li r6, 0 /* 80314D20 00311C60 80 BF 00 30 */ lwz r5, 0x30(r31) /* 80314D24 00311C64 7C 67 1B 78 */ mr r7, r3 diff --git a/asm/J3DGraphBase/J3DShapeDraw.s b/asm/J3DGraphBase/J3DShapeDraw.s index 61c7421c1b..172fa6689a 100644 --- a/asm/J3DGraphBase/J3DShapeDraw.s +++ b/asm/J3DGraphBase/J3DShapeDraw.s @@ -48,7 +48,7 @@ J3DShapeDraw_NS_addTexMtxIndexInDL: /* 803149A8 003118E8 54 1F 00 34 */ rlwinm r31, r0, 0, 0, 0x1a /* 803149AC 003118EC 7F E3 FB 78 */ mr r3, r31 /* 803149B0 003118F0 38 80 00 20 */ li r4, 0x20 -/* 803149B4 003118F4 4B FB A3 39 */ bl __nwa_X1_ +/* 803149B4 003118F4 4B FB A3 39 */ bl __nwa__FUli /* 803149B8 003118F8 7C 7E 1B 78 */ mr r30, r3 /* 803149BC 003118FC 82 F9 00 08 */ lwz r23, 8(r25) /* 803149C0 00311900 7E F6 BB 78 */ mr r22, r23 @@ -156,7 +156,7 @@ J3DShapeDraw_NS_draw: /* 80314B20 00311A60 90 1F 00 00 */ stw r0, 0(r31) /* 80314B24 00311A64 7C 80 07 35 */ extsh. r0, r4 /* 80314B28 00311A68 40 81 00 08 */ ble lbl_80314B30 -/* 80314B2C 00311A6C 4B FB A2 11 */ bl __dl +/* 80314B2C 00311A6C 4B FB A2 11 */ bl __dl__FPv lbl_80314B30: /* 80314B30 00311A70 7F E3 FB 78 */ mr r3, r31 /* 80314B34 00311A74 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index e535f11e3a..47ebc12e5f 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -1409,7 +1409,7 @@ lbl_80314564: /* 80314564 003114A4 7C 80 07 35 */ extsh. r0, r4 /* 80314568 003114A8 40 81 00 0C */ ble lbl_80314574 /* 8031456C 003114AC 7F E3 FB 78 */ mr r3, r31 -/* 80314570 003114B0 4B FB A7 CD */ bl __dl +/* 80314570 003114B0 4B FB A7 CD */ bl __dl__FPv lbl_80314574: /* 80314574 003114B4 7F E3 FB 78 */ mr r3, r31 /* 80314578 003114B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1444,7 +1444,7 @@ lbl_803145E8: /* 803145E8 00311528 7C 80 07 35 */ extsh. r0, r4 /* 803145EC 0031152C 40 81 00 0C */ ble lbl_803145F8 /* 803145F0 00311530 7F E3 FB 78 */ mr r3, r31 -/* 803145F4 00311534 4B FB A7 49 */ bl __dl +/* 803145F4 00311534 4B FB A7 49 */ bl __dl__FPv lbl_803145F8: /* 803145F8 00311538 7F E3 FB 78 */ mr r3, r31 /* 803145FC 0031153C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1476,7 +1476,7 @@ lbl_80314660: /* 80314660 003115A0 7C 80 07 35 */ extsh. r0, r4 /* 80314664 003115A4 40 81 00 0C */ ble lbl_80314670 /* 80314668 003115A8 7F E3 FB 78 */ mr r3, r31 -/* 8031466C 003115AC 4B FB A6 D1 */ bl __dl +/* 8031466C 003115AC 4B FB A6 D1 */ bl __dl__FPv lbl_80314670: /* 80314670 003115B0 7F E3 FB 78 */ mr r3, r31 /* 80314674 003115B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1511,7 +1511,7 @@ lbl_803146E4: /* 803146E4 00311624 7C 80 07 35 */ extsh. r0, r4 /* 803146E8 00311628 40 81 00 0C */ ble lbl_803146F4 /* 803146EC 0031162C 7F E3 FB 78 */ mr r3, r31 -/* 803146F0 00311630 4B FB A6 4D */ bl __dl +/* 803146F0 00311630 4B FB A6 4D */ bl __dl__FPv lbl_803146F4: /* 803146F4 00311634 7F E3 FB 78 */ mr r3, r31 /* 803146F8 00311638 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1545,7 +1545,7 @@ lbl_80314764: /* 80314764 003116A4 7C 80 07 35 */ extsh. r0, r4 /* 80314768 003116A8 40 81 00 0C */ ble lbl_80314774 /* 8031476C 003116AC 7F E3 FB 78 */ mr r3, r31 -/* 80314770 003116B0 4B FB A5 CD */ bl __dl +/* 80314770 003116B0 4B FB A5 CD */ bl __dl__FPv lbl_80314774: /* 80314774 003116B4 7F E3 FB 78 */ mr r3, r31 /* 80314778 003116B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1567,7 +1567,7 @@ lbl_80314774: /* 803147B8 003116F8 90 1F 00 00 */ stw r0, 0(r31) /* 803147BC 003116FC 7C 80 07 35 */ extsh. r0, r4 /* 803147C0 00311700 40 81 00 08 */ ble lbl_803147C8 -/* 803147C4 00311704 4B FB A5 79 */ bl __dl +/* 803147C4 00311704 4B FB A5 79 */ bl __dl__FPv lbl_803147C8: /* 803147C8 00311708 7F E3 FB 78 */ mr r3, r31 /* 803147CC 0031170C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphBase/J3DTexture.s b/asm/J3DGraphBase/J3DTexture.s index 6738d4c5f2..a66ee6ac16 100644 --- a/asm/J3DGraphBase/J3DTexture.s +++ b/asm/J3DGraphBase/J3DTexture.s @@ -103,7 +103,7 @@ J3DTexture_NS_entryNum: /* 803121B4 0030F0F4 7C 7F 1B 78 */ mr r31, r3 /* 803121B8 0030F0F8 B0 83 00 00 */ sth r4, 0(r3) /* 803121BC 0030F0FC 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a -/* 803121C0 0030F100 4B FB CB 05 */ bl __nwa +/* 803121C0 0030F100 4B FB CB 05 */ bl __nwa__FUl /* 803121C4 0030F104 90 7F 00 04 */ stw r3, 4(r31) /* 803121C8 0030F108 38 E0 00 00 */ li r7, 0 /* 803121CC 0030F10C 38 60 00 00 */ li r3, 0 diff --git a/asm/J3DGraphBase/J3DVertex.s b/asm/J3DGraphBase/J3DVertex.s index 3ca1172d38..bc6d7a86f2 100644 --- a/asm/J3DGraphBase/J3DVertex.s +++ b/asm/J3DGraphBase/J3DVertex.s @@ -102,7 +102,7 @@ J3DVertexBuffer_NS_dtor: /* 80311044 0030DF84 41 82 00 10 */ beq lbl_80311054 /* 80311048 0030DF88 7C 80 07 35 */ extsh. r0, r4 /* 8031104C 0030DF8C 40 81 00 08 */ ble lbl_80311054 -/* 80311050 0030DF90 4B FB DC ED */ bl __dl +/* 80311050 0030DF90 4B FB DC ED */ bl __dl__FPv lbl_80311054: /* 80311054 0030DF94 7F E3 FB 78 */ mr r3, r31 /* 80311058 0030DF98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -140,7 +140,7 @@ lbl_803110B8: /* 803110BC 0030DFFC 80 03 00 00 */ lwz r0, 0(r3) /* 803110C0 0030E000 1C 60 00 0C */ mulli r3, r0, 0xc /* 803110C4 0030E004 38 80 00 20 */ li r4, 0x20 -/* 803110C8 0030E008 4B FB DC 25 */ bl __nwa_X1_ +/* 803110C8 0030E008 4B FB DC 25 */ bl __nwa__FUli /* 803110CC 0030E00C 3B BE 00 04 */ addi r29, r30, 4 /* 803110D0 0030E010 7C 7F E9 2E */ stwx r3, r31, r29 /* 803110D4 0030E014 7C 7F E8 2E */ lwzx r3, r31, r29 @@ -175,7 +175,7 @@ lbl_80311124: /* 80311140 0030E080 80 03 00 00 */ lwz r0, 0(r3) /* 80311144 0030E084 1C 60 00 0C */ mulli r3, r0, 0xc /* 80311148 0030E088 38 80 00 20 */ li r4, 0x20 -/* 8031114C 0030E08C 4B FB DB A1 */ bl __nwa_X1_ +/* 8031114C 0030E08C 4B FB DB A1 */ bl __nwa__FUli /* 80311150 0030E090 90 7F 00 08 */ stw r3, 8(r31) /* 80311154 0030E094 80 1F 00 08 */ lwz r0, 8(r31) /* 80311158 0030E098 28 00 00 00 */ cmplwi r0, 0 @@ -221,7 +221,7 @@ lbl_803111D8: /* 803111DC 0030E11C 80 03 00 04 */ lwz r0, 4(r3) /* 803111E0 0030E120 1C 60 00 0C */ mulli r3, r0, 0xc /* 803111E4 0030E124 38 80 00 20 */ li r4, 0x20 -/* 803111E8 0030E128 4B FB DB 05 */ bl __nwa_X1_ +/* 803111E8 0030E128 4B FB DB 05 */ bl __nwa__FUli /* 803111EC 0030E12C 3B BE 00 0C */ addi r29, r30, 0xc /* 803111F0 0030E130 7C 7F E9 2E */ stwx r3, r31, r29 /* 803111F4 0030E134 7C 7F E8 2E */ lwzx r3, r31, r29 @@ -256,7 +256,7 @@ lbl_80311244: /* 80311260 0030E1A0 80 03 00 04 */ lwz r0, 4(r3) /* 80311264 0030E1A4 1C 60 00 0C */ mulli r3, r0, 0xc /* 80311268 0030E1A8 38 80 00 20 */ li r4, 0x20 -/* 8031126C 0030E1AC 4B FB DA 81 */ bl __nwa_X1_ +/* 8031126C 0030E1AC 4B FB DA 81 */ bl __nwa__FUli /* 80311270 0030E1B0 90 7F 00 10 */ stw r3, 0x10(r31) /* 80311274 0030E1B4 80 1F 00 10 */ lwz r0, 0x10(r31) /* 80311278 0030E1B8 28 00 00 00 */ cmplwi r0, 0 @@ -325,7 +325,7 @@ lbl_8031133C: /* 80311354 0030E294 80 04 00 18 */ lwz r0, 0x18(r4) /* 80311358 0030E298 7C 03 00 40 */ cmplw r3, r0 /* 8031135C 0030E29C 41 82 00 08 */ beq lbl_80311364 -/* 80311360 0030E2A0 4B FB D9 DD */ bl __dl +/* 80311360 0030E2A0 4B FB D9 DD */ bl __dl__FPv lbl_80311364: /* 80311364 0030E2A4 7F BE D9 2E */ stwx r29, r30, r27 lbl_80311368: @@ -372,7 +372,7 @@ lbl_803113E0: /* 803113F8 0030E338 80 04 00 18 */ lwz r0, 0x18(r4) /* 803113FC 0030E33C 7C 03 00 40 */ cmplw r3, r0 /* 80311400 0030E340 41 82 00 08 */ beq lbl_80311408 -/* 80311404 0030E344 4B FB D9 39 */ bl __dl +/* 80311404 0030E344 4B FB D9 39 */ bl __dl__FPv lbl_80311408: /* 80311408 0030E348 93 7A 00 04 */ stw r27, 4(r26) lbl_8031140C: @@ -384,7 +384,7 @@ lbl_8031140C: /* 80311420 0030E360 80 04 00 1C */ lwz r0, 0x1c(r4) /* 80311424 0030E364 7C 03 00 40 */ cmplw r3, r0 /* 80311428 0030E368 41 82 00 08 */ beq lbl_80311430 -/* 8031142C 0030E36C 4B FB D9 11 */ bl __dl +/* 8031142C 0030E36C 4B FB D9 11 */ bl __dl__FPv lbl_80311430: /* 80311430 0030E370 93 7A 00 0C */ stw r27, 0xc(r26) lbl_80311434: @@ -440,7 +440,7 @@ lbl_803114D0: /* 803114D4 0030E414 80 03 00 00 */ lwz r0, 0(r3) /* 803114D8 0030E418 1C 60 00 0C */ mulli r3, r0, 0xc /* 803114DC 0030E41C 38 80 00 20 */ li r4, 0x20 -/* 803114E0 0030E420 4B FB D8 0D */ bl __nwa_X1_ +/* 803114E0 0030E420 4B FB D8 0D */ bl __nwa__FUli /* 803114E4 0030E424 38 1F 00 1C */ addi r0, r31, 0x1c /* 803114E8 0030E428 7C 7D 01 2E */ stwx r3, r29, r0 /* 803114EC 0030E42C 7C 1D 00 2E */ lwzx r0, r29, r0 @@ -493,7 +493,7 @@ lbl_80311584: /* 80311588 0030E4C8 80 03 00 04 */ lwz r0, 4(r3) /* 8031158C 0030E4CC 1C 60 00 0C */ mulli r3, r0, 0xc /* 80311590 0030E4D0 38 80 00 20 */ li r4, 0x20 -/* 80311594 0030E4D4 4B FB D7 59 */ bl __nwa_X1_ +/* 80311594 0030E4D4 4B FB D7 59 */ bl __nwa__FUli /* 80311598 0030E4D8 38 1F 00 24 */ addi r0, r31, 0x24 /* 8031159C 0030E4DC 7C 7D 01 2E */ stwx r3, r29, r0 /* 803115A0 0030E4E0 7C 1D 00 2E */ lwzx r0, r29, r0 @@ -533,7 +533,7 @@ J3DDrawMtxData_NS_dtor: /* 80311608 0030E548 41 82 00 10 */ beq lbl_80311618 /* 8031160C 0030E54C 7C 80 07 35 */ extsh. r0, r4 /* 80311610 0030E550 40 81 00 08 */ ble lbl_80311618 -/* 80311614 0030E554 4B FB D7 29 */ bl __dl +/* 80311614 0030E554 4B FB D7 29 */ bl __dl__FPv lbl_80311618: /* 80311618 0030E558 7F E3 FB 78 */ mr r3, r31 /* 8031161C 0030E55C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphLoader/J3DAnmLoader.s b/asm/J3DGraphLoader/J3DAnmLoader.s index ef7dce9f2c..ddbeb42f5e 100644 --- a/asm/J3DGraphLoader/J3DAnmLoader.s +++ b/asm/J3DGraphLoader/J3DAnmLoader.s @@ -84,7 +84,7 @@ lbl_80337C58: /* 80337C58 00334B98 38 61 00 60 */ addi r3, r1, 0x60 /* 80337C5C 00334B9C 48 00 08 85 */ bl J3DAnmKeyLoader_v15 /* 80337C60 00334BA0 38 60 00 28 */ li r3, 0x28 -/* 80337C64 00334BA4 4B F9 6F E9 */ bl __nw +/* 80337C64 00334BA4 4B F9 6F E9 */ bl __nw__FUl /* 80337C68 00334BA8 7C 7E 1B 79 */ or. r30, r3, r3 /* 80337C6C 00334BAC 41 82 00 30 */ beq lbl_80337C9C /* 80337C70 00334BB0 38 80 00 00 */ li r4, 0 @@ -113,7 +113,7 @@ lbl_80337CC4: /* 80337CC4 00334C04 38 61 00 58 */ addi r3, r1, 0x58 /* 80337CC8 00334C08 48 00 08 19 */ bl J3DAnmKeyLoader_v15 /* 80337CCC 00334C0C 38 60 00 40 */ li r3, 0x40 -/* 80337CD0 00334C10 4B F9 6F 7D */ bl __nw +/* 80337CD0 00334C10 4B F9 6F 7D */ bl __nw__FUl /* 80337CD4 00334C14 7C 60 1B 79 */ or. r0, r3, r3 /* 80337CD8 00334C18 41 82 00 0C */ beq lbl_80337CE4 /* 80337CDC 00334C1C 4B FF 2E 25 */ bl J3DAnmColorKey @@ -133,7 +133,7 @@ lbl_80337D0C: /* 80337D0C 00334C4C 38 61 00 50 */ addi r3, r1, 0x50 /* 80337D10 00334C50 48 00 07 D1 */ bl J3DAnmKeyLoader_v15 /* 80337D14 00334C54 38 60 00 14 */ li r3, 0x14 -/* 80337D18 00334C58 4B F9 6F 35 */ bl __nw +/* 80337D18 00334C58 4B F9 6F 35 */ bl __nw__FUl /* 80337D1C 00334C5C 28 03 00 00 */ cmplwi r3, 0 /* 80337D20 00334C60 41 82 00 48 */ beq lbl_80337D68 /* 80337D24 00334C64 3C 80 80 3A */ lis r4, lbl_803A7C38@ha @@ -168,7 +168,7 @@ lbl_80337D90: /* 80337D90 00334CD0 38 61 00 48 */ addi r3, r1, 0x48 /* 80337D94 00334CD4 48 00 07 4D */ bl J3DAnmKeyLoader_v15 /* 80337D98 00334CD8 38 60 00 7C */ li r3, 0x7c -/* 80337D9C 00334CDC 4B F9 6E B1 */ bl __nw +/* 80337D9C 00334CDC 4B F9 6E B1 */ bl __nw__FUl /* 80337DA0 00334CE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80337DA4 00334CE4 41 82 00 0C */ beq lbl_80337DB0 /* 80337DA8 00334CE8 4B FF 20 B5 */ bl J3DAnmTextureSRTKey @@ -188,7 +188,7 @@ lbl_80337DD8: /* 80337DD8 00334D18 38 61 00 40 */ addi r3, r1, 0x40 /* 80337DDC 00334D1C 48 00 07 05 */ bl J3DAnmKeyLoader_v15 /* 80337DE0 00334D20 38 60 00 70 */ li r3, 0x70 -/* 80337DE4 00334D24 4B F9 6E 69 */ bl __nw +/* 80337DE4 00334D24 4B F9 6E 69 */ bl __nw__FUl /* 80337DE8 00334D28 7C 60 1B 79 */ or. r0, r3, r3 /* 80337DEC 00334D2C 41 82 00 0C */ beq lbl_80337DF8 /* 80337DF0 00334D30 4B FF 30 29 */ bl J3DAnmTevRegKey @@ -208,7 +208,7 @@ lbl_80337E20: /* 80337E20 00334D60 38 61 00 38 */ addi r3, r1, 0x38 /* 80337E24 00334D64 48 00 06 BD */ bl J3DAnmKeyLoader_v15 /* 80337E28 00334D68 38 60 00 30 */ li r3, 0x30 -/* 80337E2C 00334D6C 4B F9 6E 21 */ bl __nw +/* 80337E2C 00334D6C 4B F9 6E 21 */ bl __nw__FUl /* 80337E30 00334D70 7C 60 1B 79 */ or. r0, r3, r3 /* 80337E34 00334D74 41 82 00 0C */ beq lbl_80337E40 /* 80337E38 00334D78 4B FF 26 A9 */ bl J3DAnmVtxColorKey @@ -230,7 +230,7 @@ lbl_80337E68: /* 80337E70 00334DB0 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 80337E74 00334DB4 41 82 00 50 */ beq lbl_80337EC4 /* 80337E78 00334DB8 38 60 00 24 */ li r3, 0x24 -/* 80337E7C 00334DBC 4B F9 6D D1 */ bl __nw +/* 80337E7C 00334DBC 4B F9 6D D1 */ bl __nw__FUl /* 80337E80 00334DC0 7C 7E 1B 79 */ or. r30, r3, r3 /* 80337E84 00334DC4 41 82 00 38 */ beq lbl_80337EBC /* 80337E88 00334DC8 38 80 00 00 */ li r4, 0 @@ -251,7 +251,7 @@ lbl_80337EBC: /* 80337EC0 00334E00 48 00 00 40 */ b lbl_80337F00 lbl_80337EC4: /* 80337EC4 00334E04 38 60 00 24 */ li r3, 0x24 -/* 80337EC8 00334E08 4B F9 6D 85 */ bl __nw +/* 80337EC8 00334E08 4B F9 6D 85 */ bl __nw__FUl /* 80337ECC 00334E0C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80337ED0 00334E10 41 82 00 2C */ beq lbl_80337EFC /* 80337ED4 00334E14 38 80 00 00 */ li r4, 0 @@ -280,7 +280,7 @@ lbl_80337F24: /* 80337F24 00334E64 38 61 00 28 */ addi r3, r1, 0x28 /* 80337F28 00334E68 48 00 05 41 */ bl J3DAnmFullLoader_v15 /* 80337F2C 00334E6C 38 60 00 40 */ li r3, 0x40 -/* 80337F30 00334E70 4B F9 6D 1D */ bl __nw +/* 80337F30 00334E70 4B F9 6D 1D */ bl __nw__FUl /* 80337F34 00334E74 7C 60 1B 79 */ or. r0, r3, r3 /* 80337F38 00334E78 41 82 00 0C */ beq lbl_80337F44 /* 80337F3C 00334E7C 4B FF 2A 01 */ bl J3DAnmColorFull @@ -300,7 +300,7 @@ lbl_80337F6C: /* 80337F6C 00334EAC 38 61 00 20 */ addi r3, r1, 0x20 /* 80337F70 00334EB0 48 00 04 F9 */ bl J3DAnmFullLoader_v15 /* 80337F74 00334EB4 38 60 00 2C */ li r3, 0x2c -/* 80337F78 00334EB8 4B F9 6C D5 */ bl __nw +/* 80337F78 00334EB8 4B F9 6C D5 */ bl __nw__FUl /* 80337F7C 00334EBC 7C 60 1B 79 */ or. r0, r3, r3 /* 80337F80 00334EC0 41 82 00 0C */ beq lbl_80337F8C /* 80337F84 00334EC4 4B FF 2F 55 */ bl J3DAnmTexPattern @@ -320,7 +320,7 @@ lbl_80337FB4: /* 80337FB4 00334EF4 38 61 00 18 */ addi r3, r1, 0x18 /* 80337FB8 00334EF8 48 00 04 B1 */ bl J3DAnmFullLoader_v15 /* 80337FBC 00334EFC 38 60 00 18 */ li r3, 0x18 -/* 80337FC0 00334F00 4B F9 6C 8D */ bl __nw +/* 80337FC0 00334F00 4B F9 6C 8D */ bl __nw__FUl /* 80337FC4 00334F04 28 03 00 00 */ cmplwi r3, 0 /* 80337FC8 00334F08 41 82 00 44 */ beq lbl_8033800C /* 80337FCC 00334F0C 3C 80 80 3A */ lis r4, lbl_803A7C38@ha @@ -354,7 +354,7 @@ lbl_80338034: /* 80338034 00334F74 38 61 00 10 */ addi r3, r1, 0x10 /* 80338038 00334F78 48 00 04 31 */ bl J3DAnmFullLoader_v15 /* 8033803C 00334F7C 38 60 00 14 */ li r3, 0x14 -/* 80338040 00334F80 4B F9 6C 0D */ bl __nw +/* 80338040 00334F80 4B F9 6C 0D */ bl __nw__FUl /* 80338044 00334F84 28 03 00 00 */ cmplwi r3, 0 /* 80338048 00334F88 41 82 00 48 */ beq lbl_80338090 /* 8033804C 00334F8C 3C 80 80 3A */ lis r4, lbl_803A7C38@ha @@ -389,7 +389,7 @@ lbl_803380B8: /* 803380B8 00334FF8 38 61 00 08 */ addi r3, r1, 8 /* 803380BC 00334FFC 48 00 03 AD */ bl J3DAnmFullLoader_v15 /* 803380C0 00335000 38 60 00 30 */ li r3, 0x30 -/* 803380C4 00335004 4B F9 6B 89 */ bl __nw +/* 803380C4 00335004 4B F9 6B 89 */ bl __nw__FUl /* 803380C8 00335008 7C 60 1B 79 */ or. r0, r3, r3 /* 803380CC 0033500C 41 82 00 0C */ beq lbl_803380D8 /* 803380D0 00335010 4B FF 22 3D */ bl J3DAnmVtxColorFull @@ -678,7 +678,7 @@ lbl_803384B8: /* 803384B8 003353F8 7C 80 07 35 */ extsh. r0, r4 /* 803384BC 003353FC 40 81 00 0C */ ble lbl_803384C8 /* 803384C0 00335400 7F E3 FB 78 */ mr r3, r31 -/* 803384C4 00335404 4B F9 68 79 */ bl __dl +/* 803384C4 00335404 4B F9 68 79 */ bl __dl__FPv lbl_803384C8: /* 803384C8 00335408 7F E3 FB 78 */ mr r3, r31 /* 803384CC 0033540C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -716,7 +716,7 @@ lbl_80338530: /* 80338530 00335470 7C 80 07 35 */ extsh. r0, r4 /* 80338534 00335474 40 81 00 0C */ ble lbl_80338540 /* 80338538 00335478 7F E3 FB 78 */ mr r3, r31 -/* 8033853C 0033547C 4B F9 68 01 */ bl __dl +/* 8033853C 0033547C 4B F9 68 01 */ bl __dl__FPv lbl_80338540: /* 80338540 00335480 7F E3 FB 78 */ mr r3, r31 /* 80338544 00335484 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2054,7 +2054,7 @@ lbl_803397D0: /* 803397D0 00336710 7C 80 07 35 */ extsh. r0, r4 /* 803397D4 00336714 40 81 00 0C */ ble lbl_803397E0 /* 803397D8 00336718 7F E3 FB 78 */ mr r3, r31 -/* 803397DC 0033671C 4B F9 55 61 */ bl __dl +/* 803397DC 0033671C 4B F9 55 61 */ bl __dl__FPv lbl_803397E0: /* 803397E0 00336720 7F E3 FB 78 */ mr r3, r31 /* 803397E4 00336724 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2075,7 +2075,7 @@ lbl_803397E0: /* 80339820 00336760 90 1F 00 00 */ stw r0, 0(r31) /* 80339824 00336764 7C 80 07 35 */ extsh. r0, r4 /* 80339828 00336768 40 81 00 08 */ ble lbl_80339830 -/* 8033982C 0033676C 4B F9 55 11 */ bl __dl +/* 8033982C 0033676C 4B F9 55 11 */ bl __dl__FPv lbl_80339830: /* 80339830 00336770 7F E3 FB 78 */ mr r3, r31 /* 80339834 00336774 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphLoader/J3DClusterLoader.s b/asm/J3DGraphLoader/J3DClusterLoader.s index 7113453afa..88e2b37edf 100644 --- a/asm/J3DGraphLoader/J3DClusterLoader.s +++ b/asm/J3DGraphLoader/J3DClusterLoader.s @@ -77,7 +77,7 @@ lbl_8033421C: /* 8033421C 0033115C 7C 80 07 35 */ extsh. r0, r4 /* 80334220 00331160 40 81 00 0C */ ble lbl_8033422C /* 80334224 00331164 7F E3 FB 78 */ mr r3, r31 -/* 80334228 00331168 4B F9 AB 15 */ bl __dl +/* 80334228 00331168 4B F9 AB 15 */ bl __dl__FPv lbl_8033422C: /* 8033422C 0033116C 7F E3 FB 78 */ mr r3, r31 /* 80334230 00331170 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -96,7 +96,7 @@ J3DClusterLoader_v15_NS_load: /* 80334258 00331198 7C 7A 1B 78 */ mr r26, r3 /* 8033425C 0033119C 7C 9F 23 78 */ mr r31, r4 /* 80334260 003311A0 38 60 00 28 */ li r3, 0x28 -/* 80334264 003311A4 4B F9 A9 E9 */ bl __nw +/* 80334264 003311A4 4B F9 A9 E9 */ bl __nw__FUl /* 80334268 003311A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8033426C 003311AC 41 82 00 0C */ beq lbl_80334278 /* 80334270 003311B0 4B FF 9F 89 */ bl J3DDeformData @@ -168,7 +168,7 @@ J3DClusterLoader_v15_NS_readCluster: /* 80334354 00331294 28 00 00 00 */ cmplwi r0, 0 /* 80334358 00331298 41 82 00 3C */ beq lbl_80334394 /* 8033435C 0033129C 38 60 00 10 */ li r3, 0x10 -/* 80334360 003312A0 4B F9 A8 ED */ bl __nw +/* 80334360 003312A0 4B F9 A8 ED */ bl __nw__FUl /* 80334364 003312A4 7C 7A 1B 79 */ or. r26, r3, r3 /* 80334368 003312A8 41 82 00 20 */ beq lbl_80334388 /* 8033436C 003312AC 7F 83 E3 78 */ mr r3, r28 @@ -191,7 +191,7 @@ lbl_803343A0: /* 803343A4 003312E4 28 00 00 00 */ cmplwi r0, 0 /* 803343A8 003312E8 41 82 00 3C */ beq lbl_803343E4 /* 803343AC 003312EC 38 60 00 10 */ li r3, 0x10 -/* 803343B0 003312F0 4B F9 A8 9D */ bl __nw +/* 803343B0 003312F0 4B F9 A8 9D */ bl __nw__FUl /* 803343B4 003312F4 7C 7A 1B 79 */ or. r26, r3, r3 /* 803343B8 003312F8 41 82 00 20 */ beq lbl_803343D8 /* 803343BC 003312FC 7F 83 E3 78 */ mr r3, r28 @@ -229,7 +229,7 @@ lbl_803343F0: /* 80334430 00331370 7C 78 00 50 */ subf r3, r24, r0 /* 80334434 00331374 7C 7F 1B 78 */ mr r31, r3 /* 80334438 00331378 38 80 00 20 */ li r4, 0x20 -/* 8033443C 0033137C 4B F9 A8 B1 */ bl __nwa_X1_ +/* 8033443C 0033137C 4B F9 A8 B1 */ bl __nwa__FUli /* 80334440 00331380 7C 7E 1B 78 */ mr r30, r3 /* 80334444 00331384 7F 83 E3 78 */ mr r3, r28 /* 80334448 00331388 7F 04 C3 78 */ mr r4, r24 @@ -266,7 +266,7 @@ lbl_80334490: /* 803344C0 00331400 48 00 01 85 */ bl JSUConvertOffsetToPtr_X63_ /* 803344C4 00331404 90 77 00 1C */ stw r3, 0x1c(r23) /* 803344C8 00331408 38 60 00 14 */ li r3, 0x14 -/* 803344CC 0033140C 4B F9 A7 81 */ bl __nw +/* 803344CC 0033140C 4B F9 A7 81 */ bl __nw__FUl /* 803344D0 00331410 7C 79 1B 79 */ or. r25, r3, r3 /* 803344D4 00331414 41 82 00 10 */ beq lbl_803344E4 /* 803344D8 00331418 80 9B 00 04 */ lwz r4, 4(r27) @@ -278,7 +278,7 @@ lbl_803344E4: /* 803344EC 0033142C 41 82 00 18 */ beq lbl_80334504 /* 803344F0 00331430 1C 00 00 03 */ mulli r0, r0, 3 /* 803344F4 00331434 54 03 10 3A */ slwi r3, r0, 2 -/* 803344F8 00331438 4B F9 A7 CD */ bl __nwa +/* 803344F8 00331438 4B F9 A7 CD */ bl __nwa__FUl /* 803344FC 0033143C 90 79 00 0C */ stw r3, 0xc(r25) /* 80334500 00331440 48 00 00 0C */ b lbl_8033450C lbl_80334504: @@ -289,7 +289,7 @@ lbl_8033450C: /* 80334510 00331450 90 19 00 10 */ stw r0, 0x10(r25) /* 80334514 00331454 A0 17 00 10 */ lhz r0, 0x10(r23) /* 80334518 00331458 54 03 10 3A */ slwi r3, r0, 2 -/* 8033451C 0033145C 4B F9 A7 A9 */ bl __nwa +/* 8033451C 0033145C 4B F9 A7 A9 */ bl __nwa__FUl /* 80334520 00331460 90 79 00 08 */ stw r3, 8(r25) /* 80334524 00331464 93 37 00 20 */ stw r25, 0x20(r23) /* 80334528 00331468 3B BD 00 01 */ addi r29, r29, 1 @@ -361,7 +361,7 @@ lbl_803345C8: /* 8033461C 0033155C 90 1F 00 00 */ stw r0, 0(r31) /* 80334620 00331560 7C 80 07 35 */ extsh. r0, r4 /* 80334624 00331564 40 81 00 08 */ ble lbl_8033462C -/* 80334628 00331568 4B F9 A7 15 */ bl __dl +/* 80334628 00331568 4B F9 A7 15 */ bl __dl__FPv lbl_8033462C: /* 8033462C 0033156C 7F E3 FB 78 */ mr r3, r31 /* 80334630 00331570 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphLoader/J3DJointFactory.s b/asm/J3DGraphLoader/J3DJointFactory.s index 8a11b7d78f..82cc1c8dc5 100644 --- a/asm/J3DGraphLoader/J3DJointFactory.s +++ b/asm/J3DGraphLoader/J3DJointFactory.s @@ -38,7 +38,7 @@ J3DJointFactory_NS_create: /* 803371E4 00334124 7C 7F 1B 78 */ mr r31, r3 /* 803371E8 00334128 7C 9E 23 78 */ mr r30, r4 /* 803371EC 0033412C 38 60 00 5C */ li r3, 0x5c -/* 803371F0 00334130 4B F9 7A 5D */ bl __nw +/* 803371F0 00334130 4B F9 7A 5D */ bl __nw__FUl /* 803371F4 00334134 7C 64 1B 79 */ or. r4, r3, r3 /* 803371F8 00334138 41 82 00 0C */ beq lbl_80337204 /* 803371FC 0033413C 4B FF 7F 75 */ bl J3DJoint diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index 3cdf703148..7ff3d4af83 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -357,7 +357,7 @@ lbl_803304A0: /* 803304D0 0032D410 28 1F 00 00 */ cmplwi r31, 0 /* 803304D4 0032D414 40 82 00 40 */ bne lbl_80330514 /* 803304D8 0032D418 38 60 00 4C */ li r3, 0x4c -/* 803304DC 0032D41C 4B F9 E7 71 */ bl __nw +/* 803304DC 0032D41C 4B F9 E7 71 */ bl __nw__FUl /* 803304E0 0032D420 7C 73 1B 79 */ or. r19, r3, r3 /* 803304E4 0032D424 41 82 00 2C */ beq lbl_80330510 /* 803304E8 0032D428 3C 80 80 3D */ lis r4, lbl_803CDCF0@ha @@ -968,7 +968,7 @@ J3DMaterialFactory_NS_createPatchedMaterial: /* 80330DA4 0032DCE4 7C D2 33 78 */ mr r18, r6 /* 80330DA8 0032DCE8 40 82 00 54 */ bne lbl_80330DFC /* 80330DAC 0032DCEC 38 60 00 4C */ li r3, 0x4c -/* 80330DB0 0032DCF0 4B F9 DE 9D */ bl __nw +/* 80330DB0 0032DCF0 4B F9 DE 9D */ bl __nw__FUl /* 80330DB4 0032DCF4 7C 73 1B 79 */ or. r19, r3, r3 /* 80330DB8 0032DCF8 41 82 00 40 */ beq lbl_80330DF8 /* 80330DBC 0032DCFC 3C 80 80 3D */ lis r4, lbl_803CDCF0@ha @@ -996,7 +996,7 @@ lbl_80330DFC: /* 80330E0C 0032DD4C 4B FE 49 95 */ bl J3DMaterial_NS_createColorBlock /* 80330E10 0032DD50 90 7F 00 24 */ stw r3, 0x24(r31) /* 80330E14 0032DD54 38 60 00 5C */ li r3, 0x5c -/* 80330E18 0032DD58 4B F9 DE 35 */ bl __nw +/* 80330E18 0032DD58 4B F9 DE 35 */ bl __nw__FUl /* 80330E1C 0032DD5C 7C 73 1B 79 */ or. r19, r3, r3 /* 80330E20 0032DD60 41 82 00 44 */ beq lbl_80330E64 /* 80330E24 0032DD64 7E 72 9B 78 */ mr r18, r19 @@ -1020,7 +1020,7 @@ lbl_80330DFC: lbl_80330E64: /* 80330E64 0032DDA4 92 7F 00 28 */ stw r19, 0x28(r31) /* 80330E68 0032DDA8 38 60 00 D8 */ li r3, 0xd8 -/* 80330E6C 0032DDAC 4B F9 DD E1 */ bl __nw +/* 80330E6C 0032DDAC 4B F9 DD E1 */ bl __nw__FUl /* 80330E70 0032DDB0 7C 79 1B 79 */ or. r25, r3, r3 /* 80330E74 0032DDB4 41 82 00 B4 */ beq lbl_80330F28 /* 80330E78 0032DDB8 7F 34 CB 78 */ mr r20, r25 @@ -1681,7 +1681,7 @@ J3DMaterialFactory_NS_createLockedMaterial: /* 803317F0 0032E730 7C BE 2B 78 */ mr r30, r5 /* 803317F4 0032E734 40 82 01 40 */ bne lbl_80331934 /* 803317F8 0032E738 38 60 00 4C */ li r3, 0x4c -/* 803317FC 0032E73C 4B F9 D4 51 */ bl __nw +/* 803317FC 0032E73C 4B F9 D4 51 */ bl __nw__FUl /* 80331800 0032E740 7C 7D 1B 79 */ or. r29, r3, r3 /* 80331804 0032E744 41 82 00 40 */ beq lbl_80331844 /* 80331808 0032E748 3C 80 80 3D */ lis r4, lbl_803CDCF0@ha @@ -1701,7 +1701,7 @@ J3DMaterialFactory_NS_createLockedMaterial: /* 80331840 0032E780 4B FE 58 05 */ bl J3DLockedMaterial_NS_initialize lbl_80331844: /* 80331844 0032E784 38 60 00 04 */ li r3, 4 -/* 80331848 0032E788 4B F9 D4 05 */ bl __nw +/* 80331848 0032E788 4B F9 D4 05 */ bl __nw__FUl /* 8033184C 0032E78C 28 03 00 00 */ cmplwi r3, 0 /* 80331850 0032E790 41 82 00 1C */ beq lbl_8033186C /* 80331854 0032E794 3C 80 80 3D */ lis r4, lbl_803CDEA0@ha @@ -1713,7 +1713,7 @@ lbl_80331844: lbl_8033186C: /* 8033186C 0032E7AC 90 7D 00 24 */ stw r3, 0x24(r29) /* 80331870 0032E7B0 38 60 00 04 */ li r3, 4 -/* 80331874 0032E7B4 4B F9 D3 D9 */ bl __nw +/* 80331874 0032E7B4 4B F9 D3 D9 */ bl __nw__FUl /* 80331878 0032E7B8 28 03 00 00 */ cmplwi r3, 0 /* 8033187C 0032E7BC 41 82 00 1C */ beq lbl_80331898 /* 80331880 0032E7C0 3C 80 80 3D */ lis r4, lbl_803CDE34@ha @@ -1725,7 +1725,7 @@ lbl_8033186C: lbl_80331898: /* 80331898 0032E7D8 90 7D 00 28 */ stw r3, 0x28(r29) /* 8033189C 0032E7DC 38 60 00 08 */ li r3, 8 -/* 803318A0 0032E7E0 4B F9 D3 AD */ bl __nw +/* 803318A0 0032E7E0 4B F9 D3 AD */ bl __nw__FUl /* 803318A4 0032E7E4 7C 7F 1B 79 */ or. r31, r3, r3 /* 803318A8 0032E7E8 41 82 00 20 */ beq lbl_803318C8 /* 803318AC 0032E7EC 3C 80 80 3D */ lis r4, lbl_803CE958@ha @@ -1738,7 +1738,7 @@ lbl_80331898: lbl_803318C8: /* 803318C8 0032E808 93 FD 00 2C */ stw r31, 0x2c(r29) /* 803318CC 0032E80C 38 60 00 04 */ li r3, 4 -/* 803318D0 0032E810 4B F9 D3 7D */ bl __nw +/* 803318D0 0032E810 4B F9 D3 7D */ bl __nw__FUl /* 803318D4 0032E814 28 03 00 00 */ cmplwi r3, 0 /* 803318D8 0032E818 41 82 00 1C */ beq lbl_803318F4 /* 803318DC 0032E81C 3C 80 80 3D */ lis r4, lbl_803CDDE8@ha @@ -1750,7 +1750,7 @@ lbl_803318C8: lbl_803318F4: /* 803318F4 0032E834 90 7D 00 30 */ stw r3, 0x30(r29) /* 803318F8 0032E838 38 60 00 04 */ li r3, 4 -/* 803318FC 0032E83C 4B F9 D3 51 */ bl __nw +/* 803318FC 0032E83C 4B F9 D3 51 */ bl __nw__FUl /* 80331900 0032E840 28 03 00 00 */ cmplwi r3, 0 /* 80331904 0032E844 41 82 00 1C */ beq lbl_80331920 /* 80331908 0032E848 3C 80 80 3D */ lis r4, lbl_803CDD20@ha @@ -1825,7 +1825,7 @@ lbl_80331934: /* 80331A14 0032E954 28 00 00 00 */ cmplwi r0, 0 /* 80331A18 0032E958 40 82 00 48 */ bne lbl_80331A60 /* 80331A1C 0032E95C 38 60 00 10 */ li r3, 0x10 -/* 80331A20 0032E960 4B F9 D2 2D */ bl __nw +/* 80331A20 0032E960 4B F9 D2 2D */ bl __nw__FUl /* 80331A24 0032E964 28 03 00 00 */ cmplwi r3, 0 /* 80331A28 0032E968 41 82 00 18 */ beq lbl_80331A40 /* 80331A2C 0032E96C 38 00 00 00 */ li r0, 0 @@ -2295,7 +2295,7 @@ J3DMaterialFactory_NS_newTexMtx: /* 80332084 0032EFC4 28 00 FF FF */ cmplwi r0, 0xffff /* 80332088 0032EFC8 41 82 00 2C */ beq lbl_803320B4 /* 8033208C 0032EFCC 38 60 00 94 */ li r3, 0x94 -/* 80332090 0032EFD0 4B F9 CB BD */ bl __nw +/* 80332090 0032EFD0 4B F9 CB BD */ bl __nw__FUl /* 80332094 0032EFD4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80332098 0032EFD8 41 82 00 18 */ beq lbl_803320B0 /* 8033209C 0032EFDC 80 9D 00 30 */ lwz r4, 0x30(r29) @@ -2988,7 +2988,7 @@ lbl_803329E4: /* 803329E4 0032F924 7C 80 07 35 */ extsh. r0, r4 /* 803329E8 0032F928 40 81 00 0C */ ble lbl_803329F4 /* 803329EC 0032F92C 7F E3 FB 78 */ mr r3, r31 -/* 803329F0 0032F930 4B F9 C3 4D */ bl __dl +/* 803329F0 0032F930 4B F9 C3 4D */ bl __dl__FPv lbl_803329F4: /* 803329F4 0032F934 7F E3 FB 78 */ mr r3, r31 /* 803329F8 0032F938 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3027,7 +3027,7 @@ lbl_80332A78: /* 80332A78 0032F9B8 7C 80 07 35 */ extsh. r0, r4 /* 80332A7C 0032F9BC 40 81 00 0C */ ble lbl_80332A88 /* 80332A80 0032F9C0 7F E3 FB 78 */ mr r3, r31 -/* 80332A84 0032F9C4 4B F9 C2 B9 */ bl __dl +/* 80332A84 0032F9C4 4B F9 C2 B9 */ bl __dl__FPv lbl_80332A88: /* 80332A88 0032F9C8 7F E3 FB 78 */ mr r3, r31 /* 80332A8C 0032F9CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3064,7 +3064,7 @@ lbl_80332B04: /* 80332B04 0032FA44 7C 80 07 35 */ extsh. r0, r4 /* 80332B08 0032FA48 40 81 00 0C */ ble lbl_80332B14 /* 80332B0C 0032FA4C 7F E3 FB 78 */ mr r3, r31 -/* 80332B10 0032FA50 4B F9 C2 2D */ bl __dl +/* 80332B10 0032FA50 4B F9 C2 2D */ bl __dl__FPv lbl_80332B14: /* 80332B14 0032FA54 7F E3 FB 78 */ mr r3, r31 /* 80332B18 0032FA58 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3092,7 +3092,7 @@ lbl_80332B6C: /* 80332B6C 0032FAAC 7C 80 07 35 */ extsh. r0, r4 /* 80332B70 0032FAB0 40 81 00 0C */ ble lbl_80332B7C /* 80332B74 0032FAB4 7F E3 FB 78 */ mr r3, r31 -/* 80332B78 0032FAB8 4B F9 C1 C5 */ bl __dl +/* 80332B78 0032FAB8 4B F9 C1 C5 */ bl __dl__FPv lbl_80332B7C: /* 80332B7C 0032FABC 7F E3 FB 78 */ mr r3, r31 /* 80332B80 0032FAC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3113,7 +3113,7 @@ J3DMaterial_NS_dtor: /* 80332BB4 0032FAF4 90 1F 00 00 */ stw r0, 0(r31) /* 80332BB8 0032FAF8 7C 80 07 35 */ extsh. r0, r4 /* 80332BBC 0032FAFC 40 81 00 08 */ ble lbl_80332BC4 -/* 80332BC0 0032FB00 4B F9 C1 7D */ bl __dl +/* 80332BC0 0032FB00 4B F9 C1 7D */ bl __dl__FPv lbl_80332BC4: /* 80332BC4 0032FB04 7F E3 FB 78 */ mr r3, r31 /* 80332BC8 0032FB08 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s index 05bffbb0a4..aa0a68410b 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s @@ -237,7 +237,7 @@ lbl_803330B4: /* 803330E4 00330024 28 1F 00 00 */ cmplwi r31, 0 /* 803330E8 00330028 40 82 00 40 */ bne lbl_80333128 /* 803330EC 0033002C 38 60 00 4C */ li r3, 0x4c -/* 803330F0 00330030 4B F9 BB 5D */ bl __nw +/* 803330F0 00330030 4B F9 BB 5D */ bl __nw__FUl /* 803330F4 00330034 7C 73 1B 79 */ or. r19, r3, r3 /* 803330F8 00330038 41 82 00 2C */ beq lbl_80333124 /* 803330FC 0033003C 3C 80 80 3D */ lis r4, lbl_803CDCF0@ha @@ -933,7 +933,7 @@ J3DMaterialFactory_v21_NS_newTexMtx: /* 80333AE8 00330A28 28 00 FF FF */ cmplwi r0, 0xffff /* 80333AEC 00330A2C 41 82 00 2C */ beq lbl_80333B18 /* 80333AF0 00330A30 38 60 00 94 */ li r3, 0x94 -/* 80333AF4 00330A34 4B F9 B1 59 */ bl __nw +/* 80333AF4 00330A34 4B F9 B1 59 */ bl __nw__FUl /* 80333AF8 00330A38 7C 7F 1B 79 */ or. r31, r3, r3 /* 80333AFC 00330A3C 41 82 00 18 */ beq lbl_80333B14 /* 80333B00 00330A40 80 9D 00 24 */ lwz r4, 0x24(r29) diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index 10eb2a96b3..e93c1d1242 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -110,9 +110,9 @@ J3DModelLoader_NS_load: /* 803347F8 00331738 7C 99 23 78 */ mr r25, r4 /* 803347FC 0033173C 7C BA 2B 78 */ mr r26, r5 /* 80334800 00331740 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) -/* 80334804 00331744 4B F9 9F 81 */ bl JKRHeap_NS_getTotalFreeSize +/* 80334804 00331744 4B F9 9F 81 */ bl getTotalFreeSize__7JKRHeapFv /* 80334808 00331748 38 60 00 E4 */ li r3, 0xe4 -/* 8033480C 0033174C 4B F9 A4 41 */ bl __nw +/* 8033480C 0033174C 4B F9 A4 41 */ bl __nw__FUl /* 80334810 00331750 7C 60 1B 79 */ or. r0, r3, r3 /* 80334814 00331754 41 82 00 0C */ beq lbl_80334820 /* 80334818 00331758 4B FF 15 89 */ bl J3DModelData @@ -312,7 +312,7 @@ lbl_80334AA0: /* 80334AD0 00331A10 7C 7F 1B 78 */ mr r31, r3 /* 80334AD4 00331A14 7C 9E 23 78 */ mr r30, r4 /* 80334AD8 00331A18 38 60 00 20 */ li r3, 0x20 -/* 80334ADC 00331A1C 4B F9 A1 71 */ bl __nw +/* 80334ADC 00331A1C 4B F9 A1 71 */ bl __nw__FUl /* 80334AE0 00331A20 7C 60 1B 79 */ or. r0, r3, r3 /* 80334AE4 00331A24 41 82 00 0C */ beq lbl_80334AF0 /* 80334AE8 00331A28 4B FF AA E9 */ bl J3DMaterialTable @@ -383,7 +383,7 @@ lbl_80334BB8: /* 80334BC8 00331B08 28 00 00 00 */ cmplwi r0, 0 /* 80334BCC 00331B0C 40 82 00 38 */ bne lbl_80334C04 /* 80334BD0 00331B10 38 60 00 0C */ li r3, 0xc -/* 80334BD4 00331B14 4B F9 A0 79 */ bl __nw +/* 80334BD4 00331B14 4B F9 A0 79 */ bl __nw__FUl /* 80334BD8 00331B18 28 03 00 00 */ cmplwi r3, 0 /* 80334BDC 00331B1C 41 82 00 20 */ beq lbl_80334BFC /* 80334BE0 00331B20 3C 80 80 3D */ lis r4, lbl_803CF1E8@ha @@ -413,7 +413,7 @@ lbl_80334C04: /* 80334C38 00331B78 7C 99 23 78 */ mr r25, r4 /* 80334C3C 00331B7C 7C BE 2B 78 */ mr r30, r5 /* 80334C40 00331B80 38 60 00 E4 */ li r3, 0xe4 -/* 80334C44 00331B84 4B F9 A0 09 */ bl __nw +/* 80334C44 00331B84 4B F9 A0 09 */ bl __nw__FUl /* 80334C48 00331B88 7C 60 1B 79 */ or. r0, r3, r3 /* 80334C4C 00331B8C 41 82 00 0C */ beq lbl_80334C58 /* 80334C50 00331B90 4B FF 11 51 */ bl J3DModelData @@ -730,7 +730,7 @@ lbl_803350A8: /* 803350B0 00331FF0 48 00 00 74 */ b lbl_80335124 lbl_803350B4: /* 803350B4 00331FF4 38 60 00 04 */ li r3, 4 -/* 803350B8 00331FF8 4B F9 9B 95 */ bl __nw +/* 803350B8 00331FF8 4B F9 9B 95 */ bl __nw__FUl /* 803350BC 00331FFC 28 03 00 00 */ cmplwi r3, 0 /* 803350C0 00332000 41 82 00 98 */ beq lbl_80335158 /* 803350C4 00332004 3C 80 80 3A */ lis r4, lbl_803A3468@ha @@ -745,7 +745,7 @@ lbl_803350B4: /* 803350E8 00332028 48 00 00 70 */ b lbl_80335158 lbl_803350EC: /* 803350EC 0033202C 38 60 00 04 */ li r3, 4 -/* 803350F0 00332030 4B F9 9B 5D */ bl __nw +/* 803350F0 00332030 4B F9 9B 5D */ bl __nw__FUl /* 803350F4 00332034 28 03 00 00 */ cmplwi r3, 0 /* 803350F8 00332038 41 82 00 60 */ beq lbl_80335158 /* 803350FC 0033203C 3C 80 80 3A */ lis r4, lbl_803A3468@ha @@ -760,7 +760,7 @@ lbl_803350EC: /* 80335120 00332060 48 00 00 38 */ b lbl_80335158 lbl_80335124: /* 80335124 00332064 38 60 00 04 */ li r3, 4 -/* 80335128 00332068 4B F9 9B 25 */ bl __nw +/* 80335128 00332068 4B F9 9B 25 */ bl __nw__FUl /* 8033512C 0033206C 28 03 00 00 */ cmplwi r3, 0 /* 80335130 00332070 41 82 00 28 */ beq lbl_80335158 /* 80335134 00332074 3C 80 80 3A */ lis r4, lbl_803A3468@ha @@ -1045,7 +1045,7 @@ lbl_80335500: /* 80335504 00332444 83 FD 00 04 */ lwz r31, 4(r29) /* 80335508 00332448 A0 1E 00 44 */ lhz r0, 0x44(r30) /* 8033550C 0033244C 54 03 08 3C */ slwi r3, r0, 1 -/* 80335510 00332450 4B F9 97 B5 */ bl __nwa +/* 80335510 00332450 4B F9 97 B5 */ bl __nwa__FUl /* 80335514 00332454 90 7F 00 40 */ stw r3, 0x40(r31) /* 80335518 00332458 39 61 00 20 */ addi r11, r1, 0x20 /* 8033551C 0033245C 48 02 CD 0D */ bl _restgpr_29 @@ -1072,7 +1072,7 @@ J3DModelLoader_NS_readJoint: /* 80335564 003324A4 28 00 00 00 */ cmplwi r0, 0 /* 80335568 003324A8 41 82 00 3C */ beq lbl_803355A4 /* 8033556C 003324AC 38 60 00 10 */ li r3, 0x10 -/* 80335570 003324B0 4B F9 96 DD */ bl __nw +/* 80335570 003324B0 4B F9 96 DD */ bl __nw__FUl /* 80335574 003324B4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80335578 003324B8 41 82 00 20 */ beq lbl_80335598 /* 8033557C 003324BC 7F A3 EB 78 */ mr r3, r29 @@ -1094,7 +1094,7 @@ lbl_803355B0: /* 803355B0 003324F0 83 DF 00 04 */ lwz r30, 4(r31) /* 803355B4 003324F4 A0 1E 00 2C */ lhz r0, 0x2c(r30) /* 803355B8 003324F8 54 03 10 3A */ slwi r3, r0, 2 -/* 803355BC 003324FC 4B F9 97 09 */ bl __nwa +/* 803355BC 003324FC 4B F9 97 09 */ bl __nwa__FUl /* 803355C0 00332500 90 7E 00 28 */ stw r3, 0x28(r30) /* 803355C4 00332504 3B A0 00 00 */ li r29, 0 /* 803355C8 00332508 48 00 00 20 */ b lbl_803355E8 @@ -1139,7 +1139,7 @@ lbl_803355E8: /* 8033565C 0033259C 28 00 00 00 */ cmplwi r0, 0 /* 80335660 003325A0 41 82 00 3C */ beq lbl_8033569C /* 80335664 003325A4 38 60 00 10 */ li r3, 0x10 -/* 80335668 003325A8 4B F9 95 E5 */ bl __nw +/* 80335668 003325A8 4B F9 95 E5 */ bl __nw__FUl /* 8033566C 003325AC 7C 7C 1B 79 */ or. r28, r3, r3 /* 80335670 003325B0 41 82 00 20 */ beq lbl_80335690 /* 80335674 003325B4 7F 63 DB 78 */ mr r3, r27 @@ -1161,7 +1161,7 @@ lbl_803356A8: /* 803356A8 003325E8 80 7D 00 08 */ lwz r3, 8(r29) /* 803356AC 003325EC A0 03 00 04 */ lhz r0, 4(r3) /* 803356B0 003325F0 54 03 10 3A */ slwi r3, r0, 2 -/* 803356B4 003325F4 4B F9 96 11 */ bl __nwa +/* 803356B4 003325F4 4B F9 96 11 */ bl __nwa__FUl /* 803356B8 003325F8 80 9D 00 08 */ lwz r4, 8(r29) /* 803356BC 003325FC 90 64 00 08 */ stw r3, 8(r4) /* 803356C0 00332600 57 DF 02 95 */ rlwinm. r31, r30, 0, 0xa, 0xa @@ -1171,7 +1171,7 @@ lbl_803356A8: /* 803356D0 00332610 1C 7C 00 4C */ mulli r3, r28, 0x4c /* 803356D4 00332614 38 63 00 10 */ addi r3, r3, 0x10 /* 803356D8 00332618 38 80 00 20 */ li r4, 0x20 -/* 803356DC 0033261C 4B F9 96 11 */ bl __nwa_X1_ +/* 803356DC 0033261C 4B F9 96 11 */ bl __nwa__FUli .global J3DMaterial /* 803356E0 00332620 3C 80 80 33 */ lis r4, J3DMaterial@ha .global J3DMaterial @@ -1318,7 +1318,7 @@ lbl_80335878: /* 803358D8 00332818 28 00 00 00 */ cmplwi r0, 0 /* 803358DC 0033281C 41 82 00 3C */ beq lbl_80335918 /* 803358E0 00332820 38 60 00 10 */ li r3, 0x10 -/* 803358E4 00332824 4B F9 93 69 */ bl __nw +/* 803358E4 00332824 4B F9 93 69 */ bl __nw__FUl /* 803358E8 00332828 7C 7C 1B 79 */ or. r28, r3, r3 /* 803358EC 0033282C 41 82 00 20 */ beq lbl_8033590C /* 803358F0 00332830 7F 63 DB 78 */ mr r3, r27 @@ -1340,7 +1340,7 @@ lbl_80335924: /* 80335924 00332864 80 7D 00 08 */ lwz r3, 8(r29) /* 80335928 00332868 A0 03 00 04 */ lhz r0, 4(r3) /* 8033592C 0033286C 54 03 10 3A */ slwi r3, r0, 2 -/* 80335930 00332870 4B F9 93 95 */ bl __nwa +/* 80335930 00332870 4B F9 93 95 */ bl __nwa__FUl /* 80335934 00332874 80 9D 00 08 */ lwz r4, 8(r29) /* 80335938 00332878 90 64 00 08 */ stw r3, 8(r4) /* 8033593C 0033287C 57 DF 02 95 */ rlwinm. r31, r30, 0, 0xa, 0xa @@ -1350,7 +1350,7 @@ lbl_80335924: /* 8033594C 0033288C 1C 7C 00 4C */ mulli r3, r28, 0x4c /* 80335950 00332890 38 63 00 10 */ addi r3, r3, 0x10 /* 80335954 00332894 38 80 00 20 */ li r4, 0x20 -/* 80335958 00332898 4B F9 93 95 */ bl __nwa_X1_ +/* 80335958 00332898 4B F9 93 95 */ bl __nwa__FUli .global J3DMaterial /* 8033595C 0033289C 3C 80 80 33 */ lis r4, J3DMaterial@ha .global J3DMaterial @@ -1491,7 +1491,7 @@ J3DModelLoader_NS_readShape: /* 80335B30 00332A70 28 00 00 00 */ cmplwi r0, 0 /* 80335B34 00332A74 41 82 00 38 */ beq lbl_80335B6C /* 80335B38 00332A78 38 60 00 10 */ li r3, 0x10 -/* 80335B3C 00332A7C 4B F9 91 11 */ bl __nw +/* 80335B3C 00332A7C 4B F9 91 11 */ bl __nw__FUl /* 80335B40 00332A80 7C 7E 1B 79 */ or. r30, r3, r3 /* 80335B44 00332A84 41 82 00 20 */ beq lbl_80335B64 /* 80335B48 00332A88 7F 83 E3 78 */ mr r3, r28 @@ -1510,7 +1510,7 @@ lbl_80335B6C: lbl_80335B74: /* 80335B74 00332AB4 A0 1F 00 7C */ lhz r0, 0x7c(r31) /* 80335B78 00332AB8 54 03 10 3A */ slwi r3, r0, 2 -/* 80335B7C 00332ABC 4B F9 91 49 */ bl __nwa +/* 80335B7C 00332ABC 4B F9 91 49 */ bl __nwa__FUl /* 80335B80 00332AC0 90 7F 00 80 */ stw r3, 0x80(r31) /* 80335B84 00332AC4 38 61 00 08 */ addi r3, r1, 8 /* 80335B88 00332AC8 A0 9F 00 7C */ lhz r4, 0x7c(r31) @@ -1571,7 +1571,7 @@ J3DModelLoader_NS_readTexture: /* 80335C4C 00332B8C 28 00 00 00 */ cmplwi r0, 0 /* 80335C50 00332B90 41 82 00 3C */ beq lbl_80335C8C /* 80335C54 00332B94 38 60 00 10 */ li r3, 0x10 -/* 80335C58 00332B98 4B F9 8F F5 */ bl __nw +/* 80335C58 00332B98 4B F9 8F F5 */ bl __nw__FUl /* 80335C5C 00332B9C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80335C60 00332BA0 41 82 00 20 */ beq lbl_80335C80 /* 80335C64 00332BA4 7F 83 E3 78 */ mr r3, r28 @@ -1591,7 +1591,7 @@ lbl_80335C8C: /* 80335C94 00332BD4 90 03 00 18 */ stw r0, 0x18(r3) lbl_80335C98: /* 80335C98 00332BD8 38 60 00 0C */ li r3, 0xc -/* 80335C9C 00332BDC 4B F9 8F B1 */ bl __nw +/* 80335C9C 00332BDC 4B F9 8F B1 */ bl __nw__FUl /* 80335CA0 00332BE0 28 03 00 00 */ cmplwi r3, 0 /* 80335CA4 00332BE4 41 82 00 20 */ beq lbl_80335CC4 /* 80335CA8 00332BE8 3C 80 80 3D */ lis r4, lbl_803CF1E8@ha @@ -1627,7 +1627,7 @@ lbl_80335CC4: /* 80335D1C 00332C5C 28 00 00 00 */ cmplwi r0, 0 /* 80335D20 00332C60 41 82 00 3C */ beq lbl_80335D5C /* 80335D24 00332C64 38 60 00 10 */ li r3, 0x10 -/* 80335D28 00332C68 4B F9 8F 25 */ bl __nw +/* 80335D28 00332C68 4B F9 8F 25 */ bl __nw__FUl /* 80335D2C 00332C6C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80335D30 00332C70 41 82 00 20 */ beq lbl_80335D50 /* 80335D34 00332C74 7F 83 E3 78 */ mr r3, r28 @@ -1649,7 +1649,7 @@ lbl_80335D68: /* 80335D68 00332CA8 80 7E 00 08 */ lwz r3, 8(r30) /* 80335D6C 00332CAC A0 03 00 04 */ lhz r0, 4(r3) /* 80335D70 00332CB0 54 03 10 3A */ slwi r3, r0, 2 -/* 80335D74 00332CB4 4B F9 8F 51 */ bl __nwa +/* 80335D74 00332CB4 4B F9 8F 51 */ bl __nwa__FUl /* 80335D78 00332CB8 80 9E 00 08 */ lwz r4, 8(r30) /* 80335D7C 00332CBC 90 64 00 08 */ stw r3, 8(r4) /* 80335D80 00332CC0 3B A0 00 00 */ li r29, 0 @@ -1713,7 +1713,7 @@ lbl_80335DF4: /* 80335E58 00332D98 28 00 00 00 */ cmplwi r0, 0 /* 80335E5C 00332D9C 41 82 00 3C */ beq lbl_80335E98 /* 80335E60 00332DA0 38 60 00 10 */ li r3, 0x10 -/* 80335E64 00332DA4 4B F9 8D E9 */ bl __nw +/* 80335E64 00332DA4 4B F9 8D E9 */ bl __nw__FUl /* 80335E68 00332DA8 7C 7D 1B 79 */ or. r29, r3, r3 /* 80335E6C 00332DAC 41 82 00 20 */ beq lbl_80335E8C /* 80335E70 00332DB0 7F 83 E3 78 */ mr r3, r28 @@ -1735,7 +1735,7 @@ lbl_80335EA4: /* 80335EA4 00332DE4 80 7E 00 08 */ lwz r3, 8(r30) /* 80335EA8 00332DE8 A0 03 00 04 */ lhz r0, 4(r3) /* 80335EAC 00332DEC 54 03 10 3A */ slwi r3, r0, 2 -/* 80335EB0 00332DF0 4B F9 8E 15 */ bl __nwa +/* 80335EB0 00332DF0 4B F9 8E 15 */ bl __nwa__FUl /* 80335EB4 00332DF4 80 9E 00 08 */ lwz r4, 8(r30) /* 80335EB8 00332DF8 90 64 00 08 */ stw r3, 8(r4) /* 80335EBC 00332DFC 3B A0 00 00 */ li r29, 0 @@ -1801,7 +1801,7 @@ J3DModelLoader_NS_readTextureTable: /* 80335F90 00332ED0 28 00 00 00 */ cmplwi r0, 0 /* 80335F94 00332ED4 41 82 00 3C */ beq lbl_80335FD0 /* 80335F98 00332ED8 38 60 00 10 */ li r3, 0x10 -/* 80335F9C 00332EDC 4B F9 8C B1 */ bl __nw +/* 80335F9C 00332EDC 4B F9 8C B1 */ bl __nw__FUl /* 80335FA0 00332EE0 7C 7E 1B 79 */ or. r30, r3, r3 /* 80335FA4 00332EE4 41 82 00 20 */ beq lbl_80335FC4 /* 80335FA8 00332EE8 7F 83 E3 78 */ mr r3, r28 @@ -1821,7 +1821,7 @@ lbl_80335FD0: /* 80335FD8 00332F18 90 03 00 18 */ stw r0, 0x18(r3) lbl_80335FDC: /* 80335FDC 00332F1C 38 60 00 0C */ li r3, 0xc -/* 80335FE0 00332F20 4B F9 8C 6D */ bl __nw +/* 80335FE0 00332F20 4B F9 8C 6D */ bl __nw__FUl /* 80335FE4 00332F24 28 03 00 00 */ cmplwi r3, 0 /* 80335FE8 00332F28 41 82 00 20 */ beq lbl_80336008 /* 80335FEC 00332F2C 3C 80 80 3D */ lis r4, lbl_803CF1E8@ha @@ -1864,7 +1864,7 @@ J3DModelLoader_NS_readPatchedMaterial: /* 80336070 00332FB0 28 00 00 00 */ cmplwi r0, 0 /* 80336074 00332FB4 41 82 00 3C */ beq lbl_803360B0 /* 80336078 00332FB8 38 60 00 10 */ li r3, 0x10 -/* 8033607C 00332FBC 4B F9 8B D1 */ bl __nw +/* 8033607C 00332FBC 4B F9 8B D1 */ bl __nw__FUl /* 80336080 00332FC0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80336084 00332FC4 41 82 00 20 */ beq lbl_803360A4 /* 80336088 00332FC8 7F 83 E3 78 */ mr r3, r28 @@ -1886,7 +1886,7 @@ lbl_803360BC: /* 803360BC 00332FFC 80 7D 00 08 */ lwz r3, 8(r29) /* 803360C0 00333000 A0 03 00 04 */ lhz r0, 4(r3) /* 803360C4 00333004 54 03 10 3A */ slwi r3, r0, 2 -/* 803360C8 00333008 4B F9 8B FD */ bl __nwa +/* 803360C8 00333008 4B F9 8B FD */ bl __nwa__FUl /* 803360CC 0033300C 80 9D 00 08 */ lwz r4, 8(r29) /* 803360D0 00333010 90 64 00 08 */ stw r3, 8(r4) /* 803360D4 00333014 38 00 00 00 */ li r0, 0 @@ -1956,7 +1956,7 @@ J3DModelLoader_NS_readMaterialDL: /* 803361C0 00333100 28 00 00 00 */ cmplwi r0, 0 /* 803361C4 00333104 41 82 00 3C */ beq lbl_80336200 /* 803361C8 00333108 38 60 00 10 */ li r3, 0x10 -/* 803361CC 0033310C 4B F9 8A 81 */ bl __nw +/* 803361CC 0033310C 4B F9 8A 81 */ bl __nw__FUl /* 803361D0 00333110 7C 7D 1B 79 */ or. r29, r3, r3 /* 803361D4 00333114 41 82 00 20 */ beq lbl_803361F4 /* 803361D8 00333118 7F 83 E3 78 */ mr r3, r28 @@ -1978,7 +1978,7 @@ lbl_8033620C: /* 8033620C 0033314C 80 7E 00 08 */ lwz r3, 8(r30) /* 80336210 00333150 A0 03 00 04 */ lhz r0, 4(r3) /* 80336214 00333154 54 03 10 3A */ slwi r3, r0, 2 -/* 80336218 00333158 4B F9 8A AD */ bl __nwa +/* 80336218 00333158 4B F9 8A AD */ bl __nwa__FUl /* 8033621C 0033315C 80 9E 00 08 */ lwz r4, 8(r30) /* 80336220 00333160 90 64 00 08 */ stw r3, 8(r4) /* 80336224 00333164 38 00 00 00 */ li r0, 0 @@ -2105,7 +2105,7 @@ lbl_803363CC: /* 803363CC 0033330C 7C 80 07 35 */ extsh. r0, r4 /* 803363D0 00333310 40 81 00 0C */ ble lbl_803363DC /* 803363D4 00333314 7F E3 FB 78 */ mr r3, r31 -/* 803363D8 00333318 4B F9 89 65 */ bl __dl +/* 803363D8 00333318 4B F9 89 65 */ bl __dl__FPv lbl_803363DC: /* 803363DC 0033331C 7F E3 FB 78 */ mr r3, r31 /* 803363E0 00333320 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2130,7 +2130,7 @@ lbl_80336428: /* 80336428 00333368 7C 80 07 35 */ extsh. r0, r4 /* 8033642C 0033336C 40 81 00 0C */ ble lbl_80336438 /* 80336430 00333370 7F E3 FB 78 */ mr r3, r31 -/* 80336434 00333374 4B F9 89 09 */ bl __dl +/* 80336434 00333374 4B F9 89 09 */ bl __dl__FPv lbl_80336438: /* 80336438 00333378 7F E3 FB 78 */ mr r3, r31 /* 8033643C 0033337C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2149,7 +2149,7 @@ lbl_80336438: /* 80336470 003333B0 90 1F 00 00 */ stw r0, 0(r31) /* 80336474 003333B4 7C 80 07 35 */ extsh. r0, r4 /* 80336478 003333B8 40 81 00 08 */ ble lbl_80336480 -/* 8033647C 003333BC 4B F9 88 C1 */ bl __dl +/* 8033647C 003333BC 4B F9 88 C1 */ bl __dl__FPv lbl_80336480: /* 80336480 003333C0 7F E3 FB 78 */ mr r3, r31 /* 80336484 003333C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2186,7 +2186,7 @@ lbl_803364FC: /* 803364FC 0033343C 7C 80 07 35 */ extsh. r0, r4 /* 80336500 00333440 40 81 00 0C */ ble lbl_8033650C /* 80336504 00333444 7F E3 FB 78 */ mr r3, r31 -/* 80336508 00333448 4B F9 88 35 */ bl __dl +/* 80336508 00333448 4B F9 88 35 */ bl __dl__FPv lbl_8033650C: /* 8033650C 0033344C 7F E3 FB 78 */ mr r3, r31 /* 80336510 00333450 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2243,7 +2243,7 @@ lbl_803365D8: /* 803365D8 00333518 7C 80 07 35 */ extsh. r0, r4 /* 803365DC 0033351C 40 81 00 0C */ ble lbl_803365E8 /* 803365E0 00333520 7F E3 FB 78 */ mr r3, r31 -/* 803365E4 00333524 4B F9 87 59 */ bl __dl +/* 803365E4 00333524 4B F9 87 59 */ bl __dl__FPv lbl_803365E8: /* 803365E8 00333528 7F E3 FB 78 */ mr r3, r31 /* 803365EC 0033352C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2305,7 +2305,7 @@ J3DMaterial: /* 803366C4 00333604 90 1F 00 08 */ stw r0, 8(r31) /* 803366C8 00333608 7C 80 07 35 */ extsh. r0, r4 /* 803366CC 0033360C 40 81 00 08 */ ble lbl_803366D4 -/* 803366D0 00333610 4B F9 86 6D */ bl __dl +/* 803366D0 00333610 4B F9 86 6D */ bl __dl__FPv lbl_803366D4: /* 803366D4 00333614 7F E3 FB 78 */ mr r3, r31 /* 803366D8 00333618 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/J3DGraphLoader/J3DShapeFactory.s b/asm/J3DGraphLoader/J3DShapeFactory.s index b76fcb83c0..3a3e88ef33 100644 --- a/asm/J3DGraphLoader/J3DShapeFactory.s +++ b/asm/J3DGraphLoader/J3DShapeFactory.s @@ -61,7 +61,7 @@ J3DShapeFactory_NS_create: /* 80337418 00334358 7C 9C 23 78 */ mr r28, r4 /* 8033741C 0033435C 7C BD 2B 78 */ mr r29, r5 /* 80337420 00334360 38 60 00 68 */ li r3, 0x68 -/* 80337424 00334364 4B F9 78 29 */ bl __nw +/* 80337424 00334364 4B F9 78 29 */ bl __nw__FUl /* 80337428 00334368 7C 7F 1B 79 */ or. r31, r3, r3 /* 8033742C 0033436C 41 82 00 2C */ beq lbl_80337458 /* 80337430 00334370 3C 80 80 3D */ lis r4, lbl_803CDC78@ha @@ -101,11 +101,11 @@ lbl_80337458: /* 803374B4 003343F4 90 1F 00 30 */ stw r0, 0x30(r31) /* 803374B8 003343F8 A0 1F 00 0A */ lhz r0, 0xa(r31) /* 803374BC 003343FC 54 03 10 3A */ slwi r3, r0, 2 -/* 803374C0 00334400 4B F9 78 05 */ bl __nwa +/* 803374C0 00334400 4B F9 78 05 */ bl __nwa__FUl /* 803374C4 00334404 90 7F 00 38 */ stw r3, 0x38(r31) /* 803374C8 00334408 A0 1F 00 0A */ lhz r0, 0xa(r31) /* 803374CC 0033440C 54 03 10 3A */ slwi r3, r0, 2 -/* 803374D0 00334410 4B F9 77 F5 */ bl __nwa +/* 803374D0 00334410 4B F9 77 F5 */ bl __nwa__FUl /* 803374D4 00334414 90 7F 00 3C */ stw r3, 0x3c(r31) /* 803374D8 00334418 80 9B 00 00 */ lwz r4, 0(r27) /* 803374DC 0033441C 80 7B 00 04 */ lwz r3, 4(r27) @@ -210,7 +210,7 @@ lbl_80337644: /* 8033764C 0033458C 48 00 00 C4 */ b lbl_80337710 lbl_80337650: /* 80337650 00334590 38 60 00 08 */ li r3, 8 -/* 80337654 00334594 4B F9 75 F9 */ bl __nw +/* 80337654 00334594 4B F9 75 F9 */ bl __nw__FUl /* 80337658 00334598 28 03 00 00 */ cmplwi r3, 0 /* 8033765C 0033459C 41 82 00 24 */ beq lbl_80337680 /* 80337660 003345A0 A0 BE 00 00 */ lhz r5, 0(r30) @@ -226,7 +226,7 @@ lbl_80337680: /* 80337684 003345C4 48 00 01 AC */ b lbl_80337830 lbl_80337688: /* 80337688 003345C8 38 60 00 08 */ li r3, 8 -/* 8033768C 003345CC 4B F9 75 C1 */ bl __nw +/* 8033768C 003345CC 4B F9 75 C1 */ bl __nw__FUl /* 80337690 003345D0 28 03 00 00 */ cmplwi r3, 0 /* 80337694 003345D4 41 82 00 30 */ beq lbl_803376C4 /* 80337698 003345D8 A0 BE 00 00 */ lhz r5, 0(r30) @@ -245,7 +245,7 @@ lbl_803376C4: /* 803376C8 00334608 48 00 01 68 */ b lbl_80337830 lbl_803376CC: /* 803376CC 0033460C 38 60 00 08 */ li r3, 8 -/* 803376D0 00334610 4B F9 75 7D */ bl __nw +/* 803376D0 00334610 4B F9 75 7D */ bl __nw__FUl /* 803376D4 00334614 28 03 00 00 */ cmplwi r3, 0 /* 803376D8 00334618 41 82 00 30 */ beq lbl_80337708 /* 803376DC 0033461C A0 BE 00 00 */ lhz r5, 0(r30) @@ -264,7 +264,7 @@ lbl_80337708: /* 8033770C 0033464C 48 00 01 24 */ b lbl_80337830 lbl_80337710: /* 80337710 00334650 38 60 00 10 */ li r3, 0x10 -/* 80337714 00334654 4B F9 75 39 */ bl __nw +/* 80337714 00334654 4B F9 75 39 */ bl __nw__FUl /* 80337718 00334658 28 03 00 00 */ cmplwi r3, 0 /* 8033771C 0033465C 41 82 00 4C */ beq lbl_80337768 /* 80337720 00334660 80 9D 00 0C */ lwz r4, 0xc(r29) @@ -304,7 +304,7 @@ lbl_80337784: /* 8033779C 003346DC 48 00 00 84 */ b lbl_80337820 lbl_803377A0: /* 803377A0 003346E0 38 60 00 08 */ li r3, 8 -/* 803377A4 003346E4 4B F9 74 A9 */ bl __nw +/* 803377A4 003346E4 4B F9 74 A9 */ bl __nw__FUl /* 803377A8 003346E8 28 03 00 00 */ cmplwi r3, 0 /* 803377AC 003346EC 41 82 00 18 */ beq lbl_803377C4 /* 803377B0 003346F0 A0 BE 00 00 */ lhz r5, 0(r30) @@ -317,7 +317,7 @@ lbl_803377C4: /* 803377C8 00334708 48 00 00 68 */ b lbl_80337830 lbl_803377CC: /* 803377CC 0033470C 38 60 00 10 */ li r3, 0x10 -/* 803377D0 00334710 4B F9 74 7D */ bl __nw +/* 803377D0 00334710 4B F9 74 7D */ bl __nw__FUl /* 803377D4 00334714 28 03 00 00 */ cmplwi r3, 0 /* 803377D8 00334718 41 82 00 40 */ beq lbl_80337818 /* 803377DC 0033471C 80 9D 00 0C */ lwz r4, 0xc(r29) @@ -373,7 +373,7 @@ J3DShapeFactory_NS_newShapeDraw: /* 8033788C 003347CC 7F E3 02 14 */ add r31, r3, r0 /* 80337890 003347D0 7F E7 FA 14 */ add r31, r7, r31 /* 80337894 003347D4 38 60 00 0C */ li r3, 0xc -/* 80337898 003347D8 4B F9 73 B5 */ bl __nw +/* 80337898 003347D8 4B F9 73 B5 */ bl __nw__FUl /* 8033789C 003347DC 7C 60 1B 79 */ or. r0, r3, r3 /* 803378A0 003347E0 41 82 00 1C */ beq lbl_803378BC /* 803378A4 003347E4 80 9E 00 10 */ lwz r4, 0x10(r30) @@ -402,7 +402,7 @@ J3DShapeFactory_NS_allocVcdVatCmdBuffer: /* 803378F0 00334830 1F E4 00 C0 */ mulli r31, r4, 0xc0 /* 803378F4 00334834 7F E3 FB 78 */ mr r3, r31 /* 803378F8 00334838 38 80 00 20 */ li r4, 0x20 -/* 803378FC 0033483C 4B F9 73 F1 */ bl __nwa_X1_ +/* 803378FC 0033483C 4B F9 73 F1 */ bl __nwa__FUli /* 80337900 00334840 90 7E 00 1C */ stw r3, 0x1c(r30) /* 80337904 00334844 38 60 00 00 */ li r3, 0 /* 80337908 00334848 57 E4 F0 BE */ srwi r4, r31, 2 diff --git a/asm/JAudio2/JAIAudible.s b/asm/JAudio2/JAIAudible.s index 704dbbdc4f..f5cc5d60c2 100644 --- a/asm/JAudio2/JAIAudible.s +++ b/asm/JAudio2/JAIAudible.s @@ -16,7 +16,7 @@ JAIAudible_NS_dtor: /* 8029EFCC 0029BF0C 90 1F 00 00 */ stw r0, 0(r31) /* 8029EFD0 0029BF10 7C 80 07 35 */ extsh. r0, r4 /* 8029EFD4 0029BF14 40 81 00 08 */ ble lbl_8029EFDC -/* 8029EFD8 0029BF18 48 02 FD 65 */ bl __dl +/* 8029EFD8 0029BF18 48 02 FD 65 */ bl __dl__FPv lbl_8029EFDC: /* 8029EFDC 0029BF1C 7F E3 FB 78 */ mr r3, r31 /* 8029EFE0 0029BF20 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAIAudience.s b/asm/JAudio2/JAIAudience.s index b0545050bc..111ee7151e 100644 --- a/asm/JAudio2/JAIAudience.s +++ b/asm/JAudio2/JAIAudience.s @@ -16,7 +16,7 @@ JAIAudience_NS_dtor: /* 8029F014 0029BF54 90 1F 00 00 */ stw r0, 0(r31) /* 8029F018 0029BF58 7C 80 07 35 */ extsh. r0, r4 /* 8029F01C 0029BF5C 40 81 00 08 */ ble lbl_8029F024 -/* 8029F020 0029BF60 48 02 FD 1D */ bl __dl +/* 8029F020 0029BF60 48 02 FD 1D */ bl __dl__FPv lbl_8029F024: /* 8029F024 0029BF64 7F E3 FB 78 */ mr r3, r31 /* 8029F028 0029BF68 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAISe.s b/asm/JAudio2/JAISe.s index 083a79d032..d591689fcb 100644 --- a/asm/JAudio2/JAISe.s +++ b/asm/JAudio2/JAISe.s @@ -15,7 +15,7 @@ JAISe: /* 8029F058 0029BF98 7C BE 2B 78 */ mr r30, r5 /* 8029F05C 0029BF9C 7C DF 33 78 */ mr r31, r6 /* 8029F060 0029BFA0 7F 84 E3 78 */ mr r4, r28 -/* 8029F064 0029BFA4 48 03 CD 99 */ bl JSUPtrLink +/* 8029F064 0029BFA4 48 03 CD 99 */ bl __ct__10JSUPtrLinkFPv /* 8029F068 0029BFA8 38 7C 00 10 */ addi r3, r28, 0x10 /* 8029F06C 0029BFAC 48 00 32 8D */ bl JAISound /* 8029F070 0029BFB0 3C 60 80 3D */ lis r3, lbl_803C9858@ha diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index f183725619..29b07c7ea2 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -218,7 +218,7 @@ lbl_8029FB5C: /* 8029FB6C 0029CAAC 40 82 00 A4 */ bne lbl_8029FC10 /* 8029FB70 0029CAB0 38 7C 00 58 */ addi r3, r28, 0x58 /* 8029FB74 0029CAB4 7F C4 F3 78 */ mr r4, r30 -/* 8029FB78 0029CAB8 48 03 C5 E5 */ bl JSUPtrList_NS_remove +/* 8029FB78 0029CAB8 48 03 C5 E5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 8029FB7C 0029CABC 83 DE 00 00 */ lwz r30, 0(r30) /* 8029FB80 0029CAC0 28 1E 00 00 */ cmplwi r30, 0 /* 8029FB84 0029CAC4 41 82 00 8C */ beq lbl_8029FC10 @@ -236,7 +236,7 @@ lbl_8029FBAC: /* 8029FBB0 0029CAF0 41 82 00 10 */ beq lbl_8029FBC0 /* 8029FBB4 0029CAF4 7F C3 F3 78 */ mr r3, r30 /* 8029FBB8 0029CAF8 38 80 00 00 */ li r4, 0 -/* 8029FBBC 0029CAFC 48 03 C2 59 */ bl JSUPtrLink_NS_dtor +/* 8029FBBC 0029CAFC 48 03 C2 59 */ bl __dt__10JSUPtrLinkFv lbl_8029FBC0: /* 8029FBC0 0029CB00 88 0D 8D 90 */ lbz r0, lbl_80451310-_SDA_BASE_(r13) /* 8029FBC4 0029CB04 7C 00 07 75 */ extsb. r0, r0 @@ -287,7 +287,7 @@ JASMemPool_NS_dtor: /* 8029FC5C 0029CB9C 7F E0 07 35 */ extsh. r0, r31 /* 8029FC60 0029CBA0 40 81 00 0C */ ble lbl_8029FC6C /* 8029FC64 0029CBA4 7F C3 F3 78 */ mr r3, r30 -/* 8029FC68 0029CBA8 48 02 F0 D5 */ bl __dl +/* 8029FC68 0029CBA8 48 02 F0 D5 */ bl __dl__FPv lbl_8029FC6C: /* 8029FC6C 0029CBAC 7F C3 F3 78 */ mr r3, r30 /* 8029FC70 0029CBB0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -388,10 +388,10 @@ lbl_8029FD9C: lbl_8029FDA4: /* 8029FDA4 0029CCE4 38 7D 00 58 */ addi r3, r29, 0x58 /* 8029FDA8 0029CCE8 7F C4 F3 78 */ mr r4, r30 -/* 8029FDAC 0029CCEC 48 03 C3 B1 */ bl JSUPtrList_NS_remove +/* 8029FDAC 0029CCEC 48 03 C3 B1 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 8029FDB0 0029CCF0 38 7D 00 58 */ addi r3, r29, 0x58 /* 8029FDB4 0029CCF4 7F C4 F3 78 */ mr r4, r30 -/* 8029FDB8 0029CCF8 48 03 C1 95 */ bl JSUPtrList_NS_append +/* 8029FDB8 0029CCF8 48 03 C1 95 */ bl append__10JSUPtrListFP10JSUPtrLink /* 8029FDBC 0029CCFC 3B FF FF FF */ addi r31, r31, -1 lbl_8029FDC0: /* 8029FDC0 0029CD00 28 1F 00 00 */ cmplwi r31, 0 @@ -965,7 +965,7 @@ lbl_802A053C: lbl_802A054C: /* 802A054C 0029D48C 38 7F 00 58 */ addi r3, r31, 0x58 /* 802A0550 0029D490 7F 84 E3 78 */ mr r4, r28 -/* 802A0554 0029D494 48 03 B9 F9 */ bl JSUPtrList_NS_append +/* 802A0554 0029D494 48 03 B9 F9 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A0558 0029D498 7F 83 E3 78 */ mr r3, r28 lbl_802A055C: /* 802A055C 0029D49C 39 61 00 20 */ addi r11, r1, 0x20 @@ -1268,7 +1268,7 @@ lbl_802A0968: /* 802A0968 0029D8A8 7F E0 07 35 */ extsh. r0, r31 /* 802A096C 0029D8AC 40 81 00 0C */ ble lbl_802A0978 /* 802A0970 0029D8B0 7F C3 F3 78 */ mr r3, r30 -/* 802A0974 0029D8B4 48 02 E3 C9 */ bl __dl +/* 802A0974 0029D8B4 48 02 E3 C9 */ bl __dl__FPv lbl_802A0978: /* 802A0978 0029D8B8 7F C3 F3 78 */ mr r3, r30 /* 802A097C 0029D8BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1299,7 +1299,7 @@ JAISeCategoryMgr: /* 802A09D8 0029D918 D0 1F 00 14 */ stfs f0, 0x14(r31) /* 802A09DC 0029D91C D0 3F 00 18 */ stfs f1, 0x18(r31) /* 802A09E0 0029D920 38 7F 00 58 */ addi r3, r31, 0x58 -/* 802A09E4 0029D924 48 03 B5 31 */ bl JSUPtrList_NS_initiate +/* 802A09E4 0029D924 48 03 B5 31 */ bl initiate__10JSUPtrListFv /* 802A09E8 0029D928 C0 02 BD 8C */ lfs f0, lbl_8045578C-_SDA2_BASE_(r2) /* 802A09EC 0029D92C D0 1F 00 08 */ stfs f0, 8(r31) /* 802A09F0 0029D930 D0 1F 00 10 */ stfs f0, 0x10(r31) diff --git a/asm/JAudio2/JAISeq.s b/asm/JAudio2/JAISeq.s index e03fb66655..3e346b2867 100644 --- a/asm/JAudio2/JAISeq.s +++ b/asm/JAudio2/JAISeq.s @@ -28,7 +28,7 @@ JAISeq: /* 802A0AAC 0029D9EC 48 00 18 4D */ bl JAISound /* 802A0AB0 0029D9F0 38 7D 00 98 */ addi r3, r29, 0x98 /* 802A0AB4 0029D9F4 7F A4 EB 78 */ mr r4, r29 -/* 802A0AB8 0029D9F8 48 03 B3 45 */ bl JSUPtrLink +/* 802A0AB8 0029D9F8 48 03 B3 45 */ bl __ct__10JSUPtrLinkFPv /* 802A0ABC 0029D9FC 3C 60 80 3D */ lis r3, lbl_803C98F4@ha /* 802A0AC0 0029DA00 38 03 98 F4 */ addi r0, r3, lbl_803C98F4@l /* 802A0AC4 0029DA04 90 1D 00 00 */ stw r0, 0(r29) @@ -603,7 +603,7 @@ JASMemPool_NS_dtor_X1_: /* 802A1290 0029E1D0 7F E0 07 35 */ extsh. r0, r31 /* 802A1294 0029E1D4 40 81 00 0C */ ble lbl_802A12A0 /* 802A1298 0029E1D8 7F C3 F3 78 */ mr r3, r30 -/* 802A129C 0029E1DC 48 02 DA A1 */ bl __dl +/* 802A129C 0029E1DC 48 02 DA A1 */ bl __dl__FPv lbl_802A12A0: /* 802A12A0 0029E1E0 7F C3 F3 78 */ mr r3, r30 /* 802A12A4 0029E1E4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAISeqDataMgr.s b/asm/JAudio2/JAISeqDataMgr.s index 8f484ffb31..bb8e772a74 100644 --- a/asm/JAudio2/JAISeqDataMgr.s +++ b/asm/JAudio2/JAISeqDataMgr.s @@ -16,7 +16,7 @@ JAISeqDataUser_NS_dtor: /* 802A1794 0029E6D4 90 1F 00 00 */ stw r0, 0(r31) /* 802A1798 0029E6D8 7C 80 07 35 */ extsh. r0, r4 /* 802A179C 0029E6DC 40 81 00 08 */ ble lbl_802A17A4 -/* 802A17A0 0029E6E0 48 02 D5 9D */ bl __dl +/* 802A17A0 0029E6E0 48 02 D5 9D */ bl __dl__FPv lbl_802A17A4: /* 802A17A4 0029E6E4 7F E3 FB 78 */ mr r3, r31 /* 802A17A8 0029E6E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -38,7 +38,7 @@ JAISeqDataMgr_NS_dtor: /* 802A17DC 0029E71C 90 1F 00 00 */ stw r0, 0(r31) /* 802A17E0 0029E720 7C 80 07 35 */ extsh. r0, r4 /* 802A17E4 0029E724 40 81 00 08 */ ble lbl_802A17EC -/* 802A17E8 0029E728 48 02 D5 55 */ bl __dl +/* 802A17E8 0029E728 48 02 D5 55 */ bl __dl__FPv lbl_802A17EC: /* 802A17EC 0029E72C 7F E3 FB 78 */ mr r3, r31 /* 802A17F0 0029E730 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index 9efd75dbda..e24bf7a291 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -113,7 +113,7 @@ lbl_802A1934: /* 802A196C 0029E8AC D0 1F 00 20 */ stfs f0, 0x20(r31) /* 802A1970 0029E8B0 D0 3F 00 24 */ stfs f1, 0x24(r31) /* 802A1974 0029E8B4 38 7F 00 64 */ addi r3, r31, 0x64 -/* 802A1978 0029E8B8 48 03 A5 9D */ bl JSUPtrList_NS_initiate +/* 802A1978 0029E8B8 48 03 A5 9D */ bl initiate__10JSUPtrListFv /* 802A197C 0029E8BC 38 60 00 00 */ li r3, 0 /* 802A1980 0029E8C0 90 7F 00 0C */ stw r3, 0xc(r31) /* 802A1984 0029E8C4 90 7F 00 10 */ stw r3, 0x10(r31) @@ -167,7 +167,7 @@ lbl_802A1A28: /* 802A1A34 0029E974 28 00 00 06 */ cmplwi r0, 6 /* 802A1A38 0029E978 40 82 00 98 */ bne lbl_802A1AD0 /* 802A1A3C 0029E97C 38 7D 00 64 */ addi r3, r29, 0x64 -/* 802A1A40 0029E980 48 03 A7 1D */ bl JSUPtrList_NS_remove +/* 802A1A40 0029E980 48 03 A7 1D */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802A1A44 0029E984 28 1F 00 00 */ cmplwi r31, 0 /* 802A1A48 0029E988 41 82 00 88 */ beq lbl_802A1AD0 /* 802A1A4C 0029E98C 3C 60 80 3D */ lis r3, lbl_803C98F4@ha @@ -183,7 +183,7 @@ lbl_802A1A6C: /* 802A1A70 0029E9B0 41 82 00 10 */ beq lbl_802A1A80 /* 802A1A74 0029E9B4 38 7F 00 98 */ addi r3, r31, 0x98 /* 802A1A78 0029E9B8 38 80 00 00 */ li r4, 0 -/* 802A1A7C 0029E9BC 48 03 A3 99 */ bl JSUPtrLink_NS_dtor +/* 802A1A7C 0029E9BC 48 03 A3 99 */ bl __dt__10JSUPtrLinkFv lbl_802A1A80: /* 802A1A80 0029E9C0 88 0D 8D A0 */ lbz r0, lbl_80451320-_SDA_BASE_(r13) /* 802A1A84 0029E9C4 7C 00 07 75 */ extsb. r0, r0 @@ -234,7 +234,7 @@ JASMemPool_NS_dtor_X2_: /* 802A1B1C 0029EA5C 7F E0 07 35 */ extsh. r0, r31 /* 802A1B20 0029EA60 40 81 00 0C */ ble lbl_802A1B2C /* 802A1B24 0029EA64 7F C3 F3 78 */ mr r3, r30 -/* 802A1B28 0029EA68 48 02 D2 15 */ bl __dl +/* 802A1B28 0029EA68 48 02 D2 15 */ bl __dl__FPv lbl_802A1B2C: /* 802A1B2C 0029EA6C 7F C3 F3 78 */ mr r3, r30 /* 802A1B30 0029EA70 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -613,7 +613,7 @@ JAISeqMgr_NS_endStartSeq_: /* 802A2020 0029EF60 38 84 00 98 */ addi r4, r4, 0x98 lbl_802A2024: /* 802A2024 0029EF64 38 63 00 64 */ addi r3, r3, 0x64 -/* 802A2028 0029EF68 48 03 9F 25 */ bl JSUPtrList_NS_append +/* 802A2028 0029EF68 48 03 9F 25 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A202C 0029EF6C 28 1E 00 00 */ cmplwi r30, 0 /* 802A2030 0029EF70 41 82 00 10 */ beq lbl_802A2040 /* 802A2034 0029EF74 7F E3 FB 78 */ mr r3, r31 @@ -638,7 +638,7 @@ lbl_802A2070: /* 802A2074 0029EFB4 41 82 00 10 */ beq lbl_802A2084 /* 802A2078 0029EFB8 38 7F 00 98 */ addi r3, r31, 0x98 /* 802A207C 0029EFBC 38 80 00 00 */ li r4, 0 -/* 802A2080 0029EFC0 48 03 9D 95 */ bl JSUPtrLink_NS_dtor +/* 802A2080 0029EFC0 48 03 9D 95 */ bl __dt__10JSUPtrLinkFv lbl_802A2084: /* 802A2084 0029EFC4 88 0D 8D A0 */ lbz r0, lbl_80451320-_SDA_BASE_(r13) /* 802A2088 0029EFC8 7C 00 07 75 */ extsb. r0, r0 @@ -687,7 +687,7 @@ lbl_802A20D8: /* 802A2120 0029F060 41 82 00 10 */ beq lbl_802A2130 /* 802A2124 0029F064 38 7E 00 64 */ addi r3, r30, 0x64 /* 802A2128 0029F068 38 80 00 00 */ li r4, 0 -/* 802A212C 0029F06C 48 03 9D 81 */ bl JSUPtrList_NS_dtor +/* 802A212C 0029F06C 48 03 9D 81 */ bl __dt__10JSUPtrListFv lbl_802A2130: /* 802A2130 0029F070 7F C3 F3 78 */ mr r3, r30 /* 802A2134 0029F074 38 80 00 00 */ li r4, 0 @@ -703,7 +703,7 @@ lbl_802A2158: /* 802A2158 0029F098 7F E0 07 35 */ extsh. r0, r31 /* 802A215C 0029F09C 40 81 00 0C */ ble lbl_802A2168 /* 802A2160 0029F0A0 7F C3 F3 78 */ mr r3, r30 -/* 802A2164 0029F0A4 48 02 CB D9 */ bl __dl +/* 802A2164 0029F0A4 48 02 CB D9 */ bl __dl__FPv lbl_802A2168: /* 802A2168 0029F0A8 7F C3 F3 78 */ mr r3, r30 /* 802A216C 0029F0AC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAISoundInfo.s b/asm/JAudio2/JAISoundInfo.s index 6a6c9b3fd8..9728ac1ad6 100644 --- a/asm/JAudio2/JAISoundInfo.s +++ b/asm/JAudio2/JAISoundInfo.s @@ -35,7 +35,7 @@ lbl_802A2D8C: /* 802A2D8C 0029FCCC 7C 80 07 35 */ extsh. r0, r4 /* 802A2D90 0029FCD0 40 81 00 0C */ ble lbl_802A2D9C /* 802A2D94 0029FCD4 7F E3 FB 78 */ mr r3, r31 -/* 802A2D98 0029FCD8 48 02 BF A5 */ bl __dl +/* 802A2D98 0029FCD8 48 02 BF A5 */ bl __dl__FPv lbl_802A2D9C: /* 802A2D9C 0029FCDC 7F E3 FB 78 */ mr r3, r31 /* 802A2DA0 0029FCE0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAISoundStarter.s b/asm/JAudio2/JAISoundStarter.s index d2932162da..026872abd7 100644 --- a/asm/JAudio2/JAISoundStarter.s +++ b/asm/JAudio2/JAISoundStarter.s @@ -35,7 +35,7 @@ lbl_802A2FC4: /* 802A2FC4 0029FF04 7C 80 07 35 */ extsh. r0, r4 /* 802A2FC8 0029FF08 40 81 00 0C */ ble lbl_802A2FD4 /* 802A2FCC 0029FF0C 7F E3 FB 78 */ mr r3, r31 -/* 802A2FD0 0029FF10 48 02 BD 6D */ bl __dl +/* 802A2FD0 0029FF10 48 02 BD 6D */ bl __dl__FPv lbl_802A2FD4: /* 802A2FD4 0029FF14 7F E3 FB 78 */ mr r3, r31 /* 802A2FD8 0029FF18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAIStream.s b/asm/JAudio2/JAIStream.s index cba4de101c..fd3c1cfb6a 100644 --- a/asm/JAudio2/JAIStream.s +++ b/asm/JAudio2/JAIStream.s @@ -33,7 +33,7 @@ JAIStream: /* 802A3124 002A0064 4B FF F1 D5 */ bl JAISound /* 802A3128 002A0068 38 7D 00 98 */ addi r3, r29, 0x98 /* 802A312C 002A006C 7F A4 EB 78 */ mr r4, r29 -/* 802A3130 002A0070 48 03 8C CD */ bl JSUPtrLink +/* 802A3130 002A0070 48 03 8C CD */ bl __ct__10JSUPtrLinkFPv /* 802A3134 002A0074 3C 60 80 3D */ lis r3, lbl_803C99D8@ha /* 802A3138 002A0078 38 03 99 D8 */ addi r0, r3, lbl_803C99D8@l /* 802A313C 002A007C 90 1D 00 00 */ stw r0, 0(r29) diff --git a/asm/JAudio2/JAIStreamDataMgr.s b/asm/JAudio2/JAIStreamDataMgr.s index cc917d0f43..9ae7c4dc5a 100644 --- a/asm/JAudio2/JAIStreamDataMgr.s +++ b/asm/JAudio2/JAIStreamDataMgr.s @@ -16,7 +16,7 @@ JAIStreamDataMgr_NS_dtor: /* 802A3AF8 002A0A38 90 1F 00 00 */ stw r0, 0(r31) /* 802A3AFC 002A0A3C 7C 80 07 35 */ extsh. r0, r4 /* 802A3B00 002A0A40 40 81 00 08 */ ble lbl_802A3B08 -/* 802A3B04 002A0A44 48 02 B2 39 */ bl __dl +/* 802A3B04 002A0A44 48 02 B2 39 */ bl __dl__FPv lbl_802A3B08: /* 802A3B08 002A0A48 7F E3 FB 78 */ mr r3, r31 /* 802A3B0C 002A0A4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -38,7 +38,7 @@ JAIStreamAramMgr_NS_dtor: /* 802A3B40 002A0A80 90 1F 00 00 */ stw r0, 0(r31) /* 802A3B44 002A0A84 7C 80 07 35 */ extsh. r0, r4 /* 802A3B48 002A0A88 40 81 00 08 */ ble lbl_802A3B50 -/* 802A3B4C 002A0A8C 48 02 B1 F1 */ bl __dl +/* 802A3B4C 002A0A8C 48 02 B1 F1 */ bl __dl__FPv lbl_802A3B50: /* 802A3B50 002A0A90 7F E3 FB 78 */ mr r3, r31 /* 802A3B54 002A0A94 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index 0f72d318f0..5feedbc578 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -23,7 +23,7 @@ lbl_802A3B88: /* 802A3BA0 002A0AE0 D0 1F 00 10 */ stfs f0, 0x10(r31) /* 802A3BA4 002A0AE4 D0 3F 00 14 */ stfs f1, 0x14(r31) /* 802A3BA8 002A0AE8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 802A3BAC 002A0AEC 48 03 83 69 */ bl JSUPtrList_NS_initiate +/* 802A3BAC 002A0AEC 48 03 83 69 */ bl initiate__10JSUPtrListFv /* 802A3BB0 002A0AF0 38 00 00 00 */ li r0, 0 /* 802A3BB4 002A0AF4 90 1F 00 64 */ stw r0, 0x64(r31) /* 802A3BB8 002A0AF8 90 1F 00 68 */ stw r0, 0x68(r31) @@ -164,7 +164,7 @@ lbl_802A3D90: /* 802A3D9C 002A0CDC 28 00 00 06 */ cmplwi r0, 6 /* 802A3DA0 002A0CE0 40 82 00 A4 */ bne lbl_802A3E44 /* 802A3DA4 002A0CE4 38 7D 00 58 */ addi r3, r29, 0x58 -/* 802A3DA8 002A0CE8 48 03 83 B5 */ bl JSUPtrList_NS_remove +/* 802A3DA8 002A0CE8 48 03 83 B5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802A3DAC 002A0CEC 80 9F 02 9C */ lwz r4, 0x29c(r31) /* 802A3DB0 002A0CF0 28 04 00 00 */ cmplwi r4, 0 /* 802A3DB4 002A0CF4 41 82 00 18 */ beq lbl_802A3DCC @@ -183,7 +183,7 @@ lbl_802A3DCC: /* 802A3DE4 002A0D24 41 82 00 10 */ beq lbl_802A3DF4 /* 802A3DE8 002A0D28 38 7F 00 98 */ addi r3, r31, 0x98 /* 802A3DEC 002A0D2C 38 80 00 00 */ li r4, 0 -/* 802A3DF0 002A0D30 48 03 80 25 */ bl JSUPtrLink_NS_dtor +/* 802A3DF0 002A0D30 48 03 80 25 */ bl __dt__10JSUPtrLinkFv lbl_802A3DF4: /* 802A3DF4 002A0D34 88 0D 8D A8 */ lbz r0, lbl_80451328-_SDA_BASE_(r13) /* 802A3DF8 002A0D38 7C 00 07 75 */ extsb. r0, r0 @@ -234,7 +234,7 @@ JASMemPool_NS_dtor_X3_: /* 802A3E90 002A0DD0 7F E0 07 35 */ extsh. r0, r31 /* 802A3E94 002A0DD4 40 81 00 0C */ ble lbl_802A3EA0 /* 802A3E98 002A0DD8 7F C3 F3 78 */ mr r3, r30 -/* 802A3E9C 002A0DDC 48 02 AE A1 */ bl __dl +/* 802A3E9C 002A0DDC 48 02 AE A1 */ bl __dl__FPv lbl_802A3EA0: /* 802A3EA0 002A0DE0 7F C3 F3 78 */ mr r3, r30 /* 802A3EA4 002A0DE4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -507,7 +507,7 @@ lbl_802A4214: /* 802A421C 002A115C 38 9E 00 98 */ addi r4, r30, 0x98 lbl_802A4220: /* 802A4220 002A1160 38 7F 00 58 */ addi r3, r31, 0x58 -/* 802A4224 002A1164 48 03 7D 29 */ bl JSUPtrList_NS_append +/* 802A4224 002A1164 48 03 7D 29 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A4228 002A1168 7F C3 F3 78 */ mr r3, r30 lbl_802A422C: /* 802A422C 002A116C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index bfecd9a7c7..db18604b8f 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -26,7 +26,7 @@ lbl_8029C3CC: /* 8029C3CC 0029930C 7F 83 E3 78 */ mr r3, r28 /* 8029C3D0 00299310 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029C3D4 00299314 38 A0 00 20 */ li r5, 0x20 -/* 8029C3D8 00299318 48 03 29 39 */ bl __nwa_X2_ +/* 8029C3D8 00299318 48 03 29 39 */ bl __nwa__FUlP7JKRHeapi /* 8029C3DC 0029931C 7C 7D F1 2E */ stwx r3, r29, r30 /* 8029C3E0 00299320 7C 7D F0 2E */ lwzx r3, r29, r30 /* 8029C3E4 00299324 7F 64 DB 78 */ mr r4, r27 @@ -42,7 +42,7 @@ lbl_8029C3CC: /* 8029C40C 0029934C 54 03 10 3A */ slwi r3, r0, 2 /* 8029C410 00299350 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029C414 00299354 38 A0 00 00 */ li r5, 0 -/* 8029C418 00299358 48 03 28 F9 */ bl __nwa_X2_ +/* 8029C418 00299358 48 03 28 F9 */ bl __nwa__FUlP7JKRHeapi /* 8029C41C 0029935C 90 6D 8D 20 */ stw r3, lbl_804512A0-_SDA_BASE_(r13) /* 8029C420 00299360 3B 20 00 00 */ li r25, 0 /* 8029C424 00299364 3B C0 00 00 */ li r30, 0 @@ -52,7 +52,7 @@ lbl_8029C42C: /* 8029C430 00299370 54 63 08 3C */ slwi r3, r3, 1 /* 8029C434 00299374 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029C438 00299378 38 A0 00 20 */ li r5, 0x20 -/* 8029C43C 0029937C 48 03 28 D5 */ bl __nwa_X2_ +/* 8029C43C 0029937C 48 03 28 D5 */ bl __nwa__FUlP7JKRHeapi /* 8029C440 00299380 80 8D 8D 20 */ lwz r4, lbl_804512A0-_SDA_BASE_(r13) /* 8029C444 00299384 7C 64 F1 2E */ stwx r3, r4, r30 /* 8029C448 00299388 80 6D 8D 20 */ lwz r3, lbl_804512A0-_SDA_BASE_(r13) diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index 45202be144..ef92aa9897 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -30,7 +30,7 @@ lbl_80296364: /* 80296368 002932A8 7C 60 F9 D6 */ mullw r3, r0, r31 /* 8029636C 002932AC 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 80296370 002932B0 38 A0 00 20 */ li r5, 0x20 -/* 80296374 002932B4 48 03 89 9D */ bl __nwa_X2_ +/* 80296374 002932B4 48 03 89 9D */ bl __nwa__FUlP7JKRHeapi /* 80296378 002932B8 90 6D 8C D4 */ stw r3, lbl_80451254-_SDA_BASE_(r13) /* 8029637C 002932BC 93 CD 8C D8 */ stw r30, lbl_80451258-_SDA_BASE_(r13) /* 80296380 002932C0 93 ED 8C DC */ stw r31, lbl_8045125C-_SDA_BASE_(r13) @@ -1607,7 +1607,7 @@ JASMemPool_MultiThreaded_NS_dtor_X2_: /* 80297904 00294844 7F E0 07 35 */ extsh. r0, r31 /* 80297908 00294848 40 81 00 0C */ ble lbl_80297914 /* 8029790C 0029484C 7F C3 F3 78 */ mr r3, r30 -/* 80297910 00294850 48 03 74 2D */ bl __dl +/* 80297910 00294850 48 03 74 2D */ bl __dl__FPv lbl_80297914: /* 80297914 00294854 7F C3 F3 78 */ mr r3, r30 /* 80297918 00294858 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASAudioReseter.s b/asm/JAudio2/JASAudioReseter.s index 564d8f1e5c..64d0a55d3e 100644 --- a/asm/JAudio2/JASAudioReseter.s +++ b/asm/JAudio2/JASAudioReseter.s @@ -34,7 +34,7 @@ JASAudioReseter_NS_dtor: /* 8029D110 0029A050 41 82 00 10 */ beq lbl_8029D120 /* 8029D114 0029A054 7C 80 07 35 */ extsh. r0, r4 /* 8029D118 0029A058 40 81 00 08 */ ble lbl_8029D120 -/* 8029D11C 0029A05C 48 03 1C 21 */ bl __dl +/* 8029D11C 0029A05C 48 03 1C 21 */ bl __dl__FPv lbl_8029D120: /* 8029D120 0029A060 7F E3 FB 78 */ mr r3, r31 /* 8029D124 0029A064 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASAudioThread.s b/asm/JAudio2/JASAudioThread.s index 2d979f2346..ae5ab3e7f3 100644 --- a/asm/JAudio2/JASAudioThread.s +++ b/asm/JAudio2/JASAudioThread.s @@ -45,7 +45,7 @@ JASAudioThread_NS_create: /* 8029CD60 00299CA0 38 60 00 88 */ li r3, 0x88 /* 8029CD64 00299CA4 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029CD68 00299CA8 38 A0 00 00 */ li r5, 0 -/* 8029CD6C 00299CAC 48 03 1F 2D */ bl __nw_X2_ +/* 8029CD6C 00299CAC 48 03 1F 2D */ bl __nw__FUlP7JKRHeapi /* 8029CD70 00299CB0 7C 64 1B 79 */ or. r4, r3, r3 /* 8029CD74 00299CB4 41 82 00 18 */ beq lbl_8029CD8C /* 8029CD78 00299CB8 7F E4 FB 78 */ mr r4, r31 @@ -276,7 +276,7 @@ lbl_8029D07C: /* 8029D088 00299FC8 7F E0 07 35 */ extsh. r0, r31 /* 8029D08C 00299FCC 40 81 00 0C */ ble lbl_8029D098 /* 8029D090 00299FD0 7F C3 F3 78 */ mr r3, r30 -/* 8029D094 00299FD4 48 03 1C A9 */ bl __dl +/* 8029D094 00299FD4 48 03 1C A9 */ bl __dl__FPv lbl_8029D098: /* 8029D098 00299FD8 7F C3 F3 78 */ mr r3, r30 /* 8029D09C 00299FDC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index 3280fb0d49..25eef96971 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -98,7 +98,7 @@ lbl_80299660: /* 80299660 002965A0 38 60 00 10 */ li r3, 0x10 /* 80299664 002965A4 7F E4 FB 78 */ mr r4, r31 /* 80299668 002965A8 38 A0 00 00 */ li r5, 0 -/* 8029966C 002965AC 48 03 56 2D */ bl __nw_X2_ +/* 8029966C 002965AC 48 03 56 2D */ bl __nw__FUlP7JKRHeapi /* 80299670 002965B0 7C 7B 1B 79 */ or. r27, r3, r3 /* 80299674 002965B4 41 82 00 0C */ beq lbl_80299680 /* 80299678 002965B8 4B FF E7 01 */ bl JASBasicBank @@ -127,7 +127,7 @@ lbl_80299690: /* 802996CC 0029660C 80 77 00 04 */ lwz r3, 4(r23) /* 802996D0 00296610 7F E4 FB 78 */ mr r4, r31 /* 802996D4 00296614 38 A0 00 02 */ li r5, 2 -/* 802996D8 00296618 48 03 56 39 */ bl __nwa_X2_ +/* 802996D8 00296618 48 03 56 39 */ bl __nwa__FUlP7JKRHeapi /* 802996DC 0029661C 7C 74 1B 78 */ mr r20, r3 /* 802996E0 00296620 38 77 00 08 */ addi r3, r23, 8 /* 802996E4 00296624 7E 84 A3 78 */ mr r4, r20 @@ -138,7 +138,7 @@ lbl_80299690: /* 802996F8 00296638 7F E4 FB 78 */ mr r4, r31 /* 802996FC 0029663C 38 A0 00 00 */ li r5, 0 /* 80299700 00296640 3A B6 00 0C */ addi r21, r22, 0xc -/* 80299704 00296644 48 03 56 0D */ bl __nwa_X2_ +/* 80299704 00296644 48 03 56 0D */ bl __nwa__FUlP7JKRHeapi /* 80299708 00296648 7C 7D 1B 78 */ mr r29, r3 /* 8029970C 0029664C 38 60 00 00 */ li r3, 0 /* 80299710 00296650 7E E9 03 A6 */ mtctr r23 @@ -194,7 +194,7 @@ lbl_802997C8: /* 802997C8 00296708 38 60 00 1C */ li r3, 0x1c /* 802997CC 0029670C 7F E4 FB 78 */ mr r4, r31 /* 802997D0 00296710 38 A0 00 00 */ li r5, 0 -/* 802997D4 00296714 48 03 54 C5 */ bl __nw_X2_ +/* 802997D4 00296714 48 03 54 C5 */ bl __nw__FUlP7JKRHeapi /* 802997D8 00296718 7C 77 1B 79 */ or. r23, r3, r3 /* 802997DC 0029671C 41 82 00 0C */ beq lbl_802997E8 /* 802997E0 00296720 4B FF E8 35 */ bl JASBasicInst @@ -272,7 +272,7 @@ lbl_802998D8: /* 802998D8 00296818 38 60 00 0C */ li r3, 0xc /* 802998DC 0029681C 7F E4 FB 78 */ mr r4, r31 /* 802998E0 00296820 38 A0 00 00 */ li r5, 0 -/* 802998E4 00296824 48 03 53 B5 */ bl __nw_X2_ +/* 802998E4 00296824 48 03 53 B5 */ bl __nw__FUlP7JKRHeapi /* 802998E8 00296828 7C 75 1B 79 */ or. r21, r3, r3 /* 802998EC 0029682C 41 82 00 0C */ beq lbl_802998F8 /* 802998F0 00296830 4B FF E9 FD */ bl JASDrumSet @@ -294,7 +294,7 @@ lbl_80299918: /* 80299928 00296868 38 60 00 18 */ li r3, 0x18 /* 8029992C 0029686C 7F E4 FB 78 */ mr r4, r31 /* 80299930 00296870 38 A0 00 00 */ li r5, 0 -/* 80299934 00296874 48 03 53 65 */ bl __nw_X2_ +/* 80299934 00296874 48 03 53 65 */ bl __nw__FUlP7JKRHeapi /* 80299938 00296878 7C 74 1B 79 */ or. r20, r3, r3 /* 8029993C 0029687C 41 82 00 0C */ beq lbl_80299948 /* 80299940 00296880 4B FF EB 85 */ bl JASDrumSet_NS_TPerc @@ -386,7 +386,7 @@ lbl_80299A5C: /* 80299A60 002969A0 38 60 00 10 */ li r3, 0x10 /* 80299A64 002969A4 7F C4 F3 78 */ mr r4, r30 /* 80299A68 002969A8 38 A0 00 00 */ li r5, 0 -/* 80299A6C 002969AC 48 03 52 2D */ bl __nw_X2_ +/* 80299A6C 002969AC 48 03 52 2D */ bl __nw__FUlP7JKRHeapi /* 80299A70 002969B0 7C 7D 1B 79 */ or. r29, r3, r3 /* 80299A74 002969B4 41 82 00 0C */ beq lbl_80299A80 /* 80299A78 002969B8 4B FF E3 01 */ bl JASBasicBank @@ -413,7 +413,7 @@ lbl_80299AA8: /* 80299AC0 00296A00 38 60 00 1C */ li r3, 0x1c /* 80299AC4 00296A04 7F C4 F3 78 */ mr r4, r30 /* 80299AC8 00296A08 38 A0 00 00 */ li r5, 0 -/* 80299ACC 00296A0C 48 03 51 CD */ bl __nw_X2_ +/* 80299ACC 00296A0C 48 03 51 CD */ bl __nw__FUlP7JKRHeapi /* 80299AD0 00296A10 7C 77 1B 79 */ or. r23, r3, r3 /* 80299AD4 00296A14 41 82 00 0C */ beq lbl_80299AE0 /* 80299AD8 00296A18 4B FF E5 3D */ bl JASBasicInst @@ -447,7 +447,7 @@ lbl_80299B3C: /* 80299B3C 00296A7C 38 60 00 18 */ li r3, 0x18 /* 80299B40 00296A80 7F C4 F3 78 */ mr r4, r30 /* 80299B44 00296A84 38 A0 00 00 */ li r5, 0 -/* 80299B48 00296A88 48 03 51 51 */ bl __nw_X2_ +/* 80299B48 00296A88 48 03 51 51 */ bl __nw__FUlP7JKRHeapi /* 80299B4C 00296A8C 7C 74 1B 78 */ mr r20, r3 /* 80299B50 00296A90 88 16 00 00 */ lbz r0, 0(r22) /* 80299B54 00296A94 90 03 00 00 */ stw r0, 0(r3) @@ -466,7 +466,7 @@ lbl_80299B3C: /* 80299B88 00296AC8 7E 43 93 78 */ mr r3, r18 /* 80299B8C 00296ACC 7F C4 F3 78 */ mr r4, r30 /* 80299B90 00296AD0 38 A0 00 00 */ li r5, 0 -/* 80299B94 00296AD4 48 03 51 7D */ bl __nwa_X2_ +/* 80299B94 00296AD4 48 03 51 7D */ bl __nwa__FUlP7JKRHeapi /* 80299B98 00296AD8 7C 71 1B 78 */ mr r17, r3 /* 80299B9C 00296ADC 7E 63 9B 78 */ mr r3, r19 /* 80299BA0 00296AE0 7E 24 8B 78 */ mr r4, r17 @@ -491,7 +491,7 @@ lbl_80299BBC: /* 80299BE4 00296B24 7E 43 93 78 */ mr r3, r18 /* 80299BE8 00296B28 7F C4 F3 78 */ mr r4, r30 /* 80299BEC 00296B2C 38 A0 00 00 */ li r5, 0 -/* 80299BF0 00296B30 48 03 51 21 */ bl __nwa_X2_ +/* 80299BF0 00296B30 48 03 51 21 */ bl __nwa__FUlP7JKRHeapi /* 80299BF4 00296B34 7C 71 1B 78 */ mr r17, r3 /* 80299BF8 00296B38 7E 63 9B 78 */ mr r3, r19 /* 80299BFC 00296B3C 7E 24 8B 78 */ mr r4, r17 @@ -573,7 +573,7 @@ lbl_80299CF4: /* 80299D0C 00296C4C 38 60 00 0C */ li r3, 0xc /* 80299D10 00296C50 7F C4 F3 78 */ mr r4, r30 /* 80299D14 00296C54 38 A0 00 00 */ li r5, 0 -/* 80299D18 00296C58 48 03 4F 81 */ bl __nw_X2_ +/* 80299D18 00296C58 48 03 4F 81 */ bl __nw__FUlP7JKRHeapi /* 80299D1C 00296C5C 7C 77 1B 79 */ or. r23, r3, r3 /* 80299D20 00296C60 41 82 00 0C */ beq lbl_80299D2C /* 80299D24 00296C64 4B FF E5 C9 */ bl JASDrumSet @@ -596,7 +596,7 @@ lbl_80299D48: /* 80299D60 00296CA0 38 60 00 18 */ li r3, 0x18 /* 80299D64 00296CA4 7F C4 F3 78 */ mr r4, r30 /* 80299D68 00296CA8 38 A0 00 00 */ li r5, 0 -/* 80299D6C 00296CAC 48 03 4F 2D */ bl __nw_X2_ +/* 80299D6C 00296CAC 48 03 4F 2D */ bl __nw__FUlP7JKRHeapi /* 80299D70 00296CB0 7C 78 1B 79 */ or. r24, r3, r3 /* 80299D74 00296CB4 41 82 00 0C */ beq lbl_80299D80 /* 80299D78 00296CB8 4B FF E7 4D */ bl JASDrumSet_NS_TPerc diff --git a/asm/JAudio2/JASBasicBank.s b/asm/JAudio2/JASBasicBank.s index 8e9930974c..fbc2baec2e 100644 --- a/asm/JAudio2/JASBasicBank.s +++ b/asm/JAudio2/JASBasicBank.s @@ -31,7 +31,7 @@ JASBasicBank_NS_newInstTable: /* 80297DC8 00294D08 54 03 10 3A */ slwi r3, r0, 2 /* 80297DCC 00294D0C 7C A4 2B 78 */ mr r4, r5 /* 80297DD0 00294D10 38 A0 00 00 */ li r5, 0 -/* 80297DD4 00294D14 48 03 6F 3D */ bl __nwa_X2_ +/* 80297DD4 00294D14 48 03 6F 3D */ bl __nwa__FUlP7JKRHeapi /* 80297DD8 00294D18 90 7F 00 08 */ stw r3, 8(r31) /* 80297DDC 00294D1C 80 7F 00 08 */ lwz r3, 8(r31) /* 80297DE0 00294D20 88 1F 00 0C */ lbz r0, 0xc(r31) @@ -114,7 +114,7 @@ lbl_80297EB8: /* 80297EE4 00294E24 90 1F 00 00 */ stw r0, 0(r31) /* 80297EE8 00294E28 7C 80 07 35 */ extsh. r0, r4 /* 80297EEC 00294E2C 40 81 00 08 */ ble lbl_80297EF4 -/* 80297EF0 00294E30 48 03 6E 4D */ bl __dl +/* 80297EF0 00294E30 48 03 6E 4D */ bl __dl__FPv lbl_80297EF4: /* 80297EF4 00294E34 7F E3 FB 78 */ mr r3, r31 /* 80297EF8 00294E38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -139,7 +139,7 @@ lbl_80297F40: /* 80297F40 00294E80 7C 80 07 35 */ extsh. r0, r4 /* 80297F44 00294E84 40 81 00 0C */ ble lbl_80297F50 /* 80297F48 00294E88 7F E3 FB 78 */ mr r3, r31 -/* 80297F4C 00294E8C 48 03 6D F1 */ bl __dl +/* 80297F4C 00294E8C 48 03 6D F1 */ bl __dl__FPv lbl_80297F50: /* 80297F50 00294E90 7F E3 FB 78 */ mr r3, r31 /* 80297F54 00294E94 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASBasicInst.s b/asm/JAudio2/JASBasicInst.s index 0d53652866..56510c31af 100644 --- a/asm/JAudio2/JASBasicInst.s +++ b/asm/JAudio2/JASBasicInst.s @@ -57,7 +57,7 @@ lbl_802980CC: /* 802980CC 0029500C 7F E0 07 35 */ extsh. r0, r31 /* 802980D0 00295010 40 81 00 0C */ ble lbl_802980DC /* 802980D4 00295014 7F C3 F3 78 */ mr r3, r30 -/* 802980D8 00295018 48 03 6C 65 */ bl __dl +/* 802980D8 00295018 48 03 6C 65 */ bl __dl__FPv lbl_802980DC: /* 802980DC 0029501C 7F C3 F3 78 */ mr r3, r30 /* 802980E0 00295020 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -132,7 +132,7 @@ JASBasicInst_NS_setKeyRegionCount: /* 802981D0 00295110 38 63 00 10 */ addi r3, r3, 0x10 /* 802981D4 00295114 7F E4 FB 78 */ mr r4, r31 /* 802981D8 00295118 38 A0 00 00 */ li r5, 0 -/* 802981DC 0029511C 48 03 6B 35 */ bl __nwa_X2_ +/* 802981DC 0029511C 48 03 6B 35 */ bl __nwa__FUlP7JKRHeapi .global JASBasicInst_NS_TKeymap /* 802981E0 00295120 3C 80 80 2A */ lis r4, JASBasicInst_NS_TKeymap@ha .global JASBasicInst_NS_TKeymap @@ -182,7 +182,7 @@ JASBasicInst_NS_TKeymap_NS_dtor: /* 80298264 002951A4 41 82 00 10 */ beq lbl_80298274 /* 80298268 002951A8 7C 80 07 35 */ extsh. r0, r4 /* 8029826C 002951AC 40 81 00 08 */ ble lbl_80298274 -/* 80298270 002951B0 48 03 6A CD */ bl __dl +/* 80298270 002951B0 48 03 6A CD */ bl __dl__FPv lbl_80298274: /* 80298274 002951B4 7F E3 FB 78 */ mr r3, r31 /* 80298278 002951B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -201,7 +201,7 @@ lbl_80298274: /* 802982AC 002951EC 90 1F 00 00 */ stw r0, 0(r31) /* 802982B0 002951F0 7C 80 07 35 */ extsh. r0, r4 /* 802982B4 002951F4 40 81 00 08 */ ble lbl_802982BC -/* 802982B8 002951F8 48 03 6A 85 */ bl __dl +/* 802982B8 002951F8 48 03 6A 85 */ bl __dl__FPv lbl_802982BC: /* 802982BC 002951FC 7F E3 FB 78 */ mr r3, r31 /* 802982C0 00295200 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASBasicWaveBank.s b/asm/JAudio2/JASBasicWaveBank.s index 890f409d18..65b9ede0ef 100644 --- a/asm/JAudio2/JASBasicWaveBank.s +++ b/asm/JAudio2/JASBasicWaveBank.s @@ -61,7 +61,7 @@ lbl_802985B8: /* 802985B8 002954F8 7F E0 07 35 */ extsh. r0, r31 /* 802985BC 002954FC 40 81 00 0C */ ble lbl_802985C8 /* 802985C0 00295500 7F C3 F3 78 */ mr r3, r30 -/* 802985C4 00295504 48 03 67 79 */ bl __dl +/* 802985C4 00295504 48 03 67 79 */ bl __dl__FPv lbl_802985C8: /* 802985C8 00295508 7F C3 F3 78 */ mr r3, r30 /* 802985CC 0029550C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -89,7 +89,7 @@ lbl_80298618: /* 80298618 00295558 7C 80 07 35 */ extsh. r0, r4 /* 8029861C 0029555C 40 81 00 0C */ ble lbl_80298628 /* 80298620 00295560 7F E3 FB 78 */ mr r3, r31 -/* 80298624 00295564 48 03 67 19 */ bl __dl +/* 80298624 00295564 48 03 67 19 */ bl __dl__FPv lbl_80298628: /* 80298628 00295568 7F E3 FB 78 */ mr r3, r31 /* 8029862C 0029556C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -132,7 +132,7 @@ JASBasicWaveBank_NS_setGroupCount: /* 8029869C 002955DC 38 63 00 10 */ addi r3, r3, 0x10 /* 802986A0 002955E0 7F E4 FB 78 */ mr r4, r31 /* 802986A4 002955E4 38 A0 00 00 */ li r5, 0 -/* 802986A8 002955E8 48 03 66 69 */ bl __nwa_X2_ +/* 802986A8 002955E8 48 03 66 69 */ bl __nwa__FUlP7JKRHeapi .global JASBasicWaveBank_NS_TWaveGroup /* 802986AC 002955EC 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveGroup@ha .global JASBasicWaveBank_NS_TWaveGroup @@ -185,7 +185,7 @@ JASBasicWaveBank_NS_setWaveTableSize: /* 80298744 00295684 38 63 00 10 */ addi r3, r3, 0x10 /* 80298748 00295688 7F E4 FB 78 */ mr r4, r31 /* 8029874C 0029568C 38 A0 00 00 */ li r5, 0 -/* 80298750 00295690 48 03 65 C1 */ bl __nwa_X2_ +/* 80298750 00295690 48 03 65 C1 */ bl __nwa__FUlP7JKRHeapi .global JASBasicWaveBank_NS_TWaveHandle /* 80298754 00295694 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveHandle@ha .global JASBasicWaveBank_NS_TWaveHandle @@ -399,7 +399,7 @@ JASBasicWaveBank_NS_TWaveGroup_NS_dtor: /* 80298A3C 0029597C 28 03 00 00 */ cmplwi r3, 0 /* 80298A40 00295980 41 82 00 0C */ beq lbl_80298A4C /* 80298A44 00295984 38 63 FF F0 */ addi r3, r3, -16 -/* 80298A48 00295988 48 03 63 19 */ bl __dla +/* 80298A48 00295988 48 03 63 19 */ bl __dla__FPv lbl_80298A4C: /* 80298A4C 0029598C 7F C3 F3 78 */ mr r3, r30 /* 80298A50 00295990 38 80 00 00 */ li r4, 0 @@ -407,7 +407,7 @@ lbl_80298A4C: /* 80298A58 00295998 7F E0 07 35 */ extsh. r0, r31 /* 80298A5C 0029599C 40 81 00 0C */ ble lbl_80298A68 /* 80298A60 002959A0 7F C3 F3 78 */ mr r3, r30 -/* 80298A64 002959A4 48 03 62 D9 */ bl __dl +/* 80298A64 002959A4 48 03 62 D9 */ bl __dl__FPv lbl_80298A68: /* 80298A68 002959A8 7F C3 F3 78 */ mr r3, r30 /* 80298A6C 002959AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -431,14 +431,14 @@ JASBasicWaveBank_NS_TWaveGroup_NS_setWaveCount: /* 80298AA8 002959E8 28 03 00 00 */ cmplwi r3, 0 /* 80298AAC 002959EC 41 82 00 0C */ beq lbl_80298AB8 /* 80298AB0 002959F0 38 63 FF F0 */ addi r3, r3, -16 -/* 80298AB4 002959F4 48 03 62 AD */ bl __dla +/* 80298AB4 002959F4 48 03 62 AD */ bl __dla__FPv lbl_80298AB8: /* 80298AB8 002959F8 B3 DD 00 7C */ sth r30, 0x7c(r29) /* 80298ABC 002959FC 57 C3 18 38 */ slwi r3, r30, 3 /* 80298AC0 00295A00 38 63 00 10 */ addi r3, r3, 0x10 /* 80298AC4 00295A04 7F E4 FB 78 */ mr r4, r31 /* 80298AC8 00295A08 38 A0 00 00 */ li r5, 0 -/* 80298ACC 00295A0C 48 03 62 45 */ bl __nwa_X2_ +/* 80298ACC 00295A0C 48 03 62 45 */ bl __nwa__FUlP7JKRHeapi .global JASBasicWaveBank_NS_TGroupWaveInfo /* 80298AD0 00295A10 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TGroupWaveInfo@ha .global JASBasicWaveBank_NS_TGroupWaveInfo @@ -502,7 +502,7 @@ lbl_80298B7C: /* 80298BA8 00295AE8 90 1F 00 00 */ stw r0, 0(r31) /* 80298BAC 00295AEC 7C 80 07 35 */ extsh. r0, r4 /* 80298BB0 00295AF0 40 81 00 08 */ ble lbl_80298BB8 -/* 80298BB4 00295AF4 48 03 61 89 */ bl __dl +/* 80298BB4 00295AF4 48 03 61 89 */ bl __dl__FPv lbl_80298BB8: /* 80298BB8 00295AF8 7F E3 FB 78 */ mr r3, r31 /* 80298BBC 00295AFC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -521,7 +521,7 @@ lbl_80298BB8: /* 80298BF0 00295B30 90 1F 00 00 */ stw r0, 0(r31) /* 80298BF4 00295B34 7C 80 07 35 */ extsh. r0, r4 /* 80298BF8 00295B38 40 81 00 08 */ ble lbl_80298C00 -/* 80298BFC 00295B3C 48 03 61 41 */ bl __dl +/* 80298BFC 00295B3C 48 03 61 41 */ bl __dl__FPv lbl_80298C00: /* 80298C00 00295B40 7F E3 FB 78 */ mr r3, r31 /* 80298C04 00295B44 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASCmdStack.s b/asm/JAudio2/JASCmdStack.s index 49eae92fb4..d137e1539c 100644 --- a/asm/JAudio2/JASCmdStack.s +++ b/asm/JAudio2/JASCmdStack.s @@ -40,7 +40,7 @@ lbl_802910BC: /* 802910D0 0028E010 4E 80 04 21 */ bctrl /* 802910D4 0028E014 7F A3 EB 78 */ mr r3, r29 /* 802910D8 0028E018 7F C4 F3 78 */ mr r4, r30 -/* 802910DC 0028E01C 48 04 B0 81 */ bl JSUPtrList_NS_remove +/* 802910DC 0028E01C 48 04 B0 81 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802910E0 0028E020 7F FE FB 78 */ mr r30, r31 lbl_802910E4: /* 802910E4 0028E024 28 1E 00 00 */ cmplwi r30, 0 @@ -89,7 +89,7 @@ lbl_80291148: /* 8029117C 0028E0BC 3C 60 80 43 */ lis r3, lbl_80431678@ha /* 80291180 0028E0C0 3B E3 16 78 */ addi r31, r3, lbl_80431678@l /* 80291184 0028E0C4 38 7F 00 0C */ addi r3, r31, 0xc -/* 80291188 0028E0C8 48 04 AD 8D */ bl JSUPtrList_NS_initiate +/* 80291188 0028E0C8 48 04 AD 8D */ bl initiate__10JSUPtrListFv /* 8029118C 0028E0CC 38 7F 00 0C */ addi r3, r31, 0xc .global JASPortCmd_NS_TPortHead_NS_dtor /* 80291190 0028E0D0 3C 80 80 29 */ lis r4, JASPortCmd_NS_TPortHead_NS_dtor@ha @@ -98,7 +98,7 @@ lbl_80291148: /* 80291198 0028E0D8 38 BF 00 00 */ addi r5, r31, 0 /* 8029119C 0028E0DC 48 0D 0A 89 */ bl func_80361C24 /* 802911A0 0028E0E0 38 7F 00 24 */ addi r3, r31, 0x24 -/* 802911A4 0028E0E4 48 04 AD 71 */ bl JSUPtrList_NS_initiate +/* 802911A4 0028E0E4 48 04 AD 71 */ bl initiate__10JSUPtrListFv /* 802911A8 0028E0E8 38 7F 00 24 */ addi r3, r31, 0x24 .global JASPortCmd_NS_TPortHead_NS_dtor /* 802911AC 0028E0EC 3C 80 80 29 */ lis r4, JASPortCmd_NS_TPortHead_NS_dtor@ha @@ -123,12 +123,12 @@ JASPortCmd_NS_TPortHead_NS_dtor: /* 802911EC 0028E12C 41 82 00 20 */ beq lbl_8029120C /* 802911F0 0028E130 41 82 00 0C */ beq lbl_802911FC /* 802911F4 0028E134 38 80 00 00 */ li r4, 0 -/* 802911F8 0028E138 48 04 AC B5 */ bl JSUPtrList_NS_dtor +/* 802911F8 0028E138 48 04 AC B5 */ bl __dt__10JSUPtrListFv lbl_802911FC: /* 802911FC 0028E13C 7F E0 07 35 */ extsh. r0, r31 /* 80291200 0028E140 40 81 00 0C */ ble lbl_8029120C /* 80291204 0028E144 7F C3 F3 78 */ mr r3, r30 -/* 80291208 0028E148 48 03 DB 35 */ bl __dl +/* 80291208 0028E148 48 03 DB 35 */ bl __dl__FPv lbl_8029120C: /* 8029120C 0028E14C 7F C3 F3 78 */ mr r3, r30 /* 80291210 0028E150 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASDSPChannel.s b/asm/JAudio2/JASDSPChannel.s index b52c0a6ea0..8f0391e83c 100644 --- a/asm/JAudio2/JASDSPChannel.s +++ b/asm/JAudio2/JASDSPChannel.s @@ -80,7 +80,7 @@ JASDSPChannel_NS_initAll: /* 8029D3DC 0029A31C 38 60 07 10 */ li r3, 0x710 /* 8029D3E0 0029A320 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029D3E4 0029A324 38 A0 00 20 */ li r5, 0x20 -/* 8029D3E8 0029A328 48 03 19 29 */ bl __nwa_X2_ +/* 8029D3E8 0029A328 48 03 19 29 */ bl __nwa__FUlP7JKRHeapi .global JASDSPChannel /* 8029D3EC 0029A32C 3C 80 80 2A */ lis r4, JASDSPChannel@ha .global JASDSPChannel diff --git a/asm/JAudio2/JASDSPInterface.s b/asm/JAudio2/JASDSPInterface.s index 551b66d7ad..210fba1dc9 100644 --- a/asm/JAudio2/JASDSPInterface.s +++ b/asm/JAudio2/JASDSPInterface.s @@ -137,12 +137,12 @@ JASDsp_NS_initBuffer: /* 8029DAD8 0029AA18 38 60 60 00 */ li r3, 0x6000 /* 8029DADC 0029AA1C 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029DAE0 0029AA20 38 A0 00 20 */ li r5, 0x20 -/* 8029DAE4 0029AA24 48 03 12 2D */ bl __nwa_X2_ +/* 8029DAE4 0029AA24 48 03 12 2D */ bl __nwa__FUlP7JKRHeapi /* 8029DAE8 0029AA28 90 6D 8D 68 */ stw r3, lbl_804512E8-_SDA_BASE_(r13) /* 8029DAEC 0029AA2C 38 60 00 80 */ li r3, 0x80 /* 8029DAF0 0029AA30 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029DAF4 0029AA34 38 A0 00 20 */ li r5, 0x20 -/* 8029DAF8 0029AA38 48 03 12 19 */ bl __nwa_X2_ +/* 8029DAF8 0029AA38 48 03 12 19 */ bl __nwa__FUlP7JKRHeapi /* 8029DAFC 0029AA3C 90 6D 8D 6C */ stw r3, lbl_804512EC-_SDA_BASE_(r13) /* 8029DB00 0029AA40 80 6D 8D 68 */ lwz r3, lbl_804512E8-_SDA_BASE_(r13) /* 8029DB04 0029AA44 38 80 60 00 */ li r4, 0x6000 diff --git a/asm/JAudio2/JASDrumSet.s b/asm/JAudio2/JASDrumSet.s index 3e42890259..96373b7bab 100644 --- a/asm/JAudio2/JASDrumSet.s +++ b/asm/JAudio2/JASDrumSet.s @@ -32,7 +32,7 @@ lbl_80298348: /* 80298348 00295288 7C 80 07 35 */ extsh. r0, r4 /* 8029834C 0029528C 40 81 00 0C */ ble lbl_80298358 /* 80298350 00295290 7F E3 FB 78 */ mr r3, r31 -/* 80298354 00295294 48 03 69 E9 */ bl __dl +/* 80298354 00295294 48 03 69 E9 */ bl __dl__FPv lbl_80298358: /* 80298358 00295298 7F E3 FB 78 */ mr r3, r31 /* 8029835C 0029529C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -55,7 +55,7 @@ JASDrumSet_NS_newPercArray: /* 80298394 002952D4 54 03 10 3A */ slwi r3, r0, 2 /* 80298398 002952D8 7C A4 2B 78 */ mr r4, r5 /* 8029839C 002952DC 38 A0 00 00 */ li r5, 0 -/* 802983A0 002952E0 48 03 69 71 */ bl __nwa_X2_ +/* 802983A0 002952E0 48 03 69 71 */ bl __nwa__FUlP7JKRHeapi /* 802983A4 002952E4 90 7F 00 04 */ stw r3, 4(r31) /* 802983A8 002952E8 80 7F 00 04 */ lwz r3, 4(r31) /* 802983AC 002952EC 88 1F 00 08 */ lbz r0, 8(r31) diff --git a/asm/JAudio2/JASDvdThread.s b/asm/JAudio2/JASDvdThread.s index 2b1b97055f..7ca72d8395 100644 --- a/asm/JAudio2/JASDvdThread.s +++ b/asm/JAudio2/JASDvdThread.s @@ -27,7 +27,7 @@ lbl_8028FF38: /* 8028FF38 0028CE78 38 60 00 88 */ li r3, 0x88 /* 8028FF3C 0028CE7C 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8028FF40 0028CE80 38 A0 00 00 */ li r5, 0 -/* 8028FF44 0028CE84 48 03 ED 55 */ bl __nw_X2_ +/* 8028FF44 0028CE84 48 03 ED 55 */ bl __nw__FUlP7JKRHeapi /* 8028FF48 0028CE88 7C 64 1B 79 */ or. r4, r3, r3 /* 8028FF4C 0028CE8C 41 82 00 18 */ beq lbl_8028FF64 /* 8028FF50 0028CE90 7F A4 EB 78 */ mr r4, r29 diff --git a/asm/JAudio2/JASHeapCtrl.s b/asm/JAudio2/JASHeapCtrl.s index 9d28c0406b..4671df4809 100644 --- a/asm/JAudio2/JASHeapCtrl.s +++ b/asm/JAudio2/JASHeapCtrl.s @@ -14,10 +14,10 @@ JASHeap: /* 80290158 0028D098 7C 9F 23 78 */ mr r31, r4 /* 8029015C 0028D09C 7F A0 EB 78 */ mr r0, r29 /* 80290160 0028D0A0 7C 1E 03 78 */ mr r30, r0 -/* 80290164 0028D0A4 48 04 BD B1 */ bl JSUPtrList_NS_initiate +/* 80290164 0028D0A4 48 04 BD B1 */ bl initiate__10JSUPtrListFv /* 80290168 0028D0A8 38 7E 00 0C */ addi r3, r30, 0xc /* 8029016C 0028D0AC 7F A4 EB 78 */ mr r4, r29 -/* 80290170 0028D0B0 48 04 BC 8D */ bl JSUPtrLink +/* 80290170 0028D0B0 48 04 BC 8D */ bl __ct__10JSUPtrLinkFPv /* 80290174 0028D0B4 93 FD 00 34 */ stw r31, 0x34(r29) /* 80290178 0028D0B8 38 00 00 00 */ li r0, 0 /* 8029017C 0028D0BC 90 1D 00 38 */ stw r0, 0x38(r29) @@ -325,7 +325,7 @@ lbl_802905A4: /* 802905AC 0028D4EC 41 82 00 08 */ beq lbl_802905B4 /* 802905B0 0028D4F0 38 9E 00 0C */ addi r4, r30, 0xc lbl_802905B4: -/* 802905B4 0028D4F4 48 04 BB A9 */ bl JSUPtrList_NS_remove +/* 802905B4 0028D4F4 48 04 BB A9 */ bl remove__10JSUPtrListFP10JSUPtrLink lbl_802905B8: /* 802905B8 0028D4F8 38 00 00 00 */ li r0, 0 /* 802905BC 0028D4FC 90 1E 00 38 */ stw r0, 0x38(r30) @@ -408,7 +408,7 @@ lbl_802906B8: /* 802906C4 0028D604 38 9B 00 0C */ addi r4, r27, 0xc lbl_802906C8: /* 802906C8 0028D608 7F E3 FB 78 */ mr r3, r31 -/* 802906CC 0028D60C 48 04 B9 C9 */ bl JSUPtrList_NS_insert +/* 802906CC 0028D60C 48 04 B9 C9 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink /* 802906D0 0028D610 80 61 00 08 */ lwz r3, 8(r1) /* 802906D4 0028D614 48 0A EA 49 */ bl OSUnlockMutex /* 802906D8 0028D618 39 61 00 30 */ addi r11, r1, 0x30 @@ -544,7 +544,7 @@ JASGenericMemPool_NS_dtor: /* 80290884 0028D7C4 48 00 00 10 */ b lbl_80290894 lbl_80290888: /* 80290888 0028D7C8 83 E3 00 00 */ lwz r31, 0(r3) -/* 8029088C 0028D7CC 48 03 E4 D5 */ bl __dla +/* 8029088C 0028D7CC 48 03 E4 D5 */ bl __dla__FPv /* 80290890 0028D7D0 7F E3 FB 78 */ mr r3, r31 lbl_80290894: /* 80290894 0028D7D4 28 03 00 00 */ cmplwi r3, 0 @@ -552,7 +552,7 @@ lbl_80290894: /* 8029089C 0028D7DC 7F C0 07 35 */ extsh. r0, r30 /* 802908A0 0028D7E0 40 81 00 0C */ ble lbl_802908AC /* 802908A4 0028D7E4 7F A3 EB 78 */ mr r3, r29 -/* 802908A8 0028D7E8 48 03 E4 95 */ bl __dl +/* 802908A8 0028D7E8 48 03 E4 95 */ bl __dl__FPv lbl_802908AC: /* 802908AC 0028D7EC 7F A3 EB 78 */ mr r3, r29 /* 802908B0 0028D7F0 39 61 00 20 */ addi r11, r1, 0x20 @@ -578,7 +578,7 @@ lbl_802908F0: /* 802908F0 0028D830 7F E3 FB 78 */ mr r3, r31 /* 802908F4 0028D834 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 802908F8 0028D838 38 A0 00 00 */ li r5, 0 -/* 802908FC 0028D83C 48 03 E4 15 */ bl __nwa_X2_ +/* 802908FC 0028D83C 48 03 E4 15 */ bl __nwa__FUlP7JKRHeapi /* 80290900 0028D840 80 1C 00 00 */ lwz r0, 0(r28) /* 80290904 0028D844 90 03 00 00 */ stw r0, 0(r3) /* 80290908 0028D848 90 7C 00 00 */ stw r3, 0(r28) @@ -651,7 +651,7 @@ JASKernel_NS_setupRootHeap: /* 802909E4 0028D924 38 60 00 1C */ li r3, 0x1c /* 802909E8 0028D928 7F A4 EB 78 */ mr r4, r29 /* 802909EC 0028D92C 38 A0 00 00 */ li r5, 0 -/* 802909F0 0028D930 48 03 E2 A9 */ bl __nw_X2_ +/* 802909F0 0028D930 48 03 E2 A9 */ bl __nw__FUlP7JKRHeapi /* 802909F4 0028D934 7C 7F 1B 79 */ or. r31, r3, r3 /* 802909F8 0028D938 41 82 00 A8 */ beq lbl_80290AA0 /* 802909FC 0028D93C 48 0A E6 0D */ bl OSInitMutex @@ -670,7 +670,7 @@ lbl_80290A28: /* 80290A2C 0028D96C 7C 64 1B 78 */ mr r4, r3 /* 80290A30 0028D970 38 60 04 0C */ li r3, 0x40c /* 80290A34 0028D974 38 A0 00 00 */ li r5, 0 -/* 80290A38 0028D978 48 03 E2 61 */ bl __nw_X2_ +/* 80290A38 0028D978 48 03 E2 61 */ bl __nw__FUlP7JKRHeapi /* 80290A3C 0028D97C 28 03 00 00 */ cmplwi r3, 0 /* 80290A40 0028D980 41 82 00 14 */ beq lbl_80290A54 /* 80290A44 0028D984 93 C3 00 00 */ stw r30, 0(r3) @@ -685,7 +685,7 @@ lbl_80290A54: /* 80290A64 0028D9A4 38 60 04 0C */ li r3, 0x40c /* 80290A68 0028D9A8 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 80290A6C 0028D9AC 38 A0 00 00 */ li r5, 0 -/* 80290A70 0028D9B0 48 03 E2 29 */ bl __nw_X2_ +/* 80290A70 0028D9B0 48 03 E2 29 */ bl __nw__FUlP7JKRHeapi /* 80290A74 0028D9B4 28 03 00 00 */ cmplwi r3, 0 /* 80290A78 0028D9B8 41 82 00 14 */ beq lbl_80290A8C /* 80290A7C 0028D9BC 93 C3 00 00 */ stw r30, 0(r3) @@ -773,18 +773,18 @@ JASHeap_NS_dtor: /* 80290B7C 0028DABC 41 82 00 10 */ beq lbl_80290B8C /* 80290B80 0028DAC0 38 7E 00 0C */ addi r3, r30, 0xc /* 80290B84 0028DAC4 38 80 00 00 */ li r4, 0 -/* 80290B88 0028DAC8 48 04 B2 8D */ bl JSUPtrLink_NS_dtor +/* 80290B88 0028DAC8 48 04 B2 8D */ bl __dt__10JSUPtrLinkFv lbl_80290B8C: /* 80290B8C 0028DACC 28 1E 00 00 */ cmplwi r30, 0 /* 80290B90 0028DAD0 41 82 00 10 */ beq lbl_80290BA0 /* 80290B94 0028DAD4 7F C3 F3 78 */ mr r3, r30 /* 80290B98 0028DAD8 38 80 00 00 */ li r4, 0 -/* 80290B9C 0028DADC 48 04 B3 11 */ bl JSUPtrList_NS_dtor +/* 80290B9C 0028DADC 48 04 B3 11 */ bl __dt__10JSUPtrListFv lbl_80290BA0: /* 80290BA0 0028DAE0 7F E0 07 35 */ extsh. r0, r31 /* 80290BA4 0028DAE4 40 81 00 0C */ ble lbl_80290BB0 /* 80290BA8 0028DAE8 7F C3 F3 78 */ mr r3, r30 -/* 80290BAC 0028DAEC 48 03 E1 91 */ bl __dl +/* 80290BAC 0028DAEC 48 03 E1 91 */ bl __dl__FPv lbl_80290BB0: /* 80290BB0 0028DAF0 7F C3 F3 78 */ mr r3, r30 /* 80290BB4 0028DAF4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASSeqCtrl.s b/asm/JAudio2/JASSeqCtrl.s index 10fc108f3b..539816c177 100644 --- a/asm/JAudio2/JASSeqCtrl.s +++ b/asm/JAudio2/JASSeqCtrl.s @@ -318,7 +318,7 @@ JASSeqParser_NS_dtor: /* 80293CCC 00290C0C 90 1F 00 00 */ stw r0, 0(r31) /* 80293CD0 00290C10 7C 80 07 35 */ extsh. r0, r4 /* 80293CD4 00290C14 40 81 00 08 */ ble lbl_80293CDC -/* 80293CD8 00290C18 48 03 B0 65 */ bl __dl +/* 80293CD8 00290C18 48 03 B0 65 */ bl __dl__FPv lbl_80293CDC: /* 80293CDC 00290C1C 7F E3 FB 78 */ mr r3, r31 /* 80293CE0 00290C20 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASSimpleWaveBank.s b/asm/JAudio2/JASSimpleWaveBank.s index 0edcfb227b..1b9a43ef1d 100644 --- a/asm/JAudio2/JASSimpleWaveBank.s +++ b/asm/JAudio2/JASSimpleWaveBank.s @@ -62,7 +62,7 @@ lbl_80298D58: /* 80298D58 00295C98 7F E0 07 35 */ extsh. r0, r31 /* 80298D5C 00295C9C 40 81 00 0C */ ble lbl_80298D68 /* 80298D60 00295CA0 7F C3 F3 78 */ mr r3, r30 -/* 80298D64 00295CA4 48 03 5F D9 */ bl __dl +/* 80298D64 00295CA4 48 03 5F D9 */ bl __dl__FPv lbl_80298D68: /* 80298D68 00295CA8 7F C3 F3 78 */ mr r3, r30 /* 80298D6C 00295CAC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -90,7 +90,7 @@ lbl_80298DB8: /* 80298DB8 00295CF8 7C 80 07 35 */ extsh. r0, r4 /* 80298DBC 00295CFC 40 81 00 0C */ ble lbl_80298DC8 /* 80298DC0 00295D00 7F E3 FB 78 */ mr r3, r31 -/* 80298DC4 00295D04 48 03 5F 79 */ bl __dl +/* 80298DC4 00295D04 48 03 5F 79 */ bl __dl__FPv lbl_80298DC8: /* 80298DC8 00295D08 7F E3 FB 78 */ mr r3, r31 /* 80298DCC 00295D0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -119,7 +119,7 @@ JASSimpleWaveBank_NS_setWaveTableSize: /* 80298E14 00295D54 38 63 00 10 */ addi r3, r3, 0x10 /* 80298E18 00295D58 7F E4 FB 78 */ mr r4, r31 /* 80298E1C 00295D5C 38 A0 00 00 */ li r5, 0 -/* 80298E20 00295D60 48 03 5E F1 */ bl __nwa_X2_ +/* 80298E20 00295D60 48 03 5E F1 */ bl __nwa__FUlP7JKRHeapi .global JASSimpleWaveBank_NS_TWaveHandle /* 80298E24 00295D64 3C 80 80 2A */ lis r4, JASSimpleWaveBank_NS_TWaveHandle@ha .global JASSimpleWaveBank_NS_TWaveHandle diff --git a/asm/JAudio2/JASTaskThread.s b/asm/JAudio2/JASTaskThread.s index 541decbe22..b943e2513f 100644 --- a/asm/JAudio2/JASTaskThread.s +++ b/asm/JAudio2/JASTaskThread.s @@ -82,7 +82,7 @@ lbl_8028F7B8: /* 8028F7DC 0028C71C 28 00 00 00 */ cmplwi r0, 0 /* 8028F7E0 0028C720 40 82 00 10 */ bne lbl_8028F7F0 /* 8028F7E4 0028C724 83 83 00 00 */ lwz r28, 0(r3) -/* 8028F7E8 0028C728 48 03 F5 55 */ bl __dl +/* 8028F7E8 0028C728 48 03 F5 55 */ bl __dl__FPv /* 8028F7EC 0028C72C 93 9B 00 00 */ stw r28, 0(r27) lbl_8028F7F0: /* 8028F7F0 0028C730 80 61 00 08 */ lwz r3, 8(r1) @@ -104,7 +104,7 @@ lbl_8028F818: /* 8028F824 0028C764 7F E0 07 35 */ extsh. r0, r31 /* 8028F828 0028C768 40 81 00 0C */ ble lbl_8028F834 /* 8028F82C 0028C76C 7F C3 F3 78 */ mr r3, r30 -/* 8028F830 0028C770 48 03 F5 0D */ bl __dl +/* 8028F830 0028C770 48 03 F5 0D */ bl __dl__FPv lbl_8028F834: /* 8028F834 0028C774 7F C3 F3 78 */ mr r3, r30 /* 8028F838 0028C778 39 61 00 30 */ addi r11, r1, 0x30 @@ -155,7 +155,7 @@ lbl_8028F8D4: /* 8028F8D8 0028C818 7C 64 1B 78 */ mr r4, r3 /* 8028F8DC 0028C81C 38 60 04 0C */ li r3, 0x40c /* 8028F8E0 0028C820 38 A0 00 00 */ li r5, 0 -/* 8028F8E4 0028C824 48 03 F3 B5 */ bl __nw_X2_ +/* 8028F8E4 0028C824 48 03 F3 B5 */ bl __nw__FUlP7JKRHeapi /* 8028F8E8 0028C828 28 03 00 00 */ cmplwi r3, 0 /* 8028F8EC 0028C82C 41 82 00 14 */ beq lbl_8028F900 /* 8028F8F0 0028C830 93 43 00 00 */ stw r26, 0(r3) @@ -173,7 +173,7 @@ lbl_8028F918: /* 8028F918 0028C858 38 60 04 0C */ li r3, 0x40c /* 8028F91C 0028C85C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 8028F920 0028C860 38 A0 00 00 */ li r5, 0 -/* 8028F924 0028C864 48 03 F3 75 */ bl __nw_X2_ +/* 8028F924 0028C864 48 03 F3 75 */ bl __nw__FUlP7JKRHeapi /* 8028F928 0028C868 28 03 00 00 */ cmplwi r3, 0 /* 8028F92C 0028C86C 41 82 00 14 */ beq lbl_8028F940 /* 8028F930 0028C870 93 43 00 00 */ stw r26, 0(r3) @@ -263,7 +263,7 @@ lbl_8028FA50: /* 8028FA54 0028C994 7C 64 1B 78 */ mr r4, r3 /* 8028FA58 0028C998 38 60 04 0C */ li r3, 0x40c /* 8028FA5C 0028C99C 38 A0 00 00 */ li r5, 0 -/* 8028FA60 0028C9A0 48 03 F2 39 */ bl __nw_X2_ +/* 8028FA60 0028C9A0 48 03 F2 39 */ bl __nw__FUlP7JKRHeapi /* 8028FA64 0028C9A4 28 03 00 00 */ cmplwi r3, 0 /* 8028FA68 0028C9A8 41 82 00 14 */ beq lbl_8028FA7C /* 8028FA6C 0028C9AC 93 83 00 00 */ stw r28, 0(r3) @@ -281,7 +281,7 @@ lbl_8028FA94: /* 8028FA94 0028C9D4 38 60 04 0C */ li r3, 0x40c /* 8028FA98 0028C9D8 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 8028FA9C 0028C9DC 38 A0 00 00 */ li r5, 0 -/* 8028FAA0 0028C9E0 48 03 F1 F9 */ bl __nw_X2_ +/* 8028FAA0 0028C9E0 48 03 F1 F9 */ bl __nw__FUlP7JKRHeapi /* 8028FAA4 0028C9E4 28 03 00 00 */ cmplwi r3, 0 /* 8028FAA8 0028C9E8 41 82 00 14 */ beq lbl_8028FABC /* 8028FAAC 0028C9EC 93 83 00 00 */ stw r28, 0(r3) @@ -385,7 +385,7 @@ lbl_8028FBDC: /* 8028FC00 0028CB40 28 00 00 00 */ cmplwi r0, 0 /* 8028FC04 0028CB44 40 82 00 10 */ bne lbl_8028FC14 /* 8028FC08 0028CB48 83 E3 00 00 */ lwz r31, 0(r3) -/* 8028FC0C 0028CB4C 48 03 F1 31 */ bl __dl +/* 8028FC0C 0028CB4C 48 03 F1 31 */ bl __dl__FPv /* 8028FC10 0028CB50 93 FE 00 00 */ stw r31, 0(r30) lbl_8028FC14: /* 8028FC14 0028CB54 80 61 00 08 */ lwz r3, 8(r1) @@ -458,7 +458,7 @@ lbl_8028FCD4: /* 8028FCF8 0028CC38 28 00 00 00 */ cmplwi r0, 0 /* 8028FCFC 0028CC3C 40 82 00 10 */ bne lbl_8028FD0C /* 8028FD00 0028CC40 83 E3 00 00 */ lwz r31, 0(r3) -/* 8028FD04 0028CC44 48 03 F0 39 */ bl __dl +/* 8028FD04 0028CC44 48 03 F0 39 */ bl __dl__FPv /* 8028FD08 0028CC48 93 FE 00 00 */ stw r31, 0(r30) lbl_8028FD0C: /* 8028FD0C 0028CC4C 80 61 00 08 */ lwz r3, 8(r1) @@ -554,7 +554,7 @@ lbl_8028FE28: /* 8028FE4C 0028CD8C 28 00 00 00 */ cmplwi r0, 0 /* 8028FE50 0028CD90 40 82 00 10 */ bne lbl_8028FE60 /* 8028FE54 0028CD94 83 83 00 00 */ lwz r28, 0(r3) -/* 8028FE58 0028CD98 48 03 EE E5 */ bl __dl +/* 8028FE58 0028CD98 48 03 EE E5 */ bl __dl__FPv /* 8028FE5C 0028CD9C 93 9D 00 00 */ stw r28, 0(r29) lbl_8028FE60: /* 8028FE60 0028CDA0 80 61 00 08 */ lwz r3, 8(r1) diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index b8b33692f5..39575ff875 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -2454,7 +2454,7 @@ JASMemPool_MultiThreaded_NS_dtor: /* 80293308 00290248 7F E0 07 35 */ extsh. r0, r31 /* 8029330C 0029024C 40 81 00 0C */ ble lbl_80293318 /* 80293310 00290250 7F C3 F3 78 */ mr r3, r30 -/* 80293314 00290254 48 03 BA 29 */ bl __dl +/* 80293314 00290254 48 03 BA 29 */ bl __dl__FPv lbl_80293318: /* 80293318 00290258 7F C3 F3 78 */ mr r3, r30 /* 8029331C 0029025C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2478,7 +2478,7 @@ JASMemPool_MultiThreaded_NS_dtor_X1_: /* 8029335C 0029029C 7F E0 07 35 */ extsh. r0, r31 /* 80293360 002902A0 40 81 00 0C */ ble lbl_8029336C /* 80293364 002902A4 7F C3 F3 78 */ mr r3, r30 -/* 80293368 002902A8 48 03 B9 D5 */ bl __dl +/* 80293368 002902A8 48 03 B9 D5 */ bl __dl__FPv lbl_8029336C: /* 8029336C 002902AC 7F C3 F3 78 */ mr r3, r30 /* 80293370 002902B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2562,7 +2562,7 @@ lbl_80293488: /* 80293488 002903C8 7F E0 07 35 */ extsh. r0, r31 /* 8029348C 002903CC 40 81 00 0C */ ble lbl_80293498 /* 80293490 002903D0 7F C3 F3 78 */ mr r3, r30 -/* 80293494 002903D4 48 03 B8 A9 */ bl __dl +/* 80293494 002903D4 48 03 B8 A9 */ bl __dl__FPv lbl_80293498: /* 80293498 002903D8 7F C3 F3 78 */ mr r3, r30 /* 8029349C 002903DC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2597,7 +2597,7 @@ lbl_80293500: /* 80293500 00290440 7C 80 07 35 */ extsh. r0, r4 /* 80293504 00290444 40 81 00 0C */ ble lbl_80293510 /* 80293508 00290448 7F E3 FB 78 */ mr r3, r31 -/* 8029350C 0029044C 48 03 B8 31 */ bl __dl +/* 8029350C 0029044C 48 03 B8 31 */ bl __dl__FPv lbl_80293510: /* 80293510 00290450 7F E3 FB 78 */ mr r3, r31 /* 80293514 00290454 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASVoiceBank.s b/asm/JAudio2/JASVoiceBank.s index 1a4f61e3e3..02a222649d 100644 --- a/asm/JAudio2/JASVoiceBank.s +++ b/asm/JAudio2/JASVoiceBank.s @@ -35,7 +35,7 @@ lbl_80297FE0: /* 80297FE0 00294F20 7C 80 07 35 */ extsh. r0, r4 /* 80297FE4 00294F24 40 81 00 0C */ ble lbl_80297FF0 /* 80297FE8 00294F28 7F E3 FB 78 */ mr r3, r31 -/* 80297FEC 00294F2C 48 03 6D 51 */ bl __dl +/* 80297FEC 00294F2C 48 03 6D 51 */ bl __dl__FPv lbl_80297FF0: /* 80297FF0 00294F30 7F E3 FB 78 */ mr r3, r31 /* 80297FF4 00294F34 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JASWSParser.s b/asm/JAudio2/JASWSParser.s index 4e146192c7..a1056d46b5 100644 --- a/asm/JAudio2/JASWSParser.s +++ b/asm/JAudio2/JASWSParser.s @@ -63,7 +63,7 @@ lbl_80299058: /* 80299068 00295FA8 38 60 00 28 */ li r3, 0x28 /* 8029906C 00295FAC 7E C4 B3 78 */ mr r4, r22 /* 80299070 00295FB0 38 A0 00 00 */ li r5, 0 -/* 80299074 00295FB4 48 03 5C 25 */ bl __nw_X2_ +/* 80299074 00295FB4 48 03 5C 25 */ bl __nw__FUlP7JKRHeapi /* 80299078 00295FB8 7C 7C 1B 79 */ or. r28, r3, r3 /* 8029907C 00295FBC 41 82 00 0C */ beq lbl_80299088 /* 80299080 00295FC0 4B FF F4 79 */ bl JASBasicWaveBank @@ -224,7 +224,7 @@ lbl_802992BC: /* 802992BC 002961FC 38 60 00 80 */ li r3, 0x80 /* 802992C0 00296200 7F 24 CB 78 */ mr r4, r25 /* 802992C4 00296204 38 A0 00 00 */ li r5, 0 -/* 802992C8 00296208 48 03 59 D1 */ bl __nw_X2_ +/* 802992C8 00296208 48 03 59 D1 */ bl __nw__FUlP7JKRHeapi /* 802992CC 0029620C 7C 7D 1B 79 */ or. r29, r3, r3 /* 802992D0 00296210 41 82 00 0C */ beq lbl_802992DC /* 802992D4 00296214 4B FF F9 C1 */ bl JASSimpleWaveBank diff --git a/asm/JAudio2/JASWaveArcLoader.s b/asm/JAudio2/JASWaveArcLoader.s index 57b4a4f033..dd9ed5a09a 100644 --- a/asm/JAudio2/JASWaveArcLoader.s +++ b/asm/JAudio2/JASWaveArcLoader.s @@ -108,13 +108,13 @@ JASWaveArc_NS_dtor: /* 8029A1F4 00297134 41 82 00 10 */ beq lbl_8029A204 /* 8029A1F8 00297138 38 7E 00 10 */ addi r3, r30, 0x10 /* 8029A1FC 0029713C 38 80 00 00 */ li r4, 0 -/* 8029A200 00297140 48 04 1C 15 */ bl JSUPtrLink_NS_dtor +/* 8029A200 00297140 48 04 1C 15 */ bl __dt__10JSUPtrLinkFv lbl_8029A204: /* 8029A204 00297144 34 1E 00 04 */ addic. r0, r30, 4 /* 8029A208 00297148 41 82 00 10 */ beq lbl_8029A218 /* 8029A20C 0029714C 38 7E 00 04 */ addi r3, r30, 4 /* 8029A210 00297150 38 80 00 00 */ li r4, 0 -/* 8029A214 00297154 48 04 1C 99 */ bl JSUPtrList_NS_dtor +/* 8029A214 00297154 48 04 1C 99 */ bl __dt__10JSUPtrListFv lbl_8029A218: /* 8029A218 00297158 28 1E 00 00 */ cmplwi r30, 0 /* 8029A21C 0029715C 41 82 00 10 */ beq lbl_8029A22C @@ -125,7 +125,7 @@ lbl_8029A22C: /* 8029A22C 0029716C 7F E0 07 35 */ extsh. r0, r31 /* 8029A230 00297170 40 81 00 0C */ ble lbl_8029A23C /* 8029A234 00297174 7F C3 F3 78 */ mr r3, r30 -/* 8029A238 00297178 48 03 4B 05 */ bl __dl +/* 8029A238 00297178 48 03 4B 05 */ bl __dl__FPv lbl_8029A23C: /* 8029A23C 0029717C 7F C3 F3 78 */ mr r3, r30 /* 8029A240 00297180 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -502,7 +502,7 @@ JASWaveArc_NS_setFileName: /* 8029A748 00297688 7C 64 1B 78 */ mr r4, r3 /* 8029A74C 0029768C 38 7F 00 01 */ addi r3, r31, 1 /* 8029A750 00297690 38 A0 FF FC */ li r5, -4 -/* 8029A754 00297694 48 03 45 BD */ bl __nwa_X2_ +/* 8029A754 00297694 48 03 45 BD */ bl __nwa__FUlP7JKRHeapi /* 8029A758 00297698 7C 7D 1B 78 */ mr r29, r3 /* 8029A75C 0029769C 7F C4 F3 78 */ mr r4, r30 /* 8029A760 002976A0 48 0C E3 CD */ bl strcpy @@ -515,7 +515,7 @@ JASWaveArc_NS_setFileName: /* 8029A77C 002976BC 48 0A DD AD */ bl DVDConvertPathToEntrynum /* 8029A780 002976C0 7C 7E 1B 78 */ mr r30, r3 /* 8029A784 002976C4 7F A3 EB 78 */ mr r3, r29 -/* 8029A788 002976C8 48 03 45 D9 */ bl __dla +/* 8029A788 002976C8 48 03 45 D9 */ bl __dla__FPv /* 8029A78C 002976CC 2C 1E 00 00 */ cmpwi r30, 0 /* 8029A790 002976D0 41 80 00 10 */ blt lbl_8029A7A0 /* 8029A794 002976D4 7F 63 DB 78 */ mr r3, r27 @@ -539,7 +539,7 @@ lbl_8029A7A0: /* 8029A7D8 00297718 90 1F 00 00 */ stw r0, 0(r31) /* 8029A7DC 0029771C 7C 80 07 35 */ extsh. r0, r4 /* 8029A7E0 00297720 40 81 00 08 */ ble lbl_8029A7E8 -/* 8029A7E4 00297724 48 03 45 59 */ bl __dl +/* 8029A7E4 00297724 48 03 45 59 */ bl __dl__FPv lbl_8029A7E8: /* 8029A7E8 00297728 7F E3 FB 78 */ mr r3, r31 /* 8029A7EC 0029772C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAUAudioArcInterpreter.s b/asm/JAudio2/JAUAudioArcInterpreter.s index ba397ba9fa..e25f19bc05 100644 --- a/asm/JAudio2/JAUAudioArcInterpreter.s +++ b/asm/JAudio2/JAUAudioArcInterpreter.s @@ -26,7 +26,7 @@ JAUAudioArcInterpreter_NS_dtor: /* 802A4280 002A11C0 90 1F 00 00 */ stw r0, 0(r31) /* 802A4284 002A11C4 7C 80 07 35 */ extsh. r0, r4 /* 802A4288 002A11C8 40 81 00 08 */ ble lbl_802A4290 -/* 802A428C 002A11CC 48 02 AA B1 */ bl __dl +/* 802A428C 002A11CC 48 02 AA B1 */ bl __dl__FPv lbl_802A4290: /* 802A4290 002A11D0 7F E3 FB 78 */ mr r3, r31 /* 802A4294 002A11D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAUAudioArcLoader.s b/asm/JAudio2/JAUAudioArcLoader.s index ab5a322b73..093dc081fc 100644 --- a/asm/JAudio2/JAUAudioArcLoader.s +++ b/asm/JAudio2/JAUAudioArcLoader.s @@ -202,7 +202,7 @@ lbl_802A4954: /* 802A4A30 002A1970 7F E0 07 35 */ extsh. r0, r31 /* 802A4A34 002A1974 40 81 00 0C */ ble lbl_802A4A40 /* 802A4A38 002A1978 7F C3 F3 78 */ mr r3, r30 -/* 802A4A3C 002A197C 48 02 A3 01 */ bl __dl +/* 802A4A3C 002A197C 48 02 A3 01 */ bl __dl__FPv lbl_802A4A40: /* 802A4A40 002A1980 7F C3 F3 78 */ mr r3, r30 /* 802A4A44 002A1984 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAUBankTable.s b/asm/JAudio2/JAUBankTable.s index 5e140cc8d3..32f56a468c 100644 --- a/asm/JAudio2/JAUBankTable.s +++ b/asm/JAudio2/JAUBankTable.s @@ -8,7 +8,7 @@ JAUBankTableDictionary_NS_appendBankTable: /* 802A4A80 002A19C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4A84 002A19C4 7C 08 02 A6 */ mflr r0 /* 802A4A88 002A19C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A4A8C 002A19CC 48 03 74 C1 */ bl JSUPtrList_NS_append +/* 802A4A8C 002A19CC 48 03 74 C1 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A4A90 002A19D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4A94 002A19D4 7C 08 03 A6 */ mtlr r0 /* 802A4A98 002A19D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JAudio2/JAUSectionHeap.s b/asm/JAudio2/JAUSectionHeap.s index 6bb18421df..a7926f94ce 100644 --- a/asm/JAudio2/JAUSectionHeap.s +++ b/asm/JAudio2/JAUSectionHeap.s @@ -12,15 +12,15 @@ JAUSection_NS_TSectionData: /* 802A4EF8 002A1E38 7C 7F 1B 78 */ mr r31, r3 /* 802A4EFC 002A1E3C 48 00 1B 5D */ bl JAUDynamicSeqDataBlocks /* 802A4F00 002A1E40 38 7F 00 28 */ addi r3, r31, 0x28 -/* 802A4F04 002A1E44 48 03 70 11 */ bl JSUPtrList_NS_initiate +/* 802A4F04 002A1E44 48 03 70 11 */ bl initiate__10JSUPtrListFv /* 802A4F08 002A1E48 38 7F 00 34 */ addi r3, r31, 0x34 /* 802A4F0C 002A1E4C 48 00 17 51 */ bl __ct__Q23std16__bitset_base /* 802A4F10 002A1E50 38 7F 00 54 */ addi r3, r31, 0x54 /* 802A4F14 002A1E54 48 00 17 49 */ bl __ct__Q23std16__bitset_base /* 802A4F18 002A1E58 38 7F 00 74 */ addi r3, r31, 0x74 -/* 802A4F1C 002A1E5C 48 03 6F F9 */ bl JSUPtrList_NS_initiate +/* 802A4F1C 002A1E5C 48 03 6F F9 */ bl initiate__10JSUPtrListFv /* 802A4F20 002A1E60 38 7F 00 8C */ addi r3, r31, 0x8c -/* 802A4F24 002A1E64 48 03 6F F1 */ bl JSUPtrList_NS_initiate +/* 802A4F24 002A1E64 48 03 6F F1 */ bl initiate__10JSUPtrListFv /* 802A4F28 002A1E68 7F E3 FB 78 */ mr r3, r31 /* 802A4F2C 002A1E6C 48 00 00 B9 */ bl JAUSection_NS_TSectionData_NS_resetRegisteredWaveBankTables /* 802A4F30 002A1E70 7F E3 FB 78 */ mr r3, r31 @@ -121,10 +121,10 @@ JAUSection: /* 802A5078 002A1FB8 7C 9D 23 78 */ mr r29, r4 /* 802A507C 002A1FBC 7C BE 2B 78 */ mr r30, r5 /* 802A5080 002A1FC0 7C DF 33 78 */ mr r31, r6 -/* 802A5084 002A1FC4 48 02 C3 F9 */ bl JKRDisposer +/* 802A5084 002A1FC4 48 02 C3 F9 */ bl __ct__11JKRDisposerFv /* 802A5088 002A1FC8 38 7C 00 18 */ addi r3, r28, 0x18 /* 802A508C 002A1FCC 7F 84 E3 78 */ mr r4, r28 -/* 802A5090 002A1FD0 48 03 6D 6D */ bl JSUPtrLink +/* 802A5090 002A1FD0 48 03 6D 6D */ bl __ct__10JSUPtrLinkFPv /* 802A5094 002A1FD4 3C 60 80 3D */ lis r3, lbl_803C9B24@ha /* 802A5098 002A1FD8 38 03 9B 24 */ addi r0, r3, lbl_803C9B24@l /* 802A509C 002A1FDC 90 1C 00 00 */ stw r0, 0(r28) @@ -161,9 +161,9 @@ JAUSection_NS_finishBuild: /* 802A5108 002A2048 7C 7F 1B 78 */ mr r31, r3 /* 802A510C 002A204C 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A5110 002A2050 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5114 002A2054 48 02 93 25 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5114 002A2054 48 02 93 25 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5118 002A2058 90 61 00 08 */ stw r3, 8(r1) -/* 802A511C 002A205C 48 02 93 1D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A511C 002A205C 48 02 93 1D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5120 002A2060 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A5124 002A2064 80 63 00 E0 */ lwz r3, 0xe0(r3) /* 802A5128 002A2068 48 02 96 05 */ bl getFreeSize__7JKRHeapFv @@ -172,7 +172,7 @@ JAUSection_NS_finishBuild: /* 802A5134 002A2074 90 1F 00 D0 */ stw r0, 0xd0(r31) /* 802A5138 002A2078 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A513C 002A207C 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5140 002A2080 48 02 94 B9 */ bl JKRHeap_NS_freeTail +/* 802A5140 002A2080 48 02 94 B9 */ bl freeTail__7JKRHeapFv /* 802A5144 002A2084 38 00 00 00 */ li r0, 0 /* 802A5148 002A2088 98 1F 00 2C */ stb r0, 0x2c(r31) /* 802A514C 002A208C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -230,7 +230,7 @@ JAUSection_NS_newSoundTable: /* 802A5204 002A2144 7C DD 33 78 */ mr r29, r6 /* 802A5208 002A2148 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A520C 002A214C 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5210 002A2150 48 02 92 29 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5210 002A2150 48 02 92 29 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5214 002A2154 90 61 00 08 */ stw r3, 8(r1) /* 802A5218 002A2158 28 1F 00 00 */ cmplwi r31, 0 /* 802A521C 002A215C 41 82 00 1C */ beq lbl_802A5238 @@ -242,7 +242,7 @@ JAUSection_NS_newSoundTable: /* 802A5234 002A2174 7C 7E 1B 78 */ mr r30, r3 lbl_802A5238: /* 802A5238 002A2178 38 60 00 08 */ li r3, 8 -/* 802A523C 002A217C 48 02 9A 11 */ bl __nw +/* 802A523C 002A217C 48 02 9A 11 */ bl __nw__FUl /* 802A5240 002A2180 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5244 002A2184 41 82 00 1C */ beq lbl_802A5260 /* 802A5248 002A2188 57 A0 06 3F */ clrlwi. r0, r29, 0x18 @@ -260,7 +260,7 @@ lbl_802A5260: /* 802A5270 002A21B0 93 E3 05 2C */ stw r31, 0x52c(r3) /* 802A5274 002A21B4 93 DC 00 BC */ stw r30, 0xbc(r28) /* 802A5278 002A21B8 80 61 00 08 */ lwz r3, 8(r1) -/* 802A527C 002A21BC 48 02 91 BD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A527C 002A21BC 48 02 91 BD */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5280 002A21C0 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A5284 002A21C4 80 63 05 2C */ lwz r3, 0x52c(r3) /* 802A5288 002A21C8 39 61 00 20 */ addi r11, r1, 0x20 @@ -283,7 +283,7 @@ JAUSection_NS_newSoundNameTable: /* 802A52C0 002A2200 7C DD 33 78 */ mr r29, r6 /* 802A52C4 002A2204 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A52C8 002A2208 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A52CC 002A220C 48 02 91 6D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A52CC 002A220C 48 02 91 6D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A52D0 002A2210 90 61 00 08 */ stw r3, 8(r1) /* 802A52D4 002A2214 28 1F 00 00 */ cmplwi r31, 0 /* 802A52D8 002A2218 41 82 00 1C */ beq lbl_802A52F4 @@ -295,7 +295,7 @@ JAUSection_NS_newSoundNameTable: /* 802A52F0 002A2230 7C 7E 1B 78 */ mr r30, r3 lbl_802A52F4: /* 802A52F4 002A2234 38 60 00 08 */ li r3, 8 -/* 802A52F8 002A2238 48 02 99 55 */ bl __nw +/* 802A52F8 002A2238 48 02 99 55 */ bl __nw__FUl /* 802A52FC 002A223C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5300 002A2240 41 82 00 1C */ beq lbl_802A531C /* 802A5304 002A2244 57 A0 06 3F */ clrlwi. r0, r29, 0x18 @@ -313,7 +313,7 @@ lbl_802A531C: /* 802A532C 002A226C 93 E3 05 30 */ stw r31, 0x530(r3) /* 802A5330 002A2270 93 DC 00 C0 */ stw r30, 0xc0(r28) /* 802A5334 002A2274 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5338 002A2278 48 02 91 01 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5338 002A2278 48 02 91 01 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A533C 002A227C 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A5340 002A2280 80 63 05 30 */ lwz r3, 0x530(r3) /* 802A5344 002A2284 39 61 00 20 */ addi r11, r1, 0x20 @@ -335,13 +335,13 @@ JAUSection_NS_newStreamFileTable: /* 802A5378 002A22B8 7C BC 2B 78 */ mr r28, r5 /* 802A537C 002A22BC 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A5380 002A22C0 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5384 002A22C4 48 02 90 B5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5384 002A22C4 48 02 90 B5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5388 002A22C8 90 61 00 0C */ stw r3, 0xc(r1) /* 802A538C 002A22CC 3B E0 00 00 */ li r31, 0 /* 802A5390 002A22D0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 802A5394 002A22D4 41 82 00 EC */ beq lbl_802A5480 /* 802A5398 002A22D8 38 60 00 0C */ li r3, 0xc -/* 802A539C 002A22DC 48 02 98 B1 */ bl __nw +/* 802A539C 002A22DC 48 02 98 B1 */ bl __nw__FUl /* 802A53A0 002A22E0 28 03 00 00 */ cmplwi r3, 0 /* 802A53A4 002A22E4 41 82 00 C8 */ beq lbl_802A546C /* 802A53A8 002A22E8 7C 7B 1B 78 */ mr r27, r3 @@ -370,7 +370,7 @@ lbl_802A53F8: /* 802A5400 002A2340 90 7B 00 04 */ stw r3, 4(r27) /* 802A5404 002A2344 80 1B 00 04 */ lwz r0, 4(r27) /* 802A5408 002A2348 54 03 10 3A */ slwi r3, r0, 2 -/* 802A540C 002A234C 48 02 98 B9 */ bl __nwa +/* 802A540C 002A234C 48 02 98 B9 */ bl __nwa__FUl /* 802A5410 002A2350 90 7B 00 08 */ stw r3, 8(r27) /* 802A5414 002A2354 80 1B 00 08 */ lwz r0, 8(r27) /* 802A5418 002A2358 28 00 00 00 */ cmplwi r0, 0 @@ -405,7 +405,7 @@ lbl_802A546C: /* 802A547C 002A23BC 48 00 00 54 */ b lbl_802A54D0 lbl_802A5480: /* 802A5480 002A23C0 38 60 00 08 */ li r3, 8 -/* 802A5484 002A23C4 48 02 97 C9 */ bl __nw +/* 802A5484 002A23C4 48 02 97 C9 */ bl __nw__FUl /* 802A5488 002A23C8 7C 7C 1B 79 */ or. r28, r3, r3 /* 802A548C 002A23CC 41 82 00 28 */ beq lbl_802A54B4 /* 802A5490 002A23D0 7F 9B E3 78 */ mr r27, r28 @@ -429,7 +429,7 @@ lbl_802A54D0: /* 802A54D0 002A2410 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A54D4 002A2414 93 E3 05 28 */ stw r31, 0x528(r3) /* 802A54D8 002A2418 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A54DC 002A241C 48 02 8F 5D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A54DC 002A241C 48 02 8F 5D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A54E0 002A2420 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A54E4 002A2424 80 63 05 28 */ lwz r3, 0x528(r3) /* 802A54E8 002A2428 39 61 00 30 */ addi r11, r1, 0x30 @@ -456,10 +456,10 @@ JAUSection_NS_newSeSeqCollection: lbl_802A5530: /* 802A5530 002A2470 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A5534 002A2474 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5538 002A2478 48 02 8F 01 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5538 002A2478 48 02 8F 01 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A553C 002A247C 90 61 00 08 */ stw r3, 8(r1) /* 802A5540 002A2480 38 60 00 18 */ li r3, 0x18 -/* 802A5544 002A2484 48 02 97 09 */ bl __nw +/* 802A5544 002A2484 48 02 97 09 */ bl __nw__FUl /* 802A5548 002A2488 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A554C 002A248C 41 82 00 0C */ beq lbl_802A5558 /* 802A5550 002A2490 48 00 12 2D */ bl JAUSeqDataMgr_SeqCollection @@ -472,7 +472,7 @@ lbl_802A5558: /* 802A5568 002A24A8 93 E3 05 24 */ stw r31, 0x524(r3) /* 802A556C 002A24AC 93 FD 00 B8 */ stw r31, 0xb8(r29) /* 802A5570 002A24B0 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5574 002A24B4 48 02 8E C5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5574 002A24B4 48 02 8E C5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5578 002A24B8 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A557C 002A24BC 80 63 05 24 */ lwz r3, 0x524(r3) /* 802A5580 002A24C0 39 61 00 20 */ addi r11, r1, 0x20 @@ -494,10 +494,10 @@ JAUSection_NS_newStaticSeqDataBlock_: /* 802A55B4 002A24F4 7C BC 2B 78 */ mr r28, r5 /* 802A55B8 002A24F8 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A55BC 002A24FC 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A55C0 002A2500 48 02 8E 79 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A55C0 002A2500 48 02 8E 79 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A55C4 002A2504 90 61 00 0C */ stw r3, 0xc(r1) /* 802A55C8 002A2508 38 60 00 20 */ li r3, 0x20 -/* 802A55CC 002A250C 48 02 96 81 */ bl __nw +/* 802A55CC 002A250C 48 02 96 81 */ bl __nw__FUl /* 802A55D0 002A2510 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A55D4 002A2514 41 82 00 0C */ beq lbl_802A55E0 /* 802A55D8 002A2518 48 00 13 1D */ bl JAUSeqDataBlock @@ -506,31 +506,31 @@ lbl_802A55E0: /* 802A55E0 002A2520 28 1E 00 00 */ cmplwi r30, 0 /* 802A55E4 002A2524 40 82 00 14 */ bne lbl_802A55F8 /* 802A55E8 002A2528 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A55EC 002A252C 48 02 8E 4D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A55EC 002A252C 48 02 8E 4D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A55F0 002A2530 38 60 00 00 */ li r3, 0 /* 802A55F4 002A2534 48 00 00 BC */ b lbl_802A56B0 lbl_802A55F8: /* 802A55F8 002A2538 38 60 00 10 */ li r3, 0x10 -/* 802A55FC 002A253C 48 02 96 51 */ bl __nw +/* 802A55FC 002A253C 48 02 96 51 */ bl __nw__FUl /* 802A5600 002A2540 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5604 002A2544 41 82 00 0C */ beq lbl_802A5610 /* 802A5608 002A2548 7F C4 F3 78 */ mr r4, r30 -/* 802A560C 002A254C 48 03 67 F1 */ bl JSUPtrLink +/* 802A560C 002A254C 48 03 67 F1 */ bl __ct__10JSUPtrLinkFPv lbl_802A5610: /* 802A5610 002A2550 28 1F 00 00 */ cmplwi r31, 0 /* 802A5614 002A2554 40 82 00 14 */ bne lbl_802A5628 /* 802A5618 002A2558 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A561C 002A255C 48 02 8E 1D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A561C 002A255C 48 02 8E 1D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5620 002A2560 38 60 00 00 */ li r3, 0 /* 802A5624 002A2564 48 00 00 8C */ b lbl_802A56B0 lbl_802A5628: /* 802A5628 002A2568 7F 83 E3 78 */ mr r3, r28 /* 802A562C 002A256C 38 80 00 20 */ li r4, 0x20 -/* 802A5630 002A2570 48 02 96 BD */ bl __nwa_X1_ +/* 802A5630 002A2570 48 02 96 BD */ bl __nwa__FUli /* 802A5634 002A2574 7C 7D 1B 79 */ or. r29, r3, r3 /* 802A5638 002A2578 40 82 00 14 */ bne lbl_802A564C /* 802A563C 002A257C 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A5640 002A2580 48 02 8D F9 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5640 002A2580 48 02 8D F9 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5644 002A2584 38 60 00 00 */ li r3, 0 /* 802A5648 002A2588 48 00 00 68 */ b lbl_802A56B0 lbl_802A564C: @@ -547,18 +547,18 @@ lbl_802A564C: /* 802A5674 002A25B4 41 82 00 28 */ beq lbl_802A569C /* 802A5678 002A25B8 38 7A 00 60 */ addi r3, r26, 0x60 /* 802A567C 002A25BC 7F E4 FB 78 */ mr r4, r31 -/* 802A5680 002A25C0 48 03 68 CD */ bl JSUPtrList_NS_append +/* 802A5680 002A25C0 48 03 68 CD */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A5684 002A25C4 80 61 00 08 */ lwz r3, 8(r1) /* 802A5688 002A25C8 48 09 80 95 */ bl OSRestoreInterrupts /* 802A568C 002A25CC 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A5690 002A25D0 48 02 8D A9 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5690 002A25D0 48 02 8D A9 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5694 002A25D4 7F A3 EB 78 */ mr r3, r29 /* 802A5698 002A25D8 48 00 00 18 */ b lbl_802A56B0 lbl_802A569C: /* 802A569C 002A25DC 80 61 00 08 */ lwz r3, 8(r1) /* 802A56A0 002A25E0 48 09 80 7D */ bl OSRestoreInterrupts /* 802A56A4 002A25E4 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A56A8 002A25E8 48 02 8D 91 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A56A8 002A25E8 48 02 8D 91 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A56AC 002A25EC 38 60 00 00 */ li r3, 0 lbl_802A56B0: /* 802A56B0 002A25F0 39 61 00 30 */ addi r11, r1, 0x30 @@ -667,7 +667,7 @@ JAUSection_NS_newCopy: /* 802A5814 002A2754 80 87 00 30 */ lwz r4, 0x30(r7) /* 802A5818 002A2758 80 84 00 E0 */ lwz r4, 0xe0(r4) /* 802A581C 002A275C 7C C5 33 78 */ mr r5, r6 -/* 802A5820 002A2760 48 02 94 F1 */ bl __nwa_X2_ +/* 802A5820 002A2760 48 02 94 F1 */ bl __nwa__FUlP7JKRHeapi /* 802A5824 002A2764 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5828 002A2768 41 82 00 10 */ beq lbl_802A5838 /* 802A582C 002A276C 7F A4 EB 78 */ mr r4, r29 @@ -694,7 +694,7 @@ JAUSection_NS_newWaveBank: /* 802A5870 002A27B0 7C BD 2B 78 */ mr r29, r5 /* 802A5874 002A27B4 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A5878 002A27B8 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A587C 002A27BC 48 02 8B BD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A587C 002A27BC 48 02 8B BD */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5880 002A27C0 90 61 00 08 */ stw r3, 8(r1) /* 802A5884 002A27C4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A5888 002A27C8 80 63 00 E0 */ lwz r3, 0xe0(r3) @@ -734,12 +734,12 @@ lbl_802A58E8: /* 802A590C 002A284C 7C 00 1A 14 */ add r0, r0, r3 /* 802A5910 002A2850 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 802A5914 002A2854 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5918 002A2858 48 02 8B 21 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5918 002A2858 48 02 8B 21 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A591C 002A285C 7F A3 EB 78 */ mr r3, r29 /* 802A5920 002A2860 48 00 00 10 */ b lbl_802A5930 lbl_802A5924: /* 802A5924 002A2864 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5928 002A2868 48 02 8B 11 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5928 002A2868 48 02 8B 11 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A592C 002A286C 38 60 00 00 */ li r3, 0 lbl_802A5930: /* 802A5930 002A2870 39 61 00 20 */ addi r11, r1, 0x20 @@ -847,7 +847,7 @@ lbl_802A5A84: /* 802A5A8C 002A29CC 7F 83 00 2E */ lwzx r28, r3, r0 lbl_802A5A90: /* 802A5A90 002A29D0 80 64 00 E0 */ lwz r3, 0xe0(r4) -/* 802A5A94 002A29D4 48 02 89 A5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5A94 002A29D4 48 02 89 A5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5A98 002A29D8 90 61 00 08 */ stw r3, 8(r1) /* 802A5A9C 002A29DC 83 7F 00 08 */ lwz r27, 8(r31) /* 802A5AA0 002A29E0 80 7E 00 30 */ lwz r3, 0x30(r30) @@ -898,12 +898,12 @@ lbl_802A5B30: /* 802A5B48 002A2A88 7C 00 1A 14 */ add r0, r0, r3 /* 802A5B4C 002A2A8C 90 1E 00 D4 */ stw r0, 0xd4(r30) /* 802A5B50 002A2A90 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5B54 002A2A94 48 02 88 E5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5B54 002A2A94 48 02 88 E5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5B58 002A2A98 7F E3 FB 78 */ mr r3, r31 /* 802A5B5C 002A2A9C 48 00 00 10 */ b lbl_802A5B6C lbl_802A5B60: /* 802A5B60 002A2AA0 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5B64 002A2AA4 48 02 88 D5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5B64 002A2AA4 48 02 88 D5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5B68 002A2AA8 38 60 00 00 */ li r3, 0 lbl_802A5B6C: /* 802A5B6C 002A2AAC 39 61 00 30 */ addi r11, r1, 0x30 @@ -934,10 +934,10 @@ lbl_802A5BB8: /* 802A5BC0 002A2B00 7F E3 00 2E */ lwzx r31, r3, r0 lbl_802A5BC4: /* 802A5BC4 002A2B04 80 64 00 E0 */ lwz r3, 0xe0(r4) -/* 802A5BC8 002A2B08 48 02 88 71 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5BC8 002A2B08 48 02 88 71 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5BCC 002A2B0C 90 61 00 08 */ stw r3, 8(r1) /* 802A5BD0 002A2B10 38 60 00 08 */ li r3, 8 -/* 802A5BD4 002A2B14 48 02 90 79 */ bl __nw +/* 802A5BD4 002A2B14 48 02 90 79 */ bl __nw__FUl /* 802A5BD8 002A2B18 28 03 00 00 */ cmplwi r3, 0 /* 802A5BDC 002A2B1C 41 82 00 24 */ beq lbl_802A5C00 /* 802A5BE0 002A2B20 3C 80 80 3C */ lis r4, lbl_803C76BC@ha @@ -983,12 +983,12 @@ lbl_802A5C64: lbl_802A5C74: /* 802A5C74 002A2BB4 93 FC 00 04 */ stw r31, 4(r28) /* 802A5C78 002A2BB8 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5C7C 002A2BBC 48 02 87 BD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5C7C 002A2BBC 48 02 87 BD */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5C80 002A2BC0 7F 83 E3 78 */ mr r3, r28 /* 802A5C84 002A2BC4 48 00 00 10 */ b lbl_802A5C94 lbl_802A5C88: /* 802A5C88 002A2BC8 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5C8C 002A2BCC 48 02 87 AD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5C8C 002A2BCC 48 02 87 AD */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5C90 002A2BD0 38 60 00 00 */ li r3, 0 lbl_802A5C94: /* 802A5C94 002A2BD4 39 61 00 20 */ addi r11, r1, 0x20 @@ -1011,14 +1011,14 @@ JAUSection_NS_beginNewBankTable: /* 802A5CCC 002A2C0C 3B C0 00 00 */ li r30, 0 /* 802A5CD0 002A2C10 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A5CD4 002A2C14 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5CD8 002A2C18 48 02 87 61 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5CD8 002A2C18 48 02 87 61 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5CDC 002A2C1C 90 61 00 08 */ stw r3, 8(r1) /* 802A5CE0 002A2C20 57 A3 10 3A */ slwi r3, r29, 2 -/* 802A5CE4 002A2C24 48 02 8F E1 */ bl __nwa +/* 802A5CE4 002A2C24 48 02 8F E1 */ bl __nwa__FUl /* 802A5CE8 002A2C28 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5CEC 002A2C2C 41 82 00 84 */ beq lbl_802A5D70 /* 802A5CF0 002A2C30 38 60 00 24 */ li r3, 0x24 -/* 802A5CF4 002A2C34 48 02 8F 59 */ bl __nw +/* 802A5CF4 002A2C34 48 02 8F 59 */ bl __nw__FUl /* 802A5CF8 002A2C38 28 03 00 00 */ cmplwi r3, 0 /* 802A5CFC 002A2C3C 41 82 00 64 */ beq lbl_802A5D60 /* 802A5D00 002A2C40 7C 7E 1B 78 */ mr r30, r3 @@ -1026,7 +1026,7 @@ JAUSection_NS_beginNewBankTable: /* 802A5D08 002A2C48 41 82 00 08 */ beq lbl_802A5D10 /* 802A5D0C 002A2C4C 38 84 00 10 */ addi r4, r4, 0x10 lbl_802A5D10: -/* 802A5D10 002A2C50 48 03 60 ED */ bl JSUPtrLink +/* 802A5D10 002A2C50 48 03 60 ED */ bl __ct__10JSUPtrLinkFPv /* 802A5D14 002A2C54 3C 60 80 3C */ lis r3, lbl_803C5B80@ha /* 802A5D18 002A2C58 38 03 5B 80 */ addi r0, r3, lbl_803C5B80@l /* 802A5D1C 002A2C5C 90 1E 00 10 */ stw r0, 0x10(r30) @@ -1053,7 +1053,7 @@ lbl_802A5D60: /* 802A5D6C 002A2CAC 90 7B 00 34 */ stw r3, 0x34(r27) lbl_802A5D70: /* 802A5D70 002A2CB0 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5D74 002A2CB4 48 02 86 C5 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5D74 002A2CB4 48 02 86 C5 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5D78 002A2CB8 30 1E FF FF */ addic r0, r30, -1 /* 802A5D7C 002A2CBC 7C 00 F1 10 */ subfe r0, r0, r30 /* 802A5D80 002A2CC0 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -1189,13 +1189,13 @@ JAUNewSectionHeap: /* 802A5F34 002A2E74 48 0B C2 A5 */ bl _savegpr_28 /* 802A5F38 002A2E78 7C 7C 1B 78 */ mr r28, r3 /* 802A5F3C 002A2E7C 7C 9D 23 78 */ mr r29, r4 -/* 802A5F40 002A2E80 48 02 84 F9 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5F40 002A2E80 48 02 84 F9 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5F44 002A2E84 90 61 00 08 */ stw r3, 8(r1) /* 802A5F48 002A2E88 7F 83 E3 78 */ mr r3, r28 /* 802A5F4C 002A2E8C 48 02 87 E1 */ bl getFreeSize__7JKRHeapFv /* 802A5F50 002A2E90 7C 7E 1B 78 */ mr r30, r3 /* 802A5F54 002A2E94 38 60 05 34 */ li r3, 0x534 -/* 802A5F58 002A2E98 48 02 8C F5 */ bl __nw +/* 802A5F58 002A2E98 48 02 8C F5 */ bl __nw__FUl /* 802A5F5C 002A2E9C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5F60 002A2EA0 41 82 00 18 */ beq lbl_802A5F78 /* 802A5F64 002A2EA4 7F 84 E3 78 */ mr r4, r28 @@ -1205,7 +1205,7 @@ JAUNewSectionHeap: /* 802A5F74 002A2EB4 7C 7F 1B 78 */ mr r31, r3 lbl_802A5F78: /* 802A5F78 002A2EB8 80 61 00 08 */ lwz r3, 8(r1) -/* 802A5F7C 002A2EBC 48 02 84 BD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A5F7C 002A2EBC 48 02 84 BD */ bl becomeCurrentHeap__7JKRHeapFv /* 802A5F80 002A2EC0 7F E3 FB 78 */ mr r3, r31 /* 802A5F84 002A2EC4 39 61 00 20 */ addi r11, r1, 0x20 /* 802A5F88 002A2EC8 48 0B C2 9D */ bl _restgpr_28 @@ -1265,7 +1265,7 @@ lbl_802A6024: /* 802A6040 002A2F80 90 1D 00 DC */ stw r0, 0xdc(r29) /* 802A6044 002A2F84 93 DD 00 E0 */ stw r30, 0xe0(r29) /* 802A6048 002A2F88 38 7D 00 E8 */ addi r3, r29, 0xe8 -/* 802A604C 002A2F8C 48 03 5E C9 */ bl JSUPtrList_NS_initiate +/* 802A604C 002A2F8C 48 03 5E C9 */ bl initiate__10JSUPtrListFv /* 802A6050 002A2F90 38 7D 00 F4 */ addi r3, r29, 0xf4 /* 802A6054 002A2F94 4B FF FD A1 */ bl JAUSectionHeap_NS_TSectionHeapData /* 802A6058 002A2F98 38 00 00 00 */ li r0, 0 @@ -1276,7 +1276,7 @@ lbl_802A6024: /* 802A606C 002A2FAC 38 9D 00 18 */ addi r4, r29, 0x18 lbl_802A6070: /* 802A6070 002A2FB0 38 7D 00 E8 */ addi r3, r29, 0xe8 -/* 802A6074 002A2FB4 48 03 5E D9 */ bl JSUPtrList_NS_append +/* 802A6074 002A2FB4 48 03 5E D9 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A6078 002A2FB8 7F A3 EB 78 */ mr r3, r29 /* 802A607C 002A2FBC 39 61 00 20 */ addi r11, r1, 0x20 /* 802A6080 002A2FC0 48 0B C1 A9 */ bl _restgpr_29 @@ -1307,10 +1307,10 @@ JAUSectionHeap_NS_newDynamicSeqBlock: /* 802A60C4 002A3004 7C 9D 23 78 */ mr r29, r4 /* 802A60C8 002A3008 80 63 00 30 */ lwz r3, 0x30(r3) /* 802A60CC 002A300C 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A60D0 002A3010 48 02 83 69 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A60D0 002A3010 48 02 83 69 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A60D4 002A3014 90 61 00 0C */ stw r3, 0xc(r1) /* 802A60D8 002A3018 38 60 00 20 */ li r3, 0x20 -/* 802A60DC 002A301C 48 02 8B 71 */ bl __nw +/* 802A60DC 002A301C 48 02 8B 71 */ bl __nw__FUl /* 802A60E0 002A3020 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A60E4 002A3024 41 82 00 0C */ beq lbl_802A60F0 /* 802A60E8 002A3028 48 00 08 0D */ bl JAUSeqDataBlock @@ -1319,31 +1319,31 @@ lbl_802A60F0: /* 802A60F0 002A3030 28 1E 00 00 */ cmplwi r30, 0 /* 802A60F4 002A3034 40 82 00 14 */ bne lbl_802A6108 /* 802A60F8 002A3038 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A60FC 002A303C 48 02 83 3D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A60FC 002A303C 48 02 83 3D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A6100 002A3040 38 60 00 00 */ li r3, 0 /* 802A6104 002A3044 48 00 00 B4 */ b lbl_802A61B8 lbl_802A6108: /* 802A6108 002A3048 38 60 00 10 */ li r3, 0x10 -/* 802A610C 002A304C 48 02 8B 41 */ bl __nw +/* 802A610C 002A304C 48 02 8B 41 */ bl __nw__FUl /* 802A6110 002A3050 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A6114 002A3054 41 82 00 0C */ beq lbl_802A6120 /* 802A6118 002A3058 7F C4 F3 78 */ mr r4, r30 -/* 802A611C 002A305C 48 03 5C E1 */ bl JSUPtrLink +/* 802A611C 002A305C 48 03 5C E1 */ bl __ct__10JSUPtrLinkFPv lbl_802A6120: /* 802A6120 002A3060 28 1F 00 00 */ cmplwi r31, 0 /* 802A6124 002A3064 40 82 00 14 */ bne lbl_802A6138 /* 802A6128 002A3068 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A612C 002A306C 48 02 83 0D */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A612C 002A306C 48 02 83 0D */ bl becomeCurrentHeap__7JKRHeapFv /* 802A6130 002A3070 38 60 00 00 */ li r3, 0 /* 802A6134 002A3074 48 00 00 84 */ b lbl_802A61B8 lbl_802A6138: /* 802A6138 002A3078 7F A3 EB 78 */ mr r3, r29 /* 802A613C 002A307C 38 80 00 20 */ li r4, 0x20 -/* 802A6140 002A3080 48 02 8B AD */ bl __nwa_X1_ +/* 802A6140 002A3080 48 02 8B AD */ bl __nwa__FUli /* 802A6144 002A3084 28 03 00 00 */ cmplwi r3, 0 /* 802A6148 002A3088 40 82 00 14 */ bne lbl_802A615C /* 802A614C 002A308C 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A6150 002A3090 48 02 82 E9 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A6150 002A3090 48 02 82 E9 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A6154 002A3094 38 60 00 00 */ li r3, 0 /* 802A6158 002A3098 48 00 00 60 */ b lbl_802A61B8 lbl_802A615C: @@ -1362,14 +1362,14 @@ lbl_802A615C: /* 802A618C 002A30CC 80 61 00 08 */ lwz r3, 8(r1) /* 802A6190 002A30D0 48 09 75 8D */ bl OSRestoreInterrupts /* 802A6194 002A30D4 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A6198 002A30D8 48 02 82 A1 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A6198 002A30D8 48 02 82 A1 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A619C 002A30DC 38 60 00 01 */ li r3, 1 /* 802A61A0 002A30E0 48 00 00 18 */ b lbl_802A61B8 lbl_802A61A4: /* 802A61A4 002A30E4 80 61 00 08 */ lwz r3, 8(r1) /* 802A61A8 002A30E8 48 09 75 75 */ bl OSRestoreInterrupts /* 802A61AC 002A30EC 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802A61B0 002A30F0 48 02 82 89 */ bl JKRHeap_NS_becomeCurrentHeap +/* 802A61B0 002A30F0 48 02 82 89 */ bl becomeCurrentHeap__7JKRHeapFv /* 802A61B4 002A30F4 38 60 00 00 */ li r3, 0 lbl_802A61B8: /* 802A61B8 002A30F8 39 61 00 20 */ addi r11, r1, 0x20 @@ -1452,27 +1452,27 @@ JAUSectionHeap_NS_dtor: /* 802A62C4 002A3204 28 03 00 00 */ cmplwi r3, 0 /* 802A62C8 002A3208 41 82 00 0C */ beq lbl_802A62D4 /* 802A62CC 002A320C 38 80 00 00 */ li r4, 0 -/* 802A62D0 002A3210 48 03 5B DD */ bl JSUPtrList_NS_dtor +/* 802A62D0 002A3210 48 03 5B DD */ bl __dt__10JSUPtrListFv lbl_802A62D4: /* 802A62D4 002A3214 34 7D 00 0C */ addic. r3, r29, 0xc /* 802A62D8 002A3218 41 82 00 14 */ beq lbl_802A62EC /* 802A62DC 002A321C 28 03 00 00 */ cmplwi r3, 0 /* 802A62E0 002A3220 41 82 00 0C */ beq lbl_802A62EC /* 802A62E4 002A3224 38 80 00 00 */ li r4, 0 -/* 802A62E8 002A3228 48 03 5B C5 */ bl JSUPtrList_NS_dtor +/* 802A62E8 002A3228 48 03 5B C5 */ bl __dt__10JSUPtrListFv lbl_802A62EC: /* 802A62EC 002A322C 28 1D 00 00 */ cmplwi r29, 0 /* 802A62F0 002A3230 41 82 00 14 */ beq lbl_802A6304 /* 802A62F4 002A3234 41 82 00 10 */ beq lbl_802A6304 /* 802A62F8 002A3238 7F A3 EB 78 */ mr r3, r29 /* 802A62FC 002A323C 38 80 00 00 */ li r4, 0 -/* 802A6300 002A3240 48 03 5B AD */ bl JSUPtrList_NS_dtor +/* 802A6300 002A3240 48 03 5B AD */ bl __dt__10JSUPtrListFv lbl_802A6304: /* 802A6304 002A3244 34 1E 00 E8 */ addic. r0, r30, 0xe8 /* 802A6308 002A3248 41 82 00 10 */ beq lbl_802A6318 /* 802A630C 002A324C 38 7E 00 E8 */ addi r3, r30, 0xe8 /* 802A6310 002A3250 38 80 00 00 */ li r4, 0 -/* 802A6314 002A3254 48 03 5B 99 */ bl JSUPtrList_NS_dtor +/* 802A6314 002A3254 48 03 5B 99 */ bl __dt__10JSUPtrListFv lbl_802A6318: /* 802A6318 002A3258 38 7E 00 DC */ addi r3, r30, 0xdc /* 802A631C 002A325C 38 80 00 00 */ li r4, 0 @@ -1499,19 +1499,19 @@ lbl_802A634C: /* 802A6368 002A32A8 34 7E 00 C4 */ addic. r3, r30, 0xc4 /* 802A636C 002A32AC 41 82 00 0C */ beq lbl_802A6378 /* 802A6370 002A32B0 38 80 00 00 */ li r4, 0 -/* 802A6374 002A32B4 48 03 5B 39 */ bl JSUPtrList_NS_dtor +/* 802A6374 002A32B4 48 03 5B 39 */ bl __dt__10JSUPtrListFv lbl_802A6378: /* 802A6378 002A32B8 34 7E 00 AC */ addic. r3, r30, 0xac /* 802A637C 002A32BC 41 82 00 14 */ beq lbl_802A6390 /* 802A6380 002A32C0 28 03 00 00 */ cmplwi r3, 0 /* 802A6384 002A32C4 41 82 00 0C */ beq lbl_802A6390 /* 802A6388 002A32C8 38 80 00 00 */ li r4, 0 -/* 802A638C 002A32CC 48 03 5B 21 */ bl JSUPtrList_NS_dtor +/* 802A638C 002A32CC 48 03 5B 21 */ bl __dt__10JSUPtrListFv lbl_802A6390: /* 802A6390 002A32D0 34 7E 00 60 */ addic. r3, r30, 0x60 /* 802A6394 002A32D4 41 82 00 0C */ beq lbl_802A63A0 /* 802A6398 002A32D8 38 80 00 00 */ li r4, 0 -/* 802A639C 002A32DC 48 03 5B 11 */ bl JSUPtrList_NS_dtor +/* 802A639C 002A32DC 48 03 5B 11 */ bl __dt__10JSUPtrListFv lbl_802A63A0: /* 802A63A0 002A32E0 34 1E 00 38 */ addic. r0, r30, 0x38 /* 802A63A4 002A32E4 41 82 00 50 */ beq lbl_802A63F4 @@ -1520,14 +1520,14 @@ lbl_802A63A0: /* 802A63B0 002A32F0 28 03 00 00 */ cmplwi r3, 0 /* 802A63B4 002A32F4 41 82 00 0C */ beq lbl_802A63C0 /* 802A63B8 002A32F8 38 80 00 00 */ li r4, 0 -/* 802A63BC 002A32FC 48 03 5A F1 */ bl JSUPtrList_NS_dtor +/* 802A63BC 002A32FC 48 03 5A F1 */ bl __dt__10JSUPtrListFv lbl_802A63C0: /* 802A63C0 002A3300 34 7E 00 44 */ addic. r3, r30, 0x44 /* 802A63C4 002A3304 41 82 00 14 */ beq lbl_802A63D8 /* 802A63C8 002A3308 28 03 00 00 */ cmplwi r3, 0 /* 802A63CC 002A330C 41 82 00 0C */ beq lbl_802A63D8 /* 802A63D0 002A3310 38 80 00 00 */ li r4, 0 -/* 802A63D4 002A3314 48 03 5A D9 */ bl JSUPtrList_NS_dtor +/* 802A63D4 002A3314 48 03 5A D9 */ bl __dt__10JSUPtrListFv lbl_802A63D8: /* 802A63D8 002A3318 34 1E 00 38 */ addic. r0, r30, 0x38 /* 802A63DC 002A331C 41 82 00 18 */ beq lbl_802A63F4 @@ -1535,22 +1535,22 @@ lbl_802A63D8: /* 802A63E4 002A3324 41 82 00 10 */ beq lbl_802A63F4 /* 802A63E8 002A3328 38 7E 00 38 */ addi r3, r30, 0x38 /* 802A63EC 002A332C 38 80 00 00 */ li r4, 0 -/* 802A63F0 002A3330 48 03 5A BD */ bl JSUPtrList_NS_dtor +/* 802A63F0 002A3330 48 03 5A BD */ bl __dt__10JSUPtrListFv lbl_802A63F4: /* 802A63F4 002A3334 34 1E 00 18 */ addic. r0, r30, 0x18 /* 802A63F8 002A3338 41 82 00 10 */ beq lbl_802A6408 /* 802A63FC 002A333C 38 7E 00 18 */ addi r3, r30, 0x18 /* 802A6400 002A3340 38 80 00 00 */ li r4, 0 -/* 802A6404 002A3344 48 03 5A 11 */ bl JSUPtrLink_NS_dtor +/* 802A6404 002A3344 48 03 5A 11 */ bl __dt__10JSUPtrLinkFv lbl_802A6408: /* 802A6408 002A3348 7F C3 F3 78 */ mr r3, r30 /* 802A640C 002A334C 38 80 00 00 */ li r4, 0 -/* 802A6410 002A3350 48 02 B0 D5 */ bl JKRDisposer_NS_dtor +/* 802A6410 002A3350 48 02 B0 D5 */ bl __dt__11JKRDisposerFv lbl_802A6414: /* 802A6414 002A3354 7F E0 07 35 */ extsh. r0, r31 /* 802A6418 002A3358 40 81 00 0C */ ble lbl_802A6424 /* 802A641C 002A335C 7F C3 F3 78 */ mr r3, r30 -/* 802A6420 002A3360 48 02 89 1D */ bl __dl +/* 802A6420 002A3360 48 02 89 1D */ bl __dl__FPv lbl_802A6424: /* 802A6424 002A3364 7F C3 F3 78 */ mr r3, r30 /* 802A6428 002A3368 39 61 00 20 */ addi r11, r1, 0x20 @@ -1586,19 +1586,19 @@ lbl_802A6458: /* 802A649C 002A33DC 34 7E 00 C4 */ addic. r3, r30, 0xc4 /* 802A64A0 002A33E0 41 82 00 0C */ beq lbl_802A64AC /* 802A64A4 002A33E4 38 80 00 00 */ li r4, 0 -/* 802A64A8 002A33E8 48 03 5A 05 */ bl JSUPtrList_NS_dtor +/* 802A64A8 002A33E8 48 03 5A 05 */ bl __dt__10JSUPtrListFv lbl_802A64AC: /* 802A64AC 002A33EC 34 7E 00 AC */ addic. r3, r30, 0xac /* 802A64B0 002A33F0 41 82 00 14 */ beq lbl_802A64C4 /* 802A64B4 002A33F4 28 03 00 00 */ cmplwi r3, 0 /* 802A64B8 002A33F8 41 82 00 0C */ beq lbl_802A64C4 /* 802A64BC 002A33FC 38 80 00 00 */ li r4, 0 -/* 802A64C0 002A3400 48 03 59 ED */ bl JSUPtrList_NS_dtor +/* 802A64C0 002A3400 48 03 59 ED */ bl __dt__10JSUPtrListFv lbl_802A64C4: /* 802A64C4 002A3404 34 7E 00 60 */ addic. r3, r30, 0x60 /* 802A64C8 002A3408 41 82 00 0C */ beq lbl_802A64D4 /* 802A64CC 002A340C 38 80 00 00 */ li r4, 0 -/* 802A64D0 002A3410 48 03 59 DD */ bl JSUPtrList_NS_dtor +/* 802A64D0 002A3410 48 03 59 DD */ bl __dt__10JSUPtrListFv lbl_802A64D4: /* 802A64D4 002A3414 34 1E 00 38 */ addic. r0, r30, 0x38 /* 802A64D8 002A3418 41 82 00 50 */ beq lbl_802A6528 @@ -1607,14 +1607,14 @@ lbl_802A64D4: /* 802A64E4 002A3424 28 03 00 00 */ cmplwi r3, 0 /* 802A64E8 002A3428 41 82 00 0C */ beq lbl_802A64F4 /* 802A64EC 002A342C 38 80 00 00 */ li r4, 0 -/* 802A64F0 002A3430 48 03 59 BD */ bl JSUPtrList_NS_dtor +/* 802A64F0 002A3430 48 03 59 BD */ bl __dt__10JSUPtrListFv lbl_802A64F4: /* 802A64F4 002A3434 34 7E 00 44 */ addic. r3, r30, 0x44 /* 802A64F8 002A3438 41 82 00 14 */ beq lbl_802A650C /* 802A64FC 002A343C 28 03 00 00 */ cmplwi r3, 0 /* 802A6500 002A3440 41 82 00 0C */ beq lbl_802A650C /* 802A6504 002A3444 38 80 00 00 */ li r4, 0 -/* 802A6508 002A3448 48 03 59 A5 */ bl JSUPtrList_NS_dtor +/* 802A6508 002A3448 48 03 59 A5 */ bl __dt__10JSUPtrListFv lbl_802A650C: /* 802A650C 002A344C 34 1E 00 38 */ addic. r0, r30, 0x38 /* 802A6510 002A3450 41 82 00 18 */ beq lbl_802A6528 @@ -1622,21 +1622,21 @@ lbl_802A650C: /* 802A6518 002A3458 41 82 00 10 */ beq lbl_802A6528 /* 802A651C 002A345C 38 7E 00 38 */ addi r3, r30, 0x38 /* 802A6520 002A3460 38 80 00 00 */ li r4, 0 -/* 802A6524 002A3464 48 03 59 89 */ bl JSUPtrList_NS_dtor +/* 802A6524 002A3464 48 03 59 89 */ bl __dt__10JSUPtrListFv lbl_802A6528: /* 802A6528 002A3468 34 1E 00 18 */ addic. r0, r30, 0x18 /* 802A652C 002A346C 41 82 00 10 */ beq lbl_802A653C /* 802A6530 002A3470 38 7E 00 18 */ addi r3, r30, 0x18 /* 802A6534 002A3474 38 80 00 00 */ li r4, 0 -/* 802A6538 002A3478 48 03 58 DD */ bl JSUPtrLink_NS_dtor +/* 802A6538 002A3478 48 03 58 DD */ bl __dt__10JSUPtrLinkFv lbl_802A653C: /* 802A653C 002A347C 7F C3 F3 78 */ mr r3, r30 /* 802A6540 002A3480 38 80 00 00 */ li r4, 0 -/* 802A6544 002A3484 48 02 AF A1 */ bl JKRDisposer_NS_dtor +/* 802A6544 002A3484 48 02 AF A1 */ bl __dt__11JKRDisposerFv /* 802A6548 002A3488 7F E0 07 35 */ extsh. r0, r31 /* 802A654C 002A348C 40 81 00 0C */ ble lbl_802A6558 /* 802A6550 002A3490 7F C3 F3 78 */ mr r3, r30 -/* 802A6554 002A3494 48 02 87 E9 */ bl __dl +/* 802A6554 002A3494 48 02 87 E9 */ bl __dl__FPv lbl_802A6558: /* 802A6558 002A3498 7F C3 F3 78 */ mr r3, r30 /* 802A655C 002A349C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1661,7 +1661,7 @@ lbl_802A6558: /* 802A65A8 002A34E8 7F E0 07 35 */ extsh. r0, r31 /* 802A65AC 002A34EC 40 81 00 0C */ ble lbl_802A65B8 /* 802A65B0 002A34F0 7F C3 F3 78 */ mr r3, r30 -/* 802A65B4 002A34F4 48 02 87 89 */ bl __dl +/* 802A65B4 002A34F4 48 02 87 89 */ bl __dl__FPv lbl_802A65B8: /* 802A65B8 002A34F8 7F C3 F3 78 */ mr r3, r30 /* 802A65BC 002A34FC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAUSeqCollection.s b/asm/JAudio2/JAUSeqCollection.s index 53a4b6e10c..fbfc8d0fce 100644 --- a/asm/JAudio2/JAUSeqCollection.s +++ b/asm/JAudio2/JAUSeqCollection.s @@ -167,7 +167,7 @@ lbl_802A6884: /* 802A68C8 002A3808 7F E0 07 35 */ extsh. r0, r31 /* 802A68CC 002A380C 40 81 00 0C */ ble lbl_802A68D8 /* 802A68D0 002A3810 7F C3 F3 78 */ mr r3, r30 -/* 802A68D4 002A3814 48 02 84 69 */ bl __dl +/* 802A68D4 002A3814 48 02 84 69 */ bl __dl__FPv lbl_802A68D8: /* 802A68D8 002A3818 7F C3 F3 78 */ mr r3, r30 /* 802A68DC 002A381C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index 2928a9f219..a626c23aed 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -11,7 +11,7 @@ JAUSeqDataBlock: /* 802A6900 002A3840 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A6904 002A3844 7C 7F 1B 78 */ mr r31, r3 /* 802A6908 002A3848 7F E4 FB 78 */ mr r4, r31 -/* 802A690C 002A384C 48 03 54 F1 */ bl JSUPtrLink +/* 802A690C 002A384C 48 03 54 F1 */ bl __ct__10JSUPtrLinkFPv /* 802A6910 002A3850 7F E3 FB 78 */ mr r3, r31 /* 802A6914 002A3854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A6918 002A3858 80 01 00 14 */ lwz r0, 0x14(r1) @@ -82,7 +82,7 @@ JAUSeqDataBlocks_NS_append: /* 802A69D8 002A3918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A69DC 002A391C 7C 08 02 A6 */ mflr r0 /* 802A69E0 002A3920 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A69E4 002A3924 48 03 55 69 */ bl JSUPtrList_NS_append +/* 802A69E4 002A3924 48 03 55 69 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802A69E8 002A3928 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A69EC 002A392C 7C 08 03 A6 */ mtlr r0 /* 802A69F0 002A3930 38 21 00 10 */ addi r1, r1, 0x10 @@ -93,7 +93,7 @@ JAUSeqDataBlocks_NS_remove: /* 802A69F8 002A3938 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A69FC 002A393C 7C 08 02 A6 */ mflr r0 /* 802A6A00 002A3940 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A6A04 002A3944 48 03 57 59 */ bl JSUPtrList_NS_remove +/* 802A6A04 002A3944 48 03 57 59 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802A6A08 002A3948 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A6A0C 002A394C 7C 08 03 A6 */ mtlr r0 /* 802A6A10 002A3950 38 21 00 10 */ addi r1, r1, 0x10 @@ -128,11 +128,11 @@ JAUDynamicSeqDataBlocks: /* 802A6A60 002A39A0 90 01 00 14 */ stw r0, 0x14(r1) /* 802A6A64 002A39A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A6A68 002A39A8 7C 7F 1B 78 */ mr r31, r3 -/* 802A6A6C 002A39AC 48 03 54 A9 */ bl JSUPtrList_NS_initiate +/* 802A6A6C 002A39AC 48 03 54 A9 */ bl initiate__10JSUPtrListFv /* 802A6A70 002A39B0 38 7F 00 0C */ addi r3, r31, 0xc -/* 802A6A74 002A39B4 48 03 54 A1 */ bl JSUPtrList_NS_initiate +/* 802A6A74 002A39B4 48 03 54 A1 */ bl initiate__10JSUPtrListFv /* 802A6A78 002A39B8 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802A6A7C 002A39BC 48 03 54 99 */ bl JSUPtrList_NS_initiate +/* 802A6A7C 002A39BC 48 03 54 99 */ bl initiate__10JSUPtrListFv /* 802A6A80 002A39C0 38 00 00 00 */ li r0, 0 /* 802A6A84 002A39C4 90 1F 00 24 */ stw r0, 0x24(r31) /* 802A6A88 002A39C8 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/JAudio2/JAUStreamFileTable.s b/asm/JAudio2/JAUStreamFileTable.s index e624262298..48cb284d09 100644 --- a/asm/JAudio2/JAUStreamFileTable.s +++ b/asm/JAudio2/JAUStreamFileTable.s @@ -84,7 +84,7 @@ lbl_802A74D8: /* 802A751C 002A445C 7F E0 07 35 */ extsh. r0, r31 /* 802A7520 002A4460 40 81 00 0C */ ble lbl_802A752C /* 802A7524 002A4464 7F C3 F3 78 */ mr r3, r30 -/* 802A7528 002A4468 48 02 78 15 */ bl __dl +/* 802A7528 002A4468 48 02 78 15 */ bl __dl__FPv lbl_802A752C: /* 802A752C 002A446C 7F C3 F3 78 */ mr r3, r30 /* 802A7530 002A4470 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JFramework/JFWDisplay.s b/asm/JFramework/JFWDisplay.s index 6c8efb674d..476833c852 100644 --- a/asm/JFramework/JFWDisplay.s +++ b/asm/JFramework/JFWDisplay.s @@ -104,7 +104,7 @@ lbl_802721A0: /* 802721B0 0026F0F0 7F E0 07 35 */ extsh. r0, r31 /* 802721B4 0026F0F4 40 81 00 0C */ ble lbl_802721C0 /* 802721B8 0026F0F8 7F C3 F3 78 */ mr r3, r30 -/* 802721BC 0026F0FC 48 05 CB 81 */ bl __dl +/* 802721BC 0026F0FC 48 05 CB 81 */ bl __dl__FPv lbl_802721C0: /* 802721C0 0026F100 7F C3 F3 78 */ mr r3, r30 /* 802721C4 0026F104 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -134,7 +134,7 @@ lbl_80272210: /* 80272214 0026F154 28 00 00 00 */ cmplwi r0, 0 /* 80272218 0026F158 40 82 00 2C */ bne lbl_80272244 /* 8027221C 0026F15C 38 60 00 4C */ li r3, 0x4c -/* 80272220 0026F160 48 05 CA 2D */ bl __nw +/* 80272220 0026F160 48 05 CA 2D */ bl __nw__FUl /* 80272224 0026F164 7C 60 1B 79 */ or. r0, r3, r3 /* 80272228 0026F168 41 82 00 18 */ beq lbl_80272240 /* 8027222C 0026F16C 7F A4 EB 78 */ mr r4, r29 @@ -987,7 +987,7 @@ JFWThreadAlarmHandler: /* 80272DE4 0026FD24 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 80272DE8 0026FD28 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l /* 80272DEC 0026FD2C 38 9F 00 2C */ addi r4, r31, 0x2c -/* 80272DF0 0026FD30 48 06 93 6D */ bl JSUPtrList_NS_remove +/* 80272DF0 0026FD30 48 06 93 6D */ bl remove__10JSUPtrListFP10JSUPtrLink /* 80272DF4 0026FD34 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80272DF8 0026FD38 48 0C E9 BD */ bl OSResumeThread /* 80272DFC 0026FD3C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1008,7 +1008,7 @@ JFWDisplay_NS_threadSleep: /* 80272E2C 0026FD6C 3B E1 00 34 */ addi r31, r1, 0x34 /* 80272E30 0026FD70 7F E3 FB 78 */ mr r3, r31 /* 80272E34 0026FD74 38 81 00 08 */ addi r4, r1, 8 -/* 80272E38 0026FD78 48 06 8F C5 */ bl JSUPtrLink +/* 80272E38 0026FD78 48 06 8F C5 */ bl __ct__10JSUPtrLinkFPv /* 80272E3C 0026FD7C 38 61 00 08 */ addi r3, r1, 8 /* 80272E40 0026FD80 48 0C 7A B9 */ bl OSCreateAlarm /* 80272E44 0026FD84 48 0C DE 41 */ bl OSGetCurrentThread @@ -1018,7 +1018,7 @@ JFWDisplay_NS_threadSleep: /* 80272E54 0026FD94 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 80272E58 0026FD98 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l /* 80272E5C 0026FD9C 7F E4 FB 78 */ mr r4, r31 -/* 80272E60 0026FDA0 48 06 90 ED */ bl JSUPtrList_NS_append +/* 80272E60 0026FDA0 48 06 90 ED */ bl append__10JSUPtrListFP10JSUPtrLink /* 80272E64 0026FDA4 38 61 00 08 */ addi r3, r1, 8 /* 80272E68 0026FDA8 7F 86 E3 78 */ mr r6, r28 /* 80272E6C 0026FDAC 7F A5 EB 78 */ mr r5, r29 @@ -1035,7 +1035,7 @@ JFWDisplay_NS_threadSleep: /* 80272E90 0026FDD0 41 82 00 10 */ beq lbl_80272EA0 /* 80272E94 0026FDD4 7F E3 FB 78 */ mr r3, r31 /* 80272E98 0026FDD8 38 80 00 00 */ li r4, 0 -/* 80272E9C 0026FDDC 48 06 8F 79 */ bl JSUPtrLink_NS_dtor +/* 80272E9C 0026FDDC 48 06 8F 79 */ bl __dt__10JSUPtrLinkFv lbl_80272EA0: /* 80272EA0 0026FDE0 39 61 00 60 */ addi r11, r1, 0x60 /* 80272EA4 0026FDE4 48 0E F3 81 */ bl _restgpr_28 @@ -1391,7 +1391,7 @@ JFWDrawDoneAlarm: /* 802733BC 002702FC 3B E1 00 34 */ addi r31, r1, 0x34 /* 802733C0 00270300 7F E3 FB 78 */ mr r3, r31 /* 802733C4 00270304 38 81 00 08 */ addi r4, r1, 8 -/* 802733C8 00270308 48 06 8A 35 */ bl JSUPtrLink +/* 802733C8 00270308 48 06 8A 35 */ bl __ct__10JSUPtrLinkFPv /* 802733CC 0027030C 48 0C A3 29 */ bl __RAS_OSDisableInterrupts_begin /* 802733D0 00270310 7C 7E 1B 78 */ mr r30, r3 /* 802733D4 00270314 38 61 00 08 */ addi r3, r1, 8 @@ -1399,7 +1399,7 @@ JFWDrawDoneAlarm: /* 802733DC 0027031C 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 802733E0 00270320 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l /* 802733E4 00270324 7F E4 FB 78 */ mr r4, r31 -/* 802733E8 00270328 48 06 8B 65 */ bl JSUPtrList_NS_append +/* 802733E8 00270328 48 06 8B 65 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802733EC 0027032C C8 42 B8 70 */ lfd f2, lbl_80455270-_SDA2_BASE_(r2) /* 802733F0 00270330 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 802733F4 00270334 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) @@ -1426,14 +1426,14 @@ JFWDrawDoneAlarm: /* 80273440 00270380 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 80273444 00270384 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l /* 80273448 00270388 7F E4 FB 78 */ mr r4, r31 -/* 8027344C 0027038C 48 06 8D 11 */ bl JSUPtrList_NS_remove +/* 8027344C 0027038C 48 06 8D 11 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 80273450 00270390 7F C3 F3 78 */ mr r3, r30 /* 80273454 00270394 48 0C A2 C9 */ bl OSRestoreInterrupts /* 80273458 00270398 28 1F 00 00 */ cmplwi r31, 0 /* 8027345C 0027039C 41 82 00 10 */ beq lbl_8027346C /* 80273460 002703A0 7F E3 FB 78 */ mr r3, r31 /* 80273464 002703A4 38 80 00 00 */ li r4, 0 -/* 80273468 002703A8 48 06 89 AD */ bl JSUPtrLink_NS_dtor +/* 80273468 002703A8 48 06 89 AD */ bl __dt__10JSUPtrLinkFv lbl_8027346C: /* 8027346C 002703AC 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80273470 002703B0 83 C1 00 58 */ lwz r30, 0x58(r1) @@ -1608,7 +1608,7 @@ lbl_802736C4: /* 802736E8 00270628 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 802736EC 0027062C 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l /* 802736F0 00270630 38 80 00 00 */ li r4, 0 -/* 802736F4 00270634 48 06 87 81 */ bl JSUPtrList +/* 802736F4 00270634 48 06 87 81 */ bl __ct__10JSUPtrListFb /* 802736F8 00270638 3C 60 80 43 */ lis r3, lbl_80430FE4@ha /* 802736FC 0027063C 38 63 0F E4 */ addi r3, r3, lbl_80430FE4@l .global JSUList_NS_dtor @@ -1633,11 +1633,11 @@ JSUList_NS_dtor: /* 8027373C 0027067C 7C 9F 23 78 */ mr r31, r4 /* 80273740 00270680 41 82 00 1C */ beq lbl_8027375C /* 80273744 00270684 38 80 00 00 */ li r4, 0 -/* 80273748 00270688 48 06 87 65 */ bl JSUPtrList_NS_dtor +/* 80273748 00270688 48 06 87 65 */ bl __dt__10JSUPtrListFv /* 8027374C 0027068C 7F E0 07 35 */ extsh. r0, r31 /* 80273750 00270690 40 81 00 0C */ ble lbl_8027375C /* 80273754 00270694 7F C3 F3 78 */ mr r3, r30 -/* 80273758 00270698 48 05 B5 E5 */ bl __dl +/* 80273758 00270698 48 05 B5 E5 */ bl __dl__FPv lbl_8027375C: /* 8027375C 0027069C 7F C3 F3 78 */ mr r3, r30 /* 80273760 002706A0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JFramework/JFWSystem.s b/asm/JFramework/JFWSystem.s index d13ced50a6..3f4743d982 100644 --- a/asm/JFramework/JFWSystem.s +++ b/asm/JFramework/JFWSystem.s @@ -47,7 +47,7 @@ lbl_80271D44: /* 80271D5C 0026EC9C 80 ED 82 0C */ lwz r7, lbl_8045078C-_SDA_BASE_(r13) /* 80271D60 0026ECA0 48 06 02 45 */ bl JKRAram_NS_create /* 80271D64 0026ECA4 38 60 00 7C */ li r3, 0x7c -/* 80271D68 0026ECA8 48 05 CE E5 */ bl __nw +/* 80271D68 0026ECA8 48 05 CE E5 */ bl __nw__FUl /* 80271D6C 0026ECAC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80271D70 0026ECB0 41 82 00 1C */ beq lbl_80271D8C /* 80271D74 0026ECB4 48 0C EF 11 */ bl OSGetCurrentThread @@ -62,7 +62,7 @@ lbl_80271D8C: /* 80271D94 0026ECD4 48 07 2E C1 */ bl JUTVideo_NS_createManager /* 80271D98 0026ECD8 83 ED 81 F8 */ lwz r31, lbl_80450778-_SDA_BASE_(r13) /* 80271D9C 0026ECDC 38 60 00 1C */ li r3, 0x1c -/* 80271DA0 0026ECE0 48 05 CE AD */ bl __nw +/* 80271DA0 0026ECE0 48 05 CE AD */ bl __nw__FUl /* 80271DA4 0026ECE4 28 03 00 00 */ cmplwi r3, 0 /* 80271DA8 0026ECE8 41 82 00 0C */ beq lbl_80271DB4 /* 80271DAC 0026ECEC 7F E4 FB 78 */ mr r4, r31 @@ -75,7 +75,7 @@ lbl_80271DB4: /* 80271DC4 0026ED04 7F C3 F3 78 */ mr r3, r30 /* 80271DC8 0026ED08 48 07 00 79 */ bl JUTException_NS_create /* 80271DCC 0026ED0C 38 60 00 70 */ li r3, 0x70 -/* 80271DD0 0026ED10 48 05 CE 7D */ bl __nw +/* 80271DD0 0026ED10 48 05 CE 7D */ bl __nw__FUl /* 80271DD4 0026ED14 7C 60 1B 79 */ or. r0, r3, r3 /* 80271DD8 0026ED18 41 82 00 14 */ beq lbl_80271DEC /* 80271DDC 0026ED1C 80 8D 82 10 */ lwz r4, lbl_80450790-_SDA_BASE_(r13) @@ -224,7 +224,7 @@ lbl_80271FE0: /* 80272008 0026EF48 80 6D 8C 24 */ lwz r3, lbl_804511A4-_SDA_BASE_(r13) /* 8027200C 0026EF4C 80 8D 82 18 */ lwz r4, lbl_80450798-_SDA_BASE_(r13) /* 80272010 0026EF50 38 A0 00 04 */ li r5, 4 -/* 80272014 0026EF54 48 05 C4 C1 */ bl JKRHeap_NS_alloc_X1_ +/* 80272014 0026EF54 48 05 C4 C1 */ bl alloc__7JKRHeapFUli /* 80272018 0026EF58 80 8D 82 18 */ lwz r4, lbl_80450798-_SDA_BASE_(r13) /* 8027201C 0026EF5C 48 07 1F D1 */ bl JUTException_NS_createConsole /* 80272020 0026EF60 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 diff --git a/asm/JGadget/binary.s b/asm/JGadget/binary.s index 129e7350b9..a00e841de5 100644 --- a/asm/JGadget/binary.s +++ b/asm/JGadget/binary.s @@ -47,7 +47,7 @@ JGadget_NS_binary_NS_TParse_header_block_NS_dtor: /* 802DC8E8 002D9828 90 1F 00 00 */ stw r0, 0(r31) /* 802DC8EC 002D982C 7C 80 07 35 */ extsh. r0, r4 /* 802DC8F0 002D9830 40 81 00 08 */ ble lbl_802DC8F8 -/* 802DC8F4 002D9834 4B FF 24 49 */ bl __dl +/* 802DC8F4 002D9834 4B FF 24 49 */ bl __dl__FPv lbl_802DC8F8: /* 802DC8F8 002D9838 7F E3 FB 78 */ mr r3, r31 /* 802DC8FC 002D983C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JGadget/linklist.s b/asm/JGadget/linklist.s index 5152d3a6e1..c6e64b35fd 100644 --- a/asm/JGadget/linklist.s +++ b/asm/JGadget/linklist.s @@ -13,7 +13,7 @@ JGadget_NS_TNodeLinkList_NS_dtor: /* 802DCA30 002D9970 41 82 00 10 */ beq lbl_802DCA40 /* 802DCA34 002D9974 7C 80 07 35 */ extsh. r0, r4 /* 802DCA38 002D9978 40 81 00 08 */ ble lbl_802DCA40 -/* 802DCA3C 002D997C 4B FF 23 01 */ bl __dl +/* 802DCA3C 002D997C 4B FF 23 01 */ bl __dl__FPv lbl_802DCA40: /* 802DCA40 002D9980 7F E3 FB 78 */ mr r3, r31 /* 802DCA44 002D9984 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JGadget/std-vector.s b/asm/JGadget/std-vector.s index f707b4b32b..c94e6cfcf1 100644 --- a/asm/JGadget/std-vector.s +++ b/asm/JGadget/std-vector.s @@ -60,12 +60,12 @@ lbl_802DCD64: /* 802DCD68 002D9CA8 40 82 FF F8 */ bne lbl_802DCD60 /* 802DCD6C 002D9CAC 90 9E 00 08 */ stw r4, 8(r30) /* 802DCD70 002D9CB0 80 7E 00 04 */ lwz r3, 4(r30) -/* 802DCD74 002D9CB4 4B FF 1F C9 */ bl __dl +/* 802DCD74 002D9CB4 4B FF 1F C9 */ bl __dl__FPv lbl_802DCD78: /* 802DCD78 002D9CB8 7F E0 07 35 */ extsh. r0, r31 /* 802DCD7C 002D9CBC 40 81 00 0C */ ble lbl_802DCD88 /* 802DCD80 002D9CC0 7F C3 F3 78 */ mr r3, r30 -/* 802DCD84 002D9CC4 4B FF 1F B9 */ bl __dl +/* 802DCD84 002D9CC4 4B FF 1F B9 */ bl __dl__FPv lbl_802DCD88: /* 802DCD88 002D9CC8 7F C3 F3 78 */ mr r3, r30 /* 802DCD8C 002D9CCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -274,7 +274,7 @@ lbl_802DD008: /* 802DD028 002D9F68 7F BF EB 78 */ mr r31, r29 lbl_802DD02C: /* 802DD02C 002D9F6C 57 E3 10 3A */ slwi r3, r31, 2 -/* 802DD030 002D9F70 4B FF 1C 1D */ bl __nw +/* 802DD030 002D9F70 4B FF 1C 1D */ bl __nw__FUl /* 802DD034 002D9F74 28 03 00 00 */ cmplwi r3, 0 /* 802DD038 002D9F78 40 82 00 0C */ bne lbl_802DD044 /* 802DD03C 002D9F7C 80 7B 00 08 */ lwz r3, 8(r27) @@ -337,7 +337,7 @@ lbl_802DD0D4: /* 802DD104 002DA044 90 7B 00 04 */ stw r3, 4(r27) /* 802DD108 002DA048 93 FB 00 0C */ stw r31, 0xc(r27) /* 802DD10C 002DA04C 7C A3 2B 78 */ mr r3, r5 -/* 802DD110 002DA050 4B FF 1C 2D */ bl __dl +/* 802DD110 002DA050 4B FF 1C 2D */ bl __dl__FPv /* 802DD114 002DA054 7F A3 EB 78 */ mr r3, r29 lbl_802DD118: /* 802DD118 002DA058 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/JKernel/JKRAram.s b/asm/JKernel/JKRAram.s index 7f1cf579f0..43ea518d88 100644 --- a/asm/JKernel/JKRAram.s +++ b/asm/JKernel/JKRAram.s @@ -21,7 +21,7 @@ JKRAram_NS_create: /* 802D1FD8 002CEF18 38 60 00 A4 */ li r3, 0xa4 /* 802D1FDC 002CEF1C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D1FE0 002CEF20 38 A0 00 00 */ li r5, 0 -/* 802D1FE4 002CEF24 4B FF CC B5 */ bl __nw_X2_ +/* 802D1FE4 002CEF24 4B FF CC B5 */ bl __nw__FUlP7JKRHeapi /* 802D1FE8 002CEF28 7C 60 1B 79 */ or. r0, r3, r3 /* 802D1FEC 002CEF2C 41 82 00 18 */ beq lbl_802D2004 /* 802D1FF0 002CEF30 7F 64 DB 78 */ mr r4, r27 @@ -105,7 +105,7 @@ lbl_802D2104: /* 802D2104 002CF044 38 60 00 44 */ li r3, 0x44 /* 802D2108 002CF048 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D210C 002CF04C 38 A0 00 00 */ li r5, 0 -/* 802D2110 002CF050 4B FF CB 89 */ bl __nw_X2_ +/* 802D2110 002CF050 4B FF CB 89 */ bl __nw__FUlP7JKRHeapi /* 802D2114 002CF054 7C 60 1B 79 */ or. r0, r3, r3 /* 802D2118 002CF058 41 82 00 14 */ beq lbl_802D212C /* 802D211C 002CF05C 80 9C 00 84 */ lwz r4, 0x84(r28) @@ -150,7 +150,7 @@ lbl_802D21A4: /* 802D21B0 002CF0F0 7F E0 07 35 */ extsh. r0, r31 /* 802D21B4 002CF0F4 40 81 00 0C */ ble lbl_802D21C0 /* 802D21B8 002CF0F8 7F C3 F3 78 */ mr r3, r30 -/* 802D21BC 002CF0FC 4B FF CB 81 */ bl __dl +/* 802D21BC 002CF0FC 4B FF CB 81 */ bl __dl__FPv lbl_802D21C0: /* 802D21C0 002CF100 7F C3 F3 78 */ mr r3, r30 /* 802D21C4 002CF104 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -180,7 +180,7 @@ lbl_802D2210: /* 802D2220 002CF160 80 61 00 08 */ lwz r3, 8(r1) /* 802D2224 002CF164 83 C3 00 00 */ lwz r30, 0(r3) /* 802D2228 002CF168 83 A3 00 04 */ lwz r29, 4(r3) -/* 802D222C 002CF16C 4B FF CB 11 */ bl __dl +/* 802D222C 002CF16C 4B FF CB 11 */ bl __dl__FPv /* 802D2230 002CF170 2C 1E 00 01 */ cmpwi r30, 1 /* 802D2234 002CF174 41 82 00 08 */ beq lbl_802D223C /* 802D2238 002CF178 4B FF FF D8 */ b lbl_802D2210 @@ -347,7 +347,7 @@ lbl_802D245C: /* 802D245C 002CF39C 7F 23 CB 78 */ mr r3, r25 /* 802D2460 002CF3A0 38 80 FF E0 */ li r4, -32 /* 802D2464 002CF3A4 7F 45 D3 78 */ mr r5, r26 -/* 802D2468 002CF3A8 4B FF C0 0D */ bl JKRHeap_NS_alloc +/* 802D2468 002CF3A8 4B FF C0 0D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D246C 002CF3AC 7C 77 1B 79 */ or. r23, r3, r3 /* 802D2470 002CF3B0 40 82 00 30 */ bne lbl_802D24A0 /* 802D2474 002CF3B4 28 1D 00 00 */ cmplwi r29, 0 @@ -376,7 +376,7 @@ lbl_802D24A0: /* 802D24C8 002CF408 48 00 13 71 */ bl JKRAramPiece_NS_orderSync /* 802D24CC 002CF40C 7E E3 BB 78 */ mr r3, r23 /* 802D24D0 002CF410 7F 44 D3 78 */ mr r4, r26 -/* 802D24D4 002CF414 4B FF C0 2D */ bl JKRHeap_NS_free +/* 802D24D4 002CF414 4B FF C0 2D */ bl free__7JKRHeapFPvP7JKRHeap /* 802D24D8 002CF418 28 1D 00 00 */ cmplwi r29, 0 /* 802D24DC 002CF41C 40 82 00 0C */ bne lbl_802D24E8 /* 802D24E0 002CF420 38 60 FF FF */ li r3, -1 @@ -508,7 +508,7 @@ lbl_802D2688: /* 802D2690 002CF5D0 7E E3 BB 78 */ mr r3, r23 /* 802D2694 002CF5D4 38 80 00 20 */ li r4, 0x20 /* 802D2698 002CF5D8 7F A5 EB 78 */ mr r5, r29 -/* 802D269C 002CF5DC 4B FF BD D9 */ bl JKRHeap_NS_alloc +/* 802D269C 002CF5DC 4B FF BD D9 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D26A0 002CF5E0 7C 7A 1B 78 */ mr r26, r3 lbl_802D26A4: /* 802D26A4 002CF5E4 28 1A 00 00 */ cmplwi r26, 0 @@ -534,7 +534,7 @@ lbl_802D26E4: /* 802D26EC 002CF62C 7F 63 DB 78 */ mr r3, r27 /* 802D26F0 002CF630 38 80 FF E0 */ li r4, -32 /* 802D26F4 002CF634 7F A5 EB 78 */ mr r5, r29 -/* 802D26F8 002CF638 4B FF BD 7D */ bl JKRHeap_NS_alloc +/* 802D26F8 002CF638 4B FF BD 7D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D26FC 002CF63C 7C 78 1B 79 */ or. r24, r3, r3 /* 802D2700 002CF640 40 82 00 0C */ bne lbl_802D270C /* 802D2704 002CF644 38 60 00 00 */ li r3, 0 @@ -557,7 +557,7 @@ lbl_802D2738: /* 802D2740 002CF680 7E E3 BB 78 */ mr r3, r23 /* 802D2744 002CF684 38 80 00 20 */ li r4, 0x20 /* 802D2748 002CF688 7F A5 EB 78 */ mr r5, r29 -/* 802D274C 002CF68C 4B FF BD 29 */ bl JKRHeap_NS_alloc +/* 802D274C 002CF68C 4B FF BD 29 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D2750 002CF690 7C 79 1B 78 */ mr r25, r3 /* 802D2754 002CF694 48 00 00 08 */ b lbl_802D275C lbl_802D2758: @@ -567,7 +567,7 @@ lbl_802D275C: /* 802D2760 002CF6A0 40 82 00 18 */ bne lbl_802D2778 /* 802D2764 002CF6A4 7F 03 C3 78 */ mr r3, r24 /* 802D2768 002CF6A8 38 80 00 00 */ li r4, 0 -/* 802D276C 002CF6AC 4B FF BD 95 */ bl JKRHeap_NS_free +/* 802D276C 002CF6AC 4B FF BD 95 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D2770 002CF6B0 38 60 00 00 */ li r3, 0 /* 802D2774 002CF6B4 48 00 00 A4 */ b lbl_802D2818 lbl_802D2778: @@ -581,7 +581,7 @@ lbl_802D2778: /* 802D2794 002CF6D4 48 00 91 F5 */ bl JKRDecomp_NS_orderSync /* 802D2798 002CF6D8 7F 03 C3 78 */ mr r3, r24 /* 802D279C 002CF6DC 7F A4 EB 78 */ mr r4, r29 -/* 802D27A0 002CF6E0 4B FF BD 61 */ bl JKRHeap_NS_free +/* 802D27A0 002CF6E0 4B FF BD 61 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D27A4 002CF6E4 28 1F 00 00 */ cmplwi r31, 0 /* 802D27A8 002CF6E8 41 82 00 08 */ beq lbl_802D27B0 /* 802D27AC 002CF6EC 92 FF 00 00 */ stw r23, 0(r31) @@ -594,7 +594,7 @@ lbl_802D27B8: /* 802D27C0 002CF700 7F 63 DB 78 */ mr r3, r27 /* 802D27C4 002CF704 38 80 00 20 */ li r4, 0x20 /* 802D27C8 002CF708 7F A5 EB 78 */ mr r5, r29 -/* 802D27CC 002CF70C 4B FF BC A9 */ bl JKRHeap_NS_alloc +/* 802D27CC 002CF70C 4B FF BC A9 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D27D0 002CF710 7C 7A 1B 78 */ mr r26, r3 lbl_802D27D4: /* 802D27D4 002CF714 28 1A 00 00 */ cmplwi r26, 0 @@ -657,7 +657,7 @@ lbl_802D2884: /* 802D289C 002CF7DC 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D28A0 002CF7E0 7F 24 CB 78 */ mr r4, r25 /* 802D28A4 002CF7E4 38 A0 00 20 */ li r5, 0x20 -/* 802D28A8 002CF7E8 4B FF BC 2D */ bl JKRHeap_NS_alloc_X1_ +/* 802D28A8 002CF7E8 4B FF BC 2D */ bl alloc__7JKRHeapFUli /* 802D28AC 002CF7EC 90 6D 8E 4C */ stw r3, lbl_804513CC-_SDA_BASE_(r13) /* 802D28B0 002CF7F0 7C 03 CA 14 */ add r0, r3, r25 /* 802D28B4 002CF7F4 90 0D 8E 50 */ stw r0, lbl_804513D0-_SDA_BASE_(r13) @@ -666,7 +666,7 @@ lbl_802D2884: /* 802D28C0 002CF800 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D28C4 002CF804 38 80 11 20 */ li r4, 0x1120 /* 802D28C8 002CF808 38 A0 00 00 */ li r5, 0 -/* 802D28CC 002CF80C 4B FF BC 09 */ bl JKRHeap_NS_alloc_X1_ +/* 802D28CC 002CF80C 4B FF BC 09 */ bl alloc__7JKRHeapFUli /* 802D28D0 002CF810 90 6D 8E 54 */ stw r3, lbl_804513D4-_SDA_BASE_(r13) /* 802D28D4 002CF814 38 03 11 20 */ addi r0, r3, 0x1120 /* 802D28D8 002CF818 90 0D 8E 58 */ stw r0, lbl_804513D8-_SDA_BASE_(r13) @@ -704,12 +704,12 @@ lbl_802D2930: /* 802D2944 002CF884 48 00 00 5D */ bl decompSZS_subroutine /* 802D2948 002CF888 80 6D 8E 4C */ lwz r3, lbl_804513CC-_SDA_BASE_(r13) /* 802D294C 002CF88C 38 80 00 00 */ li r4, 0 -/* 802D2950 002CF890 4B FF BB B1 */ bl JKRHeap_NS_free +/* 802D2950 002CF890 4B FF BB B1 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D2954 002CF894 80 6D 8E 54 */ lwz r3, lbl_804513D4-_SDA_BASE_(r13) /* 802D2958 002CF898 28 03 00 00 */ cmplwi r3, 0 /* 802D295C 002CF89C 41 82 00 0C */ beq lbl_802D2968 /* 802D2960 002CF8A0 38 80 00 00 */ li r4, 0 -/* 802D2964 002CF8A4 4B FF BB 9D */ bl JKRHeap_NS_free +/* 802D2964 002CF8A4 4B FF BB 9D */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D2968: /* 802D2968 002CF8A8 7F 63 DB 78 */ mr r3, r27 /* 802D296C 002CF8AC 80 8D 8E 80 */ lwz r4, lbl_80451400-_SDA_BASE_(r13) @@ -1027,7 +1027,7 @@ lbl_802D2D90: /* 802D2DB4 002CFCF4 90 01 00 14 */ stw r0, 0x14(r1) /* 802D2DB8 002CFCF8 3C 60 80 43 */ lis r3, lbl_804342DC@ha /* 802D2DBC 002CFCFC 38 63 42 DC */ addi r3, r3, lbl_804342DC@l -/* 802D2DC0 002CFD00 48 00 91 55 */ bl JSUPtrList_NS_initiate +/* 802D2DC0 002CFD00 48 00 91 55 */ bl initiate__10JSUPtrListFv /* 802D2DC4 002CFD04 3C 60 80 43 */ lis r3, lbl_804342DC@ha /* 802D2DC8 002CFD08 38 63 42 DC */ addi r3, r3, lbl_804342DC@l .global JSUList_NS_dtor_X4_ @@ -1052,11 +1052,11 @@ JSUList_NS_dtor_X4_: /* 802D2E08 002CFD48 7C 9F 23 78 */ mr r31, r4 /* 802D2E0C 002CFD4C 41 82 00 1C */ beq lbl_802D2E28 /* 802D2E10 002CFD50 38 80 00 00 */ li r4, 0 -/* 802D2E14 002CFD54 48 00 90 99 */ bl JSUPtrList_NS_dtor +/* 802D2E14 002CFD54 48 00 90 99 */ bl __dt__10JSUPtrListFv /* 802D2E18 002CFD58 7F E0 07 35 */ extsh. r0, r31 /* 802D2E1C 002CFD5C 40 81 00 0C */ ble lbl_802D2E28 /* 802D2E20 002CFD60 7F C3 F3 78 */ mr r3, r30 -/* 802D2E24 002CFD64 4B FF BF 19 */ bl __dl +/* 802D2E24 002CFD64 4B FF BF 19 */ bl __dl__FPv lbl_802D2E28: /* 802D2E28 002CFD68 7F C3 F3 78 */ mr r3, r30 /* 802D2E2C 002CFD6C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRAramArchive.s b/asm/JKernel/JKRAramArchive.s index 4d2075d24a..daccda3790 100644 --- a/asm/JKernel/JKRAramArchive.s +++ b/asm/JKernel/JKRAramArchive.s @@ -38,7 +38,7 @@ lbl_802D7114: /* 802D7134 002D4074 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D7138 002D4078 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D713C 002D407C 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D7140 002D4080 48 00 4E B1 */ bl JSUPtrList_NS_prepend +/* 802D7140 002D4080 48 00 4E B1 */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D7144 002D4084 38 00 00 01 */ li r0, 1 /* 802D7148 002D4088 98 1D 00 30 */ stb r0, 0x30(r29) /* 802D714C 002D408C 7F A3 EB 78 */ mr r3, r29 @@ -74,7 +74,7 @@ lbl_802D71B8: /* 802D71BC 002D40FC 28 03 00 00 */ cmplwi r3, 0 /* 802D71C0 002D4100 41 82 00 0C */ beq lbl_802D71CC /* 802D71C4 002D4104 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D71C8 002D4108 4B FF 73 39 */ bl JKRHeap_NS_free +/* 802D71C8 002D4108 4B FF 73 39 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D71CC: /* 802D71CC 002D410C 3B BD 00 14 */ addi r29, r29, 0x14 /* 802D71D0 002D4110 3B 9C 00 01 */ addi r28, r28, 1 @@ -84,7 +84,7 @@ lbl_802D71D4: /* 802D71DC 002D411C 7C 1C 00 40 */ cmplw r28, r0 /* 802D71E0 002D4120 41 80 FF D8 */ blt lbl_802D71B8 /* 802D71E4 002D4124 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D71E8 002D4128 4B FF 73 19 */ bl JKRHeap_NS_free +/* 802D71E8 002D4128 4B FF 73 19 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D71EC 002D412C 38 00 00 00 */ li r0, 0 /* 802D71F0 002D4130 90 1E 00 44 */ stw r0, 0x44(r30) lbl_802D71F4: @@ -92,7 +92,7 @@ lbl_802D71F4: /* 802D71F8 002D4138 28 03 00 00 */ cmplwi r3, 0 /* 802D71FC 002D413C 41 82 00 14 */ beq lbl_802D7210 /* 802D7200 002D4140 38 80 00 00 */ li r4, 0 -/* 802D7204 002D4144 4B FF 72 FD */ bl JKRHeap_NS_free +/* 802D7204 002D4144 4B FF 72 FD */ bl free__7JKRHeapFPvP7JKRHeap /* 802D7208 002D4148 38 00 00 00 */ li r0, 0 /* 802D720C 002D414C 90 1E 00 50 */ stw r0, 0x50(r30) lbl_802D7210: @@ -119,7 +119,7 @@ lbl_802D7258: /* 802D7258 002D4198 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D725C 002D419C 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D7260 002D41A0 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D7264 002D41A4 48 00 4E F9 */ bl JSUPtrList_NS_remove +/* 802D7264 002D41A4 48 00 4E F9 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D7268 002D41A8 38 00 00 00 */ li r0, 0 /* 802D726C 002D41AC 98 1E 00 30 */ stb r0, 0x30(r30) lbl_802D7270: @@ -129,7 +129,7 @@ lbl_802D7270: /* 802D727C 002D41BC 7F E0 07 35 */ extsh. r0, r31 /* 802D7280 002D41C0 40 81 00 0C */ ble lbl_802D728C /* 802D7284 002D41C4 7F C3 F3 78 */ mr r3, r30 -/* 802D7288 002D41C8 4B FF 7A B5 */ bl __dl +/* 802D7288 002D41C8 4B FF 7A B5 */ bl __dl__FPv lbl_802D728C: /* 802D728C 002D41CC 7F C3 F3 78 */ mr r3, r30 /* 802D7290 002D41D0 39 61 00 20 */ addi r11, r1, 0x20 @@ -162,7 +162,7 @@ JKRAramArchive_NS_open: /* 802D72F0 002D4230 40 82 00 08 */ bne lbl_802D72F8 /* 802D72F4 002D4234 38 A0 00 04 */ li r5, 4 lbl_802D72F8: -/* 802D72F8 002D4238 4B FF 79 A1 */ bl __nw_X2_ +/* 802D72F8 002D4238 4B FF 79 A1 */ bl __nw__FUlP7JKRHeapi /* 802D72FC 002D423C 7C 60 1B 79 */ or. r0, r3, r3 /* 802D7300 002D4240 41 82 00 10 */ beq lbl_802D7310 /* 802D7304 002D4244 7F 84 E3 78 */ mr r4, r28 @@ -181,7 +181,7 @@ lbl_802D7330: /* 802D7330 002D4270 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D7334 002D4274 38 80 00 20 */ li r4, 0x20 /* 802D7338 002D4278 38 A0 FF E0 */ li r5, -32 -/* 802D733C 002D427C 4B FF 71 99 */ bl JKRHeap_NS_alloc_X1_ +/* 802D733C 002D427C 4B FF 71 99 */ bl alloc__7JKRHeapFUli /* 802D7340 002D4280 7C 7D 1B 79 */ or. r29, r3, r3 /* 802D7344 002D4284 40 82 00 10 */ bne lbl_802D7354 /* 802D7348 002D4288 38 00 00 00 */ li r0, 0 @@ -214,7 +214,7 @@ lbl_802D73A0: /* 802D73AC 002D42EC 7F 63 DB 78 */ mr r3, r27 /* 802D73B0 002D42F0 7F C4 F3 78 */ mr r4, r30 /* 802D73B4 002D42F4 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D73B8 002D42F8 4B FF 70 BD */ bl JKRHeap_NS_alloc +/* 802D73B8 002D42F8 4B FF 70 BD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D73BC 002D42FC 90 7F 00 44 */ stw r3, 0x44(r31) /* 802D73C0 002D4300 80 9F 00 44 */ lwz r4, 0x44(r31) /* 802D73C4 002D4304 28 04 00 00 */ cmplwi r4, 0 @@ -278,14 +278,14 @@ lbl_802D7484: /* 802D749C 002D43DC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 802D74A0 002D43E0 80 03 00 08 */ lwz r0, 8(r3) /* 802D74A4 002D43E4 54 03 10 3A */ slwi r3, r0, 2 -/* 802D74A8 002D43E8 4B FF 6F CD */ bl JKRHeap_NS_alloc +/* 802D74A8 002D43E8 4B FF 6F CD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D74AC 002D43EC 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D74B0 002D43F0 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D74B4 002D43F4 28 03 00 00 */ cmplwi r3, 0 /* 802D74B8 002D43F8 40 82 00 1C */ bne lbl_802D74D4 /* 802D74BC 002D43FC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 802D74C0 002D4400 38 80 00 00 */ li r4, 0 -/* 802D74C4 002D4404 4B FF 70 3D */ bl JKRHeap_NS_free +/* 802D74C4 002D4404 4B FF 70 3D */ bl free__7JKRHeapFPvP7JKRHeap /* 802D74C8 002D4408 38 00 00 00 */ li r0, 0 /* 802D74CC 002D440C 98 1F 00 3C */ stb r0, 0x3c(r31) /* 802D74D0 002D4410 48 00 00 A8 */ b lbl_802D7578 @@ -314,13 +314,13 @@ lbl_802D74E8: /* 802D7524 002D4464 28 03 00 00 */ cmplwi r3, 0 /* 802D7528 002D4468 41 82 00 0C */ beq lbl_802D7534 /* 802D752C 002D446C 38 80 00 00 */ li r4, 0 -/* 802D7530 002D4470 4B FF 6F D1 */ bl JKRHeap_NS_free +/* 802D7530 002D4470 4B FF 6F D1 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D7534: /* 802D7534 002D4474 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D7538 002D4478 28 03 00 00 */ cmplwi r3, 0 /* 802D753C 002D447C 41 82 00 0C */ beq lbl_802D7548 /* 802D7540 002D4480 38 80 00 00 */ li r4, 0 -/* 802D7544 002D4484 4B FF 6F BD */ bl JKRHeap_NS_free +/* 802D7544 002D4484 4B FF 6F BD */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D7548: /* 802D7548 002D4488 38 00 00 00 */ li r0, 0 /* 802D754C 002D448C 98 1F 00 3C */ stb r0, 0x3c(r31) @@ -340,7 +340,7 @@ lbl_802D7578: /* 802D757C 002D44BC 41 82 00 10 */ beq lbl_802D758C /* 802D7580 002D44C0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D7584 002D44C4 7F A4 EB 78 */ mr r4, r29 -/* 802D7588 002D44C8 4B FF 6F C1 */ bl JKRHeap_NS_free_X1_ +/* 802D7588 002D44C8 4B FF 6F C1 */ bl free__7JKRHeapFPv lbl_802D758C: /* 802D758C 002D44CC 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 802D7590 002D44D0 28 00 00 00 */ cmplwi r0, 0 @@ -505,7 +505,7 @@ lbl_802D77C0: /* 802D77C0 002D4700 7F 63 DB 78 */ mr r3, r27 /* 802D77C4 002D4704 80 9D 00 10 */ lwz r4, 0x10(r29) /* 802D77C8 002D4708 7F E5 FB 78 */ mr r5, r31 -/* 802D77CC 002D470C 4B FF 73 4D */ bl JKRHeap_NS_copyMemory +/* 802D77CC 002D470C 4B FF 73 4D */ bl copyMemory__7JKRHeapFPvPvUl lbl_802D77D0: /* 802D77D0 002D4710 28 1E 00 00 */ cmplwi r30, 0 /* 802D77D4 002D4714 41 82 00 08 */ beq lbl_802D77DC @@ -627,7 +627,7 @@ JKRAramArchive_NS_fetchResource_subroutine_X1_: lbl_802D7958: /* 802D7958 002D4898 7F E3 FB 78 */ mr r3, r31 /* 802D795C 002D489C 38 80 00 20 */ li r4, 0x20 -/* 802D7960 002D48A0 4B FF 6B 15 */ bl JKRHeap_NS_alloc +/* 802D7960 002D48A0 4B FF 6B 15 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D7964 002D48A4 7C 7B 1B 78 */ mr r27, r3 /* 802D7968 002D48A8 7F 83 E3 78 */ mr r3, r28 /* 802D796C 002D48AC 7F 64 DB 78 */ mr r4, r27 @@ -665,7 +665,7 @@ lbl_802D7998: /* 802D79E8 002D4928 7F 43 D3 78 */ mr r3, r26 /* 802D79EC 002D492C 38 80 00 20 */ li r4, 0x20 /* 802D79F0 002D4930 7F A5 EB 78 */ mr r5, r29 -/* 802D79F4 002D4934 4B FF 6A 81 */ bl JKRHeap_NS_alloc +/* 802D79F4 002D4934 4B FF 6A 81 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D79F8 002D4938 7C 7B 1B 78 */ mr r27, r3 /* 802D79FC 002D493C 7F 83 E3 78 */ mr r3, r28 /* 802D7A00 002D4940 7F 64 DB 78 */ mr r4, r27 @@ -787,11 +787,11 @@ lbl_802D7B78: /* 802D7BB4 002D4AF4 38 04 C3 28 */ addi r0, r4, lbl_803CC328@l /* 802D7BB8 002D4AF8 90 1E 00 00 */ stw r0, 0(r30) /* 802D7BBC 002D4AFC 38 80 00 00 */ li r4, 0 -/* 802D7BC0 002D4B00 4B FF 99 25 */ bl JKRDisposer_NS_dtor +/* 802D7BC0 002D4B00 4B FF 99 25 */ bl __dt__11JKRDisposerFv /* 802D7BC4 002D4B04 7F E0 07 35 */ extsh. r0, r31 /* 802D7BC8 002D4B08 40 81 00 0C */ ble lbl_802D7BD4 /* 802D7BCC 002D4B0C 7F C3 F3 78 */ mr r3, r30 -/* 802D7BD0 002D4B10 4B FF 71 6D */ bl __dl +/* 802D7BD0 002D4B10 4B FF 71 6D */ bl __dl__FPv lbl_802D7BD4: /* 802D7BD4 002D4B14 7F C3 F3 78 */ mr r3, r30 /* 802D7BD8 002D4B18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRAramBlock.s b/asm/JKernel/JKRAramBlock.s index a791ea1803..186cd56b0e 100644 --- a/asm/JKernel/JKRAramBlock.s +++ b/asm/JKernel/JKRAramBlock.s @@ -21,7 +21,7 @@ JKRAramBlock: /* 802D3338 002D0278 90 1A 00 00 */ stw r0, 0(r26) /* 802D333C 002D027C 38 7A 00 04 */ addi r3, r26, 4 /* 802D3340 002D0280 7F 44 D3 78 */ mr r4, r26 -/* 802D3344 002D0284 48 00 8A B9 */ bl JSUPtrLink +/* 802D3344 002D0284 48 00 8A B9 */ bl __ct__10JSUPtrLinkFPv /* 802D3348 002D0288 93 7A 00 14 */ stw r27, 0x14(r26) /* 802D334C 002D028C 93 9A 00 18 */ stw r28, 0x18(r26) /* 802D3350 002D0290 93 BA 00 1C */ stw r29, 0x1c(r26) @@ -57,7 +57,7 @@ JKRAramBlock: /* 802D33C8 002D0308 7C 04 02 14 */ add r0, r4, r0 /* 802D33CC 002D030C 90 06 00 1C */ stw r0, 0x1c(r6) /* 802D33D0 002D0310 38 9E 00 04 */ addi r4, r30, 4 -/* 802D33D4 002D0314 48 00 8D 89 */ bl JSUPtrList_NS_remove +/* 802D33D4 002D0314 48 00 8D 89 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D33D8 002D0318 48 00 00 1C */ b lbl_802D33F4 lbl_802D33DC: /* 802D33DC 002D031C 80 7E 00 1C */ lwz r3, 0x1c(r30) @@ -71,12 +71,12 @@ lbl_802D33F4: /* 802D33F8 002D0338 41 82 00 10 */ beq lbl_802D3408 /* 802D33FC 002D033C 38 7E 00 04 */ addi r3, r30, 4 /* 802D3400 002D0340 38 80 00 00 */ li r4, 0 -/* 802D3404 002D0344 48 00 8A 11 */ bl JSUPtrLink_NS_dtor +/* 802D3404 002D0344 48 00 8A 11 */ bl __dt__10JSUPtrLinkFv lbl_802D3408: /* 802D3408 002D0348 7F E0 07 35 */ extsh. r0, r31 /* 802D340C 002D034C 40 81 00 0C */ ble lbl_802D3418 /* 802D3410 002D0350 7F C3 F3 78 */ mr r3, r30 -/* 802D3414 002D0354 4B FF B9 29 */ bl __dl +/* 802D3414 002D0354 4B FF B9 29 */ bl __dl__FPv lbl_802D3418: /* 802D3418 002D0358 7F C3 F3 78 */ mr r3, r30 /* 802D341C 002D035C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -104,7 +104,7 @@ JKRAramBlock_NS_allocHead: /* 802D3468 002D03A8 38 60 00 24 */ li r3, 0x24 /* 802D346C 002D03AC 80 86 00 30 */ lwz r4, 0x30(r6) /* 802D3470 002D03B0 38 A0 00 00 */ li r5, 0 -/* 802D3474 002D03B4 4B FF B8 25 */ bl __nw_X2_ +/* 802D3474 002D03B4 4B FF B8 25 */ bl __nw__FUlP7JKRHeapi /* 802D3478 002D03B8 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D347C 002D03BC 41 82 00 20 */ beq lbl_802D349C /* 802D3480 002D03C0 7F C4 F3 78 */ mr r4, r30 @@ -120,7 +120,7 @@ lbl_802D349C: /* 802D34A4 002D03E4 80 9A 00 10 */ lwz r4, 0x10(r26) /* 802D34A8 002D03E8 80 7A 00 08 */ lwz r3, 8(r26) /* 802D34AC 002D03EC 38 BF 00 04 */ addi r5, r31, 4 -/* 802D34B0 002D03F0 48 00 8B E5 */ bl JSUPtrList_NS_insert +/* 802D34B0 002D03F0 48 00 8B E5 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink /* 802D34B4 002D03F4 7F E3 FB 78 */ mr r3, r31 /* 802D34B8 002D03F8 39 61 00 20 */ addi r11, r1, 0x20 /* 802D34BC 002D03FC 48 08 ED 61 */ bl func_8036221C @@ -148,7 +148,7 @@ JKRAramBlock_NS_allocTail: /* 802D3508 002D0448 38 60 00 24 */ li r3, 0x24 /* 802D350C 002D044C 80 86 00 30 */ lwz r4, 0x30(r6) /* 802D3510 002D0450 38 A0 00 00 */ li r5, 0 -/* 802D3514 002D0454 4B FF B7 85 */ bl __nw_X2_ +/* 802D3514 002D0454 4B FF B7 85 */ bl __nw__FUlP7JKRHeapi /* 802D3518 002D0458 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D351C 002D045C 41 82 00 20 */ beq lbl_802D353C /* 802D3520 002D0460 7F C4 F3 78 */ mr r4, r30 @@ -165,7 +165,7 @@ lbl_802D353C: /* 802D3548 002D0488 80 9B 00 10 */ lwz r4, 0x10(r27) /* 802D354C 002D048C 80 7B 00 08 */ lwz r3, 8(r27) /* 802D3550 002D0490 38 BF 00 04 */ addi r5, r31, 4 -/* 802D3554 002D0494 48 00 8B 41 */ bl JSUPtrList_NS_insert +/* 802D3554 002D0494 48 00 8B 41 */ bl insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink /* 802D3558 002D0498 7F E3 FB 78 */ mr r3, r31 /* 802D355C 002D049C 39 61 00 20 */ addi r11, r1, 0x20 /* 802D3560 002D04A0 48 08 EC C1 */ bl _restgpr_27 diff --git a/asm/JKernel/JKRAramHeap.s b/asm/JKernel/JKRAramHeap.s index a63184c38a..d10ce69f7f 100644 --- a/asm/JKernel/JKRAramHeap.s +++ b/asm/JKernel/JKRAramHeap.s @@ -13,14 +13,14 @@ JKRAramHeap: /* 802D2E58 002CFD98 7C 7D 1B 78 */ mr r29, r3 /* 802D2E5C 002CFD9C 7C 9E 23 78 */ mr r30, r4 /* 802D2E60 002CFDA0 7C BF 2B 78 */ mr r31, r5 -/* 802D2E64 002CFDA4 4B FF E6 19 */ bl JKRDisposer +/* 802D2E64 002CFDA4 4B FF E6 19 */ bl __ct__11JKRDisposerFv /* 802D2E68 002CFDA8 3C 60 80 3D */ lis r3, lbl_803CC168@ha /* 802D2E6C 002CFDAC 38 03 C1 68 */ addi r0, r3, lbl_803CC168@l /* 802D2E70 002CFDB0 90 1D 00 00 */ stw r0, 0(r29) /* 802D2E74 002CFDB4 38 7D 00 18 */ addi r3, r29, 0x18 /* 802D2E78 002CFDB8 48 06 C1 91 */ bl OSInitMutex /* 802D2E7C 002CFDBC 7F A3 EB 78 */ mr r3, r29 -/* 802D2E80 002CFDC0 4B FF B9 BD */ bl JKRHeap_NS_findFromRoot +/* 802D2E80 002CFDC0 4B FF B9 BD */ bl findFromRoot__7JKRHeapFPv /* 802D2E84 002CFDC4 90 7D 00 30 */ stw r3, 0x30(r29) /* 802D2E88 002CFDC8 57 E0 00 34 */ rlwinm r0, r31, 0, 0, 0x1a /* 802D2E8C 002CFDCC 90 1D 00 3C */ stw r0, 0x3c(r29) @@ -36,7 +36,7 @@ JKRAramHeap: /* 802D2EB4 002CFDF4 38 60 00 24 */ li r3, 0x24 /* 802D2EB8 002CFDF8 80 9D 00 30 */ lwz r4, 0x30(r29) /* 802D2EBC 002CFDFC 38 A0 00 00 */ li r5, 0 -/* 802D2EC0 002CFE00 4B FF BD D9 */ bl __nw_X2_ +/* 802D2EC0 002CFE00 4B FF BD D9 */ bl __nw__FUlP7JKRHeapi /* 802D2EC4 002CFE04 7C 64 1B 79 */ or. r4, r3, r3 /* 802D2EC8 002CFE08 41 82 00 20 */ beq lbl_802D2EE8 /* 802D2ECC 002CFE0C 80 9D 00 34 */ lwz r4, 0x34(r29) @@ -50,7 +50,7 @@ lbl_802D2EE8: /* 802D2EE8 002CFE28 3C 60 80 43 */ lis r3, lbl_8043430C@ha /* 802D2EEC 002CFE2C 38 63 43 0C */ addi r3, r3, lbl_8043430C@l /* 802D2EF0 002CFE30 38 84 00 04 */ addi r4, r4, 4 -/* 802D2EF4 002CFE34 48 00 90 59 */ bl JSUPtrList_NS_append +/* 802D2EF4 002CFE34 48 00 90 59 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802D2EF8 002CFE38 7F A3 EB 78 */ mr r3, r29 /* 802D2EFC 002CFE3C 39 61 00 20 */ addi r11, r1, 0x20 /* 802D2F00 002CFE40 48 08 F3 29 */ bl _restgpr_29 @@ -90,11 +90,11 @@ lbl_802D2F7C: /* 802D2F80 002CFEC0 40 82 FF CC */ bne lbl_802D2F4C /* 802D2F84 002CFEC4 7F A3 EB 78 */ mr r3, r29 /* 802D2F88 002CFEC8 38 80 00 00 */ li r4, 0 -/* 802D2F8C 002CFECC 4B FF E5 59 */ bl JKRDisposer_NS_dtor +/* 802D2F8C 002CFECC 4B FF E5 59 */ bl __dt__11JKRDisposerFv /* 802D2F90 002CFED0 7F C0 07 35 */ extsh. r0, r30 /* 802D2F94 002CFED4 40 81 00 0C */ ble lbl_802D2FA0 /* 802D2F98 002CFED8 7F A3 EB 78 */ mr r3, r29 -/* 802D2F9C 002CFEDC 4B FF BD A1 */ bl __dl +/* 802D2F9C 002CFEDC 4B FF BD A1 */ bl __dl__FPv lbl_802D2FA0: /* 802D2FA0 002CFEE0 7F A3 EB 78 */ mr r3, r29 /* 802D2FA4 002CFEE4 39 61 00 20 */ addi r11, r1, 0x20 @@ -319,7 +319,7 @@ lbl_802D3248: /* 802D3274 002D01B4 90 01 00 14 */ stw r0, 0x14(r1) /* 802D3278 002D01B8 3C 60 80 43 */ lis r3, lbl_8043430C@ha /* 802D327C 002D01BC 38 63 43 0C */ addi r3, r3, lbl_8043430C@l -/* 802D3280 002D01C0 48 00 8C 95 */ bl JSUPtrList_NS_initiate +/* 802D3280 002D01C0 48 00 8C 95 */ bl initiate__10JSUPtrListFv /* 802D3284 002D01C4 3C 60 80 43 */ lis r3, lbl_8043430C@ha /* 802D3288 002D01C8 38 63 43 0C */ addi r3, r3, lbl_8043430C@l .global JSUList_NS_dtor_X5_ @@ -344,11 +344,11 @@ JSUList_NS_dtor_X5_: /* 802D32C8 002D0208 7C 9F 23 78 */ mr r31, r4 /* 802D32CC 002D020C 41 82 00 1C */ beq lbl_802D32E8 /* 802D32D0 002D0210 38 80 00 00 */ li r4, 0 -/* 802D32D4 002D0214 48 00 8B D9 */ bl JSUPtrList_NS_dtor +/* 802D32D4 002D0214 48 00 8B D9 */ bl __dt__10JSUPtrListFv /* 802D32D8 002D0218 7F E0 07 35 */ extsh. r0, r31 /* 802D32DC 002D021C 40 81 00 0C */ ble lbl_802D32E8 /* 802D32E0 002D0220 7F C3 F3 78 */ mr r3, r30 -/* 802D32E4 002D0224 4B FF BA 59 */ bl __dl +/* 802D32E4 002D0224 4B FF BA 59 */ bl __dl__FPv lbl_802D32E8: /* 802D32E8 002D0228 7F C3 F3 78 */ mr r3, r30 /* 802D32EC 002D022C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRAramPiece.s b/asm/JKernel/JKRAramPiece.s index 9f81694b9a..fe49936da1 100644 --- a/asm/JKernel/JKRAramPiece.s +++ b/asm/JKernel/JKRAramPiece.s @@ -19,7 +19,7 @@ JKRAramPiece_NS_prepareCommand: /* 802D35A0 002D04E0 38 60 00 98 */ li r3, 0x98 /* 802D35A4 002D04E4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D35A8 002D04E8 38 A0 FF FC */ li r5, -4 -/* 802D35AC 002D04EC 4B FF B6 ED */ bl __nw_X2_ +/* 802D35AC 002D04EC 4B FF B6 ED */ bl __nw__FUlP7JKRHeapi /* 802D35B0 002D04F0 7C 64 1B 79 */ or. r4, r3, r3 /* 802D35B4 002D04F4 41 82 00 0C */ beq lbl_802D35C0 /* 802D35B8 002D04F8 48 00 04 35 */ bl JKRAMCommand @@ -106,7 +106,7 @@ lbl_802D36D8: /* 802D36D8 002D0618 38 60 00 08 */ li r3, 8 /* 802D36DC 002D061C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D36E0 002D0620 38 A0 FF FC */ li r5, -4 -/* 802D36E4 002D0624 4B FF B5 B5 */ bl __nw_X2_ +/* 802D36E4 002D0624 4B FF B5 B5 */ bl __nw__FUlP7JKRHeapi /* 802D36E8 002D0628 7C 79 1B 78 */ mr r25, r3 /* 802D36EC 002D062C 7F 43 D3 78 */ mr r3, r26 /* 802D36F0 002D0630 7F 64 DB 78 */ mr r4, r27 @@ -130,7 +130,7 @@ lbl_802D36D8: /* 802D3738 002D0678 3C 60 80 43 */ lis r3, lbl_80434324@ha /* 802D373C 002D067C 38 63 43 24 */ addi r3, r3, lbl_80434324@l /* 802D3740 002D0680 38 9A 00 20 */ addi r4, r26, 0x20 -/* 802D3744 002D0684 48 00 88 09 */ bl JSUPtrList_NS_append +/* 802D3744 002D0684 48 00 88 09 */ bl append__10JSUPtrListFP10JSUPtrLink lbl_802D3748: /* 802D3748 002D0688 3C 60 80 43 */ lis r3, lbl_80434330@ha /* 802D374C 002D068C 38 63 43 30 */ addi r3, r3, lbl_80434330@l @@ -164,7 +164,7 @@ JKRAramPiece_NS_sync: /* 802D37B0 002D06F0 3C 60 80 43 */ lis r3, lbl_80434324@ha /* 802D37B4 002D06F4 38 63 43 24 */ addi r3, r3, lbl_80434324@l /* 802D37B8 002D06F8 38 9E 00 20 */ addi r4, r30, 0x20 -/* 802D37BC 002D06FC 48 00 89 A1 */ bl JSUPtrList_NS_remove +/* 802D37BC 002D06FC 48 00 89 A1 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D37C0 002D0700 3C 60 80 43 */ lis r3, lbl_80434330@ha /* 802D37C4 002D0704 38 63 43 30 */ addi r3, r3, lbl_80434330@l /* 802D37C8 002D0708 48 06 B9 55 */ bl OSUnlockMutex @@ -186,7 +186,7 @@ lbl_802D3800: /* 802D3800 002D0740 3C 60 80 43 */ lis r3, lbl_80434324@ha /* 802D3804 002D0744 38 63 43 24 */ addi r3, r3, lbl_80434324@l /* 802D3808 002D0748 38 9E 00 20 */ addi r4, r30, 0x20 -/* 802D380C 002D074C 48 00 89 51 */ bl JSUPtrList_NS_remove +/* 802D380C 002D074C 48 00 89 51 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D3810 002D0750 3C 60 80 43 */ lis r3, lbl_80434330@ha /* 802D3814 002D0754 38 63 43 30 */ addi r3, r3, lbl_80434330@l /* 802D3818 002D0758 48 06 B9 05 */ bl OSUnlockMutex @@ -334,10 +334,10 @@ JKRAMCommand: /* 802D39FC 002D093C 7C 7F 1B 78 */ mr r31, r3 /* 802D3A00 002D0940 7F E4 FB 78 */ mr r4, r31 /* 802D3A04 002D0944 38 64 00 20 */ addi r3, r4, 0x20 -/* 802D3A08 002D0948 48 00 83 F5 */ bl JSUPtrLink +/* 802D3A08 002D0948 48 00 83 F5 */ bl __ct__10JSUPtrLinkFPv /* 802D3A0C 002D094C 38 7F 00 30 */ addi r3, r31, 0x30 /* 802D3A10 002D0950 7F E4 FB 78 */ mr r4, r31 -/* 802D3A14 002D0954 48 00 83 E9 */ bl JSUPtrLink +/* 802D3A14 002D0954 48 00 83 E9 */ bl __ct__10JSUPtrLinkFPv /* 802D3A18 002D0958 38 7F 00 68 */ addi r3, r31, 0x68 /* 802D3A1C 002D095C 38 9F 00 88 */ addi r4, r31, 0x88 /* 802D3A20 002D0960 38 A0 00 01 */ li r5, 1 @@ -369,35 +369,35 @@ JKRAMCommand_NS_dtor: /* 802D3A7C 002D09BC 80 7E 00 8C */ lwz r3, 0x8c(r30) /* 802D3A80 002D09C0 28 03 00 00 */ cmplwi r3, 0 /* 802D3A84 002D09C4 41 82 00 08 */ beq lbl_802D3A8C -/* 802D3A88 002D09C8 4B FF B2 B5 */ bl __dl +/* 802D3A88 002D09C8 4B FF B2 B5 */ bl __dl__FPv lbl_802D3A8C: /* 802D3A8C 002D09CC 80 7E 00 90 */ lwz r3, 0x90(r30) /* 802D3A90 002D09D0 28 03 00 00 */ cmplwi r3, 0 /* 802D3A94 002D09D4 41 82 00 08 */ beq lbl_802D3A9C -/* 802D3A98 002D09D8 4B FF B2 A5 */ bl __dl +/* 802D3A98 002D09D8 4B FF B2 A5 */ bl __dl__FPv lbl_802D3A9C: /* 802D3A9C 002D09DC 80 7E 00 94 */ lwz r3, 0x94(r30) /* 802D3AA0 002D09E0 28 03 00 00 */ cmplwi r3, 0 /* 802D3AA4 002D09E4 41 82 00 0C */ beq lbl_802D3AB0 /* 802D3AA8 002D09E8 38 80 00 00 */ li r4, 0 -/* 802D3AAC 002D09EC 4B FF AA 55 */ bl JKRHeap_NS_free +/* 802D3AAC 002D09EC 4B FF AA 55 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D3AB0: /* 802D3AB0 002D09F0 34 1E 00 30 */ addic. r0, r30, 0x30 /* 802D3AB4 002D09F4 41 82 00 10 */ beq lbl_802D3AC4 /* 802D3AB8 002D09F8 38 7E 00 30 */ addi r3, r30, 0x30 /* 802D3ABC 002D09FC 38 80 00 00 */ li r4, 0 -/* 802D3AC0 002D0A00 48 00 83 55 */ bl JSUPtrLink_NS_dtor +/* 802D3AC0 002D0A00 48 00 83 55 */ bl __dt__10JSUPtrLinkFv lbl_802D3AC4: /* 802D3AC4 002D0A04 34 1E 00 20 */ addic. r0, r30, 0x20 /* 802D3AC8 002D0A08 41 82 00 10 */ beq lbl_802D3AD8 /* 802D3ACC 002D0A0C 38 7E 00 20 */ addi r3, r30, 0x20 /* 802D3AD0 002D0A10 38 80 00 00 */ li r4, 0 -/* 802D3AD4 002D0A14 48 00 83 41 */ bl JSUPtrLink_NS_dtor +/* 802D3AD4 002D0A14 48 00 83 41 */ bl __dt__10JSUPtrLinkFv lbl_802D3AD8: /* 802D3AD8 002D0A18 7F E0 07 35 */ extsh. r0, r31 /* 802D3ADC 002D0A1C 40 81 00 0C */ ble lbl_802D3AE8 /* 802D3AE0 002D0A20 7F C3 F3 78 */ mr r3, r30 -/* 802D3AE4 002D0A24 4B FF B2 59 */ bl __dl +/* 802D3AE4 002D0A24 4B FF B2 59 */ bl __dl__FPv lbl_802D3AE8: /* 802D3AE8 002D0A28 7F C3 F3 78 */ mr r3, r30 /* 802D3AEC 002D0A2C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -411,7 +411,7 @@ lbl_802D3AE8: /* 802D3B0C 002D0A4C 90 01 00 14 */ stw r0, 0x14(r1) /* 802D3B10 002D0A50 3C 60 80 43 */ lis r3, lbl_80434324@ha /* 802D3B14 002D0A54 38 63 43 24 */ addi r3, r3, lbl_80434324@l -/* 802D3B18 002D0A58 48 00 83 FD */ bl JSUPtrList_NS_initiate +/* 802D3B18 002D0A58 48 00 83 FD */ bl initiate__10JSUPtrListFv /* 802D3B1C 002D0A5C 3C 60 80 43 */ lis r3, lbl_80434324@ha /* 802D3B20 002D0A60 38 63 43 24 */ addi r3, r3, lbl_80434324@l .global JSUList_NS_dtor_X4_ diff --git a/asm/JKernel/JKRAramStream.s b/asm/JKernel/JKRAramStream.s index 592d7e3d0c..53cb20d771 100644 --- a/asm/JKernel/JKRAramStream.s +++ b/asm/JKernel/JKRAramStream.s @@ -16,7 +16,7 @@ JKRAramStream_NS_create: /* 802D3B68 002D0AA8 38 60 00 7C */ li r3, 0x7c /* 802D3B6C 002D0AAC 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D3B70 002D0AB0 38 A0 00 00 */ li r5, 0 -/* 802D3B74 002D0AB4 4B FF B1 25 */ bl __nw_X2_ +/* 802D3B74 002D0AB4 4B FF B1 25 */ bl __nw__FUlP7JKRHeapi /* 802D3B78 002D0AB8 7C 60 1B 79 */ or. r0, r3, r3 /* 802D3B7C 002D0ABC 41 82 00 10 */ beq lbl_802D3B8C /* 802D3B80 002D0AC0 7F E4 FB 78 */ mr r4, r31 @@ -74,7 +74,7 @@ JKRAramStream: /* 802D3C3C 002D0B7C 7F E0 07 35 */ extsh. r0, r31 /* 802D3C40 002D0B80 40 81 00 0C */ ble lbl_802D3C4C /* 802D3C44 002D0B84 7F C3 F3 78 */ mr r3, r30 -/* 802D3C48 002D0B88 4B FF B0 F5 */ bl __dl +/* 802D3C48 002D0B88 4B FF B0 F5 */ bl __dl__FPv lbl_802D3C4C: /* 802D3C4C 002D0B8C 7F C3 F3 78 */ mr r3, r30 /* 802D3C50 002D0B90 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -159,7 +159,7 @@ lbl_802D3D54: /* 802D3D5C 002D0C9C 7F E3 FB 78 */ mr r3, r31 /* 802D3D60 002D0CA0 38 80 FF E0 */ li r4, -32 /* 802D3D64 002D0CA4 7F 25 CB 78 */ mr r5, r25 -/* 802D3D68 002D0CA8 4B FF A7 0D */ bl JKRHeap_NS_alloc +/* 802D3D68 002D0CA8 4B FF A7 0D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D3D6C 002D0CAC 7C 7A 1B 78 */ mr r26, r3 /* 802D3D70 002D0CB0 93 58 00 1C */ stw r26, 0x1c(r24) /* 802D3D74 002D0CB4 48 00 00 1C */ b lbl_802D3D90 @@ -167,7 +167,7 @@ lbl_802D3D78: /* 802D3D78 002D0CB8 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D3D7C 002D0CBC 7F E4 FB 78 */ mr r4, r31 /* 802D3D80 002D0CC0 38 A0 FF E0 */ li r5, -32 -/* 802D3D84 002D0CC4 4B FF A7 51 */ bl JKRHeap_NS_alloc_X1_ +/* 802D3D84 002D0CC4 4B FF A7 51 */ bl alloc__7JKRHeapFUli /* 802D3D88 002D0CC8 7C 7A 1B 78 */ mr r26, r3 /* 802D3D8C 002D0CCC 93 58 00 1C */ stw r26, 0x1c(r24) lbl_802D3D90: @@ -246,7 +246,7 @@ lbl_802D3E84: /* 802D3E8C 002D0DCC 41 82 00 18 */ beq lbl_802D3EA4 /* 802D3E90 002D0DD0 7F 43 D3 78 */ mr r3, r26 /* 802D3E94 002D0DD4 38 80 00 00 */ li r4, 0 -/* 802D3E98 002D0DD8 4B FF A6 69 */ bl JKRHeap_NS_free +/* 802D3E98 002D0DD8 4B FF A6 69 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D3E9C 002D0DDC 38 00 00 00 */ li r0, 0 /* 802D3EA0 002D0DE0 98 18 00 28 */ stb r0, 0x28(r24) lbl_802D3EA4: @@ -277,7 +277,7 @@ JKRAramStream_NS_write_StreamToAram_Async: /* 802D3EF8 002D0E38 38 60 00 5C */ li r3, 0x5c /* 802D3EFC 002D0E3C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D3F00 002D0E40 38 A0 FF FC */ li r5, -4 -/* 802D3F04 002D0E44 4B FF AD 95 */ bl __nw_X2_ +/* 802D3F04 002D0E44 4B FF AD 95 */ bl __nw__FUlP7JKRHeapi /* 802D3F08 002D0E48 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D3F0C 002D0E4C 41 82 00 0C */ beq lbl_802D3F18 /* 802D3F10 002D0E50 48 00 01 79 */ bl JKRAramStreamCommand diff --git a/asm/JKernel/JKRArchivePri.s b/asm/JKernel/JKRArchivePri.s index d2a2a68c1a..cc36f82e8e 100644 --- a/asm/JKernel/JKRArchivePri.s +++ b/asm/JKernel/JKRArchivePri.s @@ -24,7 +24,7 @@ JKRArchive: /* 802D62D4 002D3214 90 1D 00 34 */ stw r0, 0x34(r29) /* 802D62D8 002D3218 90 1D 00 58 */ stw r0, 0x58(r29) /* 802D62DC 002D321C 7F A3 EB 78 */ mr r3, r29 -/* 802D62E0 002D3220 4B FF 85 5D */ bl JKRHeap_NS_findFromRoot +/* 802D62E0 002D3220 4B FF 85 5D */ bl findFromRoot__7JKRHeapFPv /* 802D62E4 002D3224 90 7D 00 38 */ stw r3, 0x38(r29) /* 802D62E8 002D3228 80 1D 00 38 */ lwz r0, 0x38(r29) /* 802D62EC 002D322C 28 00 00 00 */ cmplwi r0, 0 @@ -66,7 +66,7 @@ JKRArchive_NS_dtor: /* 802D6368 002D32A8 7F E0 07 35 */ extsh. r0, r31 /* 802D636C 002D32AC 40 81 00 0C */ ble lbl_802D6378 /* 802D6370 002D32B0 7F C3 F3 78 */ mr r3, r30 -/* 802D6374 002D32B4 4B FF 89 C9 */ bl __dl +/* 802D6374 002D32B4 4B FF 89 C9 */ bl __dl__FPv lbl_802D6378: /* 802D6378 002D32B8 7F C3 F3 78 */ mr r3, r30 /* 802D637C 002D32BC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRArchivePub.s b/asm/JKernel/JKRArchivePub.s index 4e0c4576a4..0d8b61fbf9 100644 --- a/asm/JKernel/JKRArchivePub.s +++ b/asm/JKernel/JKRArchivePub.s @@ -87,7 +87,7 @@ lbl_802D5870: /* 802D5880 002D27C0 40 82 00 08 */ bne lbl_802D5888 /* 802D5884 002D27C4 38 A0 00 04 */ li r5, 4 lbl_802D5888: -/* 802D5888 002D27C8 4B FF 94 11 */ bl __nw_X2_ +/* 802D5888 002D27C8 4B FF 94 11 */ bl __nw__FUlP7JKRHeapi /* 802D588C 002D27CC 7C 60 1B 79 */ or. r0, r3, r3 /* 802D5890 002D27D0 41 82 00 1C */ beq lbl_802D58AC /* 802D5894 002D27D4 7F A4 EB 78 */ mr r4, r29 @@ -142,7 +142,7 @@ lbl_802D592C: lbl_802D5938: /* 802D5938 002D2878 38 60 00 70 */ li r3, 0x70 /* 802D593C 002D287C 7F A4 EB 78 */ mr r4, r29 -/* 802D5940 002D2880 4B FF 93 59 */ bl __nw_X2_ +/* 802D5940 002D2880 4B FF 93 59 */ bl __nw__FUlP7JKRHeapi /* 802D5944 002D2884 7C 60 1B 79 */ or. r0, r3, r3 /* 802D5948 002D2888 41 82 00 14 */ beq lbl_802D595C /* 802D594C 002D288C 7F 64 DB 78 */ mr r4, r27 @@ -155,7 +155,7 @@ lbl_802D595C: lbl_802D5964: /* 802D5964 002D28A4 38 60 00 6C */ li r3, 0x6c /* 802D5968 002D28A8 7F A4 EB 78 */ mr r4, r29 -/* 802D596C 002D28AC 4B FF 93 2D */ bl __nw_X2_ +/* 802D596C 002D28AC 4B FF 93 2D */ bl __nw__FUlP7JKRHeapi /* 802D5970 002D28B0 7C 60 1B 79 */ or. r0, r3, r3 /* 802D5974 002D28B4 41 82 00 14 */ beq lbl_802D5988 /* 802D5978 002D28B8 7F 64 DB 78 */ mr r4, r27 @@ -168,7 +168,7 @@ lbl_802D5988: lbl_802D5990: /* 802D5990 002D28D0 38 60 00 6C */ li r3, 0x6c /* 802D5994 002D28D4 7F A4 EB 78 */ mr r4, r29 -/* 802D5998 002D28D8 4B FF 93 01 */ bl __nw_X2_ +/* 802D5998 002D28D8 4B FF 93 01 */ bl __nw__FUlP7JKRHeapi /* 802D599C 002D28DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802D59A0 002D28E0 41 82 00 14 */ beq lbl_802D59B4 /* 802D59A4 002D28E4 7F 64 DB 78 */ mr r4, r27 @@ -181,7 +181,7 @@ lbl_802D59B4: lbl_802D59BC: /* 802D59BC 002D28FC 38 60 00 80 */ li r3, 0x80 /* 802D59C0 002D2900 7F A4 EB 78 */ mr r4, r29 -/* 802D59C4 002D2904 4B FF 92 D5 */ bl __nw_X2_ +/* 802D59C4 002D2904 4B FF 92 D5 */ bl __nw__FUlP7JKRHeapi /* 802D59C8 002D2908 7C 60 1B 79 */ or. r0, r3, r3 /* 802D59CC 002D290C 41 82 00 14 */ beq lbl_802D59E0 /* 802D59D0 002D2910 7F 64 DB 78 */ mr r4, r27 @@ -643,7 +643,7 @@ lbl_802D5FF4: /* 802D5FF8 002D2F38 28 03 00 00 */ cmplwi r3, 0 /* 802D5FFC 002D2F3C 41 82 00 10 */ beq lbl_802D600C /* 802D6000 002D2F40 80 9C 00 38 */ lwz r4, 0x38(r28) -/* 802D6004 002D2F44 4B FF 84 FD */ bl JKRHeap_NS_free +/* 802D6004 002D2F44 4B FF 84 FD */ bl free__7JKRHeapFPvP7JKRHeap /* 802D6008 002D2F48 93 FE 00 10 */ stw r31, 0x10(r30) lbl_802D600C: /* 802D600C 002D2F4C 3B DE 00 14 */ addi r30, r30, 0x14 @@ -677,7 +677,7 @@ lbl_802D606C: /* 802D6070 002D2FB0 90 03 00 10 */ stw r0, 0x10(r3) /* 802D6074 002D2FB4 7F E3 FB 78 */ mr r3, r31 /* 802D6078 002D2FB8 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D607C 002D2FBC 4B FF 84 85 */ bl JKRHeap_NS_free +/* 802D607C 002D2FBC 4B FF 84 85 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D6080 002D2FC0 38 60 00 01 */ li r3, 1 lbl_802D6084: /* 802D6084 002D2FC4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -799,7 +799,7 @@ lbl_802D6204: /* 802D620C 002D314C 38 60 00 24 */ li r3, 0x24 /* 802D6210 002D3150 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D6214 002D3154 38 A0 00 00 */ li r5, 0 -/* 802D6218 002D3158 4B FF 8A 81 */ bl __nw_X2_ +/* 802D6218 002D3158 4B FF 8A 81 */ bl __nw__FUlP7JKRHeapi /* 802D621C 002D315C 7C 60 1B 79 */ or. r0, r3, r3 /* 802D6220 002D3160 41 82 00 18 */ beq lbl_802D6238 /* 802D6224 002D3164 7F C4 F3 78 */ mr r4, r30 diff --git a/asm/JKernel/JKRAssertHeap.s b/asm/JKernel/JKRAssertHeap.s index e3851f2c21..aeb6667ade 100644 --- a/asm/JKernel/JKRAssertHeap.s +++ b/asm/JKernel/JKRAssertHeap.s @@ -10,7 +10,7 @@ JKRAssertHeap: /* 802D12CC 002CE20C 90 01 00 14 */ stw r0, 0x14(r1) /* 802D12D0 002CE210 93 E1 00 0C */ stw r31, 0xc(r1) /* 802D12D4 002CE214 7C 7F 1B 78 */ mr r31, r3 -/* 802D12D8 002CE218 4B FF CE 61 */ bl JKRHeap +/* 802D12D8 002CE218 4B FF CE 61 */ bl __ct__7JKRHeapFPvUlP7JKRHeapb /* 802D12DC 002CE21C 3C 60 80 3D */ lis r3, lbl_803CC090@ha /* 802D12E0 002CE220 38 03 C0 90 */ addi r0, r3, lbl_803CC090@l /* 802D12E4 002CE224 90 1F 00 00 */ stw r0, 0(r31) @@ -31,14 +31,14 @@ JKRAssertHeap: /* 802D1320 002CE260 3C 80 80 3D */ lis r4, lbl_803CC090@ha /* 802D1324 002CE264 38 04 C0 90 */ addi r0, r4, lbl_803CC090@l /* 802D1328 002CE268 90 1E 00 00 */ stw r0, 0(r30) -/* 802D132C 002CE26C 4B FF D7 95 */ bl JKRHeap_NS_dispose_X2_ +/* 802D132C 002CE26C 4B FF D7 95 */ bl dispose__7JKRHeapFv /* 802D1330 002CE270 7F C3 F3 78 */ mr r3, r30 /* 802D1334 002CE274 38 80 00 00 */ li r4, 0 -/* 802D1338 002CE278 4B FF CF 2D */ bl JKRHeap_NS_dtor +/* 802D1338 002CE278 4B FF CF 2D */ bl __dt__7JKRHeapFv /* 802D133C 002CE27C 7F E0 07 35 */ extsh. r0, r31 /* 802D1340 002CE280 40 81 00 0C */ ble lbl_802D134C /* 802D1344 002CE284 7F C3 F3 78 */ mr r3, r30 -/* 802D1348 002CE288 4B FF D9 F5 */ bl __dl +/* 802D1348 002CE288 4B FF D9 F5 */ bl __dl__FPv lbl_802D134C: /* 802D134C 002CE28C 7F C3 F3 78 */ mr r3, r30 /* 802D1350 002CE290 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -61,7 +61,7 @@ lbl_802D1384: /* 802D1384 002CE2C4 38 60 00 70 */ li r3, 0x70 /* 802D1388 002CE2C8 38 80 00 10 */ li r4, 0x10 /* 802D138C 002CE2CC 7F E5 FB 78 */ mr r5, r31 -/* 802D1390 002CE2D0 4B FF D0 E5 */ bl JKRHeap_NS_alloc +/* 802D1390 002CE2D0 4B FF D0 E5 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D1394 002CE2D4 7C 60 1B 79 */ or. r0, r3, r3 /* 802D1398 002CE2D8 40 82 00 0C */ bne lbl_802D13A4 /* 802D139C 002CE2DC 38 60 00 00 */ li r3, 0 diff --git a/asm/JKernel/JKRCompArchive.s b/asm/JKernel/JKRCompArchive.s index 2f5fcb7bcb..ba8af59d77 100644 --- a/asm/JKernel/JKRCompArchive.s +++ b/asm/JKernel/JKRCompArchive.s @@ -38,7 +38,7 @@ lbl_802D8828: /* 802D8848 002D5788 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D884C 002D578C 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D8850 002D5790 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D8854 002D5794 48 00 37 9D */ bl JSUPtrList_NS_prepend +/* 802D8854 002D5794 48 00 37 9D */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D8858 002D5798 38 00 00 01 */ li r0, 1 /* 802D885C 002D579C 98 1D 00 30 */ stb r0, 0x30(r29) /* 802D8860 002D57A0 7F A3 EB 78 */ mr r3, r29 @@ -74,7 +74,7 @@ lbl_802D88C0: /* 802D88D0 002D5810 28 03 00 00 */ cmplwi r3, 0 /* 802D88D4 002D5814 41 82 00 0C */ beq lbl_802D88E0 /* 802D88D8 002D5818 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D88DC 002D581C 4B FF 5C 25 */ bl JKRHeap_NS_free +/* 802D88DC 002D581C 4B FF 5C 25 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D88E0: /* 802D88E0 002D5820 3B BD 00 14 */ addi r29, r29, 0x14 /* 802D88E4 002D5824 3B 9C 00 01 */ addi r28, r28, 1 @@ -84,7 +84,7 @@ lbl_802D88E8: /* 802D88F0 002D5830 7C 1C 00 40 */ cmplw r28, r0 /* 802D88F4 002D5834 41 80 FF CC */ blt lbl_802D88C0 /* 802D88F8 002D5838 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D88FC 002D583C 4B FF 5C 05 */ bl JKRHeap_NS_free +/* 802D88FC 002D583C 4B FF 5C 05 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D8900 002D5840 38 00 00 00 */ li r0, 0 /* 802D8904 002D5844 90 1E 00 44 */ stw r0, 0x44(r30) lbl_802D8908: @@ -102,7 +102,7 @@ lbl_802D892C: /* 802D8930 002D5870 28 03 00 00 */ cmplwi r3, 0 /* 802D8934 002D5874 41 82 00 14 */ beq lbl_802D8948 /* 802D8938 002D5878 38 80 00 00 */ li r4, 0 -/* 802D893C 002D587C 4B FF 5B C5 */ bl JKRHeap_NS_free +/* 802D893C 002D587C 4B FF 5B C5 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D8940 002D5880 38 00 00 00 */ li r0, 0 /* 802D8944 002D5884 90 1E 00 50 */ stw r0, 0x50(r30) lbl_802D8948: @@ -119,7 +119,7 @@ lbl_802D896C: /* 802D896C 002D58AC 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D8970 002D58B0 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D8974 002D58B4 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D8978 002D58B8 48 00 37 E5 */ bl JSUPtrList_NS_remove +/* 802D8978 002D58B8 48 00 37 E5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D897C 002D58BC 38 00 00 00 */ li r0, 0 /* 802D8980 002D58C0 98 1E 00 30 */ stb r0, 0x30(r30) /* 802D8984 002D58C4 7F C3 F3 78 */ mr r3, r30 @@ -128,7 +128,7 @@ lbl_802D896C: /* 802D8990 002D58D0 7F E0 07 35 */ extsh. r0, r31 /* 802D8994 002D58D4 40 81 00 0C */ ble lbl_802D89A0 /* 802D8998 002D58D8 7F C3 F3 78 */ mr r3, r30 -/* 802D899C 002D58DC 4B FF 63 A1 */ bl __dl +/* 802D899C 002D58DC 4B FF 63 A1 */ bl __dl__FPv lbl_802D89A0: /* 802D89A0 002D58E0 7F C3 F3 78 */ mr r3, r30 /* 802D89A4 002D58E4 39 61 00 20 */ addi r11, r1, 0x20 @@ -161,7 +161,7 @@ JKRCompArchive_NS_open: /* 802D8A04 002D5944 38 60 00 F8 */ li r3, 0xf8 /* 802D8A08 002D5948 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D8A0C 002D594C 38 A0 00 00 */ li r5, 0 -/* 802D8A10 002D5950 4B FF 62 89 */ bl __nw_X2_ +/* 802D8A10 002D5950 4B FF 62 89 */ bl __nw__FUlP7JKRHeapi /* 802D8A14 002D5954 7C 60 1B 79 */ or. r0, r3, r3 /* 802D8A18 002D5958 41 82 00 10 */ beq lbl_802D8A28 /* 802D8A1C 002D595C 7F 44 D3 78 */ mr r4, r26 @@ -180,7 +180,7 @@ lbl_802D8A48: /* 802D8A48 002D5988 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D8A4C 002D598C 38 80 00 20 */ li r4, 0x20 /* 802D8A50 002D5990 38 A0 FF E0 */ li r5, -32 -/* 802D8A54 002D5994 4B FF 5A 81 */ bl JKRHeap_NS_alloc_X1_ +/* 802D8A54 002D5994 4B FF 5A 81 */ bl alloc__7JKRHeapFUli /* 802D8A58 002D5998 7C 7E 1B 79 */ or. r30, r3, r3 /* 802D8A5C 002D599C 40 82 00 10 */ bne lbl_802D8A6C /* 802D8A60 002D59A0 38 00 00 00 */ li r0, 0 @@ -227,7 +227,7 @@ lbl_802D8AEC: /* 802D8AF4 002D5A34 80 1F 00 74 */ lwz r0, 0x74(r31) /* 802D8AF8 002D5A38 7C 63 02 14 */ add r3, r3, r0 /* 802D8AFC 002D5A3C 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D8B00 002D5A40 4B FF 59 75 */ bl JKRHeap_NS_alloc +/* 802D8B00 002D5A40 4B FF 59 75 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D8B04 002D5A44 90 7F 00 44 */ stw r3, 0x44(r31) /* 802D8B08 002D5A48 80 9F 00 44 */ lwz r4, 0x44(r31) /* 802D8B0C 002D5A4C 28 04 00 00 */ cmplwi r4, 0 @@ -319,7 +319,7 @@ lbl_802D8C4C: /* 802D8C50 002D5B90 7F 24 CB 78 */ mr r4, r25 /* 802D8C54 002D5B94 7F 9D 00 D0 */ neg r28, r29 /* 802D8C58 002D5B98 7F 85 E3 78 */ mr r5, r28 -/* 802D8C5C 002D5B9C 4B FF 58 79 */ bl JKRHeap_NS_alloc_X1_ +/* 802D8C5C 002D5B9C 4B FF 58 79 */ bl alloc__7JKRHeapFUli /* 802D8C60 002D5BA0 7C 7B 1B 79 */ or. r27, r3, r3 /* 802D8C64 002D5BA4 40 82 00 10 */ bne lbl_802D8C74 /* 802D8C68 002D5BA8 38 00 00 00 */ li r0, 0 @@ -353,7 +353,7 @@ lbl_802D8C74: /* 802D8CD4 002D5C14 7F 23 CB 78 */ mr r3, r25 /* 802D8CD8 002D5C18 7F 84 E3 78 */ mr r4, r28 /* 802D8CDC 002D5C1C 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D8CE0 002D5C20 4B FF 57 95 */ bl JKRHeap_NS_alloc +/* 802D8CE0 002D5C20 4B FF 57 95 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D8CE4 002D5C24 7C 7C 1B 79 */ or. r28, r3, r3 /* 802D8CE8 002D5C28 40 82 00 10 */ bne lbl_802D8CF8 /* 802D8CEC 002D5C2C 38 00 00 00 */ li r0, 0 @@ -368,13 +368,13 @@ lbl_802D8CF8: /* 802D8D0C 002D5C4C 48 00 2C 7D */ bl JKRDecomp_NS_orderSync /* 802D8D10 002D5C50 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D8D14 002D5C54 7F 64 DB 78 */ mr r4, r27 -/* 802D8D18 002D5C58 4B FF 58 31 */ bl JKRHeap_NS_free_X1_ +/* 802D8D18 002D5C58 4B FF 58 31 */ bl free__7JKRHeapFPv /* 802D8D1C 002D5C5C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802D8D20 002D5C60 80 1F 00 74 */ lwz r0, 0x74(r31) /* 802D8D24 002D5C64 7C 63 02 14 */ add r3, r3, r0 /* 802D8D28 002D5C68 7F A4 EB 78 */ mr r4, r29 /* 802D8D2C 002D5C6C 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D8D30 002D5C70 4B FF 57 45 */ bl JKRHeap_NS_alloc +/* 802D8D30 002D5C70 4B FF 57 45 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D8D34 002D5C74 90 7F 00 44 */ stw r3, 0x44(r31) /* 802D8D38 002D5C78 80 7F 00 44 */ lwz r3, 0x44(r31) /* 802D8D3C 002D5C7C 28 03 00 00 */ cmplwi r3, 0 @@ -387,7 +387,7 @@ lbl_802D8D50: /* 802D8D54 002D5C94 80 BE 00 0C */ lwz r5, 0xc(r30) /* 802D8D58 002D5C98 80 1F 00 74 */ lwz r0, 0x74(r31) /* 802D8D5C 002D5C9C 7C A5 02 14 */ add r5, r5, r0 -/* 802D8D60 002D5CA0 4B FF 5D B9 */ bl JKRHeap_NS_copyMemory +/* 802D8D60 002D5CA0 4B FF 5D B9 */ bl copyMemory__7JKRHeapFPvPvUl /* 802D8D64 002D5CA4 80 7F 00 44 */ lwz r3, 0x44(r31) /* 802D8D68 002D5CA8 80 1E 00 0C */ lwz r0, 0xc(r30) /* 802D8D6C 002D5CAC 7C 03 02 14 */ add r0, r3, r0 @@ -471,14 +471,14 @@ lbl_802D8E74: /* 802D8E8C 002D5DCC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 802D8E90 002D5DD0 80 03 00 08 */ lwz r0, 8(r3) /* 802D8E94 002D5DD4 54 03 10 3A */ slwi r3, r0, 2 -/* 802D8E98 002D5DD8 4B FF 55 DD */ bl JKRHeap_NS_alloc +/* 802D8E98 002D5DD8 4B FF 55 DD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D8E9C 002D5DDC 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D8EA0 002D5DE0 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D8EA4 002D5DE4 28 03 00 00 */ cmplwi r3, 0 /* 802D8EA8 002D5DE8 40 82 00 1C */ bne lbl_802D8EC4 /* 802D8EAC 002D5DEC 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D8EB0 002D5DF0 80 9F 00 44 */ lwz r4, 0x44(r31) -/* 802D8EB4 002D5DF4 4B FF 56 95 */ bl JKRHeap_NS_free_X1_ +/* 802D8EB4 002D5DF4 4B FF 56 95 */ bl free__7JKRHeapFPv /* 802D8EB8 002D5DF8 38 00 00 00 */ li r0, 0 /* 802D8EBC 002D5DFC 98 1F 00 3C */ stb r0, 0x3c(r31) /* 802D8EC0 002D5E00 48 00 00 18 */ b lbl_802D8ED8 @@ -493,7 +493,7 @@ lbl_802D8ED8: /* 802D8EDC 002D5E1C 41 82 00 10 */ beq lbl_802D8EEC /* 802D8EE0 002D5E20 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D8EE4 002D5E24 7F C4 F3 78 */ mr r4, r30 -/* 802D8EE8 002D5E28 4B FF 56 61 */ bl JKRHeap_NS_free_X1_ +/* 802D8EE8 002D5E28 4B FF 56 61 */ bl free__7JKRHeapFPv lbl_802D8EEC: /* 802D8EEC 002D5E2C 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 802D8EF0 002D5E30 28 00 00 00 */ cmplwi r0, 0 @@ -674,7 +674,7 @@ lbl_802D9168: /* 802D9168 002D60A8 7F 83 E3 78 */ mr r3, r28 /* 802D916C 002D60AC 80 9E 00 10 */ lwz r4, 0x10(r30) /* 802D9170 002D60B0 7F 45 D3 78 */ mr r5, r26 -/* 802D9174 002D60B4 4B FF 59 A5 */ bl JKRHeap_NS_copyMemory +/* 802D9174 002D60B4 4B FF 59 A5 */ bl copyMemory__7JKRHeapFPvPvUl /* 802D9178 002D60B8 7F 5B D3 78 */ mr r27, r26 /* 802D917C 002D60BC 48 00 00 BC */ b lbl_802D9238 lbl_802D9180: @@ -764,7 +764,7 @@ lbl_802D92A0: /* 802D92B4 002D61F4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 802D92B8 002D61F8 40 82 00 0C */ bne lbl_802D92C4 /* 802D92BC 002D61FC 80 9C 00 38 */ lwz r4, 0x38(r28) -/* 802D92C0 002D6200 4B FF 52 41 */ bl JKRHeap_NS_free +/* 802D92C0 002D6200 4B FF 52 41 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D92C4: /* 802D92C4 002D6204 93 FE 00 10 */ stw r31, 0x10(r30) lbl_802D92C8: @@ -799,7 +799,7 @@ lbl_802D9324: /* 802D932C 002D626C 40 82 00 10 */ bne lbl_802D933C /* 802D9330 002D6270 7F C3 F3 78 */ mr r3, r30 /* 802D9334 002D6274 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 802D9338 002D6278 4B FF 51 C9 */ bl JKRHeap_NS_free +/* 802D9338 002D6278 4B FF 51 C9 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D933C: /* 802D933C 002D627C 38 00 00 00 */ li r0, 0 /* 802D9340 002D6280 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/asm/JKernel/JKRDecomp.s b/asm/JKernel/JKRDecomp.s index bbbb158262..67f02ba70b 100644 --- a/asm/JKernel/JKRDecomp.s +++ b/asm/JKernel/JKRDecomp.s @@ -16,7 +16,7 @@ JKRDecomp_NS_create: /* 802DB6A0 002D85E0 38 60 00 7C */ li r3, 0x7c /* 802DB6A4 002D85E4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802DB6A8 002D85E8 38 A0 00 00 */ li r5, 0 -/* 802DB6AC 002D85EC 4B FF 35 ED */ bl __nw_X2_ +/* 802DB6AC 002D85EC 4B FF 35 ED */ bl __nw__FUlP7JKRHeapi /* 802DB6B0 002D85F0 7C 60 1B 79 */ or. r0, r3, r3 /* 802DB6B4 002D85F4 41 82 00 10 */ beq lbl_802DB6C4 /* 802DB6B8 002D85F8 7F E4 FB 78 */ mr r4, r31 @@ -70,7 +70,7 @@ JKRDecomp: /* 802DB764 002D86A4 7F E0 07 35 */ extsh. r0, r31 /* 802DB768 002D86A8 40 81 00 0C */ ble lbl_802DB774 /* 802DB76C 002D86AC 7F C3 F3 78 */ mr r3, r30 -/* 802DB770 002D86B0 4B FF 35 CD */ bl __dl +/* 802DB770 002D86B0 4B FF 35 CD */ bl __dl__FPv lbl_802DB774: /* 802DB774 002D86B4 7F C3 F3 78 */ mr r3, r30 /* 802DB778 002D86B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -149,7 +149,7 @@ JKRDecomp_NS_prepareCommand: /* 802DB880 002D87C0 38 60 00 4C */ li r3, 0x4c /* 802DB884 002D87C4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802DB888 002D87C8 38 A0 FF FC */ li r5, -4 -/* 802DB88C 002D87CC 4B FF 34 0D */ bl __nw_X2_ +/* 802DB88C 002D87CC 4B FF 34 0D */ bl __nw__FUlP7JKRHeapi /* 802DB890 002D87D0 7C 64 1B 79 */ or. r4, r3, r3 /* 802DB894 002D87D4 41 82 00 0C */ beq lbl_802DB8A0 /* 802DB898 002D87D8 48 00 04 D9 */ bl JKRDecompCommand @@ -551,7 +551,7 @@ JKRDecompCommand_NS_dtor: /* 802DBDD4 002D8D14 41 82 00 10 */ beq lbl_802DBDE4 /* 802DBDD8 002D8D18 7C 80 07 35 */ extsh. r0, r4 /* 802DBDDC 002D8D1C 40 81 00 08 */ ble lbl_802DBDE4 -/* 802DBDE0 002D8D20 4B FF 2F 5D */ bl __dl +/* 802DBDE0 002D8D20 4B FF 2F 5D */ bl __dl__FPv lbl_802DBDE4: /* 802DBDE4 002D8D24 7F E3 FB 78 */ mr r3, r31 /* 802DBDE8 002D8D28 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRDisposer.s b/asm/JKernel/JKRDisposer.s index 6a7a93eebd..197854cbe4 100644 --- a/asm/JKernel/JKRDisposer.s +++ b/asm/JKernel/JKRDisposer.s @@ -1,74 +1,3 @@ .include "macros.inc" .section .text, "ax" # 802d147c - - -.global JKRDisposer -JKRDisposer: -/* 802D147C 002CE3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D1480 002CE3C0 7C 08 02 A6 */ mflr r0 -/* 802D1484 002CE3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D1488 002CE3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D148C 002CE3CC 7C 7F 1B 78 */ mr r31, r3 -/* 802D1490 002CE3D0 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha -/* 802D1494 002CE3D4 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l -/* 802D1498 002CE3D8 90 1F 00 00 */ stw r0, 0(r31) -/* 802D149C 002CE3DC 7F E4 FB 78 */ mr r4, r31 -/* 802D14A0 002CE3E0 38 64 00 08 */ addi r3, r4, 8 -/* 802D14A4 002CE3E4 48 00 A9 59 */ bl JSUPtrLink -/* 802D14A8 002CE3E8 7F E3 FB 78 */ mr r3, r31 -/* 802D14AC 002CE3EC 4B FF D3 91 */ bl JKRHeap_NS_findFromRoot -/* 802D14B0 002CE3F0 90 7F 00 04 */ stw r3, 4(r31) -/* 802D14B4 002CE3F4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802D14B8 002CE3F8 28 03 00 00 */ cmplwi r3, 0 -/* 802D14BC 002CE3FC 41 82 00 10 */ beq lbl_802D14CC -/* 802D14C0 002CE400 38 63 00 5C */ addi r3, r3, 0x5c -/* 802D14C4 002CE404 38 9F 00 08 */ addi r4, r31, 8 -/* 802D14C8 002CE408 48 00 AA 85 */ bl JSUPtrList_NS_append -lbl_802D14CC: -/* 802D14CC 002CE40C 7F E3 FB 78 */ mr r3, r31 -/* 802D14D0 002CE410 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D14D4 002CE414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D14D8 002CE418 7C 08 03 A6 */ mtlr r0 -/* 802D14DC 002CE41C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D14E0 002CE420 4E 80 00 20 */ blr - -.global JKRDisposer_NS_dtor -JKRDisposer_NS_dtor: -/* 802D14E4 002CE424 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802D14E8 002CE428 7C 08 02 A6 */ mflr r0 -/* 802D14EC 002CE42C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D14F0 002CE430 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802D14F4 002CE434 93 C1 00 08 */ stw r30, 8(r1) -/* 802D14F8 002CE438 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802D14FC 002CE43C 7C 9F 23 78 */ mr r31, r4 -/* 802D1500 002CE440 41 82 00 4C */ beq lbl_802D154C -/* 802D1504 002CE444 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha -/* 802D1508 002CE448 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l -/* 802D150C 002CE44C 90 1E 00 00 */ stw r0, 0(r30) -/* 802D1510 002CE450 80 7E 00 04 */ lwz r3, 4(r30) -/* 802D1514 002CE454 28 03 00 00 */ cmplwi r3, 0 -/* 802D1518 002CE458 41 82 00 10 */ beq lbl_802D1528 -/* 802D151C 002CE45C 38 63 00 5C */ addi r3, r3, 0x5c -/* 802D1520 002CE460 38 9E 00 08 */ addi r4, r30, 8 -/* 802D1524 002CE464 48 00 AC 39 */ bl JSUPtrList_NS_remove -lbl_802D1528: -/* 802D1528 002CE468 34 1E 00 08 */ addic. r0, r30, 8 -/* 802D152C 002CE46C 41 82 00 10 */ beq lbl_802D153C -/* 802D1530 002CE470 38 7E 00 08 */ addi r3, r30, 8 -/* 802D1534 002CE474 38 80 00 00 */ li r4, 0 -/* 802D1538 002CE478 48 00 A8 DD */ bl JSUPtrLink_NS_dtor -lbl_802D153C: -/* 802D153C 002CE47C 7F E0 07 35 */ extsh. r0, r31 -/* 802D1540 002CE480 40 81 00 0C */ ble lbl_802D154C -/* 802D1544 002CE484 7F C3 F3 78 */ mr r3, r30 -/* 802D1548 002CE488 4B FF D7 F5 */ bl __dl -lbl_802D154C: -/* 802D154C 002CE48C 7F C3 F3 78 */ mr r3, r30 -/* 802D1550 002CE490 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802D1554 002CE494 83 C1 00 08 */ lwz r30, 8(r1) -/* 802D1558 002CE498 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802D155C 002CE49C 7C 08 03 A6 */ mtlr r0 -/* 802D1560 002CE4A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D1564 002CE4A4 4E 80 00 20 */ blr - diff --git a/asm/JKernel/JKRDvdAramRipper.s b/asm/JKernel/JKRDvdAramRipper.s index a9718147bc..7447f182b9 100644 --- a/asm/JKernel/JKRDvdAramRipper.s +++ b/asm/JKernel/JKRDvdAramRipper.s @@ -114,7 +114,7 @@ JKRDvdAramRipper_NS_loadToAram_Async: /* 802DA9F0 002D7930 38 60 00 54 */ li r3, 0x54 /* 802DA9F4 002D7934 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802DA9F8 002D7938 38 A0 FF FC */ li r5, -4 -/* 802DA9FC 002D793C 4B FF 42 9D */ bl __nw_X2_ +/* 802DA9FC 002D793C 4B FF 42 9D */ bl __nw__FUlP7JKRHeapi /* 802DAA00 002D7940 7C 7F 1B 79 */ or. r31, r3, r3 /* 802DAA04 002D7944 41 82 00 0C */ beq lbl_802DAA10 /* 802DAA08 002D7948 48 00 05 15 */ bl JKRADCommand @@ -178,7 +178,7 @@ lbl_802DAAC8: /* 802DAAD0 002D7A10 38 60 00 10 */ li r3, 0x10 /* 802DAAD4 002D7A14 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802DAAD8 002D7A18 38 A0 FF FC */ li r5, -4 -/* 802DAADC 002D7A1C 4B FF 41 BD */ bl __nw_X2_ +/* 802DAADC 002D7A1C 4B FF 41 BD */ bl __nw__FUlP7JKRHeapi /* 802DAAE0 002D7A20 7C 7C 1B 79 */ or. r28, r3, r3 /* 802DAAE4 002D7A24 41 82 00 10 */ beq lbl_802DAAF4 /* 802DAAE8 002D7A28 7F C4 F3 78 */ mr r4, r30 @@ -369,7 +369,7 @@ lbl_802DAD74: /* 802DAD80 002D7CC0 3C 60 80 43 */ lis r3, lbl_804343B4@ha /* 802DAD84 002D7CC4 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l /* 802DAD88 002D7CC8 7F A4 EB 78 */ mr r4, r29 -/* 802DAD8C 002D7CCC 48 00 11 C1 */ bl JSUPtrList_NS_append +/* 802DAD8C 002D7CCC 48 00 11 C1 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802DAD90 002D7CD0 48 00 00 10 */ b lbl_802DADA0 lbl_802DAD94: /* 802DAD94 002D7CD4 7F A3 EB 78 */ mr r3, r29 @@ -413,7 +413,7 @@ lbl_802DAE1C: /* 802DAE1C 002D7D5C 7F E0 07 35 */ extsh. r0, r31 /* 802DAE20 002D7D60 40 81 00 0C */ ble lbl_802DAE2C /* 802DAE24 002D7D64 7F C3 F3 78 */ mr r3, r30 -/* 802DAE28 002D7D68 4B FF 3F 15 */ bl __dl +/* 802DAE28 002D7D68 4B FF 3F 15 */ bl __dl__FPv lbl_802DAE2C: /* 802DAE2C 002D7D6C 7F C3 F3 78 */ mr r3, r30 /* 802DAE30 002D7D70 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -455,11 +455,11 @@ lbl_802DAEB0: /* 802DAEB0 002D7DF0 3C 60 80 43 */ lis r3, lbl_804343B4@ha /* 802DAEB4 002D7DF4 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l /* 802DAEB8 002D7DF8 7F A4 EB 78 */ mr r4, r29 -/* 802DAEBC 002D7DFC 48 00 12 A1 */ bl JSUPtrList_NS_remove +/* 802DAEBC 002D7DFC 48 00 12 A1 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802DAEC0 002D7E00 80 7D 00 50 */ lwz r3, 0x50(r29) /* 802DAEC4 002D7E04 28 03 00 00 */ cmplwi r3, 0 /* 802DAEC8 002D7E08 41 82 00 08 */ beq lbl_802DAED0 -/* 802DAECC 002D7E0C 4B FF 3E 71 */ bl __dl +/* 802DAECC 002D7E0C 4B FF 3E 71 */ bl __dl__FPv lbl_802DAED0: /* 802DAED0 002D7E10 80 7F 00 54 */ lwz r3, 0x54(r31) /* 802DAED4 002D7E14 28 03 00 00 */ cmplwi r3, 0 @@ -491,7 +491,7 @@ JKRADCommand: /* 802DAF28 002D7E68 93 E1 00 0C */ stw r31, 0xc(r1) /* 802DAF2C 002D7E6C 7C 7F 1B 78 */ mr r31, r3 /* 802DAF30 002D7E70 7F E4 FB 78 */ mr r4, r31 -/* 802DAF34 002D7E74 48 00 0E C9 */ bl JSUPtrLink +/* 802DAF34 002D7E74 48 00 0E C9 */ bl __ct__10JSUPtrLinkFPv /* 802DAF38 002D7E78 38 00 00 00 */ li r0, 0 /* 802DAF3C 002D7E7C 90 1F 00 48 */ stw r0, 0x48(r31) /* 802DAF40 002D7E80 98 1F 00 4C */ stb r0, 0x4c(r31) @@ -528,12 +528,12 @@ lbl_802DAFA8: /* 802DAFAC 002D7EEC 41 82 00 10 */ beq lbl_802DAFBC /* 802DAFB0 002D7EF0 7F C3 F3 78 */ mr r3, r30 /* 802DAFB4 002D7EF4 38 80 00 00 */ li r4, 0 -/* 802DAFB8 002D7EF8 48 00 0E 5D */ bl JSUPtrLink_NS_dtor +/* 802DAFB8 002D7EF8 48 00 0E 5D */ bl __dt__10JSUPtrLinkFv lbl_802DAFBC: /* 802DAFBC 002D7EFC 7F E0 07 35 */ extsh. r0, r31 /* 802DAFC0 002D7F00 40 81 00 0C */ ble lbl_802DAFCC /* 802DAFC4 002D7F04 7F C3 F3 78 */ mr r3, r30 -/* 802DAFC8 002D7F08 4B FF 3D 75 */ bl __dl +/* 802DAFC8 002D7F08 4B FF 3D 75 */ bl __dl__FPv lbl_802DAFCC: /* 802DAFCC 002D7F0C 7F C3 F3 78 */ mr r3, r30 /* 802DAFD0 002D7F10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -577,14 +577,14 @@ lbl_802DB040: /* 802DB058 002D7F98 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DB05C 002D7F9C 7F 04 C3 78 */ mr r4, r24 /* 802DB060 002D7FA0 38 A0 00 20 */ li r5, 0x20 -/* 802DB064 002D7FA4 4B FF 34 71 */ bl JKRHeap_NS_alloc_X1_ +/* 802DB064 002D7FA4 4B FF 34 71 */ bl alloc__7JKRHeapFUli /* 802DB068 002D7FA8 90 6D 8E E8 */ stw r3, lbl_80451468-_SDA_BASE_(r13) /* 802DB06C 002D7FAC 7C 03 C2 14 */ add r0, r3, r24 /* 802DB070 002D7FB0 90 0D 8E EC */ stw r0, lbl_8045146C-_SDA_BASE_(r13) /* 802DB074 002D7FB4 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DB078 002D7FB8 38 80 11 20 */ li r4, 0x1120 /* 802DB07C 002D7FBC 38 A0 00 00 */ li r5, 0 -/* 802DB080 002D7FC0 4B FF 34 55 */ bl JKRHeap_NS_alloc_X1_ +/* 802DB080 002D7FC0 4B FF 34 55 */ bl alloc__7JKRHeapFUli /* 802DB084 002D7FC4 90 6D 8E F0 */ stw r3, lbl_80451470-_SDA_BASE_(r13) /* 802DB088 002D7FC8 38 03 11 20 */ addi r0, r3, 0x1120 /* 802DB08C 002D7FCC 90 0D 8E F4 */ stw r0, lbl_80451474-_SDA_BASE_(r13) @@ -592,7 +592,7 @@ lbl_802DB040: /* 802DB094 002D7FD4 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DB098 002D7FD8 38 80 01 00 */ li r4, 0x100 /* 802DB09C 002D7FDC 38 A0 00 20 */ li r5, 0x20 -/* 802DB0A0 002D7FE0 4B FF 34 35 */ bl JKRHeap_NS_alloc_X1_ +/* 802DB0A0 002D7FE0 4B FF 34 35 */ bl alloc__7JKRHeapFUli /* 802DB0A4 002D7FE4 90 6D 8E FC */ stw r3, lbl_8045147C-_SDA_BASE_(r13) /* 802DB0A8 002D7FE8 38 03 01 00 */ addi r0, r3, 0x100 /* 802DB0AC 002D7FEC 90 0D 8F 00 */ stw r0, lbl_80451480-_SDA_BASE_(r13) @@ -627,13 +627,13 @@ lbl_802DB110: lbl_802DB114: /* 802DB114 002D8054 80 6D 8E E8 */ lwz r3, lbl_80451468-_SDA_BASE_(r13) /* 802DB118 002D8058 38 80 00 00 */ li r4, 0 -/* 802DB11C 002D805C 4B FF 33 E5 */ bl JKRHeap_NS_free +/* 802DB11C 002D805C 4B FF 33 E5 */ bl free__7JKRHeapFPvP7JKRHeap /* 802DB120 002D8060 80 6D 8E F0 */ lwz r3, lbl_80451470-_SDA_BASE_(r13) /* 802DB124 002D8064 38 80 00 00 */ li r4, 0 -/* 802DB128 002D8068 4B FF 33 D9 */ bl JKRHeap_NS_free +/* 802DB128 002D8068 4B FF 33 D9 */ bl free__7JKRHeapFPvP7JKRHeap /* 802DB12C 002D806C 80 6D 8E FC */ lwz r3, lbl_8045147C-_SDA_BASE_(r13) /* 802DB130 002D8070 38 80 00 00 */ li r4, 0 -/* 802DB134 002D8074 4B FF 33 CD */ bl JKRHeap_NS_free +/* 802DB134 002D8074 4B FF 33 CD */ bl free__7JKRHeapFPvP7JKRHeap /* 802DB138 002D8078 3C 60 80 43 */ lis r3, lbl_804343C0@ha /* 802DB13C 002D807C 38 63 43 C0 */ addi r3, r3, lbl_804343C0@l /* 802DB140 002D8080 48 06 3F DD */ bl OSUnlockMutex @@ -984,7 +984,7 @@ lbl_802DB5D4: /* 802DB5F0 002D8530 90 01 00 14 */ stw r0, 0x14(r1) /* 802DB5F4 002D8534 3C 60 80 43 */ lis r3, lbl_804343B4@ha /* 802DB5F8 002D8538 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l -/* 802DB5FC 002D853C 48 00 09 19 */ bl JSUPtrList_NS_initiate +/* 802DB5FC 002D853C 48 00 09 19 */ bl initiate__10JSUPtrListFv /* 802DB600 002D8540 3C 60 80 43 */ lis r3, lbl_804343B4@ha /* 802DB604 002D8544 38 63 43 B4 */ addi r3, r3, lbl_804343B4@l .global JSUList_NS_dtor_X9_ @@ -1009,11 +1009,11 @@ JSUList_NS_dtor_X9_: /* 802DB644 002D8584 7C 9F 23 78 */ mr r31, r4 /* 802DB648 002D8588 41 82 00 1C */ beq lbl_802DB664 /* 802DB64C 002D858C 38 80 00 00 */ li r4, 0 -/* 802DB650 002D8590 48 00 08 5D */ bl JSUPtrList_NS_dtor +/* 802DB650 002D8590 48 00 08 5D */ bl __dt__10JSUPtrListFv /* 802DB654 002D8594 7F E0 07 35 */ extsh. r0, r31 /* 802DB658 002D8598 40 81 00 0C */ ble lbl_802DB664 /* 802DB65C 002D859C 7F C3 F3 78 */ mr r3, r30 -/* 802DB660 002D85A0 4B FF 36 DD */ bl __dl +/* 802DB660 002D85A0 4B FF 36 DD */ bl __dl__FPv lbl_802DB664: /* 802DB664 002D85A4 7F C3 F3 78 */ mr r3, r30 /* 802DB668 002D85A8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRDvdArchive.s b/asm/JKernel/JKRDvdArchive.s index ed3651a4fb..e9cc9c5bcc 100644 --- a/asm/JKernel/JKRDvdArchive.s +++ b/asm/JKernel/JKRDvdArchive.s @@ -38,7 +38,7 @@ lbl_802D7C44: /* 802D7C64 002D4BA4 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D7C68 002D4BA8 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D7C6C 002D4BAC 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D7C70 002D4BB0 48 00 43 81 */ bl JSUPtrList_NS_prepend +/* 802D7C70 002D4BB0 48 00 43 81 */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D7C74 002D4BB4 38 00 00 01 */ li r0, 1 /* 802D7C78 002D4BB8 98 1D 00 30 */ stb r0, 0x30(r29) /* 802D7C7C 002D4BBC 7F A3 EB 78 */ mr r3, r29 @@ -74,7 +74,7 @@ lbl_802D7CE8: /* 802D7CEC 002D4C2C 28 03 00 00 */ cmplwi r3, 0 /* 802D7CF0 002D4C30 41 82 00 0C */ beq lbl_802D7CFC /* 802D7CF4 002D4C34 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 802D7CF8 002D4C38 4B FF 68 09 */ bl JKRHeap_NS_free +/* 802D7CF8 002D4C38 4B FF 68 09 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D7CFC: /* 802D7CFC 002D4C3C 3B DE 00 14 */ addi r30, r30, 0x14 /* 802D7D00 002D4C40 3B BD 00 01 */ addi r29, r29, 1 @@ -84,7 +84,7 @@ lbl_802D7D04: /* 802D7D0C 002D4C4C 7C 1D 00 40 */ cmplw r29, r0 /* 802D7D10 002D4C50 41 80 FF D8 */ blt lbl_802D7CE8 /* 802D7D14 002D4C54 80 9F 00 38 */ lwz r4, 0x38(r31) -/* 802D7D18 002D4C58 4B FF 67 E9 */ bl JKRHeap_NS_free +/* 802D7D18 002D4C58 4B FF 67 E9 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D7D1C 002D4C5C 38 00 00 00 */ li r0, 0 /* 802D7D20 002D4C60 90 1F 00 44 */ stw r0, 0x44(r31) lbl_802D7D24: @@ -92,7 +92,7 @@ lbl_802D7D24: /* 802D7D28 002D4C68 28 03 00 00 */ cmplwi r3, 0 /* 802D7D2C 002D4C6C 41 82 00 14 */ beq lbl_802D7D40 /* 802D7D30 002D4C70 38 80 00 00 */ li r4, 0 -/* 802D7D34 002D4C74 4B FF 67 CD */ bl JKRHeap_NS_free +/* 802D7D34 002D4C74 4B FF 67 CD */ bl free__7JKRHeapFPvP7JKRHeap /* 802D7D38 002D4C78 38 00 00 00 */ li r0, 0 /* 802D7D3C 002D4C7C 90 1F 00 50 */ stw r0, 0x50(r31) lbl_802D7D40: @@ -109,7 +109,7 @@ lbl_802D7D64: /* 802D7D64 002D4CA4 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D7D68 002D4CA8 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D7D6C 002D4CAC 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D7D70 002D4CB0 48 00 43 ED */ bl JSUPtrList_NS_remove +/* 802D7D70 002D4CB0 48 00 43 ED */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D7D74 002D4CB4 38 00 00 00 */ li r0, 0 /* 802D7D78 002D4CB8 98 1F 00 30 */ stb r0, 0x30(r31) lbl_802D7D7C: @@ -119,7 +119,7 @@ lbl_802D7D7C: /* 802D7D88 002D4CC8 7F 80 07 35 */ extsh. r0, r28 /* 802D7D8C 002D4CCC 40 81 00 0C */ ble lbl_802D7D98 /* 802D7D90 002D4CD0 7F E3 FB 78 */ mr r3, r31 -/* 802D7D94 002D4CD4 4B FF 6F A9 */ bl __dl +/* 802D7D94 002D4CD4 4B FF 6F A9 */ bl __dl__FPv lbl_802D7D98: /* 802D7D98 002D4CD8 7F E3 FB 78 */ mr r3, r31 /* 802D7D9C 002D4CDC 39 61 00 20 */ addi r11, r1, 0x20 @@ -147,7 +147,7 @@ JKRDvdArchive_NS_open: /* 802D7DE8 002D4D28 38 60 00 F8 */ li r3, 0xf8 /* 802D7DEC 002D4D2C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D7DF0 002D4D30 38 A0 00 00 */ li r5, 0 -/* 802D7DF4 002D4D34 4B FF 6E A5 */ bl __nw_X2_ +/* 802D7DF4 002D4D34 4B FF 6E A5 */ bl __nw__FUlP7JKRHeapi /* 802D7DF8 002D4D38 7C 60 1B 79 */ or. r0, r3, r3 /* 802D7DFC 002D4D3C 41 82 00 10 */ beq lbl_802D7E0C /* 802D7E00 002D4D40 7F 84 E3 78 */ mr r4, r28 @@ -166,7 +166,7 @@ lbl_802D7E2C: /* 802D7E2C 002D4D6C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D7E30 002D4D70 38 80 00 20 */ li r4, 0x20 /* 802D7E34 002D4D74 38 A0 00 20 */ li r5, 0x20 -/* 802D7E38 002D4D78 4B FF 66 9D */ bl JKRHeap_NS_alloc_X1_ +/* 802D7E38 002D4D78 4B FF 66 9D */ bl alloc__7JKRHeapFUli /* 802D7E3C 002D4D7C 7C 7E 1B 79 */ or. r30, r3, r3 /* 802D7E40 002D4D80 40 82 00 10 */ bne lbl_802D7E50 /* 802D7E44 002D4D84 38 00 00 00 */ li r0, 0 @@ -196,7 +196,7 @@ lbl_802D7E9C: /* 802D7E9C 002D4DDC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802D7EA0 002D4DE0 7F E4 FB 78 */ mr r4, r31 /* 802D7EA4 002D4DE4 80 BD 00 38 */ lwz r5, 0x38(r29) -/* 802D7EA8 002D4DE8 4B FF 65 CD */ bl JKRHeap_NS_alloc +/* 802D7EA8 002D4DE8 4B FF 65 CD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D7EAC 002D4DEC 90 7D 00 44 */ stw r3, 0x44(r29) /* 802D7EB0 002D4DF0 80 9D 00 44 */ lwz r4, 0x44(r29) /* 802D7EB4 002D4DF4 28 04 00 00 */ cmplwi r4, 0 @@ -260,14 +260,14 @@ lbl_802D7F74: /* 802D7F8C 002D4ECC 80 7D 00 44 */ lwz r3, 0x44(r29) /* 802D7F90 002D4ED0 80 03 00 08 */ lwz r0, 8(r3) /* 802D7F94 002D4ED4 54 03 10 3A */ slwi r3, r0, 2 -/* 802D7F98 002D4ED8 4B FF 64 DD */ bl JKRHeap_NS_alloc +/* 802D7F98 002D4ED8 4B FF 64 DD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D7F9C 002D4EDC 90 7D 00 50 */ stw r3, 0x50(r29) /* 802D7FA0 002D4EE0 80 7D 00 50 */ lwz r3, 0x50(r29) /* 802D7FA4 002D4EE4 28 03 00 00 */ cmplwi r3, 0 /* 802D7FA8 002D4EE8 40 82 00 1C */ bne lbl_802D7FC4 /* 802D7FAC 002D4EEC 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D7FB0 002D4EF0 80 9D 00 44 */ lwz r4, 0x44(r29) -/* 802D7FB4 002D4EF4 4B FF 65 95 */ bl JKRHeap_NS_free_X1_ +/* 802D7FB4 002D4EF4 4B FF 65 95 */ bl free__7JKRHeapFPv /* 802D7FB8 002D4EF8 38 00 00 00 */ li r0, 0 /* 802D7FBC 002D4EFC 98 1D 00 3C */ stb r0, 0x3c(r29) /* 802D7FC0 002D4F00 48 00 00 28 */ b lbl_802D7FE8 @@ -287,7 +287,7 @@ lbl_802D7FE8: /* 802D7FEC 002D4F2C 41 82 00 10 */ beq lbl_802D7FFC /* 802D7FF0 002D4F30 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D7FF4 002D4F34 7F C4 F3 78 */ mr r4, r30 -/* 802D7FF8 002D4F38 4B FF 65 51 */ bl JKRHeap_NS_free_X1_ +/* 802D7FF8 002D4F38 4B FF 65 51 */ bl free__7JKRHeapFPv lbl_802D7FFC: /* 802D7FFC 002D4F3C 88 1D 00 3C */ lbz r0, 0x3c(r29) /* 802D8000 002D4F40 28 00 00 00 */ cmplwi r0, 0 @@ -452,7 +452,7 @@ lbl_802D8234: /* 802D8234 002D5174 7F 63 DB 78 */ mr r3, r27 /* 802D8238 002D5178 80 9D 00 10 */ lwz r4, 0x10(r29) /* 802D823C 002D517C 7F E5 FB 78 */ mr r5, r31 -/* 802D8240 002D5180 4B FF 68 D9 */ bl JKRHeap_NS_copyMemory +/* 802D8240 002D5180 4B FF 68 D9 */ bl copyMemory__7JKRHeapFPvPvUl lbl_802D8244: /* 802D8244 002D5184 28 1E 00 00 */ cmplwi r30, 0 /* 802D8248 002D5188 41 82 00 08 */ beq lbl_802D8250 @@ -645,7 +645,7 @@ lbl_802D84E0: /* 802D84E0 002D5420 7F 63 DB 78 */ mr r3, r27 /* 802D84E4 002D5424 38 80 00 20 */ li r4, 0x20 /* 802D84E8 002D5428 7F 45 D3 78 */ mr r5, r26 -/* 802D84EC 002D542C 4B FF 5F 89 */ bl JKRHeap_NS_alloc +/* 802D84EC 002D542C 4B FF 5F 89 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D84F0 002D5430 7C 7C 1B 78 */ mr r28, r3 /* 802D84F4 002D5434 38 00 00 00 */ li r0, 0 /* 802D84F8 002D5438 90 01 00 08 */ stw r0, 8(r1) @@ -691,7 +691,7 @@ lbl_802D8538: /* 802D8594 002D54D4 7F 83 E3 78 */ mr r3, r28 /* 802D8598 002D54D8 38 80 00 20 */ li r4, 0x20 /* 802D859C 002D54DC 7F 45 D3 78 */ mr r5, r26 -/* 802D85A0 002D54E0 4B FF 5E D5 */ bl JKRHeap_NS_alloc +/* 802D85A0 002D54E0 4B FF 5E D5 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D85A4 002D54E4 7C 7B 1B 78 */ mr r27, r3 /* 802D85A8 002D54E8 38 00 00 00 */ li r0, 0 /* 802D85AC 002D54EC 90 01 00 08 */ stw r0, 8(r1) @@ -714,7 +714,7 @@ lbl_802D85EC: /* 802D85EC 002D552C 7F 63 DB 78 */ mr r3, r27 /* 802D85F0 002D5530 38 80 00 20 */ li r4, 0x20 /* 802D85F4 002D5534 7F 45 D3 78 */ mr r5, r26 -/* 802D85F8 002D5538 4B FF 5E 7D */ bl JKRHeap_NS_alloc +/* 802D85F8 002D5538 4B FF 5E 7D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D85FC 002D553C 7C 7C 1B 78 */ mr r28, r3 /* 802D8600 002D5540 38 00 00 00 */ li r0, 0 /* 802D8604 002D5544 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/JKernel/JKRDvdFile.s b/asm/JKernel/JKRDvdFile.s index c3f4ed1bd1..de4f87fe4e 100644 --- a/asm/JKernel/JKRDvdFile.s +++ b/asm/JKernel/JKRDvdFile.s @@ -13,7 +13,7 @@ JKRDvdFile: /* 802D9598 002D64D8 7C 7E 1B 78 */ mr r30, r3 /* 802D959C 002D64DC 7F C0 F3 78 */ mr r0, r30 /* 802D95A0 002D64E0 7C 1F 03 78 */ mr r31, r0 -/* 802D95A4 002D64E4 4B FF 7E D9 */ bl JKRDisposer +/* 802D95A4 002D64E4 4B FF 7E D9 */ bl __ct__11JKRDisposerFv /* 802D95A8 002D64E8 3C 60 80 3D */ lis r3, lbl_803CC328@ha /* 802D95AC 002D64EC 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l /* 802D95B0 002D64F0 90 1F 00 00 */ stw r0, 0(r31) @@ -24,7 +24,7 @@ JKRDvdFile: /* 802D95C4 002D6504 90 1E 00 00 */ stw r0, 0(r30) /* 802D95C8 002D6508 38 7E 00 E4 */ addi r3, r30, 0xe4 /* 802D95CC 002D650C 7F C4 F3 78 */ mr r4, r30 -/* 802D95D0 002D6510 48 00 28 2D */ bl JSUPtrLink +/* 802D95D0 002D6510 48 00 28 2D */ bl __ct__10JSUPtrLinkFPv /* 802D95D4 002D6514 7F C3 F3 78 */ mr r3, r30 /* 802D95D8 002D6518 48 00 02 0D */ bl JKRDvdFile_NS_initiate /* 802D95DC 002D651C 7F C3 F3 78 */ mr r3, r30 @@ -46,7 +46,7 @@ JKRDvdFile_X1_: /* 802D9610 002D6550 7C 9F 23 78 */ mr r31, r4 /* 802D9614 002D6554 7F A0 EB 78 */ mr r0, r29 /* 802D9618 002D6558 7C 1E 03 78 */ mr r30, r0 -/* 802D961C 002D655C 4B FF 7E 61 */ bl JKRDisposer +/* 802D961C 002D655C 4B FF 7E 61 */ bl __ct__11JKRDisposerFv /* 802D9620 002D6560 3C 60 80 3D */ lis r3, lbl_803CC328@ha /* 802D9624 002D6564 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l /* 802D9628 002D6568 90 1E 00 00 */ stw r0, 0(r30) @@ -57,7 +57,7 @@ JKRDvdFile_X1_: /* 802D963C 002D657C 90 1D 00 00 */ stw r0, 0(r29) /* 802D9640 002D6580 38 7D 00 E4 */ addi r3, r29, 0xe4 /* 802D9644 002D6584 7F A4 EB 78 */ mr r4, r29 -/* 802D9648 002D6588 48 00 27 B5 */ bl JSUPtrLink +/* 802D9648 002D6588 48 00 27 B5 */ bl __ct__10JSUPtrLinkFPv /* 802D964C 002D658C 7F A3 EB 78 */ mr r3, r29 /* 802D9650 002D6590 48 00 01 95 */ bl JKRDvdFile_NS_initiate /* 802D9654 002D6594 7F A3 EB 78 */ mr r3, r29 @@ -93,7 +93,7 @@ JKRDvdFile_X2_: /* 802D96B8 002D65F8 7C 9F 23 78 */ mr r31, r4 /* 802D96BC 002D65FC 7F A0 EB 78 */ mr r0, r29 /* 802D96C0 002D6600 7C 1E 03 78 */ mr r30, r0 -/* 802D96C4 002D6604 4B FF 7D B9 */ bl JKRDisposer +/* 802D96C4 002D6604 4B FF 7D B9 */ bl __ct__11JKRDisposerFv /* 802D96C8 002D6608 3C 60 80 3D */ lis r3, lbl_803CC328@ha /* 802D96CC 002D660C 38 03 C3 28 */ addi r0, r3, lbl_803CC328@l /* 802D96D0 002D6610 90 1E 00 00 */ stw r0, 0(r30) @@ -104,7 +104,7 @@ JKRDvdFile_X2_: /* 802D96E4 002D6624 90 1D 00 00 */ stw r0, 0(r29) /* 802D96E8 002D6628 38 7D 00 E4 */ addi r3, r29, 0xe4 /* 802D96EC 002D662C 7F A4 EB 78 */ mr r4, r29 -/* 802D96F0 002D6630 48 00 27 0D */ bl JSUPtrLink +/* 802D96F0 002D6630 48 00 27 0D */ bl __ct__10JSUPtrLinkFPv /* 802D96F4 002D6634 7F A3 EB 78 */ mr r3, r29 /* 802D96F8 002D6638 48 00 00 ED */ bl JKRDvdFile_NS_initiate /* 802D96FC 002D663C 7F A3 EB 78 */ mr r3, r29 @@ -150,7 +150,7 @@ JKRDvdFile_NS_dtor: /* 802D9788 002D66C8 41 82 00 10 */ beq lbl_802D9798 /* 802D978C 002D66CC 38 7E 00 E4 */ addi r3, r30, 0xe4 /* 802D9790 002D66D0 38 80 00 00 */ li r4, 0 -/* 802D9794 002D66D4 48 00 26 81 */ bl JSUPtrLink_NS_dtor +/* 802D9794 002D66D4 48 00 26 81 */ bl __dt__10JSUPtrLinkFv lbl_802D9798: /* 802D9798 002D66D8 28 1E 00 00 */ cmplwi r30, 0 /* 802D979C 002D66DC 41 82 00 1C */ beq lbl_802D97B8 @@ -159,12 +159,12 @@ lbl_802D9798: /* 802D97A8 002D66E8 90 1E 00 00 */ stw r0, 0(r30) /* 802D97AC 002D66EC 7F C3 F3 78 */ mr r3, r30 /* 802D97B0 002D66F0 38 80 00 00 */ li r4, 0 -/* 802D97B4 002D66F4 4B FF 7D 31 */ bl JKRDisposer_NS_dtor +/* 802D97B4 002D66F4 4B FF 7D 31 */ bl __dt__11JKRDisposerFv lbl_802D97B8: /* 802D97B8 002D66F8 7F E0 07 35 */ extsh. r0, r31 /* 802D97BC 002D66FC 40 81 00 0C */ ble lbl_802D97C8 /* 802D97C0 002D6700 7F C3 F3 78 */ mr r3, r30 -/* 802D97C4 002D6704 4B FF 55 79 */ bl __dl +/* 802D97C4 002D6704 4B FF 55 79 */ bl __dl__FPv lbl_802D97C8: /* 802D97C8 002D6708 7F C3 F3 78 */ mr r3, r30 /* 802D97CC 002D670C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -226,7 +226,7 @@ JKRDvdFile_NS_open: /* 802D9894 002D67D4 3C 60 80 43 */ lis r3, lbl_8043436C@ha /* 802D9898 002D67D8 38 63 43 6C */ addi r3, r3, lbl_8043436C@l /* 802D989C 002D67DC 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D98A0 002D67E0 48 00 26 AD */ bl JSUPtrList_NS_append +/* 802D98A0 002D67E0 48 00 26 AD */ bl append__10JSUPtrListFP10JSUPtrLink /* 802D98A4 002D67E4 38 7F 00 5C */ addi r3, r31, 0x5c /* 802D98A8 002D67E8 48 07 18 D5 */ bl DVDGetCommandBlockStatus lbl_802D98AC: @@ -259,7 +259,7 @@ JKRDvdFile_NS_open_X1_: /* 802D9908 002D6848 3C 60 80 43 */ lis r3, lbl_8043436C@ha /* 802D990C 002D684C 38 63 43 6C */ addi r3, r3, lbl_8043436C@l /* 802D9910 002D6850 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D9914 002D6854 48 00 26 39 */ bl JSUPtrList_NS_append +/* 802D9914 002D6854 48 00 26 39 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802D9918 002D6858 38 7F 00 5C */ addi r3, r31, 0x5c /* 802D991C 002D685C 48 07 18 61 */ bl DVDGetCommandBlockStatus lbl_802D9920: @@ -286,7 +286,7 @@ lbl_802D9920: /* 802D9970 002D68B0 3C 60 80 43 */ lis r3, lbl_8043436C@ha /* 802D9974 002D68B4 38 63 43 6C */ addi r3, r3, lbl_8043436C@l /* 802D9978 002D68B8 38 9F 00 E4 */ addi r4, r31, 0xe4 -/* 802D997C 002D68BC 48 00 27 E1 */ bl JSUPtrList_NS_remove +/* 802D997C 002D68BC 48 00 27 E1 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D9980 002D68C0 48 00 00 20 */ b lbl_802D99A0 lbl_802D9984: /* 802D9984 002D68C4 3C 60 80 3A */ lis r3, lbl_8039D260@ha @@ -400,7 +400,7 @@ JKRDvdFile_NS_doneProcess: /* 802D9B08 002D6A48 90 01 00 14 */ stw r0, 0x14(r1) /* 802D9B0C 002D6A4C 3C 60 80 43 */ lis r3, lbl_8043436C@ha /* 802D9B10 002D6A50 38 63 43 6C */ addi r3, r3, lbl_8043436C@l -/* 802D9B14 002D6A54 48 00 24 01 */ bl JSUPtrList_NS_initiate +/* 802D9B14 002D6A54 48 00 24 01 */ bl initiate__10JSUPtrListFv /* 802D9B18 002D6A58 3C 60 80 43 */ lis r3, lbl_8043436C@ha /* 802D9B1C 002D6A5C 38 63 43 6C */ addi r3, r3, lbl_8043436C@l .global JSUList_NS_dtor_X7_ @@ -425,11 +425,11 @@ JSUList_NS_dtor_X7_: /* 802D9B5C 002D6A9C 7C 9F 23 78 */ mr r31, r4 /* 802D9B60 002D6AA0 41 82 00 1C */ beq lbl_802D9B7C /* 802D9B64 002D6AA4 38 80 00 00 */ li r4, 0 -/* 802D9B68 002D6AA8 48 00 23 45 */ bl JSUPtrList_NS_dtor +/* 802D9B68 002D6AA8 48 00 23 45 */ bl __dt__10JSUPtrListFv /* 802D9B6C 002D6AAC 7F E0 07 35 */ extsh. r0, r31 /* 802D9B70 002D6AB0 40 81 00 0C */ ble lbl_802D9B7C /* 802D9B74 002D6AB4 7F C3 F3 78 */ mr r3, r30 -/* 802D9B78 002D6AB8 4B FF 51 C5 */ bl __dl +/* 802D9B78 002D6AB8 4B FF 51 C5 */ bl __dl__FPv lbl_802D9B7C: /* 802D9B7C 002D6ABC 7F C3 F3 78 */ mr r3, r30 /* 802D9B80 002D6AC0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRDvdRipper.s b/asm/JKernel/JKRDvdRipper.s index 00febb3a1a..9d33f38b55 100644 --- a/asm/JKernel/JKRDvdRipper.s +++ b/asm/JKernel/JKRDvdRipper.s @@ -199,7 +199,7 @@ lbl_802D9E34: /* 802D9E4C 002D6D8C 38 80 00 20 */ li r4, 0x20 lbl_802D9E50: /* 802D9E50 002D6D90 7E 85 A3 78 */ mr r5, r20 -/* 802D9E54 002D6D94 4B FF 46 21 */ bl JKRHeap_NS_alloc +/* 802D9E54 002D6D94 4B FF 46 21 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D9E58 002D6D98 7C 7C 1B 78 */ mr r28, r3 /* 802D9E5C 002D6D9C 3B 20 00 01 */ li r25, 1 lbl_802D9E60: @@ -213,7 +213,7 @@ lbl_802D9E70: /* 802D9E78 002D6DB8 7F 03 C3 78 */ mr r3, r24 /* 802D9E7C 002D6DBC 38 80 00 20 */ li r4, 0x20 /* 802D9E80 002D6DC0 7E 85 A3 78 */ mr r5, r20 -/* 802D9E84 002D6DC4 4B FF 45 F1 */ bl JKRHeap_NS_alloc +/* 802D9E84 002D6DC4 4B FF 45 F1 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D9E88 002D6DC8 7C 7D 1B 79 */ or. r29, r3, r3 /* 802D9E8C 002D6DCC 40 82 00 74 */ bne lbl_802D9F00 /* 802D9E90 002D6DD0 57 20 06 3E */ clrlwi r0, r25, 0x18 @@ -221,7 +221,7 @@ lbl_802D9E70: /* 802D9E98 002D6DD8 40 82 00 68 */ bne lbl_802D9F00 /* 802D9E9C 002D6DDC 7F 83 E3 78 */ mr r3, r28 /* 802D9EA0 002D6DE0 38 80 00 00 */ li r4, 0 -/* 802D9EA4 002D6DE4 4B FF 46 5D */ bl JKRHeap_NS_free +/* 802D9EA4 002D6DE4 4B FF 46 5D */ bl free__7JKRHeapFPvP7JKRHeap /* 802D9EA8 002D6DE8 38 60 00 00 */ li r3, 0 /* 802D9EAC 002D6DEC 48 00 03 20 */ b lbl_802DA1CC lbl_802D9EB0: @@ -240,7 +240,7 @@ lbl_802D9ED0: /* 802D9EDC 002D6E1C 38 80 00 20 */ li r4, 0x20 lbl_802D9EE0: /* 802D9EE0 002D6E20 7E 85 A3 78 */ mr r5, r20 -/* 802D9EE4 002D6E24 4B FF 45 91 */ bl JKRHeap_NS_alloc +/* 802D9EE4 002D6E24 4B FF 45 91 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D9EE8 002D6E28 7C 7C 1B 78 */ mr r28, r3 /* 802D9EEC 002D6E2C 3B 20 00 01 */ li r25, 1 lbl_802D9EF0: @@ -277,7 +277,7 @@ lbl_802D9F54: /* 802D9F5C 002D6E9C 40 82 00 10 */ bne lbl_802D9F6C /* 802D9F60 002D6EA0 7F 83 E3 78 */ mr r3, r28 /* 802D9F64 002D6EA4 38 80 00 00 */ li r4, 0 -/* 802D9F68 002D6EA8 4B FF 45 99 */ bl JKRHeap_NS_free +/* 802D9F68 002D6EA8 4B FF 45 99 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D9F6C: /* 802D9F6C 002D6EAC 38 60 00 00 */ li r3, 0 /* 802D9F70 002D6EB0 48 00 02 5C */ b lbl_802DA1CC @@ -329,7 +329,7 @@ lbl_802DA004: /* 802DA00C 002D6F4C 40 82 00 10 */ bne lbl_802DA01C /* 802DA010 002D6F50 7F 83 E3 78 */ mr r3, r28 /* 802DA014 002D6F54 38 80 00 00 */ li r4, 0 -/* 802DA018 002D6F58 4B FF 44 E9 */ bl JKRHeap_NS_free +/* 802DA018 002D6F58 4B FF 44 E9 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802DA01C: /* 802DA01C 002D6F5C 38 60 00 00 */ li r3, 0 /* 802DA020 002D6F60 48 00 01 AC */ b lbl_802DA1CC @@ -398,11 +398,11 @@ lbl_802DA0F0: /* 802DA0F8 002D7038 40 82 00 10 */ bne lbl_802DA108 /* 802DA0FC 002D703C 7F 83 E3 78 */ mr r3, r28 /* 802DA100 002D7040 38 80 00 00 */ li r4, 0 -/* 802DA104 002D7044 4B FF 43 FD */ bl JKRHeap_NS_free +/* 802DA104 002D7044 4B FF 43 FD */ bl free__7JKRHeapFPvP7JKRHeap lbl_802DA108: /* 802DA108 002D7048 7F A3 EB 78 */ mr r3, r29 /* 802DA10C 002D704C 38 80 00 00 */ li r4, 0 -/* 802DA110 002D7050 4B FF 43 F1 */ bl JKRHeap_NS_free +/* 802DA110 002D7050 4B FF 43 F1 */ bl free__7JKRHeapFPvP7JKRHeap /* 802DA114 002D7054 38 60 00 00 */ li r3, 0 /* 802DA118 002D7058 48 00 00 B4 */ b lbl_802DA1CC lbl_802DA11C: @@ -419,7 +419,7 @@ lbl_802DA124: /* 802DA140 002D7080 48 00 18 49 */ bl JKRDecomp_NS_orderSync /* 802DA144 002D7084 7F A3 EB 78 */ mr r3, r29 /* 802DA148 002D7088 38 80 00 00 */ li r4, 0 -/* 802DA14C 002D708C 4B FF 43 B5 */ bl JKRHeap_NS_free +/* 802DA14C 002D708C 4B FF 43 B5 */ bl free__7JKRHeapFPvP7JKRHeap /* 802DA150 002D7090 28 17 00 00 */ cmplwi r23, 0 /* 802DA154 002D7094 41 82 00 08 */ beq lbl_802DA15C /* 802DA158 002D7098 93 57 00 00 */ stw r26, 0(r23) @@ -443,7 +443,7 @@ lbl_802DA164: /* 802DA198 002D70D8 41 82 00 10 */ beq lbl_802DA1A8 /* 802DA19C 002D70DC 7F 83 E3 78 */ mr r3, r28 /* 802DA1A0 002D70E0 38 80 00 00 */ li r4, 0 -/* 802DA1A4 002D70E4 4B FF 43 5D */ bl JKRHeap_NS_free +/* 802DA1A4 002D70E4 4B FF 43 5D */ bl free__7JKRHeapFPvP7JKRHeap lbl_802DA1A8: /* 802DA1A8 002D70E8 3B 80 00 00 */ li r28, 0 lbl_802DA1AC: @@ -454,7 +454,7 @@ lbl_802DA1B4: /* 802DA1B8 002D70F8 41 82 00 10 */ beq lbl_802DA1C8 /* 802DA1BC 002D70FC 7F 83 E3 78 */ mr r3, r28 /* 802DA1C0 002D7100 38 80 00 00 */ li r4, 0 -/* 802DA1C4 002D7104 4B FF 43 3D */ bl JKRHeap_NS_free +/* 802DA1C4 002D7104 4B FF 43 3D */ bl free__7JKRHeapFPvP7JKRHeap lbl_802DA1C8: /* 802DA1C8 002D7108 38 60 00 00 */ li r3, 0 lbl_802DA1CC: @@ -499,7 +499,7 @@ lbl_802DA23C: /* 802DA254 002D7194 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DA258 002D7198 7F 04 C3 78 */ mr r4, r24 /* 802DA25C 002D719C 38 A0 FF E0 */ li r5, -32 -/* 802DA260 002D71A0 4B FF 42 75 */ bl JKRHeap_NS_alloc_X1_ +/* 802DA260 002D71A0 4B FF 42 75 */ bl alloc__7JKRHeapFUli /* 802DA264 002D71A4 90 6D 8E A8 */ stw r3, lbl_80451428-_SDA_BASE_(r13) /* 802DA268 002D71A8 7C 03 C2 14 */ add r0, r3, r24 /* 802DA26C 002D71AC 90 0D 8E AC */ stw r0, lbl_8045142C-_SDA_BASE_(r13) @@ -508,7 +508,7 @@ lbl_802DA23C: /* 802DA278 002D71B8 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DA27C 002D71BC 38 80 11 20 */ li r4, 0x1120 /* 802DA280 002D71C0 38 A0 FF FC */ li r5, -4 -/* 802DA284 002D71C4 4B FF 42 51 */ bl JKRHeap_NS_alloc_X1_ +/* 802DA284 002D71C4 4B FF 42 51 */ bl alloc__7JKRHeapFUli /* 802DA288 002D71C8 90 6D 8E B0 */ stw r3, lbl_80451430-_SDA_BASE_(r13) /* 802DA28C 002D71CC 38 03 11 20 */ addi r0, r3, 0x1120 /* 802DA290 002D71D0 90 0D 8E B4 */ stw r0, lbl_80451434-_SDA_BASE_(r13) @@ -548,12 +548,12 @@ lbl_802DA300: /* 802DA300 002D7240 7C 78 1B 78 */ mr r24, r3 /* 802DA304 002D7244 80 6D 8E A8 */ lwz r3, lbl_80451428-_SDA_BASE_(r13) /* 802DA308 002D7248 38 80 00 00 */ li r4, 0 -/* 802DA30C 002D724C 4B FF 41 F5 */ bl JKRHeap_NS_free +/* 802DA30C 002D724C 4B FF 41 F5 */ bl free__7JKRHeapFPvP7JKRHeap /* 802DA310 002D7250 80 6D 8E B0 */ lwz r3, lbl_80451430-_SDA_BASE_(r13) /* 802DA314 002D7254 28 03 00 00 */ cmplwi r3, 0 /* 802DA318 002D7258 41 82 00 0C */ beq lbl_802DA324 /* 802DA31C 002D725C 38 80 00 00 */ li r4, 0 -/* 802DA320 002D7260 4B FF 41 E1 */ bl JKRHeap_NS_free +/* 802DA320 002D7260 4B FF 41 E1 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802DA324: /* 802DA324 002D7264 7F 43 D3 78 */ mr r3, r26 /* 802DA328 002D7268 80 8D 8E DC */ lwz r4, lbl_8045145C-_SDA_BASE_(r13) @@ -913,7 +913,7 @@ JKRDvdRipper_NS_isErrorRetry: /* 802DA7E4 002D7724 90 01 00 14 */ stw r0, 0x14(r1) /* 802DA7E8 002D7728 3C 60 80 43 */ lis r3, lbl_80434384@ha /* 802DA7EC 002D772C 38 63 43 84 */ addi r3, r3, lbl_80434384@l -/* 802DA7F0 002D7730 48 00 17 25 */ bl JSUPtrList_NS_initiate +/* 802DA7F0 002D7730 48 00 17 25 */ bl initiate__10JSUPtrListFv /* 802DA7F4 002D7734 3C 60 80 43 */ lis r3, lbl_80434384@ha /* 802DA7F8 002D7738 38 63 43 84 */ addi r3, r3, lbl_80434384@l .global JSUList_NS_dtor_X8_ @@ -938,11 +938,11 @@ JSUList_NS_dtor_X8_: /* 802DA838 002D7778 7C 9F 23 78 */ mr r31, r4 /* 802DA83C 002D777C 41 82 00 1C */ beq lbl_802DA858 /* 802DA840 002D7780 38 80 00 00 */ li r4, 0 -/* 802DA844 002D7784 48 00 16 69 */ bl JSUPtrList_NS_dtor +/* 802DA844 002D7784 48 00 16 69 */ bl __dt__10JSUPtrListFv /* 802DA848 002D7788 7F E0 07 35 */ extsh. r0, r31 /* 802DA84C 002D778C 40 81 00 0C */ ble lbl_802DA858 /* 802DA850 002D7790 7F C3 F3 78 */ mr r3, r30 -/* 802DA854 002D7794 4B FF 44 E9 */ bl __dl +/* 802DA854 002D7794 4B FF 44 E9 */ bl __dl__FPv lbl_802DA858: /* 802DA858 002D7798 7F C3 F3 78 */ mr r3, r30 /* 802DA85C 002D779C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index 7760c4518b..fc2e29ee6d 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -17,7 +17,7 @@ JKRExpHeap_NS_createRoot: /* 802CEDD8 002CBD18 40 82 00 38 */ bne lbl_802CEE10 /* 802CEDDC 002CBD1C 38 61 00 0C */ addi r3, r1, 0xc /* 802CEDE0 002CBD20 38 81 00 08 */ addi r4, r1, 8 -/* 802CEDE4 002CBD24 4B FF F5 95 */ bl JKRHeap_NS_initArena +/* 802CEDE4 002CBD24 4B FF F5 95 */ bl initArena__7JKRHeapFPPcPUli /* 802CEDE8 002CBD28 80 61 00 0C */ lwz r3, 0xc(r1) /* 802CEDEC 002CBD2C 38 83 00 90 */ addi r4, r3, 0x90 /* 802CEDF0 002CBD30 80 A1 00 08 */ lwz r5, 8(r1) @@ -55,7 +55,7 @@ lbl_802CEE50: /* 802CEE58 002CBD98 40 82 00 10 */ bne lbl_802CEE68 /* 802CEE5C 002CBD9C 7F 83 E3 78 */ mr r3, r28 /* 802CEE60 002CBDA0 38 80 00 10 */ li r4, 0x10 -/* 802CEE64 002CBDA4 4B FF F9 79 */ bl JKRHeap_NS_getMaxAllocatableSize +/* 802CEE64 002CBDA4 4B FF F9 79 */ bl getMaxAllocatableSize__7JKRHeapFi lbl_802CEE68: /* 802CEE68 002CBDA8 54 7F 00 36 */ rlwinm r31, r3, 0, 0, 0x1b /* 802CEE6C 002CBDAC 28 1F 00 A0 */ cmplwi r31, 0xa0 @@ -66,7 +66,7 @@ lbl_802CEE7C: /* 802CEE7C 002CBDBC 7F E3 FB 78 */ mr r3, r31 /* 802CEE80 002CBDC0 38 80 00 10 */ li r4, 0x10 /* 802CEE84 002CBDC4 7F 85 E3 78 */ mr r5, r28 -/* 802CEE88 002CBDC8 4B FF F5 ED */ bl JKRHeap_NS_alloc +/* 802CEE88 002CBDC8 4B FF F5 ED */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802CEE8C 002CBDCC 7C 60 1B 78 */ mr r0, r3 /* 802CEE90 002CBDD0 7C 1E 03 79 */ or. r30, r0, r0 /* 802CEE94 002CBDD4 38 9E 00 90 */ addi r4, r30, 0x90 @@ -86,7 +86,7 @@ lbl_802CEEC0: /* 802CEEC4 002CBE04 40 82 00 18 */ bne lbl_802CEEDC /* 802CEEC8 002CBE08 7F C3 F3 78 */ mr r3, r30 /* 802CEECC 002CBE0C 38 80 00 00 */ li r4, 0 -/* 802CEED0 002CBE10 4B FF F6 31 */ bl JKRHeap_NS_free +/* 802CEED0 002CBE10 4B FF F6 31 */ bl free__7JKRHeapFPvP7JKRHeap /* 802CEED4 002CBE14 38 60 00 00 */ li r3, 0 /* 802CEED8 002CBE18 48 00 00 10 */ b lbl_802CEEE8 lbl_802CEEDC: @@ -115,7 +115,7 @@ JKRExpHeap_NS_create_X1_: /* 802CEF24 002CBE64 40 82 00 20 */ bne lbl_802CEF44 /* 802CEF28 002CBE68 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) /* 802CEF2C 002CBE6C 7F A4 EB 78 */ mr r4, r29 -/* 802CEF30 002CBE70 4B FF F9 65 */ bl JKRHeap_NS_find +/* 802CEF30 002CBE70 4B FF F9 65 */ bl find__7JKRHeapCFPv /* 802CEF34 002CBE74 7C 66 1B 79 */ or. r6, r3, r3 /* 802CEF38 002CBE78 40 82 00 10 */ bne lbl_802CEF48 /* 802CEF3C 002CBE7C 38 60 00 00 */ li r3, 0 @@ -171,7 +171,7 @@ lbl_802CEF94: /* 802CEFF0 002CBF30 4E 80 04 21 */ bctrl /* 802CEFF4 002CBF34 7F C3 F3 78 */ mr r3, r30 /* 802CEFF8 002CBF38 7F E4 FB 78 */ mr r4, r31 -/* 802CEFFC 002CBF3C 4B FF F5 05 */ bl JKRHeap_NS_free +/* 802CEFFC 002CBF3C 4B FF F5 05 */ bl free__7JKRHeapFPvP7JKRHeap /* 802CF000 002CBF40 48 00 00 18 */ b lbl_802CF018 lbl_802CF004: /* 802CF004 002CBF44 38 80 FF FF */ li r4, -1 @@ -197,7 +197,7 @@ JKRExpHeap: /* 802CF044 002CBF84 7C 7D 1B 78 */ mr r29, r3 /* 802CF048 002CBF88 7C 9E 23 78 */ mr r30, r4 /* 802CF04C 002CBF8C 7C BF 2B 78 */ mr r31, r5 -/* 802CF050 002CBF90 4B FF F0 E9 */ bl JKRHeap +/* 802CF050 002CBF90 4B FF F0 E9 */ bl __ct__7JKRHeapFPvUlP7JKRHeapb /* 802CF054 002CBF94 3C 60 80 3D */ lis r3, lbl_803CBFD0@ha /* 802CF058 002CBF98 38 03 BF D0 */ addi r0, r3, lbl_803CBFD0@l /* 802CF05C 002CBF9C 90 1D 00 00 */ stw r0, 0(r29) @@ -236,14 +236,14 @@ JKRExpHeap: /* 802CF0E0 002CC020 3C 80 80 3D */ lis r4, lbl_803CBFD0@ha /* 802CF0E4 002CC024 38 04 BF D0 */ addi r0, r4, lbl_803CBFD0@l /* 802CF0E8 002CC028 90 1E 00 00 */ stw r0, 0(r30) -/* 802CF0EC 002CC02C 4B FF F9 D5 */ bl JKRHeap_NS_dispose_X2_ +/* 802CF0EC 002CC02C 4B FF F9 D5 */ bl dispose__7JKRHeapFv /* 802CF0F0 002CC030 7F C3 F3 78 */ mr r3, r30 /* 802CF0F4 002CC034 38 80 00 00 */ li r4, 0 -/* 802CF0F8 002CC038 4B FF F1 6D */ bl JKRHeap_NS_dtor +/* 802CF0F8 002CC038 4B FF F1 6D */ bl __dt__7JKRHeapFv /* 802CF0FC 002CC03C 7F E0 07 35 */ extsh. r0, r31 /* 802CF100 002CC040 40 81 00 0C */ ble lbl_802CF10C /* 802CF104 002CC044 7F C3 F3 78 */ mr r3, r30 -/* 802CF108 002CC048 4B FF FC 35 */ bl __dl +/* 802CF108 002CC048 4B FF FC 35 */ bl __dl__FPv lbl_802CF10C: /* 802CF10C 002CC04C 7F C3 F3 78 */ mr r3, r30 /* 802CF110 002CC050 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -765,7 +765,7 @@ lbl_802CF800: /* 802CF834 002CC774 38 7F 00 18 */ addi r3, r31, 0x18 /* 802CF838 002CC778 48 06 F8 09 */ bl OSLockMutex /* 802CF83C 002CC77C 7F E3 FB 78 */ mr r3, r31 -/* 802CF840 002CC780 4B FF ED 35 */ bl JKRHeap_NS_callAllDisposer +/* 802CF840 002CC780 4B FF ED 35 */ bl callAllDisposer__7JKRHeapFv /* 802CF844 002CC784 80 1F 00 30 */ lwz r0, 0x30(r31) /* 802CF848 002CC788 90 1F 00 78 */ stw r0, 0x78(r31) /* 802CF84C 002CC78C 80 1F 00 78 */ lwz r0, 0x78(r31) @@ -805,7 +805,7 @@ lbl_802CF8C4: /* 802CF8D0 002CC810 7F A3 EB 78 */ mr r3, r29 /* 802CF8D4 002CC814 38 9F 00 10 */ addi r4, r31, 0x10 /* 802CF8D8 002CC818 80 BF 00 04 */ lwz r5, 4(r31) -/* 802CF8DC 002CC81C 4B FF F1 9D */ bl JKRHeap_NS_dispose +/* 802CF8DC 002CC81C 4B FF F1 9D */ bl dispose__7JKRHeapFPvUl /* 802CF8E0 002CC820 83 DF 00 0C */ lwz r30, 0xc(r31) /* 802CF8E4 002CC824 7F E3 FB 78 */ mr r3, r31 /* 802CF8E8 002CC828 7F A4 EB 78 */ mr r4, r29 @@ -1999,7 +1999,7 @@ lbl_802D0930: /* 802D096C 002CD8AC 90 7E 00 00 */ stw r3, 0(r30) /* 802D0970 002CD8B0 48 00 00 14 */ b lbl_802D0984 lbl_802D0974: -/* 802D0974 002CD8B4 4B FF DE 11 */ bl JKRHeap_NS_getTotalFreeSize +/* 802D0974 002CD8B4 4B FF DE 11 */ bl getTotalFreeSize__7JKRHeapFv /* 802D0978 002CD8B8 80 1D 00 38 */ lwz r0, 0x38(r29) /* 802D097C 002CD8BC 7C 03 00 50 */ subf r0, r3, r0 /* 802D0980 002CD8C0 90 1E 00 00 */ stw r0, 0(r30) diff --git a/asm/JKernel/JKRFileCache.s b/asm/JKernel/JKRFileCache.s index c45ac30285..72ea3f9884 100644 --- a/asm/JKernel/JKRFileCache.s +++ b/asm/JKernel/JKRFileCache.s @@ -61,7 +61,7 @@ lbl_802D4A68: /* 802D4A70 002D19B0 38 60 00 54 */ li r3, 0x54 /* 802D4A74 002D19B4 7F 64 DB 78 */ mr r4, r27 /* 802D4A78 002D19B8 38 A0 00 00 */ li r5, 0 -/* 802D4A7C 002D19BC 4B FF A2 1D */ bl __nw_X2_ +/* 802D4A7C 002D19BC 4B FF A2 1D */ bl __nw__FUlP7JKRHeapi /* 802D4A80 002D19C0 7C 60 1B 79 */ or. r0, r3, r3 /* 802D4A84 002D19C4 41 82 00 14 */ beq lbl_802D4A98 /* 802D4A88 002D19C8 7F C4 F3 78 */ mr r4, r30 @@ -93,9 +93,9 @@ JKRFileCache: /* 802D4ADC 002D1A1C 38 03 C2 38 */ addi r0, r3, lbl_803CC238@l /* 802D4AE0 002D1A20 90 1F 00 00 */ stw r0, 0(r31) /* 802D4AE4 002D1A24 38 7F 00 3C */ addi r3, r31, 0x3c -/* 802D4AE8 002D1A28 48 00 74 2D */ bl JSUPtrList_NS_initiate +/* 802D4AE8 002D1A28 48 00 74 2D */ bl initiate__10JSUPtrListFv /* 802D4AEC 002D1A2C 7F E3 FB 78 */ mr r3, r31 -/* 802D4AF0 002D1A30 4B FF 9D 4D */ bl JKRHeap_NS_findFromRoot +/* 802D4AF0 002D1A30 4B FF 9D 4D */ bl findFromRoot__7JKRHeapFPv /* 802D4AF4 002D1A34 90 7F 00 38 */ stw r3, 0x38(r31) /* 802D4AF8 002D1A38 38 00 00 01 */ li r0, 1 /* 802D4AFC 002D1A3C 90 1F 00 34 */ stw r0, 0x34(r31) @@ -108,12 +108,12 @@ JKRFileCache: /* 802D4B18 002D1A58 38 7E 00 01 */ addi r3, r30, 1 /* 802D4B1C 002D1A5C 38 80 00 01 */ li r4, 1 /* 802D4B20 002D1A60 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 802D4B24 002D1A64 4B FF 99 51 */ bl JKRHeap_NS_alloc +/* 802D4B24 002D1A64 4B FF 99 51 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D4B28 002D1A68 90 7F 00 48 */ stw r3, 0x48(r31) /* 802D4B2C 002D1A6C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4B30 002D1A70 38 9E 00 02 */ addi r4, r30, 2 /* 802D4B34 002D1A74 38 A0 00 01 */ li r5, 1 -/* 802D4B38 002D1A78 4B FF 99 9D */ bl JKRHeap_NS_alloc_X1_ +/* 802D4B38 002D1A78 4B FF 99 9D */ bl alloc__7JKRHeapFUli /* 802D4B3C 002D1A7C 90 7F 00 4C */ stw r3, 0x4c(r31) /* 802D4B40 002D1A80 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802D4B44 002D1A84 7F 84 E3 78 */ mr r4, r28 @@ -147,7 +147,7 @@ lbl_802D4BA8: /* 802D4BB0 002D1AF0 38 83 00 01 */ addi r4, r3, 1 /* 802D4BB4 002D1AF4 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4BB8 002D1AF8 38 A0 00 00 */ li r5, 0 -/* 802D4BBC 002D1AFC 4B FF 99 19 */ bl JKRHeap_NS_alloc_X1_ +/* 802D4BBC 002D1AFC 4B FF 99 19 */ bl alloc__7JKRHeapFUli /* 802D4BC0 002D1B00 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D4BC4 002D1B04 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D4BC8 002D1B08 7F C4 F3 78 */ mr r4, r30 @@ -171,7 +171,7 @@ lbl_802D4C00: /* 802D4C08 002D1B48 38 83 00 01 */ addi r4, r3, 1 /* 802D4C0C 002D1B4C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4C10 002D1B50 38 A0 00 00 */ li r5, 0 -/* 802D4C14 002D1B54 4B FF 98 C1 */ bl JKRHeap_NS_alloc_X1_ +/* 802D4C14 002D1B54 4B FF 98 C1 */ bl alloc__7JKRHeapFUli /* 802D4C18 002D1B58 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D4C1C 002D1B5C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D4C20 002D1B60 7F C4 F3 78 */ mr r4, r30 @@ -185,7 +185,7 @@ lbl_802D4C3C: /* 802D4C3C 002D1B7C 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D4C40 002D1B80 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D4C44 002D1B84 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D4C48 002D1B88 48 00 73 A9 */ bl JSUPtrList_NS_prepend +/* 802D4C48 002D1B88 48 00 73 A9 */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D4C4C 002D1B8C 38 00 00 01 */ li r0, 1 /* 802D4C50 002D1B90 98 1F 00 30 */ stb r0, 0x30(r31) /* 802D4C54 002D1B94 7F E3 FB 78 */ mr r3, r31 @@ -214,29 +214,29 @@ lbl_802D4C3C: /* 802D4CB0 002D1BF0 28 03 00 00 */ cmplwi r3, 0 /* 802D4CB4 002D1BF4 41 82 00 0C */ beq lbl_802D4CC0 /* 802D4CB8 002D1BF8 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D4CBC 002D1BFC 4B FF 98 45 */ bl JKRHeap_NS_free +/* 802D4CBC 002D1BFC 4B FF 98 45 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D4CC0: /* 802D4CC0 002D1C00 80 9E 00 4C */ lwz r4, 0x4c(r30) /* 802D4CC4 002D1C04 28 04 00 00 */ cmplwi r4, 0 /* 802D4CC8 002D1C08 41 82 00 0C */ beq lbl_802D4CD4 /* 802D4CCC 002D1C0C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) -/* 802D4CD0 002D1C10 4B FF 98 79 */ bl JKRHeap_NS_free_X1_ +/* 802D4CD0 002D1C10 4B FF 98 79 */ bl free__7JKRHeapFPv lbl_802D4CD4: /* 802D4CD4 002D1C14 80 9E 00 50 */ lwz r4, 0x50(r30) /* 802D4CD8 002D1C18 28 04 00 00 */ cmplwi r4, 0 /* 802D4CDC 002D1C1C 41 82 00 0C */ beq lbl_802D4CE8 /* 802D4CE0 002D1C20 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) -/* 802D4CE4 002D1C24 4B FF 98 65 */ bl JKRHeap_NS_free_X1_ +/* 802D4CE4 002D1C24 4B FF 98 65 */ bl free__7JKRHeapFPv lbl_802D4CE8: /* 802D4CE8 002D1C28 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D4CEC 002D1C2C 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D4CF0 002D1C30 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D4CF4 002D1C34 48 00 74 69 */ bl JSUPtrList_NS_remove +/* 802D4CF4 002D1C34 48 00 74 69 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D4CF8 002D1C38 34 1E 00 3C */ addic. r0, r30, 0x3c /* 802D4CFC 002D1C3C 41 82 00 10 */ beq lbl_802D4D0C /* 802D4D00 002D1C40 38 7E 00 3C */ addi r3, r30, 0x3c /* 802D4D04 002D1C44 38 80 00 00 */ li r4, 0 -/* 802D4D08 002D1C48 48 00 71 A5 */ bl JSUPtrList_NS_dtor +/* 802D4D08 002D1C48 48 00 71 A5 */ bl __dt__10JSUPtrListFv lbl_802D4D0C: /* 802D4D0C 002D1C4C 7F C3 F3 78 */ mr r3, r30 /* 802D4D10 002D1C50 38 80 00 00 */ li r4, 0 @@ -244,7 +244,7 @@ lbl_802D4D0C: /* 802D4D18 002D1C58 7F E0 07 35 */ extsh. r0, r31 /* 802D4D1C 002D1C5C 40 81 00 0C */ ble lbl_802D4D28 /* 802D4D20 002D1C60 7F C3 F3 78 */ mr r3, r30 -/* 802D4D24 002D1C64 4B FF A0 19 */ bl __dl +/* 802D4D24 002D1C64 4B FF A0 19 */ bl __dl__FPv lbl_802D4D28: /* 802D4D28 002D1C68 7F C3 F3 78 */ mr r3, r30 /* 802D4D2C 002D1C6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -270,7 +270,7 @@ lbl_802D4D28: /* 802D4D7C 002D1CBC 93 AD 8E 98 */ stw r29, lbl_80451418-_SDA_BASE_(r13) /* 802D4D80 002D1CC0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4D84 002D1CC4 80 9D 00 4C */ lwz r4, 0x4c(r29) -/* 802D4D88 002D1CC8 4B FF 97 C1 */ bl JKRHeap_NS_free_X1_ +/* 802D4D88 002D1CC8 4B FF 97 C1 */ bl free__7JKRHeapFPv /* 802D4D8C 002D1CCC 93 FD 00 4C */ stw r31, 0x4c(r29) /* 802D4D90 002D1CD0 80 7D 00 4C */ lwz r3, 0x4c(r29) /* 802D4D94 002D1CD4 88 03 00 01 */ lbz r0, 1(r3) @@ -283,7 +283,7 @@ lbl_802D4D28: lbl_802D4DB0: /* 802D4DB0 002D1CF0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4DB4 002D1CF4 7F E4 FB 78 */ mr r4, r31 -/* 802D4DB8 002D1CF8 4B FF 97 91 */ bl JKRHeap_NS_free_X1_ +/* 802D4DB8 002D1CF8 4B FF 97 91 */ bl free__7JKRHeapFPv lbl_802D4DBC: /* 802D4DBC 002D1CFC 7F C3 F3 78 */ mr r3, r30 /* 802D4DC0 002D1D00 39 61 00 20 */ addi r11, r1, 0x20 @@ -318,7 +318,7 @@ lbl_802D4DBC: /* 802D4E34 002D1D74 7F A3 EB 78 */ mr r3, r29 /* 802D4E38 002D1D78 38 80 00 20 */ li r4, 0x20 /* 802D4E3C 002D1D7C 80 BC 00 38 */ lwz r5, 0x38(r28) -/* 802D4E40 002D1D80 4B FF 96 35 */ bl JKRHeap_NS_alloc +/* 802D4E40 002D1D80 4B FF 96 35 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D4E44 002D1D84 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D4E48 002D1D88 41 82 00 60 */ beq lbl_802D4EA8 /* 802D4E4C 002D1D8C 38 61 00 08 */ addi r3, r1, 8 @@ -329,7 +329,7 @@ lbl_802D4DBC: /* 802D4E60 002D1DA0 38 60 00 20 */ li r3, 0x20 /* 802D4E64 002D1DA4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D4E68 002D1DA8 38 A0 00 00 */ li r5, 0 -/* 802D4E6C 002D1DAC 4B FF 9E 2D */ bl __nw_X2_ +/* 802D4E6C 002D1DAC 4B FF 9E 2D */ bl __nw__FUlP7JKRHeapi /* 802D4E70 002D1DB0 7C 64 1B 79 */ or. r4, r3, r3 /* 802D4E74 002D1DB4 41 82 00 18 */ beq lbl_802D4E8C /* 802D4E78 002D1DB8 80 81 00 94 */ lwz r4, 0x94(r1) @@ -339,7 +339,7 @@ lbl_802D4DBC: /* 802D4E88 002D1DC8 7C 64 1B 78 */ mr r4, r3 lbl_802D4E8C: /* 802D4E8C 002D1DCC 38 7C 00 3C */ addi r3, r28, 0x3c -/* 802D4E90 002D1DD0 48 00 70 BD */ bl JSUPtrList_NS_append +/* 802D4E90 002D1DD0 48 00 70 BD */ bl append__10JSUPtrListFP10JSUPtrLink /* 802D4E94 002D1DD4 48 00 00 14 */ b lbl_802D4EA8 lbl_802D4E98: /* 802D4E98 002D1DD8 80 83 00 10 */ lwz r4, 0x10(r3) @@ -349,7 +349,7 @@ lbl_802D4E98: lbl_802D4EA8: /* 802D4EA8 002D1DE8 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D4EAC 002D1DEC 7F C4 F3 78 */ mr r4, r30 -/* 802D4EB0 002D1DF0 4B FF 96 99 */ bl JKRHeap_NS_free_X1_ +/* 802D4EB0 002D1DF0 4B FF 96 99 */ bl free__7JKRHeapFPv /* 802D4EB4 002D1DF4 38 61 00 08 */ addi r3, r1, 8 /* 802D4EB8 002D1DF8 38 80 FF FF */ li r4, -1 /* 802D4EBC 002D1DFC 48 00 48 8D */ bl JKRDvdFile_NS_dtor @@ -443,7 +443,7 @@ lbl_802D4FF4: lbl_802D5008: /* 802D5008 002D1F48 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D500C 002D1F4C 7F E4 FB 78 */ mr r4, r31 -/* 802D5010 002D1F50 4B FF 95 39 */ bl JKRHeap_NS_free_X1_ +/* 802D5010 002D1F50 4B FF 95 39 */ bl free__7JKRHeapFPv /* 802D5014 002D1F54 38 61 00 08 */ addi r3, r1, 8 /* 802D5018 002D1F58 38 80 FF FF */ li r4, -1 /* 802D501C 002D1F5C 48 00 47 2D */ bl JKRDvdFile_NS_dtor @@ -506,10 +506,10 @@ lbl_802D50F4: /* 802D50F4 002D2034 80 7E 00 00 */ lwz r3, 0(r30) /* 802D50F8 002D2038 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802D50FC 002D203C 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 802D5100 002D2040 4B FF 94 01 */ bl JKRHeap_NS_free +/* 802D5100 002D2040 4B FF 94 01 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D5104 002D2044 80 9E 00 00 */ lwz r4, 0(r30) /* 802D5108 002D2048 38 7D 00 3C */ addi r3, r29, 0x3c -/* 802D510C 002D204C 48 00 70 51 */ bl JSUPtrList_NS_remove +/* 802D510C 002D204C 48 00 70 51 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D5110 002D2050 93 C1 00 08 */ stw r30, 8(r1) /* 802D5114 002D2054 83 DE 00 0C */ lwz r30, 0xc(r30) /* 802D5118 002D2058 80 61 00 08 */ lwz r3, 8(r1) @@ -520,10 +520,10 @@ lbl_802D50F4: /* 802D512C 002D206C 41 82 00 10 */ beq lbl_802D513C /* 802D5130 002D2070 7F E3 FB 78 */ mr r3, r31 /* 802D5134 002D2074 38 80 00 00 */ li r4, 0 -/* 802D5138 002D2078 48 00 6C DD */ bl JSUPtrLink_NS_dtor +/* 802D5138 002D2078 48 00 6C DD */ bl __dt__10JSUPtrLinkFv lbl_802D513C: /* 802D513C 002D207C 7F E3 FB 78 */ mr r3, r31 -/* 802D5140 002D2080 4B FF 9B FD */ bl __dl +/* 802D5140 002D2080 4B FF 9B FD */ bl __dl__FPv lbl_802D5144: /* 802D5144 002D2084 28 1E 00 00 */ cmplwi r30, 0 /* 802D5148 002D2088 40 82 FF AC */ bne lbl_802D50F4 @@ -552,19 +552,19 @@ lbl_802D5194: /* 802D51A0 002D20E0 40 82 00 3C */ bne lbl_802D51DC /* 802D51A4 002D20E4 7F C3 F3 78 */ mr r3, r30 /* 802D51A8 002D20E8 80 9D 00 38 */ lwz r4, 0x38(r29) -/* 802D51AC 002D20EC 4B FF 93 55 */ bl JKRHeap_NS_free +/* 802D51AC 002D20EC 4B FF 93 55 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D51B0 002D20F0 38 7D 00 3C */ addi r3, r29, 0x3c /* 802D51B4 002D20F4 7F E4 FB 78 */ mr r4, r31 -/* 802D51B8 002D20F8 48 00 6F A5 */ bl JSUPtrList_NS_remove +/* 802D51B8 002D20F8 48 00 6F A5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D51BC 002D20FC 28 1F 00 00 */ cmplwi r31, 0 /* 802D51C0 002D2100 41 82 00 1C */ beq lbl_802D51DC /* 802D51C4 002D2104 41 82 00 10 */ beq lbl_802D51D4 /* 802D51C8 002D2108 7F E3 FB 78 */ mr r3, r31 /* 802D51CC 002D210C 38 80 00 00 */ li r4, 0 -/* 802D51D0 002D2110 48 00 6C 45 */ bl JSUPtrLink_NS_dtor +/* 802D51D0 002D2110 48 00 6C 45 */ bl __dt__10JSUPtrLinkFv lbl_802D51D4: /* 802D51D4 002D2114 7F E3 FB 78 */ mr r3, r31 -/* 802D51D8 002D2118 4B FF 9B 65 */ bl __dl +/* 802D51D8 002D2118 4B FF 9B 65 */ bl __dl__FPv lbl_802D51DC: /* 802D51DC 002D211C 38 60 00 01 */ li r3, 1 lbl_802D51E0: @@ -588,16 +588,16 @@ lbl_802D51E0: lbl_802D5224: /* 802D5224 002D2164 38 7E 00 3C */ addi r3, r30, 0x3c /* 802D5228 002D2168 7F E4 FB 78 */ mr r4, r31 -/* 802D522C 002D216C 48 00 6F 31 */ bl JSUPtrList_NS_remove +/* 802D522C 002D216C 48 00 6F 31 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D5230 002D2170 28 1F 00 00 */ cmplwi r31, 0 /* 802D5234 002D2174 41 82 00 1C */ beq lbl_802D5250 /* 802D5238 002D2178 41 82 00 10 */ beq lbl_802D5248 /* 802D523C 002D217C 7F E3 FB 78 */ mr r3, r31 /* 802D5240 002D2180 38 80 00 00 */ li r4, 0 -/* 802D5244 002D2184 48 00 6B D1 */ bl JSUPtrLink_NS_dtor +/* 802D5244 002D2184 48 00 6B D1 */ bl __dt__10JSUPtrLinkFv lbl_802D5248: /* 802D5248 002D2188 7F E3 FB 78 */ mr r3, r31 -/* 802D524C 002D218C 4B FF 9A F1 */ bl __dl +/* 802D524C 002D218C 4B FF 9A F1 */ bl __dl__FPv lbl_802D5250: /* 802D5250 002D2190 38 60 00 01 */ li r3, 1 lbl_802D5254: @@ -648,7 +648,7 @@ lbl_802D52D8: lbl_802D52F4: /* 802D52F4 002D2234 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D52F8 002D2238 7F C4 F3 78 */ mr r4, r30 -/* 802D52FC 002D223C 4B FF 92 4D */ bl JKRHeap_NS_free_X1_ +/* 802D52FC 002D223C 4B FF 92 4D */ bl free__7JKRHeapFPv /* 802D5300 002D2240 7F E3 FB 78 */ mr r3, r31 /* 802D5304 002D2244 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802D5308 002D2248 83 C1 00 28 */ lwz r30, 0x28(r1) @@ -666,7 +666,7 @@ lbl_802D52F4: /* 802D5338 002D2278 38 60 00 24 */ li r3, 0x24 /* 802D533C 002D227C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802D5340 002D2280 38 A0 00 00 */ li r5, 0 -/* 802D5344 002D2284 4B FF 99 55 */ bl __nw_X2_ +/* 802D5344 002D2284 4B FF 99 55 */ bl __nw__FUlP7JKRHeapi /* 802D5348 002D2288 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D534C 002D228C 41 82 00 10 */ beq lbl_802D535C /* 802D5350 002D2290 7F C4 F3 78 */ mr r4, r30 @@ -675,7 +675,7 @@ lbl_802D52F4: lbl_802D535C: /* 802D535C 002D229C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D5360 002D22A0 7F C4 F3 78 */ mr r4, r30 -/* 802D5364 002D22A4 4B FF 91 E5 */ bl JKRHeap_NS_free_X1_ +/* 802D5364 002D22A4 4B FF 91 E5 */ bl free__7JKRHeapFPv /* 802D5368 002D22A8 88 1F 00 10 */ lbz r0, 0x10(r31) /* 802D536C 002D22AC 28 00 00 01 */ cmplwi r0, 1 /* 802D5370 002D22B0 41 82 00 2C */ beq lbl_802D539C @@ -828,7 +828,7 @@ JKRFileCache_NS_getDvdPathName: /* 802D555C 002D249C 7C 83 22 14 */ add r4, r3, r4 /* 802D5560 002D24A0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D5564 002D24A4 38 A0 00 01 */ li r5, 1 -/* 802D5568 002D24A8 4B FF 8F 6D */ bl JKRHeap_NS_alloc_X1_ +/* 802D5568 002D24A8 4B FF 8F 6D */ bl alloc__7JKRHeapFUli /* 802D556C 002D24AC 7C 60 1B 78 */ mr r0, r3 /* 802D5570 002D24B0 7C 1F 03 78 */ mr r31, r0 /* 802D5574 002D24B4 80 9D 00 48 */ lwz r4, 0x48(r29) @@ -859,7 +859,7 @@ lbl_802D55B8: /* 802D55D0 002D2510 7C 83 22 14 */ add r4, r3, r4 /* 802D55D4 002D2514 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802D55D8 002D2518 38 A0 00 01 */ li r5, 1 -/* 802D55DC 002D251C 4B FF 8E F9 */ bl JKRHeap_NS_alloc_X1_ +/* 802D55DC 002D251C 4B FF 8E F9 */ bl alloc__7JKRHeapFUli /* 802D55E0 002D2520 7C 60 1B 78 */ mr r0, r3 /* 802D55E4 002D2524 7C 1F 03 78 */ mr r31, r0 /* 802D55E8 002D2528 80 9D 00 4C */ lwz r4, 0x4c(r29) @@ -914,7 +914,7 @@ JKRFileCache_NS_CCacheBlock: /* 802D5688 002D25C8 7C BE 2B 78 */ mr r30, r5 /* 802D568C 002D25CC 7C DF 33 78 */ mr r31, r6 /* 802D5690 002D25D0 7F 84 E3 78 */ mr r4, r28 -/* 802D5694 002D25D4 48 00 67 69 */ bl JSUPtrLink +/* 802D5694 002D25D4 48 00 67 69 */ bl __ct__10JSUPtrLinkFPv /* 802D5698 002D25D8 38 00 00 01 */ li r0, 1 /* 802D569C 002D25DC 90 1C 00 10 */ stw r0, 0x10(r28) /* 802D56A0 002D25E0 93 BC 00 14 */ stw r29, 0x14(r28) diff --git a/asm/JKernel/JKRFileFinder.s b/asm/JKernel/JKRFileFinder.s index c7582a5b5d..9bfebbfae2 100644 --- a/asm/JKernel/JKRFileFinder.s +++ b/asm/JKernel/JKRFileFinder.s @@ -146,7 +146,7 @@ lbl_802D4848: /* 802D4848 002D1788 7F E0 07 35 */ extsh. r0, r31 /* 802D484C 002D178C 40 81 00 0C */ ble lbl_802D4858 /* 802D4850 002D1790 7F C3 F3 78 */ mr r3, r30 -/* 802D4854 002D1794 4B FF A4 E9 */ bl __dl +/* 802D4854 002D1794 4B FF A4 E9 */ bl __dl__FPv lbl_802D4858: /* 802D4858 002D1798 7F C3 F3 78 */ mr r3, r30 /* 802D485C 002D179C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -207,7 +207,7 @@ lbl_802D48F8: /* 802D4930 002D1870 90 1F 00 0C */ stw r0, 0xc(r31) /* 802D4934 002D1874 7C 80 07 35 */ extsh. r0, r4 /* 802D4938 002D1878 40 81 00 08 */ ble lbl_802D4940 -/* 802D493C 002D187C 4B FF A4 01 */ bl __dl +/* 802D493C 002D187C 4B FF A4 01 */ bl __dl__FPv lbl_802D4940: /* 802D4940 002D1880 7F E3 FB 78 */ mr r3, r31 /* 802D4944 002D1884 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -232,7 +232,7 @@ lbl_802D498C: /* 802D498C 002D18CC 7C 80 07 35 */ extsh. r0, r4 /* 802D4990 002D18D0 40 81 00 0C */ ble lbl_802D499C /* 802D4994 002D18D4 7F E3 FB 78 */ mr r3, r31 -/* 802D4998 002D18D8 4B FF A3 A5 */ bl __dl +/* 802D4998 002D18D8 4B FF A3 A5 */ bl __dl__FPv lbl_802D499C: /* 802D499C 002D18DC 7F E3 FB 78 */ mr r3, r31 /* 802D49A0 002D18E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRFileLoader.s b/asm/JKernel/JKRFileLoader.s index cd6e681757..1a7eb9658a 100644 --- a/asm/JKernel/JKRFileLoader.s +++ b/asm/JKernel/JKRFileLoader.s @@ -10,13 +10,13 @@ JKRFileLoader: /* 802D40F8 002D1038 90 01 00 14 */ stw r0, 0x14(r1) /* 802D40FC 002D103C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802D4100 002D1040 7C 7F 1B 78 */ mr r31, r3 -/* 802D4104 002D1044 4B FF D3 79 */ bl JKRDisposer +/* 802D4104 002D1044 4B FF D3 79 */ bl __ct__11JKRDisposerFv /* 802D4108 002D1048 3C 60 80 3D */ lis r3, lbl_803CC1C8@ha /* 802D410C 002D104C 38 03 C1 C8 */ addi r0, r3, lbl_803CC1C8@l /* 802D4110 002D1050 90 1F 00 00 */ stw r0, 0(r31) /* 802D4114 002D1054 38 7F 00 18 */ addi r3, r31, 0x18 /* 802D4118 002D1058 7F E4 FB 78 */ mr r4, r31 -/* 802D411C 002D105C 48 00 7C E1 */ bl JSUPtrLink +/* 802D411C 002D105C 48 00 7C E1 */ bl __ct__10JSUPtrLinkFPv /* 802D4120 002D1060 38 00 00 00 */ li r0, 0 /* 802D4124 002D1064 90 1F 00 28 */ stw r0, 0x28(r31) /* 802D4128 002D1068 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -51,15 +51,15 @@ lbl_802D4188: /* 802D418C 002D10CC 41 82 00 10 */ beq lbl_802D419C /* 802D4190 002D10D0 38 7E 00 18 */ addi r3, r30, 0x18 /* 802D4194 002D10D4 38 80 00 00 */ li r4, 0 -/* 802D4198 002D10D8 48 00 7C 7D */ bl JSUPtrLink_NS_dtor +/* 802D4198 002D10D8 48 00 7C 7D */ bl __dt__10JSUPtrLinkFv lbl_802D419C: /* 802D419C 002D10DC 7F C3 F3 78 */ mr r3, r30 /* 802D41A0 002D10E0 38 80 00 00 */ li r4, 0 -/* 802D41A4 002D10E4 4B FF D3 41 */ bl JKRDisposer_NS_dtor +/* 802D41A4 002D10E4 4B FF D3 41 */ bl __dt__11JKRDisposerFv /* 802D41A8 002D10E8 7F E0 07 35 */ extsh. r0, r31 /* 802D41AC 002D10EC 40 81 00 0C */ ble lbl_802D41B8 /* 802D41B0 002D10F0 7F C3 F3 78 */ mr r3, r30 -/* 802D41B4 002D10F4 4B FF AB 89 */ bl __dl +/* 802D41B4 002D10F4 4B FF AB 89 */ bl __dl__FPv lbl_802D41B8: /* 802D41B8 002D10F8 7F C3 F3 78 */ mr r3, r30 /* 802D41BC 002D10FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -365,7 +365,7 @@ lbl_802D4588: /* 802D45A8 002D14E8 90 01 00 14 */ stw r0, 0x14(r1) /* 802D45AC 002D14EC 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D45B0 002D14F0 38 63 43 54 */ addi r3, r3, lbl_80434354@l -/* 802D45B4 002D14F4 48 00 79 61 */ bl JSUPtrList_NS_initiate +/* 802D45B4 002D14F4 48 00 79 61 */ bl initiate__10JSUPtrListFv /* 802D45B8 002D14F8 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D45BC 002D14FC 38 63 43 54 */ addi r3, r3, lbl_80434354@l .global JSUList_NS_dtor_X6_ @@ -390,11 +390,11 @@ JSUList_NS_dtor_X6_: /* 802D45FC 002D153C 7C 9F 23 78 */ mr r31, r4 /* 802D4600 002D1540 41 82 00 1C */ beq lbl_802D461C /* 802D4604 002D1544 38 80 00 00 */ li r4, 0 -/* 802D4608 002D1548 48 00 78 A5 */ bl JSUPtrList_NS_dtor +/* 802D4608 002D1548 48 00 78 A5 */ bl __dt__10JSUPtrListFv /* 802D460C 002D154C 7F E0 07 35 */ extsh. r0, r31 /* 802D4610 002D1550 40 81 00 0C */ ble lbl_802D461C /* 802D4614 002D1554 7F C3 F3 78 */ mr r3, r30 -/* 802D4618 002D1558 4B FF A7 25 */ bl __dl +/* 802D4618 002D1558 4B FF A7 25 */ bl __dl__FPv lbl_802D461C: /* 802D461C 002D155C 7F C3 F3 78 */ mr r3, r30 /* 802D4620 002D1560 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JKernel/JKRHeap.s b/asm/JKernel/JKRHeap.s index 8c0a74fe57..574b9bed2f 100644 --- a/asm/JKernel/JKRHeap.s +++ b/asm/JKernel/JKRHeap.s @@ -3,991 +3,5 @@ .section .text, "ax" # 802ce138 -.global JKRHeap -JKRHeap: -/* 802CE138 002CB078 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE13C 002CB07C 7C 08 02 A6 */ mflr r0 -/* 802CE140 002CB080 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE144 002CB084 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE148 002CB088 48 09 40 89 */ bl func_803621D0 -/* 802CE14C 002CB08C 7C 7F 1B 78 */ mr r31, r3 -/* 802CE150 002CB090 7C 9B 23 78 */ mr r27, r4 -/* 802CE154 002CB094 7C BC 2B 78 */ mr r28, r5 -/* 802CE158 002CB098 7C DD 33 78 */ mr r29, r6 -/* 802CE15C 002CB09C 7C FE 3B 78 */ mr r30, r7 -/* 802CE160 002CB0A0 48 00 33 1D */ bl JKRDisposer -/* 802CE164 002CB0A4 3C 60 80 3D */ lis r3, lbl_803CBF70@ha -/* 802CE168 002CB0A8 38 03 BF 70 */ addi r0, r3, lbl_803CBF70@l -/* 802CE16C 002CB0AC 90 1F 00 00 */ stw r0, 0(r31) -/* 802CE170 002CB0B0 3B 5F 00 40 */ addi r26, r31, 0x40 -/* 802CE174 002CB0B4 7F 43 D3 78 */ mr r3, r26 -/* 802CE178 002CB0B8 48 00 DD 9D */ bl JSUPtrList_NS_initiate -/* 802CE17C 002CB0BC 38 7A 00 0C */ addi r3, r26, 0xc -/* 802CE180 002CB0C0 7F E4 FB 78 */ mr r4, r31 -/* 802CE184 002CB0C4 48 00 DC 79 */ bl JSUPtrLink -/* 802CE188 002CB0C8 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802CE18C 002CB0CC 48 00 DD 89 */ bl JSUPtrList_NS_initiate -/* 802CE190 002CB0D0 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802CE194 002CB0D4 48 07 0E 75 */ bl OSInitMutex -/* 802CE198 002CB0D8 93 9F 00 38 */ stw r28, 0x38(r31) -/* 802CE19C 002CB0DC 93 7F 00 30 */ stw r27, 0x30(r31) -/* 802CE1A0 002CB0E0 7C 1B E2 14 */ add r0, r27, r28 -/* 802CE1A4 002CB0E4 90 1F 00 34 */ stw r0, 0x34(r31) -/* 802CE1A8 002CB0E8 28 1D 00 00 */ cmplwi r29, 0 -/* 802CE1AC 002CB0EC 40 82 00 18 */ bne lbl_802CE1C4 -/* 802CE1B0 002CB0F0 7F E3 FB 78 */ mr r3, r31 -/* 802CE1B4 002CB0F4 48 00 02 75 */ bl JKRHeap_NS_becomeSystemHeap -/* 802CE1B8 002CB0F8 7F E3 FB 78 */ mr r3, r31 -/* 802CE1BC 002CB0FC 48 00 02 7D */ bl JKRHeap_NS_becomeCurrentHeap -/* 802CE1C0 002CB100 48 00 00 48 */ b lbl_802CE208 -lbl_802CE1C4: -/* 802CE1C4 002CB104 34 9F 00 40 */ addic. r4, r31, 0x40 -/* 802CE1C8 002CB108 41 82 00 08 */ beq lbl_802CE1D0 -/* 802CE1CC 002CB10C 38 84 00 0C */ addi r4, r4, 0xc -lbl_802CE1D0: -/* 802CE1D0 002CB110 38 7D 00 40 */ addi r3, r29, 0x40 -/* 802CE1D4 002CB114 48 00 DD 79 */ bl JSUPtrList_NS_append -/* 802CE1D8 002CB118 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) -/* 802CE1DC 002CB11C 80 0D 8D F8 */ lwz r0, lbl_80451378-_SDA_BASE_(r13) -/* 802CE1E0 002CB120 7C 03 00 40 */ cmplw r3, r0 -/* 802CE1E4 002CB124 40 82 00 0C */ bne lbl_802CE1F0 -/* 802CE1E8 002CB128 7F E3 FB 78 */ mr r3, r31 -/* 802CE1EC 002CB12C 48 00 02 3D */ bl JKRHeap_NS_becomeSystemHeap -lbl_802CE1F0: -/* 802CE1F0 002CB130 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) -/* 802CE1F4 002CB134 80 0D 8D F8 */ lwz r0, lbl_80451378-_SDA_BASE_(r13) -/* 802CE1F8 002CB138 7C 03 00 40 */ cmplw r3, r0 -/* 802CE1FC 002CB13C 40 82 00 0C */ bne lbl_802CE208 -/* 802CE200 002CB140 7F E3 FB 78 */ mr r3, r31 -/* 802CE204 002CB144 48 00 02 35 */ bl JKRHeap_NS_becomeCurrentHeap -lbl_802CE208: -/* 802CE208 002CB148 9B DF 00 68 */ stb r30, 0x68(r31) -/* 802CE20C 002CB14C 88 1F 00 68 */ lbz r0, 0x68(r31) -/* 802CE210 002CB150 28 00 00 01 */ cmplwi r0, 1 -/* 802CE214 002CB154 40 82 00 1C */ bne lbl_802CE230 -/* 802CE218 002CB158 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) -/* 802CE21C 002CB15C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE220 002CB160 40 82 00 10 */ bne lbl_802CE230 -.global JKRDefaultMemoryErrorRoutine -/* 802CE224 002CB164 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha -.global JKRDefaultMemoryErrorRoutine -/* 802CE228 002CB168 38 03 EB 40 */ addi r0, r3, JKRDefaultMemoryErrorRoutine@l -/* 802CE22C 002CB16C 90 0D 8D FC */ stw r0, lbl_8045137C-_SDA_BASE_(r13) -lbl_802CE230: -/* 802CE230 002CB170 88 0D 83 30 */ lbz r0, lbl_804508B0-_SDA_BASE_(r13) -/* 802CE234 002CB174 98 1F 00 3C */ stb r0, 0x3c(r31) -/* 802CE238 002CB178 88 0D 8E 00 */ lbz r0, lbl_80451380-_SDA_BASE_(r13) -/* 802CE23C 002CB17C 98 1F 00 3D */ stb r0, 0x3d(r31) -/* 802CE240 002CB180 38 00 00 00 */ li r0, 0 -/* 802CE244 002CB184 98 1F 00 69 */ stb r0, 0x69(r31) -/* 802CE248 002CB188 7F E3 FB 78 */ mr r3, r31 -/* 802CE24C 002CB18C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE250 002CB190 48 09 3F CD */ bl func_8036221C -/* 802CE254 002CB194 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE258 002CB198 7C 08 03 A6 */ mtlr r0 -/* 802CE25C 002CB19C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE260 002CB1A0 4E 80 00 20 */ blr - -.global JKRHeap_NS_dtor -JKRHeap_NS_dtor: -/* 802CE264 002CB1A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE268 002CB1A8 7C 08 02 A6 */ mflr r0 -/* 802CE26C 002CB1AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE270 002CB1B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE274 002CB1B4 93 C1 00 08 */ stw r30, 8(r1) -/* 802CE278 002CB1B8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802CE27C 002CB1BC 7C 9F 23 78 */ mr r31, r4 -/* 802CE280 002CB1C0 41 82 00 DC */ beq lbl_802CE35C -/* 802CE284 002CB1C4 3C 60 80 3D */ lis r3, lbl_803CBF70@ha -/* 802CE288 002CB1C8 38 03 BF 70 */ addi r0, r3, lbl_803CBF70@l -/* 802CE28C 002CB1CC 90 1E 00 00 */ stw r0, 0(r30) -/* 802CE290 002CB1D0 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 802CE294 002CB1D4 34 9E 00 40 */ addic. r4, r30, 0x40 -/* 802CE298 002CB1D8 41 82 00 08 */ beq lbl_802CE2A0 -/* 802CE29C 002CB1DC 38 84 00 0C */ addi r4, r4, 0xc -lbl_802CE2A0: -/* 802CE2A0 002CB1E0 48 00 DE BD */ bl JSUPtrList_NS_remove -/* 802CE2A4 002CB1E4 80 8D 8D F8 */ lwz r4, lbl_80451378-_SDA_BASE_(r13) -/* 802CE2A8 002CB1E8 80 64 00 40 */ lwz r3, 0x40(r4) -/* 802CE2AC 002CB1EC 28 03 00 00 */ cmplwi r3, 0 -/* 802CE2B0 002CB1F0 41 82 00 08 */ beq lbl_802CE2B8 -/* 802CE2B4 002CB1F4 38 63 FF F4 */ addi r3, r3, -12 -lbl_802CE2B8: -/* 802CE2B8 002CB1F8 80 0D 8D F4 */ lwz r0, lbl_80451374-_SDA_BASE_(r13) -/* 802CE2BC 002CB1FC 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE2C0 002CB200 40 82 00 1C */ bne lbl_802CE2DC -/* 802CE2C4 002CB204 28 03 00 00 */ cmplwi r3, 0 -/* 802CE2C8 002CB208 40 82 00 0C */ bne lbl_802CE2D4 -/* 802CE2CC 002CB20C 7C 80 23 78 */ mr r0, r4 -/* 802CE2D0 002CB210 48 00 00 08 */ b lbl_802CE2D8 -lbl_802CE2D4: -/* 802CE2D4 002CB214 80 03 00 0C */ lwz r0, 0xc(r3) -lbl_802CE2D8: -/* 802CE2D8 002CB218 90 0D 8D F4 */ stw r0, lbl_80451374-_SDA_BASE_(r13) -lbl_802CE2DC: -/* 802CE2DC 002CB21C 80 0D 8D F0 */ lwz r0, lbl_80451370-_SDA_BASE_(r13) -/* 802CE2E0 002CB220 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE2E4 002CB224 40 82 00 18 */ bne lbl_802CE2FC -/* 802CE2E8 002CB228 28 03 00 00 */ cmplwi r3, 0 -/* 802CE2EC 002CB22C 40 82 00 08 */ bne lbl_802CE2F4 -/* 802CE2F0 002CB230 48 00 00 08 */ b lbl_802CE2F8 -lbl_802CE2F4: -/* 802CE2F4 002CB234 80 83 00 0C */ lwz r4, 0xc(r3) -lbl_802CE2F8: -/* 802CE2F8 002CB238 90 8D 8D F0 */ stw r4, lbl_80451370-_SDA_BASE_(r13) -lbl_802CE2FC: -/* 802CE2FC 002CB23C 34 1E 00 5C */ addic. r0, r30, 0x5c -/* 802CE300 002CB240 41 82 00 10 */ beq lbl_802CE310 -/* 802CE304 002CB244 38 7E 00 5C */ addi r3, r30, 0x5c -/* 802CE308 002CB248 38 80 00 00 */ li r4, 0 -/* 802CE30C 002CB24C 48 00 DB A1 */ bl JSUPtrList_NS_dtor -lbl_802CE310: -/* 802CE310 002CB250 34 1E 00 40 */ addic. r0, r30, 0x40 -/* 802CE314 002CB254 41 82 00 2C */ beq lbl_802CE340 -/* 802CE318 002CB258 34 1E 00 4C */ addic. r0, r30, 0x4c -/* 802CE31C 002CB25C 41 82 00 10 */ beq lbl_802CE32C -/* 802CE320 002CB260 38 7E 00 4C */ addi r3, r30, 0x4c -/* 802CE324 002CB264 38 80 00 00 */ li r4, 0 -/* 802CE328 002CB268 48 00 DA ED */ bl JSUPtrLink_NS_dtor -lbl_802CE32C: -/* 802CE32C 002CB26C 34 1E 00 40 */ addic. r0, r30, 0x40 -/* 802CE330 002CB270 41 82 00 10 */ beq lbl_802CE340 -/* 802CE334 002CB274 38 7E 00 40 */ addi r3, r30, 0x40 -/* 802CE338 002CB278 38 80 00 00 */ li r4, 0 -/* 802CE33C 002CB27C 48 00 DB 71 */ bl JSUPtrList_NS_dtor -lbl_802CE340: -/* 802CE340 002CB280 7F C3 F3 78 */ mr r3, r30 -/* 802CE344 002CB284 38 80 00 00 */ li r4, 0 -/* 802CE348 002CB288 48 00 31 9D */ bl JKRDisposer_NS_dtor -/* 802CE34C 002CB28C 7F E0 07 35 */ extsh. r0, r31 -/* 802CE350 002CB290 40 81 00 0C */ ble lbl_802CE35C -/* 802CE354 002CB294 7F C3 F3 78 */ mr r3, r30 -/* 802CE358 002CB298 48 00 09 E5 */ bl __dl -lbl_802CE35C: -/* 802CE35C 002CB29C 7F C3 F3 78 */ mr r3, r30 -/* 802CE360 002CB2A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE364 002CB2A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802CE368 002CB2A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE36C 002CB2AC 7C 08 03 A6 */ mtlr r0 -/* 802CE370 002CB2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE374 002CB2B4 4E 80 00 20 */ blr - -.global JKRHeap_NS_initArena -JKRHeap_NS_initArena: -/* 802CE378 002CB2B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE37C 002CB2BC 7C 08 02 A6 */ mflr r0 -/* 802CE380 002CB2C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE384 002CB2C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE388 002CB2C8 48 09 3E 4D */ bl _savegpr_27 -/* 802CE38C 002CB2CC 7C 7B 1B 78 */ mr r27, r3 -/* 802CE390 002CB2D0 7C 9C 23 78 */ mr r28, r4 -/* 802CE394 002CB2D4 7C BF 2B 78 */ mr r31, r5 -/* 802CE398 002CB2D8 48 06 CE FD */ bl OSGetArenaLo -/* 802CE39C 002CB2DC 7C 7E 1B 78 */ mr r30, r3 -/* 802CE3A0 002CB2E0 48 06 CE ED */ bl OSGetArenaHi -/* 802CE3A4 002CB2E4 7C 7D 1B 78 */ mr r29, r3 -/* 802CE3A8 002CB2E8 7C 1E E8 40 */ cmplw r30, r29 -/* 802CE3AC 002CB2EC 40 82 00 0C */ bne lbl_802CE3B8 -/* 802CE3B0 002CB2F0 38 60 00 00 */ li r3, 0 -/* 802CE3B4 002CB2F4 48 00 00 5C */ b lbl_802CE410 -lbl_802CE3B8: -/* 802CE3B8 002CB2F8 7F C3 F3 78 */ mr r3, r30 -/* 802CE3BC 002CB2FC 7F A4 EB 78 */ mr r4, r29 -/* 802CE3C0 002CB300 7F E5 FB 78 */ mr r5, r31 -/* 802CE3C4 002CB304 48 06 CD ED */ bl OSInitAlloc -/* 802CE3C8 002CB308 38 03 00 1F */ addi r0, r3, 0x1f -/* 802CE3CC 002CB30C 54 1F 00 34 */ rlwinm r31, r0, 0, 0, 0x1a -/* 802CE3D0 002CB310 57 BE 00 34 */ rlwinm r30, r29, 0, 0, 0x1a -/* 802CE3D4 002CB314 3C 60 80 00 */ lis r3, 0x80000028@ha -/* 802CE3D8 002CB318 90 6D 8E 04 */ stw r3, lbl_80451384-_SDA_BASE_(r13) -/* 802CE3DC 002CB31C 93 ED 8E 08 */ stw r31, lbl_80451388-_SDA_BASE_(r13) -/* 802CE3E0 002CB320 93 ED 8E 0C */ stw r31, lbl_8045138C-_SDA_BASE_(r13) -/* 802CE3E4 002CB324 93 CD 8E 10 */ stw r30, lbl_80451390-_SDA_BASE_(r13) -/* 802CE3E8 002CB328 80 03 00 28 */ lwz r0, 0x80000028@l(r3) -/* 802CE3EC 002CB32C 90 0D 8E 14 */ stw r0, lbl_80451394-_SDA_BASE_(r13) -/* 802CE3F0 002CB330 7F C3 F3 78 */ mr r3, r30 -/* 802CE3F4 002CB334 48 06 CE B1 */ bl OSSetArenaLo -/* 802CE3F8 002CB338 7F C3 F3 78 */ mr r3, r30 -/* 802CE3FC 002CB33C 48 06 CE A1 */ bl OSSetArenaHi -/* 802CE400 002CB340 93 FB 00 00 */ stw r31, 0(r27) -/* 802CE404 002CB344 7C 1F F0 50 */ subf r0, r31, r30 -/* 802CE408 002CB348 90 1C 00 00 */ stw r0, 0(r28) -/* 802CE40C 002CB34C 38 60 00 01 */ li r3, 1 -lbl_802CE410: -/* 802CE410 002CB350 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE414 002CB354 48 09 3E 0D */ bl _restgpr_27 -/* 802CE418 002CB358 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE41C 002CB35C 7C 08 03 A6 */ mtlr r0 -/* 802CE420 002CB360 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE424 002CB364 4E 80 00 20 */ blr - -.global JKRHeap_NS_becomeSystemHeap -JKRHeap_NS_becomeSystemHeap: -/* 802CE428 002CB368 80 0D 8D F0 */ lwz r0, lbl_80451370-_SDA_BASE_(r13) -/* 802CE42C 002CB36C 90 6D 8D F0 */ stw r3, lbl_80451370-_SDA_BASE_(r13) -/* 802CE430 002CB370 7C 03 03 78 */ mr r3, r0 -/* 802CE434 002CB374 4E 80 00 20 */ blr - -.global JKRHeap_NS_becomeCurrentHeap -JKRHeap_NS_becomeCurrentHeap: -/* 802CE438 002CB378 80 0D 8D F4 */ lwz r0, lbl_80451374-_SDA_BASE_(r13) -/* 802CE43C 002CB37C 90 6D 8D F4 */ stw r3, lbl_80451374-_SDA_BASE_(r13) -/* 802CE440 002CB380 7C 03 03 78 */ mr r3, r0 -/* 802CE444 002CB384 4E 80 00 20 */ blr - -.global JKRHeap_NS_destroy -JKRHeap_NS_destroy: -/* 802CE448 002CB388 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE44C 002CB38C 7C 08 02 A6 */ mflr r0 -/* 802CE450 002CB390 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE454 002CB394 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE458 002CB398 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802CE45C 002CB39C 7D 89 03 A6 */ mtctr r12 -/* 802CE460 002CB3A0 4E 80 04 21 */ bctrl -/* 802CE464 002CB3A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE468 002CB3A8 7C 08 03 A6 */ mtlr r0 -/* 802CE46C 002CB3AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE470 002CB3B0 4E 80 00 20 */ blr - -.global JKRHeap_NS_alloc -JKRHeap_NS_alloc: -/* 802CE474 002CB3B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE478 002CB3B8 7C 08 02 A6 */ mflr r0 -/* 802CE47C 002CB3BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE480 002CB3C0 7C 66 1B 78 */ mr r6, r3 -/* 802CE484 002CB3C4 7C 80 23 78 */ mr r0, r4 -/* 802CE488 002CB3C8 28 05 00 00 */ cmplwi r5, 0 -/* 802CE48C 002CB3CC 41 82 00 18 */ beq lbl_802CE4A4 -/* 802CE490 002CB3D0 7C A3 2B 78 */ mr r3, r5 -/* 802CE494 002CB3D4 7C C4 33 78 */ mr r4, r6 -/* 802CE498 002CB3D8 7C 05 03 78 */ mr r5, r0 -/* 802CE49C 002CB3DC 48 00 00 39 */ bl JKRHeap_NS_alloc_X1_ -/* 802CE4A0 002CB3E0 48 00 00 24 */ b lbl_802CE4C4 -lbl_802CE4A4: -/* 802CE4A4 002CB3E4 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) -/* 802CE4A8 002CB3E8 28 03 00 00 */ cmplwi r3, 0 -/* 802CE4AC 002CB3EC 41 82 00 14 */ beq lbl_802CE4C0 -/* 802CE4B0 002CB3F0 7C C4 33 78 */ mr r4, r6 -/* 802CE4B4 002CB3F4 7C 05 03 78 */ mr r5, r0 -/* 802CE4B8 002CB3F8 48 00 00 1D */ bl JKRHeap_NS_alloc_X1_ -/* 802CE4BC 002CB3FC 48 00 00 08 */ b lbl_802CE4C4 -lbl_802CE4C0: -/* 802CE4C0 002CB400 38 60 00 00 */ li r3, 0 -lbl_802CE4C4: -/* 802CE4C4 002CB404 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE4C8 002CB408 7C 08 03 A6 */ mtlr r0 -/* 802CE4CC 002CB40C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE4D0 002CB410 4E 80 00 20 */ blr - -.global JKRHeap_NS_alloc_X1_ -JKRHeap_NS_alloc_X1_: -/* 802CE4D4 002CB414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE4D8 002CB418 7C 08 02 A6 */ mflr r0 -/* 802CE4DC 002CB41C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE4E0 002CB420 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE4E4 002CB424 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802CE4E8 002CB428 7D 89 03 A6 */ mtctr r12 -/* 802CE4EC 002CB42C 4E 80 04 21 */ bctrl -/* 802CE4F0 002CB430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE4F4 002CB434 7C 08 03 A6 */ mtlr r0 -/* 802CE4F8 002CB438 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE4FC 002CB43C 4E 80 00 20 */ blr - -.global JKRHeap_NS_free -JKRHeap_NS_free: -/* 802CE500 002CB440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE504 002CB444 7C 08 02 A6 */ mflr r0 -/* 802CE508 002CB448 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE50C 002CB44C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE510 002CB450 7C 7F 1B 78 */ mr r31, r3 -/* 802CE514 002CB454 28 04 00 00 */ cmplwi r4, 0 -/* 802CE518 002CB458 40 82 00 10 */ bne lbl_802CE528 -/* 802CE51C 002CB45C 48 00 03 21 */ bl JKRHeap_NS_findFromRoot -/* 802CE520 002CB460 7C 64 1B 79 */ or. r4, r3, r3 -/* 802CE524 002CB464 41 82 00 10 */ beq lbl_802CE534 -lbl_802CE528: -/* 802CE528 002CB468 7C 83 23 78 */ mr r3, r4 -/* 802CE52C 002CB46C 7F E4 FB 78 */ mr r4, r31 -/* 802CE530 002CB470 48 00 00 19 */ bl JKRHeap_NS_free_X1_ -lbl_802CE534: -/* 802CE534 002CB474 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE538 002CB478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE53C 002CB47C 7C 08 03 A6 */ mtlr r0 -/* 802CE540 002CB480 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE544 002CB484 4E 80 00 20 */ blr - -.global JKRHeap_NS_free_X1_ -JKRHeap_NS_free_X1_: -/* 802CE548 002CB488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE54C 002CB48C 7C 08 02 A6 */ mflr r0 -/* 802CE550 002CB490 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE554 002CB494 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE558 002CB498 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802CE55C 002CB49C 7D 89 03 A6 */ mtctr r12 -/* 802CE560 002CB4A0 4E 80 04 21 */ bctrl -/* 802CE564 002CB4A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE568 002CB4A8 7C 08 03 A6 */ mtlr r0 -/* 802CE56C 002CB4AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE570 002CB4B0 4E 80 00 20 */ blr - -.global JKRHeap_NS_callAllDisposer -JKRHeap_NS_callAllDisposer: -/* 802CE574 002CB4B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE578 002CB4B8 7C 08 02 A6 */ mflr r0 -/* 802CE57C 002CB4BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE580 002CB4C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CE584 002CB4C4 7C 7F 1B 78 */ mr r31, r3 -/* 802CE588 002CB4C8 48 00 00 20 */ b lbl_802CE5A8 -lbl_802CE58C: -/* 802CE58C 002CB4CC 80 61 00 08 */ lwz r3, 8(r1) -/* 802CE590 002CB4D0 80 63 00 00 */ lwz r3, 0(r3) -/* 802CE594 002CB4D4 38 80 FF FF */ li r4, -1 -/* 802CE598 002CB4D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE59C 002CB4DC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CE5A0 002CB4E0 7D 89 03 A6 */ mtctr r12 -/* 802CE5A4 002CB4E4 4E 80 04 21 */ bctrl -lbl_802CE5A8: -/* 802CE5A8 002CB4E8 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 802CE5AC 002CB4EC 90 01 00 08 */ stw r0, 8(r1) -/* 802CE5B0 002CB4F0 28 00 00 00 */ cmplwi r0, 0 -/* 802CE5B4 002CB4F4 40 82 FF D8 */ bne lbl_802CE58C -/* 802CE5B8 002CB4F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CE5BC 002CB4FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE5C0 002CB500 7C 08 03 A6 */ mtlr r0 -/* 802CE5C4 002CB504 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE5C8 002CB508 4E 80 00 20 */ blr - -.global JKRHeap_NS_freeAll -JKRHeap_NS_freeAll: -/* 802CE5CC 002CB50C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE5D0 002CB510 7C 08 02 A6 */ mflr r0 -/* 802CE5D4 002CB514 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE5D8 002CB518 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE5DC 002CB51C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802CE5E0 002CB520 7D 89 03 A6 */ mtctr r12 -/* 802CE5E4 002CB524 4E 80 04 21 */ bctrl -/* 802CE5E8 002CB528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE5EC 002CB52C 7C 08 03 A6 */ mtlr r0 -/* 802CE5F0 002CB530 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE5F4 002CB534 4E 80 00 20 */ blr - -.global JKRHeap_NS_freeTail -JKRHeap_NS_freeTail: -/* 802CE5F8 002CB538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE5FC 002CB53C 7C 08 02 A6 */ mflr r0 -/* 802CE600 002CB540 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE604 002CB544 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE608 002CB548 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802CE60C 002CB54C 7D 89 03 A6 */ mtctr r12 -/* 802CE610 002CB550 4E 80 04 21 */ bctrl -/* 802CE614 002CB554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE618 002CB558 7C 08 03 A6 */ mtlr r0 -/* 802CE61C 002CB55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE620 002CB560 4E 80 00 20 */ blr - -.global JKRHeap_NS_resize -JKRHeap_NS_resize: -/* 802CE624 002CB564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE628 002CB568 7C 08 02 A6 */ mflr r0 -/* 802CE62C 002CB56C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE630 002CB570 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE634 002CB574 93 C1 00 08 */ stw r30, 8(r1) -/* 802CE638 002CB578 7C 7E 1B 78 */ mr r30, r3 -/* 802CE63C 002CB57C 7C 9F 23 78 */ mr r31, r4 -/* 802CE640 002CB580 28 05 00 00 */ cmplwi r5, 0 -/* 802CE644 002CB584 40 82 00 18 */ bne lbl_802CE65C -/* 802CE648 002CB588 48 00 01 F5 */ bl JKRHeap_NS_findFromRoot -/* 802CE64C 002CB58C 7C 65 1B 79 */ or. r5, r3, r3 -/* 802CE650 002CB590 40 82 00 0C */ bne lbl_802CE65C -/* 802CE654 002CB594 38 60 FF FF */ li r3, -1 -/* 802CE658 002CB598 48 00 00 14 */ b lbl_802CE66C -lbl_802CE65C: -/* 802CE65C 002CB59C 7C A3 2B 78 */ mr r3, r5 -/* 802CE660 002CB5A0 7F C4 F3 78 */ mr r4, r30 -/* 802CE664 002CB5A4 7F E5 FB 78 */ mr r5, r31 -/* 802CE668 002CB5A8 48 00 00 1D */ bl JKRHeap_NS_resize_X1_ -lbl_802CE66C: -/* 802CE66C 002CB5AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE670 002CB5B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802CE674 002CB5B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE678 002CB5B8 7C 08 03 A6 */ mtlr r0 -/* 802CE67C 002CB5BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE680 002CB5C0 4E 80 00 20 */ blr - -.global JKRHeap_NS_resize_X1_ -JKRHeap_NS_resize_X1_: -/* 802CE684 002CB5C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE688 002CB5C8 7C 08 02 A6 */ mflr r0 -/* 802CE68C 002CB5CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE690 002CB5D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE694 002CB5D4 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802CE698 002CB5D8 7D 89 03 A6 */ mtctr r12 -/* 802CE69C 002CB5DC 4E 80 04 21 */ bctrl -/* 802CE6A0 002CB5E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE6A4 002CB5E4 7C 08 03 A6 */ mtlr r0 -/* 802CE6A8 002CB5E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE6AC 002CB5EC 4E 80 00 20 */ blr - -.global JKRHeap_NS_getSize -JKRHeap_NS_getSize: -/* 802CE6B0 002CB5F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE6B4 002CB5F4 7C 08 02 A6 */ mflr r0 -/* 802CE6B8 002CB5F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE6BC 002CB5FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CE6C0 002CB600 7C 7F 1B 78 */ mr r31, r3 -/* 802CE6C4 002CB604 28 04 00 00 */ cmplwi r4, 0 -/* 802CE6C8 002CB608 40 82 00 18 */ bne lbl_802CE6E0 -/* 802CE6CC 002CB60C 48 00 01 71 */ bl JKRHeap_NS_findFromRoot -/* 802CE6D0 002CB610 7C 64 1B 79 */ or. r4, r3, r3 -/* 802CE6D4 002CB614 40 82 00 0C */ bne lbl_802CE6E0 -/* 802CE6D8 002CB618 38 60 FF FF */ li r3, -1 -/* 802CE6DC 002CB61C 48 00 00 10 */ b lbl_802CE6EC -lbl_802CE6E0: -/* 802CE6E0 002CB620 7C 83 23 78 */ mr r3, r4 -/* 802CE6E4 002CB624 7F E4 FB 78 */ mr r4, r31 -/* 802CE6E8 002CB628 48 00 00 19 */ bl JKRHeap_NS_getSize_X1_ -lbl_802CE6EC: -/* 802CE6EC 002CB62C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CE6F0 002CB630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE6F4 002CB634 7C 08 03 A6 */ mtlr r0 -/* 802CE6F8 002CB638 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE6FC 002CB63C 4E 80 00 20 */ blr - -.global JKRHeap_NS_getSize_X1_ -JKRHeap_NS_getSize_X1_: -/* 802CE700 002CB640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE704 002CB644 7C 08 02 A6 */ mflr r0 -/* 802CE708 002CB648 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE70C 002CB64C 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE710 002CB650 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802CE714 002CB654 7D 89 03 A6 */ mtctr r12 -/* 802CE718 002CB658 4E 80 04 21 */ bctrl -/* 802CE71C 002CB65C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE720 002CB660 7C 08 03 A6 */ mtlr r0 -/* 802CE724 002CB664 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE728 002CB668 4E 80 00 20 */ blr - -.global getFreeSize__7JKRHeapFv -getFreeSize__7JKRHeapFv: -/* 802CE72C 002CB66C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE730 002CB670 7C 08 02 A6 */ mflr r0 -/* 802CE734 002CB674 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE738 002CB678 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE73C 002CB67C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 802CE740 002CB680 7D 89 03 A6 */ mtctr r12 -/* 802CE744 002CB684 4E 80 04 21 */ bctrl -/* 802CE748 002CB688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE74C 002CB68C 7C 08 03 A6 */ mtlr r0 -/* 802CE750 002CB690 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE754 002CB694 4E 80 00 20 */ blr - -.global JKRHeap_NS_getMaxFreeBlock -JKRHeap_NS_getMaxFreeBlock: -/* 802CE758 002CB698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE75C 002CB69C 7C 08 02 A6 */ mflr r0 -/* 802CE760 002CB6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE764 002CB6A4 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE768 002CB6A8 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 802CE76C 002CB6AC 7D 89 03 A6 */ mtctr r12 -/* 802CE770 002CB6B0 4E 80 04 21 */ bctrl -/* 802CE774 002CB6B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE778 002CB6B8 7C 08 03 A6 */ mtlr r0 -/* 802CE77C 002CB6BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE780 002CB6C0 4E 80 00 20 */ blr - -.global JKRHeap_NS_getTotalFreeSize -JKRHeap_NS_getTotalFreeSize: -/* 802CE784 002CB6C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE788 002CB6C8 7C 08 02 A6 */ mflr r0 -/* 802CE78C 002CB6CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE790 002CB6D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE794 002CB6D4 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 802CE798 002CB6D8 7D 89 03 A6 */ mtctr r12 -/* 802CE79C 002CB6DC 4E 80 04 21 */ bctrl -/* 802CE7A0 002CB6E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE7A4 002CB6E4 7C 08 03 A6 */ mtlr r0 -/* 802CE7A8 002CB6E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE7AC 002CB6EC 4E 80 00 20 */ blr - -.global JKRHeap_NS_changeGroupID -JKRHeap_NS_changeGroupID: -/* 802CE7B0 002CB6F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE7B4 002CB6F4 7C 08 02 A6 */ mflr r0 -/* 802CE7B8 002CB6F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE7BC 002CB6FC 81 83 00 00 */ lwz r12, 0(r3) -/* 802CE7C0 002CB700 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 802CE7C4 002CB704 7D 89 03 A6 */ mtctr r12 -/* 802CE7C8 002CB708 4E 80 04 21 */ bctrl -/* 802CE7CC 002CB70C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE7D0 002CB710 7C 08 03 A6 */ mtlr r0 -/* 802CE7D4 002CB714 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE7D8 002CB718 4E 80 00 20 */ blr - -.global JKRHeap_NS_getMaxAllocatableSize -JKRHeap_NS_getMaxAllocatableSize: -/* 802CE7DC 002CB71C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE7E0 002CB720 7C 08 02 A6 */ mflr r0 -/* 802CE7E4 002CB724 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE7E8 002CB728 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE7EC 002CB72C 48 09 39 F1 */ bl _savegpr_29 -/* 802CE7F0 002CB730 7C 7D 1B 78 */ mr r29, r3 -/* 802CE7F4 002CB734 7C 9E 23 78 */ mr r30, r4 -/* 802CE7F8 002CB738 4B FF FF 61 */ bl JKRHeap_NS_getMaxFreeBlock -/* 802CE7FC 002CB73C 7C 7F 1B 78 */ mr r31, r3 -/* 802CE800 002CB740 7F A3 EB 78 */ mr r3, r29 -/* 802CE804 002CB744 4B FF FF 29 */ bl getFreeSize__7JKRHeapFv -/* 802CE808 002CB748 38 9E FF FF */ addi r4, r30, -1 -/* 802CE80C 002CB74C 57 E0 07 3E */ clrlwi r0, r31, 0x1c -/* 802CE810 002CB750 7C 00 F0 50 */ subf r0, r0, r30 -/* 802CE814 002CB754 7C 80 00 38 */ and r0, r4, r0 -/* 802CE818 002CB758 7C 60 18 50 */ subf r3, r0, r3 -/* 802CE81C 002CB75C 7C 80 20 F8 */ nor r0, r4, r4 -/* 802CE820 002CB760 7C 03 18 38 */ and r3, r0, r3 -/* 802CE824 002CB764 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE828 002CB768 48 09 3A 01 */ bl _restgpr_29 -/* 802CE82C 002CB76C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE830 002CB770 7C 08 03 A6 */ mtlr r0 -/* 802CE834 002CB774 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE838 002CB778 4E 80 00 20 */ blr - -.global JKRHeap_NS_findFromRoot -JKRHeap_NS_findFromRoot: -/* 802CE83C 002CB77C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CE840 002CB780 7C 08 02 A6 */ mflr r0 -/* 802CE844 002CB784 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CE848 002CB788 7C 64 1B 78 */ mr r4, r3 -/* 802CE84C 002CB78C 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) -/* 802CE850 002CB790 28 03 00 00 */ cmplwi r3, 0 -/* 802CE854 002CB794 40 82 00 0C */ bne lbl_802CE860 -/* 802CE858 002CB798 38 60 00 00 */ li r3, 0 -/* 802CE85C 002CB79C 48 00 00 28 */ b lbl_802CE884 -lbl_802CE860: -/* 802CE860 002CB7A0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802CE864 002CB7A4 7C 00 20 40 */ cmplw r0, r4 -/* 802CE868 002CB7A8 41 81 00 18 */ bgt lbl_802CE880 -/* 802CE86C 002CB7AC 80 03 00 34 */ lwz r0, 0x34(r3) -/* 802CE870 002CB7B0 7C 04 00 40 */ cmplw r4, r0 -/* 802CE874 002CB7B4 40 80 00 0C */ bge lbl_802CE880 -/* 802CE878 002CB7B8 48 00 00 1D */ bl JKRHeap_NS_find -/* 802CE87C 002CB7BC 48 00 00 08 */ b lbl_802CE884 -lbl_802CE880: -/* 802CE880 002CB7C0 48 00 00 BD */ bl JKRHeap_NS_findAllHeap -lbl_802CE884: -/* 802CE884 002CB7C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CE888 002CB7C8 7C 08 03 A6 */ mtlr r0 -/* 802CE88C 002CB7CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE890 002CB7D0 4E 80 00 20 */ blr - -.global JKRHeap_NS_find -JKRHeap_NS_find: -/* 802CE894 002CB7D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE898 002CB7D8 7C 08 02 A6 */ mflr r0 -/* 802CE89C 002CB7DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE8A0 002CB7E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE8A4 002CB7E4 48 09 39 39 */ bl _savegpr_29 -/* 802CE8A8 002CB7E8 7C 7D 1B 78 */ mr r29, r3 -/* 802CE8AC 002CB7EC 7C 9E 23 78 */ mr r30, r4 -/* 802CE8B0 002CB7F0 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802CE8B4 002CB7F4 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE8B8 002CB7F8 41 81 00 68 */ bgt lbl_802CE920 -/* 802CE8BC 002CB7FC 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 802CE8C0 002CB800 7C 1E 00 40 */ cmplw r30, r0 -/* 802CE8C4 002CB804 40 80 00 5C */ bge lbl_802CE920 -/* 802CE8C8 002CB808 80 1D 00 48 */ lwz r0, 0x48(r29) -/* 802CE8CC 002CB80C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE8D0 002CB810 41 82 00 48 */ beq lbl_802CE918 -/* 802CE8D4 002CB814 83 FD 00 40 */ lwz r31, 0x40(r29) -/* 802CE8D8 002CB818 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE8DC 002CB81C 41 82 00 34 */ beq lbl_802CE910 -/* 802CE8E0 002CB820 3B FF FF F4 */ addi r31, r31, -12 -/* 802CE8E4 002CB824 48 00 00 2C */ b lbl_802CE910 -lbl_802CE8E8: -/* 802CE8E8 002CB828 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CE8EC 002CB82C 7F C4 F3 78 */ mr r4, r30 -/* 802CE8F0 002CB830 4B FF FF A5 */ bl JKRHeap_NS_find -/* 802CE8F4 002CB834 28 03 00 00 */ cmplwi r3, 0 -/* 802CE8F8 002CB838 41 82 00 08 */ beq lbl_802CE900 -/* 802CE8FC 002CB83C 48 00 00 28 */ b lbl_802CE924 -lbl_802CE900: -/* 802CE900 002CB840 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CE904 002CB844 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE908 002CB848 41 82 00 08 */ beq lbl_802CE910 -/* 802CE90C 002CB84C 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CE910: -/* 802CE910 002CB850 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE914 002CB854 40 82 FF D4 */ bne lbl_802CE8E8 -lbl_802CE918: -/* 802CE918 002CB858 7F A3 EB 78 */ mr r3, r29 -/* 802CE91C 002CB85C 48 00 00 08 */ b lbl_802CE924 -lbl_802CE920: -/* 802CE920 002CB860 38 60 00 00 */ li r3, 0 -lbl_802CE924: -/* 802CE924 002CB864 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE928 002CB868 48 09 39 01 */ bl _restgpr_29 -/* 802CE92C 002CB86C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE930 002CB870 7C 08 03 A6 */ mtlr r0 -/* 802CE934 002CB874 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE938 002CB878 4E 80 00 20 */ blr - -.global JKRHeap_NS_findAllHeap -JKRHeap_NS_findAllHeap: -/* 802CE93C 002CB87C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE940 002CB880 7C 08 02 A6 */ mflr r0 -/* 802CE944 002CB884 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE948 002CB888 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE94C 002CB88C 48 09 38 91 */ bl _savegpr_29 -/* 802CE950 002CB890 7C 7D 1B 78 */ mr r29, r3 -/* 802CE954 002CB894 7C 9E 23 78 */ mr r30, r4 -/* 802CE958 002CB898 80 03 00 48 */ lwz r0, 0x48(r3) -/* 802CE95C 002CB89C 28 00 00 00 */ cmplwi r0, 0 -/* 802CE960 002CB8A0 41 82 00 48 */ beq lbl_802CE9A8 -/* 802CE964 002CB8A4 83 FD 00 40 */ lwz r31, 0x40(r29) -/* 802CE968 002CB8A8 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE96C 002CB8AC 41 82 00 34 */ beq lbl_802CE9A0 -/* 802CE970 002CB8B0 3B FF FF F4 */ addi r31, r31, -12 -/* 802CE974 002CB8B4 48 00 00 2C */ b lbl_802CE9A0 -lbl_802CE978: -/* 802CE978 002CB8B8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CE97C 002CB8BC 7F C4 F3 78 */ mr r4, r30 -/* 802CE980 002CB8C0 4B FF FF BD */ bl JKRHeap_NS_findAllHeap -/* 802CE984 002CB8C4 28 03 00 00 */ cmplwi r3, 0 -/* 802CE988 002CB8C8 41 82 00 08 */ beq lbl_802CE990 -/* 802CE98C 002CB8CC 48 00 00 40 */ b lbl_802CE9CC -lbl_802CE990: -/* 802CE990 002CB8D0 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CE994 002CB8D4 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE998 002CB8D8 41 82 00 08 */ beq lbl_802CE9A0 -/* 802CE99C 002CB8DC 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CE9A0: -/* 802CE9A0 002CB8E0 28 1F 00 00 */ cmplwi r31, 0 -/* 802CE9A4 002CB8E4 40 82 FF D4 */ bne lbl_802CE978 -lbl_802CE9A8: -/* 802CE9A8 002CB8E8 80 1D 00 30 */ lwz r0, 0x30(r29) -/* 802CE9AC 002CB8EC 7C 00 F0 40 */ cmplw r0, r30 -/* 802CE9B0 002CB8F0 41 81 00 18 */ bgt lbl_802CE9C8 -/* 802CE9B4 002CB8F4 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 802CE9B8 002CB8F8 7C 1E 00 40 */ cmplw r30, r0 -/* 802CE9BC 002CB8FC 40 80 00 0C */ bge lbl_802CE9C8 -/* 802CE9C0 002CB900 7F A3 EB 78 */ mr r3, r29 -/* 802CE9C4 002CB904 48 00 00 08 */ b lbl_802CE9CC -lbl_802CE9C8: -/* 802CE9C8 002CB908 38 60 00 00 */ li r3, 0 -lbl_802CE9CC: -/* 802CE9CC 002CB90C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9D0 002CB910 48 09 38 59 */ bl _restgpr_29 -/* 802CE9D4 002CB914 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CE9D8 002CB918 7C 08 03 A6 */ mtlr r0 -/* 802CE9DC 002CB91C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE9E0 002CB920 4E 80 00 20 */ blr - -.global JKRHeap_NS_dispose_subroutine -JKRHeap_NS_dispose_subroutine: -/* 802CE9E4 002CB924 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CE9E8 002CB928 7C 08 02 A6 */ mflr r0 -/* 802CE9EC 002CB92C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CE9F0 002CB930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9F4 002CB934 48 09 37 E5 */ bl _savegpr_28 -/* 802CE9F8 002CB938 7C 7C 1B 78 */ mr r28, r3 -/* 802CE9FC 002CB93C 7C 9D 23 78 */ mr r29, r4 -/* 802CEA00 002CB940 7C BE 2B 78 */ mr r30, r5 -/* 802CEA04 002CB944 3B E0 00 00 */ li r31, 0 -/* 802CEA08 002CB948 80 83 00 5C */ lwz r4, 0x5c(r3) -/* 802CEA0C 002CB94C 48 00 00 4C */ b lbl_802CEA58 -lbl_802CEA10: -/* 802CEA10 002CB950 80 64 00 00 */ lwz r3, 0(r4) -/* 802CEA14 002CB954 7C 1D 18 40 */ cmplw r29, r3 -/* 802CEA18 002CB958 41 81 00 38 */ bgt lbl_802CEA50 -/* 802CEA1C 002CB95C 7C 03 F0 40 */ cmplw r3, r30 -/* 802CEA20 002CB960 40 80 00 30 */ bge lbl_802CEA50 -/* 802CEA24 002CB964 38 80 FF FF */ li r4, -1 -/* 802CEA28 002CB968 81 83 00 00 */ lwz r12, 0(r3) -/* 802CEA2C 002CB96C 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CEA30 002CB970 7D 89 03 A6 */ mtctr r12 -/* 802CEA34 002CB974 4E 80 04 21 */ bctrl -/* 802CEA38 002CB978 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEA3C 002CB97C 40 82 00 0C */ bne lbl_802CEA48 -/* 802CEA40 002CB980 80 9C 00 5C */ lwz r4, 0x5c(r28) -/* 802CEA44 002CB984 48 00 00 14 */ b lbl_802CEA58 -lbl_802CEA48: -/* 802CEA48 002CB988 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802CEA4C 002CB98C 48 00 00 0C */ b lbl_802CEA58 -lbl_802CEA50: -/* 802CEA50 002CB990 7C 9F 23 78 */ mr r31, r4 -/* 802CEA54 002CB994 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802CEA58: -/* 802CEA58 002CB998 28 04 00 00 */ cmplwi r4, 0 -/* 802CEA5C 002CB99C 40 82 FF B4 */ bne lbl_802CEA10 -/* 802CEA60 002CB9A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEA64 002CB9A4 48 09 37 C1 */ bl _restgpr_28 -/* 802CEA68 002CB9A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CEA6C 002CB9AC 7C 08 03 A6 */ mtlr r0 -/* 802CEA70 002CB9B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CEA74 002CB9B4 4E 80 00 20 */ blr - -.global JKRHeap_NS_dispose -JKRHeap_NS_dispose: -/* 802CEA78 002CB9B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEA7C 002CB9BC 7C 08 02 A6 */ mflr r0 -/* 802CEA80 002CB9C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEA84 002CB9C4 7C A4 2A 14 */ add r5, r4, r5 -/* 802CEA88 002CB9C8 4B FF FF 5D */ bl JKRHeap_NS_dispose_subroutine -/* 802CEA8C 002CB9CC 38 60 00 00 */ li r3, 0 -/* 802CEA90 002CB9D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEA94 002CB9D4 7C 08 03 A6 */ mtlr r0 -/* 802CEA98 002CB9D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEA9C 002CB9DC 4E 80 00 20 */ blr - -.global JKRHeap_NS_dispose_X1_ -JKRHeap_NS_dispose_X1_: -/* 802CEAA0 002CB9E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEAA4 002CB9E4 7C 08 02 A6 */ mflr r0 -/* 802CEAA8 002CB9E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEAAC 002CB9EC 4B FF FF 39 */ bl JKRHeap_NS_dispose_subroutine -/* 802CEAB0 002CB9F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEAB4 002CB9F4 7C 08 03 A6 */ mtlr r0 -/* 802CEAB8 002CB9F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEABC 002CB9FC 4E 80 00 20 */ blr - -.global JKRHeap_NS_dispose_X2_ -JKRHeap_NS_dispose_X2_: -/* 802CEAC0 002CBA00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802CEAC4 002CBA04 7C 08 02 A6 */ mflr r0 -/* 802CEAC8 002CBA08 90 01 00 24 */ stw r0, 0x24(r1) -/* 802CEACC 002CBA0C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802CEAD0 002CBA10 7C 7F 1B 78 */ mr r31, r3 -/* 802CEAD4 002CBA14 48 00 00 20 */ b lbl_802CEAF4 -lbl_802CEAD8: -/* 802CEAD8 002CBA18 80 61 00 08 */ lwz r3, 8(r1) -/* 802CEADC 002CBA1C 80 63 00 00 */ lwz r3, 0(r3) -/* 802CEAE0 002CBA20 38 80 FF FF */ li r4, -1 -/* 802CEAE4 002CBA24 81 83 00 00 */ lwz r12, 0(r3) -/* 802CEAE8 002CBA28 81 8C 00 08 */ lwz r12, 8(r12) -/* 802CEAEC 002CBA2C 7D 89 03 A6 */ mtctr r12 -/* 802CEAF0 002CBA30 4E 80 04 21 */ bctrl -lbl_802CEAF4: -/* 802CEAF4 002CBA34 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 802CEAF8 002CBA38 90 01 00 08 */ stw r0, 8(r1) -/* 802CEAFC 002CBA3C 28 00 00 00 */ cmplwi r0, 0 -/* 802CEB00 002CBA40 40 82 FF D8 */ bne lbl_802CEAD8 -/* 802CEB04 002CBA44 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802CEB08 002CBA48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802CEB0C 002CBA4C 7C 08 03 A6 */ mtlr r0 -/* 802CEB10 002CBA50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CEB14 002CBA54 4E 80 00 20 */ blr - -.global JKRHeap_NS_copyMemory -JKRHeap_NS_copyMemory: -/* 802CEB18 002CBA58 38 05 00 03 */ addi r0, r5, 3 -/* 802CEB1C 002CBA5C 54 00 F0 BF */ rlwinm. r0, r0, 0x1e, 2, 0x1f -/* 802CEB20 002CBA60 7C 09 03 A6 */ mtctr r0 -/* 802CEB24 002CBA64 4D 82 00 20 */ beqlr -lbl_802CEB28: -/* 802CEB28 002CBA68 80 04 00 00 */ lwz r0, 0(r4) -/* 802CEB2C 002CBA6C 90 03 00 00 */ stw r0, 0(r3) -/* 802CEB30 002CBA70 38 63 00 04 */ addi r3, r3, 4 -/* 802CEB34 002CBA74 38 84 00 04 */ addi r4, r4, 4 -/* 802CEB38 002CBA78 42 00 FF F0 */ bdnz lbl_802CEB28 -/* 802CEB3C 002CBA7C 4E 80 00 20 */ blr -.global JKRDefaultMemoryErrorRoutine -JKRDefaultMemoryErrorRoutine: -/* 802CEB40 002CBA80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEB44 002CBA84 7C 08 02 A6 */ mflr r0 -/* 802CEB48 002CBA88 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEB4C 002CBA8C 3C 60 80 3A */ lis r3, lbl_8039CAD8@ha -/* 802CEB50 002CBA90 38 63 CA D8 */ addi r3, r3, lbl_8039CAD8@l -/* 802CEB54 002CBA94 38 80 03 3F */ li r4, 0x33f -/* 802CEB58 002CBA98 38 A3 00 0C */ addi r5, r3, 0xc -/* 802CEB5C 002CBA9C 38 C3 00 0F */ addi r6, r3, 0xf -/* 802CEB60 002CBAA0 4C C6 31 82 */ crclr 6 -/* 802CEB64 002CBAA4 48 01 36 99 */ bl JUTException_NS_panic_f -/* 802CEB68 002CBAA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEB6C 002CBAAC 7C 08 03 A6 */ mtlr r0 -/* 802CEB70 002CBAB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEB74 002CBAB4 4E 80 00 20 */ blr - -.global JKRHeap_NS_setErrorFlag -JKRHeap_NS_setErrorFlag: -/* 802CEB78 002CBAB8 88 03 00 68 */ lbz r0, 0x68(r3) -/* 802CEB7C 002CBABC 98 83 00 68 */ stb r4, 0x68(r3) -/* 802CEB80 002CBAC0 7C 03 03 78 */ mr r3, r0 -/* 802CEB84 002CBAC4 4E 80 00 20 */ blr - -.global JKRHeap_NS_setErrorHandler -JKRHeap_NS_setErrorHandler: -/* 802CEB88 002CBAC8 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) -/* 802CEB8C 002CBACC 28 03 00 00 */ cmplwi r3, 0 -/* 802CEB90 002CBAD0 40 82 00 0C */ bne lbl_802CEB9C -.global JKRDefaultMemoryErrorRoutine -/* 802CEB94 002CBAD4 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha -.global JKRDefaultMemoryErrorRoutine -/* 802CEB98 002CBAD8 38 63 EB 40 */ addi r3, r3, JKRDefaultMemoryErrorRoutine@l -lbl_802CEB9C: -/* 802CEB9C 002CBADC 90 6D 8D FC */ stw r3, lbl_8045137C-_SDA_BASE_(r13) -/* 802CEBA0 002CBAE0 7C 03 03 78 */ mr r3, r0 -/* 802CEBA4 002CBAE4 4E 80 00 20 */ blr - -.global JKRHeap_NS_isSubHeap -JKRHeap_NS_isSubHeap: -/* 802CEBA8 002CBAE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEBAC 002CBAEC 7C 08 02 A6 */ mflr r0 -/* 802CEBB0 002CBAF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEBB4 002CBAF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802CEBB8 002CBAF8 93 C1 00 08 */ stw r30, 8(r1) -/* 802CEBBC 002CBAFC 7C 9E 23 79 */ or. r30, r4, r4 -/* 802CEBC0 002CBB00 40 82 00 0C */ bne lbl_802CEBCC -/* 802CEBC4 002CBB04 38 60 00 00 */ li r3, 0 -/* 802CEBC8 002CBB08 48 00 00 6C */ b lbl_802CEC34 -lbl_802CEBCC: -/* 802CEBCC 002CBB0C 80 03 00 48 */ lwz r0, 0x48(r3) -/* 802CEBD0 002CBB10 28 00 00 00 */ cmplwi r0, 0 -/* 802CEBD4 002CBB14 41 82 00 5C */ beq lbl_802CEC30 -/* 802CEBD8 002CBB18 83 E3 00 40 */ lwz r31, 0x40(r3) -/* 802CEBDC 002CBB1C 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEBE0 002CBB20 41 82 00 48 */ beq lbl_802CEC28 -/* 802CEBE4 002CBB24 3B FF FF F4 */ addi r31, r31, -12 -/* 802CEBE8 002CBB28 48 00 00 40 */ b lbl_802CEC28 -lbl_802CEBEC: -/* 802CEBEC 002CBB2C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802CEBF0 002CBB30 7C 03 F0 40 */ cmplw r3, r30 -/* 802CEBF4 002CBB34 40 82 00 0C */ bne lbl_802CEC00 -/* 802CEBF8 002CBB38 38 60 00 01 */ li r3, 1 -/* 802CEBFC 002CBB3C 48 00 00 38 */ b lbl_802CEC34 -lbl_802CEC00: -/* 802CEC00 002CBB40 7F C4 F3 78 */ mr r4, r30 -/* 802CEC04 002CBB44 4B FF FF A5 */ bl JKRHeap_NS_isSubHeap -/* 802CEC08 002CBB48 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802CEC0C 002CBB4C 41 82 00 0C */ beq lbl_802CEC18 -/* 802CEC10 002CBB50 38 60 00 01 */ li r3, 1 -/* 802CEC14 002CBB54 48 00 00 20 */ b lbl_802CEC34 -lbl_802CEC18: -/* 802CEC18 002CBB58 83 FF 00 18 */ lwz r31, 0x18(r31) -/* 802CEC1C 002CBB5C 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEC20 002CBB60 41 82 00 08 */ beq lbl_802CEC28 -/* 802CEC24 002CBB64 3B FF FF F4 */ addi r31, r31, -12 -lbl_802CEC28: -/* 802CEC28 002CBB68 28 1F 00 00 */ cmplwi r31, 0 -/* 802CEC2C 002CBB6C 40 82 FF C0 */ bne lbl_802CEBEC -lbl_802CEC30: -/* 802CEC30 002CBB70 38 60 00 00 */ li r3, 0 -lbl_802CEC34: -/* 802CEC34 002CBB74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802CEC38 002CBB78 83 C1 00 08 */ lwz r30, 8(r1) -/* 802CEC3C 002CBB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC40 002CBB80 7C 08 03 A6 */ mtlr r0 -/* 802CEC44 002CBB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC48 002CBB88 4E 80 00 20 */ blr - -.global __nw -__nw: -/* 802CEC4C 002CBB8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC50 002CBB90 7C 08 02 A6 */ mflr r0 -/* 802CEC54 002CBB94 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEC58 002CBB98 38 80 00 04 */ li r4, 4 -/* 802CEC5C 002CBB9C 38 A0 00 00 */ li r5, 0 -/* 802CEC60 002CBBA0 4B FF F8 15 */ bl JKRHeap_NS_alloc -/* 802CEC64 002CBBA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC68 002CBBA8 7C 08 03 A6 */ mtlr r0 -/* 802CEC6C 002CBBAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC70 002CBBB0 4E 80 00 20 */ blr - -.global __nw_X1_ -__nw_X1_: -/* 802CEC74 002CBBB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC78 002CBBB8 7C 08 02 A6 */ mflr r0 -/* 802CEC7C 002CBBBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CEC80 002CBBC0 38 A0 00 00 */ li r5, 0 -/* 802CEC84 002CBBC4 4B FF F7 F1 */ bl JKRHeap_NS_alloc -/* 802CEC88 002CBBC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CEC8C 002CBBCC 7C 08 03 A6 */ mtlr r0 -/* 802CEC90 002CBBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CEC94 002CBBD4 4E 80 00 20 */ blr - -.global __nw_X2_ -__nw_X2_: -/* 802CEC98 002CBBD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CEC9C 002CBBDC 7C 08 02 A6 */ mflr r0 -/* 802CECA0 002CBBE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECA4 002CBBE4 7C 80 23 78 */ mr r0, r4 -/* 802CECA8 002CBBE8 7C A4 2B 78 */ mr r4, r5 -/* 802CECAC 002CBBEC 7C 05 03 78 */ mr r5, r0 -/* 802CECB0 002CBBF0 4B FF F7 C5 */ bl JKRHeap_NS_alloc -/* 802CECB4 002CBBF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CECB8 002CBBF8 7C 08 03 A6 */ mtlr r0 -/* 802CECBC 002CBBFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CECC0 002CBC00 4E 80 00 20 */ blr - -.global __nwa -__nwa: -/* 802CECC4 002CBC04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CECC8 002CBC08 7C 08 02 A6 */ mflr r0 -/* 802CECCC 002CBC0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECD0 002CBC10 38 80 00 04 */ li r4, 4 -/* 802CECD4 002CBC14 38 A0 00 00 */ li r5, 0 -/* 802CECD8 002CBC18 4B FF F7 9D */ bl JKRHeap_NS_alloc -/* 802CECDC 002CBC1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CECE0 002CBC20 7C 08 03 A6 */ mtlr r0 -/* 802CECE4 002CBC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CECE8 002CBC28 4E 80 00 20 */ blr - -.global __nwa_X1_ -__nwa_X1_: -/* 802CECEC 002CBC2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CECF0 002CBC30 7C 08 02 A6 */ mflr r0 -/* 802CECF4 002CBC34 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CECF8 002CBC38 38 A0 00 00 */ li r5, 0 -/* 802CECFC 002CBC3C 4B FF F7 79 */ bl JKRHeap_NS_alloc -/* 802CED00 002CBC40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED04 002CBC44 7C 08 03 A6 */ mtlr r0 -/* 802CED08 002CBC48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED0C 002CBC4C 4E 80 00 20 */ blr - -.global __nwa_X2_ -__nwa_X2_: -/* 802CED10 002CBC50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED14 002CBC54 7C 08 02 A6 */ mflr r0 -/* 802CED18 002CBC58 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED1C 002CBC5C 7C 80 23 78 */ mr r0, r4 -/* 802CED20 002CBC60 7C A4 2B 78 */ mr r4, r5 -/* 802CED24 002CBC64 7C 05 03 78 */ mr r5, r0 -/* 802CED28 002CBC68 4B FF F7 4D */ bl JKRHeap_NS_alloc -/* 802CED2C 002CBC6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED30 002CBC70 7C 08 03 A6 */ mtlr r0 -/* 802CED34 002CBC74 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED38 002CBC78 4E 80 00 20 */ blr - -.global __dl -__dl: -/* 802CED3C 002CBC7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED40 002CBC80 7C 08 02 A6 */ mflr r0 -/* 802CED44 002CBC84 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED48 002CBC88 38 80 00 00 */ li r4, 0 -/* 802CED4C 002CBC8C 4B FF F7 B5 */ bl JKRHeap_NS_free -/* 802CED50 002CBC90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED54 002CBC94 7C 08 03 A6 */ mtlr r0 -/* 802CED58 002CBC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED5C 002CBC9C 4E 80 00 20 */ blr - -.global __dla -__dla: -/* 802CED60 002CBCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802CED64 002CBCA4 7C 08 02 A6 */ mflr r0 -/* 802CED68 002CBCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802CED6C 002CBCAC 38 80 00 00 */ li r4, 0 -/* 802CED70 002CBCB0 4B FF F7 91 */ bl JKRHeap_NS_free -/* 802CED74 002CBCB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802CED78 002CBCB8 7C 08 03 A6 */ mtlr r0 -/* 802CED7C 002CBCBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CED80 002CBCC0 4E 80 00 20 */ blr -/* 802CED84 002CBCC4 4E 80 00 20 */ blr -/* 802CED88 002CBCC8 80 64 00 04 */ lwz r3, 4(r4) -/* 802CED8C 002CBCCC 80 05 00 04 */ lwz r0, 4(r5) -/* 802CED90 002CBCD0 7C 03 00 50 */ subf r0, r3, r0 -/* 802CED94 002CBCD4 7C 00 00 34 */ cntlzw r0, r0 -/* 802CED98 002CBCD8 54 03 D9 7E */ srwi r3, r0, 5 -/* 802CED9C 002CBCDC 4E 80 00 20 */ blr -/* 802CEDA0 002CBCE0 4E 80 00 20 */ blr -/* 802CEDA4 002CBCE4 38 60 00 00 */ li r3, 0 -/* 802CEDA8 002CBCE8 4E 80 00 20 */ blr -/* 802CEDAC 002CBCEC 38 60 00 00 */ li r3, 0 -/* 802CEDB0 002CBCF0 4E 80 00 20 */ blr - +.extern "C" becomeCurrentHeap__7JKRHeapFv +.extern "C" __nw__FUl diff --git a/asm/JKernel/JKRMemArchive.s b/asm/JKernel/JKRMemArchive.s index 3f30e1647a..69473ce32b 100644 --- a/asm/JKernel/JKRMemArchive.s +++ b/asm/JKernel/JKRMemArchive.s @@ -41,7 +41,7 @@ lbl_802D6A18: /* 802D6A38 002D3978 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D6A3C 002D397C 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D6A40 002D3980 38 9D 00 18 */ addi r4, r29, 0x18 -/* 802D6A44 002D3984 48 00 55 AD */ bl JSUPtrList_NS_prepend +/* 802D6A44 002D3984 48 00 55 AD */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D6A48 002D3988 38 00 00 01 */ li r0, 1 /* 802D6A4C 002D398C 98 1D 00 30 */ stb r0, 0x30(r29) /* 802D6A50 002D3990 7F A3 EB 78 */ mr r3, r29 @@ -92,7 +92,7 @@ lbl_802D6AD0: /* 802D6AF0 002D3A30 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D6AF4 002D3A34 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D6AF8 002D3A38 38 9C 00 18 */ addi r4, r28, 0x18 -/* 802D6AFC 002D3A3C 48 00 54 F5 */ bl JSUPtrList_NS_prepend +/* 802D6AFC 002D3A3C 48 00 54 F5 */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 802D6B00 002D3A40 38 00 00 01 */ li r0, 1 /* 802D6B04 002D3A44 98 1C 00 30 */ stb r0, 0x30(r28) /* 802D6B08 002D3A48 7F 83 E3 78 */ mr r3, r28 @@ -124,12 +124,12 @@ lbl_802D6B0C: /* 802D6B6C 002D3AAC 28 03 00 00 */ cmplwi r3, 0 /* 802D6B70 002D3AB0 41 82 00 0C */ beq lbl_802D6B7C /* 802D6B74 002D3AB4 80 9E 00 38 */ lwz r4, 0x38(r30) -/* 802D6B78 002D3AB8 4B FF 79 89 */ bl JKRHeap_NS_free +/* 802D6B78 002D3AB8 4B FF 79 89 */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D6B7C: /* 802D6B7C 002D3ABC 3C 60 80 43 */ lis r3, lbl_80434354@ha /* 802D6B80 002D3AC0 38 63 43 54 */ addi r3, r3, lbl_80434354@l /* 802D6B84 002D3AC4 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D6B88 002D3AC8 48 00 55 D5 */ bl JSUPtrList_NS_remove +/* 802D6B88 002D3AC8 48 00 55 D5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D6B8C 002D3ACC 38 00 00 00 */ li r0, 0 /* 802D6B90 002D3AD0 98 1E 00 30 */ stb r0, 0x30(r30) lbl_802D6B94: @@ -139,7 +139,7 @@ lbl_802D6B94: /* 802D6BA0 002D3AE0 7F E0 07 35 */ extsh. r0, r31 /* 802D6BA4 002D3AE4 40 81 00 0C */ ble lbl_802D6BB0 /* 802D6BA8 002D3AE8 7F C3 F3 78 */ mr r3, r30 -/* 802D6BAC 002D3AEC 4B FF 81 91 */ bl __dl +/* 802D6BAC 002D3AEC 4B FF 81 91 */ bl __dl__FPv lbl_802D6BB0: /* 802D6BB0 002D3AF0 7F C3 F3 78 */ mr r3, r30 /* 802D6BB4 002D3AF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -280,7 +280,7 @@ JKRMemArchive_NS_open_X1_: /* 802D6DA8 002D3CE8 54 00 D9 7E */ srwi r0, r0, 5 /* 802D6DAC 002D3CEC 98 1F 00 6C */ stb r0, 0x6c(r31) /* 802D6DB0 002D3CF0 7C 83 23 78 */ mr r3, r4 -/* 802D6DB4 002D3CF4 4B FF 7A 89 */ bl JKRHeap_NS_findFromRoot +/* 802D6DB4 002D3CF4 4B FF 7A 89 */ bl findFromRoot__7JKRHeapFPv /* 802D6DB8 002D3CF8 90 7F 00 38 */ stw r3, 0x38(r31) /* 802D6DBC 002D3CFC 38 00 00 00 */ li r0, 0 /* 802D6DC0 002D3D00 90 1F 00 5C */ stw r0, 0x5c(r31) diff --git a/asm/JKernel/JKRSolidHeap.s b/asm/JKernel/JKRSolidHeap.s index 6e2222e0ad..6d0f712ed1 100644 --- a/asm/JKernel/JKRSolidHeap.s +++ b/asm/JKernel/JKRSolidHeap.s @@ -20,7 +20,7 @@ lbl_802D0A48: /* 802D0A50 002CD990 40 82 00 10 */ bne lbl_802D0A60 /* 802D0A54 002CD994 7F A3 EB 78 */ mr r3, r29 /* 802D0A58 002CD998 38 80 00 10 */ li r4, 0x10 -/* 802D0A5C 002CD99C 4B FF DD 81 */ bl JKRHeap_NS_getMaxAllocatableSize +/* 802D0A5C 002CD99C 4B FF DD 81 */ bl getMaxAllocatableSize__7JKRHeapFi lbl_802D0A60: /* 802D0A60 002CD9A0 54 7F 00 36 */ rlwinm r31, r3, 0, 0, 0x1b /* 802D0A64 002CD9A4 28 1F 00 80 */ cmplwi r31, 0x80 @@ -31,7 +31,7 @@ lbl_802D0A74: /* 802D0A74 002CD9B4 7F E3 FB 78 */ mr r3, r31 /* 802D0A78 002CD9B8 38 80 00 10 */ li r4, 0x10 /* 802D0A7C 002CD9BC 7F A5 EB 78 */ mr r5, r29 -/* 802D0A80 002CD9C0 4B FF D9 F5 */ bl JKRHeap_NS_alloc +/* 802D0A80 002CD9C0 4B FF D9 F5 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D0A84 002CD9C4 7C 60 1B 78 */ mr r0, r3 /* 802D0A88 002CD9C8 7C 05 03 79 */ or. r5, r0, r0 /* 802D0A8C 002CD9CC 38 85 00 80 */ addi r4, r5, 0x80 @@ -71,7 +71,7 @@ lbl_802D0AB8: /* 802D0B08 002CDA48 4E 80 04 21 */ bctrl /* 802D0B0C 002CDA4C 7F C3 F3 78 */ mr r3, r30 /* 802D0B10 002CDA50 7F E4 FB 78 */ mr r4, r31 -/* 802D0B14 002CDA54 4B FF D9 ED */ bl JKRHeap_NS_free +/* 802D0B14 002CDA54 4B FF D9 ED */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D0B18: /* 802D0B18 002CDA58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D0B1C 002CDA5C 83 C1 00 08 */ lwz r30, 8(r1) @@ -87,7 +87,7 @@ JKRSolidHeap: /* 802D0B38 002CDA78 90 01 00 14 */ stw r0, 0x14(r1) /* 802D0B3C 002CDA7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802D0B40 002CDA80 7C 7F 1B 78 */ mr r31, r3 -/* 802D0B44 002CDA84 4B FF D5 F5 */ bl JKRHeap +/* 802D0B44 002CDA84 4B FF D5 F5 */ bl __ct__7JKRHeapFPvUlP7JKRHeapb /* 802D0B48 002CDA88 3C 60 80 3D */ lis r3, lbl_803CC030@ha /* 802D0B4C 002CDA8C 38 03 C0 30 */ addi r0, r3, lbl_803CC030@l /* 802D0B50 002CDA90 90 1F 00 00 */ stw r0, 0(r31) @@ -116,14 +116,14 @@ JKRSolidHeap: /* 802D0BAC 002CDAEC 3C 80 80 3D */ lis r4, lbl_803CC030@ha /* 802D0BB0 002CDAF0 38 04 C0 30 */ addi r0, r4, lbl_803CC030@l /* 802D0BB4 002CDAF4 90 1E 00 00 */ stw r0, 0(r30) -/* 802D0BB8 002CDAF8 4B FF DF 09 */ bl JKRHeap_NS_dispose_X2_ +/* 802D0BB8 002CDAF8 4B FF DF 09 */ bl dispose__7JKRHeapFv /* 802D0BBC 002CDAFC 7F C3 F3 78 */ mr r3, r30 /* 802D0BC0 002CDB00 38 80 00 00 */ li r4, 0 -/* 802D0BC4 002CDB04 4B FF D6 A1 */ bl JKRHeap_NS_dtor +/* 802D0BC4 002CDB04 4B FF D6 A1 */ bl __dt__7JKRHeapFv /* 802D0BC8 002CDB08 7F E0 07 35 */ extsh. r0, r31 /* 802D0BCC 002CDB0C 40 81 00 0C */ ble lbl_802D0BD8 /* 802D0BD0 002CDB10 7F C3 F3 78 */ mr r3, r30 -/* 802D0BD4 002CDB14 4B FF E1 69 */ bl __dl +/* 802D0BD4 002CDB14 4B FF E1 69 */ bl __dl__FPv lbl_802D0BD8: /* 802D0BD8 002CDB18 7F C3 F3 78 */ mr r3, r30 /* 802D0BDC 002CDB1C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -157,7 +157,7 @@ JKRSolidHeap_NS_adjustSize: /* 802D0C40 002CDB80 7F A4 EB 78 */ mr r4, r29 /* 802D0C44 002CDB84 7F E5 F2 14 */ add r31, r5, r30 /* 802D0C48 002CDB88 7F E5 FB 78 */ mr r5, r31 -/* 802D0C4C 002CDB8C 4B FF DA 39 */ bl JKRHeap_NS_resize_X1_ +/* 802D0C4C 002CDB8C 4B FF DA 39 */ bl resize__7JKRHeapFPvUl /* 802D0C50 002CDB90 2C 03 FF FF */ cmpwi r3, -1 /* 802D0C54 002CDB94 41 82 00 30 */ beq lbl_802D0C84 /* 802D0C58 002CDB98 38 00 00 00 */ li r0, 0 @@ -361,7 +361,7 @@ lbl_802D0EC8: /* 802D0F28 002CDE68 38 7F 00 18 */ addi r3, r31, 0x18 /* 802D0F2C 002CDE6C 48 06 E1 15 */ bl OSLockMutex /* 802D0F30 002CDE70 7F E3 FB 78 */ mr r3, r31 -/* 802D0F34 002CDE74 4B FF D6 41 */ bl JKRHeap_NS_callAllDisposer +/* 802D0F34 002CDE74 4B FF D6 41 */ bl callAllDisposer__7JKRHeapFv /* 802D0F38 002CDE78 80 1F 00 38 */ lwz r0, 0x38(r31) /* 802D0F3C 002CDE7C 90 1F 00 6C */ stw r0, 0x6c(r31) /* 802D0F40 002CDE80 80 1F 00 30 */ lwz r0, 0x30(r31) @@ -389,7 +389,7 @@ lbl_802D0EC8: /* 802D0F98 002CDED8 7C 04 28 40 */ cmplw r4, r5 /* 802D0F9C 002CDEDC 41 82 00 0C */ beq lbl_802D0FA8 /* 802D0FA0 002CDEE0 7F E3 FB 78 */ mr r3, r31 -/* 802D0FA4 002CDEE4 4B FF DA FD */ bl JKRHeap_NS_dispose_X1_ +/* 802D0FA4 002CDEE4 4B FF DA FD */ bl dispose__7JKRHeapFPvPv lbl_802D0FA8: /* 802D0FA8 002CDEE8 80 9F 00 6C */ lwz r4, 0x6c(r31) /* 802D0FAC 002CDEEC 80 7F 00 74 */ lwz r3, 0x74(r31) @@ -551,7 +551,7 @@ lbl_802D10D8: /* 802D1210 002CE150 7C 7E 1B 78 */ mr r30, r3 /* 802D1214 002CE154 7C 9F 23 78 */ mr r31, r4 /* 802D1218 002CE158 90 A4 00 14 */ stw r5, 0x14(r4) -/* 802D121C 002CE15C 4B FF D5 69 */ bl JKRHeap_NS_getTotalFreeSize +/* 802D121C 002CE15C 4B FF D5 69 */ bl getTotalFreeSize__7JKRHeapFv /* 802D1220 002CE160 80 1E 00 38 */ lwz r0, 0x38(r30) /* 802D1224 002CE164 7C 03 00 50 */ subf r0, r3, r0 /* 802D1228 002CE168 90 1F 00 00 */ stw r0, 0(r31) diff --git a/asm/JKernel/JKRThread.s b/asm/JKernel/JKRThread.s index 40b3c51700..f8358d7182 100644 --- a/asm/JKernel/JKRThread.s +++ b/asm/JKernel/JKRThread.s @@ -14,13 +14,13 @@ JKRThread: /* 802D1580 002CE4C0 7C 9D 23 78 */ mr r29, r4 /* 802D1584 002CE4C4 7C BE 2B 78 */ mr r30, r5 /* 802D1588 002CE4C8 7C DF 33 78 */ mr r31, r6 -/* 802D158C 002CE4CC 4B FF FE F1 */ bl JKRDisposer +/* 802D158C 002CE4CC 4B FF FE F1 */ bl __ct__11JKRDisposerFv /* 802D1590 002CE4D0 3C 60 80 3D */ lis r3, lbl_803CC114@ha /* 802D1594 002CE4D4 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l /* 802D1598 002CE4D8 90 1C 00 00 */ stw r0, 0(r28) /* 802D159C 002CE4DC 38 7C 00 18 */ addi r3, r28, 0x18 /* 802D15A0 002CE4E0 7F 84 E3 78 */ mr r4, r28 -/* 802D15A4 002CE4E4 48 00 A8 59 */ bl JSUPtrLink +/* 802D15A4 002CE4E4 48 00 A8 59 */ bl __ct__10JSUPtrLinkFPv /* 802D15A8 002CE4E8 38 00 00 00 */ li r0, 0 /* 802D15AC 002CE4EC 90 1C 00 68 */ stw r0, 0x68(r28) /* 802D15B0 002CE4F0 90 1C 00 64 */ stw r0, 0x64(r28) @@ -28,7 +28,7 @@ JKRThread: /* 802D15B8 002CE4F8 98 1C 00 60 */ stb r0, 0x60(r28) /* 802D15BC 002CE4FC 90 1C 00 70 */ stw r0, 0x70(r28) /* 802D15C0 002CE500 7F 83 E3 78 */ mr r3, r28 -/* 802D15C4 002CE504 4B FF D2 79 */ bl JKRHeap_NS_findFromRoot +/* 802D15C4 002CE504 4B FF D2 79 */ bl findFromRoot__7JKRHeapFPv /* 802D15C8 002CE508 7C 64 1B 79 */ or. r4, r3, r3 /* 802D15CC 002CE50C 40 82 00 08 */ bne lbl_802D15D4 /* 802D15D0 002CE510 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) @@ -61,13 +61,13 @@ JKRThread_X1_: /* 802D162C 002CE56C 7C BD 2B 78 */ mr r29, r5 /* 802D1630 002CE570 7C DE 33 78 */ mr r30, r6 /* 802D1634 002CE574 7C FF 3B 78 */ mr r31, r7 -/* 802D1638 002CE578 4B FF FE 45 */ bl JKRDisposer +/* 802D1638 002CE578 4B FF FE 45 */ bl __ct__11JKRDisposerFv /* 802D163C 002CE57C 3C 60 80 3D */ lis r3, lbl_803CC114@ha /* 802D1640 002CE580 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l /* 802D1644 002CE584 90 1B 00 00 */ stw r0, 0(r27) /* 802D1648 002CE588 38 7B 00 18 */ addi r3, r27, 0x18 /* 802D164C 002CE58C 7F 64 DB 78 */ mr r4, r27 -/* 802D1650 002CE590 48 00 A7 AD */ bl JSUPtrLink +/* 802D1650 002CE590 48 00 A7 AD */ bl __ct__10JSUPtrLinkFPv /* 802D1654 002CE594 38 00 00 00 */ li r0, 0 /* 802D1658 002CE598 90 1B 00 68 */ stw r0, 0x68(r27) /* 802D165C 002CE59C 90 1B 00 64 */ stw r0, 0x64(r27) @@ -105,13 +105,13 @@ JKRThread_X2_: /* 802D16CC 002CE60C 7C 7D 1B 78 */ mr r29, r3 /* 802D16D0 002CE610 7C 9E 23 78 */ mr r30, r4 /* 802D16D4 002CE614 7C BF 2B 78 */ mr r31, r5 -/* 802D16D8 002CE618 4B FF FD A5 */ bl JKRDisposer +/* 802D16D8 002CE618 4B FF FD A5 */ bl __ct__11JKRDisposerFv /* 802D16DC 002CE61C 3C 60 80 3D */ lis r3, lbl_803CC114@ha /* 802D16E0 002CE620 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l /* 802D16E4 002CE624 90 1D 00 00 */ stw r0, 0(r29) /* 802D16E8 002CE628 38 7D 00 18 */ addi r3, r29, 0x18 /* 802D16EC 002CE62C 7F A4 EB 78 */ mr r4, r29 -/* 802D16F0 002CE630 48 00 A7 0D */ bl JSUPtrLink +/* 802D16F0 002CE630 48 00 A7 0D */ bl __ct__10JSUPtrLinkFPv /* 802D16F4 002CE634 38 00 00 00 */ li r0, 0 /* 802D16F8 002CE638 90 1D 00 68 */ stw r0, 0x68(r29) /* 802D16FC 002CE63C 90 1D 00 64 */ stw r0, 0x64(r29) @@ -154,7 +154,7 @@ JKRThread_NS_dtor: /* 802D1784 002CE6C4 3C 60 80 43 */ lis r3, lbl_8043428C@ha /* 802D1788 002CE6C8 38 63 42 8C */ addi r3, r3, lbl_8043428C@l /* 802D178C 002CE6CC 38 9E 00 18 */ addi r4, r30, 0x18 -/* 802D1790 002CE6D0 48 00 A9 CD */ bl JSUPtrList_NS_remove +/* 802D1790 002CE6D0 48 00 A9 CD */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802D1794 002CE6D4 80 1E 00 28 */ lwz r0, 0x28(r30) /* 802D1798 002CE6D8 28 00 00 00 */ cmplwi r0, 0 /* 802D179C 002CE6DC 41 82 00 3C */ beq lbl_802D17D8 @@ -169,27 +169,27 @@ JKRThread_NS_dtor: lbl_802D17C0: /* 802D17C0 002CE700 80 7E 00 58 */ lwz r3, 0x58(r30) /* 802D17C4 002CE704 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 802D17C8 002CE708 4B FF CD 39 */ bl JKRHeap_NS_free +/* 802D17C8 002CE708 4B FF CD 39 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D17CC 002CE70C 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 802D17D0 002CE710 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 802D17D4 002CE714 4B FF CD 2D */ bl JKRHeap_NS_free +/* 802D17D4 002CE714 4B FF CD 2D */ bl free__7JKRHeapFPvP7JKRHeap lbl_802D17D8: /* 802D17D8 002CE718 80 7E 00 50 */ lwz r3, 0x50(r30) /* 802D17DC 002CE71C 38 80 00 00 */ li r4, 0 -/* 802D17E0 002CE720 4B FF CD 21 */ bl JKRHeap_NS_free +/* 802D17E0 002CE720 4B FF CD 21 */ bl free__7JKRHeapFPvP7JKRHeap /* 802D17E4 002CE724 34 1E 00 18 */ addic. r0, r30, 0x18 /* 802D17E8 002CE728 41 82 00 10 */ beq lbl_802D17F8 /* 802D17EC 002CE72C 38 7E 00 18 */ addi r3, r30, 0x18 /* 802D17F0 002CE730 38 80 00 00 */ li r4, 0 -/* 802D17F4 002CE734 48 00 A6 21 */ bl JSUPtrLink_NS_dtor +/* 802D17F4 002CE734 48 00 A6 21 */ bl __dt__10JSUPtrLinkFv lbl_802D17F8: /* 802D17F8 002CE738 7F C3 F3 78 */ mr r3, r30 /* 802D17FC 002CE73C 38 80 00 00 */ li r4, 0 -/* 802D1800 002CE740 4B FF FC E5 */ bl JKRDisposer_NS_dtor +/* 802D1800 002CE740 4B FF FC E5 */ bl __dt__11JKRDisposerFv /* 802D1804 002CE744 7F E0 07 35 */ extsh. r0, r31 /* 802D1808 002CE748 40 81 00 0C */ ble lbl_802D1814 /* 802D180C 002CE74C 7F C3 F3 78 */ mr r3, r30 -/* 802D1810 002CE750 4B FF D5 2D */ bl __dl +/* 802D1810 002CE750 4B FF D5 2D */ bl __dl__FPv lbl_802D1814: /* 802D1814 002CE754 7F C3 F3 78 */ mr r3, r30 /* 802D1818 002CE758 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -212,7 +212,7 @@ JKRThread_NS_setCommon_mesgQueue: /* 802D1850 002CE790 54 03 10 3A */ slwi r3, r0, 2 /* 802D1854 002CE794 38 80 00 00 */ li r4, 0 /* 802D1858 002CE798 7C C5 33 78 */ mr r5, r6 -/* 802D185C 002CE79C 4B FF CC 19 */ bl JKRHeap_NS_alloc +/* 802D185C 002CE79C 4B FF CC 19 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D1860 002CE7A0 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D1864 002CE7A4 38 7F 00 30 */ addi r3, r31, 0x30 /* 802D1868 002CE7A8 80 9F 00 50 */ lwz r4, 0x50(r31) @@ -221,7 +221,7 @@ JKRThread_NS_setCommon_mesgQueue: /* 802D1874 002CE7B4 3C 60 80 43 */ lis r3, lbl_8043428C@ha /* 802D1878 002CE7B8 38 63 42 8C */ addi r3, r3, lbl_8043428C@l /* 802D187C 002CE7BC 38 9F 00 18 */ addi r4, r31, 0x18 -/* 802D1880 002CE7C0 48 00 A6 CD */ bl JSUPtrList_NS_append +/* 802D1880 002CE7C0 48 00 A6 CD */ bl append__10JSUPtrListFP10JSUPtrLink /* 802D1884 002CE7C4 38 00 00 00 */ li r0, 0 /* 802D1888 002CE7C8 90 1F 00 74 */ stw r0, 0x74(r31) /* 802D188C 002CE7CC 90 1F 00 78 */ stw r0, 0x78(r31) @@ -246,12 +246,12 @@ JKRThread_NS_setCommon_heapSpecified: /* 802D18CC 002CE80C 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802D18D0 002CE810 38 80 00 20 */ li r4, 0x20 /* 802D18D4 002CE814 80 BE 00 28 */ lwz r5, 0x28(r30) -/* 802D18D8 002CE818 4B FF CB 9D */ bl JKRHeap_NS_alloc +/* 802D18D8 002CE818 4B FF CB 9D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D18DC 002CE81C 90 7E 00 58 */ stw r3, 0x58(r30) /* 802D18E0 002CE820 38 60 03 18 */ li r3, 0x318 /* 802D18E4 002CE824 38 80 00 20 */ li r4, 0x20 /* 802D18E8 002CE828 80 BE 00 28 */ lwz r5, 0x28(r30) -/* 802D18EC 002CE82C 4B FF CB 89 */ bl JKRHeap_NS_alloc +/* 802D18EC 002CE82C 4B FF CB 89 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802D18F0 002CE830 90 7E 00 2C */ stw r3, 0x2c(r30) /* 802D18F4 002CE834 80 FE 00 5C */ lwz r7, 0x5c(r30) /* 802D18F8 002CE838 80 7E 00 2C */ lwz r3, 0x2c(r30) @@ -354,7 +354,7 @@ lbl_802D1A30: /* 802D1A30 002CE970 38 60 00 28 */ li r3, 0x28 /* 802D1A34 002CE974 7F E4 FB 78 */ mr r4, r31 /* 802D1A38 002CE978 38 A0 00 00 */ li r5, 0 -/* 802D1A3C 002CE97C 4B FF D2 5D */ bl __nw_X2_ +/* 802D1A3C 002CE97C 4B FF D2 5D */ bl __nw__FUlP7JKRHeapi /* 802D1A40 002CE980 7C 60 1B 79 */ or. r0, r3, r3 /* 802D1A44 002CE984 41 82 00 10 */ beq lbl_802D1A54 /* 802D1A48 002CE988 7F E4 FB 78 */ mr r4, r31 @@ -467,7 +467,7 @@ lbl_802D1B9C: /* 802D1BC0 002CEB00 48 00 00 64 */ b lbl_802D1C24 lbl_802D1BC4: /* 802D1BC4 002CEB04 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) -/* 802D1BC8 002CEB08 4B FF CF E1 */ bl JKRHeap_NS_isSubHeap +/* 802D1BC8 002CEB08 4B FF CF E1 */ bl isSubHeap__7JKRHeapCFP7JKRHeap /* 802D1BCC 002CEB0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802D1BD0 002CEB10 40 82 00 54 */ bne lbl_802D1C24 /* 802D1BD4 002CEB14 80 1F 00 78 */ lwz r0, 0x78(r31) @@ -502,7 +502,7 @@ lbl_802D1C28: /* 802D1C30 002CEB70 28 1D 00 00 */ cmplwi r29, 0 /* 802D1C34 002CEB74 41 82 00 0C */ beq lbl_802D1C40 /* 802D1C38 002CEB78 7F A3 EB 78 */ mr r3, r29 -/* 802D1C3C 002CEB7C 4B FF C7 FD */ bl JKRHeap_NS_becomeCurrentHeap +/* 802D1C3C 002CEB7C 4B FF C7 FD */ bl becomeCurrentHeap__7JKRHeapFv lbl_802D1C40: /* 802D1C40 002CEB80 81 8D 8E 44 */ lwz r12, lbl_804513C4-_SDA_BASE_(r13) /* 802D1C44 002CEB84 28 0C 00 00 */ cmplwi r12, 0 @@ -656,7 +656,7 @@ lbl_802D1DEC: /* 802D1E6C 002CEDAC 90 1F 00 00 */ stw r0, 0(r31) /* 802D1E70 002CEDB0 7C 80 07 35 */ extsh. r0, r4 /* 802D1E74 002CEDB4 40 81 00 08 */ ble lbl_802D1E7C -/* 802D1E78 002CEDB8 4B FF CE C5 */ bl __dl +/* 802D1E78 002CEDB8 4B FF CE C5 */ bl __dl__FPv lbl_802D1E7C: /* 802D1E7C 002CEDBC 7F E3 FB 78 */ mr r3, r31 /* 802D1E80 002CEDC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -672,7 +672,7 @@ lbl_802D1E7C: /* 802D1EA8 002CEDE8 3B E3 42 80 */ addi r31, r3, lbl_80434280@l /* 802D1EAC 002CEDEC 38 7F 00 0C */ addi r3, r31, 0xc /* 802D1EB0 002CEDF0 38 80 00 00 */ li r4, 0 -/* 802D1EB4 002CEDF4 48 00 9F C1 */ bl JSUPtrList +/* 802D1EB4 002CEDF4 48 00 9F C1 */ bl __ct__10JSUPtrListFb /* 802D1EB8 002CEDF8 38 7F 00 0C */ addi r3, r31, 0xc .global JSUList_NS_dtor_X3_ /* 802D1EBC 002CEDFC 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X3_@ha @@ -681,7 +681,7 @@ lbl_802D1E7C: /* 802D1EC4 002CEE04 38 BF 00 00 */ addi r5, r31, 0 /* 802D1EC8 002CEE08 48 08 FD 5D */ bl func_80361C24 /* 802D1ECC 002CEE0C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 802D1ED0 002CEE10 48 00 A0 45 */ bl JSUPtrList_NS_initiate +/* 802D1ED0 002CEE10 48 00 A0 45 */ bl initiate__10JSUPtrListFv /* 802D1ED4 002CEE14 38 7F 00 24 */ addi r3, r31, 0x24 .global JSUList_NS_dtor_X2_ /* 802D1ED8 002CEE18 3C 80 80 2D */ lis r4, JSUList_NS_dtor_X2_@ha @@ -705,11 +705,11 @@ JSUList_NS_dtor_X2_: /* 802D1F14 002CEE54 7C 9F 23 78 */ mr r31, r4 /* 802D1F18 002CEE58 41 82 00 1C */ beq lbl_802D1F34 /* 802D1F1C 002CEE5C 38 80 00 00 */ li r4, 0 -/* 802D1F20 002CEE60 48 00 9F 8D */ bl JSUPtrList_NS_dtor +/* 802D1F20 002CEE60 48 00 9F 8D */ bl __dt__10JSUPtrListFv /* 802D1F24 002CEE64 7F E0 07 35 */ extsh. r0, r31 /* 802D1F28 002CEE68 40 81 00 0C */ ble lbl_802D1F34 /* 802D1F2C 002CEE6C 7F C3 F3 78 */ mr r3, r30 -/* 802D1F30 002CEE70 4B FF CE 0D */ bl __dl +/* 802D1F30 002CEE70 4B FF CE 0D */ bl __dl__FPv lbl_802D1F34: /* 802D1F34 002CEE74 7F C3 F3 78 */ mr r3, r30 /* 802D1F38 002CEE78 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -729,11 +729,11 @@ JSUList_NS_dtor_X3_: /* 802D1F68 002CEEA8 7C 9F 23 78 */ mr r31, r4 /* 802D1F6C 002CEEAC 41 82 00 1C */ beq lbl_802D1F88 /* 802D1F70 002CEEB0 38 80 00 00 */ li r4, 0 -/* 802D1F74 002CEEB4 48 00 9F 39 */ bl JSUPtrList_NS_dtor +/* 802D1F74 002CEEB4 48 00 9F 39 */ bl __dt__10JSUPtrListFv /* 802D1F78 002CEEB8 7F E0 07 35 */ extsh. r0, r31 /* 802D1F7C 002CEEBC 40 81 00 0C */ ble lbl_802D1F88 /* 802D1F80 002CEEC0 7F C3 F3 78 */ mr r3, r30 -/* 802D1F84 002CEEC4 4B FF CD B9 */ bl __dl +/* 802D1F84 002CEEC4 4B FF CD B9 */ bl __dl__FPv lbl_802D1F88: /* 802D1F88 002CEEC8 7F C3 F3 78 */ mr r3, r30 /* 802D1F8C 002CEECC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JMessage/control.s b/asm/JMessage/control.s index 5c232751fc..c4e23df9bc 100644 --- a/asm/JMessage/control.s +++ b/asm/JMessage/control.s @@ -36,7 +36,7 @@ JMessage_NS_TControl_NS_dtor: /* 802A75AC 002A44EC 90 1F 00 00 */ stw r0, 0(r31) /* 802A75B0 002A44F0 7C 80 07 35 */ extsh. r0, r4 /* 802A75B4 002A44F4 40 81 00 08 */ ble lbl_802A75BC -/* 802A75B8 002A44F8 48 02 77 85 */ bl __dl +/* 802A75B8 002A44F8 48 02 77 85 */ bl __dl__FPv lbl_802A75BC: /* 802A75BC 002A44FC 7F E3 FB 78 */ mr r3, r31 /* 802A75C0 002A4500 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JMessage/processor.s b/asm/JMessage/processor.s index 4da20177db..b92bcc2b18 100644 --- a/asm/JMessage/processor.s +++ b/asm/JMessage/processor.s @@ -16,7 +16,7 @@ JMessage_NS_TReference_NS_dtor: /* 802A7B18 002A4A58 90 1F 00 00 */ stw r0, 0(r31) /* 802A7B1C 002A4A5C 7C 80 07 35 */ extsh. r0, r4 /* 802A7B20 002A4A60 40 81 00 08 */ ble lbl_802A7B28 -/* 802A7B24 002A4A64 48 02 72 19 */ bl __dl +/* 802A7B24 002A4A64 48 02 72 19 */ bl __dl__FPv lbl_802A7B28: /* 802A7B28 002A4A68 7F E3 FB 78 */ mr r3, r31 /* 802A7B2C 002A4A6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -40,7 +40,7 @@ JMessage_NS_TProcessor_NS_dtor: /* 802A7B68 002A4AA8 90 1F 00 00 */ stw r0, 0(r31) /* 802A7B6C 002A4AAC 7C 80 07 35 */ extsh. r0, r4 /* 802A7B70 002A4AB0 40 81 00 08 */ ble lbl_802A7B78 -/* 802A7B74 002A4AB4 48 02 71 C9 */ bl __dl +/* 802A7B74 002A4AB4 48 02 71 C9 */ bl __dl__FPv lbl_802A7B78: /* 802A7B78 002A4AB8 7F E3 FB 78 */ mr r3, r31 /* 802A7B7C 002A4ABC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -681,7 +681,7 @@ JMessage_NS_TSequenceProcessor_NS_dtor: /* 802A83EC 002A532C 7F E0 07 35 */ extsh. r0, r31 /* 802A83F0 002A5330 40 81 00 0C */ ble lbl_802A83FC /* 802A83F4 002A5334 7F C3 F3 78 */ mr r3, r30 -/* 802A83F8 002A5338 48 02 69 45 */ bl __dl +/* 802A83F8 002A5338 48 02 69 45 */ bl __dl__FPv lbl_802A83FC: /* 802A83FC 002A533C 7F C3 F3 78 */ mr r3, r30 /* 802A8400 002A5340 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1217,7 +1217,7 @@ JMessage_NS_TRenderingProcessor_NS_dtor: /* 802A8AF4 002A5A34 7F E0 07 35 */ extsh. r0, r31 /* 802A8AF8 002A5A38 40 81 00 0C */ ble lbl_802A8B04 /* 802A8AFC 002A5A3C 7F C3 F3 78 */ mr r3, r30 -/* 802A8B00 002A5A40 48 02 62 3D */ bl __dl +/* 802A8B00 002A5A40 48 02 62 3D */ bl __dl__FPv lbl_802A8B04: /* 802A8B04 002A5A44 7F C3 F3 78 */ mr r3, r30 /* 802A8B08 002A5A48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JMessage/resource.s b/asm/JMessage/resource.s index 4482f08806..18dd2d0dcd 100644 --- a/asm/JMessage/resource.s +++ b/asm/JMessage/resource.s @@ -194,7 +194,7 @@ lbl_802A8F40: /* 802A8F40 002A5E80 7F E0 07 35 */ extsh. r0, r31 /* 802A8F44 002A5E84 40 81 00 0C */ ble lbl_802A8F50 /* 802A8F48 002A5E88 7F C3 F3 78 */ mr r3, r30 -/* 802A8F4C 002A5E8C 48 02 5D F1 */ bl __dl +/* 802A8F4C 002A5E8C 48 02 5D F1 */ bl __dl__FPv lbl_802A8F50: /* 802A8F50 002A5E90 7F C3 F3 78 */ mr r3, r30 /* 802A8F54 002A5E94 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -250,7 +250,7 @@ lbl_802A8FF4: /* 802A9000 002A5F40 7C 08 02 A6 */ mflr r0 /* 802A9004 002A5F44 90 01 00 14 */ stw r0, 0x14(r1) /* 802A9008 002A5F48 38 60 00 1C */ li r3, 0x1c -/* 802A900C 002A5F4C 48 02 5C 41 */ bl __nw +/* 802A900C 002A5F4C 48 02 5C 41 */ bl __nw__FUl /* 802A9010 002A5F50 28 03 00 00 */ cmplwi r3, 0 /* 802A9014 002A5F54 41 82 00 24 */ beq lbl_802A9038 /* 802A9018 002A5F58 38 00 00 00 */ li r0, 0 @@ -270,7 +270,7 @@ lbl_802A9038: /* 802A904C 002A5F8C 7C 08 02 A6 */ mflr r0 /* 802A9050 002A5F90 90 01 00 14 */ stw r0, 0x14(r1) /* 802A9054 002A5F94 7C 83 23 78 */ mr r3, r4 -/* 802A9058 002A5F98 48 02 5C E5 */ bl __dl +/* 802A9058 002A5F98 48 02 5C E5 */ bl __dl__FPv /* 802A905C 002A5F9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A9060 002A5FA0 7C 08 03 A6 */ mtlr r0 /* 802A9064 002A5FA4 38 21 00 10 */ addi r1, r1, 0x10 @@ -365,7 +365,7 @@ JMessage_NS_TParse: /* 802A918C 002A60CC 7F E0 07 35 */ extsh. r0, r31 /* 802A9190 002A60D0 40 81 00 0C */ ble lbl_802A919C /* 802A9194 002A60D4 7F C3 F3 78 */ mr r3, r30 -/* 802A9198 002A60D8 48 02 5B A5 */ bl __dl +/* 802A9198 002A60D8 48 02 5B A5 */ bl __dl__FPv lbl_802A919C: /* 802A919C 002A60DC 7F C3 F3 78 */ mr r3, r30 /* 802A91A0 002A60E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index f80e0692f3..31ac0dab06 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -3935,7 +3935,7 @@ makeColorTable: /* 8027A47C 002773BC 57 E3 10 3A */ slwi r3, r31, 2 /* 8027A480 002773C0 38 80 00 04 */ li r4, 4 /* 8027A484 002773C4 7C E5 3B 78 */ mr r5, r7 -/* 8027A488 002773C8 48 05 3F ED */ bl JKRHeap_NS_alloc +/* 8027A488 002773C8 48 05 3F ED */ bl alloc__7JKRHeapFUliP7JKRHeap /* 8027A48C 002773CC C0 82 B8 C0 */ lfs f4, lbl_804552C0-_SDA2_BASE_(r2) /* 8027A490 002773D0 FC C0 20 90 */ fmr f6, f4 /* 8027A494 002773D4 FC A0 20 90 */ fmr f5, f4 diff --git a/asm/JParticle/JPAEmitter.s b/asm/JParticle/JPAEmitter.s index f9a8d79abc..c93ab0590d 100644 --- a/asm/JParticle/JPAEmitter.s +++ b/asm/JParticle/JPAEmitter.s @@ -16,7 +16,7 @@ JPAEmitterCallBack_NS_dtor: /* 8027E6C4 0027B604 90 1F 00 00 */ stw r0, 0(r31) /* 8027E6C8 0027B608 7C 80 07 35 */ extsh. r0, r4 /* 8027E6CC 0027B60C 40 81 00 08 */ ble lbl_8027E6D4 -/* 8027E6D0 0027B610 48 05 06 6D */ bl __dl +/* 8027E6D0 0027B610 48 05 06 6D */ bl __dl__FPv lbl_8027E6D4: /* 8027E6D4 0027B614 7F E3 FB 78 */ mr r3, r31 /* 8027E6D8 0027B618 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JParticle/JPAEmitterManager.s b/asm/JParticle/JPAEmitterManager.s index dc58bae1fa..46a019fe5c 100644 --- a/asm/JParticle/JPAEmitterManager.s +++ b/asm/JParticle/JPAEmitterManager.s @@ -17,7 +17,7 @@ JPAEmitterManager: /* 8027DCC4 0027AC04 7C FC 3B 78 */ mr r28, r7 /* 8027DCC8 0027AC08 7D 1B 43 78 */ mr r27, r8 /* 8027DCCC 0027AC0C 38 7E 00 04 */ addi r3, r30, 4 -/* 8027DCD0 0027AC10 48 05 E2 45 */ bl JSUPtrList_NS_initiate +/* 8027DCD0 0027AC10 48 05 E2 45 */ bl initiate__10JSUPtrListFv /* 8027DCD4 0027AC14 38 00 00 00 */ li r0, 0 /* 8027DCD8 0027AC18 90 1E 00 10 */ stw r0, 0x10(r30) /* 8027DCDC 0027AC1C 90 1E 00 14 */ stw r0, 0x14(r30) @@ -31,7 +31,7 @@ JPAEmitterManager: /* 8027DCFC 0027AC3C 38 63 00 10 */ addi r3, r3, 0x10 /* 8027DD00 0027AC40 7F E4 FB 78 */ mr r4, r31 /* 8027DD04 0027AC44 38 A0 00 00 */ li r5, 0 -/* 8027DD08 0027AC48 48 05 10 09 */ bl __nwa_X2_ +/* 8027DD08 0027AC48 48 05 10 09 */ bl __nwa__FUlP7JKRHeapi .global JPABaseEmitter /* 8027DD0C 0027AC4C 3C 80 80 28 */ lis r4, JPABaseEmitter@ha .global JPABaseEmitter @@ -51,7 +51,7 @@ lbl_8027DD38: /* 8027DD38 0027AC78 38 7E 00 04 */ addi r3, r30, 4 /* 8027DD3C 0027AC7C 38 9D 00 58 */ addi r4, r29, 0x58 /* 8027DD40 0027AC80 7C 9C 22 14 */ add r4, r28, r4 -/* 8027DD44 0027AC84 48 05 E2 AD */ bl JSUPtrList_NS_prepend +/* 8027DD44 0027AC84 48 05 E2 AD */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 8027DD48 0027AC88 3B 7B 00 01 */ addi r27, r27, 1 /* 8027DD4C 0027AC8C 3B BD 01 14 */ addi r29, r29, 0x114 lbl_8027DD50: @@ -63,7 +63,7 @@ lbl_8027DD50: /* 8027DD64 0027ACA4 38 63 00 10 */ addi r3, r3, 0x10 /* 8027DD68 0027ACA8 7F E4 FB 78 */ mr r4, r31 /* 8027DD6C 0027ACAC 38 A0 00 00 */ li r5, 0 -/* 8027DD70 0027ACB0 48 05 0F A1 */ bl __nwa_X2_ +/* 8027DD70 0027ACB0 48 05 0F A1 */ bl __nwa__FUlP7JKRHeapi .global JPANode /* 8027DD74 0027ACB4 3C 80 80 28 */ lis r4, JPANode@ha .global JPANode @@ -112,7 +112,7 @@ lbl_8027DDF4: /* 8027DE08 0027AD48 38 63 00 10 */ addi r3, r3, 0x10 /* 8027DE0C 0027AD4C 7F E4 FB 78 */ mr r4, r31 /* 8027DE10 0027AD50 38 A0 00 00 */ li r5, 0 -/* 8027DE14 0027AD54 48 05 0E FD */ bl __nwa_X2_ +/* 8027DE14 0027AD54 48 05 0E FD */ bl __nwa__FUlP7JKRHeapi .global JSUList /* 8027DE18 0027AD58 3C 80 80 28 */ lis r4, JSUList@ha .global JSUList @@ -129,7 +129,7 @@ lbl_8027DDF4: /* 8027DE3C 0027AD7C 54 03 10 3A */ slwi r3, r0, 2 /* 8027DE40 0027AD80 7F E4 FB 78 */ mr r4, r31 /* 8027DE44 0027AD84 38 A0 00 00 */ li r5, 0 -/* 8027DE48 0027AD88 48 05 0E C9 */ bl __nwa_X2_ +/* 8027DE48 0027AD88 48 05 0E C9 */ bl __nwa__FUlP7JKRHeapi /* 8027DE4C 0027AD8C 90 7E 00 1C */ stw r3, 0x1c(r30) /* 8027DE50 0027AD90 38 C0 00 00 */ li r6, 0 /* 8027DE54 0027AD94 38 60 00 00 */ li r3, 0 @@ -147,7 +147,7 @@ lbl_8027DE70: /* 8027DE7C 0027ADBC 38 60 02 18 */ li r3, 0x218 /* 8027DE80 0027ADC0 7F E4 FB 78 */ mr r4, r31 /* 8027DE84 0027ADC4 38 A0 00 00 */ li r5, 0 -/* 8027DE88 0027ADC8 48 05 0E 11 */ bl __nw_X2_ +/* 8027DE88 0027ADC8 48 05 0E 11 */ bl __nw__FUlP7JKRHeapi /* 8027DE8C 0027ADCC 28 03 00 00 */ cmplwi r3, 0 /* 8027DE90 0027ADD0 41 82 00 0C */ beq lbl_8027DE9C /* 8027DE94 0027ADD4 38 00 00 00 */ li r0, 0 @@ -188,13 +188,13 @@ JPAEmitterManager_NS_createSimpleEmitterID: /* 8027DF10 0027AE50 83 F8 00 04 */ lwz r31, 4(r24) /* 8027DF14 0027AE54 38 78 00 04 */ addi r3, r24, 4 /* 8027DF18 0027AE58 7F E4 FB 78 */ mr r4, r31 -/* 8027DF1C 0027AE5C 48 05 E2 41 */ bl JSUPtrList_NS_remove +/* 8027DF1C 0027AE5C 48 05 E2 41 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 8027DF20 0027AE60 80 78 00 00 */ lwz r3, 0(r24) /* 8027DF24 0027AE64 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 8027DF28 0027AE68 1C 00 00 0C */ mulli r0, r0, 0xc /* 8027DF2C 0027AE6C 7C 63 02 14 */ add r3, r3, r0 /* 8027DF30 0027AE70 7F E4 FB 78 */ mr r4, r31 -/* 8027DF34 0027AE74 48 05 E0 19 */ bl JSUPtrList_NS_append +/* 8027DF34 0027AE74 48 05 E0 19 */ bl append__10JSUPtrListFP10JSUPtrLink /* 8027DF38 0027AE78 83 FF 00 00 */ lwz r31, 0(r31) /* 8027DF3C 0027AE7C 7F E3 FB 78 */ mr r3, r31 /* 8027DF40 0027AE80 7F 04 C3 78 */ mr r4, r24 @@ -471,10 +471,10 @@ JPAEmitterManager_NS_forceDeleteEmitter: /* 8027E310 0027B250 1C 00 00 0C */ mulli r0, r0, 0xc /* 8027E314 0027B254 7C 63 02 14 */ add r3, r3, r0 /* 8027E318 0027B258 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8027E31C 0027B25C 48 05 DE 41 */ bl JSUPtrList_NS_remove +/* 8027E31C 0027B25C 48 05 DE 41 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 8027E320 0027B260 38 7E 00 04 */ addi r3, r30, 4 /* 8027E324 0027B264 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8027E328 0027B268 48 05 DC C9 */ bl JSUPtrList_NS_prepend +/* 8027E328 0027B268 48 05 DC C9 */ bl prepend__10JSUPtrListFP10JSUPtrLink /* 8027E32C 0027B26C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027E330 0027B270 83 C1 00 08 */ lwz r30, 8(r1) /* 8027E334 0027B274 80 01 00 14 */ lwz r0, 0x14(r1) @@ -623,7 +623,7 @@ JSUList: /* 8027E524 0027B464 90 01 00 14 */ stw r0, 0x14(r1) /* 8027E528 0027B468 93 E1 00 0C */ stw r31, 0xc(r1) /* 8027E52C 0027B46C 7C 7F 1B 78 */ mr r31, r3 -/* 8027E530 0027B470 48 05 D9 E5 */ bl JSUPtrList_NS_initiate +/* 8027E530 0027B470 48 05 D9 E5 */ bl initiate__10JSUPtrListFv /* 8027E534 0027B474 7F E3 FB 78 */ mr r3, r31 /* 8027E538 0027B478 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027E53C 0027B47C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -640,7 +640,7 @@ JPANode_NS_dtor: /* 8027E560 0027B4A0 41 82 00 10 */ beq lbl_8027E570 /* 8027E564 0027B4A4 7C 80 07 35 */ extsh. r0, r4 /* 8027E568 0027B4A8 40 81 00 08 */ ble lbl_8027E570 -/* 8027E56C 0027B4AC 48 05 07 D1 */ bl __dl +/* 8027E56C 0027B4AC 48 05 07 D1 */ bl __dl__FPv lbl_8027E570: /* 8027E570 0027B4B0 7F E3 FB 78 */ mr r3, r31 /* 8027E574 0027B4B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -665,11 +665,11 @@ JSUList_NS_dtor_X1_: /* 8027E5B0 0027B4F0 7C 9F 23 78 */ mr r31, r4 /* 8027E5B4 0027B4F4 41 82 00 1C */ beq lbl_8027E5D0 /* 8027E5B8 0027B4F8 38 80 00 00 */ li r4, 0 -/* 8027E5BC 0027B4FC 48 05 D8 F1 */ bl JSUPtrList_NS_dtor +/* 8027E5BC 0027B4FC 48 05 D8 F1 */ bl __dt__10JSUPtrListFv /* 8027E5C0 0027B500 7F E0 07 35 */ extsh. r0, r31 /* 8027E5C4 0027B504 40 81 00 0C */ ble lbl_8027E5D0 /* 8027E5C8 0027B508 7F C3 F3 78 */ mr r3, r30 -/* 8027E5CC 0027B50C 48 05 07 71 */ bl __dl +/* 8027E5CC 0027B50C 48 05 07 71 */ bl __dl__FPv lbl_8027E5D0: /* 8027E5D0 0027B510 7F C3 F3 78 */ mr r3, r30 /* 8027E5D4 0027B514 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -692,12 +692,12 @@ JPABaseEmitter_NS_dtor: /* 8027E610 0027B550 41 82 00 10 */ beq lbl_8027E620 /* 8027E614 0027B554 38 7E 00 58 */ addi r3, r30, 0x58 /* 8027E618 0027B558 38 80 00 00 */ li r4, 0 -/* 8027E61C 0027B55C 48 05 D7 F9 */ bl JSUPtrLink_NS_dtor +/* 8027E61C 0027B55C 48 05 D7 F9 */ bl __dt__10JSUPtrLinkFv lbl_8027E620: /* 8027E620 0027B560 7F E0 07 35 */ extsh. r0, r31 /* 8027E624 0027B564 40 81 00 0C */ ble lbl_8027E630 /* 8027E628 0027B568 7F C3 F3 78 */ mr r3, r30 -/* 8027E62C 0027B56C 48 05 07 11 */ bl __dl +/* 8027E62C 0027B56C 48 05 07 11 */ bl __dl__FPv lbl_8027E630: /* 8027E630 0027B570 7F C3 F3 78 */ mr r3, r30 /* 8027E634 0027B574 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -715,7 +715,7 @@ JPABaseEmitter: /* 8027E65C 0027B59C 7C 7F 1B 78 */ mr r31, r3 /* 8027E660 0027B5A0 38 7F 00 58 */ addi r3, r31, 0x58 /* 8027E664 0027B5A4 7F E4 FB 78 */ mr r4, r31 -/* 8027E668 0027B5A8 48 05 D7 95 */ bl JSUPtrLink +/* 8027E668 0027B5A8 48 05 D7 95 */ bl __ct__10JSUPtrLinkFPv /* 8027E66C 0027B5AC 38 00 00 00 */ li r0, 0 /* 8027E670 0027B5B0 90 1F 00 C4 */ stw r0, 0xc4(r31) /* 8027E674 0027B5B4 90 1F 00 C8 */ stw r0, 0xc8(r31) diff --git a/asm/JParticle/JPAFieldBlock.s b/asm/JParticle/JPAFieldBlock.s index 0eb8b89864..7056fe2b23 100644 --- a/asm/JParticle/JPAFieldBlock.s +++ b/asm/JParticle/JPAFieldBlock.s @@ -1348,7 +1348,7 @@ lbl_8027D14C: /* 8027D1B8 0027A0F8 4E 80 04 20 */ bctr /* 8027D1BC 0027A0FC 38 60 00 10 */ li r3, 0x10 /* 8027D1C0 0027A100 38 A0 00 00 */ li r5, 0 -/* 8027D1C4 0027A104 48 05 1A D5 */ bl __nw_X2_ +/* 8027D1C4 0027A104 48 05 1A D5 */ bl __nw__FUlP7JKRHeapi /* 8027D1C8 0027A108 28 03 00 00 */ cmplwi r3, 0 /* 8027D1CC 0027A10C 41 82 00 1C */ beq lbl_8027D1E8 /* 8027D1D0 0027A110 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1362,7 +1362,7 @@ lbl_8027D1E8: /* 8027D1EC 0027A12C 48 00 01 AC */ b lbl_8027D398 /* 8027D1F0 0027A130 38 60 00 10 */ li r3, 0x10 /* 8027D1F4 0027A134 38 A0 00 00 */ li r5, 0 -/* 8027D1F8 0027A138 48 05 1A A1 */ bl __nw_X2_ +/* 8027D1F8 0027A138 48 05 1A A1 */ bl __nw__FUlP7JKRHeapi /* 8027D1FC 0027A13C 28 03 00 00 */ cmplwi r3, 0 /* 8027D200 0027A140 41 82 00 1C */ beq lbl_8027D21C /* 8027D204 0027A144 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1376,7 +1376,7 @@ lbl_8027D21C: /* 8027D220 0027A160 48 00 01 78 */ b lbl_8027D398 /* 8027D224 0027A164 38 60 00 1C */ li r3, 0x1c /* 8027D228 0027A168 38 A0 00 00 */ li r5, 0 -/* 8027D22C 0027A16C 48 05 1A 6D */ bl __nw_X2_ +/* 8027D22C 0027A16C 48 05 1A 6D */ bl __nw__FUlP7JKRHeapi /* 8027D230 0027A170 28 03 00 00 */ cmplwi r3, 0 /* 8027D234 0027A174 41 82 00 1C */ beq lbl_8027D250 /* 8027D238 0027A178 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1390,7 +1390,7 @@ lbl_8027D250: /* 8027D254 0027A194 48 00 01 44 */ b lbl_8027D398 /* 8027D258 0027A198 38 60 00 20 */ li r3, 0x20 /* 8027D25C 0027A19C 38 A0 00 00 */ li r5, 0 -/* 8027D260 0027A1A0 48 05 1A 39 */ bl __nw_X2_ +/* 8027D260 0027A1A0 48 05 1A 39 */ bl __nw__FUlP7JKRHeapi /* 8027D264 0027A1A4 28 03 00 00 */ cmplwi r3, 0 /* 8027D268 0027A1A8 41 82 00 1C */ beq lbl_8027D284 /* 8027D26C 0027A1AC 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1404,7 +1404,7 @@ lbl_8027D284: /* 8027D288 0027A1C8 48 00 01 10 */ b lbl_8027D398 /* 8027D28C 0027A1CC 38 60 00 24 */ li r3, 0x24 /* 8027D290 0027A1D0 38 A0 00 00 */ li r5, 0 -/* 8027D294 0027A1D4 48 05 1A 05 */ bl __nw_X2_ +/* 8027D294 0027A1D4 48 05 1A 05 */ bl __nw__FUlP7JKRHeapi /* 8027D298 0027A1D8 28 03 00 00 */ cmplwi r3, 0 /* 8027D29C 0027A1DC 41 82 00 1C */ beq lbl_8027D2B8 /* 8027D2A0 0027A1E0 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1418,7 +1418,7 @@ lbl_8027D2B8: /* 8027D2BC 0027A1FC 48 00 00 DC */ b lbl_8027D398 /* 8027D2C0 0027A200 38 60 00 10 */ li r3, 0x10 /* 8027D2C4 0027A204 38 A0 00 00 */ li r5, 0 -/* 8027D2C8 0027A208 48 05 19 D1 */ bl __nw_X2_ +/* 8027D2C8 0027A208 48 05 19 D1 */ bl __nw__FUlP7JKRHeapi /* 8027D2CC 0027A20C 28 03 00 00 */ cmplwi r3, 0 /* 8027D2D0 0027A210 41 82 00 1C */ beq lbl_8027D2EC /* 8027D2D4 0027A214 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1432,7 +1432,7 @@ lbl_8027D2EC: /* 8027D2F0 0027A230 48 00 00 A8 */ b lbl_8027D398 /* 8027D2F4 0027A234 38 60 00 10 */ li r3, 0x10 /* 8027D2F8 0027A238 38 A0 00 00 */ li r5, 0 -/* 8027D2FC 0027A23C 48 05 19 9D */ bl __nw_X2_ +/* 8027D2FC 0027A23C 48 05 19 9D */ bl __nw__FUlP7JKRHeapi /* 8027D300 0027A240 28 03 00 00 */ cmplwi r3, 0 /* 8027D304 0027A244 41 82 00 1C */ beq lbl_8027D320 /* 8027D308 0027A248 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1446,7 +1446,7 @@ lbl_8027D320: /* 8027D324 0027A264 48 00 00 74 */ b lbl_8027D398 /* 8027D328 0027A268 38 60 00 34 */ li r3, 0x34 /* 8027D32C 0027A26C 38 A0 00 00 */ li r5, 0 -/* 8027D330 0027A270 48 05 19 69 */ bl __nw_X2_ +/* 8027D330 0027A270 48 05 19 69 */ bl __nw__FUlP7JKRHeapi /* 8027D334 0027A274 28 03 00 00 */ cmplwi r3, 0 /* 8027D338 0027A278 41 82 00 1C */ beq lbl_8027D354 /* 8027D33C 0027A27C 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1460,7 +1460,7 @@ lbl_8027D354: /* 8027D358 0027A298 48 00 00 40 */ b lbl_8027D398 /* 8027D35C 0027A29C 38 60 00 34 */ li r3, 0x34 /* 8027D360 0027A2A0 38 A0 00 00 */ li r5, 0 -/* 8027D364 0027A2A4 48 05 19 35 */ bl __nw_X2_ +/* 8027D364 0027A2A4 48 05 19 35 */ bl __nw__FUlP7JKRHeapi /* 8027D368 0027A2A8 28 03 00 00 */ cmplwi r3, 0 /* 8027D36C 0027A2AC 41 82 00 1C */ beq lbl_8027D388 /* 8027D370 0027A2B0 3C 80 80 3C */ lis r4, lbl_803C44CC@ha @@ -1492,7 +1492,7 @@ lbl_8027D398: /* 8027D3CC 0027A30C 90 1F 00 00 */ stw r0, 0(r31) /* 8027D3D0 0027A310 7C 80 07 35 */ extsh. r0, r4 /* 8027D3D4 0027A314 40 81 00 08 */ ble lbl_8027D3DC -/* 8027D3D8 0027A318 48 05 19 65 */ bl __dl +/* 8027D3D8 0027A318 48 05 19 65 */ bl __dl__FPv lbl_8027D3DC: /* 8027D3DC 0027A31C 7F E3 FB 78 */ mr r3, r31 /* 8027D3E0 0027A320 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1517,7 +1517,7 @@ lbl_8027D428: /* 8027D428 0027A368 7C 80 07 35 */ extsh. r0, r4 /* 8027D42C 0027A36C 40 81 00 0C */ ble lbl_8027D438 /* 8027D430 0027A370 7F E3 FB 78 */ mr r3, r31 -/* 8027D434 0027A374 48 05 19 09 */ bl __dl +/* 8027D434 0027A374 48 05 19 09 */ bl __dl__FPv lbl_8027D438: /* 8027D438 0027A378 7F E3 FB 78 */ mr r3, r31 /* 8027D43C 0027A37C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1542,7 +1542,7 @@ lbl_8027D484: /* 8027D484 0027A3C4 7C 80 07 35 */ extsh. r0, r4 /* 8027D488 0027A3C8 40 81 00 0C */ ble lbl_8027D494 /* 8027D48C 0027A3CC 7F E3 FB 78 */ mr r3, r31 -/* 8027D490 0027A3D0 48 05 18 AD */ bl __dl +/* 8027D490 0027A3D0 48 05 18 AD */ bl __dl__FPv lbl_8027D494: /* 8027D494 0027A3D4 7F E3 FB 78 */ mr r3, r31 /* 8027D498 0027A3D8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1567,7 +1567,7 @@ lbl_8027D4E0: /* 8027D4E0 0027A420 7C 80 07 35 */ extsh. r0, r4 /* 8027D4E4 0027A424 40 81 00 0C */ ble lbl_8027D4F0 /* 8027D4E8 0027A428 7F E3 FB 78 */ mr r3, r31 -/* 8027D4EC 0027A42C 48 05 18 51 */ bl __dl +/* 8027D4EC 0027A42C 48 05 18 51 */ bl __dl__FPv lbl_8027D4F0: /* 8027D4F0 0027A430 7F E3 FB 78 */ mr r3, r31 /* 8027D4F4 0027A434 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1592,7 +1592,7 @@ lbl_8027D53C: /* 8027D53C 0027A47C 7C 80 07 35 */ extsh. r0, r4 /* 8027D540 0027A480 40 81 00 0C */ ble lbl_8027D54C /* 8027D544 0027A484 7F E3 FB 78 */ mr r3, r31 -/* 8027D548 0027A488 48 05 17 F5 */ bl __dl +/* 8027D548 0027A488 48 05 17 F5 */ bl __dl__FPv lbl_8027D54C: /* 8027D54C 0027A48C 7F E3 FB 78 */ mr r3, r31 /* 8027D550 0027A490 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1617,7 +1617,7 @@ lbl_8027D598: /* 8027D598 0027A4D8 7C 80 07 35 */ extsh. r0, r4 /* 8027D59C 0027A4DC 40 81 00 0C */ ble lbl_8027D5A8 /* 8027D5A0 0027A4E0 7F E3 FB 78 */ mr r3, r31 -/* 8027D5A4 0027A4E4 48 05 17 99 */ bl __dl +/* 8027D5A4 0027A4E4 48 05 17 99 */ bl __dl__FPv lbl_8027D5A8: /* 8027D5A8 0027A4E8 7F E3 FB 78 */ mr r3, r31 /* 8027D5AC 0027A4EC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1642,7 +1642,7 @@ lbl_8027D5F4: /* 8027D5F4 0027A534 7C 80 07 35 */ extsh. r0, r4 /* 8027D5F8 0027A538 40 81 00 0C */ ble lbl_8027D604 /* 8027D5FC 0027A53C 7F E3 FB 78 */ mr r3, r31 -/* 8027D600 0027A540 48 05 17 3D */ bl __dl +/* 8027D600 0027A540 48 05 17 3D */ bl __dl__FPv lbl_8027D604: /* 8027D604 0027A544 7F E3 FB 78 */ mr r3, r31 /* 8027D608 0027A548 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1667,7 +1667,7 @@ lbl_8027D650: /* 8027D650 0027A590 7C 80 07 35 */ extsh. r0, r4 /* 8027D654 0027A594 40 81 00 0C */ ble lbl_8027D660 /* 8027D658 0027A598 7F E3 FB 78 */ mr r3, r31 -/* 8027D65C 0027A59C 48 05 16 E1 */ bl __dl +/* 8027D65C 0027A59C 48 05 16 E1 */ bl __dl__FPv lbl_8027D660: /* 8027D660 0027A5A0 7F E3 FB 78 */ mr r3, r31 /* 8027D664 0027A5A4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1692,7 +1692,7 @@ lbl_8027D6AC: /* 8027D6AC 0027A5EC 7C 80 07 35 */ extsh. r0, r4 /* 8027D6B0 0027A5F0 40 81 00 0C */ ble lbl_8027D6BC /* 8027D6B4 0027A5F4 7F E3 FB 78 */ mr r3, r31 -/* 8027D6B8 0027A5F8 48 05 16 85 */ bl __dl +/* 8027D6B8 0027A5F8 48 05 16 85 */ bl __dl__FPv lbl_8027D6BC: /* 8027D6BC 0027A5FC 7F E3 FB 78 */ mr r3, r31 /* 8027D6C0 0027A600 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1717,7 +1717,7 @@ lbl_8027D708: /* 8027D708 0027A648 7C 80 07 35 */ extsh. r0, r4 /* 8027D70C 0027A64C 40 81 00 0C */ ble lbl_8027D718 /* 8027D710 0027A650 7F E3 FB 78 */ mr r3, r31 -/* 8027D714 0027A654 48 05 16 29 */ bl __dl +/* 8027D714 0027A654 48 05 16 29 */ bl __dl__FPv lbl_8027D718: /* 8027D718 0027A658 7F E3 FB 78 */ mr r3, r31 /* 8027D71C 0027A65C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JParticle/JPAParticle.s b/asm/JParticle/JPAParticle.s index c79e83406e..70d740c4f9 100644 --- a/asm/JParticle/JPAParticle.s +++ b/asm/JParticle/JPAParticle.s @@ -16,7 +16,7 @@ JPAParticleCallBack_NS_dtor: /* 8027EFC4 0027BF04 90 1F 00 00 */ stw r0, 0(r31) /* 8027EFC8 0027BF08 7C 80 07 35 */ extsh. r0, r4 /* 8027EFCC 0027BF0C 40 81 00 08 */ ble lbl_8027EFD4 -/* 8027EFD0 0027BF10 48 04 FD 6D */ bl __dl +/* 8027EFD0 0027BF10 48 04 FD 6D */ bl __dl__FPv lbl_8027EFD4: /* 8027EFD4 0027BF14 7F E3 FB 78 */ mr r3, r31 /* 8027EFD8 0027BF18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index daa431d779..b7d4b7bbfd 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -235,7 +235,7 @@ lbl_80274334: /* 80274340 00271280 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 80274344 00271284 38 80 00 04 */ li r4, 4 /* 80274348 00271288 7E 05 83 78 */ mr r5, r16 -/* 8027434C 0027128C 48 05 A1 29 */ bl JKRHeap_NS_alloc +/* 8027434C 0027128C 48 05 A1 29 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80274350 00271290 90 6F 00 00 */ stw r3, 0(r15) lbl_80274354: /* 80274354 00271294 38 60 00 00 */ li r3, 0 @@ -484,7 +484,7 @@ lbl_8027463C: /* 80274648 00271588 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 8027464C 0027158C 38 80 00 04 */ li r4, 4 /* 80274650 00271590 7E 05 83 78 */ mr r5, r16 -/* 80274654 00271594 48 05 9E 21 */ bl JKRHeap_NS_alloc +/* 80274654 00271594 48 05 9E 21 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80274658 00271598 90 6F 00 0C */ stw r3, 0xc(r15) lbl_8027465C: /* 8027465C 0027159C 38 60 00 00 */ li r3, 0 @@ -836,7 +836,7 @@ lbl_80274A60: /* 80274A6C 002719AC 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 80274A70 002719B0 38 80 00 04 */ li r4, 4 /* 80274A74 002719B4 7E 05 83 78 */ mr r5, r16 -/* 80274A78 002719B8 48 05 99 FD */ bl JKRHeap_NS_alloc +/* 80274A78 002719B8 48 05 99 FD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80274A7C 002719BC 90 6F 00 14 */ stw r3, 0x14(r15) lbl_80274A80: /* 80274A80 002719C0 38 00 00 00 */ li r0, 0 @@ -934,7 +934,7 @@ lbl_80274BA8: /* 80274BB4 00271AF4 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 80274BB8 00271AF8 38 80 00 04 */ li r4, 4 /* 80274BBC 00271AFC 7E 05 83 78 */ mr r5, r16 -/* 80274BC0 00271B00 48 05 98 B5 */ bl JKRHeap_NS_alloc +/* 80274BC0 00271B00 48 05 98 B5 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80274BC4 00271B04 90 6F 00 04 */ stw r3, 4(r15) lbl_80274BC8: /* 80274BC8 00271B08 38 60 00 00 */ li r3, 0 @@ -1202,7 +1202,7 @@ lbl_80274EE4: /* 80274EF0 00271E30 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 80274EF4 00271E34 38 80 00 04 */ li r4, 4 /* 80274EF8 00271E38 7E 05 83 78 */ mr r5, r16 -/* 80274EFC 00271E3C 48 05 95 79 */ bl JKRHeap_NS_alloc +/* 80274EFC 00271E3C 48 05 95 79 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80274F00 00271E40 90 6F 00 08 */ stw r3, 8(r15) lbl_80274F04: /* 80274F04 00271E44 38 60 00 00 */ li r3, 0 @@ -1332,7 +1332,7 @@ lbl_80275090: /* 8027509C 00271FDC 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 802750A0 00271FE0 38 80 00 04 */ li r4, 4 /* 802750A4 00271FE4 7E 05 83 78 */ mr r5, r16 -/* 802750A8 00271FE8 48 05 93 CD */ bl JKRHeap_NS_alloc +/* 802750A8 00271FE8 48 05 93 CD */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802750AC 00271FEC 90 6F 00 10 */ stw r3, 0x10(r15) lbl_802750B0: /* 802750B0 00271FF0 38 60 00 00 */ li r3, 0 @@ -1607,7 +1607,7 @@ lbl_802753E4: /* 802753F0 00272330 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 802753F4 00272334 38 80 00 04 */ li r4, 4 /* 802753F8 00272338 7E 05 83 78 */ mr r5, r16 -/* 802753FC 0027233C 48 05 90 79 */ bl JKRHeap_NS_alloc +/* 802753FC 0027233C 48 05 90 79 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80275400 00272340 90 6F 00 18 */ stw r3, 0x18(r15) lbl_80275404: /* 80275404 00272344 38 60 00 00 */ li r3, 0 diff --git a/asm/JParticle/JPAResourceLoader.s b/asm/JParticle/JPAResourceLoader.s index a7d982fb8f..7eddced291 100644 --- a/asm/JParticle/JPAResourceLoader.s +++ b/asm/JParticle/JPAResourceLoader.s @@ -41,13 +41,13 @@ JPAResourceLoader_NS_load_jpc: /* 8027D914 0027A854 54 03 10 3A */ slwi r3, r0, 2 /* 8027D918 0027A858 7F C4 F3 78 */ mr r4, r30 /* 8027D91C 0027A85C 38 A0 00 00 */ li r5, 0 -/* 8027D920 0027A860 48 05 13 F1 */ bl __nwa_X2_ +/* 8027D920 0027A860 48 05 13 F1 */ bl __nwa__FUlP7JKRHeapi /* 8027D924 0027A864 90 7D 00 04 */ stw r3, 4(r29) /* 8027D928 0027A868 A0 1D 00 10 */ lhz r0, 0x10(r29) /* 8027D92C 0027A86C 54 03 10 3A */ slwi r3, r0, 2 /* 8027D930 0027A870 7F C4 F3 78 */ mr r4, r30 /* 8027D934 0027A874 38 A0 00 00 */ li r5, 0 -/* 8027D938 0027A878 48 05 13 D9 */ bl __nwa_X2_ +/* 8027D938 0027A878 48 05 13 D9 */ bl __nwa__FUlP7JKRHeapi /* 8027D93C 0027A87C 90 7D 00 08 */ stw r3, 8(r29) /* 8027D940 0027A880 3B 60 00 10 */ li r27, 0x10 /* 8027D944 0027A884 3A A0 00 00 */ li r21, 0 @@ -60,7 +60,7 @@ lbl_8027D958: /* 8027D95C 0027A89C 38 60 00 48 */ li r3, 0x48 /* 8027D960 0027A8A0 7F C4 F3 78 */ mr r4, r30 /* 8027D964 0027A8A4 38 A0 00 00 */ li r5, 0 -/* 8027D968 0027A8A8 48 05 13 31 */ bl __nw_X2_ +/* 8027D968 0027A8A8 48 05 13 31 */ bl __nw__FUlP7JKRHeapi /* 8027D96C 0027A8AC 7C 7F 1B 79 */ or. r31, r3, r3 /* 8027D970 0027A8B0 41 82 00 0C */ beq lbl_8027D97C /* 8027D974 0027A8B4 4B FF 66 9D */ bl JPAResource @@ -74,7 +74,7 @@ lbl_8027D97C: /* 8027D990 0027A8D0 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 8027D994 0027A8D4 7F C4 F3 78 */ mr r4, r30 /* 8027D998 0027A8D8 38 A0 00 00 */ li r5, 0 -/* 8027D99C 0027A8DC 48 05 13 75 */ bl __nwa_X2_ +/* 8027D99C 0027A8DC 48 05 13 75 */ bl __nwa__FUlP7JKRHeapi /* 8027D9A0 0027A8E0 48 00 00 08 */ b lbl_8027D9A8 lbl_8027D9A4: /* 8027D9A4 0027A8E4 38 60 00 00 */ li r3, 0 @@ -88,7 +88,7 @@ lbl_8027D9A8: /* 8027D9C0 0027A900 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d /* 8027D9C4 0027A904 7F C4 F3 78 */ mr r4, r30 /* 8027D9C8 0027A908 38 A0 00 00 */ li r5, 0 -/* 8027D9CC 0027A90C 48 05 13 45 */ bl __nwa_X2_ +/* 8027D9CC 0027A90C 48 05 13 45 */ bl __nwa__FUlP7JKRHeapi /* 8027D9D0 0027A910 48 00 00 08 */ b lbl_8027D9D8 lbl_8027D9D4: /* 8027D9D4 0027A914 38 60 00 00 */ li r3, 0 @@ -153,7 +153,7 @@ lbl_8027DAA8: /* 8027DAA8 0027A9E8 38 60 00 2C */ li r3, 0x2c /* 8027DAAC 0027A9EC 7F C4 F3 78 */ mr r4, r30 /* 8027DAB0 0027A9F0 38 A0 00 00 */ li r5, 0 -/* 8027DAB4 0027A9F4 48 05 11 E5 */ bl __nw_X2_ +/* 8027DAB4 0027A9F4 48 05 11 E5 */ bl __nw__FUlP7JKRHeapi /* 8027DAB8 0027A9F8 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DABC 0027A9FC 41 82 00 14 */ beq lbl_8027DAD0 /* 8027DAC0 0027AA00 7E C4 B3 78 */ mr r4, r22 @@ -169,7 +169,7 @@ lbl_8027DAE0: /* 8027DAE0 0027AA20 38 60 00 08 */ li r3, 8 /* 8027DAE4 0027AA24 7F C4 F3 78 */ mr r4, r30 /* 8027DAE8 0027AA28 38 A0 00 00 */ li r5, 0 -/* 8027DAEC 0027AA2C 48 05 11 AD */ bl __nw_X2_ +/* 8027DAEC 0027AA2C 48 05 11 AD */ bl __nw__FUlP7JKRHeapi /* 8027DAF0 0027AA30 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DAF4 0027AA34 41 82 00 10 */ beq lbl_8027DB04 /* 8027DAF8 0027AA38 7E C4 B3 78 */ mr r4, r22 @@ -184,7 +184,7 @@ lbl_8027DB14: /* 8027DB14 0027AA54 38 60 00 08 */ li r3, 8 /* 8027DB18 0027AA58 7F C4 F3 78 */ mr r4, r30 /* 8027DB1C 0027AA5C 38 A0 00 00 */ li r5, 0 -/* 8027DB20 0027AA60 48 05 11 79 */ bl __nw_X2_ +/* 8027DB20 0027AA60 48 05 11 79 */ bl __nw__FUlP7JKRHeapi /* 8027DB24 0027AA64 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DB28 0027AA68 41 82 00 10 */ beq lbl_8027DB38 /* 8027DB2C 0027AA6C 7E C4 B3 78 */ mr r4, r22 @@ -197,7 +197,7 @@ lbl_8027DB40: /* 8027DB40 0027AA80 38 60 00 14 */ li r3, 0x14 /* 8027DB44 0027AA84 7F C4 F3 78 */ mr r4, r30 /* 8027DB48 0027AA88 38 A0 00 00 */ li r5, 0 -/* 8027DB4C 0027AA8C 48 05 11 4D */ bl __nw_X2_ +/* 8027DB4C 0027AA8C 48 05 11 4D */ bl __nw__FUlP7JKRHeapi /* 8027DB50 0027AA90 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DB54 0027AA94 41 82 00 14 */ beq lbl_8027DB68 /* 8027DB58 0027AA98 7E C4 B3 78 */ mr r4, r22 @@ -211,7 +211,7 @@ lbl_8027DB70: /* 8027DB70 0027AAB0 38 60 00 1C */ li r3, 0x1c /* 8027DB74 0027AAB4 7F C4 F3 78 */ mr r4, r30 /* 8027DB78 0027AAB8 38 A0 00 00 */ li r5, 0 -/* 8027DB7C 0027AABC 48 05 11 1D */ bl __nw_X2_ +/* 8027DB7C 0027AABC 48 05 11 1D */ bl __nw__FUlP7JKRHeapi /* 8027DB80 0027AAC0 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DB84 0027AAC4 41 82 00 10 */ beq lbl_8027DB94 /* 8027DB88 0027AAC8 7E C4 B3 78 */ mr r4, r22 @@ -224,7 +224,7 @@ lbl_8027DB9C: /* 8027DB9C 0027AADC 38 60 00 04 */ li r3, 4 /* 8027DBA0 0027AAE0 7F C4 F3 78 */ mr r4, r30 /* 8027DBA4 0027AAE4 38 A0 00 00 */ li r5, 0 -/* 8027DBA8 0027AAE8 48 05 10 F1 */ bl __nw_X2_ +/* 8027DBA8 0027AAE8 48 05 10 F1 */ bl __nw__FUlP7JKRHeapi /* 8027DBAC 0027AAEC 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DBB0 0027AAF0 41 82 00 10 */ beq lbl_8027DBC0 /* 8027DBB4 0027AAF4 7E C4 B3 78 */ mr r4, r22 @@ -237,7 +237,7 @@ lbl_8027DBC8: /* 8027DBC8 0027AB08 38 60 00 04 */ li r3, 4 /* 8027DBCC 0027AB0C 7F C4 F3 78 */ mr r4, r30 /* 8027DBD0 0027AB10 38 A0 00 00 */ li r5, 0 -/* 8027DBD4 0027AB14 48 05 10 C5 */ bl __nw_X2_ +/* 8027DBD4 0027AB14 48 05 10 C5 */ bl __nw__FUlP7JKRHeapi /* 8027DBD8 0027AB18 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DBDC 0027AB1C 41 82 00 10 */ beq lbl_8027DBEC /* 8027DBE0 0027AB20 7E C4 B3 78 */ mr r4, r22 @@ -276,7 +276,7 @@ lbl_8027DC44: /* 8027DC4C 0027AB8C 38 60 00 48 */ li r3, 0x48 /* 8027DC50 0027AB90 7F C4 F3 78 */ mr r4, r30 /* 8027DC54 0027AB94 38 A0 00 00 */ li r5, 0 -/* 8027DC58 0027AB98 48 05 10 41 */ bl __nw_X2_ +/* 8027DC58 0027AB98 48 05 10 41 */ bl __nw__FUlP7JKRHeapi /* 8027DC5C 0027AB9C 7C 64 1B 79 */ or. r4, r3, r3 /* 8027DC60 0027ABA0 41 82 00 10 */ beq lbl_8027DC70 /* 8027DC64 0027ABA4 7E 64 9B 78 */ mr r4, r19 diff --git a/asm/JParticle/JPATexture.s b/asm/JParticle/JPATexture.s index c352790ade..25ee6be51d 100644 --- a/asm/JParticle/JPATexture.s +++ b/asm/JParticle/JPATexture.s @@ -48,7 +48,7 @@ JPATexture: /* 8027D874 0027A7B4 7F E0 07 35 */ extsh. r0, r31 /* 8027D878 0027A7B8 40 81 00 0C */ ble lbl_8027D884 /* 8027D87C 0027A7BC 7F C3 F3 78 */ mr r3, r30 -/* 8027D880 0027A7C0 48 05 14 BD */ bl __dl +/* 8027D880 0027A7C0 48 05 14 BD */ bl __dl__FPv lbl_8027D884: /* 8027D884 0027A7C4 7F C3 F3 78 */ mr r3, r30 /* 8027D888 0027A7C8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGActor.s b/asm/JStage/JSGActor.s index d7d2845b17..52d44ec807 100644 --- a/asm/JStage/JSGActor.s +++ b/asm/JStage/JSGActor.s @@ -21,7 +21,7 @@ JStage_NS_TActor_NS_dtor: /* 80280A7C 0027D9BC 7F E0 07 35 */ extsh. r0, r31 /* 80280A80 0027D9C0 40 81 00 0C */ ble lbl_80280A8C /* 80280A84 0027D9C4 7F C3 F3 78 */ mr r3, r30 -/* 80280A88 0027D9C8 48 04 E2 B5 */ bl __dl +/* 80280A88 0027D9C8 48 04 E2 B5 */ bl __dl__FPv lbl_80280A8C: /* 80280A8C 0027D9CC 7F C3 F3 78 */ mr r3, r30 /* 80280A90 0027D9D0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGAmbientLight.s b/asm/JStage/JSGAmbientLight.s index 4013b61fd5..8c58724d7f 100644 --- a/asm/JStage/JSGAmbientLight.s +++ b/asm/JStage/JSGAmbientLight.s @@ -21,7 +21,7 @@ JStage_NS_TAmbientLight_NS_dtor: /* 80280B54 0027DA94 7F E0 07 35 */ extsh. r0, r31 /* 80280B58 0027DA98 40 81 00 0C */ ble lbl_80280B64 /* 80280B5C 0027DA9C 7F C3 F3 78 */ mr r3, r30 -/* 80280B60 0027DAA0 48 04 E1 DD */ bl __dl +/* 80280B60 0027DAA0 48 04 E1 DD */ bl __dl__FPv lbl_80280B64: /* 80280B64 0027DAA4 7F C3 F3 78 */ mr r3, r30 /* 80280B68 0027DAA8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGCamera.s b/asm/JStage/JSGCamera.s index 0611c87bf8..f5ac3779bb 100644 --- a/asm/JStage/JSGCamera.s +++ b/asm/JStage/JSGCamera.s @@ -21,7 +21,7 @@ JStage_NS_TCamera_NS_dtor: /* 80280BD4 0027DB14 7F E0 07 35 */ extsh. r0, r31 /* 80280BD8 0027DB18 40 81 00 0C */ ble lbl_80280BE4 /* 80280BDC 0027DB1C 7F C3 F3 78 */ mr r3, r30 -/* 80280BE0 0027DB20 48 04 E1 5D */ bl __dl +/* 80280BE0 0027DB20 48 04 E1 5D */ bl __dl__FPv lbl_80280BE4: /* 80280BE4 0027DB24 7F C3 F3 78 */ mr r3, r30 /* 80280BE8 0027DB28 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGFog.s b/asm/JStage/JSGFog.s index 58e1385ca1..0811e911e4 100644 --- a/asm/JStage/JSGFog.s +++ b/asm/JStage/JSGFog.s @@ -21,7 +21,7 @@ JStage_NS_TFog_NS_dtor: /* 80280CB4 0027DBF4 7F E0 07 35 */ extsh. r0, r31 /* 80280CB8 0027DBF8 40 81 00 0C */ ble lbl_80280CC4 /* 80280CBC 0027DBFC 7F C3 F3 78 */ mr r3, r30 -/* 80280CC0 0027DC00 48 04 E0 7D */ bl __dl +/* 80280CC0 0027DC00 48 04 E0 7D */ bl __dl__FPv lbl_80280CC4: /* 80280CC4 0027DC04 7F C3 F3 78 */ mr r3, r30 /* 80280CC8 0027DC08 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGLight.s b/asm/JStage/JSGLight.s index 0944ae210d..95f03abd38 100644 --- a/asm/JStage/JSGLight.s +++ b/asm/JStage/JSGLight.s @@ -21,7 +21,7 @@ JStage_NS_TLight_NS_dtor: /* 80280D5C 0027DC9C 7F E0 07 35 */ extsh. r0, r31 /* 80280D60 0027DCA0 40 81 00 0C */ ble lbl_80280D6C /* 80280D64 0027DCA4 7F C3 F3 78 */ mr r3, r30 -/* 80280D68 0027DCA8 48 04 DF D5 */ bl __dl +/* 80280D68 0027DCA8 48 04 DF D5 */ bl __dl__FPv lbl_80280D6C: /* 80280D6C 0027DCAC 7F C3 F3 78 */ mr r3, r30 /* 80280D70 0027DCB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGObject.s b/asm/JStage/JSGObject.s index 58f2c9aa8b..39803b3d34 100644 --- a/asm/JStage/JSGObject.s +++ b/asm/JStage/JSGObject.s @@ -16,7 +16,7 @@ JStage_NS_TObject_NS_dtor: /* 80280DF4 0027DD34 90 1F 00 00 */ stw r0, 0(r31) /* 80280DF8 0027DD38 7C 80 07 35 */ extsh. r0, r4 /* 80280DFC 0027DD3C 40 81 00 08 */ ble lbl_80280E04 -/* 80280E00 0027DD40 48 04 DF 3D */ bl __dl +/* 80280E00 0027DD40 48 04 DF 3D */ bl __dl__FPv lbl_80280E04: /* 80280E04 0027DD44 7F E3 FB 78 */ mr r3, r31 /* 80280E08 0027DD48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStage/JSGSystem.s b/asm/JStage/JSGSystem.s index 577b746675..6218ab063c 100644 --- a/asm/JStage/JSGSystem.s +++ b/asm/JStage/JSGSystem.s @@ -21,7 +21,7 @@ JStage_NS_TSystem_NS_dtor: /* 80280EC4 0027DE04 7F E0 07 35 */ extsh. r0, r31 /* 80280EC8 0027DE08 40 81 00 0C */ ble lbl_80280ED4 /* 80280ECC 0027DE0C 7F C3 F3 78 */ mr r3, r30 -/* 80280ED0 0027DE10 48 04 DE 6D */ bl __dl +/* 80280ED0 0027DE10 48 04 DE 6D */ bl __dl__FPv lbl_80280ED4: /* 80280ED4 0027DE14 7F C3 F3 78 */ mr r3, r30 /* 80280ED8 0027DE18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/ctb.s b/asm/JStudio/ctb.s index 34d8ccc524..a9333e90b8 100644 --- a/asm/JStudio/ctb.s +++ b/asm/JStudio/ctb.s @@ -16,7 +16,7 @@ JStudio_NS_ctb_NS_TObject_NS_dtor: /* 80280F38 0027DE78 90 1F 00 08 */ stw r0, 8(r31) /* 80280F3C 0027DE7C 7C 80 07 35 */ extsh. r0, r4 /* 80280F40 0027DE80 40 81 00 08 */ ble lbl_80280F48 -/* 80280F44 0027DE84 48 04 DD F9 */ bl __dl +/* 80280F44 0027DE84 48 04 DD F9 */ bl __dl__FPv lbl_80280F48: /* 80280F48 0027DE88 7F E3 FB 78 */ mr r3, r31 /* 80280F4C 0027DE8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -91,7 +91,7 @@ lbl_80281034: /* 80281034 0027DF74 7F E0 07 35 */ extsh. r0, r31 /* 80281038 0027DF78 40 81 00 0C */ ble lbl_80281044 /* 8028103C 0027DF7C 7F C3 F3 78 */ mr r3, r30 -/* 80281040 0027DF80 48 04 DC FD */ bl __dl +/* 80281040 0027DF80 48 04 DC FD */ bl __dl__FPv lbl_80281044: /* 80281044 0027DF84 7F C3 F3 78 */ mr r3, r30 /* 80281048 0027DF88 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -273,7 +273,7 @@ JStudio_NS_ctb_NS_TFactory_NS_dtor: /* 80281294 0027E1D4 90 1F 00 00 */ stw r0, 0(r31) /* 80281298 0027E1D8 7C 80 07 35 */ extsh. r0, r4 /* 8028129C 0027E1DC 40 81 00 08 */ ble lbl_802812A4 -/* 802812A0 0027E1E0 48 04 DA 9D */ bl __dl +/* 802812A0 0027E1E0 48 04 DA 9D */ bl __dl__FPv lbl_802812A4: /* 802812A4 0027E1E4 7F E3 FB 78 */ mr r3, r31 /* 802812A8 0027E1E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -293,7 +293,7 @@ lbl_802812A4: /* 802812E0 0027E220 48 00 00 28 */ b lbl_80281308 lbl_802812E4: /* 802812E4 0027E224 38 60 00 18 */ li r3, 0x18 -/* 802812E8 0027E228 48 04 D9 65 */ bl __nw +/* 802812E8 0027E228 48 04 D9 65 */ bl __nw__FUl /* 802812EC 0027E22C 7C 60 1B 79 */ or. r0, r3, r3 /* 802812F0 0027E230 41 82 00 10 */ beq lbl_80281300 /* 802812F4 0027E234 7F E4 FB 78 */ mr r4, r31 @@ -356,7 +356,7 @@ JStudio_NS_ctb_NS_TParse_NS_dtor: /* 802813B0 0027E2F0 7F E0 07 35 */ extsh. r0, r31 /* 802813B4 0027E2F4 40 81 00 0C */ ble lbl_802813C0 /* 802813B8 0027E2F8 7F C3 F3 78 */ mr r3, r30 -/* 802813BC 0027E2FC 48 04 D9 81 */ bl __dl +/* 802813BC 0027E2FC 48 04 D9 81 */ bl __dl__FPv lbl_802813C0: /* 802813C0 0027E300 7F C3 F3 78 */ mr r3, r30 /* 802813C4 0027E304 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -485,7 +485,7 @@ lbl_8028153C: /* 80281588 0027E4C8 7F E0 07 35 */ extsh. r0, r31 /* 8028158C 0027E4CC 40 81 00 0C */ ble lbl_80281598 /* 80281590 0027E4D0 7F C3 F3 78 */ mr r3, r30 -/* 80281594 0027E4D4 48 04 D7 A9 */ bl __dl +/* 80281594 0027E4D4 48 04 D7 A9 */ bl __dl__FPv lbl_80281598: /* 80281598 0027E4D8 7F C3 F3 78 */ mr r3, r30 /* 8028159C 0027E4DC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/functionvalue.s b/asm/JStudio/functionvalue.s index 20a5926816..8e80da9f57 100644 --- a/asm/JStudio/functionvalue.s +++ b/asm/JStudio/functionvalue.s @@ -46,7 +46,7 @@ JStudio_NS_TFunctionValue_NS_dtor: /* 802816C0 0027E600 90 1F 00 00 */ stw r0, 0(r31) /* 802816C4 0027E604 7C 80 07 35 */ extsh. r0, r4 /* 802816C8 0027E608 40 81 00 08 */ ble lbl_802816D0 -/* 802816CC 0027E60C 48 04 D6 71 */ bl __dl +/* 802816CC 0027E60C 48 04 D6 71 */ bl __dl__FPv lbl_802816D0: /* 802816D0 0027E610 7F E3 FB 78 */ mr r3, r31 /* 802816D4 0027E614 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2695,7 +2695,7 @@ lbl_80283BA0: /* 80283BF8 00280B38 7F E0 07 35 */ extsh. r0, r31 /* 80283BFC 00280B3C 40 81 00 0C */ ble lbl_80283C08 /* 80283C00 00280B40 7F C3 F3 78 */ mr r3, r30 -/* 80283C04 00280B44 48 04 B1 39 */ bl __dl +/* 80283C04 00280B44 48 04 B1 39 */ bl __dl__FPv lbl_80283C08: /* 80283C08 00280B48 7F C3 F3 78 */ mr r3, r30 /* 80283C0C 00280B4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2720,7 +2720,7 @@ lbl_80283C08: /* 80283C58 00280B98 7F E0 07 35 */ extsh. r0, r31 /* 80283C5C 00280B9C 40 81 00 0C */ ble lbl_80283C68 /* 80283C60 00280BA0 7F C3 F3 78 */ mr r3, r30 -/* 80283C64 00280BA4 48 04 B0 D9 */ bl __dl +/* 80283C64 00280BA4 48 04 B0 D9 */ bl __dl__FPv lbl_80283C68: /* 80283C68 00280BA8 7F C3 F3 78 */ mr r3, r30 /* 80283C6C 00280BAC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2745,7 +2745,7 @@ lbl_80283C68: /* 80283CB8 00280BF8 7F E0 07 35 */ extsh. r0, r31 /* 80283CBC 00280BFC 40 81 00 0C */ ble lbl_80283CC8 /* 80283CC0 00280C00 7F C3 F3 78 */ mr r3, r30 -/* 80283CC4 00280C04 48 04 B0 79 */ bl __dl +/* 80283CC4 00280C04 48 04 B0 79 */ bl __dl__FPv lbl_80283CC8: /* 80283CC8 00280C08 7F C3 F3 78 */ mr r3, r30 /* 80283CCC 00280C0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2770,7 +2770,7 @@ lbl_80283CC8: /* 80283D18 00280C58 7F E0 07 35 */ extsh. r0, r31 /* 80283D1C 00280C5C 40 81 00 0C */ ble lbl_80283D28 /* 80283D20 00280C60 7F C3 F3 78 */ mr r3, r30 -/* 80283D24 00280C64 48 04 B0 19 */ bl __dl +/* 80283D24 00280C64 48 04 B0 19 */ bl __dl__FPv lbl_80283D28: /* 80283D28 00280C68 7F C3 F3 78 */ mr r3, r30 /* 80283D2C 00280C6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2795,7 +2795,7 @@ lbl_80283D28: /* 80283D78 00280CB8 7F E0 07 35 */ extsh. r0, r31 /* 80283D7C 00280CBC 40 81 00 0C */ ble lbl_80283D88 /* 80283D80 00280CC0 7F C3 F3 78 */ mr r3, r30 -/* 80283D84 00280CC4 48 04 AF B9 */ bl __dl +/* 80283D84 00280CC4 48 04 AF B9 */ bl __dl__FPv lbl_80283D88: /* 80283D88 00280CC8 7F C3 F3 78 */ mr r3, r30 /* 80283D8C 00280CCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2829,7 +2829,7 @@ lbl_80283DEC: /* 80283DF8 00280D38 7F E0 07 35 */ extsh. r0, r31 /* 80283DFC 00280D3C 40 81 00 0C */ ble lbl_80283E08 /* 80283E00 00280D40 7F C3 F3 78 */ mr r3, r30 -/* 80283E04 00280D44 48 04 AF 39 */ bl __dl +/* 80283E04 00280D44 48 04 AF 39 */ bl __dl__FPv lbl_80283E08: /* 80283E08 00280D48 7F C3 F3 78 */ mr r3, r30 /* 80283E0C 00280D4C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index cdb7d156d1..e94a446d10 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -16,7 +16,7 @@ JStudio_NS_fvb_NS_TObject_NS_dtor: /* 80283FA0 00280EE0 90 1F 00 08 */ stw r0, 8(r31) /* 80283FA4 00280EE4 7C 80 07 35 */ extsh. r0, r4 /* 80283FA8 00280EE8 40 81 00 08 */ ble lbl_80283FB0 -/* 80283FAC 00280EEC 48 04 AD 91 */ bl __dl +/* 80283FAC 00280EEC 48 04 AD 91 */ bl __dl__FPv lbl_80283FB0: /* 80283FB0 00280EF0 7F E3 FB 78 */ mr r3, r31 /* 80283FB4 00280EF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -525,7 +525,7 @@ lbl_802846D8: /* 802846D8 00281618 7F E0 07 35 */ extsh. r0, r31 /* 802846DC 0028161C 40 81 00 0C */ ble lbl_802846E8 /* 802846E0 00281620 7F C3 F3 78 */ mr r3, r30 -/* 802846E4 00281624 48 04 A6 59 */ bl __dl +/* 802846E4 00281624 48 04 A6 59 */ bl __dl__FPv lbl_802846E8: /* 802846E8 00281628 7F C3 F3 78 */ mr r3, r30 /* 802846EC 0028162C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -707,7 +707,7 @@ JStudio_NS_fvb_NS_TFactory_NS_dtor: /* 80284938 00281878 90 1F 00 00 */ stw r0, 0(r31) /* 8028493C 0028187C 7C 80 07 35 */ extsh. r0, r4 /* 80284940 00281880 40 81 00 08 */ ble lbl_80284948 -/* 80284944 00281884 48 04 A3 F9 */ bl __dl +/* 80284944 00281884 48 04 A3 F9 */ bl __dl__FPv lbl_80284948: /* 80284948 00281888 7F E3 FB 78 */ mr r3, r31 /* 8028494C 0028188C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -738,7 +738,7 @@ lbl_802849A0: /* 802849AC 002818EC 48 00 00 94 */ b lbl_80284A40 lbl_802849B0: /* 802849B0 002818F0 38 60 00 40 */ li r3, 0x40 -/* 802849B4 002818F4 48 04 A2 99 */ bl __nw +/* 802849B4 002818F4 48 04 A2 99 */ bl __nw__FUl /* 802849B8 002818F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802849BC 002818FC 41 82 00 10 */ beq lbl_802849CC /* 802849C0 00281900 7F E4 FB 78 */ mr r4, r31 @@ -749,7 +749,7 @@ lbl_802849CC: /* 802849D0 00281910 48 00 00 BC */ b lbl_80284A8C lbl_802849D4: /* 802849D4 00281914 38 60 00 28 */ li r3, 0x28 -/* 802849D8 00281918 48 04 A2 75 */ bl __nw +/* 802849D8 00281918 48 04 A2 75 */ bl __nw__FUl /* 802849DC 0028191C 7C 60 1B 79 */ or. r0, r3, r3 /* 802849E0 00281920 41 82 00 10 */ beq lbl_802849F0 /* 802849E4 00281924 7F E4 FB 78 */ mr r4, r31 @@ -760,7 +760,7 @@ lbl_802849F0: /* 802849F4 00281934 48 00 00 98 */ b lbl_80284A8C lbl_802849F8: /* 802849F8 00281938 38 60 00 70 */ li r3, 0x70 -/* 802849FC 0028193C 48 04 A2 51 */ bl __nw +/* 802849FC 0028193C 48 04 A2 51 */ bl __nw__FUl /* 80284A00 00281940 7C 60 1B 79 */ or. r0, r3, r3 /* 80284A04 00281944 41 82 00 10 */ beq lbl_80284A14 /* 80284A08 00281948 7F E4 FB 78 */ mr r4, r31 @@ -771,7 +771,7 @@ lbl_80284A14: /* 80284A18 00281958 48 00 00 74 */ b lbl_80284A8C lbl_80284A1C: /* 80284A1C 0028195C 38 60 00 78 */ li r3, 0x78 -/* 80284A20 00281960 48 04 A2 2D */ bl __nw +/* 80284A20 00281960 48 04 A2 2D */ bl __nw__FUl /* 80284A24 00281964 7C 60 1B 79 */ or. r0, r3, r3 /* 80284A28 00281968 41 82 00 10 */ beq lbl_80284A38 /* 80284A2C 0028196C 7F E4 FB 78 */ mr r4, r31 @@ -782,7 +782,7 @@ lbl_80284A38: /* 80284A3C 0028197C 48 00 00 50 */ b lbl_80284A8C lbl_80284A40: /* 80284A40 00281980 38 60 00 78 */ li r3, 0x78 -/* 80284A44 00281984 48 04 A2 09 */ bl __nw +/* 80284A44 00281984 48 04 A2 09 */ bl __nw__FUl /* 80284A48 00281988 7C 60 1B 79 */ or. r0, r3, r3 /* 80284A4C 0028198C 41 82 00 10 */ beq lbl_80284A5C /* 80284A50 00281990 7F E4 FB 78 */ mr r4, r31 @@ -793,7 +793,7 @@ lbl_80284A5C: /* 80284A60 002819A0 48 00 00 2C */ b lbl_80284A8C lbl_80284A64: /* 80284A64 002819A4 38 60 00 80 */ li r3, 0x80 -/* 80284A68 002819A8 48 04 A1 E5 */ bl __nw +/* 80284A68 002819A8 48 04 A1 E5 */ bl __nw__FUl /* 80284A6C 002819AC 7C 60 1B 79 */ or. r0, r3, r3 /* 80284A70 002819B0 41 82 00 10 */ beq lbl_80284A80 /* 80284A74 002819B4 7F E4 FB 78 */ mr r4, r31 @@ -856,7 +856,7 @@ JStudio_NS_fvb_NS_TParse_NS_dtor: /* 80284B30 00281A70 7F E0 07 35 */ extsh. r0, r31 /* 80284B34 00281A74 40 81 00 0C */ ble lbl_80284B40 /* 80284B38 00281A78 7F C3 F3 78 */ mr r3, r30 -/* 80284B3C 00281A7C 48 04 A2 01 */ bl __dl +/* 80284B3C 00281A7C 48 04 A2 01 */ bl __dl__FPv lbl_80284B40: /* 80284B40 00281A80 7F C3 F3 78 */ mr r3, r30 /* 80284B44 00281A84 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -999,7 +999,7 @@ lbl_80284D30: /* 80284D3C 00281C7C 7F E0 07 35 */ extsh. r0, r31 /* 80284D40 00281C80 40 81 00 0C */ ble lbl_80284D4C /* 80284D44 00281C84 7F C3 F3 78 */ mr r3, r30 -/* 80284D48 00281C88 48 04 9F F5 */ bl __dl +/* 80284D48 00281C88 48 04 9F F5 */ bl __dl__FPv lbl_80284D4C: /* 80284D4C 00281C8C 7F C3 F3 78 */ mr r3, r30 /* 80284D50 00281C90 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1034,7 +1034,7 @@ lbl_80284DB4: /* 80284DC0 00281D00 7F E0 07 35 */ extsh. r0, r31 /* 80284DC4 00281D04 40 81 00 0C */ ble lbl_80284DD0 /* 80284DC8 00281D08 7F C3 F3 78 */ mr r3, r30 -/* 80284DCC 00281D0C 48 04 9F 71 */ bl __dl +/* 80284DCC 00281D0C 48 04 9F 71 */ bl __dl__FPv lbl_80284DD0: /* 80284DD0 00281D10 7F C3 F3 78 */ mr r3, r30 /* 80284DD4 00281D14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1069,7 +1069,7 @@ lbl_80284E38: /* 80284E44 00281D84 7F E0 07 35 */ extsh. r0, r31 /* 80284E48 00281D88 40 81 00 0C */ ble lbl_80284E54 /* 80284E4C 00281D8C 7F C3 F3 78 */ mr r3, r30 -/* 80284E50 00281D90 48 04 9E ED */ bl __dl +/* 80284E50 00281D90 48 04 9E ED */ bl __dl__FPv lbl_80284E54: /* 80284E54 00281D94 7F C3 F3 78 */ mr r3, r30 /* 80284E58 00281D98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1104,7 +1104,7 @@ lbl_80284EBC: /* 80284EC8 00281E08 7F E0 07 35 */ extsh. r0, r31 /* 80284ECC 00281E0C 40 81 00 0C */ ble lbl_80284ED8 /* 80284ED0 00281E10 7F C3 F3 78 */ mr r3, r30 -/* 80284ED4 00281E14 48 04 9E 69 */ bl __dl +/* 80284ED4 00281E14 48 04 9E 69 */ bl __dl__FPv lbl_80284ED8: /* 80284ED8 00281E18 7F C3 F3 78 */ mr r3, r30 /* 80284EDC 00281E1C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1139,7 +1139,7 @@ lbl_80284F40: /* 80284F4C 00281E8C 7F E0 07 35 */ extsh. r0, r31 /* 80284F50 00281E90 40 81 00 0C */ ble lbl_80284F5C /* 80284F54 00281E94 7F C3 F3 78 */ mr r3, r30 -/* 80284F58 00281E98 48 04 9D E5 */ bl __dl +/* 80284F58 00281E98 48 04 9D E5 */ bl __dl__FPv lbl_80284F5C: /* 80284F5C 00281E9C 7F C3 F3 78 */ mr r3, r30 /* 80284F60 00281EA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1182,7 +1182,7 @@ lbl_80284FE0: /* 80284FEC 00281F2C 7F E0 07 35 */ extsh. r0, r31 /* 80284FF0 00281F30 40 81 00 0C */ ble lbl_80284FFC /* 80284FF4 00281F34 7F C3 F3 78 */ mr r3, r30 -/* 80284FF8 00281F38 48 04 9D 45 */ bl __dl +/* 80284FF8 00281F38 48 04 9D 45 */ bl __dl__FPv lbl_80284FFC: /* 80284FFC 00281F3C 7F C3 F3 78 */ mr r3, r30 /* 80285000 00281F40 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/jstudio-control.s b/asm/JStudio/jstudio-control.s index f9ded54332..927153718a 100644 --- a/asm/JStudio/jstudio-control.s +++ b/asm/JStudio/jstudio-control.s @@ -66,7 +66,7 @@ JStudio_NS_TControl: /* 802851FC 0028213C 7F E0 07 35 */ extsh. r0, r31 /* 80285200 00282140 40 81 00 0C */ ble lbl_8028520C /* 80285204 00282144 7F C3 F3 78 */ mr r3, r30 -/* 80285208 00282148 48 04 9B 35 */ bl __dl +/* 80285208 00282148 48 04 9B 35 */ bl __dl__FPv lbl_8028520C: /* 8028520C 0028214C 7F C3 F3 78 */ mr r3, r30 /* 80285210 00282150 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -263,7 +263,7 @@ JStudio_NS_TCreateObject_NS_dtor: /* 802854A8 002823E8 90 1F 00 00 */ stw r0, 0(r31) /* 802854AC 002823EC 7C 80 07 35 */ extsh. r0, r4 /* 802854B0 002823F0 40 81 00 08 */ ble lbl_802854B8 -/* 802854B4 002823F4 48 04 98 89 */ bl __dl +/* 802854B4 002823F4 48 04 98 89 */ bl __dl__FPv lbl_802854B8: /* 802854B8 002823F8 7F E3 FB 78 */ mr r3, r31 /* 802854BC 002823FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -300,7 +300,7 @@ lbl_80285528: /* 80285534 00282474 7F E0 07 35 */ extsh. r0, r31 /* 80285538 00282478 40 81 00 0C */ ble lbl_80285544 /* 8028553C 0028247C 7F C3 F3 78 */ mr r3, r30 -/* 80285540 00282480 48 04 97 FD */ bl __dl +/* 80285540 00282480 48 04 97 FD */ bl __dl__FPv lbl_80285544: /* 80285544 00282484 7F C3 F3 78 */ mr r3, r30 /* 80285548 00282488 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -419,7 +419,7 @@ JStudio_NS_TParse_NS_dtor: /* 802856DC 0028261C 7F E0 07 35 */ extsh. r0, r31 /* 802856E0 00282620 40 81 00 0C */ ble lbl_802856EC /* 802856E4 00282624 7F C3 F3 78 */ mr r3, r30 -/* 802856E8 00282628 48 04 96 55 */ bl __dl +/* 802856E8 00282628 48 04 96 55 */ bl __dl__FPv lbl_802856EC: /* 802856EC 0028262C 7F C3 F3 78 */ mr r3, r30 /* 802856F0 00282630 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index e3e14b2aa7..033e49d44d 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -16,7 +16,7 @@ JStudio_NS_TVariableValue_NS_TOutput_NS_dtor: /* 80285E2C 00282D6C 90 1F 00 00 */ stw r0, 0(r31) /* 80285E30 00282D70 7C 80 07 35 */ extsh. r0, r4 /* 80285E34 00282D74 40 81 00 08 */ ble lbl_80285E3C -/* 80285E38 00282D78 48 04 8F 05 */ bl __dl +/* 80285E38 00282D78 48 04 8F 05 */ bl __dl__FPv lbl_80285E3C: /* 80285E3C 00282D7C 7F E3 FB 78 */ mr r3, r31 /* 80285E40 00282D80 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -122,7 +122,7 @@ JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor: /* 80285FA0 00282EE0 7F E0 07 35 */ extsh. r0, r31 /* 80285FA4 00282EE4 40 81 00 0C */ ble lbl_80285FB0 /* 80285FA8 00282EE8 7F C3 F3 78 */ mr r3, r30 -/* 80285FAC 00282EEC 48 04 8D 91 */ bl __dl +/* 80285FAC 00282EEC 48 04 8D 91 */ bl __dl__FPv lbl_80285FB0: /* 80285FB0 00282EF0 7F C3 F3 78 */ mr r3, r30 /* 80285FB4 00282EF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -146,7 +146,7 @@ JStudio_NS_TAdaptor_NS_dtor: /* 80285FF0 00282F30 90 1F 00 00 */ stw r0, 0(r31) /* 80285FF4 00282F34 7C 80 07 35 */ extsh. r0, r4 /* 80285FF8 00282F38 40 81 00 08 */ ble lbl_80286000 -/* 80285FFC 00282F3C 48 04 8D 41 */ bl __dl +/* 80285FFC 00282F3C 48 04 8D 41 */ bl __dl__FPv lbl_80286000: /* 80286000 00282F40 7F E3 FB 78 */ mr r3, r31 /* 80286004 00282F44 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -704,7 +704,7 @@ lbl_802866FC: /* 80286708 00283648 7F E0 07 35 */ extsh. r0, r31 /* 8028670C 0028364C 40 81 00 0C */ ble lbl_80286718 /* 80286710 00283650 7F C3 F3 78 */ mr r3, r30 -/* 80286714 00283654 48 04 86 29 */ bl __dl +/* 80286714 00283654 48 04 86 29 */ bl __dl__FPv lbl_80286718: /* 80286718 00283658 7F C3 F3 78 */ mr r3, r30 /* 8028671C 0028365C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -837,7 +837,7 @@ JStudio_NS_TAdaptor_actor_NS_dtor: /* 802868E4 00283824 7F E0 07 35 */ extsh. r0, r31 /* 802868E8 00283828 40 81 00 0C */ ble lbl_802868F4 /* 802868EC 0028382C 7F C3 F3 78 */ mr r3, r30 -/* 802868F0 00283830 48 04 84 4D */ bl __dl +/* 802868F0 00283830 48 04 84 4D */ bl __dl__FPv lbl_802868F4: /* 802868F4 00283834 7F C3 F3 78 */ mr r3, r30 /* 802868F8 00283838 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1104,7 +1104,7 @@ JStudio_NS_TAdaptor_ambientLight_NS_dtor: /* 80286CD0 00283C10 7F E0 07 35 */ extsh. r0, r31 /* 80286CD4 00283C14 40 81 00 0C */ ble lbl_80286CE0 /* 80286CD8 00283C18 7F C3 F3 78 */ mr r3, r30 -/* 80286CDC 00283C1C 48 04 80 61 */ bl __dl +/* 80286CDC 00283C1C 48 04 80 61 */ bl __dl__FPv lbl_80286CE0: /* 80286CE0 00283C20 7F C3 F3 78 */ mr r3, r30 /* 80286CE4 00283C24 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1217,7 +1217,7 @@ JStudio_NS_TAdaptor_camera_NS_dtor: /* 80286E50 00283D90 7F E0 07 35 */ extsh. r0, r31 /* 80286E54 00283D94 40 81 00 0C */ ble lbl_80286E60 /* 80286E58 00283D98 7F C3 F3 78 */ mr r3, r30 -/* 80286E5C 00283D9C 48 04 7E E1 */ bl __dl +/* 80286E5C 00283D9C 48 04 7E E1 */ bl __dl__FPv lbl_80286E60: /* 80286E60 00283DA0 7F C3 F3 78 */ mr r3, r30 /* 80286E64 00283DA4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1449,7 +1449,7 @@ JStudio_NS_TAdaptor_fog_NS_dtor: /* 802871B0 002840F0 7F E0 07 35 */ extsh. r0, r31 /* 802871B4 002840F4 40 81 00 0C */ ble lbl_802871C0 /* 802871B8 002840F8 7F C3 F3 78 */ mr r3, r30 -/* 802871BC 002840FC 48 04 7B 81 */ bl __dl +/* 802871BC 002840FC 48 04 7B 81 */ bl __dl__FPv lbl_802871C0: /* 802871C0 00284100 7F C3 F3 78 */ mr r3, r30 /* 802871C4 00284104 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1558,7 +1558,7 @@ JStudio_NS_TAdaptor_light_NS_dtor: /* 8028733C 0028427C 7F E0 07 35 */ extsh. r0, r31 /* 80287340 00284280 40 81 00 0C */ ble lbl_8028734C /* 80287344 00284284 7F C3 F3 78 */ mr r3, r30 -/* 80287348 00284288 48 04 79 F5 */ bl __dl +/* 80287348 00284288 48 04 79 F5 */ bl __dl__FPv lbl_8028734C: /* 8028734C 0028428C 7F C3 F3 78 */ mr r3, r30 /* 80287350 00284290 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1756,7 +1756,7 @@ JStudio_NS_TAdaptor_message_NS_dtor: /* 80287614 00284554 7F E0 07 35 */ extsh. r0, r31 /* 80287618 00284558 40 81 00 0C */ ble lbl_80287624 /* 8028761C 0028455C 7F C3 F3 78 */ mr r3, r30 -/* 80287620 00284560 48 04 77 1D */ bl __dl +/* 80287620 00284560 48 04 77 1D */ bl __dl__FPv lbl_80287624: /* 80287624 00284564 7F C3 F3 78 */ mr r3, r30 /* 80287628 00284568 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1841,7 +1841,7 @@ JStudio_NS_TAdaptor_particle_NS_dtor: /* 80287740 00284680 7F E0 07 35 */ extsh. r0, r31 /* 80287744 00284684 40 81 00 0C */ ble lbl_80287750 /* 80287748 00284688 7F C3 F3 78 */ mr r3, r30 -/* 8028774C 0028468C 48 04 75 F1 */ bl __dl +/* 8028774C 0028468C 48 04 75 F1 */ bl __dl__FPv lbl_80287750: /* 80287750 00284690 7F C3 F3 78 */ mr r3, r30 /* 80287754 00284694 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2125,7 +2125,7 @@ JStudio_NS_TAdaptor_sound_NS_dtor: /* 80287B70 00284AB0 7F E0 07 35 */ extsh. r0, r31 /* 80287B74 00284AB4 40 81 00 0C */ ble lbl_80287B80 /* 80287B78 00284AB8 7F C3 F3 78 */ mr r3, r30 -/* 80287B7C 00284ABC 48 04 71 C1 */ bl __dl +/* 80287B7C 00284ABC 48 04 71 C1 */ bl __dl__FPv lbl_80287B80: /* 80287B80 00284AC0 7F C3 F3 78 */ mr r3, r30 /* 80287B84 00284AC4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2380,7 +2380,7 @@ lbl_80287EEC: /* 80287F38 00284E78 7F E0 07 35 */ extsh. r0, r31 /* 80287F3C 00284E7C 40 81 00 0C */ ble lbl_80287F48 /* 80287F40 00284E80 7F C3 F3 78 */ mr r3, r30 -/* 80287F44 00284E84 48 04 6D F9 */ bl __dl +/* 80287F44 00284E84 48 04 6D F9 */ bl __dl__FPv lbl_80287F48: /* 80287F48 00284E88 7F C3 F3 78 */ mr r3, r30 /* 80287F4C 00284E8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2405,7 +2405,7 @@ lbl_80287F48: /* 80287F98 00284ED8 7F E0 07 35 */ extsh. r0, r31 /* 80287F9C 00284EDC 40 81 00 0C */ ble lbl_80287FA8 /* 80287FA0 00284EE0 7F C3 F3 78 */ mr r3, r30 -/* 80287FA4 00284EE4 48 04 6D 99 */ bl __dl +/* 80287FA4 00284EE4 48 04 6D 99 */ bl __dl__FPv lbl_80287FA8: /* 80287FA8 00284EE8 7F C3 F3 78 */ mr r3, r30 /* 80287FAC 00284EEC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2430,7 +2430,7 @@ lbl_80287FA8: /* 80287FF8 00284F38 7F E0 07 35 */ extsh. r0, r31 /* 80287FFC 00284F3C 40 81 00 0C */ ble lbl_80288008 /* 80288000 00284F40 7F C3 F3 78 */ mr r3, r30 -/* 80288004 00284F44 48 04 6D 39 */ bl __dl +/* 80288004 00284F44 48 04 6D 39 */ bl __dl__FPv lbl_80288008: /* 80288008 00284F48 7F C3 F3 78 */ mr r3, r30 /* 8028800C 00284F4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2455,7 +2455,7 @@ lbl_80288008: /* 80288058 00284F98 7F E0 07 35 */ extsh. r0, r31 /* 8028805C 00284F9C 40 81 00 0C */ ble lbl_80288068 /* 80288060 00284FA0 7F C3 F3 78 */ mr r3, r30 -/* 80288064 00284FA4 48 04 6C D9 */ bl __dl +/* 80288064 00284FA4 48 04 6C D9 */ bl __dl__FPv lbl_80288068: /* 80288068 00284FA8 7F C3 F3 78 */ mr r3, r30 /* 8028806C 00284FAC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2480,7 +2480,7 @@ lbl_80288068: /* 802880B8 00284FF8 7F E0 07 35 */ extsh. r0, r31 /* 802880BC 00284FFC 40 81 00 0C */ ble lbl_802880C8 /* 802880C0 00285000 7F C3 F3 78 */ mr r3, r30 -/* 802880C4 00285004 48 04 6C 79 */ bl __dl +/* 802880C4 00285004 48 04 6C 79 */ bl __dl__FPv lbl_802880C8: /* 802880C8 00285008 7F C3 F3 78 */ mr r3, r30 /* 802880CC 0028500C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2505,7 +2505,7 @@ lbl_802880C8: /* 80288118 00285058 7F E0 07 35 */ extsh. r0, r31 /* 8028811C 0028505C 40 81 00 0C */ ble lbl_80288128 /* 80288120 00285060 7F C3 F3 78 */ mr r3, r30 -/* 80288124 00285064 48 04 6C 19 */ bl __dl +/* 80288124 00285064 48 04 6C 19 */ bl __dl__FPv lbl_80288128: /* 80288128 00285068 7F C3 F3 78 */ mr r3, r30 /* 8028812C 0028506C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2530,7 +2530,7 @@ lbl_80288128: /* 80288178 002850B8 7F E0 07 35 */ extsh. r0, r31 /* 8028817C 002850BC 40 81 00 0C */ ble lbl_80288188 /* 80288180 002850C0 7F C3 F3 78 */ mr r3, r30 -/* 80288184 002850C4 48 04 6B B9 */ bl __dl +/* 80288184 002850C4 48 04 6B B9 */ bl __dl__FPv lbl_80288188: /* 80288188 002850C8 7F C3 F3 78 */ mr r3, r30 /* 8028818C 002850CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2555,7 +2555,7 @@ lbl_80288188: /* 802881D8 00285118 7F E0 07 35 */ extsh. r0, r31 /* 802881DC 0028511C 40 81 00 0C */ ble lbl_802881E8 /* 802881E0 00285120 7F C3 F3 78 */ mr r3, r30 -/* 802881E4 00285124 48 04 6B 59 */ bl __dl +/* 802881E4 00285124 48 04 6B 59 */ bl __dl__FPv lbl_802881E8: /* 802881E8 00285128 7F C3 F3 78 */ mr r3, r30 /* 802881EC 0028512C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2856,7 +2856,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor: /* 80288610 00285550 7F E0 07 35 */ extsh. r0, r31 /* 80288614 00285554 40 81 00 0C */ ble lbl_80288620 /* 80288618 00285558 7F C3 F3 78 */ mr r3, r30 -/* 8028861C 0028555C 48 04 67 21 */ bl __dl +/* 8028861C 0028555C 48 04 67 21 */ bl __dl__FPv lbl_80288620: /* 80288620 00285560 7F C3 F3 78 */ mr r3, r30 /* 80288624 00285564 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2883,7 +2883,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X1 /* 80288670 002855B0 7F E0 07 35 */ extsh. r0, r31 /* 80288674 002855B4 40 81 00 0C */ ble lbl_80288680 /* 80288678 002855B8 7F C3 F3 78 */ mr r3, r30 -/* 8028867C 002855BC 48 04 66 C1 */ bl __dl +/* 8028867C 002855BC 48 04 66 C1 */ bl __dl__FPv lbl_80288680: /* 80288680 002855C0 7F C3 F3 78 */ mr r3, r30 /* 80288684 002855C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2910,7 +2910,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X2 /* 802886D0 00285610 7F E0 07 35 */ extsh. r0, r31 /* 802886D4 00285614 40 81 00 0C */ ble lbl_802886E0 /* 802886D8 00285618 7F C3 F3 78 */ mr r3, r30 -/* 802886DC 0028561C 48 04 66 61 */ bl __dl +/* 802886DC 0028561C 48 04 66 61 */ bl __dl__FPv lbl_802886E0: /* 802886E0 00285620 7F C3 F3 78 */ mr r3, r30 /* 802886E4 00285624 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2937,7 +2937,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X3 /* 80288730 00285670 7F E0 07 35 */ extsh. r0, r31 /* 80288734 00285674 40 81 00 0C */ ble lbl_80288740 /* 80288738 00285678 7F C3 F3 78 */ mr r3, r30 -/* 8028873C 0028567C 48 04 66 01 */ bl __dl +/* 8028873C 0028567C 48 04 66 01 */ bl __dl__FPv lbl_80288740: /* 80288740 00285680 7F C3 F3 78 */ mr r3, r30 /* 80288744 00285684 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2964,7 +2964,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X4 /* 80288790 002856D0 7F E0 07 35 */ extsh. r0, r31 /* 80288794 002856D4 40 81 00 0C */ ble lbl_802887A0 /* 80288798 002856D8 7F C3 F3 78 */ mr r3, r30 -/* 8028879C 002856DC 48 04 65 A1 */ bl __dl +/* 8028879C 002856DC 48 04 65 A1 */ bl __dl__FPv lbl_802887A0: /* 802887A0 002856E0 7F C3 F3 78 */ mr r3, r30 /* 802887A4 002856E4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio/stb.s b/asm/JStudio/stb.s index 161811b98e..23c0538cdc 100644 --- a/asm/JStudio/stb.s +++ b/asm/JStudio/stb.s @@ -68,7 +68,7 @@ JStudio_NS_stb_NS_TObject_NS_dtor: /* 80288B50 00285A90 90 1F 00 08 */ stw r0, 8(r31) /* 80288B54 00285A94 7C 80 07 35 */ extsh. r0, r4 /* 80288B58 00285A98 40 81 00 08 */ ble lbl_80288B60 -/* 80288B5C 00285A9C 48 04 61 E1 */ bl __dl +/* 80288B5C 00285A9C 48 04 61 E1 */ bl __dl__FPv lbl_80288B60: /* 80288B60 00285AA0 7F E3 FB 78 */ mr r3, r31 /* 80288B64 00285AA4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -522,7 +522,7 @@ JStudio_NS_stb_NS_TControl: /* 80289168 002860A8 7F E0 07 35 */ extsh. r0, r31 /* 8028916C 002860AC 40 81 00 0C */ ble lbl_80289178 /* 80289170 002860B0 7F C3 F3 78 */ mr r3, r30 -/* 80289174 002860B4 48 04 5B C9 */ bl __dl +/* 80289174 002860B4 48 04 5B C9 */ bl __dl__FPv lbl_80289178: /* 80289178 002860B8 7F C3 F3 78 */ mr r3, r30 /* 8028917C 002860BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -565,7 +565,7 @@ lbl_802891FC: /* 802891FC 0028613C 7F E0 07 35 */ extsh. r0, r31 /* 80289200 00286140 40 81 00 0C */ ble lbl_8028920C /* 80289204 00286144 7F C3 F3 78 */ mr r3, r30 -/* 80289208 00286148 48 04 5B 35 */ bl __dl +/* 80289208 00286148 48 04 5B 35 */ bl __dl__FPv lbl_8028920C: /* 8028920C 0028614C 7F C3 F3 78 */ mr r3, r30 /* 80289210 00286150 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -846,7 +846,7 @@ JStudio_NS_stb_NS_TFactory_NS_dtor: /* 802895D4 00286514 90 1F 00 00 */ stw r0, 0(r31) /* 802895D8 00286518 7C 80 07 35 */ extsh. r0, r4 /* 802895DC 0028651C 40 81 00 08 */ ble lbl_802895E4 -/* 802895E0 00286520 48 04 57 5D */ bl __dl +/* 802895E0 00286520 48 04 57 5D */ bl __dl__FPv lbl_802895E4: /* 802895E4 00286524 7F E3 FB 78 */ mr r3, r31 /* 802895E8 00286528 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -902,7 +902,7 @@ JStudio_NS_stb_NS_TParse_NS_dtor: /* 80289694 002865D4 7F E0 07 35 */ extsh. r0, r31 /* 80289698 002865D8 40 81 00 0C */ ble lbl_802896A4 /* 8028969C 002865DC 7F C3 F3 78 */ mr r3, r30 -/* 802896A0 002865E0 48 04 56 9D */ bl __dl +/* 802896A0 002865E0 48 04 56 9D */ bl __dl__FPv lbl_802896A4: /* 802896A4 002865E4 7F C3 F3 78 */ mr r3, r30 /* 802896A8 002865E8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JAudio2/control.s b/asm/JStudio_JAudio2/control.s index a442e1e8b0..2d49731341 100644 --- a/asm/JStudio_JAudio2/control.s +++ b/asm/JStudio_JAudio2/control.s @@ -19,7 +19,7 @@ /* 8028D584 0028A4C4 7F E0 07 35 */ extsh. r0, r31 /* 8028D588 0028A4C8 40 81 00 0C */ ble lbl_8028D594 /* 8028D58C 0028A4CC 7F C3 F3 78 */ mr r3, r30 -/* 8028D590 0028A4D0 48 04 17 AD */ bl __dl +/* 8028D590 0028A4D0 48 04 17 AD */ bl __dl__FPv lbl_8028D594: /* 8028D594 0028A4D4 7F C3 F3 78 */ mr r3, r30 /* 8028D598 0028A4D8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -73,7 +73,7 @@ JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_: /* 8028D638 0028A578 7C 7D 1B 78 */ mr r29, r3 /* 8028D63C 0028A57C 7C 9E 23 78 */ mr r30, r4 /* 8028D640 0028A580 38 60 01 48 */ li r3, 0x148 -/* 8028D644 0028A584 48 04 16 09 */ bl __nw +/* 8028D644 0028A584 48 04 16 09 */ bl __nw__FUl /* 8028D648 0028A588 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028D64C 0028A58C 41 82 00 10 */ beq lbl_8028D65C /* 8028D650 0028A590 7F C4 F3 78 */ mr r4, r30 @@ -89,7 +89,7 @@ lbl_8028D66C: /* 8028D670 0028A5B0 88 1E 00 14 */ lbz r0, 0x14(r30) /* 8028D674 0028A5B4 98 1F 01 1C */ stb r0, 0x11c(r31) /* 8028D678 0028A5B8 38 60 00 38 */ li r3, 0x38 -/* 8028D67C 0028A5BC 48 04 15 D1 */ bl __nw +/* 8028D67C 0028A5BC 48 04 15 D1 */ bl __nw__FUl /* 8028D680 0028A5C0 7C 7E 1B 79 */ or. r30, r3, r3 /* 8028D684 0028A5C4 41 82 00 14 */ beq lbl_8028D698 /* 8028D688 0028A5C8 7F A4 EB 78 */ mr r4, r29 diff --git a/asm/JStudio_JAudio2/object-sound.s b/asm/JStudio_JAudio2/object-sound.s index a13bac3585..81a06bd1e5 100644 --- a/asm/JStudio_JAudio2/object-sound.s +++ b/asm/JStudio_JAudio2/object-sound.s @@ -174,7 +174,7 @@ lbl_8028D96C: /* 8028D978 0028A8B8 7F E0 07 35 */ extsh. r0, r31 /* 8028D97C 0028A8BC 40 81 00 0C */ ble lbl_8028D988 /* 8028D980 0028A8C0 7F C3 F3 78 */ mr r3, r30 -/* 8028D984 0028A8C4 48 04 13 B9 */ bl __dl +/* 8028D984 0028A8C4 48 04 13 B9 */ bl __dl__FPv lbl_8028D988: /* 8028D988 0028A8C8 7F C3 F3 78 */ mr r3, r30 /* 8028D98C 0028A8CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -694,7 +694,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor: /* 8028E0C8 0028B008 7F E0 07 35 */ extsh. r0, r31 /* 8028E0CC 0028B00C 40 81 00 0C */ ble lbl_8028E0D8 /* 8028E0D0 0028B010 7F C3 F3 78 */ mr r3, r30 -/* 8028E0D4 0028B014 48 04 0C 69 */ bl __dl +/* 8028E0D4 0028B014 48 04 0C 69 */ bl __dl__FPv lbl_8028E0D8: /* 8028E0D8 0028B018 7F C3 F3 78 */ mr r3, r30 /* 8028E0DC 0028B01C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JParticle/control.s b/asm/JStudio_JParticle/control.s index e2c874beb7..e89dcdc1e2 100644 --- a/asm/JStudio_JParticle/control.s +++ b/asm/JStudio_JParticle/control.s @@ -21,7 +21,7 @@ JStudio_JParticle_NS_TCreateObject_NS_dtor: /* 8028E3D4 0028B314 7F E0 07 35 */ extsh. r0, r31 /* 8028E3D8 0028B318 40 81 00 0C */ ble lbl_8028E3E4 /* 8028E3DC 0028B31C 7F C3 F3 78 */ mr r3, r30 -/* 8028E3E0 0028B320 48 04 09 5D */ bl __dl +/* 8028E3E0 0028B320 48 04 09 5D */ bl __dl__FPv lbl_8028E3E4: /* 8028E3E4 0028B324 7F C3 F3 78 */ mr r3, r30 /* 8028E3E8 0028B328 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -112,7 +112,7 @@ JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_: /* 8028E51C 0028B45C 7C 7D 1B 78 */ mr r29, r3 /* 8028E520 0028B460 7C 9E 23 78 */ mr r30, r4 /* 8028E524 0028B464 38 60 01 DC */ li r3, 0x1dc -/* 8028E528 0028B468 48 04 07 25 */ bl __nw +/* 8028E528 0028B468 48 04 07 25 */ bl __nw__FUl /* 8028E52C 0028B46C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028E530 0028B470 41 82 00 10 */ beq lbl_8028E540 /* 8028E534 0028B474 7F C4 F3 78 */ mr r4, r30 diff --git a/asm/JStudio_JParticle/object-particle.s b/asm/JStudio_JParticle/object-particle.s index 01d2e30ae4..528b4191f3 100644 --- a/asm/JStudio_JParticle/object-particle.s +++ b/asm/JStudio_JParticle/object-particle.s @@ -16,7 +16,7 @@ lbl_8028E550: /* 8028E554 0028B494 88 1E 00 14 */ lbz r0, 0x14(r30) /* 8028E558 0028B498 98 1F 01 B4 */ stb r0, 0x1b4(r31) /* 8028E55C 0028B49C 38 60 00 38 */ li r3, 0x38 -/* 8028E560 0028B4A0 48 04 06 ED */ bl __nw +/* 8028E560 0028B4A0 48 04 06 ED */ bl __nw__FUl /* 8028E564 0028B4A4 7C 7E 1B 79 */ or. r30, r3, r3 /* 8028E568 0028B4A8 41 82 00 14 */ beq lbl_8028E57C /* 8028E56C 0028B4AC 7F A4 EB 78 */ mr r4, r29 @@ -148,7 +148,7 @@ JStudio_JParticle_NS_TAdaptor_particle: /* 8028E734 0028B674 7F E0 07 35 */ extsh. r0, r31 /* 8028E738 0028B678 40 81 00 0C */ ble lbl_8028E744 /* 8028E73C 0028B67C 7F C3 F3 78 */ mr r3, r30 -/* 8028E740 0028B680 48 04 05 FD */ bl __dl +/* 8028E740 0028B680 48 04 05 FD */ bl __dl__FPv lbl_8028E744: /* 8028E744 0028B684 7F C3 F3 78 */ mr r3, r30 /* 8028E748 0028B688 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -213,7 +213,7 @@ lbl_8028E818: /* 8028E824 0028B764 7F E0 07 35 */ extsh. r0, r31 /* 8028E828 0028B768 40 81 00 0C */ ble lbl_8028E834 /* 8028E82C 0028B76C 7F C3 F3 78 */ mr r3, r30 -/* 8028E830 0028B770 48 04 05 0D */ bl __dl +/* 8028E830 0028B770 48 04 05 0D */ bl __dl__FPv lbl_8028E834: /* 8028E834 0028B774 7F C3 F3 78 */ mr r3, r30 /* 8028E838 0028B778 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JStage/control.s b/asm/JStudio_JStage/control.s index 179cef8a3f..867e0f224c 100644 --- a/asm/JStudio_JStage/control.s +++ b/asm/JStudio_JStage/control.s @@ -19,7 +19,7 @@ /* 80289B34 00286A74 7F E0 07 35 */ extsh. r0, r31 /* 80289B38 00286A78 40 81 00 0C */ ble lbl_80289B44 /* 80289B3C 00286A7C 7F C3 F3 78 */ mr r3, r30 -/* 80289B40 00286A80 48 04 51 FD */ bl __dl +/* 80289B40 00286A80 48 04 51 FD */ bl __dl__FPv lbl_80289B44: /* 80289B44 00286A84 7F C3 F3 78 */ mr r3, r30 /* 80289B48 00286A88 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -159,7 +159,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG_: /* 80289CFC 00286C3C 7C BD 2B 78 */ mr r29, r5 /* 80289D00 00286C40 7C 9E 23 78 */ mr r30, r4 /* 80289D04 00286C44 38 60 01 50 */ li r3, 0x150 -/* 80289D08 00286C48 48 04 4F 45 */ bl __nw +/* 80289D08 00286C48 48 04 4F 45 */ bl __nw__FUl /* 80289D0C 00286C4C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80289D10 00286C50 41 82 00 14 */ beq lbl_80289D24 /* 80289D14 00286C54 7F A4 EB 78 */ mr r4, r29 @@ -174,7 +174,7 @@ lbl_80289D24: lbl_80289D34: /* 80289D34 00286C74 93 E1 00 08 */ stw r31, 8(r1) /* 80289D38 00286C78 38 60 00 38 */ li r3, 0x38 -/* 80289D3C 00286C7C 48 04 4F 11 */ bl __nw +/* 80289D3C 00286C7C 48 04 4F 11 */ bl __nw__FUl /* 80289D40 00286C80 7C 7E 1B 79 */ or. r30, r3, r3 /* 80289D44 00286C84 41 82 00 14 */ beq lbl_80289D58 /* 80289D48 00286C88 7F 84 E3 78 */ mr r4, r28 @@ -235,7 +235,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X1_: /* 80289E00 00286D40 7C BD 2B 78 */ mr r29, r5 /* 80289E04 00286D44 7C 9E 23 78 */ mr r30, r4 /* 80289E08 00286D48 38 60 01 24 */ li r3, 0x124 -/* 80289E0C 00286D4C 48 04 4E 41 */ bl __nw +/* 80289E0C 00286D4C 48 04 4E 41 */ bl __nw__FUl /* 80289E10 00286D50 7C 7F 1B 79 */ or. r31, r3, r3 /* 80289E14 00286D54 41 82 00 14 */ beq lbl_80289E28 /* 80289E18 00286D58 7F A4 EB 78 */ mr r4, r29 @@ -250,7 +250,7 @@ lbl_80289E28: lbl_80289E38: /* 80289E38 00286D78 93 E1 00 08 */ stw r31, 8(r1) /* 80289E3C 00286D7C 38 60 00 38 */ li r3, 0x38 -/* 80289E40 00286D80 48 04 4E 0D */ bl __nw +/* 80289E40 00286D80 48 04 4E 0D */ bl __nw__FUl /* 80289E44 00286D84 7C 7E 1B 79 */ or. r30, r3, r3 /* 80289E48 00286D88 41 82 00 14 */ beq lbl_80289E5C /* 80289E4C 00286D8C 7F 84 E3 78 */ mr r4, r28 @@ -311,7 +311,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X2_: /* 80289F04 00286E44 7C BD 2B 78 */ mr r29, r5 /* 80289F08 00286E48 7C 9E 23 78 */ mr r30, r4 /* 80289F0C 00286E4C 38 60 00 68 */ li r3, 0x68 -/* 80289F10 00286E50 48 04 4D 3D */ bl __nw +/* 80289F10 00286E50 48 04 4D 3D */ bl __nw__FUl /* 80289F14 00286E54 7C 7F 1B 79 */ or. r31, r3, r3 /* 80289F18 00286E58 41 82 00 14 */ beq lbl_80289F2C /* 80289F1C 00286E5C 7F A4 EB 78 */ mr r4, r29 @@ -326,7 +326,7 @@ lbl_80289F2C: lbl_80289F3C: /* 80289F3C 00286E7C 93 E1 00 08 */ stw r31, 8(r1) /* 80289F40 00286E80 38 60 00 38 */ li r3, 0x38 -/* 80289F44 00286E84 48 04 4D 09 */ bl __nw +/* 80289F44 00286E84 48 04 4D 09 */ bl __nw__FUl /* 80289F48 00286E88 7C 7E 1B 79 */ or. r30, r3, r3 /* 80289F4C 00286E8C 41 82 00 14 */ beq lbl_80289F60 /* 80289F50 00286E90 7F 84 E3 78 */ mr r4, r28 @@ -387,7 +387,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X3_: /* 8028A008 00286F48 7C BD 2B 78 */ mr r29, r5 /* 8028A00C 00286F4C 7C 9E 23 78 */ mr r30, r4 /* 8028A010 00286F50 38 60 01 20 */ li r3, 0x120 -/* 8028A014 00286F54 48 04 4C 39 */ bl __nw +/* 8028A014 00286F54 48 04 4C 39 */ bl __nw__FUl /* 8028A018 00286F58 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028A01C 00286F5C 41 82 00 14 */ beq lbl_8028A030 /* 8028A020 00286F60 7F A4 EB 78 */ mr r4, r29 @@ -402,7 +402,7 @@ lbl_8028A030: lbl_8028A040: /* 8028A040 00286F80 93 E1 00 08 */ stw r31, 8(r1) /* 8028A044 00286F84 38 60 00 38 */ li r3, 0x38 -/* 8028A048 00286F88 48 04 4C 05 */ bl __nw +/* 8028A048 00286F88 48 04 4C 05 */ bl __nw__FUl /* 8028A04C 00286F8C 7C 7E 1B 79 */ or. r30, r3, r3 /* 8028A050 00286F90 41 82 00 14 */ beq lbl_8028A064 /* 8028A054 00286F94 7F 84 E3 78 */ mr r4, r28 @@ -463,7 +463,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X4_: /* 8028A10C 0028704C 7C BD 2B 78 */ mr r29, r5 /* 8028A110 00287050 7C 9E 23 78 */ mr r30, r4 /* 8028A114 00287054 38 60 00 90 */ li r3, 0x90 -/* 8028A118 00287058 48 04 4B 35 */ bl __nw +/* 8028A118 00287058 48 04 4B 35 */ bl __nw__FUl /* 8028A11C 0028705C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028A120 00287060 41 82 00 14 */ beq lbl_8028A134 /* 8028A124 00287064 7F A4 EB 78 */ mr r4, r29 @@ -478,7 +478,7 @@ lbl_8028A134: lbl_8028A144: /* 8028A144 00287084 93 E1 00 08 */ stw r31, 8(r1) /* 8028A148 00287088 38 60 00 38 */ li r3, 0x38 -/* 8028A14C 0028708C 48 04 4B 01 */ bl __nw +/* 8028A14C 0028708C 48 04 4B 01 */ bl __nw__FUl /* 8028A150 00287090 7C 7E 1B 79 */ or. r30, r3, r3 /* 8028A154 00287094 41 82 00 14 */ beq lbl_8028A168 /* 8028A158 00287098 7F 84 E3 78 */ mr r4, r28 diff --git a/asm/JStudio_JStage/object-actor.s b/asm/JStudio_JStage/object-actor.s index 6d15676424..bc0b60eb02 100644 --- a/asm/JStudio_JStage/object-actor.s +++ b/asm/JStudio_JStage/object-actor.s @@ -77,7 +77,7 @@ JStudio_JStage_NS_TAdaptor_actor: /* 8028A6FC 0028763C 7F E0 07 35 */ extsh. r0, r31 /* 8028A700 00287640 40 81 00 0C */ ble lbl_8028A70C /* 8028A704 00287644 7F C3 F3 78 */ mr r3, r30 -/* 8028A708 00287648 48 04 46 35 */ bl __dl +/* 8028A708 00287648 48 04 46 35 */ bl __dl__FPv lbl_8028A70C: /* 8028A70C 0028764C 7F C3 F3 78 */ mr r3, r30 /* 8028A710 00287650 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -810,7 +810,7 @@ JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor: /* 8028B16C 002880AC 7F E0 07 35 */ extsh. r0, r31 /* 8028B170 002880B0 40 81 00 0C */ ble lbl_8028B17C /* 8028B174 002880B4 7F C3 F3 78 */ mr r3, r30 -/* 8028B178 002880B8 48 04 3B C5 */ bl __dl +/* 8028B178 002880B8 48 04 3B C5 */ bl __dl__FPv lbl_8028B17C: /* 8028B17C 002880BC 7F C3 F3 78 */ mr r3, r30 /* 8028B180 002880C0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1099,7 +1099,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor: /* 8028B5B4 002884F4 7F E0 07 35 */ extsh. r0, r31 /* 8028B5B8 002884F8 40 81 00 0C */ ble lbl_8028B5C4 /* 8028B5BC 002884FC 7F C3 F3 78 */ mr r3, r30 -/* 8028B5C0 00288500 48 04 37 7D */ bl __dl +/* 8028B5C0 00288500 48 04 37 7D */ bl __dl__FPv lbl_8028B5C4: /* 8028B5C4 00288504 7F C3 F3 78 */ mr r3, r30 /* 8028B5C8 00288508 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JStage/object-ambientlight.s b/asm/JStudio_JStage/object-ambientlight.s index ce167498e1..3a5721f530 100644 --- a/asm/JStudio_JStage/object-ambientlight.s +++ b/asm/JStudio_JStage/object-ambientlight.s @@ -67,7 +67,7 @@ JStudio_JStage_NS_TAdaptor_ambientLight: /* 8028B6F4 00288634 7F E0 07 35 */ extsh. r0, r31 /* 8028B6F8 00288638 40 81 00 0C */ ble lbl_8028B704 /* 8028B6FC 0028863C 7F C3 F3 78 */ mr r3, r30 -/* 8028B700 00288640 48 04 36 3D */ bl __dl +/* 8028B700 00288640 48 04 36 3D */ bl __dl__FPv lbl_8028B704: /* 8028B704 00288644 7F C3 F3 78 */ mr r3, r30 /* 8028B708 00288648 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JStage/object-camera.s b/asm/JStudio_JStage/object-camera.s index febf39b483..b06f865107 100644 --- a/asm/JStudio_JStage/object-camera.s +++ b/asm/JStudio_JStage/object-camera.s @@ -76,7 +76,7 @@ JStudio_JStage_NS_TAdaptor_camera: /* 8028B9A8 002888E8 7F E0 07 35 */ extsh. r0, r31 /* 8028B9AC 002888EC 40 81 00 0C */ ble lbl_8028B9B8 /* 8028B9B0 002888F0 7F C3 F3 78 */ mr r3, r30 -/* 8028B9B4 002888F4 48 04 33 89 */ bl __dl +/* 8028B9B4 002888F4 48 04 33 89 */ bl __dl__FPv lbl_8028B9B8: /* 8028B9B8 002888F8 7F C3 F3 78 */ mr r3, r30 /* 8028B9BC 002888FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -885,7 +885,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor_X1_: /* 8028C518 00289458 7F E0 07 35 */ extsh. r0, r31 /* 8028C51C 0028945C 40 81 00 0C */ ble lbl_8028C528 /* 8028C520 00289460 7F C3 F3 78 */ mr r3, r30 -/* 8028C524 00289464 48 04 28 19 */ bl __dl +/* 8028C524 00289464 48 04 28 19 */ bl __dl__FPv lbl_8028C528: /* 8028C528 00289468 7F C3 F3 78 */ mr r3, r30 /* 8028C52C 0028946C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JStage/object-fog.s b/asm/JStudio_JStage/object-fog.s index 0be192bf62..2af196211b 100644 --- a/asm/JStudio_JStage/object-fog.s +++ b/asm/JStudio_JStage/object-fog.s @@ -67,7 +67,7 @@ JStudio_JStage_NS_TAdaptor_fog: /* 8028C658 00289598 7F E0 07 35 */ extsh. r0, r31 /* 8028C65C 0028959C 40 81 00 0C */ ble lbl_8028C668 /* 8028C660 002895A0 7F C3 F3 78 */ mr r3, r30 -/* 8028C664 002895A4 48 04 26 D9 */ bl __dl +/* 8028C664 002895A4 48 04 26 D9 */ bl __dl__FPv lbl_8028C668: /* 8028C668 002895A8 7F C3 F3 78 */ mr r3, r30 /* 8028C66C 002895AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -379,7 +379,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor_X2_: /* 8028CAF4 00289A34 7F E0 07 35 */ extsh. r0, r31 /* 8028CAF8 00289A38 40 81 00 0C */ ble lbl_8028CB04 /* 8028CAFC 00289A3C 7F C3 F3 78 */ mr r3, r30 -/* 8028CB00 00289A40 48 04 22 3D */ bl __dl +/* 8028CB00 00289A40 48 04 22 3D */ bl __dl__FPv lbl_8028CB04: /* 8028CB04 00289A44 7F C3 F3 78 */ mr r3, r30 /* 8028CB08 00289A48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JStudio_JStage/object-light.s b/asm/JStudio_JStage/object-light.s index 5f08c8408d..1370ae764f 100644 --- a/asm/JStudio_JStage/object-light.s +++ b/asm/JStudio_JStage/object-light.s @@ -69,7 +69,7 @@ JStudio_JStage_NS_TAdaptor_light: /* 8028CC3C 00289B7C 7F E0 07 35 */ extsh. r0, r31 /* 8028CC40 00289B80 40 81 00 0C */ ble lbl_8028CC4C /* 8028CC44 00289B84 7F C3 F3 78 */ mr r3, r30 -/* 8028CC48 00289B88 48 04 20 F5 */ bl __dl +/* 8028CC48 00289B88 48 04 20 F5 */ bl __dl__FPv lbl_8028CC4C: /* 8028CC4C 00289B8C 7F C3 F3 78 */ mr r3, r30 /* 8028CC50 00289B90 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -505,7 +505,7 @@ JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor: /* 8028D28C 0028A1CC 7F E0 07 35 */ extsh. r0, r31 /* 8028D290 0028A1D0 40 81 00 0C */ ble lbl_8028D29C /* 8028D294 0028A1D4 7F C3 F3 78 */ mr r3, r30 -/* 8028D298 0028A1D8 48 04 1A A5 */ bl __dl +/* 8028D298 0028A1D8 48 04 1A A5 */ bl __dl__FPv lbl_8028D29C: /* 8028D29C 0028A1DC 7F C3 F3 78 */ mr r3, r30 /* 8028D2A0 0028A1E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JSupport/JSUInputStream.s b/asm/JSupport/JSUInputStream.s index 49e0fffb38..6d3e192e92 100644 --- a/asm/JSupport/JSUInputStream.s +++ b/asm/JSupport/JSUInputStream.s @@ -22,7 +22,7 @@ lbl_802DC270: /* 802DC270 002D91B0 7C 80 07 35 */ extsh. r0, r4 /* 802DC274 002D91B4 40 81 00 0C */ ble lbl_802DC280 /* 802DC278 002D91B8 7F E3 FB 78 */ mr r3, r31 -/* 802DC27C 002D91BC 4B FF 2A C1 */ bl __dl +/* 802DC27C 002D91BC 4B FF 2A C1 */ bl __dl__FPv lbl_802DC280: /* 802DC280 002D91C0 7F E3 FB 78 */ mr r3, r31 /* 802DC284 002D91C4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JSupport/JSUList.s b/asm/JSupport/JSUList.s index 9919827141..dc797e3536 100644 --- a/asm/JSupport/JSUList.s +++ b/asm/JSupport/JSUList.s @@ -1,335 +1,3 @@ .include "macros.inc" .section .text, "ax" # 802dbdfc - - -.global JSUPtrLink -JSUPtrLink: -/* 802DBDFC 002D8D3C 38 00 00 00 */ li r0, 0 -/* 802DBE00 002D8D40 90 03 00 04 */ stw r0, 4(r3) -/* 802DBE04 002D8D44 90 83 00 00 */ stw r4, 0(r3) -/* 802DBE08 002D8D48 90 03 00 08 */ stw r0, 8(r3) -/* 802DBE0C 002D8D4C 90 03 00 0C */ stw r0, 0xc(r3) -/* 802DBE10 002D8D50 4E 80 00 20 */ blr - -.global JSUPtrLink_NS_dtor -JSUPtrLink_NS_dtor: -/* 802DBE14 002D8D54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBE18 002D8D58 7C 08 02 A6 */ mflr r0 -/* 802DBE1C 002D8D5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBE20 002D8D60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBE24 002D8D64 93 C1 00 08 */ stw r30, 8(r1) -/* 802DBE28 002D8D68 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802DBE2C 002D8D6C 7C 9F 23 78 */ mr r31, r4 -/* 802DBE30 002D8D70 41 82 00 28 */ beq lbl_802DBE58 -/* 802DBE34 002D8D74 80 7E 00 04 */ lwz r3, 4(r30) -/* 802DBE38 002D8D78 28 03 00 00 */ cmplwi r3, 0 -/* 802DBE3C 002D8D7C 41 82 00 0C */ beq lbl_802DBE48 -/* 802DBE40 002D8D80 7F C4 F3 78 */ mr r4, r30 -/* 802DBE44 002D8D84 48 00 03 19 */ bl JSUPtrList_NS_remove -lbl_802DBE48: -/* 802DBE48 002D8D88 7F E0 07 35 */ extsh. r0, r31 -/* 802DBE4C 002D8D8C 40 81 00 0C */ ble lbl_802DBE58 -/* 802DBE50 002D8D90 7F C3 F3 78 */ mr r3, r30 -/* 802DBE54 002D8D94 4B FF 2E E9 */ bl __dl -lbl_802DBE58: -/* 802DBE58 002D8D98 7F C3 F3 78 */ mr r3, r30 -/* 802DBE5C 002D8D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBE60 002D8DA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802DBE64 002D8DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBE68 002D8DA8 7C 08 03 A6 */ mtlr r0 -/* 802DBE6C 002D8DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBE70 002D8DB0 4E 80 00 20 */ blr - -.global JSUPtrList -JSUPtrList: -/* 802DBE74 002D8DB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBE78 002D8DB8 7C 08 02 A6 */ mflr r0 -/* 802DBE7C 002D8DBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBE80 002D8DC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBE84 002D8DC4 7C 7F 1B 78 */ mr r31, r3 -/* 802DBE88 002D8DC8 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802DBE8C 002D8DCC 41 82 00 08 */ beq lbl_802DBE94 -/* 802DBE90 002D8DD0 48 00 00 85 */ bl JSUPtrList_NS_initiate -lbl_802DBE94: -/* 802DBE94 002D8DD4 7F E3 FB 78 */ mr r3, r31 -/* 802DBE98 002D8DD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBE9C 002D8DDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBEA0 002D8DE0 7C 08 03 A6 */ mtlr r0 -/* 802DBEA4 002D8DE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBEA8 002D8DE8 4E 80 00 20 */ blr - -.global JSUPtrList_NS_dtor -JSUPtrList_NS_dtor: -/* 802DBEAC 002D8DEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DBEB0 002D8DF0 7C 08 02 A6 */ mflr r0 -/* 802DBEB4 002D8DF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DBEB8 002D8DF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DBEBC 002D8DFC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802DBEC0 002D8E00 41 82 00 3C */ beq lbl_802DBEFC -/* 802DBEC4 002D8E04 80 BF 00 00 */ lwz r5, 0(r31) -/* 802DBEC8 002D8E08 38 C0 00 00 */ li r6, 0 -/* 802DBECC 002D8E0C 38 60 00 00 */ li r3, 0 -/* 802DBED0 002D8E10 48 00 00 10 */ b lbl_802DBEE0 -lbl_802DBED4: -/* 802DBED4 002D8E14 90 65 00 04 */ stw r3, 4(r5) -/* 802DBED8 002D8E18 80 A5 00 0C */ lwz r5, 0xc(r5) -/* 802DBEDC 002D8E1C 38 C6 00 01 */ addi r6, r6, 1 -lbl_802DBEE0: -/* 802DBEE0 002D8E20 80 1F 00 08 */ lwz r0, 8(r31) -/* 802DBEE4 002D8E24 7C 06 00 40 */ cmplw r6, r0 -/* 802DBEE8 002D8E28 41 80 FF EC */ blt lbl_802DBED4 -/* 802DBEEC 002D8E2C 7C 80 07 35 */ extsh. r0, r4 -/* 802DBEF0 002D8E30 40 81 00 0C */ ble lbl_802DBEFC -/* 802DBEF4 002D8E34 7F E3 FB 78 */ mr r3, r31 -/* 802DBEF8 002D8E38 4B FF 2E 45 */ bl __dl -lbl_802DBEFC: -/* 802DBEFC 002D8E3C 7F E3 FB 78 */ mr r3, r31 -/* 802DBF00 002D8E40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DBF04 002D8E44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DBF08 002D8E48 7C 08 03 A6 */ mtlr r0 -/* 802DBF0C 002D8E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBF10 002D8E50 4E 80 00 20 */ blr - -.global JSUPtrList_NS_initiate -JSUPtrList_NS_initiate: -/* 802DBF14 002D8E54 38 00 00 00 */ li r0, 0 -/* 802DBF18 002D8E58 90 03 00 00 */ stw r0, 0(r3) -/* 802DBF1C 002D8E5C 90 03 00 04 */ stw r0, 4(r3) -/* 802DBF20 002D8E60 90 03 00 08 */ stw r0, 8(r3) -/* 802DBF24 002D8E64 4E 80 00 20 */ blr - -.global JSUPtrList_NS_setFirst -JSUPtrList_NS_setFirst: -/* 802DBF28 002D8E68 90 64 00 04 */ stw r3, 4(r4) -/* 802DBF2C 002D8E6C 38 00 00 00 */ li r0, 0 -/* 802DBF30 002D8E70 90 04 00 08 */ stw r0, 8(r4) -/* 802DBF34 002D8E74 90 04 00 0C */ stw r0, 0xc(r4) -/* 802DBF38 002D8E78 90 83 00 04 */ stw r4, 4(r3) -/* 802DBF3C 002D8E7C 90 83 00 00 */ stw r4, 0(r3) -/* 802DBF40 002D8E80 38 00 00 01 */ li r0, 1 -/* 802DBF44 002D8E84 90 03 00 08 */ stw r0, 8(r3) -/* 802DBF48 002D8E88 4E 80 00 20 */ blr - -.global JSUPtrList_NS_append -JSUPtrList_NS_append: -/* 802DBF4C 002D8E8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DBF50 002D8E90 7C 08 02 A6 */ mflr r0 -/* 802DBF54 002D8E94 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DBF58 002D8E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBF5C 002D8E9C 48 08 62 81 */ bl _savegpr_29 -/* 802DBF60 002D8EA0 7C 7D 1B 78 */ mr r29, r3 -/* 802DBF64 002D8EA4 7C 9E 23 78 */ mr r30, r4 -/* 802DBF68 002D8EA8 80 64 00 04 */ lwz r3, 4(r4) -/* 802DBF6C 002D8EAC 7C 60 00 34 */ cntlzw r0, r3 -/* 802DBF70 002D8EB0 54 1F D9 7E */ srwi r31, r0, 5 -/* 802DBF74 002D8EB4 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DBF78 002D8EB8 40 82 00 0C */ bne lbl_802DBF84 -/* 802DBF7C 002D8EBC 48 00 01 E1 */ bl JSUPtrList_NS_remove -/* 802DBF80 002D8EC0 7C 7F 1B 78 */ mr r31, r3 -lbl_802DBF84: -/* 802DBF84 002D8EC4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DBF88 002D8EC8 41 82 00 4C */ beq lbl_802DBFD4 -/* 802DBF8C 002D8ECC 80 1D 00 08 */ lwz r0, 8(r29) -/* 802DBF90 002D8ED0 28 00 00 00 */ cmplwi r0, 0 -/* 802DBF94 002D8ED4 40 82 00 14 */ bne lbl_802DBFA8 -/* 802DBF98 002D8ED8 7F A3 EB 78 */ mr r3, r29 -/* 802DBF9C 002D8EDC 7F C4 F3 78 */ mr r4, r30 -/* 802DBFA0 002D8EE0 4B FF FF 89 */ bl JSUPtrList_NS_setFirst -/* 802DBFA4 002D8EE4 48 00 00 30 */ b lbl_802DBFD4 -lbl_802DBFA8: -/* 802DBFA8 002D8EE8 93 BE 00 04 */ stw r29, 4(r30) -/* 802DBFAC 002D8EEC 80 1D 00 04 */ lwz r0, 4(r29) -/* 802DBFB0 002D8EF0 90 1E 00 08 */ stw r0, 8(r30) -/* 802DBFB4 002D8EF4 38 00 00 00 */ li r0, 0 -/* 802DBFB8 002D8EF8 90 1E 00 0C */ stw r0, 0xc(r30) -/* 802DBFBC 002D8EFC 80 7D 00 04 */ lwz r3, 4(r29) -/* 802DBFC0 002D8F00 93 C3 00 0C */ stw r30, 0xc(r3) -/* 802DBFC4 002D8F04 93 DD 00 04 */ stw r30, 4(r29) -/* 802DBFC8 002D8F08 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DBFCC 002D8F0C 38 03 00 01 */ addi r0, r3, 1 -/* 802DBFD0 002D8F10 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DBFD4: -/* 802DBFD4 002D8F14 7F E3 FB 78 */ mr r3, r31 -/* 802DBFD8 002D8F18 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBFDC 002D8F1C 48 08 62 4D */ bl _restgpr_29 -/* 802DBFE0 002D8F20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DBFE4 002D8F24 7C 08 03 A6 */ mtlr r0 -/* 802DBFE8 002D8F28 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DBFEC 002D8F2C 4E 80 00 20 */ blr - -.global JSUPtrList_NS_prepend -JSUPtrList_NS_prepend: -/* 802DBFF0 002D8F30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DBFF4 002D8F34 7C 08 02 A6 */ mflr r0 -/* 802DBFF8 002D8F38 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DBFFC 002D8F3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC000 002D8F40 48 08 61 DD */ bl _savegpr_29 -/* 802DC004 002D8F44 7C 7D 1B 78 */ mr r29, r3 -/* 802DC008 002D8F48 7C 9E 23 78 */ mr r30, r4 -/* 802DC00C 002D8F4C 80 64 00 04 */ lwz r3, 4(r4) -/* 802DC010 002D8F50 7C 60 00 34 */ cntlzw r0, r3 -/* 802DC014 002D8F54 54 1F D9 7E */ srwi r31, r0, 5 -/* 802DC018 002D8F58 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC01C 002D8F5C 40 82 00 0C */ bne lbl_802DC028 -/* 802DC020 002D8F60 48 00 01 3D */ bl JSUPtrList_NS_remove -/* 802DC024 002D8F64 7C 7F 1B 78 */ mr r31, r3 -lbl_802DC028: -/* 802DC028 002D8F68 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DC02C 002D8F6C 41 82 00 4C */ beq lbl_802DC078 -/* 802DC030 002D8F70 80 1D 00 08 */ lwz r0, 8(r29) -/* 802DC034 002D8F74 28 00 00 00 */ cmplwi r0, 0 -/* 802DC038 002D8F78 40 82 00 14 */ bne lbl_802DC04C -/* 802DC03C 002D8F7C 7F A3 EB 78 */ mr r3, r29 -/* 802DC040 002D8F80 7F C4 F3 78 */ mr r4, r30 -/* 802DC044 002D8F84 4B FF FE E5 */ bl JSUPtrList_NS_setFirst -/* 802DC048 002D8F88 48 00 00 30 */ b lbl_802DC078 -lbl_802DC04C: -/* 802DC04C 002D8F8C 93 BE 00 04 */ stw r29, 4(r30) -/* 802DC050 002D8F90 38 00 00 00 */ li r0, 0 -/* 802DC054 002D8F94 90 1E 00 08 */ stw r0, 8(r30) -/* 802DC058 002D8F98 80 1D 00 00 */ lwz r0, 0(r29) -/* 802DC05C 002D8F9C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 802DC060 002D8FA0 80 7D 00 00 */ lwz r3, 0(r29) -/* 802DC064 002D8FA4 93 C3 00 08 */ stw r30, 8(r3) -/* 802DC068 002D8FA8 93 DD 00 00 */ stw r30, 0(r29) -/* 802DC06C 002D8FAC 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DC070 002D8FB0 38 03 00 01 */ addi r0, r3, 1 -/* 802DC074 002D8FB4 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DC078: -/* 802DC078 002D8FB8 7F E3 FB 78 */ mr r3, r31 -/* 802DC07C 002D8FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC080 002D8FC0 48 08 61 A9 */ bl _restgpr_29 -/* 802DC084 002D8FC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DC088 002D8FC8 7C 08 03 A6 */ mtlr r0 -/* 802DC08C 002D8FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DC090 002D8FD0 4E 80 00 20 */ blr - -.global JSUPtrList_NS_insert -JSUPtrList_NS_insert: -/* 802DC094 002D8FD4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DC098 002D8FD8 7C 08 02 A6 */ mflr r0 -/* 802DC09C 002D8FDC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DC0A0 002D8FE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC0A4 002D8FE4 48 08 61 39 */ bl _savegpr_29 -/* 802DC0A8 002D8FE8 7C 7D 1B 78 */ mr r29, r3 -/* 802DC0AC 002D8FEC 7C 9E 23 78 */ mr r30, r4 -/* 802DC0B0 002D8FF0 7C BF 2B 78 */ mr r31, r5 -/* 802DC0B4 002D8FF4 80 03 00 00 */ lwz r0, 0(r3) -/* 802DC0B8 002D8FF8 7C 1E 00 40 */ cmplw r30, r0 -/* 802DC0BC 002D8FFC 40 82 00 10 */ bne lbl_802DC0CC -/* 802DC0C0 002D9000 7F E4 FB 78 */ mr r4, r31 -/* 802DC0C4 002D9004 4B FF FF 2D */ bl JSUPtrList_NS_prepend -/* 802DC0C8 002D9008 48 00 00 7C */ b lbl_802DC144 -lbl_802DC0CC: -/* 802DC0CC 002D900C 28 1E 00 00 */ cmplwi r30, 0 -/* 802DC0D0 002D9010 40 82 00 10 */ bne lbl_802DC0E0 -/* 802DC0D4 002D9014 7F E4 FB 78 */ mr r4, r31 -/* 802DC0D8 002D9018 4B FF FE 75 */ bl JSUPtrList_NS_append -/* 802DC0DC 002D901C 48 00 00 68 */ b lbl_802DC144 -lbl_802DC0E0: -/* 802DC0E0 002D9020 80 1E 00 04 */ lwz r0, 4(r30) -/* 802DC0E4 002D9024 7C 00 E8 40 */ cmplw r0, r29 -/* 802DC0E8 002D9028 41 82 00 0C */ beq lbl_802DC0F4 -/* 802DC0EC 002D902C 38 60 00 00 */ li r3, 0 -/* 802DC0F0 002D9030 48 00 00 54 */ b lbl_802DC144 -lbl_802DC0F4: -/* 802DC0F4 002D9034 80 7F 00 04 */ lwz r3, 4(r31) -/* 802DC0F8 002D9038 7C 60 00 34 */ cntlzw r0, r3 -/* 802DC0FC 002D903C 54 04 D9 7E */ srwi r4, r0, 5 -/* 802DC100 002D9040 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC104 002D9044 40 82 00 10 */ bne lbl_802DC114 -/* 802DC108 002D9048 7F E4 FB 78 */ mr r4, r31 -/* 802DC10C 002D904C 48 00 00 51 */ bl JSUPtrList_NS_remove -/* 802DC110 002D9050 7C 64 1B 78 */ mr r4, r3 -lbl_802DC114: -/* 802DC114 002D9054 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802DC118 002D9058 41 82 00 28 */ beq lbl_802DC140 -/* 802DC11C 002D905C 80 7E 00 08 */ lwz r3, 8(r30) -/* 802DC120 002D9060 93 BF 00 04 */ stw r29, 4(r31) -/* 802DC124 002D9064 90 7F 00 08 */ stw r3, 8(r31) -/* 802DC128 002D9068 93 DF 00 0C */ stw r30, 0xc(r31) -/* 802DC12C 002D906C 93 E3 00 0C */ stw r31, 0xc(r3) -/* 802DC130 002D9070 93 FE 00 08 */ stw r31, 8(r30) -/* 802DC134 002D9074 80 7D 00 08 */ lwz r3, 8(r29) -/* 802DC138 002D9078 38 03 00 01 */ addi r0, r3, 1 -/* 802DC13C 002D907C 90 1D 00 08 */ stw r0, 8(r29) -lbl_802DC140: -/* 802DC140 002D9080 7C 83 23 78 */ mr r3, r4 -lbl_802DC144: -/* 802DC144 002D9084 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC148 002D9088 48 08 60 E1 */ bl _restgpr_29 -/* 802DC14C 002D908C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802DC150 002D9090 7C 08 03 A6 */ mtlr r0 -/* 802DC154 002D9094 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DC158 002D9098 4E 80 00 20 */ blr - -.global JSUPtrList_NS_remove -JSUPtrList_NS_remove: -/* 802DC15C 002D909C 80 04 00 04 */ lwz r0, 4(r4) -/* 802DC160 002D90A0 7C 00 18 50 */ subf r0, r0, r3 -/* 802DC164 002D90A4 7C 00 00 34 */ cntlzw r0, r0 -/* 802DC168 002D90A8 54 06 D9 7E */ srwi r6, r0, 5 -/* 802DC16C 002D90AC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 802DC170 002D90B0 41 82 00 94 */ beq lbl_802DC204 -/* 802DC174 002D90B4 80 03 00 08 */ lwz r0, 8(r3) -/* 802DC178 002D90B8 28 00 00 01 */ cmplwi r0, 1 -/* 802DC17C 002D90BC 40 82 00 14 */ bne lbl_802DC190 -/* 802DC180 002D90C0 38 00 00 00 */ li r0, 0 -/* 802DC184 002D90C4 90 03 00 00 */ stw r0, 0(r3) -/* 802DC188 002D90C8 90 03 00 04 */ stw r0, 4(r3) -/* 802DC18C 002D90CC 48 00 00 64 */ b lbl_802DC1F0 -lbl_802DC190: -/* 802DC190 002D90D0 80 03 00 00 */ lwz r0, 0(r3) -/* 802DC194 002D90D4 7C 04 00 40 */ cmplw r4, r0 -/* 802DC198 002D90D8 40 82 00 1C */ bne lbl_802DC1B4 -/* 802DC19C 002D90DC 38 00 00 00 */ li r0, 0 -/* 802DC1A0 002D90E0 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 802DC1A4 002D90E4 90 05 00 08 */ stw r0, 8(r5) -/* 802DC1A8 002D90E8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802DC1AC 002D90EC 90 03 00 00 */ stw r0, 0(r3) -/* 802DC1B0 002D90F0 48 00 00 40 */ b lbl_802DC1F0 -lbl_802DC1B4: -/* 802DC1B4 002D90F4 80 03 00 04 */ lwz r0, 4(r3) -/* 802DC1B8 002D90F8 7C 04 00 40 */ cmplw r4, r0 -/* 802DC1BC 002D90FC 40 82 00 1C */ bne lbl_802DC1D8 -/* 802DC1C0 002D9100 38 00 00 00 */ li r0, 0 -/* 802DC1C4 002D9104 80 A4 00 08 */ lwz r5, 8(r4) -/* 802DC1C8 002D9108 90 05 00 0C */ stw r0, 0xc(r5) -/* 802DC1CC 002D910C 80 04 00 08 */ lwz r0, 8(r4) -/* 802DC1D0 002D9110 90 03 00 04 */ stw r0, 4(r3) -/* 802DC1D4 002D9114 48 00 00 1C */ b lbl_802DC1F0 -lbl_802DC1D8: -/* 802DC1D8 002D9118 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802DC1DC 002D911C 80 A4 00 08 */ lwz r5, 8(r4) -/* 802DC1E0 002D9120 90 05 00 0C */ stw r0, 0xc(r5) -/* 802DC1E4 002D9124 80 04 00 08 */ lwz r0, 8(r4) -/* 802DC1E8 002D9128 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 802DC1EC 002D912C 90 05 00 08 */ stw r0, 8(r5) -lbl_802DC1F0: -/* 802DC1F0 002D9130 38 00 00 00 */ li r0, 0 -/* 802DC1F4 002D9134 90 04 00 04 */ stw r0, 4(r4) -/* 802DC1F8 002D9138 80 83 00 08 */ lwz r4, 8(r3) -/* 802DC1FC 002D913C 38 04 FF FF */ addi r0, r4, -1 -/* 802DC200 002D9140 90 03 00 08 */ stw r0, 8(r3) -lbl_802DC204: -/* 802DC204 002D9144 7C C3 33 78 */ mr r3, r6 -/* 802DC208 002D9148 4E 80 00 20 */ blr - -.global JSUPtrList_NS_getNthLink -JSUPtrList_NS_getNthLink: -/* 802DC20C 002D914C 80 03 00 08 */ lwz r0, 8(r3) -/* 802DC210 002D9150 7C 04 00 40 */ cmplw r4, r0 -/* 802DC214 002D9154 41 80 00 0C */ blt lbl_802DC220 -/* 802DC218 002D9158 38 60 00 00 */ li r3, 0 -/* 802DC21C 002D915C 4E 80 00 20 */ blr -lbl_802DC220: -/* 802DC220 002D9160 80 63 00 00 */ lwz r3, 0(r3) -/* 802DC224 002D9164 7C 89 03 A6 */ mtctr r4 -/* 802DC228 002D9168 28 04 00 00 */ cmplwi r4, 0 -/* 802DC22C 002D916C 4C 81 00 20 */ blelr -lbl_802DC230: -/* 802DC230 002D9170 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802DC234 002D9174 42 00 FF FC */ bdnz lbl_802DC230 -/* 802DC238 002D9178 4E 80 00 20 */ blr - diff --git a/asm/JUtility/JUTCacheFont.s b/asm/JUtility/JUTCacheFont.s index e285da83dd..600f498641 100644 --- a/asm/JUtility/JUTCacheFont.s +++ b/asm/JUtility/JUTCacheFont.s @@ -67,7 +67,7 @@ lbl_802DD264: /* 802DD270 002DA1B0 7F E0 07 35 */ extsh. r0, r31 /* 802DD274 002DA1B4 40 81 00 0C */ ble lbl_802DD280 /* 802DD278 002DA1B8 7F C3 F3 78 */ mr r3, r30 -/* 802DD27C 002DA1BC 4B FF 1A C1 */ bl __dl +/* 802DD27C 002DA1BC 4B FF 1A C1 */ bl __dl__FPv lbl_802DD280: /* 802DD280 002DA1C0 7F C3 F3 78 */ mr r3, r30 /* 802DD284 002DA1C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -88,7 +88,7 @@ JUTCacheFont_NS_deleteMemBlocks_CacheFont: /* 802DD2B4 002DA1F4 28 00 00 00 */ cmplwi r0, 0 /* 802DD2B8 002DA1F8 41 82 00 0C */ beq lbl_802DD2C4 /* 802DD2BC 002DA1FC 80 7F 00 90 */ lwz r3, 0x90(r31) -/* 802DD2C0 002DA200 4B FF 1A A1 */ bl __dla +/* 802DD2C0 002DA200 4B FF 1A A1 */ bl __dla__FPv lbl_802DD2C4: /* 802DD2C4 002DA204 80 7F 00 AC */ lwz r3, 0xac(r31) /* 802DD2C8 002DA208 28 03 00 00 */ cmplwi r3, 0 @@ -100,15 +100,15 @@ lbl_802DD2C4: /* 802DD2E0 002DA220 4E 80 04 21 */ bctrl lbl_802DD2E4: /* 802DD2E4 002DA224 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 802DD2E8 002DA228 4B FF 1A 55 */ bl __dl +/* 802DD2E8 002DA228 4B FF 1A 55 */ bl __dl__FPv /* 802DD2EC 002DA22C 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802DD2F0 002DA230 4B FF 1A 4D */ bl __dl +/* 802DD2F0 002DA230 4B FF 1A 4D */ bl __dl__FPv /* 802DD2F4 002DA234 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 802DD2F8 002DA238 4B FF 1A 45 */ bl __dl +/* 802DD2F8 002DA238 4B FF 1A 45 */ bl __dl__FPv /* 802DD2FC 002DA23C 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 802DD300 002DA240 4B FF 1A 3D */ bl __dl +/* 802DD300 002DA240 4B FF 1A 3D */ bl __dl__FPv /* 802DD304 002DA244 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 802DD308 002DA248 4B FF 1A 35 */ bl __dl +/* 802DD308 002DA248 4B FF 1A 35 */ bl __dl__FPv /* 802DD30C 002DA24C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DD310 002DA250 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DD314 002DA254 7C 08 03 A6 */ mtlr r0 @@ -368,7 +368,7 @@ JUTCacheFont_NS_allocArea: /* 802DD674 002DA5B4 38 60 00 20 */ li r3, 0x20 /* 802DD678 002DA5B8 7F E4 FB 78 */ mr r4, r31 /* 802DD67C 002DA5BC 38 A0 00 00 */ li r5, 0 -/* 802DD680 002DA5C0 4B FF 16 19 */ bl __nw_X2_ +/* 802DD680 002DA5C0 4B FF 16 19 */ bl __nw__FUlP7JKRHeapi /* 802DD684 002DA5C4 90 7C 00 4C */ stw r3, 0x4c(r28) /* 802DD688 002DA5C8 80 1C 00 4C */ lwz r0, 0x4c(r28) /* 802DD68C 002DA5CC 28 00 00 00 */ cmplwi r0, 0 @@ -381,7 +381,7 @@ lbl_802DD69C: /* 802DD6A4 002DA5E4 41 82 00 28 */ beq lbl_802DD6CC /* 802DD6A8 002DA5E8 7F E4 FB 78 */ mr r4, r31 /* 802DD6AC 002DA5EC 38 A0 00 00 */ li r5, 0 -/* 802DD6B0 002DA5F0 4B FF 16 61 */ bl __nwa_X2_ +/* 802DD6B0 002DA5F0 4B FF 16 61 */ bl __nwa__FUlP7JKRHeapi /* 802DD6B4 002DA5F4 90 7C 00 7C */ stw r3, 0x7c(r28) /* 802DD6B8 002DA5F8 80 1C 00 7C */ lwz r0, 0x7c(r28) /* 802DD6BC 002DA5FC 28 00 00 00 */ cmplwi r0, 0 @@ -395,7 +395,7 @@ lbl_802DD6CC: /* 802DD6D8 002DA618 54 03 2A F4 */ rlwinm r3, r0, 5, 0xb, 0x1a /* 802DD6DC 002DA61C 7F E4 FB 78 */ mr r4, r31 /* 802DD6E0 002DA620 38 A0 00 00 */ li r5, 0 -/* 802DD6E4 002DA624 4B FF 16 2D */ bl __nwa_X2_ +/* 802DD6E4 002DA624 4B FF 16 2D */ bl __nwa__FUlP7JKRHeapi /* 802DD6E8 002DA628 90 7C 00 80 */ stw r3, 0x80(r28) /* 802DD6EC 002DA62C 80 1C 00 80 */ lwz r0, 0x80(r28) /* 802DD6F0 002DA630 28 00 00 00 */ cmplwi r0, 0 @@ -423,7 +423,7 @@ lbl_802DD738: /* 802DD740 002DA680 41 82 00 28 */ beq lbl_802DD768 /* 802DD744 002DA684 7F E4 FB 78 */ mr r4, r31 /* 802DD748 002DA688 38 A0 00 00 */ li r5, 0 -/* 802DD74C 002DA68C 4B FF 15 C5 */ bl __nwa_X2_ +/* 802DD74C 002DA68C 4B FF 15 C5 */ bl __nwa__FUlP7JKRHeapi /* 802DD750 002DA690 90 7C 00 84 */ stw r3, 0x84(r28) /* 802DD754 002DA694 80 1C 00 84 */ lwz r0, 0x84(r28) /* 802DD758 002DA698 28 00 00 00 */ cmplwi r0, 0 @@ -454,7 +454,7 @@ lbl_802DD79C: lbl_802DD7B4: /* 802DD7B4 002DA6F4 7F E4 FB 78 */ mr r4, r31 /* 802DD7B8 002DA6F8 38 A0 00 20 */ li r5, 0x20 -/* 802DD7BC 002DA6FC 4B FF 15 55 */ bl __nwa_X2_ +/* 802DD7BC 002DA6FC 4B FF 15 55 */ bl __nwa__FUlP7JKRHeapi /* 802DD7C0 002DA700 90 7C 00 90 */ stw r3, 0x90(r28) /* 802DD7C4 002DA704 80 1C 00 90 */ lwz r0, 0x90(r28) /* 802DD7C8 002DA708 28 00 00 00 */ cmplwi r0, 0 @@ -490,7 +490,7 @@ JUTCacheFont_NS_allocArray: /* 802DD828 002DA768 7C 03 02 14 */ add r0, r3, r0 /* 802DD82C 002DA76C 54 03 10 3A */ slwi r3, r0, 2 /* 802DD830 002DA770 38 A0 00 00 */ li r5, 0 -/* 802DD834 002DA774 4B FF 14 DD */ bl __nwa_X2_ +/* 802DD834 002DA774 4B FF 14 DD */ bl __nwa__FUlP7JKRHeapi /* 802DD838 002DA778 90 7F 00 50 */ stw r3, 0x50(r31) /* 802DD83C 002DA77C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802DD840 002DA780 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/JUtility/JUTConsole.s b/asm/JUtility/JUTConsole.s index 481889628f..6b5359101e 100644 --- a/asm/JUtility/JUTConsole.s +++ b/asm/JUtility/JUTConsole.s @@ -17,7 +17,7 @@ JUTConsole_NS_create: /* 802E7378 002E42B8 48 00 02 55 */ bl JUTConsole_NS_getObjectSizeFromBufferSize /* 802E737C 002E42BC 38 80 00 00 */ li r4, 0 /* 802E7380 002E42C0 7F A5 EB 78 */ mr r5, r29 -/* 802E7384 002E42C4 4B FE 70 F1 */ bl JKRHeap_NS_alloc +/* 802E7384 002E42C4 4B FE 70 F1 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802E7388 002E42C8 7C 60 1B 78 */ mr r0, r3 /* 802E738C 002E42CC 7C 1D 03 78 */ mr r29, r0 /* 802E7390 002E42D0 7F BF EB 79 */ or. r31, r29, r29 @@ -92,7 +92,7 @@ JUTConsole: /* 802E7484 002E43C4 7C 9D 23 78 */ mr r29, r4 /* 802E7488 002E43C8 7C BE 2B 78 */ mr r30, r5 /* 802E748C 002E43CC 7C DF 33 78 */ mr r31, r6 -/* 802E7490 002E43D0 4B FE 9F ED */ bl JKRDisposer +/* 802E7490 002E43D0 4B FE 9F ED */ bl __ct__11JKRDisposerFv /* 802E7494 002E43D4 3C 60 80 3D */ lis r3, lbl_803CC9A8@ha /* 802E7498 002E43D8 38 03 C9 A8 */ addi r0, r3, lbl_803CC9A8@l /* 802E749C 002E43DC 90 1C 00 00 */ stw r0, 0(r28) @@ -160,11 +160,11 @@ lbl_802E74F0: /* 802E7590 002E44D0 48 00 0D 21 */ bl JUTConsoleManager_NS_removeConsole /* 802E7594 002E44D4 7F C3 F3 78 */ mr r3, r30 /* 802E7598 002E44D8 38 80 00 00 */ li r4, 0 -/* 802E759C 002E44DC 4B FE 9F 49 */ bl JKRDisposer_NS_dtor +/* 802E759C 002E44DC 4B FE 9F 49 */ bl __dt__11JKRDisposerFv /* 802E75A0 002E44E0 7F E0 07 35 */ extsh. r0, r31 /* 802E75A4 002E44E4 40 81 00 0C */ ble lbl_802E75B0 /* 802E75A8 002E44E8 7F C3 F3 78 */ mr r3, r30 -/* 802E75AC 002E44EC 4B FE 77 91 */ bl __dl +/* 802E75AC 002E44EC 4B FE 77 91 */ bl __dl__FPv lbl_802E75B0: /* 802E75B0 002E44F0 7F C3 F3 78 */ mr r3, r30 /* 802E75B4 002E44F4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1054,7 +1054,7 @@ JUTConsoleManager_NS_createManager: lbl_802E820C: /* 802E820C 002E514C 38 60 00 14 */ li r3, 0x14 /* 802E8210 002E5150 38 A0 00 00 */ li r5, 0 -/* 802E8214 002E5154 4B FE 6A 85 */ bl __nw_X2_ +/* 802E8214 002E5154 4B FE 6A 85 */ bl __nw__FUlP7JKRHeapi /* 802E8218 002E5158 7C 60 1B 79 */ or. r0, r3, r3 /* 802E821C 002E515C 41 82 00 0C */ beq lbl_802E8228 /* 802E8220 002E5160 4B FF FF AD */ bl JUTConsoleManager diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index 09c48dd524..bdcaf15bab 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -43,7 +43,7 @@ JUTDbPrint_NS_start: /* 802E01C0 002DD100 83 ED 8D F4 */ lwz r31, lbl_80451374-_SDA_BASE_(r13) lbl_802E01C4: /* 802E01C4 002DD104 38 60 00 14 */ li r3, 0x14 -/* 802E01C8 002DD108 4B FE EA 85 */ bl __nw +/* 802E01C8 002DD108 4B FE EA 85 */ bl __nw__FUl /* 802E01CC 002DD10C 7C 60 1B 79 */ or. r0, r3, r3 /* 802E01D0 002DD110 41 82 00 14 */ beq lbl_802E01E4 /* 802E01D4 002DD114 7F C4 F3 78 */ mr r4, r30 @@ -88,7 +88,7 @@ JUTDbPrint_NS_enter: /* 802E024C 002DD18C 38 7E 00 10 */ addi r3, r30, 0x10 /* 802E0250 002DD190 38 80 FF FC */ li r4, -4 /* 802E0254 002DD194 80 B9 00 10 */ lwz r5, 0x10(r25) -/* 802E0258 002DD198 4B FE E2 1D */ bl JKRHeap_NS_alloc +/* 802E0258 002DD198 4B FE E2 1D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 802E025C 002DD19C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802E0260 002DD1A0 41 82 00 2C */ beq lbl_802E028C /* 802E0264 002DD1A4 B3 5F 00 04 */ sth r26, 4(r31) @@ -199,7 +199,7 @@ lbl_802E03D0: /* 802E03E4 002DD324 83 BE 00 00 */ lwz r29, 0(r30) /* 802E03E8 002DD328 7F C3 F3 78 */ mr r3, r30 /* 802E03EC 002DD32C 80 9C 00 10 */ lwz r4, 0x10(r28) -/* 802E03F0 002DD330 4B FE E1 11 */ bl JKRHeap_NS_free +/* 802E03F0 002DD330 4B FE E1 11 */ bl free__7JKRHeapFPvP7JKRHeap /* 802E03F4 002DD334 7F BE EB 78 */ mr r30, r29 /* 802E03F8 002DD338 93 BF 00 00 */ stw r29, 0(r31) /* 802E03FC 002DD33C 48 00 00 0C */ b lbl_802E0408 diff --git a/asm/JUtility/JUTDirectFile.s b/asm/JUtility/JUTDirectFile.s index 62f25df2ca..577a382446 100644 --- a/asm/JUtility/JUTDirectFile.s +++ b/asm/JUtility/JUTDirectFile.s @@ -84,7 +84,7 @@ JUTDirectFile_NS_dtor: /* 802E8838 002E5778 98 1F 08 30 */ stb r0, 0x830(r31) /* 802E883C 002E577C 7C 80 07 35 */ extsh. r0, r4 /* 802E8840 002E5780 40 81 00 08 */ ble lbl_802E8848 -/* 802E8844 002E5784 4B FE 64 F9 */ bl __dl +/* 802E8844 002E5784 4B FE 64 F9 */ bl __dl__FPv lbl_802E8848: /* 802E8848 002E5788 7F E3 FB 78 */ mr r3, r31 /* 802E884C 002E578C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JUtility/JUTDirectPrint.s b/asm/JUtility/JUTDirectPrint.s index ae4c69bbdd..c277c4744c 100644 --- a/asm/JUtility/JUTDirectPrint.s +++ b/asm/JUtility/JUTDirectPrint.s @@ -37,7 +37,7 @@ JUTDirectPrint_NS_start: /* 802E4250 002E1190 28 00 00 00 */ cmplwi r0, 0 /* 802E4254 002E1194 40 82 00 20 */ bne lbl_802E4274 /* 802E4258 002E1198 38 60 00 2C */ li r3, 0x2c -/* 802E425C 002E119C 4B FE A9 F1 */ bl __nw +/* 802E425C 002E119C 4B FE A9 F1 */ bl __nw__FUl /* 802E4260 002E11A0 7C 60 1B 79 */ or. r0, r3, r3 /* 802E4264 002E11A4 41 82 00 0C */ beq lbl_802E4270 /* 802E4268 002E11A8 4B FF FF 81 */ bl JUTDirectPrint diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 6d4423db4f..9c9f5dc356 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -86,7 +86,7 @@ JUTException_NS_create: /* 802E1E60 002DEDA0 38 60 00 A4 */ li r3, 0xa4 /* 802E1E64 002DEDA4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13) /* 802E1E68 002DEDA8 38 A0 00 00 */ li r5, 0 -/* 802E1E6C 002DEDAC 4B FE CE 2D */ bl __nw_X2_ +/* 802E1E6C 002DEDAC 4B FE CE 2D */ bl __nw__FUlP7JKRHeapi /* 802E1E70 002DEDB0 7C 64 1B 79 */ or. r4, r3, r3 /* 802E1E74 002DEDB4 41 82 00 10 */ beq lbl_802E1E84 /* 802E1E78 002DEDB8 7F E4 FB 78 */ mr r4, r31 @@ -2180,18 +2180,18 @@ lbl_802E3B50: /* 802E3B50 002E0A90 28 1F 00 00 */ cmplwi r31, 0 /* 802E3B54 002E0A94 40 82 FF E0 */ bne lbl_802E3B34 /* 802E3B58 002E0A98 38 60 00 14 */ li r3, 0x14 -/* 802E3B5C 002E0A9C 4B FE B0 F1 */ bl __nw +/* 802E3B5C 002E0A9C 4B FE B0 F1 */ bl __nw__FUl /* 802E3B60 002E0AA0 7C 7F 1B 79 */ or. r31, r3, r3 /* 802E3B64 002E0AA4 41 82 00 14 */ beq lbl_802E3B78 /* 802E3B68 002E0AA8 38 7F 00 04 */ addi r3, r31, 4 /* 802E3B6C 002E0AAC 7F E4 FB 78 */ mr r4, r31 -/* 802E3B70 002E0AB0 4B FF 82 8D */ bl JSUPtrLink +/* 802E3B70 002E0AB0 4B FF 82 8D */ bl __ct__10JSUPtrLinkFPv /* 802E3B74 002E0AB4 93 DF 00 00 */ stw r30, 0(r31) lbl_802E3B78: /* 802E3B78 002E0AB8 3C 60 80 43 */ lis r3, lbl_80434598@ha /* 802E3B7C 002E0ABC 38 63 45 98 */ addi r3, r3, lbl_80434598@l /* 802E3B80 002E0AC0 38 9F 00 04 */ addi r4, r31, 4 -/* 802E3B84 002E0AC4 4B FF 83 C9 */ bl JSUPtrList_NS_append +/* 802E3B84 002E0AC4 4B FF 83 C9 */ bl append__10JSUPtrListFP10JSUPtrLink lbl_802E3B88: /* 802E3B88 002E0AC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E3B8C 002E0ACC 83 C1 00 08 */ lwz r30, 8(r1) @@ -2597,7 +2597,7 @@ JUTExternalFB: /* 802E4120 002E1060 7F E0 07 35 */ extsh. r0, r31 /* 802E4124 002E1064 40 81 00 0C */ ble lbl_802E4130 /* 802E4128 002E1068 7F C3 F3 78 */ mr r3, r30 -/* 802E412C 002E106C 4B FE AC 11 */ bl __dl +/* 802E412C 002E106C 4B FE AC 11 */ bl __dl__FPv lbl_802E4130: /* 802E4130 002E1070 7F C3 F3 78 */ mr r3, r30 /* 802E4134 002E1074 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2612,7 +2612,7 @@ lbl_802E4130: /* 802E4158 002E1098 3C 60 80 43 */ lis r3, lbl_80434598@ha /* 802E415C 002E109C 38 63 45 98 */ addi r3, r3, lbl_80434598@l /* 802E4160 002E10A0 38 80 00 00 */ li r4, 0 -/* 802E4164 002E10A4 4B FF 7D 11 */ bl JSUPtrList +/* 802E4164 002E10A4 4B FF 7D 11 */ bl __ct__10JSUPtrListFb /* 802E4168 002E10A8 3C 60 80 43 */ lis r3, lbl_80434598@ha /* 802E416C 002E10AC 38 63 45 98 */ addi r3, r3, lbl_80434598@l .global JSUList_NS_dtor_X12_ @@ -2637,11 +2637,11 @@ JSUList_NS_dtor_X12_: /* 802E41AC 002E10EC 7C 9F 23 78 */ mr r31, r4 /* 802E41B0 002E10F0 41 82 00 1C */ beq lbl_802E41CC /* 802E41B4 002E10F4 38 80 00 00 */ li r4, 0 -/* 802E41B8 002E10F8 4B FF 7C F5 */ bl JSUPtrList_NS_dtor +/* 802E41B8 002E10F8 4B FF 7C F5 */ bl __dt__10JSUPtrListFv /* 802E41BC 002E10FC 7F E0 07 35 */ extsh. r0, r31 /* 802E41C0 002E1100 40 81 00 0C */ ble lbl_802E41CC /* 802E41C4 002E1104 7F C3 F3 78 */ mr r3, r30 -/* 802E41C8 002E1108 4B FE AB 75 */ bl __dl +/* 802E41C8 002E1108 4B FE AB 75 */ bl __dl__FPv lbl_802E41CC: /* 802E41CC 002E110C 7F C3 F3 78 */ mr r3, r30 /* 802E41D0 002E1110 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JUtility/JUTFader.s b/asm/JUtility/JUTFader.s index ccd33bfe9b..907e468cfa 100644 --- a/asm/JUtility/JUTFader.s +++ b/asm/JUtility/JUTFader.s @@ -231,7 +231,7 @@ lbl_802E5828: /* 802E5860 002E27A0 90 1F 00 00 */ stw r0, 0(r31) /* 802E5864 002E27A4 7C 80 07 35 */ extsh. r0, r4 /* 802E5868 002E27A8 40 81 00 08 */ ble lbl_802E5870 -/* 802E586C 002E27AC 4B FE 94 D1 */ bl __dl +/* 802E586C 002E27AC 4B FE 94 D1 */ bl __dl__FPv lbl_802E5870: /* 802E5870 002E27B0 7F E3 FB 78 */ mr r3, r31 /* 802E5874 002E27B4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JUtility/JUTGamePad.s b/asm/JUtility/JUTGamePad.s index b75b446f54..c0385a4859 100644 --- a/asm/JUtility/JUTGamePad.s +++ b/asm/JUtility/JUTGamePad.s @@ -12,7 +12,7 @@ JUTGamePad: /* 802E06EC 002DD62C 93 C1 00 08 */ stw r30, 8(r1) /* 802E06F0 002DD630 7C 7E 1B 78 */ mr r30, r3 /* 802E06F4 002DD634 7C 9F 23 78 */ mr r31, r4 -/* 802E06F8 002DD638 4B FF 0D 85 */ bl JKRDisposer +/* 802E06F8 002DD638 4B FF 0D 85 */ bl __ct__11JKRDisposerFv /* 802E06FC 002DD63C 3C 60 80 3D */ lis r3, lbl_803CC610@ha /* 802E0700 002DD640 38 03 C6 10 */ addi r0, r3, lbl_803CC610@l /* 802E0704 002DD644 90 1E 00 00 */ stw r0, 0(r30) @@ -27,7 +27,7 @@ JUTGamePad: /* 802E0728 002DD668 48 00 0E B1 */ bl JUTGamePad_NS_CRumble_NS_clear_X1_ /* 802E072C 002DD66C 38 7E 00 80 */ addi r3, r30, 0x80 /* 802E0730 002DD670 7F C4 F3 78 */ mr r4, r30 -/* 802E0734 002DD674 4B FF B6 C9 */ bl JSUPtrLink +/* 802E0734 002DD674 4B FF B6 C9 */ bl __ct__10JSUPtrLinkFPv /* 802E0738 002DD678 38 00 00 00 */ li r0, 0 /* 802E073C 002DD67C 98 1E 00 98 */ stb r0, 0x98(r30) /* 802E0740 002DD680 B3 FE 00 7C */ sth r31, 0x7c(r30) @@ -44,7 +44,7 @@ lbl_802E0764: /* 802E0768 002DD6A8 3C 60 80 43 */ lis r3, lbl_804343E4@ha /* 802E076C 002DD6AC 38 63 43 E4 */ addi r3, r3, lbl_804343E4@l /* 802E0770 002DD6B0 38 9E 00 80 */ addi r4, r30, 0x80 -/* 802E0774 002DD6B4 4B FF B7 D9 */ bl JSUPtrList_NS_append +/* 802E0774 002DD6B4 4B FF B7 D9 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802E0778 002DD6B8 7F C3 F3 78 */ mr r3, r30 /* 802E077C 002DD6BC 48 00 05 5D */ bl JUTGamePad_NS_update /* 802E0780 002DD6C0 38 00 00 00 */ li r0, 0 @@ -86,20 +86,20 @@ lbl_802E0800: /* 802E0800 002DD740 3C 60 80 43 */ lis r3, lbl_804343E4@ha /* 802E0804 002DD744 38 63 43 E4 */ addi r3, r3, lbl_804343E4@l /* 802E0808 002DD748 38 9E 00 80 */ addi r4, r30, 0x80 -/* 802E080C 002DD74C 4B FF B9 51 */ bl JSUPtrList_NS_remove +/* 802E080C 002DD74C 4B FF B9 51 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802E0810 002DD750 34 1E 00 80 */ addic. r0, r30, 0x80 /* 802E0814 002DD754 41 82 00 10 */ beq lbl_802E0824 /* 802E0818 002DD758 38 7E 00 80 */ addi r3, r30, 0x80 /* 802E081C 002DD75C 38 80 00 00 */ li r4, 0 -/* 802E0820 002DD760 4B FF B5 F5 */ bl JSUPtrLink_NS_dtor +/* 802E0820 002DD760 4B FF B5 F5 */ bl __dt__10JSUPtrLinkFv lbl_802E0824: /* 802E0824 002DD764 7F C3 F3 78 */ mr r3, r30 /* 802E0828 002DD768 38 80 00 00 */ li r4, 0 -/* 802E082C 002DD76C 4B FF 0C B9 */ bl JKRDisposer_NS_dtor +/* 802E082C 002DD76C 4B FF 0C B9 */ bl __dt__11JKRDisposerFv /* 802E0830 002DD770 7F E0 07 35 */ extsh. r0, r31 /* 802E0834 002DD774 40 81 00 0C */ ble lbl_802E0840 /* 802E0838 002DD778 7F C3 F3 78 */ mr r3, r30 -/* 802E083C 002DD77C 4B FE E5 01 */ bl __dl +/* 802E083C 002DD77C 4B FE E5 01 */ bl __dl__FPv lbl_802E0840: /* 802E0840 002DD780 7F C3 F3 78 */ mr r3, r30 /* 802E0844 002DD784 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -119,7 +119,7 @@ JUTGamePad_NS_initList: /* 802E0870 002DD7B0 40 82 00 18 */ bne lbl_802E0888 /* 802E0874 002DD7B4 3C 60 80 43 */ lis r3, lbl_804343E4@ha /* 802E0878 002DD7B8 38 63 43 E4 */ addi r3, r3, lbl_804343E4@l -/* 802E087C 002DD7BC 4B FF B6 99 */ bl JSUPtrList_NS_initiate +/* 802E087C 002DD7BC 4B FF B6 99 */ bl initiate__10JSUPtrListFv /* 802E0880 002DD7C0 38 00 00 01 */ li r0, 1 /* 802E0884 002DD7C4 98 0D 8F 50 */ stb r0, lbl_804514D0-_SDA_BASE_(r13) lbl_802E0888: @@ -1514,7 +1514,7 @@ lbl_802E1B50: /* 802E1B74 002DEAB4 3B E3 43 D8 */ addi r31, r3, lbl_804343D8@l /* 802E1B78 002DEAB8 38 7F 00 0C */ addi r3, r31, 0xc /* 802E1B7C 002DEABC 38 80 00 00 */ li r4, 0 -/* 802E1B80 002DEAC0 4B FF A2 F5 */ bl JSUPtrList +/* 802E1B80 002DEAC0 4B FF A2 F5 */ bl __ct__10JSUPtrListFb /* 802E1B84 002DEAC4 38 7F 00 0C */ addi r3, r31, 0xc .global JSUList_NS_dtor_X11_ /* 802E1B88 002DEAC8 3C 80 80 2E */ lis r4, JSUList_NS_dtor_X11_@ha @@ -1564,7 +1564,7 @@ lbl_802E1B50: /* 802E1C1C 002DEB5C 90 0D 8F 78 */ stw r0, lbl_804514F8-_SDA_BASE_(r13) /* 802E1C20 002DEB60 38 7F 01 94 */ addi r3, r31, 0x194 /* 802E1C24 002DEB64 38 80 00 00 */ li r4, 0 -/* 802E1C28 002DEB68 4B FF A2 4D */ bl JSUPtrList +/* 802E1C28 002DEB68 4B FF A2 4D */ bl __ct__10JSUPtrListFb /* 802E1C2C 002DEB6C 38 7F 01 94 */ addi r3, r31, 0x194 .global JSUList_NS_dtor_X10_ /* 802E1C30 002DEB70 3C 80 80 2E */ lis r4, JSUList_NS_dtor_X10_@ha @@ -1588,11 +1588,11 @@ JSUList_NS_dtor_X10_: /* 802E1C6C 002DEBAC 7C 9F 23 78 */ mr r31, r4 /* 802E1C70 002DEBB0 41 82 00 1C */ beq lbl_802E1C8C /* 802E1C74 002DEBB4 38 80 00 00 */ li r4, 0 -/* 802E1C78 002DEBB8 4B FF A2 35 */ bl JSUPtrList_NS_dtor +/* 802E1C78 002DEBB8 4B FF A2 35 */ bl __dt__10JSUPtrListFv /* 802E1C7C 002DEBBC 7F E0 07 35 */ extsh. r0, r31 /* 802E1C80 002DEBC0 40 81 00 0C */ ble lbl_802E1C8C /* 802E1C84 002DEBC4 7F C3 F3 78 */ mr r3, r30 -/* 802E1C88 002DEBC8 4B FE D0 B5 */ bl __dl +/* 802E1C88 002DEBC8 4B FE D0 B5 */ bl __dl__FPv lbl_802E1C8C: /* 802E1C8C 002DEBCC 7F C3 F3 78 */ mr r3, r30 /* 802E1C90 002DEBD0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1640,11 +1640,11 @@ JSUList_NS_dtor_X11_: /* 802E1D20 002DEC60 7C 9F 23 78 */ mr r31, r4 /* 802E1D24 002DEC64 41 82 00 1C */ beq lbl_802E1D40 /* 802E1D28 002DEC68 38 80 00 00 */ li r4, 0 -/* 802E1D2C 002DEC6C 4B FF A1 81 */ bl JSUPtrList_NS_dtor +/* 802E1D2C 002DEC6C 4B FF A1 81 */ bl __dt__10JSUPtrListFv /* 802E1D30 002DEC70 7F E0 07 35 */ extsh. r0, r31 /* 802E1D34 002DEC74 40 81 00 0C */ ble lbl_802E1D40 /* 802E1D38 002DEC78 7F C3 F3 78 */ mr r3, r30 -/* 802E1D3C 002DEC7C 4B FE D0 01 */ bl __dl +/* 802E1D3C 002DEC7C 4B FE D0 01 */ bl __dl__FPv lbl_802E1D40: /* 802E1D40 002DEC80 7F C3 F3 78 */ mr r3, r30 /* 802E1D44 002DEC84 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JUtility/JUTGraphFifo.s b/asm/JUtility/JUTGraphFifo.s index 2dfddfc4b8..86bdde66c9 100644 --- a/asm/JUtility/JUTGraphFifo.s +++ b/asm/JUtility/JUTGraphFifo.s @@ -23,7 +23,7 @@ JUTGraphFifo: /* 802DEB94 002DBAD4 80 9F 00 0C */ lwz r4, 0xc(r31) /* 802DEB98 002DBAD8 38 84 00 80 */ addi r4, r4, 0x80 /* 802DEB9C 002DBADC 38 A0 00 20 */ li r5, 0x20 -/* 802DEBA0 002DBAE0 4B FE F9 35 */ bl JKRHeap_NS_alloc_X1_ +/* 802DEBA0 002DBAE0 4B FE F9 35 */ bl alloc__7JKRHeapFUli /* 802DEBA4 002DBAE4 90 7F 00 04 */ stw r3, 4(r31) /* 802DEBA8 002DBAE8 80 7F 00 04 */ lwz r3, 4(r31) /* 802DEBAC 002DBAEC 38 03 00 80 */ addi r0, r3, 0x80 @@ -42,7 +42,7 @@ lbl_802DEBD8: /* 802DEBDC 002DBB1C 80 9F 00 0C */ lwz r4, 0xc(r31) /* 802DEBE0 002DBB20 38 84 00 A0 */ addi r4, r4, 0xa0 /* 802DEBE4 002DBB24 38 A0 00 20 */ li r5, 0x20 -/* 802DEBE8 002DBB28 4B FE F8 ED */ bl JKRHeap_NS_alloc_X1_ +/* 802DEBE8 002DBB28 4B FE F8 ED */ bl alloc__7JKRHeapFUli /* 802DEBEC 002DBB2C 90 7F 00 08 */ stw r3, 8(r31) /* 802DEBF0 002DBB30 80 7F 00 08 */ lwz r3, 8(r31) /* 802DEBF4 002DBB34 38 03 00 1F */ addi r0, r3, 0x1f @@ -101,11 +101,11 @@ lbl_802DEC88: lbl_802DECC0: /* 802DECC0 002DBC00 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) /* 802DECC4 002DBC04 80 9A 00 08 */ lwz r4, 8(r26) -/* 802DECC8 002DBC08 4B FE F8 81 */ bl JKRHeap_NS_free_X1_ +/* 802DECC8 002DBC08 4B FE F8 81 */ bl free__7JKRHeapFPv /* 802DECCC 002DBC0C 7F 60 07 35 */ extsh. r0, r27 /* 802DECD0 002DBC10 40 81 00 0C */ ble lbl_802DECDC /* 802DECD4 002DBC14 7F 43 D3 78 */ mr r3, r26 -/* 802DECD8 002DBC18 4B FF 00 65 */ bl __dl +/* 802DECD8 002DBC18 4B FF 00 65 */ bl __dl__FPv lbl_802DECDC: /* 802DECDC 002DBC1C 7F 43 D3 78 */ mr r3, r26 /* 802DECE0 002DBC20 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index 43b702e675..dbbd945e0d 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -91,7 +91,7 @@ JUTProcBar_NS_dtor: /* 802E59B8 002E28F8 90 0D 8F D8 */ stw r0, lbl_80451558-_SDA_BASE_(r13) /* 802E59BC 002E28FC 7C 80 07 35 */ extsh. r0, r4 /* 802E59C0 002E2900 40 81 00 08 */ ble lbl_802E59C8 -/* 802E59C4 002E2904 4B FE 93 79 */ bl __dl +/* 802E59C4 002E2904 4B FE 93 79 */ bl __dl__FPv lbl_802E59C8: /* 802E59C8 002E2908 7F E3 FB 78 */ mr r3, r31 /* 802E59CC 002E290C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -109,7 +109,7 @@ JUTProcBar_NS_create: /* 802E59F0 002E2930 28 00 00 00 */ cmplwi r0, 0 /* 802E59F4 002E2934 40 82 00 20 */ bne lbl_802E5A14 /* 802E59F8 002E2938 38 60 01 34 */ li r3, 0x134 -/* 802E59FC 002E293C 4B FE 92 51 */ bl __nw +/* 802E59FC 002E293C 4B FE 92 51 */ bl __nw__FUl /* 802E5A00 002E2940 7C 60 1B 79 */ or. r0, r3, r3 /* 802E5A04 002E2944 41 82 00 0C */ beq lbl_802E5A10 /* 802E5A08 002E2948 4B FF FE 81 */ bl JUTProcBar @@ -1486,7 +1486,7 @@ heapBar: /* 802E6E4C 002E3D8C 4B FF FE F1 */ bl addrToXPos /* 802E6E50 002E3D90 7F 7B 1A 14 */ add r27, r27, r3 /* 802E6E54 002E3D94 7F E3 FB 78 */ mr r3, r31 -/* 802E6E58 002E3D98 4B FE 79 2D */ bl JKRHeap_NS_getTotalFreeSize +/* 802E6E58 002E3D98 4B FE 79 2D */ bl getTotalFreeSize__7JKRHeapFv /* 802E6E5C 002E3D9C 7F C4 F3 78 */ mr r4, r30 /* 802E6E60 002E3DA0 4B FF FF 45 */ bl byteToXLen /* 802E6E64 002E3DA4 7C 7F 1B 78 */ mr r31, r3 @@ -1742,7 +1742,7 @@ JUTProcBar_NS_drawHeapBar: /* 802E7240 002E4180 38 61 00 14 */ addi r3, r1, 0x14 /* 802E7244 002E4184 48 00 28 81 */ bl J2DFillBox /* 802E7248 002E4188 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) -/* 802E724C 002E418C 4B FE 75 39 */ bl JKRHeap_NS_getTotalFreeSize +/* 802E724C 002E418C 4B FE 75 39 */ bl getTotalFreeSize__7JKRHeapFv /* 802E7250 002E4190 7F 44 D3 78 */ mr r4, r26 /* 802E7254 002E4194 4B FF FB 51 */ bl byteToXLen /* 802E7258 002E4198 38 00 00 00 */ li r0, 0 diff --git a/asm/JUtility/JUTResFont.s b/asm/JUtility/JUTResFont.s index 1600b1c5f7..0991642095 100644 --- a/asm/JUtility/JUTResFont.s +++ b/asm/JUtility/JUTResFont.s @@ -86,7 +86,7 @@ lbl_802DF060: /* 802DF060 002DBFA0 7F E0 07 35 */ extsh. r0, r31 /* 802DF064 002DBFA4 40 81 00 0C */ ble lbl_802DF070 /* 802DF068 002DBFA8 7F C3 F3 78 */ mr r3, r30 -/* 802DF06C 002DBFAC 4B FE FC D1 */ bl __dl +/* 802DF06C 002DBFAC 4B FE FC D1 */ bl __dl__FPv lbl_802DF070: /* 802DF070 002DBFB0 7F C3 F3 78 */ mr r3, r30 /* 802DF074 002DBFB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -102,7 +102,7 @@ JUTResFont_NS_deleteMemBlocks_ResFont: /* 802DF090 002DBFD0 7C 08 02 A6 */ mflr r0 /* 802DF094 002DBFD4 90 01 00 14 */ stw r0, 0x14(r1) /* 802DF098 002DBFD8 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802DF09C 002DBFDC 4B FE FC C5 */ bl __dla +/* 802DF09C 002DBFDC 4B FE FC C5 */ bl __dla__FPv /* 802DF0A0 002DBFE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DF0A4 002DBFE4 7C 08 03 A6 */ mtlr r0 /* 802DF0A8 002DBFE8 38 21 00 10 */ addi r1, r1, 0x10 @@ -184,7 +184,7 @@ lbl_802DF180: /* 802DF1A8 002DC0E8 54 03 10 3A */ slwi r3, r0, 2 /* 802DF1AC 002DC0EC 7F E4 FB 78 */ mr r4, r31 /* 802DF1B0 002DC0F0 38 A0 00 00 */ li r5, 0 -/* 802DF1B4 002DC0F4 4B FE FB 5D */ bl __nwa_X2_ +/* 802DF1B4 002DC0F4 4B FE FB 5D */ bl __nwa__FUlP7JKRHeapi /* 802DF1B8 002DC0F8 90 7D 00 50 */ stw r3, 0x50(r29) /* 802DF1BC 002DC0FC 80 7D 00 50 */ lwz r3, 0x50(r29) /* 802DF1C0 002DC100 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/JUtility/JUTTexture.s b/asm/JUtility/JUTTexture.s index fadb6b8bad..50ec81387d 100644 --- a/asm/JUtility/JUTTexture.s +++ b/asm/JUtility/JUTTexture.s @@ -17,18 +17,18 @@ JUTTexture_NS_dtor: /* 802DE258 002DB198 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802DE25C 002DB19C 41 82 00 0C */ beq lbl_802DE268 /* 802DE260 002DB1A0 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 802DE264 002DB1A4 4B FF 0A FD */ bl __dla +/* 802DE264 002DB1A4 4B FF 0A FD */ bl __dla__FPv lbl_802DE268: /* 802DE268 002DB1A8 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802DE26C 002DB1AC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802DE270 002DB1B0 41 82 00 0C */ beq lbl_802DE27C /* 802DE274 002DB1B4 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 802DE278 002DB1B8 4B FF 0A C5 */ bl __dl +/* 802DE278 002DB1B8 4B FF 0A C5 */ bl __dl__FPv lbl_802DE27C: /* 802DE27C 002DB1BC 7F E0 07 35 */ extsh. r0, r31 /* 802DE280 002DB1C0 40 81 00 0C */ ble lbl_802DE28C /* 802DE284 002DB1C4 7F C3 F3 78 */ mr r3, r30 -/* 802DE288 002DB1C8 4B FF 0A B5 */ bl __dl +/* 802DE288 002DB1C8 4B FF 0A B5 */ bl __dl__FPv lbl_802DE28C: /* 802DE28C 002DB1CC 7F C3 F3 78 */ mr r3, r30 /* 802DE290 002DB1D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -118,7 +118,7 @@ lbl_802DE3B0: /* 802DE3C4 002DB304 40 82 00 4C */ bne lbl_802DE410 lbl_802DE3C8: /* 802DE3C8 002DB308 38 60 00 18 */ li r3, 0x18 -/* 802DE3CC 002DB30C 4B FF 08 81 */ bl __nw +/* 802DE3CC 002DB30C 4B FF 08 81 */ bl __nw__FUl /* 802DE3D0 002DB310 7C 7E 1B 79 */ or. r30, r3, r3 /* 802DE3D4 002DB314 41 82 00 24 */ beq lbl_802DE3F8 /* 802DE3D8 002DB318 81 1F 00 20 */ lwz r8, 0x20(r31) @@ -201,7 +201,7 @@ lbl_802DE4D4: /* 802DE4D8 002DB418 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802DE4DC 002DB41C 41 82 00 0C */ beq lbl_802DE4E8 /* 802DE4E0 002DB420 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 802DE4E4 002DB424 4B FF 08 59 */ bl __dl +/* 802DE4E4 002DB424 4B FF 08 59 */ bl __dl__FPv lbl_802DE4E8: /* 802DE4E8 002DB428 93 DD 00 28 */ stw r30, 0x28(r29) /* 802DE4EC 002DB42C 88 1D 00 3B */ lbz r0, 0x3b(r29) diff --git a/asm/JUtility/JUTVideo.s b/asm/JUtility/JUTVideo.s index c4379ddf45..0d1b5a3608 100644 --- a/asm/JUtility/JUTVideo.s +++ b/asm/JUtility/JUTVideo.s @@ -14,7 +14,7 @@ JUTVideo_NS_createManager: /* 802E4C6C 002E1BAC 28 00 00 00 */ cmplwi r0, 0 /* 802E4C70 002E1BB0 40 82 00 24 */ bne lbl_802E4C94 /* 802E4C74 002E1BB4 38 60 00 58 */ li r3, 0x58 -/* 802E4C78 002E1BB8 4B FE 9F D5 */ bl __nw +/* 802E4C78 002E1BB8 4B FE 9F D5 */ bl __nw__FUl /* 802E4C7C 002E1BBC 7C 60 1B 79 */ or. r0, r3, r3 /* 802E4C80 002E1BC0 41 82 00 10 */ beq lbl_802E4C90 /* 802E4C84 002E1BC4 7F E4 FB 78 */ mr r4, r31 @@ -140,7 +140,7 @@ JUTVideo: /* 802E4E24 002E1D64 7F E0 07 35 */ extsh. r0, r31 /* 802E4E28 002E1D68 40 81 00 0C */ ble lbl_802E4E34 /* 802E4E2C 002E1D6C 7F C3 F3 78 */ mr r3, r30 -/* 802E4E30 002E1D70 4B FE 9F 0D */ bl __dl +/* 802E4E30 002E1D70 4B FE 9F 0D */ bl __dl__FPv lbl_802E4E34: /* 802E4E34 002E1D74 7F C3 F3 78 */ mr r3, r30 /* 802E4E38 002E1D78 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/JUtility/JUTXfb.s b/asm/JUtility/JUTXfb.s index 623895b35f..5431f2aad1 100644 --- a/asm/JUtility/JUTXfb.s +++ b/asm/JUtility/JUTXfb.s @@ -98,7 +98,7 @@ lbl_802E532C: /* 802E534C 002E228C 7F C0 07 35 */ extsh. r0, r30 /* 802E5350 002E2290 40 81 00 0C */ ble lbl_802E535C /* 802E5354 002E2294 7F A3 EB 78 */ mr r3, r29 -/* 802E5358 002E2298 4B FE 99 E5 */ bl __dl +/* 802E5358 002E2298 4B FE 99 E5 */ bl __dl__FPv lbl_802E535C: /* 802E535C 002E229C 7F A3 EB 78 */ mr r3, r29 /* 802E5360 002E22A0 39 61 00 20 */ addi r11, r1, 0x20 @@ -121,7 +121,7 @@ JUTXfb_NS_delXfb: /* 802E5398 002E22D8 7C 63 00 2E */ lwzx r3, r3, r0 /* 802E539C 002E22DC 28 03 00 00 */ cmplwi r3, 0 /* 802E53A0 002E22E0 41 82 00 08 */ beq lbl_802E53A8 -/* 802E53A4 002E22E4 4B FE 99 99 */ bl __dl +/* 802E53A4 002E22E4 4B FE 99 99 */ bl __dl__FPv lbl_802E53A8: /* 802E53A8 002E22E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E53AC 002E22EC 7C 08 03 A6 */ mtlr r0 @@ -141,7 +141,7 @@ JUTXfb_NS_createManager: /* 802E53D8 002E2318 28 00 00 00 */ cmplwi r0, 0 /* 802E53DC 002E231C 40 82 00 2C */ bne lbl_802E5408 /* 802E53E0 002E2320 38 60 00 20 */ li r3, 0x20 -/* 802E53E4 002E2324 4B FE 98 69 */ bl __nw +/* 802E53E4 002E2324 4B FE 98 69 */ bl __nw__FUl /* 802E53E8 002E2328 7C 60 1B 79 */ or. r0, r3, r3 /* 802E53EC 002E232C 41 82 00 18 */ beq lbl_802E5404 /* 802E53F0 002E2330 38 80 00 00 */ li r4, 0 @@ -197,7 +197,7 @@ lbl_802E547C: /* 802E5494 002E23D4 7C 7F 1B 78 */ mr r31, r3 /* 802E5498 002E23D8 7F A4 EB 78 */ mr r4, r29 /* 802E549C 002E23DC 38 A0 00 20 */ li r5, 0x20 -/* 802E54A0 002E23E0 4B FE 98 71 */ bl __nwa_X2_ +/* 802E54A0 002E23E0 4B FE 98 71 */ bl __nwa__FUlP7JKRHeapi /* 802E54A4 002E23E4 90 7C 00 00 */ stw r3, 0(r28) /* 802E54A8 002E23E8 38 00 00 01 */ li r0, 1 /* 802E54AC 002E23EC 98 1C 00 0C */ stb r0, 0xc(r28) @@ -206,7 +206,7 @@ lbl_802E547C: /* 802E54B8 002E23F8 7F E3 FB 78 */ mr r3, r31 /* 802E54BC 002E23FC 7F A4 EB 78 */ mr r4, r29 /* 802E54C0 002E2400 38 A0 00 20 */ li r5, 0x20 -/* 802E54C4 002E2404 4B FE 98 4D */ bl __nwa_X2_ +/* 802E54C4 002E2404 4B FE 98 4D */ bl __nwa__FUlP7JKRHeapi /* 802E54C8 002E2408 90 7C 00 04 */ stw r3, 4(r28) /* 802E54CC 002E240C 38 00 00 01 */ li r0, 1 /* 802E54D0 002E2410 98 1C 00 0D */ stb r0, 0xd(r28) @@ -221,7 +221,7 @@ lbl_802E54E4: /* 802E54EC 002E242C 7F E3 FB 78 */ mr r3, r31 /* 802E54F0 002E2430 7F A4 EB 78 */ mr r4, r29 /* 802E54F4 002E2434 38 A0 00 20 */ li r5, 0x20 -/* 802E54F8 002E2438 4B FE 98 19 */ bl __nwa_X2_ +/* 802E54F8 002E2438 4B FE 98 19 */ bl __nwa__FUlP7JKRHeapi /* 802E54FC 002E243C 90 7C 00 08 */ stw r3, 8(r28) /* 802E5500 002E2440 38 00 00 01 */ li r0, 1 /* 802E5504 002E2444 98 1C 00 0E */ stb r0, 0xe(r28) diff --git a/asm/SComponent/c/bg/s/c_bg_s_chk.s b/asm/SComponent/c/bg/s/c_bg_s_chk.s index 401392a229..45c3e006d7 100644 --- a/asm/SComponent/c/bg/s/c_bg_s_chk.s +++ b/asm/SComponent/c/bg/s/c_bg_s_chk.s @@ -28,7 +28,7 @@ cBgS_Chk_NS_dtor: /* 80267B90 00264AD0 90 1F 00 10 */ stw r0, 0x10(r31) /* 80267B94 00264AD4 7C 80 07 35 */ extsh. r0, r4 /* 80267B98 00264AD8 40 81 00 08 */ ble lbl_80267BA0 -/* 80267B9C 00264ADC 48 06 71 A1 */ bl __dl +/* 80267B9C 00264ADC 48 06 71 A1 */ bl __dl__FPv lbl_80267BA0: /* 80267BA0 00264AE0 7F E3 FB 78 */ mr r3, r31 /* 80267BA4 00264AE4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/bg/s/gnd/c_bg_s_gnd_chk.s b/asm/SComponent/c/bg/s/gnd/c_bg_s_gnd_chk.s index ffafd1800a..aa1d01e219 100644 --- a/asm/SComponent/c/bg/s/gnd/c_bg_s_gnd_chk.s +++ b/asm/SComponent/c/bg/s/gnd/c_bg_s_gnd_chk.s @@ -60,7 +60,7 @@ cBgS_GndChk_NS_dtor: /* 80267CE0 00264C20 7F E0 07 35 */ extsh. r0, r31 /* 80267CE4 00264C24 40 81 00 0C */ ble lbl_80267CF0 /* 80267CE8 00264C28 7F C3 F3 78 */ mr r3, r30 -/* 80267CEC 00264C2C 48 06 70 51 */ bl __dl +/* 80267CEC 00264C2C 48 06 70 51 */ bl __dl__FPv lbl_80267CF0: /* 80267CF0 00264C30 7F C3 F3 78 */ mr r3, r30 /* 80267CF4 00264C34 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s b/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s index 8a6e2ce500..7e2579f945 100644 --- a/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s +++ b/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s @@ -60,7 +60,7 @@ lbl_80267E04: /* 80267E1C 00264D5C 7F E0 07 35 */ extsh. r0, r31 /* 80267E20 00264D60 40 81 00 0C */ ble lbl_80267E2C /* 80267E24 00264D64 7F C3 F3 78 */ mr r3, r30 -/* 80267E28 00264D68 48 06 6F 15 */ bl __dl +/* 80267E28 00264D68 48 06 6F 15 */ bl __dl__FPv lbl_80267E2C: /* 80267E2C 00264D6C 7F C3 F3 78 */ mr r3, r30 /* 80267E30 00264D70 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/bg/s/poly/c_bg_s_poly_info.s b/asm/SComponent/c/bg/s/poly/c_bg_s_poly_info.s index f8a6851a0c..7a2926e201 100644 --- a/asm/SComponent/c/bg/s/poly/c_bg_s_poly_info.s +++ b/asm/SComponent/c/bg/s/poly/c_bg_s_poly_info.s @@ -34,7 +34,7 @@ cBgS_PolyInfo_NS_dtor: /* 802680D0 00265010 90 1F 00 0C */ stw r0, 0xc(r31) /* 802680D4 00265014 7C 80 07 35 */ extsh. r0, r4 /* 802680D8 00265018 40 81 00 08 */ ble lbl_802680E0 -/* 802680DC 0026501C 48 06 6C 61 */ bl __dl +/* 802680DC 0026501C 48 06 6C 61 */ bl __dl__FPv lbl_802680E0: /* 802680E0 00265020 7F E3 FB 78 */ mr r3, r31 /* 802680E4 00265024 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/bg/s/shdw/c_bg_s_shdw_draw.s b/asm/SComponent/c/bg/s/shdw/c_bg_s_shdw_draw.s index ee09c4d97d..467065d7c0 100644 --- a/asm/SComponent/c/bg/s/shdw/c_bg_s_shdw_draw.s +++ b/asm/SComponent/c/bg/s/shdw/c_bg_s_shdw_draw.s @@ -49,7 +49,7 @@ lbl_80268010: /* 8026801C 00264F5C 7F E0 07 35 */ extsh. r0, r31 /* 80268020 00264F60 40 81 00 0C */ ble lbl_8026802C /* 80268024 00264F64 7F C3 F3 78 */ mr r3, r30 -/* 80268028 00264F68 48 06 6D 15 */ bl __dl +/* 80268028 00264F68 48 06 6D 15 */ bl __dl__FPv lbl_8026802C: /* 8026802C 00264F6C 7F C3 F3 78 */ mr r3, r30 /* 80268030 00264F70 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/c_malloc.s b/asm/SComponent/c/c_malloc.s index 9a8460cf33..21d2262439 100644 --- a/asm/SComponent/c/c_malloc.s +++ b/asm/SComponent/c/c_malloc.s @@ -20,7 +20,7 @@ cMl_NS_memalignB: /* 80263244 00260184 48 00 00 0C */ b lbl_80263250 lbl_80263248: /* 80263248 00260188 80 6D 8B D0 */ lwz r3, lbl_80451150-_SDA_BASE_(r13) -/* 8026324C 0026018C 48 06 B2 89 */ bl JKRHeap_NS_alloc_X1_ +/* 8026324C 0026018C 48 06 B2 89 */ bl alloc__7JKRHeapFUli lbl_80263250: /* 80263250 00260190 80 01 00 14 */ lwz r0, 0x14(r1) /* 80263254 00260194 7C 08 03 A6 */ mtlr r0 @@ -35,7 +35,7 @@ cMl_NS_free: /* 8026326C 002601AC 7C 64 1B 79 */ or. r4, r3, r3 /* 80263270 002601B0 41 82 00 0C */ beq lbl_8026327C /* 80263274 002601B4 80 6D 8B D0 */ lwz r3, lbl_80451150-_SDA_BASE_(r13) -/* 80263278 002601B8 48 06 B2 D1 */ bl JKRHeap_NS_free_X1_ +/* 80263278 002601B8 48 06 B2 D1 */ bl free__7JKRHeapFPv lbl_8026327C: /* 8026327C 002601BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80263280 002601C0 7C 08 03 A6 */ mtlr r0 diff --git a/asm/SComponent/c/cc/c_cc_d.s b/asm/SComponent/c/cc/c_cc_d.s index 13818b4c07..03d49f3116 100644 --- a/asm/SComponent/c/cc/c_cc_d.s +++ b/asm/SComponent/c/cc/c_cc_d.s @@ -1624,7 +1624,7 @@ lbl_802649B0: /* 802649B0 002618F0 7C 80 07 35 */ extsh. r0, r4 /* 802649B4 002618F4 40 81 00 0C */ ble lbl_802649C0 /* 802649B8 002618F8 7F E3 FB 78 */ mr r3, r31 -/* 802649BC 002618FC 48 06 A3 81 */ bl __dl +/* 802649BC 002618FC 48 06 A3 81 */ bl __dl__FPv lbl_802649C0: /* 802649C0 00261900 7F E3 FB 78 */ mr r3, r31 /* 802649C4 00261904 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/m3d/g/c_m3d_g_cir.s b/asm/SComponent/c/m3d/g/c_m3d_g_cir.s index d92a1d7dc4..461867589f 100644 --- a/asm/SComponent/c/m3d/g/c_m3d_g_cir.s +++ b/asm/SComponent/c/m3d/g/c_m3d_g_cir.s @@ -23,7 +23,7 @@ cM3dGCir: /* 8026EEF0 0026BE30 90 1F 00 0C */ stw r0, 0xc(r31) /* 8026EEF4 0026BE34 7C 80 07 35 */ extsh. r0, r4 /* 8026EEF8 0026BE38 40 81 00 08 */ ble lbl_8026EF00 -/* 8026EEFC 0026BE3C 48 05 FE 41 */ bl __dl +/* 8026EEFC 0026BE3C 48 05 FE 41 */ bl __dl__FPv lbl_8026EF00: /* 8026EF00 0026BE40 7F E3 FB 78 */ mr r3, r31 /* 8026EF04 0026BE44 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -51,7 +51,7 @@ lbl_8026EF4C: /* 8026EF4C 0026BE8C 7C 80 07 35 */ extsh. r0, r4 /* 8026EF50 0026BE90 40 81 00 0C */ ble lbl_8026EF5C /* 8026EF54 0026BE94 7F E3 FB 78 */ mr r3, r31 -/* 8026EF58 0026BE98 48 05 FD E5 */ bl __dl +/* 8026EF58 0026BE98 48 05 FD E5 */ bl __dl__FPv lbl_8026EF5C: /* 8026EF5C 0026BE9C 7F E3 FB 78 */ mr r3, r31 /* 8026EF60 0026BEA0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/SComponent/c/m3d/g/c_m3d_g_cps.s b/asm/SComponent/c/m3d/g/c_m3d_g_cps.s index 0ac6f8088a..05d39d5541 100644 --- a/asm/SComponent/c/m3d/g/c_m3d_g_cps.s +++ b/asm/SComponent/c/m3d/g/c_m3d_g_cps.s @@ -32,7 +32,7 @@ lbl_8026EFD8: /* 8026EFD8 0026BF18 7C 80 07 35 */ extsh. r0, r4 /* 8026EFDC 0026BF1C 40 81 00 0C */ ble lbl_8026EFE8 /* 8026EFE0 0026BF20 7F E3 FB 78 */ mr r3, r31 -/* 8026EFE4 0026BF24 48 05 FD 59 */ bl __dl +/* 8026EFE4 0026BF24 48 05 FD 59 */ bl __dl__FPv lbl_8026EFE8: /* 8026EFE8 0026BF28 7F E3 FB 78 */ mr r3, r31 /* 8026EFEC 0026BF2C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s index 1ad8fa8c42..4417d00d84 100644 --- a/asm/Z2AudioLib/Z2Audience.s +++ b/asm/Z2AudioLib/Z2Audience.s @@ -1544,7 +1544,7 @@ lbl_802BD250: /* 802BD25C 002BA19C 7F E0 07 35 */ extsh. r0, r31 /* 802BD260 002BA1A0 40 81 00 0C */ ble lbl_802BD26C /* 802BD264 002BA1A4 7F C3 F3 78 */ mr r3, r30 -/* 802BD268 002BA1A8 48 01 1A D5 */ bl __dl +/* 802BD268 002BA1A8 48 01 1A D5 */ bl __dl__FPv lbl_802BD26C: /* 802BD26C 002BA1AC 7F C3 F3 78 */ mr r3, r30 /* 802BD270 002BA1B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1568,7 +1568,7 @@ JASMemPool_NS_dtor_X5_: /* 802BD2B0 002BA1F0 7F E0 07 35 */ extsh. r0, r31 /* 802BD2B4 002BA1F4 40 81 00 0C */ ble lbl_802BD2C0 /* 802BD2B8 002BA1F8 7F C3 F3 78 */ mr r3, r30 -/* 802BD2BC 002BA1FC 48 01 1A 81 */ bl __dl +/* 802BD2BC 002BA1FC 48 01 1A 81 */ bl __dl__FPv lbl_802BD2C0: /* 802BD2C0 002BA200 7F C3 F3 78 */ mr r3, r30 /* 802BD2C4 002BA204 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2AudioArcLoader.s b/asm/Z2AudioLib/Z2AudioArcLoader.s index 22457cc52f..fb0b307066 100644 --- a/asm/Z2AudioLib/Z2AudioArcLoader.s +++ b/asm/Z2AudioLib/Z2AudioArcLoader.s @@ -106,7 +106,7 @@ lbl_802A9B9C: /* 802A9B9C 002A6ADC 7F E0 07 35 */ extsh. r0, r31 /* 802A9BA0 002A6AE0 40 81 00 0C */ ble lbl_802A9BAC /* 802A9BA4 002A6AE4 7F C3 F3 78 */ mr r3, r30 -/* 802A9BA8 002A6AE8 48 02 51 95 */ bl __dl +/* 802A9BA8 002A6AE8 48 02 51 95 */ bl __dl__FPv lbl_802A9BAC: /* 802A9BAC 002A6AEC 7F C3 F3 78 */ mr r3, r30 /* 802A9BB0 002A6AF0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s index aed923eee2..e9d083c04c 100644 --- a/asm/Z2AudioLib/Z2AudioMgr.s +++ b/asm/Z2AudioLib/Z2AudioMgr.s @@ -193,7 +193,7 @@ Z2AudioMgr_NS_init: /* 802CD51C 002CA45C 38 60 00 50 */ li r3, 0x50 /* 802CD520 002CA460 7F 64 DB 78 */ mr r4, r27 /* 802CD524 002CA464 38 A0 00 00 */ li r5, 0 -/* 802CD528 002CA468 48 00 17 71 */ bl __nw_X2_ +/* 802CD528 002CA468 48 00 17 71 */ bl __nw__FUlP7JKRHeapi /* 802CD52C 002CA46C 7C 7B 1B 79 */ or. r27, r3, r3 /* 802CD530 002CA470 41 82 00 9C */ beq lbl_802CD5CC /* 802CD534 002CA474 3C 60 80 3D */ lis r3, lbl_803C9A08@ha @@ -423,7 +423,7 @@ lbl_802CD838: /* 802CD85C 002CA79C 7F E0 07 35 */ extsh. r0, r31 /* 802CD860 002CA7A0 40 81 00 0C */ ble lbl_802CD86C /* 802CD864 002CA7A4 7F C3 F3 78 */ mr r3, r30 -/* 802CD868 002CA7A8 48 00 14 D5 */ bl __dl +/* 802CD868 002CA7A8 48 00 14 D5 */ bl __dl__FPv lbl_802CD86C: /* 802CD86C 002CA7AC 7F C3 F3 78 */ mr r3, r30 /* 802CD870 002CA7B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -679,7 +679,7 @@ lbl_802CDBDC: /* 802CDBDC 002CAB1C 7F E0 07 35 */ extsh. r0, r31 /* 802CDBE0 002CAB20 40 81 00 0C */ ble lbl_802CDBEC /* 802CDBE4 002CAB24 7F C3 F3 78 */ mr r3, r30 -/* 802CDBE8 002CAB28 48 00 11 55 */ bl __dl +/* 802CDBE8 002CAB28 48 00 11 55 */ bl __dl__FPv lbl_802CDBEC: /* 802CDBEC 002CAB2C 7F C3 F3 78 */ mr r3, r30 /* 802CDBF0 002CAB30 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index 2dde586f51..c4f07c681b 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -75,7 +75,7 @@ lbl_802C04BC: /* 802C04BC 002BD3FC 7F E0 07 35 */ extsh. r0, r31 /* 802C04C0 002BD400 40 81 00 0C */ ble lbl_802C04CC /* 802C04C4 002BD404 7F C3 F3 78 */ mr r3, r30 -/* 802C04C8 002BD408 48 00 E8 75 */ bl __dl +/* 802C04C8 002BD408 48 00 E8 75 */ bl __dl__FPv lbl_802C04CC: /* 802C04CC 002BD40C 7F C3 F3 78 */ mr r3, r30 /* 802C04D0 002BD410 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -593,7 +593,7 @@ lbl_802C0B60: /* 802C0C24 002BDB64 4B FF F7 A5 */ bl Z2Creature /* 802C0C28 002BDB68 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0C2C 002BDB6C 7F E4 FB 78 */ mr r4, r31 -/* 802C0C30 002BDB70 48 01 B1 CD */ bl JSUPtrLink +/* 802C0C30 002BDB70 48 01 B1 CD */ bl __ct__10JSUPtrLinkFPv /* 802C0C34 002BDB74 3C 60 80 3D */ lis r3, lbl_803CB890@ha /* 802C0C38 002BDB78 38 03 B8 90 */ addi r0, r3, lbl_803CB890@l /* 802C0C3C 002BDB7C 90 1F 00 00 */ stw r0, 0(r31) @@ -623,7 +623,7 @@ lbl_802C0B60: /* 802C0C9C 002BDBDC 41 82 00 10 */ beq lbl_802C0CAC /* 802C0CA0 002BDBE0 38 7E 00 90 */ addi r3, r30, 0x90 /* 802C0CA4 002BDBE4 38 80 00 00 */ li r4, 0 -/* 802C0CA8 002BDBE8 48 01 B1 6D */ bl JSUPtrLink_NS_dtor +/* 802C0CA8 002BDBE8 48 01 B1 6D */ bl __dt__10JSUPtrLinkFv lbl_802C0CAC: /* 802C0CAC 002BDBEC 7F C3 F3 78 */ mr r3, r30 /* 802C0CB0 002BDBF0 38 80 00 00 */ li r4, 0 @@ -631,7 +631,7 @@ lbl_802C0CAC: /* 802C0CB8 002BDBF8 7F E0 07 35 */ extsh. r0, r31 /* 802C0CBC 002BDBFC 40 81 00 0C */ ble lbl_802C0CC8 /* 802C0CC0 002BDC00 7F C3 F3 78 */ mr r3, r30 -/* 802C0CC4 002BDC04 48 00 E0 79 */ bl __dl +/* 802C0CC4 002BDC04 48 00 E0 79 */ bl __dl__FPv lbl_802C0CC8: /* 802C0CC8 002BDC08 7F C3 F3 78 */ mr r3, r30 /* 802C0CCC 002BDC0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -827,7 +827,7 @@ Z2CreatureEnemy: /* 802C0F78 002BDEB8 4B FF F4 51 */ bl Z2Creature /* 802C0F7C 002BDEBC 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C0F80 002BDEC0 7F E4 FB 78 */ mr r4, r31 -/* 802C0F84 002BDEC4 48 01 AE 79 */ bl JSUPtrLink +/* 802C0F84 002BDEC4 48 01 AE 79 */ bl __ct__10JSUPtrLinkFPv /* 802C0F88 002BDEC8 3C 60 80 3D */ lis r3, lbl_803CB860@ha /* 802C0F8C 002BDECC 38 03 B8 60 */ addi r0, r3, lbl_803CB860@l /* 802C0F90 002BDED0 90 1F 00 00 */ stw r0, 0(r31) @@ -975,7 +975,7 @@ lbl_802C10F8: /* 802C11AC 002BE0EC 38 9D 00 90 */ addi r4, r29, 0x90 lbl_802C11B0: /* 802C11B0 002BE0F0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802C11B4 002BE0F4 48 01 AF A9 */ bl JSUPtrList_NS_remove +/* 802C11B4 002BE0F4 48 01 AF A9 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802C11B8 002BE0F8 48 00 01 3C */ b lbl_802C12F4 lbl_802C11BC: /* 802C11BC 002BE0FC 88 1D 00 A3 */ lbz r0, 0xa3(r29) @@ -991,7 +991,7 @@ lbl_802C11BC: /* 802C11E4 002BE124 38 9D 00 90 */ addi r4, r29, 0x90 lbl_802C11E8: /* 802C11E8 002BE128 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802C11EC 002BE12C 48 01 AD 61 */ bl JSUPtrList_NS_append +/* 802C11EC 002BE12C 48 01 AD 61 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802C11F0 002BE130 48 00 01 04 */ b lbl_802C12F4 /* 802C11F4 002BE134 28 1F 00 00 */ cmplwi r31, 0 /* 802C11F8 002BE138 41 82 00 FC */ beq lbl_802C12F4 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index 46942c84ce..07587b1c0a 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -28,7 +28,7 @@ lbl_802C58DC: /* 802C58DC 002C281C 7F E0 07 35 */ extsh. r0, r31 /* 802C58E0 002C2820 40 81 00 0C */ ble lbl_802C58EC /* 802C58E4 002C2824 7F C3 F3 78 */ mr r3, r30 -/* 802C58E8 002C2828 48 00 94 55 */ bl __dl +/* 802C58E8 002C2828 48 00 94 55 */ bl __dl__FPv lbl_802C58EC: /* 802C58EC 002C282C 7F C3 F3 78 */ mr r3, r30 /* 802C58F0 002C2830 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -334,7 +334,7 @@ Z2EnvSeDir_NS_dtor: /* 802C5D44 002C2C84 7F E0 07 35 */ extsh. r0, r31 /* 802C5D48 002C2C88 40 81 00 0C */ ble lbl_802C5D54 /* 802C5D4C 002C2C8C 7F C3 F3 78 */ mr r3, r30 -/* 802C5D50 002C2C90 48 00 8F ED */ bl __dl +/* 802C5D50 002C2C90 48 00 8F ED */ bl __dl__FPv lbl_802C5D54: /* 802C5D54 002C2C94 7F C3 F3 78 */ mr r3, r30 /* 802C5D58 002C2C98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -483,7 +483,7 @@ Z2EnvSeAutoPan_NS_dtor: /* 802C5F50 002C2E90 7F E0 07 35 */ extsh. r0, r31 /* 802C5F54 002C2E94 40 81 00 0C */ ble lbl_802C5F60 /* 802C5F58 002C2E98 7F C3 F3 78 */ mr r3, r30 -/* 802C5F5C 002C2E9C 48 00 8D E1 */ bl __dl +/* 802C5F5C 002C2E9C 48 00 8D E1 */ bl __dl__FPv lbl_802C5F60: /* 802C5F60 002C2EA0 7F C3 F3 78 */ mr r3, r30 /* 802C5F64 002C2EA4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -965,7 +965,7 @@ lbl_802C6684: /* 802C6684 002C35C4 7F E0 07 35 */ extsh. r0, r31 /* 802C6688 002C35C8 40 81 00 0C */ ble lbl_802C6694 /* 802C668C 002C35CC 7F C3 F3 78 */ mr r3, r30 -/* 802C6690 002C35D0 48 00 86 AD */ bl __dl +/* 802C6690 002C35D0 48 00 86 AD */ bl __dl__FPv lbl_802C6694: /* 802C6694 002C35D4 7F C3 F3 78 */ mr r3, r30 /* 802C6698 002C35D8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2FxLineMgr.s b/asm/Z2AudioLib/Z2FxLineMgr.s index d0968b3a8c..8a7b3901b8 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr.s +++ b/asm/Z2AudioLib/Z2FxLineMgr.s @@ -27,22 +27,22 @@ Z2FxLineMgr_NS_initDataArc: /* 802BA81C 002B775C 38 60 28 00 */ li r3, 0x2800 /* 802BA820 002B7760 7E C4 B3 78 */ mr r4, r22 /* 802BA824 002B7764 38 A0 00 20 */ li r5, 0x20 -/* 802BA828 002B7768 48 01 44 E9 */ bl __nwa_X2_ +/* 802BA828 002B7768 48 01 44 E9 */ bl __nwa__FUlP7JKRHeapi /* 802BA82C 002B776C 90 77 00 04 */ stw r3, 4(r23) /* 802BA830 002B7770 38 60 28 00 */ li r3, 0x2800 /* 802BA834 002B7774 7E C4 B3 78 */ mr r4, r22 /* 802BA838 002B7778 38 A0 00 20 */ li r5, 0x20 -/* 802BA83C 002B777C 48 01 44 D5 */ bl __nwa_X2_ +/* 802BA83C 002B777C 48 01 44 D5 */ bl __nwa__FUlP7JKRHeapi /* 802BA840 002B7780 90 77 00 08 */ stw r3, 8(r23) /* 802BA844 002B7784 38 60 4B 00 */ li r3, 0x4b00 /* 802BA848 002B7788 7E C4 B3 78 */ mr r4, r22 /* 802BA84C 002B778C 38 A0 00 20 */ li r5, 0x20 -/* 802BA850 002B7790 48 01 44 C1 */ bl __nwa_X2_ +/* 802BA850 002B7790 48 01 44 C1 */ bl __nwa__FUlP7JKRHeapi /* 802BA854 002B7794 90 77 00 0C */ stw r3, 0xc(r23) /* 802BA858 002B7798 38 60 4B 00 */ li r3, 0x4b00 /* 802BA85C 002B779C 7E C4 B3 78 */ mr r4, r22 /* 802BA860 002B77A0 38 A0 00 20 */ li r5, 0x20 -/* 802BA864 002B77A4 48 01 44 AD */ bl __nwa_X2_ +/* 802BA864 002B77A4 48 01 44 AD */ bl __nwa__FUlP7JKRHeapi /* 802BA868 002B77A8 90 77 00 10 */ stw r3, 0x10(r23) /* 802BA86C 002B77AC 7F 03 C3 78 */ mr r3, r24 /* 802BA870 002B77B0 48 01 B8 9D */ bl JKRArchive_NS_countResource @@ -51,7 +51,7 @@ Z2FxLineMgr_NS_initDataArc: /* 802BA87C 002B77BC 1C 60 00 30 */ mulli r3, r0, 0x30 /* 802BA880 002B77C0 7E C4 B3 78 */ mr r4, r22 /* 802BA884 002B77C4 38 A0 00 00 */ li r5, 0 -/* 802BA888 002B77C8 48 01 44 89 */ bl __nwa_X2_ +/* 802BA888 002B77C8 48 01 44 89 */ bl __nwa__FUlP7JKRHeapi /* 802BA88C 002B77CC 90 77 00 00 */ stw r3, 0(r23) /* 802BA890 002B77D0 3B 40 00 00 */ li r26, 0 /* 802BA894 002B77D4 3A C1 00 08 */ addi r22, r1, 8 @@ -257,7 +257,7 @@ lbl_802BA8BC: /* 802BABB0 002B7AF0 48 02 16 E9 */ bl JSUInputStream_NS_read /* 802BABB4 002B7AF4 7F 23 CB 78 */ mr r3, r25 /* 802BABB8 002B7AF8 38 80 00 00 */ li r4, 0 -/* 802BABBC 002B7AFC 48 01 39 45 */ bl JKRHeap_NS_free +/* 802BABBC 002B7AFC 48 01 39 45 */ bl free__7JKRHeapFPvP7JKRHeap /* 802BABC0 002B7B00 93 E1 00 08 */ stw r31, 8(r1) /* 802BABC4 002B7B04 93 C1 00 08 */ stw r30, 8(r1) /* 802BABC8 002B7B08 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s index b0a66a8e71..64efa28e7c 100644 --- a/asm/Z2AudioLib/Z2LinkMgr.s +++ b/asm/Z2AudioLib/Z2LinkMgr.s @@ -205,7 +205,7 @@ lbl_802C34D4: /* 802C34D4 002C0414 7F E0 07 35 */ extsh. r0, r31 /* 802C34D8 002C0418 40 81 00 0C */ ble lbl_802C34E4 /* 802C34DC 002C041C 7F C3 F3 78 */ mr r3, r30 -/* 802C34E0 002C0420 48 00 B8 5D */ bl __dl +/* 802C34E0 002C0420 48 00 B8 5D */ bl __dl__FPv lbl_802C34E4: /* 802C34E4 002C0424 7F C3 F3 78 */ mr r3, r30 /* 802C34E8 002C0428 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -275,7 +275,7 @@ lbl_802C35C0: /* 802C35CC 002C050C 7F C0 07 35 */ extsh. r0, r30 /* 802C35D0 002C0510 40 81 00 0C */ ble lbl_802C35DC /* 802C35D4 002C0514 7F E3 FB 78 */ mr r3, r31 -/* 802C35D8 002C0518 48 00 B7 65 */ bl __dl +/* 802C35D8 002C0518 48 00 B7 65 */ bl __dl__FPv lbl_802C35DC: /* 802C35DC 002C051C 7F E3 FB 78 */ mr r3, r31 /* 802C35E0 002C0520 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2192,7 +2192,7 @@ lbl_802C50E8: /* 802C50E8 002C2028 7F E0 07 35 */ extsh. r0, r31 /* 802C50EC 002C202C 40 81 00 0C */ ble lbl_802C50F8 /* 802C50F0 002C2030 7F C3 F3 78 */ mr r3, r30 -/* 802C50F4 002C2034 48 00 9C 49 */ bl __dl +/* 802C50F4 002C2034 48 00 9C 49 */ bl __dl__FPv lbl_802C50F8: /* 802C50F8 002C2038 7F C3 F3 78 */ mr r3, r30 /* 802C50FC 002C203C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2252,7 +2252,7 @@ lbl_802C51B4: /* 802C51C0 002C2100 7F E0 07 35 */ extsh. r0, r31 /* 802C51C4 002C2104 40 81 00 0C */ ble lbl_802C51D0 /* 802C51C8 002C2108 7F C3 F3 78 */ mr r3, r30 -/* 802C51CC 002C210C 48 00 9B 71 */ bl __dl +/* 802C51CC 002C210C 48 00 9B 71 */ bl __dl__FPv lbl_802C51D0: /* 802C51D0 002C2110 7F C3 F3 78 */ mr r3, r30 /* 802C51D4 002C2114 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2SeMgr.s b/asm/Z2AudioLib/Z2SeMgr.s index cf9da172f3..91a48e2eab 100644 --- a/asm/Z2AudioLib/Z2SeMgr.s +++ b/asm/Z2AudioLib/Z2SeMgr.s @@ -3785,7 +3785,7 @@ Z2MultiSeMgr_NS_dtor: /* 802AEB48 002ABA88 41 82 00 10 */ beq lbl_802AEB58 /* 802AEB4C 002ABA8C 7C 80 07 35 */ extsh. r0, r4 /* 802AEB50 002ABA90 40 81 00 08 */ ble lbl_802AEB58 -/* 802AEB54 002ABA94 48 02 01 E9 */ bl __dl +/* 802AEB54 002ABA94 48 02 01 E9 */ bl __dl__FPv lbl_802AEB58: /* 802AEB58 002ABA98 7F E3 FB 78 */ mr r3, r31 /* 802AEB5C 002ABA9C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2SoundHandles.s b/asm/Z2AudioLib/Z2SoundHandles.s index 6268a5e149..33ae5a9c6d 100644 --- a/asm/Z2AudioLib/Z2SoundHandles.s +++ b/asm/Z2AudioLib/Z2SoundHandles.s @@ -10,7 +10,7 @@ Z2SoundHandles: /* 802AB084 002A7FC4 90 01 00 14 */ stw r0, 0x14(r1) /* 802AB088 002A7FC8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AB08C 002A7FCC 7C 7F 1B 78 */ mr r31, r3 -/* 802AB090 002A7FD0 48 03 0E 85 */ bl JSUPtrList_NS_initiate +/* 802AB090 002A7FD0 48 03 0E 85 */ bl initiate__10JSUPtrListFv /* 802AB094 002A7FD4 38 00 00 00 */ li r0, 0 /* 802AB098 002A7FD8 98 1F 00 0C */ stb r0, 0xc(r31) /* 802AB09C 002A7FDC 7F E3 FB 78 */ mr r3, r31 @@ -35,12 +35,12 @@ Z2SoundHandles_NS_dtor: /* 802AB0DC 002A801C 41 82 00 10 */ beq lbl_802AB0EC /* 802AB0E0 002A8020 7F C3 F3 78 */ mr r3, r30 /* 802AB0E4 002A8024 38 80 00 00 */ li r4, 0 -/* 802AB0E8 002A8028 48 03 0D C5 */ bl JSUPtrList_NS_dtor +/* 802AB0E8 002A8028 48 03 0D C5 */ bl __dt__10JSUPtrListFv lbl_802AB0EC: /* 802AB0EC 002A802C 7F E0 07 35 */ extsh. r0, r31 /* 802AB0F0 002A8030 40 81 00 0C */ ble lbl_802AB0FC /* 802AB0F4 002A8034 7F C3 F3 78 */ mr r3, r30 -/* 802AB0F8 002A8038 48 02 3C 45 */ bl __dl +/* 802AB0F8 002A8038 48 02 3C 45 */ bl __dl__FPv lbl_802AB0FC: /* 802AB0FC 002A803C 7F C3 F3 78 */ mr r3, r30 /* 802AB100 002A8040 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -72,14 +72,14 @@ lbl_802AB13C: /* 802AB14C 002A808C 38 9E 00 04 */ addi r4, r30, 4 lbl_802AB150: /* 802AB150 002A8090 7F E3 FB 78 */ mr r3, r31 -/* 802AB154 002A8094 48 03 10 09 */ bl JSUPtrList_NS_remove +/* 802AB154 002A8094 48 03 10 09 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802AB158 002A8098 28 1E 00 00 */ cmplwi r30, 0 /* 802AB15C 002A809C 41 82 00 78 */ beq lbl_802AB1D4 /* 802AB160 002A80A0 34 1E 00 04 */ addic. r0, r30, 4 /* 802AB164 002A80A4 41 82 00 10 */ beq lbl_802AB174 /* 802AB168 002A80A8 38 7E 00 04 */ addi r3, r30, 4 /* 802AB16C 002A80AC 38 80 00 00 */ li r4, 0 -/* 802AB170 002A80B0 48 03 0C A5 */ bl JSUPtrLink_NS_dtor +/* 802AB170 002A80B0 48 03 0C A5 */ bl __dt__10JSUPtrLinkFv lbl_802AB174: /* 802AB174 002A80B4 28 1E 00 00 */ cmplwi r30, 0 /* 802AB178 002A80B8 41 82 00 0C */ beq lbl_802AB184 @@ -136,7 +136,7 @@ JASMemPool_NS_dtor_X4_: /* 802AB228 002A8168 7F E0 07 35 */ extsh. r0, r31 /* 802AB22C 002A816C 40 81 00 0C */ ble lbl_802AB238 /* 802AB230 002A8170 7F C3 F3 78 */ mr r3, r30 -/* 802AB234 002A8174 48 02 3B 09 */ bl __dl +/* 802AB234 002A8174 48 02 3B 09 */ bl __dl__FPv lbl_802AB238: /* 802AB238 002A8178 7F C3 F3 78 */ mr r3, r30 /* 802AB23C 002A817C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -245,7 +245,7 @@ lbl_802AB364: /* 802AB380 002A82C0 90 03 00 00 */ stw r0, 0(r3) /* 802AB384 002A82C4 7C 64 1B 78 */ mr r4, r3 /* 802AB388 002A82C8 38 64 00 04 */ addi r3, r4, 4 -/* 802AB38C 002A82CC 48 03 0A 71 */ bl JSUPtrLink +/* 802AB38C 002A82CC 48 03 0A 71 */ bl __ct__10JSUPtrLinkFPv lbl_802AB390: /* 802AB390 002A82D0 28 1E 00 00 */ cmplwi r30, 0 /* 802AB394 002A82D4 41 82 00 20 */ beq lbl_802AB3B4 @@ -254,7 +254,7 @@ lbl_802AB390: /* 802AB3A0 002A82E0 38 9E 00 04 */ addi r4, r30, 4 lbl_802AB3A4: /* 802AB3A4 002A82E4 7F E3 FB 78 */ mr r3, r31 -/* 802AB3A8 002A82E8 48 03 0B A5 */ bl JSUPtrList_NS_append +/* 802AB3A8 002A82E8 48 03 0B A5 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802AB3AC 002A82EC 7F C3 F3 78 */ mr r3, r30 /* 802AB3B0 002A82F0 48 00 00 08 */ b lbl_802AB3B8 lbl_802AB3B4: @@ -411,14 +411,14 @@ lbl_802AB594: /* 802AB5A0 002A84E0 38 9F 00 04 */ addi r4, r31, 4 lbl_802AB5A4: /* 802AB5A4 002A84E4 7F 83 E3 78 */ mr r3, r28 -/* 802AB5A8 002A84E8 48 03 0B B5 */ bl JSUPtrList_NS_remove +/* 802AB5A8 002A84E8 48 03 0B B5 */ bl remove__10JSUPtrListFP10JSUPtrLink /* 802AB5AC 002A84EC 28 1F 00 00 */ cmplwi r31, 0 /* 802AB5B0 002A84F0 41 82 00 78 */ beq lbl_802AB628 /* 802AB5B4 002A84F4 34 1F 00 04 */ addic. r0, r31, 4 /* 802AB5B8 002A84F8 41 82 00 10 */ beq lbl_802AB5C8 /* 802AB5BC 002A84FC 38 7F 00 04 */ addi r3, r31, 4 /* 802AB5C0 002A8500 38 80 00 00 */ li r4, 0 -/* 802AB5C4 002A8504 48 03 08 51 */ bl JSUPtrLink_NS_dtor +/* 802AB5C4 002A8504 48 03 08 51 */ bl __dt__10JSUPtrLinkFv lbl_802AB5C8: /* 802AB5C8 002A8508 28 1F 00 00 */ cmplwi r31, 0 /* 802AB5CC 002A850C 41 82 00 0C */ beq lbl_802AB5D8 diff --git a/asm/Z2AudioLib/Z2SoundInfo.s b/asm/Z2AudioLib/Z2SoundInfo.s index c471df397c..33e2d843f1 100644 --- a/asm/Z2AudioLib/Z2SoundInfo.s +++ b/asm/Z2AudioLib/Z2SoundInfo.s @@ -898,7 +898,7 @@ lbl_802BBC84: /* 802BBC90 002B8BD0 7F E0 07 35 */ extsh. r0, r31 /* 802BBC94 002B8BD4 40 81 00 0C */ ble lbl_802BBCA0 /* 802BBC98 002B8BD8 7F C3 F3 78 */ mr r3, r30 -/* 802BBC9C 002B8BDC 48 01 30 A1 */ bl __dl +/* 802BBC9C 002B8BDC 48 01 30 A1 */ bl __dl__FPv lbl_802BBCA0: /* 802BBCA0 002B8BE0 7F C3 F3 78 */ mr r3, r30 /* 802BBCA4 002B8BE4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s index 628b80e4b3..8ca400135e 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr.s @@ -11,7 +11,7 @@ Z2SoundObjMgr: /* 802BF92C 002BC86C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BF930 002BC870 7C 7F 1B 78 */ mr r31, r3 /* 802BF934 002BC874 93 ED 85 C8 */ stw r31, lbl_80450B48-_SDA_BASE_(r13) -/* 802BF938 002BC878 48 01 C5 DD */ bl JSUPtrList_NS_initiate +/* 802BF938 002BC878 48 01 C5 DD */ bl initiate__10JSUPtrListFv /* 802BF93C 002BC87C 38 00 00 00 */ li r0, 0 /* 802BF940 002BC880 98 1F 00 19 */ stb r0, 0x19(r31) /* 802BF944 002BC884 98 1F 00 1B */ stb r0, 0x1b(r31) @@ -550,7 +550,7 @@ lbl_802C00A8: /* 802C00BC 002BCFFC 40 82 00 18 */ bne lbl_802C00D4 /* 802C00C0 002BD000 7F 63 DB 78 */ mr r3, r27 /* 802C00C4 002BD004 7F A4 EB 78 */ mr r4, r29 -/* 802C00C8 002BD008 48 01 BE 85 */ bl JSUPtrList_NS_append +/* 802C00C8 002BD008 48 01 BE 85 */ bl append__10JSUPtrListFP10JSUPtrLink /* 802C00CC 002BD00C 7F C3 F3 78 */ mr r3, r30 /* 802C00D0 002BD010 48 00 00 18 */ b lbl_802C00E8 lbl_802C00D4: @@ -636,7 +636,7 @@ lbl_802C01AC: /* 802C01C8 002BD108 38 05 FF FF */ addi r0, r5, -1 /* 802C01CC 002BD10C 98 03 00 18 */ stb r0, 0x18(r3) lbl_802C01D0: -/* 802C01D0 002BD110 48 01 BF 8D */ bl JSUPtrList_NS_remove +/* 802C01D0 002BD110 48 01 BF 8D */ bl remove__10JSUPtrListFP10JSUPtrLink lbl_802C01D4: /* 802C01D4 002BD114 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C01D8 002BD118 7C 08 03 A6 */ mtlr r0 diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s index 6f5af8d859..dfd9f8cfe6 100644 --- a/asm/Z2AudioLib/Z2SoundObject.s +++ b/asm/Z2AudioLib/Z2SoundObject.s @@ -48,7 +48,7 @@ Z2SoundObjBase_NS_dtor: /* 802BDF84 002BAEC4 7F E0 07 35 */ extsh. r0, r31 /* 802BDF88 002BAEC8 40 81 00 0C */ ble lbl_802BDF94 /* 802BDF8C 002BAECC 7F C3 F3 78 */ mr r3, r30 -/* 802BDF90 002BAED0 48 01 0D AD */ bl __dl +/* 802BDF90 002BAED0 48 01 0D AD */ bl __dl__FPv lbl_802BDF94: /* 802BDF94 002BAED4 7F C3 F3 78 */ mr r3, r30 /* 802BDF98 002BAED8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -527,7 +527,7 @@ Z2DopplerSoundObjBase: /* 802BE630 002BB570 7F E0 07 35 */ extsh. r0, r31 /* 802BE634 002BB574 40 81 00 0C */ ble lbl_802BE640 /* 802BE638 002BB578 7F C3 F3 78 */ mr r3, r30 -/* 802BE63C 002BB57C 48 01 07 01 */ bl __dl +/* 802BE63C 002BB57C 48 01 07 01 */ bl __dl__FPv lbl_802BE640: /* 802BE640 002BB580 7F C3 F3 78 */ mr r3, r30 /* 802BE644 002BB584 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1025,7 +1025,7 @@ Z2SoundObjAnime_NS_ageSounds_: lbl_802BED88: /* 802BED88 002BBCC8 7F E3 FB 78 */ mr r3, r31 /* 802BED8C 002BBCCC 7F C4 F3 78 */ mr r4, r30 -/* 802BED90 002BBCD0 48 01 D4 7D */ bl JSUPtrList_NS_getNthLink +/* 802BED90 002BBCD0 48 01 D4 7D */ bl getNthLink__10JSUPtrListCFUl /* 802BED94 002BBCD4 28 03 00 00 */ cmplwi r3, 0 /* 802BED98 002BBCD8 41 82 00 08 */ beq lbl_802BEDA0 /* 802BED9C 002BBCDC 38 63 FF FC */ addi r3, r3, -4 @@ -1035,7 +1035,7 @@ lbl_802BEDA0: /* 802BEDA8 002BBCE8 41 82 01 04 */ beq lbl_802BEEAC /* 802BEDAC 002BBCEC 7F E3 FB 78 */ mr r3, r31 /* 802BEDB0 002BBCF0 7F C4 F3 78 */ mr r4, r30 -/* 802BEDB4 002BBCF4 48 01 D4 59 */ bl JSUPtrList_NS_getNthLink +/* 802BEDB4 002BBCF4 48 01 D4 59 */ bl getNthLink__10JSUPtrListCFUl /* 802BEDB8 002BBCF8 28 03 00 00 */ cmplwi r3, 0 /* 802BEDBC 002BBCFC 41 82 00 08 */ beq lbl_802BEDC4 /* 802BEDC0 002BBD00 38 63 FF FC */ addi r3, r3, -4 @@ -1051,7 +1051,7 @@ lbl_802BEDC4: lbl_802BEDE4: /* 802BEDE4 002BBD24 7F E3 FB 78 */ mr r3, r31 /* 802BEDE8 002BBD28 7F C4 F3 78 */ mr r4, r30 -/* 802BEDEC 002BBD2C 48 01 D4 21 */ bl JSUPtrList_NS_getNthLink +/* 802BEDEC 002BBD2C 48 01 D4 21 */ bl getNthLink__10JSUPtrListCFUl /* 802BEDF0 002BBD30 28 03 00 00 */ cmplwi r3, 0 /* 802BEDF4 002BBD34 41 82 00 08 */ beq lbl_802BEDFC /* 802BEDF8 002BBD38 38 63 FF FC */ addi r3, r3, -4 @@ -1062,7 +1062,7 @@ lbl_802BEDFC: /* 802BEE08 002BBD48 41 82 00 28 */ beq lbl_802BEE30 /* 802BEE0C 002BBD4C 7F E3 FB 78 */ mr r3, r31 /* 802BEE10 002BBD50 7F C4 F3 78 */ mr r4, r30 -/* 802BEE14 002BBD54 48 01 D3 F9 */ bl JSUPtrList_NS_getNthLink +/* 802BEE14 002BBD54 48 01 D3 F9 */ bl getNthLink__10JSUPtrListCFUl /* 802BEE18 002BBD58 28 03 00 00 */ cmplwi r3, 0 /* 802BEE1C 002BBD5C 41 82 00 08 */ beq lbl_802BEE24 /* 802BEE20 002BBD60 38 63 FF FC */ addi r3, r3, -4 @@ -1073,7 +1073,7 @@ lbl_802BEE24: lbl_802BEE30: /* 802BEE30 002BBD70 7F E3 FB 78 */ mr r3, r31 /* 802BEE34 002BBD74 7F C4 F3 78 */ mr r4, r30 -/* 802BEE38 002BBD78 48 01 D3 D5 */ bl JSUPtrList_NS_getNthLink +/* 802BEE38 002BBD78 48 01 D3 D5 */ bl getNthLink__10JSUPtrListCFUl /* 802BEE3C 002BBD7C 28 03 00 00 */ cmplwi r3, 0 /* 802BEE40 002BBD80 41 82 00 08 */ beq lbl_802BEE48 /* 802BEE44 002BBD84 38 63 FF FC */ addi r3, r3, -4 @@ -1085,7 +1085,7 @@ lbl_802BEE48: /* 802BEE58 002BBD98 41 82 00 28 */ beq lbl_802BEE80 /* 802BEE5C 002BBD9C 7F E3 FB 78 */ mr r3, r31 /* 802BEE60 002BBDA0 7F C4 F3 78 */ mr r4, r30 -/* 802BEE64 002BBDA4 48 01 D3 A9 */ bl JSUPtrList_NS_getNthLink +/* 802BEE64 002BBDA4 48 01 D3 A9 */ bl getNthLink__10JSUPtrListCFUl /* 802BEE68 002BBDA8 28 03 00 00 */ cmplwi r3, 0 /* 802BEE6C 002BBDAC 41 82 00 08 */ beq lbl_802BEE74 /* 802BEE70 002BBDB0 38 63 FF FC */ addi r3, r3, -4 @@ -1096,7 +1096,7 @@ lbl_802BEE74: lbl_802BEE80: /* 802BEE80 002BBDC0 7F E3 FB 78 */ mr r3, r31 /* 802BEE84 002BBDC4 7F C4 F3 78 */ mr r4, r30 -/* 802BEE88 002BBDC8 48 01 D3 85 */ bl JSUPtrList_NS_getNthLink +/* 802BEE88 002BBDC8 48 01 D3 85 */ bl getNthLink__10JSUPtrListCFUl /* 802BEE8C 002BBDCC 28 03 00 00 */ cmplwi r3, 0 /* 802BEE90 002BBDD0 41 82 00 08 */ beq lbl_802BEE98 /* 802BEE94 002BBDD4 38 63 FF FC */ addi r3, r3, -4 @@ -1138,7 +1138,7 @@ Z2SoundObjAnime_NS_updateAnime: lbl_802BEF0C: /* 802BEF0C 002BBE4C 7F E3 FB 78 */ mr r3, r31 /* 802BEF10 002BBE50 7F C4 F3 78 */ mr r4, r30 -/* 802BEF14 002BBE54 48 01 D2 F9 */ bl JSUPtrList_NS_getNthLink +/* 802BEF14 002BBE54 48 01 D2 F9 */ bl getNthLink__10JSUPtrListCFUl /* 802BEF18 002BBE58 28 03 00 00 */ cmplwi r3, 0 /* 802BEF1C 002BBE5C 41 82 00 08 */ beq lbl_802BEF24 /* 802BEF20 002BBE60 38 63 FF FC */ addi r3, r3, -4 @@ -1148,7 +1148,7 @@ lbl_802BEF24: /* 802BEF2C 002BBE6C 41 82 00 70 */ beq lbl_802BEF9C /* 802BEF30 002BBE70 7F E3 FB 78 */ mr r3, r31 /* 802BEF34 002BBE74 7F C4 F3 78 */ mr r4, r30 -/* 802BEF38 002BBE78 48 01 D2 D5 */ bl JSUPtrList_NS_getNthLink +/* 802BEF38 002BBE78 48 01 D2 D5 */ bl getNthLink__10JSUPtrListCFUl /* 802BEF3C 002BBE7C 28 03 00 00 */ cmplwi r3, 0 /* 802BEF40 002BBE80 41 82 00 08 */ beq lbl_802BEF48 /* 802BEF44 002BBE84 38 63 FF FC */ addi r3, r3, -4 @@ -1160,7 +1160,7 @@ lbl_802BEF48: /* 802BEF58 002BBE98 83 BF 00 18 */ lwz r29, 0x18(r31) /* 802BEF5C 002BBE9C 7F E3 FB 78 */ mr r3, r31 /* 802BEF60 002BBEA0 7F C4 F3 78 */ mr r4, r30 -/* 802BEF64 002BBEA4 48 01 D2 A9 */ bl JSUPtrList_NS_getNthLink +/* 802BEF64 002BBEA4 48 01 D2 A9 */ bl getNthLink__10JSUPtrListCFUl /* 802BEF68 002BBEA8 28 03 00 00 */ cmplwi r3, 0 /* 802BEF6C 002BBEAC 41 82 00 08 */ beq lbl_802BEF74 /* 802BEF70 002BBEB0 38 63 FF FC */ addi r3, r3, -4 @@ -1450,7 +1450,7 @@ Z2SoundObjAnime_NS_updateSoundLifeTime_: lbl_802BF348: /* 802BF348 002BC288 7F E3 FB 78 */ mr r3, r31 /* 802BF34C 002BC28C 7F C4 F3 78 */ mr r4, r30 -/* 802BF350 002BC290 48 01 CE BD */ bl JSUPtrList_NS_getNthLink +/* 802BF350 002BC290 48 01 CE BD */ bl getNthLink__10JSUPtrListCFUl /* 802BF354 002BC294 28 03 00 00 */ cmplwi r3, 0 /* 802BF358 002BC298 41 82 00 08 */ beq lbl_802BF360 /* 802BF35C 002BC29C 38 63 FF FC */ addi r3, r3, -4 @@ -1460,7 +1460,7 @@ lbl_802BF360: /* 802BF368 002BC2A8 41 82 02 C0 */ beq lbl_802BF628 /* 802BF36C 002BC2AC 7F E3 FB 78 */ mr r3, r31 /* 802BF370 002BC2B0 7F C4 F3 78 */ mr r4, r30 -/* 802BF374 002BC2B4 48 01 CE 99 */ bl JSUPtrList_NS_getNthLink +/* 802BF374 002BC2B4 48 01 CE 99 */ bl getNthLink__10JSUPtrListCFUl /* 802BF378 002BC2B8 28 03 00 00 */ cmplwi r3, 0 /* 802BF37C 002BC2BC 41 82 00 08 */ beq lbl_802BF384 /* 802BF380 002BC2C0 38 63 FF FC */ addi r3, r3, -4 @@ -1476,7 +1476,7 @@ lbl_802BF384: lbl_802BF3A4: /* 802BF3A4 002BC2E4 7F E3 FB 78 */ mr r3, r31 /* 802BF3A8 002BC2E8 7F C4 F3 78 */ mr r4, r30 -/* 802BF3AC 002BC2EC 48 01 CE 61 */ bl JSUPtrList_NS_getNthLink +/* 802BF3AC 002BC2EC 48 01 CE 61 */ bl getNthLink__10JSUPtrListCFUl /* 802BF3B0 002BC2F0 28 03 00 00 */ cmplwi r3, 0 /* 802BF3B4 002BC2F4 41 82 00 08 */ beq lbl_802BF3BC /* 802BF3B8 002BC2F8 38 63 FF FC */ addi r3, r3, -4 @@ -1499,7 +1499,7 @@ lbl_802BF3E4: /* 802BF3F4 002BC334 41 82 00 34 */ beq lbl_802BF428 /* 802BF3F8 002BC338 7F E3 FB 78 */ mr r3, r31 /* 802BF3FC 002BC33C 7F C4 F3 78 */ mr r4, r30 -/* 802BF400 002BC340 48 01 CE 0D */ bl JSUPtrList_NS_getNthLink +/* 802BF400 002BC340 48 01 CE 0D */ bl getNthLink__10JSUPtrListCFUl /* 802BF404 002BC344 28 03 00 00 */ cmplwi r3, 0 /* 802BF408 002BC348 41 82 00 08 */ beq lbl_802BF410 /* 802BF40C 002BC34C 38 63 FF FC */ addi r3, r3, -4 @@ -1542,7 +1542,7 @@ lbl_802BF484: /* 802BF488 002BC3C8 41 82 00 64 */ beq lbl_802BF4EC /* 802BF48C 002BC3CC 7F E3 FB 78 */ mr r3, r31 /* 802BF490 002BC3D0 7F C4 F3 78 */ mr r4, r30 -/* 802BF494 002BC3D4 48 01 CD 79 */ bl JSUPtrList_NS_getNthLink +/* 802BF494 002BC3D4 48 01 CD 79 */ bl getNthLink__10JSUPtrListCFUl /* 802BF498 002BC3D8 28 03 00 00 */ cmplwi r3, 0 /* 802BF49C 002BC3DC 41 82 00 08 */ beq lbl_802BF4A4 /* 802BF4A0 002BC3E0 38 63 FF FC */ addi r3, r3, -4 @@ -1556,7 +1556,7 @@ lbl_802BF4A4: lbl_802BF4BC: /* 802BF4BC 002BC3FC 7F E3 FB 78 */ mr r3, r31 /* 802BF4C0 002BC400 7F C4 F3 78 */ mr r4, r30 -/* 802BF4C4 002BC404 48 01 CD 49 */ bl JSUPtrList_NS_getNthLink +/* 802BF4C4 002BC404 48 01 CD 49 */ bl getNthLink__10JSUPtrListCFUl /* 802BF4C8 002BC408 28 03 00 00 */ cmplwi r3, 0 /* 802BF4CC 002BC40C 41 82 00 08 */ beq lbl_802BF4D4 /* 802BF4D0 002BC410 38 63 FF FC */ addi r3, r3, -4 @@ -1570,7 +1570,7 @@ lbl_802BF4D4: lbl_802BF4EC: /* 802BF4EC 002BC42C 7F E3 FB 78 */ mr r3, r31 /* 802BF4F0 002BC430 7F C4 F3 78 */ mr r4, r30 -/* 802BF4F4 002BC434 48 01 CD 19 */ bl JSUPtrList_NS_getNthLink +/* 802BF4F4 002BC434 48 01 CD 19 */ bl getNthLink__10JSUPtrListCFUl /* 802BF4F8 002BC438 28 03 00 00 */ cmplwi r3, 0 /* 802BF4FC 002BC43C 41 82 00 08 */ beq lbl_802BF504 /* 802BF500 002BC440 38 63 FF FC */ addi r3, r3, -4 @@ -1583,7 +1583,7 @@ lbl_802BF510: /* 802BF514 002BC454 41 82 00 28 */ beq lbl_802BF53C /* 802BF518 002BC458 7F E3 FB 78 */ mr r3, r31 /* 802BF51C 002BC45C 7F C4 F3 78 */ mr r4, r30 -/* 802BF520 002BC460 48 01 CC ED */ bl JSUPtrList_NS_getNthLink +/* 802BF520 002BC460 48 01 CC ED */ bl getNthLink__10JSUPtrListCFUl /* 802BF524 002BC464 28 03 00 00 */ cmplwi r3, 0 /* 802BF528 002BC468 41 82 00 08 */ beq lbl_802BF530 /* 802BF52C 002BC46C 38 63 FF FC */ addi r3, r3, -4 @@ -1653,7 +1653,7 @@ lbl_802BF600: /* 802BF604 002BC544 41 82 00 24 */ beq lbl_802BF628 /* 802BF608 002BC548 7F E3 FB 78 */ mr r3, r31 /* 802BF60C 002BC54C 7F C4 F3 78 */ mr r4, r30 -/* 802BF610 002BC550 48 01 CB FD */ bl JSUPtrList_NS_getNthLink +/* 802BF610 002BC550 48 01 CB FD */ bl getNthLink__10JSUPtrListCFUl /* 802BF614 002BC554 28 03 00 00 */ cmplwi r3, 0 /* 802BF618 002BC558 41 82 00 08 */ beq lbl_802BF620 /* 802BF61C 002BC55C 38 63 FF FC */ addi r3, r3, -4 diff --git a/asm/Z2AudioLib/Z2SoundStarter.s b/asm/Z2AudioLib/Z2SoundStarter.s index fd40c173f7..197daac99f 100644 --- a/asm/Z2AudioLib/Z2SoundStarter.s +++ b/asm/Z2AudioLib/Z2SoundStarter.s @@ -345,7 +345,7 @@ lbl_802AB044: /* 802AB050 002A7F90 7F E0 07 35 */ extsh. r0, r31 /* 802AB054 002A7F94 40 81 00 0C */ ble lbl_802AB060 /* 802AB058 002A7F98 7F C3 F3 78 */ mr r3, r30 -/* 802AB05C 002A7F9C 48 02 3C E1 */ bl __dl +/* 802AB05C 002A7F9C 48 02 3C E1 */ bl __dl__FPv lbl_802AB060: /* 802AB060 002A7FA0 7F C3 F3 78 */ mr r3, r30 /* 802AB064 002A7FA4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/Z2AudioLib/Z2SpeechMgr2.s b/asm/Z2AudioLib/Z2SpeechMgr2.s index 3f575a411c..1488f19e6c 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2.s @@ -75,7 +75,7 @@ lbl_802CBD5C: /* 802CBD5C 002C8C9C 7F E0 07 35 */ extsh. r0, r31 /* 802CBD60 002C8CA0 40 81 00 0C */ ble lbl_802CBD6C /* 802CBD64 002C8CA4 7F C3 F3 78 */ mr r3, r30 -/* 802CBD68 002C8CA8 48 00 2F D5 */ bl __dl +/* 802CBD68 002C8CA8 48 00 2F D5 */ bl __dl__FPv lbl_802CBD6C: /* 802CBD6C 002C8CAC 7F C3 F3 78 */ mr r3, r30 /* 802CBD70 002C8CB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/c/c_damagereaction.s b/asm/c/c_damagereaction.s index 64d0c606f9..b282c5d017 100644 --- a/asm/c/c_damagereaction.s +++ b/asm/c/c_damagereaction.s @@ -133,7 +133,7 @@ JPTraceParticleCallBack4_NS_dtor: /* 8001835C 0001529C 7F E0 07 35 */ extsh. r0, r31 /* 80018360 000152A0 40 81 00 0C */ ble lbl_8001836C /* 80018364 000152A4 7F C3 F3 78 */ mr r3, r30 -/* 80018368 000152A8 48 2B 69 D5 */ bl __dl +/* 80018368 000152A8 48 2B 69 D5 */ bl __dl__FPv lbl_8001836C: /* 8001836C 000152AC 7F C3 F3 78 */ mr r3, r30 /* 80018370 000152B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/c/c_dylink.s b/asm/c/c_dylink.s index 8b4d4d3a6b..51f0604f30 100644 --- a/asm/c/c_dylink.s +++ b/asm/c/c_dylink.s @@ -17,7 +17,7 @@ cCc_Init: /* 80018400 00015340 38 A0 00 00 */ li r5, 0 /* 80018404 00015344 48 2B 86 21 */ bl JKRSolidHeap_NS_create /* 80018408 00015348 7C 7E 1B 78 */ mr r30, r3 -/* 8001840C 0001534C 48 2B 60 2D */ bl JKRHeap_NS_becomeCurrentHeap +/* 8001840C 0001534C 48 2B 60 2D */ bl becomeCurrentHeap__7JKRHeapFv /* 80018410 00015350 7C 7D 1B 78 */ mr r29, r3 /* 80018414 00015354 3C 60 80 3F */ lis r3, lbl_803F0F50@ha /* 80018418 00015358 38 63 0F 50 */ addi r3, r3, lbl_803F0F50@l @@ -71,7 +71,7 @@ lbl_800184B4: /* 800184C8 00015408 28 00 00 00 */ cmplwi r0, 0 /* 800184CC 0001540C 40 82 00 34 */ bne lbl_80018500 /* 800184D0 00015410 38 60 00 2C */ li r3, 0x2c -/* 800184D4 00015414 48 2B 67 79 */ bl __nw +/* 800184D4 00015414 48 2B 67 79 */ bl __nw__FUl /* 800184D8 00015418 7C 64 1B 79 */ or. r4, r3, r3 /* 800184DC 0001541C 41 82 00 10 */ beq lbl_800184EC /* 800184E0 00015420 80 9B 00 04 */ lwz r4, 4(r27) @@ -91,7 +91,7 @@ lbl_80018500: /* 80018510 00015450 7F C3 F3 78 */ mr r3, r30 /* 80018514 00015454 48 2B 86 E1 */ bl JKRSolidHeap_NS_adjustSize /* 80018518 00015458 7F A3 EB 78 */ mr r3, r29 -/* 8001851C 0001545C 48 2B 5F 1D */ bl JKRHeap_NS_becomeCurrentHeap +/* 8001851C 0001545C 48 2B 5F 1D */ bl becomeCurrentHeap__7JKRHeapFv /* 80018520 00015460 38 00 00 01 */ li r0, 1 /* 80018524 00015464 98 0D 87 28 */ stb r0, lbl_80450CA8-_SDA_BASE_(r13) /* 80018528 00015468 38 60 00 01 */ li r3, 1 @@ -392,7 +392,7 @@ lbl_800188C8: /* 80018918 00015858 7F E0 07 35 */ extsh. r0, r31 /* 8001891C 0001585C 40 81 00 0C */ ble lbl_80018928 /* 80018920 00015860 7F C3 F3 78 */ mr r3, r30 -/* 80018924 00015864 48 2B 64 19 */ bl __dl +/* 80018924 00015864 48 2B 64 19 */ bl __dl__FPv lbl_80018928: /* 80018928 00015868 7F C3 F3 78 */ mr r3, r30 /* 8001892C 0001586C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/clib.s b/asm/clib.s index 0c5b74ddb0..2687536a00 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -136,7 +136,7 @@ lbl_80361CC4: /* 80361CC8 0035EC08 41 80 FF E0 */ blt lbl_80361CA8 lbl_80361CCC: /* 80361CCC 0035EC0C 38 7A FF F0 */ addi r3, r26, -16 -/* 80361CD0 0035EC10 4B F6 D0 91 */ bl __dla +/* 80361CD0 0035EC10 4B F6 D0 91 */ bl __dla__FPv lbl_80361CD4: /* 80361CD4 0035EC14 BB 41 00 08 */ lmw r26, 8(r1) /* 80361CD8 0035EC18 80 01 00 24 */ lwz r0, 0x24(r1) @@ -289,7 +289,7 @@ lbl_80361EE4: /* 80361EE4 0035EE24 7F C0 07 35 */ extsh. r0, r30 /* 80361EE8 0035EE28 40 81 00 0C */ ble lbl_80361EF4 /* 80361EEC 0035EE2C 7F A3 EB 78 */ mr r3, r29 -/* 80361EF0 0035EE30 4B F6 CE 4D */ bl __dl +/* 80361EF0 0035EE30 4B F6 CE 4D */ bl __dl__FPv lbl_80361EF4: /* 80361EF4 0035EE34 80 01 00 24 */ lwz r0, 0x24(r1) /* 80361EF8 0035EE38 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index 3dadbe7eea..8dd01a2688 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -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) diff --git a/asm/d/a/d_a_itembase.s b/asm/d/a/d_a_itembase.s index 00d9e8165a..dbc65d1b2a 100644 --- a/asm/d/a/d_a_itembase.s +++ b/asm/d/a/d_a_itembase.s @@ -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 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 05fc816e99..275d2841f0 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -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) diff --git a/asm/d/a/d_a_player.s b/asm/d/a/d_a_player.s index dd72ead33e..e8ef3da09c 100644 --- a/asm/d/a/d_a_player.s +++ b/asm/d/a/d_a_player.s @@ -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) diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index 1dcfadcfb7..f32597f2d7 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -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) diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index 6b84bb66ce..f0c45b05cc 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -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) diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index 698419c072..c485d7f27f 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -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) diff --git a/asm/d/a/obj/ss/d_a_obj_ss_base.s b/asm/d/a/obj/ss/d_a_obj_ss_base.s index 995f333452..b090231943 100644 --- a/asm/d/a/obj/ss/d_a_obj_ss_base.s +++ b/asm/d/a/obj/ss/d_a_obj_ss_base.s @@ -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) diff --git a/asm/d/bg/d_bg_plc.s b/asm/d/bg/d_bg_plc.s index c45fd9e846..c086d0a869 100644 --- a/asm/d/bg/d_bg_plc.s +++ b/asm/d/bg/d_bg_plc.s @@ -19,7 +19,7 @@ dBgPlc_NS_dtor: /* 80074094 00070FD4 41 82 00 10 */ beq lbl_800740A4 /* 80074098 00070FD8 7C 80 07 35 */ extsh. r0, r4 /* 8007409C 00070FDC 40 81 00 08 */ ble lbl_800740A4 -/* 800740A0 00070FE0 48 25 AC 9D */ bl __dl +/* 800740A0 00070FE0 48 25 AC 9D */ bl __dl__FPv lbl_800740A4: /* 800740A4 00070FE4 7F E3 FB 78 */ mr r3, r31 /* 800740A8 00070FE8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index c883b62d7a..8caa44b21c 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -22,7 +22,7 @@ cBgW_RwgElm_NS_dtor: /* 800791F4 00076134 90 1F 00 04 */ stw r0, 4(r31) /* 800791F8 00076138 7C 80 07 35 */ extsh. r0, r4 /* 800791FC 0007613C 40 81 00 08 */ ble lbl_80079204 -/* 80079200 00076140 48 25 5B 3D */ bl __dl +/* 80079200 00076140 48 25 5B 3D */ bl __dl__FPv lbl_80079204: /* 80079204 00076144 7F E3 FB 78 */ mr r3, r31 /* 80079208 00076148 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -58,7 +58,7 @@ lbl_8007926C: /* 8007926C 000761AC 7C 80 07 35 */ extsh. r0, r4 /* 80079270 000761B0 40 81 00 0C */ ble lbl_8007927C /* 80079274 000761B4 7F E3 FB 78 */ mr r3, r31 -/* 80079278 000761B8 48 25 5A C5 */ bl __dl +/* 80079278 000761B8 48 25 5A C5 */ bl __dl__FPv lbl_8007927C: /* 8007927C 000761BC 7F E3 FB 78 */ mr r3, r31 /* 80079280 000761C0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -132,7 +132,7 @@ cBgW_NS_dtor: /* 80079378 000762B8 7F E0 07 35 */ extsh. r0, r31 /* 8007937C 000762BC 40 81 00 0C */ ble lbl_80079388 /* 80079380 000762C0 7F C3 F3 78 */ mr r3, r30 -/* 80079384 000762C4 48 25 59 B9 */ bl __dl +/* 80079384 000762C4 48 25 59 B9 */ bl __dl__FPv lbl_80079388: /* 80079388 000762C8 7F C3 F3 78 */ mr r3, r30 /* 8007938C 000762CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -229,7 +229,7 @@ lbl_800794B0: /* 800794B8 000763F8 80 7F 00 A0 */ lwz r3, 0xa0(r31) /* 800794BC 000763FC 80 03 00 00 */ lwz r0, 0(r3) /* 800794C0 00076400 1C 60 00 0C */ mulli r3, r0, 0xc -/* 800794C4 00076404 48 25 58 01 */ bl __nwa +/* 800794C4 00076404 48 25 58 01 */ bl __nwa__FUl /* 800794C8 00076408 90 7F 00 9C */ stw r3, 0x9c(r31) /* 800794CC 0007640C 80 1F 00 9C */ lwz r0, 0x9c(r31) /* 800794D0 00076410 28 00 00 00 */ cmplwi r0, 0 @@ -360,7 +360,7 @@ cBgW_NS_SetTri: /* 80079684 000765C4 83 E3 00 08 */ lwz r31, 8(r3) /* 80079688 000765C8 1C 7F 00 18 */ mulli r3, r31, 0x18 /* 8007968C 000765CC 38 63 00 10 */ addi r3, r3, 0x10 -/* 80079690 000765D0 48 25 56 35 */ bl __nwa +/* 80079690 000765D0 48 25 56 35 */ bl __nwa__FUl .global cBgW_TriElm /* 80079694 000765D4 3C 80 80 08 */ lis r4, cBgW_TriElm@ha .global cBgW_TriElm @@ -411,7 +411,7 @@ lbl_8007972C: /* 8007972C 0007666C 7C 80 07 35 */ extsh. r0, r4 /* 80079730 00076670 40 81 00 0C */ ble lbl_8007973C /* 80079734 00076674 7F E3 FB 78 */ mr r3, r31 -/* 80079738 00076678 48 25 56 05 */ bl __dl +/* 80079738 00076678 48 25 56 05 */ bl __dl__FPv lbl_8007973C: /* 8007973C 0007667C 7F E3 FB 78 */ mr r3, r31 /* 80079740 00076680 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1059,7 +1059,7 @@ lbl_8007A024: /* 8007A028 00076F68 83 C3 00 08 */ lwz r30, 8(r3) /* 8007A02C 00076F6C 57 C3 18 38 */ slwi r3, r30, 3 /* 8007A030 00076F70 38 63 00 10 */ addi r3, r3, 0x10 -/* 8007A034 00076F74 48 25 4C 91 */ bl __nwa +/* 8007A034 00076F74 48 25 4C 91 */ bl __nwa__FUl .global cBgW_RwgElm /* 8007A038 00076F78 3C 80 80 08 */ lis r4, cBgW_RwgElm@ha .global cBgW_RwgElm @@ -1083,7 +1083,7 @@ lbl_8007A074: /* 8007A074 00076FB4 80 7F 00 A0 */ lwz r3, 0xa0(r31) /* 8007A078 00076FB8 80 03 00 10 */ lwz r0, 0x10(r3) /* 8007A07C 00076FBC 1C 60 00 06 */ mulli r3, r0, 6 -/* 8007A080 00076FC0 48 25 4C 45 */ bl __nwa +/* 8007A080 00076FC0 48 25 4C 45 */ bl __nwa__FUl /* 8007A084 00076FC4 90 7F 00 A4 */ stw r3, 0xa4(r31) /* 8007A088 00076FC8 80 1F 00 A4 */ lwz r0, 0xa4(r31) /* 8007A08C 00076FCC 28 00 00 00 */ cmplwi r0, 0 @@ -1097,7 +1097,7 @@ lbl_8007A0A4: /* 8007A0A8 00076FE8 83 C3 00 18 */ lwz r30, 0x18(r3) /* 8007A0AC 00076FEC 1C 7E 00 1C */ mulli r3, r30, 0x1c /* 8007A0B0 00076FF0 38 63 00 10 */ addi r3, r3, 0x10 -/* 8007A0B4 00076FF4 48 25 4C 11 */ bl __nwa +/* 8007A0B4 00076FF4 48 25 4C 11 */ bl __nwa__FUl .global cBgW_NodeTree /* 8007A0B8 00076FF8 3C 80 80 08 */ lis r4, cBgW_NodeTree@ha .global cBgW_NodeTree @@ -1122,7 +1122,7 @@ lbl_8007A0F4: /* 8007A0F8 00077038 83 C3 00 20 */ lwz r30, 0x20(r3) /* 8007A0FC 0007703C 57 C3 28 34 */ slwi r3, r30, 5 /* 8007A100 00077040 38 63 00 10 */ addi r3, r3, 0x10 -/* 8007A104 00077044 48 25 4B C1 */ bl __nwa +/* 8007A104 00077044 48 25 4B C1 */ bl __nwa__FUl .global cBgW_GrpElm /* 8007A108 00077048 3C 80 80 08 */ lis r4, cBgW_GrpElm@ha .global cBgW_GrpElm @@ -1180,7 +1180,7 @@ lbl_8007A1BC: /* 8007A1BC 000770FC 7C 80 07 35 */ extsh. r0, r4 /* 8007A1C0 00077100 40 81 00 0C */ ble lbl_8007A1CC /* 8007A1C4 00077104 7F E3 FB 78 */ mr r3, r31 -/* 8007A1C8 00077108 48 25 4B 75 */ bl __dl +/* 8007A1C8 00077108 48 25 4B 75 */ bl __dl__FPv lbl_8007A1CC: /* 8007A1CC 0007710C 7F E3 FB 78 */ mr r3, r31 /* 8007A1D0 00077110 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1301,7 +1301,7 @@ lbl_8007A378: /* 8007A378 000772B8 7C 80 07 35 */ extsh. r0, r4 /* 8007A37C 000772BC 40 81 00 0C */ ble lbl_8007A388 /* 8007A380 000772C0 7F E3 FB 78 */ mr r3, r31 -/* 8007A384 000772C4 48 25 49 B9 */ bl __dl +/* 8007A384 000772C4 48 25 49 B9 */ bl __dl__FPv lbl_8007A388: /* 8007A388 000772C8 7F E3 FB 78 */ mr r3, r31 /* 8007A38C 000772CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5851,7 +5851,7 @@ lbl_8007E494: /* 8007E4D8 0007B418 7C 9D 23 78 */ mr r29, r4 /* 8007E4DC 0007B41C 7C BE 2B 78 */ mr r30, r5 /* 8007E4E0 0007B420 38 60 00 C0 */ li r3, 0xc0 -/* 8007E4E4 0007B424 48 25 07 69 */ bl __nw +/* 8007E4E4 0007B424 48 25 07 69 */ bl __nw__FUl /* 8007E4E8 0007B428 7C 7F 1B 79 */ or. r31, r3, r3 /* 8007E4EC 0007B42C 41 82 00 0C */ beq lbl_8007E4F8 /* 8007E4F0 0007B430 4B FF D4 81 */ bl dBgW @@ -5896,7 +5896,7 @@ lbl_8007E530: /* 8007E57C 0007B4BC 7F E0 07 35 */ extsh. r0, r31 /* 8007E580 0007B4C0 40 81 00 0C */ ble lbl_8007E58C /* 8007E584 0007B4C4 7F C3 F3 78 */ mr r3, r30 -/* 8007E588 0007B4C8 48 25 07 B5 */ bl __dl +/* 8007E588 0007B4C8 48 25 07 B5 */ bl __dl__FPv lbl_8007E58C: /* 8007E58C 0007B4CC 7F C3 F3 78 */ mr r3, r30 /* 8007E590 0007B4D0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index fc229c33da..89c8ec4112 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -144,7 +144,7 @@ lbl_8007605C: /* 80076074 00072FB4 7F E0 07 35 */ extsh. r0, r31 /* 80076078 00072FB8 40 81 00 0C */ ble lbl_80076084 /* 8007607C 00072FBC 7F C3 F3 78 */ mr r3, r30 -/* 80076080 00072FC0 48 25 8C BD */ bl __dl +/* 80076080 00072FC0 48 25 8C BD */ bl __dl__FPv lbl_80076084: /* 80076084 00072FC4 7F C3 F3 78 */ mr r3, r30 /* 80076088 00072FC8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1578,7 +1578,7 @@ dBgS_AcchCir_NS_dtor: /* 80077458 00074398 7F E0 07 35 */ extsh. r0, r31 /* 8007745C 0007439C 40 81 00 0C */ ble lbl_80077468 /* 80077460 000743A0 7F C3 F3 78 */ mr r3, r30 -/* 80077464 000743A4 48 25 78 D9 */ bl __dl +/* 80077464 000743A4 48 25 78 D9 */ bl __dl__FPv lbl_80077468: /* 80077468 000743A8 7F C3 F3 78 */ mr r3, r30 /* 8007746C 000743AC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/d_bg_s_chk.s b/asm/d/bg/s/d_bg_s_chk.s index 05849a4e63..60ac0c862a 100644 --- a/asm/d/bg/s/d_bg_s_chk.s +++ b/asm/d/bg/s/d_bg_s_chk.s @@ -49,7 +49,7 @@ dBgS_Chk_NS_dtor: /* 80077534 00074474 7F E0 07 35 */ extsh. r0, r31 /* 80077538 00074478 40 81 00 0C */ ble lbl_80077544 /* 8007753C 0007447C 7F C3 F3 78 */ mr r3, r30 -/* 80077540 00074480 48 25 77 FD */ bl __dl +/* 80077540 00074480 48 25 77 FD */ bl __dl__FPv lbl_80077544: /* 80077544 00074484 7F C3 F3 78 */ mr r3, r30 /* 80077548 00074488 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s index 8dd2678a06..b7a75acc46 100644 --- a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s +++ b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s @@ -63,7 +63,7 @@ dBgS_GndChk_NS_dtor: /* 8007764C 0007458C 7F E0 07 35 */ extsh. r0, r31 /* 80077650 00074590 40 81 00 0C */ ble lbl_8007765C /* 80077654 00074594 7F C3 F3 78 */ mr r3, r30 -/* 80077658 00074598 48 25 76 E5 */ bl __dl +/* 80077658 00074598 48 25 76 E5 */ bl __dl__FPv lbl_8007765C: /* 8007765C 0007459C 7F C3 F3 78 */ mr r3, r30 /* 80077660 000745A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -145,7 +145,7 @@ lbl_80077784: /* 80077784 000746C4 7F E0 07 35 */ extsh. r0, r31 /* 80077788 000746C8 40 81 00 0C */ ble lbl_80077794 /* 8007778C 000746CC 7F C3 F3 78 */ mr r3, r30 -/* 80077790 000746D0 48 25 75 AD */ bl __dl +/* 80077790 000746D0 48 25 75 AD */ bl __dl__FPv lbl_80077794: /* 80077794 000746D4 7F C3 F3 78 */ mr r3, r30 /* 80077798 000746D8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -227,7 +227,7 @@ lbl_800778BC: /* 800778BC 000747FC 7F E0 07 35 */ extsh. r0, r31 /* 800778C0 00074800 40 81 00 0C */ ble lbl_800778CC /* 800778C4 00074804 7F C3 F3 78 */ mr r3, r30 -/* 800778C8 00074808 48 25 74 75 */ bl __dl +/* 800778C8 00074808 48 25 74 75 */ bl __dl__FPv lbl_800778CC: /* 800778CC 0007480C 7F C3 F3 78 */ mr r3, r30 /* 800778D0 00074810 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -272,7 +272,7 @@ lbl_8007795C: /* 8007795C 0007489C 7F E0 07 35 */ extsh. r0, r31 /* 80077960 000748A0 40 81 00 0C */ ble lbl_8007796C /* 80077964 000748A4 7F C3 F3 78 */ mr r3, r30 -/* 80077968 000748A8 48 25 73 D5 */ bl __dl +/* 80077968 000748A8 48 25 73 D5 */ bl __dl__FPv lbl_8007796C: /* 8007796C 000748AC 7F C3 F3 78 */ mr r3, r30 /* 80077970 000748B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -306,7 +306,7 @@ dBgS_CamGndChk_NS_dtor: /* 800779D4 00074914 7F E0 07 35 */ extsh. r0, r31 /* 800779D8 00074918 40 81 00 0C */ ble lbl_800779E4 /* 800779DC 0007491C 7F C3 F3 78 */ mr r3, r30 -/* 800779E0 00074920 48 25 73 5D */ bl __dl +/* 800779E0 00074920 48 25 73 5D */ bl __dl__FPv lbl_800779E4: /* 800779E4 00074924 7F C3 F3 78 */ mr r3, r30 /* 800779E8 00074928 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -381,7 +381,7 @@ dBgS_CamGndChk_Wtr_NS_dtor: /* 80077AE4 00074A24 7F E0 07 35 */ extsh. r0, r31 /* 80077AE8 00074A28 40 81 00 0C */ ble lbl_80077AF4 /* 80077AEC 00074A2C 7F C3 F3 78 */ mr r3, r30 -/* 80077AF0 00074A30 48 25 72 4D */ bl __dl +/* 80077AF0 00074A30 48 25 72 4D */ bl __dl__FPv lbl_80077AF4: /* 80077AF4 00074A34 7F C3 F3 78 */ mr r3, r30 /* 80077AF8 00074A38 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s b/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s index c3b3d6bbab..33a42bf9fe 100644 --- a/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s +++ b/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s @@ -34,7 +34,7 @@ lbl_80077BF8: /* 80077BF8 00074B38 7C 80 07 35 */ extsh. r0, r4 /* 80077BFC 00074B3C 40 81 00 0C */ ble lbl_80077C08 /* 80077C00 00074B40 7F E3 FB 78 */ mr r3, r31 -/* 80077C04 00074B44 48 25 71 39 */ bl __dl +/* 80077C04 00074B44 48 25 71 39 */ bl __dl__FPv lbl_80077C08: /* 80077C08 00074B48 7F E3 FB 78 */ mr r3, r31 /* 80077C0C 00074B4C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -53,7 +53,7 @@ lbl_80077C08: /* 80077C40 00074B80 90 1F 00 00 */ stw r0, 0(r31) /* 80077C44 00074B84 7C 80 07 35 */ extsh. r0, r4 /* 80077C48 00074B88 40 81 00 08 */ ble lbl_80077C50 -/* 80077C4C 00074B8C 48 25 70 F1 */ bl __dl +/* 80077C4C 00074B8C 48 25 70 F1 */ bl __dl__FPv lbl_80077C50: /* 80077C50 00074B90 7F E3 FB 78 */ mr r3, r31 /* 80077C54 00074B94 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/lin/d_bg_s_lin_chk.s b/asm/d/bg/s/lin/d_bg_s_lin_chk.s index b2da53d2f7..9b71b765ca 100644 --- a/asm/d/bg/s/lin/d_bg_s_lin_chk.s +++ b/asm/d/bg/s/lin/d_bg_s_lin_chk.s @@ -63,7 +63,7 @@ dBgS_LinChk_NS_dtor: /* 80077D38 00074C78 7F E0 07 35 */ extsh. r0, r31 /* 80077D3C 00074C7C 40 81 00 0C */ ble lbl_80077D48 /* 80077D40 00074C80 7F C3 F3 78 */ mr r3, r30 -/* 80077D44 00074C84 48 25 6F F9 */ bl __dl +/* 80077D44 00074C84 48 25 6F F9 */ bl __dl__FPv lbl_80077D48: /* 80077D48 00074C88 7F C3 F3 78 */ mr r3, r30 /* 80077D4C 00074C8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -145,7 +145,7 @@ dBgS_CamLinChk_NS_dtor: /* 80077E4C 00074D8C 7F E0 07 35 */ extsh. r0, r31 /* 80077E50 00074D90 40 81 00 0C */ ble lbl_80077E5C /* 80077E54 00074D94 7F C3 F3 78 */ mr r3, r30 -/* 80077E58 00074D98 48 25 6E E5 */ bl __dl +/* 80077E58 00074D98 48 25 6E E5 */ bl __dl__FPv lbl_80077E5C: /* 80077E5C 00074D9C 7F C3 F3 78 */ mr r3, r30 /* 80077E60 00074DA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -205,7 +205,7 @@ dBgS_CamLinChk_NorWtr_NS_dtor: /* 80077F30 00074E70 7F E0 07 35 */ extsh. r0, r31 /* 80077F34 00074E74 40 81 00 0C */ ble lbl_80077F40 /* 80077F38 00074E78 7F C3 F3 78 */ mr r3, r30 -/* 80077F3C 00074E7C 48 25 6E 01 */ bl __dl +/* 80077F3C 00074E7C 48 25 6E 01 */ bl __dl__FPv lbl_80077F40: /* 80077F40 00074E80 7F C3 F3 78 */ mr r3, r30 /* 80077F44 00074E84 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -265,7 +265,7 @@ dBgS_ObjLinChk_NS_dtor: /* 80078004 00074F44 7F E0 07 35 */ extsh. r0, r31 /* 80078008 00074F48 40 81 00 0C */ ble lbl_80078014 /* 8007800C 00074F4C 7F C3 F3 78 */ mr r3, r30 -/* 80078010 00074F50 48 25 6D 2D */ bl __dl +/* 80078010 00074F50 48 25 6D 2D */ bl __dl__FPv lbl_80078014: /* 80078014 00074F54 7F C3 F3 78 */ mr r3, r30 /* 80078018 00074F58 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -325,7 +325,7 @@ dBgS_LinkLinChk_NS_dtor: /* 800780D8 00075018 7F E0 07 35 */ extsh. r0, r31 /* 800780DC 0007501C 40 81 00 0C */ ble lbl_800780E8 /* 800780E0 00075020 7F C3 F3 78 */ mr r3, r30 -/* 800780E4 00075024 48 25 6C 59 */ bl __dl +/* 800780E4 00075024 48 25 6C 59 */ bl __dl__FPv lbl_800780E8: /* 800780E8 00075028 7F C3 F3 78 */ mr r3, r30 /* 800780EC 0007502C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -381,7 +381,7 @@ dBgS_BombLinChk_NS_dtor: /* 800781AC 000750EC 7F E0 07 35 */ extsh. r0, r31 /* 800781B0 000750F0 40 81 00 0C */ ble lbl_800781BC /* 800781B4 000750F4 7F C3 F3 78 */ mr r3, r30 -/* 800781B8 000750F8 48 25 6B 85 */ bl __dl +/* 800781B8 000750F8 48 25 6B 85 */ bl __dl__FPv lbl_800781BC: /* 800781BC 000750FC 7F C3 F3 78 */ mr r3, r30 /* 800781C0 00075100 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -444,7 +444,7 @@ dBgS_ArrowLinChk_NS_dtor: /* 8007828C 000751CC 7F E0 07 35 */ extsh. r0, r31 /* 80078290 000751D0 40 81 00 0C */ ble lbl_8007829C /* 80078294 000751D4 7F C3 F3 78 */ mr r3, r30 -/* 80078298 000751D8 48 25 6A A5 */ bl __dl +/* 80078298 000751D8 48 25 6A A5 */ bl __dl__FPv lbl_8007829C: /* 8007829C 000751DC 7F C3 F3 78 */ mr r3, r30 /* 800782A0 000751E0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -504,7 +504,7 @@ dBgS_BoomerangLinChk_NS_dtor: /* 80078360 000752A0 7F E0 07 35 */ extsh. r0, r31 /* 80078364 000752A4 40 81 00 0C */ ble lbl_80078370 /* 80078368 000752A8 7F C3 F3 78 */ mr r3, r30 -/* 8007836C 000752AC 48 25 69 D1 */ bl __dl +/* 8007836C 000752AC 48 25 69 D1 */ bl __dl__FPv lbl_80078370: /* 80078370 000752B0 7F C3 F3 78 */ mr r3, r30 /* 80078374 000752B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -564,7 +564,7 @@ dBgS_RopeLinChk_NS_dtor: /* 80078434 00075374 7F E0 07 35 */ extsh. r0, r31 /* 80078438 00075378 40 81 00 0C */ ble lbl_80078444 /* 8007843C 0007537C 7F C3 F3 78 */ mr r3, r30 -/* 80078440 00075380 48 25 68 FD */ bl __dl +/* 80078440 00075380 48 25 68 FD */ bl __dl__FPv lbl_80078444: /* 80078444 00075384 7F C3 F3 78 */ mr r3, r30 /* 80078448 00075388 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -620,7 +620,7 @@ dBgS_HorseLinChk_NS_dtor: /* 80078508 00075448 7F E0 07 35 */ extsh. r0, r31 /* 8007850C 0007544C 40 81 00 0C */ ble lbl_80078518 /* 80078510 00075450 7F C3 F3 78 */ mr r3, r30 -/* 80078514 00075454 48 25 68 29 */ bl __dl +/* 80078514 00075454 48 25 68 29 */ bl __dl__FPv lbl_80078518: /* 80078518 00075458 7F C3 F3 78 */ mr r3, r30 /* 8007851C 0007545C 83 E1 00 0C */ lwz r31, 0xc(r1) 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 e0410d413f..e91b02e81d 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 @@ -72,7 +72,7 @@ lbl_800786FC: /* 80078714 00075654 48 00 00 94 */ b lbl_800787A8 lbl_80078718: /* 80078718 00075658 38 60 00 C0 */ li r3, 0xc0 -/* 8007871C 0007565C 48 25 65 31 */ bl __nw +/* 8007871C 0007565C 48 25 65 31 */ bl __nw__FUl /* 80078720 00075660 7C 60 1B 79 */ or. r0, r3, r3 /* 80078724 00075664 41 82 00 0C */ beq lbl_80078730 /* 80078728 00075668 48 00 32 49 */ bl dBgW diff --git a/asm/d/bg/s/poly/pass/d_bg_s_poly_pass_chk.s b/asm/d/bg/s/poly/pass/d_bg_s_poly_pass_chk.s index adc046d762..cd4126d19f 100644 --- a/asm/d/bg/s/poly/pass/d_bg_s_poly_pass_chk.s +++ b/asm/d/bg/s/poly/pass/d_bg_s_poly_pass_chk.s @@ -44,7 +44,7 @@ lbl_80078DE4: /* 80078DE4 00075D24 7C 80 07 35 */ extsh. r0, r4 /* 80078DE8 00075D28 40 81 00 0C */ ble lbl_80078DF4 /* 80078DEC 00075D2C 7F E3 FB 78 */ mr r3, r31 -/* 80078DF0 00075D30 48 25 5F 4D */ bl __dl +/* 80078DF0 00075D30 48 25 5F 4D */ bl __dl__FPv lbl_80078DF4: /* 80078DF4 00075D34 7F E3 FB 78 */ mr r3, r31 /* 80078DF8 00075D38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -223,7 +223,7 @@ dBgS_PolyPassChk_NS_SetIronBall: /* 80078FCC 00075F0C 90 1F 00 00 */ stw r0, 0(r31) /* 80078FD0 00075F10 7C 80 07 35 */ extsh. r0, r4 /* 80078FD4 00075F14 40 81 00 08 */ ble lbl_80078FDC -/* 80078FD8 00075F18 48 25 5D 65 */ bl __dl +/* 80078FD8 00075F18 48 25 5D 65 */ bl __dl__FPv lbl_80078FDC: /* 80078FDC 00075F1C 7F E3 FB 78 */ mr r3, r31 /* 80078FE0 00075F20 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/roof/d_bg_s_roof_chk.s b/asm/d/bg/s/roof/d_bg_s_roof_chk.s index 724e551e06..df1058e282 100644 --- a/asm/d/bg/s/roof/d_bg_s_roof_chk.s +++ b/asm/d/bg/s/roof/d_bg_s_roof_chk.s @@ -76,7 +76,7 @@ dBgS_RoofChk_NS_dtor: /* 800790F8 00076038 7F E0 07 35 */ extsh. r0, r31 /* 800790FC 0007603C 40 81 00 0C */ ble lbl_80079108 /* 80079100 00076040 7F C3 F3 78 */ mr r3, r30 -/* 80079104 00076044 48 25 5C 39 */ bl __dl +/* 80079104 00076044 48 25 5C 39 */ bl __dl__FPv lbl_80079108: /* 80079108 00076048 7F C3 F3 78 */ mr r3, r30 /* 8007910C 0007604C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/sph/d_bg_s_sph_chk.s b/asm/d/bg/s/sph/d_bg_s_sph_chk.s index 0793f6a5dc..cc08b71458 100644 --- a/asm/d/bg/s/sph/d_bg_s_sph_chk.s +++ b/asm/d/bg/s/sph/d_bg_s_sph_chk.s @@ -88,7 +88,7 @@ lbl_80078B44: /* 80078B44 00075A84 7F E0 07 35 */ extsh. r0, r31 /* 80078B48 00075A88 40 81 00 0C */ ble lbl_80078B54 /* 80078B4C 00075A8C 7F C3 F3 78 */ mr r3, r30 -/* 80078B50 00075A90 48 25 61 ED */ bl __dl +/* 80078B50 00075A90 48 25 61 ED */ bl __dl__FPv lbl_80078B54: /* 80078B54 00075A94 7F C3 F3 78 */ mr r3, r30 /* 80078B58 00075A98 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s b/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s index b51968bc4e..4e1cceac33 100644 --- a/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s +++ b/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s @@ -98,7 +98,7 @@ dBgS_SplGrpChk_NS_dtor: /* 80078CE0 00075C20 7F E0 07 35 */ extsh. r0, r31 /* 80078CE4 00075C24 40 81 00 0C */ ble lbl_80078CF0 /* 80078CE8 00075C28 7F C3 F3 78 */ mr r3, r30 -/* 80078CEC 00075C2C 48 25 60 51 */ bl __dl +/* 80078CEC 00075C2C 48 25 60 51 */ bl __dl__FPv lbl_80078CF0: /* 80078CF0 00075C30 7F C3 F3 78 */ mr r3, r30 /* 80078CF4 00075C34 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/w/d_bg_w_base.s b/asm/d/bg/w/d_bg_w_base.s index 3be0ff955d..0532df6246 100644 --- a/asm/d/bg/w/d_bg_w_base.s +++ b/asm/d/bg/w/d_bg_w_base.s @@ -36,7 +36,7 @@ dBgW_Base: /* 8007E618 0007B558 90 1F 00 04 */ stw r0, 4(r31) /* 8007E61C 0007B55C 7C 80 07 35 */ extsh. r0, r4 /* 8007E620 0007B560 40 81 00 08 */ ble lbl_8007E628 -/* 8007E624 0007B564 48 25 07 19 */ bl __dl +/* 8007E624 0007B564 48 25 07 19 */ bl __dl__FPv lbl_8007E628: /* 8007E628 0007B568 7F E3 FB 78 */ mr r3, r31 /* 8007E62C 0007B56C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -64,7 +64,7 @@ lbl_8007E674: /* 8007E674 0007B5B4 7C 80 07 35 */ extsh. r0, r4 /* 8007E678 0007B5B8 40 81 00 0C */ ble lbl_8007E684 /* 8007E67C 0007B5BC 7F E3 FB 78 */ mr r3, r31 -/* 8007E680 0007B5C0 48 25 06 BD */ bl __dl +/* 8007E680 0007B5C0 48 25 06 BD */ bl __dl__FPv lbl_8007E684: /* 8007E684 0007B5C4 7F E3 FB 78 */ mr r3, r31 /* 8007E688 0007B5C8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index 1f3e4057ea..6bc298bc12 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -51,7 +51,7 @@ lbl_8007E78C: /* 8007E7A4 0007B6E4 7F E0 07 35 */ extsh. r0, r31 /* 8007E7A8 0007B6E8 40 81 00 0C */ ble lbl_8007E7B4 /* 8007E7AC 0007B6EC 7F C3 F3 78 */ mr r3, r30 -/* 8007E7B0 0007B6F0 48 25 05 8D */ bl __dl +/* 8007E7B0 0007B6F0 48 25 05 8D */ bl __dl__FPv lbl_8007E7B4: /* 8007E7B4 0007B6F4 7F C3 F3 78 */ mr r3, r30 /* 8007E7B8 0007B6F8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bg/w/d_bg_w_sv.s b/asm/d/bg/w/d_bg_w_sv.s index b2b7a57262..09dfba6b04 100644 --- a/asm/d/bg/w/d_bg_w_sv.s +++ b/asm/d/bg/w/d_bg_w_sv.s @@ -28,7 +28,7 @@ lbl_80082FE8: /* 80082FE8 0007FF28 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 80082FEC 0007FF2C 80 03 00 00 */ lwz r0, 0(r3) /* 80082FF0 0007FF30 1C 60 00 0C */ mulli r3, r0, 0xc -/* 80082FF4 0007FF34 48 24 BC D1 */ bl __nwa +/* 80082FF4 0007FF34 48 24 BC D1 */ bl __nwa__FUl /* 80082FF8 0007FF38 90 7E 00 C0 */ stw r3, 0xc0(r30) /* 80082FFC 0007FF3C 80 1E 00 C0 */ lwz r0, 0xc0(r30) /* 80083000 0007FF40 7C 00 00 34 */ cntlzw r0, r0 @@ -451,7 +451,7 @@ lbl_80083620: /* 80083620 00080560 7F E0 07 35 */ extsh. r0, r31 /* 80083624 00080564 40 81 00 0C */ ble lbl_80083630 /* 80083628 00080568 7F C3 F3 78 */ mr r3, r30 -/* 8008362C 0008056C 48 24 B7 11 */ bl __dl +/* 8008362C 0008056C 48 24 B7 11 */ bl __dl__FPv lbl_80083630: /* 80083630 00080570 7F C3 F3 78 */ mr r3, r30 /* 80083634 00080574 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index a08f7d9fd1..e216942fae 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -21,7 +21,7 @@ dBrightCheck_c: /* 80192F44 0018FE84 90 1F 00 08 */ stw r0, 8(r31) /* 80192F48 0018FE88 90 9F 00 04 */ stw r4, 4(r31) /* 80192F4C 0018FE8C 38 60 00 2C */ li r3, 0x2c -/* 80192F50 0018FE90 48 13 BC FD */ bl __nw +/* 80192F50 0018FE90 48 13 BC FD */ bl __nw__FUl /* 80192F54 0018FE94 7C 60 1B 79 */ or. r0, r3, r3 /* 80192F58 0018FE98 41 82 00 0C */ beq lbl_80192F64 /* 80192F5C 0018FE9C 48 0B 6C C5 */ bl dMsgString_c @@ -72,7 +72,7 @@ lbl_80193004: /* 80193004 0018FF44 7F E0 07 35 */ extsh. r0, r31 /* 80193008 0018FF48 40 81 00 0C */ ble lbl_80193014 /* 8019300C 0018FF4C 7F C3 F3 78 */ mr r3, r30 -/* 80193010 0018FF50 48 13 BD 2D */ bl __dl +/* 80193010 0018FF50 48 13 BD 2D */ bl __dl__FPv lbl_80193014: /* 80193014 0018FF54 7F C3 F3 78 */ mr r3, r30 /* 80193018 0018FF58 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -95,7 +95,7 @@ dBrightCheck_c_NS_screenSet: /* 80193050 0018FF90 3C 60 80 39 */ lis r3, lbl_80394910@ha /* 80193054 0018FF94 3B E3 49 10 */ addi r31, r3, lbl_80394910@l /* 80193058 0018FF98 38 60 01 18 */ li r3, 0x118 -/* 8019305C 0018FF9C 48 13 BB F1 */ bl __nw +/* 8019305C 0018FF9C 48 13 BB F1 */ bl __nw__FUl /* 80193060 0018FFA0 7C 60 1B 79 */ or. r0, r3, r3 /* 80193064 0018FFA4 41 82 00 0C */ beq lbl_80193070 /* 80193068 0018FFA8 48 16 54 31 */ bl J2DScreen @@ -502,7 +502,7 @@ dBrightCheck_c_NS__draw: /* 80193668 001905A8 90 1F 00 00 */ stw r0, 0(r31) /* 8019366C 001905AC 7C 80 07 35 */ extsh. r0, r4 /* 80193670 001905B0 40 81 00 08 */ ble lbl_80193678 -/* 80193674 001905B4 48 13 B6 C9 */ bl __dl +/* 80193674 001905B4 48 13 B6 C9 */ bl __dl__FPv lbl_80193678: /* 80193678 001905B8 7F E3 FB 78 */ mr r3, r31 /* 8019367C 001905BC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/cam/d_cam_param.s b/asm/d/cam/d_cam_param.s index 88b566127a..f662ca9c50 100644 --- a/asm/d/cam/d_cam_param.s +++ b/asm/d/cam/d_cam_param.s @@ -132,7 +132,7 @@ cDegree_NS_dtor: /* 800882F4 00085234 41 82 00 10 */ beq lbl_80088304 /* 800882F8 00085238 7C 80 07 35 */ extsh. r0, r4 /* 800882FC 0008523C 40 81 00 08 */ ble lbl_80088304 -/* 80088300 00085240 48 24 6A 3D */ bl __dl +/* 80088300 00085240 48 24 6A 3D */ bl __dl__FPv lbl_80088304: /* 80088304 00085244 7F E3 FB 78 */ mr r3, r31 /* 80088308 00085248 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -331,7 +331,7 @@ dCamParam_c_NS_dtor: /* 800885AC 000854EC 90 1F 00 1C */ stw r0, 0x1c(r31) /* 800885B0 000854F0 7C 80 07 35 */ extsh. r0, r4 /* 800885B4 000854F4 40 81 00 08 */ ble lbl_800885BC -/* 800885B8 000854F8 48 24 67 85 */ bl __dl +/* 800885B8 000854F8 48 24 67 85 */ bl __dl__FPv lbl_800885BC: /* 800885BC 000854FC 7F E3 FB 78 */ mr r3, r31 /* 800885C0 00085500 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -558,7 +558,7 @@ lbl_800888F0: /* 800888F0 00085830 7C 80 07 35 */ extsh. r0, r4 /* 800888F4 00085834 40 81 00 0C */ ble lbl_80088900 /* 800888F8 00085838 7F E3 FB 78 */ mr r3, r31 -/* 800888FC 0008583C 48 24 64 41 */ bl __dl +/* 800888FC 0008583C 48 24 64 41 */ bl __dl__FPv lbl_80088900: /* 80088900 00085840 7F E3 FB 78 */ mr r3, r31 /* 80088904 00085844 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -625,7 +625,7 @@ lbl_800889A8: /* 800889D0 00085910 90 1F 00 10 */ stw r0, 0x10(r31) /* 800889D4 00085914 7C 80 07 35 */ extsh. r0, r4 /* 800889D8 00085918 40 81 00 08 */ ble lbl_800889E0 -/* 800889DC 0008591C 48 24 63 61 */ bl __dl +/* 800889DC 0008591C 48 24 63 61 */ bl __dl__FPv lbl_800889E0: /* 800889E0 00085920 7F E3 FB 78 */ mr r3, r31 /* 800889E4 00085924 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/cc/d_cc_d.s b/asm/d/cc/d_cc_d.s index 39c6687a78..f3917bf90d 100644 --- a/asm/d/cc/d_cc_d.s +++ b/asm/d/cc/d_cc_d.s @@ -134,7 +134,7 @@ dCcD_GStts: /* 800837D0 00080710 90 1F 00 00 */ stw r0, 0(r31) /* 800837D4 00080714 7C 80 07 35 */ extsh. r0, r4 /* 800837D8 00080718 40 81 00 08 */ ble lbl_800837E0 -/* 800837DC 0008071C 48 24 B5 61 */ bl __dl +/* 800837DC 0008071C 48 24 B5 61 */ bl __dl__FPv lbl_800837E0: /* 800837E0 00080720 7F E3 FB 78 */ mr r3, r31 /* 800837E4 00080724 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -413,7 +413,7 @@ lbl_80083BC0: /* 80083BC0 00080B00 7C 80 07 35 */ extsh. r0, r4 /* 80083BC4 00080B04 40 81 00 0C */ ble lbl_80083BD0 /* 80083BC8 00080B08 7F E3 FB 78 */ mr r3, r31 -/* 80083BCC 00080B0C 48 24 B1 71 */ bl __dl +/* 80083BCC 00080B0C 48 24 B1 71 */ bl __dl__FPv lbl_80083BD0: /* 80083BD0 00080B10 7F E3 FB 78 */ mr r3, r31 /* 80083BD4 00080B14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -438,7 +438,7 @@ lbl_80083C1C: /* 80083C1C 00080B5C 7C 80 07 35 */ extsh. r0, r4 /* 80083C20 00080B60 40 81 00 0C */ ble lbl_80083C2C /* 80083C24 00080B64 7F E3 FB 78 */ mr r3, r31 -/* 80083C28 00080B68 48 24 B1 15 */ bl __dl +/* 80083C28 00080B68 48 24 B1 15 */ bl __dl__FPv lbl_80083C2C: /* 80083C2C 00080B6C 7F E3 FB 78 */ mr r3, r31 /* 80083C30 00080B70 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -463,7 +463,7 @@ lbl_80083C78: /* 80083C78 00080BB8 7C 80 07 35 */ extsh. r0, r4 /* 80083C7C 00080BBC 40 81 00 0C */ ble lbl_80083C88 /* 80083C80 00080BC0 7F E3 FB 78 */ mr r3, r31 -/* 80083C84 00080BC4 48 24 B0 B9 */ bl __dl +/* 80083C84 00080BC4 48 24 B0 B9 */ bl __dl__FPv lbl_80083C88: /* 80083C88 00080BC8 7F E3 FB 78 */ mr r3, r31 /* 80083C8C 00080BCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -482,7 +482,7 @@ lbl_80083C88: /* 80083CC0 00080C00 90 1F 00 18 */ stw r0, 0x18(r31) /* 80083CC4 00080C04 7C 80 07 35 */ extsh. r0, r4 /* 80083CC8 00080C08 40 81 00 08 */ ble lbl_80083CD0 -/* 80083CCC 00080C0C 48 24 B0 71 */ bl __dl +/* 80083CCC 00080C0C 48 24 B0 71 */ bl __dl__FPv lbl_80083CD0: /* 80083CD0 00080C10 7F E3 FB 78 */ mr r3, r31 /* 80083CD4 00080C14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -549,7 +549,7 @@ lbl_80083DB8: /* 80083DB8 00080CF8 7C 80 07 35 */ extsh. r0, r4 /* 80083DBC 00080CFC 40 81 00 0C */ ble lbl_80083DC8 /* 80083DC0 00080D00 7F E3 FB 78 */ mr r3, r31 -/* 80083DC4 00080D04 48 24 AF 79 */ bl __dl +/* 80083DC4 00080D04 48 24 AF 79 */ bl __dl__FPv lbl_80083DC8: /* 80083DC8 00080D08 7F E3 FB 78 */ mr r3, r31 /* 80083DCC 00080D0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -612,7 +612,7 @@ lbl_80083EA0: /* 80083EA0 00080DE0 7C 80 07 35 */ extsh. r0, r4 /* 80083EA4 00080DE4 40 81 00 0C */ ble lbl_80083EB0 /* 80083EA8 00080DE8 7F E3 FB 78 */ mr r3, r31 -/* 80083EAC 00080DEC 48 24 AE 91 */ bl __dl +/* 80083EAC 00080DEC 48 24 AE 91 */ bl __dl__FPv lbl_80083EB0: /* 80083EB0 00080DF0 7F E3 FB 78 */ mr r3, r31 /* 80083EB4 00080DF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -664,7 +664,7 @@ lbl_80083F60: /* 80083F60 00080EA0 7C 80 07 35 */ extsh. r0, r4 /* 80083F64 00080EA4 40 81 00 0C */ ble lbl_80083F70 /* 80083F68 00080EA8 7F E3 FB 78 */ mr r3, r31 -/* 80083F6C 00080EAC 48 24 AD D1 */ bl __dl +/* 80083F6C 00080EAC 48 24 AD D1 */ bl __dl__FPv lbl_80083F70: /* 80083F70 00080EB0 7F E3 FB 78 */ mr r3, r31 /* 80083F74 00080EB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -689,7 +689,7 @@ lbl_80083FBC: /* 80083FBC 00080EFC 7C 80 07 35 */ extsh. r0, r4 /* 80083FC0 00080F00 40 81 00 0C */ ble lbl_80083FCC /* 80083FC4 00080F04 7F E3 FB 78 */ mr r3, r31 -/* 80083FC8 00080F08 48 24 AD 75 */ bl __dl +/* 80083FC8 00080F08 48 24 AD 75 */ bl __dl__FPv lbl_80083FCC: /* 80083FCC 00080F0C 7F E3 FB 78 */ mr r3, r31 /* 80083FD0 00080F10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -714,7 +714,7 @@ lbl_80084018: /* 80084018 00080F58 7C 80 07 35 */ extsh. r0, r4 /* 8008401C 00080F5C 40 81 00 0C */ ble lbl_80084028 /* 80084020 00080F60 7F E3 FB 78 */ mr r3, r31 -/* 80084024 00080F64 48 24 AD 19 */ bl __dl +/* 80084024 00080F64 48 24 AD 19 */ bl __dl__FPv lbl_80084028: /* 80084028 00080F68 7F E3 FB 78 */ mr r3, r31 /* 8008402C 00080F6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -739,7 +739,7 @@ lbl_80084074: /* 80084074 00080FB4 7C 80 07 35 */ extsh. r0, r4 /* 80084078 00080FB8 40 81 00 0C */ ble lbl_80084084 /* 8008407C 00080FBC 7F E3 FB 78 */ mr r3, r31 -/* 80084080 00080FC0 48 24 AC BD */ bl __dl +/* 80084080 00080FC0 48 24 AC BD */ bl __dl__FPv lbl_80084084: /* 80084084 00080FC4 7F E3 FB 78 */ mr r3, r31 /* 80084088 00080FC8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -758,7 +758,7 @@ lbl_80084084: /* 800840BC 00080FFC 90 1F 00 0C */ stw r0, 0xc(r31) /* 800840C0 00081000 7C 80 07 35 */ extsh. r0, r4 /* 800840C4 00081004 40 81 00 08 */ ble lbl_800840CC -/* 800840C8 00081008 48 24 AC 75 */ bl __dl +/* 800840C8 00081008 48 24 AC 75 */ bl __dl__FPv lbl_800840CC: /* 800840CC 0008100C 7F E3 FB 78 */ mr r3, r31 /* 800840D0 00081010 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -866,7 +866,7 @@ lbl_80084240: /* 80084240 00081180 7C 80 07 35 */ extsh. r0, r4 /* 80084244 00081184 40 81 00 0C */ ble lbl_80084250 /* 80084248 00081188 7F E3 FB 78 */ mr r3, r31 -/* 8008424C 0008118C 48 24 AA F1 */ bl __dl +/* 8008424C 0008118C 48 24 AA F1 */ bl __dl__FPv lbl_80084250: /* 80084250 00081190 7F E3 FB 78 */ mr r3, r31 /* 80084254 00081194 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1622,7 +1622,7 @@ lbl_80084C88: /* 80084C94 00081BD4 7F E0 07 35 */ extsh. r0, r31 /* 80084C98 00081BD8 40 81 00 0C */ ble lbl_80084CA4 /* 80084C9C 00081BDC 7F C3 F3 78 */ mr r3, r30 -/* 80084CA0 00081BE0 48 24 A0 9D */ bl __dl +/* 80084CA0 00081BE0 48 24 A0 9D */ bl __dl__FPv lbl_80084CA4: /* 80084CA4 00081BE4 7F C3 F3 78 */ mr r3, r30 /* 80084CA8 00081BE8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1718,7 +1718,7 @@ lbl_80084DF4: /* 80084E00 00081D40 7F E0 07 35 */ extsh. r0, r31 /* 80084E04 00081D44 40 81 00 0C */ ble lbl_80084E10 /* 80084E08 00081D48 7F C3 F3 78 */ mr r3, r30 -/* 80084E0C 00081D4C 48 24 9F 31 */ bl __dl +/* 80084E0C 00081D4C 48 24 9F 31 */ bl __dl__FPv lbl_80084E10: /* 80084E10 00081D50 7F C3 F3 78 */ mr r3, r30 /* 80084E14 00081D54 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1829,7 +1829,7 @@ lbl_80084F9C: /* 80084FA8 00081EE8 7F E0 07 35 */ extsh. r0, r31 /* 80084FAC 00081EEC 40 81 00 0C */ ble lbl_80084FB8 /* 80084FB0 00081EF0 7F C3 F3 78 */ mr r3, r30 -/* 80084FB4 00081EF4 48 24 9D 89 */ bl __dl +/* 80084FB4 00081EF4 48 24 9D 89 */ bl __dl__FPv lbl_80084FB8: /* 80084FB8 00081EF8 7F C3 F3 78 */ mr r3, r30 /* 80084FBC 00081EFC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1920,7 +1920,7 @@ lbl_800850F8: /* 80085104 00082044 7F E0 07 35 */ extsh. r0, r31 /* 80085108 00082048 40 81 00 0C */ ble lbl_80085114 /* 8008510C 0008204C 7F C3 F3 78 */ mr r3, r30 -/* 80085110 00082050 48 24 9C 2D */ bl __dl +/* 80085110 00082050 48 24 9C 2D */ bl __dl__FPv lbl_80085114: /* 80085114 00082054 7F C3 F3 78 */ mr r3, r30 /* 80085118 00082058 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1993,7 +1993,7 @@ lbl_80085214: /* 80085214 00082154 7C 80 07 35 */ extsh. r0, r4 /* 80085218 00082158 40 81 00 0C */ ble lbl_80085224 /* 8008521C 0008215C 7F E3 FB 78 */ mr r3, r31 -/* 80085220 00082160 48 24 9B 1D */ bl __dl +/* 80085220 00082160 48 24 9B 1D */ bl __dl__FPv lbl_80085224: /* 80085224 00082164 7F E3 FB 78 */ mr r3, r31 /* 80085228 00082168 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2018,7 +2018,7 @@ lbl_80085270: /* 80085270 000821B0 7C 80 07 35 */ extsh. r0, r4 /* 80085274 000821B4 40 81 00 0C */ ble lbl_80085280 /* 80085278 000821B8 7F E3 FB 78 */ mr r3, r31 -/* 8008527C 000821BC 48 24 9A C1 */ bl __dl +/* 8008527C 000821BC 48 24 9A C1 */ bl __dl__FPv lbl_80085280: /* 80085280 000821C0 7F E3 FB 78 */ mr r3, r31 /* 80085284 000821C4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index 7f604649f4..2122c2d9c4 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -1379,7 +1379,7 @@ lbl_80087280: /* 80087280 000841C0 7C 80 07 35 */ extsh. r0, r4 /* 80087284 000841C4 40 81 00 0C */ ble lbl_80087290 /* 80087288 000841C8 7F E3 FB 78 */ mr r3, r31 -/* 8008728C 000841CC 48 24 7A B1 */ bl __dl +/* 8008728C 000841CC 48 24 7A B1 */ bl __dl__FPv lbl_80087290: /* 80087290 000841D0 7F E3 FB 78 */ mr r3, r31 /* 80087294 000841D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index 9bfec0977f..538bb707c9 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -145,7 +145,7 @@ lbl_800854B4: /* 800854B4 000823F4 7F E0 07 35 */ extsh. r0, r31 /* 800854B8 000823F8 40 81 00 0C */ ble lbl_800854C4 /* 800854BC 000823FC 7F C3 F3 78 */ mr r3, r30 -/* 800854C0 00082400 48 24 98 7D */ bl __dl +/* 800854C0 00082400 48 24 98 7D */ bl __dl__FPv lbl_800854C4: /* 800854C4 00082404 7F C3 F3 78 */ mr r3, r30 /* 800854C8 00082408 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -186,7 +186,7 @@ lbl_80085544: /* 80085544 00082484 7C 80 07 35 */ extsh. r0, r4 /* 80085548 00082488 40 81 00 0C */ ble lbl_80085554 /* 8008554C 0008248C 7F E3 FB 78 */ mr r3, r31 -/* 80085550 00082490 48 24 97 ED */ bl __dl +/* 80085550 00082490 48 24 97 ED */ bl __dl__FPv lbl_80085554: /* 80085554 00082494 7F E3 FB 78 */ mr r3, r31 /* 80085558 00082498 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -211,7 +211,7 @@ lbl_800855A0: /* 800855A0 000824E0 7C 80 07 35 */ extsh. r0, r4 /* 800855A4 000824E4 40 81 00 0C */ ble lbl_800855B0 /* 800855A8 000824E8 7F E3 FB 78 */ mr r3, r31 -/* 800855AC 000824EC 48 24 97 91 */ bl __dl +/* 800855AC 000824EC 48 24 97 91 */ bl __dl__FPv lbl_800855B0: /* 800855B0 000824F0 7F E3 FB 78 */ mr r3, r31 /* 800855B4 000824F4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index 37ebb34fb5..4cc7d8d861 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -1197,7 +1197,7 @@ daSus_c_NS_data_c_NS_dtor: /* 80031F3C 0002EE7C 41 82 00 10 */ beq lbl_80031F4C /* 80031F40 0002EE80 7C 80 07 35 */ extsh. r0, r4 /* 80031F44 0002EE84 40 81 00 08 */ ble lbl_80031F4C -/* 80031F48 0002EE88 48 29 CD F5 */ bl __dl +/* 80031F48 0002EE88 48 29 CD F5 */ bl __dl__FPv lbl_80031F4C: /* 80031F4C 0002EE8C 7F E3 FB 78 */ mr r3, r31 /* 80031F50 0002EE90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index fbcf81329b..382c169237 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -1706,7 +1706,7 @@ dComIfG_play_c_NS_createParticle: /* 8002C9E4 00029924 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002C9E8 00029928 7C 7F 1B 78 */ mr r31, r3 /* 8002C9EC 0002992C 38 60 12 18 */ li r3, 0x1218 -/* 8002C9F0 00029930 48 2A 22 5D */ bl __nw +/* 8002C9F0 00029930 48 2A 22 5D */ bl __nw__FUl /* 8002C9F4 00029934 7C 60 1B 79 */ or. r0, r3, r3 /* 8002C9F8 00029938 41 82 00 0C */ beq lbl_8002CA04 /* 8002C9FC 0002993C 48 01 F0 D1 */ bl dPa_control_c @@ -1730,7 +1730,7 @@ dComIfG_play_c_NS_createSimpleModel: /* 8002CA34 00029974 28 00 00 00 */ cmplwi r0, 0 /* 8002CA38 00029978 40 82 00 20 */ bne lbl_8002CA58 /* 8002CA3C 0002997C 38 60 10 48 */ li r3, 0x1048 -/* 8002CA40 00029980 48 2A 22 0D */ bl __nw +/* 8002CA40 00029980 48 2A 22 0D */ bl __nw__FUl /* 8002CA44 00029984 7C 60 1B 79 */ or. r0, r3, r3 /* 8002CA48 00029988 41 82 00 0C */ beq lbl_8002CA54 /* 8002CA4C 0002998C 48 01 C2 69 */ bl dSmplMdl_draw_c @@ -3541,7 +3541,7 @@ dComIfGp_createSubExpHeap2D: /* 8002E240 0002B180 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E244 0002B184 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l /* 8002E248 0002B188 80 7D 5E BC */ lwz r3, 0x5ebc(r29) -/* 8002E24C 0002B18C 48 2A 05 39 */ bl JKRHeap_NS_getTotalFreeSize +/* 8002E24C 0002B18C 48 2A 05 39 */ bl getTotalFreeSize__7JKRHeapFv /* 8002E250 0002B190 C8 22 83 10 */ lfd f1, lbl_80451D10-_SDA2_BASE_(r2) /* 8002E254 0002B194 6C 60 80 00 */ xoris r0, r3, 0x8000 /* 8002E258 0002B198 90 01 00 0C */ stw r0, 0xc(r1) @@ -4825,7 +4825,7 @@ lbl_8002F388: /* 8002F388 0002C2C8 7F 80 07 35 */ extsh. r0, r28 /* 8002F38C 0002C2CC 40 81 00 0C */ ble lbl_8002F398 /* 8002F390 0002C2D0 7F 63 DB 78 */ mr r3, r27 -/* 8002F394 0002C2D4 48 29 F9 A9 */ bl __dl +/* 8002F394 0002C2D4 48 29 F9 A9 */ bl __dl__FPv lbl_8002F398: /* 8002F398 0002C2D8 7F 63 DB 78 */ mr r3, r27 /* 8002F39C 0002C2DC 39 61 00 20 */ addi r11, r1, 0x20 @@ -5578,7 +5578,7 @@ dComIfG_inf_c_NS_dtor: /* 8002FDBC 0002CCFC 7F E0 07 35 */ extsh. r0, r31 /* 8002FDC0 0002CD00 40 81 00 0C */ ble lbl_8002FDCC /* 8002FDC4 0002CD04 7F C3 F3 78 */ mr r3, r30 -/* 8002FDC8 0002CD08 48 29 EF 75 */ bl __dl +/* 8002FDC8 0002CD08 48 29 EF 75 */ bl __dl__FPv lbl_8002FDCC: /* 8002FDCC 0002CD0C 7F C3 F3 78 */ mr r3, r30 /* 8002FDD0 0002CD10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5663,7 +5663,7 @@ lbl_8002FECC: /* 8002FECC 0002CE0C 7F C0 07 35 */ extsh. r0, r30 /* 8002FED0 0002CE10 40 81 00 0C */ ble lbl_8002FEDC /* 8002FED4 0002CE14 7F E3 FB 78 */ mr r3, r31 -/* 8002FED8 0002CE18 48 29 EE 65 */ bl __dl +/* 8002FED8 0002CE18 48 29 EE 65 */ bl __dl__FPv lbl_8002FEDC: /* 8002FEDC 0002CE1C 7F E3 FB 78 */ mr r3, r31 /* 8002FEE0 0002CE20 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5685,7 +5685,7 @@ cBgS_ChkElm_NS_dtor: /* 8002FF18 0002CE58 90 1F 00 10 */ stw r0, 0x10(r31) /* 8002FF1C 0002CE5C 7C 80 07 35 */ extsh. r0, r4 /* 8002FF20 0002CE60 40 81 00 08 */ ble lbl_8002FF28 -/* 8002FF24 0002CE64 48 29 EE 19 */ bl __dl +/* 8002FF24 0002CE64 48 29 EE 19 */ bl __dl__FPv lbl_8002FF28: /* 8002FF28 0002CE68 7F E3 FB 78 */ mr r3, r31 /* 8002FF2C 0002CE6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5807,7 +5807,7 @@ lbl_800300C8: /* 800300C8 0002D008 7F E0 07 35 */ extsh. r0, r31 /* 800300CC 0002D00C 40 81 00 0C */ ble lbl_800300D8 /* 800300D0 0002D010 7F C3 F3 78 */ mr r3, r30 -/* 800300D4 0002D014 48 29 EC 69 */ bl __dl +/* 800300D4 0002D014 48 29 EC 69 */ bl __dl__FPv lbl_800300D8: /* 800300D8 0002D018 7F C3 F3 78 */ mr r3, r30 /* 800300DC 0002D01C 39 61 00 20 */ addi r11, r1, 0x20 @@ -5836,7 +5836,7 @@ lbl_8003012C: /* 8003012C 0002D06C 7C 80 07 35 */ extsh. r0, r4 /* 80030130 0002D070 40 81 00 0C */ ble lbl_8003013C /* 80030134 0002D074 7F E3 FB 78 */ mr r3, r31 -/* 80030138 0002D078 48 29 EC 05 */ bl __dl +/* 80030138 0002D078 48 29 EC 05 */ bl __dl__FPv lbl_8003013C: /* 8003013C 0002D07C 7F E3 FB 78 */ mr r3, r31 /* 80030140 0002D080 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5854,7 +5854,7 @@ dEvt_order_c_NS_dtor: /* 80030168 0002D0A8 41 82 00 10 */ beq lbl_80030178 /* 8003016C 0002D0AC 7C 80 07 35 */ extsh. r0, r4 /* 80030170 0002D0B0 40 81 00 08 */ ble lbl_80030178 -/* 80030174 0002D0B4 48 29 EB C9 */ bl __dl +/* 80030174 0002D0B4 48 29 EB C9 */ bl __dl__FPv lbl_80030178: /* 80030178 0002D0B8 7F E3 FB 78 */ mr r3, r31 /* 8003017C 0002D0BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5872,7 +5872,7 @@ dEvDtBase_c_NS_dtor: /* 800301A4 0002D0E4 41 82 00 10 */ beq lbl_800301B4 /* 800301A8 0002D0E8 7C 80 07 35 */ extsh. r0, r4 /* 800301AC 0002D0EC 40 81 00 08 */ ble lbl_800301B4 -/* 800301B0 0002D0F0 48 29 EB 8D */ bl __dl +/* 800301B0 0002D0F0 48 29 EB 8D */ bl __dl__FPv lbl_800301B4: /* 800301B4 0002D0F4 7F E3 FB 78 */ mr r3, r31 /* 800301B8 0002D0F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5890,7 +5890,7 @@ dDlst_window_c_NS_dtor: /* 800301E0 0002D120 41 82 00 10 */ beq lbl_800301F0 /* 800301E4 0002D124 7C 80 07 35 */ extsh. r0, r4 /* 800301E8 0002D128 40 81 00 08 */ ble lbl_800301F0 -/* 800301EC 0002D12C 48 29 EB 51 */ bl __dl +/* 800301EC 0002D12C 48 29 EB 51 */ bl __dl__FPv lbl_800301F0: /* 800301F0 0002D130 7F E3 FB 78 */ mr r3, r31 /* 800301F4 0002D134 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5908,7 +5908,7 @@ dComIfG_camera_info_class_NS_dtor: /* 8003021C 0002D15C 41 82 00 10 */ beq lbl_8003022C /* 80030220 0002D160 7C 80 07 35 */ extsh. r0, r4 /* 80030224 0002D164 40 81 00 08 */ ble lbl_8003022C -/* 80030228 0002D168 48 29 EB 15 */ bl __dl +/* 80030228 0002D168 48 29 EB 15 */ bl __dl__FPv lbl_8003022C: /* 8003022C 0002D16C 7F E3 FB 78 */ mr r3, r31 /* 80030230 0002D170 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6134,7 +6134,7 @@ dAttList_c_NS_dtor: /* 800304E4 0002D424 41 82 00 10 */ beq lbl_800304F4 /* 800304E8 0002D428 7C 80 07 35 */ extsh. r0, r4 /* 800304EC 0002D42C 40 81 00 08 */ ble lbl_800304F4 -/* 800304F0 0002D430 48 29 E8 4D */ bl __dl +/* 800304F0 0002D430 48 29 E8 4D */ bl __dl__FPv lbl_800304F4: /* 800304F4 0002D434 7F E3 FB 78 */ mr r3, r31 /* 800304F8 0002D438 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6156,7 +6156,7 @@ cSAngle_NS_dtor: /* 80030524 0002D464 41 82 00 10 */ beq lbl_80030534 /* 80030528 0002D468 7C 80 07 35 */ extsh. r0, r4 /* 8003052C 0002D46C 40 81 00 08 */ ble lbl_80030534 -/* 80030530 0002D470 48 29 E8 0D */ bl __dl +/* 80030530 0002D470 48 29 E8 0D */ bl __dl__FPv lbl_80030534: /* 80030534 0002D474 7F E3 FB 78 */ mr r3, r31 /* 80030538 0002D478 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6257,7 +6257,7 @@ lbl_800305FC: /* 80030674 0002D5B4 7F E0 07 35 */ extsh. r0, r31 /* 80030678 0002D5B8 40 81 00 0C */ ble lbl_80030684 /* 8003067C 0002D5BC 7F C3 F3 78 */ mr r3, r30 -/* 80030680 0002D5C0 48 29 E6 BD */ bl __dl +/* 80030680 0002D5C0 48 29 E6 BD */ bl __dl__FPv lbl_80030684: /* 80030684 0002D5C4 7F C3 F3 78 */ mr r3, r30 /* 80030688 0002D5C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6283,7 +6283,7 @@ lbl_800306CC: /* 800306CC 0002D60C 7C 80 07 35 */ extsh. r0, r4 /* 800306D0 0002D610 40 81 00 0C */ ble lbl_800306DC /* 800306D4 0002D614 7F E3 FB 78 */ mr r3, r31 -/* 800306D8 0002D618 48 29 E6 65 */ bl __dl +/* 800306D8 0002D618 48 29 E6 65 */ bl __dl__FPv lbl_800306DC: /* 800306DC 0002D61C 7F E3 FB 78 */ mr r3, r31 /* 800306E0 0002D620 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6308,7 +6308,7 @@ lbl_80030720: /* 80030720 0002D660 7C 80 07 35 */ extsh. r0, r4 /* 80030724 0002D664 40 81 00 0C */ ble lbl_80030730 /* 80030728 0002D668 7F E3 FB 78 */ mr r3, r31 -/* 8003072C 0002D66C 48 29 E6 11 */ bl __dl +/* 8003072C 0002D66C 48 29 E6 11 */ bl __dl__FPv lbl_80030730: /* 80030730 0002D670 7F E3 FB 78 */ mr r3, r31 /* 80030734 0002D674 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6333,7 +6333,7 @@ lbl_80030774: /* 80030774 0002D6B4 7C 80 07 35 */ extsh. r0, r4 /* 80030778 0002D6B8 40 81 00 0C */ ble lbl_80030784 /* 8003077C 0002D6BC 7F E3 FB 78 */ mr r3, r31 -/* 80030780 0002D6C0 48 29 E5 BD */ bl __dl +/* 80030780 0002D6C0 48 29 E5 BD */ bl __dl__FPv lbl_80030784: /* 80030784 0002D6C4 7F E3 FB 78 */ mr r3, r31 /* 80030788 0002D6C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6358,7 +6358,7 @@ lbl_800307C8: /* 800307C8 0002D708 7C 80 07 35 */ extsh. r0, r4 /* 800307CC 0002D70C 40 81 00 0C */ ble lbl_800307D8 /* 800307D0 0002D710 7F E3 FB 78 */ mr r3, r31 -/* 800307D4 0002D714 48 29 E5 69 */ bl __dl +/* 800307D4 0002D714 48 29 E5 69 */ bl __dl__FPv lbl_800307D8: /* 800307D8 0002D718 7F E3 FB 78 */ mr r3, r31 /* 800307DC 0002D71C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6648,7 +6648,7 @@ lbl_80030BB0: /* 80030BB0 0002DAF0 7F E0 07 35 */ extsh. r0, r31 /* 80030BB4 0002DAF4 40 81 00 0C */ ble lbl_80030BC0 /* 80030BB8 0002DAF8 7F C3 F3 78 */ mr r3, r30 -/* 80030BBC 0002DAFC 48 29 E1 81 */ bl __dl +/* 80030BBC 0002DAFC 48 29 E1 81 */ bl __dl__FPv lbl_80030BC0: /* 80030BC0 0002DB00 7F C3 F3 78 */ mr r3, r30 /* 80030BC4 0002DB04 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6680,7 +6680,7 @@ lbl_80030C28: /* 80030C28 0002DB68 7C 80 07 35 */ extsh. r0, r4 /* 80030C2C 0002DB6C 40 81 00 0C */ ble lbl_80030C38 /* 80030C30 0002DB70 7F E3 FB 78 */ mr r3, r31 -/* 80030C34 0002DB74 48 29 E1 09 */ bl __dl +/* 80030C34 0002DB74 48 29 E1 09 */ bl __dl__FPv lbl_80030C38: /* 80030C38 0002DB78 7F E3 FB 78 */ mr r3, r31 /* 80030C3C 0002DB7C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6714,7 +6714,7 @@ lbl_80030CA0: /* 80030CA0 0002DBE0 7F E0 07 35 */ extsh. r0, r31 /* 80030CA4 0002DBE4 40 81 00 0C */ ble lbl_80030CB0 /* 80030CA8 0002DBE8 7F C3 F3 78 */ mr r3, r30 -/* 80030CAC 0002DBEC 48 29 E0 91 */ bl __dl +/* 80030CAC 0002DBEC 48 29 E0 91 */ bl __dl__FPv lbl_80030CB0: /* 80030CB0 0002DBF0 7F C3 F3 78 */ mr r3, r30 /* 80030CB4 0002DBF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6744,7 +6744,7 @@ lbl_80030CB0: /* 80030D0C 0002DC4C 7F E0 07 35 */ extsh. r0, r31 /* 80030D10 0002DC50 40 81 00 0C */ ble lbl_80030D1C /* 80030D14 0002DC54 7F C3 F3 78 */ mr r3, r30 -/* 80030D18 0002DC58 48 29 E0 25 */ bl __dl +/* 80030D18 0002DC58 48 29 E0 25 */ bl __dl__FPv lbl_80030D1C: /* 80030D1C 0002DC5C 7F C3 F3 78 */ mr r3, r30 /* 80030D20 0002DC60 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6820,7 +6820,7 @@ lbl_80030E14: /* 80030E14 0002DD54 7C 80 07 35 */ extsh. r0, r4 /* 80030E18 0002DD58 40 81 00 0C */ ble lbl_80030E24 /* 80030E1C 0002DD5C 7F E3 FB 78 */ mr r3, r31 -/* 80030E20 0002DD60 48 29 DF 1D */ bl __dl +/* 80030E20 0002DD60 48 29 DF 1D */ bl __dl__FPv lbl_80030E24: /* 80030E24 0002DD64 7F E3 FB 78 */ mr r3, r31 /* 80030E28 0002DD68 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6842,7 +6842,7 @@ cM3dGCyl_NS_dtor: /* 80030E5C 0002DD9C 90 1F 00 14 */ stw r0, 0x14(r31) /* 80030E60 0002DDA0 7C 80 07 35 */ extsh. r0, r4 /* 80030E64 0002DDA4 40 81 00 08 */ ble lbl_80030E6C -/* 80030E68 0002DDA8 48 29 DE D5 */ bl __dl +/* 80030E68 0002DDA8 48 29 DE D5 */ bl __dl__FPv lbl_80030E6C: /* 80030E6C 0002DDAC 7F E3 FB 78 */ mr r3, r31 /* 80030E70 0002DDB0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6861,7 +6861,7 @@ lbl_80030E6C: /* 80030EA4 0002DDE4 90 1F 00 18 */ stw r0, 0x18(r31) /* 80030EA8 0002DDE8 7C 80 07 35 */ extsh. r0, r4 /* 80030EAC 0002DDEC 40 81 00 08 */ ble lbl_80030EB4 -/* 80030EB0 0002DDF0 48 29 DE 8D */ bl __dl +/* 80030EB0 0002DDF0 48 29 DE 8D */ bl __dl__FPv lbl_80030EB4: /* 80030EB4 0002DDF4 7F E3 FB 78 */ mr r3, r31 /* 80030EB8 0002DDF8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6880,7 +6880,7 @@ lbl_80030EB4: /* 80030EEC 0002DE2C 90 1F 00 0C */ stw r0, 0xc(r31) /* 80030EF0 0002DE30 7C 80 07 35 */ extsh. r0, r4 /* 80030EF4 0002DE34 40 81 00 08 */ ble lbl_80030EFC -/* 80030EF8 0002DE38 48 29 DE 45 */ bl __dl +/* 80030EF8 0002DE38 48 29 DE 45 */ bl __dl__FPv lbl_80030EFC: /* 80030EFC 0002DE3C 7F E3 FB 78 */ mr r3, r31 /* 80030F00 0002DE40 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_attention.s b/asm/d/d_attention.s index 75c7f9ebc5..d4117d1abb 100644 --- a/asm/d/d_attention.s +++ b/asm/d/d_attention.s @@ -84,7 +84,7 @@ dAttParam_c_NS_dtor: /* 80070130 0006D070 90 1F 00 40 */ stw r0, 0x40(r31) /* 80070134 0006D074 7C 80 07 35 */ extsh. r0, r4 /* 80070138 0006D078 40 81 00 08 */ ble lbl_80070140 -/* 8007013C 0006D07C 48 25 EC 01 */ bl __dl +/* 8007013C 0006D07C 48 25 EC 01 */ bl __dl__FPv lbl_80070140: /* 80070140 0006D080 7F E3 FB 78 */ mr r3, r31 /* 80070144 0006D084 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -565,7 +565,7 @@ lbl_800707AC: /* 80070818 0006D758 7F E0 07 35 */ extsh. r0, r31 /* 8007081C 0006D75C 40 81 00 0C */ ble lbl_80070828 /* 80070820 0006D760 7F C3 F3 78 */ mr r3, r30 -/* 80070824 0006D764 48 25 E5 19 */ bl __dl +/* 80070824 0006D764 48 25 E5 19 */ bl __dl__FPv lbl_80070828: /* 80070828 0006D768 7F C3 F3 78 */ mr r3, r30 /* 8007082C 0006D76C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1630,7 +1630,7 @@ cSGlobe_NS_dtor: /* 80071690 0006E5D0 41 82 00 10 */ beq lbl_800716A0 /* 80071694 0006E5D4 7C 80 07 35 */ extsh. r0, r4 /* 80071698 0006E5D8 40 81 00 08 */ ble lbl_800716A0 -/* 8007169C 0006E5DC 48 25 D6 A1 */ bl __dl +/* 8007169C 0006E5DC 48 25 D6 A1 */ bl __dl__FPv lbl_800716A0: /* 800716A0 0006E5E0 7F E3 FB 78 */ mr r3, r31 /* 800716A4 0006E5E4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4635,7 +4635,7 @@ dAttDrawParam_c_NS_dtor: /* 80073FE4 00070F24 90 1F 00 00 */ stw r0, 0(r31) /* 80073FE8 00070F28 7C 80 07 35 */ extsh. r0, r4 /* 80073FEC 00070F2C 40 81 00 08 */ ble lbl_80073FF4 -/* 80073FF0 00070F30 48 25 AD 4D */ bl __dl +/* 80073FF0 00070F30 48 25 AD 4D */ bl __dl__FPv lbl_80073FF4: /* 80073FF4 00070F34 7F E3 FB 78 */ mr r3, r31 /* 80073FF8 00070F38 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 4b867cafeb..c2da6a4818 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -619,7 +619,7 @@ dCamera_c_NS__class_3665d_camera_cpp_NS_dtor: /* 801602D8 0015D218 41 82 00 10 */ beq lbl_801602E8 /* 801602DC 0015D21C 7C 80 07 35 */ extsh. r0, r4 /* 801602E0 0015D220 40 81 00 08 */ ble lbl_801602E8 -/* 801602E4 0015D224 48 16 EA 59 */ bl __dl +/* 801602E4 0015D224 48 16 EA 59 */ bl __dl__FPv lbl_801602E8: /* 801602E8 0015D228 7F E3 FB 78 */ mr r3, r31 /* 801602EC 0015D22C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -725,7 +725,7 @@ lbl_8016042C: /* 80160444 0015D384 7F E0 07 35 */ extsh. r0, r31 /* 80160448 0015D388 40 81 00 0C */ ble lbl_80160454 /* 8016044C 0015D38C 7F C3 F3 78 */ mr r3, r30 -/* 80160450 0015D390 48 16 E8 ED */ bl __dl +/* 80160450 0015D390 48 16 E8 ED */ bl __dl__FPv lbl_80160454: /* 80160454 0015D394 7F C3 F3 78 */ mr r3, r30 /* 80160458 0015D398 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7052,7 +7052,7 @@ dBgS_CamSphChk_NS_dtor: /* 80165EC8 00162E08 7F E0 07 35 */ extsh. r0, r31 /* 80165ECC 00162E0C 40 81 00 0C */ ble lbl_80165ED8 /* 80165ED0 00162E10 7F C3 F3 78 */ mr r3, r30 -/* 80165ED4 00162E14 48 16 8E 69 */ bl __dl +/* 80165ED4 00162E14 48 16 8E 69 */ bl __dl__FPv lbl_80165ED8: /* 80165ED8 00162E18 7F C3 F3 78 */ mr r3, r30 /* 80165EDC 00162E1C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -9049,7 +9049,7 @@ cCcD_ShapeAttr_NS_Shape_NS_dtor: /* 80167BD0 00164B10 41 82 00 10 */ beq lbl_80167BE0 /* 80167BD4 00164B14 7C 80 07 35 */ extsh. r0, r4 /* 80167BD8 00164B18 40 81 00 08 */ ble lbl_80167BE0 -/* 80167BDC 00164B1C 48 16 71 61 */ bl __dl +/* 80167BDC 00164B1C 48 16 71 61 */ bl __dl__FPv lbl_80167BE0: /* 80167BE0 00164B20 7F E3 FB 78 */ mr r3, r31 /* 80167BE4 00164B24 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -38028,7 +38028,7 @@ dComIfGs_isTmpBit: /* 801828F4 0017F834 90 1F 00 30 */ stw r0, 0x30(r31) /* 801828F8 0017F838 7C 80 07 35 */ extsh. r0, r4 /* 801828FC 0017F83C 40 81 00 08 */ ble lbl_80182904 -/* 80182900 0017F840 48 14 C4 3D */ bl __dl +/* 80182900 0017F840 48 14 C4 3D */ bl __dl__FPv lbl_80182904: /* 80182904 0017F844 7F E3 FB 78 */ mr r3, r31 /* 80182908 0017F848 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -38049,7 +38049,7 @@ dCamera_c_NS_dCamInfo_c_NS_dtor: /* 80182934 0017F874 41 82 00 10 */ beq lbl_80182944 /* 80182938 0017F878 7C 80 07 35 */ extsh. r0, r4 /* 8018293C 0017F87C 40 81 00 08 */ ble lbl_80182944 -/* 80182940 0017F880 48 14 C3 FD */ bl __dl +/* 80182940 0017F880 48 14 C3 FD */ bl __dl__FPv lbl_80182944: /* 80182944 0017F884 7F E3 FB 78 */ mr r3, r31 /* 80182948 0017F888 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index d5de83f93e..1b49c6020d 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -19,7 +19,7 @@ /* 80037E18 00034D58 7F E0 07 35 */ extsh. r0, r31 /* 80037E1C 00034D5C 40 81 00 0C */ ble lbl_80037E28 /* 80037E20 00034D60 7F C3 F3 78 */ mr r3, r30 -/* 80037E24 00034D64 48 29 6F 19 */ bl __dl +/* 80037E24 00034D64 48 29 6F 19 */ bl __dl__FPv lbl_80037E28: /* 80037E28 00034D68 7F C3 F3 78 */ mr r3, r30 /* 80037E2C 00034D6C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -58,7 +58,7 @@ lbl_80037E64: /* 80037EA8 00034DE8 7F E0 07 35 */ extsh. r0, r31 /* 80037EAC 00034DEC 40 81 00 0C */ ble lbl_80037EB8 /* 80037EB0 00034DF0 7F C3 F3 78 */ mr r3, r30 -/* 80037EB4 00034DF4 48 29 6E 89 */ bl __dl +/* 80037EB4 00034DF4 48 29 6E 89 */ bl __dl__FPv lbl_80037EB8: /* 80037EB8 00034DF8 7F C3 F3 78 */ mr r3, r30 /* 80037EBC 00034DFC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -83,7 +83,7 @@ lbl_80037EB8: /* 80037F08 00034E48 48 00 00 FC */ b lbl_80038004 lbl_80037F0C: /* 80037F0C 00034E4C 38 60 00 10 */ li r3, 0x10 -/* 80037F10 00034E50 48 29 6D 3D */ bl __nw +/* 80037F10 00034E50 48 29 6D 3D */ bl __nw__FUl /* 80037F14 00034E54 7C 7E 1B 79 */ or. r30, r3, r3 /* 80037F18 00034E58 41 82 00 38 */ beq lbl_80037F50 /* 80037F1C 00034E5C 3C 60 80 3C */ lis r3, lbl_803C5610@ha @@ -107,7 +107,7 @@ lbl_80037F50: lbl_80037F60: /* 80037F60 00034EA0 93 C1 00 08 */ stw r30, 8(r1) /* 80037F64 00034EA4 38 60 00 38 */ li r3, 0x38 -/* 80037F68 00034EA8 48 29 6C E5 */ bl __nw +/* 80037F68 00034EA8 48 29 6C E5 */ bl __nw__FUl /* 80037F6C 00034EAC 7C 7D 1B 79 */ or. r29, r3, r3 /* 80037F70 00034EB0 41 82 00 14 */ beq lbl_80037F84 /* 80037F74 00034EB4 7F 84 E3 78 */ mr r4, r28 @@ -223,7 +223,7 @@ lbl_800380D8: /* 800380FC 0003503C 7F E0 07 35 */ extsh. r0, r31 /* 80038100 00035040 40 81 00 0C */ ble lbl_8003810C /* 80038104 00035044 7F C3 F3 78 */ mr r3, r30 -/* 80038108 00035048 48 29 6C 35 */ bl __dl +/* 80038108 00035048 48 29 6C 35 */ bl __dl__FPv lbl_8003810C: /* 8003810C 0003504C 7F C3 F3 78 */ mr r3, r30 /* 80038110 00035050 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1255,7 +1255,7 @@ dDemo_object_c_NS_dtor: /* 80038F94 00035ED4 7F E0 07 35 */ extsh. r0, r31 /* 80038F98 00035ED8 40 81 00 0C */ ble lbl_80038FA4 /* 80038F9C 00035EDC 7F C3 F3 78 */ mr r3, r30 -/* 80038FA0 00035EE0 48 29 5D 9D */ bl __dl +/* 80038FA0 00035EE0 48 29 5D 9D */ bl __dl__FPv lbl_80038FA4: /* 80038FA4 00035EE4 7F C3 F3 78 */ mr r3, r30 /* 80038FA8 00035EE8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1288,7 +1288,7 @@ lbl_80038FF4: /* 80039004 00035F44 48 00 00 6C */ b lbl_80039070 lbl_80039008: /* 80039008 00035F48 38 60 00 6C */ li r3, 0x6c -/* 8003900C 00035F4C 48 29 5C 41 */ bl __nw +/* 8003900C 00035F4C 48 29 5C 41 */ bl __nw__FUl /* 80039010 00035F50 7C 7F 1B 79 */ or. r31, r3, r3 /* 80039014 00035F54 41 82 00 0C */ beq lbl_80039020 /* 80039018 00035F58 4B FF F0 09 */ bl dDemo_actor_c @@ -1351,7 +1351,7 @@ dDemo_object_c_NS_createCamera: /* 800390CC 0003600C 48 00 00 48 */ b lbl_80039114 lbl_800390D0: /* 800390D0 00036010 38 60 00 40 */ li r3, 0x40 -/* 800390D4 00036014 48 29 5B 79 */ bl __nw +/* 800390D4 00036014 48 29 5B 79 */ bl __nw__FUl /* 800390D8 00036018 28 03 00 00 */ cmplwi r3, 0 /* 800390DC 0003601C 41 82 00 30 */ beq lbl_8003910C /* 800390E0 00036020 3C 80 80 3C */ lis r4, lbl_803C47E8@ha @@ -1396,7 +1396,7 @@ dDemo_object_c_NS_createAmbient: /* 8003915C 0003609C 48 00 00 48 */ b lbl_800391A4 lbl_80039160: /* 80039160 000360A0 38 60 00 0C */ li r3, 0xc -/* 80039164 000360A4 48 29 5A E9 */ bl __nw +/* 80039164 000360A4 48 29 5A E9 */ bl __nw__FUl /* 80039168 000360A8 28 03 00 00 */ cmplwi r3, 0 /* 8003916C 000360AC 41 82 00 30 */ beq lbl_8003919C /* 80039170 000360B0 3C 80 80 3C */ lis r4, lbl_803C47E8@ha @@ -1434,7 +1434,7 @@ dDemo_object_c_NS_appendLight: /* 800391DC 0003611C 48 00 00 68 */ b lbl_80039244 lbl_800391E0: /* 800391E0 00036120 38 60 00 3C */ li r3, 0x3c -/* 800391E4 00036124 48 29 5A 69 */ bl __nw +/* 800391E4 00036124 48 29 5A 69 */ bl __nw__FUl /* 800391E8 00036128 28 03 00 00 */ cmplwi r3, 0 /* 800391EC 0003612C 41 82 00 30 */ beq lbl_8003921C /* 800391F0 00036130 3C 80 80 3C */ lis r4, lbl_803C47E8@ha @@ -1480,7 +1480,7 @@ dDemo_object_c_NS_createFog: /* 80039278 000361B8 48 00 00 48 */ b lbl_800392C0 lbl_8003927C: /* 8003927C 000361BC 38 60 00 14 */ li r3, 0x14 -/* 80039280 000361C0 48 29 59 CD */ bl __nw +/* 80039280 000361C0 48 29 59 CD */ bl __nw__FUl /* 80039284 000361C4 28 03 00 00 */ cmplwi r3, 0 /* 80039288 000361C8 41 82 00 30 */ beq lbl_800392B8 /* 8003928C 000361CC 3C 80 80 3C */ lis r4, lbl_803C47E8@ha @@ -1608,7 +1608,7 @@ lbl_800393F4: /* 8003943C 0003637C 7F E0 07 35 */ extsh. r0, r31 /* 80039440 00036380 40 81 00 0C */ ble lbl_8003944C /* 80039444 00036384 7F C3 F3 78 */ mr r3, r30 -/* 80039448 00036388 48 29 58 F5 */ bl __dl +/* 80039448 00036388 48 29 58 F5 */ bl __dl__FPv lbl_8003944C: /* 8003944C 0003638C 7F C3 F3 78 */ mr r3, r30 /* 80039450 00036390 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1633,7 +1633,7 @@ lbl_8003944C: /* 8003949C 000363DC 7F E0 07 35 */ extsh. r0, r31 /* 800394A0 000363E0 40 81 00 0C */ ble lbl_800394AC /* 800394A4 000363E4 7F C3 F3 78 */ mr r3, r30 -/* 800394A8 000363E8 48 29 58 95 */ bl __dl +/* 800394A8 000363E8 48 29 58 95 */ bl __dl__FPv lbl_800394AC: /* 800394AC 000363EC 7F C3 F3 78 */ mr r3, r30 /* 800394B0 000363F0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1658,7 +1658,7 @@ lbl_800394AC: /* 800394FC 0003643C 7F E0 07 35 */ extsh. r0, r31 /* 80039500 00036440 40 81 00 0C */ ble lbl_8003950C /* 80039504 00036444 7F C3 F3 78 */ mr r3, r30 -/* 80039508 00036448 48 29 58 35 */ bl __dl +/* 80039508 00036448 48 29 58 35 */ bl __dl__FPv lbl_8003950C: /* 8003950C 0003644C 7F C3 F3 78 */ mr r3, r30 /* 80039510 00036450 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1769,7 +1769,7 @@ dDemo_c_NS_create: /* 8003967C 000365BC 7C 08 02 A6 */ mflr r0 /* 80039680 000365C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80039684 000365C4 38 60 00 08 */ li r3, 8 -/* 80039688 000365C8 48 29 55 C5 */ bl __nw +/* 80039688 000365C8 48 29 55 C5 */ bl __nw__FUl /* 8003968C 000365CC 28 03 00 00 */ cmplwi r3, 0 /* 80039690 000365D0 41 82 00 30 */ beq lbl_800396C0 /* 80039694 000365D4 3C 80 80 3C */ lis r4, lbl_803C47E8@ha @@ -1786,7 +1786,7 @@ dDemo_c_NS_create: lbl_800396C0: /* 800396C0 00036600 90 6D 88 80 */ stw r3, lbl_80450E00-_SDA_BASE_(r13) /* 800396C4 00036604 38 60 01 10 */ li r3, 0x110 -/* 800396C8 00036608 48 29 55 85 */ bl __nw +/* 800396C8 00036608 48 29 55 85 */ bl __nw__FUl /* 800396CC 0003660C 7C 60 1B 79 */ or. r0, r3, r3 /* 800396D0 00036610 41 82 00 0C */ beq lbl_800396DC /* 800396D4 00036614 48 24 BA 41 */ bl JStudio_NS_TControl @@ -1794,7 +1794,7 @@ lbl_800396C0: lbl_800396DC: /* 800396DC 0003661C 90 0D 88 84 */ stw r0, lbl_80450E04-_SDA_BASE_(r13) /* 800396E0 00036620 38 60 00 38 */ li r3, 0x38 -/* 800396E4 00036624 48 29 55 69 */ bl __nw +/* 800396E4 00036624 48 29 55 69 */ bl __nw__FUl /* 800396E8 00036628 7C 60 1B 79 */ or. r0, r3, r3 /* 800396EC 0003662C 41 82 00 0C */ beq lbl_800396F8 /* 800396F0 00036630 48 1F 02 FD */ bl jmessage_tControl @@ -1802,7 +1802,7 @@ lbl_800396DC: lbl_800396F8: /* 800396F8 00036638 90 0D 88 9C */ stw r0, lbl_80450E1C-_SDA_BASE_(r13) /* 800396FC 0003663C 38 60 00 10 */ li r3, 0x10 -/* 80039700 00036640 48 29 55 4D */ bl __nw +/* 80039700 00036640 48 29 55 4D */ bl __nw__FUl /* 80039704 00036644 28 03 00 00 */ cmplwi r3, 0 /* 80039708 00036648 41 82 00 30 */ beq lbl_80039738 /* 8003970C 0003664C 80 AD 88 80 */ lwz r5, lbl_80450E00-_SDA_BASE_(r13) @@ -1819,7 +1819,7 @@ lbl_800396F8: lbl_80039738: /* 80039738 00036678 90 6D 88 88 */ stw r3, lbl_80450E08-_SDA_BASE_(r13) /* 8003973C 0003667C 38 60 00 18 */ li r3, 0x18 -/* 80039740 00036680 48 29 55 0D */ bl __nw +/* 80039740 00036680 48 29 55 0D */ bl __nw__FUl /* 80039744 00036684 28 03 00 00 */ cmplwi r3, 0 /* 80039748 00036688 41 82 00 3C */ beq lbl_80039784 /* 8003974C 0003668C 80 ED 85 F4 */ lwz r7, lbl_80450B74-_SDA_BASE_(r13) @@ -1841,7 +1841,7 @@ lbl_80039784: /* 80039788 000366C8 38 00 00 01 */ li r0, 1 /* 8003978C 000366CC 98 03 00 14 */ stb r0, 0x14(r3) /* 80039790 000366D0 38 60 00 18 */ li r3, 0x18 -/* 80039794 000366D4 48 29 54 B9 */ bl __nw +/* 80039794 000366D4 48 29 54 B9 */ bl __nw__FUl /* 80039798 000366D8 28 03 00 00 */ cmplwi r3, 0 /* 8003979C 000366DC 41 82 00 48 */ beq lbl_800397E4 /* 800397A0 000366E0 80 CD 89 20 */ lwz r6, lbl_80450EA0-_SDA_BASE_(r13) @@ -1864,7 +1864,7 @@ lbl_80039784: lbl_800397E4: /* 800397E4 00036724 90 6D 88 90 */ stw r3, lbl_80450E10-_SDA_BASE_(r13) /* 800397E8 00036728 38 60 00 0C */ li r3, 0xc -/* 800397EC 0003672C 48 29 54 61 */ bl __nw +/* 800397EC 0003672C 48 29 54 61 */ bl __nw__FUl /* 800397F0 00036730 28 03 00 00 */ cmplwi r3, 0 /* 800397F4 00036734 41 82 00 28 */ beq lbl_8003981C /* 800397F8 00036738 3C 80 80 3A */ lis r4, lbl_803A7934@ha @@ -1879,7 +1879,7 @@ lbl_800397E4: lbl_8003981C: /* 8003981C 0003675C 90 6D 88 94 */ stw r3, lbl_80450E14-_SDA_BASE_(r13) /* 80039820 00036760 38 60 00 18 */ li r3, 0x18 -/* 80039824 00036764 48 29 54 29 */ bl __nw +/* 80039824 00036764 48 29 54 29 */ bl __nw__FUl /* 80039828 00036768 28 03 00 00 */ cmplwi r3, 0 /* 8003982C 0003676C 41 82 00 50 */ beq lbl_8003987C /* 80039830 00036770 3C 80 80 3C */ lis r4, lbl_803C56C0@ha @@ -1904,7 +1904,7 @@ lbl_8003981C: lbl_8003987C: /* 8003987C 000367BC 90 6D 88 98 */ stw r3, lbl_80450E18-_SDA_BASE_(r13) /* 80039880 000367C0 38 60 00 B0 */ li r3, 0xb0 -/* 80039884 000367C4 48 29 53 C9 */ bl __nw +/* 80039884 000367C4 48 29 53 C9 */ bl __nw__FUl /* 80039888 000367C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8003988C 000367CC 41 82 00 0C */ beq lbl_80039898 /* 80039890 000367D0 4B FF F6 C5 */ bl dDemo_object_c @@ -2079,7 +2079,7 @@ lbl_80039A9C: /* 80039AE0 00036A20 7F E0 07 35 */ extsh. r0, r31 /* 80039AE4 00036A24 40 81 00 0C */ ble lbl_80039AF0 /* 80039AE8 00036A28 7F C3 F3 78 */ mr r3, r30 -/* 80039AEC 00036A2C 48 29 52 51 */ bl __dl +/* 80039AEC 00036A2C 48 29 52 51 */ bl __dl__FPv lbl_80039AF0: /* 80039AF0 00036A30 7F C3 F3 78 */ mr r3, r30 /* 80039AF4 00036A34 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2104,7 +2104,7 @@ lbl_80039AF0: /* 80039B40 00036A80 7F E0 07 35 */ extsh. r0, r31 /* 80039B44 00036A84 40 81 00 0C */ ble lbl_80039B50 /* 80039B48 00036A88 7F C3 F3 78 */ mr r3, r30 -/* 80039B4C 00036A8C 48 29 51 F1 */ bl __dl +/* 80039B4C 00036A8C 48 29 51 F1 */ bl __dl__FPv lbl_80039B50: /* 80039B50 00036A90 7F C3 F3 78 */ mr r3, r30 /* 80039B54 00036A94 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2433,7 +2433,7 @@ dDemo_c_NS_reset: /* 80039FD0 00036F10 7F E0 07 35 */ extsh. r0, r31 /* 80039FD4 00036F14 40 81 00 0C */ ble lbl_80039FE0 /* 80039FD8 00036F18 7F C3 F3 78 */ mr r3, r30 -/* 80039FDC 00036F1C 48 29 4D 61 */ bl __dl +/* 80039FDC 00036F1C 48 29 4D 61 */ bl __dl__FPv lbl_80039FE0: /* 80039FE0 00036F20 7F C3 F3 78 */ mr r3, r30 /* 80039FE4 00036F24 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2458,7 +2458,7 @@ lbl_80039FE0: /* 8003A030 00036F70 7F E0 07 35 */ extsh. r0, r31 /* 8003A034 00036F74 40 81 00 0C */ ble lbl_8003A040 /* 8003A038 00036F78 7F C3 F3 78 */ mr r3, r30 -/* 8003A03C 00036F7C 48 29 4D 01 */ bl __dl +/* 8003A03C 00036F7C 48 29 4D 01 */ bl __dl__FPv lbl_8003A040: /* 8003A040 00036F80 7F C3 F3 78 */ mr r3, r30 /* 8003A044 00036F84 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index ec7526ae35..bb3eaaab66 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -2242,7 +2242,7 @@ lbl_80053BF0: /* 80053CB4 00050BF4 90 1F 00 00 */ stw r0, 0(r31) /* 80053CB8 00050BF8 7C 80 07 35 */ extsh. r0, r4 /* 80053CBC 00050BFC 40 81 00 08 */ ble lbl_80053CC4 -/* 80053CC0 00050C00 48 27 B0 7D */ bl __dl +/* 80053CC0 00050C00 48 27 B0 7D */ bl __dl__FPv lbl_80053CC4: /* 80053CC4 00050C04 7F E3 FB 78 */ mr r3, r31 /* 80053CC8 00050C08 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2777,7 +2777,7 @@ J3DDrawBuffer__create: /* 80054488 000513C8 93 C1 00 08 */ stw r30, 8(r1) /* 8005448C 000513CC 7C 7E 1B 78 */ mr r30, r3 /* 80054490 000513D0 38 60 00 24 */ li r3, 0x24 -/* 80054494 000513D4 48 27 A7 B9 */ bl __nw +/* 80054494 000513D4 48 27 A7 B9 */ bl __nw__FUl /* 80054498 000513D8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8005449C 000513DC 41 82 00 08 */ beq lbl_800544A4 /* 800544A0 000513E0 48 2D 0A 69 */ bl J3DDrawBuffer_NS_initialize @@ -3209,7 +3209,7 @@ lbl_80054A44: /* 80054AA0 000519E0 7F E0 07 35 */ extsh. r0, r31 /* 80054AA4 000519E4 40 81 00 0C */ ble lbl_80054AB0 /* 80054AA8 000519E8 7F C3 F3 78 */ mr r3, r30 -/* 80054AAC 000519EC 48 27 A2 91 */ bl __dl +/* 80054AAC 000519EC 48 27 A2 91 */ bl __dl__FPv lbl_80054AB0: /* 80054AB0 000519F0 7F C3 F3 78 */ mr r3, r30 /* 80054AB4 000519F4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4057,7 +4057,7 @@ lbl_800556AC: /* 800556C4 00052604 38 E0 00 00 */ li r7, 0 /* 800556C8 00052608 48 30 85 55 */ bl GXGetTexBufferSize /* 800556CC 0005260C 38 80 00 20 */ li r4, 0x20 -/* 800556D0 00052610 48 27 96 1D */ bl __nwa_X1_ +/* 800556D0 00052610 48 27 96 1D */ bl __nwa__FUli /* 800556D4 00052614 3C 9E 00 01 */ addis r4, r30, 1 /* 800556D8 00052618 38 84 5E F0 */ addi r4, r4, 0x5ef0 /* 800556DC 0005261C 7C 79 21 2E */ stwx r3, r25, r4 @@ -4889,7 +4889,7 @@ lbl_80056244: /* 80056244 00053184 7F E0 07 35 */ extsh. r0, r31 /* 80056248 00053188 40 81 00 0C */ ble lbl_80056254 /* 8005624C 0005318C 7F C3 F3 78 */ mr r3, r30 -/* 80056250 00053190 48 27 8A ED */ bl __dl +/* 80056250 00053190 48 27 8A ED */ bl __dl__FPv lbl_80056254: /* 80056254 00053194 7F C3 F3 78 */ mr r3, r30 /* 80056258 00053198 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4916,7 +4916,7 @@ dDlst_shadowTri_c_NS_dtor: /* 800562A4 000531E4 7F E0 07 35 */ extsh. r0, r31 /* 800562A8 000531E8 40 81 00 0C */ ble lbl_800562B4 /* 800562AC 000531EC 7F C3 F3 78 */ mr r3, r30 -/* 800562B0 000531F0 48 27 8A 8D */ bl __dl +/* 800562B0 000531F0 48 27 8A 8D */ bl __dl__FPv lbl_800562B4: /* 800562B4 000531F4 7F C3 F3 78 */ mr r3, r30 /* 800562B8 000531F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5096,7 +5096,7 @@ lbl_8005650C: /* 8005650C 0005344C 7F A0 07 35 */ extsh. r0, r29 /* 80056510 00053450 40 81 00 0C */ ble lbl_8005651C /* 80056514 00053454 7F 83 E3 78 */ mr r3, r28 -/* 80056518 00053458 48 27 88 25 */ bl __dl +/* 80056518 00053458 48 27 88 25 */ bl __dl__FPv lbl_8005651C: /* 8005651C 0005345C 7F 83 E3 78 */ mr r3, r28 /* 80056520 00053460 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 6c3d441375..ede6cdd173 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -294,9 +294,9 @@ lbl_8019B110: /* 8019B150 00198090 4B E7 40 7D */ bl mDoExt_setCurrentHeap /* 8019B154 00198094 7C 7E 1B 78 */ mr r30, r3 /* 8019B158 00198098 80 7D 01 10 */ lwz r3, 0x110(r29) -/* 8019B15C 0019809C 48 13 36 29 */ bl JKRHeap_NS_getTotalFreeSize +/* 8019B15C 0019809C 48 13 36 29 */ bl getTotalFreeSize__7JKRHeapFv /* 8019B160 001980A0 38 60 00 18 */ li r3, 0x18 -/* 8019B164 001980A4 48 13 3A E9 */ bl __nw +/* 8019B164 001980A4 48 13 3A E9 */ bl __nw__FUl /* 8019B168 001980A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B16C 001980AC 41 82 00 10 */ beq lbl_8019B17C /* 8019B170 001980B0 80 9C 00 14 */ lwz r4, 0x14(r28) @@ -305,7 +305,7 @@ lbl_8019B110: lbl_8019B17C: /* 8019B17C 001980BC 90 1D 01 00 */ stw r0, 0x100(r29) /* 8019B180 001980C0 38 60 21 A4 */ li r3, 0x21a4 -/* 8019B184 001980C4 48 13 3A C9 */ bl __nw +/* 8019B184 001980C4 48 13 3A C9 */ bl __nw__FUl /* 8019B188 001980C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B18C 001980CC 41 82 00 0C */ beq lbl_8019B198 /* 8019B190 001980D0 48 05 45 11 */ bl dMenu_save_c @@ -354,7 +354,7 @@ lbl_8019B228: /* 8019B228 00198168 80 7D 00 FC */ lwz r3, 0xfc(r29) /* 8019B22C 0019816C 48 05 45 81 */ bl dMenu_save_c_NS__create /* 8019B230 00198170 38 60 00 04 */ li r3, 4 -/* 8019B234 00198174 48 13 3A 19 */ bl __nw +/* 8019B234 00198174 48 13 3A 19 */ bl __nw__FUl /* 8019B238 00198178 28 03 00 00 */ cmplwi r3, 0 /* 8019B23C 0019817C 41 82 00 1C */ beq lbl_8019B258 /* 8019B240 00198180 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -829,7 +829,7 @@ lbl_8019B8DC: /* 8019B8F8 00198838 4E 80 04 21 */ bctrl lbl_8019B8FC: /* 8019B8FC 0019883C 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8019B900 00198840 48 13 2C CD */ bl JKRHeap_NS_freeAll +/* 8019B900 00198840 48 13 2C CD */ bl freeAll__7JKRHeapFv /* 8019B904 00198844 38 60 00 00 */ li r3, 0 /* 8019B908 00198848 4B E9 28 81 */ bl dComIfGp_offHeapLockFlag /* 8019B90C 0019884C 7F E3 FB 78 */ mr r3, r31 @@ -864,7 +864,7 @@ dDlst_GameOverScrnDraw_c: /* 8019B974 001988B4 38 00 FF FF */ li r0, -1 /* 8019B978 001988B8 90 1F 00 14 */ stw r0, 0x14(r31) /* 8019B97C 001988BC 38 60 01 18 */ li r3, 0x118 -/* 8019B980 001988C0 48 13 32 CD */ bl __nw +/* 8019B980 001988C0 48 13 32 CD */ bl __nw__FUl /* 8019B984 001988C4 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B988 001988C8 41 82 00 0C */ beq lbl_8019B994 /* 8019B98C 001988CC 48 15 CB 0D */ bl J2DScreen @@ -950,7 +950,7 @@ lbl_8019BA54: /* 8019BAC4 00198A04 4E 80 04 21 */ bctrl /* 8019BAC8 00198A08 7C 7E 1B 78 */ mr r30, r3 /* 8019BACC 00198A0C 38 60 01 50 */ li r3, 0x150 -/* 8019BAD0 00198A10 48 13 31 7D */ bl __nw +/* 8019BAD0 00198A10 48 13 31 7D */ bl __nw__FUl /* 8019BAD4 00198A14 7C 60 1B 79 */ or. r0, r3, r3 /* 8019BAD8 00198A18 41 82 00 40 */ beq lbl_8019BB18 /* 8019BADC 00198A1C C0 22 A1 80 */ lfs f1, lbl_80453B80-_SDA2_BASE_(r2) @@ -1009,7 +1009,7 @@ lbl_8019BB18: /* 8019BBAC 00198AEC 4C C6 31 82 */ crclr 6 /* 8019BBB0 00198AF0 48 16 4A B1 */ bl J2DTextBox_NS_setString /* 8019BBB4 00198AF4 38 60 00 24 */ li r3, 0x24 -/* 8019BBB8 00198AF8 48 13 30 95 */ bl __nw +/* 8019BBB8 00198AF8 48 13 30 95 */ bl __nw__FUl /* 8019BBBC 00198AFC 7C 60 1B 79 */ or. r0, r3, r3 /* 8019BBC0 00198B00 41 82 00 14 */ beq lbl_8019BBD4 /* 8019BBC4 00198B04 38 80 00 06 */ li r4, 6 @@ -1066,7 +1066,7 @@ lbl_8019BC68: /* 8019BC84 00198BC4 7F E0 07 35 */ extsh. r0, r31 /* 8019BC88 00198BC8 40 81 00 0C */ ble lbl_8019BC94 /* 8019BC8C 00198BCC 7F C3 F3 78 */ mr r3, r30 -/* 8019BC90 00198BD0 48 13 30 AD */ bl __dl +/* 8019BC90 00198BD0 48 13 30 AD */ bl __dl__FPv lbl_8019BC94: /* 8019BC94 00198BD4 7F C3 F3 78 */ mr r3, r30 /* 8019BC98 00198BD8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1349,7 +1349,7 @@ lbl_8019C0A0: /* 8019C0A0 00198FE0 7C 80 07 35 */ extsh. r0, r4 /* 8019C0A4 00198FE4 40 81 00 0C */ ble lbl_8019C0B0 /* 8019C0A8 00198FE8 7F E3 FB 78 */ mr r3, r31 -/* 8019C0AC 00198FEC 48 13 2C 91 */ bl __dl +/* 8019C0AC 00198FEC 48 13 2C 91 */ bl __dl__FPv lbl_8019C0B0: /* 8019C0B0 00198FF0 7F E3 FB 78 */ mr r3, r31 /* 8019C0B4 00198FF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1499,7 +1499,7 @@ lbl_8019C0B0: /* 8019C2EC 0019922C 90 1F 00 00 */ stw r0, 0(r31) /* 8019C2F0 00199230 7C 80 07 35 */ extsh. r0, r4 /* 8019C2F4 00199234 40 81 00 08 */ ble lbl_8019C2FC -/* 8019C2F8 00199238 48 13 2A 45 */ bl __dl +/* 8019C2F8 00199238 48 13 2A 45 */ bl __dl__FPv lbl_8019C2FC: /* 8019C2FC 0019923C 7F E3 FB 78 */ mr r3, r31 /* 8019C300 00199240 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1531,7 +1531,7 @@ lbl_8019C360: /* 8019C360 001992A0 7C 80 07 35 */ extsh. r0, r4 /* 8019C364 001992A4 40 81 00 0C */ ble lbl_8019C370 /* 8019C368 001992A8 7F E3 FB 78 */ mr r3, r31 -/* 8019C36C 001992AC 48 13 29 D1 */ bl __dl +/* 8019C36C 001992AC 48 13 29 D1 */ bl __dl__FPv lbl_8019C370: /* 8019C370 001992B0 7F E3 FB 78 */ mr r3, r31 /* 8019C374 001992B4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 5204446661..0a2ac09004 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -2810,7 +2810,7 @@ undwater_init: /* 8019EB24 0019BA64 28 03 00 00 */ cmplwi r3, 0 /* 8019EB28 0019BA68 41 82 00 84 */ beq lbl_8019EBAC /* 8019EB2C 0019BA6C 38 60 00 18 */ li r3, 0x18 -/* 8019EB30 0019BA70 48 13 01 1D */ bl __nw +/* 8019EB30 0019BA70 48 13 01 1D */ bl __nw__FUl /* 8019EB34 0019BA74 7C 7E 1B 79 */ or. r30, r3, r3 /* 8019EB38 0019BA78 41 82 00 20 */ beq lbl_8019EB58 /* 8019EB3C 0019BA7C 3C 80 80 3A */ lis r4, lbl_803A3354@ha @@ -3466,7 +3466,7 @@ BOSS_LIGHT_NS_dtor: /* 8019F44C 0019C38C 41 82 00 10 */ beq lbl_8019F45C /* 8019F450 0019C390 7C 80 07 35 */ extsh. r0, r4 /* 8019F454 0019C394 40 81 00 08 */ ble lbl_8019F45C -/* 8019F458 0019C398 48 12 F8 E5 */ bl __dl +/* 8019F458 0019C398 48 12 F8 E5 */ bl __dl__FPv lbl_8019F45C: /* 8019F45C 0019C39C 7F E3 FB 78 */ mr r3, r31 /* 8019F460 0019C3A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3487,7 +3487,7 @@ DUNGEON_LIGHT_NS_dtor: /* 8019F48C 0019C3CC 41 82 00 10 */ beq lbl_8019F49C /* 8019F490 0019C3D0 7C 80 07 35 */ extsh. r0, r4 /* 8019F494 0019C3D4 40 81 00 08 */ ble lbl_8019F49C -/* 8019F498 0019C3D8 48 12 F8 A5 */ bl __dl +/* 8019F498 0019C3D8 48 12 F8 A5 */ bl __dl__FPv lbl_8019F49C: /* 8019F49C 0019C3DC 7F E3 FB 78 */ mr r3, r31 /* 8019F4A0 0019C3E0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3508,7 +3508,7 @@ WIND_INF_ENTITY_NS_dtor: /* 8019F4CC 0019C40C 41 82 00 10 */ beq lbl_8019F4DC /* 8019F4D0 0019C410 7C 80 07 35 */ extsh. r0, r4 /* 8019F4D4 0019C414 40 81 00 08 */ ble lbl_8019F4DC -/* 8019F4D8 0019C418 48 12 F8 65 */ bl __dl +/* 8019F4D8 0019C418 48 12 F8 65 */ bl __dl__FPv lbl_8019F4DC: /* 8019F4DC 0019C41C 7F E3 FB 78 */ mr r3, r31 /* 8019F4E0 0019C420 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -19692,7 +19692,7 @@ dScnKy_env_light_c_NS_dtor: /* 801ADC78 001AABB8 7F E0 07 35 */ extsh. r0, r31 /* 801ADC7C 001AABBC 40 81 00 0C */ ble lbl_801ADC88 /* 801ADC80 001AABC0 7F C3 F3 78 */ mr r3, r30 -/* 801ADC84 001AABC4 48 12 10 B9 */ bl __dl +/* 801ADC84 001AABC4 48 12 10 B9 */ bl __dl__FPv lbl_801ADC88: /* 801ADC88 001AABC8 7F C3 F3 78 */ mr r3, r30 /* 801ADC8C 001AABCC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_map.s b/asm/d/d_map.s index d37e2457bd..532851ce3c 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -1410,7 +1410,7 @@ dMap_c: /* 8002991C 0002685C 98 7F 00 90 */ stb r3, 0x90(r31) /* 80029920 00026860 38 60 01 BC */ li r3, 0x1bc /* 80029924 00026864 38 80 00 20 */ li r4, 0x20 -/* 80029928 00026868 48 2A 53 4D */ bl __nw_X1_ +/* 80029928 00026868 48 2A 53 4D */ bl __nw__FUli /* 8002992C 0002686C 90 7F 00 44 */ stw r3, 0x44(r31) /* 80029930 00026870 80 1F 00 44 */ lwz r0, 0x44(r31) /* 80029934 00026874 90 0D 88 00 */ stw r0, lbl_80450D80-_SDA_BASE_(r13) @@ -1444,7 +1444,7 @@ lbl_80029990: /* 800299A0 000268E0 38 E0 00 00 */ li r7, 0 /* 800299A4 000268E4 48 33 42 79 */ bl GXGetTexBufferSize /* 800299A8 000268E8 38 80 00 20 */ li r4, 0x20 -/* 800299AC 000268EC 48 2A 53 41 */ bl __nwa_X1_ +/* 800299AC 000268EC 48 2A 53 41 */ bl __nwa__FUli /* 800299B0 000268F0 90 7F 00 4C */ stw r3, 0x4c(r31) /* 800299B4 000268F4 A0 DF 00 7A */ lhz r6, 0x7a(r31) /* 800299B8 000268F8 A0 BF 00 78 */ lhz r5, 0x78(r31) @@ -1455,7 +1455,7 @@ lbl_80029990: /* 800299CC 0002690C 48 01 62 FD */ bl renderingDAmap_c_NS_init /* 800299D0 00026910 38 60 00 20 */ li r3, 0x20 /* 800299D4 00026914 38 80 00 20 */ li r4, 0x20 -/* 800299D8 00026918 48 2A 52 9D */ bl __nw_X1_ +/* 800299D8 00026918 48 2A 52 9D */ bl __nw__FUli /* 800299DC 0002691C 90 7F 00 48 */ stw r3, 0x48(r31) /* 800299E0 00026920 7F E3 FB 78 */ mr r3, r31 /* 800299E4 00026924 80 9F 00 48 */ lwz r4, 0x48(r31) @@ -1483,21 +1483,21 @@ dMap_c_NS__remove: /* 80029A30 00026970 80 63 00 4C */ lwz r3, 0x4c(r3) /* 80029A34 00026974 28 03 00 00 */ cmplwi r3, 0 /* 80029A38 00026978 41 82 00 10 */ beq lbl_80029A48 -/* 80029A3C 0002697C 48 2A 53 25 */ bl __dla +/* 80029A3C 0002697C 48 2A 53 25 */ bl __dla__FPv /* 80029A40 00026980 38 00 00 00 */ li r0, 0 /* 80029A44 00026984 90 1F 00 4C */ stw r0, 0x4c(r31) lbl_80029A48: /* 80029A48 00026988 80 7F 00 48 */ lwz r3, 0x48(r31) /* 80029A4C 0002698C 28 03 00 00 */ cmplwi r3, 0 /* 80029A50 00026990 41 82 00 10 */ beq lbl_80029A60 -/* 80029A54 00026994 48 2A 52 E9 */ bl __dl +/* 80029A54 00026994 48 2A 52 E9 */ bl __dl__FPv /* 80029A58 00026998 38 00 00 00 */ li r0, 0 /* 80029A5C 0002699C 90 1F 00 48 */ stw r0, 0x48(r31) lbl_80029A60: /* 80029A60 000269A0 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80029A64 000269A4 28 03 00 00 */ cmplwi r3, 0 /* 80029A68 000269A8 41 82 00 10 */ beq lbl_80029A78 -/* 80029A6C 000269AC 48 2A 52 D1 */ bl __dl +/* 80029A6C 000269AC 48 2A 52 D1 */ bl __dl__FPv /* 80029A70 000269B0 38 00 00 00 */ li r0, 0 /* 80029A74 000269B4 90 1F 00 44 */ stw r0, 0x44(r31) lbl_80029A78: @@ -2745,7 +2745,7 @@ lbl_8002AC4C: /* 8002AC4C 00027B8C 7C 80 07 35 */ extsh. r0, r4 /* 8002AC50 00027B90 40 81 00 0C */ ble lbl_8002AC5C /* 8002AC54 00027B94 7F E3 FB 78 */ mr r3, r31 -/* 8002AC58 00027B98 48 2A 40 E5 */ bl __dl +/* 8002AC58 00027B98 48 2A 40 E5 */ bl __dl__FPv lbl_8002AC5C: /* 8002AC5C 00027B9C 7F E3 FB 78 */ mr r3, r31 /* 8002AC60 00027BA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2774,7 +2774,7 @@ lbl_8002ACB8: /* 8002ACB8 00027BF8 7C 80 07 35 */ extsh. r0, r4 /* 8002ACBC 00027BFC 40 81 00 0C */ ble lbl_8002ACC8 /* 8002ACC0 00027C00 7F E3 FB 78 */ mr r3, r31 -/* 8002ACC4 00027C04 48 2A 40 79 */ bl __dl +/* 8002ACC4 00027C04 48 2A 40 79 */ bl __dl__FPv lbl_8002ACC8: /* 8002ACC8 00027C08 7F E3 FB 78 */ mr r3, r31 /* 8002ACCC 00027C0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2799,7 +2799,7 @@ lbl_8002AD14: /* 8002AD14 00027C54 7C 80 07 35 */ extsh. r0, r4 /* 8002AD18 00027C58 40 81 00 0C */ ble lbl_8002AD24 /* 8002AD1C 00027C5C 7F E3 FB 78 */ mr r3, r31 -/* 8002AD20 00027C60 48 2A 40 1D */ bl __dl +/* 8002AD20 00027C60 48 2A 40 1D */ bl __dl__FPv lbl_8002AD24: /* 8002AD24 00027C64 7F E3 FB 78 */ mr r3, r31 /* 8002AD28 00027C68 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2818,7 +2818,7 @@ lbl_8002AD24: /* 8002AD5C 00027C9C 90 1F 00 00 */ stw r0, 0(r31) /* 8002AD60 00027CA0 7C 80 07 35 */ extsh. r0, r4 /* 8002AD64 00027CA4 40 81 00 08 */ ble lbl_8002AD6C -/* 8002AD68 00027CA8 48 2A 3F D5 */ bl __dl +/* 8002AD68 00027CA8 48 2A 3F D5 */ bl __dl__FPv lbl_8002AD6C: /* 8002AD6C 00027CAC 7F E3 FB 78 */ mr r3, r31 /* 8002AD70 00027CB0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2878,7 +2878,7 @@ lbl_8002AE44: /* 8002AE44 00027D84 7C 80 07 35 */ extsh. r0, r4 /* 8002AE48 00027D88 40 81 00 0C */ ble lbl_8002AE54 /* 8002AE4C 00027D8C 7F E3 FB 78 */ mr r3, r31 -/* 8002AE50 00027D90 48 2A 3E ED */ bl __dl +/* 8002AE50 00027D90 48 2A 3E ED */ bl __dl__FPv lbl_8002AE54: /* 8002AE54 00027D94 7F E3 FB 78 */ mr r3, r31 /* 8002AE58 00027D98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2983,7 +2983,7 @@ lbl_8002AFD4: /* 8002AFD4 00027F14 7F E0 07 35 */ extsh. r0, r31 /* 8002AFD8 00027F18 40 81 00 0C */ ble lbl_8002AFE4 /* 8002AFDC 00027F1C 7F C3 F3 78 */ mr r3, r30 -/* 8002AFE0 00027F20 48 2A 3D 5D */ bl __dl +/* 8002AFE0 00027F20 48 2A 3D 5D */ bl __dl__FPv lbl_8002AFE4: /* 8002AFE4 00027F24 7F C3 F3 78 */ mr r3, r30 /* 8002AFE8 00027F28 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3031,7 +3031,7 @@ lbl_8002B08C: /* 8002B08C 00027FCC 7C 80 07 35 */ extsh. r0, r4 /* 8002B090 00027FD0 40 81 00 0C */ ble lbl_8002B09C /* 8002B094 00027FD4 7F E3 FB 78 */ mr r3, r31 -/* 8002B098 00027FD8 48 2A 3C A5 */ bl __dl +/* 8002B098 00027FD8 48 2A 3C A5 */ bl __dl__FPv lbl_8002B09C: /* 8002B09C 00027FDC 7F E3 FB 78 */ mr r3, r31 /* 8002B0A0 00027FE0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3072,7 +3072,7 @@ lbl_8002B128: /* 8002B128 00028068 7C 80 07 35 */ extsh. r0, r4 /* 8002B12C 0002806C 40 81 00 0C */ ble lbl_8002B138 /* 8002B130 00028070 7F E3 FB 78 */ mr r3, r31 -/* 8002B134 00028074 48 2A 3C 09 */ bl __dl +/* 8002B134 00028074 48 2A 3C 09 */ bl __dl__FPv lbl_8002B138: /* 8002B138 00028078 7F E3 FB 78 */ mr r3, r31 /* 8002B13C 0002807C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3109,7 +3109,7 @@ lbl_8002B1B4: /* 8002B1B4 000280F4 7C 80 07 35 */ extsh. r0, r4 /* 8002B1B8 000280F8 40 81 00 0C */ ble lbl_8002B1C4 /* 8002B1BC 000280FC 7F E3 FB 78 */ mr r3, r31 -/* 8002B1C0 00028100 48 2A 3B 7D */ bl __dl +/* 8002B1C0 00028100 48 2A 3B 7D */ bl __dl__FPv lbl_8002B1C4: /* 8002B1C4 00028104 7F E3 FB 78 */ mr r3, r31 /* 8002B1C8 00028108 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 28040126ef..7bee58e9b0 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -39,7 +39,7 @@ lbl_8021EA84: /* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap /* 8021EA8C 0021B9CC 7C 7E 1B 78 */ mr r30, r3 /* 8021EA90 0021B9D0 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EA94 0021B9D4 48 0A FC F1 */ bl JKRHeap_NS_getTotalFreeSize +/* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapFv /* 8021EA98 0021B9D8 38 7B 4E 00 */ addi r3, r27, 0x4e00 /* 8021EA9C 0021B9DC 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 8021EAA0 0021B9E0 38 84 93 38 */ addi r4, r4, lbl_80399338@l @@ -318,7 +318,7 @@ lbl_8021EE40: /* 8021EEBC 0021BDFC 90 1F 01 AC */ stw r0, 0x1ac(r31) /* 8021EEC0 0021BE00 B0 9F 01 9A */ sth r4, 0x19a(r31) /* 8021EEC4 0021BE04 38 60 08 64 */ li r3, 0x864 -/* 8021EEC8 0021BE08 48 0A FD 85 */ bl __nw +/* 8021EEC8 0021BE08 48 0A FD 85 */ bl __nw__FUl /* 8021EECC 0021BE0C 7C 60 1B 79 */ or. r0, r3, r3 /* 8021EED0 0021BE10 41 82 00 10 */ beq lbl_8021EEE0 /* 8021EED4 0021BE14 80 9F 01 00 */ lwz r4, 0x100(r31) @@ -330,7 +330,7 @@ lbl_8021EEE0: /* 8021EEE8 0021BE28 4B FF 6E C1 */ bl dMeter2Draw_c_NS_getNowLightDropRateCalc /* 8021EEEC 0021BE2C D0 3F 01 30 */ stfs f1, 0x130(r31) /* 8021EEF0 0021BE30 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EEF4 0021BE34 48 0A F8 91 */ bl JKRHeap_NS_getTotalFreeSize +/* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapFv /* 8021EEF8 0021BE38 3B 20 00 00 */ li r25, 0 /* 8021EEFC 0021BE3C 3B 80 00 00 */ li r28, 0 lbl_8021EF00: @@ -437,7 +437,7 @@ lbl_8021F050: /* 8021F06C 0021BFAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F070 0021BFB0 41 82 00 2C */ beq lbl_8021F09C /* 8021F074 0021BFB4 38 60 00 34 */ li r3, 0x34 -/* 8021F078 0021BFB8 48 0A FB D5 */ bl __nw +/* 8021F078 0021BFB8 48 0A FB D5 */ bl __nw__FUl /* 8021F07C 0021BFBC 7C 60 1B 79 */ or. r0, r3, r3 /* 8021F080 0021BFC0 41 82 00 14 */ beq lbl_8021F094 /* 8021F084 0021BFC4 80 9F 01 0C */ lwz r4, 0x10c(r31) @@ -461,7 +461,7 @@ lbl_8021F0B8: /* 8021F0C0 0021C000 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8021F0C4 0021C004 90 03 00 20 */ stw r0, 0x20(r3) /* 8021F0C8 0021C008 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapFv /* 8021F0D0 0021C010 38 60 50 00 */ li r3, 0x5000 /* 8021F0D4 0021C014 80 9F 01 00 */ lwz r4, 0x100(r31) /* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap @@ -472,7 +472,7 @@ lbl_8021F0B8: /* 8021F0EC 0021C02C 90 1F 01 14 */ stw r0, 0x114(r31) /* 8021F0F0 0021C030 90 1F 01 18 */ stw r0, 0x118(r31) /* 8021F0F4 0021C034 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021F0F8 0021C038 48 0A F6 8D */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F0F8 0021C038 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapFv /* 8021F0FC 0021C03C 38 00 00 00 */ li r0, 0 /* 8021F100 0021C040 90 1F 01 1C */ stw r0, 0x11c(r31) /* 8021F104 0021C044 7F C3 F3 78 */ mr r3, r30 @@ -733,7 +733,7 @@ dMeter2_c_NS__delete: /* 8021F4AC 0021C3EC 93 C1 00 18 */ stw r30, 0x18(r1) /* 8021F4B0 0021C3F0 7C 7E 1B 78 */ mr r30, r3 /* 8021F4B4 0021C3F4 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapFv /* 8021F4BC 0021C3FC 80 7E 01 00 */ lwz r3, 0x100(r30) /* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap /* 8021F4C4 0021C404 7C 7F 1B 78 */ mr r31, r3 @@ -802,7 +802,7 @@ lbl_8021F574: /* 8021F5B4 0021C4F4 48 08 C3 D1 */ bl Z2SeMgr_NS_seStart lbl_8021F5B8: /* 8021F5B8 0021C4F8 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapFv /* 8021F5C0 0021C500 80 7E 01 20 */ lwz r3, 0x120(r30) /* 8021F5C4 0021C504 28 03 00 00 */ cmplwi r3, 0 /* 8021F5C8 0021C508 41 82 00 24 */ beq lbl_8021F5EC @@ -817,7 +817,7 @@ lbl_8021F5E4: /* 8021F5E8 0021C528 90 1E 01 20 */ stw r0, 0x120(r30) lbl_8021F5EC: /* 8021F5EC 0021C52C 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F5F0 0021C530 48 0A F1 95 */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapFv /* 8021F5F4 0021C534 80 7E 01 04 */ lwz r3, 0x104(r30) /* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap /* 8021F5FC 0021C53C 80 7E 01 10 */ lwz r3, 0x110(r30) @@ -847,7 +847,7 @@ lbl_8021F64C: /* 8021F650 0021C590 90 1E 01 14 */ stw r0, 0x114(r30) lbl_8021F654: /* 8021F654 0021C594 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F658 0021C598 48 0A F1 2D */ bl JKRHeap_NS_getTotalFreeSize +/* 8021F658 0021C598 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapFv /* 8021F65C 0021C59C 80 7E 01 1C */ lwz r3, 0x11c(r30) /* 8021F660 0021C5A0 28 03 00 00 */ cmplwi r3, 0 /* 8021F664 0021C5A4 41 82 00 24 */ beq lbl_8021F688 @@ -918,7 +918,7 @@ lbl_8021F74C: /* 8021F74C 0021C68C 38 00 00 00 */ li r0, 0 /* 8021F750 0021C690 90 1E 01 18 */ stw r0, 0x118(r30) /* 8021F754 0021C694 7F E3 FB 78 */ mr r3, r31 -/* 8021F758 0021C698 48 0A EE 75 */ bl JKRHeap_NS_freeAll +/* 8021F758 0021C698 48 0A EE 75 */ bl freeAll__7JKRHeapFv /* 8021F75C 0021C69C 38 60 00 08 */ li r3, 8 /* 8021F760 0021C6A0 4B E0 EA 29 */ bl dComIfGp_offHeapLockFlag lbl_8021F764: @@ -5477,7 +5477,7 @@ dMeter2_c_NS_checkSubContents: /* 80223804 00220744 28 00 00 00 */ cmplwi r0, 0 /* 80223808 00220748 40 82 03 A4 */ bne lbl_80223BAC /* 8022380C 0022074C 38 60 00 90 */ li r3, 0x90 -/* 80223810 00220750 48 0A B4 3D */ bl __nw +/* 80223810 00220750 48 0A B4 3D */ bl __nw__FUl /* 80223814 00220754 7C 60 1B 79 */ or. r0, r3, r3 /* 80223818 00220758 41 82 00 10 */ beq lbl_80223828 /* 8022381C 0022075C 38 80 00 00 */ li r4, 0 @@ -5519,9 +5519,9 @@ lbl_80223890: /* 802238A0 002207E0 28 00 00 00 */ cmplwi r0, 0 /* 802238A4 002207E4 40 82 03 08 */ bne lbl_80223BAC /* 802238A8 002207E8 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 802238AC 002207EC 48 0A AE D9 */ bl JKRHeap_NS_getTotalFreeSize +/* 802238AC 002207EC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapFv /* 802238B0 002207F0 38 60 01 18 */ li r3, 0x118 -/* 802238B4 002207F4 48 0A B3 99 */ bl __nw +/* 802238B4 002207F4 48 0A B3 99 */ bl __nw__FUl /* 802238B8 002207F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802238BC 002207FC 41 82 00 14 */ beq lbl_802238D0 /* 802238C0 00220800 80 9F 01 0C */ lwz r4, 0x10c(r31) @@ -5554,7 +5554,7 @@ lbl_80223908: /* 80223920 00220860 28 00 00 00 */ cmplwi r0, 0 /* 80223924 00220864 40 82 02 88 */ bne lbl_80223BAC /* 80223928 00220868 38 60 00 2C */ li r3, 0x2c -/* 8022392C 0022086C 48 0A B3 21 */ bl __nw +/* 8022392C 0022086C 48 0A B3 21 */ bl __nw__FUl /* 80223930 00220870 7C 60 1B 79 */ or. r0, r3, r3 /* 80223934 00220874 41 82 00 10 */ beq lbl_80223944 /* 80223938 00220878 38 80 00 00 */ li r4, 0 @@ -5563,7 +5563,7 @@ lbl_80223908: lbl_80223944: /* 80223944 00220884 90 1F 01 10 */ stw r0, 0x110(r31) /* 80223948 00220888 38 60 00 40 */ li r3, 0x40 -/* 8022394C 0022088C 48 0A B3 01 */ bl __nw +/* 8022394C 0022088C 48 0A B3 01 */ bl __nw__FUl /* 80223950 00220890 7C 60 1B 79 */ or. r0, r3, r3 /* 80223954 00220894 41 82 00 18 */ beq lbl_8022396C /* 80223958 00220898 3C 80 80 43 */ lis r4, lbl_80430188@ha @@ -5591,7 +5591,7 @@ lbl_8022398C: /* 802239A8 002208E8 28 00 00 00 */ cmplwi r0, 0 /* 802239AC 002208EC 40 82 02 00 */ bne lbl_80223BAC /* 802239B0 002208F0 38 60 00 2C */ li r3, 0x2c -/* 802239B4 002208F4 48 0A B2 99 */ bl __nw +/* 802239B4 002208F4 48 0A B2 99 */ bl __nw__FUl /* 802239B8 002208F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802239BC 002208FC 41 82 00 10 */ beq lbl_802239CC /* 802239C0 00220900 38 80 00 00 */ li r4, 0 @@ -5615,7 +5615,7 @@ lbl_802239DC: /* 80223A00 00220940 28 00 00 00 */ cmplwi r0, 0 /* 80223A04 00220944 40 82 01 A8 */ bne lbl_80223BAC /* 80223A08 00220948 38 60 00 40 */ li r3, 0x40 -/* 80223A0C 0022094C 48 0A B2 41 */ bl __nw +/* 80223A0C 0022094C 48 0A B2 41 */ bl __nw__FUl /* 80223A10 00220950 7C 60 1B 79 */ or. r0, r3, r3 /* 80223A14 00220954 41 82 00 10 */ beq lbl_80223A24 /* 80223A18 00220958 80 9E 00 8C */ lwz r4, 0x8c(r30) @@ -5684,7 +5684,7 @@ lbl_80223AF8: /* 80223AF8 00220A38 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80223AFC 00220A3C 41 82 00 B0 */ beq lbl_80223BAC /* 80223B00 00220A40 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80223B04 00220A44 48 0A AA C9 */ bl JKRHeap_NS_freeAll +/* 80223B04 00220A44 48 0A AA C9 */ bl freeAll__7JKRHeapFv /* 80223B08 00220A48 38 00 00 00 */ li r0, 0 /* 80223B0C 00220A4C 98 1F 01 E5 */ stb r0, 0x1e5(r31) /* 80223B10 00220A50 B0 1F 01 B6 */ sth r0, 0x1b6(r31) @@ -5728,7 +5728,7 @@ lbl_80223B90: /* 80223B90 00220AD0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80223B94 00220AD4 41 82 00 0C */ beq lbl_80223BA0 /* 80223B98 00220AD8 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80223B9C 00220ADC 48 0A AA 31 */ bl JKRHeap_NS_freeAll +/* 80223B9C 00220ADC 48 0A AA 31 */ bl freeAll__7JKRHeapFv lbl_80223BA0: /* 80223BA0 00220AE0 38 00 00 00 */ li r0, 0 /* 80223BA4 00220AE4 98 1F 01 E5 */ stb r0, 0x1e5(r31) @@ -5809,7 +5809,7 @@ lbl_80223C98: /* 80223CB8 00220BF8 90 7F 01 08 */ stw r3, 0x108(r31) lbl_80223CBC: /* 80223CBC 00220BFC 38 60 06 30 */ li r3, 0x630 -/* 80223CC0 00220C00 48 0A AF 8D */ bl __nw +/* 80223CC0 00220C00 48 0A AF 8D */ bl __nw__FUl /* 80223CC4 00220C04 7C 60 1B 79 */ or. r0, r3, r3 /* 80223CC8 00220C08 41 82 00 0C */ beq lbl_80223CD4 /* 80223CCC 00220C0C 4B FD D6 5D */ bl dMeterButton_c @@ -5878,7 +5878,7 @@ lbl_80223DB8: /* 80223DBC 00220CFC 90 1F 01 18 */ stw r0, 0x118(r31) /* 80223DC0 00220D00 38 60 00 08 */ li r3, 8 /* 80223DC4 00220D04 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D -/* 80223DC8 00220D08 48 0A A8 05 */ bl JKRHeap_NS_freeAll +/* 80223DC8 00220D08 48 0A A8 05 */ bl freeAll__7JKRHeapFv /* 80223DCC 00220D0C 80 7F 01 08 */ lwz r3, 0x108(r31) /* 80223DD0 00220D10 28 03 00 00 */ cmplwi r3, 0 /* 80223DD4 00220D14 41 82 00 10 */ beq lbl_80223DE4 @@ -7834,7 +7834,7 @@ lbl_80225930: /* 80225930 00222870 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80225934 00222874 41 82 00 0C */ beq lbl_80225940 /* 80225938 00222878 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 8022593C 0022287C 48 0A 8C 91 */ bl JKRHeap_NS_freeAll +/* 8022593C 0022287C 48 0A 8C 91 */ bl freeAll__7JKRHeapFv lbl_80225940: /* 80225940 00222880 38 00 00 00 */ li r0, 0 /* 80225944 00222884 98 1F 01 E5 */ stb r0, 0x1e5(r31) diff --git a/asm/d/d_model.s b/asm/d/d_model.s index 46d9dcdc28..b8326ac971 100644 --- a/asm/d/d_model.s +++ b/asm/d/d_model.s @@ -201,7 +201,7 @@ dMdl_mng_c_NS_create: /* 8009C7B4 000996F4 90 01 00 14 */ stw r0, 0x14(r1) /* 8009C7B8 000996F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8009C7BC 000996FC 38 60 00 84 */ li r3, 0x84 -/* 8009C7C0 00099700 48 23 24 8D */ bl __nw +/* 8009C7C0 00099700 48 23 24 8D */ bl __nw__FUl /* 8009C7C4 00099704 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009C7C8 00099708 41 82 00 28 */ beq lbl_8009C7F0 .global dMdl_c @@ -243,7 +243,7 @@ lbl_8009C83C: /* 8009C83C 0009977C 7C 80 07 35 */ extsh. r0, r4 /* 8009C840 00099780 40 81 00 0C */ ble lbl_8009C84C /* 8009C844 00099784 7F E3 FB 78 */ mr r3, r31 -/* 8009C848 00099788 48 23 24 F5 */ bl __dl +/* 8009C848 00099788 48 23 24 F5 */ bl __dl__FPv lbl_8009C84C: /* 8009C84C 0009978C 7F E3 FB 78 */ mr r3, r31 /* 8009C850 00099790 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -271,7 +271,7 @@ dMdl_mng_c_NS_remove: /* 8009C894 000997D4 38 C0 00 04 */ li r6, 4 /* 8009C898 000997D8 48 2C 54 51 */ bl func_80361CE8 /* 8009C89C 000997DC 7F E3 FB 78 */ mr r3, r31 -/* 8009C8A0 000997E0 48 23 24 9D */ bl __dl +/* 8009C8A0 000997E0 48 23 24 9D */ bl __dl__FPv lbl_8009C8A4: /* 8009C8A4 000997E4 38 00 00 00 */ li r0, 0 /* 8009C8A8 000997E8 90 0D 8A 20 */ stw r0, lbl_80450FA0-_SDA_BASE_(r13) diff --git a/asm/d/d_name.s b/asm/d/d_name.s index c1cbdaf230..719823b880 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -54,7 +54,7 @@ dName_c: /* 8024E48C 0024B3CC 38 03 2B 64 */ addi r0, r3, lbl_803C2B64@l /* 8024E490 0024B3D0 90 1E 00 00 */ stw r0, 0(r30) /* 8024E494 0024B3D4 80 7E 00 04 */ lwz r3, 4(r30) -/* 8024E498 0024B3D8 48 08 08 A5 */ bl __dl +/* 8024E498 0024B3D8 48 08 08 A5 */ bl __dl__FPv /* 8024E49C 0024B3DC 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8024E4A0 0024B3E0 28 03 00 00 */ cmplwi r3, 0 /* 8024E4A4 0024B3E4 41 82 00 18 */ beq lbl_8024E4BC @@ -158,7 +158,7 @@ lbl_8024E600: /* 8024E600 0024B540 7F E0 07 35 */ extsh. r0, r31 /* 8024E604 0024B544 40 81 00 0C */ ble lbl_8024E610 /* 8024E608 0024B548 7F C3 F3 78 */ mr r3, r30 -/* 8024E60C 0024B54C 48 08 07 31 */ bl __dl +/* 8024E60C 0024B54C 48 08 07 31 */ bl __dl__FPv lbl_8024E610: /* 8024E610 0024B550 7F C3 F3 78 */ mr r3, r30 /* 8024E614 0024B554 39 61 00 20 */ addi r11, r1, 0x20 @@ -176,7 +176,7 @@ dName_c_NS__create: /* 8024E638 0024B578 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024E63C 0024B57C 7C 7F 1B 78 */ mr r31, r3 /* 8024E640 0024B580 38 60 00 30 */ li r3, 0x30 -/* 8024E644 0024B584 48 08 06 09 */ bl __nw +/* 8024E644 0024B584 48 08 06 09 */ bl __nw__FUl /* 8024E648 0024B588 7C 60 1B 79 */ or. r0, r3, r3 /* 8024E64C 0024B58C 41 82 00 2C */ beq lbl_8024E678 /* 8024E650 0024B590 38 80 00 05 */ li r4, 5 @@ -2388,7 +2388,7 @@ dName_c_NS_screenSet: /* 802505E4 0024D524 3C 60 80 3C */ lis r3, lbl_803C1F50@ha /* 802505E8 0024D528 3B C3 1F 50 */ addi r30, r3, lbl_803C1F50@l /* 802505EC 0024D52C 38 60 01 18 */ li r3, 0x118 -/* 802505F0 0024D530 48 07 E6 5D */ bl __nw +/* 802505F0 0024D530 48 07 E6 5D */ bl __nw__FUl /* 802505F4 0024D534 7C 60 1B 79 */ or. r0, r3, r3 /* 802505F8 0024D538 41 82 00 0C */ beq lbl_80250604 /* 802505FC 0024D53C 48 0A 7E 9D */ bl J2DScreen @@ -2600,7 +2600,7 @@ lbl_80250910: /* 80250928 0024D868 48 00 00 DC */ b lbl_80250A04 lbl_8025092C: /* 8025092C 0024D86C 38 60 00 6C */ li r3, 0x6c -/* 80250930 0024D870 48 07 E3 1D */ bl __nw +/* 80250930 0024D870 48 07 E3 1D */ bl __nw__FUl /* 80250934 0024D874 7C 60 1B 79 */ or. r0, r3, r3 /* 80250938 0024D878 41 82 00 28 */ beq lbl_80250960 /* 8025093C 0024D87C 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -2683,7 +2683,7 @@ lbl_80250A04: /* 80250A60 0024D9A0 3B 03 9C C8 */ addi r24, r3, lbl_80399CC8@l lbl_80250A64: /* 80250A64 0024D9A4 38 60 00 6C */ li r3, 0x6c -/* 80250A68 0024D9A8 48 07 E1 E5 */ bl __nw +/* 80250A68 0024D9A8 48 07 E1 E5 */ bl __nw__FUl /* 80250A6C 0024D9AC 7C 60 1B 79 */ or. r0, r3, r3 /* 80250A70 0024D9B0 41 82 00 28 */ beq lbl_80250A98 /* 80250A74 0024D9B4 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -2729,7 +2729,7 @@ lbl_80250A98: /* 80250B10 0024DA50 3B 03 9C C8 */ addi r24, r3, lbl_80399CC8@l lbl_80250B14: /* 80250B14 0024DA54 38 60 00 1C */ li r3, 0x1c -/* 80250B18 0024DA58 48 07 E1 35 */ bl __nw +/* 80250B18 0024DA58 48 07 E1 35 */ bl __nw__FUl /* 80250B1C 0024DA5C 7C 60 1B 79 */ or. r0, r3, r3 /* 80250B20 0024DA60 41 82 00 28 */ beq lbl_80250B48 /* 80250B24 0024DA64 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -2791,7 +2791,7 @@ lbl_80250B48: /* 80250C00 0024DB40 98 1F 02 A5 */ stb r0, 0x2a5(r31) /* 80250C04 0024DB44 98 1F 02 A7 */ stb r0, 0x2a7(r31) /* 80250C08 0024DB48 38 60 00 B8 */ li r3, 0xb8 -/* 80250C0C 0024DB4C 48 07 E0 41 */ bl __nw +/* 80250C0C 0024DB4C 48 07 E0 41 */ bl __nw__FUl /* 80250C10 0024DB50 7C 60 1B 79 */ or. r0, r3, r3 /* 80250C14 0024DB54 41 82 00 18 */ beq lbl_80250C2C /* 80250C18 0024DB58 38 80 00 00 */ li r4, 0 @@ -3175,7 +3175,7 @@ lbl_80251128: /* 8025117C 0024E0BC 90 1F 00 00 */ stw r0, 0(r31) /* 80251180 0024E0C0 7C 80 07 35 */ extsh. r0, r4 /* 80251184 0024E0C4 40 81 00 08 */ ble lbl_8025118C -/* 80251188 0024E0C8 48 07 DB B5 */ bl __dl +/* 80251188 0024E0C8 48 07 DB B5 */ bl __dl__FPv lbl_8025118C: /* 8025118C 0024E0CC 7F E3 FB 78 */ mr r3, r31 /* 80251190 0024E0D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3196,7 +3196,7 @@ dNm_HIO_c_NS_dtor: /* 802511C4 0024E104 90 1F 00 00 */ stw r0, 0(r31) /* 802511C8 0024E108 7C 80 07 35 */ extsh. r0, r4 /* 802511CC 0024E10C 40 81 00 08 */ ble lbl_802511D4 -/* 802511D0 0024E110 48 07 DB 6D */ bl __dl +/* 802511D0 0024E110 48 07 DB 6D */ bl __dl__FPv lbl_802511D4: /* 802511D4 0024E114 7F E3 FB 78 */ mr r3, r31 /* 802511D8 0024E118 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index 13b5329469..986cdd4e4d 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -1600,7 +1600,7 @@ dPa_modelEcallBack_NS_create: /* 8004AB34 00047A74 54 7F 06 3E */ clrlwi r31, r3, 0x18 /* 8004AB38 00047A78 1C 7F 03 94 */ mulli r3, r31, 0x394 /* 8004AB3C 00047A7C 38 63 00 10 */ addi r3, r3, 0x10 -/* 8004AB40 00047A80 48 28 41 85 */ bl __nwa +/* 8004AB40 00047A80 48 28 41 85 */ bl __nwa__FUl .global dPa_modelEcallBack_NS_model_c /* 8004AB44 00047A84 3C 80 80 05 */ lis r4, dPa_modelEcallBack_NS_model_c@ha .global dPa_modelEcallBack_NS_model_c @@ -1632,7 +1632,7 @@ dPa_modelEcallBack_NS_model_c_NS_dtor: /* 8004AB9C 00047ADC 41 82 00 10 */ beq lbl_8004ABAC /* 8004ABA0 00047AE0 7C 80 07 35 */ extsh. r0, r4 /* 8004ABA4 00047AE4 40 81 00 08 */ ble lbl_8004ABAC -/* 8004ABA8 00047AE8 48 28 41 95 */ bl __dl +/* 8004ABA8 00047AE8 48 28 41 95 */ bl __dl__FPv lbl_8004ABAC: /* 8004ABAC 00047AEC 7F E3 FB 78 */ mr r3, r31 /* 8004ABB0 00047AF0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1949,7 +1949,7 @@ dPa_simpleEcallBack_NS_create: /* 8004AFCC 00047F0C A3 E3 00 0E */ lhz r31, 0xe(r3) /* 8004AFD0 00047F10 1C 7F 00 14 */ mulli r3, r31, 0x14 /* 8004AFD4 00047F14 38 63 00 10 */ addi r3, r3, 0x10 -/* 8004AFD8 00047F18 48 28 3C ED */ bl __nwa +/* 8004AFD8 00047F18 48 28 3C ED */ bl __nwa__FUl .global dPa_simpleData_c /* 8004AFDC 00047F1C 3C 80 80 05 */ lis r4, dPa_simpleData_c@ha .global dPa_simpleData_c @@ -1982,7 +1982,7 @@ dPa_simpleData_c_NS_dtor: /* 8004B038 00047F78 41 82 00 10 */ beq lbl_8004B048 /* 8004B03C 00047F7C 7C 80 07 35 */ extsh. r0, r4 /* 8004B040 00047F80 40 81 00 08 */ ble lbl_8004B048 -/* 8004B044 00047F84 48 28 3C F9 */ bl __dl +/* 8004B044 00047F84 48 28 3C F9 */ bl __dl__FPv lbl_8004B048: /* 8004B048 00047F88 7F E3 FB 78 */ mr r3, r31 /* 8004B04C 00047F8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2827,7 +2827,7 @@ dPa_control_c_NS_createCommon: /* 8004BBA4 00048AE4 38 60 00 14 */ li r3, 0x14 /* 8004BBA8 00048AE8 80 9F 00 00 */ lwz r4, 0(r31) /* 8004BBAC 00048AEC 38 A0 00 00 */ li r5, 0 -/* 8004BBB0 00048AF0 48 28 30 E9 */ bl __nw_X2_ +/* 8004BBB0 00048AF0 48 28 30 E9 */ bl __nw__FUlP7JKRHeapi /* 8004BBB4 00048AF4 7C 60 1B 79 */ or. r0, r3, r3 /* 8004BBB8 00048AF8 41 82 00 14 */ beq lbl_8004BBCC /* 8004BBBC 00048AFC 7F 64 DB 78 */ mr r4, r27 @@ -2844,7 +2844,7 @@ lbl_8004BBCC: /* 8004BBE4 00048B24 38 60 00 30 */ li r3, 0x30 /* 8004BBE8 00048B28 80 9F 00 00 */ lwz r4, 0(r31) /* 8004BBEC 00048B2C 38 A0 00 00 */ li r5, 0 -/* 8004BBF0 00048B30 48 28 30 A9 */ bl __nw_X2_ +/* 8004BBF0 00048B30 48 28 30 A9 */ bl __nw__FUlP7JKRHeapi /* 8004BBF4 00048B34 7C 60 1B 79 */ or. r0, r3, r3 /* 8004BBF8 00048B38 41 82 00 20 */ beq lbl_8004BC18 /* 8004BBFC 00048B3C 38 80 0B B8 */ li r4, 0xbb8 @@ -2923,7 +2923,7 @@ dPa_control_c_NS_createRoomScene: /* 8004BD04 00048C44 38 60 00 14 */ li r3, 0x14 /* 8004BD08 00048C48 80 9B 00 0C */ lwz r4, 0xc(r27) /* 8004BD0C 00048C4C 38 A0 00 00 */ li r5, 0 -/* 8004BD10 00048C50 48 28 2F 89 */ bl __nw_X2_ +/* 8004BD10 00048C50 48 28 2F 89 */ bl __nw__FUlP7JKRHeapi /* 8004BD14 00048C54 7C 60 1B 79 */ or. r0, r3, r3 /* 8004BD18 00048C58 41 82 00 14 */ beq lbl_8004BD2C /* 8004BD1C 00048C5C 80 9B 00 10 */ lwz r4, 0x10(r27) @@ -3011,7 +3011,7 @@ lbl_8004BE3C: /* 8004BE40 00048D80 28 03 00 00 */ cmplwi r3, 0 /* 8004BE44 00048D84 41 82 00 14 */ beq lbl_8004BE58 /* 8004BE48 00048D88 38 80 00 00 */ li r4, 0 -/* 8004BE4C 00048D8C 48 28 26 B5 */ bl JKRHeap_NS_free +/* 8004BE4C 00048D8C 48 28 26 B5 */ bl free__7JKRHeapFPvP7JKRHeap /* 8004BE50 00048D90 38 00 00 00 */ li r0, 0 /* 8004BE54 00048D94 90 1D 00 10 */ stw r0, 0x10(r29) lbl_8004BE58: @@ -3110,7 +3110,7 @@ lbl_8004BF6C: /* 8004BF98 00048ED8 41 82 00 20 */ beq lbl_8004BFB8 /* 8004BF9C 00048EDC 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8004BFA0 00048EE0 38 80 00 00 */ li r4, 0 -/* 8004BFA4 00048EE4 48 28 25 5D */ bl JKRHeap_NS_free +/* 8004BFA4 00048EE4 48 28 25 5D */ bl free__7JKRHeapFPvP7JKRHeap /* 8004BFA8 00048EE8 38 00 00 00 */ li r0, 0 /* 8004BFAC 00048EEC 90 1E 00 10 */ stw r0, 0x10(r30) /* 8004BFB0 00048EF0 38 00 00 FF */ li r0, 0xff @@ -7198,7 +7198,7 @@ lbl_8004FA14: /* 8004FB60 0004CAA0 7F E0 07 35 */ extsh. r0, r31 /* 8004FB64 0004CAA4 40 81 00 0C */ ble lbl_8004FB70 /* 8004FB68 0004CAA8 7F C3 F3 78 */ mr r3, r30 -/* 8004FB6C 0004CAAC 48 27 F1 D1 */ bl __dl +/* 8004FB6C 0004CAAC 48 27 F1 D1 */ bl __dl__FPv lbl_8004FB70: /* 8004FB70 0004CAB0 7F C3 F3 78 */ mr r3, r30 /* 8004FB74 0004CAB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7262,7 +7262,7 @@ dPa_simpleEcallBack_NS_dtor: /* 8004FC3C 0004CB7C 7F E0 07 35 */ extsh. r0, r31 /* 8004FC40 0004CB80 40 81 00 0C */ ble lbl_8004FC4C /* 8004FC44 0004CB84 7F C3 F3 78 */ mr r3, r30 -/* 8004FC48 0004CB88 48 27 F0 F5 */ bl __dl +/* 8004FC48 0004CB88 48 27 F0 F5 */ bl __dl__FPv lbl_8004FC4C: /* 8004FC4C 0004CB8C 7F C3 F3 78 */ mr r3, r30 /* 8004FC50 0004CB90 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7289,7 +7289,7 @@ dPa_particleTracePcallBack_c_NS_dtor: /* 8004FC9C 0004CBDC 7F E0 07 35 */ extsh. r0, r31 /* 8004FCA0 0004CBE0 40 81 00 0C */ ble lbl_8004FCAC /* 8004FCA4 0004CBE4 7F C3 F3 78 */ mr r3, r30 -/* 8004FCA8 0004CBE8 48 27 F0 95 */ bl __dl +/* 8004FCA8 0004CBE8 48 27 F0 95 */ bl __dl__FPv lbl_8004FCAC: /* 8004FCAC 0004CBEC 7F C3 F3 78 */ mr r3, r30 /* 8004FCB0 0004CBF0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7324,7 +7324,7 @@ lbl_8004FD20: /* 8004FD20 0004CC60 7F E0 07 35 */ extsh. r0, r31 /* 8004FD24 0004CC64 40 81 00 0C */ ble lbl_8004FD30 /* 8004FD28 0004CC68 7F C3 F3 78 */ mr r3, r30 -/* 8004FD2C 0004CC6C 48 27 F0 11 */ bl __dl +/* 8004FD2C 0004CC6C 48 27 F0 11 */ bl __dl__FPv lbl_8004FD30: /* 8004FD30 0004CC70 7F C3 F3 78 */ mr r3, r30 /* 8004FD34 0004CC74 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7351,7 +7351,7 @@ dPa_gen_d_light8PcallBack_NS_dtor: /* 8004FD80 0004CCC0 7F E0 07 35 */ extsh. r0, r31 /* 8004FD84 0004CCC4 40 81 00 0C */ ble lbl_8004FD90 /* 8004FD88 0004CCC8 7F C3 F3 78 */ mr r3, r30 -/* 8004FD8C 0004CCCC 48 27 EF B1 */ bl __dl +/* 8004FD8C 0004CCCC 48 27 EF B1 */ bl __dl__FPv lbl_8004FD90: /* 8004FD90 0004CCD0 7F C3 F3 78 */ mr r3, r30 /* 8004FD94 0004CCD4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7378,7 +7378,7 @@ dPa_gen_b_light8PcallBack_NS_dtor: /* 8004FDE0 0004CD20 7F E0 07 35 */ extsh. r0, r31 /* 8004FDE4 0004CD24 40 81 00 0C */ ble lbl_8004FDF0 /* 8004FDE8 0004CD28 7F C3 F3 78 */ mr r3, r30 -/* 8004FDEC 0004CD2C 48 27 EF 51 */ bl __dl +/* 8004FDEC 0004CD2C 48 27 EF 51 */ bl __dl__FPv lbl_8004FDF0: /* 8004FDF0 0004CD30 7F C3 F3 78 */ mr r3, r30 /* 8004FDF4 0004CD34 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7405,7 +7405,7 @@ dPa_light8PcallBack_NS_dtor: /* 8004FE40 0004CD80 7F E0 07 35 */ extsh. r0, r31 /* 8004FE44 0004CD84 40 81 00 0C */ ble lbl_8004FE50 /* 8004FE48 0004CD88 7F C3 F3 78 */ mr r3, r30 -/* 8004FE4C 0004CD8C 48 27 EE F1 */ bl __dl +/* 8004FE4C 0004CD8C 48 27 EE F1 */ bl __dl__FPv lbl_8004FE50: /* 8004FE50 0004CD90 7F C3 F3 78 */ mr r3, r30 /* 8004FE54 0004CD94 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7432,7 +7432,7 @@ dPa_fsenthPcallBack_NS_dtor: /* 8004FEA0 0004CDE0 7F E0 07 35 */ extsh. r0, r31 /* 8004FEA4 0004CDE4 40 81 00 0C */ ble lbl_8004FEB0 /* 8004FEA8 0004CDE8 7F C3 F3 78 */ mr r3, r30 -/* 8004FEAC 0004CDEC 48 27 EE 91 */ bl __dl +/* 8004FEAC 0004CDEC 48 27 EE 91 */ bl __dl__FPv lbl_8004FEB0: /* 8004FEB0 0004CDF0 7F C3 F3 78 */ mr r3, r30 /* 8004FEB4 0004CDF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7459,7 +7459,7 @@ dPa_wbPcallBack_c_NS_dtor: /* 8004FF00 0004CE40 7F E0 07 35 */ extsh. r0, r31 /* 8004FF04 0004CE44 40 81 00 0C */ ble lbl_8004FF10 /* 8004FF08 0004CE48 7F C3 F3 78 */ mr r3, r30 -/* 8004FF0C 0004CE4C 48 27 EE 31 */ bl __dl +/* 8004FF0C 0004CE4C 48 27 EE 31 */ bl __dl__FPv lbl_8004FF10: /* 8004FF10 0004CE50 7F C3 F3 78 */ mr r3, r30 /* 8004FF14 0004CE54 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7484,7 +7484,7 @@ lbl_8004FF10: /* 8004FF60 0004CEA0 7F E0 07 35 */ extsh. r0, r31 /* 8004FF64 0004CEA4 40 81 00 0C */ ble lbl_8004FF70 /* 8004FF68 0004CEA8 7F C3 F3 78 */ mr r3, r30 -/* 8004FF6C 0004CEAC 48 27 ED D1 */ bl __dl +/* 8004FF6C 0004CEAC 48 27 ED D1 */ bl __dl__FPv lbl_8004FF70: /* 8004FF70 0004CEB0 7F C3 F3 78 */ mr r3, r30 /* 8004FF74 0004CEB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7521,7 +7521,7 @@ lbl_8004FFE4: /* 8004FFE4 0004CF24 7F E0 07 35 */ extsh. r0, r31 /* 8004FFE8 0004CF28 40 81 00 0C */ ble lbl_8004FFF4 /* 8004FFEC 0004CF2C 7F C3 F3 78 */ mr r3, r30 -/* 8004FFF0 0004CF30 48 27 ED 4D */ bl __dl +/* 8004FFF0 0004CF30 48 27 ED 4D */ bl __dl__FPv lbl_8004FFF4: /* 8004FFF4 0004CF34 7F C3 F3 78 */ mr r3, r30 /* 8004FFF8 0004CF38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7558,7 +7558,7 @@ dPa_modelPcallBack_NS_dtor: /* 8005006C 0004CFAC 7F E0 07 35 */ extsh. r0, r31 /* 80050070 0004CFB0 40 81 00 0C */ ble lbl_8005007C /* 80050074 0004CFB4 7F C3 F3 78 */ mr r3, r30 -/* 80050078 0004CFB8 48 27 EC C5 */ bl __dl +/* 80050078 0004CFB8 48 27 EC C5 */ bl __dl__FPv lbl_8005007C: /* 8005007C 0004CFBC 7F C3 F3 78 */ mr r3, r30 /* 80050080 0004CFC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7603,7 +7603,7 @@ lbl_80050110: /* 80050110 0004D050 7F E0 07 35 */ extsh. r0, r31 /* 80050114 0004D054 40 81 00 0C */ ble lbl_80050120 /* 80050118 0004D058 7F C3 F3 78 */ mr r3, r30 -/* 8005011C 0004D05C 48 27 EC 21 */ bl __dl +/* 8005011C 0004D05C 48 27 EC 21 */ bl __dl__FPv lbl_80050120: /* 80050120 0004D060 7F C3 F3 78 */ mr r3, r30 /* 80050124 0004D064 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7648,7 +7648,7 @@ lbl_800501B4: /* 800501B4 0004D0F4 7F E0 07 35 */ extsh. r0, r31 /* 800501B8 0004D0F8 40 81 00 0C */ ble lbl_800501C4 /* 800501BC 0004D0FC 7F C3 F3 78 */ mr r3, r30 -/* 800501C0 0004D100 48 27 EB 7D */ bl __dl +/* 800501C0 0004D100 48 27 EB 7D */ bl __dl__FPv lbl_800501C4: /* 800501C4 0004D104 7F C3 F3 78 */ mr r3, r30 /* 800501C8 0004D108 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7691,7 +7691,7 @@ lbl_80050258: /* 80050258 0004D198 7F E0 07 35 */ extsh. r0, r31 /* 8005025C 0004D19C 40 81 00 0C */ ble lbl_80050268 /* 80050260 0004D1A0 7F C3 F3 78 */ mr r3, r30 -/* 80050264 0004D1A4 48 27 EA D9 */ bl __dl +/* 80050264 0004D1A4 48 27 EA D9 */ bl __dl__FPv lbl_80050268: /* 80050268 0004D1A8 7F C3 F3 78 */ mr r3, r30 /* 8005026C 0004D1AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7752,7 +7752,7 @@ lbl_8005033C: /* 8005033C 0004D27C 7F E0 07 35 */ extsh. r0, r31 /* 80050340 0004D280 40 81 00 0C */ ble lbl_8005034C /* 80050344 0004D284 7F C3 F3 78 */ mr r3, r30 -/* 80050348 0004D288 48 27 E9 F5 */ bl __dl +/* 80050348 0004D288 48 27 E9 F5 */ bl __dl__FPv lbl_8005034C: /* 8005034C 0004D28C 7F C3 F3 78 */ mr r3, r30 /* 80050350 0004D290 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7793,7 +7793,7 @@ lbl_800503D0: /* 800503D0 0004D310 7F E0 07 35 */ extsh. r0, r31 /* 800503D4 0004D314 40 81 00 0C */ ble lbl_800503E0 /* 800503D8 0004D318 7F C3 F3 78 */ mr r3, r30 -/* 800503DC 0004D31C 48 27 E9 61 */ bl __dl +/* 800503DC 0004D31C 48 27 E9 61 */ bl __dl__FPv lbl_800503E0: /* 800503E0 0004D320 7F C3 F3 78 */ mr r3, r30 /* 800503E4 0004D324 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7830,7 +7830,7 @@ lbl_80050454: /* 80050454 0004D394 7F E0 07 35 */ extsh. r0, r31 /* 80050458 0004D398 40 81 00 0C */ ble lbl_80050464 /* 8005045C 0004D39C 7F C3 F3 78 */ mr r3, r30 -/* 80050460 0004D3A0 48 27 E8 DD */ bl __dl +/* 80050460 0004D3A0 48 27 E8 DD */ bl __dl__FPv lbl_80050464: /* 80050464 0004D3A4 7F C3 F3 78 */ mr r3, r30 /* 80050468 0004D3A8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index acaa0c0c90..59b303a6a2 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -62,7 +62,7 @@ lbl_8003A31C: /* 8003A31C 0003725C 7F E0 07 35 */ extsh. r0, r31 /* 8003A320 00037260 40 81 00 0C */ ble lbl_8003A32C /* 8003A324 00037264 7F C3 F3 78 */ mr r3, r30 -/* 8003A328 00037268 48 29 4A 15 */ bl __dl +/* 8003A328 00037268 48 29 4A 15 */ bl __dl__FPv lbl_8003A32C: /* 8003A32C 0003726C 7F C3 F3 78 */ mr r3, r30 /* 8003A330 00037270 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -439,7 +439,7 @@ addWarpMaterial: /* 8003A894 000377D4 7C A0 28 50 */ subf r5, r0, r5 /* 8003A898 000377D8 48 2D 79 85 */ bl J3DTexture_NS_addResTIMG /* 8003A89C 000377DC 38 60 00 94 */ li r3, 0x94 -/* 8003A8A0 000377E0 48 29 43 AD */ bl __nw +/* 8003A8A0 000377E0 48 29 43 AD */ bl __nw__FUl /* 8003A8A4 000377E4 7C 7D 1B 79 */ or. r29, r3, r3 /* 8003A8A8 000377E8 41 82 00 10 */ beq lbl_8003A8B8 /* 8003A8AC 000377EC 3C 80 80 38 */ lis r4, lbl_80379840@ha @@ -937,7 +937,7 @@ lbl_8003AF94: /* 8003AFD0 00037F10 7D 89 03 A6 */ mtctr r12 /* 8003AFD4 00037F14 4E 80 04 21 */ bctrl /* 8003AFD8 00037F18 38 60 00 F4 */ li r3, 0xf4 -/* 8003AFDC 00037F1C 48 29 3C 71 */ bl __nw +/* 8003AFDC 00037F1C 48 29 3C 71 */ bl __nw__FUl /* 8003AFE0 00037F20 7C 7A 1B 79 */ or. r26, r3, r3 /* 8003AFE4 00037F24 41 82 00 B8 */ beq lbl_8003B09C /* 8003AFE8 00037F28 3C 60 80 3D */ lis r3, lbl_803CEE60@ha @@ -1069,7 +1069,7 @@ J3DTevKColorAnm_NS_dtor: /* 8003B164 000380A4 41 82 00 10 */ beq lbl_8003B174 /* 8003B168 000380A8 7C 80 07 35 */ extsh. r0, r4 /* 8003B16C 000380AC 40 81 00 08 */ ble lbl_8003B174 -/* 8003B170 000380B0 48 29 3B CD */ bl __dl +/* 8003B170 000380B0 48 29 3B CD */ bl __dl__FPv lbl_8003B174: /* 8003B174 000380B4 7F E3 FB 78 */ mr r3, r31 /* 8003B178 000380B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1095,7 +1095,7 @@ J3DTevColorAnm_NS_dtor: /* 8003B1B8 000380F8 41 82 00 10 */ beq lbl_8003B1C8 /* 8003B1BC 000380FC 7C 80 07 35 */ extsh. r0, r4 /* 8003B1C0 00038100 40 81 00 08 */ ble lbl_8003B1C8 -/* 8003B1C4 00038104 48 29 3B 79 */ bl __dl +/* 8003B1C4 00038104 48 29 3B 79 */ bl __dl__FPv lbl_8003B1C8: /* 8003B1C8 00038108 7F E3 FB 78 */ mr r3, r31 /* 8003B1CC 0003810C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1124,7 +1124,7 @@ J3DTexNoAnm_NS_dtor: /* 8003B218 00038158 90 1F 00 00 */ stw r0, 0(r31) /* 8003B21C 0003815C 7C 80 07 35 */ extsh. r0, r4 /* 8003B220 00038160 40 81 00 08 */ ble lbl_8003B228 -/* 8003B224 00038164 48 29 3B 19 */ bl __dl +/* 8003B224 00038164 48 29 3B 19 */ bl __dl__FPv lbl_8003B228: /* 8003B228 00038168 7F E3 FB 78 */ mr r3, r31 /* 8003B22C 0003816C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1153,7 +1153,7 @@ J3DTexMtxAnm_NS_dtor: /* 8003B278 000381B8 41 82 00 10 */ beq lbl_8003B288 /* 8003B27C 000381BC 7C 80 07 35 */ extsh. r0, r4 /* 8003B280 000381C0 40 81 00 08 */ ble lbl_8003B288 -/* 8003B284 000381C4 48 29 3A B9 */ bl __dl +/* 8003B284 000381C4 48 29 3A B9 */ bl __dl__FPv lbl_8003B288: /* 8003B288 000381C8 7F E3 FB 78 */ mr r3, r31 /* 8003B28C 000381CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1179,7 +1179,7 @@ J3DMatColorAnm_NS_dtor: /* 8003B2CC 0003820C 41 82 00 10 */ beq lbl_8003B2DC /* 8003B2D0 00038210 7C 80 07 35 */ extsh. r0, r4 /* 8003B2D4 00038214 40 81 00 08 */ ble lbl_8003B2DC -/* 8003B2D8 00038218 48 29 3A 65 */ bl __dl +/* 8003B2D8 00038218 48 29 3A 65 */ bl __dl__FPv lbl_8003B2DC: /* 8003B2DC 0003821C 7F E3 FB 78 */ mr r3, r31 /* 8003B2E0 00038220 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1208,7 +1208,7 @@ dRes_info_c_NS_loadResource: /* 8003B328 00038268 80 63 00 44 */ lwz r3, 0x44(r3) /* 8003B32C 0003826C 82 83 00 08 */ lwz r20, 8(r3) /* 8003B330 00038270 56 83 10 3A */ slwi r3, r20, 2 -/* 8003B334 00038274 48 29 39 91 */ bl __nwa +/* 8003B334 00038274 48 29 39 91 */ bl __nwa__FUl /* 8003B338 00038278 90 7E 00 20 */ stw r3, 0x20(r30) /* 8003B33C 0003827C 80 1E 00 20 */ lwz r0, 0x20(r30) /* 8003B340 00038280 28 00 00 00 */ cmplwi r0, 0 @@ -1296,7 +1296,7 @@ lbl_8003B420: /* 8003B470 000383B0 38 61 00 08 */ addi r3, r1, 8 /* 8003B474 000383B4 7C 03 D9 AE */ stbx r0, r3, r27 /* 8003B478 000383B8 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) -/* 8003B47C 000383BC 48 29 33 C1 */ bl JKRHeap_NS_findFromRoot +/* 8003B47C 000383BC 48 29 33 C1 */ bl findFromRoot__7JKRHeapFPv /* 8003B480 000383C0 4B FD 38 D1 */ bl mDoExt_getGameHeap /* 8003B484 000383C4 7E E3 BB 78 */ mr r3, r23 /* 8003B488 000383C8 38 81 00 08 */ addi r4, r1, 8 @@ -1329,7 +1329,7 @@ lbl_8003B4D0: /* 8003B4E8 00038428 7D 89 03 A6 */ mtctr r12 /* 8003B4EC 0003842C 4E 80 04 21 */ bctrl /* 8003B4F0 00038430 38 60 00 F4 */ li r3, 0xf4 -/* 8003B4F4 00038434 48 29 37 59 */ bl __nw +/* 8003B4F4 00038434 48 29 37 59 */ bl __nw__FUl /* 8003B4F8 00038438 7C 7B 1B 79 */ or. r27, r3, r3 /* 8003B4FC 0003843C 41 82 00 B8 */ beq lbl_8003B5B4 /* 8003B500 00038440 3C 60 80 3D */ lis r3, lbl_803CEE60@ha @@ -1527,7 +1527,7 @@ lbl_8003B770: /* 8003B770 000386B0 3B 00 00 00 */ li r24, 0 lbl_8003B774: /* 8003B774 000386B4 38 60 00 2C */ li r3, 0x2c -/* 8003B778 000386B8 48 29 34 D5 */ bl __nw +/* 8003B778 000386B8 48 29 34 D5 */ bl __nw__FUl /* 8003B77C 000386BC 7C 7A 1B 79 */ or. r26, r3, r3 /* 8003B780 000386C0 41 82 00 40 */ beq lbl_8003B7C0 /* 8003B784 000386C4 38 80 00 00 */ li r4, 0 @@ -1645,7 +1645,7 @@ lbl_8003B914: /* 8003B914 00038854 7C 80 07 35 */ extsh. r0, r4 /* 8003B918 00038858 40 81 00 0C */ ble lbl_8003B924 /* 8003B91C 0003885C 7F E3 FB 78 */ mr r3, r31 -/* 8003B920 00038860 48 29 34 1D */ bl __dl +/* 8003B920 00038860 48 29 34 1D */ bl __dl__FPv lbl_8003B924: /* 8003B924 00038864 7F E3 FB 78 */ mr r3, r31 /* 8003B928 00038868 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1670,7 +1670,7 @@ lbl_8003B970: /* 8003B970 000388B0 7C 80 07 35 */ extsh. r0, r4 /* 8003B974 000388B4 40 81 00 0C */ ble lbl_8003B980 /* 8003B978 000388B8 7F E3 FB 78 */ mr r3, r31 -/* 8003B97C 000388BC 48 29 33 C1 */ bl __dl +/* 8003B97C 000388BC 48 29 33 C1 */ bl __dl__FPv lbl_8003B980: /* 8003B980 000388C0 7F E3 FB 78 */ mr r3, r31 /* 8003B984 000388C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1908,7 +1908,7 @@ myGetMemBlockSize: /* 8003BCA4 00038BE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8003BCA8 00038BE8 93 C1 00 08 */ stw r30, 8(r1) /* 8003BCAC 00038BEC 7C 7E 1B 78 */ mr r30, r3 -/* 8003BCB0 00038BF0 48 29 2B 8D */ bl JKRHeap_NS_findFromRoot +/* 8003BCB0 00038BF0 48 29 2B 8D */ bl findFromRoot__7JKRHeapFPv /* 8003BCB4 00038BF4 7C 7F 1B 78 */ mr r31, r3 /* 8003BCB8 00038BF8 81 83 00 00 */ lwz r12, 0(r3) /* 8003BCBC 00038BFC 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -1919,7 +1919,7 @@ myGetMemBlockSize: /* 8003BCD0 00038C10 40 82 00 14 */ bne lbl_8003BCE4 /* 8003BCD4 00038C14 7F C3 F3 78 */ mr r3, r30 /* 8003BCD8 00038C18 7F E4 FB 78 */ mr r4, r31 -/* 8003BCDC 00038C1C 48 29 29 D5 */ bl JKRHeap_NS_getSize +/* 8003BCDC 00038C1C 48 29 29 D5 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 8003BCE0 00038C20 48 00 00 08 */ b lbl_8003BCE8 lbl_8003BCE4: /* 8003BCE4 00038C24 38 60 FF FF */ li r3, -1 @@ -2053,11 +2053,11 @@ lbl_8003BE94: /* 8003BEA0 00038DE0 80 7C 00 14 */ lwz r3, 0x14(r28) /* 8003BEA4 00038DE4 4B FF FB F9 */ bl getArcHeader /* 8003BEA8 00038DE8 38 80 00 00 */ li r4, 0 -/* 8003BEAC 00038DEC 48 29 28 05 */ bl JKRHeap_NS_getSize +/* 8003BEAC 00038DEC 48 29 28 05 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 8003BEB0 00038DF0 7C 7B 1B 78 */ mr r27, r3 /* 8003BEB4 00038DF4 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 8003BEB8 00038DF8 38 80 00 00 */ li r4, 0 -/* 8003BEBC 00038DFC 48 29 27 F5 */ bl JKRHeap_NS_getSize +/* 8003BEBC 00038DFC 48 29 27 F5 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 8003BEC0 00038E00 7C 7A 1B 78 */ mr r26, r3 /* 8003BEC4 00038E04 3C 60 80 38 */ lis r3, lbl_803798B8@ha /* 8003BEC8 00038E08 38 63 98 B8 */ addi r3, r3, lbl_803798B8@l @@ -2167,7 +2167,7 @@ lbl_8003BFFC: /* 8003C04C 00038F8C 7F A0 07 35 */ extsh. r0, r29 /* 8003C050 00038F90 40 81 00 0C */ ble lbl_8003C05C /* 8003C054 00038F94 7F 83 E3 78 */ mr r3, r28 -/* 8003C058 00038F98 48 29 2C E5 */ bl __dl +/* 8003C058 00038F98 48 29 2C E5 */ bl __dl__FPv lbl_8003C05C: /* 8003C05C 00038F9C 7F 83 E3 78 */ mr r3, r28 /* 8003C060 00038FA0 39 61 00 20 */ addi r11, r1, 0x20 @@ -2546,7 +2546,7 @@ dRes_control_c_NS_setObjectRes: /* 8003C53C 0003947C 48 00 00 68 */ b lbl_8003C5A4 lbl_8003C540: /* 8003C540 00039480 38 60 00 70 */ li r3, 0x70 -/* 8003C544 00039484 48 29 27 09 */ bl __nw +/* 8003C544 00039484 48 29 27 09 */ bl __nw__FUl /* 8003C548 00039488 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003C54C 0003948C 41 82 00 18 */ beq lbl_8003C564 /* 8003C550 00039490 7F 84 E3 78 */ mr r4, r28 @@ -2695,7 +2695,7 @@ lbl_8003C720: /* 8003C754 00039694 90 1F 00 00 */ stw r0, 0(r31) /* 8003C758 00039698 7C 80 07 35 */ extsh. r0, r4 /* 8003C75C 0003969C 40 81 00 08 */ ble lbl_8003C764 -/* 8003C760 000396A0 48 29 25 DD */ bl __dl +/* 8003C760 000396A0 48 29 25 DD */ bl __dl__FPv lbl_8003C764: /* 8003C764 000396A4 7F E3 FB 78 */ mr r3, r31 /* 8003C768 000396A8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2730,7 +2730,7 @@ lbl_8003C7D8: /* 8003C7D8 00039718 7C 80 07 35 */ extsh. r0, r4 /* 8003C7DC 0003971C 40 81 00 0C */ ble lbl_8003C7E8 /* 8003C7E0 00039720 7F E3 FB 78 */ mr r3, r31 -/* 8003C7E4 00039724 48 29 25 59 */ bl __dl +/* 8003C7E4 00039724 48 29 25 59 */ bl __dl__FPv lbl_8003C7E8: /* 8003C7E8 00039728 7F E3 FB 78 */ mr r3, r31 /* 8003C7EC 0003972C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index ae4dcd295e..59b7420cb3 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -86,7 +86,7 @@ lbl_80193790: /* 801937AC 001906EC 38 63 00 08 */ addi r3, r3, 8 /* 801937B0 001906F0 41 80 FF D4 */ blt lbl_80193784 /* 801937B4 001906F4 38 60 01 50 */ li r3, 0x150 -/* 801937B8 001906F8 48 13 B4 95 */ bl __nw +/* 801937B8 001906F8 48 13 B4 95 */ bl __nw__FUl /* 801937BC 001906FC 7C 60 1B 79 */ or. r0, r3, r3 /* 801937C0 00190700 41 82 00 10 */ beq lbl_801937D0 /* 801937C4 00190704 7F C4 F3 78 */ mr r4, r30 @@ -141,7 +141,7 @@ lbl_801937D0: /* 80193884 001907C4 4E 80 04 21 */ bctrl /* 80193888 001907C8 7C 7E 1B 78 */ mr r30, r3 /* 8019388C 001907CC 38 60 01 50 */ li r3, 0x150 -/* 80193890 001907D0 48 13 B3 BD */ bl __nw +/* 80193890 001907D0 48 13 B3 BD */ bl __nw__FUl /* 80193894 001907D4 7C 60 1B 79 */ or. r0, r3, r3 /* 80193898 001907D8 41 82 00 10 */ beq lbl_801938A8 /* 8019389C 001907DC 7F C4 F3 78 */ mr r4, r30 @@ -346,7 +346,7 @@ lbl_80193B64: /* 80193B64 00190AA4 7F E0 07 35 */ extsh. r0, r31 /* 80193B68 00190AA8 40 81 00 0C */ ble lbl_80193B74 /* 80193B6C 00190AAC 7F C3 F3 78 */ mr r3, r30 -/* 80193B70 00190AB0 48 13 B1 CD */ bl __dl +/* 80193B70 00190AB0 48 13 B1 CD */ bl __dl__FPv lbl_80193B74: /* 80193B74 00190AB4 7F C3 F3 78 */ mr r3, r30 /* 80193B78 00190AB8 39 61 00 30 */ addi r11, r1, 0x30 @@ -710,7 +710,7 @@ lbl_801940CC: /* 801940F4 00191034 90 1F 00 00 */ stw r0, 0(r31) /* 801940F8 00191038 7C 80 07 35 */ extsh. r0, r4 /* 801940FC 0019103C 40 81 00 08 */ ble lbl_80194104 -/* 80194100 00191040 48 13 AC 3D */ bl __dl +/* 80194100 00191040 48 13 AC 3D */ bl __dl__FPv lbl_80194104: /* 80194104 00191044 7F E3 FB 78 */ mr r3, r31 /* 80194108 00191048 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 91dbd88ae3..8326d0b985 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -487,7 +487,7 @@ createRoomScene: /* 80024478 000213B8 38 60 00 04 */ li r3, 4 /* 8002447C 000213BC 38 80 FF FC */ li r4, -4 /* 80024480 000213C0 38 A0 00 00 */ li r5, 0 -/* 80024484 000213C4 48 2A 9F F1 */ bl JKRHeap_NS_alloc +/* 80024484 000213C4 48 2A 9F F1 */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80024488 000213C8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8002448C 000213CC 40 82 00 0C */ bne lbl_80024498 /* 80024490 000213D0 38 60 00 00 */ li r3, 0 @@ -503,7 +503,7 @@ lbl_80024498: /* 800244B4 000213F4 40 82 00 18 */ bne lbl_800244CC /* 800244B8 000213F8 7F E3 FB 78 */ mr r3, r31 /* 800244BC 000213FC 38 80 00 00 */ li r4, 0 -/* 800244C0 00021400 48 2A A0 41 */ bl JKRHeap_NS_free +/* 800244C0 00021400 48 2A A0 41 */ bl free__7JKRHeapFPvP7JKRHeap /* 800244C4 00021404 38 60 00 00 */ li r3, 0 /* 800244C8 00021408 48 00 00 08 */ b lbl_800244D0 lbl_800244CC: @@ -917,7 +917,7 @@ dStage_roomControl_c_NS_roomDzs_c_NS_create: /* 80024A54 00021994 7C 64 1B 78 */ mr r4, r3 /* 80024A58 00021998 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 80024A5C 0002199C 38 A0 FF FC */ li r5, -4 -/* 80024A60 000219A0 48 2A A2 B1 */ bl __nwa_X2_ +/* 80024A60 000219A0 48 2A A2 B1 */ bl __nwa__FUlP7JKRHeapi /* 80024A64 000219A4 90 7E 00 04 */ stw r3, 4(r30) /* 80024A68 000219A8 80 1E 00 04 */ lwz r0, 4(r30) /* 80024A6C 000219AC 28 00 00 00 */ cmplwi r0, 0 @@ -964,7 +964,7 @@ lbl_80024AEC: /* 80024AF4 00021A34 41 82 00 10 */ beq lbl_80024B04 /* 80024AF8 00021A38 4B FE A2 F5 */ bl mDoExt_getArchiveHeap /* 80024AFC 00021A3C 7F E4 FB 78 */ mr r4, r31 -/* 80024B00 00021A40 48 2A 9A 49 */ bl JKRHeap_NS_free_X1_ +/* 80024B00 00021A40 48 2A 9A 49 */ bl free__7JKRHeapFPv lbl_80024B04: /* 80024B04 00021A44 3B DE 00 04 */ addi r30, r30, 4 /* 80024B08 00021A48 3B BD 00 01 */ addi r29, r29, 1 @@ -974,7 +974,7 @@ lbl_80024B0C: /* 80024B14 00021A54 7C 03 00 40 */ cmplw r3, r0 /* 80024B18 00021A58 41 80 FF D4 */ blt lbl_80024AEC /* 80024B1C 00021A5C 80 7C 00 04 */ lwz r3, 4(r28) -/* 80024B20 00021A60 48 2A A2 41 */ bl __dla +/* 80024B20 00021A60 48 2A A2 41 */ bl __dla__FPv /* 80024B24 00021A64 38 00 00 00 */ li r0, 0 /* 80024B28 00021A68 98 1C 00 00 */ stb r0, 0(r28) lbl_80024B2C: @@ -1023,7 +1023,7 @@ lbl_80024B70: /* 80024BC4 00021B04 4B FE A2 29 */ bl mDoExt_getArchiveHeap /* 80024BC8 00021B08 7F 84 E3 78 */ mr r4, r28 /* 80024BCC 00021B0C 38 A0 FF E0 */ li r5, -32 -/* 80024BD0 00021B10 48 2A 99 05 */ bl JKRHeap_NS_alloc_X1_ +/* 80024BD0 00021B10 48 2A 99 05 */ bl alloc__7JKRHeapFUli /* 80024BD4 00021B14 7C 7D F1 2E */ stwx r3, r29, r30 /* 80024BD8 00021B18 7C 9D F0 2E */ lwzx r4, r29, r30 /* 80024BDC 00021B1C 28 04 00 00 */ cmplwi r4, 0 @@ -1270,7 +1270,7 @@ dStage_actorCreate: /* 80024F1C 00021E5C 40 82 00 14 */ bne lbl_80024F30 /* 80024F20 00021E60 7F C3 F3 78 */ mr r3, r30 /* 80024F24 00021E64 38 80 00 00 */ li r4, 0 -/* 80024F28 00021E68 48 2A 95 D9 */ bl JKRHeap_NS_free +/* 80024F28 00021E68 48 2A 95 D9 */ bl free__7JKRHeapFPvP7JKRHeap /* 80024F2C 00021E6C 48 00 00 54 */ b lbl_80024F80 lbl_80024F30: /* 80024F30 00021E70 88 03 00 0A */ lbz r0, 0xa(r3) @@ -4856,7 +4856,7 @@ dStage_roomStatus_c_NS_dtor: /* 80028374 000252B4 41 82 00 10 */ beq lbl_80028384 /* 80028378 000252B8 7C 80 07 35 */ extsh. r0, r4 /* 8002837C 000252BC 40 81 00 08 */ ble lbl_80028384 -/* 80028380 000252C0 48 2A 69 BD */ bl __dl +/* 80028380 000252C0 48 2A 69 BD */ bl __dl__FPv lbl_80028384: /* 80028384 000252C4 7F E3 FB 78 */ mr r3, r31 /* 80028388 000252C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4920,7 +4920,7 @@ dStage_KeepDoorInfo_NS_dtor: /* 80028450 00025390 7F E0 07 35 */ extsh. r0, r31 /* 80028454 00025394 40 81 00 0C */ ble lbl_80028460 /* 80028458 00025398 7F C3 F3 78 */ mr r3, r30 -/* 8002845C 0002539C 48 2A 68 E1 */ bl __dl +/* 8002845C 0002539C 48 2A 68 E1 */ bl __dl__FPv lbl_80028460: /* 80028460 000253A0 7F C3 F3 78 */ mr r3, r30 /* 80028464 000253A4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4939,7 +4939,7 @@ stage_tgsc_data_class_NS_dtor: /* 80028490 000253D0 41 82 00 10 */ beq lbl_800284A0 /* 80028494 000253D4 7C 80 07 35 */ extsh. r0, r4 /* 80028498 000253D8 40 81 00 08 */ ble lbl_800284A0 -/* 8002849C 000253DC 48 2A 68 A1 */ bl __dl +/* 8002849C 000253DC 48 2A 68 A1 */ bl __dl__FPv lbl_800284A0: /* 800284A0 000253E0 7F E3 FB 78 */ mr r3, r31 /* 800284A4 000253E4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 6c620d7c43..3a4100b78f 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -48,9 +48,9 @@ lbl_8025CA54: /* 8025CAA8 002599E8 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8025CAAC 002599EC 28 03 00 00 */ cmplwi r3, 0 /* 8025CAB0 002599F0 41 82 00 70 */ beq lbl_8025CB20 -/* 8025CAB4 002599F4 48 07 1C D1 */ bl JKRHeap_NS_getTotalFreeSize +/* 8025CAB4 002599F4 48 07 1C D1 */ bl getTotalFreeSize__7JKRHeapFv /* 8025CAB8 002599F8 38 60 03 E4 */ li r3, 0x3e4 -/* 8025CABC 002599FC 48 07 21 91 */ bl __nw +/* 8025CABC 002599FC 48 07 21 91 */ bl __nw__FUl /* 8025CAC0 00259A00 7C 60 1B 79 */ or. r0, r3, r3 /* 8025CAC4 00259A04 41 82 00 0C */ beq lbl_8025CAD0 /* 8025CAC8 00259A08 48 00 10 71 */ bl dDlst_TimerScrnDraw_c @@ -695,7 +695,7 @@ dTimer_c_NS__delete: /* 8025D3E0 0025A320 4B DB 1D ED */ bl mDoExt_setCurrentHeap /* 8025D3E4 0025A324 7C 7E 1B 78 */ mr r30, r3 /* 8025D3E8 0025A328 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025D3EC 0025A32C 48 07 13 99 */ bl JKRHeap_NS_getTotalFreeSize +/* 8025D3EC 0025A32C 48 07 13 99 */ bl getTotalFreeSize__7JKRHeapFv /* 8025D3F0 0025A330 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025D3F4 0025A334 48 00 18 69 */ bl dDlst_TimerScrnDraw_c_NS_deleteScreen /* 8025D3F8 0025A338 80 7F 00 FC */ lwz r3, 0xfc(r31) @@ -1578,7 +1578,7 @@ lbl_8025E010: /* 8025E014 0025AF54 38 80 00 03 */ li r4, 3 /* 8025E018 0025AF58 48 00 1A AD */ bl dDlst_TimerScrnDraw_c_NS_setShowType /* 8025E01C 0025AF5C 38 60 01 18 */ li r3, 0x118 -/* 8025E020 0025AF60 48 07 0C 2D */ bl __nw +/* 8025E020 0025AF60 48 07 0C 2D */ bl __nw__FUl /* 8025E024 0025AF64 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E028 0025AF68 41 82 00 0C */ beq lbl_8025E034 /* 8025E02C 0025AF6C 48 09 A4 6D */ bl J2DScreen @@ -1614,7 +1614,7 @@ lbl_8025E034: /* 8025E0A0 0025AFE0 48 0A A9 CD */ bl J2DAnmLoaderDataBase_NS_load /* 8025E0A4 0025AFE4 90 7F 00 0C */ stw r3, 0xc(r31) /* 8025E0A8 0025AFE8 38 60 00 6C */ li r3, 0x6c -/* 8025E0AC 0025AFEC 48 07 0B A1 */ bl __nw +/* 8025E0AC 0025AFEC 48 07 0B A1 */ bl __nw__FUl /* 8025E0B0 0025AFF0 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E0B4 0025AFF4 41 82 00 28 */ beq lbl_8025E0DC /* 8025E0B8 0025AFF8 80 9F 00 08 */ lwz r4, 8(r31) @@ -1629,7 +1629,7 @@ lbl_8025E034: lbl_8025E0DC: /* 8025E0DC 0025B01C 90 1F 00 20 */ stw r0, 0x20(r31) /* 8025E0E0 0025B020 38 60 00 6C */ li r3, 0x6c -/* 8025E0E4 0025B024 48 07 0B 69 */ bl __nw +/* 8025E0E4 0025B024 48 07 0B 69 */ bl __nw__FUl /* 8025E0E8 0025B028 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E0EC 0025B02C 41 82 00 24 */ beq lbl_8025E110 /* 8025E0F0 0025B030 80 9F 00 08 */ lwz r4, 8(r31) @@ -1643,7 +1643,7 @@ lbl_8025E0DC: lbl_8025E110: /* 8025E110 0025B050 90 1F 00 24 */ stw r0, 0x24(r31) /* 8025E114 0025B054 38 60 00 6C */ li r3, 0x6c -/* 8025E118 0025B058 48 07 0B 35 */ bl __nw +/* 8025E118 0025B058 48 07 0B 35 */ bl __nw__FUl /* 8025E11C 0025B05C 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E120 0025B060 41 82 00 24 */ beq lbl_8025E144 /* 8025E124 0025B064 80 9F 00 08 */ lwz r4, 8(r31) @@ -1728,7 +1728,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenBase: /* 8025E24C 0025B18C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025E250 0025B190 7C 7F 1B 78 */ mr r31, r3 /* 8025E254 0025B194 38 60 01 18 */ li r3, 0x118 -/* 8025E258 0025B198 48 07 09 F5 */ bl __nw +/* 8025E258 0025B198 48 07 09 F5 */ bl __nw__FUl /* 8025E25C 0025B19C 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E260 0025B1A0 41 82 00 0C */ beq lbl_8025E26C /* 8025E264 0025B1A4 48 09 A2 35 */ bl J2DScreen @@ -1747,7 +1747,7 @@ lbl_8025E26C: /* 8025E294 0025B1D4 38 00 00 00 */ li r0, 0 /* 8025E298 0025B1D8 90 1F 00 10 */ stw r0, 0x10(r31) /* 8025E29C 0025B1DC 38 60 00 6C */ li r3, 0x6c -/* 8025E2A0 0025B1E0 48 07 09 AD */ bl __nw +/* 8025E2A0 0025B1E0 48 07 09 AD */ bl __nw__FUl /* 8025E2A4 0025B1E4 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E2A8 0025B1E8 41 82 00 24 */ beq lbl_8025E2CC /* 8025E2AC 0025B1EC 80 9F 00 04 */ lwz r4, 4(r31) @@ -1764,7 +1764,7 @@ lbl_8025E2CC: /* 8025E2D4 0025B214 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) /* 8025E2D8 0025B218 4B FF 74 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 8025E2DC 0025B21C 38 60 00 6C */ li r3, 0x6c -/* 8025E2E0 0025B220 48 07 09 6D */ bl __nw +/* 8025E2E0 0025B220 48 07 09 6D */ bl __nw__FUl /* 8025E2E4 0025B224 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E2E8 0025B228 41 82 00 24 */ beq lbl_8025E30C /* 8025E2EC 0025B22C 80 9F 00 04 */ lwz r4, 4(r31) @@ -1781,7 +1781,7 @@ lbl_8025E30C: /* 8025E314 0025B254 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) /* 8025E318 0025B258 4B FF 74 B9 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 8025E31C 0025B25C 38 60 00 6C */ li r3, 0x6c -/* 8025E320 0025B260 48 07 09 2D */ bl __nw +/* 8025E320 0025B260 48 07 09 2D */ bl __nw__FUl /* 8025E324 0025B264 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E328 0025B268 41 82 00 28 */ beq lbl_8025E350 /* 8025E32C 0025B26C 80 9F 00 04 */ lwz r4, 4(r31) @@ -2002,7 +2002,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenBoatRace: /* 8025E678 0025B5B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025E67C 0025B5BC 7C 7F 1B 78 */ mr r31, r3 /* 8025E680 0025B5C0 38 60 01 18 */ li r3, 0x118 -/* 8025E684 0025B5C4 48 07 05 C9 */ bl __nw +/* 8025E684 0025B5C4 48 07 05 C9 */ bl __nw__FUl /* 8025E688 0025B5C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E68C 0025B5CC 41 82 00 0C */ beq lbl_8025E698 /* 8025E690 0025B5D0 48 09 9E 09 */ bl J2DScreen @@ -2019,7 +2019,7 @@ lbl_8025E698: /* 8025E6B8 0025B5F8 80 7F 00 04 */ lwz r3, 4(r31) /* 8025E6BC 0025B5FC 4B FF 6A 2D */ bl dPaneClass_showNullPane /* 8025E6C0 0025B600 38 60 00 6C */ li r3, 0x6c -/* 8025E6C4 0025B604 48 07 05 89 */ bl __nw +/* 8025E6C4 0025B604 48 07 05 89 */ bl __nw__FUl /* 8025E6C8 0025B608 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E6CC 0025B60C 41 82 00 28 */ beq lbl_8025E6F4 /* 8025E6D0 0025B610 80 9F 00 04 */ lwz r4, 4(r31) @@ -2034,7 +2034,7 @@ lbl_8025E698: lbl_8025E6F4: /* 8025E6F4 0025B634 90 1F 00 10 */ stw r0, 0x10(r31) /* 8025E6F8 0025B638 38 60 00 6C */ li r3, 0x6c -/* 8025E6FC 0025B63C 48 07 05 51 */ bl __nw +/* 8025E6FC 0025B63C 48 07 05 51 */ bl __nw__FUl /* 8025E700 0025B640 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E704 0025B644 41 82 00 24 */ beq lbl_8025E728 /* 8025E708 0025B648 80 9F 00 04 */ lwz r4, 4(r31) @@ -2053,7 +2053,7 @@ lbl_8025E728: /* 8025E738 0025B678 38 00 00 00 */ li r0, 0 /* 8025E73C 0025B67C 90 1F 00 18 */ stw r0, 0x18(r31) /* 8025E740 0025B680 38 60 00 6C */ li r3, 0x6c -/* 8025E744 0025B684 48 07 05 09 */ bl __nw +/* 8025E744 0025B684 48 07 05 09 */ bl __nw__FUl /* 8025E748 0025B688 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E74C 0025B68C 41 82 00 28 */ beq lbl_8025E774 /* 8025E750 0025B690 80 9F 00 04 */ lwz r4, 4(r31) @@ -2160,7 +2160,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenRider: /* 8025E8C4 0025B804 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025E8C8 0025B808 7C 7F 1B 78 */ mr r31, r3 /* 8025E8CC 0025B80C 38 60 01 18 */ li r3, 0x118 -/* 8025E8D0 0025B810 48 07 03 7D */ bl __nw +/* 8025E8D0 0025B810 48 07 03 7D */ bl __nw__FUl /* 8025E8D4 0025B814 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E8D8 0025B818 41 82 00 0C */ beq lbl_8025E8E4 /* 8025E8DC 0025B81C 48 09 9B BD */ bl J2DScreen @@ -2179,7 +2179,7 @@ lbl_8025E8E4: /* 8025E90C 0025B84C 38 00 00 00 */ li r0, 0 /* 8025E910 0025B850 90 1F 00 10 */ stw r0, 0x10(r31) /* 8025E914 0025B854 38 60 00 6C */ li r3, 0x6c -/* 8025E918 0025B858 48 07 03 35 */ bl __nw +/* 8025E918 0025B858 48 07 03 35 */ bl __nw__FUl /* 8025E91C 0025B85C 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E920 0025B860 41 82 00 24 */ beq lbl_8025E944 /* 8025E924 0025B864 80 9F 00 04 */ lwz r4, 4(r31) @@ -2198,7 +2198,7 @@ lbl_8025E944: /* 8025E954 0025B894 38 00 00 00 */ li r0, 0 /* 8025E958 0025B898 90 1F 00 18 */ stw r0, 0x18(r31) /* 8025E95C 0025B89C 38 60 00 6C */ li r3, 0x6c -/* 8025E960 0025B8A0 48 07 02 ED */ bl __nw +/* 8025E960 0025B8A0 48 07 02 ED */ bl __nw__FUl /* 8025E964 0025B8A4 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E968 0025B8A8 41 82 00 28 */ beq lbl_8025E990 /* 8025E96C 0025B8AC 80 9F 00 04 */ lwz r4, 4(r31) @@ -5118,7 +5118,7 @@ lbl_80261380: /* 802613B4 0025E2F4 90 1F 00 00 */ stw r0, 0(r31) /* 802613B8 0025E2F8 7C 80 07 35 */ extsh. r0, r4 /* 802613BC 0025E2FC 40 81 00 08 */ ble lbl_802613C4 -/* 802613C0 0025E300 48 06 D9 7D */ bl __dl +/* 802613C0 0025E300 48 06 D9 7D */ bl __dl__FPv lbl_802613C4: /* 802613C4 0025E304 7F E3 FB 78 */ mr r3, r31 /* 802613C8 0025E308 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/d_tresure.s b/asm/d/d_tresure.s index 778f92df71..6d194aea00 100644 --- a/asm/d/d_tresure.s +++ b/asm/d/d_tresure.s @@ -9,7 +9,7 @@ dTres_c_NS_createWork: /* 8009BBDC 00098B1C 7C 08 02 A6 */ mflr r0 /* 8009BBE0 00098B20 90 01 00 14 */ stw r0, 0x14(r1) /* 8009BBE4 00098B24 38 60 07 10 */ li r3, 0x710 -/* 8009BBE8 00098B28 48 23 30 DD */ bl __nwa +/* 8009BBE8 00098B28 48 23 30 DD */ bl __nwa__FUl /* 8009BBEC 00098B2C 38 80 00 00 */ li r4, 0 /* 8009BBF0 00098B30 38 A0 00 00 */ li r5, 0 /* 8009BBF4 00098B34 38 C0 00 1C */ li r6, 0x1c diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 7f8c764fa3..fdac72e162 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -16170,7 +16170,7 @@ dCamera_c_NS__class_5983d_ev_camera_cpp_NS_dtor: /* 80097824 00094764 41 82 00 10 */ beq lbl_80097834 /* 80097828 00094768 7C 80 07 35 */ extsh. r0, r4 /* 8009782C 0009476C 40 81 00 08 */ ble lbl_80097834 -/* 80097830 00094770 48 23 75 0D */ bl __dl +/* 80097830 00094770 48 23 75 0D */ bl __dl__FPv lbl_80097834: /* 80097834 00094774 7F E3 FB 78 */ mr r3, r31 /* 80097838 00094778 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index b70aaa0ca5..80c9f9a828 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -58,7 +58,7 @@ dFile_select_c: /* 801836B4 001805F4 4B E9 14 ED */ bl mDoExt_getSubFont /* 801836B8 001805F8 90 7E 00 1C */ stw r3, 0x1c(r30) /* 801836BC 001805FC 38 60 00 2C */ li r3, 0x2c -/* 801836C0 00180600 48 14 B5 8D */ bl __nw +/* 801836C0 00180600 48 14 B5 8D */ bl __nw__FUl /* 801836C4 00180604 7C 60 1B 79 */ or. r0, r3, r3 /* 801836C8 00180608 41 82 00 0C */ beq lbl_801836D4 /* 801836CC 0018060C 48 0C 65 55 */ bl dMsgString_c @@ -85,7 +85,7 @@ lbl_801836D4: /* 8018371C 0018065C 90 1E 00 54 */ stw r0, 0x54(r30) /* 80183720 00180660 93 FE 00 08 */ stw r31, 8(r30) /* 80183724 00180664 38 60 03 D0 */ li r3, 0x3d0 -/* 80183728 00180668 48 14 B5 25 */ bl __nw +/* 80183728 00180668 48 14 B5 25 */ bl __nw__FUl /* 8018372C 0018066C 7C 60 1B 79 */ or. r0, r3, r3 /* 80183730 00180670 41 82 00 0C */ beq lbl_8018373C /* 80183734 00180674 48 00 CB BD */ bl dFile_select3D_c @@ -543,7 +543,7 @@ lbl_80183D80: /* 80183D80 00180CC0 4B E9 0C AD */ bl mDoExt_removeMesgFont /* 80183D84 00180CC4 4B E9 0E 59 */ bl mDoExt_removeSubFont /* 80183D88 00180CC8 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80183D8C 00180CCC 48 14 AF B1 */ bl __dl +/* 80183D8C 00180CCC 48 14 AF B1 */ bl __dl__FPv /* 80183D90 00180CD0 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80183D94 00180CD4 28 03 00 00 */ cmplwi r3, 0 /* 80183D98 00180CD8 41 82 00 18 */ beq lbl_80183DB0 @@ -844,7 +844,7 @@ lbl_801841C0: /* 801841C0 00181100 7F C0 07 35 */ extsh. r0, r30 /* 801841C4 00181104 40 81 00 0C */ ble lbl_801841D0 /* 801841C8 00181108 7F E3 FB 78 */ mr r3, r31 -/* 801841CC 0018110C 48 14 AB 71 */ bl __dl +/* 801841CC 0018110C 48 14 AB 71 */ bl __dl__FPv lbl_801841D0: /* 801841D0 00181110 7F E3 FB 78 */ mr r3, r31 /* 801841D4 00181114 39 61 00 20 */ addi r11, r1, 0x20 @@ -883,7 +883,7 @@ lbl_8018424C: /* 8018424C 0018118C 7C 80 07 35 */ extsh. r0, r4 /* 80184250 00181190 40 81 00 0C */ ble lbl_8018425C /* 80184254 00181194 7F E3 FB 78 */ mr r3, r31 -/* 80184258 00181198 48 14 AA E5 */ bl __dl +/* 80184258 00181198 48 14 AA E5 */ bl __dl__FPv lbl_8018425C: /* 8018425C 0018119C 7F E3 FB 78 */ mr r3, r31 /* 80184260 001811A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -921,7 +921,7 @@ lbl_801842D4: /* 801842D4 00181214 7C 80 07 35 */ extsh. r0, r4 /* 801842D8 00181218 40 81 00 0C */ ble lbl_801842E4 /* 801842DC 0018121C 7F E3 FB 78 */ mr r3, r31 -/* 801842E0 00181220 48 14 AA 5D */ bl __dl +/* 801842E0 00181220 48 14 AA 5D */ bl __dl__FPv lbl_801842E4: /* 801842E4 00181224 7F E3 FB 78 */ mr r3, r31 /* 801842E8 00181228 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -953,7 +953,7 @@ lbl_80184348: /* 80184348 00181288 7C 80 07 35 */ extsh. r0, r4 /* 8018434C 0018128C 40 81 00 0C */ ble lbl_80184358 /* 80184350 00181290 7F E3 FB 78 */ mr r3, r31 -/* 80184354 00181294 48 14 A9 E9 */ bl __dl +/* 80184354 00181294 48 14 A9 E9 */ bl __dl__FPv lbl_80184358: /* 80184358 00181298 7F E3 FB 78 */ mr r3, r31 /* 8018435C 0018129C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -978,7 +978,7 @@ lbl_801843A4: /* 801843A4 001812E4 7C 80 07 35 */ extsh. r0, r4 /* 801843A8 001812E8 40 81 00 0C */ ble lbl_801843B4 /* 801843AC 001812EC 7F E3 FB 78 */ mr r3, r31 -/* 801843B0 001812F0 48 14 A9 8D */ bl __dl +/* 801843B0 001812F0 48 14 A9 8D */ bl __dl__FPv lbl_801843B4: /* 801843B4 001812F4 7F E3 FB 78 */ mr r3, r31 /* 801843B8 001812F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1007,7 +1007,7 @@ dFile_select_c_NS__create: /* 80184408 00181348 88 01 00 0B */ lbz r0, 0xb(r1) /* 8018440C 0018134C 98 03 00 0F */ stb r0, 0xf(r3) /* 80184410 00181350 38 60 00 30 */ li r3, 0x30 -/* 80184414 00181354 48 14 A8 39 */ bl __nw +/* 80184414 00181354 48 14 A8 39 */ bl __nw__FUl /* 80184418 00181358 7C 60 1B 79 */ or. r0, r3, r3 /* 8018441C 0018135C 41 82 00 2C */ beq lbl_80184448 /* 80184420 00181360 38 80 00 02 */ li r4, 2 @@ -8167,7 +8167,7 @@ dFile_select_c_NS_screenSet: /* 8018ADD0 00187D10 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018ADD4 00187D14 3B C3 A8 48 */ addi r30, r3, lbl_803BA848@l /* 8018ADD8 00187D18 38 60 01 18 */ li r3, 0x118 -/* 8018ADDC 00187D1C 48 14 3E 71 */ bl __nw +/* 8018ADDC 00187D1C 48 14 3E 71 */ bl __nw__FUl /* 8018ADE0 00187D20 7C 60 1B 79 */ or. r0, r3, r3 /* 8018ADE4 00187D24 41 82 00 0C */ beq lbl_8018ADF0 /* 8018ADE8 00187D28 48 16 D6 B1 */ bl J2DScreen @@ -8231,7 +8231,7 @@ lbl_8018ADF0: /* 8018AECC 00187E0C 7D 89 03 A6 */ mtctr r12 /* 8018AED0 00187E10 4E 80 04 21 */ bctrl /* 8018AED4 00187E14 38 60 00 6C */ li r3, 0x6c -/* 8018AED8 00187E18 48 14 3D 75 */ bl __nw +/* 8018AED8 00187E18 48 14 3D 75 */ bl __nw__FUl /* 8018AEDC 00187E1C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018AEE0 00187E20 41 82 00 28 */ beq lbl_8018AF08 /* 8018AEE4 00187E24 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8261,7 +8261,7 @@ lbl_8018AF08: /* 8018AF40 00187E80 3B 1E 04 F8 */ addi r24, r30, 0x4f8 lbl_8018AF44: /* 8018AF44 00187E84 38 60 00 6C */ li r3, 0x6c -/* 8018AF48 00187E88 48 14 3D 05 */ bl __nw +/* 8018AF48 00187E88 48 14 3D 05 */ bl __nw__FUl /* 8018AF4C 00187E8C 7C 64 1B 79 */ or. r4, r3, r3 /* 8018AF50 00187E90 41 82 00 24 */ beq lbl_8018AF74 /* 8018AF54 00187E94 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8292,7 +8292,7 @@ lbl_8018AF74: /* 8018AFB4 00187EF4 38 00 00 00 */ li r0, 0 /* 8018AFB8 00187EF8 98 03 00 B0 */ stb r0, 0xb0(r3) /* 8018AFBC 00187EFC 38 60 00 1C */ li r3, 0x1c -/* 8018AFC0 00187F00 48 14 3C 8D */ bl __nw +/* 8018AFC0 00187F00 48 14 3C 8D */ bl __nw__FUl /* 8018AFC4 00187F04 7C 60 1B 79 */ or. r0, r3, r3 /* 8018AFC8 00187F08 41 82 00 28 */ beq lbl_8018AFF0 /* 8018AFCC 00187F0C 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8307,7 +8307,7 @@ lbl_8018AF74: lbl_8018AFF0: /* 8018AFF0 00187F30 90 1F 02 38 */ stw r0, 0x238(r31) /* 8018AFF4 00187F34 38 60 00 1C */ li r3, 0x1c -/* 8018AFF8 00187F38 48 14 3C 55 */ bl __nw +/* 8018AFF8 00187F38 48 14 3C 55 */ bl __nw__FUl /* 8018AFFC 00187F3C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B000 00187F40 41 82 00 28 */ beq lbl_8018B028 /* 8018B004 00187F44 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8322,7 +8322,7 @@ lbl_8018AFF0: lbl_8018B028: /* 8018B028 00187F68 90 1F 02 3C */ stw r0, 0x23c(r31) /* 8018B02C 00187F6C 38 60 00 1C */ li r3, 0x1c -/* 8018B030 00187F70 48 14 3C 1D */ bl __nw +/* 8018B030 00187F70 48 14 3C 1D */ bl __nw__FUl /* 8018B034 00187F74 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B038 00187F78 41 82 00 24 */ beq lbl_8018B05C /* 8018B03C 00187F7C 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8336,7 +8336,7 @@ lbl_8018B028: lbl_8018B05C: /* 8018B05C 00187F9C 90 1F 02 40 */ stw r0, 0x240(r31) /* 8018B060 00187FA0 38 60 00 1C */ li r3, 0x1c -/* 8018B064 00187FA4 48 14 3B E9 */ bl __nw +/* 8018B064 00187FA4 48 14 3B E9 */ bl __nw__FUl /* 8018B068 00187FA8 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B06C 00187FAC 41 82 00 24 */ beq lbl_8018B090 /* 8018B070 00187FB0 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8444,7 +8444,7 @@ lbl_8018B090: /* 8018B204 00188144 3B 60 00 00 */ li r27, 0 lbl_8018B208: /* 8018B208 00188148 38 60 00 6C */ li r3, 0x6c -/* 8018B20C 0018814C 48 14 3A 41 */ bl __nw +/* 8018B20C 0018814C 48 14 3A 41 */ bl __nw__FUl /* 8018B210 00188150 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B214 00188154 41 82 00 28 */ beq lbl_8018B23C /* 8018B218 00188158 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8460,7 +8460,7 @@ lbl_8018B23C: /* 8018B23C 0018817C 7F 3F E2 14 */ add r25, r31, r28 /* 8018B240 00188180 90 19 01 64 */ stw r0, 0x164(r25) /* 8018B244 00188184 38 60 00 6C */ li r3, 0x6c -/* 8018B248 00188188 48 14 3A 05 */ bl __nw +/* 8018B248 00188188 48 14 3A 05 */ bl __nw__FUl /* 8018B24C 0018818C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B250 00188190 41 82 00 28 */ beq lbl_8018B278 /* 8018B254 00188194 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8475,7 +8475,7 @@ lbl_8018B23C: lbl_8018B278: /* 8018B278 001881B8 90 19 01 70 */ stw r0, 0x170(r25) /* 8018B27C 001881BC 38 60 00 6C */ li r3, 0x6c -/* 8018B280 001881C0 48 14 39 CD */ bl __nw +/* 8018B280 001881C0 48 14 39 CD */ bl __nw__FUl /* 8018B284 001881C4 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B288 001881C8 41 82 00 28 */ beq lbl_8018B2B0 /* 8018B28C 001881CC 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8583,7 +8583,7 @@ lbl_8018B2B0: /* 8018B420 00188360 3B 40 00 00 */ li r26, 0 lbl_8018B424: /* 8018B424 00188364 38 60 00 6C */ li r3, 0x6c -/* 8018B428 00188368 48 14 38 25 */ bl __nw +/* 8018B428 00188368 48 14 38 25 */ bl __nw__FUl /* 8018B42C 0018836C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B430 00188370 41 82 00 28 */ beq lbl_8018B458 /* 8018B434 00188374 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8694,7 +8694,7 @@ lbl_8018B4D8: /* 8018B5D0 00188510 C3 C2 9F 48 */ lfs f30, lbl_80453948-_SDA2_BASE_(r2) lbl_8018B5D4: /* 8018B5D4 00188514 38 60 00 1C */ li r3, 0x1c -/* 8018B5D8 00188518 48 14 36 75 */ bl __nw +/* 8018B5D8 00188518 48 14 36 75 */ bl __nw__FUl /* 8018B5DC 0018851C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B5E0 00188520 41 82 00 28 */ beq lbl_8018B608 /* 8018B5E4 00188524 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8790,7 +8790,7 @@ lbl_8018B608: /* 8018B748 00188688 3B 60 00 00 */ li r27, 0 lbl_8018B74C: /* 8018B74C 0018868C 38 60 00 1C */ li r3, 0x1c -/* 8018B750 00188690 48 14 34 FD */ bl __nw +/* 8018B750 00188690 48 14 34 FD */ bl __nw__FUl /* 8018B754 00188694 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B758 00188698 41 82 00 28 */ beq lbl_8018B780 /* 8018B75C 0018869C 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8806,7 +8806,7 @@ lbl_8018B780: /* 8018B780 001886C0 7E FF D2 14 */ add r23, r31, r26 /* 8018B784 001886C4 90 17 01 4C */ stw r0, 0x14c(r23) /* 8018B788 001886C8 38 60 00 1C */ li r3, 0x1c -/* 8018B78C 001886CC 48 14 34 C1 */ bl __nw +/* 8018B78C 001886CC 48 14 34 C1 */ bl __nw__FUl /* 8018B790 001886D0 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B794 001886D4 41 82 00 28 */ beq lbl_8018B7BC /* 8018B798 001886D8 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8907,7 +8907,7 @@ lbl_8018B7BC: /* 8018B910 00188850 C3 E2 9F 40 */ lfs f31, lbl_80453940-_SDA2_BASE_(r2) lbl_8018B914: /* 8018B914 00188854 38 60 00 1C */ li r3, 0x1c -/* 8018B918 00188858 48 14 33 35 */ bl __nw +/* 8018B918 00188858 48 14 33 35 */ bl __nw__FUl /* 8018B91C 0018885C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018B920 00188860 41 82 00 28 */ beq lbl_8018B948 /* 8018B924 00188864 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8986,7 +8986,7 @@ lbl_8018B948: /* 8018BA44 00188984 7D 89 03 A6 */ mtctr r12 /* 8018BA48 00188988 4E 80 04 21 */ bctrl /* 8018BA4C 0018898C 38 60 00 B8 */ li r3, 0xb8 -/* 8018BA50 00188990 48 14 31 FD */ bl __nw +/* 8018BA50 00188990 48 14 31 FD */ bl __nw__FUl /* 8018BA54 00188994 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BA58 00188998 41 82 00 18 */ beq lbl_8018BA70 /* 8018BA5C 0018899C 38 80 00 00 */ li r4, 0 @@ -9088,7 +9088,7 @@ lbl_8018BA70: /* 8018BBD8 00188B18 3B BE 06 38 */ addi r29, r30, 0x638 lbl_8018BBDC: /* 8018BBDC 00188B1C 38 60 01 00 */ li r3, 0x100 -/* 8018BBE0 00188B20 48 14 30 6D */ bl __nw +/* 8018BBE0 00188B20 48 14 30 6D */ bl __nw__FUl /* 8018BBE4 00188B24 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BBE8 00188B28 41 82 00 40 */ beq lbl_8018BC28 /* 8018BBEC 00188B2C C0 02 9F 94 */ lfs f0, lbl_80453994-_SDA2_BASE_(r2) @@ -9137,7 +9137,7 @@ lbl_8018BC28: /* 8018BC94 00188BD4 3B 41 00 4C */ addi r26, r1, 0x4c lbl_8018BC98: /* 8018BC98 00188BD8 38 60 00 3C */ li r3, 0x3c -/* 8018BC9C 00188BDC 48 14 2F B1 */ bl __nw +/* 8018BC9C 00188BDC 48 14 2F B1 */ bl __nw__FUl /* 8018BCA0 00188BE0 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BCA4 00188BE4 41 82 00 14 */ beq lbl_8018BCB8 /* 8018BCA8 00188BE8 80 9F 00 08 */ lwz r4, 8(r31) @@ -9170,7 +9170,7 @@ lbl_8018BCB8: /* 8018BD10 00188C50 4E 80 04 21 */ bctrl /* 8018BD14 00188C54 90 7F 01 1C */ stw r3, 0x11c(r31) /* 8018BD18 00188C58 38 60 03 34 */ li r3, 0x334 -/* 8018BD1C 00188C5C 48 14 2F 31 */ bl __nw +/* 8018BD1C 00188C5C 48 14 2F 31 */ bl __nw__FUl /* 8018BD20 00188C60 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BD24 00188C64 41 82 00 10 */ beq lbl_8018BD34 /* 8018BD28 00188C68 80 9F 01 1C */ lwz r4, 0x11c(r31) @@ -9181,7 +9181,7 @@ lbl_8018BD34: /* 8018BD38 00188C78 38 00 00 00 */ li r0, 0 /* 8018BD3C 00188C7C 98 1F 01 28 */ stb r0, 0x128(r31) /* 8018BD40 00188C80 38 60 00 40 */ li r3, 0x40 -/* 8018BD44 00188C84 48 14 2F 09 */ bl __nw +/* 8018BD44 00188C84 48 14 2F 09 */ bl __nw__FUl /* 8018BD48 00188C88 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BD4C 00188C8C 41 82 00 14 */ beq lbl_8018BD60 /* 8018BD50 00188C90 80 9F 00 08 */ lwz r4, 8(r31) @@ -9237,7 +9237,7 @@ lbl_8018BD60: /* 8018BE14 00188D54 4E 80 04 21 */ bctrl /* 8018BE18 00188D58 7C 76 1B 78 */ mr r22, r3 /* 8018BE1C 00188D5C 38 60 01 50 */ li r3, 0x150 -/* 8018BE20 00188D60 48 14 2E 2D */ bl __nw +/* 8018BE20 00188D60 48 14 2E 2D */ bl __nw__FUl /* 8018BE24 00188D64 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BE28 00188D68 41 82 00 40 */ beq lbl_8018BE68 /* 8018BE2C 00188D6C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) @@ -9317,7 +9317,7 @@ dFile_select_c_NS_screenSetCopySel: /* 8018BF44 00188E84 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018BF48 00188E88 3B 83 A8 48 */ addi r28, r3, lbl_803BA848@l /* 8018BF4C 00188E8C 38 60 01 18 */ li r3, 0x118 -/* 8018BF50 00188E90 48 14 2C FD */ bl __nw +/* 8018BF50 00188E90 48 14 2C FD */ bl __nw__FUl /* 8018BF54 00188E94 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BF58 00188E98 41 82 00 0C */ beq lbl_8018BF64 /* 8018BF5C 00188E9C 48 16 C5 3D */ bl J2DScreen @@ -9449,7 +9449,7 @@ lbl_8018BF64: /* 8018C150 00189090 3B 3C 06 A0 */ addi r25, r28, 0x6a0 lbl_8018C154: /* 8018C154 00189094 38 60 00 6C */ li r3, 0x6c -/* 8018C158 00189098 48 14 2A F5 */ bl __nw +/* 8018C158 00189098 48 14 2A F5 */ bl __nw__FUl /* 8018C15C 0018909C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C160 001890A0 41 82 00 28 */ beq lbl_8018C188 /* 8018C164 001890A4 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9465,7 +9465,7 @@ lbl_8018C188: /* 8018C188 001890C8 7F DF D2 14 */ add r30, r31, r26 /* 8018C18C 001890CC 90 1E 02 A4 */ stw r0, 0x2a4(r30) /* 8018C190 001890D0 38 60 00 6C */ li r3, 0x6c -/* 8018C194 001890D4 48 14 2A B9 */ bl __nw +/* 8018C194 001890D4 48 14 2A B9 */ bl __nw__FUl /* 8018C198 001890D8 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C19C 001890DC 41 82 00 28 */ beq lbl_8018C1C4 /* 8018C1A0 001890E0 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9480,7 +9480,7 @@ lbl_8018C188: lbl_8018C1C4: /* 8018C1C4 00189104 90 1E 02 C0 */ stw r0, 0x2c0(r30) /* 8018C1C8 00189108 38 60 00 6C */ li r3, 0x6c -/* 8018C1CC 0018910C 48 14 2A 81 */ bl __nw +/* 8018C1CC 0018910C 48 14 2A 81 */ bl __nw__FUl /* 8018C1D0 00189110 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C1D4 00189114 41 82 00 28 */ beq lbl_8018C1FC /* 8018C1D8 00189118 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9495,7 +9495,7 @@ lbl_8018C1C4: lbl_8018C1FC: /* 8018C1FC 0018913C 90 1E 02 C8 */ stw r0, 0x2c8(r30) /* 8018C200 00189140 38 60 00 6C */ li r3, 0x6c -/* 8018C204 00189144 48 14 2A 49 */ bl __nw +/* 8018C204 00189144 48 14 2A 49 */ bl __nw__FUl /* 8018C208 00189148 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C20C 0018914C 41 82 00 28 */ beq lbl_8018C234 /* 8018C210 00189150 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9510,7 +9510,7 @@ lbl_8018C1FC: lbl_8018C234: /* 8018C234 00189174 90 1E 02 D0 */ stw r0, 0x2d0(r30) /* 8018C238 00189178 38 60 00 6C */ li r3, 0x6c -/* 8018C23C 0018917C 48 14 2A 11 */ bl __nw +/* 8018C23C 0018917C 48 14 2A 11 */ bl __nw__FUl /* 8018C240 00189180 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C244 00189184 41 82 00 28 */ beq lbl_8018C26C /* 8018C248 00189188 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9621,7 +9621,7 @@ lbl_8018C26C: /* 8018C3E8 00189328 7D 89 03 A6 */ mtctr r12 /* 8018C3EC 0018932C 4E 80 04 21 */ bctrl /* 8018C3F0 00189330 38 60 00 B8 */ li r3, 0xb8 -/* 8018C3F4 00189334 48 14 28 59 */ bl __nw +/* 8018C3F4 00189334 48 14 28 59 */ bl __nw__FUl /* 8018C3F8 00189338 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C3FC 0018933C 41 82 00 18 */ beq lbl_8018C414 /* 8018C400 00189340 38 80 00 00 */ li r4, 0 @@ -9666,7 +9666,7 @@ lbl_8018C414: /* 8018C498 001893D8 3B 7C 00 58 */ addi r27, r28, 0x58 lbl_8018C49C: /* 8018C49C 001893DC 38 60 00 3C */ li r3, 0x3c -/* 8018C4A0 001893E0 48 14 27 AD */ bl __nw +/* 8018C4A0 001893E0 48 14 27 AD */ bl __nw__FUl /* 8018C4A4 001893E4 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C4A8 001893E8 41 82 00 14 */ beq lbl_8018C4BC /* 8018C4AC 001893EC 80 9F 00 08 */ lwz r4, 8(r31) @@ -9712,7 +9712,7 @@ dFile_select_c_NS_screenSetYesNo: /* 8018C53C 0018947C 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018C540 00189480 3B C3 A8 48 */ addi r30, r3, lbl_803BA848@l /* 8018C544 00189484 38 60 01 18 */ li r3, 0x118 -/* 8018C548 00189488 48 14 27 05 */ bl __nw +/* 8018C548 00189488 48 14 27 05 */ bl __nw__FUl /* 8018C54C 0018948C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C550 00189490 41 82 00 0C */ beq lbl_8018C55C /* 8018C554 00189494 48 16 BF 45 */ bl J2DScreen @@ -9766,7 +9766,7 @@ lbl_8018C55C: /* 8018C610 00189550 3B 9E 06 C0 */ addi r28, r30, 0x6c0 lbl_8018C614: /* 8018C614 00189554 38 60 00 6C */ li r3, 0x6c -/* 8018C618 00189558 48 14 26 35 */ bl __nw +/* 8018C618 00189558 48 14 26 35 */ bl __nw__FUl /* 8018C61C 0018955C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C620 00189560 41 82 00 28 */ beq lbl_8018C648 /* 8018C624 00189564 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9782,7 +9782,7 @@ lbl_8018C648: /* 8018C648 00189588 7F 1F D2 14 */ add r24, r31, r26 /* 8018C64C 0018958C 90 18 00 F0 */ stw r0, 0xf0(r24) /* 8018C650 00189590 38 60 00 6C */ li r3, 0x6c -/* 8018C654 00189594 48 14 25 F9 */ bl __nw +/* 8018C654 00189594 48 14 25 F9 */ bl __nw__FUl /* 8018C658 00189598 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C65C 0018959C 41 82 00 28 */ beq lbl_8018C684 /* 8018C660 001895A0 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9864,7 +9864,7 @@ lbl_8018C684: /* 8018C78C 001896CC 3B 40 00 00 */ li r26, 0 lbl_8018C790: /* 8018C790 001896D0 38 60 00 6C */ li r3, 0x6c -/* 8018C794 001896D4 48 14 24 B9 */ bl __nw +/* 8018C794 001896D4 48 14 24 B9 */ bl __nw__FUl /* 8018C798 001896D8 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C79C 001896DC 41 82 00 28 */ beq lbl_8018C7C4 /* 8018C7A0 001896E0 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9880,7 +9880,7 @@ lbl_8018C7C4: /* 8018C7C4 00189704 7F BF DA 14 */ add r29, r31, r27 /* 8018C7C8 00189708 90 1D 01 A0 */ stw r0, 0x1a0(r29) /* 8018C7CC 0018970C 38 60 00 6C */ li r3, 0x6c -/* 8018C7D0 00189710 48 14 24 7D */ bl __nw +/* 8018C7D0 00189710 48 14 24 7D */ bl __nw__FUl /* 8018C7D4 00189714 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C7D8 00189718 41 82 00 28 */ beq lbl_8018C800 /* 8018C7DC 0018971C 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9895,7 +9895,7 @@ lbl_8018C7C4: lbl_8018C800: /* 8018C800 00189740 90 1D 01 A8 */ stw r0, 0x1a8(r29) /* 8018C804 00189744 38 60 00 6C */ li r3, 0x6c -/* 8018C808 00189748 48 14 24 45 */ bl __nw +/* 8018C808 00189748 48 14 24 45 */ bl __nw__FUl /* 8018C80C 0018974C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C810 00189750 41 82 00 28 */ beq lbl_8018C838 /* 8018C814 00189754 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9967,7 +9967,7 @@ dFile_select_c_NS_screenSet3Menu: /* 8018C90C 0018984C 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018C910 00189850 3B 83 A8 48 */ addi r28, r3, lbl_803BA848@l /* 8018C914 00189854 38 60 01 18 */ li r3, 0x118 -/* 8018C918 00189858 48 14 23 35 */ bl __nw +/* 8018C918 00189858 48 14 23 35 */ bl __nw__FUl /* 8018C91C 0018985C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C920 00189860 41 82 00 0C */ beq lbl_8018C92C /* 8018C924 00189864 48 16 BB 75 */ bl J2DScreen @@ -10063,7 +10063,7 @@ lbl_8018C92C: /* 8018CA88 001899C8 3B 3C 07 70 */ addi r25, r28, 0x770 lbl_8018CA8C: /* 8018CA8C 001899CC 38 60 00 6C */ li r3, 0x6c -/* 8018CA90 001899D0 48 14 21 BD */ bl __nw +/* 8018CA90 001899D0 48 14 21 BD */ bl __nw__FUl /* 8018CA94 001899D4 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CA98 001899D8 41 82 00 28 */ beq lbl_8018CAC0 /* 8018CA9C 001899DC 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10079,7 +10079,7 @@ lbl_8018CAC0: /* 8018CAC0 00189A00 7F BF D2 14 */ add r29, r31, r26 /* 8018CAC4 00189A04 90 1D 03 40 */ stw r0, 0x340(r29) /* 8018CAC8 00189A08 38 60 00 6C */ li r3, 0x6c -/* 8018CACC 00189A0C 48 14 21 81 */ bl __nw +/* 8018CACC 00189A0C 48 14 21 81 */ bl __nw__FUl /* 8018CAD0 00189A10 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CAD4 00189A14 41 82 00 28 */ beq lbl_8018CAFC /* 8018CAD8 00189A18 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10122,7 +10122,7 @@ lbl_8018CAFC: /* 8018CB68 00189AA8 4C C6 31 82 */ crclr 6 /* 8018CB6C 00189AAC 48 17 3A F5 */ bl J2DTextBox_NS_setString /* 8018CB70 00189AB0 38 60 00 6C */ li r3, 0x6c -/* 8018CB74 00189AB4 48 14 20 D9 */ bl __nw +/* 8018CB74 00189AB4 48 14 20 D9 */ bl __nw__FUl /* 8018CB78 00189AB8 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CB7C 00189ABC 41 82 00 28 */ beq lbl_8018CBA4 /* 8018CB80 00189AC0 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10137,7 +10137,7 @@ lbl_8018CAFC: lbl_8018CBA4: /* 8018CBA4 00189AE4 90 1D 03 64 */ stw r0, 0x364(r29) /* 8018CBA8 00189AE8 38 60 00 6C */ li r3, 0x6c -/* 8018CBAC 00189AEC 48 14 20 A1 */ bl __nw +/* 8018CBAC 00189AEC 48 14 20 A1 */ bl __nw__FUl /* 8018CBB0 00189AF0 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CBB4 00189AF4 41 82 00 28 */ beq lbl_8018CBDC /* 8018CBB8 00189AF8 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10152,7 +10152,7 @@ lbl_8018CBA4: lbl_8018CBDC: /* 8018CBDC 00189B1C 90 1D 03 70 */ stw r0, 0x370(r29) /* 8018CBE0 00189B20 38 60 00 6C */ li r3, 0x6c -/* 8018CBE4 00189B24 48 14 20 69 */ bl __nw +/* 8018CBE4 00189B24 48 14 20 69 */ bl __nw__FUl /* 8018CBE8 00189B28 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CBEC 00189B2C 41 82 00 28 */ beq lbl_8018CC14 /* 8018CBF0 00189B30 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10221,7 +10221,7 @@ dFile_select_c_NS_screenSetDetail: /* 8018CCDC 00189C1C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018CCE0 00189C20 7C 7F 1B 78 */ mr r31, r3 /* 8018CCE4 00189C24 38 60 01 18 */ li r3, 0x118 -/* 8018CCE8 00189C28 48 14 1F 65 */ bl __nw +/* 8018CCE8 00189C28 48 14 1F 65 */ bl __nw__FUl /* 8018CCEC 00189C2C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CCF0 00189C30 41 82 00 0C */ beq lbl_8018CCFC /* 8018CCF4 00189C34 48 16 B7 A5 */ bl J2DScreen @@ -10260,7 +10260,7 @@ lbl_8018CCFC: /* 8018CD74 00189CB4 4E 80 04 21 */ bctrl /* 8018CD78 00189CB8 90 7F 00 30 */ stw r3, 0x30(r31) /* 8018CD7C 00189CBC 38 60 00 6C */ li r3, 0x6c -/* 8018CD80 00189CC0 48 14 1E CD */ bl __nw +/* 8018CD80 00189CC0 48 14 1E CD */ bl __nw__FUl /* 8018CD84 00189CC4 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CD88 00189CC8 41 82 00 28 */ beq lbl_8018CDB0 /* 8018CD8C 00189CCC 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -14018,7 +14018,7 @@ dFile_select3D_c: /* 801903B0 0018D2F0 7F E0 07 35 */ extsh. r0, r31 /* 801903B4 0018D2F4 40 81 00 0C */ ble lbl_801903C0 /* 801903B8 0018D2F8 7F C3 F3 78 */ mr r3, r30 -/* 801903BC 0018D2FC 48 13 E9 81 */ bl __dl +/* 801903BC 0018D2FC 48 13 E9 81 */ bl __dl__FPv lbl_801903C0: /* 801903C0 0018D300 7F C3 F3 78 */ mr r3, r30 /* 801903C4 0018D304 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -14239,7 +14239,7 @@ dFile_select3D_c_NS_setJ3D: /* 801906C0 0018D600 48 00 00 F4 */ b lbl_801907B4 lbl_801906C4: /* 801906C4 0018D604 38 60 00 F4 */ li r3, 0xf4 -/* 801906C8 0018D608 48 13 E5 85 */ bl __nw +/* 801906C8 0018D608 48 13 E5 85 */ bl __nw__FUl /* 801906CC 0018D60C 7C 79 1B 79 */ or. r25, r3, r3 /* 801906D0 0018D610 41 82 00 B8 */ beq lbl_80190788 /* 801906D4 0018D614 3C 60 80 3D */ lis r3, lbl_803CEE60@ha @@ -14325,7 +14325,7 @@ lbl_801907B4: /* 801907BC 0018D6FC 7C 03 00 40 */ cmplw r3, r0 /* 801907C0 0018D700 41 80 FF 04 */ blt lbl_801906C4 /* 801907C4 0018D704 38 60 00 DC */ li r3, 0xdc -/* 801907C8 0018D708 48 13 E4 85 */ bl __nw +/* 801907C8 0018D708 48 13 E4 85 */ bl __nw__FUl /* 801907CC 0018D70C 7C 79 1B 79 */ or. r25, r3, r3 /* 801907D0 0018D710 41 82 00 38 */ beq lbl_80190808 /* 801907D4 0018D714 7F 38 CB 78 */ mr r24, r25 @@ -14357,7 +14357,7 @@ lbl_80190808: /* 80190838 0018D778 48 1A 73 09 */ bl J3DAnmLoaderDataBase_NS_load /* 8019083C 0018D77C 7C 78 1B 78 */ mr r24, r3 /* 80190840 0018D780 38 60 00 1C */ li r3, 0x1c -/* 80190844 0018D784 48 13 E4 09 */ bl __nw +/* 80190844 0018D784 48 13 E4 09 */ bl __nw__FUl /* 80190848 0018D788 7C 79 1B 79 */ or. r25, r3, r3 /* 8019084C 0018D78C 41 82 00 20 */ beq lbl_8019086C /* 80190850 0018D790 3C 80 80 3A */ lis r4, lbl_803A3354@ha @@ -14400,7 +14400,7 @@ lbl_801908A8: /* 801908DC 0018D81C 7F E4 FB 78 */ mr r4, r31 /* 801908E0 0018D820 48 19 AF 9D */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ /* 801908E4 0018D824 38 60 00 18 */ li r3, 0x18 -/* 801908E8 0018D828 48 13 E3 65 */ bl __nw +/* 801908E8 0018D828 48 13 E3 65 */ bl __nw__FUl /* 801908EC 0018D82C 7C 79 1B 79 */ or. r25, r3, r3 /* 801908F0 0018D830 41 82 00 20 */ beq lbl_80190910 /* 801908F4 0018D834 3C 80 80 3A */ lis r4, lbl_803A3354@ha @@ -14982,7 +14982,7 @@ dFile_select3D_c_NS_calcViewMtx: /* 80191154 0018E094 90 1F 00 00 */ stw r0, 0(r31) /* 80191158 0018E098 7C 80 07 35 */ extsh. r0, r4 /* 8019115C 0018E09C 40 81 00 08 */ ble lbl_80191164 -/* 80191160 0018E0A0 48 13 DB DD */ bl __dl +/* 80191160 0018E0A0 48 13 DB DD */ bl __dl__FPv lbl_80191164: /* 80191164 0018E0A4 7F E3 FB 78 */ mr r3, r31 /* 80191168 0018E0A8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15013,7 +15013,7 @@ lbl_801911C8: /* 801911C8 0018E108 7F E0 07 35 */ extsh. r0, r31 /* 801911CC 0018E10C 40 81 00 0C */ ble lbl_801911D8 /* 801911D0 0018E110 7F C3 F3 78 */ mr r3, r30 -/* 801911D4 0018E114 48 13 DB 69 */ bl __dl +/* 801911D4 0018E114 48 13 DB 69 */ bl __dl__FPv lbl_801911D8: /* 801911D8 0018E118 7F C3 F3 78 */ mr r3, r30 /* 801911DC 0018E11C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15045,7 +15045,7 @@ lbl_80191240: /* 80191240 0018E180 7F E0 07 35 */ extsh. r0, r31 /* 80191244 0018E184 40 81 00 0C */ ble lbl_80191250 /* 80191248 0018E188 7F C3 F3 78 */ mr r3, r30 -/* 8019124C 0018E18C 48 13 DA F1 */ bl __dl +/* 8019124C 0018E18C 48 13 DA F1 */ bl __dl__FPv lbl_80191250: /* 80191250 0018E190 7F C3 F3 78 */ mr r3, r30 /* 80191254 0018E194 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15077,7 +15077,7 @@ lbl_801912B8: /* 801912B8 0018E1F8 7F E0 07 35 */ extsh. r0, r31 /* 801912BC 0018E1FC 40 81 00 0C */ ble lbl_801912C8 /* 801912C0 0018E200 7F C3 F3 78 */ mr r3, r30 -/* 801912C4 0018E204 48 13 DA 79 */ bl __dl +/* 801912C4 0018E204 48 13 DA 79 */ bl __dl__FPv lbl_801912C8: /* 801912C8 0018E208 7F C3 F3 78 */ mr r3, r30 /* 801912CC 0018E20C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15109,7 +15109,7 @@ lbl_80191330: /* 80191330 0018E270 7F E0 07 35 */ extsh. r0, r31 /* 80191334 0018E274 40 81 00 0C */ ble lbl_80191340 /* 80191338 0018E278 7F C3 F3 78 */ mr r3, r30 -/* 8019133C 0018E27C 48 13 DA 01 */ bl __dl +/* 8019133C 0018E27C 48 13 DA 01 */ bl __dl__FPv lbl_80191340: /* 80191340 0018E280 7F C3 F3 78 */ mr r3, r30 /* 80191344 0018E284 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15144,7 +15144,7 @@ lbl_801913A8: /* 801913B4 0018E2F4 7F E0 07 35 */ extsh. r0, r31 /* 801913B8 0018E2F8 40 81 00 0C */ ble lbl_801913C4 /* 801913BC 0018E2FC 7F C3 F3 78 */ mr r3, r30 -/* 801913C0 0018E300 48 13 D9 7D */ bl __dl +/* 801913C0 0018E300 48 13 D9 7D */ bl __dl__FPv lbl_801913C4: /* 801913C4 0018E304 7F C3 F3 78 */ mr r3, r30 /* 801913C8 0018E308 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -15166,7 +15166,7 @@ dFs_HIO_c_NS_dtor: /* 80191400 0018E340 90 1F 00 00 */ stw r0, 0(r31) /* 80191404 0018E344 7C 80 07 35 */ extsh. r0, r4 /* 80191408 0018E348 40 81 00 08 */ ble lbl_80191410 -/* 8019140C 0018E34C 48 13 D9 31 */ bl __dl +/* 8019140C 0018E34C 48 13 D9 31 */ bl __dl__FPv lbl_80191410: /* 80191410 0018E350 7F E3 FB 78 */ mr r3, r31 /* 80191414 0018E354 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/file/sel/d_file_sel_info.s b/asm/d/file/sel/d_file_sel_info.s index c525ac6c34..583fbcedca 100644 --- a/asm/d/file/sel/d_file_sel_info.s +++ b/asm/d/file/sel/d_file_sel_info.s @@ -80,7 +80,7 @@ lbl_80192544: /* 80192544 0018F484 7F E0 07 35 */ extsh. r0, r31 /* 80192548 0018F488 40 81 00 0C */ ble lbl_80192554 /* 8019254C 0018F48C 7F C3 F3 78 */ mr r3, r30 -/* 80192550 0018F490 48 13 C7 ED */ bl __dl +/* 80192550 0018F490 48 13 C7 ED */ bl __dl__FPv lbl_80192554: /* 80192554 0018F494 7F C3 F3 78 */ mr r3, r30 /* 80192558 0018F498 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -99,7 +99,7 @@ dFile_info_c_NS_screenSet: /* 80192580 0018F4C0 48 1C FC 51 */ bl func_803621D0 /* 80192584 0018F4C4 7C 7F 1B 78 */ mr r31, r3 /* 80192588 0018F4C8 38 60 01 18 */ li r3, 0x118 -/* 8019258C 0018F4CC 48 13 C6 C1 */ bl __nw +/* 8019258C 0018F4CC 48 13 C6 C1 */ bl __nw__FUl /* 80192590 0018F4D0 7C 60 1B 79 */ or. r0, r3, r3 /* 80192594 0018F4D4 41 82 00 0C */ beq lbl_801925A0 /* 80192598 0018F4D8 48 16 5F 01 */ bl J2DScreen @@ -136,7 +136,7 @@ lbl_801925A0: /* 80192610 0018F550 4E 80 04 21 */ bctrl /* 80192614 0018F554 90 7F 00 18 */ stw r3, 0x18(r31) /* 80192618 0018F558 38 60 00 1C */ li r3, 0x1c -/* 8019261C 0018F55C 48 13 C6 31 */ bl __nw +/* 8019261C 0018F55C 48 13 C6 31 */ bl __nw__FUl /* 80192620 0018F560 7C 60 1B 79 */ or. r0, r3, r3 /* 80192624 0018F564 41 82 00 28 */ beq lbl_8019264C /* 80192628 0018F568 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -151,7 +151,7 @@ lbl_801925A0: lbl_8019264C: /* 8019264C 0018F58C 90 1F 00 24 */ stw r0, 0x24(r31) /* 80192650 0018F590 38 60 00 1C */ li r3, 0x1c -/* 80192654 0018F594 48 13 C5 F9 */ bl __nw +/* 80192654 0018F594 48 13 C5 F9 */ bl __nw__FUl /* 80192658 0018F598 7C 60 1B 79 */ or. r0, r3, r3 /* 8019265C 0018F59C 41 82 00 28 */ beq lbl_80192684 /* 80192660 0018F5A0 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -734,7 +734,7 @@ lbl_80192E5C: /* 80192EE8 0018FE28 90 1F 00 00 */ stw r0, 0(r31) /* 80192EEC 0018FE2C 7C 80 07 35 */ extsh. r0, r4 /* 80192EF0 0018FE30 40 81 00 08 */ ble lbl_80192EF8 -/* 80192EF4 0018FE34 48 13 BE 49 */ bl __dl +/* 80192EF4 0018FE34 48 13 BE 49 */ bl __dl__FPv lbl_80192EF8: /* 80192EF8 0018FE38 7F E3 FB 78 */ mr r3, r31 /* 80192EFC 0018FE3C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/file/sel/d_file_sel_warning.s b/asm/d/file/sel/d_file_sel_warning.s index 2b201db3df..e47ab49a94 100644 --- a/asm/d/file/sel/d_file_sel_warning.s +++ b/asm/d/file/sel/d_file_sel_warning.s @@ -83,7 +83,7 @@ lbl_80191CC8: /* 80191CC8 0018EC08 7F E0 07 35 */ extsh. r0, r31 /* 80191CCC 0018EC0C 40 81 00 0C */ ble lbl_80191CD8 /* 80191CD0 0018EC10 7F C3 F3 78 */ mr r3, r30 -/* 80191CD4 0018EC14 48 13 D0 69 */ bl __dl +/* 80191CD4 0018EC14 48 13 D0 69 */ bl __dl__FPv lbl_80191CD8: /* 80191CD8 0018EC18 7F C3 F3 78 */ mr r3, r30 /* 80191CDC 0018EC1C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -109,7 +109,7 @@ dFile_warning_c_NS_screenSet: /* 80191D20 0018EC60 90 61 00 08 */ stw r3, 8(r1) /* 80191D24 0018EC64 90 01 00 0C */ stw r0, 0xc(r1) /* 80191D28 0018EC68 38 60 01 18 */ li r3, 0x118 -/* 80191D2C 0018EC6C 48 13 CF 21 */ bl __nw +/* 80191D2C 0018EC6C 48 13 CF 21 */ bl __nw__FUl /* 80191D30 0018EC70 7C 60 1B 79 */ or. r0, r3, r3 /* 80191D34 0018EC74 41 82 00 0C */ beq lbl_80191D40 /* 80191D38 0018EC78 48 16 67 61 */ bl J2DScreen @@ -117,7 +117,7 @@ dFile_warning_c_NS_screenSet: lbl_80191D40: /* 80191D40 0018EC80 90 1F 00 0C */ stw r0, 0xc(r31) /* 80191D44 0018EC84 38 60 00 2C */ li r3, 0x2c -/* 80191D48 0018EC88 48 13 CF 05 */ bl __nw +/* 80191D48 0018EC88 48 13 CF 05 */ bl __nw__FUl /* 80191D4C 0018EC8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80191D50 0018EC90 41 82 00 0C */ beq lbl_80191D5C /* 80191D54 0018EC94 48 0B 7E CD */ bl dMsgString_c @@ -154,7 +154,7 @@ lbl_80191D5C: /* 80191DCC 0018ED0C 4B E8 2C 25 */ bl mDoExt_getMesgFont /* 80191DD0 0018ED10 90 7F 00 10 */ stw r3, 0x10(r31) /* 80191DD4 0018ED14 38 60 00 6C */ li r3, 0x6c -/* 80191DD8 0018ED18 48 13 CE 75 */ bl __nw +/* 80191DD8 0018ED18 48 13 CE 75 */ bl __nw__FUl /* 80191DDC 0018ED1C 7C 60 1B 79 */ or. r0, r3, r3 /* 80191DE0 0018ED20 41 82 00 24 */ beq lbl_80191E04 /* 80191DE4 0018ED24 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -582,7 +582,7 @@ dFile_warning_c_NS_setFontColor: /* 801923EC 0018F32C 90 1F 00 00 */ stw r0, 0(r31) /* 801923F0 0018F330 7C 80 07 35 */ extsh. r0, r4 /* 801923F4 0018F334 40 81 00 08 */ ble lbl_801923FC -/* 801923F8 0018F338 48 13 C9 45 */ bl __dl +/* 801923F8 0018F338 48 13 C9 45 */ bl __dl__FPv lbl_801923FC: /* 801923FC 0018F33C 7F E3 FB 78 */ mr r3, r31 /* 80192400 0018F340 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 93193c41a2..13075e644c 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -971,7 +971,7 @@ cM3dGLin_NS_dtor: /* 80036A7C 000339BC 90 1F 00 18 */ stw r0, 0x18(r31) /* 80036A80 000339C0 7C 80 07 35 */ extsh. r0, r4 /* 80036A84 000339C4 40 81 00 08 */ ble lbl_80036A8C -/* 80036A88 000339C8 48 29 82 B5 */ bl __dl +/* 80036A88 000339C8 48 29 82 B5 */ bl __dl__FPv lbl_80036A8C: /* 80036A8C 000339CC 7F E3 FB 78 */ mr r3, r31 /* 80036A90 000339D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -990,7 +990,7 @@ lbl_80036A8C: /* 80036AC4 00033A04 90 1F 00 10 */ stw r0, 0x10(r31) /* 80036AC8 00033A08 7C 80 07 35 */ extsh. r0, r4 /* 80036ACC 00033A0C 40 81 00 08 */ ble lbl_80036AD4 -/* 80036AD0 00033A10 48 29 82 6D */ bl __dl +/* 80036AD0 00033A10 48 29 82 6D */ bl __dl__FPv lbl_80036AD4: /* 80036AD4 00033A14 7F E3 FB 78 */ mr r3, r31 /* 80036AD8 00033A18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/k/d_k_wmark.s b/asm/d/k/d_k_wmark.s index a7dd952bf1..a94fc09c19 100644 --- a/asm/d/k/d_k_wmark.s +++ b/asm/d/k/d_k_wmark.s @@ -175,7 +175,7 @@ lbl_80261670: /* 80261670 0025E5B0 7F E0 07 35 */ extsh. r0, r31 /* 80261674 0025E5B4 40 81 00 0C */ ble lbl_80261680 /* 80261678 0025E5B8 7F C3 F3 78 */ mr r3, r30 -/* 8026167C 0025E5BC 48 06 D6 C1 */ bl __dl +/* 8026167C 0025E5BC 48 06 D6 C1 */ bl __dl__FPv lbl_80261680: /* 80261680 0025E5C0 7F C3 F3 78 */ mr r3, r30 /* 80261684 0025E5C4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/k/d_k_wpillar.s b/asm/d/k/d_k_wpillar.s index 0e540053eb..d1efaf207c 100644 --- a/asm/d/k/d_k_wpillar.s +++ b/asm/d/k/d_k_wpillar.s @@ -311,7 +311,7 @@ lbl_80261FC0: /* 80261FC0 0025EF00 7F C0 07 35 */ extsh. r0, r30 /* 80261FC4 0025EF04 40 81 00 0C */ ble lbl_80261FD0 /* 80261FC8 0025EF08 7F E3 FB 78 */ mr r3, r31 -/* 80261FCC 0025EF0C 48 06 CD 71 */ bl __dl +/* 80261FCC 0025EF0C 48 06 CD 71 */ bl __dl__FPv lbl_80261FD0: /* 80261FD0 0025EF10 7F E3 FB 78 */ mr r3, r31 /* 80261FD4 0025EF14 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index f22275f341..4181ea1fbe 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -4883,7 +4883,7 @@ dKyr_snow_init: /* 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 -/* 8005FC04 0005CB44 48 26 F0 71 */ bl __nw_X1_ +/* 8005FC04 0005CB44 48 26 F0 71 */ bl __nw__FUli /* 8005FC08 0005CB48 7C 7D 1B 79 */ or. r29, r3, r3 /* 8005FC0C 0005CB4C 41 82 00 50 */ beq lbl_8005FC5C /* 8005FC10 0005CB50 7F A4 EB 78 */ mr r4, r29 @@ -6516,7 +6516,7 @@ dKyr_star_init: /* 80061334 0005E274 93 C1 00 08 */ stw r30, 8(r1) /* 80061338 0005E278 38 60 00 4C */ li r3, 0x4c /* 8006133C 0005E27C 38 80 00 20 */ li r4, 0x20 -/* 80061340 0005E280 48 26 D9 35 */ bl __nw_X1_ +/* 80061340 0005E280 48 26 D9 35 */ bl __nw__FUli /* 80061344 0005E284 7C 7E 1B 79 */ or. r30, r3, r3 /* 80061348 0005E288 41 82 00 50 */ beq lbl_80061398 /* 8006134C 0005E28C 7F C4 F3 78 */ mr r4, r30 diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index b171b5d8e6..e1080b4efe 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -170,7 +170,7 @@ RAIN_EFF_NS_dtor: /* 80056CE4 00053C24 41 82 00 10 */ beq lbl_80056CF4 /* 80056CE8 00053C28 7C 80 07 35 */ extsh. r0, r4 /* 80056CEC 00053C2C 40 81 00 08 */ ble lbl_80056CF4 -/* 80056CF0 00053C30 48 27 80 4D */ bl __dl +/* 80056CF0 00053C30 48 27 80 4D */ bl __dl__FPv lbl_80056CF4: /* 80056CF4 00053C34 7F E3 FB 78 */ mr r3, r31 /* 80056CF8 00053C38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -209,7 +209,7 @@ SNOW_EFF_NS_dtor: /* 80056D6C 00053CAC 41 82 00 10 */ beq lbl_80056D7C /* 80056D70 00053CB0 7C 80 07 35 */ extsh. r0, r4 /* 80056D74 00053CB4 40 81 00 08 */ ble lbl_80056D7C -/* 80056D78 00053CB8 48 27 7F C5 */ bl __dl +/* 80056D78 00053CB8 48 27 7F C5 */ bl __dl__FPv lbl_80056D7C: /* 80056D7C 00053CBC 7F E3 FB 78 */ mr r3, r31 /* 80056D80 00053CC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -242,7 +242,7 @@ STAR_EFF_NS_dtor: /* 80056DDC 00053D1C 41 82 00 10 */ beq lbl_80056DEC /* 80056DE0 00053D20 7C 80 07 35 */ extsh. r0, r4 /* 80056DE4 00053D24 40 81 00 08 */ ble lbl_80056DEC -/* 80056DE8 00053D28 48 27 7F 55 */ bl __dl +/* 80056DE8 00053D28 48 27 7F 55 */ bl __dl__FPv lbl_80056DEC: /* 80056DEC 00053D2C 7F E3 FB 78 */ mr r3, r31 /* 80056DF0 00053D30 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -275,7 +275,7 @@ CLOUD_EFF_NS_dtor: /* 80056E4C 00053D8C 41 82 00 10 */ beq lbl_80056E5C /* 80056E50 00053D90 7C 80 07 35 */ extsh. r0, r4 /* 80056E54 00053D94 40 81 00 08 */ ble lbl_80056E5C -/* 80056E58 00053D98 48 27 7E E5 */ bl __dl +/* 80056E58 00053D98 48 27 7E E5 */ bl __dl__FPv lbl_80056E5C: /* 80056E5C 00053D9C 7F E3 FB 78 */ mr r3, r31 /* 80056E60 00053DA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -308,7 +308,7 @@ HOUSI_EFF_NS_dtor: /* 80056EBC 00053DFC 41 82 00 10 */ beq lbl_80056ECC /* 80056EC0 00053E00 7C 80 07 35 */ extsh. r0, r4 /* 80056EC4 00053E04 40 81 00 08 */ ble lbl_80056ECC -/* 80056EC8 00053E08 48 27 7E 75 */ bl __dl +/* 80056EC8 00053E08 48 27 7E 75 */ bl __dl__FPv lbl_80056ECC: /* 80056ECC 00053E0C 7F E3 FB 78 */ mr r3, r31 /* 80056ED0 00053E10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -341,7 +341,7 @@ VRKUMO_EFF_NS_dtor: /* 80056F2C 00053E6C 41 82 00 10 */ beq lbl_80056F3C /* 80056F30 00053E70 7C 80 07 35 */ extsh. r0, r4 /* 80056F34 00053E74 40 81 00 08 */ ble lbl_80056F3C -/* 80056F38 00053E78 48 27 7E 05 */ bl __dl +/* 80056F38 00053E78 48 27 7E 05 */ bl __dl__FPv lbl_80056F3C: /* 80056F3C 00053E7C 7F E3 FB 78 */ mr r3, r31 /* 80056F40 00053E80 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -375,7 +375,7 @@ EF_ODOUR_EFF_NS_dtor: /* 80056FA0 00053EE0 41 82 00 10 */ beq lbl_80056FB0 /* 80056FA4 00053EE4 7C 80 07 35 */ extsh. r0, r4 /* 80056FA8 00053EE8 40 81 00 08 */ ble lbl_80056FB0 -/* 80056FAC 00053EEC 48 27 7D 91 */ bl __dl +/* 80056FAC 00053EEC 48 27 7D 91 */ bl __dl__FPv lbl_80056FB0: /* 80056FB0 00053EF0 7F E3 FB 78 */ mr r3, r31 /* 80056FB4 00053EF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -408,7 +408,7 @@ EF_MUD_EFF_NS_dtor: /* 80057010 00053F50 41 82 00 10 */ beq lbl_80057020 /* 80057014 00053F54 7C 80 07 35 */ extsh. r0, r4 /* 80057018 00053F58 40 81 00 08 */ ble lbl_80057020 -/* 8005701C 00053F5C 48 27 7D 21 */ bl __dl +/* 8005701C 00053F5C 48 27 7D 21 */ bl __dl__FPv lbl_80057020: /* 80057020 00053F60 7F E3 FB 78 */ mr r3, r31 /* 80057024 00053F64 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -441,7 +441,7 @@ EF_EVIL_EFF_NS_dtor: /* 80057080 00053FC0 41 82 00 10 */ beq lbl_80057090 /* 80057084 00053FC4 7C 80 07 35 */ extsh. r0, r4 /* 80057088 00053FC8 40 81 00 08 */ ble lbl_80057090 -/* 8005708C 00053FCC 48 27 7C B1 */ bl __dl +/* 8005708C 00053FCC 48 27 7C B1 */ bl __dl__FPv lbl_80057090: /* 80057090 00053FD0 7F E3 FB 78 */ mr r3, r31 /* 80057094 00053FD4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1343,7 +1343,7 @@ lbl_80057CDC: /* 80057CDC 00054C1C 7F E0 07 35 */ extsh. r0, r31 /* 80057CE0 00054C20 40 81 00 0C */ ble lbl_80057CEC /* 80057CE4 00054C24 7F C3 F3 78 */ mr r3, r30 -/* 80057CE8 00054C28 48 27 70 55 */ bl __dl +/* 80057CE8 00054C28 48 27 70 55 */ bl __dl__FPv lbl_80057CEC: /* 80057CEC 00054C2C 7F C3 F3 78 */ mr r3, r30 /* 80057CF0 00054C30 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1380,7 +1380,7 @@ lbl_80057D60: /* 80057D60 00054CA0 7F E0 07 35 */ extsh. r0, r31 /* 80057D64 00054CA4 40 81 00 0C */ ble lbl_80057D70 /* 80057D68 00054CA8 7F C3 F3 78 */ mr r3, r30 -/* 80057D6C 00054CAC 48 27 6F D1 */ bl __dl +/* 80057D6C 00054CAC 48 27 6F D1 */ bl __dl__FPv lbl_80057D70: /* 80057D70 00054CB0 7F C3 F3 78 */ mr r3, r30 /* 80057D74 00054CB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1417,7 +1417,7 @@ lbl_80057DE4: /* 80057DE4 00054D24 7F E0 07 35 */ extsh. r0, r31 /* 80057DE8 00054D28 40 81 00 0C */ ble lbl_80057DF4 /* 80057DEC 00054D2C 7F C3 F3 78 */ mr r3, r30 -/* 80057DF0 00054D30 48 27 6F 4D */ bl __dl +/* 80057DF0 00054D30 48 27 6F 4D */ bl __dl__FPv lbl_80057DF4: /* 80057DF4 00054D34 7F C3 F3 78 */ mr r3, r30 /* 80057DF8 00054D38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1454,7 +1454,7 @@ lbl_80057E68: /* 80057E68 00054DA8 7F E0 07 35 */ extsh. r0, r31 /* 80057E6C 00054DAC 40 81 00 0C */ ble lbl_80057E78 /* 80057E70 00054DB0 7F C3 F3 78 */ mr r3, r30 -/* 80057E74 00054DB4 48 27 6E C9 */ bl __dl +/* 80057E74 00054DB4 48 27 6E C9 */ bl __dl__FPv lbl_80057E78: /* 80057E78 00054DB8 7F C3 F3 78 */ mr r3, r30 /* 80057E7C 00054DBC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1491,7 +1491,7 @@ lbl_80057EEC: /* 80057EEC 00054E2C 7F E0 07 35 */ extsh. r0, r31 /* 80057EF0 00054E30 40 81 00 0C */ ble lbl_80057EFC /* 80057EF4 00054E34 7F C3 F3 78 */ mr r3, r30 -/* 80057EF8 00054E38 48 27 6E 45 */ bl __dl +/* 80057EF8 00054E38 48 27 6E 45 */ bl __dl__FPv lbl_80057EFC: /* 80057EFC 00054E3C 7F C3 F3 78 */ mr r3, r30 /* 80057F00 00054E40 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1528,7 +1528,7 @@ lbl_80057F70: /* 80057F70 00054EB0 7F E0 07 35 */ extsh. r0, r31 /* 80057F74 00054EB4 40 81 00 0C */ ble lbl_80057F80 /* 80057F78 00054EB8 7F C3 F3 78 */ mr r3, r30 -/* 80057F7C 00054EBC 48 27 6D C1 */ bl __dl +/* 80057F7C 00054EBC 48 27 6D C1 */ bl __dl__FPv lbl_80057F80: /* 80057F80 00054EC0 7F C3 F3 78 */ mr r3, r30 /* 80057F84 00054EC4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1565,7 +1565,7 @@ lbl_80057FF4: /* 80057FF4 00054F34 7F E0 07 35 */ extsh. r0, r31 /* 80057FF8 00054F38 40 81 00 0C */ ble lbl_80058004 /* 80057FFC 00054F3C 7F C3 F3 78 */ mr r3, r30 -/* 80058000 00054F40 48 27 6D 3D */ bl __dl +/* 80058000 00054F40 48 27 6D 3D */ bl __dl__FPv lbl_80058004: /* 80058004 00054F44 7F C3 F3 78 */ mr r3, r30 /* 80058008 00054F48 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1602,7 +1602,7 @@ lbl_80058078: /* 80058078 00054FB8 7F E0 07 35 */ extsh. r0, r31 /* 8005807C 00054FBC 40 81 00 0C */ ble lbl_80058088 /* 80058080 00054FC0 7F C3 F3 78 */ mr r3, r30 -/* 80058084 00054FC4 48 27 6C B9 */ bl __dl +/* 80058084 00054FC4 48 27 6C B9 */ bl __dl__FPv lbl_80058088: /* 80058088 00054FC8 7F C3 F3 78 */ mr r3, r30 /* 8005808C 00054FCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1637,7 +1637,7 @@ lbl_800580FC: /* 800580FC 0005503C 7F E0 07 35 */ extsh. r0, r31 /* 80058100 00055040 40 81 00 0C */ ble lbl_8005810C /* 80058104 00055044 7F C3 F3 78 */ mr r3, r30 -/* 80058108 00055048 48 27 6C 35 */ bl __dl +/* 80058108 00055048 48 27 6C 35 */ bl __dl__FPv lbl_8005810C: /* 8005810C 0005504C 7F C3 F3 78 */ mr r3, r30 /* 80058110 00055050 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1672,7 +1672,7 @@ lbl_80058180: /* 80058180 000550C0 7F E0 07 35 */ extsh. r0, r31 /* 80058184 000550C4 40 81 00 0C */ ble lbl_80058190 /* 80058188 000550C8 7F C3 F3 78 */ mr r3, r30 -/* 8005818C 000550CC 48 27 6B B1 */ bl __dl +/* 8005818C 000550CC 48 27 6B B1 */ bl __dl__FPv lbl_80058190: /* 80058190 000550D0 7F C3 F3 78 */ mr r3, r30 /* 80058194 000550D4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1738,7 +1738,7 @@ lbl_80058264: /* 80058264 000551A4 7F E0 07 35 */ extsh. r0, r31 /* 80058268 000551A8 40 81 00 0C */ ble lbl_80058274 /* 8005826C 000551AC 7F C3 F3 78 */ mr r3, r30 -/* 80058270 000551B0 48 27 6A CD */ bl __dl +/* 80058270 000551B0 48 27 6A CD */ bl __dl__FPv lbl_80058274: /* 80058274 000551B4 7F C3 F3 78 */ mr r3, r30 /* 80058278 000551B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1874,7 +1874,7 @@ lbl_80058428: /* 8005843C 0005537C 41 82 04 40 */ beq lbl_8005887C /* 80058440 00055380 38 60 00 78 */ li r3, 0x78 /* 80058444 00055384 38 80 00 20 */ li r4, 0x20 -/* 80058448 00055388 48 27 68 2D */ bl __nw_X1_ +/* 80058448 00055388 48 27 68 2D */ bl __nw__FUli /* 8005844C 0005538C 7C 7C 1B 79 */ or. r28, r3, r3 /* 80058450 00055390 41 82 00 50 */ beq lbl_800584A0 /* 80058454 00055394 7F 84 E3 78 */ mr r4, r28 @@ -1902,7 +1902,7 @@ lbl_800584A0: /* 800584A8 000553E8 93 9E 0E 74 */ stw r28, 0xe74(r30) /* 800584AC 000553EC 38 60 00 A0 */ li r3, 0xa0 /* 800584B0 000553F0 38 80 00 20 */ li r4, 0x20 -/* 800584B4 000553F4 48 27 67 C1 */ bl __nw_X1_ +/* 800584B4 000553F4 48 27 67 C1 */ bl __nw__FUli /* 800584B8 000553F8 7C 7C 1B 79 */ or. r28, r3, r3 /* 800584BC 000553FC 41 82 00 50 */ beq lbl_8005850C /* 800584C0 00055400 7F 84 E3 78 */ mr r4, r28 @@ -2182,7 +2182,7 @@ lbl_800588CC: /* 800588D4 00055814 40 81 02 14 */ ble lbl_80058AE8 /* 800588D8 00055818 38 60 37 18 */ li r3, 0x3718 /* 800588DC 0005581C 38 80 00 20 */ li r4, 0x20 -/* 800588E0 00055820 48 27 63 95 */ bl __nw_X1_ +/* 800588E0 00055820 48 27 63 95 */ bl __nw__FUli /* 800588E4 00055824 7C 7E 1B 79 */ or. r30, r3, r3 /* 800588E8 00055828 41 82 00 50 */ beq lbl_80058938 /* 800588EC 0005582C 7F C4 F3 78 */ mr r4, r30 @@ -2775,7 +2775,7 @@ lbl_80059140: /* 80059148 00056088 41 82 02 7C */ beq lbl_800593C4 /* 8005914C 0005608C 38 60 5D F0 */ li r3, 0x5df0 /* 80059150 00056090 38 80 00 20 */ li r4, 0x20 -/* 80059154 00056094 48 27 5B 21 */ bl __nw_X1_ +/* 80059154 00056094 48 27 5B 21 */ bl __nw__FUli /* 80059158 00056098 7C 7D 1B 79 */ or. r29, r3, r3 /* 8005915C 0005609C 41 82 00 50 */ beq lbl_800591AC /* 80059160 000560A0 7F A4 EB 78 */ mr r4, r29 @@ -2981,7 +2981,7 @@ lbl_80059420: /* 8005942C 0005636C 3C 60 00 01 */ lis r3, 0x00017728@ha /* 80059430 00056370 38 63 77 28 */ addi r3, r3, 0x00017728@l /* 80059434 00056374 38 80 00 20 */ li r4, 0x20 -/* 80059438 00056378 48 27 58 3D */ bl __nw_X1_ +/* 80059438 00056378 48 27 58 3D */ bl __nw__FUli /* 8005943C 0005637C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80059440 00056380 41 82 00 50 */ beq lbl_80059490 /* 80059444 00056384 7F A4 EB 78 */ mr r4, r29 @@ -3097,7 +3097,7 @@ lbl_800595B8: /* 800595C0 00056500 41 82 01 50 */ beq lbl_80059710 /* 800595C4 00056504 38 60 0B 08 */ li r3, 0xb08 /* 800595C8 00056508 38 80 00 20 */ li r4, 0x20 -/* 800595CC 0005650C 48 27 56 A9 */ bl __nw_X1_ +/* 800595CC 0005650C 48 27 56 A9 */ bl __nw__FUli /* 800595D0 00056510 7C 7D 1B 79 */ or. r29, r3, r3 /* 800595D4 00056514 41 82 00 50 */ beq lbl_80059624 /* 800595D8 00056518 7F A4 EB 78 */ mr r4, r29 @@ -3454,7 +3454,7 @@ lbl_80059AD0: /* 80059AD8 00056A18 41 82 03 20 */ beq lbl_80059DF8 /* 80059ADC 00056A1C 38 60 11 58 */ li r3, 0x1158 /* 80059AE0 00056A20 38 80 00 20 */ li r4, 0x20 -/* 80059AE4 00056A24 48 27 51 91 */ bl __nw_X1_ +/* 80059AE4 00056A24 48 27 51 91 */ bl __nw__FUli /* 80059AE8 00056A28 7C 7D 1B 79 */ or. r29, r3, r3 /* 80059AEC 00056A2C 41 82 00 50 */ beq lbl_80059B3C /* 80059AF0 00056A30 7F A4 EB 78 */ mr r4, r29 @@ -3710,7 +3710,7 @@ lbl_80059E70: /* 80059E78 00056DB8 41 82 00 E4 */ beq lbl_80059F5C /* 80059E7C 00056DBC 38 60 1C 40 */ li r3, 0x1c40 /* 80059E80 00056DC0 38 80 00 20 */ li r4, 0x20 -/* 80059E84 00056DC4 48 27 4D F1 */ bl __nw_X1_ +/* 80059E84 00056DC4 48 27 4D F1 */ bl __nw__FUli /* 80059E88 00056DC8 7C 7E 1B 79 */ or. r30, r3, r3 /* 80059E8C 00056DCC 41 82 00 50 */ beq lbl_80059EDC /* 80059E90 00056DD0 7F C4 F3 78 */ mr r4, r30 @@ -3803,7 +3803,7 @@ lbl_80059FB0: /* 80059FBC 00056EFC 3C 60 00 02 */ lis r3, 0x00021364@ha /* 80059FC0 00056F00 38 63 13 64 */ addi r3, r3, 0x00021364@l /* 80059FC4 00056F04 38 80 00 20 */ li r4, 0x20 -/* 80059FC8 00056F08 48 27 4C AD */ bl __nw_X1_ +/* 80059FC8 00056F08 48 27 4C AD */ bl __nw__FUli /* 80059FCC 00056F0C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80059FD0 00056F10 41 82 00 50 */ beq lbl_8005A020 /* 80059FD4 00056F14 7F C4 F3 78 */ mr r4, r30 diff --git a/asm/d/kantera/icon/d_kantera_icon_meter.s b/asm/d/kantera/icon/d_kantera_icon_meter.s index e8f2f780d7..acd3cd3414 100644 --- a/asm/d/kantera/icon/d_kantera_icon_meter.s +++ b/asm/d/kantera/icon/d_kantera_icon_meter.s @@ -77,7 +77,7 @@ lbl_801AEA34: /* 801AEA3C 001AB97C 7F E0 07 35 */ extsh. r0, r31 /* 801AEA40 001AB980 40 81 00 0C */ ble lbl_801AEA4C /* 801AEA44 001AB984 7F C3 F3 78 */ mr r3, r30 -/* 801AEA48 001AB988 48 12 02 F5 */ bl __dl +/* 801AEA48 001AB988 48 12 02 F5 */ bl __dl__FPv lbl_801AEA4C: /* 801AEA4C 001AB98C 7F C3 F3 78 */ mr r3, r30 /* 801AEA50 001AB990 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -96,7 +96,7 @@ dKantera_icon_c_NS_initiate: /* 801AEA78 001AB9B8 93 C1 00 08 */ stw r30, 8(r1) /* 801AEA7C 001AB9BC 7C 7F 1B 78 */ mr r31, r3 /* 801AEA80 001AB9C0 38 60 00 08 */ li r3, 8 -/* 801AEA84 001AB9C4 48 12 01 C9 */ bl __nw +/* 801AEA84 001AB9C4 48 12 01 C9 */ bl __nw__FUl /* 801AEA88 001AB9C8 28 03 00 00 */ cmplwi r3, 0 /* 801AEA8C 001AB9CC 41 82 00 1C */ beq lbl_801AEAA8 /* 801AEA90 001AB9D0 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -108,7 +108,7 @@ dKantera_icon_c_NS_initiate: lbl_801AEAA8: /* 801AEAA8 001AB9E8 90 7F 00 04 */ stw r3, 4(r31) /* 801AEAAC 001AB9EC 38 60 01 18 */ li r3, 0x118 -/* 801AEAB0 001AB9F0 48 12 01 9D */ bl __nw +/* 801AEAB0 001AB9F0 48 12 01 9D */ bl __nw__FUl /* 801AEAB4 001AB9F4 7C 7E 1B 79 */ or. r30, r3, r3 /* 801AEAB8 001AB9F8 41 82 00 0C */ beq lbl_801AEAC4 /* 801AEABC 001AB9FC 48 14 99 DD */ bl J2DScreen @@ -127,7 +127,7 @@ lbl_801AEAC4: /* 801AEAEC 001ABA2C 80 7F 00 04 */ lwz r3, 4(r31) /* 801AEAF0 001ABA30 93 C3 00 04 */ stw r30, 4(r3) /* 801AEAF4 001ABA34 38 60 00 6C */ li r3, 0x6c -/* 801AEAF8 001ABA38 48 12 01 55 */ bl __nw +/* 801AEAF8 001ABA38 48 12 01 55 */ bl __nw__FUl /* 801AEAFC 001ABA3C 7C 60 1B 79 */ or. r0, r3, r3 /* 801AEB00 001ABA40 41 82 00 28 */ beq lbl_801AEB28 /* 801AEB04 001ABA44 7F C4 F3 78 */ mr r4, r30 @@ -142,7 +142,7 @@ lbl_801AEAC4: lbl_801AEB28: /* 801AEB28 001ABA68 90 1F 00 08 */ stw r0, 8(r31) /* 801AEB2C 001ABA6C 38 60 00 6C */ li r3, 0x6c -/* 801AEB30 001ABA70 48 12 01 1D */ bl __nw +/* 801AEB30 001ABA70 48 12 01 1D */ bl __nw__FUl /* 801AEB34 001ABA74 7C 60 1B 79 */ or. r0, r3, r3 /* 801AEB38 001ABA78 41 82 00 28 */ beq lbl_801AEB60 /* 801AEB3C 001ABA7C 7F C4 F3 78 */ mr r4, r30 @@ -289,7 +289,7 @@ dKantera_icon_c_NS_setNowGauge: /* 801AED3C 001ABC7C 90 1F 00 00 */ stw r0, 0(r31) /* 801AED40 001ABC80 7C 80 07 35 */ extsh. r0, r4 /* 801AED44 001ABC84 40 81 00 08 */ ble lbl_801AED4C -/* 801AED48 001ABC88 48 11 FF F5 */ bl __dl +/* 801AED48 001ABC88 48 11 FF F5 */ bl __dl__FPv lbl_801AED4C: /* 801AED4C 001ABC8C 7F E3 FB 78 */ mr r3, r31 /* 801AED50 001ABC90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/map/d_map_path.s b/asm/d/map/d_map_path.s index 03562aee53..ac85d78a2f 100644 --- a/asm/d/map/d_map_path.s +++ b/asm/d/map/d_map_path.s @@ -23,7 +23,7 @@ dMpath_n_NS_dTexObjAggregate_c_NS_create: /* 8003C898 000397D8 3B 9C C2 F8 */ addi r28, r28, -15624 lbl_8003C89C: /* 8003C89C 000397DC 38 60 00 20 */ li r3, 0x20 -/* 8003C8A0 000397E0 48 29 23 AD */ bl __nw +/* 8003C8A0 000397E0 48 29 23 AD */ bl __nw__FUl /* 8003C8A4 000397E4 7C 7A F9 2E */ stwx r3, r26, r31 /* 8003C8A8 000397E8 7F A3 EB 78 */ mr r3, r29 /* 8003C8AC 000397EC 7C 9E F8 2E */ lwzx r4, r30, r31 @@ -58,7 +58,7 @@ dMpath_n_NS_dTexObjAggregate_c_NS_remove: /* 8003C914 00039854 7F FE FB 78 */ mr r30, r31 lbl_8003C918: /* 8003C918 00039858 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8003C91C 0003985C 48 29 24 21 */ bl __dl +/* 8003C91C 0003985C 48 29 24 21 */ bl __dl__FPv /* 8003C920 00039860 7F DC F9 2E */ stwx r30, r28, r31 /* 8003C924 00039864 3B BD 00 01 */ addi r29, r29, 1 /* 8003C928 00039868 2C 1D 00 07 */ cmpwi r29, 7 @@ -1042,7 +1042,7 @@ dMpath_n_NS_dTexObjAggregate_c_NS_dtor: /* 8003D764 0003A6A4 7F E0 07 35 */ extsh. r0, r31 /* 8003D768 0003A6A8 40 81 00 0C */ ble lbl_8003D774 /* 8003D76C 0003A6AC 7F C3 F3 78 */ mr r3, r30 -/* 8003D770 0003A6B0 48 29 15 CD */ bl __dl +/* 8003D770 0003A6B0 48 29 15 CD */ bl __dl__FPv lbl_8003D774: /* 8003D774 0003A6B4 7F C3 F3 78 */ mr r3, r30 /* 8003D778 0003A6B8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index 8600ac386b..3b3a6b3c49 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -842,7 +842,7 @@ dMpath_c_NS_createWork: /* 8003F7EC 0003C72C 7C 08 02 A6 */ mflr r0 /* 8003F7F0 0003C730 90 01 00 14 */ stw r0, 0x14(r1) /* 8003F7F4 0003C734 38 60 02 00 */ li r3, 0x200 -/* 8003F7F8 0003C738 48 28 F4 55 */ bl __nw +/* 8003F7F8 0003C738 48 28 F4 55 */ bl __nw__FUl /* 8003F7FC 0003C73C 90 6D 88 E4 */ stw r3, lbl_80450E64-_SDA_BASE_(r13) /* 8003F800 0003C740 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003F804 0003C744 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index ae3e246519..ae30a6c125 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -15,7 +15,7 @@ fmpTresTypeGroupDataList_c_NS_addTypeGroupData: /* 8003D7AC 0003A6EC 7C BE 2B 78 */ mr r30, r5 /* 8003D7B0 0003A6F0 83 E3 00 04 */ lwz r31, 4(r3) /* 8003D7B4 0003A6F4 38 60 00 0C */ li r3, 0xc -/* 8003D7B8 0003A6F8 48 29 14 95 */ bl __nw +/* 8003D7B8 0003A6F8 48 29 14 95 */ bl __nw__FUl /* 8003D7BC 0003A6FC 28 03 00 00 */ cmplwi r3, 0 /* 8003D7C0 0003A700 41 82 00 10 */ beq lbl_8003D7D0 /* 8003D7C4 0003A704 38 00 00 00 */ li r0, 0 @@ -85,7 +85,7 @@ dMenu_Fmap_room_data_c_NS_buildTresTypeGroup: /* 8003D8A0 0003A7E0 28 00 00 00 */ cmplwi r0, 0 /* 8003D8A4 0003A7E4 40 82 00 34 */ bne lbl_8003D8D8 /* 8003D8A8 0003A7E8 38 60 00 88 */ li r3, 0x88 -/* 8003D8AC 0003A7EC 48 29 13 A1 */ bl __nw +/* 8003D8AC 0003A7EC 48 29 13 A1 */ bl __nw__FUl /* 8003D8B0 0003A7F0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003D8B4 0003A7F4 41 82 00 20 */ beq lbl_8003D8D4 .global fmpTresTypeGroupDataList_c @@ -1452,7 +1452,7 @@ lbl_8003EB44: /* 8003EB44 0003BA84 7F E0 07 35 */ extsh. r0, r31 /* 8003EB48 0003BA88 40 81 00 0C */ ble lbl_8003EB54 /* 8003EB4C 0003BA8C 7F C3 F3 78 */ mr r3, r30 -/* 8003EB50 0003BA90 48 29 01 ED */ bl __dl +/* 8003EB50 0003BA90 48 29 01 ED */ bl __dl__FPv lbl_8003EB54: /* 8003EB54 0003BA94 7F C3 F3 78 */ mr r3, r30 /* 8003EB58 0003BA98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1511,33 +1511,33 @@ fmpTresTypeGroupData_c_NS_dtor: /* 8003EC20 0003BB60 4B FF FF 51 */ bl fmpTresTypeGroupData_c_NS_dtor lbl_8003EC24: /* 8003EC24 0003BB64 7F 03 C3 78 */ mr r3, r24 -/* 8003EC28 0003BB68 48 29 01 15 */ bl __dl +/* 8003EC28 0003BB68 48 29 01 15 */ bl __dl__FPv lbl_8003EC2C: /* 8003EC2C 0003BB6C 7F 23 CB 78 */ mr r3, r25 -/* 8003EC30 0003BB70 48 29 01 0D */ bl __dl +/* 8003EC30 0003BB70 48 29 01 0D */ bl __dl__FPv lbl_8003EC34: /* 8003EC34 0003BB74 7F 43 D3 78 */ mr r3, r26 -/* 8003EC38 0003BB78 48 29 01 05 */ bl __dl +/* 8003EC38 0003BB78 48 29 01 05 */ bl __dl__FPv lbl_8003EC3C: /* 8003EC3C 0003BB7C 7F 63 DB 78 */ mr r3, r27 -/* 8003EC40 0003BB80 48 29 00 FD */ bl __dl +/* 8003EC40 0003BB80 48 29 00 FD */ bl __dl__FPv lbl_8003EC44: /* 8003EC44 0003BB84 7F 83 E3 78 */ mr r3, r28 -/* 8003EC48 0003BB88 48 29 00 F5 */ bl __dl +/* 8003EC48 0003BB88 48 29 00 F5 */ bl __dl__FPv lbl_8003EC4C: /* 8003EC4C 0003BB8C 7F A3 EB 78 */ mr r3, r29 -/* 8003EC50 0003BB90 48 29 00 ED */ bl __dl +/* 8003EC50 0003BB90 48 29 00 ED */ bl __dl__FPv lbl_8003EC54: /* 8003EC54 0003BB94 7F C3 F3 78 */ mr r3, r30 -/* 8003EC58 0003BB98 48 29 00 E5 */ bl __dl +/* 8003EC58 0003BB98 48 29 00 E5 */ bl __dl__FPv lbl_8003EC5C: /* 8003EC5C 0003BB9C 7F E3 FB 78 */ mr r3, r31 -/* 8003EC60 0003BBA0 48 29 00 DD */ bl __dl +/* 8003EC60 0003BBA0 48 29 00 DD */ bl __dl__FPv lbl_8003EC64: /* 8003EC64 0003BBA4 7E E0 07 35 */ extsh. r0, r23 /* 8003EC68 0003BBA8 40 81 00 0C */ ble lbl_8003EC74 /* 8003EC6C 0003BBAC 7E C3 B3 78 */ mr r3, r22 -/* 8003EC70 0003BBB0 48 29 00 CD */ bl __dl +/* 8003EC70 0003BBB0 48 29 00 CD */ bl __dl__FPv lbl_8003EC74: /* 8003EC74 0003BBB4 7E C3 B3 78 */ mr r3, r22 /* 8003EC78 0003BBB8 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/d/menu/d_menu_calibration.s b/asm/d/menu/d_menu_calibration.s index f274cdcd85..43e9f2101f 100644 --- a/asm/d/menu/d_menu_calibration.s +++ b/asm/d/menu/d_menu_calibration.s @@ -14,7 +14,7 @@ /* 801AED84 001ABCC4 90 1F 00 00 */ stw r0, 0(r31) /* 801AED88 001ABCC8 7C 80 07 35 */ extsh. r0, r4 /* 801AED8C 001ABCCC 40 81 00 08 */ ble lbl_801AED94 -/* 801AED90 001ABCD0 48 11 FF AD */ bl __dl +/* 801AED90 001ABCD0 48 11 FF AD */ bl __dl__FPv lbl_801AED94: /* 801AED94 001ABCD4 7F E3 FB 78 */ mr r3, r31 /* 801AED98 001ABCD8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 7d8a0146cc..7f1fb1fb30 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -86,7 +86,7 @@ lbl_801AFE78: /* 801AFE78 001ACDB8 7F E0 07 35 */ extsh. r0, r31 /* 801AFE7C 001ACDBC 40 81 00 0C */ ble lbl_801AFE88 /* 801AFE80 001ACDC0 7F C3 F3 78 */ mr r3, r30 -/* 801AFE84 001ACDC4 48 11 EE B9 */ bl __dl +/* 801AFE84 001ACDC4 48 11 EE B9 */ bl __dl__FPv lbl_801AFE88: /* 801AFE88 001ACDC8 7F C3 F3 78 */ mr r3, r30 /* 801AFE8C 001ACDCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -105,9 +105,9 @@ dMenu_Collect2D_c_NS__create: /* 801AFEB4 001ACDF4 93 C1 00 18 */ stw r30, 0x18(r1) /* 801AFEB8 001ACDF8 7C 7F 1B 78 */ mr r31, r3 /* 801AFEBC 001ACDFC 80 63 00 04 */ lwz r3, 4(r3) -/* 801AFEC0 001ACE00 48 11 E8 C5 */ bl JKRHeap_NS_getTotalFreeSize +/* 801AFEC0 001ACE00 48 11 E8 C5 */ bl getTotalFreeSize__7JKRHeapFv /* 801AFEC4 001ACE04 38 60 01 18 */ li r3, 0x118 -/* 801AFEC8 001ACE08 48 11 ED 85 */ bl __nw +/* 801AFEC8 001ACE08 48 11 ED 85 */ bl __nw__FUl /* 801AFECC 001ACE0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFED0 001ACE10 41 82 00 0C */ beq lbl_801AFEDC /* 801AFED4 001ACE14 48 14 85 C5 */ bl J2DScreen @@ -125,7 +125,7 @@ lbl_801AFEDC: /* 801AFF00 001ACE40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801AFF04 001ACE44 48 0A 51 E5 */ bl dPaneClass_showNullPane /* 801AFF08 001ACE48 38 60 01 18 */ li r3, 0x118 -/* 801AFF0C 001ACE4C 48 11 ED 41 */ bl __nw +/* 801AFF0C 001ACE4C 48 11 ED 41 */ bl __nw__FUl /* 801AFF10 001ACE50 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFF14 001ACE54 41 82 00 0C */ beq lbl_801AFF20 /* 801AFF18 001ACE58 48 14 85 81 */ bl J2DScreen @@ -153,7 +153,7 @@ lbl_801AFF54: /* 801AFF68 001ACEA8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801AFF6C 001ACEAC 48 0A 51 7D */ bl dPaneClass_showNullPane /* 801AFF70 001ACEB0 38 60 00 08 */ li r3, 8 -/* 801AFF74 001ACEB4 48 11 EC D9 */ bl __nw +/* 801AFF74 001ACEB4 48 11 EC D9 */ bl __nw__FUl /* 801AFF78 001ACEB8 28 03 00 00 */ cmplwi r3, 0 /* 801AFF7C 001ACEBC 41 82 00 20 */ beq lbl_801AFF9C /* 801AFF80 001ACEC0 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -179,7 +179,7 @@ lbl_801AFF9C: /* 801AFFCC 001ACF0C 4E 80 04 21 */ bctrl /* 801AFFD0 001ACF10 7C 7E 1B 78 */ mr r30, r3 /* 801AFFD4 001ACF14 38 60 01 50 */ li r3, 0x150 -/* 801AFFD8 001ACF18 48 11 EC 75 */ bl __nw +/* 801AFFD8 001ACF18 48 11 EC 75 */ bl __nw__FUl /* 801AFFDC 001ACF1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFFE0 001ACF20 41 82 00 10 */ beq lbl_801AFFF0 /* 801AFFE4 001ACF24 7F C4 F3 78 */ mr r4, r30 @@ -215,7 +215,7 @@ lbl_801AFFF0: /* 801B0058 001ACF98 7D 89 03 A6 */ mtctr r12 /* 801B005C 001ACF9C 4E 80 04 21 */ bctrl /* 801B0060 001ACFA0 38 60 00 B8 */ li r3, 0xb8 -/* 801B0064 001ACFA4 48 11 EB E9 */ bl __nw +/* 801B0064 001ACFA4 48 11 EB E9 */ bl __nw__FUl /* 801B0068 001ACFA8 7C 60 1B 79 */ or. r0, r3, r3 /* 801B006C 001ACFAC 41 82 00 18 */ beq lbl_801B0084 /* 801B0070 001ACFB0 38 80 00 02 */ li r4, 2 @@ -226,7 +226,7 @@ lbl_801AFFF0: lbl_801B0084: /* 801B0084 001ACFC4 90 1F 00 20 */ stw r0, 0x20(r31) /* 801B0088 001ACFC8 38 60 00 2C */ li r3, 0x2c -/* 801B008C 001ACFCC 48 11 EB C1 */ bl __nw +/* 801B008C 001ACFCC 48 11 EB C1 */ bl __nw__FUl /* 801B0090 001ACFD0 7C 60 1B 79 */ or. r0, r3, r3 /* 801B0094 001ACFD4 41 82 00 0C */ beq lbl_801B00A0 /* 801B0098 001ACFD8 48 09 9B 89 */ bl dMsgString_c @@ -266,7 +266,7 @@ dMenu_Collect2D_c_NS__delete: /* 801B0110 001AD050 48 1B 20 B9 */ bl func_803621C8 /* 801B0114 001AD054 7C 7F 1B 78 */ mr r31, r3 /* 801B0118 001AD058 80 63 00 04 */ lwz r3, 4(r3) -/* 801B011C 001AD05C 48 11 E6 69 */ bl JKRHeap_NS_getTotalFreeSize +/* 801B011C 001AD05C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapFv /* 801B0120 001AD060 88 9F 02 58 */ lbz r4, 0x258(r31) /* 801B0124 001AD064 88 1F 02 57 */ lbz r0, 0x257(r31) /* 801B0128 001AD068 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -385,7 +385,7 @@ lbl_801B02C0: /* 801B02C0 001AD200 38 00 00 00 */ li r0, 0 /* 801B02C4 001AD204 90 1F 00 90 */ stw r0, 0x90(r31) /* 801B02C8 001AD208 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B02CC 001AD20C 48 11 E3 01 */ bl JKRHeap_NS_freeAll +/* 801B02CC 001AD20C 48 11 E3 01 */ bl freeAll__7JKRHeapFv lbl_801B02D0: /* 801B02D0 001AD210 80 7F 00 94 */ lwz r3, 0x94(r31) /* 801B02D4 001AD214 28 03 00 00 */ cmplwi r3, 0 @@ -403,7 +403,7 @@ lbl_801B0300: /* 801B0300 001AD240 38 00 00 00 */ li r0, 0 /* 801B0304 001AD244 90 1F 00 94 */ stw r0, 0x94(r31) /* 801B0308 001AD248 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B030C 001AD24C 48 11 E2 C1 */ bl JKRHeap_NS_freeAll +/* 801B030C 001AD24C 48 11 E2 C1 */ bl freeAll__7JKRHeapFv lbl_801B0310: /* 801B0310 001AD250 80 7F 00 98 */ lwz r3, 0x98(r31) /* 801B0314 001AD254 28 03 00 00 */ cmplwi r3, 0 @@ -418,7 +418,7 @@ lbl_801B0334: /* 801B0334 001AD274 38 00 00 00 */ li r0, 0 /* 801B0338 001AD278 90 1F 00 98 */ stw r0, 0x98(r31) /* 801B033C 001AD27C 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B0340 001AD280 48 11 E2 8D */ bl JKRHeap_NS_freeAll +/* 801B0340 001AD280 48 11 E2 8D */ bl freeAll__7JKRHeapFv lbl_801B0344: /* 801B0344 001AD284 80 7F 00 9C */ lwz r3, 0x9c(r31) /* 801B0348 001AD288 28 03 00 00 */ cmplwi r3, 0 @@ -433,7 +433,7 @@ lbl_801B0368: /* 801B0368 001AD2A8 38 00 00 00 */ li r0, 0 /* 801B036C 001AD2AC 90 1F 00 9C */ stw r0, 0x9c(r31) /* 801B0370 001AD2B0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B0374 001AD2B4 48 11 E2 59 */ bl JKRHeap_NS_freeAll +/* 801B0374 001AD2B4 48 11 E2 59 */ bl freeAll__7JKRHeapFv lbl_801B0378: /* 801B0378 001AD2B8 80 7F 00 A0 */ lwz r3, 0xa0(r31) /* 801B037C 001AD2BC 28 03 00 00 */ cmplwi r3, 0 @@ -448,7 +448,7 @@ lbl_801B039C: /* 801B039C 001AD2DC 38 00 00 00 */ li r0, 0 /* 801B03A0 001AD2E0 90 1F 00 A0 */ stw r0, 0xa0(r31) /* 801B03A4 001AD2E4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B03A8 001AD2E8 48 11 E2 25 */ bl JKRHeap_NS_freeAll +/* 801B03A8 001AD2E8 48 11 E2 25 */ bl freeAll__7JKRHeapFv lbl_801B03AC: /* 801B03AC 001AD2EC 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 801B03B0 001AD2F0 28 03 00 00 */ cmplwi r3, 0 @@ -463,7 +463,7 @@ lbl_801B03D0: /* 801B03D0 001AD310 38 00 00 00 */ li r0, 0 /* 801B03D4 001AD314 90 1F 00 A4 */ stw r0, 0xa4(r31) /* 801B03D8 001AD318 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B03DC 001AD31C 48 11 E1 F1 */ bl JKRHeap_NS_freeAll +/* 801B03DC 001AD31C 48 11 E1 F1 */ bl freeAll__7JKRHeapFv lbl_801B03E0: /* 801B03E0 001AD320 7F 43 D3 78 */ mr r3, r26 /* 801B03E4 001AD324 4B E5 ED E9 */ bl mDoExt_setCurrentHeap @@ -1892,7 +1892,7 @@ lbl_801B18B8: /* 801B18D8 001AE818 7C 80 03 79 */ or. r0, r4, r0 /* 801B18DC 001AE81C 41 82 00 8C */ beq lbl_801B1968 /* 801B18E0 001AE820 38 60 00 6C */ li r3, 0x6c -/* 801B18E4 001AE824 48 11 D3 69 */ bl __nw +/* 801B18E4 001AE824 48 11 D3 69 */ bl __nw__FUl /* 801B18E8 001AE828 7C 71 1B 79 */ or. r17, r3, r3 /* 801B18EC 001AE82C 41 82 00 38 */ beq lbl_801B1924 /* 801B18F0 001AE830 7F E3 FB 78 */ mr r3, r31 @@ -1996,7 +1996,7 @@ lbl_801B1A2C: /* 801B1A5C 001AE99C 9A 7F 02 58 */ stb r19, 0x258(r31) lbl_801B1A60: /* 801B1A60 001AE9A0 38 60 00 6C */ li r3, 0x6c -/* 801B1A64 001AE9A4 48 11 D1 E9 */ bl __nw +/* 801B1A64 001AE9A4 48 11 D1 E9 */ bl __nw__FUl /* 801B1A68 001AE9A8 7C 60 1B 79 */ or. r0, r3, r3 /* 801B1A6C 001AE9AC 41 82 00 28 */ beq lbl_801B1A94 /* 801B1A70 001AE9B0 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -2026,7 +2026,7 @@ lbl_801B1A94: /* 801B1ACC 001AEA0C C0 02 A5 34 */ lfs f0, lbl_80453F34-_SDA2_BASE_(r2) /* 801B1AD0 001AEA10 D0 1F 00 84 */ stfs f0, 0x84(r31) /* 801B1AD4 001AEA14 38 60 00 6C */ li r3, 0x6c -/* 801B1AD8 001AEA18 48 11 D1 75 */ bl __nw +/* 801B1AD8 001AEA18 48 11 D1 75 */ bl __nw__FUl /* 801B1ADC 001AEA1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B1AE0 001AEA20 41 82 00 28 */ beq lbl_801B1B08 /* 801B1AE4 001AEA24 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -2041,7 +2041,7 @@ lbl_801B1A94: lbl_801B1B08: /* 801B1B08 001AEA48 90 1F 00 AC */ stw r0, 0xac(r31) /* 801B1B0C 001AEA4C 38 60 00 6C */ li r3, 0x6c -/* 801B1B10 001AEA50 48 11 D1 3D */ bl __nw +/* 801B1B10 001AEA50 48 11 D1 3D */ bl __nw__FUl /* 801B1B14 001AEA54 7C 60 1B 79 */ or. r0, r3, r3 /* 801B1B18 001AEA58 41 82 00 28 */ beq lbl_801B1B40 /* 801B1B1C 001AEA5C 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -2056,7 +2056,7 @@ lbl_801B1B08: lbl_801B1B40: /* 801B1B40 001AEA80 90 1F 01 60 */ stw r0, 0x160(r31) /* 801B1B44 001AEA84 38 60 00 6C */ li r3, 0x6c -/* 801B1B48 001AEA88 48 11 D1 05 */ bl __nw +/* 801B1B48 001AEA88 48 11 D1 05 */ bl __nw__FUl /* 801B1B4C 001AEA8C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B1B50 001AEA90 41 82 00 28 */ beq lbl_801B1B78 /* 801B1B54 001AEA94 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -2071,7 +2071,7 @@ lbl_801B1B40: lbl_801B1B78: /* 801B1B78 001AEAB8 90 1F 01 64 */ stw r0, 0x164(r31) /* 801B1B7C 001AEABC 38 60 00 6C */ li r3, 0x6c -/* 801B1B80 001AEAC0 48 11 D0 CD */ bl __nw +/* 801B1B80 001AEAC0 48 11 D0 CD */ bl __nw__FUl /* 801B1B84 001AEAC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801B1B88 001AEAC8 41 82 00 28 */ beq lbl_801B1BB0 /* 801B1B8C 001AEACC 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -5123,7 +5123,7 @@ lbl_801B4790: /* 801B4790 001B16D0 38 00 00 00 */ li r0, 0 /* 801B4794 001B16D4 90 1E 00 90 */ stw r0, 0x90(r30) /* 801B4798 001B16D8 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B479C 001B16DC 48 11 9E 31 */ bl JKRHeap_NS_freeAll +/* 801B479C 001B16DC 48 11 9E 31 */ bl freeAll__7JKRHeapFv lbl_801B47A0: /* 801B47A0 001B16E0 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B47A4 001B16E4 28 03 00 00 */ cmplwi r3, 0 @@ -5141,7 +5141,7 @@ lbl_801B47D0: /* 801B47D0 001B1710 38 00 00 00 */ li r0, 0 /* 801B47D4 001B1714 90 1E 00 94 */ stw r0, 0x94(r30) /* 801B47D8 001B1718 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B47DC 001B171C 48 11 9D F1 */ bl JKRHeap_NS_freeAll +/* 801B47DC 001B171C 48 11 9D F1 */ bl freeAll__7JKRHeapFv lbl_801B47E0: /* 801B47E0 001B1720 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B47E4 001B1724 28 03 00 00 */ cmplwi r3, 0 @@ -5156,7 +5156,7 @@ lbl_801B4804: /* 801B4804 001B1744 38 00 00 00 */ li r0, 0 /* 801B4808 001B1748 90 1E 00 98 */ stw r0, 0x98(r30) /* 801B480C 001B174C 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B4810 001B1750 48 11 9D BD */ bl JKRHeap_NS_freeAll +/* 801B4810 001B1750 48 11 9D BD */ bl freeAll__7JKRHeapFv lbl_801B4814: /* 801B4814 001B1754 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B4818 001B1758 28 03 00 00 */ cmplwi r3, 0 @@ -5171,7 +5171,7 @@ lbl_801B4838: /* 801B4838 001B1778 38 00 00 00 */ li r0, 0 /* 801B483C 001B177C 90 1E 00 9C */ stw r0, 0x9c(r30) /* 801B4840 001B1780 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B4844 001B1784 48 11 9D 89 */ bl JKRHeap_NS_freeAll +/* 801B4844 001B1784 48 11 9D 89 */ bl freeAll__7JKRHeapFv lbl_801B4848: /* 801B4848 001B1788 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B484C 001B178C 28 03 00 00 */ cmplwi r3, 0 @@ -5186,7 +5186,7 @@ lbl_801B486C: /* 801B486C 001B17AC 38 00 00 00 */ li r0, 0 /* 801B4870 001B17B0 90 1E 00 A0 */ stw r0, 0xa0(r30) /* 801B4874 001B17B4 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B4878 001B17B8 48 11 9D 55 */ bl JKRHeap_NS_freeAll +/* 801B4878 001B17B8 48 11 9D 55 */ bl freeAll__7JKRHeapFv lbl_801B487C: /* 801B487C 001B17BC 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B4880 001B17C0 28 03 00 00 */ cmplwi r3, 0 @@ -5201,7 +5201,7 @@ lbl_801B48A0: /* 801B48A0 001B17E0 38 00 00 00 */ li r0, 0 /* 801B48A4 001B17E4 90 1E 00 A4 */ stw r0, 0xa4(r30) /* 801B48A8 001B17E8 80 7E 00 08 */ lwz r3, 8(r30) -/* 801B48AC 001B17EC 48 11 9D 21 */ bl JKRHeap_NS_freeAll +/* 801B48AC 001B17EC 48 11 9D 21 */ bl freeAll__7JKRHeapFv lbl_801B48B0: /* 801B48B0 001B17F0 7F E3 FB 78 */ mr r3, r31 /* 801B48B4 001B17F4 4B E5 A9 19 */ bl mDoExt_setCurrentHeap @@ -5588,7 +5588,7 @@ lbl_801B4DFC: /* 801B4E3C 001B1D7C 28 00 00 00 */ cmplwi r0, 0 /* 801B4E40 001B1D80 40 82 00 20 */ bne lbl_801B4E60 /* 801B4E44 001B1D84 38 60 21 A4 */ li r3, 0x21a4 -/* 801B4E48 001B1D88 48 11 9E 05 */ bl __nw +/* 801B4E48 001B1D88 48 11 9E 05 */ bl __nw__FUl /* 801B4E4C 001B1D8C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B4E50 001B1D90 41 82 00 0C */ beq lbl_801B4E5C /* 801B4E54 001B1D94 48 03 A8 4D */ bl dMenu_save_c @@ -5756,7 +5756,7 @@ lbl_801B5074: /* 801B50BC 001B1FFC 28 00 00 00 */ cmplwi r0, 0 /* 801B50C0 001B2000 40 82 00 30 */ bne lbl_801B50F0 /* 801B50C4 001B2004 38 60 04 0C */ li r3, 0x40c -/* 801B50C8 001B2008 48 11 9B 85 */ bl __nw +/* 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 @@ -5923,7 +5923,7 @@ lbl_801B52F0: /* 801B5338 001B2278 28 00 00 00 */ cmplwi r0, 0 /* 801B533C 001B227C 40 82 00 2C */ bne lbl_801B5368 /* 801B5340 001B2280 38 60 03 E8 */ li r3, 0x3e8 -/* 801B5344 001B2284 48 11 99 09 */ bl __nw +/* 801B5344 001B2284 48 11 99 09 */ bl __nw__FUl /* 801B5348 001B2288 7C 60 1B 79 */ or. r0, r3, r3 /* 801B534C 001B228C 41 82 00 18 */ beq lbl_801B5364 /* 801B5350 001B2290 80 9E 00 08 */ lwz r4, 8(r30) @@ -6087,7 +6087,7 @@ lbl_801B5560: /* 801B55A8 001B24E8 28 00 00 00 */ cmplwi r0, 0 /* 801B55AC 001B24EC 40 82 00 2C */ bne lbl_801B55D8 /* 801B55B0 001B24F0 38 60 01 FC */ li r3, 0x1fc -/* 801B55B4 001B24F4 48 11 96 99 */ bl __nw +/* 801B55B4 001B24F4 48 11 96 99 */ bl __nw__FUl /* 801B55B8 001B24F8 7C 60 1B 79 */ or. r0, r3, r3 /* 801B55BC 001B24FC 41 82 00 18 */ beq lbl_801B55D4 /* 801B55C0 001B2500 80 9E 00 08 */ lwz r4, 8(r30) @@ -6251,7 +6251,7 @@ lbl_801B57D0: /* 801B5818 001B2758 28 00 00 00 */ cmplwi r0, 0 /* 801B581C 001B275C 40 82 00 2C */ bne lbl_801B5848 /* 801B5820 001B2760 38 60 02 0C */ li r3, 0x20c -/* 801B5824 001B2764 48 11 94 29 */ bl __nw +/* 801B5824 001B2764 48 11 94 29 */ bl __nw__FUl /* 801B5828 001B2768 7C 60 1B 79 */ or. r0, r3, r3 /* 801B582C 001B276C 41 82 00 18 */ beq lbl_801B5844 /* 801B5830 001B2770 80 9E 00 08 */ lwz r4, 8(r30) @@ -6415,7 +6415,7 @@ lbl_801B5A40: /* 801B5A88 001B29C8 28 00 00 00 */ cmplwi r0, 0 /* 801B5A8C 001B29CC 40 82 00 30 */ bne lbl_801B5ABC /* 801B5A90 001B29D0 38 60 01 00 */ li r3, 0x100 -/* 801B5A94 001B29D4 48 11 91 B9 */ bl __nw +/* 801B5A94 001B29D4 48 11 91 B9 */ bl __nw__FUl /* 801B5A98 001B29D8 7C 60 1B 79 */ or. r0, r3, r3 /* 801B5A9C 001B29DC 41 82 00 1C */ beq lbl_801B5AB8 /* 801B5AA0 001B29E0 80 9E 00 08 */ lwz r4, 8(r30) @@ -7175,7 +7175,7 @@ lbl_801B657C: /* 801B657C 001B34BC 7F E0 07 35 */ extsh. r0, r31 /* 801B6580 001B34C0 40 81 00 0C */ ble lbl_801B658C /* 801B6584 001B34C4 7F C3 F3 78 */ mr r3, r30 -/* 801B6588 001B34C8 48 11 87 B5 */ bl __dl +/* 801B6588 001B34C8 48 11 87 B5 */ bl __dl__FPv lbl_801B658C: /* 801B658C 001B34CC 7F C3 F3 78 */ mr r3, r30 /* 801B6590 001B34D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7193,7 +7193,7 @@ dMenu_Collect3D_c_NS__create: /* 801B65B4 001B34F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B65B8 001B34F8 7C 7F 1B 78 */ mr r31, r3 /* 801B65BC 001B34FC 80 63 00 04 */ lwz r3, 4(r3) -/* 801B65C0 001B3500 48 11 81 C5 */ bl JKRHeap_NS_getTotalFreeSize +/* 801B65C0 001B3500 48 11 81 C5 */ bl getTotalFreeSize__7JKRHeapFv /* 801B65C4 001B3504 3C 60 00 02 */ lis r3, 0x00025800@ha /* 801B65C8 001B3508 38 63 58 00 */ addi r3, r3, 0x00025800@l /* 801B65CC 001B350C 80 9F 00 04 */ lwz r4, 4(r31) @@ -7538,7 +7538,7 @@ dMenu_Collect3D_c_NS_setJ3D: /* 801B6A94 001B39D4 48 00 00 F4 */ b lbl_801B6B88 lbl_801B6A98: /* 801B6A98 001B39D8 38 60 00 F4 */ li r3, 0xf4 -/* 801B6A9C 001B39DC 48 11 81 B1 */ bl __nw +/* 801B6A9C 001B39DC 48 11 81 B1 */ bl __nw__FUl /* 801B6AA0 001B39E0 7C 79 1B 79 */ or. r25, r3, r3 /* 801B6AA4 001B39E4 41 82 00 B8 */ beq lbl_801B6B5C /* 801B6AA8 001B39E8 3C 60 80 3D */ lis r3, lbl_803CEE60@ha @@ -7624,7 +7624,7 @@ lbl_801B6B88: /* 801B6B90 001B3AD0 7C 03 00 40 */ cmplw r3, r0 /* 801B6B94 001B3AD4 41 80 FF 04 */ blt lbl_801B6A98 /* 801B6B98 001B3AD8 38 60 00 DC */ li r3, 0xdc -/* 801B6B9C 001B3ADC 48 11 80 B1 */ bl __nw +/* 801B6B9C 001B3ADC 48 11 80 B1 */ bl __nw__FUl /* 801B6BA0 001B3AE0 7C 79 1B 79 */ or. r25, r3, r3 /* 801B6BA4 001B3AE4 41 82 00 38 */ beq lbl_801B6BDC /* 801B6BA8 001B3AE8 7F 38 CB 78 */ mr r24, r25 @@ -7656,7 +7656,7 @@ lbl_801B6BDC: /* 801B6C0C 001B3B4C 48 18 0F 35 */ bl J3DAnmLoaderDataBase_NS_load /* 801B6C10 001B3B50 7C 78 1B 78 */ mr r24, r3 /* 801B6C14 001B3B54 38 60 00 1C */ li r3, 0x1c -/* 801B6C18 001B3B58 48 11 80 35 */ bl __nw +/* 801B6C18 001B3B58 48 11 80 35 */ bl __nw__FUl /* 801B6C1C 001B3B5C 7C 79 1B 79 */ or. r25, r3, r3 /* 801B6C20 001B3B60 41 82 00 20 */ beq lbl_801B6C40 /* 801B6C24 001B3B64 3C 80 80 3A */ lis r4, lbl_803A3354@ha @@ -7699,7 +7699,7 @@ lbl_801B6C7C: /* 801B6CB0 001B3BF0 7F E4 FB 78 */ mr r4, r31 /* 801B6CB4 001B3BF4 48 17 4B C9 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ /* 801B6CB8 001B3BF8 38 60 00 18 */ li r3, 0x18 -/* 801B6CBC 001B3BFC 48 11 7F 91 */ bl __nw +/* 801B6CBC 001B3BFC 48 11 7F 91 */ bl __nw__FUl /* 801B6CC0 001B3C00 7C 79 1B 79 */ or. r25, r3, r3 /* 801B6CC4 001B3C04 41 82 00 20 */ beq lbl_801B6CE4 /* 801B6CC8 001B3C08 3C 80 80 3A */ lis r4, lbl_803A3354@ha @@ -8559,7 +8559,7 @@ dMenu_Collect_c: /* 801B78E8 001B4828 38 03 C7 5C */ addi r0, r3, lbl_803BC75C@l /* 801B78EC 001B482C 90 1C 00 00 */ stw r0, 0(r28) /* 801B78F0 001B4830 38 60 02 64 */ li r3, 0x264 -/* 801B78F4 001B4834 48 11 73 59 */ bl __nw +/* 801B78F4 001B4834 48 11 73 59 */ bl __nw__FUl /* 801B78F8 001B4838 7C 60 1B 79 */ or. r0, r3, r3 /* 801B78FC 001B483C 41 82 00 18 */ beq lbl_801B7914 /* 801B7900 001B4840 7F A4 EB 78 */ mr r4, r29 @@ -8570,7 +8570,7 @@ dMenu_Collect_c: lbl_801B7914: /* 801B7914 001B4854 90 1C 00 04 */ stw r0, 4(r28) /* 801B7918 001B4858 38 60 03 DC */ li r3, 0x3dc -/* 801B791C 001B485C 48 11 73 31 */ bl __nw +/* 801B791C 001B485C 48 11 73 31 */ bl __nw__FUl /* 801B7920 001B4860 7C 60 1B 79 */ or. r0, r3, r3 /* 801B7924 001B4864 41 82 00 18 */ beq lbl_801B793C /* 801B7928 001B4868 7F A4 EB 78 */ mr r4, r29 @@ -8627,7 +8627,7 @@ lbl_801B79E0: /* 801B79E0 001B4920 7F E0 07 35 */ extsh. r0, r31 /* 801B79E4 001B4924 40 81 00 0C */ ble lbl_801B79F0 /* 801B79E8 001B4928 7F C3 F3 78 */ mr r3, r30 -/* 801B79EC 001B492C 48 11 73 51 */ bl __dl +/* 801B79EC 001B492C 48 11 73 51 */ bl __dl__FPv lbl_801B79F0: /* 801B79F0 001B4930 7F C3 F3 78 */ mr r3, r30 /* 801B79F4 001B4934 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8958,7 +8958,7 @@ dMenu_Collect_c_NS_draw: /* 801B7ED8 001B4E18 90 1F 00 00 */ stw r0, 0(r31) /* 801B7EDC 001B4E1C 7C 80 07 35 */ extsh. r0, r4 /* 801B7EE0 001B4E20 40 81 00 08 */ ble lbl_801B7EE8 -/* 801B7EE4 001B4E24 48 11 6E 59 */ bl __dl +/* 801B7EE4 001B4E24 48 11 6E 59 */ bl __dl__FPv lbl_801B7EE8: /* 801B7EE8 001B4E28 7F E3 FB 78 */ mr r3, r31 /* 801B7EEC 001B4E2C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index a72f5f589d..169b33d7bf 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -46,7 +46,7 @@ dMenu_DmapBg_c: /* 801B7FB8 001B4EF8 38 00 00 01 */ li r0, 1 /* 801B7FBC 001B4EFC 98 1F 0D D8 */ stb r0, 0xdd8(r31) /* 801B7FC0 001B4F00 38 60 00 2C */ li r3, 0x2c -/* 801B7FC4 001B4F04 48 11 6C 89 */ bl __nw +/* 801B7FC4 001B4F04 48 11 6C 89 */ bl __nw__FUl /* 801B7FC8 001B4F08 7C 60 1B 79 */ or. r0, r3, r3 /* 801B7FCC 001B4F0C 41 82 00 0C */ beq lbl_801B7FD8 /* 801B7FD0 001B4F10 48 09 1C 51 */ bl dMsgString_c @@ -62,7 +62,7 @@ lbl_801B7FD8: /* 801B7FF4 001B4F34 38 00 00 00 */ li r0, 0 /* 801B7FF8 001B4F38 90 1F 0D 18 */ stw r0, 0xd18(r31) /* 801B7FFC 001B4F3C 38 60 00 2C */ li r3, 0x2c -/* 801B8000 001B4F40 48 11 6C 4D */ bl __nw +/* 801B8000 001B4F40 48 11 6C 4D */ bl __nw__FUl /* 801B8004 001B4F44 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8008 001B4F48 41 82 00 10 */ beq lbl_801B8018 /* 801B800C 001B4F4C 38 80 00 02 */ li r4, 2 @@ -151,7 +151,7 @@ dMenu_DmapBg_c_NS_mapScreenInit: /* 801B813C 001B507C 3B 84 57 60 */ addi r28, r4, lbl_80395760@l lbl_801B8140: /* 801B8140 001B5080 38 60 01 18 */ li r3, 0x118 -/* 801B8144 001B5084 48 11 6B 09 */ bl __nw +/* 801B8144 001B5084 48 11 6B 09 */ bl __nw__FUl /* 801B8148 001B5088 7C 60 1B 79 */ or. r0, r3, r3 /* 801B814C 001B508C 41 82 00 0C */ beq lbl_801B8158 /* 801B8150 001B5090 48 14 03 49 */ bl J2DScreen @@ -362,7 +362,7 @@ lbl_801B8158: /* 801B8480 001B53C0 3F 80 52 4F */ lis r28, 0x524f lbl_801B8484: /* 801B8484 001B53C4 38 60 00 2C */ li r3, 0x2c -/* 801B8488 001B53C8 48 11 67 C5 */ bl __nw +/* 801B8488 001B53C8 48 11 67 C5 */ bl __nw__FUl /* 801B848C 001B53CC 7C 64 1B 79 */ or. r4, r3, r3 /* 801B8490 001B53D0 41 82 00 24 */ beq lbl_801B84B4 /* 801B8494 001B53D4 38 1E 0C A8 */ addi r0, r30, 0xca8 @@ -573,7 +573,7 @@ lbl_801B84B4: /* 801B87C4 001B5704 3B C0 00 00 */ li r30, 0 lbl_801B87C8: /* 801B87C8 001B5708 38 60 00 6C */ li r3, 0x6c -/* 801B87CC 001B570C 48 11 64 81 */ bl __nw +/* 801B87CC 001B570C 48 11 64 81 */ bl __nw__FUl /* 801B87D0 001B5710 7C 60 1B 79 */ or. r0, r3, r3 /* 801B87D4 001B5714 41 82 00 2C */ beq lbl_801B8800 /* 801B87D8 001B5718 38 1E 0C A8 */ addi r0, r30, 0xca8 @@ -751,7 +751,7 @@ dMenu_DmapBg_c_NS_buttonIconScreenInit: /* 801B8A24 001B5964 3C 60 80 39 */ lis r3, lbl_80395518@ha /* 801B8A28 001B5968 3B E3 55 18 */ addi r31, r3, lbl_80395518@l /* 801B8A2C 001B596C 38 60 01 18 */ li r3, 0x118 -/* 801B8A30 001B5970 48 11 62 1D */ bl __nw +/* 801B8A30 001B5970 48 11 62 1D */ bl __nw__FUl /* 801B8A34 001B5974 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8A38 001B5978 41 82 00 0C */ beq lbl_801B8A44 /* 801B8A3C 001B597C 48 13 FA 5D */ bl J2DScreen @@ -803,7 +803,7 @@ lbl_801B8A44: /* 801B8AF0 001B5A30 38 00 00 00 */ li r0, 0 /* 801B8AF4 001B5A34 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801B8AF8 001B5A38 38 60 00 2C */ li r3, 0x2c -/* 801B8AFC 001B5A3C 48 11 61 51 */ bl __nw +/* 801B8AFC 001B5A3C 48 11 61 51 */ bl __nw__FUl /* 801B8B00 001B5A40 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8B04 001B5A44 41 82 00 24 */ beq lbl_801B8B28 /* 801B8B08 001B5A48 80 9E 0C B4 */ lwz r4, 0xcb4(r30) @@ -828,7 +828,7 @@ lbl_801B8B40: /* 801B8B4C 001B5A8C 38 63 00 04 */ addi r3, r3, 4 /* 801B8B50 001B5A90 42 00 FF F0 */ bdnz lbl_801B8B40 /* 801B8B54 001B5A94 38 60 00 1C */ li r3, 0x1c -/* 801B8B58 001B5A98 48 11 60 F5 */ bl __nw +/* 801B8B58 001B5A98 48 11 60 F5 */ bl __nw__FUl /* 801B8B5C 001B5A9C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8B60 001B5AA0 41 82 00 24 */ beq lbl_801B8B84 /* 801B8B64 001B5AA4 80 9E 0C B4 */ lwz r4, 0xcb4(r30) @@ -929,7 +929,7 @@ lbl_801B8BA8: /* 801B8CD8 001B5C18 3B BD 00 08 */ addi r29, r29, 8 /* 801B8CDC 001B5C1C 41 80 FE CC */ blt lbl_801B8BA8 /* 801B8CE0 001B5C20 38 60 00 6C */ li r3, 0x6c -/* 801B8CE4 001B5C24 48 11 5F 69 */ bl __nw +/* 801B8CE4 001B5C24 48 11 5F 69 */ bl __nw__FUl /* 801B8CE8 001B5C28 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8CEC 001B5C2C 41 82 00 24 */ beq lbl_801B8D10 /* 801B8CF0 001B5C30 80 9E 0C B4 */ lwz r4, 0xcb4(r30) @@ -1228,7 +1228,7 @@ dMenu_DmapBg_c_NS_createExplain: /* 801B9108 001B6048 4B E5 60 C5 */ bl mDoExt_setCurrentHeap /* 801B910C 001B604C 7C 7F 1B 78 */ mr r31, r3 /* 801B9110 001B6050 38 60 00 E8 */ li r3, 0xe8 -/* 801B9114 001B6054 48 11 5B 39 */ bl __nw +/* 801B9114 001B6054 48 11 5B 39 */ bl __nw__FUl /* 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) @@ -1295,7 +1295,7 @@ dMenu_DmapBg_c_NS_baseScreenInit: /* 801B91EC 001B612C 93 C1 00 08 */ stw r30, 8(r1) /* 801B91F0 001B6130 7C 7F 1B 78 */ mr r31, r3 /* 801B91F4 001B6134 38 60 01 18 */ li r3, 0x118 -/* 801B91F8 001B6138 48 11 5A 55 */ bl __nw +/* 801B91F8 001B6138 48 11 5A 55 */ bl __nw__FUl /* 801B91FC 001B613C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B9200 001B6140 41 82 00 0C */ beq lbl_801B920C /* 801B9204 001B6144 48 13 F2 95 */ bl J2DScreen @@ -1314,7 +1314,7 @@ lbl_801B920C: /* 801B9234 001B6174 80 7F 0C A4 */ lwz r3, 0xca4(r31) /* 801B9238 001B6178 48 09 BE B1 */ bl dPaneClass_showNullPane /* 801B923C 001B617C 38 60 01 18 */ li r3, 0x118 -/* 801B9240 001B6180 48 11 5A 0D */ bl __nw +/* 801B9240 001B6180 48 11 5A 0D */ bl __nw__FUl /* 801B9244 001B6184 7C 60 1B 79 */ or. r0, r3, r3 /* 801B9248 001B6188 41 82 00 0C */ beq lbl_801B9254 /* 801B924C 001B618C 48 13 F2 4D */ bl J2DScreen @@ -1342,7 +1342,7 @@ lbl_801B9254: /* 801B92A0 001B61E0 38 00 00 00 */ li r0, 0 /* 801B92A4 001B61E4 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801B92A8 001B61E8 38 60 00 2C */ li r3, 0x2c -/* 801B92AC 001B61EC 48 11 59 A1 */ bl __nw +/* 801B92AC 001B61EC 48 11 59 A1 */ bl __nw__FUl /* 801B92B0 001B61F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801B92B4 001B61F4 41 82 00 24 */ beq lbl_801B92D8 /* 801B92B8 001B61F8 80 9F 0C A4 */ lwz r4, 0xca4(r31) @@ -1356,7 +1356,7 @@ lbl_801B9254: lbl_801B92D8: /* 801B92D8 001B6218 90 1F 0C CC */ stw r0, 0xccc(r31) /* 801B92DC 001B621C 38 60 00 2C */ li r3, 0x2c -/* 801B92E0 001B6220 48 11 59 6D */ bl __nw +/* 801B92E0 001B6220 48 11 59 6D */ bl __nw__FUl /* 801B92E4 001B6224 7C 60 1B 79 */ or. r0, r3, r3 /* 801B92E8 001B6228 41 82 00 24 */ beq lbl_801B930C /* 801B92EC 001B622C 80 9F 0C BC */ lwz r4, 0xcbc(r31) @@ -1370,7 +1370,7 @@ lbl_801B92D8: lbl_801B930C: /* 801B930C 001B624C 90 1F 0C E0 */ stw r0, 0xce0(r31) /* 801B9310 001B6250 38 60 00 B8 */ li r3, 0xb8 -/* 801B9314 001B6254 48 11 59 39 */ bl __nw +/* 801B9314 001B6254 48 11 59 39 */ bl __nw__FUl /* 801B9318 001B6258 7C 60 1B 79 */ or. r0, r3, r3 /* 801B931C 001B625C 41 82 00 18 */ beq lbl_801B9334 /* 801B9320 001B6260 38 80 00 02 */ li r4, 2 @@ -2633,7 +2633,7 @@ lbl_801BA5C8: /* 801BA5E0 001B7520 7F C0 07 35 */ extsh. r0, r30 /* 801BA5E4 001B7524 40 81 00 0C */ ble lbl_801BA5F0 /* 801BA5E8 001B7528 7F E3 FB 78 */ mr r3, r31 -/* 801BA5EC 001B752C 48 11 47 51 */ bl __dl +/* 801BA5EC 001B752C 48 11 47 51 */ bl __dl__FPv lbl_801BA5F0: /* 801BA5F0 001B7530 7F E3 FB 78 */ mr r3, r31 /* 801BA5F4 001B7534 39 61 00 20 */ addi r11, r1, 0x20 @@ -3559,7 +3559,7 @@ lbl_801BB398: /* 801BB3BC 001B82FC 4E 80 04 21 */ bctrl /* 801BB3C0 001B8300 7C 7E 1B 78 */ mr r30, r3 /* 801BB3C4 001B8304 38 60 01 50 */ li r3, 0x150 -/* 801BB3C8 001B8308 48 11 38 85 */ bl __nw +/* 801BB3C8 001B8308 48 11 38 85 */ bl __nw__FUl /* 801BB3CC 001B830C 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB3D0 001B8310 41 82 00 10 */ beq lbl_801BB3E0 /* 801BB3D4 001B8314 7F C4 F3 78 */ mr r4, r30 @@ -3751,7 +3751,7 @@ dMenu_Dmap_c_NS_screenInit: /* 801BB65C 001B859C 3C 60 80 39 */ lis r3, lbl_80395518@ha /* 801BB660 001B85A0 3B C3 55 18 */ addi r30, r3, lbl_80395518@l /* 801BB664 001B85A4 38 60 00 6C */ li r3, 0x6c -/* 801BB668 001B85A8 48 11 35 E5 */ bl __nw +/* 801BB668 001B85A8 48 11 35 E5 */ bl __nw__FUl /* 801BB66C 001B85AC 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB670 001B85B0 41 82 00 2C */ beq lbl_801BB69C /* 801BB674 001B85B4 80 9F 00 08 */ lwz r4, 8(r31) @@ -3774,7 +3774,7 @@ lbl_801BB6B0: /* 801BB6B0 001B85F0 7F BF D2 14 */ add r29, r31, r26 /* 801BB6B4 001B85F4 D3 DD 01 14 */ stfs f30, 0x114(r29) /* 801BB6B8 001B85F8 38 60 00 6C */ li r3, 0x6c -/* 801BB6BC 001B85FC 48 11 35 91 */ bl __nw +/* 801BB6BC 001B85FC 48 11 35 91 */ bl __nw__FUl /* 801BB6C0 001B8600 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB6C4 001B8604 41 82 00 2C */ beq lbl_801BB6F0 /* 801BB6C8 001B8608 80 9F 00 08 */ lwz r4, 8(r31) @@ -3790,7 +3790,7 @@ lbl_801BB6B0: lbl_801BB6F0: /* 801BB6F0 001B8630 90 1D 00 14 */ stw r0, 0x14(r29) /* 801BB6F4 001B8634 38 60 00 6C */ li r3, 0x6c -/* 801BB6F8 001B8638 48 11 35 55 */ bl __nw +/* 801BB6F8 001B8638 48 11 35 55 */ bl __nw__FUl /* 801BB6FC 001B863C 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB700 001B8640 41 82 00 2C */ beq lbl_801BB72C /* 801BB704 001B8644 80 9F 00 08 */ lwz r4, 8(r31) @@ -3806,7 +3806,7 @@ lbl_801BB6F0: lbl_801BB72C: /* 801BB72C 001B866C 90 1D 00 34 */ stw r0, 0x34(r29) /* 801BB730 001B8670 38 60 00 6C */ li r3, 0x6c -/* 801BB734 001B8674 48 11 35 19 */ bl __nw +/* 801BB734 001B8674 48 11 35 19 */ bl __nw__FUl /* 801BB738 001B8678 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB73C 001B867C 41 82 00 2C */ beq lbl_801BB768 /* 801BB740 001B8680 80 9F 00 08 */ lwz r4, 8(r31) @@ -3834,7 +3834,7 @@ lbl_801BB768: /* 801BB794 001B86D4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l lbl_801BB798: /* 801BB798 001B86D8 38 60 00 6C */ li r3, 0x6c -/* 801BB79C 001B86DC 48 11 34 B1 */ bl __nw +/* 801BB79C 001B86DC 48 11 34 B1 */ bl __nw__FUl /* 801BB7A0 001B86E0 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB7A4 001B86E4 41 82 00 2C */ beq lbl_801BB7D0 /* 801BB7A8 001B86E8 80 9F 00 08 */ lwz r4, 8(r31) @@ -4143,7 +4143,7 @@ lbl_801BBB58: /* 801BBC40 001B8B80 38 A0 00 01 */ li r5, 1 /* 801BBC44 001B8B84 4B FD 94 B1 */ bl dSelect_cursor_c_NS_setPos /* 801BBC48 001B8B88 38 60 00 6C */ li r3, 0x6c -/* 801BBC4C 001B8B8C 48 11 30 01 */ bl __nw +/* 801BBC4C 001B8B8C 48 11 30 01 */ bl __nw__FUl /* 801BBC50 001B8B90 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBC54 001B8B94 41 82 00 2C */ beq lbl_801BBC80 /* 801BBC58 001B8B98 80 9F 00 08 */ lwz r4, 8(r31) @@ -4159,7 +4159,7 @@ lbl_801BBB58: lbl_801BBC80: /* 801BBC80 001B8BC0 90 1F 00 94 */ stw r0, 0x94(r31) /* 801BBC84 001B8BC4 38 60 00 6C */ li r3, 0x6c -/* 801BBC88 001B8BC8 48 11 2F C5 */ bl __nw +/* 801BBC88 001B8BC8 48 11 2F C5 */ bl __nw__FUl /* 801BBC8C 001B8BCC 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBC90 001B8BD0 41 82 00 28 */ beq lbl_801BBCB8 /* 801BBC94 001B8BD4 80 9F 00 08 */ lwz r4, 8(r31) @@ -4174,7 +4174,7 @@ lbl_801BBC80: lbl_801BBCB8: /* 801BBCB8 001B8BF8 90 1F 00 7C */ stw r0, 0x7c(r31) /* 801BBCBC 001B8BFC 38 60 00 6C */ li r3, 0x6c -/* 801BBCC0 001B8C00 48 11 2F 8D */ bl __nw +/* 801BBCC0 001B8C00 48 11 2F 8D */ bl __nw__FUl /* 801BBCC4 001B8C04 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBCC8 001B8C08 41 82 00 28 */ beq lbl_801BBCF0 /* 801BBCCC 001B8C0C 80 9F 00 08 */ lwz r4, 8(r31) @@ -4189,7 +4189,7 @@ lbl_801BBCB8: lbl_801BBCF0: /* 801BBCF0 001B8C30 90 1F 00 80 */ stw r0, 0x80(r31) /* 801BBCF4 001B8C34 38 60 00 6C */ li r3, 0x6c -/* 801BBCF8 001B8C38 48 11 2F 55 */ bl __nw +/* 801BBCF8 001B8C38 48 11 2F 55 */ bl __nw__FUl /* 801BBCFC 001B8C3C 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBD00 001B8C40 41 82 00 28 */ beq lbl_801BBD28 /* 801BBD04 001B8C44 80 9F 00 08 */ lwz r4, 8(r31) @@ -4204,7 +4204,7 @@ lbl_801BBCF0: lbl_801BBD28: /* 801BBD28 001B8C68 90 1F 00 84 */ stw r0, 0x84(r31) /* 801BBD2C 001B8C6C 38 60 00 6C */ li r3, 0x6c -/* 801BBD30 001B8C70 48 11 2F 1D */ bl __nw +/* 801BBD30 001B8C70 48 11 2F 1D */ bl __nw__FUl /* 801BBD34 001B8C74 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBD38 001B8C78 41 82 00 28 */ beq lbl_801BBD60 /* 801BBD3C 001B8C7C 80 9F 00 08 */ lwz r4, 8(r31) @@ -4219,7 +4219,7 @@ lbl_801BBD28: lbl_801BBD60: /* 801BBD60 001B8CA0 90 1F 00 88 */ stw r0, 0x88(r31) /* 801BBD64 001B8CA4 38 60 00 6C */ li r3, 0x6c -/* 801BBD68 001B8CA8 48 11 2E E5 */ bl __nw +/* 801BBD68 001B8CA8 48 11 2E E5 */ bl __nw__FUl /* 801BBD6C 001B8CAC 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBD70 001B8CB0 41 82 00 28 */ beq lbl_801BBD98 /* 801BBD74 001B8CB4 80 9F 00 08 */ lwz r4, 8(r31) @@ -4246,7 +4246,7 @@ lbl_801BBD98: /* 801BBDC4 001B8D04 2C 00 00 11 */ cmpwi r0, 0x11 /* 801BBDC8 001B8D08 40 82 00 44 */ bne lbl_801BBE0C /* 801BBDCC 001B8D0C 38 60 00 6C */ li r3, 0x6c -/* 801BBDD0 001B8D10 48 11 2E 7D */ bl __nw +/* 801BBDD0 001B8D10 48 11 2E 7D */ bl __nw__FUl /* 801BBDD4 001B8D14 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBDD8 001B8D18 41 82 00 2C */ beq lbl_801BBE04 /* 801BBDDC 001B8D1C 80 9F 00 08 */ lwz r4, 8(r31) @@ -4273,7 +4273,7 @@ lbl_801BBE0C: /* 801BBE28 001B8D68 2C 00 00 14 */ cmpwi r0, 0x14 /* 801BBE2C 001B8D6C 40 82 00 44 */ bne lbl_801BBE70 /* 801BBE30 001B8D70 38 60 00 6C */ li r3, 0x6c -/* 801BBE34 001B8D74 48 11 2E 19 */ bl __nw +/* 801BBE34 001B8D74 48 11 2E 19 */ bl __nw__FUl /* 801BBE38 001B8D78 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBE3C 001B8D7C 41 82 00 2C */ beq lbl_801BBE68 /* 801BBE40 001B8D80 80 9F 00 08 */ lwz r4, 8(r31) @@ -4291,7 +4291,7 @@ lbl_801BBE68: /* 801BBE6C 001B8DAC 48 00 00 40 */ b lbl_801BBEAC lbl_801BBE70: /* 801BBE70 001B8DB0 38 60 00 6C */ li r3, 0x6c -/* 801BBE74 001B8DB4 48 11 2D D9 */ bl __nw +/* 801BBE74 001B8DB4 48 11 2D D9 */ bl __nw__FUl /* 801BBE78 001B8DB8 7C 60 1B 79 */ or. r0, r3, r3 /* 801BBE7C 001B8DBC 41 82 00 2C */ beq lbl_801BBEA8 /* 801BBE80 001B8DC0 80 9F 00 08 */ lwz r4, 8(r31) @@ -4873,7 +4873,7 @@ lbl_801BC718: /* 801BC718 001B9658 80 7F 00 94 */ lwz r3, 0x94(r31) /* 801BC71C 001B965C 48 09 8E ED */ bl CPaneMgrAlpha_NS_hide /* 801BC720 001B9660 38 60 00 6C */ li r3, 0x6c -/* 801BC724 001B9664 48 11 25 29 */ bl __nw +/* 801BC724 001B9664 48 11 25 29 */ bl __nw__FUl /* 801BC728 001B9668 7C 60 1B 79 */ or. r0, r3, r3 /* 801BC72C 001B966C 41 82 00 28 */ beq lbl_801BC754 /* 801BC730 001B9670 80 9F 00 08 */ lwz r4, 8(r31) @@ -5355,9 +5355,9 @@ lbl_801BCDC4: /* 801BCE18 001B9D58 38 03 CB 10 */ addi r0, r3, lbl_803BCB10@l /* 801BCE1C 001B9D5C 90 1F 00 00 */ stw r0, 0(r31) /* 801BCE20 001B9D60 80 7F 00 E8 */ lwz r3, 0xe8(r31) -/* 801BCE24 001B9D64 48 11 19 61 */ bl JKRHeap_NS_getTotalFreeSize +/* 801BCE24 001B9D64 48 11 19 61 */ bl getTotalFreeSize__7JKRHeapFv /* 801BCE28 001B9D68 80 7F 00 E8 */ lwz r3, 0xe8(r31) -/* 801BCE2C 001B9D6C 48 11 19 59 */ bl JKRHeap_NS_getTotalFreeSize +/* 801BCE2C 001B9D6C 48 11 19 59 */ bl getTotalFreeSize__7JKRHeapFv /* 801BCE30 001B9D70 80 7F 00 08 */ lwz r3, 8(r31) /* 801BCE34 001B9D74 28 03 00 00 */ cmplwi r3, 0 /* 801BCE38 001B9D78 41 82 00 24 */ beq lbl_801BCE5C @@ -5375,14 +5375,14 @@ lbl_801BCE5C: /* 801BCE60 001B9DA0 28 03 00 00 */ cmplwi r3, 0 /* 801BCE64 001B9DA4 41 82 00 14 */ beq lbl_801BCE78 /* 801BCE68 001B9DA8 80 9F 00 FC */ lwz r4, 0xfc(r31) -/* 801BCE6C 001B9DAC 48 11 16 DD */ bl JKRHeap_NS_free_X1_ +/* 801BCE6C 001B9DAC 48 11 16 DD */ bl free__7JKRHeapFPv /* 801BCE70 001B9DB0 38 00 00 00 */ li r0, 0 /* 801BCE74 001B9DB4 90 1F 00 FC */ stw r0, 0xfc(r31) lbl_801BCE78: /* 801BCE78 001B9DB8 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 801BCE7C 001B9DBC 28 03 00 00 */ cmplwi r3, 0 /* 801BCE80 001B9DC0 41 82 00 08 */ beq lbl_801BCE88 -/* 801BCE84 001B9DC4 48 11 1E B9 */ bl __dl +/* 801BCE84 001B9DC4 48 11 1E B9 */ bl __dl__FPv lbl_801BCE88: /* 801BCE88 001B9DC8 80 7F 00 94 */ lwz r3, 0x94(r31) /* 801BCE8C 001B9DCC 28 03 00 00 */ cmplwi r3, 0 @@ -5574,7 +5574,7 @@ lbl_801BD104: /* 801BD118 001BA058 7F C0 07 35 */ extsh. r0, r30 /* 801BD11C 001BA05C 40 81 00 0C */ ble lbl_801BD128 /* 801BD120 001BA060 7F E3 FB 78 */ mr r3, r31 -/* 801BD124 001BA064 48 11 1C 19 */ bl __dl +/* 801BD124 001BA064 48 11 1C 19 */ bl __dl__FPv lbl_801BD128: /* 801BD128 001BA068 7F E3 FB 78 */ mr r3, r31 /* 801BD12C 001BA06C 39 61 00 20 */ addi r11, r1, 0x20 @@ -5614,7 +5614,7 @@ lbl_801BD1A8: /* 801BD1A8 001BA0E8 7F E0 07 35 */ extsh. r0, r31 /* 801BD1AC 001BA0EC 40 81 00 0C */ ble lbl_801BD1B8 /* 801BD1B0 001BA0F0 7F C3 F3 78 */ mr r3, r30 -/* 801BD1B4 001BA0F4 48 11 1B 89 */ bl __dl +/* 801BD1B4 001BA0F4 48 11 1B 89 */ bl __dl__FPv lbl_801BD1B8: /* 801BD1B8 001BA0F8 7F C3 F3 78 */ mr r3, r30 /* 801BD1BC 001BA0FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -6055,7 +6055,7 @@ dMenu_Dmap_c_NS__create: /* 801BD7D0 001BA710 48 1A 4A 09 */ bl _savegpr_28 /* 801BD7D4 001BA714 7C 7F 1B 78 */ mr r31, r3 /* 801BD7D8 001BA718 80 63 00 E8 */ lwz r3, 0xe8(r3) -/* 801BD7DC 001BA71C 48 11 0F A9 */ bl JKRHeap_NS_getTotalFreeSize +/* 801BD7DC 001BA71C 48 11 0F A9 */ bl getTotalFreeSize__7JKRHeapFv /* 801BD7E0 001BA720 83 BF 00 E8 */ lwz r29, 0xe8(r31) /* 801BD7E4 001BA724 7F A3 EB 78 */ mr r3, r29 /* 801BD7E8 001BA728 48 11 0F 45 */ bl getFreeSize__7JKRHeapFv @@ -6068,9 +6068,9 @@ dMenu_Dmap_c_NS__create: /* 801BD804 001BA744 4B E5 19 C9 */ bl mDoExt_setCurrentHeap /* 801BD808 001BA748 7C 7E 1B 78 */ mr r30, r3 /* 801BD80C 001BA74C 80 7F 00 EC */ lwz r3, 0xec(r31) -/* 801BD810 001BA750 48 11 0F 75 */ bl JKRHeap_NS_getTotalFreeSize +/* 801BD810 001BA750 48 11 0F 75 */ bl getTotalFreeSize__7JKRHeapFv /* 801BD814 001BA754 38 60 00 FC */ li r3, 0xfc -/* 801BD818 001BA758 48 11 14 35 */ bl __nw +/* 801BD818 001BA758 48 11 14 35 */ bl __nw__FUl /* 801BD81C 001BA75C 7C 7D 1B 79 */ or. r29, r3, r3 /* 801BD820 001BA760 41 82 00 F4 */ beq lbl_801BD914 /* 801BD824 001BA764 3C 60 80 3C */ lis r3, lbl_803BCAE0@ha @@ -6154,7 +6154,7 @@ lbl_801BD914: /* 801BD948 001BA888 98 7F 01 84 */ stb r3, 0x184(r31) lbl_801BD94C: /* 801BD94C 001BA88C 38 60 00 30 */ li r3, 0x30 -/* 801BD950 001BA890 48 11 12 FD */ bl __nw +/* 801BD950 001BA890 48 11 12 FD */ bl __nw__FUl /* 801BD954 001BA894 7C 60 1B 79 */ or. r0, r3, r3 /* 801BD958 001BA898 41 82 00 2C */ beq lbl_801BD984 /* 801BD95C 001BA89C 38 80 00 05 */ li r4, 5 @@ -6173,9 +6173,9 @@ lbl_801BD984: /* 801BD98C 001BA8CC 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 801BD990 001BA8D0 B0 03 00 28 */ sth r0, 0x28(r3) /* 801BD994 001BA8D4 80 7F 00 E8 */ lwz r3, 0xe8(r31) -/* 801BD998 001BA8D8 48 11 0D ED */ bl JKRHeap_NS_getTotalFreeSize +/* 801BD998 001BA8D8 48 11 0D ED */ bl getTotalFreeSize__7JKRHeapFv /* 801BD99C 001BA8DC 38 60 0D DC */ li r3, 0xddc -/* 801BD9A0 001BA8E0 48 11 12 AD */ bl __nw +/* 801BD9A0 001BA8E0 48 11 12 AD */ bl __nw__FUl /* 801BD9A4 001BA8E4 7C 60 1B 79 */ or. r0, r3, r3 /* 801BD9A8 001BA8E8 41 82 00 14 */ beq lbl_801BD9BC /* 801BD9AC 001BA8EC 80 9F 00 EC */ lwz r4, 0xec(r31) @@ -6187,7 +6187,7 @@ lbl_801BD9BC: /* 801BD9C0 001BA900 80 7F 00 EC */ lwz r3, 0xec(r31) /* 801BD9C4 001BA904 38 80 0C 00 */ li r4, 0xc00 /* 801BD9C8 001BA908 38 A0 00 20 */ li r5, 0x20 -/* 801BD9CC 001BA90C 48 11 0B 09 */ bl JKRHeap_NS_alloc_X1_ +/* 801BD9CC 001BA90C 48 11 0B 09 */ bl alloc__7JKRHeapFUli /* 801BD9D0 001BA910 90 7F 00 FC */ stw r3, 0xfc(r31) /* 801BD9D4 001BA914 88 1F 01 7F */ lbz r0, 0x17f(r31) /* 801BD9D8 001BA918 28 00 00 00 */ cmplwi r0, 0 @@ -9052,7 +9052,7 @@ lbl_801C0404: /* 801C0404 001BD344 7C 80 07 35 */ extsh. r0, r4 /* 801C0408 001BD348 40 81 00 0C */ ble lbl_801C0414 /* 801C040C 001BD34C 7F E3 FB 78 */ mr r3, r31 -/* 801C0410 001BD350 48 10 E9 2D */ bl __dl +/* 801C0410 001BD350 48 10 E9 2D */ bl __dl__FPv lbl_801C0414: /* 801C0414 001BD354 7F E3 FB 78 */ mr r3, r31 /* 801C0418 001BD358 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -9087,7 +9087,7 @@ lbl_801C0480: /* 801C0480 001BD3C0 7F E0 07 35 */ extsh. r0, r31 /* 801C0484 001BD3C4 40 81 00 0C */ ble lbl_801C0490 /* 801C0488 001BD3C8 7F C3 F3 78 */ mr r3, r30 -/* 801C048C 001BD3CC 48 10 E8 B1 */ bl __dl +/* 801C048C 001BD3CC 48 10 E8 B1 */ bl __dl__FPv lbl_801C0490: /* 801C0490 001BD3D0 7F C3 F3 78 */ mr r3, r30 /* 801C0494 001BD3D4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -9118,7 +9118,7 @@ lbl_801C0490: /* 801C04F0 001BD430 7F E0 07 35 */ extsh. r0, r31 /* 801C04F4 001BD434 40 81 00 0C */ ble lbl_801C0500 /* 801C04F8 001BD438 7F C3 F3 78 */ mr r3, r30 -/* 801C04FC 001BD43C 48 10 E8 41 */ bl __dl +/* 801C04FC 001BD43C 48 10 E8 41 */ bl __dl__FPv lbl_801C0500: /* 801C0500 001BD440 7F C3 F3 78 */ mr r3, r30 /* 801C0504 001BD444 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index 60c285fc0a..b360447828 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -205,7 +205,7 @@ lbl_801C5020: /* 801C5020 001C1F60 7F E0 07 35 */ extsh. r0, r31 /* 801C5024 001C1F64 40 81 00 0C */ ble lbl_801C5030 /* 801C5028 001C1F68 7F C3 F3 78 */ mr r3, r30 -/* 801C502C 001C1F6C 48 10 9D 11 */ bl __dl +/* 801C502C 001C1F6C 48 10 9D 11 */ bl __dl__FPv lbl_801C5030: /* 801C5030 001C1F70 7F C3 F3 78 */ mr r3, r30 /* 801C5034 001C1F74 39 61 00 30 */ addi r11, r1, 0x30 @@ -223,7 +223,7 @@ dMenu_Fishing_c_NS__create: /* 801C5058 001C1F98 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C505C 001C1F9C 7C 7F 1B 78 */ mr r31, r3 /* 801C5060 001C1FA0 38 60 00 2C */ li r3, 0x2c -/* 801C5064 001C1FA4 48 10 9B E9 */ bl __nw +/* 801C5064 001C1FA4 48 10 9B E9 */ bl __nw__FUl /* 801C5068 001C1FA8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C506C 001C1FAC 41 82 00 0C */ beq lbl_801C5078 /* 801C5070 001C1FB0 48 08 4B B1 */ bl dMsgString_c @@ -630,7 +630,7 @@ dMenu_Fishing_c_NS_screenSetBase: /* 801C5624 001C2564 4E 80 04 21 */ bctrl /* 801C5628 001C2568 7C 72 1B 78 */ mr r18, r3 /* 801C562C 001C256C 38 60 01 50 */ li r3, 0x150 -/* 801C5630 001C2570 48 10 96 1D */ bl __nw +/* 801C5630 001C2570 48 10 96 1D */ bl __nw__FUl /* 801C5634 001C2574 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5638 001C2578 41 82 00 10 */ beq lbl_801C5648 /* 801C563C 001C257C 7E 44 93 78 */ mr r4, r18 @@ -660,7 +660,7 @@ lbl_801C5648: /* 801C5698 001C25D8 7D 89 03 A6 */ mtctr r12 /* 801C569C 001C25DC 4E 80 04 21 */ bctrl /* 801C56A0 001C25E0 38 60 01 18 */ li r3, 0x118 -/* 801C56A4 001C25E4 48 10 95 A9 */ bl __nw +/* 801C56A4 001C25E4 48 10 95 A9 */ bl __nw__FUl /* 801C56A8 001C25E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C56AC 001C25EC 41 82 00 0C */ beq lbl_801C56B8 /* 801C56B0 001C25F0 48 13 2D E9 */ bl J2DScreen @@ -677,7 +677,7 @@ lbl_801C56B8: /* 801C56D8 001C2618 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C56DC 001C261C 48 08 FA 0D */ bl dPaneClass_showNullPane /* 801C56E0 001C2620 38 60 00 6C */ li r3, 0x6c -/* 801C56E4 001C2624 48 10 95 69 */ bl __nw +/* 801C56E4 001C2624 48 10 95 69 */ bl __nw__FUl /* 801C56E8 001C2628 7C 60 1B 79 */ or. r0, r3, r3 /* 801C56EC 001C262C 41 82 00 24 */ beq lbl_801C5710 /* 801C56F0 001C2630 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -698,7 +698,7 @@ lbl_801C5710: /* 801C5728 001C2668 3B A0 00 00 */ li r29, 0 lbl_801C572C: /* 801C572C 001C266C 38 60 00 6C */ li r3, 0x6c -/* 801C5730 001C2670 48 10 95 1D */ bl __nw +/* 801C5730 001C2670 48 10 95 1D */ bl __nw__FUl /* 801C5734 001C2674 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5738 001C2678 41 82 00 28 */ beq lbl_801C5760 /* 801C573C 001C267C 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -714,7 +714,7 @@ lbl_801C5760: /* 801C5760 001C26A0 7E 5F DA 14 */ add r18, r31, r27 /* 801C5764 001C26A4 90 12 00 4C */ stw r0, 0x4c(r18) /* 801C5768 001C26A8 38 60 00 6C */ li r3, 0x6c -/* 801C576C 001C26AC 48 10 94 E1 */ bl __nw +/* 801C576C 001C26AC 48 10 94 E1 */ bl __nw__FUl /* 801C5770 001C26B0 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5774 001C26B4 41 82 00 28 */ beq lbl_801C579C /* 801C5778 001C26B8 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -729,7 +729,7 @@ lbl_801C5760: lbl_801C579C: /* 801C579C 001C26DC 90 12 00 64 */ stw r0, 0x64(r18) /* 801C57A0 001C26E0 38 60 00 6C */ li r3, 0x6c -/* 801C57A4 001C26E4 48 10 94 A9 */ bl __nw +/* 801C57A4 001C26E4 48 10 94 A9 */ bl __nw__FUl /* 801C57A8 001C26E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C57AC 001C26EC 41 82 00 28 */ beq lbl_801C57D4 /* 801C57B0 001C26F0 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -744,7 +744,7 @@ lbl_801C579C: lbl_801C57D4: /* 801C57D4 001C2714 90 12 00 7C */ stw r0, 0x7c(r18) /* 801C57D8 001C2718 38 60 00 6C */ li r3, 0x6c -/* 801C57DC 001C271C 48 10 94 71 */ bl __nw +/* 801C57DC 001C271C 48 10 94 71 */ bl __nw__FUl /* 801C57E0 001C2720 7C 60 1B 79 */ or. r0, r3, r3 /* 801C57E4 001C2724 41 82 00 28 */ beq lbl_801C580C /* 801C57E8 001C2728 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -759,7 +759,7 @@ lbl_801C57D4: lbl_801C580C: /* 801C580C 001C274C 90 12 00 94 */ stw r0, 0x94(r18) /* 801C5810 001C2750 38 60 00 6C */ li r3, 0x6c -/* 801C5814 001C2754 48 10 94 39 */ bl __nw +/* 801C5814 001C2754 48 10 94 39 */ bl __nw__FUl /* 801C5818 001C2758 7C 60 1B 79 */ or. r0, r3, r3 /* 801C581C 001C275C 41 82 00 28 */ beq lbl_801C5844 /* 801C5820 001C2760 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -774,7 +774,7 @@ lbl_801C580C: lbl_801C5844: /* 801C5844 001C2784 90 12 00 AC */ stw r0, 0xac(r18) /* 801C5848 001C2788 38 60 00 6C */ li r3, 0x6c -/* 801C584C 001C278C 48 10 94 01 */ bl __nw +/* 801C584C 001C278C 48 10 94 01 */ bl __nw__FUl /* 801C5850 001C2790 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5854 001C2794 41 82 00 28 */ beq lbl_801C587C /* 801C5858 001C2798 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -789,7 +789,7 @@ lbl_801C5844: lbl_801C587C: /* 801C587C 001C27BC 90 12 00 C4 */ stw r0, 0xc4(r18) /* 801C5880 001C27C0 38 60 00 6C */ li r3, 0x6c -/* 801C5884 001C27C4 48 10 93 C9 */ bl __nw +/* 801C5884 001C27C4 48 10 93 C9 */ bl __nw__FUl /* 801C5888 001C27C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C588C 001C27CC 41 82 00 28 */ beq lbl_801C58B4 /* 801C5890 001C27D0 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -809,7 +809,7 @@ lbl_801C58B4: /* 801C58C4 001C2804 3B BD 00 08 */ addi r29, r29, 8 /* 801C58C8 001C2808 41 80 FE 64 */ blt lbl_801C572C /* 801C58CC 001C280C 38 60 00 6C */ li r3, 0x6c -/* 801C58D0 001C2810 48 10 93 7D */ bl __nw +/* 801C58D0 001C2810 48 10 93 7D */ bl __nw__FUl /* 801C58D4 001C2814 7C 60 1B 79 */ or. r0, r3, r3 /* 801C58D8 001C2818 41 82 00 28 */ beq lbl_801C5900 /* 801C58DC 001C281C 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -824,7 +824,7 @@ lbl_801C58B4: lbl_801C5900: /* 801C5900 001C2840 90 1F 00 F4 */ stw r0, 0xf4(r31) /* 801C5904 001C2844 38 60 00 6C */ li r3, 0x6c -/* 801C5908 001C2848 48 10 93 45 */ bl __nw +/* 801C5908 001C2848 48 10 93 45 */ bl __nw__FUl /* 801C590C 001C284C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5910 001C2850 41 82 00 28 */ beq lbl_801C5938 /* 801C5914 001C2854 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -1105,7 +1105,7 @@ dMenu_Fishing_c_NS_screenSetDoIcon: /* 801C5D4C 001C2C8C 48 19 C4 7D */ bl func_803621C8 /* 801C5D50 001C2C90 7C 7F 1B 78 */ mr r31, r3 /* 801C5D54 001C2C94 38 60 01 18 */ li r3, 0x118 -/* 801C5D58 001C2C98 48 10 8E F5 */ bl __nw +/* 801C5D58 001C2C98 48 10 8E F5 */ bl __nw__FUl /* 801C5D5C 001C2C9C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5D60 001C2CA0 41 82 00 0C */ beq lbl_801C5D6C /* 801C5D64 001C2CA4 48 13 27 35 */ bl J2DScreen diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index c0b05a225b..36bfb20f62 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -353,12 +353,12 @@ lbl_801C6A70: /* 801C6AEC 001C3A2C 38 03 D6 64 */ addi r0, r3, lbl_803BD664@l /* 801C6AF0 001C3A30 90 1E 00 00 */ stw r0, 0(r30) /* 801C6AF4 001C3A34 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6AF8 001C3A38 48 10 7C 8D */ bl JKRHeap_NS_getTotalFreeSize +/* 801C6AF8 001C3A38 48 10 7C 8D */ bl getTotalFreeSize__7JKRHeapFv /* 801C6AFC 001C3A3C 80 9E 00 8C */ lwz r4, 0x8c(r30) /* 801C6B00 001C3A40 28 04 00 00 */ cmplwi r4, 0 /* 801C6B04 001C3A44 41 82 00 14 */ beq lbl_801C6B18 /* 801C6B08 001C3A48 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6B0C 001C3A4C 48 10 7A 3D */ bl JKRHeap_NS_free_X1_ +/* 801C6B0C 001C3A4C 48 10 7A 3D */ bl free__7JKRHeapFPv /* 801C6B10 001C3A50 38 00 00 00 */ li r0, 0 /* 801C6B14 001C3A54 90 1E 00 8C */ stw r0, 0x8c(r30) lbl_801C6B18: @@ -366,7 +366,7 @@ lbl_801C6B18: /* 801C6B1C 001C3A5C 28 04 00 00 */ cmplwi r4, 0 /* 801C6B20 001C3A60 41 82 00 14 */ beq lbl_801C6B34 /* 801C6B24 001C3A64 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6B28 001C3A68 48 10 7A 21 */ bl JKRHeap_NS_free_X1_ +/* 801C6B28 001C3A68 48 10 7A 21 */ bl free__7JKRHeapFPv /* 801C6B2C 001C3A6C 38 00 00 00 */ li r0, 0 /* 801C6B30 001C3A70 90 1E 00 90 */ stw r0, 0x90(r30) lbl_801C6B34: @@ -518,7 +518,7 @@ lbl_801C6D2C: /* 801C6D38 001C3C78 7F E0 07 35 */ extsh. r0, r31 /* 801C6D3C 001C3C7C 40 81 00 0C */ ble lbl_801C6D48 /* 801C6D40 001C3C80 7F C3 F3 78 */ mr r3, r30 -/* 801C6D44 001C3C84 48 10 7F F9 */ bl __dl +/* 801C6D44 001C3C84 48 10 7F F9 */ bl __dl__FPv lbl_801C6D48: /* 801C6D48 001C3C88 7F C3 F3 78 */ mr r3, r30 /* 801C6D4C 001C3C8C 39 61 00 20 */ addi r11, r1, 0x20 @@ -537,9 +537,9 @@ dMenu_Fmap_c_NS__create: /* 801C6D74 001C3CB4 93 C1 00 28 */ stw r30, 0x28(r1) /* 801C6D78 001C3CB8 7C 7F 1B 78 */ mr r31, r3 /* 801C6D7C 001C3CBC 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6D80 001C3CC0 48 10 7A 05 */ bl JKRHeap_NS_getTotalFreeSize +/* 801C6D80 001C3CC0 48 10 7A 05 */ bl getTotalFreeSize__7JKRHeapFv /* 801C6D84 001C3CC4 38 60 12 48 */ li r3, 0x1248 -/* 801C6D88 001C3CC8 48 10 7E C5 */ bl __nw +/* 801C6D88 001C3CC8 48 10 7E C5 */ bl __nw__FUl /* 801C6D8C 001C3CCC 7C 60 1B 79 */ or. r0, r3, r3 /* 801C6D90 001C3CD0 41 82 00 0C */ beq lbl_801C6D9C /* 801C6D94 001C3CD4 48 00 87 D9 */ bl dMenu_Fmap2DBack_c @@ -551,7 +551,7 @@ lbl_801C6D9C: /* 801C6DA8 001C3CE8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C6DAC 001C3CEC 98 03 12 27 */ stb r0, 0x1227(r3) /* 801C6DB0 001C3CF0 38 60 00 C8 */ li r3, 0xc8 -/* 801C6DB4 001C3CF4 48 10 7E 99 */ bl __nw +/* 801C6DB4 001C3CF4 48 10 7E 99 */ bl __nw__FUl /* 801C6DB8 001C3CF8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C6DBC 001C3CFC 41 82 00 14 */ beq lbl_801C6DD0 /* 801C6DC0 001C3D00 80 9F 00 04 */ lwz r4, 4(r31) @@ -561,7 +561,7 @@ lbl_801C6D9C: lbl_801C6DD0: /* 801C6DD0 001C3D10 90 1F 00 18 */ stw r0, 0x18(r31) /* 801C6DD4 001C3D14 38 60 00 F0 */ li r3, 0xf0 -/* 801C6DD8 001C3D18 48 10 7E 75 */ bl __nw +/* 801C6DD8 001C3D18 48 10 7E 75 */ bl __nw__FUl /* 801C6DDC 001C3D1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C6DE0 001C3D20 41 82 00 0C */ beq lbl_801C6DEC /* 801C6DE4 001C3D24 48 00 7E 41 */ bl dMenu_FmapMap_c @@ -5660,7 +5660,7 @@ lbl_801CB888: /* 801CB8A0 001C87E0 28 00 00 00 */ cmplwi r0, 0 /* 801CB8A4 001C87E4 40 82 00 50 */ bne lbl_801CB8F4 /* 801CB8A8 001C87E8 38 60 00 14 */ li r3, 0x14 -/* 801CB8AC 001C87EC 48 10 33 A1 */ bl __nw +/* 801CB8AC 001C87EC 48 10 33 A1 */ bl __nw__FUl /* 801CB8B0 001C87F0 7C 7C 1B 79 */ or. r28, r3, r3 /* 801CB8B4 001C87F4 41 82 00 14 */ beq lbl_801CB8C8 /* 801CB8B8 001C87F8 57 60 10 3A */ slwi r0, r27, 2 @@ -5865,7 +5865,7 @@ lbl_801CBB6C: /* 801CBB78 001C8AB8 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 801CBB7C 001C8ABC 41 82 02 1C */ beq lbl_801CBD98 /* 801CBB80 001C8AC0 38 60 00 30 */ li r3, 0x30 -/* 801CBB84 001C8AC4 48 10 30 C9 */ bl __nw +/* 801CBB84 001C8AC4 48 10 30 C9 */ bl __nw__FUl /* 801CBB88 001C8AC8 7C 72 1B 79 */ or. r18, r3, r3 /* 801CBB8C 001C8ACC 41 82 00 4C */ beq lbl_801CBBD8 /* 801CBB90 001C8AD0 38 80 00 00 */ li r4, 0 @@ -5989,7 +5989,7 @@ lbl_801CBCDC: /* 801CBD48 001C8C88 98 0F 03 06 */ stb r0, 0x306(r15) lbl_801CBD4C: /* 801CBD4C 001C8C8C 38 60 00 08 */ li r3, 8 -/* 801CBD50 001C8C90 48 10 2E FD */ bl __nw +/* 801CBD50 001C8C90 48 10 2E FD */ bl __nw__FUl /* 801CBD54 001C8C94 7C 66 1B 78 */ mr r6, r3 /* 801CBD58 001C8C98 80 1B 00 68 */ lwz r0, 0x68(r27) /* 801CBD5C 001C8C9C 28 00 00 00 */ cmplwi r0, 0 @@ -6028,7 +6028,7 @@ lbl_801CBDC8: /* 801CBDCC 001C8D0C 28 00 00 00 */ cmplwi r0, 0 /* 801CBDD0 001C8D10 40 82 00 5C */ bne lbl_801CBE2C /* 801CBDD4 001C8D14 38 60 00 24 */ li r3, 0x24 -/* 801CBDD8 001C8D18 48 10 2E 75 */ bl __nw +/* 801CBDD8 001C8D18 48 10 2E 75 */ bl __nw__FUl /* 801CBDDC 001C8D1C 7C 70 1B 79 */ or. r16, r3, r3 /* 801CBDE0 001C8D20 41 82 00 48 */ beq lbl_801CBE28 /* 801CBDE4 001C8D24 C0 31 01 C8 */ lfs f1, 0x1c8(r17) @@ -6172,7 +6172,7 @@ lbl_801CBF90: /* 801CBFE0 001C8F20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CBFE4 001C8F24 41 82 00 80 */ beq lbl_801CC064 /* 801CBFE8 001C8F28 38 60 00 10 */ li r3, 0x10 -/* 801CBFEC 001C8F2C 48 10 2C 61 */ bl __nw +/* 801CBFEC 001C8F2C 48 10 2C 61 */ bl __nw__FUl /* 801CBFF0 001C8F30 7C 78 1B 79 */ or. r24, r3, r3 /* 801CBFF4 001C8F34 41 82 00 18 */ beq lbl_801CC00C /* 801CBFF8 001C8F38 38 00 00 00 */ li r0, 0 @@ -6182,7 +6182,7 @@ lbl_801CBF90: /* 801CC008 001C8F48 90 18 00 0C */ stw r0, 0xc(r24) lbl_801CC00C: /* 801CC00C 001C8F4C 38 60 00 14 */ li r3, 0x14 -/* 801CC010 001C8F50 48 10 2C 3D */ bl __nw +/* 801CC010 001C8F50 48 10 2C 3D */ bl __nw__FUl /* 801CC014 001C8F54 28 03 00 00 */ cmplwi r3, 0 /* 801CC018 001C8F58 41 82 00 20 */ beq lbl_801CC038 /* 801CC01C 001C8F5C 88 99 00 00 */ lbz r4, 0(r25) @@ -6310,7 +6310,7 @@ lbl_801CC1BC: /* 801CC1D4 001C9114 80 7E 00 04 */ lwz r3, 4(r30) /* 801CC1D8 001C9118 7F 84 E3 78 */ mr r4, r28 /* 801CC1DC 001C911C 38 A0 00 20 */ li r5, 0x20 -/* 801CC1E0 001C9120 48 10 22 F5 */ bl JKRHeap_NS_alloc_X1_ +/* 801CC1E0 001C9120 48 10 22 F5 */ bl alloc__7JKRHeapFUli /* 801CC1E4 001C9124 90 7F 00 00 */ stw r3, 0(r31) /* 801CC1E8 001C9128 48 00 00 38 */ b lbl_801CC220 lbl_801CC1EC: @@ -6326,7 +6326,7 @@ lbl_801CC20C: /* 801CC20C 001C914C 80 7E 00 04 */ lwz r3, 4(r30) /* 801CC210 001C9150 7F 84 E3 78 */ mr r4, r28 /* 801CC214 001C9154 38 A0 00 20 */ li r5, 0x20 -/* 801CC218 001C9158 48 10 22 BD */ bl JKRHeap_NS_alloc_X1_ +/* 801CC218 001C9158 48 10 22 BD */ bl alloc__7JKRHeapFUli /* 801CC21C 001C915C 90 7F 00 00 */ stw r3, 0(r31) lbl_801CC220: /* 801CC220 001C9160 80 7E 00 64 */ lwz r3, 0x64(r30) @@ -6583,7 +6583,7 @@ lbl_801CC5B0: /* 801CC5B0 001C94F0 80 7B 00 04 */ lwz r3, 4(r27) /* 801CC5B4 001C94F4 7F A4 EB 78 */ mr r4, r29 /* 801CC5B8 001C94F8 38 A0 00 20 */ li r5, 0x20 -/* 801CC5BC 001C94FC 48 10 1F 19 */ bl JKRHeap_NS_alloc_X1_ +/* 801CC5BC 001C94FC 48 10 1F 19 */ bl alloc__7JKRHeapFUli /* 801CC5C0 001C9500 90 7C 00 00 */ stw r3, 0(r28) /* 801CC5C4 001C9504 80 7B 00 64 */ lwz r3, 0x64(r27) /* 801CC5C8 001C9508 80 9C 00 00 */ lwz r4, 0(r28) @@ -6628,7 +6628,7 @@ lbl_801CC648: /* 801CC64C 001C958C 28 03 00 00 */ cmplwi r3, 0 /* 801CC650 001C9590 41 82 00 14 */ beq lbl_801CC664 /* 801CC654 001C9594 41 82 00 08 */ beq lbl_801CC65C -/* 801CC658 001C9598 48 10 26 E5 */ bl __dl +/* 801CC658 001C9598 48 10 26 E5 */ bl __dl__FPv lbl_801CC65C: /* 801CC65C 001C959C 38 00 00 00 */ li r0, 0 /* 801CC660 001C95A0 90 1F 00 20 */ stw r0, 0x20(r31) @@ -6642,7 +6642,7 @@ lbl_801CC670: /* 801CC678 001C95B8 28 03 00 00 */ cmplwi r3, 0 /* 801CC67C 001C95BC 41 82 00 10 */ beq lbl_801CC68C /* 801CC680 001C95C0 41 82 00 08 */ beq lbl_801CC688 -/* 801CC684 001C95C4 48 10 26 B9 */ bl __dl +/* 801CC684 001C95C4 48 10 26 B9 */ bl __dl__FPv lbl_801CC688: /* 801CC688 001C95C8 7F BF E1 2E */ stwx r29, r31, r28 lbl_801CC68C: @@ -6664,7 +6664,7 @@ lbl_801CC6B0: /* 801CC6C0 001C9600 28 1A 00 00 */ cmplwi r26, 0 /* 801CC6C4 001C9604 41 82 00 0C */ beq lbl_801CC6D0 /* 801CC6C8 001C9608 7F 43 D3 78 */ mr r3, r26 -/* 801CC6CC 001C960C 48 10 26 71 */ bl __dl +/* 801CC6CC 001C960C 48 10 26 71 */ bl __dl__FPv lbl_801CC6D0: /* 801CC6D0 001C9610 7F BA EB 78 */ mr r26, r29 lbl_801CC6D4: @@ -6678,10 +6678,10 @@ lbl_801CC6E4: /* 801CC6EC 001C962C 28 04 00 00 */ cmplwi r4, 0 /* 801CC6F0 001C9630 41 82 00 0C */ beq lbl_801CC6FC /* 801CC6F4 001C9634 80 7F 00 04 */ lwz r3, 4(r31) -/* 801CC6F8 001C9638 48 10 1E 51 */ bl JKRHeap_NS_free_X1_ +/* 801CC6F8 001C9638 48 10 1E 51 */ bl free__7JKRHeapFPv lbl_801CC6FC: /* 801CC6FC 001C963C 7F 43 D3 78 */ mr r3, r26 -/* 801CC700 001C9640 48 10 26 3D */ bl __dl +/* 801CC700 001C9640 48 10 26 3D */ bl __dl__FPv /* 801CC704 001C9644 7F BA EB 78 */ mr r26, r29 lbl_801CC708: /* 801CC708 001C9648 28 1A 00 00 */ cmplwi r26, 0 @@ -6745,12 +6745,12 @@ lbl_801CC7C8: /* 801CC7D4 001C9714 28 04 00 00 */ cmplwi r4, 0 /* 801CC7D8 001C9718 41 82 00 0C */ beq lbl_801CC7E4 /* 801CC7DC 001C971C 80 7C 00 04 */ lwz r3, 4(r28) -/* 801CC7E0 001C9720 48 10 1D 69 */ bl JKRHeap_NS_free_X1_ +/* 801CC7E0 001C9720 48 10 1D 69 */ bl free__7JKRHeapFPv lbl_801CC7E4: /* 801CC7E4 001C9724 28 1E 00 00 */ cmplwi r30, 0 /* 801CC7E8 001C9728 41 82 00 0C */ beq lbl_801CC7F4 /* 801CC7EC 001C972C 7F C3 F3 78 */ mr r3, r30 -/* 801CC7F0 001C9730 48 10 25 4D */ bl __dl +/* 801CC7F0 001C9730 48 10 25 4D */ bl __dl__FPv lbl_801CC7F4: /* 801CC7F4 001C9734 28 1D 00 00 */ cmplwi r29, 0 /* 801CC7F8 001C9738 41 82 00 3C */ beq lbl_801CC834 @@ -6767,10 +6767,10 @@ lbl_801CC7F4: /* 801CC81C 001C975C 38 C0 00 11 */ li r6, 0x11 /* 801CC820 001C9760 48 19 54 C9 */ bl func_80361CE8 /* 801CC824 001C9764 7F C3 F3 78 */ mr r3, r30 -/* 801CC828 001C9768 48 10 25 15 */ bl __dl +/* 801CC828 001C9768 48 10 25 15 */ bl __dl__FPv lbl_801CC82C: /* 801CC82C 001C976C 7F A3 EB 78 */ mr r3, r29 -/* 801CC830 001C9770 48 10 25 0D */ bl __dl +/* 801CC830 001C9770 48 10 25 0D */ bl __dl__FPv lbl_801CC834: /* 801CC834 001C9774 7F FD FB 78 */ mr r29, r31 lbl_801CC838: @@ -8104,7 +8104,7 @@ dMf_HIO_c_NS_dtor: /* 801CDA4C 001CA98C 90 1F 00 00 */ stw r0, 0(r31) /* 801CDA50 001CA990 7C 80 07 35 */ extsh. r0, r4 /* 801CDA54 001CA994 40 81 00 08 */ ble lbl_801CDA5C -/* 801CDA58 001CA998 48 10 12 E5 */ bl __dl +/* 801CDA58 001CA998 48 10 12 E5 */ bl __dl__FPv lbl_801CDA5C: /* 801CDA5C 001CA99C 7F E3 FB 78 */ mr r3, r31 /* 801CDA60 001CA9A0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 04c216a46c..65b28ab347 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -242,7 +242,7 @@ lbl_801CF6EC: /* 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 -/* 801CF918 001CC858 48 0F F3 35 */ bl __nw +/* 801CF918 001CC858 48 0F F3 35 */ bl __nw__FUl /* 801CF91C 001CC85C 7C 60 1B 79 */ or. r0, r3, r3 /* 801CF920 001CC860 41 82 00 0C */ beq lbl_801CF92C /* 801CF924 001CC864 48 12 8B 75 */ bl J2DScreen @@ -258,7 +258,7 @@ lbl_801CF92C: /* 801CF948 001CC888 80 7F 0C 98 */ lwz r3, 0xc98(r31) /* 801CF94C 001CC88C 48 08 57 9D */ bl dPaneClass_showNullPane /* 801CF950 001CC890 38 60 01 18 */ li r3, 0x118 -/* 801CF954 001CC894 48 0F F2 F9 */ bl __nw +/* 801CF954 001CC894 48 0F F2 F9 */ bl __nw__FUl /* 801CF958 001CC898 7C 60 1B 79 */ or. r0, r3, r3 /* 801CF95C 001CC89C 41 82 00 0C */ beq lbl_801CF968 /* 801CF960 001CC8A0 48 12 8B 39 */ bl J2DScreen @@ -290,7 +290,7 @@ lbl_801CF968: /* 801CF9C4 001CC904 C0 02 A7 D0 */ lfs f0, lbl_804541D0-_SDA2_BASE_(r2) /* 801CF9C8 001CC908 D0 1F 0F AC */ stfs f0, 0xfac(r31) /* 801CF9CC 001CC90C 38 60 00 2C */ li r3, 0x2c -/* 801CF9D0 001CC910 48 0F F2 7D */ bl __nw +/* 801CF9D0 001CC910 48 0F F2 7D */ bl __nw__FUl /* 801CF9D4 001CC914 7C 60 1B 79 */ or. r0, r3, r3 /* 801CF9D8 001CC918 41 82 00 24 */ beq lbl_801CF9FC /* 801CF9DC 001CC91C 80 9F 0C 9C */ lwz r4, 0xc9c(r31) @@ -304,7 +304,7 @@ lbl_801CF968: lbl_801CF9FC: /* 801CF9FC 001CC93C 90 1F 0C A0 */ stw r0, 0xca0(r31) /* 801CFA00 001CC940 38 60 00 6C */ li r3, 0x6c -/* 801CFA04 001CC944 48 0F F2 49 */ bl __nw +/* 801CFA04 001CC944 48 0F F2 49 */ bl __nw__FUl /* 801CFA08 001CC948 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFA0C 001CC94C 41 82 00 28 */ beq lbl_801CFA34 /* 801CFA10 001CC950 80 9F 0C 9C */ lwz r4, 0xc9c(r31) @@ -319,7 +319,7 @@ lbl_801CF9FC: lbl_801CFA34: /* 801CFA34 001CC974 90 1F 0C A4 */ stw r0, 0xca4(r31) /* 801CFA38 001CC978 38 60 00 6C */ li r3, 0x6c -/* 801CFA3C 001CC97C 48 0F F2 11 */ bl __nw +/* 801CFA3C 001CC97C 48 0F F2 11 */ bl __nw__FUl /* 801CFA40 001CC980 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFA44 001CC984 41 82 00 28 */ beq lbl_801CFA6C /* 801CFA48 001CC988 80 9F 0C 9C */ lwz r4, 0xc9c(r31) @@ -334,7 +334,7 @@ lbl_801CFA34: lbl_801CFA6C: /* 801CFA6C 001CC9AC 90 1F 0C A8 */ stw r0, 0xca8(r31) /* 801CFA70 001CC9B0 38 60 00 2C */ li r3, 0x2c -/* 801CFA74 001CC9B4 48 0F F1 D9 */ bl __nw +/* 801CFA74 001CC9B4 48 0F F1 D9 */ bl __nw__FUl /* 801CFA78 001CC9B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFA7C 001CC9BC 41 82 00 10 */ beq lbl_801CFA8C /* 801CFA80 001CC9C0 38 80 00 01 */ li r4, 1 @@ -356,7 +356,7 @@ lbl_801CFA8C: /* 801CFABC 001CC9FC 4E 80 04 21 */ bctrl /* 801CFAC0 001CCA00 7C 7C 1B 78 */ mr r28, r3 /* 801CFAC4 001CCA04 38 60 01 50 */ li r3, 0x150 -/* 801CFAC8 001CCA08 48 0F F1 85 */ bl __nw +/* 801CFAC8 001CCA08 48 0F F1 85 */ bl __nw__FUl /* 801CFACC 001CCA0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFAD0 001CCA10 41 82 00 10 */ beq lbl_801CFAE0 /* 801CFAD4 001CCA14 7F 84 E3 78 */ mr r4, r28 @@ -392,7 +392,7 @@ lbl_801CFAE0: /* 801CFB48 001CCA88 7D 89 03 A6 */ mtctr r12 /* 801CFB4C 001CCA8C 4E 80 04 21 */ bctrl /* 801CFB50 001CCA90 38 60 01 18 */ li r3, 0x118 -/* 801CFB54 001CCA94 48 0F F0 F9 */ bl __nw +/* 801CFB54 001CCA94 48 0F F0 F9 */ bl __nw__FUl /* 801CFB58 001CCA98 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFB5C 001CCA9C 41 82 00 0C */ beq lbl_801CFB68 /* 801CFB60 001CCAA0 48 12 89 39 */ bl J2DScreen @@ -409,7 +409,7 @@ lbl_801CFB68: /* 801CFB88 001CCAC8 80 7F 0C D8 */ lwz r3, 0xcd8(r31) /* 801CFB8C 001CCACC 48 08 55 5D */ bl dPaneClass_showNullPane /* 801CFB90 001CCAD0 38 60 00 6C */ li r3, 0x6c -/* 801CFB94 001CCAD4 48 0F F0 B9 */ bl __nw +/* 801CFB94 001CCAD4 48 0F F0 B9 */ bl __nw__FUl /* 801CFB98 001CCAD8 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFB9C 001CCADC 41 82 00 24 */ beq lbl_801CFBC0 /* 801CFBA0 001CCAE0 80 9F 0C D8 */ lwz r4, 0xcd8(r31) @@ -650,7 +650,7 @@ lbl_801CFED4: /* 801CFF08 001CCE48 7F E0 07 35 */ extsh. r0, r31 /* 801CFF0C 001CCE4C 40 81 00 0C */ ble lbl_801CFF18 /* 801CFF10 001CCE50 7F C3 F3 78 */ mr r3, r30 -/* 801CFF14 001CCE54 48 0F EE 29 */ bl __dl +/* 801CFF14 001CCE54 48 0F EE 29 */ bl __dl__FPv lbl_801CFF18: /* 801CFF18 001CCE58 7F C3 F3 78 */ mr r3, r30 /* 801CFF1C 001CCE5C 39 61 00 20 */ addi r11, r1, 0x20 @@ -1287,7 +1287,7 @@ dMenu_Fmap2DBack_c_NS_setRegionTexData: /* 801D089C 001CD7DC C3 42 A8 00 */ lfs f26, lbl_80454200-_SDA2_BASE_(r2) lbl_801D08A0: /* 801D08A0 001CD7E0 38 60 01 50 */ li r3, 0x150 -/* 801D08A4 001CD7E4 48 0F E3 A9 */ bl __nw +/* 801D08A4 001CD7E4 48 0F E3 A9 */ bl __nw__FUl /* 801D08A8 001CD7E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801D08AC 001CD7EC 41 82 00 10 */ beq lbl_801D08BC /* 801D08B0 001CD7F0 7F A4 EB 78 */ mr r4, r29 @@ -1841,7 +1841,7 @@ dMenu_Fmap2DBack_c_NS_setSpotPane: /* 801D10B4 001CDFF4 28 00 00 00 */ cmplwi r0, 0 /* 801D10B8 001CDFF8 40 82 00 24 */ bne lbl_801D10DC /* 801D10BC 001CDFFC 38 60 01 50 */ li r3, 0x150 -/* 801D10C0 001CE000 48 0F DB 8D */ bl __nw +/* 801D10C0 001CE000 48 0F DB 8D */ bl __nw__FUl /* 801D10C4 001CE004 7C 60 1B 79 */ or. r0, r3, r3 /* 801D10C8 001CE008 41 82 00 10 */ beq lbl_801D10D8 /* 801D10CC 001CE00C 7F E4 FB 78 */ mr r4, r31 @@ -7028,7 +7028,7 @@ dMenu_Fmap2DTop_c: /* 801D5C1C 001D2B5C 90 03 00 70 */ stw r0, 0x70(r3) /* 801D5C20 001D2B60 90 03 00 6C */ stw r0, 0x6c(r3) /* 801D5C24 001D2B64 38 60 01 18 */ li r3, 0x118 -/* 801D5C28 001D2B68 48 0F 90 25 */ bl __nw +/* 801D5C28 001D2B68 48 0F 90 25 */ bl __nw__FUl /* 801D5C2C 001D2B6C 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5C30 001D2B70 41 82 00 0C */ beq lbl_801D5C3C /* 801D5C34 001D2B74 48 12 28 65 */ bl J2DScreen @@ -7047,7 +7047,7 @@ lbl_801D5C3C: /* 801D5C64 001D2BA4 80 7F 00 08 */ lwz r3, 8(r31) /* 801D5C68 001D2BA8 48 07 F4 81 */ bl dPaneClass_showNullPane /* 801D5C6C 001D2BAC 38 60 00 2C */ li r3, 0x2c -/* 801D5C70 001D2BB0 48 0F 8F DD */ bl __nw +/* 801D5C70 001D2BB0 48 0F 8F DD */ bl __nw__FUl /* 801D5C74 001D2BB4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5C78 001D2BB8 41 82 00 24 */ beq lbl_801D5C9C /* 801D5C7C 001D2BBC 80 9F 00 08 */ lwz r4, 8(r31) @@ -7061,7 +7061,7 @@ lbl_801D5C3C: lbl_801D5C9C: /* 801D5C9C 001D2BDC 90 1F 00 0C */ stw r0, 0xc(r31) /* 801D5CA0 001D2BE0 38 60 00 1C */ li r3, 0x1c -/* 801D5CA4 001D2BE4 48 0F 8F A9 */ bl __nw +/* 801D5CA4 001D2BE4 48 0F 8F A9 */ bl __nw__FUl /* 801D5CA8 001D2BE8 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5CAC 001D2BEC 41 82 00 28 */ beq lbl_801D5CD4 /* 801D5CB0 001D2BF0 80 9F 00 08 */ lwz r4, 8(r31) @@ -7076,7 +7076,7 @@ lbl_801D5C9C: lbl_801D5CD4: /* 801D5CD4 001D2C14 90 1F 00 38 */ stw r0, 0x38(r31) /* 801D5CD8 001D2C18 38 60 00 1C */ li r3, 0x1c -/* 801D5CDC 001D2C1C 48 0F 8F 71 */ bl __nw +/* 801D5CDC 001D2C1C 48 0F 8F 71 */ bl __nw__FUl /* 801D5CE0 001D2C20 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5CE4 001D2C24 41 82 00 28 */ beq lbl_801D5D0C /* 801D5CE8 001D2C28 80 9F 00 08 */ lwz r4, 8(r31) @@ -7091,7 +7091,7 @@ lbl_801D5CD4: lbl_801D5D0C: /* 801D5D0C 001D2C4C 90 1F 00 3C */ stw r0, 0x3c(r31) /* 801D5D10 001D2C50 38 60 00 1C */ li r3, 0x1c -/* 801D5D14 001D2C54 48 0F 8F 39 */ bl __nw +/* 801D5D14 001D2C54 48 0F 8F 39 */ bl __nw__FUl /* 801D5D18 001D2C58 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5D1C 001D2C5C 41 82 00 28 */ beq lbl_801D5D44 /* 801D5D20 001D2C60 80 9F 00 08 */ lwz r4, 8(r31) @@ -7106,7 +7106,7 @@ lbl_801D5D0C: lbl_801D5D44: /* 801D5D44 001D2C84 90 1F 00 40 */ stw r0, 0x40(r31) /* 801D5D48 001D2C88 38 60 00 1C */ li r3, 0x1c -/* 801D5D4C 001D2C8C 48 0F 8F 01 */ bl __nw +/* 801D5D4C 001D2C8C 48 0F 8F 01 */ bl __nw__FUl /* 801D5D50 001D2C90 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5D54 001D2C94 41 82 00 28 */ beq lbl_801D5D7C /* 801D5D58 001D2C98 80 9F 00 08 */ lwz r4, 8(r31) @@ -7121,7 +7121,7 @@ lbl_801D5D44: lbl_801D5D7C: /* 801D5D7C 001D2CBC 90 1F 00 44 */ stw r0, 0x44(r31) /* 801D5D80 001D2CC0 38 60 00 1C */ li r3, 0x1c -/* 801D5D84 001D2CC4 48 0F 8E C9 */ bl __nw +/* 801D5D84 001D2CC4 48 0F 8E C9 */ bl __nw__FUl /* 801D5D88 001D2CC8 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5D8C 001D2CCC 41 82 00 28 */ beq lbl_801D5DB4 /* 801D5D90 001D2CD0 80 9F 00 08 */ lwz r4, 8(r31) @@ -7139,7 +7139,7 @@ lbl_801D5DB4: /* 801D5DBC 001D2CFC C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) /* 801D5DC0 001D2D00 48 07 FA 11 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 801D5DC4 001D2D04 38 60 00 1C */ li r3, 0x1c -/* 801D5DC8 001D2D08 48 0F 8E 85 */ bl __nw +/* 801D5DC8 001D2D08 48 0F 8E 85 */ bl __nw__FUl /* 801D5DCC 001D2D0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5DD0 001D2D10 41 82 00 24 */ beq lbl_801D5DF4 /* 801D5DD4 001D2D14 80 9F 00 08 */ lwz r4, 8(r31) @@ -7156,7 +7156,7 @@ lbl_801D5DF4: /* 801D5DFC 001D2D3C C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) /* 801D5E00 001D2D40 48 07 F9 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 801D5E04 001D2D44 38 60 00 6C */ li r3, 0x6c -/* 801D5E08 001D2D48 48 0F 8E 45 */ bl __nw +/* 801D5E08 001D2D48 48 0F 8E 45 */ bl __nw__FUl /* 801D5E0C 001D2D4C 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5E10 001D2D50 41 82 00 24 */ beq lbl_801D5E34 /* 801D5E14 001D2D54 80 9F 00 08 */ lwz r4, 8(r31) @@ -7170,7 +7170,7 @@ lbl_801D5DF4: lbl_801D5E34: /* 801D5E34 001D2D74 90 1F 00 58 */ stw r0, 0x58(r31) /* 801D5E38 001D2D78 38 60 00 6C */ li r3, 0x6c -/* 801D5E3C 001D2D7C 48 0F 8E 11 */ bl __nw +/* 801D5E3C 001D2D7C 48 0F 8E 11 */ bl __nw__FUl /* 801D5E40 001D2D80 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5E44 001D2D84 41 82 00 28 */ beq lbl_801D5E6C /* 801D5E48 001D2D88 80 9F 00 08 */ lwz r4, 8(r31) @@ -7185,7 +7185,7 @@ lbl_801D5E34: lbl_801D5E6C: /* 801D5E6C 001D2DAC 90 1F 00 5C */ stw r0, 0x5c(r31) /* 801D5E70 001D2DB0 38 60 00 6C */ li r3, 0x6c -/* 801D5E74 001D2DB4 48 0F 8D D9 */ bl __nw +/* 801D5E74 001D2DB4 48 0F 8D D9 */ bl __nw__FUl /* 801D5E78 001D2DB8 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5E7C 001D2DBC 41 82 00 28 */ beq lbl_801D5EA4 /* 801D5E80 001D2DC0 80 9F 00 08 */ lwz r4, 8(r31) @@ -7200,7 +7200,7 @@ lbl_801D5E6C: lbl_801D5EA4: /* 801D5EA4 001D2DE4 90 1F 00 18 */ stw r0, 0x18(r31) /* 801D5EA8 001D2DE8 38 60 00 6C */ li r3, 0x6c -/* 801D5EAC 001D2DEC 48 0F 8D A1 */ bl __nw +/* 801D5EAC 001D2DEC 48 0F 8D A1 */ bl __nw__FUl /* 801D5EB0 001D2DF0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5EB4 001D2DF4 41 82 00 28 */ beq lbl_801D5EDC /* 801D5EB8 001D2DF8 80 9F 00 08 */ lwz r4, 8(r31) @@ -7215,7 +7215,7 @@ lbl_801D5EA4: lbl_801D5EDC: /* 801D5EDC 001D2E1C 90 1F 00 1C */ stw r0, 0x1c(r31) /* 801D5EE0 001D2E20 38 60 00 6C */ li r3, 0x6c -/* 801D5EE4 001D2E24 48 0F 8D 69 */ bl __nw +/* 801D5EE4 001D2E24 48 0F 8D 69 */ bl __nw__FUl /* 801D5EE8 001D2E28 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5EEC 001D2E2C 41 82 00 28 */ beq lbl_801D5F14 /* 801D5EF0 001D2E30 80 9F 00 08 */ lwz r4, 8(r31) @@ -7230,7 +7230,7 @@ lbl_801D5EDC: lbl_801D5F14: /* 801D5F14 001D2E54 90 1F 00 20 */ stw r0, 0x20(r31) /* 801D5F18 001D2E58 38 60 00 6C */ li r3, 0x6c -/* 801D5F1C 001D2E5C 48 0F 8D 31 */ bl __nw +/* 801D5F1C 001D2E5C 48 0F 8D 31 */ bl __nw__FUl /* 801D5F20 001D2E60 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5F24 001D2E64 41 82 00 28 */ beq lbl_801D5F4C /* 801D5F28 001D2E68 80 9F 00 08 */ lwz r4, 8(r31) @@ -7245,7 +7245,7 @@ lbl_801D5F14: lbl_801D5F4C: /* 801D5F4C 001D2E8C 90 1F 00 24 */ stw r0, 0x24(r31) /* 801D5F50 001D2E90 38 60 00 6C */ li r3, 0x6c -/* 801D5F54 001D2E94 48 0F 8C F9 */ bl __nw +/* 801D5F54 001D2E94 48 0F 8C F9 */ bl __nw__FUl /* 801D5F58 001D2E98 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5F5C 001D2E9C 41 82 00 28 */ beq lbl_801D5F84 /* 801D5F60 001D2EA0 80 9F 00 08 */ lwz r4, 8(r31) @@ -7260,7 +7260,7 @@ lbl_801D5F4C: lbl_801D5F84: /* 801D5F84 001D2EC4 90 1F 00 28 */ stw r0, 0x28(r31) /* 801D5F88 001D2EC8 38 60 00 6C */ li r3, 0x6c -/* 801D5F8C 001D2ECC 48 0F 8C C1 */ bl __nw +/* 801D5F8C 001D2ECC 48 0F 8C C1 */ bl __nw__FUl /* 801D5F90 001D2ED0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5F94 001D2ED4 41 82 00 28 */ beq lbl_801D5FBC /* 801D5F98 001D2ED8 80 9F 00 08 */ lwz r4, 8(r31) @@ -7293,7 +7293,7 @@ lbl_801D5FBC: /* 801D6000 001D2F40 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) /* 801D6004 001D2F44 48 07 F7 CD */ bl CPaneMgrAlpha_NS_setAlphaRate /* 801D6008 001D2F48 38 60 00 6C */ li r3, 0x6c -/* 801D600C 001D2F4C 48 0F 8C 41 */ bl __nw +/* 801D600C 001D2F4C 48 0F 8C 41 */ bl __nw__FUl /* 801D6010 001D2F50 7C 60 1B 79 */ or. r0, r3, r3 /* 801D6014 001D2F54 41 82 00 24 */ beq lbl_801D6038 /* 801D6018 001D2F58 80 9F 00 08 */ lwz r4, 8(r31) @@ -7307,7 +7307,7 @@ lbl_801D5FBC: lbl_801D6038: /* 801D6038 001D2F78 90 1F 00 50 */ stw r0, 0x50(r31) /* 801D603C 001D2F7C 38 60 00 6C */ li r3, 0x6c -/* 801D6040 001D2F80 48 0F 8C 0D */ bl __nw +/* 801D6040 001D2F80 48 0F 8C 0D */ bl __nw__FUl /* 801D6044 001D2F84 7C 60 1B 79 */ or. r0, r3, r3 /* 801D6048 001D2F88 41 82 00 28 */ beq lbl_801D6070 /* 801D604C 001D2F8C 80 9F 00 08 */ lwz r4, 8(r31) @@ -7332,7 +7332,7 @@ lbl_801D6070: /* 801D6094 001D2FD4 48 07 F5 75 */ bl CPaneMgrAlpha_NS_hide lbl_801D6098: /* 801D6098 001D2FD8 38 60 00 6C */ li r3, 0x6c -/* 801D609C 001D2FDC 48 0F 8B B1 */ bl __nw +/* 801D609C 001D2FDC 48 0F 8B B1 */ bl __nw__FUl /* 801D60A0 001D2FE0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D60A4 001D2FE4 41 82 00 24 */ beq lbl_801D60C8 /* 801D60A8 001D2FE8 80 9F 00 08 */ lwz r4, 8(r31) @@ -7973,7 +7973,7 @@ lbl_801D6A10: /* 801D6A18 001D3958 7F C0 07 35 */ extsh. r0, r30 /* 801D6A1C 001D395C 40 81 00 0C */ ble lbl_801D6A28 /* 801D6A20 001D3960 7F E3 FB 78 */ mr r3, r31 -/* 801D6A24 001D3964 48 0F 83 19 */ bl __dl +/* 801D6A24 001D3964 48 0F 83 19 */ bl __dl__FPv lbl_801D6A28: /* 801D6A28 001D3968 7F E3 FB 78 */ mr r3, r31 /* 801D6A2C 001D396C 39 61 00 20 */ addi r11, r1, 0x20 @@ -8854,7 +8854,7 @@ dMenu_Fmap2DTop_c_NS_createExplain: /* 801D766C 001D45AC 4B E3 7B 61 */ bl mDoExt_setCurrentHeap /* 801D7670 001D45B0 7C 7F 1B 78 */ mr r31, r3 /* 801D7674 001D45B4 38 60 00 68 */ li r3, 0x68 -/* 801D7678 001D45B8 48 0F 75 D5 */ bl __nw +/* 801D7678 001D45B8 48 0F 75 D5 */ bl __nw__FUl /* 801D767C 001D45BC 7C 60 1B 79 */ or. r0, r3, r3 /* 801D7680 001D45C0 41 82 00 1C */ beq lbl_801D769C /* 801D7684 001D45C4 7F C4 F3 78 */ mr r4, r30 diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 493bd6996f..83bb6b5b8a 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -49,7 +49,7 @@ dMenu_Insect_c: /* 801D81B8 001D50F8 4E 80 04 21 */ bctrl /* 801D81BC 001D50FC 7C 7E 1B 78 */ mr r30, r3 /* 801D81C0 001D5100 38 60 01 50 */ li r3, 0x150 -/* 801D81C4 001D5104 48 0F 6A 89 */ bl __nw +/* 801D81C4 001D5104 48 0F 6A 89 */ bl __nw__FUl /* 801D81C8 001D5108 7C 60 1B 79 */ or. r0, r3, r3 /* 801D81CC 001D510C 41 82 00 10 */ beq lbl_801D81DC /* 801D81D0 001D5110 7F C4 F3 78 */ mr r4, r30 @@ -81,7 +81,7 @@ lbl_801D81DC: /* 801D8234 001D5174 38 00 00 00 */ li r0, 0 /* 801D8238 001D5178 98 1F 00 FC */ stb r0, 0xfc(r31) /* 801D823C 001D517C 38 60 00 B8 */ li r3, 0xb8 -/* 801D8240 001D5180 48 0F 6A 0D */ bl __nw +/* 801D8240 001D5180 48 0F 6A 0D */ bl __nw__FUl /* 801D8244 001D5184 7C 60 1B 79 */ or. r0, r3, r3 /* 801D8248 001D5188 41 82 00 18 */ beq lbl_801D8260 /* 801D824C 001D518C 38 80 00 02 */ li r4, 2 @@ -109,7 +109,7 @@ lbl_801D8260: /* 801D82A0 001D51E0 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 801D82A4 001D51E4 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801D82A8 001D51E8 38 60 01 18 */ li r3, 0x118 -/* 801D82AC 001D51EC 48 0F 69 A1 */ bl __nw +/* 801D82AC 001D51EC 48 0F 69 A1 */ bl __nw__FUl /* 801D82B0 001D51F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D82B4 001D51F4 41 82 00 0C */ beq lbl_801D82C0 /* 801D82B8 001D51F8 48 06 0D FD */ bl dMsgScrn3Select_c @@ -119,7 +119,7 @@ lbl_801D82C0: /* 801D82C4 001D5204 80 7F 00 04 */ lwz r3, 4(r31) /* 801D82C8 001D5208 38 80 0C 00 */ li r4, 0xc00 /* 801D82CC 001D520C 38 A0 00 20 */ li r5, 0x20 -/* 801D82D0 001D5210 48 0F 62 05 */ bl JKRHeap_NS_alloc_X1_ +/* 801D82D0 001D5210 48 0F 62 05 */ bl alloc__7JKRHeapFUli /* 801D82D4 001D5214 90 7F 00 EC */ stw r3, 0xec(r31) /* 801D82D8 001D5218 7F E3 FB 78 */ mr r3, r31 /* 801D82DC 001D521C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -174,7 +174,7 @@ lbl_801D8390: /* 801D8394 001D52D4 90 1E 00 1C */ stw r0, 0x1c(r30) /* 801D8398 001D52D8 80 7E 00 04 */ lwz r3, 4(r30) /* 801D839C 001D52DC 80 9E 00 EC */ lwz r4, 0xec(r30) -/* 801D83A0 001D52E0 48 0F 61 A9 */ bl JKRHeap_NS_free_X1_ +/* 801D83A0 001D52E0 48 0F 61 A9 */ bl free__7JKRHeapFPv /* 801D83A4 001D52E4 38 00 00 00 */ li r0, 0 /* 801D83A8 001D52E8 90 1E 00 EC */ stw r0, 0xec(r30) /* 801D83AC 001D52EC 80 7E 00 E8 */ lwz r3, 0xe8(r30) @@ -358,7 +358,7 @@ lbl_801D8610: /* 801D862C 001D556C 7F E0 07 35 */ extsh. r0, r31 /* 801D8630 001D5570 40 81 00 0C */ ble lbl_801D863C /* 801D8634 001D5574 7F C3 F3 78 */ mr r3, r30 -/* 801D8638 001D5578 48 0F 67 05 */ bl __dl +/* 801D8638 001D5578 48 0F 67 05 */ bl __dl__FPv lbl_801D863C: /* 801D863C 001D557C 7F C3 F3 78 */ mr r3, r30 /* 801D8640 001D5580 39 61 00 20 */ addi r11, r1, 0x20 @@ -376,7 +376,7 @@ dMenu_Insect_c_NS__create: /* 801D8664 001D55A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D8668 001D55A8 7C 7F 1B 78 */ mr r31, r3 /* 801D866C 001D55AC 38 60 00 2C */ li r3, 0x2c -/* 801D8670 001D55B0 48 0F 65 DD */ bl __nw +/* 801D8670 001D55B0 48 0F 65 DD */ bl __nw__FUl /* 801D8674 001D55B4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D8678 001D55B8 41 82 00 0C */ beq lbl_801D8684 /* 801D867C 001D55BC 48 07 15 A5 */ bl dMsgString_c @@ -1457,7 +1457,7 @@ dMenu_Insect_c_NS_screenSetBase: /* 801D9654 001D6594 48 18 8B 81 */ bl _savegpr_27 /* 801D9658 001D6598 7C 7D 1B 78 */ mr r29, r3 /* 801D965C 001D659C 38 60 01 18 */ li r3, 0x118 -/* 801D9660 001D65A0 48 0F 55 ED */ bl __nw +/* 801D9660 001D65A0 48 0F 55 ED */ bl __nw__FUl /* 801D9664 001D65A4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9668 001D65A8 41 82 00 0C */ beq lbl_801D9674 /* 801D966C 001D65AC 48 11 EE 2D */ bl J2DScreen @@ -1474,7 +1474,7 @@ lbl_801D9674: /* 801D9694 001D65D4 80 7D 00 20 */ lwz r3, 0x20(r29) /* 801D9698 001D65D8 48 07 BA 51 */ bl dPaneClass_showNullPane /* 801D969C 001D65DC 38 60 00 6C */ li r3, 0x6c -/* 801D96A0 001D65E0 48 0F 55 AD */ bl __nw +/* 801D96A0 001D65E0 48 0F 55 AD */ bl __nw__FUl /* 801D96A4 001D65E4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D96A8 001D65E8 41 82 00 24 */ beq lbl_801D96CC /* 801D96AC 001D65EC 80 9D 00 20 */ lwz r4, 0x20(r29) @@ -1497,7 +1497,7 @@ lbl_801D96CC: /* 801D96EC 001D662C 3B E3 66 90 */ addi r31, r3, lbl_80396690@l lbl_801D96F0: /* 801D96F0 001D6630 38 60 00 6C */ li r3, 0x6c -/* 801D96F4 001D6634 48 0F 55 59 */ bl __nw +/* 801D96F4 001D6634 48 0F 55 59 */ bl __nw__FUl /* 801D96F8 001D6638 7C 64 1B 79 */ or. r4, r3, r3 /* 801D96FC 001D663C 41 82 00 24 */ beq lbl_801D9720 /* 801D9700 001D6640 80 9D 00 20 */ lwz r4, 0x20(r29) @@ -1641,7 +1641,7 @@ dMenu_Insect_c_NS_screenSetExplain: /* 801D9900 001D6840 93 C1 00 08 */ stw r30, 8(r1) /* 801D9904 001D6844 7C 7F 1B 78 */ mr r31, r3 /* 801D9908 001D6848 38 60 01 18 */ li r3, 0x118 -/* 801D990C 001D684C 48 0F 53 41 */ bl __nw +/* 801D990C 001D684C 48 0F 53 41 */ bl __nw__FUl /* 801D9910 001D6850 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9914 001D6854 41 82 00 0C */ beq lbl_801D9920 /* 801D9918 001D6858 48 11 EB 81 */ bl J2DScreen @@ -1658,7 +1658,7 @@ lbl_801D9920: /* 801D9940 001D6880 80 7F 00 24 */ lwz r3, 0x24(r31) /* 801D9944 001D6884 48 07 B7 A5 */ bl dPaneClass_showNullPane /* 801D9948 001D6888 38 60 00 6C */ li r3, 0x6c -/* 801D994C 001D688C 48 0F 53 01 */ bl __nw +/* 801D994C 001D688C 48 0F 53 01 */ bl __nw__FUl /* 801D9950 001D6890 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9954 001D6894 41 82 00 24 */ beq lbl_801D9978 /* 801D9958 001D6898 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -1675,7 +1675,7 @@ lbl_801D9978: /* 801D9980 001D68C0 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) /* 801D9984 001D68C4 48 07 BE 4D */ bl CPaneMgrAlpha_NS_setAlphaRate /* 801D9988 001D68C8 38 60 00 6C */ li r3, 0x6c -/* 801D998C 001D68CC 48 0F 52 C1 */ bl __nw +/* 801D998C 001D68CC 48 0F 52 C1 */ bl __nw__FUl /* 801D9990 001D68D0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9994 001D68D4 41 82 00 24 */ beq lbl_801D99B8 /* 801D9998 001D68D8 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -1689,7 +1689,7 @@ lbl_801D9978: lbl_801D99B8: /* 801D99B8 001D68F8 90 1F 00 D0 */ stw r0, 0xd0(r31) /* 801D99BC 001D68FC 38 60 00 6C */ li r3, 0x6c -/* 801D99C0 001D6900 48 0F 52 8D */ bl __nw +/* 801D99C0 001D6900 48 0F 52 8D */ bl __nw__FUl /* 801D99C4 001D6904 7C 60 1B 79 */ or. r0, r3, r3 /* 801D99C8 001D6908 41 82 00 28 */ beq lbl_801D99F0 /* 801D99CC 001D690C 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -1710,7 +1710,7 @@ lbl_801D99F0: /* 801D9A04 001D6944 48 07 BC 05 */ bl CPaneMgrAlpha_NS_hide lbl_801D9A08: /* 801D9A08 001D6948 38 60 00 6C */ li r3, 0x6c -/* 801D9A0C 001D694C 48 0F 52 41 */ bl __nw +/* 801D9A0C 001D694C 48 0F 52 41 */ bl __nw__FUl /* 801D9A10 001D6950 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9A14 001D6954 41 82 00 28 */ beq lbl_801D9A3C /* 801D9A18 001D6958 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -1834,7 +1834,7 @@ dMenu_Insect_c_NS_screenSetDoIcon: /* 801D9BE0 001D6B20 48 18 85 E9 */ bl func_803621C8 /* 801D9BE4 001D6B24 7C 7F 1B 78 */ mr r31, r3 /* 801D9BE8 001D6B28 38 60 01 18 */ li r3, 0x118 -/* 801D9BEC 001D6B2C 48 0F 50 61 */ bl __nw +/* 801D9BEC 001D6B2C 48 0F 50 61 */ bl __nw__FUl /* 801D9BF0 001D6B30 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9BF4 001D6B34 41 82 00 0C */ beq lbl_801D9C00 /* 801D9BF8 001D6B38 48 11 E8 A1 */ bl J2DScreen diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index 204968d30f..7e388ccc5d 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -398,7 +398,7 @@ lbl_801DD324: /* 801DD340 001DA280 7F C0 07 35 */ extsh. r0, r30 /* 801DD344 001DA284 40 81 00 0C */ ble lbl_801DD350 /* 801DD348 001DA288 7F E3 FB 78 */ mr r3, r31 -/* 801DD34C 001DA28C 48 0F 19 F1 */ bl __dl +/* 801DD34C 001DA28C 48 0F 19 F1 */ bl __dl__FPv lbl_801DD350: /* 801DD350 001DA290 7F E3 FB 78 */ mr r3, r31 /* 801DD354 001DA294 39 61 00 20 */ addi r11, r1, 0x20 @@ -416,7 +416,7 @@ dMenu_Letter_c_NS__create: /* 801DD378 001DA2B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801DD37C 001DA2BC 7C 7F 1B 78 */ mr r31, r3 /* 801DD380 001DA2C0 38 60 00 B8 */ li r3, 0xb8 -/* 801DD384 001DA2C4 48 0F 18 C9 */ bl __nw +/* 801DD384 001DA2C4 48 0F 18 C9 */ bl __nw__FUl /* 801DD388 001DA2C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801DD38C 001DA2CC 41 82 00 18 */ beq lbl_801DD3A4 /* 801DD390 001DA2D0 38 80 00 02 */ li r4, 2 @@ -444,7 +444,7 @@ lbl_801DD3A4: /* 801DD3E4 001DA324 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 801DD3E8 001DA328 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801DD3EC 001DA32C 38 60 00 2C */ li r3, 0x2c -/* 801DD3F0 001DA330 48 0F 18 5D */ bl __nw +/* 801DD3F0 001DA330 48 0F 18 5D */ bl __nw__FUl /* 801DD3F4 001DA334 7C 60 1B 79 */ or. r0, r3, r3 /* 801DD3F8 001DA338 41 82 00 0C */ beq lbl_801DD404 /* 801DD3FC 001DA33C 48 06 C8 25 */ bl dMsgString_c @@ -452,7 +452,7 @@ lbl_801DD3A4: lbl_801DD404: /* 801DD404 001DA344 90 1F 03 10 */ stw r0, 0x310(r31) /* 801DD408 001DA348 38 60 00 24 */ li r3, 0x24 -/* 801DD40C 001DA34C 48 0F 18 41 */ bl __nw +/* 801DD40C 001DA34C 48 0F 18 41 */ bl __nw__FUl /* 801DD410 001DA350 7C 60 1B 79 */ or. r0, r3, r3 /* 801DD414 001DA354 41 82 00 0C */ beq lbl_801DD420 /* 801DD418 001DA358 48 05 E5 9D */ bl dMsgScrnArrow_c @@ -2362,7 +2362,7 @@ dMenu_Letter_c_NS_screenSetMenu: /* 801DF028 001DBF68 3C 60 80 39 */ lis r3, lbl_803969C8@ha /* 801DF02C 001DBF6C 3B E3 69 C8 */ addi r31, r3, lbl_803969C8@l /* 801DF030 001DBF70 38 60 01 18 */ li r3, 0x118 -/* 801DF034 001DBF74 48 0E FC 19 */ bl __nw +/* 801DF034 001DBF74 48 0E FC 19 */ bl __nw__FUl /* 801DF038 001DBF78 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF03C 001DBF7C 41 82 00 0C */ beq lbl_801DF048 /* 801DF040 001DBF80 48 11 94 59 */ bl J2DScreen @@ -2379,7 +2379,7 @@ lbl_801DF048: /* 801DF068 001DBFA8 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801DF06C 001DBFAC 48 07 60 7D */ bl dPaneClass_showNullPane /* 801DF070 001DBFB0 38 60 00 6C */ li r3, 0x6c -/* 801DF074 001DBFB4 48 0E FB D9 */ bl __nw +/* 801DF074 001DBFB4 48 0E FB D9 */ bl __nw__FUl /* 801DF078 001DBFB8 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF07C 001DBFBC 41 82 00 24 */ beq lbl_801DF0A0 /* 801DF080 001DBFC0 80 9E 00 18 */ lwz r4, 0x18(r30) @@ -2516,7 +2516,7 @@ lbl_801DF21C: /* 801DF280 001DC1C0 3A 1F 01 80 */ addi r16, r31, 0x180 lbl_801DF284: /* 801DF284 001DC1C4 38 60 00 6C */ li r3, 0x6c -/* 801DF288 001DC1C8 48 0E F9 C5 */ bl __nw +/* 801DF288 001DC1C8 48 0E F9 C5 */ bl __nw__FUl /* 801DF28C 001DC1CC 7C 64 1B 79 */ or. r4, r3, r3 /* 801DF290 001DC1D0 41 82 00 24 */ beq lbl_801DF2B4 /* 801DF294 001DC1D4 80 9E 00 18 */ lwz r4, 0x18(r30) @@ -2805,7 +2805,7 @@ lbl_801DF6D4: /* 801DF6E0 001DC620 3A 52 00 04 */ addi r18, r18, 4 /* 801DF6E4 001DC624 41 80 FD 1C */ blt lbl_801DF400 /* 801DF6E8 001DC628 38 60 01 18 */ li r3, 0x118 -/* 801DF6EC 001DC62C 48 0E F5 61 */ bl __nw +/* 801DF6EC 001DC62C 48 0E F5 61 */ bl __nw__FUl /* 801DF6F0 001DC630 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF6F4 001DC634 41 82 00 0C */ beq lbl_801DF700 /* 801DF6F8 001DC638 48 11 8D A1 */ bl J2DScreen @@ -2822,7 +2822,7 @@ lbl_801DF700: /* 801DF720 001DC660 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 801DF724 001DC664 48 07 59 C5 */ bl dPaneClass_showNullPane /* 801DF728 001DC668 38 60 00 6C */ li r3, 0x6c -/* 801DF72C 001DC66C 48 0E F5 21 */ bl __nw +/* 801DF72C 001DC66C 48 0E F5 21 */ bl __nw__FUl /* 801DF730 001DC670 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF734 001DC674 41 82 00 24 */ beq lbl_801DF758 /* 801DF738 001DC678 80 9E 00 1C */ lwz r4, 0x1c(r30) @@ -3047,7 +3047,7 @@ dMenu_Letter_c_NS_screenSetBase: /* 801DFA88 001DC9C8 3C 60 80 39 */ lis r3, lbl_803969C8@ha /* 801DFA8C 001DC9CC 3B C3 69 C8 */ addi r30, r3, lbl_803969C8@l /* 801DFA90 001DC9D0 38 60 01 18 */ li r3, 0x118 -/* 801DFA94 001DC9D4 48 0E F1 B9 */ bl __nw +/* 801DFA94 001DC9D4 48 0E F1 B9 */ bl __nw__FUl /* 801DFA98 001DC9D8 7C 60 1B 79 */ or. r0, r3, r3 /* 801DFA9C 001DC9DC 41 82 00 0C */ beq lbl_801DFAA8 /* 801DFAA0 001DC9E0 48 11 89 F9 */ bl J2DScreen @@ -3075,7 +3075,7 @@ lbl_801DFAA8: /* 801DFAF4 001DCA34 38 00 00 00 */ li r0, 0 /* 801DFAF8 001DCA38 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801DFAFC 001DCA3C 38 60 00 6C */ li r3, 0x6c -/* 801DFB00 001DCA40 48 0E F1 4D */ bl __nw +/* 801DFB00 001DCA40 48 0E F1 4D */ bl __nw__FUl /* 801DFB04 001DCA44 7C 60 1B 79 */ or. r0, r3, r3 /* 801DFB08 001DCA48 41 82 00 24 */ beq lbl_801DFB2C /* 801DFB0C 001DCA4C 80 9F 00 20 */ lwz r4, 0x20(r31) @@ -3616,7 +3616,7 @@ dMenu_Letter_c_NS_screenSetShadow: /* 801E033C 001DD27C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801E0340 001DD280 7C 7F 1B 78 */ mr r31, r3 /* 801E0344 001DD284 38 60 01 18 */ li r3, 0x118 -/* 801E0348 001DD288 48 0E E9 05 */ bl __nw +/* 801E0348 001DD288 48 0E E9 05 */ bl __nw__FUl /* 801E034C 001DD28C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0350 001DD290 41 82 00 0C */ beq lbl_801E035C /* 801E0354 001DD294 48 11 81 45 */ bl J2DScreen @@ -3633,7 +3633,7 @@ lbl_801E035C: /* 801E037C 001DD2BC 80 7F 00 24 */ lwz r3, 0x24(r31) /* 801E0380 001DD2C0 48 07 4D 69 */ bl dPaneClass_showNullPane /* 801E0384 001DD2C4 38 60 00 6C */ li r3, 0x6c -/* 801E0388 001DD2C8 48 0E E8 C5 */ bl __nw +/* 801E0388 001DD2C8 48 0E E8 C5 */ bl __nw__FUl /* 801E038C 001DD2CC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0390 001DD2D0 41 82 00 24 */ beq lbl_801E03B4 /* 801E0394 001DD2D4 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -3666,7 +3666,7 @@ dMenu_Letter_c_NS_screenSetLetter: /* 801E03F0 001DD330 48 18 1D E1 */ bl func_803621D0 /* 801E03F4 001DD334 7C 7F 1B 78 */ mr r31, r3 /* 801E03F8 001DD338 38 60 01 18 */ li r3, 0x118 -/* 801E03FC 001DD33C 48 0E E8 51 */ bl __nw +/* 801E03FC 001DD33C 48 0E E8 51 */ bl __nw__FUl /* 801E0400 001DD340 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0404 001DD344 41 82 00 0C */ beq lbl_801E0410 /* 801E0408 001DD348 48 11 80 91 */ bl J2DScreen @@ -3683,7 +3683,7 @@ lbl_801E0410: /* 801E0430 001DD370 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801E0434 001DD374 48 07 4C B5 */ bl dPaneClass_showNullPane /* 801E0438 001DD378 38 60 00 6C */ li r3, 0x6c -/* 801E043C 001DD37C 48 0E E8 11 */ bl __nw +/* 801E043C 001DD37C 48 0E E8 11 */ bl __nw__FUl /* 801E0440 001DD380 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0444 001DD384 41 82 00 24 */ beq lbl_801E0468 /* 801E0448 001DD388 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -3697,7 +3697,7 @@ lbl_801E0410: lbl_801E0468: /* 801E0468 001DD3A8 90 1F 02 EC */ stw r0, 0x2ec(r31) /* 801E046C 001DD3AC 38 60 00 6C */ li r3, 0x6c -/* 801E0470 001DD3B0 48 0E E7 DD */ bl __nw +/* 801E0470 001DD3B0 48 0E E7 DD */ bl __nw__FUl /* 801E0474 001DD3B4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0478 001DD3B8 41 82 00 28 */ beq lbl_801E04A0 /* 801E047C 001DD3BC 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -3784,7 +3784,7 @@ lbl_801E04B4: /* 801E05B8 001DD4F8 38 00 00 00 */ li r0, 0 /* 801E05BC 001DD4FC 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E05C0 001DD500 38 60 00 6C */ li r3, 0x6c -/* 801E05C4 001DD504 48 0E E6 89 */ bl __nw +/* 801E05C4 001DD504 48 0E E6 89 */ bl __nw__FUl /* 801E05C8 001DD508 7C 60 1B 79 */ or. r0, r3, r3 /* 801E05CC 001DD50C 41 82 00 24 */ beq lbl_801E05F0 /* 801E05D0 001DD510 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -3936,7 +3936,7 @@ lbl_801E07C0: /* 801E07FC 001DD73C 3B DE 00 04 */ addi r30, r30, 4 /* 801E0800 001DD740 41 80 FF C0 */ blt lbl_801E07C0 /* 801E0804 001DD744 38 60 01 18 */ li r3, 0x118 -/* 801E0808 001DD748 48 0E E4 45 */ bl __nw +/* 801E0808 001DD748 48 0E E4 45 */ bl __nw__FUl /* 801E080C 001DD74C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0810 001DD750 41 82 00 0C */ beq lbl_801E081C /* 801E0814 001DD754 48 11 7C 85 */ bl J2DScreen @@ -3957,7 +3957,7 @@ lbl_801E081C: /* 801E084C 001DD78C C3 E2 A8 E0 */ lfs f31, lbl_804542E0-_SDA2_BASE_(r2) lbl_801E0850: /* 801E0850 001DD790 38 60 00 6C */ li r3, 0x6c -/* 801E0854 001DD794 48 0E E3 F9 */ bl __nw +/* 801E0854 001DD794 48 0E E3 F9 */ bl __nw__FUl /* 801E0858 001DD798 7C 60 1B 79 */ or. r0, r3, r3 /* 801E085C 001DD79C 41 82 00 28 */ beq lbl_801E0884 /* 801E0860 001DD7A0 38 1E 00 28 */ addi r0, r30, 0x28 @@ -4001,7 +4001,7 @@ lbl_801E0884: /* 801E08F4 001DD834 4E 80 04 21 */ bctrl /* 801E08F8 001DD838 7C 7A 1B 78 */ mr r26, r3 /* 801E08FC 001DD83C 38 60 01 50 */ li r3, 0x150 -/* 801E0900 001DD840 48 0E E3 4D */ bl __nw +/* 801E0900 001DD840 48 0E E3 4D */ bl __nw__FUl /* 801E0904 001DD844 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0908 001DD848 41 82 00 10 */ beq lbl_801E0918 /* 801E090C 001DD84C 7F 44 D3 78 */ mr r4, r26 @@ -4054,7 +4054,7 @@ dMenu_Letter_c_NS_screenSetDoIcon: /* 801E09B8 001DD8F8 48 18 18 11 */ bl func_803621C8 /* 801E09BC 001DD8FC 7C 7F 1B 78 */ mr r31, r3 /* 801E09C0 001DD900 38 60 01 18 */ li r3, 0x118 -/* 801E09C4 001DD904 48 0E E2 89 */ bl __nw +/* 801E09C4 001DD904 48 0E E2 89 */ bl __nw__FUl /* 801E09C8 001DD908 7C 60 1B 79 */ or. r0, r3, r3 /* 801E09CC 001DD90C 41 82 00 0C */ beq lbl_801E09D8 /* 801E09D0 001DD910 48 11 7A C9 */ bl J2DScreen diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index bf59320894..ae26bc3995 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -89,7 +89,7 @@ dMenu_Option_c: /* 801E2034 001DEF74 90 1F 00 00 */ stw r0, 0(r31) /* 801E2038 001DEF78 7C 80 07 35 */ extsh. r0, r4 /* 801E203C 001DEF7C 40 81 00 08 */ ble lbl_801E2044 -/* 801E2040 001DEF80 48 0E CC FD */ bl __dl +/* 801E2040 001DEF80 48 0E CC FD */ bl __dl__FPv lbl_801E2044: /* 801E2044 001DEF84 7F E3 FB 78 */ mr r3, r31 /* 801E2048 001DEF88 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -111,7 +111,7 @@ dMenu_Option_c_NS__create: /* 801E207C 001DEFBC 4B E3 29 75 */ bl mDoExt_getMesgFont /* 801E2080 001DEFC0 90 7F 00 54 */ stw r3, 0x54(r31) /* 801E2084 001DEFC4 38 60 00 2C */ li r3, 0x2c -/* 801E2088 001DEFC8 48 0E CB C5 */ bl __nw +/* 801E2088 001DEFC8 48 0E CB C5 */ bl __nw__FUl /* 801E208C 001DEFCC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2090 001DEFD0 41 82 00 0C */ beq lbl_801E209C /* 801E2094 001DEFD4 48 06 7B 8D */ bl dMsgString_c @@ -119,7 +119,7 @@ dMenu_Option_c_NS__create: lbl_801E209C: /* 801E209C 001DEFDC 90 1F 00 48 */ stw r0, 0x48(r31) /* 801E20A0 001DEFE0 38 60 00 2C */ li r3, 0x2c -/* 801E20A4 001DEFE4 48 0E CB A9 */ bl __nw +/* 801E20A4 001DEFE4 48 0E CB A9 */ bl __nw__FUl /* 801E20A8 001DEFE8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E20AC 001DEFEC 41 82 00 10 */ beq lbl_801E20BC /* 801E20B0 001DEFF0 38 80 00 03 */ li r4, 3 @@ -130,7 +130,7 @@ lbl_801E20BC: /* 801E20C0 001DF000 38 00 00 00 */ li r0, 0 /* 801E20C4 001DF004 98 1F 03 F6 */ stb r0, 0x3f6(r31) /* 801E20C8 001DF008 38 60 01 18 */ li r3, 0x118 -/* 801E20CC 001DF00C 48 0E CB 81 */ bl __nw +/* 801E20CC 001DF00C 48 0E CB 81 */ bl __nw__FUl /* 801E20D0 001DF010 7C 60 1B 79 */ or. r0, r3, r3 /* 801E20D4 001DF014 41 82 00 0C */ beq lbl_801E20E0 /* 801E20D8 001DF018 48 11 63 C1 */ bl J2DScreen @@ -251,7 +251,7 @@ lbl_801E2260: /* 801E229C 001DF1DC 3B 5A 00 04 */ addi r26, r26, 4 /* 801E22A0 001DF1E0 41 80 FF C0 */ blt lbl_801E2260 /* 801E22A4 001DF1E4 38 60 01 18 */ li r3, 0x118 -/* 801E22A8 001DF1E8 48 0E C9 A5 */ bl __nw +/* 801E22A8 001DF1E8 48 0E C9 A5 */ bl __nw__FUl /* 801E22AC 001DF1EC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E22B0 001DF1F0 41 82 00 0C */ beq lbl_801E22BC /* 801E22B4 001DF1F4 48 11 61 E5 */ bl J2DScreen @@ -287,7 +287,7 @@ lbl_801E22BC: /* 801E2328 001DF268 4E 80 04 21 */ bctrl /* 801E232C 001DF26C 90 7F 02 7C */ stw r3, 0x27c(r31) /* 801E2330 001DF270 38 60 01 18 */ li r3, 0x118 -/* 801E2334 001DF274 48 0E C9 19 */ bl __nw +/* 801E2334 001DF274 48 0E C9 19 */ bl __nw__FUl /* 801E2338 001DF278 7C 60 1B 79 */ or. r0, r3, r3 /* 801E233C 001DF27C 41 82 00 0C */ beq lbl_801E2348 /* 801E2340 001DF280 48 11 61 59 */ bl J2DScreen @@ -307,7 +307,7 @@ lbl_801E2348: /* 801E2374 001DF2B4 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801E2378 001DF2B8 98 03 01 00 */ stb r0, 0x100(r3) /* 801E237C 001DF2BC 38 60 01 18 */ li r3, 0x118 -/* 801E2380 001DF2C0 48 0E C8 CD */ bl __nw +/* 801E2380 001DF2C0 48 0E C8 CD */ bl __nw__FUl /* 801E2384 001DF2C4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2388 001DF2C8 41 82 00 0C */ beq lbl_801E2394 /* 801E238C 001DF2CC 48 11 61 0D */ bl J2DScreen @@ -334,7 +334,7 @@ lbl_801E2394: /* 801E23DC 001DF31C 38 00 00 00 */ li r0, 0 /* 801E23E0 001DF320 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E23E4 001DF324 38 60 01 18 */ li r3, 0x118 -/* 801E23E8 001DF328 48 0E C8 65 */ bl __nw +/* 801E23E8 001DF328 48 0E C8 65 */ bl __nw__FUl /* 801E23EC 001DF32C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E23F0 001DF330 41 82 00 0C */ beq lbl_801E23FC /* 801E23F4 001DF334 48 11 60 A5 */ bl J2DScreen @@ -351,7 +351,7 @@ lbl_801E23FC: /* 801E241C 001DF35C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801E2420 001DF360 48 07 2C C9 */ bl dPaneClass_showNullPane /* 801E2424 001DF364 38 60 00 6C */ li r3, 0x6c -/* 801E2428 001DF368 48 0E C8 25 */ bl __nw +/* 801E2428 001DF368 48 0E C8 25 */ bl __nw__FUl /* 801E242C 001DF36C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2430 001DF370 41 82 00 28 */ beq lbl_801E2458 /* 801E2434 001DF374 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -366,7 +366,7 @@ lbl_801E23FC: lbl_801E2458: /* 801E2458 001DF398 90 1F 02 14 */ stw r0, 0x214(r31) /* 801E245C 001DF39C 38 60 00 6C */ li r3, 0x6c -/* 801E2460 001DF3A0 48 0E C7 ED */ bl __nw +/* 801E2460 001DF3A0 48 0E C7 ED */ bl __nw__FUl /* 801E2464 001DF3A4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2468 001DF3A8 41 82 00 28 */ beq lbl_801E2490 /* 801E246C 001DF3AC 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -392,7 +392,7 @@ lbl_801E2490: /* 801E24B8 001DF3F8 38 00 00 00 */ li r0, 0 /* 801E24BC 001DF3FC 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E24C0 001DF400 38 60 01 18 */ li r3, 0x118 -/* 801E24C4 001DF404 48 0E C7 89 */ bl __nw +/* 801E24C4 001DF404 48 0E C7 89 */ bl __nw__FUl /* 801E24C8 001DF408 7C 60 1B 79 */ or. r0, r3, r3 /* 801E24CC 001DF40C 41 82 00 0C */ beq lbl_801E24D8 /* 801E24D0 001DF410 48 11 5F C9 */ bl J2DScreen @@ -504,7 +504,7 @@ lbl_801E2540: /* 801E266C 001DF5AC 4E 80 04 21 */ bctrl /* 801E2670 001DF5B0 7C 78 1B 78 */ mr r24, r3 /* 801E2674 001DF5B4 38 60 01 50 */ li r3, 0x150 -/* 801E2678 001DF5B8 48 0E C5 D5 */ bl __nw +/* 801E2678 001DF5B8 48 0E C5 D5 */ bl __nw__FUl /* 801E267C 001DF5BC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2680 001DF5C0 41 82 00 10 */ beq lbl_801E2690 /* 801E2684 001DF5C4 7F 04 C3 78 */ mr r4, r24 @@ -542,7 +542,7 @@ lbl_801E2690: /* 801E2700 001DF640 C0 02 A9 2C */ lfs f0, lbl_8045432C-_SDA2_BASE_(r2) /* 801E2704 001DF644 D0 1F 03 74 */ stfs f0, 0x374(r31) /* 801E2708 001DF648 38 60 00 40 */ li r3, 0x40 -/* 801E270C 001DF64C 48 0E C5 41 */ bl __nw +/* 801E270C 001DF64C 48 0E C5 41 */ bl __nw__FUl /* 801E2710 001DF650 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2714 001DF654 41 82 00 14 */ beq lbl_801E2728 /* 801E2718 001DF658 80 9F 00 50 */ lwz r4, 0x50(r31) @@ -571,7 +571,7 @@ lbl_801E2728: /* 801E2770 001DF6B0 38 A1 00 0C */ addi r5, r1, 0xc /* 801E2774 001DF6B4 4B FA FA CD */ bl dFile_warning_c_NS_setFontColor /* 801E2778 001DF6B8 38 60 01 18 */ li r3, 0x118 -/* 801E277C 001DF6BC 48 0E C4 D1 */ bl __nw +/* 801E277C 001DF6BC 48 0E C4 D1 */ bl __nw__FUl /* 801E2780 001DF6C0 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2784 001DF6C4 41 82 00 0C */ beq lbl_801E2790 /* 801E2788 001DF6C8 48 11 5D 11 */ bl J2DScreen @@ -624,7 +624,7 @@ lbl_801E2790: /* 801E2840 001DF780 3B 60 00 00 */ li r27, 0 lbl_801E2844: /* 801E2844 001DF784 38 60 00 6C */ li r3, 0x6c -/* 801E2848 001DF788 48 0E C4 05 */ bl __nw +/* 801E2848 001DF788 48 0E C4 05 */ bl __nw__FUl /* 801E284C 001DF78C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2850 001DF790 41 82 00 28 */ beq lbl_801E2878 /* 801E2854 001DF794 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -640,7 +640,7 @@ lbl_801E2878: /* 801E2878 001DF7B8 7F 3F D2 14 */ add r25, r31, r26 /* 801E287C 001DF7BC 90 19 01 DC */ stw r0, 0x1dc(r25) /* 801E2880 001DF7C0 38 60 00 6C */ li r3, 0x6c -/* 801E2884 001DF7C4 48 0E C3 C9 */ bl __nw +/* 801E2884 001DF7C4 48 0E C3 C9 */ bl __nw__FUl /* 801E2888 001DF7C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E288C 001DF7CC 41 82 00 28 */ beq lbl_801E28B4 /* 801E2890 001DF7D0 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -713,7 +713,7 @@ lbl_801E28B4: /* 801E2998 001DF8D8 3B 40 00 00 */ li r26, 0 lbl_801E299C: /* 801E299C 001DF8DC 38 60 00 6C */ li r3, 0x6c -/* 801E29A0 001DF8E0 48 0E C2 AD */ bl __nw +/* 801E29A0 001DF8E0 48 0E C2 AD */ bl __nw__FUl /* 801E29A4 001DF8E4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E29A8 001DF8E8 41 82 00 28 */ beq lbl_801E29D0 /* 801E29AC 001DF8EC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -729,7 +729,7 @@ lbl_801E29D0: /* 801E29D0 001DF910 7F BF DA 14 */ add r29, r31, r27 /* 801E29D4 001DF914 90 1D 01 EC */ stw r0, 0x1ec(r29) /* 801E29D8 001DF918 38 60 00 6C */ li r3, 0x6c -/* 801E29DC 001DF91C 48 0E C2 71 */ bl __nw +/* 801E29DC 001DF91C 48 0E C2 71 */ bl __nw__FUl /* 801E29E0 001DF920 7C 60 1B 79 */ or. r0, r3, r3 /* 801E29E4 001DF924 41 82 00 28 */ beq lbl_801E2A0C /* 801E29E8 001DF928 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -744,7 +744,7 @@ lbl_801E29D0: lbl_801E2A0C: /* 801E2A0C 001DF94C 90 1D 01 F4 */ stw r0, 0x1f4(r29) /* 801E2A10 001DF950 38 60 00 6C */ li r3, 0x6c -/* 801E2A14 001DF954 48 0E C2 39 */ bl __nw +/* 801E2A14 001DF954 48 0E C2 39 */ bl __nw__FUl /* 801E2A18 001DF958 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2A1C 001DF95C 41 82 00 28 */ beq lbl_801E2A44 /* 801E2A20 001DF960 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1182,7 +1182,7 @@ lbl_801E3044: /* 801E3050 001DFF90 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801E3054 001DFF94 41 82 00 14 */ beq lbl_801E3068 /* 801E3058 001DFF98 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801E305C 001DFF9C 48 0E BC E1 */ bl __dl +/* 801E305C 001DFF9C 48 0E BC E1 */ bl __dl__FPv /* 801E3060 001DFFA0 38 00 00 00 */ li r0, 0 /* 801E3064 001DFFA4 90 1F 00 58 */ stw r0, 0x58(r31) lbl_801E3068: @@ -3825,7 +3825,7 @@ dMenu_Option_c_NS_screenSet: /* 801E5698 001E25D8 3C 60 80 39 */ lis r3, lbl_80396EA8@ha /* 801E569C 001E25DC 3B C3 6E A8 */ addi r30, r3, lbl_80396EA8@l /* 801E56A0 001E25E0 38 60 00 6C */ li r3, 0x6c -/* 801E56A4 001E25E4 48 0E 95 A9 */ bl __nw +/* 801E56A4 001E25E4 48 0E 95 A9 */ bl __nw__FUl /* 801E56A8 001E25E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E56AC 001E25EC 41 82 00 28 */ beq lbl_801E56D4 /* 801E56B0 001E25F0 80 9F 00 04 */ lwz r4, 4(r31) @@ -4004,7 +4004,7 @@ lbl_801E5738: /* 801E595C 001E289C 98 1F 02 BB */ stb r0, 0x2bb(r31) /* 801E5960 001E28A0 98 1F 02 B3 */ stb r0, 0x2b3(r31) /* 801E5964 001E28A4 38 60 00 B8 */ li r3, 0xb8 -/* 801E5968 001E28A8 48 0E 92 E5 */ bl __nw +/* 801E5968 001E28A8 48 0E 92 E5 */ bl __nw__FUl /* 801E596C 001E28AC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5970 001E28B0 41 82 00 18 */ beq lbl_801E5988 /* 801E5974 001E28B4 38 80 00 02 */ li r4, 2 @@ -4032,7 +4032,7 @@ lbl_801E5988: /* 801E59C8 001E2908 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 801E59CC 001E290C 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801E59D0 001E2910 38 60 00 6C */ li r3, 0x6c -/* 801E59D4 001E2914 48 0E 92 79 */ bl __nw +/* 801E59D4 001E2914 48 0E 92 79 */ bl __nw__FUl /* 801E59D8 001E2918 7C 60 1B 79 */ or. r0, r3, r3 /* 801E59DC 001E291C 41 82 00 24 */ beq lbl_801E5A00 /* 801E59E0 001E2920 80 9F 00 08 */ lwz r4, 8(r31) @@ -4046,7 +4046,7 @@ lbl_801E5988: lbl_801E5A00: /* 801E5A00 001E2940 90 1F 00 5C */ stw r0, 0x5c(r31) /* 801E5A04 001E2944 38 60 00 6C */ li r3, 0x6c -/* 801E5A08 001E2948 48 0E 92 45 */ bl __nw +/* 801E5A08 001E2948 48 0E 92 45 */ bl __nw__FUl /* 801E5A0C 001E294C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5A10 001E2950 41 82 00 24 */ beq lbl_801E5A34 /* 801E5A14 001E2954 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -4060,7 +4060,7 @@ lbl_801E5A00: lbl_801E5A34: /* 801E5A34 001E2974 90 1F 00 60 */ stw r0, 0x60(r31) /* 801E5A38 001E2978 38 60 00 6C */ li r3, 0x6c -/* 801E5A3C 001E297C 48 0E 92 11 */ bl __nw +/* 801E5A3C 001E297C 48 0E 92 11 */ bl __nw__FUl /* 801E5A40 001E2980 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5A44 001E2984 41 82 00 24 */ beq lbl_801E5A68 /* 801E5A48 001E2988 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -4074,7 +4074,7 @@ lbl_801E5A34: lbl_801E5A68: /* 801E5A68 001E29A8 90 1F 00 64 */ stw r0, 0x64(r31) /* 801E5A6C 001E29AC 38 60 00 6C */ li r3, 0x6c -/* 801E5A70 001E29B0 48 0E 91 DD */ bl __nw +/* 801E5A70 001E29B0 48 0E 91 DD */ bl __nw__FUl /* 801E5A74 001E29B4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5A78 001E29B8 41 82 00 24 */ beq lbl_801E5A9C /* 801E5A7C 001E29BC 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -4088,7 +4088,7 @@ lbl_801E5A68: lbl_801E5A9C: /* 801E5A9C 001E29DC 90 1F 00 68 */ stw r0, 0x68(r31) /* 801E5AA0 001E29E0 38 60 00 6C */ li r3, 0x6c -/* 801E5AA4 001E29E4 48 0E 91 A9 */ bl __nw +/* 801E5AA4 001E29E4 48 0E 91 A9 */ bl __nw__FUl /* 801E5AA8 001E29E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5AAC 001E29EC 41 82 00 24 */ beq lbl_801E5AD0 /* 801E5AB0 001E29F0 80 9F 00 04 */ lwz r4, 4(r31) @@ -4111,7 +4111,7 @@ lbl_801E5AD0: /* 801E5AF0 001E2A30 3B 3E 02 60 */ addi r25, r30, 0x260 lbl_801E5AF4: /* 801E5AF4 001E2A34 38 60 00 6C */ li r3, 0x6c -/* 801E5AF8 001E2A38 48 0E 91 55 */ bl __nw +/* 801E5AF8 001E2A38 48 0E 91 55 */ bl __nw__FUl /* 801E5AFC 001E2A3C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5B00 001E2A40 41 82 00 28 */ beq lbl_801E5B28 /* 801E5B04 001E2A44 80 9F 00 08 */ lwz r4, 8(r31) @@ -4127,7 +4127,7 @@ lbl_801E5B28: /* 801E5B28 001E2A68 7E BF DA 14 */ add r21, r31, r27 /* 801E5B2C 001E2A6C 90 15 00 74 */ stw r0, 0x74(r21) /* 801E5B30 001E2A70 38 60 00 6C */ li r3, 0x6c -/* 801E5B34 001E2A74 48 0E 91 19 */ bl __nw +/* 801E5B34 001E2A74 48 0E 91 19 */ bl __nw__FUl /* 801E5B38 001E2A78 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5B3C 001E2A7C 41 82 00 28 */ beq lbl_801E5B64 /* 801E5B40 001E2A80 80 9F 00 08 */ lwz r4, 8(r31) @@ -4151,7 +4151,7 @@ lbl_801E5B64: /* 801E5B84 001E2AC4 7C 60 03 79 */ or. r0, r3, r0 /* 801E5B88 001E2AC8 41 82 00 78 */ beq lbl_801E5C00 /* 801E5B8C 001E2ACC 38 60 00 6C */ li r3, 0x6c -/* 801E5B90 001E2AD0 48 0E 90 BD */ bl __nw +/* 801E5B90 001E2AD0 48 0E 90 BD */ bl __nw__FUl /* 801E5B94 001E2AD4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5B98 001E2AD8 41 82 00 20 */ beq lbl_801E5BB8 /* 801E5B9C 001E2ADC 80 9F 00 08 */ lwz r4, 8(r31) @@ -4250,7 +4250,7 @@ lbl_801E5CCC: /* 801E5D00 001E2C40 3A A0 00 00 */ li r21, 0 lbl_801E5D04: /* 801E5D04 001E2C44 38 60 00 6C */ li r3, 0x6c -/* 801E5D08 001E2C48 48 0E 8F 45 */ bl __nw +/* 801E5D08 001E2C48 48 0E 8F 45 */ bl __nw__FUl /* 801E5D0C 001E2C4C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5D10 001E2C50 41 82 00 28 */ beq lbl_801E5D38 /* 801E5D14 001E2C54 80 9F 00 08 */ lwz r4, 8(r31) @@ -4266,7 +4266,7 @@ lbl_801E5D38: /* 801E5D38 001E2C78 7E DF A2 14 */ add r22, r31, r20 /* 801E5D3C 001E2C7C 90 16 01 94 */ stw r0, 0x194(r22) /* 801E5D40 001E2C80 38 60 00 6C */ li r3, 0x6c -/* 801E5D44 001E2C84 48 0E 8F 09 */ bl __nw +/* 801E5D44 001E2C84 48 0E 8F 09 */ bl __nw__FUl /* 801E5D48 001E2C88 7C 60 1B 79 */ or. r0, r3, r3 /* 801E5D4C 001E2C8C 41 82 00 28 */ beq lbl_801E5D74 /* 801E5D50 001E2C90 80 9F 00 08 */ lwz r4, 8(r31) @@ -4299,7 +4299,7 @@ lbl_801E5D98: /* 801E5DB4 001E2CF4 7C 60 03 79 */ or. r0, r3, r0 /* 801E5DB8 001E2CF8 41 82 00 3C */ beq lbl_801E5DF4 /* 801E5DBC 001E2CFC 38 60 00 6C */ li r3, 0x6c -/* 801E5DC0 001E2D00 48 0E 8E 8D */ bl __nw +/* 801E5DC0 001E2D00 48 0E 8E 8D */ bl __nw__FUl /* 801E5DC4 001E2D04 7C 64 1B 79 */ or. r4, r3, r3 /* 801E5DC8 001E2D08 41 82 00 20 */ beq lbl_801E5DE8 /* 801E5DCC 001E2D0C 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -4336,7 +4336,7 @@ lbl_801E5E1C: /* 801E5E38 001E2D78 7C 60 03 79 */ or. r0, r3, r0 /* 801E5E3C 001E2D7C 41 82 00 3C */ beq lbl_801E5E78 /* 801E5E40 001E2D80 38 60 00 6C */ li r3, 0x6c -/* 801E5E44 001E2D84 48 0E 8E 09 */ bl __nw +/* 801E5E44 001E2D84 48 0E 8E 09 */ bl __nw__FUl /* 801E5E48 001E2D88 7C 64 1B 79 */ or. r4, r3, r3 /* 801E5E4C 001E2D8C 41 82 00 20 */ beq lbl_801E5E6C /* 801E5E50 001E2D90 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -4364,7 +4364,7 @@ lbl_801E5E80: /* 801E5E9C 001E2DDC 7C 60 03 79 */ or. r0, r3, r0 /* 801E5EA0 001E2DE0 41 82 00 3C */ beq lbl_801E5EDC /* 801E5EA4 001E2DE4 38 60 00 6C */ li r3, 0x6c -/* 801E5EA8 001E2DE8 48 0E 8D A5 */ bl __nw +/* 801E5EA8 001E2DE8 48 0E 8D A5 */ bl __nw__FUl /* 801E5EAC 001E2DEC 7C 64 1B 79 */ or. r4, r3, r3 /* 801E5EB0 001E2DF0 41 82 00 20 */ beq lbl_801E5ED0 /* 801E5EB4 001E2DF4 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -4877,7 +4877,7 @@ lbl_801E6660: /* 801E6670 001E35B0 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6674 001E35B4 48 00 1A 41 */ bl dMenu_Option_c_NS_paneResize /* 801E6678 001E35B8 38 60 00 6C */ li r3, 0x6c -/* 801E667C 001E35BC 48 0E 85 D1 */ bl __nw +/* 801E667C 001E35BC 48 0E 85 D1 */ bl __nw__FUl /* 801E6680 001E35C0 7C 60 1B 79 */ or. r0, r3, r3 /* 801E6684 001E35C4 41 82 00 20 */ beq lbl_801E66A4 /* 801E6688 001E35C8 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -4936,7 +4936,7 @@ lbl_801E6744: /* 801E6754 001E3694 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6758 001E3698 48 00 19 5D */ bl dMenu_Option_c_NS_paneResize /* 801E675C 001E369C 38 60 00 6C */ li r3, 0x6c -/* 801E6760 001E36A0 48 0E 84 ED */ bl __nw +/* 801E6760 001E36A0 48 0E 84 ED */ bl __nw__FUl /* 801E6764 001E36A4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E6768 001E36A8 41 82 00 20 */ beq lbl_801E6788 /* 801E676C 001E36AC 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -4997,7 +4997,7 @@ lbl_801E6830: /* 801E6840 001E3780 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6844 001E3784 48 00 18 71 */ bl dMenu_Option_c_NS_paneResize /* 801E6848 001E3788 38 60 00 6C */ li r3, 0x6c -/* 801E684C 001E378C 48 0E 84 01 */ bl __nw +/* 801E684C 001E378C 48 0E 84 01 */ bl __nw__FUl /* 801E6850 001E3790 7C 60 1B 79 */ or. r0, r3, r3 /* 801E6854 001E3794 41 82 00 20 */ beq lbl_801E6874 /* 801E6858 001E3798 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -5058,7 +5058,7 @@ lbl_801E691C: /* 801E692C 001E386C 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6930 001E3870 48 00 17 85 */ bl dMenu_Option_c_NS_paneResize /* 801E6934 001E3874 38 60 00 6C */ li r3, 0x6c -/* 801E6938 001E3878 48 0E 83 15 */ bl __nw +/* 801E6938 001E3878 48 0E 83 15 */ bl __nw__FUl /* 801E693C 001E387C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E6940 001E3880 41 82 00 20 */ beq lbl_801E6960 /* 801E6944 001E3884 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -5119,7 +5119,7 @@ lbl_801E6A08: /* 801E6A18 001E3958 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6A1C 001E395C 48 00 16 99 */ bl dMenu_Option_c_NS_paneResize /* 801E6A20 001E3960 38 60 00 6C */ li r3, 0x6c -/* 801E6A24 001E3964 48 0E 82 29 */ bl __nw +/* 801E6A24 001E3964 48 0E 82 29 */ bl __nw__FUl /* 801E6A28 001E3968 7C 60 1B 79 */ or. r0, r3, r3 /* 801E6A2C 001E396C 41 82 00 20 */ beq lbl_801E6A4C /* 801E6A30 001E3970 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -5325,7 +5325,7 @@ lbl_801E6D08: /* 801E6D24 001E3C64 7C 60 03 79 */ or. r0, r3, r0 /* 801E6D28 001E3C68 41 82 00 3C */ beq lbl_801E6D64 /* 801E6D2C 001E3C6C 38 60 00 6C */ li r3, 0x6c -/* 801E6D30 001E3C70 48 0E 7F 1D */ bl __nw +/* 801E6D30 001E3C70 48 0E 7F 1D */ bl __nw__FUl /* 801E6D34 001E3C74 7C 64 1B 79 */ or. r4, r3, r3 /* 801E6D38 001E3C78 41 82 00 20 */ beq lbl_801E6D58 /* 801E6D3C 001E3C7C 80 9F 00 04 */ lwz r4, 4(r31) diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 5cf905c660..0fdb8408c6 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -31,7 +31,7 @@ dMenu_Ring_c: /* 801E9174 001E60B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801E9178 001E60B8 98 03 00 E8 */ stb r0, 0xe8(r3) /* 801E917C 001E60BC 80 7F 00 04 */ lwz r3, 4(r31) -/* 801E9180 001E60C0 48 0E 56 05 */ bl JKRHeap_NS_getTotalFreeSize +/* 801E9180 001E60C0 48 0E 56 05 */ bl getTotalFreeSize__7JKRHeapFv /* 801E9184 001E60C4 C0 02 A9 88 */ lfs f0, lbl_80454388-_SDA2_BASE_(r2) /* 801E9188 001E60C8 D0 1F 05 70 */ stfs f0, 0x570(r31) /* 801E918C 001E60CC 88 1F 06 BC */ lbz r0, 0x6bc(r31) @@ -390,7 +390,7 @@ lbl_801E9694: /* 801E9694 001E65D4 80 7F 00 04 */ lwz r3, 4(r31) /* 801E9698 001E65D8 38 80 0C 00 */ li r4, 0xc00 /* 801E969C 001E65DC 38 A0 00 20 */ li r5, 0x20 -/* 801E96A0 001E65E0 48 0E 4E 35 */ bl JKRHeap_NS_alloc_X1_ +/* 801E96A0 001E65E0 48 0E 4E 35 */ bl alloc__7JKRHeapFUli /* 801E96A4 001E65E4 7C 9F CA 14 */ add r4, r31, r25 /* 801E96A8 001E65E8 38 04 01 F0 */ addi r0, r4, 0x1f0 /* 801E96AC 001E65EC 7C 7B 01 2E */ stwx r3, r27, r0 @@ -422,7 +422,7 @@ lbl_801E9708: /* 801E970C 001E664C 3B 20 00 00 */ li r25, 0 lbl_801E9710: /* 801E9710 001E6650 38 60 01 50 */ li r3, 0x150 -/* 801E9714 001E6654 48 0E 55 39 */ bl __nw +/* 801E9714 001E6654 48 0E 55 39 */ bl __nw__FUl /* 801E9718 001E6658 7C 64 1B 79 */ or. r4, r3, r3 /* 801E971C 001E665C 41 82 00 20 */ beq lbl_801E973C /* 801E9720 001E6660 88 14 00 00 */ lbz r0, 0(r20) @@ -472,7 +472,7 @@ lbl_801E973C: /* 801E97CC 001E670C 3A 60 00 00 */ li r19, 0 lbl_801E97D0: /* 801E97D0 001E6710 38 60 01 50 */ li r3, 0x150 -/* 801E97D4 001E6714 48 0E 54 79 */ bl __nw +/* 801E97D4 001E6714 48 0E 54 79 */ bl __nw__FUl /* 801E97D8 001E6718 7C 64 1B 79 */ or. r4, r3, r3 /* 801E97DC 001E671C 41 82 00 10 */ beq lbl_801E97EC /* 801E97E0 001E6720 7E 44 93 78 */ mr r4, r18 @@ -486,7 +486,7 @@ lbl_801E97EC: /* 801E97FC 001E673C 3A 73 00 04 */ addi r19, r19, 4 /* 801E9800 001E6740 41 80 FF D0 */ blt lbl_801E97D0 /* 801E9804 001E6744 38 60 00 10 */ li r3, 0x10 -/* 801E9808 001E6748 48 0E 54 45 */ bl __nw +/* 801E9808 001E6748 48 0E 54 45 */ bl __nw__FUl /* 801E980C 001E674C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9810 001E6750 41 82 00 0C */ beq lbl_801E981C /* 801E9814 001E6754 4B FC 51 25 */ bl dKantera_icon_c @@ -494,7 +494,7 @@ lbl_801E97EC: lbl_801E981C: /* 801E981C 001E675C 90 1F 00 54 */ stw r0, 0x54(r31) /* 801E9820 001E6760 38 60 01 18 */ li r3, 0x118 -/* 801E9824 001E6764 48 0E 54 29 */ bl __nw +/* 801E9824 001E6764 48 0E 54 29 */ bl __nw__FUl /* 801E9828 001E6768 7C 60 1B 79 */ or. r0, r3, r3 /* 801E982C 001E676C 41 82 00 0C */ beq lbl_801E9838 /* 801E9830 001E6770 48 10 EC 69 */ bl J2DScreen @@ -514,7 +514,7 @@ lbl_801E9838: /* 801E9864 001E67A4 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801E9868 001E67A8 48 06 B8 81 */ bl dPaneClass_showNullPane /* 801E986C 001E67AC 38 60 00 1C */ li r3, 0x1c -/* 801E9870 001E67B0 48 0E 53 DD */ bl __nw +/* 801E9870 001E67B0 48 0E 53 DD */ bl __nw__FUl /* 801E9874 001E67B4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9878 001E67B8 41 82 00 24 */ beq lbl_801E989C /* 801E987C 001E67BC 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -528,7 +528,7 @@ lbl_801E9838: lbl_801E989C: /* 801E989C 001E67DC 90 1F 00 18 */ stw r0, 0x18(r31) /* 801E98A0 001E67E0 38 60 00 6C */ li r3, 0x6c -/* 801E98A4 001E67E4 48 0E 53 A9 */ bl __nw +/* 801E98A4 001E67E4 48 0E 53 A9 */ bl __nw__FUl /* 801E98A8 001E67E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E98AC 001E67EC 41 82 00 24 */ beq lbl_801E98D0 /* 801E98B0 001E67F0 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -542,7 +542,7 @@ lbl_801E989C: lbl_801E98D0: /* 801E98D0 001E6810 90 1F 00 24 */ stw r0, 0x24(r31) /* 801E98D4 001E6814 38 60 00 6C */ li r3, 0x6c -/* 801E98D8 001E6818 48 0E 53 75 */ bl __nw +/* 801E98D8 001E6818 48 0E 53 75 */ bl __nw__FUl /* 801E98DC 001E681C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E98E0 001E6820 41 82 00 24 */ beq lbl_801E9904 /* 801E98E4 001E6824 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -561,7 +561,7 @@ lbl_801E9904: /* 801E9914 001E6854 38 00 00 00 */ li r0, 0 /* 801E9918 001E6858 90 1F 00 2C */ stw r0, 0x2c(r31) /* 801E991C 001E685C 38 60 00 6C */ li r3, 0x6c -/* 801E9920 001E6860 48 0E 53 2D */ bl __nw +/* 801E9920 001E6860 48 0E 53 2D */ bl __nw__FUl /* 801E9924 001E6864 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9928 001E6868 41 82 00 28 */ beq lbl_801E9950 /* 801E992C 001E686C 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -576,7 +576,7 @@ lbl_801E9904: lbl_801E9950: /* 801E9950 001E6890 90 1F 00 30 */ stw r0, 0x30(r31) /* 801E9954 001E6894 38 60 00 6C */ li r3, 0x6c -/* 801E9958 001E6898 48 0E 52 F5 */ bl __nw +/* 801E9958 001E6898 48 0E 52 F5 */ bl __nw__FUl /* 801E995C 001E689C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9960 001E68A0 41 82 00 24 */ beq lbl_801E9984 /* 801E9964 001E68A4 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -611,7 +611,7 @@ lbl_801E99C8: /* 801E99C8 001E6908 80 7F 00 04 */ lwz r3, 4(r31) /* 801E99CC 001E690C 38 80 0C 00 */ li r4, 0xc00 /* 801E99D0 001E6910 38 A0 00 20 */ li r5, 0x20 -/* 801E99D4 001E6914 48 0E 4B 01 */ bl JKRHeap_NS_alloc_X1_ +/* 801E99D4 001E6914 48 0E 4B 01 */ bl alloc__7JKRHeapFUli /* 801E99D8 001E6918 7C 9F 9A 14 */ add r4, r31, r19 /* 801E99DC 001E691C 38 04 02 50 */ addi r0, r4, 0x250 /* 801E99E0 001E6920 7C 77 01 2E */ stwx r3, r23, r0 @@ -654,7 +654,7 @@ lbl_801E9A24: /* 801E9A70 001E69B0 48 00 00 48 */ b lbl_801E9AB8 lbl_801E9A74: /* 801E9A74 001E69B4 38 60 01 50 */ li r3, 0x150 -/* 801E9A78 001E69B8 48 0E 51 D5 */ bl __nw +/* 801E9A78 001E69B8 48 0E 51 D5 */ bl __nw__FUl /* 801E9A7C 001E69BC 7C 64 1B 79 */ or. r4, r3, r3 /* 801E9A80 001E69C0 41 82 00 18 */ beq lbl_801E9A98 /* 801E9A84 001E69C4 7C 9F 9A 14 */ add r4, r31, r19 @@ -875,7 +875,7 @@ lbl_801E9B80: /* 801E9DD0 001E6D10 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_801E9DD4: /* 801E9DD4 001E6D14 38 60 00 2C */ li r3, 0x2c -/* 801E9DD8 001E6D18 48 0E 4E 75 */ bl __nw +/* 801E9DD8 001E6D18 48 0E 4E 75 */ bl __nw__FUl /* 801E9DDC 001E6D1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9DE0 001E6D20 41 82 00 0C */ beq lbl_801E9DEC /* 801E9DE4 001E6D24 48 05 FE 3D */ bl dMsgString_c @@ -1163,7 +1163,7 @@ lbl_801EA170: /* 801EA234 001E7174 3A D6 00 08 */ addi r22, r22, 8 /* 801EA238 001E7178 41 80 FF 38 */ blt lbl_801EA170 /* 801EA23C 001E717C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA240 001E7180 48 0E 45 45 */ bl JKRHeap_NS_getTotalFreeSize +/* 801EA240 001E7180 48 0E 45 45 */ bl getTotalFreeSize__7JKRHeapFv /* 801EA244 001E7184 80 7B 5D 30 */ lwz r3, 0x5d30(r27) /* 801EA248 001E7188 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 801EA24C 001E718C 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1176,7 +1176,7 @@ lbl_801EA170: /* 801EA268 001E71A8 4E 80 04 21 */ bctrl /* 801EA26C 001E71AC 7C 73 1B 78 */ mr r19, r3 /* 801EA270 001E71B0 38 60 01 50 */ li r3, 0x150 -/* 801EA274 001E71B4 48 0E 49 D9 */ bl __nw +/* 801EA274 001E71B4 48 0E 49 D9 */ bl __nw__FUl /* 801EA278 001E71B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA27C 001E71BC 41 82 00 10 */ beq lbl_801EA28C /* 801EA280 001E71C0 7E 64 9B 78 */ mr r4, r19 @@ -1212,7 +1212,7 @@ lbl_801EA28C: /* 801EA2F4 001E7234 7D 89 03 A6 */ mtctr r12 /* 801EA2F8 001E7238 4E 80 04 21 */ bctrl /* 801EA2FC 001E723C 38 60 01 18 */ li r3, 0x118 -/* 801EA300 001E7240 48 0E 49 4D */ bl __nw +/* 801EA300 001E7240 48 0E 49 4D */ bl __nw__FUl /* 801EA304 001E7244 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA308 001E7248 41 82 00 0C */ beq lbl_801EA314 /* 801EA30C 001E724C 48 10 E1 8D */ bl J2DScreen @@ -1231,7 +1231,7 @@ lbl_801EA314: /* 801EA33C 001E727C 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801EA340 001E7280 48 06 AD A9 */ bl dPaneClass_showNullPane /* 801EA344 001E7284 38 60 00 1C */ li r3, 0x1c -/* 801EA348 001E7288 48 0E 49 05 */ bl __nw +/* 801EA348 001E7288 48 0E 49 05 */ bl __nw__FUl /* 801EA34C 001E728C 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA350 001E7290 41 82 00 24 */ beq lbl_801EA374 /* 801EA354 001E7294 80 9F 00 5C */ lwz r4, 0x5c(r31) @@ -1245,7 +1245,7 @@ lbl_801EA314: lbl_801EA374: /* 801EA374 001E72B4 90 1F 00 20 */ stw r0, 0x20(r31) /* 801EA378 001E72B8 38 60 01 18 */ li r3, 0x118 -/* 801EA37C 001E72BC 48 0E 48 D1 */ bl __nw +/* 801EA37C 001E72BC 48 0E 48 D1 */ bl __nw__FUl /* 801EA380 001E72C0 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA384 001E72C4 41 82 00 0C */ beq lbl_801EA390 /* 801EA388 001E72C8 48 10 E1 11 */ bl J2DScreen @@ -1264,7 +1264,7 @@ lbl_801EA390: /* 801EA3B8 001E72F8 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801EA3BC 001E72FC 48 06 AD 2D */ bl dPaneClass_showNullPane /* 801EA3C0 001E7300 38 60 00 1C */ li r3, 0x1c -/* 801EA3C4 001E7304 48 0E 48 89 */ bl __nw +/* 801EA3C4 001E7304 48 0E 48 89 */ bl __nw__FUl /* 801EA3C8 001E7308 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA3CC 001E730C 41 82 00 28 */ beq lbl_801EA3F4 /* 801EA3D0 001E7310 80 9F 00 64 */ lwz r4, 0x64(r31) @@ -1279,7 +1279,7 @@ lbl_801EA390: lbl_801EA3F4: /* 801EA3F4 001E7334 90 1F 00 1C */ stw r0, 0x1c(r31) /* 801EA3F8 001E7338 38 60 00 6C */ li r3, 0x6c -/* 801EA3FC 001E733C 48 0E 48 51 */ bl __nw +/* 801EA3FC 001E733C 48 0E 48 51 */ bl __nw__FUl /* 801EA400 001E7340 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA404 001E7344 41 82 00 28 */ beq lbl_801EA42C /* 801EA408 001E7348 80 9F 00 64 */ lwz r4, 0x64(r31) @@ -1294,7 +1294,7 @@ lbl_801EA3F4: lbl_801EA42C: /* 801EA42C 001E736C 90 1F 00 4C */ stw r0, 0x4c(r31) /* 801EA430 001E7370 38 60 00 6C */ li r3, 0x6c -/* 801EA434 001E7374 48 0E 48 19 */ bl __nw +/* 801EA434 001E7374 48 0E 48 19 */ bl __nw__FUl /* 801EA438 001E7378 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA43C 001E737C 41 82 00 28 */ beq lbl_801EA464 /* 801EA440 001E7380 80 9F 00 64 */ lwz r4, 0x64(r31) @@ -1410,7 +1410,7 @@ lbl_801EA5AC: /* 801EA5F0 001E7530 7F E3 FB 78 */ mr r3, r31 /* 801EA5F4 001E7534 48 00 4B 29 */ bl dMenu_Ring_c_NS_textCentering /* 801EA5F8 001E7538 38 60 00 B8 */ li r3, 0xb8 -/* 801EA5FC 001E753C 48 0E 46 51 */ bl __nw +/* 801EA5FC 001E753C 48 0E 46 51 */ bl __nw__FUl /* 801EA600 001E7540 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA604 001E7544 41 82 00 20 */ beq lbl_801EA624 /* 801EA608 001E7548 38 80 00 02 */ li r4, 2 @@ -1426,7 +1426,7 @@ lbl_801EA624: /* 801EA62C 001E756C C0 22 A9 9C */ lfs f1, lbl_8045439C-_SDA2_BASE_(r2) /* 801EA630 001E7570 4B FA AC 71 */ bl dSelect_cursor_c_NS_setAlphaRate /* 801EA634 001E7574 38 60 00 E8 */ li r3, 0xe8 -/* 801EA638 001E7578 48 0E 46 15 */ bl __nw +/* 801EA638 001E7578 48 0E 46 15 */ bl __nw__FUl /* 801EA63C 001E757C 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA640 001E7580 41 82 00 1C */ beq lbl_801EA65C /* 801EA644 001E7584 80 9F 00 04 */ lwz r4, 4(r31) @@ -1493,7 +1493,7 @@ lbl_801EA6E4: /* 801EA72C 001E766C 38 03 DF 5C */ addi r0, r3, lbl_803BDF5C@l /* 801EA730 001E7670 90 1F 00 00 */ stw r0, 0(r31) /* 801EA734 001E7674 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA738 001E7678 48 0E 40 4D */ bl JKRHeap_NS_getTotalFreeSize +/* 801EA738 001E7678 48 0E 40 4D */ bl getTotalFreeSize__7JKRHeapFv /* 801EA73C 001E767C 38 00 00 00 */ li r0, 0 /* 801EA740 001E7680 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801EA744 001E7684 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -1516,7 +1516,7 @@ lbl_801EA77C: /* 801EA77C 001E76BC 80 7F 00 04 */ lwz r3, 4(r31) /* 801EA780 001E76C0 3A 99 01 F0 */ addi r20, r25, 0x1f0 /* 801EA784 001E76C4 7C 97 A0 2E */ lwzx r4, r23, r20 -/* 801EA788 001E76C8 48 0E 3D C1 */ bl JKRHeap_NS_free_X1_ +/* 801EA788 001E76C8 48 0E 3D C1 */ bl free__7JKRHeapFPv /* 801EA78C 001E76CC 7F 17 A1 2E */ stwx r24, r23, r20 /* 801EA790 001E76D0 3A 31 00 01 */ addi r17, r17, 1 /* 801EA794 001E76D4 2C 11 00 02 */ cmpwi r17, 2 @@ -1645,7 +1645,7 @@ lbl_801EA940: /* 801EA944 001E7884 28 04 00 00 */ cmplwi r4, 0 /* 801EA948 001E7888 41 82 00 14 */ beq lbl_801EA95C /* 801EA94C 001E788C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA950 001E7890 48 0E 3B F9 */ bl JKRHeap_NS_free_X1_ +/* 801EA950 001E7890 48 0E 3B F9 */ bl free__7JKRHeapFPv /* 801EA954 001E7894 38 00 00 00 */ li r0, 0 /* 801EA958 001E7898 90 14 02 50 */ stw r0, 0x250(r20) lbl_801EA95C: @@ -1663,7 +1663,7 @@ lbl_801EA95C: /* 801EA988 001E78C8 38 00 00 00 */ li r0, 0 /* 801EA98C 001E78CC 90 1F 00 14 */ stw r0, 0x14(r31) /* 801EA990 001E78D0 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA994 001E78D4 48 0E 3D F1 */ bl JKRHeap_NS_getTotalFreeSize +/* 801EA994 001E78D4 48 0E 3D F1 */ bl getTotalFreeSize__7JKRHeapFv /* 801EA998 001E78D8 80 7F 01 B8 */ lwz r3, 0x1b8(r31) /* 801EA99C 001E78DC 28 03 00 00 */ cmplwi r3, 0 /* 801EA9A0 001E78E0 41 82 00 18 */ beq lbl_801EA9B8 @@ -1716,7 +1716,7 @@ lbl_801EAA40: /* 801EAA48 001E7988 28 04 00 00 */ cmplwi r4, 0 /* 801EAA4C 001E798C 41 82 00 10 */ beq lbl_801EAA5C /* 801EAA50 001E7990 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EAA54 001E7994 48 0E 3A F5 */ bl JKRHeap_NS_free_X1_ +/* 801EAA54 001E7994 48 0E 3A F5 */ bl free__7JKRHeapFPv /* 801EAA58 001E7998 7F 3F A1 2E */ stwx r25, r31, r20 lbl_801EAA5C: /* 801EAA5C 001E799C 3A 31 00 01 */ addi r17, r17, 1 @@ -1788,7 +1788,7 @@ lbl_801EAB2C: /* 801EAB50 001E7A90 7F C0 07 35 */ extsh. r0, r30 /* 801EAB54 001E7A94 40 81 00 0C */ ble lbl_801EAB60 /* 801EAB58 001E7A98 7F E3 FB 78 */ mr r3, r31 -/* 801EAB5C 001E7A9C 48 0E 41 E1 */ bl __dl +/* 801EAB5C 001E7A9C 48 0E 41 E1 */ bl __dl__FPv lbl_801EAB60: /* 801EAB60 001E7AA0 7F E3 FB 78 */ mr r3, r31 /* 801EAB64 001E7AA4 39 61 00 50 */ addi r11, r1, 0x50 @@ -6755,13 +6755,13 @@ dMenu_Ring_c_NS_clacEllipsePlotAverage: /* 801EF200 001EC140 C3 A3 05 10 */ lfs f29, 0x510(r3) /* 801EF204 001EC144 C3 82 A9 88 */ lfs f28, lbl_80454388-_SDA2_BASE_(r2) /* 801EF208 001EC148 38 60 3E 80 */ li r3, 0x3e80 -/* 801EF20C 001EC14C 48 0D FA B9 */ bl __nwa +/* 801EF20C 001EC14C 48 0D FA B9 */ bl __nwa__FUl /* 801EF210 001EC150 7C 7F 1B 78 */ mr r31, r3 /* 801EF214 001EC154 38 60 3E 80 */ li r3, 0x3e80 -/* 801EF218 001EC158 48 0D FA AD */ bl __nwa +/* 801EF218 001EC158 48 0D FA AD */ bl __nwa__FUl /* 801EF21C 001EC15C 7C 7E 1B 78 */ mr r30, r3 /* 801EF220 001EC160 38 60 3E 80 */ li r3, 0x3e80 -/* 801EF224 001EC164 48 0D FA A1 */ bl __nwa +/* 801EF224 001EC164 48 0D FA A1 */ bl __nwa__FUl /* 801EF228 001EC168 7C 7D 1B 78 */ mr r29, r3 /* 801EF22C 001EC16C C3 62 A9 88 */ lfs f27, lbl_80454388-_SDA2_BASE_(r2) /* 801EF230 001EC170 3A E0 00 00 */ li r23, 0 @@ -6894,11 +6894,11 @@ lbl_801EF408: /* 801EF418 001EC358 42 00 FF 70 */ bdnz lbl_801EF388 lbl_801EF41C: /* 801EF41C 001EC35C 7F E3 FB 78 */ mr r3, r31 -/* 801EF420 001EC360 48 0D F9 41 */ bl __dla +/* 801EF420 001EC360 48 0D F9 41 */ bl __dla__FPv /* 801EF424 001EC364 7F C3 F3 78 */ mr r3, r30 -/* 801EF428 001EC368 48 0D F9 39 */ bl __dla +/* 801EF428 001EC368 48 0D F9 39 */ bl __dla__FPv /* 801EF42C 001EC36C 7F A3 EB 78 */ mr r3, r29 -/* 801EF430 001EC370 48 0D F9 31 */ bl __dla +/* 801EF430 001EC370 48 0D F9 31 */ bl __dla__FPv /* 801EF434 001EC374 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 801EF438 001EC378 CB E1 00 A0 */ lfd f31, 0xa0(r1) /* 801EF43C 001EC37C E3 C1 00 98 */ psq_l f30, 152(r1), 0, qr0 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 894f714348..39882722dc 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -106,7 +106,7 @@ dMenu_save_c_NS__create: /* 801EF7BC 001EC6FC 93 C1 00 08 */ stw r30, 8(r1) /* 801EF7C0 001EC700 7C 7E 1B 78 */ mr r30, r3 /* 801EF7C4 001EC704 38 60 00 30 */ li r3, 0x30 -/* 801EF7C8 001EC708 48 0D F4 85 */ bl __nw +/* 801EF7C8 001EC708 48 0D F4 85 */ bl __nw__FUl /* 801EF7CC 001EC70C 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF7D0 001EC710 41 82 00 2C */ beq lbl_801EF7FC /* 801EF7D4 001EC714 38 80 00 02 */ li r4, 2 @@ -165,7 +165,7 @@ lbl_801EF888: /* 801EF888 001EC7C8 3B E0 00 01 */ li r31, 1 lbl_801EF88C: /* 801EF88C 001EC7CC 38 60 00 68 */ li r3, 0x68 -/* 801EF890 001EC7D0 48 0D F3 BD */ bl __nw +/* 801EF890 001EC7D0 48 0D F3 BD */ bl __nw__FUl /* 801EF894 001EC7D4 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF898 001EC7D8 41 82 00 1C */ beq lbl_801EF8B4 /* 801EF89C 001EC7DC 80 9E 00 0C */ lwz r4, 0xc(r30) @@ -214,7 +214,7 @@ dMenu_save_c_NS_screenSet: /* 801EF934 001EC874 3C 60 80 3C */ lis r3, lbl_803BDF78@ha /* 801EF938 001EC878 3B C3 DF 78 */ addi r30, r3, lbl_803BDF78@l /* 801EF93C 001EC87C 38 60 01 18 */ li r3, 0x118 -/* 801EF940 001EC880 48 0D F3 0D */ bl __nw +/* 801EF940 001EC880 48 0D F3 0D */ bl __nw__FUl /* 801EF944 001EC884 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF948 001EC888 41 82 00 0C */ beq lbl_801EF954 /* 801EF94C 001EC88C 48 10 8B 4D */ bl J2DScreen @@ -235,7 +235,7 @@ lbl_801EF954: /* 801EF984 001EC8C4 4B E2 52 1D */ bl mDoExt_getSubFont /* 801EF988 001EC8C8 90 7F 00 24 */ stw r3, 0x24(r31) /* 801EF98C 001EC8CC 38 60 00 2C */ li r3, 0x2c -/* 801EF990 001EC8D0 48 0D F2 BD */ bl __nw +/* 801EF990 001EC8D0 48 0D F2 BD */ bl __nw__FUl /* 801EF994 001EC8D4 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF998 001EC8D8 41 82 00 0C */ beq lbl_801EF9A4 /* 801EF99C 001EC8DC 48 05 A2 85 */ bl dMsgString_c @@ -284,7 +284,7 @@ lbl_801EF9A4: /* 801EFA44 001EC984 7D 89 03 A6 */ mtctr r12 /* 801EFA48 001EC988 4E 80 04 21 */ bctrl /* 801EFA4C 001EC98C 38 60 00 6C */ li r3, 0x6c -/* 801EFA50 001EC990 48 0D F1 FD */ bl __nw +/* 801EFA50 001EC990 48 0D F1 FD */ bl __nw__FUl /* 801EFA54 001EC994 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFA58 001EC998 41 82 00 28 */ beq lbl_801EFA80 /* 801EFA5C 001EC99C 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -314,7 +314,7 @@ lbl_801EFA80: /* 801EFAB8 001EC9F8 3B 7E 00 60 */ addi r27, r30, 0x60 lbl_801EFABC: /* 801EFABC 001EC9FC 38 60 00 6C */ li r3, 0x6c -/* 801EFAC0 001ECA00 48 0D F1 8D */ bl __nw +/* 801EFAC0 001ECA00 48 0D F1 8D */ bl __nw__FUl /* 801EFAC4 001ECA04 7C 64 1B 79 */ or. r4, r3, r3 /* 801EFAC8 001ECA08 41 82 00 24 */ beq lbl_801EFAEC /* 801EFACC 001ECA0C 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -334,7 +334,7 @@ lbl_801EFAEC: /* 801EFB00 001ECA40 3B 5A 00 08 */ addi r26, r26, 8 /* 801EFB04 001ECA44 41 80 FF B8 */ blt lbl_801EFABC /* 801EFB08 001ECA48 38 60 00 6C */ li r3, 0x6c -/* 801EFB0C 001ECA4C 48 0D F1 41 */ bl __nw +/* 801EFB0C 001ECA4C 48 0D F1 41 */ bl __nw__FUl /* 801EFB10 001ECA50 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFB14 001ECA54 41 82 00 24 */ beq lbl_801EFB38 /* 801EFB18 001ECA58 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -348,7 +348,7 @@ lbl_801EFAEC: lbl_801EFB38: /* 801EFB38 001ECA78 90 1F 00 84 */ stw r0, 0x84(r31) /* 801EFB3C 001ECA7C 38 60 00 6C */ li r3, 0x6c -/* 801EFB40 001ECA80 48 0D F1 0D */ bl __nw +/* 801EFB40 001ECA80 48 0D F1 0D */ bl __nw__FUl /* 801EFB44 001ECA84 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFB48 001ECA88 41 82 00 28 */ beq lbl_801EFB70 /* 801EFB4C 001ECA8C 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -368,7 +368,7 @@ lbl_801EFB70: /* 801EFB80 001ECAC0 3B 7E 00 78 */ addi r27, r30, 0x78 lbl_801EFB84: /* 801EFB84 001ECAC4 38 60 00 6C */ li r3, 0x6c -/* 801EFB88 001ECAC8 48 0D F0 C5 */ bl __nw +/* 801EFB88 001ECAC8 48 0D F0 C5 */ bl __nw__FUl /* 801EFB8C 001ECACC 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFB90 001ECAD0 41 82 00 28 */ beq lbl_801EFBB8 /* 801EFB94 001ECAD4 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -437,7 +437,7 @@ lbl_801EFBB8: /* 801EFC8C 001ECBCC 38 00 00 01 */ li r0, 1 /* 801EFC90 001ECBD0 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801EFC94 001ECBD4 38 60 00 1C */ li r3, 0x1c -/* 801EFC98 001ECBD8 48 0D EF B5 */ bl __nw +/* 801EFC98 001ECBD8 48 0D EF B5 */ bl __nw__FUl /* 801EFC9C 001ECBDC 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFCA0 001ECBE0 41 82 00 28 */ beq lbl_801EFCC8 /* 801EFCA4 001ECBE4 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -452,7 +452,7 @@ lbl_801EFBB8: lbl_801EFCC8: /* 801EFCC8 001ECC08 90 1F 01 94 */ stw r0, 0x194(r31) /* 801EFCCC 001ECC0C 38 60 00 1C */ li r3, 0x1c -/* 801EFCD0 001ECC10 48 0D EF 7D */ bl __nw +/* 801EFCD0 001ECC10 48 0D EF 7D */ bl __nw__FUl /* 801EFCD4 001ECC14 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFCD8 001ECC18 41 82 00 28 */ beq lbl_801EFD00 /* 801EFCDC 001ECC1C 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -467,7 +467,7 @@ lbl_801EFCC8: lbl_801EFD00: /* 801EFD00 001ECC40 90 1F 01 98 */ stw r0, 0x198(r31) /* 801EFD04 001ECC44 38 60 00 1C */ li r3, 0x1c -/* 801EFD08 001ECC48 48 0D EF 45 */ bl __nw +/* 801EFD08 001ECC48 48 0D EF 45 */ bl __nw__FUl /* 801EFD0C 001ECC4C 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFD10 001ECC50 41 82 00 24 */ beq lbl_801EFD34 /* 801EFD14 001ECC54 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -481,7 +481,7 @@ lbl_801EFD00: lbl_801EFD34: /* 801EFD34 001ECC74 90 1F 01 A0 */ stw r0, 0x1a0(r31) /* 801EFD38 001ECC78 38 60 00 1C */ li r3, 0x1c -/* 801EFD3C 001ECC7C 48 0D EF 11 */ bl __nw +/* 801EFD3C 001ECC7C 48 0D EF 11 */ bl __nw__FUl /* 801EFD40 001ECC80 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFD44 001ECC84 41 82 00 24 */ beq lbl_801EFD68 /* 801EFD48 001ECC88 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -600,7 +600,7 @@ lbl_801EFDE4: /* 801EFF04 001ECE44 3B 60 00 00 */ li r27, 0 lbl_801EFF08: /* 801EFF08 001ECE48 38 60 00 6C */ li r3, 0x6c -/* 801EFF0C 001ECE4C 48 0D ED 41 */ bl __nw +/* 801EFF0C 001ECE4C 48 0D ED 41 */ bl __nw__FUl /* 801EFF10 001ECE50 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFF14 001ECE54 41 82 00 28 */ beq lbl_801EFF3C /* 801EFF18 001ECE58 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -616,7 +616,7 @@ lbl_801EFF3C: /* 801EFF3C 001ECE7C 7F 3F D2 14 */ add r25, r31, r26 /* 801EFF40 001ECE80 90 19 00 D4 */ stw r0, 0xd4(r25) /* 801EFF44 001ECE84 38 60 00 6C */ li r3, 0x6c -/* 801EFF48 001ECE88 48 0D ED 05 */ bl __nw +/* 801EFF48 001ECE88 48 0D ED 05 */ bl __nw__FUl /* 801EFF4C 001ECE8C 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFF50 001ECE90 41 82 00 28 */ beq lbl_801EFF78 /* 801EFF54 001ECE94 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -631,7 +631,7 @@ lbl_801EFF3C: lbl_801EFF78: /* 801EFF78 001ECEB8 90 19 00 E0 */ stw r0, 0xe0(r25) /* 801EFF7C 001ECEBC 38 60 00 6C */ li r3, 0x6c -/* 801EFF80 001ECEC0 48 0D EC CD */ bl __nw +/* 801EFF80 001ECEC0 48 0D EC CD */ bl __nw__FUl /* 801EFF84 001ECEC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801EFF88 001ECEC8 41 82 00 28 */ beq lbl_801EFFB0 /* 801EFF8C 001ECECC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -690,7 +690,7 @@ lbl_801EFFB0: /* 801F005C 001ECF9C 3B 40 00 00 */ li r26, 0 lbl_801F0060: /* 801F0060 001ECFA0 38 60 00 6C */ li r3, 0x6c -/* 801F0064 001ECFA4 48 0D EB E9 */ bl __nw +/* 801F0064 001ECFA4 48 0D EB E9 */ bl __nw__FUl /* 801F0068 001ECFA8 7C 60 1B 79 */ or. r0, r3, r3 /* 801F006C 001ECFAC 41 82 00 28 */ beq lbl_801F0094 /* 801F0070 001ECFB0 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -706,7 +706,7 @@ lbl_801F0094: /* 801F0094 001ECFD4 7F 3F DA 14 */ add r25, r31, r27 /* 801F0098 001ECFD8 90 19 01 18 */ stw r0, 0x118(r25) /* 801F009C 001ECFDC 38 60 00 6C */ li r3, 0x6c -/* 801F00A0 001ECFE0 48 0D EB AD */ bl __nw +/* 801F00A0 001ECFE0 48 0D EB AD */ bl __nw__FUl /* 801F00A4 001ECFE4 7C 60 1B 79 */ or. r0, r3, r3 /* 801F00A8 001ECFE8 41 82 00 28 */ beq lbl_801F00D0 /* 801F00AC 001ECFEC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -721,7 +721,7 @@ lbl_801F0094: lbl_801F00D0: /* 801F00D0 001ED010 90 19 01 20 */ stw r0, 0x120(r25) /* 801F00D4 001ED014 38 60 00 6C */ li r3, 0x6c -/* 801F00D8 001ED018 48 0D EB 75 */ bl __nw +/* 801F00D8 001ED018 48 0D EB 75 */ bl __nw__FUl /* 801F00DC 001ED01C 7C 60 1B 79 */ or. r0, r3, r3 /* 801F00E0 001ED020 41 82 00 28 */ beq lbl_801F0108 /* 801F00E4 001ED024 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -837,7 +837,7 @@ lbl_801F0108: /* 801F0298 001ED1D8 3B 40 00 00 */ li r26, 0 lbl_801F029C: /* 801F029C 001ED1DC 38 60 00 6C */ li r3, 0x6c -/* 801F02A0 001ED1E0 48 0D E9 AD */ bl __nw +/* 801F02A0 001ED1E0 48 0D E9 AD */ bl __nw__FUl /* 801F02A4 001ED1E4 7C 60 1B 79 */ or. r0, r3, r3 /* 801F02A8 001ED1E8 41 82 00 28 */ beq lbl_801F02D0 /* 801F02AC 001ED1EC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -933,7 +933,7 @@ lbl_801F03BC: /* 801F040C 001ED34C C3 C2 AA 48 */ lfs f30, lbl_80454448-_SDA2_BASE_(r2) lbl_801F0410: /* 801F0410 001ED350 38 60 00 1C */ li r3, 0x1c -/* 801F0414 001ED354 48 0D E8 39 */ bl __nw +/* 801F0414 001ED354 48 0D E8 39 */ bl __nw__FUl /* 801F0418 001ED358 7C 60 1B 79 */ or. r0, r3, r3 /* 801F041C 001ED35C 41 82 00 28 */ beq lbl_801F0444 /* 801F0420 001ED360 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1034,7 +1034,7 @@ lbl_801F0444: /* 801F0598 001ED4D8 C3 E2 AA 58 */ lfs f31, lbl_80454458-_SDA2_BASE_(r2) lbl_801F059C: /* 801F059C 001ED4DC 38 60 00 1C */ li r3, 0x1c -/* 801F05A0 001ED4E0 48 0D E6 AD */ bl __nw +/* 801F05A0 001ED4E0 48 0D E6 AD */ bl __nw__FUl /* 801F05A4 001ED4E4 7C 60 1B 79 */ or. r0, r3, r3 /* 801F05A8 001ED4E8 41 82 00 28 */ beq lbl_801F05D0 /* 801F05AC 001ED4EC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1117,7 +1117,7 @@ lbl_801F05D0: /* 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 -/* 801F06E8 001ED628 48 0D E5 65 */ bl __nw +/* 801F06E8 001ED628 48 0D E5 65 */ bl __nw__FUl /* 801F06EC 001ED62C 7C 60 1B 79 */ or. r0, r3, r3 /* 801F06F0 001ED630 41 82 00 18 */ beq lbl_801F0708 /* 801F06F4 001ED634 38 80 00 00 */ li r4, 0 @@ -1216,7 +1216,7 @@ lbl_801F0708: /* 801F0864 001ED7A4 3B 7E 01 B8 */ addi r27, r30, 0x1b8 lbl_801F0868: /* 801F0868 001ED7A8 38 60 00 3C */ li r3, 0x3c -/* 801F086C 001ED7AC 48 0D E3 E1 */ bl __nw +/* 801F086C 001ED7AC 48 0D E3 E1 */ bl __nw__FUl /* 801F0870 001ED7B0 7C 60 1B 79 */ or. r0, r3, r3 /* 801F0874 001ED7B4 41 82 00 14 */ beq lbl_801F0888 /* 801F0878 001ED7B8 80 9F 00 04 */ lwz r4, 4(r31) @@ -1248,7 +1248,7 @@ lbl_801F0888: /* 801F08DC 001ED81C 3B 5A 00 04 */ addi r26, r26, 4 /* 801F08E0 001ED820 41 80 FF 88 */ blt lbl_801F0868 /* 801F08E4 001ED824 38 60 00 40 */ li r3, 0x40 -/* 801F08E8 001ED828 48 0D E3 65 */ bl __nw +/* 801F08E8 001ED828 48 0D E3 65 */ bl __nw__FUl /* 801F08EC 001ED82C 7C 60 1B 79 */ or. r0, r3, r3 /* 801F08F0 001ED830 41 82 00 14 */ beq lbl_801F0904 /* 801F08F4 001ED834 80 9F 00 04 */ lwz r4, 4(r31) @@ -1427,7 +1427,7 @@ dMenu_save_c_NS__delete: /* 801F0B38 001EDA78 48 17 16 A1 */ bl _savegpr_28 /* 801F0B3C 001EDA7C 7C 7F 1B 78 */ mr r31, r3 /* 801F0B40 001EDA80 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801F0B44 001EDA84 48 0D E1 F9 */ bl __dl +/* 801F0B44 001EDA84 48 0D E1 F9 */ bl __dl__FPv /* 801F0B48 001EDA88 80 7F 21 8C */ lwz r3, 0x218c(r31) /* 801F0B4C 001EDA8C 28 03 00 00 */ cmplwi r3, 0 /* 801F0B50 001EDA90 41 82 00 24 */ beq lbl_801F0B74 @@ -8061,7 +8061,7 @@ lbl_801F6AC4: /* 801F6B64 001F3AA4 90 1F 00 00 */ stw r0, 0(r31) /* 801F6B68 001F3AA8 7C 80 07 35 */ extsh. r0, r4 /* 801F6B6C 001F3AAC 40 81 00 08 */ ble lbl_801F6B74 -/* 801F6B70 001F3AB0 48 0D 81 CD */ bl __dl +/* 801F6B70 001F3AB0 48 0D 81 CD */ bl __dl__FPv lbl_801F6B74: /* 801F6B74 001F3AB4 7F E3 FB 78 */ mr r3, r31 /* 801F6B78 001F3AB8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8080,7 +8080,7 @@ lbl_801F6B74: /* 801F6BAC 001F3AEC 90 1F 00 00 */ stw r0, 0(r31) /* 801F6BB0 001F3AF0 7C 80 07 35 */ extsh. r0, r4 /* 801F6BB4 001F3AF4 40 81 00 08 */ ble lbl_801F6BBC -/* 801F6BB8 001F3AF8 48 0D 81 85 */ bl __dl +/* 801F6BB8 001F3AF8 48 0D 81 85 */ bl __dl__FPv lbl_801F6BBC: /* 801F6BBC 001F3AFC 7F E3 FB 78 */ mr r3, r31 /* 801F6BC0 001F3B00 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8101,7 +8101,7 @@ dMs_HIO_c_NS_dtor: /* 801F6BF4 001F3B34 90 1F 00 00 */ stw r0, 0(r31) /* 801F6BF8 001F3B38 7C 80 07 35 */ extsh. r0, r4 /* 801F6BFC 001F3B3C 40 81 00 08 */ ble lbl_801F6C04 -/* 801F6C00 001F3B40 48 0D 81 3D */ bl __dl +/* 801F6C00 001F3B40 48 0D 81 3D */ bl __dl__FPv lbl_801F6C04: /* 801F6C04 001F3B44 7F E3 FB 78 */ mr r3, r31 /* 801F6C08 001F3B48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index fdddd83ed9..1c9d10d5ae 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -286,7 +286,7 @@ lbl_801F7610: /* 801F7610 001F4550 7F E0 07 35 */ extsh. r0, r31 /* 801F7614 001F4554 40 81 00 0C */ ble lbl_801F7620 /* 801F7618 001F4558 7F C3 F3 78 */ mr r3, r30 -/* 801F761C 001F455C 48 0D 77 21 */ bl __dl +/* 801F761C 001F455C 48 0D 77 21 */ bl __dl__FPv lbl_801F7620: /* 801F7620 001F4560 7F C3 F3 78 */ mr r3, r30 /* 801F7624 001F4564 39 61 00 20 */ addi r11, r1, 0x20 @@ -304,7 +304,7 @@ dMenu_Skill_c_NS__create: /* 801F7648 001F4588 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F764C 001F458C 7C 7F 1B 78 */ mr r31, r3 /* 801F7650 001F4590 38 60 00 B8 */ li r3, 0xb8 -/* 801F7654 001F4594 48 0D 75 F9 */ bl __nw +/* 801F7654 001F4594 48 0D 75 F9 */ bl __nw__FUl /* 801F7658 001F4598 7C 60 1B 79 */ or. r0, r3, r3 /* 801F765C 001F459C 41 82 00 18 */ beq lbl_801F7674 /* 801F7660 001F45A0 38 80 00 02 */ li r4, 2 @@ -332,7 +332,7 @@ lbl_801F7674: /* 801F76B4 001F45F4 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 801F76B8 001F45F8 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801F76BC 001F45FC 38 60 00 2C */ li r3, 0x2c -/* 801F76C0 001F4600 48 0D 75 8D */ bl __nw +/* 801F76C0 001F4600 48 0D 75 8D */ bl __nw__FUl /* 801F76C4 001F4604 7C 60 1B 79 */ or. r0, r3, r3 /* 801F76C8 001F4608 41 82 00 0C */ beq lbl_801F76D4 /* 801F76CC 001F460C 48 05 25 55 */ bl dMsgString_c @@ -1212,7 +1212,7 @@ dMenu_Skill_c_NS_screenSetMenu: /* 801F83A0 001F52E0 3C 60 80 39 */ lis r3, lbl_80397A18@ha /* 801F83A4 001F52E4 3A E3 7A 18 */ addi r23, r3, lbl_80397A18@l /* 801F83A8 001F52E8 38 60 01 18 */ li r3, 0x118 -/* 801F83AC 001F52EC 48 0D 68 A1 */ bl __nw +/* 801F83AC 001F52EC 48 0D 68 A1 */ bl __nw__FUl /* 801F83B0 001F52F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801F83B4 001F52F4 41 82 00 0C */ beq lbl_801F83C0 /* 801F83B8 001F52F8 48 10 00 E1 */ bl J2DScreen @@ -1229,7 +1229,7 @@ lbl_801F83C0: /* 801F83E0 001F5320 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801F83E4 001F5324 48 05 CD 05 */ bl dPaneClass_showNullPane /* 801F83E8 001F5328 38 60 00 6C */ li r3, 0x6c -/* 801F83EC 001F532C 48 0D 68 61 */ bl __nw +/* 801F83EC 001F532C 48 0D 68 61 */ bl __nw__FUl /* 801F83F0 001F5330 7C 60 1B 79 */ or. r0, r3, r3 /* 801F83F4 001F5334 41 82 00 24 */ beq lbl_801F8418 /* 801F83F8 001F5338 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -1366,7 +1366,7 @@ lbl_801F8594: /* 801F85F8 001F5538 3A 17 01 F8 */ addi r16, r23, 0x1f8 lbl_801F85FC: /* 801F85FC 001F553C 38 60 00 6C */ li r3, 0x6c -/* 801F8600 001F5540 48 0D 66 4D */ bl __nw +/* 801F8600 001F5540 48 0D 66 4D */ bl __nw__FUl /* 801F8604 001F5544 7C 64 1B 79 */ or. r4, r3, r3 /* 801F8608 001F5548 41 82 00 24 */ beq lbl_801F862C /* 801F860C 001F554C 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -1645,7 +1645,7 @@ dMenu_Skill_c_NS_screenSetLetter: /* 801F8A28 001F5968 48 16 97 A1 */ bl func_803621C8 /* 801F8A2C 001F596C 7C 7F 1B 78 */ mr r31, r3 /* 801F8A30 001F5970 38 60 01 18 */ li r3, 0x118 -/* 801F8A34 001F5974 48 0D 62 19 */ bl __nw +/* 801F8A34 001F5974 48 0D 62 19 */ bl __nw__FUl /* 801F8A38 001F5978 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8A3C 001F597C 41 82 00 0C */ beq lbl_801F8A48 /* 801F8A40 001F5980 48 0F FA 59 */ bl J2DScreen @@ -1662,7 +1662,7 @@ lbl_801F8A48: /* 801F8A68 001F59A8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801F8A6C 001F59AC 48 05 C6 7D */ bl dPaneClass_showNullPane /* 801F8A70 001F59B0 38 60 00 6C */ li r3, 0x6c -/* 801F8A74 001F59B4 48 0D 61 D9 */ bl __nw +/* 801F8A74 001F59B4 48 0D 61 D9 */ bl __nw__FUl /* 801F8A78 001F59B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8A7C 001F59BC 41 82 00 28 */ beq lbl_801F8AA4 /* 801F8A80 001F59C0 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1688,7 +1688,7 @@ lbl_801F8AA4: /* 801F8ACC 001F5A0C 38 00 00 00 */ li r0, 0 /* 801F8AD0 001F5A10 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801F8AD4 001F5A14 38 60 00 6C */ li r3, 0x6c -/* 801F8AD8 001F5A18 48 0D 61 75 */ bl __nw +/* 801F8AD8 001F5A18 48 0D 61 75 */ bl __nw__FUl /* 801F8ADC 001F5A1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8AE0 001F5A20 41 82 00 28 */ beq lbl_801F8B08 /* 801F8AE4 001F5A24 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1767,7 +1767,7 @@ lbl_801F8B74: /* 801F8C00 001F5B40 3B BD 00 08 */ addi r29, r29, 8 /* 801F8C04 001F5B44 41 80 FF 70 */ blt lbl_801F8B74 /* 801F8C08 001F5B48 38 60 00 6C */ li r3, 0x6c -/* 801F8C0C 001F5B4C 48 0D 60 41 */ bl __nw +/* 801F8C0C 001F5B4C 48 0D 60 41 */ bl __nw__FUl /* 801F8C10 001F5B50 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8C14 001F5B54 41 82 00 24 */ beq lbl_801F8C38 /* 801F8C18 001F5B58 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -1797,7 +1797,7 @@ lbl_801F8C38: /* 801F8C74 001F5BB4 4E 80 04 21 */ bctrl /* 801F8C78 001F5BB8 7C 78 1B 78 */ mr r24, r3 /* 801F8C7C 001F5BBC 38 60 01 50 */ li r3, 0x150 -/* 801F8C80 001F5BC0 48 0D 5F CD */ bl __nw +/* 801F8C80 001F5BC0 48 0D 5F CD */ bl __nw__FUl /* 801F8C84 001F5BC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8C88 001F5BC8 41 82 00 10 */ beq lbl_801F8C98 /* 801F8C8C 001F5BCC 7F 04 C3 78 */ mr r4, r24 @@ -1848,7 +1848,7 @@ dMenu_Skill_c_NS_screenSetDoIcon: /* 801F8D30 001F5C70 48 16 94 99 */ bl func_803621C8 /* 801F8D34 001F5C74 7C 7F 1B 78 */ mr r31, r3 /* 801F8D38 001F5C78 38 60 01 18 */ li r3, 0x118 -/* 801F8D3C 001F5C7C 48 0D 5F 11 */ bl __nw +/* 801F8D3C 001F5C7C 48 0D 5F 11 */ bl __nw__FUl /* 801F8D40 001F5C80 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8D44 001F5C84 41 82 00 0C */ beq lbl_801F8D50 /* 801F8D48 001F5C88 48 0F F7 51 */ bl J2DScreen diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index c1c48e8456..88dab3d625 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -193,7 +193,7 @@ lbl_801FA134: /* 801FA1F4 001F7134 48 00 2A 51 */ bl dMw_c_NS_dMw_insect_delete lbl_801FA1F8: /* 801FA1F8 001F7138 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FA1FC 001F713C 48 0D 43 D1 */ bl JKRHeap_NS_freeAll +/* 801FA1FC 001F713C 48 0D 43 D1 */ bl freeAll__7JKRHeapFv /* 801FA200 001F7140 38 60 00 00 */ li r3, 0 /* 801FA204 001F7144 4B E3 3F 85 */ bl dComIfGp_offHeapLockFlag /* 801FA208 001F7148 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2070,7 +2070,7 @@ dMw_c_NS_dMw_capture_create: /* 801FBDAC 001F8CEC 28 00 00 00 */ cmplwi r0, 0 /* 801FBDB0 001F8CF0 40 82 00 50 */ bne lbl_801FBE00 /* 801FBDB4 001F8CF4 38 60 00 08 */ li r3, 8 -/* 801FBDB8 001F8CF8 48 0D 2E 95 */ bl __nw +/* 801FBDB8 001F8CF8 48 0D 2E 95 */ bl __nw__FUl /* 801FBDBC 001F8CFC 28 03 00 00 */ cmplwi r3, 0 /* 801FBDC0 001F8D00 41 82 00 30 */ beq lbl_801FBDF0 /* 801FBDC4 001F8D04 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2147,7 +2147,7 @@ dMw_c_NS_dMw_ring_create: /* 801FBEB4 001F8DF4 38 60 00 01 */ li r3, 1 /* 801FBEB8 001F8DF8 4B E3 22 29 */ bl dComIfGp_setHeapLockFlag /* 801FBEBC 001F8DFC 38 60 06 D4 */ li r3, 0x6d4 -/* 801FBEC0 001F8E00 48 0D 2D 8D */ bl __nw +/* 801FBEC0 001F8E00 48 0D 2D 8D */ bl __nw__FUl /* 801FBEC4 001F8E04 7C 60 1B 79 */ or. r0, r3, r3 /* 801FBEC8 001F8E08 41 82 00 1C */ beq lbl_801FBEE4 /* 801FBECC 001F8E0C 80 9E 01 00 */ lwz r4, 0x100(r30) @@ -2164,7 +2164,7 @@ lbl_801FBEE4: /* 801FBEF4 001F8E34 28 00 00 00 */ cmplwi r0, 0 /* 801FBEF8 001F8E38 40 82 00 44 */ bne lbl_801FBF3C /* 801FBEFC 001F8E3C 38 60 00 08 */ li r3, 8 -/* 801FBF00 001F8E40 48 0D 2D 4D */ bl __nw +/* 801FBF00 001F8E40 48 0D 2D 4D */ bl __nw__FUl /* 801FBF04 001F8E44 28 03 00 00 */ cmplwi r3, 0 /* 801FBF08 001F8E48 41 82 00 30 */ beq lbl_801FBF38 /* 801FBF0C 001F8E4C 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2245,7 +2245,7 @@ dMw_c_NS_dMw_collect_create: /* 801FC008 001F8F48 7C 7F 1B 78 */ mr r31, r3 /* 801FC00C 001F8F4C 48 00 10 89 */ bl dMw_c_NS_markMemSize /* 801FC010 001F8F50 38 60 00 0C */ li r3, 0xc -/* 801FC014 001F8F54 48 0D 2C 39 */ bl __nw +/* 801FC014 001F8F54 48 0D 2C 39 */ bl __nw__FUl /* 801FC018 001F8F58 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC01C 001F8F5C 41 82 00 18 */ beq lbl_801FC034 /* 801FC020 001F8F60 80 9F 01 00 */ lwz r4, 0x100(r31) @@ -2363,7 +2363,7 @@ lbl_801FC19C: /* 801FC1A4 001F90E4 3B E0 00 03 */ li r31, 3 lbl_801FC1A8: /* 801FC1A8 001F90E8 38 60 03 14 */ li r3, 0x314 -/* 801FC1AC 001F90EC 48 0D 2A A1 */ bl __nw +/* 801FC1AC 001F90EC 48 0D 2A A1 */ bl __nw__FUl /* 801FC1B0 001F90F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC1B4 001F90F4 41 82 00 30 */ beq lbl_801FC1E4 /* 801FC1B8 001F90F8 80 9E 01 00 */ lwz r4, 0x100(r30) @@ -2383,7 +2383,7 @@ lbl_801FC1E4: /* 801FC1EC 001F912C 28 00 00 00 */ cmplwi r0, 0 /* 801FC1F0 001F9130 40 82 00 44 */ bne lbl_801FC234 /* 801FC1F4 001F9134 38 60 00 08 */ li r3, 8 -/* 801FC1F8 001F9138 48 0D 2A 55 */ bl __nw +/* 801FC1F8 001F9138 48 0D 2A 55 */ bl __nw__FUl /* 801FC1FC 001F913C 28 03 00 00 */ cmplwi r3, 0 /* 801FC200 001F9140 41 82 00 30 */ beq lbl_801FC230 /* 801FC204 001F9144 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2496,7 +2496,7 @@ dMw_c_NS_dMw_dmap_create: /* 801FC378 001F92B8 28 00 00 00 */ cmplwi r0, 0 /* 801FC37C 001F92BC 40 82 00 44 */ bne lbl_801FC3C0 /* 801FC380 001F92C0 38 60 00 08 */ li r3, 8 -/* 801FC384 001F92C4 48 0D 28 C9 */ bl __nw +/* 801FC384 001F92C4 48 0D 28 C9 */ bl __nw__FUl /* 801FC388 001F92C8 28 03 00 00 */ cmplwi r3, 0 /* 801FC38C 001F92CC 41 82 00 30 */ beq lbl_801FC3BC /* 801FC390 001F92D0 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2540,7 +2540,7 @@ lbl_801FC40C: /* 801FC414 001F9354 3B E0 00 00 */ li r31, 0 lbl_801FC418: /* 801FC418 001F9358 38 60 01 88 */ li r3, 0x188 -/* 801FC41C 001F935C 48 0D 28 31 */ bl __nw +/* 801FC41C 001F935C 48 0D 28 31 */ bl __nw__FUl /* 801FC420 001F9360 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC424 001F9364 41 82 00 20 */ beq lbl_801FC444 /* 801FC428 001F9368 80 9E 01 00 */ lwz r4, 0x100(r30) @@ -2625,7 +2625,7 @@ dMw_c_NS_dMw_save_create: /* 801FC530 001F9470 7C 7F 1B 78 */ mr r31, r3 /* 801FC534 001F9474 48 00 0B 61 */ bl dMw_c_NS_markMemSize /* 801FC538 001F9478 38 60 21 A4 */ li r3, 0x21a4 -/* 801FC53C 001F947C 48 0D 27 11 */ bl __nw +/* 801FC53C 001F947C 48 0D 27 11 */ bl __nw__FUl /* 801FC540 001F9480 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC544 001F9484 41 82 00 0C */ beq lbl_801FC550 /* 801FC548 001F9488 4B FF 31 59 */ bl dMenu_save_c @@ -2643,7 +2643,7 @@ lbl_801FC550: /* 801FC574 001F94B4 28 00 00 00 */ cmplwi r0, 0 /* 801FC578 001F94B8 40 82 00 44 */ bne lbl_801FC5BC /* 801FC57C 001F94BC 38 60 00 08 */ li r3, 8 -/* 801FC580 001F94C0 48 0D 26 CD */ bl __nw +/* 801FC580 001F94C0 48 0D 26 CD */ bl __nw__FUl /* 801FC584 001F94C4 28 03 00 00 */ cmplwi r3, 0 /* 801FC588 001F94C8 41 82 00 30 */ beq lbl_801FC5B8 /* 801FC58C 001F94CC 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2720,7 +2720,7 @@ dMw_c_NS_dMw_option_create: /* 801FC678 001F95B8 7C 7F 1B 78 */ mr r31, r3 /* 801FC67C 001F95BC 48 00 0A 19 */ bl dMw_c_NS_markMemSize /* 801FC680 001F95C0 38 60 04 0C */ li r3, 0x40c -/* 801FC684 001F95C4 48 0D 25 C9 */ bl __nw +/* 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 @@ -2735,7 +2735,7 @@ lbl_801FC6A8: /* 801FC6B0 001F95F0 28 00 00 00 */ cmplwi r0, 0 /* 801FC6B4 001F95F4 40 82 00 44 */ bne lbl_801FC6F8 /* 801FC6B8 001F95F8 38 60 00 08 */ li r3, 8 -/* 801FC6BC 001F95FC 48 0D 25 91 */ bl __nw +/* 801FC6BC 001F95FC 48 0D 25 91 */ bl __nw__FUl /* 801FC6C0 001F9600 28 03 00 00 */ cmplwi r3, 0 /* 801FC6C4 001F9604 41 82 00 30 */ beq lbl_801FC6F4 /* 801FC6C8 001F9608 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2820,7 +2820,7 @@ dMw_c_NS_dMw_letter_create: /* 801FC7CC 001F970C 7C 7F 1B 78 */ mr r31, r3 /* 801FC7D0 001F9710 48 00 08 C5 */ bl dMw_c_NS_markMemSize /* 801FC7D4 001F9714 38 60 03 E8 */ li r3, 0x3e8 -/* 801FC7D8 001F9718 48 0D 24 75 */ bl __nw +/* 801FC7D8 001F9718 48 0D 24 75 */ bl __nw__FUl /* 801FC7DC 001F971C 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC7E0 001F9720 41 82 00 18 */ beq lbl_801FC7F8 /* 801FC7E4 001F9724 80 9F 01 00 */ lwz r4, 0x100(r31) @@ -2834,7 +2834,7 @@ lbl_801FC7F8: /* 801FC800 001F9740 28 00 00 00 */ cmplwi r0, 0 /* 801FC804 001F9744 40 82 00 44 */ bne lbl_801FC848 /* 801FC808 001F9748 38 60 00 08 */ li r3, 8 -/* 801FC80C 001F974C 48 0D 24 41 */ bl __nw +/* 801FC80C 001F974C 48 0D 24 41 */ bl __nw__FUl /* 801FC810 001F9750 28 03 00 00 */ cmplwi r3, 0 /* 801FC814 001F9754 41 82 00 30 */ beq lbl_801FC844 /* 801FC818 001F9758 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -2917,7 +2917,7 @@ dMw_c_NS_dMw_fishing_create: /* 801FC914 001F9854 7C 7F 1B 78 */ mr r31, r3 /* 801FC918 001F9858 48 00 07 7D */ bl dMw_c_NS_markMemSize /* 801FC91C 001F985C 38 60 01 FC */ li r3, 0x1fc -/* 801FC920 001F9860 48 0D 23 2D */ bl __nw +/* 801FC920 001F9860 48 0D 23 2D */ bl __nw__FUl /* 801FC924 001F9864 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC928 001F9868 41 82 00 18 */ beq lbl_801FC940 /* 801FC92C 001F986C 80 9F 01 00 */ lwz r4, 0x100(r31) @@ -2931,7 +2931,7 @@ lbl_801FC940: /* 801FC948 001F9888 28 00 00 00 */ cmplwi r0, 0 /* 801FC94C 001F988C 40 82 00 44 */ bne lbl_801FC990 /* 801FC950 001F9890 38 60 00 08 */ li r3, 8 -/* 801FC954 001F9894 48 0D 22 F9 */ bl __nw +/* 801FC954 001F9894 48 0D 22 F9 */ bl __nw__FUl /* 801FC958 001F9898 28 03 00 00 */ cmplwi r3, 0 /* 801FC95C 001F989C 41 82 00 30 */ beq lbl_801FC98C /* 801FC960 001F98A0 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -3014,7 +3014,7 @@ dMw_c_NS_dMw_skill_create: /* 801FCA5C 001F999C 7C 7F 1B 78 */ mr r31, r3 /* 801FCA60 001F99A0 48 00 06 35 */ bl dMw_c_NS_markMemSize /* 801FCA64 001F99A4 38 60 02 0C */ li r3, 0x20c -/* 801FCA68 001F99A8 48 0D 21 E5 */ bl __nw +/* 801FCA68 001F99A8 48 0D 21 E5 */ bl __nw__FUl /* 801FCA6C 001F99AC 7C 60 1B 79 */ or. r0, r3, r3 /* 801FCA70 001F99B0 41 82 00 18 */ beq lbl_801FCA88 /* 801FCA74 001F99B4 80 9F 01 00 */ lwz r4, 0x100(r31) @@ -3028,7 +3028,7 @@ lbl_801FCA88: /* 801FCA90 001F99D0 28 00 00 00 */ cmplwi r0, 0 /* 801FCA94 001F99D4 40 82 00 44 */ bne lbl_801FCAD8 /* 801FCA98 001F99D8 38 60 00 08 */ li r3, 8 -/* 801FCA9C 001F99DC 48 0D 21 B1 */ bl __nw +/* 801FCA9C 001F99DC 48 0D 21 B1 */ bl __nw__FUl /* 801FCAA0 001F99E0 28 03 00 00 */ cmplwi r3, 0 /* 801FCAA4 001F99E4 41 82 00 30 */ beq lbl_801FCAD4 /* 801FCAA8 001F99E8 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -3113,7 +3113,7 @@ dMw_c_NS_dMw_insect_create: /* 801FCBAC 001F9AEC 7C 9F 23 78 */ mr r31, r4 /* 801FCBB0 001F9AF0 48 00 04 E5 */ bl dMw_c_NS_markMemSize /* 801FCBB4 001F9AF4 38 60 01 00 */ li r3, 0x100 -/* 801FCBB8 001F9AF8 48 0D 20 95 */ bl __nw +/* 801FCBB8 001F9AF8 48 0D 20 95 */ bl __nw__FUl /* 801FCBBC 001F9AFC 7C 60 1B 79 */ or. r0, r3, r3 /* 801FCBC0 001F9B00 41 82 00 1C */ beq lbl_801FCBDC /* 801FCBC4 001F9B04 80 9E 01 00 */ lwz r4, 0x100(r30) @@ -3128,7 +3128,7 @@ lbl_801FCBDC: /* 801FCBE4 001F9B24 28 00 00 00 */ cmplwi r0, 0 /* 801FCBE8 001F9B28 40 82 00 44 */ bne lbl_801FCC2C /* 801FCBEC 001F9B2C 38 60 00 08 */ li r3, 8 -/* 801FCBF0 001F9B30 48 0D 20 5D */ bl __nw +/* 801FCBF0 001F9B30 48 0D 20 5D */ bl __nw__FUl /* 801FCBF4 001F9B34 28 03 00 00 */ cmplwi r3, 0 /* 801FCBF8 001F9B38 41 82 00 30 */ beq lbl_801FCC28 /* 801FCBFC 001F9B3C 3C 80 80 3A */ lis r4, lbl_803A6F88@ha @@ -3491,7 +3491,7 @@ dMw_c_NS_markMemSize: /* 801FD0AC 001F9FEC 2C 00 00 00 */ cmpwi r0, 0 /* 801FD0B0 001F9FF0 40 82 00 10 */ bne lbl_801FD0C0 /* 801FD0B4 001F9FF4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0B8 001F9FF8 48 0D 16 CD */ bl JKRHeap_NS_getTotalFreeSize +/* 801FD0B8 001F9FF8 48 0D 16 CD */ bl getTotalFreeSize__7JKRHeapFv /* 801FD0BC 001F9FFC 90 7F 01 38 */ stw r3, 0x138(r31) lbl_801FD0C0: /* 801FD0C0 001FA000 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3511,7 +3511,7 @@ dMw_c_NS_checkMemSize: /* 801FD0EC 001FA02C 2C 00 00 00 */ cmpwi r0, 0 /* 801FD0F0 001FA030 40 81 00 3C */ ble lbl_801FD12C /* 801FD0F4 001FA034 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0F8 001FA038 48 0D 16 8D */ bl JKRHeap_NS_getTotalFreeSize +/* 801FD0F8 001FA038 48 0D 16 8D */ bl getTotalFreeSize__7JKRHeapFv /* 801FD0FC 001FA03C 80 1F 01 38 */ lwz r0, 0x138(r31) /* 801FD100 001FA040 7C 00 18 51 */ subf. r0, r0, r3 /* 801FD104 001FA044 40 80 00 08 */ bge lbl_801FD10C @@ -3546,7 +3546,7 @@ dMw_c_NS__create: /* 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 -/* 801FD16C 001FA0AC 48 0D 1A E1 */ bl __nw +/* 801FD16C 001FA0AC 48 0D 1A E1 */ bl __nw__FUl /* 801FD170 001FA0B0 7C 60 1B 79 */ or. r0, r3, r3 /* 801FD174 001FA0B4 41 82 00 2C */ beq lbl_801FD1A0 /* 801FD178 001FA0B8 38 80 00 05 */ li r4, 5 @@ -3565,7 +3565,7 @@ lbl_801FD1A0: /* 801FD1A8 001FA0E8 80 7E 01 04 */ lwz r3, 0x104(r30) /* 801FD1AC 001FA0EC B0 03 00 28 */ sth r0, 0x28(r3) /* 801FD1B0 001FA0F0 38 60 00 30 */ li r3, 0x30 -/* 801FD1B4 001FA0F4 48 0D 1A 99 */ bl __nw +/* 801FD1B4 001FA0F4 48 0D 1A 99 */ bl __nw__FUl /* 801FD1B8 001FA0F8 7C 7F 1B 79 */ or. r31, r3, r3 /* 801FD1BC 001FA0FC 41 82 00 34 */ beq lbl_801FD1F0 /* 801FD1C0 001FA100 38 80 00 05 */ li r4, 5 @@ -3910,11 +3910,11 @@ dMw_c_NS__delete: /* 801FD694 001FA5D4 4B E1 1B 59 */ bl mDoExt_getCurrentHeap /* 801FD698 001FA5D8 7C 7F 1B 78 */ mr r31, r3 /* 801FD69C 001FA5DC 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD6A0 001FA5E0 48 0D 16 9D */ bl __dl +/* 801FD6A0 001FA5E0 48 0D 16 9D */ bl __dl__FPv /* 801FD6A4 001FA5E4 38 00 00 00 */ li r0, 0 /* 801FD6A8 001FA5E8 90 1E 01 04 */ stw r0, 0x104(r30) /* 801FD6AC 001FA5EC 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD6B0 001FA5F0 48 0D 16 8D */ bl __dl +/* 801FD6B0 001FA5F0 48 0D 16 8D */ bl __dl__FPv /* 801FD6B4 001FA5F4 38 00 00 00 */ li r0, 0 /* 801FD6B8 001FA5F8 90 1E 01 08 */ stw r0, 0x108(r30) /* 801FD6BC 001FA5FC 80 7E 01 00 */ lwz r3, 0x100(r30) @@ -4721,7 +4721,7 @@ lbl_801FE2D4: /* 801FE308 001FB248 90 1F 00 00 */ stw r0, 0(r31) /* 801FE30C 001FB24C 7C 80 07 35 */ extsh. r0, r4 /* 801FE310 001FB250 40 81 00 08 */ ble lbl_801FE318 -/* 801FE314 001FB254 48 0D 0A 29 */ bl __dl +/* 801FE314 001FB254 48 0D 0A 29 */ bl __dl__FPv lbl_801FE318: /* 801FE318 001FB258 7F E3 FB 78 */ mr r3, r31 /* 801FE31C 001FB25C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 62af283fbd..0cdd156a8a 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -348,12 +348,12 @@ lbl_801C0D24: /* 801C0D28 001BDC68 80 7E 00 7C */ lwz r3, 0x7c(r30) /* 801C0D2C 001BDC6C 28 03 00 00 */ cmplwi r3, 0 /* 801C0D30 001BDC70 41 82 00 08 */ beq lbl_801C0D38 -/* 801C0D34 001BDC74 48 10 E0 2D */ bl __dla +/* 801C0D34 001BDC74 48 10 E0 2D */ bl __dla__FPv lbl_801C0D38: /* 801C0D38 001BDC78 80 7E 00 74 */ lwz r3, 0x74(r30) /* 801C0D3C 001BDC7C 28 03 00 00 */ cmplwi r3, 0 /* 801C0D40 001BDC80 41 82 00 08 */ beq lbl_801C0D48 -/* 801C0D44 001BDC84 48 10 E0 1D */ bl __dla +/* 801C0D44 001BDC84 48 10 E0 1D */ bl __dla__FPv lbl_801C0D48: /* 801C0D48 001BDC88 3B BD 00 01 */ addi r29, r29, 1 /* 801C0D4C 001BDC8C 2C 1D 00 02 */ cmpwi r29, 2 @@ -389,7 +389,7 @@ lbl_801C0DA4: /* 801C0DB4 001BDCF4 38 E0 00 00 */ li r7, 0 /* 801C0DB8 001BDCF8 48 19 CE 65 */ bl GXGetTexBufferSize /* 801C0DBC 001BDCFC 38 80 00 20 */ li r4, 0x20 -/* 801C0DC0 001BDD00 48 10 DF 2D */ bl __nwa_X1_ +/* 801C0DC0 001BDD00 48 10 DF 2D */ bl __nwa__FUli /* 801C0DC4 001BDD04 7F B6 F2 14 */ add r29, r22, r30 /* 801C0DC8 001BDD08 90 7D 00 7C */ stw r3, 0x7c(r29) /* 801C0DCC 001BDD0C 3B 9F 00 04 */ addi r28, r31, 4 @@ -403,7 +403,7 @@ lbl_801C0DA4: /* 801C0DEC 001BDD2C 4B E7 EE DD */ bl renderingDAmap_c_NS_init /* 801C0DF0 001BDD30 38 60 00 20 */ li r3, 0x20 /* 801C0DF4 001BDD34 38 80 00 20 */ li r4, 0x20 -/* 801C0DF8 001BDD38 48 10 DE 7D */ bl __nw_X1_ +/* 801C0DF8 001BDD38 48 10 DE 7D */ bl __nw__FUli /* 801C0DFC 001BDD3C 90 7D 00 74 */ stw r3, 0x74(r29) /* 801C0E00 001BDD40 7F 83 E3 78 */ mr r3, r28 /* 801C0E04 001BDD44 80 9D 00 74 */ lwz r4, 0x74(r29) diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index 6782afce07..62dc8680ce 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -954,7 +954,7 @@ lbl_801CEDBC: /* 801CEDBC 001CBCFC 7F E0 07 35 */ extsh. r0, r31 /* 801CEDC0 001CBD00 40 81 00 0C */ ble lbl_801CEDCC /* 801CEDC4 001CBD04 7F C3 F3 78 */ mr r3, r30 -/* 801CEDC8 001CBD08 48 0F FF 75 */ bl __dl +/* 801CEDC8 001CBD08 48 0F FF 75 */ bl __dl__FPv lbl_801CEDCC: /* 801CEDCC 001CBD0C 7F C3 F3 78 */ mr r3, r30 /* 801CEDD0 001CBD10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -998,14 +998,14 @@ dMenu_FmapMap_c_NS__delete: /* 801CEE50 001CBD90 80 63 00 BC */ lwz r3, 0xbc(r3) /* 801CEE54 001CBD94 28 03 00 00 */ cmplwi r3, 0 /* 801CEE58 001CBD98 41 82 00 10 */ beq lbl_801CEE68 -/* 801CEE5C 001CBD9C 48 0F FE E1 */ bl __dl +/* 801CEE5C 001CBD9C 48 0F FE E1 */ bl __dl__FPv /* 801CEE60 001CBDA0 38 00 00 00 */ li r0, 0 /* 801CEE64 001CBDA4 90 1F 00 BC */ stw r0, 0xbc(r31) lbl_801CEE68: /* 801CEE68 001CBDA8 80 7F 00 C0 */ lwz r3, 0xc0(r31) /* 801CEE6C 001CBDAC 28 03 00 00 */ cmplwi r3, 0 /* 801CEE70 001CBDB0 41 82 00 10 */ beq lbl_801CEE80 -/* 801CEE74 001CBDB4 48 0F FE ED */ bl __dla +/* 801CEE74 001CBDB4 48 0F FE ED */ bl __dla__FPv /* 801CEE78 001CBDB8 38 00 00 00 */ li r0, 0 /* 801CEE7C 001CBDBC 90 1F 00 C0 */ stw r0, 0xc0(r31) lbl_801CEE80: @@ -1381,7 +1381,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF3D8 001CC318 38 E0 00 00 */ li r7, 0 /* 801CF3DC 001CC31C 48 18 E8 41 */ bl GXGetTexBufferSize /* 801CF3E0 001CC320 38 80 00 20 */ li r4, 0x20 -/* 801CF3E4 001CC324 48 0F F9 09 */ bl __nwa_X1_ +/* 801CF3E4 001CC324 48 0F F9 09 */ bl __nwa__FUli /* 801CF3E8 001CC328 90 7B 00 C0 */ stw r3, 0xc0(r27) /* 801CF3EC 001CC32C 7F 63 DB 78 */ mr r3, r27 /* 801CF3F0 001CC330 80 9B 00 C0 */ lwz r4, 0xc0(r27) @@ -1392,7 +1392,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF404 001CC344 4B FF ED 59 */ bl renderingFmap_c_NS_init /* 801CF408 001CC348 38 60 00 20 */ li r3, 0x20 /* 801CF40C 001CC34C 38 80 00 20 */ li r4, 0x20 -/* 801CF410 001CC350 48 0F F8 65 */ bl __nw_X1_ +/* 801CF410 001CC350 48 0F F8 65 */ bl __nw__FUli /* 801CF414 001CC354 90 7B 00 BC */ stw r3, 0xbc(r27) /* 801CF418 001CC358 7F 63 DB 78 */ mr r3, r27 /* 801CF41C 001CC35C 80 9B 00 BC */ lwz r4, 0xbc(r27) @@ -1476,7 +1476,7 @@ lbl_801CF534: /* 801CF534 001CC474 7C 80 07 35 */ extsh. r0, r4 /* 801CF538 001CC478 40 81 00 0C */ ble lbl_801CF544 /* 801CF53C 001CC47C 7F E3 FB 78 */ mr r3, r31 -/* 801CF540 001CC480 48 0F F7 FD */ bl __dl +/* 801CF540 001CC480 48 0F F7 FD */ bl __dl__FPv lbl_801CF544: /* 801CF544 001CC484 7F E3 FB 78 */ mr r3, r31 /* 801CF548 001CC488 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 131b42d273..ebb9c9e7ab 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -38,7 +38,7 @@ dMenu_ItemExplain_c: /* 801DA7CC 001D770C 90 1F 00 08 */ stw r0, 8(r31) /* 801DA7D0 001D7710 93 DF 00 B8 */ stw r30, 0xb8(r31) /* 801DA7D4 001D7714 80 7F 00 04 */ lwz r3, 4(r31) -/* 801DA7D8 001D7718 48 0F 3F AD */ bl JKRHeap_NS_getTotalFreeSize +/* 801DA7D8 001D7718 48 0F 3F AD */ bl getTotalFreeSize__7JKRHeapFv /* 801DA7DC 001D771C 38 00 00 00 */ li r0, 0 /* 801DA7E0 001D7720 90 1F 00 C8 */ stw r0, 0xc8(r31) /* 801DA7E4 001D7724 90 1F 00 CC */ stw r0, 0xcc(r31) @@ -103,7 +103,7 @@ lbl_801DA8AC: /* 801DA8BC 001D77FC 38 00 00 00 */ li r0, 0 /* 801DA8C0 001D7800 B0 1F 00 DC */ sth r0, 0xdc(r31) /* 801DA8C4 001D7804 38 60 00 2C */ li r3, 0x2c -/* 801DA8C8 001D7808 48 0F 43 85 */ bl __nw +/* 801DA8C8 001D7808 48 0F 43 85 */ bl __nw__FUl /* 801DA8CC 001D780C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA8D0 001D7810 41 82 00 10 */ beq lbl_801DA8E0 /* 801DA8D4 001D7814 38 80 00 01 */ li r4, 1 @@ -112,7 +112,7 @@ lbl_801DA8AC: lbl_801DA8E0: /* 801DA8E0 001D7820 90 1F 00 0C */ stw r0, 0xc(r31) /* 801DA8E4 001D7824 38 60 00 10 */ li r3, 0x10 -/* 801DA8E8 001D7828 48 0F 43 65 */ bl __nw +/* 801DA8E8 001D7828 48 0F 43 65 */ bl __nw__FUl /* 801DA8EC 001D782C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA8F0 001D7830 41 82 00 0C */ beq lbl_801DA8FC /* 801DA8F4 001D7834 4B FD 40 45 */ bl dKantera_icon_c @@ -120,7 +120,7 @@ lbl_801DA8E0: lbl_801DA8FC: /* 801DA8FC 001D783C 90 1F 00 6C */ stw r0, 0x6c(r31) /* 801DA900 001D7840 38 60 01 18 */ li r3, 0x118 -/* 801DA904 001D7844 48 0F 43 49 */ bl __nw +/* 801DA904 001D7844 48 0F 43 49 */ bl __nw__FUl /* 801DA908 001D7848 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA90C 001D784C 41 82 00 0C */ beq lbl_801DA918 /* 801DA910 001D7850 48 11 DB 89 */ bl J2DScreen @@ -134,7 +134,7 @@ lbl_801DA918: /* 801DA92C 001D786C 80 DF 00 08 */ lwz r6, 8(r31) /* 801DA930 001D7870 48 11 DD 19 */ bl J2DScreen_NS_setPriority /* 801DA934 001D7874 38 60 00 6C */ li r3, 0x6c -/* 801DA938 001D7878 48 0F 43 15 */ bl __nw +/* 801DA938 001D7878 48 0F 43 15 */ bl __nw__FUl /* 801DA93C 001D787C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA940 001D7880 41 82 00 24 */ beq lbl_801DA964 /* 801DA944 001D7884 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -150,7 +150,7 @@ lbl_801DA964: /* 801DA968 001D78A8 38 00 00 00 */ li r0, 0 /* 801DA96C 001D78AC 90 1F 00 40 */ stw r0, 0x40(r31) /* 801DA970 001D78B0 38 60 00 6C */ li r3, 0x6c -/* 801DA974 001D78B4 48 0F 42 D9 */ bl __nw +/* 801DA974 001D78B4 48 0F 42 D9 */ bl __nw__FUl /* 801DA978 001D78B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA97C 001D78BC 41 82 00 28 */ beq lbl_801DA9A4 /* 801DA980 001D78C0 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -171,7 +171,7 @@ lbl_801DA9A4: /* 801DA9B8 001D78F8 C0 02 A8 8C */ lfs f0, lbl_8045428C-_SDA2_BASE_(r2) /* 801DA9BC 001D78FC D0 1F 00 BC */ stfs f0, 0xbc(r31) /* 801DA9C0 001D7900 38 60 00 6C */ li r3, 0x6c -/* 801DA9C4 001D7904 48 0F 42 89 */ bl __nw +/* 801DA9C4 001D7904 48 0F 42 89 */ bl __nw__FUl /* 801DA9C8 001D7908 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA9CC 001D790C 41 82 00 28 */ beq lbl_801DA9F4 /* 801DA9D0 001D7910 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -224,7 +224,7 @@ lbl_801DA9F4: /* 801DAA88 001D79C8 3A C3 69 90 */ addi r22, r3, lbl_80396990@l lbl_801DAA8C: /* 801DAA8C 001D79CC 38 60 00 6C */ li r3, 0x6c -/* 801DAA90 001D79D0 48 0F 41 BD */ bl __nw +/* 801DAA90 001D79D0 48 0F 41 BD */ bl __nw__FUl /* 801DAA94 001D79D4 7C 60 1B 79 */ or. r0, r3, r3 /* 801DAA98 001D79D8 41 82 00 2C */ beq lbl_801DAAC4 /* 801DAA9C 001D79DC 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -271,7 +271,7 @@ lbl_801DAAC4: /* 801DAB3C 001D7A7C 3B 5A 00 08 */ addi r26, r26, 8 /* 801DAB40 001D7A80 41 80 FF 4C */ blt lbl_801DAA8C /* 801DAB44 001D7A84 38 60 00 6C */ li r3, 0x6c -/* 801DAB48 001D7A88 48 0F 41 05 */ bl __nw +/* 801DAB48 001D7A88 48 0F 41 05 */ bl __nw__FUl /* 801DAB4C 001D7A8C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DAB50 001D7A90 41 82 00 28 */ beq lbl_801DAB78 /* 801DAB54 001D7A94 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -291,7 +291,7 @@ lbl_801DAB84: /* 801DAB84 001D7AC4 80 7F 00 04 */ lwz r3, 4(r31) /* 801DAB88 001D7AC8 38 80 0C 00 */ li r4, 0xc00 /* 801DAB8C 001D7ACC 38 A0 00 20 */ li r5, 0x20 -/* 801DAB90 001D7AD0 48 0F 39 45 */ bl JKRHeap_NS_alloc_X1_ +/* 801DAB90 001D7AD0 48 0F 39 45 */ bl alloc__7JKRHeapFUli /* 801DAB94 001D7AD4 38 19 00 88 */ addi r0, r25, 0x88 /* 801DAB98 001D7AD8 7C 7F 01 2E */ stwx r3, r31, r0 /* 801DAB9C 001D7ADC 3A B5 00 01 */ addi r21, r21, 1 @@ -299,7 +299,7 @@ lbl_801DAB84: /* 801DABA4 001D7AE4 3B 39 00 04 */ addi r25, r25, 4 /* 801DABA8 001D7AE8 41 80 FF DC */ blt lbl_801DAB84 /* 801DABAC 001D7AEC 38 60 01 50 */ li r3, 0x150 -/* 801DABB0 001D7AF0 48 0F 40 9D */ bl __nw +/* 801DABB0 001D7AF0 48 0F 40 9D */ bl __nw__FUl /* 801DABB4 001D7AF4 7C 76 1B 79 */ or. r22, r3, r3 /* 801DABB8 001D7AF8 41 82 00 68 */ beq lbl_801DAC20 /* 801DABBC 001D7AFC 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -337,7 +337,7 @@ lbl_801DAC20: /* 801DAC38 001D7B78 80 9F 00 7C */ lwz r4, 0x7c(r31) /* 801DAC3C 001D7B7C 48 11 BA 31 */ bl J2DPane_NS_appendChild /* 801DAC40 001D7B80 38 60 01 50 */ li r3, 0x150 -/* 801DAC44 001D7B84 48 0F 40 09 */ bl __nw +/* 801DAC44 001D7B84 48 0F 40 09 */ bl __nw__FUl /* 801DAC48 001D7B88 7C 76 1B 79 */ or. r22, r3, r3 /* 801DAC4C 001D7B8C 41 82 00 68 */ beq lbl_801DACB4 /* 801DAC50 001D7B90 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -375,7 +375,7 @@ lbl_801DACB4: /* 801DACCC 001D7C0C 80 9F 00 80 */ lwz r4, 0x80(r31) /* 801DACD0 001D7C10 48 11 B9 9D */ bl J2DPane_NS_appendChild /* 801DACD4 001D7C14 38 60 01 50 */ li r3, 0x150 -/* 801DACD8 001D7C18 48 0F 3F 75 */ bl __nw +/* 801DACD8 001D7C18 48 0F 3F 75 */ bl __nw__FUl /* 801DACDC 001D7C1C 7C 76 1B 79 */ or. r22, r3, r3 /* 801DACE0 001D7C20 41 82 00 68 */ beq lbl_801DAD48 /* 801DACE4 001D7C24 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -437,7 +437,7 @@ lbl_801DAD48: /* 801DADC0 001D7D00 C3 E2 A8 98 */ lfs f31, lbl_80454298-_SDA2_BASE_(r2) lbl_801DADC4: /* 801DADC4 001D7D04 38 60 01 50 */ li r3, 0x150 -/* 801DADC8 001D7D08 48 0F 3E 85 */ bl __nw +/* 801DADC8 001D7D08 48 0F 3E 85 */ bl __nw__FUl /* 801DADCC 001D7D0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DADD0 001D7D10 41 82 00 10 */ beq lbl_801DADE0 /* 801DADD4 001D7D14 7F 64 DB 78 */ mr r4, r27 @@ -511,7 +511,7 @@ lbl_801DADE0: /* 801DAEE0 001D7E20 4E 80 04 21 */ bctrl /* 801DAEE4 001D7E24 7C 75 1B 78 */ mr r21, r3 /* 801DAEE8 001D7E28 38 60 01 50 */ li r3, 0x150 -/* 801DAEEC 001D7E2C 48 0F 3D 61 */ bl __nw +/* 801DAEEC 001D7E2C 48 0F 3D 61 */ bl __nw__FUl /* 801DAEF0 001D7E30 7C 60 1B 79 */ or. r0, r3, r3 /* 801DAEF4 001D7E34 41 82 00 10 */ beq lbl_801DAF04 /* 801DAEF8 001D7E38 7E A4 AB 78 */ mr r4, r21 @@ -813,7 +813,7 @@ lbl_801DB30C: /* 801DB314 001D8254 28 04 00 00 */ cmplwi r4, 0 /* 801DB318 001D8258 41 82 00 10 */ beq lbl_801DB328 /* 801DB31C 001D825C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801DB320 001D8260 48 0F 32 29 */ bl JKRHeap_NS_free_X1_ +/* 801DB320 001D8260 48 0F 32 29 */ bl free__7JKRHeapFPv /* 801DB324 001D8264 7F 9F D9 2E */ stwx r28, r31, r27 lbl_801DB328: /* 801DB328 001D8268 3B 5A 00 01 */ addi r26, r26, 1 @@ -900,7 +900,7 @@ lbl_801DB414: /* 801DB444 001D8384 7F C0 07 35 */ extsh. r0, r30 /* 801DB448 001D8388 40 81 00 0C */ ble lbl_801DB454 /* 801DB44C 001D838C 7F E3 FB 78 */ mr r3, r31 -/* 801DB450 001D8390 48 0F 38 ED */ bl __dl +/* 801DB450 001D8390 48 0F 38 ED */ bl __dl__FPv lbl_801DB454: /* 801DB454 001D8394 7F E3 FB 78 */ mr r3, r31 /* 801DB458 001D8398 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/menu/map/d_menu_map_common.s b/asm/d/menu/map/d_menu_map_common.s index 81a44f9d97..e7e2c72164 100644 --- a/asm/d/menu/map/d_menu_map_common.s +++ b/asm/d/menu/map/d_menu_map_common.s @@ -122,7 +122,7 @@ lbl_801C28AC: /* 801C28AC 001BF7EC 7F 60 07 35 */ extsh. r0, r27 /* 801C28B0 001BF7F0 40 81 00 0C */ ble lbl_801C28BC /* 801C28B4 001BF7F4 7F 43 D3 78 */ mr r3, r26 -/* 801C28B8 001BF7F8 48 10 C4 85 */ bl __dl +/* 801C28B8 001BF7F8 48 10 C4 85 */ bl __dl__FPv lbl_801C28BC: /* 801C28BC 001BF7FC 7F 43 D3 78 */ mr r3, r26 /* 801C28C0 001BF800 39 61 00 20 */ addi r11, r1, 0x20 @@ -152,7 +152,7 @@ dMenuMapCommon_c_NS_initiate: /* 801C2914 001BF854 4E 80 04 21 */ bctrl /* 801C2918 001BF858 7C 7D 1B 78 */ mr r29, r3 /* 801C291C 001BF85C 38 60 01 50 */ li r3, 0x150 -/* 801C2920 001BF860 48 10 C3 2D */ bl __nw +/* 801C2920 001BF860 48 10 C3 2D */ bl __nw__FUl /* 801C2924 001BF864 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2928 001BF868 41 82 00 10 */ beq lbl_801C2938 /* 801C292C 001BF86C 7F A4 EB 78 */ mr r4, r29 @@ -195,7 +195,7 @@ lbl_801C2938: /* 801C29BC 001BF8FC 4E 80 04 21 */ bctrl /* 801C29C0 001BF900 7C 7D 1B 78 */ mr r29, r3 /* 801C29C4 001BF904 38 60 01 50 */ li r3, 0x150 -/* 801C29C8 001BF908 48 10 C2 85 */ bl __nw +/* 801C29C8 001BF908 48 10 C2 85 */ bl __nw__FUl /* 801C29CC 001BF90C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C29D0 001BF910 41 82 00 10 */ beq lbl_801C29E0 /* 801C29D4 001BF914 7F A4 EB 78 */ mr r4, r29 @@ -239,7 +239,7 @@ lbl_801C29E0: /* 801C2A68 001BF9A8 4E 80 04 21 */ bctrl /* 801C2A6C 001BF9AC 7C 7D 1B 78 */ mr r29, r3 /* 801C2A70 001BF9B0 38 60 01 50 */ li r3, 0x150 -/* 801C2A74 001BF9B4 48 10 C1 D9 */ bl __nw +/* 801C2A74 001BF9B4 48 10 C1 D9 */ bl __nw__FUl /* 801C2A78 001BF9B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2A7C 001BF9BC 41 82 00 10 */ beq lbl_801C2A8C /* 801C2A80 001BF9C0 7F A4 EB 78 */ mr r4, r29 @@ -283,7 +283,7 @@ lbl_801C2A8C: /* 801C2B14 001BFA54 4E 80 04 21 */ bctrl /* 801C2B18 001BFA58 7C 7D 1B 78 */ mr r29, r3 /* 801C2B1C 001BFA5C 38 60 01 50 */ li r3, 0x150 -/* 801C2B20 001BFA60 48 10 C1 2D */ bl __nw +/* 801C2B20 001BFA60 48 10 C1 2D */ bl __nw__FUl /* 801C2B24 001BFA64 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2B28 001BFA68 41 82 00 10 */ beq lbl_801C2B38 /* 801C2B2C 001BFA6C 7F A4 EB 78 */ mr r4, r29 @@ -327,7 +327,7 @@ lbl_801C2B38: /* 801C2BC0 001BFB00 4E 80 04 21 */ bctrl /* 801C2BC4 001BFB04 7C 7D 1B 78 */ mr r29, r3 /* 801C2BC8 001BFB08 38 60 01 50 */ li r3, 0x150 -/* 801C2BCC 001BFB0C 48 10 C0 81 */ bl __nw +/* 801C2BCC 001BFB0C 48 10 C0 81 */ bl __nw__FUl /* 801C2BD0 001BFB10 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2BD4 001BFB14 41 82 00 10 */ beq lbl_801C2BE4 /* 801C2BD8 001BFB18 7F A4 EB 78 */ mr r4, r29 @@ -371,7 +371,7 @@ lbl_801C2BE4: /* 801C2C6C 001BFBAC 4E 80 04 21 */ bctrl /* 801C2C70 001BFBB0 7C 7D 1B 78 */ mr r29, r3 /* 801C2C74 001BFBB4 38 60 01 50 */ li r3, 0x150 -/* 801C2C78 001BFBB8 48 10 BF D5 */ bl __nw +/* 801C2C78 001BFBB8 48 10 BF D5 */ bl __nw__FUl /* 801C2C7C 001BFBBC 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2C80 001BFBC0 41 82 00 10 */ beq lbl_801C2C90 /* 801C2C84 001BFBC4 7F A4 EB 78 */ mr r4, r29 @@ -415,7 +415,7 @@ lbl_801C2C90: /* 801C2D18 001BFC58 4E 80 04 21 */ bctrl /* 801C2D1C 001BFC5C 7C 7D 1B 78 */ mr r29, r3 /* 801C2D20 001BFC60 38 60 01 50 */ li r3, 0x150 -/* 801C2D24 001BFC64 48 10 BF 29 */ bl __nw +/* 801C2D24 001BFC64 48 10 BF 29 */ bl __nw__FUl /* 801C2D28 001BFC68 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2D2C 001BFC6C 41 82 00 10 */ beq lbl_801C2D3C /* 801C2D30 001BFC70 7F A4 EB 78 */ mr r4, r29 @@ -459,7 +459,7 @@ lbl_801C2D3C: /* 801C2DC4 001BFD04 4E 80 04 21 */ bctrl /* 801C2DC8 001BFD08 7C 7D 1B 78 */ mr r29, r3 /* 801C2DCC 001BFD0C 38 60 01 50 */ li r3, 0x150 -/* 801C2DD0 001BFD10 48 10 BE 7D */ bl __nw +/* 801C2DD0 001BFD10 48 10 BE 7D */ bl __nw__FUl /* 801C2DD4 001BFD14 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2DD8 001BFD18 41 82 00 10 */ beq lbl_801C2DE8 /* 801C2DDC 001BFD1C 7F A4 EB 78 */ mr r4, r29 @@ -503,7 +503,7 @@ lbl_801C2DE8: /* 801C2E70 001BFDB0 4E 80 04 21 */ bctrl /* 801C2E74 001BFDB4 7C 7D 1B 78 */ mr r29, r3 /* 801C2E78 001BFDB8 38 60 01 50 */ li r3, 0x150 -/* 801C2E7C 001BFDBC 48 10 BD D1 */ bl __nw +/* 801C2E7C 001BFDBC 48 10 BD D1 */ bl __nw__FUl /* 801C2E80 001BFDC0 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2E84 001BFDC4 41 82 00 10 */ beq lbl_801C2E94 /* 801C2E88 001BFDC8 7F A4 EB 78 */ mr r4, r29 @@ -547,7 +547,7 @@ lbl_801C2E94: /* 801C2F1C 001BFE5C 4E 80 04 21 */ bctrl /* 801C2F20 001BFE60 7C 7D 1B 78 */ mr r29, r3 /* 801C2F24 001BFE64 38 60 01 50 */ li r3, 0x150 -/* 801C2F28 001BFE68 48 10 BD 25 */ bl __nw +/* 801C2F28 001BFE68 48 10 BD 25 */ bl __nw__FUl /* 801C2F2C 001BFE6C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2F30 001BFE70 41 82 00 10 */ beq lbl_801C2F40 /* 801C2F34 001BFE74 7F A4 EB 78 */ mr r4, r29 @@ -591,7 +591,7 @@ lbl_801C2F40: /* 801C2FC8 001BFF08 4E 80 04 21 */ bctrl /* 801C2FCC 001BFF0C 7C 7D 1B 78 */ mr r29, r3 /* 801C2FD0 001BFF10 38 60 01 50 */ li r3, 0x150 -/* 801C2FD4 001BFF14 48 10 BC 79 */ bl __nw +/* 801C2FD4 001BFF14 48 10 BC 79 */ bl __nw__FUl /* 801C2FD8 001BFF18 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2FDC 001BFF1C 41 82 00 10 */ beq lbl_801C2FEC /* 801C2FE0 001BFF20 7F A4 EB 78 */ mr r4, r29 @@ -635,7 +635,7 @@ lbl_801C2FEC: /* 801C3074 001BFFB4 4E 80 04 21 */ bctrl /* 801C3078 001BFFB8 7C 7D 1B 78 */ mr r29, r3 /* 801C307C 001BFFBC 38 60 01 50 */ li r3, 0x150 -/* 801C3080 001BFFC0 48 10 BB CD */ bl __nw +/* 801C3080 001BFFC0 48 10 BB CD */ bl __nw__FUl /* 801C3084 001BFFC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3088 001BFFC8 41 82 00 10 */ beq lbl_801C3098 /* 801C308C 001BFFCC 7F A4 EB 78 */ mr r4, r29 @@ -679,7 +679,7 @@ lbl_801C3098: /* 801C3120 001C0060 4E 80 04 21 */ bctrl /* 801C3124 001C0064 7C 7D 1B 78 */ mr r29, r3 /* 801C3128 001C0068 38 60 01 50 */ li r3, 0x150 -/* 801C312C 001C006C 48 10 BB 21 */ bl __nw +/* 801C312C 001C006C 48 10 BB 21 */ bl __nw__FUl /* 801C3130 001C0070 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3134 001C0074 41 82 00 10 */ beq lbl_801C3144 /* 801C3138 001C0078 7F A4 EB 78 */ mr r4, r29 @@ -723,7 +723,7 @@ lbl_801C3144: /* 801C31CC 001C010C 4E 80 04 21 */ bctrl /* 801C31D0 001C0110 7C 7D 1B 78 */ mr r29, r3 /* 801C31D4 001C0114 38 60 01 50 */ li r3, 0x150 -/* 801C31D8 001C0118 48 10 BA 75 */ bl __nw +/* 801C31D8 001C0118 48 10 BA 75 */ bl __nw__FUl /* 801C31DC 001C011C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C31E0 001C0120 41 82 00 10 */ beq lbl_801C31F0 /* 801C31E4 001C0124 7F A4 EB 78 */ mr r4, r29 @@ -767,7 +767,7 @@ lbl_801C31F0: /* 801C3278 001C01B8 4E 80 04 21 */ bctrl /* 801C327C 001C01BC 7C 7D 1B 78 */ mr r29, r3 /* 801C3280 001C01C0 38 60 01 50 */ li r3, 0x150 -/* 801C3284 001C01C4 48 10 B9 C9 */ bl __nw +/* 801C3284 001C01C4 48 10 B9 C9 */ bl __nw__FUl /* 801C3288 001C01C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C328C 001C01CC 41 82 00 10 */ beq lbl_801C329C /* 801C3290 001C01D0 7F A4 EB 78 */ mr r4, r29 @@ -811,7 +811,7 @@ lbl_801C329C: /* 801C3324 001C0264 4E 80 04 21 */ bctrl /* 801C3328 001C0268 7C 7D 1B 78 */ mr r29, r3 /* 801C332C 001C026C 38 60 01 50 */ li r3, 0x150 -/* 801C3330 001C0270 48 10 B9 1D */ bl __nw +/* 801C3330 001C0270 48 10 B9 1D */ bl __nw__FUl /* 801C3334 001C0274 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3338 001C0278 41 82 00 10 */ beq lbl_801C3348 /* 801C333C 001C027C 7F A4 EB 78 */ mr r4, r29 @@ -855,7 +855,7 @@ lbl_801C3348: /* 801C33D0 001C0310 4E 80 04 21 */ bctrl /* 801C33D4 001C0314 7C 7D 1B 78 */ mr r29, r3 /* 801C33D8 001C0318 38 60 01 50 */ li r3, 0x150 -/* 801C33DC 001C031C 48 10 B8 71 */ bl __nw +/* 801C33DC 001C031C 48 10 B8 71 */ bl __nw__FUl /* 801C33E0 001C0320 7C 60 1B 79 */ or. r0, r3, r3 /* 801C33E4 001C0324 41 82 00 10 */ beq lbl_801C33F4 /* 801C33E8 001C0328 7F A4 EB 78 */ mr r4, r29 @@ -920,7 +920,7 @@ lbl_801C33F4: /* 801C34D0 001C0410 4E 80 04 21 */ bctrl /* 801C34D4 001C0414 7C 7D 1B 78 */ mr r29, r3 /* 801C34D8 001C0418 38 60 01 50 */ li r3, 0x150 -/* 801C34DC 001C041C 48 10 B7 71 */ bl __nw +/* 801C34DC 001C041C 48 10 B7 71 */ bl __nw__FUl /* 801C34E0 001C0420 7C 60 1B 79 */ or. r0, r3, r3 /* 801C34E4 001C0424 41 82 00 10 */ beq lbl_801C34F4 /* 801C34E8 001C0428 7F A4 EB 78 */ mr r4, r29 @@ -988,7 +988,7 @@ lbl_801C34F4: /* 801C35DC 001C051C 4E 80 04 21 */ bctrl /* 801C35E0 001C0520 7C 7D 1B 78 */ mr r29, r3 /* 801C35E4 001C0524 38 60 01 50 */ li r3, 0x150 -/* 801C35E8 001C0528 48 10 B6 65 */ bl __nw +/* 801C35E8 001C0528 48 10 B6 65 */ bl __nw__FUl /* 801C35EC 001C052C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C35F0 001C0530 41 82 00 10 */ beq lbl_801C3600 /* 801C35F4 001C0534 7F A4 EB 78 */ mr r4, r29 @@ -1032,7 +1032,7 @@ lbl_801C3600: /* 801C3688 001C05C8 4E 80 04 21 */ bctrl /* 801C368C 001C05CC 7C 7D 1B 78 */ mr r29, r3 /* 801C3690 001C05D0 38 60 01 50 */ li r3, 0x150 -/* 801C3694 001C05D4 48 10 B5 B9 */ bl __nw +/* 801C3694 001C05D4 48 10 B5 B9 */ bl __nw__FUl /* 801C3698 001C05D8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C369C 001C05DC 41 82 00 10 */ beq lbl_801C36AC /* 801C36A0 001C05E0 7F A4 EB 78 */ mr r4, r29 @@ -1076,7 +1076,7 @@ lbl_801C36AC: /* 801C3734 001C0674 4E 80 04 21 */ bctrl /* 801C3738 001C0678 7C 7D 1B 78 */ mr r29, r3 /* 801C373C 001C067C 38 60 01 50 */ li r3, 0x150 -/* 801C3740 001C0680 48 10 B5 0D */ bl __nw +/* 801C3740 001C0680 48 10 B5 0D */ bl __nw__FUl /* 801C3744 001C0684 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3748 001C0688 41 82 00 10 */ beq lbl_801C3758 /* 801C374C 001C068C 7F A4 EB 78 */ mr r4, r29 @@ -1120,7 +1120,7 @@ lbl_801C3758: /* 801C37E0 001C0720 4E 80 04 21 */ bctrl /* 801C37E4 001C0724 7C 7D 1B 78 */ mr r29, r3 /* 801C37E8 001C0728 38 60 01 50 */ li r3, 0x150 -/* 801C37EC 001C072C 48 10 B4 61 */ bl __nw +/* 801C37EC 001C072C 48 10 B4 61 */ bl __nw__FUl /* 801C37F0 001C0730 7C 60 1B 79 */ or. r0, r3, r3 /* 801C37F4 001C0734 41 82 00 10 */ beq lbl_801C3804 /* 801C37F8 001C0738 7F A4 EB 78 */ mr r4, r29 @@ -1153,7 +1153,7 @@ lbl_801C3804: /* 801C3860 001C07A0 38 A0 00 00 */ li r5, 0 /* 801C3864 001C07A4 48 13 3F 6D */ bl J2DPane_NS_setInfluencedAlpha /* 801C3868 001C07A8 38 60 00 B8 */ li r3, 0xb8 -/* 801C386C 001C07AC 48 10 B3 E1 */ bl __nw +/* 801C386C 001C07AC 48 10 B3 E1 */ bl __nw__FUl /* 801C3870 001C07B0 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3874 001C07B4 41 82 00 18 */ beq lbl_801C388C /* 801C3878 001C07B8 38 80 00 04 */ li r4, 4 @@ -1169,7 +1169,7 @@ lbl_801C388C: /* 801C389C 001C07DC 7C 1E 00 40 */ cmplw r30, r0 /* 801C38A0 001C07E0 40 82 00 2C */ bne lbl_801C38CC /* 801C38A4 001C07E4 38 60 00 B8 */ li r3, 0xb8 -/* 801C38A8 001C07E8 48 10 B3 A5 */ bl __nw +/* 801C38A8 001C07E8 48 10 B3 A5 */ bl __nw__FUl /* 801C38AC 001C07EC 7C 60 1B 79 */ or. r0, r3, r3 /* 801C38B0 001C07F0 41 82 00 18 */ beq lbl_801C38C8 /* 801C38B4 001C07F4 38 80 00 05 */ li r4, 5 diff --git a/asm/d/menu/window/d_menu_window_HIO.s b/asm/d/menu/window/d_menu_window_HIO.s index 8f304d0795..f1530aa51b 100644 --- a/asm/d/menu/window/d_menu_window_HIO.s +++ b/asm/d/menu/window/d_menu_window_HIO.s @@ -276,7 +276,7 @@ dMw_DHIO_c_NS_dtor: /* 801F9EB8 001F6DF8 90 1F 00 00 */ stw r0, 0(r31) /* 801F9EBC 001F6DFC 7C 80 07 35 */ extsh. r0, r4 /* 801F9EC0 001F6E00 40 81 00 08 */ ble lbl_801F9EC8 -/* 801F9EC4 001F6E04 48 0D 4E 79 */ bl __dl +/* 801F9EC4 001F6E04 48 0D 4E 79 */ bl __dl__FPv lbl_801F9EC8: /* 801F9EC8 001F6E08 7F E3 FB 78 */ mr r3, r31 /* 801F9ECC 001F6E0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -297,7 +297,7 @@ dMw_HIO_c_NS_dtor: /* 801F9F00 001F6E40 90 1F 00 00 */ stw r0, 0(r31) /* 801F9F04 001F6E44 7C 80 07 35 */ extsh. r0, r4 /* 801F9F08 001F6E48 40 81 00 08 */ ble lbl_801F9F10 -/* 801F9F0C 001F6E4C 48 0D 4E 31 */ bl __dl +/* 801F9F0C 001F6E4C 48 0D 4E 31 */ bl __dl__FPv lbl_801F9F10: /* 801F9F10 001F6E50 7F E3 FB 78 */ mr r3, r31 /* 801F9F14 001F6E54 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/meter/d_meter_HIO.s b/asm/d/meter/d_meter_HIO.s index db94e33134..78a1df828e 100644 --- a/asm/d/meter/d_meter_HIO.s +++ b/asm/d/meter/d_meter_HIO.s @@ -2703,7 +2703,7 @@ dMeter_fmapHIO_c_NS_dtor: /* 80200C00 001FDB40 41 82 00 18 */ beq lbl_80200C18 /* 80200C04 001FDB44 4B E0 E1 4D */ bl mDoExt_getGameHeap /* 80200C08 001FDB48 7F E4 FB 78 */ mr r4, r31 -/* 80200C0C 001FDB4C 48 0C D9 3D */ bl JKRHeap_NS_free_X1_ +/* 80200C0C 001FDB4C 48 0C D9 3D */ bl free__7JKRHeapFPv /* 80200C10 001FDB50 38 00 00 00 */ li r0, 0 /* 80200C14 001FDB54 90 1D 00 0C */ stw r0, 0xc(r29) lbl_80200C18: @@ -2712,7 +2712,7 @@ lbl_80200C18: /* 80200C20 001FDB60 41 82 00 18 */ beq lbl_80200C38 /* 80200C24 001FDB64 4B E0 E1 2D */ bl mDoExt_getGameHeap /* 80200C28 001FDB68 7F E4 FB 78 */ mr r4, r31 -/* 80200C2C 001FDB6C 48 0C D9 1D */ bl JKRHeap_NS_free_X1_ +/* 80200C2C 001FDB6C 48 0C D9 1D */ bl free__7JKRHeapFPv /* 80200C30 001FDB70 38 00 00 00 */ li r0, 0 /* 80200C34 001FDB74 90 1D 00 10 */ stw r0, 0x10(r29) lbl_80200C38: @@ -2750,7 +2750,7 @@ lbl_80200C90: /* 80200CA8 001FDBE8 7F C0 07 35 */ extsh. r0, r30 /* 80200CAC 001FDBEC 40 81 00 0C */ ble lbl_80200CB8 /* 80200CB0 001FDBF0 7F A3 EB 78 */ mr r3, r29 -/* 80200CB4 001FDBF4 48 0C E0 89 */ bl __dl +/* 80200CB4 001FDBF4 48 0C E0 89 */ bl __dl__FPv lbl_80200CB8: /* 80200CB8 001FDBF8 7F A3 EB 78 */ mr r3, r29 /* 80200CBC 001FDBFC 39 61 00 20 */ addi r11, r1, 0x20 @@ -2806,7 +2806,7 @@ dMeter_cursorHIO_c: /* 80200D78 001FDCB8 90 1F 00 00 */ stw r0, 0(r31) /* 80200D7C 001FDCBC 7C 80 07 35 */ extsh. r0, r4 /* 80200D80 001FDCC0 40 81 00 08 */ ble lbl_80200D88 -/* 80200D84 001FDCC4 48 0C DF B9 */ bl __dl +/* 80200D84 001FDCC4 48 0C DF B9 */ bl __dl__FPv lbl_80200D88: /* 80200D88 001FDCC8 7F E3 FB 78 */ mr r3, r31 /* 80200D8C 001FDCCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2825,7 +2825,7 @@ lbl_80200D88: /* 80200DC0 001FDD00 90 1F 00 00 */ stw r0, 0(r31) /* 80200DC4 001FDD04 7C 80 07 35 */ extsh. r0, r4 /* 80200DC8 001FDD08 40 81 00 08 */ ble lbl_80200DD0 -/* 80200DCC 001FDD0C 48 0C DF 71 */ bl __dl +/* 80200DCC 001FDD0C 48 0C DF 71 */ bl __dl__FPv lbl_80200DD0: /* 80200DD0 001FDD10 7F E3 FB 78 */ mr r3, r31 /* 80200DD4 001FDD14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2844,7 +2844,7 @@ lbl_80200DD0: /* 80200E08 001FDD48 90 1F 00 00 */ stw r0, 0(r31) /* 80200E0C 001FDD4C 7C 80 07 35 */ extsh. r0, r4 /* 80200E10 001FDD50 40 81 00 08 */ ble lbl_80200E18 -/* 80200E14 001FDD54 48 0C DF 29 */ bl __dl +/* 80200E14 001FDD54 48 0C DF 29 */ bl __dl__FPv lbl_80200E18: /* 80200E18 001FDD58 7F E3 FB 78 */ mr r3, r31 /* 80200E1C 001FDD5C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2863,7 +2863,7 @@ lbl_80200E18: /* 80200E50 001FDD90 90 1F 00 00 */ stw r0, 0(r31) /* 80200E54 001FDD94 7C 80 07 35 */ extsh. r0, r4 /* 80200E58 001FDD98 40 81 00 08 */ ble lbl_80200E60 -/* 80200E5C 001FDD9C 48 0C DE E1 */ bl __dl +/* 80200E5C 001FDD9C 48 0C DE E1 */ bl __dl__FPv lbl_80200E60: /* 80200E60 001FDDA0 7F E3 FB 78 */ mr r3, r31 /* 80200E64 001FDDA4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2882,7 +2882,7 @@ lbl_80200E60: /* 80200E98 001FDDD8 90 1F 00 00 */ stw r0, 0(r31) /* 80200E9C 001FDDDC 7C 80 07 35 */ extsh. r0, r4 /* 80200EA0 001FDDE0 40 81 00 08 */ ble lbl_80200EA8 -/* 80200EA4 001FDDE4 48 0C DE 99 */ bl __dl +/* 80200EA4 001FDDE4 48 0C DE 99 */ bl __dl__FPv lbl_80200EA8: /* 80200EA8 001FDDE8 7F E3 FB 78 */ mr r3, r31 /* 80200EAC 001FDDEC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2901,7 +2901,7 @@ lbl_80200EA8: /* 80200EE0 001FDE20 90 1F 00 00 */ stw r0, 0(r31) /* 80200EE4 001FDE24 7C 80 07 35 */ extsh. r0, r4 /* 80200EE8 001FDE28 40 81 00 08 */ ble lbl_80200EF0 -/* 80200EEC 001FDE2C 48 0C DE 51 */ bl __dl +/* 80200EEC 001FDE2C 48 0C DE 51 */ bl __dl__FPv lbl_80200EF0: /* 80200EF0 001FDE30 7F E3 FB 78 */ mr r3, r31 /* 80200EF4 001FDE34 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2920,7 +2920,7 @@ lbl_80200EF0: /* 80200F28 001FDE68 90 1F 00 00 */ stw r0, 0(r31) /* 80200F2C 001FDE6C 7C 80 07 35 */ extsh. r0, r4 /* 80200F30 001FDE70 40 81 00 08 */ ble lbl_80200F38 -/* 80200F34 001FDE74 48 0C DE 09 */ bl __dl +/* 80200F34 001FDE74 48 0C DE 09 */ bl __dl__FPv lbl_80200F38: /* 80200F38 001FDE78 7F E3 FB 78 */ mr r3, r31 /* 80200F3C 001FDE7C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2939,7 +2939,7 @@ lbl_80200F38: /* 80200F70 001FDEB0 90 1F 00 00 */ stw r0, 0(r31) /* 80200F74 001FDEB4 7C 80 07 35 */ extsh. r0, r4 /* 80200F78 001FDEB8 40 81 00 08 */ ble lbl_80200F80 -/* 80200F7C 001FDEBC 48 0C DD C1 */ bl __dl +/* 80200F7C 001FDEBC 48 0C DD C1 */ bl __dl__FPv lbl_80200F80: /* 80200F80 001FDEC0 7F E3 FB 78 */ mr r3, r31 /* 80200F84 001FDEC4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2958,7 +2958,7 @@ lbl_80200F80: /* 80200FB8 001FDEF8 90 1F 00 00 */ stw r0, 0(r31) /* 80200FBC 001FDEFC 7C 80 07 35 */ extsh. r0, r4 /* 80200FC0 001FDF00 40 81 00 08 */ ble lbl_80200FC8 -/* 80200FC4 001FDF04 48 0C DD 79 */ bl __dl +/* 80200FC4 001FDF04 48 0C DD 79 */ bl __dl__FPv lbl_80200FC8: /* 80200FC8 001FDF08 7F E3 FB 78 */ mr r3, r31 /* 80200FCC 001FDF0C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2977,7 +2977,7 @@ lbl_80200FC8: /* 80201000 001FDF40 90 1F 00 00 */ stw r0, 0(r31) /* 80201004 001FDF44 7C 80 07 35 */ extsh. r0, r4 /* 80201008 001FDF48 40 81 00 08 */ ble lbl_80201010 -/* 8020100C 001FDF4C 48 0C DD 31 */ bl __dl +/* 8020100C 001FDF4C 48 0C DD 31 */ bl __dl__FPv lbl_80201010: /* 80201010 001FDF50 7F E3 FB 78 */ mr r3, r31 /* 80201014 001FDF54 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2996,7 +2996,7 @@ lbl_80201010: /* 80201048 001FDF88 90 1F 00 00 */ stw r0, 0(r31) /* 8020104C 001FDF8C 7C 80 07 35 */ extsh. r0, r4 /* 80201050 001FDF90 40 81 00 08 */ ble lbl_80201058 -/* 80201054 001FDF94 48 0C DC E9 */ bl __dl +/* 80201054 001FDF94 48 0C DC E9 */ bl __dl__FPv lbl_80201058: /* 80201058 001FDF98 7F E3 FB 78 */ mr r3, r31 /* 8020105C 001FDF9C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3029,7 +3029,7 @@ dMeter_cursorHIO_c_NS_dtor: /* 802010B8 001FDFF8 90 1F 00 00 */ stw r0, 0(r31) /* 802010BC 001FDFFC 7C 80 07 35 */ extsh. r0, r4 /* 802010C0 001FE000 40 81 00 08 */ ble lbl_802010C8 -/* 802010C4 001FE004 48 0C DC 79 */ bl __dl +/* 802010C4 001FE004 48 0C DC 79 */ bl __dl__FPv lbl_802010C8: /* 802010C8 001FE008 7F E3 FB 78 */ mr r3, r31 /* 802010CC 001FE00C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3050,7 +3050,7 @@ dMeter_ringHIO_c_NS_dtor: /* 80201100 001FE040 90 1F 00 00 */ stw r0, 0(r31) /* 80201104 001FE044 7C 80 07 35 */ extsh. r0, r4 /* 80201108 001FE048 40 81 00 08 */ ble lbl_80201110 -/* 8020110C 001FE04C 48 0C DC 31 */ bl __dl +/* 8020110C 001FE04C 48 0C DC 31 */ bl __dl__FPv lbl_80201110: /* 80201110 001FE050 7F E3 FB 78 */ mr r3, r31 /* 80201114 001FE054 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3132,7 +3132,7 @@ lbl_80201214: /* 80201214 001FE154 7C 80 07 35 */ extsh. r0, r4 /* 80201218 001FE158 40 81 00 0C */ ble lbl_80201224 /* 8020121C 001FE15C 7F E3 FB 78 */ mr r3, r31 -/* 80201220 001FE160 48 0C DB 1D */ bl __dl +/* 80201220 001FE160 48 0C DB 1D */ bl __dl__FPv lbl_80201224: /* 80201224 001FE164 7F E3 FB 78 */ mr r3, r31 /* 80201228 001FE168 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3153,7 +3153,7 @@ dMeter_menuHIO_c_NS_dtor: /* 8020125C 001FE19C 90 1F 00 00 */ stw r0, 0(r31) /* 80201260 001FE1A0 7C 80 07 35 */ extsh. r0, r4 /* 80201264 001FE1A4 40 81 00 08 */ ble lbl_8020126C -/* 80201268 001FE1A8 48 0C DA D5 */ bl __dl +/* 80201268 001FE1A8 48 0C DA D5 */ bl __dl__FPv lbl_8020126C: /* 8020126C 001FE1AC 7F E3 FB 78 */ mr r3, r31 /* 80201270 001FE1B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 1684e3692e..67f31adbd1 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -38,7 +38,7 @@ dMeterButton_c: /* 802013A0 001FE2E0 7F E0 07 35 */ extsh. r0, r31 /* 802013A4 001FE2E4 40 81 00 0C */ ble lbl_802013B0 /* 802013A8 001FE2E8 7F C3 F3 78 */ mr r3, r30 -/* 802013AC 001FE2EC 48 0C D9 91 */ bl __dl +/* 802013AC 001FE2EC 48 0C D9 91 */ bl __dl__FPv lbl_802013B0: /* 802013B0 001FE2F0 7F C3 F3 78 */ mr r3, r30 /* 802013B4 001FE2F4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1700,7 +1700,7 @@ lbl_80202BA0: lbl_80202BC8: /* 80202BC8 001FFB08 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80202BCC 001FFB0C 80 9F 01 10 */ lwz r4, 0x110(r31) -/* 80202BD0 001FFB10 48 0C B9 79 */ bl JKRHeap_NS_free_X1_ +/* 80202BD0 001FFB10 48 0C B9 79 */ bl free__7JKRHeapFPv /* 80202BD4 001FFB14 38 00 00 00 */ li r0, 0 /* 80202BD8 001FFB18 90 1F 01 10 */ stw r0, 0x110(r31) /* 80202BDC 001FFB1C 80 7F 00 08 */ lwz r3, 8(r31) @@ -3783,7 +3783,7 @@ dMeterButton_c_NS_screenInitButton: /* 80204800 00201740 48 15 D9 C9 */ bl func_803621C8 /* 80204804 00201744 7C 7F 1B 78 */ mr r31, r3 /* 80204808 00201748 38 60 01 18 */ li r3, 0x118 -/* 8020480C 0020174C 48 0C A4 41 */ bl __nw +/* 8020480C 0020174C 48 0C A4 41 */ bl __nw__FUl /* 80204810 00201750 7C 60 1B 79 */ or. r0, r3, r3 /* 80204814 00201754 41 82 00 0C */ beq lbl_80204820 /* 80204818 00201758 48 0F 3C 81 */ bl J2DScreen @@ -3803,7 +3803,7 @@ lbl_80204820: /* 8020484C 0020178C 38 00 00 00 */ li r0, 0 /* 80204850 00201790 90 1F 00 0C */ stw r0, 0xc(r31) /* 80204854 00201794 38 60 00 6C */ li r3, 0x6c -/* 80204858 00201798 48 0C A3 F5 */ bl __nw +/* 80204858 00201798 48 0C A3 F5 */ bl __nw__FUl /* 8020485C 0020179C 7C 60 1B 79 */ or. r0, r3, r3 /* 80204860 002017A0 41 82 00 24 */ beq lbl_80204884 /* 80204864 002017A4 80 9F 00 08 */ lwz r4, 8(r31) @@ -3863,7 +3863,7 @@ lbl_802048E0: /* 80204930 00201870 38 A0 00 FF */ li r5, 0xff /* 80204934 00201874 48 00 65 35 */ bl dMeterButton_c_NS_paneTrans /* 80204938 00201878 38 60 00 6C */ li r3, 0x6c -/* 8020493C 0020187C 48 0C A3 11 */ bl __nw +/* 8020493C 0020187C 48 0C A3 11 */ bl __nw__FUl /* 80204940 00201880 7C 60 1B 79 */ or. r0, r3, r3 /* 80204944 00201884 41 82 00 24 */ beq lbl_80204968 /* 80204948 00201888 80 9F 00 08 */ lwz r4, 8(r31) @@ -3882,7 +3882,7 @@ lbl_80204968: /* 80204978 002018B8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8020497C 002018BC 48 05 0C 4D */ bl CPaneMgrAlpha_NS_show /* 80204980 002018C0 38 60 00 6C */ li r3, 0x6c -/* 80204984 002018C4 48 0C A2 C9 */ bl __nw +/* 80204984 002018C4 48 0C A2 C9 */ bl __nw__FUl /* 80204988 002018C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8020498C 002018CC 41 82 00 24 */ beq lbl_802049B0 /* 80204990 002018D0 80 9F 00 08 */ lwz r4, 8(r31) @@ -3901,7 +3901,7 @@ lbl_802049B0: /* 802049C0 00201900 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802049C4 00201904 48 05 0C 05 */ bl CPaneMgrAlpha_NS_show /* 802049C8 00201908 38 60 00 6C */ li r3, 0x6c -/* 802049CC 0020190C 48 0C A2 81 */ bl __nw +/* 802049CC 0020190C 48 0C A2 81 */ bl __nw__FUl /* 802049D0 00201910 7C 60 1B 79 */ or. r0, r3, r3 /* 802049D4 00201914 41 82 00 24 */ beq lbl_802049F8 /* 802049D8 00201918 80 9F 00 08 */ lwz r4, 8(r31) @@ -3920,7 +3920,7 @@ lbl_802049F8: /* 80204A08 00201948 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80204A0C 0020194C 48 05 0B BD */ bl CPaneMgrAlpha_NS_show /* 80204A10 00201950 38 60 00 6C */ li r3, 0x6c -/* 80204A14 00201954 48 0C A2 39 */ bl __nw +/* 80204A14 00201954 48 0C A2 39 */ bl __nw__FUl /* 80204A18 00201958 7C 60 1B 79 */ or. r0, r3, r3 /* 80204A1C 0020195C 41 82 00 24 */ beq lbl_80204A40 /* 80204A20 00201960 80 9F 00 08 */ lwz r4, 8(r31) @@ -3963,7 +3963,7 @@ lbl_80204A54: /* 80204AAC 002019EC 38 00 00 01 */ li r0, 1 /* 80204AB0 002019F0 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80204AB4 002019F4 38 60 00 6C */ li r3, 0x6c -/* 80204AB8 002019F8 48 0C A1 95 */ bl __nw +/* 80204AB8 002019F8 48 0C A1 95 */ bl __nw__FUl /* 80204ABC 002019FC 7C 60 1B 79 */ or. r0, r3, r3 /* 80204AC0 00201A00 41 82 00 24 */ beq lbl_80204AE4 /* 80204AC4 00201A04 80 9F 00 08 */ lwz r4, 8(r31) @@ -3982,7 +3982,7 @@ lbl_80204AE4: /* 80204AF4 00201A34 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80204AF8 00201A38 48 05 0A D1 */ bl CPaneMgrAlpha_NS_show /* 80204AFC 00201A3C 38 60 00 6C */ li r3, 0x6c -/* 80204B00 00201A40 48 0C A1 4D */ bl __nw +/* 80204B00 00201A40 48 0C A1 4D */ bl __nw__FUl /* 80204B04 00201A44 7C 60 1B 79 */ or. r0, r3, r3 /* 80204B08 00201A48 41 82 00 28 */ beq lbl_80204B30 /* 80204B0C 00201A4C 80 9F 00 08 */ lwz r4, 8(r31) @@ -4046,7 +4046,7 @@ lbl_80204B30: /* 80204BF0 00201B30 38 00 00 00 */ li r0, 0 /* 80204BF4 00201B34 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80204BF8 00201B38 38 60 00 6C */ li r3, 0x6c -/* 80204BFC 00201B3C 48 0C A0 51 */ bl __nw +/* 80204BFC 00201B3C 48 0C A0 51 */ bl __nw__FUl /* 80204C00 00201B40 7C 60 1B 79 */ or. r0, r3, r3 /* 80204C04 00201B44 41 82 00 24 */ beq lbl_80204C28 /* 80204C08 00201B48 80 9F 00 08 */ lwz r4, 8(r31) @@ -4109,7 +4109,7 @@ lbl_80204C28: /* 80204CE8 00201C28 38 00 00 00 */ li r0, 0 /* 80204CEC 00201C2C 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80204CF0 00201C30 38 60 00 6C */ li r3, 0x6c -/* 80204CF4 00201C34 48 0C 9F 59 */ bl __nw +/* 80204CF4 00201C34 48 0C 9F 59 */ bl __nw__FUl /* 80204CF8 00201C38 7C 60 1B 79 */ or. r0, r3, r3 /* 80204CFC 00201C3C 41 82 00 24 */ beq lbl_80204D20 /* 80204D00 00201C40 80 9F 00 08 */ lwz r4, 8(r31) @@ -4126,7 +4126,7 @@ lbl_80204D20: /* 80204D28 00201C68 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80204D2C 00201C6C 48 05 0A A5 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 80204D30 00201C70 38 60 00 6C */ li r3, 0x6c -/* 80204D34 00201C74 48 0C 9F 19 */ bl __nw +/* 80204D34 00201C74 48 0C 9F 19 */ bl __nw__FUl /* 80204D38 00201C78 7C 60 1B 79 */ or. r0, r3, r3 /* 80204D3C 00201C7C 41 82 00 24 */ beq lbl_80204D60 /* 80204D40 00201C80 80 9F 00 08 */ lwz r4, 8(r31) @@ -4143,7 +4143,7 @@ lbl_80204D60: /* 80204D68 00201CA8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80204D6C 00201CAC 48 05 0A 65 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 80204D70 00201CB0 38 60 00 6C */ li r3, 0x6c -/* 80204D74 00201CB4 48 0C 9E D9 */ bl __nw +/* 80204D74 00201CB4 48 0C 9E D9 */ bl __nw__FUl /* 80204D78 00201CB8 7C 60 1B 79 */ or. r0, r3, r3 /* 80204D7C 00201CBC 41 82 00 24 */ beq lbl_80204DA0 /* 80204D80 00201CC0 80 9F 00 08 */ lwz r4, 8(r31) @@ -4165,7 +4165,7 @@ lbl_80204DA0: /* 80204DBC 00201CFC 90 1F 00 48 */ stw r0, 0x48(r31) /* 80204DC0 00201D00 90 1F 00 4C */ stw r0, 0x4c(r31) /* 80204DC4 00201D04 38 60 00 6C */ li r3, 0x6c -/* 80204DC8 00201D08 48 0C 9E 85 */ bl __nw +/* 80204DC8 00201D08 48 0C 9E 85 */ bl __nw__FUl /* 80204DCC 00201D0C 7C 60 1B 79 */ or. r0, r3, r3 /* 80204DD0 00201D10 41 82 00 24 */ beq lbl_80204DF4 /* 80204DD4 00201D14 80 9F 00 08 */ lwz r4, 8(r31) @@ -4190,7 +4190,7 @@ lbl_80204DF4: /* 80204E1C 00201D5C 90 1F 00 68 */ stw r0, 0x68(r31) /* 80204E20 00201D60 90 1F 00 6C */ stw r0, 0x6c(r31) /* 80204E24 00201D64 38 60 00 6C */ li r3, 0x6c -/* 80204E28 00201D68 48 0C 9E 25 */ bl __nw +/* 80204E28 00201D68 48 0C 9E 25 */ bl __nw__FUl /* 80204E2C 00201D6C 7C 60 1B 79 */ or. r0, r3, r3 /* 80204E30 00201D70 41 82 00 28 */ beq lbl_80204E58 /* 80204E34 00201D74 80 9F 00 08 */ lwz r4, 8(r31) @@ -4208,7 +4208,7 @@ lbl_80204E58: /* 80204E60 00201DA0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80204E64 00201DA4 48 05 09 6D */ bl CPaneMgrAlpha_NS_setAlphaRate /* 80204E68 00201DA8 38 60 00 6C */ li r3, 0x6c -/* 80204E6C 00201DAC 48 0C 9D E1 */ bl __nw +/* 80204E6C 00201DAC 48 0C 9D E1 */ bl __nw__FUl /* 80204E70 00201DB0 7C 60 1B 79 */ or. r0, r3, r3 /* 80204E74 00201DB4 41 82 00 24 */ beq lbl_80204E98 /* 80204E78 00201DB8 80 9F 00 08 */ lwz r4, 8(r31) @@ -4225,7 +4225,7 @@ lbl_80204E98: /* 80204EA0 00201DE0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80204EA4 00201DE4 48 05 09 2D */ bl CPaneMgrAlpha_NS_setAlphaRate /* 80204EA8 00201DE8 38 60 00 6C */ li r3, 0x6c -/* 80204EAC 00201DEC 48 0C 9D A1 */ bl __nw +/* 80204EAC 00201DEC 48 0C 9D A1 */ bl __nw__FUl /* 80204EB0 00201DF0 7C 60 1B 79 */ or. r0, r3, r3 /* 80204EB4 00201DF4 41 82 00 28 */ beq lbl_80204EDC /* 80204EB8 00201DF8 80 9F 00 08 */ lwz r4, 8(r31) @@ -4243,7 +4243,7 @@ lbl_80204EDC: /* 80204EE4 00201E24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80204EE8 00201E28 48 05 08 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 80204EEC 00201E2C 38 60 00 6C */ li r3, 0x6c -/* 80204EF0 00201E30 48 0C 9D 5D */ bl __nw +/* 80204EF0 00201E30 48 0C 9D 5D */ bl __nw__FUl /* 80204EF4 00201E34 7C 60 1B 79 */ or. r0, r3, r3 /* 80204EF8 00201E38 41 82 00 28 */ beq lbl_80204F20 /* 80204EFC 00201E3C 80 9F 00 08 */ lwz r4, 8(r31) @@ -4265,7 +4265,7 @@ lbl_80204F20: /* 80204F38 00201E78 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80204F3C 00201E7C 38 80 0C 00 */ li r4, 0xc00 /* 80204F40 00201E80 38 A0 00 20 */ li r5, 0x20 -/* 80204F44 00201E84 48 0C 95 91 */ bl JKRHeap_NS_alloc_X1_ +/* 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 @@ -4862,7 +4862,7 @@ dMeterButton_c_NS_screenInitText: /* 80205854 00202794 48 15 C9 7D */ bl func_803621D0 /* 80205858 00202798 7C 7F 1B 78 */ mr r31, r3 /* 8020585C 0020279C 38 60 01 18 */ li r3, 0x118 -/* 80205860 002027A0 48 0C 93 ED */ bl __nw +/* 80205860 002027A0 48 0C 93 ED */ bl __nw__FUl /* 80205864 002027A4 7C 60 1B 79 */ or. r0, r3, r3 /* 80205868 002027A8 41 82 00 0C */ beq lbl_80205874 /* 8020586C 002027AC 48 0F 2C 2D */ bl J2DScreen @@ -4881,7 +4881,7 @@ lbl_80205874: /* 8020589C 002027DC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802058A0 002027E0 48 04 F8 49 */ bl dPaneClass_showNullPane /* 802058A4 002027E4 38 60 00 6C */ li r3, 0x6c -/* 802058A8 002027E8 48 0C 93 A5 */ bl __nw +/* 802058A8 002027E8 48 0C 93 A5 */ bl __nw__FUl /* 802058AC 002027EC 7C 60 1B 79 */ or. r0, r3, r3 /* 802058B0 002027F0 41 82 00 24 */ beq lbl_802058D4 /* 802058B4 002027F4 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -4943,7 +4943,7 @@ lbl_802058D4: /* 80205990 002028D0 7D 89 03 A6 */ mtctr r12 /* 80205994 002028D4 4E 80 04 21 */ bctrl /* 80205998 002028D8 38 60 00 6C */ li r3, 0x6c -/* 8020599C 002028DC 48 0C 92 B1 */ bl __nw +/* 8020599C 002028DC 48 0C 92 B1 */ bl __nw__FUl /* 802059A0 002028E0 7C 60 1B 79 */ or. r0, r3, r3 /* 802059A4 002028E4 41 82 00 28 */ beq lbl_802059CC /* 802059A8 002028E8 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -4958,7 +4958,7 @@ lbl_802058D4: lbl_802059CC: /* 802059CC 0020290C 90 1F 00 DC */ stw r0, 0xdc(r31) /* 802059D0 00202910 38 60 01 18 */ li r3, 0x118 -/* 802059D4 00202914 48 0C 92 79 */ bl __nw +/* 802059D4 00202914 48 0C 92 79 */ bl __nw__FUl /* 802059D8 00202918 7C 60 1B 79 */ or. r0, r3, r3 /* 802059DC 0020291C 41 82 00 0C */ beq lbl_802059E8 /* 802059E0 00202920 48 0F 2A B9 */ bl J2DScreen @@ -4977,7 +4977,7 @@ lbl_802059E8: /* 80205A10 00202950 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80205A14 00202954 48 04 F6 D5 */ bl dPaneClass_showNullPane /* 80205A18 00202958 38 60 00 6C */ li r3, 0x6c -/* 80205A1C 0020295C 48 0C 92 31 */ bl __nw +/* 80205A1C 0020295C 48 0C 92 31 */ bl __nw__FUl /* 80205A20 00202960 7C 60 1B 79 */ or. r0, r3, r3 /* 80205A24 00202964 41 82 00 28 */ beq lbl_80205A4C /* 80205A28 00202968 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -4992,7 +4992,7 @@ lbl_802059E8: lbl_80205A4C: /* 80205A4C 0020298C 90 1F 00 E0 */ stw r0, 0xe0(r31) /* 80205A50 00202990 38 60 00 6C */ li r3, 0x6c -/* 80205A54 00202994 48 0C 91 F9 */ bl __nw +/* 80205A54 00202994 48 0C 91 F9 */ bl __nw__FUl /* 80205A58 00202998 7C 60 1B 79 */ or. r0, r3, r3 /* 80205A5C 0020299C 41 82 00 28 */ beq lbl_80205A84 /* 80205A60 002029A0 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -5007,7 +5007,7 @@ lbl_80205A4C: lbl_80205A84: /* 80205A84 002029C4 90 1F 00 E4 */ stw r0, 0xe4(r31) /* 80205A88 002029C8 38 60 00 6C */ li r3, 0x6c -/* 80205A8C 002029CC 48 0C 91 C1 */ bl __nw +/* 80205A8C 002029CC 48 0C 91 C1 */ bl __nw__FUl /* 80205A90 002029D0 7C 60 1B 79 */ or. r0, r3, r3 /* 80205A94 002029D4 41 82 00 24 */ beq lbl_80205AB8 /* 80205A98 002029D8 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -5114,7 +5114,7 @@ lbl_80205C00: /* 80205C20 00202B60 B0 1F 04 B6 */ sth r0, 0x4b6(r31) /* 80205C24 00202B64 B0 1F 04 B4 */ sth r0, 0x4b4(r31) /* 80205C28 00202B68 38 60 00 2C */ li r3, 0x2c -/* 80205C2C 00202B6C 48 0C 90 21 */ bl __nw +/* 80205C2C 00202B6C 48 0C 90 21 */ bl __nw__FUl /* 80205C30 00202B70 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C34 00202B74 41 82 00 0C */ beq lbl_80205C40 /* 80205C38 00202B78 48 04 3F E9 */ bl dMsgString_c @@ -5122,7 +5122,7 @@ lbl_80205C00: lbl_80205C40: /* 80205C40 00202B80 90 1F 00 04 */ stw r0, 4(r31) /* 80205C44 00202B84 38 60 02 44 */ li r3, 0x244 -/* 80205C48 00202B88 48 0C 90 05 */ bl __nw +/* 80205C48 00202B88 48 0C 90 05 */ bl __nw__FUl /* 80205C4C 00202B8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C50 00202B90 41 82 00 10 */ beq lbl_80205C60 /* 80205C54 00202B94 38 80 00 00 */ li r4, 0 diff --git a/asm/d/meter/d_meter_haihai.s b/asm/d/meter/d_meter_haihai.s index ef5b770189..3f8a085bd8 100644 --- a/asm/d/meter/d_meter_haihai.s +++ b/asm/d/meter/d_meter_haihai.s @@ -54,7 +54,7 @@ lbl_8020AF40: /* 8020AF40 00207E80 7F E0 07 35 */ extsh. r0, r31 /* 8020AF44 00207E84 40 81 00 0C */ ble lbl_8020AF50 /* 8020AF48 00207E88 7F C3 F3 78 */ mr r3, r30 -/* 8020AF4C 00207E8C 48 0C 3D F1 */ bl __dl +/* 8020AF4C 00207E8C 48 0C 3D F1 */ bl __dl__FPv lbl_8020AF50: /* 8020AF50 00207E90 7F C3 F3 78 */ mr r3, r30 /* 8020AF54 00207E94 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -70,7 +70,7 @@ lbl_8020AF50: /* 8020AF7C 00207EBC 93 C1 00 08 */ stw r30, 8(r1) /* 8020AF80 00207EC0 7C 7F 1B 78 */ mr r31, r3 /* 8020AF84 00207EC4 38 60 01 18 */ li r3, 0x118 -/* 8020AF88 00207EC8 48 0C 3C C5 */ bl __nw +/* 8020AF88 00207EC8 48 0C 3C C5 */ bl __nw__FUl /* 8020AF8C 00207ECC 7C 60 1B 79 */ or. r0, r3, r3 /* 8020AF90 00207ED0 41 82 00 0C */ beq lbl_8020AF9C /* 8020AF94 00207ED4 48 0E D5 05 */ bl J2DScreen @@ -88,7 +88,7 @@ lbl_8020AF9C: /* 8020AFC0 00207F00 80 7F 00 04 */ lwz r3, 4(r31) /* 8020AFC4 00207F04 48 04 A1 25 */ bl dPaneClass_showNullPane /* 8020AFC8 00207F08 38 60 00 6C */ li r3, 0x6c -/* 8020AFCC 00207F0C 48 0C 3C 81 */ bl __nw +/* 8020AFCC 00207F0C 48 0C 3C 81 */ bl __nw__FUl /* 8020AFD0 00207F10 7C 60 1B 79 */ or. r0, r3, r3 /* 8020AFD4 00207F14 41 82 00 24 */ beq lbl_8020AFF8 /* 8020AFD8 00207F18 80 9F 00 04 */ lwz r4, 4(r31) diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index d328d160f8..f2c3955826 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -54,7 +54,7 @@ lbl_8020C3D4: /* 8020C3D4 00209314 7F E0 07 35 */ extsh. r0, r31 /* 8020C3D8 00209318 40 81 00 0C */ ble lbl_8020C3E4 /* 8020C3DC 0020931C 7F C3 F3 78 */ mr r3, r30 -/* 8020C3E0 00209320 48 0C 29 5D */ bl __dl +/* 8020C3E0 00209320 48 0C 29 5D */ bl __dl__FPv lbl_8020C3E4: /* 8020C3E4 00209324 7F C3 F3 78 */ mr r3, r30 /* 8020C3E8 00209328 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -76,7 +76,7 @@ lbl_8020C3E4: /* 8020C428 00209368 3B 83 F2 88 */ addi r28, r3, lbl_803BF288@l lbl_8020C42C: /* 8020C42C 0020936C 38 60 00 6C */ li r3, 0x6c -/* 8020C430 00209370 48 0C 28 1D */ bl __nw +/* 8020C430 00209370 48 0C 28 1D */ bl __nw__FUl /* 8020C434 00209374 7C 64 1B 79 */ or. r4, r3, r3 /* 8020C438 00209378 41 82 00 24 */ beq lbl_8020C45C /* 8020C43C 0020937C 80 9F 00 04 */ lwz r4, 4(r31) @@ -96,7 +96,7 @@ lbl_8020C45C: /* 8020C470 002093B0 3B BD 00 08 */ addi r29, r29, 8 /* 8020C474 002093B4 41 80 FF B8 */ blt lbl_8020C42C /* 8020C478 002093B8 38 60 00 6C */ li r3, 0x6c -/* 8020C47C 002093BC 48 0C 27 D1 */ bl __nw +/* 8020C47C 002093BC 48 0C 27 D1 */ bl __nw__FUl /* 8020C480 002093C0 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C484 002093C4 41 82 00 28 */ beq lbl_8020C4AC /* 8020C488 002093C8 80 9F 00 04 */ lwz r4, 4(r31) @@ -111,7 +111,7 @@ lbl_8020C45C: lbl_8020C4AC: /* 8020C4AC 002093EC 90 1F 00 10 */ stw r0, 0x10(r31) /* 8020C4B0 002093F0 38 60 01 18 */ li r3, 0x118 -/* 8020C4B4 002093F4 48 0C 27 99 */ bl __nw +/* 8020C4B4 002093F4 48 0C 27 99 */ bl __nw__FUl /* 8020C4B8 002093F8 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C4BC 002093FC 41 82 00 0C */ beq lbl_8020C4C8 /* 8020C4C0 00209400 48 0E BF D9 */ bl J2DScreen @@ -129,7 +129,7 @@ lbl_8020C4C8: /* 8020C4EC 0020942C 80 7F 00 08 */ lwz r3, 8(r31) /* 8020C4F0 00209430 48 04 8B F9 */ bl dPaneClass_showNullPane /* 8020C4F4 00209434 38 60 00 6C */ li r3, 0x6c -/* 8020C4F8 00209438 48 0C 27 55 */ bl __nw +/* 8020C4F8 00209438 48 0C 27 55 */ bl __nw__FUl /* 8020C4FC 0020943C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C500 00209440 41 82 00 24 */ beq lbl_8020C524 /* 8020C504 00209444 80 9F 00 08 */ lwz r4, 8(r31) @@ -143,7 +143,7 @@ lbl_8020C4C8: lbl_8020C524: /* 8020C524 00209464 90 1F 00 2C */ stw r0, 0x2c(r31) /* 8020C528 00209468 38 60 00 6C */ li r3, 0x6c -/* 8020C52C 0020946C 48 0C 27 21 */ bl __nw +/* 8020C52C 0020946C 48 0C 27 21 */ bl __nw__FUl /* 8020C530 00209470 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C534 00209474 41 82 00 28 */ beq lbl_8020C55C /* 8020C538 00209478 80 9F 00 08 */ lwz r4, 8(r31) @@ -192,7 +192,7 @@ lbl_8020C5A4: /* 8020C5DC 0020951C A8 03 00 96 */ lha r0, 0x96(r3) /* 8020C5E0 00209520 B0 1F 01 08 */ sth r0, 0x108(r31) /* 8020C5E4 00209524 38 60 01 18 */ li r3, 0x118 -/* 8020C5E8 00209528 48 0C 26 65 */ bl __nw +/* 8020C5E8 00209528 48 0C 26 65 */ bl __nw__FUl /* 8020C5EC 0020952C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C5F0 00209530 41 82 00 0C */ beq lbl_8020C5FC /* 8020C5F4 00209534 48 0E BE A5 */ bl J2DScreen @@ -209,7 +209,7 @@ lbl_8020C5FC: /* 8020C61C 0020955C 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8020C620 00209560 48 04 8A C9 */ bl dPaneClass_showNullPane /* 8020C624 00209564 38 60 00 6C */ li r3, 0x6c -/* 8020C628 00209568 48 0C 26 25 */ bl __nw +/* 8020C628 00209568 48 0C 26 25 */ bl __nw__FUl /* 8020C62C 0020956C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C630 00209570 41 82 00 24 */ beq lbl_8020C654 /* 8020C634 00209574 80 9F 00 0C */ lwz r4, 0xc(r31) diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index f3878360d3..f5df1d46b2 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -396,7 +396,7 @@ dMeterMap_c: /* 8020D9C0 0020A900 7F E0 07 35 */ extsh. r0, r31 /* 8020D9C4 0020A904 40 81 00 0C */ ble lbl_8020D9D0 /* 8020D9C8 0020A908 7F C3 F3 78 */ mr r3, r30 -/* 8020D9CC 0020A90C 48 0C 13 71 */ bl __dl +/* 8020D9CC 0020A90C 48 0C 13 71 */ bl __dl__FPv lbl_8020D9D0: /* 8020D9D0 0020A910 7F C3 F3 78 */ mr r3, r30 /* 8020D9D4 0020A914 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -477,7 +477,7 @@ lbl_8020DAA0: /* 8020DAD8 0020AA18 EC 00 08 28 */ fsubs f0, f0, f1 /* 8020DADC 0020AA1C D0 1F 00 24 */ stfs f0, 0x24(r31) /* 8020DAE0 0020AA20 38 60 00 94 */ li r3, 0x94 -/* 8020DAE4 0020AA24 48 0C 11 69 */ bl __nw +/* 8020DAE4 0020AA24 48 0C 11 69 */ bl __nw__FUl /* 8020DAE8 0020AA28 7C 60 1B 79 */ or. r0, r3, r3 /* 8020DAEC 0020AA2C 41 82 00 1C */ beq lbl_8020DB08 /* 8020DAF0 0020AA30 7F C4 F3 78 */ mr r4, r30 @@ -489,7 +489,7 @@ lbl_8020DAA0: lbl_8020DB08: /* 8020DB08 0020AA48 90 1F 00 08 */ stw r0, 8(r31) /* 8020DB0C 0020AA4C 38 60 01 50 */ li r3, 0x150 -/* 8020DB10 0020AA50 48 0C 11 3D */ bl __nw +/* 8020DB10 0020AA50 48 0C 11 3D */ bl __nw__FUl /* 8020DB14 0020AA54 7C 60 1B 79 */ or. r0, r3, r3 /* 8020DB18 0020AA58 41 82 00 14 */ beq lbl_8020DB2C /* 8020DB1C 0020AA5C 80 9F 00 08 */ lwz r4, 8(r31) diff --git a/asm/d/meter/d_meter_string.s b/asm/d/meter/d_meter_string.s index f7b88a306f..34fd89dbe3 100644 --- a/asm/d/meter/d_meter_string.s +++ b/asm/d/meter/d_meter_string.s @@ -67,7 +67,7 @@ lbl_8020EE44: /* 8020EE44 0020BD84 7F E0 07 35 */ extsh. r0, r31 /* 8020EE48 0020BD88 40 81 00 0C */ ble lbl_8020EE54 /* 8020EE4C 0020BD8C 7F C3 F3 78 */ mr r3, r30 -/* 8020EE50 0020BD90 48 0B FE ED */ bl __dl +/* 8020EE50 0020BD90 48 0B FE ED */ bl __dl__FPv lbl_8020EE54: /* 8020EE54 0020BD94 7F C3 F3 78 */ mr r3, r30 /* 8020EE58 0020BD98 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -112,7 +112,7 @@ lbl_8020EEEC: /* 8020EEEC 0020BE2C 90 1F 00 18 */ stw r0, 0x18(r31) lbl_8020EEF0: /* 8020EEF0 0020BE30 38 60 01 18 */ li r3, 0x118 -/* 8020EEF4 0020BE34 48 0B FD 59 */ bl __nw +/* 8020EEF4 0020BE34 48 0B FD 59 */ bl __nw__FUl /* 8020EEF8 0020BE38 7C 60 1B 79 */ or. r0, r3, r3 /* 8020EEFC 0020BE3C 41 82 00 0C */ beq lbl_8020EF08 /* 8020EF00 0020BE40 48 0E 95 99 */ bl J2DScreen @@ -147,7 +147,7 @@ lbl_8020EF08: /* 8020EF70 0020BEB0 48 0F 9A FD */ bl J2DAnmLoaderDataBase_NS_load /* 8020EF74 0020BEB4 90 7F 00 08 */ stw r3, 8(r31) /* 8020EF78 0020BEB8 38 60 00 6C */ li r3, 0x6c -/* 8020EF7C 0020BEBC 48 0B FC D1 */ bl __nw +/* 8020EF7C 0020BEBC 48 0B FC D1 */ bl __nw__FUl /* 8020EF80 0020BEC0 7C 60 1B 79 */ or. r0, r3, r3 /* 8020EF84 0020BEC4 41 82 00 28 */ beq lbl_8020EFAC /* 8020EF88 0020BEC8 80 9F 00 04 */ lwz r4, 4(r31) @@ -162,7 +162,7 @@ lbl_8020EF08: lbl_8020EFAC: /* 8020EFAC 0020BEEC 90 1F 00 0C */ stw r0, 0xc(r31) /* 8020EFB0 0020BEF0 38 60 00 6C */ li r3, 0x6c -/* 8020EFB4 0020BEF4 48 0B FC 99 */ bl __nw +/* 8020EFB4 0020BEF4 48 0B FC 99 */ bl __nw__FUl /* 8020EFB8 0020BEF8 7C 60 1B 79 */ or. r0, r3, r3 /* 8020EFBC 0020BEFC 41 82 00 24 */ beq lbl_8020EFE0 /* 8020EFC0 0020BF00 80 9F 00 04 */ lwz r4, 4(r31) @@ -176,7 +176,7 @@ lbl_8020EFAC: lbl_8020EFE0: /* 8020EFE0 0020BF20 90 1F 00 10 */ stw r0, 0x10(r31) /* 8020EFE4 0020BF24 38 60 00 6C */ li r3, 0x6c -/* 8020EFE8 0020BF28 48 0B FC 65 */ bl __nw +/* 8020EFE8 0020BF28 48 0B FC 65 */ bl __nw__FUl /* 8020EFEC 0020BF2C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020EFF0 0020BF30 41 82 00 24 */ beq lbl_8020F014 /* 8020EFF4 0020BF34 80 9F 00 04 */ lwz r4, 4(r31) diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index f20513e6b2..6094fa0fee 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -68,7 +68,7 @@ dMeter2Draw_c: /* 8020FBA4 0020CAE4 7F 23 CB 78 */ mr r3, r25 /* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap /* 8020FBAC 0020CAEC 38 60 01 18 */ li r3, 0x118 -/* 8020FBB0 0020CAF0 48 0B F0 9D */ bl __nw +/* 8020FBB0 0020CAF0 48 0B F0 9D */ bl __nw__FUl /* 8020FBB4 0020CAF4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FBB8 0020CAF8 41 82 00 0C */ beq lbl_8020FBC4 /* 8020FBBC 0020CAFC 48 0E 88 DD */ bl J2DScreen @@ -102,7 +102,7 @@ lbl_8020FBC4: /* 8020FC28 0020CB68 3A C0 00 00 */ li r22, 0 lbl_8020FC2C: /* 8020FC2C 0020CB6C 38 60 00 10 */ li r3, 0x10 -/* 8020FC30 0020CB70 48 0B F0 1D */ bl __nw +/* 8020FC30 0020CB70 48 0B F0 1D */ bl __nw__FUl /* 8020FC34 0020CB74 7C 64 1B 79 */ or. r4, r3, r3 /* 8020FC38 0020CB78 41 82 00 0C */ beq lbl_8020FC44 /* 8020FC3C 0020CB7C 4B F9 EC FD */ bl dKantera_icon_c @@ -115,7 +115,7 @@ lbl_8020FC44: /* 8020FC54 0020CB94 3B 39 00 04 */ addi r25, r25, 4 /* 8020FC58 0020CB98 41 80 FF D4 */ blt lbl_8020FC2C /* 8020FC5C 0020CB9C 38 60 01 18 */ li r3, 0x118 -/* 8020FC60 0020CBA0 48 0B EF ED */ bl __nw +/* 8020FC60 0020CBA0 48 0B EF ED */ bl __nw__FUl /* 8020FC64 0020CBA4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FC68 0020CBA8 41 82 00 0C */ beq lbl_8020FC74 /* 8020FC6C 0020CBAC 48 0E 88 2D */ bl J2DScreen @@ -132,7 +132,7 @@ lbl_8020FC74: /* 8020FC94 0020CBD4 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020FC98 0020CBD8 48 04 54 51 */ bl dPaneClass_showNullPane /* 8020FC9C 0020CBDC 38 60 01 18 */ li r3, 0x118 -/* 8020FCA0 0020CBE0 48 0B EF AD */ bl __nw +/* 8020FCA0 0020CBE0 48 0B EF AD */ bl __nw__FUl /* 8020FCA4 0020CBE4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FCA8 0020CBE8 41 82 00 0C */ beq lbl_8020FCB4 /* 8020FCAC 0020CBEC 48 0E 87 ED */ bl J2DScreen @@ -149,7 +149,7 @@ lbl_8020FCB4: /* 8020FCD4 0020CC14 80 7F 00 80 */ lwz r3, 0x80(r31) /* 8020FCD8 0020CC18 48 04 54 11 */ bl dPaneClass_showNullPane /* 8020FCDC 0020CC1C 38 60 00 6C */ li r3, 0x6c -/* 8020FCE0 0020CC20 48 0B EF 6D */ bl __nw +/* 8020FCE0 0020CC20 48 0B EF 6D */ bl __nw__FUl /* 8020FCE4 0020CC24 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FCE8 0020CC28 41 82 00 24 */ beq lbl_8020FD0C /* 8020FCEC 0020CC2C 80 9F 00 80 */ lwz r4, 0x80(r31) @@ -245,7 +245,7 @@ lbl_8020FD0C: /* 8020FE50 0020CD90 C0 22 AE 84 */ lfs f1, lbl_80454884-_SDA2_BASE_(r2) /* 8020FE54 0020CD94 48 00 3F E9 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation /* 8020FE58 0020CD98 38 60 00 6C */ li r3, 0x6c -/* 8020FE5C 0020CD9C 48 0B ED F1 */ bl __nw +/* 8020FE5C 0020CD9C 48 0B ED F1 */ bl __nw__FUl /* 8020FE60 0020CDA0 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FE64 0020CDA4 41 82 00 24 */ beq lbl_8020FE88 /* 8020FE68 0020CDA8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -268,7 +268,7 @@ lbl_8020FE88: /* 8020FEA8 0020CDE8 3B A4 88 D0 */ addi r29, r4, lbl_803988D0@l lbl_8020FEAC: /* 8020FEAC 0020CDEC 38 60 00 6C */ li r3, 0x6c -/* 8020FEB0 0020CDF0 48 0B ED 9D */ bl __nw +/* 8020FEB0 0020CDF0 48 0B ED 9D */ bl __nw__FUl /* 8020FEB4 0020CDF4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FEB8 0020CDF8 41 82 00 28 */ beq lbl_8020FEE0 /* 8020FEBC 0020CDFC 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -303,7 +303,7 @@ lbl_8020FEE0: /* 8020FF2C 0020CE6C C0 17 02 C4 */ lfs f0, 0x2c4(r23) /* 8020FF30 0020CE70 D0 04 01 14 */ stfs f0, 0x114(r4) /* 8020FF34 0020CE74 38 60 00 6C */ li r3, 0x6c -/* 8020FF38 0020CE78 48 0B ED 15 */ bl __nw +/* 8020FF38 0020CE78 48 0B ED 15 */ bl __nw__FUl /* 8020FF3C 0020CE7C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FF40 0020CE80 41 82 00 28 */ beq lbl_8020FF68 /* 8020FF44 0020CE84 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -333,7 +333,7 @@ lbl_8020FF68: /* 8020FFA0 0020CEE0 7D 89 03 A6 */ mtctr r12 /* 8020FFA4 0020CEE4 4E 80 04 21 */ bctrl /* 8020FFA8 0020CEE8 38 60 00 6C */ li r3, 0x6c -/* 8020FFAC 0020CEEC 48 0B EC A1 */ bl __nw +/* 8020FFAC 0020CEEC 48 0B EC A1 */ bl __nw__FUl /* 8020FFB0 0020CEF0 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FFB4 0020CEF4 41 82 00 28 */ beq lbl_8020FFDC /* 8020FFB8 0020CEF8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -364,7 +364,7 @@ lbl_8020FFDC: /* 80210018 0020CF58 7D 89 03 A6 */ mtctr r12 /* 8021001C 0020CF5C 4E 80 04 21 */ bctrl /* 80210020 0020CF60 38 60 00 6C */ li r3, 0x6c -/* 80210024 0020CF64 48 0B EC 29 */ bl __nw +/* 80210024 0020CF64 48 0B EC 29 */ bl __nw__FUl /* 80210028 0020CF68 7C 60 1B 79 */ or. r0, r3, r3 /* 8021002C 0020CF6C 41 82 00 28 */ beq lbl_80210054 /* 80210030 0020CF70 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -394,7 +394,7 @@ lbl_80210054: /* 8021008C 0020CFCC 7D 89 03 A6 */ mtctr r12 /* 80210090 0020CFD0 4E 80 04 21 */ bctrl /* 80210094 0020CFD4 38 60 00 6C */ li r3, 0x6c -/* 80210098 0020CFD8 48 0B EB B5 */ bl __nw +/* 80210098 0020CFD8 48 0B EB B5 */ bl __nw__FUl /* 8021009C 0020CFDC 7C 60 1B 79 */ or. r0, r3, r3 /* 802100A0 0020CFE0 41 82 00 28 */ beq lbl_802100C8 /* 802100A4 0020CFE4 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -1068,7 +1068,7 @@ lbl_80210A00: /* 80210A00 0020D940 80 7F 00 74 */ lwz r3, 0x74(r31) /* 80210A04 0020D944 3B 1C 04 E4 */ addi r24, r28, 0x4e4 /* 80210A08 0020D948 7C 99 C0 2E */ lwzx r4, r25, r24 -/* 80210A0C 0020D94C 48 0B DB 3D */ bl JKRHeap_NS_free_X1_ +/* 80210A0C 0020D94C 48 0B DB 3D */ bl free__7JKRHeapFPv /* 80210A10 0020D950 7F 59 C1 2E */ stwx r26, r25, r24 /* 80210A14 0020D954 3A F7 00 01 */ addi r23, r23, 1 /* 80210A18 0020D958 2C 17 00 02 */ cmpwi r23, 2 @@ -1093,7 +1093,7 @@ lbl_80210A58: /* 80210A58 0020D998 80 7F 00 74 */ lwz r3, 0x74(r31) /* 80210A5C 0020D99C 3A FB 04 F4 */ addi r23, r27, 0x4f4 /* 80210A60 0020D9A0 7C 99 B8 2E */ lwzx r4, r25, r23 -/* 80210A64 0020D9A4 48 0B DA E5 */ bl JKRHeap_NS_free_X1_ +/* 80210A64 0020D9A4 48 0B DA E5 */ bl free__7JKRHeapFPv /* 80210A68 0020D9A8 7F 59 B9 2E */ stwx r26, r25, r23 /* 80210A6C 0020D9AC 3A 94 00 01 */ addi r20, r20, 1 /* 80210A70 0020D9B0 2C 14 00 02 */ cmpwi r20, 2 @@ -1466,7 +1466,7 @@ lbl_80210F74: /* 80210F84 0020DEC4 7F C0 07 35 */ extsh. r0, r30 /* 80210F88 0020DEC8 40 81 00 0C */ ble lbl_80210F94 /* 80210F8C 0020DECC 7F E3 FB 78 */ mr r3, r31 -/* 80210F90 0020DED0 48 0B DD AD */ bl __dl +/* 80210F90 0020DED0 48 0B DD AD */ bl __dl__FPv lbl_80210F94: /* 80210F94 0020DED4 7F E3 FB 78 */ mr r3, r31 /* 80210F98 0020DED8 39 61 00 40 */ addi r11, r1, 0x40 @@ -2323,7 +2323,7 @@ dMeter2Draw_c_NS_initLife: /* 80211C30 0020EB70 B0 7F 00 02 */ sth r3, 2(r31) lbl_80211C34: /* 80211C34 0020EB74 38 60 00 6C */ li r3, 0x6c -/* 80211C38 0020EB78 48 0B D0 15 */ bl __nw +/* 80211C38 0020EB78 48 0B D0 15 */ bl __nw__FUl /* 80211C3C 0020EB7C 7C 60 1B 79 */ or. r0, r3, r3 /* 80211C40 0020EB80 41 82 00 28 */ beq lbl_80211C68 /* 80211C44 0020EB84 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2342,7 +2342,7 @@ lbl_80211C68: /* 80211C74 0020EBB4 3B 40 00 00 */ li r26, 0 lbl_80211C78: /* 80211C78 0020EBB8 38 60 00 6C */ li r3, 0x6c -/* 80211C7C 0020EBBC 48 0B CF D1 */ bl __nw +/* 80211C7C 0020EBBC 48 0B CF D1 */ bl __nw__FUl /* 80211C80 0020EBC0 7C 60 1B 79 */ or. r0, r3, r3 /* 80211C84 0020EBC4 41 82 00 28 */ beq lbl_80211CAC /* 80211C88 0020EBC8 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2358,7 +2358,7 @@ lbl_80211CAC: /* 80211CAC 0020EBEC 7F 3C DA 14 */ add r25, r28, r27 /* 80211CB0 0020EBF0 90 19 01 28 */ stw r0, 0x128(r25) /* 80211CB4 0020EBF4 38 60 00 6C */ li r3, 0x6c -/* 80211CB8 0020EBF8 48 0B CF 95 */ bl __nw +/* 80211CB8 0020EBF8 48 0B CF 95 */ bl __nw__FUl /* 80211CBC 0020EBFC 7C 60 1B 79 */ or. r0, r3, r3 /* 80211CC0 0020EC00 41 82 00 28 */ beq lbl_80211CE8 /* 80211CC4 0020EC04 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2373,7 +2373,7 @@ lbl_80211CAC: lbl_80211CE8: /* 80211CE8 0020EC28 90 19 01 78 */ stw r0, 0x178(r25) /* 80211CEC 0020EC2C 38 60 00 1C */ li r3, 0x1c -/* 80211CF0 0020EC30 48 0B CF 5D */ bl __nw +/* 80211CF0 0020EC30 48 0B CF 5D */ bl __nw__FUl /* 80211CF4 0020EC34 7C 60 1B 79 */ or. r0, r3, r3 /* 80211CF8 0020EC38 41 82 00 28 */ beq lbl_80211D20 /* 80211CFC 0020EC3C 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2388,7 +2388,7 @@ lbl_80211CE8: lbl_80211D20: /* 80211D20 0020EC60 90 19 04 40 */ stw r0, 0x440(r25) /* 80211D24 0020EC64 38 60 00 1C */ li r3, 0x1c -/* 80211D28 0020EC68 48 0B CF 25 */ bl __nw +/* 80211D28 0020EC68 48 0B CF 25 */ bl __nw__FUl /* 80211D2C 0020EC6C 7C 60 1B 79 */ or. r0, r3, r3 /* 80211D30 0020EC70 41 82 00 28 */ beq lbl_80211D58 /* 80211D34 0020EC74 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2404,7 +2404,7 @@ lbl_80211D58: /* 80211D58 0020EC98 7F 3C D2 14 */ add r25, r28, r26 /* 80211D5C 0020EC9C 90 19 03 A0 */ stw r0, 0x3a0(r25) /* 80211D60 0020ECA0 38 60 00 1C */ li r3, 0x1c -/* 80211D64 0020ECA4 48 0B CE E9 */ bl __nw +/* 80211D64 0020ECA4 48 0B CE E9 */ bl __nw__FUl /* 80211D68 0020ECA8 7C 60 1B 79 */ or. r0, r3, r3 /* 80211D6C 0020ECAC 41 82 00 28 */ beq lbl_80211D94 /* 80211D70 0020ECB0 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2424,7 +2424,7 @@ lbl_80211D94: /* 80211DA4 0020ECE4 3B 5A 00 08 */ addi r26, r26, 8 /* 80211DA8 0020ECE8 41 80 FE D0 */ blt lbl_80211C78 /* 80211DAC 0020ECEC 38 60 00 6C */ li r3, 0x6c -/* 80211DB0 0020ECF0 48 0B CE 9D */ bl __nw +/* 80211DB0 0020ECF0 48 0B CE 9D */ bl __nw__FUl /* 80211DB4 0020ECF4 7C 60 1B 79 */ or. r0, r3, r3 /* 80211DB8 0020ECF8 41 82 00 24 */ beq lbl_80211DDC /* 80211DBC 0020ECFC 80 9C 00 78 */ lwz r4, 0x78(r28) @@ -2488,7 +2488,7 @@ dMeter2Draw_c_NS_initMagic: /* 80211E90 0020EDD0 D0 03 05 50 */ stfs f0, 0x550(r3) /* 80211E94 0020EDD4 D0 03 05 54 */ stfs f0, 0x554(r3) /* 80211E98 0020EDD8 38 60 00 6C */ li r3, 0x6c -/* 80211E9C 0020EDDC 48 0B CD B1 */ bl __nw +/* 80211E9C 0020EDDC 48 0B CD B1 */ bl __nw__FUl /* 80211EA0 0020EDE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80211EA4 0020EDE4 41 82 00 28 */ beq lbl_80211ECC /* 80211EA8 0020EDE8 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2503,7 +2503,7 @@ dMeter2Draw_c_NS_initMagic: lbl_80211ECC: /* 80211ECC 0020EE0C 90 1F 01 CC */ stw r0, 0x1cc(r31) /* 80211ED0 0020EE10 38 60 00 6C */ li r3, 0x6c -/* 80211ED4 0020EE14 48 0B CD 79 */ bl __nw +/* 80211ED4 0020EE14 48 0B CD 79 */ bl __nw__FUl /* 80211ED8 0020EE18 7C 60 1B 79 */ or. r0, r3, r3 /* 80211EDC 0020EE1C 41 82 00 28 */ beq lbl_80211F04 /* 80211EE0 0020EE20 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2518,7 +2518,7 @@ lbl_80211ECC: lbl_80211F04: /* 80211F04 0020EE44 90 1F 01 D0 */ stw r0, 0x1d0(r31) /* 80211F08 0020EE48 38 60 00 6C */ li r3, 0x6c -/* 80211F0C 0020EE4C 48 0B CD 41 */ bl __nw +/* 80211F0C 0020EE4C 48 0B CD 41 */ bl __nw__FUl /* 80211F10 0020EE50 7C 60 1B 79 */ or. r0, r3, r3 /* 80211F14 0020EE54 41 82 00 28 */ beq lbl_80211F3C /* 80211F18 0020EE58 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2533,7 +2533,7 @@ lbl_80211F04: lbl_80211F3C: /* 80211F3C 0020EE7C 90 1F 01 D4 */ stw r0, 0x1d4(r31) /* 80211F40 0020EE80 38 60 00 6C */ li r3, 0x6c -/* 80211F44 0020EE84 48 0B CD 09 */ bl __nw +/* 80211F44 0020EE84 48 0B CD 09 */ bl __nw__FUl /* 80211F48 0020EE88 7C 60 1B 79 */ or. r0, r3, r3 /* 80211F4C 0020EE8C 41 82 00 28 */ beq lbl_80211F74 /* 80211F50 0020EE90 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2548,7 +2548,7 @@ lbl_80211F3C: lbl_80211F74: /* 80211F74 0020EEB4 90 1F 01 DC */ stw r0, 0x1dc(r31) /* 80211F78 0020EEB8 38 60 00 6C */ li r3, 0x6c -/* 80211F7C 0020EEBC 48 0B CC D1 */ bl __nw +/* 80211F7C 0020EEBC 48 0B CC D1 */ bl __nw__FUl /* 80211F80 0020EEC0 7C 60 1B 79 */ or. r0, r3, r3 /* 80211F84 0020EEC4 41 82 00 24 */ beq lbl_80211FA8 /* 80211F88 0020EEC8 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2696,7 +2696,7 @@ dMeter2Draw_c_NS_initLightDrop: /* 802121A8 0020F0E8 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 802121AC 0020F0EC 3B 63 82 58 */ addi r27, r3, lbl_80398258@l /* 802121B0 0020F0F0 38 60 00 6C */ li r3, 0x6c -/* 802121B4 0020F0F4 48 0B CA 99 */ bl __nw +/* 802121B4 0020F0F4 48 0B CA 99 */ bl __nw__FUl /* 802121B8 0020F0F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802121BC 0020F0FC 41 82 00 28 */ beq lbl_802121E4 /* 802121C0 0020F100 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2715,7 +2715,7 @@ lbl_802121E4: /* 802121F0 0020F130 3B A0 00 00 */ li r29, 0 lbl_802121F4: /* 802121F4 0020F134 38 60 00 6C */ li r3, 0x6c -/* 802121F8 0020F138 48 0B CA 55 */ bl __nw +/* 802121F8 0020F138 48 0B CA 55 */ bl __nw__FUl /* 802121FC 0020F13C 7C 60 1B 79 */ or. r0, r3, r3 /* 80212200 0020F140 41 82 00 28 */ beq lbl_80212228 /* 80212204 0020F144 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2731,7 +2731,7 @@ lbl_80212228: /* 80212228 0020F168 7F 9E FA 14 */ add r28, r30, r31 /* 8021222C 0020F16C 90 1C 01 F0 */ stw r0, 0x1f0(r28) /* 80212230 0020F170 38 60 00 6C */ li r3, 0x6c -/* 80212234 0020F174 48 0B CA 19 */ bl __nw +/* 80212234 0020F174 48 0B CA 19 */ bl __nw__FUl /* 80212238 0020F178 7C 60 1B 79 */ or. r0, r3, r3 /* 8021223C 0020F17C 41 82 00 28 */ beq lbl_80212264 /* 80212240 0020F180 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2746,7 +2746,7 @@ lbl_80212228: lbl_80212264: /* 80212264 0020F1A4 90 1C 01 F4 */ stw r0, 0x1f4(r28) /* 80212268 0020F1A8 38 60 00 6C */ li r3, 0x6c -/* 8021226C 0020F1AC 48 0B C9 E1 */ bl __nw +/* 8021226C 0020F1AC 48 0B C9 E1 */ bl __nw__FUl /* 80212270 0020F1B0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212274 0020F1B4 41 82 00 28 */ beq lbl_8021229C /* 80212278 0020F1B8 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2766,7 +2766,7 @@ lbl_8021229C: /* 802122AC 0020F1EC 3B BD 00 08 */ addi r29, r29, 8 /* 802122B0 0020F1F0 41 80 FF 44 */ blt lbl_802121F4 /* 802122B4 0020F1F4 38 60 00 6C */ li r3, 0x6c -/* 802122B8 0020F1F8 48 0B C9 95 */ bl __nw +/* 802122B8 0020F1F8 48 0B C9 95 */ bl __nw__FUl /* 802122BC 0020F1FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802122C0 0020F200 41 82 00 24 */ beq lbl_802122E4 /* 802122C4 0020F204 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2780,7 +2780,7 @@ lbl_8021229C: lbl_802122E4: /* 802122E4 0020F224 90 1E 01 E8 */ stw r0, 0x1e8(r30) /* 802122E8 0020F228 38 60 00 6C */ li r3, 0x6c -/* 802122EC 0020F22C 48 0B C9 61 */ bl __nw +/* 802122EC 0020F22C 48 0B C9 61 */ bl __nw__FUl /* 802122F0 0020F230 7C 60 1B 79 */ or. r0, r3, r3 /* 802122F4 0020F234 41 82 00 24 */ beq lbl_80212318 /* 802122F8 0020F238 80 9E 00 78 */ lwz r4, 0x78(r30) @@ -2866,7 +2866,7 @@ dMeter2Draw_c_NS_initRupeeKey: /* 8021241C 0020F35C 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 80212420 0020F360 3B C3 82 58 */ addi r30, r3, lbl_80398258@l /* 80212424 0020F364 38 60 00 6C */ li r3, 0x6c -/* 80212428 0020F368 48 0B C8 25 */ bl __nw +/* 80212428 0020F368 48 0B C8 25 */ bl __nw__FUl /* 8021242C 0020F36C 7C 60 1B 79 */ or. r0, r3, r3 /* 80212430 0020F370 41 82 00 24 */ beq lbl_80212454 /* 80212434 0020F374 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2885,7 +2885,7 @@ lbl_80212454: /* 80212464 0020F3A4 3B 80 00 00 */ li r28, 0 lbl_80212468: /* 80212468 0020F3A8 38 60 00 6C */ li r3, 0x6c -/* 8021246C 0020F3AC 48 0B C7 E1 */ bl __nw +/* 8021246C 0020F3AC 48 0B C7 E1 */ bl __nw__FUl /* 80212470 0020F3B0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212474 0020F3B4 41 82 00 28 */ beq lbl_8021249C /* 80212478 0020F3B8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2905,7 +2905,7 @@ lbl_8021249C: /* 802124AC 0020F3EC 38 80 00 04 */ li r4, 4 /* 802124B0 0020F3F0 48 0E 52 49 */ bl J2DPane_NS_setBasePosition /* 802124B4 0020F3F4 38 60 00 6C */ li r3, 0x6c -/* 802124B8 0020F3F8 48 0B C7 95 */ bl __nw +/* 802124B8 0020F3F8 48 0B C7 95 */ bl __nw__FUl /* 802124BC 0020F3FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802124C0 0020F400 41 82 00 28 */ beq lbl_802124E8 /* 802124C4 0020F404 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2928,7 +2928,7 @@ lbl_802124E8: /* 80212504 0020F444 3B 9C 00 08 */ addi r28, r28, 8 /* 80212508 0020F448 41 80 FF 60 */ blt lbl_80212468 /* 8021250C 0020F44C 38 60 00 6C */ li r3, 0x6c -/* 80212510 0020F450 48 0B C7 3D */ bl __nw +/* 80212510 0020F450 48 0B C7 3D */ bl __nw__FUl /* 80212514 0020F454 7C 60 1B 79 */ or. r0, r3, r3 /* 80212518 0020F458 41 82 00 24 */ beq lbl_8021253C /* 8021251C 0020F45C 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2942,7 +2942,7 @@ lbl_802124E8: lbl_8021253C: /* 8021253C 0020F47C 90 1F 02 B4 */ stw r0, 0x2b4(r31) /* 80212540 0020F480 38 60 00 6C */ li r3, 0x6c -/* 80212544 0020F484 48 0B C7 09 */ bl __nw +/* 80212544 0020F484 48 0B C7 09 */ bl __nw__FUl /* 80212548 0020F488 7C 60 1B 79 */ or. r0, r3, r3 /* 8021254C 0020F48C 41 82 00 28 */ beq lbl_80212574 /* 80212550 0020F490 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2957,7 +2957,7 @@ lbl_8021253C: lbl_80212574: /* 80212574 0020F4B4 90 1F 02 B8 */ stw r0, 0x2b8(r31) /* 80212578 0020F4B8 38 60 00 6C */ li r3, 0x6c -/* 8021257C 0020F4BC 48 0B C6 D1 */ bl __nw +/* 8021257C 0020F4BC 48 0B C6 D1 */ bl __nw__FUl /* 80212580 0020F4C0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212584 0020F4C4 41 82 00 28 */ beq lbl_802125AC /* 80212588 0020F4C8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -2985,7 +2985,7 @@ lbl_802125AC: /* 802125DC 0020F51C 3B 80 00 00 */ li r28, 0 lbl_802125E0: /* 802125E0 0020F520 38 60 00 6C */ li r3, 0x6c -/* 802125E4 0020F524 48 0B C6 69 */ bl __nw +/* 802125E4 0020F524 48 0B C6 69 */ bl __nw__FUl /* 802125E8 0020F528 7C 60 1B 79 */ or. r0, r3, r3 /* 802125EC 0020F52C 41 82 00 28 */ beq lbl_80212614 /* 802125F0 0020F530 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3012,7 +3012,7 @@ lbl_80212614: /* 80212640 0020F580 3B 9C 00 08 */ addi r28, r28, 8 /* 80212644 0020F584 41 80 FF 9C */ blt lbl_802125E0 /* 80212648 0020F588 38 60 00 6C */ li r3, 0x6c -/* 8021264C 0020F58C 48 0B C6 01 */ bl __nw +/* 8021264C 0020F58C 48 0B C6 01 */ bl __nw__FUl /* 80212650 0020F590 7C 60 1B 79 */ or. r0, r3, r3 /* 80212654 0020F594 41 82 00 24 */ beq lbl_80212678 /* 80212658 0020F598 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3086,7 +3086,7 @@ lbl_8021274C: /* 8021274C 0020F68C 80 7F 00 74 */ lwz r3, 0x74(r31) /* 80212750 0020F690 38 80 0C 00 */ li r4, 0xc00 /* 80212754 0020F694 38 A0 00 20 */ li r5, 0x20 -/* 80212758 0020F698 48 0B BD 7D */ bl JKRHeap_NS_alloc_X1_ +/* 80212758 0020F698 48 0B BD 7D */ bl alloc__7JKRHeapFUli /* 8021275C 0020F69C 38 1C 04 E4 */ addi r0, r28, 0x4e4 /* 80212760 0020F6A0 7C 7A 01 2E */ stwx r3, r26, r0 /* 80212764 0020F6A4 3B BD 00 01 */ addi r29, r29, 1 @@ -3120,7 +3120,7 @@ lbl_802127C8: /* 802127C8 0020F708 80 7F 00 74 */ lwz r3, 0x74(r31) /* 802127CC 0020F70C 38 80 0C 00 */ li r4, 0xc00 /* 802127D0 0020F710 38 A0 00 20 */ li r5, 0x20 -/* 802127D4 0020F714 48 0B BD 01 */ bl JKRHeap_NS_alloc_X1_ +/* 802127D4 0020F714 48 0B BD 01 */ bl alloc__7JKRHeapFUli /* 802127D8 0020F718 38 1D 04 F4 */ addi r0, r29, 0x4f4 /* 802127DC 0020F71C 7C 7E 01 2E */ stwx r3, r30, r0 /* 802127E0 0020F720 3A D6 00 01 */ addi r22, r22, 1 @@ -3136,7 +3136,7 @@ lbl_802127C8: /* 80212808 0020F748 3B 7B 00 10 */ addi r27, r27, 0x10 /* 8021280C 0020F74C 41 80 FF 88 */ blt lbl_80212794 /* 80212810 0020F750 38 60 00 6C */ li r3, 0x6c -/* 80212814 0020F754 48 0B C4 39 */ bl __nw +/* 80212814 0020F754 48 0B C4 39 */ bl __nw__FUl /* 80212818 0020F758 7C 60 1B 79 */ or. r0, r3, r3 /* 8021281C 0020F75C 41 82 00 28 */ beq lbl_80212844 /* 80212820 0020F760 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3170,7 +3170,7 @@ lbl_80212844: /* 8021288C 0020F7CC 88 03 00 17 */ lbz r0, 0x17(r3) /* 80212890 0020F7D0 98 1F 07 71 */ stb r0, 0x771(r31) /* 80212894 0020F7D4 38 60 01 50 */ li r3, 0x150 -/* 80212898 0020F7D8 48 0B C3 B5 */ bl __nw +/* 80212898 0020F7D8 48 0B C3 B5 */ bl __nw__FUl /* 8021289C 0020F7DC 7C 7A 1B 79 */ or. r26, r3, r3 /* 802128A0 0020F7E0 41 82 00 68 */ beq lbl_80212908 /* 802128A4 0020F7E4 80 7F 03 28 */ lwz r3, 0x328(r31) @@ -3208,7 +3208,7 @@ lbl_80212908: /* 80212920 0020F860 80 9F 05 14 */ lwz r4, 0x514(r31) /* 80212924 0020F864 48 0E 3D 49 */ bl J2DPane_NS_appendChild /* 80212928 0020F868 38 60 00 6C */ li r3, 0x6c -/* 8021292C 0020F86C 48 0B C3 21 */ bl __nw +/* 8021292C 0020F86C 48 0B C3 21 */ bl __nw__FUl /* 80212930 0020F870 7C 60 1B 79 */ or. r0, r3, r3 /* 80212934 0020F874 41 82 00 28 */ beq lbl_8021295C /* 80212938 0020F878 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3231,7 +3231,7 @@ lbl_8021295C: /* 80212978 0020F8B8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8021297C 0020F8BC 90 03 00 28 */ stw r0, 0x28(r3) /* 80212980 0020F8C0 38 60 00 6C */ li r3, 0x6c -/* 80212984 0020F8C4 48 0B C2 C9 */ bl __nw +/* 80212984 0020F8C4 48 0B C2 C9 */ bl __nw__FUl /* 80212988 0020F8C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8021298C 0020F8CC 41 82 00 28 */ beq lbl_802129B4 /* 80212990 0020F8D0 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3257,7 +3257,7 @@ lbl_802129B4: /* 802129DC 0020F91C 90 1F 03 34 */ stw r0, 0x334(r31) /* 802129E0 0020F920 90 1F 03 38 */ stw r0, 0x338(r31) /* 802129E4 0020F924 38 60 01 50 */ li r3, 0x150 -/* 802129E8 0020F928 48 0B C2 65 */ bl __nw +/* 802129E8 0020F928 48 0B C2 65 */ bl __nw__FUl /* 802129EC 0020F92C 7C 7A 1B 79 */ or. r26, r3, r3 /* 802129F0 0020F930 41 82 00 68 */ beq lbl_80212A58 /* 802129F4 0020F934 80 7F 03 2C */ lwz r3, 0x32c(r31) @@ -3295,7 +3295,7 @@ lbl_80212A58: /* 80212A70 0020F9B0 80 9F 05 18 */ lwz r4, 0x518(r31) /* 80212A74 0020F9B4 48 0E 3B F9 */ bl J2DPane_NS_appendChild /* 80212A78 0020F9B8 38 60 01 50 */ li r3, 0x150 -/* 80212A7C 0020F9BC 48 0B C1 D1 */ bl __nw +/* 80212A7C 0020F9BC 48 0B C1 D1 */ bl __nw__FUl /* 80212A80 0020F9C0 7C 7A 1B 79 */ or. r26, r3, r3 /* 80212A84 0020F9C4 41 82 00 68 */ beq lbl_80212AEC /* 80212A88 0020F9C8 80 7F 03 30 */ lwz r3, 0x330(r31) @@ -3333,7 +3333,7 @@ lbl_80212AEC: /* 80212B04 0020FA44 80 9F 05 1C */ lwz r4, 0x51c(r31) /* 80212B08 0020FA48 48 0E 3B 65 */ bl J2DPane_NS_appendChild /* 80212B0C 0020FA4C 38 60 00 6C */ li r3, 0x6c -/* 80212B10 0020FA50 48 0B C1 3D */ bl __nw +/* 80212B10 0020FA50 48 0B C1 3D */ bl __nw__FUl /* 80212B14 0020FA54 7C 60 1B 79 */ or. r0, r3, r3 /* 80212B18 0020FA58 41 82 00 28 */ beq lbl_80212B40 /* 80212B1C 0020FA5C 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3356,7 +3356,7 @@ lbl_80212B40: /* 80212B5C 0020FA9C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80212B60 0020FAA0 90 03 00 30 */ stw r0, 0x30(r3) /* 80212B64 0020FAA4 38 60 01 50 */ li r3, 0x150 -/* 80212B68 0020FAA8 48 0B C0 E5 */ bl __nw +/* 80212B68 0020FAA8 48 0B C0 E5 */ bl __nw__FUl /* 80212B6C 0020FAAC 7C 7A 1B 79 */ or. r26, r3, r3 /* 80212B70 0020FAB0 41 82 00 68 */ beq lbl_80212BD8 /* 80212B74 0020FAB4 80 7F 03 34 */ lwz r3, 0x334(r31) @@ -3394,7 +3394,7 @@ lbl_80212BD8: /* 80212BF0 0020FB30 80 9F 05 20 */ lwz r4, 0x520(r31) /* 80212BF4 0020FB34 48 0E 3A 79 */ bl J2DPane_NS_appendChild /* 80212BF8 0020FB38 38 60 00 6C */ li r3, 0x6c -/* 80212BFC 0020FB3C 48 0B C0 51 */ bl __nw +/* 80212BFC 0020FB3C 48 0B C0 51 */ bl __nw__FUl /* 80212C00 0020FB40 7C 60 1B 79 */ or. r0, r3, r3 /* 80212C04 0020FB44 41 82 00 28 */ beq lbl_80212C2C /* 80212C08 0020FB48 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3417,7 +3417,7 @@ lbl_80212C2C: /* 80212C48 0020FB88 80 7F 03 18 */ lwz r3, 0x318(r31) /* 80212C4C 0020FB8C 48 04 29 BD */ bl CPaneMgrAlpha_NS_hide /* 80212C50 0020FB90 38 60 00 6C */ li r3, 0x6c -/* 80212C54 0020FB94 48 0B BF F9 */ bl __nw +/* 80212C54 0020FB94 48 0B BF F9 */ bl __nw__FUl /* 80212C58 0020FB98 7C 60 1B 79 */ or. r0, r3, r3 /* 80212C5C 0020FB9C 41 82 00 28 */ beq lbl_80212C84 /* 80212C60 0020FBA0 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3438,7 +3438,7 @@ lbl_80212C84: /* 80212C98 0020FBD8 80 7F 03 1C */ lwz r3, 0x31c(r31) /* 80212C9C 0020FBDC 48 04 29 6D */ bl CPaneMgrAlpha_NS_hide /* 80212CA0 0020FBE0 38 60 00 6C */ li r3, 0x6c -/* 80212CA4 0020FBE4 48 0B BF A9 */ bl __nw +/* 80212CA4 0020FBE4 48 0B BF A9 */ bl __nw__FUl /* 80212CA8 0020FBE8 7C 60 1B 79 */ or. r0, r3, r3 /* 80212CAC 0020FBEC 41 82 00 28 */ beq lbl_80212CD4 /* 80212CB0 0020FBF0 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3459,7 +3459,7 @@ lbl_80212CD4: /* 80212CE8 0020FC28 80 7F 03 20 */ lwz r3, 0x320(r31) /* 80212CEC 0020FC2C 48 04 29 1D */ bl CPaneMgrAlpha_NS_hide /* 80212CF0 0020FC30 38 60 00 6C */ li r3, 0x6c -/* 80212CF4 0020FC34 48 0B BF 59 */ bl __nw +/* 80212CF4 0020FC34 48 0B BF 59 */ bl __nw__FUl /* 80212CF8 0020FC38 7C 60 1B 79 */ or. r0, r3, r3 /* 80212CFC 0020FC3C 41 82 00 28 */ beq lbl_80212D24 /* 80212D00 0020FC40 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3480,7 +3480,7 @@ lbl_80212D24: /* 80212D38 0020FC78 80 7F 03 24 */ lwz r3, 0x324(r31) /* 80212D3C 0020FC7C 48 04 28 CD */ bl CPaneMgrAlpha_NS_hide /* 80212D40 0020FC80 38 60 00 6C */ li r3, 0x6c -/* 80212D44 0020FC84 48 0B BF 09 */ bl __nw +/* 80212D44 0020FC84 48 0B BF 09 */ bl __nw__FUl /* 80212D48 0020FC88 7C 60 1B 79 */ or. r0, r3, r3 /* 80212D4C 0020FC8C 41 82 00 28 */ beq lbl_80212D74 /* 80212D50 0020FC90 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3495,7 +3495,7 @@ lbl_80212D24: lbl_80212D74: /* 80212D74 0020FCB4 90 1F 03 38 */ stw r0, 0x338(r31) /* 80212D78 0020FCB8 38 60 00 6C */ li r3, 0x6c -/* 80212D7C 0020FCBC 48 0B BE D1 */ bl __nw +/* 80212D7C 0020FCBC 48 0B BE D1 */ bl __nw__FUl /* 80212D80 0020FCC0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212D84 0020FCC4 41 82 00 28 */ beq lbl_80212DAC /* 80212D88 0020FCC8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3510,7 +3510,7 @@ lbl_80212D74: lbl_80212DAC: /* 80212DAC 0020FCEC 90 1F 03 3C */ stw r0, 0x33c(r31) /* 80212DB0 0020FCF0 38 60 00 6C */ li r3, 0x6c -/* 80212DB4 0020FCF4 48 0B BE 99 */ bl __nw +/* 80212DB4 0020FCF4 48 0B BE 99 */ bl __nw__FUl /* 80212DB8 0020FCF8 7C 60 1B 79 */ or. r0, r3, r3 /* 80212DBC 0020FCFC 41 82 00 28 */ beq lbl_80212DE4 /* 80212DC0 0020FD00 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3525,7 +3525,7 @@ lbl_80212DAC: lbl_80212DE4: /* 80212DE4 0020FD24 90 1F 03 40 */ stw r0, 0x340(r31) /* 80212DE8 0020FD28 38 60 00 6C */ li r3, 0x6c -/* 80212DEC 0020FD2C 48 0B BE 61 */ bl __nw +/* 80212DEC 0020FD2C 48 0B BE 61 */ bl __nw__FUl /* 80212DF0 0020FD30 7C 60 1B 79 */ or. r0, r3, r3 /* 80212DF4 0020FD34 41 82 00 28 */ beq lbl_80212E1C /* 80212DF8 0020FD38 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3542,7 +3542,7 @@ lbl_80212E1C: /* 80212E20 0020FD60 38 00 00 00 */ li r0, 0 /* 80212E24 0020FD64 90 1F 03 48 */ stw r0, 0x348(r31) /* 80212E28 0020FD68 38 60 00 6C */ li r3, 0x6c -/* 80212E2C 0020FD6C 48 0B BE 21 */ bl __nw +/* 80212E2C 0020FD6C 48 0B BE 21 */ bl __nw__FUl /* 80212E30 0020FD70 7C 60 1B 79 */ or. r0, r3, r3 /* 80212E34 0020FD74 41 82 00 28 */ beq lbl_80212E5C /* 80212E38 0020FD78 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3557,7 +3557,7 @@ lbl_80212E1C: lbl_80212E5C: /* 80212E5C 0020FD9C 90 1F 03 4C */ stw r0, 0x34c(r31) /* 80212E60 0020FDA0 38 60 00 6C */ li r3, 0x6c -/* 80212E64 0020FDA4 48 0B BD E9 */ bl __nw +/* 80212E64 0020FDA4 48 0B BD E9 */ bl __nw__FUl /* 80212E68 0020FDA8 7C 60 1B 79 */ or. r0, r3, r3 /* 80212E6C 0020FDAC 41 82 00 28 */ beq lbl_80212E94 /* 80212E70 0020FDB0 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3572,7 +3572,7 @@ lbl_80212E5C: lbl_80212E94: /* 80212E94 0020FDD4 90 1F 03 50 */ stw r0, 0x350(r31) /* 80212E98 0020FDD8 38 60 00 6C */ li r3, 0x6c -/* 80212E9C 0020FDDC 48 0B BD B1 */ bl __nw +/* 80212E9C 0020FDDC 48 0B BD B1 */ bl __nw__FUl /* 80212EA0 0020FDE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212EA4 0020FDE4 41 82 00 28 */ beq lbl_80212ECC /* 80212EA8 0020FDE8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3587,7 +3587,7 @@ lbl_80212E94: lbl_80212ECC: /* 80212ECC 0020FE0C 90 1F 03 5C */ stw r0, 0x35c(r31) /* 80212ED0 0020FE10 38 60 00 6C */ li r3, 0x6c -/* 80212ED4 0020FE14 48 0B BD 79 */ bl __nw +/* 80212ED4 0020FE14 48 0B BD 79 */ bl __nw__FUl /* 80212ED8 0020FE18 7C 60 1B 79 */ or. r0, r3, r3 /* 80212EDC 0020FE1C 41 82 00 28 */ beq lbl_80212F04 /* 80212EE0 0020FE20 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3602,7 +3602,7 @@ lbl_80212ECC: lbl_80212F04: /* 80212F04 0020FE44 90 1F 03 54 */ stw r0, 0x354(r31) /* 80212F08 0020FE48 38 60 00 6C */ li r3, 0x6c -/* 80212F0C 0020FE4C 48 0B BD 41 */ bl __nw +/* 80212F0C 0020FE4C 48 0B BD 41 */ bl __nw__FUl /* 80212F10 0020FE50 7C 60 1B 79 */ or. r0, r3, r3 /* 80212F14 0020FE54 41 82 00 28 */ beq lbl_80212F3C /* 80212F18 0020FE58 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3617,7 +3617,7 @@ lbl_80212F04: lbl_80212F3C: /* 80212F3C 0020FE7C 90 1F 03 58 */ stw r0, 0x358(r31) /* 80212F40 0020FE80 38 60 00 6C */ li r3, 0x6c -/* 80212F44 0020FE84 48 0B BD 09 */ bl __nw +/* 80212F44 0020FE84 48 0B BD 09 */ bl __nw__FUl /* 80212F48 0020FE88 7C 60 1B 79 */ or. r0, r3, r3 /* 80212F4C 0020FE8C 41 82 00 28 */ beq lbl_80212F74 /* 80212F50 0020FE90 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3632,7 +3632,7 @@ lbl_80212F3C: lbl_80212F74: /* 80212F74 0020FEB4 90 1F 03 60 */ stw r0, 0x360(r31) /* 80212F78 0020FEB8 38 60 00 6C */ li r3, 0x6c -/* 80212F7C 0020FEBC 48 0B BC D1 */ bl __nw +/* 80212F7C 0020FEBC 48 0B BC D1 */ bl __nw__FUl /* 80212F80 0020FEC0 7C 60 1B 79 */ or. r0, r3, r3 /* 80212F84 0020FEC4 41 82 00 28 */ beq lbl_80212FAC /* 80212F88 0020FEC8 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3663,7 +3663,7 @@ lbl_80212FCC: /* 80212FE4 0020FF24 7C 60 03 79 */ or. r0, r3, r0 /* 80212FE8 0020FF28 41 82 00 3C */ beq lbl_80213024 /* 80212FEC 0020FF2C 38 60 00 6C */ li r3, 0x6c -/* 80212FF0 0020FF30 48 0B BC 5D */ bl __nw +/* 80212FF0 0020FF30 48 0B BC 5D */ bl __nw__FUl /* 80212FF4 0020FF34 7C 64 1B 79 */ or. r4, r3, r3 /* 80212FF8 0020FF38 41 82 00 20 */ beq lbl_80213018 /* 80212FFC 0020FF3C 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3690,7 +3690,7 @@ lbl_8021302C: /* 80213044 0020FF84 7C 60 03 79 */ or. r0, r3, r0 /* 80213048 0020FF88 41 82 00 3C */ beq lbl_80213084 /* 8021304C 0020FF8C 38 60 00 6C */ li r3, 0x6c -/* 80213050 0020FF90 48 0B BB FD */ bl __nw +/* 80213050 0020FF90 48 0B BB FD */ bl __nw__FUl /* 80213054 0020FF94 7C 64 1B 79 */ or. r4, r3, r3 /* 80213058 0020FF98 41 82 00 20 */ beq lbl_80213078 /* 8021305C 0020FF9C 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3718,7 +3718,7 @@ lbl_8021308C: /* 802130A8 0020FFE8 80 7F 03 58 */ lwz r3, 0x358(r31) /* 802130AC 0020FFEC 48 04 25 5D */ bl CPaneMgrAlpha_NS_hide /* 802130B0 0020FFF0 38 60 00 6C */ li r3, 0x6c -/* 802130B4 0020FFF4 48 0B BB 99 */ bl __nw +/* 802130B4 0020FFF4 48 0B BB 99 */ bl __nw__FUl /* 802130B8 0020FFF8 7C 60 1B 79 */ or. r0, r3, r3 /* 802130BC 0020FFFC 41 82 00 24 */ beq lbl_802130E0 /* 802130C0 00210000 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3732,7 +3732,7 @@ lbl_8021308C: lbl_802130E0: /* 802130E0 00210020 90 1F 02 F8 */ stw r0, 0x2f8(r31) /* 802130E4 00210024 38 60 00 6C */ li r3, 0x6c -/* 802130E8 00210028 48 0B BB 65 */ bl __nw +/* 802130E8 00210028 48 0B BB 65 */ bl __nw__FUl /* 802130EC 0021002C 7C 60 1B 79 */ or. r0, r3, r3 /* 802130F0 00210030 41 82 00 24 */ beq lbl_80213114 /* 802130F4 00210034 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3746,7 +3746,7 @@ lbl_802130E0: lbl_80213114: /* 80213114 00210054 90 1F 03 00 */ stw r0, 0x300(r31) /* 80213118 00210058 38 60 00 6C */ li r3, 0x6c -/* 8021311C 0021005C 48 0B BB 31 */ bl __nw +/* 8021311C 0021005C 48 0B BB 31 */ bl __nw__FUl /* 80213120 00210060 7C 60 1B 79 */ or. r0, r3, r3 /* 80213124 00210064 41 82 00 24 */ beq lbl_80213148 /* 80213128 00210068 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3762,7 +3762,7 @@ lbl_80213148: /* 8021314C 0021008C C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80213150 00210090 D0 1F 07 30 */ stfs f0, 0x730(r31) /* 80213154 00210094 38 60 00 6C */ li r3, 0x6c -/* 80213158 00210098 48 0B BA F5 */ bl __nw +/* 80213158 00210098 48 0B BA F5 */ bl __nw__FUl /* 8021315C 0021009C 7C 60 1B 79 */ or. r0, r3, r3 /* 80213160 002100A0 41 82 00 28 */ beq lbl_80213188 /* 80213164 002100A4 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3783,7 +3783,7 @@ lbl_80213188: /* 8021319C 002100DC 38 00 00 00 */ li r0, 0 /* 802131A0 002100E0 B0 1F 07 40 */ sth r0, 0x740(r31) /* 802131A4 002100E4 38 60 00 6C */ li r3, 0x6c -/* 802131A8 002100E8 48 0B BA A5 */ bl __nw +/* 802131A8 002100E8 48 0B BA A5 */ bl __nw__FUl /* 802131AC 002100EC 7C 60 1B 79 */ or. r0, r3, r3 /* 802131B0 002100F0 41 82 00 24 */ beq lbl_802131D4 /* 802131B4 002100F4 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3797,7 +3797,7 @@ lbl_80213188: lbl_802131D4: /* 802131D4 00210114 90 1F 03 0C */ stw r0, 0x30c(r31) /* 802131D8 00210118 38 60 00 6C */ li r3, 0x6c -/* 802131DC 0021011C 48 0B BA 71 */ bl __nw +/* 802131DC 0021011C 48 0B BA 71 */ bl __nw__FUl /* 802131E0 00210120 7C 60 1B 79 */ or. r0, r3, r3 /* 802131E4 00210124 41 82 00 24 */ beq lbl_80213208 /* 802131E8 00210128 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3811,7 +3811,7 @@ lbl_802131D4: lbl_80213208: /* 80213208 00210148 90 1F 03 10 */ stw r0, 0x310(r31) /* 8021320C 0021014C 38 60 00 6C */ li r3, 0x6c -/* 80213210 00210150 48 0B BA 3D */ bl __nw +/* 80213210 00210150 48 0B BA 3D */ bl __nw__FUl /* 80213214 00210154 7C 60 1B 79 */ or. r0, r3, r3 /* 80213218 00210158 41 82 00 24 */ beq lbl_8021323C /* 8021321C 0021015C 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3825,7 +3825,7 @@ lbl_80213208: lbl_8021323C: /* 8021323C 0021017C 90 1F 03 14 */ stw r0, 0x314(r31) /* 80213240 00210180 38 60 00 1C */ li r3, 0x1c -/* 80213244 00210184 48 0B BA 09 */ bl __nw +/* 80213244 00210184 48 0B BA 09 */ bl __nw__FUl /* 80213248 00210188 7C 60 1B 79 */ or. r0, r3, r3 /* 8021324C 0021018C 41 82 00 24 */ beq lbl_80213270 /* 80213250 00210190 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -3860,7 +3860,7 @@ lbl_802132B4: /* 802132BC 002101FC 7F 3F EA 14 */ add r25, r31, r29 lbl_802132C0: /* 802132C0 00210200 38 60 01 50 */ li r3, 0x150 -/* 802132C4 00210204 48 0B B9 89 */ bl __nw +/* 802132C4 00210204 48 0B B9 89 */ bl __nw__FUl /* 802132C8 00210208 7C 64 1B 79 */ or. r4, r3, r3 /* 802132CC 0021020C 41 82 00 10 */ beq lbl_802132DC /* 802132D0 00210210 7E C4 B3 78 */ mr r4, r22 @@ -4020,7 +4020,7 @@ dMeter2Draw_c_NS_initButtonCross: /* 8021351C 0021045C 93 C1 00 08 */ stw r30, 8(r1) /* 80213520 00210460 7C 7F 1B 78 */ mr r31, r3 /* 80213524 00210464 38 60 00 6C */ li r3, 0x6c -/* 80213528 00210468 48 0B B7 25 */ bl __nw +/* 80213528 00210468 48 0B B7 25 */ bl __nw__FUl /* 8021352C 0021046C 7C 60 1B 79 */ or. r0, r3, r3 /* 80213530 00210470 41 82 00 24 */ beq lbl_80213554 /* 80213534 00210474 80 9F 00 78 */ lwz r4, 0x78(r31) diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index 80efc9d971..be50733606 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -35,7 +35,7 @@ dMeter2Info_c_NS_dtor: /* 8021BE40 00218D80 90 1F 00 00 */ stw r0, 0(r31) /* 8021BE44 00218D84 7C 80 07 35 */ extsh. r0, r4 /* 8021BE48 00218D88 40 81 00 08 */ ble lbl_8021BE50 -/* 8021BE4C 00218D8C 48 0B 2E F1 */ bl __dl +/* 8021BE4C 00218D8C 48 0B 2E F1 */ bl __dl__FPv lbl_8021BE50: /* 8021BE50 00218D90 7F E3 FB 78 */ mr r3, r31 /* 8021BE54 00218D94 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 37e8ae7ee2..d980c6114a 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -429,7 +429,7 @@ jmessage_tReference: /* 80228B30 00225A70 38 03 0A D4 */ addi r0, r3, lbl_803C0AD4@l /* 80228B34 00225A74 90 1F 00 00 */ stw r0, 0(r31) /* 80228B38 00225A78 38 60 00 30 */ li r3, 0x30 -/* 80228B3C 00225A7C 48 0A 61 11 */ bl __nw +/* 80228B3C 00225A7C 48 0A 61 11 */ bl __nw__FUl /* 80228B40 00225A80 7C 60 1B 79 */ or. r0, r3, r3 /* 80228B44 00225A84 41 82 00 2C */ beq lbl_80228B70 /* 80228B48 00225A88 38 80 00 05 */ li r4, 5 @@ -536,7 +536,7 @@ lbl_80228B70: /* 80228CD8 00225C18 38 03 0A D4 */ addi r0, r3, lbl_803C0AD4@l /* 80228CDC 00225C1C 90 1E 00 00 */ stw r0, 0(r30) /* 80228CE0 00225C20 80 7E 00 08 */ lwz r3, 8(r30) -/* 80228CE4 00225C24 48 0A 60 59 */ bl __dl +/* 80228CE4 00225C24 48 0A 60 59 */ bl __dl__FPv /* 80228CE8 00225C28 38 00 00 00 */ li r0, 0 /* 80228CEC 00225C2C 90 1E 00 08 */ stw r0, 8(r30) /* 80228CF0 00225C30 7F C3 F3 78 */ mr r3, r30 @@ -545,7 +545,7 @@ lbl_80228B70: /* 80228CFC 00225C3C 7F E0 07 35 */ extsh. r0, r31 /* 80228D00 00225C40 40 81 00 0C */ ble lbl_80228D0C /* 80228D04 00225C44 7F C3 F3 78 */ mr r3, r30 -/* 80228D08 00225C48 48 0A 60 35 */ bl __dl +/* 80228D08 00225C48 48 0A 60 35 */ bl __dl__FPv lbl_80228D0C: /* 80228D0C 00225C4C 7F C3 F3 78 */ mr r3, r30 /* 80228D10 00225C50 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3462,7 +3462,7 @@ jmessage_tSequenceProcessor: /* 8022B628 00228568 7F E0 07 35 */ extsh. r0, r31 /* 8022B62C 0022856C 40 81 00 0C */ ble lbl_8022B638 /* 8022B630 00228570 7F C3 F3 78 */ mr r3, r30 -/* 8022B634 00228574 48 0A 37 09 */ bl __dl +/* 8022B634 00228574 48 0A 37 09 */ bl __dl__FPv lbl_8022B638: /* 8022B638 00228578 7F C3 F3 78 */ mr r3, r30 /* 8022B63C 0022857C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8096,7 +8096,7 @@ lbl_8022F914: /* 8022F980 0022C8C0 7F E0 07 35 */ extsh. r0, r31 /* 8022F984 0022C8C4 40 81 00 0C */ ble lbl_8022F990 /* 8022F988 0022C8C8 7F C3 F3 78 */ mr r3, r30 -/* 8022F98C 0022C8CC 48 09 F3 B1 */ bl __dl +/* 8022F98C 0022C8CC 48 09 F3 B1 */ bl __dl__FPv lbl_8022F990: /* 8022F990 0022C8D0 7F C3 F3 78 */ mr r3, r30 /* 8022F994 0022C8D4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -9281,7 +9281,7 @@ jmessage_string_tSequenceProcessor: /* 80230A90 0022D9D0 7F E0 07 35 */ extsh. r0, r31 /* 80230A94 0022D9D4 40 81 00 0C */ ble lbl_80230AA0 /* 80230A98 0022D9D8 7F C3 F3 78 */ mr r3, r30 -/* 80230A9C 0022D9DC 48 09 E2 A1 */ bl __dl +/* 80230A9C 0022D9DC 48 09 E2 A1 */ bl __dl__FPv lbl_80230AA0: /* 80230AA0 0022D9E0 7F C3 F3 78 */ mr r3, r30 /* 80230AA4 0022D9E4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11289,7 +11289,7 @@ jmessage_string_tRenderingProcessor_NS_push_word: /* 8023282C 0022F76C 7F E0 07 35 */ extsh. r0, r31 /* 80232830 0022F770 40 81 00 0C */ ble lbl_8023283C /* 80232834 0022F774 7F C3 F3 78 */ mr r3, r30 -/* 80232838 0022F778 48 09 C5 05 */ bl __dl +/* 80232838 0022F778 48 09 C5 05 */ bl __dl__FPv lbl_8023283C: /* 8023283C 0022F77C 7F C3 F3 78 */ mr r3, r30 /* 80232840 0022F780 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11324,7 +11324,7 @@ lbl_802328A4: /* 802328B0 0022F7F0 7F E0 07 35 */ extsh. r0, r31 /* 802328B4 0022F7F4 40 81 00 0C */ ble lbl_802328C0 /* 802328B8 0022F7F8 7F C3 F3 78 */ mr r3, r30 -/* 802328BC 0022F7FC 48 09 C4 81 */ bl __dl +/* 802328BC 0022F7FC 48 09 C4 81 */ bl __dl__FPv lbl_802328C0: /* 802328C0 0022F800 7F C3 F3 78 */ mr r3, r30 /* 802328C4 0022F804 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11349,7 +11349,7 @@ lbl_802328C0: /* 80232910 0022F850 7F E0 07 35 */ extsh. r0, r31 /* 80232914 0022F854 40 81 00 0C */ ble lbl_80232920 /* 80232918 0022F858 7F C3 F3 78 */ mr r3, r30 -/* 8023291C 0022F85C 48 09 C4 21 */ bl __dl +/* 8023291C 0022F85C 48 09 C4 21 */ bl __dl__FPv lbl_80232920: /* 80232920 0022F860 7F C3 F3 78 */ mr r3, r30 /* 80232924 0022F864 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11374,7 +11374,7 @@ lbl_80232920: /* 80232970 0022F8B0 7F E0 07 35 */ extsh. r0, r31 /* 80232974 0022F8B4 40 81 00 0C */ ble lbl_80232980 /* 80232978 0022F8B8 7F C3 F3 78 */ mr r3, r30 -/* 8023297C 0022F8BC 48 09 C3 C1 */ bl __dl +/* 8023297C 0022F8BC 48 09 C3 C1 */ bl __dl__FPv lbl_80232980: /* 80232980 0022F8C0 7F C3 F3 78 */ mr r3, r30 /* 80232984 0022F8C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11409,7 +11409,7 @@ lbl_802329E8: /* 802329F4 0022F934 7F E0 07 35 */ extsh. r0, r31 /* 802329F8 0022F938 40 81 00 0C */ ble lbl_80232A04 /* 802329FC 0022F93C 7F C3 F3 78 */ mr r3, r30 -/* 80232A00 0022F940 48 09 C3 3D */ bl __dl +/* 80232A00 0022F940 48 09 C3 3D */ bl __dl__FPv lbl_80232A04: /* 80232A04 0022F944 7F C3 F3 78 */ mr r3, r30 /* 80232A08 0022F948 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 7f37db1cb3..21162c0654 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -37,7 +37,7 @@ dMsgFlow_c_NS_dtor: /* 80249F68 00246EA8 90 1F 00 00 */ stw r0, 0(r31) /* 80249F6C 00246EAC 7C 80 07 35 */ extsh. r0, r4 /* 80249F70 00246EB0 40 81 00 08 */ ble lbl_80249F78 -/* 80249F74 00246EB4 48 08 4D C9 */ bl __dl +/* 80249F74 00246EB4 48 08 4D C9 */ bl __dl__FPv lbl_80249F78: /* 80249F78 00246EB8 7F E3 FB 78 */ mr r3, r31 /* 80249F7C 00246EBC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index a5380ef10c..ffbc7c08ce 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -625,7 +625,7 @@ lbl_8023332C: /* 8023338C 002302CC 90 1E 01 0C */ stw r0, 0x10c(r30) /* 80233390 002302D0 90 1E 01 04 */ stw r0, 0x104(r30) /* 80233394 002302D4 38 60 00 20 */ li r3, 0x20 -/* 80233398 002302D8 48 09 B8 B5 */ bl __nw +/* 80233398 002302D8 48 09 B8 B5 */ bl __nw__FUl /* 8023339C 002302DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802333A0 002302E0 41 82 00 0C */ beq lbl_802333AC /* 802333A4 002302E4 48 07 5C C9 */ bl JMessage_NS_TResourceContainer @@ -635,7 +635,7 @@ lbl_802333AC: /* 802333B0 002302F0 80 0D 88 9C */ lwz r0, lbl_80450E1C-_SDA_BASE_(r13) /* 802333B4 002302F4 90 1E 01 14 */ stw r0, 0x114(r30) /* 802333B8 002302F8 38 60 12 78 */ li r3, 0x1278 -/* 802333BC 002302FC 48 09 B8 91 */ bl __nw +/* 802333BC 002302FC 48 09 B8 91 */ bl __nw__FUl /* 802333C0 00230300 7C 60 1B 79 */ or. r0, r3, r3 /* 802333C4 00230304 41 82 00 0C */ beq lbl_802333D0 /* 802333C8 00230308 4B FF 57 3D */ bl jmessage_tReference @@ -646,7 +646,7 @@ lbl_802333D0: /* 802333D8 00230318 80 7E 01 18 */ lwz r3, 0x118(r30) /* 802333DC 0023031C 90 03 05 BC */ stw r0, 0x5bc(r3) /* 802333E0 00230320 38 60 00 B8 */ li r3, 0xb8 -/* 802333E4 00230324 48 09 B8 69 */ bl __nw +/* 802333E4 00230324 48 09 B8 69 */ bl __nw__FUl /* 802333E8 00230328 7C 60 1B 79 */ or. r0, r3, r3 /* 802333EC 0023032C 41 82 00 14 */ beq lbl_80233400 /* 802333F0 00230330 80 9E 01 18 */ lwz r4, 0x118(r30) @@ -656,7 +656,7 @@ lbl_802333D0: lbl_80233400: /* 80233400 00230340 90 1E 01 1C */ stw r0, 0x11c(r30) /* 80233404 00230344 38 60 01 88 */ li r3, 0x188 -/* 80233408 00230348 48 09 B8 45 */ bl __nw +/* 80233408 00230348 48 09 B8 45 */ bl __nw__FUl /* 8023340C 0023034C 7C 60 1B 79 */ or. r0, r3, r3 /* 80233410 00230350 41 82 00 10 */ beq lbl_80233420 /* 80233414 00230354 80 9E 01 18 */ lwz r4, 0x118(r30) @@ -676,7 +676,7 @@ lbl_80233420: /* 80233448 00230388 80 7E 01 18 */ lwz r3, 0x118(r30) /* 8023344C 0023038C 93 C3 05 C0 */ stw r30, 0x5c0(r3) /* 80233450 00230390 38 60 00 0C */ li r3, 0xc -/* 80233454 00230394 48 09 B7 F9 */ bl __nw +/* 80233454 00230394 48 09 B7 F9 */ bl __nw__FUl /* 80233458 00230398 7C 60 1B 79 */ or. r0, r3, r3 /* 8023345C 0023039C 41 82 00 10 */ beq lbl_8023346C /* 80233460 002303A0 80 9E 01 10 */ lwz r4, 0x110(r30) @@ -745,7 +745,7 @@ lbl_802334BC: /* 80233550 00230490 38 80 00 01 */ li r4, 1 /* 80233554 00230494 48 00 33 91 */ bl dMsgObject_c_NS_setStatusLocal /* 80233558 00230498 38 60 00 2C */ li r3, 0x2c -/* 8023355C 0023049C 48 09 B6 F1 */ bl __nw +/* 8023355C 0023049C 48 09 B6 F1 */ bl __nw__FUl /* 80233560 002304A0 7C 60 1B 79 */ or. r0, r3, r3 /* 80233564 002304A4 41 82 00 0C */ beq lbl_80233570 /* 80233568 002304A8 48 01 66 B9 */ bl dMsgString_c @@ -1202,7 +1202,7 @@ lbl_80233BC8: /* 80233BD8 00230B18 38 80 FF FF */ li r4, -1 /* 80233BDC 00230B1C 48 07 53 1D */ bl JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor /* 80233BE0 00230B20 7F C3 F3 78 */ mr r3, r30 -/* 80233BE4 00230B24 48 09 B1 59 */ bl __dl +/* 80233BE4 00230B24 48 09 B1 59 */ bl __dl__FPv lbl_80233BE8: /* 80233BE8 00230B28 38 00 00 00 */ li r0, 0 /* 80233BEC 00230B2C 90 1F 01 10 */ stw r0, 0x110(r31) @@ -3872,13 +3872,13 @@ lbl_802361F4: /* 80236208 00233148 90 7F 01 44 */ stw r3, 0x144(r31) lbl_8023620C: /* 8023620C 0023314C 80 7F 01 44 */ lwz r3, 0x144(r31) -/* 80236210 00233150 48 09 85 75 */ bl JKRHeap_NS_getTotalFreeSize +/* 80236210 00233150 48 09 85 75 */ bl getTotalFreeSize__7JKRHeapFv /* 80236214 00233154 3B C0 00 00 */ li r30, 0 /* 80236218 00233158 80 1F 01 0C */ lwz r0, 0x10c(r31) /* 8023621C 0023315C 28 00 00 00 */ cmplwi r0, 0 /* 80236220 00233160 40 82 00 44 */ bne lbl_80236264 /* 80236224 00233164 38 60 02 44 */ li r3, 0x244 -/* 80236228 00233168 48 09 8A 25 */ bl __nw +/* 80236228 00233168 48 09 8A 25 */ bl __nw__FUl /* 8023622C 0023316C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236230 00233170 41 82 00 10 */ beq lbl_80236240 /* 80236234 00233174 38 80 00 00 */ li r4, 0 @@ -3907,7 +3907,7 @@ lbl_80236264: /* 80236288 002331C8 80 7F 01 20 */ lwz r3, 0x120(r31) /* 8023628C 002331CC 83 83 00 04 */ lwz r28, 4(r3) /* 80236290 002331D0 38 60 01 A0 */ li r3, 0x1a0 -/* 80236294 002331D4 48 09 89 B9 */ bl __nw +/* 80236294 002331D4 48 09 89 B9 */ bl __nw__FUl /* 80236298 002331D8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023629C 002331DC 41 82 00 18 */ beq lbl_802362B4 /* 802362A0 002331E0 88 9C 12 45 */ lbz r4, 0x1245(r28) @@ -3924,7 +3924,7 @@ lbl_802362B4: /* 802362C8 00233208 7C 7D 1B 78 */ mr r29, r3 lbl_802362CC: /* 802362CC 0023320C 38 60 00 E4 */ li r3, 0xe4 -/* 802362D0 00233210 48 09 89 7D */ bl __nw +/* 802362D0 00233210 48 09 89 7D */ bl __nw__FUl /* 802362D4 00233214 7C 60 1B 79 */ or. r0, r3, r3 /* 802362D8 00233218 41 82 00 14 */ beq lbl_802362EC /* 802362DC 0023321C 7F A4 EB 78 */ mr r4, r29 @@ -3935,7 +3935,7 @@ lbl_802362EC: /* 802362EC 0023322C 90 1F 01 04 */ stw r0, 0x104(r31) /* 802362F0 00233230 48 00 01 8C */ b lbl_8023647C /* 802362F4 00233234 38 60 00 DC */ li r3, 0xdc -/* 802362F8 00233238 48 09 89 55 */ bl __nw +/* 802362F8 00233238 48 09 89 55 */ bl __nw__FUl /* 802362FC 0023323C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236300 00233240 41 82 00 10 */ beq lbl_80236310 /* 80236304 00233244 80 9F 01 44 */ lwz r4, 0x144(r31) @@ -3945,7 +3945,7 @@ lbl_80236310: /* 80236310 00233250 90 1F 01 04 */ stw r0, 0x104(r31) /* 80236314 00233254 48 00 01 68 */ b lbl_8023647C /* 80236318 00233258 38 60 00 D4 */ li r3, 0xd4 -/* 8023631C 0023325C 48 09 89 31 */ bl __nw +/* 8023631C 0023325C 48 09 89 31 */ bl __nw__FUl /* 80236320 00233260 7C 60 1B 79 */ or. r0, r3, r3 /* 80236324 00233264 41 82 00 18 */ beq lbl_8023633C /* 80236328 00233268 80 9F 01 20 */ lwz r4, 0x120(r31) @@ -3957,7 +3957,7 @@ lbl_8023633C: /* 8023633C 0023327C 90 1F 01 04 */ stw r0, 0x104(r31) /* 80236340 00233280 48 00 01 3C */ b lbl_8023647C /* 80236344 00233284 38 60 00 D4 */ li r3, 0xd4 -/* 80236348 00233288 48 09 89 05 */ bl __nw +/* 80236348 00233288 48 09 89 05 */ bl __nw__FUl /* 8023634C 0023328C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236350 00233290 41 82 00 0C */ beq lbl_8023635C /* 80236354 00233294 48 01 00 79 */ bl dMsgScrnPlace_c @@ -3966,7 +3966,7 @@ lbl_8023635C: /* 8023635C 0023329C 90 1F 01 04 */ stw r0, 0x104(r31) /* 80236360 002332A0 48 00 01 1C */ b lbl_8023647C /* 80236364 002332A4 38 60 00 CC */ li r3, 0xcc -/* 80236368 002332A8 48 09 88 E5 */ bl __nw +/* 80236368 002332A8 48 09 88 E5 */ bl __nw__FUl /* 8023636C 002332AC 7C 60 1B 79 */ or. r0, r3, r3 /* 80236370 002332B0 41 82 00 0C */ beq lbl_8023637C /* 80236374 002332B4 48 00 62 55 */ bl dMsgScrnBoss_c @@ -3975,7 +3975,7 @@ lbl_8023637C: /* 8023637C 002332BC 90 1F 01 04 */ stw r0, 0x104(r31) /* 80236380 002332C0 48 00 00 FC */ b lbl_8023647C /* 80236384 002332C4 38 60 27 AC */ li r3, 0x27ac -/* 80236388 002332C8 48 09 88 C5 */ bl __nw +/* 80236388 002332C8 48 09 88 C5 */ bl __nw__FUl /* 8023638C 002332CC 7C 60 1B 79 */ or. r0, r3, r3 /* 80236390 002332D0 41 82 00 0C */ beq lbl_8023639C /* 80236394 002332D4 48 00 A5 D9 */ bl dMsgScrnHowl_c @@ -3987,7 +3987,7 @@ lbl_8023639C: /* 802363A8 002332E8 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802363AC 002332EC 83 83 00 04 */ lwz r28, 4(r3) /* 802363B0 002332F0 38 60 00 D0 */ li r3, 0xd0 -/* 802363B4 002332F4 48 09 88 99 */ bl __nw +/* 802363B4 002332F4 48 09 88 99 */ bl __nw__FUl /* 802363B8 002332F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802363BC 002332FC 41 82 00 14 */ beq lbl_802363D0 /* 802363C0 00233300 88 9C 12 47 */ lbz r4, 0x1247(r28) @@ -4007,7 +4007,7 @@ lbl_802363E0: /* 802363F0 00233330 28 00 02 A5 */ cmplwi r0, 0x2a5 /* 802363F4 00233334 40 82 00 30 */ bne lbl_80236424 /* 802363F8 00233338 38 60 01 A0 */ li r3, 0x1a0 -/* 802363FC 0023333C 48 09 88 51 */ bl __nw +/* 802363FC 0023333C 48 09 88 51 */ bl __nw__FUl /* 80236400 00233340 7C 60 1B 79 */ or. r0, r3, r3 /* 80236404 00233344 41 82 00 18 */ beq lbl_8023641C /* 80236408 00233348 38 80 00 00 */ li r4, 0 @@ -4020,7 +4020,7 @@ lbl_8023641C: /* 80236420 00233360 48 00 00 30 */ b lbl_80236450 lbl_80236424: /* 80236424 00233364 38 60 04 8C */ li r3, 0x48c -/* 80236428 00233368 48 09 88 25 */ bl __nw +/* 80236428 00233368 48 09 88 25 */ bl __nw__FUl /* 8023642C 0023336C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236430 00233370 41 82 00 18 */ beq lbl_80236448 /* 80236434 00233374 88 9C 12 45 */ lbz r4, 0x1245(r28) @@ -6104,7 +6104,7 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap /* 80237FAC 00234EEC 7C 7D 1B 78 */ mr r29, r3 /* 80237FB0 00234EF0 80 7F 5E C8 */ lwz r3, 0x5ec8(r31) -/* 80237FB4 00234EF4 48 09 67 D1 */ bl JKRHeap_NS_getTotalFreeSize +/* 80237FB4 00234EF4 48 09 67 D1 */ bl getTotalFreeSize__7JKRHeapFv /* 80237FB8 00234EF8 7F C3 F3 78 */ mr r3, r30 /* 80237FBC 00234EFC 4B DE 79 F9 */ bl fopMsgM_setStageLayer /* 80237FC0 00234F00 38 00 00 00 */ li r0, 0 @@ -7023,7 +7023,7 @@ lbl_80238B08: /* 80238BB4 00235AF4 90 1F 00 00 */ stw r0, 0(r31) /* 80238BB8 00235AF8 7C 80 07 35 */ extsh. r0, r4 /* 80238BBC 00235AFC 40 81 00 08 */ ble lbl_80238BC4 -/* 80238BC0 00235B00 48 09 61 7D */ bl __dl +/* 80238BC0 00235B00 48 09 61 7D */ bl __dl__FPv lbl_80238BC4: /* 80238BC4 00235B04 7F E3 FB 78 */ mr r3, r31 /* 80238BC8 00235B08 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -7051,7 +7051,7 @@ lbl_80238C14: /* 80238C14 00235B54 7C 80 07 35 */ extsh. r0, r4 /* 80238C18 00235B58 40 81 00 0C */ ble lbl_80238C24 /* 80238C1C 00235B5C 7F E3 FB 78 */ mr r3, r31 -/* 80238C20 00235B60 48 09 61 1D */ bl __dl +/* 80238C20 00235B60 48 09 61 1D */ bl __dl__FPv lbl_80238C24: /* 80238C24 00235B64 7F E3 FB 78 */ mr r3, r31 /* 80238C28 00235B68 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/d_msg_string.s b/asm/d/msg/d_msg_string.s index c375ecb3c6..dacd3b3043 100644 --- a/asm/d/msg/d_msg_string.s +++ b/asm/d/msg/d_msg_string.s @@ -17,7 +17,7 @@ dMsgString_c: /* 80249C44 00246B84 38 00 00 00 */ li r0, 0 /* 80249C48 00246B88 98 1F 00 28 */ stb r0, 0x28(r31) /* 80249C4C 00246B8C 38 60 02 44 */ li r3, 0x244 -/* 80249C50 00246B90 48 08 4F FD */ bl __nw +/* 80249C50 00246B90 48 08 4F FD */ bl __nw__FUl /* 80249C54 00246B94 7C 60 1B 79 */ or. r0, r3, r3 /* 80249C58 00246B98 41 82 00 10 */ beq lbl_80249C68 /* 80249C5C 00246B9C 88 9F 00 28 */ lbz r4, 0x28(r31) @@ -54,7 +54,7 @@ dMsgString_c_X1_: /* 80249CC8 00246C08 90 1E 00 00 */ stw r0, 0(r30) /* 80249CCC 00246C0C 9B FE 00 28 */ stb r31, 0x28(r30) /* 80249CD0 00246C10 38 60 02 44 */ li r3, 0x244 -/* 80249CD4 00246C14 48 08 4F 79 */ bl __nw +/* 80249CD4 00246C14 48 08 4F 79 */ bl __nw__FUl /* 80249CD8 00246C18 7C 60 1B 79 */ or. r0, r3, r3 /* 80249CDC 00246C1C 41 82 00 10 */ beq lbl_80249CEC /* 80249CE0 00246C20 88 9E 00 28 */ lbz r4, 0x28(r30) @@ -107,7 +107,7 @@ lbl_80249D74: /* 80249D88 00246CC8 7F E0 07 35 */ extsh. r0, r31 /* 80249D8C 00246CCC 40 81 00 0C */ ble lbl_80249D98 /* 80249D90 00246CD0 7F C3 F3 78 */ mr r3, r30 -/* 80249D94 00246CD4 48 08 4F A9 */ bl __dl +/* 80249D94 00246CD4 48 08 4F A9 */ bl __dl__FPv lbl_80249D98: /* 80249D98 00246CD8 7F C3 F3 78 */ mr r3, r30 /* 80249D9C 00246CDC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/d_msg_unit.s b/asm/d/msg/d_msg_unit.s index 2280fcb3c3..c982add77f 100644 --- a/asm/d/msg/d_msg_unit.s +++ b/asm/d/msg/d_msg_unit.s @@ -22,7 +22,7 @@ dMsgUnit_c_NS_dtor: /* 80238CC4 00235C04 90 1F 00 00 */ stw r0, 0(r31) /* 80238CC8 00235C08 7C 80 07 35 */ extsh. r0, r4 /* 80238CCC 00235C0C 40 81 00 08 */ ble lbl_80238CD4 -/* 80238CD0 00235C10 48 09 60 6D */ bl __dl +/* 80238CD0 00235C10 48 09 60 6D */ bl __dl__FPv lbl_80238CD4: /* 80238CD4 00235C14 7F E3 FB 78 */ mr r3, r31 /* 80238CD8 00235C18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index 69b7e20390..cf172722b0 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -31,7 +31,7 @@ COutFontSet_c: /* 80225C14 00222B54 90 1F 00 00 */ stw r0, 0(r31) /* 80225C18 00222B58 7C 80 07 35 */ extsh. r0, r4 /* 80225C1C 00222B5C 40 81 00 08 */ ble lbl_80225C24 -/* 80225C20 00222B60 48 0A 91 1D */ bl __dl +/* 80225C20 00222B60 48 0A 91 1D */ bl __dl__FPv lbl_80225C24: /* 80225C24 00222B64 7F E3 FB 78 */ mr r3, r31 /* 80225C28 00222B68 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -84,7 +84,7 @@ COutFont_c: /* 80225CC0 00222C00 3B E0 00 00 */ li r31, 0 lbl_80225CC4: /* 80225CC4 00222C04 38 60 00 20 */ li r3, 0x20 -/* 80225CC8 00222C08 48 0A 8F 85 */ bl __nw +/* 80225CC8 00222C08 48 0A 8F 85 */ bl __nw__FUl /* 80225CCC 00222C0C 7C 64 1B 79 */ or. r4, r3, r3 /* 80225CD0 00222C10 41 82 00 0C */ beq lbl_80225CDC /* 80225CD4 00222C14 4B FF FE E5 */ bl COutFontSet_c @@ -194,7 +194,7 @@ lbl_80225E50: /* 80225E50 00222D90 7F 40 07 35 */ extsh. r0, r26 /* 80225E54 00222D94 40 81 00 0C */ ble lbl_80225E60 /* 80225E58 00222D98 7F E3 FB 78 */ mr r3, r31 -/* 80225E5C 00222D9C 48 0A 8E E1 */ bl __dl +/* 80225E5C 00222D9C 48 0A 8E E1 */ bl __dl__FPv lbl_80225E60: /* 80225E60 00222DA0 7F E3 FB 78 */ mr r3, r31 /* 80225E64 00222DA4 39 61 00 20 */ addi r11, r1, 0x20 @@ -258,7 +258,7 @@ lbl_80225F10: /* 80225F40 00222E80 7C 7A 1B 78 */ mr r26, r3 lbl_80225F44: /* 80225F44 00222E84 38 60 01 50 */ li r3, 0x150 -/* 80225F48 00222E88 48 0A 8D 05 */ bl __nw +/* 80225F48 00222E88 48 0A 8D 05 */ bl __nw__FUl /* 80225F4C 00222E8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80225F50 00222E90 41 82 00 10 */ beq lbl_80225F60 /* 80225F54 00222E94 7F 44 D3 78 */ mr r4, r26 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index ce8a2faba5..64e688f289 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -20,7 +20,7 @@ dMsgScrn3Select_c: /* 802390E4 00236024 90 03 00 C4 */ stw r0, 0xc4(r3) /* 802390E8 00236028 90 03 00 C8 */ stw r0, 0xc8(r3) /* 802390EC 0023602C 38 60 01 18 */ li r3, 0x118 -/* 802390F0 00236030 48 09 5B 5D */ bl __nw +/* 802390F0 00236030 48 09 5B 5D */ bl __nw__FUl /* 802390F4 00236034 7C 60 1B 79 */ or. r0, r3, r3 /* 802390F8 00236038 41 82 00 0C */ beq lbl_80239104 /* 802390FC 0023603C 48 0B F3 9D */ bl J2DScreen @@ -92,7 +92,7 @@ lbl_80239104: /* 80239200 00236140 C0 02 B1 58 */ lfs f0, lbl_80454B58-_SDA2_BASE_(r2) /* 80239204 00236144 D0 1F 00 F8 */ stfs f0, 0xf8(r31) /* 80239208 00236148 38 60 00 B8 */ li r3, 0xb8 -/* 8023920C 0023614C 48 09 5A 41 */ bl __nw +/* 8023920C 0023614C 48 09 5A 41 */ bl __nw__FUl /* 80239210 00236150 7C 60 1B 79 */ or. r0, r3, r3 /* 80239214 00236154 41 82 00 18 */ beq lbl_8023922C /* 80239218 00236158 38 80 00 00 */ li r4, 0 @@ -106,7 +106,7 @@ lbl_8023922C: /* 80239234 00236174 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 80239238 00236178 4B F5 C0 69 */ bl dSelect_cursor_c_NS_setAlphaRate /* 8023923C 0023617C 38 60 00 6C */ li r3, 0x6c -/* 80239240 00236180 48 09 5A 0D */ bl __nw +/* 80239240 00236180 48 09 5A 0D */ bl __nw__FUl /* 80239244 00236184 7C 60 1B 79 */ or. r0, r3, r3 /* 80239248 00236188 41 82 00 24 */ beq lbl_8023926C /* 8023924C 0023618C 80 9F 00 04 */ lwz r4, 4(r31) @@ -132,7 +132,7 @@ lbl_8023928C: /* 80239294 002361D4 D3 FC 00 D0 */ stfs f31, 0xd0(r28) /* 80239298 002361D8 D3 FC 00 D4 */ stfs f31, 0xd4(r28) /* 8023929C 002361DC 38 60 00 6C */ li r3, 0x6c -/* 802392A0 002361E0 48 09 59 AD */ bl __nw +/* 802392A0 002361E0 48 09 59 AD */ bl __nw__FUl /* 802392A4 002361E4 7C 60 1B 79 */ or. r0, r3, r3 /* 802392A8 002361E8 41 82 00 2C */ beq lbl_802392D4 /* 802392AC 002361EC 80 9F 00 04 */ lwz r4, 4(r31) @@ -151,7 +151,7 @@ lbl_802392D4: /* 802392DC 0023621C 80 7E 00 34 */ lwz r3, 0x34(r30) /* 802392E0 00236220 48 01 C3 29 */ bl CPaneMgrAlpha_NS_hide /* 802392E4 00236224 38 60 00 6C */ li r3, 0x6c -/* 802392E8 00236228 48 09 59 65 */ bl __nw +/* 802392E8 00236228 48 09 59 65 */ bl __nw__FUl /* 802392EC 0023622C 7C 60 1B 79 */ or. r0, r3, r3 /* 802392F0 00236230 41 82 00 2C */ beq lbl_8023931C /* 802392F4 00236234 80 9F 00 04 */ lwz r4, 4(r31) @@ -174,7 +174,7 @@ lbl_8023931C: /* 80239334 00236274 7D 89 03 A6 */ mtctr r12 /* 80239338 00236278 4E 80 04 21 */ bctrl /* 8023933C 0023627C 38 60 00 6C */ li r3, 0x6c -/* 80239340 00236280 48 09 59 0D */ bl __nw +/* 80239340 00236280 48 09 59 0D */ bl __nw__FUl /* 80239344 00236284 7C 60 1B 79 */ or. r0, r3, r3 /* 80239348 00236288 41 82 00 2C */ beq lbl_80239374 /* 8023934C 0023628C 80 9F 00 04 */ lwz r4, 4(r31) @@ -197,7 +197,7 @@ lbl_80239374: /* 8023938C 002362CC 7D 89 03 A6 */ mtctr r12 /* 80239390 002362D0 4E 80 04 21 */ bctrl /* 80239394 002362D4 38 60 00 6C */ li r3, 0x6c -/* 80239398 002362D8 48 09 58 B5 */ bl __nw +/* 80239398 002362D8 48 09 58 B5 */ bl __nw__FUl /* 8023939C 002362DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802393A0 002362E0 41 82 00 2C */ beq lbl_802393CC /* 802393A4 002362E4 80 9F 00 04 */ lwz r4, 4(r31) @@ -225,7 +225,7 @@ lbl_802393CC: /* 802393F8 00236338 7E F8 EA 14 */ add r23, r24, r29 lbl_802393FC: /* 802393FC 0023633C 38 60 00 6C */ li r3, 0x6c -/* 80239400 00236340 48 09 58 4D */ bl __nw +/* 80239400 00236340 48 09 58 4D */ bl __nw__FUl /* 80239404 00236344 7C 64 1B 79 */ or. r4, r3, r3 /* 80239408 00236348 41 82 00 28 */ beq lbl_80239430 /* 8023940C 0023634C 80 9F 00 04 */ lwz r4, 4(r31) @@ -246,7 +246,7 @@ lbl_80239430: /* 80239444 00236384 3A 94 00 08 */ addi r20, r20, 8 /* 80239448 00236388 41 80 FF B4 */ blt lbl_802393FC /* 8023944C 0023638C 38 60 00 6C */ li r3, 0x6c -/* 80239450 00236390 48 09 57 FD */ bl __nw +/* 80239450 00236390 48 09 57 FD */ bl __nw__FUl /* 80239454 00236394 7C 60 1B 79 */ or. r0, r3, r3 /* 80239458 00236398 41 82 00 20 */ beq lbl_80239478 /* 8023945C 0023639C 80 9F 00 04 */ lwz r4, 4(r31) @@ -261,7 +261,7 @@ lbl_80239478: /* 8023947C 002363BC 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 80239480 002363C0 48 01 C1 89 */ bl CPaneMgrAlpha_NS_hide /* 80239484 002363C4 38 60 00 6C */ li r3, 0x6c -/* 80239488 002363C8 48 09 57 C5 */ bl __nw +/* 80239488 002363C8 48 09 57 C5 */ bl __nw__FUl /* 8023948C 002363CC 7C 60 1B 79 */ or. r0, r3, r3 /* 80239490 002363D0 41 82 00 20 */ beq lbl_802394B0 /* 80239494 002363D4 80 9F 00 04 */ lwz r4, 4(r31) @@ -274,7 +274,7 @@ lbl_80239478: lbl_802394B0: /* 802394B0 002363F0 90 1E 00 AC */ stw r0, 0xac(r30) /* 802394B4 002363F4 38 60 00 6C */ li r3, 0x6c -/* 802394B8 002363F8 48 09 57 95 */ bl __nw +/* 802394B8 002363F8 48 09 57 95 */ bl __nw__FUl /* 802394BC 002363FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802394C0 00236400 41 82 00 20 */ beq lbl_802394E0 /* 802394C4 00236404 80 9F 00 04 */ lwz r4, 4(r31) @@ -305,7 +305,7 @@ lbl_802394E0: /* 80239524 00236464 3B 5A 00 0C */ addi r26, r26, 0xc /* 80239528 00236468 41 80 FD 64 */ blt lbl_8023928C /* 8023952C 0023646C 38 60 00 6C */ li r3, 0x6c -/* 80239530 00236470 48 09 57 1D */ bl __nw +/* 80239530 00236470 48 09 57 1D */ bl __nw__FUl /* 80239534 00236474 7C 60 1B 79 */ or. r0, r3, r3 /* 80239538 00236478 41 82 00 24 */ beq lbl_8023955C /* 8023953C 0023647C 80 9F 00 04 */ lwz r4, 4(r31) @@ -319,7 +319,7 @@ lbl_802394E0: lbl_8023955C: /* 8023955C 0023649C 90 1F 00 1C */ stw r0, 0x1c(r31) /* 80239560 002364A0 38 60 00 6C */ li r3, 0x6c -/* 80239564 002364A4 48 09 56 E9 */ bl __nw +/* 80239564 002364A4 48 09 56 E9 */ bl __nw__FUl /* 80239568 002364A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023956C 002364AC 41 82 00 24 */ beq lbl_80239590 /* 80239570 002364B0 80 9F 00 04 */ lwz r4, 4(r31) @@ -333,7 +333,7 @@ lbl_8023955C: lbl_80239590: /* 80239590 002364D0 90 1F 00 20 */ stw r0, 0x20(r31) /* 80239594 002364D4 38 60 00 6C */ li r3, 0x6c -/* 80239598 002364D8 48 09 56 B5 */ bl __nw +/* 80239598 002364D8 48 09 56 B5 */ bl __nw__FUl /* 8023959C 002364DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802395A0 002364E0 41 82 00 24 */ beq lbl_802395C4 /* 802395A4 002364E4 80 9F 00 04 */ lwz r4, 4(r31) @@ -748,7 +748,7 @@ lbl_80239B9C: /* 80239BB4 00236AF4 7F E0 07 35 */ extsh. r0, r31 /* 80239BB8 00236AF8 40 81 00 0C */ ble lbl_80239BC4 /* 80239BBC 00236AFC 7F C3 F3 78 */ mr r3, r30 -/* 80239BC0 00236B00 48 09 51 7D */ bl __dl +/* 80239BC0 00236B00 48 09 51 7D */ bl __dl__FPv lbl_80239BC4: /* 80239BC4 00236B04 7F C3 F3 78 */ mr r3, r30 /* 80239BC8 00236B08 39 61 00 30 */ addi r11, r1, 0x30 @@ -785,7 +785,7 @@ lbl_80239C3C: /* 80239C3C 00236B7C 7C 80 07 35 */ extsh. r0, r4 /* 80239C40 00236B80 40 81 00 0C */ ble lbl_80239C4C /* 80239C44 00236B84 7F E3 FB 78 */ mr r3, r31 -/* 80239C48 00236B88 48 09 50 F5 */ bl __dl +/* 80239C48 00236B88 48 09 50 F5 */ bl __dl__FPv lbl_80239C4C: /* 80239C4C 00236B8C 7F E3 FB 78 */ mr r3, r31 /* 80239C50 00236B90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_arrow.s b/asm/d/msg/scrn/d_msg_scrn_arrow.s index f16bddba97..3957b3e523 100644 --- a/asm/d/msg/scrn/d_msg_scrn_arrow.s +++ b/asm/d/msg/scrn/d_msg_scrn_arrow.s @@ -15,7 +15,7 @@ dMsgScrnArrow_c: /* 8023B9D0 00238910 38 04 0C F8 */ addi r0, r4, lbl_803C0CF8@l /* 8023B9D4 00238914 90 03 00 00 */ stw r0, 0(r3) /* 8023B9D8 00238918 38 60 01 18 */ li r3, 0x118 -/* 8023B9DC 0023891C 48 09 32 71 */ bl __nw +/* 8023B9DC 0023891C 48 09 32 71 */ bl __nw__FUl /* 8023B9E0 00238920 7C 60 1B 79 */ or. r0, r3, r3 /* 8023B9E4 00238924 41 82 00 0C */ beq lbl_8023B9F0 /* 8023B9E8 00238928 48 0B CA B1 */ bl J2DScreen @@ -69,7 +69,7 @@ lbl_8023B9F0: /* 8023BAA4 002389E4 C0 02 B1 98 */ lfs f0, lbl_80454B98-_SDA2_BASE_(r2) /* 8023BAA8 002389E8 D0 1F 00 20 */ stfs f0, 0x20(r31) /* 8023BAAC 002389EC 38 60 00 6C */ li r3, 0x6c -/* 8023BAB0 002389F0 48 09 31 9D */ bl __nw +/* 8023BAB0 002389F0 48 09 31 9D */ bl __nw__FUl /* 8023BAB4 002389F4 7C 60 1B 79 */ or. r0, r3, r3 /* 8023BAB8 002389F8 41 82 00 28 */ beq lbl_8023BAE0 /* 8023BABC 002389FC 80 9F 00 04 */ lwz r4, 4(r31) @@ -84,7 +84,7 @@ lbl_8023B9F0: lbl_8023BAE0: /* 8023BAE0 00238A20 90 1F 00 10 */ stw r0, 0x10(r31) /* 8023BAE4 00238A24 38 60 00 6C */ li r3, 0x6c -/* 8023BAE8 00238A28 48 09 31 65 */ bl __nw +/* 8023BAE8 00238A28 48 09 31 65 */ bl __nw__FUl /* 8023BAEC 00238A2C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023BAF0 00238A30 41 82 00 28 */ beq lbl_8023BB18 /* 8023BAF4 00238A34 80 9F 00 04 */ lwz r4, 4(r31) @@ -136,7 +136,7 @@ lbl_8023BB18: /* 8023BBA8 00238AE8 7D 89 03 A6 */ mtctr r12 /* 8023BBAC 00238AEC 4E 80 04 21 */ bctrl /* 8023BBB0 00238AF0 38 60 00 6C */ li r3, 0x6c -/* 8023BBB4 00238AF4 48 09 30 99 */ bl __nw +/* 8023BBB4 00238AF4 48 09 30 99 */ bl __nw__FUl /* 8023BBB8 00238AF8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023BBBC 00238AFC 41 82 00 24 */ beq lbl_8023BBE0 /* 8023BBC0 00238B00 80 9F 00 04 */ lwz r4, 4(r31) @@ -266,7 +266,7 @@ lbl_8023BD8C: /* 8023BD94 00238CD4 7F E0 07 35 */ extsh. r0, r31 /* 8023BD98 00238CD8 40 81 00 0C */ ble lbl_8023BDA4 /* 8023BD9C 00238CDC 7F C3 F3 78 */ mr r3, r30 -/* 8023BDA0 00238CE0 48 09 2F 9D */ bl __dl +/* 8023BDA0 00238CE0 48 09 2F 9D */ bl __dl__FPv lbl_8023BDA4: /* 8023BDA4 00238CE4 7F C3 F3 78 */ mr r3, r30 /* 8023BDA8 00238CE8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_base.s b/asm/d/msg/scrn/d_msg_scrn_base.s index 759ce951f2..fdeea4a102 100644 --- a/asm/d/msg/scrn/d_msg_scrn_base.s +++ b/asm/d/msg/scrn/d_msg_scrn_base.s @@ -37,7 +37,7 @@ dMsgScrnBase_c_NS_dtor: /* 8023C144 00239084 90 1F 00 00 */ stw r0, 0(r31) /* 8023C148 00239088 7C 80 07 35 */ extsh. r0, r4 /* 8023C14C 0023908C 40 81 00 08 */ ble lbl_8023C154 -/* 8023C150 00239090 48 09 2B ED */ bl __dl +/* 8023C150 00239090 48 09 2B ED */ bl __dl__FPv lbl_8023C154: /* 8023C154 00239094 7F E3 FB 78 */ mr r3, r31 /* 8023C158 00239098 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index b7a4e5532f..60c7aedf68 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -20,7 +20,7 @@ dMsgScrnBoss_c: /* 8023C5F8 00239538 7F C3 F3 78 */ mr r3, r30 /* 8023C5FC 0023953C 4B FF FB 71 */ bl dMsgScrnBase_c_NS_init /* 8023C600 00239540 38 60 01 18 */ li r3, 0x118 -/* 8023C604 00239544 48 09 26 49 */ bl __nw +/* 8023C604 00239544 48 09 26 49 */ bl __nw__FUl /* 8023C608 00239548 7C 60 1B 79 */ or. r0, r3, r3 /* 8023C60C 0023954C 41 82 00 0C */ beq lbl_8023C618 /* 8023C610 00239550 48 0B BE 89 */ bl J2DScreen @@ -38,7 +38,7 @@ lbl_8023C618: /* 8023C63C 0023957C 80 7E 00 04 */ lwz r3, 4(r30) /* 8023C640 00239580 48 01 8A A9 */ bl dPaneClass_showNullPane /* 8023C644 00239584 38 60 00 6C */ li r3, 0x6c -/* 8023C648 00239588 48 09 26 05 */ bl __nw +/* 8023C648 00239588 48 09 26 05 */ bl __nw__FUl /* 8023C64C 0023958C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023C650 00239590 41 82 00 24 */ beq lbl_8023C674 /* 8023C654 00239594 80 9E 00 04 */ lwz r4, 4(r30) @@ -64,7 +64,7 @@ lbl_8023C674: /* 8023C6A0 002395E0 7D 89 03 A6 */ mtctr r12 /* 8023C6A4 002395E4 4E 80 04 21 */ bctrl /* 8023C6A8 002395E8 38 60 00 6C */ li r3, 0x6c -/* 8023C6AC 002395EC 48 09 25 A1 */ bl __nw +/* 8023C6AC 002395EC 48 09 25 A1 */ bl __nw__FUl /* 8023C6B0 002395F0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023C6B4 002395F4 41 82 00 28 */ beq lbl_8023C6DC /* 8023C6B8 002395F8 80 9E 00 04 */ lwz r4, 4(r30) @@ -97,7 +97,7 @@ lbl_8023C6DC: /* 8023C720 00239660 C0 44 01 98 */ lfs f2, 0x198(r4) /* 8023C724 00239664 48 01 7E 8D */ bl CPaneMgr_NS_paneTrans /* 8023C728 00239668 38 60 00 6C */ li r3, 0x6c -/* 8023C72C 0023966C 48 09 25 21 */ bl __nw +/* 8023C72C 0023966C 48 09 25 21 */ bl __nw__FUl /* 8023C730 00239670 7C 60 1B 79 */ or. r0, r3, r3 /* 8023C734 00239674 41 82 00 24 */ beq lbl_8023C758 /* 8023C738 00239678 80 9E 00 04 */ lwz r4, 4(r30) @@ -136,7 +136,7 @@ lbl_8023C758: /* 8023C7B8 002396F8 3B 63 98 F8 */ addi r27, r3, lbl_803998F8@l lbl_8023C7BC: /* 8023C7BC 002396FC 38 60 00 6C */ li r3, 0x6c -/* 8023C7C0 00239700 48 09 24 8D */ bl __nw +/* 8023C7C0 00239700 48 09 24 8D */ bl __nw__FUl /* 8023C7C4 00239704 7C 64 1B 79 */ or. r4, r3, r3 /* 8023C7C8 00239708 41 82 00 2C */ beq lbl_8023C7F4 /* 8023C7CC 0023970C 80 9E 00 04 */ lwz r4, 4(r30) @@ -314,7 +314,7 @@ lbl_8023CA20: /* 8023CA5C 0023999C 7F 40 07 35 */ extsh. r0, r26 /* 8023CA60 002399A0 40 81 00 0C */ ble lbl_8023CA6C /* 8023CA64 002399A4 7F E3 FB 78 */ mr r3, r31 -/* 8023CA68 002399A8 48 09 22 D5 */ bl __dl +/* 8023CA68 002399A8 48 09 22 D5 */ bl __dl__FPv lbl_8023CA6C: /* 8023CA6C 002399AC 7F E3 FB 78 */ mr r3, r31 /* 8023CA70 002399B0 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 3712f6230d..8a800433dc 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -39,7 +39,7 @@ dMsgScrnExplain_c: /* 8023CD04 00239C44 B0 7F 00 5E */ sth r3, 0x5e(r31) /* 8023CD08 00239C48 98 FF 00 67 */ stb r7, 0x67(r31) /* 8023CD0C 00239C4C 38 60 00 2C */ li r3, 0x2c -/* 8023CD10 00239C50 48 09 1F 3D */ bl __nw +/* 8023CD10 00239C50 48 09 1F 3D */ bl __nw__FUl /* 8023CD14 00239C54 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD18 00239C58 41 82 00 0C */ beq lbl_8023CD24 /* 8023CD1C 00239C5C 48 00 CF 05 */ bl dMsgString_c @@ -47,7 +47,7 @@ dMsgScrnExplain_c: lbl_8023CD24: /* 8023CD24 00239C64 90 1F 00 04 */ stw r0, 4(r31) /* 8023CD28 00239C68 38 60 02 44 */ li r3, 0x244 -/* 8023CD2C 00239C6C 48 09 1F 21 */ bl __nw +/* 8023CD2C 00239C6C 48 09 1F 21 */ bl __nw__FUl /* 8023CD30 00239C70 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD34 00239C74 41 82 00 10 */ beq lbl_8023CD44 /* 8023CD38 00239C78 38 80 00 00 */ li r4, 0 @@ -61,7 +61,7 @@ lbl_8023CD44: /* 8023CD54 00239C94 7D 89 03 A6 */ mtctr r12 /* 8023CD58 00239C98 4E 80 04 21 */ bctrl /* 8023CD5C 00239C9C 38 60 01 18 */ li r3, 0x118 -/* 8023CD60 00239CA0 48 09 1E ED */ bl __nw +/* 8023CD60 00239CA0 48 09 1E ED */ bl __nw__FUl /* 8023CD64 00239CA4 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD68 00239CA8 41 82 00 0C */ beq lbl_8023CD74 /* 8023CD6C 00239CAC 48 0B B7 2D */ bl J2DScreen @@ -79,7 +79,7 @@ lbl_8023CD74: /* 8023CD98 00239CD8 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8023CD9C 00239CDC 48 01 83 4D */ bl dPaneClass_showNullPane /* 8023CDA0 00239CE0 38 60 01 18 */ li r3, 0x118 -/* 8023CDA4 00239CE4 48 09 1E A9 */ bl __nw +/* 8023CDA4 00239CE4 48 09 1E A9 */ bl __nw__FUl /* 8023CDA8 00239CE8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CDAC 00239CEC 41 82 00 0C */ beq lbl_8023CDB8 /* 8023CDB0 00239CF0 48 0B B6 E9 */ bl J2DScreen @@ -106,7 +106,7 @@ lbl_8023CDD8: /* 8023CDFC 00239D3C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8023CE00 00239D40 48 01 82 E9 */ bl dPaneClass_showNullPane /* 8023CE04 00239D44 38 60 00 6C */ li r3, 0x6c -/* 8023CE08 00239D48 48 09 1E 45 */ bl __nw +/* 8023CE08 00239D48 48 09 1E 45 */ bl __nw__FUl /* 8023CE0C 00239D4C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CE10 00239D50 41 82 00 28 */ beq lbl_8023CE38 /* 8023CE14 00239D54 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -121,7 +121,7 @@ lbl_8023CDD8: lbl_8023CE38: /* 8023CE38 00239D78 90 1F 00 08 */ stw r0, 8(r31) /* 8023CE3C 00239D7C 38 60 00 6C */ li r3, 0x6c -/* 8023CE40 00239D80 48 09 1E 0D */ bl __nw +/* 8023CE40 00239D80 48 09 1E 0D */ bl __nw__FUl /* 8023CE44 00239D84 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CE48 00239D88 41 82 00 24 */ beq lbl_8023CE6C /* 8023CE4C 00239D8C 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -208,7 +208,7 @@ lbl_8023CF14: /* 8023CF88 00239EC8 C0 02 B1 BC */ lfs f0, lbl_80454BBC-_SDA2_BASE_(r2) /* 8023CF8C 00239ECC D0 1F 00 50 */ stfs f0, 0x50(r31) /* 8023CF90 00239ED0 38 60 00 6C */ li r3, 0x6c -/* 8023CF94 00239ED4 48 09 1C B9 */ bl __nw +/* 8023CF94 00239ED4 48 09 1C B9 */ bl __nw__FUl /* 8023CF98 00239ED8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CF9C 00239EDC 41 82 00 28 */ beq lbl_8023CFC4 /* 8023CFA0 00239EE0 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -223,7 +223,7 @@ lbl_8023CF14: lbl_8023CFC4: /* 8023CFC4 00239F04 90 1F 00 08 */ stw r0, 8(r31) /* 8023CFC8 00239F08 38 60 00 6C */ li r3, 0x6c -/* 8023CFCC 00239F0C 48 09 1C 81 */ bl __nw +/* 8023CFCC 00239F0C 48 09 1C 81 */ bl __nw__FUl /* 8023CFD0 00239F10 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CFD4 00239F14 41 82 00 24 */ beq lbl_8023CFF8 /* 8023CFD8 00239F18 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -385,7 +385,7 @@ lbl_8023D174: /* 8023D230 0023A170 7D 89 03 A6 */ mtctr r12 /* 8023D234 0023A174 4E 80 04 21 */ bctrl /* 8023D238 0023A178 38 60 00 6C */ li r3, 0x6c -/* 8023D23C 0023A17C 48 09 1A 11 */ bl __nw +/* 8023D23C 0023A17C 48 09 1A 11 */ bl __nw__FUl /* 8023D240 0023A180 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D244 0023A184 41 82 00 28 */ beq lbl_8023D26C /* 8023D248 0023A188 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -400,7 +400,7 @@ lbl_8023D174: lbl_8023D26C: /* 8023D26C 0023A1AC 90 1F 00 28 */ stw r0, 0x28(r31) /* 8023D270 0023A1B0 38 60 00 6C */ li r3, 0x6c -/* 8023D274 0023A1B4 48 09 19 D9 */ bl __nw +/* 8023D274 0023A1B4 48 09 19 D9 */ bl __nw__FUl /* 8023D278 0023A1B8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D27C 0023A1BC 41 82 00 28 */ beq lbl_8023D2A4 /* 8023D280 0023A1C0 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -415,7 +415,7 @@ lbl_8023D26C: lbl_8023D2A4: /* 8023D2A4 0023A1E4 90 1F 00 18 */ stw r0, 0x18(r31) /* 8023D2A8 0023A1E8 38 60 00 6C */ li r3, 0x6c -/* 8023D2AC 0023A1EC 48 09 19 A1 */ bl __nw +/* 8023D2AC 0023A1EC 48 09 19 A1 */ bl __nw__FUl /* 8023D2B0 0023A1F0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D2B4 0023A1F4 41 82 00 28 */ beq lbl_8023D2DC /* 8023D2B8 0023A1F8 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -430,7 +430,7 @@ lbl_8023D2A4: lbl_8023D2DC: /* 8023D2DC 0023A21C 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8023D2E0 0023A220 38 60 00 6C */ li r3, 0x6c -/* 8023D2E4 0023A224 48 09 19 69 */ bl __nw +/* 8023D2E4 0023A224 48 09 19 69 */ bl __nw__FUl /* 8023D2E8 0023A228 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D2EC 0023A22C 41 82 00 24 */ beq lbl_8023D310 /* 8023D2F0 0023A230 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -444,7 +444,7 @@ lbl_8023D2DC: lbl_8023D310: /* 8023D310 0023A250 90 1F 00 20 */ stw r0, 0x20(r31) /* 8023D314 0023A254 38 60 00 6C */ li r3, 0x6c -/* 8023D318 0023A258 48 09 19 35 */ bl __nw +/* 8023D318 0023A258 48 09 19 35 */ bl __nw__FUl /* 8023D31C 0023A25C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D320 0023A260 41 82 00 24 */ beq lbl_8023D344 /* 8023D324 0023A264 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -474,7 +474,7 @@ lbl_8023D344: /* 8023D380 0023A2C0 4E 80 04 21 */ bctrl /* 8023D384 0023A2C4 7C 78 1B 78 */ mr r24, r3 /* 8023D388 0023A2C8 38 60 01 50 */ li r3, 0x150 -/* 8023D38C 0023A2CC 48 09 18 C1 */ bl __nw +/* 8023D38C 0023A2CC 48 09 18 C1 */ bl __nw__FUl /* 8023D390 0023A2D0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D394 0023A2D4 41 82 00 10 */ beq lbl_8023D3A4 /* 8023D398 0023A2D8 7F 04 C3 78 */ mr r4, r24 @@ -515,7 +515,7 @@ lbl_8023D418: /* 8023D41C 0023A35C 90 1F 00 40 */ stw r0, 0x40(r31) lbl_8023D420: /* 8023D420 0023A360 38 60 00 24 */ li r3, 0x24 -/* 8023D424 0023A364 48 09 18 29 */ bl __nw +/* 8023D424 0023A364 48 09 18 29 */ bl __nw__FUl /* 8023D428 0023A368 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D42C 0023A36C 41 82 00 0C */ beq lbl_8023D438 /* 8023D430 0023A370 4B FF E5 85 */ bl dMsgScrnArrow_c @@ -525,7 +525,7 @@ lbl_8023D438: /* 8023D43C 0023A37C 28 1E 00 00 */ cmplwi r30, 0 /* 8023D440 0023A380 41 82 00 24 */ beq lbl_8023D464 /* 8023D444 0023A384 38 60 01 18 */ li r3, 0x118 -/* 8023D448 0023A388 48 09 18 05 */ bl __nw +/* 8023D448 0023A388 48 09 18 05 */ bl __nw__FUl /* 8023D44C 0023A38C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D450 0023A390 41 82 00 0C */ beq lbl_8023D45C /* 8023D454 0023A394 4B FF BC 61 */ bl dMsgScrn3Select_c @@ -764,7 +764,7 @@ lbl_8023D758: /* 8023D7AC 0023A6EC 7F E0 07 35 */ extsh. r0, r31 /* 8023D7B0 0023A6F0 40 81 00 0C */ ble lbl_8023D7BC /* 8023D7B4 0023A6F4 7F C3 F3 78 */ mr r3, r30 -/* 8023D7B8 0023A6F8 48 09 15 85 */ bl __dl +/* 8023D7B8 0023A6F8 48 09 15 85 */ bl __dl__FPv lbl_8023D7BC: /* 8023D7BC 0023A6FC 7F C3 F3 78 */ mr r3, r30 /* 8023D7C0 0023A700 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index ccda6e9871..945bdf9a75 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -26,7 +26,7 @@ dMsgScrnHowl_c: /* 802409B4 0023D8F4 7F E3 FB 78 */ mr r3, r31 /* 802409B8 0023D8F8 4B FF B7 B5 */ bl dMsgScrnBase_c_NS_init /* 802409BC 0023D8FC 38 60 01 18 */ li r3, 0x118 -/* 802409C0 0023D900 48 08 E2 8D */ bl __nw +/* 802409C0 0023D900 48 08 E2 8D */ bl __nw__FUl /* 802409C4 0023D904 7C 60 1B 79 */ or. r0, r3, r3 /* 802409C8 0023D908 41 82 00 0C */ beq lbl_802409D4 /* 802409CC 0023D90C 48 0B 7A CD */ bl J2DScreen @@ -54,7 +54,7 @@ lbl_802409D4: /* 80240A20 0023D960 38 00 00 00 */ li r0, 0 /* 80240A24 0023D964 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80240A28 0023D968 38 60 00 6C */ li r3, 0x6c -/* 80240A2C 0023D96C 48 08 E2 21 */ bl __nw +/* 80240A2C 0023D96C 48 08 E2 21 */ bl __nw__FUl /* 80240A30 0023D970 7C 60 1B 79 */ or. r0, r3, r3 /* 80240A34 0023D974 41 82 00 24 */ beq lbl_80240A58 /* 80240A38 0023D978 80 9F 00 04 */ lwz r4, 4(r31) @@ -92,7 +92,7 @@ lbl_80240A58: /* 80240AB4 0023D9F4 38 00 00 00 */ li r0, 0 /* 80240AB8 0023D9F8 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80240ABC 0023D9FC 38 60 00 6C */ li r3, 0x6c -/* 80240AC0 0023DA00 48 08 E1 8D */ bl __nw +/* 80240AC0 0023DA00 48 08 E1 8D */ bl __nw__FUl /* 80240AC4 0023DA04 7C 60 1B 79 */ or. r0, r3, r3 /* 80240AC8 0023DA08 41 82 00 24 */ beq lbl_80240AEC /* 80240ACC 0023DA0C 80 9F 00 04 */ lwz r4, 4(r31) @@ -106,7 +106,7 @@ lbl_80240A58: lbl_80240AEC: /* 80240AEC 0023DA2C 90 1F 00 F4 */ stw r0, 0xf4(r31) /* 80240AF0 0023DA30 38 60 00 6C */ li r3, 0x6c -/* 80240AF4 0023DA34 48 08 E1 59 */ bl __nw +/* 80240AF4 0023DA34 48 08 E1 59 */ bl __nw__FUl /* 80240AF8 0023DA38 7C 60 1B 79 */ or. r0, r3, r3 /* 80240AFC 0023DA3C 41 82 00 28 */ beq lbl_80240B24 /* 80240B00 0023DA40 80 9F 00 04 */ lwz r4, 4(r31) @@ -121,7 +121,7 @@ lbl_80240AEC: lbl_80240B24: /* 80240B24 0023DA64 90 1F 00 FC */ stw r0, 0xfc(r31) /* 80240B28 0023DA68 38 60 00 6C */ li r3, 0x6c -/* 80240B2C 0023DA6C 48 08 E1 21 */ bl __nw +/* 80240B2C 0023DA6C 48 08 E1 21 */ bl __nw__FUl /* 80240B30 0023DA70 7C 60 1B 79 */ or. r0, r3, r3 /* 80240B34 0023DA74 41 82 00 24 */ beq lbl_80240B58 /* 80240B38 0023DA78 80 9F 00 04 */ lwz r4, 4(r31) @@ -135,7 +135,7 @@ lbl_80240B24: lbl_80240B58: /* 80240B58 0023DA98 90 1F 00 F8 */ stw r0, 0xf8(r31) /* 80240B5C 0023DA9C 38 60 00 6C */ li r3, 0x6c -/* 80240B60 0023DAA0 48 08 E0 ED */ bl __nw +/* 80240B60 0023DAA0 48 08 E0 ED */ bl __nw__FUl /* 80240B64 0023DAA4 7C 60 1B 79 */ or. r0, r3, r3 /* 80240B68 0023DAA8 41 82 00 28 */ beq lbl_80240B90 /* 80240B6C 0023DAAC 80 9F 00 04 */ lwz r4, 4(r31) @@ -354,7 +354,7 @@ lbl_80240E2C: /* 80240EA8 0023DDE8 EC 02 00 24 */ fdivs f0, f2, f0 /* 80240EAC 0023DDEC D0 1F 19 84 */ stfs f0, 0x1984(r31) /* 80240EB0 0023DDF0 38 60 00 6C */ li r3, 0x6c -/* 80240EB4 0023DDF4 48 08 DD 99 */ bl __nw +/* 80240EB4 0023DDF4 48 08 DD 99 */ bl __nw__FUl /* 80240EB8 0023DDF8 7C 60 1B 79 */ or. r0, r3, r3 /* 80240EBC 0023DDFC 41 82 00 24 */ beq lbl_80240EE0 /* 80240EC0 0023DE00 80 9F 00 04 */ lwz r4, 4(r31) @@ -368,7 +368,7 @@ lbl_80240E2C: lbl_80240EE0: /* 80240EE0 0023DE20 90 1F 00 F0 */ stw r0, 0xf0(r31) /* 80240EE4 0023DE24 38 60 00 6C */ li r3, 0x6c -/* 80240EE8 0023DE28 48 08 DD 65 */ bl __nw +/* 80240EE8 0023DE28 48 08 DD 65 */ bl __nw__FUl /* 80240EEC 0023DE2C 7C 60 1B 79 */ or. r0, r3, r3 /* 80240EF0 0023DE30 41 82 00 28 */ beq lbl_80240F18 /* 80240EF4 0023DE34 80 9F 00 04 */ lwz r4, 4(r31) @@ -461,7 +461,7 @@ lbl_80240FE8: /* 80241044 0023DF84 3B 3E 01 00 */ addi r25, r30, 0x100 lbl_80241048: /* 80241048 0023DF88 38 60 00 6C */ li r3, 0x6c -/* 8024104C 0023DF8C 48 08 DC 01 */ bl __nw +/* 8024104C 0023DF8C 48 08 DC 01 */ bl __nw__FUl /* 80241050 0023DF90 7C 64 1B 79 */ or. r4, r3, r3 /* 80241054 0023DF94 41 82 00 24 */ beq lbl_80241078 /* 80241058 0023DF98 80 9F 00 04 */ lwz r4, 4(r31) @@ -486,7 +486,7 @@ lbl_80241078: /* 802410A0 0023DFE0 3B DE 01 18 */ addi r30, r30, 0x118 lbl_802410A4: /* 802410A4 0023DFE4 38 60 00 6C */ li r3, 0x6c -/* 802410A8 0023DFE8 48 08 DB A5 */ bl __nw +/* 802410A8 0023DFE8 48 08 DB A5 */ bl __nw__FUl /* 802410AC 0023DFEC 7C 64 1B 79 */ or. r4, r3, r3 /* 802410B0 0023DFF0 41 82 00 24 */ beq lbl_802410D4 /* 802410B4 0023DFF4 80 9F 00 04 */ lwz r4, 4(r31) @@ -621,7 +621,7 @@ lbl_802410D4: /* 802412B4 0023E1F4 4E 80 04 21 */ bctrl /* 802412B8 0023E1F8 7C 77 1B 78 */ mr r23, r3 /* 802412BC 0023E1FC 38 60 01 50 */ li r3, 0x150 -/* 802412C0 0023E200 48 08 D9 8D */ bl __nw +/* 802412C0 0023E200 48 08 D9 8D */ bl __nw__FUl /* 802412C4 0023E204 7C 60 1B 79 */ or. r0, r3, r3 /* 802412C8 0023E208 41 82 00 10 */ beq lbl_802412D8 /* 802412CC 0023E20C 7E E4 BB 78 */ mr r4, r23 @@ -655,7 +655,7 @@ lbl_802412D8: /* 80241338 0023E278 4E 80 04 21 */ bctrl /* 8024133C 0023E27C 7C 79 1B 78 */ mr r25, r3 /* 80241340 0023E280 38 60 01 50 */ li r3, 0x150 -/* 80241344 0023E284 48 08 D9 09 */ bl __nw +/* 80241344 0023E284 48 08 D9 09 */ bl __nw__FUl /* 80241348 0023E288 7C 60 1B 79 */ or. r0, r3, r3 /* 8024134C 0023E28C 41 82 00 10 */ beq lbl_8024135C /* 80241350 0023E290 7F 24 CB 78 */ mr r4, r25 @@ -716,7 +716,7 @@ lbl_8024135C: /* 80241428 0023E368 4E 80 04 21 */ bctrl /* 8024142C 0023E36C 7C 7E 1B 78 */ mr r30, r3 /* 80241430 0023E370 38 60 01 50 */ li r3, 0x150 -/* 80241434 0023E374 48 08 D8 19 */ bl __nw +/* 80241434 0023E374 48 08 D8 19 */ bl __nw__FUl /* 80241438 0023E378 7C 60 1B 79 */ or. r0, r3, r3 /* 8024143C 0023E37C 41 82 00 10 */ beq lbl_8024144C /* 80241440 0023E380 7F C4 F3 78 */ mr r4, r30 @@ -741,7 +741,7 @@ lbl_8024144C: /* 80241488 0023E3C8 3B 60 00 00 */ li r27, 0 lbl_8024148C: /* 8024148C 0023E3CC 38 60 01 50 */ li r3, 0x150 -/* 80241490 0023E3D0 48 08 D7 BD */ bl __nw +/* 80241490 0023E3D0 48 08 D7 BD */ bl __nw__FUl /* 80241494 0023E3D4 7C 60 1B 79 */ or. r0, r3, r3 /* 80241498 0023E3D8 41 82 00 10 */ beq lbl_802414A8 /* 8024149C 0023E3DC 7F C4 F3 78 */ mr r4, r30 @@ -809,7 +809,7 @@ lbl_802414A8: /* 80241590 0023E4D0 4E 80 04 21 */ bctrl /* 80241594 0023E4D4 7C 79 1B 78 */ mr r25, r3 /* 80241598 0023E4D8 38 60 01 50 */ li r3, 0x150 -/* 8024159C 0023E4DC 48 08 D6 B1 */ bl __nw +/* 8024159C 0023E4DC 48 08 D6 B1 */ bl __nw__FUl /* 802415A0 0023E4E0 7C 60 1B 79 */ or. r0, r3, r3 /* 802415A4 0023E4E4 41 82 00 10 */ beq lbl_802415B4 /* 802415A8 0023E4E8 7F 24 CB 78 */ mr r4, r25 @@ -1129,7 +1129,7 @@ lbl_80241A14: /* 80241A44 0023E984 7F E0 07 35 */ extsh. r0, r31 /* 80241A48 0023E988 40 81 00 0C */ ble lbl_80241A54 /* 80241A4C 0023E98C 7F C3 F3 78 */ mr r3, r30 -/* 80241A50 0023E990 48 08 D2 ED */ bl __dl +/* 80241A50 0023E990 48 08 D2 ED */ bl __dl__FPv lbl_80241A54: /* 80241A54 0023E994 7F C3 F3 78 */ mr r3, r30 /* 80241A58 0023E998 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 869d1fa310..ffd788647f 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -139,7 +139,7 @@ lbl_8023E94C: /* 8023E95C 0023B89C 80 7F 01 38 */ lwz r3, 0x138(r31) /* 8023E960 0023B8A0 38 80 0C 00 */ li r4, 0xc00 /* 8023E964 0023B8A4 38 A0 00 20 */ li r5, 0x20 -/* 8023E968 0023B8A8 48 08 FB 6D */ bl JKRHeap_NS_alloc_X1_ +/* 8023E968 0023B8A8 48 08 FB 6D */ bl alloc__7JKRHeapFUli /* 8023E96C 0023B8AC 38 1B 00 D4 */ addi r0, r27, 0xd4 /* 8023E970 0023B8B0 7C 7F 01 2E */ stwx r3, r31, r0 /* 8023E974 0023B8B4 3B 39 00 01 */ addi r25, r25, 1 @@ -214,7 +214,7 @@ lbl_8023EA38: /* 8023EA60 0023B9A0 80 1F 00 D4 */ lwz r0, 0xd4(r31) /* 8023EA64 0023B9A4 90 1F 00 E0 */ stw r0, 0xe0(r31) /* 8023EA68 0023B9A8 38 60 01 50 */ li r3, 0x150 -/* 8023EA6C 0023B9AC 48 09 01 E1 */ bl __nw +/* 8023EA6C 0023B9AC 48 09 01 E1 */ bl __nw__FUl /* 8023EA70 0023B9B0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EA74 0023B9B4 41 82 00 10 */ beq lbl_8023EA84 /* 8023EA78 0023B9B8 80 9F 00 E0 */ lwz r4, 0xe0(r31) @@ -248,7 +248,7 @@ lbl_8023EAD8: /* 8023EADC 0023BA1C 80 04 00 D4 */ lwz r0, 0xd4(r4) /* 8023EAE0 0023BA20 90 04 00 E0 */ stw r0, 0xe0(r4) /* 8023EAE4 0023BA24 38 60 01 50 */ li r3, 0x150 -/* 8023EAE8 0023BA28 48 09 01 65 */ bl __nw +/* 8023EAE8 0023BA28 48 09 01 65 */ bl __nw__FUl /* 8023EAEC 0023BA2C 7C 64 1B 79 */ or. r4, r3, r3 /* 8023EAF0 0023BA30 41 82 00 14 */ beq lbl_8023EB04 /* 8023EAF4 0023BA34 38 1B 00 E0 */ addi r0, r27, 0xe0 @@ -274,7 +274,7 @@ lbl_8023EB14: /* 8023EB3C 0023BA7C 4B FD E8 31 */ bl dMeter2Info_c_NS_setItemColor lbl_8023EB40: /* 8023EB40 0023BA80 38 60 01 18 */ li r3, 0x118 -/* 8023EB44 0023BA84 48 09 01 09 */ bl __nw +/* 8023EB44 0023BA84 48 09 01 09 */ bl __nw__FUl /* 8023EB48 0023BA88 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EB4C 0023BA8C 41 82 00 0C */ beq lbl_8023EB58 /* 8023EB50 0023BA90 48 0B 99 49 */ bl J2DScreen @@ -292,7 +292,7 @@ lbl_8023EB58: /* 8023EB7C 0023BABC 80 7F 00 04 */ lwz r3, 4(r31) /* 8023EB80 0023BAC0 48 01 65 69 */ bl dPaneClass_showNullPane /* 8023EB84 0023BAC4 38 60 01 18 */ li r3, 0x118 -/* 8023EB88 0023BAC8 48 09 00 C5 */ bl __nw +/* 8023EB88 0023BAC8 48 09 00 C5 */ bl __nw__FUl /* 8023EB8C 0023BACC 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EB90 0023BAD0 41 82 00 0C */ beq lbl_8023EB9C /* 8023EB94 0023BAD4 48 0B 99 05 */ bl J2DScreen @@ -446,7 +446,7 @@ lbl_8023EDC4: /* 8023EDCC 0023BD0C 3B 7B 00 04 */ addi r27, r27, 4 /* 8023EDD0 0023BD10 41 80 FF B4 */ blt lbl_8023ED84 /* 8023EDD4 0023BD14 38 60 00 24 */ li r3, 0x24 -/* 8023EDD8 0023BD18 48 08 FE 75 */ bl __nw +/* 8023EDD8 0023BD18 48 08 FE 75 */ bl __nw__FUl /* 8023EDDC 0023BD1C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EDE0 0023BD20 41 82 00 0C */ beq lbl_8023EDEC /* 8023EDE4 0023BD24 4B FF CB D1 */ bl dMsgScrnArrow_c @@ -454,7 +454,7 @@ lbl_8023EDC4: lbl_8023EDEC: /* 8023EDEC 0023BD2C 90 1F 00 EC */ stw r0, 0xec(r31) /* 8023EDF0 0023BD30 38 60 01 18 */ li r3, 0x118 -/* 8023EDF4 0023BD34 48 08 FE 59 */ bl __nw +/* 8023EDF4 0023BD34 48 08 FE 59 */ bl __nw__FUl /* 8023EDF8 0023BD38 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EDFC 0023BD3C 41 82 00 0C */ beq lbl_8023EE08 /* 8023EE00 0023BD40 4B FF A2 B5 */ bl dMsgScrn3Select_c @@ -462,7 +462,7 @@ lbl_8023EDEC: lbl_8023EE08: /* 8023EE08 0023BD48 90 1F 00 F0 */ stw r0, 0xf0(r31) /* 8023EE0C 0023BD4C 38 60 00 24 */ li r3, 0x24 -/* 8023EE10 0023BD50 48 08 FE 3D */ bl __nw +/* 8023EE10 0023BD50 48 08 FE 3D */ bl __nw__FUl /* 8023EE14 0023BD54 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EE18 0023BD58 41 82 00 14 */ beq lbl_8023EE2C /* 8023EE1C 0023BD5C 38 80 00 03 */ li r4, 3 @@ -474,7 +474,7 @@ lbl_8023EE2C: /* 8023EE30 0023BD70 80 7F 01 38 */ lwz r3, 0x138(r31) /* 8023EE34 0023BD74 38 80 10 6A */ li r4, 0x106a /* 8023EE38 0023BD78 38 A0 00 20 */ li r5, 0x20 -/* 8023EE3C 0023BD7C 48 08 F6 99 */ bl JKRHeap_NS_alloc_X1_ +/* 8023EE3C 0023BD7C 48 08 F6 99 */ bl alloc__7JKRHeapFUli /* 8023EE40 0023BD80 7C 7B 1B 78 */ mr r27, r3 /* 8023EE44 0023BD84 38 80 00 00 */ li r4, 0 /* 8023EE48 0023BD88 38 A0 10 6A */ li r5, 0x106a @@ -522,7 +522,7 @@ lbl_8023EED0: /* 8023EEEC 0023BE2C C0 02 B2 04 */ lfs f0, lbl_80454C04-_SDA2_BASE_(r2) /* 8023EEF0 0023BE30 D0 1F 01 94 */ stfs f0, 0x194(r31) /* 8023EEF4 0023BE34 38 60 00 6C */ li r3, 0x6c -/* 8023EEF8 0023BE38 48 08 FD 55 */ bl __nw +/* 8023EEF8 0023BE38 48 08 FD 55 */ bl __nw__FUl /* 8023EEFC 0023BE3C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EF00 0023BE40 41 82 00 28 */ beq lbl_8023EF28 /* 8023EF04 0023BE44 80 9F 00 04 */ lwz r4, 4(r31) @@ -537,7 +537,7 @@ lbl_8023EED0: lbl_8023EF28: /* 8023EF28 0023BE68 90 1F 01 08 */ stw r0, 0x108(r31) /* 8023EF2C 0023BE6C 38 60 00 6C */ li r3, 0x6c -/* 8023EF30 0023BE70 48 08 FD 1D */ bl __nw +/* 8023EF30 0023BE70 48 08 FD 1D */ bl __nw__FUl /* 8023EF34 0023BE74 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EF38 0023BE78 41 82 00 28 */ beq lbl_8023EF60 /* 8023EF3C 0023BE7C 80 9F 00 04 */ lwz r4, 4(r31) @@ -552,7 +552,7 @@ lbl_8023EF28: lbl_8023EF60: /* 8023EF60 0023BEA0 90 1F 01 0C */ stw r0, 0x10c(r31) /* 8023EF64 0023BEA4 38 60 00 6C */ li r3, 0x6c -/* 8023EF68 0023BEA8 48 08 FC E5 */ bl __nw +/* 8023EF68 0023BEA8 48 08 FC E5 */ bl __nw__FUl /* 8023EF6C 0023BEAC 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EF70 0023BEB0 41 82 00 28 */ beq lbl_8023EF98 /* 8023EF74 0023BEB4 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -632,7 +632,7 @@ lbl_8023EF98: /* 8023F098 0023BFD8 38 00 00 00 */ li r0, 0 /* 8023F09C 0023BFDC 98 1F 01 9D */ stb r0, 0x19d(r31) /* 8023F0A0 0023BFE0 38 60 00 6C */ li r3, 0x6c -/* 8023F0A4 0023BFE4 48 08 FB A9 */ bl __nw +/* 8023F0A4 0023BFE4 48 08 FB A9 */ bl __nw__FUl /* 8023F0A8 0023BFE8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023F0AC 0023BFEC 41 82 00 24 */ beq lbl_8023F0D0 /* 8023F0B0 0023BFF0 80 9F 00 04 */ lwz r4, 4(r31) @@ -658,7 +658,7 @@ lbl_8023F0D0: /* 8023F0FC 0023C03C 7D 89 03 A6 */ mtctr r12 /* 8023F100 0023C040 4E 80 04 21 */ bctrl /* 8023F104 0023C044 38 60 00 6C */ li r3, 0x6c -/* 8023F108 0023C048 48 08 FB 45 */ bl __nw +/* 8023F108 0023C048 48 08 FB 45 */ bl __nw__FUl /* 8023F10C 0023C04C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023F110 0023C050 41 82 00 28 */ beq lbl_8023F138 /* 8023F114 0023C054 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -673,7 +673,7 @@ lbl_8023F0D0: lbl_8023F138: /* 8023F138 0023C078 90 1F 00 0C */ stw r0, 0xc(r31) /* 8023F13C 0023C07C 38 60 00 6C */ li r3, 0x6c -/* 8023F140 0023C080 48 08 FB 0D */ bl __nw +/* 8023F140 0023C080 48 08 FB 0D */ bl __nw__FUl /* 8023F144 0023C084 7C 60 1B 79 */ or. r0, r3, r3 /* 8023F148 0023C088 41 82 00 24 */ beq lbl_8023F16C /* 8023F14C 0023C08C 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -687,7 +687,7 @@ lbl_8023F138: lbl_8023F16C: /* 8023F16C 0023C0AC 90 1F 00 10 */ stw r0, 0x10(r31) /* 8023F170 0023C0B0 38 60 00 6C */ li r3, 0x6c -/* 8023F174 0023C0B4 48 08 FA D9 */ bl __nw +/* 8023F174 0023C0B4 48 08 FA D9 */ bl __nw__FUl /* 8023F178 0023C0B8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023F17C 0023C0BC 41 82 00 24 */ beq lbl_8023F1A0 /* 8023F180 0023C0C0 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -948,7 +948,7 @@ lbl_8023F550: /* 8023F558 0023C498 28 04 00 00 */ cmplwi r4, 0 /* 8023F55C 0023C49C 41 82 00 14 */ beq lbl_8023F570 /* 8023F560 0023C4A0 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 8023F564 0023C4A4 48 08 EF E5 */ bl JKRHeap_NS_free_X1_ +/* 8023F564 0023C4A4 48 08 EF E5 */ bl free__7JKRHeapFPv /* 8023F568 0023C4A8 38 00 00 00 */ li r0, 0 /* 8023F56C 0023C4AC 90 1C 00 D4 */ stw r0, 0xd4(r28) lbl_8023F570: @@ -1028,7 +1028,7 @@ lbl_8023F66C: /* 8023F678 0023C5B8 28 04 00 00 */ cmplwi r4, 0 /* 8023F67C 0023C5BC 41 82 00 14 */ beq lbl_8023F690 /* 8023F680 0023C5C0 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 8023F684 0023C5C4 48 08 EE C5 */ bl JKRHeap_NS_free_X1_ +/* 8023F684 0023C5C4 48 08 EE C5 */ bl free__7JKRHeapFPv /* 8023F688 0023C5C8 38 00 00 00 */ li r0, 0 /* 8023F68C 0023C5CC 90 1E 00 50 */ stw r0, 0x50(r30) lbl_8023F690: @@ -1161,7 +1161,7 @@ lbl_8023F7EC: /* 8023F85C 0023C79C 7F E0 07 35 */ extsh. r0, r31 /* 8023F860 0023C7A0 40 81 00 0C */ ble lbl_8023F86C /* 8023F864 0023C7A4 7F C3 F3 78 */ mr r3, r30 -/* 8023F868 0023C7A8 48 08 F4 D5 */ bl __dl +/* 8023F868 0023C7A8 48 08 F4 D5 */ bl __dl__FPv lbl_8023F86C: /* 8023F86C 0023C7AC 7F C3 F3 78 */ mr r3, r30 /* 8023F870 0023C7B0 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index 630bfb61ee..519a164e3b 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -31,7 +31,7 @@ lbl_802445AC: /* 802445AC 002414EC 7F E3 FB 78 */ mr r3, r31 /* 802445B0 002414F0 4B FF 7B BD */ bl dMsgScrnBase_c_NS_init /* 802445B4 002414F4 38 60 01 18 */ li r3, 0x118 -/* 802445B8 002414F8 48 08 A6 95 */ bl __nw +/* 802445B8 002414F8 48 08 A6 95 */ bl __nw__FUl /* 802445BC 002414FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802445C0 00241500 41 82 00 0C */ beq lbl_802445CC /* 802445C4 00241504 48 0B 3E D5 */ bl J2DScreen @@ -49,7 +49,7 @@ lbl_802445CC: /* 802445F0 00241530 80 7F 00 04 */ lwz r3, 4(r31) /* 802445F4 00241534 48 01 0A F5 */ bl dPaneClass_showNullPane /* 802445F8 00241538 38 60 00 24 */ li r3, 0x24 -/* 802445FC 0024153C 48 08 A6 51 */ bl __nw +/* 802445FC 0024153C 48 08 A6 51 */ bl __nw__FUl /* 80244600 00241540 7C 60 1B 79 */ or. r0, r3, r3 /* 80244604 00241544 41 82 00 14 */ beq lbl_80244618 /* 80244608 00241548 38 80 00 00 */ li r4, 0 @@ -61,14 +61,14 @@ lbl_80244618: /* 8024461C 0024155C 80 7F 00 C8 */ lwz r3, 0xc8(r31) /* 80244620 00241560 38 80 10 6A */ li r4, 0x106a /* 80244624 00241564 38 A0 00 20 */ li r5, 0x20 -/* 80244628 00241568 48 08 9E AD */ bl JKRHeap_NS_alloc_X1_ +/* 80244628 00241568 48 08 9E AD */ bl alloc__7JKRHeapFUli /* 8024462C 0024156C 7C 78 1B 78 */ mr r24, r3 /* 80244630 00241570 38 80 00 00 */ li r4, 0 /* 80244634 00241574 38 A0 10 6A */ li r5, 0x106a /* 80244638 00241578 4B DB EE 21 */ bl func_80003458 /* 8024463C 0024157C 93 1F 00 50 */ stw r24, 0x50(r31) /* 80244640 00241580 38 60 00 6C */ li r3, 0x6c -/* 80244644 00241584 48 08 A6 09 */ bl __nw +/* 80244644 00241584 48 08 A6 09 */ bl __nw__FUl /* 80244648 00241588 7C 60 1B 79 */ or. r0, r3, r3 /* 8024464C 0024158C 41 82 00 28 */ beq lbl_80244674 /* 80244650 00241590 80 9F 00 04 */ lwz r4, 4(r31) @@ -103,7 +103,7 @@ lbl_80244674: /* 802446C0 00241600 C0 5F 00 CC */ lfs f2, 0xcc(r31) /* 802446C4 00241604 48 00 FE ED */ bl CPaneMgr_NS_paneTrans /* 802446C8 00241608 38 60 00 6C */ li r3, 0x6c -/* 802446CC 0024160C 48 08 A5 81 */ bl __nw +/* 802446CC 0024160C 48 08 A5 81 */ bl __nw__FUl /* 802446D0 00241610 7C 60 1B 79 */ or. r0, r3, r3 /* 802446D4 00241614 41 82 00 28 */ beq lbl_802446FC /* 802446D8 00241618 80 9F 00 04 */ lwz r4, 4(r31) @@ -118,7 +118,7 @@ lbl_80244674: lbl_802446FC: /* 802446FC 0024163C 90 1F 00 0C */ stw r0, 0xc(r31) /* 80244700 00241640 38 60 00 6C */ li r3, 0x6c -/* 80244704 00241644 48 08 A5 49 */ bl __nw +/* 80244704 00241644 48 08 A5 49 */ bl __nw__FUl /* 80244708 00241648 7C 60 1B 79 */ or. r0, r3, r3 /* 8024470C 0024164C 41 82 00 24 */ beq lbl_80244730 /* 80244710 00241650 80 9F 00 04 */ lwz r4, 4(r31) @@ -382,7 +382,7 @@ lbl_80244AE8: /* 80244AF4 00241A34 28 04 00 00 */ cmplwi r4, 0 /* 80244AF8 00241A38 41 82 00 14 */ beq lbl_80244B0C /* 80244AFC 00241A3C 80 7E 00 C8 */ lwz r3, 0xc8(r30) -/* 80244B00 00241A40 48 08 9A 49 */ bl JKRHeap_NS_free_X1_ +/* 80244B00 00241A40 48 08 9A 49 */ bl free__7JKRHeapFPv /* 80244B04 00241A44 38 00 00 00 */ li r0, 0 /* 80244B08 00241A48 90 1E 00 50 */ stw r0, 0x50(r30) lbl_80244B0C: @@ -455,7 +455,7 @@ lbl_80244B90: /* 80244C00 00241B40 7F E0 07 35 */ extsh. r0, r31 /* 80244C04 00241B44 40 81 00 0C */ ble lbl_80244C10 /* 80244C08 00241B48 7F C3 F3 78 */ mr r3, r30 -/* 80244C0C 00241B4C 48 08 A1 31 */ bl __dl +/* 80244C0C 00241B4C 48 08 A1 31 */ bl __dl__FPv lbl_80244C10: /* 80244C10 00241B50 7F C3 F3 78 */ mr r3, r30 /* 80244C14 00241B54 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index 5a9f04f2a9..02cee82838 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -28,11 +28,11 @@ lbl_80244E7C: /* 80244E84 00241DC4 90 7F 00 D4 */ stw r3, 0xd4(r31) lbl_80244E88: /* 80244E88 00241DC8 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 80244E8C 00241DCC 48 08 98 F9 */ bl JKRHeap_NS_getTotalFreeSize +/* 80244E8C 00241DCC 48 08 98 F9 */ bl getTotalFreeSize__7JKRHeapFv /* 80244E90 00241DD0 7F E3 FB 78 */ mr r3, r31 /* 80244E94 00241DD4 4B FF 72 D9 */ bl dMsgScrnBase_c_NS_init /* 80244E98 00241DD8 38 60 01 18 */ li r3, 0x118 -/* 80244E9C 00241DDC 48 08 9D B1 */ bl __nw +/* 80244E9C 00241DDC 48 08 9D B1 */ bl __nw__FUl /* 80244EA0 00241DE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80244EA4 00241DE4 41 82 00 0C */ beq lbl_80244EB0 /* 80244EA8 00241DE8 48 0B 35 F1 */ bl J2DScreen @@ -84,7 +84,7 @@ lbl_80244EB0: /* 80244F5C 00241E9C C0 02 B2 C0 */ lfs f0, lbl_80454CC0-_SDA2_BASE_(r2) /* 80244F60 00241EA0 D0 1F 00 D8 */ stfs f0, 0xd8(r31) /* 80244F64 00241EA4 38 60 00 6C */ li r3, 0x6c -/* 80244F68 00241EA8 48 08 9C E5 */ bl __nw +/* 80244F68 00241EA8 48 08 9C E5 */ bl __nw__FUl /* 80244F6C 00241EAC 7C 60 1B 79 */ or. r0, r3, r3 /* 80244F70 00241EB0 41 82 00 24 */ beq lbl_80244F94 /* 80244F74 00241EB4 80 9F 00 04 */ lwz r4, 4(r31) @@ -130,7 +130,7 @@ lbl_80244F94: /* 80245010 00241F50 7D 89 03 A6 */ mtctr r12 /* 80245014 00241F54 4E 80 04 21 */ bctrl /* 80245018 00241F58 38 60 00 6C */ li r3, 0x6c -/* 8024501C 00241F5C 48 08 9C 31 */ bl __nw +/* 8024501C 00241F5C 48 08 9C 31 */ bl __nw__FUl /* 80245020 00241F60 7C 60 1B 79 */ or. r0, r3, r3 /* 80245024 00241F64 41 82 00 24 */ beq lbl_80245048 /* 80245028 00241F68 80 9F 00 04 */ lwz r4, 4(r31) @@ -144,7 +144,7 @@ lbl_80244F94: lbl_80245048: /* 80245048 00241F88 90 1F 00 C4 */ stw r0, 0xc4(r31) /* 8024504C 00241F8C 38 60 00 6C */ li r3, 0x6c -/* 80245050 00241F90 48 08 9B FD */ bl __nw +/* 80245050 00241F90 48 08 9B FD */ bl __nw__FUl /* 80245054 00241F94 7C 60 1B 79 */ or. r0, r3, r3 /* 80245058 00241F98 41 82 00 24 */ beq lbl_8024507C /* 8024505C 00241F9C 80 9F 00 04 */ lwz r4, 4(r31) @@ -169,7 +169,7 @@ lbl_8024507C: /* 802450A4 00241FE4 3B A0 00 00 */ li r29, 0 lbl_802450A8: /* 802450A8 00241FE8 38 60 00 6C */ li r3, 0x6c -/* 802450AC 00241FEC 48 08 9B A1 */ bl __nw +/* 802450AC 00241FEC 48 08 9B A1 */ bl __nw__FUl /* 802450B0 00241FF0 7C 64 1B 79 */ or. r4, r3, r3 /* 802450B4 00241FF4 41 82 00 2C */ beq lbl_802450E0 /* 802450B8 00241FF8 80 9F 00 04 */ lwz r4, 4(r31) @@ -463,7 +463,7 @@ lbl_802454C4: /* 802454FC 0024243C 7F E0 07 35 */ extsh. r0, r31 /* 80245500 00242440 40 81 00 0C */ ble lbl_8024550C /* 80245504 00242444 7F C3 F3 78 */ mr r3, r30 -/* 80245508 00242448 48 08 98 35 */ bl __dl +/* 80245508 00242448 48 08 98 35 */ bl __dl__FPv lbl_8024550C: /* 8024550C 0024244C 7F C3 F3 78 */ mr r3, r30 /* 80245510 00242450 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_light.s b/asm/d/msg/scrn/d_msg_scrn_light.s index 4713cf0cfd..4f0b7372b5 100644 --- a/asm/d/msg/scrn/d_msg_scrn_light.s +++ b/asm/d/msg/scrn/d_msg_scrn_light.s @@ -165,7 +165,7 @@ lbl_8024597C: /* 8024598C 002428CC 38 65 06 D4 */ addi r3, r5, lbl_804306D4@l /* 80245990 002428D0 4B FF FE 35 */ bl dMsgScrnLight_HIO_c_NS_updateColor /* 80245994 002428D4 38 60 01 18 */ li r3, 0x118 -/* 80245998 002428D8 48 08 92 B5 */ bl __nw +/* 80245998 002428D8 48 08 92 B5 */ bl __nw__FUl /* 8024599C 002428DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802459A0 002428E0 41 82 00 0C */ beq lbl_802459AC /* 802459A4 002428E4 48 0B 2A F5 */ bl J2DScreen @@ -219,7 +219,7 @@ lbl_802459AC: /* 80245A60 002429A0 C0 02 B2 D8 */ lfs f0, lbl_80454CD8-_SDA2_BASE_(r2) /* 80245A64 002429A4 D0 1F 00 18 */ stfs f0, 0x18(r31) /* 80245A68 002429A8 38 60 00 6C */ li r3, 0x6c -/* 80245A6C 002429AC 48 08 91 E1 */ bl __nw +/* 80245A6C 002429AC 48 08 91 E1 */ bl __nw__FUl /* 80245A70 002429B0 7C 60 1B 79 */ or. r0, r3, r3 /* 80245A74 002429B4 41 82 00 24 */ beq lbl_80245A98 /* 80245A78 002429B8 80 9F 00 04 */ lwz r4, 4(r31) @@ -318,7 +318,7 @@ lbl_80245BD0: /* 80245BD8 00242B18 7F E0 07 35 */ extsh. r0, r31 /* 80245BDC 00242B1C 40 81 00 0C */ ble lbl_80245BE8 /* 80245BE0 00242B20 7F C3 F3 78 */ mr r3, r30 -/* 80245BE4 00242B24 48 08 91 59 */ bl __dl +/* 80245BE4 00242B24 48 08 91 59 */ bl __dl__FPv lbl_80245BE8: /* 80245BE8 00242B28 7F C3 F3 78 */ mr r3, r30 /* 80245BEC 00242B2C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -833,7 +833,7 @@ dMsgScrnLight_HIO_c_NS_dtor: /* 80246368 002432A8 90 1F 00 00 */ stw r0, 0(r31) /* 8024636C 002432AC 7C 80 07 35 */ extsh. r0, r4 /* 80246370 002432B0 40 81 00 08 */ ble lbl_80246378 -/* 80246374 002432B4 48 08 89 C9 */ bl __dl +/* 80246374 002432B4 48 08 89 C9 */ bl __dl__FPv lbl_80246378: /* 80246378 002432B8 7F E3 FB 78 */ mr r3, r31 /* 8024637C 002432BC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index cabe34cc3b..01ccdc4167 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -40,7 +40,7 @@ lbl_80246440: /* 80246448 00243388 D0 1F 00 CC */ stfs f0, 0xcc(r31) lbl_8024644C: /* 8024644C 0024338C 38 60 01 18 */ li r3, 0x118 -/* 80246450 00243390 48 08 87 FD */ bl __nw +/* 80246450 00243390 48 08 87 FD */ bl __nw__FUl /* 80246454 00243394 7C 60 1B 79 */ or. r0, r3, r3 /* 80246458 00243398 41 82 00 0C */ beq lbl_80246464 /* 8024645C 0024339C 48 0B 20 3D */ bl J2DScreen @@ -58,7 +58,7 @@ lbl_80246464: /* 80246488 002433C8 80 7F 00 04 */ lwz r3, 4(r31) /* 8024648C 002433CC 48 00 EC 5D */ bl dPaneClass_showNullPane /* 80246490 002433D0 38 60 00 6C */ li r3, 0x6c -/* 80246494 002433D4 48 08 87 B9 */ bl __nw +/* 80246494 002433D4 48 08 87 B9 */ bl __nw__FUl /* 80246498 002433D8 7C 60 1B 79 */ or. r0, r3, r3 /* 8024649C 002433DC 41 82 00 24 */ beq lbl_802464C0 /* 802464A0 002433E0 80 9F 00 04 */ lwz r4, 4(r31) @@ -84,7 +84,7 @@ lbl_802464C0: /* 802464EC 0024342C 7D 89 03 A6 */ mtctr r12 /* 802464F0 00243430 4E 80 04 21 */ bctrl /* 802464F4 00243434 38 60 00 6C */ li r3, 0x6c -/* 802464F8 00243438 48 08 87 55 */ bl __nw +/* 802464F8 00243438 48 08 87 55 */ bl __nw__FUl /* 802464FC 0024343C 7C 60 1B 79 */ or. r0, r3, r3 /* 80246500 00243440 41 82 00 28 */ beq lbl_80246528 /* 80246504 00243444 80 9F 00 04 */ lwz r4, 4(r31) @@ -119,7 +119,7 @@ lbl_80246528: /* 80246574 002434B4 EC 42 00 28 */ fsubs f2, f2, f0 /* 80246578 002434B8 48 00 E0 39 */ bl CPaneMgr_NS_paneTrans /* 8024657C 002434BC 38 60 00 6C */ li r3, 0x6c -/* 80246580 002434C0 48 08 86 CD */ bl __nw +/* 80246580 002434C0 48 08 86 CD */ bl __nw__FUl /* 80246584 002434C4 7C 60 1B 79 */ or. r0, r3, r3 /* 80246588 002434C8 41 82 00 24 */ beq lbl_802465AC /* 8024658C 002434CC 80 9F 00 04 */ lwz r4, 4(r31) @@ -160,7 +160,7 @@ lbl_802465AC: /* 80246614 00243554 C3 E2 B2 EC */ lfs f31, lbl_80454CEC-_SDA2_BASE_(r2) lbl_80246618: /* 80246618 00243558 38 60 00 6C */ li r3, 0x6c -/* 8024661C 0024355C 48 08 86 31 */ bl __nw +/* 8024661C 0024355C 48 08 86 31 */ bl __nw__FUl /* 80246620 00243560 7C 64 1B 79 */ or. r4, r3, r3 /* 80246624 00243564 41 82 00 2C */ beq lbl_80246650 /* 80246628 00243568 80 9F 00 04 */ lwz r4, 4(r31) @@ -354,7 +354,7 @@ lbl_802468BC: /* 802468F8 00243838 7F 40 07 35 */ extsh. r0, r26 /* 802468FC 0024383C 40 81 00 0C */ ble lbl_80246908 /* 80246900 00243840 7F E3 FB 78 */ mr r3, r31 -/* 80246904 00243844 48 08 84 39 */ bl __dl +/* 80246904 00243844 48 08 84 39 */ bl __dl__FPv lbl_80246908: /* 80246908 00243848 7F E3 FB 78 */ mr r3, r31 /* 8024690C 0024384C 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_staff.s b/asm/d/msg/scrn/d_msg_scrn_staff.s index 6bb20954b3..e3fd512729 100644 --- a/asm/d/msg/scrn/d_msg_scrn_staff.s +++ b/asm/d/msg/scrn/d_msg_scrn_staff.s @@ -21,7 +21,7 @@ dMsgScrnStaff_c: /* 80246B68 00243AA8 D0 1E 00 D0 */ stfs f0, 0xd0(r30) /* 80246B6C 00243AAC D0 1E 00 CC */ stfs f0, 0xcc(r30) /* 80246B70 00243AB0 38 60 01 18 */ li r3, 0x118 -/* 80246B74 00243AB4 48 08 80 D9 */ bl __nw +/* 80246B74 00243AB4 48 08 80 D9 */ bl __nw__FUl /* 80246B78 00243AB8 7C 60 1B 79 */ or. r0, r3, r3 /* 80246B7C 00243ABC 41 82 00 0C */ beq lbl_80246B88 /* 80246B80 00243AC0 48 0B 19 19 */ bl J2DScreen @@ -39,7 +39,7 @@ lbl_80246B88: /* 80246BAC 00243AEC 80 7E 00 04 */ lwz r3, 4(r30) /* 80246BB0 00243AF0 48 00 E5 39 */ bl dPaneClass_showNullPane /* 80246BB4 00243AF4 38 60 00 6C */ li r3, 0x6c -/* 80246BB8 00243AF8 48 08 80 95 */ bl __nw +/* 80246BB8 00243AF8 48 08 80 95 */ bl __nw__FUl /* 80246BBC 00243AFC 7C 60 1B 79 */ or. r0, r3, r3 /* 80246BC0 00243B00 41 82 00 24 */ beq lbl_80246BE4 /* 80246BC4 00243B04 80 9E 00 04 */ lwz r4, 4(r30) @@ -79,7 +79,7 @@ lbl_80246BE4: /* 80246C48 00243B88 3B 83 9B 98 */ addi r28, r3, lbl_80399B98@l lbl_80246C4C: /* 80246C4C 00243B8C 38 60 00 6C */ li r3, 0x6c -/* 80246C50 00243B90 48 08 7F FD */ bl __nw +/* 80246C50 00243B90 48 08 7F FD */ bl __nw__FUl /* 80246C54 00243B94 7C 64 1B 79 */ or. r4, r3, r3 /* 80246C58 00243B98 41 82 00 2C */ beq lbl_80246C84 /* 80246C5C 00243B9C 80 9E 00 04 */ lwz r4, 4(r30) @@ -243,7 +243,7 @@ lbl_80246E80: /* 80246EBC 00243DFC 7F 60 07 35 */ extsh. r0, r27 /* 80246EC0 00243E00 40 81 00 0C */ ble lbl_80246ECC /* 80246EC4 00243E04 7F 43 D3 78 */ mr r3, r26 -/* 80246EC8 00243E08 48 08 7E 75 */ bl __dl +/* 80246EC8 00243E08 48 08 7E 75 */ bl __dl__FPv lbl_80246ECC: /* 80246ECC 00243E0C 7F 43 D3 78 */ mr r3, r26 /* 80246ED0 00243E10 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index d93aef8a42..aa7a2fa5e7 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -34,7 +34,7 @@ lbl_80247050: /* 80247050 00243F90 7F E3 FB 78 */ mr r3, r31 /* 80247054 00243F94 4B FF 51 19 */ bl dMsgScrnBase_c_NS_init /* 80247058 00243F98 38 60 01 18 */ li r3, 0x118 -/* 8024705C 00243F9C 48 08 7B F1 */ bl __nw +/* 8024705C 00243F9C 48 08 7B F1 */ bl __nw__FUl /* 80247060 00243FA0 7C 60 1B 79 */ or. r0, r3, r3 /* 80247064 00243FA4 41 82 00 0C */ beq lbl_80247070 /* 80247068 00243FA8 48 0B 14 31 */ bl J2DScreen @@ -52,7 +52,7 @@ lbl_80247070: /* 80247094 00243FD4 80 7F 00 04 */ lwz r3, 4(r31) /* 80247098 00243FD8 48 00 E0 51 */ bl dPaneClass_showNullPane /* 8024709C 00243FDC 38 60 01 18 */ li r3, 0x118 -/* 802470A0 00243FE0 48 08 7B AD */ bl __nw +/* 802470A0 00243FE0 48 08 7B AD */ bl __nw__FUl /* 802470A4 00243FE4 7C 60 1B 79 */ or. r0, r3, r3 /* 802470A8 00243FE8 41 82 00 0C */ beq lbl_802470B4 /* 802470AC 00243FEC 48 0B 13 ED */ bl J2DScreen @@ -85,7 +85,7 @@ lbl_8024710C: /* 8024710C 0024404C 80 7F 00 C4 */ lwz r3, 0xc4(r31) /* 80247110 00244050 48 00 DF D9 */ bl dPaneClass_showNullPane /* 80247114 00244054 38 60 00 24 */ li r3, 0x24 -/* 80247118 00244058 48 08 7B 35 */ bl __nw +/* 80247118 00244058 48 08 7B 35 */ bl __nw__FUl /* 8024711C 0024405C 7C 60 1B 79 */ or. r0, r3, r3 /* 80247120 00244060 41 82 00 0C */ beq lbl_8024712C /* 80247124 00244064 4B FF 48 91 */ bl dMsgScrnArrow_c @@ -98,7 +98,7 @@ lbl_8024712C: /* 8024713C 0024407C 28 00 00 03 */ cmplwi r0, 3 /* 80247140 00244080 41 82 00 24 */ beq lbl_80247164 /* 80247144 00244084 38 60 01 18 */ li r3, 0x118 -/* 80247148 00244088 48 08 7B 05 */ bl __nw +/* 80247148 00244088 48 08 7B 05 */ bl __nw__FUl /* 8024714C 0024408C 7C 60 1B 79 */ or. r0, r3, r3 /* 80247150 00244090 41 82 00 0C */ beq lbl_8024715C /* 80247154 00244094 4B FF 1F 61 */ bl dMsgScrn3Select_c @@ -135,7 +135,7 @@ lbl_802471B0: /* 802471B0 002440F0 3B 60 00 00 */ li r27, 0 lbl_802471B4: /* 802471B4 002440F4 38 60 00 24 */ li r3, 0x24 -/* 802471B8 002440F8 48 08 7A 95 */ bl __nw +/* 802471B8 002440F8 48 08 7A 95 */ bl __nw__FUl /* 802471BC 002440FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802471C0 00244100 41 82 00 14 */ beq lbl_802471D4 /* 802471C4 00244104 7F 64 DB 78 */ mr r4, r27 @@ -147,7 +147,7 @@ lbl_802471D4: /* 802471D8 00244118 80 7F 00 E4 */ lwz r3, 0xe4(r31) /* 802471DC 0024411C 38 80 10 6A */ li r4, 0x106a /* 802471E0 00244120 38 A0 00 20 */ li r5, 0x20 -/* 802471E4 00244124 48 08 72 F1 */ bl JKRHeap_NS_alloc_X1_ +/* 802471E4 00244124 48 08 72 F1 */ bl alloc__7JKRHeapFUli /* 802471E8 00244128 7C 7C 1B 78 */ mr r28, r3 /* 802471EC 0024412C 38 80 00 00 */ li r4, 0 /* 802471F0 00244130 38 A0 10 6A */ li r5, 0x106a @@ -255,7 +255,7 @@ lbl_802472B8: /* 80247380 002442C0 7D 89 03 A6 */ mtctr r12 /* 80247384 002442C4 4E 80 04 21 */ bctrl /* 80247388 002442C8 38 60 00 6C */ li r3, 0x6c -/* 8024738C 002442CC 48 08 78 C1 */ bl __nw +/* 8024738C 002442CC 48 08 78 C1 */ bl __nw__FUl /* 80247390 002442D0 7C 60 1B 79 */ or. r0, r3, r3 /* 80247394 002442D4 41 82 00 28 */ beq lbl_802473BC /* 80247398 002442D8 80 9F 00 04 */ lwz r4, 4(r31) @@ -270,7 +270,7 @@ lbl_802472B8: lbl_802473BC: /* 802473BC 002442FC 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 802473C0 00244300 38 60 00 6C */ li r3, 0x6c -/* 802473C4 00244304 48 08 78 89 */ bl __nw +/* 802473C4 00244304 48 08 78 89 */ bl __nw__FUl /* 802473C8 00244308 7C 60 1B 79 */ or. r0, r3, r3 /* 802473CC 0024430C 41 82 00 28 */ beq lbl_802473F4 /* 802473D0 00244310 80 9F 00 04 */ lwz r4, 4(r31) @@ -285,7 +285,7 @@ lbl_802473BC: lbl_802473F4: /* 802473F4 00244334 90 1F 00 DC */ stw r0, 0xdc(r31) /* 802473F8 00244338 38 60 00 6C */ li r3, 0x6c -/* 802473FC 0024433C 48 08 78 51 */ bl __nw +/* 802473FC 0024433C 48 08 78 51 */ bl __nw__FUl /* 80247400 00244340 7C 60 1B 79 */ or. r0, r3, r3 /* 80247404 00244344 41 82 00 28 */ beq lbl_8024742C /* 80247408 00244348 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -320,7 +320,7 @@ lbl_8024742C: /* 80247478 002443B8 7D 89 03 A6 */ mtctr r12 /* 8024747C 002443BC 4E 80 04 21 */ bctrl /* 80247480 002443C0 38 60 00 6C */ li r3, 0x6c -/* 80247484 002443C4 48 08 77 C9 */ bl __nw +/* 80247484 002443C4 48 08 77 C9 */ bl __nw__FUl /* 80247488 002443C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8024748C 002443CC 41 82 00 24 */ beq lbl_802474B0 /* 80247490 002443D0 80 9F 00 04 */ lwz r4, 4(r31) @@ -346,7 +346,7 @@ lbl_802474B0: /* 802474DC 0024441C 7D 89 03 A6 */ mtctr r12 /* 802474E0 00244420 4E 80 04 21 */ bctrl /* 802474E4 00244424 38 60 00 6C */ li r3, 0x6c -/* 802474E8 00244428 48 08 77 65 */ bl __nw +/* 802474E8 00244428 48 08 77 65 */ bl __nw__FUl /* 802474EC 0024442C 7C 60 1B 79 */ or. r0, r3, r3 /* 802474F0 00244430 41 82 00 28 */ beq lbl_80247518 /* 802474F4 00244434 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -361,7 +361,7 @@ lbl_802474B0: lbl_80247518: /* 80247518 00244458 90 1F 00 0C */ stw r0, 0xc(r31) /* 8024751C 0024445C 38 60 00 6C */ li r3, 0x6c -/* 80247520 00244460 48 08 77 2D */ bl __nw +/* 80247520 00244460 48 08 77 2D */ bl __nw__FUl /* 80247524 00244464 7C 60 1B 79 */ or. r0, r3, r3 /* 80247528 00244468 41 82 00 24 */ beq lbl_8024754C /* 8024752C 0024446C 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -379,7 +379,7 @@ lbl_8024754C: /* 80247558 00244498 28 00 00 08 */ cmplwi r0, 8 /* 8024755C 0024449C 40 82 00 D4 */ bne lbl_80247630 /* 80247560 002444A0 38 60 00 6C */ li r3, 0x6c -/* 80247564 002444A4 48 08 76 E9 */ bl __nw +/* 80247564 002444A4 48 08 76 E9 */ bl __nw__FUl /* 80247568 002444A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8024756C 002444AC 41 82 00 24 */ beq lbl_80247590 /* 80247570 002444B0 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -393,7 +393,7 @@ lbl_8024754C: lbl_80247590: /* 80247590 002444D0 90 1F 00 14 */ stw r0, 0x14(r31) /* 80247594 002444D4 38 60 00 6C */ li r3, 0x6c -/* 80247598 002444D8 48 08 76 B5 */ bl __nw +/* 80247598 002444D8 48 08 76 B5 */ bl __nw__FUl /* 8024759C 002444DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802475A0 002444E0 41 82 00 24 */ beq lbl_802475C4 /* 802475A4 002444E4 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -407,7 +407,7 @@ lbl_80247590: lbl_802475C4: /* 802475C4 00244504 90 1F 00 18 */ stw r0, 0x18(r31) /* 802475C8 00244508 38 60 00 6C */ li r3, 0x6c -/* 802475CC 0024450C 48 08 76 81 */ bl __nw +/* 802475CC 0024450C 48 08 76 81 */ bl __nw__FUl /* 802475D0 00244510 7C 60 1B 79 */ or. r0, r3, r3 /* 802475D4 00244514 41 82 00 24 */ beq lbl_802475F8 /* 802475D8 00244518 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -421,7 +421,7 @@ lbl_802475C4: lbl_802475F8: /* 802475F8 00244538 90 1F 00 1C */ stw r0, 0x1c(r31) /* 802475FC 0024453C 38 60 00 6C */ li r3, 0x6c -/* 80247600 00244540 48 08 76 4D */ bl __nw +/* 80247600 00244540 48 08 76 4D */ bl __nw__FUl /* 80247604 00244544 7C 60 1B 79 */ or. r0, r3, r3 /* 80247608 00244548 41 82 00 24 */ beq lbl_8024762C /* 8024760C 0024454C 80 9F 00 C4 */ lwz r4, 0xc4(r31) @@ -803,7 +803,7 @@ lbl_80247B80: /* 80247B8C 00244ACC 28 04 00 00 */ cmplwi r4, 0 /* 80247B90 00244AD0 41 82 00 14 */ beq lbl_80247BA4 /* 80247B94 00244AD4 80 7E 00 E4 */ lwz r3, 0xe4(r30) -/* 80247B98 00244AD8 48 08 69 B1 */ bl JKRHeap_NS_free_X1_ +/* 80247B98 00244AD8 48 08 69 B1 */ bl free__7JKRHeapFPv /* 80247B9C 00244ADC 38 00 00 00 */ li r0, 0 /* 80247BA0 00244AE0 90 1E 00 50 */ stw r0, 0x50(r30) lbl_80247BA4: @@ -908,7 +908,7 @@ lbl_80247C98: /* 80247D08 00244C48 7F E0 07 35 */ extsh. r0, r31 /* 80247D0C 00244C4C 40 81 00 0C */ ble lbl_80247D18 /* 80247D10 00244C50 7F C3 F3 78 */ mr r3, r30 -/* 80247D14 00244C54 48 08 70 29 */ bl __dl +/* 80247D14 00244C54 48 08 70 29 */ bl __dl__FPv lbl_80247D18: /* 80247D18 00244C58 7F C3 F3 78 */ mr r3, r30 /* 80247D1C 00244C5C 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 1229f4e5c3..20590052a1 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -29,7 +29,7 @@ lbl_8024899C: /* 802489A4 002458E4 90 7F 00 D8 */ stw r3, 0xd8(r31) lbl_802489A8: /* 802489A8 002458E8 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 802489AC 002458EC 48 08 5D D9 */ bl JKRHeap_NS_getTotalFreeSize +/* 802489AC 002458EC 48 08 5D D9 */ bl getTotalFreeSize__7JKRHeapFv /* 802489B0 002458F0 7F E3 FB 78 */ mr r3, r31 /* 802489B4 002458F4 4B FF 37 B9 */ bl dMsgScrnBase_c_NS_init /* 802489B8 002458F8 28 1C 00 00 */ cmplwi r28, 0 @@ -41,7 +41,7 @@ lbl_802489CC: /* 802489CC 0024590C 93 9F 00 54 */ stw r28, 0x54(r31) lbl_802489D0: /* 802489D0 00245910 38 60 01 18 */ li r3, 0x118 -/* 802489D4 00245914 48 08 62 79 */ bl __nw +/* 802489D4 00245914 48 08 62 79 */ bl __nw__FUl /* 802489D8 00245918 7C 60 1B 79 */ or. r0, r3, r3 /* 802489DC 0024591C 41 82 00 0C */ beq lbl_802489E8 /* 802489E0 00245920 48 0A FA B9 */ bl J2DScreen @@ -108,7 +108,7 @@ lbl_802489E8: /* 80248AD0 00245A10 C0 02 B3 58 */ lfs f0, lbl_80454D58-_SDA2_BASE_(r2) /* 80248AD4 00245A14 D0 1F 00 E0 */ stfs f0, 0xe0(r31) /* 80248AD8 00245A18 38 60 00 6C */ li r3, 0x6c -/* 80248ADC 00245A1C 48 08 61 71 */ bl __nw +/* 80248ADC 00245A1C 48 08 61 71 */ bl __nw__FUl /* 80248AE0 00245A20 7C 60 1B 79 */ or. r0, r3, r3 /* 80248AE4 00245A24 41 82 00 24 */ beq lbl_80248B08 /* 80248AE8 00245A28 80 9F 00 04 */ lwz r4, 4(r31) @@ -154,7 +154,7 @@ lbl_80248B08: /* 80248B84 00245AC4 7D 89 03 A6 */ mtctr r12 /* 80248B88 00245AC8 4E 80 04 21 */ bctrl /* 80248B8C 00245ACC 38 60 00 6C */ li r3, 0x6c -/* 80248B90 00245AD0 48 08 60 BD */ bl __nw +/* 80248B90 00245AD0 48 08 60 BD */ bl __nw__FUl /* 80248B94 00245AD4 7C 60 1B 79 */ or. r0, r3, r3 /* 80248B98 00245AD8 41 82 00 24 */ beq lbl_80248BBC /* 80248B9C 00245ADC 80 9F 00 04 */ lwz r4, 4(r31) @@ -168,7 +168,7 @@ lbl_80248B08: lbl_80248BBC: /* 80248BBC 00245AFC 90 1F 00 C4 */ stw r0, 0xc4(r31) /* 80248BC0 00245B00 38 60 00 6C */ li r3, 0x6c -/* 80248BC4 00245B04 48 08 60 89 */ bl __nw +/* 80248BC4 00245B04 48 08 60 89 */ bl __nw__FUl /* 80248BC8 00245B08 7C 60 1B 79 */ or. r0, r3, r3 /* 80248BCC 00245B0C 41 82 00 24 */ beq lbl_80248BF0 /* 80248BD0 00245B10 80 9F 00 04 */ lwz r4, 4(r31) @@ -209,7 +209,7 @@ lbl_80248BF0: /* 80248C58 00245B98 3B 64 9C 30 */ addi r27, r4, lbl_80399C30@l lbl_80248C5C: /* 80248C5C 00245B9C 38 60 00 6C */ li r3, 0x6c -/* 80248C60 00245BA0 48 08 5F ED */ bl __nw +/* 80248C60 00245BA0 48 08 5F ED */ bl __nw__FUl /* 80248C64 00245BA4 7C 64 1B 79 */ or. r4, r3, r3 /* 80248C68 00245BA8 41 82 00 2C */ beq lbl_80248C94 /* 80248C6C 00245BAC 80 9F 00 04 */ lwz r4, 4(r31) @@ -519,7 +519,7 @@ lbl_802490B4: /* 802490EC 0024602C 7F E0 07 35 */ extsh. r0, r31 /* 802490F0 00246030 40 81 00 0C */ ble lbl_802490FC /* 802490F4 00246034 7F C3 F3 78 */ mr r3, r30 -/* 802490F8 00246038 48 08 5C 45 */ bl __dl +/* 802490F8 00246038 48 08 5C 45 */ bl __dl__FPv lbl_802490FC: /* 802490FC 0024603C 7F C3 F3 78 */ mr r3, r30 /* 80249100 00246040 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 62a8bff8ab..dbe336c60a 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -17,7 +17,7 @@ dMsgStringBase_c: /* 802493D8 00246318 B0 03 00 20 */ sth r0, 0x20(r3) /* 802493DC 0024631C 48 00 03 25 */ bl dMsgStringBase_c_NS_getResource /* 802493E0 00246320 38 60 00 20 */ li r3, 0x20 -/* 802493E4 00246324 48 08 58 69 */ bl __nw +/* 802493E4 00246324 48 08 58 69 */ bl __nw__FUl /* 802493E8 00246328 7C 60 1B 79 */ or. r0, r3, r3 /* 802493EC 0024632C 41 82 00 0C */ beq lbl_802493F8 /* 802493F0 00246330 48 05 FC 7D */ bl JMessage_NS_TResourceContainer @@ -25,7 +25,7 @@ dMsgStringBase_c: lbl_802493F8: /* 802493F8 00246338 90 1F 00 04 */ stw r0, 4(r31) /* 802493FC 0024633C 38 60 00 38 */ li r3, 0x38 -/* 80249400 00246340 48 08 58 4D */ bl __nw +/* 80249400 00246340 48 08 58 4D */ bl __nw__FUl /* 80249404 00246344 7C 60 1B 79 */ or. r0, r3, r3 /* 80249408 00246348 41 82 00 0C */ beq lbl_80249414 /* 8024940C 0024634C 4B FE 67 51 */ bl jmessage_string_tControl @@ -33,7 +33,7 @@ lbl_802493F8: lbl_80249414: /* 80249414 00246354 90 1F 00 08 */ stw r0, 8(r31) /* 80249418 00246358 38 60 00 88 */ li r3, 0x88 -/* 8024941C 0024635C 48 08 58 31 */ bl __nw +/* 8024941C 0024635C 48 08 58 31 */ bl __nw__FUl /* 80249420 00246360 7C 60 1B 79 */ or. r0, r3, r3 /* 80249424 00246364 41 82 00 0C */ beq lbl_80249430 /* 80249428 00246368 4B FE 64 99 */ bl jmessage_string_tReference @@ -41,7 +41,7 @@ lbl_80249414: lbl_80249430: /* 80249430 00246370 90 1F 00 0C */ stw r0, 0xc(r31) /* 80249434 00246374 38 60 00 8C */ li r3, 0x8c -/* 80249438 00246378 48 08 58 15 */ bl __nw +/* 80249438 00246378 48 08 58 15 */ bl __nw__FUl /* 8024943C 0024637C 7C 60 1B 79 */ or. r0, r3, r3 /* 80249440 00246380 41 82 00 14 */ beq lbl_80249454 /* 80249444 00246384 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -51,7 +51,7 @@ lbl_80249430: lbl_80249454: /* 80249454 00246394 90 1F 00 10 */ stw r0, 0x10(r31) /* 80249458 00246398 38 60 05 58 */ li r3, 0x558 -/* 8024945C 0024639C 48 08 57 F1 */ bl __nw +/* 8024945C 0024639C 48 08 57 F1 */ bl __nw__FUl /* 80249460 002463A0 7C 60 1B 79 */ or. r0, r3, r3 /* 80249464 002463A4 41 82 00 10 */ beq lbl_80249474 /* 80249468 002463A8 80 9F 00 0C */ lwz r4, 0xc(r31) @@ -60,7 +60,7 @@ lbl_80249454: lbl_80249474: /* 80249474 002463B4 90 1F 00 14 */ stw r0, 0x14(r31) /* 80249478 002463B8 38 60 00 0C */ li r3, 0xc -/* 8024947C 002463BC 48 08 57 D1 */ bl __nw +/* 8024947C 002463BC 48 08 57 D1 */ bl __nw__FUl /* 80249480 002463C0 7C 60 1B 79 */ or. r0, r3, r3 /* 80249484 002463C4 41 82 00 10 */ beq lbl_80249494 /* 80249488 002463C8 80 9F 00 04 */ lwz r4, 4(r31) @@ -153,7 +153,7 @@ lbl_8024959C: /* 802495C4 00246504 38 80 FF FF */ li r4, -1 /* 802495C8 00246508 48 05 F9 31 */ bl JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor /* 802495CC 0024650C 7F A3 EB 78 */ mr r3, r29 -/* 802495D0 00246510 48 08 57 6D */ bl __dl +/* 802495D0 00246510 48 08 57 6D */ bl __dl__FPv lbl_802495D4: /* 802495D4 00246514 38 00 00 00 */ li r0, 0 /* 802495D8 00246518 90 1E 00 04 */ stw r0, 4(r30) @@ -228,7 +228,7 @@ lbl_802496D4: /* 802496D4 00246614 7F E0 07 35 */ extsh. r0, r31 /* 802496D8 00246618 40 81 00 0C */ ble lbl_802496E4 /* 802496DC 0024661C 7F C3 F3 78 */ mr r3, r30 -/* 802496E0 00246620 48 08 56 5D */ bl __dl +/* 802496E0 00246620 48 08 56 5D */ bl __dl__FPv lbl_802496E4: /* 802496E4 00246624 7F C3 F3 78 */ mr r3, r30 /* 802496E8 00246628 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/d/npc/d_npc_lib.s b/asm/d/npc/d_npc_lib.s index 1949751d68..68abb89e61 100644 --- a/asm/d/npc/d_npc_lib.s +++ b/asm/d/npc/d_npc_lib.s @@ -1015,7 +1015,7 @@ lbl_8025208C: /* 80252150 0024F090 7F E0 07 35 */ extsh. r0, r31 /* 80252154 0024F094 40 81 00 0C */ ble lbl_80252160 /* 80252158 0024F098 7F C3 F3 78 */ mr r3, r30 -/* 8025215C 0024F09C 48 07 CB E1 */ bl __dl +/* 8025215C 0024F09C 48 07 CB E1 */ bl __dl__FPv lbl_80252160: /* 80252160 0024F0A0 7F C3 F3 78 */ mr r3, r30 /* 80252164 0024F0A4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/ovlp/d_ovlp_fade2.s b/asm/d/ovlp/d_ovlp_fade2.s index cb048adb58..37e2eb8043 100644 --- a/asm/d/ovlp/d_ovlp_fade2.s +++ b/asm/d/ovlp/d_ovlp_fade2.s @@ -678,7 +678,7 @@ lbl_80252E84: /* 80252EAC 0024FDEC 90 1F 00 00 */ stw r0, 0(r31) /* 80252EB0 0024FDF0 7C 80 07 35 */ extsh. r0, r4 /* 80252EB4 0024FDF4 40 81 00 08 */ ble lbl_80252EBC -/* 80252EB8 0024FDF8 48 07 BE 85 */ bl __dl +/* 80252EB8 0024FDF8 48 07 BE 85 */ bl __dl__FPv lbl_80252EBC: /* 80252EBC 0024FDFC 7F E3 FB 78 */ mr r3, r31 /* 80252EC0 0024FE00 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/ovlp/d_ovlp_fade3.s b/asm/d/ovlp/d_ovlp_fade3.s index 9c0d0129f2..850ba1e938 100644 --- a/asm/d/ovlp/d_ovlp_fade3.s +++ b/asm/d/ovlp/d_ovlp_fade3.s @@ -676,7 +676,7 @@ lbl_802538D4: /* 80253908 00250848 90 1F 00 00 */ stw r0, 0(r31) /* 8025390C 0025084C 7C 80 07 35 */ extsh. r0, r4 /* 80253910 00250850 40 81 00 08 */ ble lbl_80253918 -/* 80253914 00250854 48 07 B4 29 */ bl __dl +/* 80253914 00250854 48 07 B4 29 */ bl __dl__FPv lbl_80253918: /* 80253918 00250858 7F E3 FB 78 */ mr r3, r31 /* 8025391C 0025085C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/pane/class/d_pane_class_alpha.s b/asm/d/pane/class/d_pane_class_alpha.s index ccaa99bec3..4d0c9a7883 100644 --- a/asm/d/pane/class/d_pane_class_alpha.s +++ b/asm/d/pane/class/d_pane_class_alpha.s @@ -58,14 +58,14 @@ CPaneMgrAlpha_NS_dtor: /* 8025549C 002523DC 28 04 00 00 */ cmplwi r4, 0 /* 802554A0 002523E0 41 82 00 14 */ beq lbl_802554B4 /* 802554A4 002523E4 80 7E 00 08 */ lwz r3, 8(r30) -/* 802554A8 002523E8 48 07 90 A1 */ bl JKRHeap_NS_free_X1_ +/* 802554A8 002523E8 48 07 90 A1 */ bl free__7JKRHeapFPv /* 802554AC 002523EC 38 00 00 00 */ li r0, 0 /* 802554B0 002523F0 90 1E 00 0C */ stw r0, 0xc(r30) lbl_802554B4: /* 802554B4 002523F4 7F E0 07 35 */ extsh. r0, r31 /* 802554B8 002523F8 40 81 00 0C */ ble lbl_802554C4 /* 802554BC 002523FC 7F C3 F3 78 */ mr r3, r30 -/* 802554C0 00252400 48 07 98 7D */ bl __dl +/* 802554C0 00252400 48 07 98 7D */ bl __dl__FPv lbl_802554C4: /* 802554C4 00252404 7F C3 F3 78 */ mr r3, r30 /* 802554C8 00252408 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -111,7 +111,7 @@ lbl_80255518: /* 80255554 00252494 80 7E 00 08 */ lwz r3, 8(r30) /* 80255558 00252498 A8 9E 00 14 */ lha r4, 0x14(r30) /* 8025555C 0025249C 38 A0 00 20 */ li r5, 0x20 -/* 80255560 002524A0 48 07 8F 75 */ bl JKRHeap_NS_alloc_X1_ +/* 80255560 002524A0 48 07 8F 75 */ bl alloc__7JKRHeapFUli /* 80255564 002524A4 90 7E 00 0C */ stw r3, 0xc(r30) /* 80255568 002524A8 80 1E 00 0C */ lwz r0, 0xc(r30) /* 8025556C 002524AC 90 1E 00 10 */ stw r0, 0x10(r30) @@ -651,7 +651,7 @@ CPaneMgrAlphaMorf: /* 80255CDC 00252C1C 28 04 00 00 */ cmplwi r4, 0 /* 80255CE0 00252C20 41 82 00 14 */ beq lbl_80255CF4 /* 80255CE4 00252C24 80 7E 00 08 */ lwz r3, 8(r30) -/* 80255CE8 00252C28 48 07 88 61 */ bl JKRHeap_NS_free_X1_ +/* 80255CE8 00252C28 48 07 88 61 */ bl free__7JKRHeapFPv /* 80255CEC 00252C2C 38 00 00 00 */ li r0, 0 /* 80255CF0 00252C30 90 1E 00 1C */ stw r0, 0x1c(r30) lbl_80255CF4: @@ -659,7 +659,7 @@ lbl_80255CF4: /* 80255CF8 00252C38 28 04 00 00 */ cmplwi r4, 0 /* 80255CFC 00252C3C 41 82 00 14 */ beq lbl_80255D10 /* 80255D00 00252C40 80 7E 00 08 */ lwz r3, 8(r30) -/* 80255D04 00252C44 48 07 88 45 */ bl JKRHeap_NS_free_X1_ +/* 80255D04 00252C44 48 07 88 45 */ bl free__7JKRHeapFPv /* 80255D08 00252C48 38 00 00 00 */ li r0, 0 /* 80255D0C 00252C4C 90 1E 00 24 */ stw r0, 0x24(r30) lbl_80255D10: @@ -669,7 +669,7 @@ lbl_80255D10: /* 80255D1C 00252C5C 7F E0 07 35 */ extsh. r0, r31 /* 80255D20 00252C60 40 81 00 0C */ ble lbl_80255D2C /* 80255D24 00252C64 7F C3 F3 78 */ mr r3, r30 -/* 80255D28 00252C68 48 07 90 15 */ bl __dl +/* 80255D28 00252C68 48 07 90 15 */ bl __dl__FPv lbl_80255D2C: /* 80255D2C 00252C6C 7F C3 F3 78 */ mr r3, r30 /* 80255D30 00252C70 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -697,14 +697,14 @@ CPaneMgrAlphaMorf_NS_initiateAlphaMorf: /* 80255D7C 00252CBC 80 7F 00 08 */ lwz r3, 8(r31) /* 80255D80 00252CC0 A8 9F 00 14 */ lha r4, 0x14(r31) /* 80255D84 00252CC4 38 A0 00 20 */ li r5, 0x20 -/* 80255D88 00252CC8 48 07 87 4D */ bl JKRHeap_NS_alloc_X1_ +/* 80255D88 00252CC8 48 07 87 4D */ bl alloc__7JKRHeapFUli /* 80255D8C 00252CCC 90 7F 00 1C */ stw r3, 0x1c(r31) /* 80255D90 00252CD0 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 80255D94 00252CD4 90 1F 00 20 */ stw r0, 0x20(r31) /* 80255D98 00252CD8 80 7F 00 08 */ lwz r3, 8(r31) /* 80255D9C 00252CDC A8 9F 00 14 */ lha r4, 0x14(r31) /* 80255DA0 00252CE0 38 A0 00 20 */ li r5, 0x20 -/* 80255DA4 00252CE4 48 07 87 31 */ bl JKRHeap_NS_alloc_X1_ +/* 80255DA4 00252CE4 48 07 87 31 */ bl alloc__7JKRHeapFUli /* 80255DA8 00252CE8 90 7F 00 24 */ stw r3, 0x24(r31) /* 80255DAC 00252CEC 80 1F 00 24 */ lwz r0, 0x24(r31) /* 80255DB0 00252CF0 90 1F 00 28 */ stw r0, 0x28(r31) diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index dda1528f9f..a1d5880946 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -84,7 +84,7 @@ CPaneMgr_NS_dtor: /* 80253A48 00250988 28 04 00 00 */ cmplwi r4, 0 /* 80253A4C 0025098C 41 82 00 14 */ beq lbl_80253A60 /* 80253A50 00250990 80 7E 00 08 */ lwz r3, 8(r30) -/* 80253A54 00250994 48 07 AA F5 */ bl JKRHeap_NS_free_X1_ +/* 80253A54 00250994 48 07 AA F5 */ bl free__7JKRHeapFPv /* 80253A58 00250998 38 00 00 00 */ li r0, 0 /* 80253A5C 0025099C 90 1E 00 1C */ stw r0, 0x1c(r30) lbl_80253A60: @@ -92,7 +92,7 @@ lbl_80253A60: /* 80253A64 002509A4 28 04 00 00 */ cmplwi r4, 0 /* 80253A68 002509A8 41 82 00 14 */ beq lbl_80253A7C /* 80253A6C 002509AC 80 7E 00 08 */ lwz r3, 8(r30) -/* 80253A70 002509B0 48 07 AA D9 */ bl JKRHeap_NS_free_X1_ +/* 80253A70 002509B0 48 07 AA D9 */ bl free__7JKRHeapFPv /* 80253A74 002509B4 38 00 00 00 */ li r0, 0 /* 80253A78 002509B8 90 1E 00 0C */ stw r0, 0xc(r30) lbl_80253A7C: @@ -102,7 +102,7 @@ lbl_80253A7C: /* 80253A88 002509C8 7F E0 07 35 */ extsh. r0, r31 /* 80253A8C 002509CC 40 81 00 0C */ ble lbl_80253A98 /* 80253A90 002509D0 7F C3 F3 78 */ mr r3, r30 -/* 80253A94 002509D4 48 07 B2 A9 */ bl __dl +/* 80253A94 002509D4 48 07 B2 A9 */ bl __dl__FPv lbl_80253A98: /* 80253A98 002509D8 7F C3 F3 78 */ mr r3, r30 /* 80253A9C 002509DC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -240,7 +240,7 @@ lbl_80253C40: /* 80253C88 00250BC8 A8 1E 00 14 */ lha r0, 0x14(r30) /* 80253C8C 00250BCC 1C 80 00 0C */ mulli r4, r0, 0xc /* 80253C90 00250BD0 38 A0 00 20 */ li r5, 0x20 -/* 80253C94 00250BD4 48 07 A8 41 */ bl JKRHeap_NS_alloc_X1_ +/* 80253C94 00250BD4 48 07 A8 41 */ bl alloc__7JKRHeapFUli /* 80253C98 00250BD8 90 7E 00 1C */ stw r3, 0x1c(r30) /* 80253C9C 00250BDC 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 80253CA0 00250BE0 90 1E 00 20 */ stw r0, 0x20(r30) @@ -256,7 +256,7 @@ lbl_80253CB8: /* 80253CC4 00250C04 80 7E 00 08 */ lwz r3, 8(r30) /* 80253CC8 00250C08 A8 9E 00 14 */ lha r4, 0x14(r30) /* 80253CCC 00250C0C 38 A0 00 20 */ li r5, 0x20 -/* 80253CD0 00250C10 48 07 A8 05 */ bl JKRHeap_NS_alloc_X1_ +/* 80253CD0 00250C10 48 07 A8 05 */ bl alloc__7JKRHeapFUli /* 80253CD4 00250C14 90 7E 00 0C */ stw r3, 0xc(r30) /* 80253CD8 00250C18 80 1E 00 0C */ lwz r0, 0xc(r30) /* 80253CDC 00250C1C 90 1E 00 10 */ stw r0, 0x10(r30) @@ -1709,7 +1709,7 @@ lbl_802551D8: /* 802551D8 00252118 7F 43 D3 78 */ mr r3, r26 /* 802551DC 0025211C 7F 84 E3 78 */ mr r4, r28 /* 802551E0 00252120 38 A0 00 20 */ li r5, 0x20 -/* 802551E4 00252124 48 07 92 F1 */ bl JKRHeap_NS_alloc_X1_ +/* 802551E4 00252124 48 07 92 F1 */ bl alloc__7JKRHeapFUli /* 802551E8 00252128 90 79 00 00 */ stw r3, 0(r25) /* 802551EC 0025212C 7F E3 FB 78 */ mr r3, r31 /* 802551F0 00252130 80 99 00 00 */ lwz r4, 0(r25) @@ -1785,7 +1785,7 @@ lbl_802552FC: /* 802552FC 0025223C 7F E0 07 35 */ extsh. r0, r31 /* 80255300 00252240 40 81 00 0C */ ble lbl_8025530C /* 80255304 00252244 7F C3 F3 78 */ mr r3, r30 -/* 80255308 00252248 48 07 9A 35 */ bl __dl +/* 80255308 00252248 48 07 9A 35 */ bl __dl__FPv lbl_8025530C: /* 8025530C 0025224C 7F C3 F3 78 */ mr r3, r30 /* 80255310 00252250 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1810,7 +1810,7 @@ lbl_8025530C: /* 8025535C 0025229C 7F E0 07 35 */ extsh. r0, r31 /* 80255360 002522A0 40 81 00 0C */ ble lbl_8025536C /* 80255364 002522A4 7F C3 F3 78 */ mr r3, r30 -/* 80255368 002522A8 48 07 99 D5 */ bl __dl +/* 80255368 002522A8 48 07 99 D5 */ bl __dl__FPv lbl_8025536C: /* 8025536C 002522AC 7F C3 F3 78 */ mr r3, r30 /* 80255370 002522B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1830,7 +1830,7 @@ lbl_8025536C: /* 802553A8 002522E8 90 1F 00 00 */ stw r0, 0(r31) /* 802553AC 002522EC 7C 80 07 35 */ extsh. r0, r4 /* 802553B0 002522F0 40 81 00 08 */ ble lbl_802553B8 -/* 802553B4 002522F4 48 07 99 89 */ bl __dl +/* 802553B4 002522F4 48 07 99 89 */ bl __dl__FPv lbl_802553B8: /* 802553B8 002522F8 7F E3 FB 78 */ mr r3, r31 /* 802553BC 002522FC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/s/d_s_logo.s b/asm/d/s/d_s_logo.s index 95ad40b6b3..546f20766f 100644 --- a/asm/d/s/d_s_logo.s +++ b/asm/d/s/d_s_logo.s @@ -18,7 +18,7 @@ dScnLogo_c_NS_preLoad_dyl_create: /* 802560C0 00253000 93 E1 00 0C */ stw r31, 0xc(r1) /* 802560C4 00253004 7C 7F 1B 78 */ mr r31, r3 /* 802560C8 00253008 38 60 00 70 */ li r3, 0x70 -/* 802560CC 0025300C 48 07 8B F9 */ bl __nwa +/* 802560CC 0025300C 48 07 8B F9 */ bl __nwa__FUl /* 802560D0 00253010 90 7F 01 FC */ stw r3, 0x1fc(r31) /* 802560D4 00253014 80 7F 01 FC */ lwz r3, 0x1fc(r31) /* 802560D8 00253018 38 80 00 00 */ li r4, 0 @@ -36,7 +36,7 @@ dScnLogo_c_NS_preLoad_dyl_remove: /* 802560FC 0025303C 7C 08 02 A6 */ mflr r0 /* 80256100 00253040 90 01 00 14 */ stw r0, 0x14(r1) /* 80256104 00253044 80 63 01 FC */ lwz r3, 0x1fc(r3) -/* 80256108 00253048 48 07 8C 59 */ bl __dla +/* 80256108 00253048 48 07 8C 59 */ bl __dla__FPv /* 8025610C 0025304C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80256110 00253050 7C 08 03 A6 */ mtlr r0 /* 80256114 00253054 38 21 00 10 */ addi r1, r1, 0x10 @@ -1266,7 +1266,7 @@ lbl_80257314: /* 80257330 00254270 38 80 FF FF */ li r4, -1 /* 80257334 00254274 48 0A 5C BD */ bl J2DPicture_NS_dtor /* 80257338 00254278 7F 83 E3 78 */ mr r3, r28 -/* 8025733C 0025427C 48 07 7A 01 */ bl __dl +/* 8025733C 0025427C 48 07 7A 01 */ bl __dl__FPv lbl_80257340: /* 80257340 00254280 83 9F 01 DC */ lwz r28, 0x1dc(r31) /* 80257344 00254284 28 1C 00 00 */ cmplwi r28, 0 @@ -1278,7 +1278,7 @@ lbl_80257340: /* 8025735C 0025429C 38 80 FF FF */ li r4, -1 /* 80257360 002542A0 48 0A 5C 91 */ bl J2DPicture_NS_dtor /* 80257364 002542A4 7F 83 E3 78 */ mr r3, r28 -/* 80257368 002542A8 48 07 79 D5 */ bl __dl +/* 80257368 002542A8 48 07 79 D5 */ bl __dl__FPv lbl_8025736C: /* 8025736C 002542AC 83 9F 01 E0 */ lwz r28, 0x1e0(r31) /* 80257370 002542B0 28 1C 00 00 */ cmplwi r28, 0 @@ -1290,7 +1290,7 @@ lbl_8025736C: /* 80257388 002542C8 38 80 FF FF */ li r4, -1 /* 8025738C 002542CC 48 0A 5C 65 */ bl J2DPicture_NS_dtor /* 80257390 002542D0 7F 83 E3 78 */ mr r3, r28 -/* 80257394 002542D4 48 07 79 A9 */ bl __dl +/* 80257394 002542D4 48 07 79 A9 */ bl __dl__FPv lbl_80257398: /* 80257398 002542D8 83 9F 01 E8 */ lwz r28, 0x1e8(r31) /* 8025739C 002542DC 28 1C 00 00 */ cmplwi r28, 0 @@ -1302,7 +1302,7 @@ lbl_80257398: /* 802573B4 002542F4 38 80 FF FF */ li r4, -1 /* 802573B8 002542F8 48 0A 5C 39 */ bl J2DPicture_NS_dtor /* 802573BC 002542FC 7F 83 E3 78 */ mr r3, r28 -/* 802573C0 00254300 48 07 79 7D */ bl __dl +/* 802573C0 00254300 48 07 79 7D */ bl __dl__FPv lbl_802573C4: /* 802573C4 00254304 83 9F 01 EC */ lwz r28, 0x1ec(r31) /* 802573C8 00254308 28 1C 00 00 */ cmplwi r28, 0 @@ -1314,7 +1314,7 @@ lbl_802573C4: /* 802573E0 00254320 38 80 FF FF */ li r4, -1 /* 802573E4 00254324 48 0A 5C 0D */ bl J2DPicture_NS_dtor /* 802573E8 00254328 7F 83 E3 78 */ mr r3, r28 -/* 802573EC 0025432C 48 07 79 51 */ bl __dl +/* 802573EC 0025432C 48 07 79 51 */ bl __dl__FPv lbl_802573F0: /* 802573F0 00254330 83 9F 01 F0 */ lwz r28, 0x1f0(r31) /* 802573F4 00254334 28 1C 00 00 */ cmplwi r28, 0 @@ -1326,7 +1326,7 @@ lbl_802573F0: /* 8025740C 0025434C 38 80 FF FF */ li r4, -1 /* 80257410 00254350 48 0A 5B E1 */ bl J2DPicture_NS_dtor /* 80257414 00254354 7F 83 E3 78 */ mr r3, r28 -/* 80257418 00254358 48 07 79 25 */ bl __dl +/* 80257418 00254358 48 07 79 25 */ bl __dl__FPv lbl_8025741C: /* 8025741C 0025435C 83 9F 01 F4 */ lwz r28, 0x1f4(r31) /* 80257420 00254360 28 1C 00 00 */ cmplwi r28, 0 @@ -1338,7 +1338,7 @@ lbl_8025741C: /* 80257438 00254378 38 80 FF FF */ li r4, -1 /* 8025743C 0025437C 48 0A 5B B5 */ bl J2DPicture_NS_dtor /* 80257440 00254380 7F 83 E3 78 */ mr r3, r28 -/* 80257444 00254384 48 07 78 F9 */ bl __dl +/* 80257444 00254384 48 07 78 F9 */ bl __dl__FPv lbl_80257448: /* 80257448 00254388 83 9F 01 F8 */ lwz r28, 0x1f8(r31) /* 8025744C 0025438C 28 1C 00 00 */ cmplwi r28, 0 @@ -1350,7 +1350,7 @@ lbl_80257448: /* 80257464 002543A4 38 80 FF FF */ li r4, -1 /* 80257468 002543A8 48 0A 5B 89 */ bl J2DPicture_NS_dtor /* 8025746C 002543AC 7F 83 E3 78 */ mr r3, r28 -/* 80257470 002543B0 48 07 78 CD */ bl __dl +/* 80257470 002543B0 48 07 78 CD */ bl __dl__FPv lbl_80257474: /* 80257474 002543B4 7F E3 FB 78 */ mr r3, r31 /* 80257478 002543B8 4B FF EC 81 */ bl dScnLogo_c_NS_preLoad_dyl_remove @@ -1364,12 +1364,12 @@ lbl_80257474: /* 80257498 002543D8 38 A0 00 80 */ li r5, 0x80 /* 8025749C 002543DC 4B DE 4C F9 */ bl dRes_control_c_NS_deleteRes /* 802574A0 002543E0 80 7F 01 D4 */ lwz r3, 0x1d4(r31) -/* 802574A4 002543E4 48 07 6F A5 */ bl JKRHeap_NS_destroy +/* 802574A4 002543E4 48 07 6F A5 */ bl destroy__7JKRHeapFv /* 802574A8 002543E8 80 7F 01 D0 */ lwz r3, 0x1d0(r31) -/* 802574AC 002543EC 48 07 6F 9D */ bl JKRHeap_NS_destroy +/* 802574AC 002543EC 48 07 6F 9D */ bl destroy__7JKRHeapFv /* 802574B0 002543F0 80 7F 02 1C */ lwz r3, 0x21c(r31) /* 802574B4 002543F4 38 80 00 00 */ li r4, 0 -/* 802574B8 002543F8 48 07 70 49 */ bl JKRHeap_NS_free +/* 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 @@ -1661,7 +1661,7 @@ lbl_802578BC: /* 802578E4 00254824 7F A0 07 35 */ extsh. r0, r29 /* 802578E8 00254828 40 81 00 0C */ ble lbl_802578F4 /* 802578EC 0025482C 7F E3 FB 78 */ mr r3, r31 -/* 802578F0 00254830 48 07 74 4D */ bl __dl +/* 802578F0 00254830 48 07 74 4D */ bl __dl__FPv lbl_802578F4: /* 802578F4 00254834 7F E3 FB 78 */ mr r3, r31 /* 802578F8 00254838 39 61 00 20 */ addi r11, r1, 0x20 @@ -1694,7 +1694,7 @@ lbl_802578F4: /* 80257964 002548A4 4B DB 73 ED */ bl mDoExt_getGameHeap /* 80257968 002548A8 3C 80 00 34 */ lis r4, 0x34 /* 8025796C 002548AC 38 A0 FF F0 */ li r5, -16 -/* 80257970 002548B0 48 07 6B 65 */ bl JKRHeap_NS_alloc_X1_ +/* 80257970 002548B0 48 07 6B 65 */ bl alloc__7JKRHeapFUli /* 80257974 002548B4 90 7F 02 1C */ stw r3, 0x21c(r31) /* 80257978 002548B8 80 7F 02 1C */ lwz r3, 0x21c(r31) /* 8025797C 002548BC 3C 80 00 34 */ lis r4, 0x34 @@ -1816,7 +1816,7 @@ lbl_80257B14: /* 80257B20 00254A60 7F C3 F3 78 */ mr r3, r30 /* 80257B24 00254A64 48 00 01 41 */ bl dScnLogo_c_NS_logoInitGC /* 80257B28 00254A68 80 7E 01 D8 */ lwz r3, 0x1d8(r30) -/* 80257B2C 00254A6C 48 07 69 0D */ bl JKRHeap_NS_becomeCurrentHeap +/* 80257B2C 00254A6C 48 07 69 0D */ bl becomeCurrentHeap__7JKRHeapFv /* 80257B30 00254A70 7F C3 F3 78 */ mr r3, r30 /* 80257B34 00254A74 48 00 04 B9 */ bl dScnLogo_c_NS_dvdDataLoad /* 80257B38 00254A78 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1923,7 +1923,7 @@ dScnLogo_c_NS_logoInitGC: /* 80257CA0 00254BE0 4B DE 46 4D */ bl dRes_control_c_NS_getRes /* 80257CA4 00254BE4 7C 7D 1B 78 */ mr r29, r3 /* 80257CA8 00254BE8 38 60 01 68 */ li r3, 0x168 -/* 80257CAC 00254BEC 48 07 6F A1 */ bl __nw +/* 80257CAC 00254BEC 48 07 6F A1 */ bl __nw__FUl /* 80257CB0 00254BF0 7C 60 1B 79 */ or. r0, r3, r3 /* 80257CB4 00254BF4 41 82 00 24 */ beq lbl_80257CD8 /* 80257CB8 00254BF8 7F A4 EB 78 */ mr r4, r29 @@ -1959,7 +1959,7 @@ lbl_80257CD8: /* 80257D2C 00254C6C 4B DE 45 C1 */ bl dRes_control_c_NS_getRes /* 80257D30 00254C70 7C 7D 1B 78 */ mr r29, r3 /* 80257D34 00254C74 38 60 01 68 */ li r3, 0x168 -/* 80257D38 00254C78 48 07 6F 15 */ bl __nw +/* 80257D38 00254C78 48 07 6F 15 */ bl __nw__FUl /* 80257D3C 00254C7C 7C 60 1B 79 */ or. r0, r3, r3 /* 80257D40 00254C80 41 82 00 24 */ beq lbl_80257D64 /* 80257D44 00254C84 7F A4 EB 78 */ mr r4, r29 @@ -1980,7 +1980,7 @@ lbl_80257D64: /* 80257D7C 00254CBC 4B DE 45 71 */ bl dRes_control_c_NS_getRes /* 80257D80 00254CC0 7C 7D 1B 78 */ mr r29, r3 /* 80257D84 00254CC4 38 60 01 68 */ li r3, 0x168 -/* 80257D88 00254CC8 48 07 6E C5 */ bl __nw +/* 80257D88 00254CC8 48 07 6E C5 */ bl __nw__FUl /* 80257D8C 00254CCC 7C 60 1B 79 */ or. r0, r3, r3 /* 80257D90 00254CD0 41 82 00 24 */ beq lbl_80257DB4 /* 80257D94 00254CD4 7F A4 EB 78 */ mr r4, r29 @@ -2001,7 +2001,7 @@ lbl_80257DB4: /* 80257DCC 00254D0C 4B DE 45 21 */ bl dRes_control_c_NS_getRes /* 80257DD0 00254D10 7C 7D 1B 78 */ mr r29, r3 /* 80257DD4 00254D14 38 60 01 68 */ li r3, 0x168 -/* 80257DD8 00254D18 48 07 6E 75 */ bl __nw +/* 80257DD8 00254D18 48 07 6E 75 */ bl __nw__FUl /* 80257DDC 00254D1C 7C 60 1B 79 */ or. r0, r3, r3 /* 80257DE0 00254D20 41 82 00 24 */ beq lbl_80257E04 /* 80257DE4 00254D24 7F A4 EB 78 */ mr r4, r29 @@ -2022,7 +2022,7 @@ lbl_80257E04: /* 80257E1C 00254D5C 4B DE 44 D1 */ bl dRes_control_c_NS_getRes /* 80257E20 00254D60 7C 7D 1B 78 */ mr r29, r3 /* 80257E24 00254D64 38 60 01 68 */ li r3, 0x168 -/* 80257E28 00254D68 48 07 6E 25 */ bl __nw +/* 80257E28 00254D68 48 07 6E 25 */ bl __nw__FUl /* 80257E2C 00254D6C 7C 60 1B 79 */ or. r0, r3, r3 /* 80257E30 00254D70 41 82 00 24 */ beq lbl_80257E54 /* 80257E34 00254D74 7F A4 EB 78 */ mr r4, r29 @@ -2043,7 +2043,7 @@ lbl_80257E54: /* 80257E6C 00254DAC 4B DE 44 81 */ bl dRes_control_c_NS_getRes /* 80257E70 00254DB0 7C 7D 1B 78 */ mr r29, r3 /* 80257E74 00254DB4 38 60 01 68 */ li r3, 0x168 -/* 80257E78 00254DB8 48 07 6D D5 */ bl __nw +/* 80257E78 00254DB8 48 07 6D D5 */ bl __nw__FUl /* 80257E7C 00254DBC 7C 60 1B 79 */ or. r0, r3, r3 /* 80257E80 00254DC0 41 82 00 24 */ beq lbl_80257EA4 /* 80257E84 00254DC4 7F A4 EB 78 */ mr r4, r29 @@ -2078,7 +2078,7 @@ lbl_80257EA4: /* 80257EF4 00254E34 4B DE 43 F9 */ bl dRes_control_c_NS_getRes /* 80257EF8 00254E38 7C 7D 1B 78 */ mr r29, r3 /* 80257EFC 00254E3C 38 60 01 68 */ li r3, 0x168 -/* 80257F00 00254E40 48 07 6D 4D */ bl __nw +/* 80257F00 00254E40 48 07 6D 4D */ bl __nw__FUl /* 80257F04 00254E44 7C 60 1B 79 */ or. r0, r3, r3 /* 80257F08 00254E48 41 82 00 24 */ beq lbl_80257F2C /* 80257F0C 00254E4C 7F A4 EB 78 */ mr r4, r29 @@ -2120,7 +2120,7 @@ lbl_80257F2C: /* 80257F98 00254ED8 4B DE 43 55 */ bl dRes_control_c_NS_getRes /* 80257F9C 00254EDC 90 7F 02 04 */ stw r3, 0x204(r31) /* 80257FA0 00254EE0 38 60 01 68 */ li r3, 0x168 -/* 80257FA4 00254EE4 48 07 6C A9 */ bl __nw +/* 80257FA4 00254EE4 48 07 6C A9 */ bl __nw__FUl /* 80257FA8 00254EE8 7C 60 1B 79 */ or. r0, r3, r3 /* 80257FAC 00254EEC 41 82 00 24 */ beq lbl_80257FD0 /* 80257FB0 00254EF0 80 9F 02 00 */ lwz r4, 0x200(r31) @@ -2516,7 +2516,7 @@ dLog_HIO_c_NS_dtor: /* 8025857C 002554BC 90 1F 00 00 */ stw r0, 0(r31) /* 80258580 002554C0 7C 80 07 35 */ extsh. r0, r4 /* 80258584 002554C4 40 81 00 08 */ ble lbl_8025858C -/* 80258588 002554C8 48 07 67 B5 */ bl __dl +/* 80258588 002554C8 48 07 67 B5 */ bl __dl__FPv lbl_8025858C: /* 8025858C 002554CC 7F E3 FB 78 */ mr r3, r31 /* 80258590 002554D0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index c2e911d9eb..b4382f67e9 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -121,7 +121,7 @@ dScnName_c_NS_create: /* 8025892C 0025586C 4B DE 38 B9 */ bl dRes_control_c_NS_getResInfo /* 80258930 00255870 7C 7F 1B 78 */ mr r31, r3 /* 80258934 00255874 38 60 23 7C */ li r3, 0x237c -/* 80258938 00255878 48 07 63 15 */ bl __nw +/* 80258938 00255878 48 07 63 15 */ bl __nw__FUl /* 8025893C 0025587C 7C 60 1B 79 */ or. r0, r3, r3 /* 80258940 00255880 41 82 00 10 */ beq lbl_80258950 /* 80258944 00255884 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -142,7 +142,7 @@ lbl_80258950: /* 8025897C 002558BC 98 03 0F 1A */ stb r0, 0xf1a(r3) lbl_80258980: /* 80258980 002558C0 38 60 00 1C */ li r3, 0x1c -/* 80258984 002558C4 48 07 62 C9 */ bl __nw +/* 80258984 002558C4 48 07 62 C9 */ bl __nw__FUl /* 80258988 002558C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8025898C 002558CC 41 82 00 10 */ beq lbl_8025899C /* 80258990 002558D0 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -156,7 +156,7 @@ lbl_8025899C: /* 802589AC 002558EC 38 6D 8B 70 */ addi r3, r13, lbl_804510F0-_SDA_BASE_ /* 802589B0 002558F0 98 03 00 04 */ stb r0, 4(r3) /* 802589B4 002558F4 80 7D 01 D0 */ lwz r3, 0x1d0(r29) -/* 802589B8 002558F8 48 07 5A 81 */ bl JKRHeap_NS_becomeCurrentHeap +/* 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 @@ -407,7 +407,7 @@ lbl_80258D28: /* 80258D44 00255C84 38 84 C2 F8 */ addi r4, r4, -15624 /* 80258D48 00255C88 4B DE 34 4D */ bl dRes_control_c_NS_deleteRes /* 80258D4C 00255C8C 80 7F 01 CC */ lwz r3, 0x1cc(r31) -/* 80258D50 00255C90 48 07 56 F9 */ bl JKRHeap_NS_destroy +/* 80258D50 00255C90 48 07 56 F9 */ bl destroy__7JKRHeapFv /* 80258D54 00255C94 3B A0 00 00 */ li r29, 0 /* 80258D58 00255C98 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80258D5C 00255C9C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l @@ -433,7 +433,7 @@ lbl_80258DA4: /* 80258DA4 00255CE4 7F 80 07 35 */ extsh. r0, r28 /* 80258DA8 00255CE8 40 81 00 0C */ ble lbl_80258DB4 /* 80258DAC 00255CEC 7F E3 FB 78 */ mr r3, r31 -/* 80258DB0 00255CF0 48 07 5F 8D */ bl __dl +/* 80258DB0 00255CF0 48 07 5F 8D */ bl __dl__FPv lbl_80258DB4: /* 80258DB4 00255CF4 7F E3 FB 78 */ mr r3, r31 /* 80258DB8 00255CF8 39 61 00 20 */ addi r11, r1, 0x20 @@ -773,7 +773,7 @@ lbl_80259280: /* 802592B4 002561F4 90 1F 02 3C */ stw r0, 0x23c(r31) /* 802592B8 002561F8 7C 80 07 35 */ extsh. r0, r4 /* 802592BC 002561FC 40 81 00 08 */ ble lbl_802592C4 -/* 802592C0 00256200 48 07 5A 7D */ bl __dl +/* 802592C0 00256200 48 07 5A 7D */ bl __dl__FPv lbl_802592C4: /* 802592C4 00256204 7F E3 FB 78 */ mr r3, r31 /* 802592C8 00256208 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -794,7 +794,7 @@ dSn_HIO_c_NS_dtor: /* 802592FC 0025623C 90 1F 00 00 */ stw r0, 0(r31) /* 80259300 00256240 7C 80 07 35 */ extsh. r0, r4 /* 80259304 00256244 40 81 00 08 */ ble lbl_8025930C -/* 80259308 00256248 48 07 5A 35 */ bl __dl +/* 80259308 00256248 48 07 5A 35 */ bl __dl__FPv lbl_8025930C: /* 8025930C 0025624C 7F E3 FB 78 */ mr r3, r31 /* 80259310 00256250 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 7510af04ad..76e5831622 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -1653,7 +1653,7 @@ lbl_8025AB74: /* 8025ABE4 00257B24 90 1F 00 00 */ stw r0, 0(r31) /* 8025ABE8 00257B28 7C 80 07 35 */ extsh. r0, r4 /* 8025ABEC 00257B2C 40 81 00 08 */ ble lbl_8025ABF4 -/* 8025ABF0 00257B30 48 07 41 4D */ bl __dl +/* 8025ABF0 00257B30 48 07 41 4D */ bl __dl__FPv lbl_8025ABF4: /* 8025ABF4 00257B34 7F E3 FB 78 */ mr r3, r31 /* 8025ABF8 00257B38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1672,7 +1672,7 @@ lbl_8025ABF4: /* 8025AC2C 00257B6C 90 1F 00 00 */ stw r0, 0(r31) /* 8025AC30 00257B70 7C 80 07 35 */ extsh. r0, r4 /* 8025AC34 00257B74 40 81 00 08 */ ble lbl_8025AC3C -/* 8025AC38 00257B78 48 07 41 05 */ bl __dl +/* 8025AC38 00257B78 48 07 41 05 */ bl __dl__FPv lbl_8025AC3C: /* 8025AC3C 00257B7C 7F E3 FB 78 */ mr r3, r31 /* 8025AC40 00257B80 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1756,7 +1756,7 @@ lbl_8025AD50: /* 8025AD50 00257C90 7C 80 07 35 */ extsh. r0, r4 /* 8025AD54 00257C94 40 81 00 0C */ ble lbl_8025AD60 /* 8025AD58 00257C98 7F E3 FB 78 */ mr r3, r31 -/* 8025AD5C 00257C9C 48 07 3F E1 */ bl __dl +/* 8025AD5C 00257C9C 48 07 3F E1 */ bl __dl__FPv lbl_8025AD60: /* 8025AD60 00257CA0 7F E3 FB 78 */ mr r3, r31 /* 8025AD64 00257CA4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1777,7 +1777,7 @@ dScnPly_reg_HIO_c_NS_dtor: /* 8025AD98 00257CD8 90 1F 00 00 */ stw r0, 0(r31) /* 8025AD9C 00257CDC 7C 80 07 35 */ extsh. r0, r4 /* 8025ADA0 00257CE0 40 81 00 08 */ ble lbl_8025ADA8 -/* 8025ADA4 00257CE4 48 07 3F 99 */ bl __dl +/* 8025ADA4 00257CE4 48 07 3F 99 */ bl __dl__FPv lbl_8025ADA8: /* 8025ADA8 00257CE8 7F E3 FB 78 */ mr r3, r31 /* 8025ADAC 00257CEC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1804,7 +1804,7 @@ lbl_8025ADF4: /* 8025ADF4 00257D34 7C 80 07 35 */ extsh. r0, r4 /* 8025ADF8 00257D38 40 81 00 0C */ ble lbl_8025AE04 /* 8025ADFC 00257D3C 7F E3 FB 78 */ mr r3, r31 -/* 8025AE00 00257D40 48 07 3F 3D */ bl __dl +/* 8025AE00 00257D40 48 07 3F 3D */ bl __dl__FPv lbl_8025AE04: /* 8025AE04 00257D44 7F E3 FB 78 */ mr r3, r31 /* 8025AE08 00257D48 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index c910d2afa5..e91ec4174b 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -730,7 +730,7 @@ lbl_8025B7F8: /* 8025B81C 0025875C 4B DC 8B 95 */ bl dStage_roomControl_c_NS_getMemoryBlock /* 8025B820 00258760 28 03 00 00 */ cmplwi r3, 0 /* 8025B824 00258764 41 82 00 08 */ beq lbl_8025B82C -/* 8025B828 00258768 48 07 2D A5 */ bl JKRHeap_NS_freeAll +/* 8025B828 00258768 48 07 2D A5 */ bl freeAll__7JKRHeapFv lbl_8025B82C: /* 8025B82C 0025876C 7F 83 E3 78 */ mr r3, r28 /* 8025B830 00258770 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index d4fe924082..594dead53c 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -521,7 +521,7 @@ dSvBit_HIO_c_NS_init: /* 8025C2BC 002591FC 90 1F 00 00 */ stw r0, 0(r31) /* 8025C2C0 00259200 7C 80 07 35 */ extsh. r0, r4 /* 8025C2C4 00259204 40 81 00 08 */ ble lbl_8025C2CC -/* 8025C2C8 00259208 48 07 2A 75 */ bl __dl +/* 8025C2C8 00259208 48 07 2A 75 */ bl __dl__FPv lbl_8025C2CC: /* 8025C2CC 0025920C 7F E3 FB 78 */ mr r3, r31 /* 8025C2D0 00259210 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -540,7 +540,7 @@ lbl_8025C2CC: /* 8025C304 00259244 90 1F 00 00 */ stw r0, 0(r31) /* 8025C308 00259248 7C 80 07 35 */ extsh. r0, r4 /* 8025C30C 0025924C 40 81 00 08 */ ble lbl_8025C314 -/* 8025C310 00259250 48 07 2A 2D */ bl __dl +/* 8025C310 00259250 48 07 2A 2D */ bl __dl__FPv lbl_8025C314: /* 8025C314 00259254 7F E3 FB 78 */ mr r3, r31 /* 8025C318 00259258 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -559,7 +559,7 @@ lbl_8025C314: /* 8025C34C 0025928C 90 1F 00 00 */ stw r0, 0(r31) /* 8025C350 00259290 7C 80 07 35 */ extsh. r0, r4 /* 8025C354 00259294 40 81 00 08 */ ble lbl_8025C35C -/* 8025C358 00259298 48 07 29 E5 */ bl __dl +/* 8025C358 00259298 48 07 29 E5 */ bl __dl__FPv lbl_8025C35C: /* 8025C35C 0025929C 7F E3 FB 78 */ mr r3, r31 /* 8025C360 002592A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -578,7 +578,7 @@ lbl_8025C35C: /* 8025C394 002592D4 90 1F 00 00 */ stw r0, 0(r31) /* 8025C398 002592D8 7C 80 07 35 */ extsh. r0, r4 /* 8025C39C 002592DC 40 81 00 08 */ ble lbl_8025C3A4 -/* 8025C3A0 002592E0 48 07 29 9D */ bl __dl +/* 8025C3A0 002592E0 48 07 29 9D */ bl __dl__FPv lbl_8025C3A4: /* 8025C3A4 002592E4 7F E3 FB 78 */ mr r3, r31 /* 8025C3A8 002592E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -597,7 +597,7 @@ lbl_8025C3A4: /* 8025C3DC 0025931C 90 1F 00 00 */ stw r0, 0(r31) /* 8025C3E0 00259320 7C 80 07 35 */ extsh. r0, r4 /* 8025C3E4 00259324 40 81 00 08 */ ble lbl_8025C3EC -/* 8025C3E8 00259328 48 07 29 55 */ bl __dl +/* 8025C3E8 00259328 48 07 29 55 */ bl __dl__FPv lbl_8025C3EC: /* 8025C3EC 0025932C 7F E3 FB 78 */ mr r3, r31 /* 8025C3F0 00259330 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -616,7 +616,7 @@ lbl_8025C3EC: /* 8025C424 00259364 90 1F 00 00 */ stw r0, 0(r31) /* 8025C428 00259368 7C 80 07 35 */ extsh. r0, r4 /* 8025C42C 0025936C 40 81 00 08 */ ble lbl_8025C434 -/* 8025C430 00259370 48 07 29 0D */ bl __dl +/* 8025C430 00259370 48 07 29 0D */ bl __dl__FPv lbl_8025C434: /* 8025C434 00259374 7F E3 FB 78 */ mr r3, r31 /* 8025C438 00259378 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -635,7 +635,7 @@ lbl_8025C434: /* 8025C46C 002593AC 90 1F 00 00 */ stw r0, 0(r31) /* 8025C470 002593B0 7C 80 07 35 */ extsh. r0, r4 /* 8025C474 002593B4 40 81 00 08 */ ble lbl_8025C47C -/* 8025C478 002593B8 48 07 28 C5 */ bl __dl +/* 8025C478 002593B8 48 07 28 C5 */ bl __dl__FPv lbl_8025C47C: /* 8025C47C 002593BC 7F E3 FB 78 */ mr r3, r31 /* 8025C480 002593C0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -654,7 +654,7 @@ lbl_8025C47C: /* 8025C4B4 002593F4 90 1F 00 00 */ stw r0, 0(r31) /* 8025C4B8 002593F8 7C 80 07 35 */ extsh. r0, r4 /* 8025C4BC 002593FC 40 81 00 08 */ ble lbl_8025C4C4 -/* 8025C4C0 00259400 48 07 28 7D */ bl __dl +/* 8025C4C0 00259400 48 07 28 7D */ bl __dl__FPv lbl_8025C4C4: /* 8025C4C4 00259404 7F E3 FB 78 */ mr r3, r31 /* 8025C4C8 00259408 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -673,7 +673,7 @@ lbl_8025C4C4: /* 8025C4FC 0025943C 90 1F 00 00 */ stw r0, 0(r31) /* 8025C500 00259440 7C 80 07 35 */ extsh. r0, r4 /* 8025C504 00259444 40 81 00 08 */ ble lbl_8025C50C -/* 8025C508 00259448 48 07 28 35 */ bl __dl +/* 8025C508 00259448 48 07 28 35 */ bl __dl__FPv lbl_8025C50C: /* 8025C50C 0025944C 7F E3 FB 78 */ mr r3, r31 /* 8025C510 00259450 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -692,7 +692,7 @@ lbl_8025C50C: /* 8025C544 00259484 90 1F 00 00 */ stw r0, 0(r31) /* 8025C548 00259488 7C 80 07 35 */ extsh. r0, r4 /* 8025C54C 0025948C 40 81 00 08 */ ble lbl_8025C554 -/* 8025C550 00259490 48 07 27 ED */ bl __dl +/* 8025C550 00259490 48 07 27 ED */ bl __dl__FPv lbl_8025C554: /* 8025C554 00259494 7F E3 FB 78 */ mr r3, r31 /* 8025C558 00259498 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -711,7 +711,7 @@ lbl_8025C554: /* 8025C58C 002594CC 90 1F 00 00 */ stw r0, 0(r31) /* 8025C590 002594D0 7C 80 07 35 */ extsh. r0, r4 /* 8025C594 002594D4 40 81 00 08 */ ble lbl_8025C59C -/* 8025C598 002594D8 48 07 27 A5 */ bl __dl +/* 8025C598 002594D8 48 07 27 A5 */ bl __dl__FPv lbl_8025C59C: /* 8025C59C 002594DC 7F E3 FB 78 */ mr r3, r31 /* 8025C5A0 002594E0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -730,7 +730,7 @@ lbl_8025C59C: /* 8025C5D4 00259514 90 1F 00 00 */ stw r0, 0(r31) /* 8025C5D8 00259518 7C 80 07 35 */ extsh. r0, r4 /* 8025C5DC 0025951C 40 81 00 08 */ ble lbl_8025C5E4 -/* 8025C5E0 00259520 48 07 27 5D */ bl __dl +/* 8025C5E0 00259520 48 07 27 5D */ bl __dl__FPv lbl_8025C5E4: /* 8025C5E4 00259524 7F E3 FB 78 */ mr r3, r31 /* 8025C5E8 00259528 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -905,7 +905,7 @@ lbl_8025C84C: /* 8025C84C 0025978C 7C 80 07 35 */ extsh. r0, r4 /* 8025C850 00259790 40 81 00 0C */ ble lbl_8025C85C /* 8025C854 00259794 7F E3 FB 78 */ mr r3, r31 -/* 8025C858 00259798 48 07 24 E5 */ bl __dl +/* 8025C858 00259798 48 07 24 E5 */ bl __dl__FPv lbl_8025C85C: /* 8025C85C 0025979C 7F E3 FB 78 */ mr r3, r31 /* 8025C860 002597A0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -931,7 +931,7 @@ lbl_8025C8AC: /* 8025C8AC 002597EC 7C 80 07 35 */ extsh. r0, r4 /* 8025C8B0 002597F0 40 81 00 0C */ ble lbl_8025C8BC /* 8025C8B4 002597F4 7F E3 FB 78 */ mr r3, r31 -/* 8025C8B8 002597F8 48 07 24 85 */ bl __dl +/* 8025C8B8 002597F8 48 07 24 85 */ bl __dl__FPv lbl_8025C8BC: /* 8025C8BC 002597FC 7F E3 FB 78 */ mr r3, r31 /* 8025C8C0 00259800 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -975,7 +975,7 @@ lbl_8025C948: /* 8025C948 00259888 7C 80 07 35 */ extsh. r0, r4 /* 8025C94C 0025988C 40 81 00 0C */ ble lbl_8025C958 /* 8025C950 00259890 7F E3 FB 78 */ mr r3, r31 -/* 8025C954 00259894 48 07 23 E9 */ bl __dl +/* 8025C954 00259894 48 07 23 E9 */ bl __dl__FPv lbl_8025C958: /* 8025C958 00259898 7F E3 FB 78 */ mr r3, r31 /* 8025C95C 0025989C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1019,7 +1019,7 @@ lbl_8025C9E4: /* 8025C9E4 00259924 7C 80 07 35 */ extsh. r0, r4 /* 8025C9E8 00259928 40 81 00 0C */ ble lbl_8025C9F4 /* 8025C9EC 0025992C 7F E3 FB 78 */ mr r3, r31 -/* 8025C9F0 00259930 48 07 23 4D */ bl __dl +/* 8025C9F0 00259930 48 07 23 4D */ bl __dl__FPv lbl_8025C9F4: /* 8025C9F4 00259934 7F E3 FB 78 */ mr r3, r31 /* 8025C9F8 00259938 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 75fcc06957..ac44e7b11d 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -43,7 +43,7 @@ dSelect_cursor_c: /* 80194264 001911A4 38 04 B7 8C */ addi r0, r4, lbl_803BB78C@l /* 80194268 001911A8 90 03 00 00 */ stw r0, 0(r3) /* 8019426C 001911AC 38 60 00 28 */ li r3, 0x28 -/* 80194270 001911B0 48 13 A9 DD */ bl __nw +/* 80194270 001911B0 48 13 A9 DD */ bl __nw__FUl /* 80194274 001911B4 7C 60 1B 79 */ or. r0, r3, r3 /* 80194278 001911B8 41 82 00 0C */ beq lbl_80194284 /* 8019427C 001911BC 4B FF FF 69 */ bl dSelect_cursorHIO_c @@ -117,7 +117,7 @@ lbl_80194360: /* 80194370 001912B0 83 A4 5D 30 */ lwz r29, 0x5d30(r4) lbl_80194374: /* 80194374 001912B4 38 60 01 18 */ li r3, 0x118 -/* 80194378 001912B8 48 13 A8 D5 */ bl __nw +/* 80194378 001912B8 48 13 A8 D5 */ bl __nw__FUl /* 8019437C 001912BC 7C 60 1B 79 */ or. r0, r3, r3 /* 80194380 001912C0 41 82 00 0C */ beq lbl_8019438C /* 80194384 001912C4 48 16 41 15 */ bl J2DScreen @@ -157,7 +157,7 @@ lbl_801943F8: /* 80194400 00191340 48 00 02 BC */ b lbl_801946BC lbl_80194404: /* 80194404 00191344 38 60 00 6C */ li r3, 0x6c -/* 80194408 00191348 48 13 A8 45 */ bl __nw +/* 80194408 00191348 48 13 A8 45 */ bl __nw__FUl /* 8019440C 0019134C 7C 60 1B 79 */ or. r0, r3, r3 /* 80194410 00191350 41 82 00 24 */ beq lbl_80194434 /* 80194414 00191354 80 9F 00 04 */ lwz r4, 4(r31) @@ -185,7 +185,7 @@ lbl_80194434: /* 80194468 001913A8 3B 44 4A 10 */ addi r26, r4, lbl_80394A10@l lbl_8019446C: /* 8019446C 001913AC 38 60 00 6C */ li r3, 0x6c -/* 80194470 001913B0 48 13 A7 DD */ bl __nw +/* 80194470 001913B0 48 13 A7 DD */ bl __nw__FUl /* 80194474 001913B4 7C 60 1B 79 */ or. r0, r3, r3 /* 80194478 001913B8 41 82 00 2C */ beq lbl_801944A4 /* 8019447C 001913BC 80 9F 00 04 */ lwz r4, 4(r31) @@ -243,7 +243,7 @@ lbl_801944A4: /* 80194548 00191488 48 00 01 F4 */ b lbl_8019473C lbl_8019454C: /* 8019454C 0019148C 38 60 00 6C */ li r3, 0x6c -/* 80194550 00191490 48 13 A6 FD */ bl __nw +/* 80194550 00191490 48 13 A6 FD */ bl __nw__FUl /* 80194554 00191494 7C 60 1B 79 */ or. r0, r3, r3 /* 80194558 00191498 41 82 00 24 */ beq lbl_8019457C /* 8019455C 0019149C 80 9F 00 04 */ lwz r4, 4(r31) @@ -273,7 +273,7 @@ lbl_8019457C: /* 801945B8 001914F8 7D 89 03 A6 */ mtctr r12 /* 801945BC 001914FC 4E 80 04 21 */ bctrl /* 801945C0 00191500 38 60 00 6C */ li r3, 0x6c -/* 801945C4 00191504 48 13 A6 89 */ bl __nw +/* 801945C4 00191504 48 13 A6 89 */ bl __nw__FUl /* 801945C8 00191508 7C 60 1B 79 */ or. r0, r3, r3 /* 801945CC 0019150C 41 82 00 28 */ beq lbl_801945F4 /* 801945D0 00191510 80 9F 00 04 */ lwz r4, 4(r31) @@ -290,7 +290,7 @@ lbl_801945F4: /* 801945F8 00191538 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801945FC 0019153C 48 0C 10 0D */ bl CPaneMgrAlpha_NS_hide /* 80194600 00191540 38 60 00 6C */ li r3, 0x6c -/* 80194604 00191544 48 13 A6 49 */ bl __nw +/* 80194604 00191544 48 13 A6 49 */ bl __nw__FUl /* 80194608 00191548 7C 60 1B 79 */ or. r0, r3, r3 /* 8019460C 0019154C 41 82 00 24 */ beq lbl_80194630 /* 80194610 00191550 80 9F 00 04 */ lwz r4, 4(r31) @@ -306,7 +306,7 @@ lbl_80194630: /* 80194634 00191574 48 00 01 08 */ b lbl_8019473C lbl_80194638: /* 80194638 00191578 38 60 00 6C */ li r3, 0x6c -/* 8019463C 0019157C 48 13 A6 11 */ bl __nw +/* 8019463C 0019157C 48 13 A6 11 */ bl __nw__FUl /* 80194640 00191580 7C 60 1B 79 */ or. r0, r3, r3 /* 80194644 00191584 41 82 00 24 */ beq lbl_80194668 /* 80194648 00191588 80 9F 00 04 */ lwz r4, 4(r31) @@ -341,7 +341,7 @@ lbl_80194668: /* 801946B8 001915F8 48 00 00 84 */ b lbl_8019473C lbl_801946BC: /* 801946BC 001915FC 38 60 00 6C */ li r3, 0x6c -/* 801946C0 00191600 48 13 A5 8D */ bl __nw +/* 801946C0 00191600 48 13 A5 8D */ bl __nw__FUl /* 801946C4 00191604 7C 60 1B 79 */ or. r0, r3, r3 /* 801946C8 00191608 41 82 00 24 */ beq lbl_801946EC /* 801946CC 0019160C 80 9F 00 04 */ lwz r4, 4(r31) @@ -716,7 +716,7 @@ lbl_80194C04: /* 80194C04 00191B44 7F E0 07 35 */ extsh. r0, r31 /* 80194C08 00191B48 40 81 00 0C */ ble lbl_80194C14 /* 80194C0C 00191B4C 7F C3 F3 78 */ mr r3, r30 -/* 80194C10 00191B50 48 13 A1 2D */ bl __dl +/* 80194C10 00191B50 48 13 A1 2D */ bl __dl__FPv lbl_80194C14: /* 80194C14 00191B54 7F C3 F3 78 */ mr r3, r30 /* 80194C18 00191B58 39 61 00 20 */ addi r11, r1, 0x20 @@ -1681,7 +1681,7 @@ dSelect_cursor_c_NS_moveCenter: /* 80195998 001928D8 90 1F 00 00 */ stw r0, 0(r31) /* 8019599C 001928DC 7C 80 07 35 */ extsh. r0, r4 /* 801959A0 001928E0 40 81 00 08 */ ble lbl_801959A8 -/* 801959A4 001928E4 48 13 93 99 */ bl __dl +/* 801959A4 001928E4 48 13 93 99 */ bl __dl__FPv lbl_801959A8: /* 801959A8 001928E8 7F E3 FB 78 */ mr r3, r31 /* 801959AC 001928EC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1710,7 +1710,7 @@ lbl_80195A04: /* 80195A04 00192944 7C 80 07 35 */ extsh. r0, r4 /* 80195A08 00192948 40 81 00 0C */ ble lbl_80195A14 /* 80195A0C 0019294C 7F E3 FB 78 */ mr r3, r31 -/* 80195A10 00192950 48 13 93 2D */ bl __dl +/* 80195A10 00192950 48 13 93 2D */ bl __dl__FPv lbl_80195A14: /* 80195A14 00192954 7F E3 FB 78 */ mr r3, r31 /* 80195A18 00192958 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/select/d_select_icon.s b/asm/d/select/d_select_icon.s index 4addde19f0..1391ed5136 100644 --- a/asm/d/select/d_select_icon.s +++ b/asm/d/select/d_select_icon.s @@ -154,7 +154,7 @@ dSi_HIO_c_NS_dtor: /* 80195C3C 00192B7C 90 1F 00 00 */ stw r0, 0(r31) /* 80195C40 00192B80 7C 80 07 35 */ extsh. r0, r4 /* 80195C44 00192B84 40 81 00 08 */ ble lbl_80195C4C -/* 80195C48 00192B88 48 13 90 F5 */ bl __dl +/* 80195C48 00192B88 48 13 90 F5 */ bl __dl__FPv lbl_80195C4C: /* 80195C4C 00192B8C 7F E3 FB 78 */ mr r3, r31 /* 80195C50 00192B90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index e3780624ce..74b1951fb4 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -223,7 +223,7 @@ lbl_801973A8: /* 801973C0 00194300 28 00 00 00 */ cmplwi r0, 0 /* 801973C4 00194304 40 82 00 50 */ bne lbl_80197414 /* 801973C8 00194308 38 60 00 30 */ li r3, 0x30 -/* 801973CC 0019430C 48 13 78 81 */ bl __nw +/* 801973CC 0019430C 48 13 78 81 */ bl __nw__FUl /* 801973D0 00194310 7C 7E 1B 79 */ or. r30, r3, r3 /* 801973D4 00194314 41 82 00 3C */ beq lbl_80197410 /* 801973D8 00194318 3C 80 80 3A */ lis r4, lbl_803A7260@ha @@ -247,7 +247,7 @@ lbl_80197414: /* 80197418 00194358 28 00 00 00 */ cmplwi r0, 0 /* 8019741C 0019435C 40 82 00 48 */ bne lbl_80197464 /* 80197420 00194360 38 60 00 B8 */ li r3, 0xb8 -/* 80197424 00194364 48 13 78 29 */ bl __nw +/* 80197424 00194364 48 13 78 29 */ bl __nw__FUl /* 80197428 00194368 7C 60 1B 79 */ or. r0, r3, r3 /* 8019742C 0019436C 41 82 00 18 */ beq lbl_80197444 /* 80197430 00194370 38 80 00 01 */ li r4, 1 @@ -346,7 +346,7 @@ lbl_80197568: /* 80197594 001944D4 7F E0 07 35 */ extsh. r0, r31 /* 80197598 001944D8 40 81 00 0C */ ble lbl_801975A4 /* 8019759C 001944DC 7F C3 F3 78 */ mr r3, r30 -/* 801975A0 001944E0 48 13 77 9D */ bl __dl +/* 801975A0 001944E0 48 13 77 9D */ bl __dl__FPv lbl_801975A4: /* 801975A4 001944E4 7F C3 F3 78 */ mr r3, r30 /* 801975A8 001944E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3694,7 +3694,7 @@ dShopSystem_c_NS_deleteObject: /* 8019A578 001974B8 80 63 0E 40 */ lwz r3, 0xe40(r3) /* 8019A57C 001974BC 28 03 00 00 */ cmplwi r3, 0 /* 8019A580 001974C0 41 82 00 10 */ beq lbl_8019A590 -/* 8019A584 001974C4 48 13 47 B9 */ bl __dl +/* 8019A584 001974C4 48 13 47 B9 */ bl __dl__FPv /* 8019A588 001974C8 38 00 00 00 */ li r0, 0 /* 8019A58C 001974CC 90 1F 0E 40 */ stw r0, 0xe40(r31) lbl_8019A590: diff --git a/asm/d/shop/item/d_shop_item_ctrl.s b/asm/d/shop/item/d_shop_item_ctrl.s index 2955c14009..63166a89c5 100644 --- a/asm/d/shop/item/d_shop_item_ctrl.s +++ b/asm/d/shop/item/d_shop_item_ctrl.s @@ -35,7 +35,7 @@ dShopItemCtrl_c_NS_dtor: /* 80196978 001938B8 90 1F 00 00 */ stw r0, 0(r31) /* 8019697C 001938BC 7C 80 07 35 */ extsh. r0, r4 /* 80196980 001938C0 40 81 00 08 */ ble lbl_80196988 -/* 80196984 001938C4 48 13 83 B9 */ bl __dl +/* 80196984 001938C4 48 13 83 B9 */ bl __dl__FPv lbl_80196988: /* 80196988 001938C8 7F E3 FB 78 */ mr r3, r31 /* 8019698C 001938CC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index a89b802b7f..113322ef82 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -118,7 +118,7 @@ lbl_80048DD0: /* 80048DE0 00045D20 7F A0 07 35 */ extsh. r0, r29 /* 80048DE4 00045D24 40 81 00 0C */ ble lbl_80048DF0 /* 80048DE8 00045D28 7F 83 E3 78 */ mr r3, r28 -/* 80048DEC 00045D2C 48 28 5F 51 */ bl __dl +/* 80048DEC 00045D2C 48 28 5F 51 */ bl __dl__FPv lbl_80048DF0: /* 80048DF0 00045D30 7F 83 E3 78 */ mr r3, r28 /* 80048DF4 00045D34 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/f/ap/f_ap_game.s b/asm/f/ap/f_ap_game.s index b8910699b5..cfdac9d590 100644 --- a/asm/f/ap/f_ap_game.s +++ b/asm/f/ap/f_ap_game.s @@ -133,7 +133,7 @@ fapGm_HIO_c_NS_dtor: /* 80018B00 00015A40 90 1F 00 00 */ stw r0, 0(r31) /* 80018B04 00015A44 7C 80 07 35 */ extsh. r0, r4 /* 80018B08 00015A48 40 81 00 08 */ ble lbl_80018B10 -/* 80018B0C 00015A4C 48 2B 62 31 */ bl __dl +/* 80018B0C 00015A4C 48 2B 62 31 */ bl __dl__FPv lbl_80018B10: /* 80018B10 00015A50 7F E3 FB 78 */ mr r3, r31 /* 80018B14 00015A54 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index d8fada4da3..9b4ecac653 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -4855,7 +4855,7 @@ cM3dGPla_NS_dtor: /* 8001DBB0 0001AAF0 90 1F 00 10 */ stw r0, 0x10(r31) /* 8001DBB4 0001AAF4 7C 80 07 35 */ extsh. r0, r4 /* 8001DBB8 0001AAF8 40 81 00 08 */ ble lbl_8001DBC0 -/* 8001DBBC 0001AAFC 48 2B 11 81 */ bl __dl +/* 8001DBBC 0001AAFC 48 2B 11 81 */ bl __dl__FPv lbl_8001DBC0: /* 8001DBC0 0001AB00 7F E3 FB 78 */ mr r3, r31 /* 8001DBC4 0001AB04 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5129,7 +5129,7 @@ dBgS_WtrChk_NS_dtor: /* 8001DF7C 0001AEBC 7F E0 07 35 */ extsh. r0, r31 /* 8001DF80 0001AEC0 40 81 00 0C */ ble lbl_8001DF8C /* 8001DF84 0001AEC4 7F C3 F3 78 */ mr r3, r30 -/* 8001DF88 0001AEC8 48 2B 0D B5 */ bl __dl +/* 8001DF88 0001AEC8 48 2B 0D B5 */ bl __dl__FPv lbl_8001DF8C: /* 8001DF8C 0001AECC 7F C3 F3 78 */ mr r3, r30 /* 8001DF90 0001AED0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5162,7 +5162,7 @@ dBgS_ObjRoofChk_NS_dtor: /* 8001DFF4 0001AF34 7F E0 07 35 */ extsh. r0, r31 /* 8001DFF8 0001AF38 40 81 00 0C */ ble lbl_8001E004 /* 8001DFFC 0001AF3C 7F C3 F3 78 */ mr r3, r30 -/* 8001E000 0001AF40 48 2B 0D 3D */ bl __dl +/* 8001E000 0001AF40 48 2B 0D 3D */ bl __dl__FPv lbl_8001E004: /* 8001E004 0001AF44 7F C3 F3 78 */ mr r3, r30 /* 8001E008 0001AF48 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5195,7 +5195,7 @@ dBgS_ObjGndChk_NS_dtor: /* 8001E06C 0001AFAC 7F E0 07 35 */ extsh. r0, r31 /* 8001E070 0001AFB0 40 81 00 0C */ ble lbl_8001E07C /* 8001E074 0001AFB4 7F C3 F3 78 */ mr r3, r30 -/* 8001E078 0001AFB8 48 2B 0C C5 */ bl __dl +/* 8001E078 0001AFB8 48 2B 0C C5 */ bl __dl__FPv lbl_8001E07C: /* 8001E07C 0001AFBC 7F C3 F3 78 */ mr r3, r30 /* 8001E080 0001AFC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5214,7 +5214,7 @@ l_HIO_NS_dtor: /* 8001E0AC 0001AFEC 41 82 00 10 */ beq lbl_8001E0BC /* 8001E0B0 0001AFF0 7C 80 07 35 */ extsh. r0, r4 /* 8001E0B4 0001AFF4 40 81 00 08 */ ble lbl_8001E0BC -/* 8001E0B8 0001AFF8 48 2B 0C 85 */ bl __dl +/* 8001E0B8 0001AFF8 48 2B 0C 85 */ bl __dl__FPv lbl_8001E0BC: /* 8001E0BC 0001AFFC 7F E3 FB 78 */ mr r3, r31 /* 8001E0C0 0001B000 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/f/op/f_op_actor.s b/asm/f/op/f_op_actor.s index bf63359daf..28b49c6e0d 100644 --- a/asm/f/op/f_op_actor.s +++ b/asm/f/op/f_op_actor.s @@ -44,7 +44,7 @@ csXyz_NS_dtor: /* 80018BE4 00015B24 41 82 00 10 */ beq lbl_80018BF4 /* 80018BE8 00015B28 7C 80 07 35 */ extsh. r0, r4 /* 80018BEC 00015B2C 40 81 00 08 */ ble lbl_80018BF4 -/* 80018BF0 00015B30 48 2B 61 4D */ bl __dl +/* 80018BF0 00015B30 48 2B 61 4D */ bl __dl__FPv lbl_80018BF4: /* 80018BF4 00015B34 7F E3 FB 78 */ mr r3, r31 /* 80018BF8 00015B38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -79,7 +79,7 @@ J3DLightObj: /* 80018C64 00015BA4 90 1F 00 00 */ stw r0, 0(r31) /* 80018C68 00015BA8 7C 80 07 35 */ extsh. r0, r4 /* 80018C6C 00015BAC 40 81 00 08 */ ble lbl_80018C74 -/* 80018C70 00015BB0 48 2B 60 CD */ bl __dl +/* 80018C70 00015BB0 48 2B 60 CD */ bl __dl__FPv lbl_80018C74: /* 80018C74 00015BB4 7F E3 FB 78 */ mr r3, r31 /* 80018C78 00015BB8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -105,7 +105,7 @@ lbl_80018CB8: /* 80018CB8 00015BF8 7C 80 07 35 */ extsh. r0, r4 /* 80018CBC 00015BFC 40 81 00 0C */ ble lbl_80018CC8 /* 80018CC0 00015C00 7F E3 FB 78 */ mr r3, r31 -/* 80018CC4 00015C04 48 2B 60 79 */ bl __dl +/* 80018CC4 00015C04 48 2B 60 79 */ bl __dl__FPv lbl_80018CC8: /* 80018CC8 00015C08 7F E3 FB 78 */ mr r3, r31 /* 80018CCC 00015C0C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/f/op/msg/f_op_msg_mng.s b/asm/f/op/msg/f_op_msg_mng.s index 6ce7cb09bd..8f579271a2 100644 --- a/asm/f/op/msg/f_op_msg_mng.s +++ b/asm/f/op/msg/f_op_msg_mng.s @@ -746,7 +746,7 @@ fopMsgM_destroyExpHeap: /* 800203E0 0001D320 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800203E4 0001D324 7C 08 02 A6 */ mflr r0 /* 800203E8 0001D328 90 01 00 14 */ stw r0, 0x14(r1) -/* 800203EC 0001D32C 48 2A E0 5D */ bl JKRHeap_NS_destroy +/* 800203EC 0001D32C 48 2A E0 5D */ bl destroy__7JKRHeapFv /* 800203F0 0001D330 80 01 00 14 */ lwz r0, 0x14(r1) /* 800203F4 0001D334 7C 08 03 A6 */ mtlr r0 /* 800203F8 0001D338 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/m/Do/controller/m_Do_controller_pad.s b/asm/m/Do/controller/m_Do_controller_pad.s index 65e4c30432..d22d967e53 100644 --- a/asm/m/Do/controller/m_Do_controller_pad.s +++ b/asm/m/Do/controller/m_Do_controller_pad.s @@ -9,7 +9,7 @@ mDoCPd_c_NS_create: /* 80007958 00004898 7C 08 02 A6 */ mflr r0 /* 8000795C 0000489C 90 01 00 14 */ stw r0, 0x14(r1) /* 80007960 000048A0 38 60 00 B0 */ li r3, 0xb0 -/* 80007964 000048A4 48 2C 72 E9 */ bl __nw +/* 80007964 000048A4 48 2C 72 E9 */ bl __nw__FUl /* 80007968 000048A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8000796C 000048AC 41 82 00 10 */ beq lbl_8000797C /* 80007970 000048B0 38 80 00 00 */ li r4, 0 @@ -22,7 +22,7 @@ lbl_8000797C: /* 80007988 000048C8 7C 00 07 75 */ extsb. r0, r0 /* 8000798C 000048CC 41 82 00 80 */ beq lbl_80007A0C /* 80007990 000048D0 38 60 00 B0 */ li r3, 0xb0 -/* 80007994 000048D4 48 2C 72 B9 */ bl __nw +/* 80007994 000048D4 48 2C 72 B9 */ bl __nw__FUl /* 80007998 000048D8 7C 60 1B 79 */ or. r0, r3, r3 /* 8000799C 000048DC 41 82 00 10 */ beq lbl_800079AC /* 800079A0 000048E0 38 80 00 01 */ li r4, 1 @@ -33,7 +33,7 @@ lbl_800079AC: /* 800079B0 000048F0 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l /* 800079B4 000048F4 90 03 00 04 */ stw r0, 4(r3) /* 800079B8 000048F8 38 60 00 B0 */ li r3, 0xb0 -/* 800079BC 000048FC 48 2C 72 91 */ bl __nw +/* 800079BC 000048FC 48 2C 72 91 */ bl __nw__FUl /* 800079C0 00004900 7C 60 1B 79 */ or. r0, r3, r3 /* 800079C4 00004904 41 82 00 10 */ beq lbl_800079D4 /* 800079C8 00004908 38 80 00 02 */ li r4, 2 @@ -44,7 +44,7 @@ lbl_800079D4: /* 800079D8 00004918 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l /* 800079DC 0000491C 90 03 00 08 */ stw r0, 8(r3) /* 800079E0 00004920 38 60 00 B0 */ li r3, 0xb0 -/* 800079E4 00004924 48 2C 72 69 */ bl __nw +/* 800079E4 00004924 48 2C 72 69 */ bl __nw__FUl /* 800079E8 00004928 7C 60 1B 79 */ or. r0, r3, r3 /* 800079EC 0000492C 41 82 00 10 */ beq lbl_800079FC /* 800079F0 00004930 38 80 00 03 */ li r4, 3 diff --git a/asm/m/Do/dvd/m_Do_dvd_thread.s b/asm/m/Do/dvd/m_Do_dvd_thread.s index b30f399b1c..aaaaec1feb 100644 --- a/asm/m/Do/dvd/m_Do_dvd_thread.s +++ b/asm/m/Do/dvd/m_Do_dvd_thread.s @@ -19,7 +19,7 @@ mDoDvdThd_NS_main: /* 80015828 00012768 38 80 FF FF */ li r4, -1 /* 8001582C 0001276C 48 2B BF 2D */ bl JKRThread_NS_dtor /* 80015830 00012770 4B FF 94 B5 */ bl mDoExt_getAssertHeap -/* 80015834 00012774 48 2B 8C 05 */ bl JKRHeap_NS_becomeCurrentHeap +/* 80015834 00012774 48 2B 8C 05 */ bl becomeCurrentHeap__7JKRHeapFv /* 80015838 00012778 7F E3 FB 78 */ mr r3, r31 /* 8001583C 0001277C 48 00 02 9D */ bl mDoDvdThd_param_c_NS_mainLoop /* 80015840 00012780 38 60 00 00 */ li r3, 0 @@ -94,7 +94,7 @@ mDoDvdThd_command_c_NS_dtor: /* 8001591C 0001285C 90 1F 00 10 */ stw r0, 0x10(r31) /* 80015920 00012860 7C 80 07 35 */ extsh. r0, r4 /* 80015924 00012864 40 81 00 08 */ ble lbl_8001592C -/* 80015928 00012868 48 2B 94 15 */ bl __dl +/* 80015928 00012868 48 2B 94 15 */ bl __dl__FPv lbl_8001592C: /* 8001592C 0001286C 7F E3 FB 78 */ mr r3, r31 /* 80015930 00012870 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -307,7 +307,7 @@ mDoDvdThd_command_c: /* 80015BEC 00012B2C 7F E0 07 35 */ extsh. r0, r31 /* 80015BF0 00012B30 40 81 00 0C */ ble lbl_80015BFC /* 80015BF4 00012B34 7F C3 F3 78 */ mr r3, r30 -/* 80015BF8 00012B38 48 2B 91 45 */ bl __dl +/* 80015BF8 00012B38 48 2B 91 45 */ bl __dl__FPv lbl_80015BFC: /* 80015BFC 00012B3C 7F C3 F3 78 */ mr r3, r30 /* 80015C00 00012B40 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -356,7 +356,7 @@ mDoDvdThd_callback_c_NS_create: /* 80015C94 00012BD4 7C 64 1B 78 */ mr r4, r3 /* 80015C98 00012BD8 38 60 00 20 */ li r3, 0x20 /* 80015C9C 00012BDC 38 A0 FF FC */ li r5, -4 -/* 80015CA0 00012BE0 48 2B 8F F9 */ bl __nw_X2_ +/* 80015CA0 00012BE0 48 2B 8F F9 */ bl __nw__FUlP7JKRHeapi /* 80015CA4 00012BE4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80015CA8 00012BE8 41 82 00 14 */ beq lbl_80015CBC /* 80015CAC 00012BEC 7F A4 EB 78 */ mr r4, r29 @@ -415,7 +415,7 @@ lbl_80015CD4: /* 80015D78 00012CB8 7F E0 07 35 */ extsh. r0, r31 /* 80015D7C 00012CBC 40 81 00 0C */ ble lbl_80015D88 /* 80015D80 00012CC0 7F C3 F3 78 */ mr r3, r30 -/* 80015D84 00012CC4 48 2B 8F B9 */ bl __dl +/* 80015D84 00012CC4 48 2B 8F B9 */ bl __dl__FPv lbl_80015D88: /* 80015D88 00012CC8 7F C3 F3 78 */ mr r3, r30 /* 80015D8C 00012CCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -471,7 +471,7 @@ mDoDvdThd_mountArchive_c_NS_create: /* 80015E38 00012D78 7C 64 1B 78 */ mr r4, r3 /* 80015E3C 00012D7C 38 60 00 24 */ li r3, 0x24 /* 80015E40 00012D80 38 A0 FF FC */ li r5, -4 -/* 80015E44 00012D84 48 2B 8E 55 */ bl __nw_X2_ +/* 80015E44 00012D84 48 2B 8E 55 */ bl __nw__FUlP7JKRHeapi /* 80015E48 00012D88 7C 7F 1B 79 */ or. r31, r3, r3 /* 80015E4C 00012D8C 41 82 00 10 */ beq lbl_80015E5C /* 80015E50 00012D90 7F A4 EB 78 */ mr r4, r29 @@ -563,7 +563,7 @@ lbl_80015F70: /* 80015F7C 00012EBC 38 60 00 70 */ li r3, 0x70 /* 80015F80 00012EC0 7F 24 CB 78 */ mr r4, r25 /* 80015F84 00012EC4 38 A0 00 00 */ li r5, 0 -/* 80015F88 00012EC8 48 2B 8D 11 */ bl __nw_X2_ +/* 80015F88 00012EC8 48 2B 8D 11 */ bl __nw__FUlP7JKRHeapi /* 80015F8C 00012ECC 7C 60 1B 79 */ or. r0, r3, r3 /* 80015F90 00012ED0 41 82 00 14 */ beq lbl_80015FA4 /* 80015F94 00012ED4 80 9A 00 18 */ lwz r4, 0x18(r26) @@ -577,7 +577,7 @@ lbl_80015FAC: /* 80015FAC 00012EEC 38 60 00 70 */ li r3, 0x70 /* 80015FB0 00012EF0 7F 24 CB 78 */ mr r4, r25 /* 80015FB4 00012EF4 38 A0 FF FC */ li r5, -4 -/* 80015FB8 00012EF8 48 2B 8C E1 */ bl __nw_X2_ +/* 80015FB8 00012EF8 48 2B 8C E1 */ bl __nw__FUlP7JKRHeapi /* 80015FBC 00012EFC 7C 60 1B 79 */ or. r0, r3, r3 /* 80015FC0 00012F00 41 82 00 14 */ beq lbl_80015FD4 /* 80015FC4 00012F04 80 9A 00 18 */ lwz r4, 0x18(r26) @@ -686,7 +686,7 @@ lbl_800160D8: /* 8001613C 0001307C 7F E0 07 35 */ extsh. r0, r31 /* 80016140 00013080 40 81 00 0C */ ble lbl_8001614C /* 80016144 00013084 7F C3 F3 78 */ mr r3, r30 -/* 80016148 00013088 48 2B 8B F5 */ bl __dl +/* 80016148 00013088 48 2B 8B F5 */ bl __dl__FPv lbl_8001614C: /* 8001614C 0001308C 7F C3 F3 78 */ mr r3, r30 /* 80016150 00013090 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -745,7 +745,7 @@ mDoDvdThd_mountXArchive_c_NS_create: /* 80016208 00013148 7C 64 1B 78 */ mr r4, r3 /* 8001620C 0001314C 38 60 00 28 */ li r3, 0x28 /* 80016210 00013150 38 A0 FF FC */ li r5, -4 -/* 80016214 00013154 48 2B 8A 85 */ bl __nw_X2_ +/* 80016214 00013154 48 2B 8A 85 */ bl __nw__FUlP7JKRHeapi /* 80016218 00013158 7C 7F 1B 79 */ or. r31, r3, r3 /* 8001621C 0001315C 41 82 00 14 */ beq lbl_80016230 /* 80016220 00013160 7F 84 E3 78 */ mr r4, r28 @@ -867,7 +867,7 @@ mDoDvdThd_toMainRam_c_NS_create: /* 800163B8 000132F8 7C 64 1B 78 */ mr r4, r3 /* 800163BC 000132FC 38 60 00 28 */ li r3, 0x28 /* 800163C0 00013300 38 A0 FF FC */ li r5, -4 -/* 800163C4 00013304 48 2B 88 D5 */ bl __nw_X2_ +/* 800163C4 00013304 48 2B 88 D5 */ bl __nw__FUlP7JKRHeapi /* 800163C8 00013308 7C 7F 1B 79 */ or. r31, r3, r3 /* 800163CC 0001330C 41 82 00 10 */ beq lbl_800163DC /* 800163D0 00013310 7F A4 EB 78 */ mr r4, r29 @@ -925,7 +925,7 @@ lbl_80016440: /* 80016490 000133D0 7F E0 07 35 */ extsh. r0, r31 /* 80016494 000133D4 40 81 00 0C */ ble lbl_800164A0 /* 80016498 000133D8 7F C3 F3 78 */ mr r3, r30 -/* 8001649C 000133DC 48 2B 88 A1 */ bl __dl +/* 8001649C 000133DC 48 2B 88 A1 */ bl __dl__FPv lbl_800164A0: /* 800164A0 000133E0 7F C3 F3 78 */ mr r3, r30 /* 800164A4 000133E4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -969,7 +969,7 @@ lbl_8001651C: /* 80016530 00013470 28 04 00 00 */ cmplwi r4, 0 /* 80016534 00013474 41 82 00 10 */ beq lbl_80016544 /* 80016538 00013478 7F E3 FB 78 */ mr r3, r31 -/* 8001653C 0001347C 48 2B 81 C5 */ bl JKRHeap_NS_getSize_X1_ +/* 8001653C 0001347C 48 2B 81 C5 */ bl getSize__7JKRHeapFPv /* 80016540 00013480 90 7E 00 20 */ stw r3, 0x20(r30) lbl_80016544: /* 80016544 00013484 38 00 00 01 */ li r0, 1 diff --git a/asm/m/Do/m_Do_DVDError.s b/asm/m/Do/m_Do_DVDError.s index f9c02cb843..b3913d1999 100644 --- a/asm/m/Do/m_Do_DVDError.s +++ b/asm/m/Do/m_Do_DVDError.s @@ -96,7 +96,7 @@ mDoDvdErr_Watch: /* 800166D0 00013610 38 80 FF FF */ li r4, -1 /* 800166D4 00013614 48 2B B0 85 */ bl JKRThread_NS_dtor /* 800166D8 00013618 4B FF 86 0D */ bl mDoExt_getAssertHeap -/* 800166DC 0001361C 48 2B 7D 5D */ bl JKRHeap_NS_becomeCurrentHeap +/* 800166DC 0001361C 48 2B 7D 5D */ bl becomeCurrentHeap__7JKRHeapFv /* 800166E0 00013620 3C 60 80 3E */ lis r3, lbl_803DECC0@ha /* 800166E4 00013624 3B E3 EC C0 */ addi r31, r3, lbl_803DECC0@l lbl_800166E8: diff --git a/asm/m/Do/m_Do_MemCard.s b/asm/m/Do/m_Do_MemCard.s index fa3c1c48d4..276856f9e7 100644 --- a/asm/m/Do/m_Do_MemCard.s +++ b/asm/m/Do/m_Do_MemCard.s @@ -990,7 +990,7 @@ mDoMemCd_main: /* 80017440 00014380 38 80 FF FF */ li r4, -1 /* 80017444 00014384 48 2B A3 15 */ bl JKRThread_NS_dtor /* 80017448 00014388 4B FF 78 9D */ bl mDoExt_getAssertHeap -/* 8001744C 0001438C 48 2B 6F ED */ bl JKRHeap_NS_becomeCurrentHeap +/* 8001744C 0001438C 48 2B 6F ED */ bl becomeCurrentHeap__7JKRHeapFv /* 80017450 00014390 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80017454 00014394 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l /* 80017458 00014398 4B FF F3 79 */ bl mDoMemCd_Ctrl_c_NS_main diff --git a/asm/m/Do/m_Do_audio.s b/asm/m/Do/m_Do_audio.s index 07811eb3ba..e270962fa3 100644 --- a/asm/m/Do/m_Do_audio.s +++ b/asm/m/Do/m_Do_audio.s @@ -54,7 +54,7 @@ lbl_80007030: /* 80007058 00003F98 41 82 00 50 */ beq lbl_800070A8 /* 8000705C 00003F9C 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) /* 80007060 00003FA0 38 80 00 05 */ li r4, 5 -/* 80007064 00003FA4 48 2C 77 4D */ bl JKRHeap_NS_changeGroupID +/* 80007064 00003FA4 48 2C 77 4D */ bl changeGroupID__7JKRHeapFUc /* 80007068 00003FA8 7C 7F 1B 78 */ mr r31, r3 /* 8000706C 00003FAC 80 6D 86 44 */ lwz r3, lbl_80450BC4-_SDA_BASE_(r13) /* 80007070 00003FB0 80 E3 00 1C */ lwz r7, 0x1c(r3) @@ -67,7 +67,7 @@ lbl_80007030: /* 8000708C 00003FCC 48 2C 62 C1 */ bl Z2AudioMgr_NS_init /* 80007090 00003FD0 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) /* 80007094 00003FD4 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80007098 00003FD8 48 2C 77 19 */ bl JKRHeap_NS_changeGroupID +/* 80007098 00003FD8 48 2C 77 19 */ bl changeGroupID__7JKRHeapFUc /* 8000709C 00003FDC 80 6D 86 3C */ lwz r3, lbl_80450BBC-_SDA_BASE_(r13) /* 800070A0 00003FE0 48 2C 9B 55 */ bl JKRSolidHeap_NS_adjustSize /* 800070A4 00003FE4 48 00 00 18 */ b lbl_800070BC @@ -95,7 +95,7 @@ lbl_800070BC: /* 800070F4 00004034 80 6D 86 40 */ lwz r3, lbl_80450BC0-_SDA_BASE_(r13) /* 800070F8 00004038 80 63 00 1C */ lwz r3, 0x1c(r3) /* 800070FC 0000403C 38 80 00 00 */ li r4, 0 -/* 80007100 00004040 48 2C 74 01 */ bl JKRHeap_NS_free +/* 80007100 00004040 48 2C 74 01 */ bl free__7JKRHeapFPvP7JKRHeap /* 80007104 00004044 80 6D 86 40 */ lwz r3, lbl_80450BC0-_SDA_BASE_(r13) /* 80007108 00004048 28 03 00 00 */ cmplwi r3, 0 /* 8000710C 0000404C 41 82 00 18 */ beq lbl_80007124 @@ -299,7 +299,7 @@ mDoAud_zelAudio_c_NS_dtor: /* 8000739C 000042DC 7F E0 07 35 */ extsh. r0, r31 /* 800073A0 000042E0 40 81 00 0C */ ble lbl_800073AC /* 800073A4 000042E4 7F C3 F3 78 */ mr r3, r30 -/* 800073A8 000042E8 48 2C 79 95 */ bl __dl +/* 800073A8 000042E8 48 2C 79 95 */ bl __dl__FPv lbl_800073AC: /* 800073AC 000042EC 7F C3 F3 78 */ mr r3, r30 /* 800073B0 000042F0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -433,7 +433,7 @@ lbl_8000755C: /* 80007578 000044B8 34 7D 00 58 */ addic. r3, r29, 0x58 /* 8000757C 000044BC 41 82 00 0C */ beq lbl_80007588 /* 80007580 000044C0 38 80 00 00 */ li r4, 0 -/* 80007584 000044C4 48 2D 49 29 */ bl JSUPtrList_NS_dtor +/* 80007584 000044C4 48 2D 49 29 */ bl __dt__10JSUPtrListFv lbl_80007588: /* 80007588 000044C8 28 1D 00 00 */ cmplwi r29, 0 /* 8000758C 000044CC 41 82 00 18 */ beq lbl_800075A4 @@ -451,7 +451,7 @@ lbl_800075A4: /* 800075B8 000044F8 34 7D 00 64 */ addic. r3, r29, 0x64 /* 800075BC 000044FC 41 82 00 0C */ beq lbl_800075C8 /* 800075C0 00004500 38 80 00 00 */ li r4, 0 -/* 800075C4 00004504 48 2D 48 E9 */ bl JSUPtrList_NS_dtor +/* 800075C4 00004504 48 2D 48 E9 */ bl __dt__10JSUPtrListFv lbl_800075C8: /* 800075C8 00004508 7F A3 EB 78 */ mr r3, r29 /* 800075CC 0000450C 38 80 00 00 */ li r4, 0 @@ -527,7 +527,7 @@ lbl_800076AC: /* 800076C4 00004604 41 82 00 10 */ beq lbl_800076D4 /* 800076C8 00004608 38 7E 04 F4 */ addi r3, r30, 0x4f4 /* 800076CC 0000460C 38 80 00 00 */ li r4, 0 -/* 800076D0 00004610 48 2D 47 DD */ bl JSUPtrList_NS_dtor +/* 800076D0 00004610 48 2D 47 DD */ bl __dt__10JSUPtrListFv lbl_800076D4: /* 800076D4 00004614 34 1E 04 F4 */ addic. r0, r30, 0x4f4 /* 800076D8 00004618 41 82 00 1C */ beq lbl_800076F4 @@ -625,7 +625,7 @@ lbl_8000780C: /* 8000780C 0000474C 7F E0 07 35 */ extsh. r0, r31 /* 80007810 00004750 40 81 00 0C */ ble lbl_8000781C /* 80007814 00004754 7F C3 F3 78 */ mr r3, r30 -/* 80007818 00004758 48 2C 75 25 */ bl __dl +/* 80007818 00004758 48 2C 75 25 */ bl __dl__FPv lbl_8000781C: /* 8000781C 0000475C 7F C3 F3 78 */ mr r3, r30 /* 80007820 00004760 39 61 00 20 */ addi r11, r1, 0x20 @@ -648,7 +648,7 @@ JAISoundHandle_NS_dtor: /* 8000785C 0000479C 7F E0 07 35 */ extsh. r0, r31 /* 80007860 000047A0 40 81 00 0C */ ble lbl_8000786C /* 80007864 000047A4 7F C3 F3 78 */ mr r3, r30 -/* 80007868 000047A8 48 2C 74 D5 */ bl __dl +/* 80007868 000047A8 48 2C 74 D5 */ bl __dl__FPv lbl_8000786C: /* 8000786C 000047AC 7F C3 F3 78 */ mr r3, r30 /* 80007870 000047B0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -672,7 +672,7 @@ Z2MultiSeObj_NS_dtor: /* 800078B0 000047F0 7F E0 07 35 */ extsh. r0, r31 /* 800078B4 000047F4 40 81 00 0C */ ble lbl_800078C0 /* 800078B8 000047F8 7F C3 F3 78 */ mr r3, r30 -/* 800078BC 000047FC 48 2C 74 81 */ bl __dl +/* 800078BC 000047FC 48 2C 74 81 */ bl __dl__FPv lbl_800078C0: /* 800078C0 00004800 7F C3 F3 78 */ mr r3, r30 /* 800078C4 00004804 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -698,7 +698,7 @@ JAISeCategoryMgr_NS_dtor: /* 8000790C 0000484C 41 82 00 10 */ beq lbl_8000791C /* 80007910 00004850 38 7E 00 58 */ addi r3, r30, 0x58 /* 80007914 00004854 38 80 00 00 */ li r4, 0 -/* 80007918 00004858 48 2D 45 95 */ bl JSUPtrList_NS_dtor +/* 80007918 00004858 48 2D 45 95 */ bl __dt__10JSUPtrListFv lbl_8000791C: /* 8000791C 0000485C 7F C3 F3 78 */ mr r3, r30 /* 80007920 00004860 38 80 00 00 */ li r4, 0 @@ -706,7 +706,7 @@ lbl_8000791C: /* 80007928 00004868 7F E0 07 35 */ extsh. r0, r31 /* 8000792C 0000486C 40 81 00 0C */ ble lbl_80007938 /* 80007930 00004870 7F C3 F3 78 */ mr r3, r30 -/* 80007934 00004874 48 2C 74 09 */ bl __dl +/* 80007934 00004874 48 2C 74 09 */ bl __dl__FPv lbl_80007938: /* 80007938 00004878 7F C3 F3 78 */ mr r3, r30 /* 8000793C 0000487C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index d426474ad1..de3133af36 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -539,7 +539,7 @@ mDoExt_bckAnm_NS_init: /* 8000D810 0000A750 55 20 06 3F */ clrlwi. r0, r9, 0x18 /* 8000D814 0000A754 40 82 00 58 */ bne lbl_8000D86C /* 8000D818 0000A758 38 60 00 0C */ li r3, 0xc -/* 8000D81C 0000A75C 48 2C 14 31 */ bl __nw +/* 8000D81C 0000A75C 48 2C 14 31 */ bl __nw__FUl /* 8000D820 0000A760 28 03 00 00 */ cmplwi r3, 0 /* 8000D824 0000A764 41 82 00 30 */ beq lbl_8000D854 /* 8000D828 0000A768 80 BF 00 14 */ lwz r5, 0x14(r31) @@ -615,7 +615,7 @@ lbl_8000D920: /* 8000D920 0000A860 7C 80 07 35 */ extsh. r0, r4 /* 8000D924 0000A864 40 81 00 0C */ ble lbl_8000D930 /* 8000D928 0000A868 7F E3 FB 78 */ mr r3, r31 -/* 8000D92C 0000A86C 48 2C 14 11 */ bl __dl +/* 8000D92C 0000A86C 48 2C 14 11 */ bl __dl__FPv lbl_8000D930: /* 8000D930 0000A870 7F E3 FB 78 */ mr r3, r31 /* 8000D934 0000A874 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -634,7 +634,7 @@ lbl_8000D930: /* 8000D968 0000A8A8 90 1F 00 00 */ stw r0, 0(r31) /* 8000D96C 0000A8AC 7C 80 07 35 */ extsh. r0, r4 /* 8000D970 0000A8B0 40 81 00 08 */ ble lbl_8000D978 -/* 8000D974 0000A8B4 48 2C 13 C9 */ bl __dl +/* 8000D974 0000A8B4 48 2C 13 C9 */ bl __dl__FPv lbl_8000D978: /* 8000D978 0000A8B8 7F E3 FB 78 */ mr r3, r31 /* 8000D97C 0000A8BC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1125,7 +1125,7 @@ J3DIndTexCoordScale_NS_dtor: /* 8000E038 0000AF78 41 82 00 10 */ beq lbl_8000E048 /* 8000E03C 0000AF7C 7C 80 07 35 */ extsh. r0, r4 /* 8000E040 0000AF80 40 81 00 08 */ ble lbl_8000E048 -/* 8000E044 0000AF84 48 2C 0C F9 */ bl __dl +/* 8000E044 0000AF84 48 2C 0C F9 */ bl __dl__FPv lbl_8000E048: /* 8000E048 0000AF88 7F E3 FB 78 */ mr r3, r31 /* 8000E04C 0000AF8C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1144,7 +1144,7 @@ J3DIndTexMtx_NS_dtor: /* 8000E078 0000AFB8 41 82 00 10 */ beq lbl_8000E088 /* 8000E07C 0000AFBC 7C 80 07 35 */ extsh. r0, r4 /* 8000E080 0000AFC0 40 81 00 08 */ ble lbl_8000E088 -/* 8000E084 0000AFC4 48 2C 0C B9 */ bl __dl +/* 8000E084 0000AFC4 48 2C 0C B9 */ bl __dl__FPv lbl_8000E088: /* 8000E088 0000AFC8 7F E3 FB 78 */ mr r3, r31 /* 8000E08C 0000AFCC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1489,7 +1489,7 @@ J3DGXColor: /* 8000E560 0000B4A0 A3 FE 00 2C */ lhz r31, 0x2c(r30) /* 8000E564 0000B4A4 1C 7F 00 18 */ mulli r3, r31, 0x18 /* 8000E568 0000B4A8 38 63 00 10 */ addi r3, r3, 0x10 -/* 8000E56C 0000B4AC 48 2C 07 59 */ bl __nwa +/* 8000E56C 0000B4AC 48 2C 07 59 */ bl __nwa__FUl .global mDoExt_invJntPacket /* 8000E570 0000B4B0 3C 80 80 01 */ lis r4, mDoExt_invJntPacket@ha .global mDoExt_invJntPacket @@ -1551,7 +1551,7 @@ lbl_8000E62C: /* 8000E62C 0000B56C 7C 80 07 35 */ extsh. r0, r4 /* 8000E630 0000B570 40 81 00 0C */ ble lbl_8000E63C /* 8000E634 0000B574 7F E3 FB 78 */ mr r3, r31 -/* 8000E638 0000B578 48 2C 07 05 */ bl __dl +/* 8000E638 0000B578 48 2C 07 05 */ bl __dl__FPv lbl_8000E63C: /* 8000E63C 0000B57C 7F E3 FB 78 */ mr r3, r31 /* 8000E640 0000B580 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1583,7 +1583,7 @@ mDoExt_invJntPacket: /* 8000E6A0 0000B5E0 90 1F 00 00 */ stw r0, 0(r31) /* 8000E6A4 0000B5E4 7C 80 07 35 */ extsh. r0, r4 /* 8000E6A8 0000B5E8 40 81 00 08 */ ble lbl_8000E6B0 -/* 8000E6AC 0000B5EC 48 2C 06 91 */ bl __dl +/* 8000E6AC 0000B5EC 48 2C 06 91 */ bl __dl__FPv lbl_8000E6B0: /* 8000E6B0 0000B5F0 7F E3 FB 78 */ mr r3, r31 /* 8000E6B4 0000B5F4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2181,7 +2181,7 @@ lbl_8000EEAC: /* 8000EEB0 0000BDF0 41 82 00 10 */ beq lbl_8000EEC0 /* 8000EEB4 0000BDF4 7F E3 FB 78 */ mr r3, r31 /* 8000EEB8 0000BDF8 38 80 00 01 */ li r4, 1 -/* 8000EEBC 0000BDFC 48 2B FC BD */ bl JKRHeap_NS_setErrorFlag +/* 8000EEBC 0000BDFC 48 2B FC BD */ bl setErrorFlag__7JKRHeapFb lbl_8000EEC0: /* 8000EEC0 0000BE00 7F E3 FB 78 */ mr r3, r31 /* 8000EEC4 0000BE04 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2399,7 +2399,7 @@ mDoExt_destroySolidHeap: /* 8000F18C 0000C0CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8000F190 0000C0D0 7C 08 02 A6 */ mflr r0 /* 8000F194 0000C0D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8000F198 0000C0D8 48 2B F2 B1 */ bl JKRHeap_NS_destroy +/* 8000F198 0000C0D8 48 2B F2 B1 */ bl destroy__7JKRHeapFv /* 8000F19C 0000C0DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000F1A0 0000C0E0 7C 08 03 A6 */ mtlr r0 /* 8000F1A4 0000C0E4 38 21 00 10 */ addi r1, r1, 0x10 @@ -2410,7 +2410,7 @@ mDoExt_destroyExpHeap: /* 8000F1AC 0000C0EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8000F1B0 0000C0F0 7C 08 02 A6 */ mflr r0 /* 8000F1B4 0000C0F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8000F1B8 0000C0F8 48 2B F2 91 */ bl JKRHeap_NS_destroy +/* 8000F1B8 0000C0F8 48 2B F2 91 */ bl destroy__7JKRHeapFv /* 8000F1BC 0000C0FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000F1C0 0000C100 7C 08 03 A6 */ mtlr r0 /* 8000F1C4 0000C104 38 21 00 10 */ addi r1, r1, 0x10 @@ -2421,7 +2421,7 @@ mDoExt_setCurrentHeap: /* 8000F1CC 0000C10C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8000F1D0 0000C110 7C 08 02 A6 */ mflr r0 /* 8000F1D4 0000C114 90 01 00 14 */ stw r0, 0x14(r1) -/* 8000F1D8 0000C118 48 2B F2 61 */ bl JKRHeap_NS_becomeCurrentHeap +/* 8000F1D8 0000C118 48 2B F2 61 */ bl becomeCurrentHeap__7JKRHeapFv /* 8000F1DC 0000C11C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000F1E0 0000C120 7C 08 03 A6 */ mtlr r0 /* 8000F1E4 0000C124 38 21 00 10 */ addi r1, r1, 0x10 @@ -2438,7 +2438,7 @@ mDoExt_restoreCurrentHeap: /* 8000F1F8 0000C138 7C 08 02 A6 */ mflr r0 /* 8000F1FC 0000C13C 90 01 00 14 */ stw r0, 0x14(r1) /* 8000F200 0000C140 80 6D 86 C0 */ lwz r3, lbl_80450C40-_SDA_BASE_(r13) -/* 8000F204 0000C144 48 2B F2 35 */ bl JKRHeap_NS_becomeCurrentHeap +/* 8000F204 0000C144 48 2B F2 35 */ bl becomeCurrentHeap__7JKRHeapFv /* 8000F208 0000C148 38 00 00 00 */ li r0, 0 /* 8000F20C 0000C14C 90 0D 86 C0 */ stw r0, lbl_80450C40-_SDA_BASE_(r13) /* 8000F210 0000C150 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2979,7 +2979,7 @@ mDoExt_morf_c: /* 8000F9F8 0000C938 90 1F 00 00 */ stw r0, 0(r31) /* 8000F9FC 0000C93C 7C 80 07 35 */ extsh. r0, r4 /* 8000FA00 0000C940 40 81 00 08 */ ble lbl_8000FA08 -/* 8000FA04 0000C944 48 2B F3 39 */ bl __dl +/* 8000FA04 0000C944 48 2B F3 39 */ bl __dl__FPv lbl_8000FA08: /* 8000FA08 0000C948 7F E3 FB 78 */ mr r3, r31 /* 8000FA0C 0000C94C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3008,7 +3008,7 @@ lbl_8000FA64: /* 8000FA64 0000C9A4 7C 80 07 35 */ extsh. r0, r4 /* 8000FA68 0000C9A8 40 81 00 0C */ ble lbl_8000FA74 /* 8000FA6C 0000C9AC 7F E3 FB 78 */ mr r3, r31 -/* 8000FA70 0000C9B0 48 2B F2 CD */ bl __dl +/* 8000FA70 0000C9B0 48 2B F2 CD */ bl __dl__FPv lbl_8000FA74: /* 8000FA74 0000C9B4 7F E3 FB 78 */ mr r3, r31 /* 8000FA78 0000C9B8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3033,7 +3033,7 @@ lbl_8000FAC0: /* 8000FAC0 0000CA00 7C 80 07 35 */ extsh. r0, r4 /* 8000FAC4 0000CA04 40 81 00 0C */ ble lbl_8000FAD0 /* 8000FAC8 0000CA08 7F E3 FB 78 */ mr r3, r31 -/* 8000FACC 0000CA0C 48 2B F2 71 */ bl __dl +/* 8000FACC 0000CA0C 48 2B F2 71 */ bl __dl__FPv lbl_8000FAD0: /* 8000FAD0 0000CA10 7F E3 FB 78 */ mr r3, r31 /* 8000FAD4 0000CA14 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3076,7 +3076,7 @@ lbl_8000FB54: /* 8000FB54 0000CA94 7C 80 07 35 */ extsh. r0, r4 /* 8000FB58 0000CA98 40 81 00 0C */ ble lbl_8000FB64 /* 8000FB5C 0000CA9C 7F E3 FB 78 */ mr r3, r31 -/* 8000FB60 0000CAA0 48 2B F1 DD */ bl __dl +/* 8000FB60 0000CAA0 48 2B F1 DD */ bl __dl__FPv lbl_8000FB64: /* 8000FB64 0000CAA4 7F E3 FB 78 */ mr r3, r31 /* 8000FB68 0000CAA8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3222,7 +3222,7 @@ lbl_8000FD5C: /* 8000FD68 0000CCA8 7F E0 07 35 */ extsh. r0, r31 /* 8000FD6C 0000CCAC 40 81 00 0C */ ble lbl_8000FD78 /* 8000FD70 0000CCB0 7F C3 F3 78 */ mr r3, r30 -/* 8000FD74 0000CCB4 48 2B EF C9 */ bl __dl +/* 8000FD74 0000CCB4 48 2B EF C9 */ bl __dl__FPv lbl_8000FD78: /* 8000FD78 0000CCB8 7F C3 F3 78 */ mr r3, r30 /* 8000FD7C 0000CCBC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3306,7 +3306,7 @@ lbl_8000FE90: /* 8000FE90 0000CDD0 2C 1D 00 00 */ cmpwi r29, 0 /* 8000FE94 0000CDD4 41 82 00 34 */ beq lbl_8000FEC8 /* 8000FE98 0000CDD8 38 60 00 4C */ li r3, 0x4c -/* 8000FE9C 0000CDDC 48 2B ED B1 */ bl __nw +/* 8000FE9C 0000CDDC 48 2B ED B1 */ bl __nw__FUl /* 8000FEA0 0000CDE0 7C 7D 1B 79 */ or. r29, r3, r3 /* 8000FEA4 0000CDE4 41 82 00 14 */ beq lbl_8000FEB8 /* 8000FEA8 0000CDE8 48 2A EC ED */ bl Z2SoundObjAnime @@ -3343,7 +3343,7 @@ lbl_8000FEC8: /* 8000FF1C 0000CE5C A3 36 00 2C */ lhz r25, 0x2c(r22) /* 8000FF20 0000CE60 57 23 28 34 */ slwi r3, r25, 5 /* 8000FF24 0000CE64 38 63 00 10 */ addi r3, r3, 0x10 -/* 8000FF28 0000CE68 48 2B ED 9D */ bl __nwa +/* 8000FF28 0000CE68 48 2B ED 9D */ bl __nwa__FUl /* 8000FF2C 0000CE6C 38 80 00 00 */ li r4, 0 /* 8000FF30 0000CE70 38 A0 00 00 */ li r5, 0 /* 8000FF34 0000CE74 38 C0 00 20 */ li r6, 0x20 @@ -3355,7 +3355,7 @@ lbl_8000FEC8: /* 8000FF4C 0000CE8C 41 82 00 B0 */ beq lbl_8000FFFC /* 8000FF50 0000CE90 A0 16 00 2C */ lhz r0, 0x2c(r22) /* 8000FF54 0000CE94 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b -/* 8000FF58 0000CE98 48 2B ED 6D */ bl __nwa +/* 8000FF58 0000CE98 48 2B ED 6D */ bl __nwa__FUl /* 8000FF5C 0000CE9C 90 75 00 24 */ stw r3, 0x24(r21) /* 8000FF60 0000CEA0 80 15 00 24 */ lwz r0, 0x24(r21) /* 8000FF64 0000CEA4 28 00 00 00 */ cmplwi r0, 0 @@ -4011,7 +4011,7 @@ mDoExt_McaMorfSO: /* 800108C4 0000D804 7F E0 07 35 */ extsh. r0, r31 /* 800108C8 0000D808 40 81 00 0C */ ble lbl_800108D4 /* 800108CC 0000D80C 7F C3 F3 78 */ mr r3, r30 -/* 800108D0 0000D810 48 2B E4 6D */ bl __dl +/* 800108D0 0000D810 48 2B E4 6D */ bl __dl__FPv lbl_800108D4: /* 800108D4 0000D814 7F C3 F3 78 */ mr r3, r30 /* 800108D8 0000D818 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4110,7 +4110,7 @@ lbl_800109D8: /* 80010A28 0000D968 A3 78 00 2C */ lhz r27, 0x2c(r24) /* 80010A2C 0000D96C 57 63 28 34 */ slwi r3, r27, 5 /* 80010A30 0000D970 38 63 00 10 */ addi r3, r3, 0x10 -/* 80010A34 0000D974 48 2B E2 91 */ bl __nwa +/* 80010A34 0000D974 48 2B E2 91 */ bl __nwa__FUl /* 80010A38 0000D978 38 80 00 00 */ li r4, 0 /* 80010A3C 0000D97C 38 A0 00 00 */ li r5, 0 /* 80010A40 0000D980 38 C0 00 20 */ li r6, 0x20 @@ -4122,7 +4122,7 @@ lbl_800109D8: /* 80010A58 0000D998 41 82 00 B0 */ beq lbl_80010B08 /* 80010A5C 0000D99C A0 18 00 2C */ lhz r0, 0x2c(r24) /* 80010A60 0000D9A0 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b -/* 80010A64 0000D9A4 48 2B E2 61 */ bl __nwa +/* 80010A64 0000D9A4 48 2B E2 61 */ bl __nwa__FUl /* 80010A68 0000D9A8 90 77 00 24 */ stw r3, 0x24(r23) /* 80010A6C 0000D9AC 80 17 00 24 */ lwz r0, 0x24(r23) /* 80010A70 0000D9B0 28 00 00 00 */ cmplwi r0, 0 @@ -4812,7 +4812,7 @@ lbl_80011338: /* 80011438 0000E378 7F E0 07 35 */ extsh. r0, r31 /* 8001143C 0000E37C 40 81 00 0C */ ble lbl_80011448 /* 80011440 0000E380 7F C3 F3 78 */ mr r3, r30 -/* 80011444 0000E384 48 2B D8 F9 */ bl __dl +/* 80011444 0000E384 48 2B D8 F9 */ bl __dl__FPv lbl_80011448: /* 80011448 0000E388 7F C3 F3 78 */ mr r3, r30 /* 8001144C 0000E38C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4909,7 +4909,7 @@ lbl_8001153C: /* 80011598 0000E4D8 A3 36 00 2C */ lhz r25, 0x2c(r22) /* 8001159C 0000E4DC 57 23 28 34 */ slwi r3, r25, 5 /* 800115A0 0000E4E0 38 63 00 10 */ addi r3, r3, 0x10 -/* 800115A4 0000E4E4 48 2B D7 21 */ bl __nwa +/* 800115A4 0000E4E4 48 2B D7 21 */ bl __nwa__FUl /* 800115A8 0000E4E8 38 80 00 00 */ li r4, 0 /* 800115AC 0000E4EC 38 A0 00 00 */ li r5, 0 /* 800115B0 0000E4F0 38 C0 00 20 */ li r6, 0x20 @@ -4926,7 +4926,7 @@ lbl_8001153C: lbl_800115DC: /* 800115DC 0000E51C A0 16 00 2C */ lhz r0, 0x2c(r22) /* 800115E0 0000E520 54 03 23 36 */ rlwinm r3, r0, 4, 0xc, 0x1b -/* 800115E4 0000E524 48 2B D6 E1 */ bl __nwa +/* 800115E4 0000E524 48 2B D6 E1 */ bl __nwa__FUl /* 800115E8 0000E528 90 75 00 24 */ stw r3, 0x24(r21) /* 800115EC 0000E52C 80 15 00 24 */ lwz r0, 0x24(r21) /* 800115F0 0000E530 28 00 00 00 */ cmplwi r0, 0 @@ -5893,7 +5893,7 @@ mDoExt_3Dline_c_NS_init: /* 800123F4 0000F334 54 9B 04 3E */ clrlwi r27, r4, 0x10 /* 800123F8 0000F338 1C 7B 00 0C */ mulli r3, r27, 0xc /* 800123FC 0000F33C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80012400 0000F340 48 2B C8 C5 */ bl __nwa +/* 80012400 0000F340 48 2B C8 C5 */ bl __nwa__FUl /* 80012404 0000F344 3C 80 80 01 */ lis r4, cXyz@ha /* 80012408 0000F348 38 84 25 DC */ addi r4, r4, cXyz@l /* 8001240C 0000F34C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha @@ -5911,7 +5911,7 @@ lbl_80012438: /* 80012438 0000F378 2C 1E 00 00 */ cmpwi r30, 0 /* 8001243C 0000F37C 41 82 00 24 */ beq lbl_80012460 /* 80012440 0000F380 57 63 10 3A */ slwi r3, r27, 2 -/* 80012444 0000F384 48 2B C8 81 */ bl __nwa +/* 80012444 0000F384 48 2B C8 81 */ bl __nwa__FUl /* 80012448 0000F388 90 7C 00 04 */ stw r3, 4(r28) /* 8001244C 0000F38C 80 1C 00 04 */ lwz r0, 4(r28) /* 80012450 0000F390 28 00 00 00 */ cmplwi r0, 0 @@ -5928,7 +5928,7 @@ lbl_80012468: /* 80012474 0000F3B4 7C 1B 03 78 */ mr r27, r0 /* 80012478 0000F3B8 1C 60 00 0C */ mulli r3, r0, 0xc /* 8001247C 0000F3BC 38 63 00 10 */ addi r3, r3, 0x10 -/* 80012480 0000F3C0 48 2B C8 45 */ bl __nwa +/* 80012480 0000F3C0 48 2B C8 45 */ bl __nwa__FUl /* 80012484 0000F3C4 3C 80 80 01 */ lis r4, cXyz@ha /* 80012488 0000F3C8 38 84 25 DC */ addi r4, r4, cXyz@l /* 8001248C 0000F3CC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha @@ -5945,7 +5945,7 @@ lbl_80012468: lbl_800124B8: /* 800124B8 0000F3F8 1C 7F 00 0C */ mulli r3, r31, 0xc /* 800124BC 0000F3FC 38 63 00 10 */ addi r3, r3, 0x10 -/* 800124C0 0000F400 48 2B C8 05 */ bl __nwa +/* 800124C0 0000F400 48 2B C8 05 */ bl __nwa__FUl /* 800124C4 0000F404 3C 80 80 01 */ lis r4, cXyz@ha /* 800124C8 0000F408 38 84 25 DC */ addi r4, r4, cXyz@l /* 800124CC 0000F40C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha @@ -5962,7 +5962,7 @@ lbl_800124B8: lbl_800124F8: /* 800124F8 0000F438 1F 7F 00 03 */ mulli r27, r31, 3 /* 800124FC 0000F43C 7F 63 DB 78 */ mr r3, r27 -/* 80012500 0000F440 48 2B C7 C5 */ bl __nwa +/* 80012500 0000F440 48 2B C7 C5 */ bl __nwa__FUl /* 80012504 0000F444 90 7C 00 10 */ stw r3, 0x10(r28) /* 80012508 0000F448 80 1C 00 10 */ lwz r0, 0x10(r28) /* 8001250C 0000F44C 28 00 00 00 */ cmplwi r0, 0 @@ -5971,7 +5971,7 @@ lbl_800124F8: /* 80012518 0000F458 48 00 00 AC */ b lbl_800125C4 lbl_8001251C: /* 8001251C 0000F45C 7F 63 DB 78 */ mr r3, r27 -/* 80012520 0000F460 48 2B C7 A5 */ bl __nwa +/* 80012520 0000F460 48 2B C7 A5 */ bl __nwa__FUl /* 80012524 0000F464 90 7C 00 14 */ stw r3, 0x14(r28) /* 80012528 0000F468 80 1C 00 14 */ lwz r0, 0x14(r28) /* 8001252C 0000F46C 28 00 00 00 */ cmplwi r0, 0 @@ -5983,7 +5983,7 @@ lbl_8001253C: /* 80012540 0000F480 41 82 00 80 */ beq lbl_800125C0 /* 80012544 0000F484 57 FB 18 38 */ slwi r27, r31, 3 /* 80012548 0000F488 7F 63 DB 78 */ mr r3, r27 -/* 8001254C 0000F48C 48 2B C7 79 */ bl __nwa +/* 8001254C 0000F48C 48 2B C7 79 */ bl __nwa__FUl /* 80012550 0000F490 90 7C 00 18 */ stw r3, 0x18(r28) /* 80012554 0000F494 80 1C 00 18 */ lwz r0, 0x18(r28) /* 80012558 0000F498 28 00 00 00 */ cmplwi r0, 0 @@ -5992,7 +5992,7 @@ lbl_8001253C: /* 80012564 0000F4A4 48 00 00 60 */ b lbl_800125C4 lbl_80012568: /* 80012568 0000F4A8 7F 63 DB 78 */ mr r3, r27 -/* 8001256C 0000F4AC 48 2B C7 59 */ bl __nwa +/* 8001256C 0000F4AC 48 2B C7 59 */ bl __nwa__FUl /* 80012570 0000F4B0 90 7C 00 1C */ stw r3, 0x1c(r28) /* 80012574 0000F4B4 80 1C 00 1C */ lwz r0, 0x1c(r28) /* 80012578 0000F4B8 28 00 00 00 */ cmplwi r0, 0 @@ -6042,7 +6042,7 @@ cXyz: /* 8001260C 0000F54C 54 9F 04 3E */ clrlwi r31, r4, 0x10 /* 80012610 0000F550 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a /* 80012614 0000F554 38 63 00 10 */ addi r3, r3, 0x10 -/* 80012618 0000F558 48 2B C6 AD */ bl __nwa +/* 80012618 0000F558 48 2B C6 AD */ bl __nwa__FUl .global mDoExt_3Dline_c /* 8001261C 0000F55C 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha .global mDoExt_3Dline_c @@ -6940,7 +6940,7 @@ lbl_80013334: /* 80013390 000102D0 54 9D 04 3E */ clrlwi r29, r4, 0x10 /* 80013394 000102D4 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a /* 80013398 000102D8 38 63 00 10 */ addi r3, r3, 0x10 -/* 8001339C 000102DC 48 2B B9 29 */ bl __nwa +/* 8001339C 000102DC 48 2B B9 29 */ bl __nwa__FUl .global mDoExt_3Dline_c /* 800133A0 000102E0 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha .global mDoExt_3Dline_c @@ -8348,7 +8348,7 @@ mDoExt_initFontCommon: /* 80014860 000117A0 38 60 00 B8 */ li r3, 0xb8 /* 80014864 000117A4 7F 44 D3 78 */ mr r4, r26 /* 80014868 000117A8 38 A0 00 00 */ li r5, 0 -/* 8001486C 000117AC 48 2B A4 2D */ bl __nw_X2_ +/* 8001486C 000117AC 48 2B A4 2D */ bl __nw__FUlP7JKRHeapi /* 80014870 000117B0 7C 64 1B 79 */ or. r4, r3, r3 /* 80014874 000117B4 41 82 00 18 */ beq lbl_8001488C /* 80014878 000117B8 80 9F 00 00 */ lwz r4, 0(r31) @@ -8372,7 +8372,7 @@ lbl_800148A4: /* 800148B8 000117F8 48 00 00 28 */ b lbl_800148E0 lbl_800148BC: /* 800148BC 000117FC 38 60 00 70 */ li r3, 0x70 -/* 800148C0 00011800 48 2B A3 8D */ bl __nw +/* 800148C0 00011800 48 2B A3 8D */ bl __nw__FUl /* 800148C4 00011804 7C 60 1B 79 */ or. r0, r3, r3 /* 800148C8 00011808 41 82 00 14 */ beq lbl_800148DC /* 800148CC 0001180C 80 9F 00 00 */ lwz r4, 0(r31) @@ -8422,7 +8422,7 @@ lbl_80014934: /* 8001496C 000118AC 90 1F 00 00 */ stw r0, 0(r31) /* 80014970 000118B0 7C 80 07 35 */ extsh. r0, r4 /* 80014974 000118B4 40 81 00 08 */ ble lbl_8001497C -/* 80014978 000118B8 48 2B A3 C5 */ bl __dl +/* 80014978 000118B8 48 2B A3 C5 */ bl __dl__FPv lbl_8001497C: /* 8001497C 000118BC 7F E3 FB 78 */ mr r3, r31 /* 80014980 000118C0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8502,7 +8502,7 @@ lbl_80014A70: /* 80014A7C 000119BC 28 03 00 00 */ cmplwi r3, 0 /* 80014A80 000119C0 41 82 00 14 */ beq lbl_80014A94 /* 80014A84 000119C4 38 80 00 00 */ li r4, 0 -/* 80014A88 000119C8 48 2B 9A 79 */ bl JKRHeap_NS_free +/* 80014A88 000119C8 48 2B 9A 79 */ bl free__7JKRHeapFPvP7JKRHeap /* 80014A8C 000119CC 38 00 00 00 */ li r0, 0 /* 80014A90 000119D0 90 0D 86 CC */ stw r0, lbl_80450C4C-_SDA_BASE_(r13) lbl_80014A94: @@ -8629,7 +8629,7 @@ lbl_80014C20: /* 80014C2C 00011B6C 28 03 00 00 */ cmplwi r3, 0 /* 80014C30 00011B70 41 82 00 14 */ beq lbl_80014C44 /* 80014C34 00011B74 38 80 00 00 */ li r4, 0 -/* 80014C38 00011B78 48 2B 98 C9 */ bl JKRHeap_NS_free +/* 80014C38 00011B78 48 2B 98 C9 */ bl free__7JKRHeapFPvP7JKRHeap /* 80014C3C 00011B7C 38 00 00 00 */ li r0, 0 /* 80014C40 00011B80 90 0D 86 E4 */ stw r0, lbl_80450C64-_SDA_BASE_(r13) lbl_80014C44: @@ -8650,7 +8650,7 @@ mDoExt_J3DModel__create: /* 80014C70 00011BB0 7C BE 2B 78 */ mr r30, r5 /* 80014C74 00011BB4 41 82 00 CC */ beq lbl_80014D40 /* 80014C78 00011BB8 38 60 00 DC */ li r3, 0xdc -/* 80014C7C 00011BBC 48 2B 9F D1 */ bl __nw +/* 80014C7C 00011BBC 48 2B 9F D1 */ bl __nw__FUl /* 80014C80 00011BC0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80014C84 00011BC4 41 82 00 20 */ beq lbl_80014CA4 /* 80014C88 00011BC8 3C 60 80 3D */ lis r3, lbl_803CED20@ha @@ -8788,7 +8788,7 @@ lbl_80014E54: /* 80014E54 00011D94 7C 80 07 35 */ extsh. r0, r4 /* 80014E58 00011D98 40 81 00 0C */ ble lbl_80014E64 /* 80014E5C 00011D9C 7F E3 FB 78 */ mr r3, r31 -/* 80014E60 00011DA0 48 2B 9E DD */ bl __dl +/* 80014E60 00011DA0 48 2B 9E DD */ bl __dl__FPv lbl_80014E64: /* 80014E64 00011DA4 7F E3 FB 78 */ mr r3, r31 /* 80014E68 00011DA8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8838,7 +8838,7 @@ lbl_80014F14: /* 80014F14 00011E54 7C 80 07 35 */ extsh. r0, r4 /* 80014F18 00011E58 40 81 00 0C */ ble lbl_80014F24 /* 80014F1C 00011E5C 7F E3 FB 78 */ mr r3, r31 -/* 80014F20 00011E60 48 2B 9E 1D */ bl __dl +/* 80014F20 00011E60 48 2B 9E 1D */ bl __dl__FPv lbl_80014F24: /* 80014F24 00011E64 7F E3 FB 78 */ mr r3, r31 /* 80014F28 00011E68 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8871,7 +8871,7 @@ lbl_80014F90: /* 80014F90 00011ED0 7C 80 07 35 */ extsh. r0, r4 /* 80014F94 00011ED4 40 81 00 0C */ ble lbl_80014FA0 /* 80014F98 00011ED8 7F E3 FB 78 */ mr r3, r31 -/* 80014F9C 00011EDC 48 2B 9D A1 */ bl __dl +/* 80014F9C 00011EDC 48 2B 9D A1 */ bl __dl__FPv lbl_80014FA0: /* 80014FA0 00011EE0 7F E3 FB 78 */ mr r3, r31 /* 80014FA4 00011EE4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8904,7 +8904,7 @@ lbl_8001500C: /* 8001500C 00011F4C 7C 80 07 35 */ extsh. r0, r4 /* 80015010 00011F50 40 81 00 0C */ ble lbl_8001501C /* 80015014 00011F54 7F E3 FB 78 */ mr r3, r31 -/* 80015018 00011F58 48 2B 9D 25 */ bl __dl +/* 80015018 00011F58 48 2B 9D 25 */ bl __dl__FPv lbl_8001501C: /* 8001501C 00011F5C 7F E3 FB 78 */ mr r3, r31 /* 80015020 00011F60 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index b1dd431094..d5ff5fc209 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -20,7 +20,7 @@ createTimg: /* 80007DCC 00004D0C 7F E3 FB 78 */ mr r3, r31 /* 80007DD0 00004D10 38 80 00 20 */ li r4, 0x20 /* 80007DD4 00004D14 38 A0 00 00 */ li r5, 0 -/* 80007DD8 00004D18 48 2C 66 9D */ bl JKRHeap_NS_alloc +/* 80007DD8 00004D18 48 2C 66 9D */ bl alloc__7JKRHeapFUliP7JKRHeap /* 80007DDC 00004D1C 7C 60 1B 78 */ mr r0, r3 /* 80007DE0 00004D20 7C 1E 03 79 */ or. r30, r0, r0 /* 80007DE4 00004D24 40 82 00 0C */ bne lbl_80007DF0 @@ -64,7 +64,7 @@ mDoGph_gInf_c_NS_create: /* 80007E68 00004DA8 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 80007E6C 00004DAC 90 03 00 18 */ stw r0, 0x18(r3) /* 80007E70 00004DB0 38 60 00 28 */ li r3, 0x28 -/* 80007E74 00004DB4 48 2C 6D D9 */ bl __nw +/* 80007E74 00004DB4 48 2C 6D D9 */ bl __nw__FUl /* 80007E78 00004DB8 7C 60 1B 79 */ or. r0, r3, r3 /* 80007E7C 00004DBC 41 82 00 44 */ beq lbl_80007EC0 /* 80007E80 00004DC0 38 00 00 00 */ li r0, 0 @@ -1368,7 +1368,7 @@ cXyz_NS_dtor: /* 80009198 000060D8 41 82 00 10 */ beq lbl_800091A8 /* 8000919C 000060DC 7C 80 07 35 */ extsh. r0, r4 /* 800091A0 000060E0 40 81 00 08 */ ble lbl_800091A8 -/* 800091A4 000060E4 48 2C 5B 99 */ bl __dl +/* 800091A4 000060E4 48 2C 5B 99 */ bl __dl__FPv lbl_800091A8: /* 800091A8 000060E8 7F E3 FB 78 */ mr r3, r31 /* 800091AC 000060EC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1631,7 +1631,7 @@ mDoGph_gInf_c_NS_bloom_c_NS_create: /* 80009584 000064C4 48 00 58 69 */ bl mDoExt_getArchiveHeap /* 80009588 000064C8 7F E4 FB 78 */ mr r4, r31 /* 8000958C 000064CC 38 A0 FF E0 */ li r5, -32 -/* 80009590 000064D0 48 2C 4F 45 */ bl JKRHeap_NS_alloc_X1_ +/* 80009590 000064D0 48 2C 4F 45 */ bl alloc__7JKRHeapFUli /* 80009594 000064D4 90 7E 00 10 */ stw r3, 0x10(r30) /* 80009598 000064D8 38 00 00 00 */ li r0, 0 /* 8000959C 000064DC 98 1E 00 08 */ stb r0, 8(r30) @@ -1672,7 +1672,7 @@ mDoGph_gInf_c_NS_bloom_c_NS_remove: /* 80009618 00006558 41 82 00 18 */ beq lbl_80009630 /* 8000961C 0000655C 48 00 57 D1 */ bl mDoExt_getArchiveHeap /* 80009620 00006560 7F E4 FB 78 */ mr r4, r31 -/* 80009624 00006564 48 2C 4F 25 */ bl JKRHeap_NS_free_X1_ +/* 80009624 00006564 48 2C 4F 25 */ bl free__7JKRHeapFPv /* 80009628 00006568 38 00 00 00 */ li r0, 0 /* 8000962C 0000656C 90 1E 00 10 */ stw r0, 0x10(r30) lbl_80009630: @@ -3473,7 +3473,7 @@ lbl_8000B14C: /* 8000B14C 0000808C 7C 80 07 35 */ extsh. r0, r4 /* 8000B150 00008090 40 81 00 0C */ ble lbl_8000B15C /* 8000B154 00008094 7F E3 FB 78 */ mr r3, r31 -/* 8000B158 00008098 48 2C 3B E5 */ bl __dl +/* 8000B158 00008098 48 2C 3B E5 */ bl __dl__FPv lbl_8000B15C: /* 8000B15C 0000809C 7F E3 FB 78 */ mr r3, r31 /* 8000B160 000080A0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/m/Do/m_Do_lib.s b/asm/m/Do/m_Do_lib.s index e2ccd678bc..35c7d3c796 100644 --- a/asm/m/Do/m_Do_lib.s +++ b/asm/m/Do/m_Do_lib.s @@ -321,7 +321,7 @@ J3DUClipper_NS_dtor: /* 800155B0 000124F0 90 1F 00 00 */ stw r0, 0(r31) /* 800155B4 000124F4 7C 80 07 35 */ extsh. r0, r4 /* 800155B8 000124F8 40 81 00 08 */ ble lbl_800155C0 -/* 800155BC 000124FC 48 2B 97 81 */ bl __dl +/* 800155BC 000124FC 48 2B 97 81 */ bl __dl__FPv lbl_800155C0: /* 800155C0 00012500 7F E3 FB 78 */ mr r3, r31 /* 800155C4 00012504 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/m/Do/m_Do_machine.s b/asm/m/Do/m_Do_machine.s index 4c0ba15f22..fb9d7378ff 100644 --- a/asm/m/Do/m_Do_machine.s +++ b/asm/m/Do/m_Do_machine.s @@ -195,7 +195,7 @@ lbl_8000B45C: /* 8000B484 000083C4 4B FF FD 69 */ bl myGetHeapTypeByString /* 8000B488 000083C8 7C 7D 1B 78 */ mr r29, r3 /* 8000B48C 000083CC 7F E3 FB 78 */ mr r3, r31 -/* 8000B490 000083D0 48 2C 32 F5 */ bl JKRHeap_NS_getTotalFreeSize +/* 8000B490 000083D0 48 2C 32 F5 */ bl getTotalFreeSize__7JKRHeapFv /* 8000B494 000083D4 7C 7E 1B 78 */ mr r30, r3 /* 8000B498 000083D8 7F E3 FB 78 */ mr r3, r31 /* 8000B49C 000083DC 48 2C 32 91 */ bl getFreeSize__7JKRHeapFv @@ -947,13 +947,13 @@ lbl_8000BED4: /* 8000BED4 00008E14 3C 60 80 01 */ lis r3, myMemoryErrorRoutine@ha .global myMemoryErrorRoutine /* 8000BED8 00008E18 38 63 B3 EC */ addi r3, r3, myMemoryErrorRoutine@l -/* 8000BEDC 00008E1C 48 2C 2C AD */ bl JKRHeap_NS_setErrorHandler +/* 8000BEDC 00008E1C 48 2C 2C AD */ bl setErrorHandler__7JKRHeapFPFPvUli_v /* 8000BEE0 00008E20 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) /* 8000BEE4 00008E24 38 80 00 01 */ li r4, 1 -/* 8000BEE8 00008E28 48 2C 2C 91 */ bl JKRHeap_NS_setErrorFlag +/* 8000BEE8 00008E28 48 2C 2C 91 */ bl setErrorFlag__7JKRHeapFb /* 8000BEEC 00008E2C 80 6D 8C 24 */ lwz r3, lbl_804511A4-_SDA_BASE_(r13) /* 8000BEF0 00008E30 38 80 00 01 */ li r4, 1 -/* 8000BEF4 00008E34 48 2C 2C 85 */ bl JKRHeap_NS_setErrorFlag +/* 8000BEF4 00008E34 48 2C 2C 85 */ bl setErrorFlag__7JKRHeapFb /* 8000BEF8 00008E38 83 CD 8D F8 */ lwz r30, lbl_80451378-_SDA_BASE_(r13) /* 8000BEFC 00008E3C 38 60 10 00 */ li r3, 0x1000 /* 8000BF00 00008E40 7F C4 F3 78 */ mr r4, r30 @@ -1012,7 +1012,7 @@ lbl_8000BED4: /* 8000BFD4 00008F14 7F C5 F3 78 */ mr r5, r30 /* 8000BFD8 00008F18 4B FF FD 21 */ bl my_SysPrintHeap /* 8000BFDC 00008F1C 7F E3 FB 78 */ mr r3, r31 -/* 8000BFE0 00008F20 48 2C 24 59 */ bl JKRHeap_NS_becomeCurrentHeap +/* 8000BFE0 00008F20 48 2C 24 59 */ bl becomeCurrentHeap__7JKRHeapFv /* 8000BFE4 00008F24 38 60 00 00 */ li r3, 0 /* 8000BFE8 00008F28 38 80 20 00 */ li r4, 0x2000 /* 8000BFEC 00008F2C 80 AD 8D F0 */ lwz r5, lbl_80451370-_SDA_BASE_(r13) @@ -1020,7 +1020,7 @@ lbl_8000BED4: /* 8000BFF4 00008F34 38 60 00 00 */ li r3, 0 /* 8000BFF8 00008F38 48 2C 5A 1D */ bl JKRThreadSwitch_NS_createManager /* 8000BFFC 00008F3C 38 60 00 7C */ li r3, 0x7c -/* 8000C000 00008F40 48 2C 2C 4D */ bl __nw +/* 8000C000 00008F40 48 2C 2C 4D */ bl __nw__FUl /* 8000C004 00008F44 7C 7F 1B 79 */ or. r31, r3, r3 /* 8000C008 00008F48 41 82 00 18 */ beq lbl_8000C020 /* 8000C00C 00008F4C 48 33 4C 79 */ bl OSGetCurrentThread diff --git a/asm/m/Do/m_Do_main.s b/asm/m/Do/m_Do_main.s index 1dd7d97a4e..87d4e845f6 100644 --- a/asm/m/Do/m_Do_main.s +++ b/asm/m/Do/m_Do_main.s @@ -18,7 +18,7 @@ HeapCheck_NS_heapDisplay: /* 800058F0 00002830 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv /* 800058F4 00002834 7C 7E 1B 78 */ mr r30, r3 /* 800058F8 00002838 80 7D 00 08 */ lwz r3, 8(r29) -/* 800058FC 0000283C 48 2C 8E 89 */ bl JKRHeap_NS_getTotalFreeSize +/* 800058FC 0000283C 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapFv /* 80005900 00002840 7C 7B 1B 78 */ mr r27, r3 /* 80005904 00002844 80 7D 00 08 */ lwz r3, 8(r29) /* 80005908 00002848 48 2C 8E 25 */ bl getFreeSize__7JKRHeapFv @@ -247,7 +247,7 @@ lbl_80005C60: /* 80005C68 00002BA8 48 00 00 48 */ b lbl_80005CB0 lbl_80005C6C: /* 80005C6C 00002BAC 7F 03 C3 78 */ mr r3, r24 -/* 80005C70 00002BB0 48 2C 8B 15 */ bl JKRHeap_NS_getTotalFreeSize +/* 80005C70 00002BB0 48 2C 8B 15 */ bl getTotalFreeSize__7JKRHeapFv /* 80005C74 00002BB4 7C 7E 1B 78 */ mr r30, r3 /* 80005C78 00002BB8 7F 03 C3 78 */ mr r3, r24 /* 80005C7C 00002BBC 48 2C 8A B1 */ bl getFreeSize__7JKRHeapFv diff --git a/asm/m/Do/m_Do_mtx.s b/asm/m/Do/m_Do_mtx.s index 3df3c4f3c3..f56036be8f 100644 --- a/asm/m/Do/m_Do_mtx.s +++ b/asm/m/Do/m_Do_mtx.s @@ -1109,7 +1109,7 @@ mDoMtx_quatStack_c_NS_dtor: /* 8000D048 00009F88 41 82 00 10 */ beq lbl_8000D058 /* 8000D04C 00009F8C 7C 80 07 35 */ extsh. r0, r4 /* 8000D050 00009F90 40 81 00 08 */ ble lbl_8000D058 -/* 8000D054 00009F94 48 2C 1C E9 */ bl __dl +/* 8000D054 00009F94 48 2C 1C E9 */ bl __dl__FPv lbl_8000D058: /* 8000D058 00009F98 7F E3 FB 78 */ mr r3, r31 /* 8000D05C 00009F9C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1127,7 +1127,7 @@ mDoMtx_stack_c_NS_dtor: /* 8000D084 00009FC4 41 82 00 10 */ beq lbl_8000D094 /* 8000D088 00009FC8 7C 80 07 35 */ extsh. r0, r4 /* 8000D08C 00009FCC 40 81 00 08 */ ble lbl_8000D094 -/* 8000D090 00009FD0 48 2C 1C AD */ bl __dl +/* 8000D090 00009FD0 48 2C 1C AD */ bl __dl__FPv lbl_8000D094: /* 8000D094 00009FD4 7F E3 FB 78 */ mr r3, r31 /* 8000D098 00009FD8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/m/Do/machine/m_Do_machine_exception.s b/asm/m/Do/machine/m_Do_machine_exception.s index 766d836744..0149b67898 100644 --- a/asm/m/Do/machine/m_Do_machine_exception.s +++ b/asm/m/Do/machine/m_Do_machine_exception.s @@ -75,13 +75,13 @@ dispHeapInfo: /* 80017E6C 00014DAC 48 2B 68 C1 */ bl getFreeSize__7JKRHeapFv /* 80017E70 00014DB0 7C 79 1B 78 */ mr r25, r3 /* 80017E74 00014DB4 7F E3 FB 78 */ mr r3, r31 -/* 80017E78 00014DB8 48 2B 69 0D */ bl JKRHeap_NS_getTotalFreeSize +/* 80017E78 00014DB8 48 2B 69 0D */ bl getTotalFreeSize__7JKRHeapFv /* 80017E7C 00014DBC 7C 7A 1B 78 */ mr r26, r3 /* 80017E80 00014DC0 7F C3 F3 78 */ mr r3, r30 -/* 80017E84 00014DC4 48 2B 69 01 */ bl JKRHeap_NS_getTotalFreeSize +/* 80017E84 00014DC4 48 2B 69 01 */ bl getTotalFreeSize__7JKRHeapFv /* 80017E88 00014DC8 7C 7B 1B 78 */ mr r27, r3 /* 80017E8C 00014DCC 7F A3 EB 78 */ mr r3, r29 -/* 80017E90 00014DD0 48 2B 68 F5 */ bl JKRHeap_NS_getTotalFreeSize +/* 80017E90 00014DD0 48 2B 68 F5 */ bl getTotalFreeSize__7JKRHeapFv /* 80017E94 00014DD4 7C 7C 1B 78 */ mr r28, r3 /* 80017E98 00014DD8 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017E9C 00014DDC 38 63 44 60 */ addi r3, r3, lbl_80374460@l diff --git a/include/JKernel/JKRDisposer.h b/include/JKernel/JKRDisposer.h new file mode 100644 index 0000000000..8bbb6fbf89 --- /dev/null +++ b/include/JKernel/JKRDisposer.h @@ -0,0 +1,19 @@ +#ifndef __JKRDISPOSER_H__ +#define __JKRDISPOSER_H__ + +#include "dolphin/types.h" +#include "JSupport/JSUList.h" + +class JKRHeap; +class JKRDisposer { + public: + JKRDisposer(); + ~JKRDisposer(); + + public: + void** __vt; + JKRHeap* heap; + JSUPtrLink ptr_link; +}; + +#endif diff --git a/include/JKernel/JKRHeap.h b/include/JKernel/JKRHeap.h new file mode 100644 index 0000000000..f2c17d2a47 --- /dev/null +++ b/include/JKernel/JKRHeap.h @@ -0,0 +1,80 @@ + +#include "dolphin/types.h" +#include "JKernel/JKRDisposer.h" + +typedef void (*JKRErrorHandler)(void*, unsigned long, int); +class JKRHeap : JKRDisposer { + public: + JKRHeap(void*, u32, JKRHeap*, bool); + ~JKRHeap(); + + static bool initArena(char**, u32*, int); + void becomeSystemHeap(); + void becomeCurrentHeap(); + void destroy(); + + static void* alloc(u32 size, int alignment, JKRHeap* heap); + void* alloc(u32 size, int alignment); + + static void free(void* ptr, JKRHeap* heap); + void free(void* ptr); + + void callAllDisposer(); + void freeAll(); + void freeTail(); + + static s32 resize(void* ptr, u32 size, JKRHeap* heap); + s32 resize(void* ptr, u32 size); + + static s32 getSize(void* ptr, JKRHeap* heap); + s32 getSize(void* ptr); + + u32 getFreeSize(); + u32 getMaxFreeBlock(); + u32 getTotalFreeSize(); + u8 changeGroupID(u8 param_1); + u32 getMaxAllocatableSize(int alignment); + + static JKRHeap* findFromRoot(void* ptr); + JKRHeap* find(void* ptr) const; + JKRHeap* findAllHeap(void* ptr) const; + + void dispose_subroutine(u32 begin, u32 end); + void dispose(void* ptr, u32 size); + void dispose(void* begin, void* end); + void dispose(); + + static void copyMemory(void* dst, void* src, u32 size); + static void JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment); + + bool setErrorFlag(bool param_1); + static JKRErrorHandler setErrorHandler(JKRErrorHandler param_1); + + bool isSubHeap(JKRHeap* heap) const; + + public: + u8 mutex[24]; + u32 begin; + u32 end; + u32 size; + u8 field_0x3c; + u8 field_0x3d; + u8 field_0x3e; + u8 field_0x3f; + JSUPtrList child_list; + JSUPtrLink heap_link; + JSUPtrList disposable_list; + bool error_handler; + u8 field_0x69; +}; + +void* operator new(u32 size); +void* operator new(u32 size, int alignment); +void* operator new(u32 size, JKRHeap* heap, int alignment); + +void* operator new[](u32 size); +void* operator new[](u32 size, int alignment); +void* operator new[](u32 size, JKRHeap* heap, int alignment); + +void operator delete(void* ptr); +void operator delete[](void* ptr); \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE138.s b/include/JKernel/asm/func_802CE138.s new file mode 100644 index 0000000000..feb4fec5fc --- /dev/null +++ b/include/JKernel/asm/func_802CE138.s @@ -0,0 +1,82 @@ +/* 802CE138 002CB078 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE13C 002CB07C 7C 08 02 A6 */ mflr r0 +/* 802CE140 002CB080 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE144 002CB084 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE148 002CB088 48 09 40 89 */ bl func_803621D0 +/* 802CE14C 002CB08C 7C 7F 1B 78 */ mr r31, r3 +/* 802CE150 002CB090 7C 9B 23 78 */ mr r27, r4 +/* 802CE154 002CB094 7C BC 2B 78 */ mr r28, r5 +/* 802CE158 002CB098 7C DD 33 78 */ mr r29, r6 +/* 802CE15C 002CB09C 7C FE 3B 78 */ mr r30, r7 +/* 802CE160 002CB0A0 48 00 33 1D */ bl __ct__11JKRDisposerFv +/* 802CE164 002CB0A4 3C 60 80 3D */ lis r3, lbl_803CBF70@ha +/* 802CE168 002CB0A8 38 03 BF 70 */ addi r0, r3, lbl_803CBF70@l +/* 802CE16C 002CB0AC 90 1F 00 00 */ stw r0, 0(r31) +/* 802CE170 002CB0B0 3B 5F 00 40 */ addi r26, r31, 0x40 +/* 802CE174 002CB0B4 7F 43 D3 78 */ mr r3, r26 +/* 802CE178 002CB0B8 48 00 DD 9D */ bl initiate__10JSUPtrListFv +/* 802CE17C 002CB0BC 38 7A 00 0C */ addi r3, r26, 0xc +/* 802CE180 002CB0C0 7F E4 FB 78 */ mr r4, r31 +/* 802CE184 002CB0C4 48 00 DC 79 */ bl __ct__10JSUPtrLinkFPv +/* 802CE188 002CB0C8 38 7F 00 5C */ addi r3, r31, 0x5c +/* 802CE18C 002CB0CC 48 00 DD 89 */ bl initiate__10JSUPtrListFv +/* 802CE190 002CB0D0 38 7F 00 18 */ addi r3, r31, 0x18 +/* 802CE194 002CB0D4 48 07 0E 75 */ bl OSInitMutex +/* 802CE198 002CB0D8 93 9F 00 38 */ stw r28, 0x38(r31) +/* 802CE19C 002CB0DC 93 7F 00 30 */ stw r27, 0x30(r31) +/* 802CE1A0 002CB0E0 7C 1B E2 14 */ add r0, r27, r28 +/* 802CE1A4 002CB0E4 90 1F 00 34 */ stw r0, 0x34(r31) +/* 802CE1A8 002CB0E8 28 1D 00 00 */ cmplwi r29, 0 +/* 802CE1AC 002CB0EC 40 82 00 18 */ bne lbl_802CE1C4 +/* 802CE1B0 002CB0F0 7F E3 FB 78 */ mr r3, r31 +/* 802CE1B4 002CB0F4 48 00 02 75 */ bl becomeSystemHeap__7JKRHeapFv +/* 802CE1B8 002CB0F8 7F E3 FB 78 */ mr r3, r31 +/* 802CE1BC 002CB0FC 48 00 02 7D */ bl becomeCurrentHeap__7JKRHeapFv +/* 802CE1C0 002CB100 48 00 00 48 */ b lbl_802CE208 +lbl_802CE1C4: +/* 802CE1C4 002CB104 34 9F 00 40 */ addic. r4, r31, 0x40 +/* 802CE1C8 002CB108 41 82 00 08 */ beq lbl_802CE1D0 +/* 802CE1CC 002CB10C 38 84 00 0C */ addi r4, r4, 0xc +lbl_802CE1D0: +/* 802CE1D0 002CB110 38 7D 00 40 */ addi r3, r29, 0x40 +/* 802CE1D4 002CB114 48 00 DD 79 */ bl append__10JSUPtrListFP10JSUPtrLink +/* 802CE1D8 002CB118 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13) +/* 802CE1DC 002CB11C 80 0D 8D F8 */ lwz r0, lbl_80451378-_SDA_BASE_(r13) +/* 802CE1E0 002CB120 7C 03 00 40 */ cmplw r3, r0 +/* 802CE1E4 002CB124 40 82 00 0C */ bne lbl_802CE1F0 +/* 802CE1E8 002CB128 7F E3 FB 78 */ mr r3, r31 +/* 802CE1EC 002CB12C 48 00 02 3D */ bl becomeSystemHeap__7JKRHeapFv +lbl_802CE1F0: +/* 802CE1F0 002CB130 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) +/* 802CE1F4 002CB134 80 0D 8D F8 */ lwz r0, lbl_80451378-_SDA_BASE_(r13) +/* 802CE1F8 002CB138 7C 03 00 40 */ cmplw r3, r0 +/* 802CE1FC 002CB13C 40 82 00 0C */ bne lbl_802CE208 +/* 802CE200 002CB140 7F E3 FB 78 */ mr r3, r31 +/* 802CE204 002CB144 48 00 02 35 */ bl becomeCurrentHeap__7JKRHeapFv +lbl_802CE208: +/* 802CE208 002CB148 9B DF 00 68 */ stb r30, 0x68(r31) +/* 802CE20C 002CB14C 88 1F 00 68 */ lbz r0, 0x68(r31) +/* 802CE210 002CB150 28 00 00 01 */ cmplwi r0, 1 +/* 802CE214 002CB154 40 82 00 1C */ bne lbl_802CE230 +/* 802CE218 002CB158 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) +/* 802CE21C 002CB15C 28 00 00 00 */ cmplwi r0, 0 +/* 802CE220 002CB160 40 82 00 10 */ bne lbl_802CE230 +//.global JKRDefaultMemoryErrorRoutine__FPvUli +/* 802CE224 002CB164 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha +//.global JKRDefaultMemoryErrorRoutine__FPvUli +/* 802CE228 002CB168 38 03 EB 40 */ addi r0, r3, JKRDefaultMemoryErrorRoutine@l +/* 802CE22C 002CB16C 90 0D 8D FC */ stw r0, lbl_8045137C-_SDA_BASE_(r13) +lbl_802CE230: +/* 802CE230 002CB170 88 0D 83 30 */ lbz r0, lbl_804508B0-_SDA_BASE_(r13) +/* 802CE234 002CB174 98 1F 00 3C */ stb r0, 0x3c(r31) +/* 802CE238 002CB178 88 0D 8E 00 */ lbz r0, lbl_80451380-_SDA_BASE_(r13) +/* 802CE23C 002CB17C 98 1F 00 3D */ stb r0, 0x3d(r31) +/* 802CE240 002CB180 38 00 00 00 */ li r0, 0 +/* 802CE244 002CB184 98 1F 00 69 */ stb r0, 0x69(r31) +/* 802CE248 002CB188 7F E3 FB 78 */ mr r3, r31 +/* 802CE24C 002CB18C 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE250 002CB190 48 09 3F CD */ bl func_8036221C +/* 802CE254 002CB194 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE258 002CB198 7C 08 03 A6 */ mtlr r0 +/* 802CE25C 002CB19C 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE260 002CB1A0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE264.s b/include/JKernel/asm/func_802CE264.s new file mode 100644 index 0000000000..373ba892dd --- /dev/null +++ b/include/JKernel/asm/func_802CE264.s @@ -0,0 +1,81 @@ +/* 802CE264 002CB1A4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE268 002CB1A8 7C 08 02 A6 */ mflr r0 +/* 802CE26C 002CB1AC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE270 002CB1B0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802CE274 002CB1B4 93 C1 00 08 */ stw r30, 8(r1) +/* 802CE278 002CB1B8 7C 7E 1B 79 */ or. r30, r3, r3 +/* 802CE27C 002CB1BC 7C 9F 23 78 */ mr r31, r4 +/* 802CE280 002CB1C0 41 82 00 DC */ beq lbl_802CE35C +/* 802CE284 002CB1C4 3C 60 80 3D */ lis r3, lbl_803CBF70@ha +/* 802CE288 002CB1C8 38 03 BF 70 */ addi r0, r3, lbl_803CBF70@l +/* 802CE28C 002CB1CC 90 1E 00 00 */ stw r0, 0(r30) +/* 802CE290 002CB1D0 80 7E 00 50 */ lwz r3, 0x50(r30) +/* 802CE294 002CB1D4 34 9E 00 40 */ addic. r4, r30, 0x40 +/* 802CE298 002CB1D8 41 82 00 08 */ beq lbl_802CE2A0 +/* 802CE29C 002CB1DC 38 84 00 0C */ addi r4, r4, 0xc +lbl_802CE2A0: +/* 802CE2A0 002CB1E0 48 00 DE BD */ bl remove__10JSUPtrListFP10JSUPtrLink +/* 802CE2A4 002CB1E4 80 8D 8D F8 */ lwz r4, lbl_80451378-_SDA_BASE_(r13) +/* 802CE2A8 002CB1E8 80 64 00 40 */ lwz r3, 0x40(r4) +/* 802CE2AC 002CB1EC 28 03 00 00 */ cmplwi r3, 0 +/* 802CE2B0 002CB1F0 41 82 00 08 */ beq lbl_802CE2B8 +/* 802CE2B4 002CB1F4 38 63 FF F4 */ addi r3, r3, -12 +lbl_802CE2B8: +/* 802CE2B8 002CB1F8 80 0D 8D F4 */ lwz r0, lbl_80451374-_SDA_BASE_(r13) +/* 802CE2BC 002CB1FC 7C 00 F0 40 */ cmplw r0, r30 +/* 802CE2C0 002CB200 40 82 00 1C */ bne lbl_802CE2DC +/* 802CE2C4 002CB204 28 03 00 00 */ cmplwi r3, 0 +/* 802CE2C8 002CB208 40 82 00 0C */ bne lbl_802CE2D4 +/* 802CE2CC 002CB20C 7C 80 23 78 */ mr r0, r4 +/* 802CE2D0 002CB210 48 00 00 08 */ b lbl_802CE2D8 +lbl_802CE2D4: +/* 802CE2D4 002CB214 80 03 00 0C */ lwz r0, 0xc(r3) +lbl_802CE2D8: +/* 802CE2D8 002CB218 90 0D 8D F4 */ stw r0, lbl_80451374-_SDA_BASE_(r13) +lbl_802CE2DC: +/* 802CE2DC 002CB21C 80 0D 8D F0 */ lwz r0, lbl_80451370-_SDA_BASE_(r13) +/* 802CE2E0 002CB220 7C 00 F0 40 */ cmplw r0, r30 +/* 802CE2E4 002CB224 40 82 00 18 */ bne lbl_802CE2FC +/* 802CE2E8 002CB228 28 03 00 00 */ cmplwi r3, 0 +/* 802CE2EC 002CB22C 40 82 00 08 */ bne lbl_802CE2F4 +/* 802CE2F0 002CB230 48 00 00 08 */ b lbl_802CE2F8 +lbl_802CE2F4: +/* 802CE2F4 002CB234 80 83 00 0C */ lwz r4, 0xc(r3) +lbl_802CE2F8: +/* 802CE2F8 002CB238 90 8D 8D F0 */ stw r4, lbl_80451370-_SDA_BASE_(r13) +lbl_802CE2FC: +/* 802CE2FC 002CB23C 34 1E 00 5C */ addic. r0, r30, 0x5c +/* 802CE300 002CB240 41 82 00 10 */ beq lbl_802CE310 +/* 802CE304 002CB244 38 7E 00 5C */ addi r3, r30, 0x5c +/* 802CE308 002CB248 38 80 00 00 */ li r4, 0 +/* 802CE30C 002CB24C 48 00 DB A1 */ bl __dt__10JSUPtrListFv +lbl_802CE310: +/* 802CE310 002CB250 34 1E 00 40 */ addic. r0, r30, 0x40 +/* 802CE314 002CB254 41 82 00 2C */ beq lbl_802CE340 +/* 802CE318 002CB258 34 1E 00 4C */ addic. r0, r30, 0x4c +/* 802CE31C 002CB25C 41 82 00 10 */ beq lbl_802CE32C +/* 802CE320 002CB260 38 7E 00 4C */ addi r3, r30, 0x4c +/* 802CE324 002CB264 38 80 00 00 */ li r4, 0 +/* 802CE328 002CB268 48 00 DA ED */ bl __dt__10JSUPtrLinkFv +lbl_802CE32C: +/* 802CE32C 002CB26C 34 1E 00 40 */ addic. r0, r30, 0x40 +/* 802CE330 002CB270 41 82 00 10 */ beq lbl_802CE340 +/* 802CE334 002CB274 38 7E 00 40 */ addi r3, r30, 0x40 +/* 802CE338 002CB278 38 80 00 00 */ li r4, 0 +/* 802CE33C 002CB27C 48 00 DB 71 */ bl __dt__10JSUPtrListFv +lbl_802CE340: +/* 802CE340 002CB280 7F C3 F3 78 */ mr r3, r30 +/* 802CE344 002CB284 38 80 00 00 */ li r4, 0 +/* 802CE348 002CB288 48 00 31 9D */ bl __dt__11JKRDisposerFv +/* 802CE34C 002CB28C 7F E0 07 35 */ extsh. r0, r31 +/* 802CE350 002CB290 40 81 00 0C */ ble lbl_802CE35C +/* 802CE354 002CB294 7F C3 F3 78 */ mr r3, r30 +/* 802CE358 002CB298 48 00 09 E5 */ bl __dl__FPv +lbl_802CE35C: +/* 802CE35C 002CB29C 7F C3 F3 78 */ mr r3, r30 +/* 802CE360 002CB2A0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802CE364 002CB2A4 83 C1 00 08 */ lwz r30, 8(r1) +/* 802CE368 002CB2A8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE36C 002CB2AC 7C 08 03 A6 */ mtlr r0 +/* 802CE370 002CB2B0 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE374 002CB2B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE378.s b/include/JKernel/asm/func_802CE378.s new file mode 100644 index 0000000000..2437d87215 --- /dev/null +++ b/include/JKernel/asm/func_802CE378.s @@ -0,0 +1,46 @@ +/* 802CE378 002CB2B8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE37C 002CB2BC 7C 08 02 A6 */ mflr r0 +/* 802CE380 002CB2C0 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE384 002CB2C4 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE388 002CB2C8 48 09 3E 4D */ bl _savegpr_27 +/* 802CE38C 002CB2CC 7C 7B 1B 78 */ mr r27, r3 +/* 802CE390 002CB2D0 7C 9C 23 78 */ mr r28, r4 +/* 802CE394 002CB2D4 7C BF 2B 78 */ mr r31, r5 +/* 802CE398 002CB2D8 48 06 CE FD */ bl OSGetArenaLo +/* 802CE39C 002CB2DC 7C 7E 1B 78 */ mr r30, r3 +/* 802CE3A0 002CB2E0 48 06 CE ED */ bl OSGetArenaHi +/* 802CE3A4 002CB2E4 7C 7D 1B 78 */ mr r29, r3 +/* 802CE3A8 002CB2E8 7C 1E E8 40 */ cmplw r30, r29 +/* 802CE3AC 002CB2EC 40 82 00 0C */ bne lbl_802CE3B8 +/* 802CE3B0 002CB2F0 38 60 00 00 */ li r3, 0 +/* 802CE3B4 002CB2F4 48 00 00 5C */ b lbl_802CE410 +lbl_802CE3B8: +/* 802CE3B8 002CB2F8 7F C3 F3 78 */ mr r3, r30 +/* 802CE3BC 002CB2FC 7F A4 EB 78 */ mr r4, r29 +/* 802CE3C0 002CB300 7F E5 FB 78 */ mr r5, r31 +/* 802CE3C4 002CB304 48 06 CD ED */ bl OSInitAlloc +/* 802CE3C8 002CB308 38 03 00 1F */ addi r0, r3, 0x1f +/* 802CE3CC 002CB30C 54 1F 00 34 */ rlwinm r31, r0, 0, 0, 0x1a +/* 802CE3D0 002CB310 57 BE 00 34 */ rlwinm r30, r29, 0, 0, 0x1a +/* 802CE3D4 002CB314 3C 60 80 00 */ lis r3, 0x80000028@ha +/* 802CE3D8 002CB318 90 6D 8E 04 */ stw r3, lbl_80451384-_SDA_BASE_(r13) +/* 802CE3DC 002CB31C 93 ED 8E 08 */ stw r31, lbl_80451388-_SDA_BASE_(r13) +/* 802CE3E0 002CB320 93 ED 8E 0C */ stw r31, lbl_8045138C-_SDA_BASE_(r13) +/* 802CE3E4 002CB324 93 CD 8E 10 */ stw r30, lbl_80451390-_SDA_BASE_(r13) +/* 802CE3E8 002CB328 80 03 00 28 */ lwz r0, 0x80000028@l(r3) +/* 802CE3EC 002CB32C 90 0D 8E 14 */ stw r0, lbl_80451394-_SDA_BASE_(r13) +/* 802CE3F0 002CB330 7F C3 F3 78 */ mr r3, r30 +/* 802CE3F4 002CB334 48 06 CE B1 */ bl OSSetArenaLo +/* 802CE3F8 002CB338 7F C3 F3 78 */ mr r3, r30 +/* 802CE3FC 002CB33C 48 06 CE A1 */ bl OSSetArenaHi +/* 802CE400 002CB340 93 FB 00 00 */ stw r31, 0(r27) +/* 802CE404 002CB344 7C 1F F0 50 */ subf r0, r31, r30 +/* 802CE408 002CB348 90 1C 00 00 */ stw r0, 0(r28) +/* 802CE40C 002CB34C 38 60 00 01 */ li r3, 1 +lbl_802CE410: +/* 802CE410 002CB350 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE414 002CB354 48 09 3E 0D */ bl _restgpr_27 +/* 802CE418 002CB358 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE41C 002CB35C 7C 08 03 A6 */ mtlr r0 +/* 802CE420 002CB360 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE424 002CB364 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE428.s b/include/JKernel/asm/func_802CE428.s new file mode 100644 index 0000000000..33ab82edb8 --- /dev/null +++ b/include/JKernel/asm/func_802CE428.s @@ -0,0 +1,4 @@ +/* 802CE428 002CB368 80 0D 8D F0 */ lwz r0, lbl_80451370-_SDA_BASE_(r13) +/* 802CE42C 002CB36C 90 6D 8D F0 */ stw r3, lbl_80451370-_SDA_BASE_(r13) +/* 802CE430 002CB370 7C 03 03 78 */ mr r3, r0 +/* 802CE434 002CB374 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE438.s b/include/JKernel/asm/func_802CE438.s new file mode 100644 index 0000000000..0e5d91b7e1 --- /dev/null +++ b/include/JKernel/asm/func_802CE438.s @@ -0,0 +1,4 @@ +/* 802CE438 002CB378 80 0D 8D F4 */ lwz r0, lbl_80451374-_SDA_BASE_(r13) +/* 802CE43C 002CB37C 90 6D 8D F4 */ stw r3, lbl_80451374-_SDA_BASE_(r13) +/* 802CE440 002CB380 7C 03 03 78 */ mr r3, r0 +/* 802CE444 002CB384 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE448.s b/include/JKernel/asm/func_802CE448.s new file mode 100644 index 0000000000..5ffc71fdc8 --- /dev/null +++ b/include/JKernel/asm/func_802CE448.s @@ -0,0 +1,11 @@ +/* 802CE448 002CB388 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE44C 002CB38C 7C 08 02 A6 */ mflr r0 +/* 802CE450 002CB390 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE454 002CB394 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE458 002CB398 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 802CE45C 002CB39C 7D 89 03 A6 */ mtctr r12 +/* 802CE460 002CB3A0 4E 80 04 21 */ bctrl +/* 802CE464 002CB3A4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE468 002CB3A8 7C 08 03 A6 */ mtlr r0 +/* 802CE46C 002CB3AC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE470 002CB3B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE474.s b/include/JKernel/asm/func_802CE474.s new file mode 100644 index 0000000000..3936faed97 --- /dev/null +++ b/include/JKernel/asm/func_802CE474.s @@ -0,0 +1,27 @@ +/* 802CE474 002CB3B4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE478 002CB3B8 7C 08 02 A6 */ mflr r0 +/* 802CE47C 002CB3BC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE480 002CB3C0 7C 66 1B 78 */ mr r6, r3 +/* 802CE484 002CB3C4 7C 80 23 78 */ mr r0, r4 +/* 802CE488 002CB3C8 28 05 00 00 */ cmplwi r5, 0 +/* 802CE48C 002CB3CC 41 82 00 18 */ beq lbl_802CE4A4 +/* 802CE490 002CB3D0 7C A3 2B 78 */ mr r3, r5 +/* 802CE494 002CB3D4 7C C4 33 78 */ mr r4, r6 +/* 802CE498 002CB3D8 7C 05 03 78 */ mr r5, r0 +/* 802CE49C 002CB3DC 48 00 00 39 */ bl alloc__7JKRHeapFUli +/* 802CE4A0 002CB3E0 48 00 00 24 */ b lbl_802CE4C4 +lbl_802CE4A4: +/* 802CE4A4 002CB3E4 80 6D 8D F4 */ lwz r3, lbl_80451374-_SDA_BASE_(r13) +/* 802CE4A8 002CB3E8 28 03 00 00 */ cmplwi r3, 0 +/* 802CE4AC 002CB3EC 41 82 00 14 */ beq lbl_802CE4C0 +/* 802CE4B0 002CB3F0 7C C4 33 78 */ mr r4, r6 +/* 802CE4B4 002CB3F4 7C 05 03 78 */ mr r5, r0 +/* 802CE4B8 002CB3F8 48 00 00 1D */ bl alloc__7JKRHeapFUli +/* 802CE4BC 002CB3FC 48 00 00 08 */ b lbl_802CE4C4 +lbl_802CE4C0: +/* 802CE4C0 002CB400 38 60 00 00 */ li r3, 0 +lbl_802CE4C4: +/* 802CE4C4 002CB404 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE4C8 002CB408 7C 08 03 A6 */ mtlr r0 +/* 802CE4CC 002CB40C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE4D0 002CB410 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE4D4.s b/include/JKernel/asm/func_802CE4D4.s new file mode 100644 index 0000000000..fd95f68073 --- /dev/null +++ b/include/JKernel/asm/func_802CE4D4.s @@ -0,0 +1,11 @@ +/* 802CE4D4 002CB414 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE4D8 002CB418 7C 08 02 A6 */ mflr r0 +/* 802CE4DC 002CB41C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE4E0 002CB420 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE4E4 002CB424 81 8C 00 24 */ lwz r12, 0x24(r12) +/* 802CE4E8 002CB428 7D 89 03 A6 */ mtctr r12 +/* 802CE4EC 002CB42C 4E 80 04 21 */ bctrl +/* 802CE4F0 002CB430 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE4F4 002CB434 7C 08 03 A6 */ mtlr r0 +/* 802CE4F8 002CB438 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE4FC 002CB43C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE500.s b/include/JKernel/asm/func_802CE500.s new file mode 100644 index 0000000000..82c90052d1 --- /dev/null +++ b/include/JKernel/asm/func_802CE500.s @@ -0,0 +1,20 @@ +/* 802CE500 002CB440 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE504 002CB444 7C 08 02 A6 */ mflr r0 +/* 802CE508 002CB448 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE50C 002CB44C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802CE510 002CB450 7C 7F 1B 78 */ mr r31, r3 +/* 802CE514 002CB454 28 04 00 00 */ cmplwi r4, 0 +/* 802CE518 002CB458 40 82 00 10 */ bne lbl_802CE528 +/* 802CE51C 002CB45C 48 00 03 21 */ bl findFromRoot__7JKRHeapFPv +/* 802CE520 002CB460 7C 64 1B 79 */ or. r4, r3, r3 +/* 802CE524 002CB464 41 82 00 10 */ beq lbl_802CE534 +lbl_802CE528: +/* 802CE528 002CB468 7C 83 23 78 */ mr r3, r4 +/* 802CE52C 002CB46C 7F E4 FB 78 */ mr r4, r31 +/* 802CE530 002CB470 48 00 00 19 */ bl free__7JKRHeapFPv +lbl_802CE534: +/* 802CE534 002CB474 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802CE538 002CB478 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE53C 002CB47C 7C 08 03 A6 */ mtlr r0 +/* 802CE540 002CB480 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE544 002CB484 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE548.s b/include/JKernel/asm/func_802CE548.s new file mode 100644 index 0000000000..9b9f9a62eb --- /dev/null +++ b/include/JKernel/asm/func_802CE548.s @@ -0,0 +1,11 @@ +/* 802CE548 002CB488 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE54C 002CB48C 7C 08 02 A6 */ mflr r0 +/* 802CE550 002CB490 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE554 002CB494 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE558 002CB498 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 802CE55C 002CB49C 7D 89 03 A6 */ mtctr r12 +/* 802CE560 002CB4A0 4E 80 04 21 */ bctrl +/* 802CE564 002CB4A4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE568 002CB4A8 7C 08 03 A6 */ mtlr r0 +/* 802CE56C 002CB4AC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE570 002CB4B0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE574.s b/include/JKernel/asm/func_802CE574.s new file mode 100644 index 0000000000..fb966ffe72 --- /dev/null +++ b/include/JKernel/asm/func_802CE574.s @@ -0,0 +1,24 @@ +/* 802CE574 002CB4B4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE578 002CB4B8 7C 08 02 A6 */ mflr r0 +/* 802CE57C 002CB4BC 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE580 002CB4C0 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 802CE584 002CB4C4 7C 7F 1B 78 */ mr r31, r3 +/* 802CE588 002CB4C8 48 00 00 20 */ b lbl_802CE5A8 +lbl_802CE58C: +/* 802CE58C 002CB4CC 80 61 00 08 */ lwz r3, 8(r1) +/* 802CE590 002CB4D0 80 63 00 00 */ lwz r3, 0(r3) +/* 802CE594 002CB4D4 38 80 FF FF */ li r4, -1 +/* 802CE598 002CB4D8 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE59C 002CB4DC 81 8C 00 08 */ lwz r12, 8(r12) +/* 802CE5A0 002CB4E0 7D 89 03 A6 */ mtctr r12 +/* 802CE5A4 002CB4E4 4E 80 04 21 */ bctrl +lbl_802CE5A8: +/* 802CE5A8 002CB4E8 80 1F 00 5C */ lwz r0, 0x5c(r31) +/* 802CE5AC 002CB4EC 90 01 00 08 */ stw r0, 8(r1) +/* 802CE5B0 002CB4F0 28 00 00 00 */ cmplwi r0, 0 +/* 802CE5B4 002CB4F4 40 82 FF D8 */ bne lbl_802CE58C +/* 802CE5B8 002CB4F8 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 802CE5BC 002CB4FC 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE5C0 002CB500 7C 08 03 A6 */ mtlr r0 +/* 802CE5C4 002CB504 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE5C8 002CB508 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE5CC.s b/include/JKernel/asm/func_802CE5CC.s new file mode 100644 index 0000000000..b3a29d643a --- /dev/null +++ b/include/JKernel/asm/func_802CE5CC.s @@ -0,0 +1,11 @@ +/* 802CE5CC 002CB50C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE5D0 002CB510 7C 08 02 A6 */ mflr r0 +/* 802CE5D4 002CB514 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE5D8 002CB518 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE5DC 002CB51C 81 8C 00 2C */ lwz r12, 0x2c(r12) +/* 802CE5E0 002CB520 7D 89 03 A6 */ mtctr r12 +/* 802CE5E4 002CB524 4E 80 04 21 */ bctrl +/* 802CE5E8 002CB528 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE5EC 002CB52C 7C 08 03 A6 */ mtlr r0 +/* 802CE5F0 002CB530 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE5F4 002CB534 4E 80 00 20 */ blr diff --git a/include/JKernel/asm/func_802CE5F8.s b/include/JKernel/asm/func_802CE5F8.s new file mode 100644 index 0000000000..fa0b880ec2 --- /dev/null +++ b/include/JKernel/asm/func_802CE5F8.s @@ -0,0 +1,11 @@ +/* 802CE5F8 002CB538 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE5FC 002CB53C 7C 08 02 A6 */ mflr r0 +/* 802CE600 002CB540 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE604 002CB544 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE608 002CB548 81 8C 00 30 */ lwz r12, 0x30(r12) +/* 802CE60C 002CB54C 7D 89 03 A6 */ mtctr r12 +/* 802CE610 002CB550 4E 80 04 21 */ bctrl +/* 802CE614 002CB554 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE618 002CB558 7C 08 03 A6 */ mtlr r0 +/* 802CE61C 002CB55C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE620 002CB560 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE624.s b/include/JKernel/asm/func_802CE624.s new file mode 100644 index 0000000000..a5023e188e --- /dev/null +++ b/include/JKernel/asm/func_802CE624.s @@ -0,0 +1,26 @@ +/* 802CE624 002CB564 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE628 002CB568 7C 08 02 A6 */ mflr r0 +/* 802CE62C 002CB56C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE630 002CB570 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802CE634 002CB574 93 C1 00 08 */ stw r30, 8(r1) +/* 802CE638 002CB578 7C 7E 1B 78 */ mr r30, r3 +/* 802CE63C 002CB57C 7C 9F 23 78 */ mr r31, r4 +/* 802CE640 002CB580 28 05 00 00 */ cmplwi r5, 0 +/* 802CE644 002CB584 40 82 00 18 */ bne lbl_802CE65C +/* 802CE648 002CB588 48 00 01 F5 */ bl findFromRoot__7JKRHeapFPv +/* 802CE64C 002CB58C 7C 65 1B 79 */ or. r5, r3, r3 +/* 802CE650 002CB590 40 82 00 0C */ bne lbl_802CE65C +/* 802CE654 002CB594 38 60 FF FF */ li r3, -1 +/* 802CE658 002CB598 48 00 00 14 */ b lbl_802CE66C +lbl_802CE65C: +/* 802CE65C 002CB59C 7C A3 2B 78 */ mr r3, r5 +/* 802CE660 002CB5A0 7F C4 F3 78 */ mr r4, r30 +/* 802CE664 002CB5A4 7F E5 FB 78 */ mr r5, r31 +/* 802CE668 002CB5A8 48 00 00 1D */ bl resize__7JKRHeapFPvUl +lbl_802CE66C: +/* 802CE66C 002CB5AC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802CE670 002CB5B0 83 C1 00 08 */ lwz r30, 8(r1) +/* 802CE674 002CB5B4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE678 002CB5B8 7C 08 03 A6 */ mtlr r0 +/* 802CE67C 002CB5BC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE680 002CB5C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE684.s b/include/JKernel/asm/func_802CE684.s new file mode 100644 index 0000000000..0dba38039f --- /dev/null +++ b/include/JKernel/asm/func_802CE684.s @@ -0,0 +1,11 @@ +/* 802CE684 002CB5C4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE688 002CB5C8 7C 08 02 A6 */ mflr r0 +/* 802CE68C 002CB5CC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE690 002CB5D0 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE694 002CB5D4 81 8C 00 38 */ lwz r12, 0x38(r12) +/* 802CE698 002CB5D8 7D 89 03 A6 */ mtctr r12 +/* 802CE69C 002CB5DC 4E 80 04 21 */ bctrl +/* 802CE6A0 002CB5E0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE6A4 002CB5E4 7C 08 03 A6 */ mtlr r0 +/* 802CE6A8 002CB5E8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE6AC 002CB5EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE6B0.s b/include/JKernel/asm/func_802CE6B0.s new file mode 100644 index 0000000000..fa01007842 --- /dev/null +++ b/include/JKernel/asm/func_802CE6B0.s @@ -0,0 +1,22 @@ +/* 802CE6B0 002CB5F0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE6B4 002CB5F4 7C 08 02 A6 */ mflr r0 +/* 802CE6B8 002CB5F8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE6BC 002CB5FC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802CE6C0 002CB600 7C 7F 1B 78 */ mr r31, r3 +/* 802CE6C4 002CB604 28 04 00 00 */ cmplwi r4, 0 +/* 802CE6C8 002CB608 40 82 00 18 */ bne lbl_802CE6E0 +/* 802CE6CC 002CB60C 48 00 01 71 */ bl findFromRoot__7JKRHeapFPv +/* 802CE6D0 002CB610 7C 64 1B 79 */ or. r4, r3, r3 +/* 802CE6D4 002CB614 40 82 00 0C */ bne lbl_802CE6E0 +/* 802CE6D8 002CB618 38 60 FF FF */ li r3, -1 +/* 802CE6DC 002CB61C 48 00 00 10 */ b lbl_802CE6EC +lbl_802CE6E0: +/* 802CE6E0 002CB620 7C 83 23 78 */ mr r3, r4 +/* 802CE6E4 002CB624 7F E4 FB 78 */ mr r4, r31 +/* 802CE6E8 002CB628 48 00 00 19 */ bl getSize__7JKRHeapFPv +lbl_802CE6EC: +/* 802CE6EC 002CB62C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802CE6F0 002CB630 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE6F4 002CB634 7C 08 03 A6 */ mtlr r0 +/* 802CE6F8 002CB638 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE6FC 002CB63C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE700.s b/include/JKernel/asm/func_802CE700.s new file mode 100644 index 0000000000..05ee718045 --- /dev/null +++ b/include/JKernel/asm/func_802CE700.s @@ -0,0 +1,11 @@ +/* 802CE700 002CB640 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE704 002CB644 7C 08 02 A6 */ mflr r0 +/* 802CE708 002CB648 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE70C 002CB64C 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE710 002CB650 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 802CE714 002CB654 7D 89 03 A6 */ mtctr r12 +/* 802CE718 002CB658 4E 80 04 21 */ bctrl +/* 802CE71C 002CB65C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE720 002CB660 7C 08 03 A6 */ mtlr r0 +/* 802CE724 002CB664 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE728 002CB668 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE72C.s b/include/JKernel/asm/func_802CE72C.s new file mode 100644 index 0000000000..143a08a8c0 --- /dev/null +++ b/include/JKernel/asm/func_802CE72C.s @@ -0,0 +1,11 @@ +/* 802CE72C 002CB66C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE730 002CB670 7C 08 02 A6 */ mflr r0 +/* 802CE734 002CB674 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE738 002CB678 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE73C 002CB67C 81 8C 00 40 */ lwz r12, 0x40(r12) +/* 802CE740 002CB680 7D 89 03 A6 */ mtctr r12 +/* 802CE744 002CB684 4E 80 04 21 */ bctrl +/* 802CE748 002CB688 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE74C 002CB68C 7C 08 03 A6 */ mtlr r0 +/* 802CE750 002CB690 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE754 002CB694 4E 80 00 20 */ blr diff --git a/include/JKernel/asm/func_802CE758.s b/include/JKernel/asm/func_802CE758.s new file mode 100644 index 0000000000..4976dcc63d --- /dev/null +++ b/include/JKernel/asm/func_802CE758.s @@ -0,0 +1,11 @@ +/* 802CE758 002CB698 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE75C 002CB69C 7C 08 02 A6 */ mflr r0 +/* 802CE760 002CB6A0 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE764 002CB6A4 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE768 002CB6A8 81 8C 00 44 */ lwz r12, 0x44(r12) +/* 802CE76C 002CB6AC 7D 89 03 A6 */ mtctr r12 +/* 802CE770 002CB6B0 4E 80 04 21 */ bctrl +/* 802CE774 002CB6B4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE778 002CB6B8 7C 08 03 A6 */ mtlr r0 +/* 802CE77C 002CB6BC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE780 002CB6C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE784.s b/include/JKernel/asm/func_802CE784.s new file mode 100644 index 0000000000..e37bcdabec --- /dev/null +++ b/include/JKernel/asm/func_802CE784.s @@ -0,0 +1,11 @@ +/* 802CE784 002CB6C4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE788 002CB6C8 7C 08 02 A6 */ mflr r0 +/* 802CE78C 002CB6CC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE790 002CB6D0 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE794 002CB6D4 81 8C 00 48 */ lwz r12, 0x48(r12) +/* 802CE798 002CB6D8 7D 89 03 A6 */ mtctr r12 +/* 802CE79C 002CB6DC 4E 80 04 21 */ bctrl +/* 802CE7A0 002CB6E0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE7A4 002CB6E4 7C 08 03 A6 */ mtlr r0 +/* 802CE7A8 002CB6E8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE7AC 002CB6EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE7B0.s b/include/JKernel/asm/func_802CE7B0.s new file mode 100644 index 0000000000..c1052f1f84 --- /dev/null +++ b/include/JKernel/asm/func_802CE7B0.s @@ -0,0 +1,11 @@ +/* 802CE7B0 002CB6F0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE7B4 002CB6F4 7C 08 02 A6 */ mflr r0 +/* 802CE7B8 002CB6F8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE7BC 002CB6FC 81 83 00 00 */ lwz r12, 0(r3) +/* 802CE7C0 002CB700 81 8C 00 4C */ lwz r12, 0x4c(r12) +/* 802CE7C4 002CB704 7D 89 03 A6 */ mtctr r12 +/* 802CE7C8 002CB708 4E 80 04 21 */ bctrl +/* 802CE7CC 002CB70C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE7D0 002CB710 7C 08 03 A6 */ mtlr r0 +/* 802CE7D4 002CB714 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE7D8 002CB718 4E 80 00 20 */ blr diff --git a/include/JKernel/asm/func_802CE7DC.s b/include/JKernel/asm/func_802CE7DC.s new file mode 100644 index 0000000000..db15ed3a64 --- /dev/null +++ b/include/JKernel/asm/func_802CE7DC.s @@ -0,0 +1,24 @@ +/* 802CE7DC 002CB71C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE7E0 002CB720 7C 08 02 A6 */ mflr r0 +/* 802CE7E4 002CB724 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE7E8 002CB728 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE7EC 002CB72C 48 09 39 F1 */ bl _savegpr_29 +/* 802CE7F0 002CB730 7C 7D 1B 78 */ mr r29, r3 +/* 802CE7F4 002CB734 7C 9E 23 78 */ mr r30, r4 +/* 802CE7F8 002CB738 4B FF FF 61 */ bl getMaxFreeBlock__7JKRHeapFv +/* 802CE7FC 002CB73C 7C 7F 1B 78 */ mr r31, r3 +/* 802CE800 002CB740 7F A3 EB 78 */ mr r3, r29 +/* 802CE804 002CB744 4B FF FF 29 */ bl getFreeSize__7JKRHeapFv +/* 802CE808 002CB748 38 9E FF FF */ addi r4, r30, -1 +/* 802CE80C 002CB74C 57 E0 07 3E */ clrlwi r0, r31, 0x1c +/* 802CE810 002CB750 7C 00 F0 50 */ subf r0, r0, r30 +/* 802CE814 002CB754 7C 80 00 38 */ and r0, r4, r0 +/* 802CE818 002CB758 7C 60 18 50 */ subf r3, r0, r3 +/* 802CE81C 002CB75C 7C 80 20 F8 */ nor r0, r4, r4 +/* 802CE820 002CB760 7C 03 18 38 */ and r3, r0, r3 +/* 802CE824 002CB764 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE828 002CB768 48 09 3A 01 */ bl _restgpr_29 +/* 802CE82C 002CB76C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE830 002CB770 7C 08 03 A6 */ mtlr r0 +/* 802CE834 002CB774 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE838 002CB778 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE83C.s b/include/JKernel/asm/func_802CE83C.s new file mode 100644 index 0000000000..bf1f7202af --- /dev/null +++ b/include/JKernel/asm/func_802CE83C.s @@ -0,0 +1,25 @@ +/* 802CE83C 002CB77C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CE840 002CB780 7C 08 02 A6 */ mflr r0 +/* 802CE844 002CB784 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CE848 002CB788 7C 64 1B 78 */ mr r4, r3 +/* 802CE84C 002CB78C 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13) +/* 802CE850 002CB790 28 03 00 00 */ cmplwi r3, 0 +/* 802CE854 002CB794 40 82 00 0C */ bne lbl_802CE860 +/* 802CE858 002CB798 38 60 00 00 */ li r3, 0 +/* 802CE85C 002CB79C 48 00 00 28 */ b lbl_802CE884 +lbl_802CE860: +/* 802CE860 002CB7A0 80 03 00 30 */ lwz r0, 0x30(r3) +/* 802CE864 002CB7A4 7C 00 20 40 */ cmplw r0, r4 +/* 802CE868 002CB7A8 41 81 00 18 */ bgt lbl_802CE880 +/* 802CE86C 002CB7AC 80 03 00 34 */ lwz r0, 0x34(r3) +/* 802CE870 002CB7B0 7C 04 00 40 */ cmplw r4, r0 +/* 802CE874 002CB7B4 40 80 00 0C */ bge lbl_802CE880 +/* 802CE878 002CB7B8 48 00 00 1D */ bl find__7JKRHeapCFPv +/* 802CE87C 002CB7BC 48 00 00 08 */ b lbl_802CE884 +lbl_802CE880: +/* 802CE880 002CB7C0 48 00 00 BD */ bl findAllHeap__7JKRHeapCFPv +lbl_802CE884: +/* 802CE884 002CB7C4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CE888 002CB7C8 7C 08 03 A6 */ mtlr r0 +/* 802CE88C 002CB7CC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CE890 002CB7D0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE894.s b/include/JKernel/asm/func_802CE894.s new file mode 100644 index 0000000000..7ce4858d3e --- /dev/null +++ b/include/JKernel/asm/func_802CE894.s @@ -0,0 +1,48 @@ +/* 802CE894 002CB7D4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE898 002CB7D8 7C 08 02 A6 */ mflr r0 +/* 802CE89C 002CB7DC 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE8A0 002CB7E0 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE8A4 002CB7E4 48 09 39 39 */ bl _savegpr_29 +/* 802CE8A8 002CB7E8 7C 7D 1B 78 */ mr r29, r3 +/* 802CE8AC 002CB7EC 7C 9E 23 78 */ mr r30, r4 +/* 802CE8B0 002CB7F0 80 03 00 30 */ lwz r0, 0x30(r3) +/* 802CE8B4 002CB7F4 7C 00 F0 40 */ cmplw r0, r30 +/* 802CE8B8 002CB7F8 41 81 00 68 */ bgt lbl_802CE920 +/* 802CE8BC 002CB7FC 80 1D 00 34 */ lwz r0, 0x34(r29) +/* 802CE8C0 002CB800 7C 1E 00 40 */ cmplw r30, r0 +/* 802CE8C4 002CB804 40 80 00 5C */ bge lbl_802CE920 +/* 802CE8C8 002CB808 80 1D 00 48 */ lwz r0, 0x48(r29) +/* 802CE8CC 002CB80C 28 00 00 00 */ cmplwi r0, 0 +/* 802CE8D0 002CB810 41 82 00 48 */ beq lbl_802CE918 +/* 802CE8D4 002CB814 83 FD 00 40 */ lwz r31, 0x40(r29) +/* 802CE8D8 002CB818 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE8DC 002CB81C 41 82 00 34 */ beq lbl_802CE910 +/* 802CE8E0 002CB820 3B FF FF F4 */ addi r31, r31, -12 +/* 802CE8E4 002CB824 48 00 00 2C */ b lbl_802CE910 +lbl_802CE8E8: +/* 802CE8E8 002CB828 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 802CE8EC 002CB82C 7F C4 F3 78 */ mr r4, r30 +/* 802CE8F0 002CB830 4B FF FF A5 */ bl find__7JKRHeapCFPv +/* 802CE8F4 002CB834 28 03 00 00 */ cmplwi r3, 0 +/* 802CE8F8 002CB838 41 82 00 08 */ beq lbl_802CE900 +/* 802CE8FC 002CB83C 48 00 00 28 */ b lbl_802CE924 +lbl_802CE900: +/* 802CE900 002CB840 83 FF 00 18 */ lwz r31, 0x18(r31) +/* 802CE904 002CB844 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE908 002CB848 41 82 00 08 */ beq lbl_802CE910 +/* 802CE90C 002CB84C 3B FF FF F4 */ addi r31, r31, -12 +lbl_802CE910: +/* 802CE910 002CB850 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE914 002CB854 40 82 FF D4 */ bne lbl_802CE8E8 +lbl_802CE918: +/* 802CE918 002CB858 7F A3 EB 78 */ mr r3, r29 +/* 802CE91C 002CB85C 48 00 00 08 */ b lbl_802CE924 +lbl_802CE920: +/* 802CE920 002CB860 38 60 00 00 */ li r3, 0 +lbl_802CE924: +/* 802CE924 002CB864 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE928 002CB868 48 09 39 01 */ bl _restgpr_29 +/* 802CE92C 002CB86C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE930 002CB870 7C 08 03 A6 */ mtlr r0 +/* 802CE934 002CB874 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE938 002CB878 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE93C.s b/include/JKernel/asm/func_802CE93C.s new file mode 100644 index 0000000000..1cc54899ea --- /dev/null +++ b/include/JKernel/asm/func_802CE93C.s @@ -0,0 +1,48 @@ +/* 802CE93C 002CB87C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE940 002CB880 7C 08 02 A6 */ mflr r0 +/* 802CE944 002CB884 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE948 002CB888 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE94C 002CB88C 48 09 38 91 */ bl _savegpr_29 +/* 802CE950 002CB890 7C 7D 1B 78 */ mr r29, r3 +/* 802CE954 002CB894 7C 9E 23 78 */ mr r30, r4 +/* 802CE958 002CB898 80 03 00 48 */ lwz r0, 0x48(r3) +/* 802CE95C 002CB89C 28 00 00 00 */ cmplwi r0, 0 +/* 802CE960 002CB8A0 41 82 00 48 */ beq lbl_802CE9A8 +/* 802CE964 002CB8A4 83 FD 00 40 */ lwz r31, 0x40(r29) +/* 802CE968 002CB8A8 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE96C 002CB8AC 41 82 00 34 */ beq lbl_802CE9A0 +/* 802CE970 002CB8B0 3B FF FF F4 */ addi r31, r31, -12 +/* 802CE974 002CB8B4 48 00 00 2C */ b lbl_802CE9A0 +lbl_802CE978: +/* 802CE978 002CB8B8 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 802CE97C 002CB8BC 7F C4 F3 78 */ mr r4, r30 +/* 802CE980 002CB8C0 4B FF FF BD */ bl findAllHeap__7JKRHeapCFPv +/* 802CE984 002CB8C4 28 03 00 00 */ cmplwi r3, 0 +/* 802CE988 002CB8C8 41 82 00 08 */ beq lbl_802CE990 +/* 802CE98C 002CB8CC 48 00 00 40 */ b lbl_802CE9CC +lbl_802CE990: +/* 802CE990 002CB8D0 83 FF 00 18 */ lwz r31, 0x18(r31) +/* 802CE994 002CB8D4 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE998 002CB8D8 41 82 00 08 */ beq lbl_802CE9A0 +/* 802CE99C 002CB8DC 3B FF FF F4 */ addi r31, r31, -12 +lbl_802CE9A0: +/* 802CE9A0 002CB8E0 28 1F 00 00 */ cmplwi r31, 0 +/* 802CE9A4 002CB8E4 40 82 FF D4 */ bne lbl_802CE978 +lbl_802CE9A8: +/* 802CE9A8 002CB8E8 80 1D 00 30 */ lwz r0, 0x30(r29) +/* 802CE9AC 002CB8EC 7C 00 F0 40 */ cmplw r0, r30 +/* 802CE9B0 002CB8F0 41 81 00 18 */ bgt lbl_802CE9C8 +/* 802CE9B4 002CB8F4 80 1D 00 34 */ lwz r0, 0x34(r29) +/* 802CE9B8 002CB8F8 7C 1E 00 40 */ cmplw r30, r0 +/* 802CE9BC 002CB8FC 40 80 00 0C */ bge lbl_802CE9C8 +/* 802CE9C0 002CB900 7F A3 EB 78 */ mr r3, r29 +/* 802CE9C4 002CB904 48 00 00 08 */ b lbl_802CE9CC +lbl_802CE9C8: +/* 802CE9C8 002CB908 38 60 00 00 */ li r3, 0 +lbl_802CE9CC: +/* 802CE9CC 002CB90C 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE9D0 002CB910 48 09 38 59 */ bl _restgpr_29 +/* 802CE9D4 002CB914 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CE9D8 002CB918 7C 08 03 A6 */ mtlr r0 +/* 802CE9DC 002CB91C 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CE9E0 002CB920 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CE9E4.s b/include/JKernel/asm/func_802CE9E4.s new file mode 100644 index 0000000000..83b36b1daf --- /dev/null +++ b/include/JKernel/asm/func_802CE9E4.s @@ -0,0 +1,41 @@ +/* 802CE9E4 002CB924 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CE9E8 002CB928 7C 08 02 A6 */ mflr r0 +/* 802CE9EC 002CB92C 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CE9F0 002CB930 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CE9F4 002CB934 48 09 37 E5 */ bl _savegpr_28 +/* 802CE9F8 002CB938 7C 7C 1B 78 */ mr r28, r3 +/* 802CE9FC 002CB93C 7C 9D 23 78 */ mr r29, r4 +/* 802CEA00 002CB940 7C BE 2B 78 */ mr r30, r5 +/* 802CEA04 002CB944 3B E0 00 00 */ li r31, 0 +/* 802CEA08 002CB948 80 83 00 5C */ lwz r4, 0x5c(r3) +/* 802CEA0C 002CB94C 48 00 00 4C */ b lbl_802CEA58 +lbl_802CEA10: +/* 802CEA10 002CB950 80 64 00 00 */ lwz r3, 0(r4) +/* 802CEA14 002CB954 7C 1D 18 40 */ cmplw r29, r3 +/* 802CEA18 002CB958 41 81 00 38 */ bgt lbl_802CEA50 +/* 802CEA1C 002CB95C 7C 03 F0 40 */ cmplw r3, r30 +/* 802CEA20 002CB960 40 80 00 30 */ bge lbl_802CEA50 +/* 802CEA24 002CB964 38 80 FF FF */ li r4, -1 +/* 802CEA28 002CB968 81 83 00 00 */ lwz r12, 0(r3) +/* 802CEA2C 002CB96C 81 8C 00 08 */ lwz r12, 8(r12) +/* 802CEA30 002CB970 7D 89 03 A6 */ mtctr r12 +/* 802CEA34 002CB974 4E 80 04 21 */ bctrl +/* 802CEA38 002CB978 28 1F 00 00 */ cmplwi r31, 0 +/* 802CEA3C 002CB97C 40 82 00 0C */ bne lbl_802CEA48 +/* 802CEA40 002CB980 80 9C 00 5C */ lwz r4, 0x5c(r28) +/* 802CEA44 002CB984 48 00 00 14 */ b lbl_802CEA58 +lbl_802CEA48: +/* 802CEA48 002CB988 80 9F 00 0C */ lwz r4, 0xc(r31) +/* 802CEA4C 002CB98C 48 00 00 0C */ b lbl_802CEA58 +lbl_802CEA50: +/* 802CEA50 002CB990 7C 9F 23 78 */ mr r31, r4 +/* 802CEA54 002CB994 80 84 00 0C */ lwz r4, 0xc(r4) +lbl_802CEA58: +/* 802CEA58 002CB998 28 04 00 00 */ cmplwi r4, 0 +/* 802CEA5C 002CB99C 40 82 FF B4 */ bne lbl_802CEA10 +/* 802CEA60 002CB9A0 39 61 00 20 */ addi r11, r1, 0x20 +/* 802CEA64 002CB9A4 48 09 37 C1 */ bl _restgpr_28 +/* 802CEA68 002CB9A8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CEA6C 002CB9AC 7C 08 03 A6 */ mtlr r0 +/* 802CEA70 002CB9B0 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CEA74 002CB9B4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEA78.s b/include/JKernel/asm/func_802CEA78.s new file mode 100644 index 0000000000..196766d775 --- /dev/null +++ b/include/JKernel/asm/func_802CEA78.s @@ -0,0 +1,10 @@ +/* 802CEA78 002CB9B8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEA7C 002CB9BC 7C 08 02 A6 */ mflr r0 +/* 802CEA80 002CB9C0 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEA84 002CB9C4 7C A4 2A 14 */ add r5, r4, r5 +/* 802CEA88 002CB9C8 4B FF FF 5D */ bl dispose_subroutine__7JKRHeapFUlUl +/* 802CEA8C 002CB9CC 38 60 00 00 */ li r3, 0 +/* 802CEA90 002CB9D0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEA94 002CB9D4 7C 08 03 A6 */ mtlr r0 +/* 802CEA98 002CB9D8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEA9C 002CB9DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEAA0.s b/include/JKernel/asm/func_802CEAA0.s new file mode 100644 index 0000000000..c47e380724 --- /dev/null +++ b/include/JKernel/asm/func_802CEAA0.s @@ -0,0 +1,8 @@ +/* 802CEAA0 002CB9E0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEAA4 002CB9E4 7C 08 02 A6 */ mflr r0 +/* 802CEAA8 002CB9E8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEAAC 002CB9EC 4B FF FF 39 */ bl dispose_subroutine__7JKRHeapFUlUl +/* 802CEAB0 002CB9F0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEAB4 002CB9F4 7C 08 03 A6 */ mtlr r0 +/* 802CEAB8 002CB9F8 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEABC 002CB9FC 4E 80 00 20 */ blr diff --git a/include/JKernel/asm/func_802CEAC0.s b/include/JKernel/asm/func_802CEAC0.s new file mode 100644 index 0000000000..495ee1bef9 --- /dev/null +++ b/include/JKernel/asm/func_802CEAC0.s @@ -0,0 +1,24 @@ +/* 802CEAC0 002CBA00 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802CEAC4 002CBA04 7C 08 02 A6 */ mflr r0 +/* 802CEAC8 002CBA08 90 01 00 24 */ stw r0, 0x24(r1) +/* 802CEACC 002CBA0C 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 802CEAD0 002CBA10 7C 7F 1B 78 */ mr r31, r3 +/* 802CEAD4 002CBA14 48 00 00 20 */ b lbl_802CEAF4 +lbl_802CEAD8: +/* 802CEAD8 002CBA18 80 61 00 08 */ lwz r3, 8(r1) +/* 802CEADC 002CBA1C 80 63 00 00 */ lwz r3, 0(r3) +/* 802CEAE0 002CBA20 38 80 FF FF */ li r4, -1 +/* 802CEAE4 002CBA24 81 83 00 00 */ lwz r12, 0(r3) +/* 802CEAE8 002CBA28 81 8C 00 08 */ lwz r12, 8(r12) +/* 802CEAEC 002CBA2C 7D 89 03 A6 */ mtctr r12 +/* 802CEAF0 002CBA30 4E 80 04 21 */ bctrl +lbl_802CEAF4: +/* 802CEAF4 002CBA34 80 1F 00 5C */ lwz r0, 0x5c(r31) +/* 802CEAF8 002CBA38 90 01 00 08 */ stw r0, 8(r1) +/* 802CEAFC 002CBA3C 28 00 00 00 */ cmplwi r0, 0 +/* 802CEB00 002CBA40 40 82 FF D8 */ bne lbl_802CEAD8 +/* 802CEB04 002CBA44 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 802CEB08 002CBA48 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802CEB0C 002CBA4C 7C 08 03 A6 */ mtlr r0 +/* 802CEB10 002CBA50 38 21 00 20 */ addi r1, r1, 0x20 +/* 802CEB14 002CBA54 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEB18.s b/include/JKernel/asm/func_802CEB18.s new file mode 100644 index 0000000000..39714ae11a --- /dev/null +++ b/include/JKernel/asm/func_802CEB18.s @@ -0,0 +1,11 @@ +/* 802CEB18 002CBA58 38 05 00 03 */ addi r0, r5, 3 +/* 802CEB1C 002CBA5C 54 00 F0 BF */ rlwinm. r0, r0, 0x1e, 2, 0x1f +/* 802CEB20 002CBA60 7C 09 03 A6 */ mtctr r0 +/* 802CEB24 002CBA64 4D 82 00 20 */ beqlr +lbl_802CEB28: +/* 802CEB28 002CBA68 80 04 00 00 */ lwz r0, 0(r4) +/* 802CEB2C 002CBA6C 90 03 00 00 */ stw r0, 0(r3) +/* 802CEB30 002CBA70 38 63 00 04 */ addi r3, r3, 4 +/* 802CEB34 002CBA74 38 84 00 04 */ addi r4, r4, 4 +/* 802CEB38 002CBA78 42 00 FF F0 */ bdnz lbl_802CEB28 +/* 802CEB3C 002CBA7C 4E 80 00 20 */ blr diff --git a/include/JKernel/asm/func_802CEB40.s b/include/JKernel/asm/func_802CEB40.s new file mode 100644 index 0000000000..41b8934edd --- /dev/null +++ b/include/JKernel/asm/func_802CEB40.s @@ -0,0 +1,14 @@ +/* 802CEB40 002CBA80 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEB44 002CBA84 7C 08 02 A6 */ mflr r0 +/* 802CEB48 002CBA88 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEB4C 002CBA8C 3C 60 80 3A */ lis r3, lbl_8039CAD8@ha +/* 802CEB50 002CBA90 38 63 CA D8 */ addi r3, r3, lbl_8039CAD8@l +/* 802CEB54 002CBA94 38 80 03 3F */ li r4, 0x33f +/* 802CEB58 002CBA98 38 A3 00 0C */ addi r5, r3, 0xc +/* 802CEB5C 002CBA9C 38 C3 00 0F */ addi r6, r3, 0xf +/* 802CEB60 002CBAA0 4C C6 31 82 */ crclr 6 +/* 802CEB64 002CBAA4 48 01 36 99 */ bl JUTException_NS_panic_f +/* 802CEB68 002CBAA8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEB6C 002CBAAC 7C 08 03 A6 */ mtlr r0 +/* 802CEB70 002CBAB0 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEB74 002CBAB4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEB78.s b/include/JKernel/asm/func_802CEB78.s new file mode 100644 index 0000000000..2b219da5c6 --- /dev/null +++ b/include/JKernel/asm/func_802CEB78.s @@ -0,0 +1,4 @@ +/* 802CEB78 002CBAB8 88 03 00 68 */ lbz r0, 0x68(r3) +/* 802CEB7C 002CBABC 98 83 00 68 */ stb r4, 0x68(r3) +/* 802CEB80 002CBAC0 7C 03 03 78 */ mr r3, r0 +/* 802CEB84 002CBAC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEB88.s b/include/JKernel/asm/func_802CEB88.s new file mode 100644 index 0000000000..13ec8a37af --- /dev/null +++ b/include/JKernel/asm/func_802CEB88.s @@ -0,0 +1,9 @@ +/* 802CEB88 002CBAC8 80 0D 8D FC */ lwz r0, lbl_8045137C-_SDA_BASE_(r13) +/* 802CEB8C 002CBACC 28 03 00 00 */ cmplwi r3, 0 +/* 802CEB90 002CBAD0 40 82 00 0C */ bne lbl_802CEB9C +/* 802CEB94 002CBAD4 3C 60 80 2D */ lis r3, JKRDefaultMemoryErrorRoutine@ha +/* 802CEB98 002CBAD8 38 63 EB 40 */ addi r3, r3, JKRDefaultMemoryErrorRoutine@l +lbl_802CEB9C: +/* 802CEB9C 002CBADC 90 6D 8D FC */ stw r3, lbl_8045137C-_SDA_BASE_(r13) +/* 802CEBA0 002CBAE0 7C 03 03 78 */ mr r3, r0 +/* 802CEBA4 002CBAE4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEBA8.s b/include/JKernel/asm/func_802CEBA8.s new file mode 100644 index 0000000000..43f8f0dce4 --- /dev/null +++ b/include/JKernel/asm/func_802CEBA8.s @@ -0,0 +1,48 @@ +/* 802CEBA8 002CBAE8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEBAC 002CBAEC 7C 08 02 A6 */ mflr r0 +/* 802CEBB0 002CBAF0 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEBB4 002CBAF4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802CEBB8 002CBAF8 93 C1 00 08 */ stw r30, 8(r1) +/* 802CEBBC 002CBAFC 7C 9E 23 79 */ or. r30, r4, r4 +/* 802CEBC0 002CBB00 40 82 00 0C */ bne lbl_802CEBCC +/* 802CEBC4 002CBB04 38 60 00 00 */ li r3, 0 +/* 802CEBC8 002CBB08 48 00 00 6C */ b lbl_802CEC34 +lbl_802CEBCC: +/* 802CEBCC 002CBB0C 80 03 00 48 */ lwz r0, 0x48(r3) +/* 802CEBD0 002CBB10 28 00 00 00 */ cmplwi r0, 0 +/* 802CEBD4 002CBB14 41 82 00 5C */ beq lbl_802CEC30 +/* 802CEBD8 002CBB18 83 E3 00 40 */ lwz r31, 0x40(r3) +/* 802CEBDC 002CBB1C 28 1F 00 00 */ cmplwi r31, 0 +/* 802CEBE0 002CBB20 41 82 00 48 */ beq lbl_802CEC28 +/* 802CEBE4 002CBB24 3B FF FF F4 */ addi r31, r31, -12 +/* 802CEBE8 002CBB28 48 00 00 40 */ b lbl_802CEC28 +lbl_802CEBEC: +/* 802CEBEC 002CBB2C 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 802CEBF0 002CBB30 7C 03 F0 40 */ cmplw r3, r30 +/* 802CEBF4 002CBB34 40 82 00 0C */ bne lbl_802CEC00 +/* 802CEBF8 002CBB38 38 60 00 01 */ li r3, 1 +/* 802CEBFC 002CBB3C 48 00 00 38 */ b lbl_802CEC34 +lbl_802CEC00: +/* 802CEC00 002CBB40 7F C4 F3 78 */ mr r4, r30 +/* 802CEC04 002CBB44 4B FF FF A5 */ bl isSubHeap__7JKRHeapCFP7JKRHeap +/* 802CEC08 002CBB48 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802CEC0C 002CBB4C 41 82 00 0C */ beq lbl_802CEC18 +/* 802CEC10 002CBB50 38 60 00 01 */ li r3, 1 +/* 802CEC14 002CBB54 48 00 00 20 */ b lbl_802CEC34 +lbl_802CEC18: +/* 802CEC18 002CBB58 83 FF 00 18 */ lwz r31, 0x18(r31) +/* 802CEC1C 002CBB5C 28 1F 00 00 */ cmplwi r31, 0 +/* 802CEC20 002CBB60 41 82 00 08 */ beq lbl_802CEC28 +/* 802CEC24 002CBB64 3B FF FF F4 */ addi r31, r31, -12 +lbl_802CEC28: +/* 802CEC28 002CBB68 28 1F 00 00 */ cmplwi r31, 0 +/* 802CEC2C 002CBB6C 40 82 FF C0 */ bne lbl_802CEBEC +lbl_802CEC30: +/* 802CEC30 002CBB70 38 60 00 00 */ li r3, 0 +lbl_802CEC34: +/* 802CEC34 002CBB74 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802CEC38 002CBB78 83 C1 00 08 */ lwz r30, 8(r1) +/* 802CEC3C 002CBB7C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEC40 002CBB80 7C 08 03 A6 */ mtlr r0 +/* 802CEC44 002CBB84 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEC48 002CBB88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEC4C.s b/include/JKernel/asm/func_802CEC4C.s new file mode 100644 index 0000000000..96429baf31 --- /dev/null +++ b/include/JKernel/asm/func_802CEC4C.s @@ -0,0 +1,10 @@ +/* 802CEC4C 002CBB8C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEC50 002CBB90 7C 08 02 A6 */ mflr r0 +/* 802CEC54 002CBB94 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEC58 002CBB98 38 80 00 04 */ li r4, 4 +/* 802CEC5C 002CBB9C 38 A0 00 00 */ li r5, 0 +/* 802CEC60 002CBBA0 4B FF F8 15 */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CEC64 002CBBA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEC68 002CBBA8 7C 08 03 A6 */ mtlr r0 +/* 802CEC6C 002CBBAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEC70 002CBBB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEC74.s b/include/JKernel/asm/func_802CEC74.s new file mode 100644 index 0000000000..f439d28fea --- /dev/null +++ b/include/JKernel/asm/func_802CEC74.s @@ -0,0 +1,9 @@ +/* 802CEC74 002CBBB4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEC78 002CBBB8 7C 08 02 A6 */ mflr r0 +/* 802CEC7C 002CBBBC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CEC80 002CBBC0 38 A0 00 00 */ li r5, 0 +/* 802CEC84 002CBBC4 4B FF F7 F1 */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CEC88 002CBBC8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CEC8C 002CBBCC 7C 08 03 A6 */ mtlr r0 +/* 802CEC90 002CBBD0 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CEC94 002CBBD4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CEC98.s b/include/JKernel/asm/func_802CEC98.s new file mode 100644 index 0000000000..1dae5e8190 --- /dev/null +++ b/include/JKernel/asm/func_802CEC98.s @@ -0,0 +1,11 @@ +/* 802CEC98 002CBBD8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CEC9C 002CBBDC 7C 08 02 A6 */ mflr r0 +/* 802CECA0 002CBBE0 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CECA4 002CBBE4 7C 80 23 78 */ mr r0, r4 +/* 802CECA8 002CBBE8 7C A4 2B 78 */ mr r4, r5 +/* 802CECAC 002CBBEC 7C 05 03 78 */ mr r5, r0 +/* 802CECB0 002CBBF0 4B FF F7 C5 */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CECB4 002CBBF4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CECB8 002CBBF8 7C 08 03 A6 */ mtlr r0 +/* 802CECBC 002CBBFC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CECC0 002CBC00 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CECC4.s b/include/JKernel/asm/func_802CECC4.s new file mode 100644 index 0000000000..5d92bb6d97 --- /dev/null +++ b/include/JKernel/asm/func_802CECC4.s @@ -0,0 +1,10 @@ +/* 802CECC4 002CBC04 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CECC8 002CBC08 7C 08 02 A6 */ mflr r0 +/* 802CECCC 002CBC0C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CECD0 002CBC10 38 80 00 04 */ li r4, 4 +/* 802CECD4 002CBC14 38 A0 00 00 */ li r5, 0 +/* 802CECD8 002CBC18 4B FF F7 9D */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CECDC 002CBC1C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CECE0 002CBC20 7C 08 03 A6 */ mtlr r0 +/* 802CECE4 002CBC24 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CECE8 002CBC28 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CECEC.s b/include/JKernel/asm/func_802CECEC.s new file mode 100644 index 0000000000..ae4eb329e8 --- /dev/null +++ b/include/JKernel/asm/func_802CECEC.s @@ -0,0 +1,9 @@ +/* 802CECEC 002CBC2C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CECF0 002CBC30 7C 08 02 A6 */ mflr r0 +/* 802CECF4 002CBC34 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CECF8 002CBC38 38 A0 00 00 */ li r5, 0 +/* 802CECFC 002CBC3C 4B FF F7 79 */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CED00 002CBC40 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CED04 002CBC44 7C 08 03 A6 */ mtlr r0 +/* 802CED08 002CBC48 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CED0C 002CBC4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CED10.s b/include/JKernel/asm/func_802CED10.s new file mode 100644 index 0000000000..b140e1aa32 --- /dev/null +++ b/include/JKernel/asm/func_802CED10.s @@ -0,0 +1,11 @@ +/* 802CED10 002CBC50 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CED14 002CBC54 7C 08 02 A6 */ mflr r0 +/* 802CED18 002CBC58 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CED1C 002CBC5C 7C 80 23 78 */ mr r0, r4 +/* 802CED20 002CBC60 7C A4 2B 78 */ mr r4, r5 +/* 802CED24 002CBC64 7C 05 03 78 */ mr r5, r0 +/* 802CED28 002CBC68 4B FF F7 4D */ bl alloc__7JKRHeapFUliP7JKRHeap +/* 802CED2C 002CBC6C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CED30 002CBC70 7C 08 03 A6 */ mtlr r0 +/* 802CED34 002CBC74 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CED38 002CBC78 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CED3C.s b/include/JKernel/asm/func_802CED3C.s new file mode 100644 index 0000000000..961e19f001 --- /dev/null +++ b/include/JKernel/asm/func_802CED3C.s @@ -0,0 +1,9 @@ +/* 802CED3C 002CBC7C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CED40 002CBC80 7C 08 02 A6 */ mflr r0 +/* 802CED44 002CBC84 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CED48 002CBC88 38 80 00 00 */ li r4, 0 +/* 802CED4C 002CBC8C 4B FF F7 B5 */ bl free__7JKRHeapFPvP7JKRHeap +/* 802CED50 002CBC90 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CED54 002CBC94 7C 08 03 A6 */ mtlr r0 +/* 802CED58 002CBC98 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CED5C 002CBC9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802CED60.s b/include/JKernel/asm/func_802CED60.s new file mode 100644 index 0000000000..b3dbe03d51 --- /dev/null +++ b/include/JKernel/asm/func_802CED60.s @@ -0,0 +1,21 @@ +/* 802CED60 002CBCA0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802CED64 002CBCA4 7C 08 02 A6 */ mflr r0 +/* 802CED68 002CBCA8 90 01 00 14 */ stw r0, 0x14(r1) +/* 802CED6C 002CBCAC 38 80 00 00 */ li r4, 0 +/* 802CED70 002CBCB0 4B FF F7 91 */ bl free__7JKRHeapFPvP7JKRHeap +/* 802CED74 002CBCB4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802CED78 002CBCB8 7C 08 03 A6 */ mtlr r0 +/* 802CED7C 002CBCBC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802CED80 002CBCC0 4E 80 00 20 */ blr +/* 802CED84 002CBCC4 4E 80 00 20 */ blr +/* 802CED88 002CBCC8 80 64 00 04 */ lwz r3, 4(r4) +/* 802CED8C 002CBCCC 80 05 00 04 */ lwz r0, 4(r5) +/* 802CED90 002CBCD0 7C 03 00 50 */ subf r0, r3, r0 +/* 802CED94 002CBCD4 7C 00 00 34 */ cntlzw r0, r0 +/* 802CED98 002CBCD8 54 03 D9 7E */ srwi r3, r0, 5 +/* 802CED9C 002CBCDC 4E 80 00 20 */ blr +/* 802CEDA0 002CBCE0 4E 80 00 20 */ blr +/* 802CEDA4 002CBCE4 38 60 00 00 */ li r3, 0 +/* 802CEDA8 002CBCE8 4E 80 00 20 */ blr +/* 802CEDAC 002CBCEC 38 60 00 00 */ li r3, 0 +/* 802CEDB0 002CBCF0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802D147C.s b/include/JKernel/asm/func_802D147C.s new file mode 100644 index 0000000000..14f91edca6 --- /dev/null +++ b/include/JKernel/asm/func_802D147C.s @@ -0,0 +1,27 @@ +/* 802D147C 002CE3BC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802D1480 002CE3C0 7C 08 02 A6 */ mflr r0 +/* 802D1484 002CE3C4 90 01 00 14 */ stw r0, 0x14(r1) +/* 802D1488 002CE3C8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802D148C 002CE3CC 7C 7F 1B 78 */ mr r31, r3 +/* 802D1490 002CE3D0 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha +/* 802D1494 002CE3D4 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l +/* 802D1498 002CE3D8 90 1F 00 00 */ stw r0, 0(r31) +/* 802D149C 002CE3DC 7F E4 FB 78 */ mr r4, r31 +/* 802D14A0 002CE3E0 38 64 00 08 */ addi r3, r4, 8 +/* 802D14A4 002CE3E4 48 00 A9 59 */ bl __ct__10JSUPtrLinkFPv +/* 802D14A8 002CE3E8 7F E3 FB 78 */ mr r3, r31 +/* 802D14AC 002CE3EC 4B FF D3 91 */ bl findFromRoot__7JKRHeapFPv +/* 802D14B0 002CE3F0 90 7F 00 04 */ stw r3, 4(r31) +/* 802D14B4 002CE3F4 80 7F 00 04 */ lwz r3, 4(r31) +/* 802D14B8 002CE3F8 28 03 00 00 */ cmplwi r3, 0 +/* 802D14BC 002CE3FC 41 82 00 10 */ beq lbl_802D14CC +/* 802D14C0 002CE400 38 63 00 5C */ addi r3, r3, 0x5c +/* 802D14C4 002CE404 38 9F 00 08 */ addi r4, r31, 8 +/* 802D14C8 002CE408 48 00 AA 85 */ bl append__10JSUPtrListFP10JSUPtrLink +lbl_802D14CC: +/* 802D14CC 002CE40C 7F E3 FB 78 */ mr r3, r31 +/* 802D14D0 002CE410 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802D14D4 002CE414 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802D14D8 002CE418 7C 08 03 A6 */ mtlr r0 +/* 802D14DC 002CE41C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802D14E0 002CE420 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JKernel/asm/func_802D14E4.s b/include/JKernel/asm/func_802D14E4.s new file mode 100644 index 0000000000..174f63d4e4 --- /dev/null +++ b/include/JKernel/asm/func_802D14E4.s @@ -0,0 +1,36 @@ +/* 802D14E4 002CE424 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802D14E8 002CE428 7C 08 02 A6 */ mflr r0 +/* 802D14EC 002CE42C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802D14F0 002CE430 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802D14F4 002CE434 93 C1 00 08 */ stw r30, 8(r1) +/* 802D14F8 002CE438 7C 7E 1B 79 */ or. r30, r3, r3 +/* 802D14FC 002CE43C 7C 9F 23 78 */ mr r31, r4 +/* 802D1500 002CE440 41 82 00 4C */ beq lbl_802D154C +/* 802D1504 002CE444 3C 60 80 3D */ lis r3, lbl_803CC0F0@ha +/* 802D1508 002CE448 38 03 C0 F0 */ addi r0, r3, lbl_803CC0F0@l +/* 802D150C 002CE44C 90 1E 00 00 */ stw r0, 0(r30) +/* 802D1510 002CE450 80 7E 00 04 */ lwz r3, 4(r30) +/* 802D1514 002CE454 28 03 00 00 */ cmplwi r3, 0 +/* 802D1518 002CE458 41 82 00 10 */ beq lbl_802D1528 +/* 802D151C 002CE45C 38 63 00 5C */ addi r3, r3, 0x5c +/* 802D1520 002CE460 38 9E 00 08 */ addi r4, r30, 8 +/* 802D1524 002CE464 48 00 AC 39 */ bl remove__10JSUPtrListFP10JSUPtrLink +lbl_802D1528: +/* 802D1528 002CE468 34 1E 00 08 */ addic. r0, r30, 8 +/* 802D152C 002CE46C 41 82 00 10 */ beq lbl_802D153C +/* 802D1530 002CE470 38 7E 00 08 */ addi r3, r30, 8 +/* 802D1534 002CE474 38 80 00 00 */ li r4, 0 +/* 802D1538 002CE478 48 00 A8 DD */ bl __dt__10JSUPtrLinkFv +lbl_802D153C: +/* 802D153C 002CE47C 7F E0 07 35 */ extsh. r0, r31 +/* 802D1540 002CE480 40 81 00 0C */ ble lbl_802D154C +/* 802D1544 002CE484 7F C3 F3 78 */ mr r3, r30 +/* 802D1548 002CE488 4B FF D7 F5 */ bl __dl__FPv +lbl_802D154C: +/* 802D154C 002CE48C 7F C3 F3 78 */ mr r3, r30 +/* 802D1550 002CE490 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802D1554 002CE494 83 C1 00 08 */ lwz r30, 8(r1) +/* 802D1558 002CE498 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802D155C 002CE49C 7C 08 03 A6 */ mtlr r0 +/* 802D1560 002CE4A0 38 21 00 10 */ addi r1, r1, 0x10 +/* 802D1564 002CE4A4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/JSUList.h b/include/JSupport/JSUList.h new file mode 100644 index 0000000000..c0b145f223 --- /dev/null +++ b/include/JSupport/JSUList.h @@ -0,0 +1,47 @@ +#ifndef __JSULIST_H__ +#define __JSULIST_H__ + +#include "dolphin/types.h" + +class JSUPtrList; +class JSUPtrLink { + public: + JSUPtrLink(void*); + ~JSUPtrLink(); + + public: + void* unk0; + JSUPtrList* list; + JSUPtrLink* prev; + JSUPtrLink* next; +}; + +class JSUPtrList { + public: + JSUPtrList(bool should_initiate); + ~JSUPtrList(); + + void initiate(); + void setFirst(JSUPtrLink* first); + bool append(JSUPtrLink* ptr); + bool prepend(JSUPtrLink* ptr); + bool insert(JSUPtrLink* before, JSUPtrLink* ptr); + bool remove(JSUPtrLink* ptr); + JSUPtrLink* getNthLink(u32 i) const; + + public: + JSUPtrLink* head; + JSUPtrLink* tail; + u32 length; +}; + + +template +class JSUList : JSUPtrList { + public: + JSUList() : JSUPtrList(true) {} + ~JSUList() {}; + +}; + +#endif diff --git a/include/JSupport/asm/func_802DBDFC.s b/include/JSupport/asm/func_802DBDFC.s new file mode 100644 index 0000000000..82e4a6f203 --- /dev/null +++ b/include/JSupport/asm/func_802DBDFC.s @@ -0,0 +1,6 @@ +/* 802DBDFC 002D8D3C 38 00 00 00 */ li r0, 0 +/* 802DBE00 002D8D40 90 03 00 04 */ stw r0, 4(r3) +/* 802DBE04 002D8D44 90 83 00 00 */ stw r4, 0(r3) +/* 802DBE08 002D8D48 90 03 00 08 */ stw r0, 8(r3) +/* 802DBE0C 002D8D4C 90 03 00 0C */ stw r0, 0xc(r3) +/* 802DBE10 002D8D50 4E 80 00 20 */ blr diff --git a/include/JSupport/asm/func_802DBE14.s b/include/JSupport/asm/func_802DBE14.s new file mode 100644 index 0000000000..998575f093 --- /dev/null +++ b/include/JSupport/asm/func_802DBE14.s @@ -0,0 +1,26 @@ +/* 802DBE14 002D8D54 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802DBE18 002D8D58 7C 08 02 A6 */ mflr r0 +/* 802DBE1C 002D8D5C 90 01 00 14 */ stw r0, 0x14(r1) +/* 802DBE20 002D8D60 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802DBE24 002D8D64 93 C1 00 08 */ stw r30, 8(r1) +/* 802DBE28 002D8D68 7C 7E 1B 79 */ or. r30, r3, r3 +/* 802DBE2C 002D8D6C 7C 9F 23 78 */ mr r31, r4 +/* 802DBE30 002D8D70 41 82 00 28 */ beq lbl_802DBE58 +/* 802DBE34 002D8D74 80 7E 00 04 */ lwz r3, 4(r30) +/* 802DBE38 002D8D78 28 03 00 00 */ cmplwi r3, 0 +/* 802DBE3C 002D8D7C 41 82 00 0C */ beq lbl_802DBE48 +/* 802DBE40 002D8D80 7F C4 F3 78 */ mr r4, r30 +/* 802DBE44 002D8D84 48 00 03 19 */ bl remove__10JSUPtrListFP10JSUPtrLink +lbl_802DBE48: +/* 802DBE48 002D8D88 7F E0 07 35 */ extsh. r0, r31 +/* 802DBE4C 002D8D8C 40 81 00 0C */ ble lbl_802DBE58 +/* 802DBE50 002D8D90 7F C3 F3 78 */ mr r3, r30 +/* 802DBE54 002D8D94 4B FF 2E E9 */ bl __dl__FPv +lbl_802DBE58: +/* 802DBE58 002D8D98 7F C3 F3 78 */ mr r3, r30 +/* 802DBE5C 002D8D9C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802DBE60 002D8DA0 83 C1 00 08 */ lwz r30, 8(r1) +/* 802DBE64 002D8DA4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802DBE68 002D8DA8 7C 08 03 A6 */ mtlr r0 +/* 802DBE6C 002D8DAC 38 21 00 10 */ addi r1, r1, 0x10 +/* 802DBE70 002D8DB0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBE74.s b/include/JSupport/asm/func_802DBE74.s new file mode 100644 index 0000000000..404066b907 --- /dev/null +++ b/include/JSupport/asm/func_802DBE74.s @@ -0,0 +1,15 @@ +/* 802DBE74 002D8DB4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802DBE78 002D8DB8 7C 08 02 A6 */ mflr r0 +/* 802DBE7C 002D8DBC 90 01 00 14 */ stw r0, 0x14(r1) +/* 802DBE80 002D8DC0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802DBE84 002D8DC4 7C 7F 1B 78 */ mr r31, r3 +/* 802DBE88 002D8DC8 54 80 06 3F */ clrlwi. r0, r4, 0x18 +/* 802DBE8C 002D8DCC 41 82 00 08 */ beq lbl_802DBE94 +/* 802DBE90 002D8DD0 48 00 00 85 */ bl initiate__10JSUPtrListFv +lbl_802DBE94: +/* 802DBE94 002D8DD4 7F E3 FB 78 */ mr r3, r31 +/* 802DBE98 002D8DD8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802DBE9C 002D8DDC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802DBEA0 002D8DE0 7C 08 03 A6 */ mtlr r0 +/* 802DBEA4 002D8DE4 38 21 00 10 */ addi r1, r1, 0x10 +/* 802DBEA8 002D8DE8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBEAC.s b/include/JSupport/asm/func_802DBEAC.s new file mode 100644 index 0000000000..c85b5d5801 --- /dev/null +++ b/include/JSupport/asm/func_802DBEAC.s @@ -0,0 +1,29 @@ +/* 802DBEAC 002D8DEC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802DBEB0 002D8DF0 7C 08 02 A6 */ mflr r0 +/* 802DBEB4 002D8DF4 90 01 00 14 */ stw r0, 0x14(r1) +/* 802DBEB8 002D8DF8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 802DBEBC 002D8DFC 7C 7F 1B 79 */ or. r31, r3, r3 +/* 802DBEC0 002D8E00 41 82 00 3C */ beq lbl_802DBEFC +/* 802DBEC4 002D8E04 80 BF 00 00 */ lwz r5, 0(r31) +/* 802DBEC8 002D8E08 38 C0 00 00 */ li r6, 0 +/* 802DBECC 002D8E0C 38 60 00 00 */ li r3, 0 +/* 802DBED0 002D8E10 48 00 00 10 */ b lbl_802DBEE0 +lbl_802DBED4: +/* 802DBED4 002D8E14 90 65 00 04 */ stw r3, 4(r5) +/* 802DBED8 002D8E18 80 A5 00 0C */ lwz r5, 0xc(r5) +/* 802DBEDC 002D8E1C 38 C6 00 01 */ addi r6, r6, 1 +lbl_802DBEE0: +/* 802DBEE0 002D8E20 80 1F 00 08 */ lwz r0, 8(r31) +/* 802DBEE4 002D8E24 7C 06 00 40 */ cmplw r6, r0 +/* 802DBEE8 002D8E28 41 80 FF EC */ blt lbl_802DBED4 +/* 802DBEEC 002D8E2C 7C 80 07 35 */ extsh. r0, r4 +/* 802DBEF0 002D8E30 40 81 00 0C */ ble lbl_802DBEFC +/* 802DBEF4 002D8E34 7F E3 FB 78 */ mr r3, r31 +/* 802DBEF8 002D8E38 4B FF 2E 45 */ bl __dl__FPv +lbl_802DBEFC: +/* 802DBEFC 002D8E3C 7F E3 FB 78 */ mr r3, r31 +/* 802DBF00 002D8E40 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 802DBF04 002D8E44 80 01 00 14 */ lwz r0, 0x14(r1) +/* 802DBF08 002D8E48 7C 08 03 A6 */ mtlr r0 +/* 802DBF0C 002D8E4C 38 21 00 10 */ addi r1, r1, 0x10 +/* 802DBF10 002D8E50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBF14.s b/include/JSupport/asm/func_802DBF14.s new file mode 100644 index 0000000000..948cac4c52 --- /dev/null +++ b/include/JSupport/asm/func_802DBF14.s @@ -0,0 +1,5 @@ +/* 802DBF14 002D8E54 38 00 00 00 */ li r0, 0 +/* 802DBF18 002D8E58 90 03 00 00 */ stw r0, 0(r3) +/* 802DBF1C 002D8E5C 90 03 00 04 */ stw r0, 4(r3) +/* 802DBF20 002D8E60 90 03 00 08 */ stw r0, 8(r3) +/* 802DBF24 002D8E64 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBF28.s b/include/JSupport/asm/func_802DBF28.s new file mode 100644 index 0000000000..b222d9d840 --- /dev/null +++ b/include/JSupport/asm/func_802DBF28.s @@ -0,0 +1,9 @@ +/* 802DBF28 002D8E68 90 64 00 04 */ stw r3, 4(r4) +/* 802DBF2C 002D8E6C 38 00 00 00 */ li r0, 0 +/* 802DBF30 002D8E70 90 04 00 08 */ stw r0, 8(r4) +/* 802DBF34 002D8E74 90 04 00 0C */ stw r0, 0xc(r4) +/* 802DBF38 002D8E78 90 83 00 04 */ stw r4, 4(r3) +/* 802DBF3C 002D8E7C 90 83 00 00 */ stw r4, 0(r3) +/* 802DBF40 002D8E80 38 00 00 01 */ li r0, 1 +/* 802DBF44 002D8E84 90 03 00 08 */ stw r0, 8(r3) +/* 802DBF48 002D8E88 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBF4C.s b/include/JSupport/asm/func_802DBF4C.s new file mode 100644 index 0000000000..0200801922 --- /dev/null +++ b/include/JSupport/asm/func_802DBF4C.s @@ -0,0 +1,44 @@ +/* 802DBF4C 002D8E8C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802DBF50 002D8E90 7C 08 02 A6 */ mflr r0 +/* 802DBF54 002D8E94 90 01 00 24 */ stw r0, 0x24(r1) +/* 802DBF58 002D8E98 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DBF5C 002D8E9C 48 08 62 81 */ bl _savegpr_29 +/* 802DBF60 002D8EA0 7C 7D 1B 78 */ mr r29, r3 +/* 802DBF64 002D8EA4 7C 9E 23 78 */ mr r30, r4 +/* 802DBF68 002D8EA8 80 64 00 04 */ lwz r3, 4(r4) +/* 802DBF6C 002D8EAC 7C 60 00 34 */ cntlzw r0, r3 +/* 802DBF70 002D8EB0 54 1F D9 7E */ srwi r31, r0, 5 +/* 802DBF74 002D8EB4 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f +/* 802DBF78 002D8EB8 40 82 00 0C */ bne lbl_802DBF84 +/* 802DBF7C 002D8EBC 48 00 01 E1 */ bl remove__10JSUPtrListFP10JSUPtrLink +/* 802DBF80 002D8EC0 7C 7F 1B 78 */ mr r31, r3 +lbl_802DBF84: +/* 802DBF84 002D8EC4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 802DBF88 002D8EC8 41 82 00 4C */ beq lbl_802DBFD4 +/* 802DBF8C 002D8ECC 80 1D 00 08 */ lwz r0, 8(r29) +/* 802DBF90 002D8ED0 28 00 00 00 */ cmplwi r0, 0 +/* 802DBF94 002D8ED4 40 82 00 14 */ bne lbl_802DBFA8 +/* 802DBF98 002D8ED8 7F A3 EB 78 */ mr r3, r29 +/* 802DBF9C 002D8EDC 7F C4 F3 78 */ mr r4, r30 +/* 802DBFA0 002D8EE0 4B FF FF 89 */ bl setFirst__10JSUPtrListFP10JSUPtrLink +/* 802DBFA4 002D8EE4 48 00 00 30 */ b lbl_802DBFD4 +lbl_802DBFA8: +/* 802DBFA8 002D8EE8 93 BE 00 04 */ stw r29, 4(r30) +/* 802DBFAC 002D8EEC 80 1D 00 04 */ lwz r0, 4(r29) +/* 802DBFB0 002D8EF0 90 1E 00 08 */ stw r0, 8(r30) +/* 802DBFB4 002D8EF4 38 00 00 00 */ li r0, 0 +/* 802DBFB8 002D8EF8 90 1E 00 0C */ stw r0, 0xc(r30) +/* 802DBFBC 002D8EFC 80 7D 00 04 */ lwz r3, 4(r29) +/* 802DBFC0 002D8F00 93 C3 00 0C */ stw r30, 0xc(r3) +/* 802DBFC4 002D8F04 93 DD 00 04 */ stw r30, 4(r29) +/* 802DBFC8 002D8F08 80 7D 00 08 */ lwz r3, 8(r29) +/* 802DBFCC 002D8F0C 38 03 00 01 */ addi r0, r3, 1 +/* 802DBFD0 002D8F10 90 1D 00 08 */ stw r0, 8(r29) +lbl_802DBFD4: +/* 802DBFD4 002D8F14 7F E3 FB 78 */ mr r3, r31 +/* 802DBFD8 002D8F18 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DBFDC 002D8F1C 48 08 62 4D */ bl _restgpr_29 +/* 802DBFE0 002D8F20 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802DBFE4 002D8F24 7C 08 03 A6 */ mtlr r0 +/* 802DBFE8 002D8F28 38 21 00 20 */ addi r1, r1, 0x20 +/* 802DBFEC 002D8F2C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DBFF0.s b/include/JSupport/asm/func_802DBFF0.s new file mode 100644 index 0000000000..d0693789a1 --- /dev/null +++ b/include/JSupport/asm/func_802DBFF0.s @@ -0,0 +1,44 @@ +/* 802DBFF0 002D8F30 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802DBFF4 002D8F34 7C 08 02 A6 */ mflr r0 +/* 802DBFF8 002D8F38 90 01 00 24 */ stw r0, 0x24(r1) +/* 802DBFFC 002D8F3C 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DC000 002D8F40 48 08 61 DD */ bl _savegpr_29 +/* 802DC004 002D8F44 7C 7D 1B 78 */ mr r29, r3 +/* 802DC008 002D8F48 7C 9E 23 78 */ mr r30, r4 +/* 802DC00C 002D8F4C 80 64 00 04 */ lwz r3, 4(r4) +/* 802DC010 002D8F50 7C 60 00 34 */ cntlzw r0, r3 +/* 802DC014 002D8F54 54 1F D9 7E */ srwi r31, r0, 5 +/* 802DC018 002D8F58 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f +/* 802DC01C 002D8F5C 40 82 00 0C */ bne lbl_802DC028 +/* 802DC020 002D8F60 48 00 01 3D */ bl remove__10JSUPtrListFP10JSUPtrLink +/* 802DC024 002D8F64 7C 7F 1B 78 */ mr r31, r3 +lbl_802DC028: +/* 802DC028 002D8F68 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 802DC02C 002D8F6C 41 82 00 4C */ beq lbl_802DC078 +/* 802DC030 002D8F70 80 1D 00 08 */ lwz r0, 8(r29) +/* 802DC034 002D8F74 28 00 00 00 */ cmplwi r0, 0 +/* 802DC038 002D8F78 40 82 00 14 */ bne lbl_802DC04C +/* 802DC03C 002D8F7C 7F A3 EB 78 */ mr r3, r29 +/* 802DC040 002D8F80 7F C4 F3 78 */ mr r4, r30 +/* 802DC044 002D8F84 4B FF FE E5 */ bl setFirst__10JSUPtrListFP10JSUPtrLink +/* 802DC048 002D8F88 48 00 00 30 */ b lbl_802DC078 +lbl_802DC04C: +/* 802DC04C 002D8F8C 93 BE 00 04 */ stw r29, 4(r30) +/* 802DC050 002D8F90 38 00 00 00 */ li r0, 0 +/* 802DC054 002D8F94 90 1E 00 08 */ stw r0, 8(r30) +/* 802DC058 002D8F98 80 1D 00 00 */ lwz r0, 0(r29) +/* 802DC05C 002D8F9C 90 1E 00 0C */ stw r0, 0xc(r30) +/* 802DC060 002D8FA0 80 7D 00 00 */ lwz r3, 0(r29) +/* 802DC064 002D8FA4 93 C3 00 08 */ stw r30, 8(r3) +/* 802DC068 002D8FA8 93 DD 00 00 */ stw r30, 0(r29) +/* 802DC06C 002D8FAC 80 7D 00 08 */ lwz r3, 8(r29) +/* 802DC070 002D8FB0 38 03 00 01 */ addi r0, r3, 1 +/* 802DC074 002D8FB4 90 1D 00 08 */ stw r0, 8(r29) +lbl_802DC078: +/* 802DC078 002D8FB8 7F E3 FB 78 */ mr r3, r31 +/* 802DC07C 002D8FBC 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DC080 002D8FC0 48 08 61 A9 */ bl _restgpr_29 +/* 802DC084 002D8FC4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802DC088 002D8FC8 7C 08 03 A6 */ mtlr r0 +/* 802DC08C 002D8FCC 38 21 00 20 */ addi r1, r1, 0x20 +/* 802DC090 002D8FD0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DC094.s b/include/JSupport/asm/func_802DC094.s new file mode 100644 index 0000000000..f33f5e9880 --- /dev/null +++ b/include/JSupport/asm/func_802DC094.s @@ -0,0 +1,56 @@ +/* 802DC094 002D8FD4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 802DC098 002D8FD8 7C 08 02 A6 */ mflr r0 +/* 802DC09C 002D8FDC 90 01 00 24 */ stw r0, 0x24(r1) +/* 802DC0A0 002D8FE0 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DC0A4 002D8FE4 48 08 61 39 */ bl _savegpr_29 +/* 802DC0A8 002D8FE8 7C 7D 1B 78 */ mr r29, r3 +/* 802DC0AC 002D8FEC 7C 9E 23 78 */ mr r30, r4 +/* 802DC0B0 002D8FF0 7C BF 2B 78 */ mr r31, r5 +/* 802DC0B4 002D8FF4 80 03 00 00 */ lwz r0, 0(r3) +/* 802DC0B8 002D8FF8 7C 1E 00 40 */ cmplw r30, r0 +/* 802DC0BC 002D8FFC 40 82 00 10 */ bne lbl_802DC0CC +/* 802DC0C0 002D9000 7F E4 FB 78 */ mr r4, r31 +/* 802DC0C4 002D9004 4B FF FF 2D */ bl prepend__10JSUPtrListFP10JSUPtrLink +/* 802DC0C8 002D9008 48 00 00 7C */ b lbl_802DC144 +lbl_802DC0CC: +/* 802DC0CC 002D900C 28 1E 00 00 */ cmplwi r30, 0 +/* 802DC0D0 002D9010 40 82 00 10 */ bne lbl_802DC0E0 +/* 802DC0D4 002D9014 7F E4 FB 78 */ mr r4, r31 +/* 802DC0D8 002D9018 4B FF FE 75 */ bl append__10JSUPtrListFP10JSUPtrLink +/* 802DC0DC 002D901C 48 00 00 68 */ b lbl_802DC144 +lbl_802DC0E0: +/* 802DC0E0 002D9020 80 1E 00 04 */ lwz r0, 4(r30) +/* 802DC0E4 002D9024 7C 00 E8 40 */ cmplw r0, r29 +/* 802DC0E8 002D9028 41 82 00 0C */ beq lbl_802DC0F4 +/* 802DC0EC 002D902C 38 60 00 00 */ li r3, 0 +/* 802DC0F0 002D9030 48 00 00 54 */ b lbl_802DC144 +lbl_802DC0F4: +/* 802DC0F4 002D9034 80 7F 00 04 */ lwz r3, 4(r31) +/* 802DC0F8 002D9038 7C 60 00 34 */ cntlzw r0, r3 +/* 802DC0FC 002D903C 54 04 D9 7E */ srwi r4, r0, 5 +/* 802DC100 002D9040 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f +/* 802DC104 002D9044 40 82 00 10 */ bne lbl_802DC114 +/* 802DC108 002D9048 7F E4 FB 78 */ mr r4, r31 +/* 802DC10C 002D904C 48 00 00 51 */ bl remove__10JSUPtrListFP10JSUPtrLink +/* 802DC110 002D9050 7C 64 1B 78 */ mr r4, r3 +lbl_802DC114: +/* 802DC114 002D9054 54 80 06 3F */ clrlwi. r0, r4, 0x18 +/* 802DC118 002D9058 41 82 00 28 */ beq lbl_802DC140 +/* 802DC11C 002D905C 80 7E 00 08 */ lwz r3, 8(r30) +/* 802DC120 002D9060 93 BF 00 04 */ stw r29, 4(r31) +/* 802DC124 002D9064 90 7F 00 08 */ stw r3, 8(r31) +/* 802DC128 002D9068 93 DF 00 0C */ stw r30, 0xc(r31) +/* 802DC12C 002D906C 93 E3 00 0C */ stw r31, 0xc(r3) +/* 802DC130 002D9070 93 FE 00 08 */ stw r31, 8(r30) +/* 802DC134 002D9074 80 7D 00 08 */ lwz r3, 8(r29) +/* 802DC138 002D9078 38 03 00 01 */ addi r0, r3, 1 +/* 802DC13C 002D907C 90 1D 00 08 */ stw r0, 8(r29) +lbl_802DC140: +/* 802DC140 002D9080 7C 83 23 78 */ mr r3, r4 +lbl_802DC144: +/* 802DC144 002D9084 39 61 00 20 */ addi r11, r1, 0x20 +/* 802DC148 002D9088 48 08 60 E1 */ bl _restgpr_29 +/* 802DC14C 002D908C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802DC150 002D9090 7C 08 03 A6 */ mtlr r0 +/* 802DC154 002D9094 38 21 00 20 */ addi r1, r1, 0x20 +/* 802DC158 002D9098 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DC15C.s b/include/JSupport/asm/func_802DC15C.s new file mode 100644 index 0000000000..cfeaa0f9a9 --- /dev/null +++ b/include/JSupport/asm/func_802DC15C.s @@ -0,0 +1,49 @@ +/* 802DC15C 002D909C 80 04 00 04 */ lwz r0, 4(r4) +/* 802DC160 002D90A0 7C 00 18 50 */ subf r0, r0, r3 +/* 802DC164 002D90A4 7C 00 00 34 */ cntlzw r0, r0 +/* 802DC168 002D90A8 54 06 D9 7E */ srwi r6, r0, 5 +/* 802DC16C 002D90AC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f +/* 802DC170 002D90B0 41 82 00 94 */ beq lbl_802DC204 +/* 802DC174 002D90B4 80 03 00 08 */ lwz r0, 8(r3) +/* 802DC178 002D90B8 28 00 00 01 */ cmplwi r0, 1 +/* 802DC17C 002D90BC 40 82 00 14 */ bne lbl_802DC190 +/* 802DC180 002D90C0 38 00 00 00 */ li r0, 0 +/* 802DC184 002D90C4 90 03 00 00 */ stw r0, 0(r3) +/* 802DC188 002D90C8 90 03 00 04 */ stw r0, 4(r3) +/* 802DC18C 002D90CC 48 00 00 64 */ b lbl_802DC1F0 +lbl_802DC190: +/* 802DC190 002D90D0 80 03 00 00 */ lwz r0, 0(r3) +/* 802DC194 002D90D4 7C 04 00 40 */ cmplw r4, r0 +/* 802DC198 002D90D8 40 82 00 1C */ bne lbl_802DC1B4 +/* 802DC19C 002D90DC 38 00 00 00 */ li r0, 0 +/* 802DC1A0 002D90E0 80 A4 00 0C */ lwz r5, 0xc(r4) +/* 802DC1A4 002D90E4 90 05 00 08 */ stw r0, 8(r5) +/* 802DC1A8 002D90E8 80 04 00 0C */ lwz r0, 0xc(r4) +/* 802DC1AC 002D90EC 90 03 00 00 */ stw r0, 0(r3) +/* 802DC1B0 002D90F0 48 00 00 40 */ b lbl_802DC1F0 +lbl_802DC1B4: +/* 802DC1B4 002D90F4 80 03 00 04 */ lwz r0, 4(r3) +/* 802DC1B8 002D90F8 7C 04 00 40 */ cmplw r4, r0 +/* 802DC1BC 002D90FC 40 82 00 1C */ bne lbl_802DC1D8 +/* 802DC1C0 002D9100 38 00 00 00 */ li r0, 0 +/* 802DC1C4 002D9104 80 A4 00 08 */ lwz r5, 8(r4) +/* 802DC1C8 002D9108 90 05 00 0C */ stw r0, 0xc(r5) +/* 802DC1CC 002D910C 80 04 00 08 */ lwz r0, 8(r4) +/* 802DC1D0 002D9110 90 03 00 04 */ stw r0, 4(r3) +/* 802DC1D4 002D9114 48 00 00 1C */ b lbl_802DC1F0 +lbl_802DC1D8: +/* 802DC1D8 002D9118 80 04 00 0C */ lwz r0, 0xc(r4) +/* 802DC1DC 002D911C 80 A4 00 08 */ lwz r5, 8(r4) +/* 802DC1E0 002D9120 90 05 00 0C */ stw r0, 0xc(r5) +/* 802DC1E4 002D9124 80 04 00 08 */ lwz r0, 8(r4) +/* 802DC1E8 002D9128 80 A4 00 0C */ lwz r5, 0xc(r4) +/* 802DC1EC 002D912C 90 05 00 08 */ stw r0, 8(r5) +lbl_802DC1F0: +/* 802DC1F0 002D9130 38 00 00 00 */ li r0, 0 +/* 802DC1F4 002D9134 90 04 00 04 */ stw r0, 4(r4) +/* 802DC1F8 002D9138 80 83 00 08 */ lwz r4, 8(r3) +/* 802DC1FC 002D913C 38 04 FF FF */ addi r0, r4, -1 +/* 802DC200 002D9140 90 03 00 08 */ stw r0, 8(r3) +lbl_802DC204: +/* 802DC204 002D9144 7C C3 33 78 */ mr r3, r6 +/* 802DC208 002D9148 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/JSupport/asm/func_802DC20C.s b/include/JSupport/asm/func_802DC20C.s new file mode 100644 index 0000000000..ffe7dd09c4 --- /dev/null +++ b/include/JSupport/asm/func_802DC20C.s @@ -0,0 +1,14 @@ +/* 802DC20C 002D914C 80 03 00 08 */ lwz r0, 8(r3) +/* 802DC210 002D9150 7C 04 00 40 */ cmplw r4, r0 +/* 802DC214 002D9154 41 80 00 0C */ blt lbl_802DC220 +/* 802DC218 002D9158 38 60 00 00 */ li r3, 0 +/* 802DC21C 002D915C 4E 80 00 20 */ blr +lbl_802DC220: +/* 802DC220 002D9160 80 63 00 00 */ lwz r3, 0(r3) +/* 802DC224 002D9164 7C 89 03 A6 */ mtctr r4 +/* 802DC228 002D9168 28 04 00 00 */ cmplwi r4, 0 +/* 802DC22C 002D916C 4C 81 00 20 */ blelr +lbl_802DC230: +/* 802DC230 002D9170 80 63 00 0C */ lwz r3, 0xc(r3) +/* 802DC234 002D9174 42 00 FF FC */ bdnz lbl_802DC230 +/* 802DC238 002D9178 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 812ab98243..03e1dc81d7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -90,4 +90,82 @@ extern "C" { void getTotalUsedSize__10JKRExpHeapCFv(void); void HeapCheck_NS_getUsedCount(void); void CheckHeap1__9HeapCheckFv(void); + + void JUTException_NS_panic_f(void); +} + +// OS +extern "C" { + void OSInitMutex(void); + void OSGetArenaLo(void); + void OSGetArenaHi(void); + void OSInitAlloc(void); + void OSSetArenaLo(void); + void OSSetArenaHi(void); + void OSEnableScheduler(void); + void OSDisableScheduler(void); +} + +// JSupport/JSUList.h +extern "C" { + void __ct__10JSUPtrLinkFPv(void); + void __dt__10JSUPtrLinkFv(void); + void __ct__10JSUPtrListFb(void); + void __dt__10JSUPtrListFv(void); + void initiate__10JSUPtrListFv(void); + void setFirst__10JSUPtrListFP10JSUPtrLink(void); + void append__10JSUPtrListFP10JSUPtrLink(void); + void prepend__10JSUPtrListFP10JSUPtrLink(void); + void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(void); + void remove__10JSUPtrListFP10JSUPtrLink(void); + void getNthLink__10JSUPtrListCFUl(void); +} + +// JKernel/JKRDisposer.h +extern "C" { + void __ct__11JKRDisposerFv(void); + void __dt__11JKRDisposerFv(void); +} + +// JKernel/JKRHeap.h +extern "C" { + void becomeCurrentHeap__7JKRHeapFv(void); + void becomeSystemHeap__7JKRHeapFv(void); + void destroy__7JKRHeapFv(void); + void alloc__7JKRHeapFUliP7JKRHeap(void); + void alloc__7JKRHeapFUli(void); + void free__7JKRHeapFPvP7JKRHeap(void); + void free__7JKRHeapFPv(void); + void callAllDisposer__7JKRHeapFv(void); + void freeAll__7JKRHeapFv(void); + void freeTail__7JKRHeapFv(void); + void resize__7JKRHeapFPvUlP7JKRHeap(void); + void resize__7JKRHeapFPvUl(void); + void getSize__7JKRHeapFPvP7JKRHeap(void); + void getSize__7JKRHeapFPv(void); + void getFreeSize__7JKRHeapFv(void); + void getMaxFreeBlock__7JKRHeapFv(void); + void getTotalFreeSize__7JKRHeapFv(void); + void changeGroupID__7JKRHeapFUc(void); + void getMaxAllocatableSize__7JKRHeapFi(void); + void findFromRoot__7JKRHeapFPv(void); + void find__7JKRHeapCFPv(void); + void findAllHeap__7JKRHeapCFPv(void); + void dispose_subroutine__7JKRHeapFUlUl(void); + void dispose__7JKRHeapFPvUl(void); + void dispose__7JKRHeapFPvPv(void); + void dispose__7JKRHeapFv(void); + void copyMemory__7JKRHeapFPvPvUl(void); + void JKRDefaultMemoryErrorRoutine__FPvUli(void); + void setErrorFlag__7JKRHeapFb(void); + void setErrorHandler__7JKRHeapFPFPvUli_v(void); + void isSubHeap__7JKRHeapCFP7JKRHeap(void); + void __nw__FUl(void); + void __nw__FUli(void); + void __nw__FUlP7JKRHeapi(void); + void __nwa__FUl(void); + void __nwa__FUli(void); + void __nwa__FUlP7JKRHeapi(void); + void __dl__FPv(void); + void __dla__FPv(void); } \ No newline at end of file diff --git a/include/variables.h b/include/variables.h index 0650eca48c..a32427e15d 100644 --- a/include/variables.h +++ b/include/variables.h @@ -15,4 +15,29 @@ extern u8 lbl_803A2EF4; //extern char lbl_803739a0[0x310]; #define _SDA_BASE_(dummy) 0 -#define _SDA2_BASE_(dummy) 0 \ No newline at end of file +#define _SDA2_BASE_(dummy) 0 + +// func_802CE138 +extern u32 lbl_803CBF70[24]; + +extern void* lbl_80451370; // JKRHeap::sSystemHeap +extern void* lbl_80451378; // JKRHeap::sRootHeap +extern void* lbl_80451374; // JKRHeap::sCurrentHeap +extern void* lbl_8045137C; // JKRHeap::mErrorHandler + +extern u8 lbl_804508B0[8]; // ::*fill* +extern u8 lbl_80451380[4]; // DAT_80451380 + +// func_802CE378 +extern void* lbl_80451384; // JKRHeap::mCodeStart +extern void* lbl_80451388; // JKRHeap::mCodeEnd +extern void* lbl_8045138C; // JKRHeap::mUserRamStart +extern void* lbl_80451390; // JKRHeap::mUserRamEnd +extern u32 lbl_80451394; // JKRHeap::mMemorySize + + +// func_802CEB40 +extern char lbl_8039CAD8[12]; // "JKRHeap.cpp" + +// func_802D147C +extern void* lbl_803CC0F0[4]; // JKRDisposer::__vt \ No newline at end of file diff --git a/libs/JKernel/JKRDisposer.cpp b/libs/JKernel/JKRDisposer.cpp new file mode 100644 index 0000000000..2bbe0c8433 --- /dev/null +++ b/libs/JKernel/JKRDisposer.cpp @@ -0,0 +1,27 @@ +#include "JKernel/JKRDisposer.h" +#include "global.h" +#include "JKernel/JKRHeap.h" + +// #include "JKernel/asm/func_802D147C.s" +JKRDisposer::JKRDisposer() : __vt(lbl_803CC0F0), ptr_link(this) { + this->heap = JKRHeap::findFromRoot(this); + if (this->heap != 0) { + this->heap->disposable_list.append(&this->ptr_link); + } +} + +// Almost. Missing three instructions, something +// to do with the destruction of JSUPtrLink +#ifdef NONMATCHING +JKRDisposer::~JKRDisposer() { + this->__vt = lbl_803CC0F0; + if (this->heap != NULL) { + this->heap->disposable_list.remove(&this->ptr_link); + } +} +#else +asm JKRDisposer::~JKRDisposer() { + nofralloc +#include "JKernel/asm/func_802D14E4.s" +} +#endif diff --git a/libs/JKernel/JKRHeap.cpp b/libs/JKernel/JKRHeap.cpp new file mode 100644 index 0000000000..21db4e3cb6 --- /dev/null +++ b/libs/JKernel/JKRHeap.cpp @@ -0,0 +1,217 @@ +#include "JKernel/JKRHeap.h" +#include "global.h" + +#ifdef NONMATCHING +JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_handler) { +} +#else +asm JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_handler) { + nofralloc +#include "JKernel/asm/func_802CE138.s" +} +#endif + +asm JKRHeap::~JKRHeap() { + nofralloc +#include "JKernel/asm/func_802CE264.s" +} + +asm bool JKRHeap::initArena(char**, u32*, int) { + nofralloc +#include "JKernel/asm/func_802CE378.s" +} + +asm void JKRHeap::becomeSystemHeap() { + nofralloc +#include "JKernel/asm/func_802CE428.s" +} + +asm void JKRHeap::becomeCurrentHeap() { + nofralloc +#include "JKernel/asm/func_802CE438.s" +} + +asm void JKRHeap::destroy() { + nofralloc +#include "JKernel/asm/func_802CE448.s" +} + +asm void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) { + nofralloc +#include "JKernel/asm/func_802CE474.s" +} + +asm void* JKRHeap::alloc(u32 size, int alignment) { + nofralloc +#include "JKernel/asm/func_802CE4D4.s" +} + +asm void JKRHeap::free(void* ptr, JKRHeap* heap) { + nofralloc +#include "JKernel/asm/func_802CE500.s" +} + +asm void JKRHeap::free(void* ptr) { + nofralloc +#include "JKernel/asm/func_802CE548.s" +} + +asm void JKRHeap::callAllDisposer() { + nofralloc +#include "JKernel/asm/func_802CE574.s" +} + +asm void JKRHeap::freeAll() { + nofralloc +#include "JKernel/asm/func_802CE5CC.s" +} + +asm void JKRHeap::freeTail() { + nofralloc +#include "JKernel/asm/func_802CE5F8.s" +} + +asm s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) { + nofralloc +#include "JKernel/asm/func_802CE624.s" +} + +asm s32 JKRHeap::resize(void* ptr, u32 size) { + nofralloc +#include "JKernel/asm/func_802CE684.s" +} + +asm s32 JKRHeap::getSize(void* ptr, JKRHeap* heap) { + nofralloc +#include "JKernel/asm/func_802CE6B0.s" +} + +asm s32 JKRHeap::getSize(void* ptr) { + nofralloc +#include "JKernel/asm/func_802CE700.s" +} + +asm u32 JKRHeap::getFreeSize() { + nofralloc +#include "JKernel/asm/func_802CE72C.s" +} + +asm u32 JKRHeap::getMaxFreeBlock() { + nofralloc +#include "JKernel/asm/func_802CE758.s" +} + +asm u32 JKRHeap::getTotalFreeSize() { + nofralloc +#include "JKernel/asm/func_802CE784.s" +} + +asm u8 JKRHeap::changeGroupID(u8 param_1) { + nofralloc +#include "JKernel/asm/func_802CE7B0.s" +} + +asm u32 JKRHeap::getMaxAllocatableSize(int alignment) { + nofralloc +#include "JKernel/asm/func_802CE7DC.s" +} + +asm JKRHeap* JKRHeap::findFromRoot(void* ptr) { + nofralloc +#include "JKernel/asm/func_802CE83C.s" +} + +asm JKRHeap* JKRHeap::find(void* ptr) const { + nofralloc +#include "JKernel/asm/func_802CE894.s" +} + +asm JKRHeap* JKRHeap::findAllHeap(void* ptr) const { + nofralloc +#include "JKernel/asm/func_802CE93C.s" +} + +asm void JKRHeap::dispose_subroutine(u32 begin, u32 end) { + nofralloc +#include "JKernel/asm/func_802CE9E4.s" +} + +asm void JKRHeap::dispose(void* ptr, u32 size) { + nofralloc +#include "JKernel/asm/func_802CEA78.s" +} + +asm void JKRHeap::dispose(void* begin, void* end) { + nofralloc +#include "JKernel/asm/func_802CEAA0.s" +} + +asm void JKRHeap::dispose() { + nofralloc +#include "JKernel/asm/func_802CEAC0.s" +} + +asm void JKRHeap::copyMemory(void* dst, void* src, u32 size) { + nofralloc +#include "JKernel/asm/func_802CEB18.s" +} + +asm void JKRHeap::JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment) { + nofralloc +#include "JKernel/asm/func_802CEB40.s" +} + +asm bool JKRHeap::setErrorFlag(bool param_1) { + nofralloc +#include "JKernel/asm/func_802CEB78.s" +} + +asm JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler param_1) { + nofralloc +#include "JKernel/asm/func_802CEB88.s" +} + +asm bool JKRHeap::isSubHeap(JKRHeap* heap) const { + nofralloc +#include "JKernel/asm/func_802CEBA8.s" +} + +asm void* operator new(u32 size) { + nofralloc +#include "JKernel/asm/func_802CEC4C.s" +} + +asm void* operator new(u32 size, int alignment) { + nofralloc +#include "JKernel/asm/func_802CEC74.s" +} + +asm void* operator new(u32 size, JKRHeap* heap, int alignment) { + nofralloc +#include "JKernel/asm/func_802CEC98.s" +} + +asm void* operator new[](u32 size) { + nofralloc +#include "JKernel/asm/func_802CECC4.s" +} + +asm void* operator new[](u32 size, int alignment) { + nofralloc +#include "JKernel/asm/func_802CECEC.s" +} + +asm void* operator new[](u32 size, JKRHeap* heap, int alignment) { + nofralloc +#include "JKernel/asm/func_802CED10.s" +} + +asm void operator delete(void* ptr) { + nofralloc +#include "JKernel/asm/func_802CED3C.s" +} + +asm void operator delete[](void* ptr) { + nofralloc +#include "JKernel/asm/func_802CED60.s" +} diff --git a/libs/JSupport/JSUList.cpp b/libs/JSupport/JSUList.cpp new file mode 100644 index 0000000000..d5edffb8c1 --- /dev/null +++ b/libs/JSupport/JSUList.cpp @@ -0,0 +1,174 @@ +#include "JSupport/JSUList.h" +#include "global.h" + +// #include "JSupport/asm/func_802DBDFC.s" +JSUPtrLink::JSUPtrLink(void* param_1) { + this->list = (JSUPtrList*)NULL; + this->unk0 = param_1; + this->prev = (JSUPtrLink*)NULL; + this->next = (JSUPtrLink*)NULL; +} + +// #include "JSupport/asm/func_802DBE14.s" +JSUPtrLink::~JSUPtrLink() { + if (this->list != NULL) { + this->list->remove(this); + } +} + +// +// +// + +// #include "JSupport/asm/func_802DBE74.s" +JSUPtrList::JSUPtrList(bool should_initiate) { + if (should_initiate != false) { + this->initiate(); + } +} + +// #include "JSupport/asm/func_802DBEAC.s" +JSUPtrList::~JSUPtrList() { + JSUPtrLink* node = this->head; + s32 removed = 0; + while (this->length > removed) { + node->list = (JSUPtrList*)NULL; + node = node->next; + removed += 1; + } +} + +// #include "JSupport/asm/func_802DBF14.s" +void JSUPtrList::initiate() { + this->head = (JSUPtrLink*)NULL; + this->tail = (JSUPtrLink*)NULL; + this->length = 0; +} + +// #include "JSupport/asm/func_802DBF28.s" +void JSUPtrList::setFirst(JSUPtrLink* first) { + first->list = this; + first->prev = (JSUPtrLink*)NULL; + first->next = (JSUPtrLink*)NULL; + this->tail = first; + this->head = first; + this->length = 1; +} + +// #include "JSupport/asm/func_802DBF4C.s" +bool JSUPtrList::append(JSUPtrLink* ptr) { + JSUPtrList* list = ptr->list; + bool result = ((JSUPtrList*)NULL == list); + if (!result) { + result = list->remove(ptr); + } + + if (result) { + if (this->length == 0) { + this->setFirst(ptr); + } else { + ptr->list = this; + ptr->prev = this->tail; + ptr->next = (JSUPtrLink*)NULL; + this->tail->next = ptr; + this->tail = ptr; + this->length++; + } + } + + return result; +} + +// #include "JSupport/asm/func_802DBFF0.s" +bool JSUPtrList::prepend(JSUPtrLink* ptr) { + JSUPtrList* list = ptr->list; + bool result = ((JSUPtrList*)NULL == list); + if (!result) { + result = list->remove(ptr); + } + + if (result) { + if (this->length == 0) { + this->setFirst(ptr); + } else { + ptr->list = this; + ptr->prev = (JSUPtrLink*)NULL; + ptr->next = this->head; + this->head->prev = ptr; + this->head = ptr; + this->length++; + } + } + + return result; +} + +// #include "JSupport/asm/func_802DC094.s" +bool JSUPtrList::insert(JSUPtrLink* before, JSUPtrLink* ptr) { + if (before == this->head) { + return this->prepend(ptr); + } else if (before == (JSUPtrLink*)NULL) { + return this->append(ptr); + } + + if (before->list != this) { + return false; + } + + bool result = ((JSUPtrList*)NULL == ptr->list); + if (!result) { + result = ptr->list->remove(ptr); + } + + if (result) { + JSUPtrLink* prev = before->prev; + ptr->list = this; + ptr->prev = prev; + ptr->next = before; + prev->next = ptr; + before->prev = ptr; + this->length++; + } + + return result; +} + +// #include "JSupport/asm/func_802DC15C.s" +bool JSUPtrList::remove(JSUPtrLink* ptr) { + bool is_parent = (ptr->list == this); + if (is_parent) { + if (this->length == 1) { + this->head = (JSUPtrLink*)NULL; + this->tail = (JSUPtrLink*)NULL; + } else if (ptr == this->head) { + ptr->next->prev = (JSUPtrLink*)NULL; + this->head = ptr->next; + } else if (ptr == this->tail) { + ptr->prev->next = (JSUPtrLink*)NULL; + this->tail = ptr->prev; + } else { + ptr->prev->next = ptr->next; + ptr->next->prev = ptr->prev; + } + + ptr->list = (JSUPtrList*)NULL; + this->length--; + } + + return is_parent; +} + +// #include "JSupport/asm/func_802DC20C.s" +JSUPtrLink* JSUPtrList::getNthLink(u32 index) const { + if (index >= this->length) { + return (JSUPtrLink*)NULL; + } + + JSUPtrLink* node = this->head; + for(u32 i = 0; i < index; i++) { + node = node->next; + } + + return node; +} + diff --git a/obj_files.mk b/obj_files.mk index 445817bf62..cc5b207346 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -421,10 +421,12 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/gf/GFLight.o \ $(BUILD_DIR)/asm/gf/GFPixel.o \ $(BUILD_DIR)/asm/gf/GFTev.o \ + $(BUILD_DIR)/libs/JKernel/JKRHeap.o \ $(BUILD_DIR)/asm/JKernel/JKRHeap.o \ $(BUILD_DIR)/asm/JKernel/JKRExpHeap.o \ $(BUILD_DIR)/asm/JKernel/JKRSolidHeap.o \ $(BUILD_DIR)/asm/JKernel/JKRAssertHeap.o \ + $(BUILD_DIR)/libs/JKernel/JKRDisposer.o \ $(BUILD_DIR)/asm/JKernel/JKRDisposer.o \ $(BUILD_DIR)/asm/JKernel/JKRThread.o \ $(BUILD_DIR)/asm/JKernel/JKRAram.o \ @@ -447,6 +449,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/JKernel/JKRDvdAramRipper.o \ $(BUILD_DIR)/asm/JKernel/JKRDecomp.o \ $(BUILD_DIR)/asm/JSupport/JSUList.o \ + $(BUILD_DIR)/libs/JSupport/JSUList.o \ $(BUILD_DIR)/asm/JSupport/JSUInputStream.o \ $(BUILD_DIR)/asm/JSupport/JSUMemoryStream.o \ $(BUILD_DIR)/asm/JSupport/JSUFileStream.o \