From b7380e77d1e9744b03d5906638424c769b33d35c Mon Sep 17 00:00:00 2001 From: hatal175 Date: Fri, 30 Aug 2024 14:50:05 +0300 Subject: [PATCH] Work on JStudio (#2195) * work on object-light * JStage control OK * object-fog OK * object-camera OK * Work on object-actor --- ..._dt__Q214JStudio_JStage13TCreateObjectFv.s | 26 - .../JStudio_JStage/control/func_80289B60.s | 111 --- .../JStudio_JStage/control/func_80289CE4.s | 75 -- .../JStudio_JStage/control/func_80289DE8.s | 75 -- .../JStudio_JStage/control/func_80289EEC.s | 75 -- .../JStudio_JStage/control/func_80289FF0.s | 75 -- .../JStudio_JStage/control/func_8028A0F4.s | 75 -- ...Studio_JStage14TAdaptor_actorFPCvUlPCvUl.s | 10 - ...nd__Q214JStudio_JStage14TAdaptor_actorFv.s | 22 - ...e__Q214JStudio_JStage14TAdaptor_actorFUl.s | 19 - .../object-actor/func_8028A5F0.s | 50 -- .../object-actor/func_8028AA48.s | 6 - .../object-actor/func_8028AAB4.s | 6 - .../object-actor/func_8028AAC8.s | 20 - .../object-actor/func_8028AB0C.s | 27 - .../object-actor/func_8028AB68.s | 39 -- .../object-actor/func_8028ABF0.s | 6 - .../object-actor/func_8028AC04.s | 20 - .../object-actor/func_8028AC48.s | 27 - .../object-actor/func_8028ACA4.s | 25 - .../object-actor/func_8028ACFC.s | 18 - .../object-actor/func_8028B064.s | 57 -- ...ge14TAdaptor_actorFPCQ27JStudio8TControl.s | 111 --- ...ge14TAdaptor_actorFPCQ27JStudio8TControl.s | 110 --- ...t__Q214JStudio_JStage15TAdaptor_cameraFv.s | 31 - ...n__Q214JStudio_JStage15TAdaptor_cameraFv.s | 58 -- ...tudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s | 10 - ...d__Q214JStudio_JStage15TAdaptor_cameraFv.s | 22 - ...e__Q214JStudio_JStage15TAdaptor_cameraFv.s | 23 - ...__Q214JStudio_JStage15TAdaptor_cameraFUl.s | 25 - .../object-camera/func_8028B8A0.s | 49 -- .../object-camera/func_8028BBD0.s | 20 - .../object-camera/func_8028BC14.s | 27 - .../object-camera/func_8028BC70.s | 36 - .../object-camera/func_8028BCEC.s | 6 - .../object-camera/func_8028BD00.s | 20 - .../object-camera/func_8028BD44.s | 27 - .../object-camera/func_8028BDA0.s | 8 - .../object-camera/func_8028BDBC.s | 72 -- .../object-camera/func_8028BEB8.s | 74 -- .../object-camera/func_8028BFBC.s | 64 -- .../object-camera/func_8028C09C.s | 65 -- .../object-camera/func_8028C180.s | 218 ------ .../object-camera/func_8028C4E4.s | 26 - .../object-camera/func_8028C544.s | 13 - ...__dt__Q214JStudio_JStage12TAdaptor_fogFv.s | 31 - ...egin__Q214JStudio_JStage12TAdaptor_fogFv.s | 61 -- ...4JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s | 10 - ..._end__Q214JStudio_JStage12TAdaptor_fogFv.s | 22 - ...pare__Q214JStudio_JStage12TAdaptor_fogFv.s | 23 - ...ate__Q214JStudio_JStage12TAdaptor_fogFUl.s | 31 - .../JStudio_JStage/object-fog/func_8028C574.s | 40 -- .../JStudio_JStage/object-fog/func_8028C8A4.s | 136 ---- .../JStudio_JStage/object-fog/func_8028CAC0.s | 26 - .../JStudio_JStage/object-fog/func_8028CB20.s | 13 - ...dt__Q214JStudio_JStage14TAdaptor_lightFv.s | 31 - ...14TAdaptor_light20TVVOutput_direction_Fv.s | 26 - ...Studio_JStage14TAdaptor_lightFPCvUlPCvUl.s | 10 - ...nd__Q214JStudio_JStage14TAdaptor_lightFv.s | 22 - ...re__Q214JStudio_JStage14TAdaptor_lightFv.s | 23 - .../object-light/func_8028CB50.s | 42 -- .../object-light/func_8028D1B0.s | 38 - .../object-light/func_8028D228.s | 10 - .../object-light/func_8028D24C.s | 4 - .../object-light/func_8028D2B8.s | 167 ----- include/JSystem/JStage/JSGLight.h | 7 +- include/JSystem/JStage/JSGObject.h | 1 - include/JSystem/JStage/JSGSystem.h | 14 +- .../JSystem/JStudio/JStudio/jstudio-control.h | 108 ++- .../JSystem/JStudio/JStudio/jstudio-object.h | 21 + .../JSystem/JStudio/JStudio_JStage/control.h | 188 ++++- .../JStudio/JStudio/jstudio-control.cpp | 2 +- .../JStudio/JStudio_JAudio2/object-sound.cpp | 2 +- .../JStudio_JParticle/object-particle.cpp | 2 +- libs/JSystem/JStudio/JStudio_JStage/Makefile | 1 + .../JStudio/JStudio_JStage/control.cpp | 197 ++---- .../JStudio/JStudio_JStage/object-actor.cpp | 470 +++++++++---- .../JStudio_JStage/object-ambientlight.cpp | 4 +- .../JStudio/JStudio_JStage/object-camera.cpp | 652 +++++++----------- .../JStudio/JStudio_JStage/object-fog.cpp | 264 +------ .../JStudio/JStudio_JStage/object-light.cpp | 290 ++++---- .../JSystem/JStudio/JStudio_JStage/object.cpp | 2 +- src/d/d_demo.cpp | 12 +- 83 files changed, 1140 insertions(+), 3842 deletions(-) delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/__dt__Q214JStudio_JStage13TCreateObjectFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_80289B60.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_80289CE4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_80289DE8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_80289EEC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_80289FF0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/control/func_8028A0F4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A5F0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA48.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAB4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAC8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB0C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB68.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ABF0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC04.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC48.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACA4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACFC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B064.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-actor/setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028B8A0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BBD0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC14.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC70.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BCEC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD00.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD44.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDA0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDBC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BEB8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BFBC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C09C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C180.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C574.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C8A4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q214JStudio_JStage14TAdaptor_lightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028CB50.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D1B0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D228.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D24C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D2B8.s diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/__dt__Q214JStudio_JStage13TCreateObjectFv.s b/asm/JSystem/JStudio/JStudio_JStage/control/__dt__Q214JStudio_JStage13TCreateObjectFv.s deleted file mode 100644 index 10520887c2..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/__dt__Q214JStudio_JStage13TCreateObjectFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80289B00: -/* 80289B00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80289B04 7C 08 02 A6 */ mflr r0 -/* 80289B08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80289B0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80289B10 93 C1 00 08 */ stw r30, 8(r1) -/* 80289B14 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80289B18 7C 9F 23 78 */ mr r31, r4 -/* 80289B1C 41 82 00 28 */ beq lbl_80289B44 -/* 80289B20 3C 80 80 3C */ lis r4, __vt__Q214JStudio_JStage13TCreateObject@ha /* 0x803C5720@ha */ -/* 80289B24 38 04 57 20 */ addi r0, r4, __vt__Q214JStudio_JStage13TCreateObject@l /* 0x803C5720@l */ -/* 80289B28 90 1E 00 00 */ stw r0, 0(r30) -/* 80289B2C 38 80 00 00 */ li r4, 0 -/* 80289B30 4B FF B9 59 */ bl __dt__Q27JStudio13TCreateObjectFv -/* 80289B34 7F E0 07 35 */ extsh. r0, r31 -/* 80289B38 40 81 00 0C */ ble lbl_80289B44 -/* 80289B3C 7F C3 F3 78 */ mr r3, r30 -/* 80289B40 48 04 51 FD */ bl __dl__FPv -lbl_80289B44: -/* 80289B44 7F C3 F3 78 */ mr r3, r30 -/* 80289B48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80289B4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80289B50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80289B54 7C 08 03 A6 */ mtlr r0 -/* 80289B58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80289B5C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289B60.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_80289B60.s deleted file mode 100644 index 076be7bbba..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289B60.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_80289B60: -/* 80289B60 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80289B64 7C 08 02 A6 */ mflr r0 -/* 80289B68 90 01 00 24 */ stw r0, 0x24(r1) -/* 80289B6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289B70 48 0D 86 69 */ bl _savegpr_28 -/* 80289B74 7C 7D 1B 78 */ mr r29, r3 -/* 80289B78 7C 9E 23 78 */ mr r30, r4 -/* 80289B7C 7C BF 2B 78 */ mr r31, r5 -/* 80289B80 38 00 00 00 */ li r0, 0 -/* 80289B84 90 04 00 00 */ stw r0, 0(r4) -/* 80289B88 80 A5 00 00 */ lwz r5, 0(r5) -/* 80289B8C 80 85 00 04 */ lwz r4, 4(r5) -/* 80289B90 3C 60 4A 43 */ lis r3, 0x4A43 /* 0x4A434D52@ha */ -/* 80289B94 38 03 4D 52 */ addi r0, r3, 0x4D52 /* 0x4A434D52@l */ -/* 80289B98 7C 04 00 00 */ cmpw r4, r0 -/* 80289B9C 41 82 00 68 */ beq lbl_80289C04 -/* 80289BA0 40 80 00 28 */ bge lbl_80289BC8 -/* 80289BA4 3C 60 4A 41 */ lis r3, 0x4A41 /* 0x4A414354@ha */ -/* 80289BA8 38 03 43 54 */ addi r0, r3, 0x4354 /* 0x4A414354@l */ -/* 80289BAC 7C 04 00 00 */ cmpw r4, r0 -/* 80289BB0 41 82 00 40 */ beq lbl_80289BF0 -/* 80289BB4 40 80 00 A0 */ bge lbl_80289C54 -/* 80289BB8 38 03 42 4C */ addi r0, r3, 0x424c -/* 80289BBC 7C 04 00 00 */ cmpw r4, r0 -/* 80289BC0 41 82 00 58 */ beq lbl_80289C18 -/* 80289BC4 48 00 00 90 */ b lbl_80289C54 -lbl_80289BC8: -/* 80289BC8 3C 60 4A 4C */ lis r3, 0x4A4C /* 0x4A4C4954@ha */ -/* 80289BCC 38 03 49 54 */ addi r0, r3, 0x4954 /* 0x4A4C4954@l */ -/* 80289BD0 7C 04 00 00 */ cmpw r4, r0 -/* 80289BD4 41 82 00 58 */ beq lbl_80289C2C -/* 80289BD8 40 80 00 7C */ bge lbl_80289C54 -/* 80289BDC 3C 60 4A 46 */ lis r3, 0x4A46 /* 0x4A464F47@ha */ -/* 80289BE0 38 03 4F 47 */ addi r0, r3, 0x4F47 /* 0x4A464F47@l */ -/* 80289BE4 7C 04 00 00 */ cmpw r4, r0 -/* 80289BE8 41 82 00 58 */ beq lbl_80289C40 -/* 80289BEC 48 00 00 68 */ b lbl_80289C54 -lbl_80289BF0: -/* 80289BF0 3C 60 80 29 */ lis r3, func_80289CE4@ha /* 0x80289CE4@ha */ -/* 80289BF4 38 03 9C E4 */ addi r0, r3, func_80289CE4@l /* 0x80289CE4@l */ -/* 80289BF8 7C 1C 03 78 */ mr r28, r0 -/* 80289BFC 38 C0 00 02 */ li r6, 2 -/* 80289C00 48 00 00 5C */ b lbl_80289C5C -lbl_80289C04: -/* 80289C04 3C 60 80 29 */ lis r3, func_80289DE8@ha /* 0x80289DE8@ha */ -/* 80289C08 38 03 9D E8 */ addi r0, r3, func_80289DE8@l /* 0x80289DE8@l */ -/* 80289C0C 7C 1C 03 78 */ mr r28, r0 -/* 80289C10 38 C0 00 03 */ li r6, 3 -/* 80289C14 48 00 00 48 */ b lbl_80289C5C -lbl_80289C18: -/* 80289C18 3C 60 80 29 */ lis r3, func_80289EEC@ha /* 0x80289EEC@ha */ -/* 80289C1C 38 03 9E EC */ addi r0, r3, func_80289EEC@l /* 0x80289EEC@l */ -/* 80289C20 7C 1C 03 78 */ mr r28, r0 -/* 80289C24 38 C0 00 04 */ li r6, 4 -/* 80289C28 48 00 00 34 */ b lbl_80289C5C -lbl_80289C2C: -/* 80289C2C 3C 60 80 29 */ lis r3, func_80289FF0@ha /* 0x80289FF0@ha */ -/* 80289C30 38 03 9F F0 */ addi r0, r3, func_80289FF0@l /* 0x80289FF0@l */ -/* 80289C34 7C 1C 03 78 */ mr r28, r0 -/* 80289C38 38 C0 00 05 */ li r6, 5 -/* 80289C3C 48 00 00 20 */ b lbl_80289C5C -lbl_80289C40: -/* 80289C40 3C 60 80 29 */ lis r3, func_8028A0F4@ha /* 0x8028A0F4@ha */ -/* 80289C44 38 03 A0 F4 */ addi r0, r3, func_8028A0F4@l /* 0x8028A0F4@l */ -/* 80289C48 7C 1C 03 78 */ mr r28, r0 -/* 80289C4C 38 C0 00 06 */ li r6, 6 -/* 80289C50 48 00 00 0C */ b lbl_80289C5C -lbl_80289C54: -/* 80289C54 38 60 00 00 */ li r3, 0 -/* 80289C58 48 00 00 74 */ b lbl_80289CCC -lbl_80289C5C: -/* 80289C5C 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80289C60 38 81 00 08 */ addi r4, r1, 8 -/* 80289C64 38 A5 00 0C */ addi r5, r5, 0xc -/* 80289C68 81 83 00 00 */ lwz r12, 0(r3) -/* 80289C6C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80289C70 7D 89 03 A6 */ mtctr r12 -/* 80289C74 4E 80 04 21 */ bctrl -/* 80289C78 2C 03 00 01 */ cmpwi r3, 1 -/* 80289C7C 41 82 00 4C */ beq lbl_80289CC8 -/* 80289C80 40 80 00 10 */ bge lbl_80289C90 -/* 80289C84 2C 03 00 00 */ cmpwi r3, 0 -/* 80289C88 40 80 00 14 */ bge lbl_80289C9C -/* 80289C8C 48 00 00 3C */ b lbl_80289CC8 -lbl_80289C90: -/* 80289C90 2C 03 00 03 */ cmpwi r3, 3 -/* 80289C94 40 80 00 34 */ bge lbl_80289CC8 -/* 80289C98 48 00 00 28 */ b lbl_80289CC0 -lbl_80289C9C: -/* 80289C9C 7F E3 FB 78 */ mr r3, r31 -/* 80289CA0 80 81 00 08 */ lwz r4, 8(r1) -/* 80289CA4 80 BD 00 0C */ lwz r5, 0xc(r29) -/* 80289CA8 7F 8C E3 78 */ mr r12, r28 -/* 80289CAC 7D 89 03 A6 */ mtctr r12 -/* 80289CB0 4E 80 04 21 */ bctrl -/* 80289CB4 90 7E 00 00 */ stw r3, 0(r30) -/* 80289CB8 38 60 00 01 */ li r3, 1 -/* 80289CBC 48 00 00 10 */ b lbl_80289CCC -lbl_80289CC0: -/* 80289CC0 38 60 00 01 */ li r3, 1 -/* 80289CC4 48 00 00 08 */ b lbl_80289CCC -lbl_80289CC8: -/* 80289CC8 38 60 00 00 */ li r3, 0 -lbl_80289CCC: -/* 80289CCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289CD0 48 0D 85 55 */ bl _restgpr_28 -/* 80289CD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80289CD8 7C 08 03 A6 */ mtlr r0 -/* 80289CDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80289CE0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289CE4.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_80289CE4.s deleted file mode 100644 index 55c8aff264..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289CE4.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80289CE4: -/* 80289CE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80289CE8 7C 08 02 A6 */ mflr r0 -/* 80289CEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80289CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289CF4 48 0D 84 E5 */ bl _savegpr_28 -/* 80289CF8 7C 7C 1B 78 */ mr r28, r3 -/* 80289CFC 7C BD 2B 78 */ mr r29, r5 -/* 80289D00 7C 9E 23 78 */ mr r30, r4 -/* 80289D04 38 60 01 50 */ li r3, 0x150 -/* 80289D08 48 04 4F 45 */ bl __nw__FUl -/* 80289D0C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80289D10 41 82 00 14 */ beq lbl_80289D24 -/* 80289D14 7F A4 EB 78 */ mr r4, r29 -/* 80289D18 7F C5 F3 78 */ mr r5, r30 -/* 80289D1C 48 00 08 D5 */ bl __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor -/* 80289D20 7C 7F 1B 78 */ mr r31, r3 -lbl_80289D24: -/* 80289D24 28 1F 00 00 */ cmplwi r31, 0 -/* 80289D28 40 82 00 0C */ bne lbl_80289D34 -/* 80289D2C 38 60 00 00 */ li r3, 0 -/* 80289D30 48 00 00 A0 */ b lbl_80289DD0 -lbl_80289D34: -/* 80289D34 93 E1 00 08 */ stw r31, 8(r1) -/* 80289D38 38 60 00 38 */ li r3, 0x38 -/* 80289D3C 48 04 4F 11 */ bl __nw__FUl -/* 80289D40 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80289D44 41 82 00 14 */ beq lbl_80289D58 -/* 80289D48 7F 84 E3 78 */ mr r4, r28 -/* 80289D4C 7F E5 FB 78 */ mr r5, r31 -/* 80289D50 4B FF CB C1 */ bl __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor -/* 80289D54 7C 7E 1B 78 */ mr r30, r3 -lbl_80289D58: -/* 80289D58 28 1E 00 00 */ cmplwi r30, 0 -/* 80289D5C 40 82 00 0C */ bne lbl_80289D68 -/* 80289D60 3B C0 00 00 */ li r30, 0 -/* 80289D64 48 00 00 28 */ b lbl_80289D8C -lbl_80289D68: -/* 80289D68 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289D6C 28 03 00 00 */ cmplwi r3, 0 -/* 80289D70 41 82 00 1C */ beq lbl_80289D8C -/* 80289D74 93 C3 00 04 */ stw r30, 4(r3) -/* 80289D78 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289D7C 81 83 00 00 */ lwz r12, 0(r3) -/* 80289D80 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80289D84 7D 89 03 A6 */ mtctr r12 -/* 80289D88 4E 80 04 21 */ bctrl -lbl_80289D8C: -/* 80289D8C 28 1E 00 00 */ cmplwi r30, 0 -/* 80289D90 40 82 00 2C */ bne lbl_80289DBC -/* 80289D94 80 61 00 08 */ lwz r3, 8(r1) -/* 80289D98 28 03 00 00 */ cmplwi r3, 0 -/* 80289D9C 41 82 00 18 */ beq lbl_80289DB4 -/* 80289DA0 38 80 00 01 */ li r4, 1 -/* 80289DA4 81 83 00 00 */ lwz r12, 0(r3) -/* 80289DA8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80289DAC 7D 89 03 A6 */ mtctr r12 -/* 80289DB0 4E 80 04 21 */ bctrl -lbl_80289DB4: -/* 80289DB4 38 60 00 00 */ li r3, 0 -/* 80289DB8 48 00 00 18 */ b lbl_80289DD0 -lbl_80289DBC: -/* 80289DBC 38 00 00 00 */ li r0, 0 -/* 80289DC0 90 01 00 08 */ stw r0, 8(r1) -/* 80289DC4 48 00 00 08 */ b lbl_80289DCC -/* 80289DC8 4E 80 04 21 */ bctrl -lbl_80289DCC: -/* 80289DCC 7F C3 F3 78 */ mr r3, r30 -lbl_80289DD0: -/* 80289DD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289DD4 48 0D 84 51 */ bl _restgpr_28 -/* 80289DD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80289DDC 7C 08 03 A6 */ mtlr r0 -/* 80289DE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80289DE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289DE8.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_80289DE8.s deleted file mode 100644 index abec893f6c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289DE8.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80289DE8: -/* 80289DE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80289DEC 7C 08 02 A6 */ mflr r0 -/* 80289DF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80289DF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289DF8 48 0D 83 E1 */ bl _savegpr_28 -/* 80289DFC 7C 7C 1B 78 */ mr r28, r3 -/* 80289E00 7C BD 2B 78 */ mr r29, r5 -/* 80289E04 7C 9E 23 78 */ mr r30, r4 -/* 80289E08 38 60 01 24 */ li r3, 0x124 -/* 80289E0C 48 04 4E 41 */ bl __nw__FUl -/* 80289E10 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80289E14 41 82 00 14 */ beq lbl_80289E28 -/* 80289E18 7F A4 EB 78 */ mr r4, r29 -/* 80289E1C 7F C5 F3 78 */ mr r5, r30 -/* 80289E20 48 00 1A 81 */ bl __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera -/* 80289E24 7C 7F 1B 78 */ mr r31, r3 -lbl_80289E28: -/* 80289E28 28 1F 00 00 */ cmplwi r31, 0 -/* 80289E2C 40 82 00 0C */ bne lbl_80289E38 -/* 80289E30 38 60 00 00 */ li r3, 0 -/* 80289E34 48 00 00 A0 */ b lbl_80289ED4 -lbl_80289E38: -/* 80289E38 93 E1 00 08 */ stw r31, 8(r1) -/* 80289E3C 38 60 00 38 */ li r3, 0x38 -/* 80289E40 48 04 4E 0D */ bl __nw__FUl -/* 80289E44 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80289E48 41 82 00 14 */ beq lbl_80289E5C -/* 80289E4C 7F 84 E3 78 */ mr r4, r28 -/* 80289E50 7F E5 FB 78 */ mr r5, r31 -/* 80289E54 4B FF D0 29 */ bl __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera -/* 80289E58 7C 7E 1B 78 */ mr r30, r3 -lbl_80289E5C: -/* 80289E5C 28 1E 00 00 */ cmplwi r30, 0 -/* 80289E60 40 82 00 0C */ bne lbl_80289E6C -/* 80289E64 3B C0 00 00 */ li r30, 0 -/* 80289E68 48 00 00 28 */ b lbl_80289E90 -lbl_80289E6C: -/* 80289E6C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289E70 28 03 00 00 */ cmplwi r3, 0 -/* 80289E74 41 82 00 1C */ beq lbl_80289E90 -/* 80289E78 93 C3 00 04 */ stw r30, 4(r3) -/* 80289E7C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289E80 81 83 00 00 */ lwz r12, 0(r3) -/* 80289E84 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80289E88 7D 89 03 A6 */ mtctr r12 -/* 80289E8C 4E 80 04 21 */ bctrl -lbl_80289E90: -/* 80289E90 28 1E 00 00 */ cmplwi r30, 0 -/* 80289E94 40 82 00 2C */ bne lbl_80289EC0 -/* 80289E98 80 61 00 08 */ lwz r3, 8(r1) -/* 80289E9C 28 03 00 00 */ cmplwi r3, 0 -/* 80289EA0 41 82 00 18 */ beq lbl_80289EB8 -/* 80289EA4 38 80 00 01 */ li r4, 1 -/* 80289EA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80289EAC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80289EB0 7D 89 03 A6 */ mtctr r12 -/* 80289EB4 4E 80 04 21 */ bctrl -lbl_80289EB8: -/* 80289EB8 38 60 00 00 */ li r3, 0 -/* 80289EBC 48 00 00 18 */ b lbl_80289ED4 -lbl_80289EC0: -/* 80289EC0 38 00 00 00 */ li r0, 0 -/* 80289EC4 90 01 00 08 */ stw r0, 8(r1) -/* 80289EC8 48 00 00 08 */ b lbl_80289ED0 -/* 80289ECC 4E 80 04 21 */ bctrl -lbl_80289ED0: -/* 80289ED0 7F C3 F3 78 */ mr r3, r30 -lbl_80289ED4: -/* 80289ED4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289ED8 48 0D 83 4D */ bl _restgpr_28 -/* 80289EDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80289EE0 7C 08 03 A6 */ mtlr r0 -/* 80289EE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80289EE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289EEC.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_80289EEC.s deleted file mode 100644 index 4f96c990a4..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289EEC.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80289EEC: -/* 80289EEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80289EF0 7C 08 02 A6 */ mflr r0 -/* 80289EF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80289EF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289EFC 48 0D 82 DD */ bl _savegpr_28 -/* 80289F00 7C 7C 1B 78 */ mr r28, r3 -/* 80289F04 7C BD 2B 78 */ mr r29, r5 -/* 80289F08 7C 9E 23 78 */ mr r30, r4 -/* 80289F0C 38 60 00 68 */ li r3, 0x68 -/* 80289F10 48 04 4D 3D */ bl __nw__FUl -/* 80289F14 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80289F18 41 82 00 14 */ beq lbl_80289F2C -/* 80289F1C 7F A4 EB 78 */ mr r4, r29 -/* 80289F20 7F C5 F3 78 */ mr r5, r30 -/* 80289F24 48 00 16 ED */ bl __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight -/* 80289F28 7C 7F 1B 78 */ mr r31, r3 -lbl_80289F2C: -/* 80289F2C 28 1F 00 00 */ cmplwi r31, 0 -/* 80289F30 40 82 00 0C */ bne lbl_80289F3C -/* 80289F34 38 60 00 00 */ li r3, 0 -/* 80289F38 48 00 00 A0 */ b lbl_80289FD8 -lbl_80289F3C: -/* 80289F3C 93 E1 00 08 */ stw r31, 8(r1) -/* 80289F40 38 60 00 38 */ li r3, 0x38 -/* 80289F44 48 04 4D 09 */ bl __nw__FUl -/* 80289F48 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80289F4C 41 82 00 14 */ beq lbl_80289F60 -/* 80289F50 7F 84 E3 78 */ mr r4, r28 -/* 80289F54 7F E5 FB 78 */ mr r5, r31 -/* 80289F58 4B FF CD A5 */ bl __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight -/* 80289F5C 7C 7E 1B 78 */ mr r30, r3 -lbl_80289F60: -/* 80289F60 28 1E 00 00 */ cmplwi r30, 0 -/* 80289F64 40 82 00 0C */ bne lbl_80289F70 -/* 80289F68 3B C0 00 00 */ li r30, 0 -/* 80289F6C 48 00 00 28 */ b lbl_80289F94 -lbl_80289F70: -/* 80289F70 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289F74 28 03 00 00 */ cmplwi r3, 0 -/* 80289F78 41 82 00 1C */ beq lbl_80289F94 -/* 80289F7C 93 C3 00 04 */ stw r30, 4(r3) -/* 80289F80 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 80289F84 81 83 00 00 */ lwz r12, 0(r3) -/* 80289F88 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80289F8C 7D 89 03 A6 */ mtctr r12 -/* 80289F90 4E 80 04 21 */ bctrl -lbl_80289F94: -/* 80289F94 28 1E 00 00 */ cmplwi r30, 0 -/* 80289F98 40 82 00 2C */ bne lbl_80289FC4 -/* 80289F9C 80 61 00 08 */ lwz r3, 8(r1) -/* 80289FA0 28 03 00 00 */ cmplwi r3, 0 -/* 80289FA4 41 82 00 18 */ beq lbl_80289FBC -/* 80289FA8 38 80 00 01 */ li r4, 1 -/* 80289FAC 81 83 00 00 */ lwz r12, 0(r3) -/* 80289FB0 81 8C 00 08 */ lwz r12, 8(r12) -/* 80289FB4 7D 89 03 A6 */ mtctr r12 -/* 80289FB8 4E 80 04 21 */ bctrl -lbl_80289FBC: -/* 80289FBC 38 60 00 00 */ li r3, 0 -/* 80289FC0 48 00 00 18 */ b lbl_80289FD8 -lbl_80289FC4: -/* 80289FC4 38 00 00 00 */ li r0, 0 -/* 80289FC8 90 01 00 08 */ stw r0, 8(r1) -/* 80289FCC 48 00 00 08 */ b lbl_80289FD4 -/* 80289FD0 4E 80 04 21 */ bctrl -lbl_80289FD4: -/* 80289FD4 7F C3 F3 78 */ mr r3, r30 -lbl_80289FD8: -/* 80289FD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289FDC 48 0D 82 49 */ bl _restgpr_28 -/* 80289FE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80289FE4 7C 08 03 A6 */ mtlr r0 -/* 80289FE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80289FEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289FF0.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_80289FF0.s deleted file mode 100644 index 2b2f487e35..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_80289FF0.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80289FF0: -/* 80289FF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80289FF4 7C 08 02 A6 */ mflr r0 -/* 80289FF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80289FFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A000 48 0D 81 D9 */ bl _savegpr_28 -/* 8028A004 7C 7C 1B 78 */ mr r28, r3 -/* 8028A008 7C BD 2B 78 */ mr r29, r5 -/* 8028A00C 7C 9E 23 78 */ mr r30, r4 -/* 8028A010 38 60 01 20 */ li r3, 0x120 -/* 8028A014 48 04 4C 39 */ bl __nw__FUl -/* 8028A018 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8028A01C 41 82 00 14 */ beq lbl_8028A030 -/* 8028A020 7F A4 EB 78 */ mr r4, r29 -/* 8028A024 7F C5 F3 78 */ mr r5, r30 -/* 8028A028 48 00 2B 29 */ bl __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight -/* 8028A02C 7C 7F 1B 78 */ mr r31, r3 -lbl_8028A030: -/* 8028A030 28 1F 00 00 */ cmplwi r31, 0 -/* 8028A034 40 82 00 0C */ bne lbl_8028A040 -/* 8028A038 38 60 00 00 */ li r3, 0 -/* 8028A03C 48 00 00 A0 */ b lbl_8028A0DC -lbl_8028A040: -/* 8028A040 93 E1 00 08 */ stw r31, 8(r1) -/* 8028A044 38 60 00 38 */ li r3, 0x38 -/* 8028A048 48 04 4C 05 */ bl __nw__FUl -/* 8028A04C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028A050 41 82 00 14 */ beq lbl_8028A064 -/* 8028A054 7F 84 E3 78 */ mr r4, r28 -/* 8028A058 7F E5 FB 78 */ mr r5, r31 -/* 8028A05C 4B FF D3 0D */ bl __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light -/* 8028A060 7C 7E 1B 78 */ mr r30, r3 -lbl_8028A064: -/* 8028A064 28 1E 00 00 */ cmplwi r30, 0 -/* 8028A068 40 82 00 0C */ bne lbl_8028A074 -/* 8028A06C 3B C0 00 00 */ li r30, 0 -/* 8028A070 48 00 00 28 */ b lbl_8028A098 -lbl_8028A074: -/* 8028A074 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028A078 28 03 00 00 */ cmplwi r3, 0 -/* 8028A07C 41 82 00 1C */ beq lbl_8028A098 -/* 8028A080 93 C3 00 04 */ stw r30, 4(r3) -/* 8028A084 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028A088 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A08C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028A090 7D 89 03 A6 */ mtctr r12 -/* 8028A094 4E 80 04 21 */ bctrl -lbl_8028A098: -/* 8028A098 28 1E 00 00 */ cmplwi r30, 0 -/* 8028A09C 40 82 00 2C */ bne lbl_8028A0C8 -/* 8028A0A0 80 61 00 08 */ lwz r3, 8(r1) -/* 8028A0A4 28 03 00 00 */ cmplwi r3, 0 -/* 8028A0A8 41 82 00 18 */ beq lbl_8028A0C0 -/* 8028A0AC 38 80 00 01 */ li r4, 1 -/* 8028A0B0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A0B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 8028A0B8 7D 89 03 A6 */ mtctr r12 -/* 8028A0BC 4E 80 04 21 */ bctrl -lbl_8028A0C0: -/* 8028A0C0 38 60 00 00 */ li r3, 0 -/* 8028A0C4 48 00 00 18 */ b lbl_8028A0DC -lbl_8028A0C8: -/* 8028A0C8 38 00 00 00 */ li r0, 0 -/* 8028A0CC 90 01 00 08 */ stw r0, 8(r1) -/* 8028A0D0 48 00 00 08 */ b lbl_8028A0D8 -/* 8028A0D4 4E 80 04 21 */ bctrl -lbl_8028A0D8: -/* 8028A0D8 7F C3 F3 78 */ mr r3, r30 -lbl_8028A0DC: -/* 8028A0DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A0E0 48 0D 81 45 */ bl _restgpr_28 -/* 8028A0E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028A0E8 7C 08 03 A6 */ mtlr r0 -/* 8028A0EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028A0F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/control/func_8028A0F4.s b/asm/JSystem/JStudio/JStudio_JStage/control/func_8028A0F4.s deleted file mode 100644 index 69febe1fa7..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/control/func_8028A0F4.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8028A0F4: -/* 8028A0F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028A0F8 7C 08 02 A6 */ mflr r0 -/* 8028A0FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028A100 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A104 48 0D 80 D5 */ bl _savegpr_28 -/* 8028A108 7C 7C 1B 78 */ mr r28, r3 -/* 8028A10C 7C BD 2B 78 */ mr r29, r5 -/* 8028A110 7C 9E 23 78 */ mr r30, r4 -/* 8028A114 38 60 00 90 */ li r3, 0x90 -/* 8028A118 48 04 4B 35 */ bl __nw__FUl -/* 8028A11C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8028A120 41 82 00 14 */ beq lbl_8028A134 -/* 8028A124 7F A4 EB 78 */ mr r4, r29 -/* 8028A128 7F C5 F3 78 */ mr r5, r30 -/* 8028A12C 48 00 24 49 */ bl __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog -/* 8028A130 7C 7F 1B 78 */ mr r31, r3 -lbl_8028A134: -/* 8028A134 28 1F 00 00 */ cmplwi r31, 0 -/* 8028A138 40 82 00 0C */ bne lbl_8028A144 -/* 8028A13C 38 60 00 00 */ li r3, 0 -/* 8028A140 48 00 00 A0 */ b lbl_8028A1E0 -lbl_8028A144: -/* 8028A144 93 E1 00 08 */ stw r31, 8(r1) -/* 8028A148 38 60 00 38 */ li r3, 0x38 -/* 8028A14C 48 04 4B 01 */ bl __nw__FUl -/* 8028A150 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028A154 41 82 00 14 */ beq lbl_8028A168 -/* 8028A158 7F 84 E3 78 */ mr r4, r28 -/* 8028A15C 7F E5 FB 78 */ mr r5, r31 -/* 8028A160 4B FF D0 7D */ bl __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog -/* 8028A164 7C 7E 1B 78 */ mr r30, r3 -lbl_8028A168: -/* 8028A168 28 1E 00 00 */ cmplwi r30, 0 -/* 8028A16C 40 82 00 0C */ bne lbl_8028A178 -/* 8028A170 3B C0 00 00 */ li r30, 0 -/* 8028A174 48 00 00 28 */ b lbl_8028A19C -lbl_8028A178: -/* 8028A178 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028A17C 28 03 00 00 */ cmplwi r3, 0 -/* 8028A180 41 82 00 1C */ beq lbl_8028A19C -/* 8028A184 93 C3 00 04 */ stw r30, 4(r3) -/* 8028A188 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028A18C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A190 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028A194 7D 89 03 A6 */ mtctr r12 -/* 8028A198 4E 80 04 21 */ bctrl -lbl_8028A19C: -/* 8028A19C 28 1E 00 00 */ cmplwi r30, 0 -/* 8028A1A0 40 82 00 2C */ bne lbl_8028A1CC -/* 8028A1A4 80 61 00 08 */ lwz r3, 8(r1) -/* 8028A1A8 28 03 00 00 */ cmplwi r3, 0 -/* 8028A1AC 41 82 00 18 */ beq lbl_8028A1C4 -/* 8028A1B0 38 80 00 01 */ li r4, 1 -/* 8028A1B4 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A1B8 81 8C 00 08 */ lwz r12, 8(r12) -/* 8028A1BC 7D 89 03 A6 */ mtctr r12 -/* 8028A1C0 4E 80 04 21 */ bctrl -lbl_8028A1C4: -/* 8028A1C4 38 60 00 00 */ li r3, 0 -/* 8028A1C8 48 00 00 18 */ b lbl_8028A1E0 -lbl_8028A1CC: -/* 8028A1CC 38 00 00 00 */ li r0, 0 -/* 8028A1D0 90 01 00 08 */ stw r0, 8(r1) -/* 8028A1D4 48 00 00 08 */ b lbl_8028A1DC -/* 8028A1D8 4E 80 04 21 */ bctrl -lbl_8028A1DC: -/* 8028A1DC 7F C3 F3 78 */ mr r3, r30 -lbl_8028A1E0: -/* 8028A1E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A1E4 48 0D 80 41 */ bl _restgpr_28 -/* 8028A1E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028A1EC 7C 08 03 A6 */ mtlr r0 -/* 8028A1F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028A1F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl.s deleted file mode 100644 index 2028999ed1..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028A974: -/* 8028A974 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A978 7C 08 02 A6 */ mflr r0 -/* 8028A97C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A980 38 63 01 28 */ addi r3, r3, 0x128 -/* 8028A984 4B FF FA ED */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl -/* 8028A988 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A98C 7C 08 03 A6 */ mtlr r0 -/* 8028A990 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A994 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv.s deleted file mode 100644 index 6d7c1b3a1a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028A8D8: -/* 8028A8D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A8DC 7C 08 02 A6 */ mflr r0 -/* 8028A8E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A8E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028A8E8 83 E3 01 2C */ lwz r31, 0x12c(r3) -/* 8028A8EC 7F E3 FB 78 */ mr r3, r31 -/* 8028A8F0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A8F4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028A8F8 7D 89 03 A6 */ mtctr r12 -/* 8028A8FC 4E 80 04 21 */ bctrl -/* 8028A900 54 64 00 3C */ rlwinm r4, r3, 0, 0, 0x1e -/* 8028A904 7F E3 FB 78 */ mr r3, r31 -/* 8028A908 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A90C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028A910 7D 89 03 A6 */ mtctr r12 -/* 8028A914 4E 80 04 21 */ bctrl -/* 8028A918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028A91C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A920 7C 08 03 A6 */ mtlr r0 -/* 8028A924 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A928 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl.s deleted file mode 100644 index 390168860e..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8028A92C: -/* 8028A92C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A930 7C 08 02 A6 */ mflr r0 -/* 8028A934 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A938 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028A93C 7C 7F 1B 78 */ mr r31, r3 -/* 8028A940 80 83 00 04 */ lwz r4, 4(r3) -/* 8028A944 80 84 00 14 */ lwz r4, 0x14(r4) -/* 8028A948 48 00 03 F1 */ bl setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl -/* 8028A94C 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 8028A950 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A954 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028A958 7D 89 03 A6 */ mtctr r12 -/* 8028A95C 4E 80 04 21 */ bctrl -/* 8028A960 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028A964 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A968 7C 08 03 A6 */ mtlr r0 -/* 8028A96C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A970 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A5F0.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A5F0.s deleted file mode 100644 index 8d0b2dad2b..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A5F0.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8028A5F0: -/* 8028A5F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028A5F4 7C 08 02 A6 */ mflr r0 -/* 8028A5F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028A5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A600 48 0D 7B DD */ bl _savegpr_29 -/* 8028A604 7C 7D 1B 78 */ mr r29, r3 -/* 8028A608 7C 9E 23 78 */ mr r30, r4 -/* 8028A60C 7C BF 2B 78 */ mr r31, r5 -/* 8028A610 7F A5 EB 78 */ mr r5, r29 -/* 8028A614 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028A618 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028A61C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028A620 38 00 00 00 */ li r0, 0 -/* 8028A624 90 1D 00 04 */ stw r0, 4(r29) -/* 8028A628 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028A62C 90 7D 00 08 */ stw r3, 8(r29) -/* 8028A630 38 00 00 0E */ li r0, 0xe -/* 8028A634 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8028A638 3C 80 80 3C */ lis r4, __vt__Q27JStudio14TAdaptor_actor@ha /* 0x803C55A0@ha */ -/* 8028A63C 38 04 55 A0 */ addi r0, r4, __vt__Q27JStudio14TAdaptor_actor@l /* 0x803C55A0@l */ -/* 8028A640 90 1D 00 00 */ stw r0, 0(r29) -/* 8028A644 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028A648 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028A64C 38 A0 00 00 */ li r5, 0 -/* 8028A650 38 C0 00 14 */ li r6, 0x14 -/* 8028A654 38 E0 00 0E */ li r7, 0xe -/* 8028A658 48 0D 77 09 */ bl __construct_array -/* 8028A65C 93 DD 01 28 */ stw r30, 0x128(r29) -/* 8028A660 93 FD 01 2C */ stw r31, 0x12c(r29) -/* 8028A664 3C 60 80 3C */ lis r3, __vt__Q214JStudio_JStage14TAdaptor_actor@ha /* 0x803C57C4@ha */ -/* 8028A668 38 03 57 C4 */ addi r0, r3, __vt__Q214JStudio_JStage14TAdaptor_actor@l /* 0x803C57C4@l */ -/* 8028A66C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028A670 38 60 00 00 */ li r3, 0 -/* 8028A674 90 7D 01 30 */ stw r3, 0x130(r29) -/* 8028A678 90 7D 01 34 */ stw r3, 0x134(r29) -/* 8028A67C 90 7D 01 38 */ stw r3, 0x138(r29) -/* 8028A680 90 7D 01 3C */ stw r3, 0x13c(r29) -/* 8028A684 38 00 FF FF */ li r0, -1 -/* 8028A688 90 1D 01 40 */ stw r0, 0x140(r29) -/* 8028A68C 98 7D 01 44 */ stb r3, 0x144(r29) -/* 8028A690 90 7D 01 48 */ stw r3, 0x148(r29) -/* 8028A694 90 1D 01 4C */ stw r0, 0x14c(r29) -/* 8028A698 7F A3 EB 78 */ mr r3, r29 -/* 8028A69C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A6A0 48 0D 7B 89 */ bl _restgpr_29 -/* 8028A6A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028A6A8 7C 08 03 A6 */ mtlr r0 -/* 8028A6AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028A6B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA48.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA48.s deleted file mode 100644 index dfc73724d9..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA48.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028AA48: -/* 8028AA48 2C 04 00 02 */ cmpwi r4, 2 -/* 8028AA4C 4C 82 00 20 */ bnelr -/* 8028AA50 80 05 00 00 */ lwz r0, 0(r5) -/* 8028AA54 90 03 01 30 */ stw r0, 0x130(r3) -/* 8028AA58 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAB4.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAB4.s deleted file mode 100644 index c9ae10ca4d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAB4.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028AAB4: -/* 8028AAB4 2C 04 00 02 */ cmpwi r4, 2 -/* 8028AAB8 4C 82 00 20 */ bnelr -/* 8028AABC 80 05 00 00 */ lwz r0, 0(r5) -/* 8028AAC0 90 03 01 34 */ stw r0, 0x134(r3) -/* 8028AAC4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAC8.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAC8.s deleted file mode 100644 index 225e60b77e..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAC8.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8028AAC8: -/* 8028AAC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AACC 7C 08 02 A6 */ mflr r0 -/* 8028AAD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AAD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028AAD8 7C 7F 1B 78 */ mr r31, r3 -/* 8028AADC 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028AAE0 41 82 00 08 */ beq lbl_8028AAE8 -/* 8028AAE4 48 00 00 14 */ b lbl_8028AAF8 -lbl_8028AAE8: -/* 8028AAE8 38 7F 01 28 */ addi r3, r31, 0x128 -/* 8028AAEC 7C A4 2B 78 */ mr r4, r5 -/* 8028AAF0 4B FF F9 CD */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc -/* 8028AAF4 90 7F 01 3C */ stw r3, 0x13c(r31) -lbl_8028AAF8: -/* 8028AAF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028AAFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028AB00 7C 08 03 A6 */ mtlr r0 -/* 8028AB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028AB08 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB0C.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB0C.s deleted file mode 100644 index ba892530a4..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB0C.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8028AB0C: -/* 8028AB0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AB10 7C 08 02 A6 */ mflr r0 -/* 8028AB14 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AB18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028AB1C 7C 7F 1B 78 */ mr r31, r3 -/* 8028AB20 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028AB24 41 82 00 28 */ beq lbl_8028AB4C -/* 8028AB28 40 80 00 2C */ bge lbl_8028AB54 -/* 8028AB2C 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028AB30 40 80 00 08 */ bge lbl_8028AB38 -/* 8028AB34 48 00 00 20 */ b lbl_8028AB54 -lbl_8028AB38: -/* 8028AB38 38 7F 01 28 */ addi r3, r31, 0x128 -/* 8028AB3C 80 9F 01 3C */ lwz r4, 0x13c(r31) -/* 8028AB40 4B FF F9 CD */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc -/* 8028AB44 90 7F 01 40 */ stw r3, 0x140(r31) -/* 8028AB48 48 00 00 0C */ b lbl_8028AB54 -lbl_8028AB4C: -/* 8028AB4C 80 05 00 00 */ lwz r0, 0(r5) -/* 8028AB50 90 1F 01 40 */ stw r0, 0x140(r31) -lbl_8028AB54: -/* 8028AB54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028AB58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028AB5C 7C 08 03 A6 */ mtlr r0 -/* 8028AB60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028AB64 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB68.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB68.s deleted file mode 100644 index a326c0a34a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB68.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8028AB68: -/* 8028AB68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AB6C 7C 08 02 A6 */ mflr r0 -/* 8028AB70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AB74 2C 04 00 02 */ cmpwi r4, 2 -/* 8028AB78 41 82 00 08 */ beq lbl_8028AB80 -/* 8028AB7C 48 00 00 64 */ b lbl_8028ABE0 -lbl_8028AB80: -/* 8028AB80 80 85 00 00 */ lwz r4, 0(r5) -/* 8028AB84 30 04 FF FF */ addic r0, r4, -1 -/* 8028AB88 7C 80 21 10 */ subfe r4, r0, r4 -/* 8028AB8C 88 03 01 44 */ lbz r0, 0x144(r3) -/* 8028AB90 54 86 06 3E */ clrlwi r6, r4, 0x18 -/* 8028AB94 7C 00 30 40 */ cmplw r0, r6 -/* 8028AB98 41 82 00 48 */ beq lbl_8028ABE0 -/* 8028AB9C 98 83 01 44 */ stb r4, 0x144(r3) -/* 8028ABA0 80 03 01 38 */ lwz r0, 0x138(r3) -/* 8028ABA4 2C 00 00 01 */ cmpwi r0, 1 -/* 8028ABA8 41 82 00 0C */ beq lbl_8028ABB4 -/* 8028ABAC 40 80 00 34 */ bge lbl_8028ABE0 -/* 8028ABB0 48 00 00 30 */ b lbl_8028ABE0 -lbl_8028ABB4: -/* 8028ABB4 38 80 00 00 */ li r4, 0 -/* 8028ABB8 38 A0 FF FF */ li r5, -1 -/* 8028ABBC 28 06 00 00 */ cmplwi r6, 0 -/* 8028ABC0 41 82 00 0C */ beq lbl_8028ABCC -/* 8028ABC4 80 83 01 3C */ lwz r4, 0x13c(r3) -/* 8028ABC8 80 A3 01 40 */ lwz r5, 0x140(r3) -lbl_8028ABCC: -/* 8028ABCC 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 8028ABD0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028ABD4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8028ABD8 7D 89 03 A6 */ mtctr r12 -/* 8028ABDC 4E 80 04 21 */ bctrl -lbl_8028ABE0: -/* 8028ABE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028ABE4 7C 08 03 A6 */ mtlr r0 -/* 8028ABE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028ABEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ABF0.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ABF0.s deleted file mode 100644 index ebe66b2cf3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ABF0.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028ABF0: -/* 8028ABF0 2C 04 00 02 */ cmpwi r4, 2 -/* 8028ABF4 4C 82 00 20 */ bnelr -/* 8028ABF8 80 05 00 00 */ lwz r0, 0(r5) -/* 8028ABFC 90 03 01 38 */ stw r0, 0x138(r3) -/* 8028AC00 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC04.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC04.s deleted file mode 100644 index e8a0d3559a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC04.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8028AC04: -/* 8028AC04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AC08 7C 08 02 A6 */ mflr r0 -/* 8028AC0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AC10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028AC14 7C 7F 1B 78 */ mr r31, r3 -/* 8028AC18 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028AC1C 41 82 00 08 */ beq lbl_8028AC24 -/* 8028AC20 48 00 00 14 */ b lbl_8028AC34 -lbl_8028AC24: -/* 8028AC24 38 7F 01 28 */ addi r3, r31, 0x128 -/* 8028AC28 7C A4 2B 78 */ mr r4, r5 -/* 8028AC2C 4B FF F8 91 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc -/* 8028AC30 90 7F 01 48 */ stw r3, 0x148(r31) -lbl_8028AC34: -/* 8028AC34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028AC38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028AC3C 7C 08 03 A6 */ mtlr r0 -/* 8028AC40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028AC44 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC48.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC48.s deleted file mode 100644 index cc869a2ff7..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC48.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8028AC48: -/* 8028AC48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AC4C 7C 08 02 A6 */ mflr r0 -/* 8028AC50 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AC54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028AC58 7C 7F 1B 78 */ mr r31, r3 -/* 8028AC5C 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028AC60 41 82 00 28 */ beq lbl_8028AC88 -/* 8028AC64 40 80 00 2C */ bge lbl_8028AC90 -/* 8028AC68 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028AC6C 40 80 00 08 */ bge lbl_8028AC74 -/* 8028AC70 48 00 00 20 */ b lbl_8028AC90 -lbl_8028AC74: -/* 8028AC74 38 7F 01 28 */ addi r3, r31, 0x128 -/* 8028AC78 80 9F 01 3C */ lwz r4, 0x13c(r31) -/* 8028AC7C 4B FF F8 91 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc -/* 8028AC80 90 7F 01 4C */ stw r3, 0x14c(r31) -/* 8028AC84 48 00 00 0C */ b lbl_8028AC90 -lbl_8028AC88: -/* 8028AC88 80 05 00 00 */ lwz r0, 0(r5) -/* 8028AC8C 90 1F 01 4C */ stw r0, 0x14c(r31) -lbl_8028AC90: -/* 8028AC90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028AC94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028AC98 7C 08 03 A6 */ mtlr r0 -/* 8028AC9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028ACA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACA4.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACA4.s deleted file mode 100644 index 98df0374de..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACA4.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8028ACA4: -/* 8028ACA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028ACA8 7C 08 02 A6 */ mflr r0 -/* 8028ACAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028ACB0 7C 66 1B 78 */ mr r6, r3 -/* 8028ACB4 2C 04 00 02 */ cmpwi r4, 2 -/* 8028ACB8 41 82 00 08 */ beq lbl_8028ACC0 -/* 8028ACBC 48 00 00 30 */ b lbl_8028ACEC -lbl_8028ACC0: -/* 8028ACC0 80 66 01 2C */ lwz r3, 0x12c(r6) -/* 8028ACC4 80 85 00 00 */ lwz r4, 0(r5) -/* 8028ACC8 30 04 FF FF */ addic r0, r4, -1 -/* 8028ACCC 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028ACD0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8028ACD4 80 A6 01 48 */ lwz r5, 0x148(r6) -/* 8028ACD8 80 C6 01 4C */ lwz r6, 0x14c(r6) -/* 8028ACDC 81 83 00 00 */ lwz r12, 0(r3) -/* 8028ACE0 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8028ACE4 7D 89 03 A6 */ mtctr r12 -/* 8028ACE8 4E 80 04 21 */ bctrl -lbl_8028ACEC: -/* 8028ACEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028ACF0 7C 08 03 A6 */ mtlr r0 -/* 8028ACF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028ACF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACFC.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACFC.s deleted file mode 100644 index db3877df4d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACFC.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8028ACFC: -/* 8028ACFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028AD00 7C 08 02 A6 */ mflr r0 -/* 8028AD04 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028AD08 7C 8C 23 78 */ mr r12, r4 -/* 8028AD0C 2C 05 00 19 */ cmpwi r5, 0x19 -/* 8028AD10 41 82 00 08 */ beq lbl_8028AD18 -/* 8028AD14 48 00 00 14 */ b lbl_8028AD28 -lbl_8028AD18: -/* 8028AD18 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 8028AD1C 80 86 00 00 */ lwz r4, 0(r6) -/* 8028AD20 48 0D 73 65 */ bl __ptmf_scall -/* 8028AD24 60 00 00 00 */ nop -lbl_8028AD28: -/* 8028AD28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028AD2C 7C 08 03 A6 */ mtlr r0 -/* 8028AD30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028AD34 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B064.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B064.s deleted file mode 100644 index 6085068e3d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B064.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8028B064: -/* 8028B064 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8028B068 7C 08 02 A6 */ mflr r0 -/* 8028B06C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8028B070 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8028B074 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8028B078 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8028B07C F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8028B080 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B084 48 0D 71 55 */ bl _savegpr_28 -/* 8028B088 7C 7C 1B 78 */ mr r28, r3 -/* 8028B08C FF C0 08 90 */ fmr f30, f1 -/* 8028B090 83 E4 01 2C */ lwz r31, 0x12c(r4) -/* 8028B094 80 03 00 08 */ lwz r0, 8(r3) -/* 8028B098 7C 64 02 14 */ add r3, r4, r0 -/* 8028B09C 83 C3 FF FF */ lwz r30, -1(r3) -/* 8028B0A0 57 DD 06 3E */ clrlwi r29, r30, 0x18 -/* 8028B0A4 7F E3 FB 78 */ mr r3, r31 -/* 8028B0A8 39 9C 00 24 */ addi r12, r28, 0x24 -/* 8028B0AC 48 0D 6F D9 */ bl __ptmf_scall -/* 8028B0B0 60 00 00 00 */ nop -/* 8028B0B4 FF E0 08 90 */ fmr f31, f1 -/* 8028B0B8 57 C0 C6 3E */ rlwinm r0, r30, 0x18, 0x18, 0x1f -/* 8028B0BC 2C 00 00 01 */ cmpwi r0, 1 -/* 8028B0C0 41 82 00 0C */ beq lbl_8028B0CC -/* 8028B0C4 40 80 00 0C */ bge lbl_8028B0D0 -/* 8028B0C8 48 00 00 08 */ b lbl_8028B0D0 -lbl_8028B0CC: -/* 8028B0CC EF DF F0 28 */ fsubs f30, f31, f30 -lbl_8028B0D0: -/* 8028B0D0 C0 02 BA E0 */ lfs f0, lit_1081(r2) -/* 8028B0D4 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8028B0D8 40 81 00 24 */ ble lbl_8028B0FC -/* 8028B0DC 7F A3 EB 78 */ mr r3, r29 -/* 8028B0E0 4B FF 65 69 */ bl toFunction_outside__Q27JStudio14TFunctionValueFi -/* 8028B0E4 FC 20 F0 90 */ fmr f1, f30 -/* 8028B0E8 FC 40 F8 90 */ fmr f2, f31 -/* 8028B0EC 7C 6C 1B 78 */ mr r12, r3 -/* 8028B0F0 7D 89 03 A6 */ mtctr r12 -/* 8028B0F4 4E 80 04 21 */ bctrl -/* 8028B0F8 FF C0 08 18 */ frsp f30, f1 -lbl_8028B0FC: -/* 8028B0FC 7F E3 FB 78 */ mr r3, r31 -/* 8028B100 FC 20 F0 90 */ fmr f1, f30 -/* 8028B104 39 9C 00 0C */ addi r12, r28, 0xc -/* 8028B108 48 0D 6F 7D */ bl __ptmf_scall -/* 8028B10C 60 00 00 00 */ nop -/* 8028B110 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8028B114 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8028B118 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8028B11C CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8028B120 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B124 48 0D 71 01 */ bl _restgpr_28 -/* 8028B128 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8028B12C 7C 08 03 A6 */ mtlr r0 -/* 8028B130 38 21 00 40 */ addi r1, r1, 0x40 -/* 8028B134 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s deleted file mode 100644 index ef7e768363..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_8028AECC: -/* 8028AECC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 8028AED0 7C 08 02 A6 */ mflr r0 -/* 8028AED4 90 01 00 94 */ stw r0, 0x94(r1) -/* 8028AED8 39 61 00 90 */ addi r11, r1, 0x90 -/* 8028AEDC 48 0D 73 01 */ bl _savegpr_29 -/* 8028AEE0 7C 7D 1B 78 */ mr r29, r3 -/* 8028AEE4 7C 9E 23 78 */ mr r30, r4 -/* 8028AEE8 83 E3 01 2C */ lwz r31, 0x12c(r3) -/* 8028AEEC 7F E3 FB 78 */ mr r3, r31 -/* 8028AEF0 38 81 00 5C */ addi r4, r1, 0x5c -/* 8028AEF4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AEF8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8028AEFC 7D 89 03 A6 */ mtctr r12 -/* 8028AF00 4E 80 04 21 */ bctrl -/* 8028AF04 7F E3 FB 78 */ mr r3, r31 -/* 8028AF08 38 81 00 68 */ addi r4, r1, 0x68 -/* 8028AF0C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AF10 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8028AF14 7D 89 03 A6 */ mtctr r12 -/* 8028AF18 4E 80 04 21 */ bctrl -/* 8028AF1C 7F E3 FB 78 */ mr r3, r31 -/* 8028AF20 38 81 00 74 */ addi r4, r1, 0x74 -/* 8028AF24 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AF28 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8028AF2C 7D 89 03 A6 */ mtctr r12 -/* 8028AF30 4E 80 04 21 */ bctrl -/* 8028AF34 88 1D 01 44 */ lbz r0, 0x144(r29) -/* 8028AF38 28 00 00 00 */ cmplwi r0, 0 -/* 8028AF3C 40 82 00 6C */ bne lbl_8028AFA8 -/* 8028AF40 88 1E 00 89 */ lbz r0, 0x89(r30) -/* 8028AF44 28 00 00 00 */ cmplwi r0, 0 -/* 8028AF48 40 82 00 0C */ bne lbl_8028AF54 -/* 8028AF4C 38 01 00 5C */ addi r0, r1, 0x5c -/* 8028AF50 48 00 00 50 */ b lbl_8028AFA0 -lbl_8028AF54: -/* 8028AF54 38 7E 00 DC */ addi r3, r30, 0xdc -/* 8028AF58 38 81 00 5C */ addi r4, r1, 0x5c -/* 8028AF5C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028AF60 48 0B BE 0D */ bl PSMTXMultVec -/* 8028AF64 C0 01 00 68 */ lfs f0, 0x68(r1) -/* 8028AF68 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8028AF6C C0 21 00 6C */ lfs f1, 0x6c(r1) -/* 8028AF70 C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 8028AF74 EC 01 00 2A */ fadds f0, f1, f0 -/* 8028AF78 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 8028AF7C C0 01 00 70 */ lfs f0, 0x70(r1) -/* 8028AF80 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 8028AF84 C0 01 00 74 */ lfs f0, 0x74(r1) -/* 8028AF88 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 8028AF8C C0 01 00 78 */ lfs f0, 0x78(r1) -/* 8028AF90 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 8028AF94 C0 01 00 7C */ lfs f0, 0x7c(r1) -/* 8028AF98 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 8028AF9C 38 01 00 38 */ addi r0, r1, 0x38 -lbl_8028AFA0: -/* 8028AFA0 7C 1F 03 78 */ mr r31, r0 -/* 8028AFA4 48 00 00 6C */ b lbl_8028B010 -lbl_8028AFA8: -/* 8028AFA8 3B E1 00 5C */ addi r31, r1, 0x5c -/* 8028AFAC 80 1D 01 38 */ lwz r0, 0x138(r29) -/* 8028AFB0 2C 00 00 01 */ cmpwi r0, 1 -/* 8028AFB4 41 82 00 5C */ beq lbl_8028B010 -/* 8028AFB8 40 80 00 58 */ bge lbl_8028B010 -/* 8028AFBC 2C 00 00 00 */ cmpwi r0, 0 -/* 8028AFC0 40 80 00 08 */ bge lbl_8028AFC8 -/* 8028AFC4 48 00 00 4C */ b lbl_8028B010 -lbl_8028AFC8: -/* 8028AFC8 38 61 00 08 */ addi r3, r1, 8 -/* 8028AFCC 7F E4 FB 78 */ mr r4, r31 -/* 8028AFD0 80 BD 01 3C */ lwz r5, 0x13c(r29) -/* 8028AFD4 80 DD 01 40 */ lwz r6, 0x140(r29) -/* 8028AFD8 4B FF F3 51 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl -/* 8028AFDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028AFE0 40 82 00 0C */ bne lbl_8028AFEC -/* 8028AFE4 38 00 00 00 */ li r0, 0 -/* 8028AFE8 48 00 00 1C */ b lbl_8028B004 -lbl_8028AFEC: -/* 8028AFEC 38 61 00 50 */ addi r3, r1, 0x50 -/* 8028AFF0 38 81 00 44 */ addi r4, r1, 0x44 -/* 8028AFF4 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028AFF8 38 C1 00 08 */ addi r6, r1, 8 -/* 8028AFFC 4B FF AB D1 */ bl getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf -/* 8028B000 38 00 00 01 */ li r0, 1 -lbl_8028B004: -/* 8028B004 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028B008 41 82 00 44 */ beq lbl_8028B04C -/* 8028B00C 3B E1 00 38 */ addi r31, r1, 0x38 -lbl_8028B010: -/* 8028B010 7F A3 EB 78 */ mr r3, r29 -/* 8028B014 3C 80 80 3A */ lis r4, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA68@ha */ -/* 8028B018 38 84 AA 68 */ addi r4, r4, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA68@l */ -/* 8028B01C 7F E5 FB 78 */ mr r5, r31 -/* 8028B020 4B FF B1 E5 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec -/* 8028B024 7F A3 EB 78 */ mr r3, r29 -/* 8028B028 3C 80 80 3A */ lis r4, sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA74@ha */ -/* 8028B02C 38 84 AA 74 */ addi r4, r4, sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA74@l */ -/* 8028B030 38 BF 00 0C */ addi r5, r31, 0xc -/* 8028B034 4B FF B1 D1 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec -/* 8028B038 7F A3 EB 78 */ mr r3, r29 -/* 8028B03C 3C 80 80 3A */ lis r4, sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA80@ha */ -/* 8028B040 38 84 AA 80 */ addi r4, r4, sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA80@l */ -/* 8028B044 38 BF 00 18 */ addi r5, r31, 0x18 -/* 8028B048 4B FF B1 BD */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec -lbl_8028B04C: -/* 8028B04C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8028B050 48 0D 71 D9 */ bl _restgpr_29 -/* 8028B054 80 01 00 94 */ lwz r0, 0x94(r1) -/* 8028B058 7C 08 03 A6 */ mtlr r0 -/* 8028B05C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8028B060 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-actor/setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s b/asm/JSystem/JStudio/JStudio_JStage/object-actor/setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s deleted file mode 100644 index 6643e5b3d8..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-actor/setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_8028AD38: -/* 8028AD38 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 8028AD3C 7C 08 02 A6 */ mflr r0 -/* 8028AD40 90 01 00 94 */ stw r0, 0x94(r1) -/* 8028AD44 93 E1 00 8C */ stw r31, 0x8c(r1) -/* 8028AD48 93 C1 00 88 */ stw r30, 0x88(r1) -/* 8028AD4C 7C 7F 1B 78 */ mr r31, r3 -/* 8028AD50 7C 9E 23 78 */ mr r30, r4 -/* 8028AD54 38 81 00 5C */ addi r4, r1, 0x5c -/* 8028AD58 3C A0 80 3A */ lis r5, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA68@ha */ -/* 8028AD5C 38 A5 AA 68 */ addi r5, r5, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA68@l */ -/* 8028AD60 4B FF B5 15 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028AD64 7F E3 FB 78 */ mr r3, r31 -/* 8028AD68 38 81 00 68 */ addi r4, r1, 0x68 -/* 8028AD6C 3C A0 80 3A */ lis r5, sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA74@ha */ -/* 8028AD70 38 A5 AA 74 */ addi r5, r5, sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA74@l */ -/* 8028AD74 4B FF B5 01 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028AD78 7F E3 FB 78 */ mr r3, r31 -/* 8028AD7C 38 81 00 74 */ addi r4, r1, 0x74 -/* 8028AD80 3C A0 80 3A */ lis r5, sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor@ha /* 0x8039AA80@ha */ -/* 8028AD84 38 A5 AA 80 */ addi r5, r5, sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor@l /* 0x8039AA80@l */ -/* 8028AD88 4B FF B4 ED */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028AD8C 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 8028AD90 28 00 00 00 */ cmplwi r0, 0 -/* 8028AD94 40 82 00 6C */ bne lbl_8028AE00 -/* 8028AD98 88 1E 00 88 */ lbz r0, 0x88(r30) -/* 8028AD9C 28 00 00 00 */ cmplwi r0, 0 -/* 8028ADA0 40 82 00 0C */ bne lbl_8028ADAC -/* 8028ADA4 38 01 00 5C */ addi r0, r1, 0x5c -/* 8028ADA8 48 00 00 50 */ b lbl_8028ADF8 -lbl_8028ADAC: -/* 8028ADAC 38 7E 00 AC */ addi r3, r30, 0xac -/* 8028ADB0 38 81 00 5C */ addi r4, r1, 0x5c -/* 8028ADB4 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028ADB8 48 0B BF B5 */ bl PSMTXMultVec -/* 8028ADBC C0 01 00 68 */ lfs f0, 0x68(r1) -/* 8028ADC0 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8028ADC4 C0 21 00 6C */ lfs f1, 0x6c(r1) -/* 8028ADC8 C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 8028ADCC EC 01 00 2A */ fadds f0, f1, f0 -/* 8028ADD0 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 8028ADD4 C0 01 00 70 */ lfs f0, 0x70(r1) -/* 8028ADD8 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 8028ADDC C0 01 00 74 */ lfs f0, 0x74(r1) -/* 8028ADE0 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 8028ADE4 C0 01 00 78 */ lfs f0, 0x78(r1) -/* 8028ADE8 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 8028ADEC C0 01 00 7C */ lfs f0, 0x7c(r1) -/* 8028ADF0 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 8028ADF4 38 01 00 38 */ addi r0, r1, 0x38 -lbl_8028ADF8: -/* 8028ADF8 7C 1E 03 78 */ mr r30, r0 -/* 8028ADFC 48 00 00 6C */ b lbl_8028AE68 -lbl_8028AE00: -/* 8028AE00 3B C1 00 5C */ addi r30, r1, 0x5c -/* 8028AE04 80 1F 01 38 */ lwz r0, 0x138(r31) -/* 8028AE08 2C 00 00 01 */ cmpwi r0, 1 -/* 8028AE0C 41 82 00 5C */ beq lbl_8028AE68 -/* 8028AE10 40 80 00 58 */ bge lbl_8028AE68 -/* 8028AE14 2C 00 00 00 */ cmpwi r0, 0 -/* 8028AE18 40 80 00 08 */ bge lbl_8028AE20 -/* 8028AE1C 48 00 00 4C */ b lbl_8028AE68 -lbl_8028AE20: -/* 8028AE20 38 61 00 08 */ addi r3, r1, 8 -/* 8028AE24 7F C4 F3 78 */ mr r4, r30 -/* 8028AE28 80 BF 01 3C */ lwz r5, 0x13c(r31) -/* 8028AE2C 80 DF 01 40 */ lwz r6, 0x140(r31) -/* 8028AE30 4B FF F3 C9 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl -/* 8028AE34 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028AE38 40 82 00 0C */ bne lbl_8028AE44 -/* 8028AE3C 38 00 00 00 */ li r0, 0 -/* 8028AE40 48 00 00 1C */ b lbl_8028AE5C -lbl_8028AE44: -/* 8028AE44 38 61 00 50 */ addi r3, r1, 0x50 -/* 8028AE48 38 81 00 44 */ addi r4, r1, 0x44 -/* 8028AE4C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028AE50 38 C1 00 08 */ addi r6, r1, 8 -/* 8028AE54 4B FF AD 79 */ bl getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf -/* 8028AE58 38 00 00 01 */ li r0, 1 -lbl_8028AE5C: -/* 8028AE5C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028AE60 41 82 00 54 */ beq lbl_8028AEB4 -/* 8028AE64 3B C1 00 38 */ addi r30, r1, 0x38 -lbl_8028AE68: -/* 8028AE68 83 FF 01 2C */ lwz r31, 0x12c(r31) -/* 8028AE6C 7F E3 FB 78 */ mr r3, r31 -/* 8028AE70 7F C4 F3 78 */ mr r4, r30 -/* 8028AE74 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AE78 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8028AE7C 7D 89 03 A6 */ mtctr r12 -/* 8028AE80 4E 80 04 21 */ bctrl -/* 8028AE84 7F E3 FB 78 */ mr r3, r31 -/* 8028AE88 38 9E 00 0C */ addi r4, r30, 0xc -/* 8028AE8C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AE90 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 8028AE94 7D 89 03 A6 */ mtctr r12 -/* 8028AE98 4E 80 04 21 */ bctrl -/* 8028AE9C 7F E3 FB 78 */ mr r3, r31 -/* 8028AEA0 38 9E 00 18 */ addi r4, r30, 0x18 -/* 8028AEA4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028AEA8 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 8028AEAC 7D 89 03 A6 */ mtctr r12 -/* 8028AEB0 4E 80 04 21 */ bctrl -lbl_8028AEB4: -/* 8028AEB4 83 E1 00 8C */ lwz r31, 0x8c(r1) -/* 8028AEB8 83 C1 00 88 */ lwz r30, 0x88(r1) -/* 8028AEBC 80 01 00 94 */ lwz r0, 0x94(r1) -/* 8028AEC0 7C 08 03 A6 */ mtlr r0 -/* 8028AEC4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8028AEC8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s deleted file mode 100644 index 70c4b94867..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028B960: -/* 8028B960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028B964 7C 08 02 A6 */ mflr r0 -/* 8028B968 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028B96C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028B970 93 C1 00 08 */ stw r30, 8(r1) -/* 8028B974 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028B978 7C 9F 23 78 */ mr r31, r4 -/* 8028B97C 41 82 00 3C */ beq lbl_8028B9B8 -/* 8028B980 3C 80 80 3C */ lis r4, __vt__Q214JStudio_JStage15TAdaptor_camera@ha /* 0x803C5908@ha */ -/* 8028B984 38 04 59 08 */ addi r0, r4, __vt__Q214JStudio_JStage15TAdaptor_camera@l /* 0x803C5908@l */ -/* 8028B988 90 1E 00 00 */ stw r0, 0(r30) -/* 8028B98C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028B990 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028B994 7D 89 03 A6 */ mtctr r12 -/* 8028B998 4E 80 04 21 */ bctrl -/* 8028B99C 7F C3 F3 78 */ mr r3, r30 -/* 8028B9A0 38 80 00 00 */ li r4, 0 -/* 8028B9A4 4B FF B4 79 */ bl __dt__Q27JStudio15TAdaptor_cameraFv -/* 8028B9A8 7F E0 07 35 */ extsh. r0, r31 -/* 8028B9AC 40 81 00 0C */ ble lbl_8028B9B8 -/* 8028B9B0 7F C3 F3 78 */ mr r3, r30 -/* 8028B9B4 48 04 33 89 */ bl __dl__FPv -lbl_8028B9B8: -/* 8028B9B8 7F C3 F3 78 */ mr r3, r30 -/* 8028B9BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028B9C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028B9C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028B9C8 7C 08 03 A6 */ mtlr r0 -/* 8028B9CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B9D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv.s deleted file mode 100644 index 64b64c97d3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8028BA1C: -/* 8028BA1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028BA20 7C 08 02 A6 */ mflr r0 -/* 8028BA24 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028BA28 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028BA2C 48 0D 67 A9 */ bl _savegpr_27 -/* 8028BA30 7C 7B 1B 78 */ mr r27, r3 -/* 8028BA34 83 C3 01 04 */ lwz r30, 0x104(r3) -/* 8028BA38 7F C3 F3 78 */ mr r3, r30 -/* 8028BA3C 81 9E 00 00 */ lwz r12, 0(r30) -/* 8028BA40 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028BA44 7D 89 03 A6 */ mtctr r12 -/* 8028BA48 4E 80 04 21 */ bctrl -/* 8028BA4C 60 64 00 01 */ ori r4, r3, 1 -/* 8028BA50 7F C3 F3 78 */ mr r3, r30 -/* 8028BA54 81 9E 00 00 */ lwz r12, 0(r30) -/* 8028BA58 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028BA5C 7D 89 03 A6 */ mtctr r12 -/* 8028BA60 4E 80 04 21 */ bctrl -/* 8028BA64 83 BB 01 04 */ lwz r29, 0x104(r27) -/* 8028BA68 80 7B 00 04 */ lwz r3, 4(r27) -/* 8028BA6C 83 C3 00 14 */ lwz r30, 0x14(r3) -/* 8028BA70 7F 63 DB 78 */ mr r3, r27 -/* 8028BA74 7F C4 F3 78 */ mr r4, r30 -/* 8028BA78 48 00 04 41 */ bl getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl -/* 8028BA7C 7F 63 DB 78 */ mr r3, r27 -/* 8028BA80 7F C4 F3 78 */ mr r4, r30 -/* 8028BA84 48 00 06 19 */ bl getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl -/* 8028BA88 3C 60 80 43 */ lis r3, saoVVOutput___Q214JStudio_JStage15TAdaptor_camera@ha /* 0x804312D4@ha */ -/* 8028BA8C 38 03 12 D4 */ addi r0, r3, saoVVOutput___Q214JStudio_JStage15TAdaptor_camera@l /* 0x804312D4@l */ -/* 8028BA90 7C 1C 03 78 */ mr r28, r0 -/* 8028BA94 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha /* 0x80285EB8@ha */ -/* 8028BA98 3B C3 5E B8 */ addi r30, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 0x80285EB8@l */ -/* 8028BA9C 3B E0 00 00 */ li r31, 0 -/* 8028BAA0 48 00 00 34 */ b lbl_8028BAD4 -lbl_8028BAA4: -/* 8028BAA4 7F A3 EB 78 */ mr r3, r29 -/* 8028BAA8 39 9C 00 14 */ addi r12, r28, 0x14 -/* 8028BAAC 48 0D 65 D9 */ bl __ptmf_scall -/* 8028BAB0 60 00 00 00 */ nop -/* 8028BAB4 80 7B 00 08 */ lwz r3, 8(r27) -/* 8028BAB8 80 1C 00 04 */ lwz r0, 4(r28) -/* 8028BABC 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028BAC0 7C 63 02 14 */ add r3, r3, r0 -/* 8028BAC4 93 C3 00 08 */ stw r30, 8(r3) -/* 8028BAC8 93 E3 00 04 */ stw r31, 4(r3) -/* 8028BACC D0 23 00 0C */ stfs f1, 0xc(r3) -/* 8028BAD0 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_8028BAD4: -/* 8028BAD4 80 1C 00 04 */ lwz r0, 4(r28) -/* 8028BAD8 2C 00 FF FF */ cmpwi r0, -1 -/* 8028BADC 40 82 FF C8 */ bne lbl_8028BAA4 -/* 8028BAE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028BAE4 48 0D 67 3D */ bl _restgpr_27 -/* 8028BAE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028BAEC 7C 08 03 A6 */ mtlr r0 -/* 8028BAF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028BAF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s deleted file mode 100644 index 2bd127edd9..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028BBAC: -/* 8028BBAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BBB0 7C 08 02 A6 */ mflr r0 -/* 8028BBB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BBB8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8028BBBC 4B FF E8 B5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl -/* 8028BBC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BBC4 7C 08 03 A6 */ mtlr r0 -/* 8028BBC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BBCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv.s deleted file mode 100644 index 02bcf5da2c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028BAF8: -/* 8028BAF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BAFC 7C 08 02 A6 */ mflr r0 -/* 8028BB00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BB04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BB08 83 E3 01 04 */ lwz r31, 0x104(r3) -/* 8028BB0C 7F E3 FB 78 */ mr r3, r31 -/* 8028BB10 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028BB14 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028BB18 7D 89 03 A6 */ mtctr r12 -/* 8028BB1C 4E 80 04 21 */ bctrl -/* 8028BB20 54 64 00 3C */ rlwinm r4, r3, 0, 0, 0x1e -/* 8028BB24 7F E3 FB 78 */ mr r3, r31 -/* 8028BB28 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028BB2C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028BB30 7D 89 03 A6 */ mtctr r12 -/* 8028BB34 4E 80 04 21 */ bctrl -/* 8028BB38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BB3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BB40 7C 08 03 A6 */ mtlr r0 -/* 8028BB44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BB48 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv.s deleted file mode 100644 index 5b7c1d6c48..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8028B9D4: -/* 8028B9D4 3C 80 80 43 */ lis r4, saoVVOutput___Q214JStudio_JStage15TAdaptor_camera@ha /* 0x804312D4@ha */ -/* 8028B9D8 38 04 12 D4 */ addi r0, r4, saoVVOutput___Q214JStudio_JStage15TAdaptor_camera@l /* 0x804312D4@l */ -/* 8028B9DC 7C 05 03 78 */ mr r5, r0 -/* 8028B9E0 48 00 00 2C */ b lbl_8028BA0C -lbl_8028B9E4: -/* 8028B9E4 80 83 00 08 */ lwz r4, 8(r3) -/* 8028B9E8 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028B9EC 7C 84 02 14 */ add r4, r4, r0 -/* 8028B9F0 28 05 00 00 */ cmplwi r5, 0 -/* 8028B9F4 41 82 00 0C */ beq lbl_8028BA00 -/* 8028B9F8 7C A0 2B 78 */ mr r0, r5 -/* 8028B9FC 48 00 00 08 */ b lbl_8028BA04 -lbl_8028BA00: -/* 8028BA00 38 0D 8C 70 */ la r0, soOutput_none___Q27JStudio14TVariableValue(r13) /* 804511F0-_SDA_BASE_ */ -lbl_8028BA04: -/* 8028BA04 90 04 00 10 */ stw r0, 0x10(r4) -/* 8028BA08 38 A5 00 20 */ addi r5, r5, 0x20 -lbl_8028BA0C: -/* 8028BA0C 80 05 00 04 */ lwz r0, 4(r5) -/* 8028BA10 2C 00 FF FF */ cmpwi r0, -1 -/* 8028BA14 40 82 FF D0 */ bne lbl_8028B9E4 -/* 8028BA18 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl.s deleted file mode 100644 index 23179cb0e8..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8028BB4C: -/* 8028BB4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BB50 7C 08 02 A6 */ mflr r0 -/* 8028BB54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BB58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BB5C 93 C1 00 08 */ stw r30, 8(r1) -/* 8028BB60 7C 7E 1B 78 */ mr r30, r3 -/* 8028BB64 80 83 00 04 */ lwz r4, 4(r3) -/* 8028BB68 83 E4 00 14 */ lwz r31, 0x14(r4) -/* 8028BB6C 7F E4 FB 78 */ mr r4, r31 -/* 8028BB70 48 00 02 4D */ bl setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl -/* 8028BB74 7F C3 F3 78 */ mr r3, r30 -/* 8028BB78 7F E4 FB 78 */ mr r4, r31 -/* 8028BB7C 48 00 04 41 */ bl setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl -/* 8028BB80 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8028BB84 81 83 00 00 */ lwz r12, 0(r3) -/* 8028BB88 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028BB8C 7D 89 03 A6 */ mtctr r12 -/* 8028BB90 4E 80 04 21 */ bctrl -/* 8028BB94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BB98 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028BB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BBA0 7C 08 03 A6 */ mtlr r0 -/* 8028BBA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BBA8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028B8A0.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028B8A0.s deleted file mode 100644 index 12b21fb0fb..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028B8A0.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8028B8A0: -/* 8028B8A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028B8A4 7C 08 02 A6 */ mflr r0 -/* 8028B8A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028B8AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B8B0 48 0D 69 2D */ bl _savegpr_29 -/* 8028B8B4 7C 7D 1B 78 */ mr r29, r3 -/* 8028B8B8 7C 9E 23 78 */ mr r30, r4 -/* 8028B8BC 7C BF 2B 78 */ mr r31, r5 -/* 8028B8C0 7F A5 EB 78 */ mr r5, r29 -/* 8028B8C4 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028B8C8 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028B8CC 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B8D0 38 00 00 00 */ li r0, 0 -/* 8028B8D4 90 1D 00 04 */ stw r0, 4(r29) -/* 8028B8D8 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028B8DC 90 7D 00 08 */ stw r3, 8(r29) -/* 8028B8E0 38 00 00 0C */ li r0, 0xc -/* 8028B8E4 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8028B8E8 3C 80 80 3C */ lis r4, __vt__Q27JStudio15TAdaptor_camera@ha /* 0x803C5504@ha */ -/* 8028B8EC 38 04 55 04 */ addi r0, r4, __vt__Q27JStudio15TAdaptor_camera@l /* 0x803C5504@l */ -/* 8028B8F0 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B8F4 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028B8F8 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028B8FC 38 A0 00 00 */ li r5, 0 -/* 8028B900 38 C0 00 14 */ li r6, 0x14 -/* 8028B904 38 E0 00 0C */ li r7, 0xc -/* 8028B908 48 0D 64 59 */ bl __construct_array -/* 8028B90C 93 DD 01 00 */ stw r30, 0x100(r29) -/* 8028B910 93 FD 01 04 */ stw r31, 0x104(r29) -/* 8028B914 3C 60 80 3C */ lis r3, __vt__Q214JStudio_JStage15TAdaptor_camera@ha /* 0x803C5908@ha */ -/* 8028B918 38 03 59 08 */ addi r0, r3, __vt__Q214JStudio_JStage15TAdaptor_camera@l /* 0x803C5908@l */ -/* 8028B91C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B920 38 60 00 00 */ li r3, 0 -/* 8028B924 90 7D 01 08 */ stw r3, 0x108(r29) -/* 8028B928 90 7D 01 0C */ stw r3, 0x10c(r29) -/* 8028B92C 38 00 FF FF */ li r0, -1 -/* 8028B930 90 1D 01 10 */ stw r0, 0x110(r29) -/* 8028B934 98 7D 01 14 */ stb r3, 0x114(r29) -/* 8028B938 90 7D 01 18 */ stw r3, 0x118(r29) -/* 8028B93C 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 8028B940 98 7D 01 20 */ stb r3, 0x120(r29) -/* 8028B944 7F A3 EB 78 */ mr r3, r29 -/* 8028B948 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B94C 48 0D 68 DD */ bl _restgpr_29 -/* 8028B950 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028B954 7C 08 03 A6 */ mtlr r0 -/* 8028B958 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028B95C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BBD0.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BBD0.s deleted file mode 100644 index 71341eaae8..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BBD0.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8028BBD0: -/* 8028BBD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BBD4 7C 08 02 A6 */ mflr r0 -/* 8028BBD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BBDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BBE0 7C 7F 1B 78 */ mr r31, r3 -/* 8028BBE4 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028BBE8 41 82 00 08 */ beq lbl_8028BBF0 -/* 8028BBEC 48 00 00 14 */ b lbl_8028BC00 -lbl_8028BBF0: -/* 8028BBF0 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8028BBF4 7C A4 2B 78 */ mr r4, r5 -/* 8028BBF8 4B FF E8 C5 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc -/* 8028BBFC 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_8028BC00: -/* 8028BC00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BC04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BC08 7C 08 03 A6 */ mtlr r0 -/* 8028BC0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BC10 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC14.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC14.s deleted file mode 100644 index d36e420079..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC14.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8028BC14: -/* 8028BC14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BC18 7C 08 02 A6 */ mflr r0 -/* 8028BC1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BC20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BC24 7C 7F 1B 78 */ mr r31, r3 -/* 8028BC28 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028BC2C 41 82 00 28 */ beq lbl_8028BC54 -/* 8028BC30 40 80 00 2C */ bge lbl_8028BC5C -/* 8028BC34 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028BC38 40 80 00 08 */ bge lbl_8028BC40 -/* 8028BC3C 48 00 00 20 */ b lbl_8028BC5C -lbl_8028BC40: -/* 8028BC40 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8028BC44 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 8028BC48 4B FF E8 C5 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc -/* 8028BC4C 90 7F 01 10 */ stw r3, 0x110(r31) -/* 8028BC50 48 00 00 0C */ b lbl_8028BC5C -lbl_8028BC54: -/* 8028BC54 80 05 00 00 */ lwz r0, 0(r5) -/* 8028BC58 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_8028BC5C: -/* 8028BC5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BC64 7C 08 03 A6 */ mtlr r0 -/* 8028BC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BC6C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC70.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC70.s deleted file mode 100644 index 94236b0c39..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC70.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8028BC70: -/* 8028BC70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BC74 7C 08 02 A6 */ mflr r0 -/* 8028BC78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BC7C 2C 04 00 02 */ cmpwi r4, 2 -/* 8028BC80 41 82 00 08 */ beq lbl_8028BC88 -/* 8028BC84 48 00 00 58 */ b lbl_8028BCDC -lbl_8028BC88: -/* 8028BC88 80 85 00 00 */ lwz r4, 0(r5) -/* 8028BC8C 30 04 FF FF */ addic r0, r4, -1 -/* 8028BC90 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028BC94 98 03 01 14 */ stb r0, 0x114(r3) -/* 8028BC98 80 03 01 08 */ lwz r0, 0x108(r3) -/* 8028BC9C 2C 00 00 01 */ cmpwi r0, 1 -/* 8028BCA0 41 82 00 0C */ beq lbl_8028BCAC -/* 8028BCA4 40 80 00 38 */ bge lbl_8028BCDC -/* 8028BCA8 48 00 00 34 */ b lbl_8028BCDC -lbl_8028BCAC: -/* 8028BCAC 38 80 00 00 */ li r4, 0 -/* 8028BCB0 38 A0 FF FF */ li r5, -1 -/* 8028BCB4 88 03 01 14 */ lbz r0, 0x114(r3) -/* 8028BCB8 28 00 00 00 */ cmplwi r0, 0 -/* 8028BCBC 41 82 00 0C */ beq lbl_8028BCC8 -/* 8028BCC0 80 83 01 0C */ lwz r4, 0x10c(r3) -/* 8028BCC4 80 A3 01 10 */ lwz r5, 0x110(r3) -lbl_8028BCC8: -/* 8028BCC8 80 63 01 04 */ lwz r3, 0x104(r3) -/* 8028BCCC 81 83 00 00 */ lwz r12, 0(r3) -/* 8028BCD0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8028BCD4 7D 89 03 A6 */ mtctr r12 -/* 8028BCD8 4E 80 04 21 */ bctrl -lbl_8028BCDC: -/* 8028BCDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BCE0 7C 08 03 A6 */ mtlr r0 -/* 8028BCE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BCE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BCEC.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BCEC.s deleted file mode 100644 index c9d6e96ed9..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BCEC.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028BCEC: -/* 8028BCEC 2C 04 00 02 */ cmpwi r4, 2 -/* 8028BCF0 4C 82 00 20 */ bnelr -/* 8028BCF4 80 05 00 00 */ lwz r0, 0(r5) -/* 8028BCF8 90 03 01 08 */ stw r0, 0x108(r3) -/* 8028BCFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD00.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD00.s deleted file mode 100644 index fdb401aff3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD00.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8028BD00: -/* 8028BD00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BD04 7C 08 02 A6 */ mflr r0 -/* 8028BD08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BD0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BD10 7C 7F 1B 78 */ mr r31, r3 -/* 8028BD14 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028BD18 41 82 00 08 */ beq lbl_8028BD20 -/* 8028BD1C 48 00 00 14 */ b lbl_8028BD30 -lbl_8028BD20: -/* 8028BD20 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8028BD24 7C A4 2B 78 */ mr r4, r5 -/* 8028BD28 4B FF E7 95 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc -/* 8028BD2C 90 7F 01 18 */ stw r3, 0x118(r31) -lbl_8028BD30: -/* 8028BD30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BD34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BD38 7C 08 03 A6 */ mtlr r0 -/* 8028BD3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BD40 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD44.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD44.s deleted file mode 100644 index 34cb61bafd..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD44.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8028BD44: -/* 8028BD44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028BD48 7C 08 02 A6 */ mflr r0 -/* 8028BD4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028BD50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028BD54 7C 7F 1B 78 */ mr r31, r3 -/* 8028BD58 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028BD5C 41 82 00 28 */ beq lbl_8028BD84 -/* 8028BD60 40 80 00 2C */ bge lbl_8028BD8C -/* 8028BD64 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028BD68 40 80 00 08 */ bge lbl_8028BD70 -/* 8028BD6C 48 00 00 20 */ b lbl_8028BD8C -lbl_8028BD70: -/* 8028BD70 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8028BD74 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8028BD78 4B FF E7 95 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc -/* 8028BD7C 90 7F 01 1C */ stw r3, 0x11c(r31) -/* 8028BD80 48 00 00 0C */ b lbl_8028BD8C -lbl_8028BD84: -/* 8028BD84 80 05 00 00 */ lwz r0, 0(r5) -/* 8028BD88 90 1F 01 1C */ stw r0, 0x11c(r31) -lbl_8028BD8C: -/* 8028BD8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028BD90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028BD94 7C 08 03 A6 */ mtlr r0 -/* 8028BD98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028BD9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDA0.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDA0.s deleted file mode 100644 index 012e0ebcbb..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDA0.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028BDA0: -/* 8028BDA0 2C 04 00 02 */ cmpwi r4, 2 -/* 8028BDA4 4C 82 00 20 */ bnelr -/* 8028BDA8 80 85 00 00 */ lwz r4, 0(r5) -/* 8028BDAC 30 04 FF FF */ addic r0, r4, -1 -/* 8028BDB0 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028BDB4 98 03 01 20 */ stb r0, 0x120(r3) -/* 8028BDB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDBC.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDBC.s deleted file mode 100644 index bd95024d1a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDBC.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8028BDBC: -/* 8028BDBC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028BDC0 7C 08 02 A6 */ mflr r0 -/* 8028BDC4 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028BDC8 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028BDCC 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8028BDD0 7C 7E 1B 78 */ mr r30, r3 -/* 8028BDD4 7C 9F 23 78 */ mr r31, r4 -/* 8028BDD8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BDDC 3C A0 80 3A */ lis r5, sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera@ha /* 0x8039AAA8@ha */ -/* 8028BDE0 38 A5 AA A8 */ addi r5, r5, sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera@l /* 0x8039AAA8@l */ -/* 8028BDE4 4B FF A4 91 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028BDE8 88 1E 01 14 */ lbz r0, 0x114(r30) -/* 8028BDEC 28 00 00 00 */ cmplwi r0, 0 -/* 8028BDF0 40 82 00 34 */ bne lbl_8028BE24 -/* 8028BDF4 88 1F 00 88 */ lbz r0, 0x88(r31) -/* 8028BDF8 28 00 00 00 */ cmplwi r0, 0 -/* 8028BDFC 40 82 00 0C */ bne lbl_8028BE08 -/* 8028BE00 38 01 00 14 */ addi r0, r1, 0x14 -/* 8028BE04 48 00 00 18 */ b lbl_8028BE1C -lbl_8028BE08: -/* 8028BE08 38 7F 00 AC */ addi r3, r31, 0xac -/* 8028BE0C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BE10 38 A1 00 08 */ addi r5, r1, 8 -/* 8028BE14 48 0B AF 59 */ bl PSMTXMultVec -/* 8028BE18 38 01 00 08 */ addi r0, r1, 8 -lbl_8028BE1C: -/* 8028BE1C 7C 04 03 78 */ mr r4, r0 -/* 8028BE20 48 00 00 6C */ b lbl_8028BE8C -lbl_8028BE24: -/* 8028BE24 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BE28 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 8028BE2C 2C 00 00 01 */ cmpwi r0, 1 -/* 8028BE30 41 82 00 5C */ beq lbl_8028BE8C -/* 8028BE34 40 80 00 58 */ bge lbl_8028BE8C -/* 8028BE38 2C 00 00 00 */ cmpwi r0, 0 -/* 8028BE3C 40 80 00 08 */ bge lbl_8028BE44 -/* 8028BE40 48 00 00 4C */ b lbl_8028BE8C -lbl_8028BE44: -/* 8028BE44 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028BE48 80 BE 01 0C */ lwz r5, 0x10c(r30) -/* 8028BE4C 80 DE 01 10 */ lwz r6, 0x110(r30) -/* 8028BE50 4B FF E4 41 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl -/* 8028BE54 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028BE58 40 82 00 0C */ bne lbl_8028BE64 -/* 8028BE5C 38 00 00 00 */ li r0, 0 -/* 8028BE60 48 00 00 20 */ b lbl_8028BE80 -lbl_8028BE64: -/* 8028BE64 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8028BE68 D0 01 00 08 */ stfs f0, 8(r1) -/* 8028BE6C C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8028BE70 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8028BE74 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8028BE78 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8028BE7C 38 00 00 01 */ li r0, 1 -lbl_8028BE80: -/* 8028BE80 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028BE84 41 82 00 1C */ beq lbl_8028BEA0 -/* 8028BE88 38 81 00 08 */ addi r4, r1, 8 -lbl_8028BE8C: -/* 8028BE8C 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8028BE90 81 83 00 00 */ lwz r12, 0(r3) -/* 8028BE94 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 8028BE98 7D 89 03 A6 */ mtctr r12 -/* 8028BE9C 4E 80 04 21 */ bctrl -lbl_8028BEA0: -/* 8028BEA0 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028BEA4 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8028BEA8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028BEAC 7C 08 03 A6 */ mtlr r0 -/* 8028BEB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028BEB4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BEB8.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BEB8.s deleted file mode 100644 index 4ae273b0f2..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BEB8.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_8028BEB8: -/* 8028BEB8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028BEBC 7C 08 02 A6 */ mflr r0 -/* 8028BEC0 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028BEC4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028BEC8 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8028BECC 7C 7E 1B 78 */ mr r30, r3 -/* 8028BED0 7C 9F 23 78 */ mr r31, r4 -/* 8028BED4 80 63 01 04 */ lwz r3, 0x104(r3) -/* 8028BED8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BEDC 81 83 00 00 */ lwz r12, 0(r3) -/* 8028BEE0 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 8028BEE4 7D 89 03 A6 */ mtctr r12 -/* 8028BEE8 4E 80 04 21 */ bctrl -/* 8028BEEC 88 1E 01 14 */ lbz r0, 0x114(r30) -/* 8028BEF0 28 00 00 00 */ cmplwi r0, 0 -/* 8028BEF4 40 82 00 34 */ bne lbl_8028BF28 -/* 8028BEF8 88 1F 00 89 */ lbz r0, 0x89(r31) -/* 8028BEFC 28 00 00 00 */ cmplwi r0, 0 -/* 8028BF00 40 82 00 0C */ bne lbl_8028BF0C -/* 8028BF04 38 01 00 14 */ addi r0, r1, 0x14 -/* 8028BF08 48 00 00 18 */ b lbl_8028BF20 -lbl_8028BF0C: -/* 8028BF0C 38 7F 00 DC */ addi r3, r31, 0xdc -/* 8028BF10 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BF14 38 A1 00 08 */ addi r5, r1, 8 -/* 8028BF18 48 0B AE 55 */ bl PSMTXMultVec -/* 8028BF1C 38 01 00 08 */ addi r0, r1, 8 -lbl_8028BF20: -/* 8028BF20 7C 05 03 78 */ mr r5, r0 -/* 8028BF24 48 00 00 70 */ b lbl_8028BF94 -lbl_8028BF28: -/* 8028BF28 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8028BF2C 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 8028BF30 2C 00 00 01 */ cmpwi r0, 1 -/* 8028BF34 41 82 00 60 */ beq lbl_8028BF94 -/* 8028BF38 40 80 00 5C */ bge lbl_8028BF94 -/* 8028BF3C 2C 00 00 00 */ cmpwi r0, 0 -/* 8028BF40 40 80 00 08 */ bge lbl_8028BF48 -/* 8028BF44 48 00 00 50 */ b lbl_8028BF94 -lbl_8028BF48: -/* 8028BF48 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028BF4C 7C A4 2B 78 */ mr r4, r5 -/* 8028BF50 80 BE 01 0C */ lwz r5, 0x10c(r30) -/* 8028BF54 80 DE 01 10 */ lwz r6, 0x110(r30) -/* 8028BF58 4B FF E4 75 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl -/* 8028BF5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028BF60 40 82 00 0C */ bne lbl_8028BF6C -/* 8028BF64 38 00 00 00 */ li r0, 0 -/* 8028BF68 48 00 00 20 */ b lbl_8028BF88 -lbl_8028BF6C: -/* 8028BF6C C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8028BF70 D0 01 00 08 */ stfs f0, 8(r1) -/* 8028BF74 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8028BF78 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8028BF7C C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8028BF80 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8028BF84 38 00 00 01 */ li r0, 1 -lbl_8028BF88: -/* 8028BF88 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028BF8C 41 82 00 18 */ beq lbl_8028BFA4 -/* 8028BF90 38 A1 00 08 */ addi r5, r1, 8 -lbl_8028BF94: -/* 8028BF94 7F C3 F3 78 */ mr r3, r30 -/* 8028BF98 3C 80 80 3A */ lis r4, sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera@ha /* 0x8039AAA8@ha */ -/* 8028BF9C 38 84 AA A8 */ addi r4, r4, sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera@l /* 0x8039AAA8@l */ -/* 8028BFA0 4B FF A2 65 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec -lbl_8028BFA4: -/* 8028BFA4 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028BFA8 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8028BFAC 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028BFB0 7C 08 03 A6 */ mtlr r0 -/* 8028BFB4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028BFB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BFBC.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BFBC.s deleted file mode 100644 index 0a91b93e80..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BFBC.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8028BFBC: -/* 8028BFBC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028BFC0 7C 08 02 A6 */ mflr r0 -/* 8028BFC4 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028BFC8 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028BFCC 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8028BFD0 7C 7E 1B 78 */ mr r30, r3 -/* 8028BFD4 7C 9F 23 78 */ mr r31, r4 -/* 8028BFD8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028BFDC 3C A0 80 3A */ lis r5, sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera@ha /* 0x8039AAB4@ha */ -/* 8028BFE0 38 A5 AA B4 */ addi r5, r5, sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera@l /* 0x8039AAB4@l */ -/* 8028BFE4 4B FF A2 91 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028BFE8 88 1E 01 20 */ lbz r0, 0x120(r30) -/* 8028BFEC 28 00 00 00 */ cmplwi r0, 0 -/* 8028BFF0 40 82 00 34 */ bne lbl_8028C024 -/* 8028BFF4 88 1F 00 88 */ lbz r0, 0x88(r31) -/* 8028BFF8 28 00 00 00 */ cmplwi r0, 0 -/* 8028BFFC 40 82 00 0C */ bne lbl_8028C008 -/* 8028C000 38 01 00 14 */ addi r0, r1, 0x14 -/* 8028C004 48 00 00 18 */ b lbl_8028C01C -lbl_8028C008: -/* 8028C008 38 7F 00 AC */ addi r3, r31, 0xac -/* 8028C00C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028C010 38 A1 00 08 */ addi r5, r1, 8 -/* 8028C014 48 0B AD 59 */ bl PSMTXMultVec -/* 8028C018 38 01 00 08 */ addi r0, r1, 8 -lbl_8028C01C: -/* 8028C01C 7C 04 03 78 */ mr r4, r0 -/* 8028C020 48 00 00 50 */ b lbl_8028C070 -lbl_8028C024: -/* 8028C024 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028C028 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028C02C 80 BE 01 18 */ lwz r5, 0x118(r30) -/* 8028C030 80 DE 01 1C */ lwz r6, 0x11c(r30) -/* 8028C034 4B FF E2 5D */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl -/* 8028C038 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028C03C 40 82 00 0C */ bne lbl_8028C048 -/* 8028C040 38 00 00 00 */ li r0, 0 -/* 8028C044 48 00 00 20 */ b lbl_8028C064 -lbl_8028C048: -/* 8028C048 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8028C04C D0 01 00 08 */ stfs f0, 8(r1) -/* 8028C050 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8028C054 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8028C058 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8028C05C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8028C060 38 00 00 01 */ li r0, 1 -lbl_8028C064: -/* 8028C064 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028C068 41 82 00 1C */ beq lbl_8028C084 -/* 8028C06C 38 81 00 08 */ addi r4, r1, 8 -lbl_8028C070: -/* 8028C070 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8028C074 81 83 00 00 */ lwz r12, 0(r3) -/* 8028C078 81 8C 00 88 */ lwz r12, 0x88(r12) -/* 8028C07C 7D 89 03 A6 */ mtctr r12 -/* 8028C080 4E 80 04 21 */ bctrl -lbl_8028C084: -/* 8028C084 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028C088 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8028C08C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028C090 7C 08 03 A6 */ mtlr r0 -/* 8028C094 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028C098 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C09C.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C09C.s deleted file mode 100644 index 14ee36a769..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C09C.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8028C09C: -/* 8028C09C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028C0A0 7C 08 02 A6 */ mflr r0 -/* 8028C0A4 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028C0A8 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028C0AC 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8028C0B0 7C 7E 1B 78 */ mr r30, r3 -/* 8028C0B4 7C 9F 23 78 */ mr r31, r4 -/* 8028C0B8 80 63 01 04 */ lwz r3, 0x104(r3) -/* 8028C0BC 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028C0C0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028C0C4 81 8C 00 84 */ lwz r12, 0x84(r12) -/* 8028C0C8 7D 89 03 A6 */ mtctr r12 -/* 8028C0CC 4E 80 04 21 */ bctrl -/* 8028C0D0 88 1E 01 20 */ lbz r0, 0x120(r30) -/* 8028C0D4 28 00 00 00 */ cmplwi r0, 0 -/* 8028C0D8 40 82 00 34 */ bne lbl_8028C10C -/* 8028C0DC 88 1F 00 89 */ lbz r0, 0x89(r31) -/* 8028C0E0 28 00 00 00 */ cmplwi r0, 0 -/* 8028C0E4 40 82 00 0C */ bne lbl_8028C0F0 -/* 8028C0E8 38 01 00 14 */ addi r0, r1, 0x14 -/* 8028C0EC 48 00 00 18 */ b lbl_8028C104 -lbl_8028C0F0: -/* 8028C0F0 38 7F 00 DC */ addi r3, r31, 0xdc -/* 8028C0F4 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028C0F8 38 A1 00 08 */ addi r5, r1, 8 -/* 8028C0FC 48 0B AC 71 */ bl PSMTXMultVec -/* 8028C100 38 01 00 08 */ addi r0, r1, 8 -lbl_8028C104: -/* 8028C104 7C 05 03 78 */ mr r5, r0 -/* 8028C108 48 00 00 50 */ b lbl_8028C158 -lbl_8028C10C: -/* 8028C10C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028C110 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028C114 80 BE 01 18 */ lwz r5, 0x118(r30) -/* 8028C118 80 DE 01 1C */ lwz r6, 0x11c(r30) -/* 8028C11C 4B FF E2 B1 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl -/* 8028C120 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028C124 40 82 00 0C */ bne lbl_8028C130 -/* 8028C128 38 00 00 00 */ li r0, 0 -/* 8028C12C 48 00 00 20 */ b lbl_8028C14C -lbl_8028C130: -/* 8028C130 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8028C134 D0 01 00 08 */ stfs f0, 8(r1) -/* 8028C138 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8028C13C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8028C140 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 8028C144 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8028C148 38 00 00 01 */ li r0, 1 -lbl_8028C14C: -/* 8028C14C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028C150 41 82 00 18 */ beq lbl_8028C168 -/* 8028C154 38 A1 00 08 */ addi r5, r1, 8 -lbl_8028C158: -/* 8028C158 7F C3 F3 78 */ mr r3, r30 -/* 8028C15C 3C 80 80 3A */ lis r4, sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera@ha /* 0x8039AAB4@ha */ -/* 8028C160 38 84 AA B4 */ addi r4, r4, sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera@l /* 0x8039AAB4@l */ -/* 8028C164 4B FF A0 A1 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec -lbl_8028C168: -/* 8028C168 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028C16C 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8028C170 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028C174 7C 08 03 A6 */ mtlr r0 -/* 8028C178 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028C17C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C180.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C180.s deleted file mode 100644 index dc94d71529..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C180.s +++ /dev/null @@ -1,218 +0,0 @@ -lbl_8028C180: -/* 8028C180 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 8028C184 7C 08 02 A6 */ mflr r0 -/* 8028C188 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8028C18C 93 E1 00 AC */ stw r31, 0xac(r1) -/* 8028C190 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 8028C194 3C 60 80 43 */ lis r3, lit_1018@ha /* 0x80431298@ha */ -/* 8028C198 3B C3 12 98 */ addi r30, r3, lit_1018@l /* 0x80431298@l */ -/* 8028C19C 3C 60 80 3C */ lis r3, lit_1014@ha /* 0x803C58A8@ha */ -/* 8028C1A0 3B E3 58 A8 */ addi r31, r3, lit_1014@l /* 0x803C58A8@l */ -/* 8028C1A4 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C1A8 39 43 56 40 */ addi r10, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C1AC 91 41 00 88 */ stw r10, 0x88(r1) -/* 8028C1B0 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C1B4 38 63 59 80 */ addi r3, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C1B8 90 61 00 88 */ stw r3, 0x88(r1) -/* 8028C1BC 39 20 00 07 */ li r9, 7 -/* 8028C1C0 91 21 00 8C */ stw r9, 0x8c(r1) -/* 8028C1C4 81 1F 00 00 */ lwz r8, 0(r31) -/* 8028C1C8 80 FF 00 04 */ lwz r7, 4(r31) -/* 8028C1CC 91 01 00 90 */ stw r8, 0x90(r1) -/* 8028C1D0 90 E1 00 94 */ stw r7, 0x94(r1) -/* 8028C1D4 80 DF 00 08 */ lwz r6, 8(r31) -/* 8028C1D8 90 C1 00 98 */ stw r6, 0x98(r1) -/* 8028C1DC 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 8028C1E0 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 8028C1E4 90 A1 00 9C */ stw r5, 0x9c(r1) -/* 8028C1E8 90 81 00 A0 */ stw r4, 0xa0(r1) -/* 8028C1EC 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 8028C1F0 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8028C1F4 91 5E 00 3C */ stw r10, 0x3c(r30) -/* 8028C1F8 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 8028C1FC 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8028C200 91 23 00 04 */ stw r9, 4(r3) -/* 8028C204 91 03 00 08 */ stw r8, 8(r3) -/* 8028C208 90 E3 00 0C */ stw r7, 0xc(r3) -/* 8028C20C 90 C3 00 10 */ stw r6, 0x10(r3) -/* 8028C210 90 A3 00 14 */ stw r5, 0x14(r3) -/* 8028C214 90 83 00 18 */ stw r4, 0x18(r3) -/* 8028C218 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8028C21C 3C 80 80 29 */ lis r4, func_8028C4E4@ha /* 0x8028C4E4@ha */ -/* 8028C220 38 84 C4 E4 */ addi r4, r4, func_8028C4E4@l /* 0x8028C4E4@l */ -/* 8028C224 38 BE 00 00 */ addi r5, r30, 0 -/* 8028C228 48 0D 59 FD */ bl __register_global_object -/* 8028C22C 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C230 38 03 59 80 */ addi r0, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C234 90 01 00 88 */ stw r0, 0x88(r1) -/* 8028C238 38 61 00 88 */ addi r3, r1, 0x88 -/* 8028C23C 38 80 00 00 */ li r4, 0 -/* 8028C240 4B FF 9B CD */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C244 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C248 39 63 56 40 */ addi r11, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C24C 91 61 00 68 */ stw r11, 0x68(r1) -/* 8028C250 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C254 39 43 59 80 */ addi r10, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C258 91 41 00 68 */ stw r10, 0x68(r1) -/* 8028C25C 39 20 00 06 */ li r9, 6 -/* 8028C260 91 21 00 6C */ stw r9, 0x6c(r1) -/* 8028C264 81 1F 00 18 */ lwz r8, 0x18(r31) -/* 8028C268 80 FF 00 1C */ lwz r7, 0x1c(r31) -/* 8028C26C 91 01 00 70 */ stw r8, 0x70(r1) -/* 8028C270 90 E1 00 74 */ stw r7, 0x74(r1) -/* 8028C274 80 DF 00 20 */ lwz r6, 0x20(r31) -/* 8028C278 90 C1 00 78 */ stw r6, 0x78(r1) -/* 8028C27C 80 BF 00 24 */ lwz r5, 0x24(r31) -/* 8028C280 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 8028C284 90 A1 00 7C */ stw r5, 0x7c(r1) -/* 8028C288 90 81 00 80 */ stw r4, 0x80(r1) -/* 8028C28C 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 8028C290 90 01 00 84 */ stw r0, 0x84(r1) -/* 8028C294 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8028C298 91 63 00 20 */ stw r11, 0x20(r3) -/* 8028C29C 91 43 00 20 */ stw r10, 0x20(r3) -/* 8028C2A0 91 23 00 24 */ stw r9, 0x24(r3) -/* 8028C2A4 91 03 00 28 */ stw r8, 0x28(r3) -/* 8028C2A8 90 E3 00 2C */ stw r7, 0x2c(r3) -/* 8028C2AC 90 C3 00 30 */ stw r6, 0x30(r3) -/* 8028C2B0 90 A3 00 34 */ stw r5, 0x34(r3) -/* 8028C2B4 90 83 00 38 */ stw r4, 0x38(r3) -/* 8028C2B8 90 03 00 3C */ stw r0, 0x3c(r3) -/* 8028C2BC 38 63 00 20 */ addi r3, r3, 0x20 -/* 8028C2C0 3C 80 80 29 */ lis r4, func_8028C4E4@ha /* 0x8028C4E4@ha */ -/* 8028C2C4 38 84 C4 E4 */ addi r4, r4, func_8028C4E4@l /* 0x8028C4E4@l */ -/* 8028C2C8 38 BE 00 0C */ addi r5, r30, 0xc -/* 8028C2CC 48 0D 59 59 */ bl __register_global_object -/* 8028C2D0 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C2D4 38 03 59 80 */ addi r0, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C2D8 90 01 00 68 */ stw r0, 0x68(r1) -/* 8028C2DC 38 61 00 68 */ addi r3, r1, 0x68 -/* 8028C2E0 38 80 00 00 */ li r4, 0 -/* 8028C2E4 4B FF 9B 29 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C2E8 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C2EC 39 63 56 40 */ addi r11, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C2F0 91 61 00 48 */ stw r11, 0x48(r1) -/* 8028C2F4 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C2F8 39 43 59 80 */ addi r10, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C2FC 91 41 00 48 */ stw r10, 0x48(r1) -/* 8028C300 39 20 00 08 */ li r9, 8 -/* 8028C304 91 21 00 4C */ stw r9, 0x4c(r1) -/* 8028C308 81 1F 00 30 */ lwz r8, 0x30(r31) -/* 8028C30C 80 FF 00 34 */ lwz r7, 0x34(r31) -/* 8028C310 91 01 00 50 */ stw r8, 0x50(r1) -/* 8028C314 90 E1 00 54 */ stw r7, 0x54(r1) -/* 8028C318 80 DF 00 38 */ lwz r6, 0x38(r31) -/* 8028C31C 90 C1 00 58 */ stw r6, 0x58(r1) -/* 8028C320 80 BF 00 3C */ lwz r5, 0x3c(r31) -/* 8028C324 80 9F 00 40 */ lwz r4, 0x40(r31) -/* 8028C328 90 A1 00 5C */ stw r5, 0x5c(r1) -/* 8028C32C 90 81 00 60 */ stw r4, 0x60(r1) -/* 8028C330 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 8028C334 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028C338 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8028C33C 91 63 00 40 */ stw r11, 0x40(r3) -/* 8028C340 91 43 00 40 */ stw r10, 0x40(r3) -/* 8028C344 91 23 00 44 */ stw r9, 0x44(r3) -/* 8028C348 91 03 00 48 */ stw r8, 0x48(r3) -/* 8028C34C 90 E3 00 4C */ stw r7, 0x4c(r3) -/* 8028C350 90 C3 00 50 */ stw r6, 0x50(r3) -/* 8028C354 90 A3 00 54 */ stw r5, 0x54(r3) -/* 8028C358 90 83 00 58 */ stw r4, 0x58(r3) -/* 8028C35C 90 03 00 5C */ stw r0, 0x5c(r3) -/* 8028C360 38 63 00 40 */ addi r3, r3, 0x40 -/* 8028C364 3C 80 80 29 */ lis r4, func_8028C4E4@ha /* 0x8028C4E4@ha */ -/* 8028C368 38 84 C4 E4 */ addi r4, r4, func_8028C4E4@l /* 0x8028C4E4@l */ -/* 8028C36C 38 BE 00 18 */ addi r5, r30, 0x18 -/* 8028C370 48 0D 58 B5 */ bl __register_global_object -/* 8028C374 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C378 38 03 59 80 */ addi r0, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C37C 90 01 00 48 */ stw r0, 0x48(r1) -/* 8028C380 38 61 00 48 */ addi r3, r1, 0x48 -/* 8028C384 38 80 00 00 */ li r4, 0 -/* 8028C388 4B FF 9A 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C38C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C390 39 63 56 40 */ addi r11, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C394 91 61 00 28 */ stw r11, 0x28(r1) -/* 8028C398 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C39C 39 43 59 80 */ addi r10, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C3A0 91 41 00 28 */ stw r10, 0x28(r1) -/* 8028C3A4 39 20 00 09 */ li r9, 9 -/* 8028C3A8 91 21 00 2C */ stw r9, 0x2c(r1) -/* 8028C3AC 81 1F 00 48 */ lwz r8, 0x48(r31) -/* 8028C3B0 80 FF 00 4C */ lwz r7, 0x4c(r31) -/* 8028C3B4 91 01 00 30 */ stw r8, 0x30(r1) -/* 8028C3B8 90 E1 00 34 */ stw r7, 0x34(r1) -/* 8028C3BC 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 8028C3C0 90 C1 00 38 */ stw r6, 0x38(r1) -/* 8028C3C4 80 BF 00 54 */ lwz r5, 0x54(r31) -/* 8028C3C8 80 9F 00 58 */ lwz r4, 0x58(r31) -/* 8028C3CC 90 A1 00 3C */ stw r5, 0x3c(r1) -/* 8028C3D0 90 81 00 40 */ stw r4, 0x40(r1) -/* 8028C3D4 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 8028C3D8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8028C3DC 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8028C3E0 91 63 00 60 */ stw r11, 0x60(r3) -/* 8028C3E4 91 43 00 60 */ stw r10, 0x60(r3) -/* 8028C3E8 91 23 00 64 */ stw r9, 0x64(r3) -/* 8028C3EC 91 03 00 68 */ stw r8, 0x68(r3) -/* 8028C3F0 90 E3 00 6C */ stw r7, 0x6c(r3) -/* 8028C3F4 90 C3 00 70 */ stw r6, 0x70(r3) -/* 8028C3F8 90 A3 00 74 */ stw r5, 0x74(r3) -/* 8028C3FC 90 83 00 78 */ stw r4, 0x78(r3) -/* 8028C400 90 03 00 7C */ stw r0, 0x7c(r3) -/* 8028C404 38 63 00 60 */ addi r3, r3, 0x60 -/* 8028C408 3C 80 80 29 */ lis r4, func_8028C4E4@ha /* 0x8028C4E4@ha */ -/* 8028C40C 38 84 C4 E4 */ addi r4, r4, func_8028C4E4@l /* 0x8028C4E4@l */ -/* 8028C410 38 BE 00 24 */ addi r5, r30, 0x24 -/* 8028C414 48 0D 58 11 */ bl __register_global_object -/* 8028C418 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C41C 38 03 59 80 */ addi r0, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C420 90 01 00 28 */ stw r0, 0x28(r1) -/* 8028C424 38 61 00 28 */ addi r3, r1, 0x28 -/* 8028C428 38 80 00 00 */ li r4, 0 -/* 8028C42C 4B FF 99 E1 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C430 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C434 39 03 56 40 */ addi r8, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C438 91 01 00 08 */ stw r8, 8(r1) -/* 8028C43C 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C440 38 E3 59 80 */ addi r7, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C444 90 E1 00 08 */ stw r7, 8(r1) -/* 8028C448 38 C0 FF FF */ li r6, -1 -/* 8028C44C 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8028C450 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 8028C454 84 A3 21 80 */ lwzu r5, __ptmf_null@l(r3) /* 0x803A2180@l */ -/* 8028C458 80 83 00 04 */ lwz r4, 4(r3) -/* 8028C45C 90 A1 00 10 */ stw r5, 0x10(r1) -/* 8028C460 90 81 00 14 */ stw r4, 0x14(r1) -/* 8028C464 80 03 00 08 */ lwz r0, 8(r3) -/* 8028C468 90 01 00 18 */ stw r0, 0x18(r1) -/* 8028C46C 90 A1 00 1C */ stw r5, 0x1c(r1) -/* 8028C470 90 81 00 20 */ stw r4, 0x20(r1) -/* 8028C474 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028C478 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8028C47C 91 03 00 80 */ stw r8, 0x80(r3) -/* 8028C480 90 E3 00 80 */ stw r7, 0x80(r3) -/* 8028C484 90 C3 00 84 */ stw r6, 0x84(r3) -/* 8028C488 90 A3 00 88 */ stw r5, 0x88(r3) -/* 8028C48C 90 83 00 8C */ stw r4, 0x8c(r3) -/* 8028C490 90 03 00 90 */ stw r0, 0x90(r3) -/* 8028C494 90 A3 00 94 */ stw r5, 0x94(r3) -/* 8028C498 90 83 00 98 */ stw r4, 0x98(r3) -/* 8028C49C 90 03 00 9C */ stw r0, 0x9c(r3) -/* 8028C4A0 38 63 00 80 */ addi r3, r3, 0x80 -/* 8028C4A4 3C 80 80 29 */ lis r4, func_8028C4E4@ha /* 0x8028C4E4@ha */ -/* 8028C4A8 38 84 C4 E4 */ addi r4, r4, func_8028C4E4@l /* 0x8028C4E4@l */ -/* 8028C4AC 38 BE 00 30 */ addi r5, r30, 0x30 -/* 8028C4B0 48 0D 57 75 */ bl __register_global_object -/* 8028C4B4 3C 60 80 3C */ lis r3, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C4B8 38 03 59 80 */ addi r0, r3, data_803C5980@l /* 0x803C5980@l */ -/* 8028C4BC 90 01 00 08 */ stw r0, 8(r1) -/* 8028C4C0 38 61 00 08 */ addi r3, r1, 8 -/* 8028C4C4 38 80 00 00 */ li r4, 0 -/* 8028C4C8 4B FF 99 45 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C4CC 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 8028C4D0 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 8028C4D4 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 8028C4D8 7C 08 03 A6 */ mtlr r0 -/* 8028C4DC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8028C4E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s deleted file mode 100644 index 526e305eff..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028C4E4: -/* 8028C4E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028C4E8 7C 08 02 A6 */ mflr r0 -/* 8028C4EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028C4F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028C4F4 93 C1 00 08 */ stw r30, 8(r1) -/* 8028C4F8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028C4FC 7C 9F 23 78 */ mr r31, r4 -/* 8028C500 41 82 00 28 */ beq lbl_8028C528 -/* 8028C504 3C 80 80 3C */ lis r4, data_803C5980@ha /* 0x803C5980@ha */ -/* 8028C508 38 04 59 80 */ addi r0, r4, data_803C5980@l /* 0x803C5980@l */ -/* 8028C50C 90 1E 00 00 */ stw r0, 0(r30) -/* 8028C510 38 80 00 00 */ li r4, 0 -/* 8028C514 4B FF 98 F9 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C518 7F E0 07 35 */ extsh. r0, r31 -/* 8028C51C 40 81 00 0C */ ble lbl_8028C528 -/* 8028C520 7F C3 F3 78 */ mr r3, r30 -/* 8028C524 48 04 28 19 */ bl __dl__FPv -lbl_8028C528: -/* 8028C528 7F C3 F3 78 */ mr r3, r30 -/* 8028C52C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028C530 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028C534 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028C538 7C 08 03 A6 */ mtlr r0 -/* 8028C53C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C540 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s b/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s deleted file mode 100644 index bee0f04e19..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8028C544: -/* 8028C544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028C548 7C 08 02 A6 */ mflr r0 -/* 8028C54C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028C550 7C 65 1B 78 */ mr r5, r3 -/* 8028C554 80 64 01 04 */ lwz r3, 0x104(r4) -/* 8028C558 39 85 00 08 */ addi r12, r5, 8 -/* 8028C55C 48 0D 5B 29 */ bl __ptmf_scall -/* 8028C560 60 00 00 00 */ nop -/* 8028C564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028C568 7C 08 03 A6 */ mtlr r0 -/* 8028C56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C570 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s deleted file mode 100644 index ccaa0b5f46..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028C610: -/* 8028C610 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028C614 7C 08 02 A6 */ mflr r0 -/* 8028C618 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028C61C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028C620 93 C1 00 08 */ stw r30, 8(r1) -/* 8028C624 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028C628 7C 9F 23 78 */ mr r31, r4 -/* 8028C62C 41 82 00 3C */ beq lbl_8028C668 -/* 8028C630 3C 80 80 3C */ lis r4, __vt__Q214JStudio_JStage12TAdaptor_fog@ha /* 0x803C59D0@ha */ -/* 8028C634 38 04 59 D0 */ addi r0, r4, __vt__Q214JStudio_JStage12TAdaptor_fog@l /* 0x803C59D0@l */ -/* 8028C638 90 1E 00 00 */ stw r0, 0(r30) -/* 8028C63C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028C640 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028C644 7D 89 03 A6 */ mtctr r12 -/* 8028C648 4E 80 04 21 */ bctrl -/* 8028C64C 7F C3 F3 78 */ mr r3, r30 -/* 8028C650 38 80 00 00 */ li r4, 0 -/* 8028C654 4B FF AB 29 */ bl __dt__Q27JStudio12TAdaptor_fogFv -/* 8028C658 7F E0 07 35 */ extsh. r0, r31 -/* 8028C65C 40 81 00 0C */ ble lbl_8028C668 -/* 8028C660 7F C3 F3 78 */ mr r3, r30 -/* 8028C664 48 04 26 D9 */ bl __dl__FPv -lbl_8028C668: -/* 8028C668 7F C3 F3 78 */ mr r3, r30 -/* 8028C66C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028C670 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028C674 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028C678 7C 08 03 A6 */ mtlr r0 -/* 8028C67C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C680 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv.s deleted file mode 100644 index dad5cca34f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8028C6CC: -/* 8028C6CC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8028C6D0 7C 08 02 A6 */ mflr r0 -/* 8028C6D4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8028C6D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028C6DC 48 0D 5A F9 */ bl _savegpr_27 -/* 8028C6E0 7C 7B 1B 78 */ mr r27, r3 -/* 8028C6E4 83 C3 00 8C */ lwz r30, 0x8c(r3) -/* 8028C6E8 7F C3 F3 78 */ mr r3, r30 -/* 8028C6EC 81 9E 00 00 */ lwz r12, 0(r30) -/* 8028C6F0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028C6F4 7D 89 03 A6 */ mtctr r12 -/* 8028C6F8 4E 80 04 21 */ bctrl -/* 8028C6FC 60 64 00 01 */ ori r4, r3, 1 -/* 8028C700 7F C3 F3 78 */ mr r3, r30 -/* 8028C704 81 9E 00 00 */ lwz r12, 0(r30) -/* 8028C708 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028C70C 7D 89 03 A6 */ mtctr r12 -/* 8028C710 4E 80 04 21 */ bctrl -/* 8028C714 83 BB 00 8C */ lwz r29, 0x8c(r27) -/* 8028C718 7F A3 EB 78 */ mr r3, r29 -/* 8028C71C 81 9D 00 00 */ lwz r12, 0(r29) -/* 8028C720 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 8028C724 7D 89 03 A6 */ mtctr r12 -/* 8028C728 4E 80 04 21 */ bctrl -/* 8028C72C 90 61 00 08 */ stw r3, 8(r1) -/* 8028C730 7F 63 DB 78 */ mr r3, r27 -/* 8028C734 3C 80 80 3A */ lis r4, sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog@ha /* 0x8039AACC@ha */ -/* 8028C738 38 84 AA CC */ addi r4, r4, sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog@l /* 0x8039AACC@l */ -/* 8028C73C 38 A1 00 08 */ addi r5, r1, 8 -/* 8028C740 4B FF 9B 6D */ bl adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor -/* 8028C744 3C 60 80 43 */ lis r3, saoVVOutput___Q214JStudio_JStage12TAdaptor_fog@ha /* 0x8043139C@ha */ -/* 8028C748 38 03 13 9C */ addi r0, r3, saoVVOutput___Q214JStudio_JStage12TAdaptor_fog@l /* 0x8043139C@l */ -/* 8028C74C 7C 1C 03 78 */ mr r28, r0 -/* 8028C750 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha /* 0x80285EB8@ha */ -/* 8028C754 3B C3 5E B8 */ addi r30, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 0x80285EB8@l */ -/* 8028C758 3B E0 00 00 */ li r31, 0 -/* 8028C75C 48 00 00 34 */ b lbl_8028C790 -lbl_8028C760: -/* 8028C760 7F A3 EB 78 */ mr r3, r29 -/* 8028C764 39 9C 00 14 */ addi r12, r28, 0x14 -/* 8028C768 48 0D 59 1D */ bl __ptmf_scall -/* 8028C76C 60 00 00 00 */ nop -/* 8028C770 80 7B 00 08 */ lwz r3, 8(r27) -/* 8028C774 80 1C 00 04 */ lwz r0, 4(r28) -/* 8028C778 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028C77C 7C 63 02 14 */ add r3, r3, r0 -/* 8028C780 93 C3 00 08 */ stw r30, 8(r3) -/* 8028C784 93 E3 00 04 */ stw r31, 4(r3) -/* 8028C788 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 8028C78C 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_8028C790: -/* 8028C790 80 1C 00 04 */ lwz r0, 4(r28) -/* 8028C794 2C 00 FF FF */ cmpwi r0, -1 -/* 8028C798 40 82 FF C8 */ bne lbl_8028C760 -/* 8028C79C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028C7A0 48 0D 5A 81 */ bl _restgpr_27 -/* 8028C7A4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8028C7A8 7C 08 03 A6 */ mtlr r0 -/* 8028C7AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028C7B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s deleted file mode 100644 index b6f9baef2f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028C880: -/* 8028C880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028C884 7C 08 02 A6 */ mflr r0 -/* 8028C888 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028C88C 38 63 00 88 */ addi r3, r3, 0x88 -/* 8028C890 4B FF DB E1 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl -/* 8028C894 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028C898 7C 08 03 A6 */ mtlr r0 -/* 8028C89C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C8A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv.s deleted file mode 100644 index 6a57a26a51..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028C7B4: -/* 8028C7B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028C7B8 7C 08 02 A6 */ mflr r0 -/* 8028C7BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028C7C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028C7C4 83 E3 00 8C */ lwz r31, 0x8c(r3) -/* 8028C7C8 7F E3 FB 78 */ mr r3, r31 -/* 8028C7CC 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028C7D0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028C7D4 7D 89 03 A6 */ mtctr r12 -/* 8028C7D8 4E 80 04 21 */ bctrl -/* 8028C7DC 54 64 00 3C */ rlwinm r4, r3, 0, 0, 0x1e -/* 8028C7E0 7F E3 FB 78 */ mr r3, r31 -/* 8028C7E4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028C7E8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028C7EC 7D 89 03 A6 */ mtctr r12 -/* 8028C7F0 4E 80 04 21 */ bctrl -/* 8028C7F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028C7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028C7FC 7C 08 03 A6 */ mtlr r0 -/* 8028C800 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C804 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv.s deleted file mode 100644 index 1c238c34a3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8028C684: -/* 8028C684 3C 80 80 43 */ lis r4, saoVVOutput___Q214JStudio_JStage12TAdaptor_fog@ha /* 0x8043139C@ha */ -/* 8028C688 38 04 13 9C */ addi r0, r4, saoVVOutput___Q214JStudio_JStage12TAdaptor_fog@l /* 0x8043139C@l */ -/* 8028C68C 7C 05 03 78 */ mr r5, r0 -/* 8028C690 48 00 00 2C */ b lbl_8028C6BC -lbl_8028C694: -/* 8028C694 80 83 00 08 */ lwz r4, 8(r3) -/* 8028C698 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028C69C 7C 84 02 14 */ add r4, r4, r0 -/* 8028C6A0 28 05 00 00 */ cmplwi r5, 0 -/* 8028C6A4 41 82 00 0C */ beq lbl_8028C6B0 -/* 8028C6A8 7C A0 2B 78 */ mr r0, r5 -/* 8028C6AC 48 00 00 08 */ b lbl_8028C6B4 -lbl_8028C6B0: -/* 8028C6B0 38 0D 8C 70 */ la r0, soOutput_none___Q27JStudio14TVariableValue(r13) /* 804511F0-_SDA_BASE_ */ -lbl_8028C6B4: -/* 8028C6B4 90 04 00 10 */ stw r0, 0x10(r4) -/* 8028C6B8 38 A5 00 20 */ addi r5, r5, 0x20 -lbl_8028C6BC: -/* 8028C6BC 80 05 00 04 */ lwz r0, 4(r5) -/* 8028C6C0 2C 00 FF FF */ cmpwi r0, -1 -/* 8028C6C4 40 82 FF D0 */ bne lbl_8028C694 -/* 8028C6C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl.s deleted file mode 100644 index 3f858dcaf0..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028C808: -/* 8028C808 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028C80C 7C 08 02 A6 */ mflr r0 -/* 8028C810 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028C814 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028C818 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8028C81C 7C 7E 1B 78 */ mr r30, r3 -/* 8028C820 83 E3 00 8C */ lwz r31, 0x8c(r3) -/* 8028C824 38 81 00 0C */ addi r4, r1, 0xc -/* 8028C828 3C A0 80 3A */ lis r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog@ha /* 0x8039AACC@ha */ -/* 8028C82C 38 A5 AA CC */ addi r5, r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog@l /* 0x8039AACC@l */ -/* 8028C830 4B FF 9B 5D */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl -/* 8028C834 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8028C838 90 01 00 08 */ stw r0, 8(r1) -/* 8028C83C 7F E3 FB 78 */ mr r3, r31 -/* 8028C840 38 81 00 08 */ addi r4, r1, 8 -/* 8028C844 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028C848 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8028C84C 7D 89 03 A6 */ mtctr r12 -/* 8028C850 4E 80 04 21 */ bctrl -/* 8028C854 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 8028C858 81 83 00 00 */ lwz r12, 0(r3) -/* 8028C85C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028C860 7D 89 03 A6 */ mtctr r12 -/* 8028C864 4E 80 04 21 */ bctrl -/* 8028C868 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028C86C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8028C870 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028C874 7C 08 03 A6 */ mtlr r0 -/* 8028C878 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028C87C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C574.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C574.s deleted file mode 100644 index bdc70a1dc3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C574.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8028C574: -/* 8028C574 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028C578 7C 08 02 A6 */ mflr r0 -/* 8028C57C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028C580 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028C584 48 0D 5C 59 */ bl _savegpr_29 -/* 8028C588 7C 7D 1B 78 */ mr r29, r3 -/* 8028C58C 7C 9E 23 78 */ mr r30, r4 -/* 8028C590 7C BF 2B 78 */ mr r31, r5 -/* 8028C594 7F A5 EB 78 */ mr r5, r29 -/* 8028C598 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028C59C 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028C5A0 90 1D 00 00 */ stw r0, 0(r29) -/* 8028C5A4 38 00 00 00 */ li r0, 0 -/* 8028C5A8 90 1D 00 04 */ stw r0, 4(r29) -/* 8028C5AC 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028C5B0 90 7D 00 08 */ stw r3, 8(r29) -/* 8028C5B4 38 00 00 06 */ li r0, 6 -/* 8028C5B8 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8028C5BC 3C 80 80 3C */ lis r4, __vt__Q27JStudio12TAdaptor_fog@ha /* 0x803C54C4@ha */ -/* 8028C5C0 38 04 54 C4 */ addi r0, r4, __vt__Q27JStudio12TAdaptor_fog@l /* 0x803C54C4@l */ -/* 8028C5C4 90 1D 00 00 */ stw r0, 0(r29) -/* 8028C5C8 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028C5CC 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028C5D0 38 A0 00 00 */ li r5, 0 -/* 8028C5D4 38 C0 00 14 */ li r6, 0x14 -/* 8028C5D8 38 E0 00 06 */ li r7, 6 -/* 8028C5DC 48 0D 57 85 */ bl __construct_array -/* 8028C5E0 93 DD 00 88 */ stw r30, 0x88(r29) -/* 8028C5E4 93 FD 00 8C */ stw r31, 0x8c(r29) -/* 8028C5E8 3C 60 80 3C */ lis r3, __vt__Q214JStudio_JStage12TAdaptor_fog@ha /* 0x803C59D0@ha */ -/* 8028C5EC 38 03 59 D0 */ addi r0, r3, __vt__Q214JStudio_JStage12TAdaptor_fog@l /* 0x803C59D0@l */ -/* 8028C5F0 90 1D 00 00 */ stw r0, 0(r29) -/* 8028C5F4 7F A3 EB 78 */ mr r3, r29 -/* 8028C5F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028C5FC 48 0D 5C 2D */ bl _restgpr_29 -/* 8028C600 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028C604 7C 08 03 A6 */ mtlr r0 -/* 8028C608 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028C60C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C8A4.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C8A4.s deleted file mode 100644 index 0c44e0505b..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C8A4.s +++ /dev/null @@ -1,136 +0,0 @@ -lbl_8028C8A4: -/* 8028C8A4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8028C8A8 7C 08 02 A6 */ mflr r0 -/* 8028C8AC 90 01 00 74 */ stw r0, 0x74(r1) -/* 8028C8B0 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8028C8B4 93 C1 00 68 */ stw r30, 0x68(r1) -/* 8028C8B8 3C 60 80 43 */ lis r3, lit_848@ha /* 0x80431378@ha */ -/* 8028C8BC 3B C3 13 78 */ addi r30, r3, lit_848@l /* 0x80431378@l */ -/* 8028C8C0 3C 60 80 3C */ lis r3, lit_844@ha /* 0x803C59A0@ha */ -/* 8028C8C4 3B E3 59 A0 */ addi r31, r3, lit_844@l /* 0x803C59A0@l */ -/* 8028C8C8 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C8CC 39 43 56 40 */ addi r10, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C8D0 91 41 00 48 */ stw r10, 0x48(r1) -/* 8028C8D4 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028C8D8 38 63 5A 10 */ addi r3, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028C8DC 90 61 00 48 */ stw r3, 0x48(r1) -/* 8028C8E0 39 20 00 04 */ li r9, 4 -/* 8028C8E4 91 21 00 4C */ stw r9, 0x4c(r1) -/* 8028C8E8 81 1F 00 00 */ lwz r8, 0(r31) -/* 8028C8EC 80 FF 00 04 */ lwz r7, 4(r31) -/* 8028C8F0 91 01 00 50 */ stw r8, 0x50(r1) -/* 8028C8F4 90 E1 00 54 */ stw r7, 0x54(r1) -/* 8028C8F8 80 DF 00 08 */ lwz r6, 8(r31) -/* 8028C8FC 90 C1 00 58 */ stw r6, 0x58(r1) -/* 8028C900 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 8028C904 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 8028C908 90 A1 00 5C */ stw r5, 0x5c(r1) -/* 8028C90C 90 81 00 60 */ stw r4, 0x60(r1) -/* 8028C910 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 8028C914 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028C918 91 5E 00 24 */ stw r10, 0x24(r30) -/* 8028C91C 90 7E 00 24 */ stw r3, 0x24(r30) -/* 8028C920 38 7E 00 24 */ addi r3, r30, 0x24 -/* 8028C924 91 23 00 04 */ stw r9, 4(r3) -/* 8028C928 91 03 00 08 */ stw r8, 8(r3) -/* 8028C92C 90 E3 00 0C */ stw r7, 0xc(r3) -/* 8028C930 90 C3 00 10 */ stw r6, 0x10(r3) -/* 8028C934 90 A3 00 14 */ stw r5, 0x14(r3) -/* 8028C938 90 83 00 18 */ stw r4, 0x18(r3) -/* 8028C93C 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8028C940 3C 80 80 29 */ lis r4, func_8028CAC0@ha /* 0x8028CAC0@ha */ -/* 8028C944 38 84 CA C0 */ addi r4, r4, func_8028CAC0@l /* 0x8028CAC0@l */ -/* 8028C948 38 BE 00 00 */ addi r5, r30, 0 -/* 8028C94C 48 0D 52 D9 */ bl __register_global_object -/* 8028C950 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028C954 38 03 5A 10 */ addi r0, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028C958 90 01 00 48 */ stw r0, 0x48(r1) -/* 8028C95C 38 61 00 48 */ addi r3, r1, 0x48 -/* 8028C960 38 80 00 00 */ li r4, 0 -/* 8028C964 4B FF 94 A9 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028C968 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028C96C 39 63 56 40 */ addi r11, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028C970 91 61 00 28 */ stw r11, 0x28(r1) -/* 8028C974 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028C978 39 43 5A 10 */ addi r10, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028C97C 91 41 00 28 */ stw r10, 0x28(r1) -/* 8028C980 39 20 00 05 */ li r9, 5 -/* 8028C984 91 21 00 2C */ stw r9, 0x2c(r1) -/* 8028C988 81 1F 00 18 */ lwz r8, 0x18(r31) -/* 8028C98C 80 FF 00 1C */ lwz r7, 0x1c(r31) -/* 8028C990 91 01 00 30 */ stw r8, 0x30(r1) -/* 8028C994 90 E1 00 34 */ stw r7, 0x34(r1) -/* 8028C998 80 DF 00 20 */ lwz r6, 0x20(r31) -/* 8028C99C 90 C1 00 38 */ stw r6, 0x38(r1) -/* 8028C9A0 80 BF 00 24 */ lwz r5, 0x24(r31) -/* 8028C9A4 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 8028C9A8 90 A1 00 3C */ stw r5, 0x3c(r1) -/* 8028C9AC 90 81 00 40 */ stw r4, 0x40(r1) -/* 8028C9B0 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 8028C9B4 90 01 00 44 */ stw r0, 0x44(r1) -/* 8028C9B8 38 7E 00 24 */ addi r3, r30, 0x24 -/* 8028C9BC 91 63 00 20 */ stw r11, 0x20(r3) -/* 8028C9C0 91 43 00 20 */ stw r10, 0x20(r3) -/* 8028C9C4 91 23 00 24 */ stw r9, 0x24(r3) -/* 8028C9C8 91 03 00 28 */ stw r8, 0x28(r3) -/* 8028C9CC 90 E3 00 2C */ stw r7, 0x2c(r3) -/* 8028C9D0 90 C3 00 30 */ stw r6, 0x30(r3) -/* 8028C9D4 90 A3 00 34 */ stw r5, 0x34(r3) -/* 8028C9D8 90 83 00 38 */ stw r4, 0x38(r3) -/* 8028C9DC 90 03 00 3C */ stw r0, 0x3c(r3) -/* 8028C9E0 38 63 00 20 */ addi r3, r3, 0x20 -/* 8028C9E4 3C 80 80 29 */ lis r4, func_8028CAC0@ha /* 0x8028CAC0@ha */ -/* 8028C9E8 38 84 CA C0 */ addi r4, r4, func_8028CAC0@l /* 0x8028CAC0@l */ -/* 8028C9EC 38 BE 00 0C */ addi r5, r30, 0xc -/* 8028C9F0 48 0D 52 35 */ bl __register_global_object -/* 8028C9F4 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028C9F8 38 03 5A 10 */ addi r0, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028C9FC 90 01 00 28 */ stw r0, 0x28(r1) -/* 8028CA00 38 61 00 28 */ addi r3, r1, 0x28 -/* 8028CA04 38 80 00 00 */ li r4, 0 -/* 8028CA08 4B FF 94 05 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028CA0C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028CA10 39 03 56 40 */ addi r8, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028CA14 91 01 00 08 */ stw r8, 8(r1) -/* 8028CA18 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028CA1C 38 E3 5A 10 */ addi r7, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028CA20 90 E1 00 08 */ stw r7, 8(r1) -/* 8028CA24 38 C0 FF FF */ li r6, -1 -/* 8028CA28 90 C1 00 0C */ stw r6, 0xc(r1) -/* 8028CA2C 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 8028CA30 84 A3 21 80 */ lwzu r5, __ptmf_null@l(r3) /* 0x803A2180@l */ -/* 8028CA34 80 83 00 04 */ lwz r4, 4(r3) -/* 8028CA38 90 A1 00 10 */ stw r5, 0x10(r1) -/* 8028CA3C 90 81 00 14 */ stw r4, 0x14(r1) -/* 8028CA40 80 03 00 08 */ lwz r0, 8(r3) -/* 8028CA44 90 01 00 18 */ stw r0, 0x18(r1) -/* 8028CA48 90 A1 00 1C */ stw r5, 0x1c(r1) -/* 8028CA4C 90 81 00 20 */ stw r4, 0x20(r1) -/* 8028CA50 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028CA54 38 7E 00 24 */ addi r3, r30, 0x24 -/* 8028CA58 91 03 00 40 */ stw r8, 0x40(r3) -/* 8028CA5C 90 E3 00 40 */ stw r7, 0x40(r3) -/* 8028CA60 90 C3 00 44 */ stw r6, 0x44(r3) -/* 8028CA64 90 A3 00 48 */ stw r5, 0x48(r3) -/* 8028CA68 90 83 00 4C */ stw r4, 0x4c(r3) -/* 8028CA6C 90 03 00 50 */ stw r0, 0x50(r3) -/* 8028CA70 90 A3 00 54 */ stw r5, 0x54(r3) -/* 8028CA74 90 83 00 58 */ stw r4, 0x58(r3) -/* 8028CA78 90 03 00 5C */ stw r0, 0x5c(r3) -/* 8028CA7C 38 63 00 40 */ addi r3, r3, 0x40 -/* 8028CA80 3C 80 80 29 */ lis r4, func_8028CAC0@ha /* 0x8028CAC0@ha */ -/* 8028CA84 38 84 CA C0 */ addi r4, r4, func_8028CAC0@l /* 0x8028CAC0@l */ -/* 8028CA88 38 BE 00 18 */ addi r5, r30, 0x18 -/* 8028CA8C 48 0D 51 99 */ bl __register_global_object -/* 8028CA90 3C 60 80 3C */ lis r3, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028CA94 38 03 5A 10 */ addi r0, r3, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028CA98 90 01 00 08 */ stw r0, 8(r1) -/* 8028CA9C 38 61 00 08 */ addi r3, r1, 8 -/* 8028CAA0 38 80 00 00 */ li r4, 0 -/* 8028CAA4 4B FF 93 69 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028CAA8 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8028CAAC 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 8028CAB0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8028CAB4 7C 08 03 A6 */ mtlr r0 -/* 8028CAB8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8028CABC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s deleted file mode 100644 index 26ef4f3e3d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028CAC0: -/* 8028CAC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028CAC4 7C 08 02 A6 */ mflr r0 -/* 8028CAC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028CACC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028CAD0 93 C1 00 08 */ stw r30, 8(r1) -/* 8028CAD4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028CAD8 7C 9F 23 78 */ mr r31, r4 -/* 8028CADC 41 82 00 28 */ beq lbl_8028CB04 -/* 8028CAE0 3C 80 80 3C */ lis r4, data_803C5A10@ha /* 0x803C5A10@ha */ -/* 8028CAE4 38 04 5A 10 */ addi r0, r4, data_803C5A10@l /* 0x803C5A10@l */ -/* 8028CAE8 90 1E 00 00 */ stw r0, 0(r30) -/* 8028CAEC 38 80 00 00 */ li r4, 0 -/* 8028CAF0 4B FF 93 1D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028CAF4 7F E0 07 35 */ extsh. r0, r31 -/* 8028CAF8 40 81 00 0C */ ble lbl_8028CB04 -/* 8028CAFC 7F C3 F3 78 */ mr r3, r30 -/* 8028CB00 48 04 22 3D */ bl __dl__FPv -lbl_8028CB04: -/* 8028CB04 7F C3 F3 78 */ mr r3, r30 -/* 8028CB08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028CB0C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028CB10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028CB14 7C 08 03 A6 */ mtlr r0 -/* 8028CB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028CB1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s b/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s deleted file mode 100644 index b69f6f07d7..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8028CB20: -/* 8028CB20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028CB24 7C 08 02 A6 */ mflr r0 -/* 8028CB28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028CB2C 7C 65 1B 78 */ mr r5, r3 -/* 8028CB30 80 64 00 8C */ lwz r3, 0x8c(r4) -/* 8028CB34 39 85 00 08 */ addi r12, r5, 8 -/* 8028CB38 48 0D 55 4D */ bl __ptmf_scall -/* 8028CB3C 60 00 00 00 */ nop -/* 8028CB40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028CB44 7C 08 03 A6 */ mtlr r0 -/* 8028CB48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028CB4C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q214JStudio_JStage14TAdaptor_lightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q214JStudio_JStage14TAdaptor_lightFv.s deleted file mode 100644 index bbcd7d648f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q214JStudio_JStage14TAdaptor_lightFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028CBF4: -/* 8028CBF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028CBF8 7C 08 02 A6 */ mflr r0 -/* 8028CBFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028CC00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028CC04 93 C1 00 08 */ stw r30, 8(r1) -/* 8028CC08 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028CC0C 7C 9F 23 78 */ mr r31, r4 -/* 8028CC10 41 82 00 3C */ beq lbl_8028CC4C -/* 8028CC14 3C 80 80 3C */ lis r4, __vt__Q214JStudio_JStage14TAdaptor_light@ha /* 0x803C5A40@ha */ -/* 8028CC18 38 04 5A 40 */ addi r0, r4, __vt__Q214JStudio_JStage14TAdaptor_light@l /* 0x803C5A40@l */ -/* 8028CC1C 90 1E 00 00 */ stw r0, 0(r30) -/* 8028CC20 81 83 00 00 */ lwz r12, 0(r3) -/* 8028CC24 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028CC28 7D 89 03 A6 */ mtctr r12 -/* 8028CC2C 4E 80 04 21 */ bctrl -/* 8028CC30 7F C3 F3 78 */ mr r3, r30 -/* 8028CC34 38 80 00 00 */ li r4, 0 -/* 8028CC38 4B FF A6 D1 */ bl __dt__Q27JStudio14TAdaptor_lightFv -/* 8028CC3C 7F E0 07 35 */ extsh. r0, r31 -/* 8028CC40 40 81 00 0C */ ble lbl_8028CC4C -/* 8028CC44 7F C3 F3 78 */ mr r3, r30 -/* 8028CC48 48 04 20 F5 */ bl __dl__FPv -lbl_8028CC4C: -/* 8028CC4C 7F C3 F3 78 */ mr r3, r30 -/* 8028CC50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028CC54 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028CC58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028CC5C 7C 08 03 A6 */ mtlr r0 -/* 8028CC60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028CC64 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv.s deleted file mode 100644 index eb32568444..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028D258: -/* 8028D258 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D25C 7C 08 02 A6 */ mflr r0 -/* 8028D260 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D264 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D268 93 C1 00 08 */ stw r30, 8(r1) -/* 8028D26C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028D270 7C 9F 23 78 */ mr r31, r4 -/* 8028D274 41 82 00 28 */ beq lbl_8028D29C -/* 8028D278 3C 80 80 3C */ lis r4, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D27C 38 04 5A 30 */ addi r0, r4, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D280 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D284 38 80 00 00 */ li r4, 0 -/* 8028D288 4B FF 8B 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D28C 7F E0 07 35 */ extsh. r0, r31 -/* 8028D290 40 81 00 0C */ ble lbl_8028D29C -/* 8028D294 7F C3 F3 78 */ mr r3, r30 -/* 8028D298 48 04 1A A5 */ bl __dl__FPv -lbl_8028D29C: -/* 8028D29C 7F C3 F3 78 */ mr r3, r30 -/* 8028D2A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028D2A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028D2A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D2AC 7C 08 03 A6 */ mtlr r0 -/* 8028D2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D2B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl.s deleted file mode 100644 index e0a3932d64..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028D18C: -/* 8028D18C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D190 7C 08 02 A6 */ mflr r0 -/* 8028D194 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D198 38 63 01 14 */ addi r3, r3, 0x114 -/* 8028D19C 4B FF D2 D5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl -/* 8028D1A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D1A4 7C 08 03 A6 */ mtlr r0 -/* 8028D1A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D1AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv.s deleted file mode 100644 index 02805a2e46..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028CF68: -/* 8028CF68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028CF6C 7C 08 02 A6 */ mflr r0 -/* 8028CF70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028CF74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028CF78 83 E3 01 18 */ lwz r31, 0x118(r3) -/* 8028CF7C 7F E3 FB 78 */ mr r3, r31 -/* 8028CF80 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028CF84 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028CF88 7D 89 03 A6 */ mtctr r12 -/* 8028CF8C 4E 80 04 21 */ bctrl -/* 8028CF90 54 64 00 3C */ rlwinm r4, r3, 0, 0, 0x1e -/* 8028CF94 7F E3 FB 78 */ mr r3, r31 -/* 8028CF98 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028CF9C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028CFA0 7D 89 03 A6 */ mtctr r12 -/* 8028CFA4 4E 80 04 21 */ bctrl -/* 8028CFA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028CFAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028CFB0 7C 08 03 A6 */ mtlr r0 -/* 8028CFB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028CFB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv.s deleted file mode 100644 index 678151785f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8028CC68: -/* 8028CC68 3C 80 80 43 */ lis r4, saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light@ha /* 0x80431448@ha */ -/* 8028CC6C 38 04 14 48 */ addi r0, r4, saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light@l /* 0x80431448@l */ -/* 8028CC70 7C 05 03 78 */ mr r5, r0 -/* 8028CC74 48 00 00 2C */ b lbl_8028CCA0 -lbl_8028CC78: -/* 8028CC78 80 83 00 08 */ lwz r4, 8(r3) -/* 8028CC7C 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028CC80 7C 84 02 14 */ add r4, r4, r0 -/* 8028CC84 28 05 00 00 */ cmplwi r5, 0 -/* 8028CC88 41 82 00 0C */ beq lbl_8028CC94 -/* 8028CC8C 7C A0 2B 78 */ mr r0, r5 -/* 8028CC90 48 00 00 08 */ b lbl_8028CC98 -lbl_8028CC94: -/* 8028CC94 38 0D 8C 70 */ la r0, soOutput_none___Q27JStudio14TVariableValue(r13) /* 804511F0-_SDA_BASE_ */ -lbl_8028CC98: -/* 8028CC98 90 04 00 10 */ stw r0, 0x10(r4) -/* 8028CC9C 38 A5 00 0C */ addi r5, r5, 0xc -lbl_8028CCA0: -/* 8028CCA0 80 05 00 04 */ lwz r0, 4(r5) -/* 8028CCA4 2C 00 FF FF */ cmpwi r0, -1 -/* 8028CCA8 40 82 FF D0 */ bne lbl_8028CC78 -/* 8028CCAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028CB50.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028CB50.s deleted file mode 100644 index e9f9580031..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028CB50.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8028CB50: -/* 8028CB50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028CB54 7C 08 02 A6 */ mflr r0 -/* 8028CB58 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028CB5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028CB60 48 0D 56 7D */ bl _savegpr_29 -/* 8028CB64 7C 7D 1B 78 */ mr r29, r3 -/* 8028CB68 7C 9E 23 78 */ mr r30, r4 -/* 8028CB6C 7C BF 2B 78 */ mr r31, r5 -/* 8028CB70 7F A5 EB 78 */ mr r5, r29 -/* 8028CB74 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028CB78 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028CB7C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028CB80 38 00 00 00 */ li r0, 0 -/* 8028CB84 90 1D 00 04 */ stw r0, 4(r29) -/* 8028CB88 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028CB8C 90 7D 00 08 */ stw r3, 8(r29) -/* 8028CB90 38 00 00 0D */ li r0, 0xd -/* 8028CB94 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8028CB98 3C 80 80 3C */ lis r4, __vt__Q27JStudio14TAdaptor_light@ha /* 0x803C547C@ha */ -/* 8028CB9C 38 04 54 7C */ addi r0, r4, __vt__Q27JStudio14TAdaptor_light@l /* 0x803C547C@l */ -/* 8028CBA0 90 1D 00 00 */ stw r0, 0(r29) -/* 8028CBA4 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028CBA8 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028CBAC 38 A0 00 00 */ li r5, 0 -/* 8028CBB0 38 C0 00 14 */ li r6, 0x14 -/* 8028CBB4 38 E0 00 0D */ li r7, 0xd -/* 8028CBB8 48 0D 51 A9 */ bl __construct_array -/* 8028CBBC 93 DD 01 14 */ stw r30, 0x114(r29) -/* 8028CBC0 93 FD 01 18 */ stw r31, 0x118(r29) -/* 8028CBC4 3C 60 80 3C */ lis r3, __vt__Q214JStudio_JStage14TAdaptor_light@ha /* 0x803C5A40@ha */ -/* 8028CBC8 38 03 5A 40 */ addi r0, r3, __vt__Q214JStudio_JStage14TAdaptor_light@l /* 0x803C5A40@l */ -/* 8028CBCC 90 1D 00 00 */ stw r0, 0(r29) -/* 8028CBD0 38 00 00 00 */ li r0, 0 -/* 8028CBD4 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 8028CBD8 7F A3 EB 78 */ mr r3, r29 -/* 8028CBDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028CBE0 48 0D 56 49 */ bl _restgpr_29 -/* 8028CBE4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028CBE8 7C 08 03 A6 */ mtlr r0 -/* 8028CBEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028CBF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D1B0.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D1B0.s deleted file mode 100644 index c7f1d51dca..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D1B0.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8028D1B0: -/* 8028D1B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D1B4 7C 08 02 A6 */ mflr r0 -/* 8028D1B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D1BC 2C 04 00 02 */ cmpwi r4, 2 -/* 8028D1C0 41 82 00 08 */ beq lbl_8028D1C8 -/* 8028D1C4 48 00 00 54 */ b lbl_8028D218 -lbl_8028D1C8: -/* 8028D1C8 80 05 00 00 */ lwz r0, 0(r5) -/* 8028D1CC 2C 00 03 02 */ cmpwi r0, 0x302 -/* 8028D1D0 41 82 00 28 */ beq lbl_8028D1F8 -/* 8028D1D4 40 80 00 10 */ bge lbl_8028D1E4 -/* 8028D1D8 2C 00 03 01 */ cmpwi r0, 0x301 -/* 8028D1DC 40 80 00 14 */ bge lbl_8028D1F0 -/* 8028D1E0 48 00 00 38 */ b lbl_8028D218 -lbl_8028D1E4: -/* 8028D1E4 2C 00 03 04 */ cmpwi r0, 0x304 -/* 8028D1E8 40 80 00 30 */ bge lbl_8028D218 -/* 8028D1EC 48 00 00 14 */ b lbl_8028D200 -lbl_8028D1F0: -/* 8028D1F0 38 80 00 01 */ li r4, 1 -/* 8028D1F4 48 00 00 10 */ b lbl_8028D204 -lbl_8028D1F8: -/* 8028D1F8 38 80 00 02 */ li r4, 2 -/* 8028D1FC 48 00 00 08 */ b lbl_8028D204 -lbl_8028D200: -/* 8028D200 38 80 00 03 */ li r4, 3 -lbl_8028D204: -/* 8028D204 80 63 01 18 */ lwz r3, 0x118(r3) -/* 8028D208 81 83 00 00 */ lwz r12, 0(r3) -/* 8028D20C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8028D210 7D 89 03 A6 */ mtctr r12 -/* 8028D214 4E 80 04 21 */ bctrl -lbl_8028D218: -/* 8028D218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D21C 7C 08 03 A6 */ mtlr r0 -/* 8028D220 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D224 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D228.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D228.s deleted file mode 100644 index b6b2f54ad6..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D228.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028D228: -/* 8028D228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D22C 7C 08 02 A6 */ mflr r0 -/* 8028D230 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D234 38 63 01 14 */ addi r3, r3, 0x114 -/* 8028D238 4B FF D3 19 */ bl adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl -/* 8028D23C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D240 7C 08 03 A6 */ mtlr r0 -/* 8028D244 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D248 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D24C.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D24C.s deleted file mode 100644 index ec47c1e0db..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D24C.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8028D24C: -/* 8028D24C 80 03 00 08 */ lwz r0, 8(r3) -/* 8028D250 90 04 01 1C */ stw r0, 0x11c(r4) -/* 8028D254 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D2B8.s b/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D2B8.s deleted file mode 100644 index fce71e488c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D2B8.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_8028D2B8: -/* 8028D2B8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028D2BC 7C 08 02 A6 */ mflr r0 -/* 8028D2C0 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028D2C4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028D2C8 3C 60 80 43 */ lis r3, lit_930@ha /* 0x80431400@ha */ -/* 8028D2CC 3B E3 14 00 */ addi r31, r3, lit_930@l /* 0x80431400@l */ -/* 8028D2D0 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D2D4 38 A3 56 40 */ addi r5, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D2D8 90 A1 00 44 */ stw r5, 0x44(r1) -/* 8028D2DC 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D2E0 38 63 5A 30 */ addi r3, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D2E4 90 61 00 44 */ stw r3, 0x44(r1) -/* 8028D2E8 38 80 00 0A */ li r4, 0xa -/* 8028D2EC 90 81 00 48 */ stw r4, 0x48(r1) -/* 8028D2F0 38 00 00 01 */ li r0, 1 -/* 8028D2F4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8028D2F8 90 BF 00 48 */ stw r5, 0x48(r31) -/* 8028D2FC 90 7F 00 48 */ stw r3, 0x48(r31) -/* 8028D300 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D304 90 83 00 04 */ stw r4, 4(r3) -/* 8028D308 90 03 00 08 */ stw r0, 8(r3) -/* 8028D30C 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D310 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D314 38 BF 00 00 */ addi r5, r31, 0 -/* 8028D318 48 0D 49 0D */ bl __register_global_object -/* 8028D31C 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D320 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D324 90 01 00 44 */ stw r0, 0x44(r1) -/* 8028D328 38 61 00 44 */ addi r3, r1, 0x44 -/* 8028D32C 38 80 00 00 */ li r4, 0 -/* 8028D330 4B FF 8A DD */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D334 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D338 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D33C 90 C1 00 38 */ stw r6, 0x38(r1) -/* 8028D340 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D344 38 A3 5A 30 */ addi r5, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D348 90 A1 00 38 */ stw r5, 0x38(r1) -/* 8028D34C 38 80 00 0B */ li r4, 0xb -/* 8028D350 90 81 00 3C */ stw r4, 0x3c(r1) -/* 8028D354 38 00 00 01 */ li r0, 1 -/* 8028D358 90 01 00 40 */ stw r0, 0x40(r1) -/* 8028D35C 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D360 90 C3 00 0C */ stw r6, 0xc(r3) -/* 8028D364 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8028D368 90 83 00 10 */ stw r4, 0x10(r3) -/* 8028D36C 90 03 00 14 */ stw r0, 0x14(r3) -/* 8028D370 38 63 00 0C */ addi r3, r3, 0xc -/* 8028D374 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D378 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D37C 38 BF 00 0C */ addi r5, r31, 0xc -/* 8028D380 48 0D 48 A5 */ bl __register_global_object -/* 8028D384 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D388 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D38C 90 01 00 38 */ stw r0, 0x38(r1) -/* 8028D390 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028D394 38 80 00 00 */ li r4, 0 -/* 8028D398 4B FF 8A 75 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D39C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D3A0 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D3A4 90 C1 00 2C */ stw r6, 0x2c(r1) -/* 8028D3A8 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D3AC 38 A3 5A 30 */ addi r5, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D3B0 90 A1 00 2C */ stw r5, 0x2c(r1) -/* 8028D3B4 38 80 00 07 */ li r4, 7 -/* 8028D3B8 90 81 00 30 */ stw r4, 0x30(r1) -/* 8028D3BC 38 00 00 02 */ li r0, 2 -/* 8028D3C0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8028D3C4 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D3C8 90 C3 00 18 */ stw r6, 0x18(r3) -/* 8028D3CC 90 A3 00 18 */ stw r5, 0x18(r3) -/* 8028D3D0 90 83 00 1C */ stw r4, 0x1c(r3) -/* 8028D3D4 90 03 00 20 */ stw r0, 0x20(r3) -/* 8028D3D8 38 63 00 18 */ addi r3, r3, 0x18 -/* 8028D3DC 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D3E0 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D3E4 38 BF 00 18 */ addi r5, r31, 0x18 -/* 8028D3E8 48 0D 48 3D */ bl __register_global_object -/* 8028D3EC 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D3F0 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D3F4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8028D3F8 38 61 00 2C */ addi r3, r1, 0x2c -/* 8028D3FC 38 80 00 00 */ li r4, 0 -/* 8028D400 4B FF 8A 0D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D404 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D408 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D40C 90 C1 00 20 */ stw r6, 0x20(r1) -/* 8028D410 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D414 38 A3 5A 30 */ addi r5, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D418 90 A1 00 20 */ stw r5, 0x20(r1) -/* 8028D41C 38 80 00 08 */ li r4, 8 -/* 8028D420 90 81 00 24 */ stw r4, 0x24(r1) -/* 8028D424 38 00 00 02 */ li r0, 2 -/* 8028D428 90 01 00 28 */ stw r0, 0x28(r1) -/* 8028D42C 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D430 90 C3 00 24 */ stw r6, 0x24(r3) -/* 8028D434 90 A3 00 24 */ stw r5, 0x24(r3) -/* 8028D438 90 83 00 28 */ stw r4, 0x28(r3) -/* 8028D43C 90 03 00 2C */ stw r0, 0x2c(r3) -/* 8028D440 38 63 00 24 */ addi r3, r3, 0x24 -/* 8028D444 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D448 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D44C 38 BF 00 24 */ addi r5, r31, 0x24 -/* 8028D450 48 0D 47 D5 */ bl __register_global_object -/* 8028D454 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D458 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D45C 90 01 00 20 */ stw r0, 0x20(r1) -/* 8028D460 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028D464 38 80 00 00 */ li r4, 0 -/* 8028D468 4B FF 89 A5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D46C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D470 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D474 90 C1 00 14 */ stw r6, 0x14(r1) -/* 8028D478 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D47C 38 A3 5A 30 */ addi r5, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D480 90 A1 00 14 */ stw r5, 0x14(r1) -/* 8028D484 38 80 00 09 */ li r4, 9 -/* 8028D488 90 81 00 18 */ stw r4, 0x18(r1) -/* 8028D48C 38 00 00 02 */ li r0, 2 -/* 8028D490 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8028D494 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D498 90 C3 00 30 */ stw r6, 0x30(r3) -/* 8028D49C 90 A3 00 30 */ stw r5, 0x30(r3) -/* 8028D4A0 90 83 00 34 */ stw r4, 0x34(r3) -/* 8028D4A4 90 03 00 38 */ stw r0, 0x38(r3) -/* 8028D4A8 38 63 00 30 */ addi r3, r3, 0x30 -/* 8028D4AC 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D4B0 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D4B4 38 BF 00 30 */ addi r5, r31, 0x30 -/* 8028D4B8 48 0D 47 6D */ bl __register_global_object -/* 8028D4BC 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D4C0 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D4C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D4C8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8028D4CC 38 80 00 00 */ li r4, 0 -/* 8028D4D0 4B FF 89 3D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D4D4 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028D4D8 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028D4DC 90 C1 00 08 */ stw r6, 8(r1) -/* 8028D4E0 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D4E4 38 A3 5A 30 */ addi r5, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D4E8 90 A1 00 08 */ stw r5, 8(r1) -/* 8028D4EC 38 80 FF FF */ li r4, -1 -/* 8028D4F0 90 81 00 0C */ stw r4, 0xc(r1) -/* 8028D4F4 38 00 00 00 */ li r0, 0 -/* 8028D4F8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8028D4FC 38 7F 00 48 */ addi r3, r31, 0x48 -/* 8028D500 90 C3 00 3C */ stw r6, 0x3c(r3) -/* 8028D504 90 A3 00 3C */ stw r5, 0x3c(r3) -/* 8028D508 90 83 00 40 */ stw r4, 0x40(r3) -/* 8028D50C 90 03 00 44 */ stw r0, 0x44(r3) -/* 8028D510 38 63 00 3C */ addi r3, r3, 0x3c -/* 8028D514 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha /* 0x8028D258@ha */ -/* 8028D518 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 0x8028D258@l */ -/* 8028D51C 38 BF 00 3C */ addi r5, r31, 0x3c -/* 8028D520 48 0D 47 05 */ bl __register_global_object -/* 8028D524 3C 60 80 3C */ lis r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@ha /* 0x803C5A30@ha */ -/* 8028D528 38 03 5A 30 */ addi r0, r3, __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_@l /* 0x803C5A30@l */ -/* 8028D52C 90 01 00 08 */ stw r0, 8(r1) -/* 8028D530 38 61 00 08 */ addi r3, r1, 8 -/* 8028D534 38 80 00 00 */ li r4, 0 -/* 8028D538 4B FF 88 D5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028D53C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028D540 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028D544 7C 08 03 A6 */ mtlr r0 -/* 8028D548 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028D54C 4E 80 00 20 */ blr diff --git a/include/JSystem/JStage/JSGLight.h b/include/JSystem/JStage/JSGLight.h index b358c70d66..06485a3717 100644 --- a/include/JSystem/JStage/JSGLight.h +++ b/include/JSystem/JStage/JSGLight.h @@ -5,7 +5,12 @@ #include "dolphin/gx/GXStruct.h" namespace JStage { - enum TELight {}; + enum TELight { + TELIGHT_0, + TELIGHT_1, + TELIGHT_2, + TELIGHT_3, + }; /** * @ingroup jsystem-jstage diff --git a/include/JSystem/JStage/JSGObject.h b/include/JSystem/JStage/JSGObject.h index b54910a0f8..d4689c16bd 100644 --- a/include/JSystem/JStage/JSGObject.h +++ b/include/JSystem/JStage/JSGObject.h @@ -4,7 +4,6 @@ #include "dolphin/mtx.h" namespace JStage { - /** * @ingroup jsystem-jstage * diff --git a/include/JSystem/JStage/JSGSystem.h b/include/JSystem/JStage/JSGSystem.h index b260f40874..1f9fb920aa 100644 --- a/include/JSystem/JStage/JSGSystem.h +++ b/include/JSystem/JStage/JSGSystem.h @@ -5,13 +5,13 @@ namespace JStage { enum TEObject { - /* 0x0 */ TOBJ_ACTOR_UNK, - /* 0x1 */ TOBJ_UNK1, - /* 0x2 */ TOBJ_ACTOR, - /* 0x3 */ TOBJ_CAMERA, - /* 0x4 */ TOBJ_AMBIENT, - /* 0x5 */ TOBJ_LIGHT, - /* 0x6 */ TOBJ_FOG, + /* 0x0 */ OBJECT_UNDEFINED, + /* 0x1 */ OBJECT_UNK1, + /* 0x2 */ OBJECT_ACTOR, + /* 0x3 */ OBJECT_CAMERA, + /* 0x4 */ OBJECT_AMBIENT, + /* 0x5 */ OBJECT_LIGHT, + /* 0x6 */ OBJECT_FOG, }; /** diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index 600bbf9a9a..20db5602ed 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -47,6 +47,10 @@ public: Vec scaling; }; struct TTransform_position : public Vec {}; + struct TTransform_position_direction { + Vec position; + Vec direction; + }; /* 80285114 */ TControl(); /* 802851AC */ virtual ~TControl(); @@ -167,6 +171,108 @@ public: return param_2; } + bool transformOnGet_isEnabled() const { return mTransformOnGet; } + CMtxP transformOnGet_getMatrix() const { return mTransformOnGet_Matrix; } + + void transformOnGet_transformTranslation(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(296, pDst!=0); + JUT_ASSERT(297, &rSrc!=pDst); + MTXMultVec(transformOnGet_getMatrix(), &rSrc, pDst); + } + + void transformOnGet_transformDirection(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(316, pDst!=0); + JUT_ASSERT(317, &rSrc!=pDst); + MTXMultVecSR(transformOnGet_getMatrix(), &rSrc, pDst); + } + + void transformOnGet_transform(TTransform_position_direction* param_1, + TTransform_position_direction* pDst) const { + JUT_ASSERT(289, pDst!=0); + transformOnGet_transformTranslation(param_1->position, &pDst->position); + transformOnGet_transformDirection(param_1->direction, &pDst->direction); + } + + TTransform_position_direction* + transformOnGet_transform_ifEnabled(TTransform_position_direction* param_1, + TTransform_position_direction* param_2) const { + if (!transformOnGet_isEnabled()) { + return param_1; + } + transformOnGet_transform(param_1, param_2); + return param_2; + } + + void transformOnGet_transform(TTransform_position* param_1, + TTransform_position* pDst) const { + transformOnGet_transformTranslation(*param_1, pDst); + } + + TTransform_position* + transformOnGet_transform_ifEnabled(TTransform_position* param_1, + TTransform_position* param_2) const { + if (!transformOnGet_isEnabled()) { + return param_1; + } + transformOnGet_transform(param_1, param_2); + return param_2; + } + + void transformOnGet_transformRotation(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(302, pDst!=0); + JUT_ASSERT(303, &rSrc!=pDst); + pDst->x = rSrc.x; + pDst->y = rSrc.y + mTransformOnGet_RotationY; + pDst->z = rSrc.z; + } + + void transformOnGet_transformScaling(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(310, pDst!=0); + JUT_ASSERT(311, &rSrc!=pDst); + *pDst = rSrc; + } + + void transformOnGet_transform(TTransform_translation_rotation_scaling* param_1, + TTransform_translation_rotation_scaling* pDst) const { + JUT_ASSERT(263, pDst!=0); + transformOnGet_transformTranslation(param_1->translation, &pDst->translation); + transformOnGet_transformRotation(param_1->rotation, &pDst->rotation); + transformOnGet_transformScaling(param_1->scaling, &pDst->scaling); + } + + TTransform_translation_rotation_scaling* + transformOnGet_transform_ifEnabled(TTransform_translation_rotation_scaling* param_1, + TTransform_translation_rotation_scaling* param_2) const { + if (!transformOnGet_isEnabled()) { + return param_1; + } + transformOnGet_transform(param_1, param_2); + return param_2; + } + + void transformOnSet_transformDirection(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(246, pDst!=0); + JUT_ASSERT(247, &rSrc!=pDst); + MTXMultVecSR(transformOnSet_getMatrix(), &rSrc, pDst); + } + + void transformOnSet_transform(TTransform_position_direction* param_1, + TTransform_position_direction* pDst) const { + JUT_ASSERT(219, pDst!=0); + transformOnSet_transformTranslation(param_1->position, &pDst->position); + transformOnSet_transformDirection(param_1->direction, &pDst->direction); + } + + TTransform_position_direction* + transformOnSet_transform_ifEnabled(TTransform_position_direction* param_1, + TTransform_position_direction* param_2) const { + if (!transformOnSet_isEnabled()) { + return param_1; + } + transformOnSet_transform(param_1, param_2); + return param_2; + } + /* 0x58 */ f64 mSecondPerFrame; /* 0x60 */ fvb::TControl fvb_Control; /* 0x74 */ ctb::TControl ctb_Control; @@ -175,7 +281,7 @@ public: /* 0x8C */ Vec field_0x8c; /* 0x98 */ Vec field_0x98; /* 0xA4 */ f32 mTransformOnSet_RotationY; - /* 0xA8 */ f32 field_0xa8; + /* 0xA8 */ f32 mTransformOnGet_RotationY; /* 0xAC */ Mtx mTransformOnSet_Matrix; /* 0xDC */ Mtx mTransformOnGet_Matrix; }; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 97a4c23b4b..182b2bbc43 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -37,6 +37,7 @@ struct TVariableValue { /* 80285ECC */ static void update_time_(JStudio::TVariableValue*, f64); /* 80285F08 */ static void update_functionValue_(JStudio::TVariableValue*, f64); /* 8028B568 */ TVariableValue(); + //TVariableValue() : field_0x4(0), field_0x8(NULL), pOutput_((TOutput*)soOutput_none_) {} void setValue_immediate(f32 value) { field_0x8 = &update_immediate_; @@ -210,6 +211,18 @@ inline void TObject::prepareAdaptor() { struct TAdaptor_actor : public TAdaptor { TAdaptor_actor() : TAdaptor(mValue, 14) {} /* 802868B0 */ virtual ~TAdaptor_actor() = 0; + virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, const void*, u32) = 0; /* 0x10 */ TVariableValue mValue[14]; @@ -248,6 +261,14 @@ struct TAdaptor_camera : public TAdaptor { TAdaptor_camera() : TAdaptor(mValue, 12) {} /* 80286E1C */ virtual ~TAdaptor_camera() = 0; + virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32) = 0; + virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0; + /* 0x10 */ TVariableValue mValue[12]; static u32 const sauVariableValue_3_POSITION_XYZ[3]; diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index f188803787..0e53b7481d 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -11,6 +11,8 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" namespace JStudio_JStage { +typedef JStudio::TObject* (*ObjCreateFuncT)(const JStudio::stb::data::TParse_TBlock_object&, JStage::TObject*, const JStage::TSystem*); + struct TCreateObject : public JStudio::TCreateObject { TCreateObject(const JStage::TSystem* pSystem) { pJSGSystem_ = pSystem; @@ -38,10 +40,93 @@ struct TAdaptor_object_ { /* 0x4 */ JStage::TObject* pJSGObject_; }; + +template +struct TVariableValueOutput_object_ : public JStudio::TVariableValue::TOutput { + typedef f32 (TStageObject::*GetFunc)() const; + typedef void (TStageObject::*SetFunc)(f32); + TVariableValueOutput_object_() : field_0x4(-1), field_0x8(NULL), field_0x14(NULL) {} + TVariableValueOutput_object_(typename TAdaptor::TEVariableValue param_1, + SetFunc param_2, GetFunc param_3) : field_0x4(param_1), field_0x8(param_2), field_0x14(param_3) { + + } + + virtual void operator()(f32 param_1, JStudio::TAdaptor* param_2) const { + (((TAdaptor*)param_2)->get_pJSG_()->*field_0x8)(param_1); + } + virtual ~TVariableValueOutput_object_() {} + + bool isEnd_() { return field_0x4 == -1; } + void adaptor_setOutput_(TAdaptor* adaptor) { + adaptor->adaptor_referVariableValue(field_0x4)->setOutput(this); + } + void setVariableValue_(TStageObject* pObj, TAdaptor* pAdaptor) { + f32 val = (pObj->*field_0x14)(); + pAdaptor->adaptor_setVariableValue_immediate(field_0x4, val); + } + + int field_0x4; + SetFunc field_0x8; + GetFunc field_0x14; +}; + struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::TAdaptor_object_ { - struct TVVOutput_ANIMATION_FRAME_ { + typedef JStudio::TObject_actor ObjectType; + typedef TVariableValueOutput_object_ TVVOutputObject; + typedef void (JStage::TActor::*Setter)(f32); + typedef f32 (JStage::TActor::*Getter)() const; + typedef f32 (JStage::TActor::*MaxGetter)() const; + + enum TEVariableValue { + TEACTOR_1 = 1, + }; + + struct TVVOutput_ANIMATION_FRAME_ + #ifdef NONMATCHING + : public JStudio::TVariableValue::TOutput + #endif + { + TVVOutput_ANIMATION_FRAME_() { + mValueIndex = -1; + field_0x8 = 0; + mSetter = NULL; + mGetter = NULL; + mMaxGetter = NULL; + } + TVVOutput_ANIMATION_FRAME_(int param_1, u32 param_2, Setter param_3, Getter param_4, + MaxGetter param_5) { + mValueIndex = param_1; + field_0x8 = param_2; + mSetter = param_3; + mGetter = param_4; + mMaxGetter = param_5; + } + #ifdef NONMATCHING + /* 8028B064 */ virtual void operator()(f32, JStudio::TAdaptor*) const; + /* 8028B138 */ virtual ~TVVOutput_ANIMATION_FRAME_(); + + void adaptor_setOutput_(TAdaptor* adaptor) { + adaptor->adaptor_referVariableValue(mValueIndex)->setOutput(this); + } + + void setVariableValue_(JStage::TActor *param_1, JStudio::TAdaptor *param_2) { + f32 val = (param_1->*mGetter)(); + param_2->adaptor_setVariableValue_immediate(mValueIndex, val); + } + #else /* 8028B064 */ void operator()(f32, JStudio::TAdaptor*) const; /* 8028B138 */ ~TVVOutput_ANIMATION_FRAME_(); + + void* vtable; + #endif + + bool isEnd_() { return mValueIndex == -1; } + + /* 0x04 */ int mValueIndex; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ Setter mSetter; + /* 0x18 */ Getter mGetter; + /* 0x24 */ MaxGetter mMaxGetter; }; /* 8028A5F0 */ TAdaptor_actor(JStage::TSystem const*, JStage::TActor*); @@ -78,20 +163,28 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T /* 8028AD38 */ void setJSG_SRT_(JStudio::TControl const*); /* 8028AECC */ void getJSG_SRT_(JStudio::TControl const*); + JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; } + + #ifdef NONMATCHING + static TVVOutputObject saoVVOutput_[2]; + static TVVOutput_ANIMATION_FRAME_ saoVVOutput_ANIMATION_FRAME_[3]; + #else static u8 saoVVOutput_[64]; static u8 saoVVOutput_ANIMATION_FRAME_[144 + 4 /* padding */]; + #endif + /* 0x130 */ u32 field_0x130; /* 0x134 */ u32 field_0x134; /* 0x138 */ u32 field_0x138; - /* 0x13C */ u32 field_0x13c; + /* 0x13C */ JStage::TObject* field_0x13c; /* 0x140 */ u32 field_0x140; - /* 0x144 */ u32 field_0x144; - /* 0x148 */ u8 field_0x148; + /* 0x144 */ u8 field_0x144; + /* 0x148 */ JStage::TObject* field_0x148; /* 0x14C */ u32 field_0x14c; - /* 0x150 */ u32 field_0x150; }; struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight, public TAdaptor_object_ { + typedef JStudio::TObject_ambientLight ObjectType; /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*); /* 8028B6AC */ virtual ~TAdaptor_ambientLight(); @@ -101,10 +194,20 @@ struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight, public TAd /* 8028B804 */ virtual void adaptor_do_update(u32); /* 8028B87C */ virtual void adaptor_do_data(void const*, u32, void const*, u32); - JStage::TObject* get_pJSG_() { return pJSGObject_; } + JStage::TAmbientLight* get_pJSG_() { return (JStage::TAmbientLight*)pJSGObject_; } }; -struct TAdaptor_camera : public JStudio::TAdaptor_camera { +struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object_ { + typedef JStudio::TObject_camera ObjectType; + typedef TVariableValueOutput_object_ TVVOutput; + + enum TEVariableValue { + TECAMERA_6 = 6, + TECAMERA_7 = 7, + TECAMERA_8 = 8, + TECAMERA_9 = 9, + }; + /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); /* 8028B960 */ virtual ~TAdaptor_camera(); /* 8028B9D4 */ virtual void adaptor_do_prepare(); @@ -128,10 +231,26 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera { /* 8028BFBC */ void setJSG_targetPosition_(JStudio::TControl const*); /* 8028C09C */ void getJSG_targetPosition_(JStudio::TControl const*); - static u8 saoVVOutput_[160 + 4 /* padding */]; + JStage::TCamera* get_pJSG_() { return (JStage::TCamera*)pJSGObject_; } + + static TVVOutput saoVVOutput_[5]; + + /* 0x108 */ int field_0x108; + /* 0x10C */ JStage::TObject* field_0x10c; + /* 0x110 */ int field_0x110; + /* 0x114 */ u8 field_0x114; + /* 0x118 */ JStage::TObject* field_0x118; + /* 0x11C */ int field_0x11c; + /* 0x120 */ u8 field_0x120; }; -struct TAdaptor_fog : public JStudio::TAdaptor_fog { +struct TAdaptor_fog : public JStudio::TAdaptor_fog, public TAdaptor_object_ { + typedef JStudio::TObject_fog ObjectType; + enum TEVariableValue { + TEFOG_4 = 4, + TEFOG_5 = 5, + }; + /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*); /* 8028C610 */ virtual ~TAdaptor_fog(); /* 8028C684 */ virtual void adaptor_do_prepare(); @@ -140,13 +259,48 @@ struct TAdaptor_fog : public JStudio::TAdaptor_fog { /* 8028C808 */ virtual void adaptor_do_update(u32); /* 8028C880 */ virtual void adaptor_do_data(void const*, u32, void const*, u32); - static u8 saoVVOutput_[96 + 4 /* padding */]; + JStage::TFog* get_pJSG_() { return (JStage::TFog*)pJSGObject_; } + + static TVariableValueOutput_object_ saoVVOutput_[3]; }; -struct TAdaptor_light : public JStudio::TAdaptor_light { - struct TVVOutput_direction_ { - /* 8028D24C */ void operator()(f32, JStudio::TAdaptor*) const; - /* 8028D258 */ ~TVVOutput_direction_(); +struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_ { + typedef JStudio::TObject_light ObjectType; + + enum TEVariableValue { + TE_VALUE_NONE = -1, + TE_VALUE_7 = 7, + TE_VALUE_8 = 8, + TE_VALUE_9 = 9, + TE_VALUE_10 = 10, + TE_VALUE_11 = 11, + }; + enum TEDirection_ { + DIRECTION_0, + DIRECTION_1, + DIRECTION_2, + }; + struct TVVOutput_direction_ : public JStudio::TVariableValue::TOutput { + TVVOutput_direction_() { + field_0x4 = TE_VALUE_NONE; + field_0x8 = DIRECTION_0; + } + TVVOutput_direction_(TEVariableValue param_1, TEDirection_ param_2) { + field_0x4 = param_1; + field_0x8 = param_2; + } + + /* 8028D24C */ virtual void operator()(f32, JStudio::TAdaptor*) const; + /* 8028D258 */ virtual ~TVVOutput_direction_() {} + + void adaptor_setOutput_(TAdaptor* adaptor) { + adaptor->adaptor_referVariableValue(field_0x4)->setOutput(this); + } + + bool isEnd_() { return field_0x4 == -1; } + + TEVariableValue field_0x4; + TEDirection_ field_0x8; }; /* 8028CB50 */ TAdaptor_light(JStage::TSystem const*, JStage::TLight*); @@ -159,7 +313,11 @@ struct TAdaptor_light : public JStudio::TAdaptor_light { /* 8028D228 */ virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, void const*, u32); /* 8028D1B0 */ virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, void const*, u32); - static u8 saoVVOutput_direction_[72]; + JStage::TLight* get_pJSG_() { return (JStage::TLight*)pJSGObject_; } + + int field_0x11c; + + static TVVOutput_direction_ saoVVOutput_direction_[6]; }; /* 8028A1F8 */ bool diff --git a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp index 4dad2edc2c..84c9bf2d47 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -45,7 +45,7 @@ int JStudio::TControl::transformOnSet_setOrigin_TxyzRy(Vec const& param_0, f32 p * transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf */ int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 param_1) { field_0x98 = param_0; - field_0xa8 = param_1; + mTransformOnGet_RotationY = param_1; Mtx afStack_48; MTXTrans(afStack_48, -param_0.x, -param_0.y, -param_0.z); math::rotate_y(mTransformOnGet_Matrix, afStack_48, -param_1); diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index c2ae36e563..5e168ba44e 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -235,7 +235,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT( JStage::TSystem* pJSGSystem = (JStage::TSystem*)pCreateObject_->get_pJSGSystem_(); JUT_ASSERT(396, pJSGSystem != 0); JStage::TObject* pJSGObject; - if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::TOBJ_ACTOR_UNK)) { + if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED)) { JUT_ASSERT(405, pJSGObject != 0); field_0x13c = pJSGObject; } diff --git a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index ec1309c703..3f645a7577 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -183,7 +183,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( const JStage::TSystem* pJSGSystem = pCreateObject_->get_pJSGSystem_(); JUT_ASSERT(345, pJSGSystem!=0); JStage::TObject* pJSGObject; - if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::TOBJ_ACTOR_UNK) == 0) { + if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED) == 0) { JUT_ASSERT(354, pJSGObject!=0); field_0x1d0 = pJSGObject; } diff --git a/libs/JSystem/JStudio/JStudio_JStage/Makefile b/libs/JSystem/JStudio/JStudio_JStage/Makefile index 315f641ff7..3d06799ff3 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/Makefile +++ b/libs/JSystem/JStudio/JStudio_JStage/Makefile @@ -21,6 +21,7 @@ LIBJSTUDIO_JSTAGE_A_O_FILES := \ $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/object-light.o \ LIBJSTUDIO_JSTAGE_A_CFLAGS := \ + -sym on LIBJSTUDIO_JSTAGE_A_LDFLAGS := \ -nodefaults \ diff --git a/libs/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/JStudio/JStudio_JStage/control.cpp index 5cb66df374..51c97b8611 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/control.cpp @@ -4,141 +4,78 @@ // #include "JSystem/JStudio/JStudio_JStage/control.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __dt__Q214JStudio_JStage13TCreateObjectFv(); -extern "C" void -create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); -extern "C" static void func_80289CE4(); -extern "C" static void func_80289DE8(); -extern "C" static void func_80289EEC(); -extern "C" static void func_80289FF0(); -extern "C" static void func_8028A0F4(); - -// -// External References: -// - -extern "C" void __dt__Q27JStudio13TCreateObjectFv(); -extern "C" void -__ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor(); -extern "C" void -__ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight(); -extern "C" void -__ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera(); -extern "C" void -__ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog(); -extern "C" void -__ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light(); -extern "C" void __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor(); -extern "C" void -__ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight(); -extern "C" void __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera(); -extern "C" void __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog(); -extern "C" void __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5720-803C5730 022840 0010+00 1/1 1/1 0/0 .data __vt__Q214JStudio_JStage13TCreateObject */ -SECTION_DATA extern void* __vt__Q214JStudio_JStage13TCreateObject[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q214JStudio_JStage13TCreateObjectFv, - (void*) - create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object, -}; +#include "JSystem/JGadget/pointer.h" +#include "JSystem/JStage/JSGActor.h" +#include "JSystem/JStage/JSGLight.h" +#include "JSystem/JStage/JSGFog.h" +#include "JSystem/JStage/JSGCamera.h" +#include "JSystem/JStage/JSGAmbientLight.h" /* 80289B00-80289B60 284440 0060+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage13TCreateObjectFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TCreateObject::~TCreateObject() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/__dt__Q214JStudio_JStage13TCreateObjectFv.s" +JStudio_JStage::TCreateObject::~TCreateObject() {} + +template +JStudio::TObject* createObject_JSG_(const JStudio::stb::data::TParse_TBlock_object& param_1, + JStage::TObject* param_2, const JStage::TSystem* param_3) { + ObjectT* objt = (ObjectT*)param_2; + AdaptorT* pAdaptor = new AdaptorT(param_3, objt); + if (pAdaptor == NULL) { + return NULL; + } + JGadget::TPointer_delete adaptorGuard(pAdaptor); + JStudio::TObject* pObj = JStudio::TCreateObject::createFromAdaptor(param_1, pAdaptor); + if (pObj == NULL) { + return NULL; + } + adaptorGuard.set(NULL); + return pObj; } -#pragma pop /* 80289B60-80289CE4 2844A0 0184+00 1/0 0/0 0/0 .text * create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool -JStudio_JStage::TCreateObject::create(JStudio::TObject** param_0, - JStudio::stb::data::TParse_TBlock_object const& param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_80289B60.s" +bool JStudio_JStage::TCreateObject::create( + JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) { + JUT_ASSERT(83, ppObject!=0); + *ppObject = NULL; + ObjCreateFuncT pfnCreateObject; + JStage::TEObject eObject; + switch(rParse.get_type()) { + case 'JACT': + pfnCreateObject = createObject_JSG_; + eObject = JStage::OBJECT_ACTOR; + break; + case 'JCMR': + pfnCreateObject = createObject_JSG_; + eObject = JStage::OBJECT_CAMERA; + break; + case 'JABL': + pfnCreateObject = createObject_JSG_; + eObject = JStage::OBJECT_AMBIENT; + break; + case 'JLIT': + pfnCreateObject = createObject_JSG_; + eObject = JStage::OBJECT_LIGHT; + break; + case 'JFOG': + pfnCreateObject = createObject_JSG_; + eObject = JStage::OBJECT_FOG; + break; + default: + return NULL; + } + JUT_ASSERT(99, pfnCreateObject!=0); + JUT_ASSERT(100, eObject!=JStage::OBJECT_UNDEFINED); + JUT_ASSERT(109, pJSGSystem_!=0); + JStage::TObject* pJSGObject; + int pJVar2 = pJSGSystem_->JSGFindObject(&pJSGObject, (char const*)rParse.get_ID(), eObject); + switch(pJVar2) { + case 0: + JUT_ASSERT(115, pJSGObject!=0); + *ppObject = pfnCreateObject(rParse, pJSGObject, pJSGSystem_); + return true; + case 2: + return true; + } + return false; } -#pragma pop - -/* 80289CE4-80289DE8 284624 0104+00 1/1 0/0 0/0 .text - * createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80289CE4() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_80289CE4.s" -} -#pragma pop - -/* 80289DE8-80289EEC 284728 0104+00 1/1 0/0 0/0 .text - * createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80289DE8() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_80289DE8.s" -} -#pragma pop - -/* 80289EEC-80289FF0 28482C 0104+00 1/1 0/0 0/0 .text - * createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80289EEC() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_80289EEC.s" -} -#pragma pop - -/* 80289FF0-8028A0F4 284930 0104+00 1/1 0/0 0/0 .text - * createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80289FF0() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_80289FF0.s" -} -#pragma pop - -/* 8028A0F4-8028A1F8 284A34 0104+00 1/1 0/0 0/0 .text - * createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028A0F4() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/control/func_8028A0F4.s" -} -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 7286cdac4d..8f5ffbb9e2 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -247,18 +247,27 @@ SECTION_DATA extern void* __vt__Q214JStudio_JStage14TAdaptor_actor[20 + 20 /* pa /* 8028A5F0-8028A6B4 284F30 00C4+00 0/0 1/1 0/0 .text * __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_actor::TAdaptor_actor(JStage::TSystem const* param_0, - JStage::TActor* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A5F0.s" +JStudio_JStage::TAdaptor_actor::TAdaptor_actor(JStage::TSystem const* param_1, + JStage::TActor* param_2) : + TAdaptor_object_(param_1,param_2) { + field_0x130 = 0; + field_0x134 = 0; + field_0x138 = 0; + field_0x13c = NULL; + field_0x140 = -1; + field_0x144 = 0; + field_0x148 = NULL; + field_0x14c = -1; } -#pragma pop /* 8028A6B4-8028A728 284FF4 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage14TAdaptor_actorFv */ +// Matches with vtable +#ifdef NONMATCHING +JStudio_JStage::TAdaptor_actor::~TAdaptor_actor() { + adaptor_do_end(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -268,6 +277,7 @@ extern "C" asm void __dt__Q214JStudio_JStage14TAdaptor_actorFv() { #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/__dt__Q214JStudio_JStage14TAdaptor_actorFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80431188-80431194 05DEA8 000C+00 1/1 0/0 0/0 .bss @1087 */ @@ -281,7 +291,11 @@ static u8 lit_1088[12]; /* 804311A0-804311E0 05DEC0 0040+00 2/3 0/0 0/0 .bss * saoVVOutput___Q214JStudio_JStage14TAdaptor_actor */ +#ifdef NONMATCHING +JStudio_JStage::TAdaptor_actor::TVVOutputObject JStudio_JStage::TAdaptor_actor::saoVVOutput_[2]; +#else u8 JStudio_JStage::TAdaptor_actor::saoVVOutput_[64]; +#endif /* 804311E0-804311EC 05DF00 000C+00 0/1 0/0 0/0 .bss @1095 */ #pragma push @@ -303,10 +317,30 @@ static u8 lit_1103[12]; /* 80431204-80431298 05DF24 0090+04 2/3 0/0 0/0 .bss * saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor */ +#ifdef NONMATCHING +JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_ JStudio_JStage::TAdaptor_actor::saoVVOutput_ANIMATION_FRAME_[3]; +#else u8 JStudio_JStage::TAdaptor_actor::saoVVOutput_ANIMATION_FRAME_[144 + 4 /* padding */]; +#endif /* 8028A728-8028A7B4 285068 008C+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_actorFv */ +// Matches with output variable +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() { + TVVOutputObject* pOutput = saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->adaptor_setOutput_(this); + pOutput++; + } + + TVVOutput_ANIMATION_FRAME_* pAnimOutput = saoVVOutput_ANIMATION_FRAME_; + while (!pAnimOutput->isEnd_()) { + pAnimOutput->adaptor_setOutput_(this); + pAnimOutput++; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -315,9 +349,34 @@ asm void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() { #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_actorFv.s" } #pragma pop +#endif /* 8028A7B4-8028A8D8 2850F4 0124+00 1/0 0/0 0/0 .text * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_actorFv */ +// instruction order +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() { + adaptor_object_begin_(); + JStage::TActor* pActor = get_pJSG_(); + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(72, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(74, pControl != 0); + getJSG_SRT_(adaptor_getObject()->getControl()); + + TVVOutputObject* pOutput = saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->setVariableValue_(pActor, this); + pOutput++; + } + + TVVOutput_ANIMATION_FRAME_* pAnimOutput = saoVVOutput_ANIMATION_FRAME_; + while (!pAnimOutput->isEnd_()) { + pAnimOutput->setVariableValue_(pActor, this); + pAnimOutput++; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -326,43 +385,41 @@ asm void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() { #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_begin__Q214JStudio_JStage14TAdaptor_actorFv.s" } #pragma pop +#endif /* 8028A8D8-8028A92C 285218 0054+00 1/0 0/0 0/0 .text * adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_end() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_end() { + adaptor_object_end_(); } -#pragma pop /* 8028A92C-8028A974 28526C 0048+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) { + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(104, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(106, pControl != 0); + setJSG_SRT_(pControl); + pJSGObject_->JSGUpdate(); } -#pragma pop /* 8028A974-8028A998 2852B4 0024+00 1/0 0/0 0/0 .text * adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_data(void const* param_0, u32 param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_data(void const* param_1, u32 param_2, + void const* param_3, u32 param_4) { + adaptor_object_data_(param_1, param_2, param_3, param_4); } -#pragma pop /* 8028A998-8028A9F0 2852D8 0058+00 1/0 0/0 0/0 .text * adaptor_do_SHAPE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ +// Matches with literals +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_actor::adaptor_do_SHAPE(JStudio::data::TEOperationData operation, + void const* param_2, u32 param_3) { + setJSG_ID_(&JStage::TActor::JSGSetShape, operation, param_2, param_3); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -372,9 +429,17 @@ asm void JStudio_JStage::TAdaptor_actor::adaptor_do_SHAPE(JStudio::data::TEOpera #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A998.s" } #pragma pop +#endif /* 8028A9F0-8028AA48 285330 0058+00 1/0 0/0 0/0 .text * adaptor_do_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ +// Matches with literals +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOperationData operation, + void const* param_2, u32 param_3) { + setJSG_ID_(&JStage::TActor::JSGSetAnimation, operation, param_2, param_3); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -385,24 +450,32 @@ JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOperationD #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028A9F0.s" } #pragma pop +#endif /* 8028AA48-8028AA5C 285388 0014+00 1/0 0/0 0/0 .text * adaptor_do_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA48.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData operation, + void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(153, uSize==4); + JUT_ASSERT(154, pContent!=0); + field_0x130 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028AA5C-8028AAB4 28539C 0058+00 1/0 0/0 0/0 .text * adaptor_do_TEXTURE_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ +// Matches with literals +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData operation, + void const* param_2, u32 param_3) { + setJSG_ID_(&JStage::TActor::JSGSetTextureAnimation, operation, param_2, param_3); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -413,172 +486,274 @@ JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOp #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AA5C.s" } #pragma pop +#endif /* 8028AAB4-8028AAC8 2853F4 0014+00 1/0 0/0 0/0 .text * adaptor_do_TEXTURE_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAB4.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(182, uSize==4); + JUT_ASSERT(183, pContent!=0); + field_0x134 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028AAC8-8028AB0C 285408 0044+00 1/0 0/0 0/0 .text * adaptor_do_PARENT__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AAC8.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(203, pContent!=0); + JUT_ASSERT(204, uSize!=0); + field_0x13c = adaptor_object_findJSGObject_((const char*)pContent); + break; + } } -#pragma pop /* 8028AB0C-8028AB68 28544C 005C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB0C.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(226, pContent!=0); + JUT_ASSERT(227, uSize!=0); + field_0x140 = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent); + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(237, uSize==4); + JUT_ASSERT(238, pContent!=0); + field_0x140 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028AB68-8028ABF0 2854A8 0088+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AB68.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(257, uSize==4); + JUT_ASSERT(258, pContent!=0); + bool v0 = (*(u32*)pContent != 0); + if (field_0x144 != v0) { + field_0x144 = v0; + switch (field_0x138) { + case 0: + break; + case 1: + JStage::TObject* object = NULL; + u32 v1 = -1; + if (v0 != 0) { + object = field_0x13c; + v1 = field_0x140; + } + pJSGObject_->JSGSetParent(object, v1); + break; + } + } + break; + } } -#pragma pop /* 8028ABF0-8028AC04 285530 0014+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ABF0.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(303, uSize==4); + JUT_ASSERT(304, pContent!=0); + field_0x138 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028AC04-8028AC48 285544 0044+00 1/0 0/0 0/0 .text * adaptor_do_RELATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC04.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(324, pContent!=0); + JUT_ASSERT(325, uSize!=0); + field_0x148 = adaptor_object_findJSGObject_((const char*)pContent); + break; + } } -#pragma pop /* 8028AC48-8028ACA4 285588 005C+00 1/0 0/0 0/0 .text * adaptor_do_RELATION_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028AC48.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(347, pContent!=0); + JUT_ASSERT(348, uSize!=0); + field_0x14c = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent); + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(358, uSize==4); + JUT_ASSERT(359, pContent!=0); + field_0x14c = *(u32*)pContent; + break; + } } -#pragma pop /* 8028ACA4-8028ACFC 2855E4 0058+00 1/0 0/0 0/0 .text * adaptor_do_RELATION_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACA4.s" +void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( + JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(378, uSize==4); + JUT_ASSERT(379, pContent!=0); + pJSGObject_->JSGSetRelation(*(u32*)pContent, field_0x148, field_0x14c); + break; + } } -#pragma pop /* 8028ACFC-8028AD38 28563C 003C+00 3/3 0/0 0/0 .text * setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*param_0)(u32), - JStudio::data::TEOperationData param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028ACFC.s" +void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*function)(u32), + JStudio::data::TEOperationData operation, + void const* pContent, u32 uSize) { + switch (operation) { + case JStudio::data::UNK_0x19: + (((JStage::TActor*)pJSGObject_)->*function)(*(u32*)pContent); + break; + } } -#pragma pop /* 8028AD38-8028AECC 285678 0194+00 1/1 0/0 0/0 .text * setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::setJSG_SRT_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s" +void JStudio_JStage::TAdaptor_actor::setJSG_SRT_(JStudio::TControl const* pControl) { + JStudio::TControl::TTransform_translation_rotation_scaling transform; + JStudio::TControl::TTransform_translation_rotation_scaling multipliedTransform; + adaptor_getVariableValue_Vec(&transform.translation, sauVariableValue_3_TRANSLATION_XYZ); + adaptor_getVariableValue_Vec(&transform.rotation, sauVariableValue_3_ROTATION_XYZ); + adaptor_getVariableValue_Vec(&transform.scaling, sauVariableValue_3_SCALING_XYZ); + JStudio::TControl::TTransform_translation_rotation_scaling* pTransform; + if (field_0x144 == 0) { + pTransform = pControl->transformOnSet_transform_ifEnabled(&transform, &multipliedTransform); + } else { + pTransform = &transform; + switch (field_0x138) { + case 0: { + Mtx mtx; + bool check; + if (!transform_toGlobalFromLocal(mtx, *pTransform, field_0x13c, field_0x140)) { + check = false; + } else { + JStudio::math::getFromTransformation_SRxyzT( + &multipliedTransform.scaling, &multipliedTransform.rotation, + &multipliedTransform.translation, mtx); + check = true; + } + + if (!check) { + return; + } + pTransform = &multipliedTransform; + break; + } + case 1: + break; + } + } + JStage::TActor* pActor = get_pJSG_(); + pActor->JSGSetTranslation(pTransform->translation); + pActor->JSGSetRotation(pTransform->rotation); + pActor->JSGSetScaling(pTransform->scaling); } -#pragma pop /* 8028AECC-8028B064 28580C 0198+00 1/1 0/0 0/0 .text * getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::getJSG_SRT_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl.s" -} -#pragma pop +void JStudio_JStage::TAdaptor_actor::getJSG_SRT_(JStudio::TControl const* pControl) { + JStudio::TControl::TTransform_translation_rotation_scaling transform; + JStudio::TControl::TTransform_translation_rotation_scaling trs; + Mtx mtx; + JStage::TActor* pActor = get_pJSG_(); + pActor->JSGGetTranslation(&transform.translation); + pActor->JSGGetRotation(&transform.rotation); + pActor->JSGGetScaling(&transform.scaling); -/* ############################################################################################## */ -/* 804554E0-804554E8 003AE0 0004+04 1/1 0/0 0/0 .sdata2 @1081 */ -SECTION_SDATA2 static f32 lit_1081[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; + JStudio::TControl::TTransform_translation_rotation_scaling* outTransform; + if (!field_0x144) { + outTransform = pControl->transformOnGet_transform_ifEnabled(&transform, &trs); + } else { + outTransform = &transform; + switch (field_0x138) { + case 1: + break; + case 0: + bool check; + if (!transform_toLocalFromGlobal(mtx, *outTransform, field_0x13c, field_0x140)) { + check = false; + } else { + JStudio::math::getFromTransformation_SRxyzT(&trs.scaling, &trs.rotation, + &trs.translation, mtx); + check = true; + } + + if (!check) { + return; + } + outTransform = &trs; + break; + } + } + + adaptor_setVariableValue_Vec(sauVariableValue_3_TRANSLATION_XYZ, + outTransform->translation); + adaptor_setVariableValue_Vec(sauVariableValue_3_ROTATION_XYZ, outTransform->rotation); + adaptor_setVariableValue_Vec(sauVariableValue_3_SCALING_XYZ, outTransform->scaling); +} /* 8028B064-8028B138 2859A4 00D4+00 1/0 0/0 0/0 .text * __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStudio8TAdaptor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()( - f32 param_0, JStudio::TAdaptor* param_1) const { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B064.s" +void JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()( + f32 param_1, JStudio::TAdaptor* adaptor) const { + JStage::TActor* actor = static_cast(adaptor)->get_pJSG_(); + // not sure what this bit is + u32 idx = *(u32*)(((u32)adaptor - 1) + field_0x8); + + u8 idx_lowBytes = idx; + u8 idx_highBytes = idx >> 8; + + f32 maxVal = (actor->*mMaxGetter)(); + switch (idx_highBytes) { + case 1: + param_1 = maxVal - param_1; + break; + case 0: + break; + } + + if (maxVal > 0.0f) { + param_1 = (f32)(*JStudio::TFunctionValue::toFunction_outside(idx_lowBytes))(param_1, maxVal); + } + (actor->*mSetter)(param_1); } -#pragma pop /* 8028B138-8028B198 285A78 0060+00 2/1 0/0 0/0 .text * __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv */ +#ifdef NONMATCHING +JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMATION_FRAME_() { +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -587,6 +762,7 @@ asm JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMA #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803C5864-803C5888 022984 0010+14 2/2 0/0 0/0 .data diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp index 23775e9678..0dea11a745 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp @@ -25,7 +25,7 @@ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_prepare() { * adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv */ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_begin() { adaptor_object_begin_(); - GXColor color = ((JStage::TAmbientLight*)get_pJSG_())->JSGGetColor(); + GXColor color = get_pJSG_()->JSGGetColor(); adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, color); } @@ -38,7 +38,7 @@ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_end() { /* 8028B804-8028B87C 286144 0078+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl */ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(u32 param_1) { - JStage::TAmbientLight* lightObj = (JStage::TAmbientLight*)get_pJSG_(); + JStage::TAmbientLight* lightObj = get_pJSG_(); GXColor color; adaptor_getVariableValue_GXColor(&color, sauVariableValue_4_COLOR_RGBA); lightObj->JSGSetColor(color); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp index 14380f404a..cddb9dfe2c 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -1,489 +1,333 @@ // -// Generated By: dol2asm -// Translation Unit: object-camera +// object-camera // #include "JSystem/JStudio/JStudio_JStage/object-camera.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera(); -extern "C" void __dt__Q214JStudio_JStage15TAdaptor_cameraFv(); -extern "C" void adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv(); -extern "C" void adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv(); -extern "C" void adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv(); -extern "C" void adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl(); -extern "C" void adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl(); -extern "C" void -adaptor_do_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); -extern "C" void getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); -extern "C" void setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); -extern "C" void getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); -extern "C" void func_8028C180(); -extern "C" void func_8028C4E4(void* _this); -extern "C" void func_8028C544(void* _this, f32, JStudio::TAdaptor*); -extern "C" u8 saoVVOutput___Q214JStudio_JStage15TAdaptor_camera[160 + 4 /* padding */]; - -// -// External References: -// - -extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); -extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); -extern "C" void adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec(); -extern "C" void adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl(); -extern "C" void __dt__Q27JStudio15TAdaptor_cameraFv(); -extern "C" void -transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl(); -extern "C" void -transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl(); -extern "C" void adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl(); -extern "C" void adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc(); -extern "C" void -adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc(); -extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio15TAdaptor_camera[15]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C58A8-803C58B4 0229C8 000C+00 1/1 0/0 0/0 .data @1014 */ -SECTION_DATA static u8 lit_1014[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803C58B4-803C58C0 0229D4 000C+00 0/1 0/0 0/0 .data @1015 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1015[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58C0-803C58CC 0229E0 000C+00 0/1 0/0 0/0 .data @1019 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1019[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58CC-803C58D8 0229EC 000C+00 0/1 0/0 0/0 .data @1020 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1020[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58D8-803C58E4 0229F8 000C+00 0/1 0/0 0/0 .data @1024 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1024[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58E4-803C58F0 022A04 000C+00 0/1 0/0 0/0 .data @1025 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1025[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58F0-803C58FC 022A10 000C+00 0/1 0/0 0/0 .data @1029 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1029[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C58FC-803C5908 022A1C 000C+00 0/1 0/0 0/0 .data @1030 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_1030[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C5908-803C5980 022A28 003C+3C 2/2 0/0 0/0 .data __vt__Q214JStudio_JStage15TAdaptor_camera */ -SECTION_DATA extern void* __vt__Q214JStudio_JStage15TAdaptor_camera[15 + 15 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q214JStudio_JStage15TAdaptor_cameraFv, - (void*)adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv, - (void*)adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv, - (void*)adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv, - (void*)adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl, - (void*)adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl, - (void*) - adaptor_do_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl, - /* padding */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; /* 8028B8A0-8028B960 2861E0 00C0+00 0/0 1/1 0/0 .text * __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_camera::TAdaptor_camera(JStage::TSystem const* param_0, - JStage::TCamera* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028B8A0.s" +JStudio_JStage::TAdaptor_camera::TAdaptor_camera(JStage::TSystem const* param_1, + JStage::TCamera* param_2) + : TAdaptor_object_(param_1, param_2) { + field_0x108 = 0; + field_0x10c = 0; + field_0x110 = -1; + field_0x114 = 0; + field_0x118 = 0; + field_0x11c = -1; + field_0x120 = 0; } -#pragma pop /* 8028B960-8028B9D4 2862A0 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage15TAdaptor_cameraFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() { -extern "C" asm void __dt__Q214JStudio_JStage15TAdaptor_cameraFv() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s" +JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() { + adaptor_do_end(); } -#pragma pop - -/* ############################################################################################## */ -/* 80431298-804312A4 05DFB8 000C+00 1/1 0/0 0/0 .bss @1018 */ -static u8 lit_1018[12]; - -/* 804312A4-804312B0 05DFC4 000C+00 0/1 0/0 0/0 .bss @1023 */ -#pragma push -#pragma force_active on -static u8 lit_1023[12]; -#pragma pop - -/* 804312B0-804312BC 05DFD0 000C+00 0/1 0/0 0/0 .bss @1028 */ -#pragma push -#pragma force_active on -static u8 lit_1028[12]; -#pragma pop - -/* 804312BC-804312C8 05DFDC 000C+00 0/1 0/0 0/0 .bss @1033 */ -#pragma push -#pragma force_active on -static u8 lit_1033[12]; -#pragma pop - -/* 804312C8-804312D4 05DFE8 000C+00 0/1 0/0 0/0 .bss @1034 */ -#pragma push -#pragma force_active on -static u8 lit_1034[12]; -#pragma pop /* 804312D4-80431378 05DFF4 00A0+04 2/3 0/0 0/0 .bss * saoVVOutput___Q214JStudio_JStage15TAdaptor_camera */ -u8 JStudio_JStage::TAdaptor_camera::saoVVOutput_[160 + 4 /* padding */]; +JStudio_JStage::TAdaptor_camera::TVVOutput JStudio_JStage::TAdaptor_camera::saoVVOutput_[5] = { + TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_7, &JStage::TCamera::JSGSetViewRoll, + &JStage::TCamera::JSGGetViewRoll), + TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_6, &JStage::TCamera::JSGSetProjectionFovy, + &JStage::TCamera::JSGGetProjectionFovy), + TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_8, &JStage::TCamera::JSGSetProjectionNear, + &JStage::TCamera::JSGGetProjectionNear), + TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_9, &JStage::TCamera::JSGSetProjectionFar, + &JStage::TCamera::JSGGetProjectionFar), + TVVOutput(), +}; /* 8028B9D4-8028BA1C 286314 0048+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_prepare() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_prepare() { + TVVOutput* pOutput = saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->adaptor_setOutput_(this); + pOutput++; + } } -#pragma pop /* 8028BA1C-8028BAF8 28635C 00DC+00 1/0 0/0 0/0 .text * adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() { + adaptor_object_begin_(); + JStage::TCamera* pCamera = get_pJSG_(); + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(70, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(72, pControl != 0); + getJSG_position_(pControl); + getJSG_targetPosition_(pControl); + TVVOutput* pOutput = saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->setVariableValue_(pCamera, this); + pOutput++; + } } -#pragma pop /* 8028BAF8-8028BB4C 286438 0054+00 1/0 0/0 0/0 .text * adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_end() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_end() { + adaptor_object_end_(); } -#pragma pop /* 8028BB4C-8028BBAC 28648C 0060+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) { + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(98, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(100, pControl != 0); + setJSG_position_(pControl); + setJSG_targetPosition_(pControl); + pJSGObject_->JSGUpdate(); } -#pragma pop /* 8028BBAC-8028BBD0 2864EC 0024+00 1/0 0/0 0/0 .text * adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_data(void const* param_0, u32 param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_data(void const* param_1, u32 param_2, + void const* param_3, u32 param_4) { + adaptor_object_data_(param_1, param_2, param_3, param_4); } -#pragma pop /* 8028BBD0-8028BC14 286510 0044+00 1/0 0/0 0/0 .text * adaptor_do_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BBD0.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch(param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(132, pContent!=0); + JUT_ASSERT(133, uSize!=0); + field_0x10c = adaptor_object_findJSGObject_((char*)pContent); + break; + } } -#pragma pop /* 8028BC14-8028BC70 286554 005C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC14.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(155, pContent!=0); + JUT_ASSERT(156, uSize!=0); + field_0x110 = adaptor_object_findJSGObjectNode_(field_0x10c, (char*)pContent); + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(166, uSize==4); + JUT_ASSERT(167, pContent!=0); + field_0x110 = *(int*)pContent; + break; + } } -#pragma pop /* 8028BC70-8028BCEC 2865B0 007C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BC70.s" +void +JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(185, uSize==4); + JUT_ASSERT(186, pContent!=0); + field_0x114 = *(u32*)pContent ? 1 : 0; + switch(field_0x108) { + case 1: + JStage::TObject* parent = 0; + int idx = -1; + if (field_0x114 != 0) { + parent = field_0x10c; + idx = field_0x110; + } + pJSGObject_->JSGSetParent(parent, idx); + break; + case 0: + break; + } + break; + } } -#pragma pop /* 8028BCEC-8028BD00 28662C 0014+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BCEC.s" +void +JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch(param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(226, uSize==4); + JUT_ASSERT(227, pContent!=0); + field_0x108 = *(int*)pContent; + break; + } } -#pragma pop /* 8028BD00-8028BD44 286640 0044+00 1/0 0/0 0/0 .text * adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD00.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch(param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(247, pContent!=0); + JUT_ASSERT(248, uSize!=0); + field_0x118 = adaptor_object_findJSGObject_((char*)pContent); + break; + } } -#pragma pop /* 8028BD44-8028BDA0 286684 005C+00 1/0 0/0 0/0 .text * adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BD44.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(270, pContent!=0); + JUT_ASSERT(271, uSize!=0); + field_0x11c = adaptor_object_findJSGObjectNode_(field_0x118, (char*)pContent); + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(282, uSize==4); + JUT_ASSERT(283, pContent!=0); + field_0x11c = *(int*)pContent; + break; + } } -#pragma pop /* 8028BDA0-8028BDBC 2866E0 001C+00 1/0 0/0 0/0 .text * adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDA0.s" +void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch(param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(301, uSize==4); + JUT_ASSERT(302, pContent!=0); + field_0x120 = *(int*)pContent ? 1 : 0; + break; + } } -#pragma pop /* 8028BDBC-8028BEB8 2866FC 00FC+00 1/1 0/0 0/0 .text * setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BDBC.s" +void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const* param_1) { + JStudio::TControl::TTransform_position VStack_138; + JStudio::TControl::TTransform_position VStack_144; + adaptor_getVariableValue_Vec(&VStack_138, sauVariableValue_3_POSITION_XYZ); + Vec* pViewPosition; + if (field_0x114 == 0) { + pViewPosition = param_1->transformOnSet_transform_ifEnabled(&VStack_138, &VStack_144); + } else { + pViewPosition = &VStack_138; + switch (field_0x108) { + case 0: + int iVar1 = + transform_toGlobalFromLocal(&VStack_144, VStack_138, field_0x10c, field_0x110); + if (iVar1 == 0) { + return; + } + pViewPosition = &VStack_144; + break; + case 1: + break; + } + } + get_pJSG_()->JSGSetViewPosition(*pViewPosition); } -#pragma pop /* 8028BEB8-8028BFBC 2867F8 0104+00 1/1 0/0 0/0 .text * getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::getJSG_position_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BEB8.s" +void JStudio_JStage::TAdaptor_camera::getJSG_position_(JStudio::TControl const* param_1) { + Mtx mtx; + JStudio::TControl::TTransform_position transform; + JStudio::TControl::TTransform_position tempTransform; + JStudio::TControl::TTransform_position* outTransform; + + get_pJSG_()->JSGGetViewPosition(&transform); + + if (!field_0x114) { + outTransform = param_1->transformOnGet_transform_ifEnabled(&transform, &tempTransform); + } else { + outTransform = &transform; + switch (field_0x108) { + case 0: + bool check; + if (!transform_toLocalFromGlobal(mtx, *outTransform, field_0x10c, field_0x110)) { + check = false; + } else { + tempTransform.x = mtx[0][3]; + tempTransform.y = mtx[1][3]; + tempTransform.z = mtx[2][3]; + check = true; + } + + if (!check) { + return; + } + outTransform = &tempTransform; + break; + case 1: + break; + } + } + + adaptor_setVariableValue_Vec(sauVariableValue_3_POSITION_XYZ, *outTransform); } -#pragma pop /* 8028BFBC-8028C09C 2868FC 00E0+00 1/1 0/0 0/0 .text * setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::setJSG_targetPosition_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028BFBC.s" +void JStudio_JStage::TAdaptor_camera::setJSG_targetPosition_(JStudio::TControl const* param_1) { + JStudio::TControl::TTransform_position transform; + JStudio::TControl::TTransform_position tempTransform; + JStudio::TControl::TTransform_position* outTransform; + adaptor_getVariableValue_Vec(&transform, sauVariableValue_3_TARGET_POSITION_XYZ); + if (field_0x120 == 0) { + outTransform = param_1->transformOnSet_transform_ifEnabled( + &transform, &tempTransform); + } else { + if (transform_toGlobalFromLocal(&tempTransform, transform, + field_0x118, field_0x11c) == 0) { + return; + } + outTransform = &tempTransform; + } + get_pJSG_()->JSGSetViewTargetPosition(*outTransform); } -#pragma pop /* 8028C09C-8028C180 2869DC 00E4+00 1/1 0/0 0/0 .text * getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_camera::getJSG_targetPosition_(JStudio::TControl const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C09C.s" +void JStudio_JStage::TAdaptor_camera::getJSG_targetPosition_(JStudio::TControl const* param_1) { + Mtx mtx; + JStudio::TControl::TTransform_position transform; + JStudio::TControl::TTransform_position tempTransform; + JStudio::TControl::TTransform_position* outTransform; + + get_pJSG_()->JSGGetViewTargetPosition(&transform); + + if (!field_0x120) { + outTransform = param_1->transformOnGet_transform_ifEnabled(&transform, &tempTransform); + } else { + outTransform = &transform; + bool check; + if (!transform_toLocalFromGlobal(mtx, *outTransform, field_0x118, field_0x11c)) { + check = false; + } else { + tempTransform.x = mtx[0][3]; + tempTransform.y = mtx[1][3]; + tempTransform.z = mtx[2][3]; + check = true; + } + + if (!check) { + return; + } + outTransform = &tempTransform; + } + + adaptor_setVariableValue_Vec(sauVariableValue_3_TARGET_POSITION_XYZ, *outTransform); } -#pragma pop - -/* ############################################################################################## */ -/* 803C5980-803C59A0 022AA0 0010+10 2/2 0/0 0/0 .data - * __vt__Q214JStudio_JStage83TVariableValueOutput_object_ - */ -SECTION_DATA extern void* data_803C5980[4 + 4 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)func_8028C544, - (void*)func_8028C4E4, - /* padding */ - NULL, - NULL, - NULL, - NULL, -}; - -/* 8028C180-8028C4E4 286AC0 0364+00 0/0 1/0 0/0 .text __sinit_object-camera_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_8028C180() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C180.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8028C180, func_8028C180); -#pragma pop - -/* 8028C4E4-8028C544 286E24 0060+00 2/1 0/0 0/0 .text - * __dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8028C4E4(void* _this) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s" -} -#pragma pop - -/* 8028C544-8028C574 286E84 0030+00 1/0 0/0 0/0 .text - * __cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8028C544(void* _this, f32 param_0, - JStudio::TAdaptor* param_1) /* const */ { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s" -} -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp index 2506af5389..17b773de4f 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp @@ -1,259 +1,71 @@ // -// Generated By: dol2asm -// Translation Unit: object-fog +// object-fog // #include "JSystem/JStudio/JStudio_JStage/object-fog.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog(); -extern "C" void __dt__Q214JStudio_JStage12TAdaptor_fogFv(); -extern "C" void adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv(); -extern "C" void adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv(); -extern "C" void adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv(); -extern "C" void adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl(); -extern "C" void adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl(); -extern "C" void func_8028C8A4(); -extern "C" void func_8028CAC0(void* _this); -extern "C" void func_8028CB20(void* _this, f32, JStudio::TAdaptor*); -extern "C" u8 saoVVOutput___Q214JStudio_JStage12TAdaptor_fog[96 + 4 /* padding */]; - -// -// External References: -// - -extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); -extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); -extern "C" void adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor(); -extern "C" void adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl(); -extern "C" void __dt__Q27JStudio12TAdaptor_fogFv(); -extern "C" void adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl(); -extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog[16]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio12TAdaptor_fog[8]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C59A0-803C59AC 022AC0 000C+00 1/1 0/0 0/0 .data @844 */ -SECTION_DATA static u8 lit_844[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803C59AC-803C59B8 022ACC 000C+00 0/1 0/0 0/0 .data @845 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_845[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C59B8-803C59C4 022AD8 000C+00 0/1 0/0 0/0 .data @849 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_849[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C59C4-803C59D0 022AE4 000C+00 0/1 0/0 0/0 .data @850 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 lit_850[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 803C59D0-803C5A10 022AF0 0020+20 2/2 0/0 0/0 .data __vt__Q214JStudio_JStage12TAdaptor_fog */ -SECTION_DATA extern void* __vt__Q214JStudio_JStage12TAdaptor_fog[8 + 8 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q214JStudio_JStage12TAdaptor_fogFv, - (void*)adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv, - (void*)adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv, - (void*)adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv, - (void*)adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl, - (void*)adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl, - /* padding */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; /* 8028C574-8028C610 286EB4 009C+00 0/0 1/1 0/0 .text * __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_fog::TAdaptor_fog(JStage::TSystem const* param_0, - JStage::TFog* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C574.s" -} -#pragma pop +JStudio_JStage::TAdaptor_fog::TAdaptor_fog(JStage::TSystem const* param_0, JStage::TFog* param_1) + : TAdaptor_object_(param_0, param_1) {} /* 8028C610-8028C684 286F50 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage12TAdaptor_fogFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() { -extern "C" asm void __dt__Q214JStudio_JStage12TAdaptor_fogFv() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s" +JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() { + adaptor_do_end(); } -#pragma pop - -/* ############################################################################################## */ -/* 80431378-80431384 05E098 000C+00 1/1 0/0 0/0 .bss @848 */ -static u8 lit_848[12]; - -/* 80431384-80431390 05E0A4 000C+00 0/1 0/0 0/0 .bss @853 */ -#pragma push -#pragma force_active on -static u8 lit_853[12]; -#pragma pop - -/* 80431390-8043139C 05E0B0 000C+00 0/1 0/0 0/0 .bss @854 */ -#pragma push -#pragma force_active on -static u8 lit_854[12]; -#pragma pop /* 8043139C-80431400 05E0BC 0060+04 2/3 0/0 0/0 .bss * saoVVOutput___Q214JStudio_JStage12TAdaptor_fog */ -u8 JStudio_JStage::TAdaptor_fog::saoVVOutput_[96 + 4 /* padding */]; +JStudio_JStage::TVariableValueOutput_object_ JStudio_JStage::TAdaptor_fog::saoVVOutput_[3] = { + JStudio_JStage::TVariableValueOutput_object_(JStudio_JStage::TAdaptor_fog::TEFOG_4, &JStage::TFog::JSGSetStartZ, &JStage::TFog::JSGGetStartZ), + JStudio_JStage::TVariableValueOutput_object_(JStudio_JStage::TAdaptor_fog::TEFOG_5, &JStage::TFog::JSGSetEndZ, &JStage::TFog::JSGGetEndZ), + JStudio_JStage::TVariableValueOutput_object_(), +}; /* 8028C684-8028C6CC 286FC4 0048+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_fog::adaptor_do_prepare() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv.s" +void JStudio_JStage::TAdaptor_fog::adaptor_do_prepare() { + TVariableValueOutput_object_* pOutput = + saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->adaptor_setOutput_(this); + pOutput++; + } } -#pragma pop /* 8028C6CC-8028C7B4 28700C 00E8+00 1/0 0/0 0/0 .text * adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_fog::adaptor_do_begin() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv.s" +void JStudio_JStage::TAdaptor_fog::adaptor_do_begin() { + adaptor_object_begin_(); + JStage::TFog* pFog = get_pJSG_(); + adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, pFog->JSGGetColor()); + TVariableValueOutput_object_* pOutput = + saoVVOutput_; + while (!pOutput->isEnd_()) { + pOutput->setVariableValue_(pFog, this); + pOutput++; + } } -#pragma pop /* 8028C7B4-8028C808 2870F4 0054+00 1/0 0/0 0/0 .text * adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_fog::adaptor_do_end() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv.s" +void JStudio_JStage::TAdaptor_fog::adaptor_do_end() { + adaptor_object_end_(); } -#pragma pop /* 8028C808-8028C880 287148 0078+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_fog::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl.s" +void JStudio_JStage::TAdaptor_fog::adaptor_do_update(u32 param_1) { + JStage::TFog* pFog = get_pJSG_(); + GXColor color; + adaptor_getVariableValue_GXColor(&color, sauVariableValue_4_COLOR_RGBA); + pFog->JSGSetColor(color); + pJSGObject_->JSGUpdate(); } -#pragma pop /* 8028C880-8028C8A4 2871C0 0024+00 1/0 0/0 0/0 .text * adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_fog::adaptor_do_data(void const* param_0, u32 param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl.s" +void JStudio_JStage::TAdaptor_fog::adaptor_do_data(void const* param_1, u32 param_2, + void const* param_3, u32 param_4) { + adaptor_object_data_(param_1, param_2, param_3, param_4); } -#pragma pop - -/* ############################################################################################## */ -/* 803C5A10-803C5A30 022B30 0010+10 2/2 0/0 0/0 .data - * __vt__Q214JStudio_JStage77TVariableValueOutput_object_ - */ -SECTION_DATA extern void* data_803C5A10[4 + 4 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)func_8028CB20, - (void*)func_8028CAC0, - /* padding */ - NULL, - NULL, - NULL, - NULL, -}; - -/* 8028C8A4-8028CAC0 2871E4 021C+00 0/0 1/0 0/0 .text __sinit_object-fog_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_8028C8A4() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028C8A4.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8028C8A4, func_8028C8A4); -#pragma pop - -/* 8028CAC0-8028CB20 287400 0060+00 2/1 0/0 0/0 .text - * __dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8028CAC0(void* _this) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s" -} -#pragma pop - -/* 8028CB20-8028CB50 287460 0030+00 1/0 0/0 0/0 .text - * __cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8028CB20(void* _this, f32 param_0, - JStudio::TAdaptor* param_1) /* const */ { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s" -} -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index bba5a4b2d6..e4b3f74323 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -55,107 +55,51 @@ extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; extern "C" u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5A30-803C5A40 022B50 0010+00 2/2 0/0 0/0 .data - * __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_ */ -SECTION_DATA extern void* __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor, - (void*)__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv, -}; - -/* 803C5A40-803C5A68 022B60 0028+00 2/2 0/0 0/0 .data __vt__Q214JStudio_JStage14TAdaptor_light */ -SECTION_DATA extern void* __vt__Q214JStudio_JStage14TAdaptor_light[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q214JStudio_JStage14TAdaptor_lightFv, - (void*)adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv, - (void*)adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv, - (void*)adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv, - (void*)adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl, - (void*)adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl, - (void*) - adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl, -}; - /* 8028CB50-8028CBF4 287490 00A4+00 0/0 1/1 0/0 .text * __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_light::TAdaptor_light(JStage::TSystem const* param_0, - JStage::TLight* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028CB50.s" +JStudio_JStage::TAdaptor_light::TAdaptor_light(JStage::TSystem const* param_1, + JStage::TLight* param_2) + : JStudio_JStage::TAdaptor_object_(param_1, param_2) { + field_0x11c = 0; } -#pragma pop /* 8028CBF4-8028CC68 287534 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage14TAdaptor_lightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_light::~TAdaptor_light() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q214JStudio_JStage14TAdaptor_lightFv.s" +JStudio_JStage::TAdaptor_light::~TAdaptor_light() { + adaptor_do_end(); } -#pragma pop - -/* ############################################################################################## */ -/* 80431400-8043140C 05E120 000C+00 1/1 0/0 0/0 .bss @930 */ -static u8 lit_930[12]; - -/* 8043140C-80431418 05E12C 000C+00 0/1 0/0 0/0 .bss @931 */ -#pragma push -#pragma force_active on -static u8 lit_931[12]; -#pragma pop - -/* 80431418-80431424 05E138 000C+00 0/1 0/0 0/0 .bss @932 */ -#pragma push -#pragma force_active on -static u8 lit_932[12]; -#pragma pop - -/* 80431424-80431430 05E144 000C+00 0/1 0/0 0/0 .bss @933 */ -#pragma push -#pragma force_active on -static u8 lit_933[12]; -#pragma pop - -/* 80431430-8043143C 05E150 000C+00 0/1 0/0 0/0 .bss @934 */ -#pragma push -#pragma force_active on -static u8 lit_934[12]; -#pragma pop - -/* 8043143C-80431448 05E15C 000C+00 0/1 0/0 0/0 .bss @935 */ -#pragma push -#pragma force_active on -static u8 lit_935[12]; -#pragma pop /* 80431448-80431490 05E168 0048+00 1/2 0/0 0/0 .bss * saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light */ -u8 JStudio_JStage::TAdaptor_light::saoVVOutput_direction_[72]; +JStudio_JStage::TAdaptor_light::TVVOutput_direction_ + JStudio_JStage::TAdaptor_light::saoVVOutput_direction_[6] = { + JStudio_JStage::TAdaptor_light::TVVOutput_direction_( + JStudio_JStage::TAdaptor_light::TE_VALUE_10, + JStudio_JStage::TAdaptor_light::DIRECTION_1), + JStudio_JStage::TAdaptor_light::TVVOutput_direction_( + JStudio_JStage::TAdaptor_light::TE_VALUE_11, + JStudio_JStage::TAdaptor_light::DIRECTION_1), + JStudio_JStage::TAdaptor_light::TVVOutput_direction_( + JStudio_JStage::TAdaptor_light::TE_VALUE_7, + JStudio_JStage::TAdaptor_light::DIRECTION_2), + JStudio_JStage::TAdaptor_light::TVVOutput_direction_( + JStudio_JStage::TAdaptor_light::TE_VALUE_8, + JStudio_JStage::TAdaptor_light::DIRECTION_2), + JStudio_JStage::TAdaptor_light::TVVOutput_direction_( + JStudio_JStage::TAdaptor_light::TE_VALUE_9, + JStudio_JStage::TAdaptor_light::DIRECTION_2), + JStudio_JStage::TAdaptor_light::TVVOutput_direction_(), +}; /* 8028CC68-8028CCB0 2875A8 0048+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv.s" +void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() { + TVVOutput_direction_* pOutput = saoVVOutput_direction_; + while (!pOutput->isEnd_()) { + pOutput->adaptor_setOutput_(this); + pOutput++; + } } -#pragma pop /* ############################################################################################## */ /* 804554E8-804554F0 003AE8 0004+04 1/1 0/0 0/0 .sdata2 @846 */ @@ -181,6 +125,36 @@ SECTION_SDATA2 static f32 lit_850 = 57.295780181884766f; /* 8028CCB0-8028CF68 2875F0 02B8+00 1/0 0/0 0/0 .text * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv */ +// regalloc +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_light::adaptor_do_begin() { + adaptor_object_begin_(); + JStage::TLight* pLightObj = get_pJSG_(); + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(60, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + GXColor lightColor = pLightObj->JSGGetColor(); + adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, lightColor); + JStudio::TControl::TTransform_position_direction lightObjTransform; + JStudio::TControl::TTransform_position_direction aTStack_b8; + pLightObj->JSGGetPosition(&lightObjTransform.position); + pLightObj->JSGGetDirection(&lightObjTransform.direction); + JStudio::TControl::TTransform_position_direction* finalTransform = + pControl->transformOnGet_transform_ifEnabled(&lightObjTransform, &aTStack_b8); + adaptor_setVariableValue_Vec(sauVariableValue_3_POSITION_XYZ, finalTransform->position); + f32 dirx = finalTransform->direction.x; + f32 diry = finalTransform->direction.y; + f32 dirz = finalTransform->direction.z; + f32 sqr = sqrtf(dirx * dirx + dirz * dirz); + f32 dVar11 = atan2(dirx, dirz); + f32 dVar9 = atan2(diry, sqr); + adaptor_setVariableValue_immediate(10, (180.0f / M_PI) * dVar11); + adaptor_setVariableValue_immediate(11, (180.0f / M_PI) * dVar9); + Vec VStack_c4; + VECAdd(&finalTransform->position, &finalTransform->direction, &VStack_c4); + adaptor_setVariableValue_Vec(sauVariableValue_3_TARGET_POSITION_XYZ, VStack_c4); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -189,17 +163,13 @@ asm void JStudio_JStage::TAdaptor_light::adaptor_do_begin() { #include "asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv.s" } #pragma pop +#endif /* 8028CF68-8028CFBC 2878A8 0054+00 1/0 0/0 0/0 .text * adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_light::adaptor_do_end() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv.s" +void JStudio_JStage::TAdaptor_light::adaptor_do_end() { + adaptor_object_end_(); } -#pragma pop /* ############################################################################################## */ /* 8045550C-80455510 003B0C 0004+00 1/1 0/0 0/0 .sdata2 @898 */ @@ -207,6 +177,44 @@ SECTION_SDATA2 static f32 lit_898 = 0.01745329238474369f; /* 8028CFBC-8028D18C 2878FC 01D0+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl */ +// float regalloc +#ifdef NONMATCHING +void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) { + JStage::TLight* lightObj = get_pJSG_(); + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(118, pObject!=0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(120, pControl!=0); + GXColor lightColor; + adaptor_getVariableValue_GXColor(&lightColor, sauVariableValue_4_COLOR_RGBA); + lightObj->JSGSetColor(lightColor); + JStudio::TControl::TTransform_position_direction VStack_198; + JStudio::TControl::TTransform_position_direction aTStack_1b0; + adaptor_getVariableValue_Vec(&VStack_198.position, sauVariableValue_3_POSITION_XYZ); + switch (field_0x11c) { + case 1: + f32 dVar10 = adaptor_getVariableValue(10)->getValue(); + f32 dVar11 = adaptor_getVariableValue(11)->getValue(); + f32 temp = 0.01745329238474369f * dVar11; + f32 dVar12 = cos(temp); + f32 sinVal = sin(temp); + f32 temp2 = 0.01745329238474369f * dVar10; + VStack_198.direction.x = dVar12 * (f32)sin(temp2); + VStack_198.direction.y = sinVal; + VStack_198.direction.z = dVar12 * (f32)cos(temp2); + break; + case 2: + Vec VStack_1c0; + adaptor_getVariableValue_Vec(&VStack_1c0, sauVariableValue_3_TARGET_POSITION_XYZ); + VECSubtract(&VStack_1c0, &VStack_198.position, &VStack_198.direction); + } + JStudio::TControl::TTransform_position_direction* pTrans = + pControl->transformOnSet_transform_ifEnabled(&VStack_198, &aTStack_1b0); + lightObj->JSGSetPosition(pTrans->position); + lightObj->JSGSetDirection(pTrans->direction); + pJSGObject_->JSGUpdate(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -215,78 +223,54 @@ asm void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_0) { #include "asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl.s" } #pragma pop +#endif /* 8028D18C-8028D1B0 287ACC 0024+00 1/0 0/0 0/0 .text * adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_light::adaptor_do_data(void const* param_0, u32 param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl.s" +void JStudio_JStage::TAdaptor_light::adaptor_do_data(void const* param_1, u32 param_2, + void const* param_3, u32 param_4) { + adaptor_object_data_(param_1, param_2, param_3, param_4); } -#pragma pop /* 8028D1B0-8028D228 287AF0 0078+00 1/0 0/0 0/0 .text * adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D1B0.s" +void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(198, uSize==4); + JUT_ASSERT(199, pContent!=0); + JStage::TELight lightType; + switch (*(u32*)pContent) { + case 0x301: + lightType = JStage::TELIGHT_1; + break; + case 0x302: + lightType = JStage::TELIGHT_2; + break; + case 0x303: + lightType = JStage::TELIGHT_3; + break; + default: + // TODO: find out how to lose the goto + goto end; + } + get_pJSG_()->JSGSetLightType(lightType); + break; + } + end:; } -#pragma pop /* 8028D228-8028D24C 287B68 0024+00 1/0 0/0 0/0 .text * adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_light::adaptor_do_ENABLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D228.s" +void JStudio_JStage::TAdaptor_light::adaptor_do_ENABLE(JStudio::data::TEOperationData param_1, + void const* param_2, u32 param_3) { + adaptor_object_ENABLE_(param_1, param_2, param_3); } -#pragma pop /* 8028D24C-8028D258 287B8C 000C+00 1/0 0/0 0/0 .text * __cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_light::TVVOutput_direction_::operator()(f32 param_0, - JStudio::TAdaptor* param_1) const { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D24C.s" +void JStudio_JStage::TAdaptor_light::TVVOutput_direction_::operator()( + f32 param_0, JStudio::TAdaptor* param_1) const { + ((JStudio_JStage::TAdaptor_light*)param_1)->field_0x11c = field_0x8; } -#pragma pop - -/* 8028D258-8028D2B8 287B98 0060+00 2/1 0/0 0/0 .text - * __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_light::TVVOutput_direction_::~TVVOutput_direction_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv.s" -} -#pragma pop - -/* 8028D2B8-8028D550 287BF8 0298+00 0/0 1/0 0/0 .text __sinit_object-light_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_8028D2B8() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-light/func_8028D2B8.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8028D2B8, func_8028D2B8); -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/JStudio/JStudio_JStage/object.cpp index ced696bc97..03434f045c 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object.cpp @@ -104,7 +104,7 @@ void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_1, JStage::TObject* JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_1) { JStage::TObject* pJSGObject; - if (pJSGSystem_->JSGFindObject(&pJSGObject, param_1, JStage::TOBJ_ACTOR_UNK) == 0) { + if (pJSGSystem_->JSGFindObject(&pJSGObject, param_1, JStage::OBJECT_UNDEFINED) == 0) { JUT_ASSERT(122, pJSGObject != 0); } else { return NULL; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 8258a21048..2bc83bb6f4 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1392,11 +1392,11 @@ bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNa return true; } - if (objType == JStage::TOBJ_ACTOR || objType == JStage::TOBJ_ACTOR_UNK) { + if (objType == JStage::OBJECT_ACTOR || objType == JStage::OBJECT_UNDEFINED) { fopAc_ac_c* actor = fopAcM_searchFromName(actorName, 0, 0); if (actor == NULL) { - if (objType == JStage::TOBJ_ACTOR && !strncmp(actorName, "d_act", 5)) { + if (objType == JStage::OBJECT_ACTOR && !strncmp(actorName, "d_act", 5)) { actor = (fopAc_ac_c*)fopAcM_fastCreate(actorName, 0, NULL, -1, NULL, NULL, NULL, NULL); if (actor == NULL) { @@ -1409,13 +1409,13 @@ bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNa } *p_TObj = mpObject->appendActor(actor); - } else if (objType == JStage::TOBJ_CAMERA) { + } else if (objType == JStage::OBJECT_CAMERA) { *p_TObj = mpObject->createCamera(); - } else if (objType == JStage::TOBJ_AMBIENT) { + } else if (objType == JStage::OBJECT_AMBIENT) { *p_TObj = mpObject->createAmbient(); - } else if (objType == JStage::TOBJ_LIGHT) { + } else if (objType == JStage::OBJECT_LIGHT) { *p_TObj = mpObject->appendLight(); - } else if (objType == JStage::TOBJ_FOG) { + } else if (objType == JStage::OBJECT_FOG) { *p_TObj = mpObject->createFog(); }