diff --git a/Progress.md b/Progress.md index 66ffecfd238..74d7e52a014 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 41.933985% | 1686028 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 41.933985% | 1686028 | 4020672 -RELs | 34.902251% | 4013872 | 11500324 -Total | 36.723803% | 5699900 | 15520996 +RELs | 34.924199% | 4016396 | 11500324 +Total | 36.740065% | 5702424 | 15520996 ## RELs @@ -602,7 +602,7 @@ d_a_obj_smoke | 100.000000% | 1512 | 1512 d_a_obj_smtile | 35.912938% | 2376 | 6616 d_a_obj_smw_stone | 40.435606% | 1708 | 4224 d_a_obj_snowEffTag | 100.000000% | 3016 | 3016 -d_a_obj_snow_soup | 37.025948% | 1484 | 4008 +d_a_obj_snow_soup | 100.000000% | 4008 | 4008 d_a_obj_so | 31.698636% | 6412 | 20228 d_a_obj_spinLift | 41.107692% | 2672 | 6500 d_a_obj_ss_drink | 36.026542% | 3692 | 10248 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 34.902251% | 4013872 | 11500324 +Total | 34.924199% | 4016396 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/Delete__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/Delete__15daObjSnowSoup_cFv.s deleted file mode 100644 index 390e203e739..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/Delete__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80CDFB70: -/* 80CDFB70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDFB74 7C 08 02 A6 */ mflr r0 -/* 80CDFB78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDFB7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDFB80 7C 7F 1B 78 */ mr r31, r3 -/* 80CDFB84 48 00 04 75 */ bl deleteSmkEmtCommon__15daObjSnowSoup_cFv -/* 80CDFB88 7F E3 FB 78 */ mr r3, r31 -/* 80CDFB8C 88 9F 05 C0 */ lbz r4, 0x5c0(r31) -/* 80CDFB90 48 00 05 A5 */ bl deleteSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFB94 7F E3 FB 78 */ mr r3, r31 -/* 80CDFB98 38 80 FF FF */ li r4, -1 -/* 80CDFB9C 81 9F 05 70 */ lwz r12, 0x570(r31) -/* 80CDFBA0 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CDFBA4 7D 89 03 A6 */ mtctr r12 -/* 80CDFBA8 4E 80 04 21 */ bctrl -/* 80CDFBAC 38 60 00 01 */ li r3, 1 -/* 80CDFBB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDFBB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDFBB8 7C 08 03 A6 */ mtlr r0 -/* 80CDFBBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDFBC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__ct__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__ct__15daObjSnowSoup_cFv.s deleted file mode 100644 index 2c043e3e086..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__ct__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80CDF878: -/* 80CDF878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF87C 7C 08 02 A6 */ mflr r0 -/* 80CDF880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF888 7C 7F 1B 78 */ mr r31, r3 -/* 80CDF88C 4B 33 92 D9 */ bl __ct__10fopAc_ac_cFv -/* 80CDF890 3C 60 80 CE */ lis r3, __vt__15daObjSnowSoup_c@ha /* 0x80CE02D4@ha */ -/* 80CDF894 38 03 02 D4 */ addi r0, r3, __vt__15daObjSnowSoup_c@l /* 0x80CE02D4@l */ -/* 80CDF898 90 1F 05 70 */ stw r0, 0x570(r31) -/* 80CDF89C 38 E0 00 00 */ li r7, 0 -/* 80CDF8A0 38 60 00 00 */ li r3, 0 -/* 80CDF8A4 38 C0 00 00 */ li r6, 0 -lbl_80CDF8A8: -/* 80CDF8A8 38 80 00 00 */ li r4, 0 -/* 80CDF8AC 38 00 00 02 */ li r0, 2 -/* 80CDF8B0 7C 09 03 A6 */ mtctr r0 -lbl_80CDF8B4: -/* 80CDF8B4 7C BF 22 14 */ add r5, r31, r4 -/* 80CDF8B8 38 05 05 9C */ addi r0, r5, 0x59c -/* 80CDF8BC 7C C3 01 2E */ stwx r6, r3, r0 -/* 80CDF8C0 38 84 00 04 */ addi r4, r4, 4 -/* 80CDF8C4 42 00 FF F0 */ bdnz lbl_80CDF8B4 -/* 80CDF8C8 38 E7 00 01 */ addi r7, r7, 1 -/* 80CDF8CC 2C 07 00 03 */ cmpwi r7, 3 -/* 80CDF8D0 38 63 00 08 */ addi r3, r3, 8 -/* 80CDF8D4 41 80 FF D4 */ blt lbl_80CDF8A8 -/* 80CDF8D8 38 7F 05 8C */ addi r3, r31, 0x58c -/* 80CDF8DC 38 80 00 00 */ li r4, 0 -/* 80CDF8E0 38 A0 00 10 */ li r5, 0x10 -/* 80CDF8E4 4B 32 3B 75 */ bl memset -/* 80CDF8E8 38 7F 05 B4 */ addi r3, r31, 0x5b4 -/* 80CDF8EC 38 80 00 00 */ li r4, 0 -/* 80CDF8F0 38 A0 00 0C */ li r5, 0xc -/* 80CDF8F4 4B 32 3B 65 */ bl memset -/* 80CDF8F8 7F E3 FB 78 */ mr r3, r31 -/* 80CDF8FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF900 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF904 7C 08 03 A6 */ mtlr r0 -/* 80CDF908 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF90C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__dt__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__dt__15daObjSnowSoup_cFv.s deleted file mode 100644 index 92b55621063..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__dt__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80CDF910: -/* 80CDF910 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF914 7C 08 02 A6 */ mflr r0 -/* 80CDF918 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF91C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF920 93 C1 00 08 */ stw r30, 8(r1) -/* 80CDF924 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CDF928 7C 9F 23 78 */ mr r31, r4 -/* 80CDF92C 41 82 00 48 */ beq lbl_80CDF974 -/* 80CDF930 3C 60 80 CE */ lis r3, __vt__15daObjSnowSoup_c@ha /* 0x80CE02D4@ha */ -/* 80CDF934 38 03 02 D4 */ addi r0, r3, __vt__15daObjSnowSoup_c@l /* 0x80CE02D4@l */ -/* 80CDF938 90 1E 05 70 */ stw r0, 0x570(r30) -/* 80CDF93C 7F C3 F3 78 */ mr r3, r30 -/* 80CDF940 41 82 00 08 */ beq lbl_80CDF948 -/* 80CDF944 38 63 05 68 */ addi r3, r3, 0x568 -lbl_80CDF948: -/* 80CDF948 3C 80 80 CE */ lis r4, l_arcName@ha /* 0x80CE0280@ha */ -/* 80CDF94C 38 84 02 80 */ addi r4, r4, l_arcName@l /* 0x80CE0280@l */ -/* 80CDF950 80 84 00 00 */ lwz r4, 0(r4) -/* 80CDF954 4B 34 D6 B5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CDF958 7F C3 F3 78 */ mr r3, r30 -/* 80CDF95C 38 80 00 00 */ li r4, 0 -/* 80CDF960 4B 33 93 2D */ bl __dt__10fopAc_ac_cFv -/* 80CDF964 7F E0 07 35 */ extsh. r0, r31 -/* 80CDF968 40 81 00 0C */ ble lbl_80CDF974 -/* 80CDF96C 7F C3 F3 78 */ mr r3, r30 -/* 80CDF970 4B 5E F3 CD */ bl __dl__FPv -lbl_80CDF974: -/* 80CDF974 7F C3 F3 78 */ mr r3, r30 -/* 80CDF978 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF97C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CDF980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF984 7C 08 03 A6 */ mtlr r0 -/* 80CDF988 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF98C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createHeap__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createHeap__15daObjSnowSoup_cFv.s deleted file mode 100644 index 4c13d78acf3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createHeap__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80CDF990: -/* 80CDF990 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CDF994 7C 08 02 A6 */ mflr r0 -/* 80CDF998 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CDF99C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CDF9A0 4B 68 28 2D */ bl _savegpr_25 -/* 80CDF9A4 7C 79 1B 78 */ mr r25, r3 -/* 80CDF9A8 3B 40 00 00 */ li r26, 0 -/* 80CDF9AC 3B E0 00 00 */ li r31, 0 -/* 80CDF9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDF9B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDF9B8 3F 63 00 02 */ addis r27, r3, 2 -/* 80CDF9BC 3C 60 80 CE */ lis r3, l_arcName@ha /* 0x80CE0280@ha */ -/* 80CDF9C0 3B 83 02 80 */ addi r28, r3, l_arcName@l /* 0x80CE0280@l */ -/* 80CDF9C4 3C 60 80 CE */ lis r3, BMD_IDX@ha /* 0x80CE0248@ha */ -/* 80CDF9C8 3B A3 02 48 */ addi r29, r3, BMD_IDX@l /* 0x80CE0248@l */ -/* 80CDF9CC 3F C0 11 00 */ lis r30, 0x1100 -/* 80CDF9D0 3B 7B C2 F8 */ addi r27, r27, -15624 -lbl_80CDF9D4: -/* 80CDF9D4 80 7C 00 00 */ lwz r3, 0(r28) -/* 80CDF9D8 7C 9D F8 2E */ lwzx r4, r29, r31 -/* 80CDF9DC 7F 65 DB 78 */ mr r5, r27 -/* 80CDF9E0 38 C0 00 80 */ li r6, 0x80 -/* 80CDF9E4 4B 35 C9 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CDF9E8 3C 80 00 08 */ lis r4, 8 -/* 80CDF9EC 38 BE 00 84 */ addi r5, r30, 0x84 -/* 80CDF9F0 4B 33 52 65 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CDF9F4 38 1F 05 B4 */ addi r0, r31, 0x5b4 -/* 80CDF9F8 7C 79 01 2E */ stwx r3, r25, r0 -/* 80CDF9FC 7C 19 00 2E */ lwzx r0, r25, r0 -/* 80CDFA00 28 00 00 00 */ cmplwi r0, 0 -/* 80CDFA04 40 82 00 0C */ bne lbl_80CDFA10 -/* 80CDFA08 38 60 00 00 */ li r3, 0 -/* 80CDFA0C 48 00 00 18 */ b lbl_80CDFA24 -lbl_80CDFA10: -/* 80CDFA10 3B 5A 00 01 */ addi r26, r26, 1 -/* 80CDFA14 2C 1A 00 03 */ cmpwi r26, 3 -/* 80CDFA18 3B FF 00 04 */ addi r31, r31, 4 -/* 80CDFA1C 41 80 FF B8 */ blt lbl_80CDF9D4 -/* 80CDFA20 38 60 00 01 */ li r3, 1 -lbl_80CDFA24: -/* 80CDFA24 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CDFA28 4B 68 27 F1 */ bl _restgpr_25 -/* 80CDFA2C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CDFA30 7C 08 03 A6 */ mtlr r0 -/* 80CDFA34 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CDFA38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtChange__15daObjSnowSoup_cFi.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtChange__15daObjSnowSoup_cFi.s deleted file mode 100644 index bc467389ac6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtChange__15daObjSnowSoup_cFi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80CE003C: -/* 80CE003C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80CE0040 7C 08 02 A6 */ mflr r0 -/* 80CE0044 90 01 00 64 */ stw r0, 0x64(r1) -/* 80CE0048 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CE004C 4B 68 21 7D */ bl _savegpr_24 -/* 80CE0050 7C 78 1B 78 */ mr r24, r3 -/* 80CE0054 7C 9A 23 78 */ mr r26, r4 -/* 80CE0058 3C 60 80 CE */ lis r3, SOUP_MODEL_OFFSET@ha /* 0x80CE023C@ha */ -/* 80CE005C 3B 83 02 3C */ addi r28, r3, SOUP_MODEL_OFFSET@l /* 0x80CE023C@l */ -/* 80CE0060 C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 80CE0064 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CE0068 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CE006C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CE0070 38 61 00 20 */ addi r3, r1, 0x20 -/* 80CE0074 38 80 00 00 */ li r4, 0 -/* 80CE0078 38 A0 00 00 */ li r5, 0 -/* 80CE007C 38 C0 00 00 */ li r6, 0 -/* 80CE0080 4B 58 73 75 */ bl __ct__5csXyzFsss -/* 80CE0084 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 80CE0088 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CE008C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CE0090 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CE0094 3B 20 00 00 */ li r25, 0 -/* 80CE0098 3B E0 00 00 */ li r31, 0 -/* 80CE009C 3B C0 00 00 */ li r30, 0 -/* 80CE00A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE00A4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE00A8 57 40 10 3A */ slwi r0, r26, 2 -/* 80CE00AC 3B 7C 00 2C */ addi r27, r28, 0x2c -/* 80CE00B0 7F 7B 02 14 */ add r27, r27, r0 -/* 80CE00B4 57 40 18 38 */ slwi r0, r26, 3 -/* 80CE00B8 7F 58 02 14 */ add r26, r24, r0 -lbl_80CE00BC: -/* 80CE00BC 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80CE00C0 38 80 00 00 */ li r4, 0 -/* 80CE00C4 90 81 00 08 */ stw r4, 8(r1) -/* 80CE00C8 38 00 FF FF */ li r0, -1 -/* 80CE00CC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CE00D0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CE00D4 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CE00D8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CE00DC 38 80 00 00 */ li r4, 0 -/* 80CE00E0 7C BB F2 2E */ lhzx r5, r27, r30 -/* 80CE00E4 38 C1 00 34 */ addi r6, r1, 0x34 -/* 80CE00E8 38 E0 00 00 */ li r7, 0 -/* 80CE00EC 39 01 00 20 */ addi r8, r1, 0x20 -/* 80CE00F0 39 21 00 28 */ addi r9, r1, 0x28 -/* 80CE00F4 39 40 00 FF */ li r10, 0xff -/* 80CE00F8 C0 3C 00 1C */ lfs f1, 0x1c(r28) -/* 80CE00FC 4B 36 C9 95 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CE0100 38 1F 05 9C */ addi r0, r31, 0x59c -/* 80CE0104 7C 7A 01 2E */ stwx r3, r26, r0 -/* 80CE0108 3B 39 00 01 */ addi r25, r25, 1 -/* 80CE010C 2C 19 00 02 */ cmpwi r25, 2 -/* 80CE0110 3B FF 00 04 */ addi r31, r31, 4 -/* 80CE0114 3B DE 00 02 */ addi r30, r30, 2 -/* 80CE0118 41 80 FF A4 */ blt lbl_80CE00BC -/* 80CE011C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CE0120 4B 68 20 F5 */ bl _restgpr_24 -/* 80CE0124 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80CE0128 7C 08 03 A6 */ mtlr r0 -/* 80CE012C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80CE0130 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtCommon__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtCommon__15daObjSnowSoup_cFv.s deleted file mode 100644 index c65e91841b6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtCommon__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80CDFF14: -/* 80CDFF14 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80CDFF18 7C 08 02 A6 */ mflr r0 -/* 80CDFF1C 90 01 00 64 */ stw r0, 0x64(r1) -/* 80CDFF20 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CDFF24 4B 68 22 A9 */ bl _savegpr_25 -/* 80CDFF28 7C 79 1B 78 */ mr r25, r3 -/* 80CDFF2C 3C 60 80 CE */ lis r3, SOUP_MODEL_OFFSET@ha /* 0x80CE023C@ha */ -/* 80CDFF30 3B 63 02 3C */ addi r27, r3, SOUP_MODEL_OFFSET@l /* 0x80CE023C@l */ -/* 80CDFF34 C0 1B 00 18 */ lfs f0, 0x18(r27) -/* 80CDFF38 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80CDFF3C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80CDFF40 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80CDFF44 38 61 00 20 */ addi r3, r1, 0x20 -/* 80CDFF48 38 80 00 00 */ li r4, 0 -/* 80CDFF4C 38 A0 00 00 */ li r5, 0 -/* 80CDFF50 38 C0 00 00 */ li r6, 0 -/* 80CDFF54 4B 58 74 A1 */ bl __ct__5csXyzFsss -/* 80CDFF58 C0 1B 00 1C */ lfs f0, 0x1c(r27) -/* 80CDFF5C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CDFF60 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80CDFF64 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80CDFF68 3B 40 00 00 */ li r26, 0 -/* 80CDFF6C 3B E0 00 00 */ li r31, 0 -/* 80CDFF70 3B C0 00 00 */ li r30, 0 -/* 80CDFF74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDFF78 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDFF7C 3B BB 00 24 */ addi r29, r27, 0x24 -lbl_80CDFF80: -/* 80CDFF80 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80CDFF84 38 80 00 00 */ li r4, 0 -/* 80CDFF88 90 81 00 08 */ stw r4, 8(r1) -/* 80CDFF8C 38 00 FF FF */ li r0, -1 -/* 80CDFF90 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CDFF94 90 81 00 10 */ stw r4, 0x10(r1) -/* 80CDFF98 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CDFF9C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CDFFA0 38 80 00 00 */ li r4, 0 -/* 80CDFFA4 7C BD F2 2E */ lhzx r5, r29, r30 -/* 80CDFFA8 38 C1 00 34 */ addi r6, r1, 0x34 -/* 80CDFFAC 38 E0 00 00 */ li r7, 0 -/* 80CDFFB0 39 01 00 20 */ addi r8, r1, 0x20 -/* 80CDFFB4 39 21 00 28 */ addi r9, r1, 0x28 -/* 80CDFFB8 39 40 00 FF */ li r10, 0xff -/* 80CDFFBC C0 3B 00 1C */ lfs f1, 0x1c(r27) -/* 80CDFFC0 4B 36 CA D1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CDFFC4 38 1F 05 8C */ addi r0, r31, 0x58c -/* 80CDFFC8 7C 79 01 2E */ stwx r3, r25, r0 -/* 80CDFFCC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80CDFFD0 2C 1A 00 04 */ cmpwi r26, 4 -/* 80CDFFD4 3B FF 00 04 */ addi r31, r31, 4 -/* 80CDFFD8 3B DE 00 02 */ addi r30, r30, 2 -/* 80CDFFDC 41 80 FF A4 */ blt lbl_80CDFF80 -/* 80CDFFE0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80CDFFE4 4B 68 22 35 */ bl _restgpr_25 -/* 80CDFFE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80CDFFEC 7C 08 03 A6 */ mtlr r0 -/* 80CDFFF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80CDFFF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/create__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/create__15daObjSnowSoup_cFv.s deleted file mode 100644 index 95faaf01aa7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/create__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80CDFA3C: -/* 80CDFA3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDFA40 7C 08 02 A6 */ mflr r0 -/* 80CDFA44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDFA48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDFA4C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CDFA50 7C 7E 1B 78 */ mr r30, r3 -/* 80CDFA54 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CDFA58 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CDFA5C 40 82 00 1C */ bne lbl_80CDFA78 -/* 80CDFA60 28 1E 00 00 */ cmplwi r30, 0 -/* 80CDFA64 41 82 00 08 */ beq lbl_80CDFA6C -/* 80CDFA68 4B FF FE 11 */ bl __ct__15daObjSnowSoup_cFv -lbl_80CDFA6C: -/* 80CDFA6C 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CDFA70 60 00 00 08 */ ori r0, r0, 8 -/* 80CDFA74 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CDFA78: -/* 80CDFA78 7F C3 F3 78 */ mr r3, r30 -/* 80CDFA7C 28 1E 00 00 */ cmplwi r30, 0 -/* 80CDFA80 41 82 00 08 */ beq lbl_80CDFA88 -/* 80CDFA84 38 7E 05 68 */ addi r3, r30, 0x568 -lbl_80CDFA88: -/* 80CDFA88 3C 80 80 CE */ lis r4, l_arcName@ha /* 0x80CE0280@ha */ -/* 80CDFA8C 38 84 02 80 */ addi r4, r4, l_arcName@l /* 0x80CE0280@l */ -/* 80CDFA90 80 84 00 00 */ lwz r4, 0(r4) -/* 80CDFA94 4B 34 D4 29 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CDFA98 7C 7F 1B 78 */ mr r31, r3 -/* 80CDFA9C 2C 1F 00 04 */ cmpwi r31, 4 -/* 80CDFAA0 40 82 00 B4 */ bne lbl_80CDFB54 -/* 80CDFAA4 7F C3 F3 78 */ mr r3, r30 -/* 80CDFAA8 3C 80 80 CE */ lis r4, daObjSnowSoup_c_createHeap__FP10fopAc_ac_c@ha /* 0x80CDF858@ha */ -/* 80CDFAAC 38 84 F8 58 */ addi r4, r4, daObjSnowSoup_c_createHeap__FP10fopAc_ac_c@l /* 0x80CDF858@l */ -/* 80CDFAB0 38 A0 65 00 */ li r5, 0x6500 -/* 80CDFAB4 4B 33 A9 FD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CDFAB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CDFABC 40 82 00 0C */ bne lbl_80CDFAC8 -/* 80CDFAC0 38 60 00 05 */ li r3, 5 -/* 80CDFAC4 48 00 00 94 */ b lbl_80CDFB58 -lbl_80CDFAC8: -/* 80CDFAC8 7F C3 F3 78 */ mr r3, r30 -/* 80CDFACC 48 00 03 49 */ bl init__15daObjSnowSoup_cFv -/* 80CDFAD0 7F C3 F3 78 */ mr r3, r30 -/* 80CDFAD4 48 00 03 D1 */ bl setModelMtx__15daObjSnowSoup_cFv -/* 80CDFAD8 88 1E 05 C0 */ lbz r0, 0x5c0(r30) -/* 80CDFADC 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFAE0 7C 7E 02 14 */ add r3, r30, r0 -/* 80CDFAE4 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80CDFAE8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CDFAEC 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80CDFAF0 88 1E 05 C0 */ lbz r0, 0x5c0(r30) -/* 80CDFAF4 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFAF8 7C 7E 02 14 */ add r3, r30, r0 -/* 80CDFAFC 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80CDFB00 80 83 00 04 */ lwz r4, 4(r3) -/* 80CDFB04 7F C3 F3 78 */ mr r3, r30 -/* 80CDFB08 4B 33 AA 71 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CDFB0C 7F C3 F3 78 */ mr r3, r30 -/* 80CDFB10 48 00 04 05 */ bl createSmkEmtCommon__15daObjSnowSoup_cFv -/* 80CDFB14 7F C3 F3 78 */ mr r3, r30 -/* 80CDFB18 88 9E 05 C0 */ lbz r4, 0x5c0(r30) -/* 80CDFB1C 48 00 05 21 */ bl createSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFB20 3C 60 80 CE */ lis r3, SOUP_MODEL_OFFSET@ha /* 0x80CE023C@ha */ -/* 80CDFB24 38 63 02 3C */ addi r3, r3, SOUP_MODEL_OFFSET@l /* 0x80CE023C@l */ -/* 80CDFB28 C0 43 00 08 */ lfs f2, 8(r3) -/* 80CDFB2C C0 23 00 04 */ lfs f1, 4(r3) -/* 80CDFB30 C0 03 00 00 */ lfs f0, 0(r3) -/* 80CDFB34 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80CDFB38 D0 3E 05 84 */ stfs f1, 0x584(r30) -/* 80CDFB3C D0 5E 05 88 */ stfs f2, 0x588(r30) -/* 80CDFB40 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80CDFB44 3C 60 80 CE */ lis r3, lit_3706@ha /* 0x80CE0254@ha */ -/* 80CDFB48 C0 03 02 54 */ lfs f0, lit_3706@l(r3) /* 0x80CE0254@l */ -/* 80CDFB4C D0 1E 05 78 */ stfs f0, 0x578(r30) -/* 80CDFB50 D0 5E 05 7C */ stfs f2, 0x57c(r30) -lbl_80CDFB54: -/* 80CDFB54 7F E3 FB 78 */ mr r3, r31 -lbl_80CDFB58: -/* 80CDFB58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDFB5C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CDFB60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDFB64 7C 08 03 A6 */ mtlr r0 -/* 80CDFB68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDFB6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_Delete__FP15daObjSnowSoup_c.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_Delete__FP15daObjSnowSoup_c.s deleted file mode 100644 index 242300890bd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_Delete__FP15daObjSnowSoup_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE01D4: -/* 80CE01D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE01D8 7C 08 02 A6 */ mflr r0 -/* 80CE01DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE01E0 4B FF F9 91 */ bl Delete__15daObjSnowSoup_cFv -/* 80CE01E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE01E8 7C 08 03 A6 */ mtlr r0 -/* 80CE01EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE01F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_c_createHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_c_createHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 792be9ce636..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_c_createHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CDF858: -/* 80CDF858 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF85C 7C 08 02 A6 */ mflr r0 -/* 80CDF860 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF864 48 00 01 2D */ bl createHeap__15daObjSnowSoup_cFv -/* 80CDF868 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF86C 7C 08 03 A6 */ mtlr r0 -/* 80CDF870 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF874 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_create__FP15daObjSnowSoup_c.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_create__FP15daObjSnowSoup_c.s deleted file mode 100644 index dfa36ff3dcc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_create__FP15daObjSnowSoup_c.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CE0180: -/* 80CE0180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE0184 7C 08 02 A6 */ mflr r0 -/* 80CE0188 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE018C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE0190 7C 7F 1B 78 */ mr r31, r3 -/* 80CE0194 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CE0198 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CE019C 40 82 00 1C */ bne lbl_80CE01B8 -/* 80CE01A0 28 1F 00 00 */ cmplwi r31, 0 -/* 80CE01A4 41 82 00 08 */ beq lbl_80CE01AC -/* 80CE01A8 4B FF F6 D1 */ bl __ct__15daObjSnowSoup_cFv -lbl_80CE01AC: -/* 80CE01AC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CE01B0 60 00 00 08 */ ori r0, r0, 8 -/* 80CE01B4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CE01B8: -/* 80CE01B8 7F E3 FB 78 */ mr r3, r31 -/* 80CE01BC 4B FF F8 81 */ bl create__15daObjSnowSoup_cFv -/* 80CE01C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE01C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE01C8 7C 08 03 A6 */ mtlr r0 -/* 80CE01CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE01D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_draw__FP15daObjSnowSoup_c.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_draw__FP15daObjSnowSoup_c.s deleted file mode 100644 index 6a9adef6d55..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_draw__FP15daObjSnowSoup_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE0214: -/* 80CE0214 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE0218 7C 08 02 A6 */ mflr r0 -/* 80CE021C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE0220 4B FF F9 A5 */ bl draw__15daObjSnowSoup_cFv -/* 80CE0224 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE0228 7C 08 03 A6 */ mtlr r0 -/* 80CE022C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE0230 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_execute__FP15daObjSnowSoup_c.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_execute__FP15daObjSnowSoup_c.s deleted file mode 100644 index 592cd18d5e3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_execute__FP15daObjSnowSoup_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE01F4: -/* 80CE01F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE01F8 7C 08 02 A6 */ mflr r0 -/* 80CE01FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE0200 4B FF FA 41 */ bl execute__15daObjSnowSoup_cFv -/* 80CE0204 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE0208 7C 08 03 A6 */ mtlr r0 -/* 80CE020C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE0210 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtChange__15daObjSnowSoup_cFi.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtChange__15daObjSnowSoup_cFi.s deleted file mode 100644 index 9261113e410..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtChange__15daObjSnowSoup_cFi.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80CE0134: -/* 80CE0134 38 A0 00 00 */ li r5, 0 -/* 80CE0138 54 80 18 38 */ slwi r0, r4, 3 -/* 80CE013C 7C C3 02 14 */ add r6, r3, r0 -/* 80CE0140 38 80 00 01 */ li r4, 1 -/* 80CE0144 7C A3 2B 78 */ mr r3, r5 -/* 80CE0148 38 00 00 02 */ li r0, 2 -/* 80CE014C 7C 09 03 A6 */ mtctr r0 -lbl_80CE0150: -/* 80CE0150 39 05 05 9C */ addi r8, r5, 0x59c -/* 80CE0154 7C E6 40 2E */ lwzx r7, r6, r8 -/* 80CE0158 28 07 00 00 */ cmplwi r7, 0 -/* 80CE015C 41 82 00 18 */ beq lbl_80CE0174 -/* 80CE0160 80 07 00 F4 */ lwz r0, 0xf4(r7) -/* 80CE0164 60 00 00 01 */ ori r0, r0, 1 -/* 80CE0168 90 07 00 F4 */ stw r0, 0xf4(r7) -/* 80CE016C 90 87 00 24 */ stw r4, 0x24(r7) -/* 80CE0170 7C 66 41 2E */ stwx r3, r6, r8 -lbl_80CE0174: -/* 80CE0174 38 A5 00 04 */ addi r5, r5, 4 -/* 80CE0178 42 00 FF D8 */ bdnz lbl_80CE0150 -/* 80CE017C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtCommon__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtCommon__15daObjSnowSoup_cFv.s deleted file mode 100644 index 8d22b7381ee..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtCommon__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CDFFF8: -/* 80CDFFF8 38 80 00 00 */ li r4, 0 -/* 80CDFFFC 38 C0 00 01 */ li r6, 1 -/* 80CE0000 7C 85 23 78 */ mr r5, r4 -/* 80CE0004 38 00 00 04 */ li r0, 4 -/* 80CE0008 7C 09 03 A6 */ mtctr r0 -lbl_80CE000C: -/* 80CE000C 39 04 05 8C */ addi r8, r4, 0x58c -/* 80CE0010 7C E3 40 2E */ lwzx r7, r3, r8 -/* 80CE0014 28 07 00 00 */ cmplwi r7, 0 -/* 80CE0018 41 82 00 18 */ beq lbl_80CE0030 -/* 80CE001C 80 07 00 F4 */ lwz r0, 0xf4(r7) -/* 80CE0020 60 00 00 01 */ ori r0, r0, 1 -/* 80CE0024 90 07 00 F4 */ stw r0, 0xf4(r7) -/* 80CE0028 90 C7 00 24 */ stw r6, 0x24(r7) -/* 80CE002C 7C A3 41 2E */ stwx r5, r3, r8 -lbl_80CE0030: -/* 80CE0030 38 84 00 04 */ addi r4, r4, 4 -/* 80CE0034 42 00 FF D8 */ bdnz lbl_80CE000C -/* 80CE0038 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/draw__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/draw__15daObjSnowSoup_cFv.s deleted file mode 100644 index f4bcde51d9d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/draw__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80CDFBC4: -/* 80CDFBC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDFBC8 7C 08 02 A6 */ mflr r0 -/* 80CDFBCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDFBD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDFBD4 7C 7F 1B 78 */ mr r31, r3 -/* 80CDFBD8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CDFBDC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CDFBE0 38 80 00 00 */ li r4, 0 -/* 80CDFBE4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CDFBE8 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80CDFBEC 4B 4C 3B D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CDFBF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CDFBF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CDFBF8 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFBFC 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFC00 7C 9F 02 14 */ add r4, r31, r0 -/* 80CDFC04 80 84 05 B4 */ lwz r4, 0x5b4(r4) -/* 80CDFC08 80 84 00 04 */ lwz r4, 4(r4) -/* 80CDFC0C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80CDFC10 4B 4C 51 91 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CDFC14 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFC18 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFC1C 7C 7F 02 14 */ add r3, r31, r0 -/* 80CDFC20 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80CDFC24 4B 32 E0 09 */ bl mDoExt_modelUpdate__FP8J3DModel -/* 80CDFC28 38 60 00 01 */ li r3, 1 -/* 80CDFC2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDFC30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDFC34 7C 08 03 A6 */ mtlr r0 -/* 80CDFC38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDFC3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/execute__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/execute__15daObjSnowSoup_cFv.s deleted file mode 100644 index d58cf1a7dd2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/execute__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80CDFC40: -/* 80CDFC40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CDFC44 7C 08 02 A6 */ mflr r0 -/* 80CDFC48 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CDFC4C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CDFC50 7C 7F 1B 78 */ mr r31, r3 -/* 80CDFC54 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80CDFC58 7C 03 07 74 */ extsb r3, r0 -/* 80CDFC5C 4B 34 D4 11 */ bl dComIfGp_getReverb__Fi -/* 80CDFC60 7C 67 1B 78 */ mr r7, r3 -/* 80CDFC64 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080204@ha */ -/* 80CDFC68 38 03 02 04 */ addi r0, r3, 0x0204 /* 0x00080204@l */ -/* 80CDFC6C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CDFC70 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CDFC74 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CDFC78 80 63 00 00 */ lwz r3, 0(r3) -/* 80CDFC7C 38 81 00 0C */ addi r4, r1, 0xc -/* 80CDFC80 38 BF 05 80 */ addi r5, r31, 0x580 -/* 80CDFC84 38 C0 00 00 */ li r6, 0 -/* 80CDFC88 3D 00 80 CE */ lis r8, lit_3757@ha /* 0x80CE0258@ha */ -/* 80CDFC8C C0 28 02 58 */ lfs f1, lit_3757@l(r8) /* 0x80CE0258@l */ -/* 80CDFC90 FC 40 08 90 */ fmr f2, f1 -/* 80CDFC94 3D 00 80 CE */ lis r8, lit_3758@ha /* 0x80CE025C@ha */ -/* 80CDFC98 C0 68 02 5C */ lfs f3, lit_3758@l(r8) /* 0x80CE025C@l */ -/* 80CDFC9C FC 80 18 90 */ fmr f4, f3 -/* 80CDFCA0 39 00 00 00 */ li r8, 0 -/* 80CDFCA4 4B 5C C8 69 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CDFCA8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CDFCAC 7C 03 07 74 */ extsb r3, r0 -/* 80CDFCB0 4B 34 D3 BD */ bl dComIfGp_getReverb__Fi -/* 80CDFCB4 7C 67 1B 78 */ mr r7, r3 -/* 80CDFCB8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800A3@ha */ -/* 80CDFCBC 38 03 00 A3 */ addi r0, r3, 0x00A3 /* 0x000800A3@l */ -/* 80CDFCC0 90 01 00 08 */ stw r0, 8(r1) -/* 80CDFCC4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CDFCC8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CDFCCC 80 63 00 00 */ lwz r3, 0(r3) -/* 80CDFCD0 38 81 00 08 */ addi r4, r1, 8 -/* 80CDFCD4 38 BF 05 74 */ addi r5, r31, 0x574 -/* 80CDFCD8 38 C0 00 00 */ li r6, 0 -/* 80CDFCDC 3D 00 80 CE */ lis r8, lit_3757@ha /* 0x80CE0258@ha */ -/* 80CDFCE0 C0 28 02 58 */ lfs f1, lit_3757@l(r8) /* 0x80CE0258@l */ -/* 80CDFCE4 FC 40 08 90 */ fmr f2, f1 -/* 80CDFCE8 3D 00 80 CE */ lis r8, lit_3758@ha /* 0x80CE025C@ha */ -/* 80CDFCEC C0 68 02 5C */ lfs f3, lit_3758@l(r8) /* 0x80CE025C@l */ -/* 80CDFCF0 FC 80 18 90 */ fmr f4, f3 -/* 80CDFCF4 39 00 00 00 */ li r8, 0 -/* 80CDFCF8 4B 5C C8 15 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CDFCFC 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFD00 2C 00 00 01 */ cmpwi r0, 1 -/* 80CDFD04 41 82 00 84 */ beq lbl_80CDFD88 -/* 80CDFD08 40 80 00 EC */ bge lbl_80CDFDF4 -/* 80CDFD0C 2C 00 00 00 */ cmpwi r0, 0 -/* 80CDFD10 40 80 00 0C */ bge lbl_80CDFD1C -/* 80CDFD14 48 00 00 E0 */ b lbl_80CDFDF4 -/* 80CDFD18 48 00 00 DC */ b lbl_80CDFDF4 -lbl_80CDFD1C: -/* 80CDFD1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDFD20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDFD24 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80CDFD28 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CDFD2C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CDFD30 A0 84 00 0E */ lhz r4, 0xe(r4) -/* 80CDFD34 4B 35 4C 89 */ bl isEventBit__11dSv_event_cCFUs -/* 80CDFD38 2C 03 00 00 */ cmpwi r3, 0 -/* 80CDFD3C 41 82 00 B8 */ beq lbl_80CDFDF4 -/* 80CDFD40 7F E3 FB 78 */ mr r3, r31 -/* 80CDFD44 88 9F 05 C0 */ lbz r4, 0x5c0(r31) -/* 80CDFD48 48 00 03 ED */ bl deleteSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFD4C 38 00 00 01 */ li r0, 1 -/* 80CDFD50 98 1F 05 C0 */ stb r0, 0x5c0(r31) -/* 80CDFD54 7F E3 FB 78 */ mr r3, r31 -/* 80CDFD58 88 9F 05 C0 */ lbz r4, 0x5c0(r31) -/* 80CDFD5C 48 00 02 E1 */ bl createSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFD60 7F E3 FB 78 */ mr r3, r31 -/* 80CDFD64 48 00 01 41 */ bl setModelMtx__15daObjSnowSoup_cFv -/* 80CDFD68 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFD6C 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFD70 7C 7F 02 14 */ add r3, r31, r0 -/* 80CDFD74 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80CDFD78 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CDFD7C 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CDFD80 38 60 00 01 */ li r3, 1 -/* 80CDFD84 48 00 00 7C */ b lbl_80CDFE00 -lbl_80CDFD88: -/* 80CDFD88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDFD8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDFD90 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80CDFD94 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CDFD98 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CDFD9C A0 84 00 10 */ lhz r4, 0x10(r4) -/* 80CDFDA0 4B 35 4C 1D */ bl isEventBit__11dSv_event_cCFUs -/* 80CDFDA4 2C 03 00 00 */ cmpwi r3, 0 -/* 80CDFDA8 41 82 00 4C */ beq lbl_80CDFDF4 -/* 80CDFDAC 7F E3 FB 78 */ mr r3, r31 -/* 80CDFDB0 88 9F 05 C0 */ lbz r4, 0x5c0(r31) -/* 80CDFDB4 48 00 03 81 */ bl deleteSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFDB8 38 00 00 02 */ li r0, 2 -/* 80CDFDBC 98 1F 05 C0 */ stb r0, 0x5c0(r31) -/* 80CDFDC0 7F E3 FB 78 */ mr r3, r31 -/* 80CDFDC4 88 9F 05 C0 */ lbz r4, 0x5c0(r31) -/* 80CDFDC8 48 00 02 75 */ bl createSmkEmtChange__15daObjSnowSoup_cFi -/* 80CDFDCC 7F E3 FB 78 */ mr r3, r31 -/* 80CDFDD0 48 00 00 D5 */ bl setModelMtx__15daObjSnowSoup_cFv -/* 80CDFDD4 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFDD8 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFDDC 7C 7F 02 14 */ add r3, r31, r0 -/* 80CDFDE0 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80CDFDE4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CDFDE8 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CDFDEC 38 60 00 01 */ li r3, 1 -/* 80CDFDF0 48 00 00 10 */ b lbl_80CDFE00 -lbl_80CDFDF4: -/* 80CDFDF4 7F E3 FB 78 */ mr r3, r31 -/* 80CDFDF8 48 00 00 AD */ bl setModelMtx__15daObjSnowSoup_cFv -/* 80CDFDFC 38 60 00 01 */ li r3, 1 -lbl_80CDFE00: -/* 80CDFE00 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CDFE04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CDFE08 7C 08 03 A6 */ mtlr r0 -/* 80CDFE0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CDFE10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/init__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/init__15daObjSnowSoup_cFv.s deleted file mode 100644 index b57afd3c7b2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/init__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80CDFE14: -/* 80CDFE14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDFE18 7C 08 02 A6 */ mflr r0 -/* 80CDFE1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDFE20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDFE24 93 C1 00 08 */ stw r30, 8(r1) -/* 80CDFE28 7C 7E 1B 78 */ mr r30, r3 -/* 80CDFE2C 38 00 00 00 */ li r0, 0 -/* 80CDFE30 98 03 05 C0 */ stb r0, 0x5c0(r3) -/* 80CDFE34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDFE38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDFE3C 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 80CDFE40 7F E3 FB 78 */ mr r3, r31 -/* 80CDFE44 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CDFE48 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CDFE4C A0 84 00 10 */ lhz r4, 0x10(r4) -/* 80CDFE50 4B 35 4B 6D */ bl isEventBit__11dSv_event_cCFUs -/* 80CDFE54 2C 03 00 00 */ cmpwi r3, 0 -/* 80CDFE58 41 82 00 10 */ beq lbl_80CDFE68 -/* 80CDFE5C 38 00 00 02 */ li r0, 2 -/* 80CDFE60 98 1E 05 C0 */ stb r0, 0x5c0(r30) -/* 80CDFE64 48 00 00 28 */ b lbl_80CDFE8C -lbl_80CDFE68: -/* 80CDFE68 7F E3 FB 78 */ mr r3, r31 -/* 80CDFE6C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80CDFE70 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80CDFE74 A0 84 00 0E */ lhz r4, 0xe(r4) -/* 80CDFE78 4B 35 4B 45 */ bl isEventBit__11dSv_event_cCFUs -/* 80CDFE7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CDFE80 41 82 00 0C */ beq lbl_80CDFE8C -/* 80CDFE84 38 00 00 01 */ li r0, 1 -/* 80CDFE88 98 1E 05 C0 */ stb r0, 0x5c0(r30) -lbl_80CDFE8C: -/* 80CDFE8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDFE90 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CDFE94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDFE98 7C 08 03 A6 */ mtlr r0 -/* 80CDFE9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDFEA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/setModelMtx__15daObjSnowSoup_cFv.s b/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/setModelMtx__15daObjSnowSoup_cFv.s deleted file mode 100644 index 048522cac70..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/setModelMtx__15daObjSnowSoup_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CDFEA4: -/* 80CDFEA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDFEA8 7C 08 02 A6 */ mflr r0 -/* 80CDFEAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDFEB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDFEB4 7C 7F 1B 78 */ mr r31, r3 -/* 80CDFEB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CDFEBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CDFEC0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CDFEC4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CDFEC8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CDFECC 4B 66 6A 1D */ bl PSMTXTrans -/* 80CDFED0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CDFED4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CDFED8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80CDFEDC 4B 32 C5 59 */ bl mDoMtx_YrotM__FPA4_fs -/* 80CDFEE0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CDFEE4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CDFEE8 88 1F 05 C0 */ lbz r0, 0x5c0(r31) -/* 80CDFEEC 54 00 10 3A */ slwi r0, r0, 2 -/* 80CDFEF0 7C 9F 02 14 */ add r4, r31, r0 -/* 80CDFEF4 80 84 05 B4 */ lwz r4, 0x5b4(r4) -/* 80CDFEF8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CDFEFC 4B 66 65 B5 */ bl PSMTXCopy -/* 80CDFF00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDFF04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDFF08 7C 08 03 A6 */ mtlr r0 -/* 80CDFF0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDFF10 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h b/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h index bf7f37ffafd..3bda5b4d141 100644 --- a/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h +++ b/include/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h @@ -1,6 +1,34 @@ #ifndef D_A_OBJ_SNOW_SOUP_H #define D_A_OBJ_SNOW_SOUP_H -#include "dolphin/types.h" +#include "JSystem/JParticle/JPAEmitter.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.h" + +class daObjSnowSoup_c : public fopAc_ac_c, public request_of_phase_process_class { +public: + /* 80CDF878 */ daObjSnowSoup_c(); + /* 80CDF910 */ virtual ~daObjSnowSoup_c(); + /* 80CDF990 */ int createHeap(); + /* 80CDFA3C */ cPhs__Step create(); + /* 80CDFB70 */ int Delete(); + /* 80CDFBC4 */ int draw(); + /* 80CDFC40 */ int execute(); + /* 80CDFE14 */ void init(); + /* 80CDFEA4 */ void setModelMtx(); + /* 80CDFF14 */ void createSmkEmtCommon(); + /* 80CDFFF8 */ void deleteSmkEmtCommon(); + /* 80CE003C */ void createSmkEmtChange(int); + /* 80CE0134 */ void deleteSmkEmtChange(int); + + /* 0x574 */ cXyz mFirewoodPos; + /* 0x580 */ cXyz mBubblePos; + /* 0x58C */ JPABaseEmitter* mpSmkEmtCommon[4]; + /* 0x59C */ JPABaseEmitter* mpSmkEmtChange[3][2]; + /* 0x5B4 */ J3DModel* mpModel[3]; + /* 0x5C0 */ u8 mState; +}; + +STATIC_ASSERT(sizeof(daObjSnowSoup_c) == 0x5C4); #endif /* D_A_OBJ_SNOW_SOUP_H */ diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index b07f756ae74..944fbf672e8 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -4,429 +4,228 @@ // #include "rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjSnowSoup_c { - /* 80CDF878 */ daObjSnowSoup_c(); - /* 80CDF910 */ ~daObjSnowSoup_c(); - /* 80CDF990 */ void createHeap(); - /* 80CDFA3C */ void create(); - /* 80CDFB70 */ void Delete(); - /* 80CDFBC4 */ void draw(); - /* 80CDFC40 */ void execute(); - /* 80CDFE14 */ void init(); - /* 80CDFEA4 */ void setModelMtx(); - /* 80CDFF14 */ void createSmkEmtCommon(); - /* 80CDFFF8 */ void deleteSmkEmtCommon(); - /* 80CE003C */ void createSmkEmtChange(int); - /* 80CE0134 */ void deleteSmkEmtChange(int); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -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); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void daObjSnowSoup_c_createHeap__FP10fopAc_ac_c(); -extern "C" void __ct__15daObjSnowSoup_cFv(); -extern "C" void __dt__15daObjSnowSoup_cFv(); -extern "C" void createHeap__15daObjSnowSoup_cFv(); -extern "C" void create__15daObjSnowSoup_cFv(); -extern "C" void Delete__15daObjSnowSoup_cFv(); -extern "C" void draw__15daObjSnowSoup_cFv(); -extern "C" void execute__15daObjSnowSoup_cFv(); -extern "C" void init__15daObjSnowSoup_cFv(); -extern "C" void setModelMtx__15daObjSnowSoup_cFv(); -extern "C" void createSmkEmtCommon__15daObjSnowSoup_cFv(); -extern "C" void deleteSmkEmtCommon__15daObjSnowSoup_cFv(); -extern "C" void createSmkEmtChange__15daObjSnowSoup_cFi(); -extern "C" void deleteSmkEmtChange__15daObjSnowSoup_cFi(); -extern "C" static void daObjSnowSoup_create__FP15daObjSnowSoup_c(); -extern "C" static void daObjSnowSoup_Delete__FP15daObjSnowSoup_c(); -extern "C" static void daObjSnowSoup_execute__FP15daObjSnowSoup_c(); -extern "C" static void daObjSnowSoup_draw__FP15daObjSnowSoup_c(); -extern "C" extern char const* const d_a_obj_snow_soup__stringBase0; - -// -// External References: -// - -SECTION_INIT void memset(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdate__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "MSL_C/MSL_Common/Src/string.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" /* 80CDF858-80CDF878 000078 0020+00 1/1 0/0 0/0 .text daObjSnowSoup_c_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSnowSoup_c_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_c_createHeap__FP10fopAc_ac_c.s" +static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CE0274 = "SnowSoup"; -#pragma pop /* 80CE0280-80CE0284 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_snow_soup__stringBase0; +static char* l_arcName = "SnowSoup"; -/* 80CE0284-80CE02A4 -00001 0020+00 1/0 0/0 0/0 .data daObjSnowSoup_METHODS */ -SECTION_DATA static void* daObjSnowSoup_METHODS[8] = { - (void*)daObjSnowSoup_create__FP15daObjSnowSoup_c, - (void*)daObjSnowSoup_Delete__FP15daObjSnowSoup_c, - (void*)daObjSnowSoup_execute__FP15daObjSnowSoup_c, - (void*)NULL, - (void*)daObjSnowSoup_draw__FP15daObjSnowSoup_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CE02A4-80CE02D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SnowSoup */ -SECTION_DATA extern void* g_profile_Obj_SnowSoup[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x019B0000, (void*)&g_fpcLf_Method, - (void*)0x000005C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E20000, (void*)&daObjSnowSoup_METHODS, - (void*)0x00044100, (void*)0x030E0000, -}; - -/* 80CE02D4-80CE02E0 000054 000C+00 2/2 0/0 0/0 .data __vt__15daObjSnowSoup_c */ -SECTION_DATA extern void* __vt__15daObjSnowSoup_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daObjSnowSoup_cFv, -}; +/* 80CE023C-80CE0248 000000 000C+00 3/3 0/0 0/0 .rodata SOUP_MODEL_OFFSET */ +static Vec const SOUP_MODEL_OFFSET = {3317.86f, 214.73f, 323.3f}; /* 80CDF878-80CDF910 000098 0098+00 2/2 0/0 0/0 .text __ct__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjSnowSoup_c::daObjSnowSoup_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__ct__15daObjSnowSoup_cFv.s" +daObjSnowSoup_c::daObjSnowSoup_c() { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 2; j++) { + mpSmkEmtChange[i][j] = NULL; + } + } + memset(mpSmkEmtCommon, 0, 0x10); + memset(mpModel, 0, 0xc); } -#pragma pop /* 80CDF910-80CDF990 000130 0080+00 1/0 0/0 0/0 .text __dt__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjSnowSoup_c::~daObjSnowSoup_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/__dt__15daObjSnowSoup_cFv.s" +daObjSnowSoup_c::~daObjSnowSoup_c() { + dComIfG_resDelete(this, l_arcName); } -#pragma pop - -/* ############################################################################################## */ -/* 80CE023C-80CE0248 000000 000C+00 3/3 0/0 0/0 .rodata SOUP_MODEL_OFFSET */ -SECTION_RODATA static u8 const SOUP_MODEL_OFFSET[12] = { - 0x45, 0x4F, 0x5D, 0xC3, 0x43, 0x56, 0xBA, 0xE1, 0x43, 0xA1, 0xA6, 0x66, -}; -COMPILER_STRIP_GATE(0x80CE023C, &SOUP_MODEL_OFFSET); - -/* 80CE0248-80CE0254 00000C 000C+00 1/1 0/0 0/0 .rodata BMD_IDX$3657 */ -SECTION_RODATA static u8 const BMD_IDX[12] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80CE0248, &BMD_IDX); /* 80CDF990-80CDFA3C 0001B0 00AC+00 1/1 0/0 0/0 .text createHeap__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::createHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createHeap__15daObjSnowSoup_cFv.s" +int daObjSnowSoup_c::createHeap() { + static u32 const BMD_IDX[3] = {3, 4, 5}; + for (int i = 0; i < 3; i++) { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMD_IDX[i]); + mpModel[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel[i] == NULL) { + return false; + } + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 80CE0254-80CE0258 000018 0004+00 1/3 0/0 0/0 .rodata @3706 */ -SECTION_RODATA static u8 const lit_3706[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CE0254, &lit_3706); /* 80CDFA3C-80CDFB70 00025C 0134+00 1/1 0/0 0/0 .text create__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/create__15daObjSnowSoup_cFv.s" +cPhs__Step daObjSnowSoup_c::create() { + fopAcM_SetupActor(this, daObjSnowSoup_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(this, l_arcName); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, daObjSnowSoup_c_createHeap, 0x6500)) { + return cPhs_ERROR_e; + } + init(); + setModelMtx(); + fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel[mState]->getModelData()); + createSmkEmtCommon(); + createSmkEmtChange(mState); + mBubblePos.set(SOUP_MODEL_OFFSET.x, SOUP_MODEL_OFFSET.y, SOUP_MODEL_OFFSET.z); + mFirewoodPos.set(SOUP_MODEL_OFFSET.x, 0.0f, SOUP_MODEL_OFFSET.z); + } + return step; } -#pragma pop /* 80CDFB70-80CDFBC4 000390 0054+00 1/1 0/0 0/0 .text Delete__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/Delete__15daObjSnowSoup_cFv.s" +int daObjSnowSoup_c::Delete() { + deleteSmkEmtCommon(); + deleteSmkEmtChange(mState); + this->~daObjSnowSoup_c(); + return 1; } -#pragma pop /* 80CDFBC4-80CDFC40 0003E4 007C+00 1/1 0/0 0/0 .text draw__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/draw__15daObjSnowSoup_cFv.s" +int daObjSnowSoup_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[mState]->mModelData, &mTevStr); + mDoExt_modelUpdate(mpModel[mState]); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CE0258-80CE025C 00001C 0004+00 1/3 0/0 0/0 .rodata @3757 */ -SECTION_RODATA static f32 const lit_3757 = 1.0f; -COMPILER_STRIP_GATE(0x80CE0258, &lit_3757); - -/* 80CE025C-80CE0260 000020 0004+00 1/1 0/0 0/0 .rodata @3758 */ -SECTION_RODATA static f32 const lit_3758 = -1.0f; -COMPILER_STRIP_GATE(0x80CE025C, &lit_3758); /* 80CDFC40-80CDFE14 000460 01D4+00 1/1 0/0 0/0 .text execute__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/execute__15daObjSnowSoup_cFv.s" +int daObjSnowSoup_c::execute() { + i_mDoAud_seStartLevel(Z2SE_OBJ_NABE_BUBBLE, &mBubblePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + i_mDoAud_seStartLevel(Z2SE_OBJ_FIREWOOD_BURNING, &mFirewoodPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + switch (mState) { + case 0: + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { + deleteSmkEmtChange(mState); + mState = 1; + createSmkEmtChange(mState); + setModelMtx(); + fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx()); + return 1; + } + break; + case 1: + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { + deleteSmkEmtChange(mState); + mState = 2; + createSmkEmtChange(mState); + setModelMtx(); + fopAcM_SetMtx(this, mpModel[mState]->getBaseTRMtx()); + return 1; + } + break; + case 2: + break; + } + setModelMtx(); + return 1; } -#pragma pop /* 80CDFE14-80CDFEA4 000634 0090+00 1/1 0/0 0/0 .text init__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/init__15daObjSnowSoup_cFv.s" +void daObjSnowSoup_c::init() { + mState = 0; + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { + mState = 2; + } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { + mState = 1; + } } -#pragma pop /* 80CDFEA4-80CDFF14 0006C4 0070+00 2/2 0/0 0/0 .text setModelMtx__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::setModelMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/setModelMtx__15daObjSnowSoup_cFv.s" +void daObjSnowSoup_c::setModelMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel[mState]->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80CE0260-80CE0268 000024 0008+00 0/1 0/0 0/0 .rodata PARTICLE_NAME$3789 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const PARTICLE_NAME_3789[8] = { - 0x87, 0xE1, 0x87, 0xE2, 0x87, 0xE3, 0x87, 0xE6, -}; -COMPILER_STRIP_GATE(0x80CE0260, &PARTICLE_NAME_3789); -#pragma pop /* 80CDFF14-80CDFFF8 000734 00E4+00 1/1 0/0 0/0 .text createSmkEmtCommon__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::createSmkEmtCommon() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtCommon__15daObjSnowSoup_cFv.s" +void daObjSnowSoup_c::createSmkEmtCommon() { + static u16 const PARTICLE_NAME[4] = {0x87E1, 0x87E2, 0x87E3, 0x87E6}; + cXyz vec1(0.0f, 0.0f, 0.0f); + csXyz vec2(0, 0, 0); + cXyz vec3(1.0f, 1.0f, 1.0f); + for (int i = 0; i < 4; i++) { + mpSmkEmtCommon[i] = dComIfGp_particle_set(PARTICLE_NAME[i], &vec1, &vec2, &vec3); + } } -#pragma pop /* 80CDFFF8-80CE003C 000818 0044+00 1/1 0/0 0/0 .text deleteSmkEmtCommon__15daObjSnowSoup_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::deleteSmkEmtCommon() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtCommon__15daObjSnowSoup_cFv.s" +void daObjSnowSoup_c::deleteSmkEmtCommon() { + for (int i = 0; i < 4; i++) { + if (mpSmkEmtCommon[i] != NULL) { + mpSmkEmtCommon[i]->becomeInvalidEmitter(); + mpSmkEmtCommon[i] = NULL; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CE0268-80CE0274 00002C 000C+00 0/1 0/0 0/0 .rodata PARTICLE_NAME$3834 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const PARTICLE_NAME_3834[12] = { - 0x89, 0x84, 0x89, 0x85, 0x8A, 0x8B, 0x8A, 0x8D, 0x8A, 0x8C, 0x8A, 0x8E, -}; -COMPILER_STRIP_GATE(0x80CE0268, &PARTICLE_NAME_3834); -#pragma pop /* 80CE003C-80CE0134 00085C 00F8+00 2/2 0/0 0/0 .text createSmkEmtChange__15daObjSnowSoup_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::createSmkEmtChange(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/createSmkEmtChange__15daObjSnowSoup_cFi.s" +void daObjSnowSoup_c::createSmkEmtChange(int i_state) { + static u16 const PARTICLE_NAME[3][2] = {{0x8984, 0x8985}, {0x8A8B, 0x8A8D}, {0x8A8C, 0x8A8E}}; + cXyz vec1(0.0f, 0.0f, 0.0f); + csXyz vec2(0, 0, 0); + cXyz vec3(1.0f, 1.0f, 1.0f); + for (int i = 0; i < 2; i++) { + mpSmkEmtChange[i_state][i] = + dComIfGp_particle_set(PARTICLE_NAME[i_state][i], &vec1, &vec2, &vec3); + } } -#pragma pop /* 80CE0134-80CE0180 000954 004C+00 2/2 0/0 0/0 .text deleteSmkEmtChange__15daObjSnowSoup_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSnowSoup_c::deleteSmkEmtChange(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/deleteSmkEmtChange__15daObjSnowSoup_cFi.s" +void daObjSnowSoup_c::deleteSmkEmtChange(int i_state) { + for (int i = 0; i < 2; i++) { + if (mpSmkEmtChange[i_state][i] != NULL) { + mpSmkEmtChange[i_state][i]->becomeInvalidEmitter(); + mpSmkEmtChange[i_state][i] = NULL; + } + } } -#pragma pop /* 80CE0180-80CE01D4 0009A0 0054+00 1/0 0/0 0/0 .text daObjSnowSoup_create__FP15daObjSnowSoup_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSnowSoup_create(daObjSnowSoup_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_create__FP15daObjSnowSoup_c.s" + +static cPhs__Step daObjSnowSoup_create(daObjSnowSoup_c* i_this) { + fopAcM_SetupActor(i_this, daObjSnowSoup_c); + return i_this->create(); } -#pragma pop /* 80CE01D4-80CE01F4 0009F4 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_Delete__FP15daObjSnowSoup_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSnowSoup_Delete(daObjSnowSoup_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_Delete__FP15daObjSnowSoup_c.s" +static int daObjSnowSoup_Delete(daObjSnowSoup_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80CE01F4-80CE0214 000A14 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_execute__FP15daObjSnowSoup_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSnowSoup_execute(daObjSnowSoup_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_execute__FP15daObjSnowSoup_c.s" +static int daObjSnowSoup_execute(daObjSnowSoup_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80CE0214-80CE0234 000A34 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_draw__FP15daObjSnowSoup_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjSnowSoup_draw(daObjSnowSoup_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup/daObjSnowSoup_draw__FP15daObjSnowSoup_c.s" +static int daObjSnowSoup_draw(daObjSnowSoup_c* i_this) { + return i_this->draw(); } -#pragma pop -/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CE0284-80CE02A4 -00001 0020+00 1/0 0/0 0/0 .data daObjSnowSoup_METHODS */ +static actor_method_class daObjSnowSoup_METHODS = { + (process_method_func)daObjSnowSoup_create, + (process_method_func)daObjSnowSoup_Delete, + (process_method_func)daObjSnowSoup_execute, + (process_method_func)NULL, + (process_method_func)daObjSnowSoup_draw, +}; + +/* 80CE02A4-80CE02D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SnowSoup */ +extern actor_process_profile_definition g_profile_Obj_SnowSoup = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_SnowSoup, + &g_fpcLf_Method.mBase, + sizeof(daObjSnowSoup_c), + 0, + 0, + &g_fopAc_Method.base, + 0x2E2, + &daObjSnowSoup_METHODS, + 0x44100, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, +};