diff --git a/asm/f/op/f_op_view.s b/asm/f/op/f_op_view.s deleted file mode 100644 index 1e8538fc059..00000000000 --- a/asm/f/op/f_op_view.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 8001f1a8 - - -/* 8001F1A8 0001C0E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F1AC 0001C0EC 7C 08 02 A6 */ mflr r0 -/* 8001F1B0 0001C0F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F1B4 0001C0F4 7C 64 1B 78 */ mr r4, r3 -/* 8001F1B8 0001C0F8 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F1BC 0001C0FC 48 00 28 69 */ bl fpcLf_DrawMethod -/* 8001F1C0 0001C100 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F1C4 0001C104 7C 08 03 A6 */ mtlr r0 -/* 8001F1C8 0001C108 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F1CC 0001C10C 4E 80 00 20 */ blr -/* 8001F1D0 0001C110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F1D4 0001C114 7C 08 02 A6 */ mflr r0 -/* 8001F1D8 0001C118 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F1DC 0001C11C 7C 64 1B 78 */ mr r4, r3 -/* 8001F1E0 0001C120 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F1E4 0001C124 48 00 32 7D */ bl fpcMtd_Execute -/* 8001F1E8 0001C128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F1EC 0001C12C 7C 08 03 A6 */ mtlr r0 -/* 8001F1F0 0001C130 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F1F4 0001C134 4E 80 00 20 */ blr -/* 8001F1F8 0001C138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F1FC 0001C13C 7C 08 02 A6 */ mflr r0 -/* 8001F200 0001C140 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F204 0001C144 7C 64 1B 78 */ mr r4, r3 -/* 8001F208 0001C148 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F20C 0001C14C 48 00 32 79 */ bl fpcMtd_IsDelete -/* 8001F210 0001C150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F214 0001C154 7C 08 03 A6 */ mtlr r0 -/* 8001F218 0001C158 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F21C 0001C15C 4E 80 00 20 */ blr -/* 8001F220 0001C160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F224 0001C164 7C 08 02 A6 */ mflr r0 -/* 8001F228 0001C168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F22C 0001C16C 7C 64 1B 78 */ mr r4, r3 -/* 8001F230 0001C170 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F234 0001C174 48 00 32 75 */ bl fpcMtd_Delete -/* 8001F238 0001C178 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F23C 0001C17C 7C 08 03 A6 */ mtlr r0 -/* 8001F240 0001C180 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F244 0001C184 4E 80 00 20 */ blr -/* 8001F248 0001C188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001F24C 0001C18C 7C 08 02 A6 */ mflr r0 -/* 8001F250 0001C190 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F254 0001C194 7C 64 1B 78 */ mr r4, r3 -/* 8001F258 0001C198 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8001F25C 0001C19C 80 03 00 24 */ lwz r0, 0x24(r3) -/* 8001F260 0001C1A0 90 04 00 C0 */ stw r0, 0xc0(r4) -/* 8001F264 0001C1A4 88 03 00 28 */ lbz r0, 0x28(r3) -/* 8001F268 0001C1A8 98 04 00 C4 */ stb r0, 0xc4(r4) -/* 8001F26C 0001C1AC 80 64 00 C0 */ lwz r3, 0xc0(r4) -/* 8001F270 0001C1B0 48 00 32 5D */ bl fpcMtd_Create -/* 8001F274 0001C1B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001F278 0001C1B8 7C 08 03 A6 */ mtlr r0 -/* 8001F27C 0001C1BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001F280 0001C1C0 4E 80 00 20 */ blr diff --git a/include/f/f_op/f_op_view/asm/func_8001F1A8.s b/include/f/f_op/f_op_view/asm/func_8001F1A8.s new file mode 100644 index 00000000000..e1baca0d73a --- /dev/null +++ b/include/f/f_op/f_op_view/asm/func_8001F1A8.s @@ -0,0 +1,10 @@ +/* 8001F1A8 0001C0E8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F1AC 0001C0EC 7C 08 02 A6 */ mflr r0 +/* 8001F1B0 0001C0F0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F1B4 0001C0F4 7C 64 1B 78 */ mr r4, r3 +/* 8001F1B8 0001C0F8 80 63 00 C0 */ lwz r3, 0xc0(r3) +/* 8001F1BC 0001C0FC 48 00 28 69 */ bl fpcLf_DrawMethod +/* 8001F1C0 0001C100 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F1C4 0001C104 7C 08 03 A6 */ mtlr r0 +/* 8001F1C8 0001C108 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F1CC 0001C10C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_view/asm/func_8001F1D0.s b/include/f/f_op/f_op_view/asm/func_8001F1D0.s new file mode 100644 index 00000000000..d712430c59b --- /dev/null +++ b/include/f/f_op/f_op_view/asm/func_8001F1D0.s @@ -0,0 +1,10 @@ +/* 8001F1D0 0001C110 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F1D4 0001C114 7C 08 02 A6 */ mflr r0 +/* 8001F1D8 0001C118 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F1DC 0001C11C 7C 64 1B 78 */ mr r4, r3 +/* 8001F1E0 0001C120 80 63 00 C0 */ lwz r3, 0xc0(r3) +/* 8001F1E4 0001C124 48 00 32 7D */ bl fpcMtd_Execute +/* 8001F1E8 0001C128 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F1EC 0001C12C 7C 08 03 A6 */ mtlr r0 +/* 8001F1F0 0001C130 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F1F4 0001C134 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_view/asm/func_8001F1F8.s b/include/f/f_op/f_op_view/asm/func_8001F1F8.s new file mode 100644 index 00000000000..a17122c9a03 --- /dev/null +++ b/include/f/f_op/f_op_view/asm/func_8001F1F8.s @@ -0,0 +1,10 @@ +/* 8001F1F8 0001C138 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F1FC 0001C13C 7C 08 02 A6 */ mflr r0 +/* 8001F200 0001C140 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F204 0001C144 7C 64 1B 78 */ mr r4, r3 +/* 8001F208 0001C148 80 63 00 C0 */ lwz r3, 0xc0(r3) +/* 8001F20C 0001C14C 48 00 32 79 */ bl fpcMtd_IsDelete +/* 8001F210 0001C150 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F214 0001C154 7C 08 03 A6 */ mtlr r0 +/* 8001F218 0001C158 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F21C 0001C15C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_view/asm/func_8001F220.s b/include/f/f_op/f_op_view/asm/func_8001F220.s new file mode 100644 index 00000000000..9bb0f8447ee --- /dev/null +++ b/include/f/f_op/f_op_view/asm/func_8001F220.s @@ -0,0 +1,10 @@ +/* 8001F220 0001C160 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F224 0001C164 7C 08 02 A6 */ mflr r0 +/* 8001F228 0001C168 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F22C 0001C16C 7C 64 1B 78 */ mr r4, r3 +/* 8001F230 0001C170 80 63 00 C0 */ lwz r3, 0xc0(r3) +/* 8001F234 0001C174 48 00 32 75 */ bl fpcMtd_Delete +/* 8001F238 0001C178 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F23C 0001C17C 7C 08 03 A6 */ mtlr r0 +/* 8001F240 0001C180 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F244 0001C184 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/f/f_op/f_op_view/asm/func_8001F248.s b/include/f/f_op/f_op_view/asm/func_8001F248.s new file mode 100644 index 00000000000..d4886175fd4 --- /dev/null +++ b/include/f/f_op/f_op_view/asm/func_8001F248.s @@ -0,0 +1,15 @@ +/* 8001F248 0001C188 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8001F24C 0001C18C 7C 08 02 A6 */ mflr r0 +/* 8001F250 0001C190 90 01 00 14 */ stw r0, 0x14(r1) +/* 8001F254 0001C194 7C 64 1B 78 */ mr r4, r3 +/* 8001F258 0001C198 80 63 00 10 */ lwz r3, 0x10(r3) +/* 8001F25C 0001C19C 80 03 00 24 */ lwz r0, 0x24(r3) +/* 8001F260 0001C1A0 90 04 00 C0 */ stw r0, 0xc0(r4) +/* 8001F264 0001C1A4 88 03 00 28 */ lbz r0, 0x28(r3) +/* 8001F268 0001C1A8 98 04 00 C4 */ stb r0, 0xc4(r4) +/* 8001F26C 0001C1AC 80 64 00 C0 */ lwz r3, 0xc0(r4) +/* 8001F270 0001C1B0 48 00 32 5D */ bl fpcMtd_Create +/* 8001F274 0001C1B4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8001F278 0001C1B8 7C 08 03 A6 */ mtlr r0 +/* 8001F27C 0001C1BC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8001F280 0001C1C0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/ldscript.lcf b/ldscript.lcf index b0936f51436..bd14dff639a 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3375,6 +3375,11 @@ fopAcM_SetMin__FP10fopAc_ac_cfff fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i fopAcM_SearchByName__FsPP10fopAc_ac_c func_80018B28 +fopVw_Draw +func_8001F248 +func_8001F220 +func_8001F1F8 +func_8001F1D0 } /* .init 80003100 - 80005600 diff --git a/obj_files.mk b/obj_files.mk index 4f846d3b031..93de19243b3 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -65,7 +65,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/src/f/f_op/f_op_scene_mng.o \ $(BUILD_DIR)/asm/f/op/scene/f_op_scene_req.o \ $(BUILD_DIR)/asm/f/op/scene/f_op_scene_tag.o \ - $(BUILD_DIR)/asm/f/op/f_op_view.o \ + $(BUILD_DIR)/src/f/f_op/f_op_view.o \ $(BUILD_DIR)/asm/f/op/f_op_kankyo.o \ $(BUILD_DIR)/asm/f/op/f_op_msg.o \ $(BUILD_DIR)/asm/sdata2/f_op_kankyo_mng.o \ diff --git a/src/f/f_op/f_op_view.cpp b/src/f/f_op/f_op_view.cpp index 4bf93c8658d..7fa8bed4d1e 100644 --- a/src/f/f_op/f_op_view.cpp +++ b/src/f/f_op/f_op_view.cpp @@ -1 +1,58 @@ -// ok +/* f_op_view.cpp autogenerated by split.py v0.4 at 2021-02-15 20:05:33.635938 */ + +#include "global.h" + +// additional symbols needed for f_op_view.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:05:33.635977 +extern "C" { +void fopVw_Draw(void); +void fpcLf_DrawMethod(void); +void fpcMtd_Create(void); +void fpcMtd_Delete(void); +void fpcMtd_Execute(void); +void fpcMtd_IsDelete(void); +void func_8001F1D0(void); +void func_8001F1F8(void); +void func_8001F220(void); +void func_8001F248(void); +} + +// additional symbols needed for f_op_view.cpp +// autogenerated by split.py v0.4 at 2021-02-15 20:05:33.635984 + +extern "C" { +// fopVw_Draw__FP10view_class +// fopVw_Draw(view_class*) +asm void fopVw_Draw(void) { + nofralloc +#include "f/f_op/f_op_view/asm/func_8001F1A8.s" +} + +// fopVw_Execute__FP10view_class +// fopVw_Execute(view_class*) +asm void func_8001F1D0(void) { + nofralloc +#include "f/f_op/f_op_view/asm/func_8001F1D0.s" +} + +// fopVw_IsDelete__FPv +// fopVw_IsDelete(void*) +asm void func_8001F1F8(void) { + nofralloc +#include "f/f_op/f_op_view/asm/func_8001F1F8.s" +} + +// fopVw_Delete__FP10view_class +// fopVw_Delete(view_class*) +asm void func_8001F220(void) { + nofralloc +#include "f/f_op/f_op_view/asm/func_8001F220.s" +} + +// fopVw_Create__FPv +// fopVw_Create(void*) +asm void func_8001F248(void) { + nofralloc +#include "f/f_op/f_op_view/asm/func_8001F248.s" +} +};