diff --git a/Progress.md b/Progress.md index c3d4622e04..de17821e36 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 | 51.286124% | 1844528 | 3596544 +.text | 54.960206% | 1976668 | 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 | 56.420021% | 2268464 | 4020672 +Total | 59.706537% | 2400604 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 56.420021% | 2268464 | 4020672 -RELs | 39.402125% | 4531372 | 11500324 -Total | 43.810565% | 6799836 | 15520996 +main.dol | 59.706537% | 2400604 | 4020672 +RELs | 39.608519% | 4555108 | 11500324 +Total | 44.814856% | 6955712 | 15520996 ## RELs @@ -224,7 +224,7 @@ d_a_npc_ash | 42.736140% | 13320 | 31168 d_a_npc_ashB | 32.906995% | 8336 | 25332 d_a_npc_bans | 34.954955% | 11640 | 33300 d_a_npc_besu | 38.726854% | 19492 | 50332 -d_a_npc_blue_ns | 31.763122% | 7552 | 23776 +d_a_npc_blue_ns | 43.993943% | 10460 | 23776 d_a_npc_bou | 36.186814% | 12800 | 35372 d_a_npc_bouS | 32.586831% | 9720 | 29828 d_a_npc_cdn3 | 34.686491% | 14184 | 40892 @@ -361,7 +361,7 @@ d_a_obj_bky_rock | 35.592460% | 3172 | 8912 d_a_obj_bmWindow | 100.000000% | 8824 | 8824 d_a_obj_bmshutter | 41.338854% | 2396 | 5796 d_a_obj_bombf | 100.000000% | 2176 | 2176 -d_a_obj_bosswarp | 78.906503% | 9756 | 12364 +d_a_obj_bosswarp | 86.347460% | 10676 | 12364 d_a_obj_boumato | 40.192484% | 3508 | 8728 d_a_obj_brakeeff | 45.417515% | 1784 | 3928 d_a_obj_brg | 22.881356% | 6696 | 29264 @@ -560,7 +560,7 @@ d_a_obj_octhashi | 35.325420% | 3452 | 9772 d_a_obj_oiltubo | 100.000000% | 7608 | 7608 d_a_obj_onsen | 100.000000% | 2892 | 2892 d_a_obj_onsenFire | 100.000000% | 1296 | 1296 -d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 +d_a_obj_onsenTaru | 100.000000% | 8992 | 8992 d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 d_a_obj_pdoor | 37.254902% | 1900 | 5100 d_a_obj_pdtile | 31.467607% | 2856 | 9076 @@ -574,7 +574,7 @@ d_a_obj_poTbox | 44.731739% | 2768 | 6188 d_a_obj_prop | 100.000000% | 2064 | 2064 d_a_obj_pumpkin | 29.152971% | 4612 | 15820 d_a_obj_rcircle | 100.000000% | 3028 | 3028 -d_a_obj_rfHole | 43.621701% | 2380 | 5456 +d_a_obj_rfHole | 100.000000% | 5456 | 5456 d_a_obj_rgate | 100.000000% | 15620 | 15620 d_a_obj_riverrock | 37.311178% | 2964 | 7944 d_a_obj_rock | 100.000000% | 4720 | 4720 @@ -707,7 +707,7 @@ d_a_tag_CstaSw | 100.000000% | 2560 | 2560 d_a_tag_Lv6Gate | 71.494786% | 4936 | 6904 d_a_tag_Lv7Gate | 100.000000% | 6296 | 6296 d_a_tag_Lv8Gate | 100.000000% | 3848 | 3848 -d_a_tag_TWgate | 61.150640% | 12032 | 19676 +d_a_tag_TWgate | 100.000000% | 19676 | 19676 d_a_tag_ajnot | 100.000000% | 1232 | 1232 d_a_tag_allmato | 30.234070% | 3720 | 12304 d_a_tag_arena | 100.000000% | 712 | 712 @@ -752,7 +752,7 @@ d_a_tag_myna_light | 100.000000% | 3124 | 3124 d_a_tag_pachi | 100.000000% | 2528 | 2528 d_a_tag_poFire | 100.000000% | 1688 | 1688 d_a_tag_push | 100.000000% | 2800 | 2800 -d_a_tag_qs | 34.804270% | 1956 | 5620 +d_a_tag_qs | 100.000000% | 5620 | 5620 d_a_tag_ret_room | 100.000000% | 1684 | 1684 d_a_tag_river_back | 100.000000% | 2948 | 2948 d_a_tag_rmbit_sw | 100.000000% | 2204 | 2204 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 39.402125% | 4531372 | 11500324 +Total | 39.608519% | 4555108 | 11500324 diff --git a/asm/d/event/d_event/talkCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/talkCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 766af98616..0000000000 --- a/asm/d/event/d_event/talkCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80041A20: -/* 80041A20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80041A24 7C 08 02 A6 */ mflr r0 -/* 80041A28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80041A2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041A30 48 32 07 AD */ bl _savegpr_29 -/* 80041A34 7C 7F 1B 78 */ mr r31, r3 -/* 80041A38 3C 60 80 38 */ lis r3, d_event_d_event__stringBase0@ha /* 0x80379D80@ha */ -/* 80041A3C 38 63 9D 80 */ addi r3, r3, d_event_d_event__stringBase0@l /* 0x80379D80@l */ -/* 80041A40 3B C3 00 0B */ addi r30, r3, 0xb -/* 80041A44 83 A4 00 0C */ lwz r29, 0xc(r4) -/* 80041A48 A8 7D 00 08 */ lha r3, 8(r29) -/* 80041A4C 2C 03 02 C1 */ cmpwi r3, 0x2c1 -/* 80041A50 40 82 00 10 */ bne lbl_80041A60 -/* 80041A54 88 1D 05 6D */ lbz r0, 0x56d(r29) -/* 80041A58 28 00 00 FF */ cmplwi r0, 0xff -/* 80041A5C 41 82 00 20 */ beq lbl_80041A7C -lbl_80041A60: -/* 80041A60 2C 03 02 C4 */ cmpwi r3, 0x2c4 -/* 80041A64 40 82 00 10 */ bne lbl_80041A74 -/* 80041A68 88 1D 05 6B */ lbz r0, 0x56b(r29) -/* 80041A6C 28 00 00 FF */ cmplwi r0, 0xff -/* 80041A70 41 82 00 0C */ beq lbl_80041A7C -lbl_80041A74: -/* 80041A74 2C 03 00 FF */ cmpwi r3, 0xff -/* 80041A78 40 82 00 38 */ bne lbl_80041AB0 -lbl_80041A7C: -/* 80041A7C 80 AD 8A 98 */ lwz r5, m_midnaActor__9daPy_py_c(r13) -/* 80041A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041A88 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80041A8C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80041A90 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80041A94 41 82 00 10 */ beq lbl_80041AA4 -/* 80041A98 80 05 08 90 */ lwz r0, 0x890(r5) -/* 80041A9C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80041AA0 41 82 00 10 */ beq lbl_80041AB0 -lbl_80041AA4: -/* 80041AA4 3C 60 80 38 */ lis r3, d_event_d_event__stringBase0@ha /* 0x80379D80@ha */ -/* 80041AA8 38 63 9D 80 */ addi r3, r3, d_event_d_event__stringBase0@l /* 0x80379D80@l */ -/* 80041AAC 3B C3 00 18 */ addi r30, r3, 0x18 -lbl_80041AB0: -/* 80041AB0 7F E3 FB 78 */ mr r3, r31 -/* 80041AB4 38 A0 00 01 */ li r5, 1 -/* 80041AB8 38 C0 00 01 */ li r6, 1 -/* 80041ABC 4B FF FE ED */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs -/* 80041AC0 2C 03 00 00 */ cmpwi r3, 0 -/* 80041AC4 41 82 00 78 */ beq lbl_80041B3C -/* 80041AC8 38 00 00 01 */ li r0, 1 -/* 80041ACC 98 1F 00 E4 */ stb r0, 0xe4(r31) -/* 80041AD0 A8 1F 00 DE */ lha r0, 0xde(r31) -/* 80041AD4 2C 00 FF FF */ cmpwi r0, -1 -/* 80041AD8 40 82 00 48 */ bne lbl_80041B20 -/* 80041ADC 28 1D 00 00 */ cmplwi r29, 0 -/* 80041AE0 41 82 00 20 */ beq lbl_80041B00 -/* 80041AE4 38 7D 00 F4 */ addi r3, r29, 0xf4 -/* 80041AE8 48 00 19 99 */ bl getEventName__11dEvt_info_cFv -/* 80041AEC 28 03 00 00 */ cmplwi r3, 0 -/* 80041AF0 41 82 00 10 */ beq lbl_80041B00 -/* 80041AF4 A8 1D 00 FC */ lha r0, 0xfc(r29) -/* 80041AF8 B0 1F 00 DE */ sth r0, 0xde(r31) -/* 80041AFC 48 00 00 24 */ b lbl_80041B20 -lbl_80041B00: -/* 80041B00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041B04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041B08 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041B0C 7F C4 F3 78 */ mr r4, r30 -/* 80041B10 38 A0 00 FF */ li r5, 0xff -/* 80041B14 38 C0 FF FF */ li r6, -1 -/* 80041B18 48 00 59 FD */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80041B1C B0 7F 00 DE */ sth r3, 0xde(r31) -lbl_80041B20: -/* 80041B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041B28 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041B2C A8 9F 00 DE */ lha r4, 0xde(r31) -/* 80041B30 48 00 5E 55 */ bl order__16dEvent_manager_cFs -/* 80041B34 38 60 00 01 */ li r3, 1 -/* 80041B38 48 00 00 08 */ b lbl_80041B40 -lbl_80041B3C: -/* 80041B3C 38 60 00 00 */ li r3, 0 -lbl_80041B40: -/* 80041B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041B44 48 32 06 E5 */ bl _restgpr_29 -/* 80041B48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80041B4C 7C 08 03 A6 */ mtlr r0 -/* 80041B50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80041B54 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/__ct__26fmpTresTypeGroupDataList_cFv.s b/asm/d/map/d_map_path_fmap/__ct__26fmpTresTypeGroupDataList_cFv.s deleted file mode 100644 index c48bc38c37..0000000000 --- a/asm/d/map/d_map_path_fmap/__ct__26fmpTresTypeGroupDataList_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8003EC90: -/* 8003EC90 38 00 00 00 */ li r0, 0 -/* 8003EC94 90 03 00 00 */ stw r0, 0(r3) -/* 8003EC98 90 03 00 04 */ stw r0, 4(r3) -/* 8003EC9C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/__dt__22fmpTresTypeGroupData_cFv.s b/asm/d/map/d_map_path_fmap/__dt__22fmpTresTypeGroupData_cFv.s deleted file mode 100644 index bdb9844b71..0000000000 --- a/asm/d/map/d_map_path_fmap/__dt__22fmpTresTypeGroupData_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_8003EB70: -/* 8003EB70 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8003EB74 7C 08 02 A6 */ mflr r0 -/* 8003EB78 90 01 00 34 */ stw r0, 0x34(r1) -/* 8003EB7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003EB80 48 32 36 41 */ bl _savegpr_22 -/* 8003EB84 7C 76 1B 79 */ or. r22, r3, r3 -/* 8003EB88 7C 97 23 78 */ mr r23, r4 -/* 8003EB8C 41 82 00 E8 */ beq lbl_8003EC74 -/* 8003EB90 83 F6 00 04 */ lwz r31, 4(r22) -/* 8003EB94 28 1F 00 00 */ cmplwi r31, 0 -/* 8003EB98 41 82 00 CC */ beq lbl_8003EC64 -/* 8003EB9C 41 82 00 C8 */ beq lbl_8003EC64 -/* 8003EBA0 83 DF 00 04 */ lwz r30, 4(r31) -/* 8003EBA4 28 1E 00 00 */ cmplwi r30, 0 -/* 8003EBA8 41 82 00 B4 */ beq lbl_8003EC5C -/* 8003EBAC 41 82 00 B0 */ beq lbl_8003EC5C -/* 8003EBB0 83 BE 00 04 */ lwz r29, 4(r30) -/* 8003EBB4 28 1D 00 00 */ cmplwi r29, 0 -/* 8003EBB8 41 82 00 9C */ beq lbl_8003EC54 -/* 8003EBBC 41 82 00 98 */ beq lbl_8003EC54 -/* 8003EBC0 83 9D 00 04 */ lwz r28, 4(r29) -/* 8003EBC4 28 1C 00 00 */ cmplwi r28, 0 -/* 8003EBC8 41 82 00 84 */ beq lbl_8003EC4C -/* 8003EBCC 41 82 00 80 */ beq lbl_8003EC4C -/* 8003EBD0 83 7C 00 04 */ lwz r27, 4(r28) -/* 8003EBD4 28 1B 00 00 */ cmplwi r27, 0 -/* 8003EBD8 41 82 00 6C */ beq lbl_8003EC44 -/* 8003EBDC 41 82 00 68 */ beq lbl_8003EC44 -/* 8003EBE0 83 5B 00 04 */ lwz r26, 4(r27) -/* 8003EBE4 28 1A 00 00 */ cmplwi r26, 0 -/* 8003EBE8 41 82 00 54 */ beq lbl_8003EC3C -/* 8003EBEC 41 82 00 50 */ beq lbl_8003EC3C -/* 8003EBF0 83 3A 00 04 */ lwz r25, 4(r26) -/* 8003EBF4 28 19 00 00 */ cmplwi r25, 0 -/* 8003EBF8 41 82 00 3C */ beq lbl_8003EC34 -/* 8003EBFC 41 82 00 38 */ beq lbl_8003EC34 -/* 8003EC00 83 19 00 04 */ lwz r24, 4(r25) -/* 8003EC04 28 18 00 00 */ cmplwi r24, 0 -/* 8003EC08 41 82 00 24 */ beq lbl_8003EC2C -/* 8003EC0C 41 82 00 20 */ beq lbl_8003EC2C -/* 8003EC10 80 78 00 04 */ lwz r3, 4(r24) -/* 8003EC14 28 03 00 00 */ cmplwi r3, 0 -/* 8003EC18 41 82 00 0C */ beq lbl_8003EC24 -/* 8003EC1C 38 80 00 01 */ li r4, 1 -/* 8003EC20 4B FF FF 51 */ bl __dt__22fmpTresTypeGroupData_cFv -lbl_8003EC24: -/* 8003EC24 7F 03 C3 78 */ mr r3, r24 -/* 8003EC28 48 29 01 15 */ bl __dl__FPv -lbl_8003EC2C: -/* 8003EC2C 7F 23 CB 78 */ mr r3, r25 -/* 8003EC30 48 29 01 0D */ bl __dl__FPv -lbl_8003EC34: -/* 8003EC34 7F 43 D3 78 */ mr r3, r26 -/* 8003EC38 48 29 01 05 */ bl __dl__FPv -lbl_8003EC3C: -/* 8003EC3C 7F 63 DB 78 */ mr r3, r27 -/* 8003EC40 48 29 00 FD */ bl __dl__FPv -lbl_8003EC44: -/* 8003EC44 7F 83 E3 78 */ mr r3, r28 -/* 8003EC48 48 29 00 F5 */ bl __dl__FPv -lbl_8003EC4C: -/* 8003EC4C 7F A3 EB 78 */ mr r3, r29 -/* 8003EC50 48 29 00 ED */ bl __dl__FPv -lbl_8003EC54: -/* 8003EC54 7F C3 F3 78 */ mr r3, r30 -/* 8003EC58 48 29 00 E5 */ bl __dl__FPv -lbl_8003EC5C: -/* 8003EC5C 7F E3 FB 78 */ mr r3, r31 -/* 8003EC60 48 29 00 DD */ bl __dl__FPv -lbl_8003EC64: -/* 8003EC64 7E E0 07 35 */ extsh. r0, r23 -/* 8003EC68 40 81 00 0C */ ble lbl_8003EC74 -/* 8003EC6C 7E C3 B3 78 */ mr r3, r22 -/* 8003EC70 48 29 00 CD */ bl __dl__FPv -lbl_8003EC74: -/* 8003EC74 7E C3 B3 78 */ mr r3, r22 -/* 8003EC78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003EC7C 48 32 35 91 */ bl _restgpr_22 -/* 8003EC80 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8003EC84 7C 08 03 A6 */ mtlr r0 -/* 8003EC88 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003EC8C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/__dt__26fmpTresTypeGroupDataList_cFv.s b/asm/d/map/d_map_path_fmap/__dt__26fmpTresTypeGroupDataList_cFv.s deleted file mode 100644 index cf764be2e6..0000000000 --- a/asm/d/map/d_map_path_fmap/__dt__26fmpTresTypeGroupDataList_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8003EB10: -/* 8003EB10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003EB14 7C 08 02 A6 */ mflr r0 -/* 8003EB18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003EB1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003EB20 93 C1 00 08 */ stw r30, 8(r1) -/* 8003EB24 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8003EB28 7C 9F 23 78 */ mr r31, r4 -/* 8003EB2C 41 82 00 28 */ beq lbl_8003EB54 -/* 8003EB30 80 7E 00 00 */ lwz r3, 0(r30) -/* 8003EB34 28 03 00 00 */ cmplwi r3, 0 -/* 8003EB38 41 82 00 0C */ beq lbl_8003EB44 -/* 8003EB3C 38 80 00 01 */ li r4, 1 -/* 8003EB40 48 00 00 31 */ bl __dt__22fmpTresTypeGroupData_cFv -lbl_8003EB44: -/* 8003EB44 7F E0 07 35 */ extsh. r0, r31 -/* 8003EB48 40 81 00 0C */ ble lbl_8003EB54 -/* 8003EB4C 7F C3 F3 78 */ mr r3, r30 -/* 8003EB50 48 29 01 ED */ bl __dl__FPv -lbl_8003EB54: -/* 8003EB54 7F C3 F3 78 */ mr r3, r30 -/* 8003EB58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003EB5C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003EB60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003EB64 7C 08 03 A6 */ mtlr r0 -/* 8003EB68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003EB6C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/buildFmapRegionData__24dMenu_Fmap_region_data_cFi.s b/asm/d/map/d_map_path_fmap/buildFmapRegionData__24dMenu_Fmap_region_data_cFi.s deleted file mode 100644 index d54199b844..0000000000 --- a/asm/d/map/d_map_path_fmap/buildFmapRegionData__24dMenu_Fmap_region_data_cFi.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_8003DEE0: -/* 8003DEE0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8003DEE4 7C 08 02 A6 */ mflr r0 -/* 8003DEE8 90 01 00 64 */ stw r0, 0x64(r1) -/* 8003DEEC DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8003DEF0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8003DEF4 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8003DEF8 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8003DEFC DB A1 00 30 */ stfd f29, 0x30(r1) -/* 8003DF00 F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 8003DF04 DB 81 00 20 */ stfd f28, 0x20(r1) -/* 8003DF08 F3 81 00 28 */ psq_st f28, 40(r1), 0, 0 /* qr0 */ -/* 8003DF0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003DF10 48 32 42 CD */ bl _savegpr_29 -/* 8003DF14 7C 7D 1B 78 */ mr r29, r3 -/* 8003DF18 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 8003DF1C C0 03 0A E8 */ lfs f0, __float_max@l(r3) /* 0x80450AE8@l */ -/* 8003DF20 FF E0 00 90 */ fmr f31, f0 -/* 8003DF24 FF C0 00 90 */ fmr f30, f0 -/* 8003DF28 FC 00 00 50 */ fneg f0, f0 -/* 8003DF2C FF A0 00 90 */ fmr f29, f0 -/* 8003DF30 FF 80 00 90 */ fmr f28, f0 -/* 8003DF34 83 FD 00 00 */ lwz r31, 0(r29) -/* 8003DF38 3B C0 00 00 */ li r30, 0 -/* 8003DF3C 48 00 00 78 */ b lbl_8003DFB4 -lbl_8003DF40: -/* 8003DF40 7F E3 FB 78 */ mr r3, r31 -/* 8003DF44 7F C4 F3 78 */ mr r4, r30 -/* 8003DF48 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8003DF4C C0 5D 00 0C */ lfs f2, 0xc(r29) -/* 8003DF50 4B FF FA 89 */ bl buildFmapStageData__23dMenu_Fmap_stage_data_cFiff -/* 8003DF54 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 8003DF58 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 8003DF5C EC 60 08 2A */ fadds f3, f0, f1 -/* 8003DF60 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8003DF64 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 8003DF68 EC 80 10 2A */ fadds f4, f0, f2 -/* 8003DF6C C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 8003DF70 EC 20 08 2A */ fadds f1, f0, f1 -/* 8003DF74 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 8003DF78 EC 00 10 2A */ fadds f0, f0, f2 -/* 8003DF7C FC 03 F8 40 */ fcmpo cr0, f3, f31 -/* 8003DF80 40 80 00 08 */ bge lbl_8003DF88 -/* 8003DF84 FF E0 18 90 */ fmr f31, f3 -lbl_8003DF88: -/* 8003DF88 FC 04 F0 40 */ fcmpo cr0, f4, f30 -/* 8003DF8C 40 80 00 08 */ bge lbl_8003DF94 -/* 8003DF90 FF C0 20 90 */ fmr f30, f4 -lbl_8003DF94: -/* 8003DF94 FC 01 E8 40 */ fcmpo cr0, f1, f29 -/* 8003DF98 40 81 00 08 */ ble lbl_8003DFA0 -/* 8003DF9C FF A0 08 90 */ fmr f29, f1 -lbl_8003DFA0: -/* 8003DFA0 FC 00 E0 40 */ fcmpo cr0, f0, f28 -/* 8003DFA4 40 81 00 08 */ ble lbl_8003DFAC -/* 8003DFA8 FF 80 00 90 */ fmr f28, f0 -lbl_8003DFAC: -/* 8003DFAC 83 FF 00 10 */ lwz r31, 0x10(r31) -/* 8003DFB0 3B DE 00 01 */ addi r30, r30, 1 -lbl_8003DFB4: -/* 8003DFB4 28 1F 00 00 */ cmplwi r31, 0 -/* 8003DFB8 40 82 FF 88 */ bne lbl_8003DF40 -/* 8003DFBC 2C 1E 00 00 */ cmpwi r30, 0 -/* 8003DFC0 40 81 00 18 */ ble lbl_8003DFD8 -/* 8003DFC4 D3 FD 00 10 */ stfs f31, 0x10(r29) -/* 8003DFC8 D3 DD 00 18 */ stfs f30, 0x18(r29) -/* 8003DFCC D3 BD 00 14 */ stfs f29, 0x14(r29) -/* 8003DFD0 D3 9D 00 1C */ stfs f28, 0x1c(r29) -/* 8003DFD4 48 00 00 18 */ b lbl_8003DFEC -lbl_8003DFD8: -/* 8003DFD8 C0 02 84 20 */ lfs f0, lit_3894(r2) -/* 8003DFDC D0 1D 00 10 */ stfs f0, 0x10(r29) -/* 8003DFE0 D0 1D 00 14 */ stfs f0, 0x14(r29) -/* 8003DFE4 D0 1D 00 18 */ stfs f0, 0x18(r29) -/* 8003DFE8 D0 1D 00 1C */ stfs f0, 0x1c(r29) -lbl_8003DFEC: -/* 8003DFEC 7F C3 F3 78 */ mr r3, r30 -/* 8003DFF0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8003DFF4 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8003DFF8 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 8003DFFC CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8003E000 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 8003E004 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 8003E008 E3 81 00 28 */ psq_l f28, 40(r1), 0, 0 /* qr0 */ -/* 8003E00C CB 81 00 20 */ lfd f28, 0x20(r1) -/* 8003E010 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E014 48 32 42 15 */ bl _restgpr_29 -/* 8003E018 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8003E01C 7C 08 03 A6 */ mtlr r0 -/* 8003E020 38 21 00 60 */ addi r1, r1, 0x60 -/* 8003E024 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/buildFmapWorldData__23dMenu_Fmap_world_data_cFv.s b/asm/d/map/d_map_path_fmap/buildFmapWorldData__23dMenu_Fmap_world_data_cFv.s deleted file mode 100644 index 50aa1afe16..0000000000 --- a/asm/d/map/d_map_path_fmap/buildFmapWorldData__23dMenu_Fmap_world_data_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8003E04C: -/* 8003E04C 3C 80 80 45 */ lis r4, __float_max@ha /* 0x80450AE8@ha */ -/* 8003E050 C0 04 0A E8 */ lfs f0, __float_max@l(r4) /* 0x80450AE8@l */ -/* 8003E054 FC 60 00 90 */ fmr f3, f0 -/* 8003E058 FC 80 00 90 */ fmr f4, f0 -/* 8003E05C FC 00 00 50 */ fneg f0, f0 -/* 8003E060 FC A0 00 90 */ fmr f5, f0 -/* 8003E064 FC C0 00 90 */ fmr f6, f0 -/* 8003E068 80 83 00 00 */ lwz r4, 0(r3) -/* 8003E06C 38 A0 00 00 */ li r5, 0 -/* 8003E070 48 00 00 64 */ b lbl_8003E0D4 -lbl_8003E074: -/* 8003E074 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 8003E078 C0 24 00 08 */ lfs f1, 8(r4) -/* 8003E07C EC E0 08 2A */ fadds f7, f0, f1 -/* 8003E080 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 8003E084 C0 44 00 0C */ lfs f2, 0xc(r4) -/* 8003E088 ED 00 10 2A */ fadds f8, f0, f2 -/* 8003E08C C0 04 00 14 */ lfs f0, 0x14(r4) -/* 8003E090 EC 20 08 2A */ fadds f1, f0, f1 -/* 8003E094 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 8003E098 EC 00 10 2A */ fadds f0, f0, f2 -/* 8003E09C FC 07 18 40 */ fcmpo cr0, f7, f3 -/* 8003E0A0 40 80 00 08 */ bge lbl_8003E0A8 -/* 8003E0A4 FC 60 38 90 */ fmr f3, f7 -lbl_8003E0A8: -/* 8003E0A8 FC 08 20 40 */ fcmpo cr0, f8, f4 -/* 8003E0AC 40 80 00 08 */ bge lbl_8003E0B4 -/* 8003E0B0 FC 80 40 90 */ fmr f4, f8 -lbl_8003E0B4: -/* 8003E0B4 FC 01 28 40 */ fcmpo cr0, f1, f5 -/* 8003E0B8 40 81 00 08 */ ble lbl_8003E0C0 -/* 8003E0BC FC A0 08 90 */ fmr f5, f1 -lbl_8003E0C0: -/* 8003E0C0 FC 00 30 40 */ fcmpo cr0, f0, f6 -/* 8003E0C4 40 81 00 08 */ ble lbl_8003E0CC -/* 8003E0C8 FC C0 00 90 */ fmr f6, f0 -lbl_8003E0CC: -/* 8003E0CC 80 84 00 04 */ lwz r4, 4(r4) -/* 8003E0D0 38 A5 00 01 */ addi r5, r5, 1 -lbl_8003E0D4: -/* 8003E0D4 28 04 00 00 */ cmplwi r4, 0 -/* 8003E0D8 40 82 FF 9C */ bne lbl_8003E074 -/* 8003E0DC 2C 05 00 00 */ cmpwi r5, 0 -/* 8003E0E0 40 81 00 18 */ ble lbl_8003E0F8 -/* 8003E0E4 D0 63 00 04 */ stfs f3, 4(r3) -/* 8003E0E8 D0 83 00 08 */ stfs f4, 8(r3) -/* 8003E0EC D0 A3 00 0C */ stfs f5, 0xc(r3) -/* 8003E0F0 D0 C3 00 10 */ stfs f6, 0x10(r3) -/* 8003E0F4 48 00 00 18 */ b lbl_8003E10C -lbl_8003E0F8: -/* 8003E0F8 C0 02 84 20 */ lfs f0, lit_3894(r2) -/* 8003E0FC D0 03 00 04 */ stfs f0, 4(r3) -/* 8003E100 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8003E104 D0 03 00 08 */ stfs f0, 8(r3) -/* 8003E108 D0 03 00 10 */ stfs f0, 0x10(r3) -lbl_8003E10C: -/* 8003E10C 7C A3 2B 78 */ mr r3, r5 -/* 8003E110 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c.s b/asm/d/map/d_map_path_fmap/create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c.s deleted file mode 100644 index ac54aa64f1..0000000000 --- a/asm/d/map/d_map_path_fmap/create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8003E028: -/* 8003E028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E02C 7C 08 02 A6 */ mflr r0 -/* 8003E030 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E034 90 83 00 00 */ stw r4, 0(r3) -/* 8003E038 48 00 00 15 */ bl buildFmapWorldData__23dMenu_Fmap_world_data_cFv -/* 8003E03C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E040 7C 08 03 A6 */ mtlr r0 -/* 8003E044 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E048 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index 33bc631080..0000000000 --- a/asm/d/map/d_map_path_fmap/getData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8003E2BC: -/* 8003E2BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E2C0 7C 08 02 A6 */ mflr r0 -/* 8003E2C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E2C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003E2CC 93 C1 00 08 */ stw r30, 8(r1) -/* 8003E2D0 7C 7E 1B 78 */ mr r30, r3 -/* 8003E2D4 3B E0 00 00 */ li r31, 0 -/* 8003E2D8 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E2DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003E2E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003E2E4 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E2E8 48 32 A6 AD */ bl strcmp -/* 8003E2EC 2C 03 00 00 */ cmpwi r3, 0 -/* 8003E2F0 40 82 00 34 */ bne lbl_8003E324 -/* 8003E2F4 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 8003E2F8 28 04 00 00 */ cmplwi r4, 0 -/* 8003E2FC 41 82 00 38 */ beq lbl_8003E334 -/* 8003E300 88 04 00 01 */ lbz r0, 1(r4) -/* 8003E304 7C 00 07 74 */ extsb r0, r0 -/* 8003E308 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8003E30C 88 63 00 10 */ lbz r3, 0x10(r3) -/* 8003E310 7C 03 00 00 */ cmpw r3, r0 -/* 8003E314 40 82 00 20 */ bne lbl_8003E334 -/* 8003E318 90 9E 00 2C */ stw r4, 0x2c(r30) -/* 8003E31C 3B E0 00 01 */ li r31, 1 -/* 8003E320 48 00 00 14 */ b lbl_8003E334 -lbl_8003E324: -/* 8003E324 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 8003E328 28 00 00 00 */ cmplwi r0, 0 -/* 8003E32C 41 82 00 08 */ beq lbl_8003E334 -/* 8003E330 3B E0 00 01 */ li r31, 1 -lbl_8003E334: -/* 8003E334 7F E3 FB 78 */ mr r3, r31 -/* 8003E338 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003E33C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003E340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E344 7C 08 03 A6 */ mtlr r0 -/* 8003E348 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E34C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getFirstData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getFirstData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index 7954d3ce2c..0000000000 --- a/asm/d/map/d_map_path_fmap/getFirstData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_8003E1C0: -/* 8003E1C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E1C4 7C 08 02 A6 */ mflr r0 -/* 8003E1C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E1CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003E1D0 93 C1 00 08 */ stw r30, 8(r1) -/* 8003E1D4 7C 7E 1B 78 */ mr r30, r3 -/* 8003E1D8 3B E0 00 00 */ li r31, 0 -/* 8003E1DC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E1E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003E1E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003E1E8 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E1EC 48 32 A7 A9 */ bl strcmp -/* 8003E1F0 2C 03 00 00 */ cmpwi r3, 0 -/* 8003E1F4 40 82 00 1C */ bne lbl_8003E210 -/* 8003E1F8 88 7E 00 30 */ lbz r3, 0x30(r30) -/* 8003E1FC 48 05 E1 65 */ bl getFirstData__7dTres_cFUc -/* 8003E200 90 7E 00 28 */ stw r3, 0x28(r30) -/* 8003E204 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 8003E208 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 8003E20C 48 00 00 94 */ b lbl_8003E2A0 -lbl_8003E210: -/* 8003E210 38 00 00 00 */ li r0, 0 -/* 8003E214 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8003E218 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8003E21C 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 8003E220 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8003E224 80 03 00 04 */ lwz r0, 4(r3) -/* 8003E228 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 8003E22C 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8003E230 28 03 00 00 */ cmplwi r3, 0 -/* 8003E234 41 82 00 6C */ beq lbl_8003E2A0 -/* 8003E238 88 1E 00 30 */ lbz r0, 0x30(r30) -/* 8003E23C 54 00 18 38 */ slwi r0, r0, 3 -/* 8003E240 7C 03 02 14 */ add r0, r3, r0 -/* 8003E244 90 1E 00 20 */ stw r0, 0x20(r30) -/* 8003E248 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 8003E24C 28 03 00 00 */ cmplwi r3, 0 -/* 8003E250 41 82 00 50 */ beq lbl_8003E2A0 -/* 8003E254 80 03 00 00 */ lwz r0, 0(r3) -/* 8003E258 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8003E25C 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 8003E260 28 00 00 00 */ cmplwi r0, 0 -/* 8003E264 41 82 00 3C */ beq lbl_8003E2A0 -lbl_8003E268: -/* 8003E268 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8003E26C 80 03 00 00 */ lwz r0, 0(r3) -/* 8003E270 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 8003E274 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 8003E278 28 00 00 00 */ cmplwi r0, 0 -/* 8003E27C 41 82 00 0C */ beq lbl_8003E288 -/* 8003E280 3B E0 00 01 */ li r31, 1 -/* 8003E284 48 00 00 1C */ b lbl_8003E2A0 -lbl_8003E288: -/* 8003E288 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8003E28C 80 03 00 04 */ lwz r0, 4(r3) -/* 8003E290 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8003E294 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 8003E298 28 00 00 00 */ cmplwi r0, 0 -/* 8003E29C 40 82 FF CC */ bne lbl_8003E268 -lbl_8003E2A0: -/* 8003E2A0 7F E3 FB 78 */ mr r3, r31 -/* 8003E2A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003E2A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003E2AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E2B0 7C 08 03 A6 */ mtlr r0 -/* 8003E2B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E2B8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getFirstRoomData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getFirstRoomData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index a966c7d894..0000000000 --- a/asm/d/map/d_map_path_fmap/getFirstRoomData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003E350: -/* 8003E350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E354 7C 08 02 A6 */ mflr r0 -/* 8003E358 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E35C 80 83 00 14 */ lwz r4, 0x14(r3) -/* 8003E360 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8003E364 90 03 00 18 */ stw r0, 0x18(r3) -/* 8003E368 4B FF FE 59 */ bl getFirstData__22dMenuFmapIconPointer_cFv -/* 8003E36C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E370 7C 08 03 A6 */ mtlr r0 -/* 8003E374 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E378 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getNextData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getNextData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index d585e65a1d..0000000000 --- a/asm/d/map/d_map_path_fmap/getNextData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8003E3D8: -/* 8003E3D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E3DC 7C 08 02 A6 */ mflr r0 -/* 8003E3E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E3E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003E3E8 93 C1 00 08 */ stw r30, 8(r1) -/* 8003E3EC 7C 7E 1B 78 */ mr r30, r3 -/* 8003E3F0 3B E0 00 01 */ li r31, 1 -/* 8003E3F4 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E3F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003E3FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003E400 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E404 48 32 A5 91 */ bl strcmp -/* 8003E408 2C 03 00 00 */ cmpwi r3, 0 -/* 8003E40C 40 82 00 30 */ bne lbl_8003E43C -/* 8003E410 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 8003E414 28 03 00 00 */ cmplwi r3, 0 -/* 8003E418 41 82 00 5C */ beq lbl_8003E474 -/* 8003E41C 48 05 DF 81 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c -/* 8003E420 90 7E 00 28 */ stw r3, 0x28(r30) -/* 8003E424 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 8003E428 28 00 00 00 */ cmplwi r0, 0 -/* 8003E42C 41 82 00 48 */ beq lbl_8003E474 -/* 8003E430 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 8003E434 3B E0 00 00 */ li r31, 0 -/* 8003E438 48 00 00 3C */ b lbl_8003E474 -lbl_8003E43C: -/* 8003E43C 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8003E440 28 03 00 00 */ cmplwi r3, 0 -/* 8003E444 41 82 00 30 */ beq lbl_8003E474 -/* 8003E448 80 03 00 04 */ lwz r0, 4(r3) -/* 8003E44C 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8003E450 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8003E454 28 03 00 00 */ cmplwi r3, 0 -/* 8003E458 41 82 00 1C */ beq lbl_8003E474 -/* 8003E45C 80 03 00 00 */ lwz r0, 0(r3) -/* 8003E460 90 1E 00 2C */ stw r0, 0x2c(r30) -/* 8003E464 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 8003E468 28 00 00 00 */ cmplwi r0, 0 -/* 8003E46C 41 82 00 08 */ beq lbl_8003E474 -/* 8003E470 3B E0 00 00 */ li r31, 0 -lbl_8003E474: -/* 8003E474 7F E3 FB 78 */ mr r3, r31 -/* 8003E478 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003E47C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003E480 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E484 7C 08 03 A6 */ mtlr r0 -/* 8003E488 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E48C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getNextRoomData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getNextRoomData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index 7d8d8699c8..0000000000 --- a/asm/d/map/d_map_path_fmap/getNextRoomData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003E37C: -/* 8003E37C 38 A0 00 00 */ li r5, 0 -/* 8003E380 80 83 00 18 */ lwz r4, 0x18(r3) -/* 8003E384 80 04 00 08 */ lwz r0, 8(r4) -/* 8003E388 90 03 00 18 */ stw r0, 0x18(r3) -/* 8003E38C 80 03 00 18 */ lwz r0, 0x18(r3) -/* 8003E390 28 00 00 00 */ cmplwi r0, 0 -/* 8003E394 40 82 00 08 */ bne lbl_8003E39C -/* 8003E398 38 A0 00 01 */ li r5, 1 -lbl_8003E39C: -/* 8003E39C 7C A3 2B 78 */ mr r3, r5 -/* 8003E3A0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getNextStageData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getNextStageData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index cd56a9b20d..0000000000 --- a/asm/d/map/d_map_path_fmap/getNextStageData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8003E3A4: -/* 8003E3A4 38 A0 00 00 */ li r5, 0 -/* 8003E3A8 80 83 00 00 */ lwz r4, 0(r3) -/* 8003E3AC 38 04 00 01 */ addi r0, r4, 1 -/* 8003E3B0 90 03 00 00 */ stw r0, 0(r3) -/* 8003E3B4 80 83 00 14 */ lwz r4, 0x14(r3) -/* 8003E3B8 80 04 00 10 */ lwz r0, 0x10(r4) -/* 8003E3BC 90 03 00 14 */ stw r0, 0x14(r3) -/* 8003E3C0 80 03 00 14 */ lwz r0, 0x14(r3) -/* 8003E3C4 28 00 00 00 */ cmplwi r0, 0 -/* 8003E3C8 40 82 00 08 */ bne lbl_8003E3D0 -/* 8003E3CC 38 A0 00 01 */ li r5, 1 -lbl_8003E3D0: -/* 8003E3D0 7C A3 2B 78 */ mr r3, r5 -/* 8003E3D4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi.s b/asm/d/map/d_map_path_fmap/getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi.s deleted file mode 100644 index 8250ef2e88..0000000000 --- a/asm/d/map/d_map_path_fmap/getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi.s +++ /dev/null @@ -1,244 +0,0 @@ -lbl_8003DB70: -/* 8003DB70 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 8003DB74 7C 08 02 A6 */ mflr r0 -/* 8003DB78 90 01 01 04 */ stw r0, 0x104(r1) -/* 8003DB7C DB E1 00 F0 */ stfd f31, 0xf0(r1) -/* 8003DB80 F3 E1 00 F8 */ psq_st f31, 248(r1), 0, 0 /* qr0 */ -/* 8003DB84 DB C1 00 E0 */ stfd f30, 0xe0(r1) -/* 8003DB88 F3 C1 00 E8 */ psq_st f30, 232(r1), 0, 0 /* qr0 */ -/* 8003DB8C DB A1 00 D0 */ stfd f29, 0xd0(r1) -/* 8003DB90 F3 A1 00 D8 */ psq_st f29, 216(r1), 0, 0 /* qr0 */ -/* 8003DB94 DB 81 00 C0 */ stfd f28, 0xc0(r1) -/* 8003DB98 F3 81 00 C8 */ psq_st f28, 200(r1), 0, 0 /* qr0 */ -/* 8003DB9C DB 61 00 B0 */ stfd f27, 0xb0(r1) -/* 8003DBA0 F3 61 00 B8 */ psq_st f27, 184(r1), 0, 0 /* qr0 */ -/* 8003DBA4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8003DBA8 48 32 45 F9 */ bl _savegpr_14 -/* 8003DBAC 7C 6F 1B 78 */ mr r15, r3 -/* 8003DBB0 FF A0 08 90 */ fmr f29, f1 -/* 8003DBB4 FF C0 10 90 */ fmr f30, f2 -/* 8003DBB8 90 81 00 08 */ stw r4, 8(r1) -/* 8003DBBC 90 A1 00 0C */ stw r5, 0xc(r1) -/* 8003DBC0 90 C1 00 10 */ stw r6, 0x10(r1) -/* 8003DBC4 3A A0 00 00 */ li r21, 0 -/* 8003DBC8 38 00 FF FF */ li r0, -1 -/* 8003DBCC 90 01 00 44 */ stw r0, 0x44(r1) -/* 8003DBD0 38 00 FF FF */ li r0, -1 -/* 8003DBD4 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8003DBD8 C0 02 84 20 */ lfs f0, lit_3894(r2) -/* 8003DBDC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8003DBE0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8003DBE4 83 03 00 00 */ lwz r24, 0(r3) -/* 8003DBE8 48 00 02 7C */ b lbl_8003DE64 -lbl_8003DBEC: -/* 8003DBEC 80 78 00 08 */ lwz r3, 8(r24) -/* 8003DBF0 28 03 00 00 */ cmplwi r3, 0 -/* 8003DBF4 41 82 02 68 */ beq lbl_8003DE5C -/* 8003DBF8 88 03 00 02 */ lbz r0, 2(r3) -/* 8003DBFC 90 01 00 38 */ stw r0, 0x38(r1) -/* 8003DC00 83 38 00 0C */ lwz r25, 0xc(r24) -/* 8003DC04 48 00 02 50 */ b lbl_8003DE54 -lbl_8003DC08: -/* 8003DC08 80 01 00 08 */ lwz r0, 8(r1) -/* 8003DC0C 7C 00 A8 00 */ cmpw r0, r21 -/* 8003DC10 41 82 00 14 */ beq lbl_8003DC24 -/* 8003DC14 7F 03 C3 78 */ mr r3, r24 -/* 8003DC18 4B FF FD 45 */ bl isArrival__23dMenu_Fmap_stage_data_cFv -/* 8003DC1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003DC20 41 82 02 30 */ beq lbl_8003DE50 -lbl_8003DC24: -/* 8003DC24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003DC28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003DC2C 80 81 00 38 */ lwz r4, 0x38(r1) -/* 8003DC30 4B FF 74 79 */ bl getSave2__10dSv_save_cFi -/* 8003DC34 88 99 00 10 */ lbz r4, 0x10(r25) -/* 8003DC38 4B FF 6E B5 */ bl isVisitedRoom__13dSv_memory2_cFi -/* 8003DC3C 2C 03 00 00 */ cmpwi r3, 0 -/* 8003DC40 41 82 02 10 */ beq lbl_8003DE50 -/* 8003DC44 C0 2F 00 08 */ lfs f1, 8(r15) -/* 8003DC48 C0 18 00 14 */ lfs f0, 0x14(r24) -/* 8003DC4C EF E1 00 2A */ fadds f31, f1, f0 -/* 8003DC50 C0 2F 00 0C */ lfs f1, 0xc(r15) -/* 8003DC54 C0 18 00 18 */ lfs f0, 0x18(r24) -/* 8003DC58 EF 61 00 2A */ fadds f27, f1, f0 -/* 8003DC5C 80 79 00 00 */ lwz r3, 0(r25) -/* 8003DC60 28 03 00 00 */ cmplwi r3, 0 -/* 8003DC64 41 82 01 EC */ beq lbl_8003DE50 -/* 8003DC68 80 63 00 08 */ lwz r3, 8(r3) -/* 8003DC6C 28 03 00 00 */ cmplwi r3, 0 -/* 8003DC70 41 82 01 E0 */ beq lbl_8003DE50 -/* 8003DC74 83 63 00 04 */ lwz r27, 4(r3) -/* 8003DC78 83 43 00 08 */ lwz r26, 8(r3) -/* 8003DC7C 28 1B 00 00 */ cmplwi r27, 0 -/* 8003DC80 41 82 01 D0 */ beq lbl_8003DE50 -/* 8003DC84 3A 60 00 00 */ li r19, 0 -/* 8003DC88 88 03 00 00 */ lbz r0, 0(r3) -/* 8003DC8C 90 01 00 48 */ stw r0, 0x48(r1) -/* 8003DC90 3A 40 00 00 */ li r18, 0 -/* 8003DC94 38 01 00 34 */ addi r0, r1, 0x34 -/* 8003DC98 90 01 00 58 */ stw r0, 0x58(r1) -/* 8003DC9C 38 01 00 28 */ addi r0, r1, 0x28 -/* 8003DCA0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8003DCA4 38 01 00 18 */ addi r0, r1, 0x18 -/* 8003DCA8 90 01 00 50 */ stw r0, 0x50(r1) -/* 8003DCAC 48 00 01 90 */ b lbl_8003DE3C -lbl_8003DCB0: -/* 8003DCB0 88 1B 00 01 */ lbz r0, 1(r27) -/* 8003DCB4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8003DCB8 83 9B 00 04 */ lwz r28, 4(r27) -/* 8003DCBC 28 1C 00 00 */ cmplwi r28, 0 -/* 8003DCC0 41 82 01 74 */ beq lbl_8003DE34 -/* 8003DCC4 3A 20 00 00 */ li r17, 0 -/* 8003DCC8 48 00 01 58 */ b lbl_8003DE20 -lbl_8003DCCC: -/* 8003DCCC 89 DC 00 02 */ lbz r14, 2(r28) -/* 8003DCD0 2C 0E 00 00 */ cmpwi r14, 0 -/* 8003DCD4 40 81 01 44 */ ble lbl_8003DE18 -/* 8003DCD8 83 BC 00 08 */ lwz r29, 8(r28) -/* 8003DCDC 28 1D 00 00 */ cmplwi r29, 0 -/* 8003DCE0 41 82 01 38 */ beq lbl_8003DE18 -/* 8003DCE4 3A 00 00 00 */ li r16, 0 -/* 8003DCE8 48 00 01 20 */ b lbl_8003DE08 -lbl_8003DCEC: -/* 8003DCEC 88 1D 00 01 */ lbz r0, 1(r29) -/* 8003DCF0 28 00 00 03 */ cmplwi r0, 3 -/* 8003DCF4 40 82 01 0C */ bne lbl_8003DE00 -/* 8003DCF8 8A FD 00 02 */ lbz r23, 2(r29) -/* 8003DCFC 2C 17 00 03 */ cmpwi r23, 3 -/* 8003DD00 41 80 01 00 */ blt lbl_8003DE00 -/* 8003DD04 3A 80 00 00 */ li r20, 0 -/* 8003DD08 83 DD 00 04 */ lwz r30, 4(r29) -/* 8003DD0C A0 1E 00 00 */ lhz r0, 0(r30) -/* 8003DD10 54 00 18 38 */ slwi r0, r0, 3 -/* 8003DD14 7C 7A 02 14 */ add r3, r26, r0 -/* 8003DD18 A0 1E 00 02 */ lhz r0, 2(r30) -/* 8003DD1C 54 00 18 38 */ slwi r0, r0, 3 -/* 8003DD20 7F FA 02 14 */ add r31, r26, r0 -/* 8003DD24 3A C0 00 02 */ li r22, 2 -/* 8003DD28 C3 82 84 20 */ lfs f28, lit_3894(r2) -/* 8003DD2C 3B DE 00 04 */ addi r30, r30, 4 -lbl_8003DD30: -/* 8003DD30 C0 03 00 00 */ lfs f0, 0(r3) -/* 8003DD34 EC 00 F8 2A */ fadds f0, f0, f31 -/* 8003DD38 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 8003DD3C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8003DD40 C0 03 00 04 */ lfs f0, 4(r3) -/* 8003DD44 EC 00 D8 2A */ fadds f0, f0, f27 -/* 8003DD48 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 8003DD4C 80 61 00 58 */ lwz r3, 0x58(r1) -/* 8003DD50 D0 03 00 00 */ stfs f0, 0(r3) -/* 8003DD54 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8003DD58 EC 00 F8 2A */ fadds f0, f0, f31 -/* 8003DD5C EC 00 E8 28 */ fsubs f0, f0, f29 -/* 8003DD60 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8003DD64 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8003DD68 EC 00 D8 2A */ fadds f0, f0, f27 -/* 8003DD6C EC 00 F0 28 */ fsubs f0, f0, f30 -/* 8003DD70 80 61 00 54 */ lwz r3, 0x54(r1) -/* 8003DD74 D0 03 00 00 */ stfs f0, 0(r3) -/* 8003DD78 38 61 00 2C */ addi r3, r1, 0x2c -/* 8003DD7C 38 81 00 20 */ addi r4, r1, 0x20 -/* 8003DD80 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8003DD84 48 30 94 31 */ bl PSVECCrossProduct -/* 8003DD88 80 61 00 50 */ lwz r3, 0x50(r1) -/* 8003DD8C C0 03 00 00 */ lfs f0, 0(r3) -/* 8003DD90 FC 00 E0 40 */ fcmpo cr0, f0, f28 -/* 8003DD94 4C 41 13 82 */ cror 2, 1, 2 -/* 8003DD98 40 82 00 0C */ bne lbl_8003DDA4 -/* 8003DD9C 38 60 00 00 */ li r3, 0 -/* 8003DDA0 48 00 00 08 */ b lbl_8003DDA8 -lbl_8003DDA4: -/* 8003DDA4 38 60 FF FF */ li r3, -1 -lbl_8003DDA8: -/* 8003DDA8 2C 16 00 02 */ cmpwi r22, 2 -/* 8003DDAC 40 81 00 18 */ ble lbl_8003DDC4 -/* 8003DDB0 80 01 00 40 */ lwz r0, 0x40(r1) -/* 8003DDB4 7C 03 00 00 */ cmpw r3, r0 -/* 8003DDB8 41 82 00 0C */ beq lbl_8003DDC4 -/* 8003DDBC 3A 80 00 01 */ li r20, 1 -/* 8003DDC0 48 00 00 28 */ b lbl_8003DDE8 -lbl_8003DDC4: -/* 8003DDC4 90 61 00 40 */ stw r3, 0x40(r1) -/* 8003DDC8 7F E3 FB 78 */ mr r3, r31 -/* 8003DDCC A0 1E 00 00 */ lhz r0, 0(r30) -/* 8003DDD0 54 00 18 38 */ slwi r0, r0, 3 -/* 8003DDD4 7F FA 02 14 */ add r31, r26, r0 -/* 8003DDD8 3A D6 00 01 */ addi r22, r22, 1 -/* 8003DDDC 7C 16 B8 00 */ cmpw r22, r23 -/* 8003DDE0 3B DE 00 02 */ addi r30, r30, 2 -/* 8003DDE4 40 81 FF 4C */ ble lbl_8003DD30 -lbl_8003DDE8: -/* 8003DDE8 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 8003DDEC 40 82 00 14 */ bne lbl_8003DE00 -/* 8003DDF0 3A 60 00 01 */ li r19, 1 -/* 8003DDF4 92 A1 00 44 */ stw r21, 0x44(r1) -/* 8003DDF8 88 19 00 10 */ lbz r0, 0x10(r25) -/* 8003DDFC 90 01 00 3C */ stw r0, 0x3c(r1) -lbl_8003DE00: -/* 8003DE00 3A 10 00 01 */ addi r16, r16, 1 -/* 8003DE04 3B BD 00 08 */ addi r29, r29, 8 -lbl_8003DE08: -/* 8003DE08 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 8003DE0C 40 82 00 0C */ bne lbl_8003DE18 -/* 8003DE10 7C 10 70 00 */ cmpw r16, r14 -/* 8003DE14 41 80 FE D8 */ blt lbl_8003DCEC -lbl_8003DE18: -/* 8003DE18 3A 31 00 01 */ addi r17, r17, 1 -/* 8003DE1C 3B 9C 00 14 */ addi r28, r28, 0x14 -lbl_8003DE20: -/* 8003DE20 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 8003DE24 40 82 00 10 */ bne lbl_8003DE34 -/* 8003DE28 80 01 00 4C */ lwz r0, 0x4c(r1) -/* 8003DE2C 7C 11 00 00 */ cmpw r17, r0 -/* 8003DE30 41 80 FE 9C */ blt lbl_8003DCCC -lbl_8003DE34: -/* 8003DE34 3A 52 00 01 */ addi r18, r18, 1 -/* 8003DE38 3B 7B 00 08 */ addi r27, r27, 8 -lbl_8003DE3C: -/* 8003DE3C 56 60 06 3F */ clrlwi. r0, r19, 0x18 -/* 8003DE40 40 82 00 10 */ bne lbl_8003DE50 -/* 8003DE44 80 01 00 48 */ lwz r0, 0x48(r1) -/* 8003DE48 7C 12 00 00 */ cmpw r18, r0 -/* 8003DE4C 41 80 FE 64 */ blt lbl_8003DCB0 -lbl_8003DE50: -/* 8003DE50 83 39 00 08 */ lwz r25, 8(r25) -lbl_8003DE54: -/* 8003DE54 28 19 00 00 */ cmplwi r25, 0 -/* 8003DE58 40 82 FD B0 */ bne lbl_8003DC08 -lbl_8003DE5C: -/* 8003DE5C 83 18 00 10 */ lwz r24, 0x10(r24) -/* 8003DE60 3A B5 00 01 */ addi r21, r21, 1 -lbl_8003DE64: -/* 8003DE64 28 18 00 00 */ cmplwi r24, 0 -/* 8003DE68 40 82 FD 84 */ bne lbl_8003DBEC -/* 8003DE6C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8003DE70 28 00 00 00 */ cmplwi r0, 0 -/* 8003DE74 41 82 00 10 */ beq lbl_8003DE84 -/* 8003DE78 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8003DE7C 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8003DE80 90 03 00 00 */ stw r0, 0(r3) -lbl_8003DE84: -/* 8003DE84 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8003DE88 28 00 00 00 */ cmplwi r0, 0 -/* 8003DE8C 41 82 00 10 */ beq lbl_8003DE9C -/* 8003DE90 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8003DE94 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8003DE98 90 03 00 00 */ stw r0, 0(r3) -lbl_8003DE9C: -/* 8003DE9C 38 60 00 01 */ li r3, 1 -/* 8003DEA0 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, 0 /* qr0 */ -/* 8003DEA4 CB E1 00 F0 */ lfd f31, 0xf0(r1) -/* 8003DEA8 E3 C1 00 E8 */ psq_l f30, 232(r1), 0, 0 /* qr0 */ -/* 8003DEAC CB C1 00 E0 */ lfd f30, 0xe0(r1) -/* 8003DEB0 E3 A1 00 D8 */ psq_l f29, 216(r1), 0, 0 /* qr0 */ -/* 8003DEB4 CB A1 00 D0 */ lfd f29, 0xd0(r1) -/* 8003DEB8 E3 81 00 C8 */ psq_l f28, 200(r1), 0, 0 /* qr0 */ -/* 8003DEBC CB 81 00 C0 */ lfd f28, 0xc0(r1) -/* 8003DEC0 E3 61 00 B8 */ psq_l f27, 184(r1), 0, 0 /* qr0 */ -/* 8003DEC4 CB 61 00 B0 */ lfd f27, 0xb0(r1) -/* 8003DEC8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8003DECC 48 32 43 21 */ bl _restgpr_14 -/* 8003DED0 80 01 01 04 */ lwz r0, 0x104(r1) -/* 8003DED4 7C 08 03 A6 */ mtlr r0 -/* 8003DED8 38 21 01 00 */ addi r1, r1, 0x100 -/* 8003DEDC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s.s b/asm/d/map/d_map_path_fmap/getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s.s deleted file mode 100644 index afd0e4d9a3..0000000000 --- a/asm/d/map/d_map_path_fmap/getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_8003E578: -/* 8003E578 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8003E57C 7C 08 02 A6 */ mflr r0 -/* 8003E580 90 01 00 44 */ stw r0, 0x44(r1) -/* 8003E584 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8003E588 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8003E58C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8003E590 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8003E594 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E598 48 32 3C 41 */ bl _savegpr_28 -/* 8003E59C 7C 7C 1B 78 */ mr r28, r3 -/* 8003E5A0 7C DD 33 79 */ or. r29, r6, r6 -/* 8003E5A4 7C FE 3B 78 */ mr r30, r7 -/* 8003E5A8 7D 1F 43 78 */ mr r31, r8 -/* 8003E5AC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003E5B0 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8003E5B4 80 DC 00 10 */ lwz r6, 0x10(r28) -/* 8003E5B8 C0 26 00 08 */ lfs f1, 8(r6) -/* 8003E5BC EF E1 00 2A */ fadds f31, f1, f0 -/* 8003E5C0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8003E5C4 C0 26 00 0C */ lfs f1, 0xc(r6) -/* 8003E5C8 EF C1 00 2A */ fadds f30, f1, f0 -/* 8003E5CC 41 82 00 0C */ beq lbl_8003E5D8 -/* 8003E5D0 C0 02 84 20 */ lfs f0, lit_3894(r2) -/* 8003E5D4 D0 1D 00 00 */ stfs f0, 0(r29) -lbl_8003E5D8: -/* 8003E5D8 28 1E 00 00 */ cmplwi r30, 0 -/* 8003E5DC 41 82 00 0C */ beq lbl_8003E5E8 -/* 8003E5E0 C0 02 84 20 */ lfs f0, lit_3894(r2) -/* 8003E5E4 D0 1E 00 00 */ stfs f0, 0(r30) -lbl_8003E5E8: -/* 8003E5E8 28 04 00 00 */ cmplwi r4, 0 -/* 8003E5EC 41 82 00 0C */ beq lbl_8003E5F8 -/* 8003E5F0 80 1C 00 00 */ lwz r0, 0(r28) -/* 8003E5F4 90 04 00 00 */ stw r0, 0(r4) -lbl_8003E5F8: -/* 8003E5F8 28 05 00 00 */ cmplwi r5, 0 -/* 8003E5FC 41 82 00 10 */ beq lbl_8003E60C -/* 8003E600 80 7C 00 18 */ lwz r3, 0x18(r28) -/* 8003E604 88 03 00 10 */ lbz r0, 0x10(r3) -/* 8003E608 90 05 00 00 */ stw r0, 0(r5) -lbl_8003E60C: -/* 8003E60C 80 7C 00 14 */ lwz r3, 0x14(r28) -/* 8003E610 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003E614 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003E618 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E61C 48 32 A3 79 */ bl strcmp -/* 8003E620 2C 03 00 00 */ cmpwi r3, 0 -/* 8003E624 40 82 00 50 */ bne lbl_8003E674 -/* 8003E628 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 8003E62C 28 00 00 00 */ cmplwi r0, 0 -/* 8003E630 41 82 00 8C */ beq lbl_8003E6BC -/* 8003E634 28 1F 00 00 */ cmplwi r31, 0 -/* 8003E638 41 82 00 08 */ beq lbl_8003E640 -/* 8003E63C 90 1F 00 00 */ stw r0, 0(r31) -lbl_8003E640: -/* 8003E640 28 1D 00 00 */ cmplwi r29, 0 -/* 8003E644 41 82 00 14 */ beq lbl_8003E658 -/* 8003E648 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8003E64C C0 03 00 04 */ lfs f0, 4(r3) -/* 8003E650 EC 1F 00 2A */ fadds f0, f31, f0 -/* 8003E654 D0 1D 00 00 */ stfs f0, 0(r29) -lbl_8003E658: -/* 8003E658 28 1E 00 00 */ cmplwi r30, 0 -/* 8003E65C 41 82 00 60 */ beq lbl_8003E6BC -/* 8003E660 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8003E664 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8003E668 EC 1E 00 2A */ fadds f0, f30, f0 -/* 8003E66C D0 1E 00 00 */ stfs f0, 0(r30) -/* 8003E670 48 00 00 4C */ b lbl_8003E6BC -lbl_8003E674: -/* 8003E674 80 1C 00 2C */ lwz r0, 0x2c(r28) -/* 8003E678 28 00 00 00 */ cmplwi r0, 0 -/* 8003E67C 41 82 00 40 */ beq lbl_8003E6BC -/* 8003E680 28 1F 00 00 */ cmplwi r31, 0 -/* 8003E684 41 82 00 08 */ beq lbl_8003E68C -/* 8003E688 90 1F 00 00 */ stw r0, 0(r31) -lbl_8003E68C: -/* 8003E68C 28 1D 00 00 */ cmplwi r29, 0 -/* 8003E690 41 82 00 14 */ beq lbl_8003E6A4 -/* 8003E694 80 7C 00 2C */ lwz r3, 0x2c(r28) -/* 8003E698 C0 03 00 04 */ lfs f0, 4(r3) -/* 8003E69C EC 1F 00 2A */ fadds f0, f31, f0 -/* 8003E6A0 D0 1D 00 00 */ stfs f0, 0(r29) -lbl_8003E6A4: -/* 8003E6A4 28 1E 00 00 */ cmplwi r30, 0 -/* 8003E6A8 41 82 00 14 */ beq lbl_8003E6BC -/* 8003E6AC 80 7C 00 2C */ lwz r3, 0x2c(r28) -/* 8003E6B0 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8003E6B4 EC 1E 00 2A */ fadds f0, f30, f0 -/* 8003E6B8 D0 1E 00 00 */ stfs f0, 0(r30) -lbl_8003E6BC: -/* 8003E6BC 38 60 00 00 */ li r3, 0 -/* 8003E6C0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8003E6C4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8003E6C8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8003E6CC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8003E6D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E6D4 48 32 3B 51 */ bl _restgpr_28 -/* 8003E6D8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8003E6DC 7C 08 03 A6 */ mtlr r0 -/* 8003E6E0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003E6E4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/getValidData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/getValidData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index 78850c1f3a..0000000000 --- a/asm/d/map/d_map_path_fmap/getValidData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8003E510: -/* 8003E510 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003E514 7C 08 02 A6 */ mflr r0 -/* 8003E518 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003E51C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E520 48 32 3C BD */ bl _savegpr_29 -/* 8003E524 7C 7D 1B 78 */ mr r29, r3 -/* 8003E528 3B C0 00 00 */ li r30, 0 -lbl_8003E52C: -/* 8003E52C 7F A3 EB 78 */ mr r3, r29 -/* 8003E530 4B FF FD 8D */ bl getData__22dMenuFmapIconPointer_cFv -/* 8003E534 7C 7F 1B 78 */ mr r31, r3 -/* 8003E538 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003E53C 40 82 00 10 */ bne lbl_8003E54C -/* 8003E540 7F A3 EB 78 */ mr r3, r29 -/* 8003E544 4B FF FF 4D */ bl nextData__22dMenuFmapIconPointer_cFv -/* 8003E548 7C 7E 1B 78 */ mr r30, r3 -lbl_8003E54C: -/* 8003E54C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8003E550 40 82 00 0C */ bne lbl_8003E55C -/* 8003E554 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 8003E558 41 82 FF D4 */ beq lbl_8003E52C -lbl_8003E55C: -/* 8003E55C 7F C3 F3 78 */ mr r3, r30 -/* 8003E560 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E564 48 32 3C C5 */ bl _restgpr_29 -/* 8003E568 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003E56C 7C 08 03 A6 */ mtlr r0 -/* 8003E570 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003E574 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii.s b/asm/d/map/d_map_path_fmap/init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii.s deleted file mode 100644 index bfc83b120e..0000000000 --- a/asm/d/map/d_map_path_fmap/init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8003E114: -/* 8003E114 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003E118 7C 08 02 A6 */ mflr r0 -/* 8003E11C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003E120 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E124 48 32 40 AD */ bl _savegpr_26 -/* 8003E128 7C 7A 1B 78 */ mr r26, r3 -/* 8003E12C 7C 9B 23 78 */ mr r27, r4 -/* 8003E130 7C BC 2B 78 */ mr r28, r5 -/* 8003E134 7C DD 33 78 */ mr r29, r6 -/* 8003E138 7C FE 3B 78 */ mr r30, r7 -/* 8003E13C 7D 1F 43 78 */ mr r31, r8 -/* 8003E140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003E144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003E148 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8003E14C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8003E150 7D 89 03 A6 */ mtctr r12 -/* 8003E154 4E 80 04 21 */ bctrl -/* 8003E158 28 03 00 00 */ cmplwi r3, 0 -/* 8003E15C 40 82 00 0C */ bne lbl_8003E168 -/* 8003E160 38 60 00 00 */ li r3, 0 -/* 8003E164 48 00 00 44 */ b lbl_8003E1A8 -lbl_8003E168: -/* 8003E168 88 03 00 09 */ lbz r0, 9(r3) -/* 8003E16C 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8003E170 90 1A 00 0C */ stw r0, 0xc(r26) -/* 8003E174 93 7A 00 10 */ stw r27, 0x10(r26) -/* 8003E178 93 9A 00 14 */ stw r28, 0x14(r26) -/* 8003E17C 7F A3 EB 78 */ mr r3, r29 -/* 8003E180 48 05 E3 1D */ bl getTypeGroupNoToType__7dTres_cFUc -/* 8003E184 98 7A 00 31 */ stb r3, 0x31(r26) -/* 8003E188 9B BA 00 30 */ stb r29, 0x30(r26) -/* 8003E18C 93 DA 00 04 */ stw r30, 4(r26) -/* 8003E190 93 FA 00 08 */ stw r31, 8(r26) -/* 8003E194 38 00 00 00 */ li r0, 0 -/* 8003E198 90 1A 00 00 */ stw r0, 0(r26) -/* 8003E19C 7F 43 D3 78 */ mr r3, r26 -/* 8003E1A0 48 00 01 B1 */ bl getFirstRoomData__22dMenuFmapIconPointer_cFv -/* 8003E1A4 38 60 00 01 */ li r3, 1 -lbl_8003E1A8: -/* 8003E1A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E1AC 48 32 40 71 */ bl _restgpr_26 -/* 8003E1B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003E1B4 7C 08 03 A6 */ mtlr r0 -/* 8003E1B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003E1BC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/isArrival__23dMenu_Fmap_stage_data_cFv.s b/asm/d/map/d_map_path_fmap/isArrival__23dMenu_Fmap_stage_data_cFv.s deleted file mode 100644 index d127e7d74b..0000000000 --- a/asm/d/map/d_map_path_fmap/isArrival__23dMenu_Fmap_stage_data_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8003D95C: -/* 8003D95C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003D960 7C 08 02 A6 */ mflr r0 -/* 8003D964 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003D968 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D96C 48 32 48 71 */ bl _savegpr_29 -/* 8003D970 38 80 00 00 */ li r4, 0 -/* 8003D974 83 C3 00 0C */ lwz r30, 0xc(r3) -/* 8003D978 80 63 00 08 */ lwz r3, 8(r3) -/* 8003D97C 8B A3 00 02 */ lbz r29, 2(r3) -/* 8003D980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003D984 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003D988 48 00 00 24 */ b lbl_8003D9AC -lbl_8003D98C: -/* 8003D98C 7F E3 FB 78 */ mr r3, r31 -/* 8003D990 7F A4 EB 78 */ mr r4, r29 -/* 8003D994 4B FF 77 15 */ bl getSave2__10dSv_save_cFi -/* 8003D998 88 9E 00 10 */ lbz r4, 0x10(r30) -/* 8003D99C 4B FF 71 51 */ bl isVisitedRoom__13dSv_memory2_cFi -/* 8003D9A0 30 03 FF FF */ addic r0, r3, -1 -/* 8003D9A4 7C 80 19 10 */ subfe r4, r0, r3 -/* 8003D9A8 83 DE 00 08 */ lwz r30, 8(r30) -lbl_8003D9AC: -/* 8003D9AC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8003D9B0 40 82 00 0C */ bne lbl_8003D9BC -/* 8003D9B4 28 1E 00 00 */ cmplwi r30, 0 -/* 8003D9B8 40 82 FF D4 */ bne lbl_8003D98C -lbl_8003D9BC: -/* 8003D9BC 7C 83 23 78 */ mr r3, r4 -/* 8003D9C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D9C4 48 32 48 65 */ bl _restgpr_29 -/* 8003D9C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003D9CC 7C 08 03 A6 */ mtlr r0 -/* 8003D9D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003D9D4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_fmap/nextData__22dMenuFmapIconPointer_cFv.s b/asm/d/map/d_map_path_fmap/nextData__22dMenuFmapIconPointer_cFv.s deleted file mode 100644 index e88006c15e..0000000000 --- a/asm/d/map/d_map_path_fmap/nextData__22dMenuFmapIconPointer_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8003E490: -/* 8003E490 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003E494 7C 08 02 A6 */ mflr r0 -/* 8003E498 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003E49C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003E4A0 93 C1 00 08 */ stw r30, 8(r1) -/* 8003E4A4 7C 7E 1B 78 */ mr r30, r3 -/* 8003E4A8 3B E0 00 00 */ li r31, 0 -/* 8003E4AC 4B FF FF 2D */ bl getNextData__22dMenuFmapIconPointer_cFv -/* 8003E4B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003E4B4 41 82 00 40 */ beq lbl_8003E4F4 -/* 8003E4B8 7F C3 F3 78 */ mr r3, r30 -/* 8003E4BC 4B FF FE C1 */ bl getNextRoomData__22dMenuFmapIconPointer_cFv -/* 8003E4C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003E4C4 41 82 00 28 */ beq lbl_8003E4EC -/* 8003E4C8 7F C3 F3 78 */ mr r3, r30 -/* 8003E4CC 4B FF FE D9 */ bl getNextStageData__22dMenuFmapIconPointer_cFv -/* 8003E4D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003E4D4 41 82 00 0C */ beq lbl_8003E4E0 -/* 8003E4D8 3B E0 00 01 */ li r31, 1 -/* 8003E4DC 48 00 00 18 */ b lbl_8003E4F4 -lbl_8003E4E0: -/* 8003E4E0 7F C3 F3 78 */ mr r3, r30 -/* 8003E4E4 4B FF FE 6D */ bl getFirstRoomData__22dMenuFmapIconPointer_cFv -/* 8003E4E8 48 00 00 0C */ b lbl_8003E4F4 -lbl_8003E4EC: -/* 8003E4EC 7F C3 F3 78 */ mr r3, r30 -/* 8003E4F0 4B FF FC D1 */ bl getFirstData__22dMenuFmapIconPointer_cFv -lbl_8003E4F4: -/* 8003E4F4 7F E3 FB 78 */ mr r3, r31 -/* 8003E4F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003E4FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003E500 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003E504 7C 08 03 A6 */ mtlr r0 -/* 8003E508 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E50C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/__ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc.s b/asm/d/menu/d_menu_fmap/__ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc.s deleted file mode 100644 index c90d4120e3..0000000000 --- a/asm/d/menu/d_menu_fmap/__ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc.s +++ /dev/null @@ -1,267 +0,0 @@ -lbl_801C66E4: -/* 801C66E4 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801C66E8 7C 08 02 A6 */ mflr r0 -/* 801C66EC 90 01 00 54 */ stw r0, 0x54(r1) -/* 801C66F0 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 801C66F4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 801C66F8 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 801C66FC F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 801C6700 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6704 48 19 BA C5 */ bl _savegpr_24 -/* 801C6708 7C 7D 1B 78 */ mr r29, r3 -/* 801C670C 7C 98 23 78 */ mr r24, r4 -/* 801C6710 7C B9 2B 78 */ mr r25, r5 -/* 801C6714 7C DA 33 78 */ mr r26, r6 -/* 801C6718 7C FE 3B 78 */ mr r30, r7 -/* 801C671C 7D 1B 43 78 */ mr r27, r8 -/* 801C6720 7D 3C 4B 78 */ mr r28, r9 -/* 801C6724 FF C0 08 90 */ fmr f30, f1 -/* 801C6728 FF E0 10 90 */ fmr f31, f2 -/* 801C672C 7D 5F 53 78 */ mr r31, r10 -/* 801C6730 3C 60 80 3C */ lis r3, __vt__12dMenu_Fmap_c@ha /* 0x803BD664@ha */ -/* 801C6734 38 03 D6 64 */ addi r0, r3, __vt__12dMenu_Fmap_c@l /* 0x803BD664@l */ -/* 801C6738 90 1D 00 00 */ stw r0, 0(r29) -/* 801C673C 38 7D 00 C4 */ addi r3, r29, 0xc4 -/* 801C6740 48 08 37 C1 */ bl __ct__10dMsgFlow_cFv -/* 801C6744 93 AD 8B 2C */ stw r29, MyClass__12dMenu_Fmap_c(r13) -/* 801C6748 93 1D 00 04 */ stw r24, 4(r29) -/* 801C674C 93 3D 00 0C */ stw r25, 0xc(r29) -/* 801C6750 93 5D 00 10 */ stw r26, 0x10(r29) -/* 801C6754 38 60 00 FF */ li r3, 0xff -/* 801C6758 98 7D 03 08 */ stb r3, 0x308(r29) -/* 801C675C 38 80 00 00 */ li r4, 0 -/* 801C6760 98 9D 03 09 */ stb r4, 0x309(r29) -/* 801C6764 98 7D 03 0A */ stb r3, 0x30a(r29) -/* 801C6768 38 00 FF FF */ li r0, -1 -/* 801C676C 90 1D 02 04 */ stw r0, 0x204(r29) -/* 801C6770 90 1D 02 08 */ stw r0, 0x208(r29) -/* 801C6774 90 9D 00 C0 */ stw r4, 0xc0(r29) -/* 801C6778 98 9D 03 0E */ stb r4, 0x30e(r29) -/* 801C677C 98 9D 03 10 */ stb r4, 0x310(r29) -/* 801C6780 98 9D 03 12 */ stb r4, 0x312(r29) -/* 801C6784 98 9D 03 13 */ stb r4, 0x313(r29) -/* 801C6788 98 7D 03 11 */ stb r3, 0x311(r29) -/* 801C678C 90 1D 02 0C */ stw r0, 0x20c(r29) -/* 801C6790 98 9D 03 0B */ stb r4, 0x30b(r29) -/* 801C6794 98 9D 03 0F */ stb r4, 0x30f(r29) -/* 801C6798 9B 7D 03 0C */ stb r27, 0x30c(r29) -/* 801C679C 9B 9D 03 0D */ stb r28, 0x30d(r29) -/* 801C67A0 D3 DD 01 F0 */ stfs f30, 0x1f0(r29) -/* 801C67A4 D3 FD 01 F4 */ stfs f31, 0x1f4(r29) -/* 801C67A8 90 9D 00 1C */ stw r4, 0x1c(r29) -/* 801C67AC 90 9D 00 68 */ stw r4, 0x68(r29) -/* 801C67B0 90 9D 00 14 */ stw r4, 0x14(r29) -/* 801C67B4 90 9D 00 18 */ stw r4, 0x18(r29) -/* 801C67B8 90 9D 00 B8 */ stw r4, 0xb8(r29) -/* 801C67BC 90 9D 00 8C */ stw r4, 0x8c(r29) -/* 801C67C0 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C67C4 D0 1D 01 A8 */ stfs f0, 0x1a8(r29) -/* 801C67C8 90 9D 00 BC */ stw r4, 0xbc(r29) -/* 801C67CC 90 9D 00 90 */ stw r4, 0x90(r29) -/* 801C67D0 90 9D 00 20 */ stw r4, 0x20(r29) -/* 801C67D4 90 9D 00 B4 */ stw r4, 0xb4(r29) -/* 801C67D8 98 9D 03 03 */ stb r4, 0x303(r29) -/* 801C67DC 7C 83 23 78 */ mr r3, r4 -/* 801C67E0 38 00 00 08 */ li r0, 8 -/* 801C67E4 7C 09 03 A6 */ mtctr r0 -lbl_801C67E8: -/* 801C67E8 38 03 00 24 */ addi r0, r3, 0x24 -/* 801C67EC 7C 9D 01 2E */ stwx r4, r29, r0 -/* 801C67F0 38 03 00 44 */ addi r0, r3, 0x44 -/* 801C67F4 7C 9D 01 2E */ stwx r4, r29, r0 -/* 801C67F8 38 03 00 6C */ addi r0, r3, 0x6c -/* 801C67FC 7C 9D 01 2E */ stwx r4, r29, r0 -/* 801C6800 38 63 00 04 */ addi r3, r3, 4 -/* 801C6804 42 00 FF E4 */ bdnz lbl_801C67E8 -/* 801C6808 38 00 00 00 */ li r0, 0 -/* 801C680C 98 1D 03 05 */ stb r0, 0x305(r29) -/* 801C6810 38 60 00 00 */ li r3, 0 -/* 801C6814 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C6818 38 00 00 08 */ li r0, 8 -/* 801C681C 7C 09 03 A6 */ mtctr r0 -lbl_801C6820: -/* 801C6820 38 03 01 68 */ addi r0, r3, 0x168 -/* 801C6824 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6828 38 03 01 88 */ addi r0, r3, 0x188 -/* 801C682C 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6830 38 03 01 28 */ addi r0, r3, 0x128 -/* 801C6834 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6838 38 03 01 48 */ addi r0, r3, 0x148 -/* 801C683C 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6840 38 63 00 04 */ addi r3, r3, 4 -/* 801C6844 42 00 FF DC */ bdnz lbl_801C6820 -/* 801C6848 3C 60 00 03 */ lis r3, 0x0003 /* 0x00032000@ha */ -/* 801C684C 38 63 20 00 */ addi r3, r3, 0x2000 /* 0x00032000@l */ -/* 801C6850 80 9D 00 04 */ lwz r4, 4(r29) -/* 801C6854 38 A0 00 00 */ li r5, 0 -/* 801C6858 48 10 85 D5 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 801C685C 90 7D 00 08 */ stw r3, 8(r29) -/* 801C6860 38 00 00 00 */ li r0, 0 -/* 801C6864 90 1D 02 00 */ stw r0, 0x200(r29) -/* 801C6868 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C686C 38 00 00 06 */ li r0, 6 -/* 801C6870 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C6874 38 7D 02 50 */ addi r3, r29, 0x250 -/* 801C6878 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801C687C 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801C6880 48 1A 22 AD */ bl strcpy -/* 801C6884 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C6888 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C688C 80 83 00 08 */ lwz r4, 8(r3) -/* 801C6890 28 04 00 00 */ cmplwi r4, 0 -/* 801C6894 41 82 00 20 */ beq lbl_801C68B4 -/* 801C6898 88 04 00 30 */ lbz r0, 0x30(r4) -/* 801C689C 28 00 00 00 */ cmplwi r0, 0 -/* 801C68A0 41 82 00 14 */ beq lbl_801C68B4 -/* 801C68A4 9B DD 03 00 */ stb r30, 0x300(r29) -/* 801C68A8 80 03 00 08 */ lwz r0, 8(r3) -/* 801C68AC 90 1D 00 64 */ stw r0, 0x64(r29) -/* 801C68B0 48 00 00 14 */ b lbl_801C68C4 -lbl_801C68B4: -/* 801C68B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C68B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C68BC 80 03 5C 68 */ lwz r0, 0x5c68(r3) -/* 801C68C0 90 1D 00 64 */ stw r0, 0x64(r29) -lbl_801C68C4: -/* 801C68C4 88 1D 03 00 */ lbz r0, 0x300(r29) -/* 801C68C8 98 1D 03 01 */ stb r0, 0x301(r29) -/* 801C68CC 88 1D 03 00 */ lbz r0, 0x300(r29) -/* 801C68D0 98 1D 03 02 */ stb r0, 0x302(r29) -/* 801C68D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C68D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C68DC 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 801C68E0 28 00 00 04 */ cmplwi r0, 4 -/* 801C68E4 40 82 00 18 */ bne lbl_801C68FC -/* 801C68E8 38 00 00 00 */ li r0, 0 -/* 801C68EC 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C68F0 38 00 00 0E */ li r0, 0xe -/* 801C68F4 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C68F8 48 00 00 90 */ b lbl_801C6988 -lbl_801C68FC: -/* 801C68FC 28 00 00 05 */ cmplwi r0, 5 -/* 801C6900 40 82 00 18 */ bne lbl_801C6918 -/* 801C6904 38 00 00 00 */ li r0, 0 -/* 801C6908 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C690C 38 00 00 12 */ li r0, 0x12 -/* 801C6910 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C6914 48 00 00 74 */ b lbl_801C6988 -lbl_801C6918: -/* 801C6918 28 00 00 08 */ cmplwi r0, 8 -/* 801C691C 40 82 00 18 */ bne lbl_801C6934 -/* 801C6920 38 00 00 00 */ li r0, 0 -/* 801C6924 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C6928 38 00 00 17 */ li r0, 0x17 -/* 801C692C 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C6930 48 00 00 58 */ b lbl_801C6988 -lbl_801C6934: -/* 801C6934 28 00 00 03 */ cmplwi r0, 3 -/* 801C6938 40 82 00 18 */ bne lbl_801C6950 -/* 801C693C 38 00 00 01 */ li r0, 1 -/* 801C6940 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C6944 38 00 00 00 */ li r0, 0 -/* 801C6948 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C694C 48 00 00 3C */ b lbl_801C6988 -lbl_801C6950: -/* 801C6950 28 00 00 07 */ cmplwi r0, 7 -/* 801C6954 40 82 00 1C */ bne lbl_801C6970 -/* 801C6958 3B E0 00 FF */ li r31, 0xff -/* 801C695C 38 00 00 00 */ li r0, 0 -/* 801C6960 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C6964 38 00 00 03 */ li r0, 3 -/* 801C6968 98 1D 03 00 */ stb r0, 0x300(r29) -/* 801C696C 48 00 00 1C */ b lbl_801C6988 -lbl_801C6970: -/* 801C6970 28 00 00 09 */ cmplwi r0, 9 -/* 801C6974 40 82 00 14 */ bne lbl_801C6988 -/* 801C6978 38 00 00 00 */ li r0, 0 -/* 801C697C 98 1D 03 07 */ stb r0, 0x307(r29) -/* 801C6980 38 00 00 1B */ li r0, 0x1b -/* 801C6984 98 1D 03 00 */ stb r0, 0x300(r29) -lbl_801C6988: -/* 801C6988 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801C698C 28 00 00 01 */ cmplwi r0, 1 -/* 801C6990 40 82 00 18 */ bne lbl_801C69A8 -/* 801C6994 C0 02 A7 2C */ lfs f0, lit_4159(r2) -/* 801C6998 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801C699C C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C69A0 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801C69A4 48 00 00 64 */ b lbl_801C6A08 -lbl_801C69A8: -/* 801C69A8 28 00 00 03 */ cmplwi r0, 3 -/* 801C69AC 40 82 00 18 */ bne lbl_801C69C4 -/* 801C69B0 C0 02 A7 30 */ lfs f0, lit_4160(r2) -/* 801C69B4 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801C69B8 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C69BC D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801C69C0 48 00 00 48 */ b lbl_801C6A08 -lbl_801C69C4: -/* 801C69C4 28 00 00 02 */ cmplwi r0, 2 -/* 801C69C8 40 82 00 18 */ bne lbl_801C69E0 -/* 801C69CC C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C69D0 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801C69D4 C0 02 A7 34 */ lfs f0, lit_4161(r2) -/* 801C69D8 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801C69DC 48 00 00 2C */ b lbl_801C6A08 -lbl_801C69E0: -/* 801C69E0 28 00 00 00 */ cmplwi r0, 0 -/* 801C69E4 40 82 00 18 */ bne lbl_801C69FC -/* 801C69E8 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C69EC D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801C69F0 C0 02 A7 38 */ lfs f0, lit_4162(r2) -/* 801C69F4 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801C69F8 48 00 00 10 */ b lbl_801C6A08 -lbl_801C69FC: -/* 801C69FC C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C6A00 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801C6A04 D0 1D 01 20 */ stfs f0, 0x120(r29) -lbl_801C6A08: -/* 801C6A08 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C6A0C D0 1D 01 24 */ stfs f0, 0x124(r29) -/* 801C6A10 9B FD 03 04 */ stb r31, 0x304(r29) -/* 801C6A14 38 A0 00 00 */ li r5, 0 -/* 801C6A18 B0 BD 02 10 */ sth r5, 0x210(r29) -/* 801C6A1C B0 BD 02 12 */ sth r5, 0x212(r29) -/* 801C6A20 B0 BD 02 14 */ sth r5, 0x214(r29) -/* 801C6A24 38 60 00 00 */ li r3, 0 -/* 801C6A28 38 80 00 00 */ li r4, 0 -/* 801C6A2C 38 00 00 08 */ li r0, 8 -/* 801C6A30 7C 09 03 A6 */ mtctr r0 -lbl_801C6A34: -/* 801C6A34 38 04 01 AC */ addi r0, r4, 0x1ac -/* 801C6A38 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6A3C 38 04 01 CC */ addi r0, r4, 0x1cc -/* 801C6A40 7C 1D 05 2E */ stfsx f0, r29, r0 -/* 801C6A44 38 04 00 94 */ addi r0, r4, 0x94 -/* 801C6A48 7C BD 01 2E */ stwx r5, r29, r0 -/* 801C6A4C 38 03 02 18 */ addi r0, r3, 0x218 -/* 801C6A50 7C BD 03 2E */ sthx r5, r29, r0 -/* 801C6A54 38 63 00 02 */ addi r3, r3, 2 -/* 801C6A58 38 84 00 04 */ addi r4, r4, 4 -/* 801C6A5C 42 00 FF D8 */ bdnz lbl_801C6A34 -/* 801C6A60 38 60 00 00 */ li r3, 0 -/* 801C6A64 38 80 00 00 */ li r4, 0 -/* 801C6A68 38 00 00 14 */ li r0, 0x14 -/* 801C6A6C 7C 09 03 A6 */ mtctr r0 -lbl_801C6A70: -/* 801C6A70 38 03 02 28 */ addi r0, r3, 0x228 -/* 801C6A74 7C 9D 03 2E */ sthx r4, r29, r0 -/* 801C6A78 38 63 00 02 */ addi r3, r3, 2 -/* 801C6A7C 42 00 FF F4 */ bdnz lbl_801C6A70 -/* 801C6A80 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C6A84 D0 1D 01 EC */ stfs f0, 0x1ec(r29) -/* 801C6A88 38 00 00 00 */ li r0, 0 -/* 801C6A8C 98 1D 03 06 */ stb r0, 0x306(r29) -/* 801C6A90 B0 1D 02 16 */ sth r0, 0x216(r29) -/* 801C6A94 7F A3 EB 78 */ mr r3, r29 -/* 801C6A98 48 00 60 2D */ bl resetRoomDataBit__12dMenu_Fmap_cFv -/* 801C6A9C 7F A3 EB 78 */ mr r3, r29 -/* 801C6AA0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 801C6AA4 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 801C6AA8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 801C6AAC CB C1 00 30 */ lfd f30, 0x30(r1) -/* 801C6AB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6AB4 48 19 B7 61 */ bl _restgpr_24 -/* 801C6AB8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801C6ABC 7C 08 03 A6 */ mtlr r0 -/* 801C6AC0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C6AC4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/__ct__9dMf_HIO_cFv.s b/asm/d/menu/d_menu_fmap/__ct__9dMf_HIO_cFv.s deleted file mode 100644 index 3e7f8856f8..0000000000 --- a/asm/d/menu/d_menu_fmap/__ct__9dMf_HIO_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801C65F8: -/* 801C65F8 3C 80 80 3C */ lis r4, __vt__9dMf_HIO_c@ha /* 0x803BD670@ha */ -/* 801C65FC 38 04 D6 70 */ addi r0, r4, __vt__9dMf_HIO_c@l /* 0x803BD670@l */ -/* 801C6600 90 03 00 00 */ stw r0, 0(r3) -/* 801C6604 90 6D 8B 20 */ stw r3, mMySelfPointer__9dMf_HIO_c(r13) -/* 801C6608 C0 02 A7 20 */ lfs f0, lit_3994(r2) -/* 801C660C D0 03 00 08 */ stfs f0, 8(r3) -/* 801C6610 38 00 00 3C */ li r0, 0x3c -/* 801C6614 98 03 00 10 */ stb r0, 0x10(r3) -/* 801C6618 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801C661C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 801C6620 38 00 00 5F */ li r0, 0x5f -/* 801C6624 98 03 00 11 */ stb r0, 0x11(r3) -/* 801C6628 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s deleted file mode 100644 index 9892ea86af..0000000000 --- a/asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,187 +0,0 @@ -lbl_801C6AC8: -/* 801C6AC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C6ACC 7C 08 02 A6 */ mflr r0 -/* 801C6AD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C6AD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C6AD8 48 19 B6 FD */ bl _savegpr_27 -/* 801C6ADC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801C6AE0 7C 9F 23 78 */ mr r31, r4 -/* 801C6AE4 41 82 02 64 */ beq lbl_801C6D48 -/* 801C6AE8 3C 60 80 3C */ lis r3, __vt__12dMenu_Fmap_c@ha /* 0x803BD664@ha */ -/* 801C6AEC 38 03 D6 64 */ addi r0, r3, __vt__12dMenu_Fmap_c@l /* 0x803BD664@l */ -/* 801C6AF0 90 1E 00 00 */ stw r0, 0(r30) -/* 801C6AF4 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6AF8 48 10 7C 8D */ bl getTotalFreeSize__7JKRHeapFv -/* 801C6AFC 80 9E 00 8C */ lwz r4, 0x8c(r30) -/* 801C6B00 28 04 00 00 */ cmplwi r4, 0 -/* 801C6B04 41 82 00 14 */ beq lbl_801C6B18 -/* 801C6B08 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6B0C 48 10 7A 3D */ bl free__7JKRHeapFPv -/* 801C6B10 38 00 00 00 */ li r0, 0 -/* 801C6B14 90 1E 00 8C */ stw r0, 0x8c(r30) -lbl_801C6B18: -/* 801C6B18 80 9E 00 90 */ lwz r4, 0x90(r30) -/* 801C6B1C 28 04 00 00 */ cmplwi r4, 0 -/* 801C6B20 41 82 00 14 */ beq lbl_801C6B34 -/* 801C6B24 80 7E 00 04 */ lwz r3, 4(r30) -/* 801C6B28 48 10 7A 21 */ bl free__7JKRHeapFPv -/* 801C6B2C 38 00 00 00 */ li r0, 0 -/* 801C6B30 90 1E 00 90 */ stw r0, 0x90(r30) -lbl_801C6B34: -/* 801C6B34 3B 60 00 00 */ li r27, 0 -/* 801C6B38 3B A0 00 00 */ li r29, 0 -lbl_801C6B3C: -/* 801C6B3C 2C 1B 00 07 */ cmpwi r27, 7 -/* 801C6B40 40 82 00 34 */ bne lbl_801C6B74 -/* 801C6B44 3B 9D 00 94 */ addi r28, r29, 0x94 -/* 801C6B48 7C 9E E0 2E */ lwzx r4, r30, r28 -/* 801C6B4C 28 04 00 00 */ cmplwi r4, 0 -/* 801C6B50 41 82 00 18 */ beq lbl_801C6B68 -/* 801C6B54 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801C6B58 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6B5C 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 801C6B60 7D 89 03 A6 */ mtctr r12 -/* 801C6B64 4E 80 04 21 */ bctrl -lbl_801C6B68: -/* 801C6B68 38 00 00 00 */ li r0, 0 -/* 801C6B6C 7C 1E E1 2E */ stwx r0, r30, r28 -/* 801C6B70 48 00 00 34 */ b lbl_801C6BA4 -lbl_801C6B74: -/* 801C6B74 3B 9D 00 94 */ addi r28, r29, 0x94 -/* 801C6B78 7C 9E E0 2E */ lwzx r4, r30, r28 -/* 801C6B7C 28 04 00 00 */ cmplwi r4, 0 -/* 801C6B80 41 82 00 24 */ beq lbl_801C6BA4 -/* 801C6B84 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801C6B88 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6B8C 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 801C6B90 7D 89 03 A6 */ mtctr r12 -/* 801C6B94 4E 80 04 21 */ bctrl -/* 801C6B98 38 00 00 00 */ li r0, 0 -/* 801C6B9C 7C 1E E1 2E */ stwx r0, r30, r28 -/* 801C6BA0 7C 1E E1 2E */ stwx r0, r30, r28 -lbl_801C6BA4: -/* 801C6BA4 3B 7B 00 01 */ addi r27, r27, 1 -/* 801C6BA8 2C 1B 00 08 */ cmpwi r27, 8 -/* 801C6BAC 3B BD 00 04 */ addi r29, r29, 4 -/* 801C6BB0 41 80 FF 8C */ blt lbl_801C6B3C -/* 801C6BB4 7F C3 F3 78 */ mr r3, r30 -/* 801C6BB8 48 00 5A 65 */ bl removeAreaData__12dMenu_Fmap_cFv -/* 801C6BBC 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C6BC0 28 03 00 00 */ cmplwi r3, 0 -/* 801C6BC4 41 82 00 24 */ beq lbl_801C6BE8 -/* 801C6BC8 41 82 00 18 */ beq lbl_801C6BE0 -/* 801C6BCC 38 80 00 01 */ li r4, 1 -/* 801C6BD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6BD4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801C6BD8 7D 89 03 A6 */ mtctr r12 -/* 801C6BDC 4E 80 04 21 */ bctrl -lbl_801C6BE0: -/* 801C6BE0 38 00 00 00 */ li r0, 0 -/* 801C6BE4 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_801C6BE8: -/* 801C6BE8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C6BEC 28 03 00 00 */ cmplwi r3, 0 -/* 801C6BF0 41 82 00 24 */ beq lbl_801C6C14 -/* 801C6BF4 41 82 00 18 */ beq lbl_801C6C0C -/* 801C6BF8 38 80 00 01 */ li r4, 1 -/* 801C6BFC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6C00 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C6C04 7D 89 03 A6 */ mtctr r12 -/* 801C6C08 4E 80 04 21 */ bctrl -lbl_801C6C0C: -/* 801C6C0C 38 00 00 00 */ li r0, 0 -/* 801C6C10 90 1E 00 18 */ stw r0, 0x18(r30) -lbl_801C6C14: -/* 801C6C14 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C6C18 28 03 00 00 */ cmplwi r3, 0 -/* 801C6C1C 41 82 00 30 */ beq lbl_801C6C4C -/* 801C6C20 48 00 82 1D */ bl _delete__15dMenu_FmapMap_cFv -/* 801C6C24 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C6C28 28 03 00 00 */ cmplwi r3, 0 -/* 801C6C2C 41 82 00 18 */ beq lbl_801C6C44 -/* 801C6C30 38 80 00 01 */ li r4, 1 -/* 801C6C34 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6C38 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C6C3C 7D 89 03 A6 */ mtctr r12 -/* 801C6C40 4E 80 04 21 */ bctrl -lbl_801C6C44: -/* 801C6C44 38 00 00 00 */ li r0, 0 -/* 801C6C48 90 1E 00 B8 */ stw r0, 0xb8(r30) -lbl_801C6C4C: -/* 801C6C4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C6C50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C6C54 80 63 5C BC */ lwz r3, 0x5cbc(r3) -/* 801C6C58 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6C5C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801C6C60 7D 89 03 A6 */ mtctr r12 -/* 801C6C64 4E 80 04 21 */ bctrl -/* 801C6C68 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801C6C6C 28 03 00 00 */ cmplwi r3, 0 -/* 801C6C70 41 82 00 14 */ beq lbl_801C6C84 -/* 801C6C74 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6C78 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801C6C7C 7D 89 03 A6 */ mtctr r12 -/* 801C6C80 4E 80 04 21 */ bctrl -lbl_801C6C84: -/* 801C6C84 38 00 00 00 */ li r0, 0 -/* 801C6C88 90 0D 8B 2C */ stw r0, MyClass__12dMenu_Fmap_c(r13) -/* 801C6C8C 80 1E 00 08 */ lwz r0, 8(r30) -/* 801C6C90 28 00 00 00 */ cmplwi r0, 0 -/* 801C6C94 41 82 00 2C */ beq lbl_801C6CC0 -/* 801C6C98 48 07 0E BD */ bl getTalkHeap__12dMsgObject_cFv -/* 801C6C9C 80 1E 00 08 */ lwz r0, 8(r30) -/* 801C6CA0 7C 03 00 40 */ cmplw r3, r0 -/* 801C6CA4 40 82 00 0C */ bne lbl_801C6CB0 -/* 801C6CA8 38 60 00 00 */ li r3, 0 -/* 801C6CAC 48 07 0E 35 */ bl setTalkHeap__12dMsgObject_cFPv -lbl_801C6CB0: -/* 801C6CB0 80 7E 00 08 */ lwz r3, 8(r30) -/* 801C6CB4 4B E4 84 F9 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap -/* 801C6CB8 38 00 00 00 */ li r0, 0 -/* 801C6CBC 90 1E 00 08 */ stw r0, 8(r30) -lbl_801C6CC0: -/* 801C6CC0 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801C6CC4 28 03 00 00 */ cmplwi r3, 0 -/* 801C6CC8 41 82 00 40 */ beq lbl_801C6D08 -/* 801C6CCC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C6CD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6CD4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C6CD8 7D 89 03 A6 */ mtctr r12 -/* 801C6CDC 4E 80 04 21 */ bctrl -/* 801C6CE0 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801C6CE4 28 03 00 00 */ cmplwi r3, 0 -/* 801C6CE8 41 82 00 18 */ beq lbl_801C6D00 -/* 801C6CEC 38 80 00 01 */ li r4, 1 -/* 801C6CF0 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801C6CF4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C6CF8 7D 89 03 A6 */ mtctr r12 -/* 801C6CFC 4E 80 04 21 */ bctrl -lbl_801C6D00: -/* 801C6D00 38 00 00 00 */ li r0, 0 -/* 801C6D04 90 1E 00 1C */ stw r0, 0x1c(r30) -lbl_801C6D08: -/* 801C6D08 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801C6D0C 28 03 00 00 */ cmplwi r3, 0 -/* 801C6D10 41 82 00 1C */ beq lbl_801C6D2C -/* 801C6D14 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6D18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C6D1C 7D 89 03 A6 */ mtctr r12 -/* 801C6D20 4E 80 04 21 */ bctrl -/* 801C6D24 38 00 00 00 */ li r0, 0 -/* 801C6D28 90 1E 00 68 */ stw r0, 0x68(r30) -lbl_801C6D2C: -/* 801C6D2C 38 7E 00 C4 */ addi r3, r30, 0xc4 -/* 801C6D30 38 80 FF FF */ li r4, -1 -/* 801C6D34 48 08 32 15 */ bl __dt__10dMsgFlow_cFv -/* 801C6D38 7F E0 07 35 */ extsh. r0, r31 -/* 801C6D3C 40 81 00 0C */ ble lbl_801C6D48 -/* 801C6D40 7F C3 F3 78 */ mr r3, r30 -/* 801C6D44 48 10 7F F9 */ bl __dl__FPv -lbl_801C6D48: -/* 801C6D48 7F C3 F3 78 */ mr r3, r30 -/* 801C6D4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C6D50 48 19 B4 D1 */ bl _restgpr_27 -/* 801C6D54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C6D58 7C 08 03 A6 */ mtlr r0 -/* 801C6D5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C6D60 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/__dt__9dMf_HIO_cFv.s b/asm/d/menu/d_menu_fmap/__dt__9dMf_HIO_cFv.s deleted file mode 100644 index fbc15328b0..0000000000 --- a/asm/d/menu/d_menu_fmap/__dt__9dMf_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801CDA2C: -/* 801CDA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CDA30 7C 08 02 A6 */ mflr r0 -/* 801CDA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CDA38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CDA3C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801CDA40 41 82 00 1C */ beq lbl_801CDA5C -/* 801CDA44 3C A0 80 3C */ lis r5, __vt__9dMf_HIO_c@ha /* 0x803BD670@ha */ -/* 801CDA48 38 05 D6 70 */ addi r0, r5, __vt__9dMf_HIO_c@l /* 0x803BD670@l */ -/* 801CDA4C 90 1F 00 00 */ stw r0, 0(r31) -/* 801CDA50 7C 80 07 35 */ extsh. r0, r4 -/* 801CDA54 40 81 00 08 */ ble lbl_801CDA5C -/* 801CDA58 48 10 12 E5 */ bl __dl__FPv -lbl_801CDA5C: -/* 801CDA5C 7F E3 FB 78 */ mr r3, r31 -/* 801CDA60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CDA64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CDA68 7C 08 03 A6 */ mtlr r0 -/* 801CDA6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CDA70 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/__sinit_d_menu_fmap_cpp.s b/asm/d/menu/d_menu_fmap/__sinit_d_menu_fmap_cpp.s deleted file mode 100644 index 83557dd462..0000000000 --- a/asm/d/menu/d_menu_fmap/__sinit_d_menu_fmap_cpp.s +++ /dev/null @@ -1,382 +0,0 @@ -lbl_801CDA74: -/* 801CDA74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CDA78 7C 08 02 A6 */ mflr r0 -/* 801CDA7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CDA80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CDA84 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BD090@ha */ -/* 801CDA88 3B E3 D0 90 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x803BD090@l */ -/* 801CDA8C 3C 60 80 43 */ lis r3, g_fmHIO@ha /* 0x8042E82C@ha */ -/* 801CDA90 38 63 E8 2C */ addi r3, r3, g_fmHIO@l /* 0x8042E82C@l */ -/* 801CDA94 4B FF 8B 65 */ bl __ct__9dMf_HIO_cFv -/* 801CDA98 3C 80 80 1D */ lis r4, __dt__9dMf_HIO_cFv@ha /* 0x801CDA2C@ha */ -/* 801CDA9C 38 84 DA 2C */ addi r4, r4, __dt__9dMf_HIO_cFv@l /* 0x801CDA2C@l */ -/* 801CDAA0 3C A0 80 43 */ lis r5, lit_3989@ha /* 0x8042E820@ha */ -/* 801CDAA4 38 A5 E8 20 */ addi r5, r5, lit_3989@l /* 0x8042E820@l */ -/* 801CDAA8 48 19 41 7D */ bl __register_global_object -/* 801CDAAC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801CDAB0 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 801CDAB4 90 7F 01 74 */ stw r3, 0x174(r31) -/* 801CDAB8 90 1F 01 78 */ stw r0, 0x178(r31) -/* 801CDABC 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 801CDAC0 90 1F 01 7C */ stw r0, 0x17c(r31) -/* 801CDAC4 38 7F 01 74 */ addi r3, r31, 0x174 -/* 801CDAC8 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801CDACC 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 801CDAD0 90 83 00 0C */ stw r4, 0xc(r3) -/* 801CDAD4 90 03 00 10 */ stw r0, 0x10(r3) -/* 801CDAD8 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 801CDADC 90 03 00 14 */ stw r0, 0x14(r3) -/* 801CDAE0 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801CDAE4 80 1F 00 28 */ lwz r0, 0x28(r31) -/* 801CDAE8 90 83 00 18 */ stw r4, 0x18(r3) -/* 801CDAEC 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801CDAF0 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 801CDAF4 90 03 00 20 */ stw r0, 0x20(r3) -/* 801CDAF8 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 801CDAFC 80 1F 00 34 */ lwz r0, 0x34(r31) -/* 801CDB00 90 83 00 24 */ stw r4, 0x24(r3) -/* 801CDB04 90 03 00 28 */ stw r0, 0x28(r3) -/* 801CDB08 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 801CDB0C 90 03 00 2C */ stw r0, 0x2c(r3) -/* 801CDB10 80 9F 00 3C */ lwz r4, 0x3c(r31) -/* 801CDB14 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 801CDB18 90 83 00 30 */ stw r4, 0x30(r3) -/* 801CDB1C 90 03 00 34 */ stw r0, 0x34(r3) -/* 801CDB20 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 801CDB24 90 03 00 38 */ stw r0, 0x38(r3) -/* 801CDB28 80 9F 00 48 */ lwz r4, 0x48(r31) -/* 801CDB2C 80 1F 00 4C */ lwz r0, 0x4c(r31) -/* 801CDB30 90 83 00 3C */ stw r4, 0x3c(r3) -/* 801CDB34 90 03 00 40 */ stw r0, 0x40(r3) -/* 801CDB38 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 801CDB3C 90 03 00 44 */ stw r0, 0x44(r3) -/* 801CDB40 80 9F 00 54 */ lwz r4, 0x54(r31) -/* 801CDB44 80 1F 00 58 */ lwz r0, 0x58(r31) -/* 801CDB48 90 83 00 48 */ stw r4, 0x48(r3) -/* 801CDB4C 90 03 00 4C */ stw r0, 0x4c(r3) -/* 801CDB50 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 801CDB54 90 03 00 50 */ stw r0, 0x50(r3) -/* 801CDB58 80 9F 00 60 */ lwz r4, 0x60(r31) -/* 801CDB5C 80 1F 00 64 */ lwz r0, 0x64(r31) -/* 801CDB60 90 83 00 54 */ stw r4, 0x54(r3) -/* 801CDB64 90 03 00 58 */ stw r0, 0x58(r3) -/* 801CDB68 80 1F 00 68 */ lwz r0, 0x68(r31) -/* 801CDB6C 90 03 00 5C */ stw r0, 0x5c(r3) -/* 801CDB70 80 9F 00 6C */ lwz r4, 0x6c(r31) -/* 801CDB74 80 1F 00 70 */ lwz r0, 0x70(r31) -/* 801CDB78 90 83 00 60 */ stw r4, 0x60(r3) -/* 801CDB7C 90 03 00 64 */ stw r0, 0x64(r3) -/* 801CDB80 80 1F 00 74 */ lwz r0, 0x74(r31) -/* 801CDB84 90 03 00 68 */ stw r0, 0x68(r3) -/* 801CDB88 80 9F 00 78 */ lwz r4, 0x78(r31) -/* 801CDB8C 80 1F 00 7C */ lwz r0, 0x7c(r31) -/* 801CDB90 90 83 00 6C */ stw r4, 0x6c(r3) -/* 801CDB94 90 03 00 70 */ stw r0, 0x70(r3) -/* 801CDB98 80 1F 00 80 */ lwz r0, 0x80(r31) -/* 801CDB9C 90 03 00 74 */ stw r0, 0x74(r3) -/* 801CDBA0 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 801CDBA4 80 1F 00 88 */ lwz r0, 0x88(r31) -/* 801CDBA8 90 83 00 78 */ stw r4, 0x78(r3) -/* 801CDBAC 90 03 00 7C */ stw r0, 0x7c(r3) -/* 801CDBB0 80 1F 00 8C */ lwz r0, 0x8c(r31) -/* 801CDBB4 90 03 00 80 */ stw r0, 0x80(r3) -/* 801CDBB8 80 9F 00 90 */ lwz r4, 0x90(r31) -/* 801CDBBC 80 1F 00 94 */ lwz r0, 0x94(r31) -/* 801CDBC0 90 83 00 84 */ stw r4, 0x84(r3) -/* 801CDBC4 90 03 00 88 */ stw r0, 0x88(r3) -/* 801CDBC8 80 1F 00 98 */ lwz r0, 0x98(r31) -/* 801CDBCC 90 03 00 8C */ stw r0, 0x8c(r3) -/* 801CDBD0 80 9F 00 9C */ lwz r4, 0x9c(r31) -/* 801CDBD4 80 1F 00 A0 */ lwz r0, 0xa0(r31) -/* 801CDBD8 90 83 00 90 */ stw r4, 0x90(r3) -/* 801CDBDC 90 03 00 94 */ stw r0, 0x94(r3) -/* 801CDBE0 80 1F 00 A4 */ lwz r0, 0xa4(r31) -/* 801CDBE4 90 03 00 98 */ stw r0, 0x98(r3) -/* 801CDBE8 80 9F 00 A8 */ lwz r4, 0xa8(r31) -/* 801CDBEC 80 1F 00 AC */ lwz r0, 0xac(r31) -/* 801CDBF0 90 83 00 9C */ stw r4, 0x9c(r3) -/* 801CDBF4 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 801CDBF8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 801CDBFC 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 801CDC00 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 801CDC04 80 1F 00 B8 */ lwz r0, 0xb8(r31) -/* 801CDC08 90 83 00 A8 */ stw r4, 0xa8(r3) -/* 801CDC0C 90 03 00 AC */ stw r0, 0xac(r3) -/* 801CDC10 80 1F 00 BC */ lwz r0, 0xbc(r31) -/* 801CDC14 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 801CDC18 80 9F 00 C0 */ lwz r4, 0xc0(r31) -/* 801CDC1C 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801CDC20 90 83 00 B4 */ stw r4, 0xb4(r3) -/* 801CDC24 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 801CDC28 80 1F 00 C8 */ lwz r0, 0xc8(r31) -/* 801CDC2C 90 03 00 BC */ stw r0, 0xbc(r3) -/* 801CDC30 80 9F 00 CC */ lwz r4, 0xcc(r31) -/* 801CDC34 80 1F 00 D0 */ lwz r0, 0xd0(r31) -/* 801CDC38 90 83 00 C0 */ stw r4, 0xc0(r3) -/* 801CDC3C 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 801CDC40 80 1F 00 D4 */ lwz r0, 0xd4(r31) -/* 801CDC44 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 801CDC48 80 9F 00 D8 */ lwz r4, 0xd8(r31) -/* 801CDC4C 80 1F 00 DC */ lwz r0, 0xdc(r31) -/* 801CDC50 90 83 00 CC */ stw r4, 0xcc(r3) -/* 801CDC54 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 801CDC58 80 1F 00 E0 */ lwz r0, 0xe0(r31) -/* 801CDC5C 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 801CDC60 80 9F 00 E4 */ lwz r4, 0xe4(r31) -/* 801CDC64 80 1F 00 E8 */ lwz r0, 0xe8(r31) -/* 801CDC68 90 83 00 D8 */ stw r4, 0xd8(r3) -/* 801CDC6C 90 03 00 DC */ stw r0, 0xdc(r3) -/* 801CDC70 80 1F 00 EC */ lwz r0, 0xec(r31) -/* 801CDC74 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 801CDC78 80 9F 00 F0 */ lwz r4, 0xf0(r31) -/* 801CDC7C 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 801CDC80 90 83 00 E4 */ stw r4, 0xe4(r3) -/* 801CDC84 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 801CDC88 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 801CDC8C 90 03 00 EC */ stw r0, 0xec(r3) -/* 801CDC90 80 9F 00 FC */ lwz r4, 0xfc(r31) -/* 801CDC94 80 1F 01 00 */ lwz r0, 0x100(r31) -/* 801CDC98 90 83 00 F0 */ stw r4, 0xf0(r3) -/* 801CDC9C 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 801CDCA0 80 1F 01 04 */ lwz r0, 0x104(r31) -/* 801CDCA4 90 03 00 F8 */ stw r0, 0xf8(r3) -/* 801CDCA8 80 9F 01 08 */ lwz r4, 0x108(r31) -/* 801CDCAC 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801CDCB0 90 83 00 FC */ stw r4, 0xfc(r3) -/* 801CDCB4 90 03 01 00 */ stw r0, 0x100(r3) -/* 801CDCB8 80 1F 01 10 */ lwz r0, 0x110(r31) -/* 801CDCBC 90 03 01 04 */ stw r0, 0x104(r3) -/* 801CDCC0 80 9F 01 14 */ lwz r4, 0x114(r31) -/* 801CDCC4 80 1F 01 18 */ lwz r0, 0x118(r31) -/* 801CDCC8 90 83 01 08 */ stw r4, 0x108(r3) -/* 801CDCCC 90 03 01 0C */ stw r0, 0x10c(r3) -/* 801CDCD0 80 1F 01 1C */ lwz r0, 0x11c(r31) -/* 801CDCD4 90 03 01 10 */ stw r0, 0x110(r3) -/* 801CDCD8 80 9F 01 20 */ lwz r4, 0x120(r31) -/* 801CDCDC 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 801CDCE0 90 83 01 14 */ stw r4, 0x114(r3) -/* 801CDCE4 90 03 01 18 */ stw r0, 0x118(r3) -/* 801CDCE8 80 1F 01 28 */ lwz r0, 0x128(r31) -/* 801CDCEC 90 03 01 1C */ stw r0, 0x11c(r3) -/* 801CDCF0 80 9F 01 2C */ lwz r4, 0x12c(r31) -/* 801CDCF4 80 1F 01 30 */ lwz r0, 0x130(r31) -/* 801CDCF8 90 83 01 20 */ stw r4, 0x120(r3) -/* 801CDCFC 90 03 01 24 */ stw r0, 0x124(r3) -/* 801CDD00 80 1F 01 34 */ lwz r0, 0x134(r31) -/* 801CDD04 90 03 01 28 */ stw r0, 0x128(r3) -/* 801CDD08 80 9F 01 38 */ lwz r4, 0x138(r31) -/* 801CDD0C 80 1F 01 3C */ lwz r0, 0x13c(r31) -/* 801CDD10 90 83 01 2C */ stw r4, 0x12c(r3) -/* 801CDD14 90 03 01 30 */ stw r0, 0x130(r3) -/* 801CDD18 80 1F 01 40 */ lwz r0, 0x140(r31) -/* 801CDD1C 90 03 01 34 */ stw r0, 0x134(r3) -/* 801CDD20 80 9F 01 44 */ lwz r4, 0x144(r31) -/* 801CDD24 80 1F 01 48 */ lwz r0, 0x148(r31) -/* 801CDD28 90 83 01 38 */ stw r4, 0x138(r3) -/* 801CDD2C 90 03 01 3C */ stw r0, 0x13c(r3) -/* 801CDD30 80 1F 01 4C */ lwz r0, 0x14c(r31) -/* 801CDD34 90 03 01 40 */ stw r0, 0x140(r3) -/* 801CDD38 80 9F 01 50 */ lwz r4, 0x150(r31) -/* 801CDD3C 80 1F 01 54 */ lwz r0, 0x154(r31) -/* 801CDD40 90 83 01 44 */ stw r4, 0x144(r3) -/* 801CDD44 90 03 01 48 */ stw r0, 0x148(r3) -/* 801CDD48 80 1F 01 58 */ lwz r0, 0x158(r31) -/* 801CDD4C 90 03 01 4C */ stw r0, 0x14c(r3) -/* 801CDD50 80 9F 01 5C */ lwz r4, 0x15c(r31) -/* 801CDD54 80 1F 01 60 */ lwz r0, 0x160(r31) -/* 801CDD58 90 83 01 50 */ stw r4, 0x150(r3) -/* 801CDD5C 90 03 01 54 */ stw r0, 0x154(r3) -/* 801CDD60 80 1F 01 64 */ lwz r0, 0x164(r31) -/* 801CDD64 90 03 01 58 */ stw r0, 0x158(r3) -/* 801CDD68 80 9F 01 68 */ lwz r4, 0x168(r31) -/* 801CDD6C 80 1F 01 6C */ lwz r0, 0x16c(r31) -/* 801CDD70 90 83 01 5C */ stw r4, 0x15c(r3) -/* 801CDD74 90 03 01 60 */ stw r0, 0x160(r3) -/* 801CDD78 80 1F 01 70 */ lwz r0, 0x170(r31) -/* 801CDD7C 90 03 01 64 */ stw r0, 0x164(r3) -/* 801CDD80 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 801CDD84 80 1F 02 E0 */ lwz r0, 0x2e0(r31) -/* 801CDD88 90 7F 04 44 */ stw r3, 0x444(r31) -/* 801CDD8C 90 1F 04 48 */ stw r0, 0x448(r31) -/* 801CDD90 80 1F 02 E4 */ lwz r0, 0x2e4(r31) -/* 801CDD94 90 1F 04 4C */ stw r0, 0x44c(r31) -/* 801CDD98 38 7F 04 44 */ addi r3, r31, 0x444 -/* 801CDD9C 80 9F 02 E8 */ lwz r4, 0x2e8(r31) -/* 801CDDA0 80 1F 02 EC */ lwz r0, 0x2ec(r31) -/* 801CDDA4 90 83 00 0C */ stw r4, 0xc(r3) -/* 801CDDA8 90 03 00 10 */ stw r0, 0x10(r3) -/* 801CDDAC 80 1F 02 F0 */ lwz r0, 0x2f0(r31) -/* 801CDDB0 90 03 00 14 */ stw r0, 0x14(r3) -/* 801CDDB4 80 9F 02 F4 */ lwz r4, 0x2f4(r31) -/* 801CDDB8 80 1F 02 F8 */ lwz r0, 0x2f8(r31) -/* 801CDDBC 90 83 00 18 */ stw r4, 0x18(r3) -/* 801CDDC0 90 03 00 1C */ stw r0, 0x1c(r3) -/* 801CDDC4 80 1F 02 FC */ lwz r0, 0x2fc(r31) -/* 801CDDC8 90 03 00 20 */ stw r0, 0x20(r3) -/* 801CDDCC 80 9F 03 00 */ lwz r4, 0x300(r31) -/* 801CDDD0 80 1F 03 04 */ lwz r0, 0x304(r31) -/* 801CDDD4 90 83 00 24 */ stw r4, 0x24(r3) -/* 801CDDD8 90 03 00 28 */ stw r0, 0x28(r3) -/* 801CDDDC 80 1F 03 08 */ lwz r0, 0x308(r31) -/* 801CDDE0 90 03 00 2C */ stw r0, 0x2c(r3) -/* 801CDDE4 80 9F 03 0C */ lwz r4, 0x30c(r31) -/* 801CDDE8 80 1F 03 10 */ lwz r0, 0x310(r31) -/* 801CDDEC 90 83 00 30 */ stw r4, 0x30(r3) -/* 801CDDF0 90 03 00 34 */ stw r0, 0x34(r3) -/* 801CDDF4 80 1F 03 14 */ lwz r0, 0x314(r31) -/* 801CDDF8 90 03 00 38 */ stw r0, 0x38(r3) -/* 801CDDFC 80 9F 03 18 */ lwz r4, 0x318(r31) -/* 801CDE00 80 1F 03 1C */ lwz r0, 0x31c(r31) -/* 801CDE04 90 83 00 3C */ stw r4, 0x3c(r3) -/* 801CDE08 90 03 00 40 */ stw r0, 0x40(r3) -/* 801CDE0C 80 1F 03 20 */ lwz r0, 0x320(r31) -/* 801CDE10 90 03 00 44 */ stw r0, 0x44(r3) -/* 801CDE14 80 9F 03 24 */ lwz r4, 0x324(r31) -/* 801CDE18 80 1F 03 28 */ lwz r0, 0x328(r31) -/* 801CDE1C 90 83 00 48 */ stw r4, 0x48(r3) -/* 801CDE20 90 03 00 4C */ stw r0, 0x4c(r3) -/* 801CDE24 80 1F 03 2C */ lwz r0, 0x32c(r31) -/* 801CDE28 90 03 00 50 */ stw r0, 0x50(r3) -/* 801CDE2C 80 9F 03 30 */ lwz r4, 0x330(r31) -/* 801CDE30 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 801CDE34 90 83 00 54 */ stw r4, 0x54(r3) -/* 801CDE38 90 03 00 58 */ stw r0, 0x58(r3) -/* 801CDE3C 80 1F 03 38 */ lwz r0, 0x338(r31) -/* 801CDE40 90 03 00 5C */ stw r0, 0x5c(r3) -/* 801CDE44 80 9F 03 3C */ lwz r4, 0x33c(r31) -/* 801CDE48 80 1F 03 40 */ lwz r0, 0x340(r31) -/* 801CDE4C 90 83 00 60 */ stw r4, 0x60(r3) -/* 801CDE50 90 03 00 64 */ stw r0, 0x64(r3) -/* 801CDE54 80 1F 03 44 */ lwz r0, 0x344(r31) -/* 801CDE58 90 03 00 68 */ stw r0, 0x68(r3) -/* 801CDE5C 80 9F 03 48 */ lwz r4, 0x348(r31) -/* 801CDE60 80 1F 03 4C */ lwz r0, 0x34c(r31) -/* 801CDE64 90 83 00 6C */ stw r4, 0x6c(r3) -/* 801CDE68 90 03 00 70 */ stw r0, 0x70(r3) -/* 801CDE6C 80 1F 03 50 */ lwz r0, 0x350(r31) -/* 801CDE70 90 03 00 74 */ stw r0, 0x74(r3) -/* 801CDE74 80 9F 03 54 */ lwz r4, 0x354(r31) -/* 801CDE78 80 1F 03 58 */ lwz r0, 0x358(r31) -/* 801CDE7C 90 83 00 78 */ stw r4, 0x78(r3) -/* 801CDE80 90 03 00 7C */ stw r0, 0x7c(r3) -/* 801CDE84 80 1F 03 5C */ lwz r0, 0x35c(r31) -/* 801CDE88 90 03 00 80 */ stw r0, 0x80(r3) -/* 801CDE8C 80 9F 03 60 */ lwz r4, 0x360(r31) -/* 801CDE90 80 1F 03 64 */ lwz r0, 0x364(r31) -/* 801CDE94 90 83 00 84 */ stw r4, 0x84(r3) -/* 801CDE98 90 03 00 88 */ stw r0, 0x88(r3) -/* 801CDE9C 80 1F 03 68 */ lwz r0, 0x368(r31) -/* 801CDEA0 90 03 00 8C */ stw r0, 0x8c(r3) -/* 801CDEA4 80 9F 03 6C */ lwz r4, 0x36c(r31) -/* 801CDEA8 80 1F 03 70 */ lwz r0, 0x370(r31) -/* 801CDEAC 90 83 00 90 */ stw r4, 0x90(r3) -/* 801CDEB0 90 03 00 94 */ stw r0, 0x94(r3) -/* 801CDEB4 80 1F 03 74 */ lwz r0, 0x374(r31) -/* 801CDEB8 90 03 00 98 */ stw r0, 0x98(r3) -/* 801CDEBC 80 9F 03 78 */ lwz r4, 0x378(r31) -/* 801CDEC0 80 1F 03 7C */ lwz r0, 0x37c(r31) -/* 801CDEC4 90 83 00 9C */ stw r4, 0x9c(r3) -/* 801CDEC8 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 801CDECC 80 1F 03 80 */ lwz r0, 0x380(r31) -/* 801CDED0 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 801CDED4 80 9F 03 84 */ lwz r4, 0x384(r31) -/* 801CDED8 80 1F 03 88 */ lwz r0, 0x388(r31) -/* 801CDEDC 90 83 00 A8 */ stw r4, 0xa8(r3) -/* 801CDEE0 90 03 00 AC */ stw r0, 0xac(r3) -/* 801CDEE4 80 1F 03 8C */ lwz r0, 0x38c(r31) -/* 801CDEE8 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 801CDEEC 80 9F 03 90 */ lwz r4, 0x390(r31) -/* 801CDEF0 80 1F 03 94 */ lwz r0, 0x394(r31) -/* 801CDEF4 90 83 00 B4 */ stw r4, 0xb4(r3) -/* 801CDEF8 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 801CDEFC 80 1F 03 98 */ lwz r0, 0x398(r31) -/* 801CDF00 90 03 00 BC */ stw r0, 0xbc(r3) -/* 801CDF04 80 9F 03 9C */ lwz r4, 0x39c(r31) -/* 801CDF08 80 1F 03 A0 */ lwz r0, 0x3a0(r31) -/* 801CDF0C 90 83 00 C0 */ stw r4, 0xc0(r3) -/* 801CDF10 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 801CDF14 80 1F 03 A4 */ lwz r0, 0x3a4(r31) -/* 801CDF18 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 801CDF1C 80 9F 03 A8 */ lwz r4, 0x3a8(r31) -/* 801CDF20 80 1F 03 AC */ lwz r0, 0x3ac(r31) -/* 801CDF24 90 83 00 CC */ stw r4, 0xcc(r3) -/* 801CDF28 90 03 00 D0 */ stw r0, 0xd0(r3) -/* 801CDF2C 80 1F 03 B0 */ lwz r0, 0x3b0(r31) -/* 801CDF30 90 03 00 D4 */ stw r0, 0xd4(r3) -/* 801CDF34 80 9F 03 B4 */ lwz r4, 0x3b4(r31) -/* 801CDF38 80 1F 03 B8 */ lwz r0, 0x3b8(r31) -/* 801CDF3C 90 83 00 D8 */ stw r4, 0xd8(r3) -/* 801CDF40 90 03 00 DC */ stw r0, 0xdc(r3) -/* 801CDF44 80 1F 03 BC */ lwz r0, 0x3bc(r31) -/* 801CDF48 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 801CDF4C 80 9F 03 C0 */ lwz r4, 0x3c0(r31) -/* 801CDF50 80 1F 03 C4 */ lwz r0, 0x3c4(r31) -/* 801CDF54 90 83 00 E4 */ stw r4, 0xe4(r3) -/* 801CDF58 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 801CDF5C 80 1F 03 C8 */ lwz r0, 0x3c8(r31) -/* 801CDF60 90 03 00 EC */ stw r0, 0xec(r3) -/* 801CDF64 80 9F 03 CC */ lwz r4, 0x3cc(r31) -/* 801CDF68 80 1F 03 D0 */ lwz r0, 0x3d0(r31) -/* 801CDF6C 90 83 00 F0 */ stw r4, 0xf0(r3) -/* 801CDF70 90 03 00 F4 */ stw r0, 0xf4(r3) -/* 801CDF74 80 1F 03 D4 */ lwz r0, 0x3d4(r31) -/* 801CDF78 90 03 00 F8 */ stw r0, 0xf8(r3) -/* 801CDF7C 80 9F 03 D8 */ lwz r4, 0x3d8(r31) -/* 801CDF80 80 1F 03 DC */ lwz r0, 0x3dc(r31) -/* 801CDF84 90 83 00 FC */ stw r4, 0xfc(r3) -/* 801CDF88 90 03 01 00 */ stw r0, 0x100(r3) -/* 801CDF8C 80 1F 03 E0 */ lwz r0, 0x3e0(r31) -/* 801CDF90 90 03 01 04 */ stw r0, 0x104(r3) -/* 801CDF94 80 9F 03 E4 */ lwz r4, 0x3e4(r31) -/* 801CDF98 80 1F 03 E8 */ lwz r0, 0x3e8(r31) -/* 801CDF9C 90 83 01 08 */ stw r4, 0x108(r3) -/* 801CDFA0 90 03 01 0C */ stw r0, 0x10c(r3) -/* 801CDFA4 80 1F 03 EC */ lwz r0, 0x3ec(r31) -/* 801CDFA8 90 03 01 10 */ stw r0, 0x110(r3) -/* 801CDFAC 80 9F 03 F0 */ lwz r4, 0x3f0(r31) -/* 801CDFB0 80 1F 03 F4 */ lwz r0, 0x3f4(r31) -/* 801CDFB4 90 83 01 14 */ stw r4, 0x114(r3) -/* 801CDFB8 90 03 01 18 */ stw r0, 0x118(r3) -/* 801CDFBC 80 1F 03 F8 */ lwz r0, 0x3f8(r31) -/* 801CDFC0 90 03 01 1C */ stw r0, 0x11c(r3) -/* 801CDFC4 80 9F 03 FC */ lwz r4, 0x3fc(r31) -/* 801CDFC8 80 1F 04 00 */ lwz r0, 0x400(r31) -/* 801CDFCC 90 83 01 20 */ stw r4, 0x120(r3) -/* 801CDFD0 90 03 01 24 */ stw r0, 0x124(r3) -/* 801CDFD4 80 1F 04 04 */ lwz r0, 0x404(r31) -/* 801CDFD8 90 03 01 28 */ stw r0, 0x128(r3) -/* 801CDFDC 80 9F 04 08 */ lwz r4, 0x408(r31) -/* 801CDFE0 80 1F 04 0C */ lwz r0, 0x40c(r31) -/* 801CDFE4 90 83 01 2C */ stw r4, 0x12c(r3) -/* 801CDFE8 90 03 01 30 */ stw r0, 0x130(r3) -/* 801CDFEC 80 1F 04 10 */ lwz r0, 0x410(r31) -/* 801CDFF0 90 03 01 34 */ stw r0, 0x134(r3) -/* 801CDFF4 80 9F 04 14 */ lwz r4, 0x414(r31) -/* 801CDFF8 80 1F 04 18 */ lwz r0, 0x418(r31) -/* 801CDFFC 90 83 01 38 */ stw r4, 0x138(r3) -/* 801CE000 90 03 01 3C */ stw r0, 0x13c(r3) -/* 801CE004 80 1F 04 1C */ lwz r0, 0x41c(r31) -/* 801CE008 90 03 01 40 */ stw r0, 0x140(r3) -/* 801CE00C 80 9F 04 20 */ lwz r4, 0x420(r31) -/* 801CE010 80 1F 04 24 */ lwz r0, 0x424(r31) -/* 801CE014 90 83 01 44 */ stw r4, 0x144(r3) -/* 801CE018 90 03 01 48 */ stw r0, 0x148(r3) -/* 801CE01C 80 1F 04 28 */ lwz r0, 0x428(r31) -/* 801CE020 90 03 01 4C */ stw r0, 0x14c(r3) -/* 801CE024 80 9F 04 2C */ lwz r4, 0x42c(r31) -/* 801CE028 80 1F 04 30 */ lwz r0, 0x430(r31) -/* 801CE02C 90 83 01 50 */ stw r4, 0x150(r3) -/* 801CE030 90 03 01 54 */ stw r0, 0x154(r3) -/* 801CE034 80 1F 04 34 */ lwz r0, 0x434(r31) -/* 801CE038 90 03 01 58 */ stw r0, 0x158(r3) -/* 801CE03C 80 9F 04 38 */ lwz r4, 0x438(r31) -/* 801CE040 80 1F 04 3C */ lwz r0, 0x43c(r31) -/* 801CE044 90 83 01 5C */ stw r4, 0x15c(r3) -/* 801CE048 90 03 01 60 */ stw r0, 0x160(r3) -/* 801CE04C 80 1F 04 40 */ lwz r0, 0x440(r31) -/* 801CE050 90 03 01 64 */ stw r0, 0x164(r3) -/* 801CE054 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE05C 7C 08 03 A6 */ mtlr r0 -/* 801CE060 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE064 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/_create__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/_create__12dMenu_Fmap_cFv.s deleted file mode 100644 index 7f28289ecf..0000000000 --- a/asm/d/menu/d_menu_fmap/_create__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,485 +0,0 @@ -lbl_801C6D64: -/* 801C6D64 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C6D68 7C 08 02 A6 */ mflr r0 -/* 801C6D6C 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C6D70 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801C6D74 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801C6D78 7C 7F 1B 78 */ mr r31, r3 -/* 801C6D7C 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6D80 48 10 7A 05 */ bl getTotalFreeSize__7JKRHeapFv -/* 801C6D84 38 60 12 48 */ li r3, 0x1248 -/* 801C6D88 48 10 7E C5 */ bl __nw__FUl -/* 801C6D8C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C6D90 41 82 00 0C */ beq lbl_801C6D9C -/* 801C6D94 48 00 87 D9 */ bl __ct__18dMenu_Fmap2DBack_cFv -/* 801C6D98 7C 60 1B 78 */ mr r0, r3 -lbl_801C6D9C: -/* 801C6D9C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 801C6DA0 4B E6 80 C1 */ bl dComIfGp_getNowLevel__Fv -/* 801C6DA4 38 03 FF FF */ addi r0, r3, -1 -/* 801C6DA8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C6DAC 98 03 12 27 */ stb r0, 0x1227(r3) -/* 801C6DB0 38 60 00 C8 */ li r3, 0xc8 -/* 801C6DB4 48 10 7E 99 */ bl __nw__FUl -/* 801C6DB8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C6DBC 41 82 00 14 */ beq lbl_801C6DD0 -/* 801C6DC0 80 9F 00 04 */ lwz r4, 4(r31) -/* 801C6DC4 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801C6DC8 48 00 EE 09 */ bl __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C6DCC 7C 60 1B 78 */ mr r0, r3 -lbl_801C6DD0: -/* 801C6DD0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801C6DD4 38 60 00 F0 */ li r3, 0xf0 -/* 801C6DD8 48 10 7E 75 */ bl __nw__FUl -/* 801C6DDC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C6DE0 41 82 00 0C */ beq lbl_801C6DEC -/* 801C6DE4 48 00 7E 41 */ bl __ct__15dMenu_FmapMap_cFv -/* 801C6DE8 7C 60 1B 78 */ mr r0, r3 -lbl_801C6DEC: -/* 801C6DEC 90 1F 00 B8 */ stw r0, 0xb8(r31) -/* 801C6DF0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C6DF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C6DF8 C0 03 00 74 */ lfs f0, 0x74(r3) -/* 801C6DFC C0 23 00 70 */ lfs f1, 0x70(r3) -/* 801C6E00 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C6E04 FC 20 08 1E */ fctiwz f1, f1 -/* 801C6E08 D8 21 00 08 */ stfd f1, 8(r1) -/* 801C6E0C 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801C6E10 FC 00 00 1E */ fctiwz f0, f0 -/* 801C6E14 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 801C6E18 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 801C6E1C D8 21 00 18 */ stfd f1, 0x18(r1) -/* 801C6E20 80 C1 00 1C */ lwz r6, 0x1c(r1) -/* 801C6E24 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 801C6E28 80 E1 00 24 */ lwz r7, 0x24(r1) -/* 801C6E2C 81 1F 00 BC */ lwz r8, 0xbc(r31) -/* 801C6E30 48 00 7F B9 */ bl _create__15dMenu_FmapMap_cFUsUsUsUsPv -/* 801C6E34 7F E3 FB 78 */ mr r3, r31 -/* 801C6E38 38 9F 00 8C */ addi r4, r31, 0x8c -/* 801C6E3C 3C A0 80 39 */ lis r5, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801C6E40 38 A5 60 E8 */ addi r5, r5, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801C6E44 38 A5 00 01 */ addi r5, r5, 1 -/* 801C6E48 38 C0 00 00 */ li r6, 0 -/* 801C6E4C 38 E0 00 00 */ li r7, 0 -/* 801C6E50 48 00 52 45 */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb -/* 801C6E54 7F E3 FB 78 */ mr r3, r31 -/* 801C6E58 48 00 54 59 */ bl decodeFieldMapData__12dMenu_Fmap_cFv -/* 801C6E5C 7F E3 FB 78 */ mr r3, r31 -/* 801C6E60 38 9F 00 90 */ addi r4, r31, 0x90 -/* 801C6E64 3C A0 80 39 */ lis r5, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801C6E68 38 A5 60 E8 */ addi r5, r5, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801C6E6C 38 A5 00 0F */ addi r5, r5, 0xf -/* 801C6E70 38 C0 00 00 */ li r6, 0 -/* 801C6E74 38 E0 00 00 */ li r7, 0 -/* 801C6E78 48 00 52 1D */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb -/* 801C6E7C 7F E3 FB 78 */ mr r3, r31 -/* 801C6E80 48 00 56 6D */ bl decodePortalData__12dMenu_Fmap_cFv -/* 801C6E84 80 1F 00 90 */ lwz r0, 0x90(r31) -/* 801C6E88 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C6E8C 90 03 00 70 */ stw r0, 0x70(r3) -/* 801C6E90 38 80 00 00 */ li r4, 0 -/* 801C6E94 90 9F 00 20 */ stw r4, 0x20(r31) -/* 801C6E98 7C 83 23 78 */ mr r3, r4 -/* 801C6E9C 38 00 00 08 */ li r0, 8 -/* 801C6EA0 7C 09 03 A6 */ mtctr r0 -lbl_801C6EA4: -/* 801C6EA4 7C BF 1A 14 */ add r5, r31, r3 -/* 801C6EA8 90 85 00 24 */ stw r4, 0x24(r5) -/* 801C6EAC 90 85 00 44 */ stw r4, 0x44(r5) -/* 801C6EB0 90 85 00 6C */ stw r4, 0x6c(r5) -/* 801C6EB4 38 63 00 04 */ addi r3, r3, 4 -/* 801C6EB8 42 00 FF EC */ bdnz lbl_801C6EA4 -/* 801C6EBC 38 00 00 00 */ li r0, 0 -/* 801C6EC0 98 1F 03 05 */ stb r0, 0x305(r31) -/* 801C6EC4 38 60 00 00 */ li r3, 0 -/* 801C6EC8 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C6ECC 38 00 00 08 */ li r0, 8 -/* 801C6ED0 7C 09 03 A6 */ mtctr r0 -lbl_801C6ED4: -/* 801C6ED4 7C 9F 1A 14 */ add r4, r31, r3 -/* 801C6ED8 D0 04 01 68 */ stfs f0, 0x168(r4) -/* 801C6EDC D0 04 01 88 */ stfs f0, 0x188(r4) -/* 801C6EE0 D0 04 01 28 */ stfs f0, 0x128(r4) -/* 801C6EE4 D0 04 01 48 */ stfs f0, 0x148(r4) -/* 801C6EE8 38 63 00 04 */ addi r3, r3, 4 -/* 801C6EEC 42 00 FF E8 */ bdnz lbl_801C6ED4 -/* 801C6EF0 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C6EF4 28 00 00 01 */ cmplwi r0, 1 -/* 801C6EF8 40 82 00 5C */ bne lbl_801C6F54 -/* 801C6EFC 38 00 00 00 */ li r0, 0 -/* 801C6F00 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C6F04 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C6F08 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C6F0C C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C6F10 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C6F14 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C6F18 3C 00 43 30 */ lis r0, 0x4330 -/* 801C6F1C 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C6F20 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C6F24 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C6F28 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C6F2C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C6F30 48 00 A2 19 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C6F34 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C6F38 38 80 00 0C */ li r4, 0xc -/* 801C6F3C C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C6F40 48 01 07 D5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C6F44 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C6F48 38 80 00 00 */ li r4, 0 -/* 801C6F4C 48 01 04 4D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C6F50 48 00 00 20 */ b lbl_801C6F70 -lbl_801C6F54: -/* 801C6F54 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C6F58 38 80 00 0C */ li r4, 0xc -/* 801C6F5C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C6F60 48 01 07 B5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C6F64 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C6F68 38 80 03 F9 */ li r4, 0x3f9 -/* 801C6F6C 48 01 04 2D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -lbl_801C6F70: -/* 801C6F70 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801C6F74 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C6F78 D0 03 11 D4 */ stfs f0, 0x11d4(r3) -/* 801C6F7C 8B DF 03 00 */ lbz r30, 0x300(r31) -/* 801C6F80 28 1E 00 06 */ cmplwi r30, 6 -/* 801C6F84 41 82 00 2C */ beq lbl_801C6FB0 -/* 801C6F88 28 1E 00 08 */ cmplwi r30, 8 -/* 801C6F8C 41 82 00 24 */ beq lbl_801C6FB0 -/* 801C6F90 28 1E 00 0E */ cmplwi r30, 0xe -/* 801C6F94 41 82 00 1C */ beq lbl_801C6FB0 -/* 801C6F98 28 1E 00 12 */ cmplwi r30, 0x12 -/* 801C6F9C 41 82 00 14 */ beq lbl_801C6FB0 -/* 801C6FA0 28 1E 00 17 */ cmplwi r30, 0x17 -/* 801C6FA4 41 82 00 0C */ beq lbl_801C6FB0 -/* 801C6FA8 28 1E 00 1B */ cmplwi r30, 0x1b -/* 801C6FAC 40 82 02 0C */ bne lbl_801C71B8 -lbl_801C6FB0: -/* 801C6FB0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C6FB4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C6FB8 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801C6FBC 28 00 00 00 */ cmplwi r0, 0 -/* 801C6FC0 41 82 00 10 */ beq lbl_801C6FD0 -/* 801C6FC4 88 1F 03 0C */ lbz r0, 0x30c(r31) -/* 801C6FC8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C6FCC 98 03 12 27 */ stb r0, 0x1227(r3) -lbl_801C6FD0: -/* 801C6FD0 8B DF 03 00 */ lbz r30, 0x300(r31) -/* 801C6FD4 28 1E 00 1B */ cmplwi r30, 0x1b -/* 801C6FD8 40 82 00 98 */ bne lbl_801C7070 -/* 801C6FDC 38 00 00 05 */ li r0, 5 -/* 801C6FE0 98 1F 03 00 */ stb r0, 0x300(r31) -/* 801C6FE4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C6FE8 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C6FEC 7F E3 FB 78 */ mr r3, r31 -/* 801C6FF0 38 04 00 01 */ addi r0, r4, 1 -/* 801C6FF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C6FF8 48 00 47 79 */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C6FFC 38 00 00 00 */ li r0, 0 -/* 801C7000 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C7004 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7008 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C700C C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C7010 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C7014 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C7018 3C 00 43 30 */ lis r0, 0x4330 -/* 801C701C 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C7020 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C7024 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C7028 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C702C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7030 48 00 A1 19 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C7034 9B DF 03 00 */ stb r30, 0x300(r31) -/* 801C7038 7F E3 FB 78 */ mr r3, r31 -/* 801C703C 48 00 69 21 */ bl getPlayerPos2D__12dMenu_Fmap_cFv -/* 801C7040 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7044 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C7048 48 00 DA E5 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl -/* 801C704C 7F E3 FB 78 */ mr r3, r31 -/* 801C7050 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C7054 38 80 00 01 */ li r4, 1 -/* 801C7058 48 00 5A B1 */ bl drawIcon__12dMenu_Fmap_cFfb -/* 801C705C 7F E3 FB 78 */ mr r3, r31 -/* 801C7060 48 00 68 55 */ bl getHowlRegionID__12dMenu_Fmap_cFv -/* 801C7064 38 03 FF FF */ addi r0, r3, -1 -/* 801C7068 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C706C 98 03 12 27 */ stb r0, 0x1227(r3) -lbl_801C7070: -/* 801C7070 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7074 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C7078 7F E3 FB 78 */ mr r3, r31 -/* 801C707C 38 04 00 01 */ addi r0, r4, 1 -/* 801C7080 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C7084 48 00 46 ED */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C7088 38 00 00 0A */ li r0, 0xa -/* 801C708C B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C7090 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7094 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C7098 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C709C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C70A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C70A4 3C 00 43 30 */ lis r0, 0x4330 -/* 801C70A8 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C70AC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C70B0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C70B4 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C70B8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C70BC 48 00 A0 8D */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C70C0 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C70C4 28 00 00 01 */ cmplwi r0, 1 -/* 801C70C8 40 82 00 64 */ bne lbl_801C712C -/* 801C70CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C70D0 38 80 00 01 */ li r4, 1 -/* 801C70D4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C70D8 48 01 06 3D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C70DC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C70E0 38 80 00 02 */ li r4, 2 -/* 801C70E4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C70E8 48 01 06 2D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C70EC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C70F0 38 80 05 22 */ li r4, 0x522 -/* 801C70F4 38 A0 00 FF */ li r5, 0xff -/* 801C70F8 48 01 01 19 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C70FC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7100 38 80 00 00 */ li r4, 0 -/* 801C7104 38 A0 00 FF */ li r5, 0xff -/* 801C7108 48 01 01 CD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C710C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7110 38 80 05 2A */ li r4, 0x52a -/* 801C7114 38 A0 00 FF */ li r5, 0xff -/* 801C7118 48 00 FF D1 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C711C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7120 38 80 05 26 */ li r4, 0x526 -/* 801C7124 48 01 03 C9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C7128 48 00 02 E8 */ b lbl_801C7410 -lbl_801C712C: -/* 801C712C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7130 38 80 00 03 */ li r4, 3 -/* 801C7134 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C7138 48 01 05 DD */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C713C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7140 38 80 05 22 */ li r4, 0x522 -/* 801C7144 38 A0 00 FF */ li r5, 0xff -/* 801C7148 48 01 00 C9 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C714C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7150 38 80 05 27 */ li r4, 0x527 -/* 801C7154 38 A0 00 FF */ li r5, 0xff -/* 801C7158 48 01 01 7D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C715C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7160 38 80 05 29 */ li r4, 0x529 -/* 801C7164 38 A0 00 FF */ li r5, 0xff -/* 801C7168 48 00 FF 81 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C716C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7170 38 80 05 28 */ li r4, 0x528 -/* 801C7174 48 01 03 79 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C7178 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C717C 38 63 00 04 */ addi r3, r3, 4 -/* 801C7180 38 80 00 00 */ li r4, 0 -/* 801C7184 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7188 FC 40 08 90 */ fmr f2, f1 -/* 801C718C C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801C7190 4B FF CD 35 */ bl iconScale__16dMenuMapCommon_cFifff -/* 801C7194 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7198 28 00 00 12 */ cmplwi r0, 0x12 -/* 801C719C 41 82 00 10 */ beq lbl_801C71AC -/* 801C71A0 7F E3 FB 78 */ mr r3, r31 -/* 801C71A4 48 00 62 BD */ bl arrowPosInit__12dMenu_Fmap_cFv -/* 801C71A8 48 00 02 68 */ b lbl_801C7410 -lbl_801C71AC: -/* 801C71AC 7F E3 FB 78 */ mr r3, r31 -/* 801C71B0 48 00 65 C1 */ bl yamibossArrowPosInit__12dMenu_Fmap_cFv -/* 801C71B4 48 00 02 5C */ b lbl_801C7410 -lbl_801C71B8: -/* 801C71B8 28 1E 00 0D */ cmplwi r30, 0xd -/* 801C71BC 40 82 01 54 */ bne lbl_801C7310 -/* 801C71C0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C71C4 3B C3 FC 60 */ addi r30, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C71C8 88 1E 02 F9 */ lbz r0, 0x2f9(r30) -/* 801C71CC 28 00 00 00 */ cmplwi r0, 0 -/* 801C71D0 41 82 00 10 */ beq lbl_801C71E0 -/* 801C71D4 88 1F 03 0C */ lbz r0, 0x30c(r31) -/* 801C71D8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C71DC 98 03 12 27 */ stb r0, 0x1227(r3) -lbl_801C71E0: -/* 801C71E0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C71E4 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C71E8 7F E3 FB 78 */ mr r3, r31 -/* 801C71EC 38 04 00 01 */ addi r0, r4, 1 -/* 801C71F0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C71F4 48 00 45 7D */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C71F8 38 00 00 0A */ li r0, 0xa -/* 801C71FC B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C7200 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7204 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C7208 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C720C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C7210 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C7214 3C 00 43 30 */ lis r0, 0x4330 -/* 801C7218 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C721C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C7220 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C7224 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C7228 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C722C 48 00 9F 1D */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C7230 88 1E 02 F9 */ lbz r0, 0x2f9(r30) -/* 801C7234 28 00 00 00 */ cmplwi r0, 0 -/* 801C7238 41 82 00 10 */ beq lbl_801C7248 -/* 801C723C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7240 88 9F 03 0D */ lbz r4, 0x30d(r31) -/* 801C7244 48 00 AB 31 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -lbl_801C7248: -/* 801C7248 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C724C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C7250 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C7254 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C7258 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C725C 3C 00 43 30 */ lis r0, 0x4330 -/* 801C7260 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C7264 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C7268 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C726C C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C7270 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7274 48 00 A2 05 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801C7278 C0 3F 01 F4 */ lfs f1, 0x1f4(r31) -/* 801C727C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7280 C0 1F 01 F0 */ lfs f0, 0x1f0(r31) -/* 801C7284 D0 03 0F C8 */ stfs f0, 0xfc8(r3) -/* 801C7288 D0 23 0F CC */ stfs f1, 0xfcc(r3) -/* 801C728C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7290 38 80 00 01 */ li r4, 1 -/* 801C7294 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C7298 48 01 04 7D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C729C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C72A0 38 80 00 02 */ li r4, 2 -/* 801C72A4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C72A8 48 01 04 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C72AC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C72B0 38 80 05 22 */ li r4, 0x522 -/* 801C72B4 38 A0 00 FF */ li r5, 0xff -/* 801C72B8 48 00 FF 59 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C72BC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C72C0 38 80 00 00 */ li r4, 0 -/* 801C72C4 38 A0 00 FF */ li r5, 0xff -/* 801C72C8 48 01 00 0D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C72CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C72D0 38 80 05 29 */ li r4, 0x529 -/* 801C72D4 38 A0 00 FF */ li r5, 0xff -/* 801C72D8 48 00 FE 11 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C72DC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C72E0 38 80 05 28 */ li r4, 0x528 -/* 801C72E4 48 01 02 09 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C72E8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C72EC 38 63 00 04 */ addi r3, r3, 4 -/* 801C72F0 38 80 00 00 */ li r4, 0 -/* 801C72F4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C72F8 FC 40 08 90 */ fmr f2, f1 -/* 801C72FC C0 62 A7 24 */ lfs f3, lit_3995(r2) -/* 801C7300 4B FF CB C5 */ bl iconScale__16dMenuMapCommon_cFifff -/* 801C7304 7F E3 FB 78 */ mr r3, r31 -/* 801C7308 48 00 61 59 */ bl arrowPosInit__12dMenu_Fmap_cFv -/* 801C730C 48 00 01 04 */ b lbl_801C7410 -lbl_801C7310: -/* 801C7310 38 00 00 05 */ li r0, 5 -/* 801C7314 98 1F 03 00 */ stb r0, 0x300(r31) -/* 801C7318 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C731C 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C7320 7F E3 FB 78 */ mr r3, r31 -/* 801C7324 38 04 00 01 */ addi r0, r4, 1 -/* 801C7328 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C732C 48 00 44 45 */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C7330 38 00 00 00 */ li r0, 0 -/* 801C7334 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C7338 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C733C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C7340 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C7344 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C7348 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C734C 3C 00 43 30 */ lis r0, 0x4330 -/* 801C7350 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C7354 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801C7358 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C735C C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C7360 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7364 48 00 9D E5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C7368 9B DF 03 00 */ stb r30, 0x300(r31) -/* 801C736C 7F E3 FB 78 */ mr r3, r31 -/* 801C7370 48 00 65 ED */ bl getPlayerPos2D__12dMenu_Fmap_cFv -/* 801C7374 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7378 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C737C 48 00 D7 B1 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl -/* 801C7380 7F E3 FB 78 */ mr r3, r31 -/* 801C7384 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C7388 38 80 00 01 */ li r4, 1 -/* 801C738C 48 00 57 7D */ bl drawIcon__12dMenu_Fmap_cFfb -/* 801C7390 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7394 38 80 00 01 */ li r4, 1 -/* 801C7398 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C739C 48 01 03 79 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C73A0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C73A4 38 80 00 02 */ li r4, 2 -/* 801C73A8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C73AC 48 01 03 69 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C73B0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C73B4 38 80 00 00 */ li r4, 0 -/* 801C73B8 38 A0 00 FF */ li r5, 0xff -/* 801C73BC 48 00 FE 55 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C73C0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C73C4 38 80 05 27 */ li r4, 0x527 -/* 801C73C8 38 A0 00 FF */ li r5, 0xff -/* 801C73CC 48 00 FF 09 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C73D0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C73D4 38 80 05 29 */ li r4, 0x529 -/* 801C73D8 38 A0 00 FF */ li r5, 0xff -/* 801C73DC 48 00 FD 0D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C73E0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C73E4 38 80 05 24 */ li r4, 0x524 -/* 801C73E8 48 01 01 05 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C73EC 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C73F0 38 63 00 04 */ addi r3, r3, 4 -/* 801C73F4 38 80 00 00 */ li r4, 0 -/* 801C73F8 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C73FC FC 40 08 90 */ fmr f2, f1 -/* 801C7400 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801C7404 4B FF CA C1 */ bl iconScale__16dMenuMapCommon_cFifff -/* 801C7408 7F E3 FB 78 */ mr r3, r31 -/* 801C740C 48 00 60 55 */ bl arrowPosInit__12dMenu_Fmap_cFv -lbl_801C7410: -/* 801C7410 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7414 28 00 00 0E */ cmplwi r0, 0xe -/* 801C7418 41 82 00 24 */ beq lbl_801C743C -/* 801C741C 28 00 00 12 */ cmplwi r0, 0x12 -/* 801C7420 41 82 00 1C */ beq lbl_801C743C -/* 801C7424 28 00 00 03 */ cmplwi r0, 3 -/* 801C7428 41 82 00 14 */ beq lbl_801C743C -/* 801C742C 28 00 00 17 */ cmplwi r0, 0x17 -/* 801C7430 41 82 00 0C */ beq lbl_801C743C -/* 801C7434 28 00 00 1B */ cmplwi r0, 0x1b -/* 801C7438 40 82 00 10 */ bne lbl_801C7448 -lbl_801C743C: -/* 801C743C 38 00 00 00 */ li r0, 0 -/* 801C7440 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7444 98 03 12 3A */ stb r0, 0x123a(r3) -lbl_801C7448: -/* 801C7448 7F E3 FB 78 */ mr r3, r31 -/* 801C744C 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7450 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801C7454 3C 80 80 3C */ lis r4, init_process@ha /* 0x803BD204@ha */ -/* 801C7458 38 04 D2 04 */ addi r0, r4, init_process@l /* 0x803BD204@l */ -/* 801C745C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C7460 48 19 AC 25 */ bl __ptmf_scall -/* 801C7464 60 00 00 00 */ nop -/* 801C7468 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C746C 28 00 00 1B */ cmplwi r0, 0x1b -/* 801C7470 41 82 00 0C */ beq lbl_801C747C -/* 801C7474 7F E3 FB 78 */ mr r3, r31 -/* 801C7478 48 00 64 E5 */ bl getPlayerPos2D__12dMenu_Fmap_cFv -lbl_801C747C: -/* 801C747C 38 00 00 00 */ li r0, 0 -/* 801C7480 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C7484 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C7488 98 03 02 F9 */ stb r0, 0x2f9(r3) -/* 801C748C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801C7490 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 801C7494 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C7498 7C 08 03 A6 */ mtlr r0 -/* 801C749C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C74A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/_draw__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/_draw__12dMenu_Fmap_cFv.s deleted file mode 100644 index 68f4cb9b01..0000000000 --- a/asm/d/menu/d_menu_fmap/_draw__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_801C7650: -/* 801C7650 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C7654 7C 08 02 A6 */ mflr r0 -/* 801C7658 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C765C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C7660 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C7664 7C 7F 1B 78 */ mr r31, r3 -/* 801C7668 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C766C 28 04 00 00 */ cmplwi r4, 0 -/* 801C7670 41 82 01 68 */ beq lbl_801C77D8 -/* 801C7674 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 801C7678 28 00 00 00 */ cmplwi r0, 0 -/* 801C767C 41 82 01 5C */ beq lbl_801C77D8 -/* 801C7680 88 1F 03 05 */ lbz r0, 0x305(r31) -/* 801C7684 28 00 00 00 */ cmplwi r0, 0 -/* 801C7688 41 82 00 A4 */ beq lbl_801C772C -/* 801C768C C0 84 0F A0 */ lfs f4, 0xfa0(r4) -/* 801C7690 C0 64 0F 94 */ lfs f3, 0xf94(r4) -/* 801C7694 C0 44 0F 90 */ lfs f2, 0xf90(r4) -/* 801C7698 C0 24 0F 8C */ lfs f1, 0xf8c(r4) -/* 801C769C 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C76A0 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801C76A4 88 BF 03 0A */ lbz r5, 0x30a(r31) -/* 801C76A8 48 00 7D A9 */ bl setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff -/* 801C76AC 80 9F 00 B8 */ lwz r4, 0xb8(r31) -/* 801C76B0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C76B4 88 1F 03 06 */ lbz r0, 0x306(r31) -/* 801C76B8 98 03 12 24 */ stb r0, 0x1224(r3) -/* 801C76BC 90 83 0C DC */ stw r4, 0xcdc(r3) -/* 801C76C0 7F E3 FB 78 */ mr r3, r31 -/* 801C76C4 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C76C8 38 80 00 00 */ li r4, 0 -/* 801C76CC 48 00 54 3D */ bl drawIcon__12dMenu_Fmap_cFfb -/* 801C76D0 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C76D4 28 00 00 0B */ cmplwi r0, 0xb -/* 801C76D8 41 82 00 2C */ beq lbl_801C7704 -/* 801C76DC 28 00 00 0C */ cmplwi r0, 0xc -/* 801C76E0 41 82 00 24 */ beq lbl_801C7704 -/* 801C76E4 28 00 00 15 */ cmplwi r0, 0x15 -/* 801C76E8 41 82 00 1C */ beq lbl_801C7704 -/* 801C76EC 28 00 00 17 */ cmplwi r0, 0x17 -/* 801C76F0 41 82 00 14 */ beq lbl_801C7704 -/* 801C76F4 28 00 00 19 */ cmplwi r0, 0x19 -/* 801C76F8 41 82 00 0C */ beq lbl_801C7704 -/* 801C76FC 28 00 00 1B */ cmplwi r0, 0x1b -/* 801C7700 40 82 00 8C */ bne lbl_801C778C -lbl_801C7704: -/* 801C7704 C0 62 A7 24 */ lfs f3, lit_3995(r2) -/* 801C7708 C0 1F 01 EC */ lfs f0, 0x1ec(r31) -/* 801C770C EC 23 00 28 */ fsubs f1, f3, f0 -/* 801C7710 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7714 38 63 00 04 */ addi r3, r3, 4 -/* 801C7718 38 80 00 00 */ li r4, 0 -/* 801C771C FC 40 08 90 */ fmr f2, f1 -/* 801C7720 EC 63 08 28 */ fsubs f3, f3, f1 -/* 801C7724 4B FF C7 A1 */ bl iconScale__16dMenuMapCommon_cFifff -/* 801C7728 48 00 00 64 */ b lbl_801C778C -lbl_801C772C: -/* 801C772C 48 00 5B 29 */ bl drawPortalIcon__12dMenu_Fmap_cFv -/* 801C7730 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7734 28 00 00 04 */ cmplwi r0, 4 -/* 801C7738 41 82 00 0C */ beq lbl_801C7744 -/* 801C773C 28 00 00 05 */ cmplwi r0, 5 -/* 801C7740 40 82 00 4C */ bne lbl_801C778C -lbl_801C7744: -/* 801C7744 C0 62 A7 24 */ lfs f3, lit_3995(r2) -/* 801C7748 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C774C C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C7750 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C7754 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C7758 3C 00 43 30 */ lis r0, 0x4330 -/* 801C775C 90 01 00 08 */ stw r0, 8(r1) -/* 801C7760 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C7764 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C7768 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C776C EC 01 00 24 */ fdivs f0, f1, f0 -/* 801C7770 EC 23 00 28 */ fsubs f1, f3, f0 -/* 801C7774 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7778 38 63 00 04 */ addi r3, r3, 4 -/* 801C777C 38 80 00 00 */ li r4, 0 -/* 801C7780 FC 40 08 90 */ fmr f2, f1 -/* 801C7784 EC 63 08 28 */ fsubs f3, f3, f1 -/* 801C7788 4B FF C7 3D */ bl iconScale__16dMenuMapCommon_cFifff -lbl_801C778C: -/* 801C778C 38 80 00 01 */ li r4, 1 -/* 801C7790 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C7794 88 03 00 BB */ lbz r0, 0xbb(r3) -/* 801C7798 7C 84 00 38 */ and r4, r4, r0 -/* 801C779C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C77A0 98 83 12 39 */ stb r4, 0x1239(r3) -/* 801C77A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C77A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C77AC 3B C3 5F 64 */ addi r30, r3, 0x5f64 -/* 801C77B0 7F C3 F3 78 */ mr r3, r30 -/* 801C77B4 38 9E 01 B4 */ addi r4, r30, 0x1b4 -/* 801C77B8 38 BE 01 B8 */ addi r5, r30, 0x1b8 -/* 801C77BC 80 DF 00 14 */ lwz r6, 0x14(r31) -/* 801C77C0 4B E8 EF D5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801C77C4 7F C3 F3 78 */ mr r3, r30 -/* 801C77C8 38 9E 00 AC */ addi r4, r30, 0xac -/* 801C77CC 38 BE 00 B0 */ addi r5, r30, 0xb0 -/* 801C77D0 80 DF 00 18 */ lwz r6, 0x18(r31) -/* 801C77D4 4B E8 EF C1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801C77D8: -/* 801C77D8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C77DC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801C77E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C77E4 7C 08 03 A6 */ mtlr r0 -/* 801C77E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C77EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index fd2f54749a..0000000000 --- a/asm/d/menu/d_menu_fmap/_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_801C74A8: -/* 801C74A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C74AC 7C 08 02 A6 */ mflr r0 -/* 801C74B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C74B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C74B8 93 C1 00 08 */ stw r30, 8(r1) -/* 801C74BC 7C 7F 1B 78 */ mr r31, r3 -/* 801C74C0 8B C3 03 00 */ lbz r30, 0x300(r3) -/* 801C74C4 38 00 00 00 */ li r0, 0 -/* 801C74C8 98 03 03 10 */ stb r0, 0x310(r3) -/* 801C74CC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801C74D0 38 63 00 04 */ addi r3, r3, 4 -/* 801C74D4 4B FF CF 69 */ bl clearIconInfo__16dMenuMapCommon_cFv -/* 801C74D8 7F E3 FB 78 */ mr r3, r31 -/* 801C74DC 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C74E0 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801C74E4 3C 80 80 3C */ lis r4, move_process@ha /* 0x803BD4D4@ha */ -/* 801C74E8 38 04 D4 D4 */ addi r0, r4, move_process@l /* 0x803BD4D4@l */ -/* 801C74EC 7D 80 2A 14 */ add r12, r0, r5 -/* 801C74F0 48 19 AB 95 */ bl __ptmf_scall -/* 801C74F4 60 00 00 00 */ nop -/* 801C74F8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C74FC 48 00 F5 49 */ bl _execute__17dMenu_Fmap2DTop_cFv -/* 801C7500 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7504 3C 80 80 43 */ lis r4, g_fmHIO@ha /* 0x8042E82C@ha */ -/* 801C7508 38 84 E8 2C */ addi r4, r4, g_fmHIO@l /* 0x8042E82C@l */ -/* 801C750C 88 84 00 10 */ lbz r4, 0x10(r4) -/* 801C7510 48 00 D5 ED */ bl setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc -/* 801C7514 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7518 3C 80 80 43 */ lis r4, g_fmHIO@ha /* 0x8042E82C@ha */ -/* 801C751C 38 84 E8 2C */ addi r4, r4, g_fmHIO@l /* 0x8042E82C@l */ -/* 801C7520 C0 24 00 08 */ lfs f1, 8(r4) -/* 801C7524 48 00 D4 BD */ bl btkAnimeLoop__18dMenu_Fmap2DBack_cFf -/* 801C7528 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C752C 3C 80 80 43 */ lis r4, g_fmHIO@ha /* 0x8042E82C@ha */ -/* 801C7530 38 84 E8 2C */ addi r4, r4, g_fmHIO@l /* 0x8042E82C@l */ -/* 801C7534 88 84 00 11 */ lbz r4, 0x11(r4) -/* 801C7538 48 00 F9 A5 */ bl setMoyaAlpha__17dMenu_Fmap2DTop_cFUc -/* 801C753C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7540 80 83 00 10 */ lwz r4, 0x10(r3) -/* 801C7544 3C A0 80 43 */ lis r5, g_fmHIO@ha /* 0x8042E82C@ha */ -/* 801C7548 38 A5 E8 2C */ addi r5, r5, g_fmHIO@l /* 0x8042E82C@l */ -/* 801C754C C0 25 00 0C */ lfs f1, 0xc(r5) -/* 801C7550 48 00 F8 A9 */ bl btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf -/* 801C7554 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7558 7C 00 F0 40 */ cmplw r0, r30 -/* 801C755C 41 82 00 20 */ beq lbl_801C757C -/* 801C7560 7F E3 FB 78 */ mr r3, r31 -/* 801C7564 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801C7568 3C 80 80 3C */ lis r4, init_process@ha /* 0x803BD204@ha */ -/* 801C756C 38 04 D2 04 */ addi r0, r4, init_process@l /* 0x803BD204@l */ -/* 801C7570 7D 80 2A 14 */ add r12, r0, r5 -/* 801C7574 48 19 AB 11 */ bl __ptmf_scall -/* 801C7578 60 00 00 00 */ nop -lbl_801C757C: -/* 801C757C 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C7580 28 00 00 0A */ cmplwi r0, 0xa -/* 801C7584 40 82 00 14 */ bne lbl_801C7598 -/* 801C7588 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C758C 38 80 00 01 */ li r4, 1 -/* 801C7590 48 00 D3 99 */ bl calcBackAlpha__18dMenu_Fmap2DBack_cFb -/* 801C7594 48 00 00 10 */ b lbl_801C75A4 -lbl_801C7598: -/* 801C7598 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C759C 38 80 00 00 */ li r4, 0 -/* 801C75A0 48 00 D3 89 */ bl calcBackAlpha__18dMenu_Fmap2DBack_cFb -lbl_801C75A4: -/* 801C75A4 C0 3F 01 20 */ lfs f1, 0x120(r31) -/* 801C75A8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C75AC C0 1F 01 1C */ lfs f0, 0x11c(r31) -/* 801C75B0 D0 03 0F BC */ stfs f0, 0xfbc(r3) -/* 801C75B4 D0 23 0F C0 */ stfs f1, 0xfc0(r3) -/* 801C75B8 C0 3F 01 20 */ lfs f1, 0x120(r31) -/* 801C75BC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C75C0 C0 1F 01 1C */ lfs f0, 0x11c(r31) -/* 801C75C4 D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801C75C8 D0 23 00 7C */ stfs f1, 0x7c(r3) -/* 801C75CC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C75D0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C75D4 88 03 02 FF */ lbz r0, 0x2ff(r3) -/* 801C75D8 28 00 00 00 */ cmplwi r0, 0 -/* 801C75DC 41 82 00 0C */ beq lbl_801C75E8 -/* 801C75E0 7F E3 FB 78 */ mr r3, r31 -/* 801C75E4 48 00 5E 0D */ bl drawDebugStage__12dMenu_Fmap_cFv -lbl_801C75E8: -/* 801C75E8 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C75EC C0 1F 01 A8 */ lfs f0, 0x1a8(r31) -/* 801C75F0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801C75F4 41 82 00 44 */ beq lbl_801C7638 -/* 801C75F8 38 7F 01 A8 */ addi r3, r31, 0x1a8 -/* 801C75FC C0 42 A7 48 */ lfs f2, lit_4397(r2) -/* 801C7600 C0 62 A7 4C */ lfs f3, lit_4398(r2) -/* 801C7604 48 0A 84 39 */ bl cLib_addCalc2__FPffff -/* 801C7608 C0 1F 01 A8 */ lfs f0, 0x1a8(r31) -/* 801C760C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7610 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801C7614 FC 00 02 10 */ fabs f0, f0 -/* 801C7618 FC 40 00 18 */ frsp f2, f0 -/* 801C761C C0 02 A7 50 */ lfs f0, lit_4399(r2) -/* 801C7620 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801C7624 40 80 00 08 */ bge lbl_801C762C -/* 801C7628 D0 3F 01 A8 */ stfs f1, 0x1a8(r31) -lbl_801C762C: -/* 801C762C C0 1F 01 A8 */ lfs f0, 0x1a8(r31) -/* 801C7630 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7634 D0 03 11 D8 */ stfs f0, 0x11d8(r3) -lbl_801C7638: -/* 801C7638 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C763C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801C7640 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C7644 7C 08 03 A6 */ mtlr r0 -/* 801C7648 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C764C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/all_map_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/all_map_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0fa9215023..0000000000 --- a/asm/d/menu/d_menu_fmap/all_map_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_801C7B24: -/* 801C7B24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C7B28 7C 08 02 A6 */ mflr r0 -/* 801C7B2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C7B30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C7B34 7C 7F 1B 78 */ mr r31, r3 -/* 801C7B38 88 03 03 07 */ lbz r0, 0x307(r3) -/* 801C7B3C 28 00 00 01 */ cmplwi r0, 1 -/* 801C7B40 40 82 00 20 */ bne lbl_801C7B60 -/* 801C7B44 38 80 05 25 */ li r4, 0x525 -/* 801C7B48 48 00 4D 15 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C7B4C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7B50 38 80 05 2A */ li r4, 0x52a -/* 801C7B54 38 A0 00 FF */ li r5, 0xff -/* 801C7B58 48 00 F5 91 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7B5C 48 00 00 1C */ b lbl_801C7B78 -lbl_801C7B60: -/* 801C7B60 A0 9F 02 16 */ lhz r4, 0x216(r31) -/* 801C7B64 48 00 4C F9 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C7B68 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7B6C 38 80 05 29 */ li r4, 0x529 -/* 801C7B70 38 A0 00 FF */ li r5, 0xff -/* 801C7B74 48 00 F5 75 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -lbl_801C7B78: -/* 801C7B78 38 00 00 01 */ li r0, 1 -/* 801C7B7C 98 1F 03 12 */ stb r0, 0x312(r31) -/* 801C7B80 88 1F 03 13 */ lbz r0, 0x313(r31) -/* 801C7B84 28 00 00 00 */ cmplwi r0, 0 -/* 801C7B88 40 82 00 10 */ bne lbl_801C7B98 -/* 801C7B8C 7F E3 FB 78 */ mr r3, r31 -/* 801C7B90 48 00 4D 1D */ bl setAreaNameZero__12dMenu_Fmap_cFv -/* 801C7B94 48 00 00 20 */ b lbl_801C7BB4 -lbl_801C7B98: -/* 801C7B98 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7B9C 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801C7BA0 7F E3 FB 78 */ mr r3, r31 -/* 801C7BA4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C7BA8 7C 9F 02 14 */ add r4, r31, r0 -/* 801C7BAC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C7BB0 48 00 4C D1 */ bl setAreaName__12dMenu_Fmap_cFUl -lbl_801C7BB4: -/* 801C7BB4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C7BB8 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801C7BBC 98 1F 03 11 */ stb r0, 0x311(r31) -/* 801C7BC0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7BC4 38 80 00 01 */ li r4, 1 -/* 801C7BC8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C7BCC 48 00 FB 49 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C7BD0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7BD4 38 80 00 02 */ li r4, 2 -/* 801C7BD8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C7BDC 48 00 FB 39 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C7BE0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7BE4 38 80 03 F9 */ li r4, 0x3f9 -/* 801C7BE8 38 A0 00 FF */ li r5, 0xff -/* 801C7BEC 48 00 F6 25 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7BF0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7BF4 38 80 05 27 */ li r4, 0x527 -/* 801C7BF8 38 A0 00 FF */ li r5, 0xff -/* 801C7BFC 48 00 F6 D9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7C00 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7C04 38 80 05 24 */ li r4, 0x524 -/* 801C7C08 48 00 F8 E5 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C7C0C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C7C10 38 80 03 F9 */ li r4, 0x3f9 -/* 801C7C14 48 00 F7 85 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C7C18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C7C1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C7C20 7C 08 03 A6 */ mtlr r0 -/* 801C7C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C7C28 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/all_map_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/all_map_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index a9ceaf4fae..0000000000 --- a/asm/d/menu/d_menu_fmap/all_map_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,408 +0,0 @@ -lbl_801C7C2C: -/* 801C7C2C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801C7C30 7C 08 02 A6 */ mflr r0 -/* 801C7C34 90 01 00 44 */ stw r0, 0x44(r1) -/* 801C7C38 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C7C3C 48 19 A5 A1 */ bl _savegpr_29 -/* 801C7C40 7C 7E 1B 78 */ mr r30, r3 -/* 801C7C44 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C7C48 4B E6 A5 55 */ bl checkTrigger__9STControlFv -/* 801C7C4C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7C50 8B E3 12 26 */ lbz r31, 0x1226(r3) -/* 801C7C54 3B A0 00 00 */ li r29, 0 -/* 801C7C58 88 1E 03 11 */ lbz r0, 0x311(r30) -/* 801C7C5C 7C 00 F8 40 */ cmplw r0, r31 -/* 801C7C60 41 82 00 0C */ beq lbl_801C7C6C -/* 801C7C64 9B FE 03 11 */ stb r31, 0x311(r30) -/* 801C7C68 3B A0 00 01 */ li r29, 1 -lbl_801C7C6C: -/* 801C7C6C 28 1F 00 FF */ cmplwi r31, 0xff -/* 801C7C70 41 82 00 90 */ beq lbl_801C7D00 -/* 801C7C74 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7C78 7F E4 FB 78 */ mr r4, r31 -/* 801C7C7C 48 00 A8 8D */ bl isShowRegion__18dMenu_Fmap2DBack_cFi -/* 801C7C80 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7C84 41 82 00 7C */ beq lbl_801C7D00 -/* 801C7C88 7F C3 F3 78 */ mr r3, r30 -/* 801C7C8C 38 9F 00 01 */ addi r4, r31, 1 -/* 801C7C90 48 00 56 6D */ bl getRegionStageNum__12dMenu_Fmap_cFi -/* 801C7C94 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C7C98 40 82 00 18 */ bne lbl_801C7CB0 -/* 801C7C9C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7CA0 38 80 00 00 */ li r4, 0 -/* 801C7CA4 38 A0 00 FF */ li r5, 0xff -/* 801C7CA8 48 00 F6 2D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7CAC 48 00 00 14 */ b lbl_801C7CC0 -lbl_801C7CB0: -/* 801C7CB0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7CB4 38 80 05 27 */ li r4, 0x527 -/* 801C7CB8 38 A0 00 FF */ li r5, 0xff -/* 801C7CBC 48 00 F6 19 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -lbl_801C7CC0: -/* 801C7CC0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 801C7CC4 41 82 00 4C */ beq lbl_801C7D10 -/* 801C7CC8 38 00 00 C1 */ li r0, 0xc1 -/* 801C7CCC 90 01 00 20 */ stw r0, 0x20(r1) -/* 801C7CD0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7CD4 38 81 00 20 */ addi r4, r1, 0x20 -/* 801C7CD8 38 A0 00 00 */ li r5, 0 -/* 801C7CDC 38 C0 00 00 */ li r6, 0 -/* 801C7CE0 38 E0 00 00 */ li r7, 0 -/* 801C7CE4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7CE8 FC 40 08 90 */ fmr f2, f1 -/* 801C7CEC C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7CF0 FC 80 18 90 */ fmr f4, f3 -/* 801C7CF4 39 00 00 00 */ li r8, 0 -/* 801C7CF8 48 0E 3C 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7CFC 48 00 00 14 */ b lbl_801C7D10 -lbl_801C7D00: -/* 801C7D00 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7D04 38 80 00 00 */ li r4, 0 -/* 801C7D08 38 A0 00 FF */ li r5, 0xff -/* 801C7D0C 48 00 F5 C9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -lbl_801C7D10: -/* 801C7D10 48 03 23 2D */ bl dMw_A_TRIGGER__Fv -/* 801C7D14 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7D18 41 82 01 30 */ beq lbl_801C7E48 -/* 801C7D1C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7D20 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7D24 A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C7D28 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C7D2C 40 82 01 1C */ bne lbl_801C7E48 -/* 801C7D30 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C7D34 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C7D38 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C7D3C 28 00 00 01 */ cmplwi r0, 1 -/* 801C7D40 41 82 01 08 */ beq lbl_801C7E48 -/* 801C7D44 28 1F 00 FF */ cmplwi r31, 0xff -/* 801C7D48 41 82 00 18 */ beq lbl_801C7D60 -/* 801C7D4C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7D50 7F E4 FB 78 */ mr r4, r31 -/* 801C7D54 48 00 A7 B5 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi -/* 801C7D58 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7D5C 40 82 00 50 */ bne lbl_801C7DAC -lbl_801C7D60: -/* 801C7D60 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C7D64 28 00 00 00 */ cmplwi r0, 0 -/* 801C7D68 40 82 04 B0 */ bne lbl_801C8218 -/* 801C7D6C 38 00 00 4A */ li r0, 0x4a -/* 801C7D70 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801C7D74 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7D78 38 81 00 1C */ addi r4, r1, 0x1c -/* 801C7D7C 38 A0 00 00 */ li r5, 0 -/* 801C7D80 38 C0 00 00 */ li r6, 0 -/* 801C7D84 38 E0 00 00 */ li r7, 0 -/* 801C7D88 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7D8C FC 40 08 90 */ fmr f2, f1 -/* 801C7D90 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7D94 FC 80 18 90 */ fmr f4, f3 -/* 801C7D98 39 00 00 00 */ li r8, 0 -/* 801C7D9C 48 0E 3B E9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7DA0 38 00 00 01 */ li r0, 1 -/* 801C7DA4 98 1E 03 09 */ stb r0, 0x309(r30) -/* 801C7DA8 48 00 04 70 */ b lbl_801C8218 -lbl_801C7DAC: -/* 801C7DAC 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7DB0 9B E3 12 27 */ stb r31, 0x1227(r3) -/* 801C7DB4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7DB8 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C7DBC 7F C3 F3 78 */ mr r3, r30 -/* 801C7DC0 38 84 00 01 */ addi r4, r4, 1 -/* 801C7DC4 48 00 55 39 */ bl getRegionStageNum__12dMenu_Fmap_cFi -/* 801C7DC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C7DCC 40 82 00 50 */ bne lbl_801C7E1C -/* 801C7DD0 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C7DD4 28 00 00 00 */ cmplwi r0, 0 -/* 801C7DD8 40 82 04 40 */ bne lbl_801C8218 -/* 801C7DDC 38 00 00 4A */ li r0, 0x4a -/* 801C7DE0 90 01 00 18 */ stw r0, 0x18(r1) -/* 801C7DE4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7DE8 38 81 00 18 */ addi r4, r1, 0x18 -/* 801C7DEC 38 A0 00 00 */ li r5, 0 -/* 801C7DF0 38 C0 00 00 */ li r6, 0 -/* 801C7DF4 38 E0 00 00 */ li r7, 0 -/* 801C7DF8 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7DFC FC 40 08 90 */ fmr f2, f1 -/* 801C7E00 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7E04 FC 80 18 90 */ fmr f4, f3 -/* 801C7E08 39 00 00 00 */ li r8, 0 -/* 801C7E0C 48 0E 3B 79 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7E10 38 00 00 01 */ li r0, 1 -/* 801C7E14 98 1E 03 09 */ stb r0, 0x309(r30) -/* 801C7E18 48 00 04 00 */ b lbl_801C8218 -lbl_801C7E1C: -/* 801C7E1C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7E20 48 00 DC A5 */ bl calcDrawPriority__18dMenu_Fmap2DBack_cFv -/* 801C7E24 7F C3 F3 78 */ mr r3, r30 -/* 801C7E28 38 80 00 04 */ li r4, 4 -/* 801C7E2C 48 00 38 A5 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C7E30 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C7E34 28 00 00 01 */ cmplwi r0, 1 -/* 801C7E38 40 82 03 E0 */ bne lbl_801C8218 -/* 801C7E3C 38 00 00 00 */ li r0, 0 -/* 801C7E40 98 1E 03 09 */ stb r0, 0x309(r30) -/* 801C7E44 48 00 03 D4 */ b lbl_801C8218 -lbl_801C7E48: -/* 801C7E48 48 03 22 09 */ bl dMw_B_TRIGGER__Fv -/* 801C7E4C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7E50 41 82 00 44 */ beq lbl_801C7E94 -/* 801C7E54 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7E58 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7E5C A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C7E60 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C7E64 40 82 00 30 */ bne lbl_801C7E94 -/* 801C7E68 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C7E6C 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C7E70 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C7E74 28 00 00 01 */ cmplwi r0, 1 -/* 801C7E78 41 82 00 1C */ beq lbl_801C7E94 -/* 801C7E7C 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C7E80 28 00 00 01 */ cmplwi r0, 1 -/* 801C7E84 40 82 03 94 */ bne lbl_801C8218 -/* 801C7E88 38 00 00 00 */ li r0, 0 -/* 801C7E8C 98 1E 03 09 */ stb r0, 0x309(r30) -/* 801C7E90 48 00 03 88 */ b lbl_801C8218 -lbl_801C7E94: -/* 801C7E94 48 03 21 D1 */ bl dMw_Z_TRIGGER__Fv -/* 801C7E98 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7E9C 41 82 02 E4 */ beq lbl_801C8180 -/* 801C7EA0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7EA4 48 01 01 E5 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C7EA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C7EAC 41 82 02 D4 */ beq lbl_801C8180 -/* 801C7EB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C7EB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C7EB8 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801C7EBC 7F E3 FB 78 */ mr r3, r31 -/* 801C7EC0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C7EC4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C7EC8 A0 84 02 12 */ lhz r4, 0x212(r4) -/* 801C7ECC 4B E6 CA F1 */ bl isEventBit__11dSv_event_cCFUs -/* 801C7ED0 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7ED4 41 82 00 9C */ beq lbl_801C7F70 -/* 801C7ED8 7F E3 FB 78 */ mr r3, r31 -/* 801C7EDC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C7EE0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C7EE4 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801C7EE8 4B E6 CA D5 */ bl isEventBit__11dSv_event_cCFUs -/* 801C7EEC 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7EF0 40 82 00 80 */ bne lbl_801C7F70 -/* 801C7EF4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7EF8 80 9E 00 08 */ lwz r4, 8(r30) -/* 801C7EFC 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C7F00 48 00 F7 41 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C7F04 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7F08 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C7F0C 38 80 08 B4 */ li r4, 0x8b4 -/* 801C7F10 38 A0 00 00 */ li r5, 0 -/* 801C7F14 38 C0 00 00 */ li r6, 0 -/* 801C7F18 38 E0 00 FF */ li r7, 0xff -/* 801C7F1C 39 00 00 01 */ li r8, 1 -/* 801C7F20 48 07 66 39 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C7F24 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801C7F28 98 1E 03 02 */ stb r0, 0x302(r30) -/* 801C7F2C 7F C3 F3 78 */ mr r3, r30 -/* 801C7F30 38 80 00 0A */ li r4, 0xa -/* 801C7F34 48 00 37 9D */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C7F38 38 00 00 4A */ li r0, 0x4a -/* 801C7F3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C7F40 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7F44 38 81 00 14 */ addi r4, r1, 0x14 -/* 801C7F48 38 A0 00 00 */ li r5, 0 -/* 801C7F4C 38 C0 00 00 */ li r6, 0 -/* 801C7F50 38 E0 00 00 */ li r7, 0 -/* 801C7F54 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7F58 FC 40 08 90 */ fmr f2, f1 -/* 801C7F5C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7F60 FC 80 18 90 */ fmr f4, f3 -/* 801C7F64 39 00 00 00 */ li r8, 0 -/* 801C7F68 48 0E 3A 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7F6C 48 00 02 AC */ b lbl_801C8218 -lbl_801C7F70: -/* 801C7F70 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7F74 48 00 FA 21 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C7F78 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C7F7C 41 82 00 B0 */ beq lbl_801C802C -/* 801C7F80 88 1E 03 07 */ lbz r0, 0x307(r30) -/* 801C7F84 28 00 00 01 */ cmplwi r0, 1 -/* 801C7F88 40 82 00 54 */ bne lbl_801C7FDC -/* 801C7F8C 38 00 00 00 */ li r0, 0 -/* 801C7F90 98 1E 03 07 */ stb r0, 0x307(r30) -/* 801C7F94 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7F98 38 80 05 29 */ li r4, 0x529 -/* 801C7F9C 38 A0 00 FF */ li r5, 0xff -/* 801C7FA0 48 00 F1 49 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7FA4 38 00 00 49 */ li r0, 0x49 -/* 801C7FA8 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C7FAC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7FB0 38 81 00 10 */ addi r4, r1, 0x10 -/* 801C7FB4 38 A0 00 00 */ li r5, 0 -/* 801C7FB8 38 C0 00 00 */ li r6, 0 -/* 801C7FBC 38 E0 00 00 */ li r7, 0 -/* 801C7FC0 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7FC4 FC 40 08 90 */ fmr f2, f1 -/* 801C7FC8 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7FCC FC 80 18 90 */ fmr f4, f3 -/* 801C7FD0 39 00 00 00 */ li r8, 0 -/* 801C7FD4 48 0E 39 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7FD8 48 00 02 40 */ b lbl_801C8218 -lbl_801C7FDC: -/* 801C7FDC 38 00 00 01 */ li r0, 1 -/* 801C7FE0 98 1E 03 07 */ stb r0, 0x307(r30) -/* 801C7FE4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7FE8 38 80 05 2A */ li r4, 0x52a -/* 801C7FEC 38 A0 00 FF */ li r5, 0xff -/* 801C7FF0 48 00 F0 F9 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C7FF4 38 00 00 47 */ li r0, 0x47 -/* 801C7FF8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C7FFC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8000 38 81 00 0C */ addi r4, r1, 0xc -/* 801C8004 38 A0 00 00 */ li r5, 0 -/* 801C8008 38 C0 00 00 */ li r6, 0 -/* 801C800C 38 E0 00 00 */ li r7, 0 -/* 801C8010 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8014 FC 40 08 90 */ fmr f2, f1 -/* 801C8018 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C801C FC 80 18 90 */ fmr f4, f3 -/* 801C8020 39 00 00 00 */ li r8, 0 -/* 801C8024 48 0E 39 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C8028 48 00 01 F0 */ b lbl_801C8218 -lbl_801C802C: -/* 801C802C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8030 80 9E 00 08 */ lwz r4, 8(r30) -/* 801C8034 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8038 48 00 F6 09 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C803C 7F E3 FB 78 */ mr r3, r31 -/* 801C8040 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8044 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8048 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C804C 4B E6 C9 71 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8050 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8054 41 82 00 44 */ beq lbl_801C8098 -/* 801C8058 7F E3 FB 78 */ mr r3, r31 -/* 801C805C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8060 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8064 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C8068 4B E6 C9 55 */ bl isEventBit__11dSv_event_cCFUs -/* 801C806C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8070 40 82 00 28 */ bne lbl_801C8098 -/* 801C8074 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8078 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C807C 38 80 08 5D */ li r4, 0x85d -/* 801C8080 38 A0 00 00 */ li r5, 0 -/* 801C8084 38 C0 00 00 */ li r6, 0 -/* 801C8088 38 E0 00 FF */ li r7, 0xff -/* 801C808C 39 00 00 01 */ li r8, 1 -/* 801C8090 48 07 64 C9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8094 48 00 00 A0 */ b lbl_801C8134 -lbl_801C8098: -/* 801C8098 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C809C 48 00 FA BD */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv -/* 801C80A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C80A4 40 82 00 3C */ bne lbl_801C80E0 -/* 801C80A8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C80AC 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C80B0 38 80 07 DE */ li r4, 0x7de -/* 801C80B4 38 A0 00 00 */ li r5, 0 -/* 801C80B8 38 C0 00 00 */ li r6, 0 -/* 801C80BC 38 E0 00 FF */ li r7, 0xff -/* 801C80C0 39 00 00 01 */ li r8, 1 -/* 801C80C4 48 07 64 95 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C80C8 7F E3 FB 78 */ mr r3, r31 -/* 801C80CC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C80D0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C80D4 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C80D8 4B E6 C8 B5 */ bl onEventBit__11dSv_event_cFUs -/* 801C80DC 48 00 00 58 */ b lbl_801C8134 -lbl_801C80E0: -/* 801C80E0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C80E4 48 00 F9 D1 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv -/* 801C80E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C80EC 40 82 00 28 */ bne lbl_801C8114 -/* 801C80F0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C80F4 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C80F8 38 80 07 DD */ li r4, 0x7dd -/* 801C80FC 38 A0 00 00 */ li r5, 0 -/* 801C8100 38 C0 00 00 */ li r6, 0 -/* 801C8104 38 E0 00 FF */ li r7, 0xff -/* 801C8108 39 00 00 01 */ li r8, 1 -/* 801C810C 48 07 64 4D */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8110 48 00 00 24 */ b lbl_801C8134 -lbl_801C8114: -/* 801C8114 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8118 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C811C 38 80 05 1D */ li r4, 0x51d -/* 801C8120 38 A0 00 00 */ li r5, 0 -/* 801C8124 38 C0 00 00 */ li r6, 0 -/* 801C8128 38 E0 00 FF */ li r7, 0xff -/* 801C812C 39 00 00 01 */ li r8, 1 -/* 801C8130 48 07 64 29 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -lbl_801C8134: -/* 801C8134 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801C8138 98 1E 03 02 */ stb r0, 0x302(r30) -/* 801C813C 7F C3 F3 78 */ mr r3, r30 -/* 801C8140 38 80 00 0A */ li r4, 0xa -/* 801C8144 48 00 35 8D */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C8148 38 00 00 4A */ li r0, 0x4a -/* 801C814C 90 01 00 08 */ stw r0, 8(r1) -/* 801C8150 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8154 38 81 00 08 */ addi r4, r1, 8 -/* 801C8158 38 A0 00 00 */ li r5, 0 -/* 801C815C 38 C0 00 00 */ li r6, 0 -/* 801C8160 38 E0 00 00 */ li r7, 0 -/* 801C8164 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8168 FC 40 08 90 */ fmr f2, f1 -/* 801C816C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C8170 FC 80 18 90 */ fmr f4, f3 -/* 801C8174 39 00 00 00 */ li r8, 0 -/* 801C8178 48 0E 38 0D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C817C 48 00 00 9C */ b lbl_801C8218 -lbl_801C8180: -/* 801C8180 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C8184 8B E3 12 26 */ lbz r31, 0x1226(r3) -/* 801C8188 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C818C 48 00 9C 39 */ bl allmap_move2__18dMenu_Fmap2DBack_cFP9STControl -/* 801C8190 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C8194 88 03 12 26 */ lbz r0, 0x1226(r3) -/* 801C8198 7C 1F 00 40 */ cmplw r31, r0 -/* 801C819C 40 82 00 10 */ bne lbl_801C81AC -/* 801C81A0 88 1E 03 12 */ lbz r0, 0x312(r30) -/* 801C81A4 28 00 00 00 */ cmplwi r0, 0 -/* 801C81A8 41 82 00 5C */ beq lbl_801C8204 -lbl_801C81AC: -/* 801C81AC 38 00 00 00 */ li r0, 0 -/* 801C81B0 98 1E 03 12 */ stb r0, 0x312(r30) -/* 801C81B4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C81B8 88 83 12 26 */ lbz r4, 0x1226(r3) -/* 801C81BC 28 04 00 FF */ cmplwi r4, 0xff -/* 801C81C0 41 82 00 3C */ beq lbl_801C81FC -/* 801C81C4 48 00 A3 45 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi -/* 801C81C8 2C 03 00 00 */ cmpwi r3, 0 -/* 801C81CC 41 82 00 30 */ beq lbl_801C81FC -/* 801C81D0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C81D4 88 03 12 26 */ lbz r0, 0x1226(r3) -/* 801C81D8 7F C3 F3 78 */ mr r3, r30 -/* 801C81DC 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C81E0 7C 9E 02 14 */ add r4, r30, r0 -/* 801C81E4 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C81E8 48 00 46 99 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C81EC 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C81F0 38 80 00 00 */ li r4, 0 -/* 801C81F4 48 00 9B 81 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -/* 801C81F8 48 00 00 0C */ b lbl_801C8204 -lbl_801C81FC: -/* 801C81FC 7F C3 F3 78 */ mr r3, r30 -/* 801C8200 48 00 46 AD */ bl setAreaNameZero__12dMenu_Fmap_cFv -lbl_801C8204: -/* 801C8204 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C8208 28 00 00 01 */ cmplwi r0, 1 -/* 801C820C 40 82 00 0C */ bne lbl_801C8218 -/* 801C8210 38 00 00 00 */ li r0, 0 -/* 801C8214 98 1E 03 09 */ stb r0, 0x309(r30) -lbl_801C8218: -/* 801C8218 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C821C 48 19 A0 0D */ bl _restgpr_29 -/* 801C8220 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801C8224 7C 08 03 A6 */ mtlr r0 -/* 801C8228 38 21 00 40 */ addi r1, r1, 0x40 -/* 801C822C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/arrowPosInit__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/arrowPosInit__12dMenu_Fmap_cFv.s deleted file mode 100644 index 02c30d873a..0000000000 --- a/asm/d/menu/d_menu_fmap/arrowPosInit__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801CD460: -/* 801CD460 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801CD464 7C 08 02 A6 */ mflr r0 -/* 801CD468 90 01 00 44 */ stw r0, 0x44(r1) -/* 801CD46C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 801CD470 93 C1 00 38 */ stw r30, 0x38(r1) -/* 801CD474 7C 7E 1B 78 */ mr r30, r3 -/* 801CD478 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801CD47C 28 00 00 03 */ cmplwi r0, 3 -/* 801CD480 40 82 00 10 */ bne lbl_801CD490 -/* 801CD484 38 80 00 00 */ li r4, 0 -/* 801CD488 48 00 01 45 */ bl tableArrowPosInit__12dMenu_Fmap_cFb -/* 801CD48C 48 00 01 28 */ b lbl_801CD5B4 -lbl_801CD490: -/* 801CD490 28 00 00 1B */ cmplwi r0, 0x1b -/* 801CD494 40 82 00 0C */ bne lbl_801CD4A0 -/* 801CD498 48 00 03 7D */ bl howlArrowPosInit__12dMenu_Fmap_cFv -/* 801CD49C 48 00 01 18 */ b lbl_801CD5B4 -lbl_801CD4A0: -/* 801CD4A0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD4A4 8B E3 12 27 */ lbz r31, 0x1227(r3) -/* 801CD4A8 4B E6 19 B9 */ bl dComIfGp_getNowLevel__Fv -/* 801CD4AC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CD4B0 38 1F 00 01 */ addi r0, r31, 1 -/* 801CD4B4 7C 00 18 00 */ cmpw r0, r3 -/* 801CD4B8 40 82 00 DC */ bne lbl_801CD594 -/* 801CD4BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CD4C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CD4C4 88 03 00 7C */ lbz r0, 0x7c(r3) -/* 801CD4C8 28 00 00 00 */ cmplwi r0, 0 -/* 801CD4CC 41 82 00 3C */ beq lbl_801CD508 -/* 801CD4D0 38 61 00 20 */ addi r3, r1, 0x20 -/* 801CD4D4 4B E7 19 89 */ bl getMapPlayerPos__10dMapInfo_nFv -/* 801CD4D8 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 801CD4DC D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 801CD4E0 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 801CD4E4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 801CD4E8 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 801CD4EC D0 01 00 34 */ stfs f0, 0x34(r1) -/* 801CD4F0 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CD4F4 4B FF 91 39 */ bl dMenuFmap_getStartStageName__FPv -/* 801CD4F8 7C 64 1B 78 */ mr r4, r3 -/* 801CD4FC 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD500 48 19 B6 2D */ bl strcpy -/* 801CD504 48 00 00 28 */ b lbl_801CD52C -lbl_801CD508: -/* 801CD508 C0 03 00 64 */ lfs f0, 0x64(r3) -/* 801CD50C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 801CD510 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 801CD514 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 801CD518 C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 801CD51C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 801CD520 38 83 00 72 */ addi r4, r3, 0x72 -/* 801CD524 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD528 48 19 B6 05 */ bl strcpy -lbl_801CD52C: -/* 801CD52C C0 42 A7 28 */ lfs f2, lit_4158(r2) -/* 801CD530 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801CD534 28 00 00 17 */ cmplwi r0, 0x17 -/* 801CD538 40 82 00 3C */ bne lbl_801CD574 -/* 801CD53C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD540 FC 20 10 90 */ fmr f1, f2 -/* 801CD544 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CD548 38 A1 00 08 */ addi r5, r1, 8 -/* 801CD54C 48 00 3A 31 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD550 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD554 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CD558 C0 42 A7 68 */ lfs f2, lit_7300(r2) -/* 801CD55C 38 81 00 14 */ addi r4, r1, 0x14 -/* 801CD560 38 A1 00 0C */ addi r5, r1, 0xc -/* 801CD564 48 00 3A 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD568 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801CD56C C0 01 00 08 */ lfs f0, 8(r1) -/* 801CD570 EC 41 00 28 */ fsubs f2, f1, f0 -lbl_801CD574: -/* 801CD574 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD578 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CD57C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801CD580 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 801CD584 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 801CD588 EC 40 10 2A */ fadds f2, f0, f2 -/* 801CD58C 48 00 83 6D */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff -/* 801CD590 48 00 00 24 */ b lbl_801CD5B4 -lbl_801CD594: -/* 801CD594 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD598 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CD59C 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 801CD5A0 7C A3 02 14 */ add r5, r3, r0 -/* 801CD5A4 C0 45 10 24 */ lfs f2, 0x1024(r5) -/* 801CD5A8 C0 25 10 04 */ lfs f1, 0x1004(r5) -/* 801CD5AC 38 A0 00 00 */ li r5, 0 -/* 801CD5B0 48 00 83 49 */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff -lbl_801CD5B4: -/* 801CD5B4 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 801CD5B8 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 801CD5BC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801CD5C0 7C 08 03 A6 */ mtlr r0 -/* 801CD5C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CD5C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/checkDrawPortalIcon__12dMenu_Fmap_cFii.s b/asm/d/menu/d_menu_fmap/checkDrawPortalIcon__12dMenu_Fmap_cFii.s deleted file mode 100644 index 72f39b3628..0000000000 --- a/asm/d/menu/d_menu_fmap/checkDrawPortalIcon__12dMenu_Fmap_cFii.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801CCFB0: -/* 801CCFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCFB4 7C 08 02 A6 */ mflr r0 -/* 801CCFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCFBC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CCFC0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CCFC4 88 03 02 FC */ lbz r0, 0x2fc(r3) -/* 801CCFC8 28 00 00 00 */ cmplwi r0, 0 -/* 801CCFCC 41 82 00 0C */ beq lbl_801CCFD8 -/* 801CCFD0 38 60 00 01 */ li r3, 1 -/* 801CCFD4 48 00 00 1C */ b lbl_801CCFF0 -lbl_801CCFD8: -/* 801CCFD8 7C 83 23 78 */ mr r3, r4 -/* 801CCFDC 7C A4 2B 78 */ mr r4, r5 -/* 801CCFE0 4B E6 07 61 */ bl dComIfGs_isStageSwitch__Fii -/* 801CCFE4 30 03 FF FF */ addic r0, r3, -1 -/* 801CCFE8 7C 00 19 10 */ subfe r0, r0, r3 -/* 801CCFEC 54 03 06 3E */ clrlwi r3, r0, 0x18 -lbl_801CCFF0: -/* 801CCFF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCFF4 7C 08 03 A6 */ mtlr r0 -/* 801CCFF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCFFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/checkStRoomData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/checkStRoomData__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0b656e203f..0000000000 --- a/asm/d/menu/d_menu_fmap/checkStRoomData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801CB570: -/* 801CB570 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CB574 7C 08 02 A6 */ mflr r0 -/* 801CB578 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CB57C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB580 48 19 6C 55 */ bl _savegpr_27 -/* 801CB584 7C 7F 1B 78 */ mr r31, r3 -/* 801CB588 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 801CB58C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 801CB590 7C 63 02 14 */ add r3, r3, r0 -/* 801CB594 3B C3 00 04 */ addi r30, r3, 4 -/* 801CB598 8B A3 00 00 */ lbz r29, 0(r3) -/* 801CB59C 3B 80 00 00 */ li r28, 0 -/* 801CB5A0 48 00 00 90 */ b lbl_801CB630 -lbl_801CB5A4: -/* 801CB5A4 88 9E 00 0A */ lbz r4, 0xa(r30) -/* 801CB5A8 3B 64 00 0B */ addi r27, r4, 0xb -/* 801CB5AC 54 83 0F FE */ srwi r3, r4, 0x1f -/* 801CB5B0 54 80 07 FE */ clrlwi r0, r4, 0x1f -/* 801CB5B4 7C 00 1A 78 */ xor r0, r0, r3 -/* 801CB5B8 7C 03 00 51 */ subf. r0, r3, r0 -/* 801CB5BC 40 82 00 08 */ bne lbl_801CB5C4 -/* 801CB5C0 3B 7B 00 01 */ addi r27, r27, 1 -lbl_801CB5C4: -/* 801CB5C4 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801CB5C8 54 03 18 38 */ slwi r3, r0, 3 -/* 801CB5CC 38 63 02 60 */ addi r3, r3, 0x260 -/* 801CB5D0 7C 7F 1A 14 */ add r3, r31, r3 -/* 801CB5D4 7F C4 F3 78 */ mr r4, r30 -/* 801CB5D8 48 19 D3 BD */ bl strcmp -/* 801CB5DC 2C 03 00 00 */ cmpwi r3, 0 -/* 801CB5E0 40 82 00 48 */ bne lbl_801CB628 -/* 801CB5E4 38 A0 00 00 */ li r5, 0 -/* 801CB5E8 88 9E 00 0A */ lbz r4, 0xa(r30) -/* 801CB5EC 7C 89 03 A6 */ mtctr r4 -/* 801CB5F0 2C 04 00 00 */ cmpwi r4, 0 -/* 801CB5F4 40 81 00 34 */ ble lbl_801CB628 -lbl_801CB5F8: -/* 801CB5F8 80 7F 02 08 */ lwz r3, 0x208(r31) -/* 801CB5FC 38 05 00 0B */ addi r0, r5, 0xb -/* 801CB600 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 801CB604 7C 03 00 00 */ cmpw r3, r0 -/* 801CB608 40 82 00 18 */ bne lbl_801CB620 -/* 801CB60C 98 9F 03 0E */ stb r4, 0x30e(r31) -/* 801CB610 38 1E 00 0B */ addi r0, r30, 0xb -/* 801CB614 90 1F 00 C0 */ stw r0, 0xc0(r31) -/* 801CB618 A0 7E 00 08 */ lhz r3, 8(r30) -/* 801CB61C 48 00 00 30 */ b lbl_801CB64C -lbl_801CB620: -/* 801CB620 38 A5 00 01 */ addi r5, r5, 1 -/* 801CB624 42 00 FF D4 */ bdnz lbl_801CB5F8 -lbl_801CB628: -/* 801CB628 7F DE DA 14 */ add r30, r30, r27 -/* 801CB62C 3B 9C 00 01 */ addi r28, r28, 1 -lbl_801CB630: -/* 801CB630 7C 1C E8 00 */ cmpw r28, r29 -/* 801CB634 41 80 FF 70 */ blt lbl_801CB5A4 -/* 801CB638 38 00 00 00 */ li r0, 0 -/* 801CB63C 98 1F 03 0E */ stb r0, 0x30e(r31) -/* 801CB640 90 1F 00 C0 */ stw r0, 0xc0(r31) -/* 801CB644 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 801CB648 38 63 FF FF */ addi r3, r3, 0xFFFF /* 0x0000FFFF@l */ -lbl_801CB64C: -/* 801CB64C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB650 48 19 6B D1 */ bl _restgpr_27 -/* 801CB654 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CB658 7C 08 03 A6 */ mtlr r0 -/* 801CB65C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CB660 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/dMenuFmap_getStartStageName__FPv.s b/asm/d/menu/d_menu_fmap/dMenuFmap_getStartStageName__FPv.s deleted file mode 100644 index 4917737757..0000000000 --- a/asm/d/menu/d_menu_fmap/dMenuFmap_getStartStageName__FPv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801C662C: -/* 801C662C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C6630 7C 08 02 A6 */ mflr r0 -/* 801C6634 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C6638 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C663C 48 19 BB 95 */ bl _savegpr_26 -/* 801C6640 7C 7A 1B 78 */ mr r26, r3 -/* 801C6644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C6648 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C664C 38 7E 4E 20 */ addi r3, r30, 0x4e20 -/* 801C6650 81 9E 4E 20 */ lwz r12, 0x4e20(r30) -/* 801C6654 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801C6658 7D 89 03 A6 */ mtctr r12 -/* 801C665C 4E 80 04 21 */ bctrl -/* 801C6660 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 801C6664 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 801C6668 2C 00 00 05 */ cmpwi r0, 5 -/* 801C666C 40 82 00 5C */ bne lbl_801C66C8 -/* 801C6670 80 1A 00 0C */ lwz r0, 0xc(r26) -/* 801C6674 7F 9A 02 14 */ add r28, r26, r0 -/* 801C6678 3B 7C 00 04 */ addi r27, r28, 4 -/* 801C667C 3B 40 00 00 */ li r26, 0 -/* 801C6680 3B E0 00 00 */ li r31, 0 -/* 801C6684 3B BE 4E 00 */ addi r29, r30, 0x4e00 -/* 801C6688 48 00 00 34 */ b lbl_801C66BC -lbl_801C668C: -/* 801C668C 7F A3 EB 78 */ mr r3, r29 -/* 801C6690 7C 9B FA 14 */ add r4, r27, r31 -/* 801C6694 48 1A 23 01 */ bl strcmp -/* 801C6698 2C 03 00 00 */ cmpwi r3, 0 -/* 801C669C 40 82 00 18 */ bne lbl_801C66B4 -/* 801C66A0 38 6D 8B 24 */ la r3, virtual_stage(r13) /* 804510A4-_SDA_BASE_ */ -/* 801C66A4 38 9B 00 08 */ addi r4, r27, 8 -/* 801C66A8 48 1A 24 85 */ bl strcpy -/* 801C66AC 38 6D 8B 24 */ la r3, virtual_stage(r13) /* 804510A4-_SDA_BASE_ */ -/* 801C66B0 48 00 00 1C */ b lbl_801C66CC -lbl_801C66B4: -/* 801C66B4 3B 5A 00 01 */ addi r26, r26, 1 -/* 801C66B8 3B FF 00 10 */ addi r31, r31, 0x10 -lbl_801C66BC: -/* 801C66BC 88 1C 00 00 */ lbz r0, 0(r28) -/* 801C66C0 7C 1A 00 00 */ cmpw r26, r0 -/* 801C66C4 41 80 FF C8 */ blt lbl_801C668C -lbl_801C66C8: -/* 801C66C8 38 7E 4E 00 */ addi r3, r30, 0x4e00 -lbl_801C66CC: -/* 801C66CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C66D0 48 19 BB 4D */ bl _restgpr_26 -/* 801C66D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C66D8 7C 08 03 A6 */ mtlr r0 -/* 801C66DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C66E0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/decodeFieldMapData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/decodeFieldMapData__12dMenu_Fmap_cFv.s deleted file mode 100644 index 3bd1fdca95..0000000000 --- a/asm/d/menu/d_menu_fmap/decodeFieldMapData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_801CC2B0: -/* 801CC2B0 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 801CC2B4 7C 08 02 A6 */ mflr r0 -/* 801CC2B8 90 01 00 74 */ stw r0, 0x74(r1) -/* 801CC2BC 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CC2C0 48 19 5E E5 */ bl _savegpr_15 -/* 801CC2C4 7C 79 1B 78 */ mr r25, r3 -/* 801CC2C8 80 83 00 8C */ lwz r4, 0x8c(r3) -/* 801CC2CC 80 04 00 08 */ lwz r0, 8(r4) -/* 801CC2D0 7F E4 02 14 */ add r31, r4, r0 -/* 801CC2D4 80 04 00 04 */ lwz r0, 4(r4) -/* 801CC2D8 7F C4 02 14 */ add r30, r4, r0 -/* 801CC2DC 88 1E 00 00 */ lbz r0, 0(r30) -/* 801CC2E0 98 03 03 03 */ stb r0, 0x303(r3) -/* 801CC2E4 A0 04 00 16 */ lhz r0, 0x16(r4) -/* 801CC2E8 B0 03 02 16 */ sth r0, 0x216(r3) -/* 801CC2EC A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801CC2F0 48 00 05 6D */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801CC2F4 3B BF 00 04 */ addi r29, r31, 4 -/* 801CC2F8 3B 80 00 00 */ li r28, 0 -/* 801CC2FC 3B 00 00 00 */ li r24, 0 -/* 801CC300 3A E0 00 00 */ li r23, 0 -/* 801CC304 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CC308 3A 83 FC 60 */ addi r20, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CC30C 48 00 01 80 */ b lbl_801CC48C -lbl_801CC310: -/* 801CC310 7E 1D BA 14 */ add r16, r29, r23 -/* 801CC314 88 90 00 00 */ lbz r4, 0(r16) -/* 801CC318 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC31C 38 1C 12 1C */ addi r0, r28, 0x121c -/* 801CC320 7C 83 01 AE */ stbx r4, r3, r0 -/* 801CC324 3B 60 00 00 */ li r27, 0 -/* 801CC328 3A C0 00 00 */ li r22, 0 -/* 801CC32C 3A A0 00 00 */ li r21, 0 -/* 801CC330 7C 74 C2 14 */ add r3, r20, r24 -/* 801CC334 3A 63 01 AC */ addi r19, r3, 0x1ac -/* 801CC338 3A 43 01 8C */ addi r18, r3, 0x18c -/* 801CC33C 3A 23 01 6C */ addi r17, r3, 0x16c -lbl_801CC340: -/* 801CC340 38 1B 00 01 */ addi r0, r27, 1 -/* 801CC344 88 B0 00 00 */ lbz r5, 0(r16) -/* 801CC348 7C 00 28 00 */ cmpw r0, r5 -/* 801CC34C 40 82 01 20 */ bne lbl_801CC46C -/* 801CC350 3B 40 00 00 */ li r26, 0 -/* 801CC354 2C 1B 00 07 */ cmpwi r27, 7 -/* 801CC358 40 82 00 24 */ bne lbl_801CC37C -/* 801CC35C 3B 40 00 01 */ li r26, 1 -/* 801CC360 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CC364 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CC368 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CC36C 38 84 00 66 */ addi r4, r4, 0x66 -/* 801CC370 4C C6 31 82 */ crclr 6 -/* 801CC374 48 19 A1 69 */ bl sprintf -/* 801CC378 48 00 00 1C */ b lbl_801CC394 -lbl_801CC37C: -/* 801CC37C 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CC380 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CC384 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CC388 38 84 00 76 */ addi r4, r4, 0x76 -/* 801CC38C 4C C6 31 82 */ crclr 6 -/* 801CC390 48 19 A1 4D */ bl sprintf -lbl_801CC394: -/* 801CC394 7F 23 CB 78 */ mr r3, r25 -/* 801CC398 7D F9 AA 14 */ add r15, r25, r21 -/* 801CC39C 38 8F 00 94 */ addi r4, r15, 0x94 -/* 801CC3A0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801CC3A4 38 C0 00 01 */ li r6, 1 -/* 801CC3A8 7F 47 D3 78 */ mr r7, r26 -/* 801CC3AC 4B FF FC E9 */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb -/* 801CC3B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CC3B4 41 82 00 B8 */ beq lbl_801CC46C -/* 801CC3B8 88 14 03 09 */ lbz r0, 0x309(r20) -/* 801CC3BC 28 00 00 00 */ cmplwi r0, 0 -/* 801CC3C0 40 82 00 40 */ bne lbl_801CC400 -/* 801CC3C4 C0 10 00 24 */ lfs f0, 0x24(r16) -/* 801CC3C8 D0 01 00 08 */ stfs f0, 8(r1) -/* 801CC3CC 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC3D0 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 801CC3D4 80 AF 00 94 */ lwz r5, 0x94(r15) -/* 801CC3D8 C0 30 00 04 */ lfs f1, 4(r16) -/* 801CC3DC C0 50 00 08 */ lfs f2, 8(r16) -/* 801CC3E0 C0 70 00 0C */ lfs f3, 0xc(r16) -/* 801CC3E4 C0 90 00 10 */ lfs f4, 0x10(r16) -/* 801CC3E8 C0 B0 00 14 */ lfs f5, 0x14(r16) -/* 801CC3EC C0 D0 00 18 */ lfs f6, 0x18(r16) -/* 801CC3F0 C0 F0 00 20 */ lfs f7, 0x20(r16) -/* 801CC3F4 C1 10 00 1C */ lfs f8, 0x1c(r16) -/* 801CC3F8 48 00 44 0D */ bl setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff -/* 801CC3FC 48 00 00 54 */ b lbl_801CC450 -lbl_801CC400: -/* 801CC400 C0 10 00 24 */ lfs f0, 0x24(r16) -/* 801CC404 D0 01 00 08 */ stfs f0, 8(r1) -/* 801CC408 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC40C 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 801CC410 80 AF 00 94 */ lwz r5, 0x94(r15) -/* 801CC414 C0 30 00 04 */ lfs f1, 4(r16) -/* 801CC418 C0 50 00 08 */ lfs f2, 8(r16) -/* 801CC41C C0 71 00 00 */ lfs f3, 0(r17) -/* 801CC420 C0 10 00 0C */ lfs f0, 0xc(r16) -/* 801CC424 EC 63 00 2A */ fadds f3, f3, f0 -/* 801CC428 C0 92 00 00 */ lfs f4, 0(r18) -/* 801CC42C C0 10 00 10 */ lfs f0, 0x10(r16) -/* 801CC430 EC 84 00 2A */ fadds f4, f4, f0 -/* 801CC434 C0 B3 00 00 */ lfs f5, 0(r19) -/* 801CC438 C0 10 00 14 */ lfs f0, 0x14(r16) -/* 801CC43C EC A5 00 2A */ fadds f5, f5, f0 -/* 801CC440 C0 D0 00 18 */ lfs f6, 0x18(r16) -/* 801CC444 C0 F0 00 20 */ lfs f7, 0x20(r16) -/* 801CC448 C1 10 00 1C */ lfs f8, 0x1c(r16) -/* 801CC44C 48 00 43 B9 */ bl setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff -lbl_801CC450: -/* 801CC450 A0 70 00 02 */ lhz r3, 2(r16) -/* 801CC454 38 16 02 18 */ addi r0, r22, 0x218 -/* 801CC458 7C 79 03 2E */ sthx r3, r25, r0 -/* 801CC45C C0 10 00 04 */ lfs f0, 4(r16) -/* 801CC460 D0 0F 01 AC */ stfs f0, 0x1ac(r15) -/* 801CC464 C0 10 00 08 */ lfs f0, 8(r16) -/* 801CC468 D0 0F 01 CC */ stfs f0, 0x1cc(r15) -lbl_801CC46C: -/* 801CC46C 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CC470 2C 1B 00 08 */ cmpwi r27, 8 -/* 801CC474 3A D6 00 02 */ addi r22, r22, 2 -/* 801CC478 3A B5 00 04 */ addi r21, r21, 4 -/* 801CC47C 41 80 FE C4 */ blt lbl_801CC340 -/* 801CC480 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CC484 3B 18 00 04 */ addi r24, r24, 4 -/* 801CC488 3A F7 00 28 */ addi r23, r23, 0x28 -lbl_801CC48C: -/* 801CC48C 88 1F 00 00 */ lbz r0, 0(r31) -/* 801CC490 7C 1C 00 00 */ cmpw r28, r0 -/* 801CC494 41 80 FE 7C */ blt lbl_801CC310 -/* 801CC498 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC49C 48 00 96 29 */ bl calcDrawPriority__18dMenu_Fmap2DBack_cFv -/* 801CC4A0 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC4A4 48 00 46 25 */ bl calcAllMapPos__18dMenu_Fmap2DBack_cFv -/* 801CC4A8 88 19 03 03 */ lbz r0, 0x303(r25) -/* 801CC4AC 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC4B0 93 C3 0D 88 */ stw r30, 0xd88(r3) -/* 801CC4B4 98 03 12 25 */ stb r0, 0x1225(r3) -/* 801CC4B8 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC4BC 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801CC4C0 7F 23 CB 78 */ mr r3, r25 -/* 801CC4C4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CC4C8 7C 99 02 14 */ add r4, r25, r0 -/* 801CC4CC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CC4D0 48 00 03 B1 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801CC4D4 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CC4D8 48 19 5D 19 */ bl _restgpr_15 -/* 801CC4DC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801CC4E0 7C 08 03 A6 */ mtlr r0 -/* 801CC4E4 38 21 00 70 */ addi r1, r1, 0x70 -/* 801CC4E8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/decodePortalData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/decodePortalData__12dMenu_Fmap_cFv.s deleted file mode 100644 index 041ac19c5c..0000000000 --- a/asm/d/menu/d_menu_fmap/decodePortalData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CC4EC: -/* 801CC4EC 80 83 00 90 */ lwz r4, 0x90(r3) -/* 801CC4F0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CC4F4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CC4F8 88 03 02 FB */ lbz r0, 0x2fb(r3) -/* 801CC4FC 28 00 00 00 */ cmplwi r0, 0 -/* 801CC500 4D 82 00 20 */ beqlr -/* 801CC504 88 04 00 08 */ lbz r0, 8(r4) -/* 801CC508 7C 09 03 A6 */ mtctr r0 -/* 801CC50C 2C 00 00 00 */ cmpwi r0, 0 -/* 801CC510 4C 81 00 20 */ blelr -lbl_801CC514: -/* 801CC514 42 00 00 00 */ bdnz lbl_801CC514 -/* 801CC518 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawBatsumarkIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawBatsumarkIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 88cf9e5cfd..0000000000 --- a/asm/d/menu/d_menu_fmap/drawBatsumarkIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CCDDC: -/* 801CCDDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCDE0 7C 08 02 A6 */ mflr r0 -/* 801CCDE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCDE8 38 80 00 05 */ li r4, 5 -/* 801CCDEC 38 A0 00 12 */ li r5, 0x12 -/* 801CCDF0 48 00 03 1D */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CCDF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCDF8 7C 08 03 A6 */ mtlr r0 -/* 801CCDFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCE00 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawCoachIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawCoachIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 117254d973..0000000000 --- a/asm/d/menu/d_menu_fmap/drawCoachIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CCE70: -/* 801CCE70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCE74 7C 08 02 A6 */ mflr r0 -/* 801CCE78 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCE7C 38 80 00 0A */ li r4, 0xa -/* 801CCE80 38 A0 00 0D */ li r5, 0xd -/* 801CCE84 48 00 02 89 */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CCE88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCE8C 7C 08 03 A6 */ mtlr r0 -/* 801CCE90 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCE94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawDebugStage__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawDebugStage__12dMenu_Fmap_cFv.s deleted file mode 100644 index 4b01303412..0000000000 --- a/asm/d/menu/d_menu_fmap/drawDebugStage__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801CD3F0: -/* 801CD3F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CD3F4 7C 08 02 A6 */ mflr r0 -/* 801CD3F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CD3FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CD400 93 C1 00 08 */ stw r30, 8(r1) -/* 801CD404 7C 7E 1B 78 */ mr r30, r3 -/* 801CD408 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801CD40C 28 00 00 00 */ cmplwi r0, 0 -/* 801CD410 41 82 00 24 */ beq lbl_801CD434 -/* 801CD414 83 FE 02 0C */ lwz r31, 0x20c(r30) -/* 801CD418 4B FF FF 39 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801CD41C 80 9E 00 14 */ lwz r4, 0x14(r30) -/* 801CD420 80 1E 00 B8 */ lwz r0, 0xb8(r30) -/* 801CD424 90 04 12 3C */ stw r0, 0x123c(r4) -/* 801CD428 90 64 12 40 */ stw r3, 0x1240(r4) -/* 801CD42C 93 E4 12 44 */ stw r31, 0x1244(r4) -/* 801CD430 48 00 00 18 */ b lbl_801CD448 -lbl_801CD434: -/* 801CD434 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD438 38 00 00 00 */ li r0, 0 -/* 801CD43C 90 03 12 3C */ stw r0, 0x123c(r3) -/* 801CD440 90 03 12 40 */ stw r0, 0x1240(r3) -/* 801CD444 90 03 12 44 */ stw r0, 0x1244(r3) -lbl_801CD448: -/* 801CD448 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CD44C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CD450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CD454 7C 08 03 A6 */ mtlr r0 -/* 801CD458 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CD45C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawEnterIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawEnterIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 467a25b62c..0000000000 --- a/asm/d/menu/d_menu_fmap/drawEnterIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801CD210: -/* 801CD210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CD214 7C 08 02 A6 */ mflr r0 -/* 801CD218 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CD21C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CD220 7C 7F 1B 78 */ mr r31, r3 -/* 801CD224 38 80 00 01 */ li r4, 1 -/* 801CD228 38 A0 00 14 */ li r5, 0x14 -/* 801CD22C 4B FF FE E1 */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CD230 7F E3 FB 78 */ mr r3, r31 -/* 801CD234 38 80 00 08 */ li r4, 8 -/* 801CD238 38 A0 00 16 */ li r5, 0x16 -/* 801CD23C 4B FF FE D1 */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CD240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CD244 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CD248 7C 08 03 A6 */ mtlr r0 -/* 801CD24C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CD250 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawGoldWolfIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawGoldWolfIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 5c7670a0fc..0000000000 --- a/asm/d/menu/d_menu_fmap/drawGoldWolfIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CCE48: -/* 801CCE48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCE4C 7C 08 02 A6 */ mflr r0 -/* 801CCE50 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCE54 38 80 00 06 */ li r4, 6 -/* 801CCE58 38 A0 00 0B */ li r5, 0xb -/* 801CCE5C 48 00 02 B1 */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CCE60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCE64 7C 08 03 A6 */ mtlr r0 -/* 801CCE68 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCE6C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s b/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s deleted file mode 100644 index 991b6fd7e4..0000000000 --- a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_801CD10C: -/* 801CD10C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 801CD110 7C 08 02 A6 */ mflr r0 -/* 801CD114 90 01 00 74 */ stw r0, 0x74(r1) -/* 801CD118 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CD11C 48 19 50 B5 */ bl _savegpr_26 -/* 801CD120 7C 7A 1B 78 */ mr r26, r3 -/* 801CD124 7C 9B 23 78 */ mr r27, r4 -/* 801CD128 7C BC 2B 78 */ mr r28, r5 -/* 801CD12C 3C 80 80 3A */ lis r4, __vt__19dMenuFmapIconDisp_c@ha /* 0x803A7D74@ha */ -/* 801CD130 38 04 7D 74 */ addi r0, r4, __vt__19dMenuFmapIconDisp_c@l /* 0x803A7D74@l */ -/* 801CD134 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801CD138 8B AD 87 E4 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801CD13C 7F BD 07 74 */ extsb r29, r29 -/* 801CD140 83 C3 02 0C */ lwz r30, 0x20c(r3) -/* 801CD144 48 00 02 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv -/* 801CD148 7C 7F 1B 78 */ mr r31, r3 -/* 801CD14C 7F 43 D3 78 */ mr r3, r26 -/* 801CD150 48 00 02 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801CD154 7C 64 1B 78 */ mr r4, r3 -/* 801CD158 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD15C 7F E5 FB 78 */ mr r5, r31 -/* 801CD160 7F 66 DB 78 */ mr r6, r27 -/* 801CD164 7F C7 F3 78 */ mr r7, r30 -/* 801CD168 7F A8 EB 78 */ mr r8, r29 -/* 801CD16C 4B E7 0F A9 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii -/* 801CD170 48 00 00 78 */ b lbl_801CD1E8 -lbl_801CD174: -/* 801CD174 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD178 4B E7 15 71 */ bl isDrawDisp__19dMenuFmapIconDisp_cFv -/* 801CD17C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD180 41 82 00 58 */ beq lbl_801CD1D8 -/* 801CD184 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD188 38 81 00 0C */ addi r4, r1, 0xc -/* 801CD18C 38 A1 00 08 */ addi r5, r1, 8 -/* 801CD190 38 C1 00 14 */ addi r6, r1, 0x14 -/* 801CD194 38 E1 00 10 */ addi r7, r1, 0x10 -/* 801CD198 39 00 00 00 */ li r8, 0 -/* 801CD19C 4B E7 13 DD */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s -/* 801CD1A0 7F 43 D3 78 */ mr r3, r26 -/* 801CD1A4 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801CD1A8 80 A1 00 08 */ lwz r5, 8(r1) -/* 801CD1AC 4B FF E1 15 */ bl isRoomCheck__12dMenu_Fmap_cFii -/* 801CD1B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD1B4 41 82 00 24 */ beq lbl_801CD1D8 -/* 801CD1B8 80 7A 00 14 */ lwz r3, 0x14(r26) -/* 801CD1BC 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 801CD1C0 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801CD1C4 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801CD1C8 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CD1CC 38 A0 00 00 */ li r5, 0 -/* 801CD1D0 38 C0 00 00 */ li r6, 0 -/* 801CD1D4 48 00 4F 2D */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb -lbl_801CD1D8: -/* 801CD1D8 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD1DC 4B E7 12 B5 */ bl nextData__22dMenuFmapIconPointer_cFv -/* 801CD1E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD1E4 40 82 00 14 */ bne lbl_801CD1F8 -lbl_801CD1E8: -/* 801CD1E8 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD1EC 4B E7 13 25 */ bl getValidData__22dMenuFmapIconPointer_cFv -/* 801CD1F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD1F4 41 82 FF 80 */ beq lbl_801CD174 -lbl_801CD1F8: -/* 801CD1F8 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CD1FC 48 19 50 21 */ bl _restgpr_26 -/* 801CD200 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801CD204 7C 08 03 A6 */ mtlr r0 -/* 801CD208 38 21 00 70 */ addi r1, r1, 0x70 -/* 801CD20C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFfb.s b/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFfb.s deleted file mode 100644 index 7d5300f80c..0000000000 --- a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFfb.s +++ /dev/null @@ -1,179 +0,0 @@ -lbl_801CCB08: -/* 801CCB08 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801CCB0C 7C 08 02 A6 */ mflr r0 -/* 801CCB10 90 01 00 54 */ stw r0, 0x54(r1) -/* 801CCB14 39 61 00 50 */ addi r11, r1, 0x50 -/* 801CCB18 48 19 56 B9 */ bl _savegpr_26 -/* 801CCB1C 7C 7E 1B 78 */ mr r30, r3 -/* 801CCB20 7C 9F 23 78 */ mr r31, r4 -/* 801CCB24 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801CCB28 8B A3 12 27 */ lbz r29, 0x1227(r3) -/* 801CCB2C 4B E6 23 35 */ bl dComIfGp_getNowLevel__Fv -/* 801CCB30 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CCB34 38 1D 00 01 */ addi r0, r29, 1 -/* 801CCB38 7C 00 18 00 */ cmpw r0, r3 -/* 801CCB3C 40 82 00 0C */ bne lbl_801CCB48 -/* 801CCB40 7F C3 F3 78 */ mr r3, r30 -/* 801CCB44 48 00 03 55 */ bl drawPlayEnterIcon__12dMenu_Fmap_cFv -lbl_801CCB48: -/* 801CCB48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CCB4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CCB50 88 03 00 7C */ lbz r0, 0x7c(r3) -/* 801CCB54 28 00 00 00 */ cmplwi r0, 0 -/* 801CCB58 41 82 00 44 */ beq lbl_801CCB9C -/* 801CCB5C 83 83 5D AC */ lwz r28, 0x5dac(r3) -/* 801CCB60 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CCB64 4B E7 22 F9 */ bl getMapPlayerPos__10dMapInfo_nFv -/* 801CCB68 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CCB6C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CCB70 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801CCB74 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CCB78 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801CCB7C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CCB80 AB 9C 04 E6 */ lha r28, 0x4e6(r28) -/* 801CCB84 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CCB88 4B FF 9A A5 */ bl dMenuFmap_getStartStageName__FPv -/* 801CCB8C 7C 64 1B 78 */ mr r4, r3 -/* 801CCB90 38 61 00 08 */ addi r3, r1, 8 -/* 801CCB94 48 19 BF 99 */ bl strcpy -/* 801CCB98 48 00 00 2C */ b lbl_801CCBC4 -lbl_801CCB9C: -/* 801CCB9C C0 03 00 64 */ lfs f0, 0x64(r3) -/* 801CCBA0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CCBA4 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 801CCBA8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CCBAC C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 801CCBB0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CCBB4 AB 83 00 70 */ lha r28, 0x70(r3) -/* 801CCBB8 38 83 00 72 */ addi r4, r3, 0x72 -/* 801CCBBC 38 61 00 08 */ addi r3, r1, 8 -/* 801CCBC0 48 19 BF 6D */ bl strcpy -lbl_801CCBC4: -/* 801CCBC4 38 C0 00 00 */ li r6, 0 -/* 801CCBC8 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801CCBCC 28 00 00 0E */ cmplwi r0, 0xe -/* 801CCBD0 40 82 00 08 */ bne lbl_801CCBD8 -/* 801CCBD4 38 C0 00 01 */ li r6, 1 -lbl_801CCBD8: -/* 801CCBD8 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CCBDC 38 80 00 11 */ li r4, 0x11 -/* 801CCBE0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CCBE4 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801CCBE8 C0 41 00 24 */ lfs f2, 0x24(r1) -/* 801CCBEC C0 82 A7 64 */ lfs f4, lit_6987(r2) -/* 801CCBF0 7F 80 07 34 */ extsh r0, r28 -/* 801CCBF4 C8 62 A7 40 */ lfd f3, lit_4358(r2) -/* 801CCBF8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CCBFC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801CCC00 3C 00 43 30 */ lis r0, 0x4330 -/* 801CCC04 90 01 00 28 */ stw r0, 0x28(r1) -/* 801CCC08 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 801CCC0C EC 00 18 28 */ fsubs f0, f0, f3 -/* 801CCC10 EC 64 00 32 */ fmuls f3, f4, f0 -/* 801CCC14 7F E7 FB 78 */ mr r7, r31 -/* 801CCC18 48 00 58 05 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb -/* 801CCC1C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801CCC20 40 82 01 60 */ bne lbl_801CCD80 -/* 801CCC24 88 1E 03 07 */ lbz r0, 0x307(r30) -/* 801CCC28 28 00 00 01 */ cmplwi r0, 1 -/* 801CCC2C 40 82 00 FC */ bne lbl_801CCD28 -/* 801CCC30 83 BE 00 90 */ lwz r29, 0x90(r30) -/* 801CCC34 28 1D 00 00 */ cmplwi r29, 0 -/* 801CCC38 41 82 00 F0 */ beq lbl_801CCD28 -/* 801CCC3C 3B 7D 00 0C */ addi r27, r29, 0xc -/* 801CCC40 3B 40 00 00 */ li r26, 0 -/* 801CCC44 3B E0 00 00 */ li r31, 0 -/* 801CCC48 48 00 00 D4 */ b lbl_801CCD1C -lbl_801CCC4C: -/* 801CCC4C 7F 9B FA 14 */ add r28, r27, r31 -/* 801CCC50 7F C3 F3 78 */ mr r3, r30 -/* 801CCC54 88 9C 00 0E */ lbz r4, 0xe(r28) -/* 801CCC58 88 BC 00 0F */ lbz r5, 0xf(r28) -/* 801CCC5C 48 00 03 55 */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii -/* 801CCC60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CCC64 41 82 00 B0 */ beq lbl_801CCD14 -/* 801CCC68 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CCC6C 88 A3 12 27 */ lbz r5, 0x1227(r3) -/* 801CCC70 88 9C 00 01 */ lbz r4, 1(r28) -/* 801CCC74 38 04 FF FF */ addi r0, r4, -1 -/* 801CCC78 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801CCC7C 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801CCC80 28 00 00 0A */ cmplwi r0, 0xa -/* 801CCC84 41 82 00 0C */ beq lbl_801CCC90 -/* 801CCC88 28 00 00 06 */ cmplwi r0, 6 -/* 801CCC8C 40 80 00 18 */ bge lbl_801CCCA4 -lbl_801CCC90: -/* 801CCC90 28 00 00 0A */ cmplwi r0, 0xa -/* 801CCC94 40 82 00 64 */ bne lbl_801CCCF8 -/* 801CCC98 88 1E 03 01 */ lbz r0, 0x301(r30) -/* 801CCC9C 28 00 00 00 */ cmplwi r0, 0 -/* 801CCCA0 41 82 00 58 */ beq lbl_801CCCF8 -lbl_801CCCA4: -/* 801CCCA4 7C 04 28 40 */ cmplw r4, r5 -/* 801CCCA8 40 82 00 6C */ bne lbl_801CCD14 -/* 801CCCAC 38 80 00 01 */ li r4, 1 -/* 801CCCB0 C0 3C 00 10 */ lfs f1, 0x10(r28) -/* 801CCCB4 C0 5C 00 18 */ lfs f2, 0x18(r28) -/* 801CCCB8 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CCCBC 38 A0 00 00 */ li r5, 0 -/* 801CCCC0 38 C0 00 00 */ li r6, 0 -/* 801CCCC4 48 00 54 3D */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb -/* 801CCCC8 88 1E 03 08 */ lbz r0, 0x308(r30) -/* 801CCCCC 7C 00 D0 00 */ cmpw r0, r26 -/* 801CCCD0 40 82 00 44 */ bne lbl_801CCD14 -/* 801CCCD4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CCCD8 38 80 00 00 */ li r4, 0 -/* 801CCCDC C0 3C 00 10 */ lfs f1, 0x10(r28) -/* 801CCCE0 C0 5C 00 18 */ lfs f2, 0x18(r28) -/* 801CCCE4 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CCCE8 38 A0 00 00 */ li r5, 0 -/* 801CCCEC 38 C0 00 00 */ li r6, 0 -/* 801CCCF0 48 00 54 11 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb -/* 801CCCF4 48 00 00 20 */ b lbl_801CCD14 -lbl_801CCCF8: -/* 801CCCF8 38 80 00 01 */ li r4, 1 -/* 801CCCFC C0 3C 00 10 */ lfs f1, 0x10(r28) -/* 801CCD00 C0 5C 00 18 */ lfs f2, 0x18(r28) -/* 801CCD04 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CCD08 38 A0 00 00 */ li r5, 0 -/* 801CCD0C 38 C0 00 00 */ li r6, 0 -/* 801CCD10 48 00 53 F1 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb -lbl_801CCD14: -/* 801CCD14 3B 5A 00 01 */ addi r26, r26, 1 -/* 801CCD18 3B FF 00 1C */ addi r31, r31, 0x1c -lbl_801CCD1C: -/* 801CCD1C 88 1D 00 08 */ lbz r0, 8(r29) -/* 801CCD20 7C 1A 00 00 */ cmpw r26, r0 -/* 801CCD24 41 80 FF 28 */ blt lbl_801CCC4C -lbl_801CCD28: -/* 801CCD28 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801CCD2C 28 00 00 0A */ cmplwi r0, 0xa -/* 801CCD30 41 82 00 0C */ beq lbl_801CCD3C -/* 801CCD34 28 00 00 06 */ cmplwi r0, 6 -/* 801CCD38 40 80 00 18 */ bge lbl_801CCD50 -lbl_801CCD3C: -/* 801CCD3C 28 00 00 0A */ cmplwi r0, 0xa -/* 801CCD40 40 82 00 40 */ bne lbl_801CCD80 -/* 801CCD44 88 1E 03 01 */ lbz r0, 0x301(r30) -/* 801CCD48 28 00 00 00 */ cmplwi r0, 0 -/* 801CCD4C 41 82 00 34 */ beq lbl_801CCD80 -lbl_801CCD50: -/* 801CCD50 7F C3 F3 78 */ mr r3, r30 -/* 801CCD54 48 00 00 45 */ bl drawLightDropIcon__12dMenu_Fmap_cFv -/* 801CCD58 7F C3 F3 78 */ mr r3, r30 -/* 801CCD5C 48 00 00 81 */ bl drawBatsumarkIcon__12dMenu_Fmap_cFv -/* 801CCD60 7F C3 F3 78 */ mr r3, r30 -/* 801CCD64 48 00 04 AD */ bl drawEnterIcon__12dMenu_Fmap_cFv -/* 801CCD68 7F C3 F3 78 */ mr r3, r30 -/* 801CCD6C 48 00 00 99 */ bl drawSnowmanIcon__12dMenu_Fmap_cFv -/* 801CCD70 7F C3 F3 78 */ mr r3, r30 -/* 801CCD74 48 00 00 D5 */ bl drawGoldWolfIcon__12dMenu_Fmap_cFv -/* 801CCD78 7F C3 F3 78 */ mr r3, r30 -/* 801CCD7C 48 00 00 F5 */ bl drawCoachIcon__12dMenu_Fmap_cFv -lbl_801CCD80: -/* 801CCD80 39 61 00 50 */ addi r11, r1, 0x50 -/* 801CCD84 48 19 54 99 */ bl _restgpr_26 -/* 801CCD88 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801CCD8C 7C 08 03 A6 */ mtlr r0 -/* 801CCD90 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CCD94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawLightDropIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawLightDropIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 1dcc5e5008..0000000000 --- a/asm/d/menu/d_menu_fmap/drawLightDropIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_801CCD98: -/* 801CCD98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCD9C 7C 08 02 A6 */ mflr r0 -/* 801CCDA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCDA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CCDA8 7C 7F 1B 78 */ mr r31, r3 -/* 801CCDAC 48 00 0B 81 */ bl isLightVesselGet__12dMenu_Fmap_cFv -/* 801CCDB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CCDB4 41 82 00 14 */ beq lbl_801CCDC8 -/* 801CCDB8 7F E3 FB 78 */ mr r3, r31 -/* 801CCDBC 38 80 00 04 */ li r4, 4 -/* 801CCDC0 38 A0 00 05 */ li r5, 5 -/* 801CCDC4 48 00 03 49 */ bl drawIcon__12dMenu_Fmap_cFUci -lbl_801CCDC8: -/* 801CCDC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CCDCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCDD0 7C 08 03 A6 */ mtlr r0 -/* 801CCDD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCDD8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawPlayEnterIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawPlayEnterIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 5b0ddfb19b..0000000000 --- a/asm/d/menu/d_menu_fmap/drawPlayEnterIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801CCE98: -/* 801CCE98 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801CCE9C 7C 08 02 A6 */ mflr r0 -/* 801CCEA0 90 01 00 44 */ stw r0, 0x44(r1) -/* 801CCEA4 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 801CCEA8 93 C1 00 38 */ stw r30, 0x38(r1) -/* 801CCEAC 7C 7E 1B 78 */ mr r30, r3 -/* 801CCEB0 80 83 02 0C */ lwz r4, 0x20c(r3) -/* 801CCEB4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CCEB8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CCEBC 88 05 4E 0A */ lbz r0, 0x4e0a(r5) -/* 801CCEC0 7C 05 07 74 */ extsb r5, r0 -/* 801CCEC4 4B FF E3 FD */ bl isRoomCheck__12dMenu_Fmap_cFii -/* 801CCEC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CCECC 41 82 00 CC */ beq lbl_801CCF98 -/* 801CCED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CCED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CCED8 88 03 00 7C */ lbz r0, 0x7c(r3) -/* 801CCEDC 28 00 00 00 */ cmplwi r0, 0 -/* 801CCEE0 41 82 00 48 */ beq lbl_801CCF28 -/* 801CCEE4 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CCEE8 4B E7 21 45 */ bl getMapRestartPos__10dMapInfo_nFv -/* 801CCEEC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CCEF0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CCEF4 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801CCEF8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CCEFC C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801CCF00 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CCF04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CCF08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CCF0C AB E3 0D BA */ lha r31, 0xdba(r3) -/* 801CCF10 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CCF14 4B FF 97 19 */ bl dMenuFmap_getStartStageName__FPv -/* 801CCF18 7C 64 1B 78 */ mr r4, r3 -/* 801CCF1C 38 61 00 08 */ addi r3, r1, 8 -/* 801CCF20 48 19 BC 0D */ bl strcpy -/* 801CCF24 48 00 00 2C */ b lbl_801CCF50 -lbl_801CCF28: -/* 801CCF28 C0 03 00 64 */ lfs f0, 0x64(r3) -/* 801CCF2C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CCF30 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 801CCF34 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CCF38 C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 801CCF3C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CCF40 AB E3 00 70 */ lha r31, 0x70(r3) -/* 801CCF44 38 83 00 72 */ addi r4, r3, 0x72 -/* 801CCF48 38 61 00 08 */ addi r3, r1, 8 -/* 801CCF4C 48 19 BB E1 */ bl strcpy -lbl_801CCF50: -/* 801CCF50 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CCF54 38 80 00 15 */ li r4, 0x15 -/* 801CCF58 38 A1 00 08 */ addi r5, r1, 8 -/* 801CCF5C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801CCF60 C0 41 00 24 */ lfs f2, 0x24(r1) -/* 801CCF64 C0 82 A7 64 */ lfs f4, lit_6987(r2) -/* 801CCF68 7F E0 07 34 */ extsh r0, r31 -/* 801CCF6C C8 62 A7 40 */ lfd f3, lit_4358(r2) -/* 801CCF70 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CCF74 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801CCF78 3C 00 43 30 */ lis r0, 0x4330 -/* 801CCF7C 90 01 00 28 */ stw r0, 0x28(r1) -/* 801CCF80 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 801CCF84 EC 00 18 28 */ fsubs f0, f0, f3 -/* 801CCF88 EC 64 00 32 */ fmuls f3, f4, f0 -/* 801CCF8C 38 C0 00 00 */ li r6, 0 -/* 801CCF90 38 E0 00 00 */ li r7, 0 -/* 801CCF94 48 00 54 89 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb -lbl_801CCF98: -/* 801CCF98 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 801CCF9C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 801CCFA0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801CCFA4 7C 08 03 A6 */ mtlr r0 -/* 801CCFA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CCFAC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawPortalIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawPortalIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 005daff7bb..0000000000 --- a/asm/d/menu/d_menu_fmap/drawPortalIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_801CD254: -/* 801CD254 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CD258 7C 08 02 A6 */ mflr r0 -/* 801CD25C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CD260 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD264 48 19 4F 6D */ bl _savegpr_26 -/* 801CD268 7C 7A 1B 78 */ mr r26, r3 -/* 801CD26C 88 03 03 07 */ lbz r0, 0x307(r3) -/* 801CD270 28 00 00 01 */ cmplwi r0, 1 -/* 801CD274 40 82 00 70 */ bne lbl_801CD2E4 -/* 801CD278 83 DA 00 90 */ lwz r30, 0x90(r26) -/* 801CD27C 28 1E 00 00 */ cmplwi r30, 0 -/* 801CD280 41 82 00 64 */ beq lbl_801CD2E4 -/* 801CD284 3B 9E 00 0C */ addi r28, r30, 0xc -/* 801CD288 3B 60 00 00 */ li r27, 0 -/* 801CD28C 3B E0 00 00 */ li r31, 0 -/* 801CD290 48 00 00 48 */ b lbl_801CD2D8 -lbl_801CD294: -/* 801CD294 7F BC FA 14 */ add r29, r28, r31 -/* 801CD298 7F 43 D3 78 */ mr r3, r26 -/* 801CD29C 88 9D 00 0E */ lbz r4, 0xe(r29) -/* 801CD2A0 88 BD 00 0F */ lbz r5, 0xf(r29) -/* 801CD2A4 4B FF FD 0D */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii -/* 801CD2A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD2AC 41 82 00 24 */ beq lbl_801CD2D0 -/* 801CD2B0 80 7A 00 14 */ lwz r3, 0x14(r26) -/* 801CD2B4 38 80 00 01 */ li r4, 1 -/* 801CD2B8 C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 801CD2BC C0 5D 00 18 */ lfs f2, 0x18(r29) -/* 801CD2C0 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CD2C4 38 A0 00 00 */ li r5, 0 -/* 801CD2C8 38 C0 00 00 */ li r6, 0 -/* 801CD2CC 48 00 4E 35 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb -lbl_801CD2D0: -/* 801CD2D0 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CD2D4 3B FF 00 1C */ addi r31, r31, 0x1c -lbl_801CD2D8: -/* 801CD2D8 88 1E 00 08 */ lbz r0, 8(r30) -/* 801CD2DC 7C 1B 00 00 */ cmpw r27, r0 -/* 801CD2E0 41 80 FF B4 */ blt lbl_801CD294 -lbl_801CD2E4: -/* 801CD2E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD2E8 48 19 4F 35 */ bl _restgpr_26 -/* 801CD2EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CD2F0 7C 08 03 A6 */ mtlr r0 -/* 801CD2F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CD2F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/drawSnowmanIcon__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/drawSnowmanIcon__12dMenu_Fmap_cFv.s deleted file mode 100644 index 7da2af9825..0000000000 --- a/asm/d/menu/d_menu_fmap/drawSnowmanIcon__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801CCE04: -/* 801CCE04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CCE08 7C 08 02 A6 */ mflr r0 -/* 801CCE0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CCE10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CCE14 7C 7F 1B 78 */ mr r31, r3 -/* 801CCE18 38 80 00 0D */ li r4, 0xd -/* 801CCE1C 38 A0 00 09 */ li r5, 9 -/* 801CCE20 48 00 02 ED */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CCE24 7F E3 FB 78 */ mr r3, r31 -/* 801CCE28 38 80 00 0E */ li r4, 0xe -/* 801CCE2C 38 A0 00 0A */ li r5, 0xa -/* 801CCE30 48 00 02 DD */ bl drawIcon__12dMenu_Fmap_cFUci -/* 801CCE34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CCE38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CCE3C 7C 08 03 A6 */ mtlr r0 -/* 801CCE40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCE44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s b/asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s deleted file mode 100644 index aff91524a2..0000000000 --- a/asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801CC284: -/* 801CC284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CC288 7C 08 02 A6 */ mflr r0 -/* 801CC28C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CC290 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC294 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 801CC298 7D 89 03 A6 */ mtctr r12 -/* 801CC29C 4E 80 04 21 */ bctrl -/* 801CC2A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CC2A4 7C 08 03 A6 */ mtlr r0 -/* 801CC2A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC2AC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getHowlRegionID__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getHowlRegionID__12dMenu_Fmap_cFv.s deleted file mode 100644 index e887969b16..0000000000 --- a/asm/d/menu/d_menu_fmap/getHowlRegionID__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801CD8B4: -/* 801CD8B4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CD8B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CD8BC 88 03 00 E2 */ lbz r0, 0xe2(r3) -/* 801CD8C0 2C 00 00 05 */ cmpwi r0, 5 -/* 801CD8C4 41 82 00 48 */ beq lbl_801CD90C -/* 801CD8C8 40 80 00 1C */ bge lbl_801CD8E4 -/* 801CD8CC 2C 00 00 03 */ cmpwi r0, 3 -/* 801CD8D0 41 82 00 2C */ beq lbl_801CD8FC -/* 801CD8D4 40 80 00 30 */ bge lbl_801CD904 -/* 801CD8D8 2C 00 00 02 */ cmpwi r0, 2 -/* 801CD8DC 40 80 00 18 */ bge lbl_801CD8F4 -/* 801CD8E0 48 00 00 44 */ b lbl_801CD924 -lbl_801CD8E4: -/* 801CD8E4 2C 00 00 07 */ cmpwi r0, 7 -/* 801CD8E8 41 82 00 34 */ beq lbl_801CD91C -/* 801CD8EC 40 80 00 38 */ bge lbl_801CD924 -/* 801CD8F0 48 00 00 24 */ b lbl_801CD914 -lbl_801CD8F4: -/* 801CD8F4 38 60 00 01 */ li r3, 1 -/* 801CD8F8 4E 80 00 20 */ blr -lbl_801CD8FC: -/* 801CD8FC 38 60 00 04 */ li r3, 4 -/* 801CD900 4E 80 00 20 */ blr -lbl_801CD904: -/* 801CD904 38 60 00 04 */ li r3, 4 -/* 801CD908 4E 80 00 20 */ blr -lbl_801CD90C: -/* 801CD90C 38 60 00 05 */ li r3, 5 -/* 801CD910 4E 80 00 20 */ blr -lbl_801CD914: -/* 801CD914 38 60 00 03 */ li r3, 3 -/* 801CD918 4E 80 00 20 */ blr -lbl_801CD91C: -/* 801CD91C 38 60 00 04 */ li r3, 4 -/* 801CD920 4E 80 00 20 */ blr -lbl_801CD924: -/* 801CD924 38 60 00 01 */ li r3, 1 -/* 801CD928 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s b/asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s deleted file mode 100644 index 9b1525b062..0000000000 --- a/asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_801C77F0: -/* 801C77F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C77F4 7C 08 02 A6 */ mflr r0 -/* 801C77F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C77FC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C7800 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C7804 7C 7F 1B 78 */ mr r31, r3 -/* 801C7808 3B C0 00 08 */ li r30, 8 -/* 801C780C 38 00 00 00 */ li r0, 0 -/* 801C7810 98 04 00 00 */ stb r0, 0(r4) -/* 801C7814 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801C7818 28 00 00 00 */ cmplwi r0, 0 -/* 801C781C 40 82 00 C4 */ bne lbl_801C78E0 -/* 801C7820 48 03 28 31 */ bl dMw_B_TRIGGER__Fv -/* 801C7824 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7828 41 82 00 B8 */ beq lbl_801C78E0 -/* 801C782C 88 1F 03 04 */ lbz r0, 0x304(r31) -/* 801C7830 28 00 00 03 */ cmplwi r0, 3 -/* 801C7834 40 82 00 28 */ bne lbl_801C785C -/* 801C7838 38 00 00 01 */ li r0, 1 -/* 801C783C 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7840 38 00 00 00 */ li r0, 0 -/* 801C7844 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7848 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C784C 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C7850 38 00 04 00 */ li r0, 0x400 -/* 801C7854 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801C7858 48 00 00 4C */ b lbl_801C78A4 -lbl_801C785C: -/* 801C785C 38 00 00 03 */ li r0, 3 -/* 801C7860 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7864 48 04 5D ED */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801C7868 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C786C 41 82 00 18 */ beq lbl_801C7884 -/* 801C7870 38 00 00 01 */ li r0, 1 -/* 801C7874 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7878 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C787C 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C7880 48 00 00 14 */ b lbl_801C7894 -lbl_801C7884: -/* 801C7884 38 00 00 00 */ li r0, 0 -/* 801C7888 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C788C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7890 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_801C7894: -/* 801C7894 38 00 02 00 */ li r0, 0x200 -/* 801C7898 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C789C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C78A0 B0 03 00 AA */ sth r0, 0xaa(r3) -lbl_801C78A4: -/* 801C78A4 3B C0 00 09 */ li r30, 9 -/* 801C78A8 38 00 00 BB */ li r0, 0xbb -/* 801C78AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C78B0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C78B4 38 81 00 14 */ addi r4, r1, 0x14 -/* 801C78B8 38 A0 00 00 */ li r5, 0 -/* 801C78BC 38 C0 00 00 */ li r6, 0 -/* 801C78C0 38 E0 00 00 */ li r7, 0 -/* 801C78C4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C78C8 FC 40 08 90 */ fmr f2, f1 -/* 801C78CC C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C78D0 FC 80 18 90 */ fmr f4, f3 -/* 801C78D4 39 00 00 00 */ li r8, 0 -/* 801C78D8 48 0E 40 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C78DC 48 05 70 F9 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801C78E0: -/* 801C78E0 88 9F 03 00 */ lbz r4, 0x300(r31) -/* 801C78E4 28 04 00 08 */ cmplwi r4, 8 -/* 801C78E8 40 82 00 C8 */ bne lbl_801C79B0 -/* 801C78EC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C78F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C78F4 88 03 00 C0 */ lbz r0, 0xc0(r3) -/* 801C78F8 28 00 00 03 */ cmplwi r0, 3 -/* 801C78FC 40 82 00 B4 */ bne lbl_801C79B0 -/* 801C7900 88 1F 03 04 */ lbz r0, 0x304(r31) -/* 801C7904 28 00 00 03 */ cmplwi r0, 3 -/* 801C7908 40 82 00 20 */ bne lbl_801C7928 -/* 801C790C 38 00 00 01 */ li r0, 1 -/* 801C7910 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7914 38 00 00 00 */ li r0, 0 -/* 801C7918 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C791C 38 00 04 00 */ li r0, 0x400 -/* 801C7920 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801C7924 48 00 00 4C */ b lbl_801C7970 -lbl_801C7928: -/* 801C7928 38 00 00 03 */ li r0, 3 -/* 801C792C 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7930 48 04 5D 21 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801C7934 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C7938 41 82 00 18 */ beq lbl_801C7950 -/* 801C793C 38 00 00 01 */ li r0, 1 -/* 801C7940 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7944 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7948 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C794C 48 00 00 14 */ b lbl_801C7960 -lbl_801C7950: -/* 801C7950 38 00 00 00 */ li r0, 0 -/* 801C7954 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7958 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C795C 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_801C7960: -/* 801C7960 38 00 02 00 */ li r0, 0x200 -/* 801C7964 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7968 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C796C B0 03 00 AA */ sth r0, 0xaa(r3) -lbl_801C7970: -/* 801C7970 38 00 00 BB */ li r0, 0xbb -/* 801C7974 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C7978 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C797C 38 81 00 10 */ addi r4, r1, 0x10 -/* 801C7980 38 A0 00 00 */ li r5, 0 -/* 801C7984 38 C0 00 00 */ li r6, 0 -/* 801C7988 38 E0 00 00 */ li r7, 0 -/* 801C798C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7990 FC 40 08 90 */ fmr f2, f1 -/* 801C7994 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7998 FC 80 18 90 */ fmr f4, f3 -/* 801C799C 39 00 00 00 */ li r8, 0 -/* 801C79A0 48 0E 3F E5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C79A4 48 05 70 31 */ bl dMeter2Info_set2DVibrationM__Fv -/* 801C79A8 38 60 00 09 */ li r3, 9 -/* 801C79AC 48 00 01 38 */ b lbl_801C7AE4 -lbl_801C79B0: -/* 801C79B0 28 04 00 00 */ cmplwi r4, 0 -/* 801C79B4 41 82 00 1C */ beq lbl_801C79D0 -/* 801C79B8 28 04 00 06 */ cmplwi r4, 6 -/* 801C79BC 41 82 00 14 */ beq lbl_801C79D0 -/* 801C79C0 28 04 00 08 */ cmplwi r4, 8 -/* 801C79C4 41 82 00 0C */ beq lbl_801C79D0 -/* 801C79C8 28 04 00 0D */ cmplwi r4, 0xd -/* 801C79CC 40 82 01 14 */ bne lbl_801C7AE0 -lbl_801C79D0: -/* 801C79D0 7F E3 FB 78 */ mr r3, r31 -/* 801C79D4 48 00 01 29 */ bl isSync__12dMenu_Fmap_cFv -/* 801C79D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C79DC 41 82 01 04 */ beq lbl_801C7AE0 -/* 801C79E0 48 03 25 CD */ bl dMw_LEFT_TRIGGER__Fv -/* 801C79E4 2C 03 00 00 */ cmpwi r3, 0 -/* 801C79E8 41 82 00 8C */ beq lbl_801C7A74 -/* 801C79EC 48 04 5C 65 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801C79F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C79F4 41 82 00 18 */ beq lbl_801C7A0C -/* 801C79F8 38 00 00 01 */ li r0, 1 -/* 801C79FC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7A00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7A04 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C7A08 48 00 00 14 */ b lbl_801C7A1C -lbl_801C7A0C: -/* 801C7A0C 38 00 00 00 */ li r0, 0 -/* 801C7A10 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7A14 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7A18 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_801C7A1C: -/* 801C7A1C 38 00 00 03 */ li r0, 3 -/* 801C7A20 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7A24 38 00 02 00 */ li r0, 0x200 -/* 801C7A28 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7A2C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7A30 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801C7A34 38 00 00 BB */ li r0, 0xbb -/* 801C7A38 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C7A3C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7A40 38 81 00 0C */ addi r4, r1, 0xc -/* 801C7A44 38 A0 00 00 */ li r5, 0 -/* 801C7A48 38 C0 00 00 */ li r6, 0 -/* 801C7A4C 38 E0 00 00 */ li r7, 0 -/* 801C7A50 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7A54 FC 40 08 90 */ fmr f2, f1 -/* 801C7A58 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7A5C FC 80 18 90 */ fmr f4, f3 -/* 801C7A60 39 00 00 00 */ li r8, 0 -/* 801C7A64 48 0E 3F 21 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7A68 48 05 6F 6D */ bl dMeter2Info_set2DVibrationM__Fv -/* 801C7A6C 38 60 00 09 */ li r3, 9 -/* 801C7A70 48 00 00 74 */ b lbl_801C7AE4 -lbl_801C7A74: -/* 801C7A74 48 03 25 81 */ bl dMw_RIGHT_TRIGGER__Fv -/* 801C7A78 2C 03 00 00 */ cmpwi r3, 0 -/* 801C7A7C 41 82 00 64 */ beq lbl_801C7AE0 -/* 801C7A80 38 00 00 00 */ li r0, 0 -/* 801C7A84 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C7A88 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C7A8C 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801C7A90 38 00 00 01 */ li r0, 1 -/* 801C7A94 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7A98 38 00 04 00 */ li r0, 0x400 -/* 801C7A9C B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801C7AA0 38 00 00 BB */ li r0, 0xbb -/* 801C7AA4 90 01 00 08 */ stw r0, 8(r1) -/* 801C7AA8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C7AAC 38 81 00 08 */ addi r4, r1, 8 -/* 801C7AB0 38 A0 00 00 */ li r5, 0 -/* 801C7AB4 38 C0 00 00 */ li r6, 0 -/* 801C7AB8 38 E0 00 00 */ li r7, 0 -/* 801C7ABC C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C7AC0 FC 40 08 90 */ fmr f2, f1 -/* 801C7AC4 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C7AC8 FC 80 18 90 */ fmr f4, f3 -/* 801C7ACC 39 00 00 00 */ li r8, 0 -/* 801C7AD0 48 0E 3E B5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7AD4 48 05 6F 01 */ bl dMeter2Info_set2DVibrationM__Fv -/* 801C7AD8 38 60 00 09 */ li r3, 9 -/* 801C7ADC 48 00 00 08 */ b lbl_801C7AE4 -lbl_801C7AE0: -/* 801C7AE0 7F C3 F3 78 */ mr r3, r30 -lbl_801C7AE4: -/* 801C7AE4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C7AE8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801C7AEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C7AF0 7C 08 03 A6 */ mtlr r0 -/* 801C7AF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C7AF8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getNowFmapRegionData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getNowFmapRegionData__12dMenu_Fmap_cFv.s deleted file mode 100644 index 2b814e77c7..0000000000 --- a/asm/d/menu/d_menu_fmap/getNowFmapRegionData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801CD350: -/* 801CD350 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CD354 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801CD358 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 801CD35C 7C 63 02 14 */ add r3, r3, r0 -/* 801CD360 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801CD364 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getNowFmapStageData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getNowFmapStageData__12dMenu_Fmap_cFv.s deleted file mode 100644 index ba1cbbadb3..0000000000 --- a/asm/d/menu/d_menu_fmap/getNowFmapStageData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801CD368: -/* 801CD368 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CD36C 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801CD370 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 801CD374 7C 63 02 14 */ add r3, r3, r0 -/* 801CD378 80 63 00 44 */ lwz r3, 0x44(r3) -/* 801CD37C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getPlayerPos2D__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getPlayerPos2D__12dMenu_Fmap_cFv.s deleted file mode 100644 index aacc3116e2..0000000000 --- a/asm/d/menu/d_menu_fmap/getPlayerPos2D__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801CD95C: -/* 801CD95C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CD960 7C 08 02 A6 */ mflr r0 -/* 801CD964 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CD968 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801CD96C 7C 7F 1B 78 */ mr r31, r3 -/* 801CD970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CD974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CD978 88 03 00 7C */ lbz r0, 0x7c(r3) -/* 801CD97C 28 00 00 00 */ cmplwi r0, 0 -/* 801CD980 41 82 00 3C */ beq lbl_801CD9BC -/* 801CD984 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CD988 4B E7 14 D5 */ bl getMapPlayerPos__10dMapInfo_nFv -/* 801CD98C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CD990 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CD994 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801CD998 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CD99C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801CD9A0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CD9A4 80 7F 00 8C */ lwz r3, 0x8c(r31) -/* 801CD9A8 4B FF 8C 85 */ bl dMenuFmap_getStartStageName__FPv -/* 801CD9AC 7C 64 1B 78 */ mr r4, r3 -/* 801CD9B0 38 61 00 08 */ addi r3, r1, 8 -/* 801CD9B4 48 19 B1 79 */ bl strcpy -/* 801CD9B8 48 00 00 28 */ b lbl_801CD9E0 -lbl_801CD9BC: -/* 801CD9BC C0 03 00 64 */ lfs f0, 0x64(r3) -/* 801CD9C0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CD9C4 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 801CD9C8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801CD9CC C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 801CD9D0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801CD9D4 38 83 00 72 */ addi r4, r3, 0x72 -/* 801CD9D8 38 61 00 08 */ addi r3, r1, 8 -/* 801CD9DC 48 19 B1 51 */ bl strcpy -lbl_801CD9E0: -/* 801CD9E0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CD9E4 C0 43 0F CC */ lfs f2, 0xfcc(r3) -/* 801CD9E8 C0 23 0F C8 */ lfs f1, 0xfc8(r3) -/* 801CD9EC 38 81 00 08 */ addi r4, r1, 8 -/* 801CD9F0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801CD9F4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CD9F8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 801CD9FC EC 40 10 28 */ fsubs f2, f0, f2 -/* 801CDA00 38 BF 01 10 */ addi r5, r31, 0x110 -/* 801CDA04 38 DF 01 14 */ addi r6, r31, 0x114 -/* 801CDA08 48 00 33 49 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf -/* 801CDA0C C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CDA10 D0 1F 01 18 */ stfs f0, 0x118(r31) -/* 801CDA14 38 7F 01 10 */ addi r3, r31, 0x110 -/* 801CDA18 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801CDA1C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CDA20 7C 08 03 A6 */ mtlr r0 -/* 801CDA24 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CDA28 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s deleted file mode 100644 index eb10888eb3..0000000000 --- a/asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CB1DC: -/* 801CB1DC 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB1E0 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB1E4 88 04 02 F9 */ lbz r0, 0x2f9(r4) -/* 801CB1E8 28 00 00 00 */ cmplwi r0, 0 -/* 801CB1EC 41 82 00 0C */ beq lbl_801CB1F8 -/* 801CB1F0 88 63 03 00 */ lbz r3, 0x300(r3) -/* 801CB1F4 4E 80 00 20 */ blr -lbl_801CB1F8: -/* 801CB1F8 38 60 00 06 */ li r3, 6 -/* 801CB1FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s deleted file mode 100644 index 726c51415b..0000000000 --- a/asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CB200: -/* 801CB200 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CB204 28 04 00 00 */ cmplwi r4, 0 -/* 801CB208 41 82 00 20 */ beq lbl_801CB228 -/* 801CB20C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB210 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB214 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801CB218 28 00 00 00 */ cmplwi r0, 0 -/* 801CB21C 41 82 00 0C */ beq lbl_801CB228 -/* 801CB220 88 64 12 27 */ lbz r3, 0x1227(r4) -/* 801CB224 4E 80 00 20 */ blr -lbl_801CB228: -/* 801CB228 38 60 00 00 */ li r3, 0 -/* 801CB22C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getRegionStageNum__12dMenu_Fmap_cFi.s b/asm/d/menu/d_menu_fmap/getRegionStageNum__12dMenu_Fmap_cFi.s deleted file mode 100644 index b6a085e6ba..0000000000 --- a/asm/d/menu/d_menu_fmap/getRegionStageNum__12dMenu_Fmap_cFi.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801CD2FC: -/* 801CD2FC 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 801CD300 28 03 00 00 */ cmplwi r3, 0 -/* 801CD304 41 82 00 44 */ beq lbl_801CD348 -/* 801CD308 80 03 00 08 */ lwz r0, 8(r3) -/* 801CD30C 7C A3 02 14 */ add r5, r3, r0 -/* 801CD310 38 C5 00 04 */ addi r6, r5, 4 -/* 801CD314 38 60 00 00 */ li r3, 0 -/* 801CD318 88 05 00 00 */ lbz r0, 0(r5) -/* 801CD31C 7C 09 03 A6 */ mtctr r0 -/* 801CD320 2C 00 00 00 */ cmpwi r0, 0 -/* 801CD324 40 81 00 24 */ ble lbl_801CD348 -lbl_801CD328: -/* 801CD328 7C 06 18 AE */ lbzx r0, r6, r3 -/* 801CD32C 7C 04 00 00 */ cmpw r4, r0 -/* 801CD330 40 82 00 10 */ bne lbl_801CD340 -/* 801CD334 7C 66 1A 14 */ add r3, r6, r3 -/* 801CD338 88 63 00 01 */ lbz r3, 1(r3) -/* 801CD33C 4E 80 00 20 */ blr -lbl_801CD340: -/* 801CD340 38 63 00 28 */ addi r3, r3, 0x28 -/* 801CD344 42 00 FF E4 */ bdnz lbl_801CD328 -lbl_801CD348: -/* 801CD348 38 60 00 00 */ li r3, 0 -/* 801CD34C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s deleted file mode 100644 index c7beaee520..0000000000 --- a/asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CB230: -/* 801CB230 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CB234 28 04 00 00 */ cmplwi r4, 0 -/* 801CB238 41 82 00 20 */ beq lbl_801CB258 -/* 801CB23C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB240 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB244 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801CB248 28 00 00 00 */ cmplwi r0, 0 -/* 801CB24C 41 82 00 0C */ beq lbl_801CB258 -/* 801CB250 88 64 12 29 */ lbz r3, 0x1229(r4) -/* 801CB254 4E 80 00 20 */ blr -lbl_801CB258: -/* 801CB258 38 60 00 00 */ li r3, 0 -/* 801CB25C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s deleted file mode 100644 index 86c084e392..0000000000 --- a/asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CB260: -/* 801CB260 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CB264 28 04 00 00 */ cmplwi r4, 0 -/* 801CB268 41 82 00 20 */ beq lbl_801CB288 -/* 801CB26C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB270 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB274 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801CB278 28 00 00 00 */ cmplwi r0, 0 -/* 801CB27C 41 82 00 0C */ beq lbl_801CB288 -/* 801CB280 C0 24 0F C8 */ lfs f1, 0xfc8(r4) -/* 801CB284 4E 80 00 20 */ blr -lbl_801CB288: -/* 801CB288 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CB28C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s deleted file mode 100644 index 226e88975d..0000000000 --- a/asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CB290: -/* 801CB290 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CB294 28 04 00 00 */ cmplwi r4, 0 -/* 801CB298 41 82 00 20 */ beq lbl_801CB2B8 -/* 801CB29C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB2A0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB2A4 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801CB2A8 28 00 00 00 */ cmplwi r0, 0 -/* 801CB2AC 41 82 00 0C */ beq lbl_801CB2B8 -/* 801CB2B0 C0 24 0F CC */ lfs f1, 0xfcc(r4) -/* 801CB2B4 4E 80 00 20 */ blr -lbl_801CB2B8: -/* 801CB2B8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CB2BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howlArrowPosInit__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howlArrowPosInit__12dMenu_Fmap_cFv.s deleted file mode 100644 index 76eefc15e3..0000000000 --- a/asm/d/menu/d_menu_fmap/howlArrowPosInit__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801CD814: -/* 801CD814 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CD818 7C 08 02 A6 */ mflr r0 -/* 801CD81C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CD820 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CD824 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801CD828 7C 7E 1B 78 */ mr r30, r3 -/* 801CD82C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CD830 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CD834 88 A3 00 E2 */ lbz r5, 0xe2(r3) -/* 801CD838 38 7E 02 50 */ addi r3, r30, 0x250 -/* 801CD83C 3C 80 80 3C */ lis r4, stage_name_7361@ha /* 0x803BD64C@ha */ -/* 801CD840 38 04 D6 4C */ addi r0, r4, stage_name_7361@l /* 0x803BD64C@l */ -/* 801CD844 54 BF 15 BA */ rlwinm r31, r5, 2, 0x16, 0x1d -/* 801CD848 7C 80 FA 14 */ add r4, r0, r31 -/* 801CD84C 80 84 FF F8 */ lwz r4, -8(r4) -/* 801CD850 48 19 B2 DD */ bl strcpy -/* 801CD854 7F C3 F3 78 */ mr r3, r30 -/* 801CD858 38 80 00 06 */ li r4, 6 -/* 801CD85C 3C A0 80 39 */ lis r5, i_swBit@ha /* 0x803960D0@ha */ -/* 801CD860 38 05 60 D0 */ addi r0, r5, i_swBit@l /* 0x803960D0@l */ -/* 801CD864 7C A0 FA 14 */ add r5, r0, r31 -/* 801CD868 80 A5 FF F8 */ lwz r5, -8(r5) -/* 801CD86C 38 C1 00 0C */ addi r6, r1, 0xc -/* 801CD870 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD874 4B FF F7 8D */ bl searchIcon__12dMenu_Fmap_cFUciPfPf -/* 801CD878 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD87C 41 82 00 20 */ beq lbl_801CD89C -/* 801CD880 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD884 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CD888 38 BE 02 50 */ addi r5, r30, 0x250 -/* 801CD88C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801CD890 C0 41 00 08 */ lfs f2, 8(r1) -/* 801CD894 C0 62 A7 28 */ lfs f3, lit_4158(r2) -/* 801CD898 48 00 81 29 */ bl setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff -lbl_801CD89C: -/* 801CD89C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CD8A0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801CD8A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CD8A8 7C 08 03 A6 */ mtlr r0 -/* 801CD8AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CD8B0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howl_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howl_demo1_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 4bb1cad609..0000000000 --- a/asm/d/menu/d_menu_fmap/howl_demo1_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801CAC30: -/* 801CAC30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CAC34 7C 08 02 A6 */ mflr r0 -/* 801CAC38 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAC3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CAC40 7C 7F 1B 78 */ mr r31, r3 -/* 801CAC44 38 00 FF F6 */ li r0, -10 -/* 801CAC48 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CAC4C 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CAC50 38 80 00 00 */ li r4, 0 -/* 801CAC54 38 A0 00 FF */ li r5, 0xff -/* 801CAC58 48 00 C6 7D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CAC5C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAC60 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CAC64 48 00 68 15 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CAC68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CAC6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CAC70 7C 08 03 A6 */ mtlr r0 -/* 801CAC74 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CAC78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howl_demo1_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howl_demo1_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 7112019f06..0000000000 --- a/asm/d/menu/d_menu_fmap/howl_demo1_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801CAC7C: -/* 801CAC7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CAC80 7C 08 02 A6 */ mflr r0 -/* 801CAC84 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CAC88 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CAC8C 7C 7F 1B 78 */ mr r31, r3 -/* 801CAC90 A8 63 02 14 */ lha r3, 0x214(r3) -/* 801CAC94 38 03 00 01 */ addi r0, r3, 1 -/* 801CAC98 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CAC9C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CACA0 2C 00 00 01 */ cmpwi r0, 1 -/* 801CACA4 40 82 00 38 */ bne lbl_801CACDC -/* 801CACA8 38 00 00 BC */ li r0, 0xbc -/* 801CACAC 90 01 00 08 */ stw r0, 8(r1) -/* 801CACB0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CACB4 38 81 00 08 */ addi r4, r1, 8 -/* 801CACB8 38 A0 00 00 */ li r5, 0 -/* 801CACBC 38 C0 00 00 */ li r6, 0 -/* 801CACC0 38 E0 00 00 */ li r7, 0 -/* 801CACC4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CACC8 FC 40 08 90 */ fmr f2, f1 -/* 801CACCC C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CACD0 FC 80 18 90 */ fmr f4, f3 -/* 801CACD4 39 00 00 00 */ li r8, 0 -/* 801CACD8 48 0E 0C AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801CACDC: -/* 801CACDC A8 7F 02 14 */ lha r3, 0x214(r31) -/* 801CACE0 7C 60 07 35 */ extsh. r0, r3 -/* 801CACE4 40 81 00 50 */ ble lbl_801CAD34 -/* 801CACE8 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801CACEC 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 801CACF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CACF4 3C 00 43 30 */ lis r0, 0x4330 -/* 801CACF8 90 01 00 10 */ stw r0, 0x10(r1) -/* 801CACFC C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801CAD00 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CAD04 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801CAD08 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801CAD0C D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801CAD10 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAD14 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CAD18 48 00 67 61 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CAD1C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CAD20 2C 00 00 0A */ cmpwi r0, 0xa -/* 801CAD24 41 80 00 10 */ blt lbl_801CAD34 -/* 801CAD28 7F E3 FB 78 */ mr r3, r31 -/* 801CAD2C 38 80 00 1C */ li r4, 0x1c -/* 801CAD30 48 00 09 A1 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CAD34: -/* 801CAD34 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CAD38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CAD3C 7C 08 03 A6 */ mtlr r0 -/* 801CAD40 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CAD44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howl_demo2_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howl_demo2_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 9828da79a8..0000000000 --- a/asm/d/menu/d_menu_fmap/howl_demo2_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801CAD48: -/* 801CAD48 38 00 FF F6 */ li r0, -10 -/* 801CAD4C B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CAD50 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howl_demo2_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howl_demo2_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 4f20a11fe9..0000000000 --- a/asm/d/menu/d_menu_fmap/howl_demo2_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801CAD54: -/* 801CAD54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CAD58 7C 08 02 A6 */ mflr r0 -/* 801CAD5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAD60 A8 83 02 14 */ lha r4, 0x214(r3) -/* 801CAD64 38 04 00 01 */ addi r0, r4, 1 -/* 801CAD68 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CAD6C A8 03 02 14 */ lha r0, 0x214(r3) -/* 801CAD70 2C 00 00 00 */ cmpwi r0, 0 -/* 801CAD74 40 81 00 18 */ ble lbl_801CAD8C -/* 801CAD78 38 00 00 01 */ li r0, 1 -/* 801CAD7C 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CAD80 98 04 12 3A */ stb r0, 0x123a(r4) -/* 801CAD84 38 80 00 0D */ li r4, 0xd -/* 801CAD88 48 00 09 49 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CAD8C: -/* 801CAD8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CAD90 7C 08 03 A6 */ mtlr r0 -/* 801CAD94 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CAD98 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/howl_demo3_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/howl_demo3_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index bdd6ac9626..0000000000 --- a/asm/d/menu/d_menu_fmap/howl_demo3_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801CADA0: -/* 801CADA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CADA4 7C 08 02 A6 */ mflr r0 -/* 801CADA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CADAC 38 80 00 06 */ li r4, 6 -/* 801CADB0 48 00 09 21 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CADB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CADB8 7C 08 03 A6 */ mtlr r0 -/* 801CADBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CADC0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0149913e13..0000000000 --- a/asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_801CB038: -/* 801CB038 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CB03C 7C 08 02 A6 */ mflr r0 -/* 801CB040 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CB044 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB048 48 19 71 95 */ bl _savegpr_29 -/* 801CB04C 7C 7D 1B 78 */ mr r29, r3 -/* 801CB050 3B E0 00 01 */ li r31, 1 -/* 801CB054 3B C0 00 00 */ li r30, 0 -/* 801CB058 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CB05C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CB060 A8 83 00 96 */ lha r4, 0x96(r3) -/* 801CB064 A8 1D 02 12 */ lha r0, 0x212(r29) -/* 801CB068 7C 00 20 00 */ cmpw r0, r4 -/* 801CB06C 40 82 00 08 */ bne lbl_801CB074 -/* 801CB070 3B C0 00 01 */ li r30, 1 -lbl_801CB074: -/* 801CB074 A8 7D 02 12 */ lha r3, 0x212(r29) -/* 801CB078 38 03 FF FF */ addi r0, r3, -1 -/* 801CB07C B0 1D 02 12 */ sth r0, 0x212(r29) -/* 801CB080 A8 BD 02 12 */ lha r5, 0x212(r29) -/* 801CB084 C8 42 A7 40 */ lfd f2, lit_4358(r2) -/* 801CB088 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 801CB08C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801CB090 3C 60 43 30 */ lis r3, 0x4330 -/* 801CB094 90 61 00 08 */ stw r3, 8(r1) -/* 801CB098 C8 01 00 08 */ lfd f0, 8(r1) -/* 801CB09C EC 20 10 28 */ fsubs f1, f0, f2 -/* 801CB0A0 7C 80 07 34 */ extsh r0, r4 -/* 801CB0A4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CB0A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CB0AC 90 61 00 10 */ stw r3, 0x10(r1) -/* 801CB0B0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801CB0B4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CB0B8 EC 41 00 24 */ fdivs f2, f1, f0 -/* 801CB0BC 7C A0 07 35 */ extsh. r0, r5 -/* 801CB0C0 41 81 00 10 */ bgt lbl_801CB0D0 -/* 801CB0C4 38 00 00 00 */ li r0, 0 -/* 801CB0C8 B0 1D 02 12 */ sth r0, 0x212(r29) -/* 801CB0CC 48 00 00 08 */ b lbl_801CB0D4 -lbl_801CB0D0: -/* 801CB0D0 3B E0 00 00 */ li r31, 0 -lbl_801CB0D4: -/* 801CB0D4 88 1D 03 04 */ lbz r0, 0x304(r29) -/* 801CB0D8 28 00 00 01 */ cmplwi r0, 1 -/* 801CB0DC 40 82 00 24 */ bne lbl_801CB100 -/* 801CB0E0 C0 22 A7 30 */ lfs f1, lit_4160(r2) -/* 801CB0E4 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CB0E8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CB0EC EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CB0F0 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CB0F4 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CB0F8 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CB0FC 48 00 00 78 */ b lbl_801CB174 -lbl_801CB100: -/* 801CB100 28 00 00 03 */ cmplwi r0, 3 -/* 801CB104 40 82 00 24 */ bne lbl_801CB128 -/* 801CB108 C0 22 A7 2C */ lfs f1, lit_4159(r2) -/* 801CB10C C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CB110 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CB114 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CB118 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CB11C C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CB120 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CB124 48 00 00 50 */ b lbl_801CB174 -lbl_801CB128: -/* 801CB128 28 00 00 02 */ cmplwi r0, 2 -/* 801CB12C 40 82 00 24 */ bne lbl_801CB150 -/* 801CB130 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CB134 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CB138 C0 22 A7 38 */ lfs f1, lit_4162(r2) -/* 801CB13C C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CB140 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CB144 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CB148 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CB14C 48 00 00 28 */ b lbl_801CB174 -lbl_801CB150: -/* 801CB150 28 00 00 00 */ cmplwi r0, 0 -/* 801CB154 40 82 00 20 */ bne lbl_801CB174 -/* 801CB158 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CB15C D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CB160 C0 22 A7 34 */ lfs f1, lit_4161(r2) -/* 801CB164 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CB168 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CB16C EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CB170 D0 1D 01 20 */ stfs f0, 0x120(r29) -lbl_801CB174: -/* 801CB174 D0 5D 01 24 */ stfs f2, 0x124(r29) -/* 801CB178 C0 3D 01 20 */ lfs f1, 0x120(r29) -/* 801CB17C 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB180 C0 1D 01 1C */ lfs f0, 0x11c(r29) -/* 801CB184 D0 03 0F BC */ stfs f0, 0xfbc(r3) -/* 801CB188 D0 23 0F C0 */ stfs f1, 0xfc0(r3) -/* 801CB18C 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB190 C0 3D 01 24 */ lfs f1, 0x124(r29) -/* 801CB194 7F C4 F3 78 */ mr r4, r30 -/* 801CB198 48 00 A1 9D */ bl setAllAlphaRate__18dMenu_Fmap2DBack_cFfb -/* 801CB19C C0 3D 01 20 */ lfs f1, 0x120(r29) -/* 801CB1A0 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 801CB1A4 C0 1D 01 1C */ lfs f0, 0x11c(r29) -/* 801CB1A8 D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801CB1AC D0 23 00 7C */ stfs f1, 0x7c(r3) -/* 801CB1B0 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 801CB1B4 C0 3D 01 24 */ lfs f1, 0x124(r29) -/* 801CB1B8 7F C4 F3 78 */ mr r4, r30 -/* 801CB1BC 48 00 BA 89 */ bl setAllAlphaRate__17dMenu_Fmap2DTop_cFfb -/* 801CB1C0 7F E3 FB 78 */ mr r3, r31 -/* 801CB1C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB1C8 48 19 70 61 */ bl _restgpr_29 -/* 801CB1CC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CB1D0 7C 08 03 A6 */ mtlr r0 -/* 801CB1D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CB1D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isLightVesselGet__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/isLightVesselGet__12dMenu_Fmap_cFv.s deleted file mode 100644 index f1c1999d11..0000000000 --- a/asm/d/menu/d_menu_fmap/isLightVesselGet__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801CD92C: -/* 801CD92C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CD930 7C 08 02 A6 */ mflr r0 -/* 801CD934 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CD938 4B E6 14 A9 */ bl dComIfGp_isLightDropMapVisible__Fv -/* 801CD93C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CD940 30 03 FF FF */ addic r0, r3, -1 -/* 801CD944 7C 00 19 10 */ subfe r0, r0, r3 -/* 801CD948 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801CD94C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CD950 7C 08 03 A6 */ mtlr r0 -/* 801CD954 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CD958 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s deleted file mode 100644 index b8af9acd3f..0000000000 --- a/asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,169 +0,0 @@ -lbl_801CADC4: -/* 801CADC4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CADC8 7C 08 02 A6 */ mflr r0 -/* 801CADCC 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CADD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CADD4 48 19 74 09 */ bl _savegpr_29 -/* 801CADD8 7C 7D 1B 78 */ mr r29, r3 -/* 801CADDC 3B E0 00 00 */ li r31, 0 -/* 801CADE0 3B C0 00 00 */ li r30, 0 -/* 801CADE4 80 03 00 68 */ lwz r0, 0x68(r3) -/* 801CADE8 28 00 00 00 */ cmplwi r0, 0 -/* 801CADEC 40 82 00 A4 */ bne lbl_801CAE90 -/* 801CADF0 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 801CADF4 28 00 00 00 */ cmplwi r0, 0 -/* 801CADF8 40 82 00 20 */ bne lbl_801CAE18 -/* 801CADFC 3C 60 80 39 */ lis r3, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CAE00 38 63 60 E8 */ addi r3, r3, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CAE04 38 63 00 26 */ addi r3, r3, 0x26 -/* 801CAE08 38 80 00 02 */ li r4, 2 -/* 801CAE0C 80 BD 00 04 */ lwz r5, 4(r29) -/* 801CAE10 4B E4 B0 05 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap -/* 801CAE14 90 7D 00 1C */ stw r3, 0x1c(r29) -lbl_801CAE18: -/* 801CAE18 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 801CAE1C 88 03 00 0C */ lbz r0, 0xc(r3) -/* 801CAE20 2C 00 00 00 */ cmpwi r0, 0 -/* 801CAE24 41 82 00 64 */ beq lbl_801CAE88 -/* 801CAE28 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 801CAE2C 90 1D 00 68 */ stw r0, 0x68(r29) -/* 801CAE30 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 801CAE34 28 03 00 00 */ cmplwi r3, 0 -/* 801CAE38 41 82 00 18 */ beq lbl_801CAE50 -/* 801CAE3C 38 80 00 01 */ li r4, 1 -/* 801CAE40 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801CAE44 81 8C 00 08 */ lwz r12, 8(r12) -/* 801CAE48 7D 89 03 A6 */ mtctr r12 -/* 801CAE4C 4E 80 04 21 */ bctrl -lbl_801CAE50: -/* 801CAE50 38 00 00 00 */ li r0, 0 -/* 801CAE54 90 1D 00 1C */ stw r0, 0x1c(r29) -/* 801CAE58 80 7D 00 68 */ lwz r3, 0x68(r29) -/* 801CAE5C 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CAE60 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CAE64 38 84 00 3E */ addi r4, r4, 0x3e -/* 801CAE68 81 83 00 00 */ lwz r12, 0(r3) -/* 801CAE6C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CAE70 7D 89 03 A6 */ mtctr r12 -/* 801CAE74 4E 80 04 21 */ bctrl -/* 801CAE78 90 7D 00 BC */ stw r3, 0xbc(r29) -/* 801CAE7C 7F A3 EB 78 */ mr r3, r29 -/* 801CAE80 4B FF BE E5 */ bl _create__12dMenu_Fmap_cFv -/* 801CAE84 48 00 00 0C */ b lbl_801CAE90 -lbl_801CAE88: -/* 801CAE88 38 60 00 00 */ li r3, 0 -/* 801CAE8C 48 00 01 94 */ b lbl_801CB020 -lbl_801CAE90: -/* 801CAE90 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CAE94 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CAE98 A8 A3 00 94 */ lha r5, 0x94(r3) -/* 801CAE9C A8 83 00 96 */ lha r4, 0x96(r3) -/* 801CAEA0 A8 1D 02 12 */ lha r0, 0x212(r29) -/* 801CAEA4 2C 00 00 00 */ cmpwi r0, 0 -/* 801CAEA8 40 82 00 08 */ bne lbl_801CAEB0 -/* 801CAEAC 3B C0 00 01 */ li r30, 1 -lbl_801CAEB0: -/* 801CAEB0 A8 7D 02 12 */ lha r3, 0x212(r29) -/* 801CAEB4 38 03 00 01 */ addi r0, r3, 1 -/* 801CAEB8 B0 1D 02 12 */ sth r0, 0x212(r29) -/* 801CAEBC A8 1D 02 12 */ lha r0, 0x212(r29) -/* 801CAEC0 C8 42 A7 40 */ lfd f2, lit_4358(r2) -/* 801CAEC4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CAEC8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801CAECC 3C 60 43 30 */ lis r3, 0x4330 -/* 801CAED0 90 61 00 08 */ stw r3, 8(r1) -/* 801CAED4 C8 01 00 08 */ lfd f0, 8(r1) -/* 801CAED8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801CAEDC 7C A0 07 34 */ extsh r0, r5 -/* 801CAEE0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CAEE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAEE8 90 61 00 10 */ stw r3, 0x10(r1) -/* 801CAEEC C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801CAEF0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CAEF4 EC 41 00 24 */ fdivs f2, f1, f0 -/* 801CAEF8 88 1D 03 04 */ lbz r0, 0x304(r29) -/* 801CAEFC 28 00 00 01 */ cmplwi r0, 1 -/* 801CAF00 40 82 00 24 */ bne lbl_801CAF24 -/* 801CAF04 C0 22 A7 2C */ lfs f1, lit_4159(r2) -/* 801CAF08 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CAF0C EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CAF10 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CAF14 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CAF18 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CAF1C D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CAF20 48 00 00 78 */ b lbl_801CAF98 -lbl_801CAF24: -/* 801CAF24 28 00 00 03 */ cmplwi r0, 3 -/* 801CAF28 40 82 00 24 */ bne lbl_801CAF4C -/* 801CAF2C C0 22 A7 30 */ lfs f1, lit_4160(r2) -/* 801CAF30 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CAF34 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CAF38 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CAF3C D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CAF40 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CAF44 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CAF48 48 00 00 50 */ b lbl_801CAF98 -lbl_801CAF4C: -/* 801CAF4C 28 00 00 02 */ cmplwi r0, 2 -/* 801CAF50 40 82 00 24 */ bne lbl_801CAF74 -/* 801CAF54 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CAF58 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CAF5C C0 22 A7 34 */ lfs f1, lit_4161(r2) -/* 801CAF60 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CAF64 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CAF68 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CAF6C D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CAF70 48 00 00 28 */ b lbl_801CAF98 -lbl_801CAF74: -/* 801CAF74 28 00 00 00 */ cmplwi r0, 0 -/* 801CAF78 40 82 00 20 */ bne lbl_801CAF98 -/* 801CAF7C C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CAF80 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CAF84 C0 22 A7 38 */ lfs f1, lit_4162(r2) -/* 801CAF88 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CAF8C EC 00 10 28 */ fsubs f0, f0, f2 -/* 801CAF90 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801CAF94 D0 1D 01 20 */ stfs f0, 0x120(r29) -lbl_801CAF98: -/* 801CAF98 D0 5D 01 24 */ stfs f2, 0x124(r29) -/* 801CAF9C A8 7D 02 12 */ lha r3, 0x212(r29) -/* 801CAFA0 7C A0 07 34 */ extsh r0, r5 -/* 801CAFA4 7C 03 00 00 */ cmpw r3, r0 -/* 801CAFA8 41 80 00 20 */ blt lbl_801CAFC8 -/* 801CAFAC B0 9D 02 12 */ sth r4, 0x212(r29) -/* 801CAFB0 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CAFB4 D0 1D 01 1C */ stfs f0, 0x11c(r29) -/* 801CAFB8 D0 1D 01 20 */ stfs f0, 0x120(r29) -/* 801CAFBC C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CAFC0 D0 1D 01 24 */ stfs f0, 0x124(r29) -/* 801CAFC4 3B E0 00 01 */ li r31, 1 -lbl_801CAFC8: -/* 801CAFC8 C0 3D 01 20 */ lfs f1, 0x120(r29) -/* 801CAFCC 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CAFD0 C0 1D 01 1C */ lfs f0, 0x11c(r29) -/* 801CAFD4 D0 03 0F BC */ stfs f0, 0xfbc(r3) -/* 801CAFD8 D0 23 0F C0 */ stfs f1, 0xfc0(r3) -/* 801CAFDC 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CAFE0 C0 3D 01 24 */ lfs f1, 0x124(r29) -/* 801CAFE4 7F C4 F3 78 */ mr r4, r30 -/* 801CAFE8 48 00 A3 4D */ bl setAllAlphaRate__18dMenu_Fmap2DBack_cFfb -/* 801CAFEC C0 3D 01 20 */ lfs f1, 0x120(r29) -/* 801CAFF0 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 801CAFF4 C0 1D 01 1C */ lfs f0, 0x11c(r29) -/* 801CAFF8 D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801CAFFC D0 23 00 7C */ stfs f1, 0x7c(r3) -/* 801CB000 80 7D 00 18 */ lwz r3, 0x18(r29) -/* 801CB004 C0 3D 01 24 */ lfs f1, 0x124(r29) -/* 801CB008 7F C4 F3 78 */ mr r4, r30 -/* 801CB00C 48 00 BC 39 */ bl setAllAlphaRate__17dMenu_Fmap2DTop_cFfb -/* 801CB010 C0 1D 01 A8 */ lfs f0, 0x1a8(r29) -/* 801CB014 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB018 D0 03 11 D8 */ stfs f0, 0x11d8(r3) -/* 801CB01C 7F E3 FB 78 */ mr r3, r31 -lbl_801CB020: -/* 801CB020 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB024 48 19 72 05 */ bl _restgpr_29 -/* 801CB028 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CB02C 7C 08 03 A6 */ mtlr r0 -/* 801CB030 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CB034 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isRoomCheck__12dMenu_Fmap_cFii.s b/asm/d/menu/d_menu_fmap/isRoomCheck__12dMenu_Fmap_cFii.s deleted file mode 100644 index bf81fe5de0..0000000000 --- a/asm/d/menu/d_menu_fmap/isRoomCheck__12dMenu_Fmap_cFii.s +++ /dev/null @@ -1,197 +0,0 @@ -lbl_801CB2C0: -/* 801CB2C0 94 21 FE D0 */ stwu r1, -0x130(r1) -/* 801CB2C4 7C 08 02 A6 */ mflr r0 -/* 801CB2C8 90 01 01 34 */ stw r0, 0x134(r1) -/* 801CB2CC 39 61 01 30 */ addi r11, r1, 0x130 -/* 801CB2D0 48 19 6E E5 */ bl _savegpr_19 -/* 801CB2D4 7C 76 1B 78 */ mr r22, r3 -/* 801CB2D8 7C 97 23 78 */ mr r23, r4 -/* 801CB2DC 7C B8 2B 78 */ mr r24, r5 -/* 801CB2E0 88 03 03 05 */ lbz r0, 0x305(r3) -/* 801CB2E4 28 00 00 00 */ cmplwi r0, 0 -/* 801CB2E8 40 82 00 0C */ bne lbl_801CB2F4 -/* 801CB2EC 38 60 00 00 */ li r3, 0 -/* 801CB2F0 48 00 02 68 */ b lbl_801CB558 -lbl_801CB2F4: -/* 801CB2F4 80 96 00 8C */ lwz r4, 0x8c(r22) -/* 801CB2F8 80 64 00 04 */ lwz r3, 4(r4) -/* 801CB2FC 3B A3 00 04 */ addi r29, r3, 4 -/* 801CB300 7F A4 EA 14 */ add r29, r4, r29 -/* 801CB304 3B 80 00 00 */ li r28, 0 -/* 801CB308 3B 60 00 00 */ li r27, 0 -/* 801CB30C 3A A0 00 00 */ li r21, 0 -/* 801CB310 88 96 03 03 */ lbz r4, 0x303(r22) -/* 801CB314 38 00 00 00 */ li r0, 0 -/* 801CB318 38 61 00 90 */ addi r3, r1, 0x90 -/* 801CB31C 7C 89 03 A6 */ mtctr r4 -/* 801CB320 2C 04 00 00 */ cmpwi r4, 0 -/* 801CB324 40 81 00 10 */ ble lbl_801CB334 -lbl_801CB328: -/* 801CB328 98 03 00 00 */ stb r0, 0(r3) -/* 801CB32C 38 63 00 01 */ addi r3, r3, 1 -/* 801CB330 42 00 FF F8 */ bdnz lbl_801CB328 -lbl_801CB334: -/* 801CB334 3B E1 00 10 */ addi r31, r1, 0x10 -/* 801CB338 3A 81 00 90 */ addi r20, r1, 0x90 -/* 801CB33C 48 00 01 74 */ b lbl_801CB4B0 -lbl_801CB340: -/* 801CB340 88 14 00 00 */ lbz r0, 0(r20) -/* 801CB344 28 00 00 00 */ cmplwi r0, 0 -/* 801CB348 40 82 01 5C */ bne lbl_801CB4A4 -/* 801CB34C 38 61 00 08 */ addi r3, r1, 8 -/* 801CB350 7C 9D AA 14 */ add r4, r29, r21 -/* 801CB354 48 19 D7 D9 */ bl strcpy -/* 801CB358 38 C0 00 00 */ li r6, 0 -/* 801CB35C 38 A0 00 00 */ li r5, 0 -/* 801CB360 38 81 00 50 */ addi r4, r1, 0x50 -/* 801CB364 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CB368 38 00 00 40 */ li r0, 0x40 -/* 801CB36C 7C 09 03 A6 */ mtctr r0 -lbl_801CB370: -/* 801CB370 98 A4 00 00 */ stb r5, 0(r4) -/* 801CB374 98 A3 00 00 */ stb r5, 0(r3) -/* 801CB378 38 C6 00 01 */ addi r6, r6, 1 -/* 801CB37C 38 63 00 01 */ addi r3, r3, 1 -/* 801CB380 38 84 00 01 */ addi r4, r4, 1 -/* 801CB384 42 00 FF EC */ bdnz lbl_801CB370 -/* 801CB388 3B 40 00 00 */ li r26, 0 -/* 801CB38C 7F 79 DB 78 */ mr r25, r27 -/* 801CB390 1E 7B 00 14 */ mulli r19, r27, 0x14 -/* 801CB394 48 00 00 CC */ b lbl_801CB460 -lbl_801CB398: -/* 801CB398 7F DD 9A 14 */ add r30, r29, r19 -/* 801CB39C 7F C3 F3 78 */ mr r3, r30 -/* 801CB3A0 38 81 00 08 */ addi r4, r1, 8 -/* 801CB3A4 48 19 D5 F1 */ bl strcmp -/* 801CB3A8 2C 03 00 00 */ cmpwi r3, 0 -/* 801CB3AC 40 82 00 AC */ bne lbl_801CB458 -/* 801CB3B0 38 A0 00 01 */ li r5, 1 -/* 801CB3B4 38 61 00 90 */ addi r3, r1, 0x90 -/* 801CB3B8 7C A3 C9 AE */ stbx r5, r3, r25 -/* 801CB3BC 80 76 00 14 */ lwz r3, 0x14(r22) -/* 801CB3C0 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CB3C4 88 7E 00 09 */ lbz r3, 9(r30) -/* 801CB3C8 38 04 00 01 */ addi r0, r4, 1 -/* 801CB3CC 7C 03 00 00 */ cmpw r3, r0 -/* 801CB3D0 40 82 00 74 */ bne lbl_801CB444 -/* 801CB3D4 88 1E 00 08 */ lbz r0, 8(r30) -/* 801CB3D8 28 00 00 FF */ cmplwi r0, 0xff -/* 801CB3DC 41 82 00 24 */ beq lbl_801CB400 -/* 801CB3E0 38 61 00 50 */ addi r3, r1, 0x50 -/* 801CB3E4 7C A3 01 AE */ stbx r5, r3, r0 -/* 801CB3E8 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CB3EC 7C A3 01 AE */ stbx r5, r3, r0 -/* 801CB3F0 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801CB3F4 40 82 00 64 */ bne lbl_801CB458 -/* 801CB3F8 3B 40 00 01 */ li r26, 1 -/* 801CB3FC 48 00 00 5C */ b lbl_801CB458 -lbl_801CB400: -/* 801CB400 38 C0 00 00 */ li r6, 0 -/* 801CB404 38 81 00 50 */ addi r4, r1, 0x50 -/* 801CB408 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CB40C 38 00 00 40 */ li r0, 0x40 -/* 801CB410 7C 09 03 A6 */ mtctr r0 -lbl_801CB414: -/* 801CB414 88 04 00 00 */ lbz r0, 0(r4) -/* 801CB418 28 00 00 00 */ cmplwi r0, 0 -/* 801CB41C 40 82 00 08 */ bne lbl_801CB424 -/* 801CB420 98 A3 00 00 */ stb r5, 0(r3) -lbl_801CB424: -/* 801CB424 38 C6 00 01 */ addi r6, r6, 1 -/* 801CB428 38 63 00 01 */ addi r3, r3, 1 -/* 801CB42C 38 84 00 01 */ addi r4, r4, 1 -/* 801CB430 42 00 FF E4 */ bdnz lbl_801CB414 -/* 801CB434 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801CB438 40 82 00 20 */ bne lbl_801CB458 -/* 801CB43C 3B 40 00 01 */ li r26, 1 -/* 801CB440 48 00 00 18 */ b lbl_801CB458 -lbl_801CB444: -/* 801CB444 88 1E 00 08 */ lbz r0, 8(r30) -/* 801CB448 28 00 00 FF */ cmplwi r0, 0xff -/* 801CB44C 41 82 00 0C */ beq lbl_801CB458 -/* 801CB450 38 61 00 50 */ addi r3, r1, 0x50 -/* 801CB454 7C A3 01 AE */ stbx r5, r3, r0 -lbl_801CB458: -/* 801CB458 3B 39 00 01 */ addi r25, r25, 1 -/* 801CB45C 3A 73 00 14 */ addi r19, r19, 0x14 -lbl_801CB460: -/* 801CB460 88 16 03 03 */ lbz r0, 0x303(r22) -/* 801CB464 7C 19 00 00 */ cmpw r25, r0 -/* 801CB468 41 80 FF 30 */ blt lbl_801CB398 -/* 801CB46C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801CB470 41 82 00 34 */ beq lbl_801CB4A4 -/* 801CB474 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 801CB478 7C 17 00 00 */ cmpw r23, r0 -/* 801CB47C 40 82 00 10 */ bne lbl_801CB48C -/* 801CB480 7C 1F C0 AE */ lbzx r0, r31, r24 -/* 801CB484 28 00 00 00 */ cmplwi r0, 0 -/* 801CB488 40 82 00 34 */ bne lbl_801CB4BC -lbl_801CB48C: -/* 801CB48C 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CB490 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 801CB494 7C 00 B8 00 */ cmpw r0, r23 -/* 801CB498 40 81 00 0C */ ble lbl_801CB4A4 -/* 801CB49C 38 60 00 00 */ li r3, 0 -/* 801CB4A0 48 00 00 B8 */ b lbl_801CB558 -lbl_801CB4A4: -/* 801CB4A4 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CB4A8 3A B5 00 14 */ addi r21, r21, 0x14 -/* 801CB4AC 3A 94 00 01 */ addi r20, r20, 1 -lbl_801CB4B0: -/* 801CB4B0 88 16 03 03 */ lbz r0, 0x303(r22) -/* 801CB4B4 7C 1B 00 00 */ cmpw r27, r0 -/* 801CB4B8 41 80 FE 88 */ blt lbl_801CB340 -lbl_801CB4BC: -/* 801CB4BC 80 76 00 14 */ lwz r3, 0x14(r22) -/* 801CB4C0 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801CB4C4 38 80 00 00 */ li r4, 0 -/* 801CB4C8 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 801CB4CC 7C 76 02 14 */ add r3, r22, r0 -/* 801CB4D0 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801CB4D4 7E E9 03 A6 */ mtctr r23 -/* 801CB4D8 2C 17 00 00 */ cmpwi r23, 0 -/* 801CB4DC 40 81 00 1C */ ble lbl_801CB4F8 -lbl_801CB4E0: -/* 801CB4E0 80 03 00 04 */ lwz r0, 4(r3) -/* 801CB4E4 7C 03 03 78 */ mr r3, r0 -/* 801CB4E8 28 00 00 00 */ cmplwi r0, 0 -/* 801CB4EC 41 82 00 0C */ beq lbl_801CB4F8 -/* 801CB4F0 38 84 00 01 */ addi r4, r4, 1 -/* 801CB4F4 42 00 FF EC */ bdnz lbl_801CB4E0 -lbl_801CB4F8: -/* 801CB4F8 28 03 00 00 */ cmplwi r3, 0 -/* 801CB4FC 41 82 00 0C */ beq lbl_801CB508 -/* 801CB500 7C 04 B8 00 */ cmpw r4, r23 -/* 801CB504 41 82 00 0C */ beq lbl_801CB510 -lbl_801CB508: -/* 801CB508 38 60 00 00 */ li r3, 0 -/* 801CB50C 48 00 00 4C */ b lbl_801CB558 -lbl_801CB510: -/* 801CB510 80 63 00 00 */ lwz r3, 0(r3) -/* 801CB514 88 03 00 00 */ lbz r0, 0(r3) -/* 801CB518 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CB51C 38 63 00 04 */ addi r3, r3, 4 -/* 801CB520 7C 09 03 A6 */ mtctr r0 -/* 801CB524 2C 00 00 00 */ cmpwi r0, 0 -/* 801CB528 40 81 00 2C */ ble lbl_801CB554 -lbl_801CB52C: -/* 801CB52C 88 03 00 00 */ lbz r0, 0(r3) -/* 801CB530 7C 18 00 00 */ cmpw r24, r0 -/* 801CB534 40 82 00 18 */ bne lbl_801CB54C -/* 801CB538 7C 04 00 AE */ lbzx r0, r4, r0 -/* 801CB53C 28 00 00 00 */ cmplwi r0, 0 -/* 801CB540 41 82 00 0C */ beq lbl_801CB54C -/* 801CB544 38 60 00 01 */ li r3, 1 -/* 801CB548 48 00 00 10 */ b lbl_801CB558 -lbl_801CB54C: -/* 801CB54C 38 63 00 01 */ addi r3, r3, 1 -/* 801CB550 42 00 FF DC */ bdnz lbl_801CB52C -lbl_801CB554: -/* 801CB554 38 60 00 00 */ li r3, 0 -lbl_801CB558: -/* 801CB558 39 61 01 30 */ addi r11, r1, 0x130 -/* 801CB55C 48 19 6C A5 */ bl _restgpr_19 -/* 801CB560 80 01 01 34 */ lwz r0, 0x134(r1) -/* 801CB564 7C 08 03 A6 */ mtlr r0 -/* 801CB568 38 21 01 30 */ addi r1, r1, 0x130 -/* 801CB56C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isRoomDataBit__12dMenu_Fmap_cFi.s b/asm/d/menu/d_menu_fmap/isRoomDataBit__12dMenu_Fmap_cFi.s deleted file mode 100644 index a7849c109d..0000000000 --- a/asm/d/menu/d_menu_fmap/isRoomDataBit__12dMenu_Fmap_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801CCA98: -/* 801CCA98 7C 80 2E 70 */ srawi r0, r4, 5 -/* 801CCA9C 54 00 10 3A */ slwi r0, r0, 2 -/* 801CCAA0 7C 63 02 14 */ add r3, r3, r0 -/* 801CCAA4 80 A3 01 F8 */ lwz r5, 0x1f8(r3) -/* 801CCAA8 38 60 00 01 */ li r3, 1 -/* 801CCAAC 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 801CCAB0 7C 60 00 30 */ slw r0, r3, r0 -/* 801CCAB4 7C A3 00 38 */ and r3, r5, r0 -/* 801CCAB8 30 03 FF FF */ addic r0, r3, -1 -/* 801CCABC 7C 60 19 10 */ subfe r3, r0, r3 -/* 801CCAC0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s deleted file mode 100644 index 526f02a1fb..0000000000 --- a/asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801C7AFC: -/* 801C7AFC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C7B00 28 03 00 00 */ cmplwi r3, 0 -/* 801C7B04 41 82 00 18 */ beq lbl_801C7B1C -/* 801C7B08 88 03 00 0C */ lbz r0, 0xc(r3) -/* 801C7B0C 2C 00 00 00 */ cmpwi r0, 0 -/* 801C7B10 40 82 00 0C */ bne lbl_801C7B1C -/* 801C7B14 38 60 00 00 */ li r3, 0 -/* 801C7B18 4E 80 00 20 */ blr -lbl_801C7B1C: -/* 801C7B1C 38 60 00 01 */ li r3, 1 -/* 801C7B20 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/light_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/light_demo1_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index a599030f4c..0000000000 --- a/asm/d/menu/d_menu_fmap/light_demo1_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_801CA5CC: -/* 801CA5CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CA5D0 7C 08 02 A6 */ mflr r0 -/* 801CA5D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CA5D8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CA5DC 7C 7F 1B 78 */ mr r31, r3 -/* 801CA5E0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801CA5E4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CA5E8 48 00 6E 91 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CA5EC 38 00 FF F6 */ li r0, -10 -/* 801CA5F0 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CA5F4 38 00 00 BC */ li r0, 0xbc -/* 801CA5F8 90 01 00 08 */ stw r0, 8(r1) -/* 801CA5FC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CA600 38 81 00 08 */ addi r4, r1, 8 -/* 801CA604 38 A0 00 00 */ li r5, 0 -/* 801CA608 38 C0 00 00 */ li r6, 0 -/* 801CA60C 38 E0 00 00 */ li r7, 0 -/* 801CA610 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CA614 FC 40 08 90 */ fmr f2, f1 -/* 801CA618 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CA61C FC 80 18 90 */ fmr f4, f3 -/* 801CA620 39 00 00 00 */ li r8, 0 -/* 801CA624 48 0E 13 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801CA628 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA62C 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801CA630 7F E3 FB 78 */ mr r3, r31 -/* 801CA634 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA638 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA63C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA640 48 00 22 1D */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801CA644 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA648 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801CA64C 7F E3 FB 78 */ mr r3, r31 -/* 801CA650 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA654 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA658 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA65C 48 00 22 25 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801CA660 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA664 38 80 00 00 */ li r4, 0 -/* 801CA668 38 A0 00 FF */ li r5, 0xff -/* 801CA66C 48 00 CB A5 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA670 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA674 38 80 00 00 */ li r4, 0 -/* 801CA678 38 A0 00 FF */ li r5, 0xff -/* 801CA67C 48 00 CC 59 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA680 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA684 38 80 00 00 */ li r4, 0 -/* 801CA688 38 A0 00 FF */ li r5, 0xff -/* 801CA68C 48 00 CA 5D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA690 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA694 38 80 00 00 */ li r4, 0 -/* 801CA698 48 00 CE 55 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801CA69C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA6A0 38 80 00 00 */ li r4, 0 -/* 801CA6A4 48 00 CC F5 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801CA6A8 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA6AC 48 06 D4 35 */ bl setTalkHeap__12dMsgObject_cFPv -/* 801CA6B0 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801CA6B4 D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801CA6B8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA6BC 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801CA6C0 7F E3 FB 78 */ mr r3, r31 -/* 801CA6C4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA6C8 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA6CC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA6D0 48 00 21 8D */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801CA6D4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA6D8 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801CA6DC 7F E3 FB 78 */ mr r3, r31 -/* 801CA6E0 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA6E4 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA6E8 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA6EC 48 00 21 95 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801CA6F0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA6F4 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801CA6F8 90 1F 02 04 */ stw r0, 0x204(r31) -/* 801CA6FC 38 00 00 00 */ li r0, 0 -/* 801CA700 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA704 98 03 12 38 */ stb r0, 0x1238(r3) -/* 801CA708 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA70C 38 80 00 01 */ li r4, 1 -/* 801CA710 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA714 48 00 D0 01 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA718 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA71C 38 80 00 02 */ li r4, 2 -/* 801CA720 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA724 48 00 CF F1 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA728 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA72C 38 80 00 00 */ li r4, 0 -/* 801CA730 38 A0 00 FF */ li r5, 0xff -/* 801CA734 48 00 CA DD */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA738 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA73C 38 80 00 00 */ li r4, 0 -/* 801CA740 38 A0 00 FF */ li r5, 0xff -/* 801CA744 48 00 CB 91 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA748 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA74C 38 80 00 00 */ li r4, 0 -/* 801CA750 38 A0 00 FF */ li r5, 0xff -/* 801CA754 48 00 C9 95 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA758 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA75C 38 80 00 00 */ li r4, 0 -/* 801CA760 48 00 CD 8D */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801CA764 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA768 38 80 00 00 */ li r4, 0 -/* 801CA76C 48 00 CC 2D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801CA770 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA774 48 06 D3 6D */ bl setTalkHeap__12dMsgObject_cFPv -/* 801CA778 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA77C 38 80 00 00 */ li r4, 0 -/* 801CA780 38 A0 00 7D */ li r5, 0x7d -/* 801CA784 38 C0 00 00 */ li r6, 0 -/* 801CA788 38 E0 00 00 */ li r7, 0 -/* 801CA78C 48 07 F8 05 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 801CA790 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CA794 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CA798 7C 08 03 A6 */ mtlr r0 -/* 801CA79C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA7A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/light_demo1_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/light_demo1_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index c8ef92c3ac..0000000000 --- a/asm/d/menu/d_menu_fmap/light_demo1_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801CA7A4: -/* 801CA7A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA7A8 7C 08 02 A6 */ mflr r0 -/* 801CA7AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA7B0 A8 83 02 14 */ lha r4, 0x214(r3) -/* 801CA7B4 38 04 00 01 */ addi r0, r4, 1 -/* 801CA7B8 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CA7BC A8 03 02 14 */ lha r0, 0x214(r3) -/* 801CA7C0 2C 00 00 00 */ cmpwi r0, 0 -/* 801CA7C4 40 81 00 0C */ ble lbl_801CA7D0 -/* 801CA7C8 38 80 00 18 */ li r4, 0x18 -/* 801CA7CC 48 00 0F 05 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CA7D0: -/* 801CA7D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA7D4 7C 08 03 A6 */ mtlr r0 -/* 801CA7D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA7DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/light_demo2_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/light_demo2_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index ed1ac5fd2d..0000000000 --- a/asm/d/menu/d_menu_fmap/light_demo2_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CA7E0: -/* 801CA7E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA7E4 7C 08 02 A6 */ mflr r0 -/* 801CA7E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA7EC 38 80 00 00 */ li r4, 0 -/* 801CA7F0 38 A0 00 7D */ li r5, 0x7d -/* 801CA7F4 38 C0 00 00 */ li r6, 0 -/* 801CA7F8 38 E0 00 00 */ li r7, 0 -/* 801CA7FC 38 63 00 C4 */ addi r3, r3, 0xc4 -/* 801CA800 48 07 F7 91 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 801CA804 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA808 7C 08 03 A6 */ mtlr r0 -/* 801CA80C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA810 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/light_demo2_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/light_demo2_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index b541c19eb1..0000000000 --- a/asm/d/menu/d_menu_fmap/light_demo2_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801CA814: -/* 801CA814 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA818 7C 08 02 A6 */ mflr r0 -/* 801CA81C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA820 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA824 7C 7F 1B 78 */ mr r31, r3 -/* 801CA828 48 00 0E 3D */ bl talkButton__12dMenu_Fmap_cFv -/* 801CA82C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA830 38 80 00 00 */ li r4, 0 -/* 801CA834 38 A0 00 00 */ li r5, 0 -/* 801CA838 38 C0 00 00 */ li r6, 0 -/* 801CA83C 48 07 FA 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801CA840 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA844 41 82 00 1C */ beq lbl_801CA860 -/* 801CA848 7F E3 FB 78 */ mr r3, r31 -/* 801CA84C 38 80 00 0D */ li r4, 0xd -/* 801CA850 48 00 0E 81 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA854 38 00 00 01 */ li r0, 1 -/* 801CA858 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA85C 98 03 12 3A */ stb r0, 0x123a(r3) -lbl_801CA860: -/* 801CA860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA868 7C 08 03 A6 */ mtlr r0 -/* 801CA86C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA870 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/onRoomDataBit__12dMenu_Fmap_cFi.s b/asm/d/menu/d_menu_fmap/onRoomDataBit__12dMenu_Fmap_cFi.s deleted file mode 100644 index e5e07f1388..0000000000 --- a/asm/d/menu/d_menu_fmap/onRoomDataBit__12dMenu_Fmap_cFi.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CCA70: -/* 801CCA70 7C 80 2E 70 */ srawi r0, r4, 5 -/* 801CCA74 54 00 10 3A */ slwi r0, r0, 2 -/* 801CCA78 7C C3 02 14 */ add r6, r3, r0 -/* 801CCA7C 80 A6 01 F8 */ lwz r5, 0x1f8(r6) -/* 801CCA80 38 60 00 01 */ li r3, 1 -/* 801CCA84 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 801CCA88 7C 60 00 30 */ slw r0, r3, r0 -/* 801CCA8C 7C A0 03 78 */ or r0, r5, r0 -/* 801CCA90 90 06 01 F8 */ stw r0, 0x1f8(r6) -/* 801CCA94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portalWarpMapMove__12dMenu_Fmap_cFP9STControl.s b/asm/d/menu/d_menu_fmap/portalWarpMapMove__12dMenu_Fmap_cFP9STControl.s deleted file mode 100644 index 158ebd6abc..0000000000 --- a/asm/d/menu/d_menu_fmap/portalWarpMapMove__12dMenu_Fmap_cFP9STControl.s +++ /dev/null @@ -1,107 +0,0 @@ -lbl_801CC8DC: -/* 801CC8DC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801CC8E0 7C 08 02 A6 */ mflr r0 -/* 801CC8E4 90 01 00 64 */ stw r0, 0x64(r1) -/* 801CC8E8 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 801CC8EC F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 801CC8F0 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 801CC8F4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 801CC8F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CC8FC 48 19 58 D1 */ bl _savegpr_25 -/* 801CC900 7C 7B 1B 78 */ mr r27, r3 -/* 801CC904 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801CC908 48 00 82 25 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl -/* 801CC90C 83 FB 00 90 */ lwz r31, 0x90(r27) -/* 801CC910 3B DF 00 0C */ addi r30, r31, 0xc -/* 801CC914 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 801CC918 C3 E3 11 94 */ lfs f31, 0x1194(r3) -/* 801CC91C C3 C3 11 98 */ lfs f30, 0x1198(r3) -/* 801CC920 3B A0 00 FF */ li r29, 0xff -/* 801CC924 3B 80 00 00 */ li r28, 0 -/* 801CC928 3B 40 00 00 */ li r26, 0 -/* 801CC92C 48 00 00 C0 */ b lbl_801CC9EC -lbl_801CC930: -/* 801CC930 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 801CC934 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CC938 7F 3E D2 14 */ add r25, r30, r26 -/* 801CC93C 88 79 00 01 */ lbz r3, 1(r25) -/* 801CC940 38 04 00 01 */ addi r0, r4, 1 -/* 801CC944 7C 03 00 00 */ cmpw r3, r0 -/* 801CC948 40 82 00 9C */ bne lbl_801CC9E4 -/* 801CC94C 7F 63 DB 78 */ mr r3, r27 -/* 801CC950 88 99 00 0E */ lbz r4, 0xe(r25) -/* 801CC954 88 B9 00 0F */ lbz r5, 0xf(r25) -/* 801CC958 48 00 06 59 */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii -/* 801CC95C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CC960 41 82 00 84 */ beq lbl_801CC9E4 -/* 801CC964 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 801CC968 C0 39 00 10 */ lfs f1, 0x10(r25) -/* 801CC96C C0 59 00 18 */ lfs f2, 0x18(r25) -/* 801CC970 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CC974 38 A1 00 0C */ addi r5, r1, 0xc -/* 801CC978 48 00 43 A1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801CC97C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CC980 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 801CC984 EC 20 00 32 */ fmuls f1, f0, f0 -/* 801CC988 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801CC98C EC 00 F0 28 */ fsubs f0, f0, f30 -/* 801CC990 EC 00 00 32 */ fmuls f0, f0, f0 -/* 801CC994 EC 21 00 2A */ fadds f1, f1, f0 -/* 801CC998 C0 02 A7 60 */ lfs f0, lit_6855(r2) -/* 801CC99C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801CC9A0 4C 40 13 82 */ cror 2, 0, 2 -/* 801CC9A4 40 82 00 40 */ bne lbl_801CC9E4 -/* 801CC9A8 57 9D 06 3E */ clrlwi r29, r28, 0x18 -/* 801CC9AC 7F 63 DB 78 */ mr r3, r27 -/* 801CC9B0 1C 1D 00 1C */ mulli r0, r29, 0x1c -/* 801CC9B4 7F 3E 02 14 */ add r25, r30, r0 -/* 801CC9B8 A0 99 00 0C */ lhz r4, 0xc(r25) -/* 801CC9BC 4B FF FE C5 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801CC9C0 7F 63 DB 78 */ mr r3, r27 -/* 801CC9C4 38 99 00 02 */ addi r4, r25, 2 -/* 801CC9C8 48 00 09 B9 */ bl searchPortalStageID__12dMenu_Fmap_cFPc -/* 801CC9CC 7C 64 1B 78 */ mr r4, r3 -/* 801CC9D0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801CC9D4 28 00 00 FF */ cmplwi r0, 0xff -/* 801CC9D8 41 82 00 0C */ beq lbl_801CC9E4 -/* 801CC9DC 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 801CC9E0 48 00 53 95 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -lbl_801CC9E4: -/* 801CC9E4 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CC9E8 3B 5A 00 1C */ addi r26, r26, 0x1c -lbl_801CC9EC: -/* 801CC9EC 88 1F 00 08 */ lbz r0, 8(r31) -/* 801CC9F0 7C 1C 00 00 */ cmpw r28, r0 -/* 801CC9F4 41 80 FF 3C */ blt lbl_801CC930 -/* 801CC9F8 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 801CC9FC 28 03 00 FF */ cmplwi r3, 0xff -/* 801CCA00 41 82 00 48 */ beq lbl_801CCA48 -/* 801CCA04 88 1B 03 08 */ lbz r0, 0x308(r27) -/* 801CCA08 7C 03 00 40 */ cmplw r3, r0 -/* 801CCA0C 41 82 00 38 */ beq lbl_801CCA44 -/* 801CCA10 38 00 00 46 */ li r0, 0x46 -/* 801CCA14 90 01 00 08 */ stw r0, 8(r1) -/* 801CCA18 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CCA1C 38 81 00 08 */ addi r4, r1, 8 -/* 801CCA20 38 A0 00 00 */ li r5, 0 -/* 801CCA24 38 C0 00 00 */ li r6, 0 -/* 801CCA28 38 E0 00 00 */ li r7, 0 -/* 801CCA2C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CCA30 FC 40 08 90 */ fmr f2, f1 -/* 801CCA34 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CCA38 FC 80 18 90 */ fmr f4, f3 -/* 801CCA3C 39 00 00 00 */ li r8, 0 -/* 801CCA40 48 0D EF 45 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801CCA44: -/* 801CCA44 9B BB 03 08 */ stb r29, 0x308(r27) -lbl_801CCA48: -/* 801CCA48 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 801CCA4C CB E1 00 50 */ lfd f31, 0x50(r1) -/* 801CCA50 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 801CCA54 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 801CCA58 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CCA5C 48 19 57 BD */ bl _restgpr_25 -/* 801CCA60 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801CCA64 7C 08 03 A6 */ mtlr r0 -/* 801CCA68 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CCA6C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo1_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 013b825207..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo1_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_801C9A4C: -/* 801C9A4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9A50 7C 08 02 A6 */ mflr r0 -/* 801C9A54 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9A58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9A5C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9A60 38 00 00 02 */ li r0, 2 -/* 801C9A64 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C9A68 98 04 12 27 */ stb r0, 0x1227(r4) -/* 801C9A6C 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C9A70 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C9A74 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9A78 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9A7C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9A80 48 00 2D DD */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C9A84 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9A88 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801C9A8C 7F E3 FB 78 */ mr r3, r31 -/* 801C9A90 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9A94 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9A98 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C9A9C 48 00 2D E5 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C9AA0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AA4 38 80 00 01 */ li r4, 1 -/* 801C9AA8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C9AAC 48 00 DC 69 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C9AB0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AB4 38 80 00 02 */ li r4, 2 -/* 801C9AB8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C9ABC 48 00 DC 59 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C9AC0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AC4 38 80 00 08 */ li r4, 8 -/* 801C9AC8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C9ACC 48 00 DC 49 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C9AD0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AD4 38 80 00 04 */ li r4, 4 -/* 801C9AD8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C9ADC 48 00 DC 39 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C9AE0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AE4 38 80 00 00 */ li r4, 0 -/* 801C9AE8 38 A0 00 FF */ li r5, 0xff -/* 801C9AEC 48 00 D7 25 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C9AF0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9AF4 38 80 00 00 */ li r4, 0 -/* 801C9AF8 38 A0 00 FF */ li r5, 0xff -/* 801C9AFC 48 00 D7 D9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C9B00 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9B04 38 80 00 00 */ li r4, 0 -/* 801C9B08 38 A0 00 FF */ li r5, 0xff -/* 801C9B0C 48 00 D5 DD */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C9B10 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9B14 38 80 00 00 */ li r4, 0 -/* 801C9B18 48 00 D9 D5 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C9B1C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9B20 38 80 00 00 */ li r4, 0 -/* 801C9B24 48 00 D8 75 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C9B28 80 7F 00 08 */ lwz r3, 8(r31) -/* 801C9B2C 48 06 DF B5 */ bl setTalkHeap__12dMsgObject_cFPv -/* 801C9B30 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801C9B34 38 80 00 00 */ li r4, 0 -/* 801C9B38 38 A0 0B BD */ li r5, 0xbbd -/* 801C9B3C 38 C0 00 00 */ li r6, 0 -/* 801C9B40 38 E0 00 00 */ li r7, 0 -/* 801C9B44 48 08 04 4D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 801C9B48 38 00 00 0A */ li r0, 0xa -/* 801C9B4C B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9B50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9B54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9B58 7C 08 03 A6 */ mtlr r0 -/* 801C9B5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9B60 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo1_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo1_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 5d80b5ad0c..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo1_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_801C9B64: -/* 801C9B64 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C9B68 7C 08 02 A6 */ mflr r0 -/* 801C9B6C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9B70 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9B74 7C 7F 1B 78 */ mr r31, r3 -/* 801C9B78 48 00 1A ED */ bl talkButton__12dMenu_Fmap_cFv -/* 801C9B7C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801C9B80 38 80 00 00 */ li r4, 0 -/* 801C9B84 38 A0 00 00 */ li r5, 0 -/* 801C9B88 38 C0 00 00 */ li r6, 0 -/* 801C9B8C 48 08 07 4D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801C9B90 48 06 E8 41 */ bl getMessageID__12dMsgObject_cFv -/* 801C9B94 28 03 07 D8 */ cmplwi r3, 0x7d8 -/* 801C9B98 40 80 00 10 */ bge lbl_801C9BA8 -/* 801C9B9C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9BA0 2C 00 00 0A */ cmpwi r0, 0xa -/* 801C9BA4 40 80 00 C4 */ bge lbl_801C9C68 -lbl_801C9BA8: -/* 801C9BA8 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9BAC 2C 00 00 0A */ cmpwi r0, 0xa -/* 801C9BB0 40 82 00 38 */ bne lbl_801C9BE8 -/* 801C9BB4 38 00 00 BD */ li r0, 0xbd -/* 801C9BB8 90 01 00 08 */ stw r0, 8(r1) -/* 801C9BBC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C9BC0 38 81 00 08 */ addi r4, r1, 8 -/* 801C9BC4 38 A0 00 00 */ li r5, 0 -/* 801C9BC8 38 C0 00 00 */ li r6, 0 -/* 801C9BCC 38 E0 00 00 */ li r7, 0 -/* 801C9BD0 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C9BD4 FC 40 08 90 */ fmr f2, f1 -/* 801C9BD8 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C9BDC FC 80 18 90 */ fmr f4, f3 -/* 801C9BE0 39 00 00 00 */ li r8, 0 -/* 801C9BE4 48 0E 1D A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801C9BE8: -/* 801C9BE8 A8 7F 02 14 */ lha r3, 0x214(r31) -/* 801C9BEC 38 03 FF FF */ addi r0, r3, -1 -/* 801C9BF0 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9BF4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9BF8 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9BFC C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C9C00 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C9C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9C08 3C 00 43 30 */ lis r0, 0x4330 -/* 801C9C0C 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C9C10 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801C9C14 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C9C18 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C9C1C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C9C20 48 00 75 29 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C9C24 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9C28 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9C2C 41 81 00 3C */ bgt lbl_801C9C68 -/* 801C9C30 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9C34 88 03 12 2F */ lbz r0, 0x122f(r3) -/* 801C9C38 28 00 00 00 */ cmplwi r0, 0 -/* 801C9C3C 41 82 00 18 */ beq lbl_801C9C54 -/* 801C9C40 7F E3 FB 78 */ mr r3, r31 -/* 801C9C44 48 00 29 D9 */ bl removeAreaData__12dMenu_Fmap_cFv -/* 801C9C48 7F E3 FB 78 */ mr r3, r31 -/* 801C9C4C 38 80 00 FF */ li r4, 0xff -/* 801C9C50 48 00 1B 21 */ bl readWorldData__12dMenu_Fmap_cFUc -lbl_801C9C54: -/* 801C9C54 38 00 00 01 */ li r0, 1 -/* 801C9C58 98 1F 03 07 */ stb r0, 0x307(r31) -/* 801C9C5C 7F E3 FB 78 */ mr r3, r31 -/* 801C9C60 38 80 00 01 */ li r4, 1 -/* 801C9C64 48 00 1A 6D */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C9C68: -/* 801C9C68 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C9C6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C9C70 7C 08 03 A6 */ mtlr r0 -/* 801C9C74 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C9C78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo2_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo2_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 6c642eb1b7..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo2_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801C9C7C: -/* 801C9C7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9C80 7C 08 02 A6 */ mflr r0 -/* 801C9C84 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9C88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9C8C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9C90 A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801C9C94 48 00 2B C9 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C9C98 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9C9C 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801C9CA0 7F E3 FB 78 */ mr r3, r31 -/* 801C9CA4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9CA8 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9CAC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9CB0 48 00 2B D1 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C9CB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9CB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9CBC 7C 08 03 A6 */ mtlr r0 -/* 801C9CC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9CC4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo2_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo2_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0ec004afbf..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo2_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801C9CC8: -/* 801C9CC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C9CCC 7C 08 02 A6 */ mflr r0 -/* 801C9CD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9CD4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9CD8 7C 7F 1B 78 */ mr r31, r3 -/* 801C9CDC 48 00 19 89 */ bl talkButton__12dMenu_Fmap_cFv -/* 801C9CE0 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801C9CE4 38 80 00 00 */ li r4, 0 -/* 801C9CE8 38 A0 00 00 */ li r5, 0 -/* 801C9CEC 38 C0 00 00 */ li r6, 0 -/* 801C9CF0 48 08 05 E9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801C9CF4 48 06 E6 DD */ bl getMessageID__12dMsgObject_cFv -/* 801C9CF8 28 03 07 D9 */ cmplwi r3, 0x7d9 -/* 801C9CFC 41 80 00 50 */ blt lbl_801C9D4C -/* 801C9D00 38 00 00 01 */ li r0, 1 -/* 801C9D04 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9D08 98 03 12 27 */ stb r0, 0x1227(r3) -/* 801C9D0C 7F E3 FB 78 */ mr r3, r31 -/* 801C9D10 38 80 00 02 */ li r4, 2 -/* 801C9D14 48 00 19 BD */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9D18 38 00 00 C1 */ li r0, 0xc1 -/* 801C9D1C 90 01 00 08 */ stw r0, 8(r1) -/* 801C9D20 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C9D24 38 81 00 08 */ addi r4, r1, 8 -/* 801C9D28 38 A0 00 00 */ li r5, 0 -/* 801C9D2C 38 C0 00 00 */ li r6, 0 -/* 801C9D30 38 E0 00 00 */ li r7, 0 -/* 801C9D34 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C9D38 FC 40 08 90 */ fmr f2, f1 -/* 801C9D3C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C9D40 FC 80 18 90 */ fmr f4, f3 -/* 801C9D44 39 00 00 00 */ li r8, 0 -/* 801C9D48 48 0E 1C 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801C9D4C: -/* 801C9D4C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C9D50 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C9D54 7C 08 03 A6 */ mtlr r0 -/* 801C9D58 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C9D5C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo3_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo3_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 351220ca11..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo3_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801C9D60: -/* 801C9D60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9D64 7C 08 02 A6 */ mflr r0 -/* 801C9D68 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9D6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9D70 7C 7F 1B 78 */ mr r31, r3 -/* 801C9D74 A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801C9D78 48 00 2A E5 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C9D7C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9D80 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801C9D84 7F E3 FB 78 */ mr r3, r31 -/* 801C9D88 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9D8C 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9D90 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9D94 48 00 2A ED */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C9D98 38 00 00 00 */ li r0, 0 -/* 801C9D9C B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9DA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9DA8 7C 08 03 A6 */ mtlr r0 -/* 801C9DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9DB0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo3_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo3_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 9d3a3905c5..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo3_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801C9DB4: -/* 801C9DB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C9DB8 7C 08 02 A6 */ mflr r0 -/* 801C9DBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9DC0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9DC4 7C 7F 1B 78 */ mr r31, r3 -/* 801C9DC8 48 00 18 9D */ bl talkButton__12dMenu_Fmap_cFv -/* 801C9DCC 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801C9DD0 38 80 00 00 */ li r4, 0 -/* 801C9DD4 38 A0 00 00 */ li r5, 0 -/* 801C9DD8 38 C0 00 00 */ li r6, 0 -/* 801C9DDC 48 08 04 FD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801C9DE0 48 06 E5 F1 */ bl getMessageID__12dMsgObject_cFv -/* 801C9DE4 28 03 07 DA */ cmplwi r3, 0x7da -/* 801C9DE8 40 80 00 10 */ bge lbl_801C9DF8 -/* 801C9DEC A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9DF0 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9DF4 40 81 00 B0 */ ble lbl_801C9EA4 -lbl_801C9DF8: -/* 801C9DF8 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9DFC 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9E00 40 82 00 50 */ bne lbl_801C9E50 -/* 801C9E04 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9E08 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801C9E0C 7F E3 FB 78 */ mr r3, r31 -/* 801C9E10 38 04 00 01 */ addi r0, r4, 1 -/* 801C9E14 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C9E18 48 00 19 59 */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C9E1C 38 00 00 BC */ li r0, 0xbc -/* 801C9E20 90 01 00 08 */ stw r0, 8(r1) -/* 801C9E24 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C9E28 38 81 00 08 */ addi r4, r1, 8 -/* 801C9E2C 38 A0 00 00 */ li r5, 0 -/* 801C9E30 38 C0 00 00 */ li r6, 0 -/* 801C9E34 38 E0 00 00 */ li r7, 0 -/* 801C9E38 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C9E3C FC 40 08 90 */ fmr f2, f1 -/* 801C9E40 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C9E44 FC 80 18 90 */ fmr f4, f3 -/* 801C9E48 39 00 00 00 */ li r8, 0 -/* 801C9E4C 48 0E 1B 39 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801C9E50: -/* 801C9E50 A8 7F 02 14 */ lha r3, 0x214(r31) -/* 801C9E54 38 03 00 01 */ addi r0, r3, 1 -/* 801C9E58 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9E5C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9E60 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9E64 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C9E68 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C9E6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9E70 3C 00 43 30 */ lis r0, 0x4330 -/* 801C9E74 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C9E78 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801C9E7C EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C9E80 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C9E84 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C9E88 48 00 72 C1 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C9E8C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9E90 2C 00 00 0A */ cmpwi r0, 0xa -/* 801C9E94 41 80 00 10 */ blt lbl_801C9EA4 -/* 801C9E98 7F E3 FB 78 */ mr r3, r31 -/* 801C9E9C 38 80 00 0F */ li r4, 0xf -/* 801C9EA0 48 00 18 31 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C9EA4: -/* 801C9EA4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C9EA8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C9EAC 7C 08 03 A6 */ mtlr r0 -/* 801C9EB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C9EB4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo4_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo4_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 7de4bb044d..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo4_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801C9EB8: -/* 801C9EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9EBC 7C 08 02 A6 */ mflr r0 -/* 801C9EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9EC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9EC8 7C 7F 1B 78 */ mr r31, r3 -/* 801C9ECC 38 00 00 FF */ li r0, 0xff -/* 801C9ED0 98 03 03 08 */ stb r0, 0x308(r3) -/* 801C9ED4 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C9ED8 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C9EDC 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9EE0 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9EE4 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9EE8 48 00 29 75 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C9EEC 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801C9EF0 28 00 00 FF */ cmplwi r0, 0xff -/* 801C9EF4 40 82 00 0C */ bne lbl_801C9F00 -/* 801C9EF8 7F E3 FB 78 */ mr r3, r31 -/* 801C9EFC 48 00 29 B1 */ bl setAreaNameZero__12dMenu_Fmap_cFv -lbl_801C9F00: -/* 801C9F00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9F04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9F08 7C 08 03 A6 */ mtlr r0 -/* 801C9F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9F10 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo4_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo4_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0e7bab4b38..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo4_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801C9F14: -/* 801C9F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9F18 7C 08 02 A6 */ mflr r0 -/* 801C9F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9F20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9F24 7C 7F 1B 78 */ mr r31, r3 -/* 801C9F28 48 00 17 3D */ bl talkButton__12dMenu_Fmap_cFv -/* 801C9F2C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801C9F30 38 80 00 00 */ li r4, 0 -/* 801C9F34 38 A0 00 00 */ li r5, 0 -/* 801C9F38 38 C0 00 00 */ li r6, 0 -/* 801C9F3C 48 08 03 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801C9F40 2C 03 00 00 */ cmpwi r3, 0 -/* 801C9F44 41 82 00 10 */ beq lbl_801C9F54 -/* 801C9F48 7F E3 FB 78 */ mr r3, r31 -/* 801C9F4C 38 80 00 10 */ li r4, 0x10 -/* 801C9F50 48 00 17 81 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C9F54: -/* 801C9F54 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9F58 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801C9F5C 7F E3 FB 78 */ mr r3, r31 -/* 801C9F60 38 A0 00 00 */ li r5, 0 -/* 801C9F64 48 00 17 7D */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C9F68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9F6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9F70 7C 08 03 A6 */ mtlr r0 -/* 801C9F74 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9F78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo5_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo5_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 24677935dd..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo5_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801C9F7C: -/* 801C9F7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9F80 7C 08 02 A6 */ mflr r0 -/* 801C9F84 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9F88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9F8C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9F90 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801C9F94 38 80 05 26 */ li r4, 0x526 -/* 801C9F98 48 00 D5 55 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C9F9C 38 00 00 01 */ li r0, 1 -/* 801C9FA0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9FA4 98 03 12 3A */ stb r0, 0x123a(r3) -/* 801C9FA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9FAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9FB0 7C 08 03 A6 */ mtlr r0 -/* 801C9FB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9FB8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo5_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo5_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 9caf6aabd8..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo5_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_801C9FBC: -/* 801C9FBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C9FC0 7C 08 02 A6 */ mflr r0 -/* 801C9FC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9FC8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9FCC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C9FD0 7C 7F 1B 78 */ mr r31, r3 -/* 801C9FD4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C9FD8 4B E6 81 C5 */ bl checkTrigger__9STControlFv -/* 801C9FDC 48 03 00 75 */ bl dMw_B_TRIGGER__Fv -/* 801C9FE0 2C 03 00 00 */ cmpwi r3, 0 -/* 801C9FE4 40 82 00 60 */ bne lbl_801CA044 -/* 801C9FE8 48 03 00 7D */ bl dMw_Z_TRIGGER__Fv -/* 801C9FEC 2C 03 00 00 */ cmpwi r3, 0 -/* 801C9FF0 40 82 00 54 */ bne lbl_801CA044 -/* 801C9FF4 48 03 00 85 */ bl dMw_START_TRIGGER__Fv -/* 801C9FF8 2C 03 00 00 */ cmpwi r3, 0 -/* 801C9FFC 40 82 00 48 */ bne lbl_801CA044 -/* 801CA000 48 02 FF 85 */ bl dMw_UP_TRIGGER__Fv -/* 801CA004 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA008 40 82 00 3C */ bne lbl_801CA044 -/* 801CA00C 48 02 FF 8D */ bl dMw_DOWN_TRIGGER__Fv -/* 801CA010 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA014 40 82 00 30 */ bne lbl_801CA044 -/* 801CA018 48 02 FF 95 */ bl dMw_LEFT_TRIGGER__Fv -/* 801CA01C 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA020 40 82 00 24 */ bne lbl_801CA044 -/* 801CA024 48 02 FF D1 */ bl dMw_RIGHT_TRIGGER__Fv -/* 801CA028 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA02C 40 82 00 18 */ bne lbl_801CA044 -/* 801CA030 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CA034 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CA038 A0 1E 00 B2 */ lhz r0, 0xb2(r30) -/* 801CA03C 54 00 A7 FF */ rlwinm. r0, r0, 0x14, 0x1f, 0x1f -/* 801CA040 41 82 00 28 */ beq lbl_801CA068 -lbl_801CA044: -/* 801CA044 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA048 48 06 DA 99 */ bl setTalkHeap__12dMsgObject_cFPv -/* 801CA04C 38 60 07 DF */ li r3, 0x7df -/* 801CA050 38 80 03 E8 */ li r4, 0x3e8 -/* 801CA054 4B E5 5E 31 */ bl fopMsgM_messageSet__FUlUl -/* 801CA058 7F E3 FB 78 */ mr r3, r31 -/* 801CA05C 38 80 00 11 */ li r4, 0x11 -/* 801CA060 48 00 16 71 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA064 48 00 00 C8 */ b lbl_801CA12C -lbl_801CA068: -/* 801CA068 48 02 FF D5 */ bl dMw_A_TRIGGER__Fv -/* 801CA06C 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA070 41 82 00 B0 */ beq lbl_801CA120 -/* 801CA074 A0 1E 00 B2 */ lhz r0, 0xb2(r30) -/* 801CA078 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801CA07C 40 82 00 A4 */ bne lbl_801CA120 -/* 801CA080 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801CA084 28 00 00 FF */ cmplwi r0, 0xff -/* 801CA088 41 82 00 60 */ beq lbl_801CA0E8 -/* 801CA08C 80 7F 00 90 */ lwz r3, 0x90(r31) -/* 801CA090 3B C3 00 0C */ addi r30, r3, 0xc -/* 801CA094 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA098 80 9F 00 08 */ lwz r4, 8(r31) -/* 801CA09C 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801CA0A0 48 00 D5 A1 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801CA0A4 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801CA0A8 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 801CA0AC 7C 7E 02 14 */ add r3, r30, r0 -/* 801CA0B0 A0 63 00 0C */ lhz r3, 0xc(r3) -/* 801CA0B4 48 06 E3 E9 */ bl setPortalMessageID__12dMsgObject_cFUs -/* 801CA0B8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA0BC 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801CA0C0 38 80 05 1E */ li r4, 0x51e -/* 801CA0C4 38 A0 00 02 */ li r5, 2 -/* 801CA0C8 38 C0 00 00 */ li r6, 0 -/* 801CA0CC 38 E0 00 FF */ li r7, 0xff -/* 801CA0D0 39 00 00 01 */ li r8, 1 -/* 801CA0D4 48 07 44 85 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801CA0D8 7F E3 FB 78 */ mr r3, r31 -/* 801CA0DC 38 80 00 09 */ li r4, 9 -/* 801CA0E0 48 00 15 F1 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA0E4 48 00 00 48 */ b lbl_801CA12C -lbl_801CA0E8: -/* 801CA0E8 38 00 00 4A */ li r0, 0x4a -/* 801CA0EC 90 01 00 08 */ stw r0, 8(r1) -/* 801CA0F0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CA0F4 38 81 00 08 */ addi r4, r1, 8 -/* 801CA0F8 38 A0 00 00 */ li r5, 0 -/* 801CA0FC 38 C0 00 00 */ li r6, 0 -/* 801CA100 38 E0 00 00 */ li r7, 0 -/* 801CA104 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CA108 FC 40 08 90 */ fmr f2, f1 -/* 801CA10C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CA110 FC 80 18 90 */ fmr f4, f3 -/* 801CA114 39 00 00 00 */ li r8, 0 -/* 801CA118 48 0E 18 6D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801CA11C 48 00 00 10 */ b lbl_801CA12C -lbl_801CA120: -/* 801CA120 7F E3 FB 78 */ mr r3, r31 -/* 801CA124 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801CA128 48 00 27 B5 */ bl portalWarpMapMove__12dMenu_Fmap_cFP9STControl -lbl_801CA12C: -/* 801CA12C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA130 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801CA134 7F E3 FB 78 */ mr r3, r31 -/* 801CA138 38 A0 00 00 */ li r5, 0 -/* 801CA13C 48 00 15 A5 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801CA140 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CA144 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801CA148 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CA14C 7C 08 03 A6 */ mtlr r0 -/* 801CA150 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA154 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_demo6_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_demo6_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 6f53afefb8..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_demo6_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_801CA15C: -/* 801CA15C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA160 7C 08 02 A6 */ mflr r0 -/* 801CA164 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA168 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA16C 7C 7F 1B 78 */ mr r31, r3 -/* 801CA170 48 06 E0 BD */ bl getStatus__12dMsgObject_cFv -/* 801CA174 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801CA178 28 00 00 0E */ cmplwi r0, 0xe -/* 801CA17C 40 82 00 18 */ bne lbl_801CA194 -/* 801CA180 38 60 00 10 */ li r3, 0x10 -/* 801CA184 48 06 E0 79 */ bl setStatus__12dMsgObject_cFUs -/* 801CA188 7F E3 FB 78 */ mr r3, r31 -/* 801CA18C 48 00 14 D9 */ bl talkButton__12dMenu_Fmap_cFv -/* 801CA190 48 00 00 30 */ b lbl_801CA1C0 -lbl_801CA194: -/* 801CA194 48 06 E0 99 */ bl getStatus__12dMsgObject_cFv -/* 801CA198 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801CA19C 28 00 00 12 */ cmplwi r0, 0x12 -/* 801CA1A0 40 82 00 20 */ bne lbl_801CA1C0 -/* 801CA1A4 38 60 00 13 */ li r3, 0x13 -/* 801CA1A8 48 06 E0 55 */ bl setStatus__12dMsgObject_cFUs -/* 801CA1AC 7F E3 FB 78 */ mr r3, r31 -/* 801CA1B0 38 80 00 10 */ li r4, 0x10 -/* 801CA1B4 48 00 15 1D */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA1B8 7F E3 FB 78 */ mr r3, r31 -/* 801CA1BC 48 00 14 A9 */ bl talkButton__12dMenu_Fmap_cFv -lbl_801CA1C0: -/* 801CA1C0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA1C4 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801CA1C8 7F E3 FB 78 */ mr r3, r31 -/* 801CA1CC 38 A0 00 00 */ li r5, 0 -/* 801CA1D0 48 00 15 11 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801CA1D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA1D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA1DC 7C 08 03 A6 */ mtlr r0 -/* 801CA1E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA1E4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_warp_forbid_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_warp_forbid_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 06a02de98a..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_warp_forbid_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801C91D8: -/* 801C91D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C91DC 7C 08 02 A6 */ mflr r0 -/* 801C91E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C91E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C91E8 7C 7F 1B 78 */ mr r31, r3 -/* 801C91EC 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801C91F0 38 80 03 F9 */ li r4, 0x3f9 -/* 801C91F4 38 A0 00 FF */ li r5, 0xff -/* 801C91F8 48 00 E0 19 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C91FC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9200 38 80 00 00 */ li r4, 0 -/* 801C9204 38 A0 00 FF */ li r5, 0xff -/* 801C9208 48 00 E0 CD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C920C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9210 38 80 00 00 */ li r4, 0 -/* 801C9214 48 00 E2 D9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C9218 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C921C 38 80 00 00 */ li r4, 0 -/* 801C9220 48 00 E1 79 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C9224 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C922C 7C 08 03 A6 */ mtlr r0 -/* 801C9230 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9234 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_warp_forbid_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_warp_forbid_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 7604d13713..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_warp_forbid_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801C9238: -/* 801C9238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C923C 7C 08 02 A6 */ mflr r0 -/* 801C9240 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9244 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C9248 7C 7F 1B 78 */ mr r31, r3 -/* 801C924C 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801C9250 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C9254 48 07 45 85 */ bl move__17dMsgScrnExplain_cFv -/* 801C9258 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C925C 80 83 00 6C */ lwz r4, 0x6c(r3) -/* 801C9260 88 04 00 60 */ lbz r0, 0x60(r4) -/* 801C9264 28 00 00 00 */ cmplwi r0, 0 -/* 801C9268 40 82 00 14 */ bne lbl_801C927C -/* 801C926C 48 00 E4 55 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv -/* 801C9270 7F E3 FB 78 */ mr r3, r31 -/* 801C9274 88 9F 03 02 */ lbz r4, 0x302(r31) -/* 801C9278 48 00 24 59 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C927C: -/* 801C927C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9280 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801C9284 7F E3 FB 78 */ mr r3, r31 -/* 801C9288 38 A0 00 00 */ li r5, 0 -/* 801C928C 48 00 24 55 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C9290 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9294 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C9298 7C 08 03 A6 */ mtlr r0 -/* 801C929C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C92A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_warp_map_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_warp_map_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index f10effa320..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_warp_map_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_801C8B48: -/* 801C8B48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C8B4C 7C 08 02 A6 */ mflr r0 -/* 801C8B50 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C8B54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C8B58 7C 7F 1B 78 */ mr r31, r3 -/* 801C8B5C 88 03 03 01 */ lbz r0, 0x301(r3) -/* 801C8B60 28 00 00 09 */ cmplwi r0, 9 -/* 801C8B64 41 82 00 38 */ beq lbl_801C8B9C -/* 801C8B68 38 00 00 FF */ li r0, 0xff -/* 801C8B6C 98 1F 03 08 */ stb r0, 0x308(r31) -/* 801C8B70 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 801C8B74 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C8B78 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C8B7C 7C 9F 02 14 */ add r4, r31, r0 -/* 801C8B80 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C8B84 48 00 3C D9 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C8B88 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801C8B8C 28 00 00 FF */ cmplwi r0, 0xff -/* 801C8B90 40 82 00 0C */ bne lbl_801C8B9C -/* 801C8B94 7F E3 FB 78 */ mr r3, r31 -/* 801C8B98 48 00 3D 15 */ bl setAreaNameZero__12dMenu_Fmap_cFv -lbl_801C8B9C: -/* 801C8B9C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BA0 38 80 00 01 */ li r4, 1 -/* 801C8BA4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C8BA8 48 00 EB 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C8BAC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BB0 38 80 00 02 */ li r4, 2 -/* 801C8BB4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C8BB8 48 00 EB 5D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C8BBC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BC0 38 80 05 22 */ li r4, 0x522 -/* 801C8BC4 38 A0 00 FF */ li r5, 0xff -/* 801C8BC8 48 00 E6 49 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C8BCC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BD0 38 80 00 00 */ li r4, 0 -/* 801C8BD4 38 A0 00 FF */ li r5, 0xff -/* 801C8BD8 48 00 E6 FD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C8BDC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BE0 38 80 05 2A */ li r4, 0x52a -/* 801C8BE4 38 A0 00 FF */ li r5, 0xff -/* 801C8BE8 48 00 E5 01 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C8BEC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8BF0 38 80 05 26 */ li r4, 0x526 -/* 801C8BF4 48 00 E8 F9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C8BF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C8BFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C8C00 7C 08 03 A6 */ mtlr r0 -/* 801C8C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C8C08 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_warp_map_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_warp_map_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 1d4a1df964..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_warp_map_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,313 +0,0 @@ -lbl_801C8C0C: -/* 801C8C0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C8C10 7C 08 02 A6 */ mflr r0 -/* 801C8C14 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C8C18 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C8C1C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C8C20 7C 7E 1B 78 */ mr r30, r3 -/* 801C8C24 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C8C28 4B E6 95 75 */ bl checkTrigger__9STControlFv -/* 801C8C2C 48 03 14 25 */ bl dMw_B_TRIGGER__Fv -/* 801C8C30 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8C34 41 82 00 50 */ beq lbl_801C8C84 -/* 801C8C38 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C8C3C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C8C40 A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C8C44 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C8C48 40 82 00 3C */ bne lbl_801C8C84 -/* 801C8C4C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C8C50 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C8C54 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C8C58 28 00 00 01 */ cmplwi r0, 1 -/* 801C8C5C 41 82 00 28 */ beq lbl_801C8C84 -/* 801C8C60 7F C3 F3 78 */ mr r3, r30 -/* 801C8C64 38 80 00 05 */ li r4, 5 -/* 801C8C68 48 00 2A 69 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C8C6C 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C8C70 28 00 00 01 */ cmplwi r0, 1 -/* 801C8C74 40 82 04 04 */ bne lbl_801C9078 -/* 801C8C78 38 00 00 00 */ li r0, 0 -/* 801C8C7C 98 1E 03 09 */ stb r0, 0x309(r30) -/* 801C8C80 48 00 03 F8 */ b lbl_801C9078 -lbl_801C8C84: -/* 801C8C84 48 03 13 B9 */ bl dMw_A_TRIGGER__Fv -/* 801C8C88 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8C8C 41 82 03 64 */ beq lbl_801C8FF0 -/* 801C8C90 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C8C94 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C8C98 A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C8C9C 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C8CA0 40 82 03 50 */ bne lbl_801C8FF0 -/* 801C8CA4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C8CA8 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C8CAC 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C8CB0 28 00 00 01 */ cmplwi r0, 1 -/* 801C8CB4 41 82 03 3C */ beq lbl_801C8FF0 -/* 801C8CB8 88 1E 03 08 */ lbz r0, 0x308(r30) -/* 801C8CBC 28 00 00 FF */ cmplwi r0, 0xff -/* 801C8CC0 41 82 02 F8 */ beq lbl_801C8FB8 -/* 801C8CC4 80 7E 00 90 */ lwz r3, 0x90(r30) -/* 801C8CC8 3B E3 00 0C */ addi r31, r3, 0xc -/* 801C8CCC 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8CD0 80 9E 00 08 */ lwz r4, 8(r30) -/* 801C8CD4 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8CD8 48 00 E9 69 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C8CDC 88 1E 03 08 */ lbz r0, 0x308(r30) -/* 801C8CE0 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 801C8CE4 7C 7F 02 14 */ add r3, r31, r0 -/* 801C8CE8 A0 63 00 0C */ lhz r3, 0xc(r3) -/* 801C8CEC 48 06 F7 B1 */ bl setPortalMessageID__12dMsgObject_cFUs -/* 801C8CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C8CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C8CF8 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801C8CFC 7F E3 FB 78 */ mr r3, r31 -/* 801C8D00 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8D04 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8D08 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C8D0C 4B E6 BC B1 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8D10 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8D14 41 82 00 44 */ beq lbl_801C8D58 -/* 801C8D18 7F E3 FB 78 */ mr r3, r31 -/* 801C8D1C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8D20 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8D24 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C8D28 4B E6 BC 95 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8D2C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8D30 40 82 00 28 */ bne lbl_801C8D58 -/* 801C8D34 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8D38 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8D3C 38 80 08 5D */ li r4, 0x85d -/* 801C8D40 38 A0 00 00 */ li r5, 0 -/* 801C8D44 38 C0 00 00 */ li r6, 0 -/* 801C8D48 38 E0 00 FF */ li r7, 0xff -/* 801C8D4C 39 00 00 01 */ li r8, 1 -/* 801C8D50 48 07 58 09 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8D54 48 00 02 0C */ b lbl_801C8F60 -lbl_801C8D58: -/* 801C8D58 7F E3 FB 78 */ mr r3, r31 -/* 801C8D5C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8D60 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8D64 A0 84 06 24 */ lhz r4, 0x624(r4) -/* 801C8D68 4B E6 BC 55 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8D6C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8D70 41 82 00 58 */ beq lbl_801C8DC8 -/* 801C8D74 7F E3 FB 78 */ mr r3, r31 -/* 801C8D78 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8D7C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8D80 A0 84 06 22 */ lhz r4, 0x622(r4) -/* 801C8D84 4B E6 BC 39 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8D88 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8D8C 40 82 00 3C */ bne lbl_801C8DC8 -/* 801C8D90 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8D94 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8D98 38 80 07 DE */ li r4, 0x7de -/* 801C8D9C 38 A0 00 00 */ li r5, 0 -/* 801C8DA0 38 C0 00 00 */ li r6, 0 -/* 801C8DA4 38 E0 00 FF */ li r7, 0xff -/* 801C8DA8 39 00 00 01 */ li r8, 1 -/* 801C8DAC 48 07 57 AD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8DB0 7F E3 FB 78 */ mr r3, r31 -/* 801C8DB4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8DB8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8DBC A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C8DC0 4B E6 BB CD */ bl onEventBit__11dSv_event_cFUs -/* 801C8DC4 48 00 01 9C */ b lbl_801C8F60 -lbl_801C8DC8: -/* 801C8DC8 88 1E 03 08 */ lbz r0, 0x308(r30) -/* 801C8DCC 28 00 00 06 */ cmplwi r0, 6 -/* 801C8DD0 40 82 00 B4 */ bne lbl_801C8E84 -/* 801C8DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C8DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C8DDC 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 801C8DE0 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801C8DE4 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801C8DE8 38 84 00 1E */ addi r4, r4, 0x1e -/* 801C8DEC 48 19 FB A9 */ bl strcmp -/* 801C8DF0 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8DF4 40 82 00 2C */ bne lbl_801C8E20 -/* 801C8DF8 80 8D 8A 98 */ lwz r4, m_midnaActor__9daPy_py_c(r13) -/* 801C8DFC 38 60 00 00 */ li r3, 0 -/* 801C8E00 80 84 08 90 */ lwz r4, 0x890(r4) -/* 801C8E04 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 801C8E08 41 82 00 10 */ beq lbl_801C8E18 -/* 801C8E0C 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 -/* 801C8E10 41 82 00 08 */ beq lbl_801C8E18 -/* 801C8E14 38 60 00 01 */ li r3, 1 -lbl_801C8E18: -/* 801C8E18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C8E1C 40 82 00 20 */ bne lbl_801C8E3C -lbl_801C8E20: -/* 801C8E20 7F E3 FB 78 */ mr r3, r31 -/* 801C8E24 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8E28 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8E2C A0 84 00 FA */ lhz r4, 0xfa(r4) -/* 801C8E30 4B E6 BB 8D */ bl isEventBit__11dSv_event_cCFUs -/* 801C8E34 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8E38 41 82 00 28 */ beq lbl_801C8E60 -lbl_801C8E3C: -/* 801C8E3C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8E40 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8E44 38 80 05 1E */ li r4, 0x51e -/* 801C8E48 38 A0 00 02 */ li r5, 2 -/* 801C8E4C 38 C0 00 00 */ li r6, 0 -/* 801C8E50 38 E0 00 FF */ li r7, 0xff -/* 801C8E54 39 00 00 01 */ li r8, 1 -/* 801C8E58 48 07 57 01 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8E5C 48 00 01 04 */ b lbl_801C8F60 -lbl_801C8E60: -/* 801C8E60 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8E64 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8E68 38 80 05 3A */ li r4, 0x53a -/* 801C8E6C 38 A0 00 00 */ li r5, 0 -/* 801C8E70 38 C0 00 00 */ li r6, 0 -/* 801C8E74 38 E0 00 FF */ li r7, 0xff -/* 801C8E78 39 00 00 01 */ li r8, 1 -/* 801C8E7C 48 07 56 DD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8E80 48 00 00 E0 */ b lbl_801C8F60 -lbl_801C8E84: -/* 801C8E84 28 00 00 03 */ cmplwi r0, 3 -/* 801C8E88 40 82 00 B8 */ bne lbl_801C8F40 -/* 801C8E8C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C8E90 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C8E94 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 801C8E98 28 00 00 03 */ cmplwi r0, 3 -/* 801C8E9C 40 82 00 40 */ bne lbl_801C8EDC -/* 801C8EA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C8EA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C8EA8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 801C8EAC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801C8EB0 7D 89 03 A6 */ mtctr r12 -/* 801C8EB4 4E 80 04 21 */ bctrl -/* 801C8EB8 88 03 00 09 */ lbz r0, 9(r3) -/* 801C8EBC 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 801C8EC0 2C 00 00 02 */ cmpwi r0, 2 -/* 801C8EC4 40 82 00 18 */ bne lbl_801C8EDC -/* 801C8EC8 38 60 00 0F */ li r3, 0xf -/* 801C8ECC 38 80 FF FF */ li r4, -1 -/* 801C8ED0 4B E6 4C 95 */ bl dComIfGs_isOneZoneSwitch__Fii -/* 801C8ED4 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8ED8 40 82 00 20 */ bne lbl_801C8EF8 -lbl_801C8EDC: -/* 801C8EDC 7F E3 FB 78 */ mr r3, r31 -/* 801C8EE0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8EE4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8EE8 A0 84 00 66 */ lhz r4, 0x66(r4) -/* 801C8EEC 4B E6 BA D1 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8EF0 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8EF4 41 82 00 28 */ beq lbl_801C8F1C -lbl_801C8EF8: -/* 801C8EF8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8EFC 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8F00 38 80 05 1E */ li r4, 0x51e -/* 801C8F04 38 A0 00 02 */ li r5, 2 -/* 801C8F08 38 C0 00 00 */ li r6, 0 -/* 801C8F0C 38 E0 00 FF */ li r7, 0xff -/* 801C8F10 39 00 00 01 */ li r8, 1 -/* 801C8F14 48 07 56 45 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8F18 48 00 00 48 */ b lbl_801C8F60 -lbl_801C8F1C: -/* 801C8F1C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8F20 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8F24 38 80 05 3B */ li r4, 0x53b -/* 801C8F28 38 A0 00 00 */ li r5, 0 -/* 801C8F2C 38 C0 00 00 */ li r6, 0 -/* 801C8F30 38 E0 00 FF */ li r7, 0xff -/* 801C8F34 39 00 00 01 */ li r8, 1 -/* 801C8F38 48 07 56 21 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8F3C 48 00 00 24 */ b lbl_801C8F60 -lbl_801C8F40: -/* 801C8F40 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8F44 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8F48 38 80 05 1E */ li r4, 0x51e -/* 801C8F4C 38 A0 00 02 */ li r5, 2 -/* 801C8F50 38 C0 00 00 */ li r6, 0 -/* 801C8F54 38 E0 00 FF */ li r7, 0xff -/* 801C8F58 39 00 00 01 */ li r8, 1 -/* 801C8F5C 48 07 55 FD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -lbl_801C8F60: -/* 801C8F60 7F C3 F3 78 */ mr r3, r30 -/* 801C8F64 38 80 00 09 */ li r4, 9 -/* 801C8F68 48 00 27 69 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C8F6C 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C8F70 28 00 00 01 */ cmplwi r0, 1 -/* 801C8F74 40 82 00 0C */ bne lbl_801C8F80 -/* 801C8F78 38 00 00 00 */ li r0, 0 -/* 801C8F7C 98 1E 03 09 */ stb r0, 0x309(r30) -lbl_801C8F80: -/* 801C8F80 38 00 00 6D */ li r0, 0x6d -/* 801C8F84 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C8F88 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8F8C 38 81 00 10 */ addi r4, r1, 0x10 -/* 801C8F90 38 A0 00 00 */ li r5, 0 -/* 801C8F94 38 C0 00 00 */ li r6, 0 -/* 801C8F98 38 E0 00 00 */ li r7, 0 -/* 801C8F9C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8FA0 FC 40 08 90 */ fmr f2, f1 -/* 801C8FA4 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C8FA8 FC 80 18 90 */ fmr f4, f3 -/* 801C8FAC 39 00 00 00 */ li r8, 0 -/* 801C8FB0 48 0E 29 D5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C8FB4 48 00 00 C4 */ b lbl_801C9078 -lbl_801C8FB8: -/* 801C8FB8 38 00 00 4A */ li r0, 0x4a -/* 801C8FBC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C8FC0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8FC4 38 81 00 0C */ addi r4, r1, 0xc -/* 801C8FC8 38 A0 00 00 */ li r5, 0 -/* 801C8FCC 38 C0 00 00 */ li r6, 0 -/* 801C8FD0 38 E0 00 00 */ li r7, 0 -/* 801C8FD4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8FD8 FC 40 08 90 */ fmr f2, f1 -/* 801C8FDC C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C8FE0 FC 80 18 90 */ fmr f4, f3 -/* 801C8FE4 39 00 00 00 */ li r8, 0 -/* 801C8FE8 48 0E 29 9D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C8FEC 48 00 00 8C */ b lbl_801C9078 -lbl_801C8FF0: -/* 801C8FF0 48 03 10 75 */ bl dMw_Z_TRIGGER__Fv -/* 801C8FF4 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8FF8 41 82 00 60 */ beq lbl_801C9058 -/* 801C8FFC 38 00 00 00 */ li r0, 0 -/* 801C9000 98 1E 03 07 */ stb r0, 0x307(r30) -/* 801C9004 7F C3 F3 78 */ mr r3, r30 -/* 801C9008 38 80 00 06 */ li r4, 6 -/* 801C900C 48 00 26 C5 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9010 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C9014 38 80 05 29 */ li r4, 0x529 -/* 801C9018 38 A0 00 FF */ li r5, 0xff -/* 801C901C 48 00 E0 CD */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C9020 38 00 00 49 */ li r0, 0x49 -/* 801C9024 90 01 00 08 */ stw r0, 8(r1) -/* 801C9028 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C902C 38 81 00 08 */ addi r4, r1, 8 -/* 801C9030 38 A0 00 00 */ li r5, 0 -/* 801C9034 38 C0 00 00 */ li r6, 0 -/* 801C9038 38 E0 00 00 */ li r7, 0 -/* 801C903C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C9040 FC 40 08 90 */ fmr f2, f1 -/* 801C9044 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C9048 FC 80 18 90 */ fmr f4, f3 -/* 801C904C 39 00 00 00 */ li r8, 0 -/* 801C9050 48 0E 29 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C9054 48 00 00 24 */ b lbl_801C9078 -lbl_801C9058: -/* 801C9058 7F C3 F3 78 */ mr r3, r30 -/* 801C905C 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C9060 48 00 38 7D */ bl portalWarpMapMove__12dMenu_Fmap_cFP9STControl -/* 801C9064 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C9068 28 00 00 01 */ cmplwi r0, 1 -/* 801C906C 40 82 00 0C */ bne lbl_801C9078 -/* 801C9070 38 00 00 00 */ li r0, 0 -/* 801C9074 98 1E 03 09 */ stb r0, 0x309(r30) -lbl_801C9078: -/* 801C9078 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C907C 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801C9080 7F C3 F3 78 */ mr r3, r30 -/* 801C9084 38 A0 00 00 */ li r5, 0 -/* 801C9088 48 00 26 59 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C908C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C9090 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801C9094 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C9098 7C 08 03 A6 */ mtlr r0 -/* 801C909C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C90A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/portal_warp_select_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/portal_warp_select_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0eec32a173..0000000000 --- a/asm/d/menu/d_menu_fmap/portal_warp_select_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_801C90A8: -/* 801C90A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C90AC 7C 08 02 A6 */ mflr r0 -/* 801C90B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C90B4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C90B8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C90BC 7C 7F 1B 78 */ mr r31, r3 -/* 801C90C0 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801C90C4 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C90C8 48 07 47 11 */ bl move__17dMsgScrnExplain_cFv -/* 801C90CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C90D0 80 83 00 6C */ lwz r4, 0x6c(r3) -/* 801C90D4 88 04 00 60 */ lbz r0, 0x60(r4) -/* 801C90D8 28 00 00 00 */ cmplwi r0, 0 -/* 801C90DC 40 82 00 D0 */ bne lbl_801C91AC -/* 801C90E0 48 00 E5 E1 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv -/* 801C90E4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C90E8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C90EC 88 03 00 C0 */ lbz r0, 0xc0(r3) -/* 801C90F0 28 00 00 03 */ cmplwi r0, 3 -/* 801C90F4 40 82 00 90 */ bne lbl_801C9184 -/* 801C90F8 80 9F 00 90 */ lwz r4, 0x90(r31) -/* 801C90FC 3B C4 00 0C */ addi r30, r4, 0xc -/* 801C9100 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 801C9104 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C9108 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 801C910C 7C 84 02 14 */ add r4, r4, r0 -/* 801C9110 C0 24 10 24 */ lfs f1, 0x1024(r4) -/* 801C9114 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801C9118 1C A0 00 1C */ mulli r5, r0, 0x1c -/* 801C911C 7D 3E 2A 14 */ add r9, r30, r5 -/* 801C9120 C0 09 00 18 */ lfs f0, 0x18(r9) -/* 801C9124 EC 40 08 2A */ fadds f2, f0, f1 -/* 801C9128 C0 29 00 14 */ lfs f1, 0x14(r9) -/* 801C912C C0 64 10 04 */ lfs f3, 0x1004(r4) -/* 801C9130 C0 09 00 10 */ lfs f0, 0x10(r9) -/* 801C9134 EC 00 18 2A */ fadds f0, f0, f3 -/* 801C9138 D0 01 00 08 */ stfs f0, 8(r1) -/* 801C913C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 801C9140 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 801C9144 38 85 00 02 */ addi r4, r5, 2 -/* 801C9148 7C 9E 22 14 */ add r4, r30, r4 -/* 801C914C 38 A1 00 08 */ addi r5, r1, 8 -/* 801C9150 38 C0 00 00 */ li r6, 0 -/* 801C9154 88 E9 00 0A */ lbz r7, 0xa(r9) -/* 801C9158 39 00 00 00 */ li r8, 0 -/* 801C915C 89 29 00 0B */ lbz r9, 0xb(r9) -/* 801C9160 48 05 3A AD */ bl setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc -/* 801C9164 88 1F 03 08 */ lbz r0, 0x308(r31) -/* 801C9168 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 801C916C 7C 7E 00 AE */ lbzx r3, r30, r0 -/* 801C9170 4B E6 69 3D */ bl dComIfGp_SelectWarpPt_set__FUc -/* 801C9174 7F E3 FB 78 */ mr r3, r31 -/* 801C9178 38 80 00 08 */ li r4, 8 -/* 801C917C 48 00 25 55 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9180 48 00 00 2C */ b lbl_801C91AC -lbl_801C9184: -/* 801C9184 88 1F 03 01 */ lbz r0, 0x301(r31) -/* 801C9188 28 00 00 10 */ cmplwi r0, 0x10 -/* 801C918C 40 82 00 14 */ bne lbl_801C91A0 -/* 801C9190 7F E3 FB 78 */ mr r3, r31 -/* 801C9194 38 80 00 10 */ li r4, 0x10 -/* 801C9198 48 00 25 39 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C919C 48 00 00 10 */ b lbl_801C91AC -lbl_801C91A0: -/* 801C91A0 7F E3 FB 78 */ mr r3, r31 -/* 801C91A4 38 80 00 08 */ li r4, 8 -/* 801C91A8 48 00 25 29 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C91AC: -/* 801C91AC 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C91B0 88 83 12 29 */ lbz r4, 0x1229(r3) -/* 801C91B4 7F E3 FB 78 */ mr r3, r31 -/* 801C91B8 38 A0 00 00 */ li r5, 0 -/* 801C91BC 48 00 25 25 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C91C0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C91C4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801C91C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C91CC 7C 08 03 A6 */ mtlr r0 -/* 801C91D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C91D4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/readAreaData__12dMenu_Fmap_cFUcb.s b/asm/d/menu/d_menu_fmap/readAreaData__12dMenu_Fmap_cFUcb.s deleted file mode 100644 index aa2865d915..0000000000 --- a/asm/d/menu/d_menu_fmap/readAreaData__12dMenu_Fmap_cFUcb.s +++ /dev/null @@ -1,408 +0,0 @@ -lbl_801CB938: -/* 801CB938 94 21 FE D0 */ stwu r1, -0x130(r1) -/* 801CB93C 7C 08 02 A6 */ mflr r0 -/* 801CB940 90 01 01 34 */ stw r0, 0x134(r1) -/* 801CB944 DB E1 01 20 */ stfd f31, 0x120(r1) -/* 801CB948 F3 E1 01 28 */ psq_st f31, 296(r1), 0, 0 /* qr0 */ -/* 801CB94C DB C1 01 10 */ stfd f30, 0x110(r1) -/* 801CB950 F3 C1 01 18 */ psq_st f30, 280(r1), 0, 0 /* qr0 */ -/* 801CB954 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CB958 48 19 68 49 */ bl _savegpr_14 -/* 801CB95C 7C 6F 1B 78 */ mr r15, r3 -/* 801CB960 7C 90 23 78 */ mr r16, r4 -/* 801CB964 7C B1 2B 78 */ mr r17, r5 -/* 801CB968 88 03 03 05 */ lbz r0, 0x305(r3) -/* 801CB96C 28 00 00 00 */ cmplwi r0, 0 -/* 801CB970 41 82 00 0C */ beq lbl_801CB97C -/* 801CB974 38 60 00 00 */ li r3, 0 -/* 801CB978 48 00 05 64 */ b lbl_801CBEDC -lbl_801CB97C: -/* 801CB97C 80 8F 00 8C */ lwz r4, 0x8c(r15) -/* 801CB980 80 64 00 04 */ lwz r3, 4(r4) -/* 801CB984 3B 23 00 04 */ addi r25, r3, 4 -/* 801CB988 7F 24 CA 14 */ add r25, r4, r25 -/* 801CB98C 3B 00 00 00 */ li r24, 0 -/* 801CB990 38 00 00 00 */ li r0, 0 -/* 801CB994 90 01 00 BC */ stw r0, 0xbc(r1) -/* 801CB998 3A E0 00 00 */ li r23, 0 -/* 801CB99C 38 60 00 00 */ li r3, 0 -/* 801CB9A0 98 61 00 17 */ stb r3, 0x17(r1) -/* 801CB9A4 56 20 06 3F */ clrlwi. r0, r17, 0x18 -/* 801CB9A8 41 82 00 08 */ beq lbl_801CB9B0 -/* 801CB9AC 98 6F 03 06 */ stb r3, 0x306(r15) -lbl_801CB9B0: -/* 801CB9B0 3A C0 00 00 */ li r22, 0 -/* 801CB9B4 3B E0 00 00 */ li r31, 0 -/* 801CB9B8 3A A0 00 00 */ li r21, 0 -/* 801CB9BC 88 8F 03 03 */ lbz r4, 0x303(r15) -/* 801CB9C0 38 00 00 00 */ li r0, 0 -/* 801CB9C4 38 61 00 58 */ addi r3, r1, 0x58 -/* 801CB9C8 7C 89 03 A6 */ mtctr r4 -/* 801CB9CC 2C 04 00 00 */ cmpwi r4, 0 -/* 801CB9D0 40 81 00 10 */ ble lbl_801CB9E0 -lbl_801CB9D4: -/* 801CB9D4 98 03 00 00 */ stb r0, 0(r3) -/* 801CB9D8 38 63 00 01 */ addi r3, r3, 1 -/* 801CB9DC 42 00 FF F8 */ bdnz lbl_801CB9D4 -lbl_801CB9E0: -/* 801CB9E0 56 20 06 3F */ clrlwi. r0, r17, 0x18 -/* 801CB9E4 41 82 00 14 */ beq lbl_801CB9F8 -/* 801CB9E8 38 00 00 FF */ li r0, 0xff -/* 801CB9EC 98 0F 03 0A */ stb r0, 0x30a(r15) -/* 801CB9F0 38 00 FF FF */ li r0, -1 -/* 801CB9F4 90 0F 02 0C */ stw r0, 0x20c(r15) -lbl_801CB9F8: -/* 801CB9F8 38 00 00 00 */ li r0, 0 -/* 801CB9FC 90 0F 02 00 */ stw r0, 0x200(r15) -/* 801CBA00 56 00 06 3E */ clrlwi r0, r16, 0x18 -/* 801CBA04 90 01 00 C0 */ stw r0, 0xc0(r1) -/* 801CBA08 56 1A 15 BA */ rlwinm r26, r16, 2, 0x16, 0x1d -/* 801CBA0C 7F 6F D2 14 */ add r27, r15, r26 -/* 801CBA10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CBA14 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CBA18 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 801CBA1C 80 61 00 C0 */ lwz r3, 0xc0(r1) -/* 801CBA20 39 C3 FF FF */ addi r14, r3, -1 -/* 801CBA24 3B C1 00 58 */ addi r30, r1, 0x58 -/* 801CBA28 48 00 03 7C */ b lbl_801CBDA4 -lbl_801CBA2C: -/* 801CBA2C 88 1E 00 00 */ lbz r0, 0(r30) -/* 801CBA30 28 00 00 00 */ cmplwi r0, 0 -/* 801CBA34 40 82 03 64 */ bne lbl_801CBD98 -/* 801CBA38 38 61 00 08 */ addi r3, r1, 8 -/* 801CBA3C 38 8F 02 58 */ addi r4, r15, 0x258 -/* 801CBA40 48 19 D0 ED */ bl strcpy -/* 801CBA44 7D E3 7B 78 */ mr r3, r15 -/* 801CBA48 48 00 10 7D */ bl resetRoomDataBit__12dMenu_Fmap_cFv -/* 801CBA4C 56 20 06 3F */ clrlwi. r0, r17, 0x18 -/* 801CBA50 41 82 00 14 */ beq lbl_801CBA64 -/* 801CBA54 38 6F 02 58 */ addi r3, r15, 0x258 -/* 801CBA58 7C 99 FA 14 */ add r4, r25, r31 -/* 801CBA5C 48 19 D0 D1 */ bl strcpy -/* 801CBA60 48 00 00 10 */ b lbl_801CBA70 -lbl_801CBA64: -/* 801CBA64 38 6F 02 58 */ addi r3, r15, 0x258 -/* 801CBA68 38 81 00 08 */ addi r4, r1, 8 -/* 801CBA6C 48 19 D0 C1 */ bl strcpy -lbl_801CBA70: -/* 801CBA70 38 61 00 08 */ addi r3, r1, 8 -/* 801CBA74 7C 99 FA 14 */ add r4, r25, r31 -/* 801CBA78 48 19 D0 B5 */ bl strcpy -/* 801CBA7C 38 A0 00 00 */ li r5, 0 -/* 801CBA80 38 80 00 00 */ li r4, 0 -/* 801CBA84 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CBA88 38 00 00 40 */ li r0, 0x40 -/* 801CBA8C 7C 09 03 A6 */ mtctr r0 -lbl_801CBA90: -/* 801CBA90 98 83 00 00 */ stb r4, 0(r3) -/* 801CBA94 38 A5 00 01 */ addi r5, r5, 1 -/* 801CBA98 38 63 00 01 */ addi r3, r3, 1 -/* 801CBA9C 42 00 FF F4 */ bdnz lbl_801CBA90 -/* 801CBAA0 3A 80 00 00 */ li r20, 0 -/* 801CBAA4 7E D3 B3 78 */ mr r19, r22 -/* 801CBAA8 1F B6 00 14 */ mulli r29, r22, 0x14 -/* 801CBAAC 48 00 00 C0 */ b lbl_801CBB6C -lbl_801CBAB0: -/* 801CBAB0 7E 59 EA 14 */ add r18, r25, r29 -/* 801CBAB4 7E 43 93 78 */ mr r3, r18 -/* 801CBAB8 38 81 00 08 */ addi r4, r1, 8 -/* 801CBABC 48 19 CE D9 */ bl strcmp -/* 801CBAC0 2C 03 00 00 */ cmpwi r3, 0 -/* 801CBAC4 40 82 00 A0 */ bne lbl_801CBB64 -/* 801CBAC8 38 80 00 01 */ li r4, 1 -/* 801CBACC 38 61 00 58 */ addi r3, r1, 0x58 -/* 801CBAD0 7C 83 99 AE */ stbx r4, r3, r19 -/* 801CBAD4 56 03 06 3E */ clrlwi r3, r16, 0x18 -/* 801CBAD8 88 12 00 09 */ lbz r0, 9(r18) -/* 801CBADC 7C 03 00 40 */ cmplw r3, r0 -/* 801CBAE0 40 82 00 70 */ bne lbl_801CBB50 -/* 801CBAE4 88 92 00 08 */ lbz r4, 8(r18) -/* 801CBAE8 28 04 00 FF */ cmplwi r4, 0xff -/* 801CBAEC 41 82 00 20 */ beq lbl_801CBB0C -/* 801CBAF0 7D E3 7B 78 */ mr r3, r15 -/* 801CBAF4 48 00 0F 7D */ bl onRoomDataBit__12dMenu_Fmap_cFi -/* 801CBAF8 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 801CBAFC 40 82 00 68 */ bne lbl_801CBB64 -/* 801CBB00 7E 75 9B 78 */ mr r21, r19 -/* 801CBB04 3A 80 00 01 */ li r20, 1 -/* 801CBB08 48 00 00 5C */ b lbl_801CBB64 -lbl_801CBB0C: -/* 801CBB0C 3A 40 00 00 */ li r18, 0 -/* 801CBB10 3B 81 00 18 */ addi r28, r1, 0x18 -lbl_801CBB14: -/* 801CBB14 88 1C 00 00 */ lbz r0, 0(r28) -/* 801CBB18 28 00 00 00 */ cmplwi r0, 0 -/* 801CBB1C 40 82 00 10 */ bne lbl_801CBB2C -/* 801CBB20 7D E3 7B 78 */ mr r3, r15 -/* 801CBB24 7E 44 93 78 */ mr r4, r18 -/* 801CBB28 48 00 0F 49 */ bl onRoomDataBit__12dMenu_Fmap_cFi -lbl_801CBB2C: -/* 801CBB2C 3A 52 00 01 */ addi r18, r18, 1 -/* 801CBB30 2C 12 00 40 */ cmpwi r18, 0x40 -/* 801CBB34 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CBB38 41 80 FF DC */ blt lbl_801CBB14 -/* 801CBB3C 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 801CBB40 40 82 00 24 */ bne lbl_801CBB64 -/* 801CBB44 7E 75 9B 78 */ mr r21, r19 -/* 801CBB48 3A 80 00 01 */ li r20, 1 -/* 801CBB4C 48 00 00 18 */ b lbl_801CBB64 -lbl_801CBB50: -/* 801CBB50 88 12 00 08 */ lbz r0, 8(r18) -/* 801CBB54 28 00 00 FF */ cmplwi r0, 0xff -/* 801CBB58 41 82 00 0C */ beq lbl_801CBB64 -/* 801CBB5C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CBB60 7C 83 01 AE */ stbx r4, r3, r0 -lbl_801CBB64: -/* 801CBB64 3A 73 00 01 */ addi r19, r19, 1 -/* 801CBB68 3B BD 00 14 */ addi r29, r29, 0x14 -lbl_801CBB6C: -/* 801CBB6C 88 0F 03 03 */ lbz r0, 0x303(r15) -/* 801CBB70 7C 13 00 00 */ cmpw r19, r0 -/* 801CBB74 41 80 FF 3C */ blt lbl_801CBAB0 -/* 801CBB78 56 80 06 3F */ clrlwi. r0, r20, 0x18 -/* 801CBB7C 41 82 02 1C */ beq lbl_801CBD98 -/* 801CBB80 38 60 00 30 */ li r3, 0x30 -/* 801CBB84 48 10 30 C9 */ bl __nw__FUl -/* 801CBB88 7C 72 1B 79 */ or. r18, r3, r3 -/* 801CBB8C 41 82 00 4C */ beq lbl_801CBBD8 -/* 801CBB90 38 80 00 00 */ li r4, 0 -/* 801CBB94 90 92 00 08 */ stw r4, 8(r18) -/* 801CBB98 90 92 00 0C */ stw r4, 0xc(r18) -/* 801CBB9C 90 92 00 10 */ stw r4, 0x10(r18) -/* 801CBBA0 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CBBA4 D0 12 00 1C */ stfs f0, 0x1c(r18) -/* 801CBBA8 D0 12 00 20 */ stfs f0, 0x20(r18) -/* 801CBBAC D0 12 00 24 */ stfs f0, 0x24(r18) -/* 801CBBB0 D0 12 00 28 */ stfs f0, 0x28(r18) -/* 801CBBB4 D0 12 00 14 */ stfs f0, 0x14(r18) -/* 801CBBB8 D0 12 00 18 */ stfs f0, 0x18(r18) -/* 801CBBBC 7C 85 23 78 */ mr r5, r4 -/* 801CBBC0 38 00 00 08 */ li r0, 8 -/* 801CBBC4 7C 09 03 A6 */ mtctr r0 -lbl_801CBBC8: -/* 801CBBC8 98 83 00 00 */ stb r4, 0(r3) -/* 801CBBCC 38 A5 00 01 */ addi r5, r5, 1 -/* 801CBBD0 38 63 00 01 */ addi r3, r3, 1 -/* 801CBBD4 42 00 FF F4 */ bdnz lbl_801CBBC8 -lbl_801CBBD8: -/* 801CBBD8 80 1B 00 40 */ lwz r0, 0x40(r27) -/* 801CBBDC 28 00 00 00 */ cmplwi r0, 0 -/* 801CBBE0 40 82 00 0C */ bne lbl_801CBBEC -/* 801CBBE4 92 5B 00 40 */ stw r18, 0x40(r27) -/* 801CBBE8 48 00 00 0C */ b lbl_801CBBF4 -lbl_801CBBEC: -/* 801CBBEC 80 61 00 BC */ lwz r3, 0xbc(r1) -/* 801CBBF0 92 43 00 10 */ stw r18, 0x10(r3) -lbl_801CBBF4: -/* 801CBBF4 92 41 00 BC */ stw r18, 0xbc(r1) -/* 801CBBF8 38 A0 00 00 */ li r5, 0 -/* 801CBBFC 90 B2 00 10 */ stw r5, 0x10(r18) -/* 801CBC00 57 14 06 3E */ clrlwi r20, r24, 0x18 -/* 801CBC04 92 92 00 2C */ stw r20, 0x2c(r18) -/* 801CBC08 1C 15 00 14 */ mulli r0, r21, 0x14 -/* 801CBC0C 7E 79 02 14 */ add r19, r25, r0 -/* 801CBC10 7E 64 9B 78 */ mr r4, r19 -/* 801CBC14 7E 43 93 78 */ mr r3, r18 -/* 801CBC18 38 00 00 08 */ li r0, 8 -/* 801CBC1C 7C 09 03 A6 */ mtctr r0 -lbl_801CBC20: -/* 801CBC20 88 04 00 00 */ lbz r0, 0(r4) -/* 801CBC24 98 03 00 00 */ stb r0, 0(r3) -/* 801CBC28 38 A5 00 01 */ addi r5, r5, 1 -/* 801CBC2C 38 63 00 01 */ addi r3, r3, 1 -/* 801CBC30 38 84 00 01 */ addi r4, r4, 1 -/* 801CBC34 42 00 FF EC */ bdnz lbl_801CBC20 -/* 801CBC38 38 A0 00 00 */ li r5, 0 -/* 801CBC3C 7E 64 9B 78 */ mr r4, r19 -/* 801CBC40 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CBC44 38 00 00 08 */ li r0, 8 -/* 801CBC48 7C 09 03 A6 */ mtctr r0 -lbl_801CBC4C: -/* 801CBC4C 88 04 00 00 */ lbz r0, 0(r4) -/* 801CBC50 98 03 00 00 */ stb r0, 0(r3) -/* 801CBC54 38 A5 00 01 */ addi r5, r5, 1 -/* 801CBC58 38 63 00 01 */ addi r3, r3, 1 -/* 801CBC5C 38 84 00 01 */ addi r4, r4, 1 -/* 801CBC60 42 00 FF EC */ bdnz lbl_801CBC4C -/* 801CBC64 4B E6 31 FD */ bl dComIfGp_getNowLevel__Fv -/* 801CBC68 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CBC6C 56 00 06 3E */ clrlwi r0, r16, 0x18 -/* 801CBC70 7C 00 18 40 */ cmplw r0, r3 -/* 801CBC74 40 82 00 68 */ bne lbl_801CBCDC -/* 801CBC78 80 61 00 C4 */ lwz r3, 0xc4(r1) -/* 801CBC7C 88 03 00 7C */ lbz r0, 0x7c(r3) -/* 801CBC80 28 00 00 00 */ cmplwi r0, 0 -/* 801CBC84 41 82 00 34 */ beq lbl_801CBCB8 -/* 801CBC88 80 6F 00 8C */ lwz r3, 0x8c(r15) -/* 801CBC8C 4B FF A9 A1 */ bl dMenuFmap_getStartStageName__FPv -/* 801CBC90 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBC94 48 19 CD 01 */ bl strcmp -/* 801CBC98 2C 03 00 00 */ cmpwi r3, 0 -/* 801CBC9C 40 82 00 40 */ bne lbl_801CBCDC -/* 801CBCA0 80 6F 00 14 */ lwz r3, 0x14(r15) -/* 801CBCA4 7F 04 C3 78 */ mr r4, r24 -/* 801CBCA8 48 00 60 CD */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -/* 801CBCAC 9B 0F 03 0A */ stb r24, 0x30a(r15) -/* 801CBCB0 92 8F 02 0C */ stw r20, 0x20c(r15) -/* 801CBCB4 48 00 00 28 */ b lbl_801CBCDC -lbl_801CBCB8: -/* 801CBCB8 38 63 00 72 */ addi r3, r3, 0x72 -/* 801CBCBC 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBCC0 48 19 CC D5 */ bl strcmp -/* 801CBCC4 2C 03 00 00 */ cmpwi r3, 0 -/* 801CBCC8 40 82 00 14 */ bne lbl_801CBCDC -/* 801CBCCC 80 6F 00 14 */ lwz r3, 0x14(r15) -/* 801CBCD0 7F 04 C3 78 */ mr r4, r24 -/* 801CBCD4 48 00 60 A1 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -/* 801CBCD8 92 8F 02 0C */ stw r20, 0x20c(r15) -lbl_801CBCDC: -/* 801CBCDC C0 13 00 0C */ lfs f0, 0xc(r19) -/* 801CBCE0 D0 12 00 14 */ stfs f0, 0x14(r18) -/* 801CBCE4 C0 13 00 10 */ lfs f0, 0x10(r19) -/* 801CBCE8 D0 12 00 18 */ stfs f0, 0x18(r18) -/* 801CBCEC 56 20 06 3F */ clrlwi. r0, r17, 0x18 -/* 801CBCF0 41 82 00 5C */ beq lbl_801CBD4C -/* 801CBCF4 C0 33 00 10 */ lfs f1, 0x10(r19) -/* 801CBCF8 88 0F 03 06 */ lbz r0, 0x306(r15) -/* 801CBCFC 80 6F 00 14 */ lwz r3, 0x14(r15) -/* 801CBD00 C0 13 00 0C */ lfs f0, 0xc(r19) -/* 801CBD04 54 00 10 3A */ slwi r0, r0, 2 -/* 801CBD08 7C 63 02 14 */ add r3, r3, r0 -/* 801CBD0C D0 03 10 44 */ stfs f0, 0x1044(r3) -/* 801CBD10 D0 23 10 94 */ stfs f1, 0x1094(r3) -/* 801CBD14 A0 93 00 0A */ lhz r4, 0xa(r19) -/* 801CBD18 88 0F 03 06 */ lbz r0, 0x306(r15) -/* 801CBD1C 54 03 08 3C */ slwi r3, r0, 1 -/* 801CBD20 38 03 02 28 */ addi r0, r3, 0x228 -/* 801CBD24 7C 8F 03 2E */ sthx r4, r15, r0 -/* 801CBD28 88 0F 03 06 */ lbz r0, 0x306(r15) -/* 801CBD2C 54 03 18 38 */ slwi r3, r0, 3 -/* 801CBD30 38 63 02 60 */ addi r3, r3, 0x260 -/* 801CBD34 7C 6F 1A 14 */ add r3, r15, r3 -/* 801CBD38 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBD3C 48 19 CD F1 */ bl strcpy -/* 801CBD40 88 6F 03 06 */ lbz r3, 0x306(r15) -/* 801CBD44 38 03 00 01 */ addi r0, r3, 1 -/* 801CBD48 98 0F 03 06 */ stb r0, 0x306(r15) -lbl_801CBD4C: -/* 801CBD4C 38 60 00 08 */ li r3, 8 -/* 801CBD50 48 10 2E FD */ bl __nw__FUl -/* 801CBD54 7C 66 1B 78 */ mr r6, r3 -/* 801CBD58 80 1B 00 68 */ lwz r0, 0x68(r27) -/* 801CBD5C 28 00 00 00 */ cmplwi r0, 0 -/* 801CBD60 40 82 00 0C */ bne lbl_801CBD6C -/* 801CBD64 90 DB 00 68 */ stw r6, 0x68(r27) -/* 801CBD68 48 00 00 08 */ b lbl_801CBD70 -lbl_801CBD6C: -/* 801CBD6C 90 D7 00 04 */ stw r6, 4(r23) -lbl_801CBD70: -/* 801CBD70 7C D7 33 78 */ mr r23, r6 -/* 801CBD74 38 00 00 00 */ li r0, 0 -/* 801CBD78 90 06 00 04 */ stw r0, 4(r6) -/* 801CBD7C 7D E3 7B 78 */ mr r3, r15 -/* 801CBD80 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBD84 7E 45 93 78 */ mr r5, r18 -/* 801CBD88 7D C7 73 78 */ mr r7, r14 -/* 801CBD8C 89 13 00 08 */ lbz r8, 8(r19) -/* 801CBD90 48 00 01 75 */ bl readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc -/* 801CBD94 3B 18 00 01 */ addi r24, r24, 1 -lbl_801CBD98: -/* 801CBD98 3A D6 00 01 */ addi r22, r22, 1 -/* 801CBD9C 3B FF 00 14 */ addi r31, r31, 0x14 -/* 801CBDA0 3B DE 00 01 */ addi r30, r30, 1 -lbl_801CBDA4: -/* 801CBDA4 88 0F 03 03 */ lbz r0, 0x303(r15) -/* 801CBDA8 7C 16 00 00 */ cmpw r22, r0 -/* 801CBDAC 41 80 FC 80 */ blt lbl_801CBA2C -/* 801CBDB0 7E 2F D2 14 */ add r17, r15, r26 -/* 801CBDB4 80 11 00 40 */ lwz r0, 0x40(r17) -/* 801CBDB8 28 00 00 00 */ cmplwi r0, 0 -/* 801CBDBC 40 82 00 0C */ bne lbl_801CBDC8 -/* 801CBDC0 38 60 00 00 */ li r3, 0 -/* 801CBDC4 48 00 01 18 */ b lbl_801CBEDC -lbl_801CBDC8: -/* 801CBDC8 80 11 00 20 */ lwz r0, 0x20(r17) -/* 801CBDCC 28 00 00 00 */ cmplwi r0, 0 -/* 801CBDD0 40 82 00 5C */ bne lbl_801CBE2C -/* 801CBDD4 38 60 00 24 */ li r3, 0x24 -/* 801CBDD8 48 10 2E 75 */ bl __nw__FUl -/* 801CBDDC 7C 70 1B 79 */ or. r16, r3, r3 -/* 801CBDE0 41 82 00 48 */ beq lbl_801CBE28 -/* 801CBDE4 C0 31 01 C8 */ lfs f1, 0x1c8(r17) -/* 801CBDE8 C0 11 01 A8 */ lfs f0, 0x1a8(r17) -/* 801CBDEC 80 11 00 40 */ lwz r0, 0x40(r17) -/* 801CBDF0 90 10 00 00 */ stw r0, 0(r16) -/* 801CBDF4 38 00 00 00 */ li r0, 0 -/* 801CBDF8 90 10 00 04 */ stw r0, 4(r16) -/* 801CBDFC D0 10 00 08 */ stfs f0, 8(r16) -/* 801CBE00 D0 30 00 0C */ stfs f1, 0xc(r16) -/* 801CBE04 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801CBE08 D0 10 00 10 */ stfs f0, 0x10(r16) -/* 801CBE0C D0 10 00 14 */ stfs f0, 0x14(r16) -/* 801CBE10 D0 10 00 18 */ stfs f0, 0x18(r16) -/* 801CBE14 D0 10 00 1C */ stfs f0, 0x1c(r16) -/* 801CBE18 80 01 00 C0 */ lwz r0, 0xc0(r1) -/* 801CBE1C 90 10 00 20 */ stw r0, 0x20(r16) -/* 801CBE20 38 80 00 00 */ li r4, 0 -/* 801CBE24 4B E7 20 BD */ bl buildFmapRegionData__24dMenu_Fmap_region_data_cFi -lbl_801CBE28: -/* 801CBE28 92 11 00 20 */ stw r16, 0x20(r17) -lbl_801CBE2C: -/* 801CBE2C 80 6F 00 14 */ lwz r3, 0x14(r15) -/* 801CBE30 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801CBE34 7C 0E 00 00 */ cmpw r14, r0 -/* 801CBE38 40 82 00 A0 */ bne lbl_801CBED8 -/* 801CBE3C 3A 20 00 00 */ li r17, 0 -/* 801CBE40 39 C0 00 00 */ li r14, 0 -/* 801CBE44 C3 E2 A7 4C */ lfs f31, lit_4398(r2) -/* 801CBE48 48 00 00 84 */ b lbl_801CBECC -lbl_801CBE4C: -/* 801CBE4C 7D E3 7B 78 */ mr r3, r15 -/* 801CBE50 48 00 15 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801CBE54 7C 70 1B 78 */ mr r16, r3 -/* 801CBE58 7E 24 8B 78 */ mr r4, r17 -/* 801CBE5C 4B E7 1C ED */ bl getMenuFmapStageData__24dMenu_Fmap_region_data_cFi -/* 801CBE60 C0 43 00 18 */ lfs f2, 0x18(r3) -/* 801CBE64 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 801CBE68 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 801CBE6C EC 01 00 2A */ fadds f0, f1, f0 -/* 801CBE70 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801CBE74 EC 22 00 2A */ fadds f1, f2, f0 -/* 801CBE78 C0 10 00 0C */ lfs f0, 0xc(r16) -/* 801CBE7C EF C0 08 2A */ fadds f30, f0, f1 -/* 801CBE80 7D E3 7B 78 */ mr r3, r15 -/* 801CBE84 48 00 14 CD */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801CBE88 7C 70 1B 78 */ mr r16, r3 -/* 801CBE8C 7E 24 8B 78 */ mr r4, r17 -/* 801CBE90 4B E7 1C B9 */ bl getMenuFmapStageData__24dMenu_Fmap_region_data_cFi -/* 801CBE94 C0 43 00 14 */ lfs f2, 0x14(r3) -/* 801CBE98 C0 23 00 24 */ lfs f1, 0x24(r3) -/* 801CBE9C C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 801CBEA0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801CBEA4 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801CBEA8 EC 22 00 2A */ fadds f1, f2, f0 -/* 801CBEAC C0 10 00 08 */ lfs f0, 8(r16) -/* 801CBEB0 EC 00 08 2A */ fadds f0, f0, f1 -/* 801CBEB4 80 0F 00 14 */ lwz r0, 0x14(r15) -/* 801CBEB8 7C 60 72 14 */ add r3, r0, r14 -/* 801CBEBC D0 03 10 E4 */ stfs f0, 0x10e4(r3) -/* 801CBEC0 D3 C3 11 34 */ stfs f30, 0x1134(r3) -/* 801CBEC4 3A 31 00 01 */ addi r17, r17, 1 -/* 801CBEC8 39 CE 00 04 */ addi r14, r14, 4 -lbl_801CBECC: -/* 801CBECC 88 0F 03 06 */ lbz r0, 0x306(r15) -/* 801CBED0 7C 11 00 00 */ cmpw r17, r0 -/* 801CBED4 41 80 FF 78 */ blt lbl_801CBE4C -lbl_801CBED8: -/* 801CBED8 38 60 00 01 */ li r3, 1 -lbl_801CBEDC: -/* 801CBEDC E3 E1 01 28 */ psq_l f31, 296(r1), 0, 0 /* qr0 */ -/* 801CBEE0 CB E1 01 20 */ lfd f31, 0x120(r1) -/* 801CBEE4 E3 C1 01 18 */ psq_l f30, 280(r1), 0, 0 /* qr0 */ -/* 801CBEE8 CB C1 01 10 */ lfd f30, 0x110(r1) -/* 801CBEEC 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CBEF0 48 19 62 FD */ bl _restgpr_14 -/* 801CBEF4 80 01 01 34 */ lwz r0, 0x134(r1) -/* 801CBEF8 7C 08 03 A6 */ mtlr r0 -/* 801CBEFC 38 21 01 30 */ addi r1, r1, 0x130 -/* 801CBF00 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/readFieldMapData__12dMenu_Fmap_cFPPvPCcbb.s b/asm/d/menu/d_menu_fmap/readFieldMapData__12dMenu_Fmap_cFPPvPCcbb.s deleted file mode 100644 index b636ea0c79..0000000000 --- a/asm/d/menu/d_menu_fmap/readFieldMapData__12dMenu_Fmap_cFPPvPCcbb.s +++ /dev/null @@ -1,135 +0,0 @@ -lbl_801CC094: -/* 801CC094 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CC098 7C 08 02 A6 */ mflr r0 -/* 801CC09C 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CC0A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CC0A4 48 19 61 29 */ bl _savegpr_25 -/* 801CC0A8 7C 7E 1B 78 */ mr r30, r3 -/* 801CC0AC 7C 9F 23 78 */ mr r31, r4 -/* 801CC0B0 7C B9 2B 78 */ mr r25, r5 -/* 801CC0B4 7C DA 33 78 */ mr r26, r6 -/* 801CC0B8 80 63 00 64 */ lwz r3, 0x64(r3) -/* 801CC0BC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CC0C0 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CC0C4 80 1D 5C 68 */ lwz r0, 0x5c68(r29) -/* 801CC0C8 7C 03 00 40 */ cmplw r3, r0 -/* 801CC0CC 41 82 00 9C */ beq lbl_801CC168 -/* 801CC0D0 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 801CC0D4 41 82 00 44 */ beq lbl_801CC118 -/* 801CC0D8 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801CC0DC 7F 24 CB 78 */ mr r4, r25 -/* 801CC0E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC0E4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CC0E8 7D 89 03 A6 */ mtctr r12 -/* 801CC0EC 4E 80 04 21 */ bctrl -/* 801CC0F0 7C 7C 1B 78 */ mr r28, r3 -/* 801CC0F4 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801CC0F8 7F 84 E3 78 */ mr r4, r28 -/* 801CC0FC 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC100 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801CC104 7D 89 03 A6 */ mtctr r12 -/* 801CC108 4E 80 04 21 */ bctrl -/* 801CC10C 93 9F 00 00 */ stw r28, 0(r31) -/* 801CC110 38 60 00 01 */ li r3, 1 -/* 801CC114 48 00 01 58 */ b lbl_801CC26C -lbl_801CC118: -/* 801CC118 7F 24 CB 78 */ mr r4, r25 -/* 801CC11C 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC120 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CC124 7D 89 03 A6 */ mtctr r12 -/* 801CC128 4E 80 04 21 */ bctrl -/* 801CC12C 7C 7B 1B 78 */ mr r27, r3 -/* 801CC130 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801CC134 7F 64 DB 78 */ mr r4, r27 -/* 801CC138 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC13C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801CC140 7D 89 03 A6 */ mtctr r12 -/* 801CC144 4E 80 04 21 */ bctrl -/* 801CC148 7C 7C 1B 78 */ mr r28, r3 -/* 801CC14C 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801CC150 7F 64 DB 78 */ mr r4, r27 -/* 801CC154 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC158 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 801CC15C 7D 89 03 A6 */ mtctr r12 -/* 801CC160 4E 80 04 21 */ bctrl -/* 801CC164 48 00 00 58 */ b lbl_801CC1BC -lbl_801CC168: -/* 801CC168 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 801CC16C 41 82 00 44 */ beq lbl_801CC1B0 -/* 801CC170 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801CC174 7F 24 CB 78 */ mr r4, r25 -/* 801CC178 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC17C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CC180 7D 89 03 A6 */ mtctr r12 -/* 801CC184 4E 80 04 21 */ bctrl -/* 801CC188 7C 7B 1B 78 */ mr r27, r3 -/* 801CC18C 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801CC190 7F 64 DB 78 */ mr r4, r27 -/* 801CC194 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC198 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801CC19C 7D 89 03 A6 */ mtctr r12 -/* 801CC1A0 4E 80 04 21 */ bctrl -/* 801CC1A4 93 7F 00 00 */ stw r27, 0(r31) -/* 801CC1A8 38 60 00 01 */ li r3, 1 -/* 801CC1AC 48 00 00 C0 */ b lbl_801CC26C -lbl_801CC1B0: -/* 801CC1B0 7F 24 CB 78 */ mr r4, r25 -/* 801CC1B4 4B E6 65 85 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc -/* 801CC1B8 7C 7C 1B 78 */ mr r28, r3 -lbl_801CC1BC: -/* 801CC1BC 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801CC1C0 41 82 00 4C */ beq lbl_801CC20C -/* 801CC1C4 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801CC1C8 80 1D 5C 68 */ lwz r0, 0x5c68(r29) -/* 801CC1CC 7C 03 00 40 */ cmplw r3, r0 -/* 801CC1D0 41 82 00 1C */ beq lbl_801CC1EC -/* 801CC1D4 80 7E 00 04 */ lwz r3, 4(r30) -/* 801CC1D8 7F 84 E3 78 */ mr r4, r28 -/* 801CC1DC 38 A0 00 20 */ li r5, 0x20 -/* 801CC1E0 48 10 22 F5 */ bl alloc__7JKRHeapFUli -/* 801CC1E4 90 7F 00 00 */ stw r3, 0(r31) -/* 801CC1E8 48 00 00 38 */ b lbl_801CC220 -lbl_801CC1EC: -/* 801CC1EC 7F 24 CB 78 */ mr r4, r25 -/* 801CC1F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC1F4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CC1F8 7D 89 03 A6 */ mtctr r12 -/* 801CC1FC 4E 80 04 21 */ bctrl -/* 801CC200 90 7F 00 00 */ stw r3, 0(r31) -/* 801CC204 38 60 00 01 */ li r3, 1 -/* 801CC208 48 00 00 64 */ b lbl_801CC26C -lbl_801CC20C: -/* 801CC20C 80 7E 00 04 */ lwz r3, 4(r30) -/* 801CC210 7F 84 E3 78 */ mr r4, r28 -/* 801CC214 38 A0 00 20 */ li r5, 0x20 -/* 801CC218 48 10 22 BD */ bl alloc__7JKRHeapFUli -/* 801CC21C 90 7F 00 00 */ stw r3, 0(r31) -lbl_801CC220: -/* 801CC220 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801CC224 80 9F 00 00 */ lwz r4, 0(r31) -/* 801CC228 7F 85 E3 78 */ mr r5, r28 -/* 801CC22C 7F 26 CB 78 */ mr r6, r25 -/* 801CC230 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC234 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801CC238 7D 89 03 A6 */ mtctr r12 -/* 801CC23C 4E 80 04 21 */ bctrl -/* 801CC240 7C 7E 1B 78 */ mr r30, r3 -/* 801CC244 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801CC248 41 82 00 10 */ beq lbl_801CC258 -/* 801CC24C 80 7F 00 00 */ lwz r3, 0(r31) -/* 801CC250 7F 84 E3 78 */ mr r4, r28 -/* 801CC254 48 16 F3 E5 */ bl DCStoreRangeNoSync -lbl_801CC258: -/* 801CC258 28 1E 00 00 */ cmplwi r30, 0 -/* 801CC25C 40 82 00 0C */ bne lbl_801CC268 -/* 801CC260 38 60 00 00 */ li r3, 0 -/* 801CC264 48 00 00 08 */ b lbl_801CC26C -lbl_801CC268: -/* 801CC268 38 60 00 01 */ li r3, 1 -lbl_801CC26C: -/* 801CC26C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CC270 48 19 5F A9 */ bl _restgpr_25 -/* 801CC274 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CC278 7C 08 03 A6 */ mtlr r0 -/* 801CC27C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CC280 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc.s b/asm/d/menu/d_menu_fmap/readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc.s deleted file mode 100644 index 89209a4227..0000000000 --- a/asm/d/menu/d_menu_fmap/readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_801CBF04: -/* 801CBF04 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801CBF08 7C 08 02 A6 */ mflr r0 -/* 801CBF0C 90 01 00 64 */ stw r0, 0x64(r1) -/* 801CBF10 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CBF14 48 19 62 B5 */ bl _savegpr_24 -/* 801CBF18 7C 7A 1B 78 */ mr r26, r3 -/* 801CBF1C 7C 9B 23 78 */ mr r27, r4 -/* 801CBF20 7C BC 2B 78 */ mr r28, r5 -/* 801CBF24 7C D8 33 78 */ mr r24, r6 -/* 801CBF28 3B C0 00 00 */ li r30, 0 -/* 801CBF2C 38 00 00 00 */ li r0, 0 -/* 801CBF30 90 05 00 0C */ stw r0, 0xc(r5) -/* 801CBF34 90 01 00 0C */ stw r0, 0xc(r1) -/* 801CBF38 38 61 00 24 */ addi r3, r1, 0x24 -/* 801CBF3C 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CBF40 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CBF44 38 84 00 4B */ addi r4, r4, 0x4b -/* 801CBF48 7F 65 DB 78 */ mr r5, r27 -/* 801CBF4C 4C C6 31 82 */ crclr 6 -/* 801CBF50 48 19 A5 8D */ bl sprintf -/* 801CBF54 7F 43 D3 78 */ mr r3, r26 -/* 801CBF58 38 81 00 0C */ addi r4, r1, 0xc -/* 801CBF5C 38 A1 00 24 */ addi r5, r1, 0x24 -/* 801CBF60 38 C0 00 00 */ li r6, 0 -/* 801CBF64 38 E0 00 00 */ li r7, 0 -/* 801CBF68 48 00 01 2D */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb -/* 801CBF6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CBF70 41 82 00 0C */ beq lbl_801CBF7C -/* 801CBF74 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801CBF78 90 18 00 00 */ stw r0, 0(r24) -lbl_801CBF7C: -/* 801CBF7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CBF80 93 FC 00 08 */ stw r31, 8(r28) -/* 801CBF84 3B A0 00 00 */ li r29, 0 -/* 801CBF88 3B 3F 00 04 */ addi r25, r31, 4 -/* 801CBF8C 48 00 00 E0 */ b lbl_801CC06C -lbl_801CBF90: -/* 801CBF90 7F 43 D3 78 */ mr r3, r26 -/* 801CBF94 88 99 00 00 */ lbz r4, 0(r25) -/* 801CBF98 48 00 0B 01 */ bl isRoomDataBit__12dMenu_Fmap_cFi -/* 801CBF9C 2C 03 00 00 */ cmpwi r3, 0 -/* 801CBFA0 41 82 00 C4 */ beq lbl_801CC064 -/* 801CBFA4 38 00 00 00 */ li r0, 0 -/* 801CBFA8 90 01 00 08 */ stw r0, 8(r1) -/* 801CBFAC 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CBFB0 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CBFB4 38 84 60 E8 */ addi r4, r4, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -/* 801CBFB8 38 84 00 58 */ addi r4, r4, 0x58 -/* 801CBFBC 7F 65 DB 78 */ mr r5, r27 -/* 801CBFC0 88 D9 00 00 */ lbz r6, 0(r25) -/* 801CBFC4 4C C6 31 82 */ crclr 6 -/* 801CBFC8 48 19 A5 15 */ bl sprintf -/* 801CBFCC 7F 43 D3 78 */ mr r3, r26 -/* 801CBFD0 38 81 00 08 */ addi r4, r1, 8 -/* 801CBFD4 38 A0 15 00 */ li r5, 0x1500 -/* 801CBFD8 38 C1 00 10 */ addi r6, r1, 0x10 -/* 801CBFDC 48 00 05 41 */ bl readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc -/* 801CBFE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CBFE4 41 82 00 80 */ beq lbl_801CC064 -/* 801CBFE8 38 60 00 10 */ li r3, 0x10 -/* 801CBFEC 48 10 2C 61 */ bl __nw__FUl -/* 801CBFF0 7C 78 1B 79 */ or. r24, r3, r3 -/* 801CBFF4 41 82 00 18 */ beq lbl_801CC00C -/* 801CBFF8 38 00 00 00 */ li r0, 0 -/* 801CBFFC 90 18 00 00 */ stw r0, 0(r24) -/* 801CC000 90 18 00 04 */ stw r0, 4(r24) -/* 801CC004 90 18 00 08 */ stw r0, 8(r24) -/* 801CC008 90 18 00 0C */ stw r0, 0xc(r24) -lbl_801CC00C: -/* 801CC00C 38 60 00 14 */ li r3, 0x14 -/* 801CC010 48 10 2C 3D */ bl __nw__FUl -/* 801CC014 28 03 00 00 */ cmplwi r3, 0 -/* 801CC018 41 82 00 20 */ beq lbl_801CC038 -/* 801CC01C 88 99 00 00 */ lbz r4, 0(r25) -/* 801CC020 93 03 00 00 */ stw r24, 0(r3) -/* 801CC024 38 00 00 00 */ li r0, 0 -/* 801CC028 90 03 00 04 */ stw r0, 4(r3) -/* 801CC02C 90 03 00 08 */ stw r0, 8(r3) -/* 801CC030 93 83 00 0C */ stw r28, 0xc(r3) -/* 801CC034 98 83 00 10 */ stb r4, 0x10(r3) -lbl_801CC038: -/* 801CC038 28 1E 00 00 */ cmplwi r30, 0 -/* 801CC03C 40 82 00 0C */ bne lbl_801CC048 -/* 801CC040 90 7C 00 0C */ stw r3, 0xc(r28) -/* 801CC044 48 00 00 08 */ b lbl_801CC04C -lbl_801CC048: -/* 801CC048 90 7E 00 08 */ stw r3, 8(r30) -lbl_801CC04C: -/* 801CC04C 7C 7E 1B 78 */ mr r30, r3 -/* 801CC050 80 01 00 08 */ lwz r0, 8(r1) -/* 801CC054 90 18 00 0C */ stw r0, 0xc(r24) -/* 801CC058 80 61 00 08 */ lwz r3, 8(r1) -/* 801CC05C 7F 04 C3 78 */ mr r4, r24 -/* 801CC060 4B E5 AC 2D */ bl dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c -lbl_801CC064: -/* 801CC064 3B BD 00 01 */ addi r29, r29, 1 -/* 801CC068 3B 39 00 01 */ addi r25, r25, 1 -lbl_801CC06C: -/* 801CC06C 88 1F 00 00 */ lbz r0, 0(r31) -/* 801CC070 7C 1D 00 00 */ cmpw r29, r0 -/* 801CC074 41 80 FF 1C */ blt lbl_801CBF90 -/* 801CC078 38 60 00 01 */ li r3, 1 -/* 801CC07C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CC080 48 19 61 95 */ bl _restgpr_24 -/* 801CC084 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801CC088 7C 08 03 A6 */ mtlr r0 -/* 801CC08C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CC090 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc.s b/asm/d/menu/d_menu_fmap/readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc.s deleted file mode 100644 index 638b7cd812..0000000000 --- a/asm/d/menu/d_menu_fmap/readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801CC51C: -/* 801CC51C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CC520 7C 08 02 A6 */ mflr r0 -/* 801CC524 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CC528 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC52C 48 19 5C A9 */ bl _savegpr_27 -/* 801CC530 7C 7B 1B 78 */ mr r27, r3 -/* 801CC534 7C 9C 23 78 */ mr r28, r4 -/* 801CC538 7C DE 33 78 */ mr r30, r6 -/* 801CC53C 80 63 00 64 */ lwz r3, 0x64(r3) -/* 801CC540 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CC544 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CC548 80 04 5C 68 */ lwz r0, 0x5c68(r4) -/* 801CC54C 7C 03 00 40 */ cmplw r3, r0 -/* 801CC550 41 82 00 54 */ beq lbl_801CC5A4 -/* 801CC554 7F C4 F3 78 */ mr r4, r30 -/* 801CC558 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC55C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CC560 7D 89 03 A6 */ mtctr r12 -/* 801CC564 4E 80 04 21 */ bctrl -/* 801CC568 7C 7F 1B 78 */ mr r31, r3 -/* 801CC56C 80 7B 00 64 */ lwz r3, 0x64(r27) -/* 801CC570 7F E4 FB 78 */ mr r4, r31 -/* 801CC574 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC578 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801CC57C 7D 89 03 A6 */ mtctr r12 -/* 801CC580 4E 80 04 21 */ bctrl -/* 801CC584 7C 7D 1B 78 */ mr r29, r3 -/* 801CC588 80 7B 00 64 */ lwz r3, 0x64(r27) -/* 801CC58C 7F E4 FB 78 */ mr r4, r31 -/* 801CC590 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC594 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 801CC598 7D 89 03 A6 */ mtctr r12 -/* 801CC59C 4E 80 04 21 */ bctrl -/* 801CC5A0 48 00 00 10 */ b lbl_801CC5B0 -lbl_801CC5A4: -/* 801CC5A4 7F C4 F3 78 */ mr r4, r30 -/* 801CC5A8 4B E6 61 91 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc -/* 801CC5AC 7C 7D 1B 78 */ mr r29, r3 -lbl_801CC5B0: -/* 801CC5B0 80 7B 00 04 */ lwz r3, 4(r27) -/* 801CC5B4 7F A4 EB 78 */ mr r4, r29 -/* 801CC5B8 38 A0 00 20 */ li r5, 0x20 -/* 801CC5BC 48 10 1F 19 */ bl alloc__7JKRHeapFUli -/* 801CC5C0 90 7C 00 00 */ stw r3, 0(r28) -/* 801CC5C4 80 7B 00 64 */ lwz r3, 0x64(r27) -/* 801CC5C8 80 9C 00 00 */ lwz r4, 0(r28) -/* 801CC5CC 7F A5 EB 78 */ mr r5, r29 -/* 801CC5D0 7F C6 F3 78 */ mr r6, r30 -/* 801CC5D4 81 83 00 00 */ lwz r12, 0(r3) -/* 801CC5D8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801CC5DC 7D 89 03 A6 */ mtctr r12 -/* 801CC5E0 4E 80 04 21 */ bctrl -/* 801CC5E4 28 03 00 00 */ cmplwi r3, 0 -/* 801CC5E8 40 82 00 0C */ bne lbl_801CC5F4 -/* 801CC5EC 38 60 00 00 */ li r3, 0 -/* 801CC5F0 48 00 00 14 */ b lbl_801CC604 -lbl_801CC5F4: -/* 801CC5F4 80 1B 02 00 */ lwz r0, 0x200(r27) -/* 801CC5F8 7C 00 1A 14 */ add r0, r0, r3 -/* 801CC5FC 90 1B 02 00 */ stw r0, 0x200(r27) -/* 801CC600 38 60 00 01 */ li r3, 1 -lbl_801CC604: -/* 801CC604 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC608 48 19 5C 19 */ bl _restgpr_27 -/* 801CC60C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CC610 7C 08 03 A6 */ mtlr r0 -/* 801CC614 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CC618 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/readWorldData__12dMenu_Fmap_cFUc.s b/asm/d/menu/d_menu_fmap/readWorldData__12dMenu_Fmap_cFUc.s deleted file mode 100644 index 840231b2a3..0000000000 --- a/asm/d/menu/d_menu_fmap/readWorldData__12dMenu_Fmap_cFUc.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_801CB770: -/* 801CB770 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CB774 7C 08 02 A6 */ mflr r0 -/* 801CB778 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CB77C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB780 48 19 6A 55 */ bl _savegpr_27 -/* 801CB784 7C 7D 1B 78 */ mr r29, r3 -/* 801CB788 7C 9C 23 78 */ mr r28, r4 -/* 801CB78C 48 00 0E 91 */ bl removeAreaData__12dMenu_Fmap_cFv -/* 801CB790 3B E0 00 00 */ li r31, 0 -/* 801CB794 3B C0 00 00 */ li r30, 0 -/* 801CB798 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB79C 88 03 12 2F */ lbz r0, 0x122f(r3) -/* 801CB7A0 28 00 00 00 */ cmplwi r0, 0 -/* 801CB7A4 41 82 00 70 */ beq lbl_801CB814 -/* 801CB7A8 3B 60 00 00 */ li r27, 0 -/* 801CB7AC 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 801CB7B0 3B 83 FF FF */ addi r28, r3, -1 -lbl_801CB7B4: -/* 801CB7B4 7C 1B E0 00 */ cmpw r27, r28 -/* 801CB7B8 40 82 00 2C */ bne lbl_801CB7E4 -/* 801CB7BC 7F A3 EB 78 */ mr r3, r29 -/* 801CB7C0 38 1B 00 01 */ addi r0, r27, 1 -/* 801CB7C4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801CB7C8 38 A0 00 01 */ li r5, 1 -/* 801CB7CC 48 00 01 6D */ bl readAreaData__12dMenu_Fmap_cFUcb -/* 801CB7D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CB7D4 41 82 00 30 */ beq lbl_801CB804 -/* 801CB7D8 3B E0 00 01 */ li r31, 1 -/* 801CB7DC 3B C0 00 01 */ li r30, 1 -/* 801CB7E0 48 00 00 24 */ b lbl_801CB804 -lbl_801CB7E4: -/* 801CB7E4 7F A3 EB 78 */ mr r3, r29 -/* 801CB7E8 38 1B 00 01 */ addi r0, r27, 1 -/* 801CB7EC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801CB7F0 38 A0 00 00 */ li r5, 0 -/* 801CB7F4 48 00 01 45 */ bl readAreaData__12dMenu_Fmap_cFUcb -/* 801CB7F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CB7FC 41 82 00 08 */ beq lbl_801CB804 -/* 801CB800 3B C0 00 01 */ li r30, 1 -lbl_801CB804: -/* 801CB804 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CB808 2C 1B 00 08 */ cmpwi r27, 8 -/* 801CB80C 41 80 FF A8 */ blt lbl_801CB7B4 -/* 801CB810 48 00 00 24 */ b lbl_801CB834 -lbl_801CB814: -/* 801CB814 7F A3 EB 78 */ mr r3, r29 -/* 801CB818 7F 84 E3 78 */ mr r4, r28 -/* 801CB81C 38 A0 00 01 */ li r5, 1 -/* 801CB820 48 00 01 19 */ bl readAreaData__12dMenu_Fmap_cFUcb -/* 801CB824 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CB828 41 82 00 0C */ beq lbl_801CB834 -/* 801CB82C 3B E0 00 01 */ li r31, 1 -/* 801CB830 3B C0 00 01 */ li r30, 1 -lbl_801CB834: -/* 801CB834 38 E0 00 00 */ li r7, 0 -/* 801CB838 3B 60 FF FF */ li r27, -1 -/* 801CB83C 39 00 00 00 */ li r8, 0 -/* 801CB840 38 60 00 00 */ li r3, 0 -/* 801CB844 7C 65 1B 78 */ mr r5, r3 -/* 801CB848 7C 64 1B 78 */ mr r4, r3 -/* 801CB84C 38 00 00 08 */ li r0, 8 -/* 801CB850 7C 09 03 A6 */ mtctr r0 -lbl_801CB854: -/* 801CB854 38 03 00 24 */ addi r0, r3, 0x24 -/* 801CB858 7C DD 00 2E */ lwzx r6, r29, r0 -/* 801CB85C 28 06 00 00 */ cmplwi r6, 0 -/* 801CB860 41 82 00 28 */ beq lbl_801CB888 -/* 801CB864 28 07 00 00 */ cmplwi r7, 0 -/* 801CB868 40 82 00 14 */ bne lbl_801CB87C -/* 801CB86C 7D 1B 43 78 */ mr r27, r8 -/* 801CB870 7C C7 33 78 */ mr r7, r6 -/* 801CB874 90 A6 00 04 */ stw r5, 4(r6) -/* 801CB878 48 00 00 10 */ b lbl_801CB888 -lbl_801CB87C: -/* 801CB87C 90 C7 00 04 */ stw r6, 4(r7) -/* 801CB880 7C FD 00 2E */ lwzx r7, r29, r0 -/* 801CB884 90 87 00 04 */ stw r4, 4(r7) -lbl_801CB888: -/* 801CB888 39 08 00 01 */ addi r8, r8, 1 -/* 801CB88C 38 63 00 04 */ addi r3, r3, 4 -/* 801CB890 42 00 FF C4 */ bdnz lbl_801CB854 -/* 801CB894 2C 1B FF FF */ cmpwi r27, -1 -/* 801CB898 41 82 00 5C */ beq lbl_801CB8F4 -/* 801CB89C 80 1D 00 20 */ lwz r0, 0x20(r29) -/* 801CB8A0 28 00 00 00 */ cmplwi r0, 0 -/* 801CB8A4 40 82 00 50 */ bne lbl_801CB8F4 -/* 801CB8A8 38 60 00 14 */ li r3, 0x14 -/* 801CB8AC 48 10 33 A1 */ bl __nw__FUl -/* 801CB8B0 7C 7C 1B 79 */ or. r28, r3, r3 -/* 801CB8B4 41 82 00 14 */ beq lbl_801CB8C8 -/* 801CB8B8 57 60 10 3A */ slwi r0, r27, 2 -/* 801CB8BC 7C 9D 02 14 */ add r4, r29, r0 -/* 801CB8C0 80 84 00 24 */ lwz r4, 0x24(r4) -/* 801CB8C4 4B E7 27 65 */ bl create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c -lbl_801CB8C8: -/* 801CB8C8 93 9D 00 20 */ stw r28, 0x20(r29) -/* 801CB8CC 80 7D 00 20 */ lwz r3, 0x20(r29) -/* 801CB8D0 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 801CB8D4 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 801CB8D8 C0 43 00 08 */ lfs f2, 8(r3) -/* 801CB8DC C0 63 00 04 */ lfs f3, 4(r3) -/* 801CB8E0 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB8E4 D0 63 0F F4 */ stfs f3, 0xff4(r3) -/* 801CB8E8 D0 43 0F F8 */ stfs f2, 0xff8(r3) -/* 801CB8EC D0 23 0F FC */ stfs f1, 0xffc(r3) -/* 801CB8F0 D0 03 10 00 */ stfs f0, 0x1000(r3) -lbl_801CB8F4: -/* 801CB8F4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801CB8F8 41 82 00 24 */ beq lbl_801CB91C -/* 801CB8FC 80 7D 00 B8 */ lwz r3, 0xb8(r29) -/* 801CB900 80 83 00 BC */ lwz r4, 0xbc(r3) -/* 801CB904 28 04 00 00 */ cmplwi r4, 0 -/* 801CB908 41 82 00 0C */ beq lbl_801CB914 -/* 801CB90C 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB910 48 00 57 85 */ bl setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG -lbl_801CB914: -/* 801CB914 38 00 00 01 */ li r0, 1 -/* 801CB918 98 1D 03 05 */ stb r0, 0x305(r29) -lbl_801CB91C: -/* 801CB91C 7F E3 FB 78 */ mr r3, r31 -/* 801CB920 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB924 48 19 68 FD */ bl _restgpr_27 -/* 801CB928 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CB92C 7C 08 03 A6 */ mtlr r0 -/* 801CB930 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CB934 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/region_map_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/region_map_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 05de1a9be3..0000000000 --- a/asm/d/menu/d_menu_fmap/region_map_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_801C8518: -/* 801C8518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C851C 7C 08 02 A6 */ mflr r0 -/* 801C8520 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C8524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C8528 7C 7F 1B 78 */ mr r31, r3 -/* 801C852C 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C8530 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C8534 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C8538 7C 9F 02 14 */ add r4, r31, r0 -/* 801C853C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C8540 48 00 43 1D */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C8544 38 00 00 01 */ li r0, 1 -/* 801C8548 98 1F 03 12 */ stb r0, 0x312(r31) -/* 801C854C 88 1F 03 13 */ lbz r0, 0x313(r31) -/* 801C8550 28 00 00 00 */ cmplwi r0, 0 -/* 801C8554 40 82 00 10 */ bne lbl_801C8564 -/* 801C8558 7F E3 FB 78 */ mr r3, r31 -/* 801C855C 48 00 43 51 */ bl setAreaNameZero__12dMenu_Fmap_cFv -/* 801C8560 48 00 00 20 */ b lbl_801C8580 -lbl_801C8564: -/* 801C8564 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C8568 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801C856C 7F E3 FB 78 */ mr r3, r31 -/* 801C8570 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C8574 7C 9F 02 14 */ add r4, r31, r0 -/* 801C8578 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C857C 48 00 43 05 */ bl setAreaName__12dMenu_Fmap_cFUl -lbl_801C8580: -/* 801C8580 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C8584 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801C8588 90 1F 02 04 */ stw r0, 0x204(r31) -/* 801C858C 38 00 FF FF */ li r0, -1 -/* 801C8590 90 1F 02 08 */ stw r0, 0x208(r31) -/* 801C8594 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8598 38 80 00 03 */ li r4, 3 -/* 801C859C C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C85A0 48 00 F1 75 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C85A4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C85A8 38 80 05 22 */ li r4, 0x522 -/* 801C85AC 38 A0 00 FF */ li r5, 0xff -/* 801C85B0 48 00 EC 61 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C85B4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C85B8 38 80 05 27 */ li r4, 0x527 -/* 801C85BC 38 A0 00 FF */ li r5, 0xff -/* 801C85C0 48 00 ED 15 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C85C4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C85C8 38 80 05 29 */ li r4, 0x529 -/* 801C85CC 38 A0 00 FF */ li r5, 0xff -/* 801C85D0 48 00 EB 19 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C85D4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C85D8 38 80 05 28 */ li r4, 0x528 -/* 801C85DC 48 00 EF 11 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C85E0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C85E4 38 80 03 F9 */ li r4, 0x3f9 -/* 801C85E8 48 00 ED B1 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C85EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C85F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C85F4 7C 08 03 A6 */ mtlr r0 -/* 801C85F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C85FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/region_map_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/region_map_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 054d21f686..0000000000 --- a/asm/d/menu/d_menu_fmap/region_map_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,338 +0,0 @@ -lbl_801C8600: -/* 801C8600 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801C8604 7C 08 02 A6 */ mflr r0 -/* 801C8608 90 01 00 54 */ stw r0, 0x54(r1) -/* 801C860C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 801C8610 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 801C8614 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 801C8618 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 801C861C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801C8620 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801C8624 7C 7E 1B 78 */ mr r30, r3 -/* 801C8628 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801C862C 38 80 05 27 */ li r4, 0x527 -/* 801C8630 38 A0 00 FF */ li r5, 0xff -/* 801C8634 48 00 EC A1 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C8638 48 03 1A 19 */ bl dMw_B_TRIGGER__Fv -/* 801C863C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8640 41 82 00 50 */ beq lbl_801C8690 -/* 801C8644 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C8648 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C864C A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C8650 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C8654 40 82 00 3C */ bne lbl_801C8690 -/* 801C8658 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C865C 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C8660 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C8664 28 00 00 01 */ cmplwi r0, 1 -/* 801C8668 41 82 00 28 */ beq lbl_801C8690 -/* 801C866C 7F C3 F3 78 */ mr r3, r30 -/* 801C8670 38 80 00 05 */ li r4, 5 -/* 801C8674 48 00 30 5D */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C8678 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C867C 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C8680 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C8684 38 00 00 00 */ li r0, 0 -/* 801C8688 98 03 00 D8 */ stb r0, 0xd8(r3) -/* 801C868C 48 00 04 18 */ b lbl_801C8AA4 -lbl_801C8690: -/* 801C8690 48 03 19 AD */ bl dMw_A_TRIGGER__Fv -/* 801C8694 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8698 41 82 00 3C */ beq lbl_801C86D4 -/* 801C869C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C86A0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C86A4 A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C86A8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C86AC 40 82 00 28 */ bne lbl_801C86D4 -/* 801C86B0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C86B4 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C86B8 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C86BC 28 00 00 01 */ cmplwi r0, 1 -/* 801C86C0 41 82 00 14 */ beq lbl_801C86D4 -/* 801C86C4 7F C3 F3 78 */ mr r3, r30 -/* 801C86C8 38 80 00 0B */ li r4, 0xb -/* 801C86CC 48 00 30 05 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C86D0 48 00 03 D4 */ b lbl_801C8AA4 -lbl_801C86D4: -/* 801C86D4 48 03 19 91 */ bl dMw_Z_TRIGGER__Fv -/* 801C86D8 2C 03 00 00 */ cmpwi r3, 0 -/* 801C86DC 41 82 02 A8 */ beq lbl_801C8984 -/* 801C86E0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C86E4 48 00 F9 A5 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C86E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C86EC 41 82 02 98 */ beq lbl_801C8984 -/* 801C86F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C86F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C86F8 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801C86FC 7F E3 FB 78 */ mr r3, r31 -/* 801C8700 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8704 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8708 A0 84 02 12 */ lhz r4, 0x212(r4) -/* 801C870C 4B E6 C2 B1 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8710 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8714 41 82 00 9C */ beq lbl_801C87B0 -/* 801C8718 7F E3 FB 78 */ mr r3, r31 -/* 801C871C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8720 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8724 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801C8728 4B E6 C2 95 */ bl isEventBit__11dSv_event_cCFUs -/* 801C872C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8730 40 82 00 80 */ bne lbl_801C87B0 -/* 801C8734 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8738 80 9E 00 08 */ lwz r4, 8(r30) -/* 801C873C 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8740 48 00 EF 01 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C8744 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8748 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C874C 38 80 08 B4 */ li r4, 0x8b4 -/* 801C8750 38 A0 00 00 */ li r5, 0 -/* 801C8754 38 C0 00 00 */ li r6, 0 -/* 801C8758 38 E0 00 FF */ li r7, 0xff -/* 801C875C 39 00 00 01 */ li r8, 1 -/* 801C8760 48 07 5D F9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8764 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801C8768 98 1E 03 02 */ stb r0, 0x302(r30) -/* 801C876C 7F C3 F3 78 */ mr r3, r30 -/* 801C8770 38 80 00 0A */ li r4, 0xa -/* 801C8774 48 00 2F 5D */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C8778 38 00 00 4A */ li r0, 0x4a -/* 801C877C 90 01 00 10 */ stw r0, 0x10(r1) -/* 801C8780 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8784 38 81 00 10 */ addi r4, r1, 0x10 -/* 801C8788 38 A0 00 00 */ li r5, 0 -/* 801C878C 38 C0 00 00 */ li r6, 0 -/* 801C8790 38 E0 00 00 */ li r7, 0 -/* 801C8794 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8798 FC 40 08 90 */ fmr f2, f1 -/* 801C879C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C87A0 FC 80 18 90 */ fmr f4, f3 -/* 801C87A4 39 00 00 00 */ li r8, 0 -/* 801C87A8 48 0E 31 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C87AC 48 00 02 F8 */ b lbl_801C8AA4 -lbl_801C87B0: -/* 801C87B0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C87B4 48 00 F1 E1 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C87B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C87BC 41 82 00 74 */ beq lbl_801C8830 -/* 801C87C0 38 00 00 01 */ li r0, 1 -/* 801C87C4 98 1E 03 07 */ stb r0, 0x307(r30) -/* 801C87C8 7F C3 F3 78 */ mr r3, r30 -/* 801C87CC 38 80 00 07 */ li r4, 7 -/* 801C87D0 48 00 2F 01 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C87D4 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C87D8 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C87DC 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C87E0 38 00 00 00 */ li r0, 0 -/* 801C87E4 98 03 00 D8 */ stb r0, 0xd8(r3) -/* 801C87E8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C87EC 38 80 05 2A */ li r4, 0x52a -/* 801C87F0 38 A0 00 FF */ li r5, 0xff -/* 801C87F4 48 00 E8 F5 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C87F8 38 00 00 47 */ li r0, 0x47 -/* 801C87FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C8800 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8804 38 81 00 0C */ addi r4, r1, 0xc -/* 801C8808 38 A0 00 00 */ li r5, 0 -/* 801C880C 38 C0 00 00 */ li r6, 0 -/* 801C8810 38 E0 00 00 */ li r7, 0 -/* 801C8814 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8818 FC 40 08 90 */ fmr f2, f1 -/* 801C881C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C8820 FC 80 18 90 */ fmr f4, f3 -/* 801C8824 39 00 00 00 */ li r8, 0 -/* 801C8828 48 0E 31 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C882C 48 00 02 78 */ b lbl_801C8AA4 -lbl_801C8830: -/* 801C8830 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C8834 80 9E 00 08 */ lwz r4, 8(r30) -/* 801C8838 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C883C 48 00 EE 05 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C8840 7F E3 FB 78 */ mr r3, r31 -/* 801C8844 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8848 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C884C A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C8850 4B E6 C1 6D */ bl isEventBit__11dSv_event_cCFUs -/* 801C8854 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8858 41 82 00 44 */ beq lbl_801C889C -/* 801C885C 7F E3 FB 78 */ mr r3, r31 -/* 801C8860 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C8864 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C8868 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C886C 4B E6 C1 51 */ bl isEventBit__11dSv_event_cCFUs -/* 801C8870 2C 03 00 00 */ cmpwi r3, 0 -/* 801C8874 40 82 00 28 */ bne lbl_801C889C -/* 801C8878 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C887C 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8880 38 80 08 5D */ li r4, 0x85d -/* 801C8884 38 A0 00 00 */ li r5, 0 -/* 801C8888 38 C0 00 00 */ li r6, 0 -/* 801C888C 38 E0 00 FF */ li r7, 0xff -/* 801C8890 39 00 00 01 */ li r8, 1 -/* 801C8894 48 07 5C C5 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8898 48 00 00 A0 */ b lbl_801C8938 -lbl_801C889C: -/* 801C889C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88A0 48 00 F2 B9 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv -/* 801C88A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C88A8 40 82 00 3C */ bne lbl_801C88E4 -/* 801C88AC 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88B0 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C88B4 38 80 07 DE */ li r4, 0x7de -/* 801C88B8 38 A0 00 00 */ li r5, 0 -/* 801C88BC 38 C0 00 00 */ li r6, 0 -/* 801C88C0 38 E0 00 FF */ li r7, 0xff -/* 801C88C4 39 00 00 01 */ li r8, 1 -/* 801C88C8 48 07 5C 91 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C88CC 7F E3 FB 78 */ mr r3, r31 -/* 801C88D0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C88D4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C88D8 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C88DC 4B E6 C0 B1 */ bl onEventBit__11dSv_event_cFUs -/* 801C88E0 48 00 00 58 */ b lbl_801C8938 -lbl_801C88E4: -/* 801C88E4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88E8 48 00 F1 CD */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv -/* 801C88EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C88F0 40 82 00 28 */ bne lbl_801C8918 -/* 801C88F4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88F8 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C88FC 38 80 07 DD */ li r4, 0x7dd -/* 801C8900 38 A0 00 00 */ li r5, 0 -/* 801C8904 38 C0 00 00 */ li r6, 0 -/* 801C8908 38 E0 00 FF */ li r7, 0xff -/* 801C890C 39 00 00 01 */ li r8, 1 -/* 801C8910 48 07 5C 49 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C8914 48 00 00 24 */ b lbl_801C8938 -lbl_801C8918: -/* 801C8918 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C891C 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C8920 38 80 05 1D */ li r4, 0x51d -/* 801C8924 38 A0 00 00 */ li r5, 0 -/* 801C8928 38 C0 00 00 */ li r6, 0 -/* 801C892C 38 E0 00 FF */ li r7, 0xff -/* 801C8930 39 00 00 01 */ li r8, 1 -/* 801C8934 48 07 5C 25 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -lbl_801C8938: -/* 801C8938 88 1E 03 00 */ lbz r0, 0x300(r30) -/* 801C893C 98 1E 03 02 */ stb r0, 0x302(r30) -/* 801C8940 7F C3 F3 78 */ mr r3, r30 -/* 801C8944 38 80 00 0A */ li r4, 0xa -/* 801C8948 48 00 2D 89 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C894C 38 00 00 4A */ li r0, 0x4a -/* 801C8950 90 01 00 08 */ stw r0, 8(r1) -/* 801C8954 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8958 38 81 00 08 */ addi r4, r1, 8 -/* 801C895C 38 A0 00 00 */ li r5, 0 -/* 801C8960 38 C0 00 00 */ li r6, 0 -/* 801C8964 38 E0 00 00 */ li r7, 0 -/* 801C8968 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C896C FC 40 08 90 */ fmr f2, f1 -/* 801C8970 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C8974 FC 80 18 90 */ fmr f4, f3 -/* 801C8978 39 00 00 00 */ li r8, 0 -/* 801C897C 48 0E 30 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C8980 48 00 01 24 */ b lbl_801C8AA4 -lbl_801C8984: -/* 801C8984 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C8988 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C898C 88 03 02 F8 */ lbz r0, 0x2f8(r3) -/* 801C8990 28 00 00 00 */ cmplwi r0, 0 -/* 801C8994 41 82 00 10 */ beq lbl_801C89A4 -/* 801C8998 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C899C C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C89A0 48 00 87 A9 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -lbl_801C89A4: -/* 801C89A4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C89A8 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C89AC 48 00 C1 81 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl -/* 801C89B0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C89B4 C3 E3 11 94 */ lfs f31, 0x1194(r3) -/* 801C89B8 C3 C3 11 98 */ lfs f30, 0x1198(r3) -/* 801C89BC 83 FE 02 0C */ lwz r31, 0x20c(r30) -/* 801C89C0 7F C3 F3 78 */ mr r3, r30 -/* 801C89C4 48 00 49 8D */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801C89C8 7C 64 1B 78 */ mr r4, r3 -/* 801C89CC 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C89D0 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C89D4 EC 3F 00 28 */ fsubs f1, f31, f0 -/* 801C89D8 C0 02 A7 58 */ lfs f0, lit_4939(r2) -/* 801C89DC EC 21 00 28 */ fsubs f1, f1, f0 -/* 801C89E0 C0 02 A7 5C */ lfs f0, lit_4940(r2) -/* 801C89E4 EC 5E 00 28 */ fsubs f2, f30, f0 -/* 801C89E8 7F E5 FB 78 */ mr r5, r31 -/* 801C89EC 38 C1 00 18 */ addi r6, r1, 0x18 -/* 801C89F0 38 E1 00 14 */ addi r7, r1, 0x14 -/* 801C89F4 48 00 59 CD */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi -/* 801C89F8 80 1E 02 04 */ lwz r0, 0x204(r30) -/* 801C89FC 80 81 00 18 */ lwz r4, 0x18(r1) -/* 801C8A00 7C 00 20 00 */ cmpw r0, r4 -/* 801C8A04 40 82 00 20 */ bne lbl_801C8A24 -/* 801C8A08 80 7E 02 08 */ lwz r3, 0x208(r30) -/* 801C8A0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C8A10 7C 03 00 00 */ cmpw r3, r0 -/* 801C8A14 40 82 00 10 */ bne lbl_801C8A24 -/* 801C8A18 88 1E 03 12 */ lbz r0, 0x312(r30) -/* 801C8A1C 28 00 00 00 */ cmplwi r0, 0 -/* 801C8A20 41 82 00 70 */ beq lbl_801C8A90 -lbl_801C8A24: -/* 801C8A24 90 9E 02 04 */ stw r4, 0x204(r30) -/* 801C8A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C8A2C 90 1E 02 08 */ stw r0, 0x208(r30) -/* 801C8A30 7F C3 F3 78 */ mr r3, r30 -/* 801C8A34 48 00 2B 3D */ bl checkStRoomData__12dMenu_Fmap_cFv -/* 801C8A38 7C 7F 1B 78 */ mr r31, r3 -/* 801C8A3C 80 1E 02 04 */ lwz r0, 0x204(r30) -/* 801C8A40 2C 00 00 00 */ cmpwi r0, 0 -/* 801C8A44 41 80 00 44 */ blt lbl_801C8A88 -/* 801C8A48 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C8A4C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C8A50 48 00 93 25 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -/* 801C8A54 57 E4 04 3E */ clrlwi r4, r31, 0x10 -/* 801C8A58 28 04 FF FF */ cmplwi r4, 0xffff -/* 801C8A5C 41 82 00 10 */ beq lbl_801C8A6C -/* 801C8A60 7F C3 F3 78 */ mr r3, r30 -/* 801C8A64 48 00 3E 1D */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C8A68 48 00 00 28 */ b lbl_801C8A90 -lbl_801C8A6C: -/* 801C8A6C 7F C3 F3 78 */ mr r3, r30 -/* 801C8A70 80 1E 02 04 */ lwz r0, 0x204(r30) -/* 801C8A74 54 00 08 3C */ slwi r0, r0, 1 -/* 801C8A78 7C 9E 02 14 */ add r4, r30, r0 -/* 801C8A7C A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C8A80 48 00 3E 01 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C8A84 48 00 00 0C */ b lbl_801C8A90 -lbl_801C8A88: -/* 801C8A88 7F C3 F3 78 */ mr r3, r30 -/* 801C8A8C 48 00 3E 21 */ bl setAreaNameZero__12dMenu_Fmap_cFv -lbl_801C8A90: -/* 801C8A90 88 1E 03 09 */ lbz r0, 0x309(r30) -/* 801C8A94 28 00 00 01 */ cmplwi r0, 1 -/* 801C8A98 40 82 00 0C */ bne lbl_801C8AA4 -/* 801C8A9C 38 00 00 00 */ li r0, 0 -/* 801C8AA0 98 1E 03 09 */ stb r0, 0x309(r30) -lbl_801C8AA4: -/* 801C8AA4 80 1E 02 04 */ lwz r0, 0x204(r30) -/* 801C8AA8 2C 00 00 00 */ cmpwi r0, 0 -/* 801C8AAC 41 80 00 18 */ blt lbl_801C8AC4 -/* 801C8AB0 7F C3 F3 78 */ mr r3, r30 -/* 801C8AB4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C8AB8 38 A0 00 01 */ li r5, 1 -/* 801C8ABC 48 00 2C 25 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C8AC0 48 00 00 18 */ b lbl_801C8AD8 -lbl_801C8AC4: -/* 801C8AC4 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 801C8AC8 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C8ACC 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C8AD0 38 00 00 00 */ li r0, 0 -/* 801C8AD4 98 03 00 D8 */ stb r0, 0xd8(r3) -lbl_801C8AD8: -/* 801C8AD8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 801C8ADC CB E1 00 40 */ lfd f31, 0x40(r1) -/* 801C8AE0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 801C8AE4 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 801C8AE8 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801C8AEC 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 801C8AF0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801C8AF4 7C 08 03 A6 */ mtlr r0 -/* 801C8AF8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C8AFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/removeAreaData__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/removeAreaData__12dMenu_Fmap_cFv.s deleted file mode 100644 index 8fa5f1882c..0000000000 --- a/asm/d/menu/d_menu_fmap/removeAreaData__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_801CC61C: -/* 801CC61C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CC620 7C 08 02 A6 */ mflr r0 -/* 801CC624 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CC628 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC62C 48 19 5B A5 */ bl _savegpr_26 -/* 801CC630 7C 7F 1B 78 */ mr r31, r3 -/* 801CC634 88 03 03 05 */ lbz r0, 0x305(r3) -/* 801CC638 28 00 00 00 */ cmplwi r0, 0 -/* 801CC63C 40 82 00 0C */ bne lbl_801CC648 -/* 801CC640 38 60 00 01 */ li r3, 1 -/* 801CC644 48 00 01 4C */ b lbl_801CC790 -lbl_801CC648: -/* 801CC648 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801CC64C 28 03 00 00 */ cmplwi r3, 0 -/* 801CC650 41 82 00 14 */ beq lbl_801CC664 -/* 801CC654 41 82 00 08 */ beq lbl_801CC65C -/* 801CC658 48 10 26 E5 */ bl __dl__FPv -lbl_801CC65C: -/* 801CC65C 38 00 00 00 */ li r0, 0 -/* 801CC660 90 1F 00 20 */ stw r0, 0x20(r31) -lbl_801CC664: -/* 801CC664 3B 60 00 00 */ li r27, 0 -/* 801CC668 3B C0 00 00 */ li r30, 0 -/* 801CC66C 7F DD F3 78 */ mr r29, r30 -lbl_801CC670: -/* 801CC670 3B 9E 00 24 */ addi r28, r30, 0x24 -/* 801CC674 7C 7F E0 2E */ lwzx r3, r31, r28 -/* 801CC678 28 03 00 00 */ cmplwi r3, 0 -/* 801CC67C 41 82 00 10 */ beq lbl_801CC68C -/* 801CC680 41 82 00 08 */ beq lbl_801CC688 -/* 801CC684 48 10 26 B9 */ bl __dl__FPv -lbl_801CC688: -/* 801CC688 7F BF E1 2E */ stwx r29, r31, r28 -lbl_801CC68C: -/* 801CC68C 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CC690 2C 1B 00 08 */ cmpwi r27, 8 -/* 801CC694 3B DE 00 04 */ addi r30, r30, 4 -/* 801CC698 41 80 FF D8 */ blt lbl_801CC670 -/* 801CC69C 3B 60 00 00 */ li r27, 0 -/* 801CC6A0 3B C0 00 00 */ li r30, 0 -lbl_801CC6A4: -/* 801CC6A4 7F 9F F2 14 */ add r28, r31, r30 -/* 801CC6A8 83 5C 00 44 */ lwz r26, 0x44(r28) -/* 801CC6AC 48 00 00 28 */ b lbl_801CC6D4 -lbl_801CC6B0: -/* 801CC6B0 83 BA 00 10 */ lwz r29, 0x10(r26) -/* 801CC6B4 7F E3 FB 78 */ mr r3, r31 -/* 801CC6B8 7F 44 D3 78 */ mr r4, r26 -/* 801CC6BC 48 00 00 ED */ bl removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c -/* 801CC6C0 28 1A 00 00 */ cmplwi r26, 0 -/* 801CC6C4 41 82 00 0C */ beq lbl_801CC6D0 -/* 801CC6C8 7F 43 D3 78 */ mr r3, r26 -/* 801CC6CC 48 10 26 71 */ bl __dl__FPv -lbl_801CC6D0: -/* 801CC6D0 7F BA EB 78 */ mr r26, r29 -lbl_801CC6D4: -/* 801CC6D4 28 1A 00 00 */ cmplwi r26, 0 -/* 801CC6D8 40 82 FF D8 */ bne lbl_801CC6B0 -/* 801CC6DC 83 5C 00 6C */ lwz r26, 0x6c(r28) -/* 801CC6E0 48 00 00 28 */ b lbl_801CC708 -lbl_801CC6E4: -/* 801CC6E4 83 BA 00 04 */ lwz r29, 4(r26) -/* 801CC6E8 80 9A 00 00 */ lwz r4, 0(r26) -/* 801CC6EC 28 04 00 00 */ cmplwi r4, 0 -/* 801CC6F0 41 82 00 0C */ beq lbl_801CC6FC -/* 801CC6F4 80 7F 00 04 */ lwz r3, 4(r31) -/* 801CC6F8 48 10 1E 51 */ bl free__7JKRHeapFPv -lbl_801CC6FC: -/* 801CC6FC 7F 43 D3 78 */ mr r3, r26 -/* 801CC700 48 10 26 3D */ bl __dl__FPv -/* 801CC704 7F BA EB 78 */ mr r26, r29 -lbl_801CC708: -/* 801CC708 28 1A 00 00 */ cmplwi r26, 0 -/* 801CC70C 40 82 FF D8 */ bne lbl_801CC6E4 -/* 801CC710 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CC714 2C 1B 00 08 */ cmpwi r27, 8 -/* 801CC718 3B DE 00 04 */ addi r30, r30, 4 -/* 801CC71C 41 80 FF 88 */ blt lbl_801CC6A4 -/* 801CC720 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CC724 48 00 49 D1 */ bl deleteSpotPane__18dMenu_Fmap2DBack_cFv -/* 801CC728 38 80 00 00 */ li r4, 0 -/* 801CC72C 90 9F 00 20 */ stw r4, 0x20(r31) -/* 801CC730 38 60 00 00 */ li r3, 0 -/* 801CC734 38 00 00 08 */ li r0, 8 -/* 801CC738 7C 09 03 A6 */ mtctr r0 -lbl_801CC73C: -/* 801CC73C 7C BF 1A 14 */ add r5, r31, r3 -/* 801CC740 90 85 00 24 */ stw r4, 0x24(r5) -/* 801CC744 90 85 00 44 */ stw r4, 0x44(r5) -/* 801CC748 90 85 00 6C */ stw r4, 0x6c(r5) -/* 801CC74C 38 63 00 04 */ addi r3, r3, 4 -/* 801CC750 42 00 FF EC */ bdnz lbl_801CC73C -/* 801CC754 3B 40 00 00 */ li r26, 0 -/* 801CC758 3B C0 00 00 */ li r30, 0 -/* 801CC75C 3C 60 80 39 */ lis r3, d_menu_d_menu_fmap__stringBase0@ha /* 0x803960E8@ha */ -/* 801CC760 3B A3 60 E8 */ addi r29, r3, d_menu_d_menu_fmap__stringBase0@l /* 0x803960E8@l */ -lbl_801CC764: -/* 801CC764 38 7E 02 60 */ addi r3, r30, 0x260 -/* 801CC768 7C 7F 1A 14 */ add r3, r31, r3 -/* 801CC76C 7F A4 EB 78 */ mr r4, r29 -/* 801CC770 48 19 C3 BD */ bl strcpy -/* 801CC774 3B 5A 00 01 */ addi r26, r26, 1 -/* 801CC778 2C 1A 00 14 */ cmpwi r26, 0x14 -/* 801CC77C 3B DE 00 08 */ addi r30, r30, 8 -/* 801CC780 41 80 FF E4 */ blt lbl_801CC764 -/* 801CC784 38 00 00 00 */ li r0, 0 -/* 801CC788 98 1F 03 05 */ stb r0, 0x305(r31) -/* 801CC78C 38 60 00 01 */ li r3, 1 -lbl_801CC790: -/* 801CC790 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC794 48 19 5A 89 */ bl _restgpr_26 -/* 801CC798 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CC79C 7C 08 03 A6 */ mtlr r0 -/* 801CC7A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CC7A4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c.s b/asm/d/menu/d_menu_fmap/removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c.s deleted file mode 100644 index 21a4fd4ac8..0000000000 --- a/asm/d/menu/d_menu_fmap/removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801CC7A8: -/* 801CC7A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CC7AC 7C 08 02 A6 */ mflr r0 -/* 801CC7B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CC7B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC7B8 48 19 5A 21 */ bl _savegpr_28 -/* 801CC7BC 7C 7C 1B 78 */ mr r28, r3 -/* 801CC7C0 83 A4 00 0C */ lwz r29, 0xc(r4) -/* 801CC7C4 48 00 00 74 */ b lbl_801CC838 -lbl_801CC7C8: -/* 801CC7C8 83 FD 00 08 */ lwz r31, 8(r29) -/* 801CC7CC 83 DD 00 00 */ lwz r30, 0(r29) -/* 801CC7D0 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801CC7D4 28 04 00 00 */ cmplwi r4, 0 -/* 801CC7D8 41 82 00 0C */ beq lbl_801CC7E4 -/* 801CC7DC 80 7C 00 04 */ lwz r3, 4(r28) -/* 801CC7E0 48 10 1D 69 */ bl free__7JKRHeapFPv -lbl_801CC7E4: -/* 801CC7E4 28 1E 00 00 */ cmplwi r30, 0 -/* 801CC7E8 41 82 00 0C */ beq lbl_801CC7F4 -/* 801CC7EC 7F C3 F3 78 */ mr r3, r30 -/* 801CC7F0 48 10 25 4D */ bl __dl__FPv -lbl_801CC7F4: -/* 801CC7F4 28 1D 00 00 */ cmplwi r29, 0 -/* 801CC7F8 41 82 00 3C */ beq lbl_801CC834 -/* 801CC7FC 83 DD 00 04 */ lwz r30, 4(r29) -/* 801CC800 28 1E 00 00 */ cmplwi r30, 0 -/* 801CC804 41 82 00 28 */ beq lbl_801CC82C -/* 801CC808 41 82 00 24 */ beq lbl_801CC82C -/* 801CC80C 7F C3 F3 78 */ mr r3, r30 -/* 801CC810 3C 80 80 04 */ lis r4, __dt__26fmpTresTypeGroupDataList_cFv@ha /* 0x8003EB10@ha */ -/* 801CC814 38 84 EB 10 */ addi r4, r4, __dt__26fmpTresTypeGroupDataList_cFv@l /* 0x8003EB10@l */ -/* 801CC818 38 A0 00 08 */ li r5, 8 -/* 801CC81C 38 C0 00 11 */ li r6, 0x11 -/* 801CC820 48 19 54 C9 */ bl __destroy_arr -/* 801CC824 7F C3 F3 78 */ mr r3, r30 -/* 801CC828 48 10 25 15 */ bl __dl__FPv -lbl_801CC82C: -/* 801CC82C 7F A3 EB 78 */ mr r3, r29 -/* 801CC830 48 10 25 0D */ bl __dl__FPv -lbl_801CC834: -/* 801CC834 7F FD FB 78 */ mr r29, r31 -lbl_801CC838: -/* 801CC838 28 1D 00 00 */ cmplwi r29, 0 -/* 801CC83C 40 82 FF 8C */ bne lbl_801CC7C8 -/* 801CC840 38 60 00 01 */ li r3, 1 -/* 801CC844 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC848 48 19 59 DD */ bl _restgpr_28 -/* 801CC84C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CC850 7C 08 03 A6 */ mtlr r0 -/* 801CC854 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CC858 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/resetRoomDataBit__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/resetRoomDataBit__12dMenu_Fmap_cFv.s deleted file mode 100644 index 28d223ea6d..0000000000 --- a/asm/d/menu/d_menu_fmap/resetRoomDataBit__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801CCAC4: -/* 801CCAC4 38 80 00 00 */ li r4, 0 -/* 801CCAC8 7C 85 23 78 */ mr r5, r4 -/* 801CCACC 38 00 00 02 */ li r0, 2 -/* 801CCAD0 7C 09 03 A6 */ mtctr r0 -lbl_801CCAD4: -/* 801CCAD4 38 04 01 F8 */ addi r0, r4, 0x1f8 -/* 801CCAD8 7C A3 01 2E */ stwx r5, r3, r0 -/* 801CCADC 38 84 00 04 */ addi r4, r4, 4 -/* 801CCAE0 42 00 FF F4 */ bdnz lbl_801CCAD4 -/* 801CCAE4 38 A0 00 00 */ li r5, 0 -/* 801CCAE8 38 80 00 00 */ li r4, 0 -/* 801CCAEC 38 00 00 08 */ li r0, 8 -/* 801CCAF0 7C 09 03 A6 */ mtctr r0 -lbl_801CCAF4: -/* 801CCAF4 38 05 02 58 */ addi r0, r5, 0x258 -/* 801CCAF8 7C 83 01 AE */ stbx r4, r3, r0 -/* 801CCAFC 38 A5 00 01 */ addi r5, r5, 1 -/* 801CCB00 42 00 FF F4 */ bdnz lbl_801CCAF4 -/* 801CCB04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s b/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s deleted file mode 100644 index 9e2f005467..0000000000 --- a/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_801CD000: -/* 801CD000 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 801CD004 7C 08 02 A6 */ mflr r0 -/* 801CD008 90 01 00 84 */ stw r0, 0x84(r1) -/* 801CD00C 39 61 00 80 */ addi r11, r1, 0x80 -/* 801CD010 48 19 51 B5 */ bl _savegpr_23 -/* 801CD014 7C 7C 1B 78 */ mr r28, r3 -/* 801CD018 7C 97 23 78 */ mr r23, r4 -/* 801CD01C 7C BD 2B 78 */ mr r29, r5 -/* 801CD020 7C DE 33 78 */ mr r30, r6 -/* 801CD024 7C FF 3B 78 */ mr r31, r7 -/* 801CD028 3C 80 80 3A */ lis r4, __vt__19dMenuFmapIconDisp_c@ha /* 0x803A7D74@ha */ -/* 801CD02C 38 04 7D 74 */ addi r0, r4, __vt__19dMenuFmapIconDisp_c@l /* 0x803A7D74@l */ -/* 801CD030 90 01 00 48 */ stw r0, 0x48(r1) -/* 801CD034 3B 00 00 00 */ li r24, 0 -/* 801CD038 8B 2D 87 E4 */ lbz r25, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801CD03C 7F 39 07 74 */ extsb r25, r25 -/* 801CD040 83 43 02 0C */ lwz r26, 0x20c(r3) -/* 801CD044 48 00 03 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv -/* 801CD048 7C 7B 1B 78 */ mr r27, r3 -/* 801CD04C 7F 83 E3 78 */ mr r3, r28 -/* 801CD050 48 00 03 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801CD054 7C 64 1B 78 */ mr r4, r3 -/* 801CD058 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD05C 7F 65 DB 78 */ mr r5, r27 -/* 801CD060 7E E6 BB 78 */ mr r6, r23 -/* 801CD064 7F 47 D3 78 */ mr r7, r26 -/* 801CD068 7F 28 CB 78 */ mr r8, r25 -/* 801CD06C 4B E7 10 A9 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii -/* 801CD070 48 00 00 70 */ b lbl_801CD0E0 -lbl_801CD074: -/* 801CD074 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD078 4B E7 16 71 */ bl isDrawDisp__19dMenuFmapIconDisp_cFv -/* 801CD07C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD080 41 82 00 50 */ beq lbl_801CD0D0 -/* 801CD084 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD088 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CD08C 38 A1 00 0C */ addi r5, r1, 0xc -/* 801CD090 7F C6 F3 78 */ mr r6, r30 -/* 801CD094 7F E7 FB 78 */ mr r7, r31 -/* 801CD098 39 01 00 08 */ addi r8, r1, 8 -/* 801CD09C 4B E7 14 DD */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s -/* 801CD0A0 7F 83 E3 78 */ mr r3, r28 -/* 801CD0A4 80 81 00 10 */ lwz r4, 0x10(r1) -/* 801CD0A8 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 801CD0AC 4B FF E2 15 */ bl isRoomCheck__12dMenu_Fmap_cFii -/* 801CD0B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD0B4 41 82 00 1C */ beq lbl_801CD0D0 -/* 801CD0B8 80 61 00 08 */ lwz r3, 8(r1) -/* 801CD0BC 88 03 00 10 */ lbz r0, 0x10(r3) -/* 801CD0C0 7C 00 E8 00 */ cmpw r0, r29 -/* 801CD0C4 40 82 00 0C */ bne lbl_801CD0D0 -/* 801CD0C8 3B 00 00 01 */ li r24, 1 -/* 801CD0CC 48 00 00 24 */ b lbl_801CD0F0 -lbl_801CD0D0: -/* 801CD0D0 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD0D4 4B E7 13 BD */ bl nextData__22dMenuFmapIconPointer_cFv -/* 801CD0D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD0DC 40 82 00 14 */ bne lbl_801CD0F0 -lbl_801CD0E0: -/* 801CD0E0 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD0E4 4B E7 14 2D */ bl getValidData__22dMenuFmapIconPointer_cFv -/* 801CD0E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD0EC 41 82 FF 88 */ beq lbl_801CD074 -lbl_801CD0F0: -/* 801CD0F0 7F 03 C3 78 */ mr r3, r24 -/* 801CD0F4 39 61 00 80 */ addi r11, r1, 0x80 -/* 801CD0F8 48 19 51 19 */ bl _restgpr_23 -/* 801CD0FC 80 01 00 84 */ lwz r0, 0x84(r1) -/* 801CD100 7C 08 03 A6 */ mtlr r0 -/* 801CD104 38 21 00 80 */ addi r1, r1, 0x80 -/* 801CD108 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/searchPortalStageID__12dMenu_Fmap_cFPc.s b/asm/d/menu/d_menu_fmap/searchPortalStageID__12dMenu_Fmap_cFPc.s deleted file mode 100644 index 93106eccbe..0000000000 --- a/asm/d/menu/d_menu_fmap/searchPortalStageID__12dMenu_Fmap_cFPc.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_801CD380: -/* 801CD380 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CD384 7C 08 02 A6 */ mflr r0 -/* 801CD388 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CD38C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD390 48 19 4E 49 */ bl _savegpr_28 -/* 801CD394 7C 7C 1B 78 */ mr r28, r3 -/* 801CD398 7C 9D 23 78 */ mr r29, r4 -/* 801CD39C 3B C0 00 00 */ li r30, 0 -/* 801CD3A0 3B E0 00 00 */ li r31, 0 -lbl_801CD3A4: -/* 801CD3A4 7F A3 EB 78 */ mr r3, r29 -/* 801CD3A8 38 9F 02 60 */ addi r4, r31, 0x260 -/* 801CD3AC 7C 9C 22 14 */ add r4, r28, r4 -/* 801CD3B0 48 19 B5 E5 */ bl strcmp -/* 801CD3B4 2C 03 00 00 */ cmpwi r3, 0 -/* 801CD3B8 40 82 00 0C */ bne lbl_801CD3C4 -/* 801CD3BC 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 801CD3C0 48 00 00 18 */ b lbl_801CD3D8 -lbl_801CD3C4: -/* 801CD3C4 3B DE 00 01 */ addi r30, r30, 1 -/* 801CD3C8 2C 1E 00 14 */ cmpwi r30, 0x14 -/* 801CD3CC 3B FF 00 08 */ addi r31, r31, 8 -/* 801CD3D0 41 80 FF D4 */ blt lbl_801CD3A4 -/* 801CD3D4 38 60 00 FF */ li r3, 0xff -lbl_801CD3D8: -/* 801CD3D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD3DC 48 19 4E 49 */ bl _restgpr_28 -/* 801CD3E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CD3E4 7C 08 03 A6 */ mtlr r0 -/* 801CD3E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CD3EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/setAreaNameZero__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/setAreaNameZero__12dMenu_Fmap_cFv.s deleted file mode 100644 index dd0e234606..0000000000 --- a/asm/d/menu/d_menu_fmap/setAreaNameZero__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801CC8AC: -/* 801CC8AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CC8B0 7C 08 02 A6 */ mflr r0 -/* 801CC8B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CC8B8 38 00 00 00 */ li r0, 0 -/* 801CC8BC 98 03 03 13 */ stb r0, 0x313(r3) -/* 801CC8C0 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CC8C4 38 80 00 00 */ li r4, 0 -/* 801CC8C8 48 00 A7 49 */ bl setAreaNameString__17dMenu_Fmap2DTop_cFUl -/* 801CC8CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CC8D0 7C 08 03 A6 */ mtlr r0 -/* 801CC8D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC8D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/setAreaName__12dMenu_Fmap_cFUl.s b/asm/d/menu/d_menu_fmap/setAreaName__12dMenu_Fmap_cFUl.s deleted file mode 100644 index 302c7b0172..0000000000 --- a/asm/d/menu/d_menu_fmap/setAreaName__12dMenu_Fmap_cFUl.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801CC880: -/* 801CC880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CC884 7C 08 02 A6 */ mflr r0 -/* 801CC888 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CC88C 38 00 00 01 */ li r0, 1 -/* 801CC890 98 03 03 13 */ stb r0, 0x313(r3) -/* 801CC894 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CC898 48 00 A7 79 */ bl setAreaNameString__17dMenu_Fmap2DTop_cFUl -/* 801CC89C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CC8A0 7C 08 03 A6 */ mtlr r0 -/* 801CC8A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC8A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/setFlash__12dMenu_Fmap_cFUcb.s b/asm/d/menu/d_menu_fmap/setFlash__12dMenu_Fmap_cFUcb.s deleted file mode 100644 index 209f55f4ce..0000000000 --- a/asm/d/menu/d_menu_fmap/setFlash__12dMenu_Fmap_cFUcb.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801CB6E0: -/* 801CB6E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CB6E4 7C 08 02 A6 */ mflr r0 -/* 801CB6E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CB6EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB6F0 48 19 6A ED */ bl _savegpr_29 -/* 801CB6F4 7C 7D 1B 78 */ mr r29, r3 -/* 801CB6F8 7C 9E 23 78 */ mr r30, r4 -/* 801CB6FC 7C BF 2B 78 */ mr r31, r5 -/* 801CB700 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801CB704 38 9D 02 10 */ addi r4, r29, 0x210 -/* 801CB708 48 00 66 49 */ bl mapBlink__18dMenu_Fmap2DBack_cFPs -/* 801CB70C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801CB710 41 82 00 28 */ beq lbl_801CB738 -/* 801CB714 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB718 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CB71C 80 7D 00 B8 */ lwz r3, 0xb8(r29) -/* 801CB720 38 84 00 01 */ addi r4, r4, 1 -/* 801CB724 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 801CB728 80 DD 00 C0 */ lwz r6, 0xc0(r29) -/* 801CB72C 88 FD 03 0E */ lbz r7, 0x30e(r29) -/* 801CB730 48 00 3A B1 */ bl setFlashOn__15dMenu_FmapMap_cFiiPUci -/* 801CB734 48 00 00 24 */ b lbl_801CB758 -lbl_801CB738: -/* 801CB738 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB73C 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CB740 80 7D 00 B8 */ lwz r3, 0xb8(r29) -/* 801CB744 38 84 00 01 */ addi r4, r4, 1 -/* 801CB748 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 801CB74C 38 C0 00 00 */ li r6, 0 -/* 801CB750 38 E0 00 00 */ li r7, 0 -/* 801CB754 48 00 3A 8D */ bl setFlashOn__15dMenu_FmapMap_cFiiPUci -lbl_801CB758: -/* 801CB758 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB75C 48 19 6A CD */ bl _restgpr_29 -/* 801CB760 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CB764 7C 08 03 A6 */ mtlr r0 -/* 801CB768 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CB76C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/setProcess__12dMenu_Fmap_cFUc.s b/asm/d/menu/d_menu_fmap/setProcess__12dMenu_Fmap_cFUc.s deleted file mode 100644 index 25ed44a6e5..0000000000 --- a/asm/d/menu/d_menu_fmap/setProcess__12dMenu_Fmap_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801CB6D0: -/* 801CB6D0 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801CB6D4 98 03 03 01 */ stb r0, 0x301(r3) -/* 801CB6D8 98 83 03 00 */ stb r4, 0x300(r3) -/* 801CB6DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/setTitleName__12dMenu_Fmap_cFUl.s b/asm/d/menu/d_menu_fmap/setTitleName__12dMenu_Fmap_cFUl.s deleted file mode 100644 index 18f9541285..0000000000 --- a/asm/d/menu/d_menu_fmap/setTitleName__12dMenu_Fmap_cFUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801CC85C: -/* 801CC85C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CC860 7C 08 02 A6 */ mflr r0 -/* 801CC864 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CC868 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CC86C 48 00 A6 CD */ bl setTitleNameString__17dMenu_Fmap2DTop_cFUl -/* 801CC870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CC874 7C 08 03 A6 */ mtlr r0 -/* 801CC878 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC87C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/spot_map_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/spot_map_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index b38b38d14d..0000000000 --- a/asm/d/menu/d_menu_fmap/spot_map_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_801C950C: -/* 801C950C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C9510 7C 08 02 A6 */ mflr r0 -/* 801C9514 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C9518 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C951C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9520 C0 02 A7 24 */ lfs f0, lit_3995(r2) -/* 801C9524 D0 03 01 EC */ stfs f0, 0x1ec(r3) -/* 801C9528 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C952C 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801C9530 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9534 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9538 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C953C 48 00 33 21 */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801C9540 38 00 00 01 */ li r0, 1 -/* 801C9544 98 1F 03 12 */ stb r0, 0x312(r31) -/* 801C9548 88 1F 03 13 */ lbz r0, 0x313(r31) -/* 801C954C 28 00 00 00 */ cmplwi r0, 0 -/* 801C9550 40 82 00 10 */ bne lbl_801C9560 -/* 801C9554 7F E3 FB 78 */ mr r3, r31 -/* 801C9558 48 00 33 55 */ bl setAreaNameZero__12dMenu_Fmap_cFv -/* 801C955C 48 00 00 20 */ b lbl_801C957C -lbl_801C9560: -/* 801C9560 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9564 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801C9568 7F E3 FB 78 */ mr r3, r31 -/* 801C956C 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801C9570 7C 9F 02 14 */ add r4, r31, r0 -/* 801C9574 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C9578 48 00 33 09 */ bl setAreaName__12dMenu_Fmap_cFUl -lbl_801C957C: -/* 801C957C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9580 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801C9584 90 1F 02 04 */ stw r0, 0x204(r31) -/* 801C9588 38 00 FF FF */ li r0, -1 -/* 801C958C 90 1F 02 08 */ stw r0, 0x208(r31) -/* 801C9590 38 00 00 00 */ li r0, 0 -/* 801C9594 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9598 98 03 12 38 */ stb r0, 0x1238(r3) -/* 801C959C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95A0 38 80 00 01 */ li r4, 1 -/* 801C95A4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C95A8 48 00 E1 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C95AC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95B0 38 80 00 02 */ li r4, 2 -/* 801C95B4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C95B8 48 00 E1 5D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C95BC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95C0 38 80 05 22 */ li r4, 0x522 -/* 801C95C4 38 A0 00 FF */ li r5, 0xff -/* 801C95C8 48 00 DC 49 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C95CC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95D0 38 80 00 00 */ li r4, 0 -/* 801C95D4 38 A0 00 FF */ li r5, 0xff -/* 801C95D8 48 00 DC FD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C95DC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95E0 38 80 05 29 */ li r4, 0x529 -/* 801C95E4 38 A0 00 FF */ li r5, 0xff -/* 801C95E8 48 00 DB 01 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C95EC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95F0 38 80 05 28 */ li r4, 0x528 -/* 801C95F4 48 00 DE F9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801C95F8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C95FC 38 80 03 F9 */ li r4, 0x3f9 -/* 801C9600 48 00 DD 99 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801C9604 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C9608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C960C 7C 08 03 A6 */ mtlr r0 -/* 801C9610 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9614 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/spot_map_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/spot_map_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index d6f76b0644..0000000000 --- a/asm/d/menu/d_menu_fmap/spot_map_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,286 +0,0 @@ -lbl_801C9618: -/* 801C9618 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801C961C 7C 08 02 A6 */ mflr r0 -/* 801C9620 90 01 00 44 */ stw r0, 0x44(r1) -/* 801C9624 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801C9628 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801C962C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 801C9630 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 801C9634 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9638 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801C963C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9640 48 03 0A 11 */ bl dMw_B_TRIGGER__Fv -/* 801C9644 2C 03 00 00 */ cmpwi r3, 0 -/* 801C9648 41 82 00 50 */ beq lbl_801C9698 -/* 801C964C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C9650 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C9654 A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C9658 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C965C 40 82 00 3C */ bne lbl_801C9698 -/* 801C9660 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C9664 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C9668 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C966C 28 00 00 01 */ cmplwi r0, 1 -/* 801C9670 41 82 00 28 */ beq lbl_801C9698 -/* 801C9674 7F E3 FB 78 */ mr r3, r31 -/* 801C9678 38 80 00 0C */ li r4, 0xc -/* 801C967C 48 00 20 55 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9680 88 1F 03 09 */ lbz r0, 0x309(r31) -/* 801C9684 28 00 00 01 */ cmplwi r0, 1 -/* 801C9688 40 82 03 60 */ bne lbl_801C99E8 -/* 801C968C 38 00 00 00 */ li r0, 0 -/* 801C9690 98 1F 03 09 */ stb r0, 0x309(r31) -/* 801C9694 48 00 03 54 */ b lbl_801C99E8 -lbl_801C9698: -/* 801C9698 48 03 09 A5 */ bl dMw_A_TRIGGER__Fv -/* 801C969C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C96A0 41 82 00 44 */ beq lbl_801C96E4 -/* 801C96A4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C96A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C96AC A0 03 00 B2 */ lhz r0, 0xb2(r3) -/* 801C96B0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 801C96B4 40 82 00 30 */ bne lbl_801C96E4 -/* 801C96B8 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C96BC 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 801C96C0 88 03 07 72 */ lbz r0, 0x772(r3) -/* 801C96C4 28 00 00 01 */ cmplwi r0, 1 -/* 801C96C8 41 82 00 1C */ beq lbl_801C96E4 -/* 801C96CC 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C96D0 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C96D4 38 A0 00 01 */ li r5, 1 -/* 801C96D8 38 C0 00 01 */ li r6, 1 -/* 801C96DC 48 00 B7 A5 */ bl stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb -/* 801C96E0 48 00 03 08 */ b lbl_801C99E8 -lbl_801C96E4: -/* 801C96E4 48 03 09 81 */ bl dMw_Z_TRIGGER__Fv -/* 801C96E8 2C 03 00 00 */ cmpwi r3, 0 -/* 801C96EC 41 82 01 E0 */ beq lbl_801C98CC -/* 801C96F0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C96F4 48 00 E9 95 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C96F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C96FC 41 82 01 D0 */ beq lbl_801C98CC -/* 801C9700 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9704 48 00 E2 91 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801C9708 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C970C 41 82 00 60 */ beq lbl_801C976C -/* 801C9710 38 00 00 01 */ li r0, 1 -/* 801C9714 98 1F 03 07 */ stb r0, 0x307(r31) -/* 801C9718 7F E3 FB 78 */ mr r3, r31 -/* 801C971C 38 80 00 0C */ li r4, 0xc -/* 801C9720 48 00 1F B1 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9724 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9728 38 80 05 2A */ li r4, 0x52a -/* 801C972C 38 A0 00 FF */ li r5, 0xff -/* 801C9730 48 00 D9 B9 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801C9734 38 00 00 47 */ li r0, 0x47 -/* 801C9738 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C973C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C9740 38 81 00 0C */ addi r4, r1, 0xc -/* 801C9744 38 A0 00 00 */ li r5, 0 -/* 801C9748 38 C0 00 00 */ li r6, 0 -/* 801C974C 38 E0 00 00 */ li r7, 0 -/* 801C9750 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C9754 FC 40 08 90 */ fmr f2, f1 -/* 801C9758 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C975C FC 80 18 90 */ fmr f4, f3 -/* 801C9760 39 00 00 00 */ li r8, 0 -/* 801C9764 48 0E 22 21 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C9768 48 00 02 80 */ b lbl_801C99E8 -lbl_801C976C: -/* 801C976C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9770 80 9F 00 08 */ lwz r4, 8(r31) -/* 801C9774 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801C9778 48 00 DE C9 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl -/* 801C977C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C9780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C9784 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 801C9788 7F C3 F3 78 */ mr r3, r30 -/* 801C978C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C9790 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C9794 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C9798 4B E6 B2 25 */ bl isEventBit__11dSv_event_cCFUs -/* 801C979C 2C 03 00 00 */ cmpwi r3, 0 -/* 801C97A0 41 82 00 44 */ beq lbl_801C97E4 -/* 801C97A4 7F C3 F3 78 */ mr r3, r30 -/* 801C97A8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C97AC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C97B0 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C97B4 4B E6 B2 09 */ bl isEventBit__11dSv_event_cCFUs -/* 801C97B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801C97BC 40 82 00 28 */ bne lbl_801C97E4 -/* 801C97C0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C97C4 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C97C8 38 80 08 5D */ li r4, 0x85d -/* 801C97CC 38 A0 00 00 */ li r5, 0 -/* 801C97D0 38 C0 00 00 */ li r6, 0 -/* 801C97D4 38 E0 00 FF */ li r7, 0xff -/* 801C97D8 39 00 00 01 */ li r8, 1 -/* 801C97DC 48 07 4D 7D */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C97E0 48 00 00 A0 */ b lbl_801C9880 -lbl_801C97E4: -/* 801C97E4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C97E8 48 00 E3 71 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv -/* 801C97EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C97F0 40 82 00 3C */ bne lbl_801C982C -/* 801C97F4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C97F8 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C97FC 38 80 07 DE */ li r4, 0x7de -/* 801C9800 38 A0 00 00 */ li r5, 0 -/* 801C9804 38 C0 00 00 */ li r6, 0 -/* 801C9808 38 E0 00 FF */ li r7, 0xff -/* 801C980C 39 00 00 01 */ li r8, 1 -/* 801C9810 48 07 4D 49 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C9814 7F C3 F3 78 */ mr r3, r30 -/* 801C9818 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801C981C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801C9820 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C9824 4B E6 B1 69 */ bl onEventBit__11dSv_event_cFUs -/* 801C9828 48 00 00 58 */ b lbl_801C9880 -lbl_801C982C: -/* 801C982C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9830 48 00 E2 85 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv -/* 801C9834 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C9838 40 82 00 28 */ bne lbl_801C9860 -/* 801C983C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9840 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C9844 38 80 07 DD */ li r4, 0x7dd -/* 801C9848 38 A0 00 00 */ li r5, 0 -/* 801C984C 38 C0 00 00 */ li r6, 0 -/* 801C9850 38 E0 00 FF */ li r7, 0xff -/* 801C9854 39 00 00 01 */ li r8, 1 -/* 801C9858 48 07 4D 01 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801C985C 48 00 00 24 */ b lbl_801C9880 -lbl_801C9860: -/* 801C9860 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9864 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C9868 38 80 05 1D */ li r4, 0x51d -/* 801C986C 38 A0 00 00 */ li r5, 0 -/* 801C9870 38 C0 00 00 */ li r6, 0 -/* 801C9874 38 E0 00 FF */ li r7, 0xff -/* 801C9878 39 00 00 01 */ li r8, 1 -/* 801C987C 48 07 4C DD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -lbl_801C9880: -/* 801C9880 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801C9884 98 1F 03 02 */ stb r0, 0x302(r31) -/* 801C9888 7F E3 FB 78 */ mr r3, r31 -/* 801C988C 38 80 00 0A */ li r4, 0xa -/* 801C9890 48 00 1E 41 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C9894 38 00 00 4A */ li r0, 0x4a -/* 801C9898 90 01 00 08 */ stw r0, 8(r1) -/* 801C989C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C98A0 38 81 00 08 */ addi r4, r1, 8 -/* 801C98A4 38 A0 00 00 */ li r5, 0 -/* 801C98A8 38 C0 00 00 */ li r6, 0 -/* 801C98AC 38 E0 00 00 */ li r7, 0 -/* 801C98B0 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C98B4 FC 40 08 90 */ fmr f2, f1 -/* 801C98B8 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C98BC FC 80 18 90 */ fmr f4, f3 -/* 801C98C0 39 00 00 00 */ li r8, 0 -/* 801C98C4 48 0E 20 C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C98C8 48 00 01 20 */ b lbl_801C99E8 -lbl_801C98CC: -/* 801C98CC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801C98D0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801C98D4 88 03 02 F8 */ lbz r0, 0x2f8(r3) -/* 801C98D8 28 00 00 00 */ cmplwi r0, 0 -/* 801C98DC 41 82 00 1C */ beq lbl_801C98F8 -/* 801C98E0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C98E4 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C98E8 48 00 78 61 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C98EC 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C98F0 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C98F4 48 00 7B 85 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -lbl_801C98F8: -/* 801C98F8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C98FC 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C9900 38 A0 00 01 */ li r5, 1 -/* 801C9904 38 C0 00 01 */ li r6, 1 -/* 801C9908 48 00 B5 79 */ bl stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb -/* 801C990C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9910 48 00 8D 69 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801C9914 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C9918 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801C991C C0 02 A7 58 */ lfs f0, lit_4939(r2) -/* 801C9920 EF E1 00 28 */ fsubs f31, f1, f0 -/* 801C9924 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9928 48 00 8D A1 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801C992C C0 02 A7 5C */ lfs f0, lit_4940(r2) -/* 801C9930 EF C1 00 28 */ fsubs f30, f1, f0 -/* 801C9934 83 DF 02 0C */ lwz r30, 0x20c(r31) -/* 801C9938 7F E3 FB 78 */ mr r3, r31 -/* 801C993C 48 00 3A 15 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv -/* 801C9940 7C 64 1B 78 */ mr r4, r3 -/* 801C9944 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C9948 FC 20 F8 90 */ fmr f1, f31 -/* 801C994C FC 40 F0 90 */ fmr f2, f30 -/* 801C9950 7F C5 F3 78 */ mr r5, r30 -/* 801C9954 38 C1 00 14 */ addi r6, r1, 0x14 -/* 801C9958 38 E1 00 10 */ addi r7, r1, 0x10 -/* 801C995C 48 00 4A 65 */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi -/* 801C9960 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801C9964 80 61 00 14 */ lwz r3, 0x14(r1) -/* 801C9968 7C 00 18 00 */ cmpw r0, r3 -/* 801C996C 40 82 00 10 */ bne lbl_801C997C -/* 801C9970 88 1F 03 12 */ lbz r0, 0x312(r31) -/* 801C9974 28 00 00 00 */ cmplwi r0, 0 -/* 801C9978 41 82 00 5C */ beq lbl_801C99D4 -lbl_801C997C: -/* 801C997C 90 7F 02 04 */ stw r3, 0x204(r31) -/* 801C9980 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801C9984 90 1F 02 08 */ stw r0, 0x208(r31) -/* 801C9988 7F E3 FB 78 */ mr r3, r31 -/* 801C998C 48 00 1B E5 */ bl checkStRoomData__12dMenu_Fmap_cFv -/* 801C9990 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801C9994 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9998 41 80 00 34 */ blt lbl_801C99CC -/* 801C999C 54 64 04 3E */ clrlwi r4, r3, 0x10 -/* 801C99A0 28 04 FF FF */ cmplwi r4, 0xffff -/* 801C99A4 41 82 00 10 */ beq lbl_801C99B4 -/* 801C99A8 7F E3 FB 78 */ mr r3, r31 -/* 801C99AC 48 00 2E D5 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C99B0 48 00 00 24 */ b lbl_801C99D4 -lbl_801C99B4: -/* 801C99B4 7F E3 FB 78 */ mr r3, r31 -/* 801C99B8 54 00 08 3C */ slwi r0, r0, 1 -/* 801C99BC 7C 9F 02 14 */ add r4, r31, r0 -/* 801C99C0 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C99C4 48 00 2E BD */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801C99C8 48 00 00 0C */ b lbl_801C99D4 -lbl_801C99CC: -/* 801C99CC 7F E3 FB 78 */ mr r3, r31 -/* 801C99D0 48 00 2E DD */ bl setAreaNameZero__12dMenu_Fmap_cFv -lbl_801C99D4: -/* 801C99D4 88 1F 03 09 */ lbz r0, 0x309(r31) -/* 801C99D8 28 00 00 01 */ cmplwi r0, 1 -/* 801C99DC 40 82 00 0C */ bne lbl_801C99E8 -/* 801C99E0 38 00 00 00 */ li r0, 0 -/* 801C99E4 98 1F 03 09 */ stb r0, 0x309(r31) -lbl_801C99E8: -/* 801C99E8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C99EC 48 00 7E 6D */ bl zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv -/* 801C99F0 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801C99F4 2C 00 00 00 */ cmpwi r0, 0 -/* 801C99F8 41 80 00 18 */ blt lbl_801C9A10 -/* 801C99FC 7F E3 FB 78 */ mr r3, r31 -/* 801C9A00 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C9A04 38 A0 00 01 */ li r5, 1 -/* 801C9A08 48 00 1C D9 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C9A0C 48 00 00 18 */ b lbl_801C9A24 -lbl_801C9A10: -/* 801C9A10 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C9A14 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C9A18 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C9A1C 38 00 00 00 */ li r0, 0 -/* 801C9A20 98 03 00 D8 */ stb r0, 0xd8(r3) -lbl_801C9A24: -/* 801C9A24 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801C9A28 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801C9A2C E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 801C9A30 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 801C9A34 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C9A38 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801C9A3C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801C9A40 7C 08 03 A6 */ mtlr r0 -/* 801C9A44 38 21 00 40 */ addi r1, r1, 0x40 -/* 801C9A48 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/tableArrowPosInit__12dMenu_Fmap_cFb.s b/asm/d/menu/d_menu_fmap/tableArrowPosInit__12dMenu_Fmap_cFb.s deleted file mode 100644 index 8ecefea621..0000000000 --- a/asm/d/menu/d_menu_fmap/tableArrowPosInit__12dMenu_Fmap_cFb.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_801CD5CC: -/* 801CD5CC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CD5D0 7C 08 02 A6 */ mflr r0 -/* 801CD5D4 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CD5D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CD5DC 48 19 4B FD */ bl _savegpr_28 -/* 801CD5E0 7C 7E 1B 78 */ mr r30, r3 -/* 801CD5E4 7C 9F 23 78 */ mr r31, r4 -/* 801CD5E8 3B 80 FF FF */ li r28, -1 -/* 801CD5EC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CD5F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CD5F4 88 03 00 E1 */ lbz r0, 0xe1(r3) -/* 801CD5F8 2C 00 00 02 */ cmpwi r0, 2 -/* 801CD5FC 41 82 00 9C */ beq lbl_801CD698 -/* 801CD600 40 80 00 10 */ bge lbl_801CD610 -/* 801CD604 2C 00 00 01 */ cmpwi r0, 1 -/* 801CD608 40 80 00 9C */ bge lbl_801CD6A4 -/* 801CD60C 48 00 00 A0 */ b lbl_801CD6AC -lbl_801CD610: -/* 801CD610 2C 00 00 04 */ cmpwi r0, 4 -/* 801CD614 40 80 00 98 */ bge lbl_801CD6AC -/* 801CD618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CD61C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CD620 3B A3 07 F0 */ addi r29, r3, 0x7f0 -/* 801CD624 7F A3 EB 78 */ mr r3, r29 -/* 801CD628 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801CD62C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801CD630 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801CD634 4B E6 73 89 */ bl isEventBit__11dSv_event_cCFUs -/* 801CD638 2C 03 00 00 */ cmpwi r3, 0 -/* 801CD63C 41 82 00 20 */ beq lbl_801CD65C -/* 801CD640 7F A3 EB 78 */ mr r3, r29 -/* 801CD644 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801CD648 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801CD64C A0 84 00 CE */ lhz r4, 0xce(r4) -/* 801CD650 4B E6 73 6D */ bl isEventBit__11dSv_event_cCFUs -/* 801CD654 2C 03 00 00 */ cmpwi r3, 0 -/* 801CD658 40 82 00 34 */ bne lbl_801CD68C -lbl_801CD65C: -/* 801CD65C 3B 80 00 00 */ li r28, 0 -/* 801CD660 7F A3 EB 78 */ mr r3, r29 -/* 801CD664 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801CD668 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801CD66C A0 84 02 10 */ lhz r4, 0x210(r4) -/* 801CD670 4B E6 73 4D */ bl isEventBit__11dSv_event_cCFUs -/* 801CD674 2C 03 00 00 */ cmpwi r3, 0 -/* 801CD678 40 82 00 0C */ bne lbl_801CD684 -/* 801CD67C 3B A0 00 4F */ li r29, 0x4f -/* 801CD680 48 00 00 2C */ b lbl_801CD6AC -lbl_801CD684: -/* 801CD684 3B A0 00 33 */ li r29, 0x33 -/* 801CD688 48 00 00 24 */ b lbl_801CD6AC -lbl_801CD68C: -/* 801CD68C 3B 80 00 01 */ li r28, 1 -/* 801CD690 3B A0 00 2A */ li r29, 0x2a -/* 801CD694 48 00 00 18 */ b lbl_801CD6AC -lbl_801CD698: -/* 801CD698 3B 80 00 02 */ li r28, 2 -/* 801CD69C 3B A0 00 55 */ li r29, 0x55 -/* 801CD6A0 48 00 00 0C */ b lbl_801CD6AC -lbl_801CD6A4: -/* 801CD6A4 3B 80 00 03 */ li r28, 3 -/* 801CD6A8 3B A0 00 5F */ li r29, 0x5f -lbl_801CD6AC: -/* 801CD6AC 38 7E 02 50 */ addi r3, r30, 0x250 -/* 801CD6B0 57 80 10 3A */ slwi r0, r28, 2 -/* 801CD6B4 3C 80 80 3C */ lis r4, stage_name_7304@ha /* 0x803BD63C@ha */ -/* 801CD6B8 38 84 D6 3C */ addi r4, r4, stage_name_7304@l /* 0x803BD63C@l */ -/* 801CD6BC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801CD6C0 48 19 B4 6D */ bl strcpy -/* 801CD6C4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801CD6C8 41 82 00 70 */ beq lbl_801CD738 -/* 801CD6CC 7F C3 F3 78 */ mr r3, r30 -/* 801CD6D0 38 80 00 05 */ li r4, 5 -/* 801CD6D4 7F A5 EB 78 */ mr r5, r29 -/* 801CD6D8 38 C1 00 0C */ addi r6, r1, 0xc -/* 801CD6DC 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD6E0 4B FF F9 21 */ bl searchIcon__12dMenu_Fmap_cFUciPfPf -/* 801CD6E4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD6E8 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CD6EC FC 40 08 90 */ fmr f2, f1 -/* 801CD6F0 38 81 00 18 */ addi r4, r1, 0x18 -/* 801CD6F4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801CD6F8 48 00 38 85 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD6FC 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD700 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CD704 C0 42 A7 6C */ lfs f2, lit_7348(r2) -/* 801CD708 38 81 00 1C */ addi r4, r1, 0x1c -/* 801CD70C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801CD710 48 00 38 6D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD714 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD718 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801CD71C C0 61 00 08 */ lfs f3, 8(r1) -/* 801CD720 C0 41 00 14 */ lfs f2, 0x14(r1) -/* 801CD724 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CD728 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801CD72C EC 43 00 2A */ fadds f2, f3, f0 -/* 801CD730 48 00 84 89 */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff -/* 801CD734 48 00 00 24 */ b lbl_801CD758 -lbl_801CD738: -/* 801CD738 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801CD73C 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801CD740 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 801CD744 7C A3 02 14 */ add r5, r3, r0 -/* 801CD748 C0 45 10 24 */ lfs f2, 0x1024(r5) -/* 801CD74C C0 25 10 04 */ lfs f1, 0x1004(r5) -/* 801CD750 38 BE 02 50 */ addi r5, r30, 0x250 -/* 801CD754 48 00 81 A5 */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff -lbl_801CD758: -/* 801CD758 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CD75C 48 19 4A C9 */ bl _restgpr_28 -/* 801CD760 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CD764 7C 08 03 A6 */ mtlr r0 -/* 801CD768 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CD76C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 966ec795fb..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_801CA874: -/* 801CA874 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801CA878 7C 08 02 A6 */ mflr r0 -/* 801CA87C 90 01 00 64 */ stw r0, 0x64(r1) -/* 801CA880 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CA884 48 19 79 59 */ bl _savegpr_29 -/* 801CA888 7C 7F 1B 78 */ mr r31, r3 -/* 801CA88C 38 00 FF F6 */ li r0, -10 -/* 801CA890 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CA894 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CA898 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801CA89C 88 04 00 E1 */ lbz r0, 0xe1(r4) -/* 801CA8A0 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CA8A4 98 04 12 27 */ stb r0, 0x1227(r4) -/* 801CA8A8 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CA8AC 88 84 12 27 */ lbz r4, 0x1227(r4) -/* 801CA8B0 38 04 00 01 */ addi r0, r4, 1 -/* 801CA8B4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801CA8B8 48 00 0E B9 */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801CA8BC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA8C0 38 80 00 00 */ li r4, 0 -/* 801CA8C4 38 A0 00 FF */ li r5, 0xff -/* 801CA8C8 48 00 CA 0D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA8CC 3C 60 80 3A */ lis r3, __vt__19dMenuFmapIconDisp_c@ha /* 0x803A7D74@ha */ -/* 801CA8D0 38 03 7D 74 */ addi r0, r3, __vt__19dMenuFmapIconDisp_c@l /* 0x803A7D74@l */ -/* 801CA8D4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801CA8D8 3B A0 00 00 */ li r29, 0 -/* 801CA8DC 3B C0 00 00 */ li r30, 0 -lbl_801CA8E0: -/* 801CA8E0 7C 7F F2 14 */ add r3, r31, r30 -/* 801CA8E4 80 83 00 24 */ lwz r4, 0x24(r3) -/* 801CA8E8 28 04 00 00 */ cmplwi r4, 0 -/* 801CA8EC 41 82 00 A0 */ beq lbl_801CA98C -/* 801CA8F0 80 A3 00 44 */ lwz r5, 0x44(r3) -/* 801CA8F4 28 05 00 00 */ cmplwi r5, 0 -/* 801CA8F8 41 82 00 94 */ beq lbl_801CA98C -/* 801CA8FC 89 0D 87 E4 */ lbz r8, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801CA900 7D 08 07 74 */ extsb r8, r8 -/* 801CA904 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA908 38 C0 00 05 */ li r6, 5 -/* 801CA90C 80 FF 02 0C */ lwz r7, 0x20c(r31) -/* 801CA910 4B E7 38 05 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii -/* 801CA914 48 00 00 68 */ b lbl_801CA97C -lbl_801CA918: -/* 801CA918 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA91C 4B E7 3D CD */ bl isDrawDisp__19dMenuFmapIconDisp_cFv -/* 801CA920 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CA924 41 82 00 48 */ beq lbl_801CA96C -/* 801CA928 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA92C 38 81 00 0C */ addi r4, r1, 0xc -/* 801CA930 38 A1 00 08 */ addi r5, r1, 8 -/* 801CA934 38 C1 00 14 */ addi r6, r1, 0x14 -/* 801CA938 38 E1 00 10 */ addi r7, r1, 0x10 -/* 801CA93C 39 00 00 00 */ li r8, 0 -/* 801CA940 4B E7 3C 39 */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s -/* 801CA944 7F E3 FB 78 */ mr r3, r31 -/* 801CA948 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801CA94C 80 A1 00 08 */ lwz r5, 8(r1) -/* 801CA950 48 00 09 71 */ bl isRoomCheck__12dMenu_Fmap_cFii -/* 801CA954 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CA958 41 82 00 14 */ beq lbl_801CA96C -/* 801CA95C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA960 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801CA964 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801CA968 48 00 B2 51 */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff -lbl_801CA96C: -/* 801CA96C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA970 4B E7 3B 21 */ bl nextData__22dMenuFmapIconPointer_cFv -/* 801CA974 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CA978 40 82 00 14 */ bne lbl_801CA98C -lbl_801CA97C: -/* 801CA97C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA980 4B E7 3B 91 */ bl getValidData__22dMenuFmapIconPointer_cFv -/* 801CA984 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CA988 41 82 FF 90 */ beq lbl_801CA918 -lbl_801CA98C: -/* 801CA98C 3B BD 00 01 */ addi r29, r29, 1 -/* 801CA990 2C 1D 00 08 */ cmpwi r29, 8 -/* 801CA994 3B DE 00 04 */ addi r30, r30, 4 -/* 801CA998 41 80 FF 48 */ blt lbl_801CA8E0 -/* 801CA99C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CA9A0 48 19 78 89 */ bl _restgpr_29 -/* 801CA9A4 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801CA9A8 7C 08 03 A6 */ mtlr r0 -/* 801CA9AC 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CA9B0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo1_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo1_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 2b59ec3520..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo1_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801CA9B4: -/* 801CA9B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CA9B8 7C 08 02 A6 */ mflr r0 -/* 801CA9BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CA9C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CA9C4 7C 7F 1B 78 */ mr r31, r3 -/* 801CA9C8 A8 63 02 14 */ lha r3, 0x214(r3) -/* 801CA9CC 38 03 00 01 */ addi r0, r3, 1 -/* 801CA9D0 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CA9D4 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CA9D8 2C 00 00 01 */ cmpwi r0, 1 -/* 801CA9DC 40 82 00 38 */ bne lbl_801CAA14 -/* 801CA9E0 38 00 00 BC */ li r0, 0xbc -/* 801CA9E4 90 01 00 08 */ stw r0, 8(r1) -/* 801CA9E8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CA9EC 38 81 00 08 */ addi r4, r1, 8 -/* 801CA9F0 38 A0 00 00 */ li r5, 0 -/* 801CA9F4 38 C0 00 00 */ li r6, 0 -/* 801CA9F8 38 E0 00 00 */ li r7, 0 -/* 801CA9FC C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CAA00 FC 40 08 90 */ fmr f2, f1 -/* 801CAA04 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CAA08 FC 80 18 90 */ fmr f4, f3 -/* 801CAA0C 39 00 00 00 */ li r8, 0 -/* 801CAA10 48 0E 0F 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801CAA14: -/* 801CAA14 A8 9F 02 14 */ lha r4, 0x214(r31) -/* 801CAA18 7C 80 07 35 */ extsh. r0, r4 -/* 801CAA1C 40 81 00 48 */ ble lbl_801CAA64 -/* 801CAA20 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAA24 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801CAA28 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801CAA2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAA30 3C 00 43 30 */ lis r0, 0x4330 -/* 801CAA34 90 01 00 10 */ stw r0, 0x10(r1) -/* 801CAA38 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801CAA3C EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CAA40 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801CAA44 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801CAA48 48 00 67 01 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801CAA4C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CAA50 2C 00 00 0A */ cmpwi r0, 0xa -/* 801CAA54 41 80 00 10 */ blt lbl_801CAA64 -/* 801CAA58 7F E3 FB 78 */ mr r3, r31 -/* 801CAA5C 38 80 00 19 */ li r4, 0x19 -/* 801CAA60 48 00 0C 71 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CAA64: -/* 801CAA64 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CAA68 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CAA6C 7C 08 03 A6 */ mtlr r0 -/* 801CAA70 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CAA74 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo2_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo2_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index f9ddff6158..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo2_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801CAA78: -/* 801CAA78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CAA7C 7C 08 02 A6 */ mflr r0 -/* 801CAA80 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAA84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CAA88 7C 7F 1B 78 */ mr r31, r3 -/* 801CAA8C 38 00 FF F6 */ li r0, -10 -/* 801CAA90 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CAA94 38 80 00 01 */ li r4, 1 -/* 801CAA98 48 00 2B 35 */ bl tableArrowPosInit__12dMenu_Fmap_cFb -/* 801CAA9C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAAA0 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CAAA4 48 00 69 D5 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CAAA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CAAAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CAAB0 7C 08 03 A6 */ mtlr r0 -/* 801CAAB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CAAB8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo2_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo2_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index fec10c6c75..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo2_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801CAABC: -/* 801CAABC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CAAC0 7C 08 02 A6 */ mflr r0 -/* 801CAAC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CAAC8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CAACC 7C 7F 1B 78 */ mr r31, r3 -/* 801CAAD0 A8 63 02 14 */ lha r3, 0x214(r3) -/* 801CAAD4 38 03 00 01 */ addi r0, r3, 1 -/* 801CAAD8 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CAADC A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CAAE0 2C 00 00 01 */ cmpwi r0, 1 -/* 801CAAE4 40 82 00 38 */ bne lbl_801CAB1C -/* 801CAAE8 38 00 00 BC */ li r0, 0xbc -/* 801CAAEC 90 01 00 08 */ stw r0, 8(r1) -/* 801CAAF0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CAAF4 38 81 00 08 */ addi r4, r1, 8 -/* 801CAAF8 38 A0 00 00 */ li r5, 0 -/* 801CAAFC 38 C0 00 00 */ li r6, 0 -/* 801CAB00 38 E0 00 00 */ li r7, 0 -/* 801CAB04 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CAB08 FC 40 08 90 */ fmr f2, f1 -/* 801CAB0C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CAB10 FC 80 18 90 */ fmr f4, f3 -/* 801CAB14 39 00 00 00 */ li r8, 0 -/* 801CAB18 48 0E 0E 6D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801CAB1C: -/* 801CAB1C A8 7F 02 14 */ lha r3, 0x214(r31) -/* 801CAB20 7C 60 07 35 */ extsh. r0, r3 -/* 801CAB24 40 81 00 50 */ ble lbl_801CAB74 -/* 801CAB28 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801CAB2C 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 801CAB30 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAB34 3C 00 43 30 */ lis r0, 0x4330 -/* 801CAB38 90 01 00 10 */ stw r0, 0x10(r1) -/* 801CAB3C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801CAB40 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CAB44 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801CAB48 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801CAB4C D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801CAB50 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAB54 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CAB58 48 00 69 21 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CAB5C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CAB60 2C 00 00 0A */ cmpwi r0, 0xa -/* 801CAB64 41 80 00 10 */ blt lbl_801CAB74 -/* 801CAB68 7F E3 FB 78 */ mr r3, r31 -/* 801CAB6C 38 80 00 1A */ li r4, 0x1a -/* 801CAB70 48 00 0B 61 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CAB74: -/* 801CAB74 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CAB78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CAB7C 7C 08 03 A6 */ mtlr r0 -/* 801CAB80 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CAB84 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo3_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo3_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index adee24fee7..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo3_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_801CAB88: -/* 801CAB88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CAB8C 7C 08 02 A6 */ mflr r0 -/* 801CAB90 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CAB94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CAB98 7C 7F 1B 78 */ mr r31, r3 -/* 801CAB9C 80 63 00 08 */ lwz r3, 8(r3) -/* 801CABA0 48 06 CF 41 */ bl setTalkHeap__12dMsgObject_cFPv -/* 801CABA4 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CABA8 38 80 00 00 */ li r4, 0 -/* 801CABAC 38 A0 04 41 */ li r5, 0x441 -/* 801CABB0 38 C0 00 00 */ li r6, 0 -/* 801CABB4 38 E0 00 00 */ li r7, 0 -/* 801CABB8 48 07 F3 D9 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 801CABBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CABC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CABC4 7C 08 03 A6 */ mtlr r0 -/* 801CABC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CABCC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/table_demo3_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo3_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0b8cfc4f87..0000000000 --- a/asm/d/menu/d_menu_fmap/table_demo3_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801CABD0: -/* 801CABD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CABD4 7C 08 02 A6 */ mflr r0 -/* 801CABD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CABDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CABE0 7C 7F 1B 78 */ mr r31, r3 -/* 801CABE4 48 00 0A 81 */ bl talkButton__12dMenu_Fmap_cFv -/* 801CABE8 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CABEC 38 80 00 00 */ li r4, 0 -/* 801CABF0 38 A0 00 00 */ li r5, 0 -/* 801CABF4 38 C0 00 00 */ li r6, 0 -/* 801CABF8 48 07 F6 E1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801CABFC 2C 03 00 00 */ cmpwi r3, 0 -/* 801CAC00 41 82 00 1C */ beq lbl_801CAC1C -/* 801CAC04 38 00 00 01 */ li r0, 1 -/* 801CAC08 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CAC0C 98 03 12 3A */ stb r0, 0x123a(r3) -/* 801CAC10 7F E3 FB 78 */ mr r3, r31 -/* 801CAC14 38 80 00 0D */ li r4, 0xd -/* 801CAC18 48 00 0A B9 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CAC1C: -/* 801CAC1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CAC20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CAC24 7C 08 03 A6 */ mtlr r0 -/* 801CAC28 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CAC2C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/talkButton__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/talkButton__12dMenu_Fmap_cFv.s deleted file mode 100644 index 6323a06eac..0000000000 --- a/asm/d/menu/d_menu_fmap/talkButton__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801CB664: -/* 801CB664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CB668 7C 08 02 A6 */ mflr r0 -/* 801CB66C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CB670 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CB674 7C 7F 1B 78 */ mr r31, r3 -/* 801CB678 48 06 CB B5 */ bl getStatus__12dMsgObject_cFv -/* 801CB67C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801CB680 28 00 00 05 */ cmplwi r0, 5 -/* 801CB684 41 82 00 14 */ beq lbl_801CB698 -/* 801CB688 28 00 00 0F */ cmplwi r0, 0xf -/* 801CB68C 41 82 00 0C */ beq lbl_801CB698 -/* 801CB690 28 00 00 10 */ cmplwi r0, 0x10 -/* 801CB694 40 82 00 18 */ bne lbl_801CB6AC -lbl_801CB698: -/* 801CB698 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CB69C 38 80 04 08 */ li r4, 0x408 -/* 801CB6A0 38 A0 00 FF */ li r5, 0xff -/* 801CB6A4 48 00 BC 31 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CB6A8 48 00 00 14 */ b lbl_801CB6BC -lbl_801CB6AC: -/* 801CB6AC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CB6B0 38 80 00 00 */ li r4, 0 -/* 801CB6B4 38 A0 00 FF */ li r5, 0xff -/* 801CB6B8 48 00 BC 1D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -lbl_801CB6BC: -/* 801CB6BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CB6C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CB6C4 7C 08 03 A6 */ mtlr r0 -/* 801CB6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CB6CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/to_portal_warp_map_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/to_portal_warp_map_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 33837cdae8..0000000000 --- a/asm/d/menu/d_menu_fmap/to_portal_warp_map_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801C8B00: -/* 801C8B00 38 00 00 0A */ li r0, 0xa -/* 801C8B04 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801C8B08 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/to_portal_warp_map_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/to_portal_warp_map_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index f993f0b803..0000000000 --- a/asm/d/menu/d_menu_fmap/to_portal_warp_map_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801C8B0C: -/* 801C8B0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C8B10 7C 08 02 A6 */ mflr r0 -/* 801C8B14 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C8B18 A8 83 02 14 */ lha r4, 0x214(r3) -/* 801C8B1C 38 04 FF FF */ addi r0, r4, -1 -/* 801C8B20 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801C8B24 A8 03 02 14 */ lha r0, 0x214(r3) -/* 801C8B28 2C 00 00 00 */ cmpwi r0, 0 -/* 801C8B2C 41 81 00 0C */ bgt lbl_801C8B38 -/* 801C8B30 38 80 00 08 */ li r4, 8 -/* 801C8B34 48 00 2B 9D */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C8B38: -/* 801C8B38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C8B3C 7C 08 03 A6 */ mtlr r0 -/* 801C8B40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C8B44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamibossArrowPosInit__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamibossArrowPosInit__12dMenu_Fmap_cFv.s deleted file mode 100644 index 38f1fb7b44..0000000000 --- a/asm/d/menu/d_menu_fmap/yamibossArrowPosInit__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801CD770: -/* 801CD770 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CD774 7C 08 02 A6 */ mflr r0 -/* 801CD778 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CD77C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801CD780 7C 7F 1B 78 */ mr r31, r3 -/* 801CD784 38 80 00 04 */ li r4, 4 -/* 801CD788 38 A0 00 75 */ li r5, 0x75 -/* 801CD78C 38 C1 00 0C */ addi r6, r1, 0xc -/* 801CD790 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD794 4B FF F8 6D */ bl searchIcon__12dMenu_Fmap_cFUciPfPf -/* 801CD798 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CD79C 40 82 00 14 */ bne lbl_801CD7B0 -/* 801CD7A0 C0 02 A7 70 */ lfs f0, lit_7356(r2) -/* 801CD7A4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 801CD7A8 C0 02 A7 74 */ lfs f0, lit_7357(r2) -/* 801CD7AC D0 01 00 08 */ stfs f0, 8(r1) -lbl_801CD7B0: -/* 801CD7B0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CD7B4 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CD7B8 FC 40 08 90 */ fmr f2, f1 -/* 801CD7BC 38 81 00 18 */ addi r4, r1, 0x18 -/* 801CD7C0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801CD7C4 48 00 37 B9 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD7C8 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CD7CC C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CD7D0 C0 42 A7 6C */ lfs f2, lit_7348(r2) -/* 801CD7D4 38 81 00 1C */ addi r4, r1, 0x1c -/* 801CD7D8 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801CD7DC 48 00 37 A1 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801CD7E0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CD7E4 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801CD7E8 C0 61 00 08 */ lfs f3, 8(r1) -/* 801CD7EC C0 41 00 14 */ lfs f2, 0x14(r1) -/* 801CD7F0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801CD7F4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801CD7F8 EC 43 00 2A */ fadds f2, f3, f0 -/* 801CD7FC 48 00 83 BD */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff -/* 801CD800 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801CD804 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CD808 7C 08 03 A6 */ mtlr r0 -/* 801CD80C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CD810 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo1_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 535692d32a..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo1_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_801CA1E8: -/* 801CA1E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA1EC 7C 08 02 A6 */ mflr r0 -/* 801CA1F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA1F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA1F8 7C 7F 1B 78 */ mr r31, r3 -/* 801CA1FC 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801CA200 88 04 12 27 */ lbz r0, 0x1227(r4) -/* 801CA204 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA208 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA20C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA210 48 00 26 4D */ bl setTitleName__12dMenu_Fmap_cFUl -/* 801CA214 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA218 88 03 12 29 */ lbz r0, 0x1229(r3) -/* 801CA21C 7F E3 FB 78 */ mr r3, r31 -/* 801CA220 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 801CA224 7C 9F 02 14 */ add r4, r31, r0 -/* 801CA228 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA22C 48 00 26 55 */ bl setAreaName__12dMenu_Fmap_cFUl -/* 801CA230 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA234 38 80 00 01 */ li r4, 1 -/* 801CA238 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA23C 48 00 D4 D9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA240 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA244 38 80 00 02 */ li r4, 2 -/* 801CA248 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA24C 48 00 D4 C9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA250 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA254 38 80 00 08 */ li r4, 8 -/* 801CA258 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA25C 48 00 D4 B9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA260 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA264 38 80 00 04 */ li r4, 4 -/* 801CA268 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801CA26C 48 00 D4 A9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801CA270 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA274 38 80 00 00 */ li r4, 0 -/* 801CA278 38 A0 00 FF */ li r5, 0xff -/* 801CA27C 48 00 CF 95 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA280 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA284 38 80 00 00 */ li r4, 0 -/* 801CA288 38 A0 00 FF */ li r5, 0xff -/* 801CA28C 48 00 D0 49 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA290 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA294 38 80 00 00 */ li r4, 0 -/* 801CA298 38 A0 00 FF */ li r5, 0xff -/* 801CA29C 48 00 CE 4D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801CA2A0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA2A4 38 80 00 00 */ li r4, 0 -/* 801CA2A8 48 00 D2 45 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801CA2AC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801CA2B0 38 80 00 00 */ li r4, 0 -/* 801CA2B4 48 00 D0 E5 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801CA2B8 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA2BC 48 06 D8 25 */ bl setTalkHeap__12dMsgObject_cFPv -/* 801CA2C0 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA2C4 38 80 00 00 */ li r4, 0 -/* 801CA2C8 38 A0 0B C4 */ li r5, 0xbc4 -/* 801CA2CC 38 C0 00 00 */ li r6, 0 -/* 801CA2D0 38 E0 00 00 */ li r7, 0 -/* 801CA2D4 48 07 FC BD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 801CA2D8 38 00 00 0A */ li r0, 0xa -/* 801CA2DC B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CA2E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA2E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA2E8 7C 08 03 A6 */ mtlr r0 -/* 801CA2EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA2F0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo1_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo1_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 8253f8213a..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo1_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801CA2F4: -/* 801CA2F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA2F8 7C 08 02 A6 */ mflr r0 -/* 801CA2FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA300 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA304 7C 7F 1B 78 */ mr r31, r3 -/* 801CA308 48 00 13 5D */ bl talkButton__12dMenu_Fmap_cFv -/* 801CA30C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA310 38 80 00 00 */ li r4, 0 -/* 801CA314 38 A0 00 00 */ li r5, 0 -/* 801CA318 38 C0 00 00 */ li r6, 0 -/* 801CA31C 48 07 FF BD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801CA320 48 06 E0 B1 */ bl getMessageID__12dMsgObject_cFv -/* 801CA324 28 03 0F AF */ cmplwi r3, 0xfaf -/* 801CA328 41 80 00 10 */ blt lbl_801CA338 -/* 801CA32C 7F E3 FB 78 */ mr r3, r31 -/* 801CA330 38 80 00 13 */ li r4, 0x13 -/* 801CA334 48 00 13 9D */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CA338: -/* 801CA338 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA33C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA340 7C 08 03 A6 */ mtlr r0 -/* 801CA344 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA348 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo2_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo2_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 77318a179a..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo2_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801CA34C: -/* 801CA34C 38 00 00 00 */ li r0, 0 -/* 801CA350 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CA354 98 03 03 0B */ stb r0, 0x30b(r3) -/* 801CA358 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo2_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo2_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 79f4f13aae..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo2_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_801CA35C: -/* 801CA35C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CA360 7C 08 02 A6 */ mflr r0 -/* 801CA364 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CA368 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CA36C 48 19 7E 71 */ bl _savegpr_29 -/* 801CA370 7C 7D 1B 78 */ mr r29, r3 -/* 801CA374 48 06 DE B9 */ bl getStatus__12dMsgObject_cFv -/* 801CA378 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801CA37C 28 00 00 0E */ cmplwi r0, 0xe -/* 801CA380 40 82 00 74 */ bne lbl_801CA3F4 -/* 801CA384 A8 7D 02 14 */ lha r3, 0x214(r29) -/* 801CA388 38 03 00 01 */ addi r0, r3, 1 -/* 801CA38C B0 1D 02 14 */ sth r0, 0x214(r29) -/* 801CA390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CA394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CA398 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 801CA39C 7F C3 F3 78 */ mr r3, r30 -/* 801CA3A0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801CA3A4 3B E4 72 88 */ addi r31, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801CA3A8 A0 9F 00 EE */ lhz r4, 0xee(r31) -/* 801CA3AC 4B E6 A6 11 */ bl isEventBit__11dSv_event_cCFUs -/* 801CA3B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA3B4 41 82 00 20 */ beq lbl_801CA3D4 -/* 801CA3B8 A8 1D 02 14 */ lha r0, 0x214(r29) -/* 801CA3BC 2C 00 00 5A */ cmpwi r0, 0x5a -/* 801CA3C0 40 81 00 34 */ ble lbl_801CA3F4 -/* 801CA3C4 7F A3 EB 78 */ mr r3, r29 -/* 801CA3C8 38 80 00 14 */ li r4, 0x14 -/* 801CA3CC 48 00 13 05 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA3D0 48 00 00 24 */ b lbl_801CA3F4 -lbl_801CA3D4: -/* 801CA3D4 A8 1D 02 14 */ lha r0, 0x214(r29) -/* 801CA3D8 2C 00 00 1E */ cmpwi r0, 0x1e -/* 801CA3DC 40 81 00 18 */ ble lbl_801CA3F4 -/* 801CA3E0 38 00 00 01 */ li r0, 1 -/* 801CA3E4 98 1D 03 0B */ stb r0, 0x30b(r29) -/* 801CA3E8 7F C3 F3 78 */ mr r3, r30 -/* 801CA3EC A0 9F 00 EE */ lhz r4, 0xee(r31) -/* 801CA3F0 4B E6 A5 9D */ bl onEventBit__11dSv_event_cFUs -lbl_801CA3F4: -/* 801CA3F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CA3F8 48 19 7E 31 */ bl _restgpr_29 -/* 801CA3FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CA400 7C 08 03 A6 */ mtlr r0 -/* 801CA404 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA408 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo3_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo3_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index ba200d6b5c..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo3_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801CA410: -/* 801CA410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA414 7C 08 02 A6 */ mflr r0 -/* 801CA418 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA41C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA420 7C 7F 1B 78 */ mr r31, r3 -/* 801CA424 48 00 12 41 */ bl talkButton__12dMenu_Fmap_cFv -/* 801CA428 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA42C 38 80 00 00 */ li r4, 0 -/* 801CA430 38 A0 00 00 */ li r5, 0 -/* 801CA434 38 C0 00 00 */ li r6, 0 -/* 801CA438 48 07 FE A1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801CA43C 48 06 DF 95 */ bl getMessageID__12dMsgObject_cFv -/* 801CA440 28 03 0F B0 */ cmplwi r3, 0xfb0 -/* 801CA444 41 80 00 10 */ blt lbl_801CA454 -/* 801CA448 7F E3 FB 78 */ mr r3, r31 -/* 801CA44C 38 80 00 15 */ li r4, 0x15 -/* 801CA450 48 00 12 81 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CA454: -/* 801CA454 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA458 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA45C 7C 08 03 A6 */ mtlr r0 -/* 801CA460 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA464 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo4_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo4_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0580c7c553..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo4_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801CA468: -/* 801CA468 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA46C 7C 08 02 A6 */ mflr r0 -/* 801CA470 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA474 38 00 00 00 */ li r0, 0 -/* 801CA478 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801CA47C 38 00 00 BC */ li r0, 0xbc -/* 801CA480 90 01 00 08 */ stw r0, 8(r1) -/* 801CA484 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801CA488 38 81 00 08 */ addi r4, r1, 8 -/* 801CA48C 38 A0 00 00 */ li r5, 0 -/* 801CA490 38 C0 00 00 */ li r6, 0 -/* 801CA494 38 E0 00 00 */ li r7, 0 -/* 801CA498 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801CA49C FC 40 08 90 */ fmr f2, f1 -/* 801CA4A0 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801CA4A4 FC 80 18 90 */ fmr f4, f3 -/* 801CA4A8 39 00 00 00 */ li r8, 0 -/* 801CA4AC 48 0E 14 D9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801CA4B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA4B4 7C 08 03 A6 */ mtlr r0 -/* 801CA4B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA4BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo4_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo4_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 83ad7df076..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo4_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801CA4C0: -/* 801CA4C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CA4C4 7C 08 02 A6 */ mflr r0 -/* 801CA4C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CA4CC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801CA4D0 7C 7F 1B 78 */ mr r31, r3 -/* 801CA4D4 A8 63 02 14 */ lha r3, 0x214(r3) -/* 801CA4D8 38 03 00 01 */ addi r0, r3, 1 -/* 801CA4DC B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801CA4E0 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CA4E4 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801CA4E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801CA4EC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801CA4F0 3C 00 43 30 */ lis r0, 0x4330 -/* 801CA4F4 90 01 00 08 */ stw r0, 8(r1) -/* 801CA4F8 C8 01 00 08 */ lfd f0, 8(r1) -/* 801CA4FC EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CA500 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801CA504 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801CA508 D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801CA50C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA510 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CA514 48 00 6F 65 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801CA518 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801CA51C 2C 00 00 0A */ cmpwi r0, 0xa -/* 801CA520 41 80 00 10 */ blt lbl_801CA530 -/* 801CA524 7F E3 FB 78 */ mr r3, r31 -/* 801CA528 38 80 00 16 */ li r4, 0x16 -/* 801CA52C 48 00 11 A5 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801CA530: -/* 801CA530 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801CA534 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CA538 7C 08 03 A6 */ mtlr r0 -/* 801CA53C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA540 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/yamiboss_demo5_move__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/yamiboss_demo5_move__12dMenu_Fmap_cFv.s deleted file mode 100644 index 33ef09a178..0000000000 --- a/asm/d/menu/d_menu_fmap/yamiboss_demo5_move__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801CA548: -/* 801CA548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CA54C 7C 08 02 A6 */ mflr r0 -/* 801CA550 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CA554 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CA558 7C 7F 1B 78 */ mr r31, r3 -/* 801CA55C 88 03 03 0B */ lbz r0, 0x30b(r3) -/* 801CA560 28 00 00 00 */ cmplwi r0, 0 -/* 801CA564 41 82 00 18 */ beq lbl_801CA57C -/* 801CA568 48 06 DE 69 */ bl getMessageID__12dMsgObject_cFv -/* 801CA56C 28 03 0F B2 */ cmplwi r3, 0xfb2 -/* 801CA570 41 80 00 0C */ blt lbl_801CA57C -/* 801CA574 38 00 00 00 */ li r0, 0 -/* 801CA578 98 1F 03 0B */ stb r0, 0x30b(r31) -lbl_801CA57C: -/* 801CA57C 7F E3 FB 78 */ mr r3, r31 -/* 801CA580 48 00 10 E5 */ bl talkButton__12dMenu_Fmap_cFv -/* 801CA584 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 801CA588 38 80 00 00 */ li r4, 0 -/* 801CA58C 38 A0 00 00 */ li r5, 0 -/* 801CA590 38 C0 00 00 */ li r6, 0 -/* 801CA594 48 07 FD 45 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801CA598 2C 03 00 00 */ cmpwi r3, 0 -/* 801CA59C 41 82 00 1C */ beq lbl_801CA5B8 -/* 801CA5A0 7F E3 FB 78 */ mr r3, r31 -/* 801CA5A4 38 80 00 0D */ li r4, 0xd -/* 801CA5A8 48 00 11 29 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801CA5AC 38 00 00 01 */ li r0, 1 -/* 801CA5B0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CA5B4 98 03 12 3A */ stb r0, 0x123a(r3) -lbl_801CA5B8: -/* 801CA5B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CA5BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CA5C0 7C 08 03 A6 */ mtlr r0 -/* 801CA5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA5C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_all_to_region_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_all_to_region_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index 0db7ea6c7f..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_all_to_region_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_801C8230: -/* 801C8230 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C8234 7C 08 02 A6 */ mflr r0 -/* 801C8238 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C823C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C8240 7C 7F 1B 78 */ mr r31, r3 -/* 801C8244 80 83 00 14 */ lwz r4, 0x14(r3) -/* 801C8248 88 84 12 27 */ lbz r4, 0x1227(r4) -/* 801C824C 38 04 00 01 */ addi r0, r4, 1 -/* 801C8250 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C8254 48 00 35 1D */ bl readWorldData__12dMenu_Fmap_cFUc -/* 801C8258 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801C825C 40 82 00 5C */ bne lbl_801C82B8 -/* 801C8260 7F E3 FB 78 */ mr r3, r31 -/* 801C8264 38 80 00 00 */ li r4, 0 -/* 801C8268 48 00 34 69 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C826C 88 1F 03 09 */ lbz r0, 0x309(r31) -/* 801C8270 28 00 00 00 */ cmplwi r0, 0 -/* 801C8274 40 82 00 80 */ bne lbl_801C82F4 -/* 801C8278 38 00 00 4A */ li r0, 0x4a -/* 801C827C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C8280 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8284 38 81 00 0C */ addi r4, r1, 0xc -/* 801C8288 38 A0 00 00 */ li r5, 0 -/* 801C828C 38 C0 00 00 */ li r6, 0 -/* 801C8290 38 E0 00 00 */ li r7, 0 -/* 801C8294 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8298 FC 40 08 90 */ fmr f2, f1 -/* 801C829C C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C82A0 FC 80 18 90 */ fmr f4, f3 -/* 801C82A4 39 00 00 00 */ li r8, 0 -/* 801C82A8 48 0E 36 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C82AC 38 00 00 01 */ li r0, 1 -/* 801C82B0 98 1F 03 09 */ stb r0, 0x309(r31) -/* 801C82B4 48 00 00 40 */ b lbl_801C82F4 -lbl_801C82B8: -/* 801C82B8 38 00 00 00 */ li r0, 0 -/* 801C82BC B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C82C0 38 00 00 BC */ li r0, 0xbc -/* 801C82C4 90 01 00 08 */ stw r0, 8(r1) -/* 801C82C8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C82CC 38 81 00 08 */ addi r4, r1, 8 -/* 801C82D0 38 A0 00 00 */ li r5, 0 -/* 801C82D4 38 C0 00 00 */ li r6, 0 -/* 801C82D8 38 E0 00 00 */ li r7, 0 -/* 801C82DC C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C82E0 FC 40 08 90 */ fmr f2, f1 -/* 801C82E4 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C82E8 FC 80 18 90 */ fmr f4, f3 -/* 801C82EC 39 00 00 00 */ li r8, 0 -/* 801C82F0 48 0E 36 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801C82F4: -/* 801C82F4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C82F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C82FC 7C 08 03 A6 */ mtlr r0 -/* 801C8300 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C8304 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_all_to_region_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_all_to_region_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 6f71a05920..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_all_to_region_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801C8308: -/* 801C8308 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C830C 7C 08 02 A6 */ mflr r0 -/* 801C8310 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C8314 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C8318 7C 7F 1B 78 */ mr r31, r3 -/* 801C831C A8 63 02 14 */ lha r3, 0x214(r3) -/* 801C8320 38 03 00 01 */ addi r0, r3, 1 -/* 801C8324 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C8328 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C832C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C8330 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C8334 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C8338 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C833C 3C 00 43 30 */ lis r0, 0x4330 -/* 801C8340 90 01 00 08 */ stw r0, 8(r1) -/* 801C8344 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C8348 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C834C C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C8350 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C8354 48 00 8D F5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C8358 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C835C 28 00 00 01 */ cmplwi r0, 1 -/* 801C8360 40 82 00 28 */ bne lbl_801C8388 -/* 801C8364 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8368 38 80 00 01 */ li r4, 1 -/* 801C836C C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C8370 48 00 F3 A5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C8374 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8378 38 80 00 02 */ li r4, 2 -/* 801C837C C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C8380 48 00 F3 95 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C8384 48 00 00 14 */ b lbl_801C8398 -lbl_801C8388: -/* 801C8388 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C838C 38 80 00 02 */ li r4, 2 -/* 801C8390 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C8394 48 00 F3 81 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -lbl_801C8398: -/* 801C8398 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C839C 2C 00 00 0A */ cmpwi r0, 0xa -/* 801C83A0 41 80 00 2C */ blt lbl_801C83CC -/* 801C83A4 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C83A8 28 00 00 01 */ cmplwi r0, 1 -/* 801C83AC 40 82 00 14 */ bne lbl_801C83C0 -/* 801C83B0 7F E3 FB 78 */ mr r3, r31 -/* 801C83B4 38 80 00 08 */ li r4, 8 -/* 801C83B8 48 00 33 19 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C83BC 48 00 00 10 */ b lbl_801C83CC -lbl_801C83C0: -/* 801C83C0 7F E3 FB 78 */ mr r3, r31 -/* 801C83C4 38 80 00 06 */ li r4, 6 -/* 801C83C8 48 00 33 09 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C83CC: -/* 801C83CC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C83D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C83D4 7C 08 03 A6 */ mtlr r0 -/* 801C83D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C83DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_region_to_all_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_region_to_all_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index b156ac1efe..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_region_to_all_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801C83E0: -/* 801C83E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C83E4 7C 08 02 A6 */ mflr r0 -/* 801C83E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C83EC 38 00 00 0A */ li r0, 0xa -/* 801C83F0 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801C83F4 38 00 00 BD */ li r0, 0xbd -/* 801C83F8 90 01 00 08 */ stw r0, 8(r1) -/* 801C83FC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C8400 38 81 00 08 */ addi r4, r1, 8 -/* 801C8404 38 A0 00 00 */ li r5, 0 -/* 801C8408 38 C0 00 00 */ li r6, 0 -/* 801C840C 38 E0 00 00 */ li r7, 0 -/* 801C8410 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C8414 FC 40 08 90 */ fmr f2, f1 -/* 801C8418 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C841C FC 80 18 90 */ fmr f4, f3 -/* 801C8420 39 00 00 00 */ li r8, 0 -/* 801C8424 48 0E 35 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C8428 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C842C 7C 08 03 A6 */ mtlr r0 -/* 801C8430 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C8434 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_region_to_all_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_region_to_all_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index 5788eaf597..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_region_to_all_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_801C8438: -/* 801C8438 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C843C 7C 08 02 A6 */ mflr r0 -/* 801C8440 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C8444 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C8448 7C 7F 1B 78 */ mr r31, r3 -/* 801C844C A8 63 02 14 */ lha r3, 0x214(r3) -/* 801C8450 38 03 FF FF */ addi r0, r3, -1 -/* 801C8454 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C8458 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C845C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C8460 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C8464 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C8468 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C846C 3C 00 43 30 */ lis r0, 0x4330 -/* 801C8470 90 01 00 08 */ stw r0, 8(r1) -/* 801C8474 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C8478 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C847C C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C8480 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C8484 48 00 8C C5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf -/* 801C8488 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C848C 28 00 00 01 */ cmplwi r0, 1 -/* 801C8490 40 82 00 28 */ bne lbl_801C84B8 -/* 801C8494 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C8498 38 80 00 01 */ li r4, 1 -/* 801C849C C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C84A0 48 00 F2 75 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C84A4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C84A8 38 80 00 02 */ li r4, 2 -/* 801C84AC C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C84B0 48 00 F2 65 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C84B4 48 00 00 14 */ b lbl_801C84C8 -lbl_801C84B8: -/* 801C84B8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C84BC 38 80 00 02 */ li r4, 2 -/* 801C84C0 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C84C4 48 00 F2 51 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -lbl_801C84C8: -/* 801C84C8 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C84CC 2C 00 00 00 */ cmpwi r0, 0 -/* 801C84D0 41 81 00 34 */ bgt lbl_801C8504 -/* 801C84D4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C84D8 88 03 12 2F */ lbz r0, 0x122f(r3) -/* 801C84DC 28 00 00 00 */ cmplwi r0, 0 -/* 801C84E0 41 82 00 18 */ beq lbl_801C84F8 -/* 801C84E4 7F E3 FB 78 */ mr r3, r31 -/* 801C84E8 48 00 41 35 */ bl removeAreaData__12dMenu_Fmap_cFv -/* 801C84EC 7F E3 FB 78 */ mr r3, r31 -/* 801C84F0 38 80 00 FF */ li r4, 0xff -/* 801C84F4 48 00 32 7D */ bl readWorldData__12dMenu_Fmap_cFUc -lbl_801C84F8: -/* 801C84F8 7F E3 FB 78 */ mr r3, r31 -/* 801C84FC 38 80 00 00 */ li r4, 0 -/* 801C8500 48 00 31 D1 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C8504: -/* 801C8504 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C8508 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C850C 7C 08 03 A6 */ mtlr r0 -/* 801C8510 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C8514 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_region_to_spot_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_region_to_spot_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index a37207b49e..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_region_to_spot_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801C92A4: -/* 801C92A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C92A8 7C 08 02 A6 */ mflr r0 -/* 801C92AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C92B0 38 00 00 00 */ li r0, 0 -/* 801C92B4 B0 03 02 14 */ sth r0, 0x214(r3) -/* 801C92B8 C0 02 A7 28 */ lfs f0, lit_4158(r2) -/* 801C92BC D0 03 01 EC */ stfs f0, 0x1ec(r3) -/* 801C92C0 38 00 00 BC */ li r0, 0xbc -/* 801C92C4 90 01 00 08 */ stw r0, 8(r1) -/* 801C92C8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C92CC 38 81 00 08 */ addi r4, r1, 8 -/* 801C92D0 38 A0 00 00 */ li r5, 0 -/* 801C92D4 38 C0 00 00 */ li r6, 0 -/* 801C92D8 38 E0 00 00 */ li r7, 0 -/* 801C92DC C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C92E0 FC 40 08 90 */ fmr f2, f1 -/* 801C92E4 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C92E8 FC 80 18 90 */ fmr f4, f3 -/* 801C92EC 39 00 00 00 */ li r8, 0 -/* 801C92F0 48 0E 26 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C92F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C92F8 7C 08 03 A6 */ mtlr r0 -/* 801C92FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9300 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_region_to_spot_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_region_to_spot_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index be012a33fc..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_region_to_spot_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801C9304: -/* 801C9304 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C9308 7C 08 02 A6 */ mflr r0 -/* 801C930C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9310 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9314 7C 7F 1B 78 */ mr r31, r3 -/* 801C9318 A8 63 02 14 */ lha r3, 0x214(r3) -/* 801C931C 38 03 00 01 */ addi r0, r3, 1 -/* 801C9320 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9324 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9328 C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C932C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C9330 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C9334 3C 00 43 30 */ lis r0, 0x4330 -/* 801C9338 90 01 00 08 */ stw r0, 8(r1) -/* 801C933C C8 01 00 08 */ lfd f0, 8(r1) -/* 801C9340 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C9344 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C9348 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801C934C D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801C9350 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9354 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C9358 48 00 81 21 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801C935C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9360 38 80 00 01 */ li r4, 1 -/* 801C9364 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C9368 48 00 E3 AD */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C936C A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9370 2C 00 00 0A */ cmpwi r0, 0xa -/* 801C9374 41 80 00 10 */ blt lbl_801C9384 -/* 801C9378 7F E3 FB 78 */ mr r3, r31 -/* 801C937C 38 80 00 0D */ li r4, 0xd -/* 801C9380 48 00 23 51 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C9384: -/* 801C9384 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801C9388 2C 00 00 00 */ cmpwi r0, 0 -/* 801C938C 41 80 00 18 */ blt lbl_801C93A4 -/* 801C9390 7F E3 FB 78 */ mr r3, r31 -/* 801C9394 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C9398 38 A0 00 01 */ li r5, 1 -/* 801C939C 48 00 23 45 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C93A0 48 00 00 18 */ b lbl_801C93B8 -lbl_801C93A4: -/* 801C93A4 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C93A8 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C93AC 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C93B0 38 00 00 00 */ li r0, 0 -/* 801C93B4 98 03 00 D8 */ stb r0, 0xd8(r3) -lbl_801C93B8: -/* 801C93B8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C93BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C93C0 7C 08 03 A6 */ mtlr r0 -/* 801C93C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C93C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_spot_to_region_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_spot_to_region_init__12dMenu_Fmap_cFv.s deleted file mode 100644 index b093cfb5f3..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_spot_to_region_init__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801C93CC: -/* 801C93CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C93D0 7C 08 02 A6 */ mflr r0 -/* 801C93D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C93D8 38 00 00 0A */ li r0, 0xa -/* 801C93DC B0 03 02 14 */ sth r0, 0x214(r3) -/* 801C93E0 C0 22 A7 24 */ lfs f1, lit_3995(r2) -/* 801C93E4 D0 23 01 EC */ stfs f1, 0x1ec(r3) -/* 801C93E8 38 00 00 BD */ li r0, 0xbd -/* 801C93EC 90 01 00 08 */ stw r0, 8(r1) -/* 801C93F0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801C93F4 38 81 00 08 */ addi r4, r1, 8 -/* 801C93F8 38 A0 00 00 */ li r5, 0 -/* 801C93FC 38 C0 00 00 */ li r6, 0 -/* 801C9400 38 E0 00 00 */ li r7, 0 -/* 801C9404 FC 40 08 90 */ fmr f2, f1 -/* 801C9408 C0 62 A7 54 */ lfs f3, lit_4541(r2) -/* 801C940C FC 80 18 90 */ fmr f4, f3 -/* 801C9410 39 00 00 00 */ li r8, 0 -/* 801C9414 48 0E 25 71 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C9418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C941C 7C 08 03 A6 */ mtlr r0 -/* 801C9420 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C9424 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap/zoom_spot_to_region_proc__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/zoom_spot_to_region_proc__12dMenu_Fmap_cFv.s deleted file mode 100644 index d89b3081b8..0000000000 --- a/asm/d/menu/d_menu_fmap/zoom_spot_to_region_proc__12dMenu_Fmap_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_801C9428: -/* 801C9428 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C942C 7C 08 02 A6 */ mflr r0 -/* 801C9430 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C9434 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C9438 7C 7F 1B 78 */ mr r31, r3 -/* 801C943C A8 63 02 14 */ lha r3, 0x214(r3) -/* 801C9440 38 03 FF FF */ addi r0, r3, -1 -/* 801C9444 B0 1F 02 14 */ sth r0, 0x214(r31) -/* 801C9448 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C944C C8 22 A7 40 */ lfd f1, lit_4358(r2) -/* 801C9450 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C9454 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C9458 3C 00 43 30 */ lis r0, 0x4330 -/* 801C945C 90 01 00 08 */ stw r0, 8(r1) -/* 801C9460 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C9464 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801C9468 C0 02 A7 3C */ lfs f0, lit_4353(r2) -/* 801C946C EC 01 00 24 */ fdivs f0, f1, f0 -/* 801C9470 D0 1F 01 EC */ stfs f0, 0x1ec(r31) -/* 801C9474 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9478 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C947C 48 00 7F FD */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf -/* 801C9480 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9484 38 80 00 01 */ li r4, 1 -/* 801C9488 C0 22 A7 28 */ lfs f1, lit_4158(r2) -/* 801C948C 48 00 E2 89 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf -/* 801C9490 A8 1F 02 14 */ lha r0, 0x214(r31) -/* 801C9494 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9498 41 81 00 2C */ bgt lbl_801C94C4 -/* 801C949C 88 1F 03 07 */ lbz r0, 0x307(r31) -/* 801C94A0 28 00 00 01 */ cmplwi r0, 1 -/* 801C94A4 40 82 00 14 */ bne lbl_801C94B8 -/* 801C94A8 7F E3 FB 78 */ mr r3, r31 -/* 801C94AC 38 80 00 08 */ li r4, 8 -/* 801C94B0 48 00 22 21 */ bl setProcess__12dMenu_Fmap_cFUc -/* 801C94B4 48 00 00 10 */ b lbl_801C94C4 -lbl_801C94B8: -/* 801C94B8 7F E3 FB 78 */ mr r3, r31 -/* 801C94BC 38 80 00 06 */ li r4, 6 -/* 801C94C0 48 00 22 11 */ bl setProcess__12dMenu_Fmap_cFUc -lbl_801C94C4: -/* 801C94C4 80 1F 02 04 */ lwz r0, 0x204(r31) -/* 801C94C8 2C 00 00 00 */ cmpwi r0, 0 -/* 801C94CC 41 80 00 18 */ blt lbl_801C94E4 -/* 801C94D0 7F E3 FB 78 */ mr r3, r31 -/* 801C94D4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C94D8 38 A0 00 01 */ li r5, 1 -/* 801C94DC 48 00 22 05 */ bl setFlash__12dMenu_Fmap_cFUcb -/* 801C94E0 48 00 00 18 */ b lbl_801C94F8 -lbl_801C94E4: -/* 801C94E4 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801C94E8 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801C94EC 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801C94F0 38 00 00 00 */ li r0, 0 -/* 801C94F4 98 03 00 D8 */ stb r0, 0xd8(r3) -lbl_801C94F8: -/* 801C94F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C94FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C9500 7C 08 03 A6 */ mtlr r0 -/* 801C9504 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C9508 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/__ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s b/asm/d/menu/d_menu_fmap2D/__ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s deleted file mode 100644 index 21af4799db..0000000000 --- a/asm/d/menu/d_menu_fmap2D/__ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s +++ /dev/null @@ -1,744 +0,0 @@ -lbl_801D5BD0: -/* 801D5BD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D5BD4 7C 08 02 A6 */ mflr r0 -/* 801D5BD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D5BDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D5BE0 48 18 C5 E9 */ bl _savegpr_24 -/* 801D5BE4 7C 7F 1B 78 */ mr r31, r3 -/* 801D5BE8 3C A0 80 39 */ lis r5, cur_tag_3868@ha /* 0x80396248@ha */ -/* 801D5BEC 3B C5 62 48 */ addi r30, r5, cur_tag_3868@l /* 0x80396248@l */ -/* 801D5BF0 3C A0 80 3A */ lis r5, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801D5BF4 38 05 6F 88 */ addi r0, r5, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801D5BF8 90 03 00 00 */ stw r0, 0(r3) -/* 801D5BFC 3C A0 80 3C */ lis r5, __vt__17dMenu_Fmap2DTop_c@ha /* 0x803BD750@ha */ -/* 801D5C00 38 05 D7 50 */ addi r0, r5, __vt__17dMenu_Fmap2DTop_c@l /* 0x803BD750@l */ -/* 801D5C04 90 03 00 00 */ stw r0, 0(r3) -/* 801D5C08 90 83 00 04 */ stw r4, 4(r3) -/* 801D5C0C C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D5C10 D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801D5C14 D0 03 00 7C */ stfs f0, 0x7c(r3) -/* 801D5C18 38 00 00 00 */ li r0, 0 -/* 801D5C1C 90 03 00 70 */ stw r0, 0x70(r3) -/* 801D5C20 90 03 00 6C */ stw r0, 0x6c(r3) -/* 801D5C24 38 60 01 18 */ li r3, 0x118 -/* 801D5C28 48 0F 90 25 */ bl __nw__FUl -/* 801D5C2C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5C30 41 82 00 0C */ beq lbl_801D5C3C -/* 801D5C34 48 12 28 65 */ bl __ct__9J2DScreenFv -/* 801D5C38 7C 60 1B 78 */ mr r0, r3 -lbl_801D5C3C: -/* 801D5C3C 90 1F 00 08 */ stw r0, 8(r31) -/* 801D5C40 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D5C44 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D5C48 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D5C4C 38 84 00 85 */ addi r4, r4, 0x85 -/* 801D5C50 3C A0 01 02 */ lis r5, 0x102 -/* 801D5C54 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D5C58 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D5C5C 80 DD 5C BC */ lwz r6, 0x5cbc(r29) -/* 801D5C60 48 12 29 E9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801D5C64 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D5C68 48 07 F4 81 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801D5C6C 38 60 00 2C */ li r3, 0x2c -/* 801D5C70 48 0F 8F DD */ bl __nw__FUl -/* 801D5C74 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5C78 41 82 00 24 */ beq lbl_801D5C9C -/* 801D5C7C 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5C80 3C A0 52 4F */ lis r5, 0x524F /* 0x524F4F54@ha */ -/* 801D5C84 38 C5 4F 54 */ addi r6, r5, 0x4F54 /* 0x524F4F54@l */ -/* 801D5C88 38 A0 00 00 */ li r5, 0 -/* 801D5C8C 38 E0 00 02 */ li r7, 2 -/* 801D5C90 39 00 00 00 */ li r8, 0 -/* 801D5C94 48 07 FF D5 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5C98 7C 60 1B 78 */ mr r0, r3 -lbl_801D5C9C: -/* 801D5C9C 90 1F 00 0C */ stw r0, 0xc(r31) -/* 801D5CA0 38 60 00 1C */ li r3, 0x1c -/* 801D5CA4 48 0F 8F A9 */ bl __nw__FUl -/* 801D5CA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5CAC 41 82 00 28 */ beq lbl_801D5CD4 -/* 801D5CB0 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5CB4 3C A0 69 5F */ lis r5, 0x695F /* 0x695F3034@ha */ -/* 801D5CB8 38 C5 30 34 */ addi r6, r5, 0x3034 /* 0x695F3034@l */ -/* 801D5CBC 3C A0 00 79 */ lis r5, 0x0079 /* 0x0079616A@ha */ -/* 801D5CC0 38 A5 61 6A */ addi r5, r5, 0x616A /* 0x0079616A@l */ -/* 801D5CC4 38 E0 00 00 */ li r7, 0 -/* 801D5CC8 39 00 00 00 */ li r8, 0 -/* 801D5CCC 48 07 F7 31 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5CD0 7C 60 1B 78 */ mr r0, r3 -lbl_801D5CD4: -/* 801D5CD4 90 1F 00 38 */ stw r0, 0x38(r31) -/* 801D5CD8 38 60 00 1C */ li r3, 0x1c -/* 801D5CDC 48 0F 8F 71 */ bl __nw__FUl -/* 801D5CE0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5CE4 41 82 00 28 */ beq lbl_801D5D0C -/* 801D5CE8 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5CEC 3C A0 69 5F */ lis r5, 0x695F /* 0x695F3035@ha */ -/* 801D5CF0 38 C5 30 35 */ addi r6, r5, 0x3035 /* 0x695F3035@l */ -/* 801D5CF4 3C A0 00 79 */ lis r5, 0x0079 /* 0x0079616A@ha */ -/* 801D5CF8 38 A5 61 6A */ addi r5, r5, 0x616A /* 0x0079616A@l */ -/* 801D5CFC 38 E0 00 00 */ li r7, 0 -/* 801D5D00 39 00 00 00 */ li r8, 0 -/* 801D5D04 48 07 F6 F9 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5D08 7C 60 1B 78 */ mr r0, r3 -lbl_801D5D0C: -/* 801D5D0C 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 801D5D10 38 60 00 1C */ li r3, 0x1c -/* 801D5D14 48 0F 8F 39 */ bl __nw__FUl -/* 801D5D18 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5D1C 41 82 00 28 */ beq lbl_801D5D44 -/* 801D5D20 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5D24 3C A0 69 5F */ lis r5, 0x695F /* 0x695F3036@ha */ -/* 801D5D28 38 C5 30 36 */ addi r6, r5, 0x3036 /* 0x695F3036@l */ -/* 801D5D2C 3C A0 00 79 */ lis r5, 0x0079 /* 0x0079616A@ha */ -/* 801D5D30 38 A5 61 6A */ addi r5, r5, 0x616A /* 0x0079616A@l */ -/* 801D5D34 38 E0 00 00 */ li r7, 0 -/* 801D5D38 39 00 00 00 */ li r8, 0 -/* 801D5D3C 48 07 F6 C1 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5D40 7C 60 1B 78 */ mr r0, r3 -lbl_801D5D44: -/* 801D5D44 90 1F 00 40 */ stw r0, 0x40(r31) -/* 801D5D48 38 60 00 1C */ li r3, 0x1c -/* 801D5D4C 48 0F 8F 01 */ bl __nw__FUl -/* 801D5D50 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5D54 41 82 00 28 */ beq lbl_801D5D7C -/* 801D5D58 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5D5C 3C A0 69 5F */ lis r5, 0x695F /* 0x695F3037@ha */ -/* 801D5D60 38 C5 30 37 */ addi r6, r5, 0x3037 /* 0x695F3037@l */ -/* 801D5D64 3C A0 00 79 */ lis r5, 0x0079 /* 0x0079616A@ha */ -/* 801D5D68 38 A5 61 6A */ addi r5, r5, 0x616A /* 0x0079616A@l */ -/* 801D5D6C 38 E0 00 00 */ li r7, 0 -/* 801D5D70 39 00 00 00 */ li r8, 0 -/* 801D5D74 48 07 F6 89 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5D78 7C 60 1B 78 */ mr r0, r3 -lbl_801D5D7C: -/* 801D5D7C 90 1F 00 44 */ stw r0, 0x44(r31) -/* 801D5D80 38 60 00 1C */ li r3, 0x1c -/* 801D5D84 48 0F 8E C9 */ bl __nw__FUl -/* 801D5D88 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5D8C 41 82 00 28 */ beq lbl_801D5DB4 -/* 801D5D90 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5D94 3C A0 5F 63 */ lis r5, 0x5F63 /* 0x5F635F6E@ha */ -/* 801D5D98 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F635F6E@l */ -/* 801D5D9C 3C A0 6A 75 */ lis r5, 0x6A75 /* 0x6A756A69@ha */ -/* 801D5DA0 38 A5 6A 69 */ addi r5, r5, 0x6A69 /* 0x6A756A69@l */ -/* 801D5DA4 38 E0 00 02 */ li r7, 2 -/* 801D5DA8 39 00 00 00 */ li r8, 0 -/* 801D5DAC 48 07 F6 51 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5DB0 7C 60 1B 78 */ mr r0, r3 -lbl_801D5DB4: -/* 801D5DB4 90 1F 00 34 */ stw r0, 0x34(r31) -/* 801D5DB8 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801D5DBC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5DC0 48 07 FA 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5DC4 38 60 00 1C */ li r3, 0x1c -/* 801D5DC8 48 0F 8E 85 */ bl __nw__FUl -/* 801D5DCC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5DD0 41 82 00 24 */ beq lbl_801D5DF4 -/* 801D5DD4 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5DD8 3C A0 61 73 */ lis r5, 0x6173 /* 0x61735F6E@ha */ -/* 801D5DDC 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x61735F6E@l */ -/* 801D5DE0 38 A0 00 00 */ li r5, 0 -/* 801D5DE4 38 E0 00 02 */ li r7, 2 -/* 801D5DE8 39 00 00 00 */ li r8, 0 -/* 801D5DEC 48 07 F6 11 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5DF0 7C 60 1B 78 */ mr r0, r3 -lbl_801D5DF4: -/* 801D5DF4 90 1F 00 30 */ stw r0, 0x30(r31) -/* 801D5DF8 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801D5DFC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5E00 48 07 F9 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5E04 38 60 00 6C */ li r3, 0x6c -/* 801D5E08 48 0F 8E 45 */ bl __nw__FUl -/* 801D5E0C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5E10 41 82 00 24 */ beq lbl_801D5E34 -/* 801D5E14 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5E18 3C A0 61 73 */ lis r5, 0x6173 /* 0x61735F6E@ha */ -/* 801D5E1C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x61735F6E@l */ -/* 801D5E20 38 A0 00 00 */ li r5, 0 -/* 801D5E24 38 E0 00 00 */ li r7, 0 -/* 801D5E28 39 00 00 00 */ li r8, 0 -/* 801D5E2C 48 07 DB 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5E30 7C 60 1B 78 */ mr r0, r3 -lbl_801D5E34: -/* 801D5E34 90 1F 00 58 */ stw r0, 0x58(r31) -/* 801D5E38 38 60 00 6C */ li r3, 0x6c -/* 801D5E3C 48 0F 8E 11 */ bl __nw__FUl -/* 801D5E40 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5E44 41 82 00 28 */ beq lbl_801D5E6C -/* 801D5E48 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5E4C 3C A0 5F 63 */ lis r5, 0x5F63 /* 0x5F635F6E@ha */ -/* 801D5E50 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F635F6E@l */ -/* 801D5E54 3C A0 6A 75 */ lis r5, 0x6A75 /* 0x6A756A69@ha */ -/* 801D5E58 38 A5 6A 69 */ addi r5, r5, 0x6A69 /* 0x6A756A69@l */ -/* 801D5E5C 38 E0 00 00 */ li r7, 0 -/* 801D5E60 39 00 00 00 */ li r8, 0 -/* 801D5E64 48 07 DB 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5E68 7C 60 1B 78 */ mr r0, r3 -lbl_801D5E6C: -/* 801D5E6C 90 1F 00 5C */ stw r0, 0x5c(r31) -/* 801D5E70 38 60 00 6C */ li r3, 0x6c -/* 801D5E74 48 0F 8D D9 */ bl __nw__FUl -/* 801D5E78 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5E7C 41 82 00 28 */ beq lbl_801D5EA4 -/* 801D5E80 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5E84 3C A0 6E 5F */ lis r5, 0x6E5F /* 0x6E5F6E31@ha */ -/* 801D5E88 38 C5 6E 31 */ addi r6, r5, 0x6E31 /* 0x6E5F6E31@l */ -/* 801D5E8C 3C A0 00 61 */ lis r5, 0x0061 /* 0x00616274@ha */ -/* 801D5E90 38 A5 62 74 */ addi r5, r5, 0x6274 /* 0x00616274@l */ -/* 801D5E94 38 E0 00 02 */ li r7, 2 -/* 801D5E98 39 00 00 00 */ li r8, 0 -/* 801D5E9C 48 07 DA E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5EA0 7C 60 1B 78 */ mr r0, r3 -lbl_801D5EA4: -/* 801D5EA4 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801D5EA8 38 60 00 6C */ li r3, 0x6c -/* 801D5EAC 48 0F 8D A1 */ bl __nw__FUl -/* 801D5EB0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5EB4 41 82 00 28 */ beq lbl_801D5EDC -/* 801D5EB8 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5EBC 3C A0 6E 5F */ lis r5, 0x6E5F /* 0x6E5F6E31@ha */ -/* 801D5EC0 38 C5 6E 31 */ addi r6, r5, 0x6E31 /* 0x6E5F6E31@l */ -/* 801D5EC4 3C A0 00 62 */ lis r5, 0x0062 /* 0x00626274@ha */ -/* 801D5EC8 38 A5 62 74 */ addi r5, r5, 0x6274 /* 0x00626274@l */ -/* 801D5ECC 38 E0 00 02 */ li r7, 2 -/* 801D5ED0 39 00 00 00 */ li r8, 0 -/* 801D5ED4 48 07 DA B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5ED8 7C 60 1B 78 */ mr r0, r3 -lbl_801D5EDC: -/* 801D5EDC 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 801D5EE0 38 60 00 6C */ li r3, 0x6c -/* 801D5EE4 48 0F 8D 69 */ bl __nw__FUl -/* 801D5EE8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5EEC 41 82 00 28 */ beq lbl_801D5F14 -/* 801D5EF0 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5EF4 3C A0 6E 5F */ lis r5, 0x6E5F /* 0x6E5F6E31@ha */ -/* 801D5EF8 38 C5 6E 31 */ addi r6, r5, 0x6E31 /* 0x6E5F6E31@l */ -/* 801D5EFC 3C A0 00 7A */ lis r5, 0x007A /* 0x007A6274@ha */ -/* 801D5F00 38 A5 62 74 */ addi r5, r5, 0x6274 /* 0x007A6274@l */ -/* 801D5F04 38 E0 00 02 */ li r7, 2 -/* 801D5F08 39 00 00 00 */ li r8, 0 -/* 801D5F0C 48 07 DA 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5F10 7C 60 1B 78 */ mr r0, r3 -lbl_801D5F14: -/* 801D5F14 90 1F 00 20 */ stw r0, 0x20(r31) -/* 801D5F18 38 60 00 6C */ li r3, 0x6c -/* 801D5F1C 48 0F 8D 31 */ bl __nw__FUl -/* 801D5F20 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5F24 41 82 00 28 */ beq lbl_801D5F4C -/* 801D5F28 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5F2C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 801D5F30 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 801D5F34 3C A0 61 5F */ lis r5, 0x615F /* 0x615F7465@ha */ -/* 801D5F38 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x615F7465@l */ -/* 801D5F3C 38 E0 00 02 */ li r7, 2 -/* 801D5F40 39 00 00 00 */ li r8, 0 -/* 801D5F44 48 07 DA 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5F48 7C 60 1B 78 */ mr r0, r3 -lbl_801D5F4C: -/* 801D5F4C 90 1F 00 24 */ stw r0, 0x24(r31) -/* 801D5F50 38 60 00 6C */ li r3, 0x6c -/* 801D5F54 48 0F 8C F9 */ bl __nw__FUl -/* 801D5F58 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5F5C 41 82 00 28 */ beq lbl_801D5F84 -/* 801D5F60 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5F64 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 801D5F68 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 801D5F6C 3C A0 62 5F */ lis r5, 0x625F /* 0x625F7465@ha */ -/* 801D5F70 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x625F7465@l */ -/* 801D5F74 38 E0 00 02 */ li r7, 2 -/* 801D5F78 39 00 00 00 */ li r8, 0 -/* 801D5F7C 48 07 DA 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5F80 7C 60 1B 78 */ mr r0, r3 -lbl_801D5F84: -/* 801D5F84 90 1F 00 28 */ stw r0, 0x28(r31) -/* 801D5F88 38 60 00 6C */ li r3, 0x6c -/* 801D5F8C 48 0F 8C C1 */ bl __nw__FUl -/* 801D5F90 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D5F94 41 82 00 28 */ beq lbl_801D5FBC -/* 801D5F98 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D5F9C 3C A0 78 74 */ lis r5, 0x7874 /* 0x78745F6E@ha */ -/* 801D5FA0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x78745F6E@l */ -/* 801D5FA4 3C A0 7A 5F */ lis r5, 0x7A5F /* 0x7A5F7465@ha */ -/* 801D5FA8 38 A5 74 65 */ addi r5, r5, 0x7465 /* 0x7A5F7465@l */ -/* 801D5FAC 38 E0 00 02 */ li r7, 2 -/* 801D5FB0 39 00 00 00 */ li r8, 0 -/* 801D5FB4 48 07 D9 D1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D5FB8 7C 60 1B 78 */ mr r0, r3 -lbl_801D5FBC: -/* 801D5FBC 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 801D5FC0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801D5FC4 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5FC8 48 07 F8 09 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5FCC 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D5FD0 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5FD4 48 07 F7 FD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5FD8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801D5FDC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5FE0 48 07 F7 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5FE4 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 801D5FE8 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5FEC 48 07 F7 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5FF0 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D5FF4 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D5FF8 48 07 F7 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D5FFC 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 801D6000 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D6004 48 07 F7 CD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D6008 38 60 00 6C */ li r3, 0x6c -/* 801D600C 48 0F 8C 41 */ bl __nw__FUl -/* 801D6010 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D6014 41 82 00 24 */ beq lbl_801D6038 -/* 801D6018 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D601C 3C A0 6D 65 */ lis r5, 0x6D65 /* 0x6D655F6E@ha */ -/* 801D6020 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6D655F6E@l */ -/* 801D6024 38 A0 6E 61 */ li r5, 0x6e61 -/* 801D6028 38 E0 00 00 */ li r7, 0 -/* 801D602C 39 00 00 00 */ li r8, 0 -/* 801D6030 48 07 D9 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D6034 7C 60 1B 78 */ mr r0, r3 -lbl_801D6038: -/* 801D6038 90 1F 00 50 */ stw r0, 0x50(r31) -/* 801D603C 38 60 00 6C */ li r3, 0x6c -/* 801D6040 48 0F 8C 0D */ bl __nw__FUl -/* 801D6044 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D6048 41 82 00 28 */ beq lbl_801D6070 -/* 801D604C 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D6050 3C A0 5F 6E */ lis r5, 0x5F6E /* 0x5F6E5F6E@ha */ -/* 801D6054 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F6E5F6E@l */ -/* 801D6058 3C A0 00 73 */ lis r5, 0x0073 /* 0x00737562@ha */ -/* 801D605C 38 A5 75 62 */ addi r5, r5, 0x7562 /* 0x00737562@l */ -/* 801D6060 38 E0 00 00 */ li r7, 0 -/* 801D6064 39 00 00 00 */ li r8, 0 -/* 801D6068 48 07 D9 1D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D606C 7C 60 1B 78 */ mr r0, r3 -lbl_801D6070: -/* 801D6070 90 1F 00 54 */ stw r0, 0x54(r31) -/* 801D6074 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D6078 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801D607C 88 04 00 BF */ lbz r0, 0xbf(r4) -/* 801D6080 28 00 00 09 */ cmplwi r0, 9 -/* 801D6084 40 82 00 14 */ bne lbl_801D6098 -/* 801D6088 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 801D608C 48 07 F5 7D */ bl hide__13CPaneMgrAlphaFv -/* 801D6090 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 801D6094 48 07 F5 75 */ bl hide__13CPaneMgrAlphaFv -lbl_801D6098: -/* 801D6098 38 60 00 6C */ li r3, 0x6c -/* 801D609C 48 0F 8B B1 */ bl __nw__FUl -/* 801D60A0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D60A4 41 82 00 24 */ beq lbl_801D60C8 -/* 801D60A8 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D60AC 3C A0 6E 74 */ lis r5, 0x6E74 /* 0x6E745F6E@ha */ -/* 801D60B0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6E745F6E@l */ -/* 801D60B4 38 A0 63 6F */ li r5, 0x636f -/* 801D60B8 38 E0 00 00 */ li r7, 0 -/* 801D60BC 39 00 00 00 */ li r8, 0 -/* 801D60C0 48 07 D8 C5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801D60C4 7C 60 1B 78 */ mr r0, r3 -lbl_801D60C8: -/* 801D60C8 90 1F 00 60 */ stw r0, 0x60(r31) -/* 801D60CC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D60D0 D0 3F 00 88 */ stfs f1, 0x88(r31) -/* 801D60D4 D0 3F 00 84 */ stfs f1, 0x84(r31) -/* 801D60D8 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D60DC D0 1F 00 8C */ stfs f0, 0x8c(r31) -/* 801D60E0 D0 3F 00 94 */ stfs f1, 0x94(r31) -/* 801D60E4 D0 3F 00 90 */ stfs f1, 0x90(r31) -/* 801D60E8 D0 1F 00 98 */ stfs f0, 0x98(r31) -/* 801D60EC D0 3F 00 A0 */ stfs f1, 0xa0(r31) -/* 801D60F0 D0 3F 00 9C */ stfs f1, 0x9c(r31) -/* 801D60F4 D0 1F 00 A4 */ stfs f0, 0xa4(r31) -/* 801D60F8 D0 3F 00 AC */ stfs f1, 0xac(r31) -/* 801D60FC D0 3F 00 A8 */ stfs f1, 0xa8(r31) -/* 801D6100 D0 1F 00 B0 */ stfs f0, 0xb0(r31) -/* 801D6104 D0 3F 00 B8 */ stfs f1, 0xb8(r31) -/* 801D6108 D0 3F 00 B4 */ stfs f1, 0xb4(r31) -/* 801D610C D0 1F 00 BC */ stfs f0, 0xbc(r31) -/* 801D6110 38 60 00 04 */ li r3, 4 -/* 801D6114 64 63 00 04 */ oris r3, r3, 4 -/* 801D6118 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 801D611C 38 60 00 05 */ li r3, 5 -/* 801D6120 64 63 00 05 */ oris r3, r3, 5 -/* 801D6124 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 801D6128 38 60 00 06 */ li r3, 6 -/* 801D612C 64 63 00 06 */ oris r3, r3, 6 -/* 801D6130 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 801D6134 38 60 00 07 */ li r3, 7 -/* 801D6138 64 63 00 07 */ oris r3, r3, 7 -/* 801D613C 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 801D6140 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6144 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6148 38 64 00 A0 */ addi r3, r4, 0xa0 -/* 801D614C 80 9D 5C BC */ lwz r4, 0x5cbc(r29) -/* 801D6150 48 0F E1 21 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801D6154 48 13 29 19 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 801D6158 90 7F 00 10 */ stw r3, 0x10(r31) -/* 801D615C 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801D6160 80 9F 00 08 */ lwz r4, 8(r31) -/* 801D6164 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6168 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D616C 7D 89 03 A6 */ mtctr r12 -/* 801D6170 4E 80 04 21 */ bctrl -/* 801D6174 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D6178 D0 1F 00 74 */ stfs f0, 0x74(r31) -/* 801D617C 3B 00 00 00 */ li r24, 0 -/* 801D6180 3B A0 00 00 */ li r29, 0 -/* 801D6184 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6188 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D618C 3B 5E 00 40 */ addi r26, r30, 0x40 -lbl_801D6190: -/* 801D6190 4B E3 E9 75 */ bl mDoExt_getRubyFont__Fv -/* 801D6194 7C 7C 1B 78 */ mr r28, r3 -/* 801D6198 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D619C 3B 3E 00 58 */ addi r25, r30, 0x58 -/* 801D61A0 7F 39 EA 14 */ add r25, r25, r29 -/* 801D61A4 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D61A8 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D61AC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D61B0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D61B4 7D 89 03 A6 */ mtctr r12 -/* 801D61B8 4E 80 04 21 */ bctrl -/* 801D61BC 7F 84 E3 78 */ mr r4, r28 -/* 801D61C0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D61C4 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D61C8 7D 89 03 A6 */ mtctr r12 -/* 801D61CC 4E 80 04 21 */ bctrl -/* 801D61D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D61D4 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D61D8 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D61DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D61E0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D61E4 7D 89 03 A6 */ mtctr r12 -/* 801D61E8 4E 80 04 21 */ bctrl -/* 801D61EC 38 80 00 40 */ li r4, 0x40 -/* 801D61F0 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D61F4 4C C6 31 82 */ crclr 6 -/* 801D61F8 48 12 A5 55 */ bl setString__10J2DTextBoxFsPCce -/* 801D61FC 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6200 7C DA EA 14 */ add r6, r26, r29 -/* 801D6204 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D6208 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D620C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6210 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6214 7D 89 03 A6 */ mtctr r12 -/* 801D6218 4E 80 04 21 */ bctrl -/* 801D621C 38 00 00 00 */ li r0, 0 -/* 801D6220 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D6224 3B 18 00 01 */ addi r24, r24, 1 -/* 801D6228 2C 18 00 03 */ cmpwi r24, 3 -/* 801D622C 3B BD 00 08 */ addi r29, r29, 8 -/* 801D6230 41 80 FF 60 */ blt lbl_801D6190 -/* 801D6234 3B 00 00 00 */ li r24, 0 -/* 801D6238 3B A0 00 00 */ li r29, 0 -/* 801D623C 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6240 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6244 3B 5E 00 70 */ addi r26, r30, 0x70 -lbl_801D6248: -/* 801D6248 4B E3 E8 BD */ bl mDoExt_getRubyFont__Fv -/* 801D624C 7C 7C 1B 78 */ mr r28, r3 -/* 801D6250 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6254 3B 3E 00 A8 */ addi r25, r30, 0xa8 -/* 801D6258 7F 39 EA 14 */ add r25, r25, r29 -/* 801D625C 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6260 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6264 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6268 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D626C 7D 89 03 A6 */ mtctr r12 -/* 801D6270 4E 80 04 21 */ bctrl -/* 801D6274 7F 84 E3 78 */ mr r4, r28 -/* 801D6278 81 83 00 00 */ lwz r12, 0(r3) -/* 801D627C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D6280 7D 89 03 A6 */ mtctr r12 -/* 801D6284 4E 80 04 21 */ bctrl -/* 801D6288 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D628C 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6290 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6294 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6298 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D629C 7D 89 03 A6 */ mtctr r12 -/* 801D62A0 4E 80 04 21 */ bctrl -/* 801D62A4 38 80 00 40 */ li r4, 0x40 -/* 801D62A8 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D62AC 4C C6 31 82 */ crclr 6 -/* 801D62B0 48 12 A4 9D */ bl setString__10J2DTextBoxFsPCce -/* 801D62B4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D62B8 7C DA EA 14 */ add r6, r26, r29 -/* 801D62BC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D62C0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D62C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801D62C8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D62CC 7D 89 03 A6 */ mtctr r12 -/* 801D62D0 4E 80 04 21 */ bctrl -/* 801D62D4 38 00 00 00 */ li r0, 0 -/* 801D62D8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D62DC 3B 18 00 01 */ addi r24, r24, 1 -/* 801D62E0 2C 18 00 07 */ cmpwi r24, 7 -/* 801D62E4 3B BD 00 08 */ addi r29, r29, 8 -/* 801D62E8 41 80 FF 60 */ blt lbl_801D6248 -/* 801D62EC 7F E3 FB 78 */ mr r3, r31 -/* 801D62F0 38 80 03 E0 */ li r4, 0x3e0 -/* 801D62F4 48 00 0C 45 */ bl setTitleNameString__17dMenu_Fmap2DTop_cFUl -/* 801D62F8 3B 00 00 00 */ li r24, 0 -/* 801D62FC 3B A0 00 00 */ li r29, 0 -/* 801D6300 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6304 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6308 3B 5E 00 E0 */ addi r26, r30, 0xe0 -lbl_801D630C: -/* 801D630C 4B E3 E6 E5 */ bl mDoExt_getMesgFont__Fv -/* 801D6310 7C 7C 1B 78 */ mr r28, r3 -/* 801D6314 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6318 3B 3E 01 08 */ addi r25, r30, 0x108 -/* 801D631C 7F 39 EA 14 */ add r25, r25, r29 -/* 801D6320 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6324 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6328 81 83 00 00 */ lwz r12, 0(r3) -/* 801D632C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6330 7D 89 03 A6 */ mtctr r12 -/* 801D6334 4E 80 04 21 */ bctrl -/* 801D6338 7F 84 E3 78 */ mr r4, r28 -/* 801D633C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6340 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D6344 7D 89 03 A6 */ mtctr r12 -/* 801D6348 4E 80 04 21 */ bctrl -/* 801D634C 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6350 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6354 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6358 81 83 00 00 */ lwz r12, 0(r3) -/* 801D635C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6360 7D 89 03 A6 */ mtctr r12 -/* 801D6364 4E 80 04 21 */ bctrl -/* 801D6368 38 80 00 20 */ li r4, 0x20 -/* 801D636C 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D6370 4C C6 31 82 */ crclr 6 -/* 801D6374 48 12 A3 D9 */ bl setString__10J2DTextBoxFsPCce -/* 801D6378 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D637C 7C DA EA 14 */ add r6, r26, r29 -/* 801D6380 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D6384 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D6388 81 83 00 00 */ lwz r12, 0(r3) -/* 801D638C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6390 7D 89 03 A6 */ mtctr r12 -/* 801D6394 4E 80 04 21 */ bctrl -/* 801D6398 38 00 00 00 */ li r0, 0 -/* 801D639C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D63A0 3B 18 00 01 */ addi r24, r24, 1 -/* 801D63A4 2C 18 00 05 */ cmpwi r24, 5 -/* 801D63A8 3B BD 00 08 */ addi r29, r29, 8 -/* 801D63AC 41 80 FF 60 */ blt lbl_801D630C -/* 801D63B0 7F E3 FB 78 */ mr r3, r31 -/* 801D63B4 38 80 05 29 */ li r4, 0x529 -/* 801D63B8 38 A0 00 FF */ li r5, 0xff -/* 801D63BC 48 00 0D 2D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801D63C0 3B 00 00 00 */ li r24, 0 -/* 801D63C4 3B A0 00 00 */ li r29, 0 -/* 801D63C8 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D63CC 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D63D0 3B 5E 01 30 */ addi r26, r30, 0x130 -lbl_801D63D4: -/* 801D63D4 4B E3 E6 1D */ bl mDoExt_getMesgFont__Fv -/* 801D63D8 7C 7C 1B 78 */ mr r28, r3 -/* 801D63DC 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D63E0 3B 3E 01 58 */ addi r25, r30, 0x158 -/* 801D63E4 7F 39 EA 14 */ add r25, r25, r29 -/* 801D63E8 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D63EC 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D63F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D63F4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D63F8 7D 89 03 A6 */ mtctr r12 -/* 801D63FC 4E 80 04 21 */ bctrl -/* 801D6400 7F 84 E3 78 */ mr r4, r28 -/* 801D6404 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6408 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D640C 7D 89 03 A6 */ mtctr r12 -/* 801D6410 4E 80 04 21 */ bctrl -/* 801D6414 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6418 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D641C 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6420 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6424 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6428 7D 89 03 A6 */ mtctr r12 -/* 801D642C 4E 80 04 21 */ bctrl -/* 801D6430 38 80 00 20 */ li r4, 0x20 -/* 801D6434 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D6438 4C C6 31 82 */ crclr 6 -/* 801D643C 48 12 A3 11 */ bl setString__10J2DTextBoxFsPCce -/* 801D6440 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6444 7C DA EA 14 */ add r6, r26, r29 -/* 801D6448 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D644C 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D6450 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6454 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6458 7D 89 03 A6 */ mtctr r12 -/* 801D645C 4E 80 04 21 */ bctrl -/* 801D6460 38 00 00 00 */ li r0, 0 -/* 801D6464 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D6468 3B 18 00 01 */ addi r24, r24, 1 -/* 801D646C 2C 18 00 05 */ cmpwi r24, 5 -/* 801D6470 3B BD 00 08 */ addi r29, r29, 8 -/* 801D6474 41 80 FF 60 */ blt lbl_801D63D4 -/* 801D6478 7F E3 FB 78 */ mr r3, r31 -/* 801D647C 38 80 05 22 */ li r4, 0x522 -/* 801D6480 38 A0 00 FF */ li r5, 0xff -/* 801D6484 48 00 0D 8D */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801D6488 3B 00 00 00 */ li r24, 0 -/* 801D648C 3B A0 00 00 */ li r29, 0 -/* 801D6490 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6494 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6498 3B 5E 01 80 */ addi r26, r30, 0x180 -lbl_801D649C: -/* 801D649C 4B E3 E5 55 */ bl mDoExt_getMesgFont__Fv -/* 801D64A0 7C 7C 1B 78 */ mr r28, r3 -/* 801D64A4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D64A8 3B 3E 01 A8 */ addi r25, r30, 0x1a8 -/* 801D64AC 7F 39 EA 14 */ add r25, r25, r29 -/* 801D64B0 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D64B4 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D64B8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D64BC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D64C0 7D 89 03 A6 */ mtctr r12 -/* 801D64C4 4E 80 04 21 */ bctrl -/* 801D64C8 7F 84 E3 78 */ mr r4, r28 -/* 801D64CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D64D0 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D64D4 7D 89 03 A6 */ mtctr r12 -/* 801D64D8 4E 80 04 21 */ bctrl -/* 801D64DC 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D64E0 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D64E4 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D64E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D64EC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D64F0 7D 89 03 A6 */ mtctr r12 -/* 801D64F4 4E 80 04 21 */ bctrl -/* 801D64F8 38 80 00 20 */ li r4, 0x20 -/* 801D64FC 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D6500 4C C6 31 82 */ crclr 6 -/* 801D6504 48 12 A2 49 */ bl setString__10J2DTextBoxFsPCce -/* 801D6508 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D650C 7C DA EA 14 */ add r6, r26, r29 -/* 801D6510 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D6514 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D6518 81 83 00 00 */ lwz r12, 0(r3) -/* 801D651C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6520 7D 89 03 A6 */ mtctr r12 -/* 801D6524 4E 80 04 21 */ bctrl -/* 801D6528 38 00 00 00 */ li r0, 0 -/* 801D652C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D6530 3B 18 00 01 */ addi r24, r24, 1 -/* 801D6534 2C 18 00 05 */ cmpwi r24, 5 -/* 801D6538 3B BD 00 08 */ addi r29, r29, 8 -/* 801D653C 41 80 FF 60 */ blt lbl_801D649C -/* 801D6540 7F E3 FB 78 */ mr r3, r31 -/* 801D6544 38 80 05 27 */ li r4, 0x527 -/* 801D6548 38 A0 00 FF */ li r5, 0xff -/* 801D654C 48 00 0D 89 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc -/* 801D6550 3B 00 00 00 */ li r24, 0 -/* 801D6554 3B A0 00 00 */ li r29, 0 -/* 801D6558 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D655C 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6560 3B 5E 01 D0 */ addi r26, r30, 0x1d0 -lbl_801D6564: -/* 801D6564 4B E3 E4 8D */ bl mDoExt_getMesgFont__Fv -/* 801D6568 7C 7C 1B 78 */ mr r28, r3 -/* 801D656C 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6570 3B 3E 01 F8 */ addi r25, r30, 0x1f8 -/* 801D6574 7F 39 EA 14 */ add r25, r25, r29 -/* 801D6578 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D657C 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6580 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6584 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6588 7D 89 03 A6 */ mtctr r12 -/* 801D658C 4E 80 04 21 */ bctrl -/* 801D6590 7F 84 E3 78 */ mr r4, r28 -/* 801D6594 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6598 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D659C 7D 89 03 A6 */ mtctr r12 -/* 801D65A0 4E 80 04 21 */ bctrl -/* 801D65A4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D65A8 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D65AC 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D65B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D65B4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D65B8 7D 89 03 A6 */ mtctr r12 -/* 801D65BC 4E 80 04 21 */ bctrl -/* 801D65C0 38 80 00 20 */ li r4, 0x20 -/* 801D65C4 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D65C8 4C C6 31 82 */ crclr 6 -/* 801D65CC 48 12 A1 81 */ bl setString__10J2DTextBoxFsPCce -/* 801D65D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D65D4 7C DA EA 14 */ add r6, r26, r29 -/* 801D65D8 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D65DC 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D65E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D65E4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D65E8 7D 89 03 A6 */ mtctr r12 -/* 801D65EC 4E 80 04 21 */ bctrl -/* 801D65F0 38 00 00 00 */ li r0, 0 -/* 801D65F4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D65F8 3B 18 00 01 */ addi r24, r24, 1 -/* 801D65FC 2C 18 00 05 */ cmpwi r24, 5 -/* 801D6600 3B BD 00 08 */ addi r29, r29, 8 -/* 801D6604 41 80 FF 60 */ blt lbl_801D6564 -/* 801D6608 7F E3 FB 78 */ mr r3, r31 -/* 801D660C 38 80 03 F9 */ li r4, 0x3f9 -/* 801D6610 48 00 0D 89 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl -/* 801D6614 3B 00 00 00 */ li r24, 0 -/* 801D6618 3B A0 00 00 */ li r29, 0 -/* 801D661C 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6620 3B 64 65 D0 */ addi r27, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6624 3B 9E 02 20 */ addi r28, r30, 0x220 -lbl_801D6628: -/* 801D6628 4B E3 E3 C9 */ bl mDoExt_getMesgFont__Fv -/* 801D662C 7C 7A 1B 78 */ mr r26, r3 -/* 801D6630 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6634 3B 3E 02 48 */ addi r25, r30, 0x248 -/* 801D6638 7F 39 EA 14 */ add r25, r25, r29 -/* 801D663C 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6640 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6644 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6648 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D664C 7D 89 03 A6 */ mtctr r12 -/* 801D6650 4E 80 04 21 */ bctrl -/* 801D6654 7F 44 D3 78 */ mr r4, r26 -/* 801D6658 81 83 00 00 */ lwz r12, 0(r3) -/* 801D665C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D6660 7D 89 03 A6 */ mtctr r12 -/* 801D6664 4E 80 04 21 */ bctrl -/* 801D6668 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D666C 80 B9 00 00 */ lwz r5, 0(r25) -/* 801D6670 80 D9 00 04 */ lwz r6, 4(r25) -/* 801D6674 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6678 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D667C 7D 89 03 A6 */ mtctr r12 -/* 801D6680 4E 80 04 21 */ bctrl -/* 801D6684 38 80 00 20 */ li r4, 0x20 -/* 801D6688 38 BB 00 BB */ addi r5, r27, 0xbb -/* 801D668C 4C C6 31 82 */ crclr 6 -/* 801D6690 48 12 A0 BD */ bl setString__10J2DTextBoxFsPCce -/* 801D6694 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6698 7C DC EA 14 */ add r6, r28, r29 -/* 801D669C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801D66A0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801D66A4 81 83 00 00 */ lwz r12, 0(r3) -/* 801D66A8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D66AC 7D 89 03 A6 */ mtctr r12 -/* 801D66B0 4E 80 04 21 */ bctrl -/* 801D66B4 38 00 00 00 */ li r0, 0 -/* 801D66B8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D66BC 3B 18 00 01 */ addi r24, r24, 1 -/* 801D66C0 2C 18 00 05 */ cmpwi r24, 5 -/* 801D66C4 3B BD 00 08 */ addi r29, r29, 8 -/* 801D66C8 41 80 FF 60 */ blt lbl_801D6628 -/* 801D66CC 7F E3 FB 78 */ mr r3, r31 -/* 801D66D0 38 80 05 24 */ li r4, 0x524 -/* 801D66D4 48 00 0E 19 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl -/* 801D66D8 7F E3 FB 78 */ mr r3, r31 -/* 801D66DC 38 80 00 01 */ li r4, 1 -/* 801D66E0 48 00 14 ED */ bl setHIO__17dMenu_Fmap2DTop_cFb -/* 801D66E4 7F E3 FB 78 */ mr r3, r31 -/* 801D66E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D66EC 48 18 BB 29 */ bl _restgpr_24 -/* 801D66F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D66F4 7C 08 03 A6 */ mtlr r0 -/* 801D66F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D66FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/__ct__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/__ct__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 6c64f00d0b..0000000000 --- a/asm/d/menu/d_menu_fmap2D/__ct__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,489 +0,0 @@ -lbl_801CF56C: -/* 801CF56C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801CF570 7C 08 02 A6 */ mflr r0 -/* 801CF574 90 01 00 44 */ stw r0, 0x44(r1) -/* 801CF578 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CF57C 48 19 2C 59 */ bl _savegpr_27 -/* 801CF580 7C 7F 1B 78 */ mr r31, r3 -/* 801CF584 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801CF588 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801CF58C 90 1F 00 00 */ stw r0, 0(r31) -/* 801CF590 38 7F 00 04 */ addi r3, r31, 4 -/* 801CF594 4B FF 31 85 */ bl __ct__16dMenuMapCommon_cFv -/* 801CF598 3C 60 80 3C */ lis r3, __vt__18dMenu_Fmap2DBack_c@ha /* 0x803BD760@ha */ -/* 801CF59C 38 63 D7 60 */ addi r3, r3, __vt__18dMenu_Fmap2DBack_c@l /* 0x803BD760@l */ -/* 801CF5A0 90 7F 00 00 */ stw r3, 0(r31) -/* 801CF5A4 38 03 00 0C */ addi r0, r3, 0xc -/* 801CF5A8 90 1F 00 04 */ stw r0, 4(r31) -/* 801CF5AC 38 00 FF FF */ li r0, -1 -/* 801CF5B0 90 1F 11 F0 */ stw r0, 0x11f0(r31) -/* 801CF5B4 90 1F 11 F4 */ stw r0, 0x11f4(r31) -/* 801CF5B8 90 1F 11 F8 */ stw r0, 0x11f8(r31) -/* 801CF5BC 90 1F 11 FC */ stw r0, 0x11fc(r31) -/* 801CF5C0 90 1F 12 00 */ stw r0, 0x1200(r31) -/* 801CF5C4 90 1F 12 04 */ stw r0, 0x1204(r31) -/* 801CF5C8 90 1F 12 08 */ stw r0, 0x1208(r31) -/* 801CF5CC 90 1F 12 0C */ stw r0, 0x120c(r31) -/* 801CF5D0 38 60 00 00 */ li r3, 0 -/* 801CF5D4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CF5D8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801CF5DC 98 64 00 F2 */ stb r3, 0xf2(r4) -/* 801CF5E0 38 80 00 00 */ li r4, 0 -/* 801CF5E4 38 A0 00 00 */ li r5, 0 -/* 801CF5E8 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801CF5EC 38 00 00 08 */ li r0, 8 -/* 801CF5F0 7C 09 03 A6 */ mtctr r0 -lbl_801CF5F4: -/* 801CF5F4 38 C0 00 00 */ li r6, 0 -/* 801CF5F8 38 03 0C B4 */ addi r0, r3, 0xcb4 -/* 801CF5FC 7C DF 01 2E */ stwx r6, r31, r0 -/* 801CF600 38 03 0E 8C */ addi r0, r3, 0xe8c -/* 801CF604 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF608 38 03 0E AC */ addi r0, r3, 0xeac -/* 801CF60C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF610 38 03 0E CC */ addi r0, r3, 0xecc -/* 801CF614 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF618 38 03 0E EC */ addi r0, r3, 0xeec -/* 801CF61C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF620 38 03 0F 0C */ addi r0, r3, 0xf0c -/* 801CF624 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF628 38 03 0F 2C */ addi r0, r3, 0xf2c -/* 801CF62C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF630 38 03 0F 4C */ addi r0, r3, 0xf4c -/* 801CF634 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF638 38 03 0F 6C */ addi r0, r3, 0xf6c -/* 801CF63C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF640 38 03 10 04 */ addi r0, r3, 0x1004 -/* 801CF644 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF648 38 03 10 24 */ addi r0, r3, 0x1024 -/* 801CF64C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF650 38 05 0C E8 */ addi r0, r5, 0xce8 -/* 801CF654 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF658 38 05 0C EC */ addi r0, r5, 0xcec -/* 801CF65C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF660 38 05 0C F0 */ addi r0, r5, 0xcf0 -/* 801CF664 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF668 38 05 0C F4 */ addi r0, r5, 0xcf4 -/* 801CF66C 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF670 38 05 0C F8 */ addi r0, r5, 0xcf8 -/* 801CF674 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF678 38 C0 00 FF */ li r6, 0xff -/* 801CF67C 38 04 12 1C */ addi r0, r4, 0x121c -/* 801CF680 7C DF 01 AE */ stbx r6, r31, r0 -/* 801CF684 38 04 12 30 */ addi r0, r4, 0x1230 -/* 801CF688 7C DF 01 AE */ stbx r6, r31, r0 -/* 801CF68C 38 03 0D 8C */ addi r0, r3, 0xd8c -/* 801CF690 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF694 38 03 0D AC */ addi r0, r3, 0xdac -/* 801CF698 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF69C 38 03 0D CC */ addi r0, r3, 0xdcc -/* 801CF6A0 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6A4 38 03 0D EC */ addi r0, r3, 0xdec -/* 801CF6A8 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6AC 38 03 0E 0C */ addi r0, r3, 0xe0c -/* 801CF6B0 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6B4 38 03 0E 2C */ addi r0, r3, 0xe2c -/* 801CF6B8 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6BC 38 03 0E 4C */ addi r0, r3, 0xe4c -/* 801CF6C0 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6C4 38 03 0E 6C */ addi r0, r3, 0xe6c -/* 801CF6C8 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6CC 38 84 00 01 */ addi r4, r4, 1 -/* 801CF6D0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 801CF6D4 38 63 00 04 */ addi r3, r3, 4 -/* 801CF6D8 42 00 FF 1C */ bdnz lbl_801CF5F4 -/* 801CF6DC 38 60 00 00 */ li r3, 0 -/* 801CF6E0 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801CF6E4 38 00 00 14 */ li r0, 0x14 -/* 801CF6E8 7C 09 03 A6 */ mtctr r0 -lbl_801CF6EC: -/* 801CF6EC 38 03 10 44 */ addi r0, r3, 0x1044 -/* 801CF6F0 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6F4 38 03 10 94 */ addi r0, r3, 0x1094 -/* 801CF6F8 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF6FC 38 03 10 E4 */ addi r0, r3, 0x10e4 -/* 801CF700 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF704 38 03 11 34 */ addi r0, r3, 0x1134 -/* 801CF708 7C 1F 05 2E */ stfsx f0, r31, r0 -/* 801CF70C 38 63 00 04 */ addi r3, r3, 4 -/* 801CF710 42 00 FF DC */ bdnz lbl_801CF6EC -/* 801CF714 38 00 00 00 */ li r0, 0 -/* 801CF718 90 1F 0D 88 */ stw r0, 0xd88(r31) -/* 801CF71C C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801CF720 D0 3F 0F E0 */ stfs f1, 0xfe0(r31) -/* 801CF724 D0 3F 0F E4 */ stfs f1, 0xfe4(r31) -/* 801CF728 D0 3F 0F E8 */ stfs f1, 0xfe8(r31) -/* 801CF72C D0 3F 0F EC */ stfs f1, 0xfec(r31) -/* 801CF730 D0 3F 0F F0 */ stfs f1, 0xff0(r31) -/* 801CF734 D0 3F 0F F4 */ stfs f1, 0xff4(r31) -/* 801CF738 D0 3F 0F F8 */ stfs f1, 0xff8(r31) -/* 801CF73C D0 3F 0F FC */ stfs f1, 0xffc(r31) -/* 801CF740 D0 3F 10 00 */ stfs f1, 0x1000(r31) -/* 801CF744 D0 3F 11 84 */ stfs f1, 0x1184(r31) -/* 801CF748 D0 3F 11 88 */ stfs f1, 0x1188(r31) -/* 801CF74C D0 3F 0F 8C */ stfs f1, 0xf8c(r31) -/* 801CF750 D0 3F 0F 90 */ stfs f1, 0xf90(r31) -/* 801CF754 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801CF758 D0 1F 0F 94 */ stfs f0, 0xf94(r31) -/* 801CF75C D0 1F 0F 98 */ stfs f0, 0xf98(r31) -/* 801CF760 D0 3F 0F A0 */ stfs f1, 0xfa0(r31) -/* 801CF764 7F E3 FB 78 */ mr r3, r31 -/* 801CF768 48 00 33 F5 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801CF76C D0 3F 0F 9C */ stfs f1, 0xf9c(r31) -/* 801CF770 C0 42 A7 D4 */ lfs f2, lit_3971(r2) -/* 801CF774 D0 5F 0F A4 */ stfs f2, 0xfa4(r31) -/* 801CF778 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801CF77C D0 3F 0F A8 */ stfs f1, 0xfa8(r31) -/* 801CF780 38 80 00 00 */ li r4, 0 -/* 801CF784 90 9F 0C B0 */ stw r4, 0xcb0(r31) -/* 801CF788 90 9F 0C D4 */ stw r4, 0xcd4(r31) -/* 801CF78C D0 3F 0F BC */ stfs f1, 0xfbc(r31) -/* 801CF790 D0 3F 0F C0 */ stfs f1, 0xfc0(r31) -/* 801CF794 D0 3F 0F C4 */ stfs f1, 0xfc4(r31) -/* 801CF798 90 9F 0C DC */ stw r4, 0xcdc(r31) -/* 801CF79C 90 9F 0C E0 */ stw r4, 0xce0(r31) -/* 801CF7A0 98 9F 12 2D */ stb r4, 0x122d(r31) -/* 801CF7A4 98 9F 12 2E */ stb r4, 0x122e(r31) -/* 801CF7A8 98 9F 12 24 */ stb r4, 0x1224(r31) -/* 801CF7AC 98 9F 12 25 */ stb r4, 0x1225(r31) -/* 801CF7B0 D0 3F 0F C8 */ stfs f1, 0xfc8(r31) -/* 801CF7B4 D0 3F 0F CC */ stfs f1, 0xfcc(r31) -/* 801CF7B8 D0 3F 0F D0 */ stfs f1, 0xfd0(r31) -/* 801CF7BC D0 3F 0F D4 */ stfs f1, 0xfd4(r31) -/* 801CF7C0 D0 3F 0F D8 */ stfs f1, 0xfd8(r31) -/* 801CF7C4 D0 3F 0F DC */ stfs f1, 0xfdc(r31) -/* 801CF7C8 D0 3F 11 9C */ stfs f1, 0x119c(r31) -/* 801CF7CC D0 3F 11 A0 */ stfs f1, 0x11a0(r31) -/* 801CF7D0 D0 3F 11 B4 */ stfs f1, 0x11b4(r31) -/* 801CF7D4 D0 3F 11 B8 */ stfs f1, 0x11b8(r31) -/* 801CF7D8 D0 3F 11 BC */ stfs f1, 0x11bc(r31) -/* 801CF7DC D0 3F 11 C0 */ stfs f1, 0x11c0(r31) -/* 801CF7E0 D0 3F 11 C4 */ stfs f1, 0x11c4(r31) -/* 801CF7E4 D0 3F 11 C8 */ stfs f1, 0x11c8(r31) -/* 801CF7E8 D0 3F 11 CC */ stfs f1, 0x11cc(r31) -/* 801CF7EC D0 3F 11 D0 */ stfs f1, 0x11d0(r31) -/* 801CF7F0 98 9F 12 2C */ stb r4, 0x122c(r31) -/* 801CF7F4 98 9F 12 39 */ stb r4, 0x1239(r31) -/* 801CF7F8 98 9F 12 38 */ stb r4, 0x1238(r31) -/* 801CF7FC B0 9F 12 18 */ sth r4, 0x1218(r31) -/* 801CF800 B0 9F 12 1A */ sth r4, 0x121a(r31) -/* 801CF804 38 60 00 FF */ li r3, 0xff -/* 801CF808 98 7F 12 26 */ stb r3, 0x1226(r31) -/* 801CF80C 98 9F 12 27 */ stb r4, 0x1227(r31) -/* 801CF810 98 9F 12 28 */ stb r4, 0x1228(r31) -/* 801CF814 98 9F 12 29 */ stb r4, 0x1229(r31) -/* 801CF818 98 9F 12 2A */ stb r4, 0x122a(r31) -/* 801CF81C 38 00 00 01 */ li r0, 1 -/* 801CF820 98 1F 12 2B */ stb r0, 0x122b(r31) -/* 801CF824 D0 3F 0F B0 */ stfs f1, 0xfb0(r31) -/* 801CF828 D0 3F 0F B4 */ stfs f1, 0xfb4(r31) -/* 801CF82C D0 5F 0F B8 */ stfs f2, 0xfb8(r31) -/* 801CF830 D0 3F 11 D4 */ stfs f1, 0x11d4(r31) -/* 801CF834 D0 3F 11 90 */ stfs f1, 0x1190(r31) -/* 801CF838 D0 3F 11 8C */ stfs f1, 0x118c(r31) -/* 801CF83C D0 3F 11 A8 */ stfs f1, 0x11a8(r31) -/* 801CF840 D0 3F 11 A4 */ stfs f1, 0x11a4(r31) -/* 801CF844 D0 3F 11 B0 */ stfs f1, 0x11b0(r31) -/* 801CF848 D0 3F 11 AC */ stfs f1, 0x11ac(r31) -/* 801CF84C D0 3F 11 98 */ stfs f1, 0x1198(r31) -/* 801CF850 D0 3F 11 94 */ stfs f1, 0x1194(r31) -/* 801CF854 D0 3F 11 D8 */ stfs f1, 0x11d8(r31) -/* 801CF858 D0 3F 11 DC */ stfs f1, 0x11dc(r31) -/* 801CF85C C0 02 A7 D8 */ lfs f0, lit_3972(r2) -/* 801CF860 D0 1F 11 E0 */ stfs f0, 0x11e0(r31) -/* 801CF864 D0 3F 11 E4 */ stfs f1, 0x11e4(r31) -/* 801CF868 D0 3F 11 E8 */ stfs f1, 0x11e8(r31) -/* 801CF86C D0 3F 11 EC */ stfs f1, 0x11ec(r31) -/* 801CF870 98 9F 11 F0 */ stb r4, 0x11f0(r31) -/* 801CF874 98 9F 11 F1 */ stb r4, 0x11f1(r31) -/* 801CF878 98 9F 11 F2 */ stb r4, 0x11f2(r31) -/* 801CF87C 98 9F 11 F3 */ stb r4, 0x11f3(r31) -/* 801CF880 98 7F 11 F4 */ stb r3, 0x11f4(r31) -/* 801CF884 98 7F 11 F5 */ stb r3, 0x11f5(r31) -/* 801CF888 98 7F 11 F6 */ stb r3, 0x11f6(r31) -/* 801CF88C 98 7F 11 F7 */ stb r3, 0x11f7(r31) -/* 801CF890 98 9F 11 F8 */ stb r4, 0x11f8(r31) -/* 801CF894 98 9F 11 F9 */ stb r4, 0x11f9(r31) -/* 801CF898 98 9F 11 FA */ stb r4, 0x11fa(r31) -/* 801CF89C 98 9F 11 FB */ stb r4, 0x11fb(r31) -/* 801CF8A0 98 7F 11 FC */ stb r3, 0x11fc(r31) -/* 801CF8A4 98 7F 11 FD */ stb r3, 0x11fd(r31) -/* 801CF8A8 98 7F 11 FE */ stb r3, 0x11fe(r31) -/* 801CF8AC 98 7F 11 FF */ stb r3, 0x11ff(r31) -/* 801CF8B0 98 9F 12 00 */ stb r4, 0x1200(r31) -/* 801CF8B4 98 9F 12 01 */ stb r4, 0x1201(r31) -/* 801CF8B8 98 9F 12 02 */ stb r4, 0x1202(r31) -/* 801CF8BC 98 9F 12 03 */ stb r4, 0x1203(r31) -/* 801CF8C0 98 9F 12 04 */ stb r4, 0x1204(r31) -/* 801CF8C4 98 9F 12 05 */ stb r4, 0x1205(r31) -/* 801CF8C8 98 9F 12 06 */ stb r4, 0x1206(r31) -/* 801CF8CC 98 7F 12 07 */ stb r3, 0x1207(r31) -/* 801CF8D0 98 9F 12 08 */ stb r4, 0x1208(r31) -/* 801CF8D4 98 9F 12 09 */ stb r4, 0x1209(r31) -/* 801CF8D8 98 9F 12 0A */ stb r4, 0x120a(r31) -/* 801CF8DC 98 9F 12 0B */ stb r4, 0x120b(r31) -/* 801CF8E0 98 9F 12 0C */ stb r4, 0x120c(r31) -/* 801CF8E4 98 9F 12 0D */ stb r4, 0x120d(r31) -/* 801CF8E8 98 9F 12 0E */ stb r4, 0x120e(r31) -/* 801CF8EC 98 7F 12 0F */ stb r3, 0x120f(r31) -/* 801CF8F0 D0 5F 12 10 */ stfs f2, 0x1210(r31) -/* 801CF8F4 D0 5F 12 14 */ stfs f2, 0x1214(r31) -/* 801CF8F8 98 1F 12 3A */ stb r0, 0x123a(r31) -/* 801CF8FC 98 9F 12 2F */ stb r4, 0x122f(r31) -/* 801CF900 38 7F 00 04 */ addi r3, r31, 4 -/* 801CF904 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CF908 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CF90C 80 9E 5C BC */ lwz r4, 0x5cbc(r30) -/* 801CF910 4B FF 2F C9 */ bl initiate__16dMenuMapCommon_cFP10JKRArchive -/* 801CF914 38 60 01 18 */ li r3, 0x118 -/* 801CF918 48 0F F3 35 */ bl __nw__FUl -/* 801CF91C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CF920 41 82 00 0C */ beq lbl_801CF92C -/* 801CF924 48 12 8B 75 */ bl __ct__9J2DScreenFv -/* 801CF928 7C 60 1B 78 */ mr r0, r3 -lbl_801CF92C: -/* 801CF92C 90 1F 0C 98 */ stw r0, 0xc98(r31) -/* 801CF930 80 7F 0C 98 */ lwz r3, 0xc98(r31) -/* 801CF934 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801CF938 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801CF93C 3C A0 00 02 */ lis r5, 2 -/* 801CF940 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CF944 48 12 8D 05 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801CF948 80 7F 0C 98 */ lwz r3, 0xc98(r31) -/* 801CF94C 48 08 57 9D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801CF950 38 60 01 18 */ li r3, 0x118 -/* 801CF954 48 0F F2 F9 */ bl __nw__FUl -/* 801CF958 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CF95C 41 82 00 0C */ beq lbl_801CF968 -/* 801CF960 48 12 8B 39 */ bl __ct__9J2DScreenFv -/* 801CF964 7C 60 1B 78 */ mr r0, r3 -lbl_801CF968: -/* 801CF968 90 1F 0C 9C */ stw r0, 0xc9c(r31) -/* 801CF96C 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801CF970 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801CF974 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801CF978 38 84 00 20 */ addi r4, r4, 0x20 -/* 801CF97C 3C A0 00 02 */ lis r5, 2 -/* 801CF980 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CF984 48 12 8C C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801CF988 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801CF98C 48 08 57 5D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801CF990 3C 60 80 39 */ lis r3, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801CF994 38 63 65 D0 */ addi r3, r3, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801CF998 38 63 00 3A */ addi r3, r3, 0x3a -/* 801CF99C 80 9E 5C BC */ lwz r4, 0x5cbc(r30) -/* 801CF9A0 48 10 48 D1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801CF9A4 48 13 90 C9 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 801CF9A8 90 7F 0C E4 */ stw r3, 0xce4(r31) -/* 801CF9AC 80 7F 0C E4 */ lwz r3, 0xce4(r31) -/* 801CF9B0 80 9F 0C 9C */ lwz r4, 0xc9c(r31) -/* 801CF9B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801CF9B8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801CF9BC 7D 89 03 A6 */ mtctr r12 -/* 801CF9C0 4E 80 04 21 */ bctrl -/* 801CF9C4 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801CF9C8 D0 1F 0F AC */ stfs f0, 0xfac(r31) -/* 801CF9CC 38 60 00 2C */ li r3, 0x2c -/* 801CF9D0 48 0F F2 7D */ bl __nw__FUl -/* 801CF9D4 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CF9D8 41 82 00 24 */ beq lbl_801CF9FC -/* 801CF9DC 80 9F 0C 9C */ lwz r4, 0xc9c(r31) -/* 801CF9E0 3C A0 52 4F */ lis r5, 0x524F /* 0x524F4F54@ha */ -/* 801CF9E4 38 C5 4F 54 */ addi r6, r5, 0x4F54 /* 0x524F4F54@l */ -/* 801CF9E8 38 A0 00 00 */ li r5, 0 -/* 801CF9EC 38 E0 00 02 */ li r7, 2 -/* 801CF9F0 39 00 00 00 */ li r8, 0 -/* 801CF9F4 48 08 62 75 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap -/* 801CF9F8 7C 60 1B 78 */ mr r0, r3 -lbl_801CF9FC: -/* 801CF9FC 90 1F 0C A0 */ stw r0, 0xca0(r31) -/* 801CFA00 38 60 00 6C */ li r3, 0x6c -/* 801CFA04 48 0F F2 49 */ bl __nw__FUl -/* 801CFA08 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFA0C 41 82 00 28 */ beq lbl_801CFA34 -/* 801CFA10 80 9F 0C 9C */ lwz r4, 0xc9c(r31) -/* 801CFA14 3C A0 65 72 */ lis r5, 0x6572 /* 0x65725F6E@ha */ -/* 801CFA18 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x65725F6E@l */ -/* 801CFA1C 3C A0 63 65 */ lis r5, 0x6365 /* 0x63656E74@ha */ -/* 801CFA20 38 A5 6E 74 */ addi r5, r5, 0x6E74 /* 0x63656E74@l */ -/* 801CFA24 38 E0 00 00 */ li r7, 0 -/* 801CFA28 39 00 00 00 */ li r8, 0 -/* 801CFA2C 48 08 3F 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801CFA30 7C 60 1B 78 */ mr r0, r3 -lbl_801CFA34: -/* 801CFA34 90 1F 0C A4 */ stw r0, 0xca4(r31) -/* 801CFA38 38 60 00 6C */ li r3, 0x6c -/* 801CFA3C 48 0F F2 11 */ bl __nw__FUl -/* 801CFA40 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFA44 41 82 00 28 */ beq lbl_801CFA6C -/* 801CFA48 80 9F 0C 9C */ lwz r4, 0xc9c(r31) -/* 801CFA4C 3C A0 62 6C */ lis r5, 0x626C /* 0x626C616B@ha */ -/* 801CFA50 38 C5 61 6B */ addi r6, r5, 0x616B /* 0x626C616B@l */ -/* 801CFA54 3C A0 6D 61 */ lis r5, 0x6D61 /* 0x6D61705F@ha */ -/* 801CFA58 38 A5 70 5F */ addi r5, r5, 0x705F /* 0x6D61705F@l */ -/* 801CFA5C 38 E0 00 00 */ li r7, 0 -/* 801CFA60 39 00 00 00 */ li r8, 0 -/* 801CFA64 48 08 3F 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801CFA68 7C 60 1B 78 */ mr r0, r3 -lbl_801CFA6C: -/* 801CFA6C 90 1F 0C A8 */ stw r0, 0xca8(r31) -/* 801CFA70 38 60 00 2C */ li r3, 0x2c -/* 801CFA74 48 0F F1 D9 */ bl __nw__FUl -/* 801CFA78 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFA7C 41 82 00 10 */ beq lbl_801CFA8C -/* 801CFA80 38 80 00 01 */ li r4, 1 -/* 801CFA84 48 03 B4 09 */ bl __ct__14dMeterHaihai_cFUc -/* 801CFA88 7C 60 1B 78 */ mr r0, r3 -lbl_801CFA8C: -/* 801CFA8C 90 1F 0C E0 */ stw r0, 0xce0(r31) -/* 801CFA90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CFA94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CFA98 80 63 5D 30 */ lwz r3, 0x5d30(r3) -/* 801CFA9C 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801CFAA0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801CFAA4 3C A0 80 39 */ lis r5, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801CFAA8 38 A5 65 D0 */ addi r5, r5, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801CFAAC 38 A5 00 54 */ addi r5, r5, 0x54 -/* 801CFAB0 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFAB4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801CFAB8 7D 89 03 A6 */ mtctr r12 -/* 801CFABC 4E 80 04 21 */ bctrl -/* 801CFAC0 7C 7C 1B 78 */ mr r28, r3 -/* 801CFAC4 38 60 01 50 */ li r3, 0x150 -/* 801CFAC8 48 0F F1 85 */ bl __nw__FUl -/* 801CFACC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFAD0 41 82 00 10 */ beq lbl_801CFAE0 -/* 801CFAD4 7F 84 E3 78 */ mr r4, r28 -/* 801CFAD8 48 12 CC 31 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801CFADC 7C 60 1B 78 */ mr r0, r3 -lbl_801CFAE0: -/* 801CFAE0 90 1F 0C B0 */ stw r0, 0xcb0(r31) -/* 801CFAE4 38 60 00 00 */ li r3, 0 -/* 801CFAE8 98 61 00 10 */ stb r3, 0x10(r1) -/* 801CFAEC 98 61 00 11 */ stb r3, 0x11(r1) -/* 801CFAF0 98 61 00 12 */ stb r3, 0x12(r1) -/* 801CFAF4 38 00 00 FF */ li r0, 0xff -/* 801CFAF8 98 01 00 13 */ stb r0, 0x13(r1) -/* 801CFAFC 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801CFB00 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CFB04 98 61 00 18 */ stb r3, 0x18(r1) -/* 801CFB08 98 61 00 19 */ stb r3, 0x19(r1) -/* 801CFB0C 98 61 00 1A */ stb r3, 0x1a(r1) -/* 801CFB10 98 61 00 1B */ stb r3, 0x1b(r1) -/* 801CFB14 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801CFB18 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801CFB1C 80 7F 0C B0 */ lwz r3, 0xcb0(r31) -/* 801CFB20 38 81 00 1C */ addi r4, r1, 0x1c -/* 801CFB24 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801CFB28 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFB2C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801CFB30 7D 89 03 A6 */ mtctr r12 -/* 801CFB34 4E 80 04 21 */ bctrl -/* 801CFB38 80 7F 0C B0 */ lwz r3, 0xcb0(r31) -/* 801CFB3C 38 80 00 00 */ li r4, 0 -/* 801CFB40 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFB44 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801CFB48 7D 89 03 A6 */ mtctr r12 -/* 801CFB4C 4E 80 04 21 */ bctrl -/* 801CFB50 38 60 01 18 */ li r3, 0x118 -/* 801CFB54 48 0F F0 F9 */ bl __nw__FUl -/* 801CFB58 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFB5C 41 82 00 0C */ beq lbl_801CFB68 -/* 801CFB60 48 12 89 39 */ bl __ct__9J2DScreenFv -/* 801CFB64 7C 60 1B 78 */ mr r0, r3 -lbl_801CFB68: -/* 801CFB68 90 1F 0C D8 */ stw r0, 0xcd8(r31) -/* 801CFB6C 80 7F 0C D8 */ lwz r3, 0xcd8(r31) -/* 801CFB70 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801CFB74 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801CFB78 38 84 00 64 */ addi r4, r4, 0x64 -/* 801CFB7C 3C A0 00 02 */ lis r5, 2 -/* 801CFB80 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CFB84 48 12 8A C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801CFB88 80 7F 0C D8 */ lwz r3, 0xcd8(r31) -/* 801CFB8C 48 08 55 5D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801CFB90 38 60 00 6C */ li r3, 0x6c -/* 801CFB94 48 0F F0 B9 */ bl __nw__FUl -/* 801CFB98 7C 60 1B 79 */ or. r0, r3, r3 -/* 801CFB9C 41 82 00 24 */ beq lbl_801CFBC0 -/* 801CFBA0 80 9F 0C D8 */ lwz r4, 0xcd8(r31) -/* 801CFBA4 3C A0 70 6F */ lis r5, 0x706F /* 0x706F5F6E@ha */ -/* 801CFBA8 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x706F5F6E@l */ -/* 801CFBAC 38 A0 66 5F */ li r5, 0x665f -/* 801CFBB0 38 E0 00 02 */ li r7, 2 -/* 801CFBB4 39 00 00 00 */ li r8, 0 -/* 801CFBB8 48 08 3D CD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801CFBBC 7C 60 1B 78 */ mr r0, r3 -lbl_801CFBC0: -/* 801CFBC0 90 1F 0C AC */ stw r0, 0xcac(r31) -/* 801CFBC4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CFBC8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CFBCC C0 03 02 4C */ lfs f0, 0x24c(r3) -/* 801CFBD0 80 7F 0C AC */ lwz r3, 0xcac(r31) -/* 801CFBD4 80 63 00 04 */ lwz r3, 4(r3) -/* 801CFBD8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801CFBDC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801CFBE0 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFBE4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801CFBE8 7D 89 03 A6 */ mtctr r12 -/* 801CFBEC 4E 80 04 21 */ bctrl -/* 801CFBF0 3B 60 00 00 */ li r27, 0 -/* 801CFBF4 3B C0 00 00 */ li r30, 0 -/* 801CFBF8 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801CFBFC 3B 83 FC 60 */ addi r28, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801CFC00 3C 60 80 39 */ lis r3, cur_tag_3868@ha /* 0x80396248@ha */ -/* 801CFC04 3B A3 62 48 */ addi r29, r3, cur_tag_3868@l /* 0x80396248@l */ -lbl_801CFC08: -/* 801CFC08 80 7F 0C D8 */ lwz r3, 0xcd8(r31) -/* 801CFC0C 7C 9D F2 14 */ add r4, r29, r30 -/* 801CFC10 80 A4 00 00 */ lwz r5, 0(r4) -/* 801CFC14 80 C4 00 04 */ lwz r6, 4(r4) -/* 801CFC18 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFC1C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801CFC20 7D 89 03 A6 */ mtctr r12 -/* 801CFC24 4E 80 04 21 */ bctrl -/* 801CFC28 80 1C 02 58 */ lwz r0, 0x258(r28) -/* 801CFC2C 90 01 00 08 */ stw r0, 8(r1) -/* 801CFC30 80 1C 02 54 */ lwz r0, 0x254(r28) -/* 801CFC34 90 01 00 0C */ stw r0, 0xc(r1) -/* 801CFC38 38 81 00 0C */ addi r4, r1, 0xc -/* 801CFC3C 38 A1 00 08 */ addi r5, r1, 8 -/* 801CFC40 81 83 00 00 */ lwz r12, 0(r3) -/* 801CFC44 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801CFC48 7D 89 03 A6 */ mtctr r12 -/* 801CFC4C 4E 80 04 21 */ bctrl -/* 801CFC50 3B 7B 00 01 */ addi r27, r27, 1 -/* 801CFC54 2C 1B 00 04 */ cmpwi r27, 4 -/* 801CFC58 3B DE 00 08 */ addi r30, r30, 8 -/* 801CFC5C 41 80 FF AC */ blt lbl_801CFC08 -/* 801CFC60 7F E3 FB 78 */ mr r3, r31 -/* 801CFC64 48 00 2B 85 */ bl getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801CFC68 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CFC6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CFC70 D0 23 00 70 */ stfs f1, 0x70(r3) -/* 801CFC74 7F E3 FB 78 */ mr r3, r31 -/* 801CFC78 48 00 2C A9 */ bl getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv -/* 801CFC7C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CFC80 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CFC84 D0 23 00 74 */ stfs f1, 0x74(r3) -/* 801CFC88 7F E3 FB 78 */ mr r3, r31 -/* 801CFC8C 48 00 2A AD */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801CFC90 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CFC94 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CFC98 D0 23 00 78 */ stfs f1, 0x78(r3) -/* 801CFC9C 7F E3 FB 78 */ mr r3, r31 -/* 801CFCA0 48 00 2A F1 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801CFCA4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801CFCA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801CFCAC D0 23 00 7C */ stfs f1, 0x7c(r3) -/* 801CFCB0 38 00 00 00 */ li r0, 0 -/* 801CFCB4 90 1F 12 3C */ stw r0, 0x123c(r31) -/* 801CFCB8 90 1F 12 40 */ stw r0, 0x1240(r31) -/* 801CFCBC 90 1F 12 44 */ stw r0, 0x1244(r31) -/* 801CFCC0 7F E3 FB 78 */ mr r3, r31 -/* 801CFCC4 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CFCC8 48 19 25 59 */ bl _restgpr_27 -/* 801CFCCC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801CFCD0 7C 08 03 A6 */ mtlr r0 -/* 801CFCD4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CFCD8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/__dt__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/__dt__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index 4d653fb030..0000000000 --- a/asm/d/menu/d_menu_fmap2D/__dt__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_801D6700: -/* 801D6700 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D6704 7C 08 02 A6 */ mflr r0 -/* 801D6708 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D670C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6710 48 18 BA C5 */ bl _savegpr_27 -/* 801D6714 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801D6718 7C 9E 23 78 */ mr r30, r4 -/* 801D671C 41 82 03 0C */ beq lbl_801D6A28 -/* 801D6720 3C 80 80 3C */ lis r4, __vt__17dMenu_Fmap2DTop_c@ha /* 0x803BD750@ha */ -/* 801D6724 38 04 D7 50 */ addi r0, r4, __vt__17dMenu_Fmap2DTop_c@l /* 0x803BD750@l */ -/* 801D6728 90 1F 00 00 */ stw r0, 0(r31) -/* 801D672C 48 00 0F 95 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv -/* 801D6730 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D6734 28 03 00 00 */ cmplwi r3, 0 -/* 801D6738 41 82 00 18 */ beq lbl_801D6750 -/* 801D673C 38 80 00 01 */ li r4, 1 -/* 801D6740 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6744 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6748 7D 89 03 A6 */ mtctr r12 -/* 801D674C 4E 80 04 21 */ bctrl -lbl_801D6750: -/* 801D6750 38 00 00 00 */ li r0, 0 -/* 801D6754 90 1F 00 08 */ stw r0, 8(r31) -/* 801D6758 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D675C 28 03 00 00 */ cmplwi r3, 0 -/* 801D6760 41 82 00 18 */ beq lbl_801D6778 -/* 801D6764 38 80 00 01 */ li r4, 1 -/* 801D6768 81 83 00 00 */ lwz r12, 0(r3) -/* 801D676C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6770 7D 89 03 A6 */ mtctr r12 -/* 801D6774 4E 80 04 21 */ bctrl -lbl_801D6778: -/* 801D6778 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801D677C 28 03 00 00 */ cmplwi r3, 0 -/* 801D6780 41 82 00 18 */ beq lbl_801D6798 -/* 801D6784 38 80 00 01 */ li r4, 1 -/* 801D6788 81 83 00 00 */ lwz r12, 0(r3) -/* 801D678C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6790 7D 89 03 A6 */ mtctr r12 -/* 801D6794 4E 80 04 21 */ bctrl -lbl_801D6798: -/* 801D6798 38 00 00 00 */ li r0, 0 -/* 801D679C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801D67A0 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D67A4 28 03 00 00 */ cmplwi r3, 0 -/* 801D67A8 41 82 00 18 */ beq lbl_801D67C0 -/* 801D67AC 38 80 00 01 */ li r4, 1 -/* 801D67B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D67B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D67B8 7D 89 03 A6 */ mtctr r12 -/* 801D67BC 4E 80 04 21 */ bctrl -lbl_801D67C0: -/* 801D67C0 38 00 00 00 */ li r0, 0 -/* 801D67C4 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 801D67C8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801D67CC 28 03 00 00 */ cmplwi r3, 0 -/* 801D67D0 41 82 00 18 */ beq lbl_801D67E8 -/* 801D67D4 38 80 00 01 */ li r4, 1 -/* 801D67D8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D67DC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D67E0 7D 89 03 A6 */ mtctr r12 -/* 801D67E4 4E 80 04 21 */ bctrl -lbl_801D67E8: -/* 801D67E8 38 00 00 00 */ li r0, 0 -/* 801D67EC 90 1F 00 20 */ stw r0, 0x20(r31) -/* 801D67F0 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 801D67F4 28 03 00 00 */ cmplwi r3, 0 -/* 801D67F8 41 82 00 18 */ beq lbl_801D6810 -/* 801D67FC 38 80 00 01 */ li r4, 1 -/* 801D6800 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6804 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6808 7D 89 03 A6 */ mtctr r12 -/* 801D680C 4E 80 04 21 */ bctrl -lbl_801D6810: -/* 801D6810 38 00 00 00 */ li r0, 0 -/* 801D6814 90 1F 00 24 */ stw r0, 0x24(r31) -/* 801D6818 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D681C 28 03 00 00 */ cmplwi r3, 0 -/* 801D6820 41 82 00 18 */ beq lbl_801D6838 -/* 801D6824 38 80 00 01 */ li r4, 1 -/* 801D6828 81 83 00 00 */ lwz r12, 0(r3) -/* 801D682C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6830 7D 89 03 A6 */ mtctr r12 -/* 801D6834 4E 80 04 21 */ bctrl -lbl_801D6838: -/* 801D6838 38 00 00 00 */ li r0, 0 -/* 801D683C 90 1F 00 28 */ stw r0, 0x28(r31) -/* 801D6840 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 801D6844 28 03 00 00 */ cmplwi r3, 0 -/* 801D6848 41 82 00 18 */ beq lbl_801D6860 -/* 801D684C 38 80 00 01 */ li r4, 1 -/* 801D6850 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6854 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6858 7D 89 03 A6 */ mtctr r12 -/* 801D685C 4E 80 04 21 */ bctrl -lbl_801D6860: -/* 801D6860 38 00 00 00 */ li r0, 0 -/* 801D6864 90 1F 00 2C */ stw r0, 0x2c(r31) -/* 801D6868 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801D686C 28 03 00 00 */ cmplwi r3, 0 -/* 801D6870 41 82 00 24 */ beq lbl_801D6894 -/* 801D6874 41 82 00 18 */ beq lbl_801D688C -/* 801D6878 38 80 00 01 */ li r4, 1 -/* 801D687C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6880 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6884 7D 89 03 A6 */ mtctr r12 -/* 801D6888 4E 80 04 21 */ bctrl -lbl_801D688C: -/* 801D688C 38 00 00 00 */ li r0, 0 -/* 801D6890 90 1F 00 34 */ stw r0, 0x34(r31) -lbl_801D6894: -/* 801D6894 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801D6898 28 03 00 00 */ cmplwi r3, 0 -/* 801D689C 41 82 00 24 */ beq lbl_801D68C0 -/* 801D68A0 41 82 00 18 */ beq lbl_801D68B8 -/* 801D68A4 38 80 00 01 */ li r4, 1 -/* 801D68A8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D68AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D68B0 7D 89 03 A6 */ mtctr r12 -/* 801D68B4 4E 80 04 21 */ bctrl -lbl_801D68B8: -/* 801D68B8 38 00 00 00 */ li r0, 0 -/* 801D68BC 90 1F 00 30 */ stw r0, 0x30(r31) -lbl_801D68C0: -/* 801D68C0 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 801D68C4 28 03 00 00 */ cmplwi r3, 0 -/* 801D68C8 41 82 00 18 */ beq lbl_801D68E0 -/* 801D68CC 38 80 00 01 */ li r4, 1 -/* 801D68D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D68D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D68D8 7D 89 03 A6 */ mtctr r12 -/* 801D68DC 4E 80 04 21 */ bctrl -lbl_801D68E0: -/* 801D68E0 38 00 00 00 */ li r0, 0 -/* 801D68E4 90 1F 00 50 */ stw r0, 0x50(r31) -/* 801D68E8 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 801D68EC 28 03 00 00 */ cmplwi r3, 0 -/* 801D68F0 41 82 00 18 */ beq lbl_801D6908 -/* 801D68F4 38 80 00 01 */ li r4, 1 -/* 801D68F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D68FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6900 7D 89 03 A6 */ mtctr r12 -/* 801D6904 4E 80 04 21 */ bctrl -lbl_801D6908: -/* 801D6908 38 00 00 00 */ li r0, 0 -/* 801D690C 90 1F 00 54 */ stw r0, 0x54(r31) -/* 801D6910 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801D6914 28 03 00 00 */ cmplwi r3, 0 -/* 801D6918 41 82 00 24 */ beq lbl_801D693C -/* 801D691C 41 82 00 18 */ beq lbl_801D6934 -/* 801D6920 38 80 00 01 */ li r4, 1 -/* 801D6924 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6928 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D692C 7D 89 03 A6 */ mtctr r12 -/* 801D6930 4E 80 04 21 */ bctrl -lbl_801D6934: -/* 801D6934 38 00 00 00 */ li r0, 0 -/* 801D6938 90 1F 00 58 */ stw r0, 0x58(r31) -lbl_801D693C: -/* 801D693C 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801D6940 28 03 00 00 */ cmplwi r3, 0 -/* 801D6944 41 82 00 24 */ beq lbl_801D6968 -/* 801D6948 41 82 00 18 */ beq lbl_801D6960 -/* 801D694C 38 80 00 01 */ li r4, 1 -/* 801D6950 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6954 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6958 7D 89 03 A6 */ mtctr r12 -/* 801D695C 4E 80 04 21 */ bctrl -lbl_801D6960: -/* 801D6960 38 00 00 00 */ li r0, 0 -/* 801D6964 90 1F 00 5C */ stw r0, 0x5c(r31) -lbl_801D6968: -/* 801D6968 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 801D696C 28 03 00 00 */ cmplwi r3, 0 -/* 801D6970 41 82 00 18 */ beq lbl_801D6988 -/* 801D6974 38 80 00 01 */ li r4, 1 -/* 801D6978 81 83 00 00 */ lwz r12, 0(r3) -/* 801D697C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6980 7D 89 03 A6 */ mtctr r12 -/* 801D6984 4E 80 04 21 */ bctrl -lbl_801D6988: -/* 801D6988 3B A0 00 00 */ li r29, 0 -/* 801D698C 93 BF 00 60 */ stw r29, 0x60(r31) -/* 801D6990 3B 60 00 00 */ li r27, 0 -lbl_801D6994: -/* 801D6994 7F 9F EA 14 */ add r28, r31, r29 -/* 801D6998 80 7C 00 38 */ lwz r3, 0x38(r28) -/* 801D699C 28 03 00 00 */ cmplwi r3, 0 -/* 801D69A0 41 82 00 1C */ beq lbl_801D69BC -/* 801D69A4 41 82 00 18 */ beq lbl_801D69BC -/* 801D69A8 38 80 00 01 */ li r4, 1 -/* 801D69AC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D69B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D69B4 7D 89 03 A6 */ mtctr r12 -/* 801D69B8 4E 80 04 21 */ bctrl -lbl_801D69BC: -/* 801D69BC 80 7C 00 40 */ lwz r3, 0x40(r28) -/* 801D69C0 28 03 00 00 */ cmplwi r3, 0 -/* 801D69C4 41 82 00 1C */ beq lbl_801D69E0 -/* 801D69C8 41 82 00 18 */ beq lbl_801D69E0 -/* 801D69CC 38 80 00 01 */ li r4, 1 -/* 801D69D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D69D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D69D8 7D 89 03 A6 */ mtctr r12 -/* 801D69DC 4E 80 04 21 */ bctrl -lbl_801D69E0: -/* 801D69E0 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D69E4 2C 1B 00 02 */ cmpwi r27, 2 -/* 801D69E8 3B BD 00 04 */ addi r29, r29, 4 -/* 801D69EC 41 80 FF A8 */ blt lbl_801D6994 -/* 801D69F0 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801D69F4 28 03 00 00 */ cmplwi r3, 0 -/* 801D69F8 41 82 00 18 */ beq lbl_801D6A10 -/* 801D69FC 38 80 00 01 */ li r4, 1 -/* 801D6A00 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6A04 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D6A08 7D 89 03 A6 */ mtctr r12 -/* 801D6A0C 4E 80 04 21 */ bctrl -lbl_801D6A10: -/* 801D6A10 38 00 00 00 */ li r0, 0 -/* 801D6A14 90 1F 00 10 */ stw r0, 0x10(r31) -/* 801D6A18 7F C0 07 35 */ extsh. r0, r30 -/* 801D6A1C 40 81 00 0C */ ble lbl_801D6A28 -/* 801D6A20 7F E3 FB 78 */ mr r3, r31 -/* 801D6A24 48 0F 83 19 */ bl __dl__FPv -lbl_801D6A28: -/* 801D6A28 7F E3 FB 78 */ mr r3, r31 -/* 801D6A2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6A30 48 18 B7 F1 */ bl _restgpr_27 -/* 801D6A34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D6A38 7C 08 03 A6 */ mtlr r0 -/* 801D6A3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D6A40 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/_execute__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/_execute__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index dc95f9da5c..0000000000 --- a/asm/d/menu/d_menu_fmap2D/_execute__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,149 +0,0 @@ -lbl_801D6A44: -/* 801D6A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D6A48 7C 08 02 A6 */ mflr r0 -/* 801D6A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D6A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D6A54 7C 7F 1B 78 */ mr r31, r3 -/* 801D6A58 88 03 00 C0 */ lbz r0, 0xc0(r3) -/* 801D6A5C 2C 00 00 01 */ cmpwi r0, 1 -/* 801D6A60 41 82 00 2C */ beq lbl_801D6A8C -/* 801D6A64 40 80 00 40 */ bge lbl_801D6AA4 -/* 801D6A68 2C 00 00 00 */ cmpwi r0, 0 -/* 801D6A6C 40 80 00 08 */ bge lbl_801D6A74 -/* 801D6A70 48 00 00 34 */ b lbl_801D6AA4 -lbl_801D6A74: -/* 801D6A74 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6A78 48 00 0E 85 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6A7C 7F E3 FB 78 */ mr r3, r31 -/* 801D6A80 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6A84 48 00 0D 41 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6A88 48 00 00 34 */ b lbl_801D6ABC -lbl_801D6A8C: -/* 801D6A8C 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6A90 48 00 0D C9 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6A94 7F E3 FB 78 */ mr r3, r31 -/* 801D6A98 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6A9C 48 00 0D BD */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6AA0 48 00 00 1C */ b lbl_801D6ABC -lbl_801D6AA4: -/* 801D6AA4 7F E3 FB 78 */ mr r3, r31 -/* 801D6AA8 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6AAC 48 00 0E 51 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6AB0 7F E3 FB 78 */ mr r3, r31 -/* 801D6AB4 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6AB8 48 00 0E 45 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -lbl_801D6ABC: -/* 801D6ABC 88 1F 00 C1 */ lbz r0, 0xc1(r31) -/* 801D6AC0 2C 00 00 01 */ cmpwi r0, 1 -/* 801D6AC4 41 82 00 30 */ beq lbl_801D6AF4 -/* 801D6AC8 40 80 00 48 */ bge lbl_801D6B10 -/* 801D6ACC 2C 00 00 00 */ cmpwi r0, 0 -/* 801D6AD0 40 80 00 08 */ bge lbl_801D6AD8 -/* 801D6AD4 48 00 00 3C */ b lbl_801D6B10 -lbl_801D6AD8: -/* 801D6AD8 7F E3 FB 78 */ mr r3, r31 -/* 801D6ADC 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6AE0 48 00 0E 1D */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6AE4 7F E3 FB 78 */ mr r3, r31 -/* 801D6AE8 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6AEC 48 00 0C D9 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6AF0 48 00 00 38 */ b lbl_801D6B28 -lbl_801D6AF4: -/* 801D6AF4 7F E3 FB 78 */ mr r3, r31 -/* 801D6AF8 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6AFC 48 00 0D 5D */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B00 7F E3 FB 78 */ mr r3, r31 -/* 801D6B04 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6B08 48 00 0D 51 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B0C 48 00 00 1C */ b lbl_801D6B28 -lbl_801D6B10: -/* 801D6B10 7F E3 FB 78 */ mr r3, r31 -/* 801D6B14 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6B18 48 00 0D E5 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B1C 7F E3 FB 78 */ mr r3, r31 -/* 801D6B20 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6B24 48 00 0D D9 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -lbl_801D6B28: -/* 801D6B28 88 1F 00 C2 */ lbz r0, 0xc2(r31) -/* 801D6B2C 2C 00 00 01 */ cmpwi r0, 1 -/* 801D6B30 41 82 00 30 */ beq lbl_801D6B60 -/* 801D6B34 40 80 00 48 */ bge lbl_801D6B7C -/* 801D6B38 2C 00 00 00 */ cmpwi r0, 0 -/* 801D6B3C 40 80 00 08 */ bge lbl_801D6B44 -/* 801D6B40 48 00 00 3C */ b lbl_801D6B7C -lbl_801D6B44: -/* 801D6B44 7F E3 FB 78 */ mr r3, r31 -/* 801D6B48 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B4C 48 00 0D B1 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B50 7F E3 FB 78 */ mr r3, r31 -/* 801D6B54 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B58 48 00 0C 6D */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B5C 48 00 00 38 */ b lbl_801D6B94 -lbl_801D6B60: -/* 801D6B60 7F E3 FB 78 */ mr r3, r31 -/* 801D6B64 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B68 48 00 0C F1 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B6C 7F E3 FB 78 */ mr r3, r31 -/* 801D6B70 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B74 48 00 0C E5 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B78 48 00 00 1C */ b lbl_801D6B94 -lbl_801D6B7C: -/* 801D6B7C 7F E3 FB 78 */ mr r3, r31 -/* 801D6B80 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B84 48 00 0D 79 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6B88 7F E3 FB 78 */ mr r3, r31 -/* 801D6B8C 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B90 48 00 0D 6D */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -lbl_801D6B94: -/* 801D6B94 80 9F 00 34 */ lwz r4, 0x34(r31) -/* 801D6B98 28 04 00 00 */ cmplwi r4, 0 -/* 801D6B9C 41 82 00 40 */ beq lbl_801D6BDC -/* 801D6BA0 88 1F 00 C4 */ lbz r0, 0xc4(r31) -/* 801D6BA4 2C 00 00 01 */ cmpwi r0, 1 -/* 801D6BA8 41 82 00 20 */ beq lbl_801D6BC8 -/* 801D6BAC 40 80 00 28 */ bge lbl_801D6BD4 -/* 801D6BB0 2C 00 00 00 */ cmpwi r0, 0 -/* 801D6BB4 40 80 00 08 */ bge lbl_801D6BBC -/* 801D6BB8 48 00 00 1C */ b lbl_801D6BD4 -lbl_801D6BBC: -/* 801D6BBC 7F E3 FB 78 */ mr r3, r31 -/* 801D6BC0 48 00 0C 05 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6BC4 48 00 00 18 */ b lbl_801D6BDC -lbl_801D6BC8: -/* 801D6BC8 7F E3 FB 78 */ mr r3, r31 -/* 801D6BCC 48 00 0C 8D */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6BD0 48 00 00 0C */ b lbl_801D6BDC -lbl_801D6BD4: -/* 801D6BD4 7F E3 FB 78 */ mr r3, r31 -/* 801D6BD8 48 00 0D 25 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -lbl_801D6BDC: -/* 801D6BDC 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 801D6BE0 28 04 00 00 */ cmplwi r4, 0 -/* 801D6BE4 41 82 00 40 */ beq lbl_801D6C24 -/* 801D6BE8 88 1F 00 C3 */ lbz r0, 0xc3(r31) -/* 801D6BEC 2C 00 00 01 */ cmpwi r0, 1 -/* 801D6BF0 41 82 00 20 */ beq lbl_801D6C10 -/* 801D6BF4 40 80 00 28 */ bge lbl_801D6C1C -/* 801D6BF8 2C 00 00 00 */ cmpwi r0, 0 -/* 801D6BFC 40 80 00 08 */ bge lbl_801D6C04 -/* 801D6C00 48 00 00 1C */ b lbl_801D6C1C -lbl_801D6C04: -/* 801D6C04 7F E3 FB 78 */ mr r3, r31 -/* 801D6C08 48 00 0B BD */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6C0C 48 00 00 18 */ b lbl_801D6C24 -lbl_801D6C10: -/* 801D6C10 7F E3 FB 78 */ mr r3, r31 -/* 801D6C14 48 00 0C 45 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -/* 801D6C18 48 00 00 0C */ b lbl_801D6C24 -lbl_801D6C1C: -/* 801D6C1C 7F E3 FB 78 */ mr r3, r31 -/* 801D6C20 48 00 0C DD */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha -lbl_801D6C24: -/* 801D6C24 7F E3 FB 78 */ mr r3, r31 -/* 801D6C28 38 80 00 00 */ li r4, 0 -/* 801D6C2C 48 00 0F A1 */ bl setHIO__17dMenu_Fmap2DTop_cFb -/* 801D6C30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D6C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D6C38 7C 08 03 A6 */ mtlr r0 -/* 801D6C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6C40 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/allmap_move2__18dMenu_Fmap2DBack_cFP9STControl.s b/asm/d/menu/d_menu_fmap2D/allmap_move2__18dMenu_Fmap2DBack_cFP9STControl.s deleted file mode 100644 index f815807a9c..0000000000 --- a/asm/d/menu/d_menu_fmap2D/allmap_move2__18dMenu_Fmap2DBack_cFP9STControl.s +++ /dev/null @@ -1,222 +0,0 @@ -lbl_801D1DC4: -/* 801D1DC4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801D1DC8 7C 08 02 A6 */ mflr r0 -/* 801D1DCC 90 01 00 64 */ stw r0, 0x64(r1) -/* 801D1DD0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 801D1DD4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 801D1DD8 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 801D1DDC F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 801D1DE0 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 801D1DE4 F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 801D1DE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D1DEC 48 19 03 ED */ bl _savegpr_28 -/* 801D1DF0 7C 7F 1B 78 */ mr r31, r3 -/* 801D1DF4 7C 9C 23 78 */ mr r28, r4 -/* 801D1DF8 48 00 09 99 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D1DFC FF C0 08 90 */ fmr f30, f1 -/* 801D1E00 7F E3 FB 78 */ mr r3, r31 -/* 801D1E04 48 00 09 35 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D1E08 7F E3 FB 78 */ mr r3, r31 -/* 801D1E0C FC 40 F0 90 */ fmr f2, f30 -/* 801D1E10 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D1E14 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D1E18 4B FF F1 65 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D1E1C 7F E3 FB 78 */ mr r3, r31 -/* 801D1E20 48 00 0B 79 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D1E24 FF C0 08 90 */ fmr f30, f1 -/* 801D1E28 7F E3 FB 78 */ mr r3, r31 -/* 801D1E2C 48 00 09 65 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D1E30 EF C1 F0 2A */ fadds f30, f1, f30 -/* 801D1E34 7F E3 FB 78 */ mr r3, r31 -/* 801D1E38 48 00 0A 29 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D1E3C FF E0 08 90 */ fmr f31, f1 -/* 801D1E40 7F E3 FB 78 */ mr r3, r31 -/* 801D1E44 48 00 08 F5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D1E48 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801D1E4C 7F E3 FB 78 */ mr r3, r31 -/* 801D1E50 FC 40 F0 90 */ fmr f2, f30 -/* 801D1E54 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D1E58 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D1E5C 4B FF F1 21 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D1E60 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D1E64 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D1E68 C3 A3 00 E0 */ lfs f29, 0xe0(r3) -/* 801D1E6C C0 03 00 E4 */ lfs f0, 0xe4(r3) -/* 801D1E70 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 801D1E74 40 80 00 0C */ bge lbl_801D1E80 -/* 801D1E78 FF C0 E8 90 */ fmr f30, f29 -/* 801D1E7C 48 00 00 08 */ b lbl_801D1E84 -lbl_801D1E80: -/* 801D1E80 FF C0 00 90 */ fmr f30, f0 -lbl_801D1E84: -/* 801D1E84 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 801D1E88 40 81 00 08 */ ble lbl_801D1E90 -/* 801D1E8C 48 00 00 08 */ b lbl_801D1E94 -lbl_801D1E90: -/* 801D1E90 FF A0 00 90 */ fmr f29, f0 -lbl_801D1E94: -/* 801D1E94 7F 83 E3 78 */ mr r3, r28 -/* 801D1E98 81 9C 00 00 */ lwz r12, 0(r28) -/* 801D1E9C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D1EA0 7D 89 03 A6 */ mtctr r12 -/* 801D1EA4 4E 80 04 21 */ bctrl -/* 801D1EA8 FF E0 08 90 */ fmr f31, f1 -/* 801D1EAC FC 1F F0 40 */ fcmpo cr0, f31, f30 -/* 801D1EB0 4C 41 13 82 */ cror 2, 1, 2 -/* 801D1EB4 40 82 00 9C */ bne lbl_801D1F50 -/* 801D1EB8 7F 83 E3 78 */ mr r3, r28 -/* 801D1EBC 81 9C 00 00 */ lwz r12, 0(r28) -/* 801D1EC0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D1EC4 7D 89 03 A6 */ mtctr r12 -/* 801D1EC8 4E 80 04 21 */ bctrl -/* 801D1ECC 7C 7E 1B 78 */ mr r30, r3 -/* 801D1ED0 C0 3F 0F E8 */ lfs f1, 0xfe8(r31) -/* 801D1ED4 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) -/* 801D1ED8 EF C1 00 28 */ fsubs f30, f1, f0 -/* 801D1EDC 7F E3 FB 78 */ mr r3, r31 -/* 801D1EE0 48 00 0C 7D */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1EE4 EC 5E 08 24 */ fdivs f2, f30, f1 -/* 801D1EE8 FC 1F E8 40 */ fcmpo cr0, f31, f29 -/* 801D1EEC 40 80 00 14 */ bge lbl_801D1F00 -/* 801D1EF0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D1EF4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D1EF8 C0 23 00 D8 */ lfs f1, 0xd8(r3) -/* 801D1EFC 48 00 00 10 */ b lbl_801D1F0C -lbl_801D1F00: -/* 801D1F00 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D1F04 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D1F08 C0 23 00 C8 */ lfs f1, 0xc8(r3) -lbl_801D1F0C: -/* 801D1F0C C0 02 A8 00 */ lfs f0, lit_4260(r2) -/* 801D1F10 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801D1F14 EC 40 00 B2 */ fmuls f2, f0, f2 -/* 801D1F18 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801D1F1C 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801D1F20 57 C0 04 38 */ rlwinm r0, r30, 0, 0x10, 0x1c -/* 801D1F24 7C 64 02 14 */ add r3, r4, r0 -/* 801D1F28 C0 03 00 04 */ lfs f0, 4(r3) -/* 801D1F2C EC 62 00 32 */ fmuls f3, f2, f0 -/* 801D1F30 C0 3F 11 9C */ lfs f1, 0x119c(r31) -/* 801D1F34 7C 04 04 2E */ lfsx f0, r4, r0 -/* 801D1F38 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D1F3C EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1F40 D0 1F 11 9C */ stfs f0, 0x119c(r31) -/* 801D1F44 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D1F48 EC 00 18 2A */ fadds f0, f0, f3 -/* 801D1F4C D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D1F50: -/* 801D1F50 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D1F54 C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D1F58 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1F5C C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 801D1F60 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D1F64 40 80 00 0C */ bge lbl_801D1F70 -/* 801D1F68 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D1F6C D0 1F 11 9C */ stfs f0, 0x119c(r31) -lbl_801D1F70: -/* 801D1F70 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D1F74 C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D1F78 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1F7C C0 41 00 14 */ lfs f2, 0x14(r1) -/* 801D1F80 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D1F84 40 81 00 0C */ ble lbl_801D1F90 -/* 801D1F88 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D1F8C D0 1F 11 9C */ stfs f0, 0x119c(r31) -lbl_801D1F90: -/* 801D1F90 C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D1F94 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D1F98 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1F9C C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801D1FA0 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D1FA4 40 80 00 0C */ bge lbl_801D1FB0 -/* 801D1FA8 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D1FAC D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D1FB0: -/* 801D1FB0 C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D1FB4 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D1FB8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1FBC C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801D1FC0 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D1FC4 40 81 00 0C */ ble lbl_801D1FD0 -/* 801D1FC8 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D1FCC D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D1FD0: -/* 801D1FD0 7F E3 FB 78 */ mr r3, r31 -/* 801D1FD4 48 00 0A 61 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D1FD8 7F E3 FB 78 */ mr r3, r31 -/* 801D1FDC 48 00 09 DD */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv -/* 801D1FE0 7F E3 FB 78 */ mr r3, r31 -/* 801D1FE4 4B FF EA E5 */ bl calcAllMapPos__18dMenu_Fmap2DBack_cFv -/* 801D1FE8 7F E3 FB 78 */ mr r3, r31 -/* 801D1FEC C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D1FF0 C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D1FF4 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1FF8 C0 1F 0F C8 */ lfs f0, 0xfc8(r31) -/* 801D1FFC EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D2000 C0 5F 11 90 */ lfs f2, 0x1190(r31) -/* 801D2004 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D2008 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D200C C0 1F 0F CC */ lfs f0, 0xfcc(r31) -/* 801D2010 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D2014 38 81 00 0C */ addi r4, r1, 0xc -/* 801D2018 38 A1 00 08 */ addi r5, r1, 8 -/* 801D201C 4B FF EC FD */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D2020 38 00 00 FF */ li r0, 0xff -/* 801D2024 98 1F 12 26 */ stb r0, 0x1226(r31) -/* 801D2028 3B A0 00 07 */ li r29, 7 -lbl_801D202C: -/* 801D202C 38 1D 12 30 */ addi r0, r29, 0x1230 -/* 801D2030 7F 9F 00 AE */ lbzx r28, r31, r0 -/* 801D2034 2C 1C 00 FF */ cmpwi r28, 0xff -/* 801D2038 41 82 00 84 */ beq lbl_801D20BC -/* 801D203C 2C 1C 00 07 */ cmpwi r28, 7 -/* 801D2040 41 82 00 7C */ beq lbl_801D20BC -/* 801D2044 57 80 10 3A */ slwi r0, r28, 2 -/* 801D2048 7F DF 02 14 */ add r30, r31, r0 -/* 801D204C 80 7E 0C B4 */ lwz r3, 0xcb4(r30) -/* 801D2050 38 80 00 00 */ li r4, 0 -/* 801D2054 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2058 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801D205C 7D 89 03 A6 */ mtctr r12 -/* 801D2060 4E 80 04 21 */ bctrl -/* 801D2064 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801D2068 C0 DF 0F 9C */ lfs f6, 0xf9c(r31) -/* 801D206C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801D2070 C0 41 00 08 */ lfs f2, 8(r1) -/* 801D2074 C0 9F 0F BC */ lfs f4, 0xfbc(r31) -/* 801D2078 C0 7E 0E 8C */ lfs f3, 0xe8c(r30) -/* 801D207C C0 1E 0F 0C */ lfs f0, 0xf0c(r30) -/* 801D2080 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D2084 EC 64 00 2A */ fadds f3, f4, f0 -/* 801D2088 C0 BF 0F C0 */ lfs f5, 0xfc0(r31) -/* 801D208C C0 9E 0E AC */ lfs f4, 0xeac(r30) -/* 801D2090 C0 1E 0F 2C */ lfs f0, 0xf2c(r30) -/* 801D2094 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D2098 EC 85 00 2A */ fadds f4, f5, f0 -/* 801D209C C0 1E 0E CC */ lfs f0, 0xecc(r30) -/* 801D20A0 EC A0 01 B2 */ fmuls f5, f0, f6 -/* 801D20A4 C0 1E 0E EC */ lfs f0, 0xeec(r30) -/* 801D20A8 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D20AC 48 04 C2 5D */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG -/* 801D20B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D20B4 41 82 00 08 */ beq lbl_801D20BC -/* 801D20B8 9B 9F 12 26 */ stb r28, 0x1226(r31) -lbl_801D20BC: -/* 801D20BC 88 1F 12 26 */ lbz r0, 0x1226(r31) -/* 801D20C0 28 00 00 FF */ cmplwi r0, 0xff -/* 801D20C4 40 82 00 0C */ bne lbl_801D20D0 -/* 801D20C8 37 BD FF FF */ addic. r29, r29, -1 -/* 801D20CC 40 80 FF 60 */ bge lbl_801D202C -lbl_801D20D0: -/* 801D20D0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 801D20D4 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 801D20D8 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 801D20DC CB C1 00 40 */ lfd f30, 0x40(r1) -/* 801D20E0 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 801D20E4 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 801D20E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D20EC 48 19 01 39 */ bl _restgpr_28 -/* 801D20F0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801D20F4 7C 08 03 A6 */ mtlr r0 -/* 801D20F8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801D20FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf.s b/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf.s deleted file mode 100644 index c35c96304d..0000000000 --- a/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_801D6DF8: -/* 801D6DF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D6DFC 7C 08 02 A6 */ mflr r0 -/* 801D6E00 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D6E04 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D6E08 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801D6E0C 7C 7E 1B 78 */ mr r30, r3 -/* 801D6E10 7C 9F 23 79 */ or. r31, r4, r4 -/* 801D6E14 41 82 00 6C */ beq lbl_801D6E80 -/* 801D6E18 C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 801D6E1C EC 00 08 2A */ fadds f0, f0, f1 -/* 801D6E20 D0 1E 00 74 */ stfs f0, 0x74(r30) -/* 801D6E24 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 801D6E28 A8 9F 00 06 */ lha r4, 6(r31) -/* 801D6E2C C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D6E30 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801D6E34 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D6E38 3C 60 43 30 */ lis r3, 0x4330 -/* 801D6E3C 90 61 00 08 */ stw r3, 8(r1) -/* 801D6E40 C8 01 00 08 */ lfd f0, 8(r1) -/* 801D6E44 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D6E48 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D6E4C 4C 41 13 82 */ cror 2, 1, 2 -/* 801D6E50 40 82 00 24 */ bne lbl_801D6E74 -/* 801D6E54 7C 80 07 34 */ extsh r0, r4 -/* 801D6E58 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D6E5C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D6E60 90 61 00 08 */ stw r3, 8(r1) -/* 801D6E64 C8 01 00 08 */ lfd f0, 8(r1) -/* 801D6E68 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D6E6C EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D6E70 D0 1E 00 74 */ stfs f0, 0x74(r30) -lbl_801D6E74: -/* 801D6E74 C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 801D6E78 D0 1F 00 08 */ stfs f0, 8(r31) -/* 801D6E7C 48 00 00 0C */ b lbl_801D6E88 -lbl_801D6E80: -/* 801D6E80 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D6E84 D0 1E 00 74 */ stfs f0, 0x74(r30) -lbl_801D6E88: -/* 801D6E88 80 7E 00 08 */ lwz r3, 8(r30) -/* 801D6E8C 3C 80 6F 74 */ lis r4, 0x6F74 /* 0x6F745F30@ha */ -/* 801D6E90 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x6F745F30@l */ -/* 801D6E94 38 A0 73 70 */ li r5, 0x7370 -/* 801D6E98 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6E9C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6EA0 7D 89 03 A6 */ mtctr r12 -/* 801D6EA4 4E 80 04 21 */ bctrl -/* 801D6EA8 7F E4 FB 78 */ mr r4, r31 -/* 801D6EAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6EB0 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 801D6EB4 7D 89 03 A6 */ mtctr r12 -/* 801D6EB8 4E 80 04 21 */ bctrl -/* 801D6EBC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801D6EC0 48 12 27 D1 */ bl animation__9J2DScreenFv -/* 801D6EC4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D6EC8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801D6ECC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D6ED0 7C 08 03 A6 */ mtlr r0 -/* 801D6ED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D6ED8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__18dMenu_Fmap2DBack_cFf.s b/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__18dMenu_Fmap2DBack_cFf.s deleted file mode 100644 index f733ffa494..0000000000 --- a/asm/d/menu/d_menu_fmap2D/btkAnimeLoop__18dMenu_Fmap2DBack_cFf.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_801D49E0: -/* 801D49E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D49E4 7C 08 02 A6 */ mflr r0 -/* 801D49E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D49EC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D49F0 7C 7F 1B 78 */ mr r31, r3 -/* 801D49F4 80 03 0C E4 */ lwz r0, 0xce4(r3) -/* 801D49F8 28 00 00 00 */ cmplwi r0, 0 -/* 801D49FC 41 82 00 6C */ beq lbl_801D4A68 -/* 801D4A00 C0 1F 0F AC */ lfs f0, 0xfac(r31) -/* 801D4A04 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D4A08 D0 1F 0F AC */ stfs f0, 0xfac(r31) -/* 801D4A0C 80 7F 0C E4 */ lwz r3, 0xce4(r31) -/* 801D4A10 A8 03 00 06 */ lha r0, 6(r3) -/* 801D4A14 C0 5F 0F AC */ lfs f2, 0xfac(r31) -/* 801D4A18 C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D4A1C 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 801D4A20 90 61 00 0C */ stw r3, 0xc(r1) -/* 801D4A24 3C 00 43 30 */ lis r0, 0x4330 -/* 801D4A28 90 01 00 08 */ stw r0, 8(r1) -/* 801D4A2C C8 01 00 08 */ lfd f0, 8(r1) -/* 801D4A30 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4A34 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D4A38 4C 41 13 82 */ cror 2, 1, 2 -/* 801D4A3C 40 82 00 1C */ bne lbl_801D4A58 -/* 801D4A40 90 61 00 0C */ stw r3, 0xc(r1) -/* 801D4A44 90 01 00 08 */ stw r0, 8(r1) -/* 801D4A48 C8 01 00 08 */ lfd f0, 8(r1) -/* 801D4A4C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4A50 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D4A54 D0 1F 0F AC */ stfs f0, 0xfac(r31) -lbl_801D4A58: -/* 801D4A58 C0 1F 0F AC */ lfs f0, 0xfac(r31) -/* 801D4A5C 80 7F 0C E4 */ lwz r3, 0xce4(r31) -/* 801D4A60 D0 03 00 08 */ stfs f0, 8(r3) -/* 801D4A64 48 00 00 0C */ b lbl_801D4A70 -lbl_801D4A68: -/* 801D4A68 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D4A6C D0 1F 0F AC */ stfs f0, 0xfac(r31) -lbl_801D4A70: -/* 801D4A70 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801D4A74 3C 80 30 30 */ lis r4, 0x3030 /* 0x30305F30@ha */ -/* 801D4A78 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x30305F30@l */ -/* 801D4A7C 3C 80 67 6F */ lis r4, 0x676F /* 0x676F6C64@ha */ -/* 801D4A80 38 A4 6C 64 */ addi r5, r4, 0x6C64 /* 0x676F6C64@l */ -/* 801D4A84 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4A88 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D4A8C 7D 89 03 A6 */ mtctr r12 -/* 801D4A90 4E 80 04 21 */ bctrl -/* 801D4A94 80 9F 0C E4 */ lwz r4, 0xce4(r31) -/* 801D4A98 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4A9C 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 801D4AA0 7D 89 03 A6 */ mtctr r12 -/* 801D4AA4 4E 80 04 21 */ bctrl -/* 801D4AA8 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801D4AAC 3C 80 30 30 */ lis r4, 0x3030 /* 0x30305F31@ha */ -/* 801D4AB0 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x30305F31@l */ -/* 801D4AB4 3C 80 67 6F */ lis r4, 0x676F /* 0x676F6C64@ha */ -/* 801D4AB8 38 A4 6C 64 */ addi r5, r4, 0x6C64 /* 0x676F6C64@l */ -/* 801D4ABC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4AC0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D4AC4 7D 89 03 A6 */ mtctr r12 -/* 801D4AC8 4E 80 04 21 */ bctrl -/* 801D4ACC 80 9F 0C E4 */ lwz r4, 0xce4(r31) -/* 801D4AD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4AD4 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 801D4AD8 7D 89 03 A6 */ mtctr r12 -/* 801D4ADC 4E 80 04 21 */ bctrl -/* 801D4AE0 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801D4AE4 48 12 4B AD */ bl animation__9J2DScreenFv -/* 801D4AE8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D4AEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D4AF0 7C 08 03 A6 */ mtlr r0 -/* 801D4AF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D4AF8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf.s b/asm/d/menu/d_menu_fmap2D/calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf.s deleted file mode 100644 index 7903a4bfb1..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801D0C6C: -/* 801D0C6C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801D0C70 7C 08 02 A6 */ mflr r0 -/* 801D0C74 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D0C78 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801D0C7C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801D0C80 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 801D0C84 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 801D0C88 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0C8C 48 19 15 51 */ bl _savegpr_29 -/* 801D0C90 7C 7D 1B 78 */ mr r29, r3 -/* 801D0C94 7C 9E 23 78 */ mr r30, r4 -/* 801D0C98 7C BF 2B 78 */ mr r31, r5 -/* 801D0C9C C0 A3 0F F0 */ lfs f5, 0xff0(r3) -/* 801D0CA0 C0 82 A7 E8 */ lfs f4, lit_4202(r2) -/* 801D0CA4 C0 63 0F E8 */ lfs f3, 0xfe8(r3) -/* 801D0CA8 C0 03 0F E0 */ lfs f0, 0xfe0(r3) -/* 801D0CAC EC 03 00 2A */ fadds f0, f3, f0 -/* 801D0CB0 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D0CB4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D0CB8 EF E5 00 32 */ fmuls f31, f5, f0 -/* 801D0CBC C0 23 0F EC */ lfs f1, 0xfec(r3) -/* 801D0CC0 C0 03 0F E4 */ lfs f0, 0xfe4(r3) -/* 801D0CC4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D0CC8 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D0CCC EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D0CD0 EF C5 00 32 */ fmuls f30, f5, f0 -/* 801D0CD4 48 00 19 A5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D0CD8 EC 1F 08 2A */ fadds f0, f31, f1 -/* 801D0CDC D0 1E 00 00 */ stfs f0, 0(r30) -/* 801D0CE0 7F A3 EB 78 */ mr r3, r29 -/* 801D0CE4 48 00 19 E5 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D0CE8 EC 1E 08 2A */ fadds f0, f30, f1 -/* 801D0CEC D0 1F 00 00 */ stfs f0, 0(r31) -/* 801D0CF0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801D0CF4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801D0CF8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 801D0CFC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 801D0D00 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0D04 48 19 15 25 */ bl _restgpr_29 -/* 801D0D08 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801D0D0C 7C 08 03 A6 */ mtlr r0 -/* 801D0D10 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D0D14 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff.s b/asm/d/menu/d_menu_fmap2D/calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff.s deleted file mode 100644 index ce53142e8d..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_801D0E00: -/* 801D0E00 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 801D0E04 7C 08 02 A6 */ mflr r0 -/* 801D0E08 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 801D0E0C DB E1 00 90 */ stfd f31, 0x90(r1) -/* 801D0E10 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 801D0E14 DB C1 00 80 */ stfd f30, 0x80(r1) -/* 801D0E18 F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 /* qr0 */ -/* 801D0E1C DB A1 00 70 */ stfd f29, 0x70(r1) -/* 801D0E20 F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 /* qr0 */ -/* 801D0E24 DB 81 00 60 */ stfd f28, 0x60(r1) -/* 801D0E28 F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 /* qr0 */ -/* 801D0E2C DB 61 00 50 */ stfd f27, 0x50(r1) -/* 801D0E30 F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* qr0 */ -/* 801D0E34 DB 41 00 40 */ stfd f26, 0x40(r1) -/* 801D0E38 F3 41 00 48 */ psq_st f26, 72(r1), 0, 0 /* qr0 */ -/* 801D0E3C DB 21 00 30 */ stfd f25, 0x30(r1) -/* 801D0E40 F3 21 00 38 */ psq_st f25, 56(r1), 0, 0 /* qr0 */ -/* 801D0E44 DB 01 00 20 */ stfd f24, 0x20(r1) -/* 801D0E48 F3 01 00 28 */ psq_st f24, 40(r1), 0, 0 /* qr0 */ -/* 801D0E4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0E50 48 19 13 8D */ bl _savegpr_29 -/* 801D0E54 7C 7D 1B 78 */ mr r29, r3 -/* 801D0E58 FF 40 08 90 */ fmr f26, f1 -/* 801D0E5C FF 60 10 90 */ fmr f27, f2 -/* 801D0E60 7C 9E 23 78 */ mr r30, r4 -/* 801D0E64 7C BF 2B 78 */ mr r31, r5 -/* 801D0E68 FF 00 18 90 */ fmr f24, f3 -/* 801D0E6C FF 80 20 90 */ fmr f28, f4 -/* 801D0E70 FF A0 28 90 */ fmr f29, f5 -/* 801D0E74 48 00 18 A5 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801D0E78 7F A3 EB 78 */ mr r3, r29 -/* 801D0E7C 48 00 18 AD */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv -/* 801D0E80 C0 42 A7 E8 */ lfs f2, lit_4202(r2) -/* 801D0E84 88 9D 12 27 */ lbz r4, 0x1227(r29) -/* 801D0E88 1C 04 00 14 */ mulli r0, r4, 0x14 -/* 801D0E8C 7C 7D 02 14 */ add r3, r29, r0 -/* 801D0E90 C0 23 0C E8 */ lfs f1, 0xce8(r3) -/* 801D0E94 C0 03 0C F0 */ lfs f0, 0xcf0(r3) -/* 801D0E98 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D0E9C EF E2 00 32 */ fmuls f31, f2, f0 -/* 801D0EA0 C0 23 0C EC */ lfs f1, 0xcec(r3) -/* 801D0EA4 C0 03 0C F4 */ lfs f0, 0xcf4(r3) -/* 801D0EA8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D0EAC EF C2 00 32 */ fmuls f30, f2, f0 -/* 801D0EB0 54 80 10 3A */ slwi r0, r4, 2 -/* 801D0EB4 7C 7D 02 14 */ add r3, r29, r0 -/* 801D0EB8 C0 03 0E 8C */ lfs f0, 0xe8c(r3) -/* 801D0EBC EC 20 C0 2A */ fadds f1, f0, f24 -/* 801D0EC0 C0 03 0E CC */ lfs f0, 0xecc(r3) -/* 801D0EC4 EC 00 07 72 */ fmuls f0, f0, f29 -/* 801D0EC8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D0ECC EF 21 00 2A */ fadds f25, f1, f0 -/* 801D0ED0 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D0ED4 EC 20 E0 2A */ fadds f1, f0, f28 -/* 801D0ED8 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D0EDC EC 00 07 72 */ fmuls f0, f0, f29 -/* 801D0EE0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D0EE4 EF 01 00 2A */ fadds f24, f1, f0 -/* 801D0EE8 7F A3 EB 78 */ mr r3, r29 -/* 801D0EEC 48 00 1A AD */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D0EF0 FF 80 08 90 */ fmr f28, f1 -/* 801D0EF4 7F A3 EB 78 */ mr r3, r29 -/* 801D0EF8 FC 20 E8 90 */ fmr f1, f29 -/* 801D0EFC 48 00 1B CD */ bl getPathScale__18dMenu_Fmap2DBack_cFf -/* 801D0F00 EC 21 E0 24 */ fdivs f1, f1, f28 -/* 801D0F04 EC 1A F8 28 */ fsubs f0, f26, f31 -/* 801D0F08 EC 00 08 24 */ fdivs f0, f0, f1 -/* 801D0F0C EC 00 C8 2A */ fadds f0, f0, f25 -/* 801D0F10 D0 1E 00 00 */ stfs f0, 0(r30) -/* 801D0F14 EC 1B F0 28 */ fsubs f0, f27, f30 -/* 801D0F18 EC 00 08 24 */ fdivs f0, f0, f1 -/* 801D0F1C EC 00 C0 2A */ fadds f0, f0, f24 -/* 801D0F20 D0 1F 00 00 */ stfs f0, 0(r31) -/* 801D0F24 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 801D0F28 CB E1 00 90 */ lfd f31, 0x90(r1) -/* 801D0F2C E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 /* qr0 */ -/* 801D0F30 CB C1 00 80 */ lfd f30, 0x80(r1) -/* 801D0F34 E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 /* qr0 */ -/* 801D0F38 CB A1 00 70 */ lfd f29, 0x70(r1) -/* 801D0F3C E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 /* qr0 */ -/* 801D0F40 CB 81 00 60 */ lfd f28, 0x60(r1) -/* 801D0F44 E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* qr0 */ -/* 801D0F48 CB 61 00 50 */ lfd f27, 0x50(r1) -/* 801D0F4C E3 41 00 48 */ psq_l f26, 72(r1), 0, 0 /* qr0 */ -/* 801D0F50 CB 41 00 40 */ lfd f26, 0x40(r1) -/* 801D0F54 E3 21 00 38 */ psq_l f25, 56(r1), 0, 0 /* qr0 */ -/* 801D0F58 CB 21 00 30 */ lfd f25, 0x30(r1) -/* 801D0F5C E3 01 00 28 */ psq_l f24, 40(r1), 0, 0 /* qr0 */ -/* 801D0F60 CB 01 00 20 */ lfd f24, 0x20(r1) -/* 801D0F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0F68 48 19 12 C1 */ bl _restgpr_29 -/* 801D0F6C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 801D0F70 7C 08 03 A6 */ mtlr r0 -/* 801D0F74 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801D0F78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf.s b/asm/d/menu/d_menu_fmap2D/calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf.s deleted file mode 100644 index 3b627f68ac..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_801D0F7C: -/* 801D0F7C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801D0F80 7C 08 02 A6 */ mflr r0 -/* 801D0F84 90 01 00 64 */ stw r0, 0x64(r1) -/* 801D0F88 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 801D0F8C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 801D0F90 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 801D0F94 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 801D0F98 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 801D0F9C F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 801D0FA0 DB 81 00 20 */ stfd f28, 0x20(r1) -/* 801D0FA4 F3 81 00 28 */ psq_st f28, 40(r1), 0, 0 /* qr0 */ -/* 801D0FA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0FAC 48 19 12 31 */ bl _savegpr_29 -/* 801D0FB0 7C 7D 1B 78 */ mr r29, r3 -/* 801D0FB4 7C 9E 23 78 */ mr r30, r4 -/* 801D0FB8 7C BF 2B 78 */ mr r31, r5 -/* 801D0FBC C0 82 A7 E8 */ lfs f4, lit_4202(r2) -/* 801D0FC0 88 A3 12 27 */ lbz r5, 0x1227(r3) -/* 801D0FC4 1C 05 00 14 */ mulli r0, r5, 0x14 -/* 801D0FC8 7C 9D 02 14 */ add r4, r29, r0 -/* 801D0FCC C0 64 0C E8 */ lfs f3, 0xce8(r4) -/* 801D0FD0 C0 04 0C F0 */ lfs f0, 0xcf0(r4) -/* 801D0FD4 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D0FD8 EF E4 00 32 */ fmuls f31, f4, f0 -/* 801D0FDC C0 64 0C EC */ lfs f3, 0xcec(r4) -/* 801D0FE0 C0 04 0C F4 */ lfs f0, 0xcf4(r4) -/* 801D0FE4 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D0FE8 EF C4 00 32 */ fmuls f30, f4, f0 -/* 801D0FEC 54 A0 10 3A */ slwi r0, r5, 2 -/* 801D0FF0 7C 9D 02 14 */ add r4, r29, r0 -/* 801D0FF4 C0 64 0E 8C */ lfs f3, 0xe8c(r4) -/* 801D0FF8 C0 04 0F 0C */ lfs f0, 0xf0c(r4) -/* 801D0FFC EC 63 00 2A */ fadds f3, f3, f0 -/* 801D1000 C0 04 0E CC */ lfs f0, 0xecc(r4) -/* 801D1004 C0 A3 0F 9C */ lfs f5, 0xf9c(r3) -/* 801D1008 EC 00 01 72 */ fmuls f0, f0, f5 -/* 801D100C EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1010 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D1014 EF A1 00 28 */ fsubs f29, f1, f0 -/* 801D1018 C0 24 0E AC */ lfs f1, 0xeac(r4) -/* 801D101C C0 04 0F 2C */ lfs f0, 0xf2c(r4) -/* 801D1020 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1024 C0 04 0E EC */ lfs f0, 0xeec(r4) -/* 801D1028 EC 00 01 72 */ fmuls f0, f0, f5 -/* 801D102C EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1030 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1034 EF 82 00 28 */ fsubs f28, f2, f0 -/* 801D1038 48 00 19 61 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D103C C0 1D 0F 98 */ lfs f0, 0xf98(r29) -/* 801D1040 EC 20 08 24 */ fdivs f1, f0, f1 -/* 801D1044 EC 1D 00 72 */ fmuls f0, f29, f1 -/* 801D1048 EC 1F 00 2A */ fadds f0, f31, f0 -/* 801D104C D0 1E 00 00 */ stfs f0, 0(r30) -/* 801D1050 EC 1C 00 72 */ fmuls f0, f28, f1 -/* 801D1054 EC 1E 00 2A */ fadds f0, f30, f0 -/* 801D1058 D0 1F 00 00 */ stfs f0, 0(r31) -/* 801D105C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 801D1060 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 801D1064 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 801D1068 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 801D106C E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 801D1070 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 801D1074 E3 81 00 28 */ psq_l f28, 40(r1), 0, 0 /* qr0 */ -/* 801D1078 CB 81 00 20 */ lfd f28, 0x20(r1) -/* 801D107C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1080 48 19 11 A9 */ bl _restgpr_29 -/* 801D1084 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801D1088 7C 08 03 A6 */ mtlr r0 -/* 801D108C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801D1090 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcBackAlpha__18dMenu_Fmap2DBack_cFb.s b/asm/d/menu/d_menu_fmap2D/calcBackAlpha__18dMenu_Fmap2DBack_cFb.s deleted file mode 100644 index 25e10ee26a..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcBackAlpha__18dMenu_Fmap2DBack_cFb.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801D4928: -/* 801D4928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D492C 7C 08 02 A6 */ mflr r0 -/* 801D4930 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D4934 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D4938 7C 7F 1B 78 */ mr r31, r3 -/* 801D493C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801D4940 41 82 00 4C */ beq lbl_801D498C -/* 801D4944 C0 22 A7 D4 */ lfs f1, lit_3971(r2) -/* 801D4948 C0 1F 11 E4 */ lfs f0, 0x11e4(r31) -/* 801D494C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D4950 41 82 00 7C */ beq lbl_801D49CC -/* 801D4954 38 7F 11 E4 */ addi r3, r31, 0x11e4 -/* 801D4958 C0 42 A8 18 */ lfs f2, lit_5433(r2) -/* 801D495C C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D4960 48 09 B0 DD */ bl cLib_addCalc2__FPffff -/* 801D4964 C0 1F 11 E4 */ lfs f0, 0x11e4(r31) -/* 801D4968 C0 22 A7 D4 */ lfs f1, lit_3971(r2) -/* 801D496C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4970 FC 00 02 10 */ fabs f0, f0 -/* 801D4974 FC 40 00 18 */ frsp f2, f0 -/* 801D4978 C0 02 A8 1C */ lfs f0, lit_5434(r2) -/* 801D497C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D4980 40 80 00 4C */ bge lbl_801D49CC -/* 801D4984 D0 3F 11 E4 */ stfs f1, 0x11e4(r31) -/* 801D4988 48 00 00 44 */ b lbl_801D49CC -lbl_801D498C: -/* 801D498C C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D4990 C0 1F 11 E4 */ lfs f0, 0x11e4(r31) -/* 801D4994 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D4998 41 82 00 34 */ beq lbl_801D49CC -/* 801D499C 38 7F 11 E4 */ addi r3, r31, 0x11e4 -/* 801D49A0 C0 42 A8 18 */ lfs f2, lit_5433(r2) -/* 801D49A4 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D49A8 48 09 B0 95 */ bl cLib_addCalc2__FPffff -/* 801D49AC C0 1F 11 E4 */ lfs f0, 0x11e4(r31) -/* 801D49B0 FC 00 02 10 */ fabs f0, f0 -/* 801D49B4 FC 20 00 18 */ frsp f1, f0 -/* 801D49B8 C0 02 A8 1C */ lfs f0, lit_5434(r2) -/* 801D49BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D49C0 40 80 00 0C */ bge lbl_801D49CC -/* 801D49C4 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D49C8 D0 1F 11 E4 */ stfs f0, 0x11e4(r31) -lbl_801D49CC: -/* 801D49CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D49D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D49D4 7C 08 03 A6 */ mtlr r0 -/* 801D49D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D49DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcBlink__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/calcBlink__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 1274adf323..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcBlink__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,805 +0,0 @@ -lbl_801D3CB8: -/* 801D3CB8 94 21 FC 80 */ stwu r1, -0x380(r1) -/* 801D3CBC C0 23 0F A0 */ lfs f1, 0xfa0(r3) -/* 801D3CC0 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D3CC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D3CC8 4C 40 13 82 */ cror 2, 0, 2 -/* 801D3CCC 40 82 00 10 */ bne lbl_801D3CDC -/* 801D3CD0 FC 60 08 90 */ fmr f3, f1 -/* 801D3CD4 38 00 00 00 */ li r0, 0 -/* 801D3CD8 48 00 00 0C */ b lbl_801D3CE4 -lbl_801D3CDC: -/* 801D3CDC EC 61 00 28 */ fsubs f3, f1, f0 -/* 801D3CE0 38 00 00 01 */ li r0, 1 -lbl_801D3CE4: -/* 801D3CE4 1C A0 00 28 */ mulli r5, r0, 0x28 -/* 801D3CE8 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D3CEC 38 04 FC 60 */ addi r0, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D3CF0 7C 80 2A 14 */ add r4, r0, r5 -/* 801D3CF4 88 C4 00 1C */ lbz r6, 0x1c(r4) -/* 801D3CF8 C8 42 A7 F8 */ lfd f2, lit_4207(r2) -/* 801D3CFC 90 C1 00 0C */ stw r6, 0xc(r1) -/* 801D3D00 3C 00 43 30 */ lis r0, 0x4330 -/* 801D3D04 90 01 00 08 */ stw r0, 8(r1) -/* 801D3D08 C8 01 00 08 */ lfd f0, 8(r1) -/* 801D3D0C EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3D10 88 A4 00 44 */ lbz r5, 0x44(r4) -/* 801D3D14 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3D18 C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D3D1C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3D20 90 A1 00 14 */ stw r5, 0x14(r1) -/* 801D3D24 90 01 00 10 */ stw r0, 0x10(r1) -/* 801D3D28 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801D3D2C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3D30 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3D34 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3D38 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3D3C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 801D3D40 80 A1 00 1C */ lwz r5, 0x1c(r1) -/* 801D3D44 98 A3 11 F0 */ stb r5, 0x11f0(r3) -/* 801D3D48 88 C4 00 1D */ lbz r6, 0x1d(r4) -/* 801D3D4C 90 C1 00 24 */ stw r6, 0x24(r1) -/* 801D3D50 90 01 00 20 */ stw r0, 0x20(r1) -/* 801D3D54 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 801D3D58 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3D5C 88 A4 00 45 */ lbz r5, 0x45(r4) -/* 801D3D60 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3D64 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3D68 90 A1 00 2C */ stw r5, 0x2c(r1) -/* 801D3D6C 90 01 00 28 */ stw r0, 0x28(r1) -/* 801D3D70 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 801D3D74 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3D78 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3D7C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3D80 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3D84 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 801D3D88 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 801D3D8C 98 A3 11 F1 */ stb r5, 0x11f1(r3) -/* 801D3D90 88 C4 00 1E */ lbz r6, 0x1e(r4) -/* 801D3D94 90 C1 00 3C */ stw r6, 0x3c(r1) -/* 801D3D98 90 01 00 38 */ stw r0, 0x38(r1) -/* 801D3D9C C8 01 00 38 */ lfd f0, 0x38(r1) -/* 801D3DA0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3DA4 88 A4 00 46 */ lbz r5, 0x46(r4) -/* 801D3DA8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3DAC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3DB0 90 A1 00 44 */ stw r5, 0x44(r1) -/* 801D3DB4 90 01 00 40 */ stw r0, 0x40(r1) -/* 801D3DB8 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 801D3DBC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3DC0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3DC4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3DC8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3DCC D8 01 00 48 */ stfd f0, 0x48(r1) -/* 801D3DD0 80 A1 00 4C */ lwz r5, 0x4c(r1) -/* 801D3DD4 98 A3 11 F2 */ stb r5, 0x11f2(r3) -/* 801D3DD8 88 C4 00 1F */ lbz r6, 0x1f(r4) -/* 801D3DDC 90 C1 00 54 */ stw r6, 0x54(r1) -/* 801D3DE0 90 01 00 50 */ stw r0, 0x50(r1) -/* 801D3DE4 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 801D3DE8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3DEC 88 A4 00 47 */ lbz r5, 0x47(r4) -/* 801D3DF0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3DF4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3DF8 90 A1 00 5C */ stw r5, 0x5c(r1) -/* 801D3DFC 90 01 00 58 */ stw r0, 0x58(r1) -/* 801D3E00 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 801D3E04 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3E08 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3E0C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3E10 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3E14 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 801D3E18 80 A1 00 64 */ lwz r5, 0x64(r1) -/* 801D3E1C 98 A3 11 F3 */ stb r5, 0x11f3(r3) -/* 801D3E20 88 C4 00 20 */ lbz r6, 0x20(r4) -/* 801D3E24 90 C1 00 6C */ stw r6, 0x6c(r1) -/* 801D3E28 90 01 00 68 */ stw r0, 0x68(r1) -/* 801D3E2C C8 01 00 68 */ lfd f0, 0x68(r1) -/* 801D3E30 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3E34 88 A4 00 48 */ lbz r5, 0x48(r4) -/* 801D3E38 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3E3C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3E40 90 A1 00 74 */ stw r5, 0x74(r1) -/* 801D3E44 90 01 00 70 */ stw r0, 0x70(r1) -/* 801D3E48 C8 01 00 70 */ lfd f0, 0x70(r1) -/* 801D3E4C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3E50 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3E54 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3E58 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3E5C D8 01 00 78 */ stfd f0, 0x78(r1) -/* 801D3E60 80 A1 00 7C */ lwz r5, 0x7c(r1) -/* 801D3E64 98 A3 11 F4 */ stb r5, 0x11f4(r3) -/* 801D3E68 88 C4 00 21 */ lbz r6, 0x21(r4) -/* 801D3E6C 90 C1 00 84 */ stw r6, 0x84(r1) -/* 801D3E70 90 01 00 80 */ stw r0, 0x80(r1) -/* 801D3E74 C8 01 00 80 */ lfd f0, 0x80(r1) -/* 801D3E78 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3E7C 88 A4 00 49 */ lbz r5, 0x49(r4) -/* 801D3E80 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3E84 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3E88 90 A1 00 8C */ stw r5, 0x8c(r1) -/* 801D3E8C 90 01 00 88 */ stw r0, 0x88(r1) -/* 801D3E90 C8 01 00 88 */ lfd f0, 0x88(r1) -/* 801D3E94 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3E98 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3E9C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3EA0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3EA4 D8 01 00 90 */ stfd f0, 0x90(r1) -/* 801D3EA8 80 A1 00 94 */ lwz r5, 0x94(r1) -/* 801D3EAC 98 A3 11 F5 */ stb r5, 0x11f5(r3) -/* 801D3EB0 88 C4 00 22 */ lbz r6, 0x22(r4) -/* 801D3EB4 90 C1 00 9C */ stw r6, 0x9c(r1) -/* 801D3EB8 90 01 00 98 */ stw r0, 0x98(r1) -/* 801D3EBC C8 01 00 98 */ lfd f0, 0x98(r1) -/* 801D3EC0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3EC4 88 A4 00 4A */ lbz r5, 0x4a(r4) -/* 801D3EC8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3ECC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3ED0 90 A1 00 A4 */ stw r5, 0xa4(r1) -/* 801D3ED4 90 01 00 A0 */ stw r0, 0xa0(r1) -/* 801D3ED8 C8 01 00 A0 */ lfd f0, 0xa0(r1) -/* 801D3EDC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3EE0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3EE4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3EE8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3EEC D8 01 00 A8 */ stfd f0, 0xa8(r1) -/* 801D3EF0 80 A1 00 AC */ lwz r5, 0xac(r1) -/* 801D3EF4 98 A3 11 F6 */ stb r5, 0x11f6(r3) -/* 801D3EF8 88 C4 00 23 */ lbz r6, 0x23(r4) -/* 801D3EFC 90 C1 00 B4 */ stw r6, 0xb4(r1) -/* 801D3F00 90 01 00 B0 */ stw r0, 0xb0(r1) -/* 801D3F04 C8 01 00 B0 */ lfd f0, 0xb0(r1) -/* 801D3F08 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3F0C 88 A4 00 4B */ lbz r5, 0x4b(r4) -/* 801D3F10 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3F14 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3F18 90 A1 00 BC */ stw r5, 0xbc(r1) -/* 801D3F1C 90 01 00 B8 */ stw r0, 0xb8(r1) -/* 801D3F20 C8 01 00 B8 */ lfd f0, 0xb8(r1) -/* 801D3F24 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3F28 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3F2C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3F30 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3F34 D8 01 00 C0 */ stfd f0, 0xc0(r1) -/* 801D3F38 80 A1 00 C4 */ lwz r5, 0xc4(r1) -/* 801D3F3C 98 A3 11 F7 */ stb r5, 0x11f7(r3) -/* 801D3F40 88 C4 00 28 */ lbz r6, 0x28(r4) -/* 801D3F44 90 C1 00 CC */ stw r6, 0xcc(r1) -/* 801D3F48 90 01 00 C8 */ stw r0, 0xc8(r1) -/* 801D3F4C C8 01 00 C8 */ lfd f0, 0xc8(r1) -/* 801D3F50 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3F54 88 A4 00 50 */ lbz r5, 0x50(r4) -/* 801D3F58 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3F5C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3F60 90 A1 00 D4 */ stw r5, 0xd4(r1) -/* 801D3F64 90 01 00 D0 */ stw r0, 0xd0(r1) -/* 801D3F68 C8 01 00 D0 */ lfd f0, 0xd0(r1) -/* 801D3F6C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3F70 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3F74 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3F78 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3F7C D8 01 00 D8 */ stfd f0, 0xd8(r1) -/* 801D3F80 80 A1 00 DC */ lwz r5, 0xdc(r1) -/* 801D3F84 98 A3 11 F8 */ stb r5, 0x11f8(r3) -/* 801D3F88 88 C4 00 29 */ lbz r6, 0x29(r4) -/* 801D3F8C 90 C1 00 E4 */ stw r6, 0xe4(r1) -/* 801D3F90 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 801D3F94 C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 801D3F98 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3F9C 88 A4 00 51 */ lbz r5, 0x51(r4) -/* 801D3FA0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3FA4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3FA8 90 A1 00 EC */ stw r5, 0xec(r1) -/* 801D3FAC 90 01 00 E8 */ stw r0, 0xe8(r1) -/* 801D3FB0 C8 01 00 E8 */ lfd f0, 0xe8(r1) -/* 801D3FB4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D3FB8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D3FBC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D3FC0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3FC4 D8 01 00 F0 */ stfd f0, 0xf0(r1) -/* 801D3FC8 80 A1 00 F4 */ lwz r5, 0xf4(r1) -/* 801D3FCC 98 A3 11 F9 */ stb r5, 0x11f9(r3) -/* 801D3FD0 88 C4 00 2A */ lbz r6, 0x2a(r4) -/* 801D3FD4 90 C1 00 FC */ stw r6, 0xfc(r1) -/* 801D3FD8 90 01 00 F8 */ stw r0, 0xf8(r1) -/* 801D3FDC C8 01 00 F8 */ lfd f0, 0xf8(r1) -/* 801D3FE0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D3FE4 88 A4 00 52 */ lbz r5, 0x52(r4) -/* 801D3FE8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D3FEC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D3FF0 90 A1 01 04 */ stw r5, 0x104(r1) -/* 801D3FF4 90 01 01 00 */ stw r0, 0x100(r1) -/* 801D3FF8 C8 01 01 00 */ lfd f0, 0x100(r1) -/* 801D3FFC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4000 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4004 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4008 FC 00 00 1E */ fctiwz f0, f0 -/* 801D400C D8 01 01 08 */ stfd f0, 0x108(r1) -/* 801D4010 80 A1 01 0C */ lwz r5, 0x10c(r1) -/* 801D4014 98 A3 11 FA */ stb r5, 0x11fa(r3) -/* 801D4018 88 C4 00 2B */ lbz r6, 0x2b(r4) -/* 801D401C 90 C1 01 14 */ stw r6, 0x114(r1) -/* 801D4020 90 01 01 10 */ stw r0, 0x110(r1) -/* 801D4024 C8 01 01 10 */ lfd f0, 0x110(r1) -/* 801D4028 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D402C 88 A4 00 53 */ lbz r5, 0x53(r4) -/* 801D4030 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4034 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4038 90 A1 01 1C */ stw r5, 0x11c(r1) -/* 801D403C 90 01 01 18 */ stw r0, 0x118(r1) -/* 801D4040 C8 01 01 18 */ lfd f0, 0x118(r1) -/* 801D4044 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4048 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D404C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4050 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4054 D8 01 01 20 */ stfd f0, 0x120(r1) -/* 801D4058 80 A1 01 24 */ lwz r5, 0x124(r1) -/* 801D405C 98 A3 11 FB */ stb r5, 0x11fb(r3) -/* 801D4060 88 C4 00 2C */ lbz r6, 0x2c(r4) -/* 801D4064 90 C1 01 2C */ stw r6, 0x12c(r1) -/* 801D4068 90 01 01 28 */ stw r0, 0x128(r1) -/* 801D406C C8 01 01 28 */ lfd f0, 0x128(r1) -/* 801D4070 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4074 88 A4 00 54 */ lbz r5, 0x54(r4) -/* 801D4078 7C A6 28 50 */ subf r5, r6, r5 -/* 801D407C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4080 90 A1 01 34 */ stw r5, 0x134(r1) -/* 801D4084 90 01 01 30 */ stw r0, 0x130(r1) -/* 801D4088 C8 01 01 30 */ lfd f0, 0x130(r1) -/* 801D408C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4090 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4094 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4098 FC 00 00 1E */ fctiwz f0, f0 -/* 801D409C D8 01 01 38 */ stfd f0, 0x138(r1) -/* 801D40A0 80 A1 01 3C */ lwz r5, 0x13c(r1) -/* 801D40A4 98 A3 11 FC */ stb r5, 0x11fc(r3) -/* 801D40A8 88 C4 00 2D */ lbz r6, 0x2d(r4) -/* 801D40AC 90 C1 01 44 */ stw r6, 0x144(r1) -/* 801D40B0 90 01 01 40 */ stw r0, 0x140(r1) -/* 801D40B4 C8 01 01 40 */ lfd f0, 0x140(r1) -/* 801D40B8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D40BC 88 A4 00 55 */ lbz r5, 0x55(r4) -/* 801D40C0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D40C4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D40C8 90 A1 01 4C */ stw r5, 0x14c(r1) -/* 801D40CC 90 01 01 48 */ stw r0, 0x148(r1) -/* 801D40D0 C8 01 01 48 */ lfd f0, 0x148(r1) -/* 801D40D4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D40D8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D40DC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D40E0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D40E4 D8 01 01 50 */ stfd f0, 0x150(r1) -/* 801D40E8 80 A1 01 54 */ lwz r5, 0x154(r1) -/* 801D40EC 98 A3 11 FD */ stb r5, 0x11fd(r3) -/* 801D40F0 88 C4 00 2E */ lbz r6, 0x2e(r4) -/* 801D40F4 90 C1 01 5C */ stw r6, 0x15c(r1) -/* 801D40F8 90 01 01 58 */ stw r0, 0x158(r1) -/* 801D40FC C8 01 01 58 */ lfd f0, 0x158(r1) -/* 801D4100 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4104 88 A4 00 56 */ lbz r5, 0x56(r4) -/* 801D4108 7C A6 28 50 */ subf r5, r6, r5 -/* 801D410C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4110 90 A1 01 64 */ stw r5, 0x164(r1) -/* 801D4114 90 01 01 60 */ stw r0, 0x160(r1) -/* 801D4118 C8 01 01 60 */ lfd f0, 0x160(r1) -/* 801D411C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4120 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4124 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4128 FC 00 00 1E */ fctiwz f0, f0 -/* 801D412C D8 01 01 68 */ stfd f0, 0x168(r1) -/* 801D4130 80 A1 01 6C */ lwz r5, 0x16c(r1) -/* 801D4134 98 A3 11 FE */ stb r5, 0x11fe(r3) -/* 801D4138 88 C4 00 2F */ lbz r6, 0x2f(r4) -/* 801D413C 90 C1 01 74 */ stw r6, 0x174(r1) -/* 801D4140 90 01 01 70 */ stw r0, 0x170(r1) -/* 801D4144 C8 01 01 70 */ lfd f0, 0x170(r1) -/* 801D4148 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D414C 88 A4 00 57 */ lbz r5, 0x57(r4) -/* 801D4150 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4154 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4158 90 A1 01 7C */ stw r5, 0x17c(r1) -/* 801D415C 90 01 01 78 */ stw r0, 0x178(r1) -/* 801D4160 C8 01 01 78 */ lfd f0, 0x178(r1) -/* 801D4164 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4168 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D416C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4170 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4174 D8 01 01 80 */ stfd f0, 0x180(r1) -/* 801D4178 80 A1 01 84 */ lwz r5, 0x184(r1) -/* 801D417C 98 A3 11 FF */ stb r5, 0x11ff(r3) -/* 801D4180 88 C4 00 34 */ lbz r6, 0x34(r4) -/* 801D4184 90 C1 01 8C */ stw r6, 0x18c(r1) -/* 801D4188 90 01 01 88 */ stw r0, 0x188(r1) -/* 801D418C C8 01 01 88 */ lfd f0, 0x188(r1) -/* 801D4190 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4194 88 A4 00 5C */ lbz r5, 0x5c(r4) -/* 801D4198 7C A6 28 50 */ subf r5, r6, r5 -/* 801D419C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D41A0 90 A1 01 94 */ stw r5, 0x194(r1) -/* 801D41A4 90 01 01 90 */ stw r0, 0x190(r1) -/* 801D41A8 C8 01 01 90 */ lfd f0, 0x190(r1) -/* 801D41AC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D41B0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D41B4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D41B8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D41BC D8 01 01 98 */ stfd f0, 0x198(r1) -/* 801D41C0 80 A1 01 9C */ lwz r5, 0x19c(r1) -/* 801D41C4 98 A3 12 00 */ stb r5, 0x1200(r3) -/* 801D41C8 88 C4 00 35 */ lbz r6, 0x35(r4) -/* 801D41CC 90 C1 01 A4 */ stw r6, 0x1a4(r1) -/* 801D41D0 90 01 01 A0 */ stw r0, 0x1a0(r1) -/* 801D41D4 C8 01 01 A0 */ lfd f0, 0x1a0(r1) -/* 801D41D8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D41DC 88 A4 00 5D */ lbz r5, 0x5d(r4) -/* 801D41E0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D41E4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D41E8 90 A1 01 AC */ stw r5, 0x1ac(r1) -/* 801D41EC 90 01 01 A8 */ stw r0, 0x1a8(r1) -/* 801D41F0 C8 01 01 A8 */ lfd f0, 0x1a8(r1) -/* 801D41F4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D41F8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D41FC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4200 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4204 D8 01 01 B0 */ stfd f0, 0x1b0(r1) -/* 801D4208 80 A1 01 B4 */ lwz r5, 0x1b4(r1) -/* 801D420C 98 A3 12 01 */ stb r5, 0x1201(r3) -/* 801D4210 88 C4 00 36 */ lbz r6, 0x36(r4) -/* 801D4214 90 C1 01 BC */ stw r6, 0x1bc(r1) -/* 801D4218 90 01 01 B8 */ stw r0, 0x1b8(r1) -/* 801D421C C8 01 01 B8 */ lfd f0, 0x1b8(r1) -/* 801D4220 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4224 88 A4 00 5E */ lbz r5, 0x5e(r4) -/* 801D4228 7C A6 28 50 */ subf r5, r6, r5 -/* 801D422C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4230 90 A1 01 C4 */ stw r5, 0x1c4(r1) -/* 801D4234 90 01 01 C0 */ stw r0, 0x1c0(r1) -/* 801D4238 C8 01 01 C0 */ lfd f0, 0x1c0(r1) -/* 801D423C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4240 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4244 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4248 FC 00 00 1E */ fctiwz f0, f0 -/* 801D424C D8 01 01 C8 */ stfd f0, 0x1c8(r1) -/* 801D4250 80 A1 01 CC */ lwz r5, 0x1cc(r1) -/* 801D4254 98 A3 12 02 */ stb r5, 0x1202(r3) -/* 801D4258 88 C4 00 37 */ lbz r6, 0x37(r4) -/* 801D425C 90 C1 01 D4 */ stw r6, 0x1d4(r1) -/* 801D4260 90 01 01 D0 */ stw r0, 0x1d0(r1) -/* 801D4264 C8 01 01 D0 */ lfd f0, 0x1d0(r1) -/* 801D4268 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D426C 88 A4 00 5F */ lbz r5, 0x5f(r4) -/* 801D4270 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4274 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4278 90 A1 01 DC */ stw r5, 0x1dc(r1) -/* 801D427C 90 01 01 D8 */ stw r0, 0x1d8(r1) -/* 801D4280 C8 01 01 D8 */ lfd f0, 0x1d8(r1) -/* 801D4284 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4288 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D428C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4290 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4294 D8 01 01 E0 */ stfd f0, 0x1e0(r1) -/* 801D4298 80 A1 01 E4 */ lwz r5, 0x1e4(r1) -/* 801D429C 98 A3 12 03 */ stb r5, 0x1203(r3) -/* 801D42A0 88 C4 00 38 */ lbz r6, 0x38(r4) -/* 801D42A4 90 C1 01 EC */ stw r6, 0x1ec(r1) -/* 801D42A8 90 01 01 E8 */ stw r0, 0x1e8(r1) -/* 801D42AC C8 01 01 E8 */ lfd f0, 0x1e8(r1) -/* 801D42B0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D42B4 88 A4 00 60 */ lbz r5, 0x60(r4) -/* 801D42B8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D42BC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D42C0 90 A1 01 F4 */ stw r5, 0x1f4(r1) -/* 801D42C4 90 01 01 F0 */ stw r0, 0x1f0(r1) -/* 801D42C8 C8 01 01 F0 */ lfd f0, 0x1f0(r1) -/* 801D42CC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D42D0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D42D4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D42D8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D42DC D8 01 01 F8 */ stfd f0, 0x1f8(r1) -/* 801D42E0 80 A1 01 FC */ lwz r5, 0x1fc(r1) -/* 801D42E4 98 A3 12 04 */ stb r5, 0x1204(r3) -/* 801D42E8 88 C4 00 39 */ lbz r6, 0x39(r4) -/* 801D42EC 90 C1 02 04 */ stw r6, 0x204(r1) -/* 801D42F0 90 01 02 00 */ stw r0, 0x200(r1) -/* 801D42F4 C8 01 02 00 */ lfd f0, 0x200(r1) -/* 801D42F8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D42FC 88 A4 00 61 */ lbz r5, 0x61(r4) -/* 801D4300 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4304 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4308 90 A1 02 0C */ stw r5, 0x20c(r1) -/* 801D430C 90 01 02 08 */ stw r0, 0x208(r1) -/* 801D4310 C8 01 02 08 */ lfd f0, 0x208(r1) -/* 801D4314 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4318 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D431C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4320 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4324 D8 01 02 10 */ stfd f0, 0x210(r1) -/* 801D4328 80 A1 02 14 */ lwz r5, 0x214(r1) -/* 801D432C 98 A3 12 05 */ stb r5, 0x1205(r3) -/* 801D4330 88 C4 00 3A */ lbz r6, 0x3a(r4) -/* 801D4334 90 C1 02 1C */ stw r6, 0x21c(r1) -/* 801D4338 90 01 02 18 */ stw r0, 0x218(r1) -/* 801D433C C8 01 02 18 */ lfd f0, 0x218(r1) -/* 801D4340 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4344 88 A4 00 62 */ lbz r5, 0x62(r4) -/* 801D4348 7C A6 28 50 */ subf r5, r6, r5 -/* 801D434C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4350 90 A1 02 24 */ stw r5, 0x224(r1) -/* 801D4354 90 01 02 20 */ stw r0, 0x220(r1) -/* 801D4358 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 801D435C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4360 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4364 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4368 FC 00 00 1E */ fctiwz f0, f0 -/* 801D436C D8 01 02 28 */ stfd f0, 0x228(r1) -/* 801D4370 80 A1 02 2C */ lwz r5, 0x22c(r1) -/* 801D4374 98 A3 12 06 */ stb r5, 0x1206(r3) -/* 801D4378 88 C4 00 3B */ lbz r6, 0x3b(r4) -/* 801D437C 90 C1 02 34 */ stw r6, 0x234(r1) -/* 801D4380 90 01 02 30 */ stw r0, 0x230(r1) -/* 801D4384 C8 01 02 30 */ lfd f0, 0x230(r1) -/* 801D4388 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D438C 88 A4 00 63 */ lbz r5, 0x63(r4) -/* 801D4390 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4394 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4398 90 A1 02 3C */ stw r5, 0x23c(r1) -/* 801D439C 90 01 02 38 */ stw r0, 0x238(r1) -/* 801D43A0 C8 01 02 38 */ lfd f0, 0x238(r1) -/* 801D43A4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D43A8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D43AC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D43B0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D43B4 D8 01 02 40 */ stfd f0, 0x240(r1) -/* 801D43B8 80 A1 02 44 */ lwz r5, 0x244(r1) -/* 801D43BC 98 A3 12 07 */ stb r5, 0x1207(r3) -/* 801D43C0 88 C4 00 3C */ lbz r6, 0x3c(r4) -/* 801D43C4 90 C1 02 4C */ stw r6, 0x24c(r1) -/* 801D43C8 90 01 02 48 */ stw r0, 0x248(r1) -/* 801D43CC C8 01 02 48 */ lfd f0, 0x248(r1) -/* 801D43D0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D43D4 88 A4 00 64 */ lbz r5, 0x64(r4) -/* 801D43D8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D43DC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D43E0 90 A1 02 54 */ stw r5, 0x254(r1) -/* 801D43E4 90 01 02 50 */ stw r0, 0x250(r1) -/* 801D43E8 C8 01 02 50 */ lfd f0, 0x250(r1) -/* 801D43EC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D43F0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D43F4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D43F8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D43FC D8 01 02 58 */ stfd f0, 0x258(r1) -/* 801D4400 80 A1 02 5C */ lwz r5, 0x25c(r1) -/* 801D4404 98 A3 12 08 */ stb r5, 0x1208(r3) -/* 801D4408 88 C4 00 3D */ lbz r6, 0x3d(r4) -/* 801D440C 90 C1 02 64 */ stw r6, 0x264(r1) -/* 801D4410 90 01 02 60 */ stw r0, 0x260(r1) -/* 801D4414 C8 01 02 60 */ lfd f0, 0x260(r1) -/* 801D4418 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D441C 88 A4 00 65 */ lbz r5, 0x65(r4) -/* 801D4420 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4424 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4428 90 A1 02 6C */ stw r5, 0x26c(r1) -/* 801D442C 90 01 02 68 */ stw r0, 0x268(r1) -/* 801D4430 C8 01 02 68 */ lfd f0, 0x268(r1) -/* 801D4434 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4438 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D443C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4440 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4444 D8 01 02 70 */ stfd f0, 0x270(r1) -/* 801D4448 80 A1 02 74 */ lwz r5, 0x274(r1) -/* 801D444C 98 A3 12 09 */ stb r5, 0x1209(r3) -/* 801D4450 88 C4 00 3E */ lbz r6, 0x3e(r4) -/* 801D4454 90 C1 02 7C */ stw r6, 0x27c(r1) -/* 801D4458 90 01 02 78 */ stw r0, 0x278(r1) -/* 801D445C C8 01 02 78 */ lfd f0, 0x278(r1) -/* 801D4460 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4464 88 A4 00 66 */ lbz r5, 0x66(r4) -/* 801D4468 7C A6 28 50 */ subf r5, r6, r5 -/* 801D446C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4470 90 A1 02 84 */ stw r5, 0x284(r1) -/* 801D4474 90 01 02 80 */ stw r0, 0x280(r1) -/* 801D4478 C8 01 02 80 */ lfd f0, 0x280(r1) -/* 801D447C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4480 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4484 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4488 FC 00 00 1E */ fctiwz f0, f0 -/* 801D448C D8 01 02 88 */ stfd f0, 0x288(r1) -/* 801D4490 80 A1 02 8C */ lwz r5, 0x28c(r1) -/* 801D4494 98 A3 12 0A */ stb r5, 0x120a(r3) -/* 801D4498 88 C4 00 3F */ lbz r6, 0x3f(r4) -/* 801D449C 90 C1 02 94 */ stw r6, 0x294(r1) -/* 801D44A0 90 01 02 90 */ stw r0, 0x290(r1) -/* 801D44A4 C8 01 02 90 */ lfd f0, 0x290(r1) -/* 801D44A8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D44AC 88 A4 00 67 */ lbz r5, 0x67(r4) -/* 801D44B0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D44B4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D44B8 90 A1 02 9C */ stw r5, 0x29c(r1) -/* 801D44BC 90 01 02 98 */ stw r0, 0x298(r1) -/* 801D44C0 C8 01 02 98 */ lfd f0, 0x298(r1) -/* 801D44C4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D44C8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D44CC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D44D0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D44D4 D8 01 02 A0 */ stfd f0, 0x2a0(r1) -/* 801D44D8 80 A1 02 A4 */ lwz r5, 0x2a4(r1) -/* 801D44DC 98 A3 12 0B */ stb r5, 0x120b(r3) -/* 801D44E0 88 C4 00 40 */ lbz r6, 0x40(r4) -/* 801D44E4 90 C1 02 AC */ stw r6, 0x2ac(r1) -/* 801D44E8 90 01 02 A8 */ stw r0, 0x2a8(r1) -/* 801D44EC C8 01 02 A8 */ lfd f0, 0x2a8(r1) -/* 801D44F0 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D44F4 88 A4 00 68 */ lbz r5, 0x68(r4) -/* 801D44F8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D44FC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4500 90 A1 02 B4 */ stw r5, 0x2b4(r1) -/* 801D4504 90 01 02 B0 */ stw r0, 0x2b0(r1) -/* 801D4508 C8 01 02 B0 */ lfd f0, 0x2b0(r1) -/* 801D450C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4510 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4514 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4518 FC 00 00 1E */ fctiwz f0, f0 -/* 801D451C D8 01 02 B8 */ stfd f0, 0x2b8(r1) -/* 801D4520 80 A1 02 BC */ lwz r5, 0x2bc(r1) -/* 801D4524 98 A3 12 0C */ stb r5, 0x120c(r3) -/* 801D4528 88 C4 00 41 */ lbz r6, 0x41(r4) -/* 801D452C 90 C1 02 C4 */ stw r6, 0x2c4(r1) -/* 801D4530 90 01 02 C0 */ stw r0, 0x2c0(r1) -/* 801D4534 C8 01 02 C0 */ lfd f0, 0x2c0(r1) -/* 801D4538 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D453C 88 A4 00 69 */ lbz r5, 0x69(r4) -/* 801D4540 7C A6 28 50 */ subf r5, r6, r5 -/* 801D4544 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4548 90 A1 02 CC */ stw r5, 0x2cc(r1) -/* 801D454C 90 01 02 C8 */ stw r0, 0x2c8(r1) -/* 801D4550 C8 01 02 C8 */ lfd f0, 0x2c8(r1) -/* 801D4554 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D4558 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D455C EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4560 FC 00 00 1E */ fctiwz f0, f0 -/* 801D4564 D8 01 02 D0 */ stfd f0, 0x2d0(r1) -/* 801D4568 80 A1 02 D4 */ lwz r5, 0x2d4(r1) -/* 801D456C 98 A3 12 0D */ stb r5, 0x120d(r3) -/* 801D4570 88 C4 00 42 */ lbz r6, 0x42(r4) -/* 801D4574 90 C1 02 DC */ stw r6, 0x2dc(r1) -/* 801D4578 90 01 02 D8 */ stw r0, 0x2d8(r1) -/* 801D457C C8 01 02 D8 */ lfd f0, 0x2d8(r1) -/* 801D4580 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4584 88 A4 00 6A */ lbz r5, 0x6a(r4) -/* 801D4588 7C A6 28 50 */ subf r5, r6, r5 -/* 801D458C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D4590 90 A1 02 E4 */ stw r5, 0x2e4(r1) -/* 801D4594 90 01 02 E0 */ stw r0, 0x2e0(r1) -/* 801D4598 C8 01 02 E0 */ lfd f0, 0x2e0(r1) -/* 801D459C EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D45A0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D45A4 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D45A8 FC 00 00 1E */ fctiwz f0, f0 -/* 801D45AC D8 01 02 E8 */ stfd f0, 0x2e8(r1) -/* 801D45B0 80 A1 02 EC */ lwz r5, 0x2ec(r1) -/* 801D45B4 98 A3 12 0E */ stb r5, 0x120e(r3) -/* 801D45B8 88 C4 00 43 */ lbz r6, 0x43(r4) -/* 801D45BC 90 C1 02 F4 */ stw r6, 0x2f4(r1) -/* 801D45C0 90 01 02 F0 */ stw r0, 0x2f0(r1) -/* 801D45C4 C8 01 02 F0 */ lfd f0, 0x2f0(r1) -/* 801D45C8 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D45CC 88 A4 00 6B */ lbz r5, 0x6b(r4) -/* 801D45D0 7C A6 28 50 */ subf r5, r6, r5 -/* 801D45D4 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D45D8 90 A1 02 FC */ stw r5, 0x2fc(r1) -/* 801D45DC 90 01 02 F8 */ stw r0, 0x2f8(r1) -/* 801D45E0 C8 01 02 F8 */ lfd f0, 0x2f8(r1) -/* 801D45E4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D45E8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D45EC EC 04 00 2A */ fadds f0, f4, f0 -/* 801D45F0 FC 00 00 1E */ fctiwz f0, f0 -/* 801D45F4 D8 01 03 00 */ stfd f0, 0x300(r1) -/* 801D45F8 80 A1 03 04 */ lwz r5, 0x304(r1) -/* 801D45FC 98 A3 12 0F */ stb r5, 0x120f(r3) -/* 801D4600 88 A4 00 27 */ lbz r5, 0x27(r4) -/* 801D4604 90 A1 03 0C */ stw r5, 0x30c(r1) -/* 801D4608 90 01 03 08 */ stw r0, 0x308(r1) -/* 801D460C C8 01 03 08 */ lfd f0, 0x308(r1) -/* 801D4610 EC 80 10 28 */ fsubs f4, f0, f2 -/* 801D4614 C0 02 A7 E4 */ lfs f0, lit_4201(r2) -/* 801D4618 EC C4 00 24 */ fdivs f6, f4, f0 -/* 801D461C 88 A4 00 26 */ lbz r5, 0x26(r4) -/* 801D4620 90 A1 03 14 */ stw r5, 0x314(r1) -/* 801D4624 90 01 03 10 */ stw r0, 0x310(r1) -/* 801D4628 C8 81 03 10 */ lfd f4, 0x310(r1) -/* 801D462C EC 84 10 28 */ fsubs f4, f4, f2 -/* 801D4630 EC A4 00 24 */ fdivs f5, f4, f0 -/* 801D4634 88 A4 00 33 */ lbz r5, 0x33(r4) -/* 801D4638 90 A1 03 1C */ stw r5, 0x31c(r1) -/* 801D463C 90 01 03 18 */ stw r0, 0x318(r1) -/* 801D4640 C8 81 03 18 */ lfd f4, 0x318(r1) -/* 801D4644 EC 84 10 28 */ fsubs f4, f4, f2 -/* 801D4648 EC E4 00 24 */ fdivs f7, f4, f0 -/* 801D464C 88 A4 00 32 */ lbz r5, 0x32(r4) -/* 801D4650 90 A1 03 24 */ stw r5, 0x324(r1) -/* 801D4654 90 01 03 20 */ stw r0, 0x320(r1) -/* 801D4658 C8 81 03 20 */ lfd f4, 0x320(r1) -/* 801D465C EC 84 10 28 */ fsubs f4, f4, f2 -/* 801D4660 ED 24 00 24 */ fdivs f9, f4, f0 -/* 801D4664 88 A4 00 4E */ lbz r5, 0x4e(r4) -/* 801D4668 90 A1 03 2C */ stw r5, 0x32c(r1) -/* 801D466C 90 01 03 28 */ stw r0, 0x328(r1) -/* 801D4670 C8 81 03 28 */ lfd f4, 0x328(r1) -/* 801D4674 EC 84 10 28 */ fsubs f4, f4, f2 -/* 801D4678 EC 84 00 24 */ fdivs f4, f4, f0 -/* 801D467C EC 84 28 28 */ fsubs f4, f4, f5 -/* 801D4680 EC 83 01 32 */ fmuls f4, f3, f4 -/* 801D4684 EC 85 20 2A */ fadds f4, f5, f4 -/* 801D4688 88 A4 00 4F */ lbz r5, 0x4f(r4) -/* 801D468C 90 A1 03 34 */ stw r5, 0x334(r1) -/* 801D4690 90 01 03 30 */ stw r0, 0x330(r1) -/* 801D4694 C8 A1 03 30 */ lfd f5, 0x330(r1) -/* 801D4698 EC A5 10 28 */ fsubs f5, f5, f2 -/* 801D469C EC A5 00 24 */ fdivs f5, f5, f0 -/* 801D46A0 EC A5 30 28 */ fsubs f5, f5, f6 -/* 801D46A4 EC A3 01 72 */ fmuls f5, f3, f5 -/* 801D46A8 EC A6 28 2A */ fadds f5, f6, f5 -/* 801D46AC A8 C4 00 24 */ lha r6, 0x24(r4) -/* 801D46B0 6C C5 80 00 */ xoris r5, r6, 0x8000 -/* 801D46B4 90 A1 03 3C */ stw r5, 0x33c(r1) -/* 801D46B8 90 01 03 38 */ stw r0, 0x338(r1) -/* 801D46BC C8 C1 03 38 */ lfd f6, 0x338(r1) -/* 801D46C0 ED 06 08 28 */ fsubs f8, f6, f1 -/* 801D46C4 A8 A4 00 4C */ lha r5, 0x4c(r4) -/* 801D46C8 7C A6 28 50 */ subf r5, r6, r5 -/* 801D46CC 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 801D46D0 90 A1 03 44 */ stw r5, 0x344(r1) -/* 801D46D4 90 01 03 40 */ stw r0, 0x340(r1) -/* 801D46D8 C8 C1 03 40 */ lfd f6, 0x340(r1) -/* 801D46DC EC C6 08 28 */ fsubs f6, f6, f1 -/* 801D46E0 EC C3 01 B2 */ fmuls f6, f3, f6 -/* 801D46E4 EC C8 30 2A */ fadds f6, f8, f6 -/* 801D46E8 FC C0 30 1E */ fctiwz f6, f6 -/* 801D46EC D8 C1 03 48 */ stfd f6, 0x348(r1) -/* 801D46F0 80 E1 03 4C */ lwz r7, 0x34c(r1) -/* 801D46F4 88 A4 00 5A */ lbz r5, 0x5a(r4) -/* 801D46F8 90 A1 03 54 */ stw r5, 0x354(r1) -/* 801D46FC 90 01 03 50 */ stw r0, 0x350(r1) -/* 801D4700 C8 C1 03 50 */ lfd f6, 0x350(r1) -/* 801D4704 EC C6 10 28 */ fsubs f6, f6, f2 -/* 801D4708 EC C6 00 24 */ fdivs f6, f6, f0 -/* 801D470C EC C6 48 28 */ fsubs f6, f6, f9 -/* 801D4710 EC C3 01 B2 */ fmuls f6, f3, f6 -/* 801D4714 EC C9 30 2A */ fadds f6, f9, f6 -/* 801D4718 88 A4 00 5B */ lbz r5, 0x5b(r4) -/* 801D471C 90 A1 03 5C */ stw r5, 0x35c(r1) -/* 801D4720 90 01 03 58 */ stw r0, 0x358(r1) -/* 801D4724 C9 01 03 58 */ lfd f8, 0x358(r1) -/* 801D4728 EC 48 10 28 */ fsubs f2, f8, f2 -/* 801D472C EC 02 00 24 */ fdivs f0, f2, f0 -/* 801D4730 EC 00 38 28 */ fsubs f0, f0, f7 -/* 801D4734 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D4738 EC 07 00 2A */ fadds f0, f7, f0 -/* 801D473C A8 C4 00 30 */ lha r6, 0x30(r4) -/* 801D4740 6C C5 80 00 */ xoris r5, r6, 0x8000 -/* 801D4744 90 A1 03 64 */ stw r5, 0x364(r1) -/* 801D4748 90 01 03 60 */ stw r0, 0x360(r1) -/* 801D474C C8 41 03 60 */ lfd f2, 0x360(r1) -/* 801D4750 EC E2 08 28 */ fsubs f7, f2, f1 -/* 801D4754 A8 84 00 58 */ lha r4, 0x58(r4) -/* 801D4758 7C 86 20 50 */ subf r4, r6, r4 -/* 801D475C 6C 84 80 00 */ xoris r4, r4, 0x8000 -/* 801D4760 90 81 03 6C */ stw r4, 0x36c(r1) -/* 801D4764 90 01 03 68 */ stw r0, 0x368(r1) -/* 801D4768 C8 41 03 68 */ lfd f2, 0x368(r1) -/* 801D476C EC 22 08 28 */ fsubs f1, f2, f1 -/* 801D4770 EC 23 00 72 */ fmuls f1, f3, f1 -/* 801D4774 EC 27 08 2A */ fadds f1, f7, f1 -/* 801D4778 FC 20 08 1E */ fctiwz f1, f1 -/* 801D477C D8 21 03 70 */ stfd f1, 0x370(r1) -/* 801D4780 81 01 03 74 */ lwz r8, 0x374(r1) -/* 801D4784 A8 83 12 18 */ lha r4, 0x1218(r3) -/* 801D4788 38 04 00 01 */ addi r0, r4, 1 -/* 801D478C B0 03 12 18 */ sth r0, 0x1218(r3) -/* 801D4790 A8 83 12 18 */ lha r4, 0x1218(r3) -/* 801D4794 7C E0 07 34 */ extsh r0, r7 -/* 801D4798 7C 04 00 00 */ cmpw r4, r0 -/* 801D479C 41 80 00 0C */ blt lbl_801D47A8 -/* 801D47A0 38 00 00 00 */ li r0, 0 -/* 801D47A4 B0 03 12 18 */ sth r0, 0x1218(r3) -lbl_801D47A8: -/* 801D47A8 A8 83 12 1A */ lha r4, 0x121a(r3) -/* 801D47AC 38 04 00 01 */ addi r0, r4, 1 -/* 801D47B0 B0 03 12 1A */ sth r0, 0x121a(r3) -/* 801D47B4 A8 83 12 1A */ lha r4, 0x121a(r3) -/* 801D47B8 7D 00 07 34 */ extsh r0, r8 -/* 801D47BC 7C 04 00 00 */ cmpw r4, r0 -/* 801D47C0 41 80 00 0C */ blt lbl_801D47CC -/* 801D47C4 38 00 00 00 */ li r0, 0 -/* 801D47C8 B0 03 12 1A */ sth r0, 0x121a(r3) -lbl_801D47CC: -/* 801D47CC C1 02 A7 D0 */ lfs f8, lit_3970(r2) -/* 801D47D0 FD 20 40 90 */ fmr f9, f8 -/* 801D47D4 7C E6 07 34 */ extsh r6, r7 -/* 801D47D8 C8 E2 A8 08 */ lfd f7, lit_4496(r2) -/* 801D47DC 6C C5 80 00 */ xoris r5, r6, 0x8000 -/* 801D47E0 90 A1 03 74 */ stw r5, 0x374(r1) -/* 801D47E4 3C 80 43 30 */ lis r4, 0x4330 -/* 801D47E8 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D47EC C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D47F0 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D47F4 FC 01 40 40 */ fcmpo cr0, f1, f8 -/* 801D47F8 40 81 00 70 */ ble lbl_801D4868 -/* 801D47FC A8 E3 12 18 */ lha r7, 0x1218(r3) -/* 801D4800 6C E0 80 00 */ xoris r0, r7, 0x8000 -/* 801D4804 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D4808 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D480C C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D4810 EC 61 38 28 */ fsubs f3, f1, f7 -/* 801D4814 C0 42 A7 E8 */ lfs f2, lit_4202(r2) -/* 801D4818 90 A1 03 6C */ stw r5, 0x36c(r1) -/* 801D481C 90 81 03 68 */ stw r4, 0x368(r1) -/* 801D4820 C8 21 03 68 */ lfd f1, 0x368(r1) -/* 801D4824 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D4828 EC 42 00 72 */ fmuls f2, f2, f1 -/* 801D482C FC 03 10 40 */ fcmpo cr0, f3, f2 -/* 801D4830 40 80 00 1C */ bge lbl_801D484C -/* 801D4834 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D4838 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D483C C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D4840 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D4844 ED 01 10 24 */ fdivs f8, f1, f2 -/* 801D4848 48 00 00 20 */ b lbl_801D4868 -lbl_801D484C: -/* 801D484C 7C 07 30 50 */ subf r0, r7, r6 -/* 801D4850 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D4854 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D4858 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D485C C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D4860 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D4864 ED 01 10 24 */ fdivs f8, f1, f2 -lbl_801D4868: -/* 801D4868 7D 06 07 34 */ extsh r6, r8 -/* 801D486C C8 E2 A8 08 */ lfd f7, lit_4496(r2) -/* 801D4870 6C C5 80 00 */ xoris r5, r6, 0x8000 -/* 801D4874 90 A1 03 74 */ stw r5, 0x374(r1) -/* 801D4878 3C 80 43 30 */ lis r4, 0x4330 -/* 801D487C 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D4880 C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D4884 EC 41 38 28 */ fsubs f2, f1, f7 -/* 801D4888 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D488C FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 801D4890 40 81 00 70 */ ble lbl_801D4900 -/* 801D4894 A8 E3 12 1A */ lha r7, 0x121a(r3) -/* 801D4898 6C E0 80 00 */ xoris r0, r7, 0x8000 -/* 801D489C 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D48A0 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D48A4 C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D48A8 EC 61 38 28 */ fsubs f3, f1, f7 -/* 801D48AC C0 42 A7 E8 */ lfs f2, lit_4202(r2) -/* 801D48B0 90 A1 03 6C */ stw r5, 0x36c(r1) -/* 801D48B4 90 81 03 68 */ stw r4, 0x368(r1) -/* 801D48B8 C8 21 03 68 */ lfd f1, 0x368(r1) -/* 801D48BC EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D48C0 EC 42 00 72 */ fmuls f2, f2, f1 -/* 801D48C4 FC 03 10 40 */ fcmpo cr0, f3, f2 -/* 801D48C8 40 80 00 1C */ bge lbl_801D48E4 -/* 801D48CC 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D48D0 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D48D4 C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D48D8 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D48DC ED 21 10 24 */ fdivs f9, f1, f2 -/* 801D48E0 48 00 00 20 */ b lbl_801D4900 -lbl_801D48E4: -/* 801D48E4 7C 07 30 50 */ subf r0, r7, r6 -/* 801D48E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D48EC 90 01 03 74 */ stw r0, 0x374(r1) -/* 801D48F0 90 81 03 70 */ stw r4, 0x370(r1) -/* 801D48F4 C8 21 03 70 */ lfd f1, 0x370(r1) -/* 801D48F8 EC 21 38 28 */ fsubs f1, f1, f7 -/* 801D48FC ED 21 10 24 */ fdivs f9, f1, f2 -lbl_801D4900: -/* 801D4900 EC 24 28 28 */ fsubs f1, f4, f5 -/* 801D4904 EC 28 00 72 */ fmuls f1, f8, f1 -/* 801D4908 EC 25 08 2A */ fadds f1, f5, f1 -/* 801D490C D0 23 12 10 */ stfs f1, 0x1210(r3) -/* 801D4910 EC 26 00 28 */ fsubs f1, f6, f0 -/* 801D4914 EC 29 00 72 */ fmuls f1, f9, f1 -/* 801D4918 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D491C D0 03 12 14 */ stfs f0, 0x1214(r3) -/* 801D4920 38 21 03 80 */ addi r1, r1, 0x380 -/* 801D4924 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/calcDrawPriority__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/calcDrawPriority__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 8ad4d3787e..0000000000 --- a/asm/d/menu/d_menu_fmap2D/calcDrawPriority__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_801D5AC4: -/* 801D5AC4 88 C3 12 27 */ lbz r6, 0x1227(r3) -/* 801D5AC8 38 E0 00 06 */ li r7, 6 -/* 801D5ACC 39 00 00 07 */ li r8, 7 -/* 801D5AD0 38 00 00 08 */ li r0, 8 -/* 801D5AD4 7C 09 03 A6 */ mtctr r0 -lbl_801D5AD8: -/* 801D5AD8 38 A8 12 30 */ addi r5, r8, 0x1230 -/* 801D5ADC 7C 83 28 AE */ lbzx r4, r3, r5 -/* 801D5AE0 28 04 00 FF */ cmplwi r4, 0xff -/* 801D5AE4 41 82 00 24 */ beq lbl_801D5B08 -/* 801D5AE8 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801D5AEC 7C 04 00 40 */ cmplw r4, r0 -/* 801D5AF0 40 82 00 10 */ bne lbl_801D5B00 -/* 801D5AF4 7C 83 42 14 */ add r4, r3, r8 -/* 801D5AF8 98 C4 12 30 */ stb r6, 0x1230(r4) -/* 801D5AFC 48 00 00 14 */ b lbl_801D5B10 -lbl_801D5B00: -/* 801D5B00 7C C3 29 AE */ stbx r6, r3, r5 -/* 801D5B04 7C 86 23 78 */ mr r6, r4 -lbl_801D5B08: -/* 801D5B08 39 08 FF FF */ addi r8, r8, -1 -/* 801D5B0C 42 00 FF CC */ bdnz lbl_801D5AD8 -lbl_801D5B10: -/* 801D5B10 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801D5B14 28 00 00 06 */ cmplwi r0, 6 -/* 801D5B18 41 82 00 44 */ beq lbl_801D5B5C -/* 801D5B1C 38 A0 00 07 */ li r5, 7 -/* 801D5B20 38 00 00 08 */ li r0, 8 -/* 801D5B24 7C 09 03 A6 */ mtctr r0 -lbl_801D5B28: -/* 801D5B28 38 85 12 30 */ addi r4, r5, 0x1230 -/* 801D5B2C 7C 03 20 AE */ lbzx r0, r3, r4 -/* 801D5B30 28 00 00 FF */ cmplwi r0, 0xff -/* 801D5B34 41 82 00 20 */ beq lbl_801D5B54 -/* 801D5B38 28 00 00 06 */ cmplwi r0, 6 -/* 801D5B3C 40 82 00 10 */ bne lbl_801D5B4C -/* 801D5B40 7C 83 2A 14 */ add r4, r3, r5 -/* 801D5B44 98 E4 12 30 */ stb r7, 0x1230(r4) -/* 801D5B48 48 00 00 14 */ b lbl_801D5B5C -lbl_801D5B4C: -/* 801D5B4C 7C E3 21 AE */ stbx r7, r3, r4 -/* 801D5B50 7C 07 03 78 */ mr r7, r0 -lbl_801D5B54: -/* 801D5B54 38 A5 FF FF */ addi r5, r5, -1 -/* 801D5B58 42 00 FF D0 */ bdnz lbl_801D5B28 -lbl_801D5B5C: -/* 801D5B5C 88 03 12 30 */ lbz r0, 0x1230(r3) -/* 801D5B60 28 00 00 07 */ cmplwi r0, 7 -/* 801D5B64 4D 82 00 20 */ beqlr -/* 801D5B68 7C 05 03 78 */ mr r5, r0 -/* 801D5B6C 38 00 00 07 */ li r0, 7 -/* 801D5B70 98 03 12 30 */ stb r0, 0x1230(r3) -/* 801D5B74 38 C0 00 01 */ li r6, 1 -/* 801D5B78 38 00 00 07 */ li r0, 7 -/* 801D5B7C 7C 09 03 A6 */ mtctr r0 -lbl_801D5B80: -/* 801D5B80 38 86 12 30 */ addi r4, r6, 0x1230 -/* 801D5B84 7C 03 20 AE */ lbzx r0, r3, r4 -/* 801D5B88 28 00 00 FF */ cmplwi r0, 0xff -/* 801D5B8C 41 82 00 20 */ beq lbl_801D5BAC -/* 801D5B90 28 00 00 07 */ cmplwi r0, 7 -/* 801D5B94 40 82 00 10 */ bne lbl_801D5BA4 -/* 801D5B98 7C 63 32 14 */ add r3, r3, r6 -/* 801D5B9C 98 A3 12 30 */ stb r5, 0x1230(r3) -/* 801D5BA0 4E 80 00 20 */ blr -lbl_801D5BA4: -/* 801D5BA4 7C A3 21 AE */ stbx r5, r3, r4 -/* 801D5BA8 7C 05 03 78 */ mr r5, r0 -lbl_801D5BAC: -/* 801D5BAC 38 C6 00 01 */ addi r6, r6, 1 -/* 801D5BB0 42 00 FF D0 */ bdnz lbl_801D5B80 -/* 801D5BB4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index 987b06ebfe..0000000000 --- a/asm/d/menu/d_menu_fmap2D/checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_801D7994: -/* 801D7994 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D7998 7C 08 02 A6 */ mflr r0 -/* 801D799C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D79A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D79A4 7C 7F 1B 78 */ mr r31, r3 -/* 801D79A8 48 00 01 B1 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv -/* 801D79AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D79B0 40 82 00 0C */ bne lbl_801D79BC -/* 801D79B4 38 60 00 00 */ li r3, 0 -/* 801D79B8 48 00 00 3C */ b lbl_801D79F4 -lbl_801D79BC: -/* 801D79BC 7F E3 FB 78 */ mr r3, r31 -/* 801D79C0 48 00 00 F5 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv -/* 801D79C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D79C8 40 82 00 0C */ bne lbl_801D79D4 -/* 801D79CC 38 60 00 00 */ li r3, 0 -/* 801D79D0 48 00 00 24 */ b lbl_801D79F4 -lbl_801D79D4: -/* 801D79D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D79D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D79DC 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801D79E0 38 80 00 00 */ li r4, 0 -/* 801D79E4 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801D79E8 81 8C 02 1C */ lwz r12, 0x21c(r12) -/* 801D79EC 7D 89 03 A6 */ mtctr r12 -/* 801D79F0 4E 80 04 21 */ bctrl -lbl_801D79F4: -/* 801D79F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D79F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D79FC 7C 08 03 A6 */ mtlr r0 -/* 801D7A00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7A04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index 8295b39c4a..0000000000 --- a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_801D7B58: -/* 801D7B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D7B5C 7C 08 02 A6 */ mflr r0 -/* 801D7B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D7B64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D7B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D7B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D7B70 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801D7B74 7F E3 FB 78 */ mr r3, r31 -/* 801D7B78 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D7B7C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D7B80 A0 84 06 24 */ lhz r4, 0x624(r4) -/* 801D7B84 4B E5 CE 39 */ bl isEventBit__11dSv_event_cCFUs -/* 801D7B88 2C 03 00 00 */ cmpwi r3, 0 -/* 801D7B8C 41 82 00 28 */ beq lbl_801D7BB4 -/* 801D7B90 7F E3 FB 78 */ mr r3, r31 -/* 801D7B94 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D7B98 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D7B9C A0 84 06 22 */ lhz r4, 0x622(r4) -/* 801D7BA0 4B E5 CE 1D */ bl isEventBit__11dSv_event_cCFUs -/* 801D7BA4 2C 03 00 00 */ cmpwi r3, 0 -/* 801D7BA8 40 82 00 0C */ bne lbl_801D7BB4 -/* 801D7BAC 38 60 00 00 */ li r3, 0 -/* 801D7BB0 48 00 00 08 */ b lbl_801D7BB8 -lbl_801D7BB4: -/* 801D7BB4 38 60 00 01 */ li r3, 1 -lbl_801D7BB8: -/* 801D7BB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D7BBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D7BC0 7C 08 03 A6 */ mtlr r0 -/* 801D7BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7BC8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index c7daf5d8f6..0000000000 --- a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801D7AB4: -/* 801D7AB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D7AB8 7C 08 02 A6 */ mflr r0 -/* 801D7ABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D7AC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D7AC4 7C 7F 1B 78 */ mr r31, r3 -/* 801D7AC8 4B E5 73 99 */ bl dComIfGp_getNowLevel__Fv -/* 801D7ACC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801D7AD0 28 00 00 04 */ cmplwi r0, 4 -/* 801D7AD4 40 82 00 20 */ bne lbl_801D7AF4 -/* 801D7AD8 7F E3 FB 78 */ mr r3, r31 -/* 801D7ADC 38 80 00 03 */ li r4, 3 -/* 801D7AE0 4B FF FF 29 */ bl checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi -/* 801D7AE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D7AE8 40 82 00 0C */ bne lbl_801D7AF4 -/* 801D7AEC 38 60 00 00 */ li r3, 0 -/* 801D7AF0 48 00 00 54 */ b lbl_801D7B44 -lbl_801D7AF4: -/* 801D7AF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D7AF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D7AFC 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801D7B00 7F E3 FB 78 */ mr r3, r31 -/* 801D7B04 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D7B08 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D7B0C A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801D7B10 4B E5 CE AD */ bl isEventBit__11dSv_event_cCFUs -/* 801D7B14 2C 03 00 00 */ cmpwi r3, 0 -/* 801D7B18 41 82 00 28 */ beq lbl_801D7B40 -/* 801D7B1C 7F E3 FB 78 */ mr r3, r31 -/* 801D7B20 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D7B24 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D7B28 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801D7B2C 4B E5 CE 91 */ bl isEventBit__11dSv_event_cCFUs -/* 801D7B30 2C 03 00 00 */ cmpwi r3, 0 -/* 801D7B34 40 82 00 0C */ bne lbl_801D7B40 -/* 801D7B38 38 60 00 00 */ li r3, 0 -/* 801D7B3C 48 00 00 08 */ b lbl_801D7B44 -lbl_801D7B40: -/* 801D7B40 38 60 00 01 */ li r3, 1 -lbl_801D7B44: -/* 801D7B44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D7B48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D7B4C 7C 08 03 A6 */ mtlr r0 -/* 801D7B50 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7B54 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi.s b/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi.s deleted file mode 100644 index 71206ca418..0000000000 --- a/asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_801D7A08: -/* 801D7A08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D7A0C 7C 08 02 A6 */ mflr r0 -/* 801D7A10 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D7A14 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7A18 48 18 A7 BD */ bl _savegpr_27 -/* 801D7A1C 3C A0 80 43 */ lis r5, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7A20 38 A5 FC 60 */ addi r5, r5, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7A24 88 05 02 FC */ lbz r0, 0x2fc(r5) -/* 801D7A28 28 00 00 00 */ cmplwi r0, 0 -/* 801D7A2C 41 82 00 0C */ beq lbl_801D7A38 -/* 801D7A30 38 60 00 01 */ li r3, 1 -/* 801D7A34 48 00 00 68 */ b lbl_801D7A9C -lbl_801D7A38: -/* 801D7A38 83 A3 00 70 */ lwz r29, 0x70(r3) -/* 801D7A3C 28 1D 00 00 */ cmplwi r29, 0 -/* 801D7A40 41 82 00 58 */ beq lbl_801D7A98 -/* 801D7A44 3B 9D 00 0C */ addi r28, r29, 0xc -/* 801D7A48 3B 60 00 00 */ li r27, 0 -/* 801D7A4C 3B E0 00 00 */ li r31, 0 -/* 801D7A50 3B C4 00 01 */ addi r30, r4, 1 -/* 801D7A54 48 00 00 38 */ b lbl_801D7A8C -lbl_801D7A58: -/* 801D7A58 7C 9C FA 14 */ add r4, r28, r31 -/* 801D7A5C 88 04 00 01 */ lbz r0, 1(r4) -/* 801D7A60 7C 1E 00 00 */ cmpw r30, r0 -/* 801D7A64 40 82 00 20 */ bne lbl_801D7A84 -/* 801D7A68 88 64 00 0E */ lbz r3, 0xe(r4) -/* 801D7A6C 88 84 00 0F */ lbz r4, 0xf(r4) -/* 801D7A70 4B E5 5C D1 */ bl dComIfGs_isStageSwitch__Fii -/* 801D7A74 2C 03 00 00 */ cmpwi r3, 0 -/* 801D7A78 41 82 00 0C */ beq lbl_801D7A84 -/* 801D7A7C 38 60 00 01 */ li r3, 1 -/* 801D7A80 48 00 00 1C */ b lbl_801D7A9C -lbl_801D7A84: -/* 801D7A84 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D7A88 3B FF 00 1C */ addi r31, r31, 0x1c -lbl_801D7A8C: -/* 801D7A8C 88 1D 00 08 */ lbz r0, 8(r29) -/* 801D7A90 7C 1B 00 00 */ cmpw r27, r0 -/* 801D7A94 41 80 FF C4 */ blt lbl_801D7A58 -lbl_801D7A98: -/* 801D7A98 38 60 00 00 */ li r3, 0 -lbl_801D7A9C: -/* 801D7A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7AA0 48 18 A7 81 */ bl _restgpr_27 -/* 801D7AA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D7AA8 7C 08 03 A6 */ mtlr r0 -/* 801D7AAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D7AB0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s b/asm/d/menu/d_menu_fmap2D/createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s deleted file mode 100644 index e3c67d58d3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801D7640: -/* 801D7640 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D7644 7C 08 02 A6 */ mflr r0 -/* 801D7648 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D764C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7650 48 18 AB 8D */ bl _savegpr_29 -/* 801D7654 7C 7D 1B 78 */ mr r29, r3 -/* 801D7658 7C BE 2B 78 */ mr r30, r5 -/* 801D765C 80 03 00 6C */ lwz r0, 0x6c(r3) -/* 801D7660 28 00 00 00 */ cmplwi r0, 0 -/* 801D7664 40 82 00 44 */ bne lbl_801D76A8 -/* 801D7668 7C 83 23 78 */ mr r3, r4 -/* 801D766C 4B E3 7B 61 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801D7670 7C 7F 1B 78 */ mr r31, r3 -/* 801D7674 38 60 00 68 */ li r3, 0x68 -/* 801D7678 48 0F 75 D5 */ bl __nw__FUl -/* 801D767C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D7680 41 82 00 1C */ beq lbl_801D769C -/* 801D7684 7F C4 F3 78 */ mr r4, r30 -/* 801D7688 38 A0 00 00 */ li r5, 0 -/* 801D768C 38 C0 00 00 */ li r6, 0 -/* 801D7690 38 E0 00 01 */ li r7, 1 -/* 801D7694 48 06 55 F5 */ bl __ct__17dMsgScrnExplain_cFP9STControlUcbUc -/* 801D7698 7C 60 1B 78 */ mr r0, r3 -lbl_801D769C: -/* 801D769C 90 1D 00 6C */ stw r0, 0x6c(r29) -/* 801D76A0 7F E3 FB 78 */ mr r3, r31 -/* 801D76A4 4B E3 7B 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -lbl_801D76A8: -/* 801D76A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D76AC 48 18 AB 7D */ bl _restgpr_29 -/* 801D76B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D76B4 7C 08 03 A6 */ mtlr r0 -/* 801D76B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D76BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/deleteExplain__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/deleteExplain__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index d20998f0d7..0000000000 --- a/asm/d/menu/d_menu_fmap2D/deleteExplain__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801D76C0: -/* 801D76C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D76C4 7C 08 02 A6 */ mflr r0 -/* 801D76C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D76CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D76D0 7C 7F 1B 78 */ mr r31, r3 -/* 801D76D4 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801D76D8 28 03 00 00 */ cmplwi r3, 0 -/* 801D76DC 41 82 00 24 */ beq lbl_801D7700 -/* 801D76E0 41 82 00 18 */ beq lbl_801D76F8 -/* 801D76E4 38 80 00 01 */ li r4, 1 -/* 801D76E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D76EC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D76F0 7D 89 03 A6 */ mtctr r12 -/* 801D76F4 4E 80 04 21 */ bctrl -lbl_801D76F8: -/* 801D76F8 38 00 00 00 */ li r0, 0 -/* 801D76FC 90 1F 00 6C */ stw r0, 0x6c(r31) -lbl_801D7700: -/* 801D7700 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D7704 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D7708 7C 08 03 A6 */ mtlr r0 -/* 801D770C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7710 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/drawDebugRegionArea__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/drawDebugRegionArea__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 05f5c3ffa0..0000000000 --- a/asm/d/menu/d_menu_fmap2D/drawDebugRegionArea__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,179 +0,0 @@ -lbl_801D564C: -/* 801D564C 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 801D5650 7C 08 02 A6 */ mflr r0 -/* 801D5654 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 801D5658 DB E1 00 A0 */ stfd f31, 0xa0(r1) -/* 801D565C F3 E1 00 A8 */ psq_st f31, 168(r1), 0, 0 /* qr0 */ -/* 801D5660 DB C1 00 90 */ stfd f30, 0x90(r1) -/* 801D5664 F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0 /* qr0 */ -/* 801D5668 DB A1 00 80 */ stfd f29, 0x80(r1) -/* 801D566C F3 A1 00 88 */ psq_st f29, 136(r1), 0, 0 /* qr0 */ -/* 801D5670 39 61 00 80 */ addi r11, r1, 0x80 -/* 801D5674 48 18 CB 55 */ bl _savegpr_24 -/* 801D5678 7C 7C 1B 78 */ mr r28, r3 -/* 801D567C 4B FF D4 E1 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D5680 38 A0 00 FF */ li r5, 0xff -/* 801D5684 98 A1 00 24 */ stb r5, 0x24(r1) -/* 801D5688 98 A1 00 25 */ stb r5, 0x25(r1) -/* 801D568C 38 80 00 00 */ li r4, 0 -/* 801D5690 98 81 00 26 */ stb r4, 0x26(r1) -/* 801D5694 38 60 00 32 */ li r3, 0x32 -/* 801D5698 98 61 00 27 */ stb r3, 0x27(r1) -/* 801D569C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D56A0 90 01 00 28 */ stw r0, 0x28(r1) -/* 801D56A4 98 A1 00 20 */ stb r5, 0x20(r1) -/* 801D56A8 98 81 00 21 */ stb r4, 0x21(r1) -/* 801D56AC 98 A1 00 22 */ stb r5, 0x22(r1) -/* 801D56B0 98 61 00 23 */ stb r3, 0x23(r1) -/* 801D56B4 80 01 00 20 */ lwz r0, 0x20(r1) -/* 801D56B8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801D56BC 98 81 00 1C */ stb r4, 0x1c(r1) -/* 801D56C0 98 A1 00 1D */ stb r5, 0x1d(r1) -/* 801D56C4 98 A1 00 1E */ stb r5, 0x1e(r1) -/* 801D56C8 98 61 00 1F */ stb r3, 0x1f(r1) -/* 801D56CC 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 801D56D0 90 01 00 30 */ stw r0, 0x30(r1) -/* 801D56D4 98 A1 00 18 */ stb r5, 0x18(r1) -/* 801D56D8 98 81 00 19 */ stb r4, 0x19(r1) -/* 801D56DC 98 81 00 1A */ stb r4, 0x1a(r1) -/* 801D56E0 98 61 00 1B */ stb r3, 0x1b(r1) -/* 801D56E4 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D56E8 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D56EC 98 81 00 14 */ stb r4, 0x14(r1) -/* 801D56F0 98 A1 00 15 */ stb r5, 0x15(r1) -/* 801D56F4 98 81 00 16 */ stb r4, 0x16(r1) -/* 801D56F8 98 61 00 17 */ stb r3, 0x17(r1) -/* 801D56FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D5700 90 01 00 38 */ stw r0, 0x38(r1) -/* 801D5704 98 81 00 10 */ stb r4, 0x10(r1) -/* 801D5708 98 81 00 11 */ stb r4, 0x11(r1) -/* 801D570C 98 A1 00 12 */ stb r5, 0x12(r1) -/* 801D5710 98 61 00 13 */ stb r3, 0x13(r1) -/* 801D5714 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D5718 90 01 00 3C */ stw r0, 0x3c(r1) -/* 801D571C 98 A1 00 0C */ stb r5, 0xc(r1) -/* 801D5720 98 A1 00 0D */ stb r5, 0xd(r1) -/* 801D5724 98 A1 00 0E */ stb r5, 0xe(r1) -/* 801D5728 98 61 00 0F */ stb r3, 0xf(r1) -/* 801D572C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801D5730 90 01 00 40 */ stw r0, 0x40(r1) -/* 801D5734 3B C0 00 00 */ li r30, 0 -/* 801D5738 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D573C 3B E3 FC 60 */ addi r31, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D5740 CB E2 A8 08 */ lfd f31, lit_4496(r2) -/* 801D5744 3F 60 43 30 */ lis r27, 0x4330 -/* 801D5748 48 00 01 5C */ b lbl_801D58A4 -lbl_801D574C: -/* 801D574C 3B A0 00 00 */ li r29, 0 -/* 801D5750 48 00 01 24 */ b lbl_801D5874 -lbl_801D5754: -/* 801D5754 3B 00 00 07 */ li r24, 7 -lbl_801D5758: -/* 801D5758 38 18 12 30 */ addi r0, r24, 0x1230 -/* 801D575C 7F 3C 00 AE */ lbzx r25, r28, r0 -/* 801D5760 2C 19 00 FF */ cmpwi r25, 0xff -/* 801D5764 41 82 00 FC */ beq lbl_801D5860 -/* 801D5768 2C 19 00 07 */ cmpwi r25, 7 -/* 801D576C 41 82 00 F4 */ beq lbl_801D5860 -/* 801D5770 7F 83 E3 78 */ mr r3, r28 -/* 801D5774 4B FF CF C5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D5778 C8 42 A8 08 */ lfd f2, lit_4496(r2) -/* 801D577C 6F C0 80 00 */ xoris r0, r30, 0x8000 -/* 801D5780 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D5784 3C 00 43 30 */ lis r0, 0x4330 -/* 801D5788 90 01 00 48 */ stw r0, 0x48(r1) -/* 801D578C C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D5790 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801D5794 EF C0 08 2A */ fadds f30, f0, f1 -/* 801D5798 7F 83 E3 78 */ mr r3, r28 -/* 801D579C 4B FF CF F5 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D57A0 C8 42 A8 08 */ lfd f2, lit_4496(r2) -/* 801D57A4 6F A0 80 00 */ xoris r0, r29, 0x8000 -/* 801D57A8 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D57AC 3C 00 43 30 */ lis r0, 0x4330 -/* 801D57B0 90 01 00 50 */ stw r0, 0x50(r1) -/* 801D57B4 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 801D57B8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801D57BC EF A0 08 2A */ fadds f29, f0, f1 -/* 801D57C0 57 39 10 3A */ slwi r25, r25, 2 -/* 801D57C4 7F 5C CA 14 */ add r26, r28, r25 -/* 801D57C8 80 7A 0C B4 */ lwz r3, 0xcb4(r26) -/* 801D57CC 38 80 00 00 */ li r4, 0 -/* 801D57D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D57D4 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801D57D8 7D 89 03 A6 */ mtctr r12 -/* 801D57DC 4E 80 04 21 */ bctrl -/* 801D57E0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801D57E4 C0 DC 0F 9C */ lfs f6, 0xf9c(r28) -/* 801D57E8 FC 20 F0 90 */ fmr f1, f30 -/* 801D57EC FC 40 E8 90 */ fmr f2, f29 -/* 801D57F0 C0 9C 0F BC */ lfs f4, 0xfbc(r28) -/* 801D57F4 C0 7A 0E 8C */ lfs f3, 0xe8c(r26) -/* 801D57F8 C0 1A 0F 0C */ lfs f0, 0xf0c(r26) -/* 801D57FC EC 03 00 2A */ fadds f0, f3, f0 -/* 801D5800 EC 64 00 2A */ fadds f3, f4, f0 -/* 801D5804 C0 BC 0F C0 */ lfs f5, 0xfc0(r28) -/* 801D5808 C0 9A 0E AC */ lfs f4, 0xeac(r26) -/* 801D580C C0 1A 0F 2C */ lfs f0, 0xf2c(r26) -/* 801D5810 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D5814 EC 85 00 2A */ fadds f4, f5, f0 -/* 801D5818 C0 1A 0E CC */ lfs f0, 0xecc(r26) -/* 801D581C EC A0 01 B2 */ fmuls f5, f0, f6 -/* 801D5820 C0 1A 0E EC */ lfs f0, 0xeec(r26) -/* 801D5824 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D5828 48 04 8A E1 */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG -/* 801D582C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D5830 41 82 00 30 */ beq lbl_801D5860 -/* 801D5834 38 61 00 28 */ addi r3, r1, 0x28 -/* 801D5838 7C 03 C8 2E */ lwzx r0, r3, r25 -/* 801D583C 90 01 00 08 */ stw r0, 8(r1) -/* 801D5840 C0 02 A7 F0 */ lfs f0, lit_4204(r2) -/* 801D5844 EC 3E 00 28 */ fsubs f1, f30, f0 -/* 801D5848 EC 5D 00 28 */ fsubs f2, f29, f0 -/* 801D584C C0 62 A7 F4 */ lfs f3, lit_4205(r2) -/* 801D5850 FC 80 18 90 */ fmr f4, f3 -/* 801D5854 38 61 00 08 */ addi r3, r1, 8 -/* 801D5858 48 11 42 6D */ bl J2DFillBox__FffffQ28JUtility6TColor -/* 801D585C 48 00 00 0C */ b lbl_801D5868 -lbl_801D5860: -/* 801D5860 37 18 FF FF */ addic. r24, r24, -1 -/* 801D5864 40 80 FE F4 */ bge lbl_801D5758 -lbl_801D5868: -/* 801D5868 88 1F 03 04 */ lbz r0, 0x304(r31) -/* 801D586C 7F A0 EA 14 */ add r29, r0, r29 -/* 801D5870 3B BD 00 01 */ addi r29, r29, 1 -lbl_801D5874: -/* 801D5874 7F 83 E3 78 */ mr r3, r28 -/* 801D5878 4B FF D1 21 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D587C 6F A0 80 00 */ xoris r0, r29, 0x8000 -/* 801D5880 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D5884 93 61 00 50 */ stw r27, 0x50(r1) -/* 801D5888 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 801D588C EC 00 F8 28 */ fsubs f0, f0, f31 -/* 801D5890 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D5894 41 80 FE C0 */ blt lbl_801D5754 -/* 801D5898 88 1F 03 04 */ lbz r0, 0x304(r31) -/* 801D589C 7F C0 F2 14 */ add r30, r0, r30 -/* 801D58A0 3B DE 00 01 */ addi r30, r30, 1 -lbl_801D58A4: -/* 801D58A4 7F 83 E3 78 */ mr r3, r28 -/* 801D58A8 4B FF CF B9 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D58AC 6F C0 80 00 */ xoris r0, r30, 0x8000 -/* 801D58B0 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D58B4 93 61 00 50 */ stw r27, 0x50(r1) -/* 801D58B8 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 801D58BC EC 00 F8 28 */ fsubs f0, f0, f31 -/* 801D58C0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D58C4 41 80 FE 88 */ blt lbl_801D574C -/* 801D58C8 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* qr0 */ -/* 801D58CC CB E1 00 A0 */ lfd f31, 0xa0(r1) -/* 801D58D0 E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0 /* qr0 */ -/* 801D58D4 CB C1 00 90 */ lfd f30, 0x90(r1) -/* 801D58D8 E3 A1 00 88 */ psq_l f29, 136(r1), 0, 0 /* qr0 */ -/* 801D58DC CB A1 00 80 */ lfd f29, 0x80(r1) -/* 801D58E0 39 61 00 80 */ addi r11, r1, 0x80 -/* 801D58E4 48 18 C9 31 */ bl _restgpr_24 -/* 801D58E8 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 801D58EC 7C 08 03 A6 */ mtlr r0 -/* 801D58F0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801D58F4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/drawDebugStageArea__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/drawDebugStageArea__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index b53a311734..0000000000 --- a/asm/d/menu/d_menu_fmap2D/drawDebugStageArea__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_801D5388: -/* 801D5388 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 801D538C 7C 08 02 A6 */ mflr r0 -/* 801D5390 90 01 01 04 */ stw r0, 0x104(r1) -/* 801D5394 DB E1 00 F0 */ stfd f31, 0xf0(r1) -/* 801D5398 F3 E1 00 F8 */ psq_st f31, 248(r1), 0, 0 /* qr0 */ -/* 801D539C DB C1 00 E0 */ stfd f30, 0xe0(r1) -/* 801D53A0 F3 C1 00 E8 */ psq_st f30, 232(r1), 0, 0 /* qr0 */ -/* 801D53A4 DB A1 00 D0 */ stfd f29, 0xd0(r1) -/* 801D53A8 F3 A1 00 D8 */ psq_st f29, 216(r1), 0, 0 /* qr0 */ -/* 801D53AC DB 81 00 C0 */ stfd f28, 0xc0(r1) -/* 801D53B0 F3 81 00 C8 */ psq_st f28, 200(r1), 0, 0 /* qr0 */ -/* 801D53B4 DB 61 00 B0 */ stfd f27, 0xb0(r1) -/* 801D53B8 F3 61 00 B8 */ psq_st f27, 184(r1), 0, 0 /* qr0 */ -/* 801D53BC DB 41 00 A0 */ stfd f26, 0xa0(r1) -/* 801D53C0 F3 41 00 A8 */ psq_st f26, 168(r1), 0, 0 /* qr0 */ -/* 801D53C4 DB 21 00 90 */ stfd f25, 0x90(r1) -/* 801D53C8 F3 21 00 98 */ psq_st f25, 152(r1), 0, 0 /* qr0 */ -/* 801D53CC DB 01 00 80 */ stfd f24, 0x80(r1) -/* 801D53D0 F3 01 00 88 */ psq_st f24, 136(r1), 0, 0 /* qr0 */ -/* 801D53D4 DA E1 00 70 */ stfd f23, 0x70(r1) -/* 801D53D8 F2 E1 00 78 */ psq_st f23, 120(r1), 0, 0 /* qr0 */ -/* 801D53DC 39 61 00 70 */ addi r11, r1, 0x70 -/* 801D53E0 48 18 CD F5 */ bl _savegpr_27 -/* 801D53E4 7C 7B 1B 78 */ mr r27, r3 -/* 801D53E8 38 A0 00 FF */ li r5, 0xff -/* 801D53EC 98 A1 00 20 */ stb r5, 0x20(r1) -/* 801D53F0 98 A1 00 21 */ stb r5, 0x21(r1) -/* 801D53F4 38 80 00 00 */ li r4, 0 -/* 801D53F8 98 81 00 22 */ stb r4, 0x22(r1) -/* 801D53FC 38 60 00 32 */ li r3, 0x32 -/* 801D5400 98 61 00 23 */ stb r3, 0x23(r1) -/* 801D5404 80 01 00 20 */ lwz r0, 0x20(r1) -/* 801D5408 90 01 00 28 */ stw r0, 0x28(r1) -/* 801D540C 98 A1 00 1C */ stb r5, 0x1c(r1) -/* 801D5410 98 81 00 1D */ stb r4, 0x1d(r1) -/* 801D5414 98 A1 00 1E */ stb r5, 0x1e(r1) -/* 801D5418 98 61 00 1F */ stb r3, 0x1f(r1) -/* 801D541C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 801D5420 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801D5424 98 81 00 18 */ stb r4, 0x18(r1) -/* 801D5428 98 A1 00 19 */ stb r5, 0x19(r1) -/* 801D542C 98 A1 00 1A */ stb r5, 0x1a(r1) -/* 801D5430 98 61 00 1B */ stb r3, 0x1b(r1) -/* 801D5434 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D5438 90 01 00 30 */ stw r0, 0x30(r1) -/* 801D543C 98 A1 00 14 */ stb r5, 0x14(r1) -/* 801D5440 98 81 00 15 */ stb r4, 0x15(r1) -/* 801D5444 98 81 00 16 */ stb r4, 0x16(r1) -/* 801D5448 98 61 00 17 */ stb r3, 0x17(r1) -/* 801D544C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D5450 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D5454 98 81 00 10 */ stb r4, 0x10(r1) -/* 801D5458 98 A1 00 11 */ stb r5, 0x11(r1) -/* 801D545C 98 81 00 12 */ stb r4, 0x12(r1) -/* 801D5460 98 61 00 13 */ stb r3, 0x13(r1) -/* 801D5464 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D5468 90 01 00 38 */ stw r0, 0x38(r1) -/* 801D546C 98 81 00 0C */ stb r4, 0xc(r1) -/* 801D5470 98 81 00 0D */ stb r4, 0xd(r1) -/* 801D5474 98 A1 00 0E */ stb r5, 0xe(r1) -/* 801D5478 98 61 00 0F */ stb r3, 0xf(r1) -/* 801D547C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801D5480 90 01 00 3C */ stw r0, 0x3c(r1) -/* 801D5484 80 1B 12 3C */ lwz r0, 0x123c(r27) -/* 801D5488 28 00 00 00 */ cmplwi r0, 0 -/* 801D548C 41 82 01 60 */ beq lbl_801D55EC -/* 801D5490 80 1B 12 40 */ lwz r0, 0x1240(r27) -/* 801D5494 28 00 00 00 */ cmplwi r0, 0 -/* 801D5498 41 82 01 54 */ beq lbl_801D55EC -/* 801D549C 3B A0 00 00 */ li r29, 0 -/* 801D54A0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D54A4 3B C3 FC 60 */ addi r30, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D54A8 CB 22 A8 08 */ lfd f25, lit_4496(r2) -/* 801D54AC 3F E0 43 30 */ lis r31, 0x4330 -/* 801D54B0 C3 42 A8 28 */ lfs f26, lit_5633(r2) -/* 801D54B4 C3 62 A7 E0 */ lfs f27, lit_4200(r2) -/* 801D54B8 C3 C2 A8 24 */ lfs f30, lit_5632(r2) -/* 801D54BC C3 E2 A7 D0 */ lfs f31, lit_3970(r2) -/* 801D54C0 C3 02 A7 F0 */ lfs f24, lit_4204(r2) -/* 801D54C4 C3 82 A7 DC */ lfs f28, lit_4199(r2) -/* 801D54C8 48 00 01 08 */ b lbl_801D55D0 -lbl_801D54CC: -/* 801D54CC 3B 80 00 00 */ li r28, 0 -/* 801D54D0 6F A0 80 00 */ xoris r0, r29, 0x8000 -/* 801D54D4 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D54D8 93 E1 00 40 */ stw r31, 0x40(r1) -/* 801D54DC C8 01 00 40 */ lfd f0, 0x40(r1) -/* 801D54E0 EC 00 C8 28 */ fsubs f0, f0, f25 -/* 801D54E4 EF A0 F0 28 */ fsubs f29, f0, f30 -/* 801D54E8 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D54EC 93 E1 00 48 */ stw r31, 0x48(r1) -/* 801D54F0 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D54F4 EC 00 C8 28 */ fsubs f0, f0, f25 -/* 801D54F8 EC 00 F8 2A */ fadds f0, f0, f31 -/* 801D54FC EE E0 C0 28 */ fsubs f23, f0, f24 -/* 801D5500 48 00 00 A8 */ b lbl_801D55A8 -lbl_801D5504: -/* 801D5504 80 7B 12 3C */ lwz r3, 0x123c(r27) -/* 801D5508 80 9B 12 40 */ lwz r4, 0x1240(r27) -/* 801D550C FC 20 E8 90 */ fmr f1, f29 -/* 801D5510 6F 80 80 00 */ xoris r0, r28, 0x8000 -/* 801D5514 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D5518 93 E1 00 48 */ stw r31, 0x48(r1) -/* 801D551C C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D5520 EC 00 C8 28 */ fsubs f0, f0, f25 -/* 801D5524 EC 40 D0 28 */ fsubs f2, f0, f26 -/* 801D5528 80 BB 12 44 */ lwz r5, 0x1244(r27) -/* 801D552C 38 C1 00 24 */ addi r6, r1, 0x24 -/* 801D5530 38 E0 00 00 */ li r7, 0 -/* 801D5534 4B FF 8E 8D */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi -/* 801D5538 80 81 00 24 */ lwz r4, 0x24(r1) -/* 801D553C 2C 04 00 00 */ cmpwi r4, 0 -/* 801D5540 41 80 00 5C */ blt lbl_801D559C -/* 801D5544 38 60 00 06 */ li r3, 6 -/* 801D5548 7C 04 1B D6 */ divw r0, r4, r3 -/* 801D554C 7C 00 19 D6 */ mullw r0, r0, r3 -/* 801D5550 7C 00 20 50 */ subf r0, r0, r4 -/* 801D5554 54 00 10 3A */ slwi r0, r0, 2 -/* 801D5558 38 61 00 28 */ addi r3, r1, 0x28 -/* 801D555C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 801D5560 90 01 00 08 */ stw r0, 8(r1) -/* 801D5564 FC 20 B8 90 */ fmr f1, f23 -/* 801D5568 C8 42 A8 08 */ lfd f2, lit_4496(r2) -/* 801D556C 6F 80 80 00 */ xoris r0, r28, 0x8000 -/* 801D5570 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D5574 3C 00 43 30 */ lis r0, 0x4330 -/* 801D5578 90 01 00 48 */ stw r0, 0x48(r1) -/* 801D557C C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D5580 EC 40 10 28 */ fsubs f2, f0, f2 -/* 801D5584 C0 02 A7 F0 */ lfs f0, lit_4204(r2) -/* 801D5588 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D558C C0 62 A7 F4 */ lfs f3, lit_4205(r2) -/* 801D5590 FC 80 18 90 */ fmr f4, f3 -/* 801D5594 38 61 00 08 */ addi r3, r1, 8 -/* 801D5598 48 11 45 2D */ bl J2DFillBox__FffffQ28JUtility6TColor -lbl_801D559C: -/* 801D559C 88 1E 03 04 */ lbz r0, 0x304(r30) -/* 801D55A0 7F 80 E2 14 */ add r28, r0, r28 -/* 801D55A4 3B 9C 00 01 */ addi r28, r28, 1 -lbl_801D55A8: -/* 801D55A8 6F 80 80 00 */ xoris r0, r28, 0x8000 -/* 801D55AC 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D55B0 93 E1 00 48 */ stw r31, 0x48(r1) -/* 801D55B4 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D55B8 EC 00 C8 28 */ fsubs f0, f0, f25 -/* 801D55BC FC 00 D8 40 */ fcmpo cr0, f0, f27 -/* 801D55C0 41 80 FF 44 */ blt lbl_801D5504 -/* 801D55C4 88 1E 03 04 */ lbz r0, 0x304(r30) -/* 801D55C8 7F A0 EA 14 */ add r29, r0, r29 -/* 801D55CC 3B BD 00 01 */ addi r29, r29, 1 -lbl_801D55D0: -/* 801D55D0 6F A0 80 00 */ xoris r0, r29, 0x8000 -/* 801D55D4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D55D8 93 E1 00 48 */ stw r31, 0x48(r1) -/* 801D55DC C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D55E0 EC 00 C8 28 */ fsubs f0, f0, f25 -/* 801D55E4 FC 00 E0 40 */ fcmpo cr0, f0, f28 -/* 801D55E8 41 80 FE E4 */ blt lbl_801D54CC -lbl_801D55EC: -/* 801D55EC E3 E1 00 F8 */ psq_l f31, 248(r1), 0, 0 /* qr0 */ -/* 801D55F0 CB E1 00 F0 */ lfd f31, 0xf0(r1) -/* 801D55F4 E3 C1 00 E8 */ psq_l f30, 232(r1), 0, 0 /* qr0 */ -/* 801D55F8 CB C1 00 E0 */ lfd f30, 0xe0(r1) -/* 801D55FC E3 A1 00 D8 */ psq_l f29, 216(r1), 0, 0 /* qr0 */ -/* 801D5600 CB A1 00 D0 */ lfd f29, 0xd0(r1) -/* 801D5604 E3 81 00 C8 */ psq_l f28, 200(r1), 0, 0 /* qr0 */ -/* 801D5608 CB 81 00 C0 */ lfd f28, 0xc0(r1) -/* 801D560C E3 61 00 B8 */ psq_l f27, 184(r1), 0, 0 /* qr0 */ -/* 801D5610 CB 61 00 B0 */ lfd f27, 0xb0(r1) -/* 801D5614 E3 41 00 A8 */ psq_l f26, 168(r1), 0, 0 /* qr0 */ -/* 801D5618 CB 41 00 A0 */ lfd f26, 0xa0(r1) -/* 801D561C E3 21 00 98 */ psq_l f25, 152(r1), 0, 0 /* qr0 */ -/* 801D5620 CB 21 00 90 */ lfd f25, 0x90(r1) -/* 801D5624 E3 01 00 88 */ psq_l f24, 136(r1), 0, 0 /* qr0 */ -/* 801D5628 CB 01 00 80 */ lfd f24, 0x80(r1) -/* 801D562C E2 E1 00 78 */ psq_l f23, 120(r1), 0, 0 /* qr0 */ -/* 801D5630 CA E1 00 70 */ lfd f23, 0x70(r1) -/* 801D5634 39 61 00 70 */ addi r11, r1, 0x70 -/* 801D5638 48 18 CB E9 */ bl _restgpr_27 -/* 801D563C 80 01 01 04 */ lwz r0, 0x104(r1) -/* 801D5640 7C 08 03 A6 */ mtlr r0 -/* 801D5644 38 21 01 00 */ addi r1, r1, 0x100 -/* 801D5648 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/draw__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/draw__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index 58f7d529eb..0000000000 --- a/asm/d/menu/d_menu_fmap2D/draw__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_801D6C98: -/* 801D6C98 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801D6C9C 7C 08 02 A6 */ mflr r0 -/* 801D6CA0 90 01 00 64 */ stw r0, 0x64(r1) -/* 801D6CA4 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 801D6CA8 93 C1 00 58 */ stw r30, 0x58(r1) -/* 801D6CAC 7C 7E 1B 78 */ mr r30, r3 -/* 801D6CB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D6CB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D6CB8 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 801D6CBC 7F E3 FB 78 */ mr r3, r31 -/* 801D6CC0 81 9F 00 00 */ lwz r12, 0(r31) -/* 801D6CC4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801D6CC8 7D 89 03 A6 */ mtctr r12 -/* 801D6CCC 4E 80 04 21 */ bctrl -/* 801D6CD0 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D6CD4 38 81 00 10 */ addi r4, r1, 0x10 -/* 801D6CD8 38 A1 00 0C */ addi r5, r1, 0xc -/* 801D6CDC 38 C1 00 08 */ addi r6, r1, 8 -/* 801D6CE0 48 18 98 69 */ bl GXGetScissor -/* 801D6CE4 C0 3E 00 78 */ lfs f1, 0x78(r30) -/* 801D6CE8 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 801D6CEC C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D6CF0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 801D6CF4 C0 02 A7 DC */ lfs f0, lit_4199(r2) -/* 801D6CF8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D6CFC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 801D6D00 C0 02 A7 E0 */ lfs f0, lit_4200(r2) -/* 801D6D04 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 801D6D08 7F E3 FB 78 */ mr r3, r31 -/* 801D6D0C 38 81 00 28 */ addi r4, r1, 0x28 -/* 801D6D10 48 11 23 B1 */ bl func_802E90C0 -/* 801D6D14 7F E3 FB 78 */ mr r3, r31 -/* 801D6D18 81 9F 00 00 */ lwz r12, 0(r31) -/* 801D6D1C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801D6D20 7D 89 03 A6 */ mtctr r12 -/* 801D6D24 4E 80 04 21 */ bctrl -/* 801D6D28 80 7E 00 08 */ lwz r3, 8(r30) -/* 801D6D2C C0 3E 00 78 */ lfs f1, 0x78(r30) -/* 801D6D30 C0 5E 00 7C */ lfs f2, 0x7c(r30) -/* 801D6D34 7F E4 FB 78 */ mr r4, r31 -/* 801D6D38 48 12 21 9D */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801D6D3C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D6D40 C8 22 A7 F8 */ lfd f1, lit_4207(r2) -/* 801D6D44 90 01 00 3C */ stw r0, 0x3c(r1) -/* 801D6D48 3C 60 43 30 */ lis r3, 0x4330 -/* 801D6D4C 90 61 00 38 */ stw r3, 0x38(r1) -/* 801D6D50 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 801D6D54 EC 60 08 28 */ fsubs f3, f0, f1 -/* 801D6D58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D6D5C 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D6D60 90 61 00 40 */ stw r3, 0x40(r1) -/* 801D6D64 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 801D6D68 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D6D6C D0 41 00 18 */ stfs f2, 0x18(r1) -/* 801D6D70 D0 61 00 1C */ stfs f3, 0x1c(r1) -/* 801D6D74 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801D6D78 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801D6D7C 90 61 00 48 */ stw r3, 0x48(r1) -/* 801D6D80 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801D6D84 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D6D88 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D6D8C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801D6D90 80 01 00 08 */ lwz r0, 8(r1) -/* 801D6D94 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D6D98 90 61 00 50 */ stw r3, 0x50(r1) -/* 801D6D9C C8 01 00 50 */ lfd f0, 0x50(r1) -/* 801D6DA0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D6DA4 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D6DA8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 801D6DAC 7F E3 FB 78 */ mr r3, r31 -/* 801D6DB0 38 81 00 18 */ addi r4, r1, 0x18 -/* 801D6DB4 48 11 23 0D */ bl func_802E90C0 -/* 801D6DB8 7F E3 FB 78 */ mr r3, r31 -/* 801D6DBC 81 9F 00 00 */ lwz r12, 0(r31) -/* 801D6DC0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801D6DC4 7D 89 03 A6 */ mtctr r12 -/* 801D6DC8 4E 80 04 21 */ bctrl -/* 801D6DCC 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 801D6DD0 28 03 00 00 */ cmplwi r3, 0 -/* 801D6DD4 41 82 00 0C */ beq lbl_801D6DE0 -/* 801D6DD8 7F E4 FB 78 */ mr r4, r31 -/* 801D6DDC 48 06 6B 3D */ bl draw__17dMsgScrnExplain_cFP13J2DOrthoGraph -lbl_801D6DE0: -/* 801D6DE0 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 801D6DE4 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 801D6DE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801D6DEC 7C 08 03 A6 */ mtlr r0 -/* 801D6DF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 801D6DF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/draw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/draw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index b21946f4e8..0000000000 --- a/asm/d/menu/d_menu_fmap2D/draw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,585 +0,0 @@ -lbl_801CFF34: -/* 801CFF34 94 21 FE C0 */ stwu r1, -0x140(r1) -/* 801CFF38 7C 08 02 A6 */ mflr r0 -/* 801CFF3C 90 01 01 44 */ stw r0, 0x144(r1) -/* 801CFF40 DB E1 01 30 */ stfd f31, 0x130(r1) -/* 801CFF44 F3 E1 01 38 */ psq_st f31, 312(r1), 0, 0 /* qr0 */ -/* 801CFF48 DB C1 01 20 */ stfd f30, 0x120(r1) -/* 801CFF4C F3 C1 01 28 */ psq_st f30, 296(r1), 0, 0 /* qr0 */ -/* 801CFF50 DB A1 01 10 */ stfd f29, 0x110(r1) -/* 801CFF54 F3 A1 01 18 */ psq_st f29, 280(r1), 0, 0 /* qr0 */ -/* 801CFF58 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CFF5C 48 19 22 71 */ bl _savegpr_25 -/* 801CFF60 7C 7D 1B 78 */ mr r29, r3 -/* 801CFF64 48 00 3D 55 */ bl calcBlink__18dMenu_Fmap2DBack_cFv -/* 801CFF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CFF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CFF70 83 C3 5F 50 */ lwz r30, 0x5f50(r3) -/* 801CFF74 7F C3 F3 78 */ mr r3, r30 -/* 801CFF78 81 9E 00 00 */ lwz r12, 0(r30) -/* 801CFF7C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801CFF80 7D 89 03 A6 */ mtctr r12 -/* 801CFF84 4E 80 04 21 */ bctrl -/* 801CFF88 38 61 00 3C */ addi r3, r1, 0x3c -/* 801CFF8C 38 81 00 38 */ addi r4, r1, 0x38 -/* 801CFF90 38 A1 00 34 */ addi r5, r1, 0x34 -/* 801CFF94 38 C1 00 30 */ addi r6, r1, 0x30 -/* 801CFF98 48 19 05 B1 */ bl GXGetScissor -/* 801CFF9C C0 3D 0F BC */ lfs f1, 0xfbc(r29) -/* 801CFFA0 D0 21 00 60 */ stfs f1, 0x60(r1) -/* 801CFFA4 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801CFFA8 D0 01 00 64 */ stfs f0, 0x64(r1) -/* 801CFFAC C0 02 A7 DC */ lfs f0, lit_4199(r2) -/* 801CFFB0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801CFFB4 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 801CFFB8 C0 02 A7 E0 */ lfs f0, lit_4200(r2) -/* 801CFFBC D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 801CFFC0 7F C3 F3 78 */ mr r3, r30 -/* 801CFFC4 38 81 00 60 */ addi r4, r1, 0x60 -/* 801CFFC8 48 11 90 F9 */ bl func_802E90C0 -/* 801CFFCC 7F C3 F3 78 */ mr r3, r30 -/* 801CFFD0 81 9E 00 00 */ lwz r12, 0(r30) -/* 801CFFD4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801CFFD8 7D 89 03 A6 */ mtctr r12 -/* 801CFFDC 4E 80 04 21 */ bctrl -/* 801CFFE0 80 1D 12 0C */ lwz r0, 0x120c(r29) -/* 801CFFE4 90 01 00 28 */ stw r0, 0x28(r1) -/* 801CFFE8 80 1D 12 08 */ lwz r0, 0x1208(r29) -/* 801CFFEC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801CFFF0 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801CFFF4 38 81 00 2C */ addi r4, r1, 0x2c -/* 801CFFF8 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801CFFFC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0000 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D0004 7D 89 03 A6 */ mtctr r12 -/* 801D0008 4E 80 04 21 */ bctrl -/* 801D000C 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801D0010 C0 22 A7 E4 */ lfs f1, lit_4201(r2) -/* 801D0014 C0 1D 0F C4 */ lfs f0, 0xfc4(r29) -/* 801D0018 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D001C 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0020 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0024 C0 04 00 B8 */ lfs f0, 0xb8(r4) -/* 801D0028 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D002C FC 00 00 1E */ fctiwz f0, f0 -/* 801D0030 D8 01 00 D0 */ stfd f0, 0xd0(r1) -/* 801D0034 80 81 00 D4 */ lwz r4, 0xd4(r1) -/* 801D0038 81 83 00 00 */ lwz r12, 0(r3) -/* 801D003C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D0040 7D 89 03 A6 */ mtctr r12 -/* 801D0044 4E 80 04 21 */ bctrl -/* 801D0048 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801D004C C0 1D 0F BC */ lfs f0, 0xfbc(r29) -/* 801D0050 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D0054 EC 20 10 2A */ fadds f1, f0, f2 -/* 801D0058 C0 1D 0F C0 */ lfs f0, 0xfc0(r29) -/* 801D005C EC 40 10 2A */ fadds f2, f0, f2 -/* 801D0060 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D0064 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D0068 38 80 00 00 */ li r4, 0 -/* 801D006C 38 A0 00 00 */ li r5, 0 -/* 801D0070 38 C0 00 00 */ li r6, 0 -/* 801D0074 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0078 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801D007C 7D 89 03 A6 */ mtctr r12 -/* 801D0080 4E 80 04 21 */ bctrl -/* 801D0084 80 7D 0C 98 */ lwz r3, 0xc98(r29) -/* 801D0088 C0 3D 0F BC */ lfs f1, 0xfbc(r29) -/* 801D008C C0 5D 0F C0 */ lfs f2, 0xfc0(r29) -/* 801D0090 7F C4 F3 78 */ mr r4, r30 -/* 801D0094 48 12 8E 41 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801D0098 80 7D 0C 9C */ lwz r3, 0xc9c(r29) -/* 801D009C C0 3D 0F BC */ lfs f1, 0xfbc(r29) -/* 801D00A0 C0 5D 0F C0 */ lfs f2, 0xfc0(r29) -/* 801D00A4 7F C4 F3 78 */ mr r4, r30 -/* 801D00A8 48 12 8E 2D */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801D00AC 80 9D 0C A4 */ lwz r4, 0xca4(r29) -/* 801D00B0 38 61 00 7C */ addi r3, r1, 0x7c -/* 801D00B4 80 A4 00 04 */ lwz r5, 4(r4) -/* 801D00B8 38 C1 00 A0 */ addi r6, r1, 0xa0 -/* 801D00BC 38 E0 00 00 */ li r7, 0 -/* 801D00C0 39 00 00 00 */ li r8, 0 -/* 801D00C4 39 20 00 00 */ li r9, 0 -/* 801D00C8 48 08 4B C9 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs -/* 801D00CC 80 61 00 7C */ lwz r3, 0x7c(r1) -/* 801D00D0 80 01 00 80 */ lwz r0, 0x80(r1) -/* 801D00D4 90 61 00 94 */ stw r3, 0x94(r1) -/* 801D00D8 90 01 00 98 */ stw r0, 0x98(r1) -/* 801D00DC 80 01 00 84 */ lwz r0, 0x84(r1) -/* 801D00E0 90 01 00 9C */ stw r0, 0x9c(r1) -/* 801D00E4 80 9D 0C A4 */ lwz r4, 0xca4(r29) -/* 801D00E8 38 61 00 70 */ addi r3, r1, 0x70 -/* 801D00EC 80 A4 00 04 */ lwz r5, 4(r4) -/* 801D00F0 38 C1 00 A0 */ addi r6, r1, 0xa0 -/* 801D00F4 38 E0 00 03 */ li r7, 3 -/* 801D00F8 39 00 00 00 */ li r8, 0 -/* 801D00FC 39 20 00 00 */ li r9, 0 -/* 801D0100 48 08 4B 91 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs -/* 801D0104 80 61 00 70 */ lwz r3, 0x70(r1) -/* 801D0108 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801D010C 90 61 00 88 */ stw r3, 0x88(r1) -/* 801D0110 90 01 00 8C */ stw r0, 0x8c(r1) -/* 801D0114 80 01 00 78 */ lwz r0, 0x78(r1) -/* 801D0118 90 01 00 90 */ stw r0, 0x90(r1) -/* 801D011C C0 3D 0F C0 */ lfs f1, 0xfc0(r29) -/* 801D0120 C0 A1 00 98 */ lfs f5, 0x98(r1) -/* 801D0124 C0 62 A7 D4 */ lfs f3, lit_3971(r2) -/* 801D0128 EC 05 18 24 */ fdivs f0, f5, f3 -/* 801D012C EC 81 00 2A */ fadds f4, f1, f0 -/* 801D0130 C0 5D 0F BC */ lfs f2, 0xfbc(r29) -/* 801D0134 C0 21 00 94 */ lfs f1, 0x94(r1) -/* 801D0138 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D013C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D0140 EC 00 18 24 */ fdivs f0, f0, f3 -/* 801D0144 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D0148 D0 41 00 50 */ stfs f2, 0x50(r1) -/* 801D014C D0 81 00 54 */ stfs f4, 0x54(r1) -/* 801D0150 C0 01 00 88 */ lfs f0, 0x88(r1) -/* 801D0154 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D0158 EC 00 18 24 */ fdivs f0, f0, f3 -/* 801D015C EC 02 00 2A */ fadds f0, f2, f0 -/* 801D0160 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 801D0164 C0 01 00 8C */ lfs f0, 0x8c(r1) -/* 801D0168 EC 00 28 28 */ fsubs f0, f0, f5 -/* 801D016C EC 00 18 24 */ fdivs f0, f0, f3 -/* 801D0170 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D0174 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 801D0178 7F C3 F3 78 */ mr r3, r30 -/* 801D017C 38 81 00 50 */ addi r4, r1, 0x50 -/* 801D0180 48 11 8F 41 */ bl func_802E90C0 -/* 801D0184 7F C3 F3 78 */ mr r3, r30 -/* 801D0188 81 9E 00 00 */ lwz r12, 0(r30) -/* 801D018C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801D0190 7D 89 03 A6 */ mtctr r12 -/* 801D0194 4E 80 04 21 */ bctrl -/* 801D0198 7F A3 EB 78 */ mr r3, r29 -/* 801D019C 48 00 26 C5 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D01A0 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D01A4 EF A0 00 72 */ fmuls f29, f0, f1 -/* 801D01A8 7F A3 EB 78 */ mr r3, r29 -/* 801D01AC 48 00 25 8D */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D01B0 C0 1D 0F BC */ lfs f0, 0xfbc(r29) -/* 801D01B4 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D01B8 EC 00 E8 2A */ fadds f0, f0, f29 -/* 801D01BC D0 1D 11 DC */ stfs f0, 0x11dc(r29) -/* 801D01C0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D01C4 3B E3 FC 60 */ addi r31, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D01C8 88 1F 02 FF */ lbz r0, 0x2ff(r31) -/* 801D01CC 28 00 00 00 */ cmplwi r0, 0 -/* 801D01D0 41 82 00 18 */ beq lbl_801D01E8 -/* 801D01D4 88 1F 03 00 */ lbz r0, 0x300(r31) -/* 801D01D8 28 00 00 00 */ cmplwi r0, 0 -/* 801D01DC 41 82 00 0C */ beq lbl_801D01E8 -/* 801D01E0 7F A3 EB 78 */ mr r3, r29 -/* 801D01E4 48 00 54 69 */ bl drawDebugRegionArea__18dMenu_Fmap2DBack_cFv -lbl_801D01E8: -/* 801D01E8 7F A3 EB 78 */ mr r3, r29 -/* 801D01EC 48 00 2B BD */ bl regionTextureDraw__18dMenu_Fmap2DBack_cFv -/* 801D01F0 88 1F 02 FF */ lbz r0, 0x2ff(r31) -/* 801D01F4 28 00 00 00 */ cmplwi r0, 0 -/* 801D01F8 41 82 00 20 */ beq lbl_801D0218 -/* 801D01FC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0200 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0204 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801D0208 28 00 00 00 */ cmplwi r0, 0 -/* 801D020C 41 82 00 0C */ beq lbl_801D0218 -/* 801D0210 7F A3 EB 78 */ mr r3, r29 -/* 801D0214 48 00 51 75 */ bl drawDebugStageArea__18dMenu_Fmap2DBack_cFv -lbl_801D0218: -/* 801D0218 88 1D 12 39 */ lbz r0, 0x1239(r29) -/* 801D021C 28 00 00 00 */ cmplwi r0, 0 -/* 801D0220 41 82 00 60 */ beq lbl_801D0280 -/* 801D0224 80 1D 0C D4 */ lwz r0, 0xcd4(r29) -/* 801D0228 28 00 00 00 */ cmplwi r0, 0 -/* 801D022C 41 82 00 54 */ beq lbl_801D0280 -/* 801D0230 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0234 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0238 88 03 02 F7 */ lbz r0, 0x2f7(r3) -/* 801D023C 28 00 00 00 */ cmplwi r0, 0 -/* 801D0240 41 82 00 1C */ beq lbl_801D025C -/* 801D0244 C0 23 00 A8 */ lfs f1, 0xa8(r3) -/* 801D0248 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D024C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D0250 40 81 00 0C */ ble lbl_801D025C -/* 801D0254 7F A3 EB 78 */ mr r3, r29 -/* 801D0258 48 00 32 85 */ bl regionGridDraw__18dMenu_Fmap2DBack_cFv -lbl_801D025C: -/* 801D025C 7F A3 EB 78 */ mr r3, r29 -/* 801D0260 48 00 2E 35 */ bl stageTextureDraw__18dMenu_Fmap2DBack_cFv -/* 801D0264 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0268 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D026C 88 03 02 F5 */ lbz r0, 0x2f5(r3) -/* 801D0270 28 00 00 00 */ cmplwi r0, 0 -/* 801D0274 41 82 00 0C */ beq lbl_801D0280 -/* 801D0278 7F A3 EB 78 */ mr r3, r29 -/* 801D027C 48 00 39 41 */ bl stageOriginDraw__18dMenu_Fmap2DBack_cFv -lbl_801D0280: -/* 801D0280 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0284 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0288 88 03 02 F4 */ lbz r0, 0x2f4(r3) -/* 801D028C 28 00 00 00 */ cmplwi r0, 0 -/* 801D0290 41 82 00 0C */ beq lbl_801D029C -/* 801D0294 7F A3 EB 78 */ mr r3, r29 -/* 801D0298 48 00 38 61 */ bl regionOriginDraw__18dMenu_Fmap2DBack_cFv -lbl_801D029C: -/* 801D029C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D02A0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D02A4 88 03 02 F6 */ lbz r0, 0x2f6(r3) -/* 801D02A8 28 00 00 00 */ cmplwi r0, 0 -/* 801D02AC 41 82 00 1C */ beq lbl_801D02C8 -/* 801D02B0 C0 23 00 A4 */ lfs f1, 0xa4(r3) -/* 801D02B4 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D02B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D02BC 40 81 00 0C */ ble lbl_801D02C8 -/* 801D02C0 7F A3 EB 78 */ mr r3, r29 -/* 801D02C4 48 00 2F 0D */ bl worldGridDraw__18dMenu_Fmap2DBack_cFv -lbl_801D02C8: -/* 801D02C8 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D02CC 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D02D0 88 03 02 F3 */ lbz r0, 0x2f3(r3) -/* 801D02D4 28 00 00 00 */ cmplwi r0, 0 -/* 801D02D8 41 82 00 0C */ beq lbl_801D02E4 -/* 801D02DC 7F A3 EB 78 */ mr r3, r29 -/* 801D02E0 48 00 35 4D */ bl worldOriginDraw__18dMenu_Fmap2DBack_cFv -lbl_801D02E4: -/* 801D02E4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D02E8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D02EC 88 03 03 07 */ lbz r0, 0x307(r3) -/* 801D02F0 28 00 00 00 */ cmplwi r0, 0 -/* 801D02F4 41 82 00 0C */ beq lbl_801D0300 -/* 801D02F8 7F A3 EB 78 */ mr r3, r29 -/* 801D02FC 48 00 36 01 */ bl scrollAreaDraw__18dMenu_Fmap2DBack_cFv -lbl_801D0300: -/* 801D0300 38 7D 00 04 */ addi r3, r29, 4 -/* 801D0304 38 80 00 1E */ li r4, 0x1e -/* 801D0308 4B FF 42 25 */ bl blinkMove__16dMenuMapCommon_cFs -/* 801D030C 38 7D 00 04 */ addi r3, r29, 4 -/* 801D0310 4B FF 42 F1 */ bl moveLightDropAnime__16dMenuMapCommon_cFv -/* 801D0314 C0 1D 11 DC */ lfs f0, 0x11dc(r29) -/* 801D0318 D0 1D 0C 90 */ stfs f0, 0xc90(r29) -/* 801D031C 38 00 00 01 */ li r0, 1 -/* 801D0320 98 1D 0C 94 */ stb r0, 0xc94(r29) -/* 801D0324 38 7D 00 04 */ addi r3, r29, 4 -/* 801D0328 C0 3D 0F BC */ lfs f1, 0xfbc(r29) -/* 801D032C C0 5D 0F C0 */ lfs f2, 0xfc0(r29) -/* 801D0330 C0 7D 0F C4 */ lfs f3, 0xfc4(r29) -/* 801D0334 C0 9D 0F A8 */ lfs f4, 0xfa8(r29) -/* 801D0338 C0 1D 11 D8 */ lfs f0, 0x11d8(r29) -/* 801D033C EC 84 00 32 */ fmuls f4, f4, f0 -/* 801D0340 4B FF 35 A5 */ bl drawIcon__16dMenuMapCommon_cFffff -/* 801D0344 88 1F 02 FF */ lbz r0, 0x2ff(r31) -/* 801D0348 28 00 00 00 */ cmplwi r0, 0 -/* 801D034C 41 82 00 20 */ beq lbl_801D036C -/* 801D0350 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0354 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0358 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801D035C 28 00 00 00 */ cmplwi r0, 0 -/* 801D0360 40 82 00 0C */ bne lbl_801D036C -/* 801D0364 7F A3 EB 78 */ mr r3, r29 -/* 801D0368 48 00 52 E5 */ bl drawDebugRegionArea__18dMenu_Fmap2DBack_cFv -lbl_801D036C: -/* 801D036C 80 01 00 38 */ lwz r0, 0x38(r1) -/* 801D0370 C8 22 A7 F8 */ lfd f1, lit_4207(r2) -/* 801D0374 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 801D0378 3C 60 43 30 */ lis r3, 0x4330 -/* 801D037C 90 61 00 D0 */ stw r3, 0xd0(r1) -/* 801D0380 C8 01 00 D0 */ lfd f0, 0xd0(r1) -/* 801D0384 EC 60 08 28 */ fsubs f3, f0, f1 -/* 801D0388 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 801D038C 90 01 00 DC */ stw r0, 0xdc(r1) -/* 801D0390 90 61 00 D8 */ stw r3, 0xd8(r1) -/* 801D0394 C8 01 00 D8 */ lfd f0, 0xd8(r1) -/* 801D0398 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D039C D0 41 00 40 */ stfs f2, 0x40(r1) -/* 801D03A0 D0 61 00 44 */ stfs f3, 0x44(r1) -/* 801D03A4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D03A8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 801D03AC 90 61 00 E0 */ stw r3, 0xe0(r1) -/* 801D03B0 C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 801D03B4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D03B8 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D03BC D0 01 00 48 */ stfs f0, 0x48(r1) -/* 801D03C0 80 01 00 30 */ lwz r0, 0x30(r1) -/* 801D03C4 90 01 00 EC */ stw r0, 0xec(r1) -/* 801D03C8 90 61 00 E8 */ stw r3, 0xe8(r1) -/* 801D03CC C8 01 00 E8 */ lfd f0, 0xe8(r1) -/* 801D03D0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801D03D4 EC 03 00 2A */ fadds f0, f3, f0 -/* 801D03D8 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 801D03DC 7F C3 F3 78 */ mr r3, r30 -/* 801D03E0 38 81 00 40 */ addi r4, r1, 0x40 -/* 801D03E4 48 11 8C DD */ bl func_802E90C0 -/* 801D03E8 7F C3 F3 78 */ mr r3, r30 -/* 801D03EC 81 9E 00 00 */ lwz r12, 0(r30) -/* 801D03F0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 801D03F4 7D 89 03 A6 */ mtctr r12 -/* 801D03F8 4E 80 04 21 */ bctrl -/* 801D03FC 88 1D 12 3A */ lbz r0, 0x123a(r29) -/* 801D0400 28 00 00 00 */ cmplwi r0, 0 -/* 801D0404 41 82 02 10 */ beq lbl_801D0614 -/* 801D0408 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D040C FC 60 10 90 */ fmr f3, f2 -/* 801D0410 C0 3D 0F A0 */ lfs f1, 0xfa0(r29) -/* 801D0414 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D0418 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D041C 40 81 00 44 */ ble lbl_801D0460 -/* 801D0420 C0 02 A7 EC */ lfs f0, lit_4203(r2) -/* 801D0424 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D0428 40 80 00 38 */ bge lbl_801D0460 -/* 801D042C EC 80 08 28 */ fsubs f4, f0, f1 -/* 801D0430 C0 1D 11 A4 */ lfs f0, 0x11a4(r29) -/* 801D0434 FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 801D0438 41 82 00 08 */ beq lbl_801D0440 -/* 801D043C EC 40 01 32 */ fmuls f2, f0, f4 -lbl_801D0440: -/* 801D0440 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D0444 C0 3D 11 A8 */ lfs f1, 0x11a8(r29) -/* 801D0448 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D044C 41 82 00 08 */ beq lbl_801D0454 -/* 801D0450 EC 61 01 32 */ fmuls f3, f1, f4 -lbl_801D0454: -/* 801D0454 C0 9D 11 AC */ lfs f4, 0x11ac(r29) -/* 801D0458 C0 BD 11 B0 */ lfs f5, 0x11b0(r29) -/* 801D045C 48 00 00 0C */ b lbl_801D0468 -lbl_801D0460: -/* 801D0460 C0 9D 0F C8 */ lfs f4, 0xfc8(r29) -/* 801D0464 C0 BD 0F CC */ lfs f5, 0xfcc(r29) -lbl_801D0468: -/* 801D0468 7F A3 EB 78 */ mr r3, r29 -/* 801D046C C0 3D 11 8C */ lfs f1, 0x118c(r29) -/* 801D0470 C0 1D 11 9C */ lfs f0, 0x119c(r29) -/* 801D0474 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D0478 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D047C EC 20 20 28 */ fsubs f1, f0, f4 -/* 801D0480 C0 5D 11 90 */ lfs f2, 0x1190(r29) -/* 801D0484 C0 1D 11 A0 */ lfs f0, 0x11a0(r29) -/* 801D0488 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D048C EC 03 00 2A */ fadds f0, f3, f0 -/* 801D0490 EC 40 28 28 */ fsubs f2, f0, f5 -/* 801D0494 38 9D 11 94 */ addi r4, r29, 0x1194 -/* 801D0498 38 BD 11 98 */ addi r5, r29, 0x1198 -/* 801D049C 48 00 08 7D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D04A0 C0 3D 11 E0 */ lfs f1, 0x11e0(r29) -/* 801D04A4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D04A8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D04AC C0 03 02 50 */ lfs f0, 0x250(r3) -/* 801D04B0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D04B4 D0 1D 11 E0 */ stfs f0, 0x11e0(r29) -/* 801D04B8 C0 3D 11 E0 */ lfs f1, 0x11e0(r29) -/* 801D04BC C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D04C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D04C4 40 80 00 10 */ bge lbl_801D04D4 -/* 801D04C8 C0 02 A7 D8 */ lfs f0, lit_3972(r2) -/* 801D04CC EC 01 00 2A */ fadds f0, f1, f0 -/* 801D04D0 D0 1D 11 E0 */ stfs f0, 0x11e0(r29) -lbl_801D04D4: -/* 801D04D4 80 7D 0C AC */ lwz r3, 0xcac(r29) -/* 801D04D8 80 63 00 04 */ lwz r3, 4(r3) -/* 801D04DC C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 801D04E0 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 801D04E4 EC 41 00 28 */ fsubs f2, f1, f0 -/* 801D04E8 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 801D04EC C0 03 00 20 */ lfs f0, 0x20(r3) -/* 801D04F0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D04F4 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D04F8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D04FC EC 42 00 32 */ fmuls f2, f2, f0 -/* 801D0500 38 80 00 7A */ li r4, 0x7a -/* 801D0504 C0 7D 11 E0 */ lfs f3, 0x11e0(r29) -/* 801D0508 48 12 6C D5 */ bl rotate__7J2DPaneFff13J2DRotateAxisf -/* 801D050C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0510 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0514 88 03 02 EC */ lbz r0, 0x2ec(r3) -/* 801D0518 28 00 00 00 */ cmplwi r0, 0 -/* 801D051C 41 82 00 98 */ beq lbl_801D05B4 -/* 801D0520 C0 03 02 4C */ lfs f0, 0x24c(r3) -/* 801D0524 80 7D 0C AC */ lwz r3, 0xcac(r29) -/* 801D0528 80 63 00 04 */ lwz r3, 4(r3) -/* 801D052C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D0530 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D0534 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0538 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D053C 7D 89 03 A6 */ mtctr r12 -/* 801D0540 4E 80 04 21 */ bctrl -/* 801D0544 3B 20 00 00 */ li r25, 0 -/* 801D0548 3B 80 00 00 */ li r28, 0 -/* 801D054C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0550 3B 43 FC 60 */ addi r26, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0554 3C 60 80 39 */ lis r3, cur_tag_4092@ha /* 0x80396268@ha */ -/* 801D0558 3B 63 62 68 */ addi r27, r3, cur_tag_4092@l /* 0x80396268@l */ -lbl_801D055C: -/* 801D055C 80 7D 0C D8 */ lwz r3, 0xcd8(r29) -/* 801D0560 7C 9B E2 14 */ add r4, r27, r28 -/* 801D0564 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D0568 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D056C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0570 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D0574 7D 89 03 A6 */ mtctr r12 -/* 801D0578 4E 80 04 21 */ bctrl -/* 801D057C 80 1A 02 58 */ lwz r0, 0x258(r26) -/* 801D0580 90 01 00 20 */ stw r0, 0x20(r1) -/* 801D0584 80 1A 02 54 */ lwz r0, 0x254(r26) -/* 801D0588 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D058C 38 81 00 24 */ addi r4, r1, 0x24 -/* 801D0590 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801D0594 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0598 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D059C 7D 89 03 A6 */ mtctr r12 -/* 801D05A0 4E 80 04 21 */ bctrl -/* 801D05A4 3B 39 00 01 */ addi r25, r25, 1 -/* 801D05A8 2C 19 00 04 */ cmpwi r25, 4 -/* 801D05AC 3B 9C 00 08 */ addi r28, r28, 8 -/* 801D05B0 41 80 FF AC */ blt lbl_801D055C -lbl_801D05B4: -/* 801D05B4 80 7D 0C AC */ lwz r3, 0xcac(r29) -/* 801D05B8 C0 3D 11 D4 */ lfs f1, 0x11d4(r29) -/* 801D05BC C0 1D 11 D8 */ lfs f0, 0x11d8(r29) -/* 801D05C0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D05C4 48 08 52 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801D05C8 C0 3D 11 98 */ lfs f1, 0x1198(r29) -/* 801D05CC C0 1D 0F C0 */ lfs f0, 0xfc0(r29) -/* 801D05D0 EC 41 00 2A */ fadds f2, f1, f0 -/* 801D05D4 80 7D 0C AC */ lwz r3, 0xcac(r29) -/* 801D05D8 80 63 00 04 */ lwz r3, 4(r3) -/* 801D05DC C0 3D 11 94 */ lfs f1, 0x1194(r29) -/* 801D05E0 C0 1D 0F BC */ lfs f0, 0xfbc(r29) -/* 801D05E4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D05E8 D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 801D05EC D0 43 00 D8 */ stfs f2, 0xd8(r3) -/* 801D05F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D05F4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D05F8 7D 89 03 A6 */ mtctr r12 -/* 801D05FC 4E 80 04 21 */ bctrl -/* 801D0600 80 7D 0C D8 */ lwz r3, 0xcd8(r29) -/* 801D0604 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D0608 FC 40 08 90 */ fmr f2, f1 -/* 801D060C 7F C4 F3 78 */ mr r4, r30 -/* 801D0610 48 12 88 C5 */ bl draw__9J2DScreenFffPC14J2DGrafContext -lbl_801D0614: -/* 801D0614 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0618 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D061C 88 03 02 F8 */ lbz r0, 0x2f8(r3) -/* 801D0620 28 00 00 00 */ cmplwi r0, 0 -/* 801D0624 41 82 00 C0 */ beq lbl_801D06E4 -/* 801D0628 38 00 00 FF */ li r0, 0xff -/* 801D062C 98 01 00 18 */ stb r0, 0x18(r1) -/* 801D0630 98 01 00 19 */ stb r0, 0x19(r1) -/* 801D0634 98 01 00 1A */ stb r0, 0x1a(r1) -/* 801D0638 98 01 00 1B */ stb r0, 0x1b(r1) -/* 801D063C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D0640 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801D0644 7F A3 EB 78 */ mr r3, r29 -/* 801D0648 48 00 20 E1 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv -/* 801D064C FF A0 08 90 */ fmr f29, f1 -/* 801D0650 7F A3 EB 78 */ mr r3, r29 -/* 801D0654 48 00 20 C5 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801D0658 FF C0 08 90 */ fmr f30, f1 -/* 801D065C 7F A3 EB 78 */ mr r3, r29 -/* 801D0660 48 00 20 09 */ bl getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv -/* 801D0664 C0 1D 0F C0 */ lfs f0, 0xfc0(r29) -/* 801D0668 EF E0 08 2A */ fadds f31, f0, f1 -/* 801D066C 7F A3 EB 78 */ mr r3, r29 -/* 801D0670 48 00 1F E9 */ bl getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv -/* 801D0674 C0 1D 0F BC */ lfs f0, 0xfbc(r29) -/* 801D0678 EC 20 08 2A */ fadds f1, f0, f1 -/* 801D067C FC 40 F8 90 */ fmr f2, f31 -/* 801D0680 FC 60 F0 90 */ fmr f3, f30 -/* 801D0684 FC 80 E8 90 */ fmr f4, f29 -/* 801D0688 38 61 00 1C */ addi r3, r1, 0x1c -/* 801D068C 38 80 00 06 */ li r4, 6 -/* 801D0690 48 11 95 0D */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc -/* 801D0694 38 00 00 FF */ li r0, 0xff -/* 801D0698 98 01 00 10 */ stb r0, 0x10(r1) -/* 801D069C 98 01 00 11 */ stb r0, 0x11(r1) -/* 801D06A0 98 01 00 12 */ stb r0, 0x12(r1) -/* 801D06A4 98 01 00 13 */ stb r0, 0x13(r1) -/* 801D06A8 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D06AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D06B0 7F A3 EB 78 */ mr r3, r29 -/* 801D06B4 48 00 20 15 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D06B8 C0 02 A7 F0 */ lfs f0, lit_4204(r2) -/* 801D06BC EF E1 00 28 */ fsubs f31, f1, f0 -/* 801D06C0 7F A3 EB 78 */ mr r3, r29 -/* 801D06C4 48 00 1F B5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D06C8 C0 02 A7 F0 */ lfs f0, lit_4204(r2) -/* 801D06CC EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D06D0 FC 40 F8 90 */ fmr f2, f31 -/* 801D06D4 C0 62 A7 F4 */ lfs f3, lit_4205(r2) -/* 801D06D8 FC 80 18 90 */ fmr f4, f3 -/* 801D06DC 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D06E0 48 11 93 E5 */ bl J2DFillBox__FffffQ28JUtility6TColor -lbl_801D06E4: -/* 801D06E4 88 9D 12 2D */ lbz r4, 0x122d(r29) -/* 801D06E8 28 04 00 00 */ cmplwi r4, 0 -/* 801D06EC 41 82 00 14 */ beq lbl_801D0700 -/* 801D06F0 80 7D 0C E0 */ lwz r3, 0xce0(r29) -/* 801D06F4 48 03 AE 25 */ bl drawHaihai__14dMeterHaihai_cFUc -/* 801D06F8 38 00 00 00 */ li r0, 0 -/* 801D06FC 98 1D 12 2D */ stb r0, 0x122d(r29) -lbl_801D0700: -/* 801D0700 88 1F 02 FF */ lbz r0, 0x2ff(r31) -/* 801D0704 28 00 00 00 */ cmplwi r0, 0 -/* 801D0708 41 82 00 20 */ beq lbl_801D0728 -/* 801D070C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D0710 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0714 88 03 03 00 */ lbz r0, 0x300(r3) -/* 801D0718 28 00 00 00 */ cmplwi r0, 0 -/* 801D071C 40 82 00 0C */ bne lbl_801D0728 -/* 801D0720 7F A3 EB 78 */ mr r3, r29 -/* 801D0724 48 00 4C 65 */ bl drawDebugStageArea__18dMenu_Fmap2DBack_cFv -lbl_801D0728: -/* 801D0728 80 1D 12 0C */ lwz r0, 0x120c(r29) -/* 801D072C 90 01 00 08 */ stw r0, 8(r1) -/* 801D0730 80 1D 12 08 */ lwz r0, 0x1208(r29) -/* 801D0734 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D0738 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801D073C 38 81 00 0C */ addi r4, r1, 0xc -/* 801D0740 38 A1 00 08 */ addi r5, r1, 8 -/* 801D0744 81 83 00 00 */ lwz r12, 0(r3) -/* 801D0748 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D074C 7D 89 03 A6 */ mtctr r12 -/* 801D0750 4E 80 04 21 */ bctrl -/* 801D0754 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801D0758 C0 5D 11 E4 */ lfs f2, 0x11e4(r29) -/* 801D075C C0 22 A7 E4 */ lfs f1, lit_4201(r2) -/* 801D0760 C0 1D 0F C4 */ lfs f0, 0xfc4(r29) -/* 801D0764 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D0768 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D076C 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D0770 C0 04 00 BC */ lfs f0, 0xbc(r4) -/* 801D0774 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D0778 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D077C FC 00 00 1E */ fctiwz f0, f0 -/* 801D0780 D8 01 00 E8 */ stfd f0, 0xe8(r1) -/* 801D0784 80 81 00 EC */ lwz r4, 0xec(r1) -/* 801D0788 81 83 00 00 */ lwz r12, 0(r3) -/* 801D078C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D0790 7D 89 03 A6 */ mtctr r12 -/* 801D0794 4E 80 04 21 */ bctrl -/* 801D0798 80 7D 0C B0 */ lwz r3, 0xcb0(r29) -/* 801D079C C0 1D 0F BC */ lfs f0, 0xfbc(r29) -/* 801D07A0 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D07A4 EC 20 10 2A */ fadds f1, f0, f2 -/* 801D07A8 C0 1D 0F C0 */ lfs f0, 0xfc0(r29) -/* 801D07AC EC 40 10 2A */ fadds f2, f0, f2 -/* 801D07B0 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D07B4 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D07B8 38 80 00 00 */ li r4, 0 -/* 801D07BC 38 A0 00 00 */ li r5, 0 -/* 801D07C0 38 C0 00 00 */ li r6, 0 -/* 801D07C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801D07C8 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801D07CC 7D 89 03 A6 */ mtctr r12 -/* 801D07D0 4E 80 04 21 */ bctrl -/* 801D07D4 E3 E1 01 38 */ psq_l f31, 312(r1), 0, 0 /* qr0 */ -/* 801D07D8 CB E1 01 30 */ lfd f31, 0x130(r1) -/* 801D07DC E3 C1 01 28 */ psq_l f30, 296(r1), 0, 0 /* qr0 */ -/* 801D07E0 CB C1 01 20 */ lfd f30, 0x120(r1) -/* 801D07E4 E3 A1 01 18 */ psq_l f29, 280(r1), 0, 0 /* qr0 */ -/* 801D07E8 CB A1 01 10 */ lfd f29, 0x110(r1) -/* 801D07EC 39 61 01 10 */ addi r11, r1, 0x110 -/* 801D07F0 48 19 1A 29 */ bl _restgpr_25 -/* 801D07F4 80 01 01 44 */ lwz r0, 0x144(r1) -/* 801D07F8 7C 08 03 A6 */ mtlr r0 -/* 801D07FC 38 21 01 40 */ addi r1, r1, 0x140 -/* 801D0800 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/func_801D810C.s b/asm/d/menu/d_menu_fmap2D/func_801D810C.s deleted file mode 100644 index c6e758ba17..0000000000 --- a/asm/d/menu/d_menu_fmap2D/func_801D810C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_801D810C: -/* 801D810C 38 63 FF FC */ addi r3, r3, -4 -/* 801D8110 4B FF 7B CC */ b __dt__18dMenu_Fmap2DBack_cFv diff --git a/asm/d/menu/d_menu_fmap2D/getAllMapZoomRate__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/getAllMapZoomRate__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 1c34118f94..0000000000 --- a/asm/d/menu/d_menu_fmap2D/getAllMapZoomRate__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_801D2B5C: -/* 801D2B5C C0 22 A7 D4 */ lfs f1, lit_3971(r2) -/* 801D2B60 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 29445afc34..0000000000 --- a/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801D2678: -/* 801D2678 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D267C 7C 08 02 A6 */ mflr r0 -/* 801D2680 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D2684 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801D2688 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801D268C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D2690 7C 7F 1B 78 */ mr r31, r3 -/* 801D2694 48 00 00 85 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801D2698 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D269C EF E1 00 32 */ fmuls f31, f1, f0 -/* 801D26A0 7F E3 FB 78 */ mr r3, r31 -/* 801D26A4 4B FF FF B5 */ bl getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv -/* 801D26A8 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801D26AC E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 801D26B0 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 801D26B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D26B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D26BC 7C 08 03 A6 */ mtlr r0 -/* 801D26C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D26C4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index da16670456..0000000000 --- a/asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801D26C8: -/* 801D26C8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D26CC 7C 08 02 A6 */ mflr r0 -/* 801D26D0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D26D4 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801D26D8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801D26DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D26E0 7C 7F 1B 78 */ mr r31, r3 -/* 801D26E4 48 00 00 45 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv -/* 801D26E8 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D26EC EF E1 00 32 */ fmuls f31, f1, f0 -/* 801D26F0 7F E3 FB 78 */ mr r3, r31 -/* 801D26F4 4B FF FF 75 */ bl getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv -/* 801D26F8 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801D26FC E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 801D2700 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 801D2704 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D2708 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D270C 7C 08 03 A6 */ mtlr r0 -/* 801D2710 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D2714 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 0715dd31e3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801D2880: -/* 801D2880 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D2884 7C 08 02 A6 */ mflr r0 -/* 801D2888 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D288C DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801D2890 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801D2894 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D2898 7C 7F 1B 78 */ mr r31, r3 -/* 801D289C 4B FF FF C5 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D28A0 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D28A4 EF E1 00 32 */ fmuls f31, f1, f0 -/* 801D28A8 7F E3 FB 78 */ mr r3, r31 -/* 801D28AC 4B FF FE 8D */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D28B0 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801D28B4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 801D28B8 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 801D28BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D28C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D28C4 7C 08 03 A6 */ mtlr r0 -/* 801D28C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D28CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index a07447691c..0000000000 --- a/asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801D28D0: -/* 801D28D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D28D4 7C 08 02 A6 */ mflr r0 -/* 801D28D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D28DC DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801D28E0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801D28E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D28E8 7C 7F 1B 78 */ mr r31, r3 -/* 801D28EC 48 00 00 AD */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D28F0 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D28F4 EF E1 00 32 */ fmuls f31, f1, f0 -/* 801D28F8 7F E3 FB 78 */ mr r3, r31 -/* 801D28FC 4B FF FE 95 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D2900 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801D2904 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 801D2908 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 801D290C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D2910 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D2914 7C 08 03 A6 */ mtlr r0 -/* 801D2918 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D291C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/isWarpAccept__17dMenu_Fmap2DTop_cFv.s b/asm/d/menu/d_menu_fmap2D/isWarpAccept__17dMenu_Fmap2DTop_cFv.s deleted file mode 100644 index 1ae23a430f..0000000000 --- a/asm/d/menu/d_menu_fmap2D/isWarpAccept__17dMenu_Fmap2DTop_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_801D8088: -/* 801D8088 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D808C 7C 08 02 A6 */ mflr r0 -/* 801D8090 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D8094 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D8098 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D809C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801D80A0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D80A4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D80A8 A0 84 00 6C */ lhz r4, 0x6c(r4) -/* 801D80AC 4B E5 C9 11 */ bl isEventBit__11dSv_event_cCFUs -/* 801D80B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801D80B4 41 82 00 28 */ beq lbl_801D80DC -/* 801D80B8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D80BC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801D80C0 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 801D80C4 28 00 00 09 */ cmplwi r0, 9 -/* 801D80C8 41 82 00 14 */ beq lbl_801D80DC -/* 801D80CC 28 00 00 07 */ cmplwi r0, 7 -/* 801D80D0 41 82 00 0C */ beq lbl_801D80DC -/* 801D80D4 28 00 00 08 */ cmplwi r0, 8 -/* 801D80D8 40 82 00 18 */ bne lbl_801D80F0 -lbl_801D80DC: -/* 801D80DC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D80E0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D80E4 88 03 03 01 */ lbz r0, 0x301(r3) -/* 801D80E8 28 00 00 00 */ cmplwi r0, 0 -/* 801D80EC 41 82 00 0C */ beq lbl_801D80F8 -lbl_801D80F0: -/* 801D80F0 38 60 00 01 */ li r3, 1 -/* 801D80F4 48 00 00 08 */ b lbl_801D80FC -lbl_801D80F8: -/* 801D80F8 38 60 00 00 */ li r3, 0 -lbl_801D80FC: -/* 801D80FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D8100 7C 08 03 A6 */ mtlr r0 -/* 801D8104 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8108 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/regionGridDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/regionGridDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 0f41fcba38..0000000000 --- a/asm/d/menu/d_menu_fmap2D/regionGridDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,221 +0,0 @@ -lbl_801D34DC: -/* 801D34DC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 801D34E0 7C 08 02 A6 */ mflr r0 -/* 801D34E4 90 01 00 94 */ stw r0, 0x94(r1) -/* 801D34E8 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 801D34EC F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 801D34F0 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 801D34F4 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 801D34F8 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 801D34FC F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 801D3500 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 801D3504 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 801D3508 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 801D350C 93 C1 00 48 */ stw r30, 0x48(r1) -/* 801D3510 7C 7E 1B 78 */ mr r30, r3 -/* 801D3514 88 03 12 27 */ lbz r0, 0x1227(r3) -/* 801D3518 54 00 10 3A */ slwi r0, r0, 2 -/* 801D351C 7C 9E 02 14 */ add r4, r30, r0 -/* 801D3520 C0 24 10 04 */ lfs f1, 0x1004(r4) -/* 801D3524 C0 03 0F C8 */ lfs f0, 0xfc8(r3) -/* 801D3528 EF E1 00 28 */ fsubs f31, f1, f0 -/* 801D352C C0 24 10 24 */ lfs f1, 0x1024(r4) -/* 801D3530 C0 03 0F CC */ lfs f0, 0xfcc(r3) -/* 801D3534 EF C1 00 28 */ fsubs f30, f1, f0 -/* 801D3538 FC 20 F8 90 */ fmr f1, f31 -/* 801D353C FC 40 F0 90 */ fmr f2, f30 -/* 801D3540 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D3544 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3548 4B FF D7 D1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D354C 38 00 00 B4 */ li r0, 0xb4 -/* 801D3550 98 01 00 30 */ stb r0, 0x30(r1) -/* 801D3554 38 00 00 00 */ li r0, 0 -/* 801D3558 98 01 00 31 */ stb r0, 0x31(r1) -/* 801D355C 98 01 00 32 */ stb r0, 0x32(r1) -/* 801D3560 38 00 00 FF */ li r0, 0xff -/* 801D3564 98 01 00 33 */ stb r0, 0x33(r1) -/* 801D3568 80 01 00 30 */ lwz r0, 0x30(r1) -/* 801D356C 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D3570 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 801D3574 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D3578 FC 60 08 90 */ fmr f3, f1 -/* 801D357C C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D3580 38 61 00 34 */ addi r3, r1, 0x34 -/* 801D3584 38 80 00 06 */ li r4, 6 -/* 801D3588 48 11 64 11 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D358C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D3590 3B E3 FC 60 */ addi r31, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D3594 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D3598 EF 9F 00 28 */ fsubs f28, f31, f0 -lbl_801D359C: -/* 801D359C 7F C3 F3 78 */ mr r3, r30 -/* 801D35A0 FC 20 E0 90 */ fmr f1, f28 -/* 801D35A4 FC 40 F0 90 */ fmr f2, f30 -/* 801D35A8 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D35AC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D35B0 4B FF D7 69 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D35B4 7F C3 F3 78 */ mr r3, r30 -/* 801D35B8 4B FF F1 81 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D35BC C0 61 00 3C */ lfs f3, 0x3c(r1) -/* 801D35C0 FC 03 08 40 */ fcmpo cr0, f3, f1 -/* 801D35C4 4C 41 13 82 */ cror 2, 1, 2 -/* 801D35C8 40 82 00 4C */ bne lbl_801D3614 -/* 801D35CC 38 00 00 B4 */ li r0, 0xb4 -/* 801D35D0 98 01 00 28 */ stb r0, 0x28(r1) -/* 801D35D4 38 00 00 00 */ li r0, 0 -/* 801D35D8 98 01 00 29 */ stb r0, 0x29(r1) -/* 801D35DC 98 01 00 2A */ stb r0, 0x2a(r1) -/* 801D35E0 38 00 00 FF */ li r0, 0xff -/* 801D35E4 98 01 00 2B */ stb r0, 0x2b(r1) -/* 801D35E8 80 01 00 28 */ lwz r0, 0x28(r1) -/* 801D35EC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801D35F0 FC 20 18 90 */ fmr f1, f3 -/* 801D35F4 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D35F8 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D35FC 38 61 00 2C */ addi r3, r1, 0x2c -/* 801D3600 38 80 00 06 */ li r4, 6 -/* 801D3604 48 11 63 95 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3608 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D360C EF 9C 00 28 */ fsubs f28, f28, f0 -/* 801D3610 4B FF FF 8C */ b lbl_801D359C -lbl_801D3614: -/* 801D3614 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D3618 EF 9F 00 2A */ fadds f28, f31, f0 -lbl_801D361C: -/* 801D361C 7F C3 F3 78 */ mr r3, r30 -/* 801D3620 FC 20 E0 90 */ fmr f1, f28 -/* 801D3624 FC 40 F0 90 */ fmr f2, f30 -/* 801D3628 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D362C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3630 4B FF D6 E9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3634 7F C3 F3 78 */ mr r3, r30 -/* 801D3638 4B FF F2 29 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D363C FF A0 08 90 */ fmr f29, f1 -/* 801D3640 7F C3 F3 78 */ mr r3, r30 -/* 801D3644 4B FF F0 F5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D3648 EC 01 E8 2A */ fadds f0, f1, f29 -/* 801D364C C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 801D3650 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D3654 4C 40 13 82 */ cror 2, 0, 2 -/* 801D3658 40 82 00 4C */ bne lbl_801D36A4 -/* 801D365C 38 00 00 B4 */ li r0, 0xb4 -/* 801D3660 98 01 00 20 */ stb r0, 0x20(r1) -/* 801D3664 38 00 00 00 */ li r0, 0 -/* 801D3668 98 01 00 21 */ stb r0, 0x21(r1) -/* 801D366C 98 01 00 22 */ stb r0, 0x22(r1) -/* 801D3670 38 00 00 FF */ li r0, 0xff -/* 801D3674 98 01 00 23 */ stb r0, 0x23(r1) -/* 801D3678 80 01 00 20 */ lwz r0, 0x20(r1) -/* 801D367C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D3680 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D3684 FC 60 08 90 */ fmr f3, f1 -/* 801D3688 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D368C 38 61 00 24 */ addi r3, r1, 0x24 -/* 801D3690 38 80 00 06 */ li r4, 6 -/* 801D3694 48 11 63 05 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3698 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D369C EF 9C 00 2A */ fadds f28, f28, f0 -/* 801D36A0 4B FF FF 7C */ b lbl_801D361C -lbl_801D36A4: -/* 801D36A4 38 00 00 B4 */ li r0, 0xb4 -/* 801D36A8 98 01 00 18 */ stb r0, 0x18(r1) -/* 801D36AC 38 00 00 00 */ li r0, 0 -/* 801D36B0 98 01 00 19 */ stb r0, 0x19(r1) -/* 801D36B4 98 01 00 1A */ stb r0, 0x1a(r1) -/* 801D36B8 38 00 00 FF */ li r0, 0xff -/* 801D36BC 98 01 00 1B */ stb r0, 0x1b(r1) -/* 801D36C0 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D36C4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801D36C8 C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D36CC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D36D0 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D36D4 FC 80 10 90 */ fmr f4, f2 -/* 801D36D8 38 61 00 1C */ addi r3, r1, 0x1c -/* 801D36DC 38 80 00 06 */ li r4, 6 -/* 801D36E0 48 11 62 B9 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D36E4 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D36E8 EF 9E 00 28 */ fsubs f28, f30, f0 -lbl_801D36EC: -/* 801D36EC 7F C3 F3 78 */ mr r3, r30 -/* 801D36F0 FC 20 F8 90 */ fmr f1, f31 -/* 801D36F4 FC 40 E0 90 */ fmr f2, f28 -/* 801D36F8 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D36FC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3700 4B FF D6 19 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3704 7F C3 F3 78 */ mr r3, r30 -/* 801D3708 4B FF F0 89 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D370C C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D3710 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 801D3714 4C 41 13 82 */ cror 2, 1, 2 -/* 801D3718 40 82 00 4C */ bne lbl_801D3764 -/* 801D371C 38 00 00 B4 */ li r0, 0xb4 -/* 801D3720 98 01 00 10 */ stb r0, 0x10(r1) -/* 801D3724 38 00 00 00 */ li r0, 0 -/* 801D3728 98 01 00 11 */ stb r0, 0x11(r1) -/* 801D372C 98 01 00 12 */ stb r0, 0x12(r1) -/* 801D3730 38 00 00 FF */ li r0, 0xff -/* 801D3734 98 01 00 13 */ stb r0, 0x13(r1) -/* 801D3738 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D373C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D3740 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D3744 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D3748 FC 80 10 90 */ fmr f4, f2 -/* 801D374C 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D3750 38 80 00 06 */ li r4, 6 -/* 801D3754 48 11 62 45 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3758 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D375C EF 9C 00 28 */ fsubs f28, f28, f0 -/* 801D3760 4B FF FF 8C */ b lbl_801D36EC -lbl_801D3764: -/* 801D3764 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D3768 EF 9E 00 2A */ fadds f28, f30, f0 -lbl_801D376C: -/* 801D376C 7F C3 F3 78 */ mr r3, r30 -/* 801D3770 FC 20 F8 90 */ fmr f1, f31 -/* 801D3774 FC 40 E0 90 */ fmr f2, f28 -/* 801D3778 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D377C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3780 4B FF D5 99 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3784 7F C3 F3 78 */ mr r3, r30 -/* 801D3788 4B FF F2 11 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D378C FF C0 08 90 */ fmr f30, f1 -/* 801D3790 7F C3 F3 78 */ mr r3, r30 -/* 801D3794 4B FF EF FD */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D3798 EC 01 F0 2A */ fadds f0, f1, f30 -/* 801D379C C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D37A0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D37A4 4C 40 13 82 */ cror 2, 0, 2 -/* 801D37A8 40 82 00 4C */ bne lbl_801D37F4 -/* 801D37AC 38 00 00 B4 */ li r0, 0xb4 -/* 801D37B0 98 01 00 08 */ stb r0, 8(r1) -/* 801D37B4 38 00 00 00 */ li r0, 0 -/* 801D37B8 98 01 00 09 */ stb r0, 9(r1) -/* 801D37BC 98 01 00 0A */ stb r0, 0xa(r1) -/* 801D37C0 38 00 00 FF */ li r0, 0xff -/* 801D37C4 98 01 00 0B */ stb r0, 0xb(r1) -/* 801D37C8 80 01 00 08 */ lwz r0, 8(r1) -/* 801D37CC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D37D0 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D37D4 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D37D8 FC 80 10 90 */ fmr f4, f2 -/* 801D37DC 38 61 00 0C */ addi r3, r1, 0xc -/* 801D37E0 38 80 00 06 */ li r4, 6 -/* 801D37E4 48 11 61 B5 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D37E8 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 801D37EC EF 9C 00 2A */ fadds f28, f28, f0 -/* 801D37F0 4B FF FF 7C */ b lbl_801D376C -lbl_801D37F4: -/* 801D37F4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 801D37F8 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 801D37FC E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 801D3800 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 801D3804 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 801D3808 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 801D380C E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 801D3810 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 801D3814 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 801D3818 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 801D381C 80 01 00 94 */ lwz r0, 0x94(r1) -/* 801D3820 7C 08 03 A6 */ mtlr r0 -/* 801D3824 38 21 00 90 */ addi r1, r1, 0x90 -/* 801D3828 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/regionMapMove__18dMenu_Fmap2DBack_cFP9STControl.s b/asm/d/menu/d_menu_fmap2D/regionMapMove__18dMenu_Fmap2DBack_cFP9STControl.s deleted file mode 100644 index 2bfc83c6d3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/regionMapMove__18dMenu_Fmap2DBack_cFP9STControl.s +++ /dev/null @@ -1,226 +0,0 @@ -lbl_801D4B2C: -/* 801D4B2C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 801D4B30 7C 08 02 A6 */ mflr r0 -/* 801D4B34 90 01 00 74 */ stw r0, 0x74(r1) -/* 801D4B38 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 801D4B3C F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 801D4B40 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 801D4B44 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 801D4B48 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 801D4B4C F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 801D4B50 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 801D4B54 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 801D4B58 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4B5C 48 18 D6 81 */ bl _savegpr_29 -/* 801D4B60 7C 7F 1B 78 */ mr r31, r3 -/* 801D4B64 7C 9D 23 78 */ mr r29, r4 -/* 801D4B68 4B FF DC 29 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D4B6C FF C0 08 90 */ fmr f30, f1 -/* 801D4B70 7F E3 FB 78 */ mr r3, r31 -/* 801D4B74 4B FF DB C5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D4B78 7F E3 FB 78 */ mr r3, r31 -/* 801D4B7C FC 40 F0 90 */ fmr f2, f30 -/* 801D4B80 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D4B84 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D4B88 4B FF C3 F5 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D4B8C 7F E3 FB 78 */ mr r3, r31 -/* 801D4B90 4B FF DE 09 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D4B94 FF C0 08 90 */ fmr f30, f1 -/* 801D4B98 7F E3 FB 78 */ mr r3, r31 -/* 801D4B9C 4B FF DB F5 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D4BA0 EF E1 F0 2A */ fadds f31, f1, f30 -/* 801D4BA4 7F E3 FB 78 */ mr r3, r31 -/* 801D4BA8 4B FF DC B9 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D4BAC FF C0 08 90 */ fmr f30, f1 -/* 801D4BB0 7F E3 FB 78 */ mr r3, r31 -/* 801D4BB4 4B FF DB 85 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D4BB8 EC 21 F0 2A */ fadds f1, f1, f30 -/* 801D4BBC 7F E3 FB 78 */ mr r3, r31 -/* 801D4BC0 FC 40 F8 90 */ fmr f2, f31 -/* 801D4BC4 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D4BC8 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D4BCC 4B FF C3 B1 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D4BD0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4BD4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4BD8 C3 A3 00 E0 */ lfs f29, 0xe0(r3) -/* 801D4BDC C0 03 00 E4 */ lfs f0, 0xe4(r3) -/* 801D4BE0 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 801D4BE4 40 80 00 0C */ bge lbl_801D4BF0 -/* 801D4BE8 FF E0 E8 90 */ fmr f31, f29 -/* 801D4BEC 48 00 00 08 */ b lbl_801D4BF4 -lbl_801D4BF0: -/* 801D4BF0 FF E0 00 90 */ fmr f31, f0 -lbl_801D4BF4: -/* 801D4BF4 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 801D4BF8 40 81 00 08 */ ble lbl_801D4C00 -/* 801D4BFC 48 00 00 08 */ b lbl_801D4C04 -lbl_801D4C00: -/* 801D4C00 FF A0 00 90 */ fmr f29, f0 -lbl_801D4C04: -/* 801D4C04 7F A3 EB 78 */ mr r3, r29 -/* 801D4C08 81 9D 00 00 */ lwz r12, 0(r29) -/* 801D4C0C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D4C10 7D 89 03 A6 */ mtctr r12 -/* 801D4C14 4E 80 04 21 */ bctrl -/* 801D4C18 FF C0 08 90 */ fmr f30, f1 -/* 801D4C1C FC 1E F8 40 */ fcmpo cr0, f30, f31 -/* 801D4C20 4C 41 13 82 */ cror 2, 1, 2 -/* 801D4C24 40 82 00 C4 */ bne lbl_801D4CE8 -/* 801D4C28 7F A3 EB 78 */ mr r3, r29 -/* 801D4C2C 81 9D 00 00 */ lwz r12, 0(r29) -/* 801D4C30 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D4C34 7D 89 03 A6 */ mtctr r12 -/* 801D4C38 4E 80 04 21 */ bctrl -/* 801D4C3C 7C 7E 1B 78 */ mr r30, r3 -/* 801D4C40 C0 3F 0F E8 */ lfs f1, 0xfe8(r31) -/* 801D4C44 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) -/* 801D4C48 EF 81 00 28 */ fsubs f28, f1, f0 -/* 801D4C4C 7F E3 FB 78 */ mr r3, r31 -/* 801D4C50 4B FF DF FD */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D4C54 FF E0 08 90 */ fmr f31, f1 -/* 801D4C58 7F E3 FB 78 */ mr r3, r31 -/* 801D4C5C 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D4C60 4B FF DF 05 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D4C64 C0 5F 0F A0 */ lfs f2, 0xfa0(r31) -/* 801D4C68 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D4C6C EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D4C70 EC 1F 08 28 */ fsubs f0, f31, f1 -/* 801D4C74 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D4C78 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4C7C EC 5C 00 24 */ fdivs f2, f28, f0 -/* 801D4C80 FC 1E E8 40 */ fcmpo cr0, f30, f29 -/* 801D4C84 40 80 00 14 */ bge lbl_801D4C98 -/* 801D4C88 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4C8C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4C90 C0 23 00 D0 */ lfs f1, 0xd0(r3) -/* 801D4C94 48 00 00 10 */ b lbl_801D4CA4 -lbl_801D4C98: -/* 801D4C98 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4C9C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4CA0 C0 23 00 C0 */ lfs f1, 0xc0(r3) -lbl_801D4CA4: -/* 801D4CA4 C0 02 A8 00 */ lfs f0, lit_4260(r2) -/* 801D4CA8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801D4CAC EC 40 00 B2 */ fmuls f2, f0, f2 -/* 801D4CB0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801D4CB4 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801D4CB8 57 C0 04 38 */ rlwinm r0, r30, 0, 0x10, 0x1c -/* 801D4CBC 7C 64 02 14 */ add r3, r4, r0 -/* 801D4CC0 C0 03 00 04 */ lfs f0, 4(r3) -/* 801D4CC4 EC 62 00 32 */ fmuls f3, f2, f0 -/* 801D4CC8 C0 3F 11 9C */ lfs f1, 0x119c(r31) -/* 801D4CCC 7C 04 04 2E */ lfsx f0, r4, r0 -/* 801D4CD0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D4CD4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4CD8 D0 1F 11 9C */ stfs f0, 0x119c(r31) -/* 801D4CDC C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D4CE0 EC 00 18 2A */ fadds f0, f0, f3 -/* 801D4CE4 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D4CE8: -/* 801D4CE8 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D4CEC C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D4CF0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4CF4 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 801D4CF8 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D4CFC 40 80 00 0C */ bge lbl_801D4D08 -/* 801D4D00 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D4D04 D0 1F 11 9C */ stfs f0, 0x119c(r31) -lbl_801D4D08: -/* 801D4D08 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D4D0C C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D4D10 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4D14 C0 41 00 14 */ lfs f2, 0x14(r1) -/* 801D4D18 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D4D1C 40 81 00 0C */ ble lbl_801D4D28 -/* 801D4D20 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D4D24 D0 1F 11 9C */ stfs f0, 0x119c(r31) -lbl_801D4D28: -/* 801D4D28 C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D4D2C C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D4D30 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4D34 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801D4D38 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D4D3C 40 80 00 0C */ bge lbl_801D4D48 -/* 801D4D40 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D4D44 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D4D48: -/* 801D4D48 C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D4D4C C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D4D50 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4D54 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801D4D58 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 801D4D5C 40 81 00 0C */ ble lbl_801D4D68 -/* 801D4D60 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D4D64 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D4D68: -/* 801D4D68 7F E3 FB 78 */ mr r3, r31 -/* 801D4D6C 4B FF DC C9 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D4D70 7F E3 FB 78 */ mr r3, r31 -/* 801D4D74 4B FF DC 45 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv -/* 801D4D78 7F E3 FB 78 */ mr r3, r31 -/* 801D4D7C C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D4D80 C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D4D84 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D4D88 C0 1F 0F C8 */ lfs f0, 0xfc8(r31) -/* 801D4D8C EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D4D90 C0 5F 11 90 */ lfs f2, 0x1190(r31) -/* 801D4D94 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D4D98 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D4D9C C0 1F 0F CC */ lfs f0, 0xfcc(r31) -/* 801D4DA0 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D4DA4 38 81 00 0C */ addi r4, r1, 0xc -/* 801D4DA8 38 A1 00 08 */ addi r5, r1, 8 -/* 801D4DAC 4B FF BF 6D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D4DB0 38 00 00 FF */ li r0, 0xff -/* 801D4DB4 98 1F 12 26 */ stb r0, 0x1226(r31) -/* 801D4DB8 8B BF 12 27 */ lbz r29, 0x1227(r31) -/* 801D4DBC 2C 1D 00 FF */ cmpwi r29, 0xff -/* 801D4DC0 41 82 00 88 */ beq lbl_801D4E48 -/* 801D4DC4 2C 1D 00 07 */ cmpwi r29, 7 -/* 801D4DC8 41 82 00 80 */ beq lbl_801D4E48 -/* 801D4DCC 57 BE 10 3A */ slwi r30, r29, 2 -/* 801D4DD0 7C 7F F2 14 */ add r3, r31, r30 -/* 801D4DD4 80 63 0C B4 */ lwz r3, 0xcb4(r3) -/* 801D4DD8 38 80 00 00 */ li r4, 0 -/* 801D4DDC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4DE0 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801D4DE4 7D 89 03 A6 */ mtctr r12 -/* 801D4DE8 4E 80 04 21 */ bctrl -/* 801D4DEC 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801D4DF0 C0 DF 0F 9C */ lfs f6, 0xf9c(r31) -/* 801D4DF4 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801D4DF8 C0 41 00 08 */ lfs f2, 8(r1) -/* 801D4DFC C0 9F 0F BC */ lfs f4, 0xfbc(r31) -/* 801D4E00 7C 9F F2 14 */ add r4, r31, r30 -/* 801D4E04 C0 64 0E 8C */ lfs f3, 0xe8c(r4) -/* 801D4E08 C0 04 0F 0C */ lfs f0, 0xf0c(r4) -/* 801D4E0C EC 03 00 2A */ fadds f0, f3, f0 -/* 801D4E10 EC 64 00 2A */ fadds f3, f4, f0 -/* 801D4E14 C0 BF 0F C0 */ lfs f5, 0xfc0(r31) -/* 801D4E18 C0 84 0E AC */ lfs f4, 0xeac(r4) -/* 801D4E1C C0 04 0F 2C */ lfs f0, 0xf2c(r4) -/* 801D4E20 EC 04 00 2A */ fadds f0, f4, f0 -/* 801D4E24 EC 85 00 2A */ fadds f4, f5, f0 -/* 801D4E28 C0 04 0E CC */ lfs f0, 0xecc(r4) -/* 801D4E2C EC A0 01 B2 */ fmuls f5, f0, f6 -/* 801D4E30 C0 04 0E EC */ lfs f0, 0xeec(r4) -/* 801D4E34 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D4E38 48 04 94 D1 */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG -/* 801D4E3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D4E40 41 82 00 08 */ beq lbl_801D4E48 -/* 801D4E44 9B BF 12 26 */ stb r29, 0x1226(r31) -lbl_801D4E48: -/* 801D4E48 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 801D4E4C CB E1 00 60 */ lfd f31, 0x60(r1) -/* 801D4E50 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 801D4E54 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 801D4E58 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 801D4E5C CB A1 00 40 */ lfd f29, 0x40(r1) -/* 801D4E60 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 801D4E64 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 801D4E68 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4E6C 48 18 D3 BD */ bl _restgpr_29 -/* 801D4E70 80 01 00 74 */ lwz r0, 0x74(r1) -/* 801D4E74 7C 08 03 A6 */ mtlr r0 -/* 801D4E78 38 21 00 70 */ addi r1, r1, 0x70 -/* 801D4E7C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/regionOriginDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/regionOriginDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 67ea28f94c..0000000000 --- a/asm/d/menu/d_menu_fmap2D/regionOriginDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801D3AF8: -/* 801D3AF8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D3AFC 7C 08 02 A6 */ mflr r0 -/* 801D3B00 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D3B04 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3B08 48 18 E6 D5 */ bl _savegpr_29 -/* 801D3B0C 7C 7D 1B 78 */ mr r29, r3 -/* 801D3B10 3B C0 00 00 */ li r30, 0 -/* 801D3B14 3B E0 00 00 */ li r31, 0 -lbl_801D3B18: -/* 801D3B18 7C 9D FA 14 */ add r4, r29, r31 -/* 801D3B1C 80 04 0C B4 */ lwz r0, 0xcb4(r4) -/* 801D3B20 28 00 00 00 */ cmplwi r0, 0 -/* 801D3B24 41 82 00 70 */ beq lbl_801D3B94 -/* 801D3B28 7F A3 EB 78 */ mr r3, r29 -/* 801D3B2C C0 24 10 04 */ lfs f1, 0x1004(r4) -/* 801D3B30 C0 1D 0F C8 */ lfs f0, 0xfc8(r29) -/* 801D3B34 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D3B38 C0 44 10 24 */ lfs f2, 0x1024(r4) -/* 801D3B3C C0 1D 0F CC */ lfs f0, 0xfcc(r29) -/* 801D3B40 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D3B44 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D3B48 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D3B4C 4B FF D1 CD */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3B50 38 60 00 FF */ li r3, 0xff -/* 801D3B54 98 61 00 08 */ stb r3, 8(r1) -/* 801D3B58 38 00 00 00 */ li r0, 0 -/* 801D3B5C 98 01 00 09 */ stb r0, 9(r1) -/* 801D3B60 98 01 00 0A */ stb r0, 0xa(r1) -/* 801D3B64 98 61 00 0B */ stb r3, 0xb(r1) -/* 801D3B68 80 01 00 08 */ lwz r0, 8(r1) -/* 801D3B6C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D3B70 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801D3B74 C0 42 A7 F0 */ lfs f2, lit_4204(r2) -/* 801D3B78 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801D3B7C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801D3B80 EC 40 10 28 */ fsubs f2, f0, f2 -/* 801D3B84 C0 62 A7 F4 */ lfs f3, lit_4205(r2) -/* 801D3B88 FC 80 18 90 */ fmr f4, f3 -/* 801D3B8C 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3B90 48 11 5F 35 */ bl J2DFillBox__FffffQ28JUtility6TColor -lbl_801D3B94: -/* 801D3B94 3B DE 00 01 */ addi r30, r30, 1 -/* 801D3B98 2C 1E 00 08 */ cmpwi r30, 8 -/* 801D3B9C 3B FF 00 04 */ addi r31, r31, 4 -/* 801D3BA0 41 80 FF 78 */ blt lbl_801D3B18 -/* 801D3BA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3BA8 48 18 E6 81 */ bl _restgpr_29 -/* 801D3BAC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D3BB0 7C 08 03 A6 */ mtlr r0 -/* 801D3BB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3BB8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/regionTextureDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/regionTextureDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 7e780a3c69..0000000000 --- a/asm/d/menu/d_menu_fmap2D/regionTextureDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,197 +0,0 @@ -lbl_801D2DA8: -/* 801D2DA8 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 801D2DAC 7C 08 02 A6 */ mflr r0 -/* 801D2DB0 90 01 00 84 */ stw r0, 0x84(r1) -/* 801D2DB4 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 801D2DB8 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 801D2DBC DB C1 00 60 */ stfd f30, 0x60(r1) -/* 801D2DC0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 801D2DC4 39 61 00 60 */ addi r11, r1, 0x60 -/* 801D2DC8 48 18 F4 05 */ bl _savegpr_25 -/* 801D2DCC 7C 7E 1B 78 */ mr r30, r3 -/* 801D2DD0 4B FF FB 01 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D2DD4 FF C0 08 90 */ fmr f30, f1 -/* 801D2DD8 7F C3 F3 78 */ mr r3, r30 -/* 801D2DDC 4B FF FA A5 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D2DE0 7F C3 F3 78 */ mr r3, r30 -/* 801D2DE4 FC 40 F0 90 */ fmr f2, f30 -/* 801D2DE8 38 81 00 2C */ addi r4, r1, 0x2c -/* 801D2DEC 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801D2DF0 4B FF E1 8D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D2DF4 7F C3 F3 78 */ mr r3, r30 -/* 801D2DF8 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 801D2DFC C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D2E00 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D2E04 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 801D2E08 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D2E0C EC 42 00 2A */ fadds f2, f2, f0 -/* 801D2E10 38 81 00 24 */ addi r4, r1, 0x24 -/* 801D2E14 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801D2E18 4B FF DF 01 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D2E1C 7F C3 F3 78 */ mr r3, r30 -/* 801D2E20 4B FF FA 61 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D2E24 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 801D2E28 EF E1 00 28 */ fsubs f31, f1, f0 -/* 801D2E2C 7F C3 F3 78 */ mr r3, r30 -/* 801D2E30 4B FF FA A1 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D2E34 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 801D2E38 EF C1 00 28 */ fsubs f30, f1, f0 -/* 801D2E3C 8B BE 12 27 */ lbz r29, 0x1227(r30) -/* 801D2E40 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D2E44 C0 1E 0F A0 */ lfs f0, 0xfa0(r30) -/* 801D2E48 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D2E4C 40 82 00 0C */ bne lbl_801D2E58 -/* 801D2E50 8B FE 12 26 */ lbz r31, 0x1226(r30) -/* 801D2E54 48 00 00 08 */ b lbl_801D2E5C -lbl_801D2E58: -/* 801D2E58 7F BF EB 78 */ mr r31, r29 -lbl_801D2E5C: -/* 801D2E5C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D2E60 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D2E64 88 03 03 02 */ lbz r0, 0x302(r3) -/* 801D2E68 28 00 00 00 */ cmplwi r0, 0 -/* 801D2E6C 41 82 02 00 */ beq lbl_801D306C -/* 801D2E70 3B 40 00 00 */ li r26, 0 -/* 801D2E74 57 A0 10 3A */ slwi r0, r29, 2 -/* 801D2E78 7F 9E 02 14 */ add r28, r30, r0 -lbl_801D2E7C: -/* 801D2E7C 38 1A 12 30 */ addi r0, r26, 0x1230 -/* 801D2E80 7F 3E 00 AE */ lbzx r25, r30, r0 -/* 801D2E84 2C 19 00 FF */ cmpwi r25, 0xff -/* 801D2E88 41 82 01 D8 */ beq lbl_801D3060 -/* 801D2E8C 57 20 10 3A */ slwi r0, r25, 2 -/* 801D2E90 7F 7E 02 14 */ add r27, r30, r0 -/* 801D2E94 80 1B 0C B4 */ lwz r0, 0xcb4(r27) -/* 801D2E98 28 00 00 00 */ cmplwi r0, 0 -/* 801D2E9C 41 82 01 C4 */ beq lbl_801D3060 -/* 801D2EA0 7F C3 F3 78 */ mr r3, r30 -/* 801D2EA4 7F 24 CB 78 */ mr r4, r25 -/* 801D2EA8 4B FF F6 61 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi -/* 801D2EAC 2C 03 00 00 */ cmpwi r3, 0 -/* 801D2EB0 41 82 00 74 */ beq lbl_801D2F24 -/* 801D2EB4 7C 19 F8 00 */ cmpw r25, r31 -/* 801D2EB8 41 82 00 38 */ beq lbl_801D2EF0 -/* 801D2EBC 80 1E 11 FC */ lwz r0, 0x11fc(r30) -/* 801D2EC0 90 01 00 18 */ stw r0, 0x18(r1) -/* 801D2EC4 80 1E 11 F8 */ lwz r0, 0x11f8(r30) -/* 801D2EC8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801D2ECC 80 7B 0C B4 */ lwz r3, 0xcb4(r27) -/* 801D2ED0 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D2ED4 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D2ED8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2EDC 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D2EE0 7D 89 03 A6 */ mtctr r12 -/* 801D2EE4 4E 80 04 21 */ bctrl -/* 801D2EE8 C0 7E 12 14 */ lfs f3, 0x1214(r30) -/* 801D2EEC 48 00 00 68 */ b lbl_801D2F54 -lbl_801D2EF0: -/* 801D2EF0 80 1E 11 F4 */ lwz r0, 0x11f4(r30) -/* 801D2EF4 90 01 00 10 */ stw r0, 0x10(r1) -/* 801D2EF8 80 1E 11 F0 */ lwz r0, 0x11f0(r30) -/* 801D2EFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D2F00 80 7B 0C B4 */ lwz r3, 0xcb4(r27) -/* 801D2F04 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D2F08 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D2F0C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2F10 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D2F14 7D 89 03 A6 */ mtctr r12 -/* 801D2F18 4E 80 04 21 */ bctrl -/* 801D2F1C C0 7E 12 10 */ lfs f3, 0x1210(r30) -/* 801D2F20 48 00 00 34 */ b lbl_801D2F54 -lbl_801D2F24: -/* 801D2F24 80 1E 12 04 */ lwz r0, 0x1204(r30) -/* 801D2F28 90 01 00 08 */ stw r0, 8(r1) -/* 801D2F2C 80 1E 12 00 */ lwz r0, 0x1200(r30) -/* 801D2F30 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D2F34 80 7B 0C B4 */ lwz r3, 0xcb4(r27) -/* 801D2F38 38 81 00 0C */ addi r4, r1, 0xc -/* 801D2F3C 38 A1 00 08 */ addi r5, r1, 8 -/* 801D2F40 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2F44 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801D2F48 7D 89 03 A6 */ mtctr r12 -/* 801D2F4C 4E 80 04 21 */ bctrl -/* 801D2F50 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -lbl_801D2F54: -/* 801D2F54 80 7B 0C B4 */ lwz r3, 0xcb4(r27) -/* 801D2F58 C0 5E 0F A4 */ lfs f2, 0xfa4(r30) -/* 801D2F5C C0 22 A7 E4 */ lfs f1, lit_4201(r2) -/* 801D2F60 C0 1E 0F C4 */ lfs f0, 0xfc4(r30) -/* 801D2F64 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D2F68 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 801D2F6C EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D2F70 FC 00 00 1E */ fctiwz f0, f0 -/* 801D2F74 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 801D2F78 80 81 00 34 */ lwz r4, 0x34(r1) -/* 801D2F7C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2F80 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D2F84 7D 89 03 A6 */ mtctr r12 -/* 801D2F88 4E 80 04 21 */ bctrl -/* 801D2F8C 7C 19 E8 00 */ cmpw r25, r29 -/* 801D2F90 41 82 00 6C */ beq lbl_801D2FFC -/* 801D2F94 C0 9E 0F 9C */ lfs f4, 0xf9c(r30) -/* 801D2F98 80 7B 0C B4 */ lwz r3, 0xcb4(r27) -/* 801D2F9C C0 5E 0F BC */ lfs f2, 0xfbc(r30) -/* 801D2FA0 C0 3B 0E 8C */ lfs f1, 0xe8c(r27) -/* 801D2FA4 C0 1B 0F 0C */ lfs f0, 0xf0c(r27) -/* 801D2FA8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D2FAC EC 1F 00 2A */ fadds f0, f31, f0 -/* 801D2FB0 EC 22 00 2A */ fadds f1, f2, f0 -/* 801D2FB4 C0 7E 0F C0 */ lfs f3, 0xfc0(r30) -/* 801D2FB8 C0 5B 0E AC */ lfs f2, 0xeac(r27) -/* 801D2FBC C0 1B 0F 2C */ lfs f0, 0xf2c(r27) -/* 801D2FC0 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D2FC4 EC 1E 00 2A */ fadds f0, f30, f0 -/* 801D2FC8 EC 43 00 2A */ fadds f2, f3, f0 -/* 801D2FCC C0 1B 0E CC */ lfs f0, 0xecc(r27) -/* 801D2FD0 EC 60 01 32 */ fmuls f3, f0, f4 -/* 801D2FD4 C0 1B 0E EC */ lfs f0, 0xeec(r27) -/* 801D2FD8 EC 80 01 32 */ fmuls f4, f0, f4 -/* 801D2FDC 38 80 00 00 */ li r4, 0 -/* 801D2FE0 38 A0 00 00 */ li r5, 0 -/* 801D2FE4 38 C0 00 00 */ li r6, 0 -/* 801D2FE8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D2FEC 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801D2FF0 7D 89 03 A6 */ mtctr r12 -/* 801D2FF4 4E 80 04 21 */ bctrl -/* 801D2FF8 48 00 00 68 */ b lbl_801D3060 -lbl_801D2FFC: -/* 801D2FFC C0 9E 0F 9C */ lfs f4, 0xf9c(r30) -/* 801D3000 80 7C 0C B4 */ lwz r3, 0xcb4(r28) -/* 801D3004 C0 5E 0F BC */ lfs f2, 0xfbc(r30) -/* 801D3008 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) -/* 801D300C C0 1C 0F 0C */ lfs f0, 0xf0c(r28) -/* 801D3010 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D3014 EC 1F 00 2A */ fadds f0, f31, f0 -/* 801D3018 EC 22 00 2A */ fadds f1, f2, f0 -/* 801D301C C0 7E 0F C0 */ lfs f3, 0xfc0(r30) -/* 801D3020 C0 5C 0E AC */ lfs f2, 0xeac(r28) -/* 801D3024 C0 1C 0F 2C */ lfs f0, 0xf2c(r28) -/* 801D3028 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D302C EC 1E 00 2A */ fadds f0, f30, f0 -/* 801D3030 EC 43 00 2A */ fadds f2, f3, f0 -/* 801D3034 C0 1C 0E CC */ lfs f0, 0xecc(r28) -/* 801D3038 EC 60 01 32 */ fmuls f3, f0, f4 -/* 801D303C C0 1C 0E EC */ lfs f0, 0xeec(r28) -/* 801D3040 EC 80 01 32 */ fmuls f4, f0, f4 -/* 801D3044 38 80 00 00 */ li r4, 0 -/* 801D3048 38 A0 00 00 */ li r5, 0 -/* 801D304C 38 C0 00 00 */ li r6, 0 -/* 801D3050 81 83 00 00 */ lwz r12, 0(r3) -/* 801D3054 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801D3058 7D 89 03 A6 */ mtctr r12 -/* 801D305C 4E 80 04 21 */ bctrl -lbl_801D3060: -/* 801D3060 3B 5A 00 01 */ addi r26, r26, 1 -/* 801D3064 2C 1A 00 08 */ cmpwi r26, 8 -/* 801D3068 41 80 FE 14 */ blt lbl_801D2E7C -lbl_801D306C: -/* 801D306C E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 801D3070 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 801D3074 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 801D3078 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 801D307C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801D3080 48 18 F1 99 */ bl _restgpr_25 -/* 801D3084 80 01 00 84 */ lwz r0, 0x84(r1) -/* 801D3088 7C 08 03 A6 */ mtlr r0 -/* 801D308C 38 21 00 80 */ addi r1, r1, 0x80 -/* 801D3090 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/scrollAreaDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/scrollAreaDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 98f5de0254..0000000000 --- a/asm/d/menu/d_menu_fmap2D/scrollAreaDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_801D38FC: -/* 801D38FC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 801D3900 7C 08 02 A6 */ mflr r0 -/* 801D3904 90 01 00 84 */ stw r0, 0x84(r1) -/* 801D3908 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 801D390C F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 801D3910 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 801D3914 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 801D3918 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 801D391C F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 801D3920 39 61 00 50 */ addi r11, r1, 0x50 -/* 801D3924 48 18 E8 B5 */ bl _savegpr_28 -/* 801D3928 7C 7E 1B 78 */ mr r30, r3 -/* 801D392C 3B E0 00 00 */ li r31, 0 -/* 801D3930 3B A0 00 00 */ li r29, 0 -/* 801D3934 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D3938 3B 83 FC 60 */ addi r28, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D393C C3 E2 A7 D0 */ lfs f31, lit_3970(r2) -lbl_801D3940: -/* 801D3940 C0 1E 0F A0 */ lfs f0, 0xfa0(r30) -/* 801D3944 FC 1F 00 00 */ fcmpu cr0, f31, f0 -/* 801D3948 41 82 00 10 */ beq lbl_801D3958 -/* 801D394C 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D3950 7C 1F 00 00 */ cmpw r31, r0 -/* 801D3954 40 82 01 64 */ bne lbl_801D3AB8 -lbl_801D3958: -/* 801D3958 88 1C 03 06 */ lbz r0, 0x306(r28) -/* 801D395C 28 00 00 00 */ cmplwi r0, 0 -/* 801D3960 41 82 00 24 */ beq lbl_801D3984 -/* 801D3964 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D3968 38 03 FC 60 */ addi r0, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D396C 7C 60 EA 14 */ add r3, r0, r29 -/* 801D3970 C0 23 01 CC */ lfs f1, 0x1cc(r3) -/* 801D3974 C0 43 01 EC */ lfs f2, 0x1ec(r3) -/* 801D3978 C3 C3 02 0C */ lfs f30, 0x20c(r3) -/* 801D397C C3 A3 02 2C */ lfs f29, 0x22c(r3) -/* 801D3980 48 00 00 18 */ b lbl_801D3998 -lbl_801D3984: -/* 801D3984 7C 7E EA 14 */ add r3, r30, r29 -/* 801D3988 C0 23 0D 8C */ lfs f1, 0xd8c(r3) -/* 801D398C C0 43 0D AC */ lfs f2, 0xdac(r3) -/* 801D3990 C3 C3 0D CC */ lfs f30, 0xdcc(r3) -/* 801D3994 C3 A3 0D EC */ lfs f29, 0xdec(r3) -lbl_801D3998: -/* 801D3998 7F C3 F3 78 */ mr r3, r30 -/* 801D399C C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D39A0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D39A4 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D39A8 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D39AC 38 81 00 34 */ addi r4, r1, 0x34 -/* 801D39B0 38 A1 00 30 */ addi r5, r1, 0x30 -/* 801D39B4 4B FF D3 65 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D39B8 7F C3 F3 78 */ mr r3, r30 -/* 801D39BC C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D39C0 EC 3E 00 28 */ fsubs f1, f30, f0 -/* 801D39C4 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D39C8 EC 5D 00 28 */ fsubs f2, f29, f0 -/* 801D39CC 38 81 00 2C */ addi r4, r1, 0x2c -/* 801D39D0 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801D39D4 4B FF D3 45 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D39D8 38 00 00 FF */ li r0, 0xff -/* 801D39DC 98 01 00 20 */ stb r0, 0x20(r1) -/* 801D39E0 98 01 00 21 */ stb r0, 0x21(r1) -/* 801D39E4 98 01 00 22 */ stb r0, 0x22(r1) -/* 801D39E8 98 01 00 23 */ stb r0, 0x23(r1) -/* 801D39EC 80 01 00 20 */ lwz r0, 0x20(r1) -/* 801D39F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D39F4 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 801D39F8 C0 41 00 30 */ lfs f2, 0x30(r1) -/* 801D39FC FC 60 08 90 */ fmr f3, f1 -/* 801D3A00 C0 81 00 28 */ lfs f4, 0x28(r1) -/* 801D3A04 38 61 00 24 */ addi r3, r1, 0x24 -/* 801D3A08 38 80 00 06 */ li r4, 6 -/* 801D3A0C 48 11 5F 8D */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3A10 38 00 00 FF */ li r0, 0xff -/* 801D3A14 98 01 00 18 */ stb r0, 0x18(r1) -/* 801D3A18 98 01 00 19 */ stb r0, 0x19(r1) -/* 801D3A1C 98 01 00 1A */ stb r0, 0x1a(r1) -/* 801D3A20 98 01 00 1B */ stb r0, 0x1b(r1) -/* 801D3A24 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D3A28 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801D3A2C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 801D3A30 C0 41 00 30 */ lfs f2, 0x30(r1) -/* 801D3A34 FC 60 08 90 */ fmr f3, f1 -/* 801D3A38 C0 81 00 28 */ lfs f4, 0x28(r1) -/* 801D3A3C 38 61 00 1C */ addi r3, r1, 0x1c -/* 801D3A40 38 80 00 06 */ li r4, 6 -/* 801D3A44 48 11 5F 55 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3A48 38 00 00 FF */ li r0, 0xff -/* 801D3A4C 98 01 00 10 */ stb r0, 0x10(r1) -/* 801D3A50 98 01 00 11 */ stb r0, 0x11(r1) -/* 801D3A54 98 01 00 12 */ stb r0, 0x12(r1) -/* 801D3A58 98 01 00 13 */ stb r0, 0x13(r1) -/* 801D3A5C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D3A60 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D3A64 C0 41 00 30 */ lfs f2, 0x30(r1) -/* 801D3A68 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 801D3A6C C0 61 00 2C */ lfs f3, 0x2c(r1) -/* 801D3A70 FC 80 10 90 */ fmr f4, f2 -/* 801D3A74 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D3A78 38 80 00 06 */ li r4, 6 -/* 801D3A7C 48 11 5F 1D */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3A80 38 00 00 FF */ li r0, 0xff -/* 801D3A84 98 01 00 08 */ stb r0, 8(r1) -/* 801D3A88 98 01 00 09 */ stb r0, 9(r1) -/* 801D3A8C 98 01 00 0A */ stb r0, 0xa(r1) -/* 801D3A90 98 01 00 0B */ stb r0, 0xb(r1) -/* 801D3A94 80 01 00 08 */ lwz r0, 8(r1) -/* 801D3A98 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D3A9C C0 41 00 28 */ lfs f2, 0x28(r1) -/* 801D3AA0 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 801D3AA4 C0 61 00 2C */ lfs f3, 0x2c(r1) -/* 801D3AA8 FC 80 10 90 */ fmr f4, f2 -/* 801D3AAC 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3AB0 38 80 00 06 */ li r4, 6 -/* 801D3AB4 48 11 5E E5 */ bl J2DDrawLine__FffffQ28JUtility6TColori -lbl_801D3AB8: -/* 801D3AB8 3B FF 00 01 */ addi r31, r31, 1 -/* 801D3ABC 2C 1F 00 08 */ cmpwi r31, 8 -/* 801D3AC0 3B BD 00 04 */ addi r29, r29, 4 -/* 801D3AC4 41 80 FE 7C */ blt lbl_801D3940 -/* 801D3AC8 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 801D3ACC CB E1 00 70 */ lfd f31, 0x70(r1) -/* 801D3AD0 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 801D3AD4 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 801D3AD8 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 801D3ADC CB A1 00 50 */ lfd f29, 0x50(r1) -/* 801D3AE0 39 61 00 50 */ addi r11, r1, 0x50 -/* 801D3AE4 48 18 E7 41 */ bl _restgpr_28 -/* 801D3AE8 80 01 00 84 */ lwz r0, 0x84(r1) -/* 801D3AEC 7C 08 03 A6 */ mtlr r0 -/* 801D3AF0 38 21 00 80 */ addi r1, r1, 0x80 -/* 801D3AF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/scrollCalc__18dMenu_Fmap2DBack_cFf.s b/asm/d/menu/d_menu_fmap2D/scrollCalc__18dMenu_Fmap2DBack_cFf.s deleted file mode 100644 index 63b1d9dd12..0000000000 --- a/asm/d/menu/d_menu_fmap2D/scrollCalc__18dMenu_Fmap2DBack_cFf.s +++ /dev/null @@ -1,178 +0,0 @@ -lbl_801D1AA4: -/* 801D1AA4 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 801D1AA8 7C 08 02 A6 */ mflr r0 -/* 801D1AAC 90 01 00 84 */ stw r0, 0x84(r1) -/* 801D1AB0 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 801D1AB4 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 801D1AB8 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 801D1ABC F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 801D1AC0 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 801D1AC4 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 801D1AC8 DB 81 00 40 */ stfd f28, 0x40(r1) -/* 801D1ACC F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */ -/* 801D1AD0 DB 61 00 30 */ stfd f27, 0x30(r1) -/* 801D1AD4 F3 61 00 38 */ psq_st f27, 56(r1), 0, 0 /* qr0 */ -/* 801D1AD8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801D1ADC 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801D1AE0 7C 7E 1B 78 */ mr r30, r3 -/* 801D1AE4 FF 60 08 90 */ fmr f27, f1 -/* 801D1AE8 88 83 12 27 */ lbz r4, 0x1227(r3) -/* 801D1AEC 54 9F 10 3A */ slwi r31, r4, 2 -/* 801D1AF0 48 00 10 75 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D1AF4 FC A0 08 90 */ fmr f5, f1 -/* 801D1AF8 7F C3 F3 78 */ mr r3, r30 -/* 801D1AFC C0 3E 11 8C */ lfs f1, 0x118c(r30) -/* 801D1B00 C0 1E 11 9C */ lfs f0, 0x119c(r30) -/* 801D1B04 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1B08 C0 5E 11 90 */ lfs f2, 0x1190(r30) -/* 801D1B0C C0 1E 11 A0 */ lfs f0, 0x11a0(r30) -/* 801D1B10 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D1B14 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D1B18 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D1B1C 7C DE FA 14 */ add r6, r30, r31 -/* 801D1B20 C0 66 0F 4C */ lfs f3, 0xf4c(r6) -/* 801D1B24 C0 86 0F 6C */ lfs f4, 0xf6c(r6) -/* 801D1B28 4B FF F2 D9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff -/* 801D1B2C 7F C3 F3 78 */ mr r3, r30 -/* 801D1B30 48 00 0B 49 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D1B34 FF C0 08 90 */ fmr f30, f1 -/* 801D1B38 7F C3 F3 78 */ mr r3, r30 -/* 801D1B3C 48 00 0B 8D */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D1B40 FF E0 08 90 */ fmr f31, f1 -/* 801D1B44 7F C3 F3 78 */ mr r3, r30 -/* 801D1B48 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801D1B4C EC 1E 08 28 */ fsubs f0, f30, f1 -/* 801D1B50 EC 1B 00 32 */ fmuls f0, f27, f0 -/* 801D1B54 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1B58 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801D1B5C EC 1F 10 28 */ fsubs f0, f31, f2 -/* 801D1B60 EC 1B 00 32 */ fmuls f0, f27, f0 -/* 801D1B64 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D1B68 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D1B6C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D1B70 4B FF F4 0D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D1B74 C0 3E 11 8C */ lfs f1, 0x118c(r30) -/* 801D1B78 C0 1E 11 9C */ lfs f0, 0x119c(r30) -/* 801D1B7C EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1B80 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801D1B84 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1B88 D0 1E 0F C8 */ stfs f0, 0xfc8(r30) -/* 801D1B8C C0 3E 11 90 */ lfs f1, 0x1190(r30) -/* 801D1B90 C0 1E 11 A0 */ lfs f0, 0x11a0(r30) -/* 801D1B94 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1B98 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801D1B9C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1BA0 D0 1E 0F CC */ stfs f0, 0xfcc(r30) -/* 801D1BA4 C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D1BA8 D0 1E 11 AC */ stfs f0, 0x11ac(r30) -/* 801D1BAC C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D1BB0 D0 1E 11 B0 */ stfs f0, 0x11b0(r30) -/* 801D1BB4 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D1BB8 C0 5E 11 A4 */ lfs f2, 0x11a4(r30) -/* 801D1BBC FC 01 10 00 */ fcmpu cr0, f1, f2 -/* 801D1BC0 40 82 00 10 */ bne lbl_801D1BD0 -/* 801D1BC4 C0 1E 11 A8 */ lfs f0, 0x11a8(r30) -/* 801D1BC8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D1BCC 41 82 01 00 */ beq lbl_801D1CCC -lbl_801D1BD0: -/* 801D1BD0 C0 3E 0F A0 */ lfs f1, 0xfa0(r30) -/* 801D1BD4 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D1BD8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D1BDC 40 81 00 F0 */ ble lbl_801D1CCC -/* 801D1BE0 C0 02 A7 EC */ lfs f0, lit_4203(r2) -/* 801D1BE4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D1BE8 40 80 00 E4 */ bge lbl_801D1CCC -/* 801D1BEC EC 60 08 28 */ fsubs f3, f0, f1 -/* 801D1BF0 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D1BF4 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D1BF8 41 82 00 08 */ beq lbl_801D1C00 -/* 801D1BFC EF A2 00 F2 */ fmuls f29, f2, f3 -lbl_801D1C00: -/* 801D1C00 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D1C04 C0 3E 11 A8 */ lfs f1, 0x11a8(r30) -/* 801D1C08 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D1C0C 41 82 00 08 */ beq lbl_801D1C14 -/* 801D1C10 EF 81 00 F2 */ fmuls f28, f1, f3 -lbl_801D1C14: -/* 801D1C14 88 9E 12 27 */ lbz r4, 0x1227(r30) -/* 801D1C18 54 9F 10 3A */ slwi r31, r4, 2 -/* 801D1C1C 7F C3 F3 78 */ mr r3, r30 -/* 801D1C20 48 00 0F 45 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D1C24 FC A0 08 90 */ fmr f5, f1 -/* 801D1C28 7F C3 F3 78 */ mr r3, r30 -/* 801D1C2C C0 3E 11 8C */ lfs f1, 0x118c(r30) -/* 801D1C30 C0 1E 11 9C */ lfs f0, 0x119c(r30) -/* 801D1C34 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1C38 EC 3D 00 2A */ fadds f1, f29, f0 -/* 801D1C3C C0 5E 11 90 */ lfs f2, 0x1190(r30) -/* 801D1C40 C0 1E 11 A0 */ lfs f0, 0x11a0(r30) -/* 801D1C44 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D1C48 EC 5C 00 2A */ fadds f2, f28, f0 -/* 801D1C4C 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D1C50 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D1C54 7C DE FA 14 */ add r6, r30, r31 -/* 801D1C58 C0 66 0F 4C */ lfs f3, 0xf4c(r6) -/* 801D1C5C C0 86 0F 6C */ lfs f4, 0xf6c(r6) -/* 801D1C60 4B FF F1 A1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff -/* 801D1C64 7F C3 F3 78 */ mr r3, r30 -/* 801D1C68 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801D1C6C EC 1E 08 28 */ fsubs f0, f30, f1 -/* 801D1C70 EC 1B 00 32 */ fmuls f0, f27, f0 -/* 801D1C74 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1C78 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801D1C7C EC 1F 10 28 */ fsubs f0, f31, f2 -/* 801D1C80 EC 1B 00 32 */ fmuls f0, f27, f0 -/* 801D1C84 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D1C88 38 81 00 0C */ addi r4, r1, 0xc -/* 801D1C8C 38 A1 00 08 */ addi r5, r1, 8 -/* 801D1C90 4B FF F2 ED */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D1C94 C0 3E 11 8C */ lfs f1, 0x118c(r30) -/* 801D1C98 C0 1E 11 9C */ lfs f0, 0x119c(r30) -/* 801D1C9C EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1CA0 EC 3D 00 2A */ fadds f1, f29, f0 -/* 801D1CA4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801D1CA8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1CAC D0 1E 11 AC */ stfs f0, 0x11ac(r30) -/* 801D1CB0 C0 3E 11 90 */ lfs f1, 0x1190(r30) -/* 801D1CB4 C0 1E 11 A0 */ lfs f0, 0x11a0(r30) -/* 801D1CB8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D1CBC EC 3C 00 2A */ fadds f1, f28, f0 -/* 801D1CC0 C0 01 00 08 */ lfs f0, 8(r1) -/* 801D1CC4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1CC8 D0 1E 11 B0 */ stfs f0, 0x11b0(r30) -lbl_801D1CCC: -/* 801D1CCC C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D1CD0 FC 00 D8 00 */ fcmpu cr0, f0, f27 -/* 801D1CD4 40 82 00 18 */ bne lbl_801D1CEC -/* 801D1CD8 D0 1E 0F D4 */ stfs f0, 0xfd4(r30) -/* 801D1CDC D0 1E 0F D0 */ stfs f0, 0xfd0(r30) -/* 801D1CE0 D0 1E 0F DC */ stfs f0, 0xfdc(r30) -/* 801D1CE4 D0 1E 0F D8 */ stfs f0, 0xfd8(r30) -/* 801D1CE8 48 00 00 20 */ b lbl_801D1D08 -lbl_801D1CEC: -/* 801D1CEC C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D1CF0 FC 00 D8 00 */ fcmpu cr0, f0, f27 -/* 801D1CF4 40 82 00 14 */ bne lbl_801D1D08 -/* 801D1CF8 C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D1CFC D0 1E 0F D0 */ stfs f0, 0xfd0(r30) -/* 801D1D00 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D1D04 D0 1E 0F D4 */ stfs f0, 0xfd4(r30) -lbl_801D1D08: -/* 801D1D08 7F C3 F3 78 */ mr r3, r30 -/* 801D1D0C 48 00 0C AD */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv -/* 801D1D10 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 801D1D14 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 801D1D18 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 801D1D1C CB C1 00 60 */ lfd f30, 0x60(r1) -/* 801D1D20 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 801D1D24 CB A1 00 50 */ lfd f29, 0x50(r1) -/* 801D1D28 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */ -/* 801D1D2C CB 81 00 40 */ lfd f28, 0x40(r1) -/* 801D1D30 E3 61 00 38 */ psq_l f27, 56(r1), 0, 0 /* qr0 */ -/* 801D1D34 CB 61 00 30 */ lfd f27, 0x30(r1) -/* 801D1D38 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801D1D3C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 801D1D40 80 01 00 84 */ lwz r0, 0x84(r1) -/* 801D1D44 7C 08 03 A6 */ mtlr r0 -/* 801D1D48 38 21 00 80 */ addi r1, r1, 0x80 -/* 801D1D4C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/set3DStickString__17dMenu_Fmap2DTop_cFUl.s b/asm/d/menu/d_menu_fmap2D/set3DStickString__17dMenu_Fmap2DTop_cFUl.s deleted file mode 100644 index c581b63be8..0000000000 --- a/asm/d/menu/d_menu_fmap2D/set3DStickString__17dMenu_Fmap2DTop_cFUl.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_801D74EC: -/* 801D74EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D74F0 7C 08 02 A6 */ mflr r0 -/* 801D74F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D74F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D74FC 48 18 AC D5 */ bl _savegpr_26 -/* 801D7500 7C 7F 1B 78 */ mr r31, r3 -/* 801D7504 7C 9A 23 79 */ or. r26, r4, r4 -/* 801D7508 40 82 00 8C */ bne lbl_801D7594 -/* 801D750C 3B 60 00 00 */ li r27, 0 -/* 801D7510 3B C0 00 00 */ li r30, 0 -/* 801D7514 3C 60 80 39 */ lis r3, ast_c_6233@ha /* 0x803965A8@ha */ -/* 801D7518 3B A3 65 A8 */ addi r29, r3, ast_c_6233@l /* 0x803965A8@l */ -/* 801D751C 3C 60 80 39 */ lis r3, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D7520 3B 83 65 D0 */ addi r28, r3, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -lbl_801D7524: -/* 801D7524 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D7528 7C 9D F2 14 */ add r4, r29, r30 -/* 801D752C 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7530 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7534 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7538 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D753C 7D 89 03 A6 */ mtctr r12 -/* 801D7540 4E 80 04 21 */ bctrl -/* 801D7544 48 12 91 15 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D7548 38 9C 00 BB */ addi r4, r28, 0xbb -/* 801D754C 48 19 15 E1 */ bl strcpy -/* 801D7550 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D7554 2C 1B 00 05 */ cmpwi r27, 5 -/* 801D7558 3B DE 00 08 */ addi r30, r30, 8 -/* 801D755C 41 80 FF C8 */ blt lbl_801D7524 -/* 801D7560 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D7564 3C 80 73 68 */ lis r4, 0x7368 /* 0x73686130@ha */ -/* 801D7568 38 C4 61 30 */ addi r6, r4, 0x6130 /* 0x73686130@l */ -/* 801D756C 3C 80 00 61 */ lis r4, 0x0061 /* 0x0061735F@ha */ -/* 801D7570 38 A4 73 5F */ addi r5, r4, 0x735F /* 0x0061735F@l */ -/* 801D7574 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7578 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D757C 7D 89 03 A6 */ mtctr r12 -/* 801D7580 4E 80 04 21 */ bctrl -/* 801D7584 38 00 00 01 */ li r0, 1 -/* 801D7588 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D758C 98 1F 00 C3 */ stb r0, 0xc3(r31) -/* 801D7590 48 00 00 98 */ b lbl_801D7628 -lbl_801D7594: -/* 801D7594 3B 60 00 00 */ li r27, 0 -/* 801D7598 3B C0 00 00 */ li r30, 0 -/* 801D759C 3C 60 80 39 */ lis r3, ast_c_6233@ha /* 0x803965A8@ha */ -/* 801D75A0 3B 83 65 A8 */ addi r28, r3, ast_c_6233@l /* 0x803965A8@l */ -/* 801D75A4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D75A8 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801D75AC: -/* 801D75AC 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D75B0 7C 9C F2 14 */ add r4, r28, r30 -/* 801D75B4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D75B8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D75BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D75C0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D75C4 7D 89 03 A6 */ mtctr r12 -/* 801D75C8 4E 80 04 21 */ bctrl -/* 801D75CC 48 12 90 8D */ bl getStringPtr__10J2DTextBoxCFv -/* 801D75D0 7C 65 1B 78 */ mr r5, r3 -/* 801D75D4 7F A3 EB 78 */ mr r3, r29 -/* 801D75D8 7F 44 D3 78 */ mr r4, r26 -/* 801D75DC 38 C0 00 00 */ li r6, 0 -/* 801D75E0 48 04 4F 65 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801D75E4 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D75E8 2C 1B 00 05 */ cmpwi r27, 5 -/* 801D75EC 3B DE 00 08 */ addi r30, r30, 8 -/* 801D75F0 41 80 FF BC */ blt lbl_801D75AC -/* 801D75F4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D75F8 3C 80 73 68 */ lis r4, 0x7368 /* 0x73686130@ha */ -/* 801D75FC 38 C4 61 30 */ addi r6, r4, 0x6130 /* 0x73686130@l */ -/* 801D7600 3C 80 00 61 */ lis r4, 0x0061 /* 0x0061735F@ha */ -/* 801D7604 38 A4 73 5F */ addi r5, r4, 0x735F /* 0x0061735F@l */ -/* 801D7608 81 83 00 00 */ lwz r12, 0(r3) -/* 801D760C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7610 7D 89 03 A6 */ mtctr r12 -/* 801D7614 4E 80 04 21 */ bctrl -/* 801D7618 38 00 00 01 */ li r0, 1 -/* 801D761C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D7620 38 00 00 02 */ li r0, 2 -/* 801D7624 98 1F 00 C3 */ stb r0, 0xc3(r31) -lbl_801D7628: -/* 801D7628 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D762C 48 18 AB F1 */ bl _restgpr_26 -/* 801D7630 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D7634 7C 08 03 A6 */ mtlr r0 -/* 801D7638 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D763C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAButtonString__17dMenu_Fmap2DTop_cFUlUc.s b/asm/d/menu/d_menu_fmap2D/setAButtonString__17dMenu_Fmap2DTop_cFUlUc.s deleted file mode 100644 index 8bdc2ab8c9..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAButtonString__17dMenu_Fmap2DTop_cFUlUc.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801D72D4: -/* 801D72D4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D72D8 7C 08 02 A6 */ mflr r0 -/* 801D72DC 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D72E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D72E4 48 18 AE E9 */ bl _savegpr_25 -/* 801D72E8 7C 79 1B 78 */ mr r25, r3 -/* 801D72EC 7C 9A 23 79 */ or. r26, r4, r4 -/* 801D72F0 7C BB 2B 78 */ mr r27, r5 -/* 801D72F4 40 82 00 10 */ bne lbl_801D7304 -/* 801D72F8 38 00 00 00 */ li r0, 0 -/* 801D72FC 98 19 00 C0 */ stb r0, 0xc0(r25) -/* 801D7300 48 00 00 80 */ b lbl_801D7380 -lbl_801D7304: -/* 801D7304 3B 80 00 00 */ li r28, 0 -/* 801D7308 3B E0 00 00 */ li r31, 0 -/* 801D730C 3C 60 80 39 */ lis r3, font_at_6194@ha /* 0x80396558@ha */ -/* 801D7310 3B A3 65 58 */ addi r29, r3, font_at_6194@l /* 0x80396558@l */ -/* 801D7314 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D7318 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801D731C: -/* 801D731C 80 79 00 08 */ lwz r3, 8(r25) -/* 801D7320 7C 9D FA 14 */ add r4, r29, r31 -/* 801D7324 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7328 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D732C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7330 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7334 7D 89 03 A6 */ mtctr r12 -/* 801D7338 4E 80 04 21 */ bctrl -/* 801D733C 48 12 93 1D */ bl getStringPtr__10J2DTextBoxCFv -/* 801D7340 7C 65 1B 78 */ mr r5, r3 -/* 801D7344 7F C3 F3 78 */ mr r3, r30 -/* 801D7348 7F 44 D3 78 */ mr r4, r26 -/* 801D734C 38 C0 00 00 */ li r6, 0 -/* 801D7350 48 04 51 F5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801D7354 3B 9C 00 01 */ addi r28, r28, 1 -/* 801D7358 2C 1C 00 05 */ cmpwi r28, 5 -/* 801D735C 3B FF 00 08 */ addi r31, r31, 8 -/* 801D7360 41 80 FF BC */ blt lbl_801D731C -/* 801D7364 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 801D7368 28 00 00 FF */ cmplwi r0, 0xff -/* 801D736C 40 82 00 10 */ bne lbl_801D737C -/* 801D7370 38 00 00 02 */ li r0, 2 -/* 801D7374 98 19 00 C0 */ stb r0, 0xc0(r25) -/* 801D7378 48 00 00 08 */ b lbl_801D7380 -lbl_801D737C: -/* 801D737C 9B 79 00 C0 */ stb r27, 0xc0(r25) -lbl_801D7380: -/* 801D7380 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D7384 48 18 AE 95 */ bl _restgpr_25 -/* 801D7388 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D738C 7C 08 03 A6 */ mtlr r0 -/* 801D7390 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D7394 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__17dMenu_Fmap2DTop_cFfb.s b/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__17dMenu_Fmap2DTop_cFfb.s deleted file mode 100644 index 9870d5dc4e..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__17dMenu_Fmap2DTop_cFfb.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801D6C44: -/* 801D6C44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D6C48 7C 08 02 A6 */ mflr r0 -/* 801D6C4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D6C50 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801D6C54 93 E1 00 14 */ stw r31, 0x14(r1) -/* 801D6C58 7C 7F 1B 78 */ mr r31, r3 -/* 801D6C5C FF E0 08 90 */ fmr f31, f1 -/* 801D6C60 D3 E3 00 80 */ stfs f31, 0x80(r3) -/* 801D6C64 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801D6C68 41 82 00 0C */ beq lbl_801D6C74 -/* 801D6C6C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D6C70 48 07 F1 61 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv -lbl_801D6C74: -/* 801D6C74 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D6C78 FC 20 F8 90 */ fmr f1, f31 -/* 801D6C7C 48 07 F1 AD */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf -/* 801D6C80 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801D6C84 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 801D6C88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D6C8C 7C 08 03 A6 */ mtlr r0 -/* 801D6C90 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D6C94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__18dMenu_Fmap2DBack_cFfb.s b/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__18dMenu_Fmap2DBack_cFfb.s deleted file mode 100644 index a5b6b183ef..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAllAlphaRate__18dMenu_Fmap2DBack_cFfb.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801D5334: -/* 801D5334 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D5338 7C 08 02 A6 */ mflr r0 -/* 801D533C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D5340 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801D5344 93 E1 00 14 */ stw r31, 0x14(r1) -/* 801D5348 7C 7F 1B 78 */ mr r31, r3 -/* 801D534C FF E0 08 90 */ fmr f31, f1 -/* 801D5350 D3 E3 0F C4 */ stfs f31, 0xfc4(r3) -/* 801D5354 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801D5358 41 82 00 0C */ beq lbl_801D5364 -/* 801D535C 80 7F 0C A0 */ lwz r3, 0xca0(r31) -/* 801D5360 48 08 0A 71 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv -lbl_801D5364: -/* 801D5364 80 7F 0C A0 */ lwz r3, 0xca0(r31) -/* 801D5368 FC 20 F8 90 */ fmr f1, f31 -/* 801D536C 48 08 0A BD */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf -/* 801D5370 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801D5374 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 801D5378 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D537C 7C 08 03 A6 */ mtlr r0 -/* 801D5380 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D5384 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s b/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s deleted file mode 100644 index 3663cc884a..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801D78FC: -/* 801D78FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D7900 7C 08 02 A6 */ mflr r0 -/* 801D7904 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D7908 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D790C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801D7910 7C 9E 23 78 */ mr r30, r4 -/* 801D7914 AB E4 00 16 */ lha r31, 0x16(r4) -/* 801D7918 2C 1F 00 05 */ cmpwi r31, 5 -/* 801D791C 41 80 00 18 */ blt lbl_801D7934 -/* 801D7920 7F C3 F3 78 */ mr r3, r30 -/* 801D7924 48 07 DF 05 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 801D7928 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D792C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7930 41 82 00 4C */ beq lbl_801D797C -lbl_801D7934: -/* 801D7934 38 9F 00 01 */ addi r4, r31, 1 -/* 801D7938 7C 80 07 34 */ extsh r0, r4 -/* 801D793C 2C 00 00 05 */ cmpwi r0, 5 -/* 801D7940 40 81 00 08 */ ble lbl_801D7948 -/* 801D7944 38 80 00 05 */ li r4, 5 -lbl_801D7948: -/* 801D7948 B0 9E 00 16 */ sth r4, 0x16(r30) -/* 801D794C 7F C3 F3 78 */ mr r3, r30 -/* 801D7950 7C 80 07 34 */ extsh r0, r4 -/* 801D7954 C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D7958 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D795C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D7960 3C 00 43 30 */ lis r0, 0x4330 -/* 801D7964 90 01 00 08 */ stw r0, 8(r1) -/* 801D7968 C8 01 00 08 */ lfd f0, 8(r1) -/* 801D796C EC 20 08 28 */ fsubs f1, f0, f1 -/* 801D7970 C0 02 A8 2C */ lfs f0, lit_6309(r2) -/* 801D7974 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801D7978 48 07 DE 59 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_801D797C: -/* 801D797C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D7980 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801D7984 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D7988 7C 08 03 A6 */ mtlr r0 -/* 801D798C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D7990 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s b/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s deleted file mode 100644 index e3caff09f6..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_801D7858: -/* 801D7858 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D785C 7C 08 02 A6 */ mflr r0 -/* 801D7860 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D7864 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D7868 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801D786C 7C 9E 23 78 */ mr r30, r4 -/* 801D7870 AB E4 00 16 */ lha r31, 0x16(r4) -/* 801D7874 2C 1F 00 03 */ cmpwi r31, 3 -/* 801D7878 40 82 00 18 */ bne lbl_801D7890 -/* 801D787C 7F C3 F3 78 */ mr r3, r30 -/* 801D7880 48 07 DF A9 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 801D7884 C0 02 A8 30 */ lfs f0, lit_6325(r2) -/* 801D7888 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D788C 41 82 00 58 */ beq lbl_801D78E4 -lbl_801D7890: -/* 801D7890 2C 1F 00 03 */ cmpwi r31, 3 -/* 801D7894 40 81 00 0C */ ble lbl_801D78A0 -/* 801D7898 3B FF FF FF */ addi r31, r31, -1 -/* 801D789C 48 00 00 0C */ b lbl_801D78A8 -lbl_801D78A0: -/* 801D78A0 40 80 00 08 */ bge lbl_801D78A8 -/* 801D78A4 3B FF 00 01 */ addi r31, r31, 1 -lbl_801D78A8: -/* 801D78A8 B3 FE 00 16 */ sth r31, 0x16(r30) -/* 801D78AC 7F C3 F3 78 */ mr r3, r30 -/* 801D78B0 C0 42 A7 E8 */ lfs f2, lit_4202(r2) -/* 801D78B4 7F E0 07 34 */ extsh r0, r31 -/* 801D78B8 C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D78BC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D78C0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D78C4 3C 00 43 30 */ lis r0, 0x4330 -/* 801D78C8 90 01 00 08 */ stw r0, 8(r1) -/* 801D78CC C8 01 00 08 */ lfd f0, 8(r1) -/* 801D78D0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801D78D4 C0 02 A7 F4 */ lfs f0, lit_4205(r2) -/* 801D78D8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801D78DC EC 22 00 32 */ fmuls f1, f2, f0 -/* 801D78E0 48 07 DE F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_801D78E4: -/* 801D78E4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D78E8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801D78EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D78F0 7C 08 03 A6 */ mtlr r0 -/* 801D78F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D78F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s b/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s deleted file mode 100644 index 4243827f6d..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_801D77C4: -/* 801D77C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D77C8 7C 08 02 A6 */ mflr r0 -/* 801D77CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D77D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D77D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 801D77D8 7C 9E 23 78 */ mr r30, r4 -/* 801D77DC AB E4 00 16 */ lha r31, 0x16(r4) -/* 801D77E0 7F E0 07 35 */ extsh. r0, r31 -/* 801D77E4 41 81 00 18 */ bgt lbl_801D77FC -/* 801D77E8 7F C3 F3 78 */ mr r3, r30 -/* 801D77EC 48 07 E0 3D */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 801D77F0 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D77F4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D77F8 41 82 00 48 */ beq lbl_801D7840 -lbl_801D77FC: -/* 801D77FC 38 9F FF FF */ addi r4, r31, -1 -/* 801D7800 7C 80 07 35 */ extsh. r0, r4 -/* 801D7804 40 80 00 08 */ bge lbl_801D780C -/* 801D7808 38 80 00 00 */ li r4, 0 -lbl_801D780C: -/* 801D780C B0 9E 00 16 */ sth r4, 0x16(r30) -/* 801D7810 7F C3 F3 78 */ mr r3, r30 -/* 801D7814 7C 80 07 34 */ extsh r0, r4 -/* 801D7818 C8 22 A8 08 */ lfd f1, lit_4496(r2) -/* 801D781C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801D7820 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D7824 3C 00 43 30 */ lis r0, 0x4330 -/* 801D7828 90 01 00 08 */ stw r0, 8(r1) -/* 801D782C C8 01 00 08 */ lfd f0, 8(r1) -/* 801D7830 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801D7834 C0 02 A8 2C */ lfs f0, lit_6309(r2) -/* 801D7838 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801D783C 48 07 DF 95 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_801D7840: -/* 801D7840 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D7844 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801D7848 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D784C 7C 08 03 A6 */ mtlr r0 -/* 801D7850 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D7854 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setAreaNameString__17dMenu_Fmap2DTop_cFUl.s b/asm/d/menu/d_menu_fmap2D/setAreaNameString__17dMenu_Fmap2DTop_cFUl.s deleted file mode 100644 index ff87ce45dd..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setAreaNameString__17dMenu_Fmap2DTop_cFUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801D7010: -/* 801D7010 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D7014 7C 08 02 A6 */ mflr r0 -/* 801D7018 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D701C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7020 48 18 B1 B9 */ bl _savegpr_28 -/* 801D7024 7C 7C 1B 78 */ mr r28, r3 -/* 801D7028 7C 9D 23 78 */ mr r29, r4 -/* 801D702C 3B C0 00 00 */ li r30, 0 -/* 801D7030 3B E0 00 00 */ li r31, 0 -lbl_801D7034: -/* 801D7034 28 1D 00 00 */ cmplwi r29, 0 -/* 801D7038 40 82 00 44 */ bne lbl_801D707C -/* 801D703C 80 7C 00 08 */ lwz r3, 8(r28) -/* 801D7040 3C 80 80 39 */ lis r4, farea_name_6125@ha /* 0x803964F0@ha */ -/* 801D7044 38 04 64 F0 */ addi r0, r4, farea_name_6125@l /* 0x803964F0@l */ -/* 801D7048 7C 80 FA 14 */ add r4, r0, r31 -/* 801D704C 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7050 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7054 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7058 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D705C 7D 89 03 A6 */ mtctr r12 -/* 801D7060 4E 80 04 21 */ bctrl -/* 801D7064 48 12 95 F5 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D7068 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D706C 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D7070 38 84 00 BB */ addi r4, r4, 0xbb -/* 801D7074 48 19 1A B9 */ bl strcpy -/* 801D7078 48 00 00 48 */ b lbl_801D70C0 -lbl_801D707C: -/* 801D707C 80 7C 00 08 */ lwz r3, 8(r28) -/* 801D7080 3C 80 80 39 */ lis r4, farea_name_6125@ha /* 0x803964F0@ha */ -/* 801D7084 38 04 64 F0 */ addi r0, r4, farea_name_6125@l /* 0x803964F0@l */ -/* 801D7088 7C 80 FA 14 */ add r4, r0, r31 -/* 801D708C 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7090 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7094 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7098 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D709C 7D 89 03 A6 */ mtctr r12 -/* 801D70A0 4E 80 04 21 */ bctrl -/* 801D70A4 48 12 95 B5 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D70A8 7C 65 1B 78 */ mr r5, r3 -/* 801D70AC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D70B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801D70B4 7F A4 EB 78 */ mr r4, r29 -/* 801D70B8 38 C0 00 00 */ li r6, 0 -/* 801D70BC 48 04 54 89 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -lbl_801D70C0: -/* 801D70C0 3B DE 00 01 */ addi r30, r30, 1 -/* 801D70C4 2C 1E 00 03 */ cmpwi r30, 3 -/* 801D70C8 3B FF 00 08 */ addi r31, r31, 8 -/* 801D70CC 41 80 FF 68 */ blt lbl_801D7034 -/* 801D70D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D70D4 48 18 B1 51 */ bl _restgpr_28 -/* 801D70D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D70DC 7C 08 03 A6 */ mtlr r0 -/* 801D70E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D70E4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf.s b/asm/d/menu/d_menu_fmap2D/setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf.s deleted file mode 100644 index e09fefb0b6..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_801D7714: -/* 801D7714 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D7718 7C 08 02 A6 */ mflr r0 -/* 801D771C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D7720 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801D7724 39 61 00 18 */ addi r11, r1, 0x18 -/* 801D7728 48 18 AA B1 */ bl _savegpr_28 -/* 801D772C 7C 7C 1B 78 */ mr r28, r3 -/* 801D7730 FF E0 08 90 */ fmr f31, f1 -/* 801D7734 54 9E 06 3E */ clrlwi r30, r4, 0x18 -/* 801D7738 54 80 07 7B */ rlwinm. r0, r4, 0, 0x1d, 0x1d -/* 801D773C 41 82 00 34 */ beq lbl_801D7770 -/* 801D7740 3B A0 00 00 */ li r29, 0 -/* 801D7744 3B E0 00 00 */ li r31, 0 -lbl_801D7748: -/* 801D7748 38 1F 00 38 */ addi r0, r31, 0x38 -/* 801D774C 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801D7750 28 03 00 00 */ cmplwi r3, 0 -/* 801D7754 41 82 00 0C */ beq lbl_801D7760 -/* 801D7758 FC 20 F8 90 */ fmr f1, f31 -/* 801D775C 48 07 E0 75 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_801D7760: -/* 801D7760 3B BD 00 01 */ addi r29, r29, 1 -/* 801D7764 2C 1D 00 02 */ cmpwi r29, 2 -/* 801D7768 3B FF 00 04 */ addi r31, r31, 4 -/* 801D776C 41 80 FF DC */ blt lbl_801D7748 -lbl_801D7770: -/* 801D7770 57 C0 07 39 */ rlwinm. r0, r30, 0, 0x1c, 0x1c -/* 801D7774 41 82 00 34 */ beq lbl_801D77A8 -/* 801D7778 3B A0 00 00 */ li r29, 0 -/* 801D777C 3B E0 00 00 */ li r31, 0 -lbl_801D7780: -/* 801D7780 38 1F 00 40 */ addi r0, r31, 0x40 -/* 801D7784 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801D7788 28 03 00 00 */ cmplwi r3, 0 -/* 801D778C 41 82 00 0C */ beq lbl_801D7798 -/* 801D7790 FC 20 F8 90 */ fmr f1, f31 -/* 801D7794 48 07 E0 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_801D7798: -/* 801D7798 3B BD 00 01 */ addi r29, r29, 1 -/* 801D779C 2C 1D 00 02 */ cmpwi r29, 2 -/* 801D77A0 3B FF 00 04 */ addi r31, r31, 4 -/* 801D77A4 41 80 FF DC */ blt lbl_801D7780 -lbl_801D77A8: -/* 801D77A8 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801D77AC 39 61 00 18 */ addi r11, r1, 0x18 -/* 801D77B0 48 18 AA 75 */ bl _restgpr_28 -/* 801D77B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D77B8 7C 08 03 A6 */ mtlr r0 -/* 801D77BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D77C0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff.s b/asm/d/menu/d_menu_fmap2D/setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff.s deleted file mode 100644 index e3fbdd255b..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_801D59C0: -/* 801D59C0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801D59C4 7C 08 02 A6 */ mflr r0 -/* 801D59C8 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D59CC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801D59D0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801D59D4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801D59D8 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801D59DC 7C 7E 1B 78 */ mr r30, r3 -/* 801D59E0 7C 9F 23 78 */ mr r31, r4 -/* 801D59E4 D0 21 00 08 */ stfs f1, 8(r1) -/* 801D59E8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 801D59EC FF E0 18 90 */ fmr f31, f3 -/* 801D59F0 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D59F4 FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 801D59F8 41 82 00 90 */ beq lbl_801D5A88 -/* 801D59FC 38 C1 00 1C */ addi r6, r1, 0x1c -/* 801D5A00 38 E1 00 18 */ addi r7, r1, 0x18 -/* 801D5A04 4B FF D2 C5 */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf -/* 801D5A08 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d -/* 801D5A0C 7F C3 F3 78 */ mr r3, r30 -/* 801D5A10 C0 21 00 08 */ lfs f1, 8(r1) -/* 801D5A14 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801D5A18 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D5A1C 7F FE 02 14 */ add r31, r30, r0 -/* 801D5A20 C0 1F 10 04 */ lfs f0, 0x1004(r31) -/* 801D5A24 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D5A28 C0 41 00 0C */ lfs f2, 0xc(r1) -/* 801D5A2C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801D5A30 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D5A34 C0 1F 10 24 */ lfs f0, 0x1024(r31) -/* 801D5A38 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D5A3C 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D5A40 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D5A44 4B FF B2 D5 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D5A48 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801D5A4C EC 40 F8 28 */ fsubs f2, f0, f31 -/* 801D5A50 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 801D5A54 7F C3 F3 78 */ mr r3, r30 -/* 801D5A58 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801D5A5C 38 81 00 08 */ addi r4, r1, 8 -/* 801D5A60 38 A1 00 0C */ addi r5, r1, 0xc -/* 801D5A64 4B FF B5 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D5A68 C0 21 00 08 */ lfs f1, 8(r1) -/* 801D5A6C C0 1F 10 04 */ lfs f0, 0x1004(r31) -/* 801D5A70 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D5A74 D0 01 00 08 */ stfs f0, 8(r1) -/* 801D5A78 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801D5A7C C0 1F 10 24 */ lfs f0, 0x1024(r31) -/* 801D5A80 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D5A84 D0 01 00 0C */ stfs f0, 0xc(r1) -lbl_801D5A88: -/* 801D5A88 C0 01 00 08 */ lfs f0, 8(r1) -/* 801D5A8C D0 1E 11 8C */ stfs f0, 0x118c(r30) -/* 801D5A90 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801D5A94 D0 1E 11 90 */ stfs f0, 0x1190(r30) -/* 801D5A98 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D5A9C D0 1E 11 9C */ stfs f0, 0x119c(r30) -/* 801D5AA0 D0 1E 11 A0 */ stfs f0, 0x11a0(r30) -/* 801D5AA4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801D5AA8 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801D5AAC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801D5AB0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 801D5AB4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801D5AB8 7C 08 03 A6 */ mtlr r0 -/* 801D5ABC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D5AC0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff.s b/asm/d/menu/d_menu_fmap2D/setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff.s deleted file mode 100644 index e35bccdbc1..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_801D58F8: -/* 801D58F8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801D58FC 7C 08 02 A6 */ mflr r0 -/* 801D5900 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D5904 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801D5908 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801D590C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 801D5910 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 801D5914 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D5918 7C 7F 1B 78 */ mr r31, r3 -/* 801D591C FF C0 08 90 */ fmr f30, f1 -/* 801D5920 FF E0 10 90 */ fmr f31, f2 -/* 801D5924 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D5928 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 801D592C D0 01 00 08 */ stfs f0, 8(r1) -/* 801D5930 28 05 00 00 */ cmplwi r5, 0 -/* 801D5934 41 82 00 14 */ beq lbl_801D5948 -/* 801D5938 38 C1 00 0C */ addi r6, r1, 0xc -/* 801D593C 38 E1 00 08 */ addi r7, r1, 8 -/* 801D5940 4B FF D3 89 */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf -/* 801D5944 48 00 00 34 */ b lbl_801D5978 -lbl_801D5948: -/* 801D5948 C0 42 A7 E8 */ lfs f2, lit_4202(r2) -/* 801D594C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801D5950 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 801D5954 7C 7F 02 14 */ add r3, r31, r0 -/* 801D5958 C0 23 0C E8 */ lfs f1, 0xce8(r3) -/* 801D595C C0 03 0C F0 */ lfs f0, 0xcf0(r3) -/* 801D5960 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D5964 EF C2 00 32 */ fmuls f30, f2, f0 -/* 801D5968 C0 23 0C EC */ lfs f1, 0xcec(r3) -/* 801D596C C0 03 0C F4 */ lfs f0, 0xcf4(r3) -/* 801D5970 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D5974 EF E2 00 32 */ fmuls f31, f2, f0 -lbl_801D5978: -/* 801D5978 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801D597C EC 1E 00 2A */ fadds f0, f30, f0 -/* 801D5980 D0 1F 11 8C */ stfs f0, 0x118c(r31) -/* 801D5984 C0 01 00 08 */ lfs f0, 8(r1) -/* 801D5988 EC 1F 00 2A */ fadds f0, f31, f0 -/* 801D598C D0 1F 11 90 */ stfs f0, 0x1190(r31) -/* 801D5990 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D5994 D0 1F 11 9C */ stfs f0, 0x119c(r31) -/* 801D5998 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -/* 801D599C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801D59A0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801D59A4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 801D59A8 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 801D59AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D59B0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801D59B4 7C 08 03 A6 */ mtlr r0 -/* 801D59B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D59BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setArrowPosAxis__18dMenu_Fmap2DBack_cFff.s b/asm/d/menu/d_menu_fmap2D/setArrowPosAxis__18dMenu_Fmap2DBack_cFff.s deleted file mode 100644 index 9d064a05dc..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setArrowPosAxis__18dMenu_Fmap2DBack_cFff.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801D5BB8: -/* 801D5BB8 D0 23 11 8C */ stfs f1, 0x118c(r3) -/* 801D5BBC D0 43 11 90 */ stfs f2, 0x1190(r3) -/* 801D5BC0 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D5BC4 D0 03 11 9C */ stfs f0, 0x119c(r3) -/* 801D5BC8 D0 03 11 A0 */ stfs f0, 0x11a0(r3) -/* 801D5BCC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setBButtonString__17dMenu_Fmap2DTop_cFUlUc.s b/asm/d/menu/d_menu_fmap2D/setBButtonString__17dMenu_Fmap2DTop_cFUlUc.s deleted file mode 100644 index 75d3fec2c7..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setBButtonString__17dMenu_Fmap2DTop_cFUlUc.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_801D7210: -/* 801D7210 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D7214 7C 08 02 A6 */ mflr r0 -/* 801D7218 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D721C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D7220 48 18 AF AD */ bl _savegpr_25 -/* 801D7224 7C 79 1B 78 */ mr r25, r3 -/* 801D7228 7C 9A 23 79 */ or. r26, r4, r4 -/* 801D722C 7C BB 2B 78 */ mr r27, r5 -/* 801D7230 40 82 00 10 */ bne lbl_801D7240 -/* 801D7234 38 00 00 00 */ li r0, 0 -/* 801D7238 98 19 00 C1 */ stb r0, 0xc1(r25) -/* 801D723C 48 00 00 80 */ b lbl_801D72BC -lbl_801D7240: -/* 801D7240 3B 80 00 00 */ li r28, 0 -/* 801D7244 3B E0 00 00 */ li r31, 0 -/* 801D7248 3C 60 80 39 */ lis r3, font_bt_6176@ha /* 0x80396530@ha */ -/* 801D724C 3B A3 65 30 */ addi r29, r3, font_bt_6176@l /* 0x80396530@l */ -/* 801D7250 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D7254 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801D7258: -/* 801D7258 80 79 00 08 */ lwz r3, 8(r25) -/* 801D725C 7C 9D FA 14 */ add r4, r29, r31 -/* 801D7260 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7264 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7268 81 83 00 00 */ lwz r12, 0(r3) -/* 801D726C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7270 7D 89 03 A6 */ mtctr r12 -/* 801D7274 4E 80 04 21 */ bctrl -/* 801D7278 48 12 93 E1 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D727C 7C 65 1B 78 */ mr r5, r3 -/* 801D7280 7F C3 F3 78 */ mr r3, r30 -/* 801D7284 7F 44 D3 78 */ mr r4, r26 -/* 801D7288 38 C0 00 00 */ li r6, 0 -/* 801D728C 48 04 52 B9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801D7290 3B 9C 00 01 */ addi r28, r28, 1 -/* 801D7294 2C 1C 00 05 */ cmpwi r28, 5 -/* 801D7298 3B FF 00 08 */ addi r31, r31, 8 -/* 801D729C 41 80 FF BC */ blt lbl_801D7258 -/* 801D72A0 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 801D72A4 28 00 00 FF */ cmplwi r0, 0xff -/* 801D72A8 40 82 00 10 */ bne lbl_801D72B8 -/* 801D72AC 38 00 00 02 */ li r0, 2 -/* 801D72B0 98 19 00 C1 */ stb r0, 0xc1(r25) -/* 801D72B4 48 00 00 08 */ b lbl_801D72BC -lbl_801D72B8: -/* 801D72B8 9B 79 00 C1 */ stb r27, 0xc1(r25) -lbl_801D72BC: -/* 801D72BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D72C0 48 18 AF 59 */ bl _restgpr_25 -/* 801D72C4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D72C8 7C 08 03 A6 */ mtlr r0 -/* 801D72CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D72D0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc.s b/asm/d/menu/d_menu_fmap2D/setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc.s deleted file mode 100644 index 8e59355d7a..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801D4AFC: -/* 801D4AFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D4B00 7C 08 02 A6 */ mflr r0 -/* 801D4B04 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D4B08 80 63 0C A8 */ lwz r3, 0xca8(r3) -/* 801D4B0C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D4B10 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D4B14 7D 89 03 A6 */ mtctr r12 -/* 801D4B18 4E 80 04 21 */ bctrl -/* 801D4B1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D4B20 7C 08 03 A6 */ mtlr r0 -/* 801D4B24 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D4B28 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setCrossLRString__17dMenu_Fmap2DTop_cFUl.s b/asm/d/menu/d_menu_fmap2D/setCrossLRString__17dMenu_Fmap2DTop_cFUl.s deleted file mode 100644 index 7eef0998a7..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setCrossLRString__17dMenu_Fmap2DTop_cFUl.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_801D7398: -/* 801D7398 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D739C 7C 08 02 A6 */ mflr r0 -/* 801D73A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D73A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D73A8 48 18 AE 29 */ bl _savegpr_26 -/* 801D73AC 7C 7F 1B 78 */ mr r31, r3 -/* 801D73B0 7C 9A 23 79 */ or. r26, r4, r4 -/* 801D73B4 40 82 00 8C */ bne lbl_801D7440 -/* 801D73B8 3B 60 00 00 */ li r27, 0 -/* 801D73BC 3B C0 00 00 */ li r30, 0 -/* 801D73C0 3C 60 80 39 */ lis r3, juji_c_6209@ha /* 0x80396580@ha */ -/* 801D73C4 3B A3 65 80 */ addi r29, r3, juji_c_6209@l /* 0x80396580@l */ -/* 801D73C8 3C 60 80 39 */ lis r3, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D73CC 3B 83 65 D0 */ addi r28, r3, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -lbl_801D73D0: -/* 801D73D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D73D4 7C 9D F2 14 */ add r4, r29, r30 -/* 801D73D8 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D73DC 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D73E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D73E4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D73E8 7D 89 03 A6 */ mtctr r12 -/* 801D73EC 4E 80 04 21 */ bctrl -/* 801D73F0 48 12 92 69 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D73F4 38 9C 00 BB */ addi r4, r28, 0xbb -/* 801D73F8 48 19 17 35 */ bl strcpy -/* 801D73FC 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D7400 2C 1B 00 05 */ cmpwi r27, 5 -/* 801D7404 3B DE 00 08 */ addi r30, r30, 8 -/* 801D7408 41 80 FF C8 */ blt lbl_801D73D0 -/* 801D740C 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D7410 3C 80 73 68 */ lis r4, 0x7368 /* 0x73686130@ha */ -/* 801D7414 38 C4 61 30 */ addi r6, r4, 0x6130 /* 0x73686130@l */ -/* 801D7418 3C 80 6A 75 */ lis r4, 0x6A75 /* 0x6A75795F@ha */ -/* 801D741C 38 A4 79 5F */ addi r5, r4, 0x795F /* 0x6A75795F@l */ -/* 801D7420 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7424 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7428 7D 89 03 A6 */ mtctr r12 -/* 801D742C 4E 80 04 21 */ bctrl -/* 801D7430 38 00 00 01 */ li r0, 1 -/* 801D7434 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D7438 98 1F 00 C4 */ stb r0, 0xc4(r31) -/* 801D743C 48 00 00 98 */ b lbl_801D74D4 -lbl_801D7440: -/* 801D7440 3B 60 00 00 */ li r27, 0 -/* 801D7444 3B C0 00 00 */ li r30, 0 -/* 801D7448 3C 60 80 39 */ lis r3, juji_c_6209@ha /* 0x80396580@ha */ -/* 801D744C 3B 83 65 80 */ addi r28, r3, juji_c_6209@l /* 0x80396580@l */ -/* 801D7450 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D7454 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801D7458: -/* 801D7458 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D745C 7C 9C F2 14 */ add r4, r28, r30 -/* 801D7460 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7464 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7468 81 83 00 00 */ lwz r12, 0(r3) -/* 801D746C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7470 7D 89 03 A6 */ mtctr r12 -/* 801D7474 4E 80 04 21 */ bctrl -/* 801D7478 48 12 91 E1 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D747C 7C 65 1B 78 */ mr r5, r3 -/* 801D7480 7F A3 EB 78 */ mr r3, r29 -/* 801D7484 7F 44 D3 78 */ mr r4, r26 -/* 801D7488 38 C0 00 00 */ li r6, 0 -/* 801D748C 48 04 50 B9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801D7490 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D7494 2C 1B 00 05 */ cmpwi r27, 5 -/* 801D7498 3B DE 00 08 */ addi r30, r30, 8 -/* 801D749C 41 80 FF BC */ blt lbl_801D7458 -/* 801D74A0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D74A4 3C 80 73 68 */ lis r4, 0x7368 /* 0x73686130@ha */ -/* 801D74A8 38 C4 61 30 */ addi r6, r4, 0x6130 /* 0x73686130@l */ -/* 801D74AC 3C 80 6A 75 */ lis r4, 0x6A75 /* 0x6A75795F@ha */ -/* 801D74B0 38 A4 79 5F */ addi r5, r4, 0x795F /* 0x6A75795F@l */ -/* 801D74B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801D74B8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D74BC 7D 89 03 A6 */ mtctr r12 -/* 801D74C0 4E 80 04 21 */ bctrl -/* 801D74C4 38 00 00 01 */ li r0, 1 -/* 801D74C8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D74CC 38 00 00 02 */ li r0, 2 -/* 801D74D0 98 1F 00 C4 */ stb r0, 0xc4(r31) -lbl_801D74D4: -/* 801D74D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D74D8 48 18 AD 45 */ bl _restgpr_26 -/* 801D74DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D74E0 7C 08 03 A6 */ mtlr r0 -/* 801D74E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D74E8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setHIO__17dMenu_Fmap2DTop_cFb.s b/asm/d/menu/d_menu_fmap2D/setHIO__17dMenu_Fmap2DTop_cFb.s deleted file mode 100644 index a43a5057f3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setHIO__17dMenu_Fmap2DTop_cFb.s +++ /dev/null @@ -1,321 +0,0 @@ -lbl_801D7BCC: -/* 801D7BCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D7BD0 7C 08 02 A6 */ mflr r0 -/* 801D7BD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D7BD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D7BDC 93 C1 00 08 */ stw r30, 8(r1) -/* 801D7BE0 7C 7E 1B 78 */ mr r30, r3 -/* 801D7BE4 7C 9F 23 78 */ mr r31, r4 -/* 801D7BE8 C0 03 00 84 */ lfs f0, 0x84(r3) -/* 801D7BEC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7BF0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7BF4 C0 43 00 E8 */ lfs f2, 0xe8(r3) -/* 801D7BF8 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D7BFC 40 82 00 14 */ bne lbl_801D7C10 -/* 801D7C00 C0 3E 00 88 */ lfs f1, 0x88(r30) -/* 801D7C04 C0 03 00 EC */ lfs f0, 0xec(r3) -/* 801D7C08 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D7C0C 41 82 00 28 */ beq lbl_801D7C34 -lbl_801D7C10: -/* 801D7C10 D0 5E 00 84 */ stfs f2, 0x84(r30) -/* 801D7C14 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7C18 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7C1C C0 03 00 EC */ lfs f0, 0xec(r3) -/* 801D7C20 D0 1E 00 88 */ stfs f0, 0x88(r30) -/* 801D7C24 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 801D7C28 C0 3E 00 84 */ lfs f1, 0x84(r30) -/* 801D7C2C C0 5E 00 88 */ lfs f2, 0x88(r30) -/* 801D7C30 48 07 C9 81 */ bl paneTrans__8CPaneMgrFff -lbl_801D7C34: -/* 801D7C34 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 801D7C38 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7C3C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7C40 C0 23 00 F0 */ lfs f1, 0xf0(r3) -/* 801D7C44 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7C48 41 82 00 2C */ beq lbl_801D7C74 -/* 801D7C4C D0 3E 00 8C */ stfs f1, 0x8c(r30) -/* 801D7C50 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 801D7C54 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 801D7C58 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7C5C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7C60 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7C64 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7C68 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7C6C 7D 89 03 A6 */ mtctr r12 -/* 801D7C70 4E 80 04 21 */ bctrl -lbl_801D7C74: -/* 801D7C74 C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 801D7C78 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7C7C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7C80 C0 43 00 F4 */ lfs f2, 0xf4(r3) -/* 801D7C84 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D7C88 40 82 00 14 */ bne lbl_801D7C9C -/* 801D7C8C C0 3E 00 94 */ lfs f1, 0x94(r30) -/* 801D7C90 C0 03 00 F8 */ lfs f0, 0xf8(r3) -/* 801D7C94 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D7C98 41 82 00 28 */ beq lbl_801D7CC0 -lbl_801D7C9C: -/* 801D7C9C D0 5E 00 90 */ stfs f2, 0x90(r30) -/* 801D7CA0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7CA4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7CA8 C0 03 00 F8 */ lfs f0, 0xf8(r3) -/* 801D7CAC D0 1E 00 94 */ stfs f0, 0x94(r30) -/* 801D7CB0 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 801D7CB4 C0 3E 00 90 */ lfs f1, 0x90(r30) -/* 801D7CB8 C0 5E 00 94 */ lfs f2, 0x94(r30) -/* 801D7CBC 48 07 C8 F5 */ bl paneTrans__8CPaneMgrFff -lbl_801D7CC0: -/* 801D7CC0 C0 1E 00 98 */ lfs f0, 0x98(r30) -/* 801D7CC4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7CC8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7CCC C0 23 00 FC */ lfs f1, 0xfc(r3) -/* 801D7CD0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7CD4 41 82 00 2C */ beq lbl_801D7D00 -/* 801D7CD8 D0 3E 00 98 */ stfs f1, 0x98(r30) -/* 801D7CDC C0 1E 00 98 */ lfs f0, 0x98(r30) -/* 801D7CE0 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 801D7CE4 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7CE8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7CEC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7CF0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7CF4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7CF8 7D 89 03 A6 */ mtctr r12 -/* 801D7CFC 4E 80 04 21 */ bctrl -lbl_801D7D00: -/* 801D7D00 80 1E 00 58 */ lwz r0, 0x58(r30) -/* 801D7D04 28 00 00 00 */ cmplwi r0, 0 -/* 801D7D08 41 82 00 90 */ beq lbl_801D7D98 -/* 801D7D0C C0 1E 00 9C */ lfs f0, 0x9c(r30) -/* 801D7D10 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7D14 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7D18 C0 43 01 00 */ lfs f2, 0x100(r3) -/* 801D7D1C FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D7D20 40 82 00 14 */ bne lbl_801D7D34 -/* 801D7D24 C0 3E 00 A0 */ lfs f1, 0xa0(r30) -/* 801D7D28 C0 03 01 04 */ lfs f0, 0x104(r3) -/* 801D7D2C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D7D30 41 82 00 28 */ beq lbl_801D7D58 -lbl_801D7D34: -/* 801D7D34 D0 5E 00 9C */ stfs f2, 0x9c(r30) -/* 801D7D38 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7D3C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7D40 C0 03 01 04 */ lfs f0, 0x104(r3) -/* 801D7D44 D0 1E 00 A0 */ stfs f0, 0xa0(r30) -/* 801D7D48 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 801D7D4C C0 3E 00 9C */ lfs f1, 0x9c(r30) -/* 801D7D50 C0 5E 00 A0 */ lfs f2, 0xa0(r30) -/* 801D7D54 48 07 C8 5D */ bl paneTrans__8CPaneMgrFff -lbl_801D7D58: -/* 801D7D58 C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 801D7D5C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7D60 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7D64 C0 23 01 08 */ lfs f1, 0x108(r3) -/* 801D7D68 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7D6C 41 82 00 2C */ beq lbl_801D7D98 -/* 801D7D70 D0 3E 00 A4 */ stfs f1, 0xa4(r30) -/* 801D7D74 C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 801D7D78 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 801D7D7C 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7D80 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7D84 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7D88 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7D8C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7D90 7D 89 03 A6 */ mtctr r12 -/* 801D7D94 4E 80 04 21 */ bctrl -lbl_801D7D98: -/* 801D7D98 80 1E 00 5C */ lwz r0, 0x5c(r30) -/* 801D7D9C 28 00 00 00 */ cmplwi r0, 0 -/* 801D7DA0 41 82 00 90 */ beq lbl_801D7E30 -/* 801D7DA4 C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 801D7DA8 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7DAC 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7DB0 C0 43 01 0C */ lfs f2, 0x10c(r3) -/* 801D7DB4 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D7DB8 40 82 00 14 */ bne lbl_801D7DCC -/* 801D7DBC C0 3E 00 AC */ lfs f1, 0xac(r30) -/* 801D7DC0 C0 03 01 10 */ lfs f0, 0x110(r3) -/* 801D7DC4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D7DC8 41 82 00 28 */ beq lbl_801D7DF0 -lbl_801D7DCC: -/* 801D7DCC D0 5E 00 A8 */ stfs f2, 0xa8(r30) -/* 801D7DD0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7DD4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7DD8 C0 03 01 10 */ lfs f0, 0x110(r3) -/* 801D7DDC D0 1E 00 AC */ stfs f0, 0xac(r30) -/* 801D7DE0 80 7E 00 5C */ lwz r3, 0x5c(r30) -/* 801D7DE4 C0 3E 00 A8 */ lfs f1, 0xa8(r30) -/* 801D7DE8 C0 5E 00 AC */ lfs f2, 0xac(r30) -/* 801D7DEC 48 07 C7 C5 */ bl paneTrans__8CPaneMgrFff -lbl_801D7DF0: -/* 801D7DF0 C0 1E 00 B0 */ lfs f0, 0xb0(r30) -/* 801D7DF4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7DF8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7DFC C0 23 01 14 */ lfs f1, 0x114(r3) -/* 801D7E00 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7E04 41 82 00 2C */ beq lbl_801D7E30 -/* 801D7E08 D0 3E 00 B0 */ stfs f1, 0xb0(r30) -/* 801D7E0C C0 1E 00 B0 */ lfs f0, 0xb0(r30) -/* 801D7E10 80 7E 00 5C */ lwz r3, 0x5c(r30) -/* 801D7E14 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7E18 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7E1C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7E20 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7E24 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7E28 7D 89 03 A6 */ mtctr r12 -/* 801D7E2C 4E 80 04 21 */ bctrl -lbl_801D7E30: -/* 801D7E30 C0 1E 00 B4 */ lfs f0, 0xb4(r30) -/* 801D7E34 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7E38 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7E3C C0 43 01 18 */ lfs f2, 0x118(r3) -/* 801D7E40 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801D7E44 40 82 00 14 */ bne lbl_801D7E58 -/* 801D7E48 C0 3E 00 B8 */ lfs f1, 0xb8(r30) -/* 801D7E4C C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 801D7E50 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D7E54 41 82 00 28 */ beq lbl_801D7E7C -lbl_801D7E58: -/* 801D7E58 D0 5E 00 B4 */ stfs f2, 0xb4(r30) -/* 801D7E5C 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7E60 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7E64 C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 801D7E68 D0 1E 00 B8 */ stfs f0, 0xb8(r30) -/* 801D7E6C 80 7E 00 60 */ lwz r3, 0x60(r30) -/* 801D7E70 C0 3E 00 B4 */ lfs f1, 0xb4(r30) -/* 801D7E74 C0 5E 00 B8 */ lfs f2, 0xb8(r30) -/* 801D7E78 48 07 C7 39 */ bl paneTrans__8CPaneMgrFff -lbl_801D7E7C: -/* 801D7E7C C0 1E 00 BC */ lfs f0, 0xbc(r30) -/* 801D7E80 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7E84 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7E88 C0 23 01 20 */ lfs f1, 0x120(r3) -/* 801D7E8C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D7E90 41 82 00 2C */ beq lbl_801D7EBC -/* 801D7E94 D0 3E 00 BC */ stfs f1, 0xbc(r30) -/* 801D7E98 C0 1E 00 BC */ lfs f0, 0xbc(r30) -/* 801D7E9C 80 7E 00 60 */ lwz r3, 0x60(r30) -/* 801D7EA0 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7EA4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7EA8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7EAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7EB0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7EB4 7D 89 03 A6 */ mtctr r12 -/* 801D7EB8 4E 80 04 21 */ bctrl -lbl_801D7EBC: -/* 801D7EBC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7EC0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7EC4 88 03 02 ED */ lbz r0, 0x2ed(r3) -/* 801D7EC8 28 00 00 00 */ cmplwi r0, 0 -/* 801D7ECC 40 82 00 0C */ bne lbl_801D7ED8 -/* 801D7ED0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801D7ED4 41 82 01 9C */ beq lbl_801D8070 -lbl_801D7ED8: -/* 801D7ED8 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 801D7EDC 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7EE0 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7EE4 C0 24 01 24 */ lfs f1, 0x124(r4) -/* 801D7EE8 C0 44 01 28 */ lfs f2, 0x128(r4) -/* 801D7EEC 48 07 C6 C5 */ bl paneTrans__8CPaneMgrFff -/* 801D7EF0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7EF4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7EF8 C0 03 01 2C */ lfs f0, 0x12c(r3) -/* 801D7EFC 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 801D7F00 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7F04 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7F08 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7F0C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7F10 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7F14 7D 89 03 A6 */ mtctr r12 -/* 801D7F18 4E 80 04 21 */ bctrl -/* 801D7F1C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801D7F20 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7F24 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7F28 C0 24 01 30 */ lfs f1, 0x130(r4) -/* 801D7F2C C0 44 01 34 */ lfs f2, 0x134(r4) -/* 801D7F30 48 07 C6 81 */ bl paneTrans__8CPaneMgrFff -/* 801D7F34 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7F38 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7F3C C0 03 01 38 */ lfs f0, 0x138(r3) -/* 801D7F40 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801D7F44 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7F48 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7F4C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7F50 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7F54 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7F58 7D 89 03 A6 */ mtctr r12 -/* 801D7F5C 4E 80 04 21 */ bctrl -/* 801D7F60 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801D7F64 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7F68 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7F6C C0 24 01 3C */ lfs f1, 0x13c(r4) -/* 801D7F70 C0 44 01 40 */ lfs f2, 0x140(r4) -/* 801D7F74 48 07 C6 3D */ bl paneTrans__8CPaneMgrFff -/* 801D7F78 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7F7C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7F80 C0 03 01 44 */ lfs f0, 0x144(r3) -/* 801D7F84 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801D7F88 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7F8C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7F90 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7F94 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7F98 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7F9C 7D 89 03 A6 */ mtctr r12 -/* 801D7FA0 4E 80 04 21 */ bctrl -/* 801D7FA4 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 801D7FA8 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7FAC 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7FB0 C0 24 01 48 */ lfs f1, 0x148(r4) -/* 801D7FB4 C0 44 01 4C */ lfs f2, 0x14c(r4) -/* 801D7FB8 48 07 C5 F9 */ bl paneTrans__8CPaneMgrFff -/* 801D7FBC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7FC0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7FC4 C0 03 01 50 */ lfs f0, 0x150(r3) -/* 801D7FC8 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 801D7FCC 80 63 00 04 */ lwz r3, 4(r3) -/* 801D7FD0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D7FD4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D7FD8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D7FDC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D7FE0 7D 89 03 A6 */ mtctr r12 -/* 801D7FE4 4E 80 04 21 */ bctrl -/* 801D7FE8 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 801D7FEC 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D7FF0 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D7FF4 C0 24 01 54 */ lfs f1, 0x154(r4) -/* 801D7FF8 C0 44 01 58 */ lfs f2, 0x158(r4) -/* 801D7FFC 48 07 C5 B5 */ bl paneTrans__8CPaneMgrFff -/* 801D8000 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D8004 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D8008 C0 03 01 5C */ lfs f0, 0x15c(r3) -/* 801D800C 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 801D8010 80 63 00 04 */ lwz r3, 4(r3) -/* 801D8014 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D8018 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D801C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8020 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D8024 7D 89 03 A6 */ mtctr r12 -/* 801D8028 4E 80 04 21 */ bctrl -/* 801D802C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801D8030 3C 80 80 43 */ lis r4, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D8034 38 84 FC 60 */ addi r4, r4, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D8038 C0 24 01 60 */ lfs f1, 0x160(r4) -/* 801D803C C0 44 01 64 */ lfs f2, 0x164(r4) -/* 801D8040 48 07 C5 71 */ bl paneTrans__8CPaneMgrFff -/* 801D8044 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D8048 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D804C C0 03 01 68 */ lfs f0, 0x168(r3) -/* 801D8050 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801D8054 80 63 00 04 */ lwz r3, 4(r3) -/* 801D8058 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801D805C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801D8060 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8064 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801D8068 7D 89 03 A6 */ mtctr r12 -/* 801D806C 4E 80 04 21 */ bctrl -lbl_801D8070: -/* 801D8070 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D8074 83 C1 00 08 */ lwz r30, 8(r1) -/* 801D8078 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D807C 7C 08 03 A6 */ mtlr r0 -/* 801D8080 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8084 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb.s b/asm/d/menu/d_menu_fmap2D/setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb.s deleted file mode 100644 index 7ca4721e89..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb.s +++ /dev/null @@ -1,206 +0,0 @@ -lbl_801D2100: -/* 801D2100 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 801D2104 7C 08 02 A6 */ mflr r0 -/* 801D2108 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 801D210C DB E1 00 A0 */ stfd f31, 0xa0(r1) -/* 801D2110 F3 E1 00 A8 */ psq_st f31, 168(r1), 0, 0 /* qr0 */ -/* 801D2114 DB C1 00 90 */ stfd f30, 0x90(r1) -/* 801D2118 F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0 /* qr0 */ -/* 801D211C DB A1 00 80 */ stfd f29, 0x80(r1) -/* 801D2120 F3 A1 00 88 */ psq_st f29, 136(r1), 0, 0 /* qr0 */ -/* 801D2124 DB 81 00 70 */ stfd f28, 0x70(r1) -/* 801D2128 F3 81 00 78 */ psq_st f28, 120(r1), 0, 0 /* qr0 */ -/* 801D212C DB 61 00 60 */ stfd f27, 0x60(r1) -/* 801D2130 F3 61 00 68 */ psq_st f27, 104(r1), 0, 0 /* qr0 */ -/* 801D2134 DB 41 00 50 */ stfd f26, 0x50(r1) -/* 801D2138 F3 41 00 58 */ psq_st f26, 88(r1), 0, 0 /* qr0 */ -/* 801D213C DB 21 00 40 */ stfd f25, 0x40(r1) -/* 801D2140 F3 21 00 48 */ psq_st f25, 72(r1), 0, 0 /* qr0 */ -/* 801D2144 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D2148 48 19 00 8D */ bl _savegpr_27 -/* 801D214C 7C 7B 1B 78 */ mr r27, r3 -/* 801D2150 7C 9C 23 78 */ mr r28, r4 -/* 801D2154 FF 20 08 90 */ fmr f25, f1 -/* 801D2158 FF 60 10 90 */ fmr f27, f2 -/* 801D215C FF 80 18 90 */ fmr f28, f3 -/* 801D2160 7C BD 2B 78 */ mr r29, r5 -/* 801D2164 7C DE 33 78 */ mr r30, r6 -/* 801D2168 C3 E3 0F A0 */ lfs f31, 0xfa0(r3) -/* 801D216C 3B E0 00 01 */ li r31, 1 -/* 801D2170 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801D2174 28 00 00 11 */ cmplwi r0, 0x11 -/* 801D2178 40 82 01 E0 */ bne lbl_801D2358 -/* 801D217C 3B E0 00 02 */ li r31, 2 -/* 801D2180 48 00 07 51 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D2184 FF 40 08 90 */ fmr f26, f1 -/* 801D2188 7F 63 DB 78 */ mr r3, r27 -/* 801D218C 48 00 06 F5 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D2190 7F 63 DB 78 */ mr r3, r27 -/* 801D2194 FC 40 D0 90 */ fmr f2, f26 -/* 801D2198 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D219C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D21A0 4B FF ED DD */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D21A4 7F 63 DB 78 */ mr r3, r27 -/* 801D21A8 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801D21AC C0 1B 0F C8 */ lfs f0, 0xfc8(r27) -/* 801D21B0 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D21B4 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801D21B8 C0 1B 0F CC */ lfs f0, 0xfcc(r27) -/* 801D21BC EC 42 00 2A */ fadds f2, f2, f0 -/* 801D21C0 38 81 00 0C */ addi r4, r1, 0xc -/* 801D21C4 38 A1 00 08 */ addi r5, r1, 8 -/* 801D21C8 4B FF EB 51 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D21CC 7F 63 DB 78 */ mr r3, r27 -/* 801D21D0 48 00 06 B1 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D21D4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801D21D8 EF C1 00 28 */ fsubs f30, f1, f0 -/* 801D21DC 7F 63 DB 78 */ mr r3, r27 -/* 801D21E0 48 00 06 F1 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D21E4 C0 01 00 08 */ lfs f0, 8(r1) -/* 801D21E8 EF A1 00 28 */ fsubs f29, f1, f0 -/* 801D21EC 4B E5 CC 75 */ bl dComIfGp_getNowLevel__Fv -/* 801D21F0 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 801D21F4 88 7B 12 27 */ lbz r3, 0x1227(r27) -/* 801D21F8 38 03 00 01 */ addi r0, r3, 1 -/* 801D21FC 7C 00 20 00 */ cmpw r0, r4 -/* 801D2200 40 82 00 94 */ bne lbl_801D2294 -/* 801D2204 7F 63 DB 78 */ mr r3, r27 -/* 801D2208 C0 1B 0F C8 */ lfs f0, 0xfc8(r27) -/* 801D220C EC 39 00 28 */ fsubs f1, f25, f0 -/* 801D2210 C0 1B 0F CC */ lfs f0, 0xfcc(r27) -/* 801D2214 EC 5B 00 28 */ fsubs f2, f27, f0 -/* 801D2218 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D221C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D2220 4B FF EA F9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D2224 88 1B 12 27 */ lbz r0, 0x1227(r27) -/* 801D2228 54 00 10 3A */ slwi r0, r0, 2 -/* 801D222C 7C 7B 02 14 */ add r3, r27, r0 -/* 801D2230 C0 23 0E AC */ lfs f1, 0xeac(r3) -/* 801D2234 C0 03 0F 2C */ lfs f0, 0xf2c(r3) -/* 801D2238 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D223C EC 3D 00 2A */ fadds f1, f29, f0 -/* 801D2240 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D2244 C0 9B 0F 9C */ lfs f4, 0xf9c(r27) -/* 801D2248 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801D224C C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D2250 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 801D2254 EC A1 00 2A */ fadds f5, f1, f0 -/* 801D2258 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 801D225C C0 23 0E 8C */ lfs f1, 0xe8c(r3) -/* 801D2260 C0 03 0F 0C */ lfs f0, 0xf0c(r3) -/* 801D2264 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D2268 EC 3E 00 2A */ fadds f1, f30, f0 -/* 801D226C C0 03 0E CC */ lfs f0, 0xecc(r3) -/* 801D2270 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801D2274 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 801D2278 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D227C EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D2280 D0 1B 11 E8 */ stfs f0, 0x11e8(r27) -/* 801D2284 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801D2288 EC 00 28 28 */ fsubs f0, f0, f5 -/* 801D228C D0 1B 11 EC */ stfs f0, 0x11ec(r27) -/* 801D2290 48 00 00 E4 */ b lbl_801D2374 -lbl_801D2294: -/* 801D2294 4B E5 CB CD */ bl dComIfGp_getNowLevel__Fv -/* 801D2298 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D229C 7C 7B 02 14 */ add r3, r27, r0 -/* 801D22A0 C0 23 0E C8 */ lfs f1, 0xec8(r3) -/* 801D22A4 C0 1B 0F 9C */ lfs f0, 0xf9c(r27) -/* 801D22A8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D22AC C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D22B0 EF 41 00 32 */ fmuls f26, f1, f0 -/* 801D22B4 4B E5 CB AD */ bl dComIfGp_getNowLevel__Fv -/* 801D22B8 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D22BC 7C 7B 02 14 */ add r3, r27, r0 -/* 801D22C0 C3 63 0F 08 */ lfs f27, 0xf08(r3) -/* 801D22C4 4B E5 CB 9D */ bl dComIfGp_getNowLevel__Fv -/* 801D22C8 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D22CC 7C 7B 02 14 */ add r3, r27, r0 -/* 801D22D0 C0 03 0E 88 */ lfs f0, 0xe88(r3) -/* 801D22D4 EC 00 D8 2A */ fadds f0, f0, f27 -/* 801D22D8 EC 1E 00 2A */ fadds f0, f30, f0 -/* 801D22DC EF 40 D0 2A */ fadds f26, f0, f26 -/* 801D22E0 4B E5 CB 81 */ bl dComIfGp_getNowLevel__Fv -/* 801D22E4 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D22E8 7C 7B 02 14 */ add r3, r27, r0 -/* 801D22EC C0 23 0E E8 */ lfs f1, 0xee8(r3) -/* 801D22F0 C0 1B 0F 9C */ lfs f0, 0xf9c(r27) -/* 801D22F4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D22F8 C0 02 A7 E8 */ lfs f0, lit_4202(r2) -/* 801D22FC EF 61 00 32 */ fmuls f27, f1, f0 -/* 801D2300 4B E5 CB 61 */ bl dComIfGp_getNowLevel__Fv -/* 801D2304 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D2308 7C 7B 02 14 */ add r3, r27, r0 -/* 801D230C C3 C3 0F 28 */ lfs f30, 0xf28(r3) -/* 801D2310 4B E5 CB 51 */ bl dComIfGp_getNowLevel__Fv -/* 801D2314 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 801D2318 7C 7B 02 14 */ add r3, r27, r0 -/* 801D231C C0 03 0E A8 */ lfs f0, 0xea8(r3) -/* 801D2320 EC 00 F0 2A */ fadds f0, f0, f30 -/* 801D2324 EC 1D 00 2A */ fadds f0, f29, f0 -/* 801D2328 EC 40 D8 2A */ fadds f2, f0, f27 -/* 801D232C C0 3B 11 E8 */ lfs f1, 0x11e8(r27) -/* 801D2330 C0 1B 0F 9C */ lfs f0, 0xf9c(r27) -/* 801D2334 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D2338 EC 1A 00 2A */ fadds f0, f26, f0 -/* 801D233C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801D2340 C0 3B 11 EC */ lfs f1, 0x11ec(r27) -/* 801D2344 C0 1B 0F 9C */ lfs f0, 0xf9c(r27) -/* 801D2348 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D234C EC 02 00 2A */ fadds f0, f2, f0 -/* 801D2350 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801D2354 48 00 00 20 */ b lbl_801D2374 -lbl_801D2358: -/* 801D2358 C0 1B 0F C8 */ lfs f0, 0xfc8(r27) -/* 801D235C EC 39 00 28 */ fsubs f1, f25, f0 -/* 801D2360 C0 1B 0F CC */ lfs f0, 0xfcc(r27) -/* 801D2364 EC 5B 00 28 */ fsubs f2, f27, f0 -/* 801D2368 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D236C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D2370 4B FF E9 A9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -lbl_801D2374: -/* 801D2374 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801D2378 40 82 00 54 */ bne lbl_801D23CC -/* 801D237C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 801D2380 28 00 00 01 */ cmplwi r0, 1 -/* 801D2384 40 82 00 18 */ bne lbl_801D239C -/* 801D2388 C0 22 A7 E8 */ lfs f1, lit_4202(r2) -/* 801D238C C0 1B 0F A0 */ lfs f0, 0xfa0(r27) -/* 801D2390 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D2394 EF E1 00 2A */ fadds f31, f1, f0 -/* 801D2398 3B E0 00 02 */ li r31, 2 -lbl_801D239C: -/* 801D239C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 801D23A0 41 82 00 08 */ beq lbl_801D23A8 -/* 801D23A4 3B E0 00 03 */ li r31, 3 -lbl_801D23A8: -/* 801D23A8 38 7B 00 04 */ addi r3, r27, 4 -/* 801D23AC 7F 84 E3 78 */ mr r4, r28 -/* 801D23B0 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801D23B4 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801D23B8 C0 62 A7 D4 */ lfs f3, lit_3971(r2) -/* 801D23BC FC 80 E0 90 */ fmr f4, f28 -/* 801D23C0 FC A0 F8 90 */ fmr f5, f31 -/* 801D23C4 7F E5 FB 78 */ mr r5, r31 -/* 801D23C8 4B FF 1F E1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc -lbl_801D23CC: -/* 801D23CC E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* qr0 */ -/* 801D23D0 CB E1 00 A0 */ lfd f31, 0xa0(r1) -/* 801D23D4 E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0 /* qr0 */ -/* 801D23D8 CB C1 00 90 */ lfd f30, 0x90(r1) -/* 801D23DC E3 A1 00 88 */ psq_l f29, 136(r1), 0, 0 /* qr0 */ -/* 801D23E0 CB A1 00 80 */ lfd f29, 0x80(r1) -/* 801D23E4 E3 81 00 78 */ psq_l f28, 120(r1), 0, 0 /* qr0 */ -/* 801D23E8 CB 81 00 70 */ lfd f28, 0x70(r1) -/* 801D23EC E3 61 00 68 */ psq_l f27, 104(r1), 0, 0 /* qr0 */ -/* 801D23F0 CB 61 00 60 */ lfd f27, 0x60(r1) -/* 801D23F4 E3 41 00 58 */ psq_l f26, 88(r1), 0, 0 /* qr0 */ -/* 801D23F8 CB 41 00 50 */ lfd f26, 0x50(r1) -/* 801D23FC E3 21 00 48 */ psq_l f25, 72(r1), 0, 0 /* qr0 */ -/* 801D2400 CB 21 00 40 */ lfd f25, 0x40(r1) -/* 801D2404 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D2408 48 18 FE 19 */ bl _restgpr_27 -/* 801D240C 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 801D2410 7C 08 03 A6 */ mtlr r0 -/* 801D2414 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801D2418 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setMoyaAlpha__17dMenu_Fmap2DTop_cFUc.s b/asm/d/menu/d_menu_fmap2D/setMoyaAlpha__17dMenu_Fmap2DTop_cFUc.s deleted file mode 100644 index da80e95fd3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setMoyaAlpha__17dMenu_Fmap2DTop_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801D6EDC: -/* 801D6EDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D6EE0 7C 08 02 A6 */ mflr r0 -/* 801D6EE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D6EE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D6EEC 7C 9F 23 78 */ mr r31, r4 -/* 801D6EF0 80 63 00 08 */ lwz r3, 8(r3) -/* 801D6EF4 3C 80 6F 74 */ lis r4, 0x6F74 /* 0x6F745F30@ha */ -/* 801D6EF8 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x6F745F30@l */ -/* 801D6EFC 38 A0 73 70 */ li r5, 0x7370 -/* 801D6F00 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6F04 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6F08 7D 89 03 A6 */ mtctr r12 -/* 801D6F0C 4E 80 04 21 */ bctrl -/* 801D6F10 7F E4 FB 78 */ mr r4, r31 -/* 801D6F14 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6F18 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D6F1C 7D 89 03 A6 */ mtctr r12 -/* 801D6F20 4E 80 04 21 */ bctrl -/* 801D6F24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D6F28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D6F2C 7C 08 03 A6 */ mtlr r0 -/* 801D6F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6F34 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff.s b/asm/d/menu/d_menu_fmap2D/setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff.s deleted file mode 100644 index 9163bc211c..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff.s +++ /dev/null @@ -1,187 +0,0 @@ -lbl_801D0804: -/* 801D0804 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 801D0808 7C 08 02 A6 */ mflr r0 -/* 801D080C 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 801D0810 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 801D0814 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 801D0818 DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 801D081C F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 801D0820 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 801D0824 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 801D0828 DB 81 00 80 */ stfd f28, 0x80(r1) -/* 801D082C F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 /* qr0 */ -/* 801D0830 DB 61 00 70 */ stfd f27, 0x70(r1) -/* 801D0834 F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 /* qr0 */ -/* 801D0838 DB 41 00 60 */ stfd f26, 0x60(r1) -/* 801D083C F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 /* qr0 */ -/* 801D0840 DB 21 00 50 */ stfd f25, 0x50(r1) -/* 801D0844 F3 21 00 58 */ psq_st f25, 88(r1), 0, 0 /* qr0 */ -/* 801D0848 DB 01 00 40 */ stfd f24, 0x40(r1) -/* 801D084C F3 01 00 48 */ psq_st f24, 72(r1), 0, 0 /* qr0 */ -/* 801D0850 DA E1 00 30 */ stfd f23, 0x30(r1) -/* 801D0854 F2 E1 00 38 */ psq_st f23, 56(r1), 0, 0 /* qr0 */ -/* 801D0858 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D085C 48 19 19 81 */ bl _savegpr_29 -/* 801D0860 7C 7E 1B 78 */ mr r30, r3 -/* 801D0864 7C 9F 23 78 */ mr r31, r4 -/* 801D0868 7C BD 2B 78 */ mr r29, r5 -/* 801D086C FE E0 08 90 */ fmr f23, f1 -/* 801D0870 FF 00 10 90 */ fmr f24, f2 -/* 801D0874 FF 60 18 90 */ fmr f27, f3 -/* 801D0878 FF 20 20 90 */ fmr f25, f4 -/* 801D087C FF 40 28 90 */ fmr f26, f5 -/* 801D0880 FF 80 30 90 */ fmr f28, f6 -/* 801D0884 FF A0 38 90 */ fmr f29, f7 -/* 801D0888 FF C0 40 90 */ fmr f30, f8 -/* 801D088C C3 E1 00 C8 */ lfs f31, 0xc8(r1) -/* 801D0890 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D0894 FC 00 D0 00 */ fcmpu cr0, f0, f26 -/* 801D0898 40 82 00 08 */ bne lbl_801D08A0 -/* 801D089C C3 42 A8 00 */ lfs f26, lit_4260(r2) -lbl_801D08A0: -/* 801D08A0 38 60 01 50 */ li r3, 0x150 -/* 801D08A4 48 0F E3 A9 */ bl __nw__FUl -/* 801D08A8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D08AC 41 82 00 10 */ beq lbl_801D08BC -/* 801D08B0 7F A4 EB 78 */ mr r4, r29 -/* 801D08B4 48 12 BE 55 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801D08B8 7C 60 1B 78 */ mr r0, r3 -lbl_801D08BC: -/* 801D08BC 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 801D08C0 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d -/* 801D08C4 7C 9E 1A 14 */ add r4, r30, r3 -/* 801D08C8 90 04 0C B4 */ stw r0, 0xcb4(r4) -/* 801D08CC D2 E4 10 04 */ stfs f23, 0x1004(r4) -/* 801D08D0 D3 04 10 24 */ stfs f24, 0x1024(r4) -/* 801D08D4 C0 02 A8 00 */ lfs f0, lit_4260(r2) -/* 801D08D8 EC 00 06 B2 */ fmuls f0, f0, f26 -/* 801D08DC 1C 05 00 14 */ mulli r0, r5, 0x14 -/* 801D08E0 7C BE 02 14 */ add r5, r30, r0 -/* 801D08E4 D0 05 0C F8 */ stfs f0, 0xcf8(r5) -/* 801D08E8 A0 1D 00 02 */ lhz r0, 2(r29) -/* 801D08EC C8 22 A7 F8 */ lfd f1, lit_4207(r2) -/* 801D08F0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D08F4 3C 60 43 30 */ lis r3, 0x4330 -/* 801D08F8 90 61 00 08 */ stw r3, 8(r1) -/* 801D08FC C8 01 00 08 */ lfd f0, 8(r1) -/* 801D0900 EC C0 08 28 */ fsubs f6, f0, f1 -/* 801D0904 A0 1D 00 04 */ lhz r0, 4(r29) -/* 801D0908 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D090C 90 61 00 10 */ stw r3, 0x10(r1) -/* 801D0910 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801D0914 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D0918 C0 04 10 24 */ lfs f0, 0x1024(r4) -/* 801D091C EC 80 C8 2A */ fadds f4, f0, f25 -/* 801D0920 C0 22 A7 E8 */ lfs f1, lit_4202(r2) -/* 801D0924 EC 01 00 B2 */ fmuls f0, f1, f2 -/* 801D0928 C0 45 0C F8 */ lfs f2, 0xcf8(r5) -/* 801D092C EC 60 00 B2 */ fmuls f3, f0, f2 -/* 801D0930 EC E4 18 28 */ fsubs f7, f4, f3 -/* 801D0934 C0 04 10 04 */ lfs f0, 0x1004(r4) -/* 801D0938 EC A0 D8 2A */ fadds f5, f0, f27 -/* 801D093C EC 01 01 B2 */ fmuls f0, f1, f6 -/* 801D0940 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 801D0944 EC 25 00 2A */ fadds f1, f5, f0 -/* 801D0948 EC 44 18 2A */ fadds f2, f4, f3 -/* 801D094C EC 05 00 28 */ fsubs f0, f5, f0 -/* 801D0950 D0 05 0C E8 */ stfs f0, 0xce8(r5) -/* 801D0954 D0 E5 0C EC */ stfs f7, 0xcec(r5) -/* 801D0958 D0 25 0C F0 */ stfs f1, 0xcf0(r5) -/* 801D095C D0 45 0C F4 */ stfs f2, 0xcf4(r5) -/* 801D0960 D3 84 0D 8C */ stfs f28, 0xd8c(r4) -/* 801D0964 D3 A4 0D AC */ stfs f29, 0xdac(r4) -/* 801D0968 D3 C4 0D CC */ stfs f30, 0xdcc(r4) -/* 801D096C D3 E4 0D EC */ stfs f31, 0xdec(r4) -/* 801D0970 38 C0 00 00 */ li r6, 0 -/* 801D0974 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D0978 D0 1E 0F E0 */ stfs f0, 0xfe0(r30) -/* 801D097C D0 1E 0F E4 */ stfs f0, 0xfe4(r30) -/* 801D0980 D0 1E 0F E8 */ stfs f0, 0xfe8(r30) -/* 801D0984 D0 1E 0F EC */ stfs f0, 0xfec(r30) -/* 801D0988 38 E0 00 00 */ li r7, 0 -/* 801D098C 39 00 00 00 */ li r8, 0 -/* 801D0990 38 60 00 00 */ li r3, 0 -/* 801D0994 38 80 00 00 */ li r4, 0 -/* 801D0998 38 00 00 08 */ li r0, 8 -/* 801D099C 7C 09 03 A6 */ mtctr r0 -lbl_801D09A0: -/* 801D09A0 38 04 0C B4 */ addi r0, r4, 0xcb4 -/* 801D09A4 7C 1E 00 2E */ lwzx r0, r30, r0 -/* 801D09A8 28 00 00 00 */ cmplwi r0, 0 -/* 801D09AC 41 82 00 8C */ beq lbl_801D0A38 -/* 801D09B0 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 801D09B4 40 82 00 30 */ bne lbl_801D09E4 -/* 801D09B8 7C BE 1A 14 */ add r5, r30, r3 -/* 801D09BC C0 05 0C E8 */ lfs f0, 0xce8(r5) -/* 801D09C0 D0 1E 0F E0 */ stfs f0, 0xfe0(r30) -/* 801D09C4 C0 05 0C EC */ lfs f0, 0xcec(r5) -/* 801D09C8 D0 1E 0F E4 */ stfs f0, 0xfe4(r30) -/* 801D09CC C0 05 0C F0 */ lfs f0, 0xcf0(r5) -/* 801D09D0 D0 1E 0F E8 */ stfs f0, 0xfe8(r30) -/* 801D09D4 C0 05 0C F4 */ lfs f0, 0xcf4(r5) -/* 801D09D8 D0 1E 0F EC */ stfs f0, 0xfec(r30) -/* 801D09DC 38 C0 00 01 */ li r6, 1 -/* 801D09E0 48 00 00 58 */ b lbl_801D0A38 -lbl_801D09E4: -/* 801D09E4 C0 1E 0F E0 */ lfs f0, 0xfe0(r30) -/* 801D09E8 7C BE 1A 14 */ add r5, r30, r3 -/* 801D09EC C0 25 0C E8 */ lfs f1, 0xce8(r5) -/* 801D09F0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D09F4 40 81 00 08 */ ble lbl_801D09FC -/* 801D09F8 D0 3E 0F E0 */ stfs f1, 0xfe0(r30) -lbl_801D09FC: -/* 801D09FC C0 1E 0F E4 */ lfs f0, 0xfe4(r30) -/* 801D0A00 C0 25 0C EC */ lfs f1, 0xcec(r5) -/* 801D0A04 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D0A08 40 81 00 08 */ ble lbl_801D0A10 -/* 801D0A0C D0 3E 0F E4 */ stfs f1, 0xfe4(r30) -lbl_801D0A10: -/* 801D0A10 C0 1E 0F E8 */ lfs f0, 0xfe8(r30) -/* 801D0A14 C0 25 0C F0 */ lfs f1, 0xcf0(r5) -/* 801D0A18 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D0A1C 40 80 00 08 */ bge lbl_801D0A24 -/* 801D0A20 D0 3E 0F E8 */ stfs f1, 0xfe8(r30) -lbl_801D0A24: -/* 801D0A24 C0 1E 0F EC */ lfs f0, 0xfec(r30) -/* 801D0A28 C0 25 0C F4 */ lfs f1, 0xcf4(r5) -/* 801D0A2C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D0A30 40 80 00 08 */ bge lbl_801D0A38 -/* 801D0A34 D0 3E 0F EC */ stfs f1, 0xfec(r30) -lbl_801D0A38: -/* 801D0A38 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 801D0A3C 40 82 00 1C */ bne lbl_801D0A58 -/* 801D0A40 38 A8 12 30 */ addi r5, r8, 0x1230 -/* 801D0A44 7C 1E 28 AE */ lbzx r0, r30, r5 -/* 801D0A48 28 00 00 FF */ cmplwi r0, 0xff -/* 801D0A4C 40 82 00 0C */ bne lbl_801D0A58 -/* 801D0A50 7F FE 29 AE */ stbx r31, r30, r5 -/* 801D0A54 38 E0 00 01 */ li r7, 1 -lbl_801D0A58: -/* 801D0A58 39 08 00 01 */ addi r8, r8, 1 -/* 801D0A5C 38 63 00 14 */ addi r3, r3, 0x14 -/* 801D0A60 38 84 00 04 */ addi r4, r4, 4 -/* 801D0A64 42 00 FF 3C */ bdnz lbl_801D09A0 -/* 801D0A68 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 801D0A6C CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 801D0A70 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 801D0A74 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 801D0A78 E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 801D0A7C CB A1 00 90 */ lfd f29, 0x90(r1) -/* 801D0A80 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 /* qr0 */ -/* 801D0A84 CB 81 00 80 */ lfd f28, 0x80(r1) -/* 801D0A88 E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 /* qr0 */ -/* 801D0A8C CB 61 00 70 */ lfd f27, 0x70(r1) -/* 801D0A90 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 /* qr0 */ -/* 801D0A94 CB 41 00 60 */ lfd f26, 0x60(r1) -/* 801D0A98 E3 21 00 58 */ psq_l f25, 88(r1), 0, 0 /* qr0 */ -/* 801D0A9C CB 21 00 50 */ lfd f25, 0x50(r1) -/* 801D0AA0 E3 01 00 48 */ psq_l f24, 72(r1), 0, 0 /* qr0 */ -/* 801D0AA4 CB 01 00 40 */ lfd f24, 0x40(r1) -/* 801D0AA8 E2 E1 00 38 */ psq_l f23, 56(r1), 0, 0 /* qr0 */ -/* 801D0AAC CA E1 00 30 */ lfd f23, 0x30(r1) -/* 801D0AB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D0AB4 48 19 17 75 */ bl _restgpr_29 -/* 801D0AB8 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 801D0ABC 7C 08 03 A6 */ mtlr r0 -/* 801D0AC0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801D0AC4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setTitleNameString__17dMenu_Fmap2DTop_cFUl.s b/asm/d/menu/d_menu_fmap2D/setTitleNameString__17dMenu_Fmap2DTop_cFUl.s deleted file mode 100644 index f39f3241c1..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setTitleNameString__17dMenu_Fmap2DTop_cFUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801D6F38: -/* 801D6F38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D6F3C 7C 08 02 A6 */ mflr r0 -/* 801D6F40 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D6F44 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6F48 48 18 B2 91 */ bl _savegpr_28 -/* 801D6F4C 7C 7C 1B 78 */ mr r28, r3 -/* 801D6F50 7C 9D 23 78 */ mr r29, r4 -/* 801D6F54 3B C0 00 00 */ li r30, 0 -/* 801D6F58 3B E0 00 00 */ li r31, 0 -lbl_801D6F5C: -/* 801D6F5C 28 1D 00 00 */ cmplwi r29, 0 -/* 801D6F60 40 82 00 44 */ bne lbl_801D6FA4 -/* 801D6F64 80 7C 00 08 */ lwz r3, 8(r28) -/* 801D6F68 3C 80 80 39 */ lis r4, ffont_name_6110@ha /* 0x803964B8@ha */ -/* 801D6F6C 38 04 64 B8 */ addi r0, r4, ffont_name_6110@l /* 0x803964B8@l */ -/* 801D6F70 7C 80 FA 14 */ add r4, r0, r31 -/* 801D6F74 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D6F78 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D6F7C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6F80 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6F84 7D 89 03 A6 */ mtctr r12 -/* 801D6F88 4E 80 04 21 */ bctrl -/* 801D6F8C 48 12 96 CD */ bl getStringPtr__10J2DTextBoxCFv -/* 801D6F90 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap2D__stringBase0@ha /* 0x803965D0@ha */ -/* 801D6F94 38 84 65 D0 */ addi r4, r4, d_menu_d_menu_fmap2D__stringBase0@l /* 0x803965D0@l */ -/* 801D6F98 38 84 00 BB */ addi r4, r4, 0xbb -/* 801D6F9C 48 19 1B 91 */ bl strcpy -/* 801D6FA0 48 00 00 48 */ b lbl_801D6FE8 -lbl_801D6FA4: -/* 801D6FA4 80 7C 00 08 */ lwz r3, 8(r28) -/* 801D6FA8 3C 80 80 39 */ lis r4, ffont_name_6110@ha /* 0x803964B8@ha */ -/* 801D6FAC 38 04 64 B8 */ addi r0, r4, ffont_name_6110@l /* 0x803964B8@l */ -/* 801D6FB0 7C 80 FA 14 */ add r4, r0, r31 -/* 801D6FB4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D6FB8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D6FBC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D6FC0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D6FC4 7D 89 03 A6 */ mtctr r12 -/* 801D6FC8 4E 80 04 21 */ bctrl -/* 801D6FCC 48 12 96 8D */ bl getStringPtr__10J2DTextBoxCFv -/* 801D6FD0 7C 65 1B 78 */ mr r5, r3 -/* 801D6FD4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D6FD8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801D6FDC 7F A4 EB 78 */ mr r4, r29 -/* 801D6FE0 38 C0 00 00 */ li r6, 0 -/* 801D6FE4 48 04 55 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -lbl_801D6FE8: -/* 801D6FE8 3B DE 00 01 */ addi r30, r30, 1 -/* 801D6FEC 2C 1E 00 07 */ cmpwi r30, 7 -/* 801D6FF0 3B FF 00 08 */ addi r31, r31, 8 -/* 801D6FF4 41 80 FF 68 */ blt lbl_801D6F5C -/* 801D6FF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6FFC 48 18 B2 29 */ bl _restgpr_28 -/* 801D7000 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D7004 7C 08 03 A6 */ mtlr r0 -/* 801D7008 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D700C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/setZButtonString__17dMenu_Fmap2DTop_cFUlUc.s b/asm/d/menu/d_menu_fmap2D/setZButtonString__17dMenu_Fmap2DTop_cFUlUc.s deleted file mode 100644 index da76f6d016..0000000000 --- a/asm/d/menu/d_menu_fmap2D/setZButtonString__17dMenu_Fmap2DTop_cFUlUc.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_801D70E8: -/* 801D70E8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D70EC 7C 08 02 A6 */ mflr r0 -/* 801D70F0 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D70F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D70F8 48 18 B0 D5 */ bl _savegpr_25 -/* 801D70FC 7C 7D 1B 78 */ mr r29, r3 -/* 801D7100 7C 9E 23 78 */ mr r30, r4 -/* 801D7104 7C BF 2B 78 */ mr r31, r5 -/* 801D7108 28 1E 05 29 */ cmplwi r30, 0x529 -/* 801D710C 40 82 00 30 */ bne lbl_801D713C -/* 801D7110 80 8D 8A 98 */ lwz r4, m_midnaActor__9daPy_py_c(r13) -/* 801D7114 38 60 00 00 */ li r3, 0 -/* 801D7118 80 84 08 90 */ lwz r4, 0x890(r4) -/* 801D711C 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 801D7120 41 82 00 10 */ beq lbl_801D7130 -/* 801D7124 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 -/* 801D7128 41 82 00 08 */ beq lbl_801D7130 -/* 801D712C 38 60 00 01 */ li r3, 1 -lbl_801D7130: -/* 801D7130 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D7134 41 82 00 08 */ beq lbl_801D713C -/* 801D7138 3B C0 05 33 */ li r30, 0x533 -lbl_801D713C: -/* 801D713C 28 1E 00 00 */ cmplwi r30, 0 -/* 801D7140 41 82 00 14 */ beq lbl_801D7154 -/* 801D7144 7F A3 EB 78 */ mr r3, r29 -/* 801D7148 48 00 0F 41 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801D714C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D7150 40 82 00 10 */ bne lbl_801D7160 -lbl_801D7154: -/* 801D7154 38 00 00 01 */ li r0, 1 -/* 801D7158 98 1D 00 C2 */ stb r0, 0xc2(r29) -/* 801D715C 48 00 00 9C */ b lbl_801D71F8 -lbl_801D7160: -/* 801D7160 3B 20 00 00 */ li r25, 0 -/* 801D7164 3B 80 00 00 */ li r28, 0 -/* 801D7168 3C 60 80 39 */ lis r3, font_zt_6148@ha /* 0x80396508@ha */ -/* 801D716C 3B 43 65 08 */ addi r26, r3, font_zt_6148@l /* 0x80396508@l */ -/* 801D7170 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D7174 3B 63 01 88 */ addi r27, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801D7178: -/* 801D7178 80 7D 00 08 */ lwz r3, 8(r29) -/* 801D717C 7C 9A E2 14 */ add r4, r26, r28 -/* 801D7180 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D7184 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D7188 81 83 00 00 */ lwz r12, 0(r3) -/* 801D718C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D7190 7D 89 03 A6 */ mtctr r12 -/* 801D7194 4E 80 04 21 */ bctrl -/* 801D7198 48 12 94 C1 */ bl getStringPtr__10J2DTextBoxCFv -/* 801D719C 7C 65 1B 78 */ mr r5, r3 -/* 801D71A0 7F 63 DB 78 */ mr r3, r27 -/* 801D71A4 7F C4 F3 78 */ mr r4, r30 -/* 801D71A8 38 C0 00 00 */ li r6, 0 -/* 801D71AC 48 04 53 99 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801D71B0 3B 39 00 01 */ addi r25, r25, 1 -/* 801D71B4 2C 19 00 05 */ cmpwi r25, 5 -/* 801D71B8 3B 9C 00 08 */ addi r28, r28, 8 -/* 801D71BC 41 80 FF BC */ blt lbl_801D7178 -/* 801D71C0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801D71C4 28 00 00 FF */ cmplwi r0, 0xff -/* 801D71C8 40 82 00 2C */ bne lbl_801D71F4 -/* 801D71CC 7F A3 EB 78 */ mr r3, r29 -/* 801D71D0 48 00 07 C5 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv -/* 801D71D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D71D8 41 82 00 10 */ beq lbl_801D71E8 -/* 801D71DC 38 00 00 02 */ li r0, 2 -/* 801D71E0 98 1D 00 C2 */ stb r0, 0xc2(r29) -/* 801D71E4 48 00 00 14 */ b lbl_801D71F8 -lbl_801D71E8: -/* 801D71E8 38 00 00 01 */ li r0, 1 -/* 801D71EC 98 1D 00 C2 */ stb r0, 0xc2(r29) -/* 801D71F0 48 00 00 08 */ b lbl_801D71F8 -lbl_801D71F4: -/* 801D71F4 9B FD 00 C2 */ stb r31, 0xc2(r29) -lbl_801D71F8: -/* 801D71F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D71FC 48 18 B0 1D */ bl _restgpr_25 -/* 801D7200 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D7204 7C 08 03 A6 */ mtlr r0 -/* 801D7208 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D720C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb.s b/asm/d/menu/d_menu_fmap2D/stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb.s deleted file mode 100644 index 229a6f9213..0000000000 --- a/asm/d/menu/d_menu_fmap2D/stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb.s +++ /dev/null @@ -1,323 +0,0 @@ -lbl_801D4E80: -/* 801D4E80 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 801D4E84 7C 08 02 A6 */ mflr r0 -/* 801D4E88 90 01 00 94 */ stw r0, 0x94(r1) -/* 801D4E8C DB E1 00 80 */ stfd f31, 0x80(r1) -/* 801D4E90 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 801D4E94 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 801D4E98 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 801D4E9C DB A1 00 60 */ stfd f29, 0x60(r1) -/* 801D4EA0 F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 801D4EA4 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 801D4EA8 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 801D4EAC DB 61 00 40 */ stfd f27, 0x40(r1) -/* 801D4EB0 F3 61 00 48 */ psq_st f27, 72(r1), 0, 0 /* qr0 */ -/* 801D4EB4 DB 41 00 30 */ stfd f26, 0x30(r1) -/* 801D4EB8 F3 41 00 38 */ psq_st f26, 56(r1), 0, 0 /* qr0 */ -/* 801D4EBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4EC0 48 18 D3 19 */ bl _savegpr_28 -/* 801D4EC4 7C 7E 1B 78 */ mr r30, r3 -/* 801D4EC8 7C 9C 23 78 */ mr r28, r4 -/* 801D4ECC 7C DD 33 78 */ mr r29, r6 -/* 801D4ED0 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4ED4 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4ED8 C3 63 00 E0 */ lfs f27, 0xe0(r3) -/* 801D4EDC C0 03 00 E4 */ lfs f0, 0xe4(r3) -/* 801D4EE0 FC 1B 00 40 */ fcmpo cr0, f27, f0 -/* 801D4EE4 40 80 00 0C */ bge lbl_801D4EF0 -/* 801D4EE8 FF C0 D8 90 */ fmr f30, f27 -/* 801D4EEC 48 00 00 08 */ b lbl_801D4EF4 -lbl_801D4EF0: -/* 801D4EF0 FF C0 00 90 */ fmr f30, f0 -lbl_801D4EF4: -/* 801D4EF4 FC 1B 00 40 */ fcmpo cr0, f27, f0 -/* 801D4EF8 40 81 00 08 */ ble lbl_801D4F00 -/* 801D4EFC 48 00 00 08 */ b lbl_801D4F04 -lbl_801D4F00: -/* 801D4F00 FF 60 00 90 */ fmr f27, f0 -lbl_801D4F04: -/* 801D4F04 7F 83 E3 78 */ mr r3, r28 -/* 801D4F08 81 9C 00 00 */ lwz r12, 0(r28) -/* 801D4F0C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D4F10 7D 89 03 A6 */ mtctr r12 -/* 801D4F14 4E 80 04 21 */ bctrl -/* 801D4F18 FF E0 08 90 */ fmr f31, f1 -/* 801D4F1C 3B E0 00 00 */ li r31, 0 -/* 801D4F20 C3 BE 0F C8 */ lfs f29, 0xfc8(r30) -/* 801D4F24 C3 9E 0F CC */ lfs f28, 0xfcc(r30) -/* 801D4F28 FC 1F F0 40 */ fcmpo cr0, f31, f30 -/* 801D4F2C 4C 41 13 82 */ cror 2, 1, 2 -/* 801D4F30 40 82 00 E0 */ bne lbl_801D5010 -/* 801D4F34 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 801D4F38 41 82 00 D8 */ beq lbl_801D5010 -/* 801D4F3C 88 1E 12 38 */ lbz r0, 0x1238(r30) -/* 801D4F40 28 00 00 02 */ cmplwi r0, 2 -/* 801D4F44 41 82 00 CC */ beq lbl_801D5010 -/* 801D4F48 3B E0 00 01 */ li r31, 1 -/* 801D4F4C 7F 83 E3 78 */ mr r3, r28 -/* 801D4F50 81 9C 00 00 */ lwz r12, 0(r28) -/* 801D4F54 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D4F58 7D 89 03 A6 */ mtctr r12 -/* 801D4F5C 4E 80 04 21 */ bctrl -/* 801D4F60 7C 7D 1B 78 */ mr r29, r3 -/* 801D4F64 C0 3E 0F E8 */ lfs f1, 0xfe8(r30) -/* 801D4F68 C0 1E 0F E0 */ lfs f0, 0xfe0(r30) -/* 801D4F6C EF 41 00 28 */ fsubs f26, f1, f0 -/* 801D4F70 7F C3 F3 78 */ mr r3, r30 -/* 801D4F74 4B FF DC D9 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D4F78 FF C0 08 90 */ fmr f30, f1 -/* 801D4F7C 7F C3 F3 78 */ mr r3, r30 -/* 801D4F80 88 9E 12 27 */ lbz r4, 0x1227(r30) -/* 801D4F84 4B FF DB E1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D4F88 C0 5E 0F A0 */ lfs f2, 0xfa0(r30) -/* 801D4F8C C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D4F90 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D4F94 EC 1E 08 28 */ fsubs f0, f30, f1 -/* 801D4F98 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D4F9C EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4FA0 EC 5A 00 24 */ fdivs f2, f26, f0 -/* 801D4FA4 FC 1F D8 40 */ fcmpo cr0, f31, f27 -/* 801D4FA8 40 80 00 14 */ bge lbl_801D4FBC -/* 801D4FAC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4FB0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4FB4 C0 23 00 D4 */ lfs f1, 0xd4(r3) -/* 801D4FB8 48 00 00 10 */ b lbl_801D4FC8 -lbl_801D4FBC: -/* 801D4FBC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D4FC0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D4FC4 C0 23 00 C4 */ lfs f1, 0xc4(r3) -lbl_801D4FC8: -/* 801D4FC8 C0 02 A8 00 */ lfs f0, lit_4260(r2) -/* 801D4FCC EC 01 00 24 */ fdivs f0, f1, f0 -/* 801D4FD0 EC 40 00 B2 */ fmuls f2, f0, f2 -/* 801D4FD4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801D4FD8 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801D4FDC 57 A0 04 38 */ rlwinm r0, r29, 0, 0x10, 0x1c -/* 801D4FE0 7C 64 02 14 */ add r3, r4, r0 -/* 801D4FE4 C0 03 00 04 */ lfs f0, 4(r3) -/* 801D4FE8 EC 62 00 32 */ fmuls f3, f2, f0 -/* 801D4FEC C0 3E 0F C8 */ lfs f1, 0xfc8(r30) -/* 801D4FF0 7C 04 04 2E */ lfsx f0, r4, r0 -/* 801D4FF4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D4FF8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D4FFC D0 1E 0F C8 */ stfs f0, 0xfc8(r30) -/* 801D5000 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D5004 EC 00 18 2A */ fadds f0, f0, f3 -/* 801D5008 D0 1E 0F CC */ stfs f0, 0xfcc(r30) -/* 801D500C 48 00 00 0C */ b lbl_801D5018 -lbl_801D5010: -/* 801D5010 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 801D5014 41 82 02 D8 */ beq lbl_801D52EC -lbl_801D5018: -/* 801D5018 7F C3 F3 78 */ mr r3, r30 -/* 801D501C 4B FF D6 AD */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D5020 FF C0 08 90 */ fmr f30, f1 -/* 801D5024 7F C3 F3 78 */ mr r3, r30 -/* 801D5028 4B FF D6 51 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D502C 7F C3 F3 78 */ mr r3, r30 -/* 801D5030 FC 40 F0 90 */ fmr f2, f30 -/* 801D5034 38 81 00 10 */ addi r4, r1, 0x10 -/* 801D5038 38 A1 00 0C */ addi r5, r1, 0xc -/* 801D503C 4B FF BF 41 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D5040 7F C3 F3 78 */ mr r3, r30 -/* 801D5044 4B FF D7 4D */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D5048 FF C0 08 90 */ fmr f30, f1 -/* 801D504C 7F C3 F3 78 */ mr r3, r30 -/* 801D5050 4B FF D6 E9 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D5054 7F C3 F3 78 */ mr r3, r30 -/* 801D5058 FC 40 F0 90 */ fmr f2, f30 -/* 801D505C 38 81 00 18 */ addi r4, r1, 0x18 -/* 801D5060 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801D5064 4B FF BF 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf -/* 801D5068 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D506C 38 83 FC 60 */ addi r4, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D5070 88 04 03 06 */ lbz r0, 0x306(r4) -/* 801D5074 28 00 00 00 */ cmplwi r0, 0 -/* 801D5078 41 82 00 44 */ beq lbl_801D50BC -/* 801D507C 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D5080 54 00 10 3A */ slwi r0, r0, 2 -/* 801D5084 7C 64 02 14 */ add r3, r4, r0 -/* 801D5088 C0 03 01 CC */ lfs f0, 0x1cc(r3) -/* 801D508C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801D5090 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D5094 54 00 10 3A */ slwi r0, r0, 2 -/* 801D5098 7C 64 02 14 */ add r3, r4, r0 -/* 801D509C C0 03 01 EC */ lfs f0, 0x1ec(r3) -/* 801D50A0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801D50A4 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D50A8 54 00 10 3A */ slwi r0, r0, 2 -/* 801D50AC 7C 64 02 14 */ add r3, r4, r0 -/* 801D50B0 C3 E3 02 0C */ lfs f31, 0x20c(r3) -/* 801D50B4 C3 C3 02 2C */ lfs f30, 0x22c(r3) -/* 801D50B8 48 00 00 40 */ b lbl_801D50F8 -lbl_801D50BC: -/* 801D50BC 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D50C0 54 00 10 3A */ slwi r0, r0, 2 -/* 801D50C4 7C 7E 02 14 */ add r3, r30, r0 -/* 801D50C8 C0 03 0D 8C */ lfs f0, 0xd8c(r3) -/* 801D50CC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801D50D0 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D50D4 54 00 10 3A */ slwi r0, r0, 2 -/* 801D50D8 7C 7E 02 14 */ add r3, r30, r0 -/* 801D50DC C0 03 0D AC */ lfs f0, 0xdac(r3) -/* 801D50E0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801D50E4 88 1E 12 27 */ lbz r0, 0x1227(r30) -/* 801D50E8 54 00 10 3A */ slwi r0, r0, 2 -/* 801D50EC 7C 7E 02 14 */ add r3, r30, r0 -/* 801D50F0 C3 E3 0D CC */ lfs f31, 0xdcc(r3) -/* 801D50F4 C3 C3 0D EC */ lfs f30, 0xdec(r3) -lbl_801D50F8: -/* 801D50F8 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801D50FC C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801D5100 C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D5104 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D5108 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D510C 40 80 00 10 */ bge lbl_801D511C -/* 801D5110 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D5114 FC 00 00 50 */ fneg f0, f0 -/* 801D5118 D0 1E 0F C8 */ stfs f0, 0xfc8(r30) -lbl_801D511C: -/* 801D511C C0 21 00 10 */ lfs f1, 0x10(r1) -/* 801D5120 C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D5124 EC 1F 00 28 */ fsubs f0, f31, f0 -/* 801D5128 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D512C 40 81 00 10 */ ble lbl_801D513C -/* 801D5130 EC 01 F8 28 */ fsubs f0, f1, f31 -/* 801D5134 FC 00 00 50 */ fneg f0, f0 -/* 801D5138 D0 1E 0F C8 */ stfs f0, 0xfc8(r30) -lbl_801D513C: -/* 801D513C C0 41 00 0C */ lfs f2, 0xc(r1) -/* 801D5140 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801D5144 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D5148 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D514C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D5150 40 80 00 10 */ bge lbl_801D5160 -/* 801D5154 EC 02 08 28 */ fsubs f0, f2, f1 -/* 801D5158 FC 00 00 50 */ fneg f0, f0 -/* 801D515C D0 1E 0F CC */ stfs f0, 0xfcc(r30) -lbl_801D5160: -/* 801D5160 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801D5164 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D5168 EC 1E 00 28 */ fsubs f0, f30, f0 -/* 801D516C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D5170 40 81 00 10 */ ble lbl_801D5180 -/* 801D5174 EC 01 F0 28 */ fsubs f0, f1, f30 -/* 801D5178 FC 00 00 50 */ fneg f0, f0 -/* 801D517C D0 1E 0F CC */ stfs f0, 0xfcc(r30) -lbl_801D5180: -/* 801D5180 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801D5184 41 82 00 50 */ beq lbl_801D51D4 -/* 801D5188 C0 1E 0F C8 */ lfs f0, 0xfc8(r30) -/* 801D518C FC 1D 00 00 */ fcmpu cr0, f29, f0 -/* 801D5190 40 82 00 10 */ bne lbl_801D51A0 -/* 801D5194 C0 1E 0F CC */ lfs f0, 0xfcc(r30) -/* 801D5198 FC 1C 00 00 */ fcmpu cr0, f28, f0 -/* 801D519C 41 82 00 38 */ beq lbl_801D51D4 -lbl_801D51A0: -/* 801D51A0 38 00 00 BE */ li r0, 0xbe -/* 801D51A4 90 01 00 08 */ stw r0, 8(r1) -/* 801D51A8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801D51AC 38 81 00 08 */ addi r4, r1, 8 -/* 801D51B0 38 A0 00 00 */ li r5, 0 -/* 801D51B4 38 C0 00 00 */ li r6, 0 -/* 801D51B8 38 E0 00 00 */ li r7, 0 -/* 801D51BC C0 22 A7 D4 */ lfs f1, lit_3971(r2) -/* 801D51C0 FC 40 08 90 */ fmr f2, f1 -/* 801D51C4 C0 62 A8 20 */ lfs f3, lit_5568(r2) -/* 801D51C8 FC 80 18 90 */ fmr f4, f3 -/* 801D51CC 39 00 00 00 */ li r8, 0 -/* 801D51D0 48 0D 73 3D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801D51D4: -/* 801D51D4 C0 3E 0F C8 */ lfs f1, 0xfc8(r30) -/* 801D51D8 C0 1E 0F D0 */ lfs f0, 0xfd0(r30) -/* 801D51DC EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D51E0 D0 1E 0F D8 */ stfs f0, 0xfd8(r30) -/* 801D51E4 C0 3E 0F CC */ lfs f1, 0xfcc(r30) -/* 801D51E8 C0 1E 0F D4 */ lfs f0, 0xfd4(r30) -/* 801D51EC EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D51F0 D0 1E 0F DC */ stfs f0, 0xfdc(r30) -/* 801D51F4 C0 5E 0F C8 */ lfs f2, 0xfc8(r30) -/* 801D51F8 C0 3E 11 B4 */ lfs f1, 0x11b4(r30) -/* 801D51FC C0 1E 11 8C */ lfs f0, 0x118c(r30) -/* 801D5200 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D5204 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D5208 D0 1E 11 9C */ stfs f0, 0x119c(r30) -/* 801D520C C0 5E 0F CC */ lfs f2, 0xfcc(r30) -/* 801D5210 C0 3E 11 B8 */ lfs f1, 0x11b8(r30) -/* 801D5214 C0 1E 11 90 */ lfs f0, 0x1190(r30) -/* 801D5218 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D521C EC 02 00 2A */ fadds f0, f2, f0 -/* 801D5220 D0 1E 11 A0 */ stfs f0, 0x11a0(r30) -/* 801D5224 7F C3 F3 78 */ mr r3, r30 -/* 801D5228 4B FF D8 0D */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D522C 7F C3 F3 78 */ mr r3, r30 -/* 801D5230 4B FF D7 89 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv -/* 801D5234 38 00 00 00 */ li r0, 0 -/* 801D5238 98 1E 12 2D */ stb r0, 0x122d(r30) -/* 801D523C C0 5E 0F C8 */ lfs f2, 0xfc8(r30) -/* 801D5240 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 801D5244 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 801D5248 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D524C FC 00 00 50 */ fneg f0, f0 -/* 801D5250 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D5254 40 81 00 10 */ ble lbl_801D5264 -/* 801D5258 88 1E 12 2D */ lbz r0, 0x122d(r30) -/* 801D525C 60 00 00 01 */ ori r0, r0, 1 -/* 801D5260 98 1E 12 2D */ stb r0, 0x122d(r30) -lbl_801D5264: -/* 801D5264 C0 3E 0F C8 */ lfs f1, 0xfc8(r30) -/* 801D5268 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801D526C EC 00 F8 28 */ fsubs f0, f0, f31 -/* 801D5270 FC 00 00 50 */ fneg f0, f0 -/* 801D5274 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D5278 40 80 00 10 */ bge lbl_801D5288 -/* 801D527C 88 1E 12 2D */ lbz r0, 0x122d(r30) -/* 801D5280 60 00 00 04 */ ori r0, r0, 4 -/* 801D5284 98 1E 12 2D */ stb r0, 0x122d(r30) -lbl_801D5288: -/* 801D5288 C0 5E 0F CC */ lfs f2, 0xfcc(r30) -/* 801D528C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801D5290 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801D5294 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D5298 FC 00 00 50 */ fneg f0, f0 -/* 801D529C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D52A0 40 81 00 10 */ ble lbl_801D52B0 -/* 801D52A4 88 1E 12 2D */ lbz r0, 0x122d(r30) -/* 801D52A8 60 00 00 08 */ ori r0, r0, 8 -/* 801D52AC 98 1E 12 2D */ stb r0, 0x122d(r30) -lbl_801D52B0: -/* 801D52B0 C0 3E 0F CC */ lfs f1, 0xfcc(r30) -/* 801D52B4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801D52B8 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 801D52BC FC 00 00 50 */ fneg f0, f0 -/* 801D52C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D52C4 40 80 00 10 */ bge lbl_801D52D4 -/* 801D52C8 88 1E 12 2D */ lbz r0, 0x122d(r30) -/* 801D52CC 60 00 00 02 */ ori r0, r0, 2 -/* 801D52D0 98 1E 12 2D */ stb r0, 0x122d(r30) -lbl_801D52D4: -/* 801D52D4 80 7E 0C E0 */ lwz r3, 0xce0(r30) -/* 801D52D8 38 80 00 00 */ li r4, 0 -/* 801D52DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D52E0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801D52E4 7D 89 03 A6 */ mtctr r12 -/* 801D52E8 4E 80 04 21 */ bctrl -lbl_801D52EC: -/* 801D52EC E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 801D52F0 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 801D52F4 E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 801D52F8 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 801D52FC E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 801D5300 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 801D5304 E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 801D5308 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 801D530C E3 61 00 48 */ psq_l f27, 72(r1), 0, 0 /* qr0 */ -/* 801D5310 CB 61 00 40 */ lfd f27, 0x40(r1) -/* 801D5314 E3 41 00 38 */ psq_l f26, 56(r1), 0, 0 /* qr0 */ -/* 801D5318 CB 41 00 30 */ lfd f26, 0x30(r1) -/* 801D531C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D5320 48 18 CF 05 */ bl _restgpr_28 -/* 801D5324 80 01 00 94 */ lwz r0, 0x94(r1) -/* 801D5328 7C 08 03 A6 */ mtlr r0 -/* 801D532C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801D5330 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/stageOriginDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/stageOriginDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 6a250f59e3..0000000000 --- a/asm/d/menu/d_menu_fmap2D/stageOriginDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_801D3BBC: -/* 801D3BBC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D3BC0 7C 08 02 A6 */ mflr r0 -/* 801D3BC4 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D3BC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3BCC 48 18 E6 0D */ bl _savegpr_28 -/* 801D3BD0 7C 7C 1B 78 */ mr r28, r3 -/* 801D3BD4 80 63 0D 88 */ lwz r3, 0xd88(r3) -/* 801D3BD8 28 03 00 00 */ cmplwi r3, 0 -/* 801D3BDC 41 82 00 C4 */ beq lbl_801D3CA0 -/* 801D3BE0 3B C3 00 04 */ addi r30, r3, 4 -/* 801D3BE4 3B A0 00 00 */ li r29, 0 -/* 801D3BE8 3B E0 00 00 */ li r31, 0 -/* 801D3BEC 48 00 00 A8 */ b lbl_801D3C94 -lbl_801D3BF0: -/* 801D3BF0 88 BC 12 27 */ lbz r5, 0x1227(r28) -/* 801D3BF4 38 65 00 01 */ addi r3, r5, 1 -/* 801D3BF8 7C 9E FA 14 */ add r4, r30, r31 -/* 801D3BFC 88 04 00 09 */ lbz r0, 9(r4) -/* 801D3C00 7C 03 00 00 */ cmpw r3, r0 -/* 801D3C04 40 82 00 88 */ bne lbl_801D3C8C -/* 801D3C08 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d -/* 801D3C0C 7C BC 02 14 */ add r5, r28, r0 -/* 801D3C10 7F 83 E3 78 */ mr r3, r28 -/* 801D3C14 C0 25 10 04 */ lfs f1, 0x1004(r5) -/* 801D3C18 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 801D3C1C EC 21 00 2A */ fadds f1, f1, f0 -/* 801D3C20 C0 1C 0F C8 */ lfs f0, 0xfc8(r28) -/* 801D3C24 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D3C28 C0 45 10 24 */ lfs f2, 0x1024(r5) -/* 801D3C2C C0 04 00 10 */ lfs f0, 0x10(r4) -/* 801D3C30 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D3C34 C0 1C 0F CC */ lfs f0, 0xfcc(r28) -/* 801D3C38 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801D3C3C 38 81 00 14 */ addi r4, r1, 0x14 -/* 801D3C40 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D3C44 4B FF D0 D5 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3C48 38 00 00 00 */ li r0, 0 -/* 801D3C4C 98 01 00 08 */ stb r0, 8(r1) -/* 801D3C50 98 01 00 09 */ stb r0, 9(r1) -/* 801D3C54 38 00 00 FF */ li r0, 0xff -/* 801D3C58 98 01 00 0A */ stb r0, 0xa(r1) -/* 801D3C5C 98 01 00 0B */ stb r0, 0xb(r1) -/* 801D3C60 80 01 00 08 */ lwz r0, 8(r1) -/* 801D3C64 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D3C68 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801D3C6C C0 42 A7 F0 */ lfs f2, lit_4204(r2) -/* 801D3C70 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801D3C74 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801D3C78 EC 40 10 28 */ fsubs f2, f0, f2 -/* 801D3C7C C0 62 A7 F4 */ lfs f3, lit_4205(r2) -/* 801D3C80 FC 80 18 90 */ fmr f4, f3 -/* 801D3C84 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3C88 48 11 5E 3D */ bl J2DFillBox__FffffQ28JUtility6TColor -lbl_801D3C8C: -/* 801D3C8C 3B BD 00 01 */ addi r29, r29, 1 -/* 801D3C90 3B FF 00 14 */ addi r31, r31, 0x14 -lbl_801D3C94: -/* 801D3C94 88 1C 12 25 */ lbz r0, 0x1225(r28) -/* 801D3C98 7C 1D 00 00 */ cmpw r29, r0 -/* 801D3C9C 41 80 FF 54 */ blt lbl_801D3BF0 -lbl_801D3CA0: -/* 801D3CA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3CA4 48 18 E5 81 */ bl _restgpr_28 -/* 801D3CA8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D3CAC 7C 08 03 A6 */ mtlr r0 -/* 801D3CB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3CB4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/stageTextureDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/stageTextureDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 76c80693a7..0000000000 --- a/asm/d/menu/d_menu_fmap2D/stageTextureDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_801D3094: -/* 801D3094 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801D3098 7C 08 02 A6 */ mflr r0 -/* 801D309C 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D30A0 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 801D30A4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 801D30A8 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 801D30AC F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 801D30B0 DB A1 00 20 */ stfd f29, 0x20(r1) -/* 801D30B4 F3 A1 00 28 */ psq_st f29, 40(r1), 0, 0 /* qr0 */ -/* 801D30B8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801D30BC 7C 7F 1B 78 */ mr r31, r3 -/* 801D30C0 88 03 12 2F */ lbz r0, 0x122f(r3) -/* 801D30C4 28 00 00 00 */ cmplwi r0, 0 -/* 801D30C8 41 82 00 3C */ beq lbl_801D3104 -/* 801D30CC 80 7F 0C D4 */ lwz r3, 0xcd4(r31) -/* 801D30D0 C0 22 A7 E4 */ lfs f1, lit_4201(r2) -/* 801D30D4 C0 1F 0F C4 */ lfs f0, 0xfc4(r31) -/* 801D30D8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D30DC C0 1F 11 D8 */ lfs f0, 0x11d8(r31) -/* 801D30E0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D30E4 FC 00 00 1E */ fctiwz f0, f0 -/* 801D30E8 D8 01 00 08 */ stfd f0, 8(r1) -/* 801D30EC 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801D30F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D30F4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D30F8 7D 89 03 A6 */ mtctr r12 -/* 801D30FC 4E 80 04 21 */ bctrl -/* 801D3100 48 00 00 40 */ b lbl_801D3140 -lbl_801D3104: -/* 801D3104 80 7F 0C D4 */ lwz r3, 0xcd4(r31) -/* 801D3108 C0 5F 11 D8 */ lfs f2, 0x11d8(r31) -/* 801D310C C0 22 A7 E4 */ lfs f1, lit_4201(r2) -/* 801D3110 C0 1F 0F C4 */ lfs f0, 0xfc4(r31) -/* 801D3114 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D3118 C0 1F 0F A8 */ lfs f0, 0xfa8(r31) -/* 801D311C EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D3120 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D3124 FC 00 00 1E */ fctiwz f0, f0 -/* 801D3128 D8 01 00 08 */ stfd f0, 8(r1) -/* 801D312C 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801D3130 81 83 00 00 */ lwz r12, 0(r3) -/* 801D3134 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D3138 7D 89 03 A6 */ mtctr r12 -/* 801D313C 4E 80 04 21 */ bctrl -lbl_801D3140: -/* 801D3140 7F E3 FB 78 */ mr r3, r31 -/* 801D3144 4B FF F8 55 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D3148 FF A0 08 90 */ fmr f29, f1 -/* 801D314C 7F E3 FB 78 */ mr r3, r31 -/* 801D3150 4B FF F7 11 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D3154 FF C0 08 90 */ fmr f30, f1 -/* 801D3158 7F E3 FB 78 */ mr r3, r31 -/* 801D315C 4B FF F6 35 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D3160 C0 1F 0F C0 */ lfs f0, 0xfc0(r31) -/* 801D3164 EF E0 08 2A */ fadds f31, f0, f1 -/* 801D3168 7F E3 FB 78 */ mr r3, r31 -/* 801D316C 4B FF F5 CD */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D3170 C0 1F 0F BC */ lfs f0, 0xfbc(r31) -/* 801D3174 EC 20 08 2A */ fadds f1, f0, f1 -/* 801D3178 80 7F 0C D4 */ lwz r3, 0xcd4(r31) -/* 801D317C FC 40 F8 90 */ fmr f2, f31 -/* 801D3180 FC 60 F0 90 */ fmr f3, f30 -/* 801D3184 FC 80 E8 90 */ fmr f4, f29 -/* 801D3188 38 80 00 00 */ li r4, 0 -/* 801D318C 38 A0 00 00 */ li r5, 0 -/* 801D3190 38 C0 00 00 */ li r6, 0 -/* 801D3194 81 83 00 00 */ lwz r12, 0(r3) -/* 801D3198 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801D319C 7D 89 03 A6 */ mtctr r12 -/* 801D31A0 4E 80 04 21 */ bctrl -/* 801D31A4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 801D31A8 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 801D31AC E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 801D31B0 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 801D31B4 E3 A1 00 28 */ psq_l f29, 40(r1), 0, 0 /* qr0 */ -/* 801D31B8 CB A1 00 20 */ lfd f29, 0x20(r1) -/* 801D31BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801D31C0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801D31C4 7C 08 03 A6 */ mtlr r0 -/* 801D31C8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D31CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/worldGridDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/worldGridDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 6f15bce687..0000000000 --- a/asm/d/menu/d_menu_fmap2D/worldGridDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,204 +0,0 @@ -lbl_801D31D0: -/* 801D31D0 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 801D31D4 7C 08 02 A6 */ mflr r0 -/* 801D31D8 90 01 00 94 */ stw r0, 0x94(r1) -/* 801D31DC DB E1 00 80 */ stfd f31, 0x80(r1) -/* 801D31E0 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 801D31E4 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 801D31E8 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 801D31EC DB A1 00 60 */ stfd f29, 0x60(r1) -/* 801D31F0 F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 801D31F4 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 801D31F8 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 801D31FC 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 801D3200 93 C1 00 48 */ stw r30, 0x48(r1) -/* 801D3204 7C 7E 1B 78 */ mr r30, r3 -/* 801D3208 C0 03 0F C8 */ lfs f0, 0xfc8(r3) -/* 801D320C FF E0 00 50 */ fneg f31, f0 -/* 801D3210 C0 03 0F CC */ lfs f0, 0xfcc(r3) -/* 801D3214 FF C0 00 50 */ fneg f30, f0 -/* 801D3218 FC 20 F8 90 */ fmr f1, f31 -/* 801D321C FC 40 F0 90 */ fmr f2, f30 -/* 801D3220 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D3224 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3228 4B FF DA F1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D322C 38 00 00 FF */ li r0, 0xff -/* 801D3230 98 01 00 30 */ stb r0, 0x30(r1) -/* 801D3234 98 01 00 31 */ stb r0, 0x31(r1) -/* 801D3238 98 01 00 32 */ stb r0, 0x32(r1) -/* 801D323C 98 01 00 33 */ stb r0, 0x33(r1) -/* 801D3240 80 01 00 30 */ lwz r0, 0x30(r1) -/* 801D3244 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D3248 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 801D324C C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D3250 FC 60 08 90 */ fmr f3, f1 -/* 801D3254 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D3258 38 61 00 34 */ addi r3, r1, 0x34 -/* 801D325C 38 80 00 06 */ li r4, 6 -/* 801D3260 48 11 67 39 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3264 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D3268 3B E3 FC 60 */ addi r31, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D326C C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D3270 EF 9F 00 28 */ fsubs f28, f31, f0 -lbl_801D3274: -/* 801D3274 7F C3 F3 78 */ mr r3, r30 -/* 801D3278 FC 20 E0 90 */ fmr f1, f28 -/* 801D327C FC 40 F0 90 */ fmr f2, f30 -/* 801D3280 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D3284 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3288 4B FF DA 91 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D328C 7F C3 F3 78 */ mr r3, r30 -/* 801D3290 4B FF F4 A9 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D3294 C0 61 00 3C */ lfs f3, 0x3c(r1) -/* 801D3298 FC 03 08 40 */ fcmpo cr0, f3, f1 -/* 801D329C 4C 41 13 82 */ cror 2, 1, 2 -/* 801D32A0 40 82 00 44 */ bne lbl_801D32E4 -/* 801D32A4 38 00 00 FF */ li r0, 0xff -/* 801D32A8 98 01 00 28 */ stb r0, 0x28(r1) -/* 801D32AC 98 01 00 29 */ stb r0, 0x29(r1) -/* 801D32B0 98 01 00 2A */ stb r0, 0x2a(r1) -/* 801D32B4 98 01 00 2B */ stb r0, 0x2b(r1) -/* 801D32B8 80 01 00 28 */ lwz r0, 0x28(r1) -/* 801D32BC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 801D32C0 FC 20 18 90 */ fmr f1, f3 -/* 801D32C4 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D32C8 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D32CC 38 61 00 2C */ addi r3, r1, 0x2c -/* 801D32D0 38 80 00 06 */ li r4, 6 -/* 801D32D4 48 11 66 C5 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D32D8 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D32DC EF 9C 00 28 */ fsubs f28, f28, f0 -/* 801D32E0 4B FF FF 94 */ b lbl_801D3274 -lbl_801D32E4: -/* 801D32E4 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D32E8 EF 9F 00 2A */ fadds f28, f31, f0 -lbl_801D32EC: -/* 801D32EC 7F C3 F3 78 */ mr r3, r30 -/* 801D32F0 FC 20 E0 90 */ fmr f1, f28 -/* 801D32F4 FC 40 F0 90 */ fmr f2, f30 -/* 801D32F8 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D32FC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3300 4B FF DA 19 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3304 7F C3 F3 78 */ mr r3, r30 -/* 801D3308 4B FF F5 59 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv -/* 801D330C FF A0 08 90 */ fmr f29, f1 -/* 801D3310 7F C3 F3 78 */ mr r3, r30 -/* 801D3314 4B FF F4 25 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv -/* 801D3318 EC 01 E8 2A */ fadds f0, f1, f29 -/* 801D331C C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 801D3320 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801D3324 4C 40 13 82 */ cror 2, 0, 2 -/* 801D3328 40 82 00 44 */ bne lbl_801D336C -/* 801D332C 38 00 00 FF */ li r0, 0xff -/* 801D3330 98 01 00 20 */ stb r0, 0x20(r1) -/* 801D3334 98 01 00 21 */ stb r0, 0x21(r1) -/* 801D3338 98 01 00 22 */ stb r0, 0x22(r1) -/* 801D333C 98 01 00 23 */ stb r0, 0x23(r1) -/* 801D3340 80 01 00 20 */ lwz r0, 0x20(r1) -/* 801D3344 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D3348 C0 42 A7 D0 */ lfs f2, lit_3970(r2) -/* 801D334C FC 60 08 90 */ fmr f3, f1 -/* 801D3350 C0 82 A7 E0 */ lfs f4, lit_4200(r2) -/* 801D3354 38 61 00 24 */ addi r3, r1, 0x24 -/* 801D3358 38 80 00 06 */ li r4, 6 -/* 801D335C 48 11 66 3D */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3360 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D3364 EF 9C 00 2A */ fadds f28, f28, f0 -/* 801D3368 4B FF FF 84 */ b lbl_801D32EC -lbl_801D336C: -/* 801D336C 38 00 00 FF */ li r0, 0xff -/* 801D3370 98 01 00 18 */ stb r0, 0x18(r1) -/* 801D3374 98 01 00 19 */ stb r0, 0x19(r1) -/* 801D3378 98 01 00 1A */ stb r0, 0x1a(r1) -/* 801D337C 98 01 00 1B */ stb r0, 0x1b(r1) -/* 801D3380 80 01 00 18 */ lwz r0, 0x18(r1) -/* 801D3384 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801D3388 C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D338C C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D3390 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D3394 FC 80 10 90 */ fmr f4, f2 -/* 801D3398 38 61 00 1C */ addi r3, r1, 0x1c -/* 801D339C 38 80 00 06 */ li r4, 6 -/* 801D33A0 48 11 65 F9 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D33A4 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D33A8 EF 9E 00 28 */ fsubs f28, f30, f0 -lbl_801D33AC: -/* 801D33AC 7F C3 F3 78 */ mr r3, r30 -/* 801D33B0 FC 20 F8 90 */ fmr f1, f31 -/* 801D33B4 FC 40 E0 90 */ fmr f2, f28 -/* 801D33B8 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D33BC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D33C0 4B FF D9 59 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D33C4 7F C3 F3 78 */ mr r3, r30 -/* 801D33C8 4B FF F3 C9 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D33CC C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D33D0 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 801D33D4 4C 41 13 82 */ cror 2, 1, 2 -/* 801D33D8 40 82 00 44 */ bne lbl_801D341C -/* 801D33DC 38 00 00 FF */ li r0, 0xff -/* 801D33E0 98 01 00 10 */ stb r0, 0x10(r1) -/* 801D33E4 98 01 00 11 */ stb r0, 0x11(r1) -/* 801D33E8 98 01 00 12 */ stb r0, 0x12(r1) -/* 801D33EC 98 01 00 13 */ stb r0, 0x13(r1) -/* 801D33F0 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D33F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D33F8 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D33FC C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D3400 FC 80 10 90 */ fmr f4, f2 -/* 801D3404 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D3408 38 80 00 06 */ li r4, 6 -/* 801D340C 48 11 65 8D */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3410 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D3414 EF 9C 00 28 */ fsubs f28, f28, f0 -/* 801D3418 4B FF FF 94 */ b lbl_801D33AC -lbl_801D341C: -/* 801D341C C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D3420 EF 9E 00 2A */ fadds f28, f30, f0 -lbl_801D3424: -/* 801D3424 7F C3 F3 78 */ mr r3, r30 -/* 801D3428 FC 20 F8 90 */ fmr f1, f31 -/* 801D342C FC 40 E0 90 */ fmr f2, f28 -/* 801D3430 38 81 00 3C */ addi r4, r1, 0x3c -/* 801D3434 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3438 4B FF D8 E1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D343C 7F C3 F3 78 */ mr r3, r30 -/* 801D3440 4B FF F5 59 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv -/* 801D3444 FF C0 08 90 */ fmr f30, f1 -/* 801D3448 7F C3 F3 78 */ mr r3, r30 -/* 801D344C 4B FF F3 45 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv -/* 801D3450 EC 01 F0 2A */ fadds f0, f1, f30 -/* 801D3454 C0 41 00 38 */ lfs f2, 0x38(r1) -/* 801D3458 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801D345C 4C 40 13 82 */ cror 2, 0, 2 -/* 801D3460 40 82 00 44 */ bne lbl_801D34A4 -/* 801D3464 38 00 00 FF */ li r0, 0xff -/* 801D3468 98 01 00 08 */ stb r0, 8(r1) -/* 801D346C 98 01 00 09 */ stb r0, 9(r1) -/* 801D3470 98 01 00 0A */ stb r0, 0xa(r1) -/* 801D3474 98 01 00 0B */ stb r0, 0xb(r1) -/* 801D3478 80 01 00 08 */ lwz r0, 8(r1) -/* 801D347C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D3480 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D3484 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D3488 FC 80 10 90 */ fmr f4, f2 -/* 801D348C 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3490 38 80 00 06 */ li r4, 6 -/* 801D3494 48 11 65 05 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D3498 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 801D349C EF 9C 00 2A */ fadds f28, f28, f0 -/* 801D34A0 4B FF FF 84 */ b lbl_801D3424 -lbl_801D34A4: -/* 801D34A4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 801D34A8 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 801D34AC E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 801D34B0 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 801D34B4 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 801D34B8 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 801D34BC E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 801D34C0 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 801D34C4 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 801D34C8 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 801D34CC 80 01 00 94 */ lwz r0, 0x94(r1) -/* 801D34D0 7C 08 03 A6 */ mtlr r0 -/* 801D34D4 38 21 00 90 */ addi r1, r1, 0x90 -/* 801D34D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/worldOriginDraw__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/worldOriginDraw__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index 6c5f542957..0000000000 --- a/asm/d/menu/d_menu_fmap2D/worldOriginDraw__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_801D382C: -/* 801D382C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D3830 7C 08 02 A6 */ mflr r0 -/* 801D3834 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D3838 C0 03 0F C8 */ lfs f0, 0xfc8(r3) -/* 801D383C FC 20 00 50 */ fneg f1, f0 -/* 801D3840 C0 03 0F CC */ lfs f0, 0xfcc(r3) -/* 801D3844 FC 40 00 50 */ fneg f2, f0 -/* 801D3848 38 81 00 1C */ addi r4, r1, 0x1c -/* 801D384C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D3850 4B FF D4 C9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf -/* 801D3854 38 60 00 00 */ li r3, 0 -/* 801D3858 98 61 00 10 */ stb r3, 0x10(r1) -/* 801D385C 38 00 00 FF */ li r0, 0xff -/* 801D3860 98 01 00 11 */ stb r0, 0x11(r1) -/* 801D3864 98 61 00 12 */ stb r3, 0x12(r1) -/* 801D3868 98 01 00 13 */ stb r0, 0x13(r1) -/* 801D386C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801D3870 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D3874 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801D3878 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801D387C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D3880 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D3884 EC 40 08 2A */ fadds f2, f0, f1 -/* 801D3888 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D388C EC 80 18 2A */ fadds f4, f0, f3 -/* 801D3890 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D3894 38 80 00 06 */ li r4, 6 -/* 801D3898 48 11 61 01 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D389C 38 60 00 00 */ li r3, 0 -/* 801D38A0 98 61 00 08 */ stb r3, 8(r1) -/* 801D38A4 38 00 00 FF */ li r0, 0xff -/* 801D38A8 98 01 00 09 */ stb r0, 9(r1) -/* 801D38AC 98 61 00 0A */ stb r3, 0xa(r1) -/* 801D38B0 98 01 00 0B */ stb r0, 0xb(r1) -/* 801D38B4 80 01 00 08 */ lwz r0, 8(r1) -/* 801D38B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801D38BC C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801D38C0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801D38C4 EC 81 00 2A */ fadds f4, f1, f0 -/* 801D38C8 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D38CC C0 02 A8 10 */ lfs f0, lit_5133(r2) -/* 801D38D0 EC 44 00 2A */ fadds f2, f4, f0 -/* 801D38D4 C0 62 A7 DC */ lfs f3, lit_4199(r2) -/* 801D38D8 C0 02 A8 14 */ lfs f0, lit_5134(r2) -/* 801D38DC EC 84 00 2A */ fadds f4, f4, f0 -/* 801D38E0 38 61 00 0C */ addi r3, r1, 0xc -/* 801D38E4 38 80 00 06 */ li r4, 6 -/* 801D38E8 48 11 60 B1 */ bl J2DDrawLine__FffffQ28JUtility6TColori -/* 801D38EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D38F0 7C 08 03 A6 */ mtlr r0 -/* 801D38F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D38F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/zoomMapCalc2__18dMenu_Fmap2DBack_cFf.s b/asm/d/menu/d_menu_fmap2D/zoomMapCalc2__18dMenu_Fmap2DBack_cFf.s deleted file mode 100644 index 47e022e27a..0000000000 --- a/asm/d/menu/d_menu_fmap2D/zoomMapCalc2__18dMenu_Fmap2DBack_cFf.s +++ /dev/null @@ -1,262 +0,0 @@ -lbl_801D1478: -/* 801D1478 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801D147C 7C 08 02 A6 */ mflr r0 -/* 801D1480 90 01 00 44 */ stw r0, 0x44(r1) -/* 801D1484 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 801D1488 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 801D148C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 801D1490 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 801D1494 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1498 48 19 0D 3D */ bl _savegpr_27 -/* 801D149C 7C 7F 1B 78 */ mr r31, r3 -/* 801D14A0 FF C0 08 90 */ fmr f30, f1 -/* 801D14A4 48 00 17 A9 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D14A8 FF E0 08 90 */ fmr f31, f1 -/* 801D14AC 7F E3 FB 78 */ mr r3, r31 -/* 801D14B0 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D14B4 48 00 16 B1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D14B8 EC 1F 08 28 */ fsubs f0, f31, f1 -/* 801D14BC EC 1E 00 32 */ fmuls f0, f30, f0 -/* 801D14C0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801D14C4 D0 1F 0F 9C */ stfs f0, 0xf9c(r31) -/* 801D14C8 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D14CC C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D14D0 EC 41 00 2A */ fadds f2, f1, f0 -/* 801D14D4 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D14D8 54 00 10 3A */ slwi r0, r0, 2 -/* 801D14DC 7C 7F 02 14 */ add r3, r31, r0 -/* 801D14E0 C0 63 0D 8C */ lfs f3, 0xd8c(r3) -/* 801D14E4 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 801D14E8 40 80 00 3C */ bge lbl_801D1524 -/* 801D14EC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D14F0 C0 1F 11 A4 */ lfs f0, 0x11a4(r31) -/* 801D14F4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D14F8 40 82 00 0C */ bne lbl_801D1504 -/* 801D14FC EC 02 18 28 */ fsubs f0, f2, f3 -/* 801D1500 D0 1F 11 A4 */ stfs f0, 0x11a4(r31) -lbl_801D1504: -/* 801D1504 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1508 54 00 10 3A */ slwi r0, r0, 2 -/* 801D150C 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1510 C0 23 0D 8C */ lfs f1, 0xd8c(r3) -/* 801D1514 C0 1F 11 8C */ lfs f0, 0x118c(r31) -/* 801D1518 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D151C D0 1F 11 9C */ stfs f0, 0x119c(r31) -/* 801D1520 48 00 00 44 */ b lbl_801D1564 -lbl_801D1524: -/* 801D1524 C0 63 0D CC */ lfs f3, 0xdcc(r3) -/* 801D1528 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 801D152C 40 81 00 38 */ ble lbl_801D1564 -/* 801D1530 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D1534 C0 1F 11 A4 */ lfs f0, 0x11a4(r31) -/* 801D1538 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D153C 40 82 00 0C */ bne lbl_801D1548 -/* 801D1540 EC 02 18 28 */ fsubs f0, f2, f3 -/* 801D1544 D0 1F 11 A4 */ stfs f0, 0x11a4(r31) -lbl_801D1548: -/* 801D1548 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D154C 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1550 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1554 C0 23 0D CC */ lfs f1, 0xdcc(r3) -/* 801D1558 C0 1F 11 8C */ lfs f0, 0x118c(r31) -/* 801D155C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1560 D0 1F 11 9C */ stfs f0, 0x119c(r31) -lbl_801D1564: -/* 801D1564 C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D1568 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D156C EC 41 00 2A */ fadds f2, f1, f0 -/* 801D1570 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1574 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1578 7C 7F 02 14 */ add r3, r31, r0 -/* 801D157C C0 63 0D AC */ lfs f3, 0xdac(r3) -/* 801D1580 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 801D1584 40 80 00 3C */ bge lbl_801D15C0 -/* 801D1588 C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D158C C0 1F 11 A8 */ lfs f0, 0x11a8(r31) -/* 801D1590 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D1594 40 82 00 0C */ bne lbl_801D15A0 -/* 801D1598 EC 02 18 28 */ fsubs f0, f2, f3 -/* 801D159C D0 1F 11 A8 */ stfs f0, 0x11a8(r31) -lbl_801D15A0: -/* 801D15A0 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D15A4 54 00 10 3A */ slwi r0, r0, 2 -/* 801D15A8 7C 7F 02 14 */ add r3, r31, r0 -/* 801D15AC C0 23 0D AC */ lfs f1, 0xdac(r3) -/* 801D15B0 C0 1F 11 90 */ lfs f0, 0x1190(r31) -/* 801D15B4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D15B8 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -/* 801D15BC 48 00 00 44 */ b lbl_801D1600 -lbl_801D15C0: -/* 801D15C0 C0 63 0D EC */ lfs f3, 0xdec(r3) -/* 801D15C4 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 801D15C8 40 81 00 38 */ ble lbl_801D1600 -/* 801D15CC C0 22 A7 D0 */ lfs f1, lit_3970(r2) -/* 801D15D0 C0 1F 11 A8 */ lfs f0, 0x11a8(r31) -/* 801D15D4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801D15D8 40 82 00 0C */ bne lbl_801D15E4 -/* 801D15DC EC 02 18 28 */ fsubs f0, f2, f3 -/* 801D15E0 D0 1F 11 A8 */ stfs f0, 0x11a8(r31) -lbl_801D15E4: -/* 801D15E4 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D15E8 54 00 10 3A */ slwi r0, r0, 2 -/* 801D15EC 7C 7F 02 14 */ add r3, r31, r0 -/* 801D15F0 C0 23 0D EC */ lfs f1, 0xdec(r3) -/* 801D15F4 C0 1F 11 90 */ lfs f0, 0x1190(r31) -/* 801D15F8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D15FC D0 1F 11 A0 */ stfs f0, 0x11a0(r31) -lbl_801D1600: -/* 801D1600 7F E3 FB 78 */ mr r3, r31 -/* 801D1604 48 00 14 31 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D1608 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D160C EC 00 F0 2A */ fadds f0, f0, f30 -/* 801D1610 D0 1F 0F A0 */ stfs f0, 0xfa0(r31) -/* 801D1614 7F E3 FB 78 */ mr r3, r31 -/* 801D1618 48 00 10 61 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D161C FF E0 08 90 */ fmr f31, f1 -/* 801D1620 7F E3 FB 78 */ mr r3, r31 -/* 801D1624 48 00 10 A5 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D1628 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D162C 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D1630 88 03 03 08 */ lbz r0, 0x308(r3) -/* 801D1634 28 00 00 00 */ cmplwi r0, 0 -/* 801D1638 40 82 00 64 */ bne lbl_801D169C -/* 801D163C 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1640 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1644 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D1648 7C 7F 02 14 */ add r3, r31, r0 -/* 801D164C C0 43 0E CC */ lfs f2, 0xecc(r3) -/* 801D1650 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1654 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D1658 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D165C EC 5F 00 28 */ fsubs f2, f31, f0 -/* 801D1660 C0 03 0E 8C */ lfs f0, 0xe8c(r3) -/* 801D1664 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D1668 D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D166C 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1670 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1674 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1678 C0 43 0E EC */ lfs f2, 0xeec(r3) -/* 801D167C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1680 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D1684 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D1688 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D168C C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D1690 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1694 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -/* 801D1698 48 00 00 B0 */ b lbl_801D1748 -lbl_801D169C: -/* 801D169C 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D16A0 54 00 10 3A */ slwi r0, r0, 2 -/* 801D16A4 7C 7F 02 14 */ add r3, r31, r0 -/* 801D16A8 C0 43 0E AC */ lfs f2, 0xeac(r3) -/* 801D16AC C0 82 A7 E8 */ lfs f4, lit_4202(r2) -/* 801D16B0 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D16B4 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D16B8 EC 62 00 2A */ fadds f3, f2, f0 -/* 801D16BC C0 43 0E 2C */ lfs f2, 0xe2c(r3) -/* 801D16C0 C0 03 0E 6C */ lfs f0, 0xe6c(r3) -/* 801D16C4 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D16C8 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D16CC ED 03 00 28 */ fsubs f8, f3, f0 -/* 801D16D0 C0 E3 0E 8C */ lfs f7, 0xe8c(r3) -/* 801D16D4 C0 BF 0F 9C */ lfs f5, 0xf9c(r31) -/* 801D16D8 C0 C3 0E CC */ lfs f6, 0xecc(r3) -/* 801D16DC EC 04 01 B2 */ fmuls f0, f4, f6 -/* 801D16E0 EC 67 00 2A */ fadds f3, f7, f0 -/* 801D16E4 C0 43 0E 0C */ lfs f2, 0xe0c(r3) -/* 801D16E8 C0 03 0E 4C */ lfs f0, 0xe4c(r3) -/* 801D16EC EC 02 00 2A */ fadds f0, f2, f0 -/* 801D16F0 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D16F4 EC 03 00 28 */ fsubs f0, f3, f0 -/* 801D16F8 EC 00 01 72 */ fmuls f0, f0, f5 -/* 801D16FC EC 5F 00 2A */ fadds f2, f31, f0 -/* 801D1700 EC 06 01 72 */ fmuls f0, f6, f5 -/* 801D1704 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1708 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D170C EC 00 38 28 */ fsubs f0, f0, f7 -/* 801D1710 D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D1714 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1718 54 00 10 3A */ slwi r0, r0, 2 -/* 801D171C C0 5F 0F 9C */ lfs f2, 0xf9c(r31) -/* 801D1720 EC 08 00 B2 */ fmuls f0, f8, f2 -/* 801D1724 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1728 7C 7F 02 14 */ add r3, r31, r0 -/* 801D172C C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D1730 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 801D1734 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1738 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D173C C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D1740 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1744 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -lbl_801D1748: -/* 801D1748 3B 60 00 00 */ li r27, 0 -/* 801D174C 3B C0 00 00 */ li r30, 0 -lbl_801D1750: -/* 801D1750 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1754 7C 1B 00 00 */ cmpw r27, r0 -/* 801D1758 41 82 00 74 */ beq lbl_801D17CC -/* 801D175C 7F 9F F2 14 */ add r28, r31, r30 -/* 801D1760 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1764 7F BF 02 14 */ add r29, r31, r0 -/* 801D1768 7F E3 FB 78 */ mr r3, r31 -/* 801D176C 48 00 13 F1 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1770 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1774 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D1778 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) -/* 801D177C C0 1D 0E 8C */ lfs f0, 0xe8c(r29) -/* 801D1780 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1784 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D1788 C0 1D 0F 0C */ lfs f0, 0xf0c(r29) -/* 801D178C EC 00 08 2A */ fadds f0, f0, f1 -/* 801D1790 D0 1C 0F 0C */ stfs f0, 0xf0c(r28) -/* 801D1794 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1798 54 00 10 3A */ slwi r0, r0, 2 -/* 801D179C 7F BF 02 14 */ add r29, r31, r0 -/* 801D17A0 7F E3 FB 78 */ mr r3, r31 -/* 801D17A4 48 00 13 B9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D17A8 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D17AC EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D17B0 C0 3C 0E AC */ lfs f1, 0xeac(r28) -/* 801D17B4 C0 1D 0E AC */ lfs f0, 0xeac(r29) -/* 801D17B8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D17BC EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D17C0 C0 1D 0F 2C */ lfs f0, 0xf2c(r29) -/* 801D17C4 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D17C8 D0 1C 0F 2C */ stfs f0, 0xf2c(r28) -lbl_801D17CC: -/* 801D17CC 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D17D0 2C 1B 00 08 */ cmpwi r27, 8 -/* 801D17D4 3B DE 00 04 */ addi r30, r30, 4 -/* 801D17D8 41 80 FF 78 */ blt lbl_801D1750 -/* 801D17DC 7F E3 FB 78 */ mr r3, r31 -/* 801D17E0 FC 20 F0 90 */ fmr f1, f30 -/* 801D17E4 48 00 02 C1 */ bl scrollCalc__18dMenu_Fmap2DBack_cFf -/* 801D17E8 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D17EC FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 801D17F0 40 82 00 40 */ bne lbl_801D1830 -/* 801D17F4 C0 3F 11 8C */ lfs f1, 0x118c(r31) -/* 801D17F8 C0 1F 11 9C */ lfs f0, 0x119c(r31) -/* 801D17FC EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1800 C0 1F 0F C8 */ lfs f0, 0xfc8(r31) -/* 801D1804 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1808 D0 1F 11 B4 */ stfs f0, 0x11b4(r31) -/* 801D180C C0 3F 11 90 */ lfs f1, 0x1190(r31) -/* 801D1810 C0 1F 11 A0 */ lfs f0, 0x11a0(r31) -/* 801D1814 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1818 C0 1F 0F CC */ lfs f0, 0xfcc(r31) -/* 801D181C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1820 D0 1F 11 B8 */ stfs f0, 0x11b8(r31) -/* 801D1824 C0 02 A7 D0 */ lfs f0, lit_3970(r2) -/* 801D1828 D0 1F 11 A4 */ stfs f0, 0x11a4(r31) -/* 801D182C D0 1F 11 A8 */ stfs f0, 0x11a8(r31) -lbl_801D1830: -/* 801D1830 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 801D1834 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 801D1838 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 801D183C CB C1 00 20 */ lfd f30, 0x20(r1) -/* 801D1840 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1844 48 19 09 DD */ bl _restgpr_27 -/* 801D1848 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801D184C 7C 08 03 A6 */ mtlr r0 -/* 801D1850 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D1854 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv.s b/asm/d/menu/d_menu_fmap2D/zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv.s deleted file mode 100644 index cdfaca3fb0..0000000000 --- a/asm/d/menu/d_menu_fmap2D/zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv.s +++ /dev/null @@ -1,153 +0,0 @@ -lbl_801D1858: -/* 801D1858 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D185C 7C 08 02 A6 */ mflr r0 -/* 801D1860 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D1864 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 801D1868 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 801D186C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1870 48 19 09 65 */ bl _savegpr_27 -/* 801D1874 7C 7F 1B 78 */ mr r31, r3 -/* 801D1878 48 00 13 D5 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D187C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1880 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801D1884 41 82 02 00 */ beq lbl_801D1A84 -/* 801D1888 7F E3 FB 78 */ mr r3, r31 -/* 801D188C 48 00 13 C1 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1890 7F E3 FB 78 */ mr r3, r31 -/* 801D1894 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D1898 48 00 12 CD */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D189C 7F E3 FB 78 */ mr r3, r31 -/* 801D18A0 48 00 13 AD */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D18A4 D0 3F 0F 9C */ stfs f1, 0xf9c(r31) -/* 801D18A8 7F E3 FB 78 */ mr r3, r31 -/* 801D18AC 48 00 11 89 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D18B0 7F E3 FB 78 */ mr r3, r31 -/* 801D18B4 48 00 0D C5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D18B8 FF E0 08 90 */ fmr f31, f1 -/* 801D18BC 7F E3 FB 78 */ mr r3, r31 -/* 801D18C0 48 00 0E 09 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D18C4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D18C8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D18CC 88 03 03 08 */ lbz r0, 0x308(r3) -/* 801D18D0 28 00 00 00 */ cmplwi r0, 0 -/* 801D18D4 40 82 00 64 */ bne lbl_801D1938 -/* 801D18D8 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D18DC 54 00 10 3A */ slwi r0, r0, 2 -/* 801D18E0 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D18E4 7C 7F 02 14 */ add r3, r31, r0 -/* 801D18E8 C0 43 0E CC */ lfs f2, 0xecc(r3) -/* 801D18EC C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D18F0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D18F4 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D18F8 EC 5F 00 28 */ fsubs f2, f31, f0 -/* 801D18FC C0 03 0E 8C */ lfs f0, 0xe8c(r3) -/* 801D1900 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D1904 D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D1908 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D190C 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1910 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1914 C0 43 0E EC */ lfs f2, 0xeec(r3) -/* 801D1918 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D191C EC 02 00 32 */ fmuls f0, f2, f0 -/* 801D1920 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D1924 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D1928 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D192C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1930 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -/* 801D1934 48 00 00 B0 */ b lbl_801D19E4 -lbl_801D1938: -/* 801D1938 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D193C 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1940 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1944 C0 43 0E AC */ lfs f2, 0xeac(r3) -/* 801D1948 C0 82 A7 E8 */ lfs f4, lit_4202(r2) -/* 801D194C C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D1950 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1954 EC 62 00 2A */ fadds f3, f2, f0 -/* 801D1958 C0 43 0E 2C */ lfs f2, 0xe2c(r3) -/* 801D195C C0 03 0E 6C */ lfs f0, 0xe6c(r3) -/* 801D1960 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D1964 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1968 ED 03 00 28 */ fsubs f8, f3, f0 -/* 801D196C C0 E3 0E 8C */ lfs f7, 0xe8c(r3) -/* 801D1970 C0 BF 0F 9C */ lfs f5, 0xf9c(r31) -/* 801D1974 C0 C3 0E CC */ lfs f6, 0xecc(r3) -/* 801D1978 EC 04 01 B2 */ fmuls f0, f4, f6 -/* 801D197C EC 67 00 2A */ fadds f3, f7, f0 -/* 801D1980 C0 43 0E 0C */ lfs f2, 0xe0c(r3) -/* 801D1984 C0 03 0E 4C */ lfs f0, 0xe4c(r3) -/* 801D1988 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D198C EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1990 EC 03 00 28 */ fsubs f0, f3, f0 -/* 801D1994 EC 00 01 72 */ fmuls f0, f0, f5 -/* 801D1998 EC 5F 00 2A */ fadds f2, f31, f0 -/* 801D199C EC 06 01 72 */ fmuls f0, f6, f5 -/* 801D19A0 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D19A4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D19A8 EC 00 38 28 */ fsubs f0, f0, f7 -/* 801D19AC D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D19B0 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D19B4 54 00 10 3A */ slwi r0, r0, 2 -/* 801D19B8 C0 5F 0F 9C */ lfs f2, 0xf9c(r31) -/* 801D19BC EC 08 00 B2 */ fmuls f0, f8, f2 -/* 801D19C0 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D19C4 7C 7F 02 14 */ add r3, r31, r0 -/* 801D19C8 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D19CC EC 00 00 B2 */ fmuls f0, f0, f2 -/* 801D19D0 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D19D4 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D19D8 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D19DC EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D19E0 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -lbl_801D19E4: -/* 801D19E4 3B 60 00 00 */ li r27, 0 -/* 801D19E8 3B C0 00 00 */ li r30, 0 -lbl_801D19EC: -/* 801D19EC 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D19F0 7C 1B 00 00 */ cmpw r27, r0 -/* 801D19F4 41 82 00 74 */ beq lbl_801D1A68 -/* 801D19F8 7F 9F F2 14 */ add r28, r31, r30 -/* 801D19FC 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1A00 7F BF 02 14 */ add r29, r31, r0 -/* 801D1A04 7F E3 FB 78 */ mr r3, r31 -/* 801D1A08 48 00 11 55 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1A0C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1A10 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D1A14 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) -/* 801D1A18 C0 1D 0E 8C */ lfs f0, 0xe8c(r29) -/* 801D1A1C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1A20 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D1A24 C0 1D 0F 0C */ lfs f0, 0xf0c(r29) -/* 801D1A28 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D1A2C D0 1C 0F 0C */ stfs f0, 0xf0c(r28) -/* 801D1A30 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1A34 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1A38 7F BF 02 14 */ add r29, r31, r0 -/* 801D1A3C 7F E3 FB 78 */ mr r3, r31 -/* 801D1A40 48 00 11 1D */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1A44 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1A48 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D1A4C C0 3C 0E AC */ lfs f1, 0xeac(r28) -/* 801D1A50 C0 1D 0E AC */ lfs f0, 0xeac(r29) -/* 801D1A54 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1A58 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D1A5C C0 1D 0F 2C */ lfs f0, 0xf2c(r29) -/* 801D1A60 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D1A64 D0 1C 0F 2C */ stfs f0, 0xf2c(r28) -lbl_801D1A68: -/* 801D1A68 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D1A6C 2C 1B 00 08 */ cmpwi r27, 8 -/* 801D1A70 3B DE 00 04 */ addi r30, r30, 4 -/* 801D1A74 41 80 FF 78 */ blt lbl_801D19EC -/* 801D1A78 7F E3 FB 78 */ mr r3, r31 -/* 801D1A7C C0 22 A7 D4 */ lfs f1, lit_3971(r2) -/* 801D1A80 48 00 00 25 */ bl scrollCalc__18dMenu_Fmap2DBack_cFf -lbl_801D1A84: -/* 801D1A84 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 801D1A88 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 801D1A8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1A90 48 19 07 91 */ bl _restgpr_27 -/* 801D1A94 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D1A98 7C 08 03 A6 */ mtlr r0 -/* 801D1A9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D1AA0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap2D/zoomMapCalc__18dMenu_Fmap2DBack_cFf.s b/asm/d/menu/d_menu_fmap2D/zoomMapCalc__18dMenu_Fmap2DBack_cFf.s deleted file mode 100644 index 098e169c8d..0000000000 --- a/asm/d/menu/d_menu_fmap2D/zoomMapCalc__18dMenu_Fmap2DBack_cFf.s +++ /dev/null @@ -1,211 +0,0 @@ -lbl_801D1148: -/* 801D1148 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801D114C 7C 08 02 A6 */ mflr r0 -/* 801D1150 90 01 00 54 */ stw r0, 0x54(r1) -/* 801D1154 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 801D1158 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 801D115C DB C1 00 30 */ stfd f30, 0x30(r1) -/* 801D1160 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 801D1164 DB A1 00 20 */ stfd f29, 0x20(r1) -/* 801D1168 F3 A1 00 28 */ psq_st f29, 40(r1), 0, 0 /* qr0 */ -/* 801D116C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1170 48 19 10 65 */ bl _savegpr_27 -/* 801D1174 7C 7F 1B 78 */ mr r31, r3 -/* 801D1178 FF E0 08 90 */ fmr f31, f1 -/* 801D117C D3 E3 0F A0 */ stfs f31, 0xfa0(r3) -/* 801D1180 D3 E3 0F A8 */ stfs f31, 0xfa8(r3) -/* 801D1184 48 00 19 D9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1188 FF C0 08 90 */ fmr f30, f1 -/* 801D118C 7F E3 FB 78 */ mr r3, r31 -/* 801D1190 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D1194 48 00 19 D1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi -/* 801D1198 EC 01 F0 28 */ fsubs f0, f1, f30 -/* 801D119C EF DF 00 32 */ fmuls f30, f31, f0 -/* 801D11A0 7F E3 FB 78 */ mr r3, r31 -/* 801D11A4 48 00 19 B9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D11A8 EC 01 F0 2A */ fadds f0, f1, f30 -/* 801D11AC D0 1F 0F 9C */ stfs f0, 0xf9c(r31) -/* 801D11B0 7F E3 FB 78 */ mr r3, r31 -/* 801D11B4 48 00 18 81 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv -/* 801D11B8 7F E3 FB 78 */ mr r3, r31 -/* 801D11BC 48 00 14 BD */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv -/* 801D11C0 FF C0 08 90 */ fmr f30, f1 -/* 801D11C4 7F E3 FB 78 */ mr r3, r31 -/* 801D11C8 48 00 15 01 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv -/* 801D11CC 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801D11D0 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801D11D4 88 03 03 08 */ lbz r0, 0x308(r3) -/* 801D11D8 28 00 00 00 */ cmplwi r0, 0 -/* 801D11DC 40 82 00 94 */ bne lbl_801D1270 -/* 801D11E0 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D11E4 54 00 10 3A */ slwi r0, r0, 2 -/* 801D11E8 7C 7F 02 14 */ add r3, r31, r0 -/* 801D11EC C0 A3 0E 8C */ lfs f5, 0xe8c(r3) -/* 801D11F0 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D11F4 C0 83 0E CC */ lfs f4, 0xecc(r3) -/* 801D11F8 EC 03 01 32 */ fmuls f0, f3, f4 -/* 801D11FC EC C5 00 2A */ fadds f6, f5, f0 -/* 801D1200 C0 43 0E AC */ lfs f2, 0xeac(r3) -/* 801D1204 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D1208 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D120C EC E2 00 2A */ fadds f7, f2, f0 -/* 801D1210 EC 1E 30 28 */ fsubs f0, f30, f6 -/* 801D1214 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801D1218 EC 46 00 2A */ fadds f2, f6, f0 -/* 801D121C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1220 EC 04 00 32 */ fmuls f0, f4, f0 -/* 801D1224 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D1228 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D122C EC 00 28 28 */ fsubs f0, f0, f5 -/* 801D1230 D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D1234 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1238 54 00 10 3A */ slwi r0, r0, 2 -/* 801D123C EC 01 38 28 */ fsubs f0, f1, f7 -/* 801D1240 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801D1244 EC 47 00 2A */ fadds f2, f7, f0 -/* 801D1248 7C 7F 02 14 */ add r3, r31, r0 -/* 801D124C C0 23 0E EC */ lfs f1, 0xeec(r3) -/* 801D1250 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1254 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801D1258 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D125C EC 22 00 28 */ fsubs f1, f2, f0 -/* 801D1260 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D1264 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1268 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -/* 801D126C 48 00 00 C8 */ b lbl_801D1334 -lbl_801D1270: -/* 801D1270 C0 62 A7 E8 */ lfs f3, lit_4202(r2) -/* 801D1274 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1278 54 00 10 3A */ slwi r0, r0, 2 -/* 801D127C 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1280 C0 43 0E 0C */ lfs f2, 0xe0c(r3) -/* 801D1284 C0 03 0E 4C */ lfs f0, 0xe4c(r3) -/* 801D1288 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D128C EC E3 00 32 */ fmuls f7, f3, f0 -/* 801D1290 C0 43 0E 2C */ lfs f2, 0xe2c(r3) -/* 801D1294 C0 03 0E 6C */ lfs f0, 0xe6c(r3) -/* 801D1298 EC 02 00 2A */ fadds f0, f2, f0 -/* 801D129C ED 03 00 32 */ fmuls f8, f3, f0 -/* 801D12A0 C0 43 0E AC */ lfs f2, 0xeac(r3) -/* 801D12A4 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D12A8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D12AC EC 02 00 2A */ fadds f0, f2, f0 -/* 801D12B0 ED 20 40 28 */ fsubs f9, f0, f8 -/* 801D12B4 C0 C3 0E 8C */ lfs f6, 0xe8c(r3) -/* 801D12B8 C0 9F 0F 9C */ lfs f4, 0xf9c(r31) -/* 801D12BC C0 A3 0E CC */ lfs f5, 0xecc(r3) -/* 801D12C0 EC 1E 38 28 */ fsubs f0, f30, f7 -/* 801D12C4 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801D12C8 EC 47 00 2A */ fadds f2, f7, f0 -/* 801D12CC EC 03 01 72 */ fmuls f0, f3, f5 -/* 801D12D0 EC 06 00 2A */ fadds f0, f6, f0 -/* 801D12D4 EC 00 38 28 */ fsubs f0, f0, f7 -/* 801D12D8 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801D12DC EC 42 00 2A */ fadds f2, f2, f0 -/* 801D12E0 EC 05 01 32 */ fmuls f0, f5, f4 -/* 801D12E4 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D12E8 EC 02 00 28 */ fsubs f0, f2, f0 -/* 801D12EC EC 00 30 28 */ fsubs f0, f0, f6 -/* 801D12F0 D0 03 0F 0C */ stfs f0, 0xf0c(r3) -/* 801D12F4 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D12F8 54 00 10 3A */ slwi r0, r0, 2 -/* 801D12FC C0 5F 0F 9C */ lfs f2, 0xf9c(r31) -/* 801D1300 EC 01 40 28 */ fsubs f0, f1, f8 -/* 801D1304 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801D1308 EC 28 00 2A */ fadds f1, f8, f0 -/* 801D130C EC 09 00 B2 */ fmuls f0, f9, f2 -/* 801D1310 EC 21 00 2A */ fadds f1, f1, f0 -/* 801D1314 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1318 C0 03 0E EC */ lfs f0, 0xeec(r3) -/* 801D131C EC 00 00 B2 */ fmuls f0, f0, f2 -/* 801D1320 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801D1324 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801D1328 C0 03 0E AC */ lfs f0, 0xeac(r3) -/* 801D132C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1330 D0 03 0F 2C */ stfs f0, 0xf2c(r3) -lbl_801D1334: -/* 801D1334 3B 60 00 00 */ li r27, 0 -/* 801D1338 3B C0 00 00 */ li r30, 0 -lbl_801D133C: -/* 801D133C 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1340 7C 1B 00 00 */ cmpw r27, r0 -/* 801D1344 41 82 00 74 */ beq lbl_801D13B8 -/* 801D1348 7F 9F F2 14 */ add r28, r31, r30 -/* 801D134C 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1350 7F BF 02 14 */ add r29, r31, r0 -/* 801D1354 7F E3 FB 78 */ mr r3, r31 -/* 801D1358 48 00 18 05 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D135C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1360 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D1364 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) -/* 801D1368 C0 1D 0E 8C */ lfs f0, 0xe8c(r29) -/* 801D136C EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D1370 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D1374 C0 1D 0F 0C */ lfs f0, 0xf0c(r29) -/* 801D1378 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D137C D0 1C 0F 0C */ stfs f0, 0xf0c(r28) -/* 801D1380 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1384 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1388 7F BF 02 14 */ add r29, r31, r0 -/* 801D138C 7F E3 FB 78 */ mr r3, r31 -/* 801D1390 48 00 17 CD */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv -/* 801D1394 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) -/* 801D1398 EC 40 08 28 */ fsubs f2, f0, f1 -/* 801D139C C0 3C 0E AC */ lfs f1, 0xeac(r28) -/* 801D13A0 C0 1D 0E AC */ lfs f0, 0xeac(r29) -/* 801D13A4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 801D13A8 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 801D13AC C0 1D 0F 2C */ lfs f0, 0xf2c(r29) -/* 801D13B0 EC 00 08 2A */ fadds f0, f0, f1 -/* 801D13B4 D0 1C 0F 2C */ stfs f0, 0xf2c(r28) -lbl_801D13B8: -/* 801D13B8 3B 7B 00 01 */ addi r27, r27, 1 -/* 801D13BC 2C 1B 00 08 */ cmpwi r27, 8 -/* 801D13C0 3B DE 00 04 */ addi r30, r30, 4 -/* 801D13C4 41 80 FF 78 */ blt lbl_801D133C -/* 801D13C8 C0 02 A7 D4 */ lfs f0, lit_3971(r2) -/* 801D13CC FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 801D13D0 40 82 00 2C */ bne lbl_801D13FC -/* 801D13D4 38 60 00 00 */ li r3, 0 -/* 801D13D8 38 00 00 08 */ li r0, 8 -/* 801D13DC 7C 09 03 A6 */ mtctr r0 -lbl_801D13E0: -/* 801D13E0 7C 9F 1A 14 */ add r4, r31, r3 -/* 801D13E4 C0 04 0F 0C */ lfs f0, 0xf0c(r4) -/* 801D13E8 D0 04 0F 4C */ stfs f0, 0xf4c(r4) -/* 801D13EC C0 04 0F 2C */ lfs f0, 0xf2c(r4) -/* 801D13F0 D0 04 0F 6C */ stfs f0, 0xf6c(r4) -/* 801D13F4 38 63 00 04 */ addi r3, r3, 4 -/* 801D13F8 42 00 FF E8 */ bdnz lbl_801D13E0 -lbl_801D13FC: -/* 801D13FC 7F E3 FB 78 */ mr r3, r31 -/* 801D1400 48 00 15 B9 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv -/* 801D1404 7F E3 FB 78 */ mr r3, r31 -/* 801D1408 88 9F 12 29 */ lbz r4, 0x1229(r31) -/* 801D140C 48 00 09 69 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc -/* 801D1410 7F E3 FB 78 */ mr r3, r31 -/* 801D1414 48 00 13 05 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801D1418 FF C0 08 90 */ fmr f30, f1 -/* 801D141C 88 1F 12 27 */ lbz r0, 0x1227(r31) -/* 801D1420 54 00 10 3A */ slwi r0, r0, 2 -/* 801D1424 7C 7F 02 14 */ add r3, r31, r0 -/* 801D1428 C3 A3 0E CC */ lfs f29, 0xecc(r3) -/* 801D142C 7F E3 FB 78 */ mr r3, r31 -/* 801D1430 48 00 12 E9 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv -/* 801D1434 EC 01 E8 28 */ fsubs f0, f1, f29 -/* 801D1438 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 801D143C EC 1D 00 2A */ fadds f0, f29, f0 -/* 801D1440 EC 00 F0 24 */ fdivs f0, f0, f30 -/* 801D1444 D0 1F 0F B8 */ stfs f0, 0xfb8(r31) -/* 801D1448 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 801D144C CB E1 00 40 */ lfd f31, 0x40(r1) -/* 801D1450 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 801D1454 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 801D1458 E3 A1 00 28 */ psq_l f29, 40(r1), 0, 0 /* qr0 */ -/* 801D145C CB A1 00 20 */ lfd f29, 0x20(r1) -/* 801D1460 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1464 48 19 0D BD */ bl _restgpr_27 -/* 801D1468 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801D146C 7C 08 03 A6 */ mtlr r0 -/* 801D1470 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D1474 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/__dt__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/__dt__15renderingFmap_cFv.s deleted file mode 100644 index c761e3bc4b..0000000000 --- a/asm/d/menu/d_menu_fmap_map/__dt__15renderingFmap_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_801CF4D0: -/* 801CF4D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CF4D4 7C 08 02 A6 */ mflr r0 -/* 801CF4D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CF4DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CF4E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801CF4E4 41 82 00 60 */ beq lbl_801CF544 -/* 801CF4E8 3C 60 80 3C */ lis r3, __vt__15renderingFmap_c@ha /* 0x803BD6E8@ha */ -/* 801CF4EC 38 03 D6 E8 */ addi r0, r3, __vt__15renderingFmap_c@l /* 0x803BD6E8@l */ -/* 801CF4F0 90 1F 00 00 */ stw r0, 0(r31) -/* 801CF4F4 41 82 00 40 */ beq lbl_801CF534 -/* 801CF4F8 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 801CF4FC 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 801CF500 90 1F 00 00 */ stw r0, 0(r31) -/* 801CF504 41 82 00 30 */ beq lbl_801CF534 -/* 801CF508 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 801CF50C 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 801CF510 90 1F 00 00 */ stw r0, 0(r31) -/* 801CF514 41 82 00 20 */ beq lbl_801CF534 -/* 801CF518 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 801CF51C 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 801CF520 90 1F 00 00 */ stw r0, 0(r31) -/* 801CF524 41 82 00 10 */ beq lbl_801CF534 -/* 801CF528 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 801CF52C 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 801CF530 90 1F 00 00 */ stw r0, 0(r31) -lbl_801CF534: -/* 801CF534 7C 80 07 35 */ extsh. r0, r4 -/* 801CF538 40 81 00 0C */ ble lbl_801CF544 -/* 801CF53C 7F E3 FB 78 */ mr r3, r31 -/* 801CF540 48 0F F7 FD */ bl __dl__FPv -lbl_801CF544: -/* 801CF544 7F E3 FB 78 */ mr r3, r31 -/* 801CF548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CF54C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CF550 7C 08 03 A6 */ mtlr r0 -/* 801CF554 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CF558 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/_create__15dMenu_FmapMap_cFUsUsUsUsPv.s b/asm/d/menu/d_menu_fmap_map/_create__15dMenu_FmapMap_cFUsUsUsUsPv.s deleted file mode 100644 index 92b272cc26..0000000000 --- a/asm/d/menu/d_menu_fmap_map/_create__15dMenu_FmapMap_cFUsUsUsUsPv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801CEDE8: -/* 801CEDE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CEDEC 7C 08 02 A6 */ mflr r0 -/* 801CEDF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CEDF4 91 03 00 C4 */ stw r8, 0xc4(r3) -/* 801CEDF8 80 03 00 C4 */ lwz r0, 0xc4(r3) -/* 801CEDFC 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 801CEE00 38 00 00 6C */ li r0, 0x6c -/* 801CEE04 90 03 00 CC */ stw r0, 0xcc(r3) -/* 801CEE08 39 00 00 00 */ li r8, 0 -/* 801CEE0C 99 03 00 D8 */ stb r8, 0xd8(r3) -/* 801CEE10 91 03 00 DC */ stw r8, 0xdc(r3) -/* 801CEE14 38 00 FF FF */ li r0, -1 -/* 801CEE18 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 801CEE1C 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801CEE20 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801CEE24 99 03 00 E5 */ stb r8, 0xe5(r3) -/* 801CEE28 48 00 05 6D */ bl setTexture__15dMenu_FmapMap_cFUsUsUsUs -/* 801CEE2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CEE30 7C 08 03 A6 */ mtlr r0 -/* 801CEE34 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CEE38 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/_delete__15dMenu_FmapMap_cFv.s b/asm/d/menu/d_menu_fmap_map/_delete__15dMenu_FmapMap_cFv.s deleted file mode 100644 index 15ce273dd3..0000000000 --- a/asm/d/menu/d_menu_fmap_map/_delete__15dMenu_FmapMap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801CEE3C: -/* 801CEE3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CEE40 7C 08 02 A6 */ mflr r0 -/* 801CEE44 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CEE48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CEE4C 7C 7F 1B 78 */ mr r31, r3 -/* 801CEE50 80 63 00 BC */ lwz r3, 0xbc(r3) -/* 801CEE54 28 03 00 00 */ cmplwi r3, 0 -/* 801CEE58 41 82 00 10 */ beq lbl_801CEE68 -/* 801CEE5C 48 0F FE E1 */ bl __dl__FPv -/* 801CEE60 38 00 00 00 */ li r0, 0 -/* 801CEE64 90 1F 00 BC */ stw r0, 0xbc(r31) -lbl_801CEE68: -/* 801CEE68 80 7F 00 C0 */ lwz r3, 0xc0(r31) -/* 801CEE6C 28 03 00 00 */ cmplwi r3, 0 -/* 801CEE70 41 82 00 10 */ beq lbl_801CEE80 -/* 801CEE74 48 0F FE ED */ bl __dla__FPv -/* 801CEE78 38 00 00 00 */ li r0, 0 -/* 801CEE7C 90 1F 00 C0 */ stw r0, 0xc0(r31) -lbl_801CEE80: -/* 801CEE80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CEE84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CEE88 7C 08 03 A6 */ mtlr r0 -/* 801CEE8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CEE90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getBackColor__15dMenu_FmapMap_cCFv.s b/asm/d/menu/d_menu_fmap_map/getBackColor__15dMenu_FmapMap_cCFv.s deleted file mode 100644 index ca35c63d76..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getBackColor__15dMenu_FmapMap_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_801CF298: -/* 801CF298 38 62 A7 CC */ la r3, l_mapBaseColor(r2) /* 804541CC-_SDA2_BASE_ */ -/* 801CF29C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getColor__15dMenu_FmapMap_cFi.s b/asm/d/menu/d_menu_fmap_map/getColor__15dMenu_FmapMap_cFi.s deleted file mode 100644 index 975546b0ab..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getColor__15dMenu_FmapMap_cFi.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801CF2A0: -/* 801CF2A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CF2A4 7C 08 02 A6 */ mflr r0 -/* 801CF2A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CF2AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF2B0 48 19 2F 25 */ bl _savegpr_27 -/* 801CF2B4 7C 7B 1B 78 */ mr r27, r3 -/* 801CF2B8 7C 9E 23 78 */ mr r30, r4 -/* 801CF2BC 3C 80 80 39 */ lis r4, palNo@ha /* 0x803961B0@ha */ -/* 801CF2C0 3B A4 61 B0 */ addi r29, r4, palNo@l /* 0x803961B0@l */ -/* 801CF2C4 3B FD 00 20 */ addi r31, r29, 0x20 -/* 801CF2C8 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801CF2CC 28 00 00 00 */ cmplwi r0, 0 -/* 801CF2D0 41 82 00 7C */ beq lbl_801CF34C -/* 801CF2D4 88 9B 00 E4 */ lbz r4, 0xe4(r27) -/* 801CF2D8 80 1B 00 A0 */ lwz r0, 0xa0(r27) -/* 801CF2DC 7C 04 00 00 */ cmpw r4, r0 -/* 801CF2E0 40 82 00 6C */ bne lbl_801CF34C -/* 801CF2E4 80 9B 00 98 */ lwz r4, 0x98(r27) -/* 801CF2E8 80 1B 00 DC */ lwz r0, 0xdc(r27) -/* 801CF2EC 7C 04 00 00 */ cmpw r4, r0 -/* 801CF2F0 40 82 00 5C */ bne lbl_801CF34C -/* 801CF2F4 80 1B 00 E8 */ lwz r0, 0xe8(r27) -/* 801CF2F8 28 00 00 00 */ cmplwi r0, 0 -/* 801CF2FC 40 82 00 0C */ bne lbl_801CF308 -/* 801CF300 3B FD 00 68 */ addi r31, r29, 0x68 -/* 801CF304 48 00 00 70 */ b lbl_801CF374 -lbl_801CF308: -/* 801CF308 80 9B 00 9C */ lwz r4, 0x9c(r27) -/* 801CF30C 4B FF F7 D5 */ bl isFlashRoomNoCheck__15dMenu_FmapMap_cCFi -/* 801CF310 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CF314 41 82 00 0C */ beq lbl_801CF320 -/* 801CF318 3B FD 00 68 */ addi r31, r29, 0x68 -/* 801CF31C 48 00 00 58 */ b lbl_801CF374 -lbl_801CF320: -/* 801CF320 83 9B 00 A0 */ lwz r28, 0xa0(r27) -/* 801CF324 4B E5 FB 3D */ bl dComIfGp_getNowLevel__Fv -/* 801CF328 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801CF32C 7C 1C 00 00 */ cmpw r28, r0 -/* 801CF330 40 82 00 44 */ bne lbl_801CF374 -/* 801CF334 80 7B 00 98 */ lwz r3, 0x98(r27) -/* 801CF338 80 1B 00 90 */ lwz r0, 0x90(r27) -/* 801CF33C 7C 03 00 00 */ cmpw r3, r0 -/* 801CF340 40 82 00 34 */ bne lbl_801CF374 -/* 801CF344 3B FD 00 44 */ addi r31, r29, 0x44 -/* 801CF348 48 00 00 2C */ b lbl_801CF374 -lbl_801CF34C: -/* 801CF34C 83 9B 00 A0 */ lwz r28, 0xa0(r27) -/* 801CF350 4B E5 FB 11 */ bl dComIfGp_getNowLevel__Fv -/* 801CF354 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801CF358 7C 1C 00 00 */ cmpw r28, r0 -/* 801CF35C 40 82 00 18 */ bne lbl_801CF374 -/* 801CF360 80 7B 00 98 */ lwz r3, 0x98(r27) -/* 801CF364 80 1B 00 90 */ lwz r0, 0x90(r27) -/* 801CF368 7C 03 00 00 */ cmpw r3, r0 -/* 801CF36C 40 82 00 08 */ bne lbl_801CF374 -/* 801CF370 3B FD 00 44 */ addi r31, r29, 0x44 -lbl_801CF374: -/* 801CF374 57 C0 10 3A */ slwi r0, r30, 2 -/* 801CF378 7C 7F 02 14 */ add r3, r31, r0 -/* 801CF37C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF380 48 19 2E A1 */ bl _restgpr_27 -/* 801CF384 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CF388 7C 08 03 A6 */ mtlr r0 -/* 801CF38C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CF390 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getFirstRegion__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getFirstRegion__15renderingFmap_cFv.s deleted file mode 100644 index 7e28171a71..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getFirstRegion__15renderingFmap_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801CE75C: -/* 801CE75C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE760 7C 08 02 A6 */ mflr r0 -/* 801CE764 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE768 38 00 00 00 */ li r0, 0 -/* 801CE76C 90 03 00 80 */ stw r0, 0x80(r3) -/* 801CE770 80 83 00 78 */ lwz r4, 0x78(r3) -/* 801CE774 80 84 00 00 */ lwz r4, 0(r4) -/* 801CE778 90 83 00 7C */ stw r4, 0x7c(r3) -/* 801CE77C 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 801CE780 28 04 00 00 */ cmplwi r4, 0 -/* 801CE784 41 82 00 14 */ beq lbl_801CE798 -/* 801CE788 80 84 00 20 */ lwz r4, 0x20(r4) -/* 801CE78C 90 83 00 A0 */ stw r4, 0xa0(r3) -/* 801CE790 90 03 00 94 */ stw r0, 0x94(r3) -/* 801CE794 48 00 00 15 */ bl getFirstStage__15renderingFmap_cFv -lbl_801CE798: -/* 801CE798 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE79C 7C 08 03 A6 */ mtlr r0 -/* 801CE7A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE7A4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getFirstRoomPointer__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getFirstRoomPointer__15renderingFmap_cFv.s deleted file mode 100644 index b4b5b3bab3..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getFirstRoomPointer__15renderingFmap_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_801CE6A8: -/* 801CE6A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE6AC 7C 08 02 A6 */ mflr r0 -/* 801CE6B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE6B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE6B8 93 C1 00 08 */ stw r30, 8(r1) -/* 801CE6BC 7C 7E 1B 78 */ mr r30, r3 -/* 801CE6C0 3B E0 00 00 */ li r31, 0 -/* 801CE6C4 48 00 00 99 */ bl getFirstRegion__15renderingFmap_cFv -/* 801CE6C8 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 801CE6CC 28 00 00 00 */ cmplwi r0, 0 -/* 801CE6D0 41 82 00 70 */ beq lbl_801CE740 -/* 801CE6D4 80 7E 00 88 */ lwz r3, 0x88(r30) -/* 801CE6D8 28 03 00 00 */ cmplwi r3, 0 -/* 801CE6DC 41 82 00 30 */ beq lbl_801CE70C -/* 801CE6E0 83 E3 00 08 */ lwz r31, 8(r3) -/* 801CE6E4 48 00 00 28 */ b lbl_801CE70C -lbl_801CE6E8: -/* 801CE6E8 80 1E 00 88 */ lwz r0, 0x88(r30) -/* 801CE6EC 28 00 00 00 */ cmplwi r0, 0 -/* 801CE6F0 41 82 00 1C */ beq lbl_801CE70C -/* 801CE6F4 7F C3 F3 78 */ mr r3, r30 -/* 801CE6F8 81 9E 00 00 */ lwz r12, 0(r30) -/* 801CE6FC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801CE700 7D 89 03 A6 */ mtctr r12 -/* 801CE704 4E 80 04 21 */ bctrl -/* 801CE708 7C 7F 1B 78 */ mr r31, r3 -lbl_801CE70C: -/* 801CE70C 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 801CE710 28 00 00 00 */ cmplwi r0, 0 -/* 801CE714 41 82 00 1C */ beq lbl_801CE730 -/* 801CE718 28 1F 00 00 */ cmplwi r31, 0 -/* 801CE71C 41 82 FF CC */ beq lbl_801CE6E8 -/* 801CE720 7F C3 F3 78 */ mr r3, r30 -/* 801CE724 4B FF FD B9 */ bl isDrawRoom__15renderingFmap_cFv -/* 801CE728 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CE72C 41 82 FF BC */ beq lbl_801CE6E8 -lbl_801CE730: -/* 801CE730 28 1F 00 00 */ cmplwi r31, 0 -/* 801CE734 41 82 00 0C */ beq lbl_801CE740 -/* 801CE738 7F C3 F3 78 */ mr r3, r30 -/* 801CE73C 4B FF FE B1 */ bl roomSetteing__15renderingFmap_cFv -lbl_801CE740: -/* 801CE740 7F E3 FB 78 */ mr r3, r31 -/* 801CE744 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE748 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CE74C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE750 7C 08 03 A6 */ mtlr r0 -/* 801CE754 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE758 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getFirstRoom__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getFirstRoom__15renderingFmap_cFv.s deleted file mode 100644 index e2664e44e0..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getFirstRoom__15renderingFmap_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801CE80C: -/* 801CE80C 38 A0 00 00 */ li r5, 0 -/* 801CE810 90 A3 00 88 */ stw r5, 0x88(r3) -/* 801CE814 80 83 00 80 */ lwz r4, 0x80(r3) -/* 801CE818 80 04 00 0C */ lwz r0, 0xc(r4) -/* 801CE81C 90 03 00 84 */ stw r0, 0x84(r3) -/* 801CE820 80 03 00 84 */ lwz r0, 0x84(r3) -/* 801CE824 28 00 00 00 */ cmplwi r0, 0 -/* 801CE828 4D 82 00 20 */ beqlr -/* 801CE82C 90 A3 00 A4 */ stw r5, 0xa4(r3) -/* 801CE830 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801CE834 88 04 00 10 */ lbz r0, 0x10(r4) -/* 801CE838 90 03 00 9C */ stw r0, 0x9c(r3) -/* 801CE83C 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801CE840 80 04 00 00 */ lwz r0, 0(r4) -/* 801CE844 90 03 00 88 */ stw r0, 0x88(r3) -/* 801CE848 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getFirstStage__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getFirstStage__15renderingFmap_cFv.s deleted file mode 100644 index 8a2920f1e7..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getFirstStage__15renderingFmap_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801CE7A8: -/* 801CE7A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE7AC 7C 08 02 A6 */ mflr r0 -/* 801CE7B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE7B4 38 00 00 00 */ li r0, 0 -/* 801CE7B8 90 03 00 84 */ stw r0, 0x84(r3) -/* 801CE7BC 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 801CE7C0 80 84 00 00 */ lwz r4, 0(r4) -/* 801CE7C4 90 83 00 80 */ stw r4, 0x80(r3) -/* 801CE7C8 80 83 00 80 */ lwz r4, 0x80(r3) -/* 801CE7CC 28 04 00 00 */ cmplwi r4, 0 -/* 801CE7D0 41 82 00 2C */ beq lbl_801CE7FC -/* 801CE7D4 80 84 00 08 */ lwz r4, 8(r4) -/* 801CE7D8 90 83 00 8C */ stw r4, 0x8c(r3) -/* 801CE7DC 80 83 00 8C */ lwz r4, 0x8c(r3) -/* 801CE7E0 88 84 00 01 */ lbz r4, 1(r4) -/* 801CE7E4 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801CE7E8 80 83 00 8C */ lwz r4, 0x8c(r3) -/* 801CE7EC 88 84 00 02 */ lbz r4, 2(r4) -/* 801CE7F0 98 83 00 BA */ stb r4, 0xba(r3) -/* 801CE7F4 90 03 00 98 */ stw r0, 0x98(r3) -/* 801CE7F8 48 00 00 15 */ bl getFirstRoom__15renderingFmap_cFv -lbl_801CE7FC: -/* 801CE7FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE800 7C 08 03 A6 */ mtlr r0 -/* 801CE804 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE808 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getLineColor__15dMenu_FmapMap_cFii.s b/asm/d/menu/d_menu_fmap_map/getLineColor__15dMenu_FmapMap_cFii.s deleted file mode 100644 index c180f62045..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getLineColor__15dMenu_FmapMap_cFii.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801CF208: -/* 801CF208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CF20C 7C 08 02 A6 */ mflr r0 -/* 801CF210 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CF214 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CF218 3B ED 81 A8 */ la r31, black(r13) /* 80450728-_SDA_BASE_ */ -/* 801CF21C 2C 05 00 04 */ cmpwi r5, 4 -/* 801CF220 40 82 00 30 */ bne lbl_801CF250 -/* 801CF224 80 03 00 D4 */ lwz r0, 0xd4(r3) -/* 801CF228 2C 00 00 01 */ cmpwi r0, 1 -/* 801CF22C 41 82 00 1C */ beq lbl_801CF248 -/* 801CF230 40 80 00 50 */ bge lbl_801CF280 -/* 801CF234 2C 00 00 00 */ cmpwi r0, 0 -/* 801CF238 40 80 00 08 */ bge lbl_801CF240 -/* 801CF23C 48 00 00 44 */ b lbl_801CF280 -lbl_801CF240: -/* 801CF240 38 62 A7 C4 */ la r3, borderColor0(r2) /* 804541C4-_SDA2_BASE_ */ -/* 801CF244 48 00 00 40 */ b lbl_801CF284 -lbl_801CF248: -/* 801CF248 38 62 A7 C8 */ la r3, borderColor1(r2) /* 804541C8-_SDA2_BASE_ */ -/* 801CF24C 48 00 00 38 */ b lbl_801CF284 -lbl_801CF250: -/* 801CF250 81 83 00 00 */ lwz r12, 0(r3) -/* 801CF254 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 801CF258 7D 89 03 A6 */ mtctr r12 -/* 801CF25C 4E 80 04 21 */ bctrl -/* 801CF260 88 03 00 00 */ lbz r0, 0(r3) -/* 801CF264 98 1F 00 00 */ stb r0, 0(r31) -/* 801CF268 88 03 00 01 */ lbz r0, 1(r3) -/* 801CF26C 98 1F 00 01 */ stb r0, 1(r31) -/* 801CF270 88 03 00 02 */ lbz r0, 2(r3) -/* 801CF274 98 1F 00 02 */ stb r0, 2(r31) -/* 801CF278 88 03 00 03 */ lbz r0, 3(r3) -/* 801CF27C 98 1F 00 03 */ stb r0, 3(r31) -lbl_801CF280: -/* 801CF280 7F E3 FB 78 */ mr r3, r31 -lbl_801CF284: -/* 801CF284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CF288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CF28C 7C 08 03 A6 */ mtlr r0 -/* 801CF290 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CF294 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getNextRegion__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getNextRegion__15renderingFmap_cFv.s deleted file mode 100644 index df75520fc4..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getNextRegion__15renderingFmap_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801CE93C: -/* 801CE93C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE940 7C 08 02 A6 */ mflr r0 -/* 801CE944 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE948 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE94C 3B E0 00 00 */ li r31, 0 -/* 801CE950 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 801CE954 80 04 00 04 */ lwz r0, 4(r4) -/* 801CE958 90 03 00 7C */ stw r0, 0x7c(r3) -/* 801CE95C 80 03 00 7C */ lwz r0, 0x7c(r3) -/* 801CE960 28 00 00 00 */ cmplwi r0, 0 -/* 801CE964 40 82 00 0C */ bne lbl_801CE970 -/* 801CE968 3B E0 00 01 */ li r31, 1 -/* 801CE96C 48 00 00 20 */ b lbl_801CE98C -lbl_801CE970: -/* 801CE970 80 83 00 94 */ lwz r4, 0x94(r3) -/* 801CE974 38 04 00 01 */ addi r0, r4, 1 -/* 801CE978 90 03 00 94 */ stw r0, 0x94(r3) -/* 801CE97C 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 801CE980 80 04 00 20 */ lwz r0, 0x20(r4) -/* 801CE984 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 801CE988 4B FF FE 21 */ bl getFirstStage__15renderingFmap_cFv -lbl_801CE98C: -/* 801CE98C 7F E3 FB 78 */ mr r3, r31 -/* 801CE990 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE998 7C 08 03 A6 */ mtlr r0 -/* 801CE99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE9A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getNextRoomPointer__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getNextRoomPointer__15renderingFmap_cFv.s deleted file mode 100644 index 3084da315a..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getNextRoomPointer__15renderingFmap_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801CE9A4: -/* 801CE9A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE9A8 7C 08 02 A6 */ mflr r0 -/* 801CE9AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE9B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE9B4 93 C1 00 08 */ stw r30, 8(r1) -/* 801CE9B8 7C 7E 1B 78 */ mr r30, r3 -lbl_801CE9BC: -/* 801CE9BC 3B E0 00 00 */ li r31, 0 -/* 801CE9C0 7F C3 F3 78 */ mr r3, r30 -/* 801CE9C4 4B FF FE 89 */ bl getNextRoom__15renderingFmap_cFv -/* 801CE9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CE9CC 41 82 00 0C */ beq lbl_801CE9D8 -/* 801CE9D0 38 60 00 00 */ li r3, 0 -/* 801CE9D4 48 00 00 4C */ b lbl_801CEA20 -lbl_801CE9D8: -/* 801CE9D8 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 801CE9DC 28 04 00 00 */ cmplwi r4, 0 -/* 801CE9E0 41 82 00 0C */ beq lbl_801CE9EC -/* 801CE9E4 80 7E 00 88 */ lwz r3, 0x88(r30) -/* 801CE9E8 83 E3 00 08 */ lwz r31, 8(r3) -lbl_801CE9EC: -/* 801CE9EC 28 04 00 00 */ cmplwi r4, 0 -/* 801CE9F0 41 82 00 1C */ beq lbl_801CEA0C -/* 801CE9F4 28 1F 00 00 */ cmplwi r31, 0 -/* 801CE9F8 41 82 FF C4 */ beq lbl_801CE9BC -/* 801CE9FC 7F C3 F3 78 */ mr r3, r30 -/* 801CEA00 4B FF FA DD */ bl isDrawRoom__15renderingFmap_cFv -/* 801CEA04 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CEA08 41 82 FF B4 */ beq lbl_801CE9BC -lbl_801CEA0C: -/* 801CEA0C 28 1F 00 00 */ cmplwi r31, 0 -/* 801CEA10 41 82 00 0C */ beq lbl_801CEA1C -/* 801CEA14 7F C3 F3 78 */ mr r3, r30 -/* 801CEA18 4B FF FB D5 */ bl roomSetteing__15renderingFmap_cFv -lbl_801CEA1C: -/* 801CEA1C 7F E3 FB 78 */ mr r3, r31 -lbl_801CEA20: -/* 801CEA20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CEA24 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CEA28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CEA2C 7C 08 03 A6 */ mtlr r0 -/* 801CEA30 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CEA34 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getNextRoom__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getNextRoom__15renderingFmap_cFv.s deleted file mode 100644 index 2d127ba914..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getNextRoom__15renderingFmap_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801CE84C: -/* 801CE84C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE850 7C 08 02 A6 */ mflr r0 -/* 801CE854 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE858 38 A0 00 00 */ li r5, 0 -/* 801CE85C 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801CE860 80 04 00 08 */ lwz r0, 8(r4) -/* 801CE864 90 03 00 84 */ stw r0, 0x84(r3) -/* 801CE868 80 03 00 84 */ lwz r0, 0x84(r3) -/* 801CE86C 28 00 00 00 */ cmplwi r0, 0 -/* 801CE870 40 82 00 10 */ bne lbl_801CE880 -/* 801CE874 48 00 00 45 */ bl getNextStage__15renderingFmap_cFv -/* 801CE878 7C 65 1B 78 */ mr r5, r3 -/* 801CE87C 48 00 00 28 */ b lbl_801CE8A4 -lbl_801CE880: -/* 801CE880 80 83 00 A4 */ lwz r4, 0xa4(r3) -/* 801CE884 38 04 00 01 */ addi r0, r4, 1 -/* 801CE888 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 801CE88C 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801CE890 80 04 00 00 */ lwz r0, 0(r4) -/* 801CE894 90 03 00 88 */ stw r0, 0x88(r3) -/* 801CE898 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801CE89C 88 04 00 10 */ lbz r0, 0x10(r4) -/* 801CE8A0 90 03 00 9C */ stw r0, 0x9c(r3) -lbl_801CE8A4: -/* 801CE8A4 7C A3 2B 78 */ mr r3, r5 -/* 801CE8A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE8AC 7C 08 03 A6 */ mtlr r0 -/* 801CE8B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE8B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getNextStage__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/getNextStage__15renderingFmap_cFv.s deleted file mode 100644 index e0196d4aa3..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getNextStage__15renderingFmap_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801CE8B8: -/* 801CE8B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE8BC 7C 08 02 A6 */ mflr r0 -/* 801CE8C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE8C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE8C8 3B E0 00 00 */ li r31, 0 -/* 801CE8CC 80 83 00 80 */ lwz r4, 0x80(r3) -/* 801CE8D0 80 04 00 10 */ lwz r0, 0x10(r4) -/* 801CE8D4 90 03 00 80 */ stw r0, 0x80(r3) -/* 801CE8D8 80 03 00 80 */ lwz r0, 0x80(r3) -/* 801CE8DC 28 00 00 00 */ cmplwi r0, 0 -/* 801CE8E0 40 82 00 10 */ bne lbl_801CE8F0 -/* 801CE8E4 48 00 00 59 */ bl getNextRegion__15renderingFmap_cFv -/* 801CE8E8 7C 7F 1B 78 */ mr r31, r3 -/* 801CE8EC 48 00 00 38 */ b lbl_801CE924 -lbl_801CE8F0: -/* 801CE8F0 80 83 00 98 */ lwz r4, 0x98(r3) -/* 801CE8F4 38 04 00 01 */ addi r0, r4, 1 -/* 801CE8F8 90 03 00 98 */ stw r0, 0x98(r3) -/* 801CE8FC 80 83 00 80 */ lwz r4, 0x80(r3) -/* 801CE900 80 04 00 08 */ lwz r0, 8(r4) -/* 801CE904 90 03 00 8C */ stw r0, 0x8c(r3) -/* 801CE908 80 83 00 8C */ lwz r4, 0x8c(r3) -/* 801CE90C 88 04 00 01 */ lbz r0, 1(r4) -/* 801CE910 98 03 00 B9 */ stb r0, 0xb9(r3) -/* 801CE914 80 83 00 8C */ lwz r4, 0x8c(r3) -/* 801CE918 88 04 00 02 */ lbz r0, 2(r4) -/* 801CE91C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801CE920 4B FF FE ED */ bl getFirstRoom__15renderingFmap_cFv -lbl_801CE924: -/* 801CE924 7F E3 FB 78 */ mr r3, r31 -/* 801CE928 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE92C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE930 7C 08 03 A6 */ mtlr r0 -/* 801CE934 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE938 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi.s b/asm/d/menu/d_menu_fmap_map/getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi.s deleted file mode 100644 index c37d386b77..0000000000 --- a/asm/d/menu/d_menu_fmap_map/getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801CE3C0: -/* 801CE3C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE3C4 7C 08 02 A6 */ mflr r0 -/* 801CE3C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE3CC 7C 68 1B 78 */ mr r8, r3 -/* 801CE3D0 C0 83 00 18 */ lfs f4, 0x18(r3) -/* 801CE3D4 7C 83 23 78 */ mr r3, r4 -/* 801CE3D8 C0 68 00 10 */ lfs f3, 0x10(r8) -/* 801CE3DC EC 01 01 32 */ fmuls f0, f1, f4 -/* 801CE3E0 EC 23 00 2A */ fadds f1, f3, f0 -/* 801CE3E4 C0 68 00 14 */ lfs f3, 0x14(r8) -/* 801CE3E8 EC 02 01 32 */ fmuls f0, f2, f4 -/* 801CE3EC EC 43 00 2A */ fadds f2, f3, f0 -/* 801CE3F0 7C A4 2B 78 */ mr r4, r5 -/* 801CE3F4 7C C5 33 78 */ mr r5, r6 -/* 801CE3F8 7C E6 3B 78 */ mr r6, r7 -/* 801CE3FC 4B E6 F7 75 */ bl getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi -/* 801CE400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE404 7C 08 03 A6 */ mtlr r0 -/* 801CE408 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE40C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s deleted file mode 100644 index 65f5f553de..0000000000 --- a/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801CE4DC: -/* 801CE4DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE4E0 7C 08 02 A6 */ mflr r0 -/* 801CE4E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE4E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE4EC 93 C1 00 08 */ stw r30, 8(r1) -/* 801CE4F0 7C 7E 1B 78 */ mr r30, r3 -/* 801CE4F4 3B E0 00 00 */ li r31, 0 -/* 801CE4F8 4B E6 09 69 */ bl dComIfGp_getNowLevel__Fv -/* 801CE4FC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CE500 80 1E 00 A0 */ lwz r0, 0xa0(r30) -/* 801CE504 7C 00 18 00 */ cmpw r0, r3 -/* 801CE508 40 82 00 28 */ bne lbl_801CE530 -/* 801CE50C 80 7E 00 98 */ lwz r3, 0x98(r30) -/* 801CE510 80 1E 00 90 */ lwz r0, 0x90(r30) -/* 801CE514 7C 03 00 00 */ cmpw r3, r0 -/* 801CE518 40 82 00 18 */ bne lbl_801CE530 -/* 801CE51C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 801CE520 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 801CE524 7C 00 07 74 */ extsb r0, r0 -/* 801CE528 7C 03 00 00 */ cmpw r3, r0 -/* 801CE52C 41 82 00 14 */ beq lbl_801CE540 -lbl_801CE530: -/* 801CE530 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 801CE534 4B E6 F2 E5 */ bl isArrival__22dMenu_Fmap_room_data_cFv -/* 801CE538 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CE53C 41 82 00 08 */ beq lbl_801CE544 -lbl_801CE540: -/* 801CE540 3B E0 00 01 */ li r31, 1 -lbl_801CE544: -/* 801CE544 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 801CE548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE54C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CE550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE554 7C 08 03 A6 */ mtlr r0 -/* 801CE558 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE55C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/isDrawType__15dMenu_FmapMap_cFi.s b/asm/d/menu/d_menu_fmap_map/isDrawType__15dMenu_FmapMap_cFi.s deleted file mode 100644 index fc41d8f038..0000000000 --- a/asm/d/menu/d_menu_fmap_map/isDrawType__15dMenu_FmapMap_cFi.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801CF1D4: -/* 801CF1D4 54 80 D7 FE */ rlwinm r0, r4, 0x1a, 0x1f, 0x1f -/* 801CF1D8 68 03 00 01 */ xori r3, r0, 1 -/* 801CF1DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/isFlashRoomNoCheck__15dMenu_FmapMap_cCFi.s b/asm/d/menu/d_menu_fmap_map/isFlashRoomNoCheck__15dMenu_FmapMap_cCFi.s deleted file mode 100644 index fed68882e0..0000000000 --- a/asm/d/menu/d_menu_fmap_map/isFlashRoomNoCheck__15dMenu_FmapMap_cCFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_801CEAE0: -/* 801CEAE0 38 A0 00 00 */ li r5, 0 -/* 801CEAE4 80 C3 00 E8 */ lwz r6, 0xe8(r3) -/* 801CEAE8 80 03 00 EC */ lwz r0, 0xec(r3) -/* 801CEAEC 7C 09 03 A6 */ mtctr r0 -/* 801CEAF0 2C 00 00 00 */ cmpwi r0, 0 -/* 801CEAF4 40 81 00 20 */ ble lbl_801CEB14 -lbl_801CEAF8: -/* 801CEAF8 88 06 00 00 */ lbz r0, 0(r6) -/* 801CEAFC 7C 00 20 00 */ cmpw r0, r4 -/* 801CEB00 40 82 00 0C */ bne lbl_801CEB0C -/* 801CEB04 38 A0 00 01 */ li r5, 1 -/* 801CEB08 48 00 00 0C */ b lbl_801CEB14 -lbl_801CEB0C: -/* 801CEB0C 38 C6 00 01 */ addi r6, r6, 1 -/* 801CEB10 42 00 FF E8 */ bdnz lbl_801CEAF8 -lbl_801CEB14: -/* 801CEB14 7C A3 2B 78 */ mr r3, r5 -/* 801CEB18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/isSwitchSpecialOff__15renderingFmap_cFi.s b/asm/d/menu/d_menu_fmap_map/isSwitchSpecialOff__15renderingFmap_cFi.s deleted file mode 100644 index f684ddd38b..0000000000 --- a/asm/d/menu/d_menu_fmap_map/isSwitchSpecialOff__15renderingFmap_cFi.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801CE224: -/* 801CE224 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE228 7C 08 02 A6 */ mflr r0 -/* 801CE22C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE230 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE234 93 C1 00 08 */ stw r30, 8(r1) -/* 801CE238 7C 9E 23 78 */ mr r30, r4 -/* 801CE23C 3B E0 00 00 */ li r31, 0 -/* 801CE240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CE244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CE248 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 801CE24C 3C 80 80 39 */ lis r4, d_menu_d_menu_fmap_map__stringBase0@ha /* 0x8039623C@ha */ -/* 801CE250 38 84 62 3C */ addi r4, r4, d_menu_d_menu_fmap_map__stringBase0@l /* 0x8039623C@l */ -/* 801CE254 48 19 A7 41 */ bl strcmp -/* 801CE258 2C 03 00 00 */ cmpwi r3, 0 -/* 801CE25C 40 82 00 10 */ bne lbl_801CE26C -/* 801CE260 2C 1E 00 B2 */ cmpwi r30, 0xb2 -/* 801CE264 40 82 00 08 */ bne lbl_801CE26C -/* 801CE268 3B E0 00 01 */ li r31, 1 -lbl_801CE26C: -/* 801CE26C 7F E3 FB 78 */ mr r3, r31 -/* 801CE270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE274 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CE278 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE27C 7C 08 03 A6 */ mtlr r0 -/* 801CE280 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE284 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class.s b/asm/d/menu/d_menu_fmap_map/isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class.s deleted file mode 100644 index fce24d0df4..0000000000 --- a/asm/d/menu/d_menu_fmap_map/isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_801CE288: -/* 801CE288 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE28C 7C 08 02 A6 */ mflr r0 -/* 801CE290 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE294 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE298 93 C1 00 08 */ stw r30, 8(r1) -/* 801CE29C 7C 7E 1B 78 */ mr r30, r3 -/* 801CE2A0 7C 9F 23 78 */ mr r31, r4 -/* 801CE2A4 88 84 00 00 */ lbz r4, 0(r4) -/* 801CE2A8 28 04 00 FF */ cmplwi r4, 0xff -/* 801CE2AC 40 82 00 0C */ bne lbl_801CE2B8 -/* 801CE2B0 38 60 00 01 */ li r3, 1 -/* 801CE2B4 48 00 00 F4 */ b lbl_801CE3A8 -lbl_801CE2B8: -/* 801CE2B8 88 1F 00 01 */ lbz r0, 1(r31) -/* 801CE2BC 28 00 00 00 */ cmplwi r0, 0 -/* 801CE2C0 40 82 00 18 */ bne lbl_801CE2D8 -/* 801CE2C4 4B FF FF 61 */ bl isSwitchSpecialOff__15renderingFmap_cFi -/* 801CE2C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CE2CC 41 82 00 20 */ beq lbl_801CE2EC -/* 801CE2D0 38 60 00 01 */ li r3, 1 -/* 801CE2D4 48 00 00 D4 */ b lbl_801CE3A8 -lbl_801CE2D8: -/* 801CE2D8 4B FF FF 4D */ bl isSwitchSpecialOff__15renderingFmap_cFi -/* 801CE2DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801CE2E0 41 82 00 0C */ beq lbl_801CE2EC -/* 801CE2E4 38 60 00 00 */ li r3, 0 -/* 801CE2E8 48 00 00 C0 */ b lbl_801CE3A8 -lbl_801CE2EC: -/* 801CE2EC 4B E6 0B 75 */ bl dComIfGp_getNowLevel__Fv -/* 801CE2F0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CE2F4 80 1E 00 A0 */ lwz r0, 0xa0(r30) -/* 801CE2F8 7C 00 18 00 */ cmpw r0, r3 -/* 801CE2FC 40 82 00 60 */ bne lbl_801CE35C -/* 801CE300 80 7E 00 98 */ lwz r3, 0x98(r30) -/* 801CE304 80 1E 00 90 */ lwz r0, 0x90(r30) -/* 801CE308 7C 03 00 00 */ cmpw r3, r0 -/* 801CE30C 40 82 00 50 */ bne lbl_801CE35C -/* 801CE310 88 1F 00 01 */ lbz r0, 1(r31) -/* 801CE314 28 00 00 00 */ cmplwi r0, 0 -/* 801CE318 40 82 00 24 */ bne lbl_801CE33C -/* 801CE31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CE320 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CE324 88 9F 00 00 */ lbz r4, 0(r31) -/* 801CE328 80 BE 00 9C */ lwz r5, 0x9c(r30) -/* 801CE32C 4B E6 70 35 */ bl isSwitch__10dSv_info_cCFii -/* 801CE330 7C 60 00 34 */ cntlzw r0, r3 -/* 801CE334 54 03 D9 7E */ srwi r3, r0, 5 -/* 801CE338 48 00 00 70 */ b lbl_801CE3A8 -lbl_801CE33C: -/* 801CE33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801CE340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801CE344 88 9F 00 00 */ lbz r4, 0(r31) -/* 801CE348 80 BE 00 9C */ lwz r5, 0x9c(r30) -/* 801CE34C 4B E6 70 15 */ bl isSwitch__10dSv_info_cCFii -/* 801CE350 30 03 FF FF */ addic r0, r3, -1 -/* 801CE354 7C 60 19 10 */ subfe r3, r0, r3 -/* 801CE358 48 00 00 50 */ b lbl_801CE3A8 -lbl_801CE35C: -/* 801CE35C 88 9F 00 00 */ lbz r4, 0(r31) -/* 801CE360 28 04 00 80 */ cmplwi r4, 0x80 -/* 801CE364 40 80 00 38 */ bge lbl_801CE39C -/* 801CE368 88 1F 00 01 */ lbz r0, 1(r31) -/* 801CE36C 28 00 00 00 */ cmplwi r0, 0 -/* 801CE370 41 82 00 18 */ beq lbl_801CE388 -/* 801CE374 88 7E 00 B9 */ lbz r3, 0xb9(r30) -/* 801CE378 4B E5 F3 C9 */ bl dComIfGs_isStageSwitch__Fii -/* 801CE37C 30 03 FF FF */ addic r0, r3, -1 -/* 801CE380 7C 60 19 10 */ subfe r3, r0, r3 -/* 801CE384 48 00 00 24 */ b lbl_801CE3A8 -lbl_801CE388: -/* 801CE388 88 7E 00 B9 */ lbz r3, 0xb9(r30) -/* 801CE38C 4B E5 F3 B5 */ bl dComIfGs_isStageSwitch__Fii -/* 801CE390 7C 60 00 34 */ cntlzw r0, r3 -/* 801CE394 54 03 D9 7E */ srwi r3, r0, 5 -/* 801CE398 48 00 00 10 */ b lbl_801CE3A8 -lbl_801CE39C: -/* 801CE39C 88 1F 00 01 */ lbz r0, 1(r31) -/* 801CE3A0 7C 00 00 34 */ cntlzw r0, r0 -/* 801CE3A4 54 03 D9 7E */ srwi r3, r0, 5 -lbl_801CE3A8: -/* 801CE3A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE3AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CE3B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE3B4 7C 08 03 A6 */ mtlr r0 -/* 801CE3B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE3BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/postDrawPath__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/postDrawPath__15renderingFmap_cFv.s deleted file mode 100644 index 76f43ec104..0000000000 --- a/asm/d/menu/d_menu_fmap_map/postDrawPath__15renderingFmap_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801CE560: -/* 801CE560 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE564 7C 08 02 A6 */ mflr r0 -/* 801CE568 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE56C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE570 7C 7F 1B 78 */ mr r31, r3 -/* 801CE574 38 60 00 01 */ li r3, 1 -/* 801CE578 38 80 00 00 */ li r4, 0 -/* 801CE57C 48 18 D8 BD */ bl GXSetMisc -/* 801CE580 38 7F 00 24 */ addi r3, r31, 0x24 -/* 801CE584 38 9F 00 54 */ addi r4, r31, 0x54 -/* 801CE588 38 BF 00 60 */ addi r5, r31, 0x60 -/* 801CE58C 38 DF 00 6C */ addi r6, r31, 0x6c -/* 801CE590 38 E0 00 00 */ li r7, 0 -/* 801CE594 4B E3 E1 7D */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs -/* 801CE598 38 7F 00 24 */ addi r3, r31, 0x24 -/* 801CE59C 38 80 00 00 */ li r4, 0 -/* 801CE5A0 48 19 1C AD */ bl GXLoadPosMtxImm -/* 801CE5A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE5A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE5AC 7C 08 03 A6 */ mtlr r0 -/* 801CE5B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE5B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/postRenderingMap__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/postRenderingMap__15renderingFmap_cFv.s deleted file mode 100644 index 6a551ebbf7..0000000000 --- a/asm/d/menu/d_menu_fmap_map/postRenderingMap__15renderingFmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CE5B8: -/* 801CE5B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CE5BC 7C 08 02 A6 */ mflr r0 -/* 801CE5C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CE5C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CE5C8 7C 7F 1B 78 */ mr r31, r3 -/* 801CE5CC 4B E6 ED 55 */ bl postRenderingMap__18dRenderingFDAmap_cFv -/* 801CE5D0 38 00 00 01 */ li r0, 1 -/* 801CE5D4 98 1F 00 BB */ stb r0, 0xbb(r31) -/* 801CE5D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CE5DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CE5E0 7C 08 03 A6 */ mtlr r0 -/* 801CE5E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE5E8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class.s b/asm/d/menu/d_menu_fmap_map/rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class.s deleted file mode 100644 index 162192188c..0000000000 --- a/asm/d/menu/d_menu_fmap_map/rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801CF0B4: -/* 801CF0B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CF0B8 7C 08 02 A6 */ mflr r0 -/* 801CF0BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CF0C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801CF0C4 93 C1 00 08 */ stw r30, 8(r1) -/* 801CF0C8 7C 7E 1B 78 */ mr r30, r3 -/* 801CF0CC 7C 9F 23 78 */ mr r31, r4 -/* 801CF0D0 88 04 00 01 */ lbz r0, 1(r4) -/* 801CF0D4 28 00 00 04 */ cmplwi r0, 4 -/* 801CF0D8 40 82 00 38 */ bne lbl_801CF110 -/* 801CF0DC 38 00 00 00 */ li r0, 0 -/* 801CF0E0 90 1E 00 D4 */ stw r0, 0xd4(r30) -/* 801CF0E4 48 00 00 1C */ b lbl_801CF100 -lbl_801CF0E8: -/* 801CF0E8 7F C3 F3 78 */ mr r3, r30 -/* 801CF0EC 7F E4 FB 78 */ mr r4, r31 -/* 801CF0F0 4B E6 E2 D1 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class -/* 801CF0F4 80 7E 00 D4 */ lwz r3, 0xd4(r30) -/* 801CF0F8 38 03 00 01 */ addi r0, r3, 1 -/* 801CF0FC 90 1E 00 D4 */ stw r0, 0xd4(r30) -lbl_801CF100: -/* 801CF100 80 1E 00 D4 */ lwz r0, 0xd4(r30) -/* 801CF104 2C 00 00 02 */ cmpwi r0, 2 -/* 801CF108 41 80 FF E0 */ blt lbl_801CF0E8 -/* 801CF10C 48 00 00 08 */ b lbl_801CF114 -lbl_801CF110: -/* 801CF110 4B E6 D8 3D */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class -lbl_801CF114: -/* 801CF114 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801CF118 83 C1 00 08 */ lwz r30, 8(r1) -/* 801CF11C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CF120 7C 08 03 A6 */ mtlr r0 -/* 801CF124 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CF128 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/roomSetteing__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/roomSetteing__15renderingFmap_cFv.s deleted file mode 100644 index 5c1036067d..0000000000 --- a/asm/d/menu/d_menu_fmap_map/roomSetteing__15renderingFmap_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801CE5EC: -/* 801CE5EC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801CE5F0 7C 08 02 A6 */ mflr r0 -/* 801CE5F4 90 01 00 54 */ stw r0, 0x54(r1) -/* 801CE5F8 7C 66 1B 78 */ mr r6, r3 -/* 801CE5FC 80 63 00 7C */ lwz r3, 0x7c(r3) -/* 801CE600 C0 03 00 08 */ lfs f0, 8(r3) -/* 801CE604 D0 06 00 B0 */ stfs f0, 0xb0(r6) -/* 801CE608 80 66 00 7C */ lwz r3, 0x7c(r6) -/* 801CE60C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 801CE610 D0 06 00 B4 */ stfs f0, 0xb4(r6) -/* 801CE614 80 66 00 80 */ lwz r3, 0x80(r6) -/* 801CE618 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 801CE61C C0 06 00 B0 */ lfs f0, 0xb0(r6) -/* 801CE620 EC 00 08 2A */ fadds f0, f0, f1 -/* 801CE624 D0 06 00 A8 */ stfs f0, 0xa8(r6) -/* 801CE628 80 66 00 80 */ lwz r3, 0x80(r6) -/* 801CE62C C0 23 00 18 */ lfs f1, 0x18(r3) -/* 801CE630 C0 06 00 B4 */ lfs f0, 0xb4(r6) -/* 801CE634 EC 00 08 2A */ fadds f0, f0, f1 -/* 801CE638 D0 06 00 AC */ stfs f0, 0xac(r6) -/* 801CE63C C0 66 00 AC */ lfs f3, 0xac(r6) -/* 801CE640 C0 26 00 10 */ lfs f1, 0x10(r6) -/* 801CE644 C0 06 00 A8 */ lfs f0, 0xa8(r6) -/* 801CE648 EC 41 00 28 */ fsubs f2, f1, f0 -/* 801CE64C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 801CE650 C0 06 00 14 */ lfs f0, 0x14(r6) -/* 801CE654 EC 20 18 28 */ fsubs f1, f0, f3 -/* 801CE658 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 801CE65C C0 06 00 5C */ lfs f0, 0x5c(r6) -/* 801CE660 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801CE664 D0 41 00 08 */ stfs f2, 8(r1) -/* 801CE668 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 801CE66C C0 06 00 68 */ lfs f0, 0x68(r6) -/* 801CE670 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 801CE674 38 61 00 20 */ addi r3, r1, 0x20 -/* 801CE678 38 81 00 14 */ addi r4, r1, 0x14 -/* 801CE67C 38 A1 00 08 */ addi r5, r1, 8 -/* 801CE680 38 C6 00 6C */ addi r6, r6, 0x6c -/* 801CE684 38 E0 00 00 */ li r7, 0 -/* 801CE688 4B E3 E0 89 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs -/* 801CE68C 38 61 00 20 */ addi r3, r1, 0x20 -/* 801CE690 38 80 00 00 */ li r4, 0 -/* 801CE694 48 19 1B B9 */ bl GXLoadPosMtxImm -/* 801CE698 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801CE69C 7C 08 03 A6 */ mtlr r0 -/* 801CE6A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE6A4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setFlashOn__15dMenu_FmapMap_cFiiPUci.s b/asm/d/menu/d_menu_fmap_map/setFlashOn__15dMenu_FmapMap_cFiiPUci.s deleted file mode 100644 index b0a63481c4..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setFlashOn__15dMenu_FmapMap_cFiiPUci.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801CF1E0: -/* 801CF1E0 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801CF1E4 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801CF1E8 38 00 00 01 */ li r0, 1 -/* 801CF1EC 98 03 00 D8 */ stb r0, 0xd8(r3) -/* 801CF1F0 98 83 00 E4 */ stb r4, 0xe4(r3) -/* 801CF1F4 54 A0 06 3E */ clrlwi r0, r5, 0x18 -/* 801CF1F8 90 03 00 DC */ stw r0, 0xdc(r3) -/* 801CF1FC 90 C3 00 E8 */ stw r6, 0xe8(r3) -/* 801CF200 90 E3 00 EC */ stw r7, 0xec(r3) -/* 801CF204 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor.s b/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor.s deleted file mode 100644 index 802f0770ca..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801CEAAC: -/* 801CEAAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CEAB0 7C 08 02 A6 */ mflr r0 -/* 801CEAB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CEAB8 7C A8 2B 78 */ mr r8, r5 -/* 801CEABC 88 A5 00 00 */ lbz r5, 0(r5) -/* 801CEAC0 88 C8 00 01 */ lbz r6, 1(r8) -/* 801CEAC4 88 E8 00 02 */ lbz r7, 2(r8) -/* 801CEAC8 89 08 00 03 */ lbz r8, 3(r8) -/* 801CEACC 4B FF FF 6D */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc -/* 801CEAD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CEAD4 7C 08 03 A6 */ mtlr r0 -/* 801CEAD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CEADC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc.s b/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc.s deleted file mode 100644 index 7406716486..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801CEA38: -/* 801CEA38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CEA3C 7C 08 02 A6 */ mflr r0 -/* 801CEA40 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CEA44 55 00 06 3E */ clrlwi r0, r8, 0x18 -/* 801CEA48 28 00 00 E0 */ cmplwi r0, 0xe0 -/* 801CEA4C 54 C9 06 36 */ rlwinm r9, r6, 0, 0x18, 0x1b -/* 801CEA50 50 A9 25 2E */ rlwimi r9, r5, 4, 0x14, 0x17 -/* 801CEA54 50 E9 E7 3E */ rlwimi r9, r7, 0x1c, 0x1c, 0x1f -/* 801CEA58 51 09 3C 66 */ rlwimi r9, r8, 7, 0x11, 0x13 -/* 801CEA5C 41 80 00 14 */ blt lbl_801CEA70 -/* 801CEA60 54 C0 15 B4 */ rlwinm r0, r6, 2, 0x16, 0x1a -/* 801CEA64 50 A0 3C 6A */ rlwimi r0, r5, 7, 0x11, 0x15 -/* 801CEA68 50 E0 EE FE */ rlwimi r0, r7, 0x1d, 0x1b, 0x1f -/* 801CEA6C 60 09 80 00 */ ori r9, r0, 0x8000 -lbl_801CEA70: -/* 801CEA70 80 03 00 C8 */ lwz r0, 0xc8(r3) -/* 801CEA74 54 84 18 38 */ slwi r4, r4, 3 -/* 801CEA78 7C A0 22 14 */ add r5, r0, r4 -/* 801CEA7C B1 25 00 00 */ sth r9, 0(r5) -/* 801CEA80 B1 25 00 02 */ sth r9, 2(r5) -/* 801CEA84 B1 25 00 04 */ sth r9, 4(r5) -/* 801CEA88 B1 25 00 06 */ sth r9, 6(r5) -/* 801CEA8C 80 03 00 C8 */ lwz r0, 0xc8(r3) -/* 801CEA90 7C 60 22 14 */ add r3, r0, r4 -/* 801CEA94 38 80 00 08 */ li r4, 8 -/* 801CEA98 48 16 CB 45 */ bl DCStoreRange -/* 801CEA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CEAA0 7C 08 03 A6 */ mtlr r0 -/* 801CEAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CEAA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setPointColor__15dMenu_FmapMap_cFf.s b/asm/d/menu/d_menu_fmap_map/setPointColor__15dMenu_FmapMap_cFf.s deleted file mode 100644 index 581325ead3..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setPointColor__15dMenu_FmapMap_cFf.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_801CEB1C: -/* 801CEB1C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801CEB20 7C 08 02 A6 */ mflr r0 -/* 801CEB24 90 01 00 34 */ stw r0, 0x34(r1) -/* 801CEB28 DB E1 00 28 */ stfd f31, 0x28(r1) -/* 801CEB2C 39 61 00 28 */ addi r11, r1, 0x28 -/* 801CEB30 48 19 36 A9 */ bl _savegpr_28 -/* 801CEB34 7C 7F 1B 78 */ mr r31, r3 -/* 801CEB38 FF E0 08 90 */ fmr f31, f1 -/* 801CEB3C 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801CEB40 28 00 00 00 */ cmplwi r0, 0 -/* 801CEB44 41 82 00 78 */ beq lbl_801CEBBC -/* 801CEB48 4B E6 03 19 */ bl dComIfGp_getNowLevel__Fv -/* 801CEB4C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 801CEB50 88 1F 00 E4 */ lbz r0, 0xe4(r31) -/* 801CEB54 7C 00 18 40 */ cmplw r0, r3 -/* 801CEB58 40 82 00 64 */ bne lbl_801CEBBC -/* 801CEB5C 80 7F 00 90 */ lwz r3, 0x90(r31) -/* 801CEB60 80 1F 00 DC */ lwz r0, 0xdc(r31) -/* 801CEB64 7C 03 00 00 */ cmpw r3, r0 -/* 801CEB68 40 82 00 54 */ bne lbl_801CEBBC -/* 801CEB6C 3B 80 00 00 */ li r28, 0 -/* 801CEB70 3B C0 00 00 */ li r30, 0 -/* 801CEB74 3C 60 80 39 */ lis r3, palNo@ha /* 0x803961B0@ha */ -/* 801CEB78 3B A3 61 B0 */ addi r29, r3, palNo@l /* 0x803961B0@l */ -lbl_801CEB7C: -/* 801CEB7C 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801CEB80 7C 80 F2 14 */ add r4, r0, r30 -/* 801CEB84 38 64 00 E8 */ addi r3, r4, 0xe8 -/* 801CEB88 38 84 01 08 */ addi r4, r4, 0x108 -/* 801CEB8C FC 20 F8 90 */ fmr f1, f31 -/* 801CEB90 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEB94 4B FF F5 39 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor -/* 801CEB98 7F E3 FB 78 */ mr r3, r31 -/* 801CEB9C 7C 9D F0 2E */ lwzx r4, r29, r30 -/* 801CEBA0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBA4 4B FF FF 09 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor -/* 801CEBA8 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CEBAC 2C 1C 00 08 */ cmpwi r28, 8 -/* 801CEBB0 3B DE 00 04 */ addi r30, r30, 4 -/* 801CEBB4 41 80 FF C8 */ blt lbl_801CEB7C -/* 801CEBB8 48 00 00 50 */ b lbl_801CEC08 -lbl_801CEBBC: -/* 801CEBBC 3B 80 00 00 */ li r28, 0 -/* 801CEBC0 3B C0 00 00 */ li r30, 0 -/* 801CEBC4 3C 60 80 39 */ lis r3, palNo@ha /* 0x803961B0@ha */ -/* 801CEBC8 3B A3 61 B0 */ addi r29, r3, palNo@l /* 0x803961B0@l */ -lbl_801CEBCC: -/* 801CEBCC 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801CEBD0 7C 80 F2 14 */ add r4, r0, r30 -/* 801CEBD4 38 64 01 28 */ addi r3, r4, 0x128 -/* 801CEBD8 38 84 01 48 */ addi r4, r4, 0x148 -/* 801CEBDC FC 20 F8 90 */ fmr f1, f31 -/* 801CEBE0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBE4 4B FF F4 E9 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor -/* 801CEBE8 7F E3 FB 78 */ mr r3, r31 -/* 801CEBEC 7C 9D F0 2E */ lwzx r4, r29, r30 -/* 801CEBF0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBF4 4B FF FE B9 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor -/* 801CEBF8 3B 9C 00 01 */ addi r28, r28, 1 -/* 801CEBFC 2C 1C 00 08 */ cmpwi r28, 8 -/* 801CEC00 3B DE 00 04 */ addi r30, r30, 4 -/* 801CEC04 41 80 FF C8 */ blt lbl_801CEBCC -lbl_801CEC08: -/* 801CEC08 CB E1 00 28 */ lfd f31, 0x28(r1) -/* 801CEC0C 39 61 00 28 */ addi r11, r1, 0x28 -/* 801CEC10 48 19 36 15 */ bl _restgpr_28 -/* 801CEC14 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801CEC18 7C 08 03 A6 */ mtlr r0 -/* 801CEC1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CEC20 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff.s b/asm/d/menu/d_menu_fmap_map/setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff.s deleted file mode 100644 index c9d581a394..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801CF450: -/* 801CF450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801CF454 7C 08 02 A6 */ mflr r0 -/* 801CF458 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CF45C D0 83 00 D0 */ stfs f4, 0xd0(r3) -/* 801CF460 88 C3 00 D8 */ lbz r6, 0xd8(r3) -/* 801CF464 88 03 00 D9 */ lbz r0, 0xd9(r3) -/* 801CF468 7C 06 00 40 */ cmplw r6, r0 -/* 801CF46C 40 82 00 14 */ bne lbl_801CF480 -/* 801CF470 80 C3 00 DC */ lwz r6, 0xdc(r3) -/* 801CF474 80 03 00 E0 */ lwz r0, 0xe0(r3) -/* 801CF478 7C 06 00 00 */ cmpw r6, r0 -/* 801CF47C 41 82 00 20 */ beq lbl_801CF49C -lbl_801CF480: -/* 801CF480 88 02 A7 94 */ lbz r0, m_other__22dMfm_HIO_prm_res_src_s(r2) -/* 801CF484 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 801CF488 88 03 00 D8 */ lbz r0, 0xd8(r3) -/* 801CF48C 98 03 00 D9 */ stb r0, 0xd9(r3) -/* 801CF490 80 03 00 DC */ lwz r0, 0xdc(r3) -/* 801CF494 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 801CF498 48 00 00 24 */ b lbl_801CF4BC -lbl_801CF49C: -/* 801CF49C 88 C3 00 E5 */ lbz r6, 0xe5(r3) -/* 801CF4A0 28 06 00 00 */ cmplwi r6, 0 -/* 801CF4A4 41 82 00 10 */ beq lbl_801CF4B4 -/* 801CF4A8 38 06 FF FF */ addi r0, r6, -1 -/* 801CF4AC 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 801CF4B0 48 00 00 0C */ b lbl_801CF4BC -lbl_801CF4B4: -/* 801CF4B4 88 02 A7 94 */ lbz r0, m_other__22dMfm_HIO_prm_res_src_s(r2) -/* 801CF4B8 98 03 00 E5 */ stb r0, 0xe5(r3) -lbl_801CF4BC: -/* 801CF4BC 4B FF EC CD */ bl entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff -/* 801CF4C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801CF4C4 7C 08 03 A6 */ mtlr r0 -/* 801CF4C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CF4CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/setTexture__15dMenu_FmapMap_cFUsUsUsUs.s b/asm/d/menu/d_menu_fmap_map/setTexture__15dMenu_FmapMap_cFUsUsUsUs.s deleted file mode 100644 index 1cf98da7fc..0000000000 --- a/asm/d/menu/d_menu_fmap_map/setTexture__15dMenu_FmapMap_cFUsUsUsUs.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801CF394: -/* 801CF394 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CF398 7C 08 02 A6 */ mflr r0 -/* 801CF39C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CF3A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF3A4 48 19 2E 31 */ bl _savegpr_27 -/* 801CF3A8 7C 7B 1B 78 */ mr r27, r3 -/* 801CF3AC 7C 9C 23 78 */ mr r28, r4 -/* 801CF3B0 7C BD 2B 78 */ mr r29, r5 -/* 801CF3B4 7C DE 33 78 */ mr r30, r6 -/* 801CF3B8 7C FF 3B 78 */ mr r31, r7 -/* 801CF3BC 38 00 00 00 */ li r0, 0 -/* 801CF3C0 90 03 00 C0 */ stw r0, 0xc0(r3) -/* 801CF3C4 90 03 00 BC */ stw r0, 0xbc(r3) -/* 801CF3C8 7F 83 E3 78 */ mr r3, r28 -/* 801CF3CC 7F A4 EB 78 */ mr r4, r29 -/* 801CF3D0 38 A0 00 09 */ li r5, 9 -/* 801CF3D4 38 C0 00 00 */ li r6, 0 -/* 801CF3D8 38 E0 00 00 */ li r7, 0 -/* 801CF3DC 48 18 E8 41 */ bl GXGetTexBufferSize -/* 801CF3E0 38 80 00 20 */ li r4, 0x20 -/* 801CF3E4 48 0F F9 09 */ bl __nwa__FUli -/* 801CF3E8 90 7B 00 C0 */ stw r3, 0xc0(r27) -/* 801CF3EC 7F 63 DB 78 */ mr r3, r27 -/* 801CF3F0 80 9B 00 C0 */ lwz r4, 0xc0(r27) -/* 801CF3F4 7F 85 E3 78 */ mr r5, r28 -/* 801CF3F8 7F A6 EB 78 */ mr r6, r29 -/* 801CF3FC 7F C7 F3 78 */ mr r7, r30 -/* 801CF400 7F E8 FB 78 */ mr r8, r31 -/* 801CF404 4B FF ED 59 */ bl init__15renderingFmap_cFPUcUsUsUsUs -/* 801CF408 38 60 00 20 */ li r3, 0x20 -/* 801CF40C 38 80 00 20 */ li r4, 0x20 -/* 801CF410 48 0F F8 65 */ bl __nw__FUli -/* 801CF414 90 7B 00 BC */ stw r3, 0xbc(r27) -/* 801CF418 7F 63 DB 78 */ mr r3, r27 -/* 801CF41C 80 9B 00 BC */ lwz r4, 0xbc(r27) -/* 801CF420 7F 85 E3 78 */ mr r5, r28 -/* 801CF424 7F A6 EB 78 */ mr r6, r29 -/* 801CF428 80 FB 00 C0 */ lwz r7, 0xc0(r27) -/* 801CF42C 81 1B 00 C8 */ lwz r8, 0xc8(r27) -/* 801CF430 39 20 00 1B */ li r9, 0x1b -/* 801CF434 4B E6 D9 05 */ bl makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs -/* 801CF438 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF43C 48 19 2D E5 */ bl _restgpr_27 -/* 801CF440 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CF444 7C 08 03 A6 */ mtlr r0 -/* 801CF448 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CF44C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fmap_map/twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor.s b/asm/d/menu/d_menu_fmap_map/twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor.s deleted file mode 100644 index 1a6c80094c..0000000000 --- a/asm/d/menu/d_menu_fmap_map/twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801CE0CC: -/* 801CE0CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801CE0D0 7C 08 02 A6 */ mflr r0 -/* 801CE0D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801CE0D8 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801CE0DC 39 61 00 18 */ addi r11, r1, 0x18 -/* 801CE0E0 48 19 40 FD */ bl _savegpr_29 -/* 801CE0E4 7C 7D 1B 78 */ mr r29, r3 -/* 801CE0E8 7C 9E 23 78 */ mr r30, r4 -/* 801CE0EC FF E0 08 90 */ fmr f31, f1 -/* 801CE0F0 7C BF 2B 78 */ mr r31, r5 -/* 801CE0F4 88 63 00 00 */ lbz r3, 0(r3) -/* 801CE0F8 88 84 00 00 */ lbz r4, 0(r4) -/* 801CE0FC 4B FF FF 6D */ bl twoValueLineInterpolation__FUcUcf -/* 801CE100 98 7F 00 00 */ stb r3, 0(r31) -/* 801CE104 88 7D 00 01 */ lbz r3, 1(r29) -/* 801CE108 88 9E 00 01 */ lbz r4, 1(r30) -/* 801CE10C FC 20 F8 90 */ fmr f1, f31 -/* 801CE110 4B FF FF 59 */ bl twoValueLineInterpolation__FUcUcf -/* 801CE114 98 7F 00 01 */ stb r3, 1(r31) -/* 801CE118 88 7D 00 02 */ lbz r3, 2(r29) -/* 801CE11C 88 9E 00 02 */ lbz r4, 2(r30) -/* 801CE120 FC 20 F8 90 */ fmr f1, f31 -/* 801CE124 4B FF FF 45 */ bl twoValueLineInterpolation__FUcUcf -/* 801CE128 98 7F 00 02 */ stb r3, 2(r31) -/* 801CE12C 88 7D 00 03 */ lbz r3, 3(r29) -/* 801CE130 88 9E 00 03 */ lbz r4, 3(r30) -/* 801CE134 FC 20 F8 90 */ fmr f1, f31 -/* 801CE138 4B FF FF 31 */ bl twoValueLineInterpolation__FUcUcf -/* 801CE13C 98 7F 00 03 */ stb r3, 3(r31) -/* 801CE140 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801CE144 39 61 00 18 */ addi r11, r1, 0x18 -/* 801CE148 48 19 40 E1 */ bl _restgpr_29 -/* 801CE14C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801CE150 7C 08 03 A6 */ mtlr r0 -/* 801CE154 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CE158 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s b/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s deleted file mode 100644 index 5c86997233..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s +++ /dev/null @@ -1,243 +0,0 @@ -lbl_80579FF8: -/* 80579FF8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80579FFC 7C 08 02 A6 */ mflr r0 -/* 8057A000 90 01 00 64 */ stw r0, 0x64(r1) -/* 8057A004 39 61 00 60 */ addi r11, r1, 0x60 -/* 8057A008 4B DE 81 CD */ bl _savegpr_27 -/* 8057A00C 7C 7D 1B 78 */ mr r29, r3 -/* 8057A010 3C 60 80 58 */ lis r3, l_hair_offset@ha /* 0x8057B360@ha */ -/* 8057A014 3B C3 B3 60 */ addi r30, r3, l_hair_offset@l /* 0x8057B360@l */ -/* 8057A018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A01C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A020 38 7C 4E 20 */ addi r3, r28, 0x4e20 -/* 8057A024 81 9C 4E 20 */ lwz r12, 0x4e20(r28) -/* 8057A028 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8057A02C 7D 89 03 A6 */ mtctr r12 -/* 8057A030 4E 80 04 21 */ bctrl -/* 8057A034 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8057A038 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 8057A03C 28 00 00 03 */ cmplwi r0, 3 -/* 8057A040 41 82 00 A0 */ beq lbl_8057A0E0 -/* 8057A044 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8057A048 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8057A04C 28 04 00 FF */ cmplwi r4, 0xff -/* 8057A050 41 82 00 20 */ beq lbl_8057A070 -/* 8057A054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A05C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 8057A060 7C 05 07 74 */ extsb r5, r0 -/* 8057A064 4B AB B2 FD */ bl isSwitch__10dSv_info_cCFii -/* 8057A068 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A06C 41 82 00 10 */ beq lbl_8057A07C -lbl_8057A070: -/* 8057A070 38 00 00 01 */ li r0, 1 -/* 8057A074 98 1D 05 91 */ stb r0, 0x591(r29) -/* 8057A078 48 00 00 0C */ b lbl_8057A084 -lbl_8057A07C: -/* 8057A07C 38 00 00 00 */ li r0, 0 -/* 8057A080 98 1D 05 91 */ stb r0, 0x591(r29) -lbl_8057A084: -/* 8057A084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057A088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057A08C 83 83 5D AC */ lwz r28, 0x5dac(r3) -/* 8057A090 88 1D 05 91 */ lbz r0, 0x591(r29) -/* 8057A094 28 00 00 00 */ cmplwi r0, 0 -/* 8057A098 41 82 02 0C */ beq lbl_8057A2A4 -/* 8057A09C 7F A3 EB 78 */ mr r3, r29 -/* 8057A0A0 38 80 00 00 */ li r4, 0 -/* 8057A0A4 4B FF FB 8D */ bl appear__15daObjBossWarp_cFi -/* 8057A0A8 7F A3 EB 78 */ mr r3, r29 -/* 8057A0AC 4B FF FD B1 */ bl checkDistance__15daObjBossWarp_cFv -/* 8057A0B0 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A0B4 41 82 01 F0 */ beq lbl_8057A2A4 -/* 8057A0B8 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8057A0BC 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 8057A0C0 7F 83 E3 78 */ mr r3, r28 -/* 8057A0C4 38 A0 00 FF */ li r5, 0xff -/* 8057A0C8 38 C0 00 00 */ li r6, 0 -/* 8057A0CC 81 9C 06 28 */ lwz r12, 0x628(r28) -/* 8057A0D0 81 8C 01 7C */ lwz r12, 0x17c(r12) -/* 8057A0D4 7D 89 03 A6 */ mtctr r12 -/* 8057A0D8 4E 80 04 21 */ bctrl -/* 8057A0DC 48 00 01 C8 */ b lbl_8057A2A4 -lbl_8057A0E0: -/* 8057A0E0 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8057A0E4 54 00 2F FF */ rlwinm. r0, r0, 5, 0x1f, 0x1f -/* 8057A0E8 40 82 00 34 */ bne lbl_8057A11C -/* 8057A0EC 38 7C 4F F8 */ addi r3, r28, 0x4ff8 -/* 8057A0F0 4B AC E7 3D */ bl checkStartDemo__16dEvent_manager_cFv -/* 8057A0F4 2C 03 00 00 */ cmpwi r3, 0 -/* 8057A0F8 40 82 00 24 */ bne lbl_8057A11C -/* 8057A0FC 38 00 00 01 */ li r0, 1 -/* 8057A100 98 1D 05 95 */ stb r0, 0x595(r29) -/* 8057A104 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8057A108 D0 1D 06 20 */ stfs f0, 0x620(r29) -/* 8057A10C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8057A110 D0 1D 06 24 */ stfs f0, 0x624(r29) -/* 8057A114 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8057A118 D0 1D 06 28 */ stfs f0, 0x628(r29) -lbl_8057A11C: -/* 8057A11C 7F A3 EB 78 */ mr r3, r29 -/* 8057A120 48 00 02 71 */ bl event_proc_call__15daObjBossWarp_cFv -/* 8057A124 3C 60 80 45 */ lis r3, m_midnaActor__9daPy_py_c@ha /* 0x80451018@ha */ -/* 8057A128 83 63 10 18 */ lwz r27, m_midnaActor__9daPy_py_c@l(r3) /* 0x80451018@l */ -/* 8057A12C 88 1D 05 95 */ lbz r0, 0x595(r29) -/* 8057A130 28 00 00 00 */ cmplwi r0, 0 -/* 8057A134 41 82 00 30 */ beq lbl_8057A164 -/* 8057A138 28 1B 00 00 */ cmplwi r27, 0 -/* 8057A13C 41 82 00 28 */ beq lbl_8057A164 -/* 8057A140 C0 1D 06 20 */ lfs f0, 0x620(r29) -/* 8057A144 D0 1B 09 AC */ stfs f0, 0x9ac(r27) -/* 8057A148 C0 1D 06 24 */ lfs f0, 0x624(r29) -/* 8057A14C D0 1B 09 B0 */ stfs f0, 0x9b0(r27) -/* 8057A150 C0 1D 06 28 */ lfs f0, 0x628(r29) -/* 8057A154 D0 1B 09 B4 */ stfs f0, 0x9b4(r27) -/* 8057A158 80 1B 08 90 */ lwz r0, 0x890(r27) -/* 8057A15C 60 00 04 00 */ ori r0, r0, 0x400 -/* 8057A160 90 1B 08 90 */ stw r0, 0x890(r27) -lbl_8057A164: -/* 8057A164 38 00 02 F2 */ li r0, 0x2f2 -/* 8057A168 B0 01 00 08 */ sth r0, 8(r1) -/* 8057A16C 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha /* 0x80023578@ha */ -/* 8057A170 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 0x80023578@l */ -/* 8057A174 38 81 00 08 */ addi r4, r1, 8 -/* 8057A178 4B A9 F6 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8057A17C 7C 7F 1B 78 */ mr r31, r3 -/* 8057A180 4B FF F4 D9 */ bl getNowLevel__Fv -/* 8057A184 7C 7C 1B 78 */ mr r28, r3 -/* 8057A188 28 1F 00 00 */ cmplwi r31, 0 -/* 8057A18C 41 82 01 18 */ beq lbl_8057A2A4 -/* 8057A190 28 1B 00 00 */ cmplwi r27, 0 -/* 8057A194 41 82 01 10 */ beq lbl_8057A2A4 -/* 8057A198 88 1D 05 99 */ lbz r0, 0x599(r29) -/* 8057A19C 2C 00 00 01 */ cmpwi r0, 1 -/* 8057A1A0 41 82 00 0C */ beq lbl_8057A1AC -/* 8057A1A4 40 80 01 00 */ bge lbl_8057A2A4 -/* 8057A1A8 48 00 00 FC */ b lbl_8057A2A4 -lbl_8057A1AC: -/* 8057A1AC 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 8057A1B0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8057A1B4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8057A1B8 38 63 01 E0 */ addi r3, r3, 0x1e0 -/* 8057A1BC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057A1C0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057A1C4 4B DC C2 ED */ bl PSMTXCopy -/* 8057A1C8 1F 9C 00 0C */ mulli r28, r28, 0xc -/* 8057A1CC 38 7E 00 00 */ addi r3, r30, 0 -/* 8057A1D0 7C 03 E4 2E */ lfsx f0, r3, r28 -/* 8057A1D4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8057A1D8 7C 63 E2 14 */ add r3, r3, r28 -/* 8057A1DC C0 03 00 04 */ lfs f0, 4(r3) -/* 8057A1E0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8057A1E4 C0 03 00 08 */ lfs f0, 8(r3) -/* 8057A1E8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8057A1EC 38 61 00 1C */ addi r3, r1, 0x1c -/* 8057A1F0 4B A9 2B E5 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 8057A1F4 C0 3E 01 24 */ lfs f1, 0x124(r30) -/* 8057A1F8 38 9E 00 54 */ addi r4, r30, 0x54 -/* 8057A1FC 7C 64 E2 14 */ add r3, r4, r28 -/* 8057A200 C0 03 00 08 */ lfs f0, 8(r3) -/* 8057A204 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8057A208 FC 00 00 1E */ fctiwz f0, f0 -/* 8057A20C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8057A210 80 C1 00 2C */ lwz r6, 0x2c(r1) -/* 8057A214 C0 03 00 04 */ lfs f0, 4(r3) -/* 8057A218 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8057A21C FC 00 00 1E */ fctiwz f0, f0 -/* 8057A220 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8057A224 80 A1 00 34 */ lwz r5, 0x34(r1) -/* 8057A228 7C 04 E4 2E */ lfsx f0, r4, r28 -/* 8057A22C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8057A230 FC 00 00 1E */ fctiwz f0, f0 -/* 8057A234 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 8057A238 80 81 00 3C */ lwz r4, 0x3c(r1) -/* 8057A23C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057A240 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057A244 4B A9 20 5D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 8057A248 C0 3D 05 CC */ lfs f1, 0x5cc(r29) -/* 8057A24C FC 40 08 90 */ fmr f2, f1 -/* 8057A250 FC 60 08 90 */ fmr f3, f1 -/* 8057A254 4B A9 2B E5 */ bl scaleM__14mDoMtx_stack_cFfff -/* 8057A258 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057A25C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057A260 38 00 00 01 */ li r0, 1 -/* 8057A264 98 1F 05 98 */ stb r0, 0x598(r31) -/* 8057A268 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 8057A26C 28 00 00 03 */ cmplwi r0, 3 -/* 8057A270 40 80 00 1C */ bge lbl_8057A28C -/* 8057A274 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8057A278 28 04 00 00 */ cmplwi r4, 0 -/* 8057A27C 41 82 00 28 */ beq lbl_8057A2A4 -/* 8057A280 38 84 00 24 */ addi r4, r4, 0x24 -/* 8057A284 4B DC C2 2D */ bl PSMTXCopy -/* 8057A288 48 00 00 1C */ b lbl_8057A2A4 -lbl_8057A28C: -/* 8057A28C 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 8057A290 28 04 00 00 */ cmplwi r4, 0 -/* 8057A294 41 82 00 10 */ beq lbl_8057A2A4 -/* 8057A298 80 84 00 04 */ lwz r4, 4(r4) -/* 8057A29C 38 84 00 24 */ addi r4, r4, 0x24 -/* 8057A2A0 4B DC C2 11 */ bl PSMTXCopy -lbl_8057A2A4: -/* 8057A2A4 80 7D 05 7C */ lwz r3, 0x57c(r29) -/* 8057A2A8 4B A9 31 81 */ bl play__14mDoExt_baseAnmFv -/* 8057A2AC 80 7D 05 74 */ lwz r3, 0x574(r29) -/* 8057A2B0 4B A9 31 79 */ bl play__14mDoExt_baseAnmFv -/* 8057A2B4 80 7D 05 78 */ lwz r3, 0x578(r29) -/* 8057A2B8 4B A9 31 71 */ bl play__14mDoExt_baseAnmFv -/* 8057A2BC 88 1D 06 2C */ lbz r0, 0x62c(r29) -/* 8057A2C0 28 00 00 00 */ cmplwi r0, 0 -/* 8057A2C4 41 82 00 14 */ beq lbl_8057A2D8 -/* 8057A2C8 38 7D 04 F0 */ addi r3, r29, 0x4f0 -/* 8057A2CC C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 8057A2D0 C0 5E 01 28 */ lfs f2, 0x128(r30) -/* 8057A2D4 4B CF 64 6D */ bl cLib_chaseF__FPfff -lbl_8057A2D8: -/* 8057A2D8 80 7D 05 8C */ lwz r3, 0x58c(r29) -/* 8057A2DC 28 03 00 00 */ cmplwi r3, 0 -/* 8057A2E0 41 82 00 30 */ beq lbl_8057A310 -/* 8057A2E4 E0 1D 04 EC */ psq_l f0, 1260(r29), 0, 0 /* qr0 */ -/* 8057A2E8 C0 5D 04 F4 */ lfs f2, 0x4f4(r29) -/* 8057A2EC F0 01 00 10 */ psq_st f0, 16(r1), 0, 0 /* qr0 */ -/* 8057A2F0 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8057A2F4 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8057A2F8 D0 23 00 98 */ stfs f1, 0x98(r3) -/* 8057A2FC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8057A300 D0 03 00 9C */ stfs f0, 0x9c(r3) -/* 8057A304 D0 43 00 A0 */ stfs f2, 0xa0(r3) -/* 8057A308 D0 23 00 B0 */ stfs f1, 0xb0(r3) -/* 8057A30C D0 03 00 B4 */ stfs f0, 0xb4(r3) -lbl_8057A310: -/* 8057A310 80 7D 05 7C */ lwz r3, 0x57c(r29) -/* 8057A314 28 03 00 00 */ cmplwi r3, 0 -/* 8057A318 41 82 00 54 */ beq lbl_8057A36C -/* 8057A31C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8057A320 C0 1E 00 E8 */ lfs f0, 0xe8(r30) -/* 8057A324 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8057A328 41 82 00 44 */ beq lbl_8057A36C -/* 8057A32C 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008027F@ha */ -/* 8057A330 38 03 02 7F */ addi r0, r3, 0x027F /* 0x0008027F@l */ -/* 8057A334 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057A338 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8057A33C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8057A340 80 63 00 00 */ lwz r3, 0(r3) -/* 8057A344 38 81 00 0C */ addi r4, r1, 0xc -/* 8057A348 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 8057A34C 38 C0 00 00 */ li r6, 0 -/* 8057A350 38 E0 00 00 */ li r7, 0 -/* 8057A354 C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 8057A358 FC 40 08 90 */ fmr f2, f1 -/* 8057A35C C0 7E 01 20 */ lfs f3, 0x120(r30) -/* 8057A360 FC 80 18 90 */ fmr f4, f3 -/* 8057A364 39 00 00 00 */ li r8, 0 -/* 8057A368 4B D3 21 A5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8057A36C: -/* 8057A36C 7F A3 EB 78 */ mr r3, r29 -/* 8057A370 4B FF F3 D9 */ bl setBaseMtx__15daObjBossWarp_cFv -/* 8057A374 38 60 00 01 */ li r3, 1 -/* 8057A378 39 61 00 60 */ addi r11, r1, 0x60 -/* 8057A37C 4B DE 7E A5 */ bl _restgpr_27 -/* 8057A380 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8057A384 7C 08 03 A6 */ mtlr r0 -/* 8057A388 38 21 00 60 */ addi r1, r1, 0x60 -/* 8057A38C 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index cee9371e88..86532e4045 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -162,7 +162,7 @@ public: /* vt[12] */ virtual u32 getResSize(const void*) const; /* override */ /* vt[13] */ virtual u32 countFile(const char*) const; /* override */ /* vt[14] */ virtual JKRFileFinder* getFirstFile(const char*) const; /* override */ - /* vt[15] */ virtual u32 getExpandedResSize(const void*) const; + /* vt[15] */ virtual u32 getExpandedResSize(const void* res) const { return getResSize(res); } /* vt[16] */ virtual void* fetchResource(SDIFileEntry*, u32*) = 0; /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*) = 0; /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index a03b159b18..44b0d4b927 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1008,6 +1008,7 @@ u8 dComIfGs_staffroll_next_go_check(); s8 dComIfGs_BossLife_public_Get(); u8 dComIfGs_checkGetInsectNum(); u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx); +BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no); inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); @@ -1659,6 +1660,14 @@ inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos i_point, i_region); } +inline char* dComIfGs_getPlayerFieldLastStayName() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getName(); +} + +inline s16 dComIfGs_getPlayerFieldLastStayAngleY() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getAngleY(); +} + inline void dComIfGs_setPlayerName(const char* i_name) { g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setPlayerName(i_name); } @@ -1947,6 +1956,7 @@ u8 dComIfGp_TargetWarpPt_get(); void dComIfGp_TargetWarpPt_set(u8); BOOL dComIfGp_TransportWarp_check(); u8 dComIfGp_SelectWarpPt_get(); +void dComIfGp_SelectWarpPt_set(u8); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, u32 lastMode, int, s8 wipe, s16 lastAngle, int, int); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer); diff --git a/include/d/d_stage.h b/include/d/d_stage.h index d9c0c7e5d0..bbefb43a9b 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1012,6 +1012,7 @@ class cBgS_GndChk; int dStage_RoomCheck(cBgS_GndChk* gndChk); void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* stageDt, int param_2); void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2); +void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* stageDt); dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); diff --git a/include/d/map/d_map.h b/include/d/map/d_map.h index 27c57b2f85..818ab23383 100644 --- a/include/d/map/d_map.h +++ b/include/d/map/d_map.h @@ -3,6 +3,40 @@ #include "d/map/d_map_path_dmap.h" +struct dMap_prm_res_s { + /* 0x000 */ dMpath_RGB5A3_palDt_s palette_data[51]; + /* 0x198 */ u8 field_0x198; + /* 0x199 */ u8 field_0x199; + /* 0x19A */ u8 field_0x19a; + /* 0x19B */ u8 field_0x19b; + /* 0x19C */ u8 field_0x19c; + /* 0x19D */ u8 field_0x19d; + /* 0x19E */ u8 field_0x19e; + /* 0x19F */ u8 field_0x19f; + /* 0x1A0 */ u8 field_0x1a0; + /* 0x1A1 */ u8 field_0x1a1; + /* 0x1A2 */ u8 field_0x1a2; + /* 0x1A3 */ u8 field_0x1a3; + /* 0x1A4 */ u8 field_0x1a4; + /* 0x1A5 */ u8 field_0x1a5; + /* 0x1A6 */ u8 field_0x1a6; + /* 0x1A7 */ u8 field_0x1a7; + /* 0x1A8 */ u8 field_0x1a8; + /* 0x1A9 */ u8 field_0x1a9; + /* 0x1AA */ s16 field_0x1aa; + /* 0x1AC */ s16 field_0x1ac; + /* 0x1AE */ s16 field_0x1ae; + /* 0x1B0 */ s16 field_0x1b0; + /* 0x1B2 */ s16 field_0x1b2; + /* 0x1B4 */ s16 field_0x1b4; + /* 0x1B6 */ s16 field_0x1b6; + /* 0x1B8 */ f32 cursor_size; +}; + +struct dMap_HIO_prm_res_dst_s { + static dMap_prm_res_s* m_res; +}; + class renderingAmap_c : public renderingPlusDoorAndCursor_c { public: /* 800288C4 */ int getDispType() const; @@ -48,8 +82,6 @@ private: /* 0x3C */ s32 field_0x3c; }; // Size: 0x40 -struct dMap_prm_res_s; - class dMap_c : public renderingAmap_c { public: /* 8002974C */ void copyPalette(); diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index 87e8631562..1290e21770 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -20,7 +20,7 @@ public: }; // Size: 0x8 struct group_class { - /* 0x00 */ u8 field_0x0; + /* 0x00 */ u8 mSwbit; /* 0x01 */ u8 field_0x1; /* 0x02 */ u8 mLineNum; /* 0x03 */ u8 field_0x3; @@ -52,7 +52,7 @@ public: /* 8002AD3C */ virtual ~dDrawPath_c() {} /* 8002ABF0 */ virtual bool isDrawType(int) { return true; } virtual const GXColor* getColor(int) = 0; - /* 8002AD84 */ virtual GXColor* getLineColor(int param_0, int) { return (GXColor*)getColor(param_0); } + /* 8002AD84 */ virtual const GXColor* getLineColor(int param_0, int) { return (GXColor*)getColor(param_0); } virtual int getLineWidth(int) = 0; virtual bool isSwitch(dDrawPath_c::group_class const*) = 0; virtual bool isRenderingFloor(int) = 0; @@ -91,11 +91,11 @@ public: field_0x4 = NULL; field_0x8 = 0.0f; field_0xc = 0.0f; - field_0x10 = 0.0f; - field_0x14 = 0.0f; + mPosX = 0.0f; + mPosZ = 0.0f; mCmPerTexel = 0.0f; - field_0x1c = 0; - field_0x1e = 0; + mTexWidth = 0; + mTexHeight = 0; field_0x20 = 0; field_0x22 = 0; } @@ -108,25 +108,25 @@ public: /* 8002ABF8 */ virtual ~dRenderingFDAmap_c() {} /* 8003D188 */ virtual void preRenderingMap(); /* 8003D320 */ virtual void postRenderingMap(); - virtual GXColor* getBackColor() const = 0; + virtual const GXColor* getBackColor() const = 0; /* 8003D68C */ virtual const GXColor* getDecoLineColor(int, int); /* 8003D6B8 */ virtual s32 getDecorationLineWidth(int); bool isDrawAreaCheck(const Vec& param_0) { - return (param_0.x >= field_0x10 - field_0x8 * 2.0f && - param_0.x <= field_0x10 + field_0x8 * 2.0f) && - (param_0.z >= field_0x14 - field_0xc * 2.0f && - param_0.z <= field_0x14 + field_0xc * 2.0f); + return (param_0.x >= mPosX - field_0x8 * 2.0f && + param_0.x <= mPosX + field_0x8 * 2.0f) && + (param_0.z >= mPosZ - field_0xc * 2.0f && + param_0.z <= mPosZ + field_0xc * 2.0f); } /* 0x04 */ u8* field_0x4; /* 0x08 */ f32 field_0x8; /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; + /* 0x10 */ f32 mPosX; + /* 0x14 */ f32 mPosZ; /* 0x18 */ f32 mCmPerTexel; - /* 0x1C */ u16 field_0x1c; - /* 0x1E */ u16 field_0x1e; + /* 0x1C */ u16 mTexWidth; + /* 0x1E */ u16 mTexHeight; /* 0x20 */ u16 field_0x20; /* 0x22 */ u16 field_0x22; }; // Size: 0x24 @@ -154,4 +154,15 @@ struct dMpath_n { STATIC_ASSERT(sizeof(dMpath_n::dTexObjAggregate_c) == 28); +struct dMpath_RGB5A3_s { + u16 color; +}; + +struct dMpath_RGB5A3_palDt_s { + /* 0x0 */ dMpath_RGB5A3_s field_0x0; + /* 0x2 */ dMpath_RGB5A3_s field_0x2; + /* 0x4 */ dMpath_RGB5A3_s field_0x4; + /* 0x6 */ dMpath_RGB5A3_s field_0x6; +}; + #endif /* D_MAP_D_MAP_PATH_H */ diff --git a/include/d/map/d_map_path_fmap.h b/include/d/map/d_map_path_fmap.h index 4aa8f432bf..0dd9681ab5 100644 --- a/include/d/map/d_map_path_fmap.h +++ b/include/d/map/d_map_path_fmap.h @@ -12,7 +12,11 @@ public: mpNext = NULL; } - /* 8003EB70 */ ~fmpTresTypeGroupData_c(); + /* 8003EB70 */ ~fmpTresTypeGroupData_c() { + if (mpNext != NULL) { + delete mpNext; + } + } void setTypeGroupNo(u8 i_no) { mTypeGroupNo = i_no; } void setNextData(fmpTresTypeGroupData_c* i_next) { mpNext = i_next; } @@ -31,6 +35,8 @@ public: /* 8003EB10 */ ~fmpTresTypeGroupDataList_c(); /* 8003EC90 */ fmpTresTypeGroupDataList_c(); + fmpTresTypeGroupData_c* getTypeGroupDataHead() { return mpTypeGroupDataHead; } + /* 0x0 */ fmpTresTypeGroupData_c* mpTypeGroupDataHead; /* 0x4 */ fmpTresTypeGroupData_c* mpNextData; }; @@ -40,21 +46,34 @@ public: void addTypeGroupData(u8 i_typeGroupNo, const dTres_c::data_s* i_data) { mpTypeGroupData[i_typeGroupNo].addTypeGroupData(i_typeGroupNo, i_data); } + fmpTresTypeGroupDataList_c* getTypeGroupDataList(int i_typeGroupNo) { + return &mpTypeGroupData[i_typeGroupNo]; + } /* 0x0 */ fmpTresTypeGroupDataList_c mpTypeGroupData[17]; }; class dMenu_Fmap_data_c { public: + dMenu_Fmap_data_c() { + mp_tresure = NULL; + m_fileList2 = NULL; + mp_mapPath = NULL; + mp_dzsData = NULL; + } + dTres_c::list_class* getTresure() { return mp_tresure; } f32 getFilelist2MinX() { return m_fileList2->mLeftRmX; } f32 getFilelist2MinZ() { return m_fileList2->mInnerRmZ; } f32 getFilelist2MaxX() { return m_fileList2->mRightRmX; } f32 getFilelist2MaxZ() { return m_fileList2->mFrontRmZ; } + dDrawPath_c::room_class* getMapPath() { return mp_mapPath; } + void* getDzsData() { return mp_dzsData; } void setFileList2(dStage_FileList2_dt_c* i_fileList) { m_fileList2 = i_fileList; } void setTresure(dTres_c::list_class* i_list) { mp_tresure = i_list; } void setMapPath(dDrawPath_c::room_class* i_path) { mp_mapPath = i_path; } + void setDzsData(void* i_dzsData) { mp_dzsData = i_dzsData; } /* 0x0 */ dTres_c::list_class* mp_tresure; /* 0x4 */ dStage_FileList2_dt_c* m_fileList2; @@ -69,12 +88,30 @@ public: /* 8003D868 */ void buildTresTypeGroup(int, int, int); /* 8003D92C */ void buildFmapRoomData(int, int, f32, f32, f32, f32); + dMenu_Fmap_room_data_c(u8 i_roomNo, dMenu_Fmap_stage_data_c* i_stageData, + dMenu_Fmap_data_c* i_data) { + mp_fmapData = i_data; + mp_fmpTresTypeGroupDataListAll = NULL; + mp_nextData = NULL; + mp_parentStage = i_stageData; + m_roomNo = i_roomNo; + } + + ~dMenu_Fmap_room_data_c() { + if (mp_fmpTresTypeGroupDataListAll != NULL) { + delete mp_fmpTresTypeGroupDataListAll; + } + } + + fmpTresTypeGroupDataListAll_c* getTypeGroupDataListAll() { return mp_fmpTresTypeGroupDataListAll; } f32 getFileList2MinX() { return mp_fmapData->getFilelist2MinX(); } f32 getFileList2MinZ() { return mp_fmapData->getFilelist2MinZ(); } f32 getFileList2MaxX() { return mp_fmapData->getFilelist2MaxX(); } f32 getFileList2MaxZ() { return mp_fmapData->getFilelist2MaxZ(); } dMenu_Fmap_room_data_c* getNextData() { return mp_nextData; } + dMenu_Fmap_data_c* getFmapData() { return mp_fmapData; } int getRoomNo() { return m_roomNo; } + void setNextData(dMenu_Fmap_room_data_c* i_nextData) { mp_nextData = i_nextData; } /* 0x00 */ dMenu_Fmap_data_c* mp_fmapData; /* 0x04 */ fmpTresTypeGroupDataListAll_c* mp_fmpTresTypeGroupDataListAll; @@ -85,11 +122,14 @@ public: class dMenu_Fmap_stage_arc_data_c { public: + u8 getSaveTableNo() { return mSaveTableNo; } u8 getVisitedRoomSaveTableNo() { return mVisitedRoomSaveTableNo; } - /* 0x0 */ u8 field_0x0; + /* 0x0 */ u8 mSize; /* 0x1 */ u8 mSaveTableNo; /* 0x2 */ u8 mVisitedRoomSaveTableNo; + /* 0x3 */ u8 field_0x3; + /* 0x4 */ u8 mRoomNos[0]; }; class dMenu_Fmap_stage_data_c { @@ -97,8 +137,47 @@ public: /* 8003D95C */ bool isArrival(); /* 8003D9D8 */ int buildFmapStageData(int, f32, f32); + dMenu_Fmap_stage_data_c() { + mpStageArc = NULL; + mp_roomTop = NULL; + mpNextData = NULL; + m_stageMinX = 0.0f; + m_stageMinZ = 0.0f; + m_stageMaxX = 0.0f; + m_stageMaxZ = 0.0f; + m_offsetX = 0.0f; + m_offsetZ = 0.0f; + for (int i = 0; i < 8; i++) { + name[i] = '\0'; + } + } + + f32 getStageCenterX() { return (m_stageMaxX + m_stageMinX) * 0.5f; } + f32 getStageCenterZ() { return (m_stageMaxZ + m_stageMinZ) * 0.5f; } + f32 getStageCenterX_CoordRegion() { return m_offsetX + getStageCenterX(); } + f32 getStageCenterZ_CoordRegion() { return m_offsetZ + getStageCenterZ(); } + char* getStageName() { return name; } dMenu_Fmap_stage_arc_data_c* getStageArc() { return mpStageArc; } dMenu_Fmap_stage_data_c* getNextData() { return mpNextData; } + dMenu_Fmap_room_data_c* getFmapRoomDataTop() { return mp_roomTop; } + f32 getOffsetX() { return m_offsetX; } + f32 getOffsetZ() { return m_offsetZ; } + f32 getStageMinX() { return m_stageMinX; } + f32 getStageMinZ() { return m_stageMinZ; } + f32 getStageMaxX() { return m_stageMaxX; } + f32 getStageMaxZ() { return m_stageMaxZ; } + void setStageArc(dMenu_Fmap_stage_arc_data_c* i_stageArc) { mpStageArc = i_stageArc; } + void setFmapRoomDataTop(dMenu_Fmap_room_data_c* i_roomTop) { mp_roomTop = i_roomTop; } + void setNextData(dMenu_Fmap_stage_data_c* i_nextData) { mpNextData = i_nextData; } + void setStageCntNo(int i_no) { m_stageCntNo = i_no; } + void setOffsetX(f32 i_offsetX) { m_offsetX = i_offsetX; } + void setOffsetZ(f32 i_offsetZ) { m_offsetZ = i_offsetZ; } + + void setName(char* i_name) { + for (int i = 0; i < 8; i++) { + name[i] = i_name[i]; + } + } /* 0x00 */ char name[8]; /* 0x08 */ dMenu_Fmap_stage_arc_data_c* mpStageArc; @@ -116,8 +195,41 @@ public: class dMenu_Fmap_region_data_c { public: /* 8003DB48 */ dMenu_Fmap_stage_data_c* getMenuFmapStageData(int); - /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); - /* 8003DEE0 */ void buildFmapRegionData(int); + /* 8003DB70 */ int getPointStagePathInnerNo(f32, f32, int, int*, int*); + /* 8003DEE0 */ int buildFmapRegionData(int); + + dMenu_Fmap_region_data_c(int i_no, dMenu_Fmap_stage_data_c* i_stageData, + f32 i_offsetX, f32 i_offsetZ) { + mpMenuFmapStageDataTop = i_stageData; + mpNextData = NULL; + mRegionOffsetX = i_offsetX; + mRegionOffsetZ = i_offsetZ; + mRegionMinX = 0.0f; + mRegionMaxX = 0.0f; + mRegionMinZ = 0.0f; + mRegionMaxZ = 0.0f; + mRegionNo = i_no; + buildFmapRegionData(0); + } + + f32 getStageCenterX_CoordWorld(int i_stageNo) { + return mRegionOffsetX + getMenuFmapStageData(i_stageNo)->getStageCenterX_CoordRegion(); + } + + f32 getStageCenterZ_CoordWorld(int i_stageNo) { + return mRegionOffsetZ + getMenuFmapStageData(i_stageNo)->getStageCenterZ_CoordRegion(); + } + + dMenu_Fmap_stage_data_c* getMenuFmapStageDataTop() { return mpMenuFmapStageDataTop; } + dMenu_Fmap_region_data_c* getNextData() { return mpNextData; } + f32 getRegionOffsetX() { return mRegionOffsetX; } + f32 getRegionOffsetZ() { return mRegionOffsetZ; } + f32 getRegionMinX() { return mRegionMinX; } + f32 getRegionMaxX() { return mRegionMaxX; } + f32 getRegionMinZ() { return mRegionMinZ; } + f32 getRegionMaxZ() { return mRegionMaxZ; } + int getRegionNo() { return mRegionNo; } + void setNextData(dMenu_Fmap_region_data_c* i_data) { mpNextData = i_data; } /* 0x00 */ dMenu_Fmap_stage_data_c* mpMenuFmapStageDataTop; /* 0x04 */ dMenu_Fmap_region_data_c* mpNextData; @@ -130,9 +242,17 @@ public: /* 0x20 */ int mRegionNo; }; -struct dMenu_Fmap_world_data_c { +class dMenu_Fmap_world_data_c { +public: /* 8003E028 */ void create(dMenu_Fmap_region_data_c*); - /* 8003E04C */ void buildFmapWorldData(); + /* 8003E04C */ int buildFmapWorldData(); + + dMenu_Fmap_world_data_c(dMenu_Fmap_region_data_c* i_regionData) { create(i_regionData); } + dMenu_Fmap_region_data_c* getMenuFmapRegionTop() { return mp_fmapRegionData; } + f32 getWorldMinX() { return m_worldMinX; } + f32 getWorldMinZ() { return m_worldMinZ; } + f32 getWorldMaxX() { return m_worldMaxX; } + f32 getWorldMaxZ() { return m_worldMaxZ; } /* 0x00 */ dMenu_Fmap_region_data_c* mp_fmapRegionData; /* 0x04 */ f32 m_worldMinX; @@ -141,21 +261,38 @@ struct dMenu_Fmap_world_data_c { /* 0x10 */ f32 m_worldMaxZ; }; -struct dMenuFmapIconPointer_c { - /* 8003E114 */ void init(dMenu_Fmap_region_data_c*, dMenu_Fmap_stage_data_c*, u8, int, int); - /* 8003E1C0 */ void getFirstData(); - /* 8003E2BC */ void getData(); +class dMenuFmapIconPointer_c { +public: + /* 8003E114 */ bool init(dMenu_Fmap_region_data_c*, dMenu_Fmap_stage_data_c*, u8, int, int); + /* 8003E1C0 */ bool getFirstData(); + /* 8003E2BC */ bool getData(); /* 8003E350 */ void getFirstRoomData(); - /* 8003E37C */ void getNextRoomData(); - /* 8003E3A4 */ void getNextStageData(); - /* 8003E3D8 */ void getNextData(); - /* 8003E490 */ void nextData(); - /* 8003E510 */ void getValidData(); + /* 8003E37C */ bool getNextRoomData(); + /* 8003E3A4 */ bool getNextStageData(); + /* 8003E3D8 */ bool getNextData(); + /* 8003E490 */ bool nextData(); + /* 8003E510 */ bool getValidData(); + + /* 0x00 */ int mStageNo; + /* 0x04 */ int mStayStageNo; + /* 0x08 */ int mStayRoomNo; + /* 0x0C */ int mSaveTbl; + /* 0x10 */ dMenu_Fmap_region_data_c* mpRegionData; + /* 0x14 */ dMenu_Fmap_stage_data_c* mpStageData; + /* 0x18 */ dMenu_Fmap_room_data_c* mpRoomData; + /* 0x1C */ fmpTresTypeGroupDataListAll_c* mpFmpTresTypeGroupDataListAll; + /* 0x20 */ fmpTresTypeGroupDataList_c* mpFmpTresTypeGroupDataList; + /* 0x24 */ fmpTresTypeGroupData_c* mpFmpTresTypeGroupData; + /* 0x28 */ dTres_c::typeGroupData_c* mpTresTypeGroupData; + /* 0x2C */ const dTres_c::data_s* mpTresData; + /* 0x30 */ u8 mTypeGroupNo; + /* 0x31 */ u8 mType; }; -struct dMenuFmapIconDisp_c { - /* 8003E578 */ void getPosition(int*, int*, f32*, f32*, dTres_c::data_s const**); - /* 8003E6E8 */ void isDrawDisp(); +class dMenuFmapIconDisp_c : public dMenuFmapIconPointer_c { +public: + /* 8003E578 */ bool getPosition(int*, int*, f32*, f32*, dTres_c::data_s const**); + /* 8003E6E8 */ virtual bool isDrawDisp(); }; #endif /* D_MAP_D_MAP_PATH_FMAP_H */ diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h index 6010022c69..065b515850 100644 --- a/include/d/menu/d_menu_fmap.h +++ b/include/d/menu/d_menu_fmap.h @@ -2,14 +2,17 @@ #define D_MENU_D_MENU_FMAP_H #include "SSystem/SComponent/c_xyz.h" +#include "d/menu/d_menu_map_common.h" #include "d/msg/d_msg_flow.h" struct CSTControl; class J2DAnmTextureSRTKey; class JKRArchive; +class JKRAramArchive; class JKRExpHeap; class JKRHeap; class STControl; +class ResTIMG; class dMenu_Fmap_stage_data_c; class dMenu_Fmap_world_data_c; class dMenu_Fmap_region_data_c; @@ -17,10 +20,91 @@ class dMenu_Fmap2DBack_c; class dMenu_Fmap2DTop_c; class dMenu_FmapMap_c; class mDoDvdThd_mountArchive_c; -struct RoomData_c; + +// Unknown name +class dMenu_Fmap_field_data_c { +public: + /* 0x00 */ u32 field_0x0; + /* 0x04 */ u32 mStageDataOffset; + /* 0x08 */ u32 mRegionDataOffset; + /* 0x0C */ u32 mVirtualStageOffset; + /* 0x10 */ u32 mRoomDataOffset; +}; + +// Unknown name +class dMenu_Fmap_field_region_data_c { +public: + struct data { + /* 0x00 */ u8 mTextureReadNum; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u16 mTitleName; + /* 0x04 */ f32 mOriginX; + /* 0x08 */ f32 mOriginZ; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + }; + + /* 0x0 */ u8 mCount; + /* 0x4 */ data mData[0]; +}; + +// Unknown name +class dMenu_Fmap_virtual_stage_data_c { +public: + struct data { + /* 0x0 */ char mStageName[8]; + /* 0x8 */ char mVirtualStageName[8]; + }; + + /* 0x0 */ u8 mCount; + /* 0x1 */ u8 pad[3]; + /* 0x4 */ data mData[0]; +}; + +// Unknown name +class dMenu_Fmap_field_room_data_c { +public: + struct data { + /* 0x0 */ char mStageName[8]; + /* 0x8 */ u16 mAreaName; + /* 0xA */ u8 mCount; + /* 0xB */ u8 mRoomNos[0]; + }; + + /* 0x0 */ u8 mCount; + /* 0x1 */ u8 pad[3]; + /* 0x4 */ data mData[0]; +}; + +// Unknown name +class dMenu_Fmap_portal_data_c { +public: + struct data { + /* 0x00 */ u8 mSelectWarpPt; + /* 0x01 */ u8 mRegionNo; + /* 0x02 */ const char mStageName[8]; + /* 0x0A */ u8 mRoomNo; + /* 0x0B */ u8 mWarpPlayerNo; + /* 0x0C */ u16 mMessageID; + /* 0x0E */ u8 mStageNo; + /* 0x0F */ u8 mSwitchNo; + /* 0x10 */ cXyz mPosition; + }; + + /* 0x0 */ u8 field_0x0[8]; + /* 0x8 */ u8 mCount; + /* 0xC */ data mData[0]; +}; class dMenu_Fmap_c { public: + typedef void (dMenu_Fmap_c::*process)(); + /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); /* 801C6D64 */ void _create(); /* 801C74A4 */ void _delete(); @@ -95,26 +179,26 @@ public: /* 801CB230 */ u8 getStageCursor(); /* 801CB260 */ f32 getStageTransX(); /* 801CB290 */ f32 getStageTransZ(); - /* 801CB2C0 */ void isRoomCheck(int, int); - /* 801CB570 */ void checkStRoomData(); + /* 801CB2C0 */ bool isRoomCheck(int, int); + /* 801CB570 */ u16 checkStRoomData(); /* 801CB664 */ void talkButton(); /* 801CB6D0 */ void setProcess(u8); /* 801CB6E0 */ void setFlash(u8, bool); - /* 801CB770 */ void readWorldData(u8); - /* 801CB938 */ void readAreaData(u8, bool); - /* 801CBF04 */ void readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8); - /* 801CC094 */ void readFieldMapData(void**, char const*, bool, bool); + /* 801CB770 */ bool readWorldData(u8); + /* 801CB938 */ bool readAreaData(u8, bool); + /* 801CBF04 */ bool readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8); + /* 801CC094 */ bool readFieldMapData(void**, char const*, bool, bool); /* 801CC2B0 */ void decodeFieldMapData(); /* 801CC4EC */ void decodePortalData(); - /* 801CC51C */ void readRoomDzsData(void**, u32, char const*); - /* 801CC61C */ void removeAreaData(); - /* 801CC7A8 */ void removeRoomData(dMenu_Fmap_stage_data_c*); + /* 801CC51C */ bool readRoomDzsData(void**, u32, char const*); + /* 801CC61C */ bool removeAreaData(); + /* 801CC7A8 */ bool removeRoomData(dMenu_Fmap_stage_data_c*); /* 801CC85C */ void setTitleName(u32); /* 801CC880 */ void setAreaName(u32); /* 801CC8AC */ void setAreaNameZero(); /* 801CC8DC */ void portalWarpMapMove(STControl*); /* 801CCA70 */ void onRoomDataBit(int); - /* 801CCA98 */ void isRoomDataBit(int); + /* 801CCA98 */ BOOL isRoomDataBit(int); /* 801CCAC4 */ void resetRoomDataBit(); /* 801CCB08 */ void drawIcon(f32, bool); /* 801CD10C */ void drawIcon(u8, int); @@ -124,97 +208,144 @@ public: /* 801CCE48 */ void drawGoldWolfIcon(); /* 801CCE70 */ void drawCoachIcon(); /* 801CCE98 */ void drawPlayEnterIcon(); - /* 801CCFB0 */ void checkDrawPortalIcon(int, int); - /* 801CD000 */ void searchIcon(u8, int, f32*, f32*); + /* 801CCFB0 */ bool checkDrawPortalIcon(int, int); + /* 801CD000 */ bool searchIcon(u8, int, f32*, f32*); /* 801CD210 */ void drawEnterIcon(); /* 801CD254 */ void drawPortalIcon(); - /* 801CD2FC */ void getRegionStageNum(int); - /* 801CD350 */ void getNowFmapRegionData(); - /* 801CD368 */ void getNowFmapStageData(); - /* 801CD380 */ void searchPortalStageID(char*); + /* 801CD2FC */ u8 getRegionStageNum(int); + /* 801CD350 */ dMenu_Fmap_region_data_c* getNowFmapRegionData(); + /* 801CD368 */ dMenu_Fmap_stage_data_c* getNowFmapStageData(); + /* 801CD380 */ u8 searchPortalStageID(char*); /* 801CD3F0 */ void drawDebugStage(); /* 801CD460 */ void arrowPosInit(); /* 801CD5CC */ void tableArrowPosInit(bool); /* 801CD770 */ void yamibossArrowPosInit(); /* 801CD814 */ void howlArrowPosInit(); - /* 801CD8B4 */ void getHowlRegionID(); - /* 801CD92C */ void isLightVesselGet(); - /* 801CD95C */ void getPlayerPos2D(); + /* 801CD8B4 */ u8 getHowlRegionID(); + /* 801CD92C */ bool isLightVesselGet(); + /* 801CD95C */ cXyz* getPlayerPos2D(); /* 801C6AC8 */ virtual ~dMenu_Fmap_c(); - static u8 MyClass[4]; + enum process_e { + /* 0x00 */ PROC_ALL_MAP, + /* 0x01 */ PROC_PORTAL_DEMO2, + /* 0x02 */ PROC_PORTAL_DEMO3, + /* 0x03 */ PROC_TABLE_DEMO1, + /* 0x04 */ PROC_ZOOM_ALL_TO_REGION, + /* 0x05 */ PROC_ZOOM_REGION_TO_ALL, + /* 0x06 */ PROC_REGION_MAP, + /* 0x07 */ PROC_TO_PORTAL_WARP_MAP, + /* 0x08 */ PROC_PORTAL_WARP_MAP, + /* 0x09 */ PROC_PORTAL_WARP_SELECT, + /* 0x0A */ PROC_PORTAL_WARP_FORBID, + /* 0x0B */ PROC_ZOOM_REGION_TO_SPOT, + /* 0x0C */ PROC_ZOOM_SPOT_TO_REGION, + /* 0x0D */ PROC_SPOT_MAP, + /* 0x0E */ PROC_PORTAL_DEMO1, + /* 0x0F */ PROC_PORTAL_DEMO4, + /* 0x10 */ PROC_PORTAL_DEMO5, + /* 0x11 */ PROC_PORTAL_DEMO6, + /* 0x12 */ PROC_YAMIBOSS_DEMO1, + /* 0x13 */ PROC_YAMIBOSS_DEMO2, + /* 0x14 */ PROC_YAMIBOSS_DEMO3, + /* 0x15 */ PROC_YAMIBOSS_DEMO4, + /* 0x16 */ PROC_YAMIBOSS_DEMO5, + /* 0x17 */ PROC_LIGHT_DEMO1, + /* 0x18 */ PROC_LIGHT_DEMO2, + /* 0x19 */ PROC_TABLE_DEMO2, + /* 0x1A */ PROC_TABLE_DEMO3, + /* 0x1B */ PROC_HOWL_DEMO1, + /* 0x1C */ PROC_HOWL_DEMO2, + /* 0x1D */ PROC_HOWL_DEMO3, + }; + + static dMenu_Fmap_c* MyClass; private: - /* 0x004 */ JKRHeap* mpHeap; + /* 0x004 */ JKRExpHeap* mpHeap; /* 0x008 */ JKRExpHeap* mpTalkHeap; /* 0x00C */ STControl* mpStick; /* 0x010 */ CSTControl* mpCStick; /* 0x014 */ dMenu_Fmap2DBack_c* mpDraw2DBack; /* 0x018 */ dMenu_Fmap2DTop_c* mpDraw2DTop; - /* 0x01C */ mDoDvdThd_mountArchive_c* field_0x1c; + /* 0x01C */ mDoDvdThd_mountArchive_c* mpMountArchive; /* 0x020 */ dMenu_Fmap_world_data_c* mpWorldData; - /* 0x024 */ dMenu_Fmap_region_data_c* field_0x24[8]; - /* 0x044 */ dMenu_Fmap_stage_data_c* field_0x44[8]; - /* 0x064 */ JKRArchive* field_0x64; - /* 0x068 */ int field_0x68; - /* 0x06C */ RoomData_c* field_0x6c[8]; - /* 0x08C */ void* field_0x8c; - /* 0x090 */ void* field_0x90; - /* 0x094 */ int field_0x94[8]; + /* 0x024 */ dMenu_Fmap_region_data_c* mpRegionData[8]; + /* 0x044 */ dMenu_Fmap_stage_data_c* mpStageData[8]; + /* 0x064 */ JKRAramArchive* mpMapArchive; + /* 0x068 */ JKRArchive* mpResArchive; + /* 0x06C */ dMenuMapCommon_c::RoomData_c* mpRoomData[8]; + /* 0x08C */ dMenu_Fmap_field_data_c* mpFieldDat; + /* 0x090 */ dMenu_Fmap_portal_data_c* mpPortalDat; + /* 0x094 */ ResTIMG* mRegionTexture[8]; /* 0x0B4 */ int field_0xb4; /* 0x0B8 */ dMenu_FmapMap_c* mpMenuFmapMap; - /* 0x0BC */ int field_0xbc; - /* 0x0C0 */ u8* field_0xc0; - /* 0x0C4 */ dMsgFlow_c field_0xc4; - /* 0x110 */ cXyz field_0x110; - /* 0x11C */ f32 field_0x11c; - /* 0x120 */ f32 field_0x120; - /* 0x124 */ f32 field_0x124; + /* 0x0BC */ void* mpFmapMapRes; + /* 0x0C0 */ u8* mFlashRooms; + /* 0x0C4 */ dMsgFlow_c mMsgFlow; + /* 0x110 */ cXyz mPlayerPos; + /* 0x11C */ f32 mTransX; + /* 0x120 */ f32 mTransY; + /* 0x124 */ f32 mAlphaRatio; /* 0x128 */ f32 field_0x128[8]; /* 0x148 */ f32 field_0x148[8]; /* 0x168 */ f32 field_0x168[8]; /* 0x188 */ f32 field_0x188[8]; - /* 0x1A8 */ f32 field_0x1a8; - /* 0x1AC */ f32 field_0x1ac[8]; - /* 0x1CC */ f32 field_0x1cc[8]; + /* 0x1A8 */ f32 mSpotTextureFadeAlpha; + /* 0x1AC */ f32 mRegionOffsetX[8]; + /* 0x1CC */ f32 mRegionOffsetZ[8]; /* 0x1EC */ f32 field_0x1ec; - /* 0x1F0 */ f32 field_0x1f0; - /* 0x1F4 */ f32 field_0x1f4; - /* 0x1F8 */ int field_0x1f8[2]; - /* 0x200 */ int field_0x200; - /* 0x204 */ int field_0x204; - /* 0x208 */ int field_0x208; - /* 0x20C */ int field_0x20c; - /* 0x210 */ u16 field_0x210; - /* 0x212 */ u16 field_0x212; - /* 0x214 */ u16 field_0x214; - /* 0x216 */ u16 field_0x216; - /* 0x218 */ u16 field_0x218[8]; - /* 0x228 */ u16 field_0x228[20]; - /* 0x250 */ char field_0x250[8]; - /* 0x258 */ char field_0x258[8]; - /* 0x260 */ char field_0x260[20][8]; + /* 0x1F0 */ f32 mOldStageTransX; + /* 0x1F4 */ f32 mOldStageTransZ; + /* 0x1F8 */ u32 mRoomDataBits[2]; + /* 0x200 */ u32 field_0x200; + /* 0x204 */ int mStageCursor; + /* 0x208 */ int mRoomCursor; + /* 0x20C */ int mStayStageNo; + /* 0x210 */ s16 field_0x210; + /* 0x212 */ s16 mDisplayFrame; + /* 0x214 */ s16 mZoomLevel; + /* 0x216 */ u16 mAllTitleName; + /* 0x218 */ u16 mTitleName[8]; + /* 0x228 */ u16 mAreaName[20]; + /* 0x250 */ char mMarkedStageName[8]; + /* 0x258 */ char mTmpStageName[8]; + /* 0x260 */ char mStageName[20][8]; /* 0x300 */ u8 mProcess; - /* 0x301 */ u8 field_0x301; - /* 0x302 */ u8 field_0x302; + /* 0x301 */ u8 mPrevProcess; + /* 0x302 */ u8 mPrevProcessAlt; /* 0x303 */ u8 mDataNumMax; - /* 0x304 */ u8 field_0x304; - /* 0x305 */ u8 field_0x305; + /* 0x304 */ u8 mPanDirection; + /* 0x305 */ bool field_0x305; /* 0x306 */ u8 mSpotNum; - /* 0x307 */ u8 field_0x307; - /* 0x308 */ u8 field_0x308; - /* 0x309 */ u8 field_0x309; - /* 0x30A */ u8 field_0x30a; - /* 0x30B */ u8 field_0x31b; - /* 0x30C */ u8 field_0x31c; - /* 0x30D */ u8 field_0x31d; - /* 0x30E */ u8 field_0x30e; + /* 0x307 */ bool mIsWarpMap; + /* 0x308 */ u8 mPortalNo; + /* 0x309 */ bool mErrorSound; + /* 0x30A */ u8 mStartStageNo; + /* 0x30B */ bool field_0x30b; + /* 0x30C */ u8 mOldRegionCursor; + /* 0x30D */ u8 mOldStageCursor; + /* 0x30E */ u8 mFlashRoomCount; /* 0x30F */ u8 field_0x30f; /* 0x310 */ u8 field_0x310; - /* 0x311 */ u8 field_0x311; - /* 0x312 */ u8 field_0x312; - /* 0x313 */ u8 field_0x313; + /* 0x311 */ u8 mRegionNo; + /* 0x312 */ bool mResetAreaName; + /* 0x313 */ bool mAreaNameSet; +}; + +class dMf_HIO_c { +public: + /* 801C65F8 */ dMf_HIO_c(); + /* 801CDA2C */ virtual ~dMf_HIO_c() {} + + /* 0x04 */ u8 field_0x4[4]; + /* 0x08 */ f32 mBackAnimeStep; + /* 0x0C */ f32 mTopAnimeStep; + /* 0x10 */ u8 mBaseBackAlpha; + /* 0x11 */ u8 mMoyaAlpha; + + static dMf_HIO_c* mMySelfPointer; }; const char* dMenuFmap_getStartStageName(void* param_0); diff --git a/include/d/menu/d_menu_fmap2D.h b/include/d/menu/d_menu_fmap2D.h index fc13ceacd0..2467c2b708 100644 --- a/include/d/menu/d_menu_fmap2D.h +++ b/include/d/menu/d_menu_fmap2D.h @@ -9,6 +9,8 @@ #include "d/pane/d_pane_class.h" #include "dolphin/types.h" +class dMsgScrnExplain_c; + class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c { public: /* 801CF56C */ dMenu_Fmap2DBack_c(); @@ -87,17 +89,84 @@ public: field_0x1244 = param_2; } - u8 isArrowDrawFlag() { return mArrowDrawFlag; } + void setAllTrans(f32 i_transX, f32 i_transZ) { + mTransX = i_transX; + mTransZ = i_transZ; + } + + void setStageTransForceXZ(f32 param_0, f32 param_1) { + mStageTransX = param_0; + mStageTransZ = param_1; + } + + void setStageInfo(u8 i_spotNum, dMenu_FmapMap_c* i_fmapMap) { + mSpotNum = i_spotNum; + mpMenuFmapMap = i_fmapMap; + } + + void setWorldPosMinMax(f32 i_minX, f32 i_minZ, f32 i_maxX, f32 i_maxZ) { + mWorldMinX = i_minX; + mWorldMinZ = i_minZ; + mWorldMaxX = i_maxX; + mWorldMaxZ = i_maxZ; + } + + void setStageOriginXZ(int i_stageNo, f32 i_originX, f32 i_originZ) { + mStageOriginX[i_stageNo] = i_originX; + mStageOriginZ[i_stageNo] = i_originZ; + } + + void setStageOriginPathXZ(int i_stageNo, f32 i_originX, f32 i_originZ) { + mStageOriginPathX[i_stageNo] = i_originX; + mStageOriginPathZ[i_stageNo] = i_originZ; + } + + void setStageData(Stage_c* i_stageData, u8 i_dataNum) { + mpStages = i_stageData; + mStageDataNum = i_dataNum; + } + + void setRegionTextureReadNum(int i_region, u8 i_num) { + mRegionTextureReadNum[i_region] = i_num; + } + + f32 getArrowPos2DX() { return mArrowPos2DX; } + f32 getArrowPos2DY() { return mArrowPos2DY; } + f32 getRenderingPosX() { return mRenderingPosX; } + f32 getRenderingPosZ() { return mRenderingPosZ; } + f32 getStageTransX() { return mStageTransX; } + f32 getStageTransZ() { return mStageTransZ; } + f32 getRenderingScale() { return mRenderingScale; } + f32 getMapZoomRate() { return mMapZoomRate; } + u8 getRegionCursor() { return mRegionCursor; } + u8 getSpotCursor() { return mSpotCursor; } + u8 getSelectRegion() { return mSelectRegion; } + bool getAllPathShowFlag() { return mAllPathShowFlag; } + f32 getRegionOriginX(u8 i_region) { return mRegionOriginX[i_region]; } + f32 getRegionOriginZ(u8 i_region) { return mRegionOriginZ[i_region]; } + + void setArrowAlpha(f32 i_alpha) { mArrowAlpha = i_alpha; } + void setSpotTextureFadeAlpha(f32 i_alpha) { mSpotTextureFadeAlpha = i_alpha; } + void setRegionCursor(u8 i_value) { mRegionCursor = i_value; } + void setMapDrawFlag(bool i_flag) { mMapDrawFlag = i_flag; } + void resetDrug() { field_0x1238 = 0; } + + void offArrowDrawFlag() { mArrowDrawFlag = false; } + void onArrowDrawFlag() { mArrowDrawFlag = true; } + bool isArrowDrawFlag() { return mArrowDrawFlag; } void onShowRegionFlag(int region_bit) { mRegionFlag |= ((1 << region_bit) & 0xFF); } bool isShowRegionFlag(int region_bit) { return mRegionFlag & ((1 << region_bit) & 0xFF); } - struct unkData { - /* 0x00 */ float field_0x0; - /* 0x04 */ float field_0x4; - /* 0x08 */ float field_0x8; - /* 0x0C */ float field_0xc; - /* 0x10 */ float field_0x10; + void mapBlink() {} + + // Unknown name + struct RegionTexData { + /* 0x00 */ float mMinX; + /* 0x04 */ float mMinZ; + /* 0x08 */ float mMaxX; + /* 0x0C */ float mMaxZ; + /* 0x10 */ float mScale; }; /* 0x0C98 */ J2DScreen* mpBackScreen; @@ -110,71 +179,71 @@ public: /* 0x0CB4 */ J2DPicture* mpAreaTex[8]; /* 0x0CD4 */ J2DPicture* mpSpotTexture; /* 0x0CD8 */ J2DScreen* mpPointScreen; - /* 0x0CDC */ u32 field_0xcdc; + /* 0x0CDC */ dMenu_FmapMap_c* mpMenuFmapMap; /* 0x0CE0 */ dMeterHaihai_c* mpMeterHaihai; - /* 0x0CE4 */ J2DAnmBase* mpBaseAnm; - /* 0x0CE8 */ unkData field_0xce8[8]; + /* 0x0CE4 */ J2DAnmTextureSRTKey* mpBaseAnm; + /* 0x0CE8 */ RegionTexData mRegionTexData[8]; /* 0x0D88 */ Stage_c* mpStages; - /* 0x0D8C */ float field_0xd8c[8]; - /* 0x0D0C */ float field_0xdac[8]; - /* 0x0D0C */ float field_0xdcc[8]; - /* 0x0D0C */ float field_0xdec[8]; - /* 0x0E0C */ float field_0xe0c[8]; - /* 0x0E2C */ float field_0xe2c[8]; - /* 0x0E4C */ float field_0xe4c[8]; - /* 0x0E6C */ float field_0xe6c[8]; - /* 0x0E8C */ float field_0xe8c[8]; - /* 0x0EAC */ float field_0xeac[8]; - /* 0x0ECC */ float field_0xecc[8]; - /* 0x0EEC */ float field_0xeec[8]; + /* 0x0D8C */ float mRegionScrollMinX[8]; + /* 0x0D0C */ float mRegionScrollMinZ[8]; + /* 0x0D0C */ float mRegionScrollMaxX[8]; + /* 0x0D0C */ float mRegionScrollMaxZ[8]; + /* 0x0E0C */ float mRegionScrollMapMinX[8]; + /* 0x0E2C */ float mRegionScrollMapMinY[8]; + /* 0x0E4C */ float mRegionScrollMapMaxX[8]; + /* 0x0E6C */ float mRegionScrollMapMaxY[8]; + /* 0x0E8C */ float mRegionMinMapX[8]; + /* 0x0EAC */ float mRegionMinMapY[8]; + /* 0x0ECC */ float mRegionMapSizeX[8]; + /* 0x0EEC */ float mRegionMapSizeY[8]; /* 0x0F0C */ float field_0xf0c[8]; /* 0x0F2C */ float field_0xf2c[8]; /* 0x0F4C */ float field_0xf4c[8]; /* 0x0F6C */ float field_0xf6c[8]; - /* 0x0F8C */ float field_0xf8c; - /* 0x0F90 */ float field_0xf90; - /* 0x0F94 */ float field_0xf94; + /* 0x0F8C */ float mRenderingPosX; + /* 0x0F90 */ float mRenderingPosZ; + /* 0x0F94 */ float mRenderingScale; /* 0x0F98 */ float field_0xf98; - /* 0x0F9C */ float field_0xf9c; // Likely called mZoom or something similar - /* 0x0FA0 */ float field_0xfa0; + /* 0x0F9C */ float mZoom; + /* 0x0FA0 */ float mMapZoomRate; /* 0x0FA4 */ float field_0xfa4; /* 0x0FA8 */ float field_0xfa8; - /* 0x0FAC */ float field_0xfac; + /* 0x0FAC */ float mAnmFrame; /* 0x0FB0 */ float field_0xfb0; /* 0x0FB4 */ float field_0xfb4; /* 0x0FB8 */ float field_0xfb8; - /* 0x0FBC */ float field_0xfbc; - /* 0x0FC0 */ float field_0xfc0; - /* 0x0FC4 */ float field_0xfc4; - /* 0x0FC8 */ float field_0xfc8; - /* 0x0FCC */ float field_0xfcc; + /* 0x0FBC */ float mTransX; + /* 0x0FC0 */ float mTransZ; + /* 0x0FC4 */ float mAlphaRate; + /* 0x0FC8 */ float mStageTransX; + /* 0x0FCC */ float mStageTransZ; /* 0x0FD0 */ float field_0xfd0; /* 0x0FD4 */ float field_0xfd4; /* 0x0FD8 */ float field_0xfd8; /* 0x0FDC */ float field_0xfdc; - /* 0x0FE0 */ float field_0xfe0; - /* 0x0FE4 */ float field_0xfe4; - /* 0x0FE8 */ float field_0xfe8; - /* 0x0FEC */ float field_0xfec; + /* 0x0FE0 */ float mTexMinX; + /* 0x0FE4 */ float mTexMinZ; + /* 0x0FE8 */ float mTexMaxX; + /* 0x0FEC */ float mTexMaxZ; /* 0x0FF0 */ float mAllMapScaleRate; - /* 0x0FF4 */ float field_0xff4; - /* 0x0FF8 */ float field_0xff8; - /* 0x0FFC */ float field_0xffc; - /* 0x1000 */ float field_0x1000; - /* 0x1004 */ float field_0x1004[8]; - /* 0x1024 */ float field_0x1024[8]; - /* 0x1044 */ float field_0x1044[20]; - /* 0x1094 */ float field_0x1094[20]; - /* 0x10E4 */ float field_0x10e4[20]; - /* 0x1134 */ float field_0x1134[20]; + /* 0x0FF4 */ float mWorldMinX; + /* 0x0FF8 */ float mWorldMinZ; + /* 0x0FFC */ float mWorldMaxX; + /* 0x1000 */ float mWorldMaxZ; + /* 0x1004 */ float mRegionOriginX[8]; + /* 0x1024 */ float mRegionOriginZ[8]; + /* 0x1044 */ float mStageOriginX[20]; + /* 0x1094 */ float mStageOriginZ[20]; + /* 0x10E4 */ float mStageOriginPathX[20]; + /* 0x1134 */ float mStageOriginPathZ[20]; /* 0x1184 */ float field_0x1184; /* 0x1188 */ float field_0x1188; - /* 0x118C */ float field_0x118c; - /* 0x1190 */ float field_0x1190; - /* 0x1194 */ float field_0x1194; - /* 0x1198 */ float field_0x1198; - /* 0x119C */ float control_ypos; - /* 0x11A0 */ float control_xpos; + /* 0x118C */ float mArrowPos3DX; + /* 0x1190 */ float mArrowPos3DZ; + /* 0x1194 */ float mArrowPos2DX; + /* 0x1198 */ float mArrowPos2DY; + /* 0x119C */ float control_xpos; + /* 0x11A0 */ float control_ypos; /* 0x11A4 */ float field_0x11a4; /* 0x11A8 */ float field_0x11a8; /* 0x11AC */ float field_0x11ac; @@ -187,42 +256,42 @@ public: /* 0x11C8 */ float field_0x11c8; /* 0x11CC */ float field_0x11cc; /* 0x11D0 */ float field_0x11d0; - /* 0x11D4 */ float field_0x11d4; - /* 0x11D8 */ float field_0x11d8; + /* 0x11D4 */ float mArrowAlpha; + /* 0x11D8 */ float mSpotTextureFadeAlpha; /* 0x11DC */ float field_0x11dc; /* 0x11E0 */ float field_0x11e0; - /* 0x11E4 */ float field_0x11e4; + /* 0x11E4 */ float mBackAlpha; /* 0x11E8 */ float field_0x11e8; /* 0x11EC */ float field_0x11ec; - /* 0x11F0 */ JUtility::TColor field_0x11f0; - /* 0x11F4 */ JUtility::TColor field_0x11f4; - /* 0x11F8 */ JUtility::TColor field_0x11f8; - /* 0x11FC */ JUtility::TColor field_0x11fc; - /* 0x1200 */ JUtility::TColor field_0x1200; - /* 0x1204 */ JUtility::TColor field_0x1204; + /* 0x11F0 */ JUtility::TColor mSelectedRegionBlack; + /* 0x11F4 */ JUtility::TColor mSelectedRegionWhite; + /* 0x11F8 */ JUtility::TColor mUnselectedRegionBlack; + /* 0x11FC */ JUtility::TColor mUnselectedRegionWhite; + /* 0x1200 */ JUtility::TColor mUnreachedRegionBlack; + /* 0x1204 */ JUtility::TColor mUnreachedRegionWhite; /* 0x1208 */ JUtility::TColor field_0x1208; /* 0x120C */ JUtility::TColor field_0x120c; /* 0x1210 */ float field_0x1210; /* 0x1214 */ float field_0x1214; - /* 0x1218 */ u16 field_0x1218; - /* 0x121A */ u16 field_0x121a; - /* 0x121C */ u8 field_0x121c[8]; - /* 0x1224 */ u8 field_0x1224; - /* 0x1225 */ u8 field_0x1225; - /* 0x1226 */ u8 field_0x1226; - /* 0x1227 */ u8 field_0x1227; + /* 0x1218 */ s16 field_0x1218; + /* 0x121A */ s16 field_0x121a; + /* 0x121C */ u8 mRegionTextureReadNum[8]; + /* 0x1224 */ u8 mSpotNum; + /* 0x1225 */ u8 mStageDataNum; + /* 0x1226 */ u8 mSelectRegion; + /* 0x1227 */ u8 mRegionCursor; /* 0x1228 */ u8 field_0x1228; - /* 0x1229 */ u8 field_0x1229; + /* 0x1229 */ u8 mSpotCursor; /* 0x122A */ u8 field_0x122a; /* 0x122B */ u8 field_0x122b; /* 0x122C */ u8 mRegionFlag; /* 0x122D */ u8 field_0x122d; - /* 0x122E */ u8 field_0x122e; - /* 0x122F */ u8 field_0x122f; + /* 0x122E */ bool field_0x122e; + /* 0x122F */ bool mAllPathShowFlag; /* 0x1230 */ u8 field_0x1230[8]; /* 0x1238 */ u8 field_0x1238; - /* 0x1239 */ u8 field_0x1239; - /* 0x123A */ u8 mArrowDrawFlag; + /* 0x1239 */ bool mMapDrawFlag; + /* 0x123A */ bool mArrowDrawFlag; /* 0x123B */ u8 field_0x123b; /* 0x123C */ dMenu_FmapMap_c* mpFmapMap; /* 0x1240 */ dMenu_Fmap_region_data_c* mpRegionData; @@ -249,15 +318,90 @@ public: /* 801D77C4 */ void setAlphaAnimeMin(CPaneMgrAlpha*); /* 801D7858 */ void setAlphaAnimeMid(CPaneMgrAlpha*); /* 801D78FC */ void setAlphaAnimeMax(CPaneMgrAlpha*); - /* 801D7994 */ void checkPlayerWarpAccept(); - /* 801D7A08 */ void checkWarpAcceptRegion(int); - /* 801D7AB4 */ void checkWarpAcceptRegion4(); - /* 801D7B58 */ void checkWarpAcceptCannon(); + /* 801D7994 */ bool checkPlayerWarpAccept(); + /* 801D7A08 */ bool checkWarpAcceptRegion(int); + /* 801D7AB4 */ bool checkWarpAcceptRegion4(); + /* 801D7B58 */ bool checkWarpAcceptCannon(); /* 801D7BCC */ void setHIO(bool); - /* 801D8088 */ void isWarpAccept(); + /* 801D8088 */ bool isWarpAccept(); /* 801D6C98 */ virtual void draw(); /* 801D6700 */ virtual ~dMenu_Fmap2DTop_c(); -}; + + void setAllTrans(f32 i_transX, f32 i_transY) { + mTransX = i_transX; + mTransY = i_transY; + } + + dMsgScrnExplain_c* getScrnExplainPtr() { return mpScrnExplain; } + + void setPortalBin(void* i_bin) { mpPortalBin = i_bin; } + void btkAnimeLoop(f32 i_delta) { btkAnimeLoop(mpAnm, i_delta); } + + enum Arrow { + ARROW_UP = 1, + ARROW_DOWN = 2, + ARROW_UPDOWN = ARROW_UP | ARROW_DOWN, + ARROW_LEFT = 4, + ARROW_RIGHT = 8, + ARROW_LEFTRIGHT = ARROW_LEFT | ARROW_RIGHT, + }; + + enum Alpha { + ALPHA_MIN = 0, + ALPHA_MID = 1, + ALPHA_MAX = 2, + ALPHA_DEFAULT = 0xFF, + }; + + /* 0x04 */ JKRExpHeap* mpHeap; + /* 0x08 */ J2DScreen* mpTitleScreen; + /* 0x0C */ CPaneMgrAlphaMorf* mpTitleRoot; + /* 0x10 */ J2DAnmTextureSRTKey* mpAnm; + /* 0x14 */ u8 field_0x14[4]; + /* 0x18 */ CPaneMgr* mpButtonA; + /* 0x1C */ CPaneMgr* mpButtonB; + /* 0x20 */ CPaneMgr* mpButtonZ; + /* 0x24 */ CPaneMgr* mpButtonTextA; + /* 0x28 */ CPaneMgr* mpButtonTextB; + /* 0x2C */ CPaneMgr* mpButtonTextZ; + /* 0x30 */ CPaneMgrAlpha* mpAnalogStickAlpha; + /* 0x34 */ CPaneMgrAlpha* mpDpadAlpha; + /* 0x38 */ CPaneMgrAlpha* mpArrowLAlpha[2]; + /* 0x40 */ CPaneMgrAlpha* mpArrowRAlpha[2]; + /* 0x48 */ u8 field_0x48[8]; + /* 0x50 */ CPaneMgr* mpNamePane; + /* 0x54 */ CPaneMgr* mpSubPane; + /* 0x58 */ CPaneMgr* mpAnalogStick; + /* 0x5C */ CPaneMgr* mpDpad; + /* 0x60 */ CPaneMgr* mpContPane; + /* 0x64 */ u8 field_0x64[8]; + /* 0x6C */ dMsgScrnExplain_c* mpScrnExplain; + /* 0x70 */ void* mpPortalBin; + /* 0x74 */ f32 mAnmFrame; + /* 0x78 */ f32 mTransX; + /* 0x7C */ f32 mTransY; + /* 0x80 */ f32 mAlphaRate; + /* 0x84 */ f32 mTitlePosX; + /* 0x88 */ f32 mTitlePosY; + /* 0x8C */ f32 mTitleScale; + /* 0x90 */ f32 mSubTitlePosX; + /* 0x94 */ f32 mSubTitlePosY; + /* 0x98 */ f32 mSubTitleScale; + /* 0x9C */ f32 mAreaMovementPosX; + /* 0xA0 */ f32 mAreaMovementPosY; + /* 0xA4 */ f32 mAreaMovementScale; + /* 0xA8 */ f32 mClosingPosX; + /* 0xAC */ f32 mClosingPosY; + /* 0xB0 */ f32 mClosingScale; + /* 0xB4 */ f32 mDoIconPosX; + /* 0xB8 */ f32 mDoIconPosY; + /* 0xBC */ f32 mDoIconScale; + /* 0xC0 */ u8 mAlphaButtonA; + /* 0xC1 */ u8 mAlphaButtonB; + /* 0xC2 */ u8 mAlphaButtonZ; + /* 0xC3 */ u8 mAlphaAnalogStick; + /* 0xC4 */ u8 mAlphaDpad; + }; #endif /* D_MENU_D_MENU_FMAP2D_H */ diff --git a/include/d/menu/d_menu_fmap_map.h b/include/d/menu/d_menu_fmap_map.h index 5b0e05b9c5..9e11765d75 100644 --- a/include/d/menu/d_menu_fmap_map.h +++ b/include/d/menu/d_menu_fmap_map.h @@ -1,60 +1,187 @@ #ifndef D_MENU_D_MENU_FMAP_MAP_H #define D_MENU_D_MENU_FMAP_MAP_H +#include "SSystem/SComponent/c_counter.h" #include "dolphin/types.h" #include "d/menu/d_menu_fmap.h" +#include "d/map/d_map.h" #include "d/map/d_map_path.h" +#include "d/map/d_map_path_fmap.h" -class renderingFmap_c { +struct dMfm_prm_res_s { + /* 0x000 */ dMpath_RGB5A3_palDt_s palette_data[27]; + /* 0x0D8 */ GXColor field_0xd8; + /* 0x0DC */ GXColor field_0xdc; + /* 0x0E0 */ GXColor field_0xe0; + /* 0x0E4 */ GXColor field_0xe4; + /* 0x0E8 */ GXColor field_0xe8[8]; + /* 0x108 */ GXColor field_0x108[8]; + /* 0x128 */ GXColor field_0x128[8]; + /* 0x148 */ GXColor field_0x148[8]; + /* 0x168 */ s16 field_0x168; + /* 0x16A */ s16 field_0x16a; + /* 0x16C */ u8 field_0x16c; + /* 0x16D */ u8 field_0x16d; +}; + +struct dMfm_HIO_prm_res_src_s { + /* 0x0 */ u8 mFlashDuration; + + static const dMfm_HIO_prm_res_src_s m_other; +}; + +class renderingFmap_c : public dRenderingFDAmap_c { public: - enum palette_e {}; + enum palette_e { + /* 0x11 */ PALETTE_11 = 0x11, + /* 0x12 */ PALETTE_12, + /* 0x13 */ PALETTE_13, + /* 0x14 */ PALETTE_14, + /* 0x15 */ PALETTE_15, + /* 0x16 */ PALETTE_16, + /* 0x17 */ PALETTE_17, + /* 0x18 */ PALETTE_18, + /* 0x19 */ PALETTE_19, + /* 0x1A */ PALETTE_1A, + }; + + renderingFmap_c() { + mpWorldData = NULL; + mpRegionData = NULL; + mpStageData = NULL; + mpRoomData = NULL; + mpFmapData = NULL; + mpStageArc = NULL; + mStartStageNo = 0; + mRegionIndex = 0; + mStageNo = 0; + mRoomNo = 0; + mRegionNo = 0; + mRoomIndex = 0; + mStageOffsetX = 0.0f; + mStageOffsetZ = 0.0f; + mRegionOffsetX = 0.0f; + mRegionOffsetZ = 0.0f; + field_0xb8 = 0; + mSaveTableNo = 0; + mVisitedRoomSaveTableNo = 0; + mDrawEnable = false; + } /* 801CE15C */ void init(u8*, u16, u16, u16, u16); /* 801CE188 */ void entry(dMenu_Fmap_world_data_c*, int, f32, f32, f32); - /* 801CE224 */ void isSwitchSpecialOff(int); - /* 801CE288 */ void isSwitch(dDrawPath_c::group_class const*); - /* 801CE3C0 */ void getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*, - int*); + /* 801CE224 */ bool isSwitchSpecialOff(int); + /* 801CE288 */ bool isSwitch(group_class const*); + /* 801CE3C0 */ int getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*, + int*); /* 801CE410 */ void preDrawPath(); /* 801CE4D4 */ bool isDrawPath(); - /* 801CE4DC */ void isDrawRoom(); + /* 801CE4DC */ bool isDrawRoom(); /* 801CE560 */ void postDrawPath(); /* 801CE5B8 */ void postRenderingMap(); /* 801CE5EC */ void roomSetteing(); - /* 801CE6A8 */ void getFirstRoomPointer(); + /* 801CE6A8 */ room_class* getFirstRoomPointer(); /* 801CE75C */ void getFirstRegion(); /* 801CE7A8 */ void getFirstStage(); /* 801CE80C */ void getFirstRoom(); - /* 801CE84C */ void getNextRoom(); - /* 801CE8B8 */ void getNextStage(); - /* 801CE93C */ void getNextRegion(); - /* 801CE9A4 */ void getNextRoomPointer(); - /* 801CF4D0 */ ~renderingFmap_c(); - /* 801CF55C */ bool isRenderingFloor(int); - /* 801CF564 */ void beforeDrawPath(); - /* 801CF568 */ void afterDrawPath(); -}; + /* 801CE84C */ bool getNextRoom(); + /* 801CE8B8 */ bool getNextStage(); + /* 801CE93C */ bool getNextRegion(); + /* 801CE9A4 */ room_class* getNextRoomPointer(); -class dMenu_FmapMap_c { + /* 801CF4D0 */ ~renderingFmap_c(); // {} + /* 801CF55C */ bool isRenderingFloor(int); // { return true; } + /* 801CF564 */ void beforeDrawPath(); // {} + /* 801CF568 */ void afterDrawPath(); // {} + int getNowDrawRegionNo() { return mRegionNo; } + bool isDrawEnable() { return mDrawEnable; } + + /* 0x24 */ Mtx mViewMtx; + /* 0x54 */ cXyz mEye; + /* 0x60 */ cXyz mCenter; + /* 0x6C */ cXyz mUp; + /* 0x78 */ dMenu_Fmap_world_data_c* mpWorldData; + /* 0x7C */ dMenu_Fmap_region_data_c* mpRegionData; + /* 0x80 */ dMenu_Fmap_stage_data_c* mpStageData; + /* 0x84 */ dMenu_Fmap_room_data_c* mpRoomData; + /* 0x88 */ dMenu_Fmap_data_c* mpFmapData; + /* 0x8C */ dMenu_Fmap_stage_arc_data_c* mpStageArc; + /* 0x90 */ int mStartStageNo; + /* 0x94 */ int mRegionIndex; + /* 0x98 */ int mStageNo; + /* 0x9C */ int mRoomNo; + /* 0xA0 */ int mRegionNo; + /* 0xA4 */ int mRoomIndex; + /* 0xA8 */ f32 mStageOffsetX; + /* 0xAC */ f32 mStageOffsetZ; + /* 0xB0 */ f32 mRegionOffsetX; + /* 0xB4 */ f32 mRegionOffsetZ; + /* 0xB8 */ u8 field_0xb8; + /* 0xB9 */ u8 mSaveTableNo; + /* 0xBA */ u8 mVisitedRoomSaveTableNo; + /* 0xBB */ bool mDrawEnable; + }; + +class dMenu_FmapMap_c : public renderingFmap_c { public: - /* 801CEAAC */ void setFmapPaletteColor(renderingFmap_c::palette_e, _GXColor const&); - /* 801CEA38 */ void setFmapPaletteColor(renderingFmap_c::palette_e, u8, u8, u8, u8); - /* 801CEAE0 */ void isFlashRoomNoCheck(int) const; + /* 801CEAAC */ void setFmapPaletteColor(palette_e, GXColor const&); + /* 801CEA38 */ void setFmapPaletteColor(palette_e, u8, u8, u8, u8); + /* 801CEAE0 */ bool isFlashRoomNoCheck(int) const; /* 801CEB1C */ void setPointColor(f32); /* 801CEC24 */ dMenu_FmapMap_c(); /* 801CED38 */ ~dMenu_FmapMap_c(); /* 801CEDE8 */ void _create(u16, u16, u16, u16, void*); /* 801CEE3C */ void _delete(); /* 801CEE94 */ void draw(); - /* 801CF0B4 */ void rendering(dDrawPath_c::line_class const*); - /* 801CF12C */ void getLineWidth(int); - /* 801CF1D4 */ void isDrawType(int); + /* 801CF0B4 */ void rendering(line_class const*); + /* 801CF12C */ int getLineWidth(int); + /* 801CF1D4 */ bool isDrawType(int); /* 801CF1E0 */ void setFlashOn(int, int, u8*, int); - /* 801CF208 */ void getLineColor(int, int); - /* 801CF298 */ void getBackColor() const; - /* 801CF2A0 */ void getColor(int); + /* 801CF208 */ const GXColor* getLineColor(int, int); + /* 801CF298 */ const GXColor* getBackColor() const; + /* 801CF2A0 */ const GXColor* getColor(int); /* 801CF394 */ void setTexture(u16, u16, u16, u16); /* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32); + + f32 getRateWithFrameCount(int param_0) { + return (f32)(g_Counter.mCounter0 % param_0) / (f32)param_0; + } + + bool isDrawEnable() { + // probably a fakematch + bool ret = true; + ret &= renderingFmap_c::isDrawEnable(); + return ret; + } + + void setFlashOff() { + mLastFlash = mFlash; + mFlash = false; + } + + int getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_regionData, f32 i_offsetX, + f32 i_offsetY, int i_stageNo, int* o_stageNo, int* o_roomNo) { + return renderingFmap_c::getPointStagePathInnerNo(i_regionData, i_offsetX, i_offsetY, + i_stageNo, o_stageNo, o_roomNo); + } + + ResTIMG* getResTIMGPointer() { return mResTIMG; } + + /* 0xBC */ ResTIMG* mResTIMG; + /* 0xC0 */ u8* mMapImage_p; + /* 0xC4 */ dMfm_prm_res_s* m_res; + /* 0xC8 */ dMpath_RGB5A3_palDt_s* m_palette; + /* 0xCC */ int field_0xcc; + /* 0xD0 */ f32 mZoomRate; + /* 0xD4 */ int mLineNo; + /* 0xD8 */ bool mFlash; + /* 0xD9 */ bool mLastFlash; + /* 0xDC */ int mStageCursor; + /* 0xE0 */ int mLastStageCursor; + /* 0xE4 */ u8 mRegionCursor; + /* 0xE5 */ u8 mFlashTimer; + /* 0xE8 */ u8* mFlashRooms; + /* 0xEC */ int mFlashRoomCount; }; diff --git a/include/d/menu/d_menu_map_common.h b/include/d/menu/d_menu_map_common.h index d83df6324a..a1606c6a36 100644 --- a/include/d/menu/d_menu_map_common.h +++ b/include/d/menu/d_menu_map_common.h @@ -40,18 +40,36 @@ struct dMenuMapCommon_c { struct Stage_c { // Incomplete class - struct Stage_c_data { + struct data { // Unknown name /* 0x00 */ char mName[8]; - /* 0x08 */ u8 field_0x8; - /* 0x09 */ u8 field_0x9; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; + /* 0x08 */ u8 mRoomNo; + /* 0x09 */ u8 mRegionNo; + /* 0x0A */ u16 mAreaName; + /* 0x0C */ f32 mOffsetX; + /* 0x10 */ f32 mOffsetZ; }; - /* 0x0 */ u32 field_0x0; - /* 0x4 */ Stage_c_data field_0x4[0]; + /* 0x0 */ u8 mCount; + /* 0x4 */ data mData[0]; + }; + + class RoomData_c { + public: + struct data { + /* 0x0 */ u8 mSize; + /* 0x1 */ u8 field_0x1[3]; + /* 0x4 */ u8 mData[0]; + }; + + data* getRoomData() { return mpRoomData; } + RoomData_c* getNextData() { return mpNextData; } + void setRoomData(void* i_data) { mpRoomData = (data*)i_data; } + void setNextData(RoomData_c* i_nextData) { mpNextData = i_nextData; } + + /* 0x0 */ data* mpRoomData; + /* 0x4 */ RoomData_c* mpNextData; }; /* 0x004 */ J2DPicture* mPictures[23]; diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 6b9a6f0954..4b21fb17a4 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -278,8 +278,8 @@ private: /* 0x130 */ dMenu_Skill_c* mpMenuSkill; /* 0x134 */ dMenu_Insect_c* mpMenuInsect; /* 0x138 */ s32 mMemSize; - /* 0x13C */ f32 field_0x13c; - /* 0x140 */ f32 field_0x140; + /* 0x13C */ f32 mFmapStageTransX; + /* 0x140 */ f32 mFmapStageTransZ; /* 0x144 */ u8 field_0x144; /* 0x145 */ u8 mButtons; /* 0x146 */ u8 mMenuStatus; @@ -290,9 +290,9 @@ private: /* 0x14B */ u8 field_0x14B; /* 0x14C */ u8 field_0x14C; /* 0x14D */ u8 field_0x14D; - /* 0x14E */ u8 field_0x14E; - /* 0x14F */ u8 field_0x14F; - /* 0x150 */ u8 field_0x150; + /* 0x14E */ u8 mFmapProcess; + /* 0x14F */ u8 mFmapRegionCursor; + /* 0x150 */ u8 mFmapStageCursor; /* 0x151 */ u8 field_0x151; /* 0x152 */ u8 field_0x152; /* 0x153 */ u8 field_0x153; diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index 670fe8dcf7..a4f83569e2 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -284,6 +284,7 @@ public: bool isEmphasisR() { return field_0x768[2] == 7 ? true : false; } void setEmphasisA(u8 param_0) { field_0x761 = param_0; } void setEmphasisB(u8 param_0) { field_0x762 = param_0; } + u8 getInsideObjCheck() { return field_0x772; } private: /* 0x004 */ item_params mItemParams[4]; diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index b2cc55d1fc..553e9df8c6 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -118,7 +118,9 @@ public: void resetPauseStatus() { mPauseStatus = 0; } u8 getPauseStatus() { return mPauseStatus; } bool isGameStatus(int status) { return mGameStatus & status; } - bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & i_status; } + bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (1 << i_status); } + // fake function, should be isTouchKeyCheck + bool isTouchKeyCheck_alt(int i_status) { return (mTouchKeyCheck >> i_status) & 1; } void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; } bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); } void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } @@ -177,13 +179,17 @@ public: mCollectCursorPosY = y; } void setMapDrugFlag(u8 flag) { mMapDrugFlag = flag; } - bool isTempBit(int bit) { return mTempBits & (1 << bit) != 0; } + bool isTempBit(int bit) { return mTempBits & (1 << bit); } void offSub2DStatus(int bit) { mSub2DStatus &= ~(1 << bit); } void onSub2DStatus(int bit) { mSub2DStatus |= 1 << bit; } void set2DWidth(float width) { m2DWidth = width; } void set2DHeight(float height) { m2DHeight = height; } void set2DPosH(float posH) { m2DPosH = posH; } void set2DPosV(float posV) { m2DPosV = posV; } + f32 get2DWidth() { return m2DWidth; } + f32 get2DHeight() { return m2DHeight; } + u8 getTableMapRegionNo() { return mTableMapRegionNo; } + u8 getGoldWolfMapType() { return mGoldWolfMapType; } public: /* 0x04 */ u8 unk4[4]; @@ -448,6 +454,11 @@ inline bool dMeter2Info_isTouchKeyCheck(int i_status) { return g_meter2_info.isTouchKeyCheck(i_status); } +// fake function, should be dMeter2Info_isTouchKeyCheck +inline bool dMeter2Info_isTouchKeyCheck_alt(int i_status) { + return g_meter2_info.isTouchKeyCheck_alt(i_status); +} + inline void dMeter2Info_setMapKeyDirection(u16 direction) { g_meter2_info.setMapKeyDirection(direction); } @@ -752,6 +763,27 @@ inline void dMeter2Info_offShopTalkFlag() { g_meter2_info.offShopTalkFlag(); } +inline f32 dMeter2Info_get2DWidth() { + return g_meter2_info.get2DWidth(); +} + +inline f32 dMeter2Info_get2DHeight() { + return g_meter2_info.get2DHeight(); +} + +inline void dMeter2Info_setWarpInfo(const char* i_stageName, const cXyz& i_position, s16 i_angle, + u8 i_roomNo, u8 param_4, u8 i_warpPlayerNo) { + g_meter2_info.setWarpInfo(i_stageName, i_position, i_angle, i_roomNo, param_4, i_warpPlayerNo); +} + +inline u8 dMeter2Info_getTableMapRegionNo() { + return g_meter2_info.getTableMapRegionNo(); +} + +inline u8 dMeter2Info_getGoldWolfMapType() { + return g_meter2_info.getGoldWolfMapType(); +} + const char* dMeter2Info_getPlusTextureName(); const char* dMeter2Info_getNumberTextureName(int pIndex); int dMeter2Info_recieveLetter(); diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index b370e1ad3f..2cca81d0ee 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -class JKRArchive; +class JKRAramArchive; class dMeter_menuHIO_c { public: @@ -1132,7 +1132,7 @@ public: /* 80200BCC */ virtual ~dMeter_fmapHIO_c(); /* 0x004 */ s8 field_0x4; - /* 0x008 */ JKRArchive* field_0x8; + /* 0x008 */ JKRAramArchive* mpArchive; /* 0x00C */ void* field_0xc; /* 0x010 */ void* field_0x10; /* 0x014 */ void* field_0x14; @@ -1215,7 +1215,7 @@ public: /* 0x2F6 */ bool mDisplayWorldGrid; /* 0x2F7 */ bool mDisplayRegionGrid; /* 0x2F8 */ bool mDisplayReferenceArea; - /* 0x2F9 */ u8 field_0x2f9; + /* 0x2F9 */ bool field_0x2f9; /* 0x2FA */ bool mTerminalOutput; /* 0x2FB */ bool mPortalDataTerminalOutput; /* 0x2FC */ bool mAllRegionsUnlocked; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 633cdef525..506c9c1fce 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -484,6 +484,10 @@ inline void dMsgObject_setMsgOutputType(u8 outputType) { dMsgObject_getMsgObjectClass()->setMsgOutputType(outputType); } +inline void dMsgObject_setPortalMessageID(u16 id) { + dMsgObject_getMsgObjectClass()->setPortalMessageID(id); +} + class dMsgObject_HowlHIO_c { public: /* 80232AEC */ dMsgObject_HowlHIO_c(); diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 16a85f724a..b73c8225b5 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -519,6 +519,8 @@ public: void onFieldDataExistFlag() { mFieldDataExistFlag = true; } cXyz& getPos() { return mPos; } u8 getRegionNo() const { return mRegionNo; } + char* getName() { return mName; } + s16 getAngleY() { return mAngleY; } private: /* 0x00 */ cXyz mPos; diff --git a/include/rel/d/a/d_a_midna/d_a_midna.h b/include/rel/d/a/d_a_midna/d_a_midna.h index 5c60621e00..330827a70c 100644 --- a/include/rel/d/a/d_a_midna/d_a_midna.h +++ b/include/rel/d/a/d_a_midna/d_a_midna.h @@ -104,7 +104,7 @@ public: void offStateFlg0(daMidna_FLG0 i_flag) { mStateFlg0 &= ~i_flag; } void onStateFlg1(daMidna_FLG1 i_flag) { mStateFlg1 |= i_flag; } void offStateFlg1(daMidna_FLG1 i_flag) { mStateFlg1 &= ~i_flag; } - u32 checkStateFlg0(daMidna_FLG0 flag) const { return mStateFlg0 & flag; } + BOOL checkStateFlg0(daMidna_FLG0 flag) const { return mStateFlg0 & flag; } u32 checkStateFlg1(daMidna_FLG1 flag) const { return mStateFlg1 & flag; } void setFaceNum(int num) { mFaceNum = num; } void setMotionNum(int num) { mMotionNum = num; } diff --git a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h index c5ce1684f5..70e4644af5 100644 --- a/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h +++ b/include/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h @@ -38,6 +38,8 @@ public: /* 804CE1F0 */ void setListStart(); /* 804CE214 */ void _delete(); + void setPos(cXyz); + private: /* 0x568 */ u8 field_0x568[0x9d4 - 0x568]; }; diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index 2e273b6aa3..83b15af05a 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -4,9 +4,12 @@ */ #include "rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.h" +#include "SSystem/SComponent/c_math.h" #include "rel/d/a/d_a_midna/d_a_midna.h" #include "d/a/d_a_player.h" #include "d/d_procname.h" +#include "rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.h" +#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h" #include "dol2asm.h" @@ -371,24 +374,7 @@ BOOL daObjBossWarp_c::checkDistance() { } } -/* ############################################################################################## */ -/* 8057B484-8057B488 000124 0004+00 0/1 0/0 0/0 .rodata @4118 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4118 = 0x43360B61; -COMPILER_STRIP_GATE(0x8057B484, &lit_4118); -#pragma pop - -/* 8057B488-8057B48C 000128 0004+00 0/1 0/0 0/0 .rodata @4119 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4119 = 2.0f / 125.0f; -COMPILER_STRIP_GATE(0x8057B488, &lit_4119); -#pragma pop - /* 80579FF8-8057A390 000A38 0398+00 2/2 0/0 0/0 .text execute__15daObjBossWarp_cFv */ -#ifdef NONMATCHING -// regalloc int daObjBossWarp_c::execute() { if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { u8 sw = getSwNo(); @@ -412,7 +398,7 @@ int daObjBossWarp_c::execute() { } event_proc_call(); - daMidna_c* midna = daPy_py_c::getMidnaActor(); + daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); if (field_0x595 && midna != NULL) { midna->onTagWaitPos(&field_0x620); } @@ -448,9 +434,9 @@ int daObjBossWarp_c::execute() { } if (mpParticle[3] != NULL) { - JGeometry::TVec3 scale; - JGeometry::setTVec3f(&scale.x, &scale.x); - mpParticle[3]->setGlobalScale(scale); + JGeometry::TVec3 scale_vec; + JGeometry::setTVec3f(&scale.x, &scale_vec.x); + mpParticle[3]->setGlobalScale(scale_vec); } if (mpBrkAnm != NULL && mpBrkAnm->getFrame() != 0.0f) { @@ -460,16 +446,6 @@ int daObjBossWarp_c::execute() { setBaseMtx(); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjBossWarp_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/execute__15daObjBossWarp_cFv.s" -} -#pragma pop -#endif /* 8057A390-8057A4F4 000DD0 0164+00 1/1 0/0 0/0 .text event_proc_call__15daObjBossWarp_cFv */ void daObjBossWarp_c::event_proc_call() { @@ -723,10 +699,14 @@ int daObjBossWarp_c::demoProc() { "HEART_MOVE", }; - daPy_py_c* player = daPy_getPlayerActorClass(); + static int const l_dangeon_clr_bitNo[9] = { + 0x37, 0x40, 0x4E, 0x109, 0x10A, 0x10B, 0x10C, -1, -1 + }; + + daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass(); obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); cXyz unused(100000.0f, 0.0f, 0.0f); - daMidna_c* midna = daPy_py_c::getMidnaActor(); + daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); cXyz life_pos(900.0f, 0.0f, 0.0f); int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0); diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index b4e7761934..79ba86083a 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -4411,7 +4411,7 @@ static asm fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) #endif /* 8011F658-8011F7D8 119F98 0180+00 1/1 0/0 0/0 .text checkAcceptWarp__9daAlink_cFv */ -// r3/r4 swap loading midna ptr +// matches with literals #ifdef NONMATCHING bool daAlink_c::checkAcceptWarp() { cM3dGPla plane; @@ -4420,7 +4420,7 @@ bool daAlink_c::checkAcceptWarp() { !checkNoResetFlg0(FLG0_UNDERWATER)) { if (!getSlidePolygon(&plane) && !checkForestOldCentury()) { - if (checkMidnaRide() || getMidnaActor()->checkPortalObjRide()) { + if (checkMidnaRide() || ((daMidna_c*)getMidnaActor())->checkPortalObjRide()) { if ((checkField() || checkCastleTown()) && !checkStageName("R_SP161")) { if ((checkWolf() && (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) || diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index ee064b8957..e24cdd155e 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -2183,7 +2183,7 @@ BOOL daMidna_c::checkMidnaRealBody() { } /* 800C77F4-800C7C64 0C2134 0470+00 4/2 0/0 0/0 .text procCoMetamorphoseInit__9daAlink_cFv */ -// small regalloc +// matches with literals #ifdef NONMATCHING int daAlink_c::procCoMetamorphoseInit() { int var_r29 = 0; @@ -2234,7 +2234,7 @@ int daAlink_c::procCoMetamorphoseInit() { field_0x3480 = daAlinkHIO_basic_c0::m.mWolfLinkTransformSpeed; mProcVar2.field_0x300c = shape_angle.x; - daMidna_c* midna = getMidnaActor(); + daMidna_c* midna = (daMidna_c*)getMidnaActor(); if (checkMidnaRide() && daMidna_c::checkMidnaRealBody() && midna->checkDemoTypeNone()) { midna->changeOriginalDemo(); diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 0e2d0cbac0..de0f558872 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -7,140 +7,12 @@ #include "d/a/d_a_alink.h" #include "d/d_demo.h" #include "d/msg/d_msg_object.h" -#include "dol2asm.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" #include "rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h" #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" -// -// Forward References: -// - -extern "C" void __ct__14dEvt_control_cFv(); -extern "C" void __ct__12dEvt_order_cFv(); -extern "C" void orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv(); -extern "C" void order__14dEvt_control_cFUsUsUsUsPvPvsUc(); -extern "C" void setParam__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void beforeFlagProc__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void afterFlagProc__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs(); -extern "C" void talkCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void talkXyCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void catchCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void talkEnd__14dEvt_control_cFv(); -extern "C" void demoCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void demoEnd__14dEvt_control_cFv(); -extern "C" void potentialCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void doorCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void itemCheck__14dEvt_control_cFP12dEvt_order_c(); -extern "C" void endProc__14dEvt_control_cFv(); -extern "C" void change__14dEvt_control_cFv(); -extern "C" void entry__14dEvt_control_cFv(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void reset__14dEvt_control_cFPv(); -extern "C" void clearSkipSystem__14dEvt_control_cFv(); -extern "C" void dEv_defaultSkipProc__FPvi(); -extern "C" void dEv_defaultSkipZev__FPvi(); -extern "C" void dEv_defaultSkipStb__FPvi(); -extern "C" void dEv_noFinishSkipProc__FPvi(); -extern "C" void getSkipEventName__14dEvt_control_cFv(); -extern "C" void setSkipProc__14dEvt_control_cFPvPFPvi_ii(); -extern "C" void setSkipZev__14dEvt_control_cFPvPc(); -extern "C" void onSkipFade__14dEvt_control_cFv(); -extern "C" void offSkipFade__14dEvt_control_cFv(); -extern "C" void skipper__14dEvt_control_cFv(); -extern "C" void Step__14dEvt_control_cFv(); -extern "C" void moveApproval__14dEvt_control_cFPv(); -extern "C" void compulsory__14dEvt_control_cFPvPCcUs(); -extern "C" void remove__14dEvt_control_cFv(); -extern "C" void getStageEventDt__14dEvt_control_cFv(); -extern "C" void sceneChange__14dEvt_control_cFi(); -extern "C" void getPId__14dEvt_control_cFPv(); -extern "C" void convPId__14dEvt_control_cFUi(); -extern "C" void getStbDemoData__14dEvt_control_cFPc(); -extern "C" void __ct__11dEvt_info_cFv(); -extern "C" void setEventName__11dEvt_info_cFPc(); -extern "C" void getEventName__11dEvt_info_cFv(); -extern "C" void beforeProc__11dEvt_info_cFv(); -extern "C" void searchMapEventData__14dEvt_control_cFUc(); -extern "C" void searchMapEventData__14dEvt_control_cFUcl(); -extern "C" void runningEventID__14dEvt_control_cFs(); -extern "C" void setPt1__14dEvt_control_cFPv(); -extern "C" void setPt2__14dEvt_control_cFPv(); -extern "C" void setPtT__14dEvt_control_cFPv(); -extern "C" void setPtI__14dEvt_control_cFPv(); -extern "C" void setPtI_Id__14dEvt_control_cFUi(); -extern "C" void setPtD__14dEvt_control_cFPv(); -extern "C" void setGtItm__14dEvt_control_cFUc(); -extern "C" extern char const* const d_event_d_event__stringBase0; - -// -// External References: -// - -extern "C" void fadeOut__13mDoGph_gInf_cFf(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); -extern "C" void dStage_changeScene4Event__FiScibfUlsi(int, s8, int, bool, float, u32, s16, int); -extern "C" void dComIfGp_getSelectItem__Fi(); -extern "C" void dComIfG_getStageRes__FPCc(); -extern "C" void dComIfG_getRoomArcName__Fi(); -extern "C" void dComIfGs_onVisitedRoom__Fi(); -extern "C" void __dt__12dEvt_order_cFv(); -extern "C" void offEventBit__11dSv_event_cFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void dead__12daItemBase_cFv(); -extern "C" void end__7dDemo_cFv(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void forceFinish__12dEvDtEvent_cFv(); -extern "C" void setStartDemo__18dEvent_exception_cFi(); -extern "C" void setObjectArchive__16dEvent_manager_cFPc(); -extern "C" void endProc__16dEvent_manager_cFsi(); -extern "C" void Sequencer__16dEvent_manager_cFv(); -extern "C" void Experts__16dEvent_manager_cFv(); -extern "C" void getEventData__16dEvent_manager_cFs(); -extern "C" void getEventIdx__16dEvent_manager_cFPCcUcl(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(); -extern "C" void order__16dEvent_manager_cFs(); -extern "C" void issueStaff__16dEvent_manager_cFPCc(); -extern "C" void cancelStaff__16dEvent_manager_cFPCc(); -extern "C" void StopQuake__12dVibration_cFi(); -extern "C" void QuickStart__9dCamera_cFv(); -extern "C" void dCam_getBody__Fv(); -extern "C" void onKillMessageFlag__12dMsgObject_cFv(); -extern "C" void setKillMessageFlag__12dMsgObject_cFv(); -extern "C" void endFlowGroup__12dMsgObject_cFv(); -extern "C" void setDemoName__11Z2StatusMgrFPc(); -extern "C" void __construct_array(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -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* __vt__11dEvt_info_c[3 + 1 /* padding */]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" u8 m_mode__7dDemo_c[4]; -extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - // This probably will need to be moved once actual debug rom decomp begins #ifdef DEBUG static dEvDb_bit_c dEvDb_bit_table[799] = { @@ -333,12 +205,8 @@ s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) { return 1; } -/* ############################################################################################## */ /* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379D80 = "？？？"; -#pragma pop +static char const* const stringBase_80379D80 = "？？？"; /* 80041964-800419A8 03C2A4 0044+00 2/2 0/0 0/0 .text * afterFlagProc__14dEvt_control_cFP12dEvt_order_c */ @@ -365,25 +233,15 @@ int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 condition, u16 comman return 0; } -/* ############################################################################################## */ -/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379D8B = "DEFAULT_TALK"; -SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK"; -#pragma pop - /* 80041A20-80041B58 03C360 0138+00 1/1 0/0 0/0 .text talkCheck__14dEvt_control_cFP12dEvt_order_c */ -#ifdef NONMATCHING -// regswap, this pointer in r31 is weird int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { char* event = "DEFAULT_TALK"; fopAc_ac_c* actor = p_order->mActor2; if ((fopAcM_GetName(actor) == PROC_Tag_Mhint && ((daTagMhint_c*)actor)->checkNoAttention()) || (fopAcM_GetName(actor) == PROC_Tag_Mstop && ((daTagMstop_c*)actor)->checkNoAttention()) || fopAcM_GetName(actor) == PROC_MIDNA) { - daMidna_c* midna = daPy_py_c::getMidnaActor(); + daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); if (!daPy_py_c::i_checkNowWolf() || midna->checkNoDraw()) { event = "MHINT_TALK"; } @@ -404,16 +262,6 @@ int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { return 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::talkCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/talkCheck__14dEvt_control_cFP12dEvt_order_c.s" -} -#pragma pop -#endif /* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text * talkXyCheck__14dEvt_control_cFP12dEvt_order_c */ @@ -986,9 +834,8 @@ bool dEvt_control_c::skipper() { return startSkip; } -/* ############################################################################################## */ /* 80451EC8-80451ECC 0004C8 0004+00 1/1 0/0 0/0 .sdata2 @5013 */ -SECTION_SDATA2 static f32 lit_5013 = -1.0f / 20.0f; +static f32 lit_5013 = -1.0f / 20.0f; /* 80042BBC-80042FA8 03D4FC 03EC+00 0/0 1/1 0/0 .text Step__14dEvt_control_cFv */ int dEvt_control_c::Step() { @@ -1095,7 +942,7 @@ int dEvt_control_c::Step() { return 1; } else { if (!mRoomInfoSet) { - char lastStageName[7]; + char lastStageName[8]; strncpy(lastStageName, dComIfGp_getStartStageName(), 7); lastStageName[7] = 0; @@ -1372,13 +1219,5 @@ void dEvt_control_c::setGtItm(u8 itemNo) { mGtItm = itemNo; } -/* ############################################################################################## */ /* 80379DC6-80379DD0 006426 0008+02 0/0 0/0 0/0 .rodata None */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379DC6 = "GIVEMAN"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379DCE = "\0"; -#pragma pop - -/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +static char const* const stringBase_80379DC6 = "GIVEMAN"; diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index 196ea2df26..2e5ba68675 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -11,51 +11,6 @@ #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" -struct dMpath_RGB5A3_s { - /* 0x0 */ u16 color; -}; - -struct dMpath_RGB5A3_palDt_s { - /* 0x0 */ dMpath_RGB5A3_s field_0x0; - /* 0x2 */ dMpath_RGB5A3_s field_0x2; - /* 0x4 */ dMpath_RGB5A3_s field_0x4; - /* 0x6 */ dMpath_RGB5A3_s field_0x6; -}; - -struct dMap_prm_res_s { - /* 0x000 */ dMpath_RGB5A3_palDt_s palette_data[51]; - /* 0x198 */ u8 field_0x198; - /* 0x199 */ u8 field_0x199; - /* 0x19A */ u8 field_0x19a; - /* 0x19B */ u8 field_0x19b; - /* 0x19C */ u8 field_0x19c; - /* 0x19D */ u8 field_0x19d; - /* 0x19E */ u8 field_0x19e; - /* 0x19F */ u8 field_0x19f; - /* 0x1A0 */ u8 field_0x1a0; - /* 0x1A1 */ u8 field_0x1a1; - /* 0x1A2 */ u8 field_0x1a2; - /* 0x1A3 */ u8 field_0x1a3; - /* 0x1A4 */ u8 field_0x1a4; - /* 0x1A5 */ u8 field_0x1a5; - /* 0x1A6 */ u8 field_0x1a6; - /* 0x1A7 */ u8 field_0x1a7; - /* 0x1A8 */ u8 field_0x1a8; - /* 0x1A9 */ u8 field_0x1a9; - /* 0x1AA */ s16 field_0x1aa; - /* 0x1AC */ s16 field_0x1ac; - /* 0x1AE */ s16 field_0x1ae; - /* 0x1B0 */ s16 field_0x1b0; - /* 0x1B2 */ s16 field_0x1b2; - /* 0x1B4 */ s16 field_0x1b4; - /* 0x1B6 */ s16 field_0x1b6; - /* 0x1B8 */ f32 cursor_size; -}; - -struct dMap_HIO_prm_res_dst_s { - static dMap_prm_res_s* m_res; -}; - /* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc */ f32 renderingAmap_c::getIconSize(u8 i_icon) const { diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index 00777a7408..b1a2162437 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -223,8 +223,8 @@ void dRenderingFDAmap_c::drawBack() const { /* 8003D188-8003D320 037AC8 0198+00 1/0 8/0 0/0 .text preRenderingMap__18dRenderingFDAmap_cFv */ void dRenderingFDAmap_c::preRenderingMap() { - GXSetViewport(0.0f, 0.0f, field_0x1c, field_0x1e, 0.0f, 1.0f); - GXSetScissor(0, 0, field_0x1c, field_0x1e); + GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f); + GXSetScissor(0, 0, mTexWidth, mTexHeight); GXSetNumChans(1); GXSetNumTevStages(1); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, @@ -252,8 +252,8 @@ void dRenderingFDAmap_c::preRenderingMap() { /* 8003D320-8003D3C0 037C60 00A0+00 1/0 7/1 0/0 .text postRenderingMap__18dRenderingFDAmap_cFv */ void dRenderingFDAmap_c::postRenderingMap() { GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL); - GXSetTexCopySrc(0, 0, field_0x1c, field_0x1e); - GXSetTexCopyDst(field_0x1c, field_0x1e, GX_CTF_G8, GX_FALSE); + GXSetTexCopySrc(0, 0, mTexWidth, mTexHeight); + GXSetTexCopyDst(mTexWidth, mTexHeight, GX_CTF_G8, GX_FALSE); GXCopyTex(field_0x4, GX_TRUE); GXPixModeSync(); GXSetClipMode(GX_CLIP_ENABLE); diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 2d1f793237..937e40aa1a 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -177,17 +177,17 @@ s16 dMapInfo_n::getMapRestartAngleY() { /* 8003F19C-8003F1F4 039ADC 0058+00 0/0 1/1 0/0 .text getRoomCenter__10dMapInfo_nFiPfPf */ -void dMapInfo_n::getRoomCenter(int i_roomNo, f32* i_roomCenterX, f32* i_roomCenterZ) { +void dMapInfo_n::getRoomCenter(int i_roomNo, f32* i_roomPosX, f32* i_roomPosZ) { dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo); - if (i_roomCenterX != NULL) { - *i_roomCenterX = (dStage_FileList2_dt_GetRightRmX(fileList2_p) + + if (i_roomPosX != NULL) { + *i_roomPosX = (dStage_FileList2_dt_GetRightRmX(fileList2_p) + dStage_FileList2_dt_GetLeftRmX(fileList2_p)) * 0.5f; } - if (i_roomCenterZ != NULL) { - *i_roomCenterZ = (dStage_FileList2_dt_GetFrontRmZ(fileList2_p) + + if (i_roomPosZ != NULL) { + *i_roomPosZ = (dStage_FileList2_dt_GetFrontRmZ(fileList2_p) + dStage_FileList2_dt_GetInnerRmZ(fileList2_p)) * 0.5f; } @@ -618,13 +618,13 @@ s8 renderingDAmap_c::calcFloorNoForObjectByMapPathRend(f32 param_0, int i_roomNo void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_3, u16 param_4) { mIsDraw = false; field_0x4 = param_0; - field_0x1c = param_1; - field_0x1e = param_2; + mTexWidth = param_1; + mTexHeight = param_2; field_0x20 = param_3; field_0x22 = param_4; - field_0x10 = 0.0f; - field_0x14 = 0.0f; + mPosX = 0.0f; + mPosZ = 0.0f; field_0x8 = 1.0f; field_0xc = 1.0f; mRoomNoSingle = 0; @@ -634,8 +634,8 @@ void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_3, /* 8003FD08-8003FD9C 03A648 0094+00 0/0 2/2 0/0 .text entry__16renderingDAmap_cFfffiSc */ void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 i_cmPerTexel, int i_roomNoSingle, s8 param_4) { - field_0x10 = param_0; - field_0x14 = param_1; + mPosX = param_0; + mPosZ = param_1; mCmPerTexel = i_cmPerTexel; field_0x8 = mCmPerTexel * field_0x20; field_0xc = mCmPerTexel * field_0x22; @@ -647,12 +647,12 @@ void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 i_cmPerTexel, int i_r /* 8003FD9C-8003FE18 03A6DC 007C+00 3/0 3/0 0/0 .text * isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class */ bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* i_group) { - if (i_group->field_0x0 == 0xFF) { + if (i_group->mSwbit == 0xFF) { return true; } else if (i_group->field_0x1 == 0) { - return dComIfGs_isSwitch(i_group->field_0x0, mRoomNo) == false; + return dComIfGs_isSwitch(i_group->mSwbit, mRoomNo) == false; } else { - return dComIfGs_isSwitch(i_group->field_0x0, mRoomNo) != false; + return dComIfGs_isSwitch(i_group->mSwbit, mRoomNo) != false; } } @@ -699,12 +699,12 @@ void renderingDAmap_c::preDrawPath() { Vec sp14; Vec sp8; - sp20.x = field_0x10; - sp20.y = field_0x14; + sp20.x = mPosX; + sp20.y = mPosZ; sp20.z = -5000.0f; - sp14.x = field_0x10; - sp14.y = field_0x14; + sp14.x = mPosX; + sp14.y = mPosZ; sp14.z = 5000.0f; sp8.x = 0.0f; diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp index 1a97f3dbe7..329e6f1911 100644 --- a/src/d/map/d_map_path_fmap.cpp +++ b/src/d/map/d_map_path_fmap.cpp @@ -106,7 +106,7 @@ bool dMenu_Fmap_room_data_c::isArrival() { /* 8003D868-8003D92C 0381A8 00C4+00 1/1 0/0 0/0 .text * buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii */ -void dMenu_Fmap_room_data_c::buildTresTypeGroup(int param_0, int param_1, int param_2) { +void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex, int i_roomNo) { dTres_c::list_class* tresure_p = mp_fmapData->getTresure(); if (tresure_p != NULL) { int num = tresure_p->field_0x0; @@ -117,7 +117,7 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int param_0, int param_1, int pa } for (int i = 0; i < num; i++) { - data_p->mRoomNo = param_2; + data_p->mRoomNo = i_roomNo; u8 typeGroupNo = dTres_c::getTypeToTypeGroupNo(data_p->mType); mp_fmpTresTypeGroupDataListAll->addTypeGroupData(typeGroupNo, data_p); data_p++; @@ -127,97 +127,78 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int param_0, int param_1, int pa /* 8003D92C-8003D95C 03826C 0030+00 1/1 0/0 0/0 .text * buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff */ -void dMenu_Fmap_room_data_c::buildFmapRoomData(int param_0, int param_1, f32 param_2, f32 param_3, - f32 param_4, f32 param_5) { +void dMenu_Fmap_room_data_c::buildFmapRoomData(int i_stageNo, int i_index, f32 i_regionOffsetX, + f32 i_regionOffsetZ, f32 i_stageOffsetX, + f32 i_stageOffsetZ) { int roomNo = m_roomNo; if (mp_fmapData != NULL) { - buildTresTypeGroup(param_0, param_1, roomNo); + buildTresTypeGroup(i_stageNo, i_index, roomNo); } } /* 8003D95C-8003D9D8 03829C 007C+00 1/1 0/0 0/0 .text isArrival__23dMenu_Fmap_stage_data_cFv */ -#ifdef NONMATCHING bool dMenu_Fmap_stage_data_c::isArrival() { bool is_arrival = false; - dMenu_Fmap_room_data_c* room = mp_roomTop; - u8 table_no = mpStageArc->getVisitedRoomSaveTableNo(); + int table_no = mpStageArc->getVisitedRoomSaveTableNo(); for (; !is_arrival && room != NULL; room = room->getNextData()) { - is_arrival = dComIfGs_isSaveVisitedRoom(table_no, room->getRoomNo()) != false; + // fakematch: should be room->getRoomNo() + is_arrival = dComIfGs_isSaveVisitedRoom(table_no, room->m_roomNo) != false; } return is_arrival; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Fmap_stage_data_c::isArrival() { - nofralloc -#include "asm/d/map/d_map_path_fmap/isArrival__23dMenu_Fmap_stage_data_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80451E20-80451E28 000420 0004+04 5/5 0/0 0/0 .sdata2 @3894 */ -SECTION_SDATA2 static f32 lit_3894[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; /* 8003D9D8-8003DB48 038318 0170+00 1/1 0/0 0/0 .text * buildFmapStageData__23dMenu_Fmap_stage_data_cFiff */ -int dMenu_Fmap_stage_data_c::buildFmapStageData(int param_0, f32 param_1, f32 param_2) { +int dMenu_Fmap_stage_data_c::buildFmapStageData(int i_stageNo, f32 i_regionOffsetX, + f32 i_regionOffsetZ) { dMenu_Fmap_room_data_c* room = mp_roomTop; - f32 fvar3 = FLT_MAX; - f32 fvar4 = FLT_MAX; - f32 fvar5 = -FLT_MAX; - f32 fvar6 = -FLT_MAX; - int ivar = 0; + f32 stage_min_x = FLT_MAX; + f32 stage_min_z = FLT_MAX; + f32 stage_max_x = -FLT_MAX; + f32 stage_max_z = -FLT_MAX; + int room_no = 0; - for (; room != NULL; room = room->getNextData()) { - room->buildFmapRoomData(param_0, ivar, param_1, param_2, m_offsetX, m_offsetZ); - f32 min_x = room->getFileList2MinX(); - f32 min_z = room->getFileList2MinZ(); - f32 max_x = room->getFileList2MaxX(); - f32 max_z = room->getFileList2MaxZ(); + for (; room != NULL; room_no++, room = room->getNextData()) { + room->buildFmapRoomData(i_stageNo, room_no, i_regionOffsetX, i_regionOffsetZ, + m_offsetX, m_offsetZ); + f32 room_min_x = room->getFileList2MinX(); + f32 room_min_z = room->getFileList2MinZ(); + f32 room_max_x = room->getFileList2MaxX(); + f32 room_max_z = room->getFileList2MaxZ(); - if (min_x < fvar3) { - fvar3 = min_x; + if (room_min_x < stage_min_x) { + stage_min_x = room_min_x; } - if (min_z < fvar4) { - fvar4 = min_z; + if (room_min_z < stage_min_z) { + stage_min_z = room_min_z; } - if (max_x > fvar5) { - fvar5 = max_x; + if (room_max_x > stage_max_x) { + stage_max_x = room_max_x; } - if (max_z > fvar6) { - fvar6 = max_z; + if (room_max_z > stage_max_z) { + stage_max_z = room_max_z; } - - ivar++; } - if (ivar > 0) { - m_stageMinX = fvar3; - m_stageMinZ = fvar4; - m_stageMaxX = fvar5; - m_stageMaxZ = fvar6; + if (room_no > 0) { + m_stageMinX = stage_min_x; + m_stageMinZ = stage_min_z; + m_stageMaxX = stage_max_x; + m_stageMaxZ = stage_max_z; } else { - f32 tmp_0 = lit_3894[0]; - m_stageMinX = tmp_0; - m_stageMinZ = tmp_0; - m_stageMaxX = tmp_0; - m_stageMaxZ = tmp_0; + m_stageMinX = 0.0f; + m_stageMinZ = 0.0f; + m_stageMaxX = 0.0f; + m_stageMaxZ = 0.0f; } - return ivar; + return room_no; } /* 8003DB48-8003DB70 038488 0028+00 0/0 1/1 0/0 .text @@ -233,158 +214,428 @@ dMenu_Fmap_stage_data_c* dMenu_Fmap_region_data_c::getMenuFmapStageData(int para /* 8003DB70-8003DEE0 0384B0 0370+00 0/0 1/1 0/0 .text * getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 param_0, f32 param_1, int param_2, - int* param_3, int* param_4) { - nofralloc -#include "asm/d/map/d_map_path_fmap/getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi.s" +int dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 i_pointX, f32 i_pointZ, int i_stageNo, + int* o_stageNo, int* o_roomNo) { + int line_num, group_num, floor_num; + f32* point; + u16* point_index; + dDrawPath_c::line_class* line; + dDrawPath_c::group_class* group; + dDrawPath_c::floor_class* floor; + f32* points; + dMenu_Fmap_room_data_c* room; + dMenu_Fmap_stage_data_c* stage; + int point_num, point_no; + int stage_no = 0; + bool outside, found; + int floor_no, group_no, line_no; + int found_stage_no = -1; + int dir, prev_dir; + int found_room_no = -1; + cXyz vec1, vec2, cross; + vec1.y = 0.0f; + vec2.y = 0.0f; + + stage = mpMenuFmapStageDataTop; + for(; stage != NULL; stage = stage->getNextData(), stage_no++) { + if (stage->getStageArc() == NULL) continue; + int save_table_no = stage->getStageArc()->getVisitedRoomSaveTableNo(); + + room = stage->getFmapRoomDataTop(); + for (; room != NULL; room = room->getNextData()) { + if (!(i_stageNo == stage_no || stage->isArrival())) continue; + // fakematch: should be room->getRoomNo() + if (!dComIfGs_isSaveVisitedRoom(save_table_no, room->m_roomNo)) continue; + + f32 offsetX = mRegionOffsetX + stage->getOffsetX(); + f32 offsetZ = mRegionOffsetZ + stage->getOffsetZ(); + + dMenu_Fmap_data_c* map_data = room->getFmapData(); + if (map_data == NULL) continue; + + dDrawPath_c::room_class* path = map_data->getMapPath(); + if (path == NULL) continue; + + floor = path->mpFloor; + points = path->mpFloatData; + if (floor == NULL) continue; + + found = false; + floor_num = path->mFloorNum; + for (floor_no = 0; !found && floor_no < floor_num; floor_no++, floor++) { + group_num = floor->mGroupNum; + group = floor->mpGroup; + if (group == NULL) continue; + for (group_no = 0; !found && group_no < group_num; group_no++, group++) { + line_num = group->mLineNum; + if (line_num <= 0) continue; + line = group->mpLine; + if (line == NULL) continue; + for (line_no = 0; !found && line_no < line_num; line_no++, line++) { + if (line->field_0x1 != 3) continue; + point_num = line->mDataNum; + if (!(point_num >= 3)) continue; + + outside = false; + point_index = line->mpData; + f32* prev_point = &points[point_index[0] * 2]; + point = &points[point_index[1] * 2]; + point_no = 2; + point_index += 2; + + do { + vec1.x = prev_point[0] + offsetX - i_pointX; + vec1.z = prev_point[1] + offsetZ - i_pointZ; + vec2.x = point[0] + offsetX - i_pointX; + vec2.z = point[1] + offsetZ - i_pointZ; + + PSVECCrossProduct(&vec1, &vec2, &cross); + if (cross.y >= 0.0f) { + dir = 0; + } else { + dir = -1; + } + + if (point_no > 2 && dir != prev_dir) { + outside = true; + break; + } + + prev_dir = dir; + prev_point = point; + point = &points[*point_index * 2]; + point_no++; + point_index++; + } while (point_no <= point_num); + + if (!outside) { + found = true; + found_stage_no = stage_no; + found_room_no = room->getRoomNo(); + } + } + } + } + } + } + + if (o_stageNo != NULL) { + *o_stageNo = found_stage_no; + } + if (o_roomNo != NULL) { + *o_roomNo = found_room_no; + } + + return 1; } -#pragma pop /* 8003DEE0-8003E028 038820 0148+00 0/0 1/1 0/0 .text * buildFmapRegionData__24dMenu_Fmap_region_data_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) { - nofralloc -#include "asm/d/map/d_map_path_fmap/buildFmapRegionData__24dMenu_Fmap_region_data_cFi.s" +int dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) { + f32 region_min_x = FLT_MAX; + f32 region_min_z = FLT_MAX; + f32 region_max_x = -FLT_MAX; + f32 region_max_z = -FLT_MAX; + + dMenu_Fmap_stage_data_c* stage = mpMenuFmapStageDataTop; + int stage_no = 0; + + for (; stage != NULL; stage_no++, stage = stage->getNextData()) { + stage->buildFmapStageData(stage_no, mRegionOffsetX, mRegionOffsetZ); + f32 stage_min_x = stage->getStageMinX() + stage->getOffsetX(); + f32 stage_min_z = stage->getStageMinZ() + stage->getOffsetZ(); + f32 stage_max_x = stage->getStageMaxX() + stage->getOffsetX(); + f32 stage_max_z = stage->getStageMaxZ() + stage->getOffsetZ(); + + if (stage_min_x < region_min_x) { + region_min_x = stage_min_x; + } + if (stage_min_z < region_min_z) { + region_min_z = stage_min_z; + } + if (stage_max_x > region_max_x) { + region_max_x = stage_max_x; + } + if (stage_max_z > region_max_z) { + region_max_z = stage_max_z; + } + } + + if (stage_no > 0) { + mRegionMinX = region_min_x; + mRegionMinZ = region_min_z; + mRegionMaxX = region_max_x; + mRegionMaxZ = region_max_z; + } else { + mRegionMinX = 0.0f; + mRegionMaxX = 0.0f; + mRegionMinZ = 0.0f; + mRegionMaxZ = 0.0f; + } + + return stage_no; } -#pragma pop /* 8003E028-8003E04C 038968 0024+00 0/0 1/1 0/0 .text * create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_world_data_c::create(dMenu_Fmap_region_data_c* param_0) { - nofralloc -#include "asm/d/map/d_map_path_fmap/create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c.s" +void dMenu_Fmap_world_data_c::create(dMenu_Fmap_region_data_c* i_regionData) { + mp_fmapRegionData = i_regionData; + buildFmapWorldData(); } -#pragma pop /* 8003E04C-8003E114 03898C 00C8+00 1/1 0/0 0/0 .text * buildFmapWorldData__23dMenu_Fmap_world_data_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_world_data_c::buildFmapWorldData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/buildFmapWorldData__23dMenu_Fmap_world_data_cFv.s" +int dMenu_Fmap_world_data_c::buildFmapWorldData() { + f32 min_x = FLT_MAX; + f32 min_z = FLT_MAX; + f32 max_x = -FLT_MAX; + f32 max_z = -FLT_MAX; + + dMenu_Fmap_region_data_c* region = mp_fmapRegionData; + int region_no = 0; + + for (; region != NULL; region_no++, region = region->getNextData()) { + f32 region_min_x = region->getRegionMinX() + region->getRegionOffsetX(); + f32 region_min_z = region->getRegionMinZ() + region->getRegionOffsetZ(); + f32 region_max_x = region->getRegionMaxX() + region->getRegionOffsetX(); + f32 region_max_z = region->getRegionMaxZ() + region->getRegionOffsetZ(); + + if (region_min_x < min_x) { + min_x = region_min_x; + } + if (region_min_z < min_z) { + min_z = region_min_z; + } + if (region_max_x > max_x) { + max_x = region_max_x; + } + if (region_max_z > max_z) { + max_z = region_max_z; + } + } + + if (region_no > 0) { + m_worldMinX = min_x; + m_worldMinZ = min_z; + m_worldMaxX = max_x; + m_worldMaxZ = max_z; + } else { + m_worldMinX = 0.0f; + m_worldMaxX = 0.0f; + m_worldMinZ = 0.0f; + m_worldMaxZ = 0.0f; + } + + return region_no; } -#pragma pop /* 8003E114-8003E1C0 038A54 00AC+00 0/0 3/3 0/0 .text * init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* param_0, - dMenu_Fmap_stage_data_c* param_1, u8 param_2, int param_3, - int param_4) { - nofralloc -#include "asm/d/map/d_map_path_fmap/init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii.s" +bool dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* i_regionData, + dMenu_Fmap_stage_data_c* i_stageData, u8 i_typeGroupNo, + int i_stayStageNo, int i_stayRoomNo) { + stage_stag_info_class* stag_info = dComIfGp_getStage()->getStagInfo(); + if (stag_info == NULL) { + return false; + } + + mSaveTbl = i_dStage_stagInfo_GetSaveTbl(stag_info); + mpRegionData = i_regionData; + mpStageData = i_stageData; + mType = dTres_c::getTypeGroupNoToType(i_typeGroupNo); + mTypeGroupNo = i_typeGroupNo; + mStayStageNo = i_stayStageNo; + mStayRoomNo = i_stayRoomNo; + mStageNo = 0; + getFirstRoomData(); + return true; } -#pragma pop /* 8003E1C0-8003E2BC 038B00 00FC+00 2/2 0/0 0/0 .text getFirstData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getFirstData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getFirstData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getFirstData() { + bool ret = false; + if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) { + mpTresTypeGroupData = dTres_c::getFirstData(mTypeGroupNo); + mpTresData = mpTresTypeGroupData->getConstDataPointer(); + } else { + mpFmpTresTypeGroupDataList = NULL; + mpFmpTresTypeGroupData = NULL; + mpTresData = NULL; + mpFmpTresTypeGroupDataListAll = mpRoomData->getTypeGroupDataListAll(); + if (mpFmpTresTypeGroupDataListAll != NULL) { + mpFmpTresTypeGroupDataList = + mpFmpTresTypeGroupDataListAll->getTypeGroupDataList(mTypeGroupNo); + if (mpFmpTresTypeGroupDataList != NULL) { + mpFmpTresTypeGroupData = mpFmpTresTypeGroupDataList->getTypeGroupDataHead(); + if (mpFmpTresTypeGroupData != NULL) { + do { + mpTresData = mpFmpTresTypeGroupData->getTresData(); + if (mpTresData != NULL) { + ret = true; + break; + } + mpFmpTresTypeGroupData = mpFmpTresTypeGroupData->getNextData(); + } while (mpTresData != NULL); // !@bug presumably supposed to be mpFmpTresTypeGroupData != NULL + } + } + } + } + return ret; } -#pragma pop /* 8003E2BC-8003E350 038BFC 0094+00 1/1 0/0 0/0 .text getData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getData() { + bool ret = false; + if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) { + if (mpTresTypeGroupData != NULL + && mpRoomData->getRoomNo() == mpTresTypeGroupData->getRoomNo()) + { + mpTresData = mpTresTypeGroupData->getConstDataPointer(); + ret = true; + } + } else { + if (mpTresData != NULL) { + ret = true; + } + } + return ret; } -#pragma pop /* 8003E350-8003E37C 038C90 002C+00 2/2 0/0 0/0 .text getFirstRoomData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getFirstRoomData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getFirstRoomData__22dMenuFmapIconPointer_cFv.s" +void dMenuFmapIconPointer_c::getFirstRoomData() { + mpRoomData = mpStageData->getFmapRoomDataTop(); + getFirstData(); } -#pragma pop /* 8003E37C-8003E3A4 038CBC 0028+00 1/1 0/0 0/0 .text getNextRoomData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getNextRoomData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getNextRoomData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getNextRoomData() { + bool ret = false; + mpRoomData = mpRoomData->getNextData(); + if (mpRoomData == NULL) { + ret = true; + } + return ret; } -#pragma pop /* 8003E3A4-8003E3D8 038CE4 0034+00 1/1 0/0 0/0 .text getNextStageData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getNextStageData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getNextStageData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getNextStageData() { + bool ret = false; + mStageNo++; + mpStageData = mpStageData->getNextData(); + if (mpStageData == NULL) { + ret = true; + } + return ret; } -#pragma pop /* 8003E3D8-8003E490 038D18 00B8+00 1/1 0/0 0/0 .text getNextData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getNextData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getNextData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getNextData() { + bool ret = true; + if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) { + if (mpTresTypeGroupData != NULL) { + mpTresTypeGroupData = dTres_c::getNextData(mpTresTypeGroupData); + if (mpTresTypeGroupData != NULL) { + mpTresData = mpTresTypeGroupData->getConstDataPointer(); + ret = false; + } + } + } else { + if (mpFmpTresTypeGroupData != NULL) { + mpFmpTresTypeGroupData = mpFmpTresTypeGroupData->getNextData(); + if (mpFmpTresTypeGroupData != NULL) { + mpTresData = mpFmpTresTypeGroupData->getTresData(); + if (mpTresData != NULL) { + ret = false; + } + } + } + } + return ret; } -#pragma pop /* 8003E490-8003E510 038DD0 0080+00 1/1 3/3 0/0 .text nextData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::nextData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/nextData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::nextData() { + bool ret = false; + if (getNextData()) { + if (getNextRoomData()) { + if (getNextStageData()) { + ret = true; + } else { + getFirstRoomData(); + } + } else { + getFirstData(); + } + } + return ret; } -#pragma pop /* 8003E510-8003E578 038E50 0068+00 0/0 3/3 0/0 .text getValidData__22dMenuFmapIconPointer_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconPointer_c::getValidData() { - nofralloc -#include "asm/d/map/d_map_path_fmap/getValidData__22dMenuFmapIconPointer_cFv.s" +bool dMenuFmapIconPointer_c::getValidData() { + bool iVar1, iVar2 = false; + do { + iVar1 = getData(); + if (!iVar1) { + iVar2 = nextData(); + } + } while (!iVar2 && !iVar1); + return iVar2; } -#pragma pop /* 8003E578-8003E6E8 038EB8 0170+00 0/0 3/3 0/0 .text * getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenuFmapIconDisp_c::getPosition(int* param_0, int* param_1, f32* param_2, f32* param_3, - dTres_c::data_s const** param_4) { - nofralloc -#include "asm/d/map/d_map_path_fmap/getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s.s" -} -#pragma pop +bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX, f32* o_posZ, + dTres_c::data_s const** o_tresData) { + f32 offset_x = mpRegionData->getRegionOffsetX() + mpStageData->getOffsetX(); + f32 offset_z = mpRegionData->getRegionOffsetZ() + mpStageData->getOffsetZ(); + if (o_posX != NULL) { + *o_posX = 0.0f; + } + if (o_posZ != NULL) { + *o_posZ = 0.0f; + } + if (o_stageNo != NULL) { + *o_stageNo = mStageNo; + } + if (o_roomNo != NULL) { + *o_roomNo = mpRoomData->getRoomNo(); + } + + if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) { + if (mpTresTypeGroupData != NULL) { + if (o_tresData != NULL) { + *o_tresData = mpTresTypeGroupData->getConstDataPointer(); + } + if (o_posX != NULL) { + *o_posX = offset_x + mpTresTypeGroupData->getPos()->x; + } + if (o_posZ != NULL) { + *o_posZ = offset_z + mpTresTypeGroupData->getPos()->z; + } + } + } else { + if (mpTresData != NULL) { + if (o_tresData != NULL) { + *o_tresData = mpTresData; + } + if (o_posX != NULL) { + *o_posX = offset_x + mpTresData->mPos.x; + } + if (o_posZ != NULL) { + *o_posZ = offset_z + mpTresData->mPos.z; + } + } + } + + return false; +} + +#ifndef NONMATCHING /* ############################################################################################## */ /* 803A7D38-803A7D74 -00001 003C+00 1/1 0/0 0/0 .data @4467 */ SECTION_DATA static void* lit_4467[15] = { @@ -404,52 +655,123 @@ SECTION_DATA static void* lit_4467[15] = { (void*)(((char*)isDrawDisp__19dMenuFmapIconDisp_cFv) + 0x388), (void*)(((char*)isDrawDisp__19dMenuFmapIconDisp_cFv) + 0x388), }; +#endif /* 8003E6E8-8003EB10 039028 0428+00 2/0 3/3 0/0 .text isDrawDisp__19dMenuFmapIconDisp_cFv */ +#ifdef NONMATCHING +//? regalloc +bool dMenuFmapIconDisp_c::isDrawDisp() { + bool ret; + + dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc(); + if (stage_arc == NULL) { + return false; + } + + u8 save_table_no = stage_arc->getSaveTableNo(); + int room_no = mpRoomData->getRoomNo(); + bool bVar2 = (mStayStageNo == mStageNo && mStayRoomNo == room_no) || mpRoomData->isArrival(); + ret = false; + bool bVar1; + + switch (mTypeGroupNo) { + case 1: + case 8: + if (save_table_no == mSaveTbl) { + ret = bVar2 && (mpTresData->mSwBit == 0xff || + (mpTresData->mSwBit != 0xff && dComIfGs_isSwitch(mpTresData->mSwBit, room_no))); + } else { + ret = bVar2 && (mpTresData->mSwBit == 0xff || + (mpTresData->mSwBit != 0xff && mpTresData->mSwBit < 0x80 + && dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit))); + } + break; + + case 4: + bVar1 = false; + if (dComIfGp_isLightDropMapVisible()) { + if (dComIfGp_getStartStageDarkArea() == 2) { + int tres_no = mpTresData->mNo; + if (tres_no == 0x33 || tres_no == 0x34 || tres_no == 0x35) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) { + bVar1 = true; + } + } else { + bVar1 = true; + } + } else { + bVar1 = true; + } + } + if (bVar1 && mpTresData->mNo != 0xff && !dComIfGs_isStageTbox(save_table_no, mpTresData->mNo)) { + ret = true; + } + break; + + case 5: + if (save_table_no == mSaveTbl) { + ret = (mpTresData->mNo == 0xff || + (mpTresData->mNo != 0xff && !dComIfGs_isTbox(mpTresData->mNo))) + && (mpTresData->mSwBit == 0xff || (mpTresData->mSwBit != 0xff + && dComIfGs_isSwitch(mpTresData->mSwBit, room_no))); + } else { + ret = (mpTresData->mNo == 0xff || (mpTresData->mNo != 0xff + && !dComIfGs_isStageTbox(save_table_no, mpTresData->mNo))) + && (mpTresData->mSwBit == 0xff || + (mpTresData->mSwBit != 0xff && mpTresData->mSwBit < 0x80 && + dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit))); + } + break; + + case 6: + if (save_table_no == mSaveTbl) { + ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) ? true : false; + } else { + if (mpTresData->mSwBit < 0x80) { + ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) ? true : false; + } + } + break; + + case 10: + ret = mpTresData->mNo != 0xff && dComIfGs_isStageTbox(save_table_no, mpTresData->mNo); + break; + + case 13: + case 14: + if (save_table_no == mSaveTbl) { + ret = mpTresData->mSwBit == 0xff || + (mpTresData->mSwBit != 0xff && dComIfGs_isSwitch(mpTresData->mSwBit, room_no)); + } else { + ret = mpTresData->mSwBit == 0xff || (mpTresData->mSwBit < 0x80 + && dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit)); + } + break; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenuFmapIconDisp_c::isDrawDisp() { +asm bool dMenuFmapIconDisp_c::isDrawDisp() { nofralloc #include "asm/d/map/d_map_path_fmap/isDrawDisp__19dMenuFmapIconDisp_cFv.s" } #pragma pop +#endif /* 8003EB10-8003EB70 039450 0060+00 1/1 1/1 0/0 .text __dt__26fmpTresTypeGroupDataList_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fmpTresTypeGroupDataList_c::~fmpTresTypeGroupDataList_c() { - nofralloc -#include "asm/d/map/d_map_path_fmap/__dt__26fmpTresTypeGroupDataList_cFv.s" +fmpTresTypeGroupDataList_c::~fmpTresTypeGroupDataList_c() { + if (mpTypeGroupDataHead != NULL) { + delete mpTypeGroupDataHead; + } } -#pragma pop - -/* 8003EB70-8003EC90 0394B0 0120+00 1/1 0/0 0/0 .text __dt__22fmpTresTypeGroupData_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fmpTresTypeGroupData_c::~fmpTresTypeGroupData_c() { - nofralloc -#include "asm/d/map/d_map_path_fmap/__dt__22fmpTresTypeGroupData_cFv.s" -} -#pragma pop /* 8003EC90-8003ECA0 0395D0 0010+00 1/1 0/0 0/0 .text __ct__26fmpTresTypeGroupDataList_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fmpTresTypeGroupDataList_c::fmpTresTypeGroupDataList_c() { - nofralloc -#include "asm/d/map/d_map_path_fmap/__ct__26fmpTresTypeGroupDataList_cFv.s" +fmpTresTypeGroupDataList_c::fmpTresTypeGroupDataList_c() { + mpTypeGroupDataHead = NULL; + mpNextData = NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 803A7D74-803A7D80 004E94 000C+00 0/0 3/3 0/0 .data __vt__19dMenuFmapIconDisp_c */ -SECTION_DATA extern void* __vt__19dMenuFmapIconDisp_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)isDrawDisp__19dMenuFmapIconDisp_cFv, -}; diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index 4f8758a573..038c6a3d33 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -4,1472 +4,1061 @@ // #include "d/menu/d_menu_fmap.h" -#include "JSystem/JKernel/JKRArchive.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRAramArchive.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "stdio.h" -#include "string.h" -#include "dol2asm.h" -#include "dolphin/os/OSCache.h" - -struct ResTIMG; - -// -// Types: -// - -struct dMenu_Fmap_region_data_c { - /* 8003DB48 */ void getMenuFmapStageData(int); - /* 8003DEE0 */ void buildFmapRegionData(int); -}; - -struct renderingFmap_c { - /* 801CE3C0 */ void getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*, - int*); -}; - -struct mDoDvdThd_mountArchive_c { - /* 80015E14 */ void create(char const*, u8, JKRHeap*); -}; - -struct fmpTresTypeGroupDataList_c { - /* 8003EB10 */ ~fmpTresTypeGroupDataList_c(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dTres_c { - struct data_s {}; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dStage_dt_c {}; - -struct dMsgScrnExplain_c { - /* 8023D7D8 */ void move(); - /* 8023E558 */ void openExplain(u32, u8, u8, u8, bool); -}; - -struct dMsgObject_c { - /* 80237AE0 */ void setTalkHeap(void*); - /* 80237B54 */ void getTalkHeap(); - /* 802381FC */ void setStatus(u16); - /* 8023822C */ void getStatus(); - /* 802383D0 */ void getMessageID(); - /* 8023849C */ void setPortalMessageID(u16); -}; - -struct dMf_HIO_c { - /* 801C65F8 */ dMf_HIO_c(); - /* 801CDA2C */ ~dMf_HIO_c(); - - static u8 mMySelfPointer[4]; -}; - -struct dMeterMap_c { - /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); -}; - -struct dMeter2Info_c { - /* 8021CC0C */ void setWarpInfo(char const*, cXyz const&, s16, u8, u8, u8); -}; - -struct dMenu_Fmap_world_data_c { - /* 8003E028 */ void create(dMenu_Fmap_region_data_c*); -}; - -struct dMenu_Fmap_stage_data_c {}; - -struct dMenu_FmapMap_c { - /* 801CEC24 */ dMenu_FmapMap_c(); - /* 801CEDE8 */ void _create(u16, u16, u16, u16, void*); - /* 801CEE3C */ void _delete(); - /* 801CF1E0 */ void setFlashOn(int, int, u8*, int); - /* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32); -}; - -struct dMenu_Fmap2DTop_c { - /* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*); - /* 801D6A44 */ void _execute(); - /* 801D6C44 */ void setAllAlphaRate(f32, bool); - /* 801D6DF8 */ void btkAnimeLoop(J2DAnmTextureSRTKey*, f32); - /* 801D6EDC */ void setMoyaAlpha(u8); - /* 801D6F38 */ void setTitleNameString(u32); - /* 801D7010 */ void setAreaNameString(u32); - /* 801D70E8 */ void setZButtonString(u32, u8); - /* 801D7210 */ void setBButtonString(u32, u8); - /* 801D72D4 */ void setAButtonString(u32, u8); - /* 801D7398 */ void setCrossLRString(u32); - /* 801D74EC */ void set3DStickString(u32); - /* 801D7640 */ void createExplain(JKRExpHeap*, STControl*); - /* 801D76C0 */ void deleteExplain(); - /* 801D7714 */ void setArrowAlphaRatio(u8, f32); - /* 801D7994 */ void checkPlayerWarpAccept(); - /* 801D7AB4 */ void checkWarpAcceptRegion4(); - /* 801D7B58 */ void checkWarpAcceptCannon(); - /* 801D8088 */ void isWarpAccept(); -}; - -struct dMenu_Fmap2DBack_c { - /* 801CF56C */ dMenu_Fmap2DBack_c(); - /* 801D0804 */ void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32); - /* 801D0AC8 */ void calcAllMapPos(); - /* 801D0D18 */ void calcAllMapPos2D(f32, f32, f32*, f32*); - /* 801D0D50 */ void calcAllMapPos2D(char const*, f32, f32, f32*, f32*); - /* 801D0F7C */ void calcAllMapPosWorld(f32, f32, f32*, f32*); - /* 801D1094 */ void setSpotPane(ResTIMG*); - /* 801D10F4 */ void deleteSpotPane(); - /* 801D1148 */ void zoomMapCalc(f32); - /* 801D1478 */ void zoomMapCalc2(f32); - /* 801D1858 */ void zoomMapCalcHIO(); - /* 801D1D50 */ void mapBlink(s16*); - /* 801D1D74 */ void setSpotCursor(u8); - /* 801D1DC4 */ void allmap_move2(STControl*); - /* 801D2100 */ void setIcon2DPos(u8, f32, f32, f32, u8, bool); - /* 801D241C */ void setIcon2DPos(u8, char const*, f32, f32, f32, u8, bool); - /* 801D2508 */ void isShowRegion(int); - /* 801D2678 */ void getMapAreaGlobalCenterPosX(); - /* 801D26C8 */ void getMapAreaGlobalCenterPosY(); - /* 801D4928 */ void calcBackAlpha(bool); - /* 801D49E0 */ void btkAnimeLoop(f32); - /* 801D4AFC */ void setBaseBackAlpha(u8); - /* 801D4B2C */ void regionMapMove(STControl*); - /* 801D4E80 */ void stageMapMove(STControl*, u8, bool); - /* 801D5334 */ void setAllAlphaRate(f32, bool); - /* 801D58F8 */ void setArrowPos3D(u8, char const*, f32, f32); - /* 801D59C0 */ void setArrowPos3DOffset(u8, char const*, f32, f32, f32); - /* 801D5AC4 */ void calcDrawPriority(); - /* 801D5BB8 */ void setArrowPosAxis(f32, f32); -}; - -struct dMenuMapCommon_c { - /* 801C3EC4 */ void iconScale(int, f32, f32, f32); - /* 801C443C */ void clearIconInfo(); -}; - -struct dMenuFmapIconPointer_c { - /* 8003E114 */ void init(dMenu_Fmap_region_data_c*, dMenu_Fmap_stage_data_c*, u8, int, int); - /* 8003E490 */ void nextData(); - /* 8003E510 */ void getValidData(); -}; - -struct dMenuFmapIconDisp_c { - /* 8003E578 */ void getPosition(int*, int*, f32*, f32*, dTres_c::data_s const**); - /* 8003E6E8 */ void isDrawDisp(); -}; - -struct dMapInfo_n { - /* 8003EE5C */ void getMapPlayerPos(); - /* 8003F02C */ void getMapRestartPos(); -}; - -struct JKRAramArchive {}; - -// -// Forward References: -// - -extern "C" void __ct__9dMf_HIO_cFv(); -extern "C" void dMenuFmap_getStartStageName__FPv(); -extern "C" void __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc(); -extern "C" void __dt__12dMenu_Fmap_cFv(); -extern "C" void _create__12dMenu_Fmap_cFv(); -extern "C" void _delete__12dMenu_Fmap_cFv(); -extern "C" void _move__12dMenu_Fmap_cFv(); -extern "C" void _draw__12dMenu_Fmap_cFv(); -extern "C" void getNextStatus__12dMenu_Fmap_cFPUc(); -extern "C" void isSync__12dMenu_Fmap_cFv(); -extern "C" void all_map_init__12dMenu_Fmap_cFv(); -extern "C" void all_map_proc__12dMenu_Fmap_cFv(); -extern "C" void zoom_all_to_region_init__12dMenu_Fmap_cFv(); -extern "C" void zoom_all_to_region_proc__12dMenu_Fmap_cFv(); -extern "C" void zoom_region_to_all_init__12dMenu_Fmap_cFv(); -extern "C" void zoom_region_to_all_proc__12dMenu_Fmap_cFv(); -extern "C" void region_map_init__12dMenu_Fmap_cFv(); -extern "C" void region_map_proc__12dMenu_Fmap_cFv(); -extern "C" void to_portal_warp_map_init__12dMenu_Fmap_cFv(); -extern "C" void to_portal_warp_map_proc__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_map_init__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_map_proc__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_select_init__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_select_proc__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_forbid_init__12dMenu_Fmap_cFv(); -extern "C" void portal_warp_forbid_proc__12dMenu_Fmap_cFv(); -extern "C" void zoom_region_to_spot_init__12dMenu_Fmap_cFv(); -extern "C" void zoom_region_to_spot_proc__12dMenu_Fmap_cFv(); -extern "C" void zoom_spot_to_region_init__12dMenu_Fmap_cFv(); -extern "C" void zoom_spot_to_region_proc__12dMenu_Fmap_cFv(); -extern "C" void spot_map_init__12dMenu_Fmap_cFv(); -extern "C" void spot_map_proc__12dMenu_Fmap_cFv(); -extern "C" void portal_demo1_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo1_move__12dMenu_Fmap_cFv(); -extern "C" void portal_demo2_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo2_move__12dMenu_Fmap_cFv(); -extern "C" void portal_demo3_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo3_move__12dMenu_Fmap_cFv(); -extern "C" void portal_demo4_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo4_move__12dMenu_Fmap_cFv(); -extern "C" void portal_demo5_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo5_move__12dMenu_Fmap_cFv(); -extern "C" void portal_demo6_init__12dMenu_Fmap_cFv(); -extern "C" void portal_demo6_move__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo1_init__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo1_move__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo2_init__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo2_move__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo3_init__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo3_move__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo4_init__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo4_move__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo5_init__12dMenu_Fmap_cFv(); -extern "C" void yamiboss_demo5_move__12dMenu_Fmap_cFv(); -extern "C" void light_demo1_init__12dMenu_Fmap_cFv(); -extern "C" void light_demo1_move__12dMenu_Fmap_cFv(); -extern "C" void light_demo2_init__12dMenu_Fmap_cFv(); -extern "C" void light_demo2_move__12dMenu_Fmap_cFv(); -extern "C" void table_demo1_init__12dMenu_Fmap_cFv(); -extern "C" void table_demo1_move__12dMenu_Fmap_cFv(); -extern "C" void table_demo2_init__12dMenu_Fmap_cFv(); -extern "C" void table_demo2_move__12dMenu_Fmap_cFv(); -extern "C" void table_demo3_init__12dMenu_Fmap_cFv(); -extern "C" void table_demo3_move__12dMenu_Fmap_cFv(); -extern "C" void howl_demo1_init__12dMenu_Fmap_cFv(); -extern "C" void howl_demo1_move__12dMenu_Fmap_cFv(); -extern "C" void howl_demo2_init__12dMenu_Fmap_cFv(); -extern "C" void howl_demo2_move__12dMenu_Fmap_cFv(); -extern "C" void howl_demo3_init__12dMenu_Fmap_cFv(); -extern "C" void howl_demo3_move__12dMenu_Fmap_cFv(); -extern "C" void isOpen__12dMenu_Fmap_cFv(); -extern "C" void isClose__12dMenu_Fmap_cFv(); -extern "C" void getProcess__12dMenu_Fmap_cFv(); -extern "C" void getRegionCursor__12dMenu_Fmap_cFv(); -extern "C" void getStageCursor__12dMenu_Fmap_cFv(); -extern "C" void getStageTransX__12dMenu_Fmap_cFv(); -extern "C" void getStageTransZ__12dMenu_Fmap_cFv(); -extern "C" void isRoomCheck__12dMenu_Fmap_cFii(); -extern "C" void checkStRoomData__12dMenu_Fmap_cFv(); -extern "C" void talkButton__12dMenu_Fmap_cFv(); -extern "C" void setProcess__12dMenu_Fmap_cFUc(); -extern "C" void setFlash__12dMenu_Fmap_cFUcb(); -extern "C" void readWorldData__12dMenu_Fmap_cFUc(); -extern "C" void readAreaData__12dMenu_Fmap_cFUcb(); -extern "C" void readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc(); -extern "C" void readFieldMapData__12dMenu_Fmap_cFPPvPCcbb(); -extern "C" void getExpandedResSize__10JKRArchiveCFPCv(); -extern "C" void decodeFieldMapData__12dMenu_Fmap_cFv(); -extern "C" void decodePortalData__12dMenu_Fmap_cFv(); -extern "C" void readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc(); -extern "C" void removeAreaData__12dMenu_Fmap_cFv(); -extern "C" void removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c(); -extern "C" void setTitleName__12dMenu_Fmap_cFUl(); -extern "C" void setAreaName__12dMenu_Fmap_cFUl(); -extern "C" void setAreaNameZero__12dMenu_Fmap_cFv(); -extern "C" void portalWarpMapMove__12dMenu_Fmap_cFP9STControl(); -extern "C" void onRoomDataBit__12dMenu_Fmap_cFi(); -extern "C" void isRoomDataBit__12dMenu_Fmap_cFi(); -extern "C" void resetRoomDataBit__12dMenu_Fmap_cFv(); -extern "C" void drawIcon__12dMenu_Fmap_cFfb(); -extern "C" void drawLightDropIcon__12dMenu_Fmap_cFv(); -extern "C" void drawBatsumarkIcon__12dMenu_Fmap_cFv(); -extern "C" void drawSnowmanIcon__12dMenu_Fmap_cFv(); -extern "C" void drawGoldWolfIcon__12dMenu_Fmap_cFv(); -extern "C" void drawCoachIcon__12dMenu_Fmap_cFv(); -extern "C" void drawPlayEnterIcon__12dMenu_Fmap_cFv(); -extern "C" void checkDrawPortalIcon__12dMenu_Fmap_cFii(); -extern "C" void searchIcon__12dMenu_Fmap_cFUciPfPf(); -extern "C" void drawIcon__12dMenu_Fmap_cFUci(); -extern "C" void drawEnterIcon__12dMenu_Fmap_cFv(); -extern "C" void drawPortalIcon__12dMenu_Fmap_cFv(); -extern "C" void getRegionStageNum__12dMenu_Fmap_cFi(); -extern "C" void getNowFmapRegionData__12dMenu_Fmap_cFv(); -extern "C" void getNowFmapStageData__12dMenu_Fmap_cFv(); -extern "C" void searchPortalStageID__12dMenu_Fmap_cFPc(); -extern "C" void drawDebugStage__12dMenu_Fmap_cFv(); -extern "C" void arrowPosInit__12dMenu_Fmap_cFv(); -extern "C" void tableArrowPosInit__12dMenu_Fmap_cFb(); -extern "C" void yamibossArrowPosInit__12dMenu_Fmap_cFv(); -extern "C" void howlArrowPosInit__12dMenu_Fmap_cFv(); -extern "C" void getHowlRegionID__12dMenu_Fmap_cFv(); -extern "C" void isLightVesselGet__12dMenu_Fmap_cFv(); -extern "C" void getPlayerPos2D__12dMenu_Fmap_cFv(); -extern "C" void __dt__9dMf_HIO_cFv(); -extern "C" void __sinit_d_menu_fmap_cpp(); -extern "C" extern char const* const d_menu_d_menu_fmap__stringBase0; -extern "C" u8 mMySelfPointer__9dMf_HIO_c[4]; -extern "C" u8 MyClass__12dMenu_Fmap_c[4]; - -// -// External References: -// - -extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); -extern "C" void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(); -extern "C" void fopMsgM_messageSet__FUlUl(); -extern "C" void dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c(); -extern "C" void dComIfGs_isStageSwitch__Fii(); -extern "C" void dComIfGs_isOneZoneSwitch__Fii(); -extern "C" void dComIfGp_isLightDropMapVisible__Fv(); -extern "C" void dComIfGp_getNowLevel__Fv(); -extern "C" void dComIfGp_SelectWarpPt_set__FUc(); -extern "C" void checkTrigger__9STControlFv(); -extern "C" void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc(); -extern "C" void onEventBit__11dSv_event_cFUs(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getMenuFmapStageData__24dMenu_Fmap_region_data_cFi(); -extern "C" void buildFmapRegionData__24dMenu_Fmap_region_data_cFi(); -extern "C" void create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c(); -extern "C" void -init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii(); -extern "C" void nextData__22dMenuFmapIconPointer_cFv(); -extern "C" void getValidData__22dMenuFmapIconPointer_cFv(); -extern "C" void getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s(); -extern "C" void isDrawDisp__19dMenuFmapIconDisp_cFv(); -extern "C" void __dt__26fmpTresTypeGroupDataList_cFv(); -extern "C" void getMapPlayerPos__10dMapInfo_nFv(); -extern "C" void getMapRestartPos__10dMapInfo_nFv(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void iconScale__16dMenuMapCommon_cFifff(); -extern "C" void clearIconInfo__16dMenuMapCommon_cFv(); -extern "C" void getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi(); -extern "C" void __ct__15dMenu_FmapMap_cFv(); -extern "C" void _create__15dMenu_FmapMap_cFUsUsUsUsPv(); -extern "C" void _delete__15dMenu_FmapMap_cFv(); -extern "C" void setFlashOn__15dMenu_FmapMap_cFiiPUci(); -extern "C" void setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff(); -extern "C" void __ct__18dMenu_Fmap2DBack_cFv(); -extern "C" void setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff(); -extern "C" void calcAllMapPos__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf(); -extern "C" void calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf(); -extern "C" void calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf(); -extern "C" void setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG(); -extern "C" void deleteSpotPane__18dMenu_Fmap2DBack_cFv(); -extern "C" void zoomMapCalc__18dMenu_Fmap2DBack_cFf(); -extern "C" void zoomMapCalc2__18dMenu_Fmap2DBack_cFf(); -extern "C" void zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv(); -extern "C" void mapBlink__18dMenu_Fmap2DBack_cFPs(); -extern "C" void setSpotCursor__18dMenu_Fmap2DBack_cFUc(); -extern "C" void allmap_move2__18dMenu_Fmap2DBack_cFP9STControl(); -extern "C" void setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb(); -extern "C" void setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb(); -extern "C" void isShowRegion__18dMenu_Fmap2DBack_cFi(); -extern "C" void getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcBackAlpha__18dMenu_Fmap2DBack_cFb(); -extern "C" void btkAnimeLoop__18dMenu_Fmap2DBack_cFf(); -extern "C" void setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc(); -extern "C" void regionMapMove__18dMenu_Fmap2DBack_cFP9STControl(); -extern "C" void stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb(); -extern "C" void setAllAlphaRate__18dMenu_Fmap2DBack_cFfb(); -extern "C" void setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff(); -extern "C" void setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff(); -extern "C" void calcDrawPriority__18dMenu_Fmap2DBack_cFv(); -extern "C" void setArrowPosAxis__18dMenu_Fmap2DBack_cFff(); -extern "C" void __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl(); -extern "C" void _execute__17dMenu_Fmap2DTop_cFv(); -extern "C" void setAllAlphaRate__17dMenu_Fmap2DTop_cFfb(); -extern "C" void btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf(); -extern "C" void setMoyaAlpha__17dMenu_Fmap2DTop_cFUc(); -extern "C" void setTitleNameString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void setAreaNameString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void setZButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setBButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setAButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setCrossLRString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void set3DStickString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl(); -extern "C" void deleteExplain__17dMenu_Fmap2DTop_cFv(); -extern "C" void setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf(); -extern "C" void checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv(); -extern "C" void checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv(); -extern "C" void checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv(); -extern "C" void isWarpAccept__17dMenu_Fmap2DTop_cFv(); -extern "C" void dMw_UP_TRIGGER__Fv(); -extern "C" void dMw_DOWN_TRIGGER__Fv(); -extern "C" void dMw_LEFT_TRIGGER__Fv(); -extern "C" void dMw_RIGHT_TRIGGER__Fv(); -extern "C" void dMw_A_TRIGGER__Fv(); -extern "C" void dMw_B_TRIGGER__Fv(); -extern "C" void dMw_Z_TRIGGER__Fv(); -extern "C" void dMw_START_TRIGGER__Fv(); -extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv(); -extern "C" void setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc(); -extern "C" void dMeter2Info_set2DVibrationM__Fv(); -extern "C" void setTalkHeap__12dMsgObject_cFPv(); -extern "C" void getTalkHeap__12dMsgObject_cFv(); -extern "C" void setStatus__12dMsgObject_cFUs(); -extern "C" void getStatus__12dMsgObject_cFv(); -extern "C" void getMessageID__12dMsgObject_cFv(); -extern "C" void setPortalMessageID__12dMsgObject_cFUs(); -extern "C" void move__17dMsgScrnExplain_cFv(); -extern "C" void openExplain__17dMsgScrnExplain_cFUlUcUcUcb(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void getTotalFreeSize__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void __register_global_object(); -extern "C" void __destroy_arr(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_14(); -extern "C" void _savegpr_15(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_14(); -extern "C" void _restgpr_15(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803960E8 = ""; -SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat"; -SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat"; -SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc"; -SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat"; -SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat"; -SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs"; -SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti"; -SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti"; -SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104"; -SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111"; -SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803961AF = ""; -#pragma pop +#include "f_op/f_op_msg_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/menu/d_menu_fmap2D.h" +#include "d/menu/d_menu_fmap_map.h" +#include "d/menu/d_menu_window.h" +#include "d/meter/d_meter_HIO.h" +#include "d/meter/d_meter_map.h" +#include "d/meter/d_meter2_draw.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_scrn_explain.h" +#include "d/d_stage.h" +#include "d/a/d_a_player.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" /* 803BD090-803BD09C 01A1B0 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, }; -/* 803BD09C-803BD0A8 -00001 000C+00 0/1 0/0 0/0 .data @4019 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4019[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)all_map_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0A8-803BD0B4 -00001 000C+00 0/1 0/0 0/0 .data @4020 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4020[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo2_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0B4-803BD0C0 -00001 000C+00 0/1 0/0 0/0 .data @4021 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4021[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo3_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0C0-803BD0CC -00001 000C+00 0/1 0/0 0/0 .data @4022 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4022[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo1_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0CC-803BD0D8 -00001 000C+00 0/1 0/0 0/0 .data @4023 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4023[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_all_to_region_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0D8-803BD0E4 -00001 000C+00 0/1 0/0 0/0 .data @4024 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4024[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_region_to_all_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0E4-803BD0F0 -00001 000C+00 0/1 0/0 0/0 .data @4025 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4025[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)region_map_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0F0-803BD0FC -00001 000C+00 0/1 0/0 0/0 .data @4026 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4026[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)to_portal_warp_map_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD0FC-803BD108 -00001 000C+00 0/1 0/0 0/0 .data @4027 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4027[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_map_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD108-803BD114 -00001 000C+00 0/1 0/0 0/0 .data @4028 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4028[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_select_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD114-803BD120 -00001 000C+00 0/1 0/0 0/0 .data @4029 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4029[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_forbid_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD120-803BD12C -00001 000C+00 0/1 0/0 0/0 .data @4030 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4030[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_region_to_spot_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD12C-803BD138 -00001 000C+00 0/1 0/0 0/0 .data @4031 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4031[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_spot_to_region_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD138-803BD144 -00001 000C+00 0/1 0/0 0/0 .data @4032 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4032[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)spot_map_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD144-803BD150 -00001 000C+00 0/1 0/0 0/0 .data @4033 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4033[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo1_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD150-803BD15C -00001 000C+00 0/1 0/0 0/0 .data @4034 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4034[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo4_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD15C-803BD168 -00001 000C+00 0/1 0/0 0/0 .data @4035 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4035[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo5_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD168-803BD174 -00001 000C+00 0/1 0/0 0/0 .data @4036 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4036[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo6_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD174-803BD180 -00001 000C+00 0/1 0/0 0/0 .data @4037 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4037[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo1_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD180-803BD18C -00001 000C+00 0/1 0/0 0/0 .data @4038 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4038[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo2_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD18C-803BD198 -00001 000C+00 0/1 0/0 0/0 .data @4039 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4039[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo3_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD198-803BD1A4 -00001 000C+00 0/1 0/0 0/0 .data @4040 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4040[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo4_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1A4-803BD1B0 -00001 000C+00 0/1 0/0 0/0 .data @4041 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4041[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo5_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1B0-803BD1BC -00001 000C+00 0/1 0/0 0/0 .data @4042 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4042[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)light_demo1_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1BC-803BD1C8 -00001 000C+00 0/1 0/0 0/0 .data @4043 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4043[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)light_demo2_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1C8-803BD1D4 -00001 000C+00 0/1 0/0 0/0 .data @4044 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4044[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo2_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1D4-803BD1E0 -00001 000C+00 0/1 0/0 0/0 .data @4045 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4045[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo3_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1E0-803BD1EC -00001 000C+00 0/1 0/0 0/0 .data @4046 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4046[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo1_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1EC-803BD1F8 -00001 000C+00 0/1 0/0 0/0 .data @4047 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4047[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo2_init__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD1F8-803BD204 -00001 000C+00 0/1 0/0 0/0 .data @4048 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4048[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo3_init__12dMenu_Fmap_cFv, -}; -#pragma pop +/* 8042E82C-8042E840 05B54C 0014+00 2/2 0/0 0/0 .bss g_fmHIO */ +static dMf_HIO_c g_fmHIO; /* 803BD204-803BD36C 01A324 0168+00 2/3 0/0 0/0 .data init_process */ -SECTION_DATA static u8 init_process[360] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static dMenu_Fmap_c::process init_process[30] = { + &dMenu_Fmap_c::all_map_init, + &dMenu_Fmap_c::portal_demo2_init, + &dMenu_Fmap_c::portal_demo3_init, + &dMenu_Fmap_c::table_demo1_init, + &dMenu_Fmap_c::zoom_all_to_region_init, + &dMenu_Fmap_c::zoom_region_to_all_init, + &dMenu_Fmap_c::region_map_init, + &dMenu_Fmap_c::to_portal_warp_map_init, + &dMenu_Fmap_c::portal_warp_map_init, + &dMenu_Fmap_c::portal_warp_select_init, + &dMenu_Fmap_c::portal_warp_forbid_init, + &dMenu_Fmap_c::zoom_region_to_spot_init, + &dMenu_Fmap_c::zoom_spot_to_region_init, + &dMenu_Fmap_c::spot_map_init, + &dMenu_Fmap_c::portal_demo1_init, + &dMenu_Fmap_c::portal_demo4_init, + &dMenu_Fmap_c::portal_demo5_init, + &dMenu_Fmap_c::portal_demo6_init, + &dMenu_Fmap_c::yamiboss_demo1_init, + &dMenu_Fmap_c::yamiboss_demo2_init, + &dMenu_Fmap_c::yamiboss_demo3_init, + &dMenu_Fmap_c::yamiboss_demo4_init, + &dMenu_Fmap_c::yamiboss_demo5_init, + &dMenu_Fmap_c::light_demo1_init, + &dMenu_Fmap_c::light_demo2_init, + &dMenu_Fmap_c::table_demo2_init, + &dMenu_Fmap_c::table_demo3_init, + &dMenu_Fmap_c::howl_demo1_init, + &dMenu_Fmap_c::howl_demo2_init, + &dMenu_Fmap_c::howl_demo3_init, }; -/* 803BD36C-803BD378 -00001 000C+00 0/1 0/0 0/0 .data @4049 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4049[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)all_map_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD378-803BD384 -00001 000C+00 0/1 0/0 0/0 .data @4050 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4050[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo2_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD384-803BD390 -00001 000C+00 0/1 0/0 0/0 .data @4051 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4051[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo3_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD390-803BD39C -00001 000C+00 0/1 0/0 0/0 .data @4052 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4052[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo1_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD39C-803BD3A8 -00001 000C+00 0/1 0/0 0/0 .data @4053 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4053[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_all_to_region_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3A8-803BD3B4 -00001 000C+00 0/1 0/0 0/0 .data @4054 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4054[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_region_to_all_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3B4-803BD3C0 -00001 000C+00 0/1 0/0 0/0 .data @4055 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4055[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)region_map_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3C0-803BD3CC -00001 000C+00 0/1 0/0 0/0 .data @4056 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4056[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)to_portal_warp_map_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3CC-803BD3D8 -00001 000C+00 0/1 0/0 0/0 .data @4057 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4057[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_map_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3D8-803BD3E4 -00001 000C+00 0/1 0/0 0/0 .data @4058 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4058[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_select_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3E4-803BD3F0 -00001 000C+00 0/1 0/0 0/0 .data @4059 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4059[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_warp_forbid_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3F0-803BD3FC -00001 000C+00 0/1 0/0 0/0 .data @4060 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4060[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_region_to_spot_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD3FC-803BD408 -00001 000C+00 0/1 0/0 0/0 .data @4061 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4061[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)zoom_spot_to_region_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD408-803BD414 -00001 000C+00 0/1 0/0 0/0 .data @4062 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4062[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)spot_map_proc__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD414-803BD420 -00001 000C+00 0/1 0/0 0/0 .data @4063 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4063[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo1_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD420-803BD42C -00001 000C+00 0/1 0/0 0/0 .data @4064 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4064[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo4_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD42C-803BD438 -00001 000C+00 0/1 0/0 0/0 .data @4065 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4065[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo5_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD438-803BD444 -00001 000C+00 0/1 0/0 0/0 .data @4066 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4066[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portal_demo6_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD444-803BD450 -00001 000C+00 0/1 0/0 0/0 .data @4067 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4067[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo1_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD450-803BD45C -00001 000C+00 0/1 0/0 0/0 .data @4068 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4068[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo2_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD45C-803BD468 -00001 000C+00 0/1 0/0 0/0 .data @4069 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4069[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo3_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD468-803BD474 -00001 000C+00 0/1 0/0 0/0 .data @4070 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4070[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo4_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD474-803BD480 -00001 000C+00 0/1 0/0 0/0 .data @4071 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4071[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)yamiboss_demo5_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD480-803BD48C -00001 000C+00 0/1 0/0 0/0 .data @4072 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4072[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)light_demo1_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD48C-803BD498 -00001 000C+00 0/1 0/0 0/0 .data @4073 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4073[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)light_demo2_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD498-803BD4A4 -00001 000C+00 0/1 0/0 0/0 .data @4074 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4074[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo2_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD4A4-803BD4B0 -00001 000C+00 0/1 0/0 0/0 .data @4075 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4075[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)table_demo3_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD4B0-803BD4BC -00001 000C+00 0/1 0/0 0/0 .data @4076 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4076[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo1_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD4BC-803BD4C8 -00001 000C+00 0/1 0/0 0/0 .data @4077 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4077[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo2_move__12dMenu_Fmap_cFv, -}; -#pragma pop - -/* 803BD4C8-803BD4D4 -00001 000C+00 0/1 0/0 0/0 .data @4078 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4078[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)howl_demo3_move__12dMenu_Fmap_cFv, -}; -#pragma pop - /* 803BD4D4-803BD63C 01A5F4 0168+00 1/2 0/0 0/0 .data move_process */ -SECTION_DATA static u8 move_process[360] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803BD63C-803BD64C -00001 0010+00 1/1 0/0 0/0 .data stage_name$7304 */ -SECTION_DATA static void* stage_name_7304[4] = { - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0x87), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0x8F), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0x97), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0x9F), -}; - -/* 803BD64C-803BD664 -00001 0018+00 1/1 0/0 0/0 .data stage_name$7361 */ -SECTION_DATA static void* stage_name_7361[6] = { - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0xA7), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0xAF), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0xAF), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0x1E), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0xB7), - (void*)(((char*)&d_menu_d_menu_fmap__stringBase0) + 0xBF), -}; - -/* 803BD664-803BD670 01A784 000C+00 2/2 0/0 0/0 .data __vt__12dMenu_Fmap_c */ -SECTION_DATA extern void* __vt__12dMenu_Fmap_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dMenu_Fmap_cFv, -}; - -/* 803BD670-803BD680 01A790 000C+04 2/2 0/0 0/0 .data __vt__9dMf_HIO_c */ -SECTION_DATA extern void* __vt__9dMf_HIO_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dMf_HIO_cFv, - /* padding */ - NULL, +static dMenu_Fmap_c::process move_process[30] = { + &dMenu_Fmap_c::all_map_proc, + &dMenu_Fmap_c::portal_demo2_move, + &dMenu_Fmap_c::portal_demo3_move, + &dMenu_Fmap_c::table_demo1_move, + &dMenu_Fmap_c::zoom_all_to_region_proc, + &dMenu_Fmap_c::zoom_region_to_all_proc, + &dMenu_Fmap_c::region_map_proc, + &dMenu_Fmap_c::to_portal_warp_map_proc, + &dMenu_Fmap_c::portal_warp_map_proc, + &dMenu_Fmap_c::portal_warp_select_proc, + &dMenu_Fmap_c::portal_warp_forbid_proc, + &dMenu_Fmap_c::zoom_region_to_spot_proc, + &dMenu_Fmap_c::zoom_spot_to_region_proc, + &dMenu_Fmap_c::spot_map_proc, + &dMenu_Fmap_c::portal_demo1_move, + &dMenu_Fmap_c::portal_demo4_move, + &dMenu_Fmap_c::portal_demo5_move, + &dMenu_Fmap_c::portal_demo6_move, + &dMenu_Fmap_c::yamiboss_demo1_move, + &dMenu_Fmap_c::yamiboss_demo2_move, + &dMenu_Fmap_c::yamiboss_demo3_move, + &dMenu_Fmap_c::yamiboss_demo4_move, + &dMenu_Fmap_c::yamiboss_demo5_move, + &dMenu_Fmap_c::light_demo1_move, + &dMenu_Fmap_c::light_demo2_move, + &dMenu_Fmap_c::table_demo2_move, + &dMenu_Fmap_c::table_demo3_move, + &dMenu_Fmap_c::howl_demo1_move, + &dMenu_Fmap_c::howl_demo2_move, + &dMenu_Fmap_c::howl_demo3_move, }; /* 804510A0-804510A4 0005A0 0004+00 1/1 0/0 0/0 .sbss mMySelfPointer__9dMf_HIO_c */ -u8 dMf_HIO_c::mMySelfPointer[4]; - -/* 80454120-80454124 002720 0004+00 1/1 0/0 0/0 .sdata2 @3994 */ -SECTION_SDATA2 static f32 lit_3994 = 1.0f / 5.0f; - -/* 80454124-80454128 002724 0004+00 26/26 0/0 0/0 .sdata2 @3995 */ -SECTION_SDATA2 static f32 lit_3995 = 1.0f; +dMf_HIO_c* dMf_HIO_c::mMySelfPointer; /* 801C65F8-801C662C 1C0F38 0034+00 1/1 0/0 0/0 .text __ct__9dMf_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMf_HIO_c::dMf_HIO_c() { - nofralloc -#include "asm/d/menu/d_menu_fmap/__ct__9dMf_HIO_cFv.s" +dMf_HIO_c::dMf_HIO_c() { + mMySelfPointer = this; + mBackAnimeStep = 0.2f; + mBaseBackAlpha = 60; + mTopAnimeStep = 1.0f; + mMoyaAlpha = 95; } -#pragma pop - -/* ############################################################################################## */ -/* 804510A4-804510AC 0005A4 0008+00 1/1 0/0 0/0 .sbss virtual_stage$3999 */ -static u8 virtual_stage[8]; /* 801C662C-801C66E4 1C0F6C 00B8+00 5/5 2/2 0/0 .text dMenuFmap_getStartStageName__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm const char* dMenuFmap_getStartStageName(void* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/dMenuFmap_getStartStageName__FPv.s" +const char* dMenuFmap_getStartStageName(void* i_fieldData) { + static char virtual_stage[8]; + stage_stag_info_class* stag_info = dComIfGp_getStage()->getStagInfo(); + if (dStage_stagInfo_GetUpButton(stag_info) == 5) { + dMenu_Fmap_virtual_stage_data_c* data_list = (dMenu_Fmap_virtual_stage_data_c*) + ((int)i_fieldData + ((dMenu_Fmap_field_data_c*)i_fieldData)->mVirtualStageOffset); + dMenu_Fmap_virtual_stage_data_c::data* data = data_list->mData; + for (int i = 0; i < data_list->mCount; i++) { + if (!strcmp(dComIfGp_getStartStageName(), data[i].mStageName)) { + // !@bug: probably supposed to be data[i].mVirtualStageName, but doesn't matter + // because the two entries have the same virtual stage name + strcpy(virtual_stage, data->mVirtualStageName); + return virtual_stage; + } + } + } + return dComIfGp_getStartStageName(); } -#pragma pop -/* ############################################################################################## */ /* 804510AC-804510B0 0005AC 0004+00 2/2 0/0 0/0 .sbss MyClass__12dMenu_Fmap_c */ -u8 dMenu_Fmap_c::MyClass[4]; - -/* 80454128-8045412C 002728 0004+00 31/31 0/0 0/0 .sdata2 @4158 */ -SECTION_SDATA2 static u8 lit_4158[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045412C-80454130 00272C 0004+00 3/3 0/0 0/0 .sdata2 @4159 */ -SECTION_SDATA2 static f32 lit_4159 = -608.0f; - -/* 80454130-80454134 002730 0004+00 3/3 0/0 0/0 .sdata2 @4160 */ -SECTION_SDATA2 static f32 lit_4160 = 608.0f; - -/* 80454134-80454138 002734 0004+00 3/3 0/0 0/0 .sdata2 @4161 */ -SECTION_SDATA2 static f32 lit_4161 = -448.0f; - -/* 80454138-8045413C 002738 0004+00 3/3 0/0 0/0 .sdata2 @4162 */ -SECTION_SDATA2 static f32 lit_4162 = 448.0f; +dMenu_Fmap_c* dMenu_Fmap_c::MyClass; /* 801C66E4-801C6AC8 1C1024 03E4+00 0/0 1/1 0/0 .text * __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2, - u8 param_3, u8 param_4, u8 param_5, f32 param_6, f32 param_7, - u8 param_8) { - nofralloc -#include "asm/d/menu/d_menu_fmap/__ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc.s" +dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick, + u8 i_process, u8 i_regionCursor, u8 i_stageCursor, f32 i_stageTransX, + f32 i_stageTransZ, u8 i_panDirection) { + MyClass = this; + mpHeap = i_heap; + mpStick = i_stick; + mpCStick = i_cstick; + mPortalNo = -1; + mErrorSound = false; + mStartStageNo = -1; + mStageCursor = -1; + mRoomCursor = -1; + mFlashRooms = NULL; + mFlashRoomCount = 0; + field_0x310 = 0; + mResetAreaName = false; + mAreaNameSet = false; + mRegionNo = -1; + mStayStageNo = -1; + field_0x30b = false; + field_0x30f = 0; + mOldRegionCursor = i_regionCursor; + mOldStageCursor = i_stageCursor; + mOldStageTransX = i_stageTransX; + mOldStageTransZ = i_stageTransZ; + mpMountArchive = NULL; + mpResArchive = NULL; + mpDraw2DBack = NULL; + mpDraw2DTop = NULL; + mpMenuFmapMap = NULL; + mpFieldDat = NULL; + mSpotTextureFadeAlpha = 0.0f; + mpFmapMapRes = NULL; + mpPortalDat = NULL; + mpWorldData = NULL; + field_0xb4 = 0; + mDataNumMax = 0; + + for (int i = 0; i < 8; i++) { + mpRegionData[i] = NULL; + mpStageData[i] = NULL; + mpRoomData[i] = NULL; + } + + field_0x305 = false; + + for (int i = 0; i < 8; i++) { + field_0x168[i] = 0.0f; + field_0x188[i] = 0.0f; + field_0x128[i] = 0.0f; + field_0x148[i] = 0.0f; + } + + mpTalkHeap = JKRCreateExpHeap(0x32000, mpHeap, false); + field_0x200 = 0; + mIsWarpMap = false; + + mProcess = PROC_REGION_MAP; + strcpy(mMarkedStageName, ""); + if (g_fmapHIO.mpArchive != NULL && g_fmapHIO.mpArchive->isMounted()) { + mProcess = i_process; + mpMapArchive = g_fmapHIO.mpArchive; + } else { + mpMapArchive = dComIfGp_getFieldMapArchive2(); + } + mPrevProcess = mProcess; + mPrevProcessAlt = mProcess; + + if (dMeter2Info_getMapStatus() == 4) { + mIsWarpMap = false; + mProcess = PROC_PORTAL_DEMO1; + } else if (dMeter2Info_getMapStatus() == 5) { + mIsWarpMap = false; + mProcess = PROC_YAMIBOSS_DEMO1; + } else if (dMeter2Info_getMapStatus() == 8) { + mIsWarpMap = false; + mProcess = PROC_LIGHT_DEMO1; + } else if (dMeter2Info_getMapStatus() == 3) { + mIsWarpMap = true; + mProcess = PROC_ALL_MAP; + } else if (dMeter2Info_getMapStatus() == 7) { + i_panDirection = 0xff; + mIsWarpMap = false; + mProcess = PROC_TABLE_DEMO1; + } else if (dMeter2Info_getMapStatus() == 9) { + mIsWarpMap = false; + mProcess = PROC_HOWL_DEMO1; + } + + if (i_panDirection == 1) { + mTransX = -608.0f; + mTransY = 0.0f; + } else if (i_panDirection == 3) { + mTransX = 608.0f; + mTransY = 0.0f; + } else if (i_panDirection == 2) { + mTransX = 0.0f; + mTransY = -448.0f; + } else if (i_panDirection == 0) { + mTransX = 0.0f; + mTransY = 448.0f; + } else { + mTransX = 0.0f; + mTransY = 0.0f; + } + + mAlphaRatio = 0.0f; + mPanDirection = i_panDirection; + field_0x210 = 0; + mDisplayFrame = 0; + mZoomLevel = 0; + + for (int i = 0; i < 8; i++) { + mRegionOffsetX[i] = 0.0f; + mRegionOffsetZ[i] = 0.0f; + mRegionTexture[i] = NULL; + mTitleName[i] = 0; + } + + for (int i = 0; i < 20; i++) { + mAreaName[i] = 0; + } + + field_0x1ec = 0.0f; + mSpotNum = 0; + mAllTitleName = 0; + + resetRoomDataBit(); } -#pragma pop /* 801C6AC8-801C6D64 1C1408 029C+00 1/0 0/0 0/0 .text __dt__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dMenu_Fmap_c::~dMenu_Fmap_c() { -extern "C" asm void __dt__12dMenu_Fmap_cFv() { - nofralloc -#include "asm/d/menu/d_menu_fmap/__dt__12dMenu_Fmap_cFv.s" +dMenu_Fmap_c::~dMenu_Fmap_c() { + mpHeap->getTotalFreeSize(); + if (mpFieldDat != NULL) { + mpHeap->free(mpFieldDat); + mpFieldDat = NULL; + } + if (mpPortalDat != NULL) { + mpHeap->free(mpPortalDat); + mpPortalDat = NULL; + } + + for (int i = 0; i < 8; i++) { + if (i == 7) { + if (mRegionTexture[i] != NULL) { + mpResArchive->removeResource(mRegionTexture[i]); + } + mRegionTexture[i] = NULL; + } else { + if (mRegionTexture[i] != NULL) { + mpMapArchive->removeResource(mRegionTexture[i]); + mRegionTexture[i] = NULL; + mRegionTexture[i] = NULL; + } + } + } + + removeAreaData(); + + if (mpDraw2DBack != NULL) { + delete mpDraw2DBack; + mpDraw2DBack = NULL; + } + if (mpDraw2DTop != NULL) { + delete mpDraw2DTop; + mpDraw2DTop = NULL; + } + if (mpMenuFmapMap != NULL) { + mpMenuFmapMap->_delete(); + delete mpMenuFmapMap; + mpMenuFmapMap = NULL; + } + + dComIfGp_getFmapResArchive()->removeResourceAll(); + if (mpMapArchive != NULL) { + mpMapArchive->removeResourceAll(); + } + + MyClass = NULL; + + if (mpTalkHeap != NULL) { + if (dMsgObject_getTalkHeap() == mpTalkHeap) { + dMsgObject_setTalkHeap(NULL); + } + mDoExt_destroyExpHeap(mpTalkHeap); + mpTalkHeap = NULL; + } + + if (mpMountArchive != NULL) { + JKRUnmountArchive(mpMountArchive->getArchive()); + mpMountArchive->destroy(); + mpMountArchive = NULL; + } + + if (mpResArchive != NULL) { + JKRUnmountArchive(mpResArchive); + mpResArchive = NULL; + } } -#pragma pop - -/* ############################################################################################## */ -/* 8045413C-80454140 00273C 0004+00 12/12 0/0 0/0 .sdata2 @4353 */ -SECTION_SDATA2 static f32 lit_4353 = 10.0f; - -/* 80454140-80454148 002740 0008+00 16/16 0/0 0/0 .sdata2 @4358 */ -SECTION_SDATA2 static f64 lit_4358 = 4503601774854144.0 /* cast s32 to float */; /* 801C6D64-801C74A4 1C16A4 0740+00 1/1 0/0 0/0 .text _create__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_fmap/_create__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::_create() { + mpHeap->getTotalFreeSize(); + mpDraw2DBack = new dMenu_Fmap2DBack_c(); + mpDraw2DBack->setRegionCursor(dComIfGp_getNowLevel() - 1); + mpDraw2DTop = new dMenu_Fmap2DTop_c(mpHeap, mpStick); + mpMenuFmapMap = new dMenu_FmapMap_c(); + mpMenuFmapMap->_create(dMeter2Info_get2DWidth(), dMeter2Info_get2DHeight(), + dMeter2Info_get2DWidth(), dMeter2Info_get2DHeight(), mpFmapMapRes); + + readFieldMapData((void**)&mpFieldDat, "dat/field.dat", false, false); + decodeFieldMapData(); + readFieldMapData((void**)&mpPortalDat, "dat/portal.dat", false, false); + decodePortalData(); + mpDraw2DTop->setPortalBin(mpPortalDat); + + mpWorldData = NULL; + for (int i = 0; i < 8; i++) { + mpRegionData[i] = NULL; + mpStageData[i] = NULL; + mpRoomData[i] = NULL; + } + + field_0x305 = false; + + for (int i = 0; i < 8; i++) { + field_0x168[i] = 0.0f; + field_0x188[i] = 0.0f; + field_0x128[i] = 0.0f; + field_0x148[i] = 0.0f; + } + + if (mIsWarpMap == true) { + mZoomLevel = 0; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_LEFTRIGHT, 0.0f); + mpDraw2DTop->setCrossLRString(0); + } else { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_LEFTRIGHT, 1.0f); + mpDraw2DTop->setCrossLRString(0x3f9); + } + mpDraw2DBack->setArrowAlpha(1.0f); + + u8 process = mProcess; + if (process == PROC_REGION_MAP || process == PROC_PORTAL_WARP_MAP + || process == PROC_PORTAL_DEMO1 || process == PROC_YAMIBOSS_DEMO1 + || process == PROC_LIGHT_DEMO1 || process == PROC_HOWL_DEMO1) + { + if (g_fmapHIO.field_0x2f9) { + mpDraw2DBack->setRegionCursor(mOldRegionCursor); + } + + process = mProcess; + if (process == PROC_HOWL_DEMO1) { + mProcess = PROC_ZOOM_REGION_TO_ALL; + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + mZoomLevel = 0; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + mProcess = process; + getPlayerPos2D(); + mpDraw2DBack->regionMapMove(mpStick); + drawIcon(field_0x1ec, true); + mpDraw2DBack->setRegionCursor(getHowlRegionID() - 1); + } + + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + mZoomLevel = 10; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + + if (mIsWarpMap == true) { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x526); + } else { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UPDOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x528); + mpDraw2DBack->iconScale(0, 1.0f, 1.0f, 0.0f); + if (mProcess != PROC_YAMIBOSS_DEMO1) { + arrowPosInit(); + } else { + yamibossArrowPosInit(); + } + } + } else if (process == PROC_SPOT_MAP) { + if (g_fmapHIO.field_0x2f9) { + mpDraw2DBack->setRegionCursor(mOldRegionCursor); + } + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + mZoomLevel = 10; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + if (g_fmapHIO.field_0x2f9) { + mpDraw2DBack->setSpotCursor(mOldStageCursor); + } + mpDraw2DBack->zoomMapCalc2((f32)mZoomLevel / 10.0f); + mpDraw2DBack->setStageTransForceXZ(mOldStageTransX, mOldStageTransZ); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x528); + mpDraw2DBack->iconScale(0, 0.0f, 0.0f, 1.0f); + arrowPosInit(); + } else { + mProcess = PROC_ZOOM_REGION_TO_ALL; + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + mZoomLevel = 0; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + mProcess = process; + getPlayerPos2D(); + mpDraw2DBack->regionMapMove(mpStick); + drawIcon(field_0x1ec, true); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x524); + mpDraw2DBack->iconScale(0, 1.0f, 1.0f, 0.0f); + arrowPosInit(); + } + + if (mProcess == PROC_PORTAL_DEMO1 || mProcess == PROC_YAMIBOSS_DEMO1 + || mProcess == PROC_TABLE_DEMO1 || mProcess == PROC_LIGHT_DEMO1 + || mProcess == PROC_HOWL_DEMO1) + { + mpDraw2DBack->offArrowDrawFlag(); + } + + (this->*init_process[mProcess])(); + + if (mProcess != PROC_HOWL_DEMO1) { + getPlayerPos2D(); + } + + g_fmapHIO.field_0x2f9 = false; } -#pragma pop /* 801C74A4-801C74A8 1C1DE4 0004+00 0/0 1/1 0/0 .text _delete__12dMenu_Fmap_cFv */ void dMenu_Fmap_c::_delete() { /* empty function */ } -/* ############################################################################################## */ -/* 8042E820-8042E82C 05B540 000C+00 1/1 0/0 0/0 .bss @3989 */ -static u8 lit_3989[12]; - -/* 8042E82C-8042E840 05B54C 0014+00 2/2 0/0 0/0 .bss g_fmHIO */ -static u8 g_fmHIO[20]; - -/* 80454148-8045414C 002748 0004+00 1/1 0/0 0/0 .sdata2 @4397 */ -SECTION_SDATA2 static f32 lit_4397 = 2.0f / 5.0f; - -/* 8045414C-80454150 00274C 0004+00 2/2 0/0 0/0 .sdata2 @4398 */ -SECTION_SDATA2 static f32 lit_4398 = 0.5f; - -/* 80454150-80454154 002750 0004+00 1/1 0/0 0/0 .sdata2 @4399 */ -SECTION_SDATA2 static f32 lit_4399 = 1.0f / 10.0f; - /* 801C74A8-801C7650 1C1DE8 01A8+00 0/0 1/1 0/0 .text _move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::_move() { + u8 process = mProcess; + field_0x310 = 0; + mpDraw2DBack->clearIconInfo(); + + (this->*move_process[mProcess])(); + + mpDraw2DTop->_execute(); + mpDraw2DBack->setBaseBackAlpha(g_fmHIO.mBaseBackAlpha); + mpDraw2DBack->btkAnimeLoop(g_fmHIO.mBackAnimeStep); + mpDraw2DTop->setMoyaAlpha(g_fmHIO.mMoyaAlpha); + mpDraw2DTop->btkAnimeLoop(g_fmHIO.mTopAnimeStep); + + if (mProcess != process) { + (this->*init_process[mProcess])(); + } + + if (mProcess == PROC_PORTAL_WARP_FORBID) { + mpDraw2DBack->calcBackAlpha(true); + } else { + mpDraw2DBack->calcBackAlpha(false); + } + + mpDraw2DBack->setAllTrans(mTransX, mTransY); + mpDraw2DTop->setAllTrans(mTransX, mTransY); + + if (g_fmapHIO.mRangeCheck) { + drawDebugStage(); + } + + if (mSpotTextureFadeAlpha != 1.0f) { + cLib_addCalc2(&mSpotTextureFadeAlpha, 1.0f, 0.4f, 0.5f); + if (fabsf(mSpotTextureFadeAlpha - 1.0f) < 0.1f) { + mSpotTextureFadeAlpha = 1.0f; + } + mpDraw2DBack->setSpotTextureFadeAlpha(mSpotTextureFadeAlpha); + } } -#pragma pop /* 801C7650-801C77F0 1C1F90 01A0+00 0/0 1/1 0/0 .text _draw__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::_draw() { - nofralloc -#include "asm/d/menu/d_menu_fmap/_draw__12dMenu_Fmap_cFv.s" -} -#pragma pop +void dMenu_Fmap_c::_draw() { + if (mpDraw2DBack != NULL && mpDraw2DTop != NULL) { + if (field_0x305) { + mpMenuFmapMap->setRendering(mpWorldData, mStartStageNo, + mpDraw2DBack->getRenderingPosX(), + mpDraw2DBack->getRenderingPosZ(), + mpDraw2DBack->getRenderingScale(), + mpDraw2DBack->getMapZoomRate()); + mpDraw2DBack->setStageInfo(mSpotNum, mpMenuFmapMap); + drawIcon(field_0x1ec, false); + if (mProcess == PROC_ZOOM_REGION_TO_SPOT || mProcess == PROC_ZOOM_SPOT_TO_REGION + || mProcess == PROC_YAMIBOSS_DEMO4 || mProcess == PROC_LIGHT_DEMO1 + || mProcess == PROC_TABLE_DEMO2 || mProcess == PROC_HOWL_DEMO1) + { + f32 scale = 1.0f - field_0x1ec; + mpDraw2DBack->iconScale(0, scale, scale, 1.0f - scale); + } + } else { + drawPortalIcon(); + if (mProcess == PROC_ZOOM_ALL_TO_REGION || mProcess == PROC_ZOOM_REGION_TO_ALL) { + f32 scale = 1.0f - (f32)mZoomLevel / 10.0f; + mpDraw2DBack->iconScale(0, scale, scale, 1.0f - scale); + } + } -/* ############################################################################################## */ -/* 80454154-80454158 002754 0004+00 19/19 0/0 0/0 .sdata2 @4541 */ -SECTION_SDATA2 static f32 lit_4541 = -1.0f; + mpDraw2DBack->setMapDrawFlag(mpMenuFmapMap->isDrawEnable()); + dComIfGd_set2DOpa(mpDraw2DBack); + dComIfGd_set2DOpaTop(mpDraw2DTop); + } +} /* 801C77F0-801C7AFC 1C2130 030C+00 0/0 1/1 0/0 .text getNextStatus__12dMenu_Fmap_cFPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Fmap_c::getNextStatus(u8* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/getNextStatus__12dMenu_Fmap_cFPUc.s" +u8 dMenu_Fmap_c::getNextStatus(u8* param_0) { + u8 ret = 8; + *param_0 = 0; + + if (mProcess == PROC_ALL_MAP && dMw_B_TRIGGER()) { + if (mPanDirection == 3) { + mPanDirection = 1; + dMeter2Info_setMapStatus(0); + dMeter2Info_setMapKeyDirection(0x400); + } else { + mPanDirection = 3; + if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { + dMeter2Info_setMapStatus(1); + } else { + dMeter2Info_setMapStatus(0); + } + dMeter2Info_setMapKeyDirection(0x200); + } + + ret = 9; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibrationM(); + } + + if (mProcess == PROC_PORTAL_WARP_MAP && dMeter2Info_getWarpStatus() == 3) { + if (mPanDirection == 3) { + mPanDirection = 1; + dMeter2Info_setMapStatus(0); + dMeter2Info_setMapKeyDirection(0x400); + } else { + mPanDirection = 3; + if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { + dMeter2Info_setMapStatus(1); + } else { + dMeter2Info_setMapStatus(0); + } + dMeter2Info_setMapKeyDirection(0x200); + } + + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibrationM(); + return 9; + } else if ((mProcess == PROC_ALL_MAP || mProcess == PROC_REGION_MAP + || mProcess == PROC_PORTAL_WARP_MAP || mProcess == PROC_SPOT_MAP) && isSync()) { + if (dMw_LEFT_TRIGGER()) { + if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { + dMeter2Info_setMapStatus(1); + } else { + dMeter2Info_setMapStatus(0); + } + mPanDirection = 3; + dMeter2Info_setMapKeyDirection(0x200); + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibrationM(); + return 9; + } else if (dMw_RIGHT_TRIGGER()) { + dMeter2Info_setMapStatus(0); + mPanDirection = 1; + dMeter2Info_setMapKeyDirection(0x400); + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibrationM(); + return 9; + } + } + + return ret; } -#pragma pop /* 801C7AFC-801C7B24 1C243C 0028+00 1/1 1/1 0/0 .text isSync__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Fmap_c::isSync() { - nofralloc -#include "asm/d/menu/d_menu_fmap/isSync__12dMenu_Fmap_cFv.s" +bool dMenu_Fmap_c::isSync() { + if (mpMountArchive != NULL && !mpMountArchive->sync()) { + return false; + } + return true; } -#pragma pop /* 801C7B24-801C7C2C 1C2464 0108+00 1/0 0/0 0/0 .text all_map_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::all_map_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/all_map_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::all_map_init() { + if (mIsWarpMap == true) { + setTitleName(0x525); + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } else { + setTitleName(mAllTitleName); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } + + mResetAreaName = true; + + if (!mAreaNameSet) { + setAreaNameZero(); + } else { + setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]); + } + + mRegionNo = mpDraw2DBack->getRegionCursor(); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x3f9, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x524); + mpDraw2DTop->setCrossLRString(0x3f9); } -#pragma pop /* 801C7C2C-801C8230 1C256C 0604+00 1/0 0/0 0/0 .text all_map_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::all_map_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/all_map_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::all_map_proc() { + mpStick->checkTrigger(); + + u8 region = mpDraw2DBack->getSelectRegion(); + bool region_change = false; + if (mRegionNo != region) { + mRegionNo = region; + region_change = true; + } + + if (region != 0xff && mpDraw2DBack->isShowRegion(region)) { + if (getRegionStageNum(region + 1) == 0) { + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } else { + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } + if (region_change) { + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_AREA_SELECT, NULL, 0, 0, + 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } + + if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + if (region == 0xff || !mpDraw2DBack->isShowRegion(region)) { + if (!mErrorSound) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + mErrorSound = true; + } + } else { + mpDraw2DBack->setRegionCursor(region); + if (getRegionStageNum(mpDraw2DBack->getRegionCursor() + 1) == 0) { + if (!mErrorSound) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, + 1.0f, 1.0f, -1.0f, -1.0f, 0); + mErrorSound = true; + } + } else { + mpDraw2DBack->calcDrawPriority(); + setProcess(PROC_ZOOM_ALL_TO_REGION); + if (mErrorSound == true) { + mErrorSound = false; + } + } + } + } else if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + if (mErrorSound == true) { + mErrorSound = false; + } + } else if (dMw_Z_TRIGGER() && mpDraw2DTop->isWarpAccept()) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x109]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x169])) + { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x8b4, 0, 0, 0xff, true); + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (mpDraw2DTop->checkPlayerWarpAccept()) { + if (mIsWarpMap == true) { + mIsWarpMap = false; + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_OFF, NULL, 0, 0, + 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + mIsWarpMap = true; + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x68]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0xfa])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x85d, 0, 0, 0xff, true); + } else if (!mpDraw2DTop->checkWarpAcceptCannon()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7de, 0, 0, 0xff, true); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x313]); + } else if (!mpDraw2DTop->checkWarpAcceptRegion4()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7dd, 0, 0, 0xff, true); + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51d, 0, 0, 0xff, true); + } + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + u8 region1 = mpDraw2DBack->getSelectRegion(); + mpDraw2DBack->allmap_move2(mpStick); + u8 region2 = mpDraw2DBack->getSelectRegion(); + if (region1 != region2 || mResetAreaName) { + mResetAreaName = false; + if (mpDraw2DBack->getSelectRegion() != 0xff + && mpDraw2DBack->isShowRegion(mpDraw2DBack->getSelectRegion())) + { + setAreaName(mTitleName[mpDraw2DBack->getSelectRegion()]); + mpDraw2DBack->setSpotCursor(0); + + } else { + setAreaNameZero(); + } + } + if (mErrorSound == true) { + mErrorSound = false; + } + } } -#pragma pop /* 801C8230-801C8308 1C2B70 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_all_to_region_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_all_to_region_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_all_to_region_init() { + if (!readWorldData(mpDraw2DBack->getRegionCursor() + 1)) { + setProcess(PROC_ALL_MAP); + if (!mErrorSound) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + mErrorSound = true; + } + } else { + mZoomLevel = 0; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } } -#pragma pop /* 801C8308-801C83E0 1C2C48 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_all_to_region_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_all_to_region_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_all_to_region_proc() { + mZoomLevel++; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + + if (mIsWarpMap == true) { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + } else { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + } + + if (mZoomLevel >= 10) { + if (mIsWarpMap == true) { + setProcess(PROC_PORTAL_WARP_MAP); + } else { + setProcess(PROC_REGION_MAP); + } + } } -#pragma pop /* 801C83E0-801C8438 1C2D20 0058+00 1/0 0/0 0/0 .text zoom_region_to_all_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_region_to_all_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_region_to_all_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_region_to_all_init() { + mZoomLevel = 10; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop /* 801C8438-801C8518 1C2D78 00E0+00 1/0 0/0 0/0 .text zoom_region_to_all_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_region_to_all_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_region_to_all_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_region_to_all_proc() { + mZoomLevel--; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + + if (mIsWarpMap == true) { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + } else { + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + } + + if (mZoomLevel <= 0) { + if (mpDraw2DBack->getAllPathShowFlag()) { + removeAreaData(); + readWorldData(0xff); + } + setProcess(PROC_ALL_MAP); + } } -#pragma pop /* 801C8518-801C8600 1C2E58 00E8+00 1/0 0/0 0/0 .text region_map_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::region_map_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/region_map_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::region_map_init() { + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + mResetAreaName = true; + + if (!mAreaNameSet) { + setAreaNameZero(); + } else { + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + } + + mStageCursor = mpDraw2DBack->getSpotCursor(); + mRoomCursor = -1; + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UPDOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x528); + mpDraw2DTop->setCrossLRString(0x3f9); } -#pragma pop - -/* ############################################################################################## */ -/* 80454158-8045415C 002758 0004+00 2/2 0/0 0/0 .sdata2 @4939 */ -SECTION_SDATA2 static f32 lit_4939 = 304.0f; - -/* 8045415C-80454160 00275C 0004+00 2/2 0/0 0/0 .sdata2 @4940 */ -SECTION_SDATA2 static f32 lit_4940 = 224.0f; /* 801C8600-801C8B00 1C2F40 0500+00 1/0 0/0 0/0 .text region_map_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::region_map_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/region_map_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::region_map_proc() { + bool r29 = false; + mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + r29 = true; + + if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + setProcess(PROC_ZOOM_REGION_TO_ALL); + mpMenuFmapMap->setFlashOff(); + } else if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + if (r29) { + setProcess(PROC_ZOOM_REGION_TO_SPOT); + } else if (!mErrorSound) { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + mErrorSound = true; + } + } else if (dMw_Z_TRIGGER() && mpDraw2DTop->isWarpAccept()) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x109]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x169])) + { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x8b4, 0, 0, 0xff, true); + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (mpDraw2DTop->checkPlayerWarpAccept()) { + mIsWarpMap = true; + setProcess(PROC_TO_PORTAL_WARP_MAP); + mpMenuFmapMap->setFlashOff(); + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x68]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0xfa])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x85d, 0, 0, 0xff, true); + } else if (!mpDraw2DTop->checkWarpAcceptCannon()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7de, 0, 0, 0xff, true); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x313]); + } else if (!mpDraw2DTop->checkWarpAcceptRegion4()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7dd, 0, 0, 0xff, true); + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51d, 0, 0, 0xff, true); + } + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + if (g_fmapHIO.mDisplayReferenceArea) { + mpDraw2DBack->zoomMapCalc(1.0f); + } + mpDraw2DBack->regionMapMove(mpStick); + int stage_no, room_no; + f32 pos_x = mpDraw2DBack->getArrowPos2DX() - mDoGph_gInf_c::getMinXF() + - mDoGph_gInf_c::getWidthF() * 0.5f; + f32 pos_y = mpDraw2DBack->getArrowPos2DY() - mDoGph_gInf_c::getHeightF() * 0.5f; + mpMenuFmapMap->getPointStagePathInnerNo(getNowFmapRegionData(), pos_x, pos_y, + mStayStageNo, &stage_no, &room_no); + if (mStageCursor != stage_no || mRoomCursor != room_no || mResetAreaName) { + mStageCursor = stage_no; + mRoomCursor = room_no; + u16 area_name = checkStRoomData(); + if (mStageCursor >= 0) { + mpDraw2DBack->setSpotCursor(mStageCursor); + if (area_name != 0xffff) { + setAreaName(area_name); + } else { + setAreaName(mAreaName[mStageCursor]); + } + } else { + setAreaNameZero(); + } + } + if (mErrorSound == true) { + mErrorSound = false; + } + } + + if (mStageCursor >= 0) { + setFlash(mStageCursor, true); + } else { + mpMenuFmapMap->setFlashOff(); + } } -#pragma pop /* 801C8B00-801C8B0C 1C3440 000C+00 1/0 0/0 0/0 .text to_portal_warp_map_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::to_portal_warp_map_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/to_portal_warp_map_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::to_portal_warp_map_init() { + mZoomLevel = 10; } -#pragma pop /* 801C8B0C-801C8B48 1C344C 003C+00 1/0 0/0 0/0 .text to_portal_warp_map_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::to_portal_warp_map_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/to_portal_warp_map_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::to_portal_warp_map_proc() { + mZoomLevel--; + if (mZoomLevel <= 0) { + setProcess(PROC_PORTAL_WARP_MAP); + } } -#pragma pop /* 801C8B48-801C8C0C 1C3488 00C4+00 1/0 0/0 0/0 .text portal_warp_map_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_warp_map_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_warp_map_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_warp_map_init() { + if (mPrevProcess != PROC_PORTAL_WARP_SELECT) { + mPortalNo = 0xff; + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + if (mPortalNo == 0xff) { + setAreaNameZero(); + } + } + + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x526); } -#pragma pop /* 801C8C0C-801C90A4 1C354C 0498+00 1/0 0/0 0/0 .text portal_warp_map_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_warp_map_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_warp_map_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_warp_map_proc() { + mpStick->checkTrigger(); + + if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + setProcess(PROC_ZOOM_REGION_TO_ALL); + if (mErrorSound == true) { + mErrorSound = false; + } + } else if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + if (mPortalNo != 0xff) { + dMenu_Fmap_portal_data_c::data* portals = mpPortalDat->mData; + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + dMsgObject_setPortalMessageID(portals[mPortalNo].mMessageID); + + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x68]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0xfa])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x85d, 0, 0, 0xff, true); + } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x312]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x311])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7de, 0, 0, 0xff, true); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x313]); + } else if (mPortalNo == 6) { + if ((!strcmp(dComIfGp_getStartStageName(), "F_SP124") + && ((daMidna_c*)daPy_py_c::getMidnaActor())->checkPortalObjRide()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x7d])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51e, 2, 0, 0xff, true); + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x53a, 0, 0, 0xff, true); + } + } else if (mPortalNo == 3) { + if ((dMeter2Info_getMapStatus() == 3 + && i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 2 + && dComIfGs_isOneZoneSwitch(0xf, -1)) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x33])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51e, 2, 0, 0xff, true); + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x53b, 0, 0, 0xff, true); + } + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51e, 2, 0, 0xff, true); + } + + setProcess(PROC_PORTAL_WARP_SELECT); + if (mErrorSound == true) { + mErrorSound = false; + } + Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else if (dMw_Z_TRIGGER()) { + mIsWarpMap = false; + setProcess(PROC_REGION_MAP); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_OFF, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + portalWarpMapMove(mpStick); + if (mErrorSound == true) { + mErrorSound = false; + } + } + + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801C90A4-801C90A8 1C39E4 0004+00 1/0 0/0 0/0 .text portal_warp_select_init__12dMenu_Fmap_cFv */ void dMenu_Fmap_c::portal_warp_select_init() { @@ -1477,208 +1066,372 @@ void dMenu_Fmap_c::portal_warp_select_init() { } /* 801C90A8-801C91D8 1C39E8 0130+00 1/0 0/0 0/0 .text portal_warp_select_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_warp_select_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_warp_select_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_warp_select_proc() { + mpDraw2DTop->getScrnExplainPtr()->move(); + + if (mpDraw2DTop->getScrnExplainPtr()->getStatus() == 0) { + mpDraw2DTop->deleteExplain(); + + if (dMeter2Info_getWarpStatus() == 3) { + dMenu_Fmap_portal_data_c::data* portals = mpPortalDat->mData; + u8 region = mpDraw2DBack->getRegionCursor(); + + dMeter2Info_setWarpInfo(portals[mPortalNo].mStageName, + cXyz(portals[mPortalNo].mPosition.x + mpDraw2DBack->getRegionOriginX(region), + portals[mPortalNo].mPosition.y, + portals[mPortalNo].mPosition.z + mpDraw2DBack->getRegionOriginZ(region)), + 0, portals[mPortalNo].mRoomNo, 0, portals[mPortalNo].mWarpPlayerNo); + + dComIfGp_SelectWarpPt_set(portals[mPortalNo].mSelectWarpPt); + setProcess(PROC_PORTAL_WARP_MAP); + } else if (mPrevProcess == PROC_PORTAL_DEMO5) { + setProcess(PROC_PORTAL_DEMO5); + } else { + setProcess(PROC_PORTAL_WARP_MAP); + } + } + + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801C91D8-801C9238 1C3B18 0060+00 1/0 0/0 0/0 .text portal_warp_forbid_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_warp_forbid_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_warp_forbid_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_warp_forbid_init() { + mpDraw2DTop->setBButtonString(0x3f9, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0); + mpDraw2DTop->setCrossLRString(0); } -#pragma pop /* 801C9238-801C92A4 1C3B78 006C+00 1/0 0/0 0/0 .text portal_warp_forbid_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_warp_forbid_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_warp_forbid_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_warp_forbid_proc() { + mpDraw2DTop->getScrnExplainPtr()->move(); + if (mpDraw2DTop->getScrnExplainPtr()->getStatus() == 0) { + mpDraw2DTop->deleteExplain(); + setProcess(mPrevProcessAlt); + } + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801C92A4-801C9304 1C3BE4 0060+00 1/0 0/0 0/0 .text zoom_region_to_spot_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_region_to_spot_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_region_to_spot_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_region_to_spot_init() { + mZoomLevel = 0; + field_0x1ec = 0.0f; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop /* 801C9304-801C93CC 1C3C44 00C8+00 1/0 0/0 0/0 .text zoom_region_to_spot_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_region_to_spot_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_region_to_spot_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_region_to_spot_proc() { + mZoomLevel++; + field_0x1ec = (f32)mZoomLevel / 10.0f; + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + + if (mZoomLevel >= 10) { + setProcess(PROC_SPOT_MAP); + } + + if (mStageCursor >= 0) { + setFlash(mStageCursor, true); + } else { + mpMenuFmapMap->setFlashOff(); + } } -#pragma pop /* 801C93CC-801C9428 1C3D0C 005C+00 1/0 0/0 0/0 .text zoom_spot_to_region_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_spot_to_region_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_spot_to_region_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_spot_to_region_init() { + mZoomLevel = 10; + field_0x1ec = 1.0f; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop /* 801C9428-801C950C 1C3D68 00E4+00 1/0 0/0 0/0 .text zoom_spot_to_region_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::zoom_spot_to_region_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/zoom_spot_to_region_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::zoom_spot_to_region_proc() { + mZoomLevel--; + field_0x1ec = (f32)mZoomLevel / 10.0f; + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + + if (mZoomLevel <= 0) { + if (mIsWarpMap == true) { + setProcess(PROC_PORTAL_WARP_MAP); + } else { + setProcess(PROC_REGION_MAP); + } + } + + if (mStageCursor >= 0) { + setFlash(mStageCursor, true); + } else { + mpMenuFmapMap->setFlashOff(); + } } -#pragma pop /* 801C950C-801C9618 1C3E4C 010C+00 1/0 0/0 0/0 .text spot_map_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::spot_map_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/spot_map_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::spot_map_init() { + field_0x1ec = 1.0f; + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + mResetAreaName = true; + + if (!mAreaNameSet) { + setAreaNameZero(); + } else { + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + } + + mStageCursor = mpDraw2DBack->getSpotCursor(); + mRoomCursor = -1; + + mpDraw2DBack->resetDrug(); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0x522, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0x529, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0x528); + mpDraw2DTop->setCrossLRString(0x3f9); } -#pragma pop /* 801C9618-801C9A4C 1C3F58 0434+00 1/0 0/0 0/0 .text spot_map_proc__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::spot_map_proc() { - nofralloc -#include "asm/d/menu/d_menu_fmap/spot_map_proc__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::spot_map_proc() { + if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + setProcess(PROC_ZOOM_SPOT_TO_REGION); + if (mErrorSound == true) { + mErrorSound = false; + } + } else if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc) + && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1) + { + mpDraw2DBack->stageMapMove(mpStick, 1, true); + } else if (dMw_Z_TRIGGER() && mpDraw2DTop->isWarpAccept()) { + if (mpDraw2DTop->checkPlayerWarpAccept()) { + mIsWarpMap = true; + setProcess(PROC_ZOOM_SPOT_TO_REGION); + mpDraw2DTop->setZButtonString(0x52a, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x68]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0xfa])) + { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x85d, 0, 0, 0xff, true); + } else if (!mpDraw2DTop->checkWarpAcceptCannon()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7de, 0, 0, 0xff, true); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x313]); + } else if (!mpDraw2DTop->checkWarpAcceptRegion4()) { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x7dd, 0, 0, 0xff, true); + } else { + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51d, 0, 0, 0xff, true); + } + + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + if (g_fmapHIO.mDisplayReferenceArea) { + mpDraw2DBack->zoomMapCalc(1.0f); + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + } + + mpDraw2DBack->stageMapMove(mpStick, 1, true); + + int stage_no, room_no; + f32 pos_x = mpDraw2DBack->getMapAreaGlobalCenterPosX() - mDoGph_gInf_c::getMinXF() + - mDoGph_gInf_c::getWidthF() * 0.5f; + f32 pos_y = mpDraw2DBack->getMapAreaGlobalCenterPosY() - mDoGph_gInf_c::getHeightF() * 0.5f; + mpMenuFmapMap->getPointStagePathInnerNo(getNowFmapRegionData(), pos_x, pos_y, + mStayStageNo, &stage_no, &room_no); + + if (mStageCursor != stage_no || mResetAreaName) { + mStageCursor = stage_no; + mRoomCursor = room_no; + u16 area_name = checkStRoomData(); + if (mStageCursor >= 0) { + if (area_name != 0xffff) { + setAreaName(area_name); + } else { + setAreaName(mAreaName[mStageCursor]); + } + } else { + setAreaNameZero(); + } + } + + if (mErrorSound == true) { + mErrorSound = false; + } + } + + mpDraw2DBack->zoomMapCalcHIO(); + + if (mStageCursor >= 0) { + setFlash(mStageCursor, true); + } else { + mpMenuFmapMap->setFlashOff(); + } } -#pragma pop /* 801C9A4C-801C9B64 1C438C 0118+00 1/0 0/0 0/0 .text portal_demo1_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo1_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo1_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo1_init() { + mpDraw2DBack->setRegionCursor(2); + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_RIGHT, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_LEFT, 0.0f); + mpDraw2DTop->setBButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0); + mpDraw2DTop->setCrossLRString(0); + dMsgObject_setTalkHeap(mpTalkHeap); + mMsgFlow.init(NULL, 3005, 0, NULL); + mZoomLevel = 10; } -#pragma pop /* 801C9B64-801C9C7C 1C44A4 0118+00 1/0 0/0 0/0 .text portal_demo1_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo1_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo1_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo1_move() { + talkButton(); + mMsgFlow.doFlow(NULL, NULL, 0); + + if (dMsgObject_getMessageID() >= 2008 || mZoomLevel < 10) { + if (mZoomLevel == 10) { + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + mZoomLevel--; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + if (mZoomLevel <= 0) { + if (mpDraw2DBack->getAllPathShowFlag()) { + removeAreaData(); + readWorldData(0xff); + } + mIsWarpMap = true; + setProcess(PROC_PORTAL_DEMO2); + } + } } -#pragma pop /* 801C9C7C-801C9CC8 1C45BC 004C+00 1/0 0/0 0/0 .text portal_demo2_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo2_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo2_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo2_init() { + setTitleName(mAllTitleName); + setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]); } -#pragma pop /* 801C9CC8-801C9D60 1C4608 0098+00 1/0 0/0 0/0 .text portal_demo2_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo2_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo2_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo2_move() { + talkButton(); + mMsgFlow.doFlow(NULL, NULL, 0); + + if (dMsgObject_getMessageID() >= 2009) { + mpDraw2DBack->setRegionCursor(1); + setProcess(PROC_PORTAL_DEMO3); + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_AREA_SELECT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + mpDraw2DBack->mapBlink(); } -#pragma pop /* 801C9D60-801C9DB4 1C46A0 0054+00 1/0 0/0 0/0 .text portal_demo3_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo3_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo3_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo3_init() { + setTitleName(mAllTitleName); + setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]); + mZoomLevel = 0; } -#pragma pop /* 801C9DB4-801C9EB8 1C46F4 0104+00 1/0 0/0 0/0 .text portal_demo3_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo3_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo3_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo3_move() { + talkButton(); + mMsgFlow.doFlow(NULL, NULL, 0); + + if (dMsgObject_getMessageID() >= 2010 || mZoomLevel > 0) { + if (mZoomLevel == 0) { + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + mZoomLevel++; + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + if (mZoomLevel >= 10) { + setProcess(PROC_PORTAL_DEMO4); + } + } + + if (mZoomLevel == 0) { + mpDraw2DBack->mapBlink(); + } } -#pragma pop /* 801C9EB8-801C9F14 1C47F8 005C+00 1/0 0/0 0/0 .text portal_demo4_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo4_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo4_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo4_init() { + mPortalNo = 0xff; + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + if (mPortalNo == 0xff) { + setAreaNameZero(); + } } -#pragma pop /* 801C9F14-801C9F7C 1C4854 0068+00 1/0 0/0 0/0 .text portal_demo4_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo4_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo4_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo4_move() { + talkButton(); + if (mMsgFlow.doFlow(NULL, NULL, 0)) { + setProcess(PROC_PORTAL_DEMO5); + } + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801C9F7C-801C9FBC 1C48BC 0040+00 1/0 0/0 0/0 .text portal_demo5_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo5_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo5_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo5_init() { + mpDraw2DTop->set3DStickString(0x526); + mpDraw2DBack->onArrowDrawFlag(); } -#pragma pop /* 801C9FBC-801CA158 1C48FC 019C+00 1/0 0/0 0/0 .text portal_demo5_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo5_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo5_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo5_move() { + mpStick->checkTrigger(); + + // fakematch: the call to the fake inline function dMeter2Info_isTouchKeyCheck_alt + // should actually call dMeter2Info_isTouchKeyCheck, but for some reason the generated asm + // is different from every other call to dMeter2Info_isTouchKeyCheck + if (dMw_B_TRIGGER() || dMw_Z_TRIGGER() || dMw_START_TRIGGER() || dMw_UP_TRIGGER() + || dMw_DOWN_TRIGGER() || dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER() + || dMeter2Info_isTouchKeyCheck_alt(0xc)) + { + dMsgObject_setTalkHeap(mpTalkHeap); + fopMsgM_messageSet(2015, 1000); + setProcess(PROC_PORTAL_DEMO6); + } else if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc)) { + if (mPortalNo != 0xff) { + dMenu_Fmap_portal_data_c::data* portals = mpPortalDat->mData; + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + dMsgObject_setPortalMessageID(portals[mPortalNo].mMessageID); + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x51e, 2, 0, 0xff, true); + setProcess(PROC_PORTAL_WARP_SELECT); + } else { + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else { + portalWarpMapMove(mpStick); + } + + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801CA158-801CA15C 1C4A98 0004+00 1/0 0/0 0/0 .text portal_demo6_init__12dMenu_Fmap_cFv */ @@ -1688,54 +1441,68 @@ void dMenu_Fmap_c::portal_demo6_init() { /* 801CA15C-801CA1E8 1C4A9C 008C+00 1/0 0/0 0/0 .text portal_demo6_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portal_demo6_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/portal_demo6_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::portal_demo6_move() { + if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) { + dMsgObject_getMsgObjectClass()->setStatus(0x10); + talkButton(); + } else if (dMsgObject_getMsgObjectClass()->getStatus() == 0x12) { + dMsgObject_getMsgObjectClass()->setStatus(0x13); + setProcess(PROC_PORTAL_DEMO5); + talkButton(); + } + + setFlash(mpDraw2DBack->getSpotCursor(), false); } -#pragma pop /* 801CA1E8-801CA2F4 1C4B28 010C+00 1/0 0/0 0/0 .text yamiboss_demo1_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo1_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo1_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo1_init() { + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_RIGHT, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_LEFT, 0.0f); + mpDraw2DTop->setBButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0); + mpDraw2DTop->setCrossLRString(0); + dMsgObject_setTalkHeap(mpTalkHeap); + mMsgFlow.init(NULL, 3012, 0, NULL); + mZoomLevel = 10; } -#pragma pop /* 801CA2F4-801CA34C 1C4C34 0058+00 1/0 0/0 0/0 .text yamiboss_demo1_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo1_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo1_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo1_move() { + talkButton(); + mMsgFlow.doFlow(NULL, NULL, 0); + if (dMsgObject_getMessageID() >= 4015) { + setProcess(PROC_YAMIBOSS_DEMO2); + } } -#pragma pop /* 801CA34C-801CA35C 1C4C8C 0010+00 1/0 0/0 0/0 .text yamiboss_demo2_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo2_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo2_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo2_init() { + mZoomLevel = 0; + field_0x30b = false; } -#pragma pop /* 801CA35C-801CA40C 1C4C9C 00B0+00 1/0 0/0 0/0 .text yamiboss_demo2_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo2_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo2_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo2_move() { + if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) { + mZoomLevel++; + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x77])) { + if (mZoomLevel > 90) { + setProcess(PROC_YAMIBOSS_DEMO3); + } + } else { + if (mZoomLevel > 30) { + field_0x30b = true; + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x77]); + } + } + } } -#pragma pop /* 801CA40C-801CA410 1C4D4C 0004+00 1/0 0/0 0/0 .text yamiboss_demo3_init__12dMenu_Fmap_cFv */ void dMenu_Fmap_c::yamiboss_demo3_init() { @@ -1743,34 +1510,29 @@ void dMenu_Fmap_c::yamiboss_demo3_init() { } /* 801CA410-801CA468 1C4D50 0058+00 1/0 0/0 0/0 .text yamiboss_demo3_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo3_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo3_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo3_move() { + talkButton(); + mMsgFlow.doFlow(NULL, NULL, 0); + if (dMsgObject_getMessageID() >= 4016) { + setProcess(PROC_YAMIBOSS_DEMO4); + } } -#pragma pop /* 801CA468-801CA4C0 1C4DA8 0058+00 1/0 0/0 0/0 .text yamiboss_demo4_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo4_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo4_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo4_init() { + mZoomLevel = 0; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop /* 801CA4C0-801CA544 1C4E00 0084+00 1/0 0/0 0/0 .text yamiboss_demo4_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo4_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo4_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo4_move() { + mZoomLevel++; + field_0x1ec = (f32)mZoomLevel / 10.0f; + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + if (mZoomLevel >= 10) { + setProcess(PROC_YAMIBOSS_DEMO5); + } } -#pragma pop /* 801CA544-801CA548 1C4E84 0004+00 1/0 0/0 0/0 .text yamiboss_demo5_init__12dMenu_Fmap_cFv */ void dMenu_Fmap_c::yamiboss_demo5_init() { @@ -1778,168 +1540,196 @@ void dMenu_Fmap_c::yamiboss_demo5_init() { } /* 801CA548-801CA5CC 1C4E88 0084+00 1/0 0/0 0/0 .text yamiboss_demo5_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamiboss_demo5_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamiboss_demo5_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamiboss_demo5_move() { + if (field_0x30b && dMsgObject_getMessageID() >= 4018) { + field_0x30b = false; + } + talkButton(); + if (mMsgFlow.doFlow(NULL, NULL, 0)) { + setProcess(PROC_SPOT_MAP); + mpDraw2DBack->onArrowDrawFlag(); + } } -#pragma pop /* 801CA5CC-801CA7A4 1C4F0C 01D8+00 1/0 0/0 0/0 .text light_demo1_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::light_demo1_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/light_demo1_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::light_demo1_init() { + mpDraw2DBack->zoomMapCalc2(1.0f); + mZoomLevel = -10; + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + mpDraw2DTop->setBButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0); + mpDraw2DTop->setCrossLRString(0); + dMsgObject_setTalkHeap(mpTalkHeap); + field_0x1ec = 1.0f; + setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]); + setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]); + mStageCursor = mpDraw2DBack->getSpotCursor(); + mpDraw2DBack->resetDrug(); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_UP, 0.0f); + mpDraw2DTop->setArrowAlphaRatio(dMenu_Fmap2DTop_c::ARROW_DOWN, 0.0f); + mpDraw2DTop->setBButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->setZButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DTop->set3DStickString(0); + mpDraw2DTop->setCrossLRString(0); + dMsgObject_setTalkHeap(mpTalkHeap); + mMsgFlow.init(NULL, 125, 0, NULL); } -#pragma pop /* 801CA7A4-801CA7E0 1C50E4 003C+00 1/0 0/0 0/0 .text light_demo1_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::light_demo1_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/light_demo1_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::light_demo1_move() { + mZoomLevel++; + if (mZoomLevel > 0) { + setProcess(PROC_LIGHT_DEMO2); + } } -#pragma pop /* 801CA7E0-801CA814 1C5120 0034+00 1/0 0/0 0/0 .text light_demo2_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::light_demo2_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/light_demo2_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::light_demo2_init() { + mMsgFlow.init(NULL, 125, 0, NULL); } -#pragma pop /* 801CA814-801CA874 1C5154 0060+00 1/0 0/0 0/0 .text light_demo2_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::light_demo2_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/light_demo2_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::light_demo2_move() { + talkButton(); + if (mMsgFlow.doFlow(NULL, NULL, 0)) { + setProcess(PROC_SPOT_MAP); + mpDraw2DBack->onArrowDrawFlag(); + } } -#pragma pop /* 801CA874-801CA9B4 1C51B4 0140+00 1/0 0/0 0/0 .text table_demo1_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo1_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo1_init() { + mZoomLevel = -10; + mpDraw2DBack->setRegionCursor(dMeter2Info_getTableMapRegionNo()); + readWorldData(mpDraw2DBack->getRegionCursor() + 1); + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + dMenuFmapIconDisp_c icon; + + for (int i = 0; i < 8; i++) { + if (mpRegionData[i] != NULL && mpStageData[i] != NULL) { + s32 stay_no = dComIfGp_roomControl_getStayNo(); + icon.init(mpRegionData[i], mpStageData[i], 5, mStayStageNo, stay_no); + + while (!icon.getValidData()) { + if (icon.isDrawDisp()) { + f32 pos_x, pos_z; + int stage_no, room_no; + icon.getPosition(&stage_no, &room_no, &pos_x, &pos_z, NULL); + if (isRoomCheck(stage_no, room_no)) { + mpDraw2DBack->setArrowPosAxis(pos_x, pos_z); + } + } + if (icon.nextData()) break; + } + } + } } -#pragma pop /* 801CA9B4-801CAA78 1C52F4 00C4+00 1/0 0/0 0/0 .text table_demo1_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo1_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo1_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo1_move() { + mZoomLevel++; + if (mZoomLevel == 1) { + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + if (mZoomLevel > 0) { + mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f); + if (mZoomLevel >= 10) { + setProcess(PROC_TABLE_DEMO2); + } + } } -#pragma pop /* 801CAA78-801CAABC 1C53B8 0044+00 1/0 0/0 0/0 .text table_demo2_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo2_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo2_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo2_init() { + mZoomLevel = -10; + tableArrowPosInit(true); + mpDraw2DBack->zoomMapCalc2(0.0f); } -#pragma pop /* 801CAABC-801CAB88 1C53FC 00CC+00 1/0 0/0 0/0 .text table_demo2_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo2_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo2_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo2_move() { + mZoomLevel++; + if (mZoomLevel == 1) { + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + if (mZoomLevel > 0) { + field_0x1ec = (f32)mZoomLevel / 10.0f; + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + if (mZoomLevel >= 10) { + setProcess(PROC_TABLE_DEMO3); + } + } } -#pragma pop /* 801CAB88-801CABD0 1C54C8 0048+00 1/0 0/0 0/0 .text table_demo3_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo3_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo3_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo3_init() { + dMsgObject_setTalkHeap(mpTalkHeap); + mMsgFlow.init(NULL, 1089, 0, NULL); } -#pragma pop /* 801CABD0-801CAC30 1C5510 0060+00 1/0 0/0 0/0 .text table_demo3_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::table_demo3_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/table_demo3_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::table_demo3_move() { + talkButton(); + if (mMsgFlow.doFlow(NULL, NULL, 0)) { + mpDraw2DBack->onArrowDrawFlag(); + setProcess(PROC_SPOT_MAP); + } } -#pragma pop /* 801CAC30-801CAC7C 1C5570 004C+00 1/0 0/0 0/0 .text howl_demo1_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howl_demo1_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howl_demo1_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howl_demo1_init() { + mZoomLevel = -10; + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + mpDraw2DBack->zoomMapCalc2(0.0f); } -#pragma pop /* 801CAC7C-801CAD48 1C55BC 00CC+00 1/0 0/0 0/0 .text howl_demo1_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howl_demo1_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howl_demo1_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howl_demo1_move() { + mZoomLevel++; + if (mZoomLevel == 1) { + Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + if (mZoomLevel > 0) { + field_0x1ec = (f32)mZoomLevel / 10.0f; + mpDraw2DBack->zoomMapCalc2(field_0x1ec); + if (mZoomLevel >= 10) { + setProcess(PROC_HOWL_DEMO2); + } + } } -#pragma pop /* 801CAD48-801CAD54 1C5688 000C+00 1/0 0/0 0/0 .text howl_demo2_init__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howl_demo2_init() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howl_demo2_init__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howl_demo2_init() { + mZoomLevel = -10; } -#pragma pop /* 801CAD54-801CAD9C 1C5694 0048+00 1/0 0/0 0/0 .text howl_demo2_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howl_demo2_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howl_demo2_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howl_demo2_move() { + mZoomLevel++; + if (mZoomLevel > 0) { + mpDraw2DBack->onArrowDrawFlag(); + setProcess(PROC_SPOT_MAP); + } } -#pragma pop /* 801CAD9C-801CADA0 1C56DC 0004+00 1/0 0/0 0/0 .text howl_demo3_init__12dMenu_Fmap_cFv */ @@ -1949,621 +1739,1279 @@ void dMenu_Fmap_c::howl_demo3_init() { /* 801CADA0-801CADC4 1C56E0 0024+00 1/0 0/0 0/0 .text howl_demo3_move__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howl_demo3_move() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howl_demo3_move__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howl_demo3_move() { + setProcess(PROC_REGION_MAP); } -#pragma pop /* 801CADC4-801CB038 1C5704 0274+00 0/0 1/1 0/0 .text isOpen__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Fmap_c::isOpen() { - nofralloc -#include "asm/d/menu/d_menu_fmap/isOpen__12dMenu_Fmap_cFv.s" +bool dMenu_Fmap_c::isOpen() { + bool ret = false; + bool init = false; + + if (!mpResArchive) { + if (!mpMountArchive) { + mpMountArchive = mDoDvdThd_mountArchive_c::create("/res/FieldMap/res-f.arc", 2, mpHeap); + } + + if (mpMountArchive->sync()) { + mpResArchive = mpMountArchive->getArchive(); + mpMountArchive->destroy(); + mpMountArchive = NULL; + mpFmapMapRes = mpResArchive->getResource("dat/data.dat"); + _create(); + } else { + return false; + } + } + + s16 display_frame_num = (s16)g_fmapHIO.mDisplayFrameNum; + s16 undisplay_frame_num = (s16)g_fmapHIO.mUndisplayFrameNum; + if (mDisplayFrame == 0) { + init = true; + } + mDisplayFrame++; + f32 ratio = (f32)mDisplayFrame / (f32)display_frame_num; + + if (mPanDirection == 1) { + mTransX = (1.0f - ratio) * -608.0f; + mTransY = 0.0f; + } else if (mPanDirection == 3) { + mTransX = (1.0f - ratio) * 608.0f; + mTransY = 0.0f; + } else if (mPanDirection == 2) { + mTransX = 0.0f; + mTransY = (1.0f - ratio) * -448.0f; + } else if (mPanDirection == 0) { + mTransX = 0.0f; + mTransY = (1.0f - ratio) * 448.0f; + } + + mAlphaRatio = ratio; + + if (mDisplayFrame >= display_frame_num) { + mDisplayFrame = undisplay_frame_num; + mTransX = 0.0f; + mTransY = 0.0f; + mAlphaRatio = 1.0f; + ret = true; + } + + mpDraw2DBack->setAllTrans(mTransX, mTransY); + mpDraw2DBack->setAllAlphaRate(mAlphaRatio, init); + mpDraw2DTop->setAllTrans(mTransX, mTransY); + mpDraw2DTop->setAllAlphaRate(mAlphaRatio, init); + mpDraw2DBack->setSpotTextureFadeAlpha(mSpotTextureFadeAlpha); + + return ret; } -#pragma pop /* 801CB038-801CB1DC 1C5978 01A4+00 0/0 1/1 0/0 .text isClose__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Fmap_c::isClose() { - nofralloc -#include "asm/d/menu/d_menu_fmap/isClose__12dMenu_Fmap_cFv.s" +bool dMenu_Fmap_c::isClose() { + bool ret = true; + bool bVar2 = false; + + s16 undisplay_frame_num = (s16)g_fmapHIO.mUndisplayFrameNum; + if (mDisplayFrame == undisplay_frame_num) { + bVar2 = true; + } + mDisplayFrame--; + f32 ratio = (f32)mDisplayFrame / (f32)undisplay_frame_num; + + if (mDisplayFrame <= 0) { + mDisplayFrame = 0; + } else { + ret = false; + } + + if (mPanDirection == 1) { + mTransX = (1.0f - ratio) * 608.0f; + mTransY = 0.0f; + } else if (mPanDirection == 3) { + mTransX = (1.0f - ratio) * -608.0f; + mTransY = 0.0f; + } else if (mPanDirection == 2) { + mTransX = 0.0f; + mTransY = (1.0f - ratio) * 448.0f; + } else if (mPanDirection == 0) { + mTransX = 0.0f; + mTransY = (1.0f - ratio) * -448.0f; + } + + mAlphaRatio = ratio; + + mpDraw2DBack->setAllTrans(mTransX, mTransY); + mpDraw2DBack->setAllAlphaRate(mAlphaRatio, bVar2); + mpDraw2DTop->setAllTrans(mTransX, mTransY); + mpDraw2DTop->setAllAlphaRate(mAlphaRatio, bVar2); + + return ret; } -#pragma pop /* 801CB1DC-801CB200 1C5B1C 0024+00 0/0 1/1 0/0 .text getProcess__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Fmap_c::getProcess() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getProcess__12dMenu_Fmap_cFv.s" +u8 dMenu_Fmap_c::getProcess() { + if (g_fmapHIO.field_0x2f9) { + return mProcess; + } + return PROC_REGION_MAP; } -#pragma pop /* 801CB200-801CB230 1C5B40 0030+00 0/0 1/1 0/0 .text getRegionCursor__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Fmap_c::getRegionCursor() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getRegionCursor__12dMenu_Fmap_cFv.s" +u8 dMenu_Fmap_c::getRegionCursor() { + if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) { + return mpDraw2DBack->getRegionCursor(); + } + return 0; } -#pragma pop /* 801CB230-801CB260 1C5B70 0030+00 0/0 1/1 0/0 .text getStageCursor__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Fmap_c::getStageCursor() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getStageCursor__12dMenu_Fmap_cFv.s" +u8 dMenu_Fmap_c::getStageCursor() { + if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) { + return mpDraw2DBack->getSpotCursor(); + } + return 0; } -#pragma pop /* 801CB260-801CB290 1C5BA0 0030+00 0/0 1/1 0/0 .text getStageTransX__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap_c::getStageTransX() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getStageTransX__12dMenu_Fmap_cFv.s" +f32 dMenu_Fmap_c::getStageTransX() { + if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) { + return mpDraw2DBack->getStageTransX(); + } + return 0.0f; } -#pragma pop /* 801CB290-801CB2C0 1C5BD0 0030+00 0/0 1/1 0/0 .text getStageTransZ__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap_c::getStageTransZ() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getStageTransZ__12dMenu_Fmap_cFv.s" +f32 dMenu_Fmap_c::getStageTransZ() { + if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) { + return mpDraw2DBack->getStageTransZ(); + } + return 0.0f; } -#pragma pop /* 801CB2C0-801CB570 1C5C00 02B0+00 4/4 0/0 0/0 .text isRoomCheck__12dMenu_Fmap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::isRoomCheck(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/isRoomCheck__12dMenu_Fmap_cFii.s" +bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) { + if (!field_0x305) { + return false; + } + + dMenuMapCommon_c::Stage_c* stage_data + = (dMenuMapCommon_c::Stage_c*)((int)mpFieldDat + mpFieldDat->mStageDataOffset); + dMenuMapCommon_c::Stage_c::data* stages = stage_data->mData; + u8 stage_no = 0; + int i = 0; + + bool checked_data[100]; + for (int j = 0; j < mDataNumMax; j++) { + checked_data[j] = false; + } + + bool local_e0[64]; + bool room_check[64]; + char stage_name[8]; + + for (; i < mDataNumMax; i++) { + if (checked_data[i]) continue; + + strcpy(stage_name, stages[i].mName); + + for (int k = 0; k < 64; k++) { + local_e0[k] = false; + room_check[k] = false; + } + + bool bVar1 = false; + + for (int j = i; j < mDataNumMax; j++) { + if (strcmp(stages[j].mName, stage_name)) continue; + + checked_data[j] = true; + + if (stages[j].mRegionNo == mpDraw2DBack->getRegionCursor() + 1) { + if (stages[j].mRoomNo != 0xff) { + local_e0[stages[j].mRoomNo] = true; + room_check[stages[j].mRoomNo] = true; + if (!bVar1) { + bVar1 = true; + } + } else { + for (int k = 0; k < 64; k++) { + if (!local_e0[k]) { + room_check[k] = true; + } + } + if (!bVar1) { + bVar1 = true; + } + } + } else { + if (stages[j].mRoomNo != 0xff) { + local_e0[stages[j].mRoomNo] = true; + } + } + } + + if (bVar1) { + if (i_stageNo == stage_no && room_check[i_roomNo]) break; + stage_no++; + if (stage_no > i_stageNo) { + return false; + } + } + } + + u8 region = mpDraw2DBack->getRegionCursor(); + i = 0; + dMenuMapCommon_c::RoomData_c* room_data = mpRoomData[region]; + for (; i < i_stageNo; i++) { + room_data = room_data->getNextData(); + if (room_data == NULL) break; + } + + if (room_data == NULL || i != i_stageNo) { + return false; + } + + dMenuMapCommon_c::RoomData_c::data* room_data_data = room_data->getRoomData(); + u8* rooms = room_data_data->mData; + for (int j = 0; j < room_data_data->mSize; j++) { + if (i_roomNo == rooms[j] && room_check[rooms[j]]) { + return true; + } + } + + return false; } -#pragma pop /* 801CB570-801CB664 1C5EB0 00F4+00 2/2 0/0 0/0 .text checkStRoomData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::checkStRoomData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/checkStRoomData__12dMenu_Fmap_cFv.s" +u16 dMenu_Fmap_c::checkStRoomData() { + dMenu_Fmap_field_room_data_c* room_data + = (dMenu_Fmap_field_room_data_c*)((int)mpFieldDat + mpFieldDat->mRoomDataOffset); + dMenu_Fmap_field_room_data_c::data* data = room_data->mData; + int count = room_data->mCount; + for (int i = 0; i < count; i++) { + int offset = data->mCount + sizeof(dMenu_Fmap_field_room_data_c::data) - 1; + if (data->mCount % 2 == 0) { + offset += 1; + } + + if (!strcmp(mStageName[mStageCursor], data->mStageName)) { + for (int j = 0; j < data->mCount; j++) { + if (mRoomCursor == data->mRoomNos[j]) { + mFlashRoomCount = data->mCount; + mFlashRooms = data->mRoomNos; + return data->mAreaName; + } + } + } + + data = (dMenu_Fmap_field_room_data_c::data*)((int)data + offset); + } + + mFlashRoomCount = 0; + mFlashRooms = NULL; + return -1; } -#pragma pop /* 801CB664-801CB6D0 1C5FA4 006C+00 10/10 0/0 0/0 .text talkButton__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::talkButton() { - nofralloc -#include "asm/d/menu/d_menu_fmap/talkButton__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::talkButton() { + u16 status = dMsgObject_c::getStatus(); + if (status == 5 || status == 0xf || status == 0x10) { + mpDraw2DTop->setAButtonString(0x408, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } else { + mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT); + } } -#pragma pop /* 801CB6D0-801CB6E0 1C6010 0010+00 31/31 0/0 0/0 .text setProcess__12dMenu_Fmap_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::setProcess(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/setProcess__12dMenu_Fmap_cFUc.s" +void dMenu_Fmap_c::setProcess(u8 i_process) { + mPrevProcess = mProcess; + mProcess = i_process; } -#pragma pop /* 801CB6E0-801CB770 1C6020 0090+00 10/10 0/0 0/0 .text setFlash__12dMenu_Fmap_cFUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::setFlash(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/setFlash__12dMenu_Fmap_cFUcb.s" +void dMenu_Fmap_c::setFlash(u8 i_stageNo, bool param_1) { + mpDraw2DBack->mapBlink(&field_0x210); + if (param_1) { + mpMenuFmapMap->setFlashOn(mpDraw2DBack->getRegionCursor() + 1, i_stageNo, + mFlashRooms, mFlashRoomCount); + } else { + mpMenuFmapMap->setFlashOn(mpDraw2DBack->getRegionCursor() + 1, i_stageNo, NULL, 0); + } } -#pragma pop /* 801CB770-801CB938 1C60B0 01C8+00 6/6 0/0 0/0 .text readWorldData__12dMenu_Fmap_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::readWorldData(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/readWorldData__12dMenu_Fmap_cFUc.s" +bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) { + removeAreaData(); + bool ret = false; + bool bVar1 = false; + + if (mpDraw2DBack->getAllPathShowFlag()) { + for (int i = 0; i < 8; i++) { + if (i == i_regionNo - 1) { + if (readAreaData(i + 1, true)) { + ret = true; + bVar1 = true; + } + } else { + if (readAreaData(i + 1, false)) { + bVar1 = true; + } + } + } + } else { + if (readAreaData(i_regionNo, true)) { + ret = true; + bVar1 = true; + } + } + + dMenu_Fmap_region_data_c* region_data = NULL; + int head = -1; + for (int i = 0; i < 8; i++) { + if (mpRegionData[i] != NULL) { + if (region_data == NULL) { + head = i; + region_data = mpRegionData[i]; + region_data->setNextData(NULL); + } else { + region_data->setNextData(mpRegionData[i]); + region_data = mpRegionData[i]; + region_data->setNextData(NULL); + } + } + } + + if (head != -1 && mpWorldData == NULL) { + mpWorldData = new dMenu_Fmap_world_data_c(mpRegionData[head]); + mpDraw2DBack->setWorldPosMinMax(mpWorldData->getWorldMinX(), mpWorldData->getWorldMinZ(), + mpWorldData->getWorldMaxX(), mpWorldData->getWorldMaxZ()); + } + + if (bVar1) { + ResTIMG* img = mpMenuFmapMap->getResTIMGPointer(); + if (img != NULL) { + mpDraw2DBack->setSpotPane(img); + } + field_0x305 = true; + } + + return ret; } -#pragma pop /* 801CB938-801CBF04 1C6278 05CC+00 1/1 0/0 0/0 .text readAreaData__12dMenu_Fmap_cFUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::readAreaData(u8 param_0, bool param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/readAreaData__12dMenu_Fmap_cFUcb.s" +bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) { + if (field_0x305) { + return false; + } + + bool checked_data[100]; + bool local_e0[64]; + char stage_name[8]; + char tmp_stage_name[8]; + + dMenuMapCommon_c::Stage_c::data* stages + = ((dMenuMapCommon_c::Stage_c*)((int)mpFieldDat + mpFieldDat->mStageDataOffset))->mData; + u8 stage_no = 0; + dMenu_Fmap_stage_data_c* prev_stage_data = NULL; + dMenuMapCommon_c::RoomData_c* prev_room_data = NULL; + stage_name[7] = 0; + + if (i_isSelectedRegion) { + mSpotNum = 0; + } + + int i = 0; + int stage_index = 0; + + for (int j = 0; j < mDataNumMax; j++) { + checked_data[j] = false; + } + + if (i_isSelectedRegion) { + mStartStageNo = 0xff; + mStayStageNo = -1; + } + + field_0x200 = 0; + + for (; i < mDataNumMax; i++) { + if (checked_data[i]) continue; + + strcpy(tmp_stage_name, mTmpStageName); + resetRoomDataBit(); + if (i_isSelectedRegion) { + strcpy(mTmpStageName, stages[i].mName); + } else { + strcpy(mTmpStageName, tmp_stage_name); + } + strcpy(tmp_stage_name, stages[i].mName); + + for (int k = 0; k < 64; k++) { + local_e0[k] = false; + } + + bool bVar2 = false; + + for (int j = i; j < mDataNumMax; j++) { + if (strcmp(stages[j].mName, tmp_stage_name)) continue; + + checked_data[j] = true; + + if (i_regionNo == stages[j].mRegionNo) { + if (stages[j].mRoomNo != 0xff) { + onRoomDataBit(stages[j].mRoomNo); + if (!bVar2) { + stage_index = j; + bVar2 = true; + } + } else { + for (int k = 0; k < 64; k++) { + if (!local_e0[k]) { + onRoomDataBit(k); + } + } + if (!bVar2) { + stage_index = j; + bVar2 = true; + } + } + } else { + if (stages[j].mRoomNo != 0xff) { + local_e0[stages[j].mRoomNo] = true; + } + } + } + + if (bVar2) { + dMenu_Fmap_stage_data_c* stage_data = new dMenu_Fmap_stage_data_c(); + if (mpStageData[i_regionNo - 1] == NULL) { + mpStageData[i_regionNo - 1] = stage_data; + } else { + prev_stage_data->setNextData(stage_data); + } + prev_stage_data = stage_data; + stage_data->setNextData(NULL); + stage_data->setStageCntNo(stage_no); + stage_data->setName(stages[stage_index].mName); + + for (int j = 0; j < 8; j++) { + stage_name[j] = stages[stage_index].mName[j]; + } + + if (i_regionNo == dComIfGp_getNowLevel()) { + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag()) { + if (!strcmp(dMenuFmap_getStartStageName(mpFieldDat), stage_name)) { + mpDraw2DBack->setSpotCursor(stage_no); + mStartStageNo = stage_no; + mStayStageNo = stage_no; + } + } else { + if (!strcmp(dComIfGs_getPlayerFieldLastStayName(), stage_name)) { + mpDraw2DBack->setSpotCursor(stage_no); + mStayStageNo = stage_no; + } + } + } + + stage_data->setOffsetX(stages[stage_index].mOffsetX); + stage_data->setOffsetZ(stages[stage_index].mOffsetZ); + + if (i_isSelectedRegion) { + mpDraw2DBack->setStageOriginXZ(mSpotNum, stages[stage_index].mOffsetX, + stages[stage_index].mOffsetZ); + mAreaName[mSpotNum] = stages[stage_index].mAreaName; + strcpy(mStageName[mSpotNum], stage_name); + mSpotNum++; + } + + dMenuMapCommon_c::RoomData_c* room_data = new dMenuMapCommon_c::RoomData_c(); + if (mpRoomData[i_regionNo - 1] == NULL) { + mpRoomData[i_regionNo - 1] = room_data; + } else { + prev_room_data->setNextData(room_data); + } + prev_room_data = room_data; + room_data->setNextData(NULL); + readRoomData(stage_name, stage_data, room_data, i_regionNo - 1, + stages[stage_index].mRoomNo); + + stage_no++; + } + } + + if (mpStageData[i_regionNo - 1] == NULL) { + return false; + } + + if (mpRegionData[i_regionNo - 1] == NULL) { + mpRegionData[i_regionNo - 1] = new dMenu_Fmap_region_data_c(i_regionNo, + mpStageData[i_regionNo - 1], + mRegionOffsetX[i_regionNo - 1], + mRegionOffsetZ[i_regionNo - 1]); + } + + if (i_regionNo - 1 == mpDraw2DBack->getRegionCursor()) { + for (int j = 0; j < mSpotNum; j++) { + mpDraw2DBack->setStageOriginPathXZ(j, + getNowFmapRegionData()->getStageCenterX_CoordWorld(j), + getNowFmapRegionData()->getStageCenterZ_CoordWorld(j)); + } + } + + return true; } -#pragma pop /* 801CBF04-801CC094 1C6844 0190+00 1/1 0/0 0/0 .text * readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::readRoomData(char const* param_0, dMenu_Fmap_stage_data_c* param_1, - void* param_2, int param_3, u8 param_4) { - nofralloc -#include "asm/d/menu/d_menu_fmap/readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc.s" +bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c* i_stageData, + void* o_roomData, int i_regionNo, u8 param_4) { + dMenu_Fmap_room_data_c* prev_room_data = NULL; + i_stageData->setFmapRoomDataTop(NULL); + dMenu_Fmap_stage_arc_data_c* room_data = NULL; + + char stage_path[20]; + sprintf(stage_path, "%s/stage.dat", i_stageName); + if (readFieldMapData((void**)&room_data, stage_path, false, false)) { + ((dMenuMapCommon_c::RoomData_c*)o_roomData)->setRoomData(room_data); + } + + dMenu_Fmap_stage_arc_data_c* stage_arc = room_data; + u8* room_nos = room_data->mRoomNos; + i_stageData->setStageArc(stage_arc); + + for (int i = 0; i < stage_arc->mSize; i++) { + if (isRoomDataBit(room_nos[i])) { + void* dzs_data = NULL; + + char room_path[20]; + sprintf(room_path, "%s/room%d.dzs", i_stageName, room_nos[i]); + + if (readRoomDzsData(&dzs_data, 0x1500, room_path)) { + dMenu_Fmap_data_c* map_data = new dMenu_Fmap_data_c(); + dMenu_Fmap_room_data_c* room_data + = new dMenu_Fmap_room_data_c(room_nos[i], i_stageData, map_data); + if (prev_room_data == NULL) { + i_stageData->setFmapRoomDataTop(room_data); + } else { + prev_room_data->setNextData(room_data); + } + prev_room_data = room_data; + map_data->setDzsData(dzs_data); + // this cast is nonsense but it ends up getting cast back anyway + dStage_dt_c_fieldMapLoader(dzs_data, (dStage_dt_c*)map_data); + } + } + } + + return true; } -#pragma pop /* 801CC094-801CC284 1C69D4 01F0+00 3/3 0/0 0/0 .text readFieldMapData__12dMenu_Fmap_cFPPvPCcbb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::readFieldMapData(void** param_0, char const* param_1, bool param_2, - bool param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap/readFieldMapData__12dMenu_Fmap_cFPPvPCcbb.s" -} -#pragma pop +bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool param_2, + bool param_3) { + u32 size; + if (mpMapArchive != dComIfGp_getFieldMapArchive2()) { + if (param_3) { + void* res = mpResArchive->getResource(i_path); + mpResArchive->getExpandedResSize(res); + *o_data = res; + return true; + } else { + void* res = mpMapArchive->getResource(i_path); + size = mpMapArchive->getExpandedResSize(res); + mpMapArchive->removeResource(res); + } + } else { + if (param_3) { + void* res = mpResArchive->getResource(i_path); + mpResArchive->getExpandedResSize(res); + *o_data = res; + return true; + } else { + size = dLib_getExpandSizeFromAramArchive(mpMapArchive, i_path); + } + } -/* 801CC284-801CC2B0 1C6BC4 002C+00 0/0 1/0 0/0 .text getExpandedResSize__10JKRArchiveCFPCv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 JKRArchive::getExpandedResSize(void const* param_0) const { - nofralloc -#include "asm/d/menu/d_menu_fmap/getExpandedResSize__10JKRArchiveCFPCv.s" + if (param_2) { + if (mpMapArchive != dComIfGp_getFieldMapArchive2()) { + *o_data = mpHeap->alloc(size, 0x20); + } else { + *o_data = mpMapArchive->getResource(i_path); + return true; + } + } else { + *o_data = mpHeap->alloc(size, 0x20); + } + + u32 read_size = mpMapArchive->readResource(*o_data, size, i_path); + + if (param_2) { + DCStoreRangeNoSync(*o_data, size); + } + + if (read_size == 0) { + return false; + } else { + return true; + } } -#pragma pop /* 801CC2B0-801CC4EC 1C6BF0 023C+00 1/1 0/0 0/0 .text decodeFieldMapData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::decodeFieldMapData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/decodeFieldMapData__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::decodeFieldMapData() { + int field_data = (int)mpFieldDat; + dMenu_Fmap_field_region_data_c* region_data + = (dMenu_Fmap_field_region_data_c*)(field_data + mpFieldDat->mRegionDataOffset); + dMenuMapCommon_c::Stage_c* stage_data + = (dMenuMapCommon_c::Stage_c*)(field_data + mpFieldDat->mStageDataOffset); + mDataNumMax = stage_data->mCount; + mAllTitleName = *(u16*)(field_data + 0x16); + setTitleName(mAllTitleName); + dMenu_Fmap_field_region_data_c::data* regions = region_data->mData; + char tex_path[20]; + + for (int i = 0; i < region_data->mCount; i++) { + mpDraw2DBack->setRegionTextureReadNum(i, regions[i].mTextureReadNum); + + for (int j = 0; j < 8; j++) { + if (j + 1 == regions[i].mTextureReadNum) { + bool local_3f = false; + if (j == 7) { + local_3f = true; + sprintf(tex_path, "tex/region8.bti"); + } else { + sprintf(tex_path, "tex/region%d.bti", regions[i].mTextureReadNum); + } + + if (readFieldMapData((void**)&mRegionTexture[j], tex_path, true, local_3f)) { + if (!g_fmapHIO.mRegionImageDebug) { + mpDraw2DBack->setRegionTexData(j, mRegionTexture[j], + regions[i].mOriginX, regions[i].mOriginZ, + regions[i].field_0xc, regions[i].field_0x10, + regions[i].field_0x14, regions[i].field_0x18, + regions[i].field_0x20, regions[i].field_0x1c, + regions[i].field_0x24); + } else { + mpDraw2DBack->setRegionTexData(j, mRegionTexture[j], + regions[i].mOriginX, regions[i].mOriginZ, + g_fmapHIO.mRegionImagePosX[i] + regions[i].field_0xc, + g_fmapHIO.mRegionImagePosZ[i] + regions[i].field_0x10, + g_fmapHIO.mRegionImageScale[i] + regions[i].field_0x14, + regions[i].field_0x18, regions[i].field_0x20, + regions[i].field_0x1c, regions[i].field_0x24); + } + + mTitleName[j] = regions[i].mTitleName; + mRegionOffsetX[j] = regions[i].mOriginX; + mRegionOffsetZ[j] = regions[i].mOriginZ; + } + } + } + } + + mpDraw2DBack->calcDrawPriority(); + mpDraw2DBack->calcAllMapPos(); + mpDraw2DBack->setStageData(stage_data, mDataNumMax); + setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]); } -#pragma pop /* 801CC4EC-801CC51C 1C6E2C 0030+00 1/1 0/0 0/0 .text decodePortalData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::decodePortalData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/decodePortalData__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::decodePortalData() { + dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat; + if (g_fmapHIO.mPortalDataTerminalOutput) { + for (int i = 0; i < portal_dat->mCount; i++) {} + } } -#pragma pop /* 801CC51C-801CC61C 1C6E5C 0100+00 1/1 0/0 0/0 .text readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::readRoomDzsData(void** param_0, u32 param_1, char const* param_2) { - nofralloc -#include "asm/d/menu/d_menu_fmap/readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc.s" +bool dMenu_Fmap_c::readRoomDzsData(void** i_data, u32 param_1, char const* i_path) { + void* res; + char* path = const_cast(i_path); + u32 size; + if (mpMapArchive != dComIfGp_getFieldMapArchive2()) { + res = mpMapArchive->getResource(path); + size = mpMapArchive->getExpandedResSize(res); + mpMapArchive->removeResource(res); + } else { + size = dLib_getExpandSizeFromAramArchive(mpMapArchive, path); + } + + *i_data = mpHeap->alloc(size, 0x20); + u32 read_size = mpMapArchive->readResource(*i_data, size, path); + if (read_size == 0) { + return false; + } else { + field_0x200 += read_size; + return true; + } } -#pragma pop /* 801CC61C-801CC7A8 1C6F5C 018C+00 4/4 0/0 0/0 .text removeAreaData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::removeAreaData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/removeAreaData__12dMenu_Fmap_cFv.s" +bool dMenu_Fmap_c::removeAreaData() { + if (!field_0x305) { + return true; + } + + if (mpWorldData != NULL) { + if (mpWorldData != NULL) { + delete mpWorldData; + } + mpWorldData = NULL; + } + + for (int i = 0; i < 8; i++) { + if (mpRegionData[i] != NULL) { + if (mpRegionData[i] != NULL) { + delete mpRegionData[i]; + } + mpRegionData[i] = NULL; + } + } + + for (int i = 0; i < 8; i++) { + dMenu_Fmap_stage_data_c* stage_data = mpStageData[i]; + while (stage_data != NULL) { + dMenu_Fmap_stage_data_c* next_data = stage_data->getNextData(); + removeRoomData(stage_data); + if (stage_data != NULL) { + delete stage_data; + } + stage_data = next_data; + } + + dMenuMapCommon_c::RoomData_c* room_data = mpRoomData[i]; + while (room_data != NULL) { + dMenuMapCommon_c::RoomData_c* next_data = room_data->getNextData(); + dMenuMapCommon_c::RoomData_c::data* data = room_data->getRoomData(); + if (data != NULL) { + mpHeap->free(data); + } + delete room_data; + room_data = next_data; + } + } + + mpDraw2DBack->deleteSpotPane(); + + mpWorldData = NULL; + for (int i = 0; i < 8; i++) { + mpRegionData[i] = NULL; + mpStageData[i] = NULL; + mpRoomData[i] = NULL; + } + + for (int i = 0; i < 20; i++) { + strcpy(mStageName[i], ""); + } + + field_0x305 = false; + return true; } -#pragma pop /* 801CC7A8-801CC85C 1C70E8 00B4+00 1/1 0/0 0/0 .text * removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c.s" +bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) { + dMenu_Fmap_room_data_c* room_data = i_stageData->getFmapRoomDataTop(); + while (room_data != NULL) { + dMenu_Fmap_room_data_c* next_data = room_data->getNextData(); + dMenu_Fmap_data_c* fmap_data = room_data->getFmapData(); + void* dzs_data = fmap_data->getDzsData(); + if (dzs_data != NULL) { + mpHeap->free(dzs_data); + } + if (fmap_data != NULL) { + delete fmap_data; + } + delete room_data; + room_data = next_data; + } + return true; } -#pragma pop /* 801CC85C-801CC880 1C719C 0024+00 11/11 0/0 0/0 .text setTitleName__12dMenu_Fmap_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::setTitleName(u32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/setTitleName__12dMenu_Fmap_cFUl.s" +void dMenu_Fmap_c::setTitleName(u32 i_msgIndex) { + mpDraw2DTop->setTitleNameString(i_msgIndex); } -#pragma pop /* 801CC880-801CC8AC 1C71C0 002C+00 13/13 0/0 0/0 .text setAreaName__12dMenu_Fmap_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::setAreaName(u32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/setAreaName__12dMenu_Fmap_cFUl.s" +void dMenu_Fmap_c::setAreaName(u32 i_msgIndex) { + mAreaNameSet = true; + mpDraw2DTop->setAreaNameString(i_msgIndex); } -#pragma pop /* 801CC8AC-801CC8DC 1C71EC 0030+00 8/8 0/0 0/0 .text setAreaNameZero__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::setAreaNameZero() { - nofralloc -#include "asm/d/menu/d_menu_fmap/setAreaNameZero__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::setAreaNameZero() { + mAreaNameSet = false; + mpDraw2DTop->setAreaNameString(0); } -#pragma pop - -/* ############################################################################################## */ -/* 80454160-80454164 002760 0004+00 1/1 0/0 0/0 .sdata2 @6855 */ -SECTION_SDATA2 static f32 lit_6855 = 500.0f; /* 801CC8DC-801CCA70 1C721C 0194+00 2/2 0/0 0/0 .text * portalWarpMapMove__12dMenu_Fmap_cFP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::portalWarpMapMove(STControl* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/portalWarpMapMove__12dMenu_Fmap_cFP9STControl.s" +void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) { + mpDraw2DBack->regionMapMove(i_stick); + dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat; + dMenu_Fmap_portal_data_c::data* portals = portal_dat->mData; + f32 arrow_x = mpDraw2DBack->getArrowPos2DX(); + f32 arrow_y = mpDraw2DBack->getArrowPos2DY(); + u8 uVar6 = 0xff; + + for (int i = 0; i < portal_dat->mCount; i++) { + if (portals[i].mRegionNo == mpDraw2DBack->getRegionCursor() + 1 + && checkDrawPortalIcon(portals[i].mStageNo, portals[i].mSwitchNo)) + { + f32 pos_x, pos_y; + mpDraw2DBack->calcAllMapPos2D(portals[i].mPosition.x, portals[i].mPosition.z, + &pos_x, &pos_y); + if ((pos_x - arrow_x) * (pos_x - arrow_x) + + (pos_y - arrow_y) * (pos_y - arrow_y) <= 500.0f) { + uVar6 = i; + setAreaName(portals[uVar6].mMessageID); + u8 stage = searchPortalStageID(const_cast(portals[uVar6].mStageName)); + if (stage != 0xff) { + mpDraw2DBack->setSpotCursor(stage); + } + } + } + } + + if (uVar6 != 0xff) { + if (uVar6 != mPortalNo) { + Z2GetAudioMgr()->seStart(Z2SE_WARP_MAP_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + mPortalNo = uVar6; + } } -#pragma pop /* 801CCA70-801CCA98 1C73B0 0028+00 1/1 0/0 0/0 .text onRoomDataBit__12dMenu_Fmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::onRoomDataBit(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/onRoomDataBit__12dMenu_Fmap_cFi.s" +void dMenu_Fmap_c::onRoomDataBit(int i_bit) { + mRoomDataBits[i_bit >> 5] |= 1 << (i_bit & 0x1f); } -#pragma pop /* 801CCA98-801CCAC4 1C73D8 002C+00 1/1 0/0 0/0 .text isRoomDataBit__12dMenu_Fmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::isRoomDataBit(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/isRoomDataBit__12dMenu_Fmap_cFi.s" +BOOL dMenu_Fmap_c::isRoomDataBit(int i_bit) { + return (mRoomDataBits[i_bit >> 5] & 1 << (i_bit & 0x1f)) ? TRUE : FALSE; } -#pragma pop /* 801CCAC4-801CCB08 1C7404 0044+00 2/2 0/0 0/0 .text resetRoomDataBit__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::resetRoomDataBit() { - nofralloc -#include "asm/d/menu/d_menu_fmap/resetRoomDataBit__12dMenu_Fmap_cFv.s" -} -#pragma pop +void dMenu_Fmap_c::resetRoomDataBit() { + for (int i = 0; i < 2; i++) { + mRoomDataBits[i] = 0; + } -/* ############################################################################################## */ -/* 80454164-80454168 002764 0004+00 2/2 0/0 0/0 .sdata2 @6987 */ -SECTION_SDATA2 static f32 lit_6987 = 0.0054931640625f; + for (int i = 0; i < 8; i++) { + mTmpStageName[i] = '\0'; + } +} /* 801CCB08-801CCD98 1C7448 0290+00 2/2 0/0 0/0 .text drawIcon__12dMenu_Fmap_cFfb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFfb.s" +void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) { + if (mpDraw2DBack->getRegionCursor() + 1 == dComIfGp_getNowLevel()) { + drawPlayEnterIcon(); + } + + cXyz pos; + s16 angle; + char stage_name[8]; + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag()) { + fopAc_ac_c* player = daPy_getPlayerActorClass(); + pos.set(dMapInfo_n::getMapPlayerPos()); + angle = player->shape_angle.y; + strcpy(stage_name, dMenuFmap_getStartStageName(mpFieldDat)); + } else { + pos = dComIfGs_getPlayerFieldLastStayPos(); + angle = dComIfGs_getPlayerFieldLastStayAngleY(); + strcpy(stage_name, dComIfGs_getPlayerFieldLastStayName()); + } + + u8 is_portal_demo1 = 0; + if (mProcess == PROC_PORTAL_DEMO1) { + is_portal_demo1 = 1; + } + mpDraw2DBack->setIcon2DPos(0x11, stage_name, pos.x, pos.z, cM_sht2d(angle), + is_portal_demo1, param_1); + + if (!param_1) { + if (mIsWarpMap == true && mpPortalDat != NULL) { + dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat; + dMenu_Fmap_portal_data_c::data* portals = portal_dat->mData; + for (int i = 0; i < portal_dat->mCount; i++) { + if (checkDrawPortalIcon(portals[i].mStageNo, portals[i].mSwitchNo)) { + u8 region = mpDraw2DBack->getRegionCursor(); + u8 cVar2 = portals[i].mRegionNo - 1; + if ((mProcess != PROC_PORTAL_WARP_FORBID && mProcess >= PROC_REGION_MAP) + || (mProcess == PROC_PORTAL_WARP_FORBID && mPrevProcess != PROC_ALL_MAP)) + { + if (cVar2 == region) { + mpDraw2DBack->setIcon2DPos(1, portals[i].mPosition.x, + portals[i].mPosition.z, 0.0f, 0, false); + if (mPortalNo == i) { + mpDraw2DBack->setIcon2DPos(0, portals[i].mPosition.x, + portals[i].mPosition.z, 0.0f, 0, false); + } + } + } else { + mpDraw2DBack->setIcon2DPos(1, portals[i].mPosition.x, + portals[i].mPosition.z, 0.0f, 0, false); + } + } + } + } + + if ((mProcess != PROC_PORTAL_WARP_FORBID && mProcess >= PROC_REGION_MAP) + || (mProcess == PROC_PORTAL_WARP_FORBID && mPrevProcess != PROC_ALL_MAP)) + { + drawLightDropIcon(); + drawBatsumarkIcon(); + drawEnterIcon(); + drawSnowmanIcon(); + drawGoldWolfIcon(); + drawCoachIcon(); + } + } } -#pragma pop /* 801CCD98-801CCDDC 1C76D8 0044+00 1/1 0/0 0/0 .text drawLightDropIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawLightDropIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawLightDropIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawLightDropIcon() { + if (isLightVesselGet()) { + drawIcon(4, 5); + } } -#pragma pop /* 801CCDDC-801CCE04 1C771C 0028+00 1/1 0/0 0/0 .text drawBatsumarkIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawBatsumarkIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawBatsumarkIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawBatsumarkIcon() { + drawIcon(5, 0x12); } -#pragma pop /* 801CCE04-801CCE48 1C7744 0044+00 1/1 0/0 0/0 .text drawSnowmanIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawSnowmanIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawSnowmanIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawSnowmanIcon() { + drawIcon(0xd, 9); + drawIcon(0xe, 0xa); } -#pragma pop /* 801CCE48-801CCE70 1C7788 0028+00 1/1 0/0 0/0 .text drawGoldWolfIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawGoldWolfIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawGoldWolfIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawGoldWolfIcon() { + drawIcon(6, 0xb); } -#pragma pop /* 801CCE70-801CCE98 1C77B0 0028+00 1/1 0/0 0/0 .text drawCoachIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawCoachIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawCoachIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawCoachIcon() { + drawIcon(0xa, 0xd); } -#pragma pop /* 801CCE98-801CCFB0 1C77D8 0118+00 1/1 0/0 0/0 .text drawPlayEnterIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawPlayEnterIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawPlayEnterIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawPlayEnterIcon() { + cXyz pos; + s16 angle; + char stage_name[8]; + + if (isRoomCheck(mStayStageNo, dComIfGp_getStartStageRoomNo())) { + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag()) { + pos.set(dMapInfo_n::getMapRestartPos()); + angle = dComIfGs_getRestartRoomAngleY(); + strcpy(stage_name, dMenuFmap_getStartStageName(mpFieldDat)); + } else { + pos = dComIfGs_getPlayerFieldLastStayPos(); + angle = dComIfGs_getPlayerFieldLastStayAngleY(); + strcpy(stage_name, dComIfGs_getPlayerFieldLastStayName()); + } + mpDraw2DBack->setIcon2DPos(0x15, stage_name, pos.x, pos.z, cM_sht2d(angle), 0, false); + } } -#pragma pop /* 801CCFB0-801CD000 1C78F0 0050+00 3/3 0/0 0/0 .text checkDrawPortalIcon__12dMenu_Fmap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::checkDrawPortalIcon(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/checkDrawPortalIcon__12dMenu_Fmap_cFii.s" +bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) { + if (g_fmapHIO.mAllRegionsUnlocked) { + return true; + } + return dComIfGs_isStageSwitch(i_stageNo, i_switchNo); } -#pragma pop /* 801CD000-801CD10C 1C7940 010C+00 3/3 0/0 0/0 .text searchIcon__12dMenu_Fmap_cFUciPfPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::searchIcon(u8 param_0, int param_1, f32* param_2, f32* param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s" +bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o_posZ) { + dMenuFmapIconDisp_c icon; + dMenu_Fmap_stage_data_c* stage_data; + int tmp_r26, stay_no; + bool ret = false; + stay_no = dComIfGp_roomControl_getStayNo(); + tmp_r26 = mStayStageNo; + stage_data = getNowFmapStageData(); + dMenu_Fmap_region_data_c* region_data = getNowFmapRegionData(); + icon.init(region_data, stage_data, i_typeGroupNo, tmp_r26, stay_no); + // icon.init(getNowFmapRegionData(), getNowFmapStageData(), i_typeGroupNo, + // mStayStageNo, dComIfGp_roomControl_getStayNo()); + + while (!icon.getValidData()) { + if (icon.isDrawDisp()) { + int stage_no, room_no; + const dTres_c::data_s* tres_data; + icon.getPosition(&stage_no, &room_no, o_posX, o_posZ, &tres_data); + if (isRoomCheck(stage_no, room_no) && tres_data->mSwBit == i_swBit) { + ret = true; + break; + } + } + + if (icon.nextData()) { + break; + } + } + + return ret; } -#pragma pop /* 801CD10C-801CD210 1C7A4C 0104+00 6/6 0/0 0/0 .text drawIcon__12dMenu_Fmap_cFUci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawIcon(u8 param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s" +void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) { + dMenuFmapIconDisp_c icon; + dMenu_Fmap_stage_data_c* stage_data; + int tmp_r30; + int stay_no = dComIfGp_roomControl_getStayNo(); + tmp_r30 = mStayStageNo; + stage_data = getNowFmapStageData(); + dMenu_Fmap_region_data_c* region_data = getNowFmapRegionData(); + icon.init(region_data, stage_data, i_typeGroupNo, tmp_r30, stay_no); + // icon.init(getNowFmapRegionData(), getNowFmapStageData(), i_typeGroupNo, + // mStayStageNo, dComIfGp_roomControl_getStayNo()); + + while (!icon.getValidData()) { + if (icon.isDrawDisp()) { + f32 pos_x, pos_z; + int stage_no, room_no; + icon.getPosition(&stage_no, &room_no, &pos_x, &pos_z, NULL); + if (isRoomCheck(stage_no, room_no)) { + mpDraw2DBack->setIcon2DPos(param_1, pos_x, pos_z, 0.0f, 0, false); + } + } + + if (icon.nextData()) { + break; + } + } } -#pragma pop /* 801CD210-801CD254 1C7B50 0044+00 1/1 0/0 0/0 .text drawEnterIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawEnterIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawEnterIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawEnterIcon() { + drawIcon(1, 0x14); + drawIcon(8, 0x16); } -#pragma pop /* 801CD254-801CD2FC 1C7B94 00A8+00 1/1 0/0 0/0 .text drawPortalIcon__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawPortalIcon() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawPortalIcon__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawPortalIcon() { + if (mIsWarpMap == true && mpPortalDat != NULL) { + dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat; + dMenu_Fmap_portal_data_c::data* portals = portal_dat->mData; + for (int i = 0; i < portal_dat->mCount; i++) { + if (checkDrawPortalIcon(portals[i].mStageNo, portals[i].mSwitchNo)) { + mpDraw2DBack->setIcon2DPos(1, portals[i].mPosition.x, portals[i].mPosition.z, + 0.0f, 0, false); + } + } + } } -#pragma pop /* 801CD2FC-801CD350 1C7C3C 0054+00 1/1 0/0 0/0 .text getRegionStageNum__12dMenu_Fmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::getRegionStageNum(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/getRegionStageNum__12dMenu_Fmap_cFi.s" +u8 dMenu_Fmap_c::getRegionStageNum(int param_0) { + if (mpFieldDat != NULL) { + dMenu_Fmap_field_region_data_c* region_data + = (dMenu_Fmap_field_region_data_c*)((int)mpFieldDat + mpFieldDat->mRegionDataOffset); + dMenu_Fmap_field_region_data_c::data* regions = region_data->mData; + for (int i = 0; i < region_data->mCount; i++) { + if (param_0 == regions[i].mTextureReadNum) { + return regions[i].field_0x1; + } + } + } + + return 0; } -#pragma pop /* 801CD350-801CD368 1C7C90 0018+00 6/6 0/0 0/0 .text getNowFmapRegionData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::getNowFmapRegionData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getNowFmapRegionData__12dMenu_Fmap_cFv.s" +dMenu_Fmap_region_data_c* dMenu_Fmap_c::getNowFmapRegionData() { + return mpRegionData[mpDraw2DBack->getRegionCursor()]; } -#pragma pop /* 801CD368-801CD380 1C7CA8 0018+00 2/2 0/0 0/0 .text getNowFmapStageData__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::getNowFmapStageData() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getNowFmapStageData__12dMenu_Fmap_cFv.s" +dMenu_Fmap_stage_data_c* dMenu_Fmap_c::getNowFmapStageData() { + return mpStageData[mpDraw2DBack->getRegionCursor()]; } -#pragma pop /* 801CD380-801CD3F0 1C7CC0 0070+00 1/1 0/0 0/0 .text searchPortalStageID__12dMenu_Fmap_cFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::searchPortalStageID(char* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/searchPortalStageID__12dMenu_Fmap_cFPc.s" +u8 dMenu_Fmap_c::searchPortalStageID(char* param_0) { + for (int i = 0; i < 20; i++) { + if (!strcmp(param_0, mStageName[i])) { + return i; + } + } + return 0xff; } -#pragma pop /* 801CD3F0-801CD460 1C7D30 0070+00 1/1 0/0 0/0 .text drawDebugStage__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::drawDebugStage() { - nofralloc -#include "asm/d/menu/d_menu_fmap/drawDebugStage__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::drawDebugStage() { + if (mProcess != PROC_ALL_MAP) { + mpDraw2DBack->setDebugData(mpMenuFmapMap, getNowFmapRegionData(), mStayStageNo); + } else { + mpDraw2DBack->setDebugData(NULL, NULL, 0); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454168-8045416C 002768 0004+00 1/1 0/0 0/0 .sdata2 @7300 */ -SECTION_SDATA2 static f32 lit_7300 = -50.0f; /* 801CD460-801CD5CC 1C7DA0 016C+00 1/1 0/0 0/0 .text arrowPosInit__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::arrowPosInit() { - nofralloc -#include "asm/d/menu/d_menu_fmap/arrowPosInit__12dMenu_Fmap_cFv.s" -} -#pragma pop +void dMenu_Fmap_c::arrowPosInit() { + if (mProcess == PROC_TABLE_DEMO1) { + tableArrowPosInit(false); + } else if (mProcess == PROC_HOWL_DEMO1) { + howlArrowPosInit(); + } else if (mpDraw2DBack->getRegionCursor() + 1 == dComIfGp_getNowLevel()) { + cXyz pos; + char stage_name[8]; + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag()) { + pos.set(dMapInfo_n::getMapPlayerPos()); + strcpy(stage_name, dMenuFmap_getStartStageName(mpFieldDat)); + } else { + pos = dComIfGs_getPlayerFieldLastStayPos(); + strcpy(stage_name, dComIfGs_getPlayerFieldLastStayName()); + } + + f32 fVar1 = 0.0f; + if (mProcess == PROC_LIGHT_DEMO1) { + f32 pos1_x, pos2_x, pos1_z, pos2_z; + mpDraw2DBack->calcAllMapPosWorld(0.0f, 0.0f, &pos2_x, &pos2_z); + mpDraw2DBack->calcAllMapPosWorld(0.0f, -50.0f, &pos1_x, &pos1_z); + fVar1 = pos1_z - pos2_z; + } -/* ############################################################################################## */ -/* 8045416C-80454170 00276C 0004+00 2/2 0/0 0/0 .sdata2 @7348 */ -SECTION_SDATA2 static f32 lit_7348 = -20.0f; + mpDraw2DBack->setArrowPos3D(mpDraw2DBack->getRegionCursor(), stage_name, + pos.x, pos.z + fVar1); + } else { + mpDraw2DBack->setArrowPos3D(mpDraw2DBack->getRegionCursor(), NULL, + mpDraw2DBack->getRegionOriginX(mpDraw2DBack->getRegionCursor()), + mpDraw2DBack->getRegionOriginZ(mpDraw2DBack->getRegionCursor())); + } +} /* 801CD5CC-801CD770 1C7F0C 01A4+00 2/2 0/0 0/0 .text tableArrowPosInit__12dMenu_Fmap_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::tableArrowPosInit(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap/tableArrowPosInit__12dMenu_Fmap_cFb.s" +void dMenu_Fmap_c::tableArrowPosInit(bool param_0) { + int iVar5 = -1; + int swbit; + switch (dMeter2Info_getTableMapRegionNo()) { + case dMeter_fmapHIO_c::REGION_LANAYRU: + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x169]) + || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x67])) + { + iVar5 = 0; + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x108])) { + swbit = 0x4f; + } else { + swbit = 0x33; + } + } else { + iVar5 = 1; + swbit = 0x2a; + } + break; + case dMeter_fmapHIO_c::REGION_ELDIN: + iVar5 = 2; + swbit = 0x55; + break; + case dMeter_fmapHIO_c::REGION_FARON: + iVar5 = 3; + swbit = 0x5f; + break; + } + + static char* stage_name[4] = {"F_SP115", "F_SP113", "F_SP109", "F_SP108"}; + strcpy(mMarkedStageName, stage_name[iVar5]); + + if (param_0) { + f32 pos1_x, pos2_x, pos1_z, pos2_z, icon_x, icon_z; + searchIcon(5, swbit, &icon_x, &icon_z); + mpDraw2DBack->calcAllMapPosWorld(0.0f, 0.0f, &pos2_x, &pos2_z); + mpDraw2DBack->calcAllMapPosWorld(0.0f, -20.0f, &pos1_x, &pos1_z); + mpDraw2DBack->setArrowPosAxis(icon_x, icon_z + (pos1_z - pos2_z)); + } else { + mpDraw2DBack->setArrowPos3D(mpDraw2DBack->getRegionCursor(), mMarkedStageName, + mpDraw2DBack->getRegionOriginX(mpDraw2DBack->getRegionCursor()), + mpDraw2DBack->getRegionOriginZ(mpDraw2DBack->getRegionCursor())); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454170-80454174 002770 0004+00 1/1 0/0 0/0 .sdata2 @7356 */ -SECTION_SDATA2 static f32 lit_7356 = -38552.46875f; - -/* 80454174-80454178 002774 0004+00 1/1 0/0 0/0 .sdata2 @7357 */ -SECTION_SDATA2 static f32 lit_7357 = 38647.58984375f; /* 801CD770-801CD814 1C80B0 00A4+00 1/1 0/0 0/0 .text yamibossArrowPosInit__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::yamibossArrowPosInit() { - nofralloc -#include "asm/d/menu/d_menu_fmap/yamibossArrowPosInit__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::yamibossArrowPosInit() { + f32 pos1_x, pos2_x, pos1_z, pos2_z, icon_x, icon_z; + if (!searchIcon(4, 0x75, &icon_x, &icon_z)) { + icon_x = -38552.47f; + icon_z = 38647.59f; + } + mpDraw2DBack->calcAllMapPosWorld(0.0f, 0.0f, &pos2_x, &pos2_z); + mpDraw2DBack->calcAllMapPosWorld(0.0f, -20.0f, &pos1_x, &pos1_z); + mpDraw2DBack->setArrowPosAxis(icon_x, icon_z + (pos1_z - pos2_z)); } -#pragma pop - -/* ############################################################################################## */ -/* 803960D0-803960E8 022730 0018+00 1/1 0/0 0/0 .rodata i_swBit$7362 */ -SECTION_RODATA static u8 const i_swBit[24] = { - 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x2A, - 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x32, -}; -COMPILER_STRIP_GATE(0x803960D0, &i_swBit); /* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::howlArrowPosInit() { - nofralloc -#include "asm/d/menu/d_menu_fmap/howlArrowPosInit__12dMenu_Fmap_cFv.s" +void dMenu_Fmap_c::howlArrowPosInit() { + u8 type = dMeter2Info_getGoldWolfMapType(); + static char* stage_name[6] = {"F_SP104", "F_SP122", "F_SP122", "F_SP124", "F_SP111", "F_SP116"}; + strcpy(mMarkedStageName, stage_name[type - 2]); + static const int i_swBit[6] = {0x41, 0x29, 0x2a, 0x32, 0x79, 0x32}; + f32 icon_x, icon_z; + if (searchIcon(6, i_swBit[type - 2], &icon_x, &icon_z)) { + mpDraw2DBack->setArrowPos3DOffset(mpDraw2DBack->getRegionCursor(), mMarkedStageName, + icon_x, icon_z, 0.0f); + } } -#pragma pop /* 801CD8B4-801CD92C 1C81F4 0078+00 1/1 0/0 0/0 .text getHowlRegionID__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::getHowlRegionID() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getHowlRegionID__12dMenu_Fmap_cFv.s" +u8 dMenu_Fmap_c::getHowlRegionID() { + switch (dMeter2Info_getGoldWolfMapType()) { + case 2: + return 1; + case 3: + return 4; + case 4: + return 4; + case 5: + return 5; + case 6: + return 3; + case 7: + return 4; + default: + return 1; + } } -#pragma pop /* 801CD92C-801CD95C 1C826C 0030+00 1/1 0/0 0/0 .text isLightVesselGet__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::isLightVesselGet() { - nofralloc -#include "asm/d/menu/d_menu_fmap/isLightVesselGet__12dMenu_Fmap_cFv.s" +bool dMenu_Fmap_c::isLightVesselGet() { + return (bool)dComIfGp_isLightDropMapVisible(); } -#pragma pop /* 801CD95C-801CDA2C 1C829C 00D0+00 1/1 0/0 0/0 .text getPlayerPos2D__12dMenu_Fmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap_c::getPlayerPos2D() { - nofralloc -#include "asm/d/menu/d_menu_fmap/getPlayerPos2D__12dMenu_Fmap_cFv.s" +cXyz* dMenu_Fmap_c::getPlayerPos2D() { + cXyz pos; + char stage_name[8]; + if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag()) { + pos.set(dMapInfo_n::getMapPlayerPos()); + strcpy(stage_name, dMenuFmap_getStartStageName(mpFieldDat)); + } else { + pos = dComIfGs_getPlayerFieldLastStayPos(); + strcpy(stage_name, dComIfGs_getPlayerFieldLastStayName()); + } + mpDraw2DBack->calcAllMapPos2D(stage_name, pos.x - mpDraw2DBack->getStageTransX(), + pos.z - mpDraw2DBack->getStageTransZ(), + &mPlayerPos.x, &mPlayerPos.y); + mPlayerPos.z = 0.0f; + return &mPlayerPos; } -#pragma pop - -/* 801CDA2C-801CDA74 1C836C 0048+00 2/1 0/0 0/0 .text __dt__9dMf_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMf_HIO_c::~dMf_HIO_c() { - nofralloc -#include "asm/d/menu/d_menu_fmap/__dt__9dMf_HIO_cFv.s" -} -#pragma pop - -/* 801CDA74-801CE068 1C83B4 05F4+00 0/0 1/0 0/0 .text __sinit_d_menu_fmap_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_menu_fmap_cpp() { - nofralloc -#include "asm/d/menu/d_menu_fmap/__sinit_d_menu_fmap_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801CDA74, __sinit_d_menu_fmap_cpp); -#pragma pop - -/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp index e6545f8395..e6f9881cf0 100644 --- a/src/d/menu/d_menu_fmap2D.cpp +++ b/src/d/menu/d_menu_fmap2D.cpp @@ -13,327 +13,93 @@ #include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" +#include "d/menu/d_menu_fmap.h" #include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" #include "d/msg/d_msg_class.h" #include "d/msg/d_msg_scrn_explain.h" -#include "dol2asm.h" #include "m_Do/m_Do_graphic.h" - -// -// Forward References: -// - -extern "C" void __ct__18dMenu_Fmap2DBack_cFv(); -extern "C" void __dt__18dMenu_Fmap2DBack_cFv(); -extern "C" void draw__18dMenu_Fmap2DBack_cFv(); -extern "C" void setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff(); -extern "C" void calcAllMapPos__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf(); -extern "C" void calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf(); -extern "C" void calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf(); -extern "C" void calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff(); -extern "C" void calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf(); -extern "C" void setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG(); -extern "C" void deleteSpotPane__18dMenu_Fmap2DBack_cFv(); -extern "C" void zoomMapCalc__18dMenu_Fmap2DBack_cFf(); -extern "C" void zoomMapCalc2__18dMenu_Fmap2DBack_cFf(); -extern "C" void zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv(); -extern "C" void scrollCalc__18dMenu_Fmap2DBack_cFf(); -extern "C" void mapBlink__18dMenu_Fmap2DBack_cFPs(); -extern "C" void setSpotCursor__18dMenu_Fmap2DBack_cFUc(); -extern "C" void allmap_move2__18dMenu_Fmap2DBack_cFP9STControl(); -extern "C" void setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb(); -extern "C" void setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb(); -extern "C" void setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb(); -extern "C" void isShowRegion__18dMenu_Fmap2DBack_cFi(); -extern "C" void getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaSizeX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapAreaSizeY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv(); -extern "C" void getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcRenderingPos__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcRenderingScale__18dMenu_Fmap2DBack_cFv(); -extern "C" void getPathScale__18dMenu_Fmap2DBack_cFf(); -extern "C" void getAllMapZoomRate__18dMenu_Fmap2DBack_cFv(); -extern "C" void getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi(); -extern "C" void getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv(); -extern "C" void getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf(); -extern "C" void calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf(); -extern "C" void regionTextureDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void stageTextureDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void worldGridDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void regionGridDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void worldOriginDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void scrollAreaDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void regionOriginDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void stageOriginDraw__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcBlink__18dMenu_Fmap2DBack_cFv(); -extern "C" void calcBackAlpha__18dMenu_Fmap2DBack_cFb(); -extern "C" void btkAnimeLoop__18dMenu_Fmap2DBack_cFf(); -extern "C" void setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc(); -extern "C" void regionMapMove__18dMenu_Fmap2DBack_cFP9STControl(); -extern "C" void stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb(); -extern "C" void setAllAlphaRate__18dMenu_Fmap2DBack_cFfb(); -extern "C" void drawDebugStageArea__18dMenu_Fmap2DBack_cFv(); -extern "C" void drawDebugRegionArea__18dMenu_Fmap2DBack_cFv(); -extern "C" void setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff(); -extern "C" void setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff(); -extern "C" void calcDrawPriority__18dMenu_Fmap2DBack_cFv(); -extern "C" void setArrowPosAxis__18dMenu_Fmap2DBack_cFff(); -extern "C" void __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl(); -extern "C" void __dt__17dMenu_Fmap2DTop_cFv(); -extern "C" void _execute__17dMenu_Fmap2DTop_cFv(); -extern "C" void setAllAlphaRate__17dMenu_Fmap2DTop_cFfb(); -extern "C" void draw__17dMenu_Fmap2DTop_cFv(); -extern "C" void btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf(); -extern "C" void setMoyaAlpha__17dMenu_Fmap2DTop_cFUc(); -extern "C" void setTitleNameString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void setAreaNameString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void setZButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setBButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setAButtonString__17dMenu_Fmap2DTop_cFUlUc(); -extern "C" void setCrossLRString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void set3DStickString__17dMenu_Fmap2DTop_cFUl(); -extern "C" void createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl(); -extern "C" void deleteExplain__17dMenu_Fmap2DTop_cFv(); -extern "C" void setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf(); -extern "C" void setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha(); -extern "C" void setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha(); -extern "C" void setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha(); -extern "C" void checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv(); -extern "C" void checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi(); -extern "C" void checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv(); -extern "C" void checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv(); -extern "C" void setHIO__17dMenu_Fmap2DTop_cFb(); -extern "C" void isWarpAccept__17dMenu_Fmap2DTop_cFv(); -extern "C" static void func_801D810C(); -extern "C" extern char const* const d_menu_d_menu_fmap2D__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_getRubyFont__Fv(); -extern "C" void dComIfGs_isStageSwitch__Fii(); -extern "C" void dComIfGp_getNowLevel__Fv(); -extern "C" void isRegionBit__33dSv_player_field_last_stay_info_cCFi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void __ct__16dMenuMapCommon_cFv(); -extern "C" void __dt__16dMenuMapCommon_cFv(); -extern "C" void initiate__16dMenuMapCommon_cFP10JKRArchive(); -extern "C" void drawIcon__16dMenuMapCommon_cFffff(); -extern "C" void setIconInfo__16dMenuMapCommon_cFUcfffffUc(); -extern "C" void blinkMove__16dMenuMapCommon_cFs(); -extern "C" void moveLightDropAnime__16dMenuMapCommon_cFv(); -extern "C" void getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi(); -extern "C" void __ct__14dMeterHaihai_cFUc(); -extern "C" void drawHaihai__14dMeterHaihai_cFUc(); -extern "C" void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void dMeter2Info_getPixel__FffffffPC7ResTIMG(); -extern "C" void __ct__17dMsgScrnExplain_cFP9STControlUcbUc(); -extern "C" void draw__17dMsgScrnExplain_cFP13J2DOrthoGraph(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void getAlphaRate__13CPaneMgrAlphaFv(); -extern "C" void __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void setBackupAlpha__17CPaneMgrAlphaMorfFv(); -extern "C" void setAlphaMorfRate__17CPaneMgrAlphaMorfFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -extern "C" void func_802E90C0(); -extern "C" void J2DDrawLine__FffffQ28JUtility6TColori(); -extern "C" void J2DFillBox__FffffQ28JUtility6TColor(); -extern "C" void J2DDrawFrame__FffffQ28JUtility6TColorUc(); -extern "C" void rotate__7J2DPaneFff13J2DRotateAxisf(); -extern "C" void getParentPane__7J2DPaneFv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void __ct__10J2DPictureFPC7ResTIMG(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -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_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ - -/* 803BD750-803BD760 01A870 0010+00 2/2 0/0 0/0 .data __vt__17dMenu_Fmap2DTop_c */ -SECTION_DATA extern void* __vt__17dMenu_Fmap2DTop_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__17dMenu_Fmap2DTop_cFv, - (void*)__dt__17dMenu_Fmap2DTop_cFv, -}; - -/* 803BD760-803BD780 01A880 001C+04 2/2 0/0 0/0 .data __vt__18dMenu_Fmap2DBack_c */ -SECTION_DATA extern void* __vt__18dMenu_Fmap2DBack_c[7 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__18dMenu_Fmap2DBack_cFv, - (void*)NULL, - (void*)NULL, - (void*)func_801D810C, - (void*)__dt__18dMenu_Fmap2DBack_cFv, - /* padding */ - NULL, -}; - -/* ############################################################################################## */ -/* 80396248-80396268 0228A8 0020+00 2/2 0/0 0/0 .rodata cur_tag$3868 */ -SECTION_RODATA static u8 const cur_tag_3868[32] = { - 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, - 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, -}; -COMPILER_STRIP_GATE(0x80396248, &cur_tag_3868); - -/* 804541D0-804541D4 0027D0 0004+00 21/21 0/0 0/0 .sdata2 @3970 */ -SECTION_SDATA2 static u8 lit_3970[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 804541D4-804541D8 0027D4 0004+00 14/14 0/0 0/0 .sdata2 @3971 */ -SECTION_SDATA2 static f32 lit_3971 = 1.0f; - -/* 804541D8-804541DC 0027D8 0004+00 2/2 0/0 0/0 .sdata2 @3972 */ -SECTION_SDATA2 static f32 lit_3972 = 360.0f; - -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo"; -SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo"; -SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk"; -SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo"; -#pragma pop +#include "rel/d/a/d_a_midna/d_a_midna.h" /* 801CF56C-801CFCDC 1C9EAC 0770+00 0/0 1/1 0/0 .text __ct__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dMeter2Info_setMapDrugFlag(0); for (int i = 0; i < 8; i++) { mpAreaTex[i] = NULL; - field_0xe8c[i] = 0.0; - field_0xeac[i] = 0.0; - field_0xecc[i] = 0.0; - field_0xeec[i] = 0.0; + mRegionMinMapX[i] = 0.0; + mRegionMinMapY[i] = 0.0; + mRegionMapSizeX[i] = 0.0; + mRegionMapSizeY[i] = 0.0; field_0xf0c[i] = 0.0; field_0xf2c[i] = 0.0; field_0xf4c[i] = 0.0; field_0xf6c[i] = 0.0; - field_0x1004[i] = 0.0; - field_0x1024[i] = 0.0; - field_0xce8[i].field_0x0 = 0.0; - field_0xce8[i].field_0x4 = 0.0; - field_0xce8[i].field_0x8 = 0.0; - field_0xce8[i].field_0xc = 0.0; - field_0xce8[i].field_0x10 = 0.0; - field_0x121c[i] = 0xff; + mRegionOriginX[i] = 0.0; + mRegionOriginZ[i] = 0.0; + mRegionTexData[i].mMinX = 0.0; + mRegionTexData[i].mMinZ = 0.0; + mRegionTexData[i].mMaxX = 0.0; + mRegionTexData[i].mMaxZ = 0.0; + mRegionTexData[i].mScale = 0.0; + mRegionTextureReadNum[i] = 0xff; field_0x1230[i] = 0xff; - field_0xd8c[i] = 0.0; - field_0xdac[i] = 0.0; - field_0xdcc[i] = 0.0; - field_0xdec[i] = 0.0; - field_0xe0c[i] = 0.0; - field_0xe2c[i] = 0.0; - field_0xe4c[i] = 0.0; - field_0xe6c[i] = 0.0; + mRegionScrollMinX[i] = 0.0; + mRegionScrollMinZ[i] = 0.0; + mRegionScrollMaxX[i] = 0.0; + mRegionScrollMaxZ[i] = 0.0; + mRegionScrollMapMinX[i] = 0.0; + mRegionScrollMapMinY[i] = 0.0; + mRegionScrollMapMaxX[i] = 0.0; + mRegionScrollMapMaxY[i] = 0.0; } for (int i = 0; i < 20; i++) { - field_0x1044[i] = 0.0; - field_0x1094[i] = 0.0; - field_0x10e4[i] = 0.0; - field_0x1134[i] = 0.0; + mStageOriginX[i] = 0.0; + mStageOriginZ[i] = 0.0; + mStageOriginPathX[i] = 0.0; + mStageOriginPathZ[i] = 0.0; } mpStages = NULL; - field_0xfe0 = 0.0; - field_0xfe4 = 0.0; - field_0xfe8 = 0.0; - field_0xfec = 0.0; + mTexMinX = 0.0; + mTexMinZ = 0.0; + mTexMaxX = 0.0; + mTexMaxZ = 0.0; mAllMapScaleRate = 0.0; - field_0xff4 = 0.0; - field_0xff8 = 0.0; - field_0xffc = 0.0; - field_0x1000 = 0.0; + mWorldMinX = 0.0; + mWorldMinZ = 0.0; + mWorldMaxX = 0.0; + mWorldMaxZ = 0.0; field_0x1184 = 0.0; field_0x1188 = 0.0; - field_0xf8c = 0.0; - field_0xf90 = 0.0; - field_0xf94 = 1.0; + mRenderingPosX = 0.0; + mRenderingPosZ = 0.0; + mRenderingScale = 1.0; field_0xf98 = 1.0; - field_0xfa0 = 0.0; - field_0xf9c = getAllMapZoomRate(); + mMapZoomRate = 0.0; + mZoom = getAllMapZoomRate(); field_0xfa4 = 1.0; field_0xfa8 = 0.0; mpBackTex = NULL; mpSpotTexture = NULL; - field_0xfbc = 0.0; - field_0xfc0 = 0.0; - field_0xfc4 = 0.0; - field_0xcdc = 0; + mTransX = 0.0; + mTransZ = 0.0; + mAlphaRate = 0.0; + mpMenuFmapMap = NULL; mpMeterHaihai = NULL; field_0x122d = 0; - field_0x122e = 0; - field_0x1224 = 0; - field_0x1225 = 0; - field_0xfc8 = 0.0; - field_0xfcc = 0.0; + field_0x122e = false; + mSpotNum = 0; + mStageDataNum = 0; + mStageTransX = 0.0; + mStageTransZ = 0.0; field_0xfd0 = 0.0; field_0xfd4 = 0.0; field_0xfd8 = 0.0; field_0xfdc = 0.0; - control_ypos = 0.0; control_xpos = 0.0; + control_ypos = 0.0; field_0x11b4 = 0.0; field_0x11b8 = 0.0; field_0x11bc = 0.0; @@ -343,48 +109,48 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { field_0x11cc = 0.0; field_0x11d0 = 0.0; mRegionFlag = 0; - field_0x1239 = 0; + mMapDrawFlag = false; field_0x1238 = 0; field_0x1218 = 0; field_0x121a = 0; - field_0x1226 = 0xff; - field_0x1227 = 0; + mSelectRegion = 0xff; + mRegionCursor = 0; field_0x1228 = 0; - field_0x1229 = 0; + mSpotCursor = 0; field_0x122a = 0; field_0x122b = 1; field_0xfb0 = 0.0; field_0xfb4 = 0.0; field_0xfb8 = 1.0; - field_0x11d4 = 0.0; - field_0x1190 = 0.0; - field_0x118c = 0.0; + mArrowAlpha = 0.0; + mArrowPos3DZ = 0.0; + mArrowPos3DX = 0.0; field_0x11a8 = 0.0; field_0x11a4 = 0.0; field_0x11b0 = 0.0; field_0x11ac = 0.0; - field_0x1198 = 0.0; - field_0x1194 = 0.0; - field_0x11d8 = 0.0; + mArrowPos2DY = 0.0; + mArrowPos2DX = 0.0; + mSpotTextureFadeAlpha = 0.0; field_0x11dc = 0.0; field_0x11e0 = 360.0; - field_0x11e4 = 0.0; + mBackAlpha = 0.0; field_0x11e8 = 0.0; field_0x11ec = 0.0; - field_0x11f0.set(0, 0, 0, 0); - field_0x11f4.set(255, 255, 255, 255); - field_0x11f8.set(0, 0, 0, 0); - field_0x11fc.set(255, 255, 255, 255); - field_0x1200.set(0, 0, 0, 0); - field_0x1204.set(0, 0, 0, 255); + mSelectedRegionBlack.set(0, 0, 0, 0); + mSelectedRegionWhite.set(255, 255, 255, 255); + mUnselectedRegionBlack.set(0, 0, 0, 0); + mUnselectedRegionWhite.set(255, 255, 255, 255); + mUnreachedRegionBlack.set(0, 0, 0, 0); + mUnreachedRegionWhite.set(0, 0, 0, 255); field_0x1208.set(0, 0, 0, 0); field_0x120c.set(0, 0, 0, 255); field_0x1210 = 1.0; field_0x1214 = 1.0; - mArrowDrawFlag = 1; - field_0x122f = 0; + mArrowDrawFlag = true; + mAllPathShowFlag = false; initiate(dComIfGp_getFmapResArchive()); @@ -406,11 +172,11 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpBaseScreen); - mpBaseAnm = J2DAnmLoaderDataBase::load( - JKRGetNameResource("zelda_map_screen_base.btk", dComIfGp_getFmapResArchive())); + mpBaseAnm = static_cast(J2DAnmLoaderDataBase::load( + JKRGetNameResource("zelda_map_screen_base.btk", dComIfGp_getFmapResArchive()))); mpBaseAnm->searchUpdateMaterialID(mpBaseScreen); - field_0xfac = 0.0; + mAnmFrame = 0.0; mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); JUT_ASSERT(264, mpBaseRoot != 0); @@ -459,15 +225,6 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dMeter2Info_set2DPosV(getMapScissorAreaLY()); setDebugData(NULL, NULL, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __ct__18dMenu_Fmap2DBack_cFv(){nofralloc -#include "asm/d/menu/d_menu_fmap2D/__ct__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801CFCDC-801CFF34 1CA61C 0258+00 2/1 0/0 0/0 .text __dt__18dMenu_Fmap2DBack_cFv */ dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() { @@ -512,42 +269,7 @@ dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() { dMeter2Info_setMapDrugFlag(0); } -/* 80396268-80396288 0228C8 0020+00 1/1 0/0 0/0 .rodata cur_tag$4092 */ -SECTION_RODATA static u8 const cur_tag_4092[32] = { - 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, - 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, -}; -COMPILER_STRIP_GATE(0x80396268, &cur_tag_4092); - -/* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */ -SECTION_SDATA2 static f32 lit_4199 = 608.0f; - -/* 804541E0-804541E4 0027E0 0004+00 5/5 0/0 0/0 .sdata2 @4200 */ -SECTION_SDATA2 static f32 lit_4200 = 448.0f; - -/* 804541E4-804541E8 0027E4 0004+00 4/4 0/0 0/0 .sdata2 @4201 */ -SECTION_SDATA2 static f32 lit_4201 = 255.0f; - -/* 804541E8-804541EC 0027E8 0004+00 18/18 0/0 0/0 .sdata2 @4202 */ -SECTION_SDATA2 static f32 lit_4202 = 0.5f; - -/* 804541EC-804541F0 0027EC 0004+00 2/2 0/0 0/0 .sdata2 @4203 */ -SECTION_SDATA2 static f32 lit_4203 = 2.0f; - -/* 804541F0-804541F4 0027F0 0004+00 5/5 0/0 0/0 .sdata2 @4204 */ -SECTION_SDATA2 static f32 lit_4204 = 3.0f; - -/* 804541F4-804541F8 0027F4 0004+00 6/6 0/0 0/0 .sdata2 @4205 */ -SECTION_SDATA2 static f32 lit_4205 = 6.0f; - -/* 804541F8-80454200 0027F8 0008+00 4/4 0/0 0/0 .sdata2 @4207 */ -SECTION_SDATA2 static f64 lit_4207 = 4503599627370496.0 /* cast u32 to float */; - -/* ############################################################################################## */ - /* 801CFF34-801D0804 1CA874 08D0+00 1/0 0/0 0/0 .text draw__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::draw() { calcBlink(); @@ -558,17 +280,17 @@ void dMenu_Fmap2DBack_c::draw() { u32 scissorLeft, scissorTop, scissorWidth, scissorHeight; GXGetScissor(&scissorLeft, &scissorTop, &scissorWidth, &scissorHeight); - grafPort->scissor(field_0xfbc, 0.0f, 608.0f, 448.0f); + grafPort->scissor(mTransX, 0.0f, 608.0f, 448.0f); grafPort->setScissor(); mpBackTex->setBlackWhite(field_0x1208, field_0x120c); - mpBackTex->setAlpha(field_0xfc4 * 255.0f * g_fmapHIO.mBackgroundAlpha); - mpBackTex->draw(field_0xfbc + mDoGph_gInf_c::getMinXF(), - field_0xfc0 + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), + mpBackTex->setAlpha(mAlphaRate * 255.0f * g_fmapHIO.mBackgroundAlpha); + mpBackTex->draw(mTransX + mDoGph_gInf_c::getMinXF(), + mTransZ + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false, false); - mpBackScreen->draw(field_0xfbc, field_0xfc0, grafPort); - mpBaseScreen->draw(field_0xfbc, field_0xfc0, grafPort); + mpBackScreen->draw(mTransX, mTransZ, grafPort); + mpBaseScreen->draw(mTransX, mTransZ, grafPort); Mtx mtx; Vec vec1 = mpMapArea->getGlobalVtx(&mtx, 0, false, 0); @@ -578,13 +300,13 @@ void dMenu_Fmap2DBack_c::draw() { f32 width = mDoGph_gInf_c::getWidthF() / 608.0f; f32 height = mDoGph_gInf_c::getHeightF() / 448.0f; - grafPort->scissor(field_0xfbc + ((vec1.x - mDoGph_gInf_c::getMinXF()) / width), - field_0xfc0 + (vec1.y / height), (vec2.x - vec1.x) / width, + grafPort->scissor(mTransX + ((vec1.x - mDoGph_gInf_c::getMinXF()) / width), + mTransZ + (vec1.y / height), (vec2.x - vec1.x) / width, (vec2.y - vec1.y) / height); grafPort->setScissor(); - field_0x11dc = (field_0xfbc + getMapScissorAreaLX()) + (getMapScissorAreaSizeRealX() * 0.5f); + field_0x11dc = (mTransX + getMapScissorAreaLX()) + (getMapScissorAreaSizeRealX() * 0.5f); if (g_fmapHIO.mRangeCheck && g_fmapHIO.mRangeCheckDrawPriority) { drawDebugRegionArea(); @@ -596,7 +318,7 @@ void dMenu_Fmap2DBack_c::draw() { drawDebugStageArea(); } - if (field_0x1239 && mpSpotTexture) { + if (mMapDrawFlag && mpSpotTexture) { if (g_fmapHIO.mDisplayRegionGrid && g_fmapHIO.mRegionGridWidth > 0.0f) { regionGridDraw(); } @@ -627,7 +349,7 @@ void dMenu_Fmap2DBack_c::draw() { blinkMove(30); moveLightDropAnime(); setCenterPosX(field_0x11dc, 1); - drawIcon(field_0xfbc, field_0xfc0, field_0xfc4, field_0xfa8 * field_0x11d8); + drawIcon(mTransX, mTransZ, mAlphaRate, field_0xfa8 * mSpotTextureFadeAlpha); if (g_fmapHIO.mRangeCheck && !g_fmapHIO.mRangeCheckDrawPriority) { drawDebugRegionArea(); @@ -641,8 +363,8 @@ void dMenu_Fmap2DBack_c::draw() { f32 fVar3 = 0.0f; f32 fVar4, fVar5; - if (field_0xfa0 > 1.0f && field_0xfa0 < 2.0f) { - f32 tmp = 2.0f - field_0xfa0; + if (mMapZoomRate > 1.0f && mMapZoomRate < 2.0f) { + f32 tmp = 2.0f - mMapZoomRate; if (field_0x11a4 != 0.0f) { fVar2 = field_0x11a4 * tmp; } @@ -652,13 +374,13 @@ void dMenu_Fmap2DBack_c::draw() { fVar4 = field_0x11ac; fVar5 = field_0x11b0; } else { - fVar4 = field_0xfc8; - fVar5 = field_0xfcc; + fVar4 = mStageTransX; + fVar5 = mStageTransZ; } - calcAllMapPos2D((field_0x118c + control_ypos + fVar2) - fVar4, - (field_0x1190 + control_xpos + fVar3) - fVar5, &field_0x1194, - &field_0x1198); + calcAllMapPos2D((mArrowPos3DX + control_xpos + fVar2) - fVar4, + (mArrowPos3DZ + control_ypos + fVar3) - fVar5, &mArrowPos2DX, + &mArrowPos2DY); field_0x11e0 -= g_fmapHIO.mCursorSpeed; @@ -681,13 +403,13 @@ void dMenu_Fmap2DBack_c::draw() { } } - mpPointParent->setAlphaRate(field_0x11d4 * field_0x11d8); - mpPointParent->translate(field_0x1194 + field_0xfbc, field_0x1198 + field_0xfc0); + mpPointParent->setAlphaRate(mArrowAlpha * mSpotTextureFadeAlpha); + mpPointParent->translate(mArrowPos2DX + mTransX, mArrowPos2DY + mTransZ); mpPointScreen->draw(0.0f, 0.0f, grafPort); } if (g_fmapHIO.mDisplayReferenceArea) { - J2DDrawFrame(field_0xfbc + getMapAreaGlobalPosX(), field_0xfc0 + getMapAreaGlobalPosY(), + J2DDrawFrame(mTransX + getMapAreaGlobalPosX(), mTransZ + getMapAreaGlobalPosY(), getMapAreaSizeX(), getMapAreaSizeY(), JUtility::TColor(255, 255, 255, 255), 6); J2DFillBox(getMapAreaGlobalCenterPosX() - 3.0f, getMapAreaGlobalCenterPosY() - 3.0f, 6.0f, 6.0f, JUtility::TColor(255, 255, 255, 255)); @@ -703,136 +425,108 @@ void dMenu_Fmap2DBack_c::draw() { } mpBackTex->setBlackWhite(field_0x1208, field_0x120c); - mpBackTex->setAlpha((field_0xfc4 * 255.0f) * g_fmapHIO.mBackgroundFrontAlpha * field_0x11e4); - mpBackTex->draw(field_0xfbc + mDoGph_gInf_c::getMinXF(), - field_0xfc0 + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), + mpBackTex->setAlpha((mAlphaRate * 255.0f) * g_fmapHIO.mBackgroundFrontAlpha * mBackAlpha); + mpBackTex->draw(mTransX + mDoGph_gInf_c::getMinXF(), + mTransZ + mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false, false); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::draw(){nofralloc -#include "asm/d/menu/d_menu_fmap2D/draw__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80454200-80454208 002800 0004+04 4/4 0/0 0/0 .sdata2 @4260 */ -SECTION_SDATA2 static f32 lit_4260[1 + 1 /* padding */] = { - 100.0f, - /* padding */ - 0.0f, -}; /* 801D0804-801D0AC8 1CB144 02C4+00 0/0 1/1 0/0 .text * setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff */ -#ifdef NONMATCHING -// Matches with literals -void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_areaType, ResTIMG* i_timg, f32 param_2, f32 param_3, - f32 param_4, f32 param_5, f32 param_6, f32 param_7, - f32 param_8, f32 param_9, f32 param_10) { - if (param_6 == 0.0f) { - param_6 = 100.0f; +void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_originX, + f32 i_originZ, f32 i_posX, f32 i_posZ, f32 i_scale, + f32 i_scrollMinX, f32 i_scrollMinZ, f32 i_scrollMaxX, + f32 i_scrollMaxZ) { + if (i_scale == 0.0f) { + i_scale = 100.0f; } - mpAreaTex[i_areaType] = new J2DPicture(i_timg); - JUT_ASSERT(763, mpAreaTex[i_areaType] != 0); + mpAreaTex[i_regionNo] = new J2DPicture(i_timg); + JUT_ASSERT(763, mpAreaTex[i_regionNo] != 0); - field_0x1004[i_areaType] = param_2; - field_0x1024[i_areaType] = param_3; - field_0xce8[i_areaType].field_0x10 = param_6 * 100.0f; + mRegionOriginX[i_regionNo] = i_originX; + mRegionOriginZ[i_regionNo] = i_originZ; + mRegionTexData[i_regionNo].mScale = i_scale * 100.0f; f32 width = i_timg->width; f32 height = i_timg->height; - f32 tmp1 = (field_0x1004[i_areaType] + param_4) - - ((width * 0.5f) * field_0xce8[i_areaType].field_0x10); - f32 tmp2 = (field_0x1024[i_areaType] + param_5) - - ((height * 0.5f) * field_0xce8[i_areaType].field_0x10); - f32 tmp3 = (field_0x1004[i_areaType] + param_4) + - ((width * 0.5f) * field_0xce8[i_areaType].field_0x10); - f32 tmp4 = (field_0x1024[i_areaType] + param_5) + - ((height * 0.5f) * field_0xce8[i_areaType].field_0x10); + f32 min_x = (mRegionOriginX[i_regionNo] + i_posX) - + ((width * 0.5f) * mRegionTexData[i_regionNo].mScale); + f32 min_z = (mRegionOriginZ[i_regionNo] + i_posZ) - + ((height * 0.5f) * mRegionTexData[i_regionNo].mScale); + f32 max_x = (mRegionOriginX[i_regionNo] + i_posX) + + ((width * 0.5f) * mRegionTexData[i_regionNo].mScale); + f32 max_z = (mRegionOriginZ[i_regionNo] + i_posZ) + + ((height * 0.5f) * mRegionTexData[i_regionNo].mScale); - field_0xce8[i_areaType].field_0x0 = tmp1; - field_0xce8[i_areaType].field_0x4 = tmp2; - field_0xce8[i_areaType].field_0x8 = tmp3; - field_0xce8[i_areaType].field_0xc = tmp4; + mRegionTexData[i_regionNo].mMinX = min_x; + mRegionTexData[i_regionNo].mMinZ = min_z; + mRegionTexData[i_regionNo].mMaxX = max_x; + mRegionTexData[i_regionNo].mMaxZ = max_z; - field_0xd8c[i_areaType] = param_7; - field_0xdac[i_areaType] = param_8; - field_0xdcc[i_areaType] = param_9; - field_0xdec[i_areaType] = param_10; + mRegionScrollMinX[i_regionNo] = i_scrollMinX; + mRegionScrollMinZ[i_regionNo] = i_scrollMinZ; + mRegionScrollMaxX[i_regionNo] = i_scrollMaxX; + mRegionScrollMaxZ[i_regionNo] = i_scrollMaxZ; - bool bVar13 = false; + bool first = false; - field_0xfe0 = 0.0f; - field_0xfe4 = 0.0f; - field_0xfe8 = 0.0f; - field_0xfec = 0.0f; + mTexMinX = 0.0f; + mTexMinZ = 0.0f; + mTexMaxX = 0.0f; + mTexMaxZ = 0.0f; bool bVar14 = false; for (int i = 0; i < 8; i++) { if (mpAreaTex[i] != NULL) { - if (!bVar13) { - field_0xfe0 = field_0xce8[i].field_0x0; - field_0xfe4 = field_0xce8[i].field_0x4; - field_0xfe8 = field_0xce8[i].field_0x8; - field_0xfec = field_0xce8[i].field_0xc; - bVar13 = true; + if (!first) { + mTexMinX = mRegionTexData[i].mMinX; + mTexMinZ = mRegionTexData[i].mMinZ; + mTexMaxX = mRegionTexData[i].mMaxX; + mTexMaxZ = mRegionTexData[i].mMaxZ; + first = true; } else { - if (field_0xfe0 > field_0xce8[i].field_0x0) { - field_0xfe0 = field_0xce8[i].field_0x0; + if (mTexMinX > mRegionTexData[i].mMinX) { + mTexMinX = mRegionTexData[i].mMinX; } - if (field_0xfe4 > field_0xce8[i].field_0x4) { - field_0xfe4 = field_0xce8[i].field_0x4; + if (mTexMinZ > mRegionTexData[i].mMinZ) { + mTexMinZ = mRegionTexData[i].mMinZ; } - if (field_0xfe8 < field_0xce8[i].field_0x8) { - field_0xfe8 = field_0xce8[i].field_0x8; + if (mTexMaxX < mRegionTexData[i].mMaxX) { + mTexMaxX = mRegionTexData[i].mMaxX; } - if (field_0xfec < field_0xce8[i].field_0xc) { - field_0xfec = field_0xce8[i].field_0xc; + if (mTexMaxZ < mRegionTexData[i].mMaxZ) { + mTexMaxZ = mRegionTexData[i].mMaxZ; } } } if ((!bVar14) && (field_0x1230[i] == 0xff)) { - field_0x1230[i] = i_areaType; + field_0x1230[i] = i_regionNo; bVar14 = true; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setRegionTexData(u8 param_0, ResTIMG* param_1, f32 param_2, - f32 param_3, f32 param_4, f32 param_5, f32 param_6, - f32 param_7, f32 param_8, f32 param_9, f32 param_10) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff.s" -} -#pragma pop -#endif /* 801D0AC8-801D0BF8 1CB408 0130+00 1/1 1/1 0/0 .text calcAllMapPos__18dMenu_Fmap2DBack_cFv */ void dMenu_Fmap2DBack_c::calcAllMapPos() { bool set = false; calcAllMapScaleRate(); - for (int i = 0; i < 8; i = i + 1) { + for (int i = 0; i < 8; i++) { if (mpAreaTex[i] != NULL) { - f32 tmp1, tmp2, tmp3, tmp4; + f32 min_x, min_y, max_x, max_y; - calcAllMapPos2DFirst(field_0xce8[i].field_0x0, field_0xce8[i].field_0x4, &tmp1, &tmp2); - calcAllMapPos2DFirst(field_0xce8[i].field_0x8, field_0xce8[i].field_0xc, &tmp3, &tmp4); - field_0xe8c[i] = tmp1; - field_0xeac[i] = tmp2; - field_0xecc[i] = tmp3 - tmp1; - field_0xeec[i] = tmp4 - tmp2; + calcAllMapPos2DFirst(mRegionTexData[i].mMinX, mRegionTexData[i].mMinZ, &min_x, &min_y); + calcAllMapPos2DFirst(mRegionTexData[i].mMaxX, mRegionTexData[i].mMaxZ, &max_x, &max_y); + mRegionMinMapX[i] = min_x; + mRegionMinMapY[i] = min_y; + mRegionMapSizeX[i] = max_x - min_x; + mRegionMapSizeY[i] = max_y - min_y; - calcAllMapPos2DFirst(field_0xd8c[i], field_0xdac[i], &field_0xe0c[i], &field_0xe2c[i]); - calcAllMapPos2DFirst(field_0xdcc[i], field_0xdec[i], &field_0xe4c[i], &field_0xe6c[i]); + calcAllMapPos2DFirst(mRegionScrollMinX[i], mRegionScrollMinZ[i], + &mRegionScrollMapMinX[i], &mRegionScrollMapMinY[i]); + calcAllMapPos2DFirst(mRegionScrollMaxX[i], mRegionScrollMaxZ[i], + &mRegionScrollMapMaxX[i], &mRegionScrollMapMaxY[i]); onShowRegionFlag(i); @@ -848,121 +542,82 @@ void dMenu_Fmap2DBack_c::calcAllMapPos() { /* 801D0BF8-801D0C6C 1CB538 0074+00 1/1 0/0 0/0 .text calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv */ f32 dMenu_Fmap2DBack_c::calcAllMapScaleRate() { - f32 f1 = field_0xfe8 - field_0xfe0; - f32 f2 = field_0xfec - field_0xfe4; - f32 f31 = f1; + f32 width = mTexMaxX - mTexMinX; + f32 height = mTexMaxZ - mTexMinZ; - if (f1 < f2) { - f31 = f2; + f32 size = width; + if (width < height) { + size = height; } - mAllMapScaleRate = getMapAreaSizeX() / f31; + mAllMapScaleRate = getMapAreaSizeX() / size; return mAllMapScaleRate; } /* 801D0C6C-801D0D18 1CB5AC 00AC+00 1/1 0/0 0/0 .text * calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf */ -#ifdef NONMATCHING -// Matches with literals -void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 param_0, f32 param_1, f32* param_2, - f32* param_3) { - f32 tmp1 = (mAllMapScaleRate * (param_0 - (field_0xfe8 + field_0xfe0) * 0.5f)); - f32 tmp2 = (mAllMapScaleRate * (param_1 - (field_0xfec + field_0xfe4) * 0.5f)); +void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 i_texPosX, f32 i_texPosZ, f32* o_posX, + f32* o_posY) { + f32 pos_x = (mAllMapScaleRate * (i_texPosX - (mTexMaxX + mTexMinX) * 0.5f)); + f32 pos_y = (mAllMapScaleRate * (i_texPosZ - (mTexMaxZ + mTexMinZ) * 0.5f)); - *param_2 = (float)(tmp1 + getMapAreaGlobalCenterPosX()); - *param_3 = (float)(tmp2 + getMapAreaGlobalCenterPosY()); + *o_posX = pos_x + getMapAreaGlobalCenterPosX(); + *o_posY = pos_y + getMapAreaGlobalCenterPosY(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 param_0, f32 param_1, f32* param_2, - f32* param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf.s" -} -#pragma pop -#endif /* 801D0D18-801D0D50 1CB658 0038+00 13/13 1/1 0/0 .text * calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf */ -void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2, f32* param_3) { - calcAllMapPos2D(param_0, param_1, param_2, param_3, field_0xf0c[field_0x1227], - field_0xf2c[field_0x1227], field_0xf9c); +void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* o_posX, f32* o_posY) { + calcAllMapPos2D(param_0, param_1, o_posX, o_posY, field_0xf0c[mRegionCursor], + field_0xf2c[mRegionCursor], mZoom); } /* 801D0D50-801D0E00 1CB690 00B0+00 0/0 1/1 0/0 .text * calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf */ void dMenu_Fmap2DBack_c::calcAllMapPos2D(char const* param_0, f32 param_1, f32 param_2, - f32* param_3, f32* param_4) { - float tmp1, tmp2; - calcOffset(field_0x1227, param_0, &tmp1, &tmp2); - calcAllMapPos2D(param_1 + tmp1, param_2 + tmp2, param_3, param_4, field_0xf0c[field_0x1227], - field_0xf2c[field_0x1227], field_0xf9c); + f32* o_posX, f32* o_posY) { + f32 tmp1, tmp2; + calcOffset(mRegionCursor, param_0, &tmp1, &tmp2); + calcAllMapPos2D(param_1 + tmp1, param_2 + tmp2, o_posX, o_posY, field_0xf0c[mRegionCursor], + field_0xf2c[mRegionCursor], mZoom); } /* 801D0E00-801D0F7C 1CB740 017C+00 3/3 0/0 0/0 .text * calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2, f32* param_3, - f32 param_4, f32 param_5, f32 param_6) { + f32 param_4, f32 param_5, f32 i_zoom) { getMapAreaSizeX(); getMapAreaSizeY(); - f32 tmp1 = (field_0xce8[field_0x1227].field_0x0 + field_0xce8[field_0x1227].field_0x8) * 0.5f; - f32 tmp2 = (field_0xce8[field_0x1227].field_0x4 + field_0xce8[field_0x1227].field_0xc) * 0.5f; - f32 tmp3 = field_0xe8c[field_0x1227] + param_4 + (field_0xecc[field_0x1227] * param_6) * 0.5f; - f32 tmp4 = field_0xeac[field_0x1227] + param_5 + (field_0xeec[field_0x1227] * param_6) * 0.5f; + f32 tmp1 = (mRegionTexData[mRegionCursor].mMinX + mRegionTexData[mRegionCursor].mMaxX) * 0.5f; + f32 tmp2 = (mRegionTexData[mRegionCursor].mMinZ + mRegionTexData[mRegionCursor].mMaxZ) * 0.5f; + f32 tmp3 = mRegionMinMapX[mRegionCursor] + param_4 + (mRegionMapSizeX[mRegionCursor] * i_zoom) * 0.5f; + f32 tmp4 = mRegionMinMapY[mRegionCursor] + param_5 + (mRegionMapSizeY[mRegionCursor] * i_zoom) * 0.5f; - f32 scaleRatio = (getPathScale(param_6) / getMapScissorAreaSizeRealY()); + f32 scaleRatio = (getPathScale(i_zoom) / getMapScissorAreaSizeRealY()); f32 tmp5 = (param_0 - tmp1) / scaleRatio; *param_2 = tmp5 + tmp3; tmp5 = (param_1 - tmp2) / scaleRatio; *param_3 = tmp5 + tmp4; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2, f32* param_3, - f32 param_4, f32 param_5, f32 param_6) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff.s" -} -#pragma pop -#endif /* 801D0F7C-801D1094 1CB8BC 0118+00 8/8 3/3 0/0 .text * calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param_2, f32* param_3) { - f32 tmp1 = (field_0xce8[field_0x1227].field_0x0 + field_0xce8[field_0x1227].field_0x8) * 0.5f; - f32 tmp2 = (field_0xce8[field_0x1227].field_0x4 + field_0xce8[field_0x1227].field_0xc) * 0.5f; - f32 tmp3 = (param_0 - ((field_0xe8c[field_0x1227] + field_0xf0c[field_0x1227]) + - field_0xecc[field_0x1227] * field_0xf9c * 0.5f)); - f32 tmp4 = (param_1 - ((field_0xeac[field_0x1227] + field_0xf2c[field_0x1227]) + - field_0xeec[field_0x1227] * field_0xf9c * 0.5f)); + f32 tmp1 = (mRegionTexData[mRegionCursor].mMinX + mRegionTexData[mRegionCursor].mMaxX) * 0.5f; + f32 tmp2 = (mRegionTexData[mRegionCursor].mMinZ + mRegionTexData[mRegionCursor].mMaxZ) * 0.5f; + f32 tmp3 = (param_0 - ((mRegionMinMapX[mRegionCursor] + field_0xf0c[mRegionCursor]) + + mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f)); + f32 tmp4 = (param_1 - ((mRegionMinMapY[mRegionCursor] + field_0xf2c[mRegionCursor]) + + mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f)); f32 tmp5 = field_0xf98 / getMapScissorAreaSizeRealY(); *param_2 = tmp1 + (tmp3 * tmp5); *param_3 = tmp2 + (tmp4 * tmp5); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param_2, - f32* param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf.s" -} -#pragma pop -#endif /* 801D1094-801D10F4 1CB9D4 0060+00 0/0 1/1 0/0 .text setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG */ @@ -983,56 +638,54 @@ void dMenu_Fmap2DBack_c::deleteSpotPane() { /* 801D1148-801D1478 1CBA88 0330+00 0/0 8/8 0/0 .text zoomMapCalc__18dMenu_Fmap2DBack_cFf */ -#ifdef NONMATCHING -// Matches with literals -void dMenu_Fmap2DBack_c::zoomMapCalc(f32 param_0) { - field_0xfa0 = param_0; - field_0xfa8 = param_0; - field_0xf9c = getAllMapZoomRate() + - (param_0 * (getRegionMapZoomRate(field_0x1227) - getAllMapZoomRate())); +void dMenu_Fmap2DBack_c::zoomMapCalc(f32 i_zoom) { + mMapZoomRate = i_zoom; + field_0xfa8 = i_zoom; + mZoom = getAllMapZoomRate() + + (i_zoom * (getRegionMapZoomRate(mRegionCursor) - getAllMapZoomRate())); calcRenderingScale(); f32 centerX = getMapAreaGlobalCenterPosX(); f32 centerY = getMapAreaGlobalCenterPosY(); if (g_fmapHIO.field_0x308 == false) { - f32 dVar12 = field_0xe8c[field_0x1227] + (field_0xecc[field_0x1227] * 0.5f); - f32 dVar11 = field_0xeac[field_0x1227] + (field_0xeec[this->field_0x1227] * 0.5f); - field_0xf0c[field_0x1227] = (dVar12 + (param_0 * (centerX - dVar12)) - - (field_0xecc[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xe8c[field_0x1227]; - field_0xf2c[field_0x1227] = (dVar11 + (param_0 * (centerY - dVar11)) - - (field_0xeec[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xeac[field_0x1227]; + f32 region_centerX = mRegionMinMapX[mRegionCursor] + (mRegionMapSizeX[mRegionCursor] * 0.5f); + f32 region_centerY = mRegionMinMapY[mRegionCursor] + (mRegionMapSizeY[mRegionCursor] * 0.5f); + field_0xf0c[mRegionCursor] = region_centerX + (i_zoom * (centerX - region_centerX)) - + (mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapX[mRegionCursor]; + field_0xf2c[mRegionCursor] = region_centerY + (i_zoom * (centerY - region_centerY)) - + (mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapY[mRegionCursor]; } else { - f32 dVar12 = (field_0xe0c[field_0x1227] + field_0xe4c[field_0x1227]) * 0.5f; - f32 dVar11 = (field_0xe2c[field_0x1227] + field_0xe6c[field_0x1227]) * 0.5f; + f32 dVar12 = (mRegionScrollMapMinX[mRegionCursor] + mRegionScrollMapMaxX[mRegionCursor]) * 0.5f; + f32 dVar11 = (mRegionScrollMapMinY[mRegionCursor] + mRegionScrollMapMaxY[mRegionCursor]) * 0.5f; - f32 tmp = (field_0xeac[field_0x1227] + (field_0xeec[field_0x1227] * 0.5f)) - dVar11; + f32 tmp = (mRegionMinMapY[mRegionCursor] + (mRegionMapSizeY[mRegionCursor] * 0.5f)) - dVar11; - f32 tmp2 = (dVar12 + (param_0 * (centerX - dVar12))); - f32 tmp3 = (((field_0xe8c[field_0x1227] + field_0xecc[field_0x1227] * 0.5f) - dVar12)); - field_0xf0c[field_0x1227] = - (((tmp2 + (tmp3 * field_0xf9c))) - field_0xecc[field_0x1227] * field_0xf9c * 0.5f) - - field_0xe8c[field_0x1227]; + f32 tmp2 = (dVar12 + (i_zoom * (centerX - dVar12))); + f32 tmp3 = (((mRegionMinMapX[mRegionCursor] + mRegionMapSizeX[mRegionCursor] * 0.5f) - dVar12)); + field_0xf0c[mRegionCursor] = + (((tmp2 + (tmp3 * mZoom))) - mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapX[mRegionCursor]; - field_0xf2c[field_0x1227] = - (((dVar11 + (param_0 * (centerY - dVar11))) + tmp * field_0xf9c) - - field_0xeec[field_0x1227] * field_0xf9c * 0.5f) - - field_0xeac[field_0x1227]; + field_0xf2c[mRegionCursor] = + (((dVar11 + (i_zoom * (centerY - dVar11))) + tmp * mZoom) - + mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapY[mRegionCursor]; } for (int i = 0; i < 8; i++) { - if (i != field_0x1227) { + if (i != mRegionCursor) { field_0xf0c[i] = - field_0xf0c[field_0x1227] + - (field_0xe8c[i] - field_0xe8c[field_0x1227]) * (field_0xf9c - getAllMapZoomRate()); + field_0xf0c[mRegionCursor] + + (mRegionMinMapX[i] - mRegionMinMapX[mRegionCursor]) * (mZoom - getAllMapZoomRate()); field_0xf2c[i] = - field_0xf2c[field_0x1227] + - (field_0xeac[i] - field_0xeac[field_0x1227]) * (field_0xf9c - getAllMapZoomRate()); + field_0xf2c[mRegionCursor] + + (mRegionMinMapY[i] - mRegionMinMapY[mRegionCursor]) * (mZoom - getAllMapZoomRate()); } } - if (param_0 == 1.0f) { + if (i_zoom == 1.0f) { for (int i = 0; i < 8; i++) { field_0xf4c[i] = field_0xf0c[i]; field_0xf6c[i] = field_0xf2c[i]; @@ -1040,183 +693,147 @@ void dMenu_Fmap2DBack_c::zoomMapCalc(f32 param_0) { } calcRenderingPos(); - setSpotCursor(field_0x1229); + setSpotCursor(mSpotCursor); field_0xfb8 = - ((field_0xecc[field_0x1227] + (param_0 * (getMapAreaSizeX() - field_0xecc[field_0x1227]))) / + ((mRegionMapSizeX[mRegionCursor] + (i_zoom * (getMapAreaSizeX() - mRegionMapSizeX[mRegionCursor]))) / getMapAreaSizeX()); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::zoomMapCalc(f32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/zoomMapCalc__18dMenu_Fmap2DBack_cFf.s" -} -#pragma pop -#endif /* 801D1478-801D1858 1CBDB8 03E0+00 0/0 10/10 0/0 .text zoomMapCalc2__18dMenu_Fmap2DBack_cFf */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) { f32 spotZoomRate = getSpotMapZoomRate(); - f32 regionZoomRate = getRegionMapZoomRate(field_0x1227); - field_0xf9c = regionZoomRate + (param_0 * (spotZoomRate - regionZoomRate)); + f32 regionZoomRate = getRegionMapZoomRate(mRegionCursor); + mZoom = regionZoomRate + (param_0 * (spotZoomRate - regionZoomRate)); - if (field_0x118c + control_ypos < field_0xd8c[field_0x1227]) { + if (mArrowPos3DX + control_xpos < mRegionScrollMinX[mRegionCursor]) { if (field_0x11a4 == 0.0f) { - field_0x11a4 = (field_0x118c + control_ypos) - field_0xd8c[field_0x1227]; + field_0x11a4 = (mArrowPos3DX + control_xpos) - mRegionScrollMinX[mRegionCursor]; } - control_ypos = field_0xd8c[field_0x1227] - field_0x118c; + control_xpos = mRegionScrollMinX[mRegionCursor] - mArrowPos3DX; } else { - if (field_0x118c + control_ypos > field_0xdcc[field_0x1227]) { + if (mArrowPos3DX + control_xpos > mRegionScrollMaxX[mRegionCursor]) { if (field_0x11a4 == 0.0f) { - field_0x11a4 = (field_0x118c + control_ypos) - field_0xdcc[field_0x1227]; + field_0x11a4 = (mArrowPos3DX + control_xpos) - mRegionScrollMaxX[mRegionCursor]; } - control_ypos = field_0xdcc[field_0x1227] - field_0x118c; + control_xpos = mRegionScrollMaxX[mRegionCursor] - mArrowPos3DX; } } - if (field_0x1190 + control_xpos < field_0xdac[field_0x1227]) { + if (mArrowPos3DZ + control_ypos < mRegionScrollMinZ[mRegionCursor]) { if (field_0x11a8 == 0.0f) { - field_0x11a8 = (field_0x1190 + control_xpos) - field_0xdac[field_0x1227]; + field_0x11a8 = (mArrowPos3DZ + control_ypos) - mRegionScrollMinZ[mRegionCursor]; } - control_xpos = field_0xdac[field_0x1227] - this->field_0x1190; + control_ypos = mRegionScrollMinZ[mRegionCursor] - this->mArrowPos3DZ; } else { - if (field_0x1190 + control_xpos > field_0xdec[field_0x1227]) { + if (mArrowPos3DZ + control_ypos > mRegionScrollMaxZ[mRegionCursor]) { if (field_0x11a8 == 0.0f) { - field_0x11a8 = (field_0x1190 + control_xpos) - field_0xdec[field_0x1227]; + field_0x11a8 = (mArrowPos3DZ + control_ypos) - mRegionScrollMaxZ[mRegionCursor]; } - control_xpos = field_0xdec[field_0x1227] - field_0x1190; + control_ypos = mRegionScrollMaxZ[mRegionCursor] - mArrowPos3DZ; } } calcRenderingScale(); - field_0xfa0 = param_0 + 1.0f; + mMapZoomRate = param_0 + 1.0f; f32 centerX = getMapAreaGlobalCenterPosX(); f32 centerY = getMapAreaGlobalCenterPosY(); if (g_fmapHIO.field_0x308 == false) { - field_0xf0c[field_0x1227] = (centerX - (field_0xecc[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xe8c[field_0x1227]; - field_0xf2c[field_0x1227] = (centerY - (field_0xeec[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xeac[field_0x1227]; + field_0xf0c[mRegionCursor] = (centerX - (mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f)) - + mRegionMinMapX[mRegionCursor]; + field_0xf2c[mRegionCursor] = (centerY - (mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f)) - + mRegionMinMapY[mRegionCursor]; } else { - f32 tmp1 = (field_0xeac[field_0x1227] + (field_0xeec[field_0x1227] * 0.5f)) - - ((field_0xe2c[field_0x1227] + field_0xe6c[field_0x1227]) * 0.5f); + f32 tmp1 = (mRegionMinMapY[mRegionCursor] + (mRegionMapSizeY[mRegionCursor] * 0.5f)) - + ((mRegionScrollMapMinY[mRegionCursor] + mRegionScrollMapMaxY[mRegionCursor]) * 0.5f); - f32 tmp2 = ((field_0xe8c[field_0x1227] + field_0xecc[field_0x1227] * 0.5f) - - (field_0xe0c[field_0x1227] + field_0xe4c[field_0x1227]) * 0.5f); + f32 tmp2 = ((mRegionMinMapX[mRegionCursor] + mRegionMapSizeX[mRegionCursor] * 0.5f) - + (mRegionScrollMapMinX[mRegionCursor] + mRegionScrollMapMaxX[mRegionCursor]) * 0.5f); - field_0xf0c[field_0x1227] = - ((centerX + (tmp2 * field_0xf9c)) - field_0xecc[field_0x1227] * field_0xf9c * 0.5f) - - field_0xe8c[field_0x1227]; - field_0xf2c[field_0x1227] = - ((centerY + (tmp1 * field_0xf9c)) - field_0xeec[field_0x1227] * field_0xf9c * 0.5f) - - field_0xeac[field_0x1227]; + field_0xf0c[mRegionCursor] = + ((centerX + (tmp2 * mZoom)) - mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapX[mRegionCursor]; + field_0xf2c[mRegionCursor] = + ((centerY + (tmp1 * mZoom)) - mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapY[mRegionCursor]; } for (int i = 0; i < 8; i++) { - if (i != field_0x1227) { + if (i != mRegionCursor) { field_0xf0c[i] = - field_0xf0c[field_0x1227] + - (field_0xe8c[i] - field_0xe8c[field_0x1227]) * (field_0xf9c - getAllMapZoomRate()); + field_0xf0c[mRegionCursor] + + (mRegionMinMapX[i] - mRegionMinMapX[mRegionCursor]) * (mZoom - getAllMapZoomRate()); field_0xf2c[i] = - field_0xf2c[field_0x1227] + - (field_0xeac[i] - field_0xeac[field_0x1227]) * (field_0xf9c - getAllMapZoomRate()); + field_0xf2c[mRegionCursor] + + (mRegionMinMapY[i] - mRegionMinMapY[mRegionCursor]) * (mZoom - getAllMapZoomRate()); } } scrollCalc(param_0); if (param_0 == 1.0f) { - field_0x11b4 = (field_0x118c + control_ypos) - field_0xfc8; - field_0x11b8 = (field_0x1190 + control_xpos) - field_0xfcc; + field_0x11b4 = (mArrowPos3DX + control_xpos) - mStageTransX; + field_0x11b8 = (mArrowPos3DZ + control_ypos) - mStageTransZ; field_0x11a4 = 0.0f; field_0x11a8 = 0.0f; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/zoomMapCalc2__18dMenu_Fmap2DBack_cFf.s" -} -#pragma pop -#endif /* 801D1858-801D1AA4 1CC198 024C+00 0/0 1/1 0/0 .text zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::zoomMapCalcHIO() { - if (field_0xf9c != getSpotMapZoomRate()) { + if (mZoom != getSpotMapZoomRate()) { f32 spotZoomRate = getSpotMapZoomRate(); - f32 regionZoomRate = getRegionMapZoomRate(field_0x1227); - field_0xf9c = getSpotMapZoomRate(); + f32 regionZoomRate = getRegionMapZoomRate(mRegionCursor); + mZoom = getSpotMapZoomRate(); calcRenderingScale(); f32 centerX = getMapAreaGlobalCenterPosX(); f32 centerY = getMapAreaGlobalCenterPosY(); if (g_fmapHIO.field_0x308 == false) { - field_0xf0c[field_0x1227] = - (centerX - (field_0xecc[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xe8c[field_0x1227]; - field_0xf2c[field_0x1227] = - (centerY - (field_0xeec[field_0x1227] * field_0xf9c * 0.5f)) - - field_0xeac[field_0x1227]; + field_0xf0c[mRegionCursor] = + (centerX - (mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f)) - + mRegionMinMapX[mRegionCursor]; + field_0xf2c[mRegionCursor] = + (centerY - (mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f)) - + mRegionMinMapY[mRegionCursor]; } else { - f32 tmp1 = (field_0xeac[field_0x1227] + (field_0xeec[field_0x1227] * 0.5f)) - - ((field_0xe2c[field_0x1227] + field_0xe6c[field_0x1227]) * 0.5f); + f32 tmp1 = (mRegionMinMapY[mRegionCursor] + (mRegionMapSizeY[mRegionCursor] * 0.5f)) - + ((mRegionScrollMapMinY[mRegionCursor] + mRegionScrollMapMaxY[mRegionCursor]) * 0.5f); - f32 tmp2 = ((field_0xe8c[field_0x1227] + field_0xecc[field_0x1227] * 0.5f) - - (field_0xe0c[field_0x1227] + field_0xe4c[field_0x1227]) * 0.5f); + f32 tmp2 = ((mRegionMinMapX[mRegionCursor] + mRegionMapSizeX[mRegionCursor] * 0.5f) - + (mRegionScrollMapMinX[mRegionCursor] + mRegionScrollMapMaxX[mRegionCursor]) * 0.5f); - field_0xf0c[field_0x1227] = ((centerX + (tmp2 * field_0xf9c)) - - field_0xecc[field_0x1227] * field_0xf9c * 0.5f) - - field_0xe8c[field_0x1227]; - field_0xf2c[field_0x1227] = ((centerY + (tmp1 * field_0xf9c)) - - field_0xeec[field_0x1227] * field_0xf9c * 0.5f) - - field_0xeac[field_0x1227]; + field_0xf0c[mRegionCursor] = ((centerX + (tmp2 * mZoom)) - + mRegionMapSizeX[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapX[mRegionCursor]; + field_0xf2c[mRegionCursor] = ((centerY + (tmp1 * mZoom)) - + mRegionMapSizeY[mRegionCursor] * mZoom * 0.5f) - + mRegionMinMapY[mRegionCursor]; } for (int i = 0; i < 8; i++) { - if (i != field_0x1227) { + if (i != mRegionCursor) { field_0xf0c[i] = - field_0xf0c[field_0x1227] + (field_0xe8c[i] - field_0xe8c[field_0x1227]) * - (field_0xf9c - getAllMapZoomRate()); + field_0xf0c[mRegionCursor] + (mRegionMinMapX[i] - mRegionMinMapX[mRegionCursor]) * + (mZoom - getAllMapZoomRate()); field_0xf2c[i] = - field_0xf2c[field_0x1227] + (field_0xeac[i] - field_0xeac[field_0x1227]) * - (field_0xf9c - getAllMapZoomRate()); + field_0xf2c[mRegionCursor] + (mRegionMinMapY[i] - mRegionMinMapY[mRegionCursor]) * + (mZoom - getAllMapZoomRate()); } } scrollCalc(1.0f); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::zoomMapCalcHIO() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D1AA4-801D1D50 1CC3E4 02AC+00 2/2 0/0 0/0 .text scrollCalc__18dMenu_Fmap2DBack_cFf */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) { f32 tmp1, tmp2; - calcAllMapPos2D(field_0x118c + control_ypos, field_0x1190 + control_xpos, &tmp1, &tmp2, - field_0xf4c[field_0x1227], field_0xf6c[field_0x1227], - getRegionMapZoomRate(field_0x1227)); + calcAllMapPos2D(mArrowPos3DX + control_xpos, mArrowPos3DZ + control_ypos, &tmp1, &tmp2, + field_0xf4c[mRegionCursor], field_0xf6c[mRegionCursor], + getRegionMapZoomRate(mRegionCursor)); f32 centerX = getMapAreaGlobalCenterPosX(); f32 centerY = getMapAreaGlobalCenterPosY(); @@ -1225,16 +842,16 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) { calcAllMapPosWorld(tmp1 + (param_0 * (centerX - tmp1)), tmp2 + (param_0 * (centerY - tmp2)), &tmp3, &tmp4); - field_0xfc8 = (field_0x118c + control_ypos) - tmp3; - field_0xfcc = (field_0x1190 + control_xpos) - tmp4; + mStageTransX = (mArrowPos3DX + control_xpos) - tmp3; + mStageTransZ = (mArrowPos3DZ + control_ypos) - tmp4; - field_0x11ac = field_0xfc8; - field_0x11b0 = field_0xfcc; + field_0x11ac = mStageTransX; + field_0x11b0 = mStageTransZ; - if ((((field_0x11a4 != 0.0f) || (field_0x11a8 != 0.0f)) && (field_0xfa0 > 1.0f)) && - (field_0xfa0 < 2.0f)) + if ((((field_0x11a4 != 0.0f) || (field_0x11a8 != 0.0f)) && (mMapZoomRate > 1.0f)) && + (mMapZoomRate < 2.0f)) { - f32 local_40 = 2.0f - field_0xfa0; + f32 local_40 = 2.0f - mMapZoomRate; //!@bug local_44 or local_48 can be uninitialized if field_0x11a4 or field_0x11a8 is not 0 f32 local_44, local_48; @@ -1247,17 +864,17 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) { local_48 = field_0x11a8 * local_40; } - calcAllMapPos2D(field_0x118c + control_ypos + local_44, - field_0x1190 + control_xpos + local_48, &tmp1, &tmp2, - field_0xf4c[field_0x1227], field_0xf6c[field_0x1227], - getRegionMapZoomRate(field_0x1227)); + calcAllMapPos2D(mArrowPos3DX + control_xpos + local_44, + mArrowPos3DZ + control_ypos + local_48, &tmp1, &tmp2, + field_0xf4c[mRegionCursor], field_0xf6c[mRegionCursor], + getRegionMapZoomRate(mRegionCursor)); f32 local_54, local_58; calcAllMapPosWorld(tmp1 + (param_0 * (centerX - tmp1)), tmp2 + (param_0 * (centerY - tmp2)), &local_54, &local_58); - field_0x11ac = (field_0x118c + control_ypos + local_44) - local_54; - field_0x11b0 = (field_0x1190 + control_xpos + local_48) - local_58; + field_0x11ac = (mArrowPos3DX + control_xpos + local_44) - local_54; + field_0x11b0 = (mArrowPos3DZ + control_ypos + local_48) - local_58; } if (param_0 == 0.0f) { @@ -1266,22 +883,12 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) { field_0xfdc = 0.0f; field_0xfd8 = 0.0f; } else if (param_0 == 1.0f) { - field_0xfd0 = field_0xfc8; - field_0xfd4 = field_0xfcc; + field_0xfd0 = mStageTransX; + field_0xfd4 = mStageTransZ; } calcRenderingPos(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/scrollCalc__18dMenu_Fmap2DBack_cFf.s" -} -#pragma pop -#endif /* 801D1D50-801D1D74 1CC690 0024+00 0/0 1/1 0/0 .text mapBlink__18dMenu_Fmap2DBack_cFPs */ @@ -1294,7 +901,7 @@ void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) { /* 801D1D74-801D1DC4 1CC6B4 0050+00 1/1 5/5 0/0 .text setSpotCursor__18dMenu_Fmap2DBack_cFUc */ void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) { - this->field_0x1229 = param_0; + this->mSpotCursor = param_0; f32 tmp1, tmp2; getStageOriginPath(param_0, &tmp1, &tmp2); @@ -1303,8 +910,6 @@ void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) { /* 801D1DC4-801D2100 1CC704 033C+00 0/0 1/1 0/0 .text * allmap_move2__18dMenu_Fmap2DBack_cFP9STControl */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) { f32 tmp1, tmp2; calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &tmp1, &tmp2); @@ -1323,7 +928,7 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) { f32 stickValue = param_0->getValueStick(); if (stickValue >= scrollSpeed1) { s16 angle = param_0->getAngleStick(); - f32 local_68 = (field_0xfe8 - field_0xfe0); + f32 local_68 = (mTexMaxX - mTexMinX); f32 zoomRate = local_68 / getAllMapZoomRate(); f32 speed = ((stickValue < scrollSpeed2 ? g_fmapHIO.mScrollSpeedWorldSlow : @@ -1333,24 +938,24 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) { f32 delta_y = (speed * zoomRate) * cM_ssin(angle); f32 delta_x = (speed * zoomRate) * cM_scos(angle); - control_ypos = control_ypos + delta_y; - control_xpos = control_xpos + delta_x; + control_xpos = control_xpos + delta_y; + control_ypos = control_ypos + delta_x; } - if (field_0x118c + control_ypos < tmp1) { - control_ypos = tmp1 - field_0x118c; + if (mArrowPos3DX + control_xpos < tmp1) { + control_xpos = tmp1 - mArrowPos3DX; } - if (field_0x118c + control_ypos > local_50) { - control_ypos = local_50 - field_0x118c; + if (mArrowPos3DX + control_xpos > local_50) { + control_xpos = local_50 - mArrowPos3DX; } - if (field_0x1190 + control_xpos < tmp2) { - control_xpos = tmp2 - field_0x1190; + if (mArrowPos3DZ + control_ypos < tmp2) { + control_ypos = tmp2 - mArrowPos3DZ; } - if (field_0x1190 + control_xpos > local_54) { - control_xpos = local_54 - field_0x1190; + if (mArrowPos3DZ + control_ypos > local_54) { + control_ypos = local_54 - mArrowPos3DZ; } calcRenderingScale(); @@ -1358,46 +963,34 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) { calcAllMapPos(); f32 local_7c, local_80; - calcAllMapPos2D((field_0x118c + control_ypos) - field_0xfc8, - (field_0x1190 + control_xpos) - field_0xfcc, &local_7c, &local_80); + calcAllMapPos2D((mArrowPos3DX + control_xpos) - mStageTransX, + (mArrowPos3DZ + control_ypos) - mStageTransZ, &local_7c, &local_80); - field_0x1226 = 0xff; + mSelectRegion = 0xff; for (int i = 7; i >= 0; i--) { int val = field_0x1230[i]; if (val != 0xff && val != 7) { const ResTIMG* timg = mpAreaTex[val]->getTexture(0)->getTexInfo(); bool pixel = dMeter2Info_getPixel( - local_7c, local_80, (field_0xe8c[val] + field_0xf0c[val] + field_0xfbc), - (field_0xeac[val] + field_0xf2c[val] + field_0xfc0), - (field_0xecc[val] * field_0xf9c), (field_0xeec[val] * field_0xf9c), timg); + local_7c, local_80, (mRegionMinMapX[val] + field_0xf0c[val] + mTransX), + (mRegionMinMapY[val] + field_0xf2c[val] + mTransZ), + (mRegionMapSizeX[val] * mZoom), (mRegionMapSizeY[val] * mZoom), timg); if (pixel) { - field_0x1226 = val; + mSelectRegion = val; } } - if (field_0x1226 != 0xff) + if (mSelectRegion != 0xff) break; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/allmap_move2__18dMenu_Fmap2DBack_cFP9STControl.s" -} -#pragma pop -#endif /* 801D2100-801D241C 1CCA40 031C+00 1/1 3/3 0/0 .text setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 param_3, u8 param_4, bool param_5) { f32 local_68, local_6c; - f32 local_70 = field_0xfa0; + f32 local_70 = mMapZoomRate; u8 uVar9 = 1; if (param_0 == 17) { uVar9 = 2; @@ -1407,37 +1000,37 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 &local_78); f32 local_7c, local_80; - calcAllMapPos2D(local_74 + field_0xfc8, local_78 + field_0xfcc, &local_7c, &local_80); + calcAllMapPos2D(local_74 + mStageTransX, local_78 + mStageTransZ, &local_7c, &local_80); f32 dVar11 = getMapScissorAreaCenterPosX() - local_7c; f32 dVar10 = getMapScissorAreaCenterPosY() - local_80; - if (field_0x1227 + 1 == dComIfGp_getNowLevel()) { - calcAllMapPos2D(param_1 - field_0xfc8, param_2 - field_0xfcc, &local_68, &local_6c); - f32 tmp1 = (dVar10 + (field_0xeac[field_0x1227] + field_0xf2c[field_0x1227])) + - ((field_0xeec[field_0x1227] * field_0xf9c) / 2.0f); - f32 tmp2 = (dVar11 + (field_0xe8c[field_0x1227] + field_0xf0c[field_0x1227])) + - ((field_0xecc[field_0x1227] * field_0xf9c) / 2.0f); + if (mRegionCursor + 1 == dComIfGp_getNowLevel()) { + calcAllMapPos2D(param_1 - mStageTransX, param_2 - mStageTransZ, &local_68, &local_6c); + f32 tmp1 = (dVar10 + (mRegionMinMapY[mRegionCursor] + field_0xf2c[mRegionCursor])) + + ((mRegionMapSizeY[mRegionCursor] * mZoom) / 2.0f); + f32 tmp2 = (dVar11 + (mRegionMinMapX[mRegionCursor] + field_0xf0c[mRegionCursor])) + + ((mRegionMapSizeX[mRegionCursor] * mZoom) / 2.0f); field_0x11e8 = local_68 - tmp2; field_0x11ec = local_6c - tmp1; } else { - f32 tmp1 = (dVar11 + (field_0xe6c[dComIfGp_getNowLevel() + 7] + - field_0xeec[dComIfGp_getNowLevel() + 7])) + - ((field_0xeac[dComIfGp_getNowLevel() + 7] * field_0xf9c) / 2.0f); - f32 tmp2 = (dVar10 + (field_0xe8c[dComIfGp_getNowLevel() + 7] + + f32 tmp1 = (dVar11 + (mRegionScrollMapMaxY[dComIfGp_getNowLevel() + 7] + + mRegionMapSizeY[dComIfGp_getNowLevel() + 7])) + + ((mRegionMinMapY[dComIfGp_getNowLevel() + 7] * mZoom) / 2.0f); + f32 tmp2 = (dVar10 + (mRegionMinMapX[dComIfGp_getNowLevel() + 7] + field_0xf0c[dComIfGp_getNowLevel() + 7])) + - ((field_0xecc[dComIfGp_getNowLevel() + 7] * field_0xf9c) / 2.0f); - local_68 = tmp1 + (field_0x11e8 * field_0xf9c); - local_6c = tmp2 + (field_0x11ec * field_0xf9c); + ((mRegionMapSizeX[dComIfGp_getNowLevel() + 7] * mZoom) / 2.0f); + local_68 = tmp1 + (field_0x11e8 * mZoom); + local_6c = tmp2 + (field_0x11ec * mZoom); } } else { - calcAllMapPos2D(param_1 - field_0xfc8, param_2 - field_0xfcc, &local_68, &local_6c); + calcAllMapPos2D(param_1 - mStageTransX, param_2 - mStageTransZ, &local_68, &local_6c); } if (!param_5) { if (param_0 == 1) { - local_70 = (field_0xfa0 * 0.5f) + 0.5f; + local_70 = (mMapZoomRate * 0.5f) + 0.5f; uVar9 = 2; } @@ -1447,23 +1040,12 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 setIconInfo(param_0, local_68, local_6c, 1.0f, param_3, local_70, uVar9); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 param_3, - u8 param_4, bool param_5) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb.s" -} -#pragma pop -#endif /* 801D241C-801D2454 1CCD5C 0038+00 0/0 2/2 0/0 .text * setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb */ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, char const* param_1, f32 param_2, f32 param_3, f32 param_4, u8 param_5, bool param_6) { - setIcon2DPos(param_0, field_0x1227, param_1, param_2, param_3, param_4, param_5, param_6); + setIcon2DPos(param_0, mRegionCursor, param_1, param_2, param_3, param_4, param_5, param_6); } /* 801D2454-801D2508 1CCD94 00B4+00 1/1 0/0 0/0 .text @@ -1524,39 +1106,15 @@ f32 dMenu_Fmap2DBack_c::getMapAreaGlobalPosY() { /* 801D2678-801D26C8 1CCFB8 0050+00 7/7 1/1 0/0 .text * getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosX() { return getMapAreaGlobalPosX() + (getMapAreaSizeX() / 2.0f); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosX() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D26C8-801D2718 1CD008 0050+00 7/7 1/1 0/0 .text * getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosY() { return getMapAreaGlobalPosY() + (getMapAreaSizeY() / 2.0f); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosY() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D2718-801D2728 1CD058 0010+00 8/8 0/0 0/0 .text getMapAreaSizeX__18dMenu_Fmap2DBack_cFv */ f32 dMenu_Fmap2DBack_c::getMapAreaSizeX() { @@ -1606,39 +1164,15 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealX() { /* 801D2880-801D28D0 1CD1C0 0050+00 3/3 0/0 0/0 .text * getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosX() { return getMapScissorAreaLX() + (getMapScissorAreaSizeRealX() / 2.0f); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosX() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D28D0-801D2920 1CD210 0050+00 3/3 0/0 0/0 .text * getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosY() { return getMapScissorAreaLY() + (getMapScissorAreaSizeRealY() / 2.0f); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosY() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D2920-801D2998 1CD260 0078+00 2/2 0/0 0/0 .text * getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv */ @@ -1662,34 +1196,34 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealY() { /* 801D29B8-801D2A34 1CD2F8 007C+00 6/6 0/0 0/0 .text calcRenderingPos__18dMenu_Fmap2DBack_cFv */ void dMenu_Fmap2DBack_c::calcRenderingPos() { - calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &field_0xf8c, - &field_0xf90); + calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &mRenderingPosX, + &mRenderingPosZ); - field_0xf8c += field_0xfc8; - field_0xf90 += field_0xfcc; + mRenderingPosX += mStageTransX; + mRenderingPosZ += mStageTransZ; } /* 801D2A34-801D2AC8 1CD374 0094+00 7/7 0/0 0/0 .text calcRenderingScale__18dMenu_Fmap2DBack_cFv */ void dMenu_Fmap2DBack_c::calcRenderingScale() { - f32 xScale = (field_0xfe8 - field_0xfe0) / getMapAreaSizeX(); - f32 yScale = (field_0xfec - field_0xfe4) / getMapAreaSizeY(); + f32 xScale = (mTexMaxX - mTexMinX) / getMapAreaSizeX(); + f32 yScale = (mTexMaxZ - mTexMinZ) / getMapAreaSizeY(); f32 scale = xScale; if (xScale < yScale) { scale = yScale; } - field_0xf94 = scale / field_0xf9c; - field_0xf98 = field_0xf94 * getMapScissorAreaSizeRealY(); + mRenderingScale = scale / mZoom; + field_0xf98 = mRenderingScale * getMapScissorAreaSizeRealY(); } /* 801D2AC8-801D2B5C 1CD408 0094+00 1/1 0/0 0/0 .text getPathScale__18dMenu_Fmap2DBack_cFf */ f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) { JUT_ASSERT(2204, i_zoom != 0.0f); - f32 xScale = (field_0xfe8 - field_0xfe0) / getMapAreaSizeX(); - f32 yScale = (field_0xfec - field_0xfe4) / getMapAreaSizeY(); + f32 xScale = (mTexMaxX - mTexMinX) / getMapAreaSizeX(); + f32 yScale = (mTexMaxZ - mTexMinZ) / getMapAreaSizeY(); f32 scale = xScale; if (xScale < yScale) { @@ -1700,40 +1234,30 @@ f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) { } /* 801D2B5C-801D2B64 1CD49C 0008+00 6/6 0/0 0/0 .text getAllMapZoomRate__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals f32 dMenu_Fmap2DBack_c::getAllMapZoomRate() { return 1.0f; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMenu_Fmap2DBack_c::getAllMapZoomRate() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/getAllMapZoomRate__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D2B64-801D2C4C 1CD4A4 00E8+00 6/6 0/0 0/0 .text getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi */ -f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int param_0) { +f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int i_regionNo) { f32 tmp1, tmp2; if (g_fmapHIO.field_0x308 == false) { - tmp1 = getMapAreaSizeX() / field_0xecc[param_0]; - tmp2 = getMapAreaSizeY() / field_0xeec[param_0]; + tmp1 = getMapAreaSizeX() / mRegionMapSizeX[i_regionNo]; + tmp2 = getMapAreaSizeY() / mRegionMapSizeY[i_regionNo]; } else { - tmp1 = getMapAreaSizeX() / (field_0xe4c[field_0x1227] - field_0xe0c[field_0x1227]); - tmp2 = getMapAreaSizeY() / (field_0xe6c[field_0x1227] - field_0xe2c[field_0x1227]); + tmp1 = getMapAreaSizeX() / + (mRegionScrollMapMaxX[mRegionCursor] - mRegionScrollMapMinX[mRegionCursor]); + tmp2 = getMapAreaSizeY() / + (mRegionScrollMapMaxY[mRegionCursor] - mRegionScrollMapMinY[mRegionCursor]); } if (tmp1 < tmp2) { - field_0x122e = 0; + field_0x122e = false; tmp2 = tmp1; } else { - field_0x122e = 1; + field_0x122e = true; } return tmp2; @@ -1742,8 +1266,8 @@ f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int param_0) { /* 801D2C4C-801D2C88 1CD58C 003C+00 4/4 0/0 0/0 .text getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv */ f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() { - f32 tmp1 = field_0xfe8 - field_0xfe0; - f32 tmp2 = field_0xfec - field_0xfe4; + f32 tmp1 = mTexMaxX - mTexMinX; + f32 tmp2 = mTexMaxZ - mTexMinZ; f32 tmp3 = tmp1; if (tmp1 < tmp2) { @@ -1758,8 +1282,8 @@ f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() { void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param_2) { for (int i = 0; i < 20; i++) { if (i == param_0) { - *param_1 = field_0x10e4[i]; - *param_2 = field_0x1134[i]; + *param_1 = mStageOriginPathX[i]; + *param_2 = mStageOriginPathZ[i]; break; } } @@ -1767,43 +1291,42 @@ void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param /* 801D2CC8-801D2DA8 1CD608 00E0+00 4/4 0/0 0/0 .text calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf */ -void dMenu_Fmap2DBack_c::calcOffset(u8 param_0, char const* param_1, f32* param_2, f32* param_3) { +void dMenu_Fmap2DBack_c::calcOffset(u8 i_regionNo, char const* i_stageName, + f32* o_offsetX, f32* o_offsetZ) { if (mpStages != NULL) { - Stage_c::Stage_c_data* data = mpStages->field_0x4; - for (int i = 0; i < field_0x1225; i++) { - if (param_0 + 1 == data[i].field_0x9 && strcmp(param_1, data[i].mName) == 0) { - *param_2 = field_0x1004[param_0] + data[i].field_0xc; - *param_3 = field_0x1024[param_0] + data[i].field_0x10; + Stage_c::data* data = mpStages->mData; + for (int i = 0; i < mStageDataNum; i++) { + if (i_regionNo + 1 == data[i].mRegionNo && strcmp(i_stageName, data[i].mName) == 0) { + *o_offsetX = mRegionOriginX[i_regionNo] + data[i].mOffsetX; + *o_offsetZ = mRegionOriginZ[i_regionNo] + data[i].mOffsetZ; return; } } } - *param_2 = field_0x1004[param_0]; - *param_3 = field_0x1024[param_0]; + *o_offsetX = mRegionOriginX[i_regionNo]; + *o_offsetZ = mRegionOriginZ[i_regionNo]; } /* 801D2DA8-801D3094 1CD6E8 02EC+00 1/1 0/0 0/0 .text regionTextureDraw__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::regionTextureDraw() { f32 local_84, local_88; calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &local_84, &local_88); f32 local_8c, local_90; - calcAllMapPos2D(local_84 + field_0xfc8, local_88 + field_0xfcc, &local_8c, &local_90); + calcAllMapPos2D(local_84 + mStageTransX, local_88 + mStageTransZ, &local_8c, &local_90); f32 dVar14 = getMapScissorAreaCenterPosX() - local_8c; f32 dVar13 = getMapScissorAreaCenterPosY() - local_90; - s32 uVar9 = field_0x1227; + s32 uVar9 = mRegionCursor; s32 local_94; - if (field_0xfa0 == 0.0f) { - local_94 = field_0x1226; + if (mMapZoomRate == 0.0f) { + local_94 = mSelectRegion; } else { - local_94 = field_0x1227; + local_94 = mRegionCursor; } if (g_fmapHIO.mDrawBackground == false) { @@ -1816,88 +1339,65 @@ void dMenu_Fmap2DBack_c::regionTextureDraw() { f32 fVar3; if (isShowRegion(uVar10)) { if (uVar10 != local_94) { - mpAreaTex[uVar10]->setBlackWhite(field_0x11f8, field_0x11fc); + mpAreaTex[uVar10]->setBlackWhite(mUnselectedRegionBlack, mUnselectedRegionWhite); fVar3 = field_0x1214; } else { - mpAreaTex[uVar10]->setBlackWhite(field_0x11f0, field_0x11f4); + mpAreaTex[uVar10]->setBlackWhite(mSelectedRegionBlack, mSelectedRegionWhite); fVar3 = field_0x1210; } } else { - mpAreaTex[uVar10]->setBlackWhite(field_0x1200, field_0x1204); + mpAreaTex[uVar10]->setBlackWhite(mUnreachedRegionBlack, mUnreachedRegionWhite); fVar3 = 0.5f; } - mpAreaTex[uVar10]->setAlpha(field_0xfc4 * 255.0f * fVar3 * field_0xfa4); + mpAreaTex[uVar10]->setAlpha(mAlphaRate * 255.0f * fVar3 * field_0xfa4); if (uVar10 != uVar9) { mpAreaTex[uVar10]->draw( - field_0xfbc + (dVar14 + (field_0xe8c[uVar10] + field_0xf0c[uVar10])), - field_0xfc0 + (dVar13 + (field_0xeac[uVar10] + field_0xf2c[uVar10])), - field_0xecc[uVar10] * field_0xf9c, field_0xeec[uVar10] * field_0xf9c, false, + mTransX + (dVar14 + (mRegionMinMapX[uVar10] + field_0xf0c[uVar10])), + mTransZ + (dVar13 + (mRegionMinMapY[uVar10] + field_0xf2c[uVar10])), + mRegionMapSizeX[uVar10] * mZoom, mRegionMapSizeY[uVar10] * mZoom, false, false, false); } else { mpAreaTex[uVar9]->draw( - field_0xfbc + (dVar14 + (field_0xe8c[uVar9] + field_0xf0c[uVar9])), - field_0xfc0 + (dVar13 + (field_0xeac[uVar9] + field_0xf2c[uVar9])), - field_0xecc[uVar9] * field_0xf9c, field_0xeec[uVar9] * field_0xf9c, false, + mTransX + (dVar14 + (mRegionMinMapX[uVar9] + field_0xf0c[uVar9])), + mTransZ + (dVar13 + (mRegionMinMapY[uVar9] + field_0xf2c[uVar9])), + mRegionMapSizeX[uVar9] * mZoom, mRegionMapSizeY[uVar9] * mZoom, false, false, false); } } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::regionTextureDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/regionTextureDraw__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D3094-801D31D0 1CD9D4 013C+00 1/1 0/0 0/0 .text stageTextureDraw__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// Matches with literals void dMenu_Fmap2DBack_c::stageTextureDraw() { - if (field_0x122f) { - mpSpotTexture->setAlpha(field_0xfc4 * 255.0f * field_0x11d8); + if (mAllPathShowFlag) { + mpSpotTexture->setAlpha(mAlphaRate * 255.0f * mSpotTextureFadeAlpha); } else { - f32 tmp = field_0xfc4 * 255.0f * field_0xfa8; - mpSpotTexture->setAlpha(field_0x11d8 * tmp); + f32 tmp = mAlphaRate * 255.0f * field_0xfa8; + mpSpotTexture->setAlpha(mSpotTextureFadeAlpha * tmp); } - mpSpotTexture->draw(field_0xfbc + getMapScissorAreaLX(), field_0xfc0 + getMapScissorAreaLY(), + mpSpotTexture->draw(mTransX + getMapScissorAreaLX(), mTransZ + getMapScissorAreaLY(), getMapScissorAreaSizeRealX(), getMapScissorAreaSizeRealY(), false, false, false); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::stageTextureDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/stageTextureDraw__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D31D0-801D34DC 1CDB10 030C+00 1/1 0/0 0/0 .text worldGridDraw__18dMenu_Fmap2DBack_cFv */ -#ifdef NONMATCHING -// float regalloc void dMenu_Fmap2DBack_c::worldGridDraw() { f32 local_74, local_78; - f32 dVar9 = -field_0xfc8; - f32 dVar8 = -field_0xfcc; + f32 xPos, yPos; + f32 dVar9 = -mStageTransX; + f32 dVar8 = -mStageTransZ; calcAllMapPos2D(dVar9, dVar8, &local_74, &local_78); J2DDrawLine(local_74, mDoGph_gInf_c::getMinYF(), local_74, mDoGph_gInf_c::getMinYF() + mDoGph_gInf_c::getHeightF(), JUtility::TColor(255, 255, 255, 255), 6); - f32 xPos = dVar9 - g_fmapHIO.mWorldGridWidth; + xPos = dVar9 - g_fmapHIO.mWorldGridWidth; while (true) { calcAllMapPos2D(xPos, dVar8, &local_74, &local_78); if (local_74 >= getMapScissorAreaLX()) { @@ -1910,14 +1410,14 @@ void dMenu_Fmap2DBack_c::worldGridDraw() { } } - f32 xPos2 = dVar9 + g_fmapHIO.mWorldGridWidth; + xPos = dVar9 + g_fmapHIO.mWorldGridWidth; while (true) { - calcAllMapPos2D(xPos2, dVar8, &local_74, &local_78); + calcAllMapPos2D(xPos, dVar8, &local_74, &local_78); if (local_74 <= getMapScissorAreaLX() + getMapScissorAreaSizeRealX()) { J2DDrawLine(local_74, mDoGph_gInf_c::getMinYF(), local_74, mDoGph_gInf_c::getMinYF() + mDoGph_gInf_c::getHeightF(), JUtility::TColor(255, 255, 255, 255), 6); - xPos2 += g_fmapHIO.mWorldGridWidth; + xPos += g_fmapHIO.mWorldGridWidth; } else { break; } @@ -1927,7 +1427,7 @@ void dMenu_Fmap2DBack_c::worldGridDraw() { mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, JUtility::TColor(255, 255, 255, 255), 6); - f32 yPos = dVar8 - g_fmapHIO.mWorldGridWidth; + yPos = dVar8 - g_fmapHIO.mWorldGridWidth; while (true) { calcAllMapPos2D(dVar9, yPos, &local_74, &local_78); if (local_78 >= getMapScissorAreaLY()) { @@ -1940,1039 +1440,1408 @@ void dMenu_Fmap2DBack_c::worldGridDraw() { } } - f32 yPos2 = dVar8 + g_fmapHIO.mWorldGridWidth; + yPos = dVar8 + g_fmapHIO.mWorldGridWidth; while (true) { - calcAllMapPos2D(dVar9, yPos2, &local_74, &local_78); + calcAllMapPos2D(dVar9, yPos, &local_74, &local_78); if (local_78 <= getMapScissorAreaLY() + getMapScissorAreaSizeRealY()) { - J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_78, - mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, - JUtility::TColor(255, 255, 255, 255), 6); - yPos2 += g_fmapHIO.mWorldGridWidth; - }else{ + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_78, + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, + JUtility::TColor(255, 255, 255, 255), 6); + yPos += g_fmapHIO.mWorldGridWidth; + } else { break; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::worldGridDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/worldGridDraw__18dMenu_Fmap2DBack_cFv.s" -} -#pragma pop -#endif /* 801D34DC-801D382C 1CDE1C 0350+00 1/1 0/0 0/0 .text regionGridDraw__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::regionGridDraw(){nofralloc -#include "asm/d/menu/d_menu_fmap2D/regionGridDraw__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::regionGridDraw() { + f32 local_74, local_78; + + f32 xPos, yPos; + f32 dVar9 = mRegionOriginX[mRegionCursor] - mStageTransX; + f32 dVar8 = mRegionOriginZ[mRegionCursor] - mStageTransZ; + calcAllMapPos2D(dVar9, dVar8, &local_74, &local_78); + + J2DDrawLine(local_74, mDoGph_gInf_c::getMinYF(), local_74, + mDoGph_gInf_c::getMinYF() + mDoGph_gInf_c::getHeightF(), + JUtility::TColor(180, 0, 0, 255), 6); + + xPos = dVar9 - g_fmapHIO.mRegionGridWidth; + while (true) { + calcAllMapPos2D(xPos, dVar8, &local_74, &local_78); + if (local_74 >= getMapScissorAreaLX()) { + J2DDrawLine(local_74, mDoGph_gInf_c::getMinYF(), local_74, + mDoGph_gInf_c::getMinYF() + mDoGph_gInf_c::getHeightF(), + JUtility::TColor(180, 0, 0, 255), 6); + xPos -= g_fmapHIO.mRegionGridWidth; + } else { + break; + } + } + + xPos = dVar9 + g_fmapHIO.mRegionGridWidth; + while (true) { + calcAllMapPos2D(xPos, dVar8, &local_74, &local_78); + if (local_74 <= getMapScissorAreaLX() + getMapScissorAreaSizeRealX()) { + J2DDrawLine(local_74, mDoGph_gInf_c::getMinYF(), local_74, + mDoGph_gInf_c::getMinYF() + mDoGph_gInf_c::getHeightF(), + JUtility::TColor(180, 0, 0, 255), 6); + xPos += g_fmapHIO.mRegionGridWidth; + } else { + break; + } + } + + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_78, + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, + JUtility::TColor(180, 0, 0, 255), 6); + + yPos = dVar8 - g_fmapHIO.mRegionGridWidth; + while (true) { + calcAllMapPos2D(dVar9, yPos, &local_74, &local_78); + if (local_78 >= getMapScissorAreaLY()) { + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_78, + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, + JUtility::TColor(180, 0, 0, 255), 6); + yPos -= g_fmapHIO.mRegionGridWidth; + } else { + break; + } + } + + yPos = dVar8 + g_fmapHIO.mRegionGridWidth; + while (true) { + calcAllMapPos2D(dVar9, yPos, &local_74, &local_78); + if (local_78 <= getMapScissorAreaLY() + getMapScissorAreaSizeRealY()) { + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_78, + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), local_78, + JUtility::TColor(180, 0, 0, 255), 6); + yPos += g_fmapHIO.mRegionGridWidth; + } else { + break; + } + } } -#pragma pop -/* ############################################################################################## */ -/* 80454208-80454210 002808 0008+00 8/8 0/0 0/0 .sdata2 @4496 */ -SECTION_SDATA2 static f64 lit_4496 = 4503601774854144.0 /* cast s32 to float */; - -/* 80454210-80454214 002810 0004+00 1/1 0/0 0/0 .sdata2 @5133 */ -SECTION_SDATA2 static f32 lit_5133 = -0.0f; - -/* 80454214-80454218 002814 0004+00 1/1 0/0 0/0 .sdata2 @5134 */ -SECTION_SDATA2 static f32 lit_5134 = -608.0f; +// needed to make sdata2 match +static f32 dummy(int param_0) { + return param_0; +} /* 801D382C-801D38FC 1CE16C 00D0+00 1/1 0/0 0/0 .text worldOriginDraw__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::worldOriginDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/worldOriginDraw__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::worldOriginDraw() { + f32 local_44, local_48; + calcAllMapPos2D(-mStageTransX, -mStageTransZ, &local_44, &local_48); + + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_48 - local_44 + mDoGph_gInf_c::getMinXF(), + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), + local_48 - local_44 + (mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF()), + JUtility::TColor(0, 255, 0, 255), 6); + + J2DDrawLine(mDoGph_gInf_c::getMinXF(), local_48 + local_44 + -mDoGph_gInf_c::getMinXF(), + mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF(), + local_48 + local_44 + -(mDoGph_gInf_c::getMinXF() + mDoGph_gInf_c::getWidthF()), + JUtility::TColor(0, 255, 0, 255), 6); } -#pragma pop /* 801D38FC-801D3AF8 1CE23C 01FC+00 1/1 0/0 0/0 .text scrollAreaDraw__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::scrollAreaDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/scrollAreaDraw__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::scrollAreaDraw() { + for (int i = 0; i < 8; i++) { + if (mMapZoomRate != 0.0f && i != mRegionCursor) { + continue; + } + + f32 x_min, z_min, x_max, z_max; + if (g_fmapHIO.mScrollRangeDebugON) { + x_min = g_fmapHIO.mRegionScrollRangeMinX[i]; + z_min = g_fmapHIO.mRegionScrollRangeMinZ[i]; + x_max = g_fmapHIO.mRegionScrollRangeMaxX[i]; + z_max = g_fmapHIO.mRegionScrollRangeMaxZ[i]; + } else { + x_min = mRegionScrollMinX[i]; + z_min = mRegionScrollMinZ[i]; + x_max = mRegionScrollMaxX[i]; + z_max = mRegionScrollMaxZ[i]; + } + + f32 local_4c, local_50, local_54, local_58; + calcAllMapPos2D(x_min - mStageTransX, z_min - mStageTransZ, &local_4c, &local_50); + calcAllMapPos2D(x_max - mStageTransX, z_max - mStageTransZ, &local_54, &local_58); + + J2DDrawLine(local_4c, local_50, local_4c, local_58, + JUtility::TColor(255, 255, 255, 255), 6); + J2DDrawLine(local_54, local_50, local_54, local_58, + JUtility::TColor(255, 255, 255, 255), 6); + J2DDrawLine(local_4c, local_50, local_54, local_50, + JUtility::TColor(255, 255, 255, 255), 6); + J2DDrawLine(local_4c, local_58, local_54, local_58, + JUtility::TColor(255, 255, 255, 255), 6); + } } -#pragma pop /* 801D3AF8-801D3BBC 1CE438 00C4+00 1/1 0/0 0/0 .text regionOriginDraw__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::regionOriginDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/regionOriginDraw__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::regionOriginDraw() { + for (int i = 0; i < 8; i++) { + if (!mpAreaTex[i]) { + continue; + } + + f32 center_x, center_y; + calcAllMapPos2D(mRegionOriginX[i] - mStageTransX, mRegionOriginZ[i] - mStageTransZ, + ¢er_x, ¢er_y); + J2DFillBox(center_x - 3.0f, center_y - 3.0f, 6.0f, 6.0f, JUtility::TColor(255, 0, 0, 255)); + } } -#pragma pop /* 801D3BBC-801D3CB8 1CE4FC 00FC+00 1/1 0/0 0/0 .text stageOriginDraw__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::stageOriginDraw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/stageOriginDraw__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::stageOriginDraw() { + if (!mpStages) { + return; + } + + dMenuMapCommon_c::Stage_c::data* stage_data = mpStages->mData; + + for (int i = 0; i < mStageDataNum; i++) { + if (mRegionCursor + 1 == stage_data[i].mRegionNo) { + f32 center_x, center_y; + calcAllMapPos2D( + mRegionOriginX[mRegionCursor] + stage_data[i].mOffsetX - mStageTransX, + mRegionOriginZ[mRegionCursor] + stage_data[i].mOffsetZ - mStageTransZ, + ¢er_x, ¢er_y + ); + J2DFillBox(center_x - 3.0f, center_y - 3.0f, 6.0f, 6.0f, + JUtility::TColor(0, 0, 255, 255)); + } + } } -#pragma pop /* 801D3CB8-801D4928 1CE5F8 0C70+00 1/1 0/0 0/0 .text calcBlink__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcBlink(){nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcBlink__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::calcBlink() { + f32 t; + int i; + if (mMapZoomRate <= 1.0f) { + t = mMapZoomRate; + i = 0; + } else { + t = mMapZoomRate - 1.0f; + i = 1; + } + + mSelectedRegionBlack.r = g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.r + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mBlack.r + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.r); + mSelectedRegionBlack.g = g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.g + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mBlack.g + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.g); + mSelectedRegionBlack.b = g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.b + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mBlack.b + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.b); + mSelectedRegionBlack.a = g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.a + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mBlack.a + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlack.a); + mSelectedRegionWhite.r = g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.r + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mWhite.r + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.r); + mSelectedRegionWhite.g = g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.g + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mWhite.g + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.g); + mSelectedRegionWhite.b = g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.b + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mWhite.b + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.b); + mSelectedRegionWhite.a = g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.a + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mWhite.a + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mWhite.a); + mUnselectedRegionBlack.r = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.r + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mBlack.r + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.r); + mUnselectedRegionBlack.g = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.g + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mBlack.g + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.g); + mUnselectedRegionBlack.b = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.b + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mBlack.b + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.b); + mUnselectedRegionBlack.a = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.a + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mBlack.a + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlack.a); + mUnselectedRegionWhite.r = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.r + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mWhite.r + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.r); + mUnselectedRegionWhite.g = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.g + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mWhite.g + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.g); + mUnselectedRegionWhite.b = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.b + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mWhite.b + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.b); + mUnselectedRegionWhite.a = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.a + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mWhite.a + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mWhite.a); + mUnreachedRegionBlack.r = g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.r + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionBlack.r + - g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.r); + mUnreachedRegionBlack.g = g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.g + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionBlack.g + - g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.g); + mUnreachedRegionBlack.b = g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.b + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionBlack.b + - g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.b); + mUnreachedRegionBlack.a = g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.a + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionBlack.a + - g_fmapHIO.mMapBlink[i].mUnreachedRegionBlack.a); + mUnreachedRegionWhite.r = g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.r + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionWhite.r + - g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.r); + mUnreachedRegionWhite.g = g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.g + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionWhite.g + - g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.g); + mUnreachedRegionWhite.b = g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.b + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionWhite.b + - g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.b); + mUnreachedRegionWhite.a = g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.a + + t * (g_fmapHIO.mMapBlink[i + 1].mUnreachedRegionWhite.a + - g_fmapHIO.mMapBlink[i].mUnreachedRegionWhite.a); + field_0x1208.r = g_fmapHIO.mMapBlink[i].field_0x20.r + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x20.r + - g_fmapHIO.mMapBlink[i].field_0x20.r); + field_0x1208.g = g_fmapHIO.mMapBlink[i].field_0x20.g + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x20.g + - g_fmapHIO.mMapBlink[i].field_0x20.g); + field_0x1208.b = g_fmapHIO.mMapBlink[i].field_0x20.b + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x20.b + - g_fmapHIO.mMapBlink[i].field_0x20.b); + field_0x1208.a = g_fmapHIO.mMapBlink[i].field_0x20.a + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x20.a + - g_fmapHIO.mMapBlink[i].field_0x20.a); + field_0x120c.r = g_fmapHIO.mMapBlink[i].field_0x24.r + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x24.r + - g_fmapHIO.mMapBlink[i].field_0x24.r); + field_0x120c.g = g_fmapHIO.mMapBlink[i].field_0x24.g + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x24.g + - g_fmapHIO.mMapBlink[i].field_0x24.g); + field_0x120c.b = g_fmapHIO.mMapBlink[i].field_0x24.b + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x24.b + - g_fmapHIO.mMapBlink[i].field_0x24.b); + field_0x120c.a = g_fmapHIO.mMapBlink[i].field_0x24.a + + t * (g_fmapHIO.mMapBlink[i + 1].field_0x24.a + - g_fmapHIO.mMapBlink[i].field_0x24.a); + + f32 selected_max, selected_min, unselected_max, unselected_min; + f32 tmp_selected_min = g_fmapHIO.mMapBlink[i].mSelectedRegion.mMin / 255.0f; + f32 tmp_selected_max = g_fmapHIO.mMapBlink[i].mSelectedRegion.mMax / 255.0f; + f32 tmp_unselected_min = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mMin / 255.0f; + f32 tmp_unselected_max = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mMax / 255.0f; + + selected_max = tmp_selected_max + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mMax / 255.0f - tmp_selected_max); + selected_min = tmp_selected_min + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mMin / 255.0f - tmp_selected_min); + s16 selected_blink_speed = g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlinkSpeed + + t * (g_fmapHIO.mMapBlink[i + 1].mSelectedRegion.mBlinkSpeed + - g_fmapHIO.mMapBlink[i].mSelectedRegion.mBlinkSpeed); + unselected_max = tmp_unselected_max + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mMax / 255.0f - tmp_unselected_max); + unselected_min = tmp_unselected_min + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mMin / 255.0f - tmp_unselected_min); + s16 unselected_blink_speed = g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlinkSpeed + + t * (g_fmapHIO.mMapBlink[i + 1].mUnselectedRegion.mBlinkSpeed + - g_fmapHIO.mMapBlink[i].mUnselectedRegion.mBlinkSpeed); + + field_0x1218++; + if (field_0x1218 >= selected_blink_speed) { + field_0x1218 = 0; + } + + field_0x121a++; + if (field_0x121a >= unselected_blink_speed) { + field_0x121a = 0; + } + + f32 t_selected = 0.0f; + f32 t_unselected = 0.0f; + + if (selected_blink_speed > 0.0f) { + if (field_0x1218 < selected_blink_speed * 0.5f) { + t_selected = field_0x1218 / (selected_blink_speed * 0.5f); + } else { + t_selected = (selected_blink_speed - field_0x1218) / (selected_blink_speed * 0.5f); + } + } + + if (unselected_blink_speed > 0.0f) { + if (field_0x121a < unselected_blink_speed * 0.5f) { + t_unselected = field_0x121a / (unselected_blink_speed * 0.5f); + } else { + t_unselected = (unselected_blink_speed - field_0x121a) / (unselected_blink_speed * 0.5f); + } + } + + field_0x1210 = selected_min + t_selected * (selected_max - selected_min); + field_0x1214 = unselected_min + t_unselected * (unselected_max - unselected_min); } -#pragma pop - -/* ############################################################################################## */ -/* 80454218-8045421C 002818 0004+00 1/1 0/0 0/0 .sdata2 @5433 */ -SECTION_SDATA2 static f32 lit_5433 = 2.0f / 5.0f; - -/* 8045421C-80454220 00281C 0004+00 1/1 0/0 0/0 .sdata2 @5434 */ -SECTION_SDATA2 static f32 lit_5434 = 1.0f / 10.0f; /* 801D4928-801D49E0 1CF268 00B8+00 0/0 1/1 0/0 .text calcBackAlpha__18dMenu_Fmap2DBack_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcBackAlpha__18dMenu_Fmap2DBack_cFb.s" +void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) { + if (param_0) { + if (mBackAlpha != 1.0f) { + cLib_addCalc2(&mBackAlpha, 1.0f, 0.4f, 0.5f); + if (fabsf(mBackAlpha - 1.0f) < 0.1f) { + mBackAlpha = 1.0f; + } + } + } else { + if (mBackAlpha != 0.0f) { + cLib_addCalc2(&mBackAlpha, 0.0f, 0.4f, 0.5f); + if (fabsf(mBackAlpha) < 0.1f) { + mBackAlpha = 0.0f; + } + } + } } -#pragma pop /* 801D49E0-801D4AFC 1CF320 011C+00 0/0 1/1 0/0 .text btkAnimeLoop__18dMenu_Fmap2DBack_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/btkAnimeLoop__18dMenu_Fmap2DBack_cFf.s" +void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) { + if (mpBaseAnm) { + mAnmFrame += i_step; + if (mAnmFrame >= mpBaseAnm->getFrameMax()) { + mAnmFrame -= mpBaseAnm->getFrameMax(); + } + mpBaseAnm->setFrame(mAnmFrame); + } else { + mAnmFrame = 0.0f; + } + + mpBaseScreen->search('gold00_0')->setAnimation(mpBaseAnm); + mpBaseScreen->search('gold00_1')->setAnimation(mpBaseAnm); + mpBaseScreen->animation(); } -#pragma pop /* 801D4AFC-801D4B2C 1CF43C 0030+00 0/0 1/1 0/0 .text setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setBaseBackAlpha(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc.s" +void dMenu_Fmap2DBack_c::setBaseBackAlpha(u8 param_0) { + mpMapBlack->setAlpha(param_0); } -#pragma pop /* 801D4B2C-801D4E80 1CF46C 0354+00 0/0 3/3 0/0 .text * regionMapMove__18dMenu_Fmap2DBack_cFP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::regionMapMove(STControl* param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/regionMapMove__18dMenu_Fmap2DBack_cFP9STControl.s" -} -#pragma pop +void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) { + f32 min_x, min_y, max_x, max_y; + calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &min_x, &min_y); + calcAllMapPosWorld(getMapScissorAreaLX() + getMapScissorAreaSizeRealX(), + getMapScissorAreaLY() + getMapScissorAreaSizeRealY(), &max_x, &max_y); + + f32 slow_bound = g_fmapHIO.mScrollSpeedSlowBound < g_fmapHIO.mScrollSpeedFastBound ? + g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; + f32 fast_bound = g_fmapHIO.mScrollSpeedSlowBound > g_fmapHIO.mScrollSpeedFastBound ? + g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; + + f32 stick_value = i_stick->getValueStick(); + if (stick_value >= slow_bound) { + s16 angle = i_stick->getAngleStick(); + f32 local_68 = mTexMaxX - mTexMinX; + f32 spot_zoom = getSpotMapZoomRate(); + f32 region_zoom = getRegionMapZoomRate(mRegionCursor); + f32 zoom = region_zoom + (mMapZoomRate - 1.0f) * (spot_zoom - region_zoom); + f32 local_78 = local_68 / zoom; + f32 base_speed = stick_value < fast_bound ? + g_fmapHIO.mScrollSpeedRegionSlow : g_fmapHIO.mScrollSpeedRegionFast; + f32 speed = base_speed / 100.0f * local_78; + f32 speed_y = speed * cM_ssin(angle); + f32 speed_x = speed * cM_scos(angle); + control_xpos += speed_y; + control_ypos += speed_x; + } -/* ############################################################################################## */ -/* 80454220-80454224 002820 0004+00 1/1 0/0 0/0 .sdata2 @5568 */ -SECTION_SDATA2 static f32 lit_5568 = -1.0f; + if (mArrowPos3DX + control_xpos < min_x) { + control_xpos = min_x - mArrowPos3DX; + } + if (mArrowPos3DX + control_xpos > max_x) { + control_xpos = max_x - mArrowPos3DX; + } + if (mArrowPos3DZ + control_ypos < min_y) { + control_ypos = min_y - mArrowPos3DZ; + } + if (mArrowPos3DZ + control_ypos > max_y) { + control_ypos = max_y - mArrowPos3DZ; + } + + calcRenderingScale(); + calcRenderingPos(); + + f32 pos_x, pos_y; + calcAllMapPos2D(mArrowPos3DX + control_xpos - mStageTransX, + mArrowPos3DZ + control_ypos - mStageTransZ, &pos_x, &pos_y); + + mSelectRegion = 0xff; + int region = mRegionCursor; + if (region != 0xff && region != 7) { + if (dMeter2Info_getPixel(pos_x, pos_y, + mRegionMinMapX[region] + field_0xf0c[region] + mTransX, + mRegionMinMapY[region] + field_0xf2c[region] + mTransZ, + mRegionMapSizeX[region] * mZoom, + mRegionMapSizeY[region] * mZoom, + mpAreaTex[region]->getTexture(0)->getTexInfo())) { + mSelectRegion = region; + } + } +} /* 801D4E80-801D5334 1CF7C0 04B4+00 0/0 1/1 0/0 .text * stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::stageMapMove(STControl* param_0, u8 param_1, bool param_2) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb.s" +void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param_2) { + f32 min_x, min_y, max_x, max_y, center_x, center_y; + + f32 slow_bound = g_fmapHIO.mScrollSpeedSlowBound < g_fmapHIO.mScrollSpeedFastBound ? + g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; + f32 fast_bound = g_fmapHIO.mScrollSpeedSlowBound > g_fmapHIO.mScrollSpeedFastBound ? + g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; + + f32 stick_value = i_stick->getValueStick(); + bool bVar6 = false; + f32 trans_x = mStageTransX; + f32 trans_z = mStageTransZ; + + if (stick_value >= slow_bound && param_2 && field_0x1238 != 2) { + bVar6 = true; + s16 angle = i_stick->getAngleStick(); + f32 local_68 = mTexMaxX - mTexMinX; + f32 spot_zoom = getSpotMapZoomRate(); + f32 region_zoom = getRegionMapZoomRate(mRegionCursor); + f32 zoom = region_zoom + (mMapZoomRate - 1.0f) * (spot_zoom - region_zoom); + f32 local_78 = local_68 / zoom; + f32 base_speed = stick_value < fast_bound ? + g_fmapHIO.mScrollSpeedRegionZoomSlow : g_fmapHIO.mScrollSpeedRegionZoomFast; + f32 speed = base_speed / 100.0f * local_78; + f32 speed_x = speed * cM_ssin(angle); + f32 speed_z = speed * cM_scos(angle); + mStageTransX += speed_x; + mStageTransZ += speed_z; + } else if (!param_2) { + return; + } + + calcAllMapPosWorld(getMapAreaGlobalCenterPosX(), getMapAreaGlobalCenterPosY(), + ¢er_x, ¢er_y); + calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &min_x, &min_y); + + if (g_fmapHIO.mScrollRangeDebugON) { + min_x = g_fmapHIO.mRegionScrollRangeMinX[mRegionCursor]; + min_y = g_fmapHIO.mRegionScrollRangeMinZ[mRegionCursor]; + max_x = g_fmapHIO.mRegionScrollRangeMaxX[mRegionCursor]; + max_y = g_fmapHIO.mRegionScrollRangeMaxZ[mRegionCursor]; + } else { + min_x = mRegionScrollMinX[mRegionCursor]; + min_y = mRegionScrollMinZ[mRegionCursor]; + max_x = mRegionScrollMaxX[mRegionCursor]; + max_y = mRegionScrollMaxZ[mRegionCursor]; + } + + if (center_x < min_x - mStageTransX) { + mStageTransX = -(center_x - min_x); + } + if (center_x > max_x - mStageTransX) { + mStageTransX = -(center_x - max_x); + } + if (center_y < min_y - mStageTransZ) { + mStageTransZ = -(center_y - min_y); + } + if (center_y > max_y - mStageTransZ) { + mStageTransZ = -(center_y - max_y); + } + + if (bVar6 && (trans_x != mStageTransX || trans_z != mStageTransZ)) { + Z2GetAudioMgr()->seStartLevel(Z2SE_SY_MAP_SCROLL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + field_0xfd8 = mStageTransX - field_0xfd0; + field_0xfdc = mStageTransZ - field_0xfd4; + control_xpos = mStageTransX + (field_0x11b4 - mArrowPos3DX); + control_ypos = mStageTransZ + (field_0x11b8 - mArrowPos3DZ); + + calcRenderingScale(); + calcRenderingPos(); + + field_0x122d = 0; + if (mStageTransX > -(center_x - min_x)) { + field_0x122d |= 1; + } + if (mStageTransX < -(center_x - max_x)) { + field_0x122d |= 4; + } + if (mStageTransZ > -(center_y - min_y)) { + field_0x122d |= 8; + } + if (mStageTransZ < -(center_y - max_y)) { + field_0x122d |= 2; + } + + mpMeterHaihai->_execute(0); } -#pragma pop /* 801D5334-801D5388 1CFC74 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__18dMenu_Fmap2DBack_cFfb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 param_0, bool param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAllAlphaRate__18dMenu_Fmap2DBack_cFfb.s" +void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 i_rate, bool i_init) { + mAlphaRate = i_rate; + if (i_init) { + mpBaseRoot->setBackupAlpha(); + } + mpBaseRoot->setAlphaMorfRate(i_rate); } -#pragma pop - -/* ############################################################################################## */ -/* 80454224-80454228 002824 0004+00 1/1 0/0 0/0 .sdata2 @5632 */ -SECTION_SDATA2 static f32 lit_5632 = 304.0f; - -/* 80454228-8045422C 002828 0004+00 1/1 0/0 0/0 .sdata2 @5633 */ -SECTION_SDATA2 static f32 lit_5633 = 224.0f; /* 801D5388-801D564C 1CFCC8 02C4+00 1/1 0/0 0/0 .text drawDebugStageArea__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::drawDebugStageArea() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/drawDebugStageArea__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::drawDebugStageArea() { + JUtility::TColor colors[6] = { + JUtility::TColor(255, 255, 0, 50), + JUtility::TColor(255, 0, 255, 50), + JUtility::TColor(0, 255, 255, 50), + JUtility::TColor(255, 0, 0, 50), + JUtility::TColor(0, 255, 0, 50), + JUtility::TColor(0, 0, 255, 50), + }; + + if (mpFmapMap && mpRegionData) { + for (int i = 0; i < mDoGph_gInf_c::getWidthF(); i += g_fmapHIO.mRangeCheckInterval + 1) { + for (int j = 0; j < mDoGph_gInf_c::getHeightF(); j += g_fmapHIO.mRangeCheckInterval + 1) + { + int stage_no; + mpFmapMap->getPointStagePathInnerNo(mpRegionData, + i - mDoGph_gInf_c::getWidthF() / 2.0f, + j - mDoGph_gInf_c::getHeightF() / 2.0f, + field_0x1244, &stage_no, NULL); + if (stage_no >= 0) { + J2DFillBox(i + mDoGph_gInf_c::getMinXF() - 3.0f, j - 3.0f, 6.0f, 6.0f, + colors[stage_no % 6]); + } + } + } + } } -#pragma pop /* 801D564C-801D58F8 1CFF8C 02AC+00 1/1 0/0 0/0 .text drawDebugRegionArea__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::drawDebugRegionArea() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/drawDebugRegionArea__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::drawDebugRegionArea() { + getAllMapZoomRate(); + + JUtility::TColor colors[7] = { + JUtility::TColor(255, 255, 0, 50), + JUtility::TColor(255, 0, 255, 50), + JUtility::TColor(0, 255, 255, 50), + JUtility::TColor(255, 0, 0, 50), + JUtility::TColor(0, 255, 0, 50), + JUtility::TColor(0, 0, 255, 50), + JUtility::TColor(255, 255, 255, 50), + }; + + for (int i = 0; i < getMapScissorAreaSizeRealX(); i += g_fmapHIO.mRangeCheckInterval + 1) { + for (int j = 0; j < getMapScissorAreaSizeRealY(); j += g_fmapHIO.mRangeCheckInterval + 1) { + for (int k = 7; k >= 0; k--) { + int region = field_0x1230[k]; + if (region == 0xff || region == 7) continue; + f32 pos_x = i + getMapScissorAreaLX(); + f32 pos_y = j + getMapScissorAreaLY(); + if (dMeter2Info_getPixel(pos_x, pos_y, + mRegionMinMapX[region] + field_0xf0c[region] + mTransX, + mRegionMinMapY[region] + field_0xf2c[region] + mTransZ, + mRegionMapSizeX[region] * mZoom, + mRegionMapSizeY[region] * mZoom, + mpAreaTex[region]->getTexture(0)->getTexInfo())) + { + J2DFillBox(pos_x - 3.0f, pos_y - 3.0f, 6.0f, 6.0f, colors[region]); + break; + } + } + } + } } -#pragma pop /* 801D58F8-801D59C0 1D0238 00C8+00 0/0 2/2 0/0 .text setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setArrowPos3D(u8 param_0, char const* param_1, f32 param_2, - f32 param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff.s" +void dMenu_Fmap2DBack_c::setArrowPos3D(u8 i_regionNo, char const* i_stageName, f32 i_posX, + f32 i_posZ) { + f32 offset_x = 0.0f; + f32 offset_z = 0.0f; + + if (i_stageName) { + calcOffset(i_regionNo, i_stageName, &offset_x, &offset_z); + } else { + i_posX = 0.5f * (mRegionTexData[i_regionNo].mMinX + mRegionTexData[i_regionNo].mMaxX); + i_posZ = 0.5f * (mRegionTexData[i_regionNo].mMinZ + mRegionTexData[i_regionNo].mMaxZ); + } + + mArrowPos3DX = i_posX + offset_x; + mArrowPos3DZ = i_posZ + offset_z; + control_xpos = 0.0f; + control_ypos = 0.0f; } -#pragma pop /* 801D59C0-801D5AC4 1D0300 0104+00 0/0 1/1 0/0 .text * setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 param_0, char const* param_1, f32 param_2, - f32 param_3, f32 param_4) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff.s" +void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 i_regionNo, char const* i_stageName, f32 i_posX, + f32 i_posZ, f32 param_4) { + f32 offset_x, offset_z, pos2d_x, pos2d_y; + + if (param_4 != 0.0f) { + calcOffset(i_regionNo, i_stageName, &offset_x, &offset_z); + calcAllMapPos2D(i_posX + offset_x - getRegionOriginX(i_regionNo), + i_posZ + offset_z - getRegionOriginZ(i_regionNo), + &pos2d_x, &pos2d_y); + pos2d_y -= param_4; + calcAllMapPosWorld(pos2d_x, pos2d_y, &i_posX, &i_posZ); + i_posX += getRegionOriginX(i_regionNo); + i_posZ += getRegionOriginZ(i_regionNo); + } + + mArrowPos3DX = i_posX; + mArrowPos3DZ = i_posZ; + control_xpos = 0.0f; + control_ypos = 0.0f; } -#pragma pop /* 801D5AC4-801D5BB8 1D0404 00F4+00 0/0 2/2 0/0 .text calcDrawPriority__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::calcDrawPriority() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/calcDrawPriority__18dMenu_Fmap2DBack_cFv.s" +void dMenu_Fmap2DBack_c::calcDrawPriority() { + u8 region; + u8 dVar2 = mRegionCursor; + u8 dVar3 = 6; + + for (int i = 7; i >= 0; i--) { + region = field_0x1230[i]; + if (field_0x1230[i] != 0xff) { + if (field_0x1230[i] == mRegionCursor) { + field_0x1230[i] = dVar2; + break; + } + field_0x1230[i] = dVar2; + dVar2 = region; + } + } + + if (mRegionCursor != 6) { + for (int i = 7; i >= 0; i--) { + region = field_0x1230[i]; + if (field_0x1230[i] != 0xff) { + if (field_0x1230[i] == 6) { + field_0x1230[i] = dVar3; + break; + } + field_0x1230[i] = dVar3; + dVar3 = region; + } + } + } + + if (field_0x1230[0] != 7) { + u8 dVar4 = field_0x1230[0]; + field_0x1230[0] = 7; + for (int i = 1; i < 8; i++) { + region = field_0x1230[i]; + if (field_0x1230[i] != 0xff) { + if (field_0x1230[i] == 7) { + field_0x1230[i] = dVar4; + break; + } + field_0x1230[i] = dVar4; + dVar4 = region; + } + } + } } -#pragma pop /* 801D5BB8-801D5BD0 1D04F8 0018+00 0/0 3/3 0/0 .text setArrowPosAxis__18dMenu_Fmap2DBack_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 param_0, f32 param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setArrowPosAxis__18dMenu_Fmap2DBack_cFff.s" +void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 i_posX, f32 i_posZ) { + mArrowPos3DX = i_posX; + mArrowPos3DZ = i_posZ; + control_xpos = 0.0f; + control_ypos = 0.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80396288-803962A0 0228E8 0018+00 0/1 0/0 0/0 .rodata area_name$5814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const area_name[24] = { - 0x69, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x5F, - 0x73, - 0x00, - 0x00, - 0x69, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x00, - 0x69, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x31, -}; -COMPILER_STRIP_GATE(0x80396288, &area_name); -#pragma pop - -/* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const farea_name_5815[24] = { - 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E, - 0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32, -}; -COMPILER_STRIP_GATE(0x803962A0, &farea_name_5815); -#pragma pop - -/* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const sfont_name[56] = { - 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x30, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, - 0x6C, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x6C, 0x31, 0x00, 0x73, 0x66, 0x6F, - 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, - 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32, -}; -COMPILER_STRIP_GATE(0x803962B8, &sfont_name); -#pragma pop - -/* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const ffont_name_5822[56] = { - 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x30, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, - 0x6C, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x6C, 0x31, 0x00, 0x66, 0x66, 0x6F, - 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66, - 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34, -}; -COMPILER_STRIP_GATE(0x803962F0, &ffont_name_5822); -#pragma pop - -/* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const cont_zt[40] = { - 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, - 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, - 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, -}; -COMPILER_STRIP_GATE(0x80396328, &cont_zt); -#pragma pop - -/* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const font_zt_5829[40] = { - 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, - 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, - 0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35, -}; -COMPILER_STRIP_GATE(0x80396350, &font_zt_5829); -#pragma pop - -/* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const cont_bt[40] = { - 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, - 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, - 0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, -}; -COMPILER_STRIP_GATE(0x80396378, &cont_bt); -#pragma pop - -/* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const font_bt_5836[40] = { - 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, - 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, - 0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35, -}; -COMPILER_STRIP_GATE(0x803963A0, &font_bt_5836); -#pragma pop - -/* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const cont_at[40] = { - 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, - 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, - 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, -}; -COMPILER_STRIP_GATE(0x803963C8, &cont_at); -#pragma pop - -/* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const font_at_5843[40] = { - 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, - 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, - 0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35, -}; -COMPILER_STRIP_GATE(0x803963F0, &font_at_5843); -#pragma pop - -/* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const juji_c_5849[40] = { - 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x30, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, - 0x30, 0x31, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x6A, 0x75, 0x6A, 0x69, - 0x5F, 0x63, 0x30, 0x33, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, -}; -COMPILER_STRIP_GATE(0x80396418, &juji_c_5849); -#pragma pop - -/* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const fuji_c[40] = { - 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x30, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, - 0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69, - 0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, -}; -COMPILER_STRIP_GATE(0x80396440, &fuji_c); -#pragma pop - -/* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const ast_c_5856[40] = { - 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, - 0x30, 0x31, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x61, 0x73, - 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x34, -}; -COMPILER_STRIP_GATE(0x80396468, &ast_c_5856); -#pragma pop - -/* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const fst_c[40] = { - 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, - 0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73, - 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34, -}; -COMPILER_STRIP_GATE(0x80396490, &fst_c); -#pragma pop - -/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo"; -SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk"; -SECTION_DEAD static char const* const stringBase_8039668B = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039668C = "\0\0\0"; -#pragma pop /* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text * __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* param_0, STControl* param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/__ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s" +dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { + mpHeap = i_heap; + mTransX = 0.0f; + mTransY = 0.0f; + mpPortalBin = NULL; + mpScrnExplain = NULL; + + mpTitleScreen = new J2DScreen(); + mpTitleScreen->setPriority("zelda_map_screen_title.blo", 0x1020000, + dComIfGp_getFmapResArchive()); + dPaneClass_showNullPane(mpTitleScreen); + mpTitleRoot = new CPaneMgrAlphaMorf(mpTitleScreen, 'ROOT', 2, NULL); + + mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_04', 0, NULL); + mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_05', 0, NULL); + mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_06', 0, NULL); + mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_07', 0, NULL); + + mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, 'juji_c_n', 2, NULL); + mpDpadAlpha->setAlphaRate(0.0f); + mpAnalogStickAlpha = new CPaneMgrAlpha(mpTitleScreen, 'as_n', 2, NULL); + mpAnalogStickAlpha->setAlphaRate(0.0f); + mpAnalogStick = new CPaneMgr(mpTitleScreen, 'as_n', 0, NULL); + mpDpad = new CPaneMgr(mpTitleScreen, 'juji_c_n', 0, NULL); + + mpButtonA = new CPaneMgr(mpTitleScreen, 'abtn_n1', 2, NULL); + mpButtonB = new CPaneMgr(mpTitleScreen, 'bbtn_n1', 2, NULL); + mpButtonZ = new CPaneMgr(mpTitleScreen, 'zbtn_n1', 2, NULL); + mpButtonTextA = new CPaneMgr(mpTitleScreen, 'a_text_n', 2, NULL); + mpButtonTextB = new CPaneMgr(mpTitleScreen, 'b_text_n', 2, NULL); + mpButtonTextZ = new CPaneMgr(mpTitleScreen, 'z_text_n', 2, NULL); + mpButtonA->setAlphaRate(0.0f); + mpButtonB->setAlphaRate(0.0f); + mpButtonZ->setAlphaRate(0.0f); + mpButtonTextA->setAlphaRate(0.0f); + mpButtonTextB->setAlphaRate(0.0f); + mpButtonTextZ->setAlphaRate(0.0f); + + mpNamePane = new CPaneMgr(mpTitleScreen, 'name_n', 0, NULL); + mpSubPane = new CPaneMgr(mpTitleScreen, 'sub_n_n', 0, NULL); + if (dMeter2Info_getMapStatus() == 9) { + mpNamePane->hide(); + mpSubPane->hide(); + } + mpContPane = new CPaneMgr(mpTitleScreen, 'cont_n', 0, NULL); + + mTitlePosX = mTitlePosY = 0.0f; + mTitleScale = 1.0f; + mSubTitlePosX = mSubTitlePosY = 0.0f; + mSubTitleScale = 1.0f; + mAreaMovementPosX = mAreaMovementPosY = 0.0f; + mAreaMovementScale = 1.0f; + mClosingPosX = mClosingPosY = 0.0f; + mClosingScale = 1.0f; + mDoIconPosX = mDoIconPosY = 0.0f; + mDoIconScale = 1.0f; + + OSInitFastCast(); + + mpAnm = static_cast(J2DAnmLoaderDataBase::load( + JKRFileLoader::getGlbResource("zelda_map_screen_title.btk", dComIfGp_getFmapResArchive()))); + mpAnm->searchUpdateMaterialID(mpTitleScreen); + + mAnmFrame = 0.0f; + + static const u64 area_name[3] = {'i_name_s', 'i_name' ,'i_name1'}; + static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'}; + for (int i = 0; i < 3; i++) { + static_cast(mpTitleScreen->search(farea_name[i])) + ->setFont(mDoExt_getRubyFont()); + static_cast(mpTitleScreen->search(farea_name[i]))->setString(0x40, ""); + mpTitleScreen->search(area_name[i])->hide(); + } + + static const u64 sfont_name[7] = { + 'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2' + }; + static const u64 ffont_name[7] = { + 'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4' + }; + for (int i = 0; i < 7; i++) { + static_cast(mpTitleScreen->search(ffont_name[i])) + ->setFont(mDoExt_getRubyFont()); + static_cast(mpTitleScreen->search(ffont_name[i]))->setString(0x40, ""); + mpTitleScreen->search(sfont_name[i])->hide(); + } + setTitleNameString(0x3e0); + + static const u64 cont_zt[5] = {'cont_zt', 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4'}; + static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'}; + for (int i = 0; i < 5; i++) { + static_cast(mpTitleScreen->search(font_zt[i])) + ->setFont(mDoExt_getMesgFont()); + static_cast(mpTitleScreen->search(font_zt[i]))->setString(0x20, ""); + mpTitleScreen->search(cont_zt[i])->hide(); + } + setZButtonString(0x529, 0xff); + + static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; + static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'}; + for (int i = 0; i < 5; i++) { + static_cast(mpTitleScreen->search(font_bt[i])) + ->setFont(mDoExt_getMesgFont()); + static_cast(mpTitleScreen->search(font_bt[i]))->setString(0x20, ""); + mpTitleScreen->search(cont_bt[i])->hide(); + } + setBButtonString(0x522, 0xff); + + static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'}; + static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'}; + for (int i = 0; i < 5; i++) { + static_cast(mpTitleScreen->search(font_at[i])) + ->setFont(mDoExt_getMesgFont()); + static_cast(mpTitleScreen->search(font_at[i]))->setString(0x20, ""); + mpTitleScreen->search(cont_at[i])->hide(); + } + setAButtonString(0x527, 0xff); + + static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'}; + static const u64 fuji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'}; + for (int i = 0; i < 5; i++) { + static_cast(mpTitleScreen->search(fuji_c[i])) + ->setFont(mDoExt_getMesgFont()); + static_cast(mpTitleScreen->search(fuji_c[i]))->setString(0x20, ""); + mpTitleScreen->search(juji_c[i])->hide(); + } + setCrossLRString(0x3f9); + + static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'}; + static const u64 fst_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'}; + for (int i = 0; i < 5; i++) { + static_cast(mpTitleScreen->search(fst_c[i])) + ->setFont(mDoExt_getMesgFont()); + static_cast(mpTitleScreen->search(fst_c[i]))->setString(0x20, ""); + mpTitleScreen->search(ast_c[i])->hide(); + } + set3DStickString(0x524); + + setHIO(true); } -#pragma pop /* 801D6700-801D6A44 1D1040 0344+00 1/0 0/0 0/0 .text __dt__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/__dt__17dMenu_Fmap2DTop_cFv.s" +dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() { + deleteExplain(); + delete mpTitleScreen; + mpTitleScreen = NULL; + delete mpTitleRoot; + delete mpButtonA; + mpButtonA = NULL; + delete mpButtonB; + mpButtonB = NULL; + delete mpButtonZ; + mpButtonZ = NULL; + delete mpButtonTextA; + mpButtonTextA = NULL; + delete mpButtonTextB; + mpButtonTextB = NULL; + delete mpButtonTextZ; + mpButtonTextZ = NULL; + if (mpDpadAlpha != NULL) { + delete mpDpadAlpha; + mpDpadAlpha = NULL; + } + if (mpAnalogStickAlpha != NULL) { + delete mpAnalogStickAlpha; + mpAnalogStickAlpha = NULL; + } + delete mpNamePane; + mpNamePane = NULL; + delete mpSubPane; + mpSubPane = NULL; + if (mpAnalogStick != NULL) { + delete mpAnalogStick; + mpAnalogStick = NULL; + } + if (mpDpad != NULL) { + delete mpDpad; + mpDpad = NULL; + } + delete mpContPane; + mpContPane = NULL; + for (int i = 0; i < 2; i++) { + if (mpArrowLAlpha[i] != NULL) { + delete mpArrowLAlpha[i]; + } + if (mpArrowRAlpha[i] != NULL) { + delete mpArrowRAlpha[i]; + } + } + delete mpAnm; + mpAnm = NULL; } -#pragma pop /* 801D6A44-801D6C44 1D1384 0200+00 0/0 1/1 0/0 .text _execute__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::_execute() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/_execute__17dMenu_Fmap2DTop_cFv.s" +void dMenu_Fmap2DTop_c::_execute() { + switch (mAlphaButtonA) { + case ALPHA_MIN: + setAlphaAnimeMax(mpButtonA); + setAlphaAnimeMin(mpButtonTextA); + break; + case ALPHA_MID: + setAlphaAnimeMid(mpButtonA); + setAlphaAnimeMid(mpButtonTextA); + break; + default: + setAlphaAnimeMax(mpButtonA); + setAlphaAnimeMax(mpButtonTextA); + } + + switch (mAlphaButtonB) { + case ALPHA_MIN: + setAlphaAnimeMax(mpButtonB); + setAlphaAnimeMin(mpButtonTextB); + break; + case ALPHA_MID: + setAlphaAnimeMid(mpButtonB); + setAlphaAnimeMid(mpButtonTextB); + break; + default: + setAlphaAnimeMax(mpButtonB); + setAlphaAnimeMax(mpButtonTextB); + } + + switch (mAlphaButtonZ) { + case ALPHA_MIN: + setAlphaAnimeMax(mpButtonZ); + setAlphaAnimeMin(mpButtonTextZ); + break; + case ALPHA_MID: + setAlphaAnimeMid(mpButtonZ); + setAlphaAnimeMid(mpButtonTextZ); + break; + default: + setAlphaAnimeMax(mpButtonZ); + setAlphaAnimeMax(mpButtonTextZ); + } + + if (mpDpadAlpha) { + switch (mAlphaDpad) { + case ALPHA_MIN: + setAlphaAnimeMin(mpDpadAlpha); + break; + case ALPHA_MID: + setAlphaAnimeMid(mpDpadAlpha); + break; + default: + setAlphaAnimeMax(mpDpadAlpha); + break; + } + } + + if (mpAnalogStickAlpha) { + switch (mAlphaAnalogStick) { + case ALPHA_MIN: + setAlphaAnimeMin(mpAnalogStickAlpha); + break; + case ALPHA_MID: + setAlphaAnimeMid(mpAnalogStickAlpha); + break; + default: + setAlphaAnimeMax(mpAnalogStickAlpha); + break; + } + } + + setHIO(false); } -#pragma pop /* 801D6C44-801D6C98 1D1584 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__17dMenu_Fmap2DTop_cFfb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 param_0, bool param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAllAlphaRate__17dMenu_Fmap2DTop_cFfb.s" +void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 i_rate, bool i_init) { + mAlphaRate = i_rate; + if (i_init) { + mpTitleRoot->setBackupAlpha(); + } + mpTitleRoot->setAlphaMorfRate(i_rate); } -#pragma pop /* 801D6C98-801D6DF8 1D15D8 0160+00 1/0 0/0 0/0 .text draw__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::draw() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/draw__17dMenu_Fmap2DTop_cFv.s" +void dMenu_Fmap2DTop_c::draw() { + u32 scissor_left, scissor_top, scissor_width, scissor_height; + J2DOrthoGraph* ctx = static_cast(dComIfGp_getCurrentGrafPort()); + ctx->setup2D(); + GXGetScissor(&scissor_left, &scissor_top, &scissor_width, &scissor_height); + ctx->scissor(mTransX, 0.0f, 608.0f, 448.0f); + ctx->setScissor(); + mpTitleScreen->draw(mTransX, mTransY, ctx); + ctx->scissor(scissor_left, scissor_top, scissor_width, scissor_height); + ctx->setScissor(); + if (mpScrnExplain) { + mpScrnExplain->draw(ctx); + } } -#pragma pop /* 801D6DF8-801D6EDC 1D1738 00E4+00 0/0 1/1 0/0 .text * btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* param_0, f32 param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf.s" +void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) { + if (i_anm) { + mAnmFrame += i_delta; + if (mAnmFrame >= i_anm->getFrameMax()) { + mAnmFrame -= i_anm->getFrameMax(); + } + i_anm->setFrame(mAnmFrame); + } else { + mAnmFrame = 0.0f; + } + + mpTitleScreen->search('spot_0')->setAnimation(i_anm); + mpTitleScreen->animation(); } -#pragma pop /* 801D6EDC-801D6F38 1D181C 005C+00 0/0 1/1 0/0 .text setMoyaAlpha__17dMenu_Fmap2DTop_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setMoyaAlpha__17dMenu_Fmap2DTop_cFUc.s" +void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 i_alpha) { + mpTitleScreen->search('spot_0')->setAlpha(i_alpha); } -#pragma pop - -/* ############################################################################################## */ -/* 803964B8-803964F0 022B18 0038+00 1/1 0/0 0/0 .rodata ffont_name$6110 */ -SECTION_RODATA static u8 const ffont_name_6110[56] = { - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x30, - 0x30, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x6C, - 0x30, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x6C, - 0x31, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x6C, - 0x32, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x62, - 0x30, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x62, - 0x33, - 0x00, - 0x66, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x62, - 0x34, -}; -COMPILER_STRIP_GATE(0x803964B8, &ffont_name_6110); /* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setTitleNameString__17dMenu_Fmap2DTop_cFUl.s" +void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) { + static const u64 ffont_name[7] = { + 'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4' + }; + for (int i = 0; i < 7; i++) { + if (param_0 == 0) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(ffont_name[i])); + strcpy(text_box->getStringPtr(), ""); + } else { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(ffont_name[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 803964F0-80396508 022B50 0018+00 1/1 0/0 0/0 .rodata farea_name$6125 */ -SECTION_RODATA static u8 const farea_name_6125[24] = { - 0x66, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x5F, - 0x31, - 0x00, - 0x66, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x33, - 0x00, - 0x66, - 0x5F, - 0x6E, - 0x61, - 0x6D, - 0x65, - 0x32, -}; -COMPILER_STRIP_GATE(0x803964F0, &farea_name_6125); /* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAreaNameString__17dMenu_Fmap2DTop_cFUl.s" +void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) { + static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'}; + for (int i = 0; i < 3; i++) { + if (param_0 == 0) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(farea_name[i])); + strcpy(text_box->getStringPtr(), ""); + } else { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(farea_name[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80396508-80396530 022B68 0028+00 1/1 0/0 0/0 .rodata font_zt$6148 */ -SECTION_RODATA static u8 const font_zt_6148[40] = { - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x7A, - 0x74, - 0x31, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x7A, - 0x74, - 0x32, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x7A, - 0x74, - 0x33, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x7A, - 0x74, - 0x34, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x7A, - 0x74, - 0x35, -}; -COMPILER_STRIP_GATE(0x80396508, &font_zt_6148); /* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setZButtonString__17dMenu_Fmap2DTop_cFUlUc.s" -} -#pragma pop +void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) { + if (param_0 == 0x529 && ((daMidna_c*)daPy_py_c::getMidnaActor())->checkPortalObjRide()) { + param_0 = 0x533; + } -/* ############################################################################################## */ -/* 80396530-80396558 022B90 0028+00 1/1 0/0 0/0 .rodata font_bt$6176 */ -SECTION_RODATA static u8 const font_bt_6176[40] = { - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x62, - 0x74, - 0x31, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x62, - 0x74, - 0x32, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x62, - 0x74, - 0x33, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x62, - 0x74, - 0x34, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x62, - 0x74, - 0x35, -}; -COMPILER_STRIP_GATE(0x80396530, &font_bt_6176); + static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'}; + if (param_0 == 0 || !isWarpAccept()) { + mAlphaButtonZ = ALPHA_MID; + } else { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(font_zt[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } + + if (i_alpha == ALPHA_DEFAULT) { + if (checkPlayerWarpAccept()) { + mAlphaButtonZ = ALPHA_MAX; + } else { + mAlphaButtonZ = ALPHA_MID; + } + } else { + mAlphaButtonZ = i_alpha; + } + } +} /* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setBButtonString__17dMenu_Fmap2DTop_cFUlUc.s" -} -#pragma pop +void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) { + static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'}; + if (param_0 == 0) { + mAlphaButtonB = ALPHA_MIN; + } else { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(font_bt[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } -/* ############################################################################################## */ -/* 80396558-80396580 022BB8 0028+00 1/1 0/0 0/0 .rodata font_at$6194 */ -SECTION_RODATA static u8 const font_at_6194[40] = { - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x61, - 0x74, - 0x31, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x61, - 0x74, - 0x32, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x61, - 0x74, - 0x33, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x61, - 0x74, - 0x34, - 0x66, - 0x6F, - 0x6E, - 0x74, - 0x5F, - 0x61, - 0x74, - 0x35, -}; -COMPILER_STRIP_GATE(0x80396558, &font_at_6194); + if (i_alpha == ALPHA_DEFAULT) { + mAlphaButtonB = ALPHA_MAX; + } else { + mAlphaButtonB = i_alpha; + } + } +} /* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAButtonString__17dMenu_Fmap2DTop_cFUlUc.s" -} -#pragma pop +void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) { + static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'}; + if (param_0 == 0) { + mAlphaButtonA = ALPHA_MIN; + } else { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(font_at[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } -/* ############################################################################################## */ -/* 80396580-803965A8 022BE0 0028+00 1/1 0/0 0/0 .rodata juji_c$6209 */ -SECTION_RODATA static u8 const juji_c_6209[40] = { - 0x66, - 0x75, - 0x6A, - 0x69, - 0x5F, - 0x63, - 0x30, - 0x30, - 0x66, - 0x75, - 0x6A, - 0x69, - 0x5F, - 0x63, - 0x30, - 0x31, - 0x66, - 0x75, - 0x6A, - 0x69, - 0x5F, - 0x63, - 0x30, - 0x32, - 0x66, - 0x75, - 0x6A, - 0x69, - 0x5F, - 0x63, - 0x30, - 0x33, - 0x66, - 0x75, - 0x6A, - 0x69, - 0x5F, - 0x63, - 0x30, - 0x34, -}; -COMPILER_STRIP_GATE(0x80396580, &juji_c_6209); + if (i_alpha == ALPHA_DEFAULT) { + mAlphaButtonA = ALPHA_MAX; + } else { + mAlphaButtonA = i_alpha; + } + } +} /* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setCrossLRString__17dMenu_Fmap2DTop_cFUl.s" +void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) { + static const u64 juji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'}; + if (param_0 == 0) { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(juji_c[i])); + strcpy(text_box->getStringPtr(), ""); + } + mpTitleScreen->search('juy_sha0')->show(); + mAlphaDpad = 1; + } else { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(juji_c[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } + mpTitleScreen->search('juy_sha0')->show(); + mAlphaDpad = 2; + } } -#pragma pop - -/* ############################################################################################## */ -/* 803965A8-803965D0 022C08 0028+00 1/1 0/0 0/0 .rodata ast_c$6233 */ -SECTION_RODATA static u8 const ast_c_6233[40] = { - 0x00, - 0x00, - 0x66, - 0x73, - 0x74, - 0x5F, - 0x30, - 0x30, - 0x00, - 0x00, - 0x66, - 0x73, - 0x74, - 0x5F, - 0x30, - 0x31, - 0x00, - 0x00, - 0x66, - 0x73, - 0x74, - 0x5F, - 0x30, - 0x32, - 0x00, - 0x00, - 0x66, - 0x73, - 0x74, - 0x5F, - 0x30, - 0x33, - 0x00, - 0x00, - 0x66, - 0x73, - 0x74, - 0x5F, - 0x30, - 0x34, -}; -COMPILER_STRIP_GATE(0x803965A8, &ast_c_6233); /* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/set3DStickString__17dMenu_Fmap2DTop_cFUl.s" +void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) { + static const u64 ast_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'}; + if (param_0 == 0) { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(ast_c[i])); + strcpy(text_box->getStringPtr(), ""); + } + mpTitleScreen->search('as_sha0')->show(); + mAlphaAnalogStick = 1; + } else { + for (int i = 0; i < 5; i++) { + J2DTextBox* text_box = static_cast(mpTitleScreen->search(ast_c[i])); + dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); + } + mpTitleScreen->search('as_sha0')->show(); + mAlphaAnalogStick = 2; + } } -#pragma pop /* 801D7640-801D76C0 1D1F80 0080+00 0/0 5/5 0/0 .text * createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* param_0, STControl* param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl.s" +void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) { + if (!mpScrnExplain) { + JKRHeap* heap = mDoExt_setCurrentHeap(i_heap); + mpScrnExplain = new dMsgScrnExplain_c(i_stick, 0, false, 1); + mDoExt_setCurrentHeap(heap); + } } -#pragma pop /* 801D76C0-801D7714 1D2000 0054+00 1/1 2/2 0/0 .text deleteExplain__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::deleteExplain() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/deleteExplain__17dMenu_Fmap2DTop_cFv.s" +void dMenu_Fmap2DTop_c::deleteExplain() { + if (mpScrnExplain) { + delete mpScrnExplain; + mpScrnExplain = NULL; + } } -#pragma pop /* 801D7714-801D77C4 1D2054 00B0+00 0/0 12/12 0/0 .text * setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 param_0, f32 param_1){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf.s" -} -#pragma pop +void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 i_mask, f32 i_rate) { + if (i_mask & ARROW_LEFT) { + for (int i = 0; i < 2; i++) { + if (mpArrowLAlpha[i]) { + mpArrowLAlpha[i]->setAlphaRate(i_rate); + } + } + } -/* ############################################################################################## */ -/* 8045422C-80454230 00282C 0004+00 2/2 0/0 0/0 .sdata2 @6309 */ -SECTION_SDATA2 static f32 lit_6309 = 5.0f; + if (i_mask & ARROW_RIGHT) { + for (int i = 0; i < 2; i++) { + if (mpArrowRAlpha[i]) { + mpArrowRAlpha[i]->setAlphaRate(i_rate); + } + } + } +} /* 801D77C4-801D7858 1D2104 0094+00 1/1 0/0 0/0 .text * setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* param_0){nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s" +void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane) { + s16 timer = i_pane->getAlphaTimer(); + if (timer > 0 || i_pane->getAlphaRate() != 0.0f) { + timer--; + if (timer < 0) { + timer = 0; + } + i_pane->alphaAnimeStart(timer); + i_pane->setAlphaRate(timer / 5.0f); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454230-80454238 002830 0004+04 1/1 0/0 0/0 .sdata2 @6325 */ -SECTION_SDATA2 static f32 lit_6325[1 + 1 /* padding */] = { - 0.25f, - /* padding */ - 0.0f, -}; /* 801D7858-801D78FC 1D2198 00A4+00 1/1 0/0 0/0 .text * setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s" +void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* i_pane) { + s16 timer = i_pane->getAlphaTimer(); + if (timer != 3 || i_pane->getAlphaRate() != 0.25f) { + if (timer > 3) { + timer--; + } else if (timer < 3) { + timer++; + } + i_pane->alphaAnimeStart(timer); + i_pane->setAlphaRate(timer / 6.0f * 0.5f); + } } -#pragma pop /* 801D78FC-801D7994 1D223C 0098+00 1/1 0/0 0/0 .text * setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha.s" +void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane) { + s16 timer = i_pane->getAlphaTimer(); + if (timer < 5 || i_pane->getAlphaRate() != 1.0f) { + timer++; + if (timer > 5) { + timer = 5; + } + i_pane->alphaAnimeStart(timer); + i_pane->setAlphaRate(timer / 5.0f); + } } -#pragma pop /* 801D7994-801D7A08 1D22D4 0074+00 1/1 3/3 0/0 .text checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::checkPlayerWarpAccept() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv.s" +bool dMenu_Fmap2DTop_c::checkPlayerWarpAccept() { + bool ret; + if (!checkWarpAcceptCannon()) { + ret = false; + } else if (!checkWarpAcceptRegion4()) { + ret = false; + } else { + ret = daPy_getLinkPlayerActorClass()->checkAcceptDungeonWarpAlink(0); + } + return ret; } -#pragma pop /* 801D7A08-801D7AB4 1D2348 00AC+00 1/1 0/0 0/0 .text checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi.s" +bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int i_region) { + if (g_fmapHIO.mAllRegionsUnlocked) { + return true; + } + + if (mpPortalBin) { + dMenu_Fmap_portal_data_c* portal_data = (dMenu_Fmap_portal_data_c*)mpPortalBin; + dMenu_Fmap_portal_data_c::data* portals = portal_data->mData; + for (int i = 0; i < portal_data->mCount; i++) { + if (i_region + 1 == portals[i].mRegionNo + && dComIfGs_isStageSwitch(portals[i].mStageNo, portals[i].mSwitchNo)) + { + return true; + } + } + } + + return false; } -#pragma pop /* 801D7AB4-801D7B58 1D23F4 00A4+00 1/1 3/3 0/0 .text * checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv.s" +bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() { + if (dComIfGp_getNowLevel() == 4 && !checkWarpAcceptRegion(3)) { + return false; + } + + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250])) + { + return false; + } + + return true; } -#pragma pop /* 801D7B58-801D7BCC 1D2498 0074+00 1/1 3/3 0/0 .text checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::checkWarpAcceptCannon() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv.s" +bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[786]) + && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[785])) + { + return false; + } + + return true; } -#pragma pop /* 801D7BCC-801D8088 1D250C 04BC+00 2/2 0/0 0/0 .text setHIO__17dMenu_Fmap2DTop_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::setHIO(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/setHIO__17dMenu_Fmap2DTop_cFb.s" +void dMenu_Fmap2DTop_c::setHIO(bool param_0) { + if (mTitlePosX != g_fmapHIO.mTitlePosX || mTitlePosY != g_fmapHIO.mTitlePosY) { + mTitlePosX = g_fmapHIO.mTitlePosX; + mTitlePosY = g_fmapHIO.mTitlePosY; + mpNamePane->paneTrans(mTitlePosX, mTitlePosY); + } + + if (mTitleScale != g_fmapHIO.mTitleScale) { + mTitleScale = g_fmapHIO.mTitleScale; + mpNamePane->scale(mTitleScale, mTitleScale); + } + + if (mSubTitlePosX != g_fmapHIO.mSubTitlePosX || mSubTitlePosY != g_fmapHIO.mSubTitlePosY) { + mSubTitlePosX = g_fmapHIO.mSubTitlePosX; + mSubTitlePosY = g_fmapHIO.mSubTitlePosY; + mpSubPane->paneTrans(mSubTitlePosX, mSubTitlePosY); + } + + if (mSubTitleScale != g_fmapHIO.mSubTitleScale) { + mSubTitleScale = g_fmapHIO.mSubTitleScale; + mpSubPane->scale(mSubTitleScale, mSubTitleScale); + } + + if (mpAnalogStick) { + if (mAreaMovementPosX != g_fmapHIO.mAreaMovementPosX + || mAreaMovementPosY != g_fmapHIO.mAreaMovementPosY) + { + mAreaMovementPosX = g_fmapHIO.mAreaMovementPosX; + mAreaMovementPosY = g_fmapHIO.mAreaMovementPosY; + mpAnalogStick->paneTrans(mAreaMovementPosX, mAreaMovementPosY); + } + + if (mAreaMovementScale != g_fmapHIO.mAreaMovementScale) { + mAreaMovementScale = g_fmapHIO.mAreaMovementScale; + mpAnalogStick->scale(mAreaMovementScale, mAreaMovementScale); + } + } + + if (mpDpad) { + if (mClosingPosX != g_fmapHIO.mClosingPosX || mClosingPosY != g_fmapHIO.mClosingPosY) { + mClosingPosX = g_fmapHIO.mClosingPosX; + mClosingPosY = g_fmapHIO.mClosingPosY; + mpDpad->paneTrans(mClosingPosX, mClosingPosY); + } + + if (mClosingScale != g_fmapHIO.mClosingScale) { + mClosingScale = g_fmapHIO.mClosingScale; + mpDpad->scale(mClosingScale, mClosingScale); + } + } + + if (mDoIconPosX != g_fmapHIO.mDoIconPosX || mDoIconPosY != g_fmapHIO.mDoIconPosY) { + mDoIconPosX = g_fmapHIO.mDoIconPosX; + mDoIconPosY = g_fmapHIO.mDoIconPosY; + mpContPane->paneTrans(mDoIconPosX, mDoIconPosY); + } + + if (mDoIconScale != g_fmapHIO.mDoIconScale) { + mDoIconScale = g_fmapHIO.mDoIconScale; + mpContPane->scale(mDoIconScale, mDoIconScale); + } + + if (g_fmapHIO.mButtonDebugON || param_0) { + mpButtonZ->paneTrans(g_fmapHIO.mButtonZPosX, g_fmapHIO.mButtonZPosY); + mpButtonZ->scale(g_fmapHIO.mButtonZScale, g_fmapHIO.mButtonZScale); + mpButtonA->paneTrans(g_fmapHIO.mButtonAPosX, g_fmapHIO.mButtonAPosY); + mpButtonA->scale(g_fmapHIO.mButtonAScale, g_fmapHIO.mButtonAScale); + mpButtonB->paneTrans(g_fmapHIO.mButtonBPosX, g_fmapHIO.mButtonBPosY); + mpButtonB->scale(g_fmapHIO.mButtonBScale, g_fmapHIO.mButtonBScale); + mpButtonTextZ->paneTrans(g_fmapHIO.mButtonZTextPosX, g_fmapHIO.mButtonZTextPosY); + mpButtonTextZ->scale(g_fmapHIO.mButtonZTextScale, g_fmapHIO.mButtonZTextScale); + mpButtonTextA->paneTrans(g_fmapHIO.mButtonATextPosX, g_fmapHIO.mButtonATextPosY); + mpButtonTextA->scale(g_fmapHIO.mButtonATextScale, g_fmapHIO.mButtonATextScale); + mpButtonTextB->paneTrans(g_fmapHIO.mButtonBTextPosX, g_fmapHIO.mButtonBTextPosY); + mpButtonTextB->scale(g_fmapHIO.mButtonBTextScale, g_fmapHIO.mButtonBTextScale); + } } -#pragma pop /* 801D8088-801D810C 1D29C8 0084+00 1/1 3/3 0/0 .text isWarpAccept__17dMenu_Fmap2DTop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fmap2DTop_c::isWarpAccept() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/isWarpAccept__17dMenu_Fmap2DTop_cFv.s" +bool dMenu_Fmap2DTop_c::isWarpAccept() { + if ((dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[54]) + && dMeter2Info_getMapStatus() != 9 && dMeter2Info_getMapStatus() != 7 + && dMeter2Info_getMapStatus() != 8) || g_fmapHIO.mPortalWarpON) + { + return true; + } + return false; } -#pragma pop - -/* 801D810C-801D8114 1D2A4C 0008+00 1/0 0/0 0/0 .text @4@__dt__18dMenu_Fmap2DBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_801D810C() { - nofralloc -#include "asm/d/menu/d_menu_fmap2D/func_801D810C.s" -} -#pragma pop - -/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index 82d8bef1b4..943b4ea319 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -4,32 +4,12 @@ // #include "d/menu/d_menu_fmap_map.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_graphic.h" #include "dol2asm.h" -// -// Types: -// - -struct dMenu_Fmap_region_data_c { - /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); -}; - -struct dMenu_Fmap_world_data_c {}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct ResTIMG {}; - -struct dMfm_HIO_prm_res_src_s { - static u8 m_other[1 + 3 /* padding */]; -}; - -struct dMenu_Fmap_room_data_c { - /* 8003D818 */ void isArrival(); -}; - // // Forward References: // @@ -121,10 +101,7 @@ extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16]; extern "C" extern void* __vt__15dRenderingMap_c[23]; extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: @@ -136,26 +113,31 @@ SECTION_SDATA2 static f64 lit_3689 = 4503599627370496.0 /* cast u32 to float */; /* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text twoValueLineInterpolation__FUcUcf */ +#ifdef NONMATCHING +// matches with literals +static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) { + return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1)); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) { +static asm u8 twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) { nofralloc #include "asm/d/menu/d_menu_fmap_map/twoValueLineInterpolation__FUcUcf.s" } #pragma pop +#endif /* 801CE0CC-801CE15C 1C8A0C 0090+00 2/2 0/0 0/0 .text * twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void twoColorLineInterporation(_GXColor const& param_0, _GXColor const& param_1, - f32 param_2, _GXColor& param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor.s" +static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_color2, + f32 i_param, GXColor& o_color) { + o_color.r = twoValueLineInterpolation(i_color1.r, i_color2.r, i_param); + o_color.g = twoValueLineInterpolation(i_color1.g, i_color2.g, i_param); + o_color.b = twoValueLineInterpolation(i_color1.b, i_color2.b, i_param); + o_color.a = twoValueLineInterpolation(i_color1.a, i_color2.a, i_param); } -#pragma pop /* ############################################################################################## */ /* 80454180-80454184 002780 0004+00 3/3 0/0 0/0 .sdata2 @3703 */ @@ -168,6 +150,19 @@ SECTION_SDATA2 static u8 lit_3703[4] = { /* 801CE15C-801CE188 1C8A9C 002C+00 1/1 0/0 0/0 .text init__15renderingFmap_cFPUcUsUsUsUs */ +#ifdef NONMATCHING +// matches with literals +void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 param_3, u16 param_4) { + field_0x4 = param_0; + mTexWidth = i_texWidth; + mTexHeight = i_texHeight; + field_0x20 = param_3; + field_0x22 = param_4; + mPosX = 0.0f; + mPosZ = 0.0f; + mDrawEnable = false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -176,6 +171,7 @@ asm void renderingFmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_ #include "asm/d/menu/d_menu_fmap_map/init__15renderingFmap_cFPUcUsUsUsUs.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454184-80454188 002784 0004+00 3/3 0/0 0/0 .sdata2 @3711 */ @@ -183,6 +179,20 @@ SECTION_SDATA2 static f32 lit_3711 = 1.0f; /* 801CE188-801CE224 1C8AC8 009C+00 1/1 0/0 0/0 .text * entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff */ +#ifdef NONMATCHING +// matches with literals +void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo, + f32 i_posX, f32 i_posY, f32 i_scale) { + mpWorldData = i_worldData; + mStartStageNo = i_startStageNo; + mPosX = i_posX; + mPosZ = i_posY; + mCmPerTexel = i_scale; + field_0x8 = mCmPerTexel * field_0x20 * mDoGph_gInf_c::getScale(); + field_0xc = mCmPerTexel * field_0x22; + dComIfGd_setCopy2D(this); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -192,49 +202,58 @@ asm void renderingFmap_c::entry(dMenu_Fmap_world_data_c* param_0, int param_1, f #include "asm/d/menu/d_menu_fmap_map/entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff.s" } #pragma pop - -/* ############################################################################################## */ -/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80396244 = "\0\0\0"; -#pragma pop +#endif /* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::isSwitchSpecialOff(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/isSwitchSpecialOff__15renderingFmap_cFi.s" +bool renderingFmap_c::isSwitchSpecialOff(int i_swbit) { + return !strcmp(dComIfGp_getStartStageName(), "F_SP121") && i_swbit == 0xb2; } -#pragma pop /* 801CE288-801CE3C0 1C8BC8 0138+00 2/0 0/0 0/0 .text * isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::isSwitch(dDrawPath_c::group_class const* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class.s" +bool renderingFmap_c::isSwitch(dDrawPath_c::group_class const* i_group) { + if (i_group->mSwbit == 0xff) { + return true; + } + + if (i_group->field_0x1 == 0) { + if (isSwitchSpecialOff(i_group->mSwbit)) { + return true; + } + } else { + if (isSwitchSpecialOff(i_group->mSwbit)) { + return false; + } + } + + if (mRegionNo == dComIfGp_getNowLevel() && mStageNo == mStartStageNo) { + if (i_group->field_0x1 == 0) { + return !dComIfGs_isSwitch(i_group->mSwbit, mRoomNo); + } else { + return dComIfGs_isSwitch(i_group->mSwbit, mRoomNo) ? true : false; + } + } else { + if (i_group->mSwbit < 0x80) { + if (i_group->field_0x1 != 0) { + return dComIfGs_isStageSwitch(mSaveTableNo, i_group->mSwbit) ? true : false; + } else { + return !dComIfGs_isStageSwitch(mSaveTableNo, i_group->mSwbit); + } + } else { + return i_group->field_0x1 == 0; + } + } } -#pragma pop /* 801CE3C0-801CE410 1C8D00 0050+00 0/0 3/3 0/0 .text * getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* param_0, f32 param_1, - f32 param_2, int param_3, int* param_4, - int* param_5) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi.s" +int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_regionData, + f32 i_offsetX, f32 i_offsetY, int i_stageNo, + int* o_stageNo, int* o_roomNo) { + return i_regionData->getPointStagePathInnerNo(mPosX + i_offsetX * mCmPerTexel, + mPosZ + i_offsetY * mCmPerTexel, + i_stageNo, o_stageNo, o_roomNo); } -#pragma pop /* ############################################################################################## */ /* 80454188-8045418C 002788 0004+00 1/1 0/0 0/0 .sdata2 @3769 */ @@ -247,6 +266,27 @@ SECTION_SDATA2 static f32 lit_3770 = 5000.0f; SECTION_SDATA2 static f32 lit_3771 = -1.0f; /* 801CE410-801CE4D4 1C8D50 00C4+00 2/0 0/0 0/0 .text preDrawPath__15renderingFmap_cFv */ +#ifdef NONMATCHING +// matches with literals +void renderingFmap_c::preDrawPath() { + mEye.x = mPosX; + mEye.y = mPosZ; + mEye.z = -5000.0f; + mCenter.x = mPosX; + mCenter.y = mPosZ; + mCenter.z = 5000.0f; + mUp.x = 0.0f; + mUp.y = -1.0f; + mUp.z = 0.0f; + mDoMtx_lookAt(mViewMtx, &mEye, &mCenter, &mUp, 0); + + GXLoadPosMtxImm(mViewMtx, GX_PNMTX0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_INDEX16); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0); + GXSetMisc(GX_MT_XF_FLUSH, 8); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -255,6 +295,7 @@ asm void renderingFmap_c::preDrawPath() { #include "asm/d/menu/d_menu_fmap_map/preDrawPath__15renderingFmap_cFv.s" } #pragma pop +#endif /* 801CE4D4-801CE4DC 1C8E14 0008+00 2/0 0/0 0/0 .text isDrawPath__15renderingFmap_cFv */ bool renderingFmap_c::isDrawPath() { @@ -262,297 +303,326 @@ bool renderingFmap_c::isDrawPath() { } /* 801CE4DC-801CE560 1C8E1C 0084+00 2/2 0/0 0/0 .text isDrawRoom__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::isDrawRoom() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s" +bool renderingFmap_c::isDrawRoom() { + return (bool)((mRegionNo == dComIfGp_getNowLevel() && mStageNo == mStartStageNo + && mRoomNo == dComIfGp_roomControl_getStayNo()) + || mpRoomData->isArrival()); } -#pragma pop /* 801CE560-801CE5B8 1C8EA0 0058+00 2/0 0/0 0/0 .text postDrawPath__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::postDrawPath() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/postDrawPath__15renderingFmap_cFv.s" +void renderingFmap_c::postDrawPath() { + GXSetMisc(GX_MT_XF_FLUSH, 0); + mDoMtx_lookAt(mViewMtx, &mEye, &mCenter, &mUp, 0); + GXLoadPosMtxImm(mViewMtx, GX_PNMTX0); } -#pragma pop /* 801CE5B8-801CE5EC 1C8EF8 0034+00 2/0 0/0 0/0 .text postRenderingMap__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::postRenderingMap() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/postRenderingMap__15renderingFmap_cFv.s" +void renderingFmap_c::postRenderingMap() { + dRenderingFDAmap_c::postRenderingMap(); + mDrawEnable = true; } -#pragma pop /* 801CE5EC-801CE6A8 1C8F2C 00BC+00 2/2 0/0 0/0 .text roomSetteing__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::roomSetteing() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/roomSetteing__15renderingFmap_cFv.s" +void renderingFmap_c::roomSetteing() { + mRegionOffsetX = mpRegionData->getRegionOffsetX(); + mRegionOffsetZ = mpRegionData->getRegionOffsetZ(); + mStageOffsetX = mRegionOffsetX + mpStageData->getOffsetX(); + mStageOffsetZ = mRegionOffsetZ + mpStageData->getOffsetZ(); + f32 offset_z = mStageOffsetZ; + + cXyz eye, center; + eye.x = mPosX - mStageOffsetX; + eye.y = mPosZ - offset_z; + eye.z = mEye.z; + center.x = eye.x; + center.y = eye.y; + center.z = mCenter.z; + + Mtx viewMtx; + mDoMtx_lookAt(viewMtx, &eye, ¢er, &mUp, 0); + GXLoadPosMtxImm(viewMtx, GX_PNMTX0); } -#pragma pop /* 801CE6A8-801CE75C 1C8FE8 00B4+00 2/0 0/0 0/0 .text getFirstRoomPointer__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getFirstRoomPointer() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getFirstRoomPointer__15renderingFmap_cFv.s" +dDrawPath_c::room_class* renderingFmap_c::getFirstRoomPointer() { + dDrawPath_c::room_class* room = NULL; + getFirstRegion(); + + if (mpRoomData != NULL) { + if (mpFmapData != NULL) { + room = mpFmapData->getMapPath(); + } + + while (mpRoomData != NULL && (room == NULL || !isDrawRoom())) { + if (mpFmapData != NULL) { + room = getNextRoomPointer(); + } + } + + if (room != NULL) { + roomSetteing(); + } + } + + return room; } -#pragma pop /* 801CE75C-801CE7A8 1C909C 004C+00 1/1 0/0 0/0 .text getFirstRegion__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getFirstRegion() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getFirstRegion__15renderingFmap_cFv.s" +void renderingFmap_c::getFirstRegion() { + mpStageData = NULL; + mpRegionData = mpWorldData->getMenuFmapRegionTop(); + if (mpRegionData != NULL) { + mRegionNo = mpRegionData->getRegionNo(); + mRegionIndex = 0; + getFirstStage(); + } } -#pragma pop /* 801CE7A8-801CE80C 1C90E8 0064+00 2/2 0/0 0/0 .text getFirstStage__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getFirstStage() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getFirstStage__15renderingFmap_cFv.s" +void renderingFmap_c::getFirstStage() { + mpRoomData = NULL; + mpStageData = mpRegionData->getMenuFmapStageDataTop(); + if (mpStageData != NULL) { + mpStageArc = mpStageData->getStageArc(); + mSaveTableNo = mpStageArc->getSaveTableNo(); + mVisitedRoomSaveTableNo = mpStageArc->getVisitedRoomSaveTableNo(); + mStageNo = 0; + getFirstRoom(); + } } -#pragma pop /* 801CE80C-801CE84C 1C914C 0040+00 2/2 0/0 0/0 .text getFirstRoom__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getFirstRoom() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getFirstRoom__15renderingFmap_cFv.s" +void renderingFmap_c::getFirstRoom() { + mpFmapData = NULL; + mpRoomData = mpStageData->getFmapRoomDataTop(); + if (mpRoomData != NULL) { + mRoomIndex = 0; + mRoomNo = mpRoomData->getRoomNo(); + mpFmapData = mpRoomData->getFmapData(); + } } -#pragma pop /* 801CE84C-801CE8B8 1C918C 006C+00 1/1 0/0 0/0 .text getNextRoom__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getNextRoom() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getNextRoom__15renderingFmap_cFv.s" +bool renderingFmap_c::getNextRoom() { + bool ret = false; + mpRoomData = mpRoomData->getNextData(); + if (mpRoomData == NULL) { + ret = getNextStage(); + } else { + mRoomIndex++; + mpFmapData = mpRoomData->getFmapData(); + mRoomNo = mpRoomData->getRoomNo(); + } + return ret; } -#pragma pop /* 801CE8B8-801CE93C 1C91F8 0084+00 1/1 0/0 0/0 .text getNextStage__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getNextStage() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getNextStage__15renderingFmap_cFv.s" +bool renderingFmap_c::getNextStage() { + bool ret = false; + mpStageData = mpStageData->getNextData(); + if (mpStageData == NULL) { + ret = getNextRegion(); + } else { + mStageNo++; + mpStageArc = mpStageData->getStageArc(); + mSaveTableNo = mpStageArc->getSaveTableNo(); + mVisitedRoomSaveTableNo = mpStageArc->getVisitedRoomSaveTableNo(); + getFirstRoom(); + } + return ret; } -#pragma pop /* 801CE93C-801CE9A4 1C927C 0068+00 1/1 0/0 0/0 .text getNextRegion__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getNextRegion() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getNextRegion__15renderingFmap_cFv.s" +bool renderingFmap_c::getNextRegion() { + bool ret = false; + mpRegionData = mpRegionData->getNextData(); + if (mpRegionData == NULL) { + ret = true; + } else { + mRegionIndex++; + mRegionNo = mpRegionData->getRegionNo(); + getFirstStage(); + } + return ret; } -#pragma pop /* 801CE9A4-801CEA38 1C92E4 0094+00 2/0 0/0 0/0 .text getNextRoomPointer__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingFmap_c::getNextRoomPointer() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getNextRoomPointer__15renderingFmap_cFv.s" +dDrawPath_c::room_class* renderingFmap_c::getNextRoomPointer() { + room_class* room; + + do { + room = NULL; + if (getNextRoom()) { + return NULL; + } + if (mpRoomData != NULL) { + room = mpFmapData->getMapPath(); + } + } while (mpRoomData != NULL && (room == NULL || !isDrawRoom())); + + if (room != NULL) { + roomSetteing(); + } + + return room; } -#pragma pop /* 801CEA38-801CEAAC 1C9378 0074+00 1/1 0/0 0/0 .text * setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e param_0, u8 param_1, - u8 param_2, u8 param_3, u8 param_4) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc.s" +void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette, u8 i_r, + u8 i_g, u8 i_b, u8 i_a) { + int color; + if (i_a >= 0xe0) { + color = ((i_r & 0xf8) << 7) | ((i_g & 0xf8) << 2) | (i_b >> 3) | (1 << 15); + } else { + color = ((i_r & 0xf0) << 4) | (i_g & 0xf0) | (i_b >> 4) | ((i_a & 0xe0) << 7); + } + + dMpath_RGB5A3_palDt_s* palette_entry = &m_palette[i_palette]; + palette_entry->field_0x0.color = color; + palette_entry->field_0x2.color = color; + palette_entry->field_0x4.color = color; + palette_entry->field_0x6.color = color; + DCStoreRange(&m_palette[i_palette], 8); } -#pragma pop /* 801CEAAC-801CEAE0 1C93EC 0034+00 2/2 0/0 0/0 .text * setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e param_0, - _GXColor const& param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor.s" +void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette, + GXColor const& i_color) { + setFmapPaletteColor(i_palette, i_color.r, i_color.g, i_color.b, i_color.a); } -#pragma pop /* 801CEAE0-801CEB1C 1C9420 003C+00 1/1 0/0 0/0 .text isFlashRoomNoCheck__15dMenu_FmapMap_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::isFlashRoomNoCheck(int param_0) const { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/isFlashRoomNoCheck__15dMenu_FmapMap_cCFi.s" +bool dMenu_FmapMap_c::isFlashRoomNoCheck(int i_roomNo) const { + bool ret = false; + u8* ptr = mFlashRooms; + for (int i = 0; i < mFlashRoomCount; ptr++, i++) { + if (*ptr == i_roomNo) { + ret = true; + break; + } + } + return ret; } -#pragma pop - -/* ############################################################################################## */ -/* 803961B0-803961D0 022810 0020+00 2/2 0/0 0/0 .rodata palNo$3985 */ -SECTION_RODATA static u8 const palNo[32] = { - 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, -}; -COMPILER_STRIP_GATE(0x803961B0, &palNo); /* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setPointColor(f32 param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setPointColor__15dMenu_FmapMap_cFf.s" +void dMenu_FmapMap_c::setPointColor(f32 i_param) { + static const palette_e palNo[8] = { + PALETTE_11, + PALETTE_12, + PALETTE_13, + PALETTE_14, + PALETTE_15, + PALETTE_16, + PALETTE_17, + PALETTE_18, + }; + + GXColor color; + if (mFlash && mRegionCursor == dComIfGp_getNowLevel() && mStartStageNo == mStageCursor) { + for (int i = 0; i < 8; i++) { + twoColorLineInterporation(m_res->field_0xe8[i], m_res->field_0x108[i], i_param, color); + setFmapPaletteColor(palNo[i], color); + } + } else { + for (int i = 0; i < 8; i++) { + twoColorLineInterporation(m_res->field_0x128[i], m_res->field_0x148[i], i_param, color); + setFmapPaletteColor(palNo[i], color); + } + } } -#pragma pop -/* ############################################################################################## */ -/* 803BD680-803BD6E8 01A7A0 0068+00 2/2 0/0 0/0 .data __vt__15dMenu_FmapMap_c */ -SECTION_DATA extern void* __vt__15dMenu_FmapMap_c[26] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15dMenu_FmapMap_cFv, - (void*)__dt__15dMenu_FmapMap_cFv, - (void*)isDrawType__15dMenu_FmapMap_cFi, - (void*)getColor__15dMenu_FmapMap_cFi, - (void*)getLineColor__15dMenu_FmapMap_cFii, - (void*)getLineWidth__15dMenu_FmapMap_cFi, - (void*)isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__15renderingFmap_cFi, - (void*)getFirstRoomPointer__15renderingFmap_cFv, - (void*)getNextRoomPointer__15renderingFmap_cFv, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__15renderingFmap_cFv, - (void*)afterDrawPath__15renderingFmap_cFv, - (void*)preDrawPath__15renderingFmap_cFv, - (void*)postDrawPath__15renderingFmap_cFv, - (void*)isDrawPath__15renderingFmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__15renderingFmap_cFv, - (void*)getBackColor__15dMenu_FmapMap_cCFv, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, -}; - -/* 803BD6E8-803BD750 01A808 0068+00 3/3 0/0 0/0 .data __vt__15renderingFmap_c */ -SECTION_DATA extern void* __vt__15renderingFmap_c[26] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, - (void*)__dt__15renderingFmap_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__15renderingFmap_cFi, - (void*)getFirstRoomPointer__15renderingFmap_cFv, - (void*)getNextRoomPointer__15renderingFmap_cFv, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__15renderingFmap_cFv, - (void*)afterDrawPath__15renderingFmap_cFv, - (void*)preDrawPath__15renderingFmap_cFv, - (void*)postDrawPath__15renderingFmap_cFv, - (void*)isDrawPath__15renderingFmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__15renderingFmap_cFv, - (void*)NULL, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, -}; +extern void* __vt__15dMenu_FmapMap_c[26]; +extern void* __vt__15renderingFmap_c[26]; /* 801CEC24-801CED38 1C9564 0114+00 0/0 1/1 0/0 .text __ct__15dMenu_FmapMap_cFv */ +#ifdef NONMATCHING +// matches with literals and weak function ordering +dMenu_FmapMap_c::dMenu_FmapMap_c() { + mResTIMG = NULL; + mMapImage_p = NULL; + m_res = NULL; + m_palette = NULL; + field_0xcc = 0; + mZoomRate = 0.0f; + mLineNo = 0; + mFlash = false; + mLastFlash = false; + mStageCursor = 0; + mLastStageCursor = 0; + mRegionCursor = 0; + mFlashTimer = 0; + mFlashRooms = NULL; + mFlashRoomCount = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_FmapMap_c::dMenu_FmapMap_c() { +// asm dMenu_FmapMap_c::dMenu_FmapMap_c() { +extern "C" asm void __ct__15dMenu_FmapMap_cFv() { nofralloc #include "asm/d/menu/d_menu_fmap_map/__ct__15dMenu_FmapMap_cFv.s" } #pragma pop +#endif /* 801CED38-801CEDE8 1C9678 00B0+00 1/0 0/0 0/0 .text __dt__15dMenu_FmapMap_cFv */ +#ifdef NONMATCHING +// matches once ~renderingFmap_c() is inlined +dMenu_FmapMap_c::~dMenu_FmapMap_c() { + _delete(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dMenu_FmapMap_c::~dMenu_FmapMap_c() { +// asm dMenu_FmapMap_c::~dMenu_FmapMap_c() { +extern "C" asm void __dt__15dMenu_FmapMap_cFv() { nofralloc #include "asm/d/menu/d_menu_fmap_map/__dt__15dMenu_FmapMap_cFv.s" } #pragma pop +#endif /* 801CEDE8-801CEE3C 1C9728 0054+00 0/0 1/1 0/0 .text _create__15dMenu_FmapMap_cFUsUsUsUsPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3, - void* param_4) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/_create__15dMenu_FmapMap_cFUsUsUsUsPv.s" +void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16 param_3, void* i_res) { + m_res = (dMfm_prm_res_s*)i_res; + m_palette = m_res->palette_data; + field_0xcc = 0x6c; + mFlash = false; + mStageCursor = 0; + mLastStageCursor = -1; + mLastFlash = mFlash; + mFlashTimer = 0; + setTexture(i_texWidth, i_texHeight, param_2, param_3); } -#pragma pop /* 801CEE3C-801CEE94 1C977C 0058+00 1/1 1/1 0/0 .text _delete__15dMenu_FmapMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::_delete() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/_delete__15dMenu_FmapMap_cFv.s" +void dMenu_FmapMap_c::_delete() { + if (mResTIMG != NULL) { + delete mResTIMG; + mResTIMG = NULL; + } + if (mMapImage_p != NULL) { + delete[] mMapImage_p; + mMapImage_p = NULL; + } } -#pragma pop /* ############################################################################################## */ /* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2 m_other__22dMfm_HIO_prm_res_src_s */ -SECTION_SDATA2 u8 dMfm_HIO_prm_res_src_s::m_other[1 + 3 /* padding */] = { - 0x1E, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30}; /* 80454198-8045419C 002798 0004+00 1/1 0/0 0/0 .sdata2 @4104 */ SECTION_SDATA2 static f32 lit_4104 = 0.5f; @@ -571,6 +641,33 @@ SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */; /* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text draw__15dMenu_FmapMap_cFv */ +#ifdef NONMATCHING +//? regalloc and instructions out of order +void dMenu_FmapMap_c::draw() { + f32 fVar3; + int iVar2 = mFlashTimer; + int iVar1 = dMfm_HIO_prm_res_src_s::m_other.mFlashDuration / 2; + if (iVar2 < iVar1) { + fVar3 = (f32)(iVar1 - iVar2) / (f32)iVar1; + } else { + fVar3 = (f32)(iVar2 - iVar1) / (f32)iVar1; + } + setPointColor(1.0f - fVar3); + + GXColor color; + f32 fVar4 = getRateWithFrameCount(m_res->field_0x168); + f32 fVar5 = cM_ssin(fVar4 * 0x10000 - 0x8000) * 0.5f + 0.5f; + twoColorLineInterporation(m_res->field_0xd8, m_res->field_0xdc, fVar5, color); + setFmapPaletteColor(PALETTE_19, color); + + f32 fVar6 = getRateWithFrameCount(m_res->field_0x16a); + f32 fVar7 = cM_ssin(fVar6 * 0x10000 - 0x8000) * 0.5f + 0.5f; + twoColorLineInterporation(m_res->field_0xe0, m_res->field_0xe4, fVar7, color); + setFmapPaletteColor(PALETTE_1A, color); + + renderingMap(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -579,17 +676,19 @@ asm void dMenu_FmapMap_c::draw() { #include "asm/d/menu/d_menu_fmap_map/draw__15dMenu_FmapMap_cFv.s" } #pragma pop +#endif /* 801CF0B4-801CF12C 1C99F4 0078+00 1/0 0/0 0/0 .text * rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class.s" +void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) { + if (i_line->field_0x1 == 4) { + for (mLineNo = 0; mLineNo < 2; mLineNo++) { + renderingDecoration(i_line); + } + } else { + dDrawPath_c::rendering(i_line); + } } -#pragma pop /* ############################################################################################## */ /* 804541B0-804541B8 0027B0 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatData$4134 */ @@ -623,171 +722,174 @@ SECTION_SDATA2 static f32 lit_4152 = 1.5f; /* 801CF12C-801CF1D4 1C9A6C 00A8+00 1/0 0/0 0/0 .text getLineWidth__15dMenu_FmapMap_cFi */ +#ifdef NONMATCHING +// matches with literals +int dMenu_FmapMap_c::getLineWidth(int param_0) { + static u8 const l_lineWidthPatData[5] = {0, 6, 12, 0, 0}; + static u8 const l_lineWidthPatData2[5] = {0, 0, 6, 0, 0}; + + int iVar2 = 0; + if (param_0 == 4) { + switch (mLineNo) { + case 0: + case 1: + iVar2 = m_res->field_0x16d; + } + + if (mZoomRate > 1.0f) { + return (int)((f32)iVar2 * (mZoomRate - 1.0f)); + } else { + return 0; + } + } else if (mZoomRate > 1.5f) { + return l_lineWidthPatData[param_0]; + } else { + return l_lineWidthPatData2[param_0]; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_FmapMap_c::getLineWidth(int param_0) { +asm int dMenu_FmapMap_c::getLineWidth(int param_0) { nofralloc #include "asm/d/menu/d_menu_fmap_map/getLineWidth__15dMenu_FmapMap_cFi.s" } #pragma pop +#endif /* 801CF1D4-801CF1E0 1C9B14 000C+00 1/0 0/0 0/0 .text isDrawType__15dMenu_FmapMap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::isDrawType(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/isDrawType__15dMenu_FmapMap_cFi.s" + bool dMenu_FmapMap_c::isDrawType(int param_0) { + return (param_0 >> 6) & 1 ? false : true; } -#pragma pop /* 801CF1E0-801CF208 1C9B20 0028+00 0/0 1/1 0/0 .text setFlashOn__15dMenu_FmapMap_cFiiPUci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setFlashOn(int param_0, int param_1, u8* param_2, int param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setFlashOn__15dMenu_FmapMap_cFiiPUci.s" +void dMenu_FmapMap_c::setFlashOn(int i_regionNo, int i_stageNo, u8* i_rooms, int i_roomCount) { + mLastFlash = mFlash; + mFlash = true; + mRegionCursor = i_regionNo; + mStageCursor = (u8)i_stageNo; + mFlashRooms = i_rooms; + mFlashRoomCount = i_roomCount; } -#pragma pop - -/* ############################################################################################## */ -/* 80450728-80450730 0001A8 0004+04 1/1 0/0 0/0 .sdata black$4166 */ -SECTION_SDATA static u8 black[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 804541C4-804541C8 0027C4 0004+00 1/1 0/0 0/0 .sdata2 borderColor0$4169 */ -SECTION_SDATA2 static u8 borderColor0[4] = { - 0x64, - 0x00, - 0x00, - 0x00, -}; - -/* 804541C8-804541CC 0027C8 0004+00 1/1 0/0 0/0 .sdata2 borderColor1$4170 */ -SECTION_SDATA2 static u8 borderColor1[4] = { - 0x68, - 0x00, - 0x00, - 0x00, -}; /* 801CF208-801CF298 1C9B48 0090+00 1/0 0/0 0/0 .text getLineColor__15dMenu_FmapMap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::getLineColor(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getLineColor__15dMenu_FmapMap_cFii.s" -} -#pragma pop +const GXColor* dMenu_FmapMap_c::getLineColor(int param_0, int param_1) { + static GXColor black = {0, 0, 0, 0}; + static const GXColor borderColor0 = {0x64, 0, 0, 0}; + static const GXColor borderColor1 = {0x68, 0, 0, 0}; -/* ############################################################################################## */ -/* 804541CC-804541D0 0027CC 0004+00 1/1 0/0 0/0 .sdata2 l_mapBaseColor$4181 */ -SECTION_SDATA2 static u8 l_mapBaseColor[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; + GXColor* color = &black; + if (param_1 == 4) { + switch (mLineNo) { + case 0: + return &borderColor0; + case 1: + return &borderColor1; + } + } else { + *color = *getColor(param_0); + } + + return color; +} /* 801CF298-801CF2A0 1C9BD8 0008+00 1/0 0/0 0/0 .text getBackColor__15dMenu_FmapMap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::getBackColor() const { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getBackColor__15dMenu_FmapMap_cCFv.s" +const GXColor* dMenu_FmapMap_c::getBackColor() const { + static const GXColor l_mapBaseColor = {0, 0, 0, 0}; + return &l_mapBaseColor; } -#pragma pop - -/* ############################################################################################## */ -/* 803961D0-803961F4 022830 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$4186 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_onColor[36] = { - 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803961D0, &l_dungeon_onColor); -#pragma pop - -/* 803961F4-80396218 022854 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$4187 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_stayColor[36] = { - 0x24, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, - 0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803961F4, &l_dungeon_stayColor); -#pragma pop - -/* 80396218-8039623C 022878 0024+00 0/1 0/0 0/0 .rodata l_dungeon_pointColor$4188 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_pointColor[36] = { - 0x44, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, - 0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80396218, &l_dungeon_pointColor); -#pragma pop /* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::getColor(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/getColor__15dMenu_FmapMap_cFi.s" +const GXColor* dMenu_FmapMap_c::getColor(int param_0) { + static const GXColor l_dungeon_onColor[9] = { + {0x04, 0, 0, 0}, + {0x08, 0, 0, 0}, + {0x0C, 0, 0, 0}, + {0x00, 0, 0, 0}, + {0x10, 0, 0, 0}, + {0x14, 0, 0, 0}, + {0x18, 0, 0, 0}, + {0x1C, 0, 0, 0}, + {0x20, 0, 0, 0}, + }; + static const GXColor l_dungeon_stayColor[9] = { + {0x24, 0, 0, 0}, + {0x28, 0, 0, 0}, + {0x2C, 0, 0, 0}, + {0x00, 0, 0, 0}, + {0x30, 0, 0, 0}, + {0x34, 0, 0, 0}, + {0x38, 0, 0, 0}, + {0x3C, 0, 0, 0}, + {0x40, 0, 0, 0}, + }; + static const GXColor l_dungeon_pointColor[9] = { + {0x44, 0, 0, 0}, + {0x48, 0, 0, 0}, + {0x4C, 0, 0, 0}, + {0x00, 0, 0, 0}, + {0x50, 0, 0, 0}, + {0x54, 0, 0, 0}, + {0x58, 0, 0, 0}, + {0x5C, 0, 0, 0}, + {0x60, 0, 0, 0}, + }; + + const GXColor* list = l_dungeon_onColor; + if (mFlash && mRegionCursor == getNowDrawRegionNo() && mStageNo == mStageCursor) { + if (mFlashRooms == NULL) { + list = l_dungeon_pointColor; + } else if (isFlashRoomNoCheck(mRoomNo)) { + list = l_dungeon_pointColor; + } else if (getNowDrawRegionNo() == dComIfGp_getNowLevel() && mStageNo == mStartStageNo) { + list = l_dungeon_stayColor; + } + } else { + if (getNowDrawRegionNo() == dComIfGp_getNowLevel() && mStageNo == mStartStageNo) { + list = l_dungeon_stayColor; + } + } + + return &list[param_0]; } -#pragma pop /* 801CF394-801CF450 1C9CD4 00BC+00 1/1 0/0 0/0 .text setTexture__15dMenu_FmapMap_cFUsUsUsUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setTexture(u16 param_0, u16 param_1, u16 param_2, u16 param_3) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setTexture__15dMenu_FmapMap_cFUsUsUsUs.s" +void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 param_3) { + mMapImage_p = NULL; + mResTIMG = NULL; + int size = GXGetTexBufferSize(i_width, i_height, GX_TF_CI14, 0, 0); + mMapImage_p = new (0x20) u8[size]; + init(mMapImage_p, i_width, i_height, param_2, param_3); + mResTIMG = new (0x20) ResTIMG(); + makeResTIMG(mResTIMG, i_width, i_height, mMapImage_p, (u8*)m_palette, 0x1b); } -#pragma pop /* 801CF450-801CF4D0 1C9D90 0080+00 0/0 1/1 0/0 .text * setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_FmapMap_c::setRendering(dMenu_Fmap_world_data_c* param_0, int param_1, f32 param_2, - f32 param_3, f32 param_4, f32 param_5) { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff.s" +void dMenu_FmapMap_c::setRendering(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo, + f32 i_posX, f32 i_posY, f32 i_scale, f32 i_zoomRate) { + mZoomRate = i_zoomRate; + if (mFlash != mLastFlash || mStageCursor != mLastStageCursor) { + mFlashTimer = dMfm_HIO_prm_res_src_s::m_other.mFlashDuration; + mLastFlash = mFlash; + mLastStageCursor = mStageCursor; + } else { + if (mFlashTimer != 0) { + mFlashTimer--; + } else { + mFlashTimer = dMfm_HIO_prm_res_src_s::m_other.mFlashDuration; + } + } + entry(i_worldData, i_startStageNo, i_posX, i_posY, i_scale); } -#pragma pop /* 801CF4D0-801CF55C 1C9E10 008C+00 1/0 0/0 0/0 .text __dt__15renderingFmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingFmap_c::~renderingFmap_c() { - nofralloc -#include "asm/d/menu/d_menu_fmap_map/__dt__15renderingFmap_cFv.s" +renderingFmap_c::~renderingFmap_c() { + /* empty function */ } -#pragma pop /* 801CF55C-801CF564 1C9E9C 0008+00 2/0 0/0 0/0 .text isRenderingFloor__15renderingFmap_cFi */ bool renderingFmap_c::isRenderingFloor(int param_0) { @@ -806,4 +908,33 @@ void renderingFmap_c::afterDrawPath() { /* empty function */ } -/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 803BD680-803BD6E8 01A7A0 0068+00 2/2 0/0 0/0 .data __vt__15dMenu_FmapMap_c */ +SECTION_DATA extern void* __vt__15dMenu_FmapMap_c[26] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)draw__15dMenu_FmapMap_cFv, + (void*)__dt__15dMenu_FmapMap_cFv, + (void*)isDrawType__15dMenu_FmapMap_cFi, + (void*)getColor__15dMenu_FmapMap_cFi, + (void*)getLineColor__15dMenu_FmapMap_cFii, + (void*)getLineWidth__15dMenu_FmapMap_cFi, + (void*)isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class, + (void*)isRenderingFloor__15renderingFmap_cFi, + (void*)getFirstRoomPointer__15renderingFmap_cFv, + (void*)getNextRoomPointer__15renderingFmap_cFv, + (void*)drawPath__11dDrawPath_cFv, + (void*)rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class, + (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, + (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, + (void*)beforeDrawPath__15renderingFmap_cFv, + (void*)afterDrawPath__15renderingFmap_cFv, + (void*)preDrawPath__15renderingFmap_cFv, + (void*)postDrawPath__15renderingFmap_cFv, + (void*)isDrawPath__15renderingFmap_cFv, + (void*)preRenderingMap__18dRenderingFDAmap_cFv, + (void*)postRenderingMap__15renderingFmap_cFv, + (void*)getBackColor__15dMenu_FmapMap_cCFv, + (void*)getDecoLineColor__18dRenderingFDAmap_cFii, + (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, +}; diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 09891e4697..b02f20472e 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -654,7 +654,7 @@ bool dMenu_Ring_c::isMoveEnd() { if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN) { if (dMw_UP_TRIGGER() || dMw_DOWN_TRIGGER() || dMw_B_TRIGGER() || dMeter2Info_getWarpStatus() == 2 || dMeter2Info_getWarpStatus() == 1 || - dMeter2Info_isTouchKeyCheck(0x4000) != 0) + dMeter2Info_isTouchKeyCheck(0xe)) { if (dMw_UP_TRIGGER()) { mRingOrigin = 0; @@ -1354,7 +1354,7 @@ void dMenu_Ring_c::stick_wait_proc() { } else { setDoStatus(0); } - if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000) && openExplain(item)) { + if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xe) && openExplain(item)) { dMeter2Info_setItemExplainWindowStatus(1); field_0x6c4 = mCurrentSlot; setStatus(STATUS_EXPLAIN); @@ -1362,7 +1362,7 @@ void dMenu_Ring_c::stick_wait_proc() { setDoStatus(0); return; } - if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000)) { + if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xe)) { Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } if (mWaitFrames > 0) { diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 4422eb080c..67bee680ca 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -2125,8 +2125,8 @@ void dMw_c::dMw_fmap_create() { tmp = 3; } - mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150, - field_0x13c, field_0x140, tmp); + mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, mFmapProcess, mFmapRegionCursor, + mFmapStageCursor, mFmapStageTransX, mFmapStageTransZ, tmp); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); @@ -2143,11 +2143,11 @@ bool dMw_c::dMw_fmap_delete(bool param_0) { return false; } - field_0x14E = mpMenuFmap->getProcess(); - field_0x14F = mpMenuFmap->getRegionCursor(); - field_0x150 = mpMenuFmap->getStageCursor(); - field_0x13c = mpMenuFmap->getStageTransX(); - field_0x140 = mpMenuFmap->getStageTransZ(); + mFmapProcess = mpMenuFmap->getProcess(); + mFmapRegionCursor = mpMenuFmap->getRegionCursor(); + mFmapStageCursor = mpMenuFmap->getStageCursor(); + mFmapStageTransX = mpMenuFmap->getStageTransX(); + mFmapStageTransZ = mpMenuFmap->getStageTransZ(); mpMenuFmap->_delete(); delete mpMenuFmap; @@ -2521,14 +2521,14 @@ int dMw_c::_create() { field_0x148 = 0; field_0x14C = 0; field_0x14D = 0; - field_0x14E = 0; - field_0x14F = 0; - field_0x150 = 0; + mFmapProcess = 0; + mFmapRegionCursor = 0; + mFmapStageCursor = 0; field_0x151 = 0; field_0x152 = 0; f32 tmp = FLOAT_LABEL(lit_4152); - field_0x13c = tmp; - field_0x140 = tmp; + mFmapStageTransX = tmp; + mFmapStageTransZ = tmp; field_0x153 = 0; onPauseWindow(); field_0x149 = 0; diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index 31a0a4190e..813f2f0e86 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -5,7 +5,7 @@ #include "d/meter/d_meter_HIO.h" #include "d/save/d_save.h" -#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "m_Do/m_Do_ext.h" @@ -1333,7 +1333,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { dMeter_fmapHIO_c::dMeter_fmapHIO_c() { field_0xc = NULL; field_0x10 = NULL; - field_0x8 = NULL; + mpArchive = NULL; mDisplayFrameNum = 8; mUndisplayFrameNum = 6; @@ -1389,7 +1389,7 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mBackgroundAlpha = 1.0f; mBackgroundFrontAlpha = 0.7f; - field_0x2f9 = 0; + field_0x2f9 = false; mTerminalOutput = false; mPortalDataTerminalOutput = false; mRegionBitTerminalOutput = false; @@ -1520,10 +1520,10 @@ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() { field_0x10 = NULL; } - if (field_0x8 != NULL) { - field_0x8->unmount(); - delete field_0x8; - field_0x8 = NULL; + if (mpArchive != NULL) { + mpArchive->unmount(); + delete mpArchive; + mpArchive = NULL; } }