From bf663a0e3d3f5a2fb7bf8a36721c6cb3d81cf988 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 25 Feb 2023 18:23:13 -0800 Subject: [PATCH] d_a_kytag06 fully done / d_msg_class/object work (#300) * d_a_kytag06 OK and d_msg_class/object wip * add some GXDraw functions * cleanup kytag6 * remove asm --- Progress.md | 14 +- ...Character_1Byte__Q28JMessage6localeFPPCc.s | 7 - ...Character_2Byte__Q28JMessage6localeFPPCc.s | 12 - .../d_msg_class/__ct__17jmessage_tControlFv.s | 16 - ...MeasureProcessorFPC19jmessage_tReference.s | 40 - .../addCharactor__19jmessage_tReferenceFUs.s | 11 - ...CharCountBuffer__19jmessage_tReferenceFv.s | 11 - asm/d/msg/d_msg_class/changeKataToHira__Fi.s | 32 - .../d_msg_class/checkCharInfoCharactor__Fi.s | 23 - ...tFontRupeeColor__19jmessage_tReferenceFi.s | 19 - ...color__28jmessage_tRenderingProcessorFUc.s | 38 - ...g__27jmessage_tSequenceProcessorFUlPCvUl.s | 512 -- .../d_msg_class/getFontCCColorTable__FUcUc.s | 50 - .../d_msg_class/getFontGCColorTable__FUcUc.s | 50 - .../getLineMax__19jmessage_tReferenceFv.s | 41 - .../d_msg_class/getOutFontNumberType__Fi.s | 32 - asm/d/msg/d_msg_class/getPohNum__Fv.s | 16 - .../getWord__19jmessage_tReferenceFi.s | 6 - .../isBook__19jmessage_tReferenceFv.s | 16 - .../isBossName__19jmessage_tReferenceFv.s | 16 - .../isCharSend__19jmessage_tReferenceFv.s | 33 - .../isHowl__19jmessage_tReferenceFv.s | 16 - .../isKanban__19jmessage_tReferenceFv.s | 16 - .../isLightEnd__19jmessage_tReferenceFv.s | 29 - .../isLightSend__19jmessage_tReferenceFv.s | 33 - .../isMidona__19jmessage_tReferenceFv.s | 16 - .../msg/d_msg_class/isOutfontKanjiCode__Fi.s | 25 - .../isPlaceName__19jmessage_tReferenceFv.s | 16 - .../isSaveSeq__19jmessage_tReferenceFv.s | 16 - .../isStaffRoll__19jmessage_tReferenceFv.s | 16 - ...CharCountBuffer__19jmessage_tReferenceFv.s | 16 - .../resetCharactor__19jmessage_tReferenceFv.s | 15 - .../resetReference__19jmessage_tReferenceFv.s | 11 - .../resetWord__19jmessage_tReferenceFv.s | 11 - .../setCharactor__19jmessage_tReferenceFUs.s | 9 - ...CharCountBuffer__19jmessage_tReferenceFv.s | 13 - .../getPortalName__12dMsgObject_cFv.s | 23 - asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s | 5 - asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s | 20 - asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s | 15 - .../d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s | 17 - .../d_a_kytag06/dKy_event_proc__Fv.s | 348 -- .../daKytag06_Create__FP10fopAc_ac_c.s | 138 - .../daKytag06_Delete__FP13kytag06_class.s | 18 - .../daKytag06_Draw__FP13kytag06_class.s | 14 - .../daKytag06_Execute__FP13kytag06_class.s | 384 -- ...6_Ganon_wether_proc__FP13kytag06_classUc.s | 168 - ...v7_boss_wether_proc__FP13kytag06_classUc.s | 74 - .../daKytag06_type02_init__FP10fopAc_ac_c.s | 9 - .../daKytag06_type03_init__FP10fopAc_ac_c.s | 89 - .../daKytag06_type04_init__FP10fopAc_ac_c.s | 9 - .../daKytag06_type06_init__FP10fopAc_ac_c.s | 10 - ...tag06_type_03_Execute__FP13kytag06_class.s | 141 - ...tag06_type_04_Execute__FP13kytag06_class.s | 9 - ...tag06_type_05_Execute__FP13kytag06_class.s | 105 - ...tag06_type_06_Execute__FP13kytag06_class.s | 201 - ...tag06_type_07_Execute__FP13kytag06_class.s | 185 - ...ype_07_wether_Execute__FP13kytag06_class.s | 12 - ...tag06_type_08_Execute__FP13kytag06_class.s | 12 - ...tag06_type_09_Execute__FP13kytag06_class.s | 12 - ...tag06_type_10_Execute__FP13kytag06_class.s | 282 - ...tag06_type_11_Execute__FP13kytag06_class.s | 34 - ...Kytag06_wether_proc__FP13kytag06_classUc.s | 148 - .../d_a_kytag06/dice_rain_minus__Fv.s | 29 - .../d_a_kytag06/dice_wether_execute__FUcff.s | 57 - .../d_a_kytag06/dice_wether_init__FUcff.s | 45 - .../near_rail_get__FP13kytag06_classP4cXyz.s | 113 - .../set_path_info__FP10fopAc_ac_c.s | 19 - include/JSystem/JMessage/processor.h | 176 +- include/d/com/d_com_inf_game.h | 29 +- include/d/d_gameover.h | 4 +- include/d/d_stage.h | 5 +- include/d/d_timer.h | 2 +- include/d/event/d_event_data.h | 3 +- include/d/kankyo/d_kankyo.h | 3 + include/d/kankyo/d_kankyo_wether.h | 18 +- include/d/menu/d_menu_window.h | 2 +- include/d/meter/d_meter2.h | 2 +- include/d/meter/d_meter2_info.h | 42 +- include/d/msg/d_msg_class.h | 445 +- include/d/msg/d_msg_flow.h | 4 +- include/d/msg/d_msg_object.h | 77 +- include/d/msg/d_msg_unit.h | 14 + include/d/save/d_save.h | 8 +- include/dolphin/gx/GX.h | 6 + include/dolphin/gx/GXAttr.h | 8 +- include/dolphin/gx/GXDraw.h | 17 + include/f_op/f_op_msg.h | 16 +- include/f_op/f_op_msg_mng.h | 4 +- include/m_Do/m_Do_ext.h | 39 + include/m_Do/m_Do_mtx.h | 2 + .../rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h | 23 +- libs/JSystem/JMessage/resource.cpp | 44 +- libs/dolphin/gx/GXAttr.c | 261 +- libs/dolphin/gx/GXDraw.c | 71 + libs/dolphin/gx/Makefile | 2 + rel/d/a/d_a_horse/d_a_horse.cpp | 9 - rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 2172 ++++---- rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 8 - src/d/com/d_com_inf_game.cpp | 4 +- src/d/d_gameover.cpp | 1 - src/d/d_ky_thunder.cpp | 4 - src/d/d_lib.cpp | 4 - src/d/d_timer.cpp | 1 - src/d/menu/d_menu_collect.cpp | 4 - src/d/menu/d_menu_window.cpp | 1 - src/d/msg/d_msg_class.cpp | 4757 ++++++++++------- src/d/msg/d_msg_object.cpp | 49 +- src/d/msg/d_msg_string_base.cpp | 25 - src/d/msg/d_msg_unit.cpp | 74 +- src/f_op/f_op_msg.cpp | 1 - src/m_Do/m_Do_ext.cpp | 97 + 112 files changed, 5132 insertions(+), 7404 deletions(-) delete mode 100644 asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s delete mode 100644 asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s delete mode 100644 asm/d/msg/d_msg_class/__ct__17jmessage_tControlFv.s delete mode 100644 asm/d/msg/d_msg_class/__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference.s delete mode 100644 asm/d/msg/d_msg_class/addCharactor__19jmessage_tReferenceFUs.s delete mode 100644 asm/d/msg/d_msg_class/allsetCharCountBuffer__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/changeKataToHira__Fi.s delete mode 100644 asm/d/msg/d_msg_class/checkCharInfoCharactor__Fi.s delete mode 100644 asm/d/msg/d_msg_class/decideOutFontRupeeColor__19jmessage_tReferenceFi.s delete mode 100644 asm/d/msg/d_msg_class/do_color__28jmessage_tRenderingProcessorFUc.s delete mode 100644 asm/d/msg/d_msg_class/do_tag__27jmessage_tSequenceProcessorFUlPCvUl.s delete mode 100644 asm/d/msg/d_msg_class/getFontCCColorTable__FUcUc.s delete mode 100644 asm/d/msg/d_msg_class/getFontGCColorTable__FUcUc.s delete mode 100644 asm/d/msg/d_msg_class/getLineMax__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/getOutFontNumberType__Fi.s delete mode 100644 asm/d/msg/d_msg_class/getPohNum__Fv.s delete mode 100644 asm/d/msg/d_msg_class/getWord__19jmessage_tReferenceFi.s delete mode 100644 asm/d/msg/d_msg_class/isBook__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isBossName__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isCharSend__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isHowl__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isKanban__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isLightEnd__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isLightSend__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isMidona__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isOutfontKanjiCode__Fi.s delete mode 100644 asm/d/msg/d_msg_class/isPlaceName__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isSaveSeq__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/isStaffRoll__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/resetCharCountBuffer__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/resetCharactor__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/resetReference__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/resetWord__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_class/setCharactor__19jmessage_tReferenceFUs.s delete mode 100644 asm/d/msg/d_msg_class/shiftCharCountBuffer__19jmessage_tReferenceFv.s delete mode 100644 asm/d/msg/d_msg_object/getPortalName__12dMsgObject_cFv.s delete mode 100644 asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s delete mode 100644 asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s delete mode 100644 asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dKy_event_proc__Fv.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Delete__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Draw__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Ganon_wether_proc__FP13kytag06_classUc.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type02_init__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type04_init__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type06_init__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_04_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_05_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_06_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_wether_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_08_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_09_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_wether_proc__FP13kytag06_classUc.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_rain_minus__Fv.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_execute__FUcff.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_init__FUcff.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/near_rail_get__FP13kytag06_classP4cXyz.s delete mode 100644 asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/set_path_info__FP10fopAc_ac_c.s create mode 100644 include/dolphin/gx/GXDraw.h create mode 100644 libs/dolphin/gx/GXDraw.c diff --git a/Progress.md b/Progress.md index d61bca959d..c28923e14a 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 24.689257% | 887960 | 3596544 +.text | 24.818381% | 892604 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 32.628774% | 1311896 | 4020672 +Total | 32.744278% | 1316540 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 32.628774% | 1311896 | 4020672 -RELs | 33.287306% | 3828148 | 11500324 -Total | 33.116715% | 5140044 | 15520996 +main.dol | 32.744278% | 1316540 | 4020672 +RELs | 33.371790% | 3837864 | 11500324 +Total | 33.209235% | 5154404 | 15520996 ## RELs @@ -197,7 +197,7 @@ d_a_kytag02 | 54.888889% | 988 | 1800 d_a_kytag03 | 23.399898% | 1828 | 7812 d_a_kytag04 | 36.357481% | 2148 | 5908 d_a_kytag05 | 100.000000% | 816 | 816 -d_a_kytag06 | 31.287129% | 4424 | 14140 +d_a_kytag06 | 100.000000% | 14140 | 14140 d_a_kytag07 | 100.000000% | 1272 | 1272 d_a_kytag08 | 31.379026% | 1520 | 4844 d_a_kytag09 | 49.936948% | 1584 | 3172 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.287306% | 3828148 | 11500324 +Total | 33.371790% | 3837864 | 11500324 diff --git a/asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s b/asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s deleted file mode 100644 index 1a7e61ef66..0000000000 --- a/asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_802A9490: -/* 802A9490 80 A3 00 00 */ lwz r5, 0(r3) -/* 802A9494 88 85 00 00 */ lbz r4, 0(r5) -/* 802A9498 38 05 00 01 */ addi r0, r5, 1 -/* 802A949C 90 03 00 00 */ stw r0, 0(r3) -/* 802A94A0 7C 83 23 78 */ mr r3, r4 -/* 802A94A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s b/asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s deleted file mode 100644 index 603610e59e..0000000000 --- a/asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802A94A8: -/* 802A94A8 80 83 00 00 */ lwz r4, 0(r3) -/* 802A94AC 88 A4 00 00 */ lbz r5, 0(r4) -/* 802A94B0 38 04 00 01 */ addi r0, r4, 1 -/* 802A94B4 90 03 00 00 */ stw r0, 0(r3) -/* 802A94B8 80 83 00 00 */ lwz r4, 0(r3) -/* 802A94BC 88 C4 00 00 */ lbz r6, 0(r4) -/* 802A94C0 50 A6 44 2E */ rlwimi r6, r5, 8, 0x10, 0x17 -/* 802A94C4 38 04 00 01 */ addi r0, r4, 1 -/* 802A94C8 90 03 00 00 */ stw r0, 0(r3) -/* 802A94CC 7C C3 33 78 */ mr r3, r6 -/* 802A94D0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/__ct__17jmessage_tControlFv.s b/asm/d/msg/d_msg_class/__ct__17jmessage_tControlFv.s deleted file mode 100644 index 88c435ad02..0000000000 --- a/asm/d/msg/d_msg_class/__ct__17jmessage_tControlFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802299EC: -/* 802299EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802299F0 7C 08 02 A6 */ mflr r0 -/* 802299F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802299F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802299FC 7C 7F 1B 78 */ mr r31, r3 -/* 80229A00 48 07 DB 49 */ bl __ct__Q28JMessage8TControlFv -/* 80229A04 3C 60 80 3A */ lis r3, __vt__17jmessage_tControl@ha /* 0x803A7928@ha */ -/* 80229A08 38 03 79 28 */ addi r0, r3, __vt__17jmessage_tControl@l /* 0x803A7928@l */ -/* 80229A0C 90 1F 00 00 */ stw r0, 0(r31) -/* 80229A10 7F E3 FB 78 */ mr r3, r31 -/* 80229A14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80229A18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80229A1C 7C 08 03 A6 */ mtlr r0 -/* 80229A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80229A24 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference.s b/asm/d/msg/d_msg_class/__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference.s deleted file mode 100644 index a12e2806a6..0000000000 --- a/asm/d/msg/d_msg_class/__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80229A28: -/* 80229A28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80229A2C 7C 08 02 A6 */ mflr r0 -/* 80229A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80229A34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80229A38 93 C1 00 08 */ stw r30, 8(r1) -/* 80229A3C 7C 7E 1B 78 */ mr r30, r3 -/* 80229A40 48 07 F0 45 */ bl __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference -/* 80229A44 3C 60 80 3C */ lis r3, __vt__26jmessage_tMeasureProcessor@ha /* 0x803C0A94@ha */ -/* 80229A48 38 03 0A 94 */ addi r0, r3, __vt__26jmessage_tMeasureProcessor@l /* 0x803C0A94@l */ -/* 80229A4C 90 1E 00 00 */ stw r0, 0(r30) -/* 80229A50 83 FE 00 04 */ lwz r31, 4(r30) -/* 80229A54 7F E3 FB 78 */ mr r3, r31 -/* 80229A58 4B FF FD 59 */ bl resetCharactor__19jmessage_tReferenceFv -/* 80229A5C C0 02 B0 64 */ lfs f0, lit_4028(r2) -/* 80229A60 D0 1E 00 38 */ stfs f0, 0x38(r30) -/* 80229A64 38 00 00 00 */ li r0, 0 -/* 80229A68 B0 1E 00 3C */ sth r0, 0x3c(r30) -/* 80229A6C B0 1E 00 3E */ sth r0, 0x3e(r30) -/* 80229A70 B0 1E 00 40 */ sth r0, 0x40(r30) -/* 80229A74 98 1E 00 48 */ stb r0, 0x48(r30) -/* 80229A78 98 1E 00 44 */ stb r0, 0x44(r30) -/* 80229A7C 98 1E 00 45 */ stb r0, 0x45(r30) -/* 80229A80 98 1E 00 46 */ stb r0, 0x46(r30) -/* 80229A84 98 1E 00 47 */ stb r0, 0x47(r30) -/* 80229A88 98 1E 00 49 */ stb r0, 0x49(r30) -/* 80229A8C 7F E3 FB 78 */ mr r3, r31 -/* 80229A90 4B FF F3 51 */ bl getLineMax__19jmessage_tReferenceFv -/* 80229A94 98 7E 00 4A */ stb r3, 0x4a(r30) -/* 80229A98 38 00 00 00 */ li r0, 0 -/* 80229A9C 98 1E 00 4B */ stb r0, 0x4b(r30) -/* 80229AA0 98 1E 00 4C */ stb r0, 0x4c(r30) -/* 80229AA4 98 1E 00 4D */ stb r0, 0x4d(r30) -/* 80229AA8 7F C3 F3 78 */ mr r3, r30 -/* 80229AAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80229AB0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80229AB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80229AB8 7C 08 03 A6 */ mtlr r0 -/* 80229ABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80229AC0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/addCharactor__19jmessage_tReferenceFUs.s b/asm/d/msg/d_msg_class/addCharactor__19jmessage_tReferenceFUs.s deleted file mode 100644 index cf07fc7e56..0000000000 --- a/asm/d/msg/d_msg_class/addCharactor__19jmessage_tReferenceFUs.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80229788: -/* 80229788 54 86 04 3E */ clrlwi r6, r4, 0x10 -/* 8022978C A8 A3 04 0E */ lha r5, 0x40e(r3) -/* 80229790 54 A0 08 3C */ slwi r0, r5, 1 -/* 80229794 7C 83 02 14 */ add r4, r3, r0 -/* 80229798 A0 04 00 0C */ lhz r0, 0xc(r4) -/* 8022979C 7C 06 00 40 */ cmplw r6, r0 -/* 802297A0 4C 82 00 20 */ bnelr -/* 802297A4 38 05 00 01 */ addi r0, r5, 1 -/* 802297A8 B0 03 04 0E */ sth r0, 0x40e(r3) -/* 802297AC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/allsetCharCountBuffer__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/allsetCharCountBuffer__19jmessage_tReferenceFv.s deleted file mode 100644 index 67bc1ec5b1..0000000000 --- a/asm/d/msg/d_msg_class/allsetCharCountBuffer__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80229848: -/* 80229848 38 A0 00 00 */ li r5, 0 -/* 8022984C 38 00 00 1F */ li r0, 0x1f -/* 80229850 7C 09 03 A6 */ mtctr r0 -lbl_80229854: -/* 80229854 88 83 05 DC */ lbz r4, 0x5dc(r3) -/* 80229858 38 05 12 53 */ addi r0, r5, 0x1253 -/* 8022985C 7C 83 01 AE */ stbx r4, r3, r0 -/* 80229860 38 A5 00 01 */ addi r5, r5, 1 -/* 80229864 42 00 FF F0 */ bdnz lbl_80229854 -/* 80229868 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/changeKataToHira__Fi.s b/asm/d/msg/d_msg_class/changeKataToHira__Fi.s deleted file mode 100644 index fbc1223b61..0000000000 --- a/asm/d/msg/d_msg_class/changeKataToHira__Fi.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80228838: -/* 80228838 54 65 04 3E */ clrlwi r5, r3, 0x10 -/* 8022883C 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008340@ha */ -/* 80228840 38 04 83 40 */ addi r0, r4, 0x8340 /* 0x00008340@l */ -/* 80228844 7C 03 00 00 */ cmpw r3, r0 -/* 80228848 41 80 00 1C */ blt lbl_80228864 -/* 8022884C 38 04 83 7E */ addi r0, r4, -31874 -/* 80228850 7C 03 00 00 */ cmpw r3, r0 -/* 80228854 41 81 00 10 */ bgt lbl_80228864 -/* 80228858 38 03 FF 5F */ addi r0, r3, -161 -/* 8022885C 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 80228860 48 00 00 40 */ b lbl_802288A0 -lbl_80228864: -/* 80228864 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008380@ha */ -/* 80228868 38 04 83 80 */ addi r0, r4, 0x8380 /* 0x00008380@l */ -/* 8022886C 7C 03 00 00 */ cmpw r3, r0 -/* 80228870 41 80 00 1C */ blt lbl_8022888C -/* 80228874 38 04 83 93 */ addi r0, r4, -31853 -/* 80228878 7C 03 00 00 */ cmpw r3, r0 -/* 8022887C 41 81 00 10 */ bgt lbl_8022888C -/* 80228880 38 03 FF 5E */ addi r0, r3, -162 -/* 80228884 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 80228888 48 00 00 18 */ b lbl_802288A0 -lbl_8022888C: -/* 8022888C 3C 03 00 00 */ addis r0, r3, 0 -/* 80228890 28 00 83 94 */ cmplwi r0, 0x8394 -/* 80228894 40 82 00 0C */ bne lbl_802288A0 -/* 80228898 3C 60 00 01 */ lis r3, 0x0001 /* 0x000082D4@ha */ -/* 8022889C 38 A3 82 D4 */ addi r5, r3, 0x82D4 /* 0x000082D4@l */ -lbl_802288A0: -/* 802288A0 7C A3 2B 78 */ mr r3, r5 -/* 802288A4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/checkCharInfoCharactor__Fi.s b/asm/d/msg/d_msg_class/checkCharInfoCharactor__Fi.s deleted file mode 100644 index 6b1c94489b..0000000000 --- a/asm/d/msg/d_msg_class/checkCharInfoCharactor__Fi.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80228578: -/* 80228578 3C 03 00 00 */ addis r0, r3, 0 -/* 8022857C 28 00 81 40 */ cmplwi r0, 0x8140 -/* 80228580 41 82 00 44 */ beq lbl_802285C4 -/* 80228584 28 00 81 41 */ cmplwi r0, 0x8141 -/* 80228588 41 82 00 3C */ beq lbl_802285C4 -/* 8022858C 28 00 81 42 */ cmplwi r0, 0x8142 -/* 80228590 41 82 00 34 */ beq lbl_802285C4 -/* 80228594 2C 03 00 20 */ cmpwi r3, 0x20 -/* 80228598 41 82 00 2C */ beq lbl_802285C4 -/* 8022859C 2C 03 00 22 */ cmpwi r3, 0x22 -/* 802285A0 41 82 00 24 */ beq lbl_802285C4 -/* 802285A4 2C 03 00 27 */ cmpwi r3, 0x27 -/* 802285A8 41 82 00 1C */ beq lbl_802285C4 -/* 802285AC 2C 03 00 2C */ cmpwi r3, 0x2c -/* 802285B0 41 82 00 14 */ beq lbl_802285C4 -/* 802285B4 2C 03 00 2E */ cmpwi r3, 0x2e -/* 802285B8 41 82 00 0C */ beq lbl_802285C4 -/* 802285BC 38 60 00 01 */ li r3, 1 -/* 802285C0 4E 80 00 20 */ blr -lbl_802285C4: -/* 802285C4 38 60 00 00 */ li r3, 0 -/* 802285C8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/decideOutFontRupeeColor__19jmessage_tReferenceFi.s b/asm/d/msg/d_msg_class/decideOutFontRupeeColor__19jmessage_tReferenceFi.s deleted file mode 100644 index cf48897556..0000000000 --- a/asm/d/msg/d_msg_class/decideOutFontRupeeColor__19jmessage_tReferenceFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802299AC: -/* 802299AC 80 A3 05 C0 */ lwz r5, 0x5c0(r3) -/* 802299B0 A8 05 01 7C */ lha r0, 0x17c(r5) -/* 802299B4 A8 A5 01 7A */ lha r5, 0x17a(r5) -/* 802299B8 7C 00 28 50 */ subf r0, r0, r5 -/* 802299BC 7C 00 20 00 */ cmpw r0, r4 -/* 802299C0 40 81 00 10 */ ble lbl_802299D0 -/* 802299C4 38 00 00 01 */ li r0, 1 -/* 802299C8 98 03 12 50 */ stb r0, 0x1250(r3) -/* 802299CC 4E 80 00 20 */ blr -lbl_802299D0: -/* 802299D0 40 82 00 10 */ bne lbl_802299E0 -/* 802299D4 38 00 00 00 */ li r0, 0 -/* 802299D8 98 03 12 50 */ stb r0, 0x1250(r3) -/* 802299DC 4E 80 00 20 */ blr -lbl_802299E0: -/* 802299E0 38 00 00 02 */ li r0, 2 -/* 802299E4 98 03 12 50 */ stb r0, 0x1250(r3) -/* 802299E8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/do_color__28jmessage_tRenderingProcessorFUc.s b/asm/d/msg/d_msg_class/do_color__28jmessage_tRenderingProcessorFUc.s deleted file mode 100644 index 3b294a9754..0000000000 --- a/asm/d/msg/d_msg_class/do_color__28jmessage_tRenderingProcessorFUc.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8022E7CC: -/* 8022E7CC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8022E7D0 7C 08 02 A6 */ mflr r0 -/* 8022E7D4 90 01 00 44 */ stw r0, 0x44(r1) -/* 8022E7D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022E7DC 48 13 3A 01 */ bl _savegpr_29 -/* 8022E7E0 7C 7D 1B 78 */ mr r29, r3 -/* 8022E7E4 7C 9E 23 78 */ mr r30, r4 -/* 8022E7E8 83 E3 00 04 */ lwz r31, 4(r3) -/* 8022E7EC 9B C3 01 50 */ stb r30, 0x150(r3) -/* 8022E7F0 7F C3 F3 78 */ mr r3, r30 -/* 8022E7F4 88 9F 12 46 */ lbz r4, 0x1246(r31) -/* 8022E7F8 4B FF A1 05 */ bl getFontCCColorTable__FUcUc -/* 8022E7FC 90 7D 01 20 */ stw r3, 0x120(r29) -/* 8022E800 7F C3 F3 78 */ mr r3, r30 -/* 8022E804 88 9F 12 46 */ lbz r4, 0x1246(r31) -/* 8022E808 4B FF A1 A1 */ bl getFontGCColorTable__FUcUc -/* 8022E80C 90 7D 01 24 */ stw r3, 0x124(r29) -/* 8022E810 38 61 00 08 */ addi r3, r1, 8 -/* 8022E814 3C 80 80 3A */ lis r4, d_msg_d_msg_class__stringBase0@ha /* 0x80399610@ha */ -/* 8022E818 38 84 96 10 */ addi r4, r4, d_msg_d_msg_class__stringBase0@l /* 0x80399610@l */ -/* 8022E81C 38 84 00 18 */ addi r4, r4, 0x18 -/* 8022E820 80 BD 01 20 */ lwz r5, 0x120(r29) -/* 8022E824 80 DD 01 24 */ lwz r6, 0x124(r29) -/* 8022E828 4C C6 31 82 */ crclr 6 -/* 8022E82C 48 13 7C B1 */ bl sprintf -/* 8022E830 7F A3 EB 78 */ mr r3, r29 -/* 8022E834 38 81 00 08 */ addi r4, r1, 8 -/* 8022E838 38 A0 00 00 */ li r5, 0 -/* 8022E83C 38 C0 00 00 */ li r6, 0 -/* 8022E840 38 E0 00 00 */ li r7, 0 -/* 8022E844 48 00 06 BD */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb -/* 8022E848 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022E84C 48 13 39 DD */ bl _restgpr_29 -/* 8022E850 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8022E854 7C 08 03 A6 */ mtlr r0 -/* 8022E858 38 21 00 40 */ addi r1, r1, 0x40 -/* 8022E85C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/do_tag__27jmessage_tSequenceProcessorFUlPCvUl.s b/asm/d/msg/d_msg_class/do_tag__27jmessage_tSequenceProcessorFUlPCvUl.s deleted file mode 100644 index 3e93c923fe..0000000000 --- a/asm/d/msg/d_msg_class/do_tag__27jmessage_tSequenceProcessorFUlPCvUl.s +++ /dev/null @@ -1,512 +0,0 @@ -lbl_8022C1A0: -/* 8022C1A0 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8022C1A4 7C 08 02 A6 */ mflr r0 -/* 8022C1A8 90 01 00 84 */ stw r0, 0x84(r1) -/* 8022C1AC 39 61 00 80 */ addi r11, r1, 0x80 -/* 8022C1B0 48 13 60 29 */ bl _savegpr_28 -/* 8022C1B4 7C 7C 1B 78 */ mr r28, r3 -/* 8022C1B8 7C 9D 23 78 */ mr r29, r4 -/* 8022C1BC 7C BE 2B 78 */ mr r30, r5 -/* 8022C1C0 83 E3 00 04 */ lwz r31, 4(r3) -/* 8022C1C4 54 84 02 1E */ rlwinm r4, r4, 0, 8, 0xf -/* 8022C1C8 3C 00 00 04 */ lis r0, 4 -/* 8022C1CC 7C 04 00 00 */ cmpw r4, r0 -/* 8022C1D0 41 82 06 48 */ beq lbl_8022C818 -/* 8022C1D4 40 80 00 40 */ bge lbl_8022C214 -/* 8022C1D8 3C 00 00 02 */ lis r0, 2 -/* 8022C1DC 7C 04 00 00 */ cmpw r4, r0 -/* 8022C1E0 41 82 00 A4 */ beq lbl_8022C284 -/* 8022C1E4 40 80 00 20 */ bge lbl_8022C204 -/* 8022C1E8 3C 00 00 01 */ lis r0, 1 -/* 8022C1EC 7C 04 00 00 */ cmpw r4, r0 -/* 8022C1F0 41 82 00 54 */ beq lbl_8022C244 -/* 8022C1F4 40 80 06 EC */ bge lbl_8022C8E0 -/* 8022C1F8 2C 04 00 00 */ cmpwi r4, 0 -/* 8022C1FC 41 82 01 0C */ beq lbl_8022C308 -/* 8022C200 48 00 06 E0 */ b lbl_8022C8E0 -lbl_8022C204: -/* 8022C204 3C 00 00 03 */ lis r0, 3 -/* 8022C208 7C 04 00 00 */ cmpw r4, r0 -/* 8022C20C 41 82 06 A4 */ beq lbl_8022C8B0 -/* 8022C210 48 00 06 D0 */ b lbl_8022C8E0 -lbl_8022C214: -/* 8022C214 3C 00 00 06 */ lis r0, 6 -/* 8022C218 7C 04 00 00 */ cmpw r4, r0 -/* 8022C21C 41 82 06 4C */ beq lbl_8022C868 -/* 8022C220 40 80 00 14 */ bge lbl_8022C234 -/* 8022C224 3C 00 00 05 */ lis r0, 5 -/* 8022C228 7C 04 00 00 */ cmpw r4, r0 -/* 8022C22C 41 82 06 14 */ beq lbl_8022C840 -/* 8022C230 48 00 06 B0 */ b lbl_8022C8E0 -lbl_8022C234: -/* 8022C234 3C 60 00 FF */ lis r3, 0xff -/* 8022C238 7C 04 18 00 */ cmpw r4, r3 -/* 8022C23C 41 82 00 60 */ beq lbl_8022C29C -/* 8022C240 48 00 06 A0 */ b lbl_8022C8E0 -lbl_8022C244: -/* 8022C244 38 61 00 08 */ addi r3, r1, 8 -/* 8022C248 7F E4 FB 78 */ mr r4, r31 -/* 8022C24C 48 00 67 D5 */ bl getActorPos__19jmessage_tReferenceFv -/* 8022C250 C0 01 00 08 */ lfs f0, 8(r1) -/* 8022C254 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8022C258 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8022C25C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8022C260 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8022C264 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8022C268 7F 83 E3 78 */ mr r3, r28 -/* 8022C26C 88 9C 00 B4 */ lbz r4, 0xb4(r28) -/* 8022C270 57 A5 06 3E */ clrlwi r5, r29, 0x18 -/* 8022C274 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8022C278 48 00 08 99 */ bl messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz -/* 8022C27C 38 60 00 01 */ li r3, 1 -/* 8022C280 48 00 06 64 */ b lbl_8022C8E4 -lbl_8022C284: -/* 8022C284 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8022C288 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022C28C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022C290 90 03 5E E8 */ stw r0, 0x5ee8(r3) -/* 8022C294 38 60 00 01 */ li r3, 1 -/* 8022C298 48 00 06 4C */ b lbl_8022C8E4 -lbl_8022C29C: -/* 8022C29C 38 03 00 02 */ addi r0, r3, 2 -/* 8022C2A0 7C 1D 00 00 */ cmpw r29, r0 -/* 8022C2A4 41 82 00 4C */ beq lbl_8022C2F0 -/* 8022C2A8 40 80 00 14 */ bge lbl_8022C2BC -/* 8022C2AC 7C 1D 18 00 */ cmpw r29, r3 -/* 8022C2B0 41 82 00 20 */ beq lbl_8022C2D0 -/* 8022C2B4 40 80 00 2C */ bge lbl_8022C2E0 -/* 8022C2B8 48 00 00 50 */ b lbl_8022C308 -lbl_8022C2BC: -/* 8022C2BC 3C 60 01 00 */ lis r3, 0x0100 /* 0x00FFFF02@ha */ -/* 8022C2C0 38 03 FF 02 */ addi r0, r3, 0xFF02 /* 0x00FFFF02@l */ -/* 8022C2C4 7C 1D 00 00 */ cmpw r29, r0 -/* 8022C2C8 41 82 00 28 */ beq lbl_8022C2F0 -/* 8022C2CC 48 00 00 3C */ b lbl_8022C308 -lbl_8022C2D0: -/* 8022C2D0 88 1E 00 00 */ lbz r0, 0(r30) -/* 8022C2D4 98 1F 12 49 */ stb r0, 0x1249(r31) -/* 8022C2D8 38 60 00 01 */ li r3, 1 -/* 8022C2DC 48 00 06 08 */ b lbl_8022C8E4 -lbl_8022C2E0: -/* 8022C2E0 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C2E4 B0 1F 06 32 */ sth r0, 0x632(r31) -/* 8022C2E8 38 60 00 01 */ li r3, 1 -/* 8022C2EC 48 00 05 F8 */ b lbl_8022C8E4 -lbl_8022C2F0: -/* 8022C2F0 7F 83 E3 78 */ mr r3, r28 -/* 8022C2F4 7F C4 F3 78 */ mr r4, r30 -/* 8022C2F8 7C C5 33 78 */ mr r5, r6 -/* 8022C2FC 48 00 07 29 */ bl do_rubyset__27jmessage_tSequenceProcessorFPCvUl -/* 8022C300 38 60 00 01 */ li r3, 1 -/* 8022C304 48 00 05 E0 */ b lbl_8022C8E4 -lbl_8022C308: -/* 8022C308 28 1D 00 3F */ cmplwi r29, 0x3f -/* 8022C30C 41 81 05 0C */ bgt lbl_8022C818 -/* 8022C310 3C 60 80 3C */ lis r3, lit_6062@ha /* 0x803C0230@ha */ -/* 8022C314 38 63 02 30 */ addi r3, r3, lit_6062@l /* 0x803C0230@l */ -/* 8022C318 57 A0 10 3A */ slwi r0, r29, 2 -/* 8022C31C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8022C320 7C 09 03 A6 */ mtctr r0 -/* 8022C324 4E 80 04 20 */ bctr -/* 8022C328 7F 83 E3 78 */ mr r3, r28 -/* 8022C32C 48 00 07 81 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C330 38 60 00 01 */ li r3, 1 -/* 8022C334 48 00 05 B0 */ b lbl_8022C8E4 -/* 8022C338 48 00 C1 DD */ bl getWord__12dMsgObject_cFv -/* 8022C33C 7C 64 1B 78 */ mr r4, r3 -/* 8022C340 7F 83 E3 78 */ mr r3, r28 -/* 8022C344 48 07 B8 B5 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C348 38 60 00 01 */ li r3, 1 -/* 8022C34C 48 00 05 98 */ b lbl_8022C8E4 -/* 8022C350 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C354 48 00 AF 79 */ bl getSmellName__12dMsgObject_cFv -/* 8022C358 7C 64 1B 78 */ mr r4, r3 -/* 8022C35C 7F 83 E3 78 */ mr r3, r28 -/* 8022C360 48 07 B8 99 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C364 38 60 00 01 */ li r3, 1 -/* 8022C368 48 00 05 7C */ b lbl_8022C8E4 -/* 8022C36C 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C370 48 00 AF C5 */ bl getPortalName__12dMsgObject_cFv -/* 8022C374 7C 64 1B 78 */ mr r4, r3 -/* 8022C378 7F 83 E3 78 */ mr r3, r28 -/* 8022C37C 48 07 B8 7D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C380 38 60 00 01 */ li r3, 1 -/* 8022C384 48 00 05 60 */ b lbl_8022C8E4 -/* 8022C388 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C38C 48 00 B0 01 */ bl getBombName__12dMsgObject_cFv -/* 8022C390 7C 64 1B 78 */ mr r4, r3 -/* 8022C394 7F 83 E3 78 */ mr r3, r28 -/* 8022C398 48 07 B8 61 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C39C 38 60 00 01 */ li r3, 1 -/* 8022C3A0 48 00 05 44 */ b lbl_8022C8E4 -/* 8022C3A4 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C3A8 48 00 B0 75 */ bl getInsectName__12dMsgObject_cFv -/* 8022C3AC 7C 64 1B 78 */ mr r4, r3 -/* 8022C3B0 7F 83 E3 78 */ mr r3, r28 -/* 8022C3B4 48 07 B8 45 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C3B8 38 60 00 01 */ li r3, 1 -/* 8022C3BC 48 00 05 28 */ b lbl_8022C8E4 -/* 8022C3C0 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C3C4 48 00 B0 B5 */ bl getLetterName__12dMsgObject_cFv -/* 8022C3C8 7C 64 1B 78 */ mr r4, r3 -/* 8022C3CC 7F 83 E3 78 */ mr r3, r28 -/* 8022C3D0 48 07 B8 29 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C3D4 38 60 00 01 */ li r3, 1 -/* 8022C3D8 48 00 05 0C */ b lbl_8022C8E4 -/* 8022C3DC 38 60 00 01 */ li r3, 1 -/* 8022C3E0 48 00 05 04 */ b lbl_8022C8E4 -/* 8022C3E4 7F 83 E3 78 */ mr r3, r28 -/* 8022C3E8 48 00 06 C5 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C3EC 38 60 00 01 */ li r3, 1 -/* 8022C3F0 48 00 04 F4 */ b lbl_8022C8E4 -/* 8022C3F4 38 00 00 01 */ li r0, 1 -/* 8022C3F8 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C3FC 98 1F 12 76 */ stb r0, 0x1276(r31) -/* 8022C400 38 60 00 01 */ li r3, 1 -/* 8022C404 48 00 04 E0 */ b lbl_8022C8E4 -/* 8022C408 38 00 00 00 */ li r0, 0 -/* 8022C40C 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C410 38 60 00 01 */ li r3, 1 -/* 8022C414 48 00 04 D0 */ b lbl_8022C8E4 -/* 8022C418 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C41C B0 1F 05 D6 */ sth r0, 0x5d6(r31) -/* 8022C420 A8 1F 05 D6 */ lha r0, 0x5d6(r31) -/* 8022C424 2C 00 00 00 */ cmpwi r0, 0 -/* 8022C428 40 82 00 10 */ bne lbl_8022C438 -/* 8022C42C 38 00 00 03 */ li r0, 3 -/* 8022C430 98 1F 12 4C */ stb r0, 0x124c(r31) -/* 8022C434 48 00 00 0C */ b lbl_8022C440 -lbl_8022C438: -/* 8022C438 38 00 00 01 */ li r0, 1 -/* 8022C43C 98 1F 12 4C */ stb r0, 0x124c(r31) -lbl_8022C440: -/* 8022C440 38 60 00 01 */ li r3, 1 -/* 8022C444 48 00 04 A0 */ b lbl_8022C8E4 -/* 8022C448 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C44C B0 1F 05 D6 */ sth r0, 0x5d6(r31) -/* 8022C450 38 00 00 02 */ li r0, 2 -/* 8022C454 98 1F 12 4C */ stb r0, 0x124c(r31) -/* 8022C458 38 60 00 01 */ li r3, 1 -/* 8022C45C 48 00 04 88 */ b lbl_8022C8E4 -/* 8022C460 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C464 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8022C468 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8022C46C B0 03 00 94 */ sth r0, 0x94(r3) -/* 8022C470 B0 1F 05 D6 */ sth r0, 0x5d6(r31) -/* 8022C474 38 00 00 06 */ li r0, 6 -/* 8022C478 98 1F 12 4C */ stb r0, 0x124c(r31) -/* 8022C47C 38 60 00 01 */ li r3, 1 -/* 8022C480 48 00 04 64 */ b lbl_8022C8E4 -/* 8022C484 80 1E 00 00 */ lwz r0, 0(r30) -/* 8022C488 90 1F 05 B4 */ stw r0, 0x5b4(r31) -/* 8022C48C 38 00 00 04 */ li r0, 4 -/* 8022C490 98 1F 12 4C */ stb r0, 0x124c(r31) -/* 8022C494 38 60 00 01 */ li r3, 1 -/* 8022C498 48 00 04 4C */ b lbl_8022C8E4 -/* 8022C49C A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C4A0 B0 1C 00 A8 */ sth r0, 0xa8(r28) -/* 8022C4A4 A8 1C 00 A8 */ lha r0, 0xa8(r28) -/* 8022C4A8 B0 1C 00 A4 */ sth r0, 0xa4(r28) -/* 8022C4AC 38 60 00 01 */ li r3, 1 -/* 8022C4B0 48 00 04 34 */ b lbl_8022C8E4 -/* 8022C4B4 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C4B8 B0 1C 00 A4 */ sth r0, 0xa4(r28) -/* 8022C4BC 38 00 00 00 */ li r0, 0 -/* 8022C4C0 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 8022C4C4 38 60 00 01 */ li r3, 1 -/* 8022C4C8 48 00 04 1C */ b lbl_8022C8E4 -/* 8022C4CC 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C4D0 28 00 00 00 */ cmplwi r0, 0 -/* 8022C4D4 40 82 00 1C */ bne lbl_8022C4F0 -/* 8022C4D8 38 00 00 02 */ li r0, 2 -/* 8022C4DC 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C4E0 38 00 00 00 */ li r0, 0 -/* 8022C4E4 98 1F 12 43 */ stb r0, 0x1243(r31) -/* 8022C4E8 38 00 00 01 */ li r0, 1 -/* 8022C4EC 98 1C 00 B2 */ stb r0, 0xb2(r28) -lbl_8022C4F0: -/* 8022C4F0 88 1E 00 00 */ lbz r0, 0(r30) -/* 8022C4F4 28 00 00 01 */ cmplwi r0, 1 -/* 8022C4F8 40 82 00 18 */ bne lbl_8022C510 -/* 8022C4FC 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C500 88 1F 12 74 */ lbz r0, 0x1274(r31) -/* 8022C504 28 00 00 00 */ cmplwi r0, 0 -/* 8022C508 40 82 00 08 */ bne lbl_8022C510 -/* 8022C50C 98 7F 12 44 */ stb r3, 0x1244(r31) -lbl_8022C510: -/* 8022C510 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C514 38 03 00 01 */ addi r0, r3, 1 -/* 8022C518 98 1C 00 AD */ stb r0, 0xad(r28) -/* 8022C51C 38 00 00 01 */ li r0, 1 -/* 8022C520 98 1C 00 AC */ stb r0, 0xac(r28) -/* 8022C524 38 60 00 01 */ li r3, 1 -/* 8022C528 48 00 03 BC */ b lbl_8022C8E4 -/* 8022C52C 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C530 28 00 00 00 */ cmplwi r0, 0 -/* 8022C534 40 82 00 1C */ bne lbl_8022C550 -/* 8022C538 38 00 00 03 */ li r0, 3 -/* 8022C53C 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C540 38 00 00 00 */ li r0, 0 -/* 8022C544 98 1F 12 43 */ stb r0, 0x1243(r31) -/* 8022C548 38 00 00 01 */ li r0, 1 -/* 8022C54C 98 1C 00 B2 */ stb r0, 0xb2(r28) -lbl_8022C550: -/* 8022C550 88 1E 00 00 */ lbz r0, 0(r30) -/* 8022C554 28 00 00 01 */ cmplwi r0, 1 -/* 8022C558 40 82 00 18 */ bne lbl_8022C570 -/* 8022C55C 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C560 88 1F 12 74 */ lbz r0, 0x1274(r31) -/* 8022C564 28 00 00 00 */ cmplwi r0, 0 -/* 8022C568 40 82 00 08 */ bne lbl_8022C570 -/* 8022C56C 98 7F 12 44 */ stb r3, 0x1244(r31) -lbl_8022C570: -/* 8022C570 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C574 38 03 00 01 */ addi r0, r3, 1 -/* 8022C578 98 1C 00 AD */ stb r0, 0xad(r28) -/* 8022C57C 38 00 00 01 */ li r0, 1 -/* 8022C580 98 1C 00 AC */ stb r0, 0xac(r28) -/* 8022C584 38 60 00 01 */ li r3, 1 -/* 8022C588 48 00 03 5C */ b lbl_8022C8E4 -/* 8022C58C 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C590 28 00 00 02 */ cmplwi r0, 2 -/* 8022C594 40 82 00 10 */ bne lbl_8022C5A4 -/* 8022C598 88 1F 12 43 */ lbz r0, 0x1243(r31) -/* 8022C59C 28 00 00 01 */ cmplwi r0, 1 -/* 8022C5A0 41 82 00 14 */ beq lbl_8022C5B4 -lbl_8022C5A4: -/* 8022C5A4 38 00 00 02 */ li r0, 2 -/* 8022C5A8 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C5AC 38 00 00 01 */ li r0, 1 -/* 8022C5B0 98 1F 12 43 */ stb r0, 0x1243(r31) -lbl_8022C5B4: -/* 8022C5B4 38 00 00 01 */ li r0, 1 -/* 8022C5B8 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C5BC 38 60 00 01 */ li r3, 1 -/* 8022C5C0 48 00 03 24 */ b lbl_8022C8E4 -/* 8022C5C4 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C5C8 28 00 00 02 */ cmplwi r0, 2 -/* 8022C5CC 40 82 00 10 */ bne lbl_8022C5DC -/* 8022C5D0 88 1F 12 43 */ lbz r0, 0x1243(r31) -/* 8022C5D4 28 00 00 01 */ cmplwi r0, 1 -/* 8022C5D8 41 82 00 2C */ beq lbl_8022C604 -lbl_8022C5DC: -/* 8022C5DC 38 00 00 02 */ li r0, 2 -/* 8022C5E0 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C5E4 38 00 00 01 */ li r0, 1 -/* 8022C5E8 98 1F 12 43 */ stb r0, 0x1243(r31) -/* 8022C5EC 88 1F 12 74 */ lbz r0, 0x1274(r31) -/* 8022C5F0 28 00 00 00 */ cmplwi r0, 0 -/* 8022C5F4 40 82 00 24 */ bne lbl_8022C618 -/* 8022C5F8 38 00 00 00 */ li r0, 0 -/* 8022C5FC 98 1F 12 44 */ stb r0, 0x1244(r31) -/* 8022C600 48 00 00 18 */ b lbl_8022C618 -lbl_8022C604: -/* 8022C604 88 1F 12 74 */ lbz r0, 0x1274(r31) -/* 8022C608 28 00 00 00 */ cmplwi r0, 0 -/* 8022C60C 40 82 00 0C */ bne lbl_8022C618 -/* 8022C610 38 00 00 01 */ li r0, 1 -/* 8022C614 98 1F 12 44 */ stb r0, 0x1244(r31) -lbl_8022C618: -/* 8022C618 38 00 00 01 */ li r0, 1 -/* 8022C61C 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C620 38 60 00 01 */ li r3, 1 -/* 8022C624 48 00 02 C0 */ b lbl_8022C8E4 -/* 8022C628 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C62C 28 00 00 03 */ cmplwi r0, 3 -/* 8022C630 40 82 00 10 */ bne lbl_8022C640 -/* 8022C634 88 1F 12 43 */ lbz r0, 0x1243(r31) -/* 8022C638 28 00 00 01 */ cmplwi r0, 1 -/* 8022C63C 41 82 00 14 */ beq lbl_8022C650 -lbl_8022C640: -/* 8022C640 38 00 00 03 */ li r0, 3 -/* 8022C644 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C648 38 00 00 01 */ li r0, 1 -/* 8022C64C 98 1F 12 43 */ stb r0, 0x1243(r31) -lbl_8022C650: -/* 8022C650 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C654 38 03 00 01 */ addi r0, r3, 1 -/* 8022C658 98 1C 00 AD */ stb r0, 0xad(r28) -/* 8022C65C 38 00 00 01 */ li r0, 1 -/* 8022C660 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C664 38 60 00 01 */ li r3, 1 -/* 8022C668 48 00 02 7C */ b lbl_8022C8E4 -/* 8022C66C 88 1F 12 42 */ lbz r0, 0x1242(r31) -/* 8022C670 28 00 00 03 */ cmplwi r0, 3 -/* 8022C674 40 82 00 10 */ bne lbl_8022C684 -/* 8022C678 88 1F 12 43 */ lbz r0, 0x1243(r31) -/* 8022C67C 28 00 00 01 */ cmplwi r0, 1 -/* 8022C680 41 82 00 14 */ beq lbl_8022C694 -lbl_8022C684: -/* 8022C684 38 00 00 03 */ li r0, 3 -/* 8022C688 98 1F 12 42 */ stb r0, 0x1242(r31) -/* 8022C68C 38 00 00 01 */ li r0, 1 -/* 8022C690 98 1F 12 43 */ stb r0, 0x1243(r31) -lbl_8022C694: -/* 8022C694 88 7C 00 AD */ lbz r3, 0xad(r28) -/* 8022C698 88 1F 12 74 */ lbz r0, 0x1274(r31) -/* 8022C69C 28 00 00 00 */ cmplwi r0, 0 -/* 8022C6A0 40 82 00 08 */ bne lbl_8022C6A8 -/* 8022C6A4 98 7F 12 44 */ stb r3, 0x1244(r31) -lbl_8022C6A8: -/* 8022C6A8 38 00 00 01 */ li r0, 1 -/* 8022C6AC 98 1C 00 B2 */ stb r0, 0xb2(r28) -/* 8022C6B0 38 60 00 01 */ li r3, 1 -/* 8022C6B4 48 00 02 30 */ b lbl_8022C8E4 -/* 8022C6B8 7F 83 E3 78 */ mr r3, r28 -/* 8022C6BC 38 80 00 0A */ li r4, 0xa -/* 8022C6C0 81 9C 00 00 */ lwz r12, 0(r28) -/* 8022C6C4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8022C6C8 7D 89 03 A6 */ mtctr r12 -/* 8022C6CC 4E 80 04 21 */ bctrl -/* 8022C6D0 7F 83 E3 78 */ mr r3, r28 -/* 8022C6D4 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 8022C6D8 48 07 B5 21 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc -/* 8022C6DC 38 60 00 01 */ li r3, 1 -/* 8022C6E0 48 00 02 04 */ b lbl_8022C8E4 -/* 8022C6E4 7F 83 E3 78 */ mr r3, r28 -/* 8022C6E8 48 00 02 1D */ bl do_name1__27jmessage_tSequenceProcessorFv -/* 8022C6EC 38 60 00 01 */ li r3, 1 -/* 8022C6F0 48 00 01 F4 */ b lbl_8022C8E4 -/* 8022C6F4 7F 83 E3 78 */ mr r3, r28 -/* 8022C6F8 7F A4 EB 78 */ mr r4, r29 -/* 8022C6FC 48 00 02 0D */ bl do_space__27jmessage_tSequenceProcessorFUl -/* 8022C700 38 60 00 01 */ li r3, 1 -/* 8022C704 48 00 01 E0 */ b lbl_8022C8E4 -/* 8022C708 7F E3 FB 78 */ mr r3, r31 -/* 8022C70C 38 80 00 00 */ li r4, 0 -/* 8022C710 4B FF D2 9D */ bl decideOutFontRupeeColor__19jmessage_tReferenceFi -/* 8022C714 80 9F 05 C0 */ lwz r4, 0x5c0(r31) -/* 8022C718 38 60 00 00 */ li r3, 0 -/* 8022C71C B0 64 01 74 */ sth r3, 0x174(r4) -/* 8022C720 38 00 00 01 */ li r0, 1 -/* 8022C724 98 04 01 9F */ stb r0, 0x19f(r4) -/* 8022C728 98 7F 12 4F */ stb r3, 0x124f(r31) -/* 8022C72C 38 00 00 05 */ li r0, 5 -/* 8022C730 98 1F 12 4C */ stb r0, 0x124c(r31) -/* 8022C734 80 1E 00 00 */ lwz r0, 0(r30) -/* 8022C738 28 00 00 01 */ cmplwi r0, 1 -/* 8022C73C 40 82 00 20 */ bne lbl_8022C75C -/* 8022C740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8022C744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8022C748 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8022C74C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8022C750 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8022C754 A0 84 00 A0 */ lhz r4, 0xa0(r4) -/* 8022C758 4B E0 82 35 */ bl onEventBit__11dSv_event_cFUs -lbl_8022C75C: -/* 8022C75C 38 60 00 01 */ li r3, 1 -/* 8022C760 48 00 01 84 */ b lbl_8022C8E4 -/* 8022C764 38 00 00 01 */ li r0, 1 -/* 8022C768 98 1F 12 4B */ stb r0, 0x124b(r31) -/* 8022C76C 38 60 00 01 */ li r3, 1 -/* 8022C770 48 00 01 74 */ b lbl_8022C8E4 -/* 8022C774 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C778 48 00 AD 59 */ bl getSelectBombNum__12dMsgObject_cFv -/* 8022C77C 7C 60 1B 78 */ mr r0, r3 -/* 8022C780 38 6D 8B 50 */ la r3, g_msg_unit(r13) /* 804510D0-_SDA_BASE_ */ -/* 8022C784 38 80 00 07 */ li r4, 7 -/* 8022C788 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8022C78C 38 C1 00 48 */ addi r6, r1, 0x48 -/* 8022C790 38 E0 00 01 */ li r7, 1 -/* 8022C794 48 00 C5 59 */ bl setTag__10dMsgUnit_cFiiPcb -/* 8022C798 7F E3 FB 78 */ mr r3, r31 -/* 8022C79C 88 9C 00 B5 */ lbz r4, 0xb5(r28) -/* 8022C7A0 7C 84 07 74 */ extsb r4, r4 -/* 8022C7A4 4B FF CF 8D */ bl getWord__19jmessage_tReferenceFi -/* 8022C7A8 38 81 00 48 */ addi r4, r1, 0x48 -/* 8022C7AC 48 13 C3 81 */ bl strcpy -/* 8022C7B0 7F 83 E3 78 */ mr r3, r28 -/* 8022C7B4 48 00 02 F9 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C7B8 38 60 00 01 */ li r3, 1 -/* 8022C7BC 48 00 01 28 */ b lbl_8022C8E4 -/* 8022C7C0 48 00 BE 21 */ bl getSelectBombPrice__12dMsgObject_cFv -/* 8022C7C4 7C 60 1B 78 */ mr r0, r3 -/* 8022C7C8 38 6D 8B 50 */ la r3, g_msg_unit(r13) /* 804510D0-_SDA_BASE_ */ -/* 8022C7CC 38 80 00 01 */ li r4, 1 -/* 8022C7D0 7C 05 07 34 */ extsh r5, r0 -/* 8022C7D4 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8022C7D8 38 E0 00 01 */ li r7, 1 -/* 8022C7DC 48 00 C5 11 */ bl setTag__10dMsgUnit_cFiiPcb -/* 8022C7E0 7F E3 FB 78 */ mr r3, r31 -/* 8022C7E4 88 9C 00 B5 */ lbz r4, 0xb5(r28) -/* 8022C7E8 7C 84 07 74 */ extsb r4, r4 -/* 8022C7EC 4B FF CF 45 */ bl getWord__19jmessage_tReferenceFi -/* 8022C7F0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8022C7F4 48 13 C3 39 */ bl strcpy -/* 8022C7F8 7F 83 E3 78 */ mr r3, r28 -/* 8022C7FC 48 00 02 B1 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C800 38 60 00 01 */ li r3, 1 -/* 8022C804 48 00 00 E0 */ b lbl_8022C8E4 -/* 8022C808 7F 83 E3 78 */ mr r3, r28 -/* 8022C80C 48 00 02 A1 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C810 38 60 00 01 */ li r3, 1 -/* 8022C814 48 00 00 D0 */ b lbl_8022C8E4 -lbl_8022C818: -/* 8022C818 57 A0 04 0E */ rlwinm r0, r29, 0, 0x10, 7 -/* 8022C81C 2C 00 00 0E */ cmpwi r0, 0xe -/* 8022C820 40 80 00 20 */ bge lbl_8022C840 -/* 8022C824 2C 00 00 00 */ cmpwi r0, 0 -/* 8022C828 40 80 00 08 */ bge lbl_8022C830 -/* 8022C82C 48 00 00 14 */ b lbl_8022C840 -lbl_8022C830: -/* 8022C830 7F 83 E3 78 */ mr r3, r28 -/* 8022C834 48 00 02 79 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C838 38 60 00 01 */ li r3, 1 -/* 8022C83C 48 00 00 A8 */ b lbl_8022C8E4 -lbl_8022C840: -/* 8022C840 57 A0 04 0E */ rlwinm r0, r29, 0, 0x10, 7 -/* 8022C844 2C 00 00 0F */ cmpwi r0, 0xf -/* 8022C848 40 80 00 20 */ bge lbl_8022C868 -/* 8022C84C 2C 00 00 00 */ cmpwi r0, 0 -/* 8022C850 40 80 00 08 */ bge lbl_8022C858 -/* 8022C854 48 00 00 14 */ b lbl_8022C868 -lbl_8022C858: -/* 8022C858 7F 83 E3 78 */ mr r3, r28 -/* 8022C85C 48 00 02 51 */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C860 38 60 00 01 */ li r3, 1 -/* 8022C864 48 00 00 80 */ b lbl_8022C8E4 -lbl_8022C868: -/* 8022C868 57 A0 04 0E */ rlwinm r0, r29, 0, 0x10, 7 -/* 8022C86C 2C 00 00 0A */ cmpwi r0, 0xa -/* 8022C870 40 80 00 10 */ bge lbl_8022C880 -/* 8022C874 2C 00 00 00 */ cmpwi r0, 0 -/* 8022C878 40 80 00 14 */ bge lbl_8022C88C -/* 8022C87C 48 00 00 34 */ b lbl_8022C8B0 -lbl_8022C880: -/* 8022C880 2C 00 00 0C */ cmpwi r0, 0xc -/* 8022C884 40 80 00 2C */ bge lbl_8022C8B0 -/* 8022C888 48 00 00 14 */ b lbl_8022C89C -lbl_8022C88C: -/* 8022C88C 7F 83 E3 78 */ mr r3, r28 -/* 8022C890 48 00 02 1D */ bl push_word__27jmessage_tSequenceProcessorFv -/* 8022C894 38 60 00 01 */ li r3, 1 -/* 8022C898 48 00 00 4C */ b lbl_8022C8E4 -lbl_8022C89C: -/* 8022C89C 7F 83 E3 78 */ mr r3, r28 -/* 8022C8A0 7F A4 EB 78 */ mr r4, r29 -/* 8022C8A4 48 00 00 65 */ bl do_space__27jmessage_tSequenceProcessorFUl -/* 8022C8A8 38 60 00 01 */ li r3, 1 -/* 8022C8AC 48 00 00 38 */ b lbl_8022C8E4 -lbl_8022C8B0: -/* 8022C8B0 57 A0 04 0F */ rlwinm. r0, r29, 0, 0x10, 7 -/* 8022C8B4 41 82 00 24 */ beq lbl_8022C8D8 -/* 8022C8B8 41 80 00 28 */ blt lbl_8022C8E0 -/* 8022C8BC 2C 00 00 15 */ cmpwi r0, 0x15 -/* 8022C8C0 40 80 00 20 */ bge lbl_8022C8E0 -/* 8022C8C4 7F 83 E3 78 */ mr r3, r28 -/* 8022C8C8 7F A4 EB 78 */ mr r4, r29 -/* 8022C8CC 48 00 00 3D */ bl do_space__27jmessage_tSequenceProcessorFUl -/* 8022C8D0 38 60 00 01 */ li r3, 1 -/* 8022C8D4 48 00 00 10 */ b lbl_8022C8E4 -lbl_8022C8D8: -/* 8022C8D8 38 60 00 01 */ li r3, 1 -/* 8022C8DC 48 00 00 08 */ b lbl_8022C8E4 -lbl_8022C8E0: -/* 8022C8E0 38 60 00 00 */ li r3, 0 -lbl_8022C8E4: -/* 8022C8E4 39 61 00 80 */ addi r11, r1, 0x80 -/* 8022C8E8 48 13 59 3D */ bl _restgpr_28 -/* 8022C8EC 80 01 00 84 */ lwz r0, 0x84(r1) -/* 8022C8F0 7C 08 03 A6 */ mtlr r0 -/* 8022C8F4 38 21 00 80 */ addi r1, r1, 0x80 -/* 8022C8F8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getFontCCColorTable__FUcUc.s b/asm/d/msg/d_msg_class/getFontCCColorTable__FUcUc.s deleted file mode 100644 index 2272f9dbac..0000000000 --- a/asm/d/msg/d_msg_class/getFontCCColorTable__FUcUc.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_802288FC: -/* 802288FC 54 66 06 3E */ clrlwi r6, r3, 0x18 -/* 80228900 28 06 00 08 */ cmplwi r6, 8 -/* 80228904 40 81 00 0C */ ble lbl_80228910 -/* 80228908 38 60 FF FF */ li r3, -1 -/* 8022890C 4E 80 00 20 */ blr -lbl_80228910: -/* 80228910 3C A0 80 43 */ lis r5, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80228914 38 A5 02 8C */ addi r5, r5, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80228918 88 05 03 20 */ lbz r0, 0x320(r5) -/* 8022891C 28 00 00 00 */ cmplwi r0, 0 -/* 80228920 41 82 00 28 */ beq lbl_80228948 -/* 80228924 7C A5 32 14 */ add r5, r5, r6 -/* 80228928 88 85 03 33 */ lbz r4, 0x333(r5) -/* 8022892C 88 65 03 21 */ lbz r3, 0x321(r5) -/* 80228930 88 05 03 2A */ lbz r0, 0x32a(r5) -/* 80228934 54 00 80 1E */ slwi r0, r0, 0x10 -/* 80228938 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 8022893C 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 80228940 60 03 00 FF */ ori r3, r0, 0xff -/* 80228944 4E 80 00 20 */ blr -lbl_80228948: -/* 80228948 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 8022894C 3C 60 80 3A */ lis r3, colorTable_3861@ha /* 0x803995C8@ha */ -/* 80228950 38 63 95 C8 */ addi r3, r3, colorTable_3861@l /* 0x803995C8@l */ -/* 80228954 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80228958 28 06 00 00 */ cmplwi r6, 0 -/* 8022895C 4C 82 00 20 */ bnelr -/* 80228960 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80228964 2C 00 00 0D */ cmpwi r0, 0xd -/* 80228968 41 82 00 20 */ beq lbl_80228988 -/* 8022896C 40 80 00 10 */ bge lbl_8022897C -/* 80228970 2C 00 00 08 */ cmpwi r0, 8 -/* 80228974 41 82 00 20 */ beq lbl_80228994 -/* 80228978 4E 80 00 20 */ blr -lbl_8022897C: -/* 8022897C 2C 00 00 0F */ cmpwi r0, 0xf -/* 80228980 4C 80 00 20 */ bgelr -/* 80228984 48 00 00 18 */ b lbl_8022899C -lbl_80228988: -/* 80228988 3C 60 82 E7 */ lis r3, 0x82E7 /* 0x82E6E6FF@ha */ -/* 8022898C 38 63 E6 FF */ addi r3, r3, 0xE6FF /* 0x82E6E6FF@l */ -/* 80228990 4E 80 00 20 */ blr -lbl_80228994: -/* 80228994 38 60 FF FF */ li r3, -1 -/* 80228998 4E 80 00 20 */ blr -lbl_8022899C: -/* 8022899C 3C 60 96 DC */ lis r3, 0x96DC /* 0x96DC64FF@ha */ -/* 802289A0 38 63 64 FF */ addi r3, r3, 0x64FF /* 0x96DC64FF@l */ -/* 802289A4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getFontGCColorTable__FUcUc.s b/asm/d/msg/d_msg_class/getFontGCColorTable__FUcUc.s deleted file mode 100644 index 928f4e8cb7..0000000000 --- a/asm/d/msg/d_msg_class/getFontGCColorTable__FUcUc.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_802289A8: -/* 802289A8 54 66 06 3E */ clrlwi r6, r3, 0x18 -/* 802289AC 28 06 00 08 */ cmplwi r6, 8 -/* 802289B0 40 81 00 0C */ ble lbl_802289BC -/* 802289B4 38 60 FF FF */ li r3, -1 -/* 802289B8 4E 80 00 20 */ blr -lbl_802289BC: -/* 802289BC 3C A0 80 43 */ lis r5, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802289C0 38 A5 02 8C */ addi r5, r5, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802289C4 88 05 03 20 */ lbz r0, 0x320(r5) -/* 802289C8 28 00 00 00 */ cmplwi r0, 0 -/* 802289CC 41 82 00 28 */ beq lbl_802289F4 -/* 802289D0 7C A5 32 14 */ add r5, r5, r6 -/* 802289D4 88 85 03 4E */ lbz r4, 0x34e(r5) -/* 802289D8 88 65 03 3C */ lbz r3, 0x33c(r5) -/* 802289DC 88 05 03 45 */ lbz r0, 0x345(r5) -/* 802289E0 54 00 80 1E */ slwi r0, r0, 0x10 -/* 802289E4 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 802289E8 50 80 44 2E */ rlwimi r0, r4, 8, 0x10, 0x17 -/* 802289EC 60 03 00 FF */ ori r3, r0, 0xff -/* 802289F0 4E 80 00 20 */ blr -lbl_802289F4: -/* 802289F4 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 802289F8 3C 60 80 3A */ lis r3, colorTable_3877@ha /* 0x803995EC@ha */ -/* 802289FC 38 63 95 EC */ addi r3, r3, colorTable_3877@l /* 0x803995EC@l */ -/* 80228A00 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80228A04 28 06 00 00 */ cmplwi r6, 0 -/* 80228A08 4C 82 00 20 */ bnelr -/* 80228A0C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80228A10 2C 00 00 0D */ cmpwi r0, 0xd -/* 80228A14 41 82 00 20 */ beq lbl_80228A34 -/* 80228A18 40 80 00 10 */ bge lbl_80228A28 -/* 80228A1C 2C 00 00 08 */ cmpwi r0, 8 -/* 80228A20 41 82 00 20 */ beq lbl_80228A40 -/* 80228A24 4E 80 00 20 */ blr -lbl_80228A28: -/* 80228A28 2C 00 00 0F */ cmpwi r0, 0xf -/* 80228A2C 4C 80 00 20 */ bgelr -/* 80228A30 48 00 00 18 */ b lbl_80228A48 -lbl_80228A34: -/* 80228A34 3C 60 82 E7 */ lis r3, 0x82E7 /* 0x82E6E6FF@ha */ -/* 80228A38 38 63 E6 FF */ addi r3, r3, 0xE6FF /* 0x82E6E6FF@l */ -/* 80228A3C 4E 80 00 20 */ blr -lbl_80228A40: -/* 80228A40 38 60 FF FF */ li r3, -1 -/* 80228A44 4E 80 00 20 */ blr -lbl_80228A48: -/* 80228A48 3C 60 96 DC */ lis r3, 0x96DC /* 0x96DC64FF@ha */ -/* 80228A4C 38 63 64 FF */ addi r3, r3, 0x64FF /* 0x96DC64FF@l */ -/* 80228A50 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getLineMax__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/getLineMax__19jmessage_tReferenceFv.s deleted file mode 100644 index 7b8038f185..0000000000 --- a/asm/d/msg/d_msg_class/getLineMax__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80228DE0: -/* 80228DE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228DE4 7C 08 02 A6 */ mflr r0 -/* 80228DE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228DEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80228DF0 7C 7F 1B 78 */ mr r31, r3 -/* 80228DF4 48 00 00 79 */ bl isKanban__19jmessage_tReferenceFv -/* 80228DF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80228DFC 41 82 00 0C */ beq lbl_80228E08 -/* 80228E00 38 00 00 07 */ li r0, 7 -/* 80228E04 48 00 00 50 */ b lbl_80228E54 -lbl_80228E08: -/* 80228E08 7F E3 FB 78 */ mr r3, r31 -/* 80228E0C 48 00 01 31 */ bl isBook__19jmessage_tReferenceFv -/* 80228E10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80228E14 41 82 00 0C */ beq lbl_80228E20 -/* 80228E18 38 00 00 09 */ li r0, 9 -/* 80228E1C 48 00 00 38 */ b lbl_80228E54 -lbl_80228E20: -/* 80228E20 7F E3 FB 78 */ mr r3, r31 -/* 80228E24 48 00 01 4D */ bl isStaffRoll__19jmessage_tReferenceFv -/* 80228E28 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80228E2C 41 82 00 0C */ beq lbl_80228E38 -/* 80228E30 38 00 00 0A */ li r0, 0xa -/* 80228E34 48 00 00 20 */ b lbl_80228E54 -lbl_80228E38: -/* 80228E38 7F E3 FB 78 */ mr r3, r31 -/* 80228E3C 48 00 00 CD */ bl isSaveSeq__19jmessage_tReferenceFv -/* 80228E40 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80228E44 41 82 00 0C */ beq lbl_80228E50 -/* 80228E48 38 00 00 06 */ li r0, 6 -/* 80228E4C 48 00 00 08 */ b lbl_80228E54 -lbl_80228E50: -/* 80228E50 38 00 00 04 */ li r0, 4 -lbl_80228E54: -/* 80228E54 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80228E58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80228E5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228E60 7C 08 03 A6 */ mtlr r0 -/* 80228E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228E68 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getOutFontNumberType__Fi.s b/asm/d/msg/d_msg_class/getOutFontNumberType__Fi.s deleted file mode 100644 index 7b620691c9..0000000000 --- a/asm/d/msg/d_msg_class/getOutFontNumberType__Fi.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80228A54: -/* 80228A54 28 03 00 09 */ cmplwi r3, 9 -/* 80228A58 41 81 00 6C */ bgt lbl_80228AC4 -/* 80228A5C 3C 80 80 3C */ lis r4, lit_3903@ha /* 0x803BFF78@ha */ -/* 80228A60 38 84 FF 78 */ addi r4, r4, lit_3903@l /* 0x803BFF78@l */ -/* 80228A64 54 60 10 3A */ slwi r0, r3, 2 -/* 80228A68 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80228A6C 7C 09 03 A6 */ mtctr r0 -/* 80228A70 4E 80 04 20 */ bctr -/* 80228A74 38 60 00 1F */ li r3, 0x1f -/* 80228A78 4E 80 00 20 */ blr -/* 80228A7C 38 60 00 20 */ li r3, 0x20 -/* 80228A80 4E 80 00 20 */ blr -/* 80228A84 38 60 00 21 */ li r3, 0x21 -/* 80228A88 4E 80 00 20 */ blr -/* 80228A8C 38 60 00 22 */ li r3, 0x22 -/* 80228A90 4E 80 00 20 */ blr -/* 80228A94 38 60 00 23 */ li r3, 0x23 -/* 80228A98 4E 80 00 20 */ blr -/* 80228A9C 38 60 00 24 */ li r3, 0x24 -/* 80228AA0 4E 80 00 20 */ blr -/* 80228AA4 38 60 00 25 */ li r3, 0x25 -/* 80228AA8 4E 80 00 20 */ blr -/* 80228AAC 38 60 00 26 */ li r3, 0x26 -/* 80228AB0 4E 80 00 20 */ blr -/* 80228AB4 38 60 00 27 */ li r3, 0x27 -/* 80228AB8 4E 80 00 20 */ blr -/* 80228ABC 38 60 00 28 */ li r3, 0x28 -/* 80228AC0 4E 80 00 20 */ blr -lbl_80228AC4: -/* 80228AC4 38 60 00 1F */ li r3, 0x1f -/* 80228AC8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getPohNum__Fv.s b/asm/d/msg/d_msg_class/getPohNum__Fv.s deleted file mode 100644 index b63e677174..0000000000 --- a/asm/d/msg/d_msg_class/getPohNum__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228ACC: -/* 80228ACC 38 60 00 00 */ li r3, 0 -/* 80228AD0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80228AD4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80228AD8 88 04 01 0C */ lbz r0, 0x10c(r4) -/* 80228ADC 28 00 00 14 */ cmplwi r0, 0x14 -/* 80228AE0 40 80 00 10 */ bge lbl_80228AF0 -/* 80228AE4 20 00 00 14 */ subfic r0, r0, 0x14 -/* 80228AE8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80228AEC 4E 80 00 20 */ blr -lbl_80228AF0: -/* 80228AF0 28 00 00 3C */ cmplwi r0, 0x3c -/* 80228AF4 4C 80 00 20 */ bgelr -/* 80228AF8 20 00 00 3C */ subfic r0, r0, 0x3c -/* 80228AFC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80228B00 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/getWord__19jmessage_tReferenceFi.s b/asm/d/msg/d_msg_class/getWord__19jmessage_tReferenceFi.s deleted file mode 100644 index 981020308c..0000000000 --- a/asm/d/msg/d_msg_class/getWord__19jmessage_tReferenceFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80229730: -/* 80229730 7C 60 1B 78 */ mr r0, r3 -/* 80229734 1C 64 00 64 */ mulli r3, r4, 0x64 -/* 80229738 38 63 06 34 */ addi r3, r3, 0x634 -/* 8022973C 7C 60 1A 14 */ add r3, r0, r3 -/* 80229740 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isBook__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isBook__19jmessage_tReferenceFv.s deleted file mode 100644 index 08a1cf035c..0000000000 --- a/asm/d/msg/d_msg_class/isBook__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228F3C: -/* 80228F3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228F40 7C 08 02 A6 */ mflr r0 -/* 80228F44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228F48 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228F4C 28 03 00 00 */ cmplwi r3, 0 -/* 80228F50 40 82 00 0C */ bne lbl_80228F5C -/* 80228F54 38 60 00 00 */ li r3, 0 -/* 80228F58 48 00 00 08 */ b lbl_80228F60 -lbl_80228F5C: -/* 80228F5C 48 00 E2 B1 */ bl isBookMessage__12dMsgObject_cFv -lbl_80228F60: -/* 80228F60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228F64 7C 08 03 A6 */ mtlr r0 -/* 80228F68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228F6C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isBossName__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isBossName__19jmessage_tReferenceFv.s deleted file mode 100644 index b93f80aebe..0000000000 --- a/asm/d/msg/d_msg_class/isBossName__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228ED4: -/* 80228ED4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228ED8 7C 08 02 A6 */ mflr r0 -/* 80228EDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228EE0 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228EE4 28 03 00 00 */ cmplwi r3, 0 -/* 80228EE8 40 82 00 0C */ bne lbl_80228EF4 -/* 80228EEC 38 60 00 00 */ li r3, 0 -/* 80228EF0 48 00 00 08 */ b lbl_80228EF8 -lbl_80228EF4: -/* 80228EF4 48 00 E3 05 */ bl isBossMessage__12dMsgObject_cFv -lbl_80228EF8: -/* 80228EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228EFC 7C 08 03 A6 */ mtlr r0 -/* 80228F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228F04 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isCharSend__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isCharSend__19jmessage_tReferenceFv.s deleted file mode 100644 index 56d02cea95..0000000000 --- a/asm/d/msg/d_msg_class/isCharSend__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8022986C: -/* 8022986C 88 03 12 46 */ lbz r0, 0x1246(r3) -/* 80229870 28 00 00 08 */ cmplwi r0, 8 -/* 80229874 40 82 00 18 */ bne lbl_8022988C -/* 80229878 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8022987C 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80229880 A8 84 03 1C */ lha r4, 0x31c(r4) -/* 80229884 7C 85 23 78 */ mr r5, r4 -/* 80229888 48 00 00 14 */ b lbl_8022989C -lbl_8022988C: -/* 8022988C 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80229890 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80229894 A8 84 03 1A */ lha r4, 0x31a(r4) -/* 80229898 7C 85 23 78 */ mr r5, r4 -lbl_8022989C: -/* 8022989C 7C A0 07 35 */ extsh. r0, r5 -/* 802298A0 40 80 00 0C */ bge lbl_802298AC -/* 802298A4 1C 05 FF FF */ mulli r0, r5, -1 -/* 802298A8 7C 05 07 34 */ extsh r5, r0 -lbl_802298AC: -/* 802298AC 7C 80 07 35 */ extsh. r0, r4 -/* 802298B0 40 80 00 24 */ bge lbl_802298D4 -/* 802298B4 88 83 05 DD */ lbz r4, 0x5dd(r3) -/* 802298B8 7C A0 07 34 */ extsh r0, r5 -/* 802298BC 7C 63 02 14 */ add r3, r3, r0 -/* 802298C0 88 03 12 53 */ lbz r0, 0x1253(r3) -/* 802298C4 7C 04 00 40 */ cmplw r4, r0 -/* 802298C8 41 80 00 0C */ blt lbl_802298D4 -/* 802298CC 38 60 00 00 */ li r3, 0 -/* 802298D0 4E 80 00 20 */ blr -lbl_802298D4: -/* 802298D4 38 60 00 01 */ li r3, 1 -/* 802298D8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isHowl__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isHowl__19jmessage_tReferenceFv.s deleted file mode 100644 index 4827eb1141..0000000000 --- a/asm/d/msg/d_msg_class/isHowl__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228FA4: -/* 80228FA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228FA8 7C 08 02 A6 */ mflr r0 -/* 80228FAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228FB0 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228FB4 28 03 00 00 */ cmplwi r3, 0 -/* 80228FB8 40 82 00 0C */ bne lbl_80228FC4 -/* 80228FBC 38 60 00 00 */ li r3, 0 -/* 80228FC0 48 00 00 08 */ b lbl_80228FC8 -lbl_80228FC4: -/* 80228FC4 48 00 E1 25 */ bl isHowlMessage__12dMsgObject_cFv -lbl_80228FC8: -/* 80228FC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228FCC 7C 08 03 A6 */ mtlr r0 -/* 80228FD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228FD4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isKanban__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isKanban__19jmessage_tReferenceFv.s deleted file mode 100644 index b4de311ffc..0000000000 --- a/asm/d/msg/d_msg_class/isKanban__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228E6C: -/* 80228E6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228E70 7C 08 02 A6 */ mflr r0 -/* 80228E74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228E78 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228E7C 28 03 00 00 */ cmplwi r3, 0 -/* 80228E80 40 82 00 0C */ bne lbl_80228E8C -/* 80228E84 38 60 00 00 */ li r3, 0 -/* 80228E88 48 00 00 08 */ b lbl_80228E90 -lbl_80228E8C: -/* 80228E8C 48 00 E2 31 */ bl isKanbanMessage__12dMsgObject_cFv -lbl_80228E90: -/* 80228E90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228E94 7C 08 03 A6 */ mtlr r0 -/* 80228E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228E9C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isLightEnd__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isLightEnd__19jmessage_tReferenceFv.s deleted file mode 100644 index 3c7a783868..0000000000 --- a/asm/d/msg/d_msg_class/isLightEnd__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8022994C: -/* 8022994C 88 03 12 46 */ lbz r0, 0x1246(r3) -/* 80229950 28 00 00 08 */ cmplwi r0, 8 -/* 80229954 40 82 00 14 */ bne lbl_80229968 -/* 80229958 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8022995C 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80229960 A8 84 03 1C */ lha r4, 0x31c(r4) -/* 80229964 48 00 00 10 */ b lbl_80229974 -lbl_80229968: -/* 80229968 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8022996C 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80229970 A8 84 03 1A */ lha r4, 0x31a(r4) -lbl_80229974: -/* 80229974 7C 80 07 35 */ extsh. r0, r4 -/* 80229978 40 80 00 0C */ bge lbl_80229984 -/* 8022997C 1C 04 FF FF */ mulli r0, r4, -1 -/* 80229980 7C 04 07 34 */ extsh r4, r0 -lbl_80229984: -/* 80229984 7C 80 07 34 */ extsh r0, r4 -/* 80229988 7C 83 02 14 */ add r4, r3, r0 -/* 8022998C 88 84 12 53 */ lbz r4, 0x1253(r4) -/* 80229990 88 03 12 53 */ lbz r0, 0x1253(r3) -/* 80229994 7C 04 00 40 */ cmplw r4, r0 -/* 80229998 40 82 00 0C */ bne lbl_802299A4 -/* 8022999C 38 60 00 01 */ li r3, 1 -/* 802299A0 4E 80 00 20 */ blr -lbl_802299A4: -/* 802299A4 38 60 00 00 */ li r3, 0 -/* 802299A8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isLightSend__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isLightSend__19jmessage_tReferenceFv.s deleted file mode 100644 index 9eaf6c4e35..0000000000 --- a/asm/d/msg/d_msg_class/isLightSend__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802298DC: -/* 802298DC 88 03 12 46 */ lbz r0, 0x1246(r3) -/* 802298E0 28 00 00 08 */ cmplwi r0, 8 -/* 802298E4 40 82 00 18 */ bne lbl_802298FC -/* 802298E8 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802298EC 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802298F0 A8 84 03 1C */ lha r4, 0x31c(r4) -/* 802298F4 7C 85 23 78 */ mr r5, r4 -/* 802298F8 48 00 00 14 */ b lbl_8022990C -lbl_802298FC: -/* 802298FC 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80229900 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80229904 A8 84 03 1A */ lha r4, 0x31a(r4) -/* 80229908 7C 85 23 78 */ mr r5, r4 -lbl_8022990C: -/* 8022990C 7C A0 07 35 */ extsh. r0, r5 -/* 80229910 40 80 00 0C */ bge lbl_8022991C -/* 80229914 1C 05 FF FF */ mulli r0, r5, -1 -/* 80229918 7C 05 07 34 */ extsh r5, r0 -lbl_8022991C: -/* 8022991C 7C 80 07 35 */ extsh. r0, r4 -/* 80229920 40 81 00 24 */ ble lbl_80229944 -/* 80229924 88 83 05 DD */ lbz r4, 0x5dd(r3) -/* 80229928 7C A0 07 34 */ extsh r0, r5 -/* 8022992C 7C 63 02 14 */ add r3, r3, r0 -/* 80229930 88 03 12 53 */ lbz r0, 0x1253(r3) -/* 80229934 7C 04 00 40 */ cmplw r4, r0 -/* 80229938 41 80 00 0C */ blt lbl_80229944 -/* 8022993C 38 60 00 00 */ li r3, 0 -/* 80229940 4E 80 00 20 */ blr -lbl_80229944: -/* 80229944 38 60 00 01 */ li r3, 1 -/* 80229948 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isMidona__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isMidona__19jmessage_tReferenceFv.s deleted file mode 100644 index 5276fc2474..0000000000 --- a/asm/d/msg/d_msg_class/isMidona__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228FD8: -/* 80228FD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228FDC 7C 08 02 A6 */ mflr r0 -/* 80228FE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228FE4 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228FE8 28 03 00 00 */ cmplwi r3, 0 -/* 80228FEC 40 82 00 0C */ bne lbl_80228FF8 -/* 80228FF0 38 60 00 00 */ li r3, 0 -/* 80228FF4 48 00 00 08 */ b lbl_80228FFC -lbl_80228FF8: -/* 80228FF8 48 00 E1 05 */ bl isMidonaMessage__12dMsgObject_cFv -lbl_80228FFC: -/* 80228FFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80229000 7C 08 03 A6 */ mtlr r0 -/* 80229004 38 21 00 10 */ addi r1, r1, 0x10 -/* 80229008 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isOutfontKanjiCode__Fi.s b/asm/d/msg/d_msg_class/isOutfontKanjiCode__Fi.s deleted file mode 100644 index 68521d6be0..0000000000 --- a/asm/d/msg/d_msg_class/isOutfontKanjiCode__Fi.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802288A8: -/* 802288A8 2C 03 00 5C */ cmpwi r3, 0x5c -/* 802288AC 41 82 00 40 */ beq lbl_802288EC -/* 802288B0 40 80 00 1C */ bge lbl_802288CC -/* 802288B4 2C 03 00 40 */ cmpwi r3, 0x40 -/* 802288B8 41 82 00 34 */ beq lbl_802288EC -/* 802288BC 40 80 00 38 */ bge lbl_802288F4 -/* 802288C0 2C 03 00 24 */ cmpwi r3, 0x24 -/* 802288C4 41 82 00 28 */ beq lbl_802288EC -/* 802288C8 48 00 00 2C */ b lbl_802288F4 -lbl_802288CC: -/* 802288CC 3C 80 00 01 */ lis r4, 0x0001 /* 0x000081F4@ha */ -/* 802288D0 38 04 81 F4 */ addi r0, r4, 0x81F4 /* 0x000081F4@l */ -/* 802288D4 7C 03 00 00 */ cmpw r3, r0 -/* 802288D8 40 80 00 1C */ bge lbl_802288F4 -/* 802288DC 38 04 81 F2 */ addi r0, r4, -32270 -/* 802288E0 7C 03 00 00 */ cmpw r3, r0 -/* 802288E4 40 80 00 08 */ bge lbl_802288EC -/* 802288E8 48 00 00 0C */ b lbl_802288F4 -lbl_802288EC: -/* 802288EC 38 60 00 01 */ li r3, 1 -/* 802288F0 4E 80 00 20 */ blr -lbl_802288F4: -/* 802288F4 38 60 00 00 */ li r3, 0 -/* 802288F8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isPlaceName__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isPlaceName__19jmessage_tReferenceFv.s deleted file mode 100644 index eae69befda..0000000000 --- a/asm/d/msg/d_msg_class/isPlaceName__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228EA0: -/* 80228EA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228EA4 7C 08 02 A6 */ mflr r0 -/* 80228EA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228EAC 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228EB0 28 03 00 00 */ cmplwi r3, 0 -/* 80228EB4 40 82 00 0C */ bne lbl_80228EC0 -/* 80228EB8 38 60 00 00 */ li r3, 0 -/* 80228EBC 48 00 00 08 */ b lbl_80228EC4 -lbl_80228EC0: -/* 80228EC0 48 00 E3 25 */ bl isPlaceMessage__12dMsgObject_cFv -lbl_80228EC4: -/* 80228EC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228EC8 7C 08 03 A6 */ mtlr r0 -/* 80228ECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228ED0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isSaveSeq__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isSaveSeq__19jmessage_tReferenceFv.s deleted file mode 100644 index f29e01f5bb..0000000000 --- a/asm/d/msg/d_msg_class/isSaveSeq__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228F08: -/* 80228F08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228F0C 7C 08 02 A6 */ mflr r0 -/* 80228F10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228F14 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228F18 28 03 00 00 */ cmplwi r3, 0 -/* 80228F1C 40 82 00 0C */ bne lbl_80228F28 -/* 80228F20 38 60 00 00 */ li r3, 0 -/* 80228F24 48 00 00 08 */ b lbl_80228F2C -lbl_80228F28: -/* 80228F28 48 00 E3 01 */ bl isSaveMessage__12dMsgObject_cFv -lbl_80228F2C: -/* 80228F2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228F30 7C 08 03 A6 */ mtlr r0 -/* 80228F34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228F38 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/isStaffRoll__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/isStaffRoll__19jmessage_tReferenceFv.s deleted file mode 100644 index e389803afd..0000000000 --- a/asm/d/msg/d_msg_class/isStaffRoll__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80228F70: -/* 80228F70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80228F74 7C 08 02 A6 */ mflr r0 -/* 80228F78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80228F7C 80 63 05 C0 */ lwz r3, 0x5c0(r3) -/* 80228F80 28 03 00 00 */ cmplwi r3, 0 -/* 80228F84 40 82 00 0C */ bne lbl_80228F90 -/* 80228F88 38 60 00 00 */ li r3, 0 -/* 80228F8C 48 00 00 08 */ b lbl_80228F94 -lbl_80228F90: -/* 80228F90 48 00 E2 85 */ bl isStaffMessage__12dMsgObject_cFv -lbl_80228F94: -/* 80228F94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80228F98 7C 08 03 A6 */ mtlr r0 -/* 80228F9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80228FA0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/resetCharCountBuffer__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/resetCharCountBuffer__19jmessage_tReferenceFv.s deleted file mode 100644 index 2152eadb59..0000000000 --- a/asm/d/msg/d_msg_class/resetCharCountBuffer__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80229810: -/* 80229810 38 A0 00 00 */ li r5, 0 -/* 80229814 38 80 00 00 */ li r4, 0 -/* 80229818 38 00 00 1F */ li r0, 0x1f -/* 8022981C 7C 09 03 A6 */ mtctr r0 -lbl_80229820: -/* 80229820 38 05 12 53 */ addi r0, r5, 0x1253 -/* 80229824 7C 83 01 AE */ stbx r4, r3, r0 -/* 80229828 38 A5 00 01 */ addi r5, r5, 1 -/* 8022982C 42 00 FF F4 */ bdnz lbl_80229820 -/* 80229830 38 00 00 00 */ li r0, 0 -/* 80229834 98 03 12 72 */ stb r0, 0x1272(r3) -/* 80229838 98 03 12 73 */ stb r0, 0x1273(r3) -/* 8022983C 98 03 05 DC */ stb r0, 0x5dc(r3) -/* 80229840 98 03 05 DD */ stb r0, 0x5dd(r3) -/* 80229844 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/resetCharactor__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/resetCharactor__19jmessage_tReferenceFv.s deleted file mode 100644 index bee3f7bc80..0000000000 --- a/asm/d/msg/d_msg_class/resetCharactor__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802297B0: -/* 802297B0 38 80 00 00 */ li r4, 0 -/* 802297B4 7C 85 23 78 */ mr r5, r4 -/* 802297B8 38 00 02 00 */ li r0, 0x200 -/* 802297BC 7C 09 03 A6 */ mtctr r0 -lbl_802297C0: -/* 802297C0 38 04 00 0C */ addi r0, r4, 0xc -/* 802297C4 7C A3 03 2E */ sthx r5, r3, r0 -/* 802297C8 38 84 00 02 */ addi r4, r4, 2 -/* 802297CC 42 00 FF F4 */ bdnz lbl_802297C0 -/* 802297D0 38 00 00 00 */ li r0, 0 -/* 802297D4 B0 03 04 0C */ sth r0, 0x40c(r3) -/* 802297D8 B0 03 04 0E */ sth r0, 0x40e(r3) -/* 802297DC B0 03 04 10 */ sth r0, 0x410(r3) -/* 802297E0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/resetReference__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/resetReference__19jmessage_tReferenceFv.s deleted file mode 100644 index 2734e0ac32..0000000000 --- a/asm/d/msg/d_msg_class/resetReference__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8022900C: -/* 8022900C 38 00 00 00 */ li r0, 0 -/* 80229010 B0 03 05 D6 */ sth r0, 0x5d6(r3) -/* 80229014 98 03 12 4C */ stb r0, 0x124c(r3) -/* 80229018 B0 03 05 CC */ sth r0, 0x5cc(r3) -/* 8022901C B0 03 05 CE */ sth r0, 0x5ce(r3) -/* 80229020 B0 03 05 D0 */ sth r0, 0x5d0(r3) -/* 80229024 B0 03 05 D2 */ sth r0, 0x5d2(r3) -/* 80229028 98 03 12 42 */ stb r0, 0x1242(r3) -/* 8022902C 98 03 12 43 */ stb r0, 0x1243(r3) -/* 80229030 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/resetWord__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/resetWord__19jmessage_tReferenceFv.s deleted file mode 100644 index 3e251fba2c..0000000000 --- a/asm/d/msg/d_msg_class/resetWord__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80229744: -/* 80229744 38 80 00 00 */ li r4, 0 -/* 80229748 7C 85 23 78 */ mr r5, r4 -/* 8022974C 38 00 00 0A */ li r0, 0xa -/* 80229750 7C 09 03 A6 */ mtctr r0 -lbl_80229754: -/* 80229754 38 04 06 34 */ addi r0, r4, 0x634 -/* 80229758 7C A3 01 AE */ stbx r5, r3, r0 -/* 8022975C 38 84 00 64 */ addi r4, r4, 0x64 -/* 80229760 42 00 FF F4 */ bdnz lbl_80229754 -/* 80229764 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/setCharactor__19jmessage_tReferenceFUs.s b/asm/d/msg/d_msg_class/setCharactor__19jmessage_tReferenceFUs.s deleted file mode 100644 index d71b174269..0000000000 --- a/asm/d/msg/d_msg_class/setCharactor__19jmessage_tReferenceFUs.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80229768: -/* 80229768 A8 03 04 0C */ lha r0, 0x40c(r3) -/* 8022976C 54 00 08 3C */ slwi r0, r0, 1 -/* 80229770 7C A3 02 14 */ add r5, r3, r0 -/* 80229774 B0 85 00 0C */ sth r4, 0xc(r5) -/* 80229778 A8 83 04 0C */ lha r4, 0x40c(r3) -/* 8022977C 38 04 00 01 */ addi r0, r4, 1 -/* 80229780 B0 03 04 0C */ sth r0, 0x40c(r3) -/* 80229784 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class/shiftCharCountBuffer__19jmessage_tReferenceFv.s b/asm/d/msg/d_msg_class/shiftCharCountBuffer__19jmessage_tReferenceFv.s deleted file mode 100644 index 7c5293dad5..0000000000 --- a/asm/d/msg/d_msg_class/shiftCharCountBuffer__19jmessage_tReferenceFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802297E4: -/* 802297E4 38 A0 00 1E */ li r5, 0x1e -/* 802297E8 38 00 00 1E */ li r0, 0x1e -/* 802297EC 7C 09 03 A6 */ mtctr r0 -lbl_802297F0: -/* 802297F0 7C 83 2A 14 */ add r4, r3, r5 -/* 802297F4 88 04 12 52 */ lbz r0, 0x1252(r4) -/* 802297F8 98 04 12 53 */ stb r0, 0x1253(r4) -/* 802297FC 38 A5 FF FF */ addi r5, r5, -1 -/* 80229800 42 00 FF F0 */ bdnz lbl_802297F0 -/* 80229804 88 03 05 DC */ lbz r0, 0x5dc(r3) -/* 80229808 98 03 12 53 */ stb r0, 0x1253(r3) -/* 8022980C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/getPortalName__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getPortalName__12dMsgObject_cFv.s deleted file mode 100644 index cff86c3e75..0000000000 --- a/asm/d/msg/d_msg_object/getPortalName__12dMsgObject_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80237334: -/* 80237334 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80237338 7C 08 02 A6 */ mflr r0 -/* 8023733C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237340 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80237344 93 C1 00 08 */ stw r30, 8(r1) -/* 80237348 80 83 01 28 */ lwz r4, 0x128(r3) -/* 8023734C 3B E4 00 20 */ addi r31, r4, 0x20 -/* 80237350 80 04 00 24 */ lwz r0, 0x24(r4) -/* 80237354 7F DF 02 14 */ add r30, r31, r0 -/* 80237358 A0 83 01 80 */ lhz r4, 0x180(r3) -/* 8023735C 4B FF CC 29 */ bl getMessageIndex__12dMsgObject_cFUl -/* 80237360 1C 03 00 14 */ mulli r0, r3, 0x14 -/* 80237364 7C 7F 02 14 */ add r3, r31, r0 -/* 80237368 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8023736C 38 63 00 08 */ addi r3, r3, 8 -/* 80237370 7C 7E 1A 14 */ add r3, r30, r3 -/* 80237374 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80237378 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023737C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80237380 7C 08 03 A6 */ mtlr r0 -/* 80237384 38 21 00 10 */ addi r1, r1, 0x10 -/* 80237388 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s b/asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s deleted file mode 100644 index f432b85d6d..0000000000 --- a/asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80238C94: -/* 80238C94 3C 80 80 3C */ lis r4, __vt__10dMsgUnit_c@ha /* 0x803C0BF0@ha */ -/* 80238C98 38 04 0B F0 */ addi r0, r4, __vt__10dMsgUnit_c@l /* 0x803C0BF0@l */ -/* 80238C9C 90 03 00 00 */ stw r0, 0(r3) -/* 80238CA0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s b/asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s deleted file mode 100644 index 8f44ac267d..0000000000 --- a/asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80238CA4: -/* 80238CA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80238CA8 7C 08 02 A6 */ mflr r0 -/* 80238CAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238CB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80238CB4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80238CB8 41 82 00 1C */ beq lbl_80238CD4 -/* 80238CBC 3C A0 80 3C */ lis r5, __vt__10dMsgUnit_c@ha /* 0x803C0BF0@ha */ -/* 80238CC0 38 05 0B F0 */ addi r0, r5, __vt__10dMsgUnit_c@l /* 0x803C0BF0@l */ -/* 80238CC4 90 1F 00 00 */ stw r0, 0(r31) -/* 80238CC8 7C 80 07 35 */ extsh. r0, r4 -/* 80238CCC 40 81 00 08 */ ble lbl_80238CD4 -/* 80238CD0 48 09 60 6D */ bl __dl__FPv -lbl_80238CD4: -/* 80238CD4 7F E3 FB 78 */ mr r3, r31 -/* 80238CD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80238CDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80238CE0 7C 08 03 A6 */ mtlr r0 -/* 80238CE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80238CE8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s b/asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s deleted file mode 100644 index 95c116e44e..0000000000 --- a/asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8023907C: -/* 8023907C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80239080 7C 08 02 A6 */ mflr r0 -/* 80239084 90 01 00 14 */ stw r0, 0x14(r1) -/* 80239088 38 6D 8B 50 */ la r3, g_msg_unit(r13) /* 804510D0-_SDA_BASE_ */ -/* 8023908C 4B FF FC 09 */ bl __ct__10dMsgUnit_cFv -/* 80239090 3C 80 80 24 */ lis r4, __dt__10dMsgUnit_cFv@ha /* 0x80238CA4@ha */ -/* 80239094 38 84 8C A4 */ addi r4, r4, __dt__10dMsgUnit_cFv@l /* 0x80238CA4@l */ -/* 80239098 3C A0 80 43 */ lis r5, lit_3640@ha /* 0x804306B8@ha */ -/* 8023909C 38 A5 06 B8 */ addi r5, r5, lit_3640@l /* 0x804306B8@l */ -/* 802390A0 48 12 8B 85 */ bl __register_global_object -/* 802390A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802390A8 7C 08 03 A6 */ mtlr r0 -/* 802390AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802390B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s deleted file mode 100644 index 980f35e70f..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_808589A4: -/* 808589A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808589A8 7C 08 02 A6 */ mflr r0 -/* 808589AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 808589B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808589B4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 808589B8 41 82 00 10 */ beq lbl_808589C8 -/* 808589BC 7C 80 07 35 */ extsh. r0, r4 -/* 808589C0 40 81 00 08 */ ble lbl_808589C8 -/* 808589C4 4B A7 63 79 */ bl __dl__FPv -lbl_808589C8: -/* 808589C8 7F E3 FB 78 */ mr r3, r31 -/* 808589CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808589D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808589D4 7C 08 03 A6 */ mtlr r0 -/* 808589D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808589DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dKy_event_proc__Fv.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dKy_event_proc__Fv.s deleted file mode 100644 index 7eb2bc278a..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dKy_event_proc__Fv.s +++ /dev/null @@ -1,348 +0,0 @@ -lbl_80857A50: -/* 80857A50 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80857A54 7C 08 02 A6 */ mflr r0 -/* 80857A58 90 01 00 34 */ stw r0, 0x34(r1) -/* 80857A5C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80857A60 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80857A64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80857A68 4B B0 A7 71 */ bl _savegpr_28 -/* 80857A6C 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 80857A70 3B A3 9E 78 */ addi r29, r3, lit_3740@l /* 0x80859E78@l */ -/* 80857A74 3C 60 80 86 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80859FA0@ha */ -/* 80857A78 3B E3 9F A0 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80859FA0@l */ -/* 80857A7C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80857A80 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857A84 88 1E 12 D8 */ lbz r0, 0x12d8(r30) -/* 80857A88 28 00 00 00 */ cmplwi r0, 0 -/* 80857A8C 40 82 04 7C */ bne lbl_80857F08 -/* 80857A90 88 1E 12 D2 */ lbz r0, 0x12d2(r30) -/* 80857A94 28 00 00 00 */ cmplwi r0, 0 -/* 80857A98 40 82 04 70 */ bne lbl_80857F08 -/* 80857A9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80857AA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80857AA4 C3 E3 00 34 */ lfs f31, 0x34(r3) -/* 80857AA8 88 1E 12 CA */ lbz r0, 0x12ca(r30) -/* 80857AAC 2C 00 00 02 */ cmpwi r0, 2 -/* 80857AB0 41 82 01 70 */ beq lbl_80857C20 -/* 80857AB4 40 80 00 14 */ bge lbl_80857AC8 -/* 80857AB8 2C 00 00 00 */ cmpwi r0, 0 -/* 80857ABC 41 82 00 18 */ beq lbl_80857AD4 -/* 80857AC0 40 80 00 3C */ bge lbl_80857AFC -/* 80857AC4 48 00 02 A4 */ b lbl_80857D68 -lbl_80857AC8: -/* 80857AC8 2C 00 00 04 */ cmpwi r0, 4 -/* 80857ACC 40 80 02 9C */ bge lbl_80857D68 -/* 80857AD0 48 00 02 50 */ b lbl_80857D20 -lbl_80857AD4: -/* 80857AD4 C0 1E 11 D4 */ lfs f0, 0x11d4(r30) -/* 80857AD8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80857ADC 40 81 02 8C */ ble lbl_80857D68 -/* 80857AE0 EC 3F 00 28 */ fsubs f1, f31, f0 -/* 80857AE4 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80857AE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80857AEC 40 80 02 7C */ bge lbl_80857D68 -/* 80857AF0 38 00 00 01 */ li r0, 1 -/* 80857AF4 98 1E 12 CA */ stb r0, 0x12ca(r30) -/* 80857AF8 48 00 02 70 */ b lbl_80857D68 -lbl_80857AFC: -/* 80857AFC C0 3D 00 08 */ lfs f1, 8(r29) -/* 80857B00 4B A0 FE 55 */ bl cM_rndF__Ff -/* 80857B04 FC 00 08 1E */ fctiwz f0, f1 -/* 80857B08 D8 01 00 08 */ stfd f0, 8(r1) -/* 80857B0C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80857B10 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80857B14 28 00 00 08 */ cmplwi r0, 8 -/* 80857B18 41 80 00 10 */ blt lbl_80857B28 -/* 80857B1C 38 00 00 03 */ li r0, 3 -/* 80857B20 98 1E 12 CA */ stb r0, 0x12ca(r30) -/* 80857B24 48 00 02 44 */ b lbl_80857D68 -lbl_80857B28: -/* 80857B28 38 7F 00 40 */ addi r3, r31, 0x40 -/* 80857B2C 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857B30 98 7E 12 CB */ stb r3, 0x12cb(r30) -/* 80857B34 38 00 00 00 */ li r0, 0 -/* 80857B38 90 1E 12 98 */ stw r0, 0x1298(r30) -/* 80857B3C 2C 03 00 02 */ cmpwi r3, 2 -/* 80857B40 41 82 00 68 */ beq lbl_80857BA8 -/* 80857B44 40 80 00 14 */ bge lbl_80857B58 -/* 80857B48 2C 03 00 00 */ cmpwi r3, 0 -/* 80857B4C 41 82 00 1C */ beq lbl_80857B68 -/* 80857B50 40 80 00 38 */ bge lbl_80857B88 -/* 80857B54 48 00 00 B0 */ b lbl_80857C04 -lbl_80857B58: -/* 80857B58 2C 03 00 04 */ cmpwi r3, 4 -/* 80857B5C 41 82 00 8C */ beq lbl_80857BE8 -/* 80857B60 40 80 00 A4 */ bge lbl_80857C04 -/* 80857B64 48 00 00 64 */ b lbl_80857BC8 -lbl_80857B68: -/* 80857B68 38 7F 00 48 */ addi r3, r31, 0x48 -/* 80857B6C 88 63 00 00 */ lbz r3, 0(r3) -/* 80857B70 54 00 10 3A */ slwi r0, r0, 2 -/* 80857B74 38 9F 00 4C */ addi r4, r31, 0x4c -/* 80857B78 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857B7C FC 40 F8 90 */ fmr f2, f31 -/* 80857B80 4B FF FC ED */ bl dice_wether_init__FUcff -/* 80857B84 48 00 00 80 */ b lbl_80857C04 -lbl_80857B88: -/* 80857B88 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80857B8C 88 63 00 00 */ lbz r3, 0(r3) -/* 80857B90 54 00 10 3A */ slwi r0, r0, 2 -/* 80857B94 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80857B98 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857B9C FC 40 F8 90 */ fmr f2, f31 -/* 80857BA0 4B FF FC CD */ bl dice_wether_init__FUcff -/* 80857BA4 48 00 00 60 */ b lbl_80857C04 -lbl_80857BA8: -/* 80857BA8 38 7F 00 68 */ addi r3, r31, 0x68 -/* 80857BAC 88 63 00 00 */ lbz r3, 0(r3) -/* 80857BB0 54 00 10 3A */ slwi r0, r0, 2 -/* 80857BB4 38 9F 00 6C */ addi r4, r31, 0x6c -/* 80857BB8 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857BBC FC 40 F8 90 */ fmr f2, f31 -/* 80857BC0 4B FF FC AD */ bl dice_wether_init__FUcff -/* 80857BC4 48 00 00 40 */ b lbl_80857C04 -lbl_80857BC8: -/* 80857BC8 38 7F 00 78 */ addi r3, r31, 0x78 -/* 80857BCC 88 63 00 00 */ lbz r3, 0(r3) -/* 80857BD0 54 00 10 3A */ slwi r0, r0, 2 -/* 80857BD4 38 9F 00 7C */ addi r4, r31, 0x7c -/* 80857BD8 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857BDC FC 40 F8 90 */ fmr f2, f31 -/* 80857BE0 4B FF FC 8D */ bl dice_wether_init__FUcff -/* 80857BE4 48 00 00 20 */ b lbl_80857C04 -lbl_80857BE8: -/* 80857BE8 38 7F 00 80 */ addi r3, r31, 0x80 -/* 80857BEC 88 63 00 00 */ lbz r3, 0(r3) -/* 80857BF0 54 00 10 3A */ slwi r0, r0, 2 -/* 80857BF4 38 9F 00 84 */ addi r4, r31, 0x84 -/* 80857BF8 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857BFC FC 40 F8 90 */ fmr f2, f31 -/* 80857C00 4B FF FC 6D */ bl dice_wether_init__FUcff -lbl_80857C04: -/* 80857C04 80 7E 12 98 */ lwz r3, 0x1298(r30) -/* 80857C08 38 03 00 01 */ addi r0, r3, 1 -/* 80857C0C 90 1E 12 98 */ stw r0, 0x1298(r30) -/* 80857C10 88 7E 12 CA */ lbz r3, 0x12ca(r30) -/* 80857C14 38 03 00 01 */ addi r0, r3, 1 -/* 80857C18 98 1E 12 CA */ stb r0, 0x12ca(r30) -/* 80857C1C 48 00 01 4C */ b lbl_80857D68 -lbl_80857C20: -/* 80857C20 C0 1E 11 D8 */ lfs f0, 0x11d8(r30) -/* 80857C24 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80857C28 40 81 01 40 */ ble lbl_80857D68 -/* 80857C2C EC 3F 00 28 */ fsubs f1, f31, f0 -/* 80857C30 C0 1D 00 0C */ lfs f0, 0xc(r29) -/* 80857C34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80857C38 40 80 01 30 */ bge lbl_80857D68 -/* 80857C3C 88 1E 12 CB */ lbz r0, 0x12cb(r30) -/* 80857C40 2C 00 00 02 */ cmpwi r0, 2 -/* 80857C44 41 82 00 70 */ beq lbl_80857CB4 -/* 80857C48 40 80 00 14 */ bge lbl_80857C5C -/* 80857C4C 2C 00 00 00 */ cmpwi r0, 0 -/* 80857C50 41 82 00 1C */ beq lbl_80857C6C -/* 80857C54 40 80 00 3C */ bge lbl_80857C90 -/* 80857C58 48 00 01 10 */ b lbl_80857D68 -lbl_80857C5C: -/* 80857C5C 2C 00 00 04 */ cmpwi r0, 4 -/* 80857C60 41 82 00 9C */ beq lbl_80857CFC -/* 80857C64 40 80 01 04 */ bge lbl_80857D68 -/* 80857C68 48 00 00 70 */ b lbl_80857CD8 -lbl_80857C6C: -/* 80857C6C 80 1E 12 98 */ lwz r0, 0x1298(r30) -/* 80857C70 38 7F 00 48 */ addi r3, r31, 0x48 -/* 80857C74 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857C78 54 00 10 3A */ slwi r0, r0, 2 -/* 80857C7C 38 9F 00 4C */ addi r4, r31, 0x4c -/* 80857C80 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857C84 FC 40 F8 90 */ fmr f2, f31 -/* 80857C88 4B FF FC 91 */ bl dice_wether_execute__FUcff -/* 80857C8C 48 00 00 DC */ b lbl_80857D68 -lbl_80857C90: -/* 80857C90 80 1E 12 98 */ lwz r0, 0x1298(r30) -/* 80857C94 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80857C98 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857C9C 54 00 10 3A */ slwi r0, r0, 2 -/* 80857CA0 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80857CA4 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857CA8 FC 40 F8 90 */ fmr f2, f31 -/* 80857CAC 4B FF FC 6D */ bl dice_wether_execute__FUcff -/* 80857CB0 48 00 00 B8 */ b lbl_80857D68 -lbl_80857CB4: -/* 80857CB4 80 1E 12 98 */ lwz r0, 0x1298(r30) -/* 80857CB8 38 7F 00 68 */ addi r3, r31, 0x68 -/* 80857CBC 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857CC0 54 00 10 3A */ slwi r0, r0, 2 -/* 80857CC4 38 9F 00 6C */ addi r4, r31, 0x6c -/* 80857CC8 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857CCC FC 40 F8 90 */ fmr f2, f31 -/* 80857CD0 4B FF FC 49 */ bl dice_wether_execute__FUcff -/* 80857CD4 48 00 00 94 */ b lbl_80857D68 -lbl_80857CD8: -/* 80857CD8 80 1E 12 98 */ lwz r0, 0x1298(r30) -/* 80857CDC 38 7F 00 78 */ addi r3, r31, 0x78 -/* 80857CE0 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857CE4 54 00 10 3A */ slwi r0, r0, 2 -/* 80857CE8 38 9F 00 7C */ addi r4, r31, 0x7c -/* 80857CEC 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857CF0 FC 40 F8 90 */ fmr f2, f31 -/* 80857CF4 4B FF FC 25 */ bl dice_wether_execute__FUcff -/* 80857CF8 48 00 00 70 */ b lbl_80857D68 -lbl_80857CFC: -/* 80857CFC 80 1E 12 98 */ lwz r0, 0x1298(r30) -/* 80857D00 38 7F 00 80 */ addi r3, r31, 0x80 -/* 80857D04 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80857D08 54 00 10 3A */ slwi r0, r0, 2 -/* 80857D0C 38 9F 00 84 */ addi r4, r31, 0x84 -/* 80857D10 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80857D14 FC 40 F8 90 */ fmr f2, f31 -/* 80857D18 4B FF FC 01 */ bl dice_wether_execute__FUcff -/* 80857D1C 48 00 00 4C */ b lbl_80857D68 -lbl_80857D20: -/* 80857D20 C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 80857D24 4B A0 FC 31 */ bl cM_rndF__Ff -/* 80857D28 FC 00 08 1E */ fctiwz f0, f1 -/* 80857D2C D8 01 00 08 */ stfd f0, 8(r1) -/* 80857D30 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80857D34 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 80857D38 38 7F 00 20 */ addi r3, r31, 0x20 -/* 80857D3C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80857D40 EC 3F 00 2A */ fadds f1, f31, f0 -/* 80857D44 D0 3E 11 D4 */ stfs f1, 0x11d4(r30) -/* 80857D48 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80857D4C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80857D50 4C 41 13 82 */ cror 2, 1, 2 -/* 80857D54 40 82 00 0C */ bne lbl_80857D60 -/* 80857D58 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80857D5C D0 1E 11 D4 */ stfs f0, 0x11d4(r30) -lbl_80857D60: -/* 80857D60 38 00 00 00 */ li r0, 0 -/* 80857D64 98 1E 12 CA */ stb r0, 0x12ca(r30) -lbl_80857D68: -/* 80857D68 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80857D6C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857D70 88 03 13 0B */ lbz r0, 0x130b(r3) -/* 80857D74 28 00 00 01 */ cmplwi r0, 1 -/* 80857D78 40 82 00 0C */ bne lbl_80857D84 -/* 80857D7C 38 00 00 06 */ li r0, 6 -/* 80857D80 98 1E 12 C9 */ stb r0, 0x12c9(r30) -lbl_80857D84: -/* 80857D84 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80857D88 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857D8C 88 1F 12 CD */ lbz r0, 0x12cd(r31) -/* 80857D90 28 00 00 00 */ cmplwi r0, 0 -/* 80857D94 40 82 01 34 */ bne lbl_80857EC8 -/* 80857D98 88 1F 12 CE */ lbz r0, 0x12ce(r31) -/* 80857D9C 28 00 00 00 */ cmplwi r0, 0 -/* 80857DA0 40 82 01 28 */ bne lbl_80857EC8 -/* 80857DA4 88 1E 12 C9 */ lbz r0, 0x12c9(r30) -/* 80857DA8 28 00 00 06 */ cmplwi r0, 6 -/* 80857DAC 41 81 00 FC */ bgt lbl_80857EA8 -/* 80857DB0 3C 60 80 86 */ lis r3, lit_3883@ha /* 0x8085A030@ha */ -/* 80857DB4 38 63 A0 30 */ addi r3, r3, lit_3883@l /* 0x8085A030@l */ -/* 80857DB8 54 00 10 3A */ slwi r0, r0, 2 -/* 80857DBC 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80857DC0 7C 09 03 A6 */ mtctr r0 -/* 80857DC4 4E 80 04 20 */ bctr -lbl_80857DC8: -/* 80857DC8 3B 80 00 00 */ li r28, 0 -/* 80857DCC 80 1F 0E D8 */ lwz r0, 0xed8(r31) -/* 80857DD0 2C 00 00 01 */ cmpwi r0, 1 -/* 80857DD4 40 82 00 0C */ bne lbl_80857DE0 -/* 80857DD8 38 00 00 00 */ li r0, 0 -/* 80857DDC 90 1F 0E D8 */ stw r0, 0xed8(r31) -lbl_80857DE0: -/* 80857DE0 4B FF FC 0D */ bl dice_rain_minus__Fv -/* 80857DE4 48 00 00 C4 */ b lbl_80857EA8 -lbl_80857DE8: -/* 80857DE8 38 00 00 00 */ li r0, 0 -/* 80857DEC 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80857DF0 3B 80 00 01 */ li r28, 1 -/* 80857DF4 4B FF FB F9 */ bl dice_rain_minus__Fv -/* 80857DF8 48 00 00 B0 */ b lbl_80857EA8 -lbl_80857DFC: -/* 80857DFC 3B 80 00 01 */ li r28, 1 -/* 80857E00 80 7E 0E 80 */ lwz r3, 0xe80(r30) -/* 80857E04 2C 03 00 28 */ cmpwi r3, 0x28 -/* 80857E08 40 80 00 14 */ bge lbl_80857E1C -/* 80857E0C 38 63 00 01 */ addi r3, r3, 1 -/* 80857E10 90 7E 0E 80 */ stw r3, 0xe80(r30) -/* 80857E14 4B 80 38 39 */ bl dKyw_rain_set__Fi -/* 80857E18 48 00 00 90 */ b lbl_80857EA8 -lbl_80857E1C: -/* 80857E1C 38 63 FF FF */ addi r3, r3, -1 -/* 80857E20 90 7E 0E 80 */ stw r3, 0xe80(r30) -/* 80857E24 4B 80 38 29 */ bl dKyw_rain_set__Fi -/* 80857E28 48 00 00 80 */ b lbl_80857EA8 -lbl_80857E2C: -/* 80857E2C 38 00 00 01 */ li r0, 1 -/* 80857E30 90 1F 0E D8 */ stw r0, 0xed8(r31) -lbl_80857E34: -/* 80857E34 3B 80 00 02 */ li r28, 2 -/* 80857E38 80 7E 0E 80 */ lwz r3, 0xe80(r30) -/* 80857E3C 2C 03 00 FA */ cmpwi r3, 0xfa -/* 80857E40 40 80 00 68 */ bge lbl_80857EA8 -/* 80857E44 38 63 00 01 */ addi r3, r3, 1 -/* 80857E48 90 7E 0E 80 */ stw r3, 0xe80(r30) -/* 80857E4C 4B 80 38 01 */ bl dKyw_rain_set__Fi -/* 80857E50 48 00 00 58 */ b lbl_80857EA8 -lbl_80857E54: -/* 80857E54 3B 80 00 01 */ li r28, 1 -/* 80857E58 38 00 00 01 */ li r0, 1 -/* 80857E5C 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80857E60 4B FF FB 8D */ bl dice_rain_minus__Fv -/* 80857E64 48 00 00 44 */ b lbl_80857EA8 -lbl_80857E68: -/* 80857E68 3B 80 00 00 */ li r28, 0 -/* 80857E6C 80 1F 0E D8 */ lwz r0, 0xed8(r31) -/* 80857E70 2C 00 00 01 */ cmpwi r0, 1 -/* 80857E74 40 82 00 0C */ bne lbl_80857E80 -/* 80857E78 38 00 00 00 */ li r0, 0 -/* 80857E7C 90 1F 0E D8 */ stw r0, 0xed8(r31) -lbl_80857E80: -/* 80857E80 80 7E 0E 80 */ lwz r3, 0xe80(r30) -/* 80857E84 2C 03 00 02 */ cmpwi r3, 2 -/* 80857E88 40 81 00 10 */ ble lbl_80857E98 -/* 80857E8C 38 03 FF FE */ addi r0, r3, -2 -/* 80857E90 90 1E 0E 80 */ stw r0, 0xe80(r30) -/* 80857E94 48 00 00 0C */ b lbl_80857EA0 -lbl_80857E98: -/* 80857E98 38 00 00 00 */ li r0, 0 -/* 80857E9C 90 1E 0E 80 */ stw r0, 0xe80(r30) -lbl_80857EA0: -/* 80857EA0 80 7E 0E 80 */ lwz r3, 0xe80(r30) -/* 80857EA4 4B 80 37 A9 */ bl dKyw_rain_set__Fi -lbl_80857EA8: -/* 80857EA8 88 7E 12 C8 */ lbz r3, 0x12c8(r30) -/* 80857EAC 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80857EB0 7C 03 00 40 */ cmplw r3, r0 -/* 80857EB4 41 82 00 14 */ beq lbl_80857EC8 -/* 80857EB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80857EBC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857EC0 9B 83 12 C8 */ stb r28, 0x12c8(r3) -/* 80857EC4 9B 83 12 C5 */ stb r28, 0x12c5(r3) -lbl_80857EC8: -/* 80857EC8 88 1F 12 CD */ lbz r0, 0x12cd(r31) -/* 80857ECC 28 00 00 00 */ cmplwi r0, 0 -/* 80857ED0 40 82 00 38 */ bne lbl_80857F08 -/* 80857ED4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80857ED8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857EDC 88 03 12 CE */ lbz r0, 0x12ce(r3) -/* 80857EE0 28 00 00 00 */ cmplwi r0, 0 -/* 80857EE4 40 82 00 24 */ bne lbl_80857F08 -/* 80857EE8 88 83 12 C5 */ lbz r4, 0x12c5(r3) -/* 80857EEC 28 04 00 FF */ cmplwi r4, 0xff -/* 80857EF0 41 82 00 18 */ beq lbl_80857F08 -/* 80857EF4 88 03 12 C3 */ lbz r0, 0x12c3(r3) -/* 80857EF8 7C 00 20 40 */ cmplw r0, r4 -/* 80857EFC 41 82 00 0C */ beq lbl_80857F08 -/* 80857F00 C0 1D 00 14 */ lfs f0, 0x14(r29) -/* 80857F04 D0 03 11 E0 */ stfs f0, 0x11e0(r3) -lbl_80857F08: -/* 80857F08 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80857F0C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80857F10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80857F14 4B B0 A3 11 */ bl _restgpr_28 -/* 80857F18 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80857F1C 7C 08 03 A6 */ mtlr r0 -/* 80857F20 38 21 00 30 */ addi r1, r1, 0x30 -/* 80857F24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Create__FP10fopAc_ac_c.s deleted file mode 100644 index ff7e4a0812..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,138 +0,0 @@ -lbl_80859C88: -/* 80859C88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80859C8C 7C 08 02 A6 */ mflr r0 -/* 80859C90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80859C94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80859C98 7C 7F 1B 78 */ mr r31, r3 -/* 80859C9C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80859CA0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80859CA4 40 82 00 1C */ bne lbl_80859CC0 -/* 80859CA8 28 1F 00 00 */ cmplwi r31, 0 -/* 80859CAC 41 82 00 08 */ beq lbl_80859CB4 -/* 80859CB0 4B 7B EE B5 */ bl __ct__10fopAc_ac_cFv -lbl_80859CB4: -/* 80859CB4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80859CB8 60 00 00 08 */ ori r0, r0, 8 -/* 80859CBC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80859CC0: -/* 80859CC0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80859CC4 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f -/* 80859CC8 98 1F 05 93 */ stb r0, 0x593(r31) -/* 80859CCC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80859CD0 54 00 27 3E */ srwi r0, r0, 0x1c -/* 80859CD4 98 1F 05 97 */ stb r0, 0x597(r31) -/* 80859CD8 3C 60 80 86 */ lis r3, lit_3881@ha /* 0x80859E8C@ha */ -/* 80859CDC C0 03 9E 8C */ lfs f0, lit_3881@l(r3) /* 0x80859E8C@l */ -/* 80859CE0 D0 1F 05 6C */ stfs f0, 0x56c(r31) -/* 80859CE4 D0 1F 05 70 */ stfs f0, 0x570(r31) -/* 80859CE8 88 1F 05 93 */ lbz r0, 0x593(r31) -/* 80859CEC 28 00 00 0B */ cmplwi r0, 0xb -/* 80859CF0 41 81 00 F0 */ bgt lbl_80859DE0 -/* 80859CF4 3C 60 80 86 */ lis r3, lit_4772@ha /* 0x8085A0A4@ha */ -/* 80859CF8 38 63 A0 A4 */ addi r3, r3, lit_4772@l /* 0x8085A0A4@l */ -/* 80859CFC 54 00 10 3A */ slwi r0, r0, 2 -/* 80859D00 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80859D04 7C 09 03 A6 */ mtctr r0 -/* 80859D08 4E 80 04 20 */ bctr -lbl_80859D0C: -/* 80859D0C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80859D10 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80859D14 98 1F 05 94 */ stb r0, 0x594(r31) -/* 80859D18 7F E3 FB 78 */ mr r3, r31 -/* 80859D1C 4B FF E2 2D */ bl set_path_info__FP10fopAc_ac_c -/* 80859D20 90 7F 05 68 */ stw r3, 0x568(r31) -/* 80859D24 48 00 01 2C */ b lbl_80859E50 -lbl_80859D28: -/* 80859D28 7F E3 FB 78 */ mr r3, r31 -/* 80859D2C 4B FF FD E9 */ bl daKytag06_type02_init__FP10fopAc_ac_c -/* 80859D30 48 00 01 20 */ b lbl_80859E50 -lbl_80859D34: -/* 80859D34 7F E3 FB 78 */ mr r3, r31 -/* 80859D38 4B FF FD FD */ bl daKytag06_type03_init__FP10fopAc_ac_c -/* 80859D3C 48 00 01 14 */ b lbl_80859E50 -lbl_80859D40: -/* 80859D40 7F E3 FB 78 */ mr r3, r31 -/* 80859D44 4B FF FD 8D */ bl daKytag06_type04_init__FP10fopAc_ac_c -/* 80859D48 48 00 01 08 */ b lbl_80859E50 -lbl_80859D4C: -/* 80859D4C 7F E3 FB 78 */ mr r3, r31 -/* 80859D50 4B FF FD A1 */ bl daKytag06_type06_init__FP10fopAc_ac_c -/* 80859D54 48 00 00 FC */ b lbl_80859E50 -lbl_80859D58: -/* 80859D58 38 00 00 00 */ li r0, 0 -/* 80859D5C 98 1F 05 90 */ stb r0, 0x590(r31) -/* 80859D60 98 1F 05 91 */ stb r0, 0x591(r31) -/* 80859D64 90 1F 05 74 */ stw r0, 0x574(r31) -/* 80859D68 48 00 00 E8 */ b lbl_80859E50 -lbl_80859D6C: -/* 80859D6C 7F E3 FB 78 */ mr r3, r31 -/* 80859D70 4B FF FD 81 */ bl daKytag06_type06_init__FP10fopAc_ac_c -/* 80859D74 38 00 00 09 */ li r0, 9 -/* 80859D78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859D7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859D80 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 80859D84 38 00 00 32 */ li r0, 0x32 -/* 80859D88 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 80859D8C 48 00 00 C4 */ b lbl_80859E50 -lbl_80859D90: -/* 80859D90 7F E3 FB 78 */ mr r3, r31 -/* 80859D94 4B FF FD 5D */ bl daKytag06_type06_init__FP10fopAc_ac_c -/* 80859D98 48 00 00 B8 */ b lbl_80859E50 -lbl_80859D9C: -/* 80859D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859DA4 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80859DA8 3C 80 80 86 */ lis r4, d_a_kytag06__stringBase0@ha /* 0x80859F90@ha */ -/* 80859DAC 38 84 9F 90 */ addi r4, r4, d_a_kytag06__stringBase0@l /* 0x80859F90@l */ -/* 80859DB0 4B B0 EB E5 */ bl strcmp -/* 80859DB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80859DB8 41 82 00 10 */ beq lbl_80859DC8 -/* 80859DBC 7F E3 FB 78 */ mr r3, r31 -/* 80859DC0 4B FF FD 31 */ bl daKytag06_type06_init__FP10fopAc_ac_c -/* 80859DC4 48 00 00 8C */ b lbl_80859E50 -lbl_80859DC8: -/* 80859DC8 7F E3 FB 78 */ mr r3, r31 -/* 80859DCC 4B FF FD 69 */ bl daKytag06_type03_init__FP10fopAc_ac_c -/* 80859DD0 48 00 00 80 */ b lbl_80859E50 -lbl_80859DD4: -/* 80859DD4 7F E3 FB 78 */ mr r3, r31 -/* 80859DD8 4B FF FD 19 */ bl daKytag06_type06_init__FP10fopAc_ac_c -/* 80859DDC 48 00 00 74 */ b lbl_80859E50 -lbl_80859DE0: -/* 80859DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859DE8 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80859DEC 3C 80 80 86 */ lis r4, d_a_kytag06__stringBase0@ha /* 0x80859F90@ha */ -/* 80859DF0 38 84 9F 90 */ addi r4, r4, d_a_kytag06__stringBase0@l /* 0x80859F90@l */ -/* 80859DF4 38 84 00 08 */ addi r4, r4, 8 -/* 80859DF8 4B B0 EB 9D */ bl strcmp -/* 80859DFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80859E00 41 82 00 20 */ beq lbl_80859E20 -/* 80859E04 38 00 00 03 */ li r0, 3 -/* 80859E08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859E0C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859E10 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 80859E14 98 03 12 C2 */ stb r0, 0x12c2(r3) -/* 80859E18 98 03 12 C3 */ stb r0, 0x12c3(r3) -/* 80859E1C 48 00 00 18 */ b lbl_80859E34 -lbl_80859E20: -/* 80859E20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859E24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859E28 3C 60 80 86 */ lis r3, lit_4771@ha /* 0x80859F8C@ha */ -/* 80859E2C C0 03 9F 8C */ lfs f0, lit_4771@l(r3) /* 0x80859F8C@l */ -/* 80859E30 D0 04 00 34 */ stfs f0, 0x34(r4) -lbl_80859E34: -/* 80859E34 38 00 00 00 */ li r0, 0 -/* 80859E38 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80859E3C 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80859E40 98 1F 05 90 */ stb r0, 0x590(r31) -/* 80859E44 98 1F 05 91 */ stb r0, 0x591(r31) -/* 80859E48 38 00 02 80 */ li r0, 0x280 -/* 80859E4C 90 1F 05 74 */ stw r0, 0x574(r31) -lbl_80859E50: -/* 80859E50 38 60 00 04 */ li r3, 4 -/* 80859E54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80859E58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80859E5C 7C 08 03 A6 */ mtlr r0 -/* 80859E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80859E64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Delete__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Delete__FP13kytag06_class.s deleted file mode 100644 index 09d87103ff..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Delete__FP13kytag06_class.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80859A90: -/* 80859A90 88 03 05 93 */ lbz r0, 0x593(r3) -/* 80859A94 28 00 00 00 */ cmplwi r0, 0 -/* 80859A98 40 82 00 30 */ bne lbl_80859AC8 -/* 80859A9C 88 03 05 90 */ lbz r0, 0x590(r3) -/* 80859AA0 28 00 00 00 */ cmplwi r0, 0 -/* 80859AA4 41 82 00 24 */ beq lbl_80859AC8 -/* 80859AA8 88 03 05 91 */ lbz r0, 0x591(r3) -/* 80859AAC 28 00 00 04 */ cmplwi r0, 4 -/* 80859AB0 41 80 00 18 */ blt lbl_80859AC8 -/* 80859AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859AB8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859ABC 3C 60 80 86 */ lis r3, lit_4638@ha /* 0x80859F88@ha */ -/* 80859AC0 C0 03 9F 88 */ lfs f0, lit_4638@l(r3) /* 0x80859F88@l */ -/* 80859AC4 D0 04 00 34 */ stfs f0, 0x34(r4) -lbl_80859AC8: -/* 80859AC8 38 60 00 01 */ li r3, 1 -/* 80859ACC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Draw__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Draw__FP13kytag06_class.s deleted file mode 100644 index 4943e56f06..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Draw__FP13kytag06_class.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8085811C: -/* 8085811C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80858120 7C 08 02 A6 */ mflr r0 -/* 80858124 90 01 00 14 */ stw r0, 0x14(r1) -/* 80858128 88 03 05 93 */ lbz r0, 0x593(r3) -/* 8085812C 28 00 00 04 */ cmplwi r0, 4 -/* 80858130 40 82 00 08 */ bne lbl_80858138 -/* 80858134 4B FF FD F5 */ bl daKytag06_type_04_Execute__FP13kytag06_class -lbl_80858138: -/* 80858138 38 60 00 01 */ li r3, 1 -/* 8085813C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80858140 7C 08 03 A6 */ mtlr r0 -/* 80858144 38 21 00 10 */ addi r1, r1, 0x10 -/* 80858148 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s deleted file mode 100644 index 549c6e44f8..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,384 +0,0 @@ -lbl_80859528: -/* 80859528 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8085952C 7C 08 02 A6 */ mflr r0 -/* 80859530 90 01 00 54 */ stw r0, 0x54(r1) -/* 80859534 39 61 00 50 */ addi r11, r1, 0x50 -/* 80859538 4B B0 8C 9D */ bl _savegpr_27 -/* 8085953C 7C 7D 1B 78 */ mr r29, r3 -/* 80859540 3C 80 80 86 */ lis r4, lit_3740@ha /* 0x80859E78@ha */ -/* 80859544 3B C4 9E 78 */ addi r30, r4, lit_3740@l /* 0x80859E78@l */ -/* 80859548 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085954C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859550 88 03 05 93 */ lbz r0, 0x593(r3) -/* 80859554 28 00 00 0B */ cmplwi r0, 0xb -/* 80859558 41 81 02 40 */ bgt lbl_80859798 -/* 8085955C 3C 80 80 86 */ lis r4, lit_4611@ha /* 0x8085A074@ha */ -/* 80859560 38 84 A0 74 */ addi r4, r4, lit_4611@l /* 0x8085A074@l */ -/* 80859564 54 00 10 3A */ slwi r0, r0, 2 -/* 80859568 7C 04 00 2E */ lwzx r0, r4, r0 -/* 8085956C 7C 09 03 A6 */ mtctr r0 -/* 80859570 4E 80 04 20 */ bctr -lbl_80859574: -/* 80859574 80 9F 5D 74 */ lwz r4, 0x5d74(r31) -/* 80859578 80 1D 05 68 */ lwz r0, 0x568(r29) -/* 8085957C 28 00 00 00 */ cmplwi r0, 0 -/* 80859580 41 82 04 EC */ beq lbl_80859A6C -/* 80859584 3B 60 00 00 */ li r27, 0 -/* 80859588 3B E0 00 00 */ li r31, 0 -/* 8085958C 38 84 00 D8 */ addi r4, r4, 0xd8 -/* 80859590 4B FF E9 FD */ bl near_rail_get__FP13kytag06_classP4cXyz -/* 80859594 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80859598 41 82 04 D4 */ beq lbl_80859A6C -/* 8085959C 88 7C 00 03 */ lbz r3, 3(r28) -/* 808595A0 28 03 00 FF */ cmplwi r3, 0xff -/* 808595A4 41 82 04 C8 */ beq lbl_80859A6C -/* 808595A8 4B 94 F2 3D */ bl dKy_change_colpat__FUc -/* 808595AC 88 1C 00 03 */ lbz r0, 3(r28) -/* 808595B0 28 00 00 00 */ cmplwi r0, 0 -/* 808595B4 40 82 00 10 */ bne lbl_808595C4 -/* 808595B8 3B 60 00 FA */ li r27, 0xfa -/* 808595BC 3B E0 00 19 */ li r31, 0x19 -/* 808595C0 48 00 00 28 */ b lbl_808595E8 -lbl_808595C4: -/* 808595C4 28 00 00 01 */ cmplwi r0, 1 -/* 808595C8 40 82 00 10 */ bne lbl_808595D8 -/* 808595CC 3B 60 01 F4 */ li r27, 0x1f4 -/* 808595D0 3B E0 00 32 */ li r31, 0x32 -/* 808595D4 48 00 00 14 */ b lbl_808595E8 -lbl_808595D8: -/* 808595D8 28 00 00 02 */ cmplwi r0, 2 -/* 808595DC 40 82 00 0C */ bne lbl_808595E8 -/* 808595E0 3B 60 00 7D */ li r27, 0x7d -/* 808595E4 3B E0 00 0C */ li r31, 0xc -lbl_808595E8: -/* 808595E8 C0 1D 05 6C */ lfs f0, 0x56c(r29) -/* 808595EC FC 00 00 1E */ fctiwz f0, f0 -/* 808595F0 D8 01 00 08 */ stfd f0, 8(r1) -/* 808595F4 80 01 00 0C */ lwz r0, 0xc(r1) -/* 808595F8 2C 00 00 FA */ cmpwi r0, 0xfa -/* 808595FC 40 81 00 18 */ ble lbl_80859614 -/* 80859600 38 00 00 01 */ li r0, 1 -/* 80859604 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859608 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085960C 98 03 0E 92 */ stb r0, 0xe92(r3) -/* 80859610 48 00 00 14 */ b lbl_80859624 -lbl_80859614: -/* 80859614 38 00 00 00 */ li r0, 0 -/* 80859618 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085961C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859620 98 03 0E 92 */ stb r0, 0xe92(r3) -lbl_80859624: -/* 80859624 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80859628 7F 60 07 34 */ extsh r0, r27 -/* 8085962C C8 3E 01 08 */ lfd f1, 0x108(r30) -/* 80859630 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80859634 90 01 00 0C */ stw r0, 0xc(r1) -/* 80859638 3C 00 43 30 */ lis r0, 0x4330 -/* 8085963C 90 01 00 08 */ stw r0, 8(r1) -/* 80859640 C8 01 00 08 */ lfd f0, 8(r1) -/* 80859644 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80859648 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 8085964C C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80859650 C0 9E 00 40 */ lfs f4, 0x40(r30) -/* 80859654 4B A1 63 29 */ bl cLib_addCalc__FPfffff -/* 80859658 38 7D 05 70 */ addi r3, r29, 0x570 -/* 8085965C 7F E0 07 34 */ extsh r0, r31 -/* 80859660 C8 3E 01 08 */ lfd f1, 0x108(r30) -/* 80859664 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80859668 90 01 00 14 */ stw r0, 0x14(r1) -/* 8085966C 3C 00 43 30 */ lis r0, 0x4330 -/* 80859670 90 01 00 10 */ stw r0, 0x10(r1) -/* 80859674 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80859678 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8085967C C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 80859680 C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80859684 C0 9E 00 40 */ lfs f4, 0x40(r30) -/* 80859688 4B A1 62 F5 */ bl cLib_addCalc__FPfffff -/* 8085968C C0 5D 05 6C */ lfs f2, 0x56c(r29) -/* 80859690 FC 00 10 1E */ fctiwz f0, f2 -/* 80859694 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80859698 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8085969C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808596A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808596A4 90 03 0E 8C */ stw r0, 0xe8c(r3) -/* 808596A8 C0 1D 05 70 */ lfs f0, 0x570(r29) -/* 808596AC FC 00 00 1E */ fctiwz f0, f0 -/* 808596B0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 808596B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 808596B8 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 808596BC 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 808596C0 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 808596C4 C0 3E 00 F4 */ lfs f1, 0xf4(r30) -/* 808596C8 C0 1E 00 E8 */ lfs f0, 0xe8(r30) -/* 808596CC EC 02 00 24 */ fdivs f0, f2, f0 -/* 808596D0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 808596D4 FC 00 00 1E */ fctiwz f0, f0 -/* 808596D8 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 808596DC 80 81 00 2C */ lwz r4, 0x2c(r1) -/* 808596E0 4B A6 E8 D5 */ bl setSnowPower__10Z2EnvSeMgrFSc -/* 808596E4 48 00 03 88 */ b lbl_80859A6C -lbl_808596E8: -/* 808596E8 88 9D 05 95 */ lbz r4, 0x595(r29) -/* 808596EC 28 04 00 FF */ cmplwi r4, 0xff -/* 808596F0 41 82 03 7C */ beq lbl_80859A6C -/* 808596F4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 808596F8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 808596FC 7C A5 07 74 */ extsb r5, r5 -/* 80859700 7F E3 FB 78 */ mr r3, r31 -/* 80859704 4B 7D BC 5D */ bl isSwitch__10dSv_info_cCFii -/* 80859708 2C 03 00 00 */ cmpwi r3, 0 -/* 8085970C 41 82 03 60 */ beq lbl_80859A6C -/* 80859710 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 80859714 28 00 00 00 */ cmplwi r0, 0 -/* 80859718 40 82 03 54 */ bne lbl_80859A6C -/* 8085971C 38 00 00 01 */ li r0, 1 -/* 80859720 98 1D 05 90 */ stb r0, 0x590(r29) -/* 80859724 88 7D 05 91 */ lbz r3, 0x591(r29) -/* 80859728 4B 94 F0 BD */ bl dKy_change_colpat__FUc -/* 8085972C 48 00 03 40 */ b lbl_80859A6C -lbl_80859730: -/* 80859730 4B FF FB ED */ bl daKytag06_type_03_Execute__FP13kytag06_class -/* 80859734 48 00 03 38 */ b lbl_80859A6C -lbl_80859738: -/* 80859738 4B FF FA 6D */ bl daKytag06_type_05_Execute__FP13kytag06_class -/* 8085973C 48 00 03 30 */ b lbl_80859A6C -lbl_80859740: -/* 80859740 4B FF F2 A1 */ bl daKytag06_type_06_Execute__FP13kytag06_class -/* 80859744 48 00 03 28 */ b lbl_80859A6C -lbl_80859748: -/* 80859748 4B FF EF A9 */ bl daKytag06_type_07_Execute__FP13kytag06_class -/* 8085974C 48 00 03 20 */ b lbl_80859A6C -lbl_80859750: -/* 80859750 4B FF F5 85 */ bl daKytag06_type_08_Execute__FP13kytag06_class -/* 80859754 48 00 03 18 */ b lbl_80859A6C -lbl_80859758: -/* 80859758 4B FF F5 A9 */ bl daKytag06_type_09_Execute__FP13kytag06_class -/* 8085975C 48 00 03 10 */ b lbl_80859A6C -lbl_80859760: -/* 80859760 38 7F 4E 00 */ addi r3, r31, 0x4e00 -/* 80859764 3C 80 80 86 */ lis r4, d_a_kytag06__stringBase0@ha /* 0x80859F90@ha */ -/* 80859768 38 84 9F 90 */ addi r4, r4, d_a_kytag06__stringBase0@l /* 0x80859F90@l */ -/* 8085976C 4B B0 F2 29 */ bl strcmp -/* 80859770 2C 03 00 00 */ cmpwi r3, 0 -/* 80859774 41 82 00 10 */ beq lbl_80859784 -/* 80859778 7F A3 EB 78 */ mr r3, r29 -/* 8085977C 4B FF F5 B1 */ bl daKytag06_type_10_Execute__FP13kytag06_class -/* 80859780 48 00 02 EC */ b lbl_80859A6C -lbl_80859784: -/* 80859784 7F A3 EB 78 */ mr r3, r29 -/* 80859788 4B FF FB 95 */ bl daKytag06_type_03_Execute__FP13kytag06_class -/* 8085978C 48 00 02 E0 */ b lbl_80859A6C -lbl_80859790: -/* 80859790 4B FF F9 9D */ bl daKytag06_type_11_Execute__FP13kytag06_class -/* 80859794 48 00 02 D8 */ b lbl_80859A6C -lbl_80859798: -/* 80859798 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 8085979C 28 00 00 00 */ cmplwi r0, 0 -/* 808597A0 40 82 01 3C */ bne lbl_808598DC -/* 808597A4 88 BD 05 91 */ lbz r5, 0x591(r29) -/* 808597A8 2C 05 00 02 */ cmpwi r5, 2 -/* 808597AC 41 82 00 9C */ beq lbl_80859848 -/* 808597B0 40 80 00 14 */ bge lbl_808597C4 -/* 808597B4 2C 05 00 00 */ cmpwi r5, 0 -/* 808597B8 41 82 00 18 */ beq lbl_808597D0 -/* 808597BC 40 80 00 4C */ bge lbl_80859808 -/* 808597C0 48 00 00 E4 */ b lbl_808598A4 -lbl_808597C4: -/* 808597C4 2C 05 00 04 */ cmpwi r5, 4 -/* 808597C8 40 80 00 DC */ bge lbl_808598A4 -/* 808597CC 48 00 00 B4 */ b lbl_80859880 -lbl_808597D0: -/* 808597D0 4B 7D 41 41 */ bl dComIfGs_BossLife_public_Get__Fv -/* 808597D4 7C 60 07 74 */ extsb r0, r3 -/* 808597D8 2C 00 FF FF */ cmpwi r0, -1 -/* 808597DC 41 82 00 C8 */ beq lbl_808598A4 -/* 808597E0 4B 7D 41 31 */ bl dComIfGs_BossLife_public_Get__Fv -/* 808597E4 7C 60 07 74 */ extsb r0, r3 -/* 808597E8 2C 00 00 06 */ cmpwi r0, 6 -/* 808597EC 41 81 00 B8 */ bgt lbl_808598A4 -/* 808597F0 38 60 00 01 */ li r3, 1 -/* 808597F4 4B 94 EF F1 */ bl dKy_change_colpat__FUc -/* 808597F8 88 7D 05 91 */ lbz r3, 0x591(r29) -/* 808597FC 38 03 00 01 */ addi r0, r3, 1 -/* 80859800 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80859804 48 00 00 A0 */ b lbl_808598A4 -lbl_80859808: -/* 80859808 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 8085980C 2C 00 02 58 */ cmpwi r0, 0x258 -/* 80859810 40 81 00 94 */ ble lbl_808598A4 -/* 80859814 38 00 00 00 */ li r0, 0 -/* 80859818 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085981C 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859820 98 04 0E B5 */ stb r0, 0xeb5(r4) -/* 80859824 80 64 0E B8 */ lwz r3, 0xeb8(r4) -/* 80859828 2C 03 00 32 */ cmpwi r3, 0x32 -/* 8085982C 40 80 00 10 */ bge lbl_8085983C -/* 80859830 38 03 00 01 */ addi r0, r3, 1 -/* 80859834 90 04 0E B8 */ stw r0, 0xeb8(r4) -/* 80859838 48 00 00 6C */ b lbl_808598A4 -lbl_8085983C: -/* 8085983C 38 05 00 01 */ addi r0, r5, 1 -/* 80859840 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80859844 48 00 00 60 */ b lbl_808598A4 -lbl_80859848: -/* 80859848 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 8085984C 2C 00 03 84 */ cmpwi r0, 0x384 -/* 80859850 40 81 00 54 */ ble lbl_808598A4 -/* 80859854 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859858 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085985C 80 64 0E 80 */ lwz r3, 0xe80(r4) -/* 80859860 2C 03 00 FA */ cmpwi r3, 0xfa -/* 80859864 40 80 00 10 */ bge lbl_80859874 -/* 80859868 38 03 00 01 */ addi r0, r3, 1 -/* 8085986C 90 04 0E 80 */ stw r0, 0xe80(r4) -/* 80859870 48 00 00 34 */ b lbl_808598A4 -lbl_80859874: -/* 80859874 38 05 00 01 */ addi r0, r5, 1 -/* 80859878 98 1D 05 91 */ stb r0, 0x591(r29) -/* 8085987C 48 00 00 28 */ b lbl_808598A4 -lbl_80859880: -/* 80859880 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80859884 2C 00 04 4C */ cmpwi r0, 0x44c -/* 80859888 40 81 00 1C */ ble lbl_808598A4 -/* 8085988C 38 00 00 02 */ li r0, 2 -/* 80859890 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859894 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859898 90 03 0E D8 */ stw r0, 0xed8(r3) -/* 8085989C 38 05 00 01 */ addi r0, r5, 1 -/* 808598A0 98 1D 05 91 */ stb r0, 0x591(r29) -lbl_808598A4: -/* 808598A4 4B 7D 40 6D */ bl dComIfGs_BossLife_public_Get__Fv -/* 808598A8 7C 60 07 74 */ extsb r0, r3 -/* 808598AC 2C 00 FF FF */ cmpwi r0, -1 -/* 808598B0 41 82 01 68 */ beq lbl_80859A18 -/* 808598B4 4B 7D 40 5D */ bl dComIfGs_BossLife_public_Get__Fv -/* 808598B8 7C 60 07 74 */ extsb r0, r3 -/* 808598BC 2C 00 00 03 */ cmpwi r0, 3 -/* 808598C0 41 81 01 58 */ bgt lbl_80859A18 -/* 808598C4 38 00 00 00 */ li r0, 0 -/* 808598C8 98 1D 05 91 */ stb r0, 0x591(r29) -/* 808598CC 90 1D 05 78 */ stw r0, 0x578(r29) -/* 808598D0 38 00 00 01 */ li r0, 1 -/* 808598D4 98 1D 05 90 */ stb r0, 0x590(r29) -/* 808598D8 48 00 01 40 */ b lbl_80859A18 -lbl_808598DC: -/* 808598DC 88 BD 05 91 */ lbz r5, 0x591(r29) -/* 808598E0 2C 05 00 02 */ cmpwi r5, 2 -/* 808598E4 41 82 00 A8 */ beq lbl_8085998C -/* 808598E8 40 80 00 14 */ bge lbl_808598FC -/* 808598EC 2C 05 00 00 */ cmpwi r5, 0 -/* 808598F0 41 82 00 1C */ beq lbl_8085990C -/* 808598F4 40 80 00 58 */ bge lbl_8085994C -/* 808598F8 48 00 01 20 */ b lbl_80859A18 -lbl_808598FC: -/* 808598FC 2C 05 00 04 */ cmpwi r5, 4 -/* 80859900 41 82 00 D4 */ beq lbl_808599D4 -/* 80859904 40 80 01 14 */ bge lbl_80859A18 -/* 80859908 48 00 00 A8 */ b lbl_808599B0 -lbl_8085990C: -/* 8085990C 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80859910 2C 00 00 00 */ cmpwi r0, 0 -/* 80859914 40 81 01 04 */ ble lbl_80859A18 -/* 80859918 38 00 00 00 */ li r0, 0 -/* 8085991C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859920 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859924 90 04 0E D8 */ stw r0, 0xed8(r4) -/* 80859928 80 64 0E 80 */ lwz r3, 0xe80(r4) -/* 8085992C 2C 03 00 00 */ cmpwi r3, 0 -/* 80859930 40 81 00 10 */ ble lbl_80859940 -/* 80859934 38 03 FF FF */ addi r0, r3, -1 -/* 80859938 90 04 0E 80 */ stw r0, 0xe80(r4) -/* 8085993C 48 00 00 DC */ b lbl_80859A18 -lbl_80859940: -/* 80859940 38 05 00 01 */ addi r0, r5, 1 -/* 80859944 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80859948 48 00 00 D0 */ b lbl_80859A18 -lbl_8085994C: -/* 8085994C 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80859950 2C 00 00 96 */ cmpwi r0, 0x96 -/* 80859954 40 81 00 C4 */ ble lbl_80859A18 -/* 80859958 38 00 00 00 */ li r0, 0 -/* 8085995C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859960 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859964 98 04 0E B5 */ stb r0, 0xeb5(r4) -/* 80859968 80 64 0E B8 */ lwz r3, 0xeb8(r4) -/* 8085996C 2C 03 00 00 */ cmpwi r3, 0 -/* 80859970 41 80 00 10 */ blt lbl_80859980 -/* 80859974 38 03 FF FF */ addi r0, r3, -1 -/* 80859978 90 04 0E B8 */ stw r0, 0xeb8(r4) -/* 8085997C 48 00 00 9C */ b lbl_80859A18 -lbl_80859980: -/* 80859980 38 05 00 01 */ addi r0, r5, 1 -/* 80859984 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80859988 48 00 00 90 */ b lbl_80859A18 -lbl_8085998C: -/* 8085998C 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80859990 2C 00 01 2C */ cmpwi r0, 0x12c -/* 80859994 40 81 00 84 */ ble lbl_80859A18 -/* 80859998 38 60 00 06 */ li r3, 6 -/* 8085999C 4B 94 EE 49 */ bl dKy_change_colpat__FUc -/* 808599A0 88 7D 05 91 */ lbz r3, 0x591(r29) -/* 808599A4 38 03 00 01 */ addi r0, r3, 1 -/* 808599A8 98 1D 05 91 */ stb r0, 0x591(r29) -/* 808599AC 48 00 00 6C */ b lbl_80859A18 -lbl_808599B0: -/* 808599B0 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 808599B4 2C 00 01 A4 */ cmpwi r0, 0x1a4 -/* 808599B8 40 81 00 60 */ ble lbl_80859A18 -/* 808599BC 38 60 00 00 */ li r3, 0 -/* 808599C0 4B 94 EE 25 */ bl dKy_change_colpat__FUc -/* 808599C4 88 7D 05 91 */ lbz r3, 0x591(r29) -/* 808599C8 38 03 00 01 */ addi r0, r3, 1 -/* 808599CC 98 1D 05 91 */ stb r0, 0x591(r29) -/* 808599D0 48 00 00 48 */ b lbl_80859A18 -lbl_808599D4: -/* 808599D4 4B 7D 3F 3D */ bl dComIfGs_BossLife_public_Get__Fv -/* 808599D8 7C 60 07 75 */ extsb. r0, r3 -/* 808599DC 40 82 00 3C */ bne lbl_80859A18 -/* 808599E0 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 808599E4 C0 1E 00 FC */ lfs f0, 0xfc(r30) -/* 808599E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808599EC 40 80 00 2C */ bge lbl_80859A18 -/* 808599F0 C0 1E 01 00 */ lfs f0, 0x100(r30) -/* 808599F4 EC 21 00 2A */ fadds f1, f1, f0 -/* 808599F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808599FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859A00 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80859A04 28 00 00 00 */ cmplwi r0, 0 -/* 80859A08 41 82 00 0C */ beq lbl_80859A14 -/* 80859A0C C0 1E 00 58 */ lfs f0, 0x58(r30) -/* 80859A10 EC 21 00 2A */ fadds f1, f1, f0 -lbl_80859A14: -/* 80859A14 D0 3F 00 34 */ stfs f1, 0x34(r31) -lbl_80859A18: -/* 80859A18 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 80859A1C 28 00 00 00 */ cmplwi r0, 0 -/* 80859A20 40 82 00 10 */ bne lbl_80859A30 -/* 80859A24 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 80859A28 28 00 00 00 */ cmplwi r0, 0 -/* 80859A2C 41 82 00 20 */ beq lbl_80859A4C -lbl_80859A30: -/* 80859A30 80 9D 05 78 */ lwz r4, 0x578(r29) -/* 80859A34 3C 60 00 02 */ lis r3, 0x0002 /* 0x00018DD9@ha */ -/* 80859A38 38 03 8D D9 */ addi r0, r3, 0x8DD9 /* 0x00018DD9@l */ -/* 80859A3C 7C 04 00 00 */ cmpw r4, r0 -/* 80859A40 40 80 00 0C */ bge lbl_80859A4C -/* 80859A44 38 04 00 01 */ addi r0, r4, 1 -/* 80859A48 90 1D 05 78 */ stw r0, 0x578(r29) -lbl_80859A4C: -/* 80859A4C 80 9D 05 78 */ lwz r4, 0x578(r29) -/* 80859A50 3C 60 00 02 */ lis r3, 0x0002 /* 0x0001869F@ha */ -/* 80859A54 38 03 86 9F */ addi r0, r3, 0x869F /* 0x0001869F@l */ -/* 80859A58 7C 04 00 00 */ cmpw r4, r0 -/* 80859A5C 40 80 00 10 */ bge lbl_80859A6C -/* 80859A60 80 7D 05 7C */ lwz r3, 0x57c(r29) -/* 80859A64 38 03 00 01 */ addi r0, r3, 1 -/* 80859A68 90 1D 05 7C */ stw r0, 0x57c(r29) -lbl_80859A6C: -/* 80859A6C 38 60 00 01 */ li r3, 1 -/* 80859A70 39 61 00 50 */ addi r11, r1, 0x50 -/* 80859A74 4B B0 87 AD */ bl _restgpr_27 -/* 80859A78 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80859A7C 7C 08 03 A6 */ mtlr r0 -/* 80859A80 38 21 00 50 */ addi r1, r1, 0x50 -/* 80859A84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Ganon_wether_proc__FP13kytag06_classUc.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Ganon_wether_proc__FP13kytag06_classUc.s deleted file mode 100644 index dda5a44f5a..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Ganon_wether_proc__FP13kytag06_classUc.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_8085824C: -/* 8085824C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80858250 7C 08 02 A6 */ mflr r0 -/* 80858254 90 01 00 24 */ stw r0, 0x24(r1) -/* 80858258 39 61 00 20 */ addi r11, r1, 0x20 -/* 8085825C 4B B0 9F 7D */ bl _savegpr_28 -/* 80858260 7C 7D 1B 78 */ mr r29, r3 -/* 80858264 7C 9C 23 78 */ mr r28, r4 -/* 80858268 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 8085826C 3B C3 9E 78 */ addi r30, r3, lit_3740@l /* 0x80859E78@l */ -/* 80858270 38 00 00 00 */ li r0, 0 -/* 80858274 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858278 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085827C 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80858280 38 60 00 00 */ li r3, 0 -/* 80858284 38 80 C0 00 */ li r4, -16384 -/* 80858288 4B 80 33 95 */ bl dKyw_evt_wind_set__Fss -/* 8085828C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80858290 2C 00 00 02 */ cmpwi r0, 2 -/* 80858294 41 82 00 A4 */ beq lbl_80858338 -/* 80858298 40 80 00 14 */ bge lbl_808582AC -/* 8085829C 2C 00 00 00 */ cmpwi r0, 0 -/* 808582A0 41 82 00 18 */ beq lbl_808582B8 -/* 808582A4 40 80 00 50 */ bge lbl_808582F4 -/* 808582A8 48 00 01 D8 */ b lbl_80858480 -lbl_808582AC: -/* 808582AC 2C 00 00 04 */ cmpwi r0, 4 -/* 808582B0 40 80 01 D0 */ bge lbl_80858480 -/* 808582B4 48 00 00 C8 */ b lbl_8085837C -lbl_808582B8: -/* 808582B8 38 00 00 0A */ li r0, 0xa -/* 808582BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808582C0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808582C4 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 808582C8 38 00 00 32 */ li r0, 0x32 -/* 808582CC 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 808582D0 38 7D 05 6C */ addi r3, r29, 0x56c -/* 808582D4 C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 808582D8 C0 5E 00 3C */ lfs f2, 0x3c(r30) -/* 808582DC C0 7E 00 40 */ lfs f3, 0x40(r30) -/* 808582E0 C0 9E 00 44 */ lfs f4, 0x44(r30) -/* 808582E4 4B A1 76 99 */ bl cLib_addCalc__FPfffff -/* 808582E8 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 808582EC 4B 80 33 21 */ bl dKyw_custom_windpower__Ff -/* 808582F0 48 00 01 90 */ b lbl_80858480 -lbl_808582F4: -/* 808582F4 38 00 00 01 */ li r0, 1 -/* 808582F8 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 808582FC 38 00 00 0A */ li r0, 0xa -/* 80858300 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858304 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858308 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 8085830C 38 00 00 32 */ li r0, 0x32 -/* 80858310 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 80858314 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858318 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 8085831C C0 5E 00 3C */ lfs f2, 0x3c(r30) -/* 80858320 C0 7E 00 40 */ lfs f3, 0x40(r30) -/* 80858324 C0 9E 00 44 */ lfs f4, 0x44(r30) -/* 80858328 4B A1 76 55 */ bl cLib_addCalc__FPfffff -/* 8085832C C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858330 4B 80 32 DD */ bl dKyw_custom_windpower__Ff -/* 80858334 48 00 01 4C */ b lbl_80858480 -lbl_80858338: -/* 80858338 38 00 00 00 */ li r0, 0 -/* 8085833C 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80858340 38 00 00 0A */ li r0, 0xa -/* 80858344 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858348 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085834C 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 80858350 38 00 00 32 */ li r0, 0x32 -/* 80858354 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 80858358 38 7D 05 6C */ addi r3, r29, 0x56c -/* 8085835C C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 80858360 C0 5E 00 3C */ lfs f2, 0x3c(r30) -/* 80858364 C0 7E 00 40 */ lfs f3, 0x40(r30) -/* 80858368 C0 9E 00 44 */ lfs f4, 0x44(r30) -/* 8085836C 4B A1 76 11 */ bl cLib_addCalc__FPfffff -/* 80858370 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858374 4B 80 32 99 */ bl dKyw_custom_windpower__Ff -/* 80858378 48 00 01 08 */ b lbl_80858480 -lbl_8085837C: -/* 8085837C 38 00 00 32 */ li r0, 0x32 -/* 80858380 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858384 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858388 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8085838C 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 80858390 2C 00 00 02 */ cmpwi r0, 2 -/* 80858394 41 82 00 A4 */ beq lbl_80858438 -/* 80858398 40 80 00 14 */ bge lbl_808583AC -/* 8085839C 2C 00 00 00 */ cmpwi r0, 0 -/* 808583A0 41 82 00 18 */ beq lbl_808583B8 -/* 808583A4 40 80 00 54 */ bge lbl_808583F8 -/* 808583A8 48 00 00 D0 */ b lbl_80858478 -lbl_808583AC: -/* 808583AC 2C 00 00 04 */ cmpwi r0, 4 -/* 808583B0 40 80 00 C8 */ bge lbl_80858478 -/* 808583B4 48 00 00 BC */ b lbl_80858470 -lbl_808583B8: -/* 808583B8 38 00 00 0A */ li r0, 0xa -/* 808583BC 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 808583C0 38 7D 05 6C */ addi r3, r29, 0x56c -/* 808583C4 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 808583C8 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 808583CC FC 60 10 90 */ fmr f3, f2 -/* 808583D0 C0 9E 00 40 */ lfs f4, 0x40(r30) -/* 808583D4 4B A1 75 A9 */ bl cLib_addCalc__FPfffff -/* 808583D8 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 808583DC C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 808583E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808583E4 40 80 00 94 */ bge lbl_80858478 -/* 808583E8 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 808583EC 38 03 00 01 */ addi r0, r3, 1 -/* 808583F0 98 1D 05 90 */ stb r0, 0x590(r29) -/* 808583F4 48 00 00 84 */ b lbl_80858478 -lbl_808583F8: -/* 808583F8 38 00 00 0B */ li r0, 0xb -/* 808583FC 98 03 0E B5 */ stb r0, 0xeb5(r3) -/* 80858400 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858404 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 80858408 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 8085840C FC 60 10 90 */ fmr f3, f2 -/* 80858410 C0 9E 00 44 */ lfs f4, 0x44(r30) -/* 80858414 4B A1 75 69 */ bl cLib_addCalc__FPfffff -/* 80858418 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 8085841C C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80858420 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858424 40 81 00 54 */ ble lbl_80858478 -/* 80858428 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 8085842C 38 03 00 01 */ addi r0, r3, 1 -/* 80858430 98 1D 05 90 */ stb r0, 0x590(r29) -/* 80858434 48 00 00 44 */ b lbl_80858478 -lbl_80858438: -/* 80858438 38 7D 05 6C */ addi r3, r29, 0x56c -/* 8085843C C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 80858440 C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 80858444 C0 7E 00 5C */ lfs f3, 0x5c(r30) -/* 80858448 C0 9E 00 44 */ lfs f4, 0x44(r30) -/* 8085844C 4B A1 75 31 */ bl cLib_addCalc__FPfffff -/* 80858450 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858454 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 80858458 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085845C 40 80 00 1C */ bge lbl_80858478 -/* 80858460 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 80858464 38 03 00 01 */ addi r0, r3, 1 -/* 80858468 98 1D 05 90 */ stb r0, 0x590(r29) -/* 8085846C 48 00 00 0C */ b lbl_80858478 -lbl_80858470: -/* 80858470 38 00 00 00 */ li r0, 0 -/* 80858474 98 1D 05 90 */ stb r0, 0x590(r29) -lbl_80858478: -/* 80858478 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 8085847C 4B 80 31 91 */ bl dKyw_custom_windpower__Ff -lbl_80858480: -/* 80858480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858488 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8085848C 28 00 00 00 */ cmplwi r0, 0 -/* 80858490 41 82 00 0C */ beq lbl_8085849C -/* 80858494 38 00 00 01 */ li r0, 1 -/* 80858498 90 1F 0E D8 */ stw r0, 0xed8(r31) -lbl_8085849C: -/* 8085849C 39 61 00 20 */ addi r11, r1, 0x20 -/* 808584A0 4B B0 9D 85 */ bl _restgpr_28 -/* 808584A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 808584A8 7C 08 03 A6 */ mtlr r0 -/* 808584AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 808584B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc.s deleted file mode 100644 index cf03d3a285..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_8085814C: -/* 8085814C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80858150 7C 08 02 A6 */ mflr r0 -/* 80858154 90 01 00 14 */ stw r0, 0x14(r1) -/* 80858158 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085815C 93 C1 00 08 */ stw r30, 8(r1) -/* 80858160 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858164 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858168 38 00 00 00 */ li r0, 0 -/* 8085816C 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80858170 8B DF 12 C8 */ lbz r30, 0x12c8(r31) -/* 80858174 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80858178 2C 00 00 01 */ cmpwi r0, 1 -/* 8085817C 41 82 00 58 */ beq lbl_808581D4 -/* 80858180 40 80 00 10 */ bge lbl_80858190 -/* 80858184 2C 00 00 00 */ cmpwi r0, 0 -/* 80858188 40 80 00 14 */ bge lbl_8085819C -/* 8085818C 48 00 00 78 */ b lbl_80858204 -lbl_80858190: -/* 80858190 2C 00 00 03 */ cmpwi r0, 3 -/* 80858194 40 80 00 70 */ bge lbl_80858204 -/* 80858198 48 00 00 48 */ b lbl_808581E0 -lbl_8085819C: -/* 8085819C 3B C0 00 00 */ li r30, 0 -/* 808581A0 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 808581A4 2C 03 00 14 */ cmpwi r3, 0x14 -/* 808581A8 40 81 00 10 */ ble lbl_808581B8 -/* 808581AC 38 03 FF FC */ addi r0, r3, -4 -/* 808581B0 90 1F 0E 80 */ stw r0, 0xe80(r31) -/* 808581B4 48 00 00 14 */ b lbl_808581C8 -lbl_808581B8: -/* 808581B8 2C 03 00 00 */ cmpwi r3, 0 -/* 808581BC 41 82 00 0C */ beq lbl_808581C8 -/* 808581C0 38 03 FF FF */ addi r0, r3, -1 -/* 808581C4 90 1F 0E 80 */ stw r0, 0xe80(r31) -lbl_808581C8: -/* 808581C8 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 808581CC 4B 80 34 81 */ bl dKyw_rain_set__Fi -/* 808581D0 48 00 00 34 */ b lbl_80858204 -lbl_808581D4: -/* 808581D4 3B C0 00 01 */ li r30, 1 -/* 808581D8 4B FF F8 15 */ bl dice_rain_minus__Fv -/* 808581DC 48 00 00 28 */ b lbl_80858204 -lbl_808581E0: -/* 808581E0 3B C0 00 02 */ li r30, 2 -/* 808581E4 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 808581E8 2C 03 00 FA */ cmpwi r3, 0xfa -/* 808581EC 40 80 00 10 */ bge lbl_808581FC -/* 808581F0 38 63 00 01 */ addi r3, r3, 1 -/* 808581F4 90 7F 0E 80 */ stw r3, 0xe80(r31) -/* 808581F8 4B 80 34 55 */ bl dKyw_rain_set__Fi -lbl_808581FC: -/* 808581FC 38 00 00 01 */ li r0, 1 -/* 80858200 90 1F 0E D8 */ stw r0, 0xed8(r31) -lbl_80858204: -/* 80858204 88 7F 12 C8 */ lbz r3, 0x12c8(r31) -/* 80858208 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8085820C 7C 03 00 40 */ cmplw r3, r0 -/* 80858210 41 82 00 24 */ beq lbl_80858234 -/* 80858214 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858218 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085821C 88 03 12 D8 */ lbz r0, 0x12d8(r3) -/* 80858220 28 00 00 00 */ cmplwi r0, 0 -/* 80858224 40 82 00 10 */ bne lbl_80858234 -/* 80858228 9B DF 12 C8 */ stb r30, 0x12c8(r31) -/* 8085822C 7F C3 F3 78 */ mr r3, r30 -/* 80858230 4B 95 05 B5 */ bl dKy_change_colpat__FUc -lbl_80858234: -/* 80858234 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80858238 83 C1 00 08 */ lwz r30, 8(r1) -/* 8085823C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80858240 7C 08 03 A6 */ mtlr r0 -/* 80858244 38 21 00 10 */ addi r1, r1, 0x10 -/* 80858248 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type02_init__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type02_init__FP10fopAc_ac_c.s deleted file mode 100644 index 75a0e909d0..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type02_init__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80859B14: -/* 80859B14 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859B18 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80859B1C 98 03 05 95 */ stb r0, 0x595(r3) -/* 80859B20 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859B24 98 03 05 91 */ stb r0, 0x591(r3) -/* 80859B28 38 00 00 00 */ li r0, 0 -/* 80859B2C 98 03 05 90 */ stb r0, 0x590(r3) -/* 80859B30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s deleted file mode 100644 index 2338514379..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80859B34: -/* 80859B34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80859B38 7C 08 02 A6 */ mflr r0 -/* 80859B3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80859B40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80859B44 93 C1 00 08 */ stw r30, 8(r1) -/* 80859B48 7C 7F 1B 78 */ mr r31, r3 -/* 80859B4C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859B50 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80859B54 98 03 05 95 */ stb r0, 0x595(r3) -/* 80859B58 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859B5C 98 03 05 91 */ stb r0, 0x591(r3) -/* 80859B60 38 00 00 00 */ li r0, 0 -/* 80859B64 98 03 05 90 */ stb r0, 0x590(r3) -/* 80859B68 88 03 05 97 */ lbz r0, 0x597(r3) -/* 80859B6C 28 00 00 00 */ cmplwi r0, 0 -/* 80859B70 40 82 00 90 */ bne lbl_80859C00 -/* 80859B74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859B78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859B7C 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80859B80 7F C3 F3 78 */ mr r3, r30 -/* 80859B84 38 80 0C 01 */ li r4, 0xc01 -/* 80859B88 4B 7D AE 35 */ bl isEventBit__11dSv_event_cCFUs -/* 80859B8C 2C 03 00 00 */ cmpwi r3, 0 -/* 80859B90 41 82 00 E0 */ beq lbl_80859C70 -/* 80859B94 7F C3 F3 78 */ mr r3, r30 -/* 80859B98 38 80 1E 08 */ li r4, 0x1e08 -/* 80859B9C 4B 7D AE 21 */ bl isEventBit__11dSv_event_cCFUs -/* 80859BA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80859BA4 40 82 00 CC */ bne lbl_80859C70 -/* 80859BA8 88 9F 05 95 */ lbz r4, 0x595(r31) -/* 80859BAC 28 04 00 FF */ cmplwi r4, 0xff -/* 80859BB0 41 82 00 C0 */ beq lbl_80859C70 -/* 80859BB4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80859BB8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80859BBC 7C A5 07 74 */ extsb r5, r5 -/* 80859BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859BC8 4B 7D B7 99 */ bl isSwitch__10dSv_info_cCFii -/* 80859BCC 2C 03 00 00 */ cmpwi r3, 0 -/* 80859BD0 41 82 00 A0 */ beq lbl_80859C70 -/* 80859BD4 38 00 00 09 */ li r0, 9 -/* 80859BD8 98 1F 05 90 */ stb r0, 0x590(r31) -/* 80859BDC 38 00 00 FA */ li r0, 0xfa -/* 80859BE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859BE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859BE8 90 03 0E 80 */ stw r0, 0xe80(r3) -/* 80859BEC 88 1F 05 91 */ lbz r0, 0x591(r31) -/* 80859BF0 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 80859BF4 98 03 12 C2 */ stb r0, 0x12c2(r3) -/* 80859BF8 98 03 12 C3 */ stb r0, 0x12c3(r3) -/* 80859BFC 48 00 00 74 */ b lbl_80859C70 -lbl_80859C00: -/* 80859C00 28 00 00 02 */ cmplwi r0, 2 -/* 80859C04 40 82 00 6C */ bne lbl_80859C70 -/* 80859C08 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80859C0C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80859C10 7C 00 07 75 */ extsb. r0, r0 -/* 80859C14 41 82 00 5C */ beq lbl_80859C70 -/* 80859C18 88 9F 05 95 */ lbz r4, 0x595(r31) -/* 80859C1C 28 04 00 FF */ cmplwi r4, 0xff -/* 80859C20 41 82 00 48 */ beq lbl_80859C68 -/* 80859C24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859C28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859C2C 88 BF 04 E2 */ lbz r5, 0x4e2(r31) -/* 80859C30 7C A5 07 74 */ extsb r5, r5 -/* 80859C34 4B 7D B7 2D */ bl isSwitch__10dSv_info_cCFii -/* 80859C38 2C 03 00 00 */ cmpwi r3, 0 -/* 80859C3C 40 82 00 2C */ bne lbl_80859C68 -/* 80859C40 38 60 00 00 */ li r3, 0 -/* 80859C44 88 9F 05 91 */ lbz r4, 0x591(r31) -/* 80859C48 3C A0 80 86 */ lis r5, lit_4012@ha /* 0x80859EC8@ha */ -/* 80859C4C C0 25 9E C8 */ lfs f1, lit_4012@l(r5) /* 0x80859EC8@l */ -/* 80859C50 4B 94 EB BD */ bl dKy_custom_colset__FUcUcf -/* 80859C54 88 1F 05 91 */ lbz r0, 0x591(r31) -/* 80859C58 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859C5C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859C60 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 80859C64 48 00 00 0C */ b lbl_80859C70 -lbl_80859C68: -/* 80859C68 38 00 00 01 */ li r0, 1 -/* 80859C6C 98 1F 05 90 */ stb r0, 0x590(r31) -lbl_80859C70: -/* 80859C70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80859C74 83 C1 00 08 */ lwz r30, 8(r1) -/* 80859C78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80859C7C 7C 08 03 A6 */ mtlr r0 -/* 80859C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80859C84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type04_init__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type04_init__FP10fopAc_ac_c.s deleted file mode 100644 index 7832e4bdc3..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type04_init__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80859AD0: -/* 80859AD0 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859AD4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80859AD8 98 03 05 95 */ stb r0, 0x595(r3) -/* 80859ADC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859AE0 98 03 05 91 */ stb r0, 0x591(r3) -/* 80859AE4 38 00 00 00 */ li r0, 0 -/* 80859AE8 98 03 05 90 */ stb r0, 0x590(r3) -/* 80859AEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type06_init__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type06_init__FP10fopAc_ac_c.s deleted file mode 100644 index 7a57aa5229..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type06_init__FP10fopAc_ac_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80859AF0: -/* 80859AF0 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859AF4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80859AF8 98 03 05 95 */ stb r0, 0x595(r3) -/* 80859AFC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80859B00 98 03 05 91 */ stb r0, 0x591(r3) -/* 80859B04 38 00 00 00 */ li r0, 0 -/* 80859B08 98 03 05 90 */ stb r0, 0x590(r3) -/* 80859B0C 98 03 05 98 */ stb r0, 0x598(r3) -/* 80859B10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s deleted file mode 100644 index 3dcc8e3927..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,141 +0,0 @@ -lbl_8085931C: -/* 8085931C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80859320 7C 08 02 A6 */ mflr r0 -/* 80859324 90 01 00 14 */ stw r0, 0x14(r1) -/* 80859328 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8085932C 93 C1 00 08 */ stw r30, 8(r1) -/* 80859330 7C 7F 1B 78 */ mr r31, r3 -/* 80859334 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 80859338 3B C3 9E 78 */ addi r30, r3, lit_3740@l /* 0x80859E78@l */ -/* 8085933C 88 1F 05 97 */ lbz r0, 0x597(r31) -/* 80859340 28 00 00 00 */ cmplwi r0, 0 -/* 80859344 40 82 00 F4 */ bne lbl_80859438 -/* 80859348 88 BF 05 90 */ lbz r5, 0x590(r31) -/* 8085934C 2C 05 00 02 */ cmpwi r5, 2 -/* 80859350 41 82 00 AC */ beq lbl_808593FC -/* 80859354 40 80 01 BC */ bge lbl_80859510 -/* 80859358 2C 05 00 00 */ cmpwi r5, 0 -/* 8085935C 41 82 00 10 */ beq lbl_8085936C -/* 80859360 40 80 00 78 */ bge lbl_808593D8 -/* 80859364 48 00 01 AC */ b lbl_80859510 -/* 80859368 48 00 01 A8 */ b lbl_80859510 -lbl_8085936C: -/* 8085936C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80859370 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859374 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80859378 7F C3 F3 78 */ mr r3, r30 -/* 8085937C 38 80 0C 01 */ li r4, 0xc01 -/* 80859380 4B 7D B6 3D */ bl isEventBit__11dSv_event_cCFUs -/* 80859384 2C 03 00 00 */ cmpwi r3, 0 -/* 80859388 41 82 01 88 */ beq lbl_80859510 -/* 8085938C 7F C3 F3 78 */ mr r3, r30 -/* 80859390 38 80 1E 08 */ li r4, 0x1e08 -/* 80859394 4B 7D B6 29 */ bl isEventBit__11dSv_event_cCFUs -/* 80859398 2C 03 00 00 */ cmpwi r3, 0 -/* 8085939C 40 82 01 74 */ bne lbl_80859510 -/* 808593A0 38 00 00 01 */ li r0, 1 -/* 808593A4 98 1F 05 90 */ stb r0, 0x590(r31) -/* 808593A8 38 00 01 C2 */ li r0, 0x1c2 -/* 808593AC 90 1F 05 78 */ stw r0, 0x578(r31) -/* 808593B0 88 7F 05 91 */ lbz r3, 0x591(r31) -/* 808593B4 4B 94 F4 31 */ bl dKy_change_colpat__FUc -/* 808593B8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 808593BC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 808593C0 7C A5 07 74 */ extsb r5, r5 -/* 808593C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808593C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808593CC 88 9F 05 95 */ lbz r4, 0x595(r31) -/* 808593D0 4B 7D BE 31 */ bl onSwitch__10dSv_info_cFii -/* 808593D4 48 00 01 3C */ b lbl_80859510 -lbl_808593D8: -/* 808593D8 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 808593DC 38 03 FF FF */ addi r0, r3, -1 -/* 808593E0 90 1F 05 78 */ stw r0, 0x578(r31) -/* 808593E4 2C 03 00 00 */ cmpwi r3, 0 -/* 808593E8 41 81 01 28 */ bgt lbl_80859510 -/* 808593EC 88 7F 05 90 */ lbz r3, 0x590(r31) -/* 808593F0 38 03 00 01 */ addi r0, r3, 1 -/* 808593F4 98 1F 05 90 */ stb r0, 0x590(r31) -/* 808593F8 48 00 01 18 */ b lbl_80859510 -lbl_808593FC: -/* 808593FC 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80859400 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 80859404 54 00 07 7F */ clrlwi. r0, r0, 0x1d -/* 80859408 40 82 01 08 */ bne lbl_80859510 -/* 8085940C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859410 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859414 80 64 0E 80 */ lwz r3, 0xe80(r4) -/* 80859418 2C 03 00 FA */ cmpwi r3, 0xfa -/* 8085941C 40 80 00 10 */ bge lbl_8085942C -/* 80859420 38 03 00 01 */ addi r0, r3, 1 -/* 80859424 90 04 0E 80 */ stw r0, 0xe80(r4) -/* 80859428 48 00 00 E8 */ b lbl_80859510 -lbl_8085942C: -/* 8085942C 38 05 00 01 */ addi r0, r5, 1 -/* 80859430 98 1F 05 90 */ stb r0, 0x590(r31) -/* 80859434 48 00 00 DC */ b lbl_80859510 -lbl_80859438: -/* 80859438 28 00 00 02 */ cmplwi r0, 2 -/* 8085943C 40 82 00 D4 */ bne lbl_80859510 -/* 80859440 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80859444 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80859448 7C 00 07 75 */ extsb. r0, r0 -/* 8085944C 41 82 00 C4 */ beq lbl_80859510 -/* 80859450 88 1F 05 90 */ lbz r0, 0x590(r31) -/* 80859454 2C 00 00 01 */ cmpwi r0, 1 -/* 80859458 41 82 00 B8 */ beq lbl_80859510 -/* 8085945C 40 80 00 B4 */ bge lbl_80859510 -/* 80859460 2C 00 00 00 */ cmpwi r0, 0 -/* 80859464 40 80 00 08 */ bge lbl_8085946C -/* 80859468 48 00 00 A8 */ b lbl_80859510 -lbl_8085946C: -/* 8085946C 88 9F 05 95 */ lbz r4, 0x595(r31) -/* 80859470 28 04 00 FF */ cmplwi r4, 0xff -/* 80859474 41 82 00 7C */ beq lbl_808594F0 -/* 80859478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8085947C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80859480 88 BF 04 E2 */ lbz r5, 0x4e2(r31) -/* 80859484 7C A5 07 74 */ extsb r5, r5 -/* 80859488 4B 7D BE D9 */ bl isSwitch__10dSv_info_cCFii -/* 8085948C 2C 03 00 00 */ cmpwi r3, 0 -/* 80859490 41 82 00 60 */ beq lbl_808594F0 -/* 80859494 38 7F 05 6C */ addi r3, r31, 0x56c -/* 80859498 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8085949C C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 808594A0 C0 7E 00 40 */ lfs f3, 0x40(r30) -/* 808594A4 C0 9E 00 6C */ lfs f4, 0x6c(r30) -/* 808594A8 4B A1 64 D5 */ bl cLib_addCalc__FPfffff -/* 808594AC C0 3F 05 6C */ lfs f1, 0x56c(r31) -/* 808594B0 C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 808594B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808594B8 4C 41 13 82 */ cror 2, 1, 2 -/* 808594BC 40 82 00 20 */ bne lbl_808594DC -/* 808594C0 D0 1F 05 6C */ stfs f0, 0x56c(r31) -/* 808594C4 38 00 00 00 */ li r0, 0 -/* 808594C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808594CC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808594D0 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 808594D4 38 00 00 01 */ li r0, 1 -/* 808594D8 98 1F 05 90 */ stb r0, 0x590(r31) -lbl_808594DC: -/* 808594DC 88 7F 05 91 */ lbz r3, 0x591(r31) -/* 808594E0 38 80 00 00 */ li r4, 0 -/* 808594E4 C0 3F 05 6C */ lfs f1, 0x56c(r31) -/* 808594E8 4B 94 F3 25 */ bl dKy_custom_colset__FUcUcf -/* 808594EC 48 00 00 24 */ b lbl_80859510 -lbl_808594F0: -/* 808594F0 38 60 00 00 */ li r3, 0 -/* 808594F4 88 9F 05 91 */ lbz r4, 0x591(r31) -/* 808594F8 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 808594FC 4B 94 F3 11 */ bl dKy_custom_colset__FUcUcf -/* 80859500 88 1F 05 91 */ lbz r0, 0x591(r31) -/* 80859504 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859508 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085950C 98 03 12 C8 */ stb r0, 0x12c8(r3) -lbl_80859510: -/* 80859510 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80859514 83 C1 00 08 */ lwz r30, 8(r1) -/* 80859518 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8085951C 7C 08 03 A6 */ mtlr r0 -/* 80859520 38 21 00 10 */ addi r1, r1, 0x10 -/* 80859524 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_04_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_04_Execute__FP13kytag06_class.s deleted file mode 100644 index 4ad107cf58..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_04_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80857F28: -/* 80857F28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80857F2C 7C 08 02 A6 */ mflr r0 -/* 80857F30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80857F34 4B FF FB 1D */ bl dKy_event_proc__Fv -/* 80857F38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80857F3C 7C 08 03 A6 */ mtlr r0 -/* 80857F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80857F44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_05_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_05_Execute__FP13kytag06_class.s deleted file mode 100644 index 4ef22c513e..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_05_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_808591A4: -/* 808591A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 808591A8 7C 08 02 A6 */ mflr r0 -/* 808591AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 808591B0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 808591B4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 808591B8 7C 7E 1B 78 */ mr r30, r3 -/* 808591BC 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 808591C0 3B E3 9E 78 */ addi r31, r3, lit_3740@l /* 0x80859E78@l */ -/* 808591C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808591C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808591CC 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 808591D0 28 03 00 00 */ cmplwi r3, 0 -/* 808591D4 41 82 01 30 */ beq lbl_80859304 -/* 808591D8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 808591DC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 808591E0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 808591E4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808591E8 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 808591EC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 808591F0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 808591F4 38 81 00 0C */ addi r4, r1, 0xc -/* 808591F8 4B AE E1 A5 */ bl PSVECSquareDistance -/* 808591FC C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80859200 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80859204 40 81 00 58 */ ble lbl_8085925C -/* 80859208 FC 00 08 34 */ frsqrte f0, f1 -/* 8085920C C8 9F 00 20 */ lfd f4, 0x20(r31) -/* 80859210 FC 44 00 32 */ fmul f2, f4, f0 -/* 80859214 C8 7F 00 28 */ lfd f3, 0x28(r31) -/* 80859218 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085921C FC 01 00 32 */ fmul f0, f1, f0 -/* 80859220 FC 03 00 28 */ fsub f0, f3, f0 -/* 80859224 FC 02 00 32 */ fmul f0, f2, f0 -/* 80859228 FC 44 00 32 */ fmul f2, f4, f0 -/* 8085922C FC 00 00 32 */ fmul f0, f0, f0 -/* 80859230 FC 01 00 32 */ fmul f0, f1, f0 -/* 80859234 FC 03 00 28 */ fsub f0, f3, f0 -/* 80859238 FC 02 00 32 */ fmul f0, f2, f0 -/* 8085923C FC 44 00 32 */ fmul f2, f4, f0 -/* 80859240 FC 00 00 32 */ fmul f0, f0, f0 -/* 80859244 FC 01 00 32 */ fmul f0, f1, f0 -/* 80859248 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085924C FC 02 00 32 */ fmul f0, f2, f0 -/* 80859250 FC 21 00 32 */ fmul f1, f1, f0 -/* 80859254 FC 20 08 18 */ frsp f1, f1 -/* 80859258 48 00 00 88 */ b lbl_808592E0 -lbl_8085925C: -/* 8085925C C8 1F 00 30 */ lfd f0, 0x30(r31) -/* 80859260 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80859264 40 80 00 10 */ bge lbl_80859274 -/* 80859268 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8085926C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80859270 48 00 00 70 */ b lbl_808592E0 -lbl_80859274: -/* 80859274 D0 21 00 08 */ stfs f1, 8(r1) -/* 80859278 80 81 00 08 */ lwz r4, 8(r1) -/* 8085927C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80859280 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80859284 7C 03 00 00 */ cmpw r3, r0 -/* 80859288 41 82 00 14 */ beq lbl_8085929C -/* 8085928C 40 80 00 40 */ bge lbl_808592CC -/* 80859290 2C 03 00 00 */ cmpwi r3, 0 -/* 80859294 41 82 00 20 */ beq lbl_808592B4 -/* 80859298 48 00 00 34 */ b lbl_808592CC -lbl_8085929C: -/* 8085929C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 808592A0 41 82 00 0C */ beq lbl_808592AC -/* 808592A4 38 00 00 01 */ li r0, 1 -/* 808592A8 48 00 00 28 */ b lbl_808592D0 -lbl_808592AC: -/* 808592AC 38 00 00 02 */ li r0, 2 -/* 808592B0 48 00 00 20 */ b lbl_808592D0 -lbl_808592B4: -/* 808592B4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 808592B8 41 82 00 0C */ beq lbl_808592C4 -/* 808592BC 38 00 00 05 */ li r0, 5 -/* 808592C0 48 00 00 10 */ b lbl_808592D0 -lbl_808592C4: -/* 808592C4 38 00 00 03 */ li r0, 3 -/* 808592C8 48 00 00 08 */ b lbl_808592D0 -lbl_808592CC: -/* 808592CC 38 00 00 04 */ li r0, 4 -lbl_808592D0: -/* 808592D0 2C 00 00 01 */ cmpwi r0, 1 -/* 808592D4 40 82 00 0C */ bne lbl_808592E0 -/* 808592D8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 808592DC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_808592E0: -/* 808592E0 C0 5F 00 F8 */ lfs f2, 0xf8(r31) -/* 808592E4 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 808592E8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 808592EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808592F0 40 80 00 14 */ bge lbl_80859304 -/* 808592F4 38 00 00 01 */ li r0, 1 -/* 808592F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808592FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859300 98 03 13 0B */ stb r0, 0x130b(r3) -lbl_80859304: -/* 80859304 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80859308 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8085930C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80859310 7C 08 03 A6 */ mtlr r0 -/* 80859314 38 21 00 20 */ addi r1, r1, 0x20 -/* 80859318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_06_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_06_Execute__FP13kytag06_class.s deleted file mode 100644 index 7e72537cde..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_06_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_808589E0: -/* 808589E0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 808589E4 7C 08 02 A6 */ mflr r0 -/* 808589E8 90 01 00 64 */ stw r0, 0x64(r1) -/* 808589EC 39 61 00 60 */ addi r11, r1, 0x60 -/* 808589F0 4B B0 97 D5 */ bl _savegpr_23 -/* 808589F4 7C 7D 1B 78 */ mr r29, r3 -/* 808589F8 3C 80 80 86 */ lis r4, lit_1109@ha /* 0x8085A130@ha */ -/* 808589FC 3B C4 A1 30 */ addi r30, r4, lit_1109@l /* 0x8085A130@l */ -/* 80858A00 3C 80 80 86 */ lis r4, lit_3740@ha /* 0x80859E78@ha */ -/* 80858A04 3B E4 9E 78 */ addi r31, r4, lit_3740@l /* 0x80859E78@l */ -/* 80858A08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858A0C 3B 24 61 C0 */ addi r25, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858A10 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858A14 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80858A18 88 84 12 CC */ lbz r4, 0x12cc(r4) -/* 80858A1C 4B FF FA 99 */ bl daKytag06_wether_proc__FP13kytag06_classUc -/* 80858A20 C0 39 00 34 */ lfs f1, 0x34(r25) -/* 80858A24 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 80858A28 2C 00 00 00 */ cmpwi r0, 0 -/* 80858A2C 40 82 00 30 */ bne lbl_80858A5C -/* 80858A30 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80858A34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858A38 41 81 00 10 */ bgt lbl_80858A48 -/* 80858A3C C0 1F 00 64 */ lfs f0, 0x64(r31) -/* 80858A40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858A44 40 80 00 10 */ bge lbl_80858A54 -lbl_80858A48: -/* 80858A48 38 00 00 01 */ li r0, 1 -/* 80858A4C 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80858A50 48 00 00 0C */ b lbl_80858A5C -lbl_80858A54: -/* 80858A54 38 00 00 00 */ li r0, 0 -/* 80858A58 98 1D 05 91 */ stb r0, 0x591(r29) -lbl_80858A5C: -/* 80858A5C 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 80858A60 2C 00 00 02 */ cmpwi r0, 2 -/* 80858A64 41 82 00 A0 */ beq lbl_80858B04 -/* 80858A68 40 80 00 14 */ bge lbl_80858A7C -/* 80858A6C 2C 00 00 00 */ cmpwi r0, 0 -/* 80858A70 41 82 00 18 */ beq lbl_80858A88 -/* 80858A74 40 80 00 58 */ bge lbl_80858ACC -/* 80858A78 48 00 01 10 */ b lbl_80858B88 -lbl_80858A7C: -/* 80858A7C 2C 00 00 04 */ cmpwi r0, 4 -/* 80858A80 40 80 01 08 */ bge lbl_80858B88 -/* 80858A84 48 00 00 C0 */ b lbl_80858B44 -lbl_80858A88: -/* 80858A88 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 80858A8C 28 00 00 00 */ cmplwi r0, 0 -/* 80858A90 41 82 00 F8 */ beq lbl_80858B88 -/* 80858A94 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858A98 C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 80858A9C C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858AA0 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80858AA4 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858AA8 4B A1 6E D5 */ bl cLib_addCalc__FPfffff -/* 80858AAC C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858AB0 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80858AB4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858AB8 40 81 00 D0 */ ble lbl_80858B88 -/* 80858ABC 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 80858AC0 38 03 00 01 */ addi r0, r3, 1 -/* 80858AC4 98 1D 05 90 */ stb r0, 0x590(r29) -/* 80858AC8 48 00 00 C0 */ b lbl_80858B88 -lbl_80858ACC: -/* 80858ACC 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858AD0 C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 80858AD4 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858AD8 C0 7F 00 78 */ lfs f3, 0x78(r31) -/* 80858ADC C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858AE0 4B A1 6E 9D */ bl cLib_addCalc__FPfffff -/* 80858AE4 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858AE8 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80858AEC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858AF0 40 80 00 98 */ bge lbl_80858B88 -/* 80858AF4 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 80858AF8 38 03 00 01 */ addi r0, r3, 1 -/* 80858AFC 98 1D 05 90 */ stb r0, 0x590(r29) -/* 80858B00 48 00 00 88 */ b lbl_80858B88 -lbl_80858B04: -/* 80858B04 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858B08 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80858B0C C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858B10 C0 7F 00 78 */ lfs f3, 0x78(r31) -/* 80858B14 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858B18 4B A1 6E 65 */ bl cLib_addCalc__FPfffff -/* 80858B1C C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858B20 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80858B24 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858B28 40 81 00 60 */ ble lbl_80858B88 -/* 80858B2C C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80858B30 D0 1D 05 6C */ stfs f0, 0x56c(r29) -/* 80858B34 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 80858B38 38 03 00 01 */ addi r0, r3, 1 -/* 80858B3C 98 1D 05 90 */ stb r0, 0x590(r29) -/* 80858B40 48 00 00 48 */ b lbl_80858B88 -lbl_80858B44: -/* 80858B44 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 80858B48 28 00 00 00 */ cmplwi r0, 0 -/* 80858B4C 40 82 00 3C */ bne lbl_80858B88 -/* 80858B50 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858B54 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80858B58 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858B5C C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 80858B60 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858B64 4B A1 6E 19 */ bl cLib_addCalc__FPfffff -/* 80858B68 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858B6C C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80858B70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858B74 40 80 00 14 */ bge lbl_80858B88 -/* 80858B78 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80858B7C D0 1D 05 6C */ stfs f0, 0x56c(r29) -/* 80858B80 38 00 00 00 */ li r0, 0 -/* 80858B84 98 1D 05 90 */ stb r0, 0x590(r29) -lbl_80858B88: -/* 80858B88 C0 3F 00 A4 */ lfs f1, 0xa4(r31) -/* 80858B8C C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80858B90 C0 5D 05 6C */ lfs f2, 0x56c(r29) -/* 80858B94 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858B98 EC 01 00 2A */ fadds f0, f1, f0 -/* 80858B9C FC 00 00 1E */ fctiwz f0, f0 -/* 80858BA0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80858BA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80858BA8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80858BAC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858BB0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858BB4 B0 03 11 20 */ sth r0, 0x1120(r3) -/* 80858BB8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80858BBC C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80858BC0 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858BC4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80858BC8 FC 00 00 1E */ fctiwz f0, f0 -/* 80858BCC D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80858BD0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80858BD4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80858BD8 B0 03 11 22 */ sth r0, 0x1122(r3) -/* 80858BDC C0 3F 00 B0 */ lfs f1, 0xb0(r31) -/* 80858BE0 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 80858BE4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858BE8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80858BEC FC 00 00 1E */ fctiwz f0, f0 -/* 80858BF0 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80858BF4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80858BF8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80858BFC B0 03 11 24 */ sth r0, 0x1124(r3) -/* 80858C00 88 1E 00 4C */ lbz r0, 0x4c(r30) -/* 80858C04 7C 00 07 75 */ extsb. r0, r0 -/* 80858C08 40 82 00 30 */ bne lbl_80858C38 -/* 80858C0C C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80858C10 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 80858C14 38 7E 00 50 */ addi r3, r30, 0x50 -/* 80858C18 D0 03 00 04 */ stfs f0, 4(r3) -/* 80858C1C D0 03 00 08 */ stfs f0, 8(r3) -/* 80858C20 3C 80 80 86 */ lis r4, __dt__4cXyzFv@ha /* 0x808589A4@ha */ -/* 80858C24 38 84 89 A4 */ addi r4, r4, __dt__4cXyzFv@l /* 0x808589A4@l */ -/* 80858C28 38 BE 00 40 */ addi r5, r30, 0x40 -/* 80858C2C 4B FF EB CD */ bl __register_global_object -/* 80858C30 38 00 00 01 */ li r0, 1 -/* 80858C34 98 1E 00 4C */ stb r0, 0x4c(r30) -lbl_80858C38: -/* 80858C38 3A E0 00 00 */ li r23, 0 -/* 80858C3C 3B 80 00 00 */ li r28, 0 -/* 80858C40 3B 60 00 00 */ li r27, 0 -/* 80858C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858C48 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858C4C 3C 60 80 86 */ lis r3, w_eff_name@ha /* 0x8085A06C@ha */ -/* 80858C50 3B 43 A0 6C */ addi r26, r3, w_eff_name@l /* 0x8085A06C@l */ -lbl_80858C54: -/* 80858C54 80 79 5D 3C */ lwz r3, 0x5d3c(r25) -/* 80858C58 38 00 00 FF */ li r0, 0xff -/* 80858C5C 90 01 00 08 */ stw r0, 8(r1) -/* 80858C60 38 80 00 00 */ li r4, 0 -/* 80858C64 90 81 00 0C */ stw r4, 0xc(r1) -/* 80858C68 38 00 FF FF */ li r0, -1 -/* 80858C6C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80858C70 90 81 00 14 */ stw r4, 0x14(r1) -/* 80858C74 90 81 00 18 */ stw r4, 0x18(r1) -/* 80858C78 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80858C7C 3B 1B 05 80 */ addi r24, r27, 0x580 -/* 80858C80 7C 9D C0 2E */ lwzx r4, r29, r24 -/* 80858C84 38 A0 00 00 */ li r5, 0 -/* 80858C88 7C DA E2 2E */ lhzx r6, r26, r28 -/* 80858C8C 38 FE 00 50 */ addi r7, r30, 0x50 -/* 80858C90 39 00 00 00 */ li r8, 0 -/* 80858C94 39 20 00 00 */ li r9, 0 -/* 80858C98 39 40 00 00 */ li r10, 0 -/* 80858C9C C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80858CA0 4B 7F 48 2D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80858CA4 7C 7D C1 2E */ stwx r3, r29, r24 -/* 80858CA8 3A F7 00 01 */ addi r23, r23, 1 -/* 80858CAC 2C 17 00 04 */ cmpwi r23, 4 -/* 80858CB0 3B 9C 00 02 */ addi r28, r28, 2 -/* 80858CB4 3B 7B 00 04 */ addi r27, r27, 4 -/* 80858CB8 41 80 FF 9C */ blt lbl_80858C54 -/* 80858CBC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80858CC0 4B B0 95 51 */ bl _restgpr_23 -/* 80858CC4 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80858CC8 7C 08 03 A6 */ mtlr r0 -/* 80858CCC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80858CD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_Execute__FP13kytag06_class.s deleted file mode 100644 index f692426bd9..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,185 +0,0 @@ -lbl_808586F0: -/* 808586F0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 808586F4 7C 08 02 A6 */ mflr r0 -/* 808586F8 90 01 00 44 */ stw r0, 0x44(r1) -/* 808586FC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80858700 4B B0 9A DD */ bl _savegpr_29 -/* 80858704 7C 7D 1B 78 */ mr r29, r3 -/* 80858708 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 8085870C 3B E3 9E 78 */ addi r31, r3, lit_3740@l /* 0x80859E78@l */ -/* 80858710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858718 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 8085871C 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 80858720 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 80858724 2C 00 00 00 */ cmpwi r0, 0 -/* 80858728 40 82 00 30 */ bne lbl_80858758 -/* 8085872C C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80858730 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858734 41 81 00 10 */ bgt lbl_80858744 -/* 80858738 C0 1F 00 64 */ lfs f0, 0x64(r31) -/* 8085873C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858740 40 80 00 10 */ bge lbl_80858750 -lbl_80858744: -/* 80858744 38 00 00 01 */ li r0, 1 -/* 80858748 98 1D 05 91 */ stb r0, 0x591(r29) -/* 8085874C 48 00 00 0C */ b lbl_80858758 -lbl_80858750: -/* 80858750 38 00 00 00 */ li r0, 0 -/* 80858754 98 1D 05 91 */ stb r0, 0x591(r29) -lbl_80858758: -/* 80858758 88 1D 05 90 */ lbz r0, 0x590(r29) -/* 8085875C 2C 00 00 02 */ cmpwi r0, 2 -/* 80858760 41 82 00 A0 */ beq lbl_80858800 -/* 80858764 40 80 00 14 */ bge lbl_80858778 -/* 80858768 2C 00 00 00 */ cmpwi r0, 0 -/* 8085876C 41 82 00 18 */ beq lbl_80858784 -/* 80858770 40 80 00 58 */ bge lbl_808587C8 -/* 80858774 48 00 01 10 */ b lbl_80858884 -lbl_80858778: -/* 80858778 2C 00 00 04 */ cmpwi r0, 4 -/* 8085877C 40 80 01 08 */ bge lbl_80858884 -/* 80858780 48 00 00 C0 */ b lbl_80858840 -lbl_80858784: -/* 80858784 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 80858788 28 00 00 00 */ cmplwi r0, 0 -/* 8085878C 41 82 00 F8 */ beq lbl_80858884 -/* 80858790 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858794 C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 80858798 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 8085879C C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 808587A0 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 808587A4 4B A1 71 D9 */ bl cLib_addCalc__FPfffff -/* 808587A8 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 808587AC C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 808587B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808587B4 40 81 00 D0 */ ble lbl_80858884 -/* 808587B8 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 808587BC 38 03 00 01 */ addi r0, r3, 1 -/* 808587C0 98 1D 05 90 */ stb r0, 0x590(r29) -/* 808587C4 48 00 00 C0 */ b lbl_80858884 -lbl_808587C8: -/* 808587C8 38 7D 05 6C */ addi r3, r29, 0x56c -/* 808587CC C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 808587D0 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 808587D4 C0 7F 00 78 */ lfs f3, 0x78(r31) -/* 808587D8 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 808587DC 4B A1 71 A1 */ bl cLib_addCalc__FPfffff -/* 808587E0 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 808587E4 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 808587E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808587EC 40 80 00 98 */ bge lbl_80858884 -/* 808587F0 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 808587F4 38 03 00 01 */ addi r0, r3, 1 -/* 808587F8 98 1D 05 90 */ stb r0, 0x590(r29) -/* 808587FC 48 00 00 88 */ b lbl_80858884 -lbl_80858800: -/* 80858800 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858804 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80858808 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 8085880C C0 7F 00 78 */ lfs f3, 0x78(r31) -/* 80858810 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858814 4B A1 71 69 */ bl cLib_addCalc__FPfffff -/* 80858818 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 8085881C C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80858820 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858824 40 81 00 60 */ ble lbl_80858884 -/* 80858828 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8085882C D0 1D 05 6C */ stfs f0, 0x56c(r29) -/* 80858830 88 7D 05 90 */ lbz r3, 0x590(r29) -/* 80858834 38 03 00 01 */ addi r0, r3, 1 -/* 80858838 98 1D 05 90 */ stb r0, 0x590(r29) -/* 8085883C 48 00 00 48 */ b lbl_80858884 -lbl_80858840: -/* 80858840 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 80858844 28 00 00 00 */ cmplwi r0, 0 -/* 80858848 40 82 00 3C */ bne lbl_80858884 -/* 8085884C 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858850 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80858854 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858858 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 8085885C C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 80858860 4B A1 71 1D */ bl cLib_addCalc__FPfffff -/* 80858864 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858868 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 8085886C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858870 40 80 00 14 */ bge lbl_80858884 -/* 80858874 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 80858878 D0 1D 05 6C */ stfs f0, 0x56c(r29) -/* 8085887C 38 00 00 00 */ li r0, 0 -/* 80858880 98 1D 05 90 */ stb r0, 0x590(r29) -lbl_80858884: -/* 80858884 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80858888 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8085888C C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80858890 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80858894 C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 80858898 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8085889C 38 00 00 58 */ li r0, 0x58 -/* 808588A0 98 01 00 08 */ stb r0, 8(r1) -/* 808588A4 38 00 00 4C */ li r0, 0x4c -/* 808588A8 98 01 00 09 */ stb r0, 9(r1) -/* 808588AC 38 00 00 32 */ li r0, 0x32 -/* 808588B0 98 01 00 0A */ stb r0, 0xa(r1) -/* 808588B4 38 00 00 FF */ li r0, 0xff -/* 808588B8 98 01 00 0B */ stb r0, 0xb(r1) -/* 808588BC 7F A3 EB 78 */ mr r3, r29 -/* 808588C0 4B FF FE 05 */ bl daKytag06_type_07_wether_Execute__FP13kytag06_class -/* 808588C4 28 1E 00 00 */ cmplwi r30, 0 -/* 808588C8 41 82 00 C4 */ beq lbl_8085898C -/* 808588CC C0 3E 00 DC */ lfs f1, 0xdc(r30) -/* 808588D0 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 808588D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808588D8 40 81 00 98 */ ble lbl_80858970 -/* 808588DC 38 61 00 0C */ addi r3, r1, 0xc -/* 808588E0 38 81 00 08 */ addi r4, r1, 8 -/* 808588E4 C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 808588E8 C0 1D 05 6C */ lfs f0, 0x56c(r29) -/* 808588EC EC 21 00 32 */ fmuls f1, f1, f0 -/* 808588F0 38 A0 00 00 */ li r5, 0 -/* 808588F4 4B 95 14 6D */ bl dKy_BossLight_set__FP4cXyzP8_GXColorfUc -/* 808588F8 C0 7F 00 90 */ lfs f3, 0x90(r31) -/* 808588FC C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80858900 C0 5D 05 6C */ lfs f2, 0x56c(r29) -/* 80858904 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858908 EC 03 00 2A */ fadds f0, f3, f0 -/* 8085890C FC 00 00 1E */ fctiwz f0, f0 -/* 80858910 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80858914 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80858918 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8085891C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858920 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858924 B0 03 11 20 */ sth r0, 0x1120(r3) -/* 80858928 C0 3F 00 98 */ lfs f1, 0x98(r31) -/* 8085892C C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80858930 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858934 EC 01 00 2A */ fadds f0, f1, f0 -/* 80858938 FC 00 00 1E */ fctiwz f0, f0 -/* 8085893C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80858940 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80858944 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80858948 B0 03 11 22 */ sth r0, 0x1122(r3) -/* 8085894C C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80858950 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80858954 EC 03 00 2A */ fadds f0, f3, f0 -/* 80858958 FC 00 00 1E */ fctiwz f0, f0 -/* 8085895C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80858960 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80858964 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80858968 B0 03 11 24 */ sth r0, 0x1124(r3) -/* 8085896C 48 00 00 20 */ b lbl_8085898C -lbl_80858970: -/* 80858970 38 00 00 00 */ li r0, 0 -/* 80858974 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858978 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085897C B0 03 11 20 */ sth r0, 0x1120(r3) -/* 80858980 B0 03 11 22 */ sth r0, 0x1122(r3) -/* 80858984 B0 03 11 24 */ sth r0, 0x1124(r3) -/* 80858988 90 03 0E D8 */ stw r0, 0xed8(r3) -lbl_8085898C: -/* 8085898C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80858990 4B B0 98 99 */ bl _restgpr_29 -/* 80858994 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80858998 7C 08 03 A6 */ mtlr r0 -/* 8085899C 38 21 00 40 */ addi r1, r1, 0x40 -/* 808589A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_wether_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_wether_Execute__FP13kytag06_class.s deleted file mode 100644 index 8265026114..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_wether_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_808586C4: -/* 808586C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808586C8 7C 08 02 A6 */ mflr r0 -/* 808586CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 808586D0 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 808586D4 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 808586D8 88 84 12 CC */ lbz r4, 0x12cc(r4) -/* 808586DC 4B FF FD D9 */ bl daKytag06_wether_proc__FP13kytag06_classUc -/* 808586E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808586E4 7C 08 03 A6 */ mtlr r0 -/* 808586E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 808586EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_08_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_08_Execute__FP13kytag06_class.s deleted file mode 100644 index ba9045cce9..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_08_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80858CD4: -/* 80858CD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80858CD8 7C 08 02 A6 */ mflr r0 -/* 80858CDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80858CE0 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858CE4 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80858CE8 88 84 12 CC */ lbz r4, 0x12cc(r4) -/* 80858CEC 4B FF F4 61 */ bl daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc -/* 80858CF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80858CF4 7C 08 03 A6 */ mtlr r0 -/* 80858CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80858CFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_09_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_09_Execute__FP13kytag06_class.s deleted file mode 100644 index 1146597bc9..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_09_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80858D00: -/* 80858D00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80858D04 7C 08 02 A6 */ mflr r0 -/* 80858D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80858D0C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858D10 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80858D14 88 84 12 CC */ lbz r4, 0x12cc(r4) -/* 80858D18 4B FF F5 35 */ bl daKytag06_Ganon_wether_proc__FP13kytag06_classUc -/* 80858D1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80858D20 7C 08 03 A6 */ mtlr r0 -/* 80858D24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80858D28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s deleted file mode 100644 index ec347b5f0e..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,282 +0,0 @@ -lbl_80858D2C: -/* 80858D2C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80858D30 7C 08 02 A6 */ mflr r0 -/* 80858D34 90 01 00 44 */ stw r0, 0x44(r1) -/* 80858D38 39 61 00 40 */ addi r11, r1, 0x40 -/* 80858D3C 4B B0 94 9D */ bl _savegpr_28 -/* 80858D40 7C 7D 1B 78 */ mr r29, r3 -/* 80858D44 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 80858D48 3B E3 9E 78 */ addi r31, r3, lit_3740@l /* 0x80859E78@l */ -/* 80858D4C 3B 80 00 00 */ li r28, 0 -/* 80858D50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858D54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858D58 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 80858D5C 7F C3 F3 78 */ mr r3, r30 -/* 80858D60 38 80 20 08 */ li r4, 0x2008 -/* 80858D64 4B 7D BC 59 */ bl isEventBit__11dSv_event_cCFUs -/* 80858D68 2C 03 00 00 */ cmpwi r3, 0 -/* 80858D6C 41 82 00 0C */ beq lbl_80858D78 -/* 80858D70 3B 80 00 00 */ li r28, 0 -/* 80858D74 48 00 00 38 */ b lbl_80858DAC -lbl_80858D78: -/* 80858D78 7F C3 F3 78 */ mr r3, r30 -/* 80858D7C 38 80 14 20 */ li r4, 0x1420 -/* 80858D80 4B 7D BC 3D */ bl isEventBit__11dSv_event_cCFUs -/* 80858D84 2C 03 00 00 */ cmpwi r3, 0 -/* 80858D88 41 82 00 0C */ beq lbl_80858D94 -/* 80858D8C 3B 80 00 02 */ li r28, 2 -/* 80858D90 48 00 00 1C */ b lbl_80858DAC -lbl_80858D94: -/* 80858D94 7F C3 F3 78 */ mr r3, r30 -/* 80858D98 38 80 14 40 */ li r4, 0x1440 -/* 80858D9C 4B 7D BC 21 */ bl isEventBit__11dSv_event_cCFUs -/* 80858DA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80858DA4 41 82 00 08 */ beq lbl_80858DAC -/* 80858DA8 3B 80 00 01 */ li r28, 1 -lbl_80858DAC: -/* 80858DAC 57 9E 06 3E */ clrlwi r30, r28, 0x18 -/* 80858DB0 2C 1E 00 01 */ cmpwi r30, 1 -/* 80858DB4 41 82 00 2C */ beq lbl_80858DE0 -/* 80858DB8 40 80 00 10 */ bge lbl_80858DC8 -/* 80858DBC 2C 1E 00 00 */ cmpwi r30, 0 -/* 80858DC0 40 80 00 14 */ bge lbl_80858DD4 -/* 80858DC4 48 00 00 34 */ b lbl_80858DF8 -lbl_80858DC8: -/* 80858DC8 2C 1E 00 03 */ cmpwi r30, 3 -/* 80858DCC 40 80 00 2C */ bge lbl_80858DF8 -/* 80858DD0 48 00 00 1C */ b lbl_80858DEC -lbl_80858DD4: -/* 80858DD4 38 60 00 00 */ li r3, 0 -/* 80858DD8 4B 94 FA 0D */ bl dKy_change_colpat__FUc -/* 80858DDC 48 00 00 24 */ b lbl_80858E00 -lbl_80858DE0: -/* 80858DE0 38 60 00 01 */ li r3, 1 -/* 80858DE4 4B 94 FA 01 */ bl dKy_change_colpat__FUc -/* 80858DE8 48 00 00 18 */ b lbl_80858E00 -lbl_80858DEC: -/* 80858DEC 38 60 00 02 */ li r3, 2 -/* 80858DF0 4B 94 F9 F5 */ bl dKy_change_colpat__FUc -/* 80858DF4 48 00 00 0C */ b lbl_80858E00 -lbl_80858DF8: -/* 80858DF8 38 60 00 00 */ li r3, 0 -/* 80858DFC 4B 94 F9 E9 */ bl dKy_change_colpat__FUc -lbl_80858E00: -/* 80858E00 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80858E04 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80858E08 2C 00 00 04 */ cmpwi r0, 4 -/* 80858E0C 40 82 02 0C */ bne lbl_80859018 -/* 80858E10 38 C0 00 00 */ li r6, 0 -/* 80858E14 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858E18 38 A3 CA 54 */ addi r5, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858E1C 98 C5 0E 90 */ stb r6, 0xe90(r5) -/* 80858E20 80 05 0E 8C */ lwz r0, 0xe8c(r5) -/* 80858E24 2C 00 00 00 */ cmpwi r0, 0 -/* 80858E28 40 82 00 40 */ bne lbl_80858E68 -/* 80858E2C 88 05 0E 88 */ lbz r0, 0xe88(r5) -/* 80858E30 28 00 00 00 */ cmplwi r0, 0 -/* 80858E34 41 82 00 34 */ beq lbl_80858E68 -/* 80858E38 80 65 0E 94 */ lwz r3, 0xe94(r5) -/* 80858E3C 28 03 00 00 */ cmplwi r3, 0 -/* 80858E40 41 82 00 28 */ beq lbl_80858E68 -/* 80858E44 B0 C3 6D 88 */ sth r6, 0x6d88(r3) -/* 80858E48 7C C3 33 78 */ mr r3, r6 -/* 80858E4C 38 00 01 F4 */ li r0, 0x1f4 -/* 80858E50 7C 09 03 A6 */ mtctr r0 -lbl_80858E54: -/* 80858E54 80 85 0E 94 */ lwz r4, 0xe94(r5) -/* 80858E58 38 03 00 14 */ addi r0, r3, 0x14 -/* 80858E5C 7C C4 01 AE */ stbx r6, r4, r0 -/* 80858E60 38 63 00 38 */ addi r3, r3, 0x38 -/* 80858E64 42 00 FF F0 */ bdnz lbl_80858E54 -lbl_80858E68: -/* 80858E68 4B 80 27 D1 */ bl dKyw_evt_wind_set_go__Fv -/* 80858E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80858E70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80858E74 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 80858E78 C0 63 00 D8 */ lfs f3, 0xd8(r3) -/* 80858E7C D0 61 00 08 */ stfs f3, 8(r1) -/* 80858E80 C0 43 00 DC */ lfs f2, 0xdc(r3) -/* 80858E84 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80858E88 C0 23 00 E0 */ lfs f1, 0xe0(r3) -/* 80858E8C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80858E90 28 03 00 00 */ cmplwi r3, 0 -/* 80858E94 41 82 01 A8 */ beq lbl_8085903C -/* 80858E98 C0 1F 00 B8 */ lfs f0, 0xb8(r31) -/* 80858E9C FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80858EA0 40 81 00 34 */ ble lbl_80858ED4 -/* 80858EA4 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 80858EA8 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80858EAC 40 80 00 28 */ bge lbl_80858ED4 -/* 80858EB0 C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 80858EB4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80858EB8 40 80 00 1C */ bge lbl_80858ED4 -/* 80858EBC C0 1F 00 C4 */ lfs f0, 0xc4(r31) -/* 80858EC0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858EC4 40 81 00 10 */ ble lbl_80858ED4 -/* 80858EC8 C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 80858ECC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858ED0 41 80 00 54 */ blt lbl_80858F24 -lbl_80858ED4: -/* 80858ED4 C0 1F 00 CC */ lfs f0, 0xcc(r31) -/* 80858ED8 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80858EDC 41 80 00 48 */ blt lbl_80858F24 -/* 80858EE0 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 80858EE4 C0 1F 00 D0 */ lfs f0, 0xd0(r31) -/* 80858EE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858EEC 41 81 00 38 */ bgt lbl_80858F24 -/* 80858EF0 C0 1F 00 C4 */ lfs f0, 0xc4(r31) -/* 80858EF4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858EF8 41 80 00 2C */ blt lbl_80858F24 -/* 80858EFC C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 80858F00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858F04 40 80 00 3C */ bge lbl_80858F40 -/* 80858F08 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80858F0C C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 80858F10 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80858F14 40 80 00 2C */ bge lbl_80858F40 -/* 80858F18 C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 80858F1C FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80858F20 40 80 00 20 */ bge lbl_80858F40 -lbl_80858F24: -/* 80858F24 38 7D 05 70 */ addi r3, r29, 0x570 -/* 80858F28 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80858F2C C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80858F30 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80858F34 C0 9F 00 40 */ lfs f4, 0x40(r31) -/* 80858F38 4B A1 6A 45 */ bl cLib_addCalc__FPfffff -/* 80858F3C 48 00 00 1C */ b lbl_80858F58 -lbl_80858F40: -/* 80858F40 38 7D 05 70 */ addi r3, r29, 0x570 -/* 80858F44 C0 3D 05 6C */ lfs f1, 0x56c(r29) -/* 80858F48 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858F4C FC 60 10 90 */ fmr f3, f2 -/* 80858F50 C0 9F 00 DC */ lfs f4, 0xdc(r31) -/* 80858F54 4B A1 6A 29 */ bl cLib_addCalc__FPfffff -lbl_80858F58: -/* 80858F58 2C 1E 00 01 */ cmpwi r30, 1 -/* 80858F5C 41 82 00 54 */ beq lbl_80858FB0 -/* 80858F60 40 80 00 10 */ bge lbl_80858F70 -/* 80858F64 2C 1E 00 00 */ cmpwi r30, 0 -/* 80858F68 40 80 00 14 */ bge lbl_80858F7C -/* 80858F6C 48 00 00 D0 */ b lbl_8085903C -lbl_80858F70: -/* 80858F70 2C 1E 00 03 */ cmpwi r30, 3 -/* 80858F74 40 80 00 C8 */ bge lbl_8085903C -/* 80858F78 48 00 00 6C */ b lbl_80858FE4 -lbl_80858F7C: -/* 80858F7C 38 00 00 00 */ li r0, 0 -/* 80858F80 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858F84 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858F88 98 03 0E 92 */ stb r0, 0xe92(r3) -/* 80858F8C 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858F90 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80858F94 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858F98 C0 7F 00 58 */ lfs f3, 0x58(r31) -/* 80858F9C C0 9F 00 DC */ lfs f4, 0xdc(r31) -/* 80858FA0 4B A1 69 DD */ bl cLib_addCalc__FPfffff -/* 80858FA4 C0 3F 00 E0 */ lfs f1, 0xe0(r31) -/* 80858FA8 4B 80 26 65 */ bl dKyw_custom_windpower__Ff -/* 80858FAC 48 00 00 90 */ b lbl_8085903C -lbl_80858FB0: -/* 80858FB0 38 00 00 00 */ li r0, 0 -/* 80858FB4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858FB8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858FBC 98 03 0E 92 */ stb r0, 0xe92(r3) -/* 80858FC0 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858FC4 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80858FC8 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80858FCC C0 7F 00 58 */ lfs f3, 0x58(r31) -/* 80858FD0 C0 9F 00 DC */ lfs f4, 0xdc(r31) -/* 80858FD4 4B A1 69 A9 */ bl cLib_addCalc__FPfffff -/* 80858FD8 C0 3F 00 E4 */ lfs f1, 0xe4(r31) -/* 80858FDC 4B 80 26 31 */ bl dKyw_custom_windpower__Ff -/* 80858FE0 48 00 00 5C */ b lbl_8085903C -lbl_80858FE4: -/* 80858FE4 38 00 00 01 */ li r0, 1 -/* 80858FE8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858FEC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858FF0 98 03 0E 92 */ stb r0, 0xe92(r3) -/* 80858FF4 38 7D 05 6C */ addi r3, r29, 0x56c -/* 80858FF8 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80858FFC C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80859000 C0 7F 00 58 */ lfs f3, 0x58(r31) -/* 80859004 C0 9F 00 DC */ lfs f4, 0xdc(r31) -/* 80859008 4B A1 69 75 */ bl cLib_addCalc__FPfffff -/* 8085900C C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80859010 4B 80 25 FD */ bl dKyw_custom_windpower__Ff -/* 80859014 48 00 00 28 */ b lbl_8085903C -lbl_80859018: -/* 80859018 38 00 00 00 */ li r0, 0 -/* 8085901C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859020 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859024 98 03 0E 92 */ stb r0, 0xe92(r3) -/* 80859028 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 8085902C D0 1D 05 6C */ stfs f0, 0x56c(r29) -/* 80859030 D0 1D 05 70 */ stfs f0, 0x570(r29) -/* 80859034 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80859038 4B 80 25 D5 */ bl dKyw_custom_windpower__Ff -lbl_8085903C: -/* 8085903C C0 1F 00 E8 */ lfs f0, 0xe8(r31) -/* 80859040 C0 5D 05 6C */ lfs f2, 0x56c(r29) -/* 80859044 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80859048 FC 00 00 1E */ fctiwz f0, f0 -/* 8085904C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80859050 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80859054 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80859058 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8085905C 90 03 0E 8C */ stw r0, 0xe8c(r3) -/* 80859060 C0 3F 00 EC */ lfs f1, 0xec(r31) -/* 80859064 C0 1D 05 70 */ lfs f0, 0x570(r29) -/* 80859068 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8085906C FC 00 00 1E */ fctiwz f0, f0 -/* 80859070 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80859074 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80859078 90 03 0E B8 */ stw r0, 0xeb8(r3) -/* 8085907C 88 03 0E 92 */ lbz r0, 0xe92(r3) -/* 80859080 28 00 00 00 */ cmplwi r0, 0 -/* 80859084 40 82 00 28 */ bne lbl_808590AC -/* 80859088 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 8085908C 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 80859090 C0 1F 00 F0 */ lfs f0, 0xf0(r31) -/* 80859094 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80859098 FC 00 00 1E */ fctiwz f0, f0 -/* 8085909C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 808590A0 80 81 00 24 */ lwz r4, 0x24(r1) -/* 808590A4 4B A6 EF 11 */ bl setSnowPower__10Z2EnvSeMgrFSc -/* 808590A8 48 00 00 24 */ b lbl_808590CC -lbl_808590AC: -/* 808590AC 3C 60 80 43 */ lis r3, g_mEnvSeMgr@ha /* 0x8042DD70@ha */ -/* 808590B0 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ -/* 808590B4 C0 1F 00 F4 */ lfs f0, 0xf4(r31) -/* 808590B8 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 808590BC FC 00 00 1E */ fctiwz f0, f0 -/* 808590C0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 808590C4 80 81 00 24 */ lwz r4, 0x24(r1) -/* 808590C8 4B A6 EE ED */ bl setSnowPower__10Z2EnvSeMgrFSc -lbl_808590CC: -/* 808590CC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 808590D0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 808590D4 7C 00 07 75 */ extsb. r0, r0 -/* 808590D8 41 82 00 3C */ beq lbl_80859114 -/* 808590DC 2C 00 00 03 */ cmpwi r0, 3 -/* 808590E0 41 82 00 34 */ beq lbl_80859114 -/* 808590E4 2C 00 00 05 */ cmpwi r0, 5 -/* 808590E8 41 80 00 0C */ blt lbl_808590F4 -/* 808590EC 2C 00 00 09 */ cmpwi r0, 9 -/* 808590F0 40 81 00 24 */ ble lbl_80859114 -lbl_808590F4: -/* 808590F4 2C 00 00 0B */ cmpwi r0, 0xb -/* 808590F8 41 82 00 1C */ beq lbl_80859114 -/* 808590FC 2C 00 00 0D */ cmpwi r0, 0xd -/* 80859100 41 82 00 14 */ beq lbl_80859114 -/* 80859104 38 00 00 00 */ li r0, 0 -/* 80859108 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085910C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80859110 98 03 0E 90 */ stb r0, 0xe90(r3) -lbl_80859114: -/* 80859114 39 61 00 40 */ addi r11, r1, 0x40 -/* 80859118 4B B0 91 0D */ bl _restgpr_28 -/* 8085911C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80859120 7C 08 03 A6 */ mtlr r0 -/* 80859124 38 21 00 40 */ addi r1, r1, 0x40 -/* 80859128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s deleted file mode 100644 index 12ce798cb8..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8085912C: -/* 8085912C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80859130 7C 08 02 A6 */ mflr r0 -/* 80859134 90 01 00 14 */ stw r0, 0x14(r1) -/* 80859138 4B 95 34 45 */ bl dKy_darkworld_check__Fv -/* 8085913C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80859140 41 82 00 54 */ beq lbl_80859194 -/* 80859144 38 60 00 00 */ li r3, 0 -/* 80859148 4B 7D 38 35 */ bl getLayerNo__14dComIfG_play_cFi -/* 8085914C 2C 03 00 0E */ cmpwi r3, 0xe -/* 80859150 40 82 00 44 */ bne lbl_80859194 -/* 80859154 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80859158 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8085915C 7C 00 07 74 */ extsb r0, r0 -/* 80859160 2C 00 00 08 */ cmpwi r0, 8 -/* 80859164 41 82 00 28 */ beq lbl_8085918C -/* 80859168 40 80 00 2C */ bge lbl_80859194 -/* 8085916C 2C 00 00 05 */ cmpwi r0, 5 -/* 80859170 40 80 00 24 */ bge lbl_80859194 -/* 80859174 2C 00 00 00 */ cmpwi r0, 0 -/* 80859178 40 80 00 08 */ bge lbl_80859180 -/* 8085917C 48 00 00 18 */ b lbl_80859194 -lbl_80859180: -/* 80859180 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80859184 4B 94 F6 61 */ bl dKy_change_colpat__FUc -/* 80859188 48 00 00 0C */ b lbl_80859194 -lbl_8085918C: -/* 8085918C 38 60 00 05 */ li r3, 5 -/* 80859190 4B 94 F6 55 */ bl dKy_change_colpat__FUc -lbl_80859194: -/* 80859194 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80859198 7C 08 03 A6 */ mtlr r0 -/* 8085919C 38 21 00 10 */ addi r1, r1, 0x10 -/* 808591A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_wether_proc__FP13kytag06_classUc.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_wether_proc__FP13kytag06_classUc.s deleted file mode 100644 index f03911232c..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_wether_proc__FP13kytag06_classUc.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_808584B4: -/* 808584B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808584B8 7C 08 02 A6 */ mflr r0 -/* 808584BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 808584C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808584C4 93 C1 00 08 */ stw r30, 8(r1) -/* 808584C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808584CC 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808584D0 38 00 00 00 */ li r0, 0 -/* 808584D4 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 808584D8 8B DF 12 C8 */ lbz r30, 0x12c8(r31) -/* 808584DC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 808584E0 28 00 00 07 */ cmplwi r0, 7 -/* 808584E4 41 81 01 98 */ bgt lbl_8085867C -/* 808584E8 3C 60 80 86 */ lis r3, lit_4064@ha /* 0x8085A04C@ha */ -/* 808584EC 38 63 A0 4C */ addi r3, r3, lit_4064@l /* 0x8085A04C@l */ -/* 808584F0 54 00 10 3A */ slwi r0, r0, 2 -/* 808584F4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 808584F8 7C 09 03 A6 */ mtctr r0 -/* 808584FC 4E 80 04 20 */ bctr -lbl_80858500: -/* 80858500 3B C0 00 00 */ li r30, 0 -/* 80858504 4B FF F4 E9 */ bl dice_rain_minus__Fv -/* 80858508 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 8085850C 2C 03 00 00 */ cmpwi r3, 0 -/* 80858510 41 82 01 6C */ beq lbl_8085867C -/* 80858514 38 03 FF FF */ addi r0, r3, -1 -/* 80858518 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 8085851C 48 00 01 60 */ b lbl_8085867C -lbl_80858520: -/* 80858520 3B C0 00 01 */ li r30, 1 -/* 80858524 4B FF F4 C9 */ bl dice_rain_minus__Fv -/* 80858528 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 8085852C 2C 03 00 00 */ cmpwi r3, 0 -/* 80858530 41 82 01 4C */ beq lbl_8085867C -/* 80858534 38 03 FF FF */ addi r0, r3, -1 -/* 80858538 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 8085853C 48 00 01 40 */ b lbl_8085867C -lbl_80858540: -/* 80858540 3B C0 00 01 */ li r30, 1 -/* 80858544 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80858548 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 8085854C 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80858550 40 82 00 2C */ bne lbl_8085857C -/* 80858554 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 80858558 2C 03 00 28 */ cmpwi r3, 0x28 -/* 8085855C 40 80 00 14 */ bge lbl_80858570 -/* 80858560 38 63 00 01 */ addi r3, r3, 1 -/* 80858564 90 7F 0E 80 */ stw r3, 0xe80(r31) -/* 80858568 4B 80 30 E5 */ bl dKyw_rain_set__Fi -/* 8085856C 48 00 00 10 */ b lbl_8085857C -lbl_80858570: -/* 80858570 38 63 FF FF */ addi r3, r3, -1 -/* 80858574 90 7F 0E 80 */ stw r3, 0xe80(r31) -/* 80858578 4B 80 30 D5 */ bl dKyw_rain_set__Fi -lbl_8085857C: -/* 8085857C 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 80858580 2C 03 00 00 */ cmpwi r3, 0 -/* 80858584 41 82 00 F8 */ beq lbl_8085867C -/* 80858588 38 03 FF FF */ addi r0, r3, -1 -/* 8085858C 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 80858590 48 00 00 EC */ b lbl_8085867C -lbl_80858594: -/* 80858594 3B C0 00 01 */ li r30, 1 -/* 80858598 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 8085859C 2C 03 00 FA */ cmpwi r3, 0xfa -/* 808585A0 40 80 00 10 */ bge lbl_808585B0 -/* 808585A4 38 63 00 01 */ addi r3, r3, 1 -/* 808585A8 90 7F 0E 80 */ stw r3, 0xe80(r31) -/* 808585AC 4B 80 30 A1 */ bl dKyw_rain_set__Fi -lbl_808585B0: -/* 808585B0 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 808585B4 2C 03 00 00 */ cmpwi r3, 0 -/* 808585B8 41 82 00 C4 */ beq lbl_8085867C -/* 808585BC 38 03 FF FF */ addi r0, r3, -1 -/* 808585C0 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 808585C4 48 00 00 B8 */ b lbl_8085867C -lbl_808585C8: -/* 808585C8 38 00 00 01 */ li r0, 1 -/* 808585CC 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 808585D0 3B C0 00 01 */ li r30, 1 -/* 808585D4 80 7F 0E 80 */ lwz r3, 0xe80(r31) -/* 808585D8 2C 03 00 FA */ cmpwi r3, 0xfa -/* 808585DC 40 80 00 10 */ bge lbl_808585EC -/* 808585E0 38 63 00 01 */ addi r3, r3, 1 -/* 808585E4 90 7F 0E 80 */ stw r3, 0xe80(r31) -/* 808585E8 4B 80 30 65 */ bl dKyw_rain_set__Fi -lbl_808585EC: -/* 808585EC 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 808585F0 2C 03 00 00 */ cmpwi r3, 0 -/* 808585F4 41 82 00 88 */ beq lbl_8085867C -/* 808585F8 38 03 FF FF */ addi r0, r3, -1 -/* 808585FC 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 80858600 48 00 00 7C */ b lbl_8085867C -lbl_80858604: -/* 80858604 3B C0 00 01 */ li r30, 1 -/* 80858608 38 00 00 01 */ li r0, 1 -/* 8085860C 90 1F 0E D8 */ stw r0, 0xed8(r31) -/* 80858610 4B FF F3 DD */ bl dice_rain_minus__Fv -/* 80858614 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 80858618 2C 03 00 00 */ cmpwi r3, 0 -/* 8085861C 41 82 00 60 */ beq lbl_8085867C -/* 80858620 38 03 FF FF */ addi r0, r3, -1 -/* 80858624 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 80858628 48 00 00 54 */ b lbl_8085867C -lbl_8085862C: -/* 8085862C 3B C0 00 01 */ li r30, 1 -/* 80858630 80 9F 0E 8C */ lwz r4, 0xe8c(r31) -/* 80858634 2C 04 00 7D */ cmpwi r4, 0x7d -/* 80858638 40 80 00 20 */ bge lbl_80858658 -/* 8085863C 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80858640 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 80858644 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80858648 40 82 00 34 */ bne lbl_8085867C -/* 8085864C 38 04 00 01 */ addi r0, r4, 1 -/* 80858650 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 80858654 48 00 00 28 */ b lbl_8085867C -lbl_80858658: -/* 80858658 38 04 FF FF */ addi r0, r4, -1 -/* 8085865C 90 1F 0E 8C */ stw r0, 0xe8c(r31) -/* 80858660 48 00 00 1C */ b lbl_8085867C -lbl_80858664: -/* 80858664 3B C0 00 02 */ li r30, 2 -/* 80858668 80 7F 0E 8C */ lwz r3, 0xe8c(r31) -/* 8085866C 2C 03 01 F4 */ cmpwi r3, 0x1f4 -/* 80858670 40 80 00 0C */ bge lbl_8085867C -/* 80858674 38 03 00 01 */ addi r0, r3, 1 -/* 80858678 90 1F 0E 8C */ stw r0, 0xe8c(r31) -lbl_8085867C: -/* 8085867C 88 7F 12 C8 */ lbz r3, 0x12c8(r31) -/* 80858680 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80858684 7C 03 00 40 */ cmplw r3, r0 -/* 80858688 41 82 00 24 */ beq lbl_808586AC -/* 8085868C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80858690 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80858694 88 03 12 D8 */ lbz r0, 0x12d8(r3) -/* 80858698 28 00 00 00 */ cmplwi r0, 0 -/* 8085869C 40 82 00 10 */ bne lbl_808586AC -/* 808586A0 9B DF 12 C8 */ stb r30, 0x12c8(r31) -/* 808586A4 7F C3 F3 78 */ mr r3, r30 -/* 808586A8 4B 95 01 3D */ bl dKy_change_colpat__FUc -lbl_808586AC: -/* 808586AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808586B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 808586B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808586B8 7C 08 03 A6 */ mtlr r0 -/* 808586BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 808586C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_rain_minus__Fv.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_rain_minus__Fv.s deleted file mode 100644 index 250be610f2..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_rain_minus__Fv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_808579EC: -/* 808579EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808579F0 7C 08 02 A6 */ mflr r0 -/* 808579F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 808579F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808579FC 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80857A00 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80857A04 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 80857A08 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80857A0C 40 82 00 34 */ bne lbl_80857A40 -/* 80857A10 80 64 0E 80 */ lwz r3, 0xe80(r4) -/* 80857A14 2C 03 00 28 */ cmpwi r3, 0x28 -/* 80857A18 40 81 00 10 */ ble lbl_80857A28 -/* 80857A1C 38 03 FF FD */ addi r0, r3, -3 -/* 80857A20 90 04 0E 80 */ stw r0, 0xe80(r4) -/* 80857A24 48 00 00 14 */ b lbl_80857A38 -lbl_80857A28: -/* 80857A28 2C 03 00 00 */ cmpwi r3, 0 -/* 80857A2C 41 82 00 0C */ beq lbl_80857A38 -/* 80857A30 38 03 FF FF */ addi r0, r3, -1 -/* 80857A34 90 04 0E 80 */ stw r0, 0xe80(r4) -lbl_80857A38: -/* 80857A38 80 64 0E 80 */ lwz r3, 0xe80(r4) -/* 80857A3C 4B 80 3C 11 */ bl dKyw_rain_set__Fi -lbl_80857A40: -/* 80857A40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80857A44 7C 08 03 A6 */ mtlr r0 -/* 80857A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80857A4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_execute__FUcff.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_execute__FUcff.s deleted file mode 100644 index c5eb396145..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_execute__FUcff.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80857918: -/* 80857918 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8085791C 7C 08 02 A6 */ mflr r0 -/* 80857920 90 01 00 44 */ stw r0, 0x44(r1) -/* 80857924 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80857928 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8085792C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80857930 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80857934 DB A1 00 10 */ stfd f29, 0x10(r1) -/* 80857938 F3 A1 00 18 */ psq_st f29, 24(r1), 0, 0 /* qr0 */ -/* 8085793C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80857940 FF A0 08 90 */ fmr f29, f1 -/* 80857944 FF C0 10 90 */ fmr f30, f2 -/* 80857948 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 8085794C 3B E4 CA 54 */ addi r31, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80857950 98 7F 12 C9 */ stb r3, 0x12c9(r31) -/* 80857954 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80857958 28 00 00 FF */ cmplwi r0, 0xff -/* 8085795C 41 82 00 50 */ beq lbl_808579AC -/* 80857960 4B A0 FF F5 */ bl cM_rndF__Ff -/* 80857964 FF E0 08 90 */ fmr f31, f1 -/* 80857968 FC 20 E8 90 */ fmr f1, f29 -/* 8085796C 4B A0 FF E9 */ bl cM_rndF__Ff -/* 80857970 EC 1E E8 2A */ fadds f0, f30, f29 -/* 80857974 EC 00 08 2A */ fadds f0, f0, f1 -/* 80857978 EC 20 F8 2A */ fadds f1, f0, f31 -/* 8085797C D0 3F 11 D8 */ stfs f1, 0x11d8(r31) -/* 80857980 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 80857984 C0 03 9E 78 */ lfs f0, lit_3740@l(r3) /* 0x80859E78@l */ -/* 80857988 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085798C 4C 41 13 82 */ cror 2, 1, 2 -/* 80857990 40 82 00 0C */ bne lbl_8085799C -/* 80857994 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80857998 D0 1F 11 D8 */ stfs f0, 0x11d8(r31) -lbl_8085799C: -/* 8085799C 80 7F 12 98 */ lwz r3, 0x1298(r31) -/* 808579A0 38 03 00 01 */ addi r0, r3, 1 -/* 808579A4 90 1F 12 98 */ stw r0, 0x1298(r31) -/* 808579A8 48 00 00 18 */ b lbl_808579C0 -lbl_808579AC: -/* 808579AC 38 00 00 00 */ li r0, 0 -/* 808579B0 98 1F 12 C9 */ stb r0, 0x12c9(r31) -/* 808579B4 88 7F 12 CA */ lbz r3, 0x12ca(r31) -/* 808579B8 38 03 00 01 */ addi r0, r3, 1 -/* 808579BC 98 1F 12 CA */ stb r0, 0x12ca(r31) -lbl_808579C0: -/* 808579C0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 808579C4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 808579C8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 808579CC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 808579D0 E3 A1 00 18 */ psq_l f29, 24(r1), 0, 0 /* qr0 */ -/* 808579D4 CB A1 00 10 */ lfd f29, 0x10(r1) -/* 808579D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808579DC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 808579E0 7C 08 03 A6 */ mtlr r0 -/* 808579E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 808579E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_init__FUcff.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_init__FUcff.s deleted file mode 100644 index 128c868050..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_init__FUcff.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8085786C: -/* 8085786C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80857870 7C 08 02 A6 */ mflr r0 -/* 80857874 90 01 00 44 */ stw r0, 0x44(r1) -/* 80857878 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8085787C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80857880 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80857884 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80857888 DB A1 00 10 */ stfd f29, 0x10(r1) -/* 8085788C F3 A1 00 18 */ psq_st f29, 24(r1), 0, 0 /* qr0 */ -/* 80857890 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80857894 FF A0 08 90 */ fmr f29, f1 -/* 80857898 FF C0 10 90 */ fmr f30, f2 -/* 8085789C 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 808578A0 3B E4 CA 54 */ addi r31, r4, g_env_light@l /* 0x8042CA54@l */ -/* 808578A4 98 7F 12 C9 */ stb r3, 0x12c9(r31) -/* 808578A8 4B A1 00 AD */ bl cM_rndF__Ff -/* 808578AC FF E0 08 90 */ fmr f31, f1 -/* 808578B0 FC 20 E8 90 */ fmr f1, f29 -/* 808578B4 4B A1 00 A1 */ bl cM_rndF__Ff -/* 808578B8 EC 1E E8 2A */ fadds f0, f30, f29 -/* 808578BC EC 00 08 2A */ fadds f0, f0, f1 -/* 808578C0 EC 20 F8 2A */ fadds f1, f0, f31 -/* 808578C4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 808578C8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 808578CC D0 23 11 D8 */ stfs f1, 0x11d8(r3) -/* 808578D0 3C 60 80 86 */ lis r3, lit_3740@ha /* 0x80859E78@ha */ -/* 808578D4 C0 03 9E 78 */ lfs f0, lit_3740@l(r3) /* 0x80859E78@l */ -/* 808578D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808578DC 4C 41 13 82 */ cror 2, 1, 2 -/* 808578E0 40 82 00 0C */ bne lbl_808578EC -/* 808578E4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 808578E8 D0 1F 11 D8 */ stfs f0, 0x11d8(r31) -lbl_808578EC: -/* 808578EC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 808578F0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 808578F4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 808578F8 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 808578FC E3 A1 00 18 */ psq_l f29, 24(r1), 0, 0 /* qr0 */ -/* 80857900 CB A1 00 10 */ lfd f29, 0x10(r1) -/* 80857904 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80857908 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8085790C 7C 08 03 A6 */ mtlr r0 -/* 80857910 38 21 00 40 */ addi r1, r1, 0x40 -/* 80857914 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/near_rail_get__FP13kytag06_classP4cXyz.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/near_rail_get__FP13kytag06_classP4cXyz.s deleted file mode 100644 index c657e983e3..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/near_rail_get__FP13kytag06_classP4cXyz.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_80857F8C: -/* 80857F8C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80857F90 7C 08 02 A6 */ mflr r0 -/* 80857F94 90 01 00 54 */ stw r0, 0x54(r1) -/* 80857F98 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80857F9C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80857FA0 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 80857FA4 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 80857FA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80857FAC 4B B0 A2 25 */ bl _savegpr_26 -/* 80857FB0 7C 9C 23 78 */ mr r28, r4 -/* 80857FB4 3C 80 80 86 */ lis r4, lit_3740@ha /* 0x80859E78@ha */ -/* 80857FB8 3B 44 9E 78 */ addi r26, r4, lit_3740@l /* 0x80859E78@l */ -/* 80857FBC C3 DA 00 18 */ lfs f30, 0x18(r26) -/* 80857FC0 83 E3 05 68 */ lwz r31, 0x568(r3) -/* 80857FC4 3B A0 00 00 */ li r29, 0 -/* 80857FC8 3B 60 00 00 */ li r27, 0 -/* 80857FCC C3 FA 00 14 */ lfs f31, 0x14(r26) -/* 80857FD0 48 00 01 14 */ b lbl_808580E4 -lbl_80857FD4: -/* 80857FD4 7F 83 E3 78 */ mr r3, r28 -/* 80857FD8 80 1F 00 08 */ lwz r0, 8(r31) -/* 80857FDC 38 9B 00 04 */ addi r4, r27, 4 -/* 80857FE0 7C 80 22 14 */ add r4, r0, r4 -/* 80857FE4 4B AE F3 B9 */ bl PSVECSquareDistance -/* 80857FE8 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80857FEC 40 81 00 58 */ ble lbl_80858044 -/* 80857FF0 FC 00 08 34 */ frsqrte f0, f1 -/* 80857FF4 C8 9A 00 20 */ lfd f4, 0x20(r26) -/* 80857FF8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80857FFC C8 7A 00 28 */ lfd f3, 0x28(r26) -/* 80858000 FC 00 00 32 */ fmul f0, f0, f0 -/* 80858004 FC 01 00 32 */ fmul f0, f1, f0 -/* 80858008 FC 03 00 28 */ fsub f0, f3, f0 -/* 8085800C FC 02 00 32 */ fmul f0, f2, f0 -/* 80858010 FC 44 00 32 */ fmul f2, f4, f0 -/* 80858014 FC 00 00 32 */ fmul f0, f0, f0 -/* 80858018 FC 01 00 32 */ fmul f0, f1, f0 -/* 8085801C FC 03 00 28 */ fsub f0, f3, f0 -/* 80858020 FC 02 00 32 */ fmul f0, f2, f0 -/* 80858024 FC 44 00 32 */ fmul f2, f4, f0 -/* 80858028 FC 00 00 32 */ fmul f0, f0, f0 -/* 8085802C FC 01 00 32 */ fmul f0, f1, f0 -/* 80858030 FC 03 00 28 */ fsub f0, f3, f0 -/* 80858034 FC 02 00 32 */ fmul f0, f2, f0 -/* 80858038 FC 21 00 32 */ fmul f1, f1, f0 -/* 8085803C FC 20 08 18 */ frsp f1, f1 -/* 80858040 48 00 00 88 */ b lbl_808580C8 -lbl_80858044: -/* 80858044 C8 1A 00 30 */ lfd f0, 0x30(r26) -/* 80858048 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8085804C 40 80 00 10 */ bge lbl_8085805C -/* 80858050 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80858054 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80858058 48 00 00 70 */ b lbl_808580C8 -lbl_8085805C: -/* 8085805C D0 21 00 08 */ stfs f1, 8(r1) -/* 80858060 80 81 00 08 */ lwz r4, 8(r1) -/* 80858064 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80858068 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8085806C 7C 03 00 00 */ cmpw r3, r0 -/* 80858070 41 82 00 14 */ beq lbl_80858084 -/* 80858074 40 80 00 40 */ bge lbl_808580B4 -/* 80858078 2C 03 00 00 */ cmpwi r3, 0 -/* 8085807C 41 82 00 20 */ beq lbl_8085809C -/* 80858080 48 00 00 34 */ b lbl_808580B4 -lbl_80858084: -/* 80858084 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80858088 41 82 00 0C */ beq lbl_80858094 -/* 8085808C 38 00 00 01 */ li r0, 1 -/* 80858090 48 00 00 28 */ b lbl_808580B8 -lbl_80858094: -/* 80858094 38 00 00 02 */ li r0, 2 -/* 80858098 48 00 00 20 */ b lbl_808580B8 -lbl_8085809C: -/* 8085809C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 808580A0 41 82 00 0C */ beq lbl_808580AC -/* 808580A4 38 00 00 05 */ li r0, 5 -/* 808580A8 48 00 00 10 */ b lbl_808580B8 -lbl_808580AC: -/* 808580AC 38 00 00 03 */ li r0, 3 -/* 808580B0 48 00 00 08 */ b lbl_808580B8 -lbl_808580B4: -/* 808580B4 38 00 00 04 */ li r0, 4 -lbl_808580B8: -/* 808580B8 2C 00 00 01 */ cmpwi r0, 1 -/* 808580BC 40 82 00 0C */ bne lbl_808580C8 -/* 808580C0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 808580C4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_808580C8: -/* 808580C8 FC 01 F0 40 */ fcmpo cr0, f1, f30 -/* 808580CC 40 80 00 10 */ bge lbl_808580DC -/* 808580D0 FF C0 08 90 */ fmr f30, f1 -/* 808580D4 80 1F 00 08 */ lwz r0, 8(r31) -/* 808580D8 7F C0 DA 14 */ add r30, r0, r27 -lbl_808580DC: -/* 808580DC 3B BD 00 01 */ addi r29, r29, 1 -/* 808580E0 3B 7B 00 10 */ addi r27, r27, 0x10 -lbl_808580E4: -/* 808580E4 A0 1F 00 00 */ lhz r0, 0(r31) -/* 808580E8 7C 1D 00 00 */ cmpw r29, r0 -/* 808580EC 41 80 FE E8 */ blt lbl_80857FD4 -/* 808580F0 7F C3 F3 78 */ mr r3, r30 -/* 808580F4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 808580F8 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 808580FC E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80858100 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80858104 39 61 00 30 */ addi r11, r1, 0x30 -/* 80858108 4B B0 A1 15 */ bl _restgpr_26 -/* 8085810C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80858110 7C 08 03 A6 */ mtlr r0 -/* 80858114 38 21 00 50 */ addi r1, r1, 0x50 -/* 80858118 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/set_path_info__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/set_path_info__FP10fopAc_ac_c.s deleted file mode 100644 index ae49c79cfe..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/set_path_info__FP10fopAc_ac_c.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80857F48: -/* 80857F48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80857F4C 7C 08 02 A6 */ mflr r0 -/* 80857F50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80857F54 7C 64 1B 78 */ mr r4, r3 -/* 80857F58 38 00 00 00 */ li r0, 0 -/* 80857F5C 88 63 05 94 */ lbz r3, 0x594(r3) -/* 80857F60 28 03 00 FF */ cmplwi r3, 0xff -/* 80857F64 41 82 00 14 */ beq lbl_80857F78 -/* 80857F68 88 04 04 E2 */ lbz r0, 0x4e2(r4) -/* 80857F6C 7C 04 07 74 */ extsb r4, r0 -/* 80857F70 4B 7F 98 7D */ bl dPath_GetRoomPath__Fii -/* 80857F74 7C 60 1B 78 */ mr r0, r3 -lbl_80857F78: -/* 80857F78 7C 03 03 78 */ mr r3, r0 -/* 80857F7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80857F80 7C 08 03 A6 */ mtlr r0 -/* 80857F84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80857F88 4E 80 00 20 */ blr diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index 5ca3f9c77a..f90f03264b 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -3,7 +3,6 @@ #include "JSystem/JMessage/resource.h" #include "JSystem/JUtility/JUTFont.h" -#include "SSystem/SComponent/c_xyz.h" #include "init.h" namespace JMessage { @@ -11,6 +10,8 @@ struct TResource; struct TResourceContainer; struct TReference { + TReference() { pcResource_ = NULL; } + /* 802A7AF8 */ virtual ~TReference(); /* 802A7B40 */ virtual const char* do_word(u32) const; @@ -183,6 +184,7 @@ struct TProcessor { const TResource* getResourceCache() const { return pResourceCache_; } const char* getCurrent() const { return pszCurrent_; } + const TReference* getReference() const { return pReference_; } const TResource* getResource_groupID_uncached(u16 groupID) const { return pReference_->getResource_groupID(groupID); @@ -268,7 +270,8 @@ struct TSequenceProcessor : public TProcessor { TControl* getControl() const { return pControl_; } static const void* process_setMessageIndex_(const TSequenceProcessor* pProcessor, u16 param_1) { - return process_setMessageCode_(pProcessor, pProcessor->getResourceCache()->getGroupID(), param_1); + return process_setMessageCode_(pProcessor, pProcessor->getResourceCache()->getGroupID(), + param_1); } static const void* process_setMessageCode_(const TSequenceProcessor* pProcessor, u32 param_1) { @@ -291,173 +294,4 @@ struct TRenderingProcessor : public TProcessor { }; }; // namespace JMessage -struct STControl; -struct dMsgObject_c; -struct jmessage_tReference : public JMessage::TReference { - /* 80228B04 */ jmessage_tReference(); - /* 80228D28 */ void calcDistance(); - /* 80228DE0 */ void getLineMax(); - /* 80228E6C */ void isKanban(); - /* 80228EA0 */ void isPlaceName(); - /* 80228ED4 */ void isBossName(); - /* 80228F08 */ void isSaveSeq(); - /* 80228F3C */ void isBook(); - /* 80228F70 */ void isStaffRoll(); - /* 80228FA4 */ void isHowl(); - /* 80228FD8 */ void isMidona(); - /* 8022900C */ void resetReference(); - /* 80229034 */ void pageSend(); - /* 80229168 */ void selectMessage(); - /* 802294A8 */ void inputNumber(); - /* 80229730 */ void getWord(int); - /* 80229744 */ void resetWord(); - /* 80229768 */ void setCharactor(u16); - /* 80229788 */ void addCharactor(u16); - /* 802297B0 */ void resetCharactor(); - /* 802297E4 */ void shiftCharCountBuffer(); - /* 80229810 */ void resetCharCountBuffer(); - /* 80229848 */ void allsetCharCountBuffer(); - /* 8022986C */ void isCharSend(); - /* 802298DC */ void isLightSend(); - /* 8022994C */ void isLightEnd(); - /* 802299AC */ void decideOutFontRupeeColor(int); - /* 80232A20 */ void getActorPos(); - - /* 80238C78 */ void setActorPos(cXyz pos) { mActorPos = pos; } - - /* 80228CB4 */ virtual ~jmessage_tReference(); - -private: - /* 0x0008 */ STControl* mpStick; - /* 0x000C */ u16 field_0xc[0x200]; - /* 0x040C */ s16 field_0x40c; - /* 0x040E */ s16 field_0x40e; - /* 0x0410 */ s16 mCountBackUp; - /* 0x0414 */ cXyz mActorPos; - /* 0x0420 */ f32 mFontSizeX; - /* 0x0424 */ f32 mFontSizeY; - /* 0x0428 */ f32 mRubySize; - /* 0x042C */ f32 mTBoxWidth; - /* 0x0430 */ f32 mTBoxHeight; - /* 0x0434 */ f32 mLineSpace; - /* 0x0438 */ f32 mCharSpace; - /* 0x043C */ f32 mRubyCharSpace; - /* 0x0440 */ f32 mSelFontSize; - /* 0x0444 */ f32 mSelRubySize; - /* 0x0448 */ f32 mSelTBoxWidth; - /* 0x044C */ f32 mSelCharSpace; - /* 0x0450 */ f32 mSelRubyCharSpace; - /* 0x0454 */ f32 mDistanceScale; - /* 0x0458 */ f32 mAddCharAllAlphaRate; - /* 0x045C */ f32 mCharAllAlphaRate; - /* 0x0460 */ f32 mAddCharAlpha; - /* 0x0464 */ f32 mCharAlpha; - /* 0x0468 */ f32 mStrLength[40]; - /* 0x0508 */ f32 mSpaceLength[40]; - /* 0x05A8 */ f32 mSelLength[3]; - /* 0x05B4 */ u32 mDemoFrame; - /* 0x05B8 */ u32 mRevoMessageID; - /* 0x05BC */ u16* mpStatus; - /* 0x05C0 */ dMsgObject_c* mpObjectPtr; - /* 0x05C4 */ char* mpSelMsgPtr; - /* 0x05C8 */ JUTFont* mpFont; - /* 0x05CC */ s16 mStartLineCount; - /* 0x05CE */ s16 mEndLineCount; - /* 0x05D0 */ u16 mLineCount; - /* 0x05D2 */ s16 field_0x5d2; - /* 0x05D4 */ s16 mPageEndCount; - /* 0x05D6 */ s16 mSendTimer; - /* 0x05D8 */ s16 mCharCnt; - /* 0x05DA */ s16 mPageNum; - /* 0x05DC */ u8 mNowLightCount; - /* 0x05DD */ u8 mDrawLightCount; - /* 0x05DE */ u16 mMsgID; - /* 0x05E0 */ u16 mLineScale[40]; - /* 0x0630 */ u16 mTopTagScale; - /* 0x0632 */ u16 mNowTagScale; - /* 0x0634 */ char mWord[10][100]; - /* 0x0A1C */ char mTextPtr[0x200]; - /* 0x0C1C */ char mTextSPtr[0x200]; - /* 0x0E1C */ char mRuby[0x200]; - /* 0x101C */ u8 mSelText[3][50]; - /* 0x10B2 */ u8 mSelRuby[3][80]; - /* 0x11A2 */ s8 mPageLine[40]; - /* 0x11CA */ s8 mPageLineMax[40]; - /* 0x11F2 */ u8 mPageType[40]; - /* 0x121A */ u8 mLineArrange[40]; - /* 0x1242 */ u8 mSelectNum; - /* 0x1243 */ u8 mSelectType; - /* 0x1244 */ u8 mSelectPos; - /* 0x1245 */ u8 mFukiPosType; - /* 0x1246 */ u8 mFukiKind; - /* 0x1247 */ u8 mForm; - /* 0x1248 */ u8 field_0x1248; - /* 0x1249 */ u8 mNowColorType; - /* 0x124A */ u8 mTopColorType; - /* 0x124B */ bool mButtonTagStopFlag; - /* 0x124C */ u8 mSendFlag; - /* 0x124D */ u8 mStopFlag; - /* 0x124E */ u8 mSelectRubyFlag; - /* 0x124F */ u8 mInputFigure; - /* 0x1250 */ u8 mOutFontRupeeColor; - /* 0x1251 */ s8 mNowWordCount; - /* 0x1252 */ s8 mTopWordCount; - /* 0x1253 */ u8 mCharCountBuffer[31]; - /* 0x1272 */ bool mLightBatchFlag; - /* 0x1273 */ bool mBatchFlag; - /* 0x1274 */ bool mSelectSetCancelFlag; - /* 0x1275 */ bool mBombNameUseFlag; - /* 0x1276 */ bool mBatchColorFlag; -}; // Size: 0x1278 - -struct jmessage_tControl; -struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor { - /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); - /* 8022C904 */ void do_name1(); - /* 8022C908 */ void do_space(u32); - /* 8022CA24 */ void do_rubyset(void const*, u32); - /* 8022CAAC */ void push_word(); - /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*); - /* 8022CBE8 */ void calcStringLength(); - - /* 8023299C */ virtual ~jmessage_tSequenceProcessor(); - /* 8022B654 */ virtual void do_reset(); - /* 8022B658 */ virtual void do_begin(void const*, char const*); - /* 8022BA3C */ virtual void do_end(); - /* 8022BFE0 */ virtual void do_character(int); - /* 8022C1A0 */ virtual bool do_tag(u32, void const*, u32); - /* 8022BB7C */ virtual bool do_isReady(); - /* 8022C8FC */ virtual bool do_jump_isReady(); - /* 8022CBE4 */ virtual void do_jump(void const*, char const*); -}; - -struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor { - /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*); - /* 8022E12C */ void resetRendering(); - /* 8022E17C */ void do_widthcenter(); - /* 8022E260 */ void do_selwidthcenter(int); - /* 8022E318 */ void do_heightcenter(); - /* 8022E7CC */ void do_color(u8); - /* 8022E860 */ void do_scale(f32); - /* 8022E960 */ void do_linedown(s16); - /* 8022E9C0 */ void do_transY(s16, bool); - /* 8022EAE4 */ void do_outfont(u8, u32); - /* 8022ED10 */ void do_arrow2(); - /* 8022EECC */ void getLineLength(int); - /* 8022EF00 */ void do_strcat(char*, bool, bool, bool); - /* 8022F148 */ void do_rubyset(void const*, u32); - /* 8022F384 */ void do_rubystrcat(char*, char*, f32, f32); - /* 8022F53C */ void do_name1(); - /* 8022F540 */ void do_numset(s16); - /* 8022F734 */ void push_word(); - /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32); - - /* 8023293C */ virtual ~jmessage_tRenderingProcessor(); - /* 8022CDC8 */ virtual void do_reset(); - /* 8022CDCC */ virtual void do_begin(void const*, char const*); - /* 8022CFD8 */ virtual void do_end(); - /* 8022D0A0 */ virtual void do_character(int); - /* 8022D74C */ virtual void do_tag(u32, void const*, u32); -}; - #endif /* JMESSAGE_PROCESSOR_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index cc18f4a398..9d6c0083a0 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -289,7 +289,7 @@ public: f32 getItemLifeCount() { return mItemLifeCount; } s16 getItemMaxArrowNumCount() { return mItemMaxArrowNumCount; } void clearNowAnimeID() { mNowAnimeID = -1; } - void clearMesgCamInfoID() { mMesgCamInfo = (void*)-1; } + void clearMesgCamInfoID() { mMesgCamInfo = -1; } void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; } void clearItemLifeCount() { mItemLifeCount = 0.0f; @@ -401,6 +401,10 @@ public: setCameraAttentionStatus(camIdx, 0); } + void setMesgCamInfoID(int param_0) { + mMesgCamInfo = param_0; + } + void setStatus(u16 status) { mStatus = status; } s32 checkStatus(u16 flags) { return flags & mStatus; } @@ -634,7 +638,7 @@ public: /* 0x04FAB */ u8 field_0x4fab; // related to setWarpItemData /* 0x04FAC */ u8 field_0x4fac; // related to setWarpItemData /* 0x04FAD */ u8 field_0x4fad[3]; - /* 0x04FB0 */ void* mMesgCamInfo; + /* 0x04FB0 */ int mMesgCamInfo; /* 0x04FB4 */ int mMesgCamInfoBasicID; /* 0x04FB8 */ fopAc_ac_c* mMesgCamInfoActor1; /* 0x04FBC */ fopAc_ac_c* mMesgCamInfoActor2; @@ -838,6 +842,7 @@ int dComIfGs_isItemFirstBit(u8 i_no); u16 dComIfGs_getRupee(); static u16 dComIfGs_getLife(); s8 dComIfGs_BossLife_public_Get(); +u8 dComIfGs_checkGetInsectNum(); inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); @@ -1379,6 +1384,18 @@ inline char* dComIfGs_getPlayerName() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName(); } +inline char* dComIfGs_getHorseName() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getHorseName(); +} + +inline u32 dComIfGs_getRaceGameTime() { + return g_dComIfG_gameInfo.info.getMiniGame().getRaceGameTime(); +} + +inline u32 dComIfGs_getBalloonScore() { + return g_dComIfG_gameInfo.info.getMiniGame().getBalloonScore(); +} + inline u8 dComIfGs_getTransformStatus() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getTransformStatus(); } @@ -1469,6 +1486,10 @@ inline int dComIfGs_getTmpReg(u16 i_reg) { return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg); } +inline u8 i_dComIfGs_getEventReg(u16 reg) { + return g_dComIfG_gameInfo.info.getEvent().getEventReg(reg); +} + inline void dComIfGs_setWarashibeItem(u8 i_itemNo) { g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(i_itemNo); } @@ -2384,6 +2405,10 @@ inline u8 dComIfGp_getMesgStatus() { return g_dComIfG_gameInfo.play.getMesgStatus(); } +inline void dComIfGp_setMesgCameraTagInfo(int param_0) { + g_dComIfG_gameInfo.play.setMesgCamInfoID(param_0); +} + inline s32 dComIfGp_roomControl_getStayNo() { return dStage_roomControl_c::getStayNo(); } diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index 7ddd006b4a..3e2c20b081 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -3,7 +3,7 @@ #include "SSystem/SComponent/c_phase.h" #include "d/menu/d_menu_save.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_hostIO.h" @@ -23,7 +23,7 @@ public: class dDlst_Gameover_CAPTURE_c : public dDlst_base_c { public: /* 8019ACF8 */ virtual void draw(); - /* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c(); + /* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c(); }; class dMsgScrnLight_c; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 56093e0d47..1a5d48ca69 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -273,7 +273,10 @@ public: // PPNT struct dStage_dPnt_c { - /* 0x0 */ int field_0x0; + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; + /* 0x2 */ u8 field_0x2; + /* 0x3 */ u8 field_0x3; /* 0x4 */ cXyz m_position; }; // Size: 0x10 diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 63d6f14f7c..ef75f4045d 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_phase.h" #include "SSystem/SComponent/c_xyz.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" #include "d/msg/d_msg_object.h" #include "dolphin/os/OSTime.h" #include "dolphin/types.h" diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index b5857f5141..1b2d413e90 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -2,9 +2,8 @@ #define D_EVENT_D_EVENT_DATA_H #include "d/d_stage.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" #include "d/save/d_save.h" -#include "dolphin/types.h" struct event_binary_data_header { /* 0x00 */ u32 eventTop; // offset to Event chunk diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 051412b54e..d55cc9097a 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -38,6 +38,9 @@ static void GxXFog_set(); u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly); void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3); void dKy_bg_MAxx_proc(void* param_0); +void dKy_change_colpat(u8 colpat); +void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3); +void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE() {} diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index b6f66d3783..90c1fe3bb8 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -22,6 +22,9 @@ static void squal_proc(); void dKyw_rain_set(int count); void dKyw_wind_set(); cXyz dKyw_get_wind_vecpow(); +void dKyw_evt_wind_set(s16 angleX, s16 angleY); +void dKyw_custom_windpower(f32 pow); +void dKyw_evt_wind_set_go(); class dKankyo_sun_Packet : public J3DPacket { public: @@ -133,9 +136,18 @@ public: virtual void draw(); virtual ~dKankyo_snow_Packet(); -private: - /* 0x10 */ u8* mpTex; - /* 0x14 */ SNOW_EFF mSnowEff[500]; + /* 0x0010 */ u8* mpTex; + /* 0x0014 */ SNOW_EFF mSnowEff[500]; + /* 0x6D74 */ cXyz field_0x6d74; + /* 0x6D80 */ f32 field_0x6d80; + /* 0x6D84 */ f32 field_0x6d84; + /* 0x6D88 */ u16 field_0x6d88; + /* 0x6D8A */ u16 field_0x6d8a; + /* 0x6D8C */ u32 field_0x6d8c; + /* 0x6D90 */ u8 field_0x6d90; + /* 0x6D91 */ u8 field_0x6d91; + /* 0x6D92 */ u8 field_0x6d92; + /* 0x6D93 */ u8 field_0x6d93; }; struct STAR_EFF { diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 8734194867..0713418675 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -4,7 +4,7 @@ #include "d/d_drawlist.h" #include "d/menu/d_menu_collect.h" #include "d/meter/d_meter2_info.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 02e8c4ce49..75198c5793 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -5,7 +5,7 @@ #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_draw.h" #include "d/meter/d_meter_map.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" #include "dolphin/types.h" class dMeterMap_c; diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index eb02183a84..b1ebbbc3ba 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -5,29 +5,11 @@ #include "d/d_resorce.h" #include "d/menu/d_menu_window.h" #include "d/meter/d_meter2.h" +#include "d/msg/d_msg_class.h" #include "d/msg/d_msg_flow.h" #include "d/pane/d_pane_class.h" -#include "dolphin/types.h" #include "f_op/f_op_actor.h" -struct JMSMesgEntry_c { - /* 0x00 */ u32 mStringOffset; - /* 0x04 */ u16 mStringId; - /* 0x06 */ u16 field_0x04; - /* 0x08 */ u8 field_0x08; - /* 0x09 */ u8 field_0x09; - /* 0x0A */ u8 field_0x0a; - /* 0x0B */ u8 field_0x0b; - /* 0x0C */ u8 field_0x0c; - /* 0x0D */ u8 field_0x0d; - /* 0x0E */ u8 field_0x0e; - /* 0x0F */ u8 field_0x0f; - /* 0x10 */ u8 field_0x10; - /* 0x11 */ u8 field_0x11; - /* 0x12 */ u8 field_0x12; - /* 0x13 */ u8 field_0x13; -}; // Size: 0x14 - struct dMenu_LetterData { u16 mSubject; u16 mName; @@ -89,7 +71,7 @@ public: void setWarpInfo(const char*, const cXyz&, s16, u8, u8, u8); u8 getItemType(u8); int readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*, - J2DPicture*, int); + J2DPicture*, int); void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*); s16 get2ndTexture(u8); s16 get3rdTexture(u8); @@ -162,6 +144,10 @@ public: s16 getMsgKeyWaitTimer() { return mMsgKeyWaitTimer; } u8 getGameOverType() { return mGameOverType; } void setGameOverType(u8 i_gameoverType) { mGameOverType = i_gameoverType; } + void setMsgKeyWaitTimer(s16 i_waitTimer) { mMsgKeyWaitTimer = i_waitTimer; } + u32 getMsgTimeMs() { return mMsgTimeMs; } + u32 getTimeMs() { return mTimeMs; } + u8 getNowCount() { return mNowCount; } public: /* 0x04 */ u8 unk4[4]; @@ -516,6 +502,22 @@ inline void dMeter2Info_setGameOverType(u8 i_gameoverType) { g_meter2_info.setGameOverType(i_gameoverType); } +inline void dMeter2Info_setMsgKeyWaitTimer(s16 i_waitTimer) { + g_meter2_info.setMsgKeyWaitTimer(i_waitTimer); +} + +inline u32 dMeter2Info_getMsgTimeMs() { + return g_meter2_info.getMsgTimeMs(); +} + +inline u32 dMeter2Info_getTimeMs() { + return g_meter2_info.getTimeMs(); +} + +inline u8 dMeter2Info_getNowCount() { + return g_meter2_info.getNowCount(); +} + char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index 8ac1d507e5..1b04e9eaf8 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -1,22 +1,437 @@ #ifndef D_MSG_D_MSG_CLASS_H #define D_MSG_D_MSG_CLASS_H -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "JSystem/JMessage/control.h" +#include "JSystem/JMessage/processor.h" +#include "d/msg/d_msg_out_font.h" +#include "f_op/f_op_msg.h" +struct JMSMesgEntry_c { + /* 0x00 */ u32 mStringOffset; + /* 0x04 */ u16 mStringId; + /* 0x06 */ u16 field_0x04; + /* 0x08 */ u8 field_0x08; + /* 0x09 */ u8 field_0x09; + /* 0x0A */ u8 field_0x0a; + /* 0x0B */ u8 field_0x0b; + /* 0x0C */ u8 field_0x0c; + /* 0x0D */ u8 field_0x0d; + /* 0x0E */ u8 field_0x0e; + /* 0x0F */ u8 field_0x0f; + /* 0x10 */ u32 field_0x10; +}; // Size: 0x14 -class msg_class : public leafdraw_class { -public: - /* 0xC0 */ int mMsgType; - /* 0xC4 */ create_tag_class mDwTg; - /* 0xD8 */ leafdraw_method_class* mSubMtd; - /* 0xDC */ fopAc_ac_c* mpActor; - /* 0xE0 */ cXyz mPos; - /* 0xEC */ u32 mMsgID; - /* 0xF0 */ u32 field_0xf0; - /* 0xF4 */ u32 field_0xf4; - /* 0xF8 */ u16 mMode; - /* 0xFA */ u8 mSelectedChoiceIdx; -}; // Size: 0xFC +struct JMSMesgHeader_c { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 sectionSize; + /* 0x08 */ u16 entryCount; + /* 0x0A */ u16 entrySize; + /* 0x0C */ u16 field_0xc; + /* 0x0E */ u16 field_0xe; +}; // Size: 0x10 + +struct STControl; +struct dMsgObject_c; +struct jmessage_tReference : public JMessage::TReference { + /* 80228B04 */ jmessage_tReference(); + /* 80228D28 */ void calcDistance(); + /* 80228DE0 */ u8 getLineMax(); + /* 80228E6C */ bool isKanban(); + /* 80228EA0 */ bool isPlaceName(); + /* 80228ED4 */ bool isBossName(); + /* 80228F08 */ bool isSaveSeq(); + /* 80228F3C */ bool isBook(); + /* 80228F70 */ bool isStaffRoll(); + /* 80228FA4 */ u8 isHowl(); + /* 80228FD8 */ bool isMidona(); + /* 8022900C */ void resetReference(); + /* 80229034 */ void pageSend(); + /* 80229168 */ void selectMessage(); + /* 802294A8 */ void inputNumber(); + /* 80229730 */ const char* getWord(int); + /* 80229744 */ void resetWord(); + /* 80229768 */ void setCharactor(u16); + /* 80229788 */ void addCharactor(u16); + /* 802297B0 */ void resetCharactor(); + /* 802297E4 */ void shiftCharCountBuffer(); + /* 80229810 */ void resetCharCountBuffer(); + /* 80229848 */ void allsetCharCountBuffer(); + /* 8022986C */ bool isCharSend(); + /* 802298DC */ bool isLightSend(); + /* 8022994C */ bool isLightEnd(); + /* 802299AC */ void decideOutFontRupeeColor(int); + /* 80232A20 */ cXyz getActorPos(); + + /* 80238C78 */ void setActorPos(cXyz pos) { mActorPos = pos; } + + bool isSelectSetCancelFlag() { return mSelectSetCancelFlag != 0; } + BOOL isSelectRubyFlag(int i_flag) { + return mSelectRubyFlag & (u8)(1 << i_flag) ? 1 : 0; + } + + void setAddCharAllAlphaRate(f32 i_alphaRate) { mAddCharAllAlphaRate = i_alphaRate; } + void setCharAllAlphaRate(f32 i_alphaRate) { mCharAllAlphaRate = i_alphaRate; } + void resetNowLightCount() { mNowLightCount = 0; } + void resetDrawLightCount() { mDrawLightCount = 0; } + void setBatchColorFlag(u8 i_flag) { mBatchColorFlag = i_flag; } + void setSendTimer(s16 i_timer) { mSendTimer = i_timer; } + void setSendFlag(u8 i_flag) { mSendFlag = i_flag; } + void setSelectNum(u8 i_num) { mSelectNum = i_num; } + void setSelectType(u8 i_type) { mSelectType = i_type; } + void resetInputFigure() { mInputFigure = 0; } + void onButtonTagStopFlag() { mButtonTagStopFlag = 1; } + void setDemoFrame(u32 i_frame) { mDemoFrame = i_frame; } + void setNowColorType(u8 i_colorType) { mNowColorType = i_colorType; } + void setNowTagScale(u16 i_tagScale) { mNowTagScale = i_tagScale; } + void setRevoMessageID(u32 i_msgID) { mRevoMessageID = i_msgID; } + void setPageLine(int i_no, s8 i_pageLine) { mPageLine[i_no] = i_pageLine; } + void setPageLineMax(int i_no, s8 i_pageLineMax) { mPageLineMax[i_no] = i_pageLineMax; } + void setPageType(int i_no, u8 i_pageType) { mPageType[i_no] = i_pageType; } + void setLineArrange(int i_no, u8 i_arrange) { mLineArrange[i_no] = i_arrange; } + void setLineScale(int i_no, u16 i_lineScale) { mLineScale[i_no] = i_lineScale; } + void setSelLength(int i_no, f32 i_selLength) { mSelLength[i_no] = i_selLength; } + void offSelectRubyFlag(int i_flag) { mSelectRubyFlag &= ~(u8)(1 << i_flag); } + void setPageEndCount(s16 i_endCount) { mPageEndCount = i_endCount; } + void onBombNameUseFlag() { mBombNameUseFlag = 1; } + void onSelectRubyFlag(int i_flag) { mSelectRubyFlag |= (1 << i_flag); } + + void setLineLength(int i_no, f32 i_strLen, f32 i_spaceLen) { + mStrLength[i_no] = i_strLen; + mSpaceLength[i_no] = i_spaceLen; + } + + void setSelectPos(u8 i_pos) { + if (!isSelectSetCancelFlag()) { + mSelectPos = i_pos; + } + } + + dMsgObject_c* getObjectPtr() { return mpObjectPtr; } + u8 getForm() { return mForm; } + u8 getNowLightCount() { return mNowLightCount; } + u8 getCharCountBuffer(int i_no) { return mCharCountBuffer[i_no]; } + u8 getDrawLightCount() { return mDrawLightCount; } + u8 getFukiKind() { return mFukiKind; } + s16 getSendTimer() { return mSendTimer; } + u8 getSelectNum() { return mSelectNum; } + u8 getSelectType() { return mSelectType; } + const char* getSelMsgPtr() { return mpSelMsgPtr; } + f32 getDistanceScale() { return mDistanceScale; } + + /* 80228CB4 */ virtual ~jmessage_tReference(); + + /* 0x0008 */ STControl* mpStick; + /* 0x000C */ u16 mCharactor[0x200]; + /* 0x040C */ s16 field_0x40c; + /* 0x040E */ s16 field_0x40e; + /* 0x0410 */ s16 mCountBackUp; + /* 0x0414 */ cXyz mActorPos; + /* 0x0420 */ f32 mFontSizeX; + /* 0x0424 */ f32 mFontSizeY; + /* 0x0428 */ f32 mRubySize; + /* 0x042C */ f32 mTBoxWidth; + /* 0x0430 */ f32 mTBoxHeight; + /* 0x0434 */ f32 mLineSpace; + /* 0x0438 */ f32 mCharSpace; + /* 0x043C */ f32 mRubyCharSpace; + /* 0x0440 */ f32 mSelFontSize; + /* 0x0444 */ f32 mSelRubySize; + /* 0x0448 */ f32 mSelTBoxWidth; + /* 0x044C */ f32 mSelCharSpace; + /* 0x0450 */ f32 mSelRubyCharSpace; + /* 0x0454 */ f32 mDistanceScale; + /* 0x0458 */ f32 mAddCharAllAlphaRate; + /* 0x045C */ f32 mCharAllAlphaRate; + /* 0x0460 */ f32 mAddCharAlpha; + /* 0x0464 */ f32 mCharAlpha; + /* 0x0468 */ f32 mStrLength[40]; + /* 0x0508 */ f32 mSpaceLength[40]; + /* 0x05A8 */ f32 mSelLength[3]; + /* 0x05B4 */ u32 mDemoFrame; + /* 0x05B8 */ u32 mRevoMessageID; + /* 0x05BC */ u16* mpStatus; + /* 0x05C0 */ dMsgObject_c* mpObjectPtr; + /* 0x05C4 */ char* mpSelMsgPtr; + /* 0x05C8 */ JUTFont* mpFont; + /* 0x05CC */ s16 mStartLineCount; + /* 0x05CE */ s16 mEndLineCount; + /* 0x05D0 */ u16 mLineCount; + /* 0x05D2 */ s16 field_0x5d2; + /* 0x05D4 */ s16 mPageEndCount; + /* 0x05D6 */ s16 mSendTimer; + /* 0x05D8 */ s16 mCharCnt; + /* 0x05DA */ s16 mPageNum; + /* 0x05DC */ u8 mNowLightCount; + /* 0x05DD */ u8 mDrawLightCount; + /* 0x05DE */ u16 mMsgID; + /* 0x05E0 */ u16 mLineScale[40]; + /* 0x0630 */ u16 mTopTagScale; + /* 0x0632 */ u16 mNowTagScale; + /* 0x0634 */ char mWord[10][100]; + /* 0x0A1C */ char mText[0x200]; + /* 0x0C1C */ char mTextS[0x200]; + /* 0x0E1C */ char mRuby[0x200]; + /* 0x101C */ u8 mSelText[3][50]; + /* 0x10B2 */ u8 mSelRuby[3][80]; + /* 0x11A2 */ s8 mPageLine[40]; + /* 0x11CA */ s8 mPageLineMax[40]; + /* 0x11F2 */ u8 mPageType[40]; + /* 0x121A */ u8 mLineArrange[40]; + /* 0x1242 */ u8 mSelectNum; + /* 0x1243 */ u8 mSelectType; + /* 0x1244 */ u8 mSelectPos; + /* 0x1245 */ u8 mFukiPosType; + /* 0x1246 */ u8 mFukiKind; + /* 0x1247 */ u8 mForm; + /* 0x1248 */ u8 mArrange; + /* 0x1249 */ u8 mNowColorType; + /* 0x124A */ u8 mTopColorType; + /* 0x124B */ bool mButtonTagStopFlag; + /* 0x124C */ u8 mSendFlag; + /* 0x124D */ u8 mStopFlag; + /* 0x124E */ u8 mSelectRubyFlag; + /* 0x124F */ u8 mInputFigure; + /* 0x1250 */ u8 mOutFontRupeeColor; + /* 0x1251 */ s8 mNowWordCount; + /* 0x1252 */ s8 mTopWordCount; + /* 0x1253 */ u8 mCharCountBuffer[31]; + /* 0x1272 */ bool mLightBatchFlag; + /* 0x1273 */ bool mBatchFlag; + /* 0x1274 */ bool mSelectSetCancelFlag; + /* 0x1275 */ bool mBombNameUseFlag; + /* 0x1276 */ u8 mBatchColorFlag; +}; // Size: 0x1278 + +struct jmessage_tMeasureProcessor : public JMessage::TRenderingProcessor { + /* 80229A28 */ jmessage_tMeasureProcessor(jmessage_tReference const*); + /* 8022B0B0 */ void do_scale(f32); + /* 8022B18C */ void do_space(u32); + /* 8022B3EC */ void do_pageType(int); + /* 8022B454 */ void do_name1(); + /* 8022B458 */ void do_rubyset(void const*, u32); + /* 8022B4E0 */ void push_word(char*); + + /* 8022B5F4 */ virtual ~jmessage_tMeasureProcessor(); + /* 80229AC4 */ virtual void do_begin(void const*, char const*); + /* 80229CB4 */ virtual void do_end(); + /* 80229E3C */ virtual void do_character(int); + /* 8022A268 */ virtual bool do_tag(u32, void const*, u32); + + /* 0x38 */ f32 field_0x38; + /* 0x3C */ s16 mTotalLineCnt; + /* 0x3E */ s16 field_0x3e; + /* 0x40 */ s16 field_0x40; + /* 0x42 */ u16 field_0x42; + /* 0x44 */ u8 field_0x44; + /* 0x45 */ u8 mSelectType; + /* 0x46 */ u8 field_0x46; + /* 0x47 */ u8 field_0x47; + /* 0x48 */ s8 field_0x48; + /* 0x49 */ s8 field_0x49; + /* 0x4A */ u8 mPageLineMax; + /* 0x4B */ u8 field_0x4b; + /* 0x4C */ u8 field_0x4c; + /* 0x4D */ u8 field_0x4d; +}; // Size: 0x50 + +struct jmessage_tControl; +struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor, + public jmessage_tMeasureProcessor { + /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); + /* 8022C904 */ void do_name1(); + /* 8022C908 */ void do_space(u32); + /* 8022CA24 */ void do_rubyset(void const*, u32); + /* 8022CAAC */ void push_word(); + /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*); + /* 8022CBE8 */ void calcStringLength(); + + /* 8023299C */ virtual ~jmessage_tSequenceProcessor(); + /* 8022B654 */ virtual void do_reset(); + /* 8022B658 */ virtual void do_begin(void const*, char const*); + /* 8022BA3C */ virtual void do_end(); + /* 8022BFE0 */ virtual void do_character(int); + /* 8022C1A0 */ virtual bool do_tag(u32, void const*, u32); + /* 8022BB7C */ virtual bool do_isReady(); + /* 8022C8FC */ virtual bool do_jump_isReady(); + /* 8022CBE4 */ virtual void do_jump(void const*, char const*); + + /* 0x4C jmessage_tMeasureProcessor */ + /* 0x9C */ const void* field_0x9c; + /* 0xA0 */ const char* field_0xa0; + /* 0xA4 */ u16 field_0xa4; + /* 0xA6 */ u16 field_0xa6; + /* 0xA8 */ s16 field_0xa8; + /* 0xAA */ u16 field_0xaa; + /* 0xAC */ u8 field_0xac; + /* 0xAD */ u8 field_0xad; + /* 0xAE */ u8 field_0xae; + /* 0xAF */ u8 mForceForm; + /* 0xB0 */ u8 mMouthCheck; + /* 0xB1 */ u8 field_0xb1; + /* 0xB2 */ u8 field_0xb2; + /* 0xB3 */ u8 field_0xb3; + /* 0xB4 */ u8 field_0xb4; + /* 0xB5 */ s8 field_0xb5; +}; + +struct CharInfo_c; +struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor { + /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*); + /* 8022E12C */ void resetRendering(); + /* 8022E17C */ void do_widthcenter(); + /* 8022E260 */ void do_selwidthcenter(int); + /* 8022E318 */ void do_heightcenter(); + /* 8022E7CC */ void do_color(u8); + /* 8022E860 */ void do_scale(f32); + /* 8022E960 */ void do_linedown(s16); + /* 8022E9C0 */ void do_transY(s16, bool); + /* 8022EAE4 */ void do_outfont(u8, u32); + /* 8022ED10 */ void do_arrow2(); + /* 8022EECC */ void getLineLength(int); + /* 8022EF00 */ void do_strcat(char*, bool, bool, bool); + /* 8022F148 */ void do_rubyset(void const*, u32); + /* 8022F384 */ void do_rubystrcat(char*, char*, f32, f32); + /* 8022F53C */ void do_name1(); + /* 8022F540 */ void do_numset(s16); + /* 8022F734 */ void push_word(); + /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32); + + /* 8023293C */ virtual ~jmessage_tRenderingProcessor(); + /* 8022CDC8 */ virtual void do_reset(); + /* 8022CDCC */ virtual void do_begin(void const*, char const*); + /* 8022CFD8 */ virtual void do_end(); + /* 8022D0A0 */ virtual void do_character(int); + /* 8022D74C */ virtual bool do_tag(u32, void const*, u32); + + /* 0x038 */ COutFont_c* mpOutFont; + /* 0x03C */ CharInfo_c* mCharInfoPtr; + /* 0x040 */ s16* mpCharInfoCnt; + /* 0x044 */ f32 field_0x44; + /* 0x048 */ f32 field_0x48; + /* 0x04C */ f32 field_0x4c; + /* 0x050 */ f32 mTextInitPosX; + /* 0x054 */ f32 mTextInitPosY; + /* 0x058 */ f32 mTextInitScaleX; + /* 0x05C */ f32 mTextInitScaleY; + /* 0x060 */ f32 mSelTextInitPosX[3]; + /* 0x06C */ f32 mSelTextInitPosY[3]; + /* 0x078 */ f32 mTextInitOffsetPos; + /* 0x07C */ f32 field_0x7c[40]; + /* 0x11C */ int field_0x11c; + /* 0x120 */ u32 mCCColor; + /* 0x124 */ u32 mGCColor; + /* 0x128 */ f32 field_0x128; + /* 0x12C */ f32 field_0x12c; + /* 0x130 */ f32 field_0x130; + /* 0x134 */ f32 field_0x134; + /* 0x138 */ f32 field_0x138; + /* 0x13C */ u16 field_0x13c; + /* 0x13E */ u16 field_0x13e; + /* 0x140 */ u16 field_0x140; + /* 0x142 */ u16 field_0x142; + /* 0x144 */ u16 field_0x144; + /* 0x146 */ u16 field_0x146; + /* 0x148 */ u16 field_0x148; + /* 0x14A */ u16 field_0x14a; + /* 0x14C */ u8 field_0x14c; + /* 0x14D */ u8 field_0x14d; + /* 0x14E */ u8 field_0x14e; + /* 0x14F */ u8 field_0x14f; + /* 0x150 */ u8 mColorNo; + /* 0x151 */ u8 field_0x151; + /* 0x152 */ u8 field_0x152[0x184 - 0x152]; + /* 0x184 */ u8 field_0x184; + /* 0x185 */ u8 field_0x185; + /* 0x186 */ u8 field_0x186; + /* 0x187 */ u8 field_0x187; +}; + +struct jmessage_string_tControl : public JMessage::TControl { + /* 8022FB5C */ jmessage_string_tControl(); + + /* 802328DC */ virtual ~jmessage_string_tControl(); +}; + +struct jmessage_string_tReference : public JMessage::TReference { + /* 8022F8C0 */ jmessage_string_tReference(); + /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); + /* 8022FA2C */ void setCharactor(u16); + /* 8022FA30 */ void addCharactor(u16); + /* 8022FA34 */ void resetCharactor(); + /* 8022FA38 */ void getLineLength(int); + /* 8022FA6C */ void addLineLength(int, f32); + /* 8022FA98 */ void getOutfontLength(int); + /* 8022FACC */ void setOutfontLength(int, f32); + /* 8022FAF0 */ void clearOutfontLength(int); + /* 8022FB24 */ void getLineCountNowPage(); + + /* 8022F94C */ virtual ~jmessage_string_tReference(); + + /* 0x08 */ J2DTextBox* mPanePtr; + /* 0x0C */ J2DTextBox* mRubyPanePtr; + /* 0x10 */ COutFont_c* mOutFontPtr; + /* 0x14 */ JUTFont* mpFont; + /* 0x18 */ f32 mLineLength[12]; + /* 0x48 */ f32 mOutfontLength[12]; + /* 0x78 */ u32 mCCColor; + /* 0x7C */ u32 mGCColor; + /* 0x80 */ s16 mLineCount; + /* 0x82 */ u8 mLineMax; + /* 0x83 */ u8 mNowPage; + /* 0x84 */ u8 mFlags; +}; + +struct jmessage_string_tMeasureProcessor : public JMessage::TRenderingProcessor { + /* 8022FB98 */ jmessage_string_tMeasureProcessor(jmessage_string_tReference const*); + /* 8023098C */ void do_rubyset(void const*, u32); + + /* 80230A5C */ virtual ~jmessage_string_tMeasureProcessor(); + /* 8022FBE4 */ virtual void do_begin(void const*, char const*); + /* 8022FC14 */ virtual void do_end(); + /* 8022FC28 */ virtual void do_character(int); + /* 8022FDF0 */ virtual void do_tag(u32, void const*, u32); + + /* 0x38 */ jmessage_string_tReference* mpReference; +}; + +struct jmessage_string_tSequenceProcessor : public JMessage::TSequenceProcessor, public jmessage_string_tMeasureProcessor { + /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*, + jmessage_string_tControl*); + + /* 80232858 */ virtual ~jmessage_string_tSequenceProcessor(); + /* 80230ABC */ virtual void do_reset(); + /* 80230AC0 */ virtual void do_begin(void const*, char const*); + /* 80230B7C */ virtual void do_end(); + /* 80230B88 */ virtual void do_character(int); + /* 80230B8C */ virtual void do_tag(u32, void const*, u32); + /* 80230B80 */ virtual bool do_isReady(); + /* 80230BBC */ virtual bool do_jump_isReady(); + /* 80230BC4 */ virtual void do_jump(void const*, char const*); +}; + +struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcessor { + /* 80230BC8 */ jmessage_string_tRenderingProcessor(jmessage_string_tReference const*); + /* 80230C20 */ void getLineCountNowPage(); + /* 80231D70 */ void do_widthcenter(); + /* 80231EF0 */ void do_heightcenter(); + /* 80232044 */ void do_strcat(char*); + /* 802320B0 */ void do_rubyset(void const*, u32); + /* 80232260 */ void do_rubystrcat(char*); + /* 802322CC */ void do_outfont(u8); + /* 8023256C */ void do_color(u8); + /* 80232600 */ void do_scale(f32); + /* 80232690 */ void do_linedown(s16); + /* 802326E4 */ void do_numset(s16); + /* 802327BC */ void push_word(char const*); + + /* 802327F8 */ virtual ~jmessage_string_tRenderingProcessor(); + /* 80230C5C */ virtual void do_reset(); + /* 80230CA0 */ virtual void do_begin(void const*, char const*); + /* 80230CE8 */ virtual void do_end(); + /* 80230D48 */ virtual void do_character(int); + /* 80231110 */ virtual void do_tag(u32, void const*, u32); + + /* 0x38 */ jmessage_string_tReference* mpReference; +}; #endif /* D_MSG_D_MSG_CLASS_H */ diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index 378fb187a1..4e975d941b 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -1,9 +1,7 @@ #ifndef D_MSG_D_MSG_FLOW_H #define D_MSG_D_MSG_FLOW_H -#include "d/msg/d_msg_class.h" -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_msg.h" // all mesg_flow_node structs members might be wrong struct mesg_flow_node { diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 7f7c74f6f2..8f9c3f73d0 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -7,7 +7,6 @@ #include "JSystem/JMessage/resource.h" #include "d/com/d_com_inf_game.h" #include "d/msg/d_msg_class.h" -#include "dolphin/types.h" class COutFont_c; class dMsgScrnBase_c; @@ -20,7 +19,7 @@ public: /* 80233AE8 */ void _delete(); /* 80233D04 */ void setMessageIndex(u32, u32, bool); /* 80233E70 */ void setMessageIndexDemo(u32, bool); - /* 80233F84 */ void getMessageIndex(u32); + /* 80233F84 */ int getMessageIndex(u32); /* 80233FD8 */ void getRevoMessageIndex(u32); /* 802340D4 */ void getMessageIndexAlways(u32); /* 80234128 */ void getMessageIDAlways(u32); @@ -51,24 +50,24 @@ public: /* 80236D0C */ void changeGroupLocal(s16); /* 80236DE4 */ void getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); - /* 802370A8 */ BOOL isGetItemMessage(); - /* 802370BC */ BOOL isKanbanMessage(); - /* 802370E8 */ BOOL isHowlMessage(); + /* 802370A8 */ u8 isGetItemMessage(); + /* 802370BC */ bool isKanbanMessage(); + /* 802370E8 */ u8 isHowlMessage(); /* 802370FC */ bool isMidonaMessage(); - /* 80237138 */ void isMidonaNormalTalkWait(); - /* 802371B0 */ void isMidonaTalkWait(); - /* 802371E4 */ void isPlaceMessage(); - /* 802371F8 */ void isBossMessage(); + /* 80237138 */ bool isMidonaNormalTalkWait(); + /* 802371B0 */ bool isMidonaTalkWait(); + /* 802371E4 */ bool isPlaceMessage(); + /* 802371F8 */ bool isBossMessage(); /* 8023720C */ bool isBookMessage(); - /* 80237214 */ void isStaffMessage(); - /* 80237228 */ void isSaveMessage(); - /* 8023723C */ void isTalkMessage(); - /* 802372CC */ void getSmellName(); - /* 80237334 */ void getPortalName(); - /* 8023738C */ void getBombName(); - /* 8023741C */ void getInsectName(); - /* 80237478 */ void getLetterName(); - /* 802374D0 */ void getSelectBombNum(); + /* 80237214 */ bool isStaffMessage(); + /* 80237228 */ bool isSaveMessage(); + /* 8023723C */ bool isTalkMessage(); + /* 802372CC */ const char* getSmellName(); + /* 80237334 */ const char* getPortalName(); + /* 8023738C */ const char* getBombName(); + /* 8023741C */ const char* getInsectName(); + /* 80237478 */ const char* getLetterName(); + /* 802374D0 */ u8 getSelectBombNum(); /* 80237520 */ void onMsgSendControlLocal(); /* 80237530 */ void offMsgSendControlLocal(); /* 80237550 */ void isMsgSendControlLocal(); @@ -145,7 +144,7 @@ public: /* 802384D8 */ static void setArrowNum(u8); /* 802384EC */ void setMsgOutputType(u8); /* 80238500 */ void getMsgOutputType(); - /* 80238514 */ void getWord(); + /* 80238514 */ static const char* getWord(); /* 80238528 */ void getSelectWord(int); /* 80238544 */ void setSelectWordFlag(u8); /* 80238574 */ void getSelectWordFlag(); @@ -159,8 +158,29 @@ public: void setShopWaitTimerLocal(u8 timer) { mShopWaitTimer = timer; } void setSelectCancelPosLocal(u8 pos) { mSelectCancelPos = pos; } u8 getItemEquipButtonLocal() { return mItemEquipButton; } + s16 getInputValueLocal() { return mInputValue; } + void setInputValueLocal(s16 i_inputValue) { mInputValue = i_inputValue; } + s16 getNowTotalPriceLocal() { return mNowTotalPrice; } + s16 getNowTotalPaymentLocal() { return mNowTotalPayment; } + void onInputFlagLocal() { mInputFlag = 1; } + void offAutoMessageFlagLocal() { mAutoMessageFlag = 0; } + void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; } + void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; } + u16 getPortalMessageIDLocal() { return mPortalMessageID; } + u8 getSelectPushFlag() { return mSelectPushFlag; } u8 getSelectCancelPos() { return mSelectCancelPos; } + s16 getInputValue() { return getInputValueLocal(); } + void setInputValue(s16 i_inputValue) { setInputValueLocal(i_inputValue); } + s16 getNowTotalPrice() { return getNowTotalPriceLocal(); } + s16 getNowTotalPayment() { return getNowTotalPaymentLocal(); } + void onInputFlag() { onInputFlagLocal(); } + void offAutoMessageFlag() { offAutoMessageFlagLocal(); } + void onAutoMessageFlag() { onAutoMessageFlagLocal(); } + void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); } + u16 getPortalMessageID() { return getPortalMessageIDLocal(); } + + jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; } /* 0x0FC */ int field_0xfc; /* 0x100 */ msg_class* field_0x100; @@ -195,11 +215,11 @@ public: /* 0x16E */ u16 field_0x16e; /* 0x170 */ u16 mNowTalkFlowNo; /* 0x172 */ u16 field_0x172; - /* 0x174 */ u16 mInputValue; + /* 0x174 */ s16 mInputValue; /* 0x176 */ u16 mFundRaisingValue; /* 0x178 */ u16 field_0x178; - /* 0x17A */ u16 mNowTotalPrice; - /* 0x17C */ u16 mNowTotalPayment; + /* 0x17A */ s16 mNowTotalPrice; + /* 0x17C */ s16 mNowTotalPayment; /* 0x17E */ u16 field_0x17e; /* 0x180 */ u16 mPortalMessageID; /* 0x182 */ u16 mBombMessageID[3]; @@ -278,6 +298,10 @@ inline void dMsgObject_setDemoMessage(u32 param_0) { dMsgObject_getMsgObjectClass()->setDemoMessage(param_0); } +inline const char* dMsgObject_getWord() { + return dMsgObject_c::getWord(); +} + inline void dMsgObject_setShopWaitTimer(u8 timer) { dMsgObject_c::setShopWaitTimer(timer); } @@ -478,13 +502,12 @@ public: /* 0x310 */ u16 mBossNameDisplayTime; /* 0x312 */ u16 mBatchDisplayWeight_3; /* 0x314 */ u16 mCharDisplayWeight_5; - /* 0x316 */ u16 mBatchDisplayWeight_8; - /* 0x318 */ u16 mBatchDisplayWeight_9; - /* 0x31A */ u16 mHaloDelayFrame; - /* 0x31C */ u16 mHaloDelayFrameSpirit; + /* 0x316 */ s16 mBatchDisplayWeight_8; + /* 0x318 */ s16 mBatchDisplayWeight_9; + /* 0x31A */ s16 mHaloDelayFrame; + /* 0x31C */ s16 mHaloDelayFrameSpirit; /* 0x31E */ bool mSaveSeqMsgDebug; /* 0x31F */ bool mMsgDebug; - /* 0x320 */ u8 field_0x320; /* 0x320 */ bool mTextColorDebug; /* 0x321 */ u8 mTextColorUpperR[9]; // Default, Red, Green, Blue, Yellow, L.Blue, Purple, Grey, Orange, /* 0x32A */ u8 mTextColorUpperG[9]; diff --git a/include/d/msg/d_msg_unit.h b/include/d/msg/d_msg_unit.h index af9ade818b..f32b1e6b44 100644 --- a/include/d/msg/d_msg_unit.h +++ b/include/d/msg/d_msg_unit.h @@ -3,4 +3,18 @@ #include "dolphin/types.h" +class dMsgUnit_c { +public: + /* 80238C94 */ dMsgUnit_c(); + /* 80238CEC */ void setTag(int, int, char*, bool); + + /* 80238CA4 */ virtual ~dMsgUnit_c(); +}; + +extern dMsgUnit_c g_msg_unit; + +inline void dMsgUnit_setTag(int param_0, int param_1, char* param_2) { + g_msg_unit.setTag(param_0, param_1, param_2, true); +} + #endif /* D_MSG_D_MSG_UNIT_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 387be9e51b..8071645b43 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -385,7 +385,7 @@ public: u16 getMaxLife() { return mMaxLife; } u16 getLife() const { return mLife; } - u16 getRupee() { return mRupee; } + u16 getRupee() const { return mRupee; } u16 getOil() { return mOil; } u16 getMaxOil() const { return mMaxOil; } u8& getMagic() { return mMagic; } @@ -678,6 +678,7 @@ class dSv_player_info_c { public: void init(); char* getLinkName() { return mPlayerName; } + char* getHorseName() { return mHorseName; } void setPlayerName(const char* i_name) { strcpy((char*)mPlayerName, i_name); } void setHorseName(const char* i_name) { strcpy((char*)mHorseName, i_name); } void setTotalTime(s64 i_time) { mTotalTime = i_time; } @@ -851,6 +852,9 @@ class dSv_MiniGame_c { public: void init(); + u32 getRaceGameTime() const { return mRaceGameTime; } + u32 getBalloonScore() const { return mBalloonScore; } + private: /* 0x00 */ u8 unk0; /* 0x01 */ u8 unk1[3]; @@ -1040,6 +1044,7 @@ public: dSv_player_c& getPlayer() { return mPlayer; } dSv_event_c& getEvent() { return mEvent; } dSv_memory_c& getSave(int i_stageNo) { return mSave[i_stageNo]; } + dSv_MiniGame_c& getMiniGame() { return mMiniGame; } void putSave(int i_stageNo, dSv_memory_c mem) { mSave[i_stageNo] = mem; } static const int STAGE_MAX = 32; @@ -1084,6 +1089,7 @@ public: dSv_turnRestart_c& getTurnRestart() { return mTurnRestart; } dSv_event_c& getEvent() { return mSavedata.getEvent(); } dSv_danBit_c& getDan() { return mDan; } + dSv_MiniGame_c& getMiniGame() { return mSavedata.getMiniGame(); } s64 getStartTime() const { return mStartTime; } s64 getSaveTotalTime() const { return mSaveTotalTime; } void setStartTime(s64 time) { mStartTime = time; } diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index d2d03f349f..a34161b4b6 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -53,6 +53,12 @@ inline void GXPosition3f32(f32 x, f32 y, f32 z) { GXFIFO.f32 = z; } +inline void GXNormal3f32(f32 x, f32 y, f32 z) { + GXFIFO.f32 = x; + GXFIFO.f32 = y; + GXFIFO.f32 = z; +} + inline void GXPosition2f32(f32 x, f32 z) { GXFIFO.f32 = x; GXFIFO.f32 = z; diff --git a/include/dolphin/gx/GXAttr.h b/include/dolphin/gx/GXAttr.h index 9b9bbdf4ee..7cebd8d6fd 100644 --- a/include/dolphin/gx/GXAttr.h +++ b/include/dolphin/gx/GXAttr.h @@ -29,9 +29,15 @@ void GXSetVtxAttrFmtv(GXVtxFmt fmt, GXVtxAttrFmtList* list); void __GXSetVAT(void); void GXSetArray(GXAttr attr, void* base, u8); void GXInvalidateVtxCache(void); -void GXSetTexCoordGen2(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx, GXBool renormalize, u32 pt_mtx); +void GXSetTexCoordGen2(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx, + GXBool renormalize, u32 pt_mtx); void GXSetNumTexGens(u8 numTexGens); +void GXGetVtxAttrFmtv(GXVtxFmt param_0, GXVtxAttrFmtList* param_1); +void GXGetVtxAttrFmt(GXVtxFmt param_0, int param_1, GXCompCnt* param_2, GXCompType* param_3, + u8* param_4); +void GXGetVtxDescv(GXVtxDescList* attrPtr); + #ifdef __cplusplus }; #endif diff --git a/include/dolphin/gx/GXDraw.h b/include/dolphin/gx/GXDraw.h new file mode 100644 index 0000000000..6e31b179f6 --- /dev/null +++ b/include/dolphin/gx/GXDraw.h @@ -0,0 +1,17 @@ +#ifndef GXDRAW_H +#define GXDRAW_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXDrawCylinder(u8 numEdges); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXDRAW_H */ diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h index 5ba7d17fb4..1e093473c6 100644 --- a/include/f_op/f_op_msg.h +++ b/include/f_op/f_op_msg.h @@ -1,8 +1,22 @@ #ifndef F_OP_F_OP_MSG_H #define F_OP_F_OP_MSG_H -#include "dolphin/types.h" #include "f_pc/f_pc_leaf.h" +#include "f_op/f_op_actor.h" + +class msg_class : public leafdraw_class { +public: + /* 0xC0 */ int mMsgType; + /* 0xC4 */ create_tag_class mDwTg; + /* 0xD8 */ leafdraw_method_class* mSubMtd; + /* 0xDC */ fopAc_ac_c* mpActor; + /* 0xE0 */ cXyz mPos; + /* 0xEC */ u32 mMsgID; + /* 0xF0 */ u32 field_0xf0; + /* 0xF4 */ u32 field_0xf4; + /* 0xF8 */ u16 mMode; + /* 0xFA */ u8 mSelectedChoiceIdx; +}; // Size: 0xFC extern leafdraw_method_class g_fopMsg_Method; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 8e115fd700..15fa6eae40 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -1,9 +1,7 @@ #ifndef F_F_OP_MSG_MNG_H_ #define F_F_OP_MSG_MNG_H_ -#include "d/msg/d_msg_class.h" -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_msg.h" struct msg_process_profile_definition { /* 0x00 */ leaf_process_profile_definition mBase; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 474820b6b3..40d5d75aee 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -8,6 +8,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "global.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_mtx.h" class mDoExt_baseAnm { public: @@ -481,6 +482,44 @@ private: /* 0x18 */ mDoExt_3Dline_c* field_0x18; }; +class mDoExt_cubePacket : public J3DPacket { +public: + mDoExt_cubePacket(cXyz& i_position, cXyz& i_size, csXyz& i_angle, const GXColor& i_color) { + mPosition = i_position; + mSize = i_size; + mAngle = i_angle; + mColor = i_color; + } + + virtual void draw(); + virtual ~mDoExt_cubePacket() {} + + /* 0x10 */ cXyz mPosition; + /* 0x1C */ cXyz mSize; + /* 0x28 */ csXyz mAngle; + /* 0x2E */ GXColor mColor; +}; + +class mDoExt_cylinderPacket : public J3DPacket { +public: + mDoExt_cylinderPacket(cXyz& i_position, f32 i_radius, f32 i_height, const GXColor& i_color, u8 param_4) { + mPosition = i_position; + mRadius = i_radius; + mHeight = i_height; + mColor = i_color; + field_0x28 = param_4; + } + + virtual void draw(); + virtual ~mDoExt_cylinderPacket() {} + + /* 0x10 */ cXyz mPosition; + /* 0x1C */ f32 mRadius; + /* 0x20 */ f32 mHeight; + /* 0x24 */ GXColor mColor; + /* 0x28 */ u8 field_0x28; +}; + JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index a415fd414d..dff4b20c56 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -24,6 +24,7 @@ void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Ve s16 param_4); void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]); void mDoMtx_ZrotM(Mtx mtx, s16 z); +void mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]); inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); @@ -98,6 +99,7 @@ public: static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); } static void inverse() { PSMTXInverse(now, now); } + static void inverseTranspose() { mDoMtx_inverseTranspose(now, now); } static void concat(const Mtx m) { PSMTXConcat(now, m, now); } static void revConcat(const Mtx m) { PSMTXConcat(m, now, now); } static void copy(const Mtx m) { PSMTXCopy(m, now); } diff --git a/include/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h b/include/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h index ea64262f62..cc30b2b861 100644 --- a/include/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h +++ b/include/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h @@ -1,6 +1,27 @@ #ifndef D_A_KYTAG06_H #define D_A_KYTAG06_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_path.h" + +class kytag06_class : public fopAc_ac_c { +public: + /* 0x568 */ dPath* mpPath; + /* 0x56C */ f32 mWindPower; + /* 0x570 */ f32 field_0x570; + /* 0x574 */ int field_0x574; + /* 0x578 */ int field_0x578; + /* 0x57C */ int field_0x57c; + /* 0x580 */ u32 field_0x580[4]; + /* 0x590 */ u8 mMode; + /* 0x591 */ u8 field_0x591; + /* 0x592 */ u8 field_0x592; + /* 0x593 */ u8 mType; + /* 0x594 */ u8 mPathNo; + /* 0x595 */ u8 mSwNo; + /* 0x596 */ u8 field_0x596; + /* 0x597 */ u8 field_0x597; + /* 0x598 */ u8 field_0x598; +}; #endif /* D_A_KYTAG06_H */ diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 460b109c14..ad6c49503a 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -5,8 +5,8 @@ #include "JSystem/JMessage/resource.h" #include "JSystem/JGadget/binary.h" -#include "dol2asm.h" #include "MSL_C/MSL_Common/Src/mem.h" +#include "dol2asm.h" // // Types: @@ -269,39 +269,27 @@ asm bool JMessage::TParse::parseBlock_next(void const** param_0, u32* param_1, u /* 802A9490-802A94A8 2A3DD0 0018+00 1/0 0/0 0/0 .text * parseCharacter_1Byte__Q28JMessage6localeFPPCc */ -// reg swap -#ifdef NONMATCHING -int JMessage::locale::parseCharacter_1Byte(char const** pString) { - u8* c; - int ret; +int JMessage::locale::parseCharacter_1Byte(char const** string) { + u8 parse_char = **string; - c = (u8*)*pString; - ret = *c; - - *pString = *pString + 1; - return ret; + *string = *string + 1; + return parse_char; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int JMessage::locale::parseCharacter_1Byte(char const** param_0) { - nofralloc -#include "asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s" -} -#pragma pop -#endif /* 802A94A8-802A94D4 2A3DE8 002C+00 1/0 0/0 0/0 .text * parseCharacter_2Byte__Q28JMessage6localeFPPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int JMessage::locale::parseCharacter_2Byte(char const** param_0) { - nofralloc -#include "asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s" +int JMessage::locale::parseCharacter_2Byte(char const** string) { + u8** tmp_str = (u8**)string; + + u8 hi = **tmp_str; + *tmp_str = *tmp_str + 1; + + u8 lo = **tmp_str; + int parse_char = (hi << 8) | lo; + *tmp_str = *tmp_str + 1; + + return parse_char; } -#pragma pop /* 802A94D4-802A9528 2A3E14 0054+00 1/1 0/0 0/0 .text lower_bound__3stdFPCUlPCUlRCUl */ #pragma push diff --git a/libs/dolphin/gx/GXAttr.c b/libs/dolphin/gx/GXAttr.c index 229a52e157..8572c332e1 100644 --- a/libs/dolphin/gx/GXAttr.c +++ b/libs/dolphin/gx/GXAttr.c @@ -4,8 +4,8 @@ // #include "dolphin/gx/GXAttr.h" -#include "dolphin/gx/GXInit.h" #include "dol2asm.h" +#include "dolphin/gx/GXInit.h" // // Forward References: @@ -137,6 +137,107 @@ asm void __GXCalculateVLim(void) { } #pragma pop +void GXGetVtxDesc(int param_0, GXAttrType* param_1) { + int local_38; + + switch (param_0) { + case 0: + local_38 = __GXData->field_0x14 & 1; + break; + case 1: + local_38 = (__GXData->field_0x14 & 2) >> 1; + break; + case 2: + local_38 = (__GXData->field_0x14 & 4) >> 2; + break; + case 3: + local_38 = (__GXData->field_0x14 & 8) >> 3; + break; + case 4: + local_38 = (__GXData->field_0x14 & 0x10) >> 4; + break; + case 5: + local_38 = (__GXData->field_0x14 & 0x20) >> 5; + break; + case 6: + local_38 = (__GXData->field_0x14 & 0x40) >> 6; + break; + case 7: + local_38 = (__GXData->field_0x14 & 0x80) >> 7; + break; + case 8: + local_38 = (__GXData->field_0x14 & 0x100) >> 8; + break; + case 9: + local_38 = (__GXData->field_0x14 & 0x600) >> 9; + break; + case 10: + if (__GXData->field_0x4d4 != 0) { + local_38 = (__GXData->field_0x14 & 0x1800) >> 11; + } else { + local_38 = 0; + } + break; + case 0x19: + if (__GXData->field_0x4d5 != 0) { + local_38 = (__GXData->field_0x14 & 0x1800) >> 11; + } else { + local_38 = 0; + } + break; + case 11: + local_38 = (__GXData->field_0x14 & 0x6000) >> 13; + break; + case 12: + local_38 = (__GXData->field_0x14 & 0x18000) >> 15; + break; + case 13: + local_38 = (__GXData->field_0x18 & 3); + break; + case 14: + local_38 = (__GXData->field_0x18 & 0xC) >> 2; + break; + case 15: + local_38 = (__GXData->field_0x18 & 0x30) >> 4; + break; + case 16: + local_38 = (__GXData->field_0x18 & 0xC0) >> 6; + break; + case 17: + local_38 = (__GXData->field_0x18 & 0x300) >> 8; + break; + case 18: + local_38 = (__GXData->field_0x18 & 0xC00) >> 10; + break; + case 19: + local_38 = (__GXData->field_0x18 & 0x3000) >> 12; + break; + case 20: + local_38 = (__GXData->field_0x18 & 0xC000) >> 14; + break; + default: + local_38 = 0; + break; + } + + *param_1 = local_38; +} + +void GXGetVtxDescv(GXVtxDescList* attrPtr) { + int i; + + for (i = 0; i <= 0x14; i++) { + attrPtr[i].attr = (GXAttr)i; + GXGetVtxDesc(i, &attrPtr[i].type); + } + + attrPtr[i].attr = (GXAttr)0x19; + GXGetVtxDesc(0x19, &attrPtr[i].type); + + i++; + attrPtr[i].attr = (GXAttr)0xFF; +} + /* 8035B58C-8035B5C4 355ECC 0038+00 0/0 66/66 7/7 .text GXClearVtxDesc */ #pragma push #pragma optimization_level 0 @@ -205,6 +306,161 @@ asm void __GXSetVAT(void) { } #pragma pop +static u8 GetFracForNrm(int param_0) { + int var_r31; + + switch (param_0) { + case 1: + var_r31 = 6; + break; + case 3: + var_r31 = 14; + break; + default: + case 2: + var_r31 = 0; + break; + } + + return var_r31; +} + +void GXGetVtxAttrFmtv(GXVtxFmt param_0, GXVtxAttrFmtList* param_1) { + s32 tmp; + s32 tmp2; + s32 tmp3; + int i; + +#ifdef DEBUG + // not fully matching + tmp = 1; + if (data_8074d3c8 != 0) { + OSPanic("GXAttr.c", 941, "\'GXGetVtxAttrFmtv\' is not allowed between GXBegin/GXEnd"); + tmp = 0; + } + + tmp2 = 1; + if (param_1 == NULL) { + OSPanic("GXAttr.c", 942, "GXSetVtxAttrFmt: list pointer is NULL"); + tmp2 = 0; + } + + tmp3 = 1; + if (param_0 >= 8) { + OSPanic("GXAttr.c", 943, "GXSetVtxAttrFmt: Format Index is out of range"); + tmp3 = 0; + } +#endif + + for (i = 9; i <= 0x14; i++) { + param_1->mAttrib = i; + GXGetVtxAttrFmt(param_0, i, ¶m_1->mCompCnt, ¶m_1->mCompType, ¶m_1->mCompShift); + param_1++; + } + + param_1->mAttrib = 0xFF; +} + +void GXGetVtxAttrFmt(GXVtxFmt param_0, int param_1, GXCompCnt* param_2, GXCompType* param_3, + u8* param_4) { + s32 tmp; + s32 tmp2; + GXCompCnt* tmp_1; + GXCompCnt* tmp_2; + u32* tmp_3; + +#ifdef DEBUG + // not fully matching + tmp = 1; + if (data_8074d3c8) { + OSPanic("GXAttr.c", 844, "\'GXGetVtxAttrFmt\' is not allowed between GXBegin/GXEnd"); + tmp = 0; + } + + tmp2 = 1; + if (param_0 >= 8) { + OSPanic("GXAttr.c", 845, "GXSetVtxAttrFmt: Format Index is out of range"); + tmp2 = 0; + } +#endif + + tmp_1 = &__GXData->field_0x1c[param_0]; + tmp_2 = &__GXData->field_0x3c[param_0]; + tmp_3 = &__GXData->field_0x5c[param_0]; + + switch (param_1) { + case 9: + *param_2 = *tmp_1 & 1; + *param_3 = (*tmp_1 & 0xE) >> 1; + *param_4 = (*tmp_1 & 0x1F0) >> 4; + break; + case 10: + case 0x19: + *param_2 = (*tmp_1 & 0x200) >> 9; + if (*param_2 == 1 && ((*tmp_1 & 0x80000000) >> 31) != 0) { + *param_2 = 2; + } + + *param_3 = (*tmp_1 & 0x1C00) >> 10; + *param_4 = GetFracForNrm(*param_3); + break; + case 11: + *param_2 = (*tmp_1 & 0x2000) >> 0xd; + *param_3 = (*tmp_1 & 0x1C000) >> 0xe; + *param_4 = 0; + break; + case 12: + *param_2 = (*tmp_1 & 0x20000) >> 0x11; + *param_3 = (*tmp_1 & 0x1C0000) >> 0x12; + *param_4 = 0; + break; + case 13: + *param_2 = (*tmp_1 & 0x200000) >> 0x15; + *param_3 = (*tmp_1 & 0x1C00000) >> 0x16; + *param_4 = ((*tmp_1 & 0x3e000000)) >> 25; + break; + case 14: + *param_2 = *tmp_2 & 1; + *param_3 = (*tmp_2 & 0xE) >> 1; + *param_4 = (*tmp_2 & 0x1F0) >> 4; + break; + case 15: + *param_2 = (*tmp_2 & 0x200) >> 9; + *param_3 = (*tmp_2 & 0x1C00) >> 10; + *param_4 = (*tmp_2 & 0x3E000) >> 13; + break; + case 16: + *param_2 = (*tmp_2 & 0x40000) >> 0x12; + *param_3 = (*tmp_2 & 0x380000) >> 0x13; + *param_4 = (*tmp_2 & 0x7C00000) >> 0x16; + break; + case 17: + *param_2 = (*tmp_2 & 0x8000000) >> 0x1B; + *param_3 = (*tmp_2 & 0x70000000) >> 0x1C; + *param_4 = (*tmp_3 & 0x1F); + break; + case 18: + *param_2 = (*tmp_3 & 0x20) >> 5; + *param_3 = (*tmp_3 & 0x1C0) >> 6; + *param_4 = (*tmp_3 & 0x3E00) >> 9; + break; + case 19: + *param_2 = (*tmp_3 & 0x4000) >> 0xe; + *param_3 = (*tmp_3 & 0x38000) >> 0xf; + *param_4 = (*tmp_3 & 0x7c0000) >> 0x12; + break; + case 20: + *param_2 = (*tmp_3 & 0x800000) >> 0x17; + *param_3 = (*tmp_3 & 0x7000000) >> 0x18; + *param_4 = (*tmp_3 & 0xF8000000) >> 0x1b; + break; + default: + *param_2 = 1; + *param_3 = 0; + *param_4 = 0; + } +} + /* 8035BB28-8035BB6C 356468 0044+00 0/0 13/13 5/5 .text GXSetArray */ #pragma push #pragma optimization_level 0 @@ -253,7 +509,8 @@ SECTION_DATA static void* lit_739[21] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSetTexCoordGen2(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx, GXBool renormalize, u32 pt_mtx) { +asm void GXSetTexCoordGen2(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx, + GXBool renormalize, u32 pt_mtx) { nofralloc #include "asm/dolphin/gx/GXAttr/GXSetTexCoordGen2.s" } diff --git a/libs/dolphin/gx/GXDraw.c b/libs/dolphin/gx/GXDraw.c new file mode 100644 index 0000000000..cc44bb8b4d --- /dev/null +++ b/libs/dolphin/gx/GXDraw.c @@ -0,0 +1,71 @@ +#include "dolphin/gx/GXDraw.h" +#include "dolphin/gx/GX.h" + +static GXVtxDescList vcd[27]; +static GXVtxAttrFmtList vat[27]; + +void GetVertState(void) { + GXGetVtxDescv(vcd); + GXGetVtxAttrFmtv(GX_VTXFMT3, vat); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_NRM, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT3, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT3, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0); +} + +void RestoreVertState(void) { + GXSetVtxDescv(vcd); + GXSetVtxAttrFmtv(GX_VTXFMT3, vat); +} + +// doesn't fully match debug +void GXDrawCylinder(u8 numEdges) { + f32 temp_f29; + f32 temp_f30; + f32 temp_f31; + + s32 i; + + f32 sp1A0[100]; + f32 sp10[100]; + + temp_f31 = 1.0f; + temp_f30 = -temp_f31; + + GetVertState(); + for (i = 0; i <= numEdges; i++) { + temp_f29 = (i * 2.0f * 3.141593f) / numEdges; + sp1A0[i] = cosf(temp_f29); + sp10[i] = sinf(temp_f29); + } + + GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT3, (numEdges + 1) * 2); + for (i = 0; i <= numEdges; i++) { + GXPosition3f32(sp1A0[i], sp10[i], temp_f30); + GXNormal3f32(sp1A0[i], sp10[i], 0.0f); + GXPosition3f32(sp1A0[i], sp10[i], temp_f31); + GXNormal3f32(sp1A0[i], sp10[i], 0.0f); + } + i_GXEnd(); + + GXBegin(GX_TRIANGLEFAN, GX_VTXFMT3, numEdges + 2); + GXPosition3f32(0.0f, 0.0f, temp_f31); + GXNormal3f32(0.0f, 0.0f, 1.0f); + for (i = 0; i <= numEdges; i++) { + GXPosition3f32(sp1A0[i], -sp10[i], temp_f31); + GXNormal3f32(0.0f, 0.0f, 1.0f); + } + i_GXEnd(); + + GXBegin(GX_TRIANGLEFAN, GX_VTXFMT3, numEdges + 2); + GXPosition3f32(0.0f, 0.0f, temp_f30); + GXNormal3f32(0.0f, 0.0f, -1.0f); + for (i = 0; i <= numEdges; i++) { + GXPosition3f32(sp1A0[i], sp10[i], temp_f30); + GXNormal3f32(0.0f, 0.0f, -1.0f); + } + i_GXEnd(); + + RestoreVertState(); +} \ No newline at end of file diff --git a/libs/dolphin/gx/Makefile b/libs/dolphin/gx/Makefile index a83a0ee3f3..c025601779 100644 --- a/libs/dolphin/gx/Makefile +++ b/libs/dolphin/gx/Makefile @@ -14,6 +14,7 @@ LIBGX_A_CPP_FILES := \ libs/dolphin/gx/GXBump.c \ libs/dolphin/gx/GXTev.c \ libs/dolphin/gx/GXPixel.c \ + libs/dolphin/gx/GXDraw.c \ libs/dolphin/gx/GXDisplayList.c \ libs/dolphin/gx/GXTransform.c \ libs/dolphin/gx/GXPerf.c \ @@ -30,6 +31,7 @@ LIBGX_A_O_FILES := \ $(BUILD_DIR)/libs/dolphin/gx/GXBump.o \ $(BUILD_DIR)/libs/dolphin/gx/GXTev.o \ $(BUILD_DIR)/libs/dolphin/gx/GXPixel.o \ + $(BUILD_DIR)/libs/dolphin/gx/GXDraw.o \ $(BUILD_DIR)/libs/dolphin/gx/GXDisplayList.o \ $(BUILD_DIR)/libs/dolphin/gx/GXTransform.o \ $(BUILD_DIR)/libs/dolphin/gx/GXPerf.o \ diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index 848defa6e4..b4866f5e22 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -12,15 +12,6 @@ // Types: // -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF7C */ void quatM(Quaternion const*); - - static u8 now[48]; -}; - struct mDoCPd_c { static u8 m_cpadInfo[256]; }; diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index fd494c6152..b379d2c5dd 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -1,213 +1,72 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag06 -// +/** + * d_a_kytag06.cpp + * Weather System Manager + */ #include "rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct kytag06_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz { - /* 808589A4 */ ~cXyz(); -}; - -struct dPa_control_c { - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -// -// Forward References: -// - -extern "C" static void dice_wether_init__FUcff(); -extern "C" static void dice_wether_execute__FUcff(); -extern "C" static void dice_rain_minus__Fv(); -extern "C" static void dKy_event_proc__Fv(); -extern "C" static void daKytag06_type_04_Execute__FP13kytag06_class(); -extern "C" static void set_path_info__FP10fopAc_ac_c(); -extern "C" static void near_rail_get__FP13kytag06_classP4cXyz(); -extern "C" static void daKytag06_Draw__FP13kytag06_class(); -extern "C" static void daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc(); -extern "C" static void daKytag06_Ganon_wether_proc__FP13kytag06_classUc(); -extern "C" static void daKytag06_wether_proc__FP13kytag06_classUc(); -extern "C" static void daKytag06_type_07_wether_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_07_Execute__FP13kytag06_class(); -extern "C" void __dt__4cXyzFv(); -extern "C" static void daKytag06_type_06_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_08_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_09_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_10_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_11_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_05_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_type_03_Execute__FP13kytag06_class(); -extern "C" static void daKytag06_Execute__FP13kytag06_class(); -extern "C" static bool daKytag06_IsDelete__FP13kytag06_class(); -extern "C" static void daKytag06_Delete__FP13kytag06_class(); -extern "C" static void daKytag06_type04_init__FP10fopAc_ac_c(); -extern "C" static void daKytag06_type06_init__FP10fopAc_ac_c(); -extern "C" static void daKytag06_type02_init__FP10fopAc_ac_c(); -extern "C" static void daKytag06_type03_init__FP10fopAc_ac_c(); -extern "C" static void daKytag06_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_kytag06__stringBase0; -extern "C" extern void* g_profile_KYTAG06[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void getLayerNo__14dComIfG_play_cFi(); -extern "C" void dComIfGs_BossLife_public_Get__Fv(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void dKyw_custom_windpower__Ff(); -extern "C" void dKyw_evt_wind_set__Fss(); -extern "C" void dKyw_evt_wind_set_go__Fv(); -extern "C" void dKyw_rain_set__Fi(); -extern "C" void dKy_change_colpat__FUc(); -extern "C" void dKy_custom_colset__FUcUcf(); -extern "C" void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void cM_rndF__Ff(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void setSnowPower__10Z2EnvSeMgrFSc(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80859E78-80859E7C 000000 0004+00 11/11 0/0 0/0 .rodata @3740 */ -SECTION_RODATA static f32 const lit_3740 = 360.0f; -COMPILER_STRIP_GATE(0x80859E78, &lit_3740); +#include "SSystem/SComponent/c_counter.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text dice_wether_init__FUcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dice_wether_init(u8 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_init__FUcff.s" +static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + env_light->mDiceWeatherMode = i_weatherMode; + env_light->mDiceWeatherTime = + i_currentTime + i_weatherTime + cM_rndF(i_weatherTime) + cM_rndF(i_weatherTime); + + if (env_light->mDiceWeatherTime >= 360.0f) { + env_light->mDiceWeatherTime -= 360.0f; + } } -#pragma pop /* 80857918-808579EC 000198 00D4+00 1/1 0/0 0/0 .text dice_wether_execute__FUcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dice_wether_execute(u8 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_wether_execute__FUcff.s" +static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + env_light->mDiceWeatherMode = i_weatherMode; + + if (env_light->mDiceWeatherMode != 0xFF) { + env_light->mDiceWeatherTime = + i_currentTime + i_weatherTime + cM_rndF(i_weatherTime) + cM_rndF(i_weatherTime); + + if (env_light->mDiceWeatherTime >= 360.0f) { + env_light->mDiceWeatherTime -= 360.0f; + } + + env_light->mDiceWeatherCounter++; + } else { + env_light->mDiceWeatherMode = 0; + env_light->mDiceWeatherState++; + } } -#pragma pop /* 808579EC-80857A50 00026C 0064+00 3/3 0/0 0/0 .text dice_rain_minus__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dice_rain_minus() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dice_rain_minus__Fv.s" +static void dice_rain_minus() { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + if ((g_Counter.mCounter0 & 3) == 0) { + // run block every 4 frames + if (env_light->mRainCount > 40) { + env_light->mRainCount -= 3; + } else if (env_light->mRainCount != 0) { + env_light->mRainCount--; + } + + dKyw_rain_set(env_light->mRainCount); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80859E7C-80859E80 000004 0004+00 0/2 0/0 0/0 .rodata @3877 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3877 = 15.0f; -COMPILER_STRIP_GATE(0x80859E7C, &lit_3877); -#pragma pop - -/* 80859E80-80859E84 000008 0004+00 0/1 0/0 0/0 .rodata @3878 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3878 = 0x414FD70A; -COMPILER_STRIP_GATE(0x80859E80, &lit_3878); -#pragma pop - -/* 80859E84-80859E88 00000C 0004+00 0/1 0/0 0/0 .rodata @3879 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3879 = 180.0f; -COMPILER_STRIP_GATE(0x80859E84, &lit_3879); -#pragma pop - -/* 80859E88-80859E8C 000010 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3880 = 0x40FFAE14; -COMPILER_STRIP_GATE(0x80859E88, &lit_3880); -#pragma pop /* 80859FA0-80859FAC 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, }; /* 80859FAC-80859FC0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ +// unused? #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, @@ -217,538 +76,551 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80859FC0-80859FE0 000020 0020+00 0/1 0/0 0/0 .data S_time_table$3766 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_time_table[32] = { - 0x42, 0x34, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x43, 0x87, 0x00, 0x00, 0x43, 0xB4, 0x00, 0x00, -}; -#pragma pop - -/* 80859FE0-80859FE8 000040 0008+00 0/1 0/0 0/0 .data S_wether_table$3767 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_table[8] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x01, 0x02, -}; -#pragma pop - -/* 80859FE8-80859FEC 000048 0004+00 0/1 0/0 0/0 .data S_wether_mode_pat01$3768 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_mode_pat01[4] = { - 0x01, - 0x02, - 0x01, - 0xFF, -}; -#pragma pop - -/* 80859FEC-80859FF8 00004C 000C+00 0/1 0/0 0/0 .data S_wether_time_pat01$3769 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_time_pat01[12] = { - 0x40, 0xF0, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, -}; -#pragma pop - -/* 80859FF8-80859FFC 000058 0004+00 0/1 0/0 0/0 .data S_wether_mode_pat02$3770 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_mode_pat02[4] = { - 0x01, - 0x04, - 0x01, - 0xFF, -}; -#pragma pop - -/* 80859FFC-8085A008 00005C 000C+00 0/1 0/0 0/0 .data S_wether_time_pat02$3771 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_time_pat02[12] = { - 0x40, 0xA0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, -}; -#pragma pop - -/* 8085A008-8085A00C 000068 0004+00 0/1 0/0 0/0 .data S_wether_mode_pat03$3772 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_mode_pat03[4] = { - 0x01, - 0x03, - 0x01, - 0xFF, -}; -#pragma pop - -/* 8085A00C-8085A018 00006C 000C+00 0/1 0/0 0/0 .data S_wether_time_pat03$3773 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_time_pat03[12] = { - 0x40, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, -}; -#pragma pop - -/* 8085A018-8085A01C 000078 0002+02 0/1 0/0 0/0 .data S_wether_mode_pat04$3774 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_mode_pat04[2 + 2 /* padding */] = { - 0x01, - 0xFF, - /* padding */ - 0x00, - 0x00, -}; -#pragma pop - -/* 8085A01C-8085A020 00007C 0004+00 0/1 0/0 0/0 .data S_wether_time_pat04$3775 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_time_pat04[4] = { - 0x41, - 0xF0, - 0x00, - 0x00, -}; -#pragma pop - -/* 8085A020-8085A024 000080 0004+00 0/1 0/0 0/0 .data S_wether_mode_pat05$3776 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_mode_pat05[4] = { - 0x01, - 0x05, - 0x01, - 0xFF, -}; -#pragma pop - -/* 8085A024-8085A030 000084 000C+00 0/1 0/0 0/0 .data S_wether_time_pat05$3777 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 S_wether_time_pat05[12] = { - 0x40, 0x70, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x40, 0x70, 0x00, 0x00, -}; -#pragma pop - -/* 8085A030-8085A04C -00001 001C+00 1/1 0/0 0/0 .data @3883 */ -SECTION_DATA static void* lit_3883[7] = { - (void*)(((char*)dKy_event_proc__Fv) + 0x378), (void*)(((char*)dKy_event_proc__Fv) + 0x398), - (void*)(((char*)dKy_event_proc__Fv) + 0x3AC), (void*)(((char*)dKy_event_proc__Fv) + 0x3E4), - (void*)(((char*)dKy_event_proc__Fv) + 0x404), (void*)(((char*)dKy_event_proc__Fv) + 0x3DC), - (void*)(((char*)dKy_event_proc__Fv) + 0x418), -}; - /* 80857A50-80857F28 0002D0 04D8+00 2/1 0/0 0/0 .text dKy_event_proc__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_event_proc() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/dKy_event_proc__Fv.s" +static void dKy_event_proc() { + static f32 S_time_table[8] = {45.0f, 75.0f, 120.0f, 150.0f, 180.0f, 240.0f, 270.0f, 360.0f}; + static u8 S_wether_table[8] = {0, 1, 2, 3, 4, 0, 1, 2}; + + static u8 S_wether_mode_pat01[4] = {1, 2, 1, 0xFF}; + static f32 S_wether_time_pat01[3] = {7.5f, 7.5f, 7.5f}; + + static u8 S_wether_mode_pat02[4] = {1, 4, 1, 0xFF}; + static f32 S_wether_time_pat02[3] = {5.0f, 15.0f, 5.0f}; + + static u8 S_wether_mode_pat03[4] = {1, 3, 1, 0xFF}; + static f32 S_wether_time_pat03[3] = {7.5f, 15.0f, 7.5f}; + + static u8 S_wether_mode_pat04[2] = {1, 0xFF}; + static f32 S_wether_time_pat04[1] = {30.0f}; + + static u8 S_wether_mode_pat05[4] = {1, 5, 1, 0xFF}; + static f32 S_wether_time_pat05[3] = {3.75f, 7.5f, 3.75f}; + + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + if (!g_env_light.mCameraInWater) { + if (g_env_light.mInitAnmTimer == 0) { + f32 current_time = dComIfGs_getTime(); + + switch (env_light->mDiceWeatherState) { + case 0: + if (current_time > env_light->mDiceWeatherChangeTime && + current_time - env_light->mDiceWeatherChangeTime < 15.0f) + { + env_light->mDiceWeatherState = 1; + } + break; + case 1: + u8 table_no = cM_rndF(12.99f); + if (table_no >= 8) { + env_light->mDiceWeatherState = 3; + } else { + env_light->mDiceWeatherCurrPattern = S_wether_table[table_no]; + env_light->mDiceWeatherCounter = 0; + + switch (env_light->mDiceWeatherCurrPattern) { + case 0: + dice_wether_init(S_wether_mode_pat01[env_light->mDiceWeatherCounter], + S_wether_time_pat01[env_light->mDiceWeatherCounter], + current_time); + break; + case 1: + dice_wether_init(S_wether_mode_pat02[env_light->mDiceWeatherCounter], + S_wether_time_pat02[env_light->mDiceWeatherCounter], + current_time); + break; + case 2: + dice_wether_init(S_wether_mode_pat03[env_light->mDiceWeatherCounter], + S_wether_time_pat03[env_light->mDiceWeatherCounter], + current_time); + break; + case 3: + dice_wether_init(S_wether_mode_pat04[env_light->mDiceWeatherCounter], + S_wether_time_pat04[env_light->mDiceWeatherCounter], + current_time); + break; + case 4: + dice_wether_init(S_wether_mode_pat05[env_light->mDiceWeatherCounter], + S_wether_time_pat05[env_light->mDiceWeatherCounter], + current_time); + break; + } + + env_light->mDiceWeatherCounter++; + env_light->mDiceWeatherState++; + } + break; + case 2: + if (current_time > env_light->mDiceWeatherTime && + current_time - env_light->mDiceWeatherTime < 180.0f) + { + switch (env_light->mDiceWeatherCurrPattern) { + case 0: + dice_wether_execute(S_wether_mode_pat01[env_light->mDiceWeatherCounter], + S_wether_time_pat01[env_light->mDiceWeatherCounter], + current_time); + break; + case 1: + dice_wether_execute(S_wether_mode_pat02[env_light->mDiceWeatherCounter], + S_wether_time_pat02[env_light->mDiceWeatherCounter], + current_time); + break; + case 2: + dice_wether_execute(S_wether_mode_pat03[env_light->mDiceWeatherCounter], + S_wether_time_pat03[env_light->mDiceWeatherCounter], + current_time); + break; + case 3: + dice_wether_execute(S_wether_mode_pat04[env_light->mDiceWeatherCounter], + S_wether_time_pat04[env_light->mDiceWeatherCounter], + current_time); + break; + case 4: + dice_wether_execute(S_wether_mode_pat05[env_light->mDiceWeatherCounter], + S_wether_time_pat05[env_light->mDiceWeatherCounter], + current_time); + break; + } + } + break; + case 3: + u8 time_table_no = cM_rndF(7.99f); + env_light->mDiceWeatherChangeTime = current_time + S_time_table[time_table_no]; + + if (env_light->mDiceWeatherChangeTime >= 360.0f) { + env_light->mDiceWeatherChangeTime -= 360.0f; + } + + env_light->mDiceWeatherState = 0; + break; + } + + if (g_env_light.field_0x130b == 1) { + env_light->mDiceWeatherMode = 6; + } + + if (g_env_light.mColPatMode == 0 && g_env_light.mColPatModeGather == 0) { + u8 weather_colpat; + + switch (env_light->mDiceWeatherMode) { + case 0: + weather_colpat = 0; + if (g_env_light.mThunderEff.mMode == 1) { + g_env_light.mThunderEff.mMode = 0; + } + + dice_rain_minus(); + break; + case 1: + g_env_light.mThunderEff.mMode = 0; + weather_colpat = 1; + dice_rain_minus(); + break; + case 2: + weather_colpat = 1; + if (env_light->mRainCount < 40) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } else { + env_light->mRainCount--; + dKyw_rain_set(env_light->mRainCount); + } + break; + case 5: + g_env_light.mThunderEff.mMode = 1; + case 3: + weather_colpat = 2; + if (env_light->mRainCount < 250) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } + break; + case 4: + weather_colpat = 1; + g_env_light.mThunderEff.mMode = 1; + dice_rain_minus(); + break; + case 6: + weather_colpat = 0; + if (g_env_light.mThunderEff.mMode == 1) { + g_env_light.mThunderEff.mMode = 0; + } + + if (env_light->mRainCount > 2) { + env_light->mRainCount -= 2; + } else { + env_light->mRainCount = 0; + } + + dKyw_rain_set(env_light->mRainCount); + } + + if (env_light->mColpatWeather != weather_colpat) { + g_env_light.mColpatWeather = weather_colpat; + g_env_light.mColpatCurrGather = weather_colpat; + } + } + + if (g_env_light.mColPatMode == 0 && g_env_light.mColPatModeGather == 0 && + g_env_light.mColpatCurrGather != 0xFF && + g_env_light.mColPatCurr != g_env_light.mColpatCurrGather) + { + g_env_light.mColPatBlendGather = 0.0f; + } + } + } } -#pragma pop /* 80857F28-80857F48 0007A8 0020+00 1/1 0/0 0/0 .text daKytag06_type_04_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_04_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_04_Execute__FP13kytag06_class.s" +static void daKytag06_type_04_Execute(kytag06_class*) { + dKy_event_proc(); } -#pragma pop /* 80857F48-80857F8C 0007C8 0044+00 1/1 0/0 0/0 .text set_path_info__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void set_path_info(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/set_path_info__FP10fopAc_ac_c.s" +static dPath* set_path_info(fopAc_ac_c* i_this) { + kytag06_class* this_ = (kytag06_class*)i_this; + dPath* room_path = NULL; + + if (this_->mPathNo != 0xFF) { + room_path = dPath_GetRoomPath(this_->mPathNo, fopAcM_GetRoomNo(this_)); + } + + return room_path; } -#pragma pop - -/* ############################################################################################## */ -/* 80859E8C-80859E90 000014 0004+00 1/7 0/0 0/0 .rodata @3881 */ -SECTION_RODATA static u8 const lit_3881[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80859E8C, &lit_3881); - -/* 80859E90-80859E98 000018 0004+04 0/1 0/0 0/0 .rodata @3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3939[1 + 1 /* padding */] = { - 100000000.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80859E90, &lit_3939); -#pragma pop - -/* 80859E98-80859EA0 000020 0008+00 0/2 0/0 0/0 .rodata @3940 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3940[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80859E98, &lit_3940); -#pragma pop - -/* 80859EA0-80859EA8 000028 0008+00 0/2 0/0 0/0 .rodata @3941 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3941[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80859EA0, &lit_3941); -#pragma pop - -/* 80859EA8-80859EB0 000030 0008+00 0/2 0/0 0/0 .rodata @3942 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3942[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80859EA8, &lit_3942); -#pragma pop /* 80857F8C-8085811C 00080C 0190+00 1/1 0/0 0/0 .text near_rail_get__FP13kytag06_classP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void near_rail_get(kytag06_class* param_0, cXyz* param_1) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/near_rail_get__FP13kytag06_classP4cXyz.s" +static dStage_dPnt_c* near_rail_get(kytag06_class* i_this, cXyz* i_pos) { + f32 nearest_dist = 100000000.0f; + dPath* path = i_this->mpPath; + dStage_dPnt_c* pnt; + + for (int i = 0; i < path->m_num; i++) { + f32 pnt_dist = i_pos->abs(path->m_points[i].m_position); + + if (pnt_dist < nearest_dist) { + nearest_dist = pnt_dist; + pnt = &path->m_points[i]; + } + } + + return pnt; } -#pragma pop /* 8085811C-8085814C 00099C 0030+00 1/0 0/0 0/0 .text daKytag06_Draw__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_Draw(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Draw__FP13kytag06_class.s" +static int daKytag06_Draw(kytag06_class* i_this) { + if (i_this->mType == 4) { + daKytag06_type_04_Execute(i_this); + } + + return 1; } -#pragma pop /* 8085814C-8085824C 0009CC 0100+00 1/1 0/0 0/0 .text * daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_lv7_boss_wether_proc(kytag06_class* param_0, u8 param_1) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc.s" +static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + g_env_light.mThunderEff.mMode = 0; + + u8 weather_colpat = g_env_light.mColpatWeather; + switch (param_1) { + case 0: + weather_colpat = 0; + if (env_light->mRainCount > 20) { + env_light->mRainCount -= 4; + } else if (env_light->mRainCount != 0) { + env_light->mRainCount--; + } + dKyw_rain_set(env_light->mRainCount); + break; + case 1: + weather_colpat = 1; + dice_rain_minus(); + break; + case 2: + weather_colpat = 2; + if (env_light->mRainCount < 250) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } + + g_env_light.mThunderEff.mMode = 1; + break; + } + + if (env_light->mColpatWeather != weather_colpat && !g_env_light.mCameraInWater) { + g_env_light.mColpatWeather = weather_colpat; + dKy_change_colpat(weather_colpat); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80859EB0-80859EB4 000038 0004+00 0/2 0/0 0/0 .rodata @4006 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4006 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80859EB0, &lit_4006); -#pragma pop - -/* 80859EB4-80859EB8 00003C 0004+00 0/1 0/0 0/0 .rodata @4007 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4007 = 0.25f; -COMPILER_STRIP_GATE(0x80859EB4, &lit_4007); -#pragma pop - -/* 80859EB8-80859EBC 000040 0004+00 0/6 0/0 0/0 .rodata @4008 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4008 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80859EB8, &lit_4008); -#pragma pop - -/* 80859EBC-80859EC0 000044 0004+00 0/1 0/0 0/0 .rodata @4009 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4009 = 0x3727C5AC; -COMPILER_STRIP_GATE(0x80859EBC, &lit_4009); -#pragma pop - -/* 80859EC0-80859EC4 000048 0004+00 0/1 0/0 0/0 .rodata @4010 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4010 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80859EC0, &lit_4010); -#pragma pop - -/* 80859EC4-80859EC8 00004C 0004+00 0/5 0/0 0/0 .rodata @4011 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4011 = 0.5f; -COMPILER_STRIP_GATE(0x80859EC4, &lit_4011); -#pragma pop - -/* 80859EC8-80859ECC 000050 0004+00 1/7 0/0 0/0 .rodata @4012 */ -SECTION_RODATA static f32 const lit_4012 = 1.0f; -COMPILER_STRIP_GATE(0x80859EC8, &lit_4012); - -/* 80859ECC-80859ED0 000054 0004+00 0/3 0/0 0/0 .rodata @4013 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4013 = 99.0f / 100.0f; -COMPILER_STRIP_GATE(0x80859ECC, &lit_4013); -#pragma pop - -/* 80859ED0-80859ED4 000058 0004+00 0/4 0/0 0/0 .rodata @4014 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4014 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80859ED0, &lit_4014); -#pragma pop - -/* 80859ED4-80859ED8 00005C 0004+00 0/1 0/0 0/0 .rodata @4015 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4015 = 0x3C75C28F; -COMPILER_STRIP_GATE(0x80859ED4, &lit_4015); -#pragma pop /* 8085824C-808584B4 000ACC 0268+00 1/1 0/0 0/0 .text * daKytag06_Ganon_wether_proc__FP13kytag06_classUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_Ganon_wether_proc(kytag06_class* param_0, u8 param_1) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Ganon_wether_proc__FP13kytag06_classUc.s" -} -#pragma pop +static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); -/* ############################################################################################## */ -/* 8085A04C-8085A06C -00001 0020+00 1/1 0/0 0/0 .data @4064 */ -SECTION_DATA static void* lit_4064[8] = { - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x4C), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x6C), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x8C), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0xE0), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x114), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x150), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x178), - (void*)(((char*)daKytag06_wether_proc__FP13kytag06_classUc) + 0x1B0), -}; + g_env_light.mThunderEff.mMode = 0; + dKyw_evt_wind_set(0, -0x4000); + + switch (param_1) { + case 0: + g_env_light.mMoyaMode = 10; + g_env_light.mMoyaCount = 50; + + cLib_addCalc(&i_this->mWindPower, 0.3f, 0.25f, 0.01f, 1e-05f); + dKyw_custom_windpower(i_this->mWindPower); + break; + case 1: + g_env_light.mThunderEff.mMode = 1; + g_env_light.mMoyaMode = 10; + g_env_light.mMoyaCount = 50; + + cLib_addCalc(&i_this->mWindPower, 0.7f, 0.25f, 0.01f, 1e-05f); + dKyw_custom_windpower(i_this->mWindPower); + break; + case 2: + g_env_light.mThunderEff.mMode = 0; + g_env_light.mMoyaMode = 10; + g_env_light.mMoyaCount = 50; + + cLib_addCalc(&i_this->mWindPower, 0.7f, 0.25f, 0.01f, 1e-05f); + dKyw_custom_windpower(i_this->mWindPower); + break; + case 3: + g_env_light.mMoyaCount = 50; + + switch (i_this->mMode) { + case 0: + g_env_light.mMoyaMode = 10; + cLib_addCalc(&i_this->mWindPower, 0.0f, 0.5f, 0.5f, 0.01f); + + if (i_this->mWindPower < 0.01f) { + i_this->mMode++; + } + break; + case 1: + g_env_light.mMoyaMode = 11; + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.5f, 0.5f, 1e-05f); + + if (i_this->mWindPower > 0.99f) { + i_this->mMode++; + } + break; + case 2: + cLib_addCalc(&i_this->mWindPower, 0.0f, 0.1f, 0.015f, 1e-05f); + + if (i_this->mWindPower < 0.01f) { + i_this->mMode++; + } + break; + case 3: + i_this->mMode = 0; + break; + } + + dKyw_custom_windpower(i_this->mWindPower); + break; + } + + if (i_dComIfGp_event_runCheck()) { + g_env_light.mThunderEff.mMode = 1; + } +} /* 808584B4-808586C4 000D34 0210+00 3/2 0/0 0/0 .text daKytag06_wether_proc__FP13kytag06_classUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_wether_proc(kytag06_class* param_0, u8 param_1) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_wether_proc__FP13kytag06_classUc.s" +static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + g_env_light.mThunderEff.mMode = 0; + + u8 weather_colpat = env_light->mColpatWeather; + switch (param_1) { + case 0: + weather_colpat = 0; + dice_rain_minus(); + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 1: + weather_colpat = 1; + dice_rain_minus(); + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 2: + weather_colpat = 1; + + if ((g_Counter.mCounter0 & 3) == 0) { + // run block every 4 frames + if (env_light->mRainCount < 40) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } else { + env_light->mRainCount--; + dKyw_rain_set(env_light->mRainCount); + } + } + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 3: + weather_colpat = 1; + + if (env_light->mRainCount < 250) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 4: + g_env_light.mThunderEff.mMode = 1; + weather_colpat = 1; + + if (env_light->mRainCount < 250) { + env_light->mRainCount++; + dKyw_rain_set(env_light->mRainCount); + } + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 5: + weather_colpat = 1; + g_env_light.mThunderEff.mMode = 1; + + dice_rain_minus(); + + if (env_light->mSnowCount != 0) { + env_light->mSnowCount--; + } + break; + case 6: + weather_colpat = 1; + + if (env_light->mSnowCount < 125) { + if ((g_Counter.mCounter0 & 3) == 0) { + // run block every 4 frames + env_light->mSnowCount++; + } + } else { + env_light->mSnowCount--; + } + break; + case 7: + weather_colpat = 2; + + if (env_light->mSnowCount < 500) { + env_light->mSnowCount++; + } + break; + } + + if (env_light->mColpatWeather != weather_colpat && !g_env_light.mCameraInWater) { + g_env_light.mColpatWeather = weather_colpat; + dKy_change_colpat(weather_colpat); + } } -#pragma pop /* 808586C4-808586F0 000F44 002C+00 1/1 0/0 0/0 .text * daKytag06_type_07_wether_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_07_wether_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_wether_Execute__FP13kytag06_class.s" +static void daKytag06_type_07_wether_Execute(kytag06_class* i_this) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + daKytag06_wether_proc(i_this, env_light->field_0x12cc); } -#pragma pop - -/* ############################################################################################## */ -/* 80859ED8-80859EDC 000060 0004+00 0/2 0/0 0/0 .rodata @4114 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4114 = 285.0f; -COMPILER_STRIP_GATE(0x80859ED8, &lit_4114); -#pragma pop - -/* 80859EDC-80859EE0 000064 0004+00 0/2 0/0 0/0 .rodata @4115 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4115 = 82.5f; -COMPILER_STRIP_GATE(0x80859EDC, &lit_4115); -#pragma pop - -/* 80859EE0-80859EE4 000068 0004+00 0/2 0/0 0/0 .rodata @4116 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4116 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(0x80859EE0, &lit_4116); -#pragma pop - -/* 80859EE4-80859EE8 00006C 0004+00 0/3 0/0 0/0 .rodata @4117 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4117 = 0x38D1B717; -COMPILER_STRIP_GATE(0x80859EE4, &lit_4117); -#pragma pop - -/* 80859EE8-80859EEC 000070 0004+00 0/2 0/0 0/0 .rodata @4118 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4118 = 79.0f / 100.0f; -COMPILER_STRIP_GATE(0x80859EE8, &lit_4118); -#pragma pop - -/* 80859EEC-80859EF0 000074 0004+00 0/3 0/0 0/0 .rodata @4119 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4119 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(0x80859EEC, &lit_4119); -#pragma pop - -/* 80859EF0-80859EF4 000078 0004+00 0/2 0/0 0/0 .rodata @4120 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4120 = 1.5f; -COMPILER_STRIP_GATE(0x80859EF0, &lit_4120); -#pragma pop - -/* 80859EF4-80859EF8 00007C 0004+00 0/2 0/0 0/0 .rodata @4121 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4121 = 61.0f / 100.0f; -COMPILER_STRIP_GATE(0x80859EF4, &lit_4121); -#pragma pop - -/* 80859EF8-80859EFC 000080 0004+00 0/1 0/0 0/0 .rodata @4122 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4122 = -273.0f; -COMPILER_STRIP_GATE(0x80859EF8, &lit_4122); -#pragma pop - -/* 80859EFC-80859F00 000084 0004+00 0/1 0/0 0/0 .rodata @4123 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4123 = 233.0f; -COMPILER_STRIP_GATE(0x80859EFC, &lit_4123); -#pragma pop - -/* 80859F00-80859F04 000088 0004+00 0/1 0/0 0/0 .rodata @4124 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4124 = 160.0f; -COMPILER_STRIP_GATE(0x80859F00, &lit_4124); -#pragma pop - -/* 80859F04-80859F08 00008C 0004+00 0/1 0/0 0/0 .rodata @4125 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4125 = 2.0f; -COMPILER_STRIP_GATE(0x80859F04, &lit_4125); -#pragma pop - -/* 80859F08-80859F0C 000090 0004+00 0/1 0/0 0/0 .rodata @4126 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4126 = 25.0f; -COMPILER_STRIP_GATE(0x80859F08, &lit_4126); -#pragma pop - -/* 80859F0C-80859F10 000094 0004+00 0/1 0/0 0/0 .rodata @4127 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4127 = 230.0f; -COMPILER_STRIP_GATE(0x80859F0C, &lit_4127); -#pragma pop - -/* 80859F10-80859F14 000098 0004+00 0/1 0/0 0/0 .rodata @4128 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4128 = 30.0f; -COMPILER_STRIP_GATE(0x80859F10, &lit_4128); -#pragma pop - -/* 80859F14-80859F18 00009C 0004+00 0/1 0/0 0/0 .rodata @4129 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4129 = 215.0f; -COMPILER_STRIP_GATE(0x80859F14, &lit_4129); -#pragma pop - -/* 80859F18-80859F1C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4130 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4130 = 155.0f; -COMPILER_STRIP_GATE(0x80859F18, &lit_4130); -#pragma pop /* 808586F0-808589A4 000F70 02B4+00 1/1 0/0 0/0 .text daKytag06_type_07_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_07_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_07_Execute__FP13kytag06_class.s" +static void daKytag06_type_07_Execute(kytag06_class* i_this) { + cXyz spX; + f32 current_time = dComIfGs_getTime(); + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + camera_class* camera = dComIfGp_getCamera(0); + + if (i_this->field_0x574 == 0) { + if (current_time > 285.0f || current_time < 82.5f) { + i_this->field_0x591 = 1; + } else { + i_this->field_0x591 = 0; + } + } + + switch (i_this->mMode) { + case 0: + if (i_this->field_0x591 != 0) { + cLib_addCalc(&i_this->mWindPower, 0.8f, 0.5f, 1.0f, 0.0001f); + + if (i_this->mWindPower > 0.79f) { + i_this->mMode++; + } + } + break; + case 1: + cLib_addCalc(&i_this->mWindPower, 0.6f, 0.5f, 1.5f, 0.0001f); + + if (i_this->mWindPower < 0.61f) { + i_this->mMode++; + } + break; + case 2: + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.5f, 1.5f, 0.0001f); + + if (i_this->mWindPower > 0.99f) { + i_this->mWindPower = 1.0f; + i_this->mMode++; + } + break; + case 3: + if (i_this->field_0x591 == 0) { + cLib_addCalc(&i_this->mWindPower, 0.0f, 0.5f, 1.0f, 0.0001f); + + if (i_this->mWindPower < 0.01f) { + i_this->mWindPower = 0.0f; + i_this->mMode = 0; + } + } + break; + } + + spX.x = -273.0f; + spX.y = 233.0f; + spX.z = 160.0f; + + GXColor color; + color.r = 88; + color.g = 76; + color.b = 50; + color.a = 255; + + daKytag06_type_07_wether_Execute(i_this); + + if (camera != NULL) { + if (camera->mLookat.mEye.y > 0.0f) { + dKy_BossLight_set(&spX, &color, i_this->mWindPower * 2.0f, 0); + g_env_light.mTerrainAmbienceBG3_R = (u8)(i_this->mWindPower * 230.0f + 25.0f); + g_env_light.mTerrainAmbienceBG3_G = (u8)(i_this->mWindPower * 215.0f + 30.0f); + g_env_light.mTerrainAmbienceBG3_B = (u8)(i_this->mWindPower * 155.0f + 25.0f); + } else { + g_env_light.mTerrainAmbienceBG3_R = 0; + g_env_light.mTerrainAmbienceBG3_G = 0; + g_env_light.mTerrainAmbienceBG3_B = 0; + g_env_light.mThunderEff.mMode = 0; + } + } } -#pragma pop - -/* 808589A4-808589E0 001224 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/__dt__4cXyzFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80859F1C-80859F20 0000A4 0004+00 0/1 0/0 0/0 .rodata @4205 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4205 = 10.0f; -COMPILER_STRIP_GATE(0x80859F1C, &lit_4205); -#pragma pop - -/* 80859F20-80859F24 0000A8 0004+00 0/1 0/0 0/0 .rodata @4206 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4206 = 245.0f; -COMPILER_STRIP_GATE(0x80859F20, &lit_4206); -#pragma pop - -/* 80859F24-80859F28 0000AC 0004+00 0/1 0/0 0/0 .rodata @4207 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4207 = 185.0f; -COMPILER_STRIP_GATE(0x80859F24, &lit_4207); -#pragma pop - -/* 80859F28-80859F2C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4208 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4208 = 20.0f; -COMPILER_STRIP_GATE(0x80859F28, &lit_4208); -#pragma pop - -/* 80859F2C-80859F30 0000B4 0004+00 0/1 0/0 0/0 .rodata @4209 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4209 = 130.0f; -COMPILER_STRIP_GATE(0x80859F2C, &lit_4209); -#pragma pop - -/* 8085A06C-8085A074 0000CC 0008+00 1/1 0/0 0/0 .data w_eff_name$4163 */ -SECTION_DATA static u8 w_eff_name[8] = { - 0x87, 0x53, 0x87, 0x54, 0x87, 0x55, 0x87, 0x56, -}; /* 8085A130-8085A134 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ +// all of these unused? static u8 lit_1109[1 + 3 /* padding */]; /* 8085A134-8085A138 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ @@ -841,395 +713,663 @@ static u8 lit_1010[1 + 3 /* padding */]; static u8 lit_1009[1 + 3 /* padding */]; #pragma pop -/* 8085A170-8085A180 000048 000C+04 0/1 0/0 0/0 .bss @4165 */ -#pragma push -#pragma force_active on -static u8 lit_4165[12 + 4 /* padding */]; -#pragma pop - -/* 8085A180-8085A18C 000058 000C+00 0/1 0/0 0/0 .bss c_pos$4164 */ -#pragma push -#pragma force_active on -static u8 c_pos[12]; -#pragma pop - /* 808589E0-80858CD4 001260 02F4+00 1/1 0/0 0/0 .text daKytag06_type_06_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_06_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_06_Execute__FP13kytag06_class.s" +static void daKytag06_type_06_Execute(kytag06_class* i_this) { + static u16 w_eff_name[4] = { + 0x8753, + 0x8754, + 0x8755, + 0x8756, + }; + + dComIfGs_getTime(); + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + + daKytag06_wether_proc(i_this, env_light->field_0x12cc); + cXyz spX; + + f32 current_time = dComIfGs_getTime(); + if (i_this->field_0x574 == 0) { + if (current_time > 285.0f || current_time < 82.5f) { + i_this->field_0x591 = 1; + } else { + i_this->field_0x591 = 0; + } + } + + switch (i_this->mMode) { + case 0: + if (i_this->field_0x591 != 0) { + cLib_addCalc(&i_this->mWindPower, 0.8f, 0.5f, 1.0f, 0.0001f); + + if (i_this->mWindPower > 0.79f) { + i_this->mMode++; + } + } + break; + case 1: + cLib_addCalc(&i_this->mWindPower, 0.6f, 0.5f, 1.5f, 0.0001f); + + if (i_this->mWindPower < 0.61f) { + i_this->mMode++; + } + break; + case 2: + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.5f, 1.5f, 0.0001f); + + if (i_this->mWindPower > 0.99f) { + i_this->mWindPower = 1.0f; + i_this->mMode++; + } + break; + case 3: + if (i_this->field_0x591 == 0) { + cLib_addCalc(&i_this->mWindPower, 0.0f, 0.5f, 1.0f, 0.0001f); + + if (i_this->mWindPower < 0.01f) { + i_this->mWindPower = 0.0f; + i_this->mMode = 0; + } + } + break; + } + + g_env_light.mTerrainAmbienceBG3_R = (u8)(i_this->mWindPower * 245.0f + 10.0f); + g_env_light.mTerrainAmbienceBG3_G = (u8)(i_this->mWindPower * 185.0f + 15.0f); + g_env_light.mTerrainAmbienceBG3_B = (u8)(i_this->mWindPower * 130.0f + 20.0f); + + static cXyz c_pos(0.0f, 0.0f, 0.0f); + + for (int i = 0; i < 4; i++) { + i_this->field_0x580[i] = + dComIfGp_particle_set(i_this->field_0x580[i], w_eff_name[i], &c_pos, NULL, NULL); + } } -#pragma pop /* 80858CD4-80858D00 001554 002C+00 1/1 0/0 0/0 .text daKytag06_type_08_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_08_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_08_Execute__FP13kytag06_class.s" +static void daKytag06_type_08_Execute(kytag06_class* i_this) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + daKytag06_lv7_boss_wether_proc(i_this, env_light->field_0x12cc); } -#pragma pop /* 80858D00-80858D2C 001580 002C+00 1/1 0/0 0/0 .text daKytag06_type_09_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_09_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_09_Execute__FP13kytag06_class.s" +static void daKytag06_type_09_Execute(kytag06_class* i_this) { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + daKytag06_Ganon_wether_proc(i_this, env_light->field_0x12cc); } -#pragma pop - -/* ############################################################################################## */ -/* 80859F30-80859F34 0000B8 0004+00 0/1 0/0 0/0 .rodata @4336 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4336 = 2079.0f; -COMPILER_STRIP_GATE(0x80859F30, &lit_4336); -#pragma pop - -/* 80859F34-80859F38 0000BC 0004+00 0/1 0/0 0/0 .rodata @4337 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4337 = 3013.0f; -COMPILER_STRIP_GATE(0x80859F34, &lit_4337); -#pragma pop - -/* 80859F38-80859F3C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4338 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4338 = 864.0f; -COMPILER_STRIP_GATE(0x80859F38, &lit_4338); -#pragma pop - -/* 80859F3C-80859F40 0000C4 0004+00 0/1 0/0 0/0 .rodata @4339 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4339 = -6000.0f; -COMPILER_STRIP_GATE(0x80859F3C, &lit_4339); -#pragma pop - -/* 80859F40-80859F44 0000C8 0004+00 0/1 0/0 0/0 .rodata @4340 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4340 = -4145.0f; -COMPILER_STRIP_GATE(0x80859F40, &lit_4340); -#pragma pop - -/* 80859F44-80859F48 0000CC 0004+00 0/1 0/0 0/0 .rodata @4341 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4341 = -2960.0f; -COMPILER_STRIP_GATE(0x80859F44, &lit_4341); -#pragma pop - -/* 80859F48-80859F4C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4342 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4342 = -880.0f; -COMPILER_STRIP_GATE(0x80859F48, &lit_4342); -#pragma pop - -/* 80859F4C-80859F50 0000D4 0004+00 0/1 0/0 0/0 .rodata @4343 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4343 = -4920.0f; -COMPILER_STRIP_GATE(0x80859F4C, &lit_4343); -#pragma pop - -/* 80859F50-80859F54 0000D8 0004+00 0/1 0/0 0/0 .rodata @4344 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4344 = -2000.0f; -COMPILER_STRIP_GATE(0x80859F50, &lit_4344); -#pragma pop - -/* 80859F54-80859F58 0000DC 0004+00 0/1 0/0 0/0 .rodata @4345 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4345 = 0x3A83126F; -COMPILER_STRIP_GATE(0x80859F54, &lit_4345); -#pragma pop - -/* 80859F58-80859F5C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4346 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4346 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80859F58, &lit_4346); -#pragma pop - -/* 80859F5C-80859F60 0000E4 0004+00 0/1 0/0 0/0 .rodata @4347 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4347 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(0x80859F5C, &lit_4347); -#pragma pop - -/* 80859F60-80859F64 0000E8 0004+00 0/2 0/0 0/0 .rodata @4348 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4348 = 500.0f; -COMPILER_STRIP_GATE(0x80859F60, &lit_4348); -#pragma pop - -/* 80859F64-80859F68 0000EC 0004+00 0/1 0/0 0/0 .rodata @4349 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4349 = 50.0f; -COMPILER_STRIP_GATE(0x80859F64, &lit_4349); -#pragma pop - -/* 80859F68-80859F6C 0000F0 0004+00 0/1 0/0 0/0 .rodata @4350 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4350 = 63.0f; -COMPILER_STRIP_GATE(0x80859F68, &lit_4350); -#pragma pop - -/* 80859F6C-80859F70 0000F4 0004+00 0/2 0/0 0/0 .rodata @4351 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4351 = 127.0f; -COMPILER_STRIP_GATE(0x80859F6C, &lit_4351); -#pragma pop /* 80858D2C-8085912C 0015AC 0400+00 1/1 0/0 0/0 .text daKytag06_type_10_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_10_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s" +static void daKytag06_type_10_Execute(kytag06_class* i_this) { + u8 tmp = 0; + if (i_dComIfGs_isEventBit(0x2008)) { + // 2008: Snowpeak Ruins completed + tmp = 0; + } else if (i_dComIfGs_isEventBit(0x1420)) { + // 1420: Talked to Yeta after giving cheese + tmp = 2; + } else if (i_dComIfGs_isEventBit(0x1440)) { + // 1440: Talked to Yeta after giving pumpkin + tmp = 1; + } + + switch (tmp) { + case 0: + dKy_change_colpat(0); + break; + case 1: + dKy_change_colpat(1); + break; + case 2: + dKy_change_colpat(2); + break; + default: + dKy_change_colpat(0); + break; + } + + if (dComIfGp_roomControl_getStayNo() == 4) { + g_env_light.field_0xe90 = 0; + + if (g_env_light.mSnowCount == 0 && g_env_light.mSnowInitialized && + g_env_light.mpSnowPacket != NULL) + { + g_env_light.mpSnowPacket->field_0x6d88 = 0; + + for (int i = 0; i < 500; i++) { + g_env_light.mpSnowPacket->mSnowEff[i].mStatus = 0; + } + } + + dKyw_evt_wind_set_go(); + camera_class* camera = dComIfGp_getCamera(0); + + cXyz eye(camera->mLookat.mEye); + + if (camera != NULL) { + if (((eye.x > 2079.0f && eye.x < 3013.0f && eye.y < 864.0f && eye.z > -6000.0f && + eye.z < -4145.0f) || + eye.x < -2960.0f) || + ((eye.z > -880.0f || eye.z < -6000.0f) || + (eye.z < -4920.0f && eye.y < 864.0f && eye.x < -2000.0f))) + { + cLib_addCalc(&i_this->field_0x570, 0.0f, 0.6f, 0.5f, 0.01f); + } else { + cLib_addCalc(&i_this->field_0x570, i_this->mWindPower, 0.5f, 0.5f, 0.001f); + } + + switch (tmp) { + case 0: + g_env_light.field_0xe92 = 0; + cLib_addCalc(&i_this->mWindPower, 0.0f, 0.5f, 0.1f, 0.001f); + dKyw_custom_windpower(0.2f); + break; + case 1: + g_env_light.field_0xe92 = 0; + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.5f, 0.1f, 0.001f); + dKyw_custom_windpower(0.35f); + break; + case 2: + g_env_light.field_0xe92 = 1; + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.5f, 0.1f, 0.001f); + dKyw_custom_windpower(0.5f); + break; + } + } + } else { + g_env_light.field_0xe92 = 0; + i_this->mWindPower = 0.0f; + i_this->field_0x570 = 0.0f; + dKyw_custom_windpower(0.3f); + } + + g_env_light.mSnowCount = i_this->mWindPower * 500.0f; + g_env_light.mMoyaCount = i_this->field_0x570 * 50.0f; + + if (!g_env_light.field_0xe92) { + g_mEnvSeMgr.setSnowPower(i_this->mWindPower * 63.0f); + } else { + g_mEnvSeMgr.setSnowPower(i_this->mWindPower * 127.0f); + } + + if (dComIfGp_roomControl_getStayNo() != 0 && dComIfGp_roomControl_getStayNo() != 3 && + (dComIfGp_roomControl_getStayNo() < 5 || dComIfGp_roomControl_getStayNo() > 9) && + dComIfGp_roomControl_getStayNo() != 11 && dComIfGp_roomControl_getStayNo() != 13) + { + g_env_light.field_0xe90 = 0; + } } -#pragma pop /* 8085912C-808591A4 0019AC 0078+00 1/1 0/0 0/0 .text daKytag06_type_11_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_11_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s" +static void daKytag06_type_11_Execute(kytag06_class* i_this) { + if (dKy_darkworld_check() && dComIfG_play_c::getLayerNo(0) == 14) { + switch (dComIfGp_roomControl_getStayNo()) { + case 0: + case 1: + case 2: + case 3: + case 4: + dKy_change_colpat(dComIfGp_roomControl_getStayNo()); + break; + case 8: + dKy_change_colpat(5); + break; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80859F70-80859F74 0000F8 0004+00 0/1 0/0 0/0 .rodata @4406 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4406 = 5000.0f; -COMPILER_STRIP_GATE(0x80859F70, &lit_4406); -#pragma pop /* 808591A4-8085931C 001A24 0178+00 1/1 0/0 0/0 .text daKytag06_type_05_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_05_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_05_Execute__FP13kytag06_class.s" +static void daKytag06_type_05_Execute(kytag06_class* i_this) { + cXyz spX; + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + if (player != NULL) { + spX.x = player->current.pos.x; + spX.y = i_this->current.pos.y; + spX.z = player->current.pos.z; + + if (i_this->current.pos.abs(spX) < i_this->mScale.x * 5000.0f) { + g_env_light.field_0x130b = 1; + } + } } -#pragma pop /* 8085931C-80859528 001B9C 020C+00 1/1 0/0 0/0 .text daKytag06_type_03_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type_03_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s" +static void daKytag06_type_03_Execute(kytag06_class* i_this) { + if (i_this->field_0x597 == 0) { + switch (i_this->mMode) { + case 0: + // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed + if (i_dComIfGs_isEventBit(0x0C01) && !i_dComIfGs_isEventBit(0x1E08)) { + i_this->mMode = 1; + i_this->field_0x578 = 450; + dKy_change_colpat(i_this->field_0x591); + + s32 stayNo = dComIfGp_roomControl_getStayNo(); + dComIfGs_onSwitch(i_this->mSwNo, stayNo); + } + break; + case 1: + int old = i_this->field_0x578; + i_this->field_0x578--; + + if (old <= 0) { + i_this->mMode++; + } + break; + case 2: + if ((g_Counter.mCounter0 & 7) == 0) { + // run block every 8 frames + if (g_env_light.mRainCount < 250) { + g_env_light.mRainCount++; + } else { + i_this->mMode++; + } + } + break; + case 3: + break; + } + } else if (i_this->field_0x597 == 2 && dComIfGp_roomControl_getStayNo() != 0) { + switch (i_this->mMode) { + case 0: + if (i_this->mSwNo != 0xFF && dComIfGs_isSwitch(i_this->mSwNo, i_this->current.roomNo)) { + cLib_addCalc(&i_this->mWindPower, 1.0f, 0.1f, 0.01f, 0.0001f); + + if (i_this->mWindPower >= 1.0f) { + i_this->mWindPower = 1.0f; + g_env_light.mColpatWeather = 0; + i_this->mMode = 1; + } + + dKy_custom_colset(i_this->field_0x591, 0, i_this->mWindPower); + } else { + dKy_custom_colset(0, i_this->field_0x591, 1.0f); + g_env_light.mColpatWeather = i_this->field_0x591; + } + break; + case 1: + break; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80859F74-80859F78 0000FC 0004+00 0/1 0/0 0/0 .rodata @4609 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4609 = 255.0f; -COMPILER_STRIP_GATE(0x80859F74, &lit_4609); -#pragma pop - -/* 80859F78-80859F80 000100 0004+04 0/1 0/0 0/0 .rodata @4610 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4610[1 + 1 /* padding */] = { - 3.0f / 100.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80859F78, &lit_4610); -#pragma pop - -/* 80859F80-80859F88 000108 0008+00 0/1 0/0 0/0 .rodata @4613 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4613[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80859F80, &lit_4613); -#pragma pop - -/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80859F90 = "F_SP114"; -#pragma pop - -/* 8085A074-8085A0A4 -00001 0030+00 1/1 0/0 0/0 .data @4611 */ -SECTION_DATA static void* lit_4611[12] = { - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x270), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x4C), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x1C0), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x208), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x544), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x210), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x218), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x220), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x228), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x230), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x238), - (void*)(((char*)daKytag06_Execute__FP13kytag06_class) + 0x268), -}; /* 80859528-80859A88 001DA8 0560+00 2/0 0/0 0/0 .text daKytag06_Execute__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_Execute(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s" +static int daKytag06_Execute(kytag06_class* i_this) { + dComIfGs_getTime(); + + switch (i_this->mType) { + case 1: + camera_class* camera = dComIfGp_getCamera(0); + + if (i_this->mpPath != NULL) { + int target1 = 0; + int target2 = 0; + dStage_dPnt_c* pnt = near_rail_get(i_this, &camera->mLookat.mEye); + + if (pnt != NULL && pnt->field_0x3 != 0xFF) { + dKy_change_colpat(pnt->field_0x3); + + if (pnt->field_0x3 == 0) { + target1 = 250; + target2 = 25; + } else if (pnt->field_0x3 == 1) { + target1 = 500; + target2 = 50; + } else if (pnt->field_0x3 == 2) { + target1 = 125; + target2 = 12; + } + + if ((int)i_this->mWindPower > 250) { + g_env_light.field_0xe92 = 1; + } else { + g_env_light.field_0xe92 = 0; + } + + cLib_addCalc(&i_this->mWindPower, (s16)target1, 0.5f, 1.0f, 0.01f); + cLib_addCalc(&i_this->field_0x570, (s16)target2, 0.5f, 1.0f, 0.01f); + + g_env_light.mSnowCount = i_this->mWindPower; + g_env_light.mMoyaCount = i_this->field_0x570; + g_mEnvSeMgr.setSnowPower((i_this->mWindPower / 500.0f) * 127.0f); + break; + } + } + break; + case 2: + if (i_this->mSwNo != 0xFF) { + s32 stayNo = dComIfGp_roomControl_getStayNo(); + if (dComIfGs_isSwitch(i_this->mSwNo, stayNo) && i_this->mMode == 0) { + i_this->mMode = 1; + dKy_change_colpat(i_this->field_0x591); + } + } + break; + case 3: + daKytag06_type_03_Execute(i_this); + break; + case 5: + daKytag06_type_05_Execute(i_this); + break; + case 6: + daKytag06_type_06_Execute(i_this); + break; + case 7: + daKytag06_type_07_Execute(i_this); + break; + case 8: + daKytag06_type_08_Execute(i_this); + break; + case 9: + daKytag06_type_09_Execute(i_this); + break; + case 10: + if (strcmp(dComIfGp_getStartStageName(), "F_SP114") != 0) { + daKytag06_type_10_Execute(i_this); + } else { + daKytag06_type_03_Execute(i_this); + } + break; + case 11: + daKytag06_type_11_Execute(i_this); + break; + default: + if (i_this->mMode == 0) { + switch (i_this->field_0x591) { + case 0: + if (dComIfGs_BossLife_public_Get() != -1 && dComIfGs_BossLife_public_Get() <= 6) { + dKy_change_colpat(1); + i_this->field_0x591++; + } + break; + case 1: + if (i_this->field_0x578 > 600) { + g_env_light.mMoyaMode = 0; + + if (g_env_light.mMoyaCount < 50) { + g_env_light.mMoyaCount++; + } else { + i_this->field_0x591++; + } + } + break; + case 2: + if (i_this->field_0x578 > 900) { + if (g_env_light.mRainCount < 250) { + g_env_light.mRainCount++; + } else { + i_this->field_0x591++; + } + } + break; + case 3: + if (i_this->field_0x578 > 1100) { + g_env_light.mThunderEff.mMode = 2; + i_this->field_0x591++; + } + break; + } + + if (dComIfGs_BossLife_public_Get() != -1 && dComIfGs_BossLife_public_Get() <= 3) { + i_this->field_0x591 = 0; + i_this->field_0x578 = 0; + i_this->mMode = 1; + } + } else { + switch (i_this->field_0x591) { + case 0: + if (i_this->field_0x578 > 0) { + g_env_light.mThunderEff.mMode = 0; + + if (g_env_light.mRainCount > 0) { + g_env_light.mRainCount--; + } else { + i_this->field_0x591++; + } + } + break; + case 1: + if (i_this->field_0x578 > 150) { + g_env_light.mMoyaMode = 0; + + if (g_env_light.mMoyaCount >= 0) { + g_env_light.mMoyaCount--; + } else { + i_this->field_0x591++; + } + } + break; + case 2: + if (i_this->field_0x578 > 300) { + dKy_change_colpat(6); + i_this->field_0x591++; + } + break; + case 3: + if (i_this->field_0x578 > 420) { + dKy_change_colpat(0); + i_this->field_0x591++; + } + break; + case 4: + if (dComIfGs_BossLife_public_Get() == 0) { + f32 time = dComIfGs_getTime(); + + if (time < 255.0f) { + time += 0.03f; + + if (i_dComIfGp_event_runCheck()) { + time += 0.1f; + } + + dComIfGs_setTime(time); + } + } + break; + } + } + + if ((i_this->mMode != 0 || i_this->field_0x591 != 0) && i_this->field_0x578 < 101849) { + i_this->field_0x578++; + } + + if (i_this->field_0x578 < 99999) { + i_this->field_0x57c++; + } + break; + case 4: + break; + } + + return 1; } -#pragma pop /* 80859A88-80859A90 002308 0008+00 1/0 0/0 0/0 .text daKytag06_IsDelete__FP13kytag06_class */ -static bool daKytag06_IsDelete(kytag06_class* param_0) { - return true; +static int daKytag06_IsDelete(kytag06_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80859F88-80859F8C 000110 0004+00 1/1 0/0 0/0 .rodata @4638 */ -SECTION_RODATA static f32 const lit_4638 = 270.0f; -COMPILER_STRIP_GATE(0x80859F88, &lit_4638); - /* 80859A90-80859AD0 002310 0040+00 1/0 0/0 0/0 .text daKytag06_Delete__FP13kytag06_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_Delete(kytag06_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Delete__FP13kytag06_class.s" +static int daKytag06_Delete(kytag06_class* i_this) { + if (i_this->mType == 0 && i_this->mMode != 0 && i_this->field_0x591 >= 4) { + dComIfGs_setTime(270.0f); + } + + return 1; } -#pragma pop /* 80859AD0-80859AF0 002350 0020+00 1/1 0/0 0/0 .text daKytag06_type04_init__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type04_init(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type04_init__FP10fopAc_ac_c.s" +static void daKytag06_type04_init(fopAc_ac_c* i_this) { + kytag06_class* this_ = (kytag06_class*)i_this; + + this_->mSwNo = fopAcM_GetParam(this_) >> 8; + this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; + this_->mMode = 0; } -#pragma pop /* 80859AF0-80859B14 002370 0024+00 1/1 0/0 0/0 .text daKytag06_type06_init__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type06_init(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type06_init__FP10fopAc_ac_c.s" +static void daKytag06_type06_init(fopAc_ac_c* i_this) { + kytag06_class* this_ = (kytag06_class*)i_this; + + this_->mSwNo = fopAcM_GetParam(this_) >> 8; + this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; + this_->mMode = 0; + this_->field_0x598 = 0; } -#pragma pop /* 80859B14-80859B34 002394 0020+00 1/1 0/0 0/0 .text daKytag06_type02_init__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type02_init(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type02_init__FP10fopAc_ac_c.s" +static void daKytag06_type02_init(fopAc_ac_c* i_this) { + kytag06_class* this_ = (kytag06_class*)i_this; + + this_->mSwNo = fopAcM_GetParam(this_) >> 8; + this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; + this_->mMode = 0; } -#pragma pop /* 80859B34-80859C88 0023B4 0154+00 1/1 0/0 0/0 .text daKytag06_type03_init__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_type03_init(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s" +static void daKytag06_type03_init(fopAc_ac_c* i_this) { + kytag06_class* this_ = (kytag06_class*)i_this; + + this_->mSwNo = fopAcM_GetParam(this_) >> 8; + this_->field_0x591 = fopAcM_GetParam(this_) & 0xFF; + this_->mMode = 0; + + if (this_->field_0x597 == 0) { + // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed + if (i_dComIfGs_isEventBit(0x0C01) && !i_dComIfGs_isEventBit(0x1E08) && this_->mSwNo != 0xFF) + { + s32 stayNo = dComIfGp_roomControl_getStayNo(); + + if (dComIfGs_isSwitch(this_->mSwNo, stayNo)) { + this_->mMode = 9; + g_env_light.mRainCount = 250; + g_env_light.mColpatWeather = this_->field_0x591; + g_env_light.mColPatPrev = this_->field_0x591; + g_env_light.mColPatCurr = this_->field_0x591; + } + } + } else if (this_->field_0x597 == 2 && dComIfGp_roomControl_getStayNo() != 0) { + if (this_->mSwNo != 0xFF && !dComIfGs_isSwitch(this_->mSwNo, this_->current.roomNo)) { + dKy_custom_colset(0, this_->field_0x591, 1.0f); + g_env_light.mColpatWeather = this_->field_0x591; + } else { + this_->mMode = 1; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80859F8C-80859F90 000114 0004+00 1/1 0/0 0/0 .rodata @4771 */ -SECTION_RODATA static f32 const lit_4771 = 210.0f; -COMPILER_STRIP_GATE(0x80859F8C, &lit_4771); - -/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80859F98 = "T_MUKAO"; -#pragma pop - -/* 8085A0A4-8085A0D4 -00001 0030+00 1/1 0/0 0/0 .data @4772 */ -SECTION_DATA static void* lit_4772[12] = { - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x158), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x84), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xA0), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xAC), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xB8), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x1C8), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xC4), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xD0), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0xE4), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x108), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x114), - (void*)(((char*)daKytag06_Create__FP10fopAc_ac_c) + 0x14C), -}; /* 80859C88-80859E68 002508 01E0+00 2/0 0/0 0/0 .text daKytag06_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag06_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Create__FP10fopAc_ac_c.s" +static int daKytag06_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) kytag06_class(); + fopAcM_OnCondition(i_this, 8); + } + kytag06_class* this_ = static_cast(i_this); + + this_->mType = (fopAcM_GetParam(this_) >> 0x18) & 0xF; + this_->field_0x597 = (fopAcM_GetParam(this_) >> 0x1C); + this_->mWindPower = 0.0f; + this_->field_0x570 = 0.0f; + + switch (this_->mType) { + case 1: + this_->mPathNo = fopAcM_GetParam(this_) >> 0x10; + this_->mpPath = set_path_info(this_); + break; + case 2: + daKytag06_type02_init(this_); + break; + case 3: + daKytag06_type03_init(this_); + break; + case 4: + daKytag06_type04_init(this_); + break; + case 6: + daKytag06_type06_init(this_); + break; + case 7: + this_->mMode = 0; + this_->field_0x591 = 0; + this_->field_0x574 = 0; + break; + case 8: + daKytag06_type06_init(this_); + g_env_light.mMoyaMode = 9; + g_env_light.mMoyaCount = 50; + break; + case 9: + daKytag06_type06_init(this_); + break; + case 10: + if (strcmp(dComIfGp_getStartStageName(), "F_SP114") != 0) { + daKytag06_type06_init(this_); + } else { + daKytag06_type03_init(this_); + } + break; + case 11: + daKytag06_type06_init(this_); + break; + default: + if (strcmp(dComIfGp_getStartStageName(), "T_MUKAO") != 0) { + g_env_light.mColpatWeather = 3; + g_env_light.mColPatPrev = 3; + g_env_light.mColPatCurr = 3; + } else { + dComIfGs_setTime(210.0f); + } + + this_->field_0x578 = 0; + this_->field_0x57c = 0; + this_->mMode = 0; + this_->field_0x591 = 0; + this_->field_0x574 = 640; + break; + case 5: + break; + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* ############################################################################################## */ /* 8085A0D4-8085A0F4 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag06_Method */ -SECTION_DATA static void* l_daKytag06_Method[8] = { - (void*)daKytag06_Create__FP10fopAc_ac_c, - (void*)daKytag06_Delete__FP13kytag06_class, - (void*)daKytag06_Execute__FP13kytag06_class, - (void*)daKytag06_IsDelete__FP13kytag06_class, - (void*)daKytag06_Draw__FP13kytag06_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag06_Method = { + (process_method_func)daKytag06_Create, (process_method_func)daKytag06_Delete, + (process_method_func)daKytag06_Execute, (process_method_func)daKytag06_IsDelete, + (process_method_func)daKytag06_Draw, }; /* 8085A0F4-8085A124 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG06 */ -SECTION_DATA extern void* g_profile_KYTAG06[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02B00000, (void*)&g_fpcLf_Method, - (void*)0x0000059C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00640000, (void*)&l_daKytag06_Method, - (void*)0x00060000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG06 = { + -3, + 7, + -3, + PROC_KYTAG06, + 0, + &g_fpcLf_Method.mBase, + sizeof(kytag06_class), + 0, + 0, + &g_fopAc_Method.base, + 0x64, + 0, + 0, + &l_daKytag06_Method, + 0x00060000, + 0, + 0, + 0, + 0, }; /* 8085A18C-8085A190 000064 0004+00 0/0 0/0 0/0 .bss diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 9e35b9a118..020c0a4a56 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -11,14 +11,6 @@ // Types: // -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - /* 8000CF7C */ void quatM(Quaternion const*); - - static u8 now[48]; -}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index a8591eb4ec..4fe93340e5 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1857,7 +1857,7 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag) { return NULL; } -int dComIfGs_checkGetInsectNum() { +u8 dComIfGs_checkGetInsectNum() { static u8 l_itemno[24] = { M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, @@ -1865,7 +1865,7 @@ int dComIfGs_checkGetInsectNum() { M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, }; - int insectCount = 0; + u8 insectCount = 0; u8* insectList = l_itemno; for (int i = 0; i < ARRAY_SIZE(l_itemno); i++) { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index db84dfce6f..60008a8a61 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -116,7 +116,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__14mDoHIO_entry_c[3]; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 95f721cca3..17c9e9841d 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -11,10 +11,6 @@ // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; -}; - struct kankyo_class {}; diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index f2122d1bcf..1716be27b7 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -14,10 +14,6 @@ // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; -}; - struct dEvt_control_c { /* 800434D8 */ void searchMapEventData(u8); }; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 7edfb5108b..3aae99b8dd 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -141,7 +141,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void __div2i(); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern u8 g_drawHIO[3880]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index a6a90f09f7..a8fc4babdc 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -11,10 +11,6 @@ // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; -}; - struct mDoGph_gInf_c { static u8 mFader[4]; }; diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index df4208beb5..47180550ec 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -257,7 +257,6 @@ extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__10CSTControl[4]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 521b7d2a91..e1d4cff6cb 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -4,297 +4,10 @@ // #include "d/msg/d_msg_class.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_unit.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct jmessage_tControl { - /* 802299EC */ jmessage_tControl(); -}; - -struct jmessage_tReference { - /* 80228B04 */ jmessage_tReference(); - /* 80228CB4 */ ~jmessage_tReference(); - /* 80228D28 */ void calcDistance(); - /* 80228DE0 */ void getLineMax(); - /* 80228E6C */ void isKanban(); - /* 80228EA0 */ void isPlaceName(); - /* 80228ED4 */ void isBossName(); - /* 80228F08 */ void isSaveSeq(); - /* 80228F3C */ void isBook(); - /* 80228F70 */ void isStaffRoll(); - /* 80228FA4 */ void isHowl(); - /* 80228FD8 */ void isMidona(); - /* 8022900C */ void resetReference(); - /* 80229034 */ void pageSend(); - /* 80229168 */ void selectMessage(); - /* 802294A8 */ void inputNumber(); - /* 80229730 */ void getWord(int); - /* 80229744 */ void resetWord(); - /* 80229768 */ void setCharactor(u16); - /* 80229788 */ void addCharactor(u16); - /* 802297B0 */ void resetCharactor(); - /* 802297E4 */ void shiftCharCountBuffer(); - /* 80229810 */ void resetCharCountBuffer(); - /* 80229848 */ void allsetCharCountBuffer(); - /* 8022986C */ void isCharSend(); - /* 802298DC */ void isLightSend(); - /* 8022994C */ void isLightEnd(); - /* 802299AC */ void decideOutFontRupeeColor(int); - /* 80232A20 */ void getActorPos(); -}; - -struct jmessage_tSequenceProcessor { - /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); - /* 8022B654 */ void do_reset(); - /* 8022B658 */ void do_begin(void const*, char const*); - /* 8022BA3C */ void do_end(); - /* 8022BB7C */ void do_isReady(); - /* 8022BFE0 */ void do_character(int); - /* 8022C1A0 */ void do_tag(u32, void const*, u32); - /* 8022C8FC */ bool do_jump_isReady(); - /* 8022C904 */ void do_name1(); - /* 8022C908 */ void do_space(u32); - /* 8022CA24 */ void do_rubyset(void const*, u32); - /* 8022CAAC */ void push_word(); - /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*); - /* 8022CBE4 */ void do_jump(void const*, char const*); - /* 8022CBE8 */ void calcStringLength(); - /* 8023299C */ ~jmessage_tSequenceProcessor(); -}; - -struct jmessage_tRenderingProcessor { - /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*); - /* 8022CDC8 */ void do_reset(); - /* 8022CDCC */ void do_begin(void const*, char const*); - /* 8022CFD8 */ void do_end(); - /* 8022D0A0 */ void do_character(int); - /* 8022D74C */ void do_tag(u32, void const*, u32); - /* 8022E12C */ void resetRendering(); - /* 8022E17C */ void do_widthcenter(); - /* 8022E260 */ void do_selwidthcenter(int); - /* 8022E318 */ void do_heightcenter(); - /* 8022E7CC */ void do_color(u8); - /* 8022E860 */ void do_scale(f32); - /* 8022E960 */ void do_linedown(s16); - /* 8022E9C0 */ void do_transY(s16, bool); - /* 8022EAE4 */ void do_outfont(u8, u32); - /* 8022ED10 */ void do_arrow2(); - /* 8022EECC */ void getLineLength(int); - /* 8022EF00 */ void do_strcat(char*, bool, bool, bool); - /* 8022F148 */ void do_rubyset(void const*, u32); - /* 8022F384 */ void do_rubystrcat(char*, char*, f32, f32); - /* 8022F53C */ void do_name1(); - /* 8022F540 */ void do_numset(s16); - /* 8022F734 */ void push_word(); - /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32); - /* 8023293C */ ~jmessage_tRenderingProcessor(); -}; - -struct jmessage_tMeasureProcessor { - /* 80229A28 */ jmessage_tMeasureProcessor(jmessage_tReference const*); - /* 80229AC4 */ void do_begin(void const*, char const*); - /* 80229CB4 */ void do_end(); - /* 80229E3C */ void do_character(int); - /* 8022A268 */ void do_tag(u32, void const*, u32); - /* 8022B0B0 */ void do_scale(f32); - /* 8022B18C */ void do_space(u32); - /* 8022B3EC */ void do_pageType(int); - /* 8022B454 */ void do_name1(); - /* 8022B458 */ void do_rubyset(void const*, u32); - /* 8022B4E0 */ void push_word(char*); - /* 8022B5F4 */ ~jmessage_tMeasureProcessor(); -}; - -struct jmessage_string_tControl { - /* 8022FB5C */ jmessage_string_tControl(); - /* 802328DC */ ~jmessage_string_tControl(); -}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; -}; - -struct JUTFont {}; - -struct COutFont_c { - /* 80226CF8 */ void initialize(); -}; - -struct jmessage_string_tReference { - /* 8022F8C0 */ jmessage_string_tReference(); - /* 8022F94C */ ~jmessage_string_tReference(); - /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 8022FA2C */ void setCharactor(u16); - /* 8022FA30 */ void addCharactor(u16); - /* 8022FA34 */ void resetCharactor(); - /* 8022FA38 */ void getLineLength(int); - /* 8022FA6C */ void addLineLength(int, f32); - /* 8022FA98 */ void getOutfontLength(int); - /* 8022FACC */ void setOutfontLength(int, f32); - /* 8022FAF0 */ void clearOutfontLength(int); - /* 8022FB24 */ void getLineCountNowPage(); -}; - -struct jmessage_string_tSequenceProcessor { - /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*, - jmessage_string_tControl*); - /* 80230ABC */ void do_reset(); - /* 80230AC0 */ void do_begin(void const*, char const*); - /* 80230B7C */ void do_end(); - /* 80230B80 */ bool do_isReady(); - /* 80230B88 */ void do_character(int); - /* 80230B8C */ void do_tag(u32, void const*, u32); - /* 80230BBC */ bool do_jump_isReady(); - /* 80230BC4 */ void do_jump(void const*, char const*); - /* 80232858 */ ~jmessage_string_tSequenceProcessor(); -}; - -struct jmessage_string_tRenderingProcessor { - /* 80230BC8 */ jmessage_string_tRenderingProcessor(jmessage_string_tReference const*); - /* 80230C20 */ void getLineCountNowPage(); - /* 80230C5C */ void do_reset(); - /* 80230CA0 */ void do_begin(void const*, char const*); - /* 80230CE8 */ void do_end(); - /* 80230D48 */ void do_character(int); - /* 80231110 */ void do_tag(u32, void const*, u32); - /* 80231D70 */ void do_widthcenter(); - /* 80231EF0 */ void do_heightcenter(); - /* 80232044 */ void do_strcat(char*); - /* 802320B0 */ void do_rubyset(void const*, u32); - /* 80232260 */ void do_rubystrcat(char*); - /* 802322CC */ void do_outfont(u8); - /* 8023256C */ void do_color(u8); - /* 80232600 */ void do_scale(f32); - /* 80232690 */ void do_linedown(s16); - /* 802326E4 */ void do_numset(s16); - /* 802327BC */ void push_word(char const*); - /* 802327F8 */ ~jmessage_string_tRenderingProcessor(); -}; - -struct jmessage_string_tMeasureProcessor { - /* 8022FB98 */ jmessage_string_tMeasureProcessor(jmessage_string_tReference const*); - /* 8022FBE4 */ void do_begin(void const*, char const*); - /* 8022FC14 */ void do_end(); - /* 8022FC28 */ void do_character(int); - /* 8022FDF0 */ void do_tag(u32, void const*, u32); - /* 8023098C */ void do_rubyset(void const*, u32); - /* 80230A5C */ ~jmessage_string_tMeasureProcessor(); -}; - -struct dSv_player_item_max_c { - /* 800340F8 */ void getBombNum(u8) const; -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 80034A04 */ void getEventReg(u16) const; -}; - -struct dMsgUnit_c { - /* 80238CEC */ void setTag(int, int, char*, bool); -}; - -struct dMsgObject_c { - /* 802360A0 */ void talkStartInit(); - /* 802370BC */ void isKanbanMessage(); - /* 802370E8 */ void isHowlMessage(); - /* 802370FC */ void isMidonaMessage(); - /* 802371E4 */ void isPlaceMessage(); - /* 802371F8 */ void isBossMessage(); - /* 8023720C */ bool isBookMessage(); - /* 80237214 */ void isStaffMessage(); - /* 80237228 */ void isSaveMessage(); - /* 802372CC */ void getSmellName(); - /* 80237334 */ void getPortalName(); - /* 8023738C */ void getBombName(); - /* 8023741C */ void getInsectName(); - /* 80237478 */ void getLetterName(); - /* 802374D0 */ void getSelectBombNum(); - /* 802375E4 */ void addSelectBomBag(u8); - /* 80237610 */ void resetSelectBomBag(); - /* 80238500 */ void getMsgOutputType(); - /* 80238514 */ void getWord(); - /* 80238528 */ void getSelectWord(int); - /* 80238574 */ void getSelectWordFlag(); - /* 802385E0 */ void getSelectBombPrice(); - /* 80238638 */ void getItemEquipButton(); -}; - -struct STControl { - /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); - /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct JMessage { - struct TControl { - /* 802A7548 */ TControl(); - /* 802A758C */ ~TControl(); - }; - - struct TReference { - /* 802A7AF8 */ ~TReference(); - /* 802A7B40 */ bool do_word(u32) const; - }; - - struct TProcessor { - /* 802A7BF8 */ void stack_pushCurrent(char const*); - /* 802A7FC0 */ void do_reset(); - /* 802A7FD8 */ void do_select_begin(u32); - /* 802A7FDC */ void do_select_end(); - /* 802A7FE0 */ void do_select_separate(); - /* 802A8084 */ void do_resetStatus_(char const*); - /* 802A8088 */ bool do_setBegin_isReady_() const; - /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*); - }; - - struct TSequenceProcessor { - /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*); - /* 802A83B8 */ ~TSequenceProcessor(); - /* 802A8794 */ void do_branch_query(u32); - /* 802A8798 */ s32 do_branch_queryResult(); - /* 802A87A0 */ void do_branch(void const*, char const*); - /* 802A87A4 */ void do_resetStatus_(char const*); - /* 802A87C0 */ void do_setBegin_isReady_() const; - /* 802A87D0 */ void do_begin_(void const*, char const*); - /* 802A87D4 */ void do_end_(); - /* 802A87E0 */ void do_tag_(u32, void const*, u32); - }; - - struct TRenderingProcessor { - /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*); - /* 802A8AC0 */ ~TRenderingProcessor(); - /* 802A8B20 */ void process(char const*); - /* 802A8BA4 */ void do_begin_(void const*, char const*); - /* 802A8BA8 */ void do_end_(); - /* 802A8BAC */ void do_tag_(u32, void const*, u32); - }; -}; - -struct J2DPane { - /* 802F7100 */ void getBounds(); - /* 802F7AFC */ void getParentPane(); -}; // // Forward References: @@ -542,62 +255,81 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); -extern "C" void snprintf(); -extern "C" void strcat(); -extern "C" void strcpy(); -extern "C" void strlen(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__17jmessage_tControl[3]; extern "C" extern void* __vt__Q28JMessage10TReference[4 + 1 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +SECTION_DATA extern void* __vt__35jmessage_string_tRenderingProcessor[16]; +SECTION_DATA extern void* __vt__34jmessage_string_tSequenceProcessor[22]; +SECTION_DATA extern void* __vt__33jmessage_string_tMeasureProcessor[16]; +SECTION_DATA extern void* __vt__24jmessage_string_tControl[3]; +SECTION_DATA extern void* __vt__26jmessage_string_tReference[4]; +SECTION_DATA extern void* __vt__28jmessage_tRenderingProcessor[16]; +SECTION_DATA extern void* __vt__27jmessage_tSequenceProcessor[22]; +SECTION_DATA extern void* __vt__26jmessage_tMeasureProcessor[16]; +SECTION_DATA extern void* __vt__19jmessage_tReference[4 + 1 /* padding */]; + // // Declarations: // /* 80228578-802285CC 222EB8 0054+00 1/1 0/0 0/0 .text checkCharInfoCharactor__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void checkCharInfoCharactor(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/checkCharInfoCharactor__Fi.s" +static bool checkCharInfoCharactor(int c) { + if (c != 0x8140 && c != 0x8141 && c != 0x8142 && c != 0x0020 && c != 0x0022 && c != 0x0027 && + c != 0x002C && c != 0x002E) + { + return true; + } + + return false; } -#pragma pop /* ############################################################################################## */ /* 804510C0-804510C8 0005C0 0003+05 1/1 0/0 0/0 .sbss mMoji$3770 */ -static u8 mMoji[3 + 5 /* padding */]; +static char mMoji[3]; /* 802285CC-80228608 222F0C 003C+00 3/3 0/0 0/0 .text changeCodeToChar__FUs */ +// r4 / r5 swap +#ifdef NONMATCHING +static const char* changeCodeToChar(u16 param_0) { + mMoji[2] = '\0'; + mMoji[1] = '\0'; + mMoji[0] = '\0'; + + mMoji[0] = param_0 >> 8; + + if (mMoji[0] == '\0') { + mMoji[0] = (u16)param_0; + } else { + mMoji[1] = (u16)param_0; + } + + return mMoji; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void changeCodeToChar(u16 param_0) { +static asm char* changeCodeToChar(u16 param_0) { nofralloc #include "asm/d/msg/d_msg_class/changeCodeToChar__FUs.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803BFDF8-803BFE78 01CF18 0080+00 1/1 0/0 0/0 .data char_table$3795 */ -SECTION_DATA static u8 char_table[128] = { - 0x00, 0x00, 0x81, 0x42, 0x81, 0x75, 0x81, 0x76, 0x81, 0x41, 0x81, 0x45, 0x83, 0x92, 0x83, 0x40, - 0x83, 0x42, 0x83, 0x44, 0x83, 0x46, 0x83, 0x48, 0x83, 0x83, 0x83, 0x85, 0x83, 0x87, 0x83, 0x62, - 0x81, 0x5B, 0x83, 0x41, 0x83, 0x43, 0x83, 0x45, 0x83, 0x47, 0x83, 0x49, 0x83, 0x4A, 0x83, 0x4C, - 0x83, 0x4E, 0x83, 0x50, 0x83, 0x52, 0x83, 0x54, 0x83, 0x56, 0x83, 0x58, 0x83, 0x5A, 0x83, 0x5C, - 0x83, 0x5E, 0x83, 0x60, 0x83, 0x63, 0x83, 0x65, 0x83, 0x67, 0x83, 0x69, 0x83, 0x6A, 0x83, 0x6B, - 0x83, 0x6C, 0x83, 0x6D, 0x83, 0x6E, 0x83, 0x71, 0x83, 0x74, 0x83, 0x77, 0x83, 0x7A, 0x83, 0x7D, - 0x83, 0x7E, 0x83, 0x80, 0x83, 0x81, 0x83, 0x82, 0x83, 0x84, 0x83, 0x86, 0x83, 0x88, 0x83, 0x89, - 0x83, 0x8A, 0x83, 0x8B, 0x83, 0x8C, 0x83, 0x8D, 0x83, 0x8F, 0x83, 0x93, 0x81, 0x4A, 0x81, 0x4B, +SECTION_DATA static u16 char_table[64] = { + 0x0000, 0x8142, 0x8175, 0x8176, 0x8141, 0x8145, 0x8392, 0x8340, 0x8342, 0x8344, 0x8346, + 0x8348, 0x8383, 0x8385, 0x8387, 0x8362, 0x815B, 0x8341, 0x8343, 0x8345, 0x8347, 0x8349, + 0x834A, 0x834C, 0x834E, 0x8350, 0x8352, 0x8354, 0x8356, 0x8358, 0x835A, 0x835C, 0x835E, + 0x8360, 0x8363, 0x8365, 0x8367, 0x8369, 0x836A, 0x836B, 0x836C, 0x836D, 0x836E, 0x8371, + 0x8374, 0x8377, 0x837A, 0x837D, 0x837E, 0x8380, 0x8381, 0x8382, 0x8384, 0x8386, 0x8388, + 0x8389, 0x838A, 0x838B, 0x838C, 0x838D, 0x838F, 0x8393, 0x814A, 0x814B, }; /* 803BFE78-803BFF78 -00001 0100+00 1/1 0/0 0/0 .data @3831 */ @@ -679,97 +411,144 @@ static asm void change1ByteTo2Bytes(int param_0) { #pragma pop /* 80228838-802288A8 223178 0070+00 8/8 0/0 0/0 .text changeKataToHira__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void changeKataToHira(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/changeKataToHira__Fi.s" +static u16 changeKataToHira(int param_0) { + u16 var_r5 = param_0; + + if (param_0 >= 0x8340 && param_0 <= 0x837E) { + var_r5 = param_0 - 0xA1; + } else if (param_0 >= 0x8380 && param_0 <= 0x8393) { + var_r5 = param_0 - 0xA2; + } else if (param_0 == 0x8394) { + var_r5 = 0x82D4; + } + + return var_r5; } -#pragma pop /* 802288A8-802288FC 2231E8 0054+00 4/4 0/0 0/0 .text isOutfontKanjiCode__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void isOutfontKanjiCode(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/isOutfontKanjiCode__Fi.s" +static bool isOutfontKanjiCode(int param_0) { + switch (param_0) { + case 0x5C: + case 0x40: + case 0x24: + case 0x81F2: + case 0x81F3: + return true; + default: + return false; + } } -#pragma pop - -/* ############################################################################################## */ -/* 803995C8-803995EC 025C28 0024+00 1/1 0/0 0/0 .rodata colorTable$3861 */ -SECTION_RODATA static u8 const colorTable_3861[36] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x78, 0x78, 0xFF, 0xAA, 0xDC, 0x8C, 0xFF, - 0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF, - 0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF, -}; -COMPILER_STRIP_GATE(0x803995C8, &colorTable_3861); /* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getFontCCColorTable(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/getFontCCColorTable__FUcUc.s" -} -#pragma pop +static u32 getFontCCColorTable(u8 i_colorNo, u8 i_fukiKind) { + static const u32 colorTable[9] = { + 0xFFFFFFFF, 0xF07878FF, 0xAADC8CFF, 0xA0B4DCFF, 0xDCDC82FF, + 0xB4C8E6FF, 0xC8A0DCFF, 0xFFFFFFFF, 0xDCAA78FF, + }; -/* ############################################################################################## */ -/* 803995EC-80399610 025C4C 0024+00 1/1 0/0 0/0 .rodata colorTable$3877 */ -SECTION_RODATA static u8 const colorTable_3877[36] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x78, 0x78, 0xFF, 0xAA, 0xDC, 0x8C, 0xFF, - 0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF, - 0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF, -}; -COMPILER_STRIP_GATE(0x803995EC, &colorTable_3877); + if (i_colorNo > 8) { + return 0xFFFFFFFF; + } + + if (g_MsgObject_HIO_c.mTextColorDebug) { + return (g_MsgObject_HIO_c.mTextColorUpperR[i_colorNo] << 0x18) | + (g_MsgObject_HIO_c.mTextColorUpperG[i_colorNo] << 0x10) | + (g_MsgObject_HIO_c.mTextColorUpperB[i_colorNo] << 0x8) | 0xFF; + } + + u32 color = colorTable[i_colorNo]; + + if (i_colorNo != 0) { + return color; + } + + switch (i_fukiKind) { + case 13: + return 0x82E6E6FF; + case 8: + return 0xFFFFFFFF; + case 14: + return 0x96DC64FF; + default: + return color; + } +} /* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getFontGCColorTable(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/getFontGCColorTable__FUcUc.s" -} -#pragma pop +static u32 getFontGCColorTable(u8 i_colorNo, u8 i_fukiKind) { + static const u32 colorTable[9] = { + 0xFFFFFFFF, 0xF07878FF, 0xAADC8CFF, 0xA0B4DCFF, 0xDCDC82FF, + 0xB4C8E6FF, 0xC8A0DCFF, 0xFFFFFFFF, 0xDCAA78FF, + }; -/* ############################################################################################## */ -/* 803BFF78-803BFFA0 -00001 0028+00 1/1 0/0 0/0 .data @3903 */ -SECTION_DATA static void* lit_3903[10] = { - (void*)(((char*)getOutFontNumberType__Fi) + 0x20), - (void*)(((char*)getOutFontNumberType__Fi) + 0x28), - (void*)(((char*)getOutFontNumberType__Fi) + 0x30), - (void*)(((char*)getOutFontNumberType__Fi) + 0x38), - (void*)(((char*)getOutFontNumberType__Fi) + 0x40), - (void*)(((char*)getOutFontNumberType__Fi) + 0x48), - (void*)(((char*)getOutFontNumberType__Fi) + 0x50), - (void*)(((char*)getOutFontNumberType__Fi) + 0x58), - (void*)(((char*)getOutFontNumberType__Fi) + 0x60), - (void*)(((char*)getOutFontNumberType__Fi) + 0x68), -}; + if (i_colorNo > 8) { + return 0xFFFFFFFF; + } + + if (g_MsgObject_HIO_c.mTextColorDebug) { + return (g_MsgObject_HIO_c.mTextColorLowerR[i_colorNo] << 0x18) | + (g_MsgObject_HIO_c.mTextColorLowerG[i_colorNo] << 0x10) | + (g_MsgObject_HIO_c.mTextColorLowerB[i_colorNo] << 0x8) | 0xFF; + } + + u32 color = colorTable[i_colorNo]; + + if (i_colorNo != 0) { + return color; + } + + switch (i_fukiKind) { + case 13: + return 0x82E6E6FF; + case 8: + return 0xFFFFFFFF; + case 14: + return 0x96DC64FF; + default: + return color; + } +} /* 80228A54-80228ACC 223394 0078+00 3/2 0/0 0/0 .text getOutFontNumberType__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getOutFontNumberType(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/getOutFontNumberType__Fi.s" +static int getOutFontNumberType(int param_0) { + switch (param_0) { + case 0: + return 0x1F; + case 1: + return 0x20; + case 2: + return 0x21; + case 3: + return 0x22; + case 4: + return 0x23; + case 5: + return 0x24; + case 6: + return 0x25; + case 7: + return 0x26; + case 8: + return 0x27; + case 9: + return 0x28; + default: + return 0x1F; + } } -#pragma pop /* 80228ACC-80228B04 22340C 0038+00 3/3 0/0 0/0 .text getPohNum__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getPohNum() { - nofralloc -#include "asm/d/msg/d_msg_class/getPohNum__Fv.s" +static u8 getPohNum() { + u8 num = 0; + + if (dComIfGs_getPohSpiritNum() < 20) { + num = 20 - dComIfGs_getPohSpiritNum(); + } else if (dComIfGs_getPohSpiritNum() < 60) { + num = 60 - dComIfGs_getPohSpiritNum(); + } + + return num; } -#pragma pop /* ############################################################################################## */ /* 803BFFA0-803BFFD0 -00001 0030+00 1/1 0/0 0/0 .data @5158 */ @@ -960,74 +739,1712 @@ SECTION_DATA static void* lit_5735[10] = { (void*)(((char*)do_isReady__27jmessage_tSequenceProcessorFv) + 0x350), }; -/* 803C0230-803C0330 -00001 0100+00 1/1 0/0 0/0 .data @6062 */ -SECTION_DATA static void* lit_6062[64] = { - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x188), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x254), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x268), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x278), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x278), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x2A8), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x2FC), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x314), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x32C), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x38C), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x3EC), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x424), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x518), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x544), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x188), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x568), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x5C4), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x2E4), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x1B0), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x1CC), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x1E8), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x5D4), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x620), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x488), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x4CC), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x198), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x2C0), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x668), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x668), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x554), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x204), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x220), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x23C), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x244), - (void*)(((char*)do_tag__27jmessage_tSequenceProcessorFUlPCvUl) + 0x244), +/* 80454A58-80454A5C 003058 0004+00 1/1 0/0 0/0 .sdata2 @4025 */ +SECTION_SDATA2 static f32 lit_4025 = 9.0f / 10.0f; + +/* 80454A5C-80454A60 00305C 0004+00 14/14 0/0 0/0 .sdata2 @4026 */ +SECTION_SDATA2 static f32 lit_4026 = 0.5f; + +/* 80454A60-80454A64 003060 0004+00 25/25 0/0 0/0 .sdata2 @4027 */ +SECTION_SDATA2 static u8 lit_4027[4] = { + 0x00, + 0x00, + 0x00, + 0x00, }; +/* 80454A64-80454A68 003064 0004+00 23/23 0/0 0/0 .sdata2 @4028 */ +SECTION_SDATA2 static f32 lit_4028 = 1.0f; + +/* 80228B04-80228CB4 223444 01B0+00 0/0 1/1 0/0 .text __ct__19jmessage_tReferenceFv */ +// matches with literals +#ifdef NONMATCHING +jmessage_tReference::jmessage_tReference() { + mpStick = new STControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); + mpStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x800); + + mActorPos.set(0.0f, 0.0f, 0.0f); + + mpSelMsgPtr = NULL; + mpFont = NULL; + mFontSizeX = 0.0f; + mFontSizeY = 0.0f; + mRubySize = 0.0f; + mLineSpace = 0.0f; + mCharSpace = 0.0f; + mRubyCharSpace = 0.0f; + mSelFontSize = 0.0f; + mSelRubySize = 0.0f; + mSelTBoxWidth = 0.0f; + mSelCharSpace = 0.0f; + mSelCharSpace = 0.0f; + mDistanceScale = 1.0f; + mAddCharAllAlphaRate = 0.0f; + mCharAllAlphaRate = 0.0f; + mAddCharAlpha = 0.0f; + mCharAlpha = 0.0f; + mStartLineCount = 0; + mEndLineCount = 0; + mLineCount = 0; + field_0x5d2 = 0; + mPageNum = 0; + mSendTimer = 0; + mDemoFrame = 0; + mCharCnt = 0; + mNowLightCount = 0; + mDrawLightCount = 0; + resetCharCountBuffer(); + mNowColorType = 0; + mTopColorType = 0; + mButtonTagStopFlag = 0; + mPageEndCount = 0; + mSelectNum = 0; + mSelectType = 0; + mSelectPos = 0; + mSendFlag = 0; + mStopFlag = 0; + mpStatus = NULL; + mpObjectPtr = NULL; + mSelectRubyFlag = 0; + mInputFigure = 0; + mOutFontRupeeColor = 0; + mNowWordCount = 0; + mTopWordCount = 0; + resetCharactor(); + resetWord(); + mSelectSetCancelFlag = 0; + mBombNameUseFlag = 0; + mRevoMessageID = 0; + mBatchColorFlag = 0; + mTopTagScale = 0; + mNowTagScale = 0; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_tReference::jmessage_tReference() { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__19jmessage_tReferenceFv.s" +} +#pragma pop +#endif + +/* 80228CB4-80228D28 2235F4 0074+00 1/0 0/0 0/0 .text __dt__19jmessage_tReferenceFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_tReference::~jmessage_tReference() { +extern "C" asm void __dt__19jmessage_tReferenceFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__19jmessage_tReferenceFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80454A68-80454A70 003068 0008+00 1/1 0/0 0/0 .sdata2 @4078 */ +SECTION_SDATA2 static u8 lit_4078[8] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +/* 80228D28-80228DE0 223668 00B8+00 1/1 0/0 0/0 .text calcDistance__19jmessage_tReferenceFv */ +// matches with literals +#ifdef NONMATCHING +void jmessage_tReference::calcDistance() { + if (mActorPos.x == 0.0f && mActorPos.y == 0.0f && mActorPos.z == 0.0f) { + mDistanceScale = 1.0f; + } else { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + (mActorPos - player->mAttentionInfo.mPosition).absXZ(); + mDistanceScale = 1.0f; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tReference::calcDistance() { + nofralloc +#include "asm/d/msg/d_msg_class/calcDistance__19jmessage_tReferenceFv.s" +} +#pragma pop +#endif + +/* 80228DE0-80228E6C 223720 008C+00 5/5 0/0 0/0 .text getLineMax__19jmessage_tReferenceFv + */ +u8 jmessage_tReference::getLineMax() { + int line_max; + + if (isKanban()) { + line_max = 7; + } else if (isBook()) { + line_max = 9; + } else if (isStaffRoll()) { + line_max = 10; + } else if (isSaveSeq()) { + line_max = 6; + } else { + line_max = 4; + } + + return line_max; +} + +/* 80228E6C-80228EA0 2237AC 0034+00 2/2 0/0 0/0 .text isKanban__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isKanban() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isKanbanMessage(); +} + +/* 80228EA0-80228ED4 2237E0 0034+00 2/2 0/0 0/0 .text isPlaceName__19jmessage_tReferenceFv */ +bool jmessage_tReference::isPlaceName() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isPlaceMessage(); +} + +/* 80228ED4-80228F08 223814 0034+00 2/2 0/0 0/0 .text isBossName__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isBossName() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isBossMessage(); +} + +/* 80228F08-80228F3C 223848 0034+00 2/2 0/0 0/0 .text isSaveSeq__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isSaveSeq() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isSaveMessage(); +} + +/* 80228F3C-80228F70 22387C 0034+00 2/2 0/0 0/0 .text isBook__19jmessage_tReferenceFv */ +bool jmessage_tReference::isBook() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isBookMessage(); +} + +/* 80228F70-80228FA4 2238B0 0034+00 3/3 0/0 0/0 .text isStaffRoll__19jmessage_tReferenceFv */ +bool jmessage_tReference::isStaffRoll() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isStaffMessage(); +} + +/* 80228FA4-80228FD8 2238E4 0034+00 1/1 0/0 0/0 .text isHowl__19jmessage_tReferenceFv */ +u8 jmessage_tReference::isHowl() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isHowlMessage(); +} + +/* 80228FD8-8022900C 223918 0034+00 2/2 0/0 0/0 .text isMidona__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isMidona() { + if (getObjectPtr() == NULL) { + return false; + } + + return getObjectPtr()->isMidonaMessage(); +} + +/* 8022900C-80229034 22394C 0028+00 1/1 0/0 0/0 .text resetReference__19jmessage_tReferenceFv */ +void jmessage_tReference::resetReference() { + mSendTimer = 0; + mSendFlag = 0; + mStartLineCount = 0; + mEndLineCount = 0; + mLineCount = 0; + field_0x5d2 = 0; + mSelectNum = 0; + mSelectType = 0; +} + +/* ############################################################################################## */ +/* 80454A70-80454A78 003070 0008+00 16/16 0/0 0/0 .sdata2 @4198 */ +SECTION_SDATA2 static f64 lit_4198 = 4503601774854144.0 /* cast s32 to float */; + +/* 80229034-80229168 223974 0134+00 0/0 1/1 0/0 .text pageSend__19jmessage_tReferenceFv + */ +// matches with literals +#ifdef NONMATCHING +void jmessage_tReference::pageSend() { + field_0x5d2++; + mLineCount = 0; + mStartLineCount = mEndLineCount; + + mText[0] = 0; + mTextS[0] = 0; + mRuby[0] = 0; + + for (int i = 0; i < 3; i++) { + mSelText[i][0] = 0; + mSelRuby[i][0] = 0; + } + + mSendFlag = 0; + mSendTimer = 0; + mSelectNum = 0; + mSelectType = 0; + mCharCnt = 0; + + if (mNowColorType != mTopColorType) { + mTopColorType = mNowColorType; + } + + mTopWordCount = mNowWordCount; + mCharAlpha = 0.0f; + + if (getForm() == 8) { + setAddCharAllAlphaRate(1.0f / (g_MsgObject_HIO_c.mBatchDisplayWeight_8 + 1.0f)); + setCharAllAlphaRate(0.0f); + } else if (getForm() == 9) { + setAddCharAllAlphaRate(1.0f / (g_MsgObject_HIO_c.mBatchDisplayWeight_9 + 1.0f)); + setCharAllAlphaRate(0.0f); + } + + mTopTagScale = mNowTagScale; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tReference::pageSend() { + nofralloc +#include "asm/d/msg/d_msg_class/pageSend__19jmessage_tReferenceFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80454A78-80454A7C 003078 0004+00 4/4 0/0 0/0 .sdata2 @4291 */ +SECTION_SDATA2 static f32 lit_4291 = -1.0f; + +/* 80229168-802294A8 223AA8 0340+00 0/0 2/2 0/0 .text selectMessage__19jmessage_tReferenceFv */ +// matches with literals +#ifdef NONMATCHING +void jmessage_tReference::selectMessage() { + if (mSelectNum != 0) { + mpStick->checkTrigger(); + + if (mSelectType == 0) { + if (mpStick->checkUpTrigger()) { + if (mSelectNum == 2) { + if (mSelectPos == 1) { + mSelectPos = 0; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } else if (mSelectNum == 3 && mSelectPos != 0) { + mSelectPos--; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } else if (mpStick->checkDownTrigger()) { + if (mSelectNum == 2) { + if (mSelectPos == 0) { + mSelectPos = 1; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } else if (mSelectNum == 3 && mSelectPos < 2) { + mSelectPos++; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } + } else if (mpStick->checkLeftTrigger()) { + if (mSelectPos == 1) { + mSelectPos = 0; + getObjectPtr()->getSequenceProcessor()->calcStringLength(); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } else if (mSelectPos == 2) { + mSelectPos = 1; + getObjectPtr()->getSequenceProcessor()->calcStringLength(); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + } else if (mpStick->checkRightTrigger()) { + if (mSelectPos == 0) { + mSelectPos = 1; + getObjectPtr()->getSequenceProcessor()->calcStringLength(); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } else if (mSelectPos == 1 && mSelectNum == 3) { + mSelectPos = 2; + getObjectPtr()->getSequenceProcessor()->calcStringLength(); + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + } + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tReference::selectMessage() { + nofralloc +#include "asm/d/msg/d_msg_class/selectMessage__19jmessage_tReferenceFv.s" +} +#pragma pop +#endif + +/* 802294A8-80229730 223DE8 0288+00 0/0 1/1 0/0 .text inputNumber__19jmessage_tReferenceFv */ +// matches with literals +#ifdef NONMATCHING +void jmessage_tReference::inputNumber() { + mpStick->checkTrigger(); + + s16 input_val = getObjectPtr()->getInputValue(); + s16 new_input_val = input_val; + + u8 max_figure = 0; + if (i_dComIfGs_getRupee() >= 1000) { + max_figure = 3; + } else if (i_dComIfGs_getRupee() >= 100) { + max_figure = 2; + } else if (i_dComIfGs_getRupee() >= 10) { + max_figure = 1; + } + + if (mpStick->checkUpTrigger()) { + switch (mInputFigure) { + case 0: + new_input_val = input_val + 1; + break; + case 1: + new_input_val = input_val + 10; + break; + case 2: + new_input_val = input_val + 100; + break; + case 3: + new_input_val = input_val + 1000; + break; + } + } else if (mpStick->checkDownTrigger()) { + switch (mInputFigure) { + case 0: + new_input_val = input_val - 1; + break; + case 1: + new_input_val = input_val - 10; + break; + case 2: + new_input_val = input_val - 100; + break; + case 3: + new_input_val = input_val - 1000; + break; + } + } else if (mpStick->checkLeftTrigger()) { + if (mInputFigure < max_figure) { + mInputFigure++; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + } else if (mpStick->checkRightTrigger()) { + if (mInputFigure != 0) { + mInputFigure--; + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } + } + + if (new_input_val < 0) { + new_input_val = 0; + } + + if (new_input_val > i_dComIfGs_getRupee()) { + new_input_val = i_dComIfGs_getRupee(); + } + + if (new_input_val != input_val) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + } + + decideOutFontRupeeColor(new_input_val); + getObjectPtr()->setInputValue(new_input_val); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tReference::inputNumber() { + nofralloc +#include "asm/d/msg/d_msg_class/inputNumber__19jmessage_tReferenceFv.s" +} +#pragma pop +#endif + +/* 80229730-80229744 224070 0014+00 5/5 0/0 0/0 .text getWord__19jmessage_tReferenceFi */ +const char* jmessage_tReference::getWord(int i_no) { + return mWord[i_no]; +} + +/* 80229744-80229768 224084 0024+00 2/2 0/0 0/0 .text resetWord__19jmessage_tReferenceFv + */ +void jmessage_tReference::resetWord() { + for (int i = 0; i < 10; i++) { + mWord[i][0] = 0; + } +} + +/* 80229768-80229788 2240A8 0020+00 3/3 0/0 0/0 .text setCharactor__19jmessage_tReferenceFUs */ +void jmessage_tReference::setCharactor(u16 param_0) { + mCharactor[field_0x40c] = param_0; + field_0x40c++; +} + +/* 80229788-802297B0 2240C8 0028+00 3/3 0/0 0/0 .text addCharactor__19jmessage_tReferenceFUs */ +void jmessage_tReference::addCharactor(u16 param_0) { + if (param_0 == mCharactor[field_0x40e]) { + field_0x40e++; + } +} + +/* 802297B0-802297E4 2240F0 0034+00 3/3 0/0 0/0 .text resetCharactor__19jmessage_tReferenceFv */ +void jmessage_tReference::resetCharactor() { + for (int i = 0; i < 0x200; i++) { + mCharactor[i] = 0; + } + + field_0x40c = 0; + field_0x40e = 0; + mCountBackUp = 0; +} + +/* 802297E4-80229810 224124 002C+00 0/0 1/1 0/0 .text + * shiftCharCountBuffer__19jmessage_tReferenceFv */ +void jmessage_tReference::shiftCharCountBuffer() { + for (int i = 30; i > 0; i--) { + mCharCountBuffer[i] = mCharCountBuffer[i - 1]; + } + + mCharCountBuffer[0] = getNowLightCount(); +} + +/* 80229810-80229848 224150 0038+00 1/1 5/5 0/0 .text + * resetCharCountBuffer__19jmessage_tReferenceFv */ +void jmessage_tReference::resetCharCountBuffer() { + for (int i = 0; i < 31; i++) { + mCharCountBuffer[i] = 0; + } + + mLightBatchFlag = false; + mBatchFlag = false; + resetNowLightCount(); + resetDrawLightCount(); +} + +/* 80229848-8022986C 224188 0024+00 1/1 0/0 0/0 .text + * allsetCharCountBuffer__19jmessage_tReferenceFv */ +void jmessage_tReference::allsetCharCountBuffer() { + for (int i = 0; i < 31; i++) { + mCharCountBuffer[i] = getNowLightCount(); + } +} + +/* 8022986C-802298DC 2241AC 0070+00 2/2 0/0 0/0 .text isCharSend__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isCharSend() { + s16 delay_frame; + s16 var_r5; + + if (getFukiKind() == 8) { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrameSpirit; + var_r5 = delay_frame; + } else { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrame; + var_r5 = delay_frame; + } + + if (var_r5 < 0) { + var_r5 *= -1; + } + + if (delay_frame < 0 && getDrawLightCount() >= getCharCountBuffer(var_r5)) { + return false; + } + + return true; +} + +/* 802298DC-8022994C 22421C 0070+00 1/1 0/0 0/0 .text isLightSend__19jmessage_tReferenceFv */ +bool jmessage_tReference::isLightSend() { + s16 delay_frame; + s16 var_r5; + + if (getFukiKind() == 8) { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrameSpirit; + var_r5 = delay_frame; + } else { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrame; + var_r5 = delay_frame; + } + + if (var_r5 < 0) { + var_r5 *= -1; + } + + if (delay_frame > 0 && getDrawLightCount() >= getCharCountBuffer(var_r5)) { + return false; + } + + return true; +} + +/* 8022994C-802299AC 22428C 0060+00 0/0 1/1 0/0 .text isLightEnd__19jmessage_tReferenceFv + */ +bool jmessage_tReference::isLightEnd() { + s16 delay_frame; + + if (getFukiKind() == 8) { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrameSpirit; + } else { + delay_frame = g_MsgObject_HIO_c.mHaloDelayFrame; + } + + if (delay_frame < 0) { + delay_frame *= -1; + } + + if (getCharCountBuffer(delay_frame) == getCharCountBuffer(0)) { + return true; + } + + return false; +} + +/* 802299AC-802299EC 2242EC 0040+00 2/2 0/0 0/0 .text + * decideOutFontRupeeColor__19jmessage_tReferenceFi */ +void jmessage_tReference::decideOutFontRupeeColor(int i_inputVal) { + s16 payment = getObjectPtr()->getNowTotalPayment(); + s16 price = getObjectPtr()->getNowTotalPrice(); + int diff = price - payment; + + if (diff > i_inputVal) { + mOutFontRupeeColor = 1; + } else if (diff == i_inputVal) { + mOutFontRupeeColor = 0; + } else { + mOutFontRupeeColor = 2; + } +} + +/* 802299EC-80229A28 22432C 003C+00 0/0 1/1 0/0 .text __ct__17jmessage_tControlFv */ +jmessage_tControl::jmessage_tControl() {} + +/* 80229A28-80229AC4 224368 009C+00 1/1 0/0 0/0 .text + * __ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference */ +jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const* param_0) + : TRenderingProcessor(param_0) { + jmessage_tReference* reference_p = (jmessage_tReference*)getReference(); + + reference_p->resetCharactor(); + field_0x38 = lit_4028; + mTotalLineCnt = 0; + field_0x3e = 0; + field_0x40 = 0; + field_0x48 = 0; + field_0x44 = 0; + mSelectType = 0; + field_0x46 = 0; + field_0x47 = 0; + field_0x49 = 0; + mPageLineMax = reference_p->getLineMax(); + field_0x4b = 0; + field_0x4c = 0; + field_0x4d = 0; +} + +/* 80229AC4-80229CB4 224404 01F0+00 1/0 0/0 0/0 .text + * do_begin__26jmessage_tMeasureProcessorFPCvPCc */ +// matches with literals +#ifdef NONMATCHING +void jmessage_tMeasureProcessor::do_begin(void const* param_0, char const* param_1) { + jmessage_tReference* reference_p = (jmessage_tReference*)getReference(); + + reference_p->resetCharactor(); + reference_p->setRevoMessageID(0); + field_0x38 = 1.0f; + field_0x4c = *((u8*)param_0 + 8); + field_0x42 = *((u8*)param_0 + 0xE); + + for (int i = 0; i < 40; i++) { + reference_p->setLineLength(i, 0.0f, 0.0f); + reference_p->setPageLine(i, 0); + reference_p->setPageLineMax(i, 0); + reference_p->setPageType(i, 0); + reference_p->setLineArrange(i, *((u8*)param_0 + 0xD)); + reference_p->setLineScale(i, 100); + + if (reference_p->isPlaceName() || reference_p->isStaffRoll() || reference_p->isBossName() || + reference_p->getFukiKind() == 9) + { + reference_p->setLineArrange(i, 1); + } else { + if (*((u16*)param_0 + 0x2) == 0x2A5) { + reference_p->setLineArrange(i, 1); + } + + if (*((u8*)param_0 + 0xD) == 0) { + reference_p->setLineArrange(i, 1); + } + } + } + + for (int i = 0; i < 3; i++) { + reference_p->setSelLength(i, 0.0f); + reference_p->offSelectRubyFlag(i); + } + + reference_p->setPageEndCount(0); + mTotalLineCnt = 0; + field_0x3e = 0; + field_0x40 = 0; + field_0x48 = 0; + field_0x44 = 0; + mSelectType = 0; + field_0x46 = 0; + field_0x47 = 0; + field_0x49 = 0; + mPageLineMax = reference_p->getLineMax(); + reference_p->resetWord(); + field_0x4b = 0; + + dMsgObject_c* object_p = reference_p->getObjectPtr(); + object_p->offAutoMessageFlag(); + + if (!reference_p->isSelectSetCancelFlag()) { + object_p->resetSelectBomBag(); + } + + if (reference_p->getDistanceScale() != 1.0f) { + do_scale(field_0x38); + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__26jmessage_tMeasureProcessorFPCvPCc.s" +} +#pragma pop +#endif + +/* 80229CB4-80229E3C 2245F4 0188+00 1/0 0/0 0/0 .text do_end__26jmessage_tMeasureProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_end() { + nofralloc +#include "asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s" +} +#pragma pop + +/* 80229E3C-8022A268 22477C 042C+00 1/0 0/0 0/0 .text do_character__26jmessage_tMeasureProcessorFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_character(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_character__26jmessage_tMeasureProcessorFi.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399610 = "'"; +SECTION_DEAD static char const* const stringBase_80399612 = "s"; +SECTION_DEAD static char const* const stringBase_80399614 = "%d"; +#pragma pop + +/* 80454A7C-80454A80 00307C 0004+00 5/5 0/0 0/0 .sdata2 @5151 */ +SECTION_SDATA2 static f32 lit_5151 = 100.0f; + +/* 80454A80-80454A88 003080 0008+00 5/5 0/0 0/0 .sdata2 @5154 */ +SECTION_SDATA2 static f64 lit_5154 = 4503599627370496.0 /* cast u32 to float */; + +/* 8022A268-8022B0B0 224BA8 0E48+00 5/0 0/0 0/0 .text do_tag__26jmessage_tMeasureProcessorFUlPCvUl + */ +#ifdef NONMATCHING +bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) { + jmessage_tReference* reference_p = (jmessage_tReference*)getReference(); + + switch (i_tag & 0xFF0000) { + case 0x10000: + case 0x20000: + return true; + case 0xFF0000: + switch (i_tag) { + case 0xFF0000: + return true; + case 0xFF0001: + u16 scale = *(u16*)i_data; + reference_p->setLineScale(mTotalLineCnt, scale); + do_scale(scale / 100.0f); + return true; + case 0xFF0002: + case 0xFFFF02: + do_rubyset(i_data, i_size); + if (field_0x46 != 0) { + if (mSelectType == 2) { + if (!reference_p->isSelectRubyFlag(field_0x46 - 1)) { + reference_p->onSelectRubyFlag(field_0x46 - 1); + } + } else if (mSelectType == 3) { + if (!reference_p->isSelectRubyFlag(field_0x46 - 1)) { + reference_p->onSelectRubyFlag(field_0x46 - 1); + } + } + } + return true; + } + case 0: + switch (i_tag) { + case 1: + reference_p->setCharAllAlphaRate(1.0f); + return true; + case 2: + return true; + case 0x3e: + char msg_num1[4]; + sprintf(msg_num1, "%d", dComIfGp_getMessageCountNumber() / 100); + push_word(msg_num1); + return true; + case 0x3f: + char msg_num2[4]; + sprintf(msg_num2, "%d", dComIfGp_getMessageCountNumber() % 100); + push_word(msg_num2); + return true; + case 3: + case 4: + if (*(u16*)i_data != 0) { + reference_p->mpObjectPtr->onAutoMessageFlag(); + } + return true; + case 0x28: + reference_p->setDemoFrame(*(u32*)i_data); + return true; + case 0: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + char player_name[100]; + strcpy(player_name, dComIfGs_getPlayerName()); + push_word(player_name); + return true; + case 0x22: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + char horse_name[100]; + strcpy(horse_name, dComIfGs_getHorseName()); + push_word(horse_name); + return true; + case 0x35: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + stack_pushCurrent(dMsgObject_getWord()); + return true; + case 0x29: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + stack_pushCurrent(reference_p->getObjectPtr()->getSmellName()); + return true; + case 0x2b: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + stack_pushCurrent(reference_p->getObjectPtr()->getPortalName()); + return true; + case 0x2d: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + dMsgObject_c* object_p = reference_p->getObjectPtr(); + if (!reference_p->isSelectSetCancelFlag()) { + reference_p->onBombNameUseFlag(); + } + + stack_pushCurrent(object_p->getBombName()); + return true; + case 0x3b: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + stack_pushCurrent(reference_p->getObjectPtr()->getInsectName()); + return true; + case 0x3c: + if (field_0x49 != 0) { + field_0x49 = 0; + } + + stack_pushCurrent(reference_p->getObjectPtr()->getLetterName()); + return true; + case 8: + if (field_0x46 == 0) { + if (field_0x3e > 0) { + reference_p->setPageLine(field_0x40, field_0x3e); + reference_p->setPageLineMax(field_0x40, field_0x3e); + do_pageType(field_0x3e); + field_0x3e = 0; + mPageLineMax = reference_p->getLineMax(); + field_0x49 = 0; + } + + mSelectType = 2; + field_0x44 = 1; + field_0x46 = 1; + } + + if (*(u8*)i_data == 1) { + reference_p->setSelectPos(field_0x47); + } + + field_0x47++; + field_0x46++; + reference_p->setLineArrange(mTotalLineCnt, 1); + return true; + case 9: + if (field_0x46 == 0) { + if (field_0x3e > 0) { + reference_p->setPageLine(field_0x40, field_0x3e); + reference_p->setPageLineMax(field_0x40, field_0x3e); + do_pageType(field_0x3e); + field_0x3e = 0; + mPageLineMax = reference_p->getLineMax(); + field_0x49 = 0; + } + + mSelectType = 3; + field_0x44 = 2; + } + + if (*(u8*)i_data == 1) { + reference_p->setSelectPos(field_0x47); + } + + field_0x47++; + field_0x46++; + reference_p->setLineArrange(mTotalLineCnt, 1); + return true; + case 0x1f: + case 0x34: + reference_p->setSelectPos(field_0x47); + case 0x1e: + case 0x33: + field_0x47++; + reference_p->setLineArrange(mTotalLineCnt, 0); + do_space(0); + return true; + case 0x20: + mSelectType = 1; + field_0x38 = 1.0f; + do_character(10); + stack_pushCurrent(reference_p->getSelMsgPtr()); + return true; + case 0x21: + do_name1(); + return true; + case 10: + case 0xb: + case 0xc: + case 0xd: + case 0xe: + case 0xf: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1a: + case 0x1b: + case 0x1c: + case 0x1d: + case 0x23: + case 0x24: + case 0x27: + case 0x2a: + case 0x2c: + case 0x2e: + case 0x2f: + case 0x39: + case 0x3a: + do_space(i_tag); + return true; + case 0x30: + do_space(i_tag); + if (!reference_p->isSelectSetCancelFlag()) { + reference_p->getObjectPtr()->addSelectBomBag(*(u8*)i_data - 1); + } + return true; + case 0x25: + for (int i = 0; i < 4; i++) { + do_space(0); + } + return true; + case 0x26: + return true; + case 0x31: + char bomb_num_text[40]; + u8 sel_bomb_num = reference_p->getObjectPtr()->getSelectBombNum(); + dMsgUnit_setTag(7, sel_bomb_num, bomb_num_text); + push_word(bomb_num_text); + return true; + case 0x32: + char bomb_price_text[40]; + s16 sel_bomb_price = reference_p->getObjectPtr()->getSelectBombPrice(); + dMsgUnit_setTag(1, sel_bomb_price, bomb_price_text); + push_word(bomb_price_text); + return true; + case 0x37: + u8 bomb_type = NORMAL_BOMB; + + if (*(u8*)i_data == 1) { + bomb_type = WATER_BOMB; + } else if (*(u8*)i_data == 2) { + bomb_type = POKE_BOMB; + } + + char bomb_max_text[40]; + u8 bomb_max = dComIfGs_getBombMax(bomb_type); + dMsgUnit_setTag(7, bomb_max, bomb_max_text); + push_word(bomb_max_text); + return true; + case 0x38: + char arrow_max_text[40]; + u8 arrow_max = dComIfGs_getArrowMax(); + dMsgUnit_setTag(0, arrow_max, arrow_max_text); + push_word(arrow_max_text); + return true; + } + return true; + case 0x40000: + switch (i_tag & 0xFF00FFFF) { + case 0: + push_word(changeCodeToChar(0x24)); + return true; + case 1: + push_word(changeCodeToChar(0x5C)); + return true; + case 2: + push_word(changeCodeToChar(0x40)); + return true; + case 3: + push_word(changeCodeToChar(0x81F2)); + return true; + case 4: + push_word(changeCodeToChar(0x81F3)); + return true; + case 5: + push_word(changeCodeToChar(0x81E3)); + return true; + case 6: + push_word(changeCodeToChar(0x876C)); + return true; + case 7: + push_word(changeCodeToChar(0x8766)); + return true; + case 8: + push_word(changeCodeToChar(0x8765)); + return true; + case 9: + push_word(changeCodeToChar(0x8767)); + return true; + case 10: + push_word(changeCodeToChar(0x8768)); + return true; + case 11: + push_word(changeCodeToChar(0x8769)); + return true; + case 12: + push_word(changeCodeToChar(0x876A)); + return true; + case 13: + push_word(changeCodeToChar(0x876B)); + return true; + } + return false; + case 0x50000: + char buffer_0[40]; + switch (i_tag & 0xFF00FFFF) { + case 0: + if (*(u8*)i_data == 0) { + int msg_time_ms = dMeter2Info_getMsgTimeMs(); + dMsgUnit_setTag(4, msg_time_ms, buffer_0); + } else if (*(u8*)i_data == 2) { + int race_time = dComIfGs_getRaceGameTime(); + dMsgUnit_setTag(4, race_time, buffer_0); + } else { + int time_ms = dMeter2Info_getTimeMs(); + dMsgUnit_setTag(4, time_ms, buffer_0); + } + break; + case 1: + u32 msg_num_ = dComIfGp_getMessageCountNumber(); + dMsgUnit_setTag(0, msg_num_, buffer_0); + break; + case 2: + u32 msg_num = dComIfGp_getMessageCountNumber(); + dMsgUnit_setTag(1, msg_num, buffer_0); + break; + case 9: + s16 fund_raise_val = *(u32*)i_data; + reference_p->getObjectPtr()->setFundRaisingValue(fund_raise_val); + + int fund_raising = fund_raise_val - dMsgObject_getFundRaising(); + dMsgUnit_setTag(10, fund_raising, buffer_0); + break; + case 10: + u32 letter_num = dMeter2Info_getNewLetterNum(); + dMsgUnit_setTag(11, letter_num, buffer_0); + break; + case 11: + u32 poh_num = getPohNum(); + dMsgUnit_setTag(12, poh_num, buffer_0); + break; + case 12: + int tmp; + if (*(u8*)i_data == 0) { + tmp = dComIfGp_getMessageCountNumber(); + } else { + tmp = dComIfGs_getBalloonScore(); + } + + dMsgUnit_setTag(13, tmp, buffer_0); + break; + case 3: + u32 insect_num; + if (*(u8*)i_data == 0) { + insect_num = dComIfGs_checkGetInsectNum(); + } else { + insect_num = 24 - dComIfGs_checkGetInsectNum(); + } + + dMsgUnit_setTag(2, insect_num, buffer_0); + break; + case 4: + dMsgUnit_setTag(3, 0, buffer_0); + break; + case 5: + dMsgUnit_setTag(0x10000, dComIfGp_getNeedLightDropNum(), buffer_0); + break; + case 6: + dMsgUnit_setTag(6, 20 - i_dComIfGs_getEventReg(0xFF1F), buffer_0); + break; + case 8: + dMsgUnit_setTag(9, (u32)dComIfGp_getMessageCountNumber(), buffer_0); + break; + case 13: + dMsgUnit_setTag(14, (u32)dComIfGp_getMessageCountNumber(), buffer_0); + break; + case 14: + dMsgUnit_setTag(0x10001, (u32)dComIfGp_getMessageCountNumber(), buffer_0); + break; + case 7: + int now_count = dMeter2Info_getNowCount(); + dMsgUnit_setTag(8, now_count, buffer_0); + break; + default: + return false; + } + push_word(buffer_0); + return true; + case 0x60000: + char buffer1[40]; + switch (i_tag & 0xFF00FFFF) { + case 0: + push_word(buffer1); + return true; + case 1: + push_word(buffer1); + return true; + case 2: + push_word(changeCodeToChar(0xB2)); + return true; + case 3: + push_word(changeCodeToChar(0xB3)); + return true; + case 4: + push_word(changeCodeToChar(0xB1)); + return true; + case 5: + push_word(changeCodeToChar(0x89)); + return true; + case 6: + push_word(changeCodeToChar(0xB9)); + return true; + case 7: + push_word(changeCodeToChar(0xBC)); + return true; + case 8: + push_word(changeCodeToChar(0xBD)); + return true; + case 9: + push_word(changeCodeToChar(0xBE)); + return true; + case 10: + case 11: + do_space(i_tag); + return true; + } + case 0x30000: + switch (i_tag & 0xFF00FFFF) { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + do_space(i_tag); + return true; + case 0: + reference_p->setRevoMessageID(*(u32*)i_data); + return true; + } + } + + return false; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool jmessage_tMeasureProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/do_tag__26jmessage_tMeasureProcessorFUlPCvUl.s" +} +#pragma pop +#endif + +/* 8022B0B0-8022B18C 2259F0 00DC+00 2/2 0/0 0/0 .text do_scale__26jmessage_tMeasureProcessorFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_scale(f32 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_scale__26jmessage_tMeasureProcessorFf.s" +} +#pragma pop + +/* 8022B18C-8022B3EC 225ACC 0260+00 2/1 0/0 0/0 .text do_space__26jmessage_tMeasureProcessorFUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_space(u32 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_space__26jmessage_tMeasureProcessorFUl.s" +} +#pragma pop + +/* 8022B3EC-8022B454 225D2C 0068+00 3/3 0/0 0/0 .text do_pageType__26jmessage_tMeasureProcessorFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_pageType(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_pageType__26jmessage_tMeasureProcessorFi.s" +} +#pragma pop + +/* 8022B454-8022B458 225D94 0004+00 1/1 0/0 0/0 .text do_name1__26jmessage_tMeasureProcessorFv */ +void jmessage_tMeasureProcessor::do_name1() {} + +/* 8022B458-8022B4E0 225D98 0088+00 1/1 0/0 0/0 .text + * do_rubyset__26jmessage_tMeasureProcessorFPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::do_rubyset(void const* param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubyset__26jmessage_tMeasureProcessorFPCvUl.s" +} +#pragma pop + +/* 8022B4E0-8022B558 225E20 0078+00 1/1 0/0 0/0 .text push_word__26jmessage_tMeasureProcessorFPc + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tMeasureProcessor::push_word(char* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/push_word__26jmessage_tMeasureProcessorFPc.s" +} +#pragma pop + +/* 8022B558-8022B5F4 225E98 009C+00 0/0 1/1 0/0 .text + * __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_tSequenceProcessor::jmessage_tSequenceProcessor(jmessage_tReference const* param_0, + jmessage_tControl* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl.s" +} +#pragma pop + +/* 8022B5F4-8022B654 225F34 0060+00 1/0 0/0 0/0 .text __dt__26jmessage_tMeasureProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_tMeasureProcessor::~jmessage_tMeasureProcessor() { +extern "C" asm void __dt__26jmessage_tMeasureProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__26jmessage_tMeasureProcessorFv.s" +} +#pragma pop + +/* 8022B654-8022B658 225F94 0004+00 1/0 0/0 0/0 .text do_reset__27jmessage_tSequenceProcessorFv */ +void jmessage_tSequenceProcessor::do_reset() {} + +/* ############################################################################################## */ +/* 80454A88-80454A8C 003088 0004+00 1/1 0/0 0/0 .sdata2 @5490 */ +SECTION_SDATA2 static f32 lit_5490 = 10.0f; + +/* 80454A8C-80454A90 00308C 0004+00 2/2 0/0 0/0 .sdata2 @5491 */ +SECTION_SDATA2 static f32 lit_5491 = 255.0f; + +/* 8022B658-8022BA3C 225F98 03E4+00 1/0 0/0 0/0 .text + * do_begin__27jmessage_tSequenceProcessorFPCvPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__27jmessage_tSequenceProcessorFPCvPCc.s" +} +#pragma pop + +/* 8022BA3C-8022BB7C 22637C 0140+00 1/0 0/0 0/0 .text do_end__27jmessage_tSequenceProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::do_end() { + nofralloc +#include "asm/d/msg/d_msg_class/do_end__27jmessage_tSequenceProcessorFv.s" +} +#pragma pop + +/* 8022BB7C-8022BFE0 2264BC 0464+00 2/0 0/0 0/0 .text do_isReady__27jmessage_tSequenceProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool jmessage_tSequenceProcessor::do_isReady() { + nofralloc +#include "asm/d/msg/d_msg_class/do_isReady__27jmessage_tSequenceProcessorFv.s" +} +#pragma pop + +/* 8022BFE0-8022C1A0 226920 01C0+00 1/0 0/0 0/0 .text + * do_character__27jmessage_tSequenceProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::do_character(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_character__27jmessage_tSequenceProcessorFi.s" +} +#pragma pop + +/* 8022C1A0-8022C8FC 226AE0 075C+00 2/0 0/0 0/0 .text + * do_tag__27jmessage_tSequenceProcessorFUlPCvUl */ +bool jmessage_tSequenceProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) { + jmessage_tReference* reference_p = + (jmessage_tReference*)JMessage::TSequenceProcessor::getReference(); + + switch (i_tag & 0xFF0000) { + case 0x10000: { + cXyz pos = reference_p->getActorPos(); + messageSePlay(field_0xb4, i_tag & 0xFF, &pos); + return true; + } + case 0x20000: + dComIfGp_setMesgCameraTagInfo(i_tag & 0xFF); + return true; + case 0xFF0000: + switch (i_tag) { + case 0xFF0000: + reference_p->setNowColorType(*(u8*)i_data); + return true; + case 0xFF0001: + reference_p->setNowTagScale(*(u16*)i_data); + return true; + case 0xFF0002: + case 0xFFFF02: + do_rubyset(i_data, i_size); + return true; + } + case 0: + switch (i_tag) { + case 0: + case 0x22: + push_word(); + return true; + case 0x35: + JMessage::TSequenceProcessor::stack_pushCurrent(dMsgObject_getWord()); + return true; + case 0x29: + JMessage::TSequenceProcessor::stack_pushCurrent( + reference_p->getObjectPtr()->getSmellName()); + return true; + case 0x2b: + JMessage::TSequenceProcessor::stack_pushCurrent( + reference_p->getObjectPtr()->getPortalName()); + return true; + case 0x2d: + JMessage::TSequenceProcessor::stack_pushCurrent( + reference_p->getObjectPtr()->getBombName()); + return true; + case 0x3b: + JMessage::TSequenceProcessor::stack_pushCurrent( + reference_p->getObjectPtr()->getInsectName()); + return true; + case 0x3c: + JMessage::TSequenceProcessor::stack_pushCurrent( + reference_p->getObjectPtr()->getLetterName()); + return true; + case 0x3d: + return true; + case 0x3e: + case 0x3f: + push_word(); + return true; + case 1: + field_0xb2 = 1; + reference_p->setBatchColorFlag(1); + return true; + case 2: + field_0xb2 = 0; + return true; + case 3: + case 4: + reference_p->setSendTimer(*(u16*)i_data); + if (reference_p->getSendTimer() == 0) { + reference_p->setSendFlag(3); + } else { + reference_p->setSendFlag(1); + } + return true; + case 5: + reference_p->setSendTimer(*(u16*)i_data); + reference_p->setSendFlag(2); + return true; + case 0x36: + dMeter2Info_setMsgKeyWaitTimer(*(u16*)i_data); + reference_p->setSendTimer(*(u16*)i_data); + reference_p->setSendFlag(6); + return true; + case 0x28: + reference_p->setDemoFrame(*(u32*)i_data); + reference_p->setSendFlag(4); + return true; + case 6: + field_0xa8 = *(u16*)i_data; + field_0xa4 = field_0xa8; + return true; + case 7: + field_0xa4 = *(u16*)i_data; + mMouthCheck = 0; + return true; + case 8: + if (reference_p->getSelectNum() == 0) { + reference_p->setSelectNum(2); + reference_p->setSelectType(0); + field_0xb2 = 1; + } + + if (*(u8*)i_data == 1) { + reference_p->setSelectPos(field_0xad); + } + + field_0xad++; + field_0xac = 1; + return true; + case 9: + if (reference_p->getSelectNum() == 0) { + reference_p->setSelectNum(3); + reference_p->setSelectType(0); + field_0xb2 = 1; + } + + if (*(u8*)i_data == 1) { + reference_p->setSelectPos(field_0xad); + } + + field_0xad++; + field_0xac = 1; + return true; + case 0x1e: + if (reference_p->getSelectNum() != 2 || reference_p->getSelectType() != 1) { + reference_p->setSelectNum(2); + reference_p->setSelectType(1); + } + + field_0xb2 = 1; + return true; + case 0x1f: + if (reference_p->getSelectNum() != 2 || reference_p->getSelectType() != 1) { + reference_p->setSelectNum(2); + reference_p->setSelectType(1); + reference_p->setSelectPos(0); + } else { + reference_p->setSelectPos(1); + } + + field_0xb2 = 1; + return true; + case 0x33: + if (reference_p->getSelectNum() != 3 || reference_p->getSelectType() != 1) { + reference_p->setSelectNum(3); + reference_p->setSelectType(1); + } + + field_0xad++; + field_0xb2 = 1; + return true; + case 0x34: + if (reference_p->getSelectNum() != 3 || reference_p->getSelectType() != 1) { + reference_p->setSelectNum(3); + reference_p->setSelectType(1); + } + + reference_p->setSelectPos(field_0xad); + field_0xb2 = 1; + return true; + case 0x20: + do_character(10); + JMessage::TSequenceProcessor::stack_pushCurrent(reference_p->getSelMsgPtr()); + return true; + case 0x21: + do_name1(); + return true; + case 10: + case 0xb: + case 0xc: + case 0xd: + case 0xe: + case 0xf: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1a: + case 0x1b: + case 0x1c: + case 0x1d: + case 0x23: + case 0x24: + case 0x27: + case 0x2a: + case 0x2c: + case 0x2e: + case 0x2f: + case 0x30: + case 0x39: + case 0x3a: + do_space(i_tag); + return true; + case 0x25: + reference_p->decideOutFontRupeeColor(0); + dMsgObject_c* object_p = reference_p->getObjectPtr(); + + object_p->setInputValue(0); + object_p->onInputFlag(); + reference_p->resetInputFigure(); + reference_p->setSendFlag(5); + + if (*(u32*)i_data == 1) { + dComIfGs_onTmpBit(dSv_event_tmp_flag_c::tempBitLabels[80]); + } + return true; + case 0x26: + reference_p->onButtonTagStopFlag(); + return true; + case 0x31: + char buffer1[40]; + u8 sel_bomb_num = reference_p->getObjectPtr()->getSelectBombNum(); + dMsgUnit_setTag(7, sel_bomb_num, buffer1); + strcpy((char*)reference_p->getWord(field_0xb5), buffer1); + push_word(); + return true; + case 0x32: + char buffer2[40]; + s16 sel_bomb_price = reference_p->getObjectPtr()->getSelectBombPrice(); + dMsgUnit_setTag(1, sel_bomb_price, buffer2); + strcpy((char*)reference_p->getWord(field_0xb5), buffer2); + push_word(); + return true; + case 0x37: + case 0x38: + push_word(); + return true; + } + case 0x40000: + switch (i_tag & 0xFF00FFFF) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + push_word(); + return true; + } + case 0x50000: + switch (i_tag & 0xFF00FFFF) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + push_word(); + return true; + } + case 0x60000: + switch (i_tag & 0xFF00FFFF) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + push_word(); + return true; + case 10: + case 11: + do_space(i_tag); + return true; + } + case 0x30000: + switch (i_tag & 0xFF00FFFF) { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + do_space(i_tag); + return true; + case 0: + return true; + } + } + + return false; +} + +/* 8022C8FC-8022C904 22723C 0008+00 1/0 0/0 0/0 .text + * do_jump_isReady__27jmessage_tSequenceProcessorFv */ +bool jmessage_tSequenceProcessor::do_jump_isReady() { + return true; +} + +/* 8022C904-8022C908 227244 0004+00 1/1 0/0 0/0 .text do_name1__27jmessage_tSequenceProcessorFv */ +void jmessage_tSequenceProcessor::do_name1() { + /* empty function */ +} + /* 803C0330-803C03F4 -00001 00C4+00 1/1 0/0 0/0 .data @6110 */ SECTION_DATA static void* lit_6110[49] = { (void*)(((char*)do_space__27jmessage_tSequenceProcessorFUl) + 0x54), @@ -1081,6 +2498,123 @@ SECTION_DATA static void* lit_6110[49] = { (void*)(((char*)do_space__27jmessage_tSequenceProcessorFUl) + 0xFC), }; +/* 8022C908-8022CA24 227248 011C+00 2/1 0/0 0/0 .text do_space__27jmessage_tSequenceProcessorFUl + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::do_space(u32 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_space__27jmessage_tSequenceProcessorFUl.s" +} +#pragma pop + +/* 8022CA24-8022CAAC 227364 0088+00 1/1 0/0 0/0 .text + * do_rubyset__27jmessage_tSequenceProcessorFPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::do_rubyset(void const* param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubyset__27jmessage_tSequenceProcessorFPCvUl.s" +} +#pragma pop + +/* 8022CAAC-8022CB10 2273EC 0064+00 1/1 0/0 0/0 .text push_word__27jmessage_tSequenceProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::push_word() { + nofralloc +#include "asm/d/msg/d_msg_class/push_word__27jmessage_tSequenceProcessorFv.s" +} +#pragma pop + +/* 8022CB10-8022CBE4 227450 00D4+00 2/2 0/0 0/0 .text + * messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::messageSePlay(u8 param_0, u8 param_1, cXyz* param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s" +} +#pragma pop + +/* 8022CBE4-8022CBE8 227524 0004+00 1/0 0/0 0/0 .text + * do_jump__27jmessage_tSequenceProcessorFPCvPCc */ +void jmessage_tSequenceProcessor::do_jump(void const* param_0, char const* param_1) {} + +/* 8022CBE8-8022CCB0 227528 00C8+00 2/2 0/0 0/0 .text + * calcStringLength__27jmessage_tSequenceProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tSequenceProcessor::calcStringLength() { + nofralloc +#include "asm/d/msg/d_msg_class/calcStringLength__27jmessage_tSequenceProcessorFv.s" +} +#pragma pop + +/* 8022CCB0-8022CDC8 2275F0 0118+00 0/0 1/1 0/0 .text + * __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_tRenderingProcessor::jmessage_tRenderingProcessor(jmessage_tReference const* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference.s" +} +#pragma pop + +/* 8022CDC8-8022CDCC 227708 0004+00 1/0 0/0 0/0 .text do_reset__28jmessage_tRenderingProcessorFv + */ +void jmessage_tRenderingProcessor::do_reset() {} + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399617 = ""; +#pragma pop + +/* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text + * do_begin__28jmessage_tRenderingProcessorFPCvPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__28jmessage_tRenderingProcessorFPCvPCc.s" +} +#pragma pop + +/* 8022CFD8-8022D0A0 227918 00C8+00 1/0 0/0 0/0 .text do_end__28jmessage_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_end() { + nofralloc +#include "asm/d/msg/d_msg_class/do_end__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80454A90-80454A94 003090 0004+00 1/1 0/0 0/0 .sdata2 @6374 */ +SECTION_SDATA2 static f32 lit_6374 = 3.0f / 10.0f; + +/* 8022D0A0-8022D74C 2279E0 06AC+00 1/0 0/0 0/0 .text + * do_character__28jmessage_tRenderingProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_character(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_character__28jmessage_tRenderingProcessorFi.s" +} +#pragma pop + /* 803C03F4-803C0448 -00001 0054+00 1/1 0/0 0/0 .data @6572 */ SECTION_DATA static void* lit_6572[21] = { (void*)(((char*)do_tag__28jmessage_tRenderingProcessorFUlPCvUl) + 0x9BC), @@ -1174,6 +2708,68 @@ SECTION_DATA static void* lit_6571[64] = { (void*)(((char*)do_tag__28jmessage_tRenderingProcessorFUlPCvUl) + 0x22C), }; +/* 8022D74C-8022E12C 22808C 09E0+00 3/0 0/0 0/0 .text + * do_tag__28jmessage_tRenderingProcessorFUlPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool jmessage_tRenderingProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/do_tag__28jmessage_tRenderingProcessorFUlPCvUl.s" +} +#pragma pop + +/* 8022E12C-8022E17C 228A6C 0050+00 0/0 2/2 0/0 .text + * resetRendering__28jmessage_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::resetRendering() { + nofralloc +#include "asm/d/msg/d_msg_class/resetRendering__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399618 = "" + "\x1B" + "CR[%d]"; +#pragma pop + +/* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text + * do_widthcenter__28jmessage_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_widthcenter() { + nofralloc +#include "asm/d/msg/d_msg_class/do_widthcenter__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* 8022E260-8022E318 228BA0 00B8+00 1/1 0/0 0/0 .text + * do_selwidthcenter__28jmessage_tRenderingProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_selwidthcenter(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_selwidthcenter__28jmessage_tRenderingProcessorFi.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399620 = "" + "\x1B" + "CD[%d]"; +#pragma pop + /* 803C0548-803C056C -00001 0024+00 1/1 0/0 0/0 .data @6703 */ SECTION_DATA static void* lit_6703[9] = { (void*)(((char*)do_heightcenter__28jmessage_tRenderingProcessorFv) + 0xC8), @@ -1187,6 +2783,385 @@ SECTION_DATA static void* lit_6703[9] = { (void*)(((char*)do_heightcenter__28jmessage_tRenderingProcessorFv) + 0x3A8), }; +/* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text + * do_heightcenter__28jmessage_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_heightcenter() { + nofralloc +#include "asm/d/msg/d_msg_class/do_heightcenter__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc + */ +void jmessage_tRenderingProcessor::do_color(u8 i_colorNo) { + jmessage_tReference* reference_p = (jmessage_tReference*)getReference(); + + mColorNo = i_colorNo; + mCCColor = getFontCCColorTable(i_colorNo, reference_p->getFukiKind()); + mGCColor = getFontGCColorTable(i_colorNo, reference_p->getFukiKind()); + + char buffer[40]; + sprintf(buffer, + "\x1B" + "CC[%08x]" + "\x1B" + "GC[%08x]", + mCCColor, mGCColor); + do_strcat(buffer, false, false, false); +} + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039963B = "" + "\x1B" + "FX[%d]" + "\x1B" + "FY[%d]"; +#pragma pop + +/* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_scale(f32 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_scale__28jmessage_tRenderingProcessorFf.s" +} +#pragma pop + +/* 8022E960-8022E9C0 2292A0 0060+00 1/1 0/0 0/0 .text + * do_linedown__28jmessage_tRenderingProcessorFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_linedown(s16 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_linedown__28jmessage_tRenderingProcessorFs.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039964A = "" + "\x1B" + "CU[%d]"; +#pragma pop + +/* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_transY(s16 param_0, bool param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_transY__28jmessage_tRenderingProcessorFsb.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80454A94-80454A98 003094 0004+00 1/1 0/0 0/0 .sdata2 @6781 */ +SECTION_SDATA2 static f32 lit_6781 = 24.0f; + +/* 8022EAE4-8022ED10 229424 022C+00 2/2 0/0 0/0 .text + * do_outfont__28jmessage_tRenderingProcessorFUcUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_outfont(u8 param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_outfont__28jmessage_tRenderingProcessorFUcUl.s" +} +#pragma pop + +/* 8022ED10-8022EECC 229650 01BC+00 1/1 0/0 0/0 .text do_arrow2__28jmessage_tRenderingProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_arrow2() { + nofralloc +#include "asm/d/msg/d_msg_class/do_arrow2__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* 8022EECC-8022EF00 22980C 0034+00 1/1 0/0 0/0 .text + * getLineLength__28jmessage_tRenderingProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::getLineLength(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/getLineLength__28jmessage_tRenderingProcessorFi.s" +} +#pragma pop + +/* 8022EF00-8022F148 229840 0248+00 10/10 0/0 0/0 .text + * do_strcat__28jmessage_tRenderingProcessorFPcbbb */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_strcat(char* param_0, bool param_1, bool param_2, + bool param_3) { + nofralloc +#include "asm/d/msg/d_msg_class/do_strcat__28jmessage_tRenderingProcessorFPcbbb.s" +} +#pragma pop + +/* 8022F148-8022F384 229A88 023C+00 1/1 0/0 0/0 .text + * do_rubyset__28jmessage_tRenderingProcessorFPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_rubyset(void const* param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubyset__28jmessage_tRenderingProcessorFPCvUl.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399652 = "" + "\x1B" + "CL[%d]"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0"; +#pragma pop + +/* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text + * do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_rubystrcat(char* param_0, char* param_1, f32 param_2, + f32 param_3) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff.s" +} +#pragma pop + +/* 8022F53C-8022F540 229E7C 0004+00 1/1 0/0 0/0 .text do_name1__28jmessage_tRenderingProcessorFv + */ +void jmessage_tRenderingProcessor::do_name1() {} + +/* 8022F540-8022F734 229E80 01F4+00 1/1 0/0 0/0 .text do_numset__28jmessage_tRenderingProcessorFs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::do_numset(s16 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_numset__28jmessage_tRenderingProcessorFs.s" +} +#pragma pop + +/* 8022F734-8022F784 22A074 0050+00 1/1 0/0 0/0 .text push_word__28jmessage_tRenderingProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::push_word() { + nofralloc +#include "asm/d/msg/d_msg_class/push_word__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* 8022F784-8022F8C0 22A0C4 013C+00 2/2 0/0 0/0 .text + * getCharInfo__28jmessage_tRenderingProcessorFfffff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_tRenderingProcessor::getCharInfo(f32 param_0, f32 param_1, f32 param_2, + f32 param_3, f32 param_4) { + nofralloc +#include "asm/d/msg/d_msg_class/getCharInfo__28jmessage_tRenderingProcessorFfffff.s" +} +#pragma pop + +/* 8022F8C0-8022F94C 22A200 008C+00 0/0 1/1 0/0 .text __ct__26jmessage_string_tReferenceFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_string_tReference::jmessage_string_tReference() { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__26jmessage_string_tReferenceFv.s" +} +#pragma pop + +/* 8022F94C-8022F9AC 22A28C 0060+00 1/0 0/0 0/0 .text __dt__26jmessage_string_tReferenceFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_string_tReference::~jmessage_string_tReference() { +extern "C" asm void __dt__26jmessage_string_tReferenceFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__26jmessage_string_tReferenceFv.s" +} +#pragma pop + +/* 8022F9AC-8022FA2C 22A2EC 0080+00 0/0 3/3 0/0 .text + * init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::init(J2DTextBox* param_0, J2DTextBox* param_1, + JUTFont* param_2, COutFont_c* param_3, u8 param_4) { + nofralloc +#include "asm/d/msg/d_msg_class/init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s" +} +#pragma pop + +/* 8022FA2C-8022FA30 22A36C 0004+00 3/3 0/0 0/0 .text + * setCharactor__26jmessage_string_tReferenceFUs */ +void jmessage_string_tReference::setCharactor(u16 param_0) {} + +/* 8022FA30-8022FA34 22A370 0004+00 3/3 0/0 0/0 .text + * addCharactor__26jmessage_string_tReferenceFUs */ +void jmessage_string_tReference::addCharactor(u16 param_0) {} + +/* 8022FA34-8022FA38 22A374 0004+00 3/3 0/0 0/0 .text + * resetCharactor__26jmessage_string_tReferenceFv */ +void jmessage_string_tReference::resetCharactor() {} + +/* 8022FA38-8022FA6C 22A378 0034+00 2/2 1/1 0/0 .text + * getLineLength__26jmessage_string_tReferenceFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::getLineLength(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/getLineLength__26jmessage_string_tReferenceFi.s" +} +#pragma pop + +/* 8022FA6C-8022FA98 22A3AC 002C+00 2/2 0/0 0/0 .text + * addLineLength__26jmessage_string_tReferenceFif */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::addLineLength(int param_0, f32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/addLineLength__26jmessage_string_tReferenceFif.s" +} +#pragma pop + +/* 8022FA98-8022FACC 22A3D8 0034+00 1/1 0/0 0/0 .text + * getOutfontLength__26jmessage_string_tReferenceFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::getOutfontLength(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/getOutfontLength__26jmessage_string_tReferenceFi.s" +} +#pragma pop + +/* 8022FACC-8022FAF0 22A40C 0024+00 1/1 0/0 0/0 .text + * setOutfontLength__26jmessage_string_tReferenceFif */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::setOutfontLength(int param_0, f32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/setOutfontLength__26jmessage_string_tReferenceFif.s" +} +#pragma pop + +/* 8022FAF0-8022FB24 22A430 0034+00 2/2 0/0 0/0 .text + * clearOutfontLength__26jmessage_string_tReferenceFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::clearOutfontLength(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/clearOutfontLength__26jmessage_string_tReferenceFi.s" +} +#pragma pop + +/* 8022FB24-8022FB5C 22A464 0038+00 4/4 0/0 0/0 .text + * getLineCountNowPage__26jmessage_string_tReferenceFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tReference::getLineCountNowPage() { + nofralloc +#include "asm/d/msg/d_msg_class/getLineCountNowPage__26jmessage_string_tReferenceFv.s" +} +#pragma pop + +/* 8022FB5C-8022FB98 22A49C 003C+00 0/0 1/1 0/0 .text __ct__24jmessage_string_tControlFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_string_tControl::jmessage_string_tControl() { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__24jmessage_string_tControlFv.s" +} +#pragma pop + +/* 8022FB98-8022FBE4 22A4D8 004C+00 1/1 0/0 0/0 .text + * __ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_string_tMeasureProcessor::jmessage_string_tMeasureProcessor( + jmessage_string_tReference const* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference.s" +} +#pragma pop + +/* 8022FBE4-8022FC14 22A524 0030+00 1/0 0/0 0/0 .text + * do_begin__33jmessage_string_tMeasureProcessorFPCvPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tMeasureProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__33jmessage_string_tMeasureProcessorFPCvPCc.s" +} +#pragma pop + +/* 8022FC14-8022FC28 22A554 0014+00 1/0 0/0 0/0 .text + * do_end__33jmessage_string_tMeasureProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tMeasureProcessor::do_end() { + nofralloc +#include "asm/d/msg/d_msg_class/do_end__33jmessage_string_tMeasureProcessorFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80454A98-80454AA0 003098 0004+04 3/3 0/0 0/0 .sdata2 @7190 */ +SECTION_SDATA2 static f32 lit_7190[1 + 1 /* padding */] = { + 20.0f, + /* padding */ + 0.0f, +}; + +/* 8022FC28-8022FDF0 22A568 01C8+00 1/0 0/0 0/0 .text + * do_character__33jmessage_string_tMeasureProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tMeasureProcessor::do_character(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_character__33jmessage_string_tMeasureProcessorFi.s" +} +#pragma pop + /* 803C056C-803C059C -00001 0030+00 1/1 0/0 0/0 .data @7487 */ SECTION_DATA static void* lit_7487[12] = { (void*)(((char*)do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl) + 0x940), @@ -1308,6 +3283,170 @@ SECTION_DATA static void* lit_7484[64] = { (void*)(((char*)do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl) + 0x224), }; +/* 8022FDF0-8023098C 22A730 0B9C+00 5/0 0/0 0/0 .text + * do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tMeasureProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl.s" +} +#pragma pop + +/* 8023098C-80230A08 22B2CC 007C+00 1/1 0/0 0/0 .text + * do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tMeasureProcessor::do_rubyset(void const* param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl.s" +} +#pragma pop + +/* 80230A08-80230A5C 22B348 0054+00 0/0 1/1 0/0 .text + * __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_string_tSequenceProcessor::jmessage_string_tSequenceProcessor( + jmessage_string_tReference const* param_0, jmessage_string_tControl* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/func_80230A08.s" +} +#pragma pop + +/* 80230A5C-80230ABC 22B39C 0060+00 1/0 0/0 0/0 .text __dt__33jmessage_string_tMeasureProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_string_tMeasureProcessor::~jmessage_string_tMeasureProcessor() { +extern "C" asm void __dt__33jmessage_string_tMeasureProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__33jmessage_string_tMeasureProcessorFv.s" +} +#pragma pop + +/* 80230ABC-80230AC0 22B3FC 0004+00 1/0 0/0 0/0 .text + * do_reset__34jmessage_string_tSequenceProcessorFv */ +void jmessage_string_tSequenceProcessor::do_reset() {} + +/* 80230AC0-80230B7C 22B400 00BC+00 1/0 0/0 0/0 .text + * do_begin__34jmessage_string_tSequenceProcessorFPCvPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tSequenceProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__34jmessage_string_tSequenceProcessorFPCvPCc.s" +} +#pragma pop + +/* 80230B7C-80230B80 22B4BC 0004+00 1/0 0/0 0/0 .text + * do_end__34jmessage_string_tSequenceProcessorFv */ +void jmessage_string_tSequenceProcessor::do_end() {} + +/* 80230B80-80230B88 22B4C0 0008+00 1/0 0/0 0/0 .text + * do_isReady__34jmessage_string_tSequenceProcessorFv */ +bool jmessage_string_tSequenceProcessor::do_isReady() { + return true; +} + +/* 80230B88-80230B8C 22B4C8 0004+00 1/0 0/0 0/0 .text + * do_character__34jmessage_string_tSequenceProcessorFi */ +void jmessage_string_tSequenceProcessor::do_character(int param_0) {} + +/* 80230B8C-80230BBC 22B4CC 0030+00 1/0 0/0 0/0 .text + * do_tag__34jmessage_string_tSequenceProcessorFUlPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tSequenceProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/do_tag__34jmessage_string_tSequenceProcessorFUlPCvUl.s" +} +#pragma pop + +/* 80230BBC-80230BC4 22B4FC 0008+00 1/0 0/0 0/0 .text + * do_jump_isReady__34jmessage_string_tSequenceProcessorFv */ +bool jmessage_string_tSequenceProcessor::do_jump_isReady() { + return true; +} + +/* 80230BC4-80230BC8 22B504 0004+00 1/0 0/0 0/0 .text + * do_jump__34jmessage_string_tSequenceProcessorFPCvPCc */ +void jmessage_string_tSequenceProcessor::do_jump(void const* param_0, char const* param_1) {} + +/* 80230BC8-80230C20 22B508 0058+00 0/0 1/1 0/0 .text + * __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jmessage_string_tRenderingProcessor::jmessage_string_tRenderingProcessor( + jmessage_string_tReference const* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/__ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference.s" +} +#pragma pop + +/* 80230C20-80230C5C 22B560 003C+00 5/5 0/0 0/0 .text + * getLineCountNowPage__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::getLineCountNowPage() { + nofralloc +#include "asm/d/msg/d_msg_class/getLineCountNowPage__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80230C5C-80230CA0 22B59C 0044+00 1/0 0/0 0/0 .text + * do_reset__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_reset() { + nofralloc +#include "asm/d/msg/d_msg_class/do_reset__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80230CA0-80230CE8 22B5E0 0048+00 1/0 0/0 0/0 .text + * do_begin__35jmessage_string_tRenderingProcessorFPCvPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_begin(void const* param_0, char const* param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_begin__35jmessage_string_tRenderingProcessorFPCvPCc.s" +} +#pragma pop + +/* 80230CE8-80230D48 22B628 0060+00 1/0 0/0 0/0 .text + * do_end__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_end() { + nofralloc +#include "asm/d/msg/d_msg_class/do_end__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80230D48-80231110 22B688 03C8+00 1/0 0/0 0/0 .text + * do_character__35jmessage_string_tRenderingProcessorFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_character(int param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_character__35jmessage_string_tRenderingProcessorFi.s" +} +#pragma pop + /* 803C0710-803C0764 -00001 0054+00 1/1 0/0 0/0 .data @7997 */ SECTION_DATA static void* lit_7997[21] = { (void*)(((char*)do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl) + 0xC44), @@ -1454,6 +3593,207 @@ SECTION_DATA static void* lit_7993[64] = { (void*)(((char*)do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl) + 0x240), }; +/* 80231110-80231D70 22BA50 0C60+00 6/0 0/0 0/0 .text + * do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_tag(u32 param_0, void const* param_1, + u32 param_2) { + nofralloc +#include "asm/d/msg/d_msg_class/do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl.s" +} +#pragma pop + +/* 80231D70-80231EF0 22C6B0 0180+00 2/2 0/0 0/0 .text + * do_widthcenter__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_widthcenter() { + nofralloc +#include "asm/d/msg/d_msg_class/do_widthcenter__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80231EF0-80232044 22C830 0154+00 1/1 0/0 0/0 .text + * do_heightcenter__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_heightcenter() { + nofralloc +#include "asm/d/msg/d_msg_class/do_heightcenter__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80232044-802320B0 22C984 006C+00 7/7 0/0 0/0 .text + * do_strcat__35jmessage_string_tRenderingProcessorFPc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_strcat(char* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_strcat__35jmessage_string_tRenderingProcessorFPc.s" +} +#pragma pop + +/* 802320B0-80232260 22C9F0 01B0+00 1/1 0/0 0/0 .text + * do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_rubyset(void const* param_0, u32 param_1) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl.s" +} +#pragma pop + +/* 80232260-802322CC 22CBA0 006C+00 2/2 0/0 0/0 .text + * do_rubystrcat__35jmessage_string_tRenderingProcessorFPc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_rubystrcat(char* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_rubystrcat__35jmessage_string_tRenderingProcessorFPc.s" +} +#pragma pop + +/* 802322CC-8023256C 22CC0C 02A0+00 2/2 0/0 0/0 .text + * do_outfont__35jmessage_string_tRenderingProcessorFUc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_outfont(u8 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_outfont__35jmessage_string_tRenderingProcessorFUc.s" +} +#pragma pop + +/* 8023256C-80232600 22CEAC 0094+00 1/1 0/0 0/0 .text + * do_color__35jmessage_string_tRenderingProcessorFUc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_color(u8 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_color__35jmessage_string_tRenderingProcessorFUc.s" +} +#pragma pop + +/* 80232600-80232690 22CF40 0090+00 1/1 0/0 0/0 .text + * do_scale__35jmessage_string_tRenderingProcessorFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_scale(f32 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_scale__35jmessage_string_tRenderingProcessorFf.s" +} +#pragma pop + +/* 80232690-802326E4 22CFD0 0054+00 1/1 0/0 0/0 .text + * do_linedown__35jmessage_string_tRenderingProcessorFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_linedown(s16 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_linedown__35jmessage_string_tRenderingProcessorFs.s" +} +#pragma pop + +/* 802326E4-802327BC 22D024 00D8+00 1/1 0/0 0/0 .text + * do_numset__35jmessage_string_tRenderingProcessorFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::do_numset(s16 param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/do_numset__35jmessage_string_tRenderingProcessorFs.s" +} +#pragma pop + +/* 802327BC-802327F8 22D0FC 003C+00 1/1 0/0 0/0 .text + * push_word__35jmessage_string_tRenderingProcessorFPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jmessage_string_tRenderingProcessor::push_word(char const* param_0) { + nofralloc +#include "asm/d/msg/d_msg_class/push_word__35jmessage_string_tRenderingProcessorFPCc.s" +} +#pragma pop + +/* 802327F8-80232858 22D138 0060+00 1/0 0/0 0/0 .text + * __dt__35jmessage_string_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_string_tRenderingProcessor::~jmessage_string_tRenderingProcessor() { +extern "C" asm void __dt__35jmessage_string_tRenderingProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__35jmessage_string_tRenderingProcessorFv.s" +} +#pragma pop + +/* 80232858-802328DC 22D198 0084+00 1/0 0/0 0/0 .text __dt__34jmessage_string_tSequenceProcessorFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_string_tSequenceProcessor::~jmessage_string_tSequenceProcessor() { +extern "C" asm void __dt__34jmessage_string_tSequenceProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__34jmessage_string_tSequenceProcessorFv.s" +} +#pragma pop + +/* 802328DC-8023293C 22D21C 0060+00 1/0 0/0 0/0 .text __dt__24jmessage_string_tControlFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_string_tControl::~jmessage_string_tControl() { +extern "C" asm void __dt__24jmessage_string_tControlFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__24jmessage_string_tControlFv.s" +} +#pragma pop + +/* 8023293C-8023299C 22D27C 0060+00 1/0 0/0 0/0 .text __dt__28jmessage_tRenderingProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_tRenderingProcessor::~jmessage_tRenderingProcessor() { +extern "C" asm void __dt__28jmessage_tRenderingProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__28jmessage_tRenderingProcessorFv.s" +} +#pragma pop + +/* 8023299C-80232A20 22D2DC 0084+00 1/0 0/0 0/0 .text __dt__27jmessage_tSequenceProcessorFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm jmessage_tSequenceProcessor::~jmessage_tSequenceProcessor() { +extern "C" asm void __dt__27jmessage_tSequenceProcessorFv() { + nofralloc +#include "asm/d/msg/d_msg_class/__dt__27jmessage_tSequenceProcessorFv.s" +} +#pragma pop + +/* 80232A20-80232A3C 22D360 001C+00 2/2 0/0 0/0 .text getActorPos__19jmessage_tReferenceFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm cXyz jmessage_tReference::getActorPos() { + nofralloc +#include "asm/d/msg/d_msg_class/getActorPos__19jmessage_tReferenceFv.s" +} +#pragma pop + /* 803C0908-803C0948 01DA28 0040+00 2/2 0/0 0/0 .data __vt__35jmessage_string_tRenderingProcessor */ SECTION_DATA extern void* __vt__35jmessage_string_tRenderingProcessor[16] = { @@ -1616,1503 +3956,4 @@ SECTION_DATA extern void* __vt__19jmessage_tReference[4 + 1 /* padding */] = { NULL, }; -/* 80454A58-80454A5C 003058 0004+00 1/1 0/0 0/0 .sdata2 @4025 */ -SECTION_SDATA2 static f32 lit_4025 = 9.0f / 10.0f; - -/* 80454A5C-80454A60 00305C 0004+00 14/14 0/0 0/0 .sdata2 @4026 */ -SECTION_SDATA2 static f32 lit_4026 = 0.5f; - -/* 80454A60-80454A64 003060 0004+00 25/25 0/0 0/0 .sdata2 @4027 */ -SECTION_SDATA2 static u8 lit_4027[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454A64-80454A68 003064 0004+00 23/23 0/0 0/0 .sdata2 @4028 */ -SECTION_SDATA2 static f32 lit_4028 = 1.0f; - -/* 80228B04-80228CB4 223444 01B0+00 0/0 1/1 0/0 .text __ct__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tReference::jmessage_tReference() { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228CB4-80228D28 2235F4 0074+00 1/0 0/0 0/0 .text __dt__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tReference::~jmessage_tReference() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A68-80454A70 003068 0008+00 1/1 0/0 0/0 .sdata2 @4078 */ -SECTION_SDATA2 static u8 lit_4078[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80228D28-80228DE0 223668 00B8+00 1/1 0/0 0/0 .text calcDistance__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::calcDistance() { - nofralloc -#include "asm/d/msg/d_msg_class/calcDistance__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228DE0-80228E6C 223720 008C+00 5/5 0/0 0/0 .text getLineMax__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::getLineMax() { - nofralloc -#include "asm/d/msg/d_msg_class/getLineMax__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228E6C-80228EA0 2237AC 0034+00 2/2 0/0 0/0 .text isKanban__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isKanban() { - nofralloc -#include "asm/d/msg/d_msg_class/isKanban__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228EA0-80228ED4 2237E0 0034+00 2/2 0/0 0/0 .text isPlaceName__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isPlaceName() { - nofralloc -#include "asm/d/msg/d_msg_class/isPlaceName__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228ED4-80228F08 223814 0034+00 2/2 0/0 0/0 .text isBossName__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isBossName() { - nofralloc -#include "asm/d/msg/d_msg_class/isBossName__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228F08-80228F3C 223848 0034+00 2/2 0/0 0/0 .text isSaveSeq__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isSaveSeq() { - nofralloc -#include "asm/d/msg/d_msg_class/isSaveSeq__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228F3C-80228F70 22387C 0034+00 2/2 0/0 0/0 .text isBook__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isBook() { - nofralloc -#include "asm/d/msg/d_msg_class/isBook__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228F70-80228FA4 2238B0 0034+00 3/3 0/0 0/0 .text isStaffRoll__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isStaffRoll() { - nofralloc -#include "asm/d/msg/d_msg_class/isStaffRoll__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228FA4-80228FD8 2238E4 0034+00 1/1 0/0 0/0 .text isHowl__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isHowl() { - nofralloc -#include "asm/d/msg/d_msg_class/isHowl__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80228FD8-8022900C 223918 0034+00 2/2 0/0 0/0 .text isMidona__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isMidona() { - nofralloc -#include "asm/d/msg/d_msg_class/isMidona__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 8022900C-80229034 22394C 0028+00 1/1 0/0 0/0 .text resetReference__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::resetReference() { - nofralloc -#include "asm/d/msg/d_msg_class/resetReference__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A70-80454A78 003070 0008+00 16/16 0/0 0/0 .sdata2 @4198 */ -SECTION_SDATA2 static f64 lit_4198 = 4503601774854144.0 /* cast s32 to float */; - -/* 80229034-80229168 223974 0134+00 0/0 1/1 0/0 .text pageSend__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::pageSend() { - nofralloc -#include "asm/d/msg/d_msg_class/pageSend__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A78-80454A7C 003078 0004+00 4/4 0/0 0/0 .sdata2 @4291 */ -SECTION_SDATA2 static f32 lit_4291 = -1.0f; - -/* 80229168-802294A8 223AA8 0340+00 0/0 2/2 0/0 .text selectMessage__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::selectMessage() { - nofralloc -#include "asm/d/msg/d_msg_class/selectMessage__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 802294A8-80229730 223DE8 0288+00 0/0 1/1 0/0 .text inputNumber__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::inputNumber() { - nofralloc -#include "asm/d/msg/d_msg_class/inputNumber__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80229730-80229744 224070 0014+00 5/5 0/0 0/0 .text getWord__19jmessage_tReferenceFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::getWord(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/getWord__19jmessage_tReferenceFi.s" -} -#pragma pop - -/* 80229744-80229768 224084 0024+00 2/2 0/0 0/0 .text resetWord__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::resetWord() { - nofralloc -#include "asm/d/msg/d_msg_class/resetWord__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80229768-80229788 2240A8 0020+00 3/3 0/0 0/0 .text setCharactor__19jmessage_tReferenceFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::setCharactor(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/setCharactor__19jmessage_tReferenceFUs.s" -} -#pragma pop - -/* 80229788-802297B0 2240C8 0028+00 3/3 0/0 0/0 .text addCharactor__19jmessage_tReferenceFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::addCharactor(u16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/addCharactor__19jmessage_tReferenceFUs.s" -} -#pragma pop - -/* 802297B0-802297E4 2240F0 0034+00 3/3 0/0 0/0 .text resetCharactor__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::resetCharactor() { - nofralloc -#include "asm/d/msg/d_msg_class/resetCharactor__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 802297E4-80229810 224124 002C+00 0/0 1/1 0/0 .text - * shiftCharCountBuffer__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::shiftCharCountBuffer() { - nofralloc -#include "asm/d/msg/d_msg_class/shiftCharCountBuffer__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80229810-80229848 224150 0038+00 1/1 5/5 0/0 .text - * resetCharCountBuffer__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::resetCharCountBuffer() { - nofralloc -#include "asm/d/msg/d_msg_class/resetCharCountBuffer__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 80229848-8022986C 224188 0024+00 1/1 0/0 0/0 .text - * allsetCharCountBuffer__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::allsetCharCountBuffer() { - nofralloc -#include "asm/d/msg/d_msg_class/allsetCharCountBuffer__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 8022986C-802298DC 2241AC 0070+00 2/2 0/0 0/0 .text isCharSend__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isCharSend() { - nofralloc -#include "asm/d/msg/d_msg_class/isCharSend__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 802298DC-8022994C 22421C 0070+00 1/1 0/0 0/0 .text isLightSend__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isLightSend() { - nofralloc -#include "asm/d/msg/d_msg_class/isLightSend__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 8022994C-802299AC 22428C 0060+00 0/0 1/1 0/0 .text isLightEnd__19jmessage_tReferenceFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::isLightEnd() { - nofralloc -#include "asm/d/msg/d_msg_class/isLightEnd__19jmessage_tReferenceFv.s" -} -#pragma pop - -/* 802299AC-802299EC 2242EC 0040+00 2/2 0/0 0/0 .text - * decideOutFontRupeeColor__19jmessage_tReferenceFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::decideOutFontRupeeColor(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/decideOutFontRupeeColor__19jmessage_tReferenceFi.s" -} -#pragma pop - -/* 802299EC-80229A28 22432C 003C+00 0/0 1/1 0/0 .text __ct__17jmessage_tControlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tControl::jmessage_tControl() { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__17jmessage_tControlFv.s" -} -#pragma pop - -/* 80229A28-80229AC4 224368 009C+00 1/1 0/0 0/0 .text - * __ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference.s" -} -#pragma pop - -/* 80229AC4-80229CB4 224404 01F0+00 1/0 0/0 0/0 .text - * do_begin__26jmessage_tMeasureProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__26jmessage_tMeasureProcessorFPCvPCc.s" -} -#pragma pop - -/* 80229CB4-80229E3C 2245F4 0188+00 1/0 0/0 0/0 .text do_end__26jmessage_tMeasureProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_end() { - nofralloc -#include "asm/d/msg/d_msg_class/do_end__26jmessage_tMeasureProcessorFv.s" -} -#pragma pop - -/* 80229E3C-8022A268 22477C 042C+00 1/0 0/0 0/0 .text do_character__26jmessage_tMeasureProcessorFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_character(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_character__26jmessage_tMeasureProcessorFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399610 = "'"; -SECTION_DEAD static char const* const stringBase_80399612 = "s"; -SECTION_DEAD static char const* const stringBase_80399614 = "%d"; -#pragma pop - -/* 80454A7C-80454A80 00307C 0004+00 5/5 0/0 0/0 .sdata2 @5151 */ -SECTION_SDATA2 static f32 lit_5151 = 100.0f; - -/* 80454A80-80454A88 003080 0008+00 5/5 0/0 0/0 .sdata2 @5154 */ -SECTION_SDATA2 static f64 lit_5154 = 4503599627370496.0 /* cast u32 to float */; - -/* 8022A268-8022B0B0 224BA8 0E48+00 5/0 0/0 0/0 .text do_tag__26jmessage_tMeasureProcessorFUlPCvUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__26jmessage_tMeasureProcessorFUlPCvUl.s" -} -#pragma pop - -/* 8022B0B0-8022B18C 2259F0 00DC+00 2/2 0/0 0/0 .text do_scale__26jmessage_tMeasureProcessorFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_scale(f32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_scale__26jmessage_tMeasureProcessorFf.s" -} -#pragma pop - -/* 8022B18C-8022B3EC 225ACC 0260+00 2/1 0/0 0/0 .text do_space__26jmessage_tMeasureProcessorFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_space(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_space__26jmessage_tMeasureProcessorFUl.s" -} -#pragma pop - -/* 8022B3EC-8022B454 225D2C 0068+00 3/3 0/0 0/0 .text do_pageType__26jmessage_tMeasureProcessorFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_pageType(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_pageType__26jmessage_tMeasureProcessorFi.s" -} -#pragma pop - -/* 8022B454-8022B458 225D94 0004+00 1/1 0/0 0/0 .text do_name1__26jmessage_tMeasureProcessorFv */ -void jmessage_tMeasureProcessor::do_name1() { - /* empty function */ -} - -/* 8022B458-8022B4E0 225D98 0088+00 1/1 0/0 0/0 .text - * do_rubyset__26jmessage_tMeasureProcessorFPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::do_rubyset(void const* param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubyset__26jmessage_tMeasureProcessorFPCvUl.s" -} -#pragma pop - -/* 8022B4E0-8022B558 225E20 0078+00 1/1 0/0 0/0 .text push_word__26jmessage_tMeasureProcessorFPc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tMeasureProcessor::push_word(char* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/push_word__26jmessage_tMeasureProcessorFPc.s" -} -#pragma pop - -/* 8022B558-8022B5F4 225E98 009C+00 0/0 1/1 0/0 .text - * __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tSequenceProcessor::jmessage_tSequenceProcessor(jmessage_tReference const* param_0, - jmessage_tControl* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl.s" -} -#pragma pop - -/* 8022B5F4-8022B654 225F34 0060+00 1/0 0/0 0/0 .text __dt__26jmessage_tMeasureProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tMeasureProcessor::~jmessage_tMeasureProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__26jmessage_tMeasureProcessorFv.s" -} -#pragma pop - -/* 8022B654-8022B658 225F94 0004+00 1/0 0/0 0/0 .text do_reset__27jmessage_tSequenceProcessorFv */ -void jmessage_tSequenceProcessor::do_reset() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80454A88-80454A8C 003088 0004+00 1/1 0/0 0/0 .sdata2 @5490 */ -SECTION_SDATA2 static f32 lit_5490 = 10.0f; - -/* 80454A8C-80454A90 00308C 0004+00 2/2 0/0 0/0 .sdata2 @5491 */ -SECTION_SDATA2 static f32 lit_5491 = 255.0f; - -/* 8022B658-8022BA3C 225F98 03E4+00 1/0 0/0 0/0 .text - * do_begin__27jmessage_tSequenceProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__27jmessage_tSequenceProcessorFPCvPCc.s" -} -#pragma pop - -/* 8022BA3C-8022BB7C 22637C 0140+00 1/0 0/0 0/0 .text do_end__27jmessage_tSequenceProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_end() { - nofralloc -#include "asm/d/msg/d_msg_class/do_end__27jmessage_tSequenceProcessorFv.s" -} -#pragma pop - -/* 8022BB7C-8022BFE0 2264BC 0464+00 2/0 0/0 0/0 .text do_isReady__27jmessage_tSequenceProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_isReady() { - nofralloc -#include "asm/d/msg/d_msg_class/do_isReady__27jmessage_tSequenceProcessorFv.s" -} -#pragma pop - -/* 8022BFE0-8022C1A0 226920 01C0+00 1/0 0/0 0/0 .text - * do_character__27jmessage_tSequenceProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_character(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_character__27jmessage_tSequenceProcessorFi.s" -} -#pragma pop - -/* 8022C1A0-8022C8FC 226AE0 075C+00 2/0 0/0 0/0 .text - * do_tag__27jmessage_tSequenceProcessorFUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__27jmessage_tSequenceProcessorFUlPCvUl.s" -} -#pragma pop - -/* 8022C8FC-8022C904 22723C 0008+00 1/0 0/0 0/0 .text - * do_jump_isReady__27jmessage_tSequenceProcessorFv */ -bool jmessage_tSequenceProcessor::do_jump_isReady() { - return true; -} - -/* 8022C904-8022C908 227244 0004+00 1/1 0/0 0/0 .text do_name1__27jmessage_tSequenceProcessorFv */ -void jmessage_tSequenceProcessor::do_name1() { - /* empty function */ -} - -/* 8022C908-8022CA24 227248 011C+00 2/1 0/0 0/0 .text do_space__27jmessage_tSequenceProcessorFUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_space(u32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_space__27jmessage_tSequenceProcessorFUl.s" -} -#pragma pop - -/* 8022CA24-8022CAAC 227364 0088+00 1/1 0/0 0/0 .text - * do_rubyset__27jmessage_tSequenceProcessorFPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::do_rubyset(void const* param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubyset__27jmessage_tSequenceProcessorFPCvUl.s" -} -#pragma pop - -/* 8022CAAC-8022CB10 2273EC 0064+00 1/1 0/0 0/0 .text push_word__27jmessage_tSequenceProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::push_word() { - nofralloc -#include "asm/d/msg/d_msg_class/push_word__27jmessage_tSequenceProcessorFv.s" -} -#pragma pop - -/* 8022CB10-8022CBE4 227450 00D4+00 2/2 0/0 0/0 .text - * messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::messageSePlay(u8 param_0, u8 param_1, cXyz* param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s" -} -#pragma pop - -/* 8022CBE4-8022CBE8 227524 0004+00 1/0 0/0 0/0 .text - * do_jump__27jmessage_tSequenceProcessorFPCvPCc */ -void jmessage_tSequenceProcessor::do_jump(void const* param_0, char const* param_1) { - /* empty function */ -} - -/* 8022CBE8-8022CCB0 227528 00C8+00 2/2 0/0 0/0 .text - * calcStringLength__27jmessage_tSequenceProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tSequenceProcessor::calcStringLength() { - nofralloc -#include "asm/d/msg/d_msg_class/calcStringLength__27jmessage_tSequenceProcessorFv.s" -} -#pragma pop - -/* 8022CCB0-8022CDC8 2275F0 0118+00 0/0 1/1 0/0 .text - * __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tRenderingProcessor::jmessage_tRenderingProcessor(jmessage_tReference const* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference.s" -} -#pragma pop - -/* 8022CDC8-8022CDCC 227708 0004+00 1/0 0/0 0/0 .text do_reset__28jmessage_tRenderingProcessorFv - */ -void jmessage_tRenderingProcessor::do_reset() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399617 = ""; -#pragma pop - -/* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text - * do_begin__28jmessage_tRenderingProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__28jmessage_tRenderingProcessorFPCvPCc.s" -} -#pragma pop - -/* 8022CFD8-8022D0A0 227918 00C8+00 1/0 0/0 0/0 .text do_end__28jmessage_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_end() { - nofralloc -#include "asm/d/msg/d_msg_class/do_end__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A90-80454A94 003090 0004+00 1/1 0/0 0/0 .sdata2 @6374 */ -SECTION_SDATA2 static f32 lit_6374 = 3.0f / 10.0f; - -/* 8022D0A0-8022D74C 2279E0 06AC+00 1/0 0/0 0/0 .text - * do_character__28jmessage_tRenderingProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_character(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_character__28jmessage_tRenderingProcessorFi.s" -} -#pragma pop - -/* 8022D74C-8022E12C 22808C 09E0+00 3/0 0/0 0/0 .text - * do_tag__28jmessage_tRenderingProcessorFUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__28jmessage_tRenderingProcessorFUlPCvUl.s" -} -#pragma pop - -/* 8022E12C-8022E17C 228A6C 0050+00 0/0 2/2 0/0 .text - * resetRendering__28jmessage_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::resetRendering() { - nofralloc -#include "asm/d/msg/d_msg_class/resetRendering__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399618 = "" - "\x1B" - "CR[%d]"; -#pragma pop - -/* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text - * do_widthcenter__28jmessage_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_widthcenter() { - nofralloc -#include "asm/d/msg/d_msg_class/do_widthcenter__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* 8022E260-8022E318 228BA0 00B8+00 1/1 0/0 0/0 .text - * do_selwidthcenter__28jmessage_tRenderingProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_selwidthcenter(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_selwidthcenter__28jmessage_tRenderingProcessorFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399620 = "" - "\x1B" - "CD[%d]"; -#pragma pop - -/* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text - * do_heightcenter__28jmessage_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_heightcenter() { - nofralloc -#include "asm/d/msg/d_msg_class/do_heightcenter__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399628 = "" - "\x1B" - "CC[%08x]" - "\x1B" - "GC[%08x]"; -#pragma pop - -/* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_color(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_color__28jmessage_tRenderingProcessorFUc.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039963B = "" - "\x1B" - "FX[%d]" - "\x1B" - "FY[%d]"; -#pragma pop - -/* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_scale(f32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_scale__28jmessage_tRenderingProcessorFf.s" -} -#pragma pop - -/* 8022E960-8022E9C0 2292A0 0060+00 1/1 0/0 0/0 .text - * do_linedown__28jmessage_tRenderingProcessorFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_linedown(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_linedown__28jmessage_tRenderingProcessorFs.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039964A = "" - "\x1B" - "CU[%d]"; -#pragma pop - -/* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_transY(s16 param_0, bool param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_transY__28jmessage_tRenderingProcessorFsb.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A94-80454A98 003094 0004+00 1/1 0/0 0/0 .sdata2 @6781 */ -SECTION_SDATA2 static f32 lit_6781 = 24.0f; - -/* 8022EAE4-8022ED10 229424 022C+00 2/2 0/0 0/0 .text - * do_outfont__28jmessage_tRenderingProcessorFUcUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_outfont(u8 param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_outfont__28jmessage_tRenderingProcessorFUcUl.s" -} -#pragma pop - -/* 8022ED10-8022EECC 229650 01BC+00 1/1 0/0 0/0 .text do_arrow2__28jmessage_tRenderingProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_arrow2() { - nofralloc -#include "asm/d/msg/d_msg_class/do_arrow2__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* 8022EECC-8022EF00 22980C 0034+00 1/1 0/0 0/0 .text - * getLineLength__28jmessage_tRenderingProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::getLineLength(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/getLineLength__28jmessage_tRenderingProcessorFi.s" -} -#pragma pop - -/* 8022EF00-8022F148 229840 0248+00 10/10 0/0 0/0 .text - * do_strcat__28jmessage_tRenderingProcessorFPcbbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_strcat(char* param_0, bool param_1, bool param_2, - bool param_3) { - nofralloc -#include "asm/d/msg/d_msg_class/do_strcat__28jmessage_tRenderingProcessorFPcbbb.s" -} -#pragma pop - -/* 8022F148-8022F384 229A88 023C+00 1/1 0/0 0/0 .text - * do_rubyset__28jmessage_tRenderingProcessorFPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_rubyset(void const* param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubyset__28jmessage_tRenderingProcessorFPCvUl.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399652 = "" - "\x1B" - "CL[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0"; -#pragma pop - -/* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text - * do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_rubystrcat(char* param_0, char* param_1, f32 param_2, - f32 param_3) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff.s" -} -#pragma pop - -/* 8022F53C-8022F540 229E7C 0004+00 1/1 0/0 0/0 .text do_name1__28jmessage_tRenderingProcessorFv - */ -void jmessage_tRenderingProcessor::do_name1() { - /* empty function */ -} - -/* 8022F540-8022F734 229E80 01F4+00 1/1 0/0 0/0 .text do_numset__28jmessage_tRenderingProcessorFs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::do_numset(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_numset__28jmessage_tRenderingProcessorFs.s" -} -#pragma pop - -/* 8022F734-8022F784 22A074 0050+00 1/1 0/0 0/0 .text push_word__28jmessage_tRenderingProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::push_word() { - nofralloc -#include "asm/d/msg/d_msg_class/push_word__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* 8022F784-8022F8C0 22A0C4 013C+00 2/2 0/0 0/0 .text - * getCharInfo__28jmessage_tRenderingProcessorFfffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tRenderingProcessor::getCharInfo(f32 param_0, f32 param_1, f32 param_2, - f32 param_3, f32 param_4) { - nofralloc -#include "asm/d/msg/d_msg_class/getCharInfo__28jmessage_tRenderingProcessorFfffff.s" -} -#pragma pop - -/* 8022F8C0-8022F94C 22A200 008C+00 0/0 1/1 0/0 .text __ct__26jmessage_string_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tReference::jmessage_string_tReference() { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__26jmessage_string_tReferenceFv.s" -} -#pragma pop - -/* 8022F94C-8022F9AC 22A28C 0060+00 1/0 0/0 0/0 .text __dt__26jmessage_string_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tReference::~jmessage_string_tReference() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__26jmessage_string_tReferenceFv.s" -} -#pragma pop - -/* 8022F9AC-8022FA2C 22A2EC 0080+00 0/0 3/3 0/0 .text - * init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::init(J2DTextBox* param_0, J2DTextBox* param_1, - JUTFont* param_2, COutFont_c* param_3, u8 param_4) { - nofralloc -#include "asm/d/msg/d_msg_class/init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s" -} -#pragma pop - -/* 8022FA2C-8022FA30 22A36C 0004+00 3/3 0/0 0/0 .text - * setCharactor__26jmessage_string_tReferenceFUs */ -void jmessage_string_tReference::setCharactor(u16 param_0) { - /* empty function */ -} - -/* 8022FA30-8022FA34 22A370 0004+00 3/3 0/0 0/0 .text - * addCharactor__26jmessage_string_tReferenceFUs */ -void jmessage_string_tReference::addCharactor(u16 param_0) { - /* empty function */ -} - -/* 8022FA34-8022FA38 22A374 0004+00 3/3 0/0 0/0 .text - * resetCharactor__26jmessage_string_tReferenceFv */ -void jmessage_string_tReference::resetCharactor() { - /* empty function */ -} - -/* 8022FA38-8022FA6C 22A378 0034+00 2/2 1/1 0/0 .text - * getLineLength__26jmessage_string_tReferenceFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::getLineLength(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/getLineLength__26jmessage_string_tReferenceFi.s" -} -#pragma pop - -/* 8022FA6C-8022FA98 22A3AC 002C+00 2/2 0/0 0/0 .text - * addLineLength__26jmessage_string_tReferenceFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::addLineLength(int param_0, f32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/addLineLength__26jmessage_string_tReferenceFif.s" -} -#pragma pop - -/* 8022FA98-8022FACC 22A3D8 0034+00 1/1 0/0 0/0 .text - * getOutfontLength__26jmessage_string_tReferenceFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::getOutfontLength(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/getOutfontLength__26jmessage_string_tReferenceFi.s" -} -#pragma pop - -/* 8022FACC-8022FAF0 22A40C 0024+00 1/1 0/0 0/0 .text - * setOutfontLength__26jmessage_string_tReferenceFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::setOutfontLength(int param_0, f32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/setOutfontLength__26jmessage_string_tReferenceFif.s" -} -#pragma pop - -/* 8022FAF0-8022FB24 22A430 0034+00 2/2 0/0 0/0 .text - * clearOutfontLength__26jmessage_string_tReferenceFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::clearOutfontLength(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/clearOutfontLength__26jmessage_string_tReferenceFi.s" -} -#pragma pop - -/* 8022FB24-8022FB5C 22A464 0038+00 4/4 0/0 0/0 .text - * getLineCountNowPage__26jmessage_string_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tReference::getLineCountNowPage() { - nofralloc -#include "asm/d/msg/d_msg_class/getLineCountNowPage__26jmessage_string_tReferenceFv.s" -} -#pragma pop - -/* 8022FB5C-8022FB98 22A49C 003C+00 0/0 1/1 0/0 .text __ct__24jmessage_string_tControlFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tControl::jmessage_string_tControl() { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__24jmessage_string_tControlFv.s" -} -#pragma pop - -/* 8022FB98-8022FBE4 22A4D8 004C+00 1/1 0/0 0/0 .text - * __ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tMeasureProcessor::jmessage_string_tMeasureProcessor( - jmessage_string_tReference const* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference.s" -} -#pragma pop - -/* 8022FBE4-8022FC14 22A524 0030+00 1/0 0/0 0/0 .text - * do_begin__33jmessage_string_tMeasureProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tMeasureProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__33jmessage_string_tMeasureProcessorFPCvPCc.s" -} -#pragma pop - -/* 8022FC14-8022FC28 22A554 0014+00 1/0 0/0 0/0 .text - * do_end__33jmessage_string_tMeasureProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tMeasureProcessor::do_end() { - nofralloc -#include "asm/d/msg/d_msg_class/do_end__33jmessage_string_tMeasureProcessorFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80454A98-80454AA0 003098 0004+04 3/3 0/0 0/0 .sdata2 @7190 */ -SECTION_SDATA2 static f32 lit_7190[1 + 1 /* padding */] = { - 20.0f, - /* padding */ - 0.0f, -}; - -/* 8022FC28-8022FDF0 22A568 01C8+00 1/0 0/0 0/0 .text - * do_character__33jmessage_string_tMeasureProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tMeasureProcessor::do_character(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_character__33jmessage_string_tMeasureProcessorFi.s" -} -#pragma pop - -/* 8022FDF0-8023098C 22A730 0B9C+00 5/0 0/0 0/0 .text - * do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tMeasureProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl.s" -} -#pragma pop - -/* 8023098C-80230A08 22B2CC 007C+00 1/1 0/0 0/0 .text - * do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tMeasureProcessor::do_rubyset(void const* param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl.s" -} -#pragma pop - -/* 80230A08-80230A5C 22B348 0054+00 0/0 1/1 0/0 .text - * __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tSequenceProcessor::jmessage_string_tSequenceProcessor( - jmessage_string_tReference const* param_0, jmessage_string_tControl* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/func_80230A08.s" -} -#pragma pop - -/* 80230A5C-80230ABC 22B39C 0060+00 1/0 0/0 0/0 .text __dt__33jmessage_string_tMeasureProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tMeasureProcessor::~jmessage_string_tMeasureProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__33jmessage_string_tMeasureProcessorFv.s" -} -#pragma pop - -/* 80230ABC-80230AC0 22B3FC 0004+00 1/0 0/0 0/0 .text - * do_reset__34jmessage_string_tSequenceProcessorFv */ -void jmessage_string_tSequenceProcessor::do_reset() { - /* empty function */ -} - -/* 80230AC0-80230B7C 22B400 00BC+00 1/0 0/0 0/0 .text - * do_begin__34jmessage_string_tSequenceProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tSequenceProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__34jmessage_string_tSequenceProcessorFPCvPCc.s" -} -#pragma pop - -/* 80230B7C-80230B80 22B4BC 0004+00 1/0 0/0 0/0 .text - * do_end__34jmessage_string_tSequenceProcessorFv */ -void jmessage_string_tSequenceProcessor::do_end() { - /* empty function */ -} - -/* 80230B80-80230B88 22B4C0 0008+00 1/0 0/0 0/0 .text - * do_isReady__34jmessage_string_tSequenceProcessorFv */ -bool jmessage_string_tSequenceProcessor::do_isReady() { - return true; -} - -/* 80230B88-80230B8C 22B4C8 0004+00 1/0 0/0 0/0 .text - * do_character__34jmessage_string_tSequenceProcessorFi */ -void jmessage_string_tSequenceProcessor::do_character(int param_0) { - /* empty function */ -} - -/* 80230B8C-80230BBC 22B4CC 0030+00 1/0 0/0 0/0 .text - * do_tag__34jmessage_string_tSequenceProcessorFUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tSequenceProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__34jmessage_string_tSequenceProcessorFUlPCvUl.s" -} -#pragma pop - -/* 80230BBC-80230BC4 22B4FC 0008+00 1/0 0/0 0/0 .text - * do_jump_isReady__34jmessage_string_tSequenceProcessorFv */ -bool jmessage_string_tSequenceProcessor::do_jump_isReady() { - return true; -} - -/* 80230BC4-80230BC8 22B504 0004+00 1/0 0/0 0/0 .text - * do_jump__34jmessage_string_tSequenceProcessorFPCvPCc */ -void jmessage_string_tSequenceProcessor::do_jump(void const* param_0, char const* param_1) { - /* empty function */ -} - -/* 80230BC8-80230C20 22B508 0058+00 0/0 1/1 0/0 .text - * __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tRenderingProcessor::jmessage_string_tRenderingProcessor( - jmessage_string_tReference const* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/__ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference.s" -} -#pragma pop - -/* 80230C20-80230C5C 22B560 003C+00 5/5 0/0 0/0 .text - * getLineCountNowPage__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::getLineCountNowPage() { - nofralloc -#include "asm/d/msg/d_msg_class/getLineCountNowPage__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80230C5C-80230CA0 22B59C 0044+00 1/0 0/0 0/0 .text - * do_reset__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_reset() { - nofralloc -#include "asm/d/msg/d_msg_class/do_reset__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80230CA0-80230CE8 22B5E0 0048+00 1/0 0/0 0/0 .text - * do_begin__35jmessage_string_tRenderingProcessorFPCvPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_begin(void const* param_0, char const* param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_begin__35jmessage_string_tRenderingProcessorFPCvPCc.s" -} -#pragma pop - -/* 80230CE8-80230D48 22B628 0060+00 1/0 0/0 0/0 .text - * do_end__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_end() { - nofralloc -#include "asm/d/msg/d_msg_class/do_end__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80230D48-80231110 22B688 03C8+00 1/0 0/0 0/0 .text - * do_character__35jmessage_string_tRenderingProcessorFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_character(int param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_character__35jmessage_string_tRenderingProcessorFi.s" -} -#pragma pop - -/* 80231110-80231D70 22BA50 0C60+00 6/0 0/0 0/0 .text - * do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_tag(u32 param_0, void const* param_1, - u32 param_2) { - nofralloc -#include "asm/d/msg/d_msg_class/do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl.s" -} -#pragma pop - -/* 80231D70-80231EF0 22C6B0 0180+00 2/2 0/0 0/0 .text - * do_widthcenter__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_widthcenter() { - nofralloc -#include "asm/d/msg/d_msg_class/do_widthcenter__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80231EF0-80232044 22C830 0154+00 1/1 0/0 0/0 .text - * do_heightcenter__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_heightcenter() { - nofralloc -#include "asm/d/msg/d_msg_class/do_heightcenter__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80232044-802320B0 22C984 006C+00 7/7 0/0 0/0 .text - * do_strcat__35jmessage_string_tRenderingProcessorFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_strcat(char* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_strcat__35jmessage_string_tRenderingProcessorFPc.s" -} -#pragma pop - -/* 802320B0-80232260 22C9F0 01B0+00 1/1 0/0 0/0 .text - * do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_rubyset(void const* param_0, u32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl.s" -} -#pragma pop - -/* 80232260-802322CC 22CBA0 006C+00 2/2 0/0 0/0 .text - * do_rubystrcat__35jmessage_string_tRenderingProcessorFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_rubystrcat(char* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_rubystrcat__35jmessage_string_tRenderingProcessorFPc.s" -} -#pragma pop - -/* 802322CC-8023256C 22CC0C 02A0+00 2/2 0/0 0/0 .text - * do_outfont__35jmessage_string_tRenderingProcessorFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_outfont(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_outfont__35jmessage_string_tRenderingProcessorFUc.s" -} -#pragma pop - -/* 8023256C-80232600 22CEAC 0094+00 1/1 0/0 0/0 .text - * do_color__35jmessage_string_tRenderingProcessorFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_color(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_color__35jmessage_string_tRenderingProcessorFUc.s" -} -#pragma pop - -/* 80232600-80232690 22CF40 0090+00 1/1 0/0 0/0 .text - * do_scale__35jmessage_string_tRenderingProcessorFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_scale(f32 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_scale__35jmessage_string_tRenderingProcessorFf.s" -} -#pragma pop - -/* 80232690-802326E4 22CFD0 0054+00 1/1 0/0 0/0 .text - * do_linedown__35jmessage_string_tRenderingProcessorFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_linedown(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_linedown__35jmessage_string_tRenderingProcessorFs.s" -} -#pragma pop - -/* 802326E4-802327BC 22D024 00D8+00 1/1 0/0 0/0 .text - * do_numset__35jmessage_string_tRenderingProcessorFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::do_numset(s16 param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/do_numset__35jmessage_string_tRenderingProcessorFs.s" -} -#pragma pop - -/* 802327BC-802327F8 22D0FC 003C+00 1/1 0/0 0/0 .text - * push_word__35jmessage_string_tRenderingProcessorFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_string_tRenderingProcessor::push_word(char const* param_0) { - nofralloc -#include "asm/d/msg/d_msg_class/push_word__35jmessage_string_tRenderingProcessorFPCc.s" -} -#pragma pop - -/* 802327F8-80232858 22D138 0060+00 1/0 0/0 0/0 .text - * __dt__35jmessage_string_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tRenderingProcessor::~jmessage_string_tRenderingProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__35jmessage_string_tRenderingProcessorFv.s" -} -#pragma pop - -/* 80232858-802328DC 22D198 0084+00 1/0 0/0 0/0 .text __dt__34jmessage_string_tSequenceProcessorFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tSequenceProcessor::~jmessage_string_tSequenceProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__34jmessage_string_tSequenceProcessorFv.s" -} -#pragma pop - -/* 802328DC-8023293C 22D21C 0060+00 1/0 0/0 0/0 .text __dt__24jmessage_string_tControlFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_string_tControl::~jmessage_string_tControl() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__24jmessage_string_tControlFv.s" -} -#pragma pop - -/* 8023293C-8023299C 22D27C 0060+00 1/0 0/0 0/0 .text __dt__28jmessage_tRenderingProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tRenderingProcessor::~jmessage_tRenderingProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__28jmessage_tRenderingProcessorFv.s" -} -#pragma pop - -/* 8023299C-80232A20 22D2DC 0084+00 1/0 0/0 0/0 .text __dt__27jmessage_tSequenceProcessorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm jmessage_tSequenceProcessor::~jmessage_tSequenceProcessor() { - nofralloc -#include "asm/d/msg/d_msg_class/__dt__27jmessage_tSequenceProcessorFv.s" -} -#pragma pop - -/* 80232A20-80232A3C 22D360 001C+00 2/2 0/0 0/0 .text getActorPos__19jmessage_tReferenceFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void jmessage_tReference::getActorPos() { - nofralloc -#include "asm/d/msg/d_msg_class/getActorPos__19jmessage_tReferenceFv.s" -} -#pragma pop - /* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index f1893ffe22..aa170fde24 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -350,7 +350,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 m_control__7dDemo_c[4]; @@ -678,7 +677,7 @@ asm void dMsgObject_c::setMessageIndexDemo(u32 param_0, bool param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getMessageIndex(u32 param_0) { +asm int dMsgObject_c::getMessageIndex(u32 param_0) { nofralloc #include "asm/d/msg/d_msg_object/getMessageIndex__12dMsgObject_cFUl.s" } @@ -992,13 +991,13 @@ asm void dMsgObject_c::getStringLocal(u32 param_0, J2DTextBox* param_1, J2DTextB /* 802370A8-802370BC 2319E8 0014+00 0/0 1/1 0/0 .text isGetItemMessage__12dMsgObject_cFv */ -BOOL dMsgObject_c::isGetItemMessage() { +u8 dMsgObject_c::isGetItemMessage() { return mFukiKind == 9; } /* 802370BC-802370E8 2319FC 002C+00 4/4 2/2 0/0 .text isKanbanMessage__12dMsgObject_cFv */ -BOOL dMsgObject_c::isKanbanMessage() { +bool dMsgObject_c::isKanbanMessage() { if (mFukiKind == 2 || mFukiKind == 6 || mFukiKind == 15) { return true; } @@ -1006,7 +1005,7 @@ BOOL dMsgObject_c::isKanbanMessage() { } /* 802370E8-802370FC 231A28 0014+00 6/6 3/3 0/0 .text isHowlMessage__12dMsgObject_cFv */ -BOOL dMsgObject_c::isHowlMessage() { +u8 dMsgObject_c::isHowlMessage() { return mFukiKind == 17; } @@ -1025,7 +1024,7 @@ asm bool dMsgObject_c::isMidonaMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isMidonaNormalTalkWait() { +asm bool dMsgObject_c::isMidonaNormalTalkWait() { nofralloc #include "asm/d/msg/d_msg_object/isMidonaNormalTalkWait__12dMsgObject_cFv.s" } @@ -1036,7 +1035,7 @@ asm void dMsgObject_c::isMidonaNormalTalkWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isMidonaTalkWait() { +asm bool dMsgObject_c::isMidonaTalkWait() { nofralloc #include "asm/d/msg/d_msg_object/isMidonaTalkWait__12dMsgObject_cFv.s" } @@ -1046,7 +1045,7 @@ asm void dMsgObject_c::isMidonaTalkWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isPlaceMessage() { +asm bool dMsgObject_c::isPlaceMessage() { nofralloc #include "asm/d/msg/d_msg_object/isPlaceMessage__12dMsgObject_cFv.s" } @@ -1056,7 +1055,7 @@ asm void dMsgObject_c::isPlaceMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isBossMessage() { +asm bool dMsgObject_c::isBossMessage() { nofralloc #include "asm/d/msg/d_msg_object/isBossMessage__12dMsgObject_cFv.s" } @@ -1071,7 +1070,7 @@ bool dMsgObject_c::isBookMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isStaffMessage() { +asm bool dMsgObject_c::isStaffMessage() { nofralloc #include "asm/d/msg/d_msg_object/isStaffMessage__12dMsgObject_cFv.s" } @@ -1081,7 +1080,7 @@ asm void dMsgObject_c::isStaffMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isSaveMessage() { +asm bool dMsgObject_c::isSaveMessage() { nofralloc #include "asm/d/msg/d_msg_object/isSaveMessage__12dMsgObject_cFv.s" } @@ -1091,7 +1090,7 @@ asm void dMsgObject_c::isSaveMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::isTalkMessage() { +asm bool dMsgObject_c::isTalkMessage() { nofralloc #include "asm/d/msg/d_msg_object/isTalkMessage__12dMsgObject_cFv.s" } @@ -1101,27 +1100,27 @@ asm void dMsgObject_c::isTalkMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getSmellName() { +asm const char* dMsgObject_c::getSmellName() { nofralloc #include "asm/d/msg/d_msg_object/getSmellName__12dMsgObject_cFv.s" } #pragma pop /* 80237334-8023738C 231C74 0058+00 0/0 5/5 0/0 .text getPortalName__12dMsgObject_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::getPortalName() { - nofralloc -#include "asm/d/msg/d_msg_object/getPortalName__12dMsgObject_cFv.s" +const char* dMsgObject_c::getPortalName() { + JMSMesgHeader_c* info_header_p = (JMSMesgHeader_c*)((char*)mpMsgRes + 0x20); + char* data_ptr = (char*)info_header_p + info_header_p->sectionSize; + JMSMesgEntry_c* info_entries = (JMSMesgEntry_c*)((char*)info_header_p + 0x10); + + JMSMesgEntry_c* msg_entry = &info_entries[getMessageIndex(getPortalMessageID())]; + return data_ptr + msg_entry->mStringOffset + 8; } -#pragma pop /* 8023738C-8023741C 231CCC 0090+00 0/0 5/5 0/0 .text getBombName__12dMsgObject_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getBombName() { +asm const char* dMsgObject_c::getBombName() { nofralloc #include "asm/d/msg/d_msg_object/getBombName__12dMsgObject_cFv.s" } @@ -1131,7 +1130,7 @@ asm void dMsgObject_c::getBombName() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getInsectName() { +asm const char* dMsgObject_c::getInsectName() { nofralloc #include "asm/d/msg/d_msg_object/getInsectName__12dMsgObject_cFv.s" } @@ -1141,7 +1140,7 @@ asm void dMsgObject_c::getInsectName() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getLetterName() { +asm const char* dMsgObject_c::getLetterName() { nofralloc #include "asm/d/msg/d_msg_object/getLetterName__12dMsgObject_cFv.s" } @@ -1152,7 +1151,7 @@ asm void dMsgObject_c::getLetterName() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getSelectBombNum() { +asm u8 dMsgObject_c::getSelectBombNum() { nofralloc #include "asm/d/msg/d_msg_object/getSelectBombNum__12dMsgObject_cFv.s" } @@ -1959,7 +1958,7 @@ asm void dMsgObject_c::getMsgOutputType() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getWord() { +asm const char* dMsgObject_c::getWord() { nofralloc #include "asm/d/msg/d_msg_object/getWord__12dMsgObject_cFv.s" } diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index 2fe10220c5..d8f2f24ef8 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -8,31 +8,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct jmessage_string_tControl { - /* 8022FB5C */ jmessage_string_tControl(); -}; - -struct COutFont_c {}; - -struct jmessage_string_tReference { - /* 8022F8C0 */ jmessage_string_tReference(); - /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); - /* 8022FA38 */ void getLineLength(int); -}; - -struct jmessage_string_tSequenceProcessor { - /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*, - jmessage_string_tControl*); -}; - -struct jmessage_string_tRenderingProcessor { - /* 80230BC8 */ jmessage_string_tRenderingProcessor(jmessage_string_tReference const*); -}; - // // Forward References: // diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index 5644e289ba..bdf5169a5f 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -5,21 +5,8 @@ #include "d/msg/d_msg_unit.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct dScnKy_env_light_c { - /* 8019FA08 */ void getDaytime(); -}; - -struct dMsgUnit_c { - /* 80238C94 */ dMsgUnit_c(); - /* 80238CA4 */ ~dMsgUnit_c(); - /* 80238CEC */ void setTag(int, int, char*, bool); -}; +#include "d/kankyo/d_kankyo.h" +#include "d/meter/d_meter2_info.h" // // Forward References: @@ -41,45 +28,16 @@ extern "C" void __dl__FPv(); extern "C" void __register_global_object(); extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); -extern "C" void sprintf(); -extern "C" void strcmp(); -extern "C" void strcat(); -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; // // Declarations: // -/* ############################################################################################## */ -/* 803C0BF0-803C0C00 01DD10 000C+04 2/2 0/0 0/0 .data __vt__10dMsgUnit_c */ -SECTION_DATA extern void* __vt__10dMsgUnit_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dMsgUnit_cFv, - /* padding */ - NULL, -}; - /* 80238C94-80238CA4 2335D4 0010+00 1/1 0/0 0/0 .text __ct__10dMsgUnit_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgUnit_c::dMsgUnit_c() { - nofralloc -#include "asm/d/msg/d_msg_unit/__ct__10dMsgUnit_cFv.s" -} -#pragma pop +dMsgUnit_c::dMsgUnit_c() {} /* 80238CA4-80238CEC 2335E4 0048+00 2/1 0/0 0/0 .text __dt__10dMsgUnit_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgUnit_c::~dMsgUnit_c() { - nofralloc -#include "asm/d/msg/d_msg_unit/__dt__10dMsgUnit_cFv.s" -} -#pragma pop +dMsgUnit_c::~dMsgUnit_c() {} /* ############################################################################################## */ /* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -121,32 +79,12 @@ asm void dMsgUnit_c::setTag(int param_0, int param_1, char* param_2, bool param_ } #pragma pop -/* ############################################################################################## */ -/* 804306B8-804306C8 05D3D8 000C+04 1/1 0/0 0/0 .bss @3640 */ -static u8 lit_3640[12 + 4 /* padding */]; - /* 804510D0-804510D8 0005D0 0004+04 1/1 5/5 0/0 .sbss g_msg_unit */ -extern u8 g_msg_unit[4 + 4 /* padding */]; -u8 g_msg_unit[4 + 4 /* padding */]; - -/* 8023907C-802390B4 2339BC 0038+00 0/0 1/0 0/0 .text __sinit_d_msg_unit_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_msg_unit_cpp() { - nofralloc -#include "asm/d/msg/d_msg_unit/__sinit_d_msg_unit_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8023907C, __sinit_d_msg_unit_cpp); -#pragma pop +dMsgUnit_c g_msg_unit; /* ############################################################################################## */ /* 804510D8-804510E0 0005D8 0008+00 0/0 2/2 0/0 .sbss None */ extern u8 data_804510D8[8]; -u8 data_804510D8[8]; +u8 data_804510D8[8] ALIGN_DECL(8); /* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index 5ec20f99ae..b9b30830ff 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -4,7 +4,6 @@ */ #include "f_op/f_op_msg.h" -#include "d/msg/d_msg_class.h" #include "d/s/d_s_play.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 0bb79ef153..4786fe3639 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -16,6 +16,7 @@ #include "dol2asm.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +#include "dolphin/gx/GXDraw.h" #include "d/kankyo/d_kankyo.h" #include "m_Do/m_Do_mtx.h" @@ -3278,6 +3279,102 @@ extern "C" asm void draw__26mDoExt_3DlineMatSortPacketFv() { } #pragma pop +void drawCube(MtxP mtx, cXyz* pos, const GXColor& color) { + GXSetArray(GX_VA_POS, pos, sizeof(cXyz)); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_INDEX8); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevColor(GX_TEVREG0, color); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_ENABLE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_ENABLE, GX_TEVPREV); + GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetCullMode(GX_CULL_BACK); + GXSetClipMode(GX_CLIP_ENABLE); + GXLoadPosMtxImm(mtx, 0); + GXSetCurrentMtx(0); + + GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 14); + GXPosition1x8(4); + GXPosition1x8(6); + GXPosition1x8(5); + GXPosition1x8(7); + GXPosition1x8(3); + GXPosition1x8(6); + GXPosition1x8(2); + GXPosition1x8(4); + GXPosition1x8(0); + GXPosition1x8(5); + GXPosition1x8(1); + GXPosition1x8(3); + GXPosition1x8(0); + GXPosition1x8(2); + i_GXEnd(); +} + +void mDoExt_cubePacket::draw() { + static cXyz l_pos[8] = { + cXyz(-1.0f, 1.0f, -1.0f), + cXyz(1.0f, 1.0f, -1.0f), + cXyz(-1.0f, 1.0f, 1.0f), + cXyz(1.0f, 1.0f, 1.0f), + cXyz(-1.0f, -1.0f, -1.0f), + cXyz(1.0f, -1.0f, -1.0f), + cXyz(-1.0f, -1.0f, 1.0f), + cXyz(1.0f, -1.0f, 1.0f), + }; + + mDoMtx_stack_c::transS(mPosition.x, mPosition.y, mPosition.z); + mDoMtx_stack_c::XYZrotM(mAngle.x, mAngle.y, mAngle.z); + mDoMtx_stack_c::scaleM(mSize.x, mSize.y, mSize.z); + mDoMtx_stack_c::revConcat(j3dSys.getViewMtx()); + drawCube(mDoMtx_stack_c::get(), l_pos, mColor); +} + +void mDoExt_cylinderPacket::draw() { + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, GX_ENABLE, GX_SRC_REG, GX_SRC_REG, 1, GX_DF_CLAMP, GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevColor(GX_TEVREG0, mColor); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_C0, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + + if (field_0x28) { + GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE); + } else { + GXSetZMode(GX_DISABLE, GX_LEQUAL, GX_DISABLE); + } + + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); + GXSetCullMode(GX_CULL_BACK); + GXSetClipMode(GX_CLIP_ENABLE); + + mDoMtx_stack_c::copy(j3dSys.getViewMtx()); + mDoMtx_stack_c::transM(mPosition.x, mPosition.y + mHeight * 0.5f, mPosition.z); + mDoMtx_stack_c::scaleM(mRadius, mRadius * 0.5f, mRadius); + mDoMtx_stack_c::XrotM(0x4000); + + GXLoadPosMtxImm(mDoMtx_stack_c::get(), 0); + mDoMtx_stack_c::inverseTranspose(); + + GXLoadNrmMtxImm(mDoMtx_stack_c::get(), 0); + GXSetCurrentMtx(0); + GXDrawCylinder(8); +} + /* ############################################################################################## */ /* 803740FC-803740FC 00075C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push