falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugDisplay and Debug_console attemp

This commit is contained in:
Pheenoh 2021-02-07 17:20:16 -05:00
parent c0f8f75b84
commit 4d1d865921
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
70 changed files with 547 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/J2DGraph/J2DGrafContext.s
View File

@ -340,7 +340,7 @@ lbl_802E8FB8:
lbl_802E8FD8:
/* 802E8FD8 002E5F18 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 802E8FDC 002E5F1C 41 82 00 98 */ beq lbl_802E9074
/* 802E8FE0 002E5F20 48 07 90 CD */ bl func_803620AC
/* 802E8FE0 002E5F20 48 07 90 CD */ bl __cvt_fp2unsigned
/* 802E8FE4 002E5F24 C8 22 C7 58 */ lfd f1, lbl_80456158-_SDA2_BASE_(r2)
/* 802E8FE8 002E5F28 90 61 00 0C */ stw r3, 0xc(r1)
/* 802E8FEC 002E5F2C 3C 00 43 30 */ lis r0, 0x4330
@ -348,7 +348,7 @@ lbl_802E8FD8:
/* 802E8FF4 002E5F34 C8 01 00 08 */ lfd f0, 8(r1)
/* 802E8FF8 002E5F38 EF 80 08 28 */ fsubs f28, f0, f1
/* 802E8FFC 002E5F3C FC 20 E8 90 */ fmr f1, f29
/* 802E9000 002E5F40 48 07 90 AD */ bl func_803620AC
/* 802E9000 002E5F40 48 07 90 AD */ bl __cvt_fp2unsigned
/* 802E9004 002E5F44 C8 22 C7 58 */ lfd f1, lbl_80456158-_SDA2_BASE_(r2)
/* 802E9008 002E5F48 90 61 00 14 */ stw r3, 0x14(r1)
/* 802E900C 002E5F4C 3C 00 43 30 */ lis r0, 0x4330
@ -362,16 +362,16 @@ lbl_802E8FD8:
/* 802E902C 002E5F6C 48 08 2E 91 */ bl func_8036BEBC
/* 802E9030 002E5F70 FC 00 08 18 */ frsp f0, f1
/* 802E9034 002E5F74 EC 20 E8 28 */ fsubs f1, f0, f29
/* 802E9038 002E5F78 48 07 90 75 */ bl func_803620AC
/* 802E9038 002E5F78 48 07 90 75 */ bl __cvt_fp2unsigned
/* 802E903C 002E5F7C 7C 7D 1B 78 */ mr r29, r3
/* 802E9040 002E5F80 EC 3F E0 28 */ fsubs f1, f31, f28
/* 802E9044 002E5F84 48 07 90 69 */ bl func_803620AC
/* 802E9044 002E5F84 48 07 90 69 */ bl __cvt_fp2unsigned
/* 802E9048 002E5F88 7C 7E 1B 78 */ mr r30, r3
/* 802E904C 002E5F8C FC 20 E8 90 */ fmr f1, f29
/* 802E9050 002E5F90 48 07 90 5D */ bl func_803620AC
/* 802E9050 002E5F90 48 07 90 5D */ bl __cvt_fp2unsigned
/* 802E9054 002E5F94 7C 7F 1B 78 */ mr r31, r3
/* 802E9058 002E5F98 FC 20 E0 90 */ fmr f1, f28
/* 802E905C 002E5F9C 48 07 90 51 */ bl func_803620AC
/* 802E905C 002E5F9C 48 07 90 51 */ bl __cvt_fp2unsigned
/* 802E9060 002E5FA0 7F E4 FB 78 */ mr r4, r31
/* 802E9064 002E5FA4 7F C5 F3 78 */ mr r5, r30
/* 802E9068 002E5FA8 7F A6 EB 78 */ mr r6, r29

6
asm/J3DGraphAnimator/J3DAnimation.s
View File

@ -1315,7 +1315,7 @@ lbl_80329680:
/* 803296AC 003265EC EC 00 08 28 */ fsubs f0, f0, f1
/* 803296B0 003265F0 EC 1F 00 32 */ fmuls f0, f31, f0
/* 803296B4 003265F4 EC 22 00 2A */ fadds f1, f2, f0
/* 803296B8 003265F8 48 03 89 F5 */ bl func_803620AC
/* 803296B8 003265F8 48 03 89 F5 */ bl __cvt_fp2unsigned
/* 803296BC 003265FC B0 7A 00 0C */ sth r3, 0xc(r26)
lbl_803296C0:
/* 803296C0 00326600 A0 7F 00 08 */ lhz r3, 8(r31)
@ -1418,7 +1418,7 @@ lbl_803297FC:
/* 80329828 00326768 EC 00 08 28 */ fsubs f0, f0, f1
/* 8032982C 0032676C EC 1F 00 32 */ fmuls f0, f31, f0
/* 80329830 00326770 EC 22 00 2A */ fadds f1, f2, f0
/* 80329834 00326774 48 03 88 79 */ bl func_803620AC
/* 80329834 00326774 48 03 88 79 */ bl __cvt_fp2unsigned
/* 80329838 00326778 B0 7A 00 0E */ sth r3, 0xe(r26)
lbl_8032983C:
/* 8032983C 0032677C A0 7E 00 08 */ lhz r3, 8(r30)
@ -1521,7 +1521,7 @@ lbl_80329978:
/* 803299A4 003268E4 EC 00 08 28 */ fsubs f0, f0, f1
/* 803299A8 003268E8 EC 1F 00 32 */ fmuls f0, f31, f0
/* 803299AC 003268EC EC 22 00 2A */ fadds f1, f2, f0
/* 803299B0 003268F0 48 03 86 FD */ bl func_803620AC
/* 803299B0 003268F0 48 03 86 FD */ bl __cvt_fp2unsigned
/* 803299B4 003268F4 B0 7A 00 10 */ sth r3, 0x10(r26)
lbl_803299B8:
/* 803299B8 003268F8 A0 7D 00 08 */ lhz r3, 8(r29)

4
asm/J3DGraphAnimator/J3DCluster.s
View File

@ -527,7 +527,7 @@ lbl_8032E920:
/* 8032E92C 0032B86C C0 22 CA 88 */ lfs f1, lbl_80456488-_SDA2_BASE_(r2)
/* 8032E930 0032B870 FC 00 10 50 */ fneg f0, f2
/* 8032E934 0032B874 EC 21 00 32 */ fmuls f1, f1, f0
/* 8032E938 0032B878 48 03 37 75 */ bl func_803620AC
/* 8032E938 0032B878 48 03 37 75 */ bl __cvt_fp2unsigned
/* 8032E93C 0032B87C 54 60 10 3A */ slwi r0, r3, 2
/* 8032E940 0032B880 3C 60 80 45 */ lis r3, lbl_8044AA40@ha
/* 8032E944 0032B884 38 63 AA 40 */ addi r3, r3, lbl_8044AA40@l
@ -538,7 +538,7 @@ lbl_8032E920:
lbl_8032E958:
/* 8032E958 0032B898 C0 02 CA 88 */ lfs f0, lbl_80456488-_SDA2_BASE_(r2)
/* 8032E95C 0032B89C EC 20 00 B2 */ fmuls f1, f0, f2
/* 8032E960 0032B8A0 48 03 37 4D */ bl func_803620AC
/* 8032E960 0032B8A0 48 03 37 4D */ bl __cvt_fp2unsigned
/* 8032E964 0032B8A4 54 60 10 3A */ slwi r0, r3, 2
/* 8032E968 0032B8A8 3C 60 80 45 */ lis r3, lbl_8044AA40@ha
/* 8032E96C 0032B8AC 38 63 AA 40 */ addi r3, r3, lbl_8044AA40@l

2
asm/J3DGraphBase/J3DDrawBuffer.s
View File

@ -313,7 +313,7 @@ lbl_8032528C:
/* 80325350 00322290 FC 00 10 40 */ fcmpo cr0, f0, f2
/* 80325354 00322294 40 81 00 10 */ ble lbl_80325364
/* 80325358 00322298 EC 22 08 24 */ fdivs f1, f2, f1
/* 8032535C 0032229C 48 03 CD 51 */ bl func_803620AC
/* 8032535C 0032229C 48 03 CD 51 */ bl __cvt_fp2unsigned
/* 80325360 003222A0 48 00 00 14 */ b lbl_80325374
lbl_80325364:
/* 80325364 003222A4 80 7E 00 04 */ lwz r3, 4(r30)

2
asm/J3DGraphBase/J3DGD.s
View File

@ -2582,7 +2582,7 @@ lbl_8030F6D4:
/* 8030F6FC 0030C63C D0 01 00 08 */ stfs f0, 8(r1)
/* 8030F700 0030C640 C0 02 C9 58 */ lfs f0, lbl_80456358-_SDA2_BASE_(r2)
/* 8030F704 0030C644 EC 20 00 F2 */ fmuls f1, f0, f3
/* 8030F708 0030C648 48 05 29 A5 */ bl func_803620AC
/* 8030F708 0030C648 48 05 29 A5 */ bl __cvt_fp2unsigned
/* 8030F70C 0030C64C 81 01 00 08 */ lwz r8, 8(r1)
/* 8030F710 0030C650 80 81 00 0C */ lwz r4, 0xc(r1)
/* 8030F714 0030C654 38 00 00 61 */ li r0, 0x61

2
asm/JAudio2/JASOscillator.s
View File

@ -330,7 +330,7 @@ JASOscillator_NS_updateCurrentValue:
/* 8029C2FC 0029923C EC 00 08 24 */ fdivs f0, f0, f1
/* 8029C300 00299240 EF E2 00 32 */ fmuls f31, f2, f0
/* 8029C304 00299244 FC 20 F8 90 */ fmr f1, f31
/* 8029C308 00299248 48 0C 5D A5 */ bl func_803620AC
/* 8029C308 00299248 48 0C 5D A5 */ bl __cvt_fp2unsigned
/* 8029C30C 0029924C C8 22 BD 18 */ lfd f1, lbl_80455718-_SDA2_BASE_(r2)
/* 8029C310 00299250 90 61 00 0C */ stw r3, 0xc(r1)
/* 8029C314 00299254 3C 00 43 30 */ lis r0, 0x4330

12
asm/JAudio2/JASSeqParser.s
View File

@ -276,7 +276,7 @@ lbl_80294088:
/* 802940CC 0029100C C0 22 BB D8 */ lfs f1, lbl_804555D8-_SDA2_BASE_(r2)
/* 802940D0 00291010 C0 04 02 18 */ lfs f0, 0x218(r4)
/* 802940D4 00291014 EC 21 00 32 */ fmuls f1, f1, f0
/* 802940D8 00291018 48 0C DF D5 */ bl func_803620AC
/* 802940D8 00291018 48 0C DF D5 */ bl __cvt_fp2unsigned
/* 802940DC 0029101C 48 00 00 9C */ b lbl_80294178
/* 802940E0 00291020 88 64 02 32 */ lbz r3, 0x232(r4)
/* 802940E4 00291024 88 04 02 31 */ lbz r0, 0x231(r4)
@ -291,27 +291,27 @@ lbl_80294088:
/* 80294108 00291048 C0 22 BB DC */ lfs f1, lbl_804555DC-_SDA2_BASE_(r2)
/* 8029410C 0029104C C0 04 01 E0 */ lfs f0, 0x1e0(r4)
/* 80294110 00291050 EC 21 00 32 */ fmuls f1, f1, f0
/* 80294114 00291054 48 0C DF 99 */ bl func_803620AC
/* 80294114 00291054 48 0C DF 99 */ bl __cvt_fp2unsigned
/* 80294118 00291058 48 00 00 60 */ b lbl_80294178
/* 8029411C 0029105C C0 22 BB E0 */ lfs f1, lbl_804555E0-_SDA2_BASE_(r2)
/* 80294120 00291060 C0 04 01 E0 */ lfs f0, 0x1e0(r4)
/* 80294124 00291064 EC 21 00 32 */ fmuls f1, f1, f0
/* 80294128 00291068 48 0C DF 85 */ bl func_803620AC
/* 80294128 00291068 48 0C DF 85 */ bl __cvt_fp2unsigned
/* 8029412C 0029106C 48 00 00 4C */ b lbl_80294178
/* 80294130 00291070 C0 22 BB F8 */ lfs f1, lbl_804555F8-_SDA2_BASE_(r2)
/* 80294134 00291074 C0 04 01 E8 */ lfs f0, 0x1e8(r4)
/* 80294138 00291078 EC 21 00 32 */ fmuls f1, f1, f0
/* 8029413C 0029107C 48 0C DF 71 */ bl func_803620AC
/* 8029413C 0029107C 48 0C DF 71 */ bl __cvt_fp2unsigned
/* 80294140 00291080 48 00 00 38 */ b lbl_80294178
/* 80294144 00291084 C0 22 BB FC */ lfs f1, lbl_804555FC-_SDA2_BASE_(r2)
/* 80294148 00291088 C0 04 01 E4 */ lfs f0, 0x1e4(r4)
/* 8029414C 0029108C EC 21 00 32 */ fmuls f1, f1, f0
/* 80294150 00291090 48 0C DF 5D */ bl func_803620AC
/* 80294150 00291090 48 0C DF 5D */ bl __cvt_fp2unsigned
/* 80294154 00291094 48 00 00 24 */ b lbl_80294178
/* 80294158 00291098 C0 22 BB FC */ lfs f1, lbl_804555FC-_SDA2_BASE_(r2)
/* 8029415C 0029109C C0 04 01 EC */ lfs f0, 0x1ec(r4)
/* 80294160 002910A0 EC 21 00 32 */ fmuls f1, f1, f0
/* 80294164 002910A4 48 0C DF 49 */ bl func_803620AC
/* 80294164 002910A4 48 0C DF 49 */ bl __cvt_fp2unsigned
/* 80294168 002910A8 48 00 00 10 */ b lbl_80294178
/* 8029416C 002910AC A0 64 01 F0 */ lhz r3, 0x1f0(r4)
/* 80294170 002910B0 48 00 00 08 */ b lbl_80294178

2
asm/JAudio2/JASTrack.s
View File

@ -1507,7 +1507,7 @@ lbl_80292670:
/* 802926BC 0028F5FC EF FF 00 32 */ fmuls f31, f31, f0
lbl_802926C0:
/* 802926C0 0028F600 FC 20 F8 90 */ fmr f1, f31
/* 802926C4 0028F604 48 0C F9 E9 */ bl func_803620AC
/* 802926C4 0028F604 48 0C F9 E9 */ bl __cvt_fp2unsigned
/* 802926C8 0028F608 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0
/* 802926CC 0028F60C CB E1 00 20 */ lfd f31, 0x20(r1)
/* 802926D0 0028F610 80 01 00 34 */ lwz r0, 0x34(r1)

4
asm/JStudio_JAudio2/object-sound.s
View File

@ -398,7 +398,7 @@ lbl_8028DC78:
/* 8028DCA4 0028ABE4 48 00 00 18 */ b lbl_8028DCBC
lbl_8028DCA8:
/* 8028DCA8 0028ABE8 C0 25 00 00 */ lfs f1, 0(r5)
/* 8028DCAC 0028ABEC 48 0D 44 01 */ bl func_803620AC
/* 8028DCAC 0028ABEC 48 0D 44 01 */ bl __cvt_fp2unsigned
/* 8028DCB0 0028ABF0 90 7F 01 28 */ stw r3, 0x128(r31)
/* 8028DCB4 0028ABF4 7F E3 FB 78 */ mr r3, r31
/* 8028DCB8 0028ABF8 48 00 02 ED */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_
@ -432,7 +432,7 @@ lbl_8028DCF0:
/* 8028DD1C 0028AC5C 48 00 00 18 */ b lbl_8028DD34
lbl_8028DD20:
/* 8028DD20 0028AC60 C0 25 00 00 */ lfs f1, 0(r5)
/* 8028DD24 0028AC64 48 0D 43 89 */ bl func_803620AC
/* 8028DD24 0028AC64 48 0D 43 89 */ bl __cvt_fp2unsigned
/* 8028DD28 0028AC68 7C 64 1B 78 */ mr r4, r3
/* 8028DD2C 0028AC6C 7F E3 FB 78 */ mr r3, r31
/* 8028DD30 0028AC70 48 00 03 25 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_

6
asm/JStudio_JParticle/object-particle.s
View File

@ -393,7 +393,7 @@ lbl_8028EAA0:
/* 8028EACC 0028BA0C 48 00 00 18 */ b lbl_8028EAE4
lbl_8028EAD0:
/* 8028EAD0 0028BA10 C0 25 00 00 */ lfs f1, 0(r5)
/* 8028EAD4 0028BA14 48 0D 35 D9 */ bl func_803620AC
/* 8028EAD4 0028BA14 48 0D 35 D9 */ bl __cvt_fp2unsigned
/* 8028EAD8 0028BA18 90 7F 01 C8 */ stw r3, 0x1c8(r31)
/* 8028EADC 0028BA1C 7F E3 FB 78 */ mr r3, r31
/* 8028EAE0 0028BA20 48 00 06 29 */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_
@ -424,7 +424,7 @@ lbl_8028EAE4:
/* 8028EB40 0028BA80 48 00 00 18 */ b lbl_8028EB58
lbl_8028EB44:
/* 8028EB44 0028BA84 C0 25 00 00 */ lfs f1, 0(r5)
/* 8028EB48 0028BA88 48 0D 35 65 */ bl func_803620AC
/* 8028EB48 0028BA88 48 0D 35 65 */ bl __cvt_fp2unsigned
/* 8028EB4C 0028BA8C 7C 64 1B 78 */ mr r4, r3
/* 8028EB50 0028BA90 7F E3 FB 78 */ mr r3, r31
/* 8028EB54 0028BA94 48 00 06 6D */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_endParticle_fadeOut_
@ -941,7 +941,7 @@ lbl_8028F278:
/* 8028F2B0 0028C1F0 C8 01 00 18 */ lfd f0, 0x18(r1)
/* 8028F2B4 0028C1F4 FC 00 10 28 */ fsub f0, f0, f2
/* 8028F2B8 0028C1F8 FC 21 00 24 */ fdiv f1, f1, f0
/* 8028F2BC 0028C1FC 48 0D 2D F1 */ bl func_803620AC
/* 8028F2BC 0028C1FC 48 0D 2D F1 */ bl __cvt_fp2unsigned
/* 8028F2C0 0028C200 90 7E 01 C0 */ stw r3, 0x1c0(r30)
/* 8028F2C4 0028C204 80 1E 01 C0 */ lwz r0, 0x1c0(r30)
/* 8028F2C8 0028C208 7C 1F 00 50 */ subf r0, r31, r0

4
asm/JUtility/JUTAssert.s
View File

@ -206,8 +206,8 @@ JUTAssertion_NS_setVisible:
/* 802E4C34 002E1B74 98 6D 83 78 */ stb r3, lbl_804508F8-_SDA_BASE_(r13)
/* 802E4C38 002E1B78 4E 80 00 20 */ blr
.global JUTAssertion_NS_setMessageCount
JUTAssertion_NS_setMessageCount:
.global setMessageCount__12JUTAssertionFi
setMessageCount__12JUTAssertionFi:
/* 802E4C3C 002E1B7C 7C 03 00 D0 */ neg r0, r3
/* 802E4C40 002E1B80 7C 60 03 38 */ orc r0, r3, r0
/* 802E4C44 002E1B84 7C 00 FE 70 */ srawi r0, r0, 0x1f

20
asm/JUtility/JUTConsole.s
View File

@ -31,7 +31,7 @@ lbl_802E73AC:
/* 802E73AC 002E42EC 38 1D 00 6C */ addi r0, r29, 0x6c
/* 802E73B0 002E42F0 90 1F 00 28 */ stw r0, 0x28(r31)
/* 802E73B4 002E42F4 7F E3 FB 78 */ mr r3, r31
/* 802E73B8 002E42F8 48 00 02 35 */ bl JUTConsole_NS_clear
/* 802E73B8 002E42F8 48 00 02 35 */ bl clear__10JUTConsoleFv
/* 802E73BC 002E42FC 7F C3 F3 78 */ mr r3, r30
/* 802E73C0 002E4300 7F E4 FB 78 */ mr r4, r31
/* 802E73C4 002E4304 48 00 0E 7D */ bl JUTConsoleManager_NS_appendConsole
@ -69,7 +69,7 @@ lbl_802E7434:
/* 802E7434 002E4374 38 1D 00 6C */ addi r0, r29, 0x6c
/* 802E7438 002E4378 90 1F 00 28 */ stw r0, 0x28(r31)
/* 802E743C 002E437C 7F E3 FB 78 */ mr r3, r31
/* 802E7440 002E4380 48 00 01 AD */ bl JUTConsole_NS_clear
/* 802E7440 002E4380 48 00 01 AD */ bl clear__10JUTConsoleFv
/* 802E7444 002E4384 7F C3 F3 78 */ mr r3, r30
/* 802E7448 002E4388 7F E4 FB 78 */ mr r4, r31
/* 802E744C 002E438C 48 00 0D F5 */ bl JUTConsoleManager_NS_appendConsole
@ -188,8 +188,8 @@ JUTConsole_NS_getLineFromObjectSize:
/* 802E75E4 002E4524 7C 63 03 96 */ divwu r3, r3, r0
/* 802E75E8 002E4528 4E 80 00 20 */ blr
.global JUTConsole_NS_clear
JUTConsole_NS_clear:
.global clear__10JUTConsoleFv
clear__10JUTConsoleFv:
/* 802E75EC 002E452C 38 C0 00 00 */ li r6, 0
/* 802E75F0 002E4530 90 C3 00 30 */ stw r6, 0x30(r3)
/* 802E75F4 002E4534 90 C3 00 34 */ stw r6, 0x34(r3)
@ -851,8 +851,8 @@ JUTConsole_print_f_va_:
/* 802E7F74 002E4EB4 38 21 04 10 */ addi r1, r1, 0x410
/* 802E7F78 002E4EB8 4E 80 00 20 */ blr
.global JUTConsole_NS_dumpToTerminal
JUTConsole_NS_dumpToTerminal:
.global dumpToTerminal__10JUTConsoleFUi
dumpToTerminal__10JUTConsoleFUi:
/* 802E7F7C 002E4EBC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E7F80 002E4EC0 7C 08 02 A6 */ mflr r0
/* 802E7F84 002E4EC4 90 01 00 24 */ stw r0, 0x24(r1)
@ -936,8 +936,8 @@ lbl_802E8090:
/* 802E80A0 002E4FE0 38 21 00 20 */ addi r1, r1, 0x20
/* 802E80A4 002E4FE4 4E 80 00 20 */ blr
.global JUTConsole_NS_scroll
JUTConsole_NS_scroll:
.global scroll__10JUTConsoleFi
scroll__10JUTConsoleFi:
/* 802E80A8 002E4FE8 2C 04 00 00 */ cmpwi r4, 0
/* 802E80AC 002E4FEC 40 80 00 34 */ bge lbl_802E80E0
/* 802E80B0 002E4FF0 80 A3 00 34 */ lwz r5, 0x34(r3)
@ -1017,8 +1017,8 @@ lbl_802E819C:
/* 802E81A0 002E50E0 7C 64 02 14 */ add r3, r4, r0
/* 802E81A4 002E50E4 4E 80 00 20 */ blr
.global JUTConsole_NS_getLineOffset
JUTConsole_NS_getLineOffset:
.global getLineOffset__10JUTConsoleCFv
getLineOffset__10JUTConsoleCFv:
/* 802E81A8 002E50E8 80 83 00 34 */ lwz r4, 0x34(r3)
/* 802E81AC 002E50EC 80 03 00 30 */ lwz r0, 0x30(r3)
/* 802E81B0 002E50F0 7C 84 00 51 */ subf. r4, r4, r0

4
asm/JUtility/JUTDbPrint.s
View File

@ -344,8 +344,8 @@ lbl_802E05E8:
/* 802E05F8 002DD538 38 21 01 80 */ addi r1, r1, 0x180
/* 802E05FC 002DD53C 4E 80 00 20 */ blr
.global JUTReport_X1_
JUTReport_X1_:
.global JUTReport__FiiiPCce
JUTReport__FiiiPCce:
/* 802E0600 002DD540 94 21 FE 70 */ stwu r1, -0x190(r1)
/* 802E0604 002DD544 7C 08 02 A6 */ mflr r0
/* 802E0608 002DD548 90 01 01 94 */ stw r0, 0x194(r1)

16
asm/JUtility/JUTException.s
View File

@ -1899,7 +1899,7 @@ lbl_802E3774:
/* 802E3790 002E06D0 40 82 00 14 */ bne lbl_802E37A4
/* 802E3794 002E06D4 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13)
/* 802E3798 002E06D8 80 83 00 24 */ lwz r4, 0x24(r3)
/* 802E379C 002E06DC 48 00 49 0D */ bl JUTConsole_NS_scroll
/* 802E379C 002E06DC 48 00 49 0D */ bl scroll__10JUTConsoleFi
/* 802E37A0 002E06E0 38 60 00 01 */ li r3, 1
lbl_802E37A4:
/* 802E37A4 002E06E4 80 01 00 08 */ lwz r0, 8(r1)
@ -1908,7 +1908,7 @@ lbl_802E37A4:
/* 802E37B0 002E06F0 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13)
/* 802E37B4 002E06F4 80 03 00 24 */ lwz r0, 0x24(r3)
/* 802E37B8 002E06F8 7C 80 00 D0 */ neg r4, r0
/* 802E37BC 002E06FC 48 00 48 ED */ bl JUTConsole_NS_scroll
/* 802E37BC 002E06FC 48 00 48 ED */ bl scroll__10JUTConsoleFi
/* 802E37C0 002E0700 38 60 00 01 */ li r3, 1
lbl_802E37C4:
/* 802E37C4 002E0704 80 01 00 0C */ lwz r0, 0xc(r1)
@ -1930,7 +1930,7 @@ lbl_802E37F4:
/* 802E37FC 002E073C 40 80 00 08 */ bge lbl_802E3804
/* 802E3800 002E0740 38 80 FF FC */ li r4, -4
lbl_802E3804:
/* 802E3804 002E0744 48 00 48 A5 */ bl JUTConsole_NS_scroll
/* 802E3804 002E0744 48 00 48 A5 */ bl scroll__10JUTConsoleFi
/* 802E3808 002E0748 38 60 00 01 */ li r3, 1
/* 802E380C 002E074C 3A E0 00 00 */ li r23, 0
/* 802E3810 002E0750 3A D6 00 01 */ addi r22, r22, 1
@ -1954,7 +1954,7 @@ lbl_802E3844:
/* 802E384C 002E078C 40 80 00 08 */ bge lbl_802E3854
/* 802E3850 002E0790 38 80 00 04 */ li r4, 4
lbl_802E3854:
/* 802E3854 002E0794 48 00 48 55 */ bl JUTConsole_NS_scroll
/* 802E3854 002E0794 48 00 48 55 */ bl scroll__10JUTConsoleFi
/* 802E3858 002E0798 38 60 00 01 */ li r3, 1
/* 802E385C 002E079C 3A C0 00 00 */ li r22, 0
/* 802E3860 002E07A0 3A F7 00 01 */ addi r23, r23, 1
@ -1983,7 +1983,7 @@ lbl_802E38A8:
/* 802E38A8 002E07E8 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13)
/* 802E38AC 002E07EC 80 03 00 24 */ lwz r0, 0x24(r3)
/* 802E38B0 002E07F0 7C 80 00 D0 */ neg r4, r0
/* 802E38B4 002E07F4 48 00 47 F5 */ bl JUTConsole_NS_scroll
/* 802E38B4 002E07F4 48 00 47 F5 */ bl scroll__10JUTConsoleFi
/* 802E38B8 002E07F8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 802E38BC 002E07FC 38 80 00 01 */ li r4, 1
/* 802E38C0 002E0800 48 00 4B 91 */ bl JUTConsoleManager_NS_drawDirect
@ -1996,14 +1996,14 @@ lbl_802E38CC:
lbl_802E38D8:
/* 802E38D8 002E0818 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13)
/* 802E38DC 002E081C 38 80 00 01 */ li r4, 1
/* 802E38E0 002E0820 48 00 47 C9 */ bl JUTConsole_NS_scroll
/* 802E38E0 002E0820 48 00 47 C9 */ bl scroll__10JUTConsoleFi
/* 802E38E4 002E0824 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 802E38E8 002E0828 38 80 00 01 */ li r4, 1
/* 802E38EC 002E082C 48 00 4B 65 */ bl JUTConsoleManager_NS_drawDirect
/* 802E38F0 002E0830 83 0D 8F 9C */ lwz r24, lbl_8045151C-_SDA_BASE_(r13)
/* 802E38F4 002E0834 82 F8 00 48 */ lwz r23, 0x48(r24)
/* 802E38F8 002E0838 7F 03 C3 78 */ mr r3, r24
/* 802E38FC 002E083C 48 00 48 AD */ bl JUTConsole_NS_getLineOffset
/* 802E38FC 002E083C 48 00 48 AD */ bl getLineOffset__10JUTConsoleCFv
/* 802E3900 002E0840 7C 79 1B 78 */ mr r25, r3
/* 802E3904 002E0844 7F 03 C3 78 */ mr r3, r24
/* 802E3908 002E0848 48 00 48 7D */ bl JUTConsole_NS_getUsedLine
@ -2023,7 +2023,7 @@ lbl_802E3930:
/* 802E3938 002E0878 83 0D 8F 9C */ lwz r24, lbl_8045151C-_SDA_BASE_(r13)
/* 802E393C 002E087C 82 F8 00 48 */ lwz r23, 0x48(r24)
/* 802E3940 002E0880 7F 03 C3 78 */ mr r3, r24
/* 802E3944 002E0884 48 00 48 65 */ bl JUTConsole_NS_getLineOffset
/* 802E3944 002E0884 48 00 48 65 */ bl getLineOffset__10JUTConsoleCFv
/* 802E3948 002E0888 7C 79 1B 78 */ mr r25, r3
/* 802E394C 002E088C 7F 03 C3 78 */ mr r3, r24
/* 802E3950 002E0890 48 00 48 35 */ bl JUTConsole_NS_getUsedLine

4
asm/clib.s
View File

@ -417,8 +417,8 @@ lbl_803620A4:
/* 803620A4 0035EFE4 7D 89 03 A6 */ mtctr r12
/* 803620A8 0035EFE8 4E 80 04 20 */ bctr
.global func_803620AC
func_803620AC:
.global __cvt_fp2unsigned
__cvt_fp2unsigned:
/* 803620AC 0035EFEC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803620B0 0035EFF0 3C 80 80 3A */ lis r4, lbl_803A2190@h
/* 803620B4 0035EFF4 60 84 21 90 */ ori r4, r4, lbl_803A2190@l

2
asm/d/a/obj/d_a_obj_item.s
View File

@ -3022,7 +3022,7 @@ daItem_c_NS_set_bound_se:
/* 8015D860 0015A7A0 FC 20 00 18 */ frsp f1, f0
/* 8015D864 0015A7A4 C0 02 9B 9C */ lfs f0, lbl_8045359C-_SDA2_BASE_(r2)
/* 8015D868 0015A7A8 EC 20 00 72 */ fmuls f1, f0, f1
/* 8015D86C 0015A7AC 48 20 48 41 */ bl func_803620AC
/* 8015D86C 0015A7AC 48 20 48 41 */ bl __cvt_fp2unsigned
/* 8015D870 0015A7B0 7C 7F 1B 78 */ mr r31, r3
/* 8015D874 0015A7B4 28 1F 00 64 */ cmplwi r31, 0x64
/* 8015D878 0015A7B8 40 81 00 08 */ ble lbl_8015D880

84
asm/d/bg/w/d_bg_w_kcol.s
View File

@ -668,13 +668,13 @@ lbl_8007F030:
/* 8007F06C 0007BFAC C0 01 00 70 */ lfs f0, 0x70(r1)
/* 8007F070 0007BFB0 EC 00 F0 2A */ fadds f0, f0, f30
/* 8007F074 0007BFB4 D0 01 00 70 */ stfs f0, 0x70(r1)
/* 8007F078 0007BFB8 48 2E 30 35 */ bl func_803620AC
/* 8007F078 0007BFB8 48 2E 30 35 */ bl __cvt_fp2unsigned
/* 8007F07C 0007BFBC 7C 6E 1B 79 */ or. r14, r3, r3
/* 8007F080 0007BFC0 40 80 00 08 */ bge lbl_8007F088
/* 8007F084 0007BFC4 39 C0 00 00 */ li r14, 0
lbl_8007F088:
/* 8007F088 0007BFC8 C0 21 00 68 */ lfs f1, 0x68(r1)
/* 8007F08C 0007BFCC 48 2E 30 21 */ bl func_803620AC
/* 8007F08C 0007BFCC 48 2E 30 21 */ bl __cvt_fp2unsigned
/* 8007F090 0007BFD0 7C 7C 1B 78 */ mr r28, r3
/* 8007F094 0007BFD4 82 4F 00 18 */ lwz r18, 0x18(r15)
/* 8007F098 0007BFD8 80 12 00 20 */ lwz r0, 0x20(r18)
@ -686,13 +686,13 @@ lbl_8007F0AC:
/* 8007F0AC 0007BFEC 7C 0E E0 00 */ cmpw r14, r28
/* 8007F0B0 0007BFF0 40 80 05 14 */ bge lbl_8007F5C4
/* 8007F0B4 0007BFF4 C0 21 00 78 */ lfs f1, 0x78(r1)
/* 8007F0B8 0007BFF8 48 2E 2F F5 */ bl func_803620AC
/* 8007F0B8 0007BFF8 48 2E 2F F5 */ bl __cvt_fp2unsigned
/* 8007F0BC 0007BFFC 7C 7D 1B 79 */ or. r29, r3, r3
/* 8007F0C0 0007C000 40 80 00 08 */ bge lbl_8007F0C8
/* 8007F0C4 0007C004 3B A0 00 00 */ li r29, 0
lbl_8007F0C8:
/* 8007F0C8 0007C008 C0 21 00 6C */ lfs f1, 0x6c(r1)
/* 8007F0CC 0007C00C 48 2E 2F E1 */ bl func_803620AC
/* 8007F0CC 0007C00C 48 2E 2F E1 */ bl __cvt_fp2unsigned
/* 8007F0D0 0007C010 7C 7B 1B 78 */ mr r27, r3
/* 8007F0D4 0007C014 80 12 00 24 */ lwz r0, 0x24(r18)
/* 8007F0D8 0007C018 7C 00 00 F8 */ nor r0, r0, r0
@ -703,13 +703,13 @@ lbl_8007F0E8:
/* 8007F0E8 0007C028 7C 1D D8 00 */ cmpw r29, r27
/* 8007F0EC 0007C02C 40 80 04 D8 */ bge lbl_8007F5C4
/* 8007F0F0 0007C030 C0 21 00 7C */ lfs f1, 0x7c(r1)
/* 8007F0F4 0007C034 48 2E 2F B9 */ bl func_803620AC
/* 8007F0F4 0007C034 48 2E 2F B9 */ bl __cvt_fp2unsigned
/* 8007F0F8 0007C038 7C 71 1B 79 */ or. r17, r3, r3
/* 8007F0FC 0007C03C 40 80 00 08 */ bge lbl_8007F104
/* 8007F100 0007C040 3A 20 00 00 */ li r17, 0
lbl_8007F104:
/* 8007F104 0007C044 C0 21 00 70 */ lfs f1, 0x70(r1)
/* 8007F108 0007C048 48 2E 2F A5 */ bl func_803620AC
/* 8007F108 0007C048 48 2E 2F A5 */ bl __cvt_fp2unsigned
/* 8007F10C 0007C04C 7C 7A 1B 78 */ mr r26, r3
/* 8007F110 0007C050 80 12 00 28 */ lwz r0, 0x28(r18)
/* 8007F114 0007C054 7C 00 00 F8 */ nor r0, r0, r0
@ -1078,7 +1078,7 @@ lbl_8007F5D8:
/* 8007F664 0007C5A4 38 A1 00 20 */ addi r5, r1, 0x20
/* 8007F668 0007C5A8 48 2C 7A 4D */ bl PSVECSubtract
/* 8007F66C 0007C5AC C0 21 00 20 */ lfs f1, 0x20(r1)
/* 8007F670 0007C5B0 48 2E 2A 3D */ bl func_803620AC
/* 8007F670 0007C5B0 48 2E 2A 3D */ bl __cvt_fp2unsigned
/* 8007F674 0007C5B4 7C 7C 1B 79 */ or. r28, r3, r3
/* 8007F678 0007C5B8 40 80 00 0C */ bge lbl_8007F684
/* 8007F67C 0007C5BC 38 60 00 00 */ li r3, 0
@ -1093,7 +1093,7 @@ lbl_8007F684:
/* 8007F69C 0007C5DC 48 00 02 E0 */ b lbl_8007F97C
lbl_8007F6A0:
/* 8007F6A0 0007C5E0 C0 21 00 28 */ lfs f1, 0x28(r1)
/* 8007F6A4 0007C5E4 48 2E 2A 09 */ bl func_803620AC
/* 8007F6A4 0007C5E4 48 2E 2A 09 */ bl __cvt_fp2unsigned
/* 8007F6A8 0007C5E8 7C 7D 1B 79 */ or. r29, r3, r3
/* 8007F6AC 0007C5EC 40 80 00 0C */ bge lbl_8007F6B8
/* 8007F6B0 0007C5F0 38 60 00 00 */ li r3, 0
@ -1107,7 +1107,7 @@ lbl_8007F6B8:
/* 8007F6CC 0007C60C 48 00 02 B0 */ b lbl_8007F97C
lbl_8007F6D0:
/* 8007F6D0 0007C610 C0 21 00 24 */ lfs f1, 0x24(r1)
/* 8007F6D4 0007C614 48 2E 29 D9 */ bl func_803620AC
/* 8007F6D4 0007C614 48 2E 29 D9 */ bl __cvt_fp2unsigned
/* 8007F6D8 0007C618 7C 79 1B 79 */ or. r25, r3, r3
/* 8007F6DC 0007C61C 40 80 00 0C */ bge lbl_8007F6E8
/* 8007F6E0 0007C620 38 60 00 00 */ li r3, 0
@ -1271,7 +1271,7 @@ lbl_8007F7DC:
/* 8007F93C 0007C87C 80 7E 00 18 */ lwz r3, 0x18(r30)
/* 8007F940 0007C880 C0 03 00 18 */ lfs f0, 0x18(r3)
/* 8007F944 0007C884 EC 3E 00 28 */ fsubs f1, f30, f0
/* 8007F948 0007C888 48 2E 27 65 */ bl func_803620AC
/* 8007F948 0007C888 48 2E 27 65 */ bl __cvt_fp2unsigned
/* 8007F94C 0007C88C 7C 77 1B 78 */ mr r23, r3
lbl_8007F950:
/* 8007F950 0007C890 A4 15 00 02 */ lhzu r0, 2(r21)
@ -1334,13 +1334,13 @@ lbl_8007F97C:
/* 8007FA30 0007C970 C0 01 00 2C */ lfs f0, 0x2c(r1)
/* 8007FA34 0007C974 EC 00 10 2A */ fadds f0, f0, f2
/* 8007FA38 0007C978 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 8007FA3C 0007C97C 48 2E 26 71 */ bl func_803620AC
/* 8007FA3C 0007C97C 48 2E 26 71 */ bl __cvt_fp2unsigned
/* 8007FA40 0007C980 7C 7E 1B 79 */ or. r30, r3, r3
/* 8007FA44 0007C984 40 80 00 08 */ bge lbl_8007FA4C
/* 8007FA48 0007C988 3B C0 00 00 */ li r30, 0
lbl_8007FA4C:
/* 8007FA4C 0007C98C C0 21 00 24 */ lfs f1, 0x24(r1)
/* 8007FA50 0007C990 48 2E 26 5D */ bl func_803620AC
/* 8007FA50 0007C990 48 2E 26 5D */ bl __cvt_fp2unsigned
/* 8007FA54 0007C994 7C 7D 1B 78 */ mr r29, r3
/* 8007FA58 0007C998 82 0F 00 18 */ lwz r16, 0x18(r15)
/* 8007FA5C 0007C99C 80 10 00 20 */ lwz r0, 0x20(r16)
@ -1352,13 +1352,13 @@ lbl_8007FA70:
/* 8007FA70 0007C9B0 7C 1E E8 00 */ cmpw r30, r29
/* 8007FA74 0007C9B4 40 80 04 74 */ bge lbl_8007FEE8
/* 8007FA78 0007C9B8 C0 21 00 34 */ lfs f1, 0x34(r1)
/* 8007FA7C 0007C9BC 48 2E 26 31 */ bl func_803620AC
/* 8007FA7C 0007C9BC 48 2E 26 31 */ bl __cvt_fp2unsigned
/* 8007FA80 0007C9C0 7C 7C 1B 79 */ or. r28, r3, r3
/* 8007FA84 0007C9C4 40 80 00 08 */ bge lbl_8007FA8C
/* 8007FA88 0007C9C8 3B 80 00 00 */ li r28, 0
lbl_8007FA8C:
/* 8007FA8C 0007C9CC C0 21 00 28 */ lfs f1, 0x28(r1)
/* 8007FA90 0007C9D0 48 2E 26 1D */ bl func_803620AC
/* 8007FA90 0007C9D0 48 2E 26 1D */ bl __cvt_fp2unsigned
/* 8007FA94 0007C9D4 7C 7B 1B 78 */ mr r27, r3
/* 8007FA98 0007C9D8 80 10 00 24 */ lwz r0, 0x24(r16)
/* 8007FA9C 0007C9DC 7C 00 00 F8 */ nor r0, r0, r0
@ -1369,13 +1369,13 @@ lbl_8007FAAC:
/* 8007FAAC 0007C9EC 7C 1C D8 00 */ cmpw r28, r27
/* 8007FAB0 0007C9F0 40 80 04 38 */ bge lbl_8007FEE8
/* 8007FAB4 0007C9F4 C0 21 00 38 */ lfs f1, 0x38(r1)
/* 8007FAB8 0007C9F8 48 2E 25 F5 */ bl func_803620AC
/* 8007FAB8 0007C9F8 48 2E 25 F5 */ bl __cvt_fp2unsigned
/* 8007FABC 0007C9FC 7C 6E 1B 79 */ or. r14, r3, r3
/* 8007FAC0 0007CA00 40 80 00 08 */ bge lbl_8007FAC8
/* 8007FAC4 0007CA04 39 C0 00 00 */ li r14, 0
lbl_8007FAC8:
/* 8007FAC8 0007CA08 C0 21 00 2C */ lfs f1, 0x2c(r1)
/* 8007FACC 0007CA0C 48 2E 25 E1 */ bl func_803620AC
/* 8007FACC 0007CA0C 48 2E 25 E1 */ bl __cvt_fp2unsigned
/* 8007FAD0 0007CA10 7C 7A 1B 78 */ mr r26, r3
/* 8007FAD4 0007CA14 80 10 00 28 */ lwz r0, 0x28(r16)
/* 8007FAD8 0007CA18 7C 00 00 F8 */ nor r0, r0, r0
@ -1709,14 +1709,14 @@ lbl_8007FF14:
/* 8007FFA4 0007CEE4 81 C3 00 18 */ lwz r14, 0x18(r3)
/* 8007FFA8 0007CEE8 C3 EE 00 14 */ lfs f31, 0x14(r14)
/* 8007FFAC 0007CEEC EC 21 F8 28 */ fsubs f1, f1, f31
/* 8007FFB0 0007CEF0 48 2E 20 FD */ bl func_803620AC
/* 8007FFB0 0007CEF0 48 2E 20 FD */ bl __cvt_fp2unsigned
/* 8007FFB4 0007CEF4 7C 7E 1B 79 */ or. r30, r3, r3
/* 8007FFB8 0007CEF8 40 80 00 08 */ bge lbl_8007FFC0
/* 8007FFBC 0007CEFC 3B C0 00 00 */ li r30, 0
lbl_8007FFC0:
/* 8007FFC0 0007CF00 C0 01 00 38 */ lfs f0, 0x38(r1)
/* 8007FFC4 0007CF04 EC 20 F8 28 */ fsubs f1, f0, f31
/* 8007FFC8 0007CF08 48 2E 20 E5 */ bl func_803620AC
/* 8007FFC8 0007CF08 48 2E 20 E5 */ bl __cvt_fp2unsigned
/* 8007FFCC 0007CF0C 7C 7D 1B 78 */ mr r29, r3
/* 8007FFD0 0007CF10 80 0E 00 20 */ lwz r0, 0x20(r14)
/* 8007FFD4 0007CF14 7C 00 00 F8 */ nor r0, r0, r0
@ -1729,14 +1729,14 @@ lbl_8007FFE4:
/* 8007FFEC 0007CF2C C0 01 00 48 */ lfs f0, 0x48(r1)
/* 8007FFF0 0007CF30 C3 EE 00 18 */ lfs f31, 0x18(r14)
/* 8007FFF4 0007CF34 EC 20 F8 28 */ fsubs f1, f0, f31
/* 8007FFF8 0007CF38 48 2E 20 B5 */ bl func_803620AC
/* 8007FFF8 0007CF38 48 2E 20 B5 */ bl __cvt_fp2unsigned
/* 8007FFFC 0007CF3C 7C 7C 1B 79 */ or. r28, r3, r3
/* 80080000 0007CF40 40 80 00 08 */ bge lbl_80080008
/* 80080004 0007CF44 3B 80 00 00 */ li r28, 0
lbl_80080008:
/* 80080008 0007CF48 C0 01 00 3C */ lfs f0, 0x3c(r1)
/* 8008000C 0007CF4C EC 20 F8 28 */ fsubs f1, f0, f31
/* 80080010 0007CF50 48 2E 20 9D */ bl func_803620AC
/* 80080010 0007CF50 48 2E 20 9D */ bl __cvt_fp2unsigned
/* 80080014 0007CF54 7C 7B 1B 78 */ mr r27, r3
/* 80080018 0007CF58 80 0E 00 24 */ lwz r0, 0x24(r14)
/* 8008001C 0007CF5C 7C 00 00 F8 */ nor r0, r0, r0
@ -1749,14 +1749,14 @@ lbl_8008002C:
/* 80080034 0007CF74 C0 01 00 4C */ lfs f0, 0x4c(r1)
/* 80080038 0007CF78 C3 EE 00 1C */ lfs f31, 0x1c(r14)
/* 8008003C 0007CF7C EC 20 F8 28 */ fsubs f1, f0, f31
/* 80080040 0007CF80 48 2E 20 6D */ bl func_803620AC
/* 80080040 0007CF80 48 2E 20 6D */ bl __cvt_fp2unsigned
/* 80080044 0007CF84 7C 71 1B 79 */ or. r17, r3, r3
/* 80080048 0007CF88 40 80 00 08 */ bge lbl_80080050
/* 8008004C 0007CF8C 3A 20 00 00 */ li r17, 0
lbl_80080050:
/* 80080050 0007CF90 C0 01 00 40 */ lfs f0, 0x40(r1)
/* 80080054 0007CF94 EC 20 F8 28 */ fsubs f1, f0, f31
/* 80080058 0007CF98 48 2E 20 55 */ bl func_803620AC
/* 80080058 0007CF98 48 2E 20 55 */ bl __cvt_fp2unsigned
/* 8008005C 0007CF9C 7C 7A 1B 78 */ mr r26, r3
/* 80080060 0007CFA0 80 0E 00 28 */ lwz r0, 0x28(r14)
/* 80080064 0007CFA4 7C 00 00 F8 */ nor r0, r0, r0
@ -2012,7 +2012,7 @@ lbl_80080310:
/* 80080418 0007D358 7C 65 1B 78 */ mr r5, r3
/* 8008041C 0007D35C 48 2C 6C 99 */ bl PSVECSubtract
/* 80080420 0007D360 C0 21 00 88 */ lfs f1, 0x88(r1)
/* 80080424 0007D364 48 2E 1C 89 */ bl func_803620AC
/* 80080424 0007D364 48 2E 1C 89 */ bl __cvt_fp2unsigned
/* 80080428 0007D368 90 61 00 C8 */ stw r3, 0xc8(r1)
/* 8008042C 0007D36C 7C 60 1B 79 */ or. r0, r3, r3
/* 80080430 0007D370 40 80 00 0C */ bge lbl_8008043C
@ -2020,7 +2020,7 @@ lbl_80080310:
/* 80080438 0007D378 90 01 00 C8 */ stw r0, 0xc8(r1)
lbl_8008043C:
/* 8008043C 0007D37C C0 21 00 7C */ lfs f1, 0x7c(r1)
/* 80080440 0007D380 48 2E 1C 6D */ bl func_803620AC
/* 80080440 0007D380 48 2E 1C 6D */ bl __cvt_fp2unsigned
/* 80080444 0007D384 7C 6E 1B 78 */ mr r14, r3
/* 80080448 0007D388 82 1E 00 18 */ lwz r16, 0x18(r30)
/* 8008044C 0007D38C 80 10 00 20 */ lwz r0, 0x20(r16)
@ -2036,13 +2036,13 @@ lbl_80080460:
/* 80080470 0007D3B0 48 00 0C D0 */ b lbl_80081140
lbl_80080474:
/* 80080474 0007D3B4 C0 21 00 8C */ lfs f1, 0x8c(r1)
/* 80080478 0007D3B8 48 2E 1C 35 */ bl func_803620AC
/* 80080478 0007D3B8 48 2E 1C 35 */ bl __cvt_fp2unsigned
/* 8008047C 0007D3BC 7C 7C 1B 79 */ or. r28, r3, r3
/* 80080480 0007D3C0 40 80 00 08 */ bge lbl_80080488
/* 80080484 0007D3C4 3B 80 00 00 */ li r28, 0
lbl_80080488:
/* 80080488 0007D3C8 C0 21 00 80 */ lfs f1, 0x80(r1)
/* 8008048C 0007D3CC 48 2E 1C 21 */ bl func_803620AC
/* 8008048C 0007D3CC 48 2E 1C 21 */ bl __cvt_fp2unsigned
/* 80080490 0007D3D0 7C 7B 1B 78 */ mr r27, r3
/* 80080494 0007D3D4 80 10 00 24 */ lwz r0, 0x24(r16)
/* 80080498 0007D3D8 7C 00 00 F8 */ nor r0, r0, r0
@ -2056,13 +2056,13 @@ lbl_800804A8:
/* 800804B4 0007D3F4 48 00 0C 8C */ b lbl_80081140
lbl_800804B8:
/* 800804B8 0007D3F8 C0 21 00 90 */ lfs f1, 0x90(r1)
/* 800804BC 0007D3FC 48 2E 1B F1 */ bl func_803620AC
/* 800804BC 0007D3FC 48 2E 1B F1 */ bl __cvt_fp2unsigned
/* 800804C0 0007D400 7C 6F 1B 79 */ or. r15, r3, r3
/* 800804C4 0007D404 40 80 00 08 */ bge lbl_800804CC
/* 800804C8 0007D408 39 E0 00 00 */ li r15, 0
lbl_800804CC:
/* 800804CC 0007D40C C0 21 00 84 */ lfs f1, 0x84(r1)
/* 800804D0 0007D410 48 2E 1B DD */ bl func_803620AC
/* 800804D0 0007D410 48 2E 1B DD */ bl __cvt_fp2unsigned
/* 800804D4 0007D414 7C 7A 1B 78 */ mr r26, r3
/* 800804D8 0007D418 80 10 00 28 */ lwz r0, 0x28(r16)
/* 800804DC 0007D41C 7C 00 00 F8 */ nor r0, r0, r0
@ -2999,13 +2999,13 @@ lbl_80081140:
/* 80081280 0007E1C0 7C 65 1B 78 */ mr r5, r3
/* 80081284 0007E1C4 48 2C 5E 31 */ bl PSVECSubtract
/* 80081288 0007E1C8 C0 21 00 7C */ lfs f1, 0x7c(r1)
/* 8008128C 0007E1CC 48 2E 0E 21 */ bl func_803620AC
/* 8008128C 0007E1CC 48 2E 0E 21 */ bl __cvt_fp2unsigned
/* 80081290 0007E1D0 7C 6E 1B 79 */ or. r14, r3, r3
/* 80081294 0007E1D4 40 80 00 08 */ bge lbl_8008129C
/* 80081298 0007E1D8 39 C0 00 00 */ li r14, 0
lbl_8008129C:
/* 8008129C 0007E1DC C0 21 00 70 */ lfs f1, 0x70(r1)
/* 800812A0 0007E1E0 48 2E 0E 0D */ bl func_803620AC
/* 800812A0 0007E1E0 48 2E 0E 0D */ bl __cvt_fp2unsigned
/* 800812A4 0007E1E4 7C 7E 1B 78 */ mr r30, r3
/* 800812A8 0007E1E8 82 2F 00 18 */ lwz r17, 0x18(r15)
/* 800812AC 0007E1EC 80 11 00 20 */ lwz r0, 0x20(r17)
@ -3020,13 +3020,13 @@ lbl_800812C0:
/* 800812CC 0007E20C 48 00 0A F4 */ b lbl_80081DC0
lbl_800812D0:
/* 800812D0 0007E210 C0 21 00 80 */ lfs f1, 0x80(r1)
/* 800812D4 0007E214 48 2E 0D D9 */ bl func_803620AC
/* 800812D4 0007E214 48 2E 0D D9 */ bl __cvt_fp2unsigned
/* 800812D8 0007E218 7C 7D 1B 79 */ or. r29, r3, r3
/* 800812DC 0007E21C 40 80 00 08 */ bge lbl_800812E4
/* 800812E0 0007E220 3B A0 00 00 */ li r29, 0
lbl_800812E4:
/* 800812E4 0007E224 C0 21 00 74 */ lfs f1, 0x74(r1)
/* 800812E8 0007E228 48 2E 0D C5 */ bl func_803620AC
/* 800812E8 0007E228 48 2E 0D C5 */ bl __cvt_fp2unsigned
/* 800812EC 0007E22C 7C 7C 1B 78 */ mr r28, r3
/* 800812F0 0007E230 80 11 00 24 */ lwz r0, 0x24(r17)
/* 800812F4 0007E234 7C 00 00 F8 */ nor r0, r0, r0
@ -3040,13 +3040,13 @@ lbl_80081304:
/* 80081310 0007E250 48 00 0A B0 */ b lbl_80081DC0
lbl_80081314:
/* 80081314 0007E254 C0 21 00 84 */ lfs f1, 0x84(r1)
/* 80081318 0007E258 48 2E 0D 95 */ bl func_803620AC
/* 80081318 0007E258 48 2E 0D 95 */ bl __cvt_fp2unsigned
/* 8008131C 0007E25C 7C 72 1B 79 */ or. r18, r3, r3
/* 80081320 0007E260 40 80 00 08 */ bge lbl_80081328
/* 80081324 0007E264 3A 40 00 00 */ li r18, 0
lbl_80081328:
/* 80081328 0007E268 C0 21 00 78 */ lfs f1, 0x78(r1)
/* 8008132C 0007E26C 48 2E 0D 81 */ bl func_803620AC
/* 8008132C 0007E26C 48 2E 0D 81 */ bl __cvt_fp2unsigned
/* 80081330 0007E270 7C 7B 1B 78 */ mr r27, r3
/* 80081334 0007E274 80 11 00 28 */ lwz r0, 0x28(r17)
/* 80081338 0007E278 7C 00 00 F8 */ nor r0, r0, r0
@ -3810,7 +3810,7 @@ lbl_80081DC0:
/* 80081E4C 0007ED8C 38 A1 00 2C */ addi r5, r1, 0x2c
/* 80081E50 0007ED90 48 2C 52 65 */ bl PSVECSubtract
/* 80081E54 0007ED94 C0 21 00 2C */ lfs f1, 0x2c(r1)
/* 80081E58 0007ED98 48 2E 02 55 */ bl func_803620AC
/* 80081E58 0007ED98 48 2E 02 55 */ bl __cvt_fp2unsigned
/* 80081E5C 0007ED9C 7C 7C 1B 79 */ or. r28, r3, r3
/* 80081E60 0007EDA0 40 80 00 0C */ bge lbl_80081E6C
/* 80081E64 0007EDA4 38 60 00 00 */ li r3, 0
@ -3825,7 +3825,7 @@ lbl_80081E6C:
/* 80081E84 0007EDC4 48 00 02 E0 */ b lbl_80082164
lbl_80081E88:
/* 80081E88 0007EDC8 C0 21 00 34 */ lfs f1, 0x34(r1)
/* 80081E8C 0007EDCC 48 2E 02 21 */ bl func_803620AC
/* 80081E8C 0007EDCC 48 2E 02 21 */ bl __cvt_fp2unsigned
/* 80081E90 0007EDD0 7C 7D 1B 79 */ or. r29, r3, r3
/* 80081E94 0007EDD4 40 80 00 0C */ bge lbl_80081EA0
/* 80081E98 0007EDD8 38 60 00 00 */ li r3, 0
@ -3839,7 +3839,7 @@ lbl_80081EA0:
/* 80081EB4 0007EDF4 48 00 02 B0 */ b lbl_80082164
lbl_80081EB8:
/* 80081EB8 0007EDF8 C0 21 00 30 */ lfs f1, 0x30(r1)
/* 80081EBC 0007EDFC 48 2E 01 F1 */ bl func_803620AC
/* 80081EBC 0007EDFC 48 2E 01 F1 */ bl __cvt_fp2unsigned
/* 80081EC0 0007EE00 7C 79 1B 79 */ or. r25, r3, r3
/* 80081EC4 0007EE04 40 80 00 08 */ bge lbl_80081ECC
/* 80081EC8 0007EE08 3B 20 00 00 */ li r25, 0
@ -4001,7 +4001,7 @@ lbl_80081F64:
/* 80082120 0007F060 80 7E 00 18 */ lwz r3, 0x18(r30)
/* 80082124 0007F064 C0 03 00 18 */ lfs f0, 0x18(r3)
/* 80082128 0007F068 EC 3F 00 28 */ fsubs f1, f31, f0
/* 8008212C 0007F06C 48 2D FF 81 */ bl func_803620AC
/* 8008212C 0007F06C 48 2D FF 81 */ bl __cvt_fp2unsigned
/* 80082130 0007F070 7C 77 1B 78 */ mr r23, r3
lbl_80082134:
/* 80082134 0007F074 A4 15 00 02 */ lhzu r0, 2(r21)
@ -4041,7 +4041,7 @@ lbl_80082164:
/* 800821B8 0007F0F8 38 A1 00 20 */ addi r5, r1, 0x20
/* 800821BC 0007F0FC 48 2C 4E F9 */ bl PSVECSubtract
/* 800821C0 0007F100 C0 21 00 20 */ lfs f1, 0x20(r1)
/* 800821C4 0007F104 48 2D FE E9 */ bl func_803620AC
/* 800821C4 0007F104 48 2D FE E9 */ bl __cvt_fp2unsigned
/* 800821C8 0007F108 7C 7C 1B 79 */ or. r28, r3, r3
/* 800821CC 0007F10C 40 80 00 0C */ bge lbl_800821D8
/* 800821D0 0007F110 38 60 00 00 */ li r3, 0
@ -4056,7 +4056,7 @@ lbl_800821D8:
/* 800821F0 0007F130 48 00 02 DC */ b lbl_800824CC
lbl_800821F4:
/* 800821F4 0007F134 C0 21 00 28 */ lfs f1, 0x28(r1)
/* 800821F8 0007F138 48 2D FE B5 */ bl func_803620AC
/* 800821F8 0007F138 48 2D FE B5 */ bl __cvt_fp2unsigned
/* 800821FC 0007F13C 7C 7D 1B 79 */ or. r29, r3, r3
/* 80082200 0007F140 40 80 00 0C */ bge lbl_8008220C
/* 80082204 0007F144 38 60 00 00 */ li r3, 0
@ -4070,7 +4070,7 @@ lbl_8008220C:
/* 80082220 0007F160 48 00 02 AC */ b lbl_800824CC
lbl_80082224:
/* 80082224 0007F164 C0 21 00 24 */ lfs f1, 0x24(r1)
/* 80082228 0007F168 48 2D FE 85 */ bl func_803620AC
/* 80082228 0007F168 48 2D FE 85 */ bl __cvt_fp2unsigned
/* 8008222C 0007F16C 7C 79 1B 79 */ or. r25, r3, r3
/* 80082230 0007F170 40 80 00 08 */ bge lbl_80082238
/* 80082234 0007F174 3B 20 00 00 */ li r25, 0
@ -4078,7 +4078,7 @@ lbl_80082238:
/* 80082238 0007F178 C0 3F 00 48 */ lfs f1, 0x48(r31)
/* 8008223C 0007F17C C0 13 00 18 */ lfs f0, 0x18(r19)
/* 80082240 0007F180 EC 21 00 28 */ fsubs f1, f1, f0
/* 80082244 0007F184 48 2D FE 69 */ bl func_803620AC
/* 80082244 0007F184 48 2D FE 69 */ bl __cvt_fp2unsigned
/* 80082248 0007F188 7C 78 1B 78 */ mr r24, r3
/* 8008224C 0007F18C 80 13 00 24 */ lwz r0, 0x24(r19)
/* 80082250 0007F190 7C 00 00 F8 */ nor r0, r0, r0

2
asm/d/d_vibration.s
View File

@ -66,7 +66,7 @@ lbl_8006F214:
/* 8006F220 0006C160 C8 01 00 08 */ lfd f0, 8(r1)
/* 8006F224 0006C164 EC 00 F8 28 */ fsubs f0, f0, f31
/* 8006F228 0006C168 EC 20 00 72 */ fmuls f1, f0, f1
/* 8006F22C 0006C16C 48 2F 2E 81 */ bl func_803620AC
/* 8006F22C 0006C16C 48 2F 2E 81 */ bl __cvt_fp2unsigned
/* 8006F230 0006C170 7F E0 1E 30 */ sraw r0, r31, r3
/* 8006F234 0006C174 7F 9C 03 78 */ or r28, r28, r0
/* 8006F238 0006C178 3B 7B 00 01 */ addi r27, r27, 1

2
asm/d/s/d_s_play.s
View File

@ -465,7 +465,7 @@ lbl_80259A98:
/* 80259A98 002569D8 7F E3 FB 78 */ mr r3, r31
/* 80259A9C 002569DC 4B DD 17 91 */ bl init__14dComIfG_play_cFv
/* 80259AA0 002569E0 38 60 00 00 */ li r3, 0
/* 80259AA4 002569E4 48 08 B1 99 */ bl JUTAssertion_NS_setMessageCount
/* 80259AA4 002569E4 48 08 B1 99 */ bl setMessageCount__12JUTAssertionFi
/* 80259AA8 002569E8 38 60 00 01 */ li r3, 1
/* 80259AAC 002569EC 39 61 00 20 */ addi r11, r1, 0x20
/* 80259AB0 002569F0 48 10 87 6D */ bl _restgpr_26

8
asm/data.s
View File

@ -4,7 +4,13 @@ lbl_803A2EE0:
.incbin "baserom.dol", 0x39FEE0, 0x14
.global lbl_803A2EF4
lbl_803A2EF4:
.incbin "baserom.dol", 0x39FEF4, 0x4C
.incbin "baserom.dol", 0x39FEF4, 0x20
.global lbl_803A2F14
lbl_803A2F14:
.incbin "baserom.dol", 0x39FF14, 0x14
.global lbl_803A2F28
lbl_803A2F28:
.incbin "baserom.dol", 0x39FF28, 0x18
.global lbl_803A2F40
lbl_803A2F40:
.incbin "baserom.dol", 0x39FF40, 0xC

2
asm/gf/GFPixel.s
View File

@ -76,7 +76,7 @@ lbl_802CDF40:
/* 802CDF8C 002CAECC 98 83 80 00 */ stb r4, -0x8000(r3)
/* 802CDF90 002CAED0 C0 02 C5 88 */ lfs f0, lbl_80455F88-_SDA2_BASE_(r2)
/* 802CDF94 002CAED4 EC 20 00 F2 */ fmuls f1, f0, f3
/* 802CDF98 002CAED8 48 09 41 15 */ bl func_803620AC
/* 802CDF98 002CAED8 48 09 41 15 */ bl __cvt_fp2unsigned
/* 802CDF9C 002CAEDC 64 60 EF 00 */ oris r0, r3, 0xef00
/* 802CDFA0 002CAEE0 3C C0 CC 01 */ lis r6, 0xCC008000@ha
/* 802CDFA4 002CAEE4 90 06 80 00 */ stw r0, 0xCC008000@l(r6)

10
asm/gx/GXFrameBuf.s
View File

@ -216,7 +216,7 @@ GXGetNumXfbLines:
/* 8035CCEC 00359C2C 7C 7F 1B 78 */ mr r31, r3
/* 8035CCF0 00359C30 C0 02 CB A8 */ lfs f0, lbl_804565A8-_SDA2_BASE_(r2)
/* 8035CCF4 00359C34 EC 20 08 24 */ fdivs f1, f0, f1
/* 8035CCF8 00359C38 48 00 53 B5 */ bl func_803620AC
/* 8035CCF8 00359C38 48 00 53 B5 */ bl __cvt_fp2unsigned
/* 8035CCFC 00359C3C 57 E5 04 3E */ clrlwi r5, r31, 0x10
/* 8035CD00 00359C40 38 05 FF FF */ addi r0, r5, -1
/* 8035CD04 00359C44 54 64 05 FE */ clrlwi r4, r3, 0x17
@ -278,7 +278,7 @@ GXGetYScaleFactor:
/* 8035CDC8 00359D08 EC 42 08 24 */ fdivs f2, f2, f1
/* 8035CDCC 00359D0C EC 20 10 24 */ fdivs f1, f0, f2
/* 8035CDD0 00359D10 FF 80 10 90 */ fmr f28, f2
/* 8035CDD4 00359D14 48 00 52 D9 */ bl func_803620AC
/* 8035CDD4 00359D14 48 00 52 D9 */ bl __cvt_fp2unsigned
/* 8035CDD8 00359D18 38 1F FF FF */ addi r0, r31, -1
/* 8035CDDC 00359D1C 54 64 05 FE */ clrlwi r4, r3, 0x17
/* 8035CDE0 00359D20 54 1E 40 2E */ slwi r30, r0, 8
@ -324,7 +324,7 @@ lbl_8035CE48:
/* 8035CE6C 00359DAC EC 01 00 24 */ fdivs f0, f1, f0
/* 8035CE70 00359DB0 EC 3E 00 24 */ fdivs f1, f30, f0
/* 8035CE74 00359DB4 FF 80 00 90 */ fmr f28, f0
/* 8035CE78 00359DB8 48 00 52 35 */ bl func_803620AC
/* 8035CE78 00359DB8 48 00 52 35 */ bl __cvt_fp2unsigned
/* 8035CE7C 00359DBC 54 64 05 FE */ clrlwi r4, r3, 0x17
/* 8035CE80 00359DC0 7C 7E 23 96 */ divwu r3, r30, r4
/* 8035CE84 00359DC4 28 04 00 80 */ cmplwi r4, 0x80
@ -372,7 +372,7 @@ lbl_8035CEEC:
/* 8035CF14 00359E54 EC 01 00 24 */ fdivs f0, f1, f0
/* 8035CF18 00359E58 EC 3F 00 24 */ fdivs f1, f31, f0
/* 8035CF1C 00359E5C FF 80 00 90 */ fmr f28, f0
/* 8035CF20 00359E60 48 00 51 8D */ bl func_803620AC
/* 8035CF20 00359E60 48 00 51 8D */ bl __cvt_fp2unsigned
/* 8035CF24 00359E64 54 64 05 FE */ clrlwi r4, r3, 0x17
/* 8035CF28 00359E68 7C 7E 23 96 */ divwu r3, r30, r4
/* 8035CF2C 00359E6C 28 04 00 80 */ cmplwi r4, 0x80
@ -418,7 +418,7 @@ GXSetDispCopyYScale:
/* 8035CFAC 00359EEC 94 21 FF F8 */ stwu r1, -8(r1)
/* 8035CFB0 00359EF0 C0 02 CB A8 */ lfs f0, lbl_804565A8-_SDA2_BASE_(r2)
/* 8035CFB4 00359EF4 EC 20 08 24 */ fdivs f1, f0, f1
/* 8035CFB8 00359EF8 48 00 50 F5 */ bl func_803620AC
/* 8035CFB8 00359EF8 48 00 50 F5 */ bl __cvt_fp2unsigned
/* 8035CFBC 00359EFC 54 67 05 FE */ clrlwi r7, r3, 0x17
/* 8035CFC0 00359F00 80 62 CB 80 */ lwz r3, lbl_80456580-_SDA2_BASE_(r2)
/* 8035CFC4 00359F04 38 00 00 61 */ li r0, 0x61

2
asm/gx/GXPixel.s
View File

@ -95,7 +95,7 @@ lbl_8035F9BC:
/* 8035F9E8 0035C928 EC 00 10 28 */ fsubs f0, f0, f2
/* 8035F9EC 0035C92C EC 03 00 24 */ fdivs f0, f3, f0
/* 8035F9F0 0035C930 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 8035F9F4 0035C934 48 00 26 B9 */ bl func_803620AC
/* 8035F9F4 0035C934 48 00 26 B9 */ bl __cvt_fp2unsigned
/* 8035F9F8 0035C938 50 7E 02 3E */ rlwimi r30, r3, 0, 8, 0x1f
/* 8035F9FC 0035C93C D3 E1 00 20 */ stfs f31, 0x20(r1)
/* 8035FA00 0035C940 52 FD 06 FE */ rlwimi r29, r23, 0, 0x1b, 0x1f

8
asm/os/OSContext.s
View File

@ -463,10 +463,10 @@ lbl_8033C23C:
/* 8033C23C 0033917C 48 00 00 04 */ b lbl_8033C240
lbl_8033C240:
/* 8033C240 00339180 C8 3A 00 98 */ lfd f1, 0x98(r26)
/* 8033C244 00339184 48 02 5E 69 */ bl func_803620AC
/* 8033C244 00339184 48 02 5E 69 */ bl __cvt_fp2unsigned
/* 8033C248 00339188 7C 7B 1B 78 */ mr r27, r3
/* 8033C24C 0033918C C8 3A 00 90 */ lfd f1, 0x90(r26)
/* 8033C250 00339190 48 02 5E 5D */ bl func_803620AC
/* 8033C250 00339190 48 02 5E 5D */ bl __cvt_fp2unsigned
/* 8033C254 00339194 7C 65 1B 78 */ mr r5, r3
/* 8033C258 00339198 4C C6 31 82 */ crclr 6
/* 8033C25C 0033919C 7F 24 CB 78 */ mr r4, r25
@ -491,10 +491,10 @@ lbl_8033C2A0:
/* 8033C2A0 003391E0 48 00 00 04 */ b lbl_8033C2A4
lbl_8033C2A4:
/* 8033C2A4 003391E4 C8 3A 01 D0 */ lfd f1, 0x1d0(r26)
/* 8033C2A8 003391E8 48 02 5E 05 */ bl func_803620AC
/* 8033C2A8 003391E8 48 02 5E 05 */ bl __cvt_fp2unsigned
/* 8033C2AC 003391EC 7C 7B 1B 78 */ mr r27, r3
/* 8033C2B0 003391F0 C8 3A 01 C8 */ lfd f1, 0x1c8(r26)
/* 8033C2B4 003391F4 48 02 5D F9 */ bl func_803620AC
/* 8033C2B4 003391F4 48 02 5D F9 */ bl __cvt_fp2unsigned
/* 8033C2B8 003391F8 7C 65 1B 78 */ mr r5, r3
/* 8033C2BC 003391FC 4C C6 31 82 */ crclr 6
/* 8033C2C0 00339200 7F 24 CB 78 */ mr r4, r25

3
include/JSystem/JKernel/JKRAram/JKRAram.h
View File

@ -40,6 +40,7 @@ public:
static void changeGroupIdIfNeed(u8*, int);
static void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static void dump(void);
static JKRAram* getManager() { return sAramObject; }
static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; }
@ -67,6 +68,8 @@ private:
static JSUList<JKRAMCommand> sAramCommandList;
};
extern JKRAram* sAramObject__7JKRAram; // JKRAram::sAramObject
void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
#endif

6
include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
View File

@ -14,7 +14,7 @@
/* 802D1CA8 002CEBE8 3B A3 00 7F */ addi r29, r3, 0x7f
/* 802D1CAC 002CEBEC 41 82 00 34 */ beq lbl_802D1CE0
/* 802D1CB0 002CEBF0 7F 83 E3 78 */ mr r3, r28
/* 802D1CB4 002CEBF4 48 01 59 39 */ bl JUTConsole_NS_clear
/* 802D1CB4 002CEBF4 48 01 59 39 */ bl clear__10JUTConsoleFv
/* 802D1CB8 002CEBF8 7F 83 E3 78 */ mr r3, r28
/* 802D1CBC 002CEBFC 7F 24 CB 78 */ mr r4, r25
/* 802D1CC0 002CEC00 80 AD 8E 34 */ lwz r5, lbl_804513B4-_SDA_BASE_(r13)
@ -78,11 +78,11 @@ lbl_802D1D60:
/* 802D1D8C 002CECCC EF E0 08 24 */ fdivs f31, f0, f1
/* 802D1D90 002CECD0 C0 02 C5 C0 */ lfs f0, lbl_80455FC0-_SDA2_BASE_(r2)
/* 802D1D94 002CECD4 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802D1D98 002CECD8 48 09 03 15 */ bl func_803620AC
/* 802D1D98 002CECD8 48 09 03 15 */ bl __cvt_fp2unsigned
/* 802D1D9C 002CECDC 7C 79 1B 78 */ mr r25, r3
/* 802D1DA0 002CECE0 C0 02 C5 C4 */ lfs f0, lbl_80455FC4-_SDA2_BASE_(r2)
/* 802D1DA4 002CECE4 EC 20 07 F2 */ fmuls f1, f0, f31
/* 802D1DA8 002CECE8 48 09 03 05 */ bl func_803620AC
/* 802D1DA8 002CECE8 48 09 03 05 */ bl __cvt_fp2unsigned
/* 802D1DAC 002CECEC 38 80 00 0A */ li r4, 0xa
/* 802D1DB0 002CECF0 7C 03 23 96 */ divwu r0, r3, r4
/* 802D1DB4 002CECF4 7C 00 21 D6 */ mullw r0, r0, r4

2
include/JSystem/JStudio/asm/getValue__Q27JStudio19TFunctionValue_listFd.s
View File

@ -238,7 +238,7 @@ lbl_80282BA8:
lbl_80282BC4:
/* 80282BC4 0027FB04 48 0E 95 39 */ bl func_8036C0FC
/* 80282BC8 0027FB08 D8 21 00 10 */ stfd f1, 0x10(r1)
/* 80282BCC 0027FB0C 48 0D F4 E1 */ bl func_803620AC
/* 80282BCC 0027FB0C 48 0D F4 E1 */ bl __cvt_fp2unsigned
/* 80282BD0 0027FB10 90 61 00 18 */ stw r3, 0x18(r1)
/* 80282BD4 0027FB14 7F E3 FB 78 */ mr r3, r31
/* 80282BD8 0027FB18 38 81 00 08 */ addi r4, r1, 8

8
include/JSystem/JUtility/JUTAssert/JUTAssert.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef JSYSTEM_JUTILITY_JUTASSERT_H_
#define JSYSTEM_JUTILITY_JUTASSERT_H_
namespace JUTAssertion {
void setMessageCount(int message_count);
}
#endif

92
include/JSystem/JUtility/JUTConsole/JUTConsole.h Normal file
View File

@ -0,0 +1,92 @@
#ifndef JSYSTEM_JUTILITY_JUTCONSOLE_H_
#define JSYSTEM_JUTILITY_JUTCONSOLE_H_
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JSupport/JSUList/JSUList.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "dolphin/types.h"
struct JKRDisposer_members {
struct JKRHeap* heap;
struct JSUPtrLink link;
};
struct TColor {
u8 r;
u8 g;
u8 b;
u8 a;
};
struct JUTResFont_vtable {
void* field_0x0;
void* field_0x4;
void* dtor;
void* setGX1;
void* setGX2;
void* drawChar_scale;
void* getLeading;
void* getAscent;
void* getDescent;
void* getHeight;
void* getWidth;
void* getWidthEntry;
void* getCellWidth;
void* getCellHeight;
void* getFontType;
void* getResFont;
void* isLeadByte;
void* loadImage;
void* setBlock;
};
class JUTConsole {
public:
void clear(void);
void scroll(int);
void dumpToTerminal(unsigned int);
int getLineOffset(void) const;
struct JUTConsole_vtable* vtable;
struct JKRDisposer_members base;
u8 field_0x18;
u8 field_0x19;
u8 field_0x1a;
u8 field_0x1b;
u8 field_0x1c;
u8 field_0x1d;
u8 field_0x1e;
u8 field_0x1f;
u32 field_0x20;
s32 field_0x24;
u8 field_0x28;
u8 field_0x29;
u8 field_0x2a;
u8 field_0x2b;
bool field_0x2c;
u8 field_0x2d;
u8 field_0x2e;
u8 field_0x2f;
s32 field_0x30;
s32 field_0x34;
s32 field_0x38;
u8 field_0x3c;
u8 field_0x3d;
u8 field_0x3e;
u8 field_0x3f;
s32 field_0x40;
s32 field_0x44;
s32 field_0x48;
struct JUTResFont* font;
float field_0x50;
float field_0x54;
u32 field_0x58;
struct TColor field_0x5c;
struct TColor field_0x60;
u32 field_0x64;
bool field_0x68;
bool field_0x69;
bool field_0x6a;
bool field_0x6b;
};
#endif

7
include/JSystem/JUtility/JUTReport/JUTReport.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef JSYSTEM_JUTILITY_JUTREPORT_H
#define JSYSTEM_JUTILITY_JUTREPORT_H
void JUTReport(int, int, const char*, ...);
void JUTReport(int, int, int, const char*, ...);
#endif

2
include/Z2AudioLib/Z2Audience/asm/func_802BCFE4.s
View File

@ -17,7 +17,7 @@ lbl_802BD01C:
/* 802BD01C 002B9F5C C0 43 00 1C */ lfs f2, 0x1c(r3)
/* 802BD020 002B9F60 EC 01 00 28 */ fsubs f0, f1, f0
/* 802BD024 002B9F64 EC 22 00 32 */ fmuls f1, f2, f0
/* 802BD028 002B9F68 48 0A 50 85 */ bl func_803620AC
/* 802BD028 002B9F68 48 0A 50 85 */ bl __cvt_fp2unsigned
lbl_802BD02C:
/* 802BD02C 002B9F6C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BD030 002B9F70 7C 08 03 A6 */ mtlr r0

2
include/Z2AudioLib/Z2Audience/asm/func_802BDC44.s
View File

@ -23,7 +23,7 @@ lbl_802BDC90:
/* 802BDC90 002BABD0 C0 44 00 B8 */ lfs f2, 0xb8(r4)
/* 802BDC94 002BABD4 EC 01 00 28 */ fsubs f0, f1, f0
/* 802BDC98 002BABD8 EC 22 00 32 */ fmuls f1, f2, f0
/* 802BDC9C 002BABDC 48 0A 44 11 */ bl func_803620AC
/* 802BDC9C 002BABDC 48 0A 44 11 */ bl __cvt_fp2unsigned
lbl_802BDCA0:
/* 802BDCA0 002BABE0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802BDCA4 002BABE4 7C 08 03 A6 */ mtlr r0

2
include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s
View File

@ -16,7 +16,7 @@
/* 802C9328 002C6268 48 00 00 BD */ bl Z2EnvSeMgr_NS_getFogDensity
/* 802C932C 002C626C C0 02 C4 58 */ lfs f0, lbl_80455E58-_SDA2_BASE_(r2)
/* 802C9330 002C6270 EC 20 00 72 */ fmuls f1, f0, f1
/* 802C9334 002C6274 48 09 8D 79 */ bl func_803620AC
/* 802C9334 002C6274 48 09 8D 79 */ bl __cvt_fp2unsigned
/* 802C9338 002C6278 7C 67 1B 78 */ mr r7, r3
/* 802C933C 002C627C 3C 60 00 09 */ lis r3, 0x00090035@ha
/* 802C9340 002C6280 38 03 00 35 */ addi r0, r3, 0x00090035@l

2
include/Z2AudioLib/Z2SeMgr/asm/func_802AB984.s
View File

@ -676,7 +676,7 @@ lbl_802AC2F0:
/* 802AC318 002A9258 FC C0 18 90 */ fmr f6, f3
/* 802AC31C 002A925C 38 60 00 00 */ li r3, 0
/* 802AC320 002A9260 4B FF D3 D5 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign
/* 802AC324 002A9264 48 0B 5D 89 */ bl func_803620AC
/* 802AC324 002A9264 48 0B 5D 89 */ bl __cvt_fp2unsigned
/* 802AC328 002A9268 7C 7D 1B 78 */ mr r29, r3
/* 802AC32C 002A926C C8 22 BE D8 */ lfd f1, lbl_804558D8-_SDA2_BASE_(r2)
/* 802AC330 002A9270 93 A1 00 B4 */ stw r29, 0xb4(r1)

2
include/d/d_a/d_a_alink/asm/func_80131A6C.s
View File

@ -11,7 +11,7 @@
/* 80131A94 0012E9D4 EC 21 00 32 */ fmuls f1, f1, f0
/* 80131A98 0012E9D8 C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2)
/* 80131A9C 0012E9DC EC 21 00 24 */ fdivs f1, f1, f0
/* 80131AA0 0012E9E0 48 23 06 0D */ bl func_803620AC
/* 80131AA0 0012E9E0 48 23 06 0D */ bl __cvt_fp2unsigned
/* 80131AA4 0012E9E4 7C 66 1B 78 */ mr r6, r3
/* 80131AA8 0012E9E8 28 06 00 7F */ cmplwi r6, 0x7f
/* 80131AAC 0012E9EC 40 81 00 08 */ ble lbl_80131AB4

2
include/d/d_camera/asm/func_80160470.s
View File

@ -460,7 +460,7 @@ lbl_80160610:
/* 80160B84 0015DAC4 90 9C 00 A8 */ stw r4, 0xa8(r28)
/* 80160B88 0015DAC8 C0 22 9C A4 */ lfs f1, lbl_804536A4-_SDA2_BASE_(r2)
/* 80160B8C 0015DACC 48 10 6E 01 */ bl cM_rndFX
/* 80160B90 0015DAD0 48 20 15 1D */ bl func_803620AC
/* 80160B90 0015DAD0 48 20 15 1D */ bl __cvt_fp2unsigned
/* 80160B94 0015DAD4 90 7C 00 AC */ stw r3, 0xac(r28)
/* 80160B98 0015DAD8 C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2)
/* 80160B9C 0015DADC D0 1C 00 84 */ stfs f0, 0x84(r28)

2
include/d/d_com/d_com_inf_game/asm/func_8002E22C.s
View File

@ -16,7 +16,7 @@
/* 8002E268 0002B1A8 EC 20 08 28 */ fsubs f1, f0, f1
/* 8002E26C 0002B1AC C0 02 83 08 */ lfs f0, lbl_80451D08-_SDA2_BASE_(r2)
/* 8002E270 0002B1B0 EC 20 00 72 */ fmuls f1, f0, f1
/* 8002E274 0002B1B4 48 33 3E 39 */ bl func_803620AC
/* 8002E274 0002B1B4 48 33 3E 39 */ bl __cvt_fp2unsigned
/* 8002E278 0002B1B8 7C 7B 1B 78 */ mr r27, r3
/* 8002E27C 0002B1BC 3B 40 00 00 */ li r26, 0
/* 8002E280 0002B1C0 3B E0 00 00 */ li r31, 0

4
include/d/d_kankyo/asm/func_8019F4FC.s
View File

@ -93,7 +93,7 @@ lbl_8019F634:
/* 8019F65C 0019C59C D0 1E 12 44 */ stfs f0, 0x1244(r30)
lbl_8019F660:
/* 8019F660 0019C5A0 C0 3E 12 44 */ lfs f1, 0x1244(r30)
/* 8019F664 0019C5A4 48 1C 2A 49 */ bl func_803620AC
/* 8019F664 0019C5A4 48 1C 2A 49 */ bl __cvt_fp2unsigned
/* 8019F668 0019C5A8 C8 22 A2 80 */ lfd f1, lbl_80453C80-_SDA2_BASE_(r2)
/* 8019F66C 0019C5AC 90 61 00 0C */ stw r3, 0xc(r1)
/* 8019F670 0019C5B0 3C 00 43 30 */ lis r0, 0x4330
@ -117,7 +117,7 @@ lbl_8019F6AC:
/* 8019F6B4 0019C5F4 EC 01 00 2A */ fadds f0, f1, f0
/* 8019F6B8 0019C5F8 D0 1E 12 50 */ stfs f0, 0x1250(r30)
/* 8019F6BC 0019C5FC C0 3E 12 50 */ lfs f1, 0x1250(r30)
/* 8019F6C0 0019C600 48 1C 29 ED */ bl func_803620AC
/* 8019F6C0 0019C600 48 1C 29 ED */ bl __cvt_fp2unsigned
/* 8019F6C4 0019C604 C8 22 A2 80 */ lfd f1, lbl_80453C80-_SDA2_BASE_(r2)
/* 8019F6C8 0019C608 90 61 00 0C */ stw r3, 0xc(r1)
/* 8019F6CC 0019C60C 3C 00 43 30 */ lis r0, 0x4330

8
include/d/d_meter2/d_meter2_info/asm/func_8021E308.s
View File

@ -20,7 +20,7 @@
/* 8021E354 0021B294 FC 1F 00 40 */ fcmpo cr0, f31, f0
/* 8021E358 0021B298 41 80 00 68 */ blt lbl_8021E3C0
/* 8021E35C 0021B29C FC 20 E0 90 */ fmr f1, f28
/* 8021E360 0021B2A0 48 14 3D 4D */ bl func_803620AC
/* 8021E360 0021B2A0 48 14 3D 4D */ bl __cvt_fp2unsigned
/* 8021E364 0021B2A4 C8 22 AF C0 */ lfd f1, lbl_804549C0-_SDA2_BASE_(r2)
/* 8021E368 0021B2A8 90 61 00 0C */ stw r3, 0xc(r1)
/* 8021E36C 0021B2AC 3C 00 43 30 */ lis r0, 0x4330
@ -34,7 +34,7 @@
/* 8021E38C 0021B2CC FC 1E 00 40 */ fcmpo cr0, f30, f0
/* 8021E390 0021B2D0 41 80 00 30 */ blt lbl_8021E3C0
/* 8021E394 0021B2D4 FC 20 E8 90 */ fmr f1, f29
/* 8021E398 0021B2D8 48 14 3D 15 */ bl func_803620AC
/* 8021E398 0021B2D8 48 14 3D 15 */ bl __cvt_fp2unsigned
/* 8021E39C 0021B2DC C8 22 AF C0 */ lfd f1, lbl_804549C0-_SDA2_BASE_(r2)
/* 8021E3A0 0021B2E0 90 61 00 0C */ stw r3, 0xc(r1)
/* 8021E3A4 0021B2E4 3C 00 43 30 */ lis r0, 0x4330
@ -55,7 +55,7 @@ lbl_8021E3C8:
/* 8021E3D8 0021B318 EC 00 08 28 */ fsubs f0, f0, f1
/* 8021E3DC 0021B31C EC 1F 00 32 */ fmuls f0, f31, f0
/* 8021E3E0 0021B320 EC 20 E0 24 */ fdivs f1, f0, f28
/* 8021E3E4 0021B324 48 14 3C C9 */ bl func_803620AC
/* 8021E3E4 0021B324 48 14 3C C9 */ bl __cvt_fp2unsigned
/* 8021E3E8 0021B328 7C 7E 1B 78 */ mr r30, r3
/* 8021E3EC 0021B32C A0 1F 00 04 */ lhz r0, 4(r31)
/* 8021E3F0 0021B330 C8 22 AF C0 */ lfd f1, lbl_804549C0-_SDA2_BASE_(r2)
@ -66,7 +66,7 @@ lbl_8021E3C8:
/* 8021E404 0021B344 EC 00 08 28 */ fsubs f0, f0, f1
/* 8021E408 0021B348 EC 1E 00 32 */ fmuls f0, f30, f0
/* 8021E40C 0021B34C EC 20 E8 24 */ fdivs f1, f0, f29
/* 8021E410 0021B350 48 14 3C 9D */ bl func_803620AC
/* 8021E410 0021B350 48 14 3C 9D */ bl __cvt_fp2unsigned
/* 8021E414 0021B354 81 1F 00 0C */ lwz r8, 0xc(r31)
/* 8021E418 0021B358 80 FF 00 1C */ lwz r7, 0x1c(r31)
/* 8021E41C 0021B35C 54 66 1E F8 */ rlwinm r6, r3, 3, 0x1b, 0x1c

1
include/global.h
View File

@ -12,7 +12,6 @@
#define JUT_ASSERT(...)
#define JUT_EXPECT(...)
#define JUTReport(...)
#define ASSERT(...)
#define LOGF(FMT, ...)
#define FLAG_ON(V, F) (((V) & (F)) == 0)

8
include/m_Do/m_Do_graphic/asm/func_800091C0.s
View File

@ -169,16 +169,16 @@ lbl_8000921C:
/* 8000945C 0000639C B0 64 80 00 */ sth r3, -0x8000(r4)
lbl_80009460:
/* 80009460 000063A0 C0 3F 00 24 */ lfs f1, 0x24(r31)
/* 80009464 000063A4 48 35 8C 49 */ bl func_803620AC
/* 80009464 000063A4 48 35 8C 49 */ bl __cvt_fp2unsigned
/* 80009468 000063A8 7C 7C 1B 78 */ mr r28, r3
/* 8000946C 000063AC C0 3F 00 20 */ lfs f1, 0x20(r31)
/* 80009470 000063B0 48 35 8C 3D */ bl func_803620AC
/* 80009470 000063B0 48 35 8C 3D */ bl __cvt_fp2unsigned
/* 80009474 000063B4 7C 7D 1B 78 */ mr r29, r3
/* 80009478 000063B8 C0 3F 00 1C */ lfs f1, 0x1c(r31)
/* 8000947C 000063BC 48 35 8C 31 */ bl func_803620AC
/* 8000947C 000063BC 48 35 8C 31 */ bl __cvt_fp2unsigned
/* 80009480 000063C0 7C 7E 1B 78 */ mr r30, r3
/* 80009484 000063C4 C0 3F 00 18 */ lfs f1, 0x18(r31)
/* 80009488 000063C8 48 35 8C 25 */ bl func_803620AC
/* 80009488 000063C8 48 35 8C 25 */ bl __cvt_fp2unsigned
/* 8000948C 000063CC 7F C4 F3 78 */ mr r4, r30
/* 80009490 000063D0 7F A5 EB 78 */ mr r5, r29
/* 80009494 000063D4 7F 86 E3 78 */ mr r6, r28

8
include/m_Do/m_Do_graphic/asm/func_8000A604.s
View File

@ -142,16 +142,16 @@ lbl_8000A818:
/* 8000A82C 0000776C C0 DD 00 14 */ lfs f6, 0x14(r29)
/* 8000A830 00007770 48 35 5C 35 */ bl GXSetViewport
/* 8000A834 00007774 C0 3D 00 0C */ lfs f1, 0xc(r29)
/* 8000A838 00007778 48 35 78 75 */ bl func_803620AC
/* 8000A838 00007778 48 35 78 75 */ bl __cvt_fp2unsigned
/* 8000A83C 0000777C 7C 76 1B 78 */ mr r22, r3
/* 8000A840 00007780 C0 3D 00 08 */ lfs f1, 8(r29)
/* 8000A844 00007784 48 35 78 69 */ bl func_803620AC
/* 8000A844 00007784 48 35 78 69 */ bl __cvt_fp2unsigned
/* 8000A848 00007788 7C 77 1B 78 */ mr r23, r3
/* 8000A84C 0000778C C0 3D 00 04 */ lfs f1, 4(r29)
/* 8000A850 00007790 48 35 78 5D */ bl func_803620AC
/* 8000A850 00007790 48 35 78 5D */ bl __cvt_fp2unsigned
/* 8000A854 00007794 7C 78 1B 78 */ mr r24, r3
/* 8000A858 00007798 C0 3D 00 00 */ lfs f1, 0(r29)
/* 8000A85C 0000779C 48 35 78 51 */ bl func_803620AC
/* 8000A85C 0000779C 48 35 78 51 */ bl __cvt_fp2unsigned
/* 8000A860 000077A0 7F 04 C3 78 */ mr r4, r24
/* 8000A864 000077A4 7E E5 BB 78 */ mr r5, r23
/* 8000A868 000077A8 7E C6 B3 78 */ mr r6, r22

2
include/m_Do/m_Do_graphic/m_Do_graphic.h
View File

@ -107,7 +107,7 @@ void func_8000A604(void);
void func_8000B118(void);
void func_8000B1D0(void);
void func_8000B1E4(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void mDoExt_adjustSolidHeap(void);
void mDoExt_createSolidHeapToCurrent_X1_(void);
void mDoExt_restoreCurrentHeap(void);

16
include/m_Do/m_Do_machine/asm/func_8000B95C.s
View File

@ -119,7 +119,7 @@ lbl_8000BB0C:
/* 8000BB14 00008A54 40 82 00 14 */ bne lbl_8000BB28
/* 8000BB18 00008A58 7F C3 F3 78 */ mr r3, r30
/* 8000BB1C 00008A5C 80 9E 00 24 */ lwz r4, 0x24(r30)
/* 8000BB20 00008A60 48 2D C5 89 */ bl JUTConsole_NS_scroll
/* 8000BB20 00008A60 48 2D C5 89 */ bl scroll__10JUTConsoleFi
/* 8000BB24 00008A64 38 60 00 01 */ li r3, 1
lbl_8000BB28:
/* 8000BB28 00008A68 80 01 00 08 */ lwz r0, 8(r1)
@ -128,7 +128,7 @@ lbl_8000BB28:
/* 8000BB34 00008A74 7F C3 F3 78 */ mr r3, r30
/* 8000BB38 00008A78 80 1E 00 24 */ lwz r0, 0x24(r30)
/* 8000BB3C 00008A7C 7C 80 00 D0 */ neg r4, r0
/* 8000BB40 00008A80 48 2D C5 69 */ bl JUTConsole_NS_scroll
/* 8000BB40 00008A80 48 2D C5 69 */ bl scroll__10JUTConsoleFi
/* 8000BB44 00008A84 38 60 00 01 */ li r3, 1
lbl_8000BB48:
/* 8000BB48 00008A88 80 01 00 0C */ lwz r0, 0xc(r1)
@ -150,7 +150,7 @@ lbl_8000BB78:
/* 8000BB80 00008AC0 40 80 00 08 */ bge lbl_8000BB88
/* 8000BB84 00008AC4 38 80 FF FC */ li r4, -4
lbl_8000BB88:
/* 8000BB88 00008AC8 48 2D C5 21 */ bl JUTConsole_NS_scroll
/* 8000BB88 00008AC8 48 2D C5 21 */ bl scroll__10JUTConsoleFi
/* 8000BB8C 00008ACC 38 60 00 01 */ li r3, 1
/* 8000BB90 00008AD0 3B A0 00 00 */ li r29, 0
/* 8000BB94 00008AD4 3B FF 00 01 */ addi r31, r31, 1
@ -174,7 +174,7 @@ lbl_8000BBC8:
/* 8000BBD0 00008B10 40 80 00 08 */ bge lbl_8000BBD8
/* 8000BBD4 00008B14 38 80 00 04 */ li r4, 4
lbl_8000BBD8:
/* 8000BBD8 00008B18 48 2D C4 D1 */ bl JUTConsole_NS_scroll
/* 8000BBD8 00008B18 48 2D C4 D1 */ bl scroll__10JUTConsoleFi
/* 8000BBDC 00008B1C 38 60 00 01 */ li r3, 1
/* 8000BBE0 00008B20 3B E0 00 00 */ li r31, 0
/* 8000BBE4 00008B24 3B BD 00 01 */ addi r29, r29, 1
@ -209,7 +209,7 @@ lbl_8000BC40:
/* 8000BC40 00008B80 7F E3 FB 78 */ mr r3, r31
/* 8000BC44 00008B84 80 1F 00 24 */ lwz r0, 0x24(r31)
/* 8000BC48 00008B88 7C 80 00 D0 */ neg r4, r0
/* 8000BC4C 00008B8C 48 2D C4 5D */ bl JUTConsole_NS_scroll
/* 8000BC4C 00008B8C 48 2D C4 5D */ bl scroll__10JUTConsoleFi
/* 8000BC50 00008B90 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 8000BC54 00008B94 38 80 00 01 */ li r4, 1
/* 8000BC58 00008B98 48 2D C7 F9 */ bl JUTConsoleManager_NS_drawDirect
@ -221,13 +221,13 @@ lbl_8000BC64:
lbl_8000BC6C:
/* 8000BC6C 00008BAC 7F E3 FB 78 */ mr r3, r31
/* 8000BC70 00008BB0 38 80 00 01 */ li r4, 1
/* 8000BC74 00008BB4 48 2D C4 35 */ bl JUTConsole_NS_scroll
/* 8000BC74 00008BB4 48 2D C4 35 */ bl scroll__10JUTConsoleFi
/* 8000BC78 00008BB8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13)
/* 8000BC7C 00008BBC 38 80 00 01 */ li r4, 1
/* 8000BC80 00008BC0 48 2D C7 D1 */ bl JUTConsoleManager_NS_drawDirect
/* 8000BC84 00008BC4 83 9F 00 48 */ lwz r28, 0x48(r31)
/* 8000BC88 00008BC8 7F E3 FB 78 */ mr r3, r31
/* 8000BC8C 00008BCC 48 2D C5 1D */ bl JUTConsole_NS_getLineOffset
/* 8000BC8C 00008BCC 48 2D C5 1D */ bl getLineOffset__10JUTConsoleCFv
/* 8000BC90 00008BD0 7C 7D 1B 78 */ mr r29, r3
/* 8000BC94 00008BD4 7F E3 FB 78 */ mr r3, r31
/* 8000BC98 00008BD8 48 2D C4 ED */ bl JUTConsole_NS_getUsedLine
@ -246,7 +246,7 @@ lbl_8000BCC0:
/* 8000BCC4 00008C04 48 2D 7C BD */ bl JUTException_NS_waitTime
/* 8000BCC8 00008C08 83 9F 00 48 */ lwz r28, 0x48(r31)
/* 8000BCCC 00008C0C 7F E3 FB 78 */ mr r3, r31
/* 8000BCD0 00008C10 48 2D C4 D9 */ bl JUTConsole_NS_getLineOffset
/* 8000BCD0 00008C10 48 2D C4 D9 */ bl getLineOffset__10JUTConsoleCFv
/* 8000BCD4 00008C14 7C 7D 1B 78 */ mr r29, r3
/* 8000BCD8 00008C18 7F E3 FB 78 */ mr r3, r31
/* 8000BCDC 00008C1C 48 2D C4 A9 */ bl JUTConsole_NS_getUsedLine

2
include/m_Do/m_Do_machine_exception/asm/func_80018124.s
View File

@ -3,7 +3,7 @@
/* 8001812C 0001506C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80018130 00015070 80 6D 8C 38 */ lwz r3, lbl_804511B8-_SDA_BASE_(r13)
/* 80018134 00015074 38 80 FF FF */ li r4, -1
/* 80018138 00015078 48 2C FE 45 */ bl JUTConsole_NS_dumpToTerminal
/* 80018138 00015078 48 2C FE 45 */ bl dumpToTerminal__10JUTConsoleFUi
/* 8001813C 0001507C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80018140 00015080 7C 08 03 A6 */ mtlr r0
/* 80018144 00015084 38 21 00 10 */ addi r1, r1, 0x10

22
include/m_Do/m_Do_main/asm/func_80005D4C.s
View File

@ -50,7 +50,7 @@ lbl_80005DD0:
/* 80005E04 00002D44 54 00 D9 7E */ srwi r0, r0, 5
/* 80005E08 00002D48 98 1F 00 68 */ stb r0, 0x68(r31)
/* 80005E0C 00002D4C 38 60 00 00 */ li r3, 0
/* 80005E10 00002D50 48 2D EE 2D */ bl JUTAssertion_NS_setMessageCount
/* 80005E10 00002D50 48 2D EE 2D */ bl setMessageCount__12JUTAssertionFi
lbl_80005E14:
/* 80005E14 00002D54 88 1F 00 68 */ lbz r0, 0x68(r31)
/* 80005E18 00002D58 28 00 00 00 */ cmplwi r0, 0
@ -78,7 +78,7 @@ lbl_80005E54:
/* 80005E68 00002DA8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 80005E6C 00002DAC 41 82 00 0C */ beq lbl_80005E78
/* 80005E70 00002DB0 7F E3 FB 78 */ mr r3, r31
/* 80005E74 00002DB4 48 2E 17 79 */ bl JUTConsole_NS_clear
/* 80005E74 00002DB4 48 2E 17 79 */ bl clear__10JUTConsoleFv
lbl_80005E78:
/* 80005E78 00002DB8 80 7C 00 00 */ lwz r3, 0(r28)
/* 80005E7C 00002DBC 54 60 05 2B */ rlwinm. r0, r3, 0, 0x14, 0x15
@ -119,7 +119,7 @@ lbl_80005ED4:
/* 80005EFC 00002E3C EC 02 00 28 */ fsubs f0, f2, f0
/* 80005F00 00002E40 D0 0D 85 AC */ stfs f0, lbl_80450B2C-_SDA_BASE_(r13)
/* 80005F04 00002E44 7F E3 FB 78 */ mr r3, r31
/* 80005F08 00002E48 48 2E 21 A1 */ bl JUTConsole_NS_scroll
/* 80005F08 00002E48 48 2E 21 A1 */ bl scroll__10JUTConsoleFi
/* 80005F0C 00002E4C 48 00 00 2C */ b lbl_80005F38
lbl_80005F10:
/* 80005F10 00002E50 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15
@ -139,7 +139,7 @@ lbl_80005F38:
/* 80005F40 00002E80 41 82 00 18 */ beq lbl_80005F58
/* 80005F44 00002E84 7F E3 FB 78 */ mr r3, r31
/* 80005F48 00002E88 38 80 FF FF */ li r4, -1
/* 80005F4C 00002E8C 48 2E 20 31 */ bl JUTConsole_NS_dumpToTerminal
/* 80005F4C 00002E8C 48 2E 20 31 */ bl dumpToTerminal__10JUTConsoleFUi
/* 80005F50 00002E90 38 00 00 03 */ li r0, 3
/* 80005F54 00002E94 90 1F 00 58 */ stw r0, 0x58(r31)
lbl_80005F58:
@ -150,7 +150,7 @@ lbl_80005F58:
/* 80005F68 00002EA8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005F6C 00002EAC 38 C6 01 B1 */ addi r6, r6, 0x1b1
/* 80005F70 00002EB0 4C C6 31 82 */ crclr 6
/* 80005F74 00002EB4 48 2D A6 8D */ bl JUTReport_X1_
/* 80005F74 00002EB4 48 2D A6 8D */ bl JUTReport__FiiiPCce
/* 80005F78 00002EB8 38 60 00 1E */ li r3, 0x1e
/* 80005F7C 00002EBC 38 80 01 90 */ li r4, 0x190
/* 80005F80 00002EC0 38 A0 00 01 */ li r5, 1
@ -158,7 +158,7 @@ lbl_80005F58:
/* 80005F88 00002EC8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005F8C 00002ECC 38 C6 01 D3 */ addi r6, r6, 0x1d3
/* 80005F90 00002ED0 4C C6 31 82 */ crclr 6
/* 80005F94 00002ED4 48 2D A6 6D */ bl JUTReport_X1_
/* 80005F94 00002ED4 48 2D A6 6D */ bl JUTReport__FiiiPCce
/* 80005F98 00002ED8 38 60 00 1E */ li r3, 0x1e
/* 80005F9C 00002EDC 38 80 01 9A */ li r4, 0x19a
/* 80005FA0 00002EE0 38 A0 00 01 */ li r5, 1
@ -166,9 +166,9 @@ lbl_80005F58:
/* 80005FA8 00002EE8 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 80005FAC 00002EEC 38 C6 01 ED */ addi r6, r6, 0x1ed
/* 80005FB0 00002EF0 4C C6 31 82 */ crclr 6
/* 80005FB4 00002EF4 48 2D A6 4D */ bl JUTReport_X1_
/* 80005FB4 00002EF4 48 2D A6 4D */ bl JUTReport__FiiiPCce
/* 80005FB8 00002EF8 7F E3 FB 78 */ mr r3, r31
/* 80005FBC 00002EFC 48 2E 21 ED */ bl JUTConsole_NS_getLineOffset
/* 80005FBC 00002EFC 48 2E 21 ED */ bl getLineOffset__10JUTConsoleCFv
/* 80005FC0 00002F00 7C 67 1B 78 */ mr r7, r3
/* 80005FC4 00002F04 38 60 00 1E */ li r3, 0x1e
/* 80005FC8 00002F08 38 80 01 A4 */ li r4, 0x1a4
@ -180,7 +180,7 @@ lbl_80005F58:
/* 80005FE0 00002F20 81 3F 00 44 */ lwz r9, 0x44(r31)
/* 80005FE4 00002F24 81 5F 00 58 */ lwz r10, 0x58(r31)
/* 80005FE8 00002F28 4C C6 31 82 */ crclr 6
/* 80005FEC 00002F2C 48 2D A6 15 */ bl JUTReport_X1_
/* 80005FEC 00002F2C 48 2D A6 15 */ bl JUTReport__FiiiPCce
/* 80005FF0 00002F30 48 00 01 00 */ b lbl_800060F0
lbl_80005FF4:
/* 80005FF4 00002F34 80 9E 00 00 */ lwz r4, 0(r30)
@ -242,7 +242,7 @@ lbl_800060B0:
/* 800060C0 00003000 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 800060C4 00003004 38 C6 02 35 */ addi r6, r6, 0x235
/* 800060C8 00003008 4C C6 31 82 */ crclr 6
/* 800060CC 0000300C 48 2D A5 35 */ bl JUTReport_X1_
/* 800060CC 0000300C 48 2D A5 35 */ bl JUTReport__FiiiPCce
/* 800060D0 00003010 38 60 00 1E */ li r3, 0x1e
/* 800060D4 00003014 38 80 01 C2 */ li r4, 0x1c2
/* 800060D8 00003018 38 A0 00 01 */ li r5, 1
@ -250,7 +250,7 @@ lbl_800060B0:
/* 800060E0 00003020 38 C6 39 A0 */ addi r6, r6, lbl_803739A0@l
/* 800060E4 00003024 38 C6 02 5B */ addi r6, r6, 0x25b
/* 800060E8 00003028 4C C6 31 82 */ crclr 6
/* 800060EC 0000302C 48 2D A5 15 */ bl JUTReport_X1_
/* 800060EC 0000302C 48 2D A5 15 */ bl JUTReport__FiiiPCce
lbl_800060F0:
/* 800060F0 00003030 C0 0D 85 A4 */ lfs f0, lbl_80450B24-_SDA_BASE_(r13)
/* 800060F4 00003034 FC 00 00 1E */ fctiwz f0, f0

8
include/m_Do/m_Do_main/m_Do_main.h
View File

@ -3,6 +3,7 @@
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTConsole/JUTConsole.h"
#include "dolphin/types.h"
class HeapCheck {
@ -15,6 +16,9 @@ public:
JKRExpHeap* getHeap() { return heap; }
void setHeap(JKRExpHeap* i_heap) { heap = i_heap; }
void setHeapSize(u32 i_size) { heap_size = i_size; }
s32 getMaxTotalUsedSize() { return max_total_used_size; }
s32 getMaxTotalFreeSize() { return max_total_free_size; }
char** getNames() { return names; }
private:
/* 0x00 */ char* names[2];
@ -38,8 +42,8 @@ extern HeapCheck lbl_803D32E0[8]; // RootHeapCheck
// extern HeapCheck lbl_803D33F8; // CommandHeapCheck
extern u8 lbl_80450B1A[2];
extern u8 lbl_80450B18;
extern u8 lbl_80450588[8];
extern u8 lbl_804511B8[4];
extern u8 lbl_80450588;
extern JUTConsole* lbl_804511B8;
extern u8 lbl_80451210[4];
extern JKRSolidHeap* lbl_80450BBC;
#endif

26
include/variables.h
View File

@ -10,31 +10,8 @@ extern u32 _sRumbleSupported;
extern u8 lbl_803A2EF4;
extern char lbl_803A2EE0[20];
extern u8 lbl_80450B19;
// extern u8 lbl_80450588;
// extern u8 lbl_804511B8;
extern u8 lbl_80450B20;
extern u8 lbl_80450B1C;
extern u8 lbl_80450B28;
extern u8 lbl_80450B24;
extern u8 lbl_80450B28;
extern u8 lbl_80450B30;
extern u8 lbl_80450B2C;
extern u8 lbl_80450B30;
extern u8 lbl_80450B2C;
extern u8 lbl_80450B2C;
extern u8 lbl_80450B2C;
extern u8 lbl_80450B2C;
extern u8 lbl_80450B1C;
extern u8 lbl_80450B1C;
extern u8 lbl_80450B24;
extern u8 lbl_80450B24;
struct g_HIO_struct;
extern g_HIO_struct g_HIO;
extern u8 lbl_80450C2C;
extern u8 lbl_80450C28;
extern u8 lbl_80450C34;
extern u8 lbl_80450B24;
extern u8 lbl_80450B1C;
extern s8 lbl_80450580;
// extern u8 lbl_80450B1A;
struct JUTGamePad;
@ -73,7 +50,6 @@ extern u8 J3DLightObj;
extern void* lbl_803CBF70; // JKRHeap::__vt
class JKRHeap;
extern JKRHeap* sSystemHeap__7JKRHeap; // JKRHeap::sSystemHeap
extern JKRHeap* sRootHeap__7JKRHeap; // JKRHeap::sRootHeap
extern JKRHeap* sCurrentHeap__7JKRHeap; // JKRHeap::sCurrentHeap
@ -325,9 +301,7 @@ extern u8 lbl_804343B4; // JKRDvdAramRipper::sDvdAramAsyncList
extern u8 lbl_804343C0; // JKernel::decompMutex
extern u8 lbl_803CC518; // JSUFileInputStream::__vt
class JKRAram;
extern u8 lbl_803CC158; // JKRAram::__vt
extern JKRAram* sAramObject__7JKRAram; // JKRAram::sAramObject
extern OSMessageQueue sMessageQueue__7JKRAram; // JKRAram::sMessageQueue
extern bool lbl_804513FC; // DAT_804513fc (init global mutex)
extern OSMutex lbl_804342E8; // JKernel::decompMutex (static?)

1
libs/JSystem/JKernel/JKRAram.cpp
View File

@ -50,6 +50,7 @@ extern u32 JKRAram__readCount;
extern u32 JKRAram__maxDest;
extern u32* JKRAram__tsPtr;
extern u32 JKRAram__tsArea;
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size,
long stream_priority, long decomp_priority, long piece_priority) {

4
libs/JSystem/JKernel/JKRAramArchive.cpp
View File

@ -1,4 +1,6 @@
#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
#include "JSystem/JKernel/JKRAram/JKRAram.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JKernel/JKRFile/JKRFile.h"
#include "global.h"
extern "C" {
@ -31,6 +33,8 @@ void remove__10JSUPtrListFP10JSUPtrLink(void);
void* memset(void* dest, int ch, u32 count);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
asm JKRAramArchive::JKRAramArchive(long, JKRArchive::EMountDirection) {
nofralloc
#include "JSystem/JKernel/JKRAramArchive/asm/func_802D70C0.s"

2
libs/JSystem/JKernel/JKRAramStream.cpp
View File

@ -1,5 +1,6 @@
#include "JSystem/JKernel/JKRAramStream/JKRAramStream.h"
#include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "global.h"
extern "C" {
s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32);
@ -12,6 +13,7 @@ void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
}
extern char lbl_8039D120[32];
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRAramStream* JKRAramStream::create(long priority) {
if (!sAramStreamObject) {

4
libs/JSystem/JKernel/JKRCompArchive.cpp
View File

@ -1,4 +1,6 @@
#include "JSystem/JKernel/JKRCompArchive/JKRCompArchive.h"
#include "JSystem/JKernel/JKRAram/JKRAram.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "global.h"
extern "C" {
@ -34,6 +36,8 @@ void remove__10JSUPtrListFP10JSUPtrLink(void);
void* memset(void* dest, int ch, u32 count);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
asm JKRCompArchive::JKRCompArchive(long, JKRArchive::EMountDirection) {
nofralloc
#include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"

5
libs/JSystem/JKernel/JKRDvdAramRipper.cpp
View File

@ -1,6 +1,9 @@
#include "JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h"
#include "JSystem/JKernel/JKRAram/JKRAram.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "dvd/dvd.h"
#include "global.h"
extern "C" {
void __ct__10JKRDvdFileFv(void);
void __ct__10JSUPtrLinkFPv(void);
@ -37,6 +40,8 @@ void VIWaitForRetrace(void);
void write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl(void);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
static void decompSZS_subroutine(u8*, u32);
static u8* firstSrcData(void);
static u8* nextSrcData(u8*);

3
libs/JSystem/JKernel/JKRDvdArchive.cpp
View File

@ -1,6 +1,7 @@
#include "JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h"
#include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
#include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "global.h"
extern "C" {
@ -19,6 +20,8 @@ void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRip
void* memset(void* dest, int ch, u32 count);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
: JKRArchive(entryNum, MOUNT_DVD), mMountDirection(mountDirection) {
if (!open(entryNum))

3
libs/JSystem/JKernel/JKRDvdRipper.cpp
View File

@ -1,4 +1,5 @@
#include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "dvd/dvd.h"
#include "global.h"
@ -26,6 +27,8 @@ void orderSync__9JKRDecompFPUcPUcUlUl(void);
void VIWaitForRetrace(void);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
static void decompSZS_subroutine(u8*, u8*);
static u8* firstSrcData(void);
static u8* nextSrcData(u8*);

3
libs/JSystem/JKernel/JKRFileCache.cpp
View File

@ -1,5 +1,6 @@
#include "JSystem/JKernel/JKRFileCache/JKRFileCache.h"
#include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JKernel/JKRFileFinder/JKRFileFinder.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "dvd/dvd.h"
@ -21,6 +22,8 @@ void memcpy(void*, const void*, int);
void remove__10JSUPtrListFP10JSUPtrLink(void);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
if (!path || *path != '/') {
return NULL;

3
libs/JSystem/JKernel/JKRHeap.cpp
View File

@ -1,4 +1,5 @@
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "global.h"
extern "C" {
@ -12,6 +13,8 @@ void JUTException_NS_panic_f(const char* filename, int line, const char* format,
void remove__10JSUPtrListFP10JSUPtrLink(void);
}
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
: JKRDisposer(), mChildTree(this), mDisposerList() {
OSInitMutex(&mMutex);

6
libs/JSystem/JKernel/JKRThread.cpp
View File

@ -1,4 +1,5 @@
#include "JSystem/JKernel/JKRThread/JKRThread.h"
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "global.h"
@ -8,11 +9,11 @@ void __dl__FPv(void);
void __nw__FUlP7JKRHeapi(void);
void becomeCurrentHeap__7JKRHeapFv(void);
void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void func_803626BC(void);
void func_803664DC(void);
void isSubHeap__7JKRHeapCFP7JKRHeap(void);
void JUTConsole_NS_clear(void);
void clear__10JUTConsoleFv(void);
void JUTConsole_NS_print_f(void);
void JUTConsole_NS_print(void);
void JUTWarningConsole(void);
@ -25,6 +26,7 @@ static const u8 lbl_80455FC0[4] = {0x42, 0xc8, 0x0, 0x0};
static const u8 lbl_80455FC4[4] = {0x44, 0x7a, 0x0, 0x0};
// lbl_80455FC8 JKRThread.o @937
static const u8 lbl_80455FC8[8] = {0x43, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
extern JKRExpHeap* sSystemHeap__7JKRHeap;
JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
mSwitchCount = 0;

2
libs/JSystem/JStudio/functionvalue.cpp
View File

@ -1,7 +1,7 @@
#include "JSystem/JStudio/functionvalue.h"
extern "C" {
void func_803620AC(void);
void __cvt_fp2unsigned(void);
}
namespace JStudio {

2
libs/Z2AudioLib/Z2Audience.cpp
View File

@ -16,7 +16,7 @@ extern "C" {
void __dl__FPv(void);
void func_80361C24(void);
void func_80361D60(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
}
extern "C" {

2
libs/Z2AudioLib/Z2EnvSeMgr.cpp
View File

@ -17,7 +17,7 @@ extern "C" {
void __dl__FPv(void);
void isEventBit__11dSv_event_cCFUs(void);
void dComIfGp_getReverb(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void isSwitch__12dSv_memBit_cCFi(void);
void Z2EnvSeMgr_NS_startRainSe(void);
}

2
libs/Z2AudioLib/Z2SeMgr.cpp
View File

@ -14,7 +14,7 @@
extern "C" {
void __dl__FPv(void);
void func_80361D60(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
}
asm Z2SeMgr::Z2SeMgr(void) {

2
src/d/d_a/d_a_alink.cpp
View File

@ -1162,7 +1162,7 @@ void func_80361D60(void);
void func_80361F14(void);
void func_80362018(void);
void func_80362084(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
void getLightDropNum__16dSv_light_drop_cCFUc(void);
void getNeckAimPos__9daAlink_cFP4cXyzPii(void);

2
src/d/d_camera.cpp
View File

@ -308,7 +308,7 @@ void fopCamM_GetParam(void);
void func_80361C24(void);
void func_80361D60(void);
void func_80362084(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void getE3Zhint__9daAlink_cFv(void);
void Inv__7cSAngleCFv(void);
void Invert__7cSGlobeFv(void);

2
src/d/d_com/d_com_inf_game.cpp
View File

@ -232,7 +232,7 @@ void func_80030E84(void);
void func_80030ECC(void);
void func_80361C24(void);
void func_80361D60(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void func_803664DC(void);
void getBottleNum__24dSv_player_item_record_cCFUc(void);
void getItem__17dSv_player_item_cCFib(void);

2
src/d/d_kankyo.cpp
View File

@ -95,7 +95,7 @@ void DUNGEON_LIGHT_NS_dtor(void);
void DUNGEON_LIGHT(void);
void func_80361C24(void);
void func_80361D60(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void GB_MAPLE_COL_CHANGE(void);
void GFSetFog(void);
void GXInitLightAttn(void);

2
src/d/d_meter2/d_meter2_info.cpp
View File

@ -42,7 +42,7 @@ void dMsgFlow_c_NS_init(void);
void dMsgFlow_c(void);
void dMsgObject_c_NS_setLetterNameID(void);
void func_80361C24(void);
void func_803620AC(void);
void __cvt_fp2unsigned(void);
void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void);
void getItem__17dSv_player_item_cCFib(void);
void isEventBit__11dSv_event_cCFUs(void);

9
src/m_Do/m_Do_machine.cpp
View File

@ -1,5 +1,7 @@
/* m_Do_machine.cpp autogenerated by split.py v0.4 at 2021-01-31 21:09:47.100423 */
#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
#include "JSystem/JUtility/JUTConsole/JUTConsole.h"
#include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
@ -11,11 +13,11 @@ void JFWSystem_NS_init(void);
void JUTAssertion_NS_setVisible(void);
void JUTConsoleManager_NS_drawDirect(void);
void JUTConsoleManager_NS_setDirectConsole(void);
void JUTConsole_NS_getLineOffset(void);
void getLineOffset__10JUTConsoleCFv(void);
void JUTConsole_NS_getUsedLine(void);
void JUTConsole_NS_print(void);
void JUTConsole_NS_print_f(void);
void JUTConsole_NS_scroll(void);
void scroll__10JUTConsoleFi(void);
void JUTDbPrint_NS_start(void);
void JUTException_NS_appendMapFile(void);
void JUTException_NS_isEnablePad(void);
@ -113,13 +115,14 @@ extern u8 lbl_80450C2C;
extern u8 lbl_80450C30;
extern u8 lbl_80450C34;
extern u8 lbl_804511A4;
extern u8 lbl_804511B8;
extern JUTConsole* lbl_804511B8;
extern u8 lbl_804514C8;
extern u8 lbl_80451508;
extern u8 lbl_8045151C;
extern u8 lbl_80451570;
extern u8 lbl_80451B00;
extern u8 lbl_80451B04;
extern JKRExpHeap* sSystemHeap__7JKRHeap;
extern "C" {
// myGetHeapTypeByString__FP7JKRHeap

5
src/m_Do/m_Do_machine_exception.cpp
View File

@ -1,5 +1,6 @@
/* m_Do_machine_exception.cpp autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026493 */
#include "JSystem/JKernel/JKRAram/JKRAram.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
@ -7,7 +8,7 @@
// autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026518
extern "C" {
void DynamicModuleControlBase_NS_dump(void);
void JUTConsole_NS_dumpToTerminal(void);
void dumpToTerminal__10JUTConsoleFUi(void);
void JUTConsole_NS_print(void);
void JUTConsole_print_f_va_(void);
void _restgpr_23(void);
@ -37,7 +38,7 @@ extern u8 lbl_80450C28;
extern u8 lbl_80450C2C;
extern u8 lbl_80450C34;
extern u8 lbl_80450C90;
extern u8 lbl_804511B8;
extern JUTConsole* lbl_804511B8;
extern "C" {
// print_f__FPCce

249
src/m_Do/m_Do_main.cpp
View File

@ -1,4 +1,8 @@
#include "m_Do/m_Do_main/m_Do_main.h"
#include "JSystem/JKernel/JKRAram/JKRAram.h"
#include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
#include "JSystem/JUtility/JUTAssert/JUTAssert.h"
#include "JSystem/JUtility/JUTReport/JUTReport.h"
#include "SComponent/c_API_controller_pad.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "dvd/dvd.h"
@ -11,16 +15,25 @@
#include "m_Do/m_Do_machine/m_Do_machine.h"
#include "m_Do/m_Do_reset/m_Do_reset.h"
extern u8 lbl_80451A00;
extern u8 lbl_80451A04;
extern u8 lbl_80451A08;
extern float lbl_80451A00;
extern float lbl_80451A04;
extern float lbl_80451A08;
extern u8 lbl_80451A0C;
extern u8 lbl_80451A10;
extern u8 lbl_80451A18;
extern u8 lbl_803D0000;
// extern char lbl_803739A0[0x310];
extern float lbl_80450B2C;
extern float lbl_80450B1C;
extern JKRExpHeap* sSystemHeap__7JKRHeap;
extern JKRExpHeap* lbl_80450C2C;
extern JKRExpHeap* lbl_80450C28;
extern JKRExpHeap* lbl_80450C34;
extern s8 lbl_80450B20;
extern s8 lbl_80450B28;
extern float lbl_80450B24;
extern s8 lbl_80450B30;
extern char lbl_803739A0;
extern char lbl_803739A0[0x310];
extern "C" {
int strcmp(const char*, const char*);
void cDyl_InitAsync(void);
@ -42,13 +55,8 @@ void getTotalFreeSize__7JKRHeapCFv(void);
void getTotalUsedSize__10JKRExpHeapCFv(void);
void getUsedCount__9HeapCheckCFv(void);
void heapDisplay__9HeapCheckCFv(void);
void JUTAssertion_NS_setMessageCount(void);
void JUTConsole_NS_clear(void);
void JUTConsole_NS_dumpToTerminal(void);
void JUTConsole_NS_getLineOffset(void);
void JUTConsole_NS_scroll(void);
void JUTReport__FiiPCce(int, int, const char*, ...);
void JUTReport_X1_(void);
void JUTReport__FiiiPCce(void);
void mDoDvdThd_callback_c_NS_create(void);
void mDoMch_HeapCheckAll(void);
void mDoMemCd_Ctrl_c_NS_update(void);
@ -57,8 +65,16 @@ void read__8mDoCPd_cFv(void);
void version_check__Fv(void);
void main01__Fv(void);
void ct__13dComIfG_inf_cFv(void);
int getLineOffset__10JUTConsoleCFv(void);
void dumpToTerminal__10JUTConsoleFUi(void);
void scroll__10JUTConsoleFi(void);
void clear__10JUTConsoleFv(void);
void setMessageCount__12JUTAssertionFi(void);
}
extern char* lbl_803A2F14[5];
extern char* lbl_803A2F28[5];
void version_check(void) {
if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) {
return;
@ -140,22 +156,22 @@ void HeapCheck::heapDisplay(void) const {
s32 heap_total_free_size = heap->getTotalFreeSize();
s32 heap_free_size = heap->getFreeSize();
JUTReport__FiiPCce(0x64, 0xd4, "[%sName]", names[0]);
JUTReport__FiiPCce(0x64, 0xe3, "HeapSize %8ld", heap_size1);
JUTReport__FiiPCce(0x64, 0xf0, "TargetHeapSize %8ld", heap_size);
JUTReport__FiiPCce(0x64, 0xfd, "TotalFree %8ld", heap_total_free_size - heap_size2);
JUTReport__FiiPCce(0x64, 0x10a, "FreeSize %8ld", heap_free_size - heap_size2);
JUTReport__FiiPCce(0x64, 0x117, "TotalUsedSize %8ld", heap_total_used_size);
JUTReport__FiiPCce(0x64, 0x124, "TotalUsedRate %3ld%%",
(int)(heap_total_used_size * 0x64) / (int)heap_size);
JUTReport__FiiPCce(0x64, 0x131, "MaxTotalUsedSize %8ld", max_total_used_size);
JUTReport__FiiPCce(0x64, 0x13e, "MaxTotalUsedRate %3ld%%",
(max_total_used_size * 0x64) / (int)heap_size);
JUTReport__FiiPCce(0x64, 0x14b, "MinFreeSize %8ld", max_total_free_size - heap_size2);
JUTReport__FiiPCce(0x64, 0x158, "MinFreeRate %3ld%%",
((max_total_free_size - heap_size2) * 0x64) / (int)heap_size);
JUTReport(0x64, 0xd4, "[%sName]", names[0]);
JUTReport(0x64, 0xe3, "HeapSize %8ld", heap_size1);
JUTReport(0x64, 0xf0, "TargetHeapSize %8ld", heap_size);
JUTReport(0x64, 0xfd, "TotalFree %8ld", heap_total_free_size - heap_size2);
JUTReport(0x64, 0x10a, "FreeSize %8ld", heap_free_size - heap_size2);
JUTReport(0x64, 0x117, "TotalUsedSize %8ld", heap_total_used_size);
JUTReport(0x64, 0x124, "TotalUsedRate %3ld%%",
(int)(heap_total_used_size * 0x64) / (int)heap_size);
JUTReport(0x64, 0x131, "MaxTotalUsedSize %8ld", max_total_used_size);
JUTReport(0x64, 0x13e, "MaxTotalUsedRate %3ld%%",
(max_total_used_size * 0x64) / (int)heap_size);
JUTReport(0x64, 0x14b, "MinFreeSize %8ld", max_total_free_size - heap_size2);
JUTReport(0x64, 0x158, "MinFreeRate %3ld%%",
((max_total_free_size - heap_size2) * 0x64) / (int)heap_size);
heap_size2 = countUsed(heap);
JUTReport__FiiPCce(0x64, 0x165, "UsedCount %3ld%", heap_size2);
JUTReport(0x64, 0x165, "UsedCount %3ld%", heap_size2);
}
const char* lbl_80373AEF = "";
@ -178,15 +194,194 @@ const char* lbl_80373BB6 = "SCROLL
const char* lbl_80373BD5 = "Press L+R trigger to control console.";
const char* lbl_80373BFB = "Press [Z] trigger to close this window.";
#ifdef NONMATCHING
void debugDisplay(void) {
int tmp1;
int tmp2;
HeapCheck** hct = (HeapCheck**)lbl_803A2EE0;
if (lbl_80450B19 >= 1 && lbl_80450B19 <= 6) {
hct[lbl_80450B19 - 1]->heapDisplay();
}
if (lbl_80450588 == 5) {
JKRAramHeap* heap = sAramObject__7JKRAram->getAramHeap();
if (heap) {
JUTReport(0x1db, 100, lbl_803739A0 + 0x196);
JUTReport(0x1db, 0x72, lbl_803739A0 + 0x1A0, heap->getFreeSize());
JUTReport(0x1db, 0x80, lbl_803739A0 + 0x150);
JUTReport(0x1db, 0x8e, lbl_803739A0 + 0x1A0, heap->getTotalFreeSize());
}
} else {
if (lbl_80450588) {
JUTReport(0x1db, 100, lbl_803739A0 + 0x1A3, lbl_803A2F14[lbl_80450588]);
JUTReport(0x1db, 0x72, lbl_803739A0 + 0x1A3, lbl_803A2F28[lbl_80450588]);
int k = 0;
for (int i = 0; i < 8; i++, k += 0x2c) {
// heap check table stuff
HeapCheck* heap_check;
heap_check = HeapCheckTable[i];
switch (lbl_80450588) {
case 3: {
tmp1 = heap_check->getUsedCount();
tmp2 = heap_check->getHeap()->getTotalUsedSize();
break;
}
case 1: {
tmp1 = heap_check->getHeap()->getTotalFreeSize();
tmp2 = heap_check->getHeap()->getFreeSize();
break;
}
case 2: {
tmp1 = heap_check->getMaxTotalUsedSize();
tmp2 = heap_check->getHeap()->getSize();
break;
}
case 4: {
tmp1 = heap_check->getUsedCount() - heap_check->getUsedCountRef();
tmp2 = heap_check->getHeap()->getTotalUsedSize() -
heap_check->getTotalUsedSizeRef();
break;
}
JUTReport(0x1db, k + 0x96, lbl_80373B46, heap_check->getNames()[0]);
JUTReport(0x1db, k + 0xA4, lbl_80373B4C, tmp1);
JUTReport(0x1db, k + 0xB2, lbl_80373B4C, tmp2);
}
}
}
}
}
#else
asm void debugDisplay(void) {
nofralloc
#include "m_Do\m_Do_main\asm\func_80005AD8.s"
}
#endif
#ifndef NONMATCHING
void Debug_console(u32 controller_no) {
float tmp2;
float tmp3;
int tmp6;
// systemConsole
if (lbl_804511B8) {
if (!lbl_80450B20) {
lbl_80450B1C = lbl_80451A00;
lbl_80450B20 = 1;
}
if (!lbl_80450B28) {
lbl_80450B24 = lbl_80451A04;
lbl_80450B28 = 1;
}
if (!lbl_80450B30) {
lbl_80450B2C = lbl_80451A08;
lbl_80450B30 = 1;
}
u32 tmp5 = m_cpadInfo[controller_no].mPressedButtonFlags;
if ((m_cpadInfo[controller_no].mPressedButtonFlags & 0x10) &&
!(m_cpadInfo[controller_no].mButtonFlags & 0xFFFFFFEF)) {
lbl_804511B8->field_0x68 = !lbl_804511B8->field_0x68;
JUTAssertion::setMessageCount(0);
}
if (lbl_804511B8->field_0x68) {
u32 tmp = m_cpadInfo[controller_no].mButtonFlags;
// if R and L are pressed
if ((tmp & 0x40 && tmp & 0x20) ||
((lbl_80451A08 > m_cpadInfo[controller_no].mTriggerLeft) &&
(lbl_80451A08 > m_cpadInfo[controller_no].mTriggerRight))) {
tmp2 = m_cpadInfo[controller_no].mMainStickPosX;
tmp3 = m_cpadInfo[controller_no].mMainStickPosY;
// if x buttons are pressed, clear the console
if (tmp & 0xC00 && tmp5 & 0x1000) {
lbl_804511B8->clear();
}
u32 tmp = m_cpadInfo[controller_no].mButtonFlags;
if (!(tmp & 0xC00)) {
// subtract console scroll value from stick Y
float tmp4 = lbl_80450B2C;
lbl_80450B2C = tmp4 - tmp3;
if (lbl_80450B2C <= lbl_80451A0C) {
lbl_80451A10 <= lbl_80450B2C ? tmp = 0 : tmp = lbl_80451A0C;
} else {
tmp = (tmp4 - tmp3);
}
if (tmp) {
lbl_80450B2C -= (tmp ^ 0x80000000) - 4503601774854144.00000000;
lbl_804511B8->scroll(tmp);
}
} else {
if (tmp & 0x400) {
lbl_80450B2C += tmp2;
}
if (tmp & 0x800) {
lbl_80450B2C -= tmp3;
}
}
if (tmp5 & 0x100) {
lbl_804511B8->dumpToTerminal(0xFFFFFFFF);
lbl_804511B8->field_0x58 = 3;
}
JUTReport(0x1E, 0x186, 1, lbl_80373B51);
JUTReport(0x1E, 400, 1, lbl_80373B73);
JUTReport(0x1E, 0x19A, 1, lbl_80373B8D);
tmp6 = lbl_804511B8->getLineOffset();
JUTReport(0x1E, 0x1A4, 1, lbl_80373BB6, tmp6, lbl_804511B8->field_0x40,
lbl_804511B8->field_0x44, lbl_804511B8->field_0x58);
}
} else {
if (tmp5 & 4) {
g_HIO.field_0x15 ^= 1;
}
if (tmp5 & 1) {
if (sAramObject__7JKRAram->getAramHeap()) {
sAramObject__7JKRAram->getAramHeap()->dump();
}
DynamicModuleControlBase_NS_dump();
dRes_control_c_NS_dump();
}
if (tmp5 & 2) {
sSystemHeap__7JKRHeap->dump_sort();
}
if (tmp5 & 8) {
lbl_80450C2C->dump_sort();
lbl_80450C28->dump_sort();
lbl_80450C34->dump_sort();
}
JUTReport(0x1E, 0x1B8, 1, lbl_80373BD5);
JUTReport(0x1E, 0x1C2, 1, lbl_80373BFB);
}
lbl_804511B8->field_0x40 = lbl_80450B1C;
lbl_804511B8->field_0x44 = lbl_80450B24;
tmp6 = 1;
}
}
#else
asm void Debug_console(u32) {
nofralloc
#include "m_Do\m_Do_main\asm\func_80005D4C.s"
}
#endif
#ifdef NONMATCHING
void LOAD_COPYDATE(void*) {
@ -239,7 +434,7 @@ void debug(void) {
if (lbl_80450B18) {
if (((m_gamePad[2]->buttons.mButtonFlags & ~0x10) == 0x40) &&
(m_gamePad[2]->buttons.mPressedButtonFlags & 0x10)) {
lbl_80450588[0] < 0x5 ? lbl_80450588[0]++ : lbl_80450588[0] = 0x1;
lbl_80450588 < 0x5 ? lbl_80450588++ : lbl_80450588 = 0x1;
}
debugDisplay();