mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 21:11:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopMsgM_messageGet OK + rename g_meter2_info global

Browse Source
This commit is contained in:
Pheenoh
2021-03-27 19:53:05 -04:00
parent 3c4f60bf54
commit 37d5d9f00e
154 changed files with 1184 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/msg/d_msg_object.s
+18 -18
View File
@@ -615,8 +615,8 @@ lbl_8023332C:
/* 80233364 002302A4 98 7E 01 A4 */ stb r3, 0x1a4(r30)
/* 80233368 002302A8 98 7E 01 A1 */ stb r3, 0x1a1(r30)
/* 8023336C 002302AC 98 7E 01 A5 */ stb r3, 0x1a5(r30)
/* 80233370 002302B0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80233374 002302B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80233370 002302B0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80233374 002302B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80233378 002302B8 80 03 00 10 */ lwz r0, 0x10(r3)
/* 8023337C 002302BC 90 1E 01 28 */ stw r0, 0x128(r30)
/* 80233380 002302C0 38 60 00 00 */ li r3, 0
@@ -796,8 +796,8 @@ lbl_80233600:
/* 80233600 00230540 38 00 00 00 */ li r0, 0
/* 80233604 00230544 98 1F 04 D2 */ stb r0, 0x4d2(r31)
lbl_80233608:
/* 80233608 00230548 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8023360C 0023054C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80233608 00230548 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8023360C 0023054C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80233610 00230550 4B FE 8C 29 */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv
/* 80233614 00230554 80 7F 01 14 */ lwz r3, 0x114(r31)
/* 80233618 00230558 48 07 40 1D */ bl update__Q28JMessage8TControlFv
@@ -2848,8 +2848,8 @@ lbl_80235350:
lbl_80235380:
/* 80235380 002322C0 80 7F 01 18 */ lwz r3, 0x118(r31)
/* 80235384 002322C4 4B FF 3D E5 */ bl selectMessage__19jmessage_tReferenceFv
/* 80235388 002322C8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8023538C 002322CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80235388 002322C8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8023538C 002322CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80235390 002322D0 88 03 00 BD */ lbz r0, 0xbd(r3)
/* 80235394 002322D4 28 00 00 00 */ cmplwi r0, 0
/* 80235398 002322D8 41 82 00 1C */ beq lbl_802353B4
@@ -3228,8 +3228,8 @@ inputProc__12dMsgObject_cFv:
/* 802358E4 00232824 48 12 C8 F1 */ bl _savegpr_27
/* 802358E8 00232828 7C 7C 1B 78 */ mr r28, r3
/* 802358EC 0023282C 38 00 00 01 */ li r0, 1
/* 802358F0 00232830 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802358F4 00232834 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 802358F0 00232830 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802358F4 00232834 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
/* 802358F8 00232838 98 1E 00 BD */ stb r0, 0xbd(r30)
/* 802358FC 0023283C 80 7C 01 18 */ lwz r3, 0x118(r28)
/* 80235900 00232840 4B FF 3B A9 */ bl inputNumber__19jmessage_tReferenceFv
@@ -3809,8 +3809,8 @@ lbl_80236118:
/* 80236128 00233068 41 82 00 2C */ beq lbl_80236154
/* 8023612C 0023306C 28 00 00 05 */ cmplwi r0, 5
/* 80236130 00233070 40 82 00 34 */ bne lbl_80236164
/* 80236134 00233074 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80236138 00233078 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80236134 00233074 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80236138 00233078 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8023613C 0023307C 4B FE 60 A1 */ bl isFloatingMessageVisible__13dMeter2Info_cFv
/* 80236140 00233080 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80236144 00233084 41 82 00 20 */ beq lbl_80236164
@@ -3818,8 +3818,8 @@ lbl_80236118:
/* 8023614C 0023308C 28 00 00 00 */ cmplwi r0, 0
/* 80236150 00233090 40 82 00 14 */ bne lbl_80236164
lbl_80236154:
/* 80236154 00233094 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80236158 00233098 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80236154 00233094 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80236158 00233098 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8023615C 0023309C 80 63 00 1C */ lwz r3, 0x1c(r3)
/* 80236160 002330A0 4B FE 95 8D */ bl emphasisButtonDelete__9dMeter2_cFv
lbl_80236164:
@@ -3849,8 +3849,8 @@ lbl_802361B4:
/* 802361B4 002330F4 80 1F 01 04 */ lwz r0, 0x104(r31)
/* 802361B8 002330F8 28 00 00 00 */ cmplwi r0, 0
/* 802361BC 002330FC 40 82 05 30 */ bne lbl_802366EC
/* 802361C0 00233100 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802361C4 00233104 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 802361C0 00233100 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802361C4 00233104 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 802361C8 00233108 A0 03 00 A6 */ lhz r0, 0xa6(r3)
/* 802361CC 0023310C 28 00 13 EB */ cmplwi r0, 0x13eb
/* 802361D0 00233110 41 82 05 1C */ beq lbl_802366EC
@@ -4696,8 +4696,8 @@ lbl_80236D60:
/* 80236D78 00233CB8 38 00 00 01 */ li r0, 1
/* 80236D7C 00233CBC 98 1E 01 9D */ stb r0, 0x19d(r30)
lbl_80236D80:
/* 80236D80 00233CC0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80236D84 00233CC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80236D80 00233CC0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80236D84 00233CC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80236D88 00233CC8 80 03 00 14 */ lwz r0, 0x14(r3)
/* 80236D8C 00233CCC 90 1E 01 30 */ stw r0, 0x130(r30)
/* 80236D90 00233CD0 48 00 00 0C */ b lbl_80236D9C
@@ -5693,8 +5693,8 @@ setKillMessageFlagLocal__12dMsgObject_cFv:
/* 80237A20 00234960 40 82 00 18 */ bne lbl_80237A38
/* 80237A24 00234964 38 00 00 00 */ li r0, 0
/* 80237A28 00234968 98 1F 04 CD */ stb r0, 0x4cd(r31)
/* 80237A2C 0023496C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80237A30 00234970 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80237A2C 0023496C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80237A30 00234970 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80237A34 00234974 4B FE 47 E5 */ bl resetFloatingMessage__13dMeter2Info_cFv
lbl_80237A38:
/* 80237A38 00234978 7F E3 FB 78 */ mr r3, r31