From 9f55d3f37a5f07a00c371352e6c64a066af36093 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sat, 4 May 2024 11:14:34 +0300 Subject: [PATCH] d_a_obj_balloon OK, d_a_balloon_2D mostly done. (#2145) * d_a_obj_balloon OK * Work on d_a_balloon_2D --- .../__dt__Q213daBalloon2D_c10CHeadScoreFv.s | 17 - ...ddScoreCount__13daBalloon2D_cFP4cXyzUlUc.s | 52 - .../create__13daBalloon2D_cFv.s | 41 - .../daBalloon2D_createHeap__FP10fopAc_ac_c.s | 9 - .../daBalloon2D_destroy__FP13daBalloon2D_c.s | 9 - .../daBalloon2D_draw__FP13daBalloon2D_c.s | 9 - .../daBalloon2D_execute__FP13daBalloon2D_c.s | 9 - .../destroy__13daBalloon2D_cFv.s | 25 - .../draw__Q213daBalloon2D_c6c_listFv.s | 20 - .../execute__13daBalloon2D_cFv.s | 18 - .../setBalloonSize__13daBalloon2D_cFUc.s | 47 - .../setComboCount__13daBalloon2D_cFUcUc.s | 29 - .../setComboNum__13daBalloon2D_cFUc.s | 64 - .../setScoreCount__13daBalloon2D_cFUl.s | 13 - .../setScoreNum__13daBalloon2D_cFi.s | 124 -- .../CreateHeap__15daObj_Balloon_cFv.s | 58 - .../__ct__19daObj_Balloon_HIO_cFv.s | 19 - .../d_a_obj_balloon/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_balloon/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s | 30 - .../__dt__19daObj_Balloon_HIO_cFv.s | 20 - .../d_a_obj_balloon/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_balloon/__dt__8cM3dGSphFv.s | 20 - .../__sinit_d_a_obj_balloon_cpp.s | 16 - .../_delete__15daObj_Balloon_cFv.s | 32 - .../action__15daObj_Balloon_cFv.s | 314 ----- .../cc_set__15daObj_Balloon_cFv.s | 44 - .../create__15daObj_Balloon_cFv.s | 163 --- ...aObj_Balloon_Create__FP15daObj_Balloon_c.s | 9 - ...aObj_Balloon_Delete__FP15daObj_Balloon_c.s | 9 - .../daObj_Balloon_Draw__FP15daObj_Balloon_c.s | 9 - ...Obj_Balloon_Execute__FP15daObj_Balloon_c.s | 9 - .../draw__15daObj_Balloon_cFv.s | 57 - .../execute__15daObj_Balloon_cFv.s | 17 - .../d_a_obj_balloon/func_80BA8DE8.s | 3 - .../d_a_obj_balloon/func_80BA8DF0.s | 3 - .../mtx_set__15daObj_Balloon_cFv.s | 29 - .../saveBestScore__15daObj_Balloon_cFv.s | 7 - .../useHeapInit__FP10fopAc_ac_c.s | 9 - include/d/meter/d_meter2_info.h | 11 + .../rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h | 160 +++ .../d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h | 45 + rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp | 640 ++++++---- .../a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp | 1126 +++++------------ 45 files changed, 930 insertions(+), 2511 deletions(-) delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__Q213daBalloon2D_c10CHeadScoreFv.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/addScoreCount__13daBalloon2D_cFP4cXyzUlUc.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/create__13daBalloon2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_createHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_destroy__FP13daBalloon2D_c.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_draw__FP13daBalloon2D_c.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_execute__FP13daBalloon2D_c.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/destroy__13daBalloon2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__Q213daBalloon2D_c6c_listFv.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/execute__13daBalloon2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setBalloonSize__13daBalloon2D_cFUc.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboCount__13daBalloon2D_cFUcUc.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboNum__13daBalloon2D_cFUc.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreCount__13daBalloon2D_cFUl.s delete mode 100644 asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreNum__13daBalloon2D_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/CreateHeap__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__ct__19daObj_Balloon_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__19daObj_Balloon_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__sinit_d_a_obj_balloon_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/_delete__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/action__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/cc_set__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/create__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Create__FP15daObj_Balloon_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Delete__FP15daObj_Balloon_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Draw__FP15daObj_Balloon_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Execute__FP15daObj_Balloon_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/draw__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/execute__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DE8.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DF0.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/mtx_set__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/saveBestScore__15daObj_Balloon_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/useHeapInit__FP10fopAc_ac_c.s diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__Q213daBalloon2D_c10CHeadScoreFv.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__Q213daBalloon2D_c10CHeadScoreFv.s deleted file mode 100644 index a6987b1793..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__Q213daBalloon2D_c10CHeadScoreFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80655304: -/* 80655304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80655308 7C 08 02 A6 */ mflr r0 -/* 8065530C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80655310 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80655314 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80655318 41 82 00 10 */ beq lbl_80655328 -/* 8065531C 7C 80 07 35 */ extsh. r0, r4 -/* 80655320 40 81 00 08 */ ble lbl_80655328 -/* 80655324 4B C7 9A 19 */ bl __dl__FPv -lbl_80655328: -/* 80655328 7F E3 FB 78 */ mr r3, r31 -/* 8065532C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80655330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80655334 7C 08 03 A6 */ mtlr r0 -/* 80655338 38 21 00 10 */ addi r1, r1, 0x10 -/* 8065533C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/addScoreCount__13daBalloon2D_cFP4cXyzUlUc.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/addScoreCount__13daBalloon2D_cFP4cXyzUlUc.s deleted file mode 100644 index 84ac99b0f7..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/addScoreCount__13daBalloon2D_cFP4cXyzUlUc.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80653FEC: -/* 80653FEC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80653FF0 7C 08 02 A6 */ mflr r0 -/* 80653FF4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80653FF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80653FFC 4B D0 E1 E1 */ bl _savegpr_29 -/* 80654000 7C 7D 1B 78 */ mr r29, r3 -/* 80654004 7C BE 2B 78 */ mr r30, r5 -/* 80654008 7C DF 33 78 */ mr r31, r6 -/* 8065400C 38 C0 00 00 */ li r6, 0 -/* 80654010 38 00 00 13 */ li r0, 0x13 -/* 80654014 7C 09 03 A6 */ mtctr r0 -lbl_80654018: -/* 80654018 20 A6 00 13 */ subfic r5, r6, 0x13 -/* 8065401C 38 05 FF FF */ addi r0, r5, -1 -/* 80654020 54 00 20 36 */ slwi r0, r0, 4 -/* 80654024 7C 7D 02 14 */ add r3, r29, r0 -/* 80654028 C0 03 05 F8 */ lfs f0, 0x5f8(r3) -/* 8065402C 54 A0 20 36 */ slwi r0, r5, 4 -/* 80654030 7C BD 02 14 */ add r5, r29, r0 -/* 80654034 D0 05 05 F8 */ stfs f0, 0x5f8(r5) -/* 80654038 C0 03 05 FC */ lfs f0, 0x5fc(r3) -/* 8065403C D0 05 05 FC */ stfs f0, 0x5fc(r5) -/* 80654040 C0 03 06 00 */ lfs f0, 0x600(r3) -/* 80654044 D0 05 06 00 */ stfs f0, 0x600(r5) -/* 80654048 A0 03 06 04 */ lhz r0, 0x604(r3) -/* 8065404C B0 05 06 04 */ sth r0, 0x604(r5) -/* 80654050 88 03 06 06 */ lbz r0, 0x606(r3) -/* 80654054 98 05 06 06 */ stb r0, 0x606(r5) -/* 80654058 88 03 06 07 */ lbz r0, 0x607(r3) -/* 8065405C 98 05 06 07 */ stb r0, 0x607(r5) -/* 80654060 38 C6 00 01 */ addi r6, r6, 1 -/* 80654064 42 00 FF B4 */ bdnz lbl_80654018 -/* 80654068 7C 83 23 78 */ mr r3, r4 -/* 8065406C 38 81 00 08 */ addi r4, r1, 8 -/* 80654070 4B 9C 12 A1 */ bl mDoLib_project__FP3VecP3Vec -/* 80654074 C0 01 00 08 */ lfs f0, 8(r1) -/* 80654078 D0 1D 05 F8 */ stfs f0, 0x5f8(r29) -/* 8065407C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80654080 D0 1D 05 FC */ stfs f0, 0x5fc(r29) -/* 80654084 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80654088 D0 1D 06 00 */ stfs f0, 0x600(r29) -/* 8065408C B3 DD 06 04 */ sth r30, 0x604(r29) -/* 80654090 38 00 00 3C */ li r0, 0x3c -/* 80654094 98 1D 06 06 */ stb r0, 0x606(r29) -/* 80654098 9B FD 06 07 */ stb r31, 0x607(r29) -/* 8065409C 39 61 00 30 */ addi r11, r1, 0x30 -/* 806540A0 4B D0 E1 89 */ bl _restgpr_29 -/* 806540A4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 806540A8 7C 08 03 A6 */ mtlr r0 -/* 806540AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 806540B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/create__13daBalloon2D_cFv.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/create__13daBalloon2D_cFv.s deleted file mode 100644 index 2c91ee0887..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/create__13daBalloon2D_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80653D24: -/* 80653D24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80653D28 7C 08 02 A6 */ mflr r0 -/* 80653D2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653D30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80653D34 93 C1 00 08 */ stw r30, 8(r1) -/* 80653D38 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80653D3C 41 82 00 08 */ beq lbl_80653D44 -/* 80653D40 38 63 05 68 */ addi r3, r3, 0x568 -lbl_80653D44: -/* 80653D44 3C 80 80 65 */ lis r4, l_arcName@ha /* 0x806556D4@ha */ -/* 80653D48 38 84 56 D4 */ addi r4, r4, l_arcName@l /* 0x806556D4@l */ -/* 80653D4C 80 84 00 00 */ lwz r4, 0(r4) -/* 80653D50 4B 9D 91 6D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80653D54 7C 7F 1B 78 */ mr r31, r3 -/* 80653D58 2C 1F 00 04 */ cmpwi r31, 4 -/* 80653D5C 40 82 00 3C */ bne lbl_80653D98 -/* 80653D60 7F C3 F3 78 */ mr r3, r30 -/* 80653D64 3C 80 80 65 */ lis r4, daBalloon2D_createHeap__FP10fopAc_ac_c@ha /* 0x80653518@ha */ -/* 80653D68 38 84 35 18 */ addi r4, r4, daBalloon2D_createHeap__FP10fopAc_ac_c@l /* 0x80653518@l */ -/* 80653D6C 38 A0 00 00 */ li r5, 0 -/* 80653D70 4B 9C 67 41 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80653D74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80653D78 40 82 00 0C */ bne lbl_80653D84 -/* 80653D7C 38 60 00 05 */ li r3, 5 -/* 80653D80 48 00 00 1C */ b lbl_80653D9C -lbl_80653D84: -/* 80653D84 3C 60 80 65 */ lis r3, myclass__13daBalloon2D_c@ha /* 0x80655844@ha */ -/* 80653D88 93 C3 58 44 */ stw r30, myclass__13daBalloon2D_c@l(r3) /* 0x80655844@l */ -/* 80653D8C 7F C3 F3 78 */ mr r3, r30 -/* 80653D90 38 80 00 01 */ li r4, 1 -/* 80653D94 48 00 10 F9 */ bl setHIO__13daBalloon2D_cFb -lbl_80653D98: -/* 80653D98 7F E3 FB 78 */ mr r3, r31 -lbl_80653D9C: -/* 80653D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80653DA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80653DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80653DA8 7C 08 03 A6 */ mtlr r0 -/* 80653DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653DB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_createHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_createHeap__FP10fopAc_ac_c.s deleted file mode 100644 index d0c311710a..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_createHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80653518: -/* 80653518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8065351C 7C 08 02 A6 */ mflr r0 -/* 80653520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653524 48 00 00 15 */ bl createHeap__13daBalloon2D_cFv -/* 80653528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8065352C 7C 08 03 A6 */ mtlr r0 -/* 80653530 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653534 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_destroy__FP13daBalloon2D_c.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_destroy__FP13daBalloon2D_c.s deleted file mode 100644 index eaad220e33..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_destroy__FP13daBalloon2D_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80655344: -/* 80655344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80655348 7C 08 02 A6 */ mflr r0 -/* 8065534C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80655350 4B FF EA 65 */ bl destroy__13daBalloon2D_cFv -/* 80655354 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80655358 7C 08 03 A6 */ mtlr r0 -/* 8065535C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80655360 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_draw__FP13daBalloon2D_c.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_draw__FP13daBalloon2D_c.s deleted file mode 100644 index eb89ad92a1..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_draw__FP13daBalloon2D_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80655384: -/* 80655384 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80655388 7C 08 02 A6 */ mflr r0 -/* 8065538C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80655390 4B FF EA 81 */ bl draw__13daBalloon2D_cFv -/* 80655394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80655398 7C 08 03 A6 */ mtlr r0 -/* 8065539C 38 21 00 10 */ addi r1, r1, 0x10 -/* 806553A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_execute__FP13daBalloon2D_c.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_execute__FP13daBalloon2D_c.s deleted file mode 100644 index 0934bc543b..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_execute__FP13daBalloon2D_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80655364: -/* 80655364 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80655368 7C 08 02 A6 */ mflr r0 -/* 8065536C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80655370 4B FF EB 51 */ bl execute__13daBalloon2D_cFv -/* 80655374 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80655378 7C 08 03 A6 */ mtlr r0 -/* 8065537C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80655380 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/destroy__13daBalloon2D_cFv.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/destroy__13daBalloon2D_cFv.s deleted file mode 100644 index d9ca9567e2..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/destroy__13daBalloon2D_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80653DB4: -/* 80653DB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80653DB8 7C 08 02 A6 */ mflr r0 -/* 80653DBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653DC0 28 03 00 00 */ cmplwi r3, 0 -/* 80653DC4 41 82 00 08 */ beq lbl_80653DCC -/* 80653DC8 38 63 05 68 */ addi r3, r3, 0x568 -lbl_80653DCC: -/* 80653DCC 3C 80 80 65 */ lis r4, l_arcName@ha /* 0x806556D4@ha */ -/* 80653DD0 38 84 56 D4 */ addi r4, r4, l_arcName@l /* 0x806556D4@l */ -/* 80653DD4 80 84 00 00 */ lwz r4, 0(r4) -/* 80653DD8 4B 9D 92 31 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80653DDC 38 00 00 00 */ li r0, 0 -/* 80653DE0 3C 60 80 65 */ lis r3, myclass__13daBalloon2D_c@ha /* 0x80655844@ha */ -/* 80653DE4 90 03 58 44 */ stw r0, myclass__13daBalloon2D_c@l(r3) /* 0x80655844@l */ -/* 80653DE8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80653DEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80653DF0 A0 03 00 A2 */ lhz r0, 0xa2(r3) -/* 80653DF4 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80653DF8 B0 03 00 A2 */ sth r0, 0xa2(r3) -/* 80653DFC 38 60 00 01 */ li r3, 1 -/* 80653E00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80653E04 7C 08 03 A6 */ mtlr r0 -/* 80653E08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653E0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__Q213daBalloon2D_c6c_listFv.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__Q213daBalloon2D_c6c_listFv.s deleted file mode 100644 index dc8baa806f..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__Q213daBalloon2D_c6c_listFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_806534CC: -/* 806534CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806534D0 7C 08 02 A6 */ mflr r0 -/* 806534D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806534D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806534DC 7C 7F 1B 78 */ mr r31, r3 -/* 806534E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806534E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806534E8 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 806534EC 81 83 00 00 */ lwz r12, 0(r3) -/* 806534F0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 806534F4 7D 89 03 A6 */ mtctr r12 -/* 806534F8 4E 80 04 21 */ bctrl -/* 806534FC 80 7F 00 04 */ lwz r3, 4(r31) -/* 80653500 48 00 0A 05 */ bl drawMeter__13daBalloon2D_cFv -/* 80653504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80653508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8065350C 7C 08 03 A6 */ mtlr r0 -/* 80653510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/execute__13daBalloon2D_cFv.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/execute__13daBalloon2D_cFv.s deleted file mode 100644 index 35885e33f1..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/execute__13daBalloon2D_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80653EC0: -/* 80653EC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80653EC4 7C 08 02 A6 */ mflr r0 -/* 80653EC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653ECC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80653ED0 7C 7F 1B 78 */ mr r31, r3 -/* 80653ED4 48 00 05 6D */ bl setAllAlpha__13daBalloon2D_cFv -/* 80653ED8 7F E3 FB 78 */ mr r3, r31 -/* 80653EDC 48 00 07 71 */ bl setComboAlpha__13daBalloon2D_cFv -/* 80653EE0 7F E3 FB 78 */ mr r3, r31 -/* 80653EE4 38 80 00 00 */ li r4, 0 -/* 80653EE8 48 00 0F A5 */ bl setHIO__13daBalloon2D_cFb -/* 80653EEC 38 60 00 01 */ li r3, 1 -/* 80653EF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80653EF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80653EF8 7C 08 03 A6 */ mtlr r0 -/* 80653EFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653F00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setBalloonSize__13daBalloon2D_cFUc.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setBalloonSize__13daBalloon2D_cFUc.s deleted file mode 100644 index b9752d3d62..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setBalloonSize__13daBalloon2D_cFUc.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_806541B4: -/* 806541B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806541B8 7C 08 02 A6 */ mflr r0 -/* 806541BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806541C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806541C4 7C 7F 1B 78 */ mr r31, r3 -/* 806541C8 98 83 07 45 */ stb r4, 0x745(r3) -/* 806541CC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 806541D0 2C 00 00 01 */ cmpwi r0, 1 -/* 806541D4 41 82 00 3C */ beq lbl_80654210 -/* 806541D8 40 80 00 10 */ bge lbl_806541E8 -/* 806541DC 2C 00 00 00 */ cmpwi r0, 0 -/* 806541E0 40 80 00 14 */ bge lbl_806541F4 -/* 806541E4 48 00 00 60 */ b lbl_80654244 -lbl_806541E8: -/* 806541E8 2C 00 00 03 */ cmpwi r0, 3 -/* 806541EC 40 80 00 58 */ bge lbl_80654244 -/* 806541F0 48 00 00 3C */ b lbl_8065422C -lbl_806541F4: -/* 806541F4 80 7F 05 98 */ lwz r3, 0x598(r31) -/* 806541F8 4B C0 13 D1 */ bl show__13CPaneMgrAlphaFv -/* 806541FC 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 80654200 4B C0 14 09 */ bl hide__13CPaneMgrAlphaFv -/* 80654204 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 80654208 4B C0 14 01 */ bl hide__13CPaneMgrAlphaFv -/* 8065420C 48 00 00 38 */ b lbl_80654244 -lbl_80654210: -/* 80654210 80 7F 05 98 */ lwz r3, 0x598(r31) -/* 80654214 4B C0 13 F5 */ bl hide__13CPaneMgrAlphaFv -/* 80654218 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 8065421C 4B C0 13 AD */ bl show__13CPaneMgrAlphaFv -/* 80654220 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 80654224 4B C0 13 E5 */ bl hide__13CPaneMgrAlphaFv -/* 80654228 48 00 00 1C */ b lbl_80654244 -lbl_8065422C: -/* 8065422C 80 7F 05 98 */ lwz r3, 0x598(r31) -/* 80654230 4B C0 13 D9 */ bl hide__13CPaneMgrAlphaFv -/* 80654234 80 7F 05 9C */ lwz r3, 0x59c(r31) -/* 80654238 4B C0 13 D1 */ bl hide__13CPaneMgrAlphaFv -/* 8065423C 80 7F 05 A0 */ lwz r3, 0x5a0(r31) -/* 80654240 4B C0 13 89 */ bl show__13CPaneMgrAlphaFv -lbl_80654244: -/* 80654244 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80654248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8065424C 7C 08 03 A6 */ mtlr r0 -/* 80654250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80654254 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboCount__13daBalloon2D_cFUcUc.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboCount__13daBalloon2D_cFUcUc.s deleted file mode 100644 index 114497d6e2..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboCount__13daBalloon2D_cFUcUc.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80653F58: -/* 80653F58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80653F5C 7C 08 02 A6 */ mflr r0 -/* 80653F60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653F64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80653F68 93 C1 00 08 */ stw r30, 8(r1) -/* 80653F6C 7C 7E 1B 78 */ mr r30, r3 -/* 80653F70 7C 9F 23 78 */ mr r31, r4 -/* 80653F74 88 83 07 44 */ lbz r4, 0x744(r3) -/* 80653F78 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 80653F7C 7C 04 00 40 */ cmplw r4, r0 -/* 80653F80 41 82 00 0C */ beq lbl_80653F8C -/* 80653F84 7C A4 2B 78 */ mr r4, r5 -/* 80653F88 48 00 01 35 */ bl setComboNum__13daBalloon2D_cFUc -lbl_80653F8C: -/* 80653F8C 88 7E 07 45 */ lbz r3, 0x745(r30) -/* 80653F90 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80653F94 7C 03 00 40 */ cmplw r3, r0 -/* 80653F98 41 82 00 10 */ beq lbl_80653FA8 -/* 80653F9C 7F C3 F3 78 */ mr r3, r30 -/* 80653FA0 7F E4 FB 78 */ mr r4, r31 -/* 80653FA4 48 00 02 11 */ bl setBalloonSize__13daBalloon2D_cFUc -lbl_80653FA8: -/* 80653FA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80653FAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80653FB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80653FB4 7C 08 03 A6 */ mtlr r0 -/* 80653FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653FBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboNum__13daBalloon2D_cFUc.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboNum__13daBalloon2D_cFUc.s deleted file mode 100644 index 4a5458a95d..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboNum__13daBalloon2D_cFUc.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_806540BC: -/* 806540BC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 806540C0 7C 08 02 A6 */ mflr r0 -/* 806540C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 806540C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 806540CC 4B D0 E1 0D */ bl _savegpr_28 -/* 806540D0 7C 7F 1B 78 */ mr r31, r3 -/* 806540D4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 806540D8 28 00 00 63 */ cmplwi r0, 0x63 -/* 806540DC 40 81 00 08 */ ble lbl_806540E4 -/* 806540E0 38 80 00 63 */ li r4, 0x63 -lbl_806540E4: -/* 806540E4 98 9F 07 44 */ stb r4, 0x744(r31) -/* 806540E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806540EC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806540F0 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 806540F4 54 9C 06 3E */ clrlwi r28, r4, 0x18 -/* 806540F8 38 00 00 0A */ li r0, 0xa -/* 806540FC 7C 7C 03 D6 */ divw r3, r28, r0 -/* 80654100 4B BC A1 C9 */ bl dMeter2Info_getNumberTextureName__Fi -/* 80654104 7C 65 1B 78 */ mr r5, r3 -/* 80654108 7F A3 EB 78 */ mr r3, r29 -/* 8065410C 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80654110 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 80654114 81 9D 00 00 */ lwz r12, 0(r29) -/* 80654118 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8065411C 7D 89 03 A6 */ mtctr r12 -/* 80654120 4E 80 04 21 */ bctrl -/* 80654124 7C 64 1B 78 */ mr r4, r3 -/* 80654128 80 7F 05 BC */ lwz r3, 0x5bc(r31) -/* 8065412C 38 A0 00 00 */ li r5, 0 -/* 80654130 81 83 00 00 */ lwz r12, 0(r3) -/* 80654134 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80654138 7D 89 03 A6 */ mtctr r12 -/* 8065413C 4E 80 04 21 */ bctrl -/* 80654140 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 80654144 38 60 00 0A */ li r3, 0xa -/* 80654148 7C 1C 1B D6 */ divw r0, r28, r3 -/* 8065414C 7C 00 19 D6 */ mullw r0, r0, r3 -/* 80654150 7C 60 E0 50 */ subf r3, r0, r28 -/* 80654154 4B BC A1 75 */ bl dMeter2Info_getNumberTextureName__Fi -/* 80654158 7C 65 1B 78 */ mr r5, r3 -/* 8065415C 7F A3 EB 78 */ mr r3, r29 -/* 80654160 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80654164 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 80654168 81 9D 00 00 */ lwz r12, 0(r29) -/* 8065416C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80654170 7D 89 03 A6 */ mtctr r12 -/* 80654174 4E 80 04 21 */ bctrl -/* 80654178 7C 64 1B 78 */ mr r4, r3 -/* 8065417C 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 80654180 38 A0 00 00 */ li r5, 0 -/* 80654184 81 83 00 00 */ lwz r12, 0(r3) -/* 80654188 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 8065418C 7D 89 03 A6 */ mtctr r12 -/* 80654190 4E 80 04 21 */ bctrl -/* 80654194 7F E3 FB 78 */ mr r3, r31 -/* 80654198 48 00 04 B5 */ bl setComboAlpha__13daBalloon2D_cFv -/* 8065419C 39 61 00 20 */ addi r11, r1, 0x20 -/* 806541A0 4B D0 E0 85 */ bl _restgpr_28 -/* 806541A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806541A8 7C 08 03 A6 */ mtlr r0 -/* 806541AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 806541B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreCount__13daBalloon2D_cFUl.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreCount__13daBalloon2D_cFUl.s deleted file mode 100644 index caec8d9057..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreCount__13daBalloon2D_cFUl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80653FC0: -/* 80653FC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80653FC4 7C 08 02 A6 */ mflr r0 -/* 80653FC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80653FCC 80 03 07 40 */ lwz r0, 0x740(r3) -/* 80653FD0 7C 00 20 40 */ cmplw r0, r4 -/* 80653FD4 41 82 00 08 */ beq lbl_80653FDC -/* 80653FD8 48 00 02 81 */ bl setScoreNum__13daBalloon2D_cFi -lbl_80653FDC: -/* 80653FDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80653FE0 7C 08 03 A6 */ mtlr r0 -/* 80653FE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80653FE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreNum__13daBalloon2D_cFi.s b/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreNum__13daBalloon2D_cFi.s deleted file mode 100644 index 0e4f5cff6a..0000000000 --- a/asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreNum__13daBalloon2D_cFi.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_80654258: -/* 80654258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8065425C 7C 08 02 A6 */ mflr r0 -/* 80654260 90 01 00 24 */ stw r0, 0x24(r1) -/* 80654264 39 61 00 20 */ addi r11, r1, 0x20 -/* 80654268 4B D0 DF 71 */ bl _savegpr_28 -/* 8065426C 7C 7F 1B 78 */ mr r31, r3 -/* 80654270 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001869F@ha */ -/* 80654274 38 03 86 9F */ addi r0, r3, 0x869F /* 0x0001869F@l */ -/* 80654278 7C 04 00 00 */ cmpw r4, r0 -/* 8065427C 40 81 00 08 */ ble lbl_80654284 -/* 80654280 7C 04 03 78 */ mr r4, r0 -lbl_80654284: -/* 80654284 90 9F 07 40 */ stw r4, 0x740(r31) -/* 80654288 38 00 27 10 */ li r0, 0x2710 -/* 8065428C 7C 64 03 D6 */ divw r3, r4, r0 -/* 80654290 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80654294 7F 80 20 50 */ subf r28, r0, r4 -/* 80654298 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8065429C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806542A0 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 806542A4 4B BC A0 25 */ bl dMeter2Info_getNumberTextureName__Fi -/* 806542A8 7C 65 1B 78 */ mr r5, r3 -/* 806542AC 7F A3 EB 78 */ mr r3, r29 -/* 806542B0 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 806542B4 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 806542B8 81 9D 00 00 */ lwz r12, 0(r29) -/* 806542BC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 806542C0 7D 89 03 A6 */ mtctr r12 -/* 806542C4 4E 80 04 21 */ bctrl -/* 806542C8 7C 64 1B 78 */ mr r4, r3 -/* 806542CC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 806542D0 38 A0 00 00 */ li r5, 0 -/* 806542D4 81 83 00 00 */ lwz r12, 0(r3) -/* 806542D8 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 806542DC 7D 89 03 A6 */ mtctr r12 -/* 806542E0 4E 80 04 21 */ bctrl -/* 806542E4 38 00 03 E8 */ li r0, 0x3e8 -/* 806542E8 7C 7C 03 D6 */ divw r3, r28, r0 -/* 806542EC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 806542F0 7F 80 E0 50 */ subf r28, r0, r28 -/* 806542F4 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 806542F8 4B BC 9F D1 */ bl dMeter2Info_getNumberTextureName__Fi -/* 806542FC 7C 65 1B 78 */ mr r5, r3 -/* 80654300 7F A3 EB 78 */ mr r3, r29 -/* 80654304 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 80654308 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 8065430C 81 9D 00 00 */ lwz r12, 0(r29) -/* 80654310 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80654314 7D 89 03 A6 */ mtctr r12 -/* 80654318 4E 80 04 21 */ bctrl -/* 8065431C 7C 64 1B 78 */ mr r4, r3 -/* 80654320 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80654324 38 A0 00 00 */ li r5, 0 -/* 80654328 81 83 00 00 */ lwz r12, 0(r3) -/* 8065432C 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80654330 7D 89 03 A6 */ mtctr r12 -/* 80654334 4E 80 04 21 */ bctrl -/* 80654338 38 00 00 64 */ li r0, 0x64 -/* 8065433C 7C 7C 03 D6 */ divw r3, r28, r0 -/* 80654340 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80654344 7F 80 E0 50 */ subf r28, r0, r28 -/* 80654348 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 8065434C 4B BC 9F 7D */ bl dMeter2Info_getNumberTextureName__Fi -/* 80654350 7C 65 1B 78 */ mr r5, r3 -/* 80654354 7F A3 EB 78 */ mr r3, r29 -/* 80654358 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 8065435C 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 80654360 81 9D 00 00 */ lwz r12, 0(r29) -/* 80654364 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80654368 7D 89 03 A6 */ mtctr r12 -/* 8065436C 4E 80 04 21 */ bctrl -/* 80654370 7C 64 1B 78 */ mr r4, r3 -/* 80654374 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80654378 38 A0 00 00 */ li r5, 0 -/* 8065437C 81 83 00 00 */ lwz r12, 0(r3) -/* 80654380 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80654384 7D 89 03 A6 */ mtctr r12 -/* 80654388 4E 80 04 21 */ bctrl -/* 8065438C 38 00 00 0A */ li r0, 0xa -/* 80654390 7C 7C 03 D6 */ divw r3, r28, r0 -/* 80654394 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80654398 7F 80 E0 50 */ subf r28, r0, r28 -/* 8065439C 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 806543A0 4B BC 9F 29 */ bl dMeter2Info_getNumberTextureName__Fi -/* 806543A4 7C 65 1B 78 */ mr r5, r3 -/* 806543A8 7F A3 EB 78 */ mr r3, r29 -/* 806543AC 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 806543B0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 806543B4 81 9D 00 00 */ lwz r12, 0(r29) -/* 806543B8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 806543BC 7D 89 03 A6 */ mtctr r12 -/* 806543C0 4E 80 04 21 */ bctrl -/* 806543C4 7C 64 1B 78 */ mr r4, r3 -/* 806543C8 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806543CC 38 A0 00 00 */ li r5, 0 -/* 806543D0 81 83 00 00 */ lwz r12, 0(r3) -/* 806543D4 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 806543D8 7D 89 03 A6 */ mtctr r12 -/* 806543DC 4E 80 04 21 */ bctrl -/* 806543E0 83 BE 5D 30 */ lwz r29, 0x5d30(r30) -/* 806543E4 7F 83 E3 78 */ mr r3, r28 -/* 806543E8 4B BC 9E E1 */ bl dMeter2Info_getNumberTextureName__Fi -/* 806543EC 7C 65 1B 78 */ mr r5, r3 -/* 806543F0 7F A3 EB 78 */ mr r3, r29 -/* 806543F4 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 806543F8 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 806543FC 81 9D 00 00 */ lwz r12, 0(r29) -/* 80654400 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80654404 7D 89 03 A6 */ mtctr r12 -/* 80654408 4E 80 04 21 */ bctrl -/* 8065440C 7C 64 1B 78 */ mr r4, r3 -/* 80654410 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 80654414 38 A0 00 00 */ li r5, 0 -/* 80654418 81 83 00 00 */ lwz r12, 0(r3) -/* 8065441C 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 80654420 7D 89 03 A6 */ mtctr r12 -/* 80654424 4E 80 04 21 */ bctrl -/* 80654428 39 61 00 20 */ addi r11, r1, 0x20 -/* 8065442C 4B D0 DD F9 */ bl _restgpr_28 -/* 80654430 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80654434 7C 08 03 A6 */ mtlr r0 -/* 80654438 38 21 00 20 */ addi r1, r1, 0x20 -/* 8065443C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/CreateHeap__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/CreateHeap__15daObj_Balloon_cFv.s deleted file mode 100644 index 1e62d47302..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/CreateHeap__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80BA87CC: -/* 80BA87CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA87D0 7C 08 02 A6 */ mflr r0 -/* 80BA87D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA87D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA87DC 7C 7F 1B 78 */ mr r31, r3 -/* 80BA87E0 88 03 05 78 */ lbz r0, 0x578(r3) -/* 80BA87E4 28 00 00 00 */ cmplwi r0, 0 -/* 80BA87E8 40 82 00 2C */ bne lbl_80BA8814 -/* 80BA87EC 3C 60 80 BB */ lis r3, d_a_obj_balloon__stringBase0@ha /* 0x80BA8E54@ha */ -/* 80BA87F0 38 63 8E 54 */ addi r3, r3, d_a_obj_balloon__stringBase0@l /* 0x80BA8E54@l */ -/* 80BA87F4 38 80 00 03 */ li r4, 3 -/* 80BA87F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA87FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA8800 3C A5 00 02 */ addis r5, r5, 2 -/* 80BA8804 38 C0 00 80 */ li r6, 0x80 -/* 80BA8808 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BA880C 4B 49 3A E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BA8810 48 00 00 60 */ b lbl_80BA8870 -lbl_80BA8814: -/* 80BA8814 28 00 00 01 */ cmplwi r0, 1 -/* 80BA8818 40 82 00 2C */ bne lbl_80BA8844 -/* 80BA881C 3C 60 80 BB */ lis r3, d_a_obj_balloon__stringBase0@ha /* 0x80BA8E54@ha */ -/* 80BA8820 38 63 8E 54 */ addi r3, r3, d_a_obj_balloon__stringBase0@l /* 0x80BA8E54@l */ -/* 80BA8824 38 80 00 04 */ li r4, 4 -/* 80BA8828 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA882C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA8830 3C A5 00 02 */ addis r5, r5, 2 -/* 80BA8834 38 C0 00 80 */ li r6, 0x80 -/* 80BA8838 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BA883C 4B 49 3A B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BA8840 48 00 00 30 */ b lbl_80BA8870 -lbl_80BA8844: -/* 80BA8844 28 00 00 02 */ cmplwi r0, 2 -/* 80BA8848 40 82 00 28 */ bne lbl_80BA8870 -/* 80BA884C 3C 60 80 BB */ lis r3, d_a_obj_balloon__stringBase0@ha /* 0x80BA8E54@ha */ -/* 80BA8850 38 63 8E 54 */ addi r3, r3, d_a_obj_balloon__stringBase0@l /* 0x80BA8E54@l */ -/* 80BA8854 38 80 00 05 */ li r4, 5 -/* 80BA8858 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA885C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA8860 3C A5 00 02 */ addis r5, r5, 2 -/* 80BA8864 38 C0 00 80 */ li r6, 0x80 -/* 80BA8868 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BA886C 4B 49 3A 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -lbl_80BA8870: -/* 80BA8870 38 80 00 00 */ li r4, 0 -/* 80BA8874 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BA8878 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BA887C 4B 46 C3 D9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BA8880 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80BA8884 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80BA8888 30 03 FF FF */ addic r0, r3, -1 -/* 80BA888C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BA8890 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8894 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8898 7C 08 03 A6 */ mtlr r0 -/* 80BA889C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA88A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__ct__19daObj_Balloon_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__ct__19daObj_Balloon_HIO_cFv.s deleted file mode 100644 index 667acf555d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__ct__19daObj_Balloon_HIO_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80BA7FAC: -/* 80BA7FAC 3C 80 80 BB */ lis r4, lit_3656@ha /* 0x80BA8E0C@ha */ -/* 80BA7FB0 38 A4 8E 0C */ addi r5, r4, lit_3656@l /* 0x80BA8E0C@l */ -/* 80BA7FB4 3C 80 80 BB */ lis r4, __vt__19daObj_Balloon_HIO_c@ha /* 0x80BA8F98@ha */ -/* 80BA7FB8 38 04 8F 98 */ addi r0, r4, __vt__19daObj_Balloon_HIO_c@l /* 0x80BA8F98@l */ -/* 80BA7FBC 90 03 00 00 */ stw r0, 0(r3) -/* 80BA7FC0 38 00 FF FF */ li r0, -1 -/* 80BA7FC4 98 03 00 04 */ stb r0, 4(r3) -/* 80BA7FC8 C0 25 00 00 */ lfs f1, 0(r5) -/* 80BA7FCC D0 23 00 08 */ stfs f1, 8(r3) -/* 80BA7FD0 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 80BA7FD4 C0 05 00 04 */ lfs f0, 4(r5) -/* 80BA7FD8 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80BA7FDC D0 23 00 14 */ stfs f1, 0x14(r3) -/* 80BA7FE0 C0 05 00 08 */ lfs f0, 8(r5) -/* 80BA7FE4 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80BA7FE8 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80BA7FEC D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80BA7FF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 4f7ff489a2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA8D1C: -/* 80BA8D1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8D20 7C 08 02 A6 */ mflr r0 -/* 80BA8D24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8D28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8D2C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA8D30 41 82 00 1C */ beq lbl_80BA8D4C -/* 80BA8D34 3C A0 80 BB */ lis r5, __vt__10cCcD_GStts@ha /* 0x80BA8F44@ha */ -/* 80BA8D38 38 05 8F 44 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80BA8F44@l */ -/* 80BA8D3C 90 1F 00 00 */ stw r0, 0(r31) -/* 80BA8D40 7C 80 07 35 */ extsh. r0, r4 -/* 80BA8D44 40 81 00 08 */ ble lbl_80BA8D4C -/* 80BA8D48 4B 72 5F F5 */ bl __dl__FPv -lbl_80BA8D4C: -/* 80BA8D4C 7F E3 FB 78 */ mr r3, r31 -/* 80BA8D50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8D54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8D58 7C 08 03 A6 */ mtlr r0 -/* 80BA8D5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8D60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 3914e5c47b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BA8BC0: -/* 80BA8BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8BC4 7C 08 02 A6 */ mflr r0 -/* 80BA8BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8BCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8BD0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA8BD4 41 82 00 30 */ beq lbl_80BA8C04 -/* 80BA8BD8 3C 60 80 BB */ lis r3, __vt__10dCcD_GStts@ha /* 0x80BA8F50@ha */ -/* 80BA8BDC 38 03 8F 50 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80BA8F50@l */ -/* 80BA8BE0 90 1F 00 00 */ stw r0, 0(r31) -/* 80BA8BE4 41 82 00 10 */ beq lbl_80BA8BF4 -/* 80BA8BE8 3C 60 80 BB */ lis r3, __vt__10cCcD_GStts@ha /* 0x80BA8F44@ha */ -/* 80BA8BEC 38 03 8F 44 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80BA8F44@l */ -/* 80BA8BF0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BA8BF4: -/* 80BA8BF4 7C 80 07 35 */ extsh. r0, r4 -/* 80BA8BF8 40 81 00 0C */ ble lbl_80BA8C04 -/* 80BA8BFC 7F E3 FB 78 */ mr r3, r31 -/* 80BA8C00 4B 72 61 3D */ bl __dl__FPv -lbl_80BA8C04: -/* 80BA8C04 7F E3 FB 78 */ mr r3, r31 -/* 80BA8C08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8C10 7C 08 03 A6 */ mtlr r0 -/* 80BA8C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8C18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 402783ceaa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BA8C8C: -/* 80BA8C8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8C90 7C 08 02 A6 */ mflr r0 -/* 80BA8C94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8C98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8C9C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA8CA0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BA8CA4 7C 9F 23 78 */ mr r31, r4 -/* 80BA8CA8 41 82 00 38 */ beq lbl_80BA8CE0 -/* 80BA8CAC 3C 60 80 BB */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80BA8F38@ha */ -/* 80BA8CB0 38 03 8F 38 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80BA8F38@l */ -/* 80BA8CB4 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80BA8CB8 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80BA8CBC 38 80 FF FF */ li r4, -1 -/* 80BA8CC0 4B 6C 62 59 */ bl __dt__8cM3dGCirFv -/* 80BA8CC4 7F C3 F3 78 */ mr r3, r30 -/* 80BA8CC8 38 80 00 00 */ li r4, 0 -/* 80BA8CCC 4B 6B F3 E5 */ bl __dt__13cBgS_PolyInfoFv -/* 80BA8CD0 7F E0 07 35 */ extsh. r0, r31 -/* 80BA8CD4 40 81 00 0C */ ble lbl_80BA8CE0 -/* 80BA8CD8 7F C3 F3 78 */ mr r3, r30 -/* 80BA8CDC 4B 72 60 61 */ bl __dl__FPv -lbl_80BA8CE0: -/* 80BA8CE0 7F C3 F3 78 */ mr r3, r30 -/* 80BA8CE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8CE8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA8CEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8CF0 7C 08 03 A6 */ mtlr r0 -/* 80BA8CF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8CF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index a12c63dd5f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BA8C1C: -/* 80BA8C1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8C20 7C 08 02 A6 */ mflr r0 -/* 80BA8C24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8C28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8C2C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BA8C30 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BA8C34 7C 9F 23 78 */ mr r31, r4 -/* 80BA8C38 41 82 00 38 */ beq lbl_80BA8C70 -/* 80BA8C3C 3C 80 80 BB */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80BA8F74@ha */ -/* 80BA8C40 38 84 8F 74 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80BA8F74@l */ -/* 80BA8C44 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BA8C48 38 04 00 0C */ addi r0, r4, 0xc -/* 80BA8C4C 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80BA8C50 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BA8C54 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80BA8C58 38 80 00 00 */ li r4, 0 -/* 80BA8C5C 4B 4C D3 39 */ bl __dt__9dBgS_AcchFv -/* 80BA8C60 7F E0 07 35 */ extsh. r0, r31 -/* 80BA8C64 40 81 00 0C */ ble lbl_80BA8C70 -/* 80BA8C68 7F C3 F3 78 */ mr r3, r30 -/* 80BA8C6C 4B 72 60 D1 */ bl __dl__FPv -lbl_80BA8C70: -/* 80BA8C70 7F C3 F3 78 */ mr r3, r30 -/* 80BA8C74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8C78 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BA8C7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8C80 7C 08 03 A6 */ mtlr r0 -/* 80BA8C84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8C88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__19daObj_Balloon_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__19daObj_Balloon_HIO_cFv.s deleted file mode 100644 index 4500b43534..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__19daObj_Balloon_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA8D64: -/* 80BA8D64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8D68 7C 08 02 A6 */ mflr r0 -/* 80BA8D6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8D70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8D74 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA8D78 41 82 00 1C */ beq lbl_80BA8D94 -/* 80BA8D7C 3C A0 80 BB */ lis r5, __vt__19daObj_Balloon_HIO_c@ha /* 0x80BA8F98@ha */ -/* 80BA8D80 38 05 8F 98 */ addi r0, r5, __vt__19daObj_Balloon_HIO_c@l /* 0x80BA8F98@l */ -/* 80BA8D84 90 1F 00 00 */ stw r0, 0(r31) -/* 80BA8D88 7C 80 07 35 */ extsh. r0, r4 -/* 80BA8D8C 40 81 00 08 */ ble lbl_80BA8D94 -/* 80BA8D90 4B 72 5F AD */ bl __dl__FPv -lbl_80BA8D94: -/* 80BA8D94 7F E3 FB 78 */ mr r3, r31 -/* 80BA8D98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8D9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8DA0 7C 08 03 A6 */ mtlr r0 -/* 80BA8DA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGAabFv.s deleted file mode 100644 index 15bf2805ea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA8B78: -/* 80BA8B78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8B7C 7C 08 02 A6 */ mflr r0 -/* 80BA8B80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8B84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8B88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA8B8C 41 82 00 1C */ beq lbl_80BA8BA8 -/* 80BA8B90 3C A0 80 BB */ lis r5, __vt__8cM3dGAab@ha /* 0x80BA8F68@ha */ -/* 80BA8B94 38 05 8F 68 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BA8F68@l */ -/* 80BA8B98 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BA8B9C 7C 80 07 35 */ extsh. r0, r4 -/* 80BA8BA0 40 81 00 08 */ ble lbl_80BA8BA8 -/* 80BA8BA4 4B 72 61 99 */ bl __dl__FPv -lbl_80BA8BA8: -/* 80BA8BA8 7F E3 FB 78 */ mr r3, r31 -/* 80BA8BAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8BB4 7C 08 03 A6 */ mtlr r0 -/* 80BA8BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGSphFv.s deleted file mode 100644 index cc1a26e2cd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BA8B30: -/* 80BA8B30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8B34 7C 08 02 A6 */ mflr r0 -/* 80BA8B38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8B3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA8B40 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BA8B44 41 82 00 1C */ beq lbl_80BA8B60 -/* 80BA8B48 3C A0 80 BB */ lis r5, __vt__8cM3dGSph@ha /* 0x80BA8F5C@ha */ -/* 80BA8B4C 38 05 8F 5C */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80BA8F5C@l */ -/* 80BA8B50 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80BA8B54 7C 80 07 35 */ extsh. r0, r4 -/* 80BA8B58 40 81 00 08 */ ble lbl_80BA8B60 -/* 80BA8B5C 4B 72 61 E1 */ bl __dl__FPv -lbl_80BA8B60: -/* 80BA8B60 7F E3 FB 78 */ mr r3, r31 -/* 80BA8B64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA8B68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8B6C 7C 08 03 A6 */ mtlr r0 -/* 80BA8B70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8B74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__sinit_d_a_obj_balloon_cpp.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__sinit_d_a_obj_balloon_cpp.s deleted file mode 100644 index 8d93967475..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__sinit_d_a_obj_balloon_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BA8DAC: -/* 80BA8DAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8DB0 7C 08 02 A6 */ mflr r0 -/* 80BA8DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8DB8 3C 60 80 BB */ lis r3, l_HIO@ha /* 0x80BA900C@ha */ -/* 80BA8DBC 38 63 90 0C */ addi r3, r3, l_HIO@l /* 0x80BA900C@l */ -/* 80BA8DC0 4B FF F1 ED */ bl __ct__19daObj_Balloon_HIO_cFv -/* 80BA8DC4 3C 80 80 BB */ lis r4, __dt__19daObj_Balloon_HIO_cFv@ha /* 0x80BA8D64@ha */ -/* 80BA8DC8 38 84 8D 64 */ addi r4, r4, __dt__19daObj_Balloon_HIO_cFv@l /* 0x80BA8D64@l */ -/* 80BA8DCC 3C A0 80 BB */ lis r5, lit_3651@ha /* 0x80BA9000@ha */ -/* 80BA8DD0 38 A5 90 00 */ addi r5, r5, lit_3651@l /* 0x80BA9000@l */ -/* 80BA8DD4 4B FF F1 65 */ bl __register_global_object -/* 80BA8DD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8DDC 7C 08 03 A6 */ mtlr r0 -/* 80BA8DE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8DE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/_delete__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/_delete__15daObj_Balloon_cFv.s deleted file mode 100644 index 6780d0a329..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/_delete__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BA8734: -/* 80BA8734 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA8738 7C 08 02 A6 */ mflr r0 -/* 80BA873C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA8740 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BA8744 7C 7F 1B 78 */ mr r31, r3 -/* 80BA8748 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80BA874C 3C 80 80 BB */ lis r4, d_a_obj_balloon__stringBase0@ha /* 0x80BA8E54@ha */ -/* 80BA8750 38 84 8E 54 */ addi r4, r4, d_a_obj_balloon__stringBase0@l /* 0x80BA8E54@l */ -/* 80BA8754 4B 48 48 B5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BA8758 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800C1@ha */ -/* 80BA875C 38 03 00 C1 */ addi r0, r3, 0x00C1 /* 0x000800C1@l */ -/* 80BA8760 90 01 00 08 */ stw r0, 8(r1) -/* 80BA8764 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BA8768 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BA876C 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA8770 38 81 00 08 */ addi r4, r1, 8 -/* 80BA8774 38 A0 00 00 */ li r5, 0 -/* 80BA8778 4B 70 51 39 */ bl seStop__7Z2SeMgrF10JAISoundIDUl -/* 80BA877C 88 1F 09 14 */ lbz r0, 0x914(r31) -/* 80BA8780 28 00 00 00 */ cmplwi r0, 0 -/* 80BA8784 41 82 00 10 */ beq lbl_80BA8794 -/* 80BA8788 38 00 00 00 */ li r0, 0 -/* 80BA878C 3C 60 80 BB */ lis r3, data_80BA8FFC@ha /* 0x80BA8FFC@ha */ -/* 80BA8790 98 03 8F FC */ stb r0, data_80BA8FFC@l(r3) /* 0x80BA8FFC@l */ -lbl_80BA8794: -/* 80BA8794 38 60 00 01 */ li r3, 1 -/* 80BA8798 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BA879C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA87A0 7C 08 03 A6 */ mtlr r0 -/* 80BA87A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA87A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/action__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/action__15daObj_Balloon_cFv.s deleted file mode 100644 index 74f7eb2d30..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/action__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,314 +0,0 @@ -lbl_80BA81B8: -/* 80BA81B8 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 80BA81BC 7C 08 02 A6 */ mflr r0 -/* 80BA81C0 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80BA81C4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80BA81C8 4B 7B 9F F9 */ bl _savegpr_22 -/* 80BA81CC 7C 79 1B 78 */ mr r25, r3 -/* 80BA81D0 3C 60 80 BB */ lis r3, lit_1109@ha /* 0x80BA8FB0@ha */ -/* 80BA81D4 3B A3 8F B0 */ addi r29, r3, lit_1109@l /* 0x80BA8FB0@l */ -/* 80BA81D8 3C 60 80 BB */ lis r3, cNullVec__6Z2Calc@ha /* 0x80BA8E5C@ha */ -/* 80BA81DC 3B C3 8E 5C */ addi r30, r3, cNullVec__6Z2Calc@l /* 0x80BA8E5C@l */ -/* 80BA81E0 3C 60 80 BB */ lis r3, lit_3656@ha /* 0x80BA8E0C@ha */ -/* 80BA81E4 3B E3 8E 0C */ addi r31, r3, lit_3656@l /* 0x80BA8E0C@l */ -/* 80BA81E8 88 19 05 79 */ lbz r0, 0x579(r25) -/* 80BA81EC 2C 00 00 01 */ cmpwi r0, 1 -/* 80BA81F0 41 82 00 3C */ beq lbl_80BA822C -/* 80BA81F4 40 80 00 10 */ bge lbl_80BA8204 -/* 80BA81F8 2C 00 00 00 */ cmpwi r0, 0 -/* 80BA81FC 40 80 00 14 */ bge lbl_80BA8210 -/* 80BA8200 48 00 01 60 */ b lbl_80BA8360 -lbl_80BA8204: -/* 80BA8204 2C 00 00 03 */ cmpwi r0, 3 -/* 80BA8208 40 80 01 58 */ bge lbl_80BA8360 -/* 80BA820C 48 00 00 D8 */ b lbl_80BA82E4 -lbl_80BA8210: -/* 80BA8210 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80BA8214 D0 19 05 30 */ stfs f0, 0x530(r25) -/* 80BA8218 D0 19 05 2C */ stfs f0, 0x52c(r25) -/* 80BA821C D0 19 04 FC */ stfs f0, 0x4fc(r25) -/* 80BA8220 38 00 00 01 */ li r0, 1 -/* 80BA8224 98 19 05 79 */ stb r0, 0x579(r25) -/* 80BA8228 48 00 01 38 */ b lbl_80BA8360 -lbl_80BA822C: -/* 80BA822C 38 79 05 80 */ addi r3, r25, 0x580 -/* 80BA8230 A8 99 05 84 */ lha r4, 0x584(r25) -/* 80BA8234 38 A0 00 10 */ li r5, 0x10 -/* 80BA8238 38 C0 00 08 */ li r6, 8 -/* 80BA823C 4B 6C 83 CD */ bl cLib_addCalcAngleS2__FPssss -/* 80BA8240 38 79 05 82 */ addi r3, r25, 0x582 -/* 80BA8244 A8 99 05 86 */ lha r4, 0x586(r25) -/* 80BA8248 38 A0 00 10 */ li r5, 0x10 -/* 80BA824C 38 C0 00 08 */ li r6, 8 -/* 80BA8250 4B 6C 83 B9 */ bl cLib_addCalcAngleS2__FPssss -/* 80BA8254 38 79 04 FC */ addi r3, r25, 0x4fc -/* 80BA8258 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80BA825C C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 80BA8260 4B 6C 84 E1 */ bl cLib_chaseF__FPfff -/* 80BA8264 C0 39 04 D4 */ lfs f1, 0x4d4(r25) -/* 80BA8268 C0 19 04 AC */ lfs f0, 0x4ac(r25) -/* 80BA826C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BA8270 40 80 00 F0 */ bge lbl_80BA8360 -/* 80BA8274 38 00 00 02 */ li r0, 2 -/* 80BA8278 98 19 05 79 */ stb r0, 0x579(r25) -/* 80BA827C C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80BA8280 4B 6B F6 D5 */ bl cM_rndF__Ff -/* 80BA8284 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80BA8288 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BA828C FC 00 00 1E */ fctiwz f0, f0 -/* 80BA8290 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 80BA8294 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80BA8298 7C 00 07 34 */ extsh r0, r0 -/* 80BA829C 90 19 05 7C */ stw r0, 0x57c(r25) -/* 80BA82A0 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80BA82A4 4B 6B F6 B1 */ bl cM_rndF__Ff -/* 80BA82A8 C0 5F 00 2C */ lfs f2, 0x2c(r31) -/* 80BA82AC EC 02 08 2A */ fadds f0, f2, f1 -/* 80BA82B0 FC 00 00 1E */ fctiwz f0, f0 -/* 80BA82B4 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 80BA82B8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80BA82BC B0 19 05 84 */ sth r0, 0x584(r25) -/* 80BA82C0 FC 20 10 90 */ fmr f1, f2 -/* 80BA82C4 4B 6B F6 91 */ bl cM_rndF__Ff -/* 80BA82C8 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80BA82CC EC 00 08 2A */ fadds f0, f0, f1 -/* 80BA82D0 FC 00 00 1E */ fctiwz f0, f0 -/* 80BA82D4 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80BA82D8 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 80BA82DC B0 19 05 86 */ sth r0, 0x586(r25) -/* 80BA82E0 48 00 00 80 */ b lbl_80BA8360 -lbl_80BA82E4: -/* 80BA82E4 38 79 05 80 */ addi r3, r25, 0x580 -/* 80BA82E8 A8 99 05 84 */ lha r4, 0x584(r25) -/* 80BA82EC 38 A0 00 10 */ li r5, 0x10 -/* 80BA82F0 38 C0 00 20 */ li r6, 0x20 -/* 80BA82F4 4B 6C 83 15 */ bl cLib_addCalcAngleS2__FPssss -/* 80BA82F8 38 79 05 82 */ addi r3, r25, 0x582 -/* 80BA82FC A8 99 05 86 */ lha r4, 0x586(r25) -/* 80BA8300 38 A0 00 10 */ li r5, 0x10 -/* 80BA8304 38 C0 00 20 */ li r6, 0x20 -/* 80BA8308 4B 6C 83 01 */ bl cLib_addCalcAngleS2__FPssss -/* 80BA830C 38 79 04 FC */ addi r3, r25, 0x4fc -/* 80BA8310 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80BA8314 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 80BA8318 4B 6C 84 29 */ bl cLib_chaseF__FPfff -/* 80BA831C 80 19 05 7C */ lwz r0, 0x57c(r25) -/* 80BA8320 2C 00 00 00 */ cmpwi r0, 0 -/* 80BA8324 40 82 00 3C */ bne lbl_80BA8360 -/* 80BA8328 38 00 00 01 */ li r0, 1 -/* 80BA832C 98 19 05 79 */ stb r0, 0x579(r25) -/* 80BA8330 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80BA8334 4B 6B F6 21 */ bl cM_rndF__Ff -/* 80BA8338 FC 00 08 1E */ fctiwz f0, f1 -/* 80BA833C D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80BA8340 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 80BA8344 B0 19 05 84 */ sth r0, 0x584(r25) -/* 80BA8348 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80BA834C 4B 6B F6 09 */ bl cM_rndF__Ff -/* 80BA8350 FC 00 08 1E */ fctiwz f0, f1 -/* 80BA8354 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 80BA8358 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80BA835C B0 19 05 86 */ sth r0, 0x586(r25) -lbl_80BA8360: -/* 80BA8360 A8 79 04 E8 */ lha r3, 0x4e8(r25) -/* 80BA8364 A8 19 05 80 */ lha r0, 0x580(r25) -/* 80BA8368 7C 03 02 14 */ add r0, r3, r0 -/* 80BA836C B0 19 04 E8 */ sth r0, 0x4e8(r25) -/* 80BA8370 A8 79 04 E6 */ lha r3, 0x4e6(r25) -/* 80BA8374 A8 19 05 82 */ lha r0, 0x582(r25) -/* 80BA8378 7C 03 02 14 */ add r0, r3, r0 -/* 80BA837C B0 19 04 E6 */ sth r0, 0x4e6(r25) -/* 80BA8380 80 79 05 7C */ lwz r3, 0x57c(r25) -/* 80BA8384 2C 03 00 00 */ cmpwi r3, 0 -/* 80BA8388 41 82 00 0C */ beq lbl_80BA8394 -/* 80BA838C 38 03 FF FF */ addi r0, r3, -1 -/* 80BA8390 90 19 05 7C */ stw r0, 0x57c(r25) -lbl_80BA8394: -/* 80BA8394 38 79 07 BC */ addi r3, r25, 0x7bc -/* 80BA8398 4B 4D B4 99 */ bl Move__10dCcD_GSttsFv -/* 80BA839C 38 79 07 DC */ addi r3, r25, 0x7dc -/* 80BA83A0 4B 4D C0 C1 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80BA83A4 28 03 00 00 */ cmplwi r3, 0 -/* 80BA83A8 41 82 02 90 */ beq lbl_80BA8638 -/* 80BA83AC 38 79 07 DC */ addi r3, r25, 0x7dc -/* 80BA83B0 4B 4D C1 49 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80BA83B4 7C 7C 1B 78 */ mr r28, r3 -/* 80BA83B8 4B 6B B6 91 */ bl GetAc__8cCcD_ObjFv -/* 80BA83BC A8 03 00 08 */ lha r0, 8(r3) -/* 80BA83C0 2C 00 00 F4 */ cmpwi r0, 0xf4 -/* 80BA83C4 40 82 02 74 */ bne lbl_80BA8638 -/* 80BA83C8 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA83CC 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA83D0 38 7E 00 34 */ addi r3, r30, 0x34 -/* 80BA83D4 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80BA83D8 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80BA83DC D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80BA83E0 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80BA83E4 3A C0 00 00 */ li r22, 0 -/* 80BA83E8 3B 60 00 00 */ li r27, 0 -/* 80BA83EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA83F0 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA83F4 3B 1E 00 30 */ addi r24, r30, 0x30 -lbl_80BA83F8: -/* 80BA83F8 80 77 5D 3C */ lwz r3, 0x5d3c(r23) -/* 80BA83FC 38 80 00 00 */ li r4, 0 -/* 80BA8400 90 81 00 08 */ stw r4, 8(r1) -/* 80BA8404 38 00 FF FF */ li r0, -1 -/* 80BA8408 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BA840C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BA8410 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BA8414 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BA8418 38 80 00 00 */ li r4, 0 -/* 80BA841C 7C B8 DA 2E */ lhzx r5, r24, r27 -/* 80BA8420 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 80BA8424 38 F9 01 0C */ addi r7, r25, 0x10c -/* 80BA8428 39 19 04 E4 */ addi r8, r25, 0x4e4 -/* 80BA842C 39 21 00 4C */ addi r9, r1, 0x4c -/* 80BA8430 39 40 00 FF */ li r10, 0xff -/* 80BA8434 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80BA8438 4B 4A 46 59 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BA843C 3A D6 00 01 */ addi r22, r22, 1 -/* 80BA8440 2C 16 00 02 */ cmpwi r22, 2 -/* 80BA8444 3B 7B 00 02 */ addi r27, r27, 2 -/* 80BA8448 41 80 FF B0 */ blt lbl_80BA83F8 -/* 80BA844C 80 1E 00 20 */ lwz r0, 0x20(r30) -/* 80BA8450 88 79 05 78 */ lbz r3, 0x578(r25) -/* 80BA8454 7C 00 18 00 */ cmpw r0, r3 -/* 80BA8458 40 82 00 58 */ bne lbl_80BA84B0 -/* 80BA845C 80 7D 00 40 */ lwz r3, 0x40(r29) -/* 80BA8460 38 03 00 01 */ addi r0, r3, 1 -/* 80BA8464 90 1D 00 40 */ stw r0, 0x40(r29) -/* 80BA8468 83 7D 00 44 */ lwz r27, 0x44(r29) -/* 80BA846C 2C 00 00 0A */ cmpwi r0, 0xa -/* 80BA8470 41 80 00 34 */ blt lbl_80BA84A4 -/* 80BA8474 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80BA8478 38 7D 00 5C */ addi r3, r29, 0x5c -/* 80BA847C 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA8480 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA8484 7C 63 02 14 */ add r3, r3, r0 -/* 80BA8488 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80BA848C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BA8490 FC 00 00 1E */ fctiwz f0, f0 -/* 80BA8494 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80BA8498 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 80BA849C 90 1D 00 44 */ stw r0, 0x44(r29) -/* 80BA84A0 48 00 00 5C */ b lbl_80BA84FC -lbl_80BA84A4: -/* 80BA84A4 57 60 08 3C */ slwi r0, r27, 1 -/* 80BA84A8 90 1D 00 44 */ stw r0, 0x44(r29) -/* 80BA84AC 48 00 00 50 */ b lbl_80BA84FC -lbl_80BA84B0: -/* 80BA84B0 90 7E 00 20 */ stw r3, 0x20(r30) -/* 80BA84B4 38 00 00 01 */ li r0, 1 -/* 80BA84B8 90 1D 00 40 */ stw r0, 0x40(r29) -/* 80BA84BC C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80BA84C0 38 7D 00 5C */ addi r3, r29, 0x5c -/* 80BA84C4 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA84C8 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA84CC 38 63 00 14 */ addi r3, r3, 0x14 -/* 80BA84D0 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80BA84D4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BA84D8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BA84DC D8 01 00 68 */ stfd f0, 0x68(r1) -/* 80BA84E0 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 80BA84E4 90 1D 00 44 */ stw r0, 0x44(r29) -/* 80BA84E8 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA84EC 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA84F0 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80BA84F4 4B 7B 9B B9 */ bl __cvt_fp2unsigned -/* 80BA84F8 7C 7B 1B 78 */ mr r27, r3 -lbl_80BA84FC: -/* 80BA84FC 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA8500 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA8504 38 7E 00 40 */ addi r3, r30, 0x40 -/* 80BA8508 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80BA850C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA8510 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BA8514 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BA8518 80 63 00 00 */ lwz r3, 0(r3) -/* 80BA851C 38 81 00 24 */ addi r4, r1, 0x24 -/* 80BA8520 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 80BA8524 80 DD 00 40 */ lwz r6, 0x40(r29) -/* 80BA8528 38 E0 00 00 */ li r7, 0 -/* 80BA852C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80BA8530 FC 40 08 90 */ fmr f2, f1 -/* 80BA8534 C0 7F 00 3C */ lfs f3, 0x3c(r31) -/* 80BA8538 FC 80 18 90 */ fmr f4, f3 -/* 80BA853C 39 00 00 00 */ li r8, 0 -/* 80BA8540 4B 70 34 45 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BA8544 80 1D 00 48 */ lwz r0, 0x48(r29) -/* 80BA8548 7C 00 DA 14 */ add r0, r0, r27 -/* 80BA854C 90 1D 00 48 */ stw r0, 0x48(r29) -/* 80BA8550 38 00 00 5A */ li r0, 0x5a -/* 80BA8554 B0 01 00 20 */ sth r0, 0x20(r1) -/* 80BA8558 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha /* 0x80023578@ha */ -/* 80BA855C 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 0x80023578@l */ -/* 80BA8560 38 81 00 20 */ addi r4, r1, 0x20 -/* 80BA8564 4B 47 12 95 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80BA8568 7C 76 1B 79 */ or. r22, r3, r3 -/* 80BA856C 41 82 00 C0 */ beq lbl_80BA862C -/* 80BA8570 88 19 05 78 */ lbz r0, 0x578(r25) -/* 80BA8574 28 00 00 02 */ cmplwi r0, 2 -/* 80BA8578 40 82 00 0C */ bne lbl_80BA8584 -/* 80BA857C 3B 40 00 00 */ li r26, 0 -/* 80BA8580 48 00 00 20 */ b lbl_80BA85A0 -lbl_80BA8584: -/* 80BA8584 28 00 00 01 */ cmplwi r0, 1 -/* 80BA8588 40 82 00 0C */ bne lbl_80BA8594 -/* 80BA858C 3B 40 00 01 */ li r26, 1 -/* 80BA8590 48 00 00 10 */ b lbl_80BA85A0 -lbl_80BA8594: -/* 80BA8594 28 00 00 00 */ cmplwi r0, 0 -/* 80BA8598 40 82 00 08 */ bne lbl_80BA85A0 -/* 80BA859C 3B 40 00 02 */ li r26, 2 -lbl_80BA85A0: -/* 80BA85A0 7F 83 E3 78 */ mr r3, r28 -/* 80BA85A4 4B 6B B4 A5 */ bl GetAc__8cCcD_ObjFv -/* 80BA85A8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80BA85AC D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80BA85B0 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80BA85B4 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80BA85B8 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80BA85BC D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80BA85C0 38 61 00 34 */ addi r3, r1, 0x34 -/* 80BA85C4 38 81 00 40 */ addi r4, r1, 0x40 -/* 80BA85C8 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 80BA85CC 4B 6B E5 19 */ bl __pl__4cXyzCFRC3Vec -/* 80BA85D0 38 61 00 28 */ addi r3, r1, 0x28 -/* 80BA85D4 38 81 00 34 */ addi r4, r1, 0x34 -/* 80BA85D8 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80BA85DC 4B 6B E6 3D */ bl __dv__4cXyzCFf -/* 80BA85E0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80BA85E4 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80BA85E8 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80BA85EC D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80BA85F0 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80BA85F4 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80BA85F8 7E C3 B3 78 */ mr r3, r22 -/* 80BA85FC 7F 44 D3 78 */ mr r4, r26 -/* 80BA8600 80 1D 00 40 */ lwz r0, 0x40(r29) -/* 80BA8604 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80BA8608 4B AA B9 51 */ bl setComboCount__13daBalloon2D_cFUcUc -/* 80BA860C 7E C3 B3 78 */ mr r3, r22 -/* 80BA8610 80 9D 00 48 */ lwz r4, 0x48(r29) -/* 80BA8614 4B AA B9 AD */ bl setScoreCount__13daBalloon2D_cFUl -/* 80BA8618 7E C3 B3 78 */ mr r3, r22 -/* 80BA861C 38 81 00 40 */ addi r4, r1, 0x40 -/* 80BA8620 7F 65 DB 78 */ mr r5, r27 -/* 80BA8624 7F 46 D3 78 */ mr r6, r26 -/* 80BA8628 4B AA B9 C5 */ bl addScoreCount__13daBalloon2D_cFP4cXyzUlUc -lbl_80BA862C: -/* 80BA862C 7F 23 CB 78 */ mr r3, r25 -/* 80BA8630 4B 47 16 4D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80BA8634 48 00 00 10 */ b lbl_80BA8644 -lbl_80BA8638: -/* 80BA8638 7F 23 CB 78 */ mr r3, r25 -/* 80BA863C 38 99 07 A0 */ addi r4, r25, 0x7a0 -/* 80BA8640 4B 47 20 8D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -lbl_80BA8644: -/* 80BA8644 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80BA8648 4B 7B 9B C5 */ bl _restgpr_22 -/* 80BA864C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80BA8650 7C 08 03 A6 */ mtlr r0 -/* 80BA8654 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80BA8658 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/cc_set__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/cc_set__15daObj_Balloon_cFv.s deleted file mode 100644 index 3b20726ddc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/cc_set__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80BA810C: -/* 80BA810C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA8110 7C 08 02 A6 */ mflr r0 -/* 80BA8114 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA8118 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BA811C 7C 7F 1B 78 */ mr r31, r3 -/* 80BA8120 80 63 05 70 */ lwz r3, 0x570(r3) -/* 80BA8124 38 63 00 24 */ addi r3, r3, 0x24 -/* 80BA8128 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA812C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA8130 4B 79 E3 81 */ bl PSMTXCopy -/* 80BA8134 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA8138 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA813C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80BA8140 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BA8144 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80BA8148 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BA814C C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80BA8150 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BA8154 38 7F 09 00 */ addi r3, r31, 0x900 -/* 80BA8158 38 81 00 08 */ addi r4, r1, 8 -/* 80BA815C 4B 6C 74 ED */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BA8160 38 7F 09 00 */ addi r3, r31, 0x900 -/* 80BA8164 88 1F 05 78 */ lbz r0, 0x578(r31) -/* 80BA8168 54 05 10 3A */ slwi r5, r0, 2 -/* 80BA816C 3C 80 80 BB */ lis r4, l_HIO@ha /* 0x80BA900C@ha */ -/* 80BA8170 38 04 90 0C */ addi r0, r4, l_HIO@l /* 0x80BA900C@l */ -/* 80BA8174 7C 80 2A 14 */ add r4, r0, r5 -/* 80BA8178 C0 24 00 08 */ lfs f1, 8(r4) -/* 80BA817C 3C 80 80 BB */ lis r4, balloon_radius@ha /* 0x80BA8E80@ha */ -/* 80BA8180 38 84 8E 80 */ addi r4, r4, balloon_radius@l /* 0x80BA8E80@l */ -/* 80BA8184 7C 04 2C 2E */ lfsx f0, r4, r5 -/* 80BA8188 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80BA818C 4B 6C 75 7D */ bl SetR__8cM3dGSphFf -/* 80BA8190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA8194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA8198 38 63 23 3C */ addi r3, r3, 0x233c -/* 80BA819C 38 9F 07 DC */ addi r4, r31, 0x7dc -/* 80BA81A0 4B 6B CA 09 */ bl Set__4cCcSFP8cCcD_Obj -/* 80BA81A4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BA81A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA81AC 7C 08 03 A6 */ mtlr r0 -/* 80BA81B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA81B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/create__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/create__15daObj_Balloon_cFv.s deleted file mode 100644 index 5ecd70a897..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/create__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,163 +0,0 @@ -lbl_80BA88C4: -/* 80BA88C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA88C8 7C 08 02 A6 */ mflr r0 -/* 80BA88CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA88D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA88D4 4B 7B 99 05 */ bl _savegpr_28 -/* 80BA88D8 7C 7D 1B 78 */ mr r29, r3 -/* 80BA88DC 3C 80 80 BB */ lis r4, lit_3656@ha /* 0x80BA8E0C@ha */ -/* 80BA88E0 3B E4 8E 0C */ addi r31, r4, lit_3656@l /* 0x80BA8E0C@l */ -/* 80BA88E4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BA88E8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BA88EC 40 82 00 E0 */ bne lbl_80BA89CC -/* 80BA88F0 7F A0 EB 79 */ or. r0, r29, r29 -/* 80BA88F4 41 82 00 CC */ beq lbl_80BA89C0 -/* 80BA88F8 7C 1E 03 78 */ mr r30, r0 -/* 80BA88FC 4B 47 02 69 */ bl __ct__10fopAc_ac_cFv -/* 80BA8900 38 7E 05 88 */ addi r3, r30, 0x588 -/* 80BA8904 4B 4C D5 A9 */ bl __ct__12dBgS_AcchCirFv -/* 80BA8908 3B 9E 05 C8 */ addi r28, r30, 0x5c8 -/* 80BA890C 7F 83 E3 78 */ mr r3, r28 -/* 80BA8910 4B 4C D7 91 */ bl __ct__9dBgS_AcchFv -/* 80BA8914 3C 60 80 BB */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80BA8F74@ha */ -/* 80BA8918 38 63 8F 74 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80BA8F74@l */ -/* 80BA891C 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80BA8920 38 03 00 0C */ addi r0, r3, 0xc -/* 80BA8924 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80BA8928 38 03 00 18 */ addi r0, r3, 0x18 -/* 80BA892C 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80BA8930 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80BA8934 4B 4D 05 35 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BA8938 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BA893C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BA8940 90 1E 07 B8 */ stw r0, 0x7b8(r30) -/* 80BA8944 38 7E 07 BC */ addi r3, r30, 0x7bc -/* 80BA8948 4B 4D AE 19 */ bl __ct__10dCcD_GSttsFv -/* 80BA894C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BA8950 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BA8954 90 7E 07 B8 */ stw r3, 0x7b8(r30) -/* 80BA8958 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BA895C 90 1E 07 BC */ stw r0, 0x7bc(r30) -/* 80BA8960 3B 9E 07 DC */ addi r28, r30, 0x7dc -/* 80BA8964 7F 83 E3 78 */ mr r3, r28 -/* 80BA8968 4B 4D B0 C1 */ bl __ct__12dCcD_GObjInfFv -/* 80BA896C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BA8970 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BA8974 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80BA8978 3C 60 80 BB */ lis r3, __vt__8cM3dGAab@ha /* 0x80BA8F68@ha */ -/* 80BA897C 38 03 8F 68 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BA8F68@l */ -/* 80BA8980 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80BA8984 3C 60 80 BB */ lis r3, __vt__8cM3dGSph@ha /* 0x80BA8F5C@ha */ -/* 80BA8988 38 03 8F 5C */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80BA8F5C@l */ -/* 80BA898C 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80BA8990 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80BA8994 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80BA8998 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80BA899C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BA89A0 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80BA89A4 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80BA89A8 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80BA89AC 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80BA89B0 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BA89B4 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80BA89B8 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BA89BC 90 1C 01 34 */ stw r0, 0x134(r28) -lbl_80BA89C0: -/* 80BA89C0 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80BA89C4 60 00 00 08 */ ori r0, r0, 8 -/* 80BA89C8 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80BA89CC: -/* 80BA89CC 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BA89D0 98 1D 05 78 */ stb r0, 0x578(r29) -/* 80BA89D4 88 1D 05 78 */ lbz r0, 0x578(r29) -/* 80BA89D8 28 00 00 FF */ cmplwi r0, 0xff -/* 80BA89DC 40 82 00 0C */ bne lbl_80BA89E8 -/* 80BA89E0 38 00 00 00 */ li r0, 0 -/* 80BA89E4 98 1D 05 78 */ stb r0, 0x578(r29) -lbl_80BA89E8: -/* 80BA89E8 38 7D 05 68 */ addi r3, r29, 0x568 -/* 80BA89EC 3C 80 80 BB */ lis r4, d_a_obj_balloon__stringBase0@ha /* 0x80BA8E54@ha */ -/* 80BA89F0 38 84 8E 54 */ addi r4, r4, d_a_obj_balloon__stringBase0@l /* 0x80BA8E54@l */ -/* 80BA89F4 4B 48 44 C9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BA89F8 7C 7E 1B 78 */ mr r30, r3 -/* 80BA89FC 2C 1E 00 04 */ cmpwi r30, 4 -/* 80BA8A00 40 82 01 14 */ bne lbl_80BA8B14 -/* 80BA8A04 7F A3 EB 78 */ mr r3, r29 -/* 80BA8A08 3C 80 80 BB */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80BA88A4@ha */ -/* 80BA8A0C 38 84 88 A4 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80BA88A4@l */ -/* 80BA8A10 38 A0 0D 60 */ li r5, 0xd60 -/* 80BA8A14 4B 47 1A 9D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80BA8A18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BA8A1C 40 82 00 0C */ bne lbl_80BA8A28 -/* 80BA8A20 38 60 00 05 */ li r3, 5 -/* 80BA8A24 48 00 00 F4 */ b lbl_80BA8B18 -lbl_80BA8A28: -/* 80BA8A28 3C 60 80 BB */ lis r3, data_80BA8FFC@ha /* 0x80BA8FFC@ha */ -/* 80BA8A2C 8C 03 8F FC */ lbzu r0, data_80BA8FFC@l(r3) /* 0x80BA8FFC@l */ -/* 80BA8A30 28 00 00 00 */ cmplwi r0, 0 -/* 80BA8A34 40 82 00 20 */ bne lbl_80BA8A54 -/* 80BA8A38 38 00 00 01 */ li r0, 1 -/* 80BA8A3C 98 1D 09 14 */ stb r0, 0x914(r29) -/* 80BA8A40 98 03 00 00 */ stb r0, 0(r3) -/* 80BA8A44 38 00 FF FF */ li r0, -1 -/* 80BA8A48 3C 60 80 BB */ lis r3, l_HIO@ha /* 0x80BA900C@ha */ -/* 80BA8A4C 38 63 90 0C */ addi r3, r3, l_HIO@l /* 0x80BA900C@l */ -/* 80BA8A50 98 03 00 04 */ stb r0, 4(r3) -lbl_80BA8A54: -/* 80BA8A54 38 00 00 00 */ li r0, 0 -/* 80BA8A58 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80BA8A5C 80 7D 05 70 */ lwz r3, 0x570(r29) -/* 80BA8A60 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BA8A64 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80BA8A68 7F A3 EB 78 */ mr r3, r29 -/* 80BA8A6C C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80BA8A70 FC 40 08 90 */ fmr f2, f1 -/* 80BA8A74 FC 60 08 90 */ fmr f3, f1 -/* 80BA8A78 4B 47 1A B1 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80BA8A7C 7F A3 EB 78 */ mr r3, r29 -/* 80BA8A80 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 80BA8A84 FC 40 08 90 */ fmr f2, f1 -/* 80BA8A88 FC 60 08 90 */ fmr f3, f1 -/* 80BA8A8C 4B 47 1A AD */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80BA8A90 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80BA8A94 D0 1D 05 20 */ stfs f0, 0x520(r29) -/* 80BA8A98 38 00 00 00 */ li r0, 0 -/* 80BA8A9C 90 01 00 08 */ stw r0, 8(r1) -/* 80BA8AA0 38 7D 05 C8 */ addi r3, r29, 0x5c8 -/* 80BA8AA4 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BA8AA8 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80BA8AAC 7F A6 EB 78 */ mr r6, r29 -/* 80BA8AB0 38 E0 00 01 */ li r7, 1 -/* 80BA8AB4 39 1D 05 88 */ addi r8, r29, 0x588 -/* 80BA8AB8 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80BA8ABC 39 40 00 00 */ li r10, 0 -/* 80BA8AC0 4B 4C D7 89 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80BA8AC4 38 7D 05 88 */ addi r3, r29, 0x588 -/* 80BA8AC8 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80BA8ACC FC 40 08 90 */ fmr f2, f1 -/* 80BA8AD0 4B 4C D4 89 */ bl SetWall__12dBgS_AcchCirFff -/* 80BA8AD4 38 00 00 3C */ li r0, 0x3c -/* 80BA8AD8 B0 1D 05 62 */ sth r0, 0x562(r29) -/* 80BA8ADC B0 1D 05 60 */ sth r0, 0x560(r29) -/* 80BA8AE0 38 7D 07 A0 */ addi r3, r29, 0x7a0 -/* 80BA8AE4 38 80 00 FF */ li r4, 0xff -/* 80BA8AE8 38 A0 00 00 */ li r5, 0 -/* 80BA8AEC 7F A6 EB 78 */ mr r6, r29 -/* 80BA8AF0 4B 4D AD 71 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BA8AF4 38 7D 07 DC */ addi r3, r29, 0x7dc -/* 80BA8AF8 3C 80 80 BB */ lis r4, cc_sph_src@ha /* 0x80BA8EA8@ha */ -/* 80BA8AFC 38 84 8E A8 */ addi r4, r4, cc_sph_src@l /* 0x80BA8EA8@l */ -/* 80BA8B00 4B 4D BF 35 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80BA8B04 38 1D 07 A0 */ addi r0, r29, 0x7a0 -/* 80BA8B08 90 1D 08 20 */ stw r0, 0x820(r29) -/* 80BA8B0C 7F A3 EB 78 */ mr r3, r29 -/* 80BA8B10 4B FF FB FD */ bl daObj_Balloon_Execute__FP15daObj_Balloon_c -lbl_80BA8B14: -/* 80BA8B14 7F C3 F3 78 */ mr r3, r30 -lbl_80BA8B18: -/* 80BA8B18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BA8B1C 4B 7B 97 09 */ bl _restgpr_28 -/* 80BA8B20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA8B24 7C 08 03 A6 */ mtlr r0 -/* 80BA8B28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA8B2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Create__FP15daObj_Balloon_c.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Create__FP15daObj_Balloon_c.s deleted file mode 100644 index 13d58a7b7d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Create__FP15daObj_Balloon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA8CFC: -/* 80BA8CFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8D00 7C 08 02 A6 */ mflr r0 -/* 80BA8D04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8D08 4B FF FB BD */ bl create__15daObj_Balloon_cFv -/* 80BA8D0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8D10 7C 08 03 A6 */ mtlr r0 -/* 80BA8D14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8D18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Delete__FP15daObj_Balloon_c.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Delete__FP15daObj_Balloon_c.s deleted file mode 100644 index 0947f124ee..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Delete__FP15daObj_Balloon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA87AC: -/* 80BA87AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA87B0 7C 08 02 A6 */ mflr r0 -/* 80BA87B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA87B8 4B FF FF 7D */ bl _delete__15daObj_Balloon_cFv -/* 80BA87BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA87C0 7C 08 03 A6 */ mtlr r0 -/* 80BA87C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA87C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Draw__FP15daObj_Balloon_c.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Draw__FP15daObj_Balloon_c.s deleted file mode 100644 index 7c885d9357..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Draw__FP15daObj_Balloon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA80D4: -/* 80BA80D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA80D8 7C 08 02 A6 */ mflr r0 -/* 80BA80DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA80E0 4B FF FF 15 */ bl draw__15daObj_Balloon_cFv -/* 80BA80E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA80E8 7C 08 03 A6 */ mtlr r0 -/* 80BA80EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA80F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Execute__FP15daObj_Balloon_c.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Execute__FP15daObj_Balloon_c.s deleted file mode 100644 index 7e241238c5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Execute__FP15daObj_Balloon_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA870C: -/* 80BA870C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8710 7C 08 02 A6 */ mflr r0 -/* 80BA8714 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8718 4B FF FF B5 */ bl execute__15daObj_Balloon_cFv -/* 80BA871C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8720 7C 08 03 A6 */ mtlr r0 -/* 80BA8724 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8728 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/draw__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/draw__15daObj_Balloon_cFv.s deleted file mode 100644 index e66a72acb4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/draw__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80BA7FF4: -/* 80BA7FF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BA7FF8 7C 08 02 A6 */ mflr r0 -/* 80BA7FFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BA8000 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BA8004 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BA8008 7C 7E 1B 78 */ mr r30, r3 -/* 80BA800C 3C 60 80 BB */ lis r3, lit_3656@ha /* 0x80BA8E0C@ha */ -/* 80BA8010 3B E3 8E 0C */ addi r31, r3, lit_3656@l /* 0x80BA8E0C@l */ -/* 80BA8014 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BA8018 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BA801C 38 80 00 10 */ li r4, 0x10 -/* 80BA8020 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BA8024 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BA8028 4B 5F B7 9D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BA802C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BA8030 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BA8034 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80BA8038 80 84 00 04 */ lwz r4, 4(r4) -/* 80BA803C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BA8040 4B 5F CD 61 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BA8044 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80BA8048 80 83 00 04 */ lwz r4, 4(r3) -/* 80BA804C 7F C3 F3 78 */ mr r3, r30 -/* 80BA8050 4B 47 53 DD */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -/* 80BA8054 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80BA8058 4B 46 5C 6D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BA805C C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80BA8060 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 80BA8064 C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 80BA8068 EC 20 18 2A */ fadds f1, f0, f3 -/* 80BA806C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BA8070 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BA8074 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80BA8078 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80BA807C 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80BA8080 38 80 00 01 */ li r4, 1 -/* 80BA8084 80 BE 05 70 */ lwz r5, 0x570(r30) -/* 80BA8088 38 C1 00 08 */ addi r6, r1, 8 -/* 80BA808C C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80BA8090 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80BA8094 C0 9E 06 60 */ lfs f4, 0x660(r30) -/* 80BA8098 38 FE 06 B8 */ addi r7, r30, 0x6b8 -/* 80BA809C 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80BA80A0 39 20 00 00 */ li r9, 0 -/* 80BA80A4 C0 BF 00 00 */ lfs f5, 0(r31) -/* 80BA80A8 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80BA80AC 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80BA80B0 4B 48 68 61 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80BA80B4 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80BA80B8 38 60 00 01 */ li r3, 1 -/* 80BA80BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BA80C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BA80C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BA80C8 7C 08 03 A6 */ mtlr r0 -/* 80BA80CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BA80D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/execute__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/execute__15daObj_Balloon_cFv.s deleted file mode 100644 index b849610f70..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/execute__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80BA86CC: -/* 80BA86CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA86D0 7C 08 02 A6 */ mflr r0 -/* 80BA86D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA86D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA86DC 7C 7F 1B 78 */ mr r31, r3 -/* 80BA86E0 4B FF FA D9 */ bl action__15daObj_Balloon_cFv -/* 80BA86E4 7F E3 FB 78 */ mr r3, r31 -/* 80BA86E8 4B FF FA 25 */ bl cc_set__15daObj_Balloon_cFv -/* 80BA86EC 7F E3 FB 78 */ mr r3, r31 -/* 80BA86F0 4B FF FF 6D */ bl mtx_set__15daObj_Balloon_cFv -/* 80BA86F4 38 60 00 01 */ li r3, 1 -/* 80BA86F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA86FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA8700 7C 08 03 A6 */ mtlr r0 -/* 80BA8704 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA8708 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DE8.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DE8.s deleted file mode 100644 index e468a7324a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DE8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BA8DE8: -/* 80BA8DE8 38 63 FF DC */ addi r3, r3, -36 -/* 80BA8DEC 4B FF FE 30 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DF0.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DF0.s deleted file mode 100644 index 46e9aa1041..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DF0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BA8DF0: -/* 80BA8DF0 38 63 FF EC */ addi r3, r3, -20 -/* 80BA8DF4 4B FF FE 28 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/mtx_set__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/mtx_set__15daObj_Balloon_cFv.s deleted file mode 100644 index 2b2c9c3b7b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/mtx_set__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BA865C: -/* 80BA865C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA8660 7C 08 02 A6 */ mflr r0 -/* 80BA8664 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA8668 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BA866C 7C 7F 1B 78 */ mr r31, r3 -/* 80BA8670 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BA8674 4B 46 46 F1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BA8678 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BA867C 4B 46 48 C9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BA8680 3C 60 80 BB */ lis r3, l_HIO@ha /* 0x80BA900C@ha */ -/* 80BA8684 38 63 90 0C */ addi r3, r3, l_HIO@l /* 0x80BA900C@l */ -/* 80BA8688 88 1F 05 78 */ lbz r0, 0x578(r31) -/* 80BA868C 54 00 10 3A */ slwi r0, r0, 2 -/* 80BA8690 7C 63 02 14 */ add r3, r3, r0 -/* 80BA8694 C0 23 00 08 */ lfs f1, 8(r3) -/* 80BA8698 FC 40 08 90 */ fmr f2, f1 -/* 80BA869C FC 60 08 90 */ fmr f3, f1 -/* 80BA86A0 4B 46 47 99 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80BA86A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BA86A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BA86AC 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BA86B0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BA86B4 4B 79 DD FD */ bl PSMTXCopy -/* 80BA86B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BA86BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA86C0 7C 08 03 A6 */ mtlr r0 -/* 80BA86C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA86C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/saveBestScore__15daObj_Balloon_cFv.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/saveBestScore__15daObj_Balloon_cFv.s deleted file mode 100644 index 4fcb1fe9ca..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/saveBestScore__15daObj_Balloon_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80BA80F4: -/* 80BA80F4 3C 60 80 BB */ lis r3, data_80BA8FF8@ha /* 0x80BA8FF8@ha */ -/* 80BA80F8 80 03 8F F8 */ lwz r0, data_80BA8FF8@l(r3) /* 0x80BA8FF8@l */ -/* 80BA80FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BA8100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BA8104 90 03 5E 0C */ stw r0, 0x5e0c(r3) -/* 80BA8108 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index d75864294e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BA88A4: -/* 80BA88A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BA88A8 7C 08 02 A6 */ mflr r0 -/* 80BA88AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BA88B0 4B FF FF 1D */ bl CreateHeap__15daObj_Balloon_cFv -/* 80BA88B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BA88B8 7C 08 03 A6 */ mtlr r0 -/* 80BA88BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BA88C0 4E 80 00 20 */ blr diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index b030682561..3556917b9a 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -178,6 +178,8 @@ public: } void setMapDrugFlag(u8 flag) { mMapDrugFlag = flag; } bool isTempBit(int bit) { return mTempBits & (1 << bit) != 0; } + void offSub2DStatus(int bit) { mSub2DStatus &= ~(1 << bit); } + void onSub2DStatus(int bit) { mSub2DStatus |= 1 << bit; } public: /* 0x04 */ u8 unk4[4]; @@ -715,6 +717,15 @@ inline bool dMeter2Info_isTempBit(int bit) { return g_meter2_info.isTempBit(bit); } +inline void dMeter2Info_offSub2DStatus(int bit) { + g_meter2_info.offSub2DStatus(bit); +} + +inline void dMeter2Info_onSub2DStatus(int bit) { + g_meter2_info.onSub2DStatus(bit); +} + +const char* dMeter2Info_getPlusTextureName(); const char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h b/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h index 5b4085b02c..69a1a15e21 100644 --- a/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h +++ b/include/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h @@ -2,5 +2,165 @@ #define D_A_BALLOON_2D_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/d_drawlist.h" +#include "d/s/d_s_play.h" + +class J2DScreen; +class CPaneMgr; +class J2DPicture; +class J2DPane; +class J2DTextBox; + +class daBalloon2D_c : public fopAc_ac_c, public request_of_phase_process_class { +public: + class c_list + #ifdef NONMATCHING + : public dDlst_base_c + #endif + { + public: + c_list() { mBalloon = NULL; } + void set(daBalloon2D_c* i_this) { mBalloon = i_this; } + + #ifdef NONMATCHING + /* 806534CC */ virtual void draw(); + /* 8065544C */ virtual ~c_list(); + #else + void draw(); + ~c_list(); + void* vtable; + #endif + + daBalloon2D_c* mBalloon; + }; + + class CHeadScore { + public: + /* 80655304 */ ~CHeadScore(); + /* 80655340 */ CHeadScore(); + }; + + daBalloon2D_c() { + initiate(); + } + + /* 80653538 */ int createHeap(); + /* 80653D24 */ int create(); + /* 80653DB4 */ int destroy(); + /* 80653E10 */ int draw(); + /* 80653EC0 */ int execute(); + /* 80653F04 */ void drawMeter(); + /* 80653F58 */ void setComboCount(u8, u8); + /* 80653FC0 */ void setScoreCount(u32); + /* 80653FEC */ void addScoreCount(cXyz*, u32, u8); + /* 806540B4 */ void initiate(); + /* 806540B8 */ void update(); + /* 806540BC */ void setComboNum(u8); + /* 806541B4 */ void setBalloonSize(u8); + /* 80654258 */ void setScoreNum(int); + /* 80654440 */ void setAllAlpha(); + /* 8065464C */ void setComboAlpha(); + /* 80654730 */ void drawAddScore(); + /* 80654E8C */ void setHIO(bool); + /* 80655494 */ + #ifdef NONMATCHING + virtual + #endif + ~daBalloon2D_c(); + + void show() { mIsVisible = 1; } + void hide() { mIsVisible = 0; } + u8 isVisible() { return mIsVisible; } + + static daBalloon2D_c* myclass; + + struct ScoreCount { + cXyz field_0x0; + u16 field_0xc; + u8 field_0xe; + u8 field_0xf; + }; + + #ifdef NONMATCHING + #else + /* 0x570 */ u32 vtable; + #endif + /* 0x574 */ J2DScreen* mScreen; + /* 0x578 */ CPaneMgr* field_0x578; + /* 0x57C */ CPaneMgr* field_0x57c; + /* 0x580 */ CPaneMgr* field_0x580; + /* 0x584 */ CPaneMgr* field_0x584; + /* 0x588 */ CPaneMgr* field_0x588; + /* 0x58C */ CPaneMgr* field_0x58c; + /* 0x590 */ CPaneMgr* field_0x590; + /* 0x594 */ CPaneMgr* field_0x594; + /* 0x598 */ CPaneMgr* field_0x598; + /* 0x59C */ CPaneMgr* field_0x59c; + /* 0x5A0 */ CPaneMgr* field_0x5a0; + /* 0x5A4 */ CPaneMgr* field_0x5a4; + /* 0x5A8 */ J2DPicture* field_0x5a8[7]; + /* 0x5A4 */ J2DPicture* field_0x5c4[10]; + /* 0x5EC */ J2DPicture* field_0x5ec; + /* 0x5F0 */ c_list field_0x5f0; + /* 0x5F8 */ ScoreCount field_0x5f8[20]; + /* 0x738 */ f32 mAllAlpha; + /* 0x73C */ f32 mComboAlpha; + /* 0x740 */ u32 mScoreCount; + /* 0x744 */ u8 mComboNum; + /* 0x745 */ u8 mBalloonSize; + /* 0x746 */ u8 mIsVisible; +}; + +class daBalloon2D_HIO_c /*: public mDoHIO_entry_c */ { +public: + /* 806553A8 */ /* virtual */ ~daBalloon2D_HIO_c(); + /* 0x00 */ u32 field_0x00; + /* 0x04 */ u8 field_0x04; + /* 0x00 */ u8 field_0x05[0x20 - 5]; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6c; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7c; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8c; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; + /* 0x9C */ f32 field_0x9c; + /* 0xA0 */ f32 field_0xa0; + /* 0xA4 */ f32 field_0xa4; + /* 0xA8 */ f32 field_0xa8; + /* 0xAC */ f32 field_0xac; + /* 0xB0 */ f32 field_0xb0; + /* 0xB4 */ f32 field_0xb4; + /* 0xB8 */ f32 field_0xb8; + /* 0xBC */ f32 field_0xbc; + /* 0xC0 */ f32 field_0xc0; + /* 0xC4 */ f32 field_0xc4; +}; #endif /* D_A_BALLOON_2D_H */ diff --git a/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h b/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h index 073d6c12c5..6313903559 100644 --- a/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h +++ b/include/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h @@ -1,5 +1,50 @@ #ifndef D_A_OBJ_BALLOON_H #define D_A_OBJ_BALLOON_H +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "SSystem/SComponent/c_m3d_g_sph.h" +#include "d/cc/d_cc_d.h" +#include "SSystem/SComponent/c_phase.h" + +class daObj_Balloon_c : public fopAc_ac_c { +public: + /* 80BA7FF4 */ int draw(); + /* 80BA80F4 */ void saveBestScore(); + /* 80BA810C */ void cc_set(); + /* 80BA81B8 */ void action(); + /* 80BA865C */ void mtx_set(); + /* 80BA86CC */ int execute(); + /* 80BA8734 */ int _delete(); + /* 80BA87CC */ int CreateHeap(); + /* 80BA88C4 */ int create(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mModel; + /* 0x574 */ int field_0x574; + /* 0x578 */ u8 field_0x578; + /* 0x579 */ u8 field_0x579; + /* 0x57C */ int field_0x57c; + /* 0x580 */ s16 field_0x580; + /* 0x582 */ s16 field_0x582; + /* 0x584 */ s16 field_0x584; + /* 0x586 */ s16 field_0x586; + /* 0x588 */ dBgS_AcchCir mAcchCir; + /* 0x5C8 */ dBgS_ObjAcch mAcch; + /* 0x7A0 */ dCcD_Stts mStts; + /* 0x7D8 */ dCcD_Sph mSph; + /* 0x914 */ u8 field_0x914; + /* 0x914 */ u8 mUnused[8]; +}; + +class daObj_Balloon_HIO_c { +public: + /* 80BA7FAC */ daObj_Balloon_HIO_c(); + /* 80BA8D64 */ virtual ~daObj_Balloon_HIO_c() {} + + /* 0x04 */ s8 field_0x04; + /* 0x08 */ f32 field_0x08[3]; + /* 0x14 */ f32 field_0x14[3]; +}; #endif /* D_A_OBJ_BALLOON_H */ diff --git a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp index 2036007f4c..994804a2e5 100644 --- a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp +++ b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp @@ -4,128 +4,27 @@ // #include "rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/pane/d_pane_class.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_object.h" +#include "m_Do/m_Do_lib.h" #include "dol2asm.h" // // Types: // -struct request_of_phase_process_class {}; - -struct mDoHIO_entry_c { - /* 80655404 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct daBalloon2D_c { - struct c_list { - /* 806534CC */ void draw(); - /* 8065544C */ ~c_list(); - }; - - struct CHeadScore { - /* 80655304 */ ~CHeadScore(); - /* 80655340 */ CHeadScore(); - }; - - /* 80653538 */ void createHeap(); - /* 80653D24 */ void create(); - /* 80653DB4 */ void destroy(); - /* 80653E10 */ void draw(); - /* 80653EC0 */ void execute(); - /* 80653F04 */ void drawMeter(); - /* 80653F58 */ void setComboCount(u8, u8); - /* 80653FC0 */ void setScoreCount(u32); - /* 80653FEC */ void addScoreCount(cXyz*, u32, u8); - /* 806540B4 */ void initiate(); - /* 806540B8 */ void update(); - /* 806540BC */ void setComboNum(u8); - /* 806541B4 */ void setBalloonSize(u8); - /* 80654258 */ void setScoreNum(int); - /* 80654440 */ void setAllAlpha(); - /* 8065464C */ void setComboAlpha(); - /* 80654730 */ void drawAddScore(); - /* 80654E8C */ void setHIO(bool); - /* 80655494 */ ~daBalloon2D_c(); - - static u8 myclass[4]; -}; - -struct daBalloon2D_HIO_c { - /* 806553A8 */ ~daBalloon2D_HIO_c(); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); -}; - -struct dMsgObject_c { - /* 8023822C */ void getStatus(); -}; - struct JMSMesgEntry_c {}; -struct dMeter2Info_c { - /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); -}; - -struct dDlst_base_c { - /* 806553A4 */ void draw(); -}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct Vec {}; - struct ResTIMG {}; -struct JMath { - static u8 sincosTable_[65536]; -}; - struct JKRExpHeap {}; -struct JKRArchive {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802545B0 */ void paneTrans(f32, f32); -}; - // // Forward References: // @@ -169,7 +68,6 @@ extern "C" u8 myclass__13daBalloon2D_c[4]; // External References: // -SECTION_INIT void memcpy(); extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoLib_project__FP3VecP3Vec(); extern "C" void __ct__10fopAc_ac_cFv(); @@ -207,10 +105,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_23(); 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" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -219,24 +113,15 @@ extern "C" void __register_global_object(); // /* 806534CC-80653518 0000EC 004C+00 1/0 0/0 0/0 .text draw__Q213daBalloon2D_c6c_listFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::c_list::draw() { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__Q213daBalloon2D_c6c_listFv.s" +void daBalloon2D_c::c_list::draw() { + dComIfGp_getCurrentGrafPort()->setup2D(); + mBalloon->drawMeter(); } -#pragma pop /* 80653518-80653538 000138 0020+00 1/1 0/0 0/0 .text daBalloon2D_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBalloon2D_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_createHeap__FP10fopAc_ac_c.s" +static int daBalloon2D_createHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); } -#pragma pop /* ############################################################################################## */ /* 806555AC-806555B0 000000 0004+00 5/5 0/0 0/0 .rodata @3896 */ @@ -275,69 +160,172 @@ SECTION_DATA static u8 data_80655610[196] = { }; /* 806556D4-806556D8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_balloon_2D__stringBase0; +static char* l_arcName = "Balloon2D"; /* 80653538-80653D24 000158 07EC+00 1/1 0/0 0/0 .text createHeap__13daBalloon2D_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daBalloon2D_c::createHeap() { + mScreen = new J2DScreen(); + if (mScreen == NULL) { + return 0; + } + dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName); + JUT_ASSERT(445, resInfo != 0); + JKRArchive* arc = resInfo->getArchive(); + mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc); + dPaneClass_showNullPane(mScreen); + field_0x578 = new CPaneMgr(mScreen, 'n_all', 2, NULL); + field_0x57c = new CPaneMgr(mScreen, 'score_tn', 0, NULL); + field_0x580 = new CPaneMgr(mScreen, 'suji_n', 2, NULL); + field_0x584 = new CPaneMgr(mScreen, 's_set_n', 0, NULL); + field_0x588 = new CPaneMgr(mScreen, 'tas_n', 0, NULL); + field_0x58c = new CPaneMgr(mScreen, 'combo_tn', 0, NULL); + field_0x590 = new CPaneMgr(mScreen, 'num_n', 0, NULL); + field_0x594 = new CPaneMgr(mScreen, 'co_set_n', 2, NULL); + field_0x598 = new CPaneMgr(mScreen, 'bal_3_n', 2, NULL); + field_0x59c = new CPaneMgr(mScreen, 'bal_2_n', 2, NULL); + field_0x5a0 = new CPaneMgr(mScreen, 'bal_1_n', 2, NULL); + field_0x5a4 = new CPaneMgr(mScreen, 'ba_com_n', 2, NULL); + field_0x578->setAlphaRate(0.0f); + field_0x5a4->setAlphaRate(0.0f); + for (s32 i = 0; i < 10; i++) { + ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(i)); + field_0x5c4[i] = new J2DPicture(resTimg); + } + ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getPlusTextureName()); + field_0x5ec = new J2DPicture(resTimg); + if (field_0x578 == NULL || field_0x57c == NULL || field_0x580 == NULL || + field_0x584 == NULL ||field_0x588 == NULL || field_0x58c == NULL || + field_0x590 == NULL || field_0x594 == NULL || field_0x598 == NULL || + field_0x59c == NULL || field_0x5a0 == NULL || field_0x5a4 == NULL || field_0x5c4[0] == NULL || field_0x5c4[1] == NULL || field_0x5c4[2] == NULL || + field_0x5c4[3] == NULL || field_0x5c4[4] == NULL || field_0x5c4[5] == NULL || + field_0x5c4[6] == NULL || field_0x5c4[7] == NULL || field_0x5c4[8] == NULL || + field_0x5c4[9] == NULL || field_0x5ec == NULL) + { + return 0; + } + J2DTextBox* combos[2]; + J2DTextBox* scores[2]; + combos[0] = (J2DTextBox*)mScreen->search('combo_ts'); + combos[1] = (J2DTextBox*)mScreen->search('combo_t'); + scores[0] = (J2DTextBox*)mScreen->search('score_ts'); + scores[1] = (J2DTextBox*)mScreen->search('score_t'); + field_0x5a8[0] = (J2DPicture*)mScreen->search('suji_4'); + field_0x5a8[1] = (J2DPicture*)mScreen->search('suji_3'); + field_0x5a8[2] = (J2DPicture*)mScreen->search('suji_2'); + field_0x5a8[3] = (J2DPicture*)mScreen->search('suji_1'); + field_0x5a8[4] = (J2DPicture*)mScreen->search('suji_0'); + field_0x5a8[5] = (J2DPicture*)mScreen->search('num_1'); + field_0x5a8[6] = (J2DPicture*)mScreen->search('num_0'); + for (int i = 0; i < 2; i++) { + combos[i]->setString(32, ""); + scores[i]->setString(32, ""); + dMeter2Info_getStringKanji(0x53f, combos[i]->getStringPtr(), 0); + dMeter2Info_getStringKanji(0x53e, scores[i]->getStringPtr(), 0); + combos[i]->setFont(mDoExt_getMesgFont()); + scores[i]->setFont(mDoExt_getMesgFont()); + } + setComboNum(0); + setBalloonSize(0); + setScoreNum(0); + field_0x5f0.set(this); + if ((fopAcM_GetParam(this) & 1)) { + show(); + } else { + hide(); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBalloon2D_c::createHeap() { +asm int daBalloon2D_c::createHeap() { nofralloc #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/createHeap__13daBalloon2D_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80655770-8065577C 000008 000C+00 1/1 0/0 0/0 .bss @3779 */ static u8 lit_3779[12]; /* 8065577C-80655844 000014 00C8+00 3/3 0/0 0/0 .bss l_HOSTIO */ +#ifdef NONMATCHING +daBalloon2D_HIO_c l_HOSTIO; +#else static u8 l_HOSTIO[200]; +#endif /* 80655844-80655848 0000DC 0004+00 2/2 0/0 0/0 .bss myclass__13daBalloon2D_c */ -u8 daBalloon2D_c::myclass[4]; +daBalloon2D_c* daBalloon2D_c::myclass; /* 80653D24-80653DB4 000944 0090+00 1/1 0/0 0/0 .text create__13daBalloon2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::create() { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/create__13daBalloon2D_cFv.s" +int daBalloon2D_c::create() { + int rv = dComIfG_resLoad(this, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, daBalloon2D_createHeap, 0)) { + return cPhs_ERROR_e; + } + JUT_ASSERT(566, daBalloon2D_c::myclass == 0); + myclass = this; + setHIO(true); + } + return rv; } -#pragma pop /* 80653DB4-80653E10 0009D4 005C+00 1/1 0/0 0/0 .text destroy__13daBalloon2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::destroy() { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/destroy__13daBalloon2D_cFv.s" +int daBalloon2D_c::destroy() { + dComIfG_resDelete(this, l_arcName); + myclass = NULL; + dMeter2Info_offSub2DStatus(1); + return 1; } -#pragma pop /* 80653E10-80653EC0 000A30 00B0+00 1/1 0/0 0/0 .text draw__13daBalloon2D_cFv */ +// Matches with virtual +#ifdef NONMATCHING +int daBalloon2D_c::draw() { + if (isVisible() && !dComIfGp_isPauseFlag() && + !dMsgObject_isTalkNowCheck()) + { + dComIfGd_set2DOpa(&field_0x5f0); + dMeter2Info_onSub2DStatus(1); + } else { + dMeter2Info_offSub2DStatus(1); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBalloon2D_c::draw() { +asm int daBalloon2D_c::draw() { nofralloc #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/draw__13daBalloon2D_cFv.s" } #pragma pop +#endif /* 80653EC0-80653F04 000AE0 0044+00 1/1 0/0 0/0 .text execute__13daBalloon2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::execute() { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/execute__13daBalloon2D_cFv.s" +int daBalloon2D_c::execute() { + setAllAlpha(); + setComboAlpha(); + setHIO(false); + return 1; } -#pragma pop /* 80653F04-80653F58 000B24 0054+00 1/1 0/0 0/0 .text drawMeter__13daBalloon2D_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daBalloon2D_c::drawMeter() { + update(); + mScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); + drawAddScore(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -346,79 +334,114 @@ asm void daBalloon2D_c::drawMeter() { #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/drawMeter__13daBalloon2D_cFv.s" } #pragma pop +#endif /* 80653F58-80653FC0 000B78 0068+00 0/0 0/0 1/1 .text setComboCount__13daBalloon2D_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::setComboCount(u8 param_0, u8 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboCount__13daBalloon2D_cFUcUc.s" +void daBalloon2D_c::setComboCount(u8 size, u8 comboNum) { + if (mComboNum != comboNum) { + setComboNum(comboNum); + } + if (mBalloonSize != size) { + setBalloonSize(size); + } } -#pragma pop /* 80653FC0-80653FEC 000BE0 002C+00 0/0 0/0 2/2 .text setScoreCount__13daBalloon2D_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::setScoreCount(u32 param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreCount__13daBalloon2D_cFUl.s" +void daBalloon2D_c::setScoreCount(u32 scoreCount) { + if (mScoreCount != scoreCount) { + setScoreNum(scoreCount); + } } -#pragma pop /* 80653FEC-806540B4 000C0C 00C8+00 0/0 0/0 1/1 .text addScoreCount__13daBalloon2D_cFP4cXyzUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::addScoreCount(cXyz* param_0, u32 param_1, u8 param_2) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/addScoreCount__13daBalloon2D_cFP4cXyzUlUc.s" +void daBalloon2D_c::addScoreCount(cXyz* param_1, u32 param_2, u8 param_3) { + for (int i = 0; i < 19; i++) { + int current = 19 - i; + int prev = current - 1; + field_0x5f8[current].field_0x0.set(field_0x5f8[prev].field_0x0); + field_0x5f8[current].field_0xc = field_0x5f8[prev].field_0xc; + field_0x5f8[current].field_0xe = field_0x5f8[prev].field_0xe; + field_0x5f8[current].field_0xf = field_0x5f8[prev].field_0xf; + } + cXyz acStack_2c; + mDoLib_project(param_1, &acStack_2c); + field_0x5f8[0].field_0x0.set(acStack_2c); + field_0x5f8[0].field_0xc = param_2; + field_0x5f8[0].field_0xe = 60; + field_0x5f8[0].field_0xf = param_3; } -#pragma pop /* 806540B4-806540B8 000CD4 0004+00 1/1 0/0 0/0 .text initiate__13daBalloon2D_cFv */ void daBalloon2D_c::initiate() { - /* empty function */ } /* 806540B8-806540BC 000CD8 0004+00 1/1 0/0 0/0 .text update__13daBalloon2D_cFv */ void daBalloon2D_c::update() { - /* empty function */ } /* 806540BC-806541B4 000CDC 00F8+00 2/2 0/0 0/0 .text setComboNum__13daBalloon2D_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::setComboNum(u8 param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboNum__13daBalloon2D_cFUc.s" +void daBalloon2D_c::setComboNum(u8 comboNum) { + if (comboNum > 99) { + comboNum = 99; + } + mComboNum = comboNum; + ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(comboNum / 10)); + field_0x5a8[5]->changeTexture(resTimg, 0); + resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(comboNum % 10)); + field_0x5a8[6]->changeTexture(resTimg, 0); + setComboAlpha(); } -#pragma pop /* 806541B4-80654258 000DD4 00A4+00 2/2 0/0 0/0 .text setBalloonSize__13daBalloon2D_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::setBalloonSize(u8 param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setBalloonSize__13daBalloon2D_cFUc.s" +void daBalloon2D_c::setBalloonSize(u8 balloonSize) { + mBalloonSize = balloonSize; + switch(balloonSize) { + case 0: + field_0x598->show(); + field_0x59c->hide(); + field_0x5a0->hide(); + break; + case 1: + field_0x598->hide(); + field_0x59c->show(); + field_0x5a0->hide(); + break; + case 2: + field_0x598->hide(); + field_0x59c->hide(); + field_0x5a0->show(); + break; + } } -#pragma pop /* 80654258-80654440 000E78 01E8+00 2/2 0/0 0/0 .text setScoreNum__13daBalloon2D_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBalloon2D_c::setScoreNum(int param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setScoreNum__13daBalloon2D_cFi.s" +void daBalloon2D_c::setScoreNum(int scoreNum) { + if (scoreNum > 99999) { + scoreNum = 99999; + } + mScoreCount = scoreNum; + int digit = scoreNum / 10000; + int num = scoreNum % 10000; + ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(digit)); + field_0x5a8[0]->changeTexture(resTimg, 0); + digit = num / 1000; + int num2 = num % 1000; + resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(digit)); + field_0x5a8[1]->changeTexture(resTimg, 0); + digit = num2 / 100; + int num3 = num2 % 100; + resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(digit)); + field_0x5a8[2]->changeTexture(resTimg, 0); + digit = num3 / 10; + num3 %= 10; + resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(digit)); + field_0x5a8[3]->changeTexture(resTimg, 0); + resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(num3)); + field_0x5a8[4]->changeTexture(resTimg, 0); } -#pragma pop /* ############################################################################################## */ /* 806555B0-806555B4 000004 0004+00 0/3 0/0 0/0 .rodata @4064 */ @@ -450,6 +473,37 @@ COMPILER_STRIP_GATE(0x806555BC, &lit_4067); #pragma pop /* 80654440-8065464C 001060 020C+00 1/1 0/0 0/0 .text setAllAlpha__13daBalloon2D_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daBalloon2D_c::setAllAlpha() { + mAllAlpha = field_0x578->getAlphaRate(); + if (isVisible()) { + if (mAllAlpha != 1.0f) { + cLib_addCalc2(&mAllAlpha, 1.0f, 0.4f, 0.5f); + if (fabsf(mAllAlpha - 1.0f) < 0.1f) { + mAllAlpha = 1.0f; + } + field_0x578->setAlphaRate(mAllAlpha); + field_0x580->setAlphaRate(l_HOSTIO.field_0x3c * mAllAlpha); + field_0x594->setAlphaRate(l_HOSTIO.field_0x84 * mAllAlpha); + field_0x598->setAlphaRate(l_HOSTIO.field_0x94 * mAllAlpha); + field_0x59c->setAlphaRate(l_HOSTIO.field_0xa4 * mAllAlpha); + field_0x5a0->setAlphaRate(l_HOSTIO.field_0xb4 * mAllAlpha); + } + } else if (mAllAlpha != 1.0f) { + cLib_addCalc2(&mAllAlpha, 0.0f, 0.4f, 0.5f); + if (fabsf(mAllAlpha) < 0.1f) { + mAllAlpha = 0.0f; + } + field_0x578->setAlphaRate(mAllAlpha); + field_0x580->setAlphaRate(l_HOSTIO.field_0x3c * mAllAlpha); + field_0x594->setAlphaRate(l_HOSTIO.field_0x84 * mAllAlpha); + field_0x598->setAlphaRate(l_HOSTIO.field_0x94 * mAllAlpha); + field_0x59c->setAlphaRate(l_HOSTIO.field_0xa4 * mAllAlpha); + field_0x5a0->setAlphaRate(l_HOSTIO.field_0xb4 * mAllAlpha); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -458,8 +512,27 @@ asm void daBalloon2D_c::setAllAlpha() { #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setAllAlpha__13daBalloon2D_cFv.s" } #pragma pop +#endif /* 8065464C-80654730 00126C 00E4+00 2/2 0/0 0/0 .text setComboAlpha__13daBalloon2D_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daBalloon2D_c::setComboAlpha() { + mComboAlpha = field_0x5a4->getAlphaRate() * field_0x578->getAlphaRate(); + if (mComboNum != 0) { + if (mComboAlpha != 1.0f) { + cLib_addCalc2(&mComboAlpha, 1.0f, 0.4f, 0.5f); + if (fabsf(mComboAlpha - 1.0f) < 0.1f) { + mComboAlpha = 1.0f; + } + field_0x5a4->setAlphaRate(mComboAlpha); + } + } else if (mComboAlpha != 0.0f) { + mComboAlpha = 0.0f; + field_0x5a4->setAlphaRate(mComboAlpha); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -468,6 +541,7 @@ asm void daBalloon2D_c::setComboAlpha() { #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setComboAlpha__13daBalloon2D_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806555C0-806555C4 000014 0004+00 0/1 0/0 0/0 .rodata @4165 */ @@ -543,6 +617,90 @@ COMPILER_STRIP_GATE(0x806555E4, &lit_4175); #pragma pop /* 80654730-80654E8C 001350 075C+00 1/1 0/0 0/0 .text drawAddScore__13daBalloon2D_cFv */ +// field_0x0.x, regalloc +#ifdef NONMATCHING +void daBalloon2D_c::drawAddScore() { + for (int i = 19; i >= 0; i--) { + if (field_0x5f8[i].field_0xe != 0) { + field_0x5f8[i].field_0xe--; + int uVar7 = field_0x5f8[i].field_0xc; + u8 local_88 = 0xff; + f32 dVar11 = 30.0f; + f32 dVar9 = 30.0f; + field_0x5f8[i].field_0x0.x += 0.3f * cM_ssin((field_0x5f8[i].field_0xe % 60) * 1024); + field_0x5f8[i].field_0x0.y -= 1.0f; + if (field_0x5f8[i].field_0xe < 10) { + f32 fVar5 = field_0x5f8[i].field_0xe / 10.0f; + local_88 = fVar5 * 255.0f; + dVar11 *= fVar5; + dVar9 *= fVar5; + } + for (int j = 0; j < 10; j++) { + field_0x5c4[j]->setAlpha(local_88); + } + field_0x5ec->setAlpha(local_88); + f32 dVar8 = (field_0x5f8[i].field_0x0.y - (dVar9 / 2.0f)); + int digit; + if (uVar7 >= 10000) { + f32 dVar10 = (field_0x5f8[i].field_0x0.x - + (dVar11 / 2.0f) * 6.0f); + field_0x5ec->draw(dVar10, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 10000; + uVar7 = uVar7 % 10000; + field_0x5c4[digit]->draw(dVar10 + dVar11, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 1000; + uVar7 %= 1000; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 2.0f, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 100; + uVar7 %= 100; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 3.0f, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 10; + uVar7 %= 10; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 4.0f, dVar8, dVar11, dVar9, false, false, false); + field_0x5c4[uVar7]->draw(dVar10 + dVar11 * 5.0f, dVar8, dVar11, dVar9, false, false, false); + } else if (uVar7 >= 1000) { + f32 dVar10 = (field_0x5f8[i].field_0x0.x - + (dVar11 / 2.0f) * 5.0f); + field_0x5ec->draw(dVar10, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 1000; + uVar7 %= 1000; + field_0x5c4[digit]->draw(dVar10 + dVar11, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 100; + uVar7 %= 100; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 2.0f, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 10; + uVar7 %= 10; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 3.0f, dVar8, dVar11, dVar9, false, false, false); + field_0x5c4[uVar7]->draw(dVar10 + dVar11 * 4.0f, dVar8, dVar11, dVar9, false, false, false); + } else if (uVar7 >= 100) { + f32 dVar10 = (field_0x5f8[i].field_0x0.x - + (dVar11 / 2.0f) * 4.0f); + field_0x5ec->draw(dVar10, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 100; + uVar7 %= 100; + field_0x5c4[digit]->draw(dVar10 + dVar11, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 10; + uVar7 %= 10; + field_0x5c4[digit]->draw(dVar10 + dVar11 * 2.0f, dVar8, dVar11, dVar9, false, false, false); + field_0x5c4[uVar7]->draw(dVar10 + dVar11 * 3.0f, dVar8, dVar11, dVar9, false, false, false); + } else if (uVar7 >= 10) { + f32 dVar10 = (field_0x5f8[i].field_0x0.x - + (dVar11 / 2.0f) * 3.0f); + field_0x5ec->draw(dVar10, dVar8, dVar11, dVar9, false, false, false); + digit = uVar7 / 10; + uVar7 %= 10; + field_0x5c4[digit]->draw(dVar10 + dVar11, dVar8, dVar11, dVar9, false, false, false); + field_0x5c4[uVar7]->draw(dVar10 + dVar11 * 2.0f, dVar8, dVar11, dVar9, false, false, false); + } else { + f32 dVar10 = (field_0x5f8[i].field_0x0.x - + (dVar11 / 2.0f) * 2.0f); + field_0x5ec->draw(dVar10, dVar8, dVar11, dVar9, false, false, false); + field_0x5c4[uVar7]->draw(dVar10 + dVar11, dVar8, dVar11, dVar9, false, false, false); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -551,8 +709,43 @@ asm void daBalloon2D_c::drawAddScore() { #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/drawAddScore__13daBalloon2D_cFv.s" } #pragma pop +#endif /* 80654E8C-80655250 001AAC 03C4+00 2/2 0/0 0/0 .text setHIO__13daBalloon2D_cFb */ +// Matches with vtables +#ifdef NONMATCHING +void daBalloon2D_c::setHIO(bool param_1) { + if ((l_HOSTIO.field_0x04 != 0) || param_1) { + field_0x57c->paneTrans(l_HOSTIO.field_0x20, l_HOSTIO.field_0x24); + field_0x57c->scale(l_HOSTIO.field_0x28, l_HOSTIO.field_0x28); + field_0x580->paneTrans(l_HOSTIO.field_0x2c, l_HOSTIO.field_0x30); + field_0x580->scale(l_HOSTIO.field_0x34, l_HOSTIO.field_0x38); + field_0x580->setAlphaRate(l_HOSTIO.field_0x3c * mAllAlpha); + field_0x584->paneTrans(l_HOSTIO.field_0x40, l_HOSTIO.field_0x44); + field_0x584->scale(l_HOSTIO.field_0x48, l_HOSTIO.field_0x48); + field_0x588->paneTrans(l_HOSTIO.field_0x4c, l_HOSTIO.field_0x50); + field_0x588->scale(l_HOSTIO.field_0x54, l_HOSTIO.field_0x54); + field_0x58c->paneTrans(l_HOSTIO.field_0x58, l_HOSTIO.field_0x5c); + field_0x58c->scale(l_HOSTIO.field_0x60, l_HOSTIO.field_0x60); + field_0x590->paneTrans(l_HOSTIO.field_0x64, l_HOSTIO.field_0x68); + field_0x590->scale(l_HOSTIO.field_0x6c, l_HOSTIO.field_0x70); + field_0x594->paneTrans(l_HOSTIO.field_0x78, l_HOSTIO.field_0x7c); + field_0x594->scale(l_HOSTIO.field_0x80, l_HOSTIO.field_0x80); + field_0x594->setAlphaRate(l_HOSTIO.field_0x84 * mAllAlpha); + field_0x598->paneTrans(l_HOSTIO.field_0x88, l_HOSTIO.field_0x8c); + field_0x598->scale(l_HOSTIO.field_0x90, l_HOSTIO.field_0x90); + field_0x598->setAlphaRate(l_HOSTIO.field_0x94 * mAllAlpha); + field_0x59c->paneTrans(l_HOSTIO.field_0x98, l_HOSTIO.field_0x9c); + field_0x59c->scale(l_HOSTIO.field_0xa0, l_HOSTIO.field_0xa0); + field_0x59c->setAlphaRate(l_HOSTIO.field_0xa4 * mAllAlpha); + field_0x5a0->paneTrans(l_HOSTIO.field_0xa8, l_HOSTIO.field_0xac); + field_0x5a0->scale(l_HOSTIO.field_0xb0, l_HOSTIO.field_0xb0); + field_0x5a0->setAlphaRate(l_HOSTIO.field_0xb4 * mAllAlpha); + field_0x5a4->paneTrans(l_HOSTIO.field_0xb8, l_HOSTIO.field_0xbc); + field_0x5a4->scale(l_HOSTIO.field_0xc0, l_HOSTIO.field_0xc0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -561,6 +754,7 @@ asm void daBalloon2D_c::setHIO(bool param_0) { #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/setHIO__13daBalloon2D_cFb.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806556D8-806556F8 -00001 0020+00 1/0 0/0 0/0 .data daBalloon2D_METHODS */ @@ -608,63 +802,48 @@ SECTION_DATA extern void* __vt__Q213daBalloon2D_c6c_list[4] = { }; /* 80655250-80655304 001E70 00B4+00 1/0 0/0 0/0 .text daBalloon2D_create__FP13daBalloon2D_c */ +#ifdef NONMATCHING +static int daBalloon2D_create(daBalloon2D_c* i_this) { + fopAcM_SetupActor(i_this, daBalloon2D_c); + return i_this->create(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daBalloon2D_create(daBalloon2D_c* param_0) { +static asm int daBalloon2D_create(daBalloon2D_c* param_0) { nofralloc #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_create__FP13daBalloon2D_c.s" } #pragma pop +#endif /* 80655304-80655340 001F24 003C+00 2/2 0/0 0/0 .text __dt__Q213daBalloon2D_c10CHeadScoreFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daBalloon2D_c::CHeadScore::~CHeadScore() { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__Q213daBalloon2D_c10CHeadScoreFv.s" +daBalloon2D_c::CHeadScore::~CHeadScore() { } -#pragma pop /* 80655340-80655344 001F60 0004+00 1/1 0/0 0/0 .text __ct__Q213daBalloon2D_c10CHeadScoreFv */ daBalloon2D_c::CHeadScore::CHeadScore() { - /* empty function */ } /* 80655344-80655364 001F64 0020+00 1/0 0/0 0/0 .text daBalloon2D_destroy__FP13daBalloon2D_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBalloon2D_destroy(daBalloon2D_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_destroy__FP13daBalloon2D_c.s" +static int daBalloon2D_destroy(daBalloon2D_c* i_this) { + return i_this->destroy(); } -#pragma pop /* 80655364-80655384 001F84 0020+00 1/0 0/0 0/0 .text daBalloon2D_execute__FP13daBalloon2D_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBalloon2D_execute(daBalloon2D_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_execute__FP13daBalloon2D_c.s" +static int daBalloon2D_execute(daBalloon2D_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80655384-806553A4 001FA4 0020+00 1/0 0/0 0/0 .text daBalloon2D_draw__FP13daBalloon2D_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBalloon2D_draw(daBalloon2D_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/daBalloon2D_draw__FP13daBalloon2D_c.s" +static int daBalloon2D_draw(daBalloon2D_c* i_this) { + return i_this->draw(); } -#pragma pop /* 806553A4-806553A8 001FC4 0004+00 1/0 0/0 0/0 .text draw__12dDlst_base_cFv */ -void dDlst_base_c::draw() { +void draw__12dDlst_base_cFv() { /* empty function */ } @@ -697,7 +876,8 @@ asm daBalloon2D_HIO_c::~daBalloon2D_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +asm void __dt__14mDoHIO_entry_cFv() { +//asm mDoHIO_entry_c::~mDoHIO_entry_c() { nofralloc #include "asm/rel/d/a/d_a_balloon_2D/d_a_balloon_2D/__dt__14mDoHIO_entry_cFv.s" } diff --git a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp index aa51b4cb89..9f7884d3e4 100644 --- a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp @@ -1,268 +1,28 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_balloon +// Balloon // #include "rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h" +#include "rel/d/a/d_a_balloon_2D/d_a_balloon_2D.h" #include "d/cc/d_cc_d.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Balloon_c { - /* 80BA7FF4 */ void draw(); - /* 80BA80F4 */ void saveBestScore(); - /* 80BA810C */ void cc_set(); - /* 80BA81B8 */ void action(); - /* 80BA865C */ void mtx_set(); - /* 80BA86CC */ void execute(); - /* 80BA8734 */ void _delete(); - /* 80BA87CC */ void CreateHeap(); - /* 80BA88C4 */ void create(); -}; - -struct daObj_Balloon_HIO_c { - /* 80BA7FAC */ daObj_Balloon_HIO_c(); - /* 80BA8D64 */ ~daObj_Balloon_HIO_c(); -}; - -struct daBalloon2D_c { - /* 80653F58 */ void setComboCount(u8, u8); - /* 80653FC0 */ void setScoreCount(u32); - /* 80653FEC */ void addScoreCount(cXyz*, u32, u8); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -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 dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BA8C1C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80BA8C8C */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__19daObj_Balloon_HIO_cFv(); -extern "C" void draw__15daObj_Balloon_cFv(); -extern "C" static void daObj_Balloon_Draw__FP15daObj_Balloon_c(); -extern "C" void saveBestScore__15daObj_Balloon_cFv(); -extern "C" void cc_set__15daObj_Balloon_cFv(); -extern "C" void action__15daObj_Balloon_cFv(); -extern "C" void mtx_set__15daObj_Balloon_cFv(); -extern "C" void execute__15daObj_Balloon_cFv(); -extern "C" static void daObj_Balloon_Execute__FP15daObj_Balloon_c(); -extern "C" static bool daObj_Balloon_IsDelete__FP15daObj_Balloon_c(); -extern "C" void _delete__15daObj_Balloon_cFv(); -extern "C" static void daObj_Balloon_Delete__FP15daObj_Balloon_c(); -extern "C" void CreateHeap__15daObj_Balloon_cFv(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void create__15daObj_Balloon_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" static void daObj_Balloon_Create__FP15daObj_Balloon_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__19daObj_Balloon_HIO_cFv(); -extern "C" void __sinit_d_a_obj_balloon_cpp(); -extern "C" static void func_80BA8DE8(); -extern "C" static void func_80BA8DF0(); -extern "C" extern char const* const d_a_obj_balloon__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -extern "C" void fpcSch_JudgeForPName__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void __dv__4cXyzCFf(); -extern "C" void cM_rndF__Ff(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStop__7Z2SeMgrF10JAISoundIDUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_22(); -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 void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void setComboCount__13daBalloon2D_cFUcUc(); -extern "C" void setScoreCount__13daBalloon2D_cFUl(); -extern "C" void addScoreCount__13daBalloon2D_cFP4cXyzUlUc(); -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BA8E0C-80BA8E10 000000 0004+00 4/4 0/0 0/0 .rodata @3656 */ -SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(0x80BA8E0C, &lit_3656); - -/* 80BA8E10-80BA8E14 000004 0004+00 0/1 0/0 0/0 .rodata @3657 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3657 = 1.5f; -COMPILER_STRIP_GATE(0x80BA8E10, &lit_3657); -#pragma pop - -/* 80BA8E14-80BA8E18 000008 0004+00 0/1 0/0 0/0 .rodata @3658 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3658 = 3.0f; -COMPILER_STRIP_GATE(0x80BA8E14, &lit_3658); -#pragma pop - -/* 80BA8E18-80BA8E1C 00000C 0004+00 0/1 0/0 0/0 .rodata @3659 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3659 = 10.0f; -COMPILER_STRIP_GATE(0x80BA8E18, &lit_3659); -#pragma pop +#include "d/cc/d_cc_uty.h" +#include "d/d_drawlist.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JAUSoundTable.h" +#include "Z2AudioLib/Z2WolfHowlMgr.h" /* 80BA8E5C-80BA8E68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80BA8E68-80BA8E7C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -272,193 +32,6 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80BA8E7C-80BA8E80 000020 0004+00 0/1 0/0 0/0 .data - * m_combo_type__29@unnamed@d_a_obj_balloon_cpp@ */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 data_80BA8E7C = 0xFFFFFFFF; -#pragma pop - -/* 80BA8E80-80BA8E8C 000024 000C+00 1/1 0/0 0/0 .data balloon_radius$3706 */ -SECTION_DATA static u8 balloon_radius[12] = { - 0x44, 0x85, 0xC0, 0x00, 0x43, 0xC3, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, -}; - -/* 80BA8E8C-80BA8E90 000030 0004+00 0/1 0/0 0/0 .data kago_wall_hit_id$3736 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 kago_wall_hit_id[4] = { - 0x8A, - 0x12, - 0x8A, - 0x13, -}; -#pragma pop - -/* 80BA8E90-80BA8E9C 000034 000C+00 0/1 0/0 0/0 .data kago_effect_scale$3737 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 kago_effect_scale[12] = { - 0x40, 0x80, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, -}; -#pragma pop - -/* 80BA8E9C-80BA8EA8 000040 000C+00 0/1 0/0 0/0 .data break_sound_id$3749 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 break_sound_id[12] = { - 0x00, 0x08, 0x02, 0x55, 0x00, 0x08, 0x02, 0x54, 0x00, 0x08, 0x02, 0x53, -}; -#pragma pop - -/* 80BA8EA8-80BA8EE8 00004C 0040+00 1/1 0/0 0/0 .data cc_sph_src$3893 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x8, 0x11}, 0x0}}, // mObj - {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 80BA8EE8-80BA8F08 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Balloon_Method */ -SECTION_DATA static void* l_daObj_Balloon_Method[8] = { - (void*)daObj_Balloon_Create__FP15daObj_Balloon_c, - (void*)daObj_Balloon_Delete__FP15daObj_Balloon_c, - (void*)daObj_Balloon_Execute__FP15daObj_Balloon_c, - (void*)daObj_Balloon_IsDelete__FP15daObj_Balloon_c, - (void*)daObj_Balloon_Draw__FP15daObj_Balloon_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BA8F08-80BA8F38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BALLOON */ -SECTION_DATA extern void* g_profile_OBJ_BALLOON[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011C0000, (void*)&g_fpcLf_Method, - (void*)0x00000920, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00400000, (void*)&l_daObj_Balloon_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80BA8F38-80BA8F44 0000DC 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80BA8F44-80BA8F50 0000E8 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80BA8F50-80BA8F5C 0000F4 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80BA8F5C-80BA8F68 000100 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80BA8F68-80BA8F74 00010C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BA8F74-80BA8F98 000118 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BA8DF0, - (void*)NULL, - (void*)NULL, - (void*)func_80BA8DE8, -}; - -/* 80BA8F98-80BA8FA4 00013C 000C+00 2/2 0/0 0/0 .data __vt__19daObj_Balloon_HIO_c */ -SECTION_DATA extern void* __vt__19daObj_Balloon_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19daObj_Balloon_HIO_cFv, -}; - -/* 80BA7FAC-80BA7FF4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__19daObj_Balloon_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__ct__19daObj_Balloon_HIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BA8E1C-80BA8E20 000010 0004+00 0/1 0/0 0/0 .rodata @3687 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3687 = 100.0f; -COMPILER_STRIP_GATE(0x80BA8E1C, &lit_3687); -#pragma pop - -/* 80BA8E20-80BA8E24 000014 0004+00 0/1 0/0 0/0 .rodata @3688 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3688 = 400.0f; -COMPILER_STRIP_GATE(0x80BA8E20, &lit_3688); -#pragma pop - -/* 80BA8E24-80BA8E28 000018 0004+00 0/3 0/0 0/0 .rodata @3689 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3689[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BA8E24, &lit_3689); -#pragma pop - -/* 80BA7FF4-80BA80D4 000134 00E0+00 1/1 0/0 0/0 .text draw__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/draw__15daObj_Balloon_cFv.s" -} -#pragma pop - -/* 80BA80D4-80BA80F4 000214 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Draw__FP15daObj_Balloon_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Balloon_Draw(daObj_Balloon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Draw__FP15daObj_Balloon_c.s" -} -#pragma pop - -/* ############################################################################################## */ /* 80BA8FB0-80BA8FB4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -552,397 +125,357 @@ static u8 lit_1010[1 + 3 /* padding */]; static u8 lit_1009[1 + 3 /* padding */]; #pragma pop +/* 80BA8E7C-80BA8E80 000020 0004+00 0/1 0/0 0/0 .data + * m_combo_type__29@unnamed@d_a_obj_balloon_cpp@ */ +static int m_combo_type = 0xFFFFFFFF; + +/* 80BA8E80-80BA8E8C 000024 000C+00 1/1 0/0 0/0 .data balloon_radius$3706 */ +static f32 balloon_radius[3] = { + 1070.0f, 390.0f, 110.0f, +}; + +/* 80BA8E8C-80BA8E90 000030 0004+00 0/1 0/0 0/0 .data kago_wall_hit_id$3736 */ +static u16 kago_wall_hit_id[2] = { + 0x8A12, + 0x8A13, +}; + +/* 80BA8E90-80BA8E9C 000034 000C+00 0/1 0/0 0/0 .data kago_effect_scale$3737 */ +static f32 kago_effect_scale[3] = { + 4.0f, 1.5f, 0.8f, +}; + +/* 80BA8E9C-80BA8EA8 000040 000C+00 0/1 0/0 0/0 .data break_sound_id$3749 */ +static u32 break_sound_id[3] = { + Z2SE_OBJ_BLN_BREAK_L, Z2SE_OBJ_BLN_BREAK_M, Z2SE_OBJ_BLN_BREAK_S, +}; + +/* 80BA8EA8-80BA8EE8 00004C 0040+00 1/1 0/0 0/0 .data cc_sph_src$3893 */ +static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x8, 0x11}, 0x0}}, // mObj + {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr +}; + +/* 80BA7FAC-80BA7FF4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__19daObj_Balloon_HIO_cFv */ +daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() { + field_0x04 = -1; + field_0x08[0] = 1.0f; + field_0x08[1] = 1.0f; + field_0x08[2] = 1.5f; + field_0x14[0] = 1.0f; + field_0x14[1] = 3.0f; + field_0x14[2] = 10.0f; +} + +/* 80BA7FF4-80BA80D4 000134 00E0+00 1/1 0/0 0/0 .text draw__15daObj_Balloon_cFv */ +int daObj_Balloon_c::draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + fopAcM_setEffectMtx(this, mModel->getModelData()); + mDoExt_modelUpdateDL(mModel); + cXyz acStack_28; + acStack_28.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + field_0x574 = dComIfGd_setShadow(field_0x574, 1, mModel, &acStack_28, 400.0f, 0.0f, + current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, + 1.0f, dDlst_shadowControl_c::getSimpleTex()); + return 1; +} + +/* 80BA80D4-80BA80F4 000214 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Draw__FP15daObj_Balloon_c */ +static int daObj_Balloon_Draw(daObj_Balloon_c* i_this) { + return i_this->draw(); +} + /* 80BA8FF0-80BA8FF4 000048 0004+00 0/1 0/0 0/0 .bss * m_combo_count__29@unnamed@d_a_obj_balloon_cpp@ */ -#pragma push -#pragma force_active on -static u8 data_80BA8FF0[4]; -#pragma pop +static int m_combo_count; /* 80BA8FF4-80BA8FF8 00004C 0004+00 0/1 0/0 0/0 .bss * m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@ */ -#pragma push -#pragma force_active on -static u8 data_80BA8FF4[4]; -#pragma pop +static int m_combo_next_score; /* 80BA8FF8-80BA8FFC 000050 0004+00 1/2 0/0 0/0 .bss * m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@ */ -static u8 data_80BA8FF8[4]; +static u32 m_balloon_score; /* 80BA80F4-80BA810C 000234 0018+00 0/0 0/0 1/1 .text saveBestScore__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::saveBestScore() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/saveBestScore__15daObj_Balloon_cFv.s" +void daObj_Balloon_c::saveBestScore() { + dComIfGp_setMessageCountNumber(m_balloon_score); } -#pragma pop /* ############################################################################################## */ /* 80BA8FFC-80BA9000 000054 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80BA8FFC[4]; +static u8 data_80BA8FFC; /* 80BA9000-80BA900C 000058 000C+00 1/1 0/0 0/0 .bss @3651 */ -static u8 lit_3651[12]; +//static u8 lit_3651[12]; /* 80BA900C-80BA902C 000064 0020+00 4/5 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[32]; +static daObj_Balloon_HIO_c l_HIO; /* 80BA810C-80BA81B8 00024C 00AC+00 1/1 0/0 0/0 .text cc_set__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::cc_set() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/cc_set__15daObj_Balloon_cFv.s" +void daObj_Balloon_c::cc_set() { + cXyz cStack_18; + mDoMtx_stack_c::copy(mModel->getBaseTRMtx()); + mDoMtx_stack_c::multVecZero(&cStack_18); + mSph.SetC(cStack_18); + mSph.SetR(balloon_radius[field_0x578] * l_HIO.field_0x08[field_0x578]); + dComIfG_Ccsp()->Set(&mSph); } -#pragma pop - -/* ############################################################################################## */ -/* 80BA8E28-80BA8E2C 00001C 0004+00 0/1 0/0 0/0 .rodata @3809 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3809 = -3.0f; -COMPILER_STRIP_GATE(0x80BA8E28, &lit_3809); -#pragma pop - -/* 80BA8E2C-80BA8E30 000020 0004+00 0/1 0/0 0/0 .rodata @3810 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3810 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BA8E2C, &lit_3810); -#pragma pop - -/* 80BA8E30-80BA8E34 000024 0004+00 0/1 0/0 0/0 .rodata @3811 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3811 = 30.0f; -COMPILER_STRIP_GATE(0x80BA8E30, &lit_3811); -#pragma pop - -/* 80BA8E34-80BA8E38 000028 0004+00 0/1 0/0 0/0 .rodata @3812 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3812 = 60.0f; -COMPILER_STRIP_GATE(0x80BA8E34, &lit_3812); -#pragma pop - -/* 80BA8E38-80BA8E3C 00002C 0004+00 0/1 0/0 0/0 .rodata @3813 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3813 = 512.0f; -COMPILER_STRIP_GATE(0x80BA8E38, &lit_3813); -#pragma pop - -/* 80BA8E3C-80BA8E40 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3814 = 5.0f; -COMPILER_STRIP_GATE(0x80BA8E3C, &lit_3814); -#pragma pop - -/* 80BA8E40-80BA8E44 000034 0004+00 0/1 0/0 0/0 .rodata @3815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3815 = 128.0f; -COMPILER_STRIP_GATE(0x80BA8E40, &lit_3815); -#pragma pop - -/* 80BA8E44-80BA8E48 000038 0004+00 0/2 0/0 0/0 .rodata @3816 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3816 = 2.0f; -COMPILER_STRIP_GATE(0x80BA8E44, &lit_3816); -#pragma pop - -/* 80BA8E48-80BA8E4C 00003C 0004+00 0/1 0/0 0/0 .rodata @3817 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3817 = -1.0f; -COMPILER_STRIP_GATE(0x80BA8E48, &lit_3817); -#pragma pop /* 80BA81B8-80BA865C 0002F8 04A4+00 1/1 0/0 0/0 .text action__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/action__15daObj_Balloon_cFv.s" +void daObj_Balloon_c::action() { + switch (field_0x579) { + case 0: + gravity = 0.0f; + speedF = 0.0f; + speed.y = 0.0f; + field_0x579 = 1; + break; + case 1: + cLib_addCalcAngleS2(&field_0x580, field_0x584, 16, 8); + cLib_addCalcAngleS2(&field_0x582, field_0x586, 16, 8); + cLib_chaseF(&speed.y, -3.0f, 0.1f); + if (current.pos.y < home.pos.y) { + field_0x579 = 2; + field_0x57c = (s16)(30.0f + cM_rndF(60.0f)); + field_0x584 = 512.0f + cM_rndF(512.0f); + field_0x586 = 512.0f + cM_rndF(512.0f); + } + break; + case 2: + cLib_addCalcAngleS2(&field_0x580, field_0x584, 16, 32); + cLib_addCalcAngleS2(&field_0x582, field_0x586, 16, 32); + cLib_chaseF(&speed.y, 5.0f, 0.1f); + if (field_0x57c == 0) { + field_0x579 = 1; + field_0x584 = cM_rndF(128.0f); + field_0x586 = cM_rndF(128.0f); + } + break; + } + shape_angle.z += field_0x580; + shape_angle.y += field_0x582; + if (field_0x57c != 0) { + field_0x57c--; + } + mStts.Move(); + if (mSph.ChkTgHit()) { + cCcD_Obj* tgHit = mSph.GetTgHitObj(); + if (fopAcM_GetName(dCc_GetAc(tgHit->GetAc())) == 0xf4) { + cXyz cStack_48(kago_effect_scale[field_0x578], kago_effect_scale[field_0x578], + kago_effect_scale[field_0x578]); + for (int i = 0; i < 2; i++) { + dComIfGp_particle_set(kago_wall_hit_id[i], ¤t.pos, &tevStr, &shape_angle, + &cStack_48); + } + u32 local_74; + u32 local_28; + if (m_combo_type == field_0x578) { + m_combo_count++; + local_74 = m_combo_next_score; + if (m_combo_count >= 10) { + m_combo_next_score = l_HIO.field_0x14[field_0x578] * 512.0f; + local_28 = m_combo_next_score; + } else { + m_combo_next_score <<= 1; + } + } else { + m_combo_type = field_0x578; + m_combo_count = 1; + m_combo_next_score = + l_HIO.field_0x14[field_0x578] * 2.0f; + local_28 = m_combo_next_score; + local_74 = l_HIO.field_0x14[field_0x578]; + } + Z2GetAudioMgr()->seStart(break_sound_id[field_0x578], ¤t.pos, m_combo_count, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + m_balloon_score += local_74; + daBalloon2D_c* balloon2d = (daBalloon2D_c*)fopAcM_SearchByName(PROC_BALLOON2D); + if (balloon2d != NULL) { + u8 unaff_r25; + if (field_0x578 == 2) { + unaff_r25 = 0; + } else if (field_0x578 == 1) { + unaff_r25 = 1; + } else if (field_0x578 == 0) { + unaff_r25 = 2; + } + cXyz cStack_54(dCc_GetAc(tgHit->GetAc())->current.pos); + cStack_54 = (cStack_54 + current.pos) / 2.0f; + balloon2d->setComboCount(unaff_r25, m_combo_count); + balloon2d->setScoreCount(m_balloon_score); + balloon2d->addScoreCount(&cStack_54, local_74, unaff_r25); + } + fopAcM_delete(this); + return; + } + } + fopAcM_posMoveF(this, mStts.GetCCMoveP()); } -#pragma pop /* 80BA865C-80BA86CC 00079C 0070+00 1/1 0/0 0/0 .text mtx_set__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::mtx_set() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/mtx_set__15daObj_Balloon_cFv.s" +void daObj_Balloon_c::mtx_set() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(l_HIO.field_0x08[field_0x578], + l_HIO.field_0x08[field_0x578], + l_HIO.field_0x08[field_0x578]); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80BA86CC-80BA870C 00080C 0040+00 1/1 0/0 0/0 .text execute__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/execute__15daObj_Balloon_cFv.s" +int daObj_Balloon_c::execute() { + action(); + cc_set(); + mtx_set(); + return 1; } -#pragma pop /* 80BA870C-80BA872C 00084C 0020+00 2/1 0/0 0/0 .text daObj_Balloon_Execute__FP15daObj_Balloon_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Balloon_Execute(daObj_Balloon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Execute__FP15daObj_Balloon_c.s" +static int daObj_Balloon_Execute(daObj_Balloon_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80BA872C-80BA8734 00086C 0008+00 1/0 0/0 0/0 .text daObj_Balloon_IsDelete__FP15daObj_Balloon_c */ -static bool daObj_Balloon_IsDelete(daObj_Balloon_c* param_0) { - return true; +static int daObj_Balloon_IsDelete(daObj_Balloon_c* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80BA8E54-80BA8E54 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BA8E54 = "Obj_bal"; -#pragma pop - /* 80BA8734-80BA87AC 000874 0078+00 1/1 0/0 0/0 .text _delete__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/_delete__15daObj_Balloon_cFv.s" +int daObj_Balloon_c::_delete() { + dComIfG_resDelete(&mPhase, "Obj_bal"); + Z2GetAudioMgr()->seStop(Z2SE_OBJ_WATERMILL_ROUND, 0); + if (field_0x914 != 0) { + data_80BA8FFC = 0; + } + return 1; } -#pragma pop /* 80BA87AC-80BA87CC 0008EC 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Delete__FP15daObj_Balloon_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Balloon_Delete(daObj_Balloon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Delete__FP15daObj_Balloon_c.s" +static int daObj_Balloon_Delete(daObj_Balloon_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80BA87CC-80BA88A4 00090C 00D8+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/CreateHeap__15daObj_Balloon_cFv.s" +int daObj_Balloon_c::CreateHeap() { + J3DModelData* modelData; + if (field_0x578 == 0) { + modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_bal", 3); + } else if (field_0x578 == 1) { + modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_bal", 4); + } else if (field_0x578 == 2) { + modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_bal", 5); + } + JUT_ASSERT(501, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + return mModel != NULL ? 1 : 0; } -#pragma pop /* 80BA88A4-80BA88C4 0009E4 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80BA8E4C-80BA8E50 000040 0004+00 0/1 0/0 0/0 .rodata @3946 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3946 = -1000.0f; -COMPILER_STRIP_GATE(0x80BA8E4C, &lit_3946); -#pragma pop - -/* 80BA8E50-80BA8E54 000044 0004+00 0/1 0/0 0/0 .rodata @3947 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3947 = 1000.0f; -COMPILER_STRIP_GATE(0x80BA8E50, &lit_3947); -#pragma pop /* 80BA88C4-80BA8B30 000A04 026C+00 1/1 0/0 0/0 .text create__15daObj_Balloon_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Balloon_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/create__15daObj_Balloon_cFv.s" +int daObj_Balloon_c::create() { + fopAcM_SetupActor(this, daObj_Balloon_c); + field_0x578 = fopAcM_GetParam(this); + if (field_0x578 == 0xff) { + field_0x578 = 0x0; + } + int rv = dComIfG_resLoad(&mPhase, "Obj_bal"); + if (rv == cPhs_COMPLEATE_e) { + OS_REPORT("Obj_Balloon PARAM %x\n", fopAcM_GetParam(this)); + if (fopAcM_entrySolidHeap(this, useHeapInit, 0xd60) == 0) { + return cPhs_ERROR_e; + } else { + if (data_80BA8FFC == 0) { + field_0x914 = 1; + data_80BA8FFC = 1; + l_HIO.field_0x04 = -1; + } + attention_info.flags = 0; + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_SetMin(this, -1000.0f, -1000.0f, -1000.0f); + fopAcM_SetMax(this, 1000.0f, 1000.0f, 1000.0f); + fopAcM_setCullSizeFar(this, 2.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + mAcchCir.SetWall(0.0f, 0.0f); + health = 60; + field_0x560 = 60; + mStts.Init(0xff, 0, this); + mSph.Set(cc_sph_src); + mSph.SetStts(&mStts); + daObj_Balloon_Execute(this); + } + } + return rv; } -#pragma pop - -/* 80BA8B30-80BA8B78 000C70 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80BA8B78-80BA8BC0 000CB8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80BA8BC0-80BA8C1C 000D00 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80BA8C1C-80BA8C8C 000D5C 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80BA8C8C-80BA8CFC 000DCC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop /* 80BA8CFC-80BA8D1C 000E3C 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Create__FP15daObj_Balloon_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Balloon_Create(daObj_Balloon_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/daObj_Balloon_Create__FP15daObj_Balloon_c.s" +static int daObj_Balloon_Create(daObj_Balloon_c* i_this) { + return i_this->create(); } -#pragma pop -/* 80BA8D1C-80BA8D64 000E5C 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 80BA8EE8-80BA8F08 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Balloon_Method */ +static actor_method_class l_daObj_Balloon_Method = { + (process_method_func)daObj_Balloon_Create, (process_method_func)daObj_Balloon_Delete, + (process_method_func)daObj_Balloon_Execute, (process_method_func)daObj_Balloon_IsDelete, + (process_method_func)daObj_Balloon_Draw, +}; -/* 80BA8D64-80BA8DAC 000EA4 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Balloon_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Balloon_HIO_c::~daObj_Balloon_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__dt__19daObj_Balloon_HIO_cFv.s" -} -#pragma pop - -/* 80BA8DAC-80BA8DE8 000EEC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_balloon_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_balloon_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/__sinit_d_a_obj_balloon_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BA8DAC, __sinit_d_a_obj_balloon_cpp); -#pragma pop - -/* 80BA8DE8-80BA8DF0 000F28 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BA8DE8() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DE8.s" -} -#pragma pop - -/* 80BA8DF0-80BA8DF8 000F30 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BA8DF0() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon/func_80BA8DF0.s" -} -#pragma pop +/* 80BA8F08-80BA8F38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BALLOON */ +extern actor_process_profile_definition g_profile_OBJ_BALLOON = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_BALLOON, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Balloon_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 64, // mPriority + &l_daObj_Balloon_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* ############################################################################################## */ /* 80BA902C-80BA9030 000084 0004+00 0/0 0/0 0/0 .bss * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80BA902C[4]; -#pragma pop +JASDefaultBankTable* JASGlobalInstance::sInstance; /* 80BA9030-80BA9034 000088 0004+00 0/0 0/0 0/0 .bss * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_80BA9030[4]; -#pragma pop +JASAudioThread* JASGlobalInstance::sInstance; /* 80BA9034-80BA9038 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9034[4]; -#pragma pop +Z2SeMgr* JASGlobalInstance::sInstance; /* 80BA9038-80BA903C 000090 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9038[4]; -#pragma pop +Z2SeqMgr* JASGlobalInstance::sInstance; /* 80BA903C-80BA9040 000094 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA903C[4]; -#pragma pop +Z2SceneMgr* JASGlobalInstance::sInstance; /* 80BA9040-80BA9044 000098 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9040[4]; -#pragma pop +Z2StatusMgr* JASGlobalInstance::sInstance; /* 80BA9044-80BA9048 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> */ @@ -953,113 +486,65 @@ static u8 data_80BA9044[4]; /* 80BA9048-80BA904C 0000A0 0004+00 0/0 0/0 0/0 .bss * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80BA9048[4]; -#pragma pop +JAISoundStarter* JASGlobalInstance::sInstance; /* 80BA904C-80BA9050 0000A4 0004+00 0/0 0/0 0/0 .bss * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80BA904C[4]; -#pragma pop +Z2SoundStarter* JASGlobalInstance::sInstance; /* 80BA9050-80BA9054 0000A8 0004+00 0/0 0/0 0/0 .bss * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_80BA9050[4]; -#pragma pop +Z2SpeechMgr2* JASGlobalInstance::sInstance; /* 80BA9054-80BA9058 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9054[4]; -#pragma pop +JAISeMgr* JASGlobalInstance::sInstance; /* 80BA9058-80BA905C 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9058[4]; -#pragma pop +JAISeqMgr* JASGlobalInstance::sInstance; /* 80BA905C-80BA9060 0000B4 0004+00 0/0 0/0 0/0 .bss * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA905C[4]; -#pragma pop +JAIStreamMgr* JASGlobalInstance::sInstance; /* 80BA9060-80BA9064 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9060[4]; -#pragma pop +Z2SoundMgr* JASGlobalInstance::sInstance; /* 80BA9064-80BA9068 0000BC 0004+00 0/0 0/0 0/0 .bss * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80BA9064[4]; -#pragma pop +JAISoundInfo* JASGlobalInstance::sInstance; /* 80BA9068-80BA906C 0000C0 0004+00 0/0 0/0 0/0 .bss * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_80BA9068[4]; -#pragma pop +JAUSoundTable* JASGlobalInstance::sInstance; /* 80BA906C-80BA9070 0000C4 0004+00 0/0 0/0 0/0 .bss * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_80BA906C[4]; -#pragma pop +JAUSoundNameTable* JASGlobalInstance::sInstance; /* 80BA9070-80BA9074 0000C8 0004+00 0/0 0/0 0/0 .bss * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80BA9070[4]; -#pragma pop +JAUSoundInfo* JASGlobalInstance::sInstance; /* 80BA9074-80BA9078 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80BA9074[4]; -#pragma pop +Z2SoundInfo* JASGlobalInstance::sInstance; /* 80BA9078-80BA907C 0000D0 0004+00 0/0 0/0 0/0 .bss * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9078[4]; -#pragma pop +Z2SoundObjMgr* JASGlobalInstance::sInstance; /* 80BA907C-80BA9080 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> */ -#pragma push -#pragma force_active on -static u8 data_80BA907C[4]; -#pragma pop +Z2Audience* JASGlobalInstance::sInstance; /* 80BA9080-80BA9084 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9080[4]; -#pragma pop +Z2FxLineMgr* JASGlobalInstance::sInstance; /* 80BA9084-80BA9088 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA9084[4]; -#pragma pop +Z2EnvSeMgr* JASGlobalInstance::sInstance; /* 80BA9088-80BA908C 0000E0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> */ @@ -1070,9 +555,6 @@ static u8 data_80BA9088[4]; /* 80BA908C-80BA9090 0000E4 0004+00 0/0 0/0 0/0 .bss * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80BA908C[4]; -#pragma pop +Z2WolfHowlMgr* JASGlobalInstance::sInstance; /* 80BA8E54-80BA8E54 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */