encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on J2DPrint (#374)

Browse Source
This commit is contained in:
hatal175
2023-07-18 23:25:56 -07:00
committed by GitHub
parent 8a579ec161
commit aae8d823ef
9 changed files with 492 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Progress.md
+4 -4
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 28.946900% | 1041088 | 3596544
.text | 28.956242% | 1041424 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 36.437292% | 1465024 | 4020672
Total | 36.445649% | 1465360 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 36.437292% | 1465024 | 4020672
main.dol | 36.445649% | 1465360 | 4020672
RELs | 33.847533% | 3892576 | 11500324
Total | 34.518403% | 5357600 | 15520996
Total | 34.520568% | 5357936 | 15520996
## RELs
asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s
-73
View File
@@ -1,73 +0,0 @@
lbl_802F59C0:
/* 802F59C0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802F59C4 7C 08 02 A6 */ mflr r0
/* 802F59C8 90 01 00 24 */ stw r0, 0x24(r1)
/* 802F59CC 39 61 00 20 */ addi r11, r1, 0x20
/* 802F59D0 48 06 C8 09 */ bl _savegpr_28
/* 802F59D4 7C 9E 23 78 */ mr r30, r4
/* 802F59D8 7C BF 2B 78 */ mr r31, r5
/* 802F59DC 7C DC 33 78 */ mr r28, r6
/* 802F59E0 83 A4 00 00 */ lwz r29, 0(r4)
/* 802F59E4 88 1D 00 00 */ lbz r0, 0(r29)
/* 802F59E8 2C 00 00 5B */ cmpwi r0, 0x5b
/* 802F59EC 41 82 00 0C */ beq lbl_802F59F8
/* 802F59F0 7F E3 FB 78 */ mr r3, r31
/* 802F59F4 48 00 00 B8 */ b lbl_802F5AAC
lbl_802F59F8:
/* 802F59F8 38 1D 00 01 */ addi r0, r29, 1
/* 802F59FC 90 1E 00 00 */ stw r0, 0(r30)
/* 802F5A00 38 60 00 00 */ li r3, 0
/* 802F5A04 2C 07 00 0A */ cmpwi r7, 0xa
/* 802F5A08 40 82 00 18 */ bne lbl_802F5A20
/* 802F5A0C 80 7E 00 00 */ lwz r3, 0(r30)
/* 802F5A10 38 81 00 08 */ addi r4, r1, 8
/* 802F5A14 7C E5 3B 78 */ mr r5, r7
/* 802F5A18 48 07 31 E9 */ bl strtol
/* 802F5A1C 48 00 00 50 */ b lbl_802F5A6C
lbl_802F5A20:
/* 802F5A20 2C 07 00 10 */ cmpwi r7, 0x10
/* 802F5A24 40 82 00 48 */ bne lbl_802F5A6C
/* 802F5A28 80 7E 00 00 */ lwz r3, 0(r30)
/* 802F5A2C 38 81 00 08 */ addi r4, r1, 8
/* 802F5A30 7C E5 3B 78 */ mr r5, r7
/* 802F5A34 48 07 32 BD */ bl strtoul
/* 802F5A38 80 9E 00 00 */ lwz r4, 0(r30)
/* 802F5A3C 80 01 00 08 */ lwz r0, 8(r1)
/* 802F5A40 7C 04 00 50 */ subf r0, r4, r0
/* 802F5A44 28 00 00 08 */ cmplwi r0, 8
/* 802F5A48 41 82 00 24 */ beq lbl_802F5A6C
/* 802F5A4C 28 00 00 06 */ cmplwi r0, 6
/* 802F5A50 40 82 00 10 */ bne lbl_802F5A60
/* 802F5A54 54 60 40 2E */ slwi r0, r3, 8
/* 802F5A58 60 03 00 FF */ ori r3, r0, 0xff
/* 802F5A5C 48 00 00 10 */ b lbl_802F5A6C
lbl_802F5A60:
/* 802F5A60 93 BE 00 00 */ stw r29, 0(r30)
/* 802F5A64 7F 83 E3 78 */ mr r3, r28
/* 802F5A68 48 00 00 44 */ b lbl_802F5AAC
lbl_802F5A6C:
/* 802F5A6C 80 81 00 08 */ lwz r4, 8(r1)
/* 802F5A70 88 04 00 00 */ lbz r0, 0(r4)
/* 802F5A74 2C 00 00 5D */ cmpwi r0, 0x5d
/* 802F5A78 41 82 00 10 */ beq lbl_802F5A88
/* 802F5A7C 93 BE 00 00 */ stw r29, 0(r30)
/* 802F5A80 7F 83 E3 78 */ mr r3, r28
/* 802F5A84 48 00 00 28 */ b lbl_802F5AAC
lbl_802F5A88:
/* 802F5A88 80 1E 00 00 */ lwz r0, 0(r30)
/* 802F5A8C 7C 00 20 40 */ cmplw r0, r4
/* 802F5A90 40 82 00 14 */ bne lbl_802F5AA4
/* 802F5A94 38 04 00 01 */ addi r0, r4, 1
/* 802F5A98 90 1E 00 00 */ stw r0, 0(r30)
/* 802F5A9C 7F E3 FB 78 */ mr r3, r31
/* 802F5AA0 48 00 00 0C */ b lbl_802F5AAC
lbl_802F5AA4:
/* 802F5AA4 38 04 00 01 */ addi r0, r4, 1
/* 802F5AA8 90 1E 00 00 */ stw r0, 0(r30)
lbl_802F5AAC:
/* 802F5AAC 39 61 00 20 */ addi r11, r1, 0x20
/* 802F5AB0 48 06 C7 75 */ bl _restgpr_28
/* 802F5AB4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802F5AB8 7C 08 03 A6 */ mtlr r0
/* 802F5ABC 38 21 00 20 */ addi r1, r1, 0x20
/* 802F5AC0 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s
-22
View File
@@ -1,22 +0,0 @@
lbl_802DFD58:
/* 802DFD58 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802DFD5C 7C 08 02 A6 */ mflr r0
/* 802DFD60 90 01 00 14 */ stw r0, 0x14(r1)
/* 802DFD64 80 83 00 58 */ lwz r4, 0x58(r3)
/* 802DFD68 28 04 00 00 */ cmplwi r4, 0
/* 802DFD6C 41 82 00 18 */ beq lbl_802DFD84
/* 802DFD70 80 84 00 00 */ lwz r4, 0(r4)
/* 802DFD74 28 04 00 00 */ cmplwi r4, 0
/* 802DFD78 41 82 00 0C */ beq lbl_802DFD84
/* 802DFD7C A0 64 00 0E */ lhz r3, 0xe(r4)
/* 802DFD80 48 00 00 14 */ b lbl_802DFD94
lbl_802DFD84:
/* 802DFD84 81 83 00 00 */ lwz r12, 0(r3)
/* 802DFD88 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 802DFD8C 7D 89 03 A6 */ mtctr r12
/* 802DFD90 4E 80 04 21 */ bctrl
lbl_802DFD94:
/* 802DFD94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802DFD98 7C 08 03 A6 */ mtlr r0
/* 802DFD9C 38 21 00 10 */ addi r1, r1, 0x10
/* 802DFDA0 4E 80 00 20 */ blr
include/JSystem/J2DGraph/J2DPrint.h
+6 -6
View File
@@ -23,12 +23,12 @@ public:
/* 802F4778 */ void print(f32, f32, u8, char const*, ...);
/* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
f32, f32, u8);
/* 802F4B4C */ void parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
/* 802F4B4C */ f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
/* 802F52E8 */ void doCtrlCode(int);
/* 802F5410 */ void doEscapeCode(u8 const**, u8);
/* 802F5410 */ u16 doEscapeCode(u8 const**, u8);
/* 802F594C */ void initchar();
/* 802F59C0 */ void getNumberS32(u8 const**, s32, s32, int);
/* 802F5AC4 */ void getNumberF32(u8 const**, f32, f32, int);
/* 802F59C0 */ s32 getNumberS32(u8 const**, s32, s32, int);
/* 802F5AC4 */ f32 getNumberF32(u8 const**, f32, f32, int);
/* 802F4420 */ virtual ~J2DPrint();
@@ -65,7 +65,7 @@ private:
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ s16 field_0x20;
/* 0x22 */ u8 field_0x22;
/* 0x22 */ bool field_0x22;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
@@ -80,7 +80,7 @@ private:
/* 0x50 */ f32 mFontSizeX;
/* 0x54 */ f32 mFontSizeY;
/* 0x58 */ s16 field_0x58;
/* 0x5A */ u8 field_0x5a;
/* 0x5A */ bool field_0x5a;
}; // Size: 0x5C
f32 J2DPrint_print_alpha_va(J2DPrint*, u8, const char*, va_list);
include/JSystem/JUtility/JUTFont.h
+5 -3
View File
@@ -71,13 +71,13 @@ public:
/* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2);
/* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0;
/* 0x18 */ virtual int getLeading() const = 0;
/* 0x1C */ virtual u16 getAscent() const = 0;
/* 0x20 */ virtual u16 getDescent() const = 0;
/* 0x1C */ virtual s32 getAscent() const = 0;
/* 0x20 */ virtual s32 getDescent() const = 0;
/* 0x24 */ virtual s32 getHeight() const = 0;
/* 0x28 */ virtual s32 getWidth() const = 0;
/* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0;
/* 0x30 */ virtual int getCellWidth() const;
/* 0x34 */ virtual u16 getCellHeight() const;
/* 0x34 */ virtual s32 getCellHeight() const;
/* 0x38 */ virtual u16 getFontType() const = 0;
/* 0x3C */ virtual ResFONT* getResFont() const = 0;
/* 0x40 */ virtual bool isLeadByte(int a1) const = 0;
@@ -112,6 +112,8 @@ public:
}
bool isValid() const { return mValid; }
bool isFixed() const { return mFixed; }
int getFixedWidth() const { return mFixedWidth; }
/* 0x04 */ bool mValid;
/* 0x05 */ bool mFixed;
include/JSystem/JUtility/JUTResFont.h
+3 -3
View File
@@ -21,13 +21,13 @@ public:
/* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor);
/* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool);
/* 802DDFEC */ virtual int getLeading() const;
/* 802DE004 */ virtual u16 getAscent() const;
/* 802DE010 */ virtual u16 getDescent() const;
/* 802DE004 */ virtual s32 getAscent() const;
/* 802DE010 */ virtual s32 getDescent() const;
/* 802DE01C */ virtual s32 getHeight() const;
/* 802DDFF8 */ virtual s32 getWidth() const;
/* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const;
/* 802DFD0C */ virtual int getCellWidth() const;
/* 802DFD58 */ virtual u16 getCellHeight() const;
/* 802DFD58 */ virtual s32 getCellHeight() const;
/* 802DDFE0 */ virtual u16 getFontType() const;
/* 802DDFD8 */ virtual ResFONT* getResFont() const;
/* 802DFDA4 */ virtual bool isLeadByte(int) const;
libs/JSystem/J2DGraph/J2DPrint.cpp
+471 -10
View File
File diff suppressed because it is too large Load Diff
libs/JSystem/JUtility/JUTCacheFont.cpp
+2 -2
View File
@@ -512,7 +512,7 @@ asm s32 JUTResFont::getWidth() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u16 JUTResFont::getAscent() const {
asm s32 JUTResFont::getAscent() const {
nofralloc
#include "asm/JSystem/JUtility/JUTCacheFont/getAscent__10JUTResFontCFv.s"
}
@@ -522,7 +522,7 @@ asm u16 JUTResFont::getAscent() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u16 JUTResFont::getDescent() const {
asm s32 JUTResFont::getDescent() const {
nofralloc
#include "asm/JSystem/JUtility/JUTCacheFont/getDescent__10JUTResFontCFv.s"
}
libs/JSystem/JUtility/JUTResFont.cpp
+1 -13
View File
@@ -429,9 +429,7 @@ int JUTResFont::getCellWidth() const {
}
/* 802DFD58-802DFDA4 2DA698 004C+00 1/0 1/0 0/0 .text getCellHeight__10JUTResFontCFv */
#ifdef NONMATCHING
// casting issue on the return
int JUTResFont::getCellHeight() const {
s32 JUTResFont::getCellHeight() const {
u16 height;
if (mpGlyphBlocks) {
@@ -443,16 +441,6 @@ int JUTResFont::getCellHeight() const {
return getHeight();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u16 JUTResFont::getCellHeight() const {
nofralloc
#include "asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s"
}
#pragma pop
#endif
/* 802DFDA4-802DFDD8 2DA6E4 0034+00 1/0 1/0 0/0 .text isLeadByte__10JUTResFontCFi */
bool JUTResFont::isLeadByte(int param_0) const {