diff options
| author | Jonathan Wase <jonathan@familjenwase.se> | 2020-11-29 17:47:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 11:47:00 -0500 |
| commit | 635fbc34ec907fbafce794d4683a2bd73f7c5773 (patch) | |
| tree | e164334ef004014f2ba75f20edbc51aac3b37a60 /asm/J2DGraph | |
| parent | 68a46e15cb3a50dc572db8645c333529144e8cf8 (diff) | |
Adds JSUList, JKRDisposer, and JKRHeap. (#4)
* Added JSUList, JKRDisposer, and JKRHeap.
JSUList: Decompiled JSUPtrLink and JSUPtrList with their respected
functions. The templated class JSUList is left.
JKRDisposer: Constructor matched but the destructor is close but
not yet a match.
JKRHeap: No functions matches yet. JKRHeap.cpp now includes
"operator delete" which makes it possible to forward compile
destructors.
* moved files from src/ to libs/
Diffstat (limited to 'asm/J2DGraph')
| -rw-r--r-- | asm/J2DGraph/J2DAnimation.s | 18 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DAnmLoader.s | 30 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DGrafContext.s | 2 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DMatBlock.s | 130 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DMaterial.s | 46 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DMaterialFactory.s | 2 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DPane.s | 32 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DPicture.s | 16 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DPictureEx.s | 2 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DPrint.s | 6 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DScreen.s | 52 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DTextBox.s | 22 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DTextBoxEx.s | 4 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DWindow.s | 16 | ||||
| -rw-r--r-- | asm/J2DGraph/J2DWindowEx.s | 2 |
15 files changed, 190 insertions, 190 deletions
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 |
