From b6369be75be2b38d2311cdddbaecb5373a15045b Mon Sep 17 00:00:00 2001 From: hev7 <143887945+hev7@users.noreply.github.com> Date: Sat, 16 Sep 2023 18:22:57 +0100 Subject: [PATCH] d_a_obj_swspinner OK, d_a_obj_lv4gear OK (#1931) --- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__14daObjLv4Gear_cFv.s | 33 - .../Create__14daObjLv4Gear_cFv.s | 22 - .../_delete__14daObjLv4Gear_cFv.s | 14 - .../daObjLv4Gear_Create__FP14daObjLv4Gear_c.s | 9 - .../daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s | 9 - .../daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s | 9 - ...daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s | 9 - .../draw__14daObjLv4Gear_cFv.s | 26 - .../execute__14daObjLv4Gear_cFv.s | 134 ---- .../d_a_obj_lv4gear/func_80C68124.s | 58 -- .../initBaseMtx__14daObjLv4Gear_cFv.s | 16 - .../d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s | 34 - .../setBaseMtx__14daObjLv4Gear_cFv.s | 25 - .../CreateHeap__16daObjSwSpinner_cFv.s | 86 --- .../Create__16daObjSwSpinner_cFv.s | 57 -- .../Delete__16daObjSwSpinner_cFv.s | 29 - .../Draw__16daObjSwSpinner_cFv.s | 50 -- .../Execute__16daObjSwSpinner_cFPPA3_A4_f.s | 238 ------- .../create1st__16daObjSwSpinner_cFv.s | 35 - ...inner_MoveBGDelete__FP16daObjSwSpinner_c.s | 9 - ...Spinner_MoveBGDraw__FP16daObjSwSpinner_c.s | 12 - ...nner_MoveBGExecute__FP16daObjSwSpinner_c.s | 9 - ...wSpinner_create1st__FP16daObjSwSpinner_c.s | 27 - .../initBaseMtx__16daObjSwSpinner_cFv.s | 23 - .../search_spinner_sub__FPvPv.s | 143 ---- .../setBaseMtx__16daObjSwSpinner_cFv.s | 47 -- include/rel/d/a/d_a_spinner/d_a_spinner.h | 10 +- .../d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h | 33 +- .../obj/d_a_obj_swspinner/d_a_obj_swspinner.h | 35 +- .../a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp | 411 ++++-------- .../d_a_obj_swspinner/d_a_obj_swspinner.cpp | 620 ++++++------------ 32 files changed, 415 insertions(+), 1866 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CreateHeap__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/Create__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/_delete__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Create__FP14daObjLv4Gear_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/draw__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/execute__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/func_80C68124.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/initBaseMtx__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/setBaseMtx__14daObjLv4Gear_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/CreateHeap__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Create__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Delete__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Draw__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Execute__16daObjSwSpinner_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/create1st__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_create1st__FP16daObjSwSpinner_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/initBaseMtx__16daObjSwSpinner_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/search_spinner_sub__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/setBaseMtx__16daObjSwSpinner_cFv.s diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 058d67065b8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C67F18: -/* 80C67F18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67F1C 7C 08 02 A6 */ mflr r0 -/* 80C67F20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67F24 48 00 01 81 */ bl CreateHeap__14daObjLv4Gear_cFv -/* 80C67F28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67F2C 7C 08 03 A6 */ mtlr r0 -/* 80C67F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67F34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CreateHeap__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CreateHeap__14daObjLv4Gear_cFv.s deleted file mode 100644 index c9cb5d1a666..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CreateHeap__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C680A4: -/* 80C680A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C680A8 7C 08 02 A6 */ mflr r0 -/* 80C680AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C680B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C680B4 7C 7F 1B 78 */ mr r31, r3 -/* 80C680B8 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C6852C@ha */ -/* 80C680BC 38 63 85 2C */ addi r3, r3, l_arcName@l /* 0x80C6852C@l */ -/* 80C680C0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C680C4 88 1F 05 82 */ lbz r0, 0x582(r31) -/* 80C680C8 54 00 10 3A */ slwi r0, r0, 2 -/* 80C680CC 3C 80 80 C7 */ lis r4, l_bmd@ha /* 0x80C68500@ha */ -/* 80C680D0 38 84 85 00 */ addi r4, r4, l_bmd@l /* 0x80C68500@l */ -/* 80C680D4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C680D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C680DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C680E0 3C A5 00 02 */ addis r5, r5, 2 -/* 80C680E4 38 C0 00 80 */ li r6, 0x80 -/* 80C680E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C680EC 4B 3D 42 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C680F0 3C 80 00 08 */ lis r4, 8 -/* 80C680F4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C680F8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C680FC 4B 3A CB 59 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C68100 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80C68104 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C68108 30 03 FF FF */ addic r0, r3, -1 -/* 80C6810C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C68110 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C68114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C68118 7C 08 03 A6 */ mtlr r0 -/* 80C6811C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C68120 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/Create__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/Create__14daObjLv4Gear_cFv.s deleted file mode 100644 index 76372afb947..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/Create__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C68050: -/* 80C68050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C68054 7C 08 02 A6 */ mflr r0 -/* 80C68058 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6805C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C68060 7C 7F 1B 78 */ mr r31, r3 -/* 80C68064 4B FF FF 51 */ bl initBaseMtx__14daObjLv4Gear_cFv -/* 80C68068 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C6806C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C68070 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C68074 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C68078 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6807C 7F E3 FB 78 */ mr r3, r31 -/* 80C68080 4B 3B 24 F9 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C68084 38 00 FF FF */ li r0, -1 -/* 80C68088 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80C6808C 38 60 00 01 */ li r3, 1 -/* 80C68090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C68094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C68098 7C 08 03 A6 */ mtlr r0 -/* 80C6809C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C680A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/_delete__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/_delete__14daObjLv4Gear_cFv.s deleted file mode 100644 index 7e72907e861..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/_delete__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80C68444: -/* 80C68444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C68448 7C 08 02 A6 */ mflr r0 -/* 80C6844C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C68450 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C6852C@ha */ -/* 80C68454 38 84 85 2C */ addi r4, r4, l_arcName@l /* 0x80C6852C@l */ -/* 80C68458 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6845C 38 63 05 68 */ addi r3, r3, 0x568 -/* 80C68460 4B 3C 4B A9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C68464 38 60 00 01 */ li r3, 1 -/* 80C68468 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6846C 7C 08 03 A6 */ mtlr r0 -/* 80C68470 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C68474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Create__FP14daObjLv4Gear_c.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Create__FP14daObjLv4Gear_c.s deleted file mode 100644 index 0c9faa825cc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Create__FP14daObjLv4Gear_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C684D8: -/* 80C684D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C684DC 7C 08 02 A6 */ mflr r0 -/* 80C684E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C684E4 4B FF FC 41 */ bl create__14daObjLv4Gear_cFv -/* 80C684E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C684EC 7C 08 03 A6 */ mtlr r0 -/* 80C684F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C684F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s deleted file mode 100644 index a0641624f03..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C684B8: -/* 80C684B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C684BC 7C 08 02 A6 */ mflr r0 -/* 80C684C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C684C4 4B FF FF 81 */ bl _delete__14daObjLv4Gear_cFv -/* 80C684C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C684CC 7C 08 03 A6 */ mtlr r0 -/* 80C684D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C684D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s deleted file mode 100644 index 1446d661bf9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C68478: -/* 80C68478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6847C 7C 08 02 A6 */ mflr r0 -/* 80C68480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C68484 4B FF FF 5D */ bl draw__14daObjLv4Gear_cFv -/* 80C68488 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6848C 7C 08 03 A6 */ mtlr r0 -/* 80C68490 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C68494 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s deleted file mode 100644 index ccd11e91001..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C68498: -/* 80C68498 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6849C 7C 08 02 A6 */ mflr r0 -/* 80C684A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C684A4 4B FF FD 51 */ bl execute__14daObjLv4Gear_cFv -/* 80C684A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C684AC 7C 08 03 A6 */ mtlr r0 -/* 80C684B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C684B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/draw__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/draw__14daObjLv4Gear_cFv.s deleted file mode 100644 index 50bd8b63ff6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/draw__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C683E0: -/* 80C683E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C683E4 7C 08 02 A6 */ mflr r0 -/* 80C683E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C683EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C683F0 7C 7F 1B 78 */ mr r31, r3 -/* 80C683F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C683F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C683FC 38 80 00 00 */ li r4, 0 -/* 80C68400 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C68404 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C68408 4B 53 B3 BD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C6840C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C68410 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C68414 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80C68418 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6841C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C68420 4B 53 C9 81 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C68424 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C68428 4B 3A 58 9D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6842C 38 60 00 01 */ li r3, 1 -/* 80C68430 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C68434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C68438 7C 08 03 A6 */ mtlr r0 -/* 80C6843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C68440 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/execute__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/execute__14daObjLv4Gear_cFv.s deleted file mode 100644 index 4ba9eee8b99..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/execute__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80C681F4: -/* 80C681F4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C681F8 7C 08 02 A6 */ mflr r0 -/* 80C681FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C68200 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C68204 4B 6F 9F D9 */ bl _savegpr_29 -/* 80C68208 7C 7D 1B 78 */ mr r29, r3 -/* 80C6820C 3C 60 80 C7 */ lis r3, l_bmd@ha /* 0x80C68500@ha */ -/* 80C68210 3B E3 85 00 */ addi r31, r3, l_bmd@l /* 0x80C68500@l */ -/* 80C68214 38 00 00 00 */ li r0, 0 -/* 80C68218 B0 1D 05 74 */ sth r0, 0x574(r29) -/* 80C6821C 80 7D 05 7C */ lwz r3, 0x57c(r29) -/* 80C68220 3C 03 00 01 */ addis r0, r3, 1 -/* 80C68224 28 00 FF FF */ cmplwi r0, 0xffff -/* 80C68228 40 82 00 34 */ bne lbl_80C6825C -/* 80C6822C 3C 60 80 C6 */ lis r3, searchSwSpinSub__FPvPv@ha /* 0x80C67F38@ha */ -/* 80C68230 38 63 7F 38 */ addi r3, r3, searchSwSpinSub__FPvPv@l /* 0x80C67F38@l */ -/* 80C68234 7F A4 EB 78 */ mr r4, r29 -/* 80C68238 4B 3B 91 01 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80C6823C 28 03 00 00 */ cmplwi r3, 0 -/* 80C68240 41 82 01 6C */ beq lbl_80C683AC -/* 80C68244 41 82 00 0C */ beq lbl_80C68250 -/* 80C68248 80 03 00 04 */ lwz r0, 4(r3) -/* 80C6824C 48 00 00 08 */ b lbl_80C68254 -lbl_80C68250: -/* 80C68250 38 00 FF FF */ li r0, -1 -lbl_80C68254: -/* 80C68254 90 1D 05 7C */ stw r0, 0x57c(r29) -/* 80C68258 48 00 01 54 */ b lbl_80C683AC -lbl_80C6825C: -/* 80C6825C 90 61 00 10 */ stw r3, 0x10(r1) -/* 80C68260 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C68264 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C68268 38 81 00 10 */ addi r4, r1, 0x10 -/* 80C6826C 4B 3B 15 8D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C68270 28 03 00 00 */ cmplwi r3, 0 -/* 80C68274 41 82 00 0C */ beq lbl_80C68280 -/* 80C68278 A8 03 05 EE */ lha r0, 0x5ee(r3) -/* 80C6827C B0 1D 05 74 */ sth r0, 0x574(r29) -lbl_80C68280: -/* 80C68280 A8 1D 05 74 */ lha r0, 0x574(r29) -/* 80C68284 2C 00 00 00 */ cmpwi r0, 0 -/* 80C68288 40 82 00 10 */ bne lbl_80C68298 -/* 80C6828C 38 00 00 00 */ li r0, 0 -/* 80C68290 B0 1D 05 80 */ sth r0, 0x580(r29) -/* 80C68294 48 00 00 10 */ b lbl_80C682A4 -lbl_80C68298: -/* 80C68298 A0 7D 05 80 */ lhz r3, 0x580(r29) -/* 80C6829C 38 03 00 01 */ addi r0, r3, 1 -/* 80C682A0 B0 1D 05 80 */ sth r0, 0x580(r29) -lbl_80C682A4: -/* 80C682A4 A0 9D 05 80 */ lhz r4, 0x580(r29) -/* 80C682A8 88 1D 05 82 */ lbz r0, 0x582(r29) -/* 80C682AC 54 00 08 3C */ slwi r0, r0, 1 -/* 80C682B0 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80C682B4 7C 03 02 AE */ lhax r0, r3, r0 -/* 80C682B8 7C 04 00 00 */ cmpw r4, r0 -/* 80C682BC 40 81 00 18 */ ble lbl_80C682D4 -/* 80C682C0 38 7D 05 76 */ addi r3, r29, 0x576 -/* 80C682C4 A8 9D 05 74 */ lha r4, 0x574(r29) -/* 80C682C8 38 A0 00 0A */ li r5, 0xa -/* 80C682CC 4B 60 84 05 */ bl cLib_chaseS__FPsss -/* 80C682D0 48 00 00 14 */ b lbl_80C682E4 -lbl_80C682D4: -/* 80C682D4 38 7D 05 76 */ addi r3, r29, 0x576 -/* 80C682D8 38 80 00 00 */ li r4, 0 -/* 80C682DC 38 A0 00 32 */ li r5, 0x32 -/* 80C682E0 4B 60 83 F1 */ bl cLib_chaseS__FPsss -lbl_80C682E4: -/* 80C682E4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80C682E8 54 00 A7 3F */ rlwinm. r0, r0, 0x14, 0x1c, 0x1f -/* 80C682EC 40 82 00 C0 */ bne lbl_80C683AC -/* 80C682F0 AB DD 05 76 */ lha r30, 0x576(r29) -/* 80C682F4 7F C0 07 35 */ extsh. r0, r30 -/* 80C682F8 41 82 00 B4 */ beq lbl_80C683AC -/* 80C682FC 88 1D 05 82 */ lbz r0, 0x582(r29) -/* 80C68300 28 00 00 00 */ cmplwi r0, 0 -/* 80C68304 40 82 00 54 */ bne lbl_80C68358 -/* 80C68308 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80C6830C 7C 03 07 74 */ extsb r3, r0 -/* 80C68310 4B 3C 4D 5D */ bl dComIfGp_getReverb__Fi -/* 80C68314 7C 67 1B 78 */ mr r7, r3 -/* 80C68318 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008019F@ha */ -/* 80C6831C 38 03 01 9F */ addi r0, r3, 0x019F /* 0x0008019F@l */ -/* 80C68320 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C68324 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C68328 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6832C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C68330 38 81 00 0C */ addi r4, r1, 0xc -/* 80C68334 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80C68338 7F C6 F3 78 */ mr r6, r30 -/* 80C6833C C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80C68340 FC 40 08 90 */ fmr f2, f1 -/* 80C68344 C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80C68348 FC 80 18 90 */ fmr f4, f3 -/* 80C6834C 39 00 00 00 */ li r8, 0 -/* 80C68350 4B 64 41 BD */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C68354 48 00 00 58 */ b lbl_80C683AC -lbl_80C68358: -/* 80C68358 28 00 00 01 */ cmplwi r0, 1 -/* 80C6835C 40 82 00 50 */ bne lbl_80C683AC -/* 80C68360 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80C68364 7C 03 07 74 */ extsb r3, r0 -/* 80C68368 4B 3C 4D 05 */ bl dComIfGp_getReverb__Fi -/* 80C6836C 7C 67 1B 78 */ mr r7, r3 -/* 80C68370 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C1@ha */ -/* 80C68374 38 03 01 C1 */ addi r0, r3, 0x01C1 /* 0x000801C1@l */ -/* 80C68378 90 01 00 08 */ stw r0, 8(r1) -/* 80C6837C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C68380 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C68384 80 63 00 00 */ lwz r3, 0(r3) -/* 80C68388 38 81 00 08 */ addi r4, r1, 8 -/* 80C6838C 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80C68390 7F C6 F3 78 */ mr r6, r30 -/* 80C68394 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80C68398 FC 40 08 90 */ fmr f2, f1 -/* 80C6839C C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80C683A0 FC 80 18 90 */ fmr f4, f3 -/* 80C683A4 39 00 00 00 */ li r8, 0 -/* 80C683A8 4B 64 41 65 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C683AC: -/* 80C683AC A8 7D 05 78 */ lha r3, 0x578(r29) -/* 80C683B0 A8 1D 05 76 */ lha r0, 0x576(r29) -/* 80C683B4 7C 03 02 14 */ add r0, r3, r0 -/* 80C683B8 B0 1D 05 78 */ sth r0, 0x578(r29) -/* 80C683BC 7F A3 EB 78 */ mr r3, r29 -/* 80C683C0 4B FF FC 31 */ bl setBaseMtx__14daObjLv4Gear_cFv -/* 80C683C4 38 60 00 01 */ li r3, 1 -/* 80C683C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C683CC 4B 6F 9E 5D */ bl _restgpr_29 -/* 80C683D0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C683D4 7C 08 03 A6 */ mtlr r0 -/* 80C683D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C683DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/func_80C68124.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/func_80C68124.s deleted file mode 100644 index 04a4f040f04..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/func_80C68124.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80C68124: -/* 80C68124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C68128 7C 08 02 A6 */ mflr r0 -/* 80C6812C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C68130 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C68134 93 C1 00 08 */ stw r30, 8(r1) -/* 80C68138 7C 7E 1B 78 */ mr r30, r3 -/* 80C6813C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C68140 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C68144 40 82 00 1C */ bne lbl_80C68160 -/* 80C68148 28 1E 00 00 */ cmplwi r30, 0 -/* 80C6814C 41 82 00 08 */ beq lbl_80C68154 -/* 80C68150 4B 3B 0A 15 */ bl __ct__10fopAc_ac_cFv -lbl_80C68154: -/* 80C68154 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C68158 60 00 00 08 */ ori r0, r0, 8 -/* 80C6815C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C68160: -/* 80C68160 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C68164 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80C68168 98 1E 05 82 */ stb r0, 0x582(r30) -/* 80C6816C 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80C68170 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C6852C@ha */ -/* 80C68174 38 84 85 2C */ addi r4, r4, l_arcName@l /* 0x80C6852C@l */ -/* 80C68178 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6817C 4B 3C 4D 41 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C68180 7C 7F 1B 78 */ mr r31, r3 -/* 80C68184 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C68188 40 82 00 50 */ bne lbl_80C681D8 -/* 80C6818C 7F C3 F3 78 */ mr r3, r30 -/* 80C68190 3C 80 80 C6 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80C67F18@ha */ -/* 80C68194 38 84 7F 18 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80C67F18@l */ -/* 80C68198 88 1E 05 82 */ lbz r0, 0x582(r30) -/* 80C6819C 54 00 10 3A */ slwi r0, r0, 2 -/* 80C681A0 3C A0 80 C7 */ lis r5, l_heap_size@ha /* 0x80C68514@ha */ -/* 80C681A4 38 A5 85 14 */ addi r5, r5, l_heap_size@l /* 0x80C68514@l */ -/* 80C681A8 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80C681AC 4B 3B 23 05 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C681B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C681B4 40 82 00 0C */ bne lbl_80C681C0 -/* 80C681B8 38 60 00 05 */ li r3, 5 -/* 80C681BC 48 00 00 20 */ b lbl_80C681DC -lbl_80C681C0: -/* 80C681C0 7F C3 F3 78 */ mr r3, r30 -/* 80C681C4 4B FF FE 8D */ bl Create__14daObjLv4Gear_cFv -/* 80C681C8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C681CC 40 82 00 0C */ bne lbl_80C681D8 -/* 80C681D0 38 60 00 05 */ li r3, 5 -/* 80C681D4 48 00 00 08 */ b lbl_80C681DC -lbl_80C681D8: -/* 80C681D8 7F E3 FB 78 */ mr r3, r31 -lbl_80C681DC: -/* 80C681DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C681E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C681E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C681E8 7C 08 03 A6 */ mtlr r0 -/* 80C681EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C681F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/initBaseMtx__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/initBaseMtx__14daObjLv4Gear_cFv.s deleted file mode 100644 index d891acd07d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/initBaseMtx__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C67FB4: -/* 80C67FB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67FB8 7C 08 02 A6 */ mflr r0 -/* 80C67FBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67FC0 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80C67FC4 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80C67FC8 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80C67FCC C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80C67FD0 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80C67FD4 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80C67FD8 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80C67FDC 48 00 00 15 */ bl setBaseMtx__14daObjLv4Gear_cFv -/* 80C67FE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67FE4 7C 08 03 A6 */ mtlr r0 -/* 80C67FE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67FEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s deleted file mode 100644 index 407352c1b7a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C67F38: -/* 80C67F38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67F3C 7C 08 02 A6 */ mflr r0 -/* 80C67F40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67F44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67F48 93 C1 00 08 */ stw r30, 8(r1) -/* 80C67F4C 7C 9E 23 78 */ mr r30, r4 -/* 80C67F50 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C67F54 41 82 00 44 */ beq lbl_80C67F98 -/* 80C67F58 4B 3B 0D 89 */ bl fopAc_IsActor__FPv -/* 80C67F5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C67F60 41 82 00 38 */ beq lbl_80C67F98 -/* 80C67F64 A8 1F 00 0E */ lha r0, 0xe(r31) -/* 80C67F68 2C 00 00 B3 */ cmpwi r0, 0xb3 -/* 80C67F6C 40 82 00 2C */ bne lbl_80C67F98 -/* 80C67F70 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C67F74 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80C67F78 28 03 00 FF */ cmplwi r3, 0xff -/* 80C67F7C 41 82 00 1C */ beq lbl_80C67F98 -/* 80C67F80 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C67F84 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80C67F88 7C 03 00 40 */ cmplw r3, r0 -/* 80C67F8C 40 82 00 0C */ bne lbl_80C67F98 -/* 80C67F90 7F E3 FB 78 */ mr r3, r31 -/* 80C67F94 48 00 00 08 */ b lbl_80C67F9C -lbl_80C67F98: -/* 80C67F98 38 60 00 00 */ li r3, 0 -lbl_80C67F9C: -/* 80C67F9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67FA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C67FA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67FA8 7C 08 03 A6 */ mtlr r0 -/* 80C67FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67FB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/setBaseMtx__14daObjLv4Gear_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/setBaseMtx__14daObjLv4Gear_cFv.s deleted file mode 100644 index 2d85adbb8ce..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/setBaseMtx__14daObjLv4Gear_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C67FF0: -/* 80C67FF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67FF4 7C 08 02 A6 */ mflr r0 -/* 80C67FF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67FFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C68000 7C 7F 1B 78 */ mr r31, r3 -/* 80C68004 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80C68008 4B 3A 4D 5D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80C6800C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C68010 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C68014 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C68018 A8 1F 05 78 */ lha r0, 0x578(r31) -/* 80C6801C 7C 04 02 14 */ add r0, r4, r0 -/* 80C68020 7C 04 07 34 */ extsh r4, r0 -/* 80C68024 4B 3A 44 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C68028 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6802C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C68030 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80C68034 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C68038 4B 6D E4 79 */ bl PSMTXCopy -/* 80C6803C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C68040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C68044 7C 08 03 A6 */ mtlr r0 -/* 80C68048 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6804C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/CreateHeap__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/CreateHeap__16daObjSwSpinner_cFv.s deleted file mode 100644 index d1fd961c73a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/CreateHeap__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80D0035C: -/* 80D0035C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00360 7C 08 02 A6 */ mflr r0 -/* 80D00364 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00368 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D0036C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D00370 7C 7F 1B 78 */ mr r31, r3 -/* 80D00374 3C 60 80 D0 */ lis r3, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D00378 38 63 0A E0 */ addi r3, r3, l_arcName@l /* 0x80D00AE0@l */ -/* 80D0037C 80 63 00 00 */ lwz r3, 0(r3) -/* 80D00380 38 80 00 04 */ li r4, 4 -/* 80D00384 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00388 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0038C 3F C5 00 02 */ addis r30, r5, 2 -/* 80D00390 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80D00394 7F C5 F3 78 */ mr r5, r30 -/* 80D00398 38 C0 00 80 */ li r6, 0x80 -/* 80D0039C 4B 33 BF 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D003A0 3C 80 00 08 */ lis r4, 8 -/* 80D003A4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D003A8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D003AC 4B 31 48 A9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D003B0 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80D003B4 80 1F 05 A8 */ lwz r0, 0x5a8(r31) -/* 80D003B8 28 00 00 00 */ cmplwi r0, 0 -/* 80D003BC 40 82 00 0C */ bne lbl_80D003C8 -/* 80D003C0 38 60 00 00 */ li r3, 0 -/* 80D003C4 48 00 00 BC */ b lbl_80D00480 -lbl_80D003C8: -/* 80D003C8 3C 60 80 D0 */ lis r3, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D003CC 38 63 0A E0 */ addi r3, r3, l_arcName@l /* 0x80D00AE0@l */ -/* 80D003D0 80 63 00 00 */ lwz r3, 0(r3) -/* 80D003D4 38 80 00 05 */ li r4, 5 -/* 80D003D8 7F C5 F3 78 */ mr r5, r30 -/* 80D003DC 38 C0 00 80 */ li r6, 0x80 -/* 80D003E0 4B 33 BF 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D003E4 3C 80 00 08 */ lis r4, 8 -/* 80D003E8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D003EC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D003F0 4B 31 48 65 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D003F4 90 7F 05 AC */ stw r3, 0x5ac(r31) -/* 80D003F8 80 1F 05 AC */ lwz r0, 0x5ac(r31) -/* 80D003FC 28 00 00 00 */ cmplwi r0, 0 -/* 80D00400 40 82 00 0C */ bne lbl_80D0040C -/* 80D00404 38 60 00 00 */ li r3, 0 -/* 80D00408 48 00 00 78 */ b lbl_80D00480 -lbl_80D0040C: -/* 80D0040C 38 60 00 C0 */ li r3, 0xc0 -/* 80D00410 4B 5C E8 3D */ bl __nw__FUl -/* 80D00414 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D00418 41 82 00 0C */ beq lbl_80D00424 -/* 80D0041C 4B 37 B5 55 */ bl __ct__4dBgWFv -/* 80D00420 7C 60 1B 78 */ mr r0, r3 -lbl_80D00424: -/* 80D00424 90 1F 05 B0 */ stw r0, 0x5b0(r31) -/* 80D00428 80 1F 05 B0 */ lwz r0, 0x5b0(r31) -/* 80D0042C 28 00 00 00 */ cmplwi r0, 0 -/* 80D00430 41 82 00 3C */ beq lbl_80D0046C -/* 80D00434 3C 60 80 D0 */ lis r3, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D00438 38 63 0A E0 */ addi r3, r3, l_arcName@l /* 0x80D00AE0@l */ -/* 80D0043C 80 63 00 00 */ lwz r3, 0(r3) -/* 80D00440 38 80 00 08 */ li r4, 8 -/* 80D00444 7F C5 F3 78 */ mr r5, r30 -/* 80D00448 38 C0 00 80 */ li r6, 0x80 -/* 80D0044C 4B 33 BE A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D00450 7C 64 1B 78 */ mr r4, r3 -/* 80D00454 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80D00458 38 A0 00 01 */ li r5, 1 -/* 80D0045C 38 DF 05 B4 */ addi r6, r31, 0x5b4 -/* 80D00460 4B 37 9A D9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D00464 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D00468 41 82 00 14 */ beq lbl_80D0047C -lbl_80D0046C: -/* 80D0046C 38 00 00 00 */ li r0, 0 -/* 80D00470 90 1F 05 B0 */ stw r0, 0x5b0(r31) -/* 80D00474 38 60 00 00 */ li r3, 0 -/* 80D00478 48 00 00 08 */ b lbl_80D00480 -lbl_80D0047C: -/* 80D0047C 38 60 00 01 */ li r3, 1 -lbl_80D00480: -/* 80D00480 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00484 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D00488 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0048C 7C 08 03 A6 */ mtlr r0 -/* 80D00490 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00494 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Create__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Create__16daObjSwSpinner_cFv.s deleted file mode 100644 index 104786b03cf..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Create__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80D00284: -/* 80D00284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00288 7C 08 02 A6 */ mflr r0 -/* 80D0028C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00290 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D00294 93 C1 00 08 */ stw r30, 8(r1) -/* 80D00298 7C 7E 1B 78 */ mr r30, r3 -/* 80D0029C 3C 60 80 D0 */ lis r3, lit_3717@ha /* 0x80D00A94@ha */ -/* 80D002A0 3B E3 0A 94 */ addi r31, r3, lit_3717@l /* 0x80D00A94@l */ -/* 80D002A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D002A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D002AC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D002B0 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80D002B4 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80D002B8 7C 05 07 74 */ extsb r5, r0 -/* 80D002BC 4B 33 50 A5 */ bl isSwitch__10dSv_info_cCFii -/* 80D002C0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D002C4 41 82 00 18 */ beq lbl_80D002DC -/* 80D002C8 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80D002CC D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 80D002D0 38 00 00 00 */ li r0, 0 -/* 80D002D4 98 1E 05 EA */ stb r0, 0x5ea(r30) -/* 80D002D8 48 00 00 14 */ b lbl_80D002EC -lbl_80D002DC: -/* 80D002DC C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80D002E0 D0 1E 05 E4 */ stfs f0, 0x5e4(r30) -/* 80D002E4 38 00 00 01 */ li r0, 1 -/* 80D002E8 98 1E 05 EA */ stb r0, 0x5ea(r30) -lbl_80D002EC: -/* 80D002EC C0 3E 05 54 */ lfs f1, 0x554(r30) -/* 80D002F0 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80D002F4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D002F8 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80D002FC 7F C3 F3 78 */ mr r3, r30 -/* 80D00300 4B FF FE 75 */ bl initBaseMtx__16daObjSwSpinner_cFv -/* 80D00304 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80D00308 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D0030C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80D00310 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80D00314 80 83 00 04 */ lwz r4, 4(r3) -/* 80D00318 7F C3 F3 78 */ mr r3, r30 -/* 80D0031C 4B 31 A2 5D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80D00320 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00324 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D00328 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D0032C 80 9E 05 B0 */ lwz r4, 0x5b0(r30) -/* 80D00330 7F C5 F3 78 */ mr r5, r30 -/* 80D00334 4B 37 46 D5 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80D00338 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80D0033C 4B 37 B6 85 */ bl Move__4dBgWFv -/* 80D00340 38 60 00 01 */ li r3, 1 -/* 80D00344 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00348 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D0034C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00350 7C 08 03 A6 */ mtlr r0 -/* 80D00354 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00358 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Delete__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Delete__16daObjSwSpinner_cFv.s deleted file mode 100644 index 9ea9b5e512e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Delete__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80D00954: -/* 80D00954 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00958 7C 08 02 A6 */ mflr r0 -/* 80D0095C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00960 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D00964 7C 7F 1B 78 */ mr r31, r3 -/* 80D00968 80 63 05 B0 */ lwz r3, 0x5b0(r3) -/* 80D0096C 28 03 00 00 */ cmplwi r3, 0 -/* 80D00970 41 82 00 24 */ beq lbl_80D00994 -/* 80D00974 4B 56 78 61 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80D00978 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D0097C 41 82 00 18 */ beq lbl_80D00994 -/* 80D00980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D00988 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D0098C 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 80D00990 4B 37 38 C1 */ bl Release__4cBgSFP9dBgW_Base -lbl_80D00994: -/* 80D00994 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80D00998 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D0099C 38 84 0A E0 */ addi r4, r4, l_arcName@l /* 0x80D00AE0@l */ -/* 80D009A0 80 84 00 00 */ lwz r4, 0(r4) -/* 80D009A4 4B 32 C6 65 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D009A8 38 60 00 01 */ li r3, 1 -/* 80D009AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D009B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D009B4 7C 08 03 A6 */ mtlr r0 -/* 80D009B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D009BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Draw__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Draw__16daObjSwSpinner_cFv.s deleted file mode 100644 index 215c1132edb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Draw__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80D00890: -/* 80D00890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00894 7C 08 02 A6 */ mflr r0 -/* 80D00898 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D0089C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D008A0 93 C1 00 08 */ stw r30, 8(r1) -/* 80D008A4 7C 7E 1B 78 */ mr r30, r3 -/* 80D008A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D008AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D008B0 38 80 00 10 */ li r4, 0x10 -/* 80D008B4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80D008B8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80D008BC 4B 4A 2F 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D008C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D008C4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D008C8 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80D008CC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D008D0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D008D4 4B 4A 44 CD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D008D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D008DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D008E0 80 9E 05 AC */ lwz r4, 0x5ac(r30) -/* 80D008E4 80 84 00 04 */ lwz r4, 4(r4) -/* 80D008E8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D008EC 4B 4A 44 B5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D008F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D008F4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D008F8 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80D008FC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D00900 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D00904 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D00908 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80D0090C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D00910 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80D00914 4B 30 D3 B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D00918 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80D0091C 4B 30 D3 A9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D00920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D00928 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D0092C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D00930 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D00934 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D00938 38 60 00 01 */ li r3, 1 -/* 80D0093C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00940 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D00944 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00948 7C 08 03 A6 */ mtlr r0 -/* 80D0094C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00950 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Execute__16daObjSwSpinner_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Execute__16daObjSwSpinner_cFPPA3_A4_f.s deleted file mode 100644 index 7aefa84e586..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Execute__16daObjSwSpinner_cFPPA3_A4_f.s +++ /dev/null @@ -1,238 +0,0 @@ -lbl_80D00518: -/* 80D00518 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80D0051C 7C 08 02 A6 */ mflr r0 -/* 80D00520 90 01 00 34 */ stw r0, 0x34(r1) -/* 80D00524 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D00528 4B 66 1C B1 */ bl _savegpr_28 -/* 80D0052C 7C 7F 1B 78 */ mr r31, r3 -/* 80D00530 7C 9D 23 78 */ mr r29, r4 -/* 80D00534 3C 60 80 D0 */ lis r3, lit_3717@ha /* 0x80D00A94@ha */ -/* 80D00538 3B C3 0A 94 */ addi r30, r3, lit_3717@l /* 0x80D00A94@l */ -/* 80D0053C 3B 80 00 00 */ li r28, 0 -/* 80D00540 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80D00544 B0 1F 05 EC */ sth r0, 0x5ec(r31) -/* 80D00548 88 1F 05 EA */ lbz r0, 0x5ea(r31) -/* 80D0054C 28 00 00 00 */ cmplwi r0, 0 -/* 80D00550 41 82 00 5C */ beq lbl_80D005AC -/* 80D00554 3C 60 80 D0 */ lis r3, search_spinner_sub__FPvPv@ha /* 0x80CFFF78@ha */ -/* 80D00558 38 63 FF 78 */ addi r3, r3, search_spinner_sub__FPvPv@l /* 0x80CFFF78@l */ -/* 80D0055C 7F E4 FB 78 */ mr r4, r31 -/* 80D00560 4B 31 92 99 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80D00564 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80D00568 41 82 00 3C */ beq lbl_80D005A4 -/* 80D0056C 88 1F 05 E8 */ lbz r0, 0x5e8(r31) -/* 80D00570 28 00 00 00 */ cmplwi r0, 0 -/* 80D00574 41 82 00 10 */ beq lbl_80D00584 -/* 80D00578 88 1C 0A 6F */ lbz r0, 0xa6f(r28) -/* 80D0057C 28 00 00 03 */ cmplwi r0, 3 -/* 80D00580 41 82 00 10 */ beq lbl_80D00590 -lbl_80D00584: -/* 80D00584 88 1C 0A 6F */ lbz r0, 0xa6f(r28) -/* 80D00588 28 00 00 04 */ cmplwi r0, 4 -/* 80D0058C 40 82 00 20 */ bne lbl_80D005AC -lbl_80D00590: -/* 80D00590 A8 7C 04 E6 */ lha r3, 0x4e6(r28) -/* 80D00594 A8 1C 0A 7E */ lha r0, 0xa7e(r28) -/* 80D00598 7C 03 02 14 */ add r0, r3, r0 -/* 80D0059C B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80D005A0 48 00 00 0C */ b lbl_80D005AC -lbl_80D005A4: -/* 80D005A4 38 00 00 00 */ li r0, 0 -/* 80D005A8 98 1F 05 E8 */ stb r0, 0x5e8(r31) -lbl_80D005AC: -/* 80D005AC A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80D005B0 A8 9F 05 EC */ lha r4, 0x5ec(r31) -/* 80D005B4 4B 57 08 71 */ bl cLib_distanceAngleS__Fss -/* 80D005B8 B0 7F 05 EE */ sth r3, 0x5ee(r31) -/* 80D005BC A8 1F 05 EE */ lha r0, 0x5ee(r31) -/* 80D005C0 2C 00 00 00 */ cmpwi r0, 0 -/* 80D005C4 40 82 00 10 */ bne lbl_80D005D4 -/* 80D005C8 38 00 00 00 */ li r0, 0 -/* 80D005CC B0 1F 05 F0 */ sth r0, 0x5f0(r31) -/* 80D005D0 48 00 00 10 */ b lbl_80D005E0 -lbl_80D005D4: -/* 80D005D4 A8 7F 05 F0 */ lha r3, 0x5f0(r31) -/* 80D005D8 38 03 00 01 */ addi r0, r3, 1 -/* 80D005DC B0 1F 05 F0 */ sth r0, 0x5f0(r31) -lbl_80D005E0: -/* 80D005E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D005E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D005E8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D005EC 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80D005F0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D005F4 7C 05 07 74 */ extsb r5, r0 -/* 80D005F8 4B 33 4D 69 */ bl isSwitch__10dSv_info_cCFii -/* 80D005FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D00600 41 82 00 C8 */ beq lbl_80D006C8 -/* 80D00604 38 7F 05 E4 */ addi r3, r31, 0x5e4 -/* 80D00608 C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 80D0060C C0 5E 00 2C */ lfs f2, 0x2c(r30) -/* 80D00610 C0 7E 00 30 */ lfs f3, 0x30(r30) -/* 80D00614 C0 9E 00 34 */ lfs f4, 0x34(r30) -/* 80D00618 4B 56 F3 65 */ bl cLib_addCalc__FPfffff -/* 80D0061C C0 1E 00 00 */ lfs f0, 0(r30) -/* 80D00620 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80D00624 40 82 00 48 */ bne lbl_80D0066C -/* 80D00628 88 1F 05 EA */ lbz r0, 0x5ea(r31) -/* 80D0062C 28 00 00 00 */ cmplwi r0, 0 -/* 80D00630 41 82 00 3C */ beq lbl_80D0066C -/* 80D00634 88 1F 05 E8 */ lbz r0, 0x5e8(r31) -/* 80D00638 28 00 00 00 */ cmplwi r0, 0 -/* 80D0063C 41 82 00 20 */ beq lbl_80D0065C -/* 80D00640 88 1C 0A 6F */ lbz r0, 0xa6f(r28) -/* 80D00644 28 00 00 00 */ cmplwi r0, 0 -/* 80D00648 41 82 00 0C */ beq lbl_80D00654 -/* 80D0064C 38 00 00 05 */ li r0, 5 -/* 80D00650 98 1C 0A 6F */ stb r0, 0xa6f(r28) -lbl_80D00654: -/* 80D00654 38 00 00 00 */ li r0, 0 -/* 80D00658 98 1F 05 E8 */ stb r0, 0x5e8(r31) -lbl_80D0065C: -/* 80D0065C A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 80D00660 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80D00664 38 00 00 00 */ li r0, 0 -/* 80D00668 98 1F 05 EA */ stb r0, 0x5ea(r31) -lbl_80D0066C: -/* 80D0066C 88 1F 05 EB */ lbz r0, 0x5eb(r31) -/* 80D00670 28 00 00 00 */ cmplwi r0, 0 -/* 80D00674 40 82 00 D4 */ bne lbl_80D00748 -/* 80D00678 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D0067C 7C 03 07 74 */ extsb r3, r0 -/* 80D00680 4B 32 C9 ED */ bl dComIfGp_getReverb__Fi -/* 80D00684 7C 67 1B 78 */ mr r7, r3 -/* 80D00688 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008019E@ha */ -/* 80D0068C 38 03 01 9E */ addi r0, r3, 0x019E /* 0x0008019E@l */ -/* 80D00690 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D00694 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D00698 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D0069C 80 63 00 00 */ lwz r3, 0(r3) -/* 80D006A0 38 81 00 10 */ addi r4, r1, 0x10 -/* 80D006A4 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80D006A8 38 C0 00 00 */ li r6, 0 -/* 80D006AC C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 80D006B0 FC 40 08 90 */ fmr f2, f1 -/* 80D006B4 C0 7E 00 3C */ lfs f3, 0x3c(r30) -/* 80D006B8 FC 80 18 90 */ fmr f4, f3 -/* 80D006BC 39 00 00 00 */ li r8, 0 -/* 80D006C0 4B 5A B2 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80D006C4 48 00 00 84 */ b lbl_80D00748 -lbl_80D006C8: -/* 80D006C8 88 1F 05 E8 */ lbz r0, 0x5e8(r31) -/* 80D006CC 28 00 00 00 */ cmplwi r0, 0 -/* 80D006D0 41 82 00 5C */ beq lbl_80D0072C -/* 80D006D4 A8 1F 05 F0 */ lha r0, 0x5f0(r31) -/* 80D006D8 2C 00 00 C8 */ cmpwi r0, 0xc8 -/* 80D006DC 40 81 00 6C */ ble lbl_80D00748 -/* 80D006E0 A8 1F 05 EE */ lha r0, 0x5ee(r31) -/* 80D006E4 2C 00 0B B8 */ cmpwi r0, 0xbb8 -/* 80D006E8 40 81 00 24 */ ble lbl_80D0070C -/* 80D006EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D006F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D006F4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D006F8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D006FC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D00700 7C 05 07 74 */ extsb r5, r0 -/* 80D00704 4B 33 4A FD */ bl onSwitch__10dSv_info_cFii -/* 80D00708 48 00 00 40 */ b lbl_80D00748 -lbl_80D0070C: -/* 80D0070C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00710 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D00714 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D00718 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D0071C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D00720 7C 05 07 74 */ extsb r5, r0 -/* 80D00724 4B 33 4B 8D */ bl offSwitch__10dSv_info_cFii -/* 80D00728 48 00 00 20 */ b lbl_80D00748 -lbl_80D0072C: -/* 80D0072C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D00734 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D00738 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80D0073C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D00740 7C 05 07 74 */ extsb r5, r0 -/* 80D00744 4B 33 4B 6D */ bl offSwitch__10dSv_info_cFii -lbl_80D00748: -/* 80D00748 88 1F 05 E8 */ lbz r0, 0x5e8(r31) -/* 80D0074C 28 00 00 00 */ cmplwi r0, 0 -/* 80D00750 41 82 00 5C */ beq lbl_80D007AC -/* 80D00754 88 1F 05 E9 */ lbz r0, 0x5e9(r31) -/* 80D00758 28 00 00 00 */ cmplwi r0, 0 -/* 80D0075C 40 82 00 50 */ bne lbl_80D007AC -/* 80D00760 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D00764 7C 03 07 74 */ extsb r3, r0 -/* 80D00768 4B 32 C9 05 */ bl dComIfGp_getReverb__Fi -/* 80D0076C 7C 67 1B 78 */ mr r7, r3 -/* 80D00770 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008019D@ha */ -/* 80D00774 38 03 01 9D */ addi r0, r3, 0x019D /* 0x0008019D@l */ -/* 80D00778 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D0077C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D00780 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D00784 80 63 00 00 */ lwz r3, 0(r3) -/* 80D00788 38 81 00 0C */ addi r4, r1, 0xc -/* 80D0078C 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80D00790 38 C0 00 00 */ li r6, 0 -/* 80D00794 C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 80D00798 FC 40 08 90 */ fmr f2, f1 -/* 80D0079C C0 7E 00 3C */ lfs f3, 0x3c(r30) -/* 80D007A0 FC 80 18 90 */ fmr f4, f3 -/* 80D007A4 39 00 00 00 */ li r8, 0 -/* 80D007A8 4B 5A B1 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80D007AC: -/* 80D007AC AB 9F 05 EE */ lha r28, 0x5ee(r31) -/* 80D007B0 7F 80 07 35 */ extsh. r0, r28 -/* 80D007B4 41 82 00 50 */ beq lbl_80D00804 -/* 80D007B8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D007BC 7C 03 07 74 */ extsb r3, r0 -/* 80D007C0 4B 32 C8 AD */ bl dComIfGp_getReverb__Fi -/* 80D007C4 7C 67 1B 78 */ mr r7, r3 -/* 80D007C8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801CC@ha */ -/* 80D007CC 38 03 01 CC */ addi r0, r3, 0x01CC /* 0x000801CC@l */ -/* 80D007D0 90 01 00 08 */ stw r0, 8(r1) -/* 80D007D4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80D007D8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80D007DC 80 63 00 00 */ lwz r3, 0(r3) -/* 80D007E0 38 81 00 08 */ addi r4, r1, 8 -/* 80D007E4 38 BF 05 38 */ addi r5, r31, 0x538 -/* 80D007E8 7F 86 E3 78 */ mr r6, r28 -/* 80D007EC C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 80D007F0 FC 40 08 90 */ fmr f2, f1 -/* 80D007F4 C0 7E 00 3C */ lfs f3, 0x3c(r30) -/* 80D007F8 FC 80 18 90 */ fmr f4, f3 -/* 80D007FC 39 00 00 00 */ li r8, 0 -/* 80D00800 4B 5A BD 0D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80D00804: -/* 80D00804 38 1F 05 6C */ addi r0, r31, 0x56c -/* 80D00808 90 1D 00 00 */ stw r0, 0(r29) -/* 80D0080C 7F E3 FB 78 */ mr r3, r31 -/* 80D00810 4B FF F9 BD */ bl setBaseMtx__16daObjSwSpinner_cFv -/* 80D00814 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80D00818 4B 37 B1 A9 */ bl Move__4dBgWFv -/* 80D0081C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80D00820 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80D00824 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80D00828 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80D0082C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80D00830 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80D00834 C0 3F 05 54 */ lfs f1, 0x554(r31) -/* 80D00838 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80D0083C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D00840 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80D00844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D00848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D0084C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D00850 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80D00854 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D00858 7C 05 07 74 */ extsb r5, r0 -/* 80D0085C 4B 33 4B 05 */ bl isSwitch__10dSv_info_cCFii -/* 80D00860 30 03 FF FF */ addic r0, r3, -1 -/* 80D00864 7C 00 19 10 */ subfe r0, r0, r3 -/* 80D00868 98 1F 05 EB */ stb r0, 0x5eb(r31) -/* 80D0086C 88 1F 05 E8 */ lbz r0, 0x5e8(r31) -/* 80D00870 98 1F 05 E9 */ stb r0, 0x5e9(r31) -/* 80D00874 38 60 00 01 */ li r3, 1 -/* 80D00878 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D0087C 4B 66 19 A9 */ bl _restgpr_28 -/* 80D00880 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80D00884 7C 08 03 A6 */ mtlr r0 -/* 80D00888 38 21 00 30 */ addi r1, r1, 0x30 -/* 80D0088C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/create1st__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/create1st__16daObjSwSpinner_cFv.s deleted file mode 100644 index 8796abb6d00..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/create1st__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80D00498: -/* 80D00498 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D0049C 7C 08 02 A6 */ mflr r0 -/* 80D004A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D004A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D004A8 7C 7F 1B 78 */ mr r31, r3 -/* 80D004AC 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80D004B0 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D004B4 38 84 0A E0 */ addi r4, r4, l_arcName@l /* 0x80D00AE0@l */ -/* 80D004B8 80 84 00 00 */ lwz r4, 0(r4) -/* 80D004BC 4B 32 CA 01 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D004C0 7C 60 1B 78 */ mr r0, r3 -/* 80D004C4 2C 00 00 04 */ cmpwi r0, 4 -/* 80D004C8 40 82 00 38 */ bne lbl_80D00500 -/* 80D004CC 7F E3 FB 78 */ mr r3, r31 -/* 80D004D0 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D00AE0@ha */ -/* 80D004D4 38 84 0A E0 */ addi r4, r4, l_arcName@l /* 0x80D00AE0@l */ -/* 80D004D8 80 84 00 00 */ lwz r4, 0(r4) -/* 80D004DC 38 A0 00 09 */ li r5, 9 -/* 80D004E0 38 C0 00 00 */ li r6, 0 -/* 80D004E4 38 E0 22 00 */ li r7, 0x2200 -/* 80D004E8 39 00 00 00 */ li r8, 0 -/* 80D004EC 4B 37 82 D1 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80D004F0 7C 60 1B 78 */ mr r0, r3 -/* 80D004F4 2C 00 00 05 */ cmpwi r0, 5 -/* 80D004F8 40 82 00 08 */ bne lbl_80D00500 -/* 80D004FC 48 00 00 08 */ b lbl_80D00504 -lbl_80D00500: -/* 80D00500 7C 03 03 78 */ mr r3, r0 -lbl_80D00504: -/* 80D00504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D0050C 7C 08 03 A6 */ mtlr r0 -/* 80D00510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c.s deleted file mode 100644 index 365108dfb58..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D00A20: -/* 80D00A20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00A24 7C 08 02 A6 */ mflr r0 -/* 80D00A28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00A2C 4B 37 7E B1 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80D00A30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00A34 7C 08 03 A6 */ mtlr r0 -/* 80D00A38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00A3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c.s deleted file mode 100644 index 6bfe6ee6777..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80D00A60: -/* 80D00A60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00A64 7C 08 02 A6 */ mflr r0 -/* 80D00A68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00A6C 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80D00A70 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D00A74 7D 89 03 A6 */ mtctr r12 -/* 80D00A78 4E 80 04 21 */ bctrl -/* 80D00A7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00A80 7C 08 03 A6 */ mtlr r0 -/* 80D00A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00A88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c.s deleted file mode 100644 index bb737e88952..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D00A40: -/* 80D00A40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00A44 7C 08 02 A6 */ mflr r0 -/* 80D00A48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00A4C 4B 37 7F 05 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80D00A50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00A54 7C 08 03 A6 */ mtlr r0 -/* 80D00A58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00A5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_create1st__FP16daObjSwSpinner_c.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_create1st__FP16daObjSwSpinner_c.s deleted file mode 100644 index 32118736b8e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_create1st__FP16daObjSwSpinner_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D009C0: -/* 80D009C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D009C4 7C 08 02 A6 */ mflr r0 -/* 80D009C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D009CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D009D0 7C 7F 1B 78 */ mr r31, r3 -/* 80D009D4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D009D8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D009DC 40 82 00 28 */ bne lbl_80D00A04 -/* 80D009E0 28 1F 00 00 */ cmplwi r31, 0 -/* 80D009E4 41 82 00 14 */ beq lbl_80D009F8 -/* 80D009E8 4B 37 7C 3D */ bl __ct__16dBgS_MoveBgActorFv -/* 80D009EC 3C 60 80 D0 */ lis r3, __vt__16daObjSwSpinner_c@ha /* 0x80D00B34@ha */ -/* 80D009F0 38 03 0B 34 */ addi r0, r3, __vt__16daObjSwSpinner_c@l /* 0x80D00B34@l */ -/* 80D009F4 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80D009F8: -/* 80D009F8 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D009FC 60 00 00 08 */ ori r0, r0, 8 -/* 80D00A00 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D00A04: -/* 80D00A04 7F E3 FB 78 */ mr r3, r31 -/* 80D00A08 4B FF FA 91 */ bl create1st__16daObjSwSpinner_cFv -/* 80D00A0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00A10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00A14 7C 08 03 A6 */ mtlr r0 -/* 80D00A18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00A1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/initBaseMtx__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/initBaseMtx__16daObjSwSpinner_cFv.s deleted file mode 100644 index 158cca16267..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/initBaseMtx__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D00174: -/* 80D00174 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D00178 7C 08 02 A6 */ mflr r0 -/* 80D0017C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D00180 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80D00184 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D00188 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80D0018C C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80D00190 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80D00194 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D00198 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80D0019C 80 83 05 AC */ lwz r4, 0x5ac(r3) -/* 80D001A0 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D001A4 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80D001A8 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80D001AC D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80D001B0 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D001B4 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80D001B8 48 00 00 15 */ bl setBaseMtx__16daObjSwSpinner_cFv -/* 80D001BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D001C0 7C 08 03 A6 */ mtlr r0 -/* 80D001C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D001C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/search_spinner_sub__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/search_spinner_sub__FPvPv.s deleted file mode 100644 index 88bb6d407bc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/search_spinner_sub__FPvPv.s +++ /dev/null @@ -1,143 +0,0 @@ -lbl_80CFFF78: -/* 80CFFF78 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80CFFF7C 7C 08 02 A6 */ mflr r0 -/* 80CFFF80 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CFFF84 39 61 00 40 */ addi r11, r1, 0x40 -/* 80CFFF88 4B 66 22 55 */ bl _savegpr_29 -/* 80CFFF8C 7C 9E 23 78 */ mr r30, r4 -/* 80CFFF90 3C 80 80 D0 */ lis r4, lit_3717@ha /* 0x80D00A94@ha */ -/* 80CFFF94 3B A4 0A 94 */ addi r29, r4, lit_3717@l /* 0x80D00A94@l */ -/* 80CFFF98 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CFFF9C 41 82 01 BC */ beq lbl_80D00158 -/* 80CFFFA0 4B 31 8D 41 */ bl fopAc_IsActor__FPv -/* 80CFFFA4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CFFFA8 41 82 01 B0 */ beq lbl_80D00158 -/* 80CFFFAC A8 1F 00 0E */ lha r0, 0xe(r31) -/* 80CFFFB0 2C 00 00 F2 */ cmpwi r0, 0xf2 -/* 80CFFFB4 40 82 01 A4 */ bne lbl_80D00158 -/* 80CFFFB8 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80CFFFBC C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CFFFC0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CFFFC4 C0 3D 00 00 */ lfs f1, 0(r29) -/* 80CFFFC8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80CFFFCC D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80CFFFD0 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80CFFFD4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CFFFD8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80CFFFDC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80CFFFE0 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80CFFFE4 38 61 00 0C */ addi r3, r1, 0xc -/* 80CFFFE8 38 81 00 18 */ addi r4, r1, 0x18 -/* 80CFFFEC 4B 64 73 B1 */ bl PSVECSquareDistance -/* 80CFFFF0 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80CFFFF4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CFFFF8 40 81 00 58 */ ble lbl_80D00050 -/* 80CFFFFC FC 00 08 34 */ frsqrte f0, f1 -/* 80D00000 C8 9D 00 08 */ lfd f4, 8(r29) -/* 80D00004 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D00008 C8 7D 00 10 */ lfd f3, 0x10(r29) -/* 80D0000C FC 00 00 32 */ fmul f0, f0, f0 -/* 80D00010 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D00014 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D00018 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D0001C FC 44 00 32 */ fmul f2, f4, f0 -/* 80D00020 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D00024 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D00028 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D0002C FC 02 00 32 */ fmul f0, f2, f0 -/* 80D00030 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D00034 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D00038 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D0003C FC 03 00 28 */ fsub f0, f3, f0 -/* 80D00040 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D00044 FC 21 00 32 */ fmul f1, f1, f0 -/* 80D00048 FC 20 08 18 */ frsp f1, f1 -/* 80D0004C 48 00 00 88 */ b lbl_80D000D4 -lbl_80D00050: -/* 80D00050 C8 1D 00 18 */ lfd f0, 0x18(r29) -/* 80D00054 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D00058 40 80 00 10 */ bge lbl_80D00068 -/* 80D0005C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D00060 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80D00064 48 00 00 70 */ b lbl_80D000D4 -lbl_80D00068: -/* 80D00068 D0 21 00 08 */ stfs f1, 8(r1) -/* 80D0006C 80 81 00 08 */ lwz r4, 8(r1) -/* 80D00070 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80D00074 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80D00078 7C 03 00 00 */ cmpw r3, r0 -/* 80D0007C 41 82 00 14 */ beq lbl_80D00090 -/* 80D00080 40 80 00 40 */ bge lbl_80D000C0 -/* 80D00084 2C 03 00 00 */ cmpwi r3, 0 -/* 80D00088 41 82 00 20 */ beq lbl_80D000A8 -/* 80D0008C 48 00 00 34 */ b lbl_80D000C0 -lbl_80D00090: -/* 80D00090 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D00094 41 82 00 0C */ beq lbl_80D000A0 -/* 80D00098 38 00 00 01 */ li r0, 1 -/* 80D0009C 48 00 00 28 */ b lbl_80D000C4 -lbl_80D000A0: -/* 80D000A0 38 00 00 02 */ li r0, 2 -/* 80D000A4 48 00 00 20 */ b lbl_80D000C4 -lbl_80D000A8: -/* 80D000A8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D000AC 41 82 00 0C */ beq lbl_80D000B8 -/* 80D000B0 38 00 00 05 */ li r0, 5 -/* 80D000B4 48 00 00 10 */ b lbl_80D000C4 -lbl_80D000B8: -/* 80D000B8 38 00 00 03 */ li r0, 3 -/* 80D000BC 48 00 00 08 */ b lbl_80D000C4 -lbl_80D000C0: -/* 80D000C0 38 00 00 04 */ li r0, 4 -lbl_80D000C4: -/* 80D000C4 2C 00 00 01 */ cmpwi r0, 1 -/* 80D000C8 40 82 00 0C */ bne lbl_80D000D4 -/* 80D000CC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D000D0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80D000D4: -/* 80D000D4 C0 1D 00 20 */ lfs f0, 0x20(r29) -/* 80D000D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D000DC 40 80 00 54 */ bge lbl_80D00130 -/* 80D000E0 88 1E 05 E8 */ lbz r0, 0x5e8(r30) -/* 80D000E4 28 00 00 00 */ cmplwi r0, 0 -/* 80D000E8 40 82 00 0C */ bne lbl_80D000F4 -/* 80D000EC 38 00 00 01 */ li r0, 1 -/* 80D000F0 98 1E 05 E8 */ stb r0, 0x5e8(r30) -lbl_80D000F4: -/* 80D000F4 88 1F 0A 6F */ lbz r0, 0xa6f(r31) -/* 80D000F8 28 00 00 00 */ cmplwi r0, 0 -/* 80D000FC 40 82 00 0C */ bne lbl_80D00108 -/* 80D00100 38 00 00 01 */ li r0, 1 -/* 80D00104 98 1F 0A 6F */ stb r0, 0xa6f(r31) -lbl_80D00108: -/* 80D00108 38 00 00 00 */ li r0, 0 -/* 80D0010C 90 1F 0A 64 */ stw r0, 0xa64(r31) -/* 80D00110 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 80D00114 D0 1F 0A A4 */ stfs f0, 0xaa4(r31) -/* 80D00118 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 80D0011C D0 1F 0A A8 */ stfs f0, 0xaa8(r31) -/* 80D00120 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 80D00124 D0 1F 0A AC */ stfs f0, 0xaac(r31) -/* 80D00128 7F E3 FB 78 */ mr r3, r31 -/* 80D0012C 48 00 00 30 */ b lbl_80D0015C -lbl_80D00130: -/* 80D00130 88 1E 05 E8 */ lbz r0, 0x5e8(r30) -/* 80D00134 28 00 00 00 */ cmplwi r0, 0 -/* 80D00138 41 82 00 20 */ beq lbl_80D00158 -/* 80D0013C 88 1F 0A 6F */ lbz r0, 0xa6f(r31) -/* 80D00140 28 00 00 00 */ cmplwi r0, 0 -/* 80D00144 41 82 00 0C */ beq lbl_80D00150 -/* 80D00148 38 00 00 05 */ li r0, 5 -/* 80D0014C 98 1F 0A 6F */ stb r0, 0xa6f(r31) -lbl_80D00150: -/* 80D00150 38 00 00 00 */ li r0, 0 -/* 80D00154 98 1E 05 E8 */ stb r0, 0x5e8(r30) -lbl_80D00158: -/* 80D00158 38 60 00 00 */ li r3, 0 -lbl_80D0015C: -/* 80D0015C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D00160 4B 66 20 C9 */ bl _restgpr_29 -/* 80D00164 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D00168 7C 08 03 A6 */ mtlr r0 -/* 80D0016C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D00170 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/setBaseMtx__16daObjSwSpinner_cFv.s b/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/setBaseMtx__16daObjSwSpinner_cFv.s deleted file mode 100644 index 5d864c8453c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/setBaseMtx__16daObjSwSpinner_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80D001CC: -/* 80D001CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D001D0 7C 08 02 A6 */ mflr r0 -/* 80D001D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D001D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D001DC 7C 7F 1B 78 */ mr r31, r3 -/* 80D001E0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80D001E4 4B 30 CB 81 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D001E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D001EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D001F0 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80D001F4 4B 30 C2 41 */ bl mDoMtx_YrotM__FPA4_fs -/* 80D001F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D001FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00200 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80D00204 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D00208 4B 64 62 A9 */ bl PSMTXCopy -/* 80D0020C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D00210 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00214 38 9F 05 B4 */ addi r4, r31, 0x5b4 -/* 80D00218 4B 64 62 99 */ bl PSMTXCopy -/* 80D0021C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D00220 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00224 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D00228 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D0022C C0 1F 05 E4 */ lfs f0, 0x5e4(r31) -/* 80D00230 EC 42 00 2A */ fadds f2, f2, f0 -/* 80D00234 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D00238 4B 64 66 B1 */ bl PSMTXTrans -/* 80D0023C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D00240 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00244 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80D00248 4B 30 C1 ED */ bl mDoMtx_YrotM__FPA4_fs -/* 80D0024C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D00250 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00254 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80D00258 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D0025C 4B 64 62 55 */ bl PSMTXCopy -/* 80D00260 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D00264 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D00268 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80D0026C 4B 64 62 45 */ bl PSMTXCopy -/* 80D00270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D00274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D00278 7C 08 03 A6 */ mtlr r0 -/* 80D0027C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D00280 4E 80 00 20 */ blr diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h index 8df9070a625..1dd62d83a28 100644 --- a/include/rel/d/a/d_a_spinner/d_a_spinner.h +++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h @@ -2,9 +2,9 @@ #define D_A_SPINNER_H #include "d/com/d_com_inf_game.h" +#include "d/d_path.h" #include "d/particle/d_particle_copoly.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_path.h" class daSpinner_c : public fopAc_ac_c { public: @@ -61,6 +61,12 @@ public: field_0xaa4 = param_0; } + void offSpinnerTag() { + if (mSpinnerTag != 0) { + mSpinnerTag = 5; + } + } + bool reflectAccept() { bool accept = false; if (!mBck.isStop() && mSpinnerTag == 0) { @@ -72,6 +78,8 @@ public: MtxP getModelMtx() { return mpModel->getBaseTRMtx(); } + s16 getAngleY() { return shape_angle.y + field_0xa7e; } + private: /* 0x568 */ J3DModel* mpModel; /* 0x56C */ mDoExt_bckAnm mBck; diff --git a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h index cf46cbbf11e..3411e49a01f 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h +++ b/include/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h @@ -1,6 +1,37 @@ #ifndef D_A_OBJ_LV4GEAR_H #define D_A_OBJ_LV4GEAR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h" + +class daObjLv4Gear_c : public fopAc_ac_c { +public: + enum gear_type_e { + GEAR_S_e, + GEAR_L_e, + }; + + /* 80C67FB4 */ void initBaseMtx(); + /* 80C67FF0 */ void setBaseMtx(); + /* 80C68050 */ int Create(); + /* 80C680A4 */ int CreateHeap(); + /* 80C68124 */ int create(); + /* 80C681F4 */ int execute(); + /* 80C683E0 */ int draw(); + /* 80C68444 */ int _delete(); + + u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getType() { return fopAcM_GetParamBit(this, 8, 4); } + u8 checkSE() { return fopAcM_GetParamBit(this, 12, 4); } + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ s16 mTarget; + /* 0x576 */ s16 mSpeed; + /* 0x578 */ s16 field_0x578; + /* 0x57C */ int mProcID; + /* 0x580 */ u16 mCount; + /* 0x582 */ u8 mType; +}; #endif /* D_A_OBJ_LV4GEAR_H */ diff --git a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h index 9e3206c00f3..dedd9d03a90 100644 --- a/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h +++ b/include/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h @@ -1,6 +1,39 @@ #ifndef D_A_OBJ_SWSPINNER_H #define D_A_OBJ_SWSPINNER_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/bg/d_bg_w.h" +#include "f_op/f_op_actor_mng.h" +#include "rel/d/a/d_a_spinner/d_a_spinner.h" + +class daObjSwSpinner_c : public dBgS_MoveBgActor { +public: + /* 80D00174 */ void initBaseMtx(); + /* 80D001CC */ void setBaseMtx(); + /* 80D00284 */ int Create(); + /* 80D0035C */ int CreateHeap(); + /* 80D00498 */ int create1st(); + /* 80D00518 */ int Execute(Mtx**); + /* 80D00890 */ int Draw(); + /* 80D00954 */ int Delete(); + + u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } + int GetRotSpeedY() { return mRotSpeedY; } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel1; + /* 0x5AC */ J3DModel* mpModel2; + /* 0x5B0 */ dBgW* mpBgW2; + /* 0x5B4 */ Mtx mMtx; + /* 0x5E4 */ f32 field_0x5e4; + /* 0x5E8 */ u8 field_0x5e8; + /* 0x5E9 */ u8 field_0x5e9; + /* 0x5EA */ u8 field_0x5ea; + /* 0x5EB */ u8 field_0x5eb; + /* 0x5EC */ s16 mShapeAngleY; + /* 0x5EE */ s16 mRotSpeedY; + /* 0x5F0 */ s16 mCount; +}; // Size: 0x5F4 #endif /* D_A_OBJ_SWSPINNER_H */ diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index 514cb22637a..391ea35897a 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -1,342 +1,205 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4gear +// d_a_obj_lv4gear.cpp +// Spinner gear (Arbiter's Grounds) // #include "rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjLv4Gear_c { - /* 80C67FB4 */ void initBaseMtx(); - /* 80C67FF0 */ void setBaseMtx(); - /* 80C68050 */ void Create(); - /* 80C680A4 */ void CreateHeap(); - /* 80C68124 */ void create(); - /* 80C681F4 */ void execute(); - /* 80C683E0 */ void draw(); - /* 80C68444 */ void _delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" static void searchSwSpinSub__FPvPv(); -extern "C" void initBaseMtx__14daObjLv4Gear_cFv(); -extern "C" void setBaseMtx__14daObjLv4Gear_cFv(); -extern "C" void Create__14daObjLv4Gear_cFv(); -extern "C" void CreateHeap__14daObjLv4Gear_cFv(); -extern "C" void create__14daObjLv4Gear_cFv(); -extern "C" void execute__14daObjLv4Gear_cFv(); -extern "C" void draw__14daObjLv4Gear_cFv(); -extern "C" void _delete__14daObjLv4Gear_cFv(); -extern "C" static void daObjLv4Gear_Draw__FP14daObjLv4Gear_c(); -extern "C" static void daObjLv4Gear_Execute__FP14daObjLv4Gear_c(); -extern "C" static void daObjLv4Gear_Delete__FP14daObjLv4Gear_c(); -extern "C" static void daObjLv4Gear_Create__FP14daObjLv4Gear_c(); -extern "C" extern char const* const d_a_obj_lv4gear__stringBase0; -extern "C" extern void* g_profile_Obj_Lv4Gear[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80C67F18-80C67F38 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80C67F38-80C67FB4 000098 007C+00 1/1 0/0 0/0 .text searchSwSpinSub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchSwSpinSub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/searchSwSpinSub__FPvPv.s" +static void* searchSwSpinSub(void* param_0, void* param_1) { + daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)param_0; + daObjLv4Gear_c* gear = (daObjLv4Gear_c*)param_1; + + if (swspinner != NULL && fopAc_IsActor(swspinner) && + fpcM_GetProfName(swspinner) == PROC_Obj_SwSpinner) + { + u8 sw_bit = swspinner->getSwBit(); + if (sw_bit != 0xFF && sw_bit == gear->getSwBit()) { + return swspinner; + } + } + + return 0; } -#pragma pop /* 80C67FB4-80C67FF0 000114 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/initBaseMtx__14daObjLv4Gear_cFv.s" +void daObjLv4Gear_c::initBaseMtx() { + mpModel->mBaseScale = mScale; + setBaseMtx(); } -#pragma pop /* 80C67FF0-80C68050 000150 0060+00 2/2 0/0 0/0 .text setBaseMtx__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/setBaseMtx__14daObjLv4Gear_cFv.s" +void daObjLv4Gear_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y + field_0x578); + MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); } -#pragma pop /* 80C68050-80C680A4 0001B0 0054+00 1/1 0/0 0/0 .text Create__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/Create__14daObjLv4Gear_cFv.s" +int daObjLv4Gear_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mProcID = -1; + return 1; } -#pragma pop /* ############################################################################################## */ /* 80C68500-80C68508 000000 0008+00 2/2 0/0 0/0 .rodata l_bmd */ -SECTION_RODATA static u8 const l_bmd[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, -}; -COMPILER_STRIP_GATE(0x80C68500, &l_bmd); - -/* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C68524 = "P_Gear"; -#pragma pop +static int const l_bmd[] = {0x00000004, 0x00000003}; /* 80C6852C-80C68530 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4gear__stringBase0; +static char* l_arcName = "P_Gear"; /* 80C680A4-80C68124 000204 0080+00 1/1 0/0 0/0 .text CreateHeap__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/CreateHeap__14daObjLv4Gear_cFv.s" +int daObjLv4Gear_c::CreateHeap() { + mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]), + 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + return 1; } -#pragma pop /* ############################################################################################## */ /* 80C68508-80C68510 000008 0008+00 0/0 0/0 0/0 .rodata l_size */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_size[8] = { - 0x42, 0xC8, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C68508, &l_size); -#pragma pop +static int const l_size[] = {0x42C80000, 0x43960000}; /* 80C68510-80C68514 000010 0004+00 0/1 0/0 0/0 .rodata l_rot_start_time */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const l_rot_start_time = 0x000F0064; -COMPILER_STRIP_GATE(0x80C68510, &l_rot_start_time); -#pragma pop +static s16 const l_rot_start_time[] = {0x000F, 0x0064}; /* 80C68514-80C6851C 000014 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ -SECTION_RODATA static u8 const l_heap_size[8] = { - 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, -}; -COMPILER_STRIP_GATE(0x80C68514, &l_heap_size); +static int const l_heap_size[] = {0x00000F00, 0x00000F00}; /* 80C68124-80C681F4 000284 00D0+00 1/1 0/0 0/0 .text create__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/func_80C68124.s" +int daObjLv4Gear_c::create() { + fopAcM_SetupActor(this, daObjLv4Gear_c); + + mType = getType(); + + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, l_heap_size[mType])) { + return cPhs_ERROR_e; + } + + if (!Create()) { + return cPhs_ERROR_e; + } + } + + return phase; } -#pragma pop /* ############################################################################################## */ -/* 80C6851C-80C68520 00001C 0004+00 0/1 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = 1.0f; -COMPILER_STRIP_GATE(0x80C6851C, &lit_3773); -#pragma pop - -/* 80C68520-80C68524 000020 0004+00 0/1 0/0 0/0 .rodata @3774 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3774 = -1.0f; -COMPILER_STRIP_GATE(0x80C68520, &lit_3774); -#pragma pop - /* 80C681F4-80C683E0 000354 01EC+00 1/1 0/0 0/0 .text execute__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/execute__14daObjLv4Gear_cFv.s" +int daObjLv4Gear_c::execute() { + mTarget = 0; + + if (mProcID == 0xFFFFFFFF) { + base_process_class* proc = fpcEx_Search(searchSwSpinSub, this); + if (proc != NULL) { + mProcID = (proc != NULL) ? proc->mBsPcId : -1; + } + } else { + daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)fopAcM_SearchByID(mProcID); + if (swspinner != NULL) { + mTarget = swspinner->GetRotSpeedY(); + } + + if (mTarget == 0) { + mCount = 0; + } else { + mCount += 1; + } + + if (mCount > l_rot_start_time[mType]) { + cLib_chaseS(&mSpeed, mTarget, 10); + } else { + cLib_chaseS(&mSpeed, 0, 50); + } + + if (checkSE() == 0 && mSpeed != 0) { + if (mType == GEAR_S_e) { + fopAcM_seStartLevel(this, Z2SE_OBJ_SPNR_GEAR_S, mSpeed); + } else if (mType == GEAR_L_e) { + fopAcM_seStartLevel(this, Z2SE_OBJ_SPNR_GEAR_L, mSpeed); + } + } + } + + field_0x578 += mSpeed; + setBaseMtx(); + + return 1; } -#pragma pop /* 80C683E0-80C68444 000540 0064+00 1/1 0/0 0/0 .text draw__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/draw__14daObjLv4Gear_cFv.s" +int daObjLv4Gear_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + return 1; } -#pragma pop /* 80C68444-80C68478 0005A4 0034+00 1/1 0/0 0/0 .text _delete__14daObjLv4Gear_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv4Gear_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/_delete__14daObjLv4Gear_cFv.s" +int daObjLv4Gear_c::_delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop /* 80C68478-80C68498 0005D8 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Draw__FP14daObjLv4Gear_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv4Gear_Draw(daObjLv4Gear_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Draw__FP14daObjLv4Gear_c.s" +static int daObjLv4Gear_Draw(daObjLv4Gear_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80C68498-80C684B8 0005F8 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Execute__FP14daObjLv4Gear_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv4Gear_Execute(daObjLv4Gear_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Execute__FP14daObjLv4Gear_c.s" +static int daObjLv4Gear_Execute(daObjLv4Gear_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80C684B8-80C684D8 000618 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Delete__FP14daObjLv4Gear_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv4Gear_Delete(daObjLv4Gear_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Delete__FP14daObjLv4Gear_c.s" +static int daObjLv4Gear_Delete(daObjLv4Gear_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80C684D8-80C684F8 000638 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Create__FP14daObjLv4Gear_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv4Gear_Create(daObjLv4Gear_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear/daObjLv4Gear_Create__FP14daObjLv4Gear_c.s" +static int daObjLv4Gear_Create(daObjLv4Gear_c* i_this) { + return i_this->create(); } -#pragma pop /* ############################################################################################## */ /* 80C68530-80C68550 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLv4Gear_Method */ -SECTION_DATA static void* l_daObjLv4Gear_Method[8] = { - (void*)daObjLv4Gear_Create__FP14daObjLv4Gear_c, - (void*)daObjLv4Gear_Delete__FP14daObjLv4Gear_c, - (void*)daObjLv4Gear_Execute__FP14daObjLv4Gear_c, - (void*)NULL, - (void*)daObjLv4Gear_Draw__FP14daObjLv4Gear_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjLv4Gear_Method = { + (process_method_func)daObjLv4Gear_Create, (process_method_func)daObjLv4Gear_Delete, + (process_method_func)daObjLv4Gear_Execute, (process_method_func)NULL, + (process_method_func)daObjLv4Gear_Draw, }; /* 80C68550-80C68580 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Gear */ -SECTION_DATA extern void* g_profile_Obj_Lv4Gear[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01830000, (void*)&g_fpcLf_Method, - (void*)0x00000584, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02310000, (void*)&l_daObjLv4Gear_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_Obj_Lv4Gear, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjLv4Gear_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0231, // mPriority + &l_daObjLv4Gear_Method, // mSubMtd + 0x00040100, // mStatus + 0, // mActorType + 14, // mCullType }; /* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index 3a5452711b4..63446515197 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -1,474 +1,260 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_swspinner +// d_a_obj_swspinner.cpp +// Object - swspinner // #include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjSwSpinner_c { - /* 80D00174 */ void initBaseMtx(); - /* 80D001CC */ void setBaseMtx(); - /* 80D00284 */ void Create(); - /* 80D0035C */ void CreateHeap(); - /* 80D00498 */ void create1st(); - /* 80D00518 */ void Execute(f32 (**)[3][4]); - /* 80D00890 */ void Draw(); - /* 80D00954 */ void Delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void search_spinner_sub__FPvPv(); -extern "C" void initBaseMtx__16daObjSwSpinner_cFv(); -extern "C" void setBaseMtx__16daObjSwSpinner_cFv(); -extern "C" void Create__16daObjSwSpinner_cFv(); -extern "C" void CreateHeap__16daObjSwSpinner_cFv(); -extern "C" void create1st__16daObjSwSpinner_cFv(); -extern "C" void Execute__16daObjSwSpinner_cFPPA3_A4_f(); -extern "C" void Draw__16daObjSwSpinner_cFv(); -extern "C" void Delete__16daObjSwSpinner_cFv(); -extern "C" static void daObjSwSpinner_create1st__FP16daObjSwSpinner_c(); -extern "C" static void daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c(); -extern "C" static void daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c(); -extern "C" static void daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c(); -extern "C" extern char const* const d_a_obj_swspinner__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_distanceAngleS__Fss(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareDistance(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* ############################################################################################## */ -/* 80D00A94-80D00A9C 000000 0004+04 3/3 0/0 0/0 .rodata @3717 */ -SECTION_RODATA static u8 const lit_3717[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D00A94, &lit_3717); - -/* 80D00A9C-80D00AA4 000008 0008+00 0/1 0/0 0/0 .rodata @3718 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3718[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D00A9C, &lit_3718); -#pragma pop - -/* 80D00AA4-80D00AAC 000010 0008+00 0/1 0/0 0/0 .rodata @3719 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3719[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D00AA4, &lit_3719); -#pragma pop - -/* 80D00AAC-80D00AB4 000018 0008+00 0/1 0/0 0/0 .rodata @3720 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3720[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D00AAC, &lit_3720); -#pragma pop - -/* 80D00AB4-80D00AB8 000020 0004+00 0/3 0/0 0/0 .rodata @3721 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3721 = 100.0f; -COMPILER_STRIP_GATE(0x80D00AB4, &lit_3721); -#pragma pop - /* 80CFFF78-80D00174 000078 01FC+00 1/1 0/0 0/0 .text search_spinner_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void search_spinner_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/search_spinner_sub__FPvPv.s" +static void* search_spinner_sub(void* param_0, void* param_1) { + daSpinner_c* spinner = (daSpinner_c*)param_0; + daObjSwSpinner_c* swspinner = (daObjSwSpinner_c*)param_1; + + if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == PROC_SPINNER) { + if (spinner->current.pos.absXZ(swspinner->current.pos) < 100.0f) { + if (swspinner->field_0x5e8 == NULL) { + swspinner->field_0x5e8 = 1; + } + spinner->setSpinnerTag(swspinner->mAttentionInfo.mPosition); + return spinner; + } + if (swspinner->field_0x5e8 != NULL) { + spinner->offSpinnerTag(); + swspinner->field_0x5e8 = NULL; + } + } + + return NULL; } -#pragma pop /* 80D00174-80D001CC 000274 0058+00 1/1 0/0 0/0 .text initBaseMtx__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/initBaseMtx__16daObjSwSpinner_cFv.s" +void daObjSwSpinner_c::initBaseMtx() { + mpModel1->setBaseScale(mScale); + mpModel2->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80D001CC-80D00284 0002CC 00B8+00 2/2 0/0 0/0 .text setBaseMtx__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/setBaseMtx__16daObjSwSpinner_cFv.s" +void daObjSwSpinner_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + mpModel1->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mMtx); + + MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y + field_0x5e4, current.pos.z); + mDoMtx_stack_c::YrotM(orig.angle.y); + + mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* ############################################################################################## */ -/* 80D00AB8-80D00ABC 000024 0004+00 0/2 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = 50.0f; -COMPILER_STRIP_GATE(0x80D00AB8, &lit_3773); -#pragma pop - -/* 80D00ABC-80D00AC0 000028 0004+00 0/1 0/0 0/0 .rodata @3774 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3774 = 30.0f; -COMPILER_STRIP_GATE(0x80D00ABC, &lit_3774); -#pragma pop - /* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Create__16daObjSwSpinner_cFv.s" +int daObjSwSpinner_c::Create() { + if (i_fopAcM_isSwitch(this, getSwBit2())) { + field_0x5e4 = 50.0f; + field_0x5ea = 0; + } else { + field_0x5e4 = 30.0f; + field_0x5ea = 1; + } + mAttentionInfo.mPosition.y -= 100.0f; + + initBaseMtx(); + fopAcM_SetMtx(this, mpModel1->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel1->getModelData()); + + dComIfG_Bgsp().Regist(mpBgW2, this); + mpBgW2->Move(); + + return 1; } -#pragma pop /* ############################################################################################## */ -/* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D00AD4 = "P_Sswitch"; -#pragma pop - /* 80D00AE0-80D00AE4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swspinner__stringBase0; +static char* l_arcName = "P_Sswitch"; /* 80D0035C-80D00498 00045C 013C+00 1/0 0/0 0/0 .text CreateHeap__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/CreateHeap__16daObjSwSpinner_cFv.s" +int daObjSwSpinner_c::CreateHeap() { + mpModel1 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 4), 0x80000, + 0x11000084); + if (mpModel1 == NULL) { + return 0; + } + + mpModel2 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 5), 0x80000, + 0x11000084); + if (mpModel2 == NULL) { + return 0; + } + + mpBgW2 = new dBgW(); + if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 8), 1, &mMtx)) { + mpBgW2 = NULL; + return 0; + } + + return 1; } -#pragma pop /* 80D00498-80D00518 000598 0080+00 1/1 0/0 0/0 .text create1st__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/create1st__16daObjSwSpinner_cFv.s" +int daObjSwSpinner_c::create1st() { + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 9, NULL, 0x2200, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* ############################################################################################## */ -/* 80D00AC0-80D00AC4 00002C 0004+00 0/1 0/0 0/0 .rodata @3919 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3919 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D00AC0, &lit_3919); -#pragma pop - -/* 80D00AC4-80D00AC8 000030 0004+00 0/1 0/0 0/0 .rodata @3920 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3920 = 10.0f; -COMPILER_STRIP_GATE(0x80D00AC4, &lit_3920); -#pragma pop - -/* 80D00AC8-80D00ACC 000034 0004+00 0/1 0/0 0/0 .rodata @3921 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3921 = 2.0f; -COMPILER_STRIP_GATE(0x80D00AC8, &lit_3921); -#pragma pop - -/* 80D00ACC-80D00AD0 000038 0004+00 0/1 0/0 0/0 .rodata @3922 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(0x80D00ACC, &lit_3922); -#pragma pop - -/* 80D00AD0-80D00AD4 00003C 0004+00 0/1 0/0 0/0 .rodata @3923 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3923 = -1.0f; -COMPILER_STRIP_GATE(0x80D00AD0, &lit_3923); -#pragma pop - /* 80D00518-80D00890 000618 0378+00 1/0 0/0 0/0 .text Execute__16daObjSwSpinner_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Execute__16daObjSwSpinner_cFPPA3_A4_f.s" +int daObjSwSpinner_c::Execute(Mtx** param_0) { + daSpinner_c* spinner = NULL; + mShapeAngleY = shape_angle.y; + + if (field_0x5ea != NULL) { + spinner = (daSpinner_c*)fopAcM_Search((fopAcIt_JudgeFunc)search_spinner_sub, this); + if (spinner != NULL) { + if ((field_0x5e8 != NULL && spinner->checkSpinnerTagInto()) || + spinner->checkSpinnerTagIntoIncRot()) { + shape_angle.y = spinner->getAngleY(); + } + } else { + field_0x5e8 = NULL; + } + } + + mRotSpeedY = cLib_distanceAngleS(shape_angle.y, mShapeAngleY); + if (mRotSpeedY == 0) { + mCount = 0; + } else { + mCount += 1; + } + + if (i_fopAcM_isSwitch(this, getSwBit2())) { + if (cLib_addCalc(&field_0x5e4, 50.0f, 0.1f, 10.0f, 2.0f) == 0.0f && field_0x5ea != NULL) { + if (field_0x5e8 != NULL) { + spinner->offSpinnerTag(); + field_0x5e8 = NULL; + } + shape_angle.y = orig.angle.y; + field_0x5ea = NULL; + } + if (field_0x5eb == NULL) { + fopAcM_seStart(this, Z2SE_OBJ_SPNR_SW_CL, 0); + } + } else if (field_0x5e8 != NULL) { + if (mCount > 200) { + if (mRotSpeedY > 3000) { + i_fopAcM_onSwitch(this, getSwBit()); + } else { + i_fopAcM_offSwitch(this, getSwBit()); + } + } + } else { + dComIfGs_offSwitch(getSwBit() & 0XFF, fopAcM_GetHomeRoomNo(this)); + } + if (field_0x5e8 != NULL && field_0x5e9 == NULL) { + fopAcM_seStart(this, Z2SE_OBJ_SPNR_SW_FIT, 0); + } + if (mRotSpeedY != 0) { + fopAcM_seStartLevel(this, Z2SE_OBJ_SPNR_SW_RL, mRotSpeedY); + } + + *param_0 = &mBgMtx; + setBaseMtx(); + mpBgW2->Move(); + mAttentionInfo.mPosition = current.pos; + mAttentionInfo.mPosition.y -= 100.0f; + field_0x5eb = i_fopAcM_isSwitch(this, getSwBit2()) ? 1 : 0; + field_0x5e9 = field_0x5e8; + + return 1; } -#pragma pop /* 80D00890-80D00954 000990 00C4+00 1/0 0/0 0/0 .text Draw__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Draw__16daObjSwSpinner_cFv.s" +int daObjSwSpinner_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel1, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel2, &mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel1); + mDoExt_modelUpdateDL(mpModel2); + dComIfGd_setList(); + + return 1; } -#pragma pop /* 80D00954-80D009C0 000A54 006C+00 1/0 0/0 0/0 .text Delete__16daObjSwSpinner_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwSpinner_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/Delete__16daObjSwSpinner_cFv.s" +int daObjSwSpinner_c::Delete() { + if (mpBgW2 != NULL && mpBgW2->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW2); + } + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop /* ############################################################################################## */ -/* 80D00AE4-80D00B04 -00001 0020+00 1/0 0/0 0/0 .data daObjSwSpinner_METHODS */ -SECTION_DATA static void* daObjSwSpinner_METHODS[8] = { - (void*)daObjSwSpinner_create1st__FP16daObjSwSpinner_c, - (void*)daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c, - (void*)daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c, - (void*)NULL, - (void*)daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D00B04-80D00B34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwSpinner */ -SECTION_DATA extern void* g_profile_Obj_SwSpinner[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00B30000, (void*)&g_fpcLf_Method, - (void*)0x000005F4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x022F0000, (void*)&daObjSwSpinner_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D00B34-80D00B5C 000054 0028+00 1/1 0/0 0/0 .data __vt__16daObjSwSpinner_c */ -SECTION_DATA extern void* __vt__16daObjSwSpinner_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16daObjSwSpinner_cFv, - (void*)Create__16daObjSwSpinner_cFv, - (void*)Execute__16daObjSwSpinner_cFPPA3_A4_f, - (void*)Draw__16daObjSwSpinner_cFv, - (void*)Delete__16daObjSwSpinner_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - /* 80D009C0-80D00A20 000AC0 0060+00 1/0 0/0 0/0 .text * daObjSwSpinner_create1st__FP16daObjSwSpinner_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwSpinner_create1st(daObjSwSpinner_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_create1st__FP16daObjSwSpinner_c.s" +static int daObjSwSpinner_create1st(daObjSwSpinner_c* i_this) { + fopAcM_SetupActor(i_this, daObjSwSpinner_c); + return i_this->create1st(); } -#pragma pop /* 80D00A20-80D00A40 000B20 0020+00 1/0 0/0 0/0 .text * daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwSpinner_MoveBGDelete(daObjSwSpinner_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c.s" +static int daObjSwSpinner_MoveBGDelete(daObjSwSpinner_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80D00A40-80D00A60 000B40 0020+00 1/0 0/0 0/0 .text * daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwSpinner_MoveBGExecute(daObjSwSpinner_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c.s" +static int daObjSwSpinner_MoveBGExecute(daObjSwSpinner_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80D00A60-80D00A8C 000B60 002C+00 1/0 0/0 0/0 .text * daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner/daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c.s" +static int daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop + +/* 80D00AE4-80D00B04 -00001 0020+00 1/0 0/0 0/0 .data daObjSwSpinner_METHODS */ +static actor_method_class daObjSwSpinner_METHODS = { + (process_method_func)daObjSwSpinner_create1st, + (process_method_func)daObjSwSpinner_MoveBGDelete, + (process_method_func)daObjSwSpinner_MoveBGExecute, + (process_method_func)NULL, + (process_method_func)daObjSwSpinner_MoveBGDraw, +}; + +/* 80D00B04-80D00B34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwSpinner */ +extern actor_process_profile_definition g_profile_Obj_SwSpinner = { + -3, // mLayerID + 3, // mListID + -3, // mListPrio + PROC_Obj_SwSpinner, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjSwSpinner_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x022F, // mPriority + &daObjSwSpinner_METHODS, // mSubMtd + 0x00040100, // mStatus + 0, // mActorType + 14, // mCullType +}; /* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */