mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-16 21:18:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

JSystem Font classes, SComponent cBgW (#14)

Browse Source 
* c_bg_w.cpp OK

* JUTFont and JUTResFont partially implemented

Co-authored-by: notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
notyourav
2020-12-03 17:58:53 -08:00
committed by GitHub
parent e27ed1c55d
commit 294858f751
35 changed files with 1412 additions and 1527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/d_a_npc.s
+1 -1
View File
@@ -11098,7 +11098,7 @@ lbl_8014F6E4:
/* 8014F728 0014C668 80 7E 0A 14 */ lwz r3, 0xa14(r30)
/* 8014F72C 0014C66C 28 03 00 00 */ cmplwi r3, 0
/* 8014F730 0014C670 41 82 00 24 */ beq lbl_8014F754
/* 8014F734 0014C674 48 11 8A A1 */ bl cBgW_BgId_NS_ChkUsed
/* 8014F734 0014C674 48 11 8A A1 */ bl ChkUsed__9cBgW_BgIdCFv
/* 8014F738 0014C678 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8014F73C 0014C67C 41 82 00 18 */ beq lbl_8014F754
/* 8014F740 0014C680 3C 60 80 40 */ lis r3, lbl_804061C0@ha
asm/d/bg/d_bg_s.s
+8 -8
View File
@@ -45,7 +45,7 @@ cBgS_NS_Regist:
/* 80074170 000710B0 48 00 00 C8 */ b lbl_80074238
lbl_80074174:
/* 80074174 000710B4 7F 83 E3 78 */ mr r3, r28
/* 80074178 000710B8 48 1F 40 5D */ bl cBgW_BgId_NS_ChkUsed
/* 80074178 000710B8 48 1F 40 5D */ bl ChkUsed__9cBgW_BgIdCFv
/* 8007417C 000710BC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80074180 000710C0 41 82 00 0C */ beq lbl_8007418C
/* 80074184 000710C4 38 60 00 01 */ li r3, 1
@@ -78,7 +78,7 @@ lbl_800741B8:
/* 800741E4 00071124 4E 80 04 21 */ bctrl
/* 800741E8 00071128 7F 83 E3 78 */ mr r3, r28
/* 800741EC 0007112C 7F E4 FB 78 */ mr r4, r31
/* 800741F0 00071130 48 1F 3F D1 */ bl cBgW_BgId_NS_Regist
/* 800741F0 00071130 48 1F 3F D1 */ bl Regist__9cBgW_BgIdFi
/* 800741F4 00071134 38 1F 00 01 */ addi r0, r31, 1
/* 800741F8 00071138 90 0D 89 E0 */ stw r0, lbl_80450F60-_SDA_BASE_(r13)
/* 800741FC 0007113C 2C 00 01 00 */ cmpwi r0, 0x100
@@ -97,7 +97,7 @@ lbl_80074224:
/* 80074224 00071164 7C 04 F8 00 */ cmpw r4, r31
/* 80074228 00071168 40 82 FF 90 */ bne lbl_800741B8
/* 8007422C 0007116C 7F 83 E3 78 */ mr r3, r28
/* 80074230 00071170 48 1F 3F 99 */ bl cBgW_BgId_NS_Release
/* 80074230 00071170 48 1F 3F 99 */ bl Release__9cBgW_BgIdFv
/* 80074234 00071174 38 60 00 01 */ li r3, 1
lbl_80074238:
/* 80074238 00071178 39 61 00 20 */ addi r11, r1, 0x20
@@ -122,7 +122,7 @@ cBgS_NS_Release:
lbl_80074278:
/* 80074278 000711B8 A3 FE 00 00 */ lhz r31, 0(r30)
/* 8007427C 000711BC 7F C3 F3 78 */ mr r3, r30
/* 80074280 000711C0 48 1F 3F 55 */ bl cBgW_BgId_NS_ChkUsed
/* 80074280 000711C0 48 1F 3F 55 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80074284 000711C4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80074288 000711C8 41 82 00 38 */ beq lbl_800742C0
/* 8007428C 000711CC 2C 1F 00 00 */ cmpwi r31, 0
@@ -136,7 +136,7 @@ lbl_80074278:
/* 800742AC 000711EC 41 82 00 14 */ beq lbl_800742C0
/* 800742B0 000711F0 4B FF FE 79 */ bl cBgS_ChkElm_NS_Release
/* 800742B4 000711F4 7F C3 F3 78 */ mr r3, r30
/* 800742B8 000711F8 48 1F 3F 11 */ bl cBgW_BgId_NS_Release
/* 800742B8 000711F8 48 1F 3F 11 */ bl Release__9cBgW_BgIdFv
/* 800742BC 000711FC 48 00 00 0C */ b lbl_800742C8
lbl_800742C0:
/* 800742C0 00071200 38 60 00 01 */ li r3, 1
@@ -1992,7 +1992,7 @@ dBgS_NS_RideCallBack:
/* 80075BA4 00072AE4 1F E0 00 14 */ mulli r31, r0, 0x14
/* 80075BA8 00072AE8 7F DC F8 2E */ lwzx r30, r28, r31
/* 80075BAC 00072AEC 7F C3 F3 78 */ mr r3, r30
/* 80075BB0 00072AF0 48 1F 26 25 */ bl cBgW_BgId_NS_ChkUsed
/* 80075BB0 00072AF0 48 1F 26 25 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80075BB4 00072AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075BB8 00072AF8 41 82 00 24 */ beq lbl_80075BDC
/* 80075BBC 00072AFC 7F C3 F3 78 */ mr r3, r30
@@ -2022,7 +2022,7 @@ lbl_80075BDC:
/* 80075C18 00072B58 1F E0 00 14 */ mulli r31, r0, 0x14
/* 80075C1C 00072B5C 7F DB F8 2E */ lwzx r30, r27, r31
/* 80075C20 00072B60 7F C3 F3 78 */ mr r3, r30
/* 80075C24 00072B64 48 1F 25 B1 */ bl cBgW_BgId_NS_ChkUsed
/* 80075C24 00072B64 48 1F 25 B1 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80075C28 00072B68 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075C2C 00072B6C 41 82 00 28 */ beq lbl_80075C54
/* 80075C30 00072B70 7F C3 F3 78 */ mr r3, r30
@@ -2057,7 +2057,7 @@ dBgS_NS_PushPullCallBack:
/* 80075C94 00072BD4 1F E0 00 14 */ mulli r31, r0, 0x14
/* 80075C98 00072BD8 7F DA F8 2E */ lwzx r30, r26, r31
/* 80075C9C 00072BDC 7F C3 F3 78 */ mr r3, r30
/* 80075CA0 00072BE0 48 1F 25 35 */ bl cBgW_BgId_NS_ChkUsed
/* 80075CA0 00072BE0 48 1F 25 35 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80075CA4 00072BE4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075CA8 00072BE8 40 82 00 0C */ bne lbl_80075CB4
/* 80075CAC 00072BEC 38 60 00 00 */ li r3, 0
asm/d/bg/s/movebg/d_bg_s_movebg_actor.s
+1 -1
View File
@@ -209,7 +209,7 @@ lbl_800788C4:
/* 80078908 00075848 80 7E 05 68 */ lwz r3, 0x568(r30)
/* 8007890C 0007584C 28 03 00 00 */ cmplwi r3, 0
/* 80078910 00075850 41 82 00 24 */ beq lbl_80078934
/* 80078914 00075854 48 1E F8 C1 */ bl cBgW_BgId_NS_ChkUsed
/* 80078914 00075854 48 1E F8 C1 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80078918 00075858 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007891C 0007585C 41 82 00 18 */ beq lbl_80078934
/* 80078920 00075860 3C 60 80 40 */ lis r3, lbl_804061C0@ha
asm/d/error/d_error_msg.s
+2 -2
View File
@@ -85,7 +85,7 @@ messageSet:
/* 8009CCBC 00099BFC 3C 80 80 38 */ lis r4, lbl_8037B3E0@ha
/* 8009CCC0 00099C00 38 84 B3 E0 */ addi r4, r4, lbl_8037B3E0@l
/* 8009CCC4 00099C04 38 A0 00 00 */ li r5, 0
/* 8009CCC8 00099C08 48 24 22 CD */ bl JUTResFont_X1_
/* 8009CCC8 00099C08 48 24 22 CD */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 8009CCCC 00099C0C 3B C1 00 D4 */ addi r30, r1, 0xd4
/* 8009CCD0 00099C10 38 80 00 C8 */ li r4, 0xc8
/* 8009CCD4 00099C14 98 81 00 60 */ stb r4, 0x60(r1)
@@ -392,7 +392,7 @@ lbl_8009D100:
/* 8009D138 0009A078 48 26 33 59 */ bl J2DTextBox_NS_draw_X1_
/* 8009D13C 0009A07C 38 61 00 D4 */ addi r3, r1, 0xd4
/* 8009D140 0009A080 38 80 FF FF */ li r4, -1
/* 8009D144 0009A084 48 24 1E BD */ bl JUTResFont_NS_dtor
/* 8009D144 0009A084 48 24 1E BD */ bl __dt__10JUTResFontFv
/* 8009D148 0009A088 38 61 01 48 */ addi r3, r1, 0x148
/* 8009D14C 0009A08C 38 80 FF FF */ li r4, -1
/* 8009D150 0009A090 48 25 FE A1 */ bl J2DPicture_NS_dtor