From d3420ffe8d38185b66cb67a6605fb3d89cb72b36 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Thu, 22 Aug 2024 23:17:24 +0300 Subject: [PATCH] jstudio particle and sound OK (#2194) * Work on object-sound * object-particle OK * object-sound OK * JStudio_JAudio2 control OK * JStudio_JParticle control OK * JStage object OK * JStage ambient light OK --- .../JStudio/JStudio/object-id/func_80288988.s | 72 -- ...dt__Q215JStudio_JAudio213TCreateObjectFv.s | 26 - .../JStudio_JAudio2/control/func_8028D5B0.s | 34 - .../JStudio_JAudio2/control/func_8028D624.s | 75 -- ...t__Q215JStudio_JAudio214TAdaptor_soundFv.s | 50 -- ...JAudio214TAdaptor_sound13TVVOSetValue_Fv.s | 26 - ...e__Q215JStudio_JAudio214TAdaptor_soundFv.s | 58 -- ...__Q215JStudio_JAudio214TAdaptor_soundFUl.s | 118 --- ...___Q215JStudio_JAudio214TAdaptor_soundFv.s | 48 -- ...__Q215JStudio_JAudio214TAdaptor_soundFUl.s | 18 - .../object-sound/func_8028D728.s | 11 - .../object-sound/func_8028D750.s | 11 - .../object-sound/func_8028D778.s | 11 - .../object-sound/func_8028D7A0.s | 26 - .../object-sound/func_8028D800.s | 11 - .../object-sound/func_8028D828.s | 52 -- .../object-sound/func_8028DC20.s | 16 - .../object-sound/func_8028DC54.s | 16 - .../object-sound/func_8028DC88.s | 21 - .../object-sound/func_8028DCD0.s | 15 - .../object-sound/func_8028DD00.s | 21 - .../object-sound/func_8028DD48.s | 30 - .../object-sound/func_8028DDB4.s | 36 - .../object-sound/func_8028DE34.s | 8 - .../object-sound/func_8028DE50.s | 8 - .../object-sound/func_8028DE6C.s | 8 - .../object-sound/func_8028DE88.s | 11 - .../object-sound/func_8028DEB0.s | 8 - .../object-sound/func_8028DECC.s | 16 - .../object-sound/func_8028E0F4.s | 172 ----- ...___Q215JStudio_JAudio214TAdaptor_soundFv.s | 45 -- ...__Q217JStudio_JParticle13TCreateObjectFv.s | 26 - ..._Q217JStudio_JParticle13TCreateObjectFUl.s | 29 - ...article13TCreateObjectFP14JPABaseEmitter.s | 10 - .../JStudio_JParticle/control/func_8028E400.s | 34 - .../JStudio_JParticle/control/func_8028E508.s | 75 -- ...17JStudio_JParticle17TAdaptor_particleFv.s | 66 -- ...17JStudio_JParticle17TAdaptor_particleFv.s | 77 -- ...7JStudio_JParticle17TAdaptor_particleFUl.s | 65 -- .../object-particle/func_8028E60C.s | 62 -- .../object-particle/func_8028E700.s | 26 - .../object-particle/func_8028EA68.s | 6 - .../object-particle/func_8028EA7C.s | 16 - .../object-particle/func_8028EAB0.s | 21 - .../object-particle/func_8028EAF8.s | 12 - .../object-particle/func_8028EB24.s | 21 - .../object-particle/func_8028EB6C.s | 30 - .../object-particle/func_8028EBD8.s | 36 - .../object-particle/func_8028EC58.s | 8 - .../object-particle/func_8028EC74.s | 6 - .../object-particle/func_8028EC88.s | 8 - .../object-particle/func_8028ECA4.s | 8 - .../object-particle/func_8028ECC0.s | 249 ------- .../object-particle/func_8028F060.s | 16 - .../object-particle/func_8028F098.s | 16 - .../object-particle/func_8028F0D0.s | 16 - .../object-particle/func_8028F108.s | 50 -- .../object-particle/func_8028F1C0.s | 82 --- ...4JStudio_JStage21TAdaptor_ambientLightFv.s | 31 - ...4JStudio_JStage21TAdaptor_ambientLightFv.s | 36 - ...4JStudio_JStage21TAdaptor_ambientLightFv.s | 22 - ...JStudio_JStage21TAdaptor_ambientLightFUl.s | 31 - .../object-ambientlight/func_8028B610.s | 40 - .../object-ambientlight/func_8028B87C.s | 10 - ...udio_JStage16TAdaptor_object_FPCvUlPCvUl.s | 22 - ...Q214JStudio_JStage16TAdaptor_object_FPCc.s | 23 - .../JStudio_JStage/object/func_8028A1F8.s | 42 -- .../JStudio_JStage/object/func_8028A290.s | 42 -- .../JStudio_JStage/object/func_8028A328.s | 45 -- .../JStudio_JStage/object/func_8028A3CC.s | 45 -- .../JStudio_JStage/object/func_8028A50C.s | 20 - .../JStudio_JStage/object/func_8028A550.s | 44 -- include/JSystem/JAudio2/JAISound.h | 6 +- include/JSystem/JGadget/pointer.h | 25 + include/JSystem/JParticle/JPAEmitter.h | 3 +- include/JSystem/JStage/JSGObject.h | 12 +- include/JSystem/JStage/JSGSystem.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-control.h | 71 +- .../JSystem/JStudio/JStudio/jstudio-math.h | 4 + .../JSystem/JStudio/JStudio/jstudio-object.h | 88 ++- include/JSystem/JStudio/JStudio/object-id.h | 2 +- .../JSystem/JStudio/JStudio/stb-data-parse.h | 1 + .../JSystem/JStudio/JStudio_JAudio2/control.h | 63 +- .../JStudio/JStudio_JParticle/control.h | 91 ++- .../JSystem/JStudio/JStudio_JStage/control.h | 39 +- include/d/d_demo.h | 2 +- libs/JSystem/JParticle/JPABaseShape.cpp | 2 +- libs/JSystem/JStage/JSGObject.cpp | 8 +- libs/JSystem/JStage/JSGSystem.cpp | 4 +- .../JStudio/JStudio/jstudio-control.cpp | 63 +- libs/JSystem/JStudio/JStudio/jstudio-math.cpp | 15 +- .../JStudio/JStudio/jstudio-object.cpp | 104 ++- libs/JSystem/JStudio/JStudio/object-id.cpp | 18 +- .../JStudio/JStudio_JAudio2/control.cpp | 99 +-- .../JStudio/JStudio_JAudio2/object-sound.cpp | 678 +++++++---------- .../JStudio/JStudio_JParticle/control.cpp | 154 ++-- .../JStudio_JParticle/object-particle.cpp | 689 +++++++++--------- .../JStudio_JStage/object-ambientlight.cpp | 120 +-- .../JStudio/JStudio_JStage/object-light.cpp | 4 - .../JSystem/JStudio/JStudio_JStage/object.cpp | 205 +++--- src/d/d_demo.cpp | 4 +- 101 files changed, 1200 insertions(+), 3978 deletions(-) delete mode 100644 asm/JSystem/JStudio/JStudio/object-id/func_80288988.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/control/__dt__Q215JStudio_JAudio213TCreateObjectFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D5B0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D624.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q215JStudio_JAudio214TAdaptor_soundFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D728.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D750.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D778.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D7A0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D800.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D828.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC20.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC54.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC88.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DCD0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD00.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD48.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DDB4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE34.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE50.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE6C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE88.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DEB0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DECC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028E0F4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JAudio2/object-sound/prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/control/__dt__Q217JStudio_JParticle13TCreateObjectFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/control/emitter_create__Q217JStudio_JParticle13TCreateObjectFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/control/emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E400.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E508.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/__dt__Q217JStudio_JParticle17TAdaptor_particleFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E60C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E700.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA68.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA7C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAB0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAF8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB24.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB6C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EBD8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC58.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC74.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC88.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECA4.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECC0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F060.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F098.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F0D0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F108.s delete mode 100644 asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F1C0.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B610.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B87C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A1F8.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A290.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A328.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A3CC.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A50C.s delete mode 100644 asm/JSystem/JStudio/JStudio_JStage/object/func_8028A550.s create mode 100644 include/JSystem/JGadget/pointer.h diff --git a/asm/JSystem/JStudio/JStudio/object-id/func_80288988.s b/asm/JSystem/JStudio/JStudio/object-id/func_80288988.s deleted file mode 100644 index f1594ee0e4..0000000000 --- a/asm/JSystem/JStudio/JStudio/object-id/func_80288988.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80288988: -/* 80288988 80 A3 00 04 */ lwz r5, 4(r3) -/* 8028898C 80 04 00 04 */ lwz r0, 4(r4) -/* 80288990 7C 05 00 40 */ cmplw r5, r0 -/* 80288994 41 82 00 0C */ beq lbl_802889A0 -/* 80288998 38 60 00 00 */ li r3, 0 -/* 8028899C 4E 80 00 20 */ blr -lbl_802889A0: -/* 802889A0 80 03 00 00 */ lwz r0, 0(r3) -/* 802889A4 7C 06 03 78 */ mr r6, r0 -/* 802889A8 80 64 00 00 */ lwz r3, 0(r4) -/* 802889AC 7C 64 1B 78 */ mr r4, r3 -/* 802889B0 7C 00 18 40 */ cmplw r0, r3 -/* 802889B4 40 82 00 0C */ bne lbl_802889C0 -/* 802889B8 38 60 00 01 */ li r3, 1 -/* 802889BC 4E 80 00 20 */ blr -lbl_802889C0: -/* 802889C0 54 A0 F0 BE */ srwi r0, r5, 2 -/* 802889C4 7C 09 03 A6 */ mtctr r0 -/* 802889C8 28 05 00 04 */ cmplwi r5, 4 -/* 802889CC 41 80 00 2C */ blt lbl_802889F8 -lbl_802889D0: -/* 802889D0 80 66 00 00 */ lwz r3, 0(r6) -/* 802889D4 80 04 00 00 */ lwz r0, 0(r4) -/* 802889D8 7C 03 00 40 */ cmplw r3, r0 -/* 802889DC 41 82 00 0C */ beq lbl_802889E8 -/* 802889E0 38 60 00 00 */ li r3, 0 -/* 802889E4 4E 80 00 20 */ blr -lbl_802889E8: -/* 802889E8 38 A5 FF FC */ addi r5, r5, -4 -/* 802889EC 38 C6 00 04 */ addi r6, r6, 4 -/* 802889F0 38 84 00 04 */ addi r4, r4, 4 -/* 802889F4 42 00 FF DC */ bdnz lbl_802889D0 -lbl_802889F8: -/* 802889F8 2C 05 00 02 */ cmpwi r5, 2 -/* 802889FC 41 82 00 3C */ beq lbl_80288A38 -/* 80288A00 40 80 00 10 */ bge lbl_80288A10 -/* 80288A04 2C 05 00 01 */ cmpwi r5, 1 -/* 80288A08 40 80 00 50 */ bge lbl_80288A58 -/* 80288A0C 48 00 00 64 */ b lbl_80288A70 -lbl_80288A10: -/* 80288A10 2C 05 00 04 */ cmpwi r5, 4 -/* 80288A14 40 80 00 5C */ bge lbl_80288A70 -/* 80288A18 88 66 00 00 */ lbz r3, 0(r6) -/* 80288A1C 88 04 00 00 */ lbz r0, 0(r4) -/* 80288A20 7C 03 00 40 */ cmplw r3, r0 -/* 80288A24 41 82 00 0C */ beq lbl_80288A30 -/* 80288A28 38 60 00 00 */ li r3, 0 -/* 80288A2C 4E 80 00 20 */ blr -lbl_80288A30: -/* 80288A30 38 C6 00 01 */ addi r6, r6, 1 -/* 80288A34 38 84 00 01 */ addi r4, r4, 1 -lbl_80288A38: -/* 80288A38 88 66 00 00 */ lbz r3, 0(r6) -/* 80288A3C 88 04 00 00 */ lbz r0, 0(r4) -/* 80288A40 7C 03 00 40 */ cmplw r3, r0 -/* 80288A44 41 82 00 0C */ beq lbl_80288A50 -/* 80288A48 38 60 00 00 */ li r3, 0 -/* 80288A4C 4E 80 00 20 */ blr -lbl_80288A50: -/* 80288A50 38 C6 00 01 */ addi r6, r6, 1 -/* 80288A54 38 84 00 01 */ addi r4, r4, 1 -lbl_80288A58: -/* 80288A58 88 66 00 00 */ lbz r3, 0(r6) -/* 80288A5C 88 04 00 00 */ lbz r0, 0(r4) -/* 80288A60 7C 03 00 40 */ cmplw r3, r0 -/* 80288A64 41 82 00 0C */ beq lbl_80288A70 -/* 80288A68 38 60 00 00 */ li r3, 0 -/* 80288A6C 4E 80 00 20 */ blr -lbl_80288A70: -/* 80288A70 38 60 00 01 */ li r3, 1 -/* 80288A74 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/control/__dt__Q215JStudio_JAudio213TCreateObjectFv.s b/asm/JSystem/JStudio/JStudio_JAudio2/control/__dt__Q215JStudio_JAudio213TCreateObjectFv.s deleted file mode 100644 index db251e9d6f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/control/__dt__Q215JStudio_JAudio213TCreateObjectFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028D550: -/* 8028D550 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D554 7C 08 02 A6 */ mflr r0 -/* 8028D558 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D55C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D560 93 C1 00 08 */ stw r30, 8(r1) -/* 8028D564 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028D568 7C 9F 23 78 */ mr r31, r4 -/* 8028D56C 41 82 00 28 */ beq lbl_8028D594 -/* 8028D570 3C 80 80 3C */ lis r4, __vt__Q215JStudio_JAudio213TCreateObject@ha /* 0x803C5A68@ha */ -/* 8028D574 38 04 5A 68 */ addi r0, r4, __vt__Q215JStudio_JAudio213TCreateObject@l /* 0x803C5A68@l */ -/* 8028D578 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D57C 38 80 00 00 */ li r4, 0 -/* 8028D580 4B FF 7F 09 */ bl __dt__Q27JStudio13TCreateObjectFv -/* 8028D584 7F E0 07 35 */ extsh. r0, r31 -/* 8028D588 40 81 00 0C */ ble lbl_8028D594 -/* 8028D58C 7F C3 F3 78 */ mr r3, r30 -/* 8028D590 48 04 17 AD */ bl __dl__FPv -lbl_8028D594: -/* 8028D594 7F C3 F3 78 */ mr r3, r30 -/* 8028D598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028D59C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028D5A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D5A4 7C 08 03 A6 */ mtlr r0 -/* 8028D5A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D5AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D5B0.s b/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D5B0.s deleted file mode 100644 index a66ee20224..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D5B0.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8028D5B0: -/* 8028D5B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D5B4 7C 08 02 A6 */ mflr r0 -/* 8028D5B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D5BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D5C0 7C 66 1B 78 */ mr r6, r3 -/* 8028D5C4 7C 9F 23 78 */ mr r31, r4 -/* 8028D5C8 80 65 00 00 */ lwz r3, 0(r5) -/* 8028D5CC 80 83 00 04 */ lwz r4, 4(r3) -/* 8028D5D0 3C 60 4A 53 */ lis r3, 0x4A53 /* 0x4A534E44@ha */ -/* 8028D5D4 38 03 4E 44 */ addi r0, r3, 0x4E44 /* 0x4A534E44@l */ -/* 8028D5D8 7C 04 00 00 */ cmpw r4, r0 -/* 8028D5DC 41 82 00 08 */ beq lbl_8028D5E4 -/* 8028D5E0 48 00 00 10 */ b lbl_8028D5F0 -lbl_8028D5E4: -/* 8028D5E4 3C 60 80 29 */ lis r3, createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject@ha /* 0x8028D624@ha */ -/* 8028D5E8 39 83 D6 24 */ addi r12, r3, createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject@l /* 0x8028D624@l */ -/* 8028D5EC 48 00 00 0C */ b lbl_8028D5F8 -lbl_8028D5F0: -/* 8028D5F0 38 60 00 00 */ li r3, 0 -/* 8028D5F4 48 00 00 1C */ b lbl_8028D610 -lbl_8028D5F8: -/* 8028D5F8 7C A3 2B 78 */ mr r3, r5 -/* 8028D5FC 7C C4 33 78 */ mr r4, r6 -/* 8028D600 7D 89 03 A6 */ mtctr r12 -/* 8028D604 4E 80 04 21 */ bctrl -/* 8028D608 90 7F 00 00 */ stw r3, 0(r31) -/* 8028D60C 38 60 00 01 */ li r3, 1 -lbl_8028D610: -/* 8028D610 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028D614 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D618 7C 08 03 A6 */ mtlr r0 -/* 8028D61C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D620 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D624.s b/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D624.s deleted file mode 100644 index 958c24f217..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D624.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8028D624: -/* 8028D624 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028D628 7C 08 02 A6 */ mflr r0 -/* 8028D62C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028D630 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028D634 48 0D 4B A9 */ bl _savegpr_29 -/* 8028D638 7C 7D 1B 78 */ mr r29, r3 -/* 8028D63C 7C 9E 23 78 */ mr r30, r4 -/* 8028D640 38 60 01 48 */ li r3, 0x148 -/* 8028D644 48 04 16 09 */ bl __nw__FUl -/* 8028D648 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8028D64C 41 82 00 10 */ beq lbl_8028D65C -/* 8028D650 7F C4 F3 78 */ mr r4, r30 -/* 8028D654 48 00 01 D5 */ bl __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject -/* 8028D658 7C 7F 1B 78 */ mr r31, r3 -lbl_8028D65C: -/* 8028D65C 28 1F 00 00 */ cmplwi r31, 0 -/* 8028D660 40 82 00 0C */ bne lbl_8028D66C -/* 8028D664 38 60 00 00 */ li r3, 0 -/* 8028D668 48 00 00 A8 */ b lbl_8028D710 -lbl_8028D66C: -/* 8028D66C 93 E1 00 08 */ stw r31, 8(r1) -/* 8028D670 88 1E 00 14 */ lbz r0, 0x14(r30) -/* 8028D674 98 1F 01 1C */ stb r0, 0x11c(r31) -/* 8028D678 38 60 00 38 */ li r3, 0x38 -/* 8028D67C 48 04 15 D1 */ bl __nw__FUl -/* 8028D680 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028D684 41 82 00 14 */ beq lbl_8028D698 -/* 8028D688 7F A4 EB 78 */ mr r4, r29 -/* 8028D68C 7F E5 FB 78 */ mr r5, r31 -/* 8028D690 4B FF A5 0D */ bl __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound -/* 8028D694 7C 7E 1B 78 */ mr r30, r3 -lbl_8028D698: -/* 8028D698 28 1E 00 00 */ cmplwi r30, 0 -/* 8028D69C 40 82 00 0C */ bne lbl_8028D6A8 -/* 8028D6A0 3B C0 00 00 */ li r30, 0 -/* 8028D6A4 48 00 00 28 */ b lbl_8028D6CC -lbl_8028D6A8: -/* 8028D6A8 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028D6AC 28 03 00 00 */ cmplwi r3, 0 -/* 8028D6B0 41 82 00 1C */ beq lbl_8028D6CC -/* 8028D6B4 93 C3 00 04 */ stw r30, 4(r3) -/* 8028D6B8 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028D6BC 81 83 00 00 */ lwz r12, 0(r3) -/* 8028D6C0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028D6C4 7D 89 03 A6 */ mtctr r12 -/* 8028D6C8 4E 80 04 21 */ bctrl -lbl_8028D6CC: -/* 8028D6CC 28 1E 00 00 */ cmplwi r30, 0 -/* 8028D6D0 40 82 00 2C */ bne lbl_8028D6FC -/* 8028D6D4 80 61 00 08 */ lwz r3, 8(r1) -/* 8028D6D8 28 03 00 00 */ cmplwi r3, 0 -/* 8028D6DC 41 82 00 18 */ beq lbl_8028D6F4 -/* 8028D6E0 38 80 00 01 */ li r4, 1 -/* 8028D6E4 81 83 00 00 */ lwz r12, 0(r3) -/* 8028D6E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 8028D6EC 7D 89 03 A6 */ mtctr r12 -/* 8028D6F0 4E 80 04 21 */ bctrl -lbl_8028D6F4: -/* 8028D6F4 38 60 00 00 */ li r3, 0 -/* 8028D6F8 48 00 00 18 */ b lbl_8028D710 -lbl_8028D6FC: -/* 8028D6FC 38 00 00 00 */ li r0, 0 -/* 8028D700 90 01 00 08 */ stw r0, 8(r1) -/* 8028D704 48 00 00 08 */ b lbl_8028D70C -/* 8028D708 4E 80 04 21 */ bctrl -lbl_8028D70C: -/* 8028D70C 7F C3 F3 78 */ mr r3, r30 -lbl_8028D710: -/* 8028D710 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028D714 48 0D 4B 15 */ bl _restgpr_29 -/* 8028D718 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028D71C 7C 08 03 A6 */ mtlr r0 -/* 8028D720 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028D724 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q215JStudio_JAudio214TAdaptor_soundFv.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q215JStudio_JAudio214TAdaptor_soundFv.s deleted file mode 100644 index c1dcc00480..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q215JStudio_JAudio214TAdaptor_soundFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8028D8F4: -/* 8028D8F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D8F8 7C 08 02 A6 */ mflr r0 -/* 8028D8FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D900 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D904 93 C1 00 08 */ stw r30, 8(r1) -/* 8028D908 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028D90C 7C 9F 23 78 */ mr r31, r4 -/* 8028D910 41 82 00 78 */ beq lbl_8028D988 -/* 8028D914 3C 60 80 3C */ lis r3, __vt__Q215JStudio_JAudio214TAdaptor_sound@ha /* 0x803C5A88@ha */ -/* 8028D918 38 03 5A 88 */ addi r0, r3, __vt__Q215JStudio_JAudio214TAdaptor_sound@l /* 0x803C5A88@l */ -/* 8028D91C 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D920 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 8028D924 28 03 00 00 */ cmplwi r3, 0 -/* 8028D928 41 82 00 34 */ beq lbl_8028D95C -/* 8028D92C 88 1E 01 1F */ lbz r0, 0x11f(r30) -/* 8028D930 28 00 00 00 */ cmplwi r0, 0 -/* 8028D934 40 82 00 0C */ bne lbl_8028D940 -/* 8028D938 48 01 4C 61 */ bl stop__8JAISoundFv -/* 8028D93C 48 00 00 20 */ b lbl_8028D95C -lbl_8028D940: -/* 8028D940 88 1E 01 1C */ lbz r0, 0x11c(r30) -/* 8028D944 28 00 00 00 */ cmplwi r0, 0 -/* 8028D948 41 82 00 10 */ beq lbl_8028D958 -/* 8028D94C 38 7E 01 18 */ addi r3, r30, 0x118 -/* 8028D950 48 01 48 35 */ bl releaseSound__14JAISoundHandleFv -/* 8028D954 48 00 00 08 */ b lbl_8028D95C -lbl_8028D958: -/* 8028D958 48 01 4C 41 */ bl stop__8JAISoundFv -lbl_8028D95C: -/* 8028D95C 34 1E 01 18 */ addic. r0, r30, 0x118 -/* 8028D960 41 82 00 0C */ beq lbl_8028D96C -/* 8028D964 38 7E 01 18 */ addi r3, r30, 0x118 -/* 8028D968 48 01 48 1D */ bl releaseSound__14JAISoundHandleFv -lbl_8028D96C: -/* 8028D96C 7F C3 F3 78 */ mr r3, r30 -/* 8028D970 38 80 00 00 */ li r4, 0 -/* 8028D974 4B FF A1 C9 */ bl __dt__Q27JStudio14TAdaptor_soundFv -/* 8028D978 7F E0 07 35 */ extsh. r0, r31 -/* 8028D97C 40 81 00 0C */ ble lbl_8028D988 -/* 8028D980 7F C3 F3 78 */ mr r3, r30 -/* 8028D984 48 04 13 B9 */ bl __dl__FPv -lbl_8028D988: -/* 8028D988 7F C3 F3 78 */ mr r3, r30 -/* 8028D98C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028D990 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028D994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D998 7C 08 03 A6 */ mtlr r0 -/* 8028D99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D9A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv.s deleted file mode 100644 index 062ec36805..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028E094: -/* 8028E094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E098 7C 08 02 A6 */ mflr r0 -/* 8028E09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E0A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E0A4 93 C1 00 08 */ stw r30, 8(r1) -/* 8028E0A8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028E0AC 7C 9F 23 78 */ mr r31, r4 -/* 8028E0B0 41 82 00 28 */ beq lbl_8028E0D8 -/* 8028E0B4 3C 80 80 3C */ lis r4, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E0B8 38 04 5A 78 */ addi r0, r4, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E0BC 90 1E 00 00 */ stw r0, 0(r30) -/* 8028E0C0 38 80 00 00 */ li r4, 0 -/* 8028E0C4 4B FF 7D 49 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E0C8 7F E0 07 35 */ extsh. r0, r31 -/* 8028E0CC 40 81 00 0C */ ble lbl_8028E0D8 -/* 8028E0D0 7F C3 F3 78 */ mr r3, r30 -/* 8028E0D4 48 04 0C 69 */ bl __dl__FPv -lbl_8028E0D8: -/* 8028E0D8 7F C3 F3 78 */ mr r3, r30 -/* 8028E0DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E0E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028E0E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E0E8 7C 08 03 A6 */ mtlr r0 -/* 8028E0EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E0F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv.s deleted file mode 100644 index 4651cec53c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8028D9A4: -/* 8028D9A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D9A8 7C 08 02 A6 */ mflr r0 -/* 8028D9AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D9B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D9B4 7C 7F 1B 78 */ mr r31, r3 -/* 8028D9B8 88 0D 8C 78 */ lbz r0, data_804511F8(r13) -/* 8028D9BC 7C 00 07 75 */ extsb. r0, r0 -/* 8028D9C0 40 82 00 4C */ bne lbl_8028DA0C -/* 8028D9C4 38 00 00 00 */ li r0, 0 -/* 8028D9C8 3C 60 80 43 */ lis r3, aoData@ha /* 0x80431490@ha */ -/* 8028D9CC 38 A3 14 90 */ addi r5, r3, aoData@l /* 0x80431490@l */ -/* 8028D9D0 90 05 00 00 */ stw r0, 0(r5) -/* 8028D9D4 C0 02 BB 10 */ lfs f0, lit_1470(r2) -/* 8028D9D8 D0 05 00 04 */ stfs f0, 4(r5) -/* 8028D9DC 38 80 00 01 */ li r4, 1 -/* 8028D9E0 90 85 00 08 */ stw r4, 8(r5) -/* 8028D9E4 D0 05 00 0C */ stfs f0, 0xc(r5) -/* 8028D9E8 38 00 00 02 */ li r0, 2 -/* 8028D9EC 90 05 00 10 */ stw r0, 0x10(r5) -/* 8028D9F0 D0 05 00 14 */ stfs f0, 0x14(r5) -/* 8028D9F4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8028D9F8 C0 03 0A E0 */ lfs f0, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8028D9FC 38 00 FF FF */ li r0, -1 -/* 8028DA00 90 05 00 18 */ stw r0, 0x18(r5) -/* 8028DA04 D0 05 00 1C */ stfs f0, 0x1c(r5) -/* 8028DA08 98 8D 8C 78 */ stb r4, data_804511F8(r13) -lbl_8028DA0C: -/* 8028DA0C 7F E3 FB 78 */ mr r3, r31 -/* 8028DA10 3C 80 80 43 */ lis r4, aoData@ha /* 0x80431490@ha */ -/* 8028DA14 38 84 14 90 */ addi r4, r4, aoData@l /* 0x80431490@l */ -/* 8028DA18 4B FF 87 A9 */ bl adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate -/* 8028DA1C 3C 60 80 43 */ lis r3, saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound@ha /* 0x804314F8@ha */ -/* 8028DA20 38 03 14 F8 */ addi r0, r3, saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound@l /* 0x804314F8@l */ -/* 8028DA24 7C 04 03 78 */ mr r4, r0 -/* 8028DA28 48 00 00 2C */ b lbl_8028DA54 -lbl_8028DA2C: -/* 8028DA2C 80 7F 00 08 */ lwz r3, 8(r31) -/* 8028DA30 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8028DA34 7C 63 02 14 */ add r3, r3, r0 -/* 8028DA38 28 04 00 00 */ cmplwi r4, 0 -/* 8028DA3C 41 82 00 0C */ beq lbl_8028DA48 -/* 8028DA40 7C 80 23 78 */ mr r0, r4 -/* 8028DA44 48 00 00 08 */ b lbl_8028DA4C -lbl_8028DA48: -/* 8028DA48 38 0D 8C 70 */ la r0, soOutput_none___Q27JStudio14TVariableValue(r13) /* 804511F0-_SDA_BASE_ */ -lbl_8028DA4C: -/* 8028DA4C 90 03 00 10 */ stw r0, 0x10(r3) -/* 8028DA50 38 84 00 0C */ addi r4, r4, 0xc -lbl_8028DA54: -/* 8028DA54 80 04 00 04 */ lwz r0, 4(r4) -/* 8028DA58 2C 00 FF FF */ cmpwi r0, -1 -/* 8028DA5C 40 82 FF D0 */ bne lbl_8028DA2C -/* 8028DA60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028DA64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DA68 7C 08 03 A6 */ mtlr r0 -/* 8028DA6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DA70 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl.s deleted file mode 100644 index 4d4cd1c88a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl.s +++ /dev/null @@ -1,118 +0,0 @@ -lbl_8028DA78: -/* 8028DA78 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028DA7C 7C 08 02 A6 */ mflr r0 -/* 8028DA80 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028DA84 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028DA88 93 C1 00 58 */ stw r30, 0x58(r1) -/* 8028DA8C 7C 7F 1B 78 */ mr r31, r3 -/* 8028DA90 80 83 00 04 */ lwz r4, 4(r3) -/* 8028DA94 83 C4 00 14 */ lwz r30, 0x14(r4) -/* 8028DA98 38 81 00 18 */ addi r4, r1, 0x18 -/* 8028DA9C 3C A0 80 3A */ lis r5, sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound@ha /* 0x8039AB6C@ha */ -/* 8028DAA0 38 A5 AB 6C */ addi r5, r5, sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound@l /* 0x8039AB6C@l */ -/* 8028DAA4 4B FF 87 D1 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028DAA8 88 1F 01 44 */ lbz r0, 0x144(r31) -/* 8028DAAC 28 00 00 00 */ cmplwi r0, 0 -/* 8028DAB0 40 82 00 34 */ bne lbl_8028DAE4 -/* 8028DAB4 88 1E 00 88 */ lbz r0, 0x88(r30) -/* 8028DAB8 28 00 00 00 */ cmplwi r0, 0 -/* 8028DABC 40 82 00 0C */ bne lbl_8028DAC8 -/* 8028DAC0 38 01 00 18 */ addi r0, r1, 0x18 -/* 8028DAC4 48 00 00 18 */ b lbl_8028DADC -lbl_8028DAC8: -/* 8028DAC8 38 7E 00 AC */ addi r3, r30, 0xac -/* 8028DACC 38 81 00 18 */ addi r4, r1, 0x18 -/* 8028DAD0 38 A1 00 0C */ addi r5, r1, 0xc -/* 8028DAD4 48 0B 92 99 */ bl PSMTXMultVec -/* 8028DAD8 38 01 00 0C */ addi r0, r1, 0xc -lbl_8028DADC: -/* 8028DADC 7C 03 03 78 */ mr r3, r0 -/* 8028DAE0 48 00 00 50 */ b lbl_8028DB30 -lbl_8028DAE4: -/* 8028DAE4 38 61 00 24 */ addi r3, r1, 0x24 -/* 8028DAE8 38 81 00 18 */ addi r4, r1, 0x18 -/* 8028DAEC 80 BF 01 3C */ lwz r5, 0x13c(r31) -/* 8028DAF0 80 DF 01 40 */ lwz r6, 0x140(r31) -/* 8028DAF4 4B FF C7 9D */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl -/* 8028DAF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028DAFC 40 82 00 0C */ bne lbl_8028DB08 -/* 8028DB00 38 00 00 00 */ li r0, 0 -/* 8028DB04 48 00 00 20 */ b lbl_8028DB24 -lbl_8028DB08: -/* 8028DB08 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8028DB0C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8028DB10 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8028DB14 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8028DB18 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 8028DB1C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8028DB20 38 00 00 01 */ li r0, 1 -lbl_8028DB24: -/* 8028DB24 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8028DB28 41 82 00 E0 */ beq lbl_8028DC08 -/* 8028DB2C 38 61 00 0C */ addi r3, r1, 0xc -lbl_8028DB30: -/* 8028DB30 E0 23 00 00 */ psq_l f1, 0(r3), 0, 0 /* qr0 */ -/* 8028DB34 C0 03 00 08 */ lfs f0, 8(r3) -/* 8028DB38 F0 3F 01 30 */ psq_st f1, 304(r31), 0, 0 /* qr0 */ -/* 8028DB3C D0 1F 01 38 */ stfs f0, 0x138(r31) -/* 8028DB40 88 1F 01 1D */ lbz r0, 0x11d(r31) -/* 8028DB44 28 00 00 00 */ cmplwi r0, 0 -/* 8028DB48 41 82 00 4C */ beq lbl_8028DB94 -/* 8028DB4C 88 1F 01 20 */ lbz r0, 0x120(r31) -/* 8028DB50 2C 00 00 02 */ cmpwi r0, 2 -/* 8028DB54 41 82 00 14 */ beq lbl_8028DB68 -/* 8028DB58 40 80 00 3C */ bge lbl_8028DB94 -/* 8028DB5C 2C 00 00 01 */ cmpwi r0, 1 -/* 8028DB60 40 80 00 2C */ bge lbl_8028DB8C -/* 8028DB64 48 00 00 30 */ b lbl_8028DB94 -lbl_8028DB68: -/* 8028DB68 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 8028DB6C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8028DB70 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8028DB74 90 01 00 08 */ stw r0, 8(r1) -/* 8028DB78 38 81 00 08 */ addi r4, r1, 8 -/* 8028DB7C 38 BF 01 18 */ addi r5, r31, 0x118 -/* 8028DB80 80 DF 01 2C */ lwz r6, 0x12c(r31) -/* 8028DB84 48 01 54 69 */ bl func_802A2FEC -/* 8028DB88 48 00 00 0C */ b lbl_8028DB94 -lbl_8028DB8C: -/* 8028DB8C 38 00 00 02 */ li r0, 2 -/* 8028DB90 98 1F 01 20 */ stb r0, 0x120(r31) -lbl_8028DB94: -/* 8028DB94 88 1F 01 1E */ lbz r0, 0x11e(r31) -/* 8028DB98 28 00 00 00 */ cmplwi r0, 0 -/* 8028DB9C 41 82 00 30 */ beq lbl_8028DBCC -/* 8028DBA0 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 8028DBA4 3C 03 00 01 */ addis r0, r3, 1 -/* 8028DBA8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8028DBAC 41 82 00 20 */ beq lbl_8028DBCC -/* 8028DBB0 80 1F 01 18 */ lwz r0, 0x118(r31) -/* 8028DBB4 28 00 00 00 */ cmplwi r0, 0 -/* 8028DBB8 40 82 00 14 */ bne lbl_8028DBCC -/* 8028DBBC 7F E3 FB 78 */ mr r3, r31 -/* 8028DBC0 48 00 03 45 */ bl prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv -/* 8028DBC4 7F E3 FB 78 */ mr r3, r31 -/* 8028DBC8 48 00 03 DD */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv -lbl_8028DBCC: -/* 8028DBCC 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 8028DBD0 28 03 00 00 */ cmplwi r3, 0 -/* 8028DBD4 41 82 00 34 */ beq lbl_8028DC08 -/* 8028DBD8 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8028DBDC 28 04 00 00 */ cmplwi r4, 0 -/* 8028DBE0 41 82 00 28 */ beq lbl_8028DC08 -/* 8028DBE4 80 84 00 08 */ lwz r4, 8(r4) -/* 8028DBE8 28 04 00 00 */ cmplwi r4, 0 -/* 8028DBEC 41 82 00 1C */ beq lbl_8028DC08 -/* 8028DBF0 C0 03 00 00 */ lfs f0, 0(r3) -/* 8028DBF4 D0 04 00 04 */ stfs f0, 4(r4) -/* 8028DBF8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8028DBFC D0 04 00 08 */ stfs f0, 8(r4) -/* 8028DC00 C0 03 00 08 */ lfs f0, 8(r3) -/* 8028DC04 D0 04 00 0C */ stfs f0, 0xc(r4) -lbl_8028DC08: -/* 8028DC08 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028DC0C 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8028DC10 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028DC14 7C 08 03 A6 */ mtlr r0 -/* 8028DC18 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028DC1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv.s deleted file mode 100644 index b75921f9e3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_8028DFA4: -/* 8028DFA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028DFA8 7C 08 02 A6 */ mflr r0 -/* 8028DFAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028DFB0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028DFB4 7C 7F 1B 78 */ mr r31, r3 -/* 8028DFB8 80 63 01 18 */ lwz r3, 0x118(r3) -/* 8028DFBC 28 03 00 00 */ cmplwi r3, 0 -/* 8028DFC0 41 82 00 80 */ beq lbl_8028E040 -/* 8028DFC4 80 1F 01 28 */ lwz r0, 0x128(r31) -/* 8028DFC8 C0 22 BB 10 */ lfs f1, lit_1470(r2) -/* 8028DFCC D0 23 00 24 */ stfs f1, 0x24(r3) -/* 8028DFD0 28 00 00 00 */ cmplwi r0, 0 -/* 8028DFD4 41 82 00 40 */ beq lbl_8028E014 -/* 8028DFD8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8028DFDC 90 03 00 30 */ stw r0, 0x30(r3) -/* 8028DFE0 C0 62 BB 14 */ lfs f3, lit_1805(r2) -/* 8028DFE4 EC 43 00 28 */ fsubs f2, f3, f0 -/* 8028DFE8 80 03 00 30 */ lwz r0, 0x30(r3) -/* 8028DFEC C8 22 BB 18 */ lfd f1, lit_1807(r2) -/* 8028DFF0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8028DFF4 3C 00 43 30 */ lis r0, 0x4330 -/* 8028DFF8 90 01 00 08 */ stw r0, 8(r1) -/* 8028DFFC C8 01 00 08 */ lfd f0, 8(r1) -/* 8028E000 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8028E004 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8028E008 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8028E00C D0 63 00 2C */ stfs f3, 0x2c(r3) -/* 8028E010 48 00 00 1C */ b lbl_8028E02C -lbl_8028E014: -/* 8028E014 C0 02 BB 14 */ lfs f0, lit_1805(r2) -/* 8028E018 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 8028E01C D0 23 00 28 */ stfs f1, 0x28(r3) -/* 8028E020 38 00 00 00 */ li r0, 0 -/* 8028E024 90 03 00 30 */ stw r0, 0x30(r3) -/* 8028E028 D0 23 00 2C */ stfs f1, 0x2c(r3) -lbl_8028E02C: -/* 8028E02C 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 8028E030 38 63 00 1C */ addi r3, r3, 0x1c -/* 8028E034 48 01 42 11 */ bl unlockIfLocked__15JAISoundStatus_Fv -/* 8028E038 38 00 00 01 */ li r0, 1 -/* 8028E03C 98 1F 01 20 */ stb r0, 0x120(r31) -lbl_8028E040: -/* 8028E040 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028E044 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028E048 7C 08 03 A6 */ mtlr r0 -/* 8028E04C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028E050 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl.s deleted file mode 100644 index 4ea0a46568..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8028E054: -/* 8028E054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E058 7C 08 02 A6 */ mflr r0 -/* 8028E05C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E064 7C 7F 1B 78 */ mr r31, r3 -/* 8028E068 80 63 01 18 */ lwz r3, 0x118(r3) -/* 8028E06C 28 03 00 00 */ cmplwi r3, 0 -/* 8028E070 41 82 00 10 */ beq lbl_8028E080 -/* 8028E074 48 01 44 69 */ bl stop__8JAISoundFUl -/* 8028E078 38 00 00 00 */ li r0, 0 -/* 8028E07C 98 1F 01 20 */ stb r0, 0x120(r31) -lbl_8028E080: -/* 8028E080 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E088 7C 08 03 A6 */ mtlr r0 -/* 8028E08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E090 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D728.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D728.s deleted file mode 100644 index 5082aa699a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D728.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8028D728: -/* 8028D728 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D72C 7C 08 02 A6 */ mflr r0 -/* 8028D730 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D734 38 80 00 00 */ li r4, 0 -/* 8028D738 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D73C 48 01 56 79 */ bl moveVolume__18JAISoundParamsMoveFfUl -/* 8028D740 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D744 7C 08 03 A6 */ mtlr r0 -/* 8028D748 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D74C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D750.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D750.s deleted file mode 100644 index d0906e1ccf..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D750.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8028D750: -/* 8028D750 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D754 7C 08 02 A6 */ mflr r0 -/* 8028D758 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D75C 38 80 00 00 */ li r4, 0 -/* 8028D760 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D764 48 01 57 59 */ bl movePan__18JAISoundParamsMoveFfUl -/* 8028D768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D76C 7C 08 03 A6 */ mtlr r0 -/* 8028D770 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D774 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D778.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D778.s deleted file mode 100644 index 0067a15891..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D778.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8028D778: -/* 8028D778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D77C 7C 08 02 A6 */ mflr r0 -/* 8028D780 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D784 38 80 00 00 */ li r4, 0 -/* 8028D788 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D78C 48 01 56 81 */ bl movePitch__18JAISoundParamsMoveFfUl -/* 8028D790 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D794 7C 08 03 A6 */ mtlr r0 -/* 8028D798 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D79C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D7A0.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D7A0.s deleted file mode 100644 index 8ffc509ff7..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D7A0.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028D7A0: -/* 8028D7A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028D7A4 7C 08 02 A6 */ mflr r0 -/* 8028D7A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028D7AC DB E1 00 10 */ stfd f31, 0x10(r1) -/* 8028D7B0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 8028D7B4 FF E0 08 90 */ fmr f31, f1 -/* 8028D7B8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028D7BC 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8028D7C0 7D 89 03 A6 */ mtctr r12 -/* 8028D7C4 4E 80 04 21 */ bctrl -/* 8028D7C8 28 03 00 00 */ cmplwi r3, 0 -/* 8028D7CC 41 82 00 1C */ beq lbl_8028D7E8 -/* 8028D7D0 D3 E3 00 00 */ stfs f31, 0(r3) -/* 8028D7D4 C0 02 BB 10 */ lfs f0, lit_1470(r2) -/* 8028D7D8 D0 03 00 04 */ stfs f0, 4(r3) -/* 8028D7DC 38 00 00 00 */ li r0, 0 -/* 8028D7E0 90 03 00 0C */ stw r0, 0xc(r3) -/* 8028D7E4 D0 03 00 08 */ stfs f0, 8(r3) -lbl_8028D7E8: -/* 8028D7E8 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 8028D7EC CB E1 00 10 */ lfd f31, 0x10(r1) -/* 8028D7F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028D7F4 7C 08 03 A6 */ mtlr r0 -/* 8028D7F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028D7FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D800.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D800.s deleted file mode 100644 index d3d5f24161..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D800.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8028D800: -/* 8028D800 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D804 7C 08 02 A6 */ mflr r0 -/* 8028D808 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D80C 38 80 00 00 */ li r4, 0 -/* 8028D810 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D814 48 01 56 51 */ bl moveFxMix__18JAISoundParamsMoveFfUl -/* 8028D818 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D81C 7C 08 03 A6 */ mtlr r0 -/* 8028D820 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D824 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D828.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D828.s deleted file mode 100644 index 546792def3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D828.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8028D828: -/* 8028D828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028D82C 7C 08 02 A6 */ mflr r0 -/* 8028D830 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028D834 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028D838 93 C1 00 08 */ stw r30, 8(r1) -/* 8028D83C 7C 7E 1B 78 */ mr r30, r3 -/* 8028D840 7C 9F 23 78 */ mr r31, r4 -/* 8028D844 7F C5 F3 78 */ mr r5, r30 -/* 8028D848 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028D84C 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028D850 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D854 38 00 00 00 */ li r0, 0 -/* 8028D858 90 1E 00 04 */ stw r0, 4(r30) -/* 8028D85C 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028D860 90 7E 00 08 */ stw r3, 8(r30) -/* 8028D864 38 00 00 0D */ li r0, 0xd -/* 8028D868 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8028D86C 3C 80 80 3C */ lis r4, __vt__Q27JStudio14TAdaptor_sound@ha /* 0x803C535C@ha */ -/* 8028D870 38 04 53 5C */ addi r0, r4, __vt__Q27JStudio14TAdaptor_sound@l /* 0x803C535C@l */ -/* 8028D874 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D878 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028D87C 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028D880 38 A0 00 00 */ li r5, 0 -/* 8028D884 38 C0 00 14 */ li r6, 0x14 -/* 8028D888 38 E0 00 0D */ li r7, 0xd -/* 8028D88C 48 0D 44 D5 */ bl __construct_array -/* 8028D890 3C 60 80 3C */ lis r3, __vt__Q215JStudio_JAudio214TAdaptor_sound@ha /* 0x803C5A88@ha */ -/* 8028D894 38 03 5A 88 */ addi r0, r3, __vt__Q215JStudio_JAudio214TAdaptor_sound@l /* 0x803C5A88@l */ -/* 8028D898 90 1E 00 00 */ stw r0, 0(r30) -/* 8028D89C 93 FE 01 14 */ stw r31, 0x114(r30) -/* 8028D8A0 38 60 00 00 */ li r3, 0 -/* 8028D8A4 90 7E 01 18 */ stw r3, 0x118(r30) -/* 8028D8A8 98 7E 01 1C */ stb r3, 0x11c(r30) -/* 8028D8AC 98 7E 01 1D */ stb r3, 0x11d(r30) -/* 8028D8B0 98 7E 01 1E */ stb r3, 0x11e(r30) -/* 8028D8B4 98 7E 01 1F */ stb r3, 0x11f(r30) -/* 8028D8B8 98 7E 01 20 */ stb r3, 0x120(r30) -/* 8028D8BC 38 00 FF FF */ li r0, -1 -/* 8028D8C0 90 1E 01 24 */ stw r0, 0x124(r30) -/* 8028D8C4 90 7E 01 28 */ stw r3, 0x128(r30) -/* 8028D8C8 90 7E 01 2C */ stw r3, 0x12c(r30) -/* 8028D8CC 90 7E 01 3C */ stw r3, 0x13c(r30) -/* 8028D8D0 90 1E 01 40 */ stw r0, 0x140(r30) -/* 8028D8D4 98 7E 01 44 */ stb r3, 0x144(r30) -/* 8028D8D8 7F C3 F3 78 */ mr r3, r30 -/* 8028D8DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028D8E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028D8E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028D8E8 7C 08 03 A6 */ mtlr r0 -/* 8028D8EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028D8F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC20.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC20.s deleted file mode 100644 index 455457c7f4..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC20.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028DC20: -/* 8028DC20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DC24 7C 08 02 A6 */ mflr r0 -/* 8028DC28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DC2C 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028DC30 41 82 00 08 */ beq lbl_8028DC38 -/* 8028DC34 48 00 00 10 */ b lbl_8028DC44 -lbl_8028DC38: -/* 8028DC38 80 05 00 00 */ lwz r0, 0(r5) -/* 8028DC3C 90 03 01 24 */ stw r0, 0x124(r3) -/* 8028DC40 48 00 02 C5 */ bl prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv -lbl_8028DC44: -/* 8028DC44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DC48 7C 08 03 A6 */ mtlr r0 -/* 8028DC4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DC50 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC54.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC54.s deleted file mode 100644 index 441c2dd355..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC54.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028DC54: -/* 8028DC54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DC58 7C 08 02 A6 */ mflr r0 -/* 8028DC5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DC60 2C 04 00 01 */ cmpwi r4, 1 -/* 8028DC64 41 82 00 08 */ beq lbl_8028DC6C -/* 8028DC68 48 00 00 10 */ b lbl_8028DC78 -lbl_8028DC6C: -/* 8028DC6C 38 00 00 00 */ li r0, 0 -/* 8028DC70 90 03 01 28 */ stw r0, 0x128(r3) -/* 8028DC74 48 00 03 31 */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv -lbl_8028DC78: -/* 8028DC78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DC7C 7C 08 03 A6 */ mtlr r0 -/* 8028DC80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DC84 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC88.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC88.s deleted file mode 100644 index 53db1f1c36..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC88.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8028DC88: -/* 8028DC88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DC8C 7C 08 02 A6 */ mflr r0 -/* 8028DC90 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DC94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028DC98 7C 7F 1B 78 */ mr r31, r3 -/* 8028DC9C 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DCA0 41 82 00 08 */ beq lbl_8028DCA8 -/* 8028DCA4 48 00 00 18 */ b lbl_8028DCBC -lbl_8028DCA8: -/* 8028DCA8 C0 25 00 00 */ lfs f1, 0(r5) -/* 8028DCAC 48 0D 44 01 */ bl __cvt_fp2unsigned -/* 8028DCB0 90 7F 01 28 */ stw r3, 0x128(r31) -/* 8028DCB4 7F E3 FB 78 */ mr r3, r31 -/* 8028DCB8 48 00 02 ED */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv -lbl_8028DCBC: -/* 8028DCBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028DCC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DCC4 7C 08 03 A6 */ mtlr r0 -/* 8028DCC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DCCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DCD0.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DCD0.s deleted file mode 100644 index 125a1cc6f2..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DCD0.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8028DCD0: -/* 8028DCD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DCD4 7C 08 02 A6 */ mflr r0 -/* 8028DCD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DCDC 2C 04 00 01 */ cmpwi r4, 1 -/* 8028DCE0 41 82 00 08 */ beq lbl_8028DCE8 -/* 8028DCE4 48 00 00 0C */ b lbl_8028DCF0 -lbl_8028DCE8: -/* 8028DCE8 38 80 00 00 */ li r4, 0 -/* 8028DCEC 48 00 03 69 */ bl endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl -lbl_8028DCF0: -/* 8028DCF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DCF4 7C 08 03 A6 */ mtlr r0 -/* 8028DCF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DCFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD00.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD00.s deleted file mode 100644 index 456ed6a931..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD00.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8028DD00: -/* 8028DD00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DD04 7C 08 02 A6 */ mflr r0 -/* 8028DD08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DD0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028DD10 7C 7F 1B 78 */ mr r31, r3 -/* 8028DD14 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DD18 41 82 00 08 */ beq lbl_8028DD20 -/* 8028DD1C 48 00 00 18 */ b lbl_8028DD34 -lbl_8028DD20: -/* 8028DD20 C0 25 00 00 */ lfs f1, 0(r5) -/* 8028DD24 48 0D 43 89 */ bl __cvt_fp2unsigned -/* 8028DD28 7C 64 1B 78 */ mr r4, r3 -/* 8028DD2C 7F E3 FB 78 */ mr r3, r31 -/* 8028DD30 48 00 03 25 */ bl endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl -lbl_8028DD34: -/* 8028DD34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028DD38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DD3C 7C 08 03 A6 */ mtlr r0 -/* 8028DD40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DD44 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD48.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD48.s deleted file mode 100644 index 7414944dfe..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD48.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8028DD48: -/* 8028DD48 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028DD4C 7C 08 02 A6 */ mflr r0 -/* 8028DD50 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028DD54 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028DD58 7C 7F 1B 78 */ mr r31, r3 -/* 8028DD5C 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028DD60 41 82 00 08 */ beq lbl_8028DD68 -/* 8028DD64 48 00 00 3C */ b lbl_8028DDA0 -lbl_8028DD68: -/* 8028DD68 38 00 00 00 */ li r0, 0 -/* 8028DD6C 90 1F 01 3C */ stw r0, 0x13c(r31) -/* 8028DD70 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 8028DD74 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8028DD78 38 81 00 08 */ addi r4, r1, 8 -/* 8028DD7C 38 C0 00 00 */ li r6, 0 -/* 8028DD80 81 83 00 00 */ lwz r12, 0(r3) -/* 8028DD84 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8028DD88 7D 89 03 A6 */ mtctr r12 -/* 8028DD8C 4E 80 04 21 */ bctrl -/* 8028DD90 2C 03 00 00 */ cmpwi r3, 0 -/* 8028DD94 40 82 00 0C */ bne lbl_8028DDA0 -/* 8028DD98 80 01 00 08 */ lwz r0, 8(r1) -/* 8028DD9C 90 1F 01 3C */ stw r0, 0x13c(r31) -lbl_8028DDA0: -/* 8028DDA0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028DDA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028DDA8 7C 08 03 A6 */ mtlr r0 -/* 8028DDAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028DDB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DDB4.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DDB4.s deleted file mode 100644 index 356709b5ba..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DDB4.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8028DDB4: -/* 8028DDB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DDB8 7C 08 02 A6 */ mflr r0 -/* 8028DDBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DDC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028DDC4 7C 7F 1B 78 */ mr r31, r3 -/* 8028DDC8 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028DDCC 41 82 00 4C */ beq lbl_8028DE18 -/* 8028DDD0 40 80 00 50 */ bge lbl_8028DE20 -/* 8028DDD4 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028DDD8 40 80 00 08 */ bge lbl_8028DDE0 -/* 8028DDDC 48 00 00 44 */ b lbl_8028DE20 -lbl_8028DDE0: -/* 8028DDE0 80 7F 01 3C */ lwz r3, 0x13c(r31) -/* 8028DDE4 28 03 00 00 */ cmplwi r3, 0 -/* 8028DDE8 41 82 00 38 */ beq lbl_8028DE20 -/* 8028DDEC 7C A4 2B 78 */ mr r4, r5 -/* 8028DDF0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028DDF4 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 8028DDF8 7D 89 03 A6 */ mtctr r12 -/* 8028DDFC 4E 80 04 21 */ bctrl -/* 8028DE00 90 7F 01 40 */ stw r3, 0x140(r31) -/* 8028DE04 80 7F 01 40 */ lwz r3, 0x140(r31) -/* 8028DE08 3C 03 00 01 */ addis r0, r3, 1 -/* 8028DE0C 28 00 FF FF */ cmplwi r0, 0xffff -/* 8028DE10 40 82 00 10 */ bne lbl_8028DE20 -/* 8028DE14 48 00 00 0C */ b lbl_8028DE20 -lbl_8028DE18: -/* 8028DE18 80 05 00 00 */ lwz r0, 0(r5) -/* 8028DE1C 90 1F 01 40 */ stw r0, 0x140(r31) -lbl_8028DE20: -/* 8028DE20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028DE24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DE28 7C 08 03 A6 */ mtlr r0 -/* 8028DE2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DE30 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE34.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE34.s deleted file mode 100644 index 049b27f3cb..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE34.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028DE34: -/* 8028DE34 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DE38 4C 82 00 20 */ bnelr -/* 8028DE3C 80 85 00 00 */ lwz r4, 0(r5) -/* 8028DE40 30 04 FF FF */ addic r0, r4, -1 -/* 8028DE44 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028DE48 98 03 01 44 */ stb r0, 0x144(r3) -/* 8028DE4C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE50.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE50.s deleted file mode 100644 index e82220c8af..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE50.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028DE50: -/* 8028DE50 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DE54 4C 82 00 20 */ bnelr -/* 8028DE58 80 85 00 00 */ lwz r4, 0(r5) -/* 8028DE5C 30 04 FF FF */ addic r0, r4, -1 -/* 8028DE60 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028DE64 98 03 01 1E */ stb r0, 0x11e(r3) -/* 8028DE68 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE6C.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE6C.s deleted file mode 100644 index 22d57ead22..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE6C.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028DE6C: -/* 8028DE6C 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DE70 4C 82 00 20 */ bnelr -/* 8028DE74 80 85 00 00 */ lwz r4, 0(r5) -/* 8028DE78 30 04 FF FF */ addic r0, r4, -1 -/* 8028DE7C 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028DE80 98 03 01 1D */ stb r0, 0x11d(r3) -/* 8028DE84 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE88.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE88.s deleted file mode 100644 index 664651187b..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE88.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8028DE88: -/* 8028DE88 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DE8C 4C 82 00 20 */ bnelr -/* 8028DE90 80 85 00 00 */ lwz r4, 0(r5) -/* 8028DE94 38 00 00 00 */ li r0, 0 -/* 8028DE98 90 03 01 2C */ stw r0, 0x12c(r3) -/* 8028DE9C 28 04 00 00 */ cmplwi r4, 0 -/* 8028DEA0 4D 82 00 20 */ beqlr -/* 8028DEA4 38 03 01 30 */ addi r0, r3, 0x130 -/* 8028DEA8 90 03 01 2C */ stw r0, 0x12c(r3) -/* 8028DEAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DEB0.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DEB0.s deleted file mode 100644 index 73c6319a66..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DEB0.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028DEB0: -/* 8028DEB0 2C 04 00 02 */ cmpwi r4, 2 -/* 8028DEB4 4C 82 00 20 */ bnelr -/* 8028DEB8 80 85 00 00 */ lwz r4, 0(r5) -/* 8028DEBC 30 04 FF FF */ addic r0, r4, -1 -/* 8028DEC0 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028DEC4 98 03 01 1F */ stb r0, 0x11f(r3) -/* 8028DEC8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DECC.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DECC.s deleted file mode 100644 index c9dcd236e8..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DECC.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028DECC: -/* 8028DECC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028DED0 7C 08 02 A6 */ mflr r0 -/* 8028DED4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028DED8 7C 65 1B 78 */ mr r5, r3 -/* 8028DEDC 80 64 01 18 */ lwz r3, 0x118(r4) -/* 8028DEE0 28 03 00 00 */ cmplwi r3, 0 -/* 8028DEE4 41 82 00 10 */ beq lbl_8028DEF4 -/* 8028DEE8 81 85 00 08 */ lwz r12, 8(r5) -/* 8028DEEC 7D 89 03 A6 */ mtctr r12 -/* 8028DEF0 4E 80 04 21 */ bctrl -lbl_8028DEF4: -/* 8028DEF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028DEF8 7C 08 03 A6 */ mtlr r0 -/* 8028DEFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028DF00 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028E0F4.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028E0F4.s deleted file mode 100644 index be4b92bf26..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028E0F4.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_8028E0F4: -/* 8028E0F4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8028E0F8 7C 08 02 A6 */ mflr r0 -/* 8028E0FC 90 01 00 64 */ stw r0, 0x64(r1) -/* 8028E100 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8028E104 3C 60 80 43 */ lis r3, aoData@ha /* 0x80431490@ha */ -/* 8028E108 3B E3 14 90 */ addi r31, r3, aoData@l /* 0x80431490@l */ -/* 8028E10C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E110 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E114 90 C1 00 44 */ stw r6, 0x44(r1) -/* 8028E118 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E11C 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E120 90 A1 00 44 */ stw r5, 0x44(r1) -/* 8028E124 38 80 00 07 */ li r4, 7 -/* 8028E128 90 81 00 48 */ stw r4, 0x48(r1) -/* 8028E12C 3C 60 80 29 */ lis r3, func_8028D728@ha /* 0x8028D728@ha */ -/* 8028E130 38 03 D7 28 */ addi r0, r3, func_8028D728@l /* 0x8028D728@l */ -/* 8028E134 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8028E138 90 DF 00 68 */ stw r6, 0x68(r31) -/* 8028E13C 90 BF 00 68 */ stw r5, 0x68(r31) -/* 8028E140 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E144 90 83 00 04 */ stw r4, 4(r3) -/* 8028E148 90 03 00 08 */ stw r0, 8(r3) -/* 8028E14C 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E150 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E154 38 BF 00 20 */ addi r5, r31, 0x20 -/* 8028E158 48 0D 3A CD */ bl __register_global_object -/* 8028E15C 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E160 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E164 90 01 00 44 */ stw r0, 0x44(r1) -/* 8028E168 38 61 00 44 */ addi r3, r1, 0x44 -/* 8028E16C 38 80 00 00 */ li r4, 0 -/* 8028E170 4B FF 7C 9D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E174 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E178 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E17C 90 C1 00 38 */ stw r6, 0x38(r1) -/* 8028E180 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E184 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E188 90 A1 00 38 */ stw r5, 0x38(r1) -/* 8028E18C 38 80 00 08 */ li r4, 8 -/* 8028E190 90 81 00 3C */ stw r4, 0x3c(r1) -/* 8028E194 3C 60 80 29 */ lis r3, func_8028D750@ha /* 0x8028D750@ha */ -/* 8028E198 38 03 D7 50 */ addi r0, r3, func_8028D750@l /* 0x8028D750@l */ -/* 8028E19C 90 01 00 40 */ stw r0, 0x40(r1) -/* 8028E1A0 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E1A4 90 C3 00 0C */ stw r6, 0xc(r3) -/* 8028E1A8 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8028E1AC 90 83 00 10 */ stw r4, 0x10(r3) -/* 8028E1B0 90 03 00 14 */ stw r0, 0x14(r3) -/* 8028E1B4 38 63 00 0C */ addi r3, r3, 0xc -/* 8028E1B8 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E1BC 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E1C0 38 BF 00 2C */ addi r5, r31, 0x2c -/* 8028E1C4 48 0D 3A 61 */ bl __register_global_object -/* 8028E1C8 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E1CC 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E1D0 90 01 00 38 */ stw r0, 0x38(r1) -/* 8028E1D4 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028E1D8 38 80 00 00 */ li r4, 0 -/* 8028E1DC 4B FF 7C 31 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E1E0 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E1E4 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E1E8 90 C1 00 2C */ stw r6, 0x2c(r1) -/* 8028E1EC 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E1F0 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E1F4 90 A1 00 2C */ stw r5, 0x2c(r1) -/* 8028E1F8 38 80 00 09 */ li r4, 9 -/* 8028E1FC 90 81 00 30 */ stw r4, 0x30(r1) -/* 8028E200 3C 60 80 29 */ lis r3, func_8028D778@ha /* 0x8028D778@ha */ -/* 8028E204 38 03 D7 78 */ addi r0, r3, func_8028D778@l /* 0x8028D778@l */ -/* 8028E208 90 01 00 34 */ stw r0, 0x34(r1) -/* 8028E20C 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E210 90 C3 00 18 */ stw r6, 0x18(r3) -/* 8028E214 90 A3 00 18 */ stw r5, 0x18(r3) -/* 8028E218 90 83 00 1C */ stw r4, 0x1c(r3) -/* 8028E21C 90 03 00 20 */ stw r0, 0x20(r3) -/* 8028E220 38 63 00 18 */ addi r3, r3, 0x18 -/* 8028E224 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E228 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E22C 38 BF 00 38 */ addi r5, r31, 0x38 -/* 8028E230 48 0D 39 F5 */ bl __register_global_object -/* 8028E234 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E238 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E23C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8028E240 38 61 00 2C */ addi r3, r1, 0x2c -/* 8028E244 38 80 00 00 */ li r4, 0 -/* 8028E248 4B FF 7B C5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E24C 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E250 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E254 90 C1 00 20 */ stw r6, 0x20(r1) -/* 8028E258 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E25C 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E260 90 A1 00 20 */ stw r5, 0x20(r1) -/* 8028E264 38 80 00 0A */ li r4, 0xa -/* 8028E268 90 81 00 24 */ stw r4, 0x24(r1) -/* 8028E26C 3C 60 80 29 */ lis r3, func_8028D7A0@ha /* 0x8028D7A0@ha */ -/* 8028E270 38 03 D7 A0 */ addi r0, r3, func_8028D7A0@l /* 0x8028D7A0@l */ -/* 8028E274 90 01 00 28 */ stw r0, 0x28(r1) -/* 8028E278 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E27C 90 C3 00 24 */ stw r6, 0x24(r3) -/* 8028E280 90 A3 00 24 */ stw r5, 0x24(r3) -/* 8028E284 90 83 00 28 */ stw r4, 0x28(r3) -/* 8028E288 90 03 00 2C */ stw r0, 0x2c(r3) -/* 8028E28C 38 63 00 24 */ addi r3, r3, 0x24 -/* 8028E290 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E294 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E298 38 BF 00 44 */ addi r5, r31, 0x44 -/* 8028E29C 48 0D 39 89 */ bl __register_global_object -/* 8028E2A0 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E2A4 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E2A8 90 01 00 20 */ stw r0, 0x20(r1) -/* 8028E2AC 38 61 00 20 */ addi r3, r1, 0x20 -/* 8028E2B0 38 80 00 00 */ li r4, 0 -/* 8028E2B4 4B FF 7B 59 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E2B8 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E2BC 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E2C0 90 C1 00 14 */ stw r6, 0x14(r1) -/* 8028E2C4 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E2C8 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E2CC 90 A1 00 14 */ stw r5, 0x14(r1) -/* 8028E2D0 38 80 00 0B */ li r4, 0xb -/* 8028E2D4 90 81 00 18 */ stw r4, 0x18(r1) -/* 8028E2D8 3C 60 80 29 */ lis r3, func_8028D800@ha /* 0x8028D800@ha */ -/* 8028E2DC 38 03 D8 00 */ addi r0, r3, func_8028D800@l /* 0x8028D800@l */ -/* 8028E2E0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8028E2E4 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E2E8 90 C3 00 30 */ stw r6, 0x30(r3) -/* 8028E2EC 90 A3 00 30 */ stw r5, 0x30(r3) -/* 8028E2F0 90 83 00 34 */ stw r4, 0x34(r3) -/* 8028E2F4 90 03 00 38 */ stw r0, 0x38(r3) -/* 8028E2F8 38 63 00 30 */ addi r3, r3, 0x30 -/* 8028E2FC 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E300 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E304 38 BF 00 50 */ addi r5, r31, 0x50 -/* 8028E308 48 0D 39 1D */ bl __register_global_object -/* 8028E30C 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E310 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E314 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E318 38 61 00 14 */ addi r3, r1, 0x14 -/* 8028E31C 38 80 00 00 */ li r4, 0 -/* 8028E320 4B FF 7A ED */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E324 3C 60 80 3C */ lis r3, __vt__Q37JStudio14TVariableValue7TOutput@ha /* 0x803C5640@ha */ -/* 8028E328 38 C3 56 40 */ addi r6, r3, __vt__Q37JStudio14TVariableValue7TOutput@l /* 0x803C5640@l */ -/* 8028E32C 90 C1 00 08 */ stw r6, 8(r1) -/* 8028E330 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E334 38 A3 5A 78 */ addi r5, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E338 90 A1 00 08 */ stw r5, 8(r1) -/* 8028E33C 38 80 FF FF */ li r4, -1 -/* 8028E340 90 81 00 0C */ stw r4, 0xc(r1) -/* 8028E344 38 00 00 00 */ li r0, 0 -/* 8028E348 90 01 00 10 */ stw r0, 0x10(r1) -/* 8028E34C 38 7F 00 68 */ addi r3, r31, 0x68 -/* 8028E350 90 C3 00 3C */ stw r6, 0x3c(r3) -/* 8028E354 90 A3 00 3C */ stw r5, 0x3c(r3) -/* 8028E358 90 83 00 40 */ stw r4, 0x40(r3) -/* 8028E35C 90 03 00 44 */ stw r0, 0x44(r3) -/* 8028E360 38 63 00 3C */ addi r3, r3, 0x3c -/* 8028E364 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha /* 0x8028E094@ha */ -/* 8028E368 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 0x8028E094@l */ -/* 8028E36C 38 BF 00 5C */ addi r5, r31, 0x5c -/* 8028E370 48 0D 38 B5 */ bl __register_global_object -/* 8028E374 3C 60 80 3C */ lis r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@ha /* 0x803C5A78@ha */ -/* 8028E378 38 03 5A 78 */ addi r0, r3, __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_@l /* 0x803C5A78@l */ -/* 8028E37C 90 01 00 08 */ stw r0, 8(r1) -/* 8028E380 38 61 00 08 */ addi r3, r1, 8 -/* 8028E384 38 80 00 00 */ li r4, 0 -/* 8028E388 4B FF 7A 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv -/* 8028E38C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 8028E390 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8028E394 7C 08 03 A6 */ mtlr r0 -/* 8028E398 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028E39C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv.s b/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv.s deleted file mode 100644 index 184b1a998f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JAudio2/object-sound/prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8028DF04: -/* 8028DF04 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028DF08 7C 08 02 A6 */ mflr r0 -/* 8028DF0C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028DF10 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028DF14 7C 7F 1B 78 */ mr r31, r3 -/* 8028DF18 80 63 01 18 */ lwz r3, 0x118(r3) -/* 8028DF1C 28 03 00 00 */ cmplwi r3, 0 -/* 8028DF20 41 82 00 08 */ beq lbl_8028DF28 -/* 8028DF24 48 01 46 75 */ bl stop__8JAISoundFv -lbl_8028DF28: -/* 8028DF28 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 8028DF2C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8028DF30 88 1F 01 1D */ lbz r0, 0x11d(r31) -/* 8028DF34 28 00 00 00 */ cmplwi r0, 0 -/* 8028DF38 40 82 00 2C */ bne lbl_8028DF64 -/* 8028DF3C 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8028DF40 90 01 00 0C */ stw r0, 0xc(r1) -/* 8028DF44 38 81 00 0C */ addi r4, r1, 0xc -/* 8028DF48 38 BF 01 18 */ addi r5, r31, 0x118 -/* 8028DF4C 80 DF 01 2C */ lwz r6, 0x12c(r31) -/* 8028DF50 81 83 00 00 */ lwz r12, 0(r3) -/* 8028DF54 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028DF58 7D 89 03 A6 */ mtctr r12 -/* 8028DF5C 4E 80 04 21 */ bctrl -/* 8028DF60 48 00 00 1C */ b lbl_8028DF7C -lbl_8028DF64: -/* 8028DF64 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 8028DF68 90 01 00 08 */ stw r0, 8(r1) -/* 8028DF6C 38 81 00 08 */ addi r4, r1, 8 -/* 8028DF70 38 BF 01 18 */ addi r5, r31, 0x118 -/* 8028DF74 80 DF 01 2C */ lwz r6, 0x12c(r31) -/* 8028DF78 48 01 50 75 */ bl func_802A2FEC -lbl_8028DF7C: -/* 8028DF7C 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 8028DF80 28 03 00 00 */ cmplwi r3, 0 -/* 8028DF84 41 82 00 0C */ beq lbl_8028DF90 -/* 8028DF88 38 63 00 1C */ addi r3, r3, 0x1c -/* 8028DF8C 48 01 42 95 */ bl lockWhenPrepared__15JAISoundStatus_Fv -lbl_8028DF90: -/* 8028DF90 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028DF94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028DF98 7C 08 03 A6 */ mtlr r0 -/* 8028DF9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028DFA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/control/__dt__Q217JStudio_JParticle13TCreateObjectFv.s b/asm/JSystem/JStudio/JStudio_JParticle/control/__dt__Q217JStudio_JParticle13TCreateObjectFv.s deleted file mode 100644 index 7c70fe1814..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/control/__dt__Q217JStudio_JParticle13TCreateObjectFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028E3A0: -/* 8028E3A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E3A4 7C 08 02 A6 */ mflr r0 -/* 8028E3A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E3AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E3B0 93 C1 00 08 */ stw r30, 8(r1) -/* 8028E3B4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028E3B8 7C 9F 23 78 */ mr r31, r4 -/* 8028E3BC 41 82 00 28 */ beq lbl_8028E3E4 -/* 8028E3C0 3C 80 80 3C */ lis r4, __vt__Q217JStudio_JParticle13TCreateObject@ha /* 0x803C5AD8@ha */ -/* 8028E3C4 38 04 5A D8 */ addi r0, r4, __vt__Q217JStudio_JParticle13TCreateObject@l /* 0x803C5AD8@l */ -/* 8028E3C8 90 1E 00 00 */ stw r0, 0(r30) -/* 8028E3CC 38 80 00 00 */ li r4, 0 -/* 8028E3D0 4B FF 70 B9 */ bl __dt__Q27JStudio13TCreateObjectFv -/* 8028E3D4 7F E0 07 35 */ extsh. r0, r31 -/* 8028E3D8 40 81 00 0C */ ble lbl_8028E3E4 -/* 8028E3DC 7F C3 F3 78 */ mr r3, r30 -/* 8028E3E0 48 04 09 5D */ bl __dl__FPv -lbl_8028E3E4: -/* 8028E3E4 7F C3 F3 78 */ mr r3, r30 -/* 8028E3E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E3EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028E3F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E3F4 7C 08 03 A6 */ mtlr r0 -/* 8028E3F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E3FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_create__Q217JStudio_JParticle13TCreateObjectFUl.s b/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_create__Q217JStudio_JParticle13TCreateObjectFUl.s deleted file mode 100644 index ea57952dee..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_create__Q217JStudio_JParticle13TCreateObjectFUl.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8028E474: -/* 8028E474 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028E478 7C 08 02 A6 */ mflr r0 -/* 8028E47C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028E480 7C 87 23 78 */ mr r7, r4 -/* 8028E484 3C 80 80 3A */ lis r4, lit_1172@ha /* 0x8039ABA8@ha */ -/* 8028E488 38 A4 AB A8 */ addi r5, r4, lit_1172@l /* 0x8039ABA8@l */ -/* 8028E48C 80 85 00 00 */ lwz r4, 0(r5) -/* 8028E490 80 05 00 04 */ lwz r0, 4(r5) -/* 8028E494 90 81 00 08 */ stw r4, 8(r1) -/* 8028E498 90 01 00 0C */ stw r0, 0xc(r1) -/* 8028E49C 80 05 00 08 */ lwz r0, 8(r5) -/* 8028E4A0 90 01 00 10 */ stw r0, 0x10(r1) -/* 8028E4A4 38 81 00 14 */ addi r4, r1, 0x14 -/* 8028E4A8 E0 21 00 08 */ psq_l f1, 8(r1), 0, 0 /* qr0 */ -/* 8028E4AC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8028E4B0 F0 24 00 00 */ psq_st f1, 0(r4), 0, 0 /* qr0 */ -/* 8028E4B4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8028E4B8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8028E4BC 54 E5 04 3E */ clrlwi r5, r7, 0x10 -/* 8028E4C0 54 E6 46 3E */ srwi r6, r7, 0x18 -/* 8028E4C4 54 E7 86 3E */ rlwinm r7, r7, 0x10, 0x18, 0x1f -/* 8028E4C8 39 00 00 00 */ li r8, 0 -/* 8028E4CC 39 20 00 00 */ li r9, 0 -/* 8028E4D0 4B FE F9 ED */ bl func_8027DEBC -/* 8028E4D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028E4D8 7C 08 03 A6 */ mtlr r0 -/* 8028E4DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028E4E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter.s b/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter.s deleted file mode 100644 index e1ff357aae..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/control/emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028E4E4: -/* 8028E4E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E4E8 7C 08 02 A6 */ mflr r0 -/* 8028E4EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E4F0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8028E4F4 4B FE FD E5 */ bl forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter -/* 8028E4F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E4FC 7C 08 03 A6 */ mtlr r0 -/* 8028E500 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E504 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E400.s b/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E400.s deleted file mode 100644 index bfe1c2120e..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E400.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8028E400: -/* 8028E400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E404 7C 08 02 A6 */ mflr r0 -/* 8028E408 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E40C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E410 7C 66 1B 78 */ mr r6, r3 -/* 8028E414 7C 9F 23 78 */ mr r31, r4 -/* 8028E418 80 65 00 00 */ lwz r3, 0(r5) -/* 8028E41C 80 83 00 04 */ lwz r4, 4(r3) -/* 8028E420 3C 60 4A 50 */ lis r3, 0x4A50 /* 0x4A505443@ha */ -/* 8028E424 38 03 54 43 */ addi r0, r3, 0x5443 /* 0x4A505443@l */ -/* 8028E428 7C 04 00 00 */ cmpw r4, r0 -/* 8028E42C 41 82 00 08 */ beq lbl_8028E434 -/* 8028E430 48 00 00 10 */ b lbl_8028E440 -lbl_8028E434: -/* 8028E434 3C 60 80 29 */ lis r3, createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject@ha /* 0x8028E508@ha */ -/* 8028E438 39 83 E5 08 */ addi r12, r3, createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject@l /* 0x8028E508@l */ -/* 8028E43C 48 00 00 0C */ b lbl_8028E448 -lbl_8028E440: -/* 8028E440 38 60 00 00 */ li r3, 0 -/* 8028E444 48 00 00 1C */ b lbl_8028E460 -lbl_8028E448: -/* 8028E448 7C A3 2B 78 */ mr r3, r5 -/* 8028E44C 7C C4 33 78 */ mr r4, r6 -/* 8028E450 7D 89 03 A6 */ mtctr r12 -/* 8028E454 4E 80 04 21 */ bctrl -/* 8028E458 90 7F 00 00 */ stw r3, 0(r31) -/* 8028E45C 38 60 00 01 */ li r3, 1 -lbl_8028E460: -/* 8028E460 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E468 7C 08 03 A6 */ mtlr r0 -/* 8028E46C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E470 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E508.s b/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E508.s deleted file mode 100644 index d6026baa92..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E508.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8028E508: -/* 8028E508 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028E50C 7C 08 02 A6 */ mflr r0 -/* 8028E510 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028E514 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028E518 48 0D 3C C5 */ bl _savegpr_29 -/* 8028E51C 7C 7D 1B 78 */ mr r29, r3 -/* 8028E520 7C 9E 23 78 */ mr r30, r4 -/* 8028E524 38 60 01 DC */ li r3, 0x1dc -/* 8028E528 48 04 07 25 */ bl __nw__FUl -/* 8028E52C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8028E530 41 82 00 10 */ beq lbl_8028E540 -/* 8028E534 7F C4 F3 78 */ mr r4, r30 -/* 8028E538 48 00 00 D5 */ bl __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject -/* 8028E53C 7C 7F 1B 78 */ mr r31, r3 -lbl_8028E540: -/* 8028E540 28 1F 00 00 */ cmplwi r31, 0 -/* 8028E544 40 82 00 0C */ bne lbl_8028E550 -/* 8028E548 38 60 00 00 */ li r3, 0 -/* 8028E54C 48 00 00 A8 */ b lbl_8028E5F4 -lbl_8028E550: -/* 8028E550 93 E1 00 08 */ stw r31, 8(r1) -/* 8028E554 88 1E 00 14 */ lbz r0, 0x14(r30) -/* 8028E558 98 1F 01 B4 */ stb r0, 0x1b4(r31) -/* 8028E55C 38 60 00 38 */ li r3, 0x38 -/* 8028E560 48 04 06 ED */ bl __nw__FUl -/* 8028E564 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028E568 41 82 00 14 */ beq lbl_8028E57C -/* 8028E56C 7F A4 EB 78 */ mr r4, r29 -/* 8028E570 7F E5 FB 78 */ mr r5, r31 -/* 8028E574 4B FF 91 F9 */ bl __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle -/* 8028E578 7C 7E 1B 78 */ mr r30, r3 -lbl_8028E57C: -/* 8028E57C 28 1E 00 00 */ cmplwi r30, 0 -/* 8028E580 40 82 00 0C */ bne lbl_8028E58C -/* 8028E584 3B C0 00 00 */ li r30, 0 -/* 8028E588 48 00 00 28 */ b lbl_8028E5B0 -lbl_8028E58C: -/* 8028E58C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028E590 28 03 00 00 */ cmplwi r3, 0 -/* 8028E594 41 82 00 1C */ beq lbl_8028E5B0 -/* 8028E598 93 C3 00 04 */ stw r30, 4(r3) -/* 8028E59C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8028E5A0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028E5A4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028E5A8 7D 89 03 A6 */ mtctr r12 -/* 8028E5AC 4E 80 04 21 */ bctrl -lbl_8028E5B0: -/* 8028E5B0 28 1E 00 00 */ cmplwi r30, 0 -/* 8028E5B4 40 82 00 2C */ bne lbl_8028E5E0 -/* 8028E5B8 80 61 00 08 */ lwz r3, 8(r1) -/* 8028E5BC 28 03 00 00 */ cmplwi r3, 0 -/* 8028E5C0 41 82 00 18 */ beq lbl_8028E5D8 -/* 8028E5C4 38 80 00 01 */ li r4, 1 -/* 8028E5C8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028E5CC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8028E5D0 7D 89 03 A6 */ mtctr r12 -/* 8028E5D4 4E 80 04 21 */ bctrl -lbl_8028E5D8: -/* 8028E5D8 38 60 00 00 */ li r3, 0 -/* 8028E5DC 48 00 00 18 */ b lbl_8028E5F4 -lbl_8028E5E0: -/* 8028E5E0 38 00 00 00 */ li r0, 0 -/* 8028E5E4 90 01 00 08 */ stw r0, 8(r1) -/* 8028E5E8 48 00 00 08 */ b lbl_8028E5F0 -/* 8028E5EC 4E 80 04 21 */ bctrl -lbl_8028E5F0: -/* 8028E5F0 7F C3 F3 78 */ mr r3, r30 -lbl_8028E5F4: -/* 8028E5F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028E5F8 48 0D 3C 31 */ bl _restgpr_29 -/* 8028E5FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028E600 7C 08 03 A6 */ mtlr r0 -/* 8028E604 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028E608 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/__dt__Q217JStudio_JParticle17TAdaptor_particleFv.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/__dt__Q217JStudio_JParticle17TAdaptor_particleFv.s deleted file mode 100644 index 794681a5c3..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/__dt__Q217JStudio_JParticle17TAdaptor_particleFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8028E760: -/* 8028E760 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E764 7C 08 02 A6 */ mflr r0 -/* 8028E768 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E76C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E770 93 C1 00 08 */ stw r30, 8(r1) -/* 8028E774 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028E778 7C 9F 23 78 */ mr r31, r4 -/* 8028E77C 41 82 00 B8 */ beq lbl_8028E834 -/* 8028E780 3C 60 80 3C */ lis r3, __vt__Q217JStudio_JParticle17TAdaptor_particle@ha /* 0x803C5B0C@ha */ -/* 8028E784 38 03 5B 0C */ addi r0, r3, __vt__Q217JStudio_JParticle17TAdaptor_particle@l /* 0x803C5B0C@l */ -/* 8028E788 90 1E 00 00 */ stw r0, 0(r30) -/* 8028E78C 80 9E 01 A4 */ lwz r4, 0x1a4(r30) -/* 8028E790 28 04 00 00 */ cmplwi r4, 0 -/* 8028E794 41 82 00 64 */ beq lbl_8028E7F8 -/* 8028E798 88 1E 01 B6 */ lbz r0, 0x1b6(r30) -/* 8028E79C 28 00 00 00 */ cmplwi r0, 0 -/* 8028E7A0 40 82 00 1C */ bne lbl_8028E7BC -/* 8028E7A4 80 7E 01 A0 */ lwz r3, 0x1a0(r30) -/* 8028E7A8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028E7AC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028E7B0 7D 89 03 A6 */ mtctr r12 -/* 8028E7B4 4E 80 04 21 */ bctrl -/* 8028E7B8 48 00 00 40 */ b lbl_8028E7F8 -lbl_8028E7BC: -/* 8028E7BC 88 1E 01 B4 */ lbz r0, 0x1b4(r30) -/* 8028E7C0 28 00 00 00 */ cmplwi r0, 0 -/* 8028E7C4 41 82 00 20 */ beq lbl_8028E7E4 -/* 8028E7C8 80 1E 01 B0 */ lwz r0, 0x1b0(r30) -/* 8028E7CC 90 04 00 EC */ stw r0, 0xec(r4) -/* 8028E7D0 80 7E 01 A4 */ lwz r3, 0x1a4(r30) -/* 8028E7D4 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8028E7D8 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 8028E7DC 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8028E7E0 48 00 00 18 */ b lbl_8028E7F8 -lbl_8028E7E4: -/* 8028E7E4 80 7E 01 A0 */ lwz r3, 0x1a0(r30) -/* 8028E7E8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028E7EC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028E7F0 7D 89 03 A6 */ mtctr r12 -/* 8028E7F4 4E 80 04 21 */ bctrl -lbl_8028E7F8: -/* 8028E7F8 34 1E 01 A8 */ addic. r0, r30, 0x1a8 -/* 8028E7FC 41 82 00 1C */ beq lbl_8028E818 -/* 8028E800 3C 60 80 3C */ lis r3, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@ha /* 0x803C5AF0@ha */ -/* 8028E804 38 03 5A F0 */ addi r0, r3, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@l /* 0x803C5AF0@l */ -/* 8028E808 90 1E 01 A8 */ stw r0, 0x1a8(r30) -/* 8028E80C 38 7E 01 A8 */ addi r3, r30, 0x1a8 -/* 8028E810 38 80 00 00 */ li r4, 0 -/* 8028E814 4B FE FE 91 */ bl __dt__18JPAEmitterCallBackFv -lbl_8028E818: -/* 8028E818 7F C3 F3 78 */ mr r3, r30 -/* 8028E81C 38 80 00 00 */ li r4, 0 -/* 8028E820 4B FF 8E ED */ bl __dt__Q27JStudio17TAdaptor_particleFv -/* 8028E824 7F E0 07 35 */ extsh. r0, r31 -/* 8028E828 40 81 00 0C */ ble lbl_8028E834 -/* 8028E82C 7F C3 F3 78 */ mr r3, r30 -/* 8028E830 48 04 05 0D */ bl __dl__FPv -lbl_8028E834: -/* 8028E834 7F C3 F3 78 */ mr r3, r30 -/* 8028E838 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E83C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028E840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E844 7C 08 03 A6 */ mtlr r0 -/* 8028E848 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E84C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv.s deleted file mode 100644 index 3f19f6b166..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_8028E850: -/* 8028E850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E854 7C 08 02 A6 */ mflr r0 -/* 8028E858 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E85C 88 0D 8C 80 */ lbz r0, data_80451200(r13) -/* 8028E860 7C 00 07 75 */ extsb. r0, r0 -/* 8028E864 40 82 00 FC */ bne lbl_8028E960 -/* 8028E868 38 00 00 00 */ li r0, 0 -/* 8028E86C 3C 80 80 43 */ lis r4, aoData@ha /* 0x80431540@ha */ -/* 8028E870 38 C4 15 40 */ addi r6, r4, aoData@l /* 0x80431540@l */ -/* 8028E874 90 06 00 00 */ stw r0, 0(r6) -/* 8028E878 C0 02 BB 20 */ lfs f0, lit_1361(r2) -/* 8028E87C D0 06 00 04 */ stfs f0, 4(r6) -/* 8028E880 38 A0 00 01 */ li r5, 1 -/* 8028E884 90 A6 00 08 */ stw r5, 8(r6) -/* 8028E888 D0 06 00 0C */ stfs f0, 0xc(r6) -/* 8028E88C 38 00 00 02 */ li r0, 2 -/* 8028E890 90 06 00 10 */ stw r0, 0x10(r6) -/* 8028E894 D0 06 00 14 */ stfs f0, 0x14(r6) -/* 8028E898 38 00 00 03 */ li r0, 3 -/* 8028E89C 90 06 00 18 */ stw r0, 0x18(r6) -/* 8028E8A0 D0 06 00 1C */ stfs f0, 0x1c(r6) -/* 8028E8A4 38 00 00 04 */ li r0, 4 -/* 8028E8A8 90 06 00 20 */ stw r0, 0x20(r6) -/* 8028E8AC D0 06 00 24 */ stfs f0, 0x24(r6) -/* 8028E8B0 38 00 00 05 */ li r0, 5 -/* 8028E8B4 90 06 00 28 */ stw r0, 0x28(r6) -/* 8028E8B8 D0 06 00 2C */ stfs f0, 0x2c(r6) -/* 8028E8BC 38 00 00 06 */ li r0, 6 -/* 8028E8C0 90 06 00 30 */ stw r0, 0x30(r6) -/* 8028E8C4 C0 02 BB 24 */ lfs f0, lit_1362(r2) -/* 8028E8C8 D0 06 00 34 */ stfs f0, 0x34(r6) -/* 8028E8CC 38 00 00 07 */ li r0, 7 -/* 8028E8D0 90 06 00 38 */ stw r0, 0x38(r6) -/* 8028E8D4 D0 06 00 3C */ stfs f0, 0x3c(r6) -/* 8028E8D8 38 00 00 08 */ li r0, 8 -/* 8028E8DC 90 06 00 40 */ stw r0, 0x40(r6) -/* 8028E8E0 D0 06 00 44 */ stfs f0, 0x44(r6) -/* 8028E8E4 38 00 00 09 */ li r0, 9 -/* 8028E8E8 90 06 00 48 */ stw r0, 0x48(r6) -/* 8028E8EC C0 02 BB 28 */ lfs f0, lit_1363(r2) -/* 8028E8F0 D0 06 00 4C */ stfs f0, 0x4c(r6) -/* 8028E8F4 38 00 00 0A */ li r0, 0xa -/* 8028E8F8 90 06 00 50 */ stw r0, 0x50(r6) -/* 8028E8FC D0 06 00 54 */ stfs f0, 0x54(r6) -/* 8028E900 38 00 00 0B */ li r0, 0xb -/* 8028E904 90 06 00 58 */ stw r0, 0x58(r6) -/* 8028E908 D0 06 00 5C */ stfs f0, 0x5c(r6) -/* 8028E90C 38 00 00 0C */ li r0, 0xc -/* 8028E910 90 06 00 60 */ stw r0, 0x60(r6) -/* 8028E914 D0 06 00 64 */ stfs f0, 0x64(r6) -/* 8028E918 38 00 00 0D */ li r0, 0xd -/* 8028E91C 90 06 00 68 */ stw r0, 0x68(r6) -/* 8028E920 D0 06 00 6C */ stfs f0, 0x6c(r6) -/* 8028E924 38 00 00 0E */ li r0, 0xe -/* 8028E928 90 06 00 70 */ stw r0, 0x70(r6) -/* 8028E92C D0 06 00 74 */ stfs f0, 0x74(r6) -/* 8028E930 38 00 00 0F */ li r0, 0xf -/* 8028E934 90 06 00 78 */ stw r0, 0x78(r6) -/* 8028E938 D0 06 00 7C */ stfs f0, 0x7c(r6) -/* 8028E93C 38 00 00 10 */ li r0, 0x10 -/* 8028E940 90 06 00 80 */ stw r0, 0x80(r6) -/* 8028E944 D0 06 00 84 */ stfs f0, 0x84(r6) -/* 8028E948 3C 80 80 45 */ lis r4, __float_nan@ha /* 0x80450AE0@ha */ -/* 8028E94C C0 04 0A E0 */ lfs f0, __float_nan@l(r4) /* 0x80450AE0@l */ -/* 8028E950 38 00 FF FF */ li r0, -1 -/* 8028E954 90 06 00 88 */ stw r0, 0x88(r6) -/* 8028E958 D0 06 00 8C */ stfs f0, 0x8c(r6) -/* 8028E95C 98 AD 8C 80 */ stb r5, data_80451200(r13) -lbl_8028E960: -/* 8028E960 3C 80 80 43 */ lis r4, aoData@ha /* 0x80431540@ha */ -/* 8028E964 38 84 15 40 */ addi r4, r4, aoData@l /* 0x80431540@l */ -/* 8028E968 4B FF 78 59 */ bl adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate -/* 8028E96C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E970 7C 08 03 A6 */ mtlr r0 -/* 8028E974 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E978 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl.s deleted file mode 100644 index 9e2ed7d6b1..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8028E980: -/* 8028E980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E984 7C 08 02 A6 */ mflr r0 -/* 8028E988 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E98C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E990 7C 7F 1B 78 */ mr r31, r3 -/* 8028E994 80 63 01 C0 */ lwz r3, 0x1c0(r3) -/* 8028E998 28 03 00 00 */ cmplwi r3, 0 -/* 8028E99C 41 82 00 8C */ beq lbl_8028EA28 -/* 8028E9A0 80 1F 01 C4 */ lwz r0, 0x1c4(r31) -/* 8028E9A4 7C 00 18 40 */ cmplw r0, r3 -/* 8028E9A8 40 80 00 80 */ bge lbl_8028EA28 -/* 8028E9AC 7C 00 22 14 */ add r0, r0, r4 -/* 8028E9B0 90 1F 01 C4 */ stw r0, 0x1c4(r31) -/* 8028E9B4 80 7F 01 C4 */ lwz r3, 0x1c4(r31) -/* 8028E9B8 80 1F 01 C0 */ lwz r0, 0x1c0(r31) -/* 8028E9BC 7C 03 00 40 */ cmplw r3, r0 -/* 8028E9C0 41 80 00 68 */ blt lbl_8028EA28 -/* 8028E9C4 88 1F 01 B8 */ lbz r0, 0x1b8(r31) -/* 8028E9C8 2C 00 00 02 */ cmpwi r0, 2 -/* 8028E9CC 41 82 00 50 */ beq lbl_8028EA1C -/* 8028E9D0 40 80 00 10 */ bge lbl_8028E9E0 -/* 8028E9D4 2C 00 00 01 */ cmpwi r0, 1 -/* 8028E9D8 40 80 00 14 */ bge lbl_8028E9EC -/* 8028E9DC 48 00 00 40 */ b lbl_8028EA1C -lbl_8028E9E0: -/* 8028E9E0 2C 00 00 04 */ cmpwi r0, 4 -/* 8028E9E4 40 80 00 38 */ bge lbl_8028EA1C -/* 8028E9E8 48 00 00 10 */ b lbl_8028E9F8 -lbl_8028E9EC: -/* 8028E9EC 38 00 00 02 */ li r0, 2 -/* 8028E9F0 98 1F 01 B8 */ stb r0, 0x1b8(r31) -/* 8028E9F4 48 00 00 28 */ b lbl_8028EA1C -lbl_8028E9F8: -/* 8028E9F8 80 7F 01 A0 */ lwz r3, 0x1a0(r31) -/* 8028E9FC 80 9F 01 A4 */ lwz r4, 0x1a4(r31) -/* 8028EA00 81 83 00 00 */ lwz r12, 0(r3) -/* 8028EA04 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028EA08 7D 89 03 A6 */ mtctr r12 -/* 8028EA0C 4E 80 04 21 */ bctrl -/* 8028EA10 38 00 00 00 */ li r0, 0 -/* 8028EA14 90 1F 01 A4 */ stw r0, 0x1a4(r31) -/* 8028EA18 98 1F 01 B8 */ stb r0, 0x1b8(r31) -lbl_8028EA1C: -/* 8028EA1C 38 00 00 00 */ li r0, 0 -/* 8028EA20 90 1F 01 C0 */ stw r0, 0x1c0(r31) -/* 8028EA24 90 1F 01 C4 */ stw r0, 0x1c4(r31) -lbl_8028EA28: -/* 8028EA28 88 1F 01 B5 */ lbz r0, 0x1b5(r31) -/* 8028EA2C 28 00 00 00 */ cmplwi r0, 0 -/* 8028EA30 41 82 00 24 */ beq lbl_8028EA54 -/* 8028EA34 88 1F 01 B7 */ lbz r0, 0x1b7(r31) -/* 8028EA38 28 00 00 00 */ cmplwi r0, 0 -/* 8028EA3C 41 82 00 18 */ beq lbl_8028EA54 -/* 8028EA40 80 1F 01 A4 */ lwz r0, 0x1a4(r31) -/* 8028EA44 28 00 00 00 */ cmplwi r0, 0 -/* 8028EA48 40 82 00 0C */ bne lbl_8028EA54 -/* 8028EA4C 7F E3 FB 78 */ mr r3, r31 -/* 8028EA50 48 00 06 B9 */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv -lbl_8028EA54: -/* 8028EA54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028EA58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028EA5C 7C 08 03 A6 */ mtlr r0 -/* 8028EA60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028EA64 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E60C.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E60C.s deleted file mode 100644 index 7fbc15bf02..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E60C.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8028E60C: -/* 8028E60C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E610 7C 08 02 A6 */ mflr r0 -/* 8028E614 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E618 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E61C 93 C1 00 08 */ stw r30, 8(r1) -/* 8028E620 7C 7F 1B 78 */ mr r31, r3 -/* 8028E624 7C 9E 23 78 */ mr r30, r4 -/* 8028E628 7F E5 FB 78 */ mr r5, r31 -/* 8028E62C 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028E630 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028E634 90 1F 00 00 */ stw r0, 0(r31) -/* 8028E638 38 00 00 00 */ li r0, 0 -/* 8028E63C 90 1F 00 04 */ stw r0, 4(r31) -/* 8028E640 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028E644 90 7F 00 08 */ stw r3, 8(r31) -/* 8028E648 38 00 00 14 */ li r0, 0x14 -/* 8028E64C 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8028E650 3C 80 80 3C */ lis r4, __vt__Q27JStudio17TAdaptor_particle@ha /* 0x803C53CC@ha */ -/* 8028E654 38 04 53 CC */ addi r0, r4, __vt__Q27JStudio17TAdaptor_particle@l /* 0x803C53CC@l */ -/* 8028E658 90 1F 00 00 */ stw r0, 0(r31) -/* 8028E65C 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028E660 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028E664 38 A0 00 00 */ li r5, 0 -/* 8028E668 38 C0 00 14 */ li r6, 0x14 -/* 8028E66C 38 E0 00 14 */ li r7, 0x14 -/* 8028E670 48 0D 36 F1 */ bl __construct_array -/* 8028E674 3C 60 80 3C */ lis r3, __vt__Q217JStudio_JParticle17TAdaptor_particle@ha /* 0x803C5B0C@ha */ -/* 8028E678 38 03 5B 0C */ addi r0, r3, __vt__Q217JStudio_JParticle17TAdaptor_particle@l /* 0x803C5B0C@l */ -/* 8028E67C 90 1F 00 00 */ stw r0, 0(r31) -/* 8028E680 93 DF 01 A0 */ stw r30, 0x1a0(r31) -/* 8028E684 38 80 00 00 */ li r4, 0 -/* 8028E688 90 9F 01 A4 */ stw r4, 0x1a4(r31) -/* 8028E68C 3C 60 80 3B */ lis r3, __vt__18JPAEmitterCallBack@ha /* 0x803A8578@ha */ -/* 8028E690 38 03 85 78 */ addi r0, r3, __vt__18JPAEmitterCallBack@l /* 0x803A8578@l */ -/* 8028E694 90 1F 01 A8 */ stw r0, 0x1a8(r31) -/* 8028E698 3C 60 80 3C */ lis r3, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@ha /* 0x803C5AF0@ha */ -/* 8028E69C 38 03 5A F0 */ addi r0, r3, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@l /* 0x803C5AF0@l */ -/* 8028E6A0 90 1F 01 A8 */ stw r0, 0x1a8(r31) -/* 8028E6A4 93 FF 01 AC */ stw r31, 0x1ac(r31) -/* 8028E6A8 90 9F 01 B0 */ stw r4, 0x1b0(r31) -/* 8028E6AC 98 9F 01 B4 */ stb r4, 0x1b4(r31) -/* 8028E6B0 98 9F 01 B5 */ stb r4, 0x1b5(r31) -/* 8028E6B4 98 9F 01 B6 */ stb r4, 0x1b6(r31) -/* 8028E6B8 98 9F 01 B7 */ stb r4, 0x1b7(r31) -/* 8028E6BC 98 9F 01 B8 */ stb r4, 0x1b8(r31) -/* 8028E6C0 38 00 FF FF */ li r0, -1 -/* 8028E6C4 90 1F 01 BC */ stw r0, 0x1bc(r31) -/* 8028E6C8 90 9F 01 C0 */ stw r4, 0x1c0(r31) -/* 8028E6CC 90 9F 01 C4 */ stw r4, 0x1c4(r31) -/* 8028E6D0 90 9F 01 C8 */ stw r4, 0x1c8(r31) -/* 8028E6D4 90 9F 01 CC */ stw r4, 0x1cc(r31) -/* 8028E6D8 90 9F 01 D0 */ stw r4, 0x1d0(r31) -/* 8028E6DC 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 8028E6E0 98 9F 01 D8 */ stb r4, 0x1d8(r31) -/* 8028E6E4 7F E3 FB 78 */ mr r3, r31 -/* 8028E6E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E6EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028E6F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E6F4 7C 08 03 A6 */ mtlr r0 -/* 8028E6F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E6FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E700.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E700.s deleted file mode 100644 index 9c25b4c194..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E700.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8028E700: -/* 8028E700 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028E704 7C 08 02 A6 */ mflr r0 -/* 8028E708 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028E70C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028E710 93 C1 00 08 */ stw r30, 8(r1) -/* 8028E714 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028E718 7C 9F 23 78 */ mr r31, r4 -/* 8028E71C 41 82 00 28 */ beq lbl_8028E744 -/* 8028E720 3C 80 80 3C */ lis r4, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@ha /* 0x803C5AF0@ha */ -/* 8028E724 38 04 5A F0 */ addi r0, r4, __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_@l /* 0x803C5AF0@l */ -/* 8028E728 90 1E 00 00 */ stw r0, 0(r30) -/* 8028E72C 38 80 00 00 */ li r4, 0 -/* 8028E730 4B FE FF 75 */ bl __dt__18JPAEmitterCallBackFv -/* 8028E734 7F E0 07 35 */ extsh. r0, r31 -/* 8028E738 40 81 00 0C */ ble lbl_8028E744 -/* 8028E73C 7F C3 F3 78 */ mr r3, r30 -/* 8028E740 48 04 05 FD */ bl __dl__FPv -lbl_8028E744: -/* 8028E744 7F C3 F3 78 */ mr r3, r30 -/* 8028E748 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028E74C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028E750 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028E754 7C 08 03 A6 */ mtlr r0 -/* 8028E758 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028E75C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA68.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA68.s deleted file mode 100644 index 15cbe22535..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA68.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028EA68: -/* 8028EA68 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028EA6C 4C 82 00 20 */ bnelr -/* 8028EA70 80 05 00 00 */ lwz r0, 0(r5) -/* 8028EA74 90 03 01 BC */ stw r0, 0x1bc(r3) -/* 8028EA78 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA7C.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA7C.s deleted file mode 100644 index bc49ed4e0f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA7C.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028EA7C: -/* 8028EA7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028EA80 7C 08 02 A6 */ mflr r0 -/* 8028EA84 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028EA88 2C 04 00 01 */ cmpwi r4, 1 -/* 8028EA8C 41 82 00 08 */ beq lbl_8028EA94 -/* 8028EA90 48 00 00 10 */ b lbl_8028EAA0 -lbl_8028EA94: -/* 8028EA94 38 00 00 00 */ li r0, 0 -/* 8028EA98 90 03 01 C8 */ stw r0, 0x1c8(r3) -/* 8028EA9C 48 00 06 6D */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv -lbl_8028EAA0: -/* 8028EAA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028EAA4 7C 08 03 A6 */ mtlr r0 -/* 8028EAA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028EAAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAB0.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAB0.s deleted file mode 100644 index 043c83d500..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAB0.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8028EAB0: -/* 8028EAB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028EAB4 7C 08 02 A6 */ mflr r0 -/* 8028EAB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028EABC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028EAC0 7C 7F 1B 78 */ mr r31, r3 -/* 8028EAC4 2C 04 00 02 */ cmpwi r4, 2 -/* 8028EAC8 41 82 00 08 */ beq lbl_8028EAD0 -/* 8028EACC 48 00 00 18 */ b lbl_8028EAE4 -lbl_8028EAD0: -/* 8028EAD0 C0 25 00 00 */ lfs f1, 0(r5) -/* 8028EAD4 48 0D 35 D9 */ bl __cvt_fp2unsigned -/* 8028EAD8 90 7F 01 C8 */ stw r3, 0x1c8(r31) -/* 8028EADC 7F E3 FB 78 */ mr r3, r31 -/* 8028EAE0 48 00 06 29 */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv -lbl_8028EAE4: -/* 8028EAE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028EAE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028EAEC 7C 08 03 A6 */ mtlr r0 -/* 8028EAF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028EAF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAF8.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAF8.s deleted file mode 100644 index c1d643db27..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAF8.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8028EAF8: -/* 8028EAF8 2C 04 00 01 */ cmpwi r4, 1 -/* 8028EAFC 4C 82 00 20 */ bnelr -/* 8028EB00 80 63 01 A4 */ lwz r3, 0x1a4(r3) -/* 8028EB04 28 03 00 00 */ cmplwi r3, 0 -/* 8028EB08 4D 82 00 20 */ beqlr -/* 8028EB0C 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8028EB10 60 00 00 01 */ ori r0, r0, 1 -/* 8028EB14 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8028EB18 38 00 00 01 */ li r0, 1 -/* 8028EB1C 90 03 00 24 */ stw r0, 0x24(r3) -/* 8028EB20 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB24.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB24.s deleted file mode 100644 index 727bd96ae9..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB24.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8028EB24: -/* 8028EB24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028EB28 7C 08 02 A6 */ mflr r0 -/* 8028EB2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028EB30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028EB34 7C 7F 1B 78 */ mr r31, r3 -/* 8028EB38 2C 04 00 02 */ cmpwi r4, 2 -/* 8028EB3C 41 82 00 08 */ beq lbl_8028EB44 -/* 8028EB40 48 00 00 18 */ b lbl_8028EB58 -lbl_8028EB44: -/* 8028EB44 C0 25 00 00 */ lfs f1, 0(r5) -/* 8028EB48 48 0D 35 65 */ bl __cvt_fp2unsigned -/* 8028EB4C 7C 64 1B 78 */ mr r4, r3 -/* 8028EB50 7F E3 FB 78 */ mr r3, r31 -/* 8028EB54 48 00 06 6D */ bl endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl -lbl_8028EB58: -/* 8028EB58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028EB5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028EB60 7C 08 03 A6 */ mtlr r0 -/* 8028EB64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028EB68 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB6C.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB6C.s deleted file mode 100644 index f4a3ebfdc7..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB6C.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8028EB6C: -/* 8028EB6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028EB70 7C 08 02 A6 */ mflr r0 -/* 8028EB74 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028EB78 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028EB7C 7C 7F 1B 78 */ mr r31, r3 -/* 8028EB80 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028EB84 41 82 00 08 */ beq lbl_8028EB8C -/* 8028EB88 48 00 00 3C */ b lbl_8028EBC4 -lbl_8028EB8C: -/* 8028EB8C 38 00 00 00 */ li r0, 0 -/* 8028EB90 90 1F 01 D0 */ stw r0, 0x1d0(r31) -/* 8028EB94 80 7F 01 A0 */ lwz r3, 0x1a0(r31) -/* 8028EB98 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8028EB9C 38 81 00 08 */ addi r4, r1, 8 -/* 8028EBA0 38 C0 00 00 */ li r6, 0 -/* 8028EBA4 81 83 00 00 */ lwz r12, 0(r3) -/* 8028EBA8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8028EBAC 7D 89 03 A6 */ mtctr r12 -/* 8028EBB0 4E 80 04 21 */ bctrl -/* 8028EBB4 2C 03 00 00 */ cmpwi r3, 0 -/* 8028EBB8 40 82 00 0C */ bne lbl_8028EBC4 -/* 8028EBBC 80 01 00 08 */ lwz r0, 8(r1) -/* 8028EBC0 90 1F 01 D0 */ stw r0, 0x1d0(r31) -lbl_8028EBC4: -/* 8028EBC4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028EBC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028EBCC 7C 08 03 A6 */ mtlr r0 -/* 8028EBD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028EBD4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EBD8.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EBD8.s deleted file mode 100644 index 64e88c18fe..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EBD8.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8028EBD8: -/* 8028EBD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028EBDC 7C 08 02 A6 */ mflr r0 -/* 8028EBE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028EBE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028EBE8 7C 7F 1B 78 */ mr r31, r3 -/* 8028EBEC 2C 04 00 19 */ cmpwi r4, 0x19 -/* 8028EBF0 41 82 00 4C */ beq lbl_8028EC3C -/* 8028EBF4 40 80 00 50 */ bge lbl_8028EC44 -/* 8028EBF8 2C 04 00 18 */ cmpwi r4, 0x18 -/* 8028EBFC 40 80 00 08 */ bge lbl_8028EC04 -/* 8028EC00 48 00 00 44 */ b lbl_8028EC44 -lbl_8028EC04: -/* 8028EC04 80 7F 01 D0 */ lwz r3, 0x1d0(r31) -/* 8028EC08 28 03 00 00 */ cmplwi r3, 0 -/* 8028EC0C 41 82 00 38 */ beq lbl_8028EC44 -/* 8028EC10 7C A4 2B 78 */ mr r4, r5 -/* 8028EC14 81 83 00 00 */ lwz r12, 0(r3) -/* 8028EC18 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 8028EC1C 7D 89 03 A6 */ mtctr r12 -/* 8028EC20 4E 80 04 21 */ bctrl -/* 8028EC24 90 7F 01 D4 */ stw r3, 0x1d4(r31) -/* 8028EC28 80 7F 01 D4 */ lwz r3, 0x1d4(r31) -/* 8028EC2C 3C 03 00 01 */ addis r0, r3, 1 -/* 8028EC30 28 00 FF FF */ cmplwi r0, 0xffff -/* 8028EC34 40 82 00 10 */ bne lbl_8028EC44 -/* 8028EC38 48 00 00 0C */ b lbl_8028EC44 -lbl_8028EC3C: -/* 8028EC3C 80 05 00 00 */ lwz r0, 0(r5) -/* 8028EC40 90 1F 01 D4 */ stw r0, 0x1d4(r31) -lbl_8028EC44: -/* 8028EC44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028EC48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028EC4C 7C 08 03 A6 */ mtlr r0 -/* 8028EC50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028EC54 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC58.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC58.s deleted file mode 100644 index 6d79d2dc37..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC58.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028EC58: -/* 8028EC58 2C 04 00 02 */ cmpwi r4, 2 -/* 8028EC5C 4C 82 00 20 */ bnelr -/* 8028EC60 80 85 00 00 */ lwz r4, 0(r5) -/* 8028EC64 30 04 FF FF */ addic r0, r4, -1 -/* 8028EC68 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028EC6C 98 03 01 D8 */ stb r0, 0x1d8(r3) -/* 8028EC70 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC74.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC74.s deleted file mode 100644 index 8173ac4917..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC74.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8028EC74: -/* 8028EC74 2C 04 00 02 */ cmpwi r4, 2 -/* 8028EC78 4C 82 00 20 */ bnelr -/* 8028EC7C 80 05 00 00 */ lwz r0, 0(r5) -/* 8028EC80 90 03 01 CC */ stw r0, 0x1cc(r3) -/* 8028EC84 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC88.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC88.s deleted file mode 100644 index 3f1d82dbe4..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC88.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028EC88: -/* 8028EC88 2C 04 00 02 */ cmpwi r4, 2 -/* 8028EC8C 4C 82 00 20 */ bnelr -/* 8028EC90 80 85 00 00 */ lwz r4, 0(r5) -/* 8028EC94 30 04 FF FF */ addic r0, r4, -1 -/* 8028EC98 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028EC9C 98 03 01 B5 */ stb r0, 0x1b5(r3) -/* 8028ECA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECA4.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECA4.s deleted file mode 100644 index 4f3fbd2e3c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECA4.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8028ECA4: -/* 8028ECA4 2C 04 00 02 */ cmpwi r4, 2 -/* 8028ECA8 4C 82 00 20 */ bnelr -/* 8028ECAC 80 85 00 00 */ lwz r4, 0(r5) -/* 8028ECB0 30 04 FF FF */ addic r0, r4, -1 -/* 8028ECB4 7C 00 21 10 */ subfe r0, r0, r4 -/* 8028ECB8 98 03 01 B6 */ stb r0, 0x1b6(r3) -/* 8028ECBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECC0.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECC0.s deleted file mode 100644 index 2fb7c3432f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECC0.s +++ /dev/null @@ -1,249 +0,0 @@ -lbl_8028ECC0: -/* 8028ECC0 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 8028ECC4 7C 08 02 A6 */ mflr r0 -/* 8028ECC8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 8028ECCC DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 8028ECD0 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 8028ECD4 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8028ECD8 48 0D 35 01 */ bl _savegpr_28 -/* 8028ECDC 7C 7E 1B 78 */ mr r30, r3 -/* 8028ECE0 7C 9F 23 78 */ mr r31, r4 -/* 8028ECE4 38 80 00 00 */ li r4, 0 -/* 8028ECE8 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 8028ECEC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8028ECF0 41 82 00 18 */ beq lbl_8028ED08 -/* 8028ECF4 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 8028ECF8 80 1F 00 DC */ lwz r0, 0xdc(r31) -/* 8028ECFC 7C 03 02 15 */ add. r0, r3, r0 -/* 8028ED00 40 82 00 08 */ bne lbl_8028ED08 -/* 8028ED04 38 80 00 01 */ li r4, 1 -lbl_8028ED08: -/* 8028ED08 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8028ED0C 41 82 00 48 */ beq lbl_8028ED54 -/* 8028ED10 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED14 80 63 01 A0 */ lwz r3, 0x1a0(r3) -/* 8028ED18 7F E4 FB 78 */ mr r4, r31 -/* 8028ED1C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028ED20 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028ED24 7D 89 03 A6 */ mtctr r12 -/* 8028ED28 4E 80 04 21 */ bctrl -/* 8028ED2C 38 00 00 00 */ li r0, 0 -/* 8028ED30 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED34 90 03 01 A4 */ stw r0, 0x1a4(r3) -/* 8028ED38 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED3C 98 03 01 B8 */ stb r0, 0x1b8(r3) -/* 8028ED40 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED44 90 03 01 C0 */ stw r0, 0x1c0(r3) -/* 8028ED48 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED4C 90 03 01 C4 */ stw r0, 0x1c4(r3) -/* 8028ED50 48 00 02 F0 */ b lbl_8028F040 -lbl_8028ED54: -/* 8028ED54 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED58 80 83 00 04 */ lwz r4, 4(r3) -/* 8028ED5C 83 A4 00 14 */ lwz r29, 0x14(r4) -/* 8028ED60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028ED64 38 81 00 7C */ addi r4, r1, 0x7c -/* 8028ED68 3C A0 80 3A */ lis r5, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle@ha /* 0x8039AB10@ha */ -/* 8028ED6C 38 A5 AB 10 */ addi r5, r5, sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle@l /* 0x8039AB10@l */ -/* 8028ED70 4B FF 75 05 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028ED74 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED78 38 81 00 88 */ addi r4, r1, 0x88 -/* 8028ED7C 3C A0 80 3A */ lis r5, sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle@ha /* 0x8039AB1C@ha */ -/* 8028ED80 38 A5 AB 1C */ addi r5, r5, sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle@l /* 0x8039AB1C@l */ -/* 8028ED84 4B FF 74 F1 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028ED88 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028ED8C 38 81 00 94 */ addi r4, r1, 0x94 -/* 8028ED90 3C A0 80 3A */ lis r5, sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle@ha /* 0x8039AB28@ha */ -/* 8028ED94 38 A5 AB 28 */ addi r5, r5, sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle@l /* 0x8039AB28@l */ -/* 8028ED98 4B FF 74 DD */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl -/* 8028ED9C 80 DE 00 04 */ lwz r6, 4(r30) -/* 8028EDA0 88 06 01 D8 */ lbz r0, 0x1d8(r6) -/* 8028EDA4 28 00 00 00 */ cmplwi r0, 0 -/* 8028EDA8 40 82 01 40 */ bne lbl_8028EEE8 -/* 8028EDAC 3B 81 00 7C */ addi r28, r1, 0x7c -/* 8028EDB0 80 06 01 CC */ lwz r0, 0x1cc(r6) -/* 8028EDB4 2C 00 00 01 */ cmpwi r0, 1 -/* 8028EDB8 41 82 00 78 */ beq lbl_8028EE30 -/* 8028EDBC 40 80 00 74 */ bge lbl_8028EE30 -/* 8028EDC0 2C 00 00 00 */ cmpwi r0, 0 -/* 8028EDC4 40 80 00 08 */ bge lbl_8028EDCC -/* 8028EDC8 48 00 00 68 */ b lbl_8028EE30 -lbl_8028EDCC: -/* 8028EDCC 88 1D 00 88 */ lbz r0, 0x88(r29) -/* 8028EDD0 28 00 00 00 */ cmplwi r0, 0 -/* 8028EDD4 40 82 00 0C */ bne lbl_8028EDE0 -/* 8028EDD8 7F 80 E3 78 */ mr r0, r28 -/* 8028EDDC 48 00 00 50 */ b lbl_8028EE2C -lbl_8028EDE0: -/* 8028EDE0 38 7D 00 AC */ addi r3, r29, 0xac -/* 8028EDE4 7F 84 E3 78 */ mr r4, r28 -/* 8028EDE8 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8028EDEC 48 0B 7F 81 */ bl PSMTXMultVec -/* 8028EDF0 C0 01 00 88 */ lfs f0, 0x88(r1) -/* 8028EDF4 D0 01 00 64 */ stfs f0, 0x64(r1) -/* 8028EDF8 C0 21 00 8C */ lfs f1, 0x8c(r1) -/* 8028EDFC C0 1D 00 A4 */ lfs f0, 0xa4(r29) -/* 8028EE00 EC 01 00 2A */ fadds f0, f1, f0 -/* 8028EE04 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 8028EE08 C0 01 00 90 */ lfs f0, 0x90(r1) -/* 8028EE0C D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 8028EE10 C0 01 00 94 */ lfs f0, 0x94(r1) -/* 8028EE14 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 8028EE18 C0 01 00 98 */ lfs f0, 0x98(r1) -/* 8028EE1C D0 01 00 74 */ stfs f0, 0x74(r1) -/* 8028EE20 C0 01 00 9C */ lfs f0, 0x9c(r1) -/* 8028EE24 D0 01 00 78 */ stfs f0, 0x78(r1) -/* 8028EE28 38 01 00 58 */ addi r0, r1, 0x58 -lbl_8028EE2C: -/* 8028EE2C 7C 1C 03 78 */ mr r28, r0 -lbl_8028EE30: -/* 8028EE30 E0 1C 00 00 */ psq_l f0, 0(r28), 0, 0 /* qr0 */ -/* 8028EE34 C0 3C 00 08 */ lfs f1, 8(r28) -/* 8028EE38 F0 01 00 1C */ psq_st f0, 28(r1), 0, 0 /* qr0 */ -/* 8028EE3C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8028EE40 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 8028EE44 D0 1F 00 A4 */ stfs f0, 0xa4(r31) -/* 8028EE48 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8028EE4C D0 1F 00 A8 */ stfs f0, 0xa8(r31) -/* 8028EE50 D0 3F 00 AC */ stfs f1, 0xac(r31) -/* 8028EE54 C8 42 BB 30 */ lfd f2, lit_1622(r2) -/* 8028EE58 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 8028EE5C C8 22 BB 38 */ lfd f1, lit_1623(r2) -/* 8028EE60 FC 00 08 24 */ fdiv f0, f0, f1 -/* 8028EE64 FC 02 00 32 */ fmul f0, f2, f0 -/* 8028EE68 FC 00 00 1E */ fctiwz f0, f0 -/* 8028EE6C D8 01 00 A0 */ stfd f0, 0xa0(r1) -/* 8028EE70 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8028EE74 7C 03 07 34 */ extsh r3, r0 -/* 8028EE78 C0 1C 00 10 */ lfs f0, 0x10(r28) -/* 8028EE7C FC 00 08 24 */ fdiv f0, f0, f1 -/* 8028EE80 FC 02 00 32 */ fmul f0, f2, f0 -/* 8028EE84 FC 00 00 1E */ fctiwz f0, f0 -/* 8028EE88 D8 01 00 A8 */ stfd f0, 0xa8(r1) -/* 8028EE8C 80 01 00 AC */ lwz r0, 0xac(r1) -/* 8028EE90 7C 04 07 34 */ extsh r4, r0 -/* 8028EE94 C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 8028EE98 FC 00 08 24 */ fdiv f0, f0, f1 -/* 8028EE9C FC 02 00 32 */ fmul f0, f2, f0 -/* 8028EEA0 FC 00 00 1E */ fctiwz f0, f0 -/* 8028EEA4 D8 01 00 B0 */ stfd f0, 0xb0(r1) -/* 8028EEA8 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 8028EEAC 7C 05 07 34 */ extsh r5, r0 -/* 8028EEB0 38 DF 00 68 */ addi r6, r31, 0x68 -/* 8028EEB4 4B FF 18 81 */ bl JPAGetXYZRotateMtx__FsssPA4_f -/* 8028EEB8 E0 1C 00 18 */ psq_l f0, 24(r28), 0, 0 /* qr0 */ -/* 8028EEBC C0 5C 00 20 */ lfs f2, 0x20(r28) -/* 8028EEC0 F0 01 00 10 */ psq_st f0, 16(r1), 0, 0 /* qr0 */ -/* 8028EEC4 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8028EEC8 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8028EECC D0 3F 00 98 */ stfs f1, 0x98(r31) -/* 8028EED0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8028EED4 D0 1F 00 9C */ stfs f0, 0x9c(r31) -/* 8028EED8 D0 5F 00 A0 */ stfs f2, 0xa0(r31) -/* 8028EEDC D0 3F 00 B0 */ stfs f1, 0xb0(r31) -/* 8028EEE0 D0 1F 00 B4 */ stfs f0, 0xb4(r31) -/* 8028EEE4 48 00 00 5C */ b lbl_8028EF40 -lbl_8028EEE8: -/* 8028EEE8 38 61 00 28 */ addi r3, r1, 0x28 -/* 8028EEEC 38 81 00 7C */ addi r4, r1, 0x7c -/* 8028EEF0 80 A6 01 D0 */ lwz r5, 0x1d0(r6) -/* 8028EEF4 80 C6 01 D4 */ lwz r6, 0x1d4(r6) -/* 8028EEF8 4B FF B3 01 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl -/* 8028EEFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028EF00 40 82 00 1C */ bne lbl_8028EF1C -/* 8028EF04 7F E3 FB 79 */ or. r3, r31, r31 -/* 8028EF08 41 82 01 38 */ beq lbl_8028F040 -/* 8028EF0C 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8028EF10 60 00 00 04 */ ori r0, r0, 4 -/* 8028EF14 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8028EF18 48 00 01 28 */ b lbl_8028F040 -lbl_8028EF1C: -/* 8028EF1C 38 61 00 28 */ addi r3, r1, 0x28 -/* 8028EF20 38 9F 00 68 */ addi r4, r31, 0x68 -/* 8028EF24 38 BF 00 98 */ addi r5, r31, 0x98 -/* 8028EF28 38 DF 00 A4 */ addi r6, r31, 0xa4 -/* 8028EF2C 4B FF 18 DD */ bl func_80280808 -/* 8028EF30 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 8028EF34 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 8028EF38 D0 1F 00 B0 */ stfs f0, 0xb0(r31) -/* 8028EF3C D0 3F 00 B4 */ stfs f1, 0xb4(r31) -lbl_8028EF40: -/* 8028EF40 CB E2 BB 40 */ lfd f31, lit_1624(r2) -/* 8028EF44 80 7E 00 04 */ lwz r3, 4(r30) -/* 8028EF48 80 03 01 C0 */ lwz r0, 0x1c0(r3) -/* 8028EF4C C8 22 BB 50 */ lfd f1, lit_1629(r2) -/* 8028EF50 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8028EF54 3C 80 43 30 */ lis r4, 0x4330 -/* 8028EF58 90 81 00 B0 */ stw r4, 0xb0(r1) -/* 8028EF5C C8 01 00 B0 */ lfd f0, 0xb0(r1) -/* 8028EF60 FC 40 08 28 */ fsub f2, f0, f1 -/* 8028EF64 80 03 01 C4 */ lwz r0, 0x1c4(r3) -/* 8028EF68 90 01 00 AC */ stw r0, 0xac(r1) -/* 8028EF6C 90 81 00 A8 */ stw r4, 0xa8(r1) -/* 8028EF70 C8 01 00 A8 */ lfd f0, 0xa8(r1) -/* 8028EF74 FC 00 08 28 */ fsub f0, f0, f1 -/* 8028EF78 88 03 01 B8 */ lbz r0, 0x1b8(r3) -/* 8028EF7C 2C 00 00 02 */ cmpwi r0, 2 -/* 8028EF80 41 82 00 30 */ beq lbl_8028EFB0 -/* 8028EF84 40 80 00 10 */ bge lbl_8028EF94 -/* 8028EF88 2C 00 00 01 */ cmpwi r0, 1 -/* 8028EF8C 40 80 00 14 */ bge lbl_8028EFA0 -/* 8028EF90 48 00 00 20 */ b lbl_8028EFB0 -lbl_8028EF94: -/* 8028EF94 2C 00 00 04 */ cmpwi r0, 4 -/* 8028EF98 40 80 00 18 */ bge lbl_8028EFB0 -/* 8028EF9C 48 00 00 0C */ b lbl_8028EFA8 -lbl_8028EFA0: -/* 8028EFA0 FF E0 10 24 */ fdiv f31, f0, f2 -/* 8028EFA4 48 00 00 0C */ b lbl_8028EFB0 -lbl_8028EFA8: -/* 8028EFA8 FC 02 00 28 */ fsub f0, f2, f0 -/* 8028EFAC FF E0 10 24 */ fdiv f31, f0, f2 -lbl_8028EFB0: -/* 8028EFB0 3B 80 00 FF */ li r28, 0xff -/* 8028EFB4 38 81 00 08 */ addi r4, r1, 8 -/* 8028EFB8 3C A0 80 3A */ lis r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle@ha /* 0x8039AB40@ha */ -/* 8028EFBC 38 A5 AB 40 */ addi r5, r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle@l /* 0x8039AB40@l */ -/* 8028EFC0 4B FF 73 CD */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl -/* 8028EFC4 88 01 00 0B */ lbz r0, 0xb(r1) -/* 8028EFC8 C8 22 BB 50 */ lfd f1, lit_1629(r2) -/* 8028EFCC 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8028EFD0 3C 00 43 30 */ lis r0, 0x4330 -/* 8028EFD4 90 01 00 B0 */ stw r0, 0xb0(r1) -/* 8028EFD8 C8 01 00 B0 */ lfd f0, 0xb0(r1) -/* 8028EFDC FC 00 08 28 */ fsub f0, f0, f1 -/* 8028EFE0 FF FF 00 32 */ fmul f31, f31, f0 -/* 8028EFE4 C8 02 BB 48 */ lfd f0, lit_1625(r2) -/* 8028EFE8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 8028EFEC 40 80 00 10 */ bge lbl_8028EFFC -/* 8028EFF0 FC 00 F8 1E */ fctiwz f0, f31 -/* 8028EFF4 D8 01 00 A8 */ stfd f0, 0xa8(r1) -/* 8028EFF8 83 81 00 AC */ lwz r28, 0xac(r1) -lbl_8028EFFC: -/* 8028EFFC 9B 9F 00 BB */ stb r28, 0xbb(r31) -/* 8028F000 38 00 00 00 */ li r0, 0 -/* 8028F004 90 01 00 0C */ stw r0, 0xc(r1) -/* 8028F008 80 7E 00 08 */ lwz r3, 8(r30) -/* 8028F00C 28 03 00 00 */ cmplwi r3, 0 -/* 8028F010 41 82 00 18 */ beq lbl_8028F028 -/* 8028F014 7F E4 FB 78 */ mr r4, r31 -/* 8028F018 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F01C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8028F020 7D 89 03 A6 */ mtctr r12 -/* 8028F024 4E 80 04 21 */ bctrl -lbl_8028F028: -/* 8028F028 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8028F02C 28 03 00 00 */ cmplwi r3, 0 -/* 8028F030 41 82 00 10 */ beq lbl_8028F040 -/* 8028F034 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8028F038 60 00 00 04 */ ori r0, r0, 4 -/* 8028F03C 90 03 00 F4 */ stw r0, 0xf4(r3) -lbl_8028F040: -/* 8028F040 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 8028F044 CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 8028F048 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8028F04C 48 0D 31 D9 */ bl _restgpr_28 -/* 8028F050 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 8028F054 7C 08 03 A6 */ mtlr r0 -/* 8028F058 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8028F05C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F060.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F060.s deleted file mode 100644 index 0386246355..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F060.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028F060: -/* 8028F060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028F064 7C 08 02 A6 */ mflr r0 -/* 8028F068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028F06C 80 63 00 08 */ lwz r3, 8(r3) -/* 8028F070 28 03 00 00 */ cmplwi r3, 0 -/* 8028F074 41 82 00 14 */ beq lbl_8028F088 -/* 8028F078 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F07C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8028F080 7D 89 03 A6 */ mtctr r12 -/* 8028F084 4E 80 04 21 */ bctrl -lbl_8028F088: -/* 8028F088 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028F08C 7C 08 03 A6 */ mtlr r0 -/* 8028F090 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028F094 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F098.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F098.s deleted file mode 100644 index cdc4fb58a0..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F098.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028F098: -/* 8028F098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028F09C 7C 08 02 A6 */ mflr r0 -/* 8028F0A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028F0A4 80 63 00 08 */ lwz r3, 8(r3) -/* 8028F0A8 28 03 00 00 */ cmplwi r3, 0 -/* 8028F0AC 41 82 00 14 */ beq lbl_8028F0C0 -/* 8028F0B0 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F0B4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028F0B8 7D 89 03 A6 */ mtctr r12 -/* 8028F0BC 4E 80 04 21 */ bctrl -lbl_8028F0C0: -/* 8028F0C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028F0C4 7C 08 03 A6 */ mtlr r0 -/* 8028F0C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028F0CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F0D0.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F0D0.s deleted file mode 100644 index 74221e14ea..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F0D0.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8028F0D0: -/* 8028F0D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028F0D4 7C 08 02 A6 */ mflr r0 -/* 8028F0D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028F0DC 80 63 00 08 */ lwz r3, 8(r3) -/* 8028F0E0 28 03 00 00 */ cmplwi r3, 0 -/* 8028F0E4 41 82 00 14 */ beq lbl_8028F0F8 -/* 8028F0E8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F0EC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028F0F0 7D 89 03 A6 */ mtctr r12 -/* 8028F0F4 4E 80 04 21 */ bctrl -lbl_8028F0F8: -/* 8028F0F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028F0FC 7C 08 03 A6 */ mtlr r0 -/* 8028F100 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028F104 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F108.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F108.s deleted file mode 100644 index 2c6e701966..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F108.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8028F108: -/* 8028F108 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028F10C 7C 08 02 A6 */ mflr r0 -/* 8028F110 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028F114 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028F118 7C 7F 1B 78 */ mr r31, r3 -/* 8028F11C 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 8028F120 28 04 00 00 */ cmplwi r4, 0 -/* 8028F124 41 82 00 18 */ beq lbl_8028F13C -/* 8028F128 80 7F 01 A0 */ lwz r3, 0x1a0(r31) -/* 8028F12C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F130 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028F134 7D 89 03 A6 */ mtctr r12 -/* 8028F138 4E 80 04 21 */ bctrl -lbl_8028F13C: -/* 8028F13C 80 7F 01 A0 */ lwz r3, 0x1a0(r31) -/* 8028F140 80 9F 01 BC */ lwz r4, 0x1bc(r31) -/* 8028F144 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F148 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8028F14C 7D 89 03 A6 */ mtctr r12 -/* 8028F150 4E 80 04 21 */ bctrl -/* 8028F154 90 7F 01 A4 */ stw r3, 0x1a4(r31) -/* 8028F158 28 03 00 00 */ cmplwi r3, 0 -/* 8028F15C 41 82 00 50 */ beq lbl_8028F1AC -/* 8028F160 80 03 00 EC */ lwz r0, 0xec(r3) -/* 8028F164 90 1F 01 B0 */ stw r0, 0x1b0(r31) -/* 8028F168 38 1F 01 A8 */ addi r0, r31, 0x1a8 -/* 8028F16C 90 03 00 EC */ stw r0, 0xec(r3) -/* 8028F170 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 8028F174 60 00 00 40 */ ori r0, r0, 0x40 -/* 8028F178 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 8028F17C 38 00 00 01 */ li r0, 1 -/* 8028F180 98 1F 01 B7 */ stb r0, 0x1b7(r31) -/* 8028F184 98 1F 01 B8 */ stb r0, 0x1b8(r31) -/* 8028F188 80 1F 01 C8 */ lwz r0, 0x1c8(r31) -/* 8028F18C 28 00 00 00 */ cmplwi r0, 0 -/* 8028F190 40 82 00 0C */ bne lbl_8028F19C -/* 8028F194 38 00 00 02 */ li r0, 2 -/* 8028F198 98 1F 01 B8 */ stb r0, 0x1b8(r31) -lbl_8028F19C: -/* 8028F19C 80 1F 01 C8 */ lwz r0, 0x1c8(r31) -/* 8028F1A0 90 1F 01 C0 */ stw r0, 0x1c0(r31) -/* 8028F1A4 38 00 00 00 */ li r0, 0 -/* 8028F1A8 90 1F 01 C4 */ stw r0, 0x1c4(r31) -lbl_8028F1AC: -/* 8028F1AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028F1B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028F1B4 7C 08 03 A6 */ mtlr r0 -/* 8028F1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028F1BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F1C0.s b/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F1C0.s deleted file mode 100644 index c925579c0f..0000000000 --- a/asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F1C0.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8028F1C0: -/* 8028F1C0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8028F1C4 7C 08 02 A6 */ mflr r0 -/* 8028F1C8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8028F1CC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8028F1D0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8028F1D4 7C 7E 1B 78 */ mr r30, r3 -/* 8028F1D8 7C 9F 23 78 */ mr r31, r4 -/* 8028F1DC 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 8028F1E0 28 04 00 00 */ cmplwi r4, 0 -/* 8028F1E4 41 82 00 EC */ beq lbl_8028F2D0 -/* 8028F1E8 28 1F 00 00 */ cmplwi r31, 0 -/* 8028F1EC 40 82 00 30 */ bne lbl_8028F21C -/* 8028F1F0 80 7E 01 A0 */ lwz r3, 0x1a0(r30) -/* 8028F1F4 81 83 00 00 */ lwz r12, 0(r3) -/* 8028F1F8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028F1FC 7D 89 03 A6 */ mtctr r12 -/* 8028F200 4E 80 04 21 */ bctrl -/* 8028F204 38 00 00 00 */ li r0, 0 -/* 8028F208 90 1E 01 A4 */ stw r0, 0x1a4(r30) -/* 8028F20C 98 1E 01 B8 */ stb r0, 0x1b8(r30) -/* 8028F210 90 1E 01 C0 */ stw r0, 0x1c0(r30) -/* 8028F214 90 1E 01 C4 */ stw r0, 0x1c4(r30) -/* 8028F218 48 00 00 B8 */ b lbl_8028F2D0 -lbl_8028F21C: -/* 8028F21C 88 7E 01 B8 */ lbz r3, 0x1b8(r30) -/* 8028F220 38 00 00 03 */ li r0, 3 -/* 8028F224 98 1E 01 B8 */ stb r0, 0x1b8(r30) -/* 8028F228 80 9E 01 C4 */ lwz r4, 0x1c4(r30) -/* 8028F22C 28 04 00 00 */ cmplwi r4, 0 -/* 8028F230 40 82 00 0C */ bne lbl_8028F23C -/* 8028F234 93 FE 01 C0 */ stw r31, 0x1c0(r30) -/* 8028F238 48 00 00 98 */ b lbl_8028F2D0 -lbl_8028F23C: -/* 8028F23C 38 A0 00 00 */ li r5, 0 -/* 8028F240 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8028F244 2C 00 00 02 */ cmpwi r0, 2 -/* 8028F248 41 82 00 30 */ beq lbl_8028F278 -/* 8028F24C 40 80 00 10 */ bge lbl_8028F25C -/* 8028F250 2C 00 00 01 */ cmpwi r0, 1 -/* 8028F254 40 80 00 14 */ bge lbl_8028F268 -/* 8028F258 48 00 00 20 */ b lbl_8028F278 -lbl_8028F25C: -/* 8028F25C 2C 00 00 04 */ cmpwi r0, 4 -/* 8028F260 40 80 00 18 */ bge lbl_8028F278 -/* 8028F264 48 00 00 0C */ b lbl_8028F270 -lbl_8028F268: -/* 8028F268 7C 85 23 78 */ mr r5, r4 -/* 8028F26C 48 00 00 0C */ b lbl_8028F278 -lbl_8028F270: -/* 8028F270 80 1E 01 C0 */ lwz r0, 0x1c0(r30) -/* 8028F274 7C A4 00 50 */ subf r5, r4, r0 -lbl_8028F278: -/* 8028F278 C8 42 BB 50 */ lfd f2, lit_1629(r2) -/* 8028F27C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028F280 3C 60 43 30 */ lis r3, 0x4330 -/* 8028F284 90 61 00 08 */ stw r3, 8(r1) -/* 8028F288 C8 01 00 08 */ lfd f0, 8(r1) -/* 8028F28C FC 20 10 28 */ fsub f1, f0, f2 -/* 8028F290 80 1E 01 C0 */ lwz r0, 0x1c0(r30) -/* 8028F294 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028F298 90 61 00 10 */ stw r3, 0x10(r1) -/* 8028F29C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8028F2A0 FC 00 10 28 */ fsub f0, f0, f2 -/* 8028F2A4 FC 21 00 32 */ fmul f1, f1, f0 -/* 8028F2A8 90 A1 00 1C */ stw r5, 0x1c(r1) -/* 8028F2AC 90 61 00 18 */ stw r3, 0x18(r1) -/* 8028F2B0 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8028F2B4 FC 00 10 28 */ fsub f0, f0, f2 -/* 8028F2B8 FC 21 00 24 */ fdiv f1, f1, f0 -/* 8028F2BC 48 0D 2D F1 */ bl __cvt_fp2unsigned -/* 8028F2C0 90 7E 01 C0 */ stw r3, 0x1c0(r30) -/* 8028F2C4 80 1E 01 C0 */ lwz r0, 0x1c0(r30) -/* 8028F2C8 7C 1F 00 50 */ subf r0, r31, r0 -/* 8028F2CC 90 1E 01 C4 */ stw r0, 0x1c4(r30) -lbl_8028F2D0: -/* 8028F2D0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8028F2D4 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8028F2D8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8028F2DC 7C 08 03 A6 */ mtlr r0 -/* 8028F2E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028F2E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv.s deleted file mode 100644 index 56313c8ed6..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028B6AC: -/* 8028B6AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028B6B0 7C 08 02 A6 */ mflr r0 -/* 8028B6B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028B6B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028B6BC 93 C1 00 08 */ stw r30, 8(r1) -/* 8028B6C0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8028B6C4 7C 9F 23 78 */ mr r31, r4 -/* 8028B6C8 41 82 00 3C */ beq lbl_8028B704 -/* 8028B6CC 3C 80 80 3C */ lis r4, __vt__Q214JStudio_JStage21TAdaptor_ambientLight@ha /* 0x803C5888@ha */ -/* 8028B6D0 38 04 58 88 */ addi r0, r4, __vt__Q214JStudio_JStage21TAdaptor_ambientLight@l /* 0x803C5888@l */ -/* 8028B6D4 90 1E 00 00 */ stw r0, 0(r30) -/* 8028B6D8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028B6DC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028B6E0 7D 89 03 A6 */ mtctr r12 -/* 8028B6E4 4E 80 04 21 */ bctrl -/* 8028B6E8 7F C3 F3 78 */ mr r3, r30 -/* 8028B6EC 38 80 00 00 */ li r4, 0 -/* 8028B6F0 4B FF B5 AD */ bl __dt__Q27JStudio21TAdaptor_ambientLightFv -/* 8028B6F4 7F E0 07 35 */ extsh. r0, r31 -/* 8028B6F8 40 81 00 0C */ ble lbl_8028B704 -/* 8028B6FC 7F C3 F3 78 */ mr r3, r30 -/* 8028B700 48 04 36 3D */ bl __dl__FPv -lbl_8028B704: -/* 8028B704 7F C3 F3 78 */ mr r3, r30 -/* 8028B708 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028B70C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8028B710 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028B714 7C 08 03 A6 */ mtlr r0 -/* 8028B718 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B71C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv.s deleted file mode 100644 index 6ed7abe53d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8028B724: -/* 8028B724 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028B728 7C 08 02 A6 */ mflr r0 -/* 8028B72C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028B730 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028B734 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8028B738 7C 7E 1B 78 */ mr r30, r3 -/* 8028B73C 83 E3 00 64 */ lwz r31, 0x64(r3) -/* 8028B740 7F E3 FB 78 */ mr r3, r31 -/* 8028B744 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028B748 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028B74C 7D 89 03 A6 */ mtctr r12 -/* 8028B750 4E 80 04 21 */ bctrl -/* 8028B754 60 64 00 01 */ ori r4, r3, 1 -/* 8028B758 7F E3 FB 78 */ mr r3, r31 -/* 8028B75C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028B760 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028B764 7D 89 03 A6 */ mtctr r12 -/* 8028B768 4E 80 04 21 */ bctrl -/* 8028B76C 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 8028B770 81 83 00 00 */ lwz r12, 0(r3) -/* 8028B774 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8028B778 7D 89 03 A6 */ mtctr r12 -/* 8028B77C 4E 80 04 21 */ bctrl -/* 8028B780 90 61 00 08 */ stw r3, 8(r1) -/* 8028B784 7F C3 F3 78 */ mr r3, r30 -/* 8028B788 3C 80 80 3A */ lis r4, sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight@ha /* 0x8039AA98@ha */ -/* 8028B78C 38 84 AA 98 */ addi r4, r4, sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight@l /* 0x8039AA98@l */ -/* 8028B790 38 A1 00 08 */ addi r5, r1, 8 -/* 8028B794 4B FF AB 19 */ bl adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor -/* 8028B798 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028B79C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8028B7A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028B7A4 7C 08 03 A6 */ mtlr r0 -/* 8028B7A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028B7AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv.s deleted file mode 100644 index 85226f5803..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028B7B0: -/* 8028B7B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028B7B4 7C 08 02 A6 */ mflr r0 -/* 8028B7B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028B7BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028B7C0 83 E3 00 64 */ lwz r31, 0x64(r3) -/* 8028B7C4 7F E3 FB 78 */ mr r3, r31 -/* 8028B7C8 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028B7CC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028B7D0 7D 89 03 A6 */ mtctr r12 -/* 8028B7D4 4E 80 04 21 */ bctrl -/* 8028B7D8 54 64 00 3C */ rlwinm r4, r3, 0, 0, 0x1e -/* 8028B7DC 7F E3 FB 78 */ mr r3, r31 -/* 8028B7E0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028B7E4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028B7E8 7D 89 03 A6 */ mtctr r12 -/* 8028B7EC 4E 80 04 21 */ bctrl -/* 8028B7F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028B7F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028B7F8 7C 08 03 A6 */ mtlr r0 -/* 8028B7FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B800 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl.s deleted file mode 100644 index 906b4ce362..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8028B804: -/* 8028B804 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028B808 7C 08 02 A6 */ mflr r0 -/* 8028B80C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028B810 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8028B814 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8028B818 7C 7E 1B 78 */ mr r30, r3 -/* 8028B81C 83 E3 00 64 */ lwz r31, 0x64(r3) -/* 8028B820 38 81 00 0C */ addi r4, r1, 0xc -/* 8028B824 3C A0 80 3A */ lis r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight@ha /* 0x8039AA98@ha */ -/* 8028B828 38 A5 AA 98 */ addi r5, r5, sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight@l /* 0x8039AA98@l */ -/* 8028B82C 4B FF AB 61 */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl -/* 8028B830 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8028B834 90 01 00 08 */ stw r0, 8(r1) -/* 8028B838 7F E3 FB 78 */ mr r3, r31 -/* 8028B83C 38 81 00 08 */ addi r4, r1, 8 -/* 8028B840 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028B844 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8028B848 7D 89 03 A6 */ mtctr r12 -/* 8028B84C 4E 80 04 21 */ bctrl -/* 8028B850 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 8028B854 81 83 00 00 */ lwz r12, 0(r3) -/* 8028B858 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8028B85C 7D 89 03 A6 */ mtctr r12 -/* 8028B860 4E 80 04 21 */ bctrl -/* 8028B864 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8028B868 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8028B86C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028B870 7C 08 03 A6 */ mtlr r0 -/* 8028B874 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028B878 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B610.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B610.s deleted file mode 100644 index 53c492b216..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B610.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8028B610: -/* 8028B610 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8028B614 7C 08 02 A6 */ mflr r0 -/* 8028B618 90 01 00 24 */ stw r0, 0x24(r1) -/* 8028B61C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B620 48 0D 6B BD */ bl _savegpr_29 -/* 8028B624 7C 7D 1B 78 */ mr r29, r3 -/* 8028B628 7C 9E 23 78 */ mr r30, r4 -/* 8028B62C 7C BF 2B 78 */ mr r31, r5 -/* 8028B630 7F A5 EB 78 */ mr r5, r29 -/* 8028B634 3C 60 80 3C */ lis r3, __vt__Q27JStudio8TAdaptor@ha /* 0x803C5610@ha */ -/* 8028B638 38 03 56 10 */ addi r0, r3, __vt__Q27JStudio8TAdaptor@l /* 0x803C5610@l */ -/* 8028B63C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B640 38 00 00 00 */ li r0, 0 -/* 8028B644 90 1D 00 04 */ stw r0, 4(r29) -/* 8028B648 38 65 00 10 */ addi r3, r5, 0x10 -/* 8028B64C 90 7D 00 08 */ stw r3, 8(r29) -/* 8028B650 38 00 00 04 */ li r0, 4 -/* 8028B654 90 1D 00 0C */ stw r0, 0xc(r29) -/* 8028B658 3C 80 80 3C */ lis r4, __vt__Q27JStudio21TAdaptor_ambientLight@ha /* 0x803C5560@ha */ -/* 8028B65C 38 04 55 60 */ addi r0, r4, __vt__Q27JStudio21TAdaptor_ambientLight@l /* 0x803C5560@l */ -/* 8028B660 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B664 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha /* 0x8028B568@ha */ -/* 8028B668 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 0x8028B568@l */ -/* 8028B66C 38 A0 00 00 */ li r5, 0 -/* 8028B670 38 C0 00 14 */ li r6, 0x14 -/* 8028B674 38 E0 00 04 */ li r7, 4 -/* 8028B678 48 0D 66 E9 */ bl __construct_array -/* 8028B67C 93 DD 00 60 */ stw r30, 0x60(r29) -/* 8028B680 93 FD 00 64 */ stw r31, 0x64(r29) -/* 8028B684 3C 60 80 3C */ lis r3, __vt__Q214JStudio_JStage21TAdaptor_ambientLight@ha /* 0x803C5888@ha */ -/* 8028B688 38 03 58 88 */ addi r0, r3, __vt__Q214JStudio_JStage21TAdaptor_ambientLight@l /* 0x803C5888@l */ -/* 8028B68C 90 1D 00 00 */ stw r0, 0(r29) -/* 8028B690 7F A3 EB 78 */ mr r3, r29 -/* 8028B694 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B698 48 0D 6B 91 */ bl _restgpr_29 -/* 8028B69C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8028B6A0 7C 08 03 A6 */ mtlr r0 -/* 8028B6A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028B6A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B87C.s b/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B87C.s deleted file mode 100644 index aee076182e..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B87C.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8028B87C: -/* 8028B87C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028B880 7C 08 02 A6 */ mflr r0 -/* 8028B884 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028B888 38 63 00 60 */ addi r3, r3, 0x60 -/* 8028B88C 4B FF EB E5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl -/* 8028B890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028B894 7C 08 03 A6 */ mtlr r0 -/* 8028B898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B89C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl.s b/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl.s deleted file mode 100644 index ece7413d84..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8028A470: -/* 8028A470 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A474 7C 08 02 A6 */ mflr r0 -/* 8028A478 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A47C 80 63 00 04 */ lwz r3, 4(r3) -/* 8028A480 28 05 00 00 */ cmplwi r5, 0 -/* 8028A484 40 82 00 0C */ bne lbl_8028A490 -/* 8028A488 38 80 FF FF */ li r4, -1 -/* 8028A48C 48 00 00 08 */ b lbl_8028A494 -lbl_8028A490: -/* 8028A490 80 84 00 00 */ lwz r4, 0(r4) -lbl_8028A494: -/* 8028A494 7C C5 33 78 */ mr r5, r6 -/* 8028A498 7C E6 3B 78 */ mr r6, r7 -/* 8028A49C 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A4A0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8028A4A4 7D 89 03 A6 */ mtctr r12 -/* 8028A4A8 4E 80 04 21 */ bctrl -/* 8028A4AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A4B0 7C 08 03 A6 */ mtlr r0 -/* 8028A4B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A4B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc.s b/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc.s deleted file mode 100644 index 7f2fdde179..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8028A4BC: -/* 8028A4BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A4C0 7C 08 02 A6 */ mflr r0 -/* 8028A4C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A4C8 7C 85 23 78 */ mr r5, r4 -/* 8028A4CC 80 63 00 00 */ lwz r3, 0(r3) -/* 8028A4D0 38 81 00 08 */ addi r4, r1, 8 -/* 8028A4D4 38 C0 00 00 */ li r6, 0 -/* 8028A4D8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A4DC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8028A4E0 7D 89 03 A6 */ mtctr r12 -/* 8028A4E4 4E 80 04 21 */ bctrl -/* 8028A4E8 2C 03 00 00 */ cmpwi r3, 0 -/* 8028A4EC 41 82 00 0C */ beq lbl_8028A4F8 -/* 8028A4F0 38 60 00 00 */ li r3, 0 -/* 8028A4F4 48 00 00 08 */ b lbl_8028A4FC -lbl_8028A4F8: -/* 8028A4F8 80 61 00 08 */ lwz r3, 8(r1) -lbl_8028A4FC: -/* 8028A4FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A500 7C 08 03 A6 */ mtlr r0 -/* 8028A504 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A508 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A1F8.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A1F8.s deleted file mode 100644 index b93de7f81c..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A1F8.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8028A1F8: -/* 8028A1F8 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8028A1FC 7C 08 02 A6 */ mflr r0 -/* 8028A200 90 01 00 74 */ stw r0, 0x74(r1) -/* 8028A204 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8028A208 93 C1 00 68 */ stw r30, 0x68(r1) -/* 8028A20C 7C 7E 1B 78 */ mr r30, r3 -/* 8028A210 7C 9F 23 78 */ mr r31, r4 -/* 8028A214 28 05 00 00 */ cmplwi r5, 0 -/* 8028A218 40 82 00 0C */ bne lbl_8028A224 -/* 8028A21C 38 60 00 00 */ li r3, 0 -/* 8028A220 48 00 00 58 */ b lbl_8028A278 -lbl_8028A224: -/* 8028A224 7C A3 2B 78 */ mr r3, r5 -/* 8028A228 7C C4 33 78 */ mr r4, r6 -/* 8028A22C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028A230 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A234 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8028A238 7D 89 03 A6 */ mtctr r12 -/* 8028A23C 4E 80 04 21 */ bctrl -/* 8028A240 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028A244 40 82 00 0C */ bne lbl_8028A250 -/* 8028A248 38 60 00 00 */ li r3, 0 -/* 8028A24C 48 00 00 2C */ b lbl_8028A278 -lbl_8028A250: -/* 8028A250 38 61 00 08 */ addi r3, r1, 8 -/* 8028A254 38 9F 00 18 */ addi r4, r31, 0x18 -/* 8028A258 38 BF 00 0C */ addi r5, r31, 0xc -/* 8028A25C 7F E6 FB 78 */ mr r6, r31 -/* 8028A260 4B FF B8 E5 */ bl getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec -/* 8028A264 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028A268 38 81 00 08 */ addi r4, r1, 8 -/* 8028A26C 7F C5 F3 78 */ mr r5, r30 -/* 8028A270 48 0B C2 75 */ bl PSMTXConcat -/* 8028A274 38 60 00 01 */ li r3, 1 -lbl_8028A278: -/* 8028A278 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8028A27C 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 8028A280 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8028A284 7C 08 03 A6 */ mtlr r0 -/* 8028A288 38 21 00 70 */ addi r1, r1, 0x70 -/* 8028A28C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A290.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A290.s deleted file mode 100644 index c8cee61da4..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A290.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8028A290: -/* 8028A290 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8028A294 7C 08 02 A6 */ mflr r0 -/* 8028A298 90 01 00 74 */ stw r0, 0x74(r1) -/* 8028A29C 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 8028A2A0 93 C1 00 68 */ stw r30, 0x68(r1) -/* 8028A2A4 7C 7E 1B 78 */ mr r30, r3 -/* 8028A2A8 7C 9F 23 78 */ mr r31, r4 -/* 8028A2AC 28 05 00 00 */ cmplwi r5, 0 -/* 8028A2B0 40 82 00 0C */ bne lbl_8028A2BC -/* 8028A2B4 38 60 00 00 */ li r3, 0 -/* 8028A2B8 48 00 00 58 */ b lbl_8028A310 -lbl_8028A2BC: -/* 8028A2BC 7C A3 2B 78 */ mr r3, r5 -/* 8028A2C0 7C C4 33 78 */ mr r4, r6 -/* 8028A2C4 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8028A2C8 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A2CC 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8028A2D0 7D 89 03 A6 */ mtctr r12 -/* 8028A2D4 4E 80 04 21 */ bctrl -/* 8028A2D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028A2DC 40 82 00 0C */ bne lbl_8028A2E8 -/* 8028A2E0 38 60 00 00 */ li r3, 0 -/* 8028A2E4 48 00 00 2C */ b lbl_8028A310 -lbl_8028A2E8: -/* 8028A2E8 38 61 00 08 */ addi r3, r1, 8 -/* 8028A2EC C0 3F 00 00 */ lfs f1, 0(r31) -/* 8028A2F0 C0 5F 00 04 */ lfs f2, 4(r31) -/* 8028A2F4 C0 7F 00 08 */ lfs f3, 8(r31) -/* 8028A2F8 48 0B C5 F1 */ bl PSMTXTrans -/* 8028A2FC 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028A300 38 81 00 08 */ addi r4, r1, 8 -/* 8028A304 7F C5 F3 78 */ mr r5, r30 -/* 8028A308 48 0B C1 DD */ bl PSMTXConcat -/* 8028A30C 38 60 00 01 */ li r3, 1 -lbl_8028A310: -/* 8028A310 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 8028A314 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 8028A318 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8028A31C 7C 08 03 A6 */ mtlr r0 -/* 8028A320 38 21 00 70 */ addi r1, r1, 0x70 -/* 8028A324 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A328.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A328.s deleted file mode 100644 index 02ac1078eb..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A328.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8028A328: -/* 8028A328 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8028A32C 7C 08 02 A6 */ mflr r0 -/* 8028A330 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8028A334 93 E1 00 9C */ stw r31, 0x9c(r1) -/* 8028A338 93 C1 00 98 */ stw r30, 0x98(r1) -/* 8028A33C 7C 7E 1B 78 */ mr r30, r3 -/* 8028A340 7C 9F 23 78 */ mr r31, r4 -/* 8028A344 28 05 00 00 */ cmplwi r5, 0 -/* 8028A348 40 82 00 0C */ bne lbl_8028A354 -/* 8028A34C 38 60 00 00 */ li r3, 0 -/* 8028A350 48 00 00 64 */ b lbl_8028A3B4 -lbl_8028A354: -/* 8028A354 7C A3 2B 78 */ mr r3, r5 -/* 8028A358 7C C4 33 78 */ mr r4, r6 -/* 8028A35C 38 A1 00 68 */ addi r5, r1, 0x68 -/* 8028A360 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A364 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8028A368 7D 89 03 A6 */ mtctr r12 -/* 8028A36C 4E 80 04 21 */ bctrl -/* 8028A370 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028A374 40 82 00 0C */ bne lbl_8028A380 -/* 8028A378 38 60 00 00 */ li r3, 0 -/* 8028A37C 48 00 00 38 */ b lbl_8028A3B4 -lbl_8028A380: -/* 8028A380 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028A384 38 9F 00 18 */ addi r4, r31, 0x18 -/* 8028A388 38 BF 00 0C */ addi r5, r31, 0xc -/* 8028A38C 7F E6 FB 78 */ mr r6, r31 -/* 8028A390 4B FF B7 B5 */ bl getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec -/* 8028A394 38 61 00 68 */ addi r3, r1, 0x68 -/* 8028A398 38 81 00 08 */ addi r4, r1, 8 -/* 8028A39C 48 0B C2 15 */ bl PSMTXInverse -/* 8028A3A0 38 61 00 08 */ addi r3, r1, 8 -/* 8028A3A4 38 81 00 38 */ addi r4, r1, 0x38 -/* 8028A3A8 7F C5 F3 78 */ mr r5, r30 -/* 8028A3AC 48 0B C1 39 */ bl PSMTXConcat -/* 8028A3B0 38 60 00 01 */ li r3, 1 -lbl_8028A3B4: -/* 8028A3B4 83 E1 00 9C */ lwz r31, 0x9c(r1) -/* 8028A3B8 83 C1 00 98 */ lwz r30, 0x98(r1) -/* 8028A3BC 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8028A3C0 7C 08 03 A6 */ mtlr r0 -/* 8028A3C4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8028A3C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A3CC.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A3CC.s deleted file mode 100644 index 540c8715dc..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A3CC.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8028A3CC: -/* 8028A3CC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8028A3D0 7C 08 02 A6 */ mflr r0 -/* 8028A3D4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8028A3D8 93 E1 00 9C */ stw r31, 0x9c(r1) -/* 8028A3DC 93 C1 00 98 */ stw r30, 0x98(r1) -/* 8028A3E0 7C 7E 1B 78 */ mr r30, r3 -/* 8028A3E4 7C 9F 23 78 */ mr r31, r4 -/* 8028A3E8 28 05 00 00 */ cmplwi r5, 0 -/* 8028A3EC 40 82 00 0C */ bne lbl_8028A3F8 -/* 8028A3F0 38 60 00 00 */ li r3, 0 -/* 8028A3F4 48 00 00 64 */ b lbl_8028A458 -lbl_8028A3F8: -/* 8028A3F8 7C A3 2B 78 */ mr r3, r5 -/* 8028A3FC 7C C4 33 78 */ mr r4, r6 -/* 8028A400 38 A1 00 68 */ addi r5, r1, 0x68 -/* 8028A404 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A408 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8028A40C 7D 89 03 A6 */ mtctr r12 -/* 8028A410 4E 80 04 21 */ bctrl -/* 8028A414 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8028A418 40 82 00 0C */ bne lbl_8028A424 -/* 8028A41C 38 60 00 00 */ li r3, 0 -/* 8028A420 48 00 00 38 */ b lbl_8028A458 -lbl_8028A424: -/* 8028A424 38 61 00 38 */ addi r3, r1, 0x38 -/* 8028A428 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8028A42C C0 5F 00 04 */ lfs f2, 4(r31) -/* 8028A430 C0 7F 00 08 */ lfs f3, 8(r31) -/* 8028A434 48 0B C4 B5 */ bl PSMTXTrans -/* 8028A438 38 61 00 68 */ addi r3, r1, 0x68 -/* 8028A43C 38 81 00 08 */ addi r4, r1, 8 -/* 8028A440 48 0B C1 71 */ bl PSMTXInverse -/* 8028A444 38 61 00 08 */ addi r3, r1, 8 -/* 8028A448 38 81 00 38 */ addi r4, r1, 0x38 -/* 8028A44C 7F C5 F3 78 */ mr r5, r30 -/* 8028A450 48 0B C0 95 */ bl PSMTXConcat -/* 8028A454 38 60 00 01 */ li r3, 1 -lbl_8028A458: -/* 8028A458 83 E1 00 9C */ lwz r31, 0x9c(r1) -/* 8028A45C 83 C1 00 98 */ lwz r30, 0x98(r1) -/* 8028A460 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8028A464 7C 08 03 A6 */ mtlr r0 -/* 8028A468 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8028A46C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A50C.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A50C.s deleted file mode 100644 index 337c8b0a5a..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A50C.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8028A50C: -/* 8028A50C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A510 7C 08 02 A6 */ mflr r0 -/* 8028A514 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A518 28 04 00 00 */ cmplwi r4, 0 -/* 8028A51C 40 82 00 0C */ bne lbl_8028A528 -/* 8028A520 38 60 FF FF */ li r3, -1 -/* 8028A524 48 00 00 1C */ b lbl_8028A540 -lbl_8028A528: -/* 8028A528 7C 83 23 78 */ mr r3, r4 -/* 8028A52C 7C A4 2B 78 */ mr r4, r5 -/* 8028A530 81 83 00 00 */ lwz r12, 0(r3) -/* 8028A534 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 8028A538 7D 89 03 A6 */ mtctr r12 -/* 8028A53C 4E 80 04 21 */ bctrl -lbl_8028A540: -/* 8028A540 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A544 7C 08 03 A6 */ mtlr r0 -/* 8028A548 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A54C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A550.s b/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A550.s deleted file mode 100644 index cd5c03413d..0000000000 --- a/asm/JSystem/JStudio/JStudio_JStage/object/func_8028A550.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8028A550: -/* 8028A550 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8028A554 7C 08 02 A6 */ mflr r0 -/* 8028A558 90 01 00 14 */ stw r0, 0x14(r1) -/* 8028A55C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8028A560 2C 04 00 02 */ cmpwi r4, 2 -/* 8028A564 41 82 00 08 */ beq lbl_8028A56C -/* 8028A568 48 00 00 74 */ b lbl_8028A5DC -lbl_8028A56C: -/* 8028A56C 80 05 00 00 */ lwz r0, 0(r5) -/* 8028A570 28 00 00 00 */ cmplwi r0, 0 -/* 8028A574 41 82 00 38 */ beq lbl_8028A5AC -/* 8028A578 83 E3 00 04 */ lwz r31, 4(r3) -/* 8028A57C 7F E3 FB 78 */ mr r3, r31 -/* 8028A580 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A584 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028A588 7D 89 03 A6 */ mtctr r12 -/* 8028A58C 4E 80 04 21 */ bctrl -/* 8028A590 60 64 00 02 */ ori r4, r3, 2 -/* 8028A594 7F E3 FB 78 */ mr r3, r31 -/* 8028A598 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A59C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028A5A0 7D 89 03 A6 */ mtctr r12 -/* 8028A5A4 4E 80 04 21 */ bctrl -/* 8028A5A8 48 00 00 34 */ b lbl_8028A5DC -lbl_8028A5AC: -/* 8028A5AC 83 E3 00 04 */ lwz r31, 4(r3) -/* 8028A5B0 7F E3 FB 78 */ mr r3, r31 -/* 8028A5B4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A5B8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8028A5BC 7D 89 03 A6 */ mtctr r12 -/* 8028A5C0 4E 80 04 21 */ bctrl -/* 8028A5C4 54 64 07 FA */ rlwinm r4, r3, 0, 0x1f, 0x1d -/* 8028A5C8 7F E3 FB 78 */ mr r3, r31 -/* 8028A5CC 81 9F 00 00 */ lwz r12, 0(r31) -/* 8028A5D0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8028A5D4 7D 89 03 A6 */ mtctr r12 -/* 8028A5D8 4E 80 04 21 */ bctrl -lbl_8028A5DC: -/* 8028A5DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8028A5E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8028A5E4 7C 08 03 A6 */ mtlr r0 -/* 8028A5E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028A5EC 4E 80 00 20 */ blr diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index c37f800515..76848227d4 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -128,10 +128,10 @@ struct JAISoundFader { } } void fadeIn(u32 param_1) { - if (param_1 == 0) { - forceIn(); - } else { + if (param_1 != 0) { mTransition.set(1.0f, mIntensity, param_1); + } else { + forceIn(); } } void fadeInFromOut(u32 param_1) { diff --git a/include/JSystem/JGadget/pointer.h b/include/JSystem/JGadget/pointer.h new file mode 100644 index 0000000000..183684237f --- /dev/null +++ b/include/JSystem/JGadget/pointer.h @@ -0,0 +1,25 @@ +#ifndef POINTER_H +#define POINTER_H + +namespace JGadget { + +template +class TPointer { +public: + TPointer(T* ptr) : mPtr(ptr) {} + void set(T* ptr) { mPtr = ptr; } + T* mPtr; +}; + +template +class TPointer_delete : public TPointer { +public: + TPointer_delete(T* ptr) : TPointer(ptr) {} + ~TPointer_delete() { + delete mPtr; + } +}; + +} + +#endif \ No newline at end of file diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 5606837b6f..a037998fa3 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -67,12 +67,13 @@ struct JPAEmitterWorkData { */ class JPAEmitterCallBack { public: + virtual ~JPAEmitterCallBack() = 0; /* 80050368 */ virtual void execute(JPABaseEmitter*); /* 80050374 */ virtual void executeAfter(JPABaseEmitter*); /* 8005036C */ virtual void draw(JPABaseEmitter*); /* 80050370 */ virtual void drawAfter(JPABaseEmitter*); - /* 8027E6A4 */ ~JPAEmitterCallBack(); + /* 8027E6A4 */ //~JPAEmitterCallBack(); }; enum { diff --git a/include/JSystem/JStage/JSGObject.h b/include/JSystem/JStage/JSGObject.h index d7d1f7584a..b54910a0f8 100644 --- a/include/JSystem/JStage/JSGObject.h +++ b/include/JSystem/JStage/JSGObject.h @@ -14,7 +14,7 @@ namespace JStage { virtual s32 JSGFGetType() const = 0; /* 80280E1C */ virtual bool JSGGetName() const; /* 80280E24 */ virtual void JSGUpdate(); - /* 80280E28 */ virtual bool JSGGetFlag() const; + /* 80280E28 */ virtual u32 JSGGetFlag() const; /* 80280E30 */ virtual void JSGSetFlag(u32); /* 80280E34 */ virtual bool JSGGetData(u32, void*, u32) const; /* 80280E3C */ virtual void JSGSetData(u32, void const*, u32); @@ -22,7 +22,15 @@ namespace JStage { /* 80280E44 */ virtual void JSGSetParent(JStage::TObject*, u32); /* 80280E48 */ virtual void JSGSetRelation(bool, JStage::TObject*, u32); /* 80280E4C */ virtual s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ virtual int JSGGetNodeTransformation(u32, f32 (*)[4]) const; + /* 80280E54 */ virtual bool JSGGetNodeTransformation(u32, f32 (*)[4]) const; + + void JSGFEnableFlag(u32 flag) { + JSGSetFlag(JSGGetFlag() | flag); + } + + void JSGFDisableFlag(u32 flag) { + JSGSetFlag(JSGGetFlag() & ~flag); + } }; }; diff --git a/include/JSystem/JStage/JSGSystem.h b/include/JSystem/JStage/JSGSystem.h index 9728b126ef..b260f40874 100644 --- a/include/JSystem/JStage/JSGSystem.h +++ b/include/JSystem/JStage/JSGSystem.h @@ -21,7 +21,7 @@ namespace JStage { struct TSystem : public TObject { /* 80280E90 */ virtual ~TSystem() = 0; /* 80280EF0 */ virtual s32 JSGFGetType() const; - /* 80280EF8 */ virtual bool JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; + /* 80280EF8 */ virtual int JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; /* 80280F00 */ virtual bool JSGCreateObject(char const*, JStage::TEObject, u32); /* 80280F08 */ virtual void JSGDestroyObject(JStage::TObject*); /* 80280F0C */ virtual bool JSGGetSystemData(u32); diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index 0b98b548a7..600bbf9a9a 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -13,6 +13,16 @@ struct TCreateObject { /* 80285488 */ virtual ~TCreateObject() = 0; virtual bool create(TObject**, JStudio::stb::data::TParse_TBlock_object const&) = 0; + template + static typename AdaptorT::ObjectType* createFromAdaptor(JStudio::stb::data::TParse_TBlock_object const& param_1, AdaptorT* param_2) { + typename AdaptorT::ObjectType* rv = new typename AdaptorT::ObjectType(param_1, param_2); + if (rv == NULL) { + return NULL; + } + rv->prepareAdaptor(); + return rv; + } + /* 0x4 */ JGadget::TLinkListNode mNode; }; // Size: 0xC @@ -31,8 +41,12 @@ struct TFactory : public stb::TFactory { class TControl : public stb::TControl { public: - struct TTransform_translation_rotation_scaling {}; - struct TTransform_position {}; + struct TTransform_translation_rotation_scaling { + Vec translation; + Vec rotation; + Vec scaling; + }; + struct TTransform_position : public Vec {}; /* 80285114 */ TControl(); /* 802851AC */ virtual ~TControl(); @@ -100,6 +114,59 @@ public: return obj->referFunctionValue(); } + bool transformOnSet_isEnabled() const { return mTransformOnSet; } + CMtxP transformOnSet_getMatrix() const { return mTransformOnSet_Matrix; } + + void transformOnSet_transformTranslation(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(226, pDst!=0); + JUT_ASSERT(227, &rSrc!=pDst); + MTXMultVec(transformOnSet_getMatrix(), &rSrc, pDst); + } + + void transformOnSet_transformRotation(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(232, pDst!=0); + JUT_ASSERT(233, &rSrc!=pDst); + pDst->x = rSrc.x; + pDst->y = rSrc.y + mTransformOnSet_RotationY; + pDst->z = rSrc.z; + } + + void transformOnSet_transformScaling(const Vec& rSrc, Vec* pDst) const { + JUT_ASSERT(240, pDst!=0); + JUT_ASSERT(241, &rSrc!=pDst); + *pDst = rSrc; + } + + void transformOnSet_transform(TTransform_position* param_1, TTransform_position* param_2) const { + transformOnSet_transformTranslation(*param_1, param_2); + } + + void transformOnSet_transform(TTransform_translation_rotation_scaling* param_1, + TTransform_translation_rotation_scaling* param_2) const { + transformOnSet_transformTranslation(param_1->translation, ¶m_2->translation); + transformOnSet_transformRotation(param_1->rotation, ¶m_2->rotation); + transformOnSet_transformScaling(param_1->scaling, ¶m_2->scaling); + } + + TTransform_position* transformOnSet_transform_ifEnabled(TTransform_position* param_1, + TTransform_position* param_2) const { + if (!transformOnSet_isEnabled()) { + return param_1; + } + transformOnSet_transform(param_1, param_2); + return param_2; + } + + TTransform_translation_rotation_scaling* + transformOnSet_transform_ifEnabled(TTransform_translation_rotation_scaling* param_1, + TTransform_translation_rotation_scaling* 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; diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index c28ade8073..c02f19f37d 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -55,6 +55,10 @@ namespace math { param_2->y = param_1[1][3]; param_2->z = param_1[2][3]; } + + inline void getTransformation_T(Mtx mtx, const Vec* param_2) { + MTXTrans(mtx, param_2->x, param_2->y, param_2->z); + } }; }; // namespace JStudio diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index c4929f48ef..97a4c23b4b 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -3,6 +3,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "limits.h" +#include "math.h" typedef struct _GXColor GXColor; @@ -14,6 +15,7 @@ namespace data { UNK_0x3 = 0x3, UNK_0x10 = 0x10, UNK_0x12 = 0x12, + UNK_0x18 = 0x18, UNK_0x19 = 0x19, }; }; @@ -80,6 +82,10 @@ struct TVariableValue { } } + void setOutput(TOutput* param_1) { + pOutput_ = (param_1 != NULL) ? param_1 : (TOutput*)soOutput_none_; + } + static u8 soOutput_none_[4 + 4 /* padding */]; /* 0x00 */ f32 mValue; @@ -107,14 +113,9 @@ public: /* 8028682C */ virtual void do_data(void const*, u32, void const*, u32); TAdaptor* getAdaptor() { return mpAdaptor; } - TControl* getControl() { return (TControl*)stb::TObject::getControl(); } + TControl* getControl() const { return (TControl*)stb::TObject::getControl(); } - void prepareAdaptor() { - if (mpAdaptor != NULL) { - // mpAdaptor->adaptor_setObject_(this); - // mpAdaptor->adaptor_do_begin(); - } - } + inline void prepareAdaptor(); template T* createFromAdaptor(const stb::data::TParse_TBlock_object& param_0, T* param_1) { @@ -134,10 +135,18 @@ public: struct TAdaptor { struct TSetVariableValue_immediate { + TSetVariableValue_immediate() : field_0x0(-1), field_0x4(NAN) {} + TSetVariableValue_immediate(u32 param_1, f32 param_2) : + field_0x0(param_1), field_0x4(param_2) {} u32 field_0x0; f32 field_0x4; }; typedef void (*setVarFunc)(JStudio::TAdaptor*, JStudio::TControl*, u32, void const*, u32); + TAdaptor(TVariableValue *param_1, u32 param_2) { + pObject_ = NULL; + pValue_ = param_1; + u = param_2; + } /* 80285FD0 */ virtual ~TAdaptor() = 0; /* 80286018 */ virtual void adaptor_do_prepare(); /* 8028601C */ virtual void adaptor_do_begin(); @@ -184,19 +193,29 @@ struct TAdaptor { return &pValue_[param_0]; } + const TObject* adaptor_getObject() { return pObject_; } + /* 0x4 */ const TObject* pObject_; /* 0x8 */ TVariableValue* pValue_; /* 0xC */ u32 u; }; +inline void TObject::prepareAdaptor() { + if (mpAdaptor != NULL) { + mpAdaptor->adaptor_setObject_(this); + mpAdaptor->adaptor_do_prepare(); + } +} + struct TAdaptor_actor : public TAdaptor { + TAdaptor_actor() : TAdaptor(mValue, 14) {} /* 802868B0 */ virtual ~TAdaptor_actor() = 0; /* 0x10 */ TVariableValue mValue[14]; - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; + static u32 const sauVariableValue_3_TRANSLATION_XYZ[3]; + static u32 const sauVariableValue_3_ROTATION_XYZ[3]; + static u32 const sauVariableValue_3_SCALING_XYZ[3]; }; // Size: 0x128 struct TObject_actor : public TObject { @@ -208,12 +227,13 @@ struct TObject_actor : public TObject { }; struct TAdaptor_ambientLight : public TAdaptor { + TAdaptor_ambientLight() : TAdaptor(mValue, 4) {} /* 80286C9C */ virtual ~TAdaptor_ambientLight() = 0; /* 0x10 */ TVariableValue mValue[4]; - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; + static u32 const sauVariableValue_3_COLOR_RGB[3]; + static u32 const sauVariableValue_4_COLOR_RGBA[4]; }; struct TObject_ambientLight : public TObject { @@ -225,13 +245,14 @@ struct TObject_ambientLight : public TObject { }; struct TAdaptor_camera : public TAdaptor { + TAdaptor_camera() : TAdaptor(mValue, 12) {} /* 80286E1C */ virtual ~TAdaptor_camera() = 0; /* 0x10 */ TVariableValue mValue[12]; - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; - static u8 sauVariableValue_2_DISTANCE_NEAR_FAR[8]; + static u32 const sauVariableValue_3_POSITION_XYZ[3]; + static u32 const sauVariableValue_3_TARGET_POSITION_XYZ[3]; + static u32 sauVariableValue_2_DISTANCE_NEAR_FAR[2]; }; struct TObject_camera : public TObject { @@ -243,13 +264,14 @@ struct TObject_camera : public TObject { }; struct TAdaptor_fog : public TAdaptor { + TAdaptor_fog() : TAdaptor(mValue, 6) {} /* 8028717C */ virtual ~TAdaptor_fog() = 0; /* 0x10 */ TVariableValue mValue[6]; - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 sauVariableValue_2_RANGE_BEGIN_END[8]; + static u32 const sauVariableValue_3_COLOR_RGB[3]; + static u32 const sauVariableValue_4_COLOR_RGBA[4]; + static u32 sauVariableValue_2_RANGE_BEGIN_END[2]; }; struct TObject_fog : public TObject { @@ -261,15 +283,16 @@ struct TObject_fog : public TObject { }; struct TAdaptor_light : public TAdaptor { + TAdaptor_light() : TAdaptor(mValue, 13) {} /* 80287308 */ virtual ~TAdaptor_light() = 0; /* 0x10 */ TVariableValue mValue[13]; - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; - static u8 sauVariableValue_2_DIRECTION_THETA_PHI[8]; + static u32 const sauVariableValue_3_COLOR_RGB[3]; + static u32 const sauVariableValue_4_COLOR_RGBA[4]; + static u32 const sauVariableValue_3_POSITION_XYZ[3]; + static u32 const sauVariableValue_3_TARGET_POSITION_XYZ[3]; + static u32 sauVariableValue_2_DIRECTION_THETA_PHI[2]; }; struct TObject_light : public TObject { @@ -281,6 +304,7 @@ struct TObject_light : public TObject { }; struct TAdaptor_message : public TAdaptor { + TAdaptor_message() : TAdaptor(NULL, 0) {} /* 802875E0 */ virtual ~TAdaptor_message() = 0; }; @@ -293,17 +317,18 @@ struct TObject_message : public TObject { }; struct TAdaptor_particle : public TAdaptor { + TAdaptor_particle() : TAdaptor(mValue, 20) {} /* 8028770C */ virtual ~TAdaptor_particle() = 0; /* 0x10 */ TVariableValue mValue[20]; - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 const sauVariableValue_3_COLOR1_RGB[12]; - static u8 const sauVariableValue_4_COLOR1_RGBA[16]; + static u32 const sauVariableValue_3_TRANSLATION_XYZ[3]; + static u32 const sauVariableValue_3_ROTATION_XYZ[3]; + static u32 const sauVariableValue_3_SCALING_XYZ[3]; + static u32 const sauVariableValue_3_COLOR_RGB[3]; + static u32 const sauVariableValue_4_COLOR_RGBA[4]; + static u32 const sauVariableValue_3_COLOR1_RGB[3]; + static u32 const sauVariableValue_4_COLOR1_RGBA[4]; }; struct TObject_particle : public TObject { @@ -315,11 +340,12 @@ struct TObject_particle : public TObject { }; struct TAdaptor_sound : public TAdaptor { + TAdaptor_sound() : TAdaptor(mValue, 13) {} /* 80287B3C */ virtual ~TAdaptor_sound() = 0; /* 0x10 */ TVariableValue mValue[13]; - static u8 const sauVariableValue_3_POSITION_XYZ[12]; + static u32 const sauVariableValue_3_POSITION_XYZ[3]; }; // Size: 0x114 struct TObject_sound : public TObject { diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/include/JSystem/JStudio/JStudio/object-id.h index 87ca81d26b..81365c88a2 100644 --- a/include/JSystem/JStudio/JStudio/object-id.h +++ b/include/JSystem/JStudio/JStudio/object-id.h @@ -11,7 +11,7 @@ struct TIDData { public: TIDData(const void* id, u32 id_size) : mID(id), mID_size(id_size) {} - /* 80288988 */ bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&); + /* 80288988 */ static bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&); inline const void* getID() const { return mID; } inline u32 getIDSize() const { return mID_size; } diff --git a/include/JSystem/JStudio/JStudio/stb-data-parse.h b/include/JSystem/JStudio/JStudio/stb-data-parse.h index 1c7a42b48a..f8c5bd470f 100644 --- a/include/JSystem/JStudio/JStudio/stb-data-parse.h +++ b/include/JSystem/JStudio/JStudio/stb-data-parse.h @@ -90,6 +90,7 @@ public: u16 get_flag() const { return get()->flag; } u16 get_IDSize() const { return get()->id_size; } + u32 get_type() const { return get()->type; } const void* get_ID() const { return get()->id; } }; diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h index 289dba80fd..3996d59273 100644 --- a/include/JSystem/JStudio/JStudio_JAudio2/control.h +++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h @@ -8,6 +8,9 @@ namespace JStudio_JAudio2 { struct TCreateObject : public JStudio::TCreateObject { + typedef JStudio::TObject* (*CreateFunc)(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JAudio2::TCreateObject*); + TCreateObject(JAISoundStarter* p_soundStarter, const JStage::TSystem* p_system) { pJAISoundStarter_ = p_soundStarter; pJSGSystem_ = p_system; @@ -17,8 +20,12 @@ struct TCreateObject : public JStudio::TCreateObject { /* 8028D550 */ virtual ~TCreateObject(); /* 8028D5B0 */ virtual bool create(JStudio::TObject**, JStudio::stb::data::TParse_TBlock_object const&); - /* 8028D624 */ void createObject_JAI_SOUND_(JStudio::stb::data::TParse_TBlock_object const&, - JStudio_JAudio2::TCreateObject*); + /* 8028D624 */ static JStudio::TObject* + createObject_JAI_SOUND_(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JAudio2::TCreateObject*); + JAISoundStarter* get_pJAISoundStarter_() { return pJAISoundStarter_; } + const JStage::TSystem* get_pJSGSystem_() { return pJSGSystem_; } + bool isPermit_onExit_notEnd() { return mPermit_onExit_notEnd; } /* 0x0C */ JAISoundStarter* pJAISoundStarter_; /* 0x10 */ const JStage::TSystem* pJSGSystem_; @@ -26,9 +33,26 @@ struct TCreateObject : public JStudio::TCreateObject { }; struct TAdaptor_sound : public JStudio::TAdaptor_sound { - struct TVVOSetValue_ { - /* 8028DECC */ void operator()(f32, JStudio::TAdaptor*) const; - /* 8028E094 */ ~TVVOSetValue_(); + typedef void (*TVVOSoundSetFunc)(JAISound*, f32); + typedef JStudio::TObject_sound ObjectType; + + enum TEVariableValue { + UNK_7 = 7, + UNK_8 = 8, + UNK_9 = 9, + UNK_10 = 10, + UNK_11 = 11, + UNK_NONE = -1, + }; + + struct TVVOSetValue_ : public JStudio::TVariableValue::TOutput { + TVVOSetValue_(TEVariableValue param_1, TVVOSoundSetFunc param_2) + : field_0x04(param_1), field_0x08(param_2) {} + /* 8028DECC */ virtual void operator()(f32, JStudio::TAdaptor*) const; + /* 8028E094 */ virtual ~TVVOSetValue_() {} + + /* 0x04 */ TEVariableValue field_0x04; + /* 0x08 */ TVVOSoundSetFunc field_0x08; }; /* 8028D828 */ TAdaptor_sound(JStudio_JAudio2::TCreateObject*); @@ -58,20 +82,43 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound { /* 8028DEB0 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, u32); + void beginSound_fadeIn_(u32 param_1) { + field_0x128 = param_1; + beginSound_fadeIn_(); + } + + void beginSound_() { + beginSound_fadeIn_(0); + } + + void endSound_() { + endSound_fadeOut_(0); + } + + void opJAISoundHandle_stop_() { + opJAISoundHandle_->stop(); + } + + void set_bPermit_onExit_notEnd_(bool param_1) { field_0x11c = param_1; } + + #ifndef NONMATCHING + static TVVOSetValue_ saoVVOSetValue_[6]; + #else static u8 saoVVOSetValue_[72]; + #endif /* 0x114 */ TCreateObject* pCreateObject_; /* 0x118 */ JAISoundHandle opJAISoundHandle_; - /* 0x11C */ u8 field_0x11c; + /* 0x11C */ bool field_0x11c; /* 0x11D */ u8 field_0x11d; /* 0x11E */ u8 field_0x11e; /* 0x11F */ u8 field_0x11f; /* 0x120 */ u8 field_0x120; /* 0x124 */ u32 field_0x124; /* 0x128 */ u32 field_0x128; - /* 0x12C */ u32 field_0x12c; + /* 0x12C */ JGeometry::TVec3* field_0x12c; /* 0x130 */ JGeometry::TVec3 field_0x130; - /* 0x13C */ u32 field_0x13c; + /* 0x13C */ JStage::TObject* field_0x13c; /* 0x140 */ u32 field_0x140; /* 0x144 */ u8 field_0x144; }; diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/include/JSystem/JStudio/JStudio_JParticle/control.h index 0b9e4d9cf6..44e1ca6597 100644 --- a/include/JSystem/JStudio/JStudio_JParticle/control.h +++ b/include/JSystem/JStudio/JStudio_JParticle/control.h @@ -2,11 +2,14 @@ #define JSTUDIO_JPARTICLE_CONTROL_H #include "JSystem/JParticle/JPAParticle.h" +#include "JSystem/JParticle/JPAEmitter.h" #include "JSystem/JStage/JSGSystem.h" #include "JSystem/JStudio/JStudio/jstudio-object.h" namespace JStudio_JParticle { struct TCreateObject : public JStudio::TCreateObject { + typedef JStudio::TObject* (*CreateFunc)(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JParticle::TCreateObject*); TCreateObject(JPAEmitterManager* p_emitMgr, const JStage::TSystem* p_system) { pJPAEmitterManager_ = p_emitMgr; pJSGSystem_ = p_system; @@ -16,24 +19,52 @@ struct TCreateObject : public JStudio::TCreateObject { /* 8028E3A0 */ virtual ~TCreateObject(); /* 8028E400 */ virtual bool create(JStudio::TObject**, JStudio::stb::data::TParse_TBlock_object const&); - /* 8028E474 */ virtual void emitter_create(u32); + /* 8028E474 */ virtual JPABaseEmitter* emitter_create(u32); /* 8028E4E4 */ virtual void emitter_destroy(JPABaseEmitter*); - /* 8028E508 */ void createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&, - JStudio_JParticle::TCreateObject*); + /* 8028E508 */ static JStudio::TObject* + createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JParticle::TCreateObject*); + const JStage::TSystem* get_pJSGSystem_() { return pJSGSystem_; } + bool isPermit_onExit_notEnd() { return mPermit_onExit_notEnd; } + /* 0x0C */ JPAEmitterManager* pJPAEmitterManager_; /* 0x10 */ const JStage::TSystem* pJSGSystem_; /* 0x14 */ bool mPermit_onExit_notEnd; }; struct TAdaptor_particle : public JStudio::TAdaptor_particle { - struct TJPACallback_emitter_ { - /* 8028E700 */ ~TJPACallback_emitter_(); - /* 8028ECC0 */ void execute(JPABaseEmitter*); - /* 8028F060 */ void executeAfter(JPABaseEmitter*); - /* 8028F098 */ void draw(JPABaseEmitter*); - /* 8028F0D0 */ void drawAfter(JPABaseEmitter*); + typedef JStudio::TObject_particle ObjectType; + + struct TJPACallback_emitter_ : public JPAEmitterCallBack { + TJPACallback_emitter_(TAdaptor_particle* param_1) { + pThis_ = param_1; + pOld = NULL; + JUT_ASSERT(113, pThis_!=0); + } + /* 8028E700 */ virtual ~TJPACallback_emitter_() {} + /* 8028ECC0 */ virtual void execute(JPABaseEmitter*); + /* 8028F060 */ virtual void executeAfter(JPABaseEmitter*); + /* 8028F098 */ virtual void draw(JPABaseEmitter*); + /* 8028F0D0 */ virtual void drawAfter(JPABaseEmitter*); + + JPAEmitterCallBack* getOld() { return pOld; } + void setOld(JPAEmitterCallBack* cb) { pOld = cb; } + + /* 0x4 */ TAdaptor_particle* pThis_; + /* 0x8 */ JPAEmitterCallBack* pOld; + }; + + struct TJPAEmitter_stopDrawParticle_ { + TJPAEmitter_stopDrawParticle_(JPABaseEmitter* emitter) : pJPAEmitter_(emitter) {} + ~TJPAEmitter_stopDrawParticle_() { + if (pJPAEmitter_ != NULL) { + pJPAEmitter_->stopDrawParticle(); + } + } + void set(JPABaseEmitter* emitter) { pJPAEmitter_ = emitter; } + /* 0x0 */ JPABaseEmitter* pJPAEmitter_; }; /* 8028E60C */ TAdaptor_particle(JStudio_JParticle::TCreateObject*); @@ -61,6 +92,48 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle { /* 8028EC88 */ virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32); /* 8028ECA4 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, u32); + + static bool state_isFade_(u8 param_1) { + return param_1 == 1 || param_1 == 3; + } + + bool state_isFade_() { + return state_isFade_(field_0x1b8); + } + + void beginParticle_fadeIn_(u32 param_1) { + field_0x1c8 = param_1; + beginParticle_fadeIn_(); + } + + void beginParticle_() { + beginParticle_fadeIn_(0); + } + + void endParticle_() { + if (pJPAEmitter_ != NULL) { + pJPAEmitter_->becomeInvalidEmitter(); + } + } + + void set_bPermit_onExit_notEnd_(bool param_1) { field_0x1b4 = param_1; } + + /* 0x1A0 */ TCreateObject* pCreateObject_; + /* 0x1A4 */ JPABaseEmitter* pJPAEmitter_; + /* 0x1A8 */ TJPACallback_emitter_ field_0x1a8; + /* 0x1B4 */ u8 field_0x1b4; + /* 0x1B5 */ u8 field_0x1b5; + /* 0x1B6 */ u8 field_0x1b6; + /* 0x1B7 */ u8 field_0x1b7; + /* 0x1B8 */ u8 field_0x1b8; + /* 0x1BC */ u32 field_0x1bc; + /* 0x1C0 */ u32 u32FadeTime_end; + /* 0x1C4 */ u32 field_0x1c4; + /* 0x1C8 */ u32 field_0x1c8; + /* 0x1CC */ u32 field_0x1cc; + /* 0x1D0 */ JStage::TObject* field_0x1d0; + /* 0x1D4 */ u32 field_0x1d4; + /* 0x1D8 */ u8 field_0x1d8; }; }; // namespace JStudio_JParticle diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 0adc2f744c..f188803787 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -8,6 +8,7 @@ #include "JSystem/JStage/JSGLight.h" #include "JSystem/JStage/JSGSystem.h" #include "JSystem/JStudio/JStudio/jstudio-object.h" +#include "JSystem/JStudio/JStudio/jstudio-math.h" namespace JStudio_JStage { struct TCreateObject : public JStudio::TCreateObject { @@ -23,14 +24,18 @@ struct TCreateObject : public JStudio::TCreateObject { }; struct TAdaptor_object_ { + TAdaptor_object_(JStage::TSystem const*param_2, JStage::TObject *param_3) : + pJSGSystem_(param_2), pJSGObject_(param_3) {} /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - /* 8028A4BC */ void adaptor_object_findJSGObject_(char const*); - /* 8028A50C */ void adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); + /* 8028A4BC */ JStage::TObject* adaptor_object_findJSGObject_(char const*); + /* 8028A50C */ s32 adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); /* 8028A550 */ void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, u32); - /* 0x0 */ JStudio::TAdaptor* field_0x0; - /* 0x4 */ JStage::TSystem* pJSGSystem_; - /* 0x8 */ JStage::TObject* pJSGObject_; + void adaptor_object_begin_() { pJSGObject_->JSGFEnableFlag(1); } + void adaptor_object_end_() { pJSGObject_->JSGFDisableFlag(1); } + + /* 0x0 */ JStage::TSystem const* pJSGSystem_; + /* 0x4 */ JStage::TObject* pJSGObject_; }; struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::TAdaptor_object_ { @@ -86,7 +91,7 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T /* 0x150 */ u32 field_0x150; }; -struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight { +struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight, public TAdaptor_object_ { /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*); /* 8028B6AC */ virtual ~TAdaptor_ambientLight(); @@ -95,6 +100,8 @@ struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight { /* 8028B7B0 */ virtual void adaptor_do_end(); /* 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_; } }; struct TAdaptor_camera : public JStudio::TAdaptor_camera { @@ -155,18 +162,30 @@ struct TAdaptor_light : public JStudio::TAdaptor_light { static u8 saoVVOutput_direction_[72]; }; -/* 8028A1F8 */ void +/* 8028A1F8 */ bool transform_toGlobalFromLocal(f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, JStage::TObject const*, u32); -/* 8028A290 */ void transform_toGlobalFromLocal(f32 (*)[4], +/* 8028A290 */ bool transform_toGlobalFromLocal(f32 (*)[4], JStudio::TControl::TTransform_position const&, JStage::TObject const*, u32); -/* 8028A328 */ void + +inline bool transform_toGlobalFromLocal(JStudio::TControl::TTransform_position* param_1, + JStudio::TControl::TTransform_position const& param_2, + JStage::TObject const* param_3, u32 param_4) { + Mtx afStack_38; + + if (!transform_toGlobalFromLocal(afStack_38, param_2, param_3, param_4)) { + return false; + } + JStudio::math::getFromTransformation_T(afStack_38, param_1); + return true; +} +/* 8028A328 */ bool transform_toLocalFromGlobal(f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, JStage::TObject const*, u32); -/* 8028A3CC */ void transform_toLocalFromGlobal(f32 (*)[4], +/* 8028A3CC */ bool transform_toLocalFromGlobal(f32 (*)[4], JStudio::TControl::TTransform_position const&, JStage::TObject const*, u32); }; // namespace JStudio_JStage diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 21ef9324e8..2f838d0ef2 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -58,7 +58,7 @@ public: /* 80038098 */ virtual ~dDemo_actor_c(); /* 800387EC */ virtual void JSGSetData(u32, void const*, u32); /* 8003A05C */ virtual s32 JSGFindNodeID(char const*) const; - /* 8003A088 */ virtual int JSGGetNodeTransformation(u32, f32 (*)[4]) const; + /* 8003A088 */ virtual bool JSGGetNodeTransformation(u32, f32 (*)[4]) const; /* 8003A0D8 */ virtual void JSGGetTranslation(Vec*) const; /* 80038920 */ virtual void JSGSetTranslation(Vec const&); /* 8003A0F4 */ virtual void JSGGetScaling(Vec*) const; diff --git a/libs/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp index 33bf4b4ea6..51d1ce64c7 100644 --- a/libs/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/JParticle/JPABaseShape.cpp @@ -1254,7 +1254,7 @@ void JPADrawEmitterCallBackB(JPAEmitterWorkData* work) { if (work->mpEmtr->mpEmtrCallBack == NULL) return; - work->mpEmtr->mpEmtrCallBack->drawAfter(work->mpEmtr); + work->mpEmtr->mpEmtrCallBack->draw(work->mpEmtr); } /* 8027A414-8027A454 274D54 0040+00 0/0 1/1 0/0 .text diff --git a/libs/JSystem/JStage/JSGObject.cpp b/libs/JSystem/JStage/JSGObject.cpp index f2be132acb..dd48e6a9fa 100644 --- a/libs/JSystem/JStage/JSGObject.cpp +++ b/libs/JSystem/JStage/JSGObject.cpp @@ -15,8 +15,8 @@ void JStage::TObject::JSGUpdate() {} /* 80280E28-80280E30 27B768 0008+00 1/0 12/0 0/0 .text JSGGetFlag__Q26JStage7TObjectCFv */ -bool JStage::TObject::JSGGetFlag() const { - return false; +u32 JStage::TObject::JSGGetFlag() const { + return 0; } /* 80280E30-80280E34 27B770 0004+00 1/0 12/0 0/0 .text JSGSetFlag__Q26JStage7TObjectFUl @@ -50,7 +50,7 @@ s32 JStage::TObject::JSGFindNodeID(char const*) const { /* 80280E54-80280E90 27B794 003C+00 1/0 11/0 0/0 .text * JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f */ -int JStage::TObject::JSGGetNodeTransformation(u32, MtxP mtx) const { +bool JStage::TObject::JSGGetNodeTransformation(u32, MtxP mtx) const { mtx[0][0] = 0.0f; mtx[0][1] = 0.0f; mtx[0][2] = 0.0f; @@ -63,5 +63,5 @@ int JStage::TObject::JSGGetNodeTransformation(u32, MtxP mtx) const { mtx[2][1] = 0.0f; mtx[2][2] = 0.0f; mtx[2][3] = 0.0f; - return 0; + return false; } diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index e21642b2e6..5e66bf749e 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -11,8 +11,8 @@ s32 JStage::TSystem::JSGFGetType() const { /* 80280EF8-80280F00 27B838 0008+00 1/0 0/0 0/0 .text * JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ -bool JStage::TSystem::JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const { - return true; +int JStage::TSystem::JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const { + return 1; } /* 80280F00-80280F08 27B840 0008+00 1/0 1/0 0/0 .text diff --git a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp index 7e8a914974..4dad2edc2c 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -1,6 +1,5 @@ // -// Generated By: dol2asm -// Translation Unit: jstudio-control +// jstudio-control // #include "JSystem/JStudio/JStudio/jstudio-control.h" @@ -8,66 +7,6 @@ #include "JSystem/JStudio/JStudio/jstudio-data.h" #include "string.h" -// -// Forward References: -// - -extern "C" void __ct__Q27JStudio8TControlFv(); -extern "C" void __dt__Q27JStudio8TControlFv(); -extern "C" void setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory(); -extern "C" void transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf(); -extern "C" void transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf(); -extern "C" void transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject(); -extern "C" void transform_setOrigin_ctb_index__Q27JStudio8TControlFUl(); -extern "C" void __dt__Q27JStudio13TCreateObjectFv(); -extern "C" void __dt__Q27JStudio8TFactoryFv(); -extern "C" void appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject(); -extern "C" void create__Q27JStudio8TFactoryFRCQ47JStudio3stb4data20TParse_TBlock_object(); -extern "C" void __ct__Q27JStudio6TParseFPQ27JStudio8TControl(); -extern "C" void __dt__Q27JStudio6TParseFv(); -extern "C" void parseHeader__Q27JStudio6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl(); -extern "C" void parseBlock_block__Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl(); -extern "C" void parseBlock_block_fvb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl(); -extern "C" void parseBlock_block_ctb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl(); - -// -// External References: -// - -extern "C" void __ct__Q37JStudio3ctb8TControlFv(); -extern "C" void __dt__Q37JStudio3ctb8TControlFv(); -extern "C" void getObject_index__Q37JStudio3ctb8TControlFUl(); -extern "C" void __dt__Q37JStudio3ctb8TFactoryFv(); -extern "C" void __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl(); -extern "C" void __dt__Q37JStudio3ctb6TParseFv(); -extern "C" void __ct__Q37JStudio3fvb8TControlFv(); -extern "C" void __dt__Q37JStudio3fvb8TControlFv(); -extern "C" void __dt__Q37JStudio3fvb8TFactoryFv(); -extern "C" void __ct__Q37JStudio3fvb6TParseFPQ37JStudio3fvb8TControl(); -extern "C" void __dt__Q37JStudio3fvb6TParseFv(); -extern "C" void __ct__Q37JStudio3stb8TControlFv(); -extern "C" void __dt__Q37JStudio3stb8TControlFv(); -extern "C" void __dt__Q37JStudio3stb8TFactoryFv(); -extern "C" void destroy__Q37JStudio3stb8TFactoryFPQ37JStudio3stb7TObject(); -extern "C" void __ct__Q37JStudio3stb6TParseFPQ37JStudio3stb8TControl(); -extern "C" void __dt__Q37JStudio3stb6TParseFv(); -extern "C" void parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl(); -extern "C" void parseBlock_next__Q37JStudio3stb6TParseFPPCvPUlUl(); -extern "C" void parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl(); -extern "C" void -parseBlock_object__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data20TParse_TBlock_objectUl(); -extern "C" void __dl__FPv(); -extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(); -extern "C" void __dt__Q27JGadget13TNodeLinkListFv(); -extern "C" void -Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__Q27JStudio13TCreateObject[4]; -extern "C" u8 ga8cSignature__Q27JStudio4data[8]; - /* 80285114-802851AC 27FA54 0098+00 0/0 1/1 0/0 .text __ct__Q27JStudio8TControlFv */ JStudio::TControl::TControl() { mTransformOnSet = false; diff --git a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp index ec2544e891..e65acc702f 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -44,12 +44,15 @@ SECTION_SDATA2 static u8 lit_489[4] = { // regalloc #ifdef NONMATCHING void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { - f32 cosx = cos(DEG_TO_RAD(x)); - f32 sinx = sin(DEG_TO_RAD(x)); - f32 cosy = cos(DEG_TO_RAD(y)); - f32 siny = sin(DEG_TO_RAD(y)); - f32 cosz = cos(DEG_TO_RAD(z)); - f32 sinz = sin(DEG_TO_RAD(z)); + x = DEG_TO_RAD(x); + f32 cosx = cos(x); + f32 sinx = sin(x); + y = DEG_TO_RAD(y); + f32 cosy = cos(y); + f32 siny = sin(y); + z = DEG_TO_RAD(z); + f32 cosz = cos(z); + f32 sinz = sin(z); f32 cosxcosz = cosx * cosz; f32 cosxsinz = cosx * sinz; f32 sinxcosz = sinx * cosz; diff --git a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp index e393dfb62f..0d8ec9c068 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -1686,8 +1686,8 @@ JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object c /* ############################################################################################## */ /* 8039AA68-8039AA74 0270C8 000C+00 3/3 2/2 0/0 .rodata * sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor */ -SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, +SECTION_RODATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[3] = { + 3, 4, 5, }; COMPILER_STRIP_GATE(0x8039AA68, &JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ); @@ -1748,29 +1748,29 @@ JStudio::TObject_ambientLight::TObject_ambientLight( /* ############################################################################################## */ /* 8039AA74-8039AA80 0270D4 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor */ -SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, +SECTION_RODATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[3] = { + 6, 7, 8, }; COMPILER_STRIP_GATE(0x8039AA74, &JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ); /* 8039AA80-8039AA8C 0270E0 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor */ -SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[12] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, +SECTION_RODATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[3] = { + 9, 10, 11, }; COMPILER_STRIP_GATE(0x8039AA80, &JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ); /* 8039AA8C-8039AA98 0270EC 000C+00 1/1 0/0 0/0 .rodata * sauVariableValue_3_COLOR_RGB__Q27JStudio21TAdaptor_ambientLight */ -SECTION_RODATA u8 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AA8C, &JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB); /* 8039AA98-8039AAA8 0270F8 0010+00 1/1 2/2 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight */ -SECTION_RODATA u8 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, +SECTION_RODATA u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[4] = { + 0, 1, 2, 3, }; COMPILER_STRIP_GATE(0x8039AA98, &JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA); @@ -1811,15 +1811,15 @@ JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object /* ############################################################################################## */ /* 8039AAA8-8039AAB4 027108 000C+00 1/1 2/2 0/0 .rodata * sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera */ -SECTION_RODATA u8 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AAA8, &JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ); /* 8039AAB4-8039AAC0 027114 000C+00 1/1 2/2 0/0 .rodata * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera */ -SECTION_RODATA u8 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, +SECTION_RODATA u32 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[3] = { + 3, 4, 5, }; COMPILER_STRIP_GATE(0x8039AAB4, &JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ); @@ -1845,8 +1845,8 @@ static u8 data_80431070[16]; /* 804554B0-804554B8 003AB0 0008+00 1/1 0/0 0/0 .sdata2 * sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera */ -SECTION_SDATA2 u8 JStudio::TAdaptor_camera::sauVariableValue_2_DISTANCE_NEAR_FAR[8] = { - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, +SECTION_SDATA2 u32 JStudio::TAdaptor_camera::sauVariableValue_2_DISTANCE_NEAR_FAR[2] = { + 8, 9, }; /* 80286EB8-8028717C 2817F8 02C4+00 2/0 0/0 0/0 .text @@ -1883,22 +1883,22 @@ JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const /* ############################################################################################## */ /* 8039AAC0-8039AACC 027120 000C+00 1/1 0/0 0/0 .rodata * sauVariableValue_3_COLOR_RGB__Q27JStudio12TAdaptor_fog */ -SECTION_RODATA u8 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AAC0, &JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB); /* 8039AACC-8039AADC 02712C 0010+00 1/1 2/2 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog */ -SECTION_RODATA u8 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, +SECTION_RODATA u32 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[4] = { + 0, 1, 2, 3, }; COMPILER_STRIP_GATE(0x8039AACC, &JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA); /* 804554B8-804554C0 003AB8 0008+00 1/1 0/0 0/0 .sdata2 * sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog */ -SECTION_SDATA2 u8 JStudio::TAdaptor_fog::sauVariableValue_2_RANGE_BEGIN_END[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, +SECTION_SDATA2 u32 JStudio::TAdaptor_fog::sauVariableValue_2_RANGE_BEGIN_END[2] = { + 4, 5, }; /* 80287218-80287308 281B58 00F0+00 2/0 0/0 0/0 .text @@ -1946,8 +1946,8 @@ static u8 data_8043108C[16]; /* 804554C0-804554C8 003AC0 0008+00 1/1 0/0 0/0 .sdata2 * sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light */ -SECTION_SDATA2 u8 JStudio::TAdaptor_light::sauVariableValue_2_DIRECTION_THETA_PHI[8] = { - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, +SECTION_SDATA2 u32 JStudio::TAdaptor_light::sauVariableValue_2_DIRECTION_THETA_PHI[2] = { + 10, 11, }; /* 802873A4-802875E0 281CE4 023C+00 2/0 0/0 0/0 .text @@ -2061,51 +2061,51 @@ JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object c * sauVariableValue_3_COLOR_RGB__Q27JStudio14TAdaptor_light */ #pragma push #pragma force_active on -SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AADC, &JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB); #pragma pop /* 8039AAE8-8039AAF8 027148 0010+00 0/0 2/2 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio14TAdaptor_light */ -SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, +SECTION_RODATA u32 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[4] = { + 0, 1, 2, 3, }; COMPILER_STRIP_GATE(0x8039AAE8, &JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA); /* 8039AAF8-8039AB04 027158 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light */ -SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, +SECTION_RODATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[3] = { + 4, 5, 6, }; COMPILER_STRIP_GATE(0x8039AAF8, &JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ); /* 8039AB04-8039AB10 027164 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light */ -SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, +SECTION_RODATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[3] = { + 7, 8, 9, }; COMPILER_STRIP_GATE(0x8039AB04, &JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ); /* 8039AB10-8039AB1C 027170 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle */ -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AB10, &JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ); /* 8039AB1C-8039AB28 02717C 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle */ -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[3] = { + 3, 4, 5, }; COMPILER_STRIP_GATE(0x8039AB1C, &JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ); /* 8039AB28-8039AB34 027188 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle */ -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[12] = { - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[3] = { + 6, 7, 8, }; COMPILER_STRIP_GATE(0x8039AB28, &JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ); @@ -2113,16 +2113,16 @@ COMPILER_STRIP_GATE(0x8039AB28, &JStudio::TAdaptor_particle::sauVariableValue_3_ * sauVariableValue_3_COLOR_RGB__Q27JStudio17TAdaptor_particle */ #pragma push #pragma force_active on -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[12] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[3] = { + 9, 10, 11, }; COMPILER_STRIP_GATE(0x8039AB34, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB); #pragma pop /* 8039AB40-8039AB50 0271A0 0010+00 0/0 1/1 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle */ -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[16] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[4] = { + 9, 10, 11, 12, }; COMPILER_STRIP_GATE(0x8039AB40, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA); @@ -2130,8 +2130,8 @@ COMPILER_STRIP_GATE(0x8039AB40, &JStudio::TAdaptor_particle::sauVariableValue_4_ * sauVariableValue_3_COLOR1_RGB__Q27JStudio17TAdaptor_particle */ #pragma push #pragma force_active on -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[12] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[3] = { + 9, 10, 11, }; COMPILER_STRIP_GATE(0x8039AB50, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB); #pragma pop @@ -2140,16 +2140,16 @@ COMPILER_STRIP_GATE(0x8039AB50, &JStudio::TAdaptor_particle::sauVariableValue_3_ * sauVariableValue_4_COLOR1_RGBA__Q27JStudio17TAdaptor_particle */ #pragma push #pragma force_active on -SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[16] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, +SECTION_RODATA u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[4] = { + 9, 10, 11, 12, }; COMPILER_STRIP_GATE(0x8039AB5C, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA); #pragma pop /* 8039AB6C-8039AB78 0271CC 000C+00 1/1 1/1 0/0 .rodata * sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound */ -SECTION_RODATA u8 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, +SECTION_RODATA u32 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[3] = { + 0, 1, 2, }; COMPILER_STRIP_GATE(0x8039AB6C, &JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ); @@ -2571,11 +2571,7 @@ SECTION_DEAD static char const* const pad_8039AB82 = "\0\0\0\0\0"; #pragma pop /* 804511F8-80451200 0006F8 0008+00 0/0 1/1 0/0 .sbss None */ -extern u8 data_804511F8[8]; -u8 data_804511F8[8]; - -/* 80451200-80451208 000700 0008+00 0/0 1/1 0/0 .sbss None */ -extern u8 data_80451200[8]; -u8 data_80451200[8]; +// extern u8 data_804511F8[8]; +// u8 data_804511F8[8]; /* 8039AB78-8039AB78 0271D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JStudio/JStudio/object-id.cpp b/libs/JSystem/JStudio/JStudio/object-id.cpp index fe7bf8b503..456de396bd 100644 --- a/libs/JSystem/JStudio/JStudio/object-id.cpp +++ b/libs/JSystem/JStudio/JStudio/object-id.cpp @@ -1,14 +1,11 @@ // -// Generated By: dol2asm -// Translation Unit: object-id +// object-id // #include "JSystem/JStudio/JStudio/object-id.h" /* 80288988-80288A78 2832C8 00F0+00 0/0 3/3 0/0 .text * isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData */ -// regalloc -#ifdef NONMATCHING bool JStudio::object::TIDData::isEqual(JStudio::object::TIDData const& a, JStudio::object::TIDData const& b) { if (a.getIDSize() != b.getIDSize()) { @@ -20,7 +17,7 @@ bool JStudio::object::TIDData::isEqual(JStudio::object::TIDData const& a, u32* aStr32 = (u32*)aStr; const void* bStr = b.getID(); u32* bStr32 = (u32*)bStr; - if (aStr == bStr) { // mismatch here + if (aStr == bStr) { // they point to the same id return true; } @@ -54,14 +51,3 @@ bool JStudio::object::TIDData::isEqual(JStudio::object::TIDData const& a, return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool JStudio::object::TIDData::isEqual(JStudio::object::TIDData const& param_0, - JStudio::object::TIDData const& param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio/object-id/func_80288988.s" -} -#pragma pop -#endif \ No newline at end of file diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp index 96518b7da7..7be260ba2f 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -1,83 +1,50 @@ // -// Generated By: dol2asm -// Translation Unit: control +// control // #include "JSystem/JStudio/JStudio_JAudio2/control.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __dt__Q215JStudio_JAudio213TCreateObjectFv(); -extern "C" void -create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); -extern "C" void -createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject(); - -// -// External References: -// - -extern "C" void __dt__Q27JStudio13TCreateObjectFv(); -extern "C" void -__ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound(); -extern "C" void __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5A68-803C5A78 022B88 0010+00 1/1 1/1 0/0 .data __vt__Q215JStudio_JAudio213TCreateObject */ -SECTION_DATA extern void* __vt__Q215JStudio_JAudio213TCreateObject[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q215JStudio_JAudio213TCreateObjectFv, - (void*) - create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object, -}; +#include "JSystem/JGadget/pointer.h" /* 8028D550-8028D5B0 287E90 0060+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio213TCreateObjectFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JAudio2::TCreateObject::~TCreateObject() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/control/__dt__Q215JStudio_JAudio213TCreateObjectFv.s" -} -#pragma pop +JStudio_JAudio2::TCreateObject::~TCreateObject() {} /* 8028D5B0-8028D624 287EF0 0074+00 1/0 0/0 0/0 .text * create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool -JStudio_JAudio2::TCreateObject::create(JStudio::TObject** param_0, - JStudio::stb::data::TParse_TBlock_object const& param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D5B0.s" +bool JStudio_JAudio2::TCreateObject::create( + JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { + JUT_ASSERT(40, ppObject!=0); + CreateFunc func; + switch (param_2.get_type()) { + case 'JSND': + func = createObject_JAI_SOUND_; + break; + default: + return false; + } + *ppObject = func(param_2, this); + return 1; } -#pragma pop /* 8028D624-8028D728 287F64 0104+00 1/1 0/0 0/0 .text * createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_( - JStudio::stb::data::TParse_TBlock_object const& param_0, - JStudio_JAudio2::TCreateObject* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/control/func_8028D624.s" +JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_( + JStudio::stb::data::TParse_TBlock_object const& param_1, + JStudio_JAudio2::TCreateObject* param_2) { + JStudio_JAudio2::TAdaptor_sound* adaptor = new JStudio_JAudio2::TAdaptor_sound(param_2); + if (adaptor == NULL) { + return NULL; + } + JGadget::TPointer_delete deleteGuard(adaptor); + adaptor->set_bPermit_onExit_notEnd_(param_2->isPermit_onExit_notEnd()); + JStudio::TObject_sound* soundObj = + JStudio::TCreateObject::createFromAdaptor(param_1, + adaptor); + if (soundObj == NULL) { + return NULL; + } + deleteGuard.set(NULL); + return soundObj; } -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 68c333653b..c2ae36e563 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -1,532 +1,378 @@ // -// Generated By: dol2asm -// Translation Unit: object-sound +// object-sound // #include "JSystem/JStudio/JStudio_JAudio2/object-sound.h" -#include "dol2asm.h" #include "JSystem/JStudio/JStudio_JAudio2/control.h" - -// -// Forward References: -// - -extern "C" static void func_8028D728(); -extern "C" static void func_8028D750(); -extern "C" static void func_8028D778(); -extern "C" static void func_8028D7A0(); -extern "C" static void func_8028D800(); -extern "C" void __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject(); -extern "C" void __dt__Q215JStudio_JAudio214TAdaptor_soundFv(); -extern "C" void adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv(); -extern "C" void adaptor_do_end__Q215JStudio_JAudio214TAdaptor_soundFv(); -extern "C" void adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl(); -extern "C" void -adaptor_do_SOUND__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_BEGIN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_REPEAT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_LOCATED__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor(); -extern "C" void prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv(); -extern "C" void beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv(); -extern "C" void endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl(); -extern "C" void __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv(); -extern "C" void func_8028E0F4(); -extern "C" u8 saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound[72]; - -// -// External References: -// - -extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); -extern "C" void adaptor_do_begin__Q27JStudio8TAdaptorFv(); -extern "C" void adaptor_do_data__Q27JStudio8TAdaptorFPCvUlPCvUl(); -extern "C" void -adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate(); -extern "C" void adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl(); -extern "C" void __dt__Q27JStudio14TAdaptor_soundFv(); -extern "C" void -transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl(); -extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void releaseSound__14JAISoundHandleFv(); -extern "C" void lockWhenPrepared__15JAISoundStatus_Fv(); -extern "C" void unlockIfLocked__15JAISoundStatus_Fv(); -extern "C" void stop__8JAISoundFUl(); -extern "C" void stop__8JAISoundFv(); -extern "C" void moveVolume__18JAISoundParamsMoveFfUl(); -extern "C" void movePitch__18JAISoundParamsMoveFfUl(); -extern "C" void moveFxMix__18JAISoundParamsMoveFfUl(); -extern "C" void movePan__18JAISoundParamsMoveFfUl(); -extern "C" void func_802A2FEC(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void __construct_array(); -extern "C" void __cvt_fp2unsigned(); -extern "C" u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound[12]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_sound[20]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; -extern "C" extern u8 data_804511F8[8]; - -// -// Declarations: -// +#include "JSystem/JStudio/JStudio_JStage/control.h" /* 8028D728-8028D750 288068 0028+00 1/1 0/0 0/0 .text * setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028D728() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D728.s" +static void setValue_VOLUME_(JAISound *param_1, float param_2) { + param_1->getAuxiliary().moveVolume(param_2, 0); } -#pragma pop /* 8028D750-8028D778 288090 0028+00 1/1 0/0 0/0 .text * setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028D750() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D750.s" +static void setValue_PAN_(JAISound *param_1, float param_2) { + param_1->getAuxiliary().movePan(param_2, 0); } -#pragma pop /* 8028D778-8028D7A0 2880B8 0028+00 1/1 0/0 0/0 .text * setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028D778() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D778.s" +static void setValue_PITCH_(JAISound *param_1, float param_2) { + param_1->getAuxiliary().movePitch(param_2, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 80455510-80455514 003B10 0004+00 3/3 0/0 0/0 .sdata2 @1470 */ -SECTION_SDATA2 static u8 lit_1470[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 8028D7A0-8028D800 2880E0 0060+00 1/1 0/0 0/0 .text * setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028D7A0() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D7A0.s" +static void setValue_TEMPO_(JAISound *param_1, float param_2) { + JAITempoMgr* tempoMgr = param_1->getTempoMgr(); + if (tempoMgr != NULL) { + tempoMgr->setTempo(param_2); + } } -#pragma pop /* 8028D800-8028D828 288140 0028+00 1/1 0/0 0/0 .text * setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8028D800() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D800.s" +static void setValue_ECHO_(JAISound *param_1, float param_2) { + param_1->getAuxiliary().moveFxMix(param_2, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 803C5A78-803C5A88 022B98 0010+00 2/2 0/0 0/0 .data - * __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_ */ -SECTION_DATA extern void* __vt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor, - (void*)__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv, -}; - -/* 803C5A88-803C5AD8 022BA8 0050+00 2/2 0/0 0/0 .data __vt__Q215JStudio_JAudio214TAdaptor_sound */ -SECTION_DATA extern void* __vt__Q215JStudio_JAudio214TAdaptor_sound[20] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q215JStudio_JAudio214TAdaptor_soundFv, - (void*)adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv, - (void*)adaptor_do_begin__Q27JStudio8TAdaptorFv, - (void*)adaptor_do_end__Q215JStudio_JAudio214TAdaptor_soundFv, - (void*)adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl, - (void*)adaptor_do_data__Q27JStudio8TAdaptorFPCvUlPCvUl, - (void*) - adaptor_do_SOUND__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_BEGIN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_REPEAT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_LOCATED__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl, -}; /* 8028D828-8028D8F4 288168 00CC+00 0/0 1/1 0/0 .text * __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028D828.s" +JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) : + pCreateObject_(param_1) { + field_0x11c = 0; + field_0x11d = 0; + field_0x11e = 0; + field_0x11f = 0; + field_0x120 = 0; + field_0x124 = 0xffffffff; + field_0x128 = 0; + field_0x12c = NULL; + field_0x13c = NULL; + field_0x140 = 0xffffffff; + field_0x144 = 0; + JUT_ASSERT(112, pCreateObject_!=0); } -#pragma pop /* 8028D8F4-8028D9A4 288234 00B0+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio214TAdaptor_soundFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JAudio2::TAdaptor_sound::~TAdaptor_sound() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q215JStudio_JAudio214TAdaptor_soundFv.s" +JStudio_JAudio2::TAdaptor_sound::~TAdaptor_sound() { + if (opJAISoundHandle_) { + if (field_0x11f == 0) { + opJAISoundHandle_->stop(); + } else if (field_0x11c != 0) { + opJAISoundHandle_.releaseSound(); + } else { + opJAISoundHandle_->stop(); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80431490-804314B0 05E1B0 0020+00 2/2 0/0 0/0 .bss aoData$1517 */ -static u8 aoData[32]; - -/* 804314B0-804314BC 05E1D0 000C+00 0/1 0/0 0/0 .bss @1817 */ -#pragma push -#pragma force_active on -static u8 lit_1817[12]; -#pragma pop - -/* 804314BC-804314C8 05E1DC 000C+00 0/1 0/0 0/0 .bss @1818 */ -#pragma push -#pragma force_active on -static u8 lit_1818[12]; -#pragma pop - -/* 804314C8-804314D4 05E1E8 000C+00 0/1 0/0 0/0 .bss @1819 */ -#pragma push -#pragma force_active on -static u8 lit_1819[12]; -#pragma pop - -/* 804314D4-804314E0 05E1F4 000C+00 0/1 0/0 0/0 .bss @1820 */ -#pragma push -#pragma force_active on -static u8 lit_1820[12]; -#pragma pop - -/* 804314E0-804314EC 05E200 000C+00 0/1 0/0 0/0 .bss @1821 */ -#pragma push -#pragma force_active on -static u8 lit_1821[12]; -#pragma pop - -/* 804314EC-804314F8 05E20C 000C+00 0/1 0/0 0/0 .bss @1822 */ -#pragma push -#pragma force_active on -static u8 lit_1822[12]; -#pragma pop - -/* 804314F8-80431540 05E218 0048+00 1/2 0/0 0/0 .bss - * saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound */ -u8 JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[72]; /* 8028D9A4-8028DA74 2882E4 00D0+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() { + static JStudio::TAdaptor::TSetVariableValue_immediate aoData[4] = { + TSetVariableValue_immediate(0, 0.0f), + TSetVariableValue_immediate(1, 0.0f), + TSetVariableValue_immediate(2, 0.0f), + TSetVariableValue_immediate(-1, NAN), + }; + adaptor_setVariableValue_immediate(aoData); + for (TVVOSetValue_* pTVar1 = saoVVOSetValue_; pTVar1->field_0x04 != -1; pTVar1++) { + adaptor_referVariableValue(pTVar1->field_0x04)->setOutput(pTVar1); + } } -#pragma pop + +/* 804314F8-80431540 05E218 0048+00 1/2 0/0 0/0 .bss + * saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound */ +JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[6] = { + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_7, setValue_VOLUME_ + ), + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_8, setValue_PAN_ + ), + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_9, setValue_PITCH_ + ), + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_10, setValue_TEMPO_ + ), + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_11, setValue_ECHO_ + ), + JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_( + JStudio_JAudio2::TAdaptor_sound::UNK_NONE, NULL + ), +}; /* 8028DA74-8028DA78 2883B4 0004+00 1/0 0/0 0/0 .text * adaptor_do_end__Q215JStudio_JAudio214TAdaptor_soundFv */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() { - /* empty function */ } /* 8028DA78-8028DC20 2883B8 01A8+00 1/0 0/0 0/0 .text * adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) { + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(194, pObject!=0); + const JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(196, pControl!=0); + JStudio::TControl::TTransform_position VStack_148; + JStudio::TControl::TTransform_position VStack_154; + JStudio::TControl::TTransform_position* pVVar2; + adaptor_getVariableValue_Vec(&VStack_148, + JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ); + if (field_0x144 == 0) { + pVVar2 = pControl->transformOnSet_transform_ifEnabled(&VStack_148, &VStack_154); + } else { + if (!JStudio_JStage::transform_toGlobalFromLocal(&VStack_154, VStack_148, field_0x13c, field_0x140)) { + return; + } + pVVar2 = &VStack_154; + } + field_0x130 = *pVVar2; + if (field_0x11d) { + switch(field_0x120) { + case 2: + JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_(); + soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c); + break; + case 1: + field_0x120 = 2; + break; + } + } + + if (field_0x11e != 0 && field_0x124 != -1 && !opJAISoundHandle_) { + prepareSound_(); + beginSound_fadeIn_(); + } + if (field_0x12c != NULL && opJAISoundHandle_) + { + opJAISoundHandle_->setPos(*field_0x12c); + } } -#pragma pop /* 8028DC20-8028DC54 288560 0034+00 1/0 0/0 0/0 .text * adaptor_do_SOUND__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC20.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch(param_1) { + case JStudio::data::UNK_0x19: + JUT_ASSERT(283, pContent!=0); + JUT_ASSERT(284, uSize==4); + field_0x124 = *(u32*)pContent; + prepareSound_(); + break; + } } -#pragma pop /* 8028DC54-8028DC88 288594 0034+00 1/0 0/0 0/0 .text * adaptor_do_BEGIN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC54.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x1: + JUT_ASSERT(284, uSize == 0); + beginSound_(); + break; + } } -#pragma pop /* 8028DC88-8028DCD0 2885C8 0048+00 1/0 0/0 0/0 .text * adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DC88.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(323, pContent!=0); + JUT_ASSERT(324, uSize==4); + beginSound_fadeIn_(*(f32*)pContent); + break; + } } -#pragma pop /* 8028DCD0-8028DD00 288610 0030+00 1/0 0/0 0/0 .text * adaptor_do_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DCD0.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x1: + JUT_ASSERT(345, uSize == 0); + endSound_(); + break; + } } -#pragma pop /* 8028DD00-8028DD48 288640 0048+00 1/0 0/0 0/0 .text * adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD00.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(364, pContent!=0); + JUT_ASSERT(365, uSize==4); + endSound_fadeOut_(*(f32*)pContent); + break; + } } -#pragma pop /* 8028DD48-8028DDB4 288688 006C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DD48.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT( + JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(387, pContent!=0); + JUT_ASSERT(388, uSize!=0); + field_0x13c = NULL; + 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)) { + JUT_ASSERT(405, pJSGObject != 0); + field_0x13c = pJSGObject; + } + break; + } } -#pragma pop /* 8028DDB4-8028DE34 2886F4 0080+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DDB4.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + if (field_0x13c != NULL) { + JUT_ASSERT(431, pContent!=0); + JUT_ASSERT(432, uSize==0); + field_0x140 = field_0x13c->JSGFindNodeID((char*)pContent); + if (field_0x140 == -1) { + return; + } + } + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(447, uSize==4); + JUT_ASSERT(448, pContent!=0); + field_0x140 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028DE34-8028DE50 288774 001C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE34.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(468, uSize == 4); + JUT_ASSERT(469, pContent != 0); + field_0x144 = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028DE50-8028DE6C 288790 001C+00 1/0 0/0 0/0 .text * adaptor_do_REPEAT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE50.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(490, uSize == 4); + JUT_ASSERT(491, pContent != 0); + field_0x11e = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028DE6C-8028DE88 2887AC 001C+00 1/0 0/0 0/0 .text * adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE6C.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(512, uSize == 4); + JUT_ASSERT(513, pContent != 0); + field_0x11d = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028DE88-8028DEB0 2887C8 0028+00 1/0 0/0 0/0 .text * adaptor_do_LOCATED__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DE88.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(534, pContent != 0); + JUT_ASSERT(535, uSize == 4); + u32 val = *(u32*)pContent; + field_0x12c = NULL; + if (val != 0) { + field_0x12c = &field_0x130; + } + } } -#pragma pop /* 8028DEB0-8028DECC 2887F0 001C+00 1/0 0/0 0/0 .text * adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DEB0.s" +void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(512, uSize == 4); + JUT_ASSERT(513, pContent != 0); + field_0x11f = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028DECC-8028DF04 28880C 0038+00 1/0 0/0 0/0 .text * __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_0, - JStudio::TAdaptor* param_1) const { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028DECC.s" +void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1, + JStudio::TAdaptor* param_2) const { + JUT_ASSERT(596, param_2 != 0); + if (((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_) { + JAISound* sound = ((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_.sound_; + field_0x08(sound, param_1); + } } -#pragma pop /* 8028DF04-8028DFA4 288844 00A0+00 2/2 0/0 0/0 .text * prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::prepareSound_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv.s" +void JStudio_JAudio2::TAdaptor_sound::prepareSound_() { + if (opJAISoundHandle_) { + opJAISoundHandle_stop_(); + } + JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_(); + if (field_0x11d == 0) { + soundStarter->startSound(field_0x124, &opJAISoundHandle_, field_0x12c); + } else { + soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c); + } + if (opJAISoundHandle_) { + opJAISoundHandle_->lockWhenPrepared(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455514-80455518 003B14 0004+00 1/1 0/0 0/0 .sdata2 @1805 */ -SECTION_SDATA2 static f32 lit_1805 = 1.0f; - -/* 80455518-80455520 003B18 0008+00 1/1 0/0 0/0 .sdata2 @1807 */ -SECTION_SDATA2 static f64 lit_1807 = 4503599627370496.0 /* cast u32 to float */; /* 8028DFA4-8028E054 2888E4 00B0+00 3/3 0/0 0/0 .text * beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::beginSound_fadeIn_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv.s" +void JStudio_JAudio2::TAdaptor_sound::beginSound_fadeIn_() { + if (opJAISoundHandle_) { + opJAISoundHandle_->fadeIn(field_0x128); + opJAISoundHandle_->unlockIfLocked(); + field_0x120 = 1; + } } -#pragma pop /* 8028E054-8028E094 288994 0040+00 2/2 0/0 0/0 .text * endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JAudio2::TAdaptor_sound::endSound_fadeOut_(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl.s" +void JStudio_JAudio2::TAdaptor_sound::endSound_fadeOut_(u32 u32FadeTime) { + if (opJAISoundHandle_) { + opJAISoundHandle_->stop(u32FadeTime); + JUT_ASSERT(654, (u32FadeTime>0)||!opJAISoundHandle_); + field_0x120 = 0; + } } -#pragma pop - -/* 8028E094-8028E0F4 2889D4 0060+00 2/1 0/0 0/0 .text - * __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::~TVVOSetValue_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv.s" -} -#pragma pop - -/* 8028E0F4-8028E3A0 288A34 02AC+00 0/0 1/0 0/0 .text __sinit_object-sound_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void func_8028E0F4() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JAudio2/object-sound/func_8028E0F4.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8028E0F4, func_8028E0F4); -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp index 573cd248e8..c4d3abac07 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -1,136 +1,68 @@ // -// Generated By: dol2asm -// Translation Unit: control +// control // #include "JSystem/JStudio/JStudio_JParticle/control.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __dt__Q217JStudio_JParticle13TCreateObjectFv(); -extern "C" void -create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); -extern "C" void emitter_create__Q217JStudio_JParticle13TCreateObjectFUl(); -extern "C" void emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter(); -extern "C" void -createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject(); - -// -// External References: -// - -extern "C" void func_8027DEBC(); -extern "C" void forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter(); -extern "C" void __dt__Q27JStudio13TCreateObjectFv(); -extern "C" void -__ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle(); -extern "C" void -__ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5AD8-803C5AF0 022BF8 0018+00 1/1 1/1 0/0 .data __vt__Q217JStudio_JParticle13TCreateObject - */ -SECTION_DATA extern void* __vt__Q217JStudio_JParticle13TCreateObject[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q217JStudio_JParticle13TCreateObjectFv, - (void*) - create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object, - (void*)emitter_create__Q217JStudio_JParticle13TCreateObjectFUl, - (void*)emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter, -}; +#include "JSystem/JParticle/JPAEmitterManager.h" +#include "JSystem/JGadget/pointer.h" /* 8028E3A0-8028E400 288CE0 0060+00 1/0 1/1 0/0 .text __dt__Q217JStudio_JParticle13TCreateObjectFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JParticle::TCreateObject::~TCreateObject() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/control/__dt__Q217JStudio_JParticle13TCreateObjectFv.s" -} -#pragma pop +JStudio_JParticle::TCreateObject::~TCreateObject() {} /* 8028E400-8028E474 288D40 0074+00 1/0 1/0 0/0 .text * create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool -JStudio_JParticle::TCreateObject::create(JStudio::TObject** param_0, - JStudio::stb::data::TParse_TBlock_object const& param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E400.s" +bool +JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject, + JStudio::stb::data::TParse_TBlock_object const& param_2) { + JUT_ASSERT(40, ppObject!=0); + CreateFunc func; + switch (param_2.get_type()) { + case 'JPTC': + func = createObject_JPA_PARTICLE_; + break; + default: + return false; + } + *ppObject = func(param_2, this); + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 8039ABA8-8039ABB8 027208 000C+04 1/1 0/0 0/0 .rodata @1172 */ -SECTION_RODATA static u8 const lit_1172[12 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8039ABA8, &lit_1172); /* 8028E474-8028E4E4 288DB4 0070+00 1/0 0/0 0/0 .text * emitter_create__Q217JStudio_JParticle13TCreateObjectFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TCreateObject::emitter_create(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/control/emitter_create__Q217JStudio_JParticle13TCreateObjectFUl.s" +JPABaseEmitter* JStudio_JParticle::TCreateObject::emitter_create(u32 param_1) { + JGeometry::TVec3 local_08; + Vec local_1c = {0.0f, 0.0f, 0.0f}; + local_08 = local_1c; + return pJPAEmitterManager_->createSimpleEmitterID( + local_08, param_1 & 0xffff, (param_1 >> 24) & 0xff, (param_1 >> 16) & 0xff, NULL, NULL); } -#pragma pop /* 8028E4E4-8028E508 288E24 0024+00 1/0 1/0 0/0 .text * emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/control/emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter.s" +void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter) { + pJPAEmitterManager_->forceDeleteEmitter(pEmitter); } -#pragma pop /* 8028E508-8028E60C 288E48 0104+00 1/1 0/0 0/0 .text * createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_( - JStudio::stb::data::TParse_TBlock_object const& param_0, - JStudio_JParticle::TCreateObject* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/control/func_8028E508.s" +JStudio::TObject* JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_( + JStudio::stb::data::TParse_TBlock_object const& param_1, + JStudio_JParticle::TCreateObject* param_2) { + JStudio_JParticle::TAdaptor_particle* adaptor = new JStudio_JParticle::TAdaptor_particle(param_2); + if (adaptor == NULL) { + return NULL; + } + JGadget::TPointer_delete deleteGuard(adaptor); + adaptor->set_bPermit_onExit_notEnd_(param_2->isPermit_onExit_notEnd()); + JStudio::TObject_particle* particle = + JStudio::TCreateObject::createFromAdaptor(param_1, + adaptor); + if (particle == NULL) { + return NULL; + } + deleteGuard.set(NULL); + return particle; } -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index c2a7edb542..ec1309c703 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -1,466 +1,431 @@ // -// Generated By: dol2asm -// Translation Unit: object-particle +// object-particle // #include "JSystem/JStudio/JStudio_JParticle/object-particle.h" -#include "dol2asm.h" - -// -// Types: -// - -struct JStudio_JStage { - /* 8028A1F8 */ void transform_toGlobalFromLocal( - f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, - JStage::TObject const*, u32); -}; - -// -// Forward References: -// - -extern "C" void -__ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject(); -extern "C" void __dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv(); -extern "C" void __dt__Q217JStudio_JParticle17TAdaptor_particleFv(); -extern "C" void adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv(); -extern "C" void adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv(); -extern "C" void adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl(); -extern "C" void -adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl(); -extern "C" void -execute__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter(); -extern "C" void -executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter(); -extern "C" void -draw__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter(); -extern "C" void -drawAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter(); -extern "C" void beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv(); -extern "C" void endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl(); - -// -// External References: -// - -extern "C" void __dt__18JPAEmitterCallBackFv(); -extern "C" void JPAGetXYZRotateMtx__FsssPA4_f(); -extern "C" void func_80280808(); -extern "C" void adaptor_do_begin__Q27JStudio8TAdaptorFv(); -extern "C" void adaptor_do_data__Q27JStudio8TAdaptorFPCvUlPCvUl(); -extern "C" void -adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate(); -extern "C" void adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl(); -extern "C" void adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl(); -extern "C" void __dt__Q27JStudio17TAdaptor_particleFv(); -extern "C" void -transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl(); -extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" u8 const sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" u8 const sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" u8 const sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle[16]; -extern "C" extern void* __vt__18JPAEmitterCallBack[7]; -extern "C" extern void* __vt__Q27JStudio17TAdaptor_particle[19]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern u8 data_80451200[8]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5AF0-803C5B0C 022C10 001C+00 3/3 0/0 0/0 .data - * __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_ */ -SECTION_DATA extern void* __vt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_[7] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv, - (void*) - execute__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter, - (void*) - executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter, - (void*)draw__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter, - (void*) - drawAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter, -}; - -/* 803C5B0C-803C5B58 022C2C 004C+00 2/2 0/0 0/0 .data - * __vt__Q217JStudio_JParticle17TAdaptor_particle */ -SECTION_DATA extern void* __vt__Q217JStudio_JParticle17TAdaptor_particle[19] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q217JStudio_JParticle17TAdaptor_particleFv, - (void*)adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv, - (void*)adaptor_do_begin__Q27JStudio8TAdaptorFv, - (void*)adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv, - (void*)adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl, - (void*)adaptor_do_data__Q27JStudio8TAdaptorFPCvUlPCvUl, - (void*) - adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, - (void*) - adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl, -}; +#include "JSystem/JStudio/JStudio_JStage/control.h" /* 8028E60C-8028E700 288F4C 00F4+00 0/0 1/1 0/0 .text * __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JParticle::TAdaptor_particle::TAdaptor_particle( - JStudio_JParticle::TCreateObject* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E60C.s" +JStudio_JParticle::TAdaptor_particle::TAdaptor_particle( + JStudio_JParticle::TCreateObject* param_1) : + pCreateObject_(param_1), + pJPAEmitter_(NULL), + field_0x1a8(this) { + field_0x1b4 = 0; + field_0x1b5 = 0; + field_0x1b6 = 0; + field_0x1b7 = 0; + field_0x1b8 = 0; + field_0x1bc = -1; + u32FadeTime_end = 0; + field_0x1c4 = 0; + field_0x1c8 = 0; + field_0x1cc = 0; + field_0x1d0 = NULL; + field_0x1d4 = -1; + field_0x1d8 = 0; + JUT_ASSERT(90, pCreateObject_!=0); } -#pragma pop - -/* 8028E700-8028E760 289040 0060+00 1/0 0/0 0/0 .text - * __dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::~TJPACallback_emitter_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028E700.s" -} -#pragma pop /* 8028E760-8028E850 2890A0 00F0+00 1/0 0/0 0/0 .text * __dt__Q217JStudio_JParticle17TAdaptor_particleFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/__dt__Q217JStudio_JParticle17TAdaptor_particleFv.s" +JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() { + if (pJPAEmitter_ != NULL) { + if (field_0x1b6 == 0) { + pCreateObject_->emitter_destroy(pJPAEmitter_); + } else if (field_0x1b4 != 0) { + pJPAEmitter_->setEmitterCallBackPtr(field_0x1a8.getOld()); + pJPAEmitter_->quitImmortalEmitter(); + } else { + pCreateObject_->emitter_destroy(pJPAEmitter_); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80431540-804315D0 05E260 0090+00 1/1 0/0 0/0 .bss aoData$1265 */ -static u8 aoData[144]; - -/* 80455520-80455524 003B20 0004+00 1/1 0/0 0/0 .sdata2 @1361 */ -SECTION_SDATA2 static u8 lit_1361[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80455524-80455528 003B24 0004+00 1/1 0/0 0/0 .sdata2 @1362 */ -SECTION_SDATA2 static f32 lit_1362 = 1.0f; - -/* 80455528-80455530 003B28 0004+04 1/1 0/0 0/0 .sdata2 @1363 */ -SECTION_SDATA2 static f32 lit_1363[1 + 1 /* padding */] = { - 255.0f, - /* padding */ - 0.0f, -}; /* 8028E850-8028E97C 289190 012C+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_prepare() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_prepare() { + static JStudio::TAdaptor::TSetVariableValue_immediate aoData[18] = { + JStudio::TAdaptor::TSetVariableValue_immediate(0, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(1, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(2, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(3, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(4, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(5, 0.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(6, 1.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(7, 1.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(8, 1.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(9, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(10, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(11, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(12, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(13, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(14, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(15, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(16, 255.0f), + JStudio::TAdaptor::TSetVariableValue_immediate(), + }; + adaptor_setVariableValue_immediate(aoData); } -#pragma pop /* 8028E97C-8028E980 2892BC 0004+00 1/0 0/0 0/0 .text * adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() { - /* empty function */ } /* 8028E980-8028EA68 2892C0 00E8+00 1/0 0/0 0/0 .text * adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) { + const JStudio::TObject* pObject = adaptor_getObject(); + JUT_ASSERT(179, pObject != 0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(181, pControl != 0); + if (u32FadeTime_end != 0 && field_0x1c4 < u32FadeTime_end) { + JUT_ASSERT(187, state_isFade_()); + JUT_ASSERT(188, pJPAEmitter_ != 0); + field_0x1c4 += param_1; + if (field_0x1c4 >= u32FadeTime_end) { + switch (field_0x1b8) { + case 1: + field_0x1b8 = 2; + break; + case 3: + pCreateObject_->emitter_destroy(pJPAEmitter_); + pJPAEmitter_ = NULL; + field_0x1b8 = 0; + break; + } + u32FadeTime_end = 0; + field_0x1c4 = 0; + } + } else { + JUT_ASSERT(210, !state_isFade_()); + } + if (field_0x1b5 != 0 && field_0x1b7 != 0 && pJPAEmitter_ == NULL) { + beginParticle_fadeIn_(); + } } -#pragma pop /* 8028EA68-8028EA7C 2893A8 0014+00 1/0 0/0 0/0 .text * adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA68.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x19) { + JUT_ASSERT(232, uSize==4); + JUT_ASSERT(233, pContent!=0); + field_0x1bc = *(u32*)pContent; + } } -#pragma pop /* 8028EA7C-8028EAB0 2893BC 0034+00 1/0 0/0 0/0 .text * adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EA7C.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x1: + JUT_ASSERT(253, uSize==0); + beginParticle_(); + break; + } } -#pragma pop /* 8028EAB0-8028EAF8 2893F0 0048+00 1/0 0/0 0/0 .text * adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAB0.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(272, pContent!=0); + JUT_ASSERT(273, uSize==4); + beginParticle_fadeIn_(*(f32*)pContent); + break; + } } -#pragma pop /* 8028EAF8-8028EB24 289438 002C+00 1/0 0/0 0/0 .text * adaptor_do_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EAF8.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x1) { + JUT_ASSERT(294, uSize==0); + endParticle_(); + } } -#pragma pop /* 8028EB24-8028EB6C 289464 0048+00 1/0 0/0 0/0 .text * adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB24.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(336, pContent!=0); + JUT_ASSERT(337, uSize==4); + endParticle_fadeOut_(*(f32*)pContent); + break; + } } -#pragma pop /* 8028EB6C-8028EBD8 2894AC 006C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EB6C.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + JUT_ASSERT(313, pContent!=0); + JUT_ASSERT(314, uSize==4); + field_0x1d0 = NULL; + 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) { + JUT_ASSERT(354, pJSGObject!=0); + field_0x1d0 = pJSGObject; + } + break; + } } -#pragma pop /* 8028EBD8-8028EC58 289518 0080+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EBD8.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( + JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x18: + if (field_0x1d0 != NULL) { + JUT_ASSERT(380, pContent!=0); + JUT_ASSERT(381, uSize==4); + field_0x1d4 = field_0x1d0->JSGFindNodeID((const char*)pContent); + if (field_0x1d4 == -1) { + return; + } + } + break; + case JStudio::data::UNK_0x19: + JUT_ASSERT(397, uSize==4); + JUT_ASSERT(396, pContent!=0); + field_0x1d4 = *(u32*)pContent; + break; + } } -#pragma pop /* 8028EC58-8028EC74 289598 001C+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC58.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(417, uSize==4); + JUT_ASSERT(418, pContent!=0); + field_0x1d8 = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028EC74-8028EC88 2895B4 0014+00 1/0 0/0 0/0 .text * adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC74.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(439, uSize==4); + JUT_ASSERT(439, pContent!=0); + field_0x1cc = *(u32*)pContent; + } } -#pragma pop /* 8028EC88-8028ECA4 2895C8 001C+00 1/0 0/0 0/0 .text * adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028EC88.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(460, uSize==4); + JUT_ASSERT(461, pContent!=0); + field_0x1b5 = *(u32*)pContent ? 1 : 0; + } } -#pragma pop /* 8028ECA4-8028ECC0 2895E4 001C+00 1/0 0/0 0/0 .text * adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END( - JStudio::data::TEOperationData param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECA4.s" +void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1, + const void* pContent, u32 uSize) { + if (param_1 == JStudio::data::UNK_0x2) { + JUT_ASSERT(460, uSize==4); + JUT_ASSERT(461, pContent!=0); + field_0x1b6 = *(u32*)pContent ? 1 : 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80455530-80455538 003B30 0008+00 1/1 0/0 0/0 .sdata2 @1622 */ -SECTION_SDATA2 static f64 lit_1622 = 65536.0; - -/* 80455538-80455540 003B38 0008+00 1/1 0/0 0/0 .sdata2 @1623 */ -SECTION_SDATA2 static f64 lit_1623 = 360.0; - -/* 80455540-80455548 003B40 0008+00 1/1 0/0 0/0 .sdata2 @1624 */ -SECTION_SDATA2 static f64 lit_1624 = 1.0; - -/* 80455548-80455550 003B48 0008+00 1/1 0/0 0/0 .sdata2 @1625 */ -SECTION_SDATA2 static f64 lit_1625 = 255.0; - -/* 80455550-80455558 003B50 0008+00 2/2 0/0 0/0 .sdata2 @1629 */ -SECTION_SDATA2 static f64 lit_1629 = 4503599627370496.0 /* cast u32 to float */; /* 8028ECC0-8028F060 289600 03A0+00 1/0 0/0 0/0 .text * execute__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028ECC0.s" +void +JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* pJPAEmitter) { + JUT_ASSERT(518, pJPAEmitter==pThis_->pJPAEmitter_); + if (pJPAEmitter->isEnableDeleteEmitter()) { + pThis_->pCreateObject_->emitter_destroy(pJPAEmitter); + pThis_->pJPAEmitter_ = NULL; + pThis_->field_0x1b8 = 0; + pThis_->u32FadeTime_end = 0; + pThis_->field_0x1c4 = 0; + return; + } + const JStudio::TObject* pObject = pThis_->adaptor_getObject(); + JUT_ASSERT(534, pObject!=0); + JStudio::TControl* pControl = pObject->getControl(); + JUT_ASSERT(536, pControl!=0); + TJPAEmitter_stopDrawParticle_ aTStack_21c(pJPAEmitter); + JStudio::TControl::TTransform_translation_rotation_scaling VStack_19c; + JStudio::TControl::TTransform_translation_rotation_scaling aTStack_1c0; + pThis_->adaptor_getVariableValue_Vec( + &VStack_19c.translation, + sauVariableValue_3_TRANSLATION_XYZ); + pThis_->adaptor_getVariableValue_Vec( + &VStack_19c.rotation, + sauVariableValue_3_ROTATION_XYZ); + pThis_->adaptor_getVariableValue_Vec( + &VStack_19c.scaling, + sauVariableValue_3_SCALING_XYZ); + if (pThis_->field_0x1d8 == 0) { + JStudio::TControl::TTransform_translation_rotation_scaling* pVVar9 = &VStack_19c; + switch(pThis_->field_0x1cc) { + case 0: + pVVar9 = pControl->transformOnSet_transform_ifEnabled(&VStack_19c, &aTStack_1c0); + break; + case 1: + break; + } + pJPAEmitter->setGlobalTranslation(pVVar9->translation); + int rotx = 65536.0 * (pVVar9->rotation.x / 360.0); + int roty = 65536.0 * (pVVar9->rotation.y / 360.0); + int rotz = 65536.0 * (pVVar9->rotation.z / 360.0); + pJPAEmitter->setGlobalRotation(JGeometry::TVec3(rotx, roty, rotz)); + pJPAEmitter->setGlobalScale(pVVar9->scaling); + } else { + Mtx afStack_1f0; + if (JStudio_JStage::transform_toGlobalFromLocal(afStack_1f0, VStack_19c, pThis_->field_0x1d0, + pThis_->field_0x1d4) == 0) + { + return; + } + pJPAEmitter->setGlobalSRTMatrix(afStack_1f0); + } + f64 alpha = 1.0; + u32 u32FadeTime_end = pThis_->u32FadeTime_end; + f64 dVar16 = u32FadeTime_end; + f64 dVar15 = pThis_->field_0x1c4; + switch(pThis_->field_0x1b8) { + case 1: + JUT_ASSERT(606, u32FadeTime_end>0); + alpha = dVar15 / dVar16; + break; + case 3: + JUT_ASSERT(611, u32FadeTime_end>0); + alpha = (dVar16 - dVar15) / dVar16; + } + + u8 globalAlpha = 255; + GXColor a_Stack_224; + pThis_->adaptor_getVariableValue_GXColor(&a_Stack_224, sauVariableValue_4_COLOR_RGBA); + alpha *= a_Stack_224.a; + if (alpha < 255.0) { + globalAlpha = alpha; + } + pJPAEmitter->setGlobalAlpha(globalAlpha); + aTStack_21c.set(NULL); + if (pOld != NULL) { + pOld->execute(pJPAEmitter); + } } -#pragma pop /* 8028F060-8028F098 2899A0 0038+00 1/0 0/0 0/0 .text * executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F060.s" +void +JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) { + if (pOld != NULL) { + pOld->executeAfter(pJPAEmitter); + } } -#pragma pop /* 8028F098-8028F0D0 2899D8 0038+00 1/0 0/0 0/0 .text * draw__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F098.s" +void +JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter* pJPAEmitter) { + if (pOld != NULL) { + pOld->draw(pJPAEmitter); + } } -#pragma pop /* 8028F0D0-8028F108 289A10 0038+00 1/0 0/0 0/0 .text * drawAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEmitter* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F0D0.s" +void +JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEmitter* pJPAEmitter) { + if (pOld != NULL) { + pOld->drawAfter(pJPAEmitter); + } } -#pragma pop /* 8028F108-8028F1C0 289A48 00B8+00 3/3 0/0 0/0 .text * beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::beginParticle_fadeIn_() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F108.s" +void JStudio_JParticle::TAdaptor_particle::beginParticle_fadeIn_() { + if (pJPAEmitter_ != NULL) { + pCreateObject_->emitter_destroy(pJPAEmitter_); + } + JPABaseEmitter* pEmitter = pCreateObject_->emitter_create(field_0x1bc); + pJPAEmitter_ = pEmitter; + if (pEmitter != NULL) { + field_0x1a8.setOld(pEmitter->getEmitterCallBackPtr()); + pEmitter->setEmitterCallBackPtr(&field_0x1a8); + pEmitter->becomeImmortalEmitter(); + field_0x1b7 = 1; + field_0x1b8 = 1; + if (field_0x1c8 == 0) { + field_0x1b8 = 2; + } + u32FadeTime_end = field_0x1c8; + field_0x1c4 = 0; + } } -#pragma pop /* 8028F1C0-8028F2E8 289B00 0128+00 1/1 0/0 0/0 .text * endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JParticle/object-particle/func_8028F1C0.s" +void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_1) { + if (pJPAEmitter_ == NULL) { + return; + } + if (param_1 == 0) { + pCreateObject_->emitter_destroy(pJPAEmitter_); + pJPAEmitter_ = NULL; + field_0x1b8 = 0; + u32FadeTime_end = 0; + field_0x1c4 = 0; + return; + } + u8 eState_old = field_0x1b8 & 0xff; + field_0x1b8 = 3; + if (field_0x1c4 == 0) { + u32FadeTime_end = param_1; + return; + } + JUT_ASSERT(735, state_isFade_(eState_old)); + u32 u32Denominator = 0; + + switch(eState_old) { + case 1: + u32Denominator = field_0x1c4; + break; + case 3: + u32Denominator = u32FadeTime_end - field_0x1c4; + break; + } + JUT_ASSERT(793, u32Denominator!=0); + u32FadeTime_end = ((f64)param_1 * (f64)u32FadeTime_end) / u32Denominator; + field_0x1c4 = u32FadeTime_end - param_1; } -#pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp index e07f702b59..23775e9678 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp @@ -1,129 +1,53 @@ // -// Generated By: dol2asm -// Translation Unit: object-ambientlight +// object-ambientlight // #include "JSystem/JStudio/JStudio_JStage/object-ambientlight.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void -__ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight(); -extern "C" void __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv(); -extern "C" void adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv(); -extern "C" void adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv(); -extern "C" void adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv(); -extern "C" void adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl(); -extern "C" void adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCvUlPCvUl(); - -// -// External References: -// - -extern "C" void adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor(); -extern "C" void adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl(); -extern "C" void __dt__Q27JStudio21TAdaptor_ambientLightFv(); -extern "C" void adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl(); -extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight[16]; -extern "C" extern void* __vt__Q27JStudio21TAdaptor_ambientLight[8]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C5888-803C58A8 0229A8 0020+00 2/2 0/0 0/0 .data - * __vt__Q214JStudio_JStage21TAdaptor_ambientLight */ -SECTION_DATA extern void* __vt__Q214JStudio_JStage21TAdaptor_ambientLight[8] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv, - (void*)adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv, - (void*)adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv, - (void*)adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv, - (void*)adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl, - (void*)adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCvUlPCvUl, -}; /* 8028B610-8028B6AC 285F50 009C+00 0/0 1/1 0/0 .text * __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_ambientLight::TAdaptor_ambientLight(JStage::TSystem const* param_0, - JStage::TAmbientLight* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/func_8028B610.s" -} -#pragma pop +JStudio_JStage::TAdaptor_ambientLight::TAdaptor_ambientLight(JStage::TSystem const* param_1, + JStage::TAmbientLight* param_2) + : TAdaptor_object_(param_1, param_2) {} /* 8028B6AC-8028B720 285FEC 0074+00 1/0 0/0 0/0 .text * __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_ambientLight::~TAdaptor_ambientLight() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/__dt__Q214JStudio_JStage21TAdaptor_ambientLightFv.s" +JStudio_JStage::TAdaptor_ambientLight::~TAdaptor_ambientLight() { + adaptor_do_end(); } -#pragma pop /* 8028B720-8028B724 286060 0004+00 1/0 0/0 0/0 .text * adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv */ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_prepare() { - /* empty function */ } /* 8028B724-8028B7B0 286064 008C+00 1/0 0/0 0/0 .text * adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_begin() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv.s" +void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_begin() { + adaptor_object_begin_(); + GXColor color = ((JStage::TAmbientLight*)get_pJSG_())->JSGGetColor(); + adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, color); } -#pragma pop /* 8028B7B0-8028B804 2860F0 0054+00 1/0 0/0 0/0 .text * adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_end() { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv.s" +void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_end() { + adaptor_object_end_(); } -#pragma pop /* 8028B804-8028B87C 286144 0078+00 1/0 0/0 0/0 .text * adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(u32 param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object-ambientlight/adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl.s" +void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(u32 param_1) { + JStage::TAmbientLight* lightObj = (JStage::TAmbientLight*)get_pJSG_(); + GXColor color; + adaptor_getVariableValue_GXColor(&color, sauVariableValue_4_COLOR_RGBA); + lightObj->JSGSetColor(color); + pJSGObject_->JSGUpdate(); } -#pragma pop /* 8028B87C-8028B8A0 2861BC 0024+00 1/0 0/0 0/0 .text * adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_ambientLight::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-ambientlight/func_8028B87C.s" -} -#pragma pop +void JStudio_JStage::TAdaptor_ambientLight::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); +} \ No newline at end of file diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index 5c69ae48dd..bba5a4b2d6 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -47,16 +47,12 @@ extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" void cos(); -extern "C" void sin(); -extern "C" void atan2(); extern "C" u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio14TAdaptor_light[16]; extern "C" u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; extern "C" u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; extern "C" extern void* __vt__Q27JStudio14TAdaptor_light[10]; extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u32 __float_nan; extern "C" u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; // diff --git a/libs/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/JStudio/JStudio_JStage/object.cpp index 4d088342f8..ced696bc97 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object.cpp @@ -1,143 +1,142 @@ // -// Generated By: dol2asm -// Translation Unit: object +// object // #include "JSystem/JStudio/JStudio_JStage/object.h" -// -// Forward References: -// - -extern "C" void -transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl(); -extern "C" void -transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl(); -extern "C" void -transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl(); -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 -adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl(); - -// -// External References: -// - -extern "C" void getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec(); - -// -// Declarations: -// - /* 8028A1F8-8028A290 284B38 0098+00 0/0 2/2 0/0 .text * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::transform_toGlobalFromLocal( - f32 (*param_0)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_1, - JStage::TObject const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A1F8.s" +bool JStudio_JStage::transform_toGlobalFromLocal( + f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, + JStage::TObject const* param_3, u32 param_4) { + if (param_3 == NULL) { + return false; + } + Mtx nodeTransformMtx; + if (!param_3->JSGGetNodeTransformation(param_4, nodeTransformMtx)) { + return false; + } + Mtx amStack_70; + JStudio::math::getTransformation_SRxyzT(amStack_70, param_2.scaling, param_2.rotation, + param_2.translation); + MTXConcat(nodeTransformMtx, amStack_70, param_1); + return true; } -#pragma pop /* 8028A290-8028A328 284BD0 0098+00 0/0 3/3 0/0 .text * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::transform_toGlobalFromLocal(f32 (*param_0)[4], - JStudio::TControl::TTransform_position const& param_1, - JStage::TObject const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A290.s" +bool JStudio_JStage::transform_toGlobalFromLocal( + f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, + JStage::TObject const* param_3, u32 param_4) { + if (param_3 == NULL) { + return false; + } + Mtx nodeTransformMtx; + if (!param_3->JSGGetNodeTransformation(param_4, nodeTransformMtx)) { + return false; + } + Mtx amStack_70; + JStudio::math::getTransformation_T(amStack_70, ¶m_2); + MTXConcat(nodeTransformMtx, amStack_70, param_1); + return true; } -#pragma pop /* 8028A328-8028A3CC 284C68 00A4+00 0/0 1/1 0/0 .text * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::transform_toLocalFromGlobal( - f32 (*param_0)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_1, - JStage::TObject const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A328.s" +bool JStudio_JStage::transform_toLocalFromGlobal( + f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, + JStage::TObject const* param_3, u32 param_4) { + if (param_3 == NULL) { + return false; + } + Mtx nodeTransformMtx; + if (!param_3->JSGGetNodeTransformation(param_4, nodeTransformMtx)) { + return false; + } + Mtx afStack_70; + JStudio::math::getTransformation_SRxyzT(afStack_70, param_2.scaling, param_2.rotation, + param_2.translation); + Mtx auStack_a0; + MTXInverse(nodeTransformMtx, auStack_a0); + MTXConcat(auStack_a0, afStack_70, param_1); + return true; } -#pragma pop /* 8028A3CC-8028A470 284D0C 00A4+00 0/0 2/2 0/0 .text * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::transform_toLocalFromGlobal(f32 (*param_0)[4], - JStudio::TControl::TTransform_position const& param_1, - JStage::TObject const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A3CC.s" +bool JStudio_JStage::transform_toLocalFromGlobal( + f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, + JStage::TObject const* param_3, u32 param_4) { + if (param_3 == NULL) { + return false; + } + Mtx nodeTransformMtx; + if (!param_3->JSGGetNodeTransformation(param_4, nodeTransformMtx)) { + return false; + } + Mtx afStack_70; + JStudio::math::getTransformation_T(afStack_70, ¶m_2); + Mtx auStack_a0; + MTXInverse(nodeTransformMtx, auStack_a0); + MTXConcat(auStack_a0, afStack_70, param_1); + return true; } -#pragma pop /* 8028A470-8028A4BC 284DB0 004C+00 0/0 5/5 0/0 .text * adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_0, u32 param_1, - void const* param_2, u32 param_3) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl.s" +void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_1, u32 param_2, + void const* param_3, u32 param_4) { + int uVar3; + if (param_2 == 0) { + uVar3 = -1; + } else { + uVar3 = *(int*)param_1; + } + pJSGObject_->JSGSetData(uVar3, param_3, param_4); } -#pragma pop /* 8028A4BC-8028A50C 284DFC 0050+00 0/0 4/4 0/0 .text * adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_0) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc.s" +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) { + JUT_ASSERT(122, pJSGObject != 0); + } else { + return NULL; + } + return pJSGObject; } -#pragma pop /* 8028A50C-8028A550 284E4C 0044+00 0/0 4/4 0/0 .text * adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_(JStage::TObject const* param_0, - char const* param_1) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A50C.s" +s32 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_( + JStage::TObject const* param_1, char const* param_2) { + if (param_1 == NULL) { + return -1; + } + return param_1->JSGFindNodeID(param_2); } -#pragma pop /* 8028A550-8028A5F0 284E90 00A0+00 0/0 1/1 0/0 .text * adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void -JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperationData param_0, - void const* param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JStudio/JStudio_JStage/object/func_8028A550.s" -} -#pragma pop +void +JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperationData param_1, + void const* pContent, u32 uSize) { + switch (param_1) { + case JStudio::data::UNK_0x2: + JUT_ASSERT(157, uSize==4); + JUT_ASSERT(158, pContent!=0); + if (*(u32*)pContent != 0) { + pJSGObject_->JSGFEnableFlag(2); + } else { + pJSGObject_->JSGFDisableFlag(2); + } + break; + } +} \ No newline at end of file diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index f6fd0805b5..8258a21048 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1669,9 +1669,9 @@ s32 dDemo_actor_c::JSGFindNodeID(char const* param_0) const { /* 8003A088-8003A0C8 0349C8 0040+00 1/0 0/0 0/0 .text * JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f */ -int dDemo_actor_c::JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { +bool dDemo_actor_c::JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { MTXCopy(mModel->getAnmMtx((u16)param_0), param_1); - return 1; + return true; } /* 8003A0C8-8003A0D0 034A08 0008+00 1/0 0/0 0/0 .text JSGGetAnimationFrameMax__13dDemo_actor_cCFv