mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -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/J2DGraph/J2DMatBlock.s
+5 -5
View File
@@ -986,7 +986,7 @@ lbl_802EC14C:
/* 802EC158 002E9098 41 82 00 14 */ beq lbl_802EC16C
/* 802EC15C 002E909C 7F C4 F3 78 */ mr r4, r30
/* 802EC160 002E90A0 38 A0 00 00 */ li r5, 0
/* 802EC164 002E90A4 4B FF 2E 31 */ bl JUTResFont_X1_
/* 802EC164 002E90A4 4B FF 2E 31 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802EC168 002E90A8 7C 7F 1B 78 */ mr r31, r3
lbl_802EC16C:
/* 802EC16C 002E90AC 28 1F 00 00 */ cmplwi r31, 0
@@ -2232,7 +2232,7 @@ lbl_802ED318:
/* 802ED324 002EA264 41 82 00 14 */ beq lbl_802ED338
/* 802ED328 002EA268 7F C4 F3 78 */ mr r4, r30
/* 802ED32C 002EA26C 38 A0 00 00 */ li r5, 0
/* 802ED330 002EA270 4B FF 1C 65 */ bl JUTResFont_X1_
/* 802ED330 002EA270 4B FF 1C 65 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802ED334 002EA274 7C 7F 1B 78 */ mr r31, r3
lbl_802ED338:
/* 802ED338 002EA278 28 1F 00 00 */ cmplwi r31, 0
@@ -3693,7 +3693,7 @@ lbl_802EE7C0:
/* 802EE7CC 002EB70C 41 82 00 14 */ beq lbl_802EE7E0
/* 802EE7D0 002EB710 7F C4 F3 78 */ mr r4, r30
/* 802EE7D4 002EB714 38 A0 00 00 */ li r5, 0
/* 802EE7D8 002EB718 4B FF 07 BD */ bl JUTResFont_X1_
/* 802EE7D8 002EB718 4B FF 07 BD */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802EE7DC 002EB71C 7C 7F 1B 78 */ mr r31, r3
lbl_802EE7E0:
/* 802EE7E0 002EB720 28 1F 00 00 */ cmplwi r31, 0
@@ -5154,7 +5154,7 @@ lbl_802EFC68:
/* 802EFC74 002ECBB4 41 82 00 14 */ beq lbl_802EFC88
/* 802EFC78 002ECBB8 7F C4 F3 78 */ mr r4, r30
/* 802EFC7C 002ECBBC 38 A0 00 00 */ li r5, 0
/* 802EFC80 002ECBC0 4B FE F3 15 */ bl JUTResFont_X1_
/* 802EFC80 002ECBC0 4B FE F3 15 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802EFC84 002ECBC4 7C 7F 1B 78 */ mr r31, r3
lbl_802EFC88:
/* 802EFC88 002ECBC8 28 1F 00 00 */ cmplwi r31, 0
@@ -6604,7 +6604,7 @@ lbl_802F10E8:
/* 802F10F4 002EE034 41 82 00 14 */ beq lbl_802F1108
/* 802F10F8 002EE038 7F C4 F3 78 */ mr r4, r30
/* 802F10FC 002EE03C 38 A0 00 00 */ li r5, 0
/* 802F1100 002EE040 4B FE DE 95 */ bl JUTResFont_X1_
/* 802F1100 002EE040 4B FE DE 95 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802F1104 002EE044 7C 7F 1B 78 */ mr r31, r3
lbl_802F1108:
/* 802F1108 002EE048 28 1F 00 00 */ cmplwi r31, 0
asm/J2DGraph/J2DPrint.s
+4 -4
View File
@@ -673,7 +673,7 @@ lbl_802F4C6C:
/* 802F4C7C 002F1BBC 80 74 00 04 */ lwz r3, 4(r20)
/* 802F4C80 002F1BC0 38 81 00 14 */ addi r4, r1, 0x14
/* 802F4C84 002F1BC4 38 A1 00 10 */ addi r5, r1, 0x10
/* 802F4C88 002F1BC8 4B FE A1 3D */ bl JUTFont_NS_setGradColor
/* 802F4C88 002F1BC8 4B FE A1 3D */ bl setGradColor__7JUTFontF6TColor6TColor
lbl_802F4C8C:
/* 802F4C8C 002F1BCC 3B 80 00 00 */ li r28, 0
/* 802F4C90 002F1BD0 80 74 00 04 */ lwz r3, 4(r20)
@@ -1415,7 +1415,7 @@ lbl_802F571C:
/* 802F572C 002F266C 80 7A 00 04 */ lwz r3, 4(r26)
/* 802F5730 002F2670 38 81 00 20 */ addi r4, r1, 0x20
/* 802F5734 002F2674 38 A1 00 1C */ addi r5, r1, 0x1c
/* 802F5738 002F2678 4B FE 96 8D */ bl JUTFont_NS_setGradColor
/* 802F5738 002F2678 4B FE 96 8D */ bl setGradColor__7JUTFontF6TColor6TColor
/* 802F573C 002F267C 48 00 01 F4 */ b lbl_802F5930
lbl_802F5740:
/* 802F5740 002F2680 7F 43 D3 78 */ mr r3, r26
@@ -1463,7 +1463,7 @@ lbl_802F57D4:
/* 802F57E4 002F2724 80 7A 00 04 */ lwz r3, 4(r26)
/* 802F57E8 002F2728 38 81 00 14 */ addi r4, r1, 0x14
/* 802F57EC 002F272C 38 A1 00 10 */ addi r5, r1, 0x10
/* 802F57F0 002F2730 4B FE 95 D5 */ bl JUTFont_NS_setGradColor
/* 802F57F0 002F2730 4B FE 95 D5 */ bl setGradColor__7JUTFontF6TColor6TColor
/* 802F57F4 002F2734 48 00 01 3C */ b lbl_802F5930
lbl_802F57F8:
/* 802F57F8 002F2738 7F 43 D3 78 */ mr r3, r26
@@ -1545,7 +1545,7 @@ lbl_802F5904:
/* 802F5914 002F2854 80 7A 00 04 */ lwz r3, 4(r26)
/* 802F5918 002F2858 38 81 00 0C */ addi r4, r1, 0xc
/* 802F591C 002F285C 38 A1 00 08 */ addi r5, r1, 8
/* 802F5920 002F2860 4B FE 94 A5 */ bl JUTFont_NS_setGradColor
/* 802F5920 002F2860 4B FE 94 A5 */ bl setGradColor__7JUTFontF6TColor6TColor
/* 802F5924 002F2864 48 00 00 0C */ b lbl_802F5930
lbl_802F5928:
/* 802F5928 002F2868 93 FB 00 00 */ stw r31, 0(r27)
asm/J2DGraph/J2DTextBox.s
+2 -2
View File
@@ -424,7 +424,7 @@ J2DTextBox_NS_initiate:
/* 802FFC94 002FCBD4 41 82 00 14 */ beq lbl_802FFCA8
/* 802FFC98 002FCBD8 7F 44 D3 78 */ mr r4, r26
/* 802FFC9C 002FCBDC 38 A0 00 00 */ li r5, 0
/* 802FFCA0 002FCBE0 4B FD F2 F5 */ bl JUTResFont_X1_
/* 802FFCA0 002FCBE0 4B FD F2 F5 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802FFCA4 002FCBE4 7C 60 1B 78 */ mr r0, r3
lbl_802FFCA8:
/* 802FFCA8 002FCBE8 90 1B 01 00 */ stw r0, 0x100(r27)
@@ -600,7 +600,7 @@ J2DTextBox_NS_private_readStream:
/* 802FFF2C 002FCE6C 41 82 00 14 */ beq lbl_802FFF40
/* 802FFF30 002FCE70 7F 64 DB 78 */ mr r4, r27
/* 802FFF34 002FCE74 38 A0 00 00 */ li r5, 0
/* 802FFF38 002FCE78 4B FD F0 5D */ bl JUTResFont_X1_
/* 802FFF38 002FCE78 4B FD F0 5D */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 802FFF3C 002FCE7C 7C 60 1B 78 */ mr r0, r3
lbl_802FFF40:
/* 802FFF40 002FCE80 90 1C 01 00 */ stw r0, 0x100(r28)
asm/JFramework/JFWSystem.s
+1 -1
View File
@@ -80,7 +80,7 @@ lbl_80271DB4:
/* 80271DD8 0026ED18 41 82 00 14 */ beq lbl_80271DEC
/* 80271DDC 0026ED1C 80 8D 82 10 */ lwz r4, lbl_80450790-_SDA_BASE_(r13)
/* 80271DE0 0026ED20 38 A0 00 00 */ li r5, 0
/* 80271DE4 0026ED24 48 06 D1 B1 */ bl JUTResFont_X1_
/* 80271DE4 0026ED24 48 06 D1 B1 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 80271DE8 0026ED28 7C 60 1B 78 */ mr r0, r3
lbl_80271DEC:
/* 80271DEC 0026ED2C 90 0D 8C 30 */ stw r0, lbl_804511B0-_SDA_BASE_(r13)
asm/JUtility/JUTAssert.s
+3 -3
View File
@@ -116,7 +116,7 @@ JUTAssertion_NS_flushMessage_dbPrint:
/* 802E4ADC 002E1A1C 90 01 00 0C */ stw r0, 0xc(r1)
/* 802E4AE0 002E1A20 7F E3 FB 78 */ mr r3, r31
/* 802E4AE4 002E1A24 38 81 00 0C */ addi r4, r1, 0xc
/* 802E4AE8 002E1A28 4B FF A2 89 */ bl JUTFont_NS_setCharColor
/* 802E4AE8 002E1A28 4B FF A2 89 */ bl setCharColor__7JUTFontF6TColor
/* 802E4AEC 002E1A2C 3C 60 80 43 */ lis r3, lbl_80434870@ha
/* 802E4AF0 002E1A30 38 63 48 70 */ addi r3, r3, lbl_80434870@l
/* 802E4AF4 002E1A34 48 08 40 F1 */ bl func_80368BE4
@@ -153,7 +153,7 @@ JUTAssertion_NS_flushMessage_dbPrint:
/* 802E4B70 002E1AB0 38 84 48 70 */ addi r4, r4, lbl_80434870@l
/* 802E4B74 002E1AB4 7F C5 F3 78 */ mr r5, r30
/* 802E4B78 002E1AB8 38 C0 00 01 */ li r6, 1
/* 802E4B7C 002E1ABC 4B FF A2 AD */ bl JUTFont_NS_drawString_size_scale
/* 802E4B7C 002E1ABC 4B FF A2 AD */ bl drawString_size_scale__7JUTFontFffffPcUlb
/* 802E4B80 002E1AC0 3C 60 80 43 */ lis r3, lbl_804348B0@ha
/* 802E4B84 002E1AC4 38 63 48 B0 */ addi r3, r3, lbl_804348B0@l
/* 802E4B88 002E1AC8 48 08 40 5D */ bl func_80368BE4
@@ -190,7 +190,7 @@ JUTAssertion_NS_flushMessage_dbPrint:
/* 802E4C04 002E1B44 38 84 48 B0 */ addi r4, r4, lbl_804348B0@l
/* 802E4C08 002E1B48 7F C5 F3 78 */ mr r5, r30
/* 802E4C0C 002E1B4C 38 C0 00 01 */ li r6, 1
/* 802E4C10 002E1B50 4B FF A2 19 */ bl JUTFont_NS_drawString_size_scale
/* 802E4C10 002E1B50 4B FF A2 19 */ bl drawString_size_scale__7JUTFontFffffPcUlb
lbl_802E4C14:
/* 802E4C14 002E1B54 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0
/* 802E4C18 002E1B58 CB E1 00 40 */ lfd f31, 0x40(r1)
asm/JUtility/JUTCacheFont.s
+12 -12
View File
@@ -14,16 +14,16 @@ JUTCacheFont:
/* 802DD1A0 002DA0E0 7C 9D 23 78 */ mr r29, r4
/* 802DD1A4 002DA0E4 7C BE 2B 78 */ mr r30, r5
/* 802DD1A8 002DA0E8 7C DF 33 78 */ mr r31, r6
/* 802DD1AC 002DA0EC 48 00 1D 9D */ bl JUTResFont
/* 802DD1AC 002DA0EC 48 00 1D 9D */ bl __ct__10JUTResFontFv
/* 802DD1B0 002DA0F0 3C 60 80 3D */ lis r3, lbl_803CC540@ha
/* 802DD1B4 002DA0F4 38 03 C5 40 */ addi r0, r3, lbl_803CC540@l
/* 802DD1B8 002DA0F8 90 1C 00 00 */ stw r0, 0(r28)
/* 802DD1BC 002DA0FC 7F 83 E3 78 */ mr r3, r28
/* 802DD1C0 002DA100 48 00 01 61 */ bl JUTCacheFont_NS_initialize_state
/* 802DD1C4 002DA104 7F 83 E3 78 */ mr r3, r28
/* 802DD1C8 002DA108 48 00 1E E9 */ bl JUTResFont_NS_initialize_state
/* 802DD1C8 002DA108 48 00 1E E9 */ bl initialize_state__10JUTResFontFv
/* 802DD1CC 002DA10C 7F 83 E3 78 */ mr r3, r28
/* 802DD1D0 002DA110 48 00 1B 55 */ bl JUTFont_NS_initialize_state
/* 802DD1D0 002DA110 48 00 1B 55 */ bl initialize_state__7JUTFontFv
/* 802DD1D4 002DA114 7F 83 E3 78 */ mr r3, r28
/* 802DD1D8 002DA118 7F A4 EB 78 */ mr r4, r29
/* 802DD1DC 002DA11C 38 A0 00 00 */ li r5, 0
@@ -55,15 +55,15 @@ JUTCacheFont:
/* 802DD244 002DA184 7F C3 F3 78 */ mr r3, r30
/* 802DD248 002DA188 48 00 00 D9 */ bl JUTCacheFont_NS_initialize_state
/* 802DD24C 002DA18C 7F C3 F3 78 */ mr r3, r30
/* 802DD250 002DA190 48 00 1E 3D */ bl JUTResFont_NS_deleteMemBlocks_ResFont
/* 802DD250 002DA190 48 00 1E 3D */ bl deleteMemBlocks_ResFont__10JUTResFontFv
/* 802DD254 002DA194 7F C3 F3 78 */ mr r3, r30
/* 802DD258 002DA198 48 00 1E 59 */ bl JUTResFont_NS_initialize_state
/* 802DD258 002DA198 48 00 1E 59 */ bl initialize_state__10JUTResFontFv
/* 802DD25C 002DA19C 7F C3 F3 78 */ mr r3, r30
/* 802DD260 002DA1A0 48 00 1A C5 */ bl JUTFont_NS_initialize_state
/* 802DD260 002DA1A0 48 00 1A C5 */ bl initialize_state__7JUTFontFv
lbl_802DD264:
/* 802DD264 002DA1A4 7F C3 F3 78 */ mr r3, r30
/* 802DD268 002DA1A8 38 80 00 00 */ li r4, 0
/* 802DD26C 002DA1AC 48 00 1D 95 */ bl JUTResFont_NS_dtor
/* 802DD26C 002DA1AC 48 00 1D 95 */ bl __dt__10JUTResFontFv
/* 802DD270 002DA1B0 7F E0 07 35 */ extsh. r0, r31
/* 802DD274 002DA1B4 40 81 00 0C */ ble lbl_802DD280
/* 802DD278 002DA1B8 7F C3 F3 78 */ mr r3, r30
@@ -266,9 +266,9 @@ JUTCacheFont_NS_initiate:
/* 802DD50C 002DA44C 7F E3 FB 78 */ mr r3, r31
/* 802DD510 002DA450 4B FF FD 8D */ bl JUTCacheFont_NS_deleteMemBlocks_CacheFont
/* 802DD514 002DA454 7F E3 FB 78 */ mr r3, r31
/* 802DD518 002DA458 48 00 1B 75 */ bl JUTResFont_NS_deleteMemBlocks_ResFont
/* 802DD518 002DA458 48 00 1B 75 */ bl deleteMemBlocks_ResFont__10JUTResFontFv
/* 802DD51C 002DA45C 7F E3 FB 78 */ mr r3, r31
/* 802DD520 002DA460 48 00 18 05 */ bl JUTFont_NS_initialize_state
/* 802DD520 002DA460 48 00 18 05 */ bl initialize_state__7JUTFontFv
/* 802DD524 002DA464 38 00 00 00 */ li r0, 0
/* 802DD528 002DA468 98 1F 00 04 */ stb r0, 4(r31)
/* 802DD52C 002DA46C 38 60 00 00 */ li r3, 0
@@ -298,11 +298,11 @@ JUTCacheFont_NS_internal_initiate:
/* 802DD578 002DA4B8 7F 63 DB 78 */ mr r3, r27
/* 802DD57C 002DA4BC 4B FF FD A5 */ bl JUTCacheFont_NS_initialize_state
/* 802DD580 002DA4C0 7F 63 DB 78 */ mr r3, r27
/* 802DD584 002DA4C4 48 00 1B 09 */ bl JUTResFont_NS_deleteMemBlocks_ResFont
/* 802DD584 002DA4C4 48 00 1B 09 */ bl deleteMemBlocks_ResFont__10JUTResFontFv
/* 802DD588 002DA4C8 7F 63 DB 78 */ mr r3, r27
/* 802DD58C 002DA4CC 48 00 1B 25 */ bl JUTResFont_NS_initialize_state
/* 802DD58C 002DA4CC 48 00 1B 25 */ bl initialize_state__10JUTResFontFv
/* 802DD590 002DA4D0 7F 63 DB 78 */ mr r3, r27
/* 802DD594 002DA4D4 48 00 17 91 */ bl JUTFont_NS_initialize_state
/* 802DD594 002DA4D4 48 00 17 91 */ bl initialize_state__7JUTFontFv
/* 802DD598 002DA4D8 28 1C 00 00 */ cmplwi r28, 0
/* 802DD59C 002DA4DC 40 82 00 0C */ bne lbl_802DD5A8
/* 802DD5A0 002DA4E0 38 60 00 00 */ li r3, 0
asm/JUtility/JUTConsole.s
+5 -5
View File
@@ -399,7 +399,7 @@ lbl_802E78D0:
/* 802E78F4 002E4834 90 01 00 2C */ stw r0, 0x2c(r1)
/* 802E78F8 002E4838 80 79 00 4C */ lwz r3, 0x4c(r25)
/* 802E78FC 002E483C 38 81 00 2C */ addi r4, r1, 0x2c
/* 802E7900 002E4840 4B FF 74 71 */ bl JUTFont_NS_setCharColor
/* 802E7900 002E4840 4B FF 74 71 */ bl setCharColor__7JUTFontF6TColor
/* 802E7904 002E4844 48 00 01 18 */ b lbl_802E7A1C
lbl_802E7908:
/* 802E7908 002E4848 80 19 00 34 */ lwz r0, 0x34(r25)
@@ -415,7 +415,7 @@ lbl_802E7908:
/* 802E7930 002E4870 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E7934 002E4874 80 79 00 4C */ lwz r3, 0x4c(r25)
/* 802E7938 002E4878 38 81 00 24 */ addi r4, r1, 0x24
/* 802E793C 002E487C 4B FF 74 35 */ bl JUTFont_NS_setCharColor
/* 802E793C 002E487C 4B FF 74 35 */ bl setCharColor__7JUTFontF6TColor
/* 802E7940 002E4880 48 00 00 DC */ b lbl_802E7A1C
lbl_802E7944:
/* 802E7944 002E4884 38 00 00 E6 */ li r0, 0xe6
@@ -428,7 +428,7 @@ lbl_802E7944:
/* 802E7960 002E48A0 90 01 00 1C */ stw r0, 0x1c(r1)
/* 802E7964 002E48A4 80 79 00 4C */ lwz r3, 0x4c(r25)
/* 802E7968 002E48A8 38 81 00 1C */ addi r4, r1, 0x1c
/* 802E796C 002E48AC 4B FF 74 05 */ bl JUTFont_NS_setCharColor
/* 802E796C 002E48AC 4B FF 74 05 */ bl setCharColor__7JUTFontF6TColor
/* 802E7970 002E48B0 48 00 00 AC */ b lbl_802E7A1C
lbl_802E7974:
/* 802E7974 002E48B4 38 00 00 E6 */ li r0, 0xe6
@@ -441,7 +441,7 @@ lbl_802E7974:
/* 802E7990 002E48D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802E7994 002E48D4 80 79 00 4C */ lwz r3, 0x4c(r25)
/* 802E7998 002E48D8 38 81 00 14 */ addi r4, r1, 0x14
/* 802E799C 002E48DC 4B FF 73 D5 */ bl JUTFont_NS_setCharColor
/* 802E799C 002E48DC 4B FF 73 D5 */ bl setCharColor__7JUTFontF6TColor
/* 802E79A0 002E48E0 48 00 00 7C */ b lbl_802E7A1C
lbl_802E79A4:
/* 802E79A4 002E48E4 80 6D 8F A8 */ lwz r3, lbl_80451528-_SDA_BASE_(r13)
@@ -527,7 +527,7 @@ lbl_802E7A40:
/* 802E7ADC 002E4A1C FC 80 D8 90 */ fmr f4, f27
/* 802E7AE0 002E4A20 7F A4 EB 78 */ mr r4, r29
/* 802E7AE4 002E4A24 38 C0 00 01 */ li r6, 1
/* 802E7AE8 002E4A28 4B FF 73 41 */ bl JUTFont_NS_drawString_size_scale
/* 802E7AE8 002E4A28 4B FF 73 41 */ bl drawString_size_scale__7JUTFontFffffPcUlb
/* 802E7AEC 002E4A2C 48 00 00 60 */ b lbl_802E7B4C
lbl_802E7AF0:
/* 802E7AF0 002E4A30 80 6D 8F A8 */ lwz r3, lbl_80451528-_SDA_BASE_(r13)
asm/JUtility/JUTDbPrint.s
+2 -2
View File
@@ -178,7 +178,7 @@ JUTDbPrint_NS_flush_X1_:
/* 802E0398 002DD2D8 90 01 00 08 */ stw r0, 8(r1)
/* 802E039C 002DD2DC 80 7C 00 04 */ lwz r3, 4(r28)
/* 802E03A0 002DD2E0 38 81 00 08 */ addi r4, r1, 8
/* 802E03A4 002DD2E4 4B FF E9 CD */ bl JUTFont_NS_setCharColor
/* 802E03A4 002DD2E4 4B FF E9 CD */ bl setCharColor__7JUTFontF6TColor
/* 802E03A8 002DD2E8 48 00 00 60 */ b lbl_802E0408
lbl_802E03AC:
/* 802E03AC 002DD2EC 88 1C 00 0C */ lbz r0, 0xc(r28)
@@ -276,7 +276,7 @@ JUTDbPrint_NS_drawString:
/* 802E0500 002DD440 7F C4 F3 78 */ mr r4, r30
/* 802E0504 002DD444 7F A5 EB 78 */ mr r5, r29
/* 802E0508 002DD448 38 C0 00 01 */ li r6, 1
/* 802E050C 002DD44C 4B FF E9 1D */ bl JUTFont_NS_drawString_size_scale
/* 802E050C 002DD44C 4B FF E9 1D */ bl drawString_size_scale__7JUTFontFffffPcUlb
/* 802E0510 002DD450 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0
/* 802E0514 002DD454 CB E1 00 40 */ lfd f31, 0x40(r1)
/* 802E0518 002DD458 39 61 00 40 */ addi r11, r1, 0x40
asm/JUtility/JUTFont.s
+2 -155
View File
@@ -3,8 +3,8 @@
.section .text, "ax" # 802decf8
.global JUTFont
JUTFont:
.global __ct__7JUTFontFv
__ct__7JUTFontFv:
/* 802DECF8 002DBC38 3C 80 80 3A */ lis r4, lbl_803A31F0@ha
/* 802DECFC 002DBC3C 38 04 31 F0 */ addi r0, r4, lbl_803A31F0@l
/* 802DED00 002DBC40 90 03 00 00 */ stw r0, 0(r3)
@@ -16,156 +16,3 @@ JUTFont:
/* 802DED18 002DBC58 38 00 00 00 */ li r0, 0
/* 802DED1C 002DBC5C 98 03 00 04 */ stb r0, 4(r3)
/* 802DED20 002DBC60 4E 80 00 20 */ blr
.global JUTFont_NS_initialize_state
JUTFont_NS_initialize_state:
/* 802DED24 002DBC64 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802DED28 002DBC68 7C 08 02 A6 */ mflr r0
/* 802DED2C 002DBC6C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802DED30 002DBC70 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802DED34 002DBC74 7C 7F 1B 78 */ mr r31, r3
/* 802DED38 002DBC78 38 00 FF FF */ li r0, -1
/* 802DED3C 002DBC7C 90 01 00 08 */ stw r0, 8(r1)
/* 802DED40 002DBC80 90 01 00 0C */ stw r0, 0xc(r1)
/* 802DED44 002DBC84 38 81 00 0C */ addi r4, r1, 0xc
/* 802DED48 002DBC88 48 00 00 29 */ bl JUTFont_NS_setCharColor
/* 802DED4C 002DBC8C 38 00 00 00 */ li r0, 0
/* 802DED50 002DBC90 98 1F 00 05 */ stb r0, 5(r31)
/* 802DED54 002DBC94 90 1F 00 08 */ stw r0, 8(r31)
/* 802DED58 002DBC98 98 1F 00 04 */ stb r0, 4(r31)
/* 802DED5C 002DBC9C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 802DED60 002DBCA0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802DED64 002DBCA4 7C 08 03 A6 */ mtlr r0
/* 802DED68 002DBCA8 38 21 00 20 */ addi r1, r1, 0x20
/* 802DED6C 002DBCAC 4E 80 00 20 */ blr
.global JUTFont_NS_setCharColor
JUTFont_NS_setCharColor:
/* 802DED70 002DBCB0 88 E4 00 00 */ lbz r7, 0(r4)
/* 802DED74 002DBCB4 98 E3 00 0C */ stb r7, 0xc(r3)
/* 802DED78 002DBCB8 88 C4 00 01 */ lbz r6, 1(r4)
/* 802DED7C 002DBCBC 98 C3 00 0D */ stb r6, 0xd(r3)
/* 802DED80 002DBCC0 88 A4 00 02 */ lbz r5, 2(r4)
/* 802DED84 002DBCC4 98 A3 00 0E */ stb r5, 0xe(r3)
/* 802DED88 002DBCC8 88 04 00 03 */ lbz r0, 3(r4)
/* 802DED8C 002DBCCC 98 03 00 0F */ stb r0, 0xf(r3)
/* 802DED90 002DBCD0 98 E3 00 10 */ stb r7, 0x10(r3)
/* 802DED94 002DBCD4 98 C3 00 11 */ stb r6, 0x11(r3)
/* 802DED98 002DBCD8 98 A3 00 12 */ stb r5, 0x12(r3)
/* 802DED9C 002DBCDC 98 03 00 13 */ stb r0, 0x13(r3)
/* 802DEDA0 002DBCE0 98 E3 00 14 */ stb r7, 0x14(r3)
/* 802DEDA4 002DBCE4 98 C3 00 15 */ stb r6, 0x15(r3)
/* 802DEDA8 002DBCE8 98 A3 00 16 */ stb r5, 0x16(r3)
/* 802DEDAC 002DBCEC 98 03 00 17 */ stb r0, 0x17(r3)
/* 802DEDB0 002DBCF0 98 E3 00 18 */ stb r7, 0x18(r3)
/* 802DEDB4 002DBCF4 98 C3 00 19 */ stb r6, 0x19(r3)
/* 802DEDB8 002DBCF8 98 A3 00 1A */ stb r5, 0x1a(r3)
/* 802DEDBC 002DBCFC 98 03 00 1B */ stb r0, 0x1b(r3)
/* 802DEDC0 002DBD00 4E 80 00 20 */ blr
.global JUTFont_NS_setGradColor
JUTFont_NS_setGradColor:
/* 802DEDC4 002DBD04 89 04 00 00 */ lbz r8, 0(r4)
/* 802DEDC8 002DBD08 99 03 00 0C */ stb r8, 0xc(r3)
/* 802DEDCC 002DBD0C 88 E4 00 01 */ lbz r7, 1(r4)
/* 802DEDD0 002DBD10 98 E3 00 0D */ stb r7, 0xd(r3)
/* 802DEDD4 002DBD14 88 C4 00 02 */ lbz r6, 2(r4)
/* 802DEDD8 002DBD18 98 C3 00 0E */ stb r6, 0xe(r3)
/* 802DEDDC 002DBD1C 88 04 00 03 */ lbz r0, 3(r4)
/* 802DEDE0 002DBD20 98 03 00 0F */ stb r0, 0xf(r3)
/* 802DEDE4 002DBD24 99 03 00 10 */ stb r8, 0x10(r3)
/* 802DEDE8 002DBD28 98 E3 00 11 */ stb r7, 0x11(r3)
/* 802DEDEC 002DBD2C 98 C3 00 12 */ stb r6, 0x12(r3)
/* 802DEDF0 002DBD30 98 03 00 13 */ stb r0, 0x13(r3)
/* 802DEDF4 002DBD34 88 E5 00 00 */ lbz r7, 0(r5)
/* 802DEDF8 002DBD38 98 E3 00 14 */ stb r7, 0x14(r3)
/* 802DEDFC 002DBD3C 88 C5 00 01 */ lbz r6, 1(r5)
/* 802DEE00 002DBD40 98 C3 00 15 */ stb r6, 0x15(r3)
/* 802DEE04 002DBD44 88 85 00 02 */ lbz r4, 2(r5)
/* 802DEE08 002DBD48 98 83 00 16 */ stb r4, 0x16(r3)
/* 802DEE0C 002DBD4C 88 05 00 03 */ lbz r0, 3(r5)
/* 802DEE10 002DBD50 98 03 00 17 */ stb r0, 0x17(r3)
/* 802DEE14 002DBD54 98 E3 00 18 */ stb r7, 0x18(r3)
/* 802DEE18 002DBD58 98 C3 00 19 */ stb r6, 0x19(r3)
/* 802DEE1C 002DBD5C 98 83 00 1A */ stb r4, 0x1a(r3)
/* 802DEE20 002DBD60 98 03 00 1B */ stb r0, 0x1b(r3)
/* 802DEE24 002DBD64 4E 80 00 20 */ blr
.global JUTFont_NS_drawString_size_scale
JUTFont_NS_drawString_size_scale:
/* 802DEE28 002DBD68 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 802DEE2C 002DBD6C 7C 08 02 A6 */ mflr r0
/* 802DEE30 002DBD70 90 01 00 74 */ stw r0, 0x74(r1)
/* 802DEE34 002DBD74 DB E1 00 60 */ stfd f31, 0x60(r1)
/* 802DEE38 002DBD78 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0
/* 802DEE3C 002DBD7C DB C1 00 50 */ stfd f30, 0x50(r1)
/* 802DEE40 002DBD80 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0
/* 802DEE44 002DBD84 DB A1 00 40 */ stfd f29, 0x40(r1)
/* 802DEE48 002DBD88 F3 A1 00 48 */ psq_st f29, 72(r1), 0, qr0
/* 802DEE4C 002DBD8C DB 81 00 30 */ stfd f28, 0x30(r1)
/* 802DEE50 002DBD90 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0
/* 802DEE54 002DBD94 DB 61 00 20 */ stfd f27, 0x20(r1)
/* 802DEE58 002DBD98 F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0
/* 802DEE5C 002DBD9C 39 61 00 20 */ addi r11, r1, 0x20
/* 802DEE60 002DBDA0 48 08 33 75 */ bl _savegpr_27
/* 802DEE64 002DBDA4 7C 7B 1B 78 */ mr r27, r3
/* 802DEE68 002DBDA8 FF 60 08 90 */ fmr f27, f1
/* 802DEE6C 002DBDAC FF 80 10 90 */ fmr f28, f2
/* 802DEE70 002DBDB0 FF A0 18 90 */ fmr f29, f3
/* 802DEE74 002DBDB4 FF C0 20 90 */ fmr f30, f4
/* 802DEE78 002DBDB8 7C 9C 23 78 */ mr r28, r4
/* 802DEE7C 002DBDBC 7C BD 2B 78 */ mr r29, r5
/* 802DEE80 002DBDC0 7C DE 33 78 */ mr r30, r6
/* 802DEE84 002DBDC4 FF E0 D8 90 */ fmr f31, f27
/* 802DEE88 002DBDC8 48 00 00 74 */ b lbl_802DEEFC
lbl_802DEE8C:
/* 802DEE8C 002DBDCC 88 9C 00 00 */ lbz r4, 0(r28)
/* 802DEE90 002DBDD0 7C 9F 23 78 */ mr r31, r4
/* 802DEE94 002DBDD4 7F 63 DB 78 */ mr r3, r27
/* 802DEE98 002DBDD8 81 9B 00 00 */ lwz r12, 0(r27)
/* 802DEE9C 002DBDDC 81 8C 00 40 */ lwz r12, 0x40(r12)
/* 802DEEA0 002DBDE0 7D 89 03 A6 */ mtctr r12
/* 802DEEA4 002DBDE4 4E 80 04 21 */ bctrl
/* 802DEEA8 002DBDE8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802DEEAC 002DBDEC 41 82 00 14 */ beq lbl_802DEEC0
/* 802DEEB0 002DBDF0 57 FF 40 2E */ slwi r31, r31, 8
/* 802DEEB4 002DBDF4 8C 1C 00 01 */ lbzu r0, 1(r28)
/* 802DEEB8 002DBDF8 7F FF 03 78 */ or r31, r31, r0
/* 802DEEBC 002DBDFC 3B BD FF FF */ addi r29, r29, -1
lbl_802DEEC0:
/* 802DEEC0 002DBE00 7F 63 DB 78 */ mr r3, r27
/* 802DEEC4 002DBE04 FC 20 D8 90 */ fmr f1, f27
/* 802DEEC8 002DBE08 FC 40 E0 90 */ fmr f2, f28
/* 802DEECC 002DBE0C FC 60 E8 90 */ fmr f3, f29
/* 802DEED0 002DBE10 FC 80 F0 90 */ fmr f4, f30
/* 802DEED4 002DBE14 7F E4 FB 78 */ mr r4, r31
/* 802DEED8 002DBE18 7F C5 F3 78 */ mr r5, r30
/* 802DEEDC 002DBE1C 81 9B 00 00 */ lwz r12, 0(r27)
/* 802DEEE0 002DBE20 81 8C 00 14 */ lwz r12, 0x14(r12)
/* 802DEEE4 002DBE24 7D 89 03 A6 */ mtctr r12
/* 802DEEE8 002DBE28 4E 80 04 21 */ bctrl
/* 802DEEEC 002DBE2C EF 7B 08 2A */ fadds f27, f27, f1
/* 802DEEF0 002DBE30 3B C0 00 01 */ li r30, 1
/* 802DEEF4 002DBE34 3B BD FF FF */ addi r29, r29, -1
/* 802DEEF8 002DBE38 3B 9C 00 01 */ addi r28, r28, 1
lbl_802DEEFC:
/* 802DEEFC 002DBE3C 28 1D 00 00 */ cmplwi r29, 0
/* 802DEF00 002DBE40 40 82 FF 8C */ bne lbl_802DEE8C
/* 802DEF04 002DBE44 EC 3B F8 28 */ fsubs f1, f27, f31
/* 802DEF08 002DBE48 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0
/* 802DEF0C 002DBE4C CB E1 00 60 */ lfd f31, 0x60(r1)
/* 802DEF10 002DBE50 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0
/* 802DEF14 002DBE54 CB C1 00 50 */ lfd f30, 0x50(r1)
/* 802DEF18 002DBE58 E3 A1 00 48 */ psq_l f29, 72(r1), 0, qr0
/* 802DEF1C 002DBE5C CB A1 00 40 */ lfd f29, 0x40(r1)
/* 802DEF20 002DBE60 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0
/* 802DEF24 002DBE64 CB 81 00 30 */ lfd f28, 0x30(r1)
/* 802DEF28 002DBE68 E3 61 00 28 */ psq_l f27, 40(r1), 0, qr0
/* 802DEF2C 002DBE6C CB 61 00 20 */ lfd f27, 0x20(r1)
/* 802DEF30 002DBE70 39 61 00 20 */ addi r11, r1, 0x20
/* 802DEF34 002DBE74 48 08 32 ED */ bl _restgpr_27
/* 802DEF38 002DBE78 80 01 00 74 */ lwz r0, 0x74(r1)
/* 802DEF3C 002DBE7C 7C 08 03 A6 */ mtlr r0
/* 802DEF40 002DBE80 38 21 00 70 */ addi r1, r1, 0x70
/* 802DEF44 002DBE84 4E 80 00 20 */ blr
asm/JUtility/JUTResFont.s
-1253
View File
File diff suppressed because it is too large Load Diff
asm/SComponent/c/bg/c_bg_w.s
-65
View File
@@ -1,65 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 802681c0
.global cBgW_BgId_NS_Regist
cBgW_BgId_NS_Regist:
/* 802681C0 00265100 B0 83 00 00 */ sth r4, 0(r3)
/* 802681C4 00265104 4E 80 00 20 */ blr
.global cBgW_BgId_NS_Release
cBgW_BgId_NS_Release:
/* 802681C8 00265108 38 00 01 00 */ li r0, 0x100
/* 802681CC 0026510C B0 03 00 00 */ sth r0, 0(r3)
/* 802681D0 00265110 4E 80 00 20 */ blr
.global cBgW_BgId_NS_ChkUsed
cBgW_BgId_NS_ChkUsed:
/* 802681D4 00265114 A0 63 00 00 */ lhz r3, 0(r3)
/* 802681D8 00265118 38 03 FF 00 */ addi r0, r3, -256
/* 802681DC 0026511C 54 03 0F FE */ srwi r3, r0, 0x1f
/* 802681E0 00265120 4E 80 00 20 */ blr
.global cBgW_CheckBGround
cBgW_CheckBGround:
/* 802681E4 00265124 C0 02 B6 E8 */ lfs f0, lbl_804550E8-_SDA2_BASE_(r2)
/* 802681E8 00265128 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 802681EC 0026512C 4C 41 13 82 */ cror 2, 1, 2
/* 802681F0 00265130 7C 00 00 26 */ mfcr r0
/* 802681F4 00265134 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f
/* 802681F8 00265138 4E 80 00 20 */ blr
.global cBgW_CheckBRoof
cBgW_CheckBRoof:
/* 802681FC 0026513C C0 02 B6 EC */ lfs f0, lbl_804550EC-_SDA2_BASE_(r2)
/* 80268200 00265140 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80268204 00265144 7C 00 00 26 */ mfcr r0
/* 80268208 00265148 54 03 0F FE */ srwi r3, r0, 0x1f
/* 8026820C 0026514C 4E 80 00 20 */ blr
.global cBgW_CheckBWall
cBgW_CheckBWall:
/* 80268210 00265150 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80268214 00265154 7C 08 02 A6 */ mflr r0
/* 80268218 00265158 90 01 00 14 */ stw r0, 0x14(r1)
/* 8026821C 0026515C DB E1 00 08 */ stfd f31, 8(r1)
/* 80268220 00265160 FF E0 08 90 */ fmr f31, f1
/* 80268224 00265164 4B FF FF C1 */ bl cBgW_CheckBGround
/* 80268228 00265168 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8026822C 0026516C 40 82 00 1C */ bne lbl_80268248
/* 80268230 00265170 FC 20 F8 90 */ fmr f1, f31
/* 80268234 00265174 4B FF FF C9 */ bl cBgW_CheckBRoof
/* 80268238 00265178 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8026823C 0026517C 40 82 00 0C */ bne lbl_80268248
/* 80268240 00265180 38 60 00 01 */ li r3, 1
/* 80268244 00265184 48 00 00 08 */ b lbl_8026824C
lbl_80268248:
/* 80268248 00265188 38 60 00 00 */ li r3, 0
lbl_8026824C:
/* 8026824C 0026518C CB E1 00 08 */ lfd f31, 8(r1)
/* 80268250 00265190 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80268254 00265194 7C 08 03 A6 */ mtlr r0
/* 80268258 00265198 38 21 00 10 */ addi r1, r1, 0x10
/* 8026825C 0026519C 4E 80 00 20 */ blr
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
asm/m/Do/m_Do_ext.s
+3 -1
View File
@@ -8377,7 +8377,7 @@ lbl_800148BC:
/* 800148C8 00011808 41 82 00 14 */ beq lbl_800148DC
/* 800148CC 0001180C 80 9F 00 00 */ lwz r4, 0(r31)
/* 800148D0 00011810 7F 45 D3 78 */ mr r5, r26
/* 800148D4 00011814 48 2C A6 C1 */ bl JUTResFont_X1_
/* 800148D4 00011814 48 2C A6 C1 */ bl __ct__10JUTResFontFPCcP7JKRHeap
/* 800148D8 00011818 7C 60 1B 78 */ mr r0, r3
lbl_800148DC:
/* 800148DC 0001181C 90 1E 00 00 */ stw r0, 0(r30)
@@ -8411,6 +8411,8 @@ lbl_80014934:
/* 80014940 00011880 7C 08 03 A6 */ mtlr r0
/* 80014944 00011884 38 21 00 20 */ addi r1, r1, 0x20
/* 80014948 00011888 4E 80 00 20 */ blr
.global __dt__7JUTFontFv
__dt__7JUTFontFv:
/* 8001494C 0001188C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80014950 00011890 7C 08 02 A6 */ mflr r0
/* 80014954 00011894 90 01 00 14 */ stw r0, 0x14(r1)