diff --git a/asm/f/op/f_op_msg.s b/asm/f/op/f_op_msg.s deleted file mode 100644 index 4aad30347ee..00000000000 --- a/asm/f/op/f_op_msg.s +++ /dev/null @@ -1,128 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 8001f488 - - -/* 8001F488 0001C3C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F48C 0001C3CC 7C 08 02 A6 */ mflr r0 -/* 8001F490 0001C3D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F494 0001C3D4 7C 64 1B 78 */ mr r4, r3 -/* 8001F498 0001C3D8 80 63 00 D8 */ lwz r3, 0xd8(r3) -/* 8001F49C 0001C3DC 48 00 25 89 */ bl fpcLf_DrawMethod -/* 8001F4A0 0001C3E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F4A4 0001C3E4 7C 08 03 A6 */ mtlr r0 -/* 8001F4A8 0001C3E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F4AC 0001C3EC 4E 80 00 20 */ blr -/* 8001F4B0 0001C3F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F4B4 0001C3F4 7C 08 02 A6 */ mflr r0 -/* 8001F4B8 0001C3F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F4BC 0001C3FC 7C 64 1B 78 */ mr r4, r3 -/* 8001F4C0 0001C400 38 60 00 01 */ li r3, 1 -/* 8001F4C4 0001C404 88 0D 8B A4 */ lbz r0, lbl_80451124-_SDA_BASE_(r13) -/* 8001F4C8 0001C408 7C 00 07 75 */ extsb. r0, r0 -/* 8001F4CC 0001C40C 40 82 00 0C */ bne lbl_8001F4D8 -/* 8001F4D0 0001C410 80 64 00 D8 */ lwz r3, 0xd8(r4) -/* 8001F4D4 0001C414 48 00 2F 8D */ bl fpcMtd_Execute -lbl_8001F4D8: -/* 8001F4D8 0001C418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F4DC 0001C41C 7C 08 03 A6 */ mtlr r0 -/* 8001F4E0 0001C420 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F4E4 0001C424 4E 80 00 20 */ blr -/* 8001F4E8 0001C428 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F4EC 0001C42C 7C 08 02 A6 */ mflr r0 -/* 8001F4F0 0001C430 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F4F4 0001C434 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001F4F8 0001C438 93 C1 00 08 */ stw r30, 8(r1) -/* 8001F4FC 0001C43C 7C 7E 1B 78 */ mr r30, r3 -/* 8001F500 0001C440 80 63 00 D8 */ lwz r3, 0xd8(r3) -/* 8001F504 0001C444 7F C4 F3 78 */ mr r4, r30 -/* 8001F508 0001C448 48 00 2F 7D */ bl fpcMtd_IsDelete -/* 8001F50C 0001C44C 7C 7F 1B 78 */ mr r31, r3 -/* 8001F510 0001C450 2C 1F 00 01 */ cmpwi r31, 1 -/* 8001F514 0001C454 40 82 00 0C */ bne lbl_8001F520 -/* 8001F518 0001C458 38 7E 00 C4 */ addi r3, r30, 0xc4 -/* 8001F51C 0001C45C 48 00 0F B9 */ bl fopDwTg_DrawQTo -lbl_8001F520: -/* 8001F520 0001C460 7F E3 FB 78 */ mr r3, r31 -/* 8001F524 0001C464 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001F528 0001C468 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001F52C 0001C46C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F530 0001C470 7C 08 03 A6 */ mtlr r0 -/* 8001F534 0001C474 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F538 0001C478 4E 80 00 20 */ blr -/* 8001F53C 0001C47C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F540 0001C480 7C 08 02 A6 */ mflr r0 -/* 8001F544 0001C484 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F548 0001C488 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001F54C 0001C48C 93 C1 00 08 */ stw r30, 8(r1) -/* 8001F550 0001C490 7C 7E 1B 78 */ mr r30, r3 -/* 8001F554 0001C494 80 63 00 D8 */ lwz r3, 0xd8(r3) -/* 8001F558 0001C498 7F C4 F3 78 */ mr r4, r30 -/* 8001F55C 0001C49C 48 00 2F 4D */ bl fpcMtd_Delete -/* 8001F560 0001C4A0 7C 7F 1B 78 */ mr r31, r3 -/* 8001F564 0001C4A4 38 7E 00 C4 */ addi r3, r30, 0xc4 -/* 8001F568 0001C4A8 48 00 0F 6D */ bl fopDwTg_DrawQTo -/* 8001F56C 0001C4AC 7F E3 FB 78 */ mr r3, r31 -/* 8001F570 0001C4B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001F574 0001C4B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001F578 0001C4B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F57C 0001C4BC 7C 08 03 A6 */ mtlr r0 -/* 8001F580 0001C4C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F584 0001C4C4 4E 80 00 20 */ blr -/* 8001F588 0001C4C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F58C 0001C4CC 7C 08 02 A6 */ mflr r0 -/* 8001F590 0001C4D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F594 0001C4D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001F598 0001C4D8 93 C1 00 08 */ stw r30, 8(r1) -/* 8001F59C 0001C4DC 7C 7F 1B 78 */ mr r31, r3 -/* 8001F5A0 0001C4E0 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8001F5A4 0001C4E4 7C 00 07 75 */ extsb. r0, r0 -/* 8001F5A8 0001C4E8 40 82 00 70 */ bne lbl_8001F618 -/* 8001F5AC 0001C4EC 83 C3 00 10 */ lwz r30, 0x10(r3) -/* 8001F5B0 0001C4F0 38 6D 87 70 */ addi r3, r13, lbl_80450CF0-_SDA_BASE_ -/* 8001F5B4 0001C4F4 48 00 10 A9 */ bl fpcBs_MakeOfType -/* 8001F5B8 0001C4F8 90 7F 00 C0 */ stw r3, 0xc0(r31) -/* 8001F5BC 0001C4FC 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 8001F5C0 0001C500 90 1F 00 D8 */ stw r0, 0xd8(r31) -/* 8001F5C4 0001C504 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 8001F5C8 0001C508 7F E4 FB 78 */ mr r4, r31 -/* 8001F5CC 0001C50C 48 00 0F 29 */ bl fopDwTg_Init -/* 8001F5D0 0001C510 7F E3 FB 78 */ mr r3, r31 -/* 8001F5D4 0001C514 48 00 04 71 */ bl fopMsgM_GetAppend -/* 8001F5D8 0001C518 28 03 00 00 */ cmplwi r3, 0 -/* 8001F5DC 0001C51C 41 82 00 3C */ beq lbl_8001F618 -/* 8001F5E0 0001C520 80 03 00 00 */ lwz r0, 0(r3) -/* 8001F5E4 0001C524 90 1F 00 DC */ stw r0, 0xdc(r31) -/* 8001F5E8 0001C528 C0 03 00 04 */ lfs f0, 4(r3) -/* 8001F5EC 0001C52C D0 1F 00 E0 */ stfs f0, 0xe0(r31) -/* 8001F5F0 0001C530 C0 03 00 08 */ lfs f0, 8(r3) -/* 8001F5F4 0001C534 D0 1F 00 E4 */ stfs f0, 0xe4(r31) -/* 8001F5F8 0001C538 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8001F5FC 0001C53C D0 1F 00 E8 */ stfs f0, 0xe8(r31) -/* 8001F600 0001C540 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8001F604 0001C544 90 1F 00 EC */ stw r0, 0xec(r31) -/* 8001F608 0001C548 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8001F60C 0001C54C 90 1F 00 F0 */ stw r0, 0xf0(r31) -/* 8001F610 0001C550 80 03 00 18 */ lwz r0, 0x18(r3) -/* 8001F614 0001C554 90 1F 00 F4 */ stw r0, 0xf4(r31) -lbl_8001F618: -/* 8001F618 0001C558 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 8001F61C 0001C55C 7F E4 FB 78 */ mr r4, r31 -/* 8001F620 0001C560 48 00 2E AD */ bl fpcMtd_Create -/* 8001F624 0001C564 7C 7E 1B 78 */ mr r30, r3 -/* 8001F628 0001C568 2C 1E 00 04 */ cmpwi r30, 4 -/* 8001F62C 0001C56C 40 82 00 18 */ bne lbl_8001F644 -/* 8001F630 0001C570 7F E3 FB 78 */ mr r3, r31 -/* 8001F634 0001C574 48 00 23 CD */ bl fpcLf_GetPriority -/* 8001F638 0001C578 7C 64 07 34 */ extsh r4, r3 -/* 8001F63C 0001C57C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 8001F640 0001C580 48 00 0E 6D */ bl fopDwTg_ToDrawQ -lbl_8001F644: -/* 8001F644 0001C584 7F C3 F3 78 */ mr r3, r30 -/* 8001F648 0001C588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001F64C 0001C58C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001F650 0001C590 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F654 0001C594 7C 08 03 A6 */ mtlr r0 -/* 8001F658 0001C598 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F65C 0001C59C 4E 80 00 20 */ blr - diff --git a/include/f/f_op/f_op_msg/asm/func_8001F488.s b/include/f/f_op/f_op_msg/asm/func_8001F488.s new file mode 100644 index 00000000000..0cd8a438263 --- /dev/null +++ b/include/f/f_op/f_op_msg/asm/func_8001F488.s @@ -0,0 +1,10 @@ +/* 8001F488 0001C3C8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F48C 0001C3CC 7C 08 02 A6 */ mflr r0 +/* 8001F490 0001C3D0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F494 0001C3D4 7C 64 1B 78 */ mr r4, r3 +/* 8001F498 0001C3D8 80 63 00 D8 */ lwz r3, 0xd8(r3) +/* 8001F49C 0001C3DC 48 00 25 89 */ bl fpcLf_DrawMethod +/* 8001F4A0 0001C3E0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F4A4 0001C3E4 7C 08 03 A6 */ mtlr r0 +/* 8001F4A8 0001C3E8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F4AC 0001C3EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_msg/asm/func_8001F4B0.s b/include/f/f_op/f_op_msg/asm/func_8001F4B0.s new file mode 100644 index 00000000000..c25190f6a41 --- /dev/null +++ b/include/f/f_op/f_op_msg/asm/func_8001F4B0.s @@ -0,0 +1,15 @@ +/* 8001F4B0 0001C3F0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F4B4 0001C3F4 7C 08 02 A6 */ mflr r0 +/* 8001F4B8 0001C3F8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F4BC 0001C3FC 7C 64 1B 78 */ mr r4, r3 +/* 8001F4C0 0001C400 38 60 00 01 */ li r3, 1 +/* 8001F4C4 0001C404 88 0D 8B A4 */ lbz r0, lbl_80451124-_SDA_BASE_(r13) +/* 8001F4C8 0001C408 7C 00 07 75 */ extsb. r0, r0 +/* 8001F4CC 0001C40C 40 82 00 0C */ bne lbl_8001F4D8 +/* 8001F4D0 0001C410 80 64 00 D8 */ lwz r3, 0xd8(r4) +/* 8001F4D4 0001C414 48 00 2F 8D */ bl fpcMtd_Execute +lbl_8001F4D8: +/* 8001F4D8 0001C418 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F4DC 0001C41C 7C 08 03 A6 */ mtlr r0 +/* 8001F4E0 0001C420 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F4E4 0001C424 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_msg/asm/func_8001F4E8.s b/include/f/f_op/f_op_msg/asm/func_8001F4E8.s new file mode 100644 index 00000000000..60ba9d8ef4c --- /dev/null +++ b/include/f/f_op/f_op_msg/asm/func_8001F4E8.s @@ -0,0 +1,22 @@ +/* 8001F4E8 0001C428 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F4EC 0001C42C 7C 08 02 A6 */ mflr r0 +/* 8001F4F0 0001C430 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F4F4 0001C434 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8001F4F8 0001C438 93 C1 00 08 */ stw r30, 8(r1) +/* 8001F4FC 0001C43C 7C 7E 1B 78 */ mr r30, r3 +/* 8001F500 0001C440 80 63 00 D8 */ lwz r3, 0xd8(r3) +/* 8001F504 0001C444 7F C4 F3 78 */ mr r4, r30 +/* 8001F508 0001C448 48 00 2F 7D */ bl fpcMtd_IsDelete +/* 8001F50C 0001C44C 7C 7F 1B 78 */ mr r31, r3 +/* 8001F510 0001C450 2C 1F 00 01 */ cmpwi r31, 1 +/* 8001F514 0001C454 40 82 00 0C */ bne lbl_8001F520 +/* 8001F518 0001C458 38 7E 00 C4 */ addi r3, r30, 0xc4 +/* 8001F51C 0001C45C 48 00 0F B9 */ bl fopDwTg_DrawQTo +lbl_8001F520: +/* 8001F520 0001C460 7F E3 FB 78 */ mr r3, r31 +/* 8001F524 0001C464 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8001F528 0001C468 83 C1 00 08 */ lwz r30, 8(r1) +/* 8001F52C 0001C46C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F530 0001C470 7C 08 03 A6 */ mtlr r0 +/* 8001F534 0001C474 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F538 0001C478 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_msg/asm/func_8001F53C.s b/include/f/f_op/f_op_msg/asm/func_8001F53C.s new file mode 100644 index 00000000000..ffdb94d4a87 --- /dev/null +++ b/include/f/f_op/f_op_msg/asm/func_8001F53C.s @@ -0,0 +1,19 @@ +/* 8001F53C 0001C47C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F540 0001C480 7C 08 02 A6 */ mflr r0 +/* 8001F544 0001C484 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F548 0001C488 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8001F54C 0001C48C 93 C1 00 08 */ stw r30, 8(r1) +/* 8001F550 0001C490 7C 7E 1B 78 */ mr r30, r3 +/* 8001F554 0001C494 80 63 00 D8 */ lwz r3, 0xd8(r3) +/* 8001F558 0001C498 7F C4 F3 78 */ mr r4, r30 +/* 8001F55C 0001C49C 48 00 2F 4D */ bl fpcMtd_Delete +/* 8001F560 0001C4A0 7C 7F 1B 78 */ mr r31, r3 +/* 8001F564 0001C4A4 38 7E 00 C4 */ addi r3, r30, 0xc4 +/* 8001F568 0001C4A8 48 00 0F 6D */ bl fopDwTg_DrawQTo +/* 8001F56C 0001C4AC 7F E3 FB 78 */ mr r3, r31 +/* 8001F570 0001C4B0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8001F574 0001C4B4 83 C1 00 08 */ lwz r30, 8(r1) +/* 8001F578 0001C4B8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F57C 0001C4BC 7C 08 03 A6 */ mtlr r0 +/* 8001F580 0001C4C0 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F584 0001C4C4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_msg/asm/func_8001F588.s b/include/f/f_op/f_op_msg/asm/func_8001F588.s new file mode 100644 index 00000000000..1a1bf92538b --- /dev/null +++ b/include/f/f_op/f_op_msg/asm/func_8001F588.s @@ -0,0 +1,56 @@ +/* 8001F588 0001C4C8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F58C 0001C4CC 7C 08 02 A6 */ mflr r0 +/* 8001F590 0001C4D0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F594 0001C4D4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8001F598 0001C4D8 93 C1 00 08 */ stw r30, 8(r1) +/* 8001F59C 0001C4DC 7C 7F 1B 78 */ mr r31, r3 +/* 8001F5A0 0001C4E0 88 03 00 0C */ lbz r0, 0xc(r3) +/* 8001F5A4 0001C4E4 7C 00 07 75 */ extsb. r0, r0 +/* 8001F5A8 0001C4E8 40 82 00 70 */ bne lbl_8001F618 +/* 8001F5AC 0001C4EC 83 C3 00 10 */ lwz r30, 0x10(r3) +/* 8001F5B0 0001C4F0 38 6D 87 70 */ la r3, lbl_80450CF0(r13) +/* 8001F5B4 0001C4F4 48 00 10 A9 */ bl fpcBs_MakeOfType +/* 8001F5B8 0001C4F8 90 7F 00 C0 */ stw r3, 0xc0(r31) +/* 8001F5BC 0001C4FC 80 1E 00 24 */ lwz r0, 0x24(r30) +/* 8001F5C0 0001C500 90 1F 00 D8 */ stw r0, 0xd8(r31) +/* 8001F5C4 0001C504 38 7F 00 C4 */ addi r3, r31, 0xc4 +/* 8001F5C8 0001C508 7F E4 FB 78 */ mr r4, r31 +/* 8001F5CC 0001C50C 48 00 0F 29 */ bl fopDwTg_Init +/* 8001F5D0 0001C510 7F E3 FB 78 */ mr r3, r31 +/* 8001F5D4 0001C514 48 00 04 71 */ bl fopMsgM_GetAppend +/* 8001F5D8 0001C518 28 03 00 00 */ cmplwi r3, 0 +/* 8001F5DC 0001C51C 41 82 00 3C */ beq lbl_8001F618 +/* 8001F5E0 0001C520 80 03 00 00 */ lwz r0, 0(r3) +/* 8001F5E4 0001C524 90 1F 00 DC */ stw r0, 0xdc(r31) +/* 8001F5E8 0001C528 C0 03 00 04 */ lfs f0, 4(r3) +/* 8001F5EC 0001C52C D0 1F 00 E0 */ stfs f0, 0xe0(r31) +/* 8001F5F0 0001C530 C0 03 00 08 */ lfs f0, 8(r3) +/* 8001F5F4 0001C534 D0 1F 00 E4 */ stfs f0, 0xe4(r31) +/* 8001F5F8 0001C538 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8001F5FC 0001C53C D0 1F 00 E8 */ stfs f0, 0xe8(r31) +/* 8001F600 0001C540 80 03 00 10 */ lwz r0, 0x10(r3) +/* 8001F604 0001C544 90 1F 00 EC */ stw r0, 0xec(r31) +/* 8001F608 0001C548 80 03 00 14 */ lwz r0, 0x14(r3) +/* 8001F60C 0001C54C 90 1F 00 F0 */ stw r0, 0xf0(r31) +/* 8001F610 0001C550 80 03 00 18 */ lwz r0, 0x18(r3) +/* 8001F614 0001C554 90 1F 00 F4 */ stw r0, 0xf4(r31) +lbl_8001F618: +/* 8001F618 0001C558 80 7F 00 D8 */ lwz r3, 0xd8(r31) +/* 8001F61C 0001C55C 7F E4 FB 78 */ mr r4, r31 +/* 8001F620 0001C560 48 00 2E AD */ bl fpcMtd_Create +/* 8001F624 0001C564 7C 7E 1B 78 */ mr r30, r3 +/* 8001F628 0001C568 2C 1E 00 04 */ cmpwi r30, 4 +/* 8001F62C 0001C56C 40 82 00 18 */ bne lbl_8001F644 +/* 8001F630 0001C570 7F E3 FB 78 */ mr r3, r31 +/* 8001F634 0001C574 48 00 23 CD */ bl fpcLf_GetPriority +/* 8001F638 0001C578 7C 64 07 34 */ extsh r4, r3 +/* 8001F63C 0001C57C 38 7F 00 C4 */ addi r3, r31, 0xc4 +/* 8001F640 0001C580 48 00 0E 6D */ bl fopDwTg_ToDrawQ +lbl_8001F644: +/* 8001F644 0001C584 7F C3 F3 78 */ mr r3, r30 +/* 8001F648 0001C588 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8001F64C 0001C58C 83 C1 00 08 */ lwz r30, 8(r1) +/* 8001F650 0001C590 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F654 0001C594 7C 08 03 A6 */ mtlr r0 +/* 8001F658 0001C598 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F65C 0001C59C 4E 80 00 20 */ blr diff --git a/ldscript.lcf b/ldscript.lcf index 8b6b43bea31..54f84f20b61 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3420,6 +3420,11 @@ func_8001F368 func_8001F314 func_8001F2C0 fopKy_Draw +func_8001F588 +func_8001F53C +func_8001F4E8 +func_8001F4B0 +fopMsg_Draw } /* .init 80003100 - 80005600 diff --git a/obj_files.mk b/obj_files.mk index bc35a941f44..775769db52e 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -67,7 +67,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/src/f/f_op/f_op_scene_tag.o \ $(BUILD_DIR)/src/f/f_op/f_op_view.o \ $(BUILD_DIR)/src/f/f_op/f_op_kankyo.o \ - $(BUILD_DIR)/asm/f/op/f_op_msg.o \ + $(BUILD_DIR)/src/f/f_op/f_op_msg.o \ $(BUILD_DIR)/asm/sdata2/f_op_kankyo_mng.o \ $(BUILD_DIR)/src/f/f_op/f_op_kankyo_mng.o \ $(BUILD_DIR)/asm/sdata2/f_op_msg_mng.o \ diff --git a/src/f/f_op/f_op_msg.cpp b/src/f/f_op/f_op_msg.cpp index 4bf93c8658d..d1c1867b088 100644 --- a/src/f/f_op/f_op_msg.cpp +++ b/src/f/f_op/f_op_msg.cpp @@ -1 +1,68 @@ -// ok +/* f_op_msg.cpp autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071191 */ + +#include "global.h" + +// additional symbols needed for f_op_msg.cpp +// autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071227 +extern "C" { + void fopDwTg_DrawQTo(void); + void fopDwTg_Init(void); + void fopDwTg_ToDrawQ(void); + void fopMsgM_GetAppend(void); + void fopMsg_Draw(void); + void fpcBs_MakeOfType(void); + void fpcLf_DrawMethod(void); + void fpcLf_GetPriority(void); + void fpcMtd_Create(void); + void fpcMtd_Delete(void); + void fpcMtd_Execute(void); + void fpcMtd_IsDelete(void); + void func_8001F4B0(void); + void func_8001F4E8(void); + void func_8001F53C(void); + void func_8001F588(void); +} + +// additional symbols needed for f_op_msg.cpp +// autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071235 +extern u8 lbl_80450CF0; +extern u8 lbl_80451124; + + +extern "C" { +// fopMsg_Draw__FPv +// fopMsg_Draw(void*) +asm void fopMsg_Draw(void) { + nofralloc + #include "f/f_op/f_op_msg/asm/func_8001F488.s" +} + +// fopMsg_Execute__FPv +// fopMsg_Execute(void*) +asm void func_8001F4B0(void) { + nofralloc + #include "f/f_op/f_op_msg/asm/func_8001F4B0.s" +} + +// fopMsg_IsDelete__FPv +// fopMsg_IsDelete(void*) +asm void func_8001F4E8(void) { + nofralloc + #include "f/f_op/f_op_msg/asm/func_8001F4E8.s" +} + +// fopMsg_Delete__FPv +// fopMsg_Delete(void*) +asm void func_8001F53C(void) { + nofralloc + #include "f/f_op/f_op_msg/asm/func_8001F53C.s" +} + +// fopMsg_Create__FPv +// fopMsg_Create(void*) +asm void func_8001F588(void) { + nofralloc + #include "f/f_op/f_op_msg/asm/func_8001F588.s" +} + +};