mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 22:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Added JSUList, JKRDisposer, and JKRHeap.

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

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

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

* moved files from src/ to libs/
This commit is contained in:
Jonathan Wase
2020-11-29 17:47:00 +01:00
committed by GitHub
parent 68a46e15cb
commit 635fbc34ec
385 changed files with 4633 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/J3DGraphLoader/J3DAnmLoader.s
+17 -17
View File
@@ -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)
asm/J3DGraphLoader/J3DClusterLoader.s
+9 -9
View File
@@ -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)
asm/J3DGraphLoader/J3DJointFactory.s
+1 -1
View File
@@ -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
asm/J3DGraphLoader/J3DMaterialFactory.s
+17 -17
View File
@@ -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)
asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s
+2 -2
View File
@@ -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)
asm/J3DGraphLoader/J3DModelLoader.s
+37 -37
View File
@@ -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)
asm/J3DGraphLoader/J3DShapeFactory.s
+11 -11
View File
@@ -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