diff --git a/asm/bss.s b/asm/bss.s index bb36b7a811d..bfdb5a86572 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -110,8 +110,8 @@ l_fopCamM_id: .global l_fopOvlpM_Request l_fopOvlpM_Request: .skip 0x28 -.global lbl_803F1E10 -lbl_803F1E10: +.global lists +lists: .skip 0x2EE0 .global lbl_803F4CF0 lbl_803F4CF0: diff --git a/include/f/f_op/f_op_draw_tag/asm/func_80020518.s b/include/f/f_op/f_op_draw_tag/asm/func_80020518.s index f8a705db71e..2c8a4fe6f58 100644 --- a/include/f/f_op/f_op_draw_tag/asm/func_80020518.s +++ b/include/f/f_op/f_op_draw_tag/asm/func_80020518.s @@ -2,8 +2,8 @@ /* 8002051C 0001D45C 7C 08 02 A6 */ mflr r0 /* 80020520 0001D460 90 01 00 14 */ stw r0, 0x14(r1) /* 80020524 0001D464 38 6D 80 50 */ la r3, g_fopDwTg_Queue(r13) -/* 80020528 0001D468 3C 80 80 3F */ lis r4, lbl_803F1E10@ha -/* 8002052C 0001D46C 38 84 1E 10 */ addi r4, r4, lbl_803F1E10@l +/* 80020528 0001D468 3C 80 80 3F */ lis r4, lists@ha +/* 8002052C 0001D46C 38 84 1E 10 */ addi r4, r4, lists@l /* 80020530 0001D470 38 A0 03 E8 */ li r5, 0x3e8 /* 80020534 0001D474 48 24 5F B5 */ bl cTr_Create /* 80020538 0001D478 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp index c2b2c2c04c4..d8cfab512e6 100644 --- a/src/f/f_op/f_op_draw_tag.cpp +++ b/src/f/f_op/f_op_draw_tag.cpp @@ -14,7 +14,7 @@ void fopDwTg_ToDrawQ__FP16create_tag_classi(void); // additional symbols needed for f_op_draw_tag.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463045 -extern u8 lbl_803F1E10; +extern node_list_class lists; extern node_lists_tree_class g_fopDwTg_Queue; void fopDwTg_ToDrawQ(create_tag_class* pCreateTagClass, int priority) { @@ -25,12 +25,11 @@ void fopDwTg_DrawQTo(create_tag_class* pCreateTagClass) { cTg_SingleCutFromTree(pCreateTagClass); } -asm void fopDwTg_Init(create_tag_class*, void*) { - nofralloc -#include "f/f_op/f_op_draw_tag/asm/func_800204F4.s" +bool fopDwTg_Init(create_tag_class* pCreateTagClass, void* pActor) { + cTg_Create(pCreateTagClass,pActor); + return true; } -asm void fopDwTg_CreateQueue(void) { - nofralloc -#include "f/f_op/f_op_draw_tag/asm/func_80020518.s" -} +void fopDwTg_CreateQueue(void) { + cTr_Create(&g_fopDwTg_Queue,&lists,1000); +} \ No newline at end of file