diff --git a/asm/sdata.s b/asm/sdata.s index e9938c4f0af..9ccbd9af7b8 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -38,8 +38,8 @@ l_scnRqID: .global lbl_804505C0 lbl_804505C0: .incbin "baserom.dol", 0x3D0320, 0x8 -.global lbl_804505C8 -lbl_804505C8: +.global i_msgID +i_msgID: .incbin "baserom.dol", 0x3D0328, 0x8 .global g_fopDwTg_Queue g_fopDwTg_Queue: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s index 76c63d704f0..74b82b49091 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s @@ -58,7 +58,7 @@ lbl_8001FDF8: /* 8001FE08 0001CD48 40 82 00 08 */ bne lbl_8001FE10 /* 8001FE0C 0001CD4C AB 83 02 F4 */ lha r28, 0x2f4(r3) lbl_8001FE10: -/* 8001FE10 0001CD50 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8001FE10 0001CD50 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8001FE14 0001CD54 4B FF FC 11 */ bl fopMsgM_SearchByID__FUi /* 8001FE18 0001CD58 28 03 00 00 */ cmplwi r3, 0 /* 8001FE1C 0001CD5C 41 82 00 4C */ beq lbl_8001FE68 @@ -78,7 +78,7 @@ lbl_8001FE10: /* 8001FE54 0001CD94 7F C5 F3 78 */ mr r5, r30 /* 8001FE58 0001CD98 38 C0 00 00 */ li r6, 0 /* 8001FE5C 0001CD9C 48 21 3E A9 */ bl setMessageIndex__12dMsgObject_cFUlUlb -/* 8001FE60 0001CDA0 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8001FE60 0001CDA0 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8001FE64 0001CDA4 48 00 00 08 */ b lbl_8001FE6C lbl_8001FE68: /* 8001FE68 0001CDA8 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s index 5a1d017dad0..2349e92ef15 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s @@ -33,7 +33,7 @@ lbl_8001FEF8: /* 8001FEFC 0001CE3C D0 01 00 10 */ stfs f0, 0x10(r1) /* 8001FF00 0001CE40 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8001FF04 0001CE44 D0 01 00 08 */ stfs f0, 8(r1) -/* 8001FF08 0001CE48 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8001FF08 0001CE48 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8001FF0C 0001CE4C 4B FF FB 19 */ bl fopMsgM_SearchByID__FUi /* 8001FF10 0001CE50 7C 7F 1B 79 */ or. r31, r3, r3 /* 8001FF14 0001CE54 41 82 00 94 */ beq lbl_8001FFA8 @@ -57,7 +57,7 @@ lbl_8001FEF8: /* 8001FF5C 0001CE9C 7F C5 F3 78 */ mr r5, r30 /* 8001FF60 0001CEA0 38 C0 00 00 */ li r6, 0 /* 8001FF64 0001CEA4 48 21 3D A1 */ bl setMessageIndex__12dMsgObject_cFUlUlb -/* 8001FF68 0001CEA8 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8001FF68 0001CEA8 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8001FF6C 0001CEAC 48 00 00 40 */ b lbl_8001FFAC lbl_8001FF70: /* 8001FF70 0001CEB0 28 00 00 0F */ cmplwi r0, 0xf @@ -72,7 +72,7 @@ lbl_8001FF70: /* 8001FF94 0001CED4 93 DF 00 F0 */ stw r30, 0xf0(r31) /* 8001FF98 0001CED8 38 00 00 00 */ li r0, 0 /* 8001FF9C 0001CEDC 90 1F 00 DC */ stw r0, 0xdc(r31) -/* 8001FFA0 0001CEE0 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8001FFA0 0001CEE0 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8001FFA4 0001CEE4 48 00 00 08 */ b lbl_8001FFAC lbl_8001FFA8: /* 8001FFA8 0001CEE8 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s index 97a7fc2f5a5..4b89d088026 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s @@ -33,7 +33,7 @@ lbl_80020038: /* 8002003C 0001CF7C D0 01 00 10 */ stfs f0, 0x10(r1) /* 80020040 0001CF80 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80020044 0001CF84 D0 01 00 08 */ stfs f0, 8(r1) -/* 80020048 0001CF88 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 80020048 0001CF88 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 8002004C 0001CF8C 4B FF F9 D9 */ bl fopMsgM_SearchByID__FUi /* 80020050 0001CF90 28 03 00 00 */ cmplwi r3, 0 /* 80020054 0001CF94 41 82 00 50 */ beq lbl_800200A4 @@ -54,7 +54,7 @@ lbl_80020038: /* 80020090 0001CFD0 7F C4 F3 78 */ mr r4, r30 /* 80020094 0001CFD4 38 A0 00 00 */ li r5, 0 /* 80020098 0001CFD8 48 21 3D D9 */ bl setMessageIndexDemo__12dMsgObject_cFUlb -/* 8002009C 0001CFDC 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) +/* 8002009C 0001CFDC 80 6D 80 48 */ lwz r3, i_msgID-_SDA_BASE_(r13) /* 800200A0 0001CFE0 48 00 00 08 */ b lbl_800200A8 lbl_800200A4: /* 800200A4 0001CFE4 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_80020100.s b/include/f/f_op/f_op_msg_mng/asm/func_80020100.s index e407ccc98c7..91d3d6964da 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_80020100.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_80020100.s @@ -1,2 +1,2 @@ -/* 80020100 0001D040 90 6D 80 48 */ stw r3, lbl_804505C8-_SDA_BASE_(r13) +/* 80020100 0001D040 90 6D 80 48 */ stw r3, i_msgID-_SDA_BASE_(r13) /* 80020104 0001D044 4E 80 00 20 */ blr