d_a_vrbox / d_a_kytag02 / d_a_obj_eff OK (#327)

* d_a_vrbox / d_a_kytag02 / d_a_obj_eff OK

* some std header setups

* f_pc / profile cleanup

* setup cull data

* remove asm

* d_a_suspend OK
This commit is contained in:
TakaRikka
2023-05-05 16:17:19 -07:00
committed by GitHub
parent 2bf8a5777f
commit 694169c16c
148 changed files with 1924 additions and 2696 deletions
@@ -1,54 +0,0 @@
lbl_804D5118:
/* 804D5118 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804D511C 7C 08 02 A6 */ mflr r0
/* 804D5120 90 01 00 14 */ stw r0, 0x14(r1)
/* 804D5124 7C 65 1B 78 */ mr r5, r3
/* 804D5128 3C 60 80 4D */ lis r3, lit_3640@ha /* 0x804D523C@ha */
/* 804D512C 38 83 52 3C */ addi r4, r3, lit_3640@l /* 0x804D523C@l */
/* 804D5130 88 05 04 E2 */ lbz r0, 0x4e2(r5)
/* 804D5134 7C 00 07 75 */ extsb. r0, r0
/* 804D5138 7C 03 03 78 */ mr r3, r0
/* 804D513C 40 80 00 10 */ bge lbl_804D514C
/* 804D5140 80 05 00 B0 */ lwz r0, 0xb0(r5)
/* 804D5144 54 00 B6 3E */ rlwinm r0, r0, 0x16, 0x18, 0x1f
/* 804D5148 7C 03 07 74 */ extsb r3, r0
lbl_804D514C:
/* 804D514C 80 05 00 B0 */ lwz r0, 0xb0(r5)
/* 804D5150 54 06 06 3E */ clrlwi r6, r0, 0x18
/* 804D5154 54 07 C7 FE */ rlwinm r7, r0, 0x18, 0x1f, 0x1f
/* 804D5158 54 08 BF FE */ rlwinm r8, r0, 0x17, 0x1f, 0x1f
/* 804D515C 54 00 17 BF */ rlwinm. r0, r0, 2, 0x1e, 0x1f
/* 804D5160 41 82 00 34 */ beq lbl_804D5194
/* 804D5164 C0 05 04 EC */ lfs f0, 0x4ec(r5)
/* 804D5168 C0 44 00 00 */ lfs f2, 0(r4)
/* 804D516C EC 00 00 B2 */ fmuls f0, f0, f2
/* 804D5170 D0 05 04 EC */ stfs f0, 0x4ec(r5)
/* 804D5174 C0 25 04 F0 */ lfs f1, 0x4f0(r5)
/* 804D5178 C0 04 00 04 */ lfs f0, 4(r4)
/* 804D517C EC 01 00 32 */ fmuls f0, f1, f0
/* 804D5180 D0 05 04 F0 */ stfs f0, 0x4f0(r5)
/* 804D5184 C0 05 04 F4 */ lfs f0, 0x4f4(r5)
/* 804D5188 EC 00 00 B2 */ fmuls f0, f0, f2
/* 804D518C D0 05 04 F4 */ stfs f0, 0x4f4(r5)
/* 804D5190 48 00 00 30 */ b lbl_804D51C0
lbl_804D5194:
/* 804D5194 C0 05 04 EC */ lfs f0, 0x4ec(r5)
/* 804D5198 C0 44 00 08 */ lfs f2, 8(r4)
/* 804D519C EC 00 00 B2 */ fmuls f0, f0, f2
/* 804D51A0 D0 05 04 EC */ stfs f0, 0x4ec(r5)
/* 804D51A4 C0 25 04 F0 */ lfs f1, 0x4f0(r5)
/* 804D51A8 C0 04 00 0C */ lfs f0, 0xc(r4)
/* 804D51AC EC 01 00 32 */ fmuls f0, f1, f0
/* 804D51B0 D0 05 04 F0 */ stfs f0, 0x4f0(r5)
/* 804D51B4 C0 05 04 F4 */ lfs f0, 0x4f4(r5)
/* 804D51B8 EC 00 00 B2 */ fmuls f0, f0, f2
/* 804D51BC D0 05 04 F4 */ stfs f0, 0x4f4(r5)
lbl_804D51C0:
/* 804D51C0 38 85 04 D0 */ addi r4, r5, 0x4d0
/* 804D51C4 38 A5 04 EC */ addi r5, r5, 0x4ec
/* 804D51C8 4B B5 C0 81 */ bl newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc
/* 804D51CC 38 60 00 04 */ li r3, 4
/* 804D51D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804D51D4 7C 08 03 A6 */ mtlr r0
/* 804D51D8 38 21 00 10 */ addi r1, r1, 0x10
/* 804D51DC 4E 80 00 20 */ blr
@@ -1,48 +0,0 @@
lbl_804988DC:
/* 804988DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804988E0 7C 08 02 A6 */ mflr r0
/* 804988E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 804988E8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 804988EC 93 C1 00 08 */ stw r30, 8(r1)
/* 804988F0 7C 7E 1B 78 */ mr r30, r3
/* 804988F4 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 804988F8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 804988FC 40 82 00 1C */ bne lbl_80498918
/* 80498900 28 1E 00 00 */ cmplwi r30, 0
/* 80498904 41 82 00 08 */ beq lbl_8049890C
/* 80498908 4B B8 02 5D */ bl __ct__10fopAc_ac_cFv
lbl_8049890C:
/* 8049890C 80 1E 04 A0 */ lwz r0, 0x4a0(r30)
/* 80498910 60 00 00 08 */ ori r0, r0, 8
/* 80498914 90 1E 04 A0 */ stw r0, 0x4a0(r30)
lbl_80498918:
/* 80498918 38 00 00 00 */ li r0, 0
/* 8049891C 98 1E 05 74 */ stb r0, 0x574(r30)
/* 80498920 3B E0 00 04 */ li r31, 4
/* 80498924 7F C3 F3 78 */ mr r3, r30
/* 80498928 3C 80 80 4A */ lis r4, daVrbox_solidHeapCB__FP10fopAc_ac_c@ha /* 0x80498868@ha */
/* 8049892C 38 84 88 68 */ addi r4, r4, daVrbox_solidHeapCB__FP10fopAc_ac_c@l /* 0x80498868@l */
/* 80498930 38 A0 0C 60 */ li r5, 0xc60
/* 80498934 4B B8 1B 7D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 80498938 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8049893C 41 82 00 2C */ beq lbl_80498968
/* 80498940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80498944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80498948 A0 03 5D 46 */ lhz r0, 0x5d46(r3)
/* 8049894C 60 00 00 01 */ ori r0, r0, 1
/* 80498950 B0 03 5D 46 */ sth r0, 0x5d46(r3)
/* 80498954 38 00 00 00 */ li r0, 0
/* 80498958 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8049895C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80498960 98 03 12 D4 */ stb r0, 0x12d4(r3)
/* 80498964 48 00 00 08 */ b lbl_8049896C
lbl_80498968:
/* 80498968 3B E0 00 05 */ li r31, 5
lbl_8049896C:
/* 8049896C 7F E3 FB 78 */ mr r3, r31
/* 80498970 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80498974 83 C1 00 08 */ lwz r30, 8(r1)
/* 80498978 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8049897C 7C 08 03 A6 */ mtlr r0
/* 80498980 38 21 00 10 */ addi r1, r1, 0x10
/* 80498984 4E 80 00 20 */ blr
@@ -1,114 +0,0 @@
lbl_80498518:
/* 80498518 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8049851C 7C 08 02 A6 */ mflr r0
/* 80498520 90 01 00 34 */ stw r0, 0x34(r1)
/* 80498524 DB E1 00 20 */ stfd f31, 0x20(r1)
/* 80498528 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
/* 8049852C 39 61 00 20 */ addi r11, r1, 0x20
/* 80498530 4B EC 9C A9 */ bl _savegpr_28
/* 80498534 83 E3 05 6C */ lwz r31, 0x56c(r3)
/* 80498538 3C 80 80 4A */ lis r4, lit_3695@ha /* 0x80498990@ha */
/* 8049853C C3 E4 89 90 */ lfs f31, lit_3695@l(r4) /* 0x80498990@l */
/* 80498540 3B A0 00 00 */ li r29, 0
/* 80498544 48 00 01 75 */ bl daVrbox_color_set__FP11vrbox_class
/* 80498548 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8049854C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80498550 88 03 12 D4 */ lbz r0, 0x12d4(r3)
/* 80498554 28 00 00 00 */ cmplwi r0, 0
/* 80498558 41 82 00 0C */ beq lbl_80498564
/* 8049855C 38 60 00 01 */ li r3, 1
/* 80498560 48 00 01 38 */ b lbl_80498698
lbl_80498564:
/* 80498564 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */
/* 80498568 88 83 0D 64 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */
/* 8049856C 7C 84 07 75 */ extsb. r4, r4
/* 80498570 41 80 00 28 */ blt lbl_80498598
/* 80498574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80498578 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8049857C 38 63 4E C4 */ addi r3, r3, 0x4ec4
/* 80498580 4B B8 BE 05 */ bl getStatusRoomDt__20dStage_roomControl_cFi
/* 80498584 81 83 00 00 */ lwz r12, 0(r3)
/* 80498588 81 8C 01 0C */ lwz r12, 0x10c(r12)
/* 8049858C 7D 89 03 A6 */ mtctr r12
/* 80498590 4E 80 04 21 */ bctrl
/* 80498594 7C 7D 1B 78 */ mr r29, r3
lbl_80498598:
/* 80498598 28 1D 00 00 */ cmplwi r29, 0
/* 8049859C 41 82 00 08 */ beq lbl_804985A4
/* 804985A0 C3 FD 00 04 */ lfs f31, 4(r29)
lbl_804985A4:
/* 804985A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 804985A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 804985AC 80 83 61 B0 */ lwz r4, 0x61b0(r3)
/* 804985B0 28 04 00 00 */ cmplwi r4, 0
/* 804985B4 41 82 00 1C */ beq lbl_804985D0
/* 804985B8 3C 60 80 4A */ lis r3, lit_3696@ha /* 0x80498994@ha */
/* 804985BC C0 23 89 94 */ lfs f1, lit_3696@l(r3) /* 0x80498994@l */
/* 804985C0 C0 04 01 8C */ lfs f0, 0x18c(r4)
/* 804985C4 EC 00 F8 28 */ fsubs f0, f0, f31
/* 804985C8 EC 41 00 32 */ fmuls f2, f1, f0
/* 804985CC 48 00 00 0C */ b lbl_804985D8
lbl_804985D0:
/* 804985D0 3C 60 80 4A */ lis r3, lit_3695@ha /* 0x80498990@ha */
/* 804985D4 C0 43 89 90 */ lfs f2, lit_3695@l(r3) /* 0x80498990@l */
lbl_804985D8:
/* 804985D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 804985DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 804985E0 C0 24 01 7C */ lfs f1, 0x17c(r4)
/* 804985E4 C0 04 01 8C */ lfs f0, 0x18c(r4)
/* 804985E8 EC 40 10 28 */ fsubs f2, f0, f2
/* 804985EC C0 64 01 9C */ lfs f3, 0x19c(r4)
/* 804985F0 4B EA E2 F9 */ bl PSMTXTrans
/* 804985F4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 804985F8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 804985FC 38 9F 00 24 */ addi r4, r31, 0x24
/* 80498600 4B EA DE B1 */ bl PSMTXCopy
/* 80498604 4B D1 00 29 */ bl dKy_GxFog_set__Fv
/* 80498608 A0 7F 00 5C */ lhz r3, 0x5c(r31)
/* 8049860C 3B 83 FF FF */ addi r28, r3, -1
/* 80498610 3B A0 00 02 */ li r29, 2
/* 80498614 48 00 00 38 */ b lbl_8049864C
lbl_80498618:
/* 80498618 80 7F 00 60 */ lwz r3, 0x60(r31)
/* 8049861C 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d
/* 80498620 7C 63 00 2E */ lwzx r3, r3, r0
/* 80498624 28 03 00 00 */ cmplwi r3, 0
/* 80498628 41 82 00 1C */ beq lbl_80498644
/* 8049862C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80498630 81 83 00 00 */ lwz r12, 0(r3)
/* 80498634 81 8C 00 30 */ lwz r12, 0x30(r12)
/* 80498638 7D 89 03 A6 */ mtctr r12
/* 8049863C 4E 80 04 21 */ bctrl
/* 80498640 7C 7E 1B 78 */ mr r30, r3
lbl_80498644:
/* 80498644 9B BE 00 00 */ stb r29, 0(r30)
/* 80498648 3B 9C FF FF */ addi r28, r28, -1
lbl_8049864C:
/* 8049864C 2C 1C 00 00 */ cmpwi r28, 0
/* 80498650 40 80 FF C8 */ bge lbl_80498618
/* 80498654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80498658 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8049865C 80 04 5F 64 */ lwz r0, 0x5f64(r4)
/* 80498660 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80498664 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */
/* 80498668 90 1E 00 48 */ stw r0, 0x48(r30)
/* 8049866C 80 04 5F 68 */ lwz r0, 0x5f68(r4)
/* 80498670 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80498674 7F E3 FB 78 */ mr r3, r31
/* 80498678 4B B7 56 4D */ bl mDoExt_modelUpdateDL__FP8J3DModel
/* 8049867C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80498680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80498684 80 03 5F 80 */ lwz r0, 0x5f80(r3)
/* 80498688 90 1E 00 48 */ stw r0, 0x48(r30)
/* 8049868C 80 03 5F 84 */ lwz r0, 0x5f84(r3)
/* 80498690 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80498694 38 60 00 01 */ li r3, 1
lbl_80498698:
/* 80498698 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
/* 8049869C CB E1 00 20 */ lfd f31, 0x20(r1)
/* 804986A0 39 61 00 20 */ addi r11, r1, 0x20
/* 804986A4 4B EC 9B 81 */ bl _restgpr_28
/* 804986A8 80 01 00 34 */ lwz r0, 0x34(r1)
/* 804986AC 7C 08 03 A6 */ mtlr r0
/* 804986B0 38 21 00 30 */ addi r1, r1, 0x30
/* 804986B4 4E 80 00 20 */ blr
@@ -1,107 +0,0 @@
lbl_804986B8:
/* 804986B8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 804986BC 7C 08 02 A6 */ mflr r0
/* 804986C0 90 01 00 24 */ stw r0, 0x24(r1)
/* 804986C4 39 61 00 20 */ addi r11, r1, 0x20
/* 804986C8 4B EC 9B 15 */ bl _savegpr_29
/* 804986CC 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
/* 804986D0 3B E4 CA 54 */ addi r31, r4, g_env_light@l /* 0x8042CA54@l */
/* 804986D4 A9 7F 10 CC */ lha r11, 0x10cc(r31)
/* 804986D8 A9 5F 10 CA */ lha r10, 0x10ca(r31)
/* 804986DC A9 3F 10 C8 */ lha r9, 0x10c8(r31)
/* 804986E0 A9 1F 10 C4 */ lha r8, 0x10c4(r31)
/* 804986E4 A8 FF 10 C2 */ lha r7, 0x10c2(r31)
/* 804986E8 A8 DF 10 C0 */ lha r6, 0x10c0(r31)
/* 804986EC A8 BF 10 E4 */ lha r5, 0x10e4(r31)
/* 804986F0 A8 9F 10 E0 */ lha r4, 0x10e0(r31)
/* 804986F4 A8 1F 10 E2 */ lha r0, 0x10e2(r31)
/* 804986F8 7C 00 2A 14 */ add r0, r0, r5
/* 804986FC 7C 00 32 14 */ add r0, r0, r6
/* 80498700 7C 00 3A 14 */ add r0, r0, r7
/* 80498704 7C 00 42 14 */ add r0, r0, r8
/* 80498708 7C 00 4A 14 */ add r0, r0, r9
/* 8049870C 7C 00 52 14 */ add r0, r0, r10
/* 80498710 7C 00 5A 14 */ add r0, r0, r11
/* 80498714 7C 04 02 15 */ add. r0, r4, r0
/* 80498718 40 82 00 14 */ bne lbl_8049872C
/* 8049871C 38 00 00 01 */ li r0, 1
/* 80498720 98 1F 12 D4 */ stb r0, 0x12d4(r31)
/* 80498724 38 60 00 01 */ li r3, 1
/* 80498728 48 00 01 10 */ b lbl_80498838
lbl_8049872C:
/* 8049872C 38 00 00 00 */ li r0, 0
/* 80498730 98 1F 12 D4 */ stb r0, 0x12d4(r31)
/* 80498734 80 63 05 6C */ lwz r3, 0x56c(r3)
/* 80498738 83 C3 00 04 */ lwz r30, 4(r3)
/* 8049873C 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 80498740 83 A3 00 00 */ lwz r29, 0(r3)
/* 80498744 28 1D 00 00 */ cmplwi r29, 0
/* 80498748 41 82 00 6C */ beq lbl_804987B4
/* 8049874C 80 7D 00 24 */ lwz r3, 0x24(r29)
/* 80498750 38 80 00 00 */ li r4, 0
/* 80498754 81 83 00 00 */ lwz r12, 0(r3)
/* 80498758 81 8C 00 74 */ lwz r12, 0x74(r12)
/* 8049875C 7D 89 03 A6 */ mtctr r12
/* 80498760 4E 80 04 21 */ bctrl
/* 80498764 7F A3 EB 78 */ mr r3, r29
/* 80498768 81 9D 00 00 */ lwz r12, 0(r29)
/* 8049876C 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 80498770 7D 89 03 A6 */ mtctr r12
/* 80498774 4E 80 04 21 */ bctrl
/* 80498778 A8 1F 10 C0 */ lha r0, 0x10c0(r31)
/* 8049877C B0 01 00 08 */ sth r0, 8(r1)
/* 80498780 A8 1F 10 C2 */ lha r0, 0x10c2(r31)
/* 80498784 B0 01 00 0A */ sth r0, 0xa(r1)
/* 80498788 A8 1F 10 C4 */ lha r0, 0x10c4(r31)
/* 8049878C B0 01 00 0C */ sth r0, 0xc(r1)
/* 80498790 38 00 00 FF */ li r0, 0xff
/* 80498794 B0 01 00 0E */ sth r0, 0xe(r1)
/* 80498798 80 7D 00 2C */ lwz r3, 0x2c(r29)
/* 8049879C 38 80 00 00 */ li r4, 0
/* 804987A0 38 A1 00 08 */ addi r5, r1, 8
/* 804987A4 81 83 00 00 */ lwz r12, 0(r3)
/* 804987A8 81 8C 00 60 */ lwz r12, 0x60(r12)
/* 804987AC 7D 89 03 A6 */ mtctr r12
/* 804987B0 4E 80 04 21 */ bctrl
lbl_804987B4:
/* 804987B4 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 804987B8 83 A3 00 04 */ lwz r29, 4(r3)
/* 804987BC 28 1D 00 00 */ cmplwi r29, 0
/* 804987C0 41 82 00 74 */ beq lbl_80498834
/* 804987C4 80 7D 00 24 */ lwz r3, 0x24(r29)
/* 804987C8 38 80 00 00 */ li r4, 0
/* 804987CC 81 83 00 00 */ lwz r12, 0(r3)
/* 804987D0 81 8C 00 74 */ lwz r12, 0x74(r12)
/* 804987D4 7D 89 03 A6 */ mtctr r12
/* 804987D8 4E 80 04 21 */ bctrl
/* 804987DC 7F A3 EB 78 */ mr r3, r29
/* 804987E0 81 9D 00 00 */ lwz r12, 0(r29)
/* 804987E4 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 804987E8 7D 89 03 A6 */ mtctr r12
/* 804987EC 4E 80 04 21 */ bctrl
/* 804987F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 804987F4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 804987F8 A8 03 10 E8 */ lha r0, 0x10e8(r3)
/* 804987FC B0 01 00 08 */ sth r0, 8(r1)
/* 80498800 A8 03 10 EA */ lha r0, 0x10ea(r3)
/* 80498804 B0 01 00 0A */ sth r0, 0xa(r1)
/* 80498808 A8 03 10 EC */ lha r0, 0x10ec(r3)
/* 8049880C B0 01 00 0C */ sth r0, 0xc(r1)
/* 80498810 A8 03 10 EE */ lha r0, 0x10ee(r3)
/* 80498814 B0 01 00 0E */ sth r0, 0xe(r1)
/* 80498818 80 7D 00 2C */ lwz r3, 0x2c(r29)
/* 8049881C 38 80 00 00 */ li r4, 0
/* 80498820 38 A1 00 08 */ addi r5, r1, 8
/* 80498824 81 83 00 00 */ lwz r12, 0(r3)
/* 80498828 81 8C 00 60 */ lwz r12, 0x60(r12)
/* 8049882C 7D 89 03 A6 */ mtctr r12
/* 80498830 4E 80 04 21 */ bctrl
lbl_80498834:
/* 80498834 38 60 00 01 */ li r3, 1
lbl_80498838:
/* 80498838 39 61 00 20 */ addi r11, r1, 0x20
/* 8049883C 4B EC 99 ED */ bl _restgpr_29
/* 80498840 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80498844 7C 08 03 A6 */ mtlr r0
/* 80498848 38 21 00 20 */ addi r1, r1, 0x20
/* 8049884C 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_80498868:
/* 80498868 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8049886C 7C 08 02 A6 */ mflr r0
/* 80498870 90 01 00 14 */ stw r0, 0x14(r1)
/* 80498874 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80498878 93 C1 00 08 */ stw r30, 8(r1)
/* 8049887C 7C 7E 1B 78 */ mr r30, r3
/* 80498880 3C 60 80 4A */ lis r3, d_a_vrbox__stringBase0@ha /* 0x80498998@ha */
/* 80498884 38 63 89 98 */ addi r3, r3, d_a_vrbox__stringBase0@l /* 0x80498998@l */
/* 80498888 4B B9 6B AD */ bl dComIfG_getStageRes__FPCc
/* 8049888C 7C 7F 1B 78 */ mr r31, r3
/* 80498890 3C 80 00 08 */ lis r4, 8
/* 80498894 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
/* 80498898 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
/* 8049889C 4B B7 C3 B9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 804988A0 90 7E 05 6C */ stw r3, 0x56c(r30)
/* 804988A4 38 60 00 00 */ li r3, 0
/* 804988A8 28 1F 00 00 */ cmplwi r31, 0
/* 804988AC 41 82 00 14 */ beq lbl_804988C0
/* 804988B0 80 1E 05 6C */ lwz r0, 0x56c(r30)
/* 804988B4 28 00 00 00 */ cmplwi r0, 0
/* 804988B8 41 82 00 08 */ beq lbl_804988C0
/* 804988BC 38 60 00 01 */ li r3, 1
lbl_804988C0:
/* 804988C0 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 804988C4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 804988C8 83 C1 00 08 */ lwz r30, 8(r1)
/* 804988CC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 804988D0 7C 08 03 A6 */ mtlr r0
/* 804988D4 38 21 00 10 */ addi r1, r1, 0x10
/* 804988D8 4E 80 00 20 */ blr
@@ -1,72 +0,0 @@
lbl_80855CEC:
/* 80855CEC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80855CF0 7C 08 02 A6 */ mflr r0
/* 80855CF4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80855CF8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80855CFC 93 C1 00 08 */ stw r30, 8(r1)
/* 80855D00 7C 7F 1B 78 */ mr r31, r3
/* 80855D04 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80855D08 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */
/* 80855D0C 4B 80 4D D5 */ bl dKyw_get_wind_vec__Fv
/* 80855D10 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80855D14 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80855D18 40 82 00 20 */ bne lbl_80855D38
/* 80855D1C 28 1F 00 00 */ cmplwi r31, 0
/* 80855D20 41 82 00 0C */ beq lbl_80855D2C
/* 80855D24 7F E3 FB 78 */ mr r3, r31
/* 80855D28 4B 7C 2E 3D */ bl __ct__10fopAc_ac_cFv
lbl_80855D2C:
/* 80855D2C 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80855D30 60 00 00 08 */ ori r0, r0, 8
/* 80855D34 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80855D38:
/* 80855D38 38 00 00 00 */ li r0, 0
/* 80855D3C B0 1F 05 74 */ sth r0, 0x574(r31)
/* 80855D40 98 1F 05 76 */ stb r0, 0x576(r31)
/* 80855D44 A8 1F 04 DC */ lha r0, 0x4dc(r31)
/* 80855D48 98 1F 05 77 */ stb r0, 0x577(r31)
/* 80855D4C 3C 60 80 85 */ lis r3, lit_3668@ha /* 0x80855E04@ha */
/* 80855D50 C0 03 5E 04 */ lfs f0, lit_3668@l(r3) /* 0x80855E04@l */
/* 80855D54 D0 1E 0E 5C */ stfs f0, 0xe5c(r30)
/* 80855D58 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80855D5C 98 1F 05 78 */ stb r0, 0x578(r31)
/* 80855D60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80855D64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80855D68 88 9F 05 77 */ lbz r4, 0x577(r31)
/* 80855D6C 88 BF 04 BA */ lbz r5, 0x4ba(r31)
/* 80855D70 7C A5 07 74 */ extsb r5, r5
/* 80855D74 4B 7D F5 ED */ bl isSwitch__10dSv_info_cCFii
/* 80855D78 2C 03 00 00 */ cmpwi r3, 0
/* 80855D7C 41 82 00 44 */ beq lbl_80855DC0
/* 80855D80 4B 80 58 B9 */ bl dKyw_evt_wind_set_go__Fv
/* 80855D84 38 60 00 00 */ li r3, 0
/* 80855D88 A8 9F 04 DE */ lha r4, 0x4de(r31)
/* 80855D8C 4B 80 58 91 */ bl dKyw_evt_wind_set__Fss
/* 80855D90 88 1F 05 78 */ lbz r0, 0x578(r31)
/* 80855D94 28 00 00 63 */ cmplwi r0, 0x63
/* 80855D98 40 82 00 10 */ bne lbl_80855DA8
/* 80855D9C 38 00 00 FF */ li r0, 0xff
/* 80855DA0 98 1E 0E 6E */ stb r0, 0xe6e(r30)
/* 80855DA4 48 00 00 1C */ b lbl_80855DC0
lbl_80855DA8:
/* 80855DA8 38 00 00 01 */ li r0, 1
/* 80855DAC 98 1E 0E 6E */ stb r0, 0xe6e(r30)
/* 80855DB0 38 00 00 04 */ li r0, 4
/* 80855DB4 98 1E 0E B5 */ stb r0, 0xeb5(r30)
/* 80855DB8 38 00 00 32 */ li r0, 0x32
/* 80855DBC 90 1E 0E B8 */ stw r0, 0xeb8(r30)
lbl_80855DC0:
/* 80855DC0 88 1F 05 78 */ lbz r0, 0x578(r31)
/* 80855DC4 28 00 00 63 */ cmplwi r0, 0x63
/* 80855DC8 41 82 00 10 */ beq lbl_80855DD8
/* 80855DCC 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855DD0 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855DD4 4B A7 21 E9 */ bl initStrongWindSe__10Z2EnvSeMgrFv
lbl_80855DD8:
/* 80855DD8 38 60 00 04 */ li r3, 4
/* 80855DDC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80855DE0 83 C1 00 08 */ lwz r30, 8(r1)
/* 80855DE4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80855DE8 7C 08 03 A6 */ mtlr r0
/* 80855DEC 38 21 00 10 */ addi r1, r1, 0x10
/* 80855DF0 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80855CCC:
/* 80855CCC 38 00 00 00 */ li r0, 0
/* 80855CD0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80855CD4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80855CD8 98 03 0E 6D */ stb r0, 0xe6d(r3)
/* 80855CDC 90 03 0E B8 */ stw r0, 0xeb8(r3)
/* 80855CE0 98 03 0E 6E */ stb r0, 0xe6e(r3)
/* 80855CE4 38 60 00 01 */ li r3, 1
/* 80855CE8 4E 80 00 20 */ blr
@@ -1,140 +0,0 @@
lbl_80855AC0:
/* 80855AC0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80855AC4 7C 08 02 A6 */ mflr r0
/* 80855AC8 90 01 00 24 */ stw r0, 0x24(r1)
/* 80855ACC 39 61 00 20 */ addi r11, r1, 0x20
/* 80855AD0 4B B0 C7 09 */ bl _savegpr_28
/* 80855AD4 7C 7E 1B 78 */ mr r30, r3
/* 80855AD8 3C 60 80 85 */ lis r3, lit_3666@ha /* 0x80855DFC@ha */
/* 80855ADC 3B 83 5D FC */ addi r28, r3, lit_3666@l /* 0x80855DFC@l */
/* 80855AE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80855AE4 3B A3 CA 54 */ addi r29, r3, g_env_light@l /* 0x8042CA54@l */
/* 80855AE8 4B 80 4F F9 */ bl dKyw_get_wind_vec__Fv
/* 80855AEC 7C 7F 1B 78 */ mr r31, r3
/* 80855AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80855AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80855AF8 88 9E 05 77 */ lbz r4, 0x577(r30)
/* 80855AFC 88 BE 04 BA */ lbz r5, 0x4ba(r30)
/* 80855B00 7C A5 07 74 */ extsb r5, r5
/* 80855B04 4B 7D F8 5D */ bl isSwitch__10dSv_info_cCFii
/* 80855B08 2C 03 00 00 */ cmpwi r3, 0
/* 80855B0C 41 82 01 34 */ beq lbl_80855C40
/* 80855B10 4B 80 5B 29 */ bl dKyw_evt_wind_set_go__Fv
/* 80855B14 38 60 00 00 */ li r3, 0
/* 80855B18 A8 9E 04 DE */ lha r4, 0x4de(r30)
/* 80855B1C 4B 80 5B 01 */ bl dKyw_evt_wind_set__Fss
/* 80855B20 88 1E 05 78 */ lbz r0, 0x578(r30)
/* 80855B24 28 00 00 63 */ cmplwi r0, 0x63
/* 80855B28 41 82 01 04 */ beq lbl_80855C2C
/* 80855B2C 38 80 00 01 */ li r4, 1
/* 80855B30 98 9D 0E 6E */ stb r4, 0xe6e(r29)
/* 80855B34 38 00 00 04 */ li r0, 4
/* 80855B38 98 1D 0E B5 */ stb r0, 0xeb5(r29)
/* 80855B3C 38 00 00 32 */ li r0, 0x32
/* 80855B40 90 1D 0E B8 */ stw r0, 0xeb8(r29)
/* 80855B44 88 1E 05 76 */ lbz r0, 0x576(r30)
/* 80855B48 2C 00 00 01 */ cmpwi r0, 1
/* 80855B4C 41 82 00 5C */ beq lbl_80855BA8
/* 80855B50 40 80 00 10 */ bge lbl_80855B60
/* 80855B54 2C 00 00 00 */ cmpwi r0, 0
/* 80855B58 40 80 00 14 */ bge lbl_80855B6C
/* 80855B5C 48 00 00 B8 */ b lbl_80855C14
lbl_80855B60:
/* 80855B60 2C 00 00 03 */ cmpwi r0, 3
/* 80855B64 40 80 00 B0 */ bge lbl_80855C14
/* 80855B68 48 00 00 78 */ b lbl_80855BE0
lbl_80855B6C:
/* 80855B6C A8 1E 05 74 */ lha r0, 0x574(r30)
/* 80855B70 2C 00 00 00 */ cmpwi r0, 0
/* 80855B74 41 81 00 A0 */ bgt lbl_80855C14
/* 80855B78 C0 1C 00 00 */ lfs f0, 0(r28)
/* 80855B7C D0 1D 0E 5C */ stfs f0, 0xe5c(r29)
/* 80855B80 38 00 00 3C */ li r0, 0x3c
/* 80855B84 B0 1E 05 74 */ sth r0, 0x574(r30)
/* 80855B88 38 00 00 02 */ li r0, 2
/* 80855B8C 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855B90 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855B94 98 03 01 60 */ stb r0, 0x160(r3)
/* 80855B98 88 7E 05 76 */ lbz r3, 0x576(r30)
/* 80855B9C 38 03 00 01 */ addi r0, r3, 1
/* 80855BA0 98 1E 05 76 */ stb r0, 0x576(r30)
/* 80855BA4 48 00 00 70 */ b lbl_80855C14
lbl_80855BA8:
/* 80855BA8 A8 1E 05 74 */ lha r0, 0x574(r30)
/* 80855BAC 2C 00 00 00 */ cmpwi r0, 0
/* 80855BB0 41 81 00 64 */ bgt lbl_80855C14
/* 80855BB4 C0 1C 00 04 */ lfs f0, 4(r28)
/* 80855BB8 D0 1D 0E 5C */ stfs f0, 0xe5c(r29)
/* 80855BBC 38 00 00 5A */ li r0, 0x5a
/* 80855BC0 B0 1E 05 74 */ sth r0, 0x574(r30)
/* 80855BC4 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855BC8 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855BCC 98 83 01 60 */ stb r4, 0x160(r3)
/* 80855BD0 88 7E 05 76 */ lbz r3, 0x576(r30)
/* 80855BD4 38 03 00 01 */ addi r0, r3, 1
/* 80855BD8 98 1E 05 76 */ stb r0, 0x576(r30)
/* 80855BDC 48 00 00 38 */ b lbl_80855C14
lbl_80855BE0:
/* 80855BE0 A8 1E 05 74 */ lha r0, 0x574(r30)
/* 80855BE4 2C 00 00 00 */ cmpwi r0, 0
/* 80855BE8 41 81 00 2C */ bgt lbl_80855C14
/* 80855BEC C0 1C 00 08 */ lfs f0, 8(r28)
/* 80855BF0 D0 1D 0E 5C */ stfs f0, 0xe5c(r29)
/* 80855BF4 38 00 00 5A */ li r0, 0x5a
/* 80855BF8 B0 1E 05 74 */ sth r0, 0x574(r30)
/* 80855BFC 38 00 00 00 */ li r0, 0
/* 80855C00 98 1E 05 76 */ stb r0, 0x576(r30)
/* 80855C04 38 00 00 03 */ li r0, 3
/* 80855C08 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855C0C 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855C10 98 03 01 60 */ stb r0, 0x160(r3)
lbl_80855C14:
/* 80855C14 A8 7E 05 74 */ lha r3, 0x574(r30)
/* 80855C18 2C 03 00 00 */ cmpwi r3, 0
/* 80855C1C 41 82 00 4C */ beq lbl_80855C68
/* 80855C20 38 03 FF FF */ addi r0, r3, -1
/* 80855C24 B0 1E 05 74 */ sth r0, 0x574(r30)
/* 80855C28 48 00 00 40 */ b lbl_80855C68
lbl_80855C2C:
/* 80855C2C 38 00 00 FF */ li r0, 0xff
/* 80855C30 98 1D 0E 6E */ stb r0, 0xe6e(r29)
/* 80855C34 C0 1C 00 0C */ lfs f0, 0xc(r28)
/* 80855C38 D0 1D 0E 5C */ stfs f0, 0xe5c(r29)
/* 80855C3C 48 00 00 2C */ b lbl_80855C68
lbl_80855C40:
/* 80855C40 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80855C44 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */
/* 80855C48 38 60 00 00 */ li r3, 0
/* 80855C4C 98 64 0E 6D */ stb r3, 0xe6d(r4)
/* 80855C50 88 1E 05 78 */ lbz r0, 0x578(r30)
/* 80855C54 28 00 00 63 */ cmplwi r0, 0x63
/* 80855C58 41 82 00 08 */ beq lbl_80855C60
/* 80855C5C 90 64 0E B8 */ stw r3, 0xeb8(r4)
lbl_80855C60:
/* 80855C60 38 00 00 00 */ li r0, 0
/* 80855C64 98 04 0E 6E */ stb r0, 0xe6e(r4)
lbl_80855C68:
/* 80855C68 88 1E 05 78 */ lbz r0, 0x578(r30)
/* 80855C6C 28 00 00 63 */ cmplwi r0, 0x63
/* 80855C70 41 82 00 38 */ beq lbl_80855CA8
/* 80855C74 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855C78 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855C7C 7F E4 FB 78 */ mr r4, r31
/* 80855C80 4B A7 23 49 */ bl setWindDirection__10Z2EnvSeMgrFP3Vec
/* 80855C84 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */
/* 80855C88 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */
/* 80855C8C 88 63 00 00 */ lbz r3, 0(r3)
/* 80855C90 7C 63 07 74 */ extsb r3, r3
/* 80855C94 4B 7D 73 D9 */ bl dComIfGp_getReverb__Fi
/* 80855C98 7C 64 1B 78 */ mr r4, r3
/* 80855C9C 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */
/* 80855CA0 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */
/* 80855CA4 4B A7 23 69 */ bl startStrongWindSe__10Z2EnvSeMgrFSc
lbl_80855CA8:
/* 80855CA8 38 60 00 01 */ li r3, 1
/* 80855CAC 39 61 00 20 */ addi r11, r1, 0x20
/* 80855CB0 4B B0 C5 75 */ bl _restgpr_28
/* 80855CB4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80855CB8 7C 08 03 A6 */ mtlr r0
/* 80855CBC 38 21 00 20 */ addi r1, r1, 0x20
/* 80855CC0 4E 80 00 20 */ blr
@@ -1,51 +0,0 @@
lbl_8057C9D8:
/* 8057C9D8 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8057C9DC 7C 08 02 A6 */ mflr r0
/* 8057C9E0 90 01 00 34 */ stw r0, 0x34(r1)
/* 8057C9E4 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 8057C9E8 7C 7F 1B 78 */ mr r31, r3
/* 8057C9EC 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 8057C9F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 8057C9F4 40 82 00 1C */ bne lbl_8057CA10
/* 8057C9F8 28 1F 00 00 */ cmplwi r31, 0
/* 8057C9FC 41 82 00 08 */ beq lbl_8057CA04
/* 8057CA00 4B A9 C1 65 */ bl __ct__10fopAc_ac_cFv
lbl_8057CA04:
/* 8057CA04 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 8057CA08 60 00 00 08 */ ori r0, r0, 8
/* 8057CA0C 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_8057CA10:
/* 8057CA10 7F E3 FB 78 */ mr r3, r31
/* 8057CA14 38 80 00 08 */ li r4, 8
/* 8057CA18 38 A0 00 00 */ li r5, 0
/* 8057CA1C 48 00 00 B9 */ bl func_8057CAD4
/* 8057CA20 2C 03 00 03 */ cmpwi r3, 3
/* 8057CA24 40 82 00 58 */ bne lbl_8057CA7C
/* 8057CA28 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
/* 8057CA2C 7C 04 07 74 */ extsb r4, r0
/* 8057CA30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8057CA34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8057CA38 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 8057CA3C 38 00 00 00 */ li r0, 0
/* 8057CA40 90 01 00 08 */ stw r0, 8(r1)
/* 8057CA44 90 81 00 0C */ stw r4, 0xc(r1)
/* 8057CA48 90 01 00 10 */ stw r0, 0x10(r1)
/* 8057CA4C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8057CA50 39 3F 04 EC */ addi r9, r31, 0x4ec
/* 8057CA54 91 21 00 18 */ stw r9, 0x18(r1)
/* 8057CA58 38 80 00 00 */ li r4, 0
/* 8057CA5C 38 A0 00 E7 */ li r5, 0xe7
/* 8057CA60 38 DF 04 D0 */ addi r6, r31, 0x4d0
/* 8057CA64 38 E0 00 00 */ li r7, 0
/* 8057CA68 39 00 00 00 */ li r8, 0
/* 8057CA6C 39 40 00 37 */ li r10, 0x37
/* 8057CA70 3D 60 80 58 */ lis r11, lit_3648@ha /* 0x8057CAF8@ha */
/* 8057CA74 C0 2B CA F8 */ lfs f1, lit_3648@l(r11) /* 0x8057CAF8@l */
/* 8057CA78 4B AD 00 19 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
lbl_8057CA7C:
/* 8057CA7C 38 60 00 05 */ li r3, 5
/* 8057CA80 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 8057CA84 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8057CA88 7C 08 03 A6 */ mtlr r0
/* 8057CA8C 38 21 00 30 */ addi r1, r1, 0x30
/* 8057CA90 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_8057CA94:
/* 8057CA94 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8057CA98 7C 08 02 A6 */ mflr r0
/* 8057CA9C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8057CAA0 4B FF FF 39 */ bl _create__Q28daObjEff5Act_cFv
/* 8057CAA4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8057CAA8 7C 08 03 A6 */ mtlr r0
/* 8057CAAC 38 21 00 10 */ addi r1, r1, 0x10
/* 8057CAB0 4E 80 00 20 */ blr
@@ -1,8 +0,0 @@
lbl_8057CAD4:
/* 8057CAD4 80 C3 00 B0 */ lwz r6, 0xb0(r3)
/* 8057CAD8 38 00 00 01 */ li r0, 1
/* 8057CADC 7C 03 20 30 */ slw r3, r0, r4
/* 8057CAE0 38 63 FF FF */ addi r3, r3, -1
/* 8057CAE4 7C C0 2C 30 */ srw r0, r6, r5
/* 8057CAE8 7C 63 00 38 */ and r3, r3, r0
/* 8057CAEC 4E 80 00 20 */ blr
+5 -3
View File
@@ -538,7 +538,9 @@ struct J3DFogInfo {
/* 0x18 */ u16 field_0x18[10];
}; // Size: 0x2C
struct J3DFog : public J3DFogInfo {};
struct J3DFog : public J3DFogInfo {
J3DFogInfo* getFogInfo() { return (J3DFogInfo*)this; }
};
struct J3DAlphaComp {
/* 0x0 */ u16 field_0x0;
@@ -558,7 +560,7 @@ public:
virtual u32 getType() = 0;
/* 80317368 */ virtual void setFog(J3DFog);
/* 80317364 */ virtual void setFog(J3DFog*);
/* 8000DF5C */ virtual bool getFog();
/* 8000DF5C */ virtual J3DFog* getFog();
/* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*);
/* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&);
/* 8000DF54 */ virtual bool getAlphaComp();
@@ -617,7 +619,7 @@ public:
/* 8032194C */ virtual u32 getType();
/* 8032197C */ virtual void setFog(J3DFog);
/* 80321958 */ virtual void setFog(J3DFog*);
/* 803219A0 */ virtual bool getFog();
/* 803219A0 */ virtual J3DFog* getFog();
/* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const*);
/* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const&);
/* 803219E0 */ virtual bool getAlphaComp();
@@ -62,10 +62,12 @@ public:
J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); }
u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); }
J3DFog* getFog() { return mPEBlock->getFog(); }
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
void setCullMode(u8 i_mode) { mColorBlock->setCullMode(i_mode); }
public:
/* 0x04 */ J3DMaterial* mNext;
+3 -14
View File
@@ -2,24 +2,13 @@
#define JMATRIGONOMETRIC_H
#include "dolphin/types.h"
namespace std {
template <typename A1, typename B1>
struct pair {
A1 a1;
B1 b1;
pair() {
a1 = A1();
b1 = B1();
}
};
} // namespace std
#include "MSL_C/utility.h"
struct TSinCosTable {
std::pair<f32, f32> table[0x2000];
f32 sinShort(s16 v) const { return table[static_cast<u16>(v) >> 3].a1; }
f32 cosShort(s16 v) const { return table[static_cast<u16>(v) >> 3].b1; }
f32 sinShort(s16 v) const { return table[static_cast<u16>(v) >> 3].first; }
f32 cosShort(s16 v) const { return table[static_cast<u16>(v) >> 3].second; }
};
struct TAtanTable {
+15
View File
@@ -0,0 +1,15 @@
#ifndef MSL_ALGORITHM_H_
#define MSL_ALGORITHM_H_
namespace std {
template <class ForwardIterator, class T>
ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& val);
template <class ForwardIterator, class T>
ForwardIterator upper_bound(ForwardIterator first, ForwardIterator last, const T& val);
template<class InputIt, class UnaryPredicate>
InputIt find_if(InputIt first, InputIt last, UnaryPredicate p);
} // namespace std
#endif
+16
View File
@@ -0,0 +1,16 @@
#ifndef MSL_BITSET_H_
#define MSL_BITSET_H_
#include "stddef.h"
namespace std {
template<size_t N> class bitset {
bitset();
void set(size_t pos, bool val);
void reset(size_t pos);
bool test(size_t pos) const;
};
} // namespace std
#endif
+8
View File
@@ -0,0 +1,8 @@
#ifndef MSL_FUNCTIONAL_H_
#define MSL_FUNCTIONAL_H_
namespace std {
template <class T> struct less {};
} // namespace std
#endif
+17
View File
@@ -0,0 +1,17 @@
#ifndef MSL_UTILITY_H_
#define MSL_UTILITY_H_
namespace std {
template <class T1, class T2>
struct pair {
T1 first;
T2 second;
pair() {
first = T1();
second = T2();
}
};
} // namespace std
#endif
+2 -2
View File
@@ -18,11 +18,11 @@ float cM_rndF2(float);
float cM_rndFX2(float);
inline f32 cM_scos(s16 s) {
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].b1;
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].second;
}
inline f32 cM_ssin(s16 s) {
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].a1;
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].first;
}
inline s16 cM_deg2s(f32 val) {
+3 -1
View File
@@ -80,6 +80,8 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 802C9F58 */ void registLv3WaterSePos(u8, Vec*);
/* 802CA794 */ void startLv3WaterSe(s8);
void setWindType(u8 i_type) { mWindType = i_type; }
/* 0x000 */ Z2EnvSeAutoPan field_0x0;
/* 0x01C */ Z2EnvSeAutoPan field_0x1c;
/* 0x038 */ u8 field_0x38;
@@ -112,7 +114,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 0x140 */ u8 field_0x140;
/* 0x141 */ u8 field_0x141;
/* 0x144 */ Z2EnvSeDir field_0x144;
/* 0x160 */ u8 field_0x160;
/* 0x160 */ u8 mWindType;
/* 0x164 */ Z2MultiSeMgr field_0x164;
/* 0x180 */ Z2EnvSeBase field_0x180;
/* 0x188 */ u8 field_0x188;
+14
View File
@@ -321,6 +321,8 @@ public:
mZSetFlagForce = flag;
}
void onStatus(u16 i_status) { mStatus |= i_status; }
void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; }
void setItemMagicCount(s16 magic) { mItemMagicCount += magic; }
void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; }
@@ -2207,6 +2209,10 @@ inline u8 dComIfGp_get3DSetFlagForce() {
return g_dComIfG_gameInfo.play.get3DSetFlagForce();
}
inline void dComIfGp_onStatus(u16 i_status) {
g_dComIfG_gameInfo.play.onStatus(i_status);
}
inline void dComIfGp_setItemMagicCount(s16 count) {
g_dComIfG_gameInfo.play.setItemMagicCount(count);
}
@@ -2858,6 +2864,10 @@ inline BOOL i_dComIfGp_event_runCheck() {
return g_dComIfG_gameInfo.play.getEvent().runCheck();
}
inline f32 dComIfGp_event_getCullRate() {
return g_dComIfG_gameInfo.play.getEvent().getCullRate();
}
inline u16 dComIfGp_event_checkHind(u16 flag) {
if (!i_dComIfGp_event_runCheck()) {
return false;
@@ -3258,6 +3268,10 @@ inline Mtx44* dComIfGd_getProjViewMtx() {
return &(g_dComIfG_gameInfo.drawlist.getView()->mProjViewMtx);
}
inline MtxP dComIfGd_getInvViewMtx() {
return g_dComIfG_gameInfo.drawlist.getView()->mInvViewMtx;
}
inline view_port_class* dComIfGd_getViewport() {
return g_dComIfG_gameInfo.drawlist.getViewport();
}
+1 -54
View File
@@ -1,61 +1,8 @@
#ifndef D_COM_D_COM_STATIC_H
#define D_COM_D_COM_STATIC_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "rel/d/a/d_a_suspend/d_a_suspend.h"
int daNpcKakashi_getSwdTutorialStep();
class daSus_c {
public:
class data_c {
public:
/* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 80030FBC */ data_c* reset();
/* 80030FCC */ u8 isSwitch();
/* 800310C8 */ u8 check(fopAc_ac_c*);
/* 80031038 */ bool check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
void setNext(data_c* i_next) { mpNext = i_next; }
data_c* getNext() { return mpNext; }
u8 getType() { return mType; }
/* 0x00 */ s8 mRoomNo;
/* 0x01 */ bool field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3;
/* 0x04 */ u8 mType;
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ data_c* mpNext;
}; // Size: 0x24
class room_c {
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
/* 0x0 */ data_c* mpData;
}; // Size: 0x4
/* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 800313BC */ void reset();
/* 800314D4 */ static void check(fopAc_ac_c*);
/* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
/* 800315A4 */ static void execute();
static void reset(int roomNo) {
room_c* room = (room_c*)mRoom; // tmp
room[roomNo].reset();
}
static u8 mData[1152];
static u8 mRoom[256];
static s16 mSetTop;
};
#endif /* D_COM_D_COM_STATIC_H */
+4
View File
@@ -1063,6 +1063,10 @@ inline int dStage_FileList_dt_GetBitSw(dStage_FileList_dt_c* p_fList) {
return p_fList->mBitSw;
}
inline f32 dStage_FileList_dt_SeaLevel(dStage_FileList_dt_c* p_fList) {
return p_fList->mSeaLevel;
}
inline f32 dStage_FileList2_dt_GetLeftRmX(dStage_FileList2_dt_c* p_fList2) {
return p_fList2->mLeftRmX;
}
+1
View File
@@ -143,6 +143,7 @@ public:
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
bool runCheck() { return mEventStatus != 0; }
f32 getCullRate() { return mCullRate; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }
void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
+1
View File
@@ -21,6 +21,7 @@ f32 dKyw_get_wind_pow();
static void squal_proc();
void dKyw_rain_set(int count);
void dKyw_wind_set();
cXyz* dKyw_get_wind_vec();
cXyz dKyw_get_wind_vecpow();
void dKyw_evt_wind_set(s16 angleX, s16 angleY);
void dKyw_custom_windpower(f32 pow);
+16 -9
View File
@@ -18,7 +18,10 @@ struct actor_process_profile_definition {
/* 0x28 */ u32 mStatus;
/* 0x2C */ u8 mActorType;
/* 0x2D */ u8 mCullType;
/* 0x2E */ u8 field_0x2e[2]; // Likely padding
};
enum {
ACTOR_TYPE_ENEMY = 2,
};
struct JKRSolidHeap;
@@ -93,6 +96,16 @@ struct actor_attention_types {
class dJntCol_c;
struct cull_sphere {
/* 0x0 */ Vec mCenter;
/* 0xC */ f32 mRadius;
};
struct cull_box {
/* 0x0 */ Vec mMin;
/* 0xC */ Vec mMax;
};
class fopAc_ac_c : public leafdraw_class {
public:
/* 0x0C0 */ int mAcType;
@@ -119,14 +132,8 @@ public:
/* 0x4F8 */ cXyz speed;
/* 0x504 */ MtxP mCullMtx;
union {
struct {
/* 0x508 */ cXyz mMin;
/* 0x514 */ cXyz mMax;
} mBox;
struct {
/* 0x508 */ cXyz mCenter;
/* 0x514 */ f32 mRadius;
} mSphere;
/* 0x508 */ cull_box mBox;
/* 0x508 */ cull_sphere mSphere;
} mCull;
/* 0x520 */ f32 mCullSizeFar;
/* 0x524 */ J3DModel* model;
+20
View File
@@ -305,6 +305,26 @@ inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) {
return i_actor->mJntCol;
}
inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) {
return i_actor->mCullSizeFar;
}
inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
return i_actor->mCullType;
}
inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14;
}
inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mCenter;
}
inline f32 fopAcM_getCullSizeSphereR(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mRadius;
}
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo);
-1
View File
@@ -24,7 +24,6 @@ typedef struct leaf_process_profile_definition {
/* 0x00 */ process_profile_definition mBase;
/* 0x1C */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x20 */ s16 mPriority; // mDrawPriority
/* 0x22 */ u8 unk22[2]; // Likely padding...
} leaf_process_profile_definition;
s16 fpcLf_GetPriority(const leafdraw_class* pLeaf);
-1
View File
@@ -13,7 +13,6 @@ typedef struct process_profile_definition {
/* 0x04 */ u16 mListID;
/* 0x06 */ u16 mListPrio;
/* 0x08 */ s16 mProcName;
/* 0x0A */ s16 unkA; // probably padding
/* 0x0C */ process_method_class* mSubMtd; // Subclass methods
/* 0x10 */ s32 mSize;
/* 0x14 */ s32 mSizeOther;
+16
View File
@@ -128,4 +128,20 @@ inline void mDoAud_mEnvSe_startFarThunderSe(const Vec* param_0) {
g_mEnvSeMgr.startFarThunderSe((Vec*)param_0, 0);
}
inline void mDoAud_mEnvse_initStrongWind() {
g_mEnvSeMgr.initStrongWindSe();
}
inline void mDoAud_mEnvse_setWindDirection(Vec* i_direction) {
g_mEnvSeMgr.setWindDirection(i_direction);
}
inline void mDoAud_mEnvse_startStrongWindSe(s8 i_reverb) {
g_mEnvSeMgr.startStrongWindSe(i_reverb);
}
inline void mDoAud_mEnvse_setWindType(u8 i_type) {
g_mEnvSeMgr.setWindType(i_type);
}
#endif /* M_DO_M_DO_AUDIO_H */
+11
View File
@@ -17,6 +17,17 @@ struct mDoLib_clipper {
return mClipper.clip(m, (Vec*)param_1, (Vec*)param_2);
}
static u32 clip(const Mtx m, Vec param_1, f32 param_2) {
return mClipper.clip(m, param_1, param_2);
}
static f32 getFar() { return mSystemFar; }
static void resetFar() {
mClipper.setFar(mSystemFar);
mClipper.calcViewFrustum();
}
static J3DUClipper mClipper;
static f32 mSystemFar;
static f32 mFovyRate;
+48 -18
View File
@@ -1,35 +1,65 @@
#ifndef D_A_SUSPEND_H
#define D_A_SUSPEND_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daSus_c : public fopAc_ac_c {
public:
u32 getScale() {
return fopAcM_GetParam(this) >> 0x1E;
}
class data_c {
public:
/* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 80030FBC */ data_c* reset();
/* 80030FCC */ u8 isSwitch();
/* 800310C8 */ u8 check(fopAc_ac_c*);
/* 80031038 */ bool check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
u8 getArg1() {
return (fopAcM_GetParam(this) >> 9) & 1;
}
void setNext(data_c* i_next) { mpNext = i_next; }
data_c* getNext() { return mpNext; }
u8 getType() { return mType; }
u8 getArg0() {
return (fopAcM_GetParam(this) >> 8) & 1;
}
/* 0x00 */ s8 mRoomNo;
/* 0x01 */ bool field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3;
/* 0x04 */ u8 mType;
/* 0x08 */ cXyz field_0x8;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ data_c* mpNext;
}; // Size: 0x24
u8 getSw() {
return fopAcM_GetParam(this) & 0xFF;
}
u8 getRoom() {
return fopAcM_GetParam(this) >> 10;
}
class room_c {
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
/* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 0x0 */ data_c* mpData;
}; // Size: 0x4
/* 80031248 */ static void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 800313BC */ void reset();
/* 800314D4 */ static void check(fopAc_ac_c*);
/* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
/* 800315A4 */ static void execute();
/* 804D5118 */ int create();
static void reset(int roomNo) {
room_c* room = (room_c*)mRoom; // tmp
room[roomNo].reset();
}
u32 getScale() { return fopAcM_GetParam(this) >> 0x1E; }
u8 getArg1() { return (fopAcM_GetParam(this) >> 9) & 1; }
u8 getArg0() { return (fopAcM_GetParam(this) >> 8) & 1; }
u8 getSw() { return fopAcM_GetParam(this) & 0xFF; }
u8 getRoom() { return fopAcM_GetParam(this) >> 10; }
static u8 mData[1152];
static u8 mRoom[256];
static s16 mSetTop;
};
#endif /* D_A_SUSPEND_H */
+9 -1
View File
@@ -1,6 +1,14 @@
#ifndef D_A_VRBOX_H
#define D_A_VRBOX_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class vrbox_class : public fopAc_ac_c {
public:
/* 0x568 */ u8 unk_0x568[0x56C - 0x568];
/* 0x56C */ J3DModel* mpSoraModel;
/* 0x570 */ u8 unk_0x570[0x574 - 0x570];
/* 0x574 */ u8 field_0x574;
};
#endif /* D_A_VRBOX_H */
@@ -1,6 +1,15 @@
#ifndef D_A_KYTAG02_H
#define D_A_KYTAG02_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class kytag02_class : public fopAc_ac_c {
public:
/* 0x568 */ cXyz field_0x568;
/* 0x574 */ s16 field_0x574;
/* 0x576 */ u8 field_0x576;
/* 0x577 */ u8 field_0x577;
/* 0x578 */ u8 field_0x578;
};
#endif /* D_A_KYTAG02_H */
+13 -1
View File
@@ -1,6 +1,18 @@
#ifndef D_A_OBJ_EFF_H
#define D_A_OBJ_EFF_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
namespace daObjEff {
class Act_c : public fopAc_ac_c {
public:
enum Prm_e {
PRM_0 = 0,
PRM_8 = 8,
};
/* 8057C9D8 */ int _create();
};
}; // namespace daObjEff
#endif /* D_A_OBJ_EFF_H */
+1 -1
View File
@@ -2128,7 +2128,7 @@ asm void J3DPEBlockFull::setFog(J3DFog param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool J3DPEBlockFull::getFog() {
asm J3DFog* J3DPEBlockFull::getFog() {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getFog__14J3DPEBlockFullFv.s"
}
+1 -6
View File
@@ -317,19 +317,14 @@ extern actor_process_profile_definition g_profile_B_OH2 = {
7,
0xFFFD,
PROC_B_OH2,
0,
&g_fpcLf_Method.mBase,
sizeof(b_oh2_class),
0,
0,
&g_fopAc_Method.base,
0x00DB,
0,
0,
&l_daB_OH2_Method,
0x00044000,
2,
ACTOR_TYPE_ENEMY,
14,
0,
0,
};
-5
View File
@@ -214,19 +214,14 @@ extern actor_process_profile_definition g_profile_ALLDIE = {
2,
0xFFFD,
PROC_ALLDIE,
0,
&g_fpcLf_Method.mBase,
sizeof(daAlldie_c),
0,
0,
&g_fopAc_Method.base,
0x0116,
0,
0,
&l_daAlldie_Method,
0x00044000,
0,
6,
0,
0,
};
-5
View File
@@ -82,19 +82,14 @@ extern actor_process_profile_definition g_profile_ANDSW = {
7, // mListID
-3, // mListPrio
PROC_ANDSW, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daAndsw_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x012E, // mPriority
0, // padding
0, // padding
&l_daAndsw_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
-5
View File
@@ -425,19 +425,14 @@ extern actor_process_profile_definition g_profile_CROD = {
8,
0xFFFD,
PROC_CROD,
0,
&g_fpcLf_Method.mBase,
sizeof(daCrod_c),
0,
0,
&g_fopAc_Method.base,
0x02B0,
0,
0,
&l_daCrod_Method,
0x00060000,
5,
0,
0,
0,
};
-5
View File
@@ -109,19 +109,14 @@ extern actor_process_profile_definition g_profile_DMIDNA = {
7,
0xFFFD,
PROC_DMIDNA,
0,
&g_fpcLf_Method.mBase,
sizeof(daDmidna_c),
0,
0,
&g_fopAc_Method.base,
0x005D,
0,
0,
&l_daDmidna_Method,
0x00060000,
3,
0,
0,
0,
};
+1 -6
View File
@@ -96,19 +96,14 @@ extern actor_process_profile_definition g_profile_ECONT = {
8, // mListID
-3, // mListPrio
PROC_ECONT, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(econt_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x009B, // mPriority
0, // padding
0, // padding
&l_daEcont_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
0, // mCullType
};
+2 -7
View File
@@ -83,19 +83,14 @@ extern actor_process_profile_definition g_profile_GUARD_MNG = {
7, // mListID
-3, // mListPrio
PROC_GUARD_MNG, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daGuardMng_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0197, // mPriority
0, // padding
0, // padding
0x0197, // mPriority
&l_daGuardMng_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
0, // mCullType
};
-5
View File
@@ -89,19 +89,14 @@ extern actor_process_profile_definition g_profile_HITOBJ = {
7, // mListID
-3, // mListPrio
PROC_HITOBJ, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(hitobj_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x02B2, // mPriority
0, // padding
0, // padding
&l_daHitobj_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};
-5
View File
@@ -72,19 +72,14 @@ extern actor_process_profile_definition g_profile_SET_BG_OBJ = {
7,
-3,
PROC_SET_BG_OBJ,
0,
&g_fpcLf_Method.mBase,
sizeof(daSetBgObj_c),
0,
0,
&g_fopAc_Method.base,
0x02F2,
0,
0,
&l_daSetBgObj_Method,
0x00040100,
0,
14,
0,
0,
};
-5
View File
@@ -98,19 +98,14 @@ extern actor_process_profile_definition g_profile_SKIP2D = {
3,
0xFFFD,
PROC_SKIP2D,
0000,
&g_fpcLf_Method.mBase,
sizeof(daSkip2D_c),
0,
0,
&g_fopAc_Method.base,
0x0304,
0,
0,
&daSkip2D_MethodTable,
0x00040000,
0,
0,
0,
0,
};
+27 -76
View File
@@ -4,66 +4,22 @@
//
#include "rel/d/a/d_a_suspend/d_a_suspend.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void create__7daSus_cFv();
extern "C" static void daSus_create__FP7daSus_c();
extern "C" extern void* g_profile_SUSPEND[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc();
/* ############################################################################################## */
/* 804D523C-804D5240 000000 0004+00 1/1 0/0 0/0 .rodata @3640 */
SECTION_RODATA static f32 const lit_3640 = 1250.0f;
COMPILER_STRIP_GATE(0x804D523C, &lit_3640);
/* 804D5240-804D5244 000004 0004+00 0/1 0/0 0/0 .rodata @3641 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3641 = 2500.0f;
COMPILER_STRIP_GATE(0x804D5240, &lit_3641);
#pragma pop
/* 804D5244-804D5248 000008 0004+00 0/1 0/0 0/0 .rodata @3642 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3642 = 125.0f;
COMPILER_STRIP_GATE(0x804D5244, &lit_3642);
#pragma pop
/* 804D5248-804D524C 00000C 0004+00 0/1 0/0 0/0 .rodata @3643 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3643 = 250.0f;
COMPILER_STRIP_GATE(0x804D5248, &lit_3643);
#pragma pop
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
/* 804D5118-804D51E0 000078 00C8+00 1/1 0/0 0/0 .text create__7daSus_cFv */
#ifdef NONMATCHING
// missing mr instruction
int daSus_c::create() {
daSus_c* suspend = static_cast<daSus_c*>(this);
s8 roomNo = fopAcM_GetRoomNo(suspend);
s8 roomNo = fopAcM_GetRoomNo(this);
if (roomNo < 0) {
roomNo = suspend->getRoom();
roomNo = getRoom();
}
u8 sw = suspend->getSw();
u8 arg0 = suspend->getArg0();
u8 arg1 = suspend->getArg1();
u8 sw = getSw();
u8 arg0 = getArg0();
u8 arg1 = getArg1();
if (suspend->getScale() != 0) {
if (getScale() != 0) {
mScale.x *= 1250.0f;
mScale.y *= 2500.0f;
mScale.z *= 1250.0f;
@@ -73,19 +29,9 @@ int daSus_c::create() {
mScale.z *= 125.0f;
}
newData(roomNo,current.pos,mScale,sw,arg0,arg1);
newData(roomNo, current.pos, mScale, sw, arg0, arg1);
return cPhs_COMPLEATE_e;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daSus_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_suspend/d_a_suspend/create__7daSus_cFv.s"
}
#pragma pop
#endif
/* 804D51E0-804D5234 000140 0054+00 1/0 0/0 0/0 .text daSus_create__FP7daSus_c */
static int daSus_create(daSus_c* i_this) {
@@ -93,24 +39,29 @@ static int daSus_create(daSus_c* i_this) {
new (i_this) daSus_c();
fopAcM_OnCondition(i_this, 8);
}
return i_this->create();
}
/* ############################################################################################## */
/* 804D524C-804D526C -00001 0020+00 1/0 0/0 0/0 .data daSus_METHODS */
SECTION_DATA static void* daSus_METHODS[8] = {
(void*)daSus_create__FP7daSus_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class daSus_METHODS = {
(process_method_func)daSus_create, NULL, NULL, NULL, NULL,
};
/* 804D526C-804D529C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SUSPEND */
SECTION_DATA extern void* g_profile_SUSPEND[12] = {
(void*)0xFFFFFFFD, (void*)0x000BFFFD, (void*)0x030F0000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02FB0000, (void*)&daSus_METHODS, (void*)0x00060000, (void*)0x05000000,
extern actor_process_profile_definition g_profile_SUSPEND = {
-3,
11,
-3,
PROC_SUSPEND,
&g_fpcLf_Method.mBase,
sizeof(daSus_c),
0,
0,
&g_fopAc_Method.base,
763,
&daSus_METHODS,
0x00060000,
5,
0,
};
-5
View File
@@ -74,19 +74,14 @@ extern actor_process_profile_definition g_profile_SwTime = {
7, // mListID
-3, // mListPrio
PROC_SwTime, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daSwTime_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0240, // mPriority
0, // padding
0, // padding
&l_daSwTime_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
-5
View File
@@ -79,19 +79,14 @@ extern actor_process_profile_definition g_profile_TBOX_SW = {
7,
0xFFFD,
PROC_TBOX_SW,
0000,
&g_fpcLf_Method.mBase,
sizeof(daTboxSw_c),
0,
0,
&g_fopAc_Method.base,
0x020E,
0,
0,
&l_daTboxSw_Method,
0x00040100,
0,
14,
0,
0,
};
+144 -143
View File
@@ -1,177 +1,178 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_vrbox
//
/**
* d_a_vrbox.cpp
*
*/
#include "rel/d/a/d_a_vrbox/d_a_vrbox.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct vrbox_class {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
};
struct J3DModelData {};
struct J3DModel {};
//
// Forward References:
//
extern "C" static void daVrbox_Draw__FP11vrbox_class();
extern "C" static void daVrbox_color_set__FP11vrbox_class();
extern "C" static bool daVrbox_Execute__FP11vrbox_class();
extern "C" static bool daVrbox_IsDelete__FP11vrbox_class();
extern "C" static bool daVrbox_Delete__FP11vrbox_class();
extern "C" static void daVrbox_solidHeapCB__FP10fopAc_ac_c();
extern "C" static void daVrbox_Create__FP10fopAc_ac_c();
extern "C" extern char const* const d_a_vrbox__stringBase0;
extern "C" extern void* g_profile_VRBOX[12];
//
// External References:
//
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
extern "C" void dComIfG_getStageRes__FPCc();
extern "C" void dKy_GxFog_set__Fv();
extern "C" void PSMTXCopy();
extern "C" void PSMTXTrans();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
//
// Declarations:
//
/* ############################################################################################## */
/* 80498990-80498994 000000 0004+00 1/1 0/0 0/0 .rodata @3695 */
SECTION_RODATA static u8 const lit_3695[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80498990, &lit_3695);
/* 80498994-80498998 000004 0004+00 1/1 0/0 0/0 .rodata @3696 */
SECTION_RODATA static f32 const lit_3696 = 9.0f / 100.0f;
COMPILER_STRIP_GATE(0x80498994, &lit_3696);
static int daVrbox_color_set(vrbox_class* i_this);
/* 80498518-804986B8 000078 01A0+00 1/0 0/0 0/0 .text daVrbox_Draw__FP11vrbox_class */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daVrbox_Draw(vrbox_class* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s"
static int daVrbox_Draw(vrbox_class* i_this) {
J3DModel* soraModel_p = i_this->mpSoraModel;
f32 fvar = 0.0f;
dStage_FileList_dt_c* filelist_p = NULL;
daVrbox_color_set(i_this);
if (g_env_light.mVrboxInvisible) {
return 1;
}
if (dComIfGp_roomControl_getStayNo() >= 0) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo();
}
if (filelist_p != NULL) {
fvar = dStage_FileList_dt_SeaLevel(filelist_p);
}
if (dComIfGd_getView() != NULL) {
fvar = (dComIfGd_getInvViewMtx()[1][3] - fvar) * 0.09f;
} else {
fvar = 0.0f;
}
mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - fvar,
dComIfGd_getInvViewMtx()[2][3]);
soraModel_p->i_setBaseTRMtx(mDoMtx_stack_c::get());
dKy_GxFog_set();
// these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData?
for (int i = ((J3DModelData*)soraModel_p)->getMaterialNum() - 1; i >= 0; i--) {
J3DMaterial* material_p = ((J3DModelData*)soraModel_p)->getMaterialNodePointer(i);
J3DFogInfo* fogInfo_p;
if (material_p != NULL) {
fogInfo_p = material_p->getFog()->getFogInfo();
}
fogInfo_p->field_0x0 = 2;
}
dComIfGd_setListSky();
mDoExt_modelUpdateDL(soraModel_p);
dComIfGd_setList();
return 1;
}
#pragma pop
/* 804986B8-80498850 000218 0198+00 1/1 0/0 0/0 .text daVrbox_color_set__FP11vrbox_class
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daVrbox_color_set(vrbox_class* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_color_set__FP11vrbox_class.s"
static int daVrbox_color_set(vrbox_class* i_this) {
if ((g_env_light.mCloudOuterHazeColor.r + g_env_light.mCloudOuterHazeColor.g +
g_env_light.mCloudOuterHazeColor.b + g_env_light.mSkyColor.r + g_env_light.mSkyColor.g +
g_env_light.mSkyColor.b + g_env_light.mUpperCloudColor.r + g_env_light.mUpperCloudColor.g +
g_env_light.mUpperCloudColor.b) == 0)
{
g_env_light.mVrboxInvisible = true;
return 1;
}
g_env_light.mVrboxInvisible = false;
J3DModelData* modelData = i_this->mpSoraModel->getModelData();
GXColorS10 color;
J3DMaterial* material_0 = modelData->getMaterialNodePointer(0);
if (material_0 != NULL) {
material_0->setCullMode(0);
material_0->change();
color.r = g_env_light.mSkyColor.r;
color.g = g_env_light.mSkyColor.g;
color.b = g_env_light.mSkyColor.b;
color.a = 255;
material_0->setTevColor(0, (J3DGXColorS10*)&color);
}
J3DMaterial* material_1 = modelData->getMaterialNodePointer(1);
if (material_1 != NULL) {
material_1->setCullMode(0);
material_1->change();
color.r = g_env_light.mCloudInnerHazeColor.r;
color.g = g_env_light.mCloudInnerHazeColor.g;
color.b = g_env_light.mCloudInnerHazeColor.b;
color.a = g_env_light.mCloudInnerHazeColor.a;
material_1->setTevColor(0, (J3DGXColorS10*)&color);
}
return 1;
}
#pragma pop
/* 80498850-80498858 0003B0 0008+00 1/0 0/0 0/0 .text daVrbox_Execute__FP11vrbox_class */
static bool daVrbox_Execute(vrbox_class* param_0) {
return true;
static int daVrbox_Execute(vrbox_class* i_this) {
return 1;
}
/* 80498858-80498860 0003B8 0008+00 1/0 0/0 0/0 .text daVrbox_IsDelete__FP11vrbox_class
*/
static bool daVrbox_IsDelete(vrbox_class* param_0) {
return true;
static int daVrbox_IsDelete(vrbox_class* i_this) {
return 1;
}
/* 80498860-80498868 0003C0 0008+00 1/0 0/0 0/0 .text daVrbox_Delete__FP11vrbox_class */
static bool daVrbox_Delete(vrbox_class* param_0) {
return true;
static int daVrbox_Delete(vrbox_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80498998-80498998 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80498998 = "vrbox_sora.bmd";
#pragma pop
/* 80498868-804988DC 0003C8 0074+00 1/1 0/0 0/0 .text daVrbox_solidHeapCB__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daVrbox_solidHeapCB(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_solidHeapCB__FP10fopAc_ac_c.s"
static int daVrbox_solidHeapCB(fopAc_ac_c* i_this) {
vrbox_class* this_ = (vrbox_class*)i_this;
J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sora.bmd");
this_->mpSoraModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
return modelData != NULL && this_->mpSoraModel != NULL;
}
#pragma pop
/* 804988DC-80498988 00043C 00AC+00 1/0 0/0 0/0 .text daVrbox_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daVrbox_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Create__FP10fopAc_ac_c.s"
static int daVrbox_Create(fopAc_ac_c* i_this) {
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) vrbox_class();
fopAcM_OnCondition(i_this, 8);
}
vrbox_class* this_ = (vrbox_class*)i_this;
this_->field_0x574 = 0;
int phase = cPhs_COMPLEATE_e;
if (fopAcM_entrySolidHeap(this_, daVrbox_solidHeapCB, 0xC60)) {
dComIfGp_onStatus(1);
g_env_light.mVrboxInvisible = false;
} else {
phase = cPhs_ERROR_e;
}
return phase;
}
#pragma pop
/* ############################################################################################## */
/* 804989A8-804989C8 -00001 0020+00 1/0 0/0 0/0 .data l_daVrbox_Method */
SECTION_DATA static void* l_daVrbox_Method[8] = {
(void*)daVrbox_Create__FP10fopAc_ac_c,
(void*)daVrbox_Delete__FP11vrbox_class,
(void*)daVrbox_Execute__FP11vrbox_class,
(void*)daVrbox_IsDelete__FP11vrbox_class,
(void*)daVrbox_Draw__FP11vrbox_class,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daVrbox_Method = {
(process_method_func)daVrbox_Create, (process_method_func)daVrbox_Delete,
(process_method_func)daVrbox_Execute, (process_method_func)daVrbox_IsDelete,
(process_method_func)daVrbox_Draw,
};
/* 804989C8-804989F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_VRBOX */
SECTION_DATA extern void* g_profile_VRBOX[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02DA0000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x00070000, (void*)&l_daVrbox_Method,
(void*)0x00044000, (void*)NULL,
extern actor_process_profile_definition g_profile_VRBOX = {
-3,
7,
-3,
PROC_VRBOX,
&g_fpcLf_Method.mBase,
sizeof(vrbox_class),
0,
0,
&g_fopAc_Method.base,
7,
&l_daVrbox_Method,
0x00044000,
0,
0,
};
/* 80498998-80498998 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+1 -6
View File
@@ -349,21 +349,16 @@ extern actor_process_profile_definition g_profile_E_YK = {
7, // mListID
-3, // mListPrio
PROC_E_YK, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(e_yk_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x00BC, // mPriority
0, // padding
0, // padding
&l_daE_YK_Method, // mSubMtd
0x10050100, // mStatus
0x02, // mActorType
ACTOR_TYPE_ENEMY, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};
/* 80807E80-80807E8C 000110 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */
-5
View File
@@ -89,19 +89,14 @@ extern actor_process_profile_definition g_profile_E_YM_TAG = {
7, // mListID
-3, // mListPrio
PROC_E_YM_TAG, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daE_YM_TAG_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x00C3, // mPriority
0, // padding
0, // padding
&l_daE_YM_TAG_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};
+137 -135
View File
@@ -1,160 +1,162 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_kytag02
//
/**
* d_a_kytag02.cpp
*
*/
#include "rel/d/a/kytag/d_a_kytag02/d_a_kytag02.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct kytag02_class {};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct Vec {};
struct Z2EnvSeMgr {
/* 802C7FBC */ void initStrongWindSe();
/* 802C7FC8 */ void setWindDirection(Vec*);
/* 802C800C */ void startStrongWindSe(s8);
};
//
// Forward References:
//
extern "C" static bool daKytag02_Draw__FP13kytag02_class();
extern "C" static void daKytag02_Execute__FP13kytag02_class();
extern "C" static bool daKytag02_IsDelete__FP13kytag02_class();
extern "C" static void daKytag02_Delete__FP13kytag02_class();
extern "C" static void daKytag02_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_KYTAG02[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void dKyw_get_wind_vec__Fv();
extern "C" void dKyw_evt_wind_set__Fss();
extern "C" void dKyw_evt_wind_set_go__Fv();
extern "C" void initStrongWindSe__10Z2EnvSeMgrFv();
extern "C" void setWindDirection__10Z2EnvSeMgrFP3Vec();
extern "C" void startStrongWindSe__10Z2EnvSeMgrFSc();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
//
// Declarations:
//
/* 80855AB8-80855AC0 000078 0008+00 1/0 0/0 0/0 .text daKytag02_Draw__FP13kytag02_class
/* -80855AC0 000078 0008+00 1/0 0/0 0/0 .text daKytag02_Draw__FP13kytag02_class
*/
static bool daKytag02_Draw(kytag02_class* param_0) {
return true;
static int daKytag02_Draw(kytag02_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80855DFC-80855E00 000000 0004+00 1/1 0/0 0/0 .rodata @3666 */
SECTION_RODATA static f32 const lit_3666 = 27.0f / 100.0f;
COMPILER_STRIP_GATE(0x80855DFC, &lit_3666);
/* 80855E00-80855E04 000004 0004+00 0/1 0/0 0/0 .rodata @3667 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_3667 = 0x3ECF5C28;
COMPILER_STRIP_GATE(0x80855E00, &lit_3667);
#pragma pop
/* 80855E04-80855E08 000008 0004+00 1/2 0/0 0/0 .rodata @3668 */
SECTION_RODATA static u8 const lit_3668[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80855E04, &lit_3668);
/* 80855E08-80855E0C 00000C 0004+00 0/1 0/0 0/0 .rodata @3669 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3669 = 3.0f / 10.0f;
COMPILER_STRIP_GATE(0x80855E08, &lit_3669);
#pragma pop
/* 80855AC0-80855CC4 000080 0204+00 1/0 0/0 0/0 .text daKytag02_Execute__FP13kytag02_class */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daKytag02_Execute(kytag02_class* param_0) {
nofralloc
#include "asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Execute__FP13kytag02_class.s"
static int daKytag02_Execute(kytag02_class* i_this) {
dScnKy_env_light_c* env_light = i_dKy_getEnvlight();
cXyz* wind_vec = dKyw_get_wind_vec();
if (dComIfGs_isSwitch(i_this->field_0x577, i_this->orig.roomNo)) {
dKyw_evt_wind_set_go();
dKyw_evt_wind_set(0, i_this->current.angle.y);
if (i_this->field_0x578 != 99) {
env_light->mTeachWindExist = 1;
env_light->mMoyaMode = 4;
env_light->mMoyaCount = 50;
switch (i_this->field_0x576) {
case 0:
if (i_this->field_0x574 <= 0) {
env_light->custom_windpower = 0.27f;
i_this->field_0x574 = 60;
mDoAud_mEnvse_setWindType(2);
i_this->field_0x576++;
}
break;
case 1:
if (i_this->field_0x574 <= 0) {
env_light->custom_windpower = 0.40499997f;
i_this->field_0x574 = 90;
mDoAud_mEnvse_setWindType(1);
i_this->field_0x576++;
}
break;
case 2:
if (i_this->field_0x574 <= 0) {
env_light->custom_windpower = 0.0f;
i_this->field_0x574 = 90;
i_this->field_0x576 = 0;
mDoAud_mEnvse_setWindType(3);
}
break;
}
if (i_this->field_0x574 != 0) {
i_this->field_0x574--;
}
} else {
env_light->mTeachWindExist = 0xFF;
env_light->custom_windpower = 0.3f;
}
} else {
env_light = i_dKy_getEnvlight();
env_light->mEvtWindSet = 0;
if (i_this->field_0x578 != 99) {
env_light->mMoyaCount = 0;
}
env_light->mTeachWindExist = 0;
}
if (i_this->field_0x578 != 99) {
mDoAud_mEnvse_setWindDirection(wind_vec);
s8 reverb = dComIfGp_getReverb(dComIfGp_roomControl_getStayNo());
mDoAud_mEnvse_startStrongWindSe(reverb);
}
return 1;
}
#pragma pop
/* 80855CC4-80855CCC 000284 0008+00 1/0 0/0 0/0 .text daKytag02_IsDelete__FP13kytag02_class */
static bool daKytag02_IsDelete(kytag02_class* param_0) {
return true;
static int daKytag02_IsDelete(kytag02_class* i_this) {
return 1;
}
/* 80855CCC-80855CEC 00028C 0020+00 1/0 0/0 0/0 .text daKytag02_Delete__FP13kytag02_class
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daKytag02_Delete(kytag02_class* param_0) {
nofralloc
#include "asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Delete__FP13kytag02_class.s"
static int daKytag02_Delete(kytag02_class* i_this) {
dScnKy_env_light_c* env_light = i_dKy_getEnvlight();
env_light->mEvtWindSet = 0;
env_light->mMoyaCount = 0;
env_light->mTeachWindExist = 0;
return 1;
}
#pragma pop
/* 80855CEC-80855DF4 0002AC 0108+00 1/0 0/0 0/0 .text daKytag02_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daKytag02_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Create__FP10fopAc_ac_c.s"
static int daKytag02_Create(fopAc_ac_c* i_this) {
dScnKy_env_light_c* env_light = i_dKy_getEnvlight();
dKyw_get_wind_vec();
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) kytag02_class();
fopAcM_OnCondition(i_this, 8);
}
kytag02_class* this_ = (kytag02_class*)i_this;
this_->field_0x574 = 0;
this_->field_0x576 = 0;
this_->field_0x577 = this_->current.angle.x & 0xFF;
env_light->custom_windpower = 0.0f;
this_->field_0x578 = fopAcM_GetParam(this_) & 0xFF;
if (dComIfGs_isSwitch(this_->field_0x577, this_->orig.roomNo)) {
dKyw_evt_wind_set_go();
dKyw_evt_wind_set(0, this_->current.angle.y);
if (this_->field_0x578 == 99) {
env_light->mTeachWindExist = 0xFF;
} else {
env_light->mTeachWindExist = 1;
env_light->mMoyaMode = 4;
env_light->mMoyaCount = 50;
}
}
if (this_->field_0x578 != 99) {
mDoAud_mEnvse_initStrongWind();
}
return cPhs_COMPLEATE_e;
}
#pragma pop
/* ############################################################################################## */
/* 80855E0C-80855E2C -00001 0020+00 1/0 0/0 0/0 .data l_daKytag02_Method */
SECTION_DATA static void* l_daKytag02_Method[8] = {
(void*)daKytag02_Create__FP10fopAc_ac_c,
(void*)daKytag02_Delete__FP13kytag02_class,
(void*)daKytag02_Execute__FP13kytag02_class,
(void*)daKytag02_IsDelete__FP13kytag02_class,
(void*)daKytag02_Draw__FP13kytag02_class,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daKytag02_Method = {
(process_method_func)daKytag02_Create, (process_method_func)daKytag02_Delete,
(process_method_func)daKytag02_Execute, (process_method_func)daKytag02_IsDelete,
(process_method_func)daKytag02_Draw,
};
/* 80855E2C-80855E5C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG02 */
SECTION_DATA extern void* g_profile_KYTAG02[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02AC0000, (void*)&g_fpcLf_Method,
(void*)0x0000057C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x00600000, (void*)&l_daKytag02_Method,
(void*)0x00044000, (void*)NULL,
extern actor_process_profile_definition g_profile_KYTAG02 = {
-3,
7,
-3,
PROC_KYTAG02,
&g_fpcLf_Method.mBase,
sizeof(kytag02_class),
0,
0,
&g_fopAc_Method.base,
0x60,
&l_daKytag02_Method,
0x00044000,
0,
0,
};
@@ -62,19 +62,14 @@ extern actor_process_profile_definition g_profile_KYTAG05 = {
7,
0xFFFD,
PROC_KYTAG05,
0000,
&g_fpcLf_Method.mBase,
sizeof(kytag05_class),
0,
0,
&g_fopAc_Method.base,
0x0063,
0,
0,
&l_daKytag05_Method,
0x00044000,
0,
0,
0,
0,
};
@@ -1355,21 +1355,16 @@ extern actor_process_profile_definition g_profile_KYTAG06 = {
7,
-3,
PROC_KYTAG06,
0,
&g_fpcLf_Method.mBase,
sizeof(kytag06_class),
0,
0,
&g_fopAc_Method.base,
0x64,
0,
0,
&l_daKytag06_Method,
0x00060000,
0,
0,
0,
0,
};
/* 8085A18C-8085A190 000064 0004+00 0/0 0/0 0/0 .bss
@@ -88,19 +88,14 @@ extern actor_process_profile_definition g_profile_KYTAG07 = {
7, // mListID
-3, // mListPrio
PROC_KYTAG07, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(kytag07_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0065, // mPriority
0, // padding
0, // padding
&l_daKytag07_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};
@@ -114,19 +114,14 @@ extern actor_process_profile_definition g_profile_KYTAG14 = {
7,
0xFFFD,
PROC_KYTAG14,
0,
&g_fpcLf_Method.mBase,
sizeof(kytag14_class),
0,
0,
&g_fopAc_Method.base,
0x006C,
0,
0,
&l_daKytag14_Method,
0x00044000,
0,
0,
0,
0,
};
@@ -61,19 +61,14 @@ extern actor_process_profile_definition g_profile_KYTAG17 = {
7, // mListID
-3, // mListPrio
PROC_KYTAG17, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(kytag17_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x006F, // mPriority
0, // padding
0, // padding
&l_daKytag17_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};
@@ -133,19 +133,14 @@ extern actor_process_profile_definition g_profile_Obj_Bombf = {
7, // mListID
-3, // mListPrio
PROC_Obj_Bombf, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjBombf_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x00FB, // mPriority
0, // Padding
0, // Padding
&l_daObjBombf_Method, // mSubMtd
0x00040100, // mStatus
3, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -180,19 +180,14 @@ extern actor_process_profile_definition g_profile_Obj_Cboard = {
3,
-3,
PROC_Obj_Cboard,
0,
&g_fpcLf_Method.mBase,
sizeof(daObjBoard_c),
0,
0,
&g_fopAc_Method.base,
0x01C5,
0,
0,
&daObjBoard_METHODS,
0x00040000,
0,
14,
0,
0,
};
@@ -114,19 +114,14 @@ extern actor_process_profile_definition g_profile_Obj_Cowdoor = {
3, // mListID
-3, // mListPrio
PROC_Obj_Cowdoor, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daCowdoor_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x01BF, // mPriority
0, // Padding
0, // Padding
&l_daCowdoor_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
+63 -121
View File
@@ -1,160 +1,102 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_obj_eff
//
/**
* d_a_obj_eff.cpp
*
*/
#include "rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daObjEff {
struct Act_c {
struct Prm_e {};
/* 8057C9D8 */ void _create();
};
};
#include "d/com/d_com_inf_game.h"
struct daObj {
template <typename A1>
void PrmAbstract(/* ... */);
/* 8057CAD4 */ /* daObj::PrmAbstract<daObjEff::Act_c::Prm_e> */
void func_8057CAD4(void* _this, fopAc_ac_c const*, daObjEff::Act_c::Prm_e,
daObjEff::Act_c::Prm_e);
template <typename T>
static int PrmAbstract(const fopAc_ac_c* param_0, T param_1, T param_2);
};
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct csXyz {};
struct _GXColor {};
struct cXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
cXyz const*, f32);
};
//
// Forward References:
//
extern "C" void _create__Q28daObjEff5Act_cFv();
extern "C" static void func_8057CA94();
extern "C" static bool func_8057CAB4();
extern "C" static bool func_8057CABC();
extern "C" static bool func_8057CAC4();
extern "C" static bool func_8057CACC();
extern "C" void func_8057CAD4(void* _this, fopAc_ac_c const*, daObjEff::Act_c::Prm_e,
daObjEff::Act_c::Prm_e);
extern "C" extern void* g_profile_Obj_Eff[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* ############################################################################################## */
/* 8057CAF8-8057CAFC 000000 0004+00 1/1 0/0 0/0 .rodata @3648 */
SECTION_RODATA static u8 const lit_3648[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x8057CAF8, &lit_3648);
/* 8057C9D8-8057CA94 000078 00BC+00 1/1 0/0 0/0 .text _create__Q28daObjEff5Act_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjEff::Act_c::_create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff/_create__Q28daObjEff5Act_cFv.s"
}
#pragma pop
int daObjEff::Act_c::_create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) Act_c();
fopAcM_OnCondition(this, 8);
}
if (daObj::PrmAbstract<Act_c::Prm_e>(this, PRM_8, PRM_0) == 3) {
s32 roomNo = fopAcM_GetRoomNo(this);
dComIfGp_particle_setColor(0x00E7, &current.pos, NULL, NULL, NULL, 0.0f, 55, NULL, &mScale,
NULL, roomNo, &mScale);
}
return cPhs_ERROR_e;
}
namespace daObjEff {
namespace {
/* 8057CA94-8057CAB4 000134 0020+00 1/0 0/0 0/0 .text
* Mthd_Create__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_8057CA94() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff/func_8057CA94.s"
int Mthd_Create(void* i_this) {
return static_cast<daObjEff::Act_c*>(i_this)->_create();
}
#pragma pop
/* 8057CAB4-8057CABC 000154 0008+00 1/0 0/0 0/0 .text
* Mthd_Delete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */
static bool func_8057CAB4() {
return true;
int Mthd_Delete(void* i_this) {
return 1;
}
/* 8057CABC-8057CAC4 00015C 0008+00 1/0 0/0 0/0 .text
* Mthd_Execute__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */
static bool func_8057CABC() {
return true;
int Mthd_Execute(void* i_this) {
return 1;
}
/* 8057CAC4-8057CACC 000164 0008+00 1/0 0/0 0/0 .text
* Mthd_Draw__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */
static bool func_8057CAC4() {
return true;
int Mthd_Draw(void* i_this) {
return 1;
}
/* 8057CACC-8057CAD4 00016C 0008+00 1/0 0/0 0/0 .text
* Mthd_IsDelete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */
static bool func_8057CACC() {
return true;
int Mthd_IsDelete(void* i_this) {
return 1;
}
}; // namespace
}; // namespace daObjEff
/* 8057CAD4-8057CAF0 000174 001C+00 1/1 0/0 0/0 .text
* PrmAbstract<Q38daObjEff5Act_c5Prm_e>__5daObjFPC10fopAc_ac_cQ38daObjEff5Act_c5Prm_eQ38daObjEff5Act_c5Prm_e
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8057CAD4(void* _this, fopAc_ac_c const* param_0,
daObjEff::Act_c::Prm_e param_1, daObjEff::Act_c::Prm_e param_2) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff/func_8057CAD4.s"
template <typename T>
int daObj::PrmAbstract(const fopAc_ac_c* param_0, T param_1, T param_2) {
u32 param = fopAcM_GetParam(param_0);
return ((1 << param_1) - 1) & (param >> param_2);
}
#pragma pop
/* ############################################################################################## */
/* 8057CAFC-8057CB1C -00001 0020+00 1/0 0/0 0/0 .data
* Mthd_Table__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@ */
SECTION_DATA static void* data_8057CAFC[8] = {
(void*)func_8057CA94, (void*)func_8057CAB4, (void*)func_8057CABC, (void*)func_8057CACC,
(void*)func_8057CAC4, (void*)NULL, (void*)NULL, (void*)NULL,
namespace daObjEff {
namespace {
static actor_method_class Mthd_Table = {
(process_method_func)Mthd_Create, (process_method_func)Mthd_Delete,
(process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete,
(process_method_func)Mthd_Draw,
};
};
}; // namespace daObjEff
/* 8057CB1C-8057CB4C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Eff */
SECTION_DATA extern void* g_profile_Obj_Eff[12] = {
(void*)0xFFFFFFFD, (void*)0x0009FFFD, (void*)0x03010000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method,
(void*)0x010B0000, (void*)&data_8057CAFC, (void*)0x00040000, (void*)NULL,
};
extern actor_process_profile_definition g_profile_Obj_Eff = {
-3,
9,
-3,
PROC_Obj_Eff,
&g_fpcLf_Method.mBase,
sizeof(daObjEff::Act_c),
0,
0,
&g_fopAc_Method.base,
0x10B,
&daObjEff::Mthd_Table,
0x00040000,
0,
0,
};
@@ -277,19 +277,14 @@ extern actor_process_profile_definition g_profile_Obj_E_CREATE = {
3,
0xFFFD,
PROC_Obj_E_CREATE,
0,
&g_fpcLf_Method.mBase,
sizeof(daObjE_CREATE_c),
0,
0,
&g_fopAc_Method.base,
0x01CA,
0,
0,
&l_daObjE_CREATE_Method,
0x00040000,
0x0,
0xE,
0,
0,
};
+13 -9
View File
@@ -289,14 +289,18 @@ static actor_method_class daObjMGate_METHODS = {
/* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MGate */
extern actor_process_profile_definition g_profile_Obj_MGate = {
-3, 3,
0xFFFD, PROC_Obj_MGate,
0, &g_fpcLf_Method.mBase,
0x5D0, 0,
0, &g_fopAc_Method.base,
0x01C4, 0,
0, &daObjMGate_METHODS,
0x00040100, 0,
14, 0,
-3,
3,
0xFFFD,
PROC_Obj_MGate,
&g_fpcLf_Method.mBase,
0x5D0,
0,
0,
&g_fopAc_Method.base,
0x01C4,
&daObjMGate_METHODS,
0x00040100,
0,
14,
};
@@ -58,20 +58,15 @@ extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = {
-3, // mLayerID
3, // mListID
-3, // mListPrio
PROC_OBJ_ONSEN_FIRE, // mProcName
0, // padding
PROC_OBJ_ONSEN_FIRE, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjOnsenFire_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0264, // mPriority
0, // padding
0, // padding
0x0264, // mPriority
&l_daObjOnsenFire_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
0x0E, // mCullType
};
+1 -6
View File
@@ -90,19 +90,14 @@ extern actor_process_profile_definition g_profile_Obj_Smoke = {
7, // mListID
-3, // mListPrio
PROC_Obj_Smoke, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjSmoke_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0278, // mPriority
0, // padding
0, // padding
0x0278, // mPriority
&l_daObjSmoke_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};
@@ -564,21 +564,16 @@ extern actor_process_profile_definition g_profile_Obj_Stone = {
8, // mListID
-3, // mListPrio
PROC_Obj_Stone, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjStone_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x01FF, // mPriority
0, // padding
0, // padding
&l_daObjStone_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
23, // mCullType
0, // padding
0, // padding
};
/* 80CECD74-80CECDA4 000120 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */
@@ -284,21 +284,16 @@ extern actor_process_profile_definition g_profile_Obj_StoneMark = {
7, // mListID
-3, // mListPrio
PROC_Obj_StoneMark, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjSMark_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0216, // mPriority
0, // padding
0, // padding
&l_daObjSMark_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
23, // mCullType
0, // padding
0 // padding
};
/* 8059A464-8059A488 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */
@@ -122,19 +122,14 @@ extern actor_process_profile_definition g_profile_Obj_TMoon = {
7, // mListID
-3, // mListPrio
PROC_Obj_TMoon, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjTMoon_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0239, // mPriority
0, // Padding
0, // Padding
&l_daObjTMoon_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -444,19 +444,14 @@ extern actor_process_profile_definition g_profile_OBJ_WEB0 = {
3,
-3,
PROC_OBJ_WEB0,
0,
&g_fpcLf_Method.mBase,
sizeof(obj_web0_class),
0,
0,
&g_fopAc_Method.base,
0x002F,
0,
0,
&l_daObj_Web0_Method,
0x00040100,
0,
14,
0,
0,
};
@@ -334,19 +334,14 @@ extern actor_process_profile_definition g_profile_OBJ_WEB1 = {
3,
-3,
PROC_OBJ_WEB1,
0,
&g_fpcLf_Method.mBase,
sizeof(obj_web1_class),
0,
0,
&g_fopAc_Method.base,
0x0030,
0,
0,
&l_daObj_Web1_Method,
0x00040100,
0,
14,
0,
0,
};
@@ -118,19 +118,14 @@ extern actor_process_profile_definition g_profile_Tag_CstaSw = {
7, // mListID
-3, // mListPrio
PROC_Tag_CstaSw, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagCstaSw_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0291, // mPriority
0, // Padding
0, // Padding
&l_daTagCstaSw_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -80,19 +80,14 @@ extern actor_process_profile_definition g_profile_Tag_AJnot = {
3,
0xFFFD,
PROC_Tag_AJnot,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagAJnot_c),
0,
0,
&g_fopAc_Method.base,
0x01B4,
0,
0,
&l_daTagAJnot_Method,
0x00044000,
3,
14,
0,
0,
};
@@ -35,19 +35,14 @@ extern actor_process_profile_definition g_profile_Tag_Arena = {
7, // mListID
-3, // mListPrio
PROC_Tag_Arena, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagArena_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x014D, // mPriority
0, // padding
0, // padding
&l_daTagArena_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
@@ -46,19 +46,14 @@ extern actor_process_profile_definition g_profile_Tag_Assist = {
7, // mListID
-3, // mListPrio
PROC_Tag_Assist, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagAssist_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x010A, // mPriority
0, // padding
0, // padding
&l_daTagAssist_Method, // mSubMtd
0x00040000, // mStatus
0x00, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};
@@ -176,16 +176,14 @@ extern actor_process_profile_definition g_profile_Tag_Attp = {
7, // mListID
-3, // mListPrio
PROC_Tag_Attp, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daAttp_c), // mSize
0, // mSizeOther
0, // mParameter
&g_fopAc_Method.base, // mSubMtd
0x01B8, // mPriority
0, // padding
0, // padding
&l_daAttp_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0, // mCullType
};
@@ -39,19 +39,14 @@ extern actor_process_profile_definition g_profile_Tag_Escape = {
07,
0xFFFD,
PROC_Tag_Escape,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagEscape_c),
0,
0,
&g_fopAc_Method.base,
0x018D,
0,
0,
&l_daTagEscape_Method,
0x00040000,
0,
14,
0,
0,
};
-5
View File
@@ -31,19 +31,14 @@ extern actor_process_profile_definition g_profile_TAG_GRA = {
3, // mListID
-3, // mListPrio
PROC_TAG_GRA, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagGra_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0014, // mPriority
0, // padding
0, // padding
&l_daTagGra_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
@@ -74,19 +74,14 @@ extern actor_process_profile_definition g_profile_Tag_Gstart = {
2,
0xFFFD,
PROC_Tag_Gstart,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagGstart_c),
0,
0,
&g_fopAc_Method.base,
0x01B5,
0,
0,
&l_daTagGstart_Method,
0x00060000,
3,
14,
0,
0,
};
@@ -77,19 +77,14 @@ extern actor_process_profile_definition g_profile_TAG_GUARD = {
7,
-3,
PROC_TAG_GUARD,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagGuard_c),
0,
0,
&g_fopAc_Method.base,
0x0198,
0,
0,
&l_daTagGuard_Method,
0x00040000,
0x00,
0x0E,
0,
0,
};
@@ -88,19 +88,14 @@ extern actor_process_profile_definition g_profile_Tag_Hinit = {
3,
-3,
PROC_Tag_Hinit,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagHinit_c),
0,
0,
&g_fopAc_Method.base,
0x01B1,
0,
0,
&l_daTagHinit_Method,
0x00060000,
3,
0x0E,
0,
0,
};
@@ -107,19 +107,14 @@ extern actor_process_profile_definition g_profile_TAG_HOWL = {
7, // mListID
-3, // mListPrio
PROC_TAG_HOWL, // mProcName
0, // unkA
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTag_Howl_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x011B, // mPriority
0, // unk22[0]
0, // unk22[1]
&daTag_Howl_MethodTable, // mSubMtd
0x00040000, // mStatus
0x00, // mActorType
0x0E, // mCullType
0, // field_0x2e[0]
0, // field_0x2e[1]
};
@@ -196,19 +196,14 @@ extern actor_process_profile_definition g_profile_Tag_Hstop = {
3,
0xFFFD,
PROC_Tag_Hstop,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagHstop_c),
0,
0,
&g_fopAc_Method.base,
0x01B3,
0,
0,
&l_daTagHstop_Method,
0x00040000,
3,
14,
0,
0,
};
@@ -39,19 +39,14 @@ extern actor_process_profile_definition g_profile_Tag_Instruction = {
7,
0xFFFD,
PROC_Tag_Instruction,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagInst_c),
0,
0,
&g_fopAc_Method.base,
0x014E,
0,
0,
&l_daTagInst_Method,
0x00040000,
0,
14,
0,
0,
};
@@ -127,19 +127,14 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = {
7, // mListID
-3, // mListPrio
PROC_TAG_LANTERN, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTag_Lantern_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x011E, // mPriority
0, // Padding
0, // Padding
&daTag_Lantern_MethodTable, // mSubMtd
0x00040000, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -100,19 +100,14 @@ extern actor_process_profile_definition g_profile_TAG_LV5SOUP = {
7,
0xFFFD,
0x122,
0,
&g_fpcLf_Method.mBase,
sizeof(daTag_Lv5Soup_c),
0,
0,
&g_fopAc_Method.base,
0x0046,
0,
0,
&daTag_Lv5Soup_MethodTable,
0x00064100,
5,
14,
0,
0,
};
@@ -121,19 +121,14 @@ extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = {
7,
0xFFFD,
PROC_Tag_Lv6CstaSw,
0,
&g_fpcLf_Method.mBase,
sizeof(daLv6CstaSw_c),
0,
0,
&g_fopAc_Method.base,
0x0292,
0,
0,
&l_daLv6CstaSw_Method,
0x00044000,
0,
14,
0,
0,
};
@@ -72,19 +72,14 @@ extern actor_process_profile_definition g_profile_Tag_Magne = {
7,
0xFFFD,
PROC_Tag_Magne,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagMagne_c),
0,
0,
&g_fopAc_Method.base,
0x024E,
0,
0,
&l_daTagMagne_Method,
0x00040000,
0,
14,
0,
0,
};
@@ -121,19 +121,14 @@ extern actor_process_profile_definition g_profile_Tag_Mmsg = {
7, // mListID
0xFFFD, // mListPrio
PROC_Tag_Mmsg, // mProcName
0, // unkA
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagMmsg_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x00FF, // mPriority
0, // unk22[0]
0, // unk22[1]
&l_daTagMmsg_Method, // mSubMtd
0x00044000, // mStatus
0x03, // mActorType
0x0E, // mCullType
0, // field_0x2e[0]
0 // field_0x2e[1]
};
@@ -317,19 +317,14 @@ extern actor_process_profile_definition g_profile_Tag_Mstop = {
7, // mListID
-3, // mListPrio
PROC_Tag_Mstop, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagMstop_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0101, // mPriority
0, // padding
0, // padding
&l_daTagMstop_Method, // mSubMtd
0x00044000, // mStatus
3, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
@@ -89,19 +89,14 @@ extern actor_process_profile_definition g_profile_Tag_poFire = {
7, // mListID
-3, // mListPrio
PROC_Tag_poFire, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagPoFire_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0289, // mPriority
0, // Padding
0, // Padding
&l_daTagPoFire_Method, // mSubMtd
0x00044000, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -113,19 +113,14 @@ extern actor_process_profile_definition g_profile_Tag_RetRoom = {
7, // mListID
-3, // mListPrio
PROC_Tag_RetRoom, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagRetRm_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x02DB, // mPriority
0, // padding
0, // padding
&daTagRetRm_METHODS, // mSubMtd
0x00040000, // mStatus
0x00, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};
@@ -144,19 +144,14 @@ extern actor_process_profile_definition g_profile_Tag_RmbitSw = {
7,
-3,
PROC_Tag_RmbitSw,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagRmbitSw_c),
0,
0,
&g_fopAc_Method.base,
0x02EC,
0,
0,
&daTagRmbitSw_METHODS,
0x00040000,
0,
0x0E,
0,
0,
};
@@ -33,19 +33,14 @@ extern actor_process_profile_definition g_profile_Tag_Schedule = {
0x0007, // mListID
0xFFFD, // mListPrio
PROC_Tag_Schedule, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagSchedule_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x018C, // mPriority
0, // padding
0, // padding
&l_daTagSchedule_Method, // mSubMtd
0x00040000, // mStatus
0x00, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};
@@ -76,19 +76,14 @@ extern actor_process_profile_definition g_profile_Tag_SetBall = {
7,
0xFFFD,
PROC_Tag_SetBall,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagSetBall_c),
0,
0,
&g_fopAc_Method.base,
0x023F,
0,
0,
&l_daTagSetBall_Method,
0x00040100,
0,
14,
0,
0,
};
@@ -123,19 +123,14 @@ extern actor_process_profile_definition g_profile_Tag_Restart = {
7,
0xFFFD,
PROC_Tag_Restart,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagRestart_c),
0,
0,
&g_fopAc_Method.base,
0x0250,
0,
0,
&l_daTagRestart_Method,
0x00040000,
0,
14,
0,
0,
};
@@ -178,19 +178,14 @@ extern actor_process_profile_definition g_profile_TAG_SHOPITM = {
7, // mListID
-3, // mListPrio
PROC_TAG_SHOPITM, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTag_ShopItem_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x004B, // mPriority
0, // Padding
0, // Padding
&daTag_ShopItem_MethodTable, // mSubMtd
0x00064100, // mStatus
5, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -109,19 +109,14 @@ extern actor_process_profile_definition g_profile_Tag_SmkEmt = {
7, // mListID
-3, // mListPrio
PROC_Tag_SmkEmt, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagSmkEmt_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x02E7, // mPriority
0, // padding
0, // padding
&daTagSmkEmt_METHODS, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};
@@ -119,19 +119,14 @@ extern actor_process_profile_definition g_profile_Tag_Spinner = {
3, // mListID
-3, // mListPrio
PROC_Tag_Spinner, // mProcName
0, // Padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagSpinner_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x025D, // mPriority
0, // Padding
0, // Padding
&l_daTagSpinner_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
14, // mCullType
0, // Padding
0, // Padding
};
@@ -111,19 +111,14 @@ extern actor_process_profile_definition g_profile_Tag_Spring = {
7, // mListID
-3, // mListPrio
PROC_Tag_Spring, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagSpring_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x024B, // mPriority
0, // padding
0, // padding
&l_daTagSpring_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};

Some files were not shown because too many files have changed in this diff Show More