diff options
80 files changed, 1323 insertions, 4458 deletions
diff --git a/Progress.md b/Progress.md index f13c80b79c..5c952561cf 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 | 46.432575% | 1669968 | 3596544 +.text | 46.811606% | 1683600 | 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 | 52.078459% | 2093904 | 4020672 +Total | 52.417506% | 2107536 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 52.078459% | 2093904 | 4020672 +main.dol | 52.417506% | 2107536 | 4020672 RELs | 36.060758% | 4147104 | 11500324 -Total | 40.210100% | 6241008 | 15520996 +Total | 40.297929% | 6254640 | 15520996 ## RELs diff --git a/asm/d/map/d_map/__ct__15renderingAmap_cFv.s b/asm/d/map/d_map/__ct__15renderingAmap_cFv.s deleted file mode 100644 index 812a0720af..0000000000 --- a/asm/d/map/d_map/__ct__15renderingAmap_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8002AE6C: -/* 8002AE6C 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 8002AE70 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 8002AE74 90 03 00 00 */ stw r0, 0(r3) -/* 8002AE78 3C 80 80 3A */ lis r4, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AE7C 38 04 7C F8 */ addi r0, r4, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AE80 90 03 00 00 */ stw r0, 0(r3) -/* 8002AE84 3C 80 80 3A */ lis r4, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002AE88 38 04 6F 94 */ addi r0, r4, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002AE8C 90 03 00 00 */ stw r0, 0(r3) -/* 8002AE90 3C 80 80 3A */ lis r4, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002AE94 38 04 6F D4 */ addi r0, r4, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002AE98 90 03 00 00 */ stw r0, 0(r3) -/* 8002AE9C 3C 80 80 3A */ lis r4, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002AEA0 38 04 7C 90 */ addi r0, r4, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002AEA4 90 03 00 00 */ stw r0, 0(r3) -/* 8002AEA8 38 A0 00 00 */ li r5, 0 -/* 8002AEAC 90 A3 00 04 */ stw r5, 4(r3) -/* 8002AEB0 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 8002AEB4 D0 03 00 08 */ stfs f0, 8(r3) -/* 8002AEB8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8002AEBC D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8002AEC0 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8002AEC4 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8002AEC8 B0 A3 00 1C */ sth r5, 0x1c(r3) -/* 8002AECC B0 A3 00 1E */ sth r5, 0x1e(r3) -/* 8002AED0 B0 A3 00 20 */ sth r5, 0x20(r3) -/* 8002AED4 B0 A3 00 22 */ sth r5, 0x22(r3) -/* 8002AED8 3C 80 80 3A */ lis r4, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002AEDC 38 04 7E E0 */ addi r0, r4, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002AEE0 90 03 00 00 */ stw r0, 0(r3) -/* 8002AEE4 90 A3 00 24 */ stw r5, 0x24(r3) -/* 8002AEE8 90 A3 00 28 */ stw r5, 0x28(r3) -/* 8002AEEC 90 A3 00 2C */ stw r5, 0x2c(r3) -/* 8002AEF0 98 A3 00 30 */ stb r5, 0x30(r3) -/* 8002AEF4 98 A3 00 31 */ stb r5, 0x31(r3) -/* 8002AEF8 3C 80 80 3A */ lis r4, __vt__19renderingPlusDoor_c@ha /* 0x803A7D80@ha */ -/* 8002AEFC 38 04 7D 80 */ addi r0, r4, __vt__19renderingPlusDoor_c@l /* 0x803A7D80@l */ -/* 8002AF00 90 03 00 00 */ stw r0, 0(r3) -/* 8002AF04 3C 80 80 3A */ lis r4, __vt__28renderingPlusDoorAndCursor_c@ha /* 0x803A7E24@ha */ -/* 8002AF08 38 04 7E 24 */ addi r0, r4, __vt__28renderingPlusDoorAndCursor_c@l /* 0x803A7E24@l */ -/* 8002AF0C 90 03 00 00 */ stw r0, 0(r3) -/* 8002AF10 3C 80 80 3A */ lis r4, __vt__15renderingAmap_c@ha /* 0x803A70F4@ha */ -/* 8002AF14 38 04 70 F4 */ addi r0, r4, __vt__15renderingAmap_c@l /* 0x803A70F4@l */ -/* 8002AF18 90 03 00 00 */ stw r0, 0(r3) -/* 8002AF1C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__ct__6dMap_cFiiii.s b/asm/d/map/d_map/__ct__6dMap_cFiiii.s deleted file mode 100644 index 69fb3668ff..0000000000 --- a/asm/d/map/d_map/__ct__6dMap_cFiiii.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_80029874: -/* 80029874 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80029878 7C 08 02 A6 */ mflr r0 -/* 8002987C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80029880 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029884 48 33 89 51 */ bl _savegpr_27 -/* 80029888 7C 7F 1B 78 */ mr r31, r3 -/* 8002988C 7C 9B 23 78 */ mr r27, r4 -/* 80029890 7C BC 2B 78 */ mr r28, r5 -/* 80029894 7C DD 33 78 */ mr r29, r6 -/* 80029898 7C FE 3B 78 */ mr r30, r7 -/* 8002989C 48 00 15 D1 */ bl __ct__15renderingAmap_cFv -/* 800298A0 3C 60 80 3A */ lis r3, __vt__6dMap_c@ha /* 0x803A7030@ha */ -/* 800298A4 38 03 70 30 */ addi r0, r3, __vt__6dMap_c@l /* 0x803A7030@l */ -/* 800298A8 90 1F 00 00 */ stw r0, 0(r31) -/* 800298AC 38 60 00 00 */ li r3, 0 -/* 800298B0 90 7F 00 40 */ stw r3, 0x40(r31) -/* 800298B4 90 7F 00 44 */ stw r3, 0x44(r31) -/* 800298B8 90 7F 00 48 */ stw r3, 0x48(r31) -/* 800298BC 90 7F 00 4C */ stw r3, 0x4c(r31) -/* 800298C0 C0 22 82 E4 */ lfs f1, lit_4321(r2) -/* 800298C4 D0 3F 00 50 */ stfs f1, 0x50(r31) -/* 800298C8 D0 3F 00 54 */ stfs f1, 0x54(r31) -/* 800298CC C0 02 82 E0 */ lfs f0, lit_4284(r2) -/* 800298D0 D0 1F 00 58 */ stfs f0, 0x58(r31) -/* 800298D4 D0 3F 00 5C */ stfs f1, 0x5c(r31) -/* 800298D8 D0 3F 00 60 */ stfs f1, 0x60(r31) -/* 800298DC D0 3F 00 64 */ stfs f1, 0x64(r31) -/* 800298E0 D0 3F 00 68 */ stfs f1, 0x68(r31) -/* 800298E4 D0 3F 00 6C */ stfs f1, 0x6c(r31) -/* 800298E8 D0 3F 00 70 */ stfs f1, 0x70(r31) -/* 800298EC 90 7F 00 74 */ stw r3, 0x74(r31) -/* 800298F0 B0 7F 00 78 */ sth r3, 0x78(r31) -/* 800298F4 B0 7F 00 7A */ sth r3, 0x7a(r31) -/* 800298F8 38 00 FF FF */ li r0, -1 -/* 800298FC 90 1F 00 7C */ stw r0, 0x7c(r31) -/* 80029900 90 1F 00 80 */ stw r0, 0x80(r31) -/* 80029904 90 1F 00 84 */ stw r0, 0x84(r31) -/* 80029908 90 1F 00 88 */ stw r0, 0x88(r31) -/* 8002990C 98 7F 00 8C */ stb r3, 0x8c(r31) -/* 80029910 98 7F 00 8D */ stb r3, 0x8d(r31) -/* 80029914 98 7F 00 8E */ stb r3, 0x8e(r31) -/* 80029918 98 7F 00 8F */ stb r3, 0x8f(r31) -/* 8002991C 98 7F 00 90 */ stb r3, 0x90(r31) -/* 80029920 38 60 01 BC */ li r3, 0x1bc -/* 80029924 38 80 00 20 */ li r4, 0x20 -/* 80029928 48 2A 53 4D */ bl __nw__FUli -/* 8002992C 90 7F 00 44 */ stw r3, 0x44(r31) -/* 80029930 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 80029934 90 0D 88 00 */ stw r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80029938 3C 60 80 38 */ lis r3, d_map_d_map__stringBase0@ha /* 0x80378F24@ha */ -/* 8002993C 38 63 8F 24 */ addi r3, r3, d_map_d_map__stringBase0@l /* 0x80378F24@l */ -/* 80029940 38 80 00 45 */ li r4, 0x45 -/* 80029944 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029948 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002994C 3C A5 00 02 */ addis r5, r5, 2 -/* 80029950 38 C0 00 80 */ li r6, 0x80 -/* 80029954 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80029958 48 01 29 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8002995C 90 7F 00 40 */ stw r3, 0x40(r31) -/* 80029960 7F E3 FB 78 */ mr r3, r31 -/* 80029964 4B FF FE B5 */ bl resCopy__6dMap_cFv -/* 80029968 B3 7F 00 78 */ sth r27, 0x78(r31) -/* 8002996C B3 9F 00 7A */ sth r28, 0x7a(r31) -/* 80029970 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80029974 A8 03 01 AE */ lha r0, 0x1ae(r3) -/* 80029978 2C 00 00 00 */ cmpwi r0, 0 -/* 8002997C 40 81 00 14 */ ble lbl_80029990 -/* 80029980 A8 63 01 B0 */ lha r3, 0x1b0(r3) -/* 80029984 38 00 00 06 */ li r0, 6 -/* 80029988 7C 03 03 D6 */ divw r0, r3, r0 -/* 8002998C 90 1F 00 74 */ stw r0, 0x74(r31) -lbl_80029990: -/* 80029990 57 A3 04 3E */ clrlwi r3, r29, 0x10 -/* 80029994 57 C4 04 3E */ clrlwi r4, r30, 0x10 -/* 80029998 38 A0 00 09 */ li r5, 9 -/* 8002999C 38 C0 00 00 */ li r6, 0 -/* 800299A0 38 E0 00 00 */ li r7, 0 -/* 800299A4 48 33 42 79 */ bl GXGetTexBufferSize -/* 800299A8 38 80 00 20 */ li r4, 0x20 -/* 800299AC 48 2A 53 41 */ bl __nwa__FUli -/* 800299B0 90 7F 00 4C */ stw r3, 0x4c(r31) -/* 800299B4 A0 DF 00 7A */ lhz r6, 0x7a(r31) -/* 800299B8 A0 BF 00 78 */ lhz r5, 0x78(r31) -/* 800299BC 7F E3 FB 78 */ mr r3, r31 -/* 800299C0 80 9F 00 4C */ lwz r4, 0x4c(r31) -/* 800299C4 7C A7 2B 78 */ mr r7, r5 -/* 800299C8 7C C8 33 78 */ mr r8, r6 -/* 800299CC 48 01 62 FD */ bl init__16renderingDAmap_cFPUcUsUsUsUs -/* 800299D0 38 60 00 20 */ li r3, 0x20 -/* 800299D4 38 80 00 20 */ li r4, 0x20 -/* 800299D8 48 2A 52 9D */ bl __nw__FUli -/* 800299DC 90 7F 00 48 */ stw r3, 0x48(r31) -/* 800299E0 7F E3 FB 78 */ mr r3, r31 -/* 800299E4 80 9F 00 48 */ lwz r4, 0x48(r31) -/* 800299E8 A0 BF 00 78 */ lhz r5, 0x78(r31) -/* 800299EC A0 DF 00 7A */ lhz r6, 0x7a(r31) -/* 800299F0 80 FF 00 4C */ lwz r7, 0x4c(r31) -/* 800299F4 81 1F 00 44 */ lwz r8, 0x44(r31) -/* 800299F8 39 20 00 33 */ li r9, 0x33 -/* 800299FC 48 01 33 3D */ bl makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs -/* 80029A00 7F E3 FB 78 */ mr r3, r31 -/* 80029A04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029A08 48 33 88 19 */ bl _restgpr_27 -/* 80029A0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80029A10 7C 08 03 A6 */ mtlr r0 -/* 80029A14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029A18 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__11dDrawPath_cFv.s b/asm/d/map/d_map/__dt__11dDrawPath_cFv.s deleted file mode 100644 index ef643e8315..0000000000 --- a/asm/d/map/d_map/__dt__11dDrawPath_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8002AD3C: -/* 8002AD3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002AD40 7C 08 02 A6 */ mflr r0 -/* 8002AD44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AD48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002AD4C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002AD50 41 82 00 1C */ beq lbl_8002AD6C -/* 8002AD54 3C A0 80 3A */ lis r5, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AD58 38 05 7C F8 */ addi r0, r5, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AD5C 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AD60 7C 80 07 35 */ extsh. r0, r4 -/* 8002AD64 40 81 00 08 */ ble lbl_8002AD6C -/* 8002AD68 48 2A 3F D5 */ bl __dl__FPv -lbl_8002AD6C: -/* 8002AD6C 7F E3 FB 78 */ mr r3, r31 -/* 8002AD70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002AD74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002AD78 7C 08 03 A6 */ mtlr r0 -/* 8002AD7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AD80 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__15dRenderingMap_cFv.s b/asm/d/map/d_map/__dt__15dRenderingMap_cFv.s deleted file mode 100644 index 05f2d51590..0000000000 --- a/asm/d/map/d_map/__dt__15dRenderingMap_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8002AC74: -/* 8002AC74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002AC78 7C 08 02 A6 */ mflr r0 -/* 8002AC7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AC80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002AC84 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002AC88 41 82 00 40 */ beq lbl_8002ACC8 -/* 8002AC8C 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002AC90 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002AC94 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AC98 41 82 00 20 */ beq lbl_8002ACB8 -/* 8002AC9C 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002ACA0 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002ACA4 90 1F 00 00 */ stw r0, 0(r31) -/* 8002ACA8 41 82 00 10 */ beq lbl_8002ACB8 -/* 8002ACAC 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002ACB0 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002ACB4 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002ACB8: -/* 8002ACB8 7C 80 07 35 */ extsh. r0, r4 -/* 8002ACBC 40 81 00 0C */ ble lbl_8002ACC8 -/* 8002ACC0 7F E3 FB 78 */ mr r3, r31 -/* 8002ACC4 48 2A 40 79 */ bl __dl__FPv -lbl_8002ACC8: -/* 8002ACC8 7F E3 FB 78 */ mr r3, r31 -/* 8002ACCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002ACD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002ACD4 7C 08 03 A6 */ mtlr r0 -/* 8002ACD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ACDC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__15renderingAmap_cFv.s b/asm/d/map/d_map/__dt__15renderingAmap_cFv.s deleted file mode 100644 index 29181faa23..0000000000 --- a/asm/d/map/d_map/__dt__15renderingAmap_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8002ADB0: -/* 8002ADB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002ADB4 7C 08 02 A6 */ mflr r0 -/* 8002ADB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ADBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002ADC0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002ADC4 41 82 00 90 */ beq lbl_8002AE54 -/* 8002ADC8 3C 60 80 3A */ lis r3, __vt__15renderingAmap_c@ha /* 0x803A70F4@ha */ -/* 8002ADCC 38 03 70 F4 */ addi r0, r3, __vt__15renderingAmap_c@l /* 0x803A70F4@l */ -/* 8002ADD0 90 1F 00 00 */ stw r0, 0(r31) -/* 8002ADD4 41 82 00 70 */ beq lbl_8002AE44 -/* 8002ADD8 3C 60 80 3A */ lis r3, __vt__28renderingPlusDoorAndCursor_c@ha /* 0x803A7E24@ha */ -/* 8002ADDC 38 03 7E 24 */ addi r0, r3, __vt__28renderingPlusDoorAndCursor_c@l /* 0x803A7E24@l */ -/* 8002ADE0 90 1F 00 00 */ stw r0, 0(r31) -/* 8002ADE4 41 82 00 60 */ beq lbl_8002AE44 -/* 8002ADE8 3C 60 80 3A */ lis r3, __vt__19renderingPlusDoor_c@ha /* 0x803A7D80@ha */ -/* 8002ADEC 38 03 7D 80 */ addi r0, r3, __vt__19renderingPlusDoor_c@l /* 0x803A7D80@l */ -/* 8002ADF0 90 1F 00 00 */ stw r0, 0(r31) -/* 8002ADF4 41 82 00 50 */ beq lbl_8002AE44 -/* 8002ADF8 3C 60 80 3A */ lis r3, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002ADFC 38 03 7E E0 */ addi r0, r3, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002AE00 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AE04 41 82 00 40 */ beq lbl_8002AE44 -/* 8002AE08 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002AE0C 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002AE10 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AE14 41 82 00 30 */ beq lbl_8002AE44 -/* 8002AE18 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002AE1C 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002AE20 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AE24 41 82 00 20 */ beq lbl_8002AE44 -/* 8002AE28 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002AE2C 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002AE30 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AE34 41 82 00 10 */ beq lbl_8002AE44 -/* 8002AE38 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AE3C 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AE40 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002AE44: -/* 8002AE44 7C 80 07 35 */ extsh. r0, r4 -/* 8002AE48 40 81 00 0C */ ble lbl_8002AE54 -/* 8002AE4C 7F E3 FB 78 */ mr r3, r31 -/* 8002AE50 48 2A 3E ED */ bl __dl__FPv -lbl_8002AE54: -/* 8002AE54 7F E3 FB 78 */ mr r3, r31 -/* 8002AE58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002AE5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002AE60 7C 08 03 A6 */ mtlr r0 -/* 8002AE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AE68 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__16renderingDAmap_cFv.s b/asm/d/map/d_map/__dt__16renderingDAmap_cFv.s deleted file mode 100644 index e3b06a49c8..0000000000 --- a/asm/d/map/d_map/__dt__16renderingDAmap_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8002B150: -/* 8002B150 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002B154 7C 08 02 A6 */ mflr r0 -/* 8002B158 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002B15C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002B160 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002B164 41 82 00 60 */ beq lbl_8002B1C4 -/* 8002B168 3C 60 80 3A */ lis r3, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002B16C 38 03 7E E0 */ addi r0, r3, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002B170 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B174 41 82 00 40 */ beq lbl_8002B1B4 -/* 8002B178 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002B17C 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002B180 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B184 41 82 00 30 */ beq lbl_8002B1B4 -/* 8002B188 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002B18C 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002B190 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B194 41 82 00 20 */ beq lbl_8002B1B4 -/* 8002B198 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002B19C 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002B1A0 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B1A4 41 82 00 10 */ beq lbl_8002B1B4 -/* 8002B1A8 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002B1AC 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002B1B0 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002B1B4: -/* 8002B1B4 7C 80 07 35 */ extsh. r0, r4 -/* 8002B1B8 40 81 00 0C */ ble lbl_8002B1C4 -/* 8002B1BC 7F E3 FB 78 */ mr r3, r31 -/* 8002B1C0 48 2A 3B 7D */ bl __dl__FPv -lbl_8002B1C4: -/* 8002B1C4 7F E3 FB 78 */ mr r3, r31 -/* 8002B1C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002B1CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002B1D0 7C 08 03 A6 */ mtlr r0 -/* 8002B1D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B1D8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__18dRenderingFDAmap_cFv.s b/asm/d/map/d_map/__dt__18dRenderingFDAmap_cFv.s deleted file mode 100644 index d07334489d..0000000000 --- a/asm/d/map/d_map/__dt__18dRenderingFDAmap_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002ABF8: -/* 8002ABF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002ABFC 7C 08 02 A6 */ mflr r0 -/* 8002AC00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AC04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002AC08 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002AC0C 41 82 00 50 */ beq lbl_8002AC5C -/* 8002AC10 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002AC14 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002AC18 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AC1C 41 82 00 30 */ beq lbl_8002AC4C -/* 8002AC20 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002AC24 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002AC28 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AC2C 41 82 00 20 */ beq lbl_8002AC4C -/* 8002AC30 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002AC34 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002AC38 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AC3C 41 82 00 10 */ beq lbl_8002AC4C -/* 8002AC40 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AC44 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AC48 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002AC4C: -/* 8002AC4C 7C 80 07 35 */ extsh. r0, r4 -/* 8002AC50 40 81 00 0C */ ble lbl_8002AC5C -/* 8002AC54 7F E3 FB 78 */ mr r3, r31 -/* 8002AC58 48 2A 40 E5 */ bl __dl__FPv -lbl_8002AC5C: -/* 8002AC5C 7F E3 FB 78 */ mr r3, r31 -/* 8002AC60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002AC64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002AC68 7C 08 03 A6 */ mtlr r0 -/* 8002AC6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AC70 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__19renderingPlusDoor_cFv.s b/asm/d/map/d_map/__dt__19renderingPlusDoor_cFv.s deleted file mode 100644 index ae03d93bb3..0000000000 --- a/asm/d/map/d_map/__dt__19renderingPlusDoor_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8002B0B4: -/* 8002B0B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002B0B8 7C 08 02 A6 */ mflr r0 -/* 8002B0BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002B0C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002B0C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002B0C8 41 82 00 70 */ beq lbl_8002B138 -/* 8002B0CC 3C 60 80 3A */ lis r3, __vt__19renderingPlusDoor_c@ha /* 0x803A7D80@ha */ -/* 8002B0D0 38 03 7D 80 */ addi r0, r3, __vt__19renderingPlusDoor_c@l /* 0x803A7D80@l */ -/* 8002B0D4 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B0D8 41 82 00 50 */ beq lbl_8002B128 -/* 8002B0DC 3C 60 80 3A */ lis r3, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002B0E0 38 03 7E E0 */ addi r0, r3, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002B0E4 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B0E8 41 82 00 40 */ beq lbl_8002B128 -/* 8002B0EC 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002B0F0 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002B0F4 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B0F8 41 82 00 30 */ beq lbl_8002B128 -/* 8002B0FC 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002B100 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002B104 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B108 41 82 00 20 */ beq lbl_8002B128 -/* 8002B10C 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002B110 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002B114 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B118 41 82 00 10 */ beq lbl_8002B128 -/* 8002B11C 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002B120 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002B124 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002B128: -/* 8002B128 7C 80 07 35 */ extsh. r0, r4 -/* 8002B12C 40 81 00 0C */ ble lbl_8002B138 -/* 8002B130 7F E3 FB 78 */ mr r3, r31 -/* 8002B134 48 2A 3C 09 */ bl __dl__FPv -lbl_8002B138: -/* 8002B138 7F E3 FB 78 */ mr r3, r31 -/* 8002B13C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002B140 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002B144 7C 08 03 A6 */ mtlr r0 -/* 8002B148 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B14C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__28dDrawPathWithNormalPattern_cFv.s b/asm/d/map/d_map/__dt__28dDrawPathWithNormalPattern_cFv.s deleted file mode 100644 index 2d9fbd53bc..0000000000 --- a/asm/d/map/d_map/__dt__28dDrawPathWithNormalPattern_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8002ACE0: -/* 8002ACE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002ACE4 7C 08 02 A6 */ mflr r0 -/* 8002ACE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ACEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002ACF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002ACF4 41 82 00 30 */ beq lbl_8002AD24 -/* 8002ACF8 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002ACFC 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002AD00 90 1F 00 00 */ stw r0, 0(r31) -/* 8002AD04 41 82 00 10 */ beq lbl_8002AD14 -/* 8002AD08 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AD0C 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AD10 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002AD14: -/* 8002AD14 7C 80 07 35 */ extsh. r0, r4 -/* 8002AD18 40 81 00 0C */ ble lbl_8002AD24 -/* 8002AD1C 7F E3 FB 78 */ mr r3, r31 -/* 8002AD20 48 2A 40 1D */ bl __dl__FPv -lbl_8002AD24: -/* 8002AD24 7F E3 FB 78 */ mr r3, r31 -/* 8002AD28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002AD2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002AD30 7C 08 03 A6 */ mtlr r0 -/* 8002AD34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AD38 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__28renderingPlusDoorAndCursor_cFv.s b/asm/d/map/d_map/__dt__28renderingPlusDoorAndCursor_cFv.s deleted file mode 100644 index 795261904e..0000000000 --- a/asm/d/map/d_map/__dt__28renderingPlusDoorAndCursor_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8002B008: -/* 8002B008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002B00C 7C 08 02 A6 */ mflr r0 -/* 8002B010 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002B014 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002B018 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8002B01C 41 82 00 80 */ beq lbl_8002B09C -/* 8002B020 3C 60 80 3A */ lis r3, __vt__28renderingPlusDoorAndCursor_c@ha /* 0x803A7E24@ha */ -/* 8002B024 38 03 7E 24 */ addi r0, r3, __vt__28renderingPlusDoorAndCursor_c@l /* 0x803A7E24@l */ -/* 8002B028 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B02C 41 82 00 60 */ beq lbl_8002B08C -/* 8002B030 3C 60 80 3A */ lis r3, __vt__19renderingPlusDoor_c@ha /* 0x803A7D80@ha */ -/* 8002B034 38 03 7D 80 */ addi r0, r3, __vt__19renderingPlusDoor_c@l /* 0x803A7D80@l */ -/* 8002B038 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B03C 41 82 00 50 */ beq lbl_8002B08C -/* 8002B040 3C 60 80 3A */ lis r3, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002B044 38 03 7E E0 */ addi r0, r3, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002B048 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B04C 41 82 00 40 */ beq lbl_8002B08C -/* 8002B050 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002B054 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002B058 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B05C 41 82 00 30 */ beq lbl_8002B08C -/* 8002B060 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002B064 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002B068 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B06C 41 82 00 20 */ beq lbl_8002B08C -/* 8002B070 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002B074 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002B078 90 1F 00 00 */ stw r0, 0(r31) -/* 8002B07C 41 82 00 10 */ beq lbl_8002B08C -/* 8002B080 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002B084 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002B088 90 1F 00 00 */ stw r0, 0(r31) -lbl_8002B08C: -/* 8002B08C 7C 80 07 35 */ extsh. r0, r4 -/* 8002B090 40 81 00 0C */ ble lbl_8002B09C -/* 8002B094 7F E3 FB 78 */ mr r3, r31 -/* 8002B098 48 2A 3C A5 */ bl __dl__FPv -lbl_8002B09C: -/* 8002B09C 7F E3 FB 78 */ mr r3, r31 -/* 8002B0A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002B0A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002B0A8 7C 08 03 A6 */ mtlr r0 -/* 8002B0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B0B0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/__dt__6dMap_cFv.s b/asm/d/map/d_map/__dt__6dMap_cFv.s deleted file mode 100644 index f9e609099b..0000000000 --- a/asm/d/map/d_map/__dt__6dMap_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8002AF20: -/* 8002AF20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002AF24 7C 08 02 A6 */ mflr r0 -/* 8002AF28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AF2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002AF30 93 C1 00 08 */ stw r30, 8(r1) -/* 8002AF34 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002AF38 7C 9F 23 78 */ mr r31, r4 -/* 8002AF3C 41 82 00 A8 */ beq lbl_8002AFE4 -/* 8002AF40 3C 80 80 3A */ lis r4, __vt__6dMap_c@ha /* 0x803A7030@ha */ -/* 8002AF44 38 04 70 30 */ addi r0, r4, __vt__6dMap_c@l /* 0x803A7030@l */ -/* 8002AF48 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF4C 4B FF EA D1 */ bl _remove__6dMap_cFv -/* 8002AF50 28 1E 00 00 */ cmplwi r30, 0 -/* 8002AF54 41 82 00 80 */ beq lbl_8002AFD4 -/* 8002AF58 3C 60 80 3A */ lis r3, __vt__15renderingAmap_c@ha /* 0x803A70F4@ha */ -/* 8002AF5C 38 03 70 F4 */ addi r0, r3, __vt__15renderingAmap_c@l /* 0x803A70F4@l */ -/* 8002AF60 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF64 41 82 00 70 */ beq lbl_8002AFD4 -/* 8002AF68 3C 60 80 3A */ lis r3, __vt__28renderingPlusDoorAndCursor_c@ha /* 0x803A7E24@ha */ -/* 8002AF6C 38 03 7E 24 */ addi r0, r3, __vt__28renderingPlusDoorAndCursor_c@l /* 0x803A7E24@l */ -/* 8002AF70 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF74 41 82 00 60 */ beq lbl_8002AFD4 -/* 8002AF78 3C 60 80 3A */ lis r3, __vt__19renderingPlusDoor_c@ha /* 0x803A7D80@ha */ -/* 8002AF7C 38 03 7D 80 */ addi r0, r3, __vt__19renderingPlusDoor_c@l /* 0x803A7D80@l */ -/* 8002AF80 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF84 41 82 00 50 */ beq lbl_8002AFD4 -/* 8002AF88 3C 60 80 3A */ lis r3, __vt__16renderingDAmap_c@ha /* 0x803A7EE0@ha */ -/* 8002AF8C 38 03 7E E0 */ addi r0, r3, __vt__16renderingDAmap_c@l /* 0x803A7EE0@l */ -/* 8002AF90 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF94 41 82 00 40 */ beq lbl_8002AFD4 -/* 8002AF98 3C 60 80 3A */ lis r3, __vt__18dRenderingFDAmap_c@ha /* 0x803A7C90@ha */ -/* 8002AF9C 38 03 7C 90 */ addi r0, r3, __vt__18dRenderingFDAmap_c@l /* 0x803A7C90@l */ -/* 8002AFA0 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AFA4 41 82 00 30 */ beq lbl_8002AFD4 -/* 8002AFA8 3C 60 80 3A */ lis r3, __vt__15dRenderingMap_c@ha /* 0x803A6FD4@ha */ -/* 8002AFAC 38 03 6F D4 */ addi r0, r3, __vt__15dRenderingMap_c@l /* 0x803A6FD4@l */ -/* 8002AFB0 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AFB4 41 82 00 20 */ beq lbl_8002AFD4 -/* 8002AFB8 3C 60 80 3A */ lis r3, __vt__28dDrawPathWithNormalPattern_c@ha /* 0x803A6F94@ha */ -/* 8002AFBC 38 03 6F 94 */ addi r0, r3, __vt__28dDrawPathWithNormalPattern_c@l /* 0x803A6F94@l */ -/* 8002AFC0 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AFC4 41 82 00 10 */ beq lbl_8002AFD4 -/* 8002AFC8 3C 60 80 3A */ lis r3, __vt__11dDrawPath_c@ha /* 0x803A7CF8@ha */ -/* 8002AFCC 38 03 7C F8 */ addi r0, r3, __vt__11dDrawPath_c@l /* 0x803A7CF8@l */ -/* 8002AFD0 90 1E 00 00 */ stw r0, 0(r30) -lbl_8002AFD4: -/* 8002AFD4 7F E0 07 35 */ extsh. r0, r31 -/* 8002AFD8 40 81 00 0C */ ble lbl_8002AFE4 -/* 8002AFDC 7F C3 F3 78 */ mr r3, r30 -/* 8002AFE0 48 2A 3D 5D */ bl __dl__FPv -lbl_8002AFE4: -/* 8002AFE4 7F C3 F3 78 */ mr r3, r30 -/* 8002AFE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002AFEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002AFF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002AFF4 7C 08 03 A6 */ mtlr r0 -/* 8002AFF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AFFC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/_draw__6dMap_cFv.s b/asm/d/map/d_map/_draw__6dMap_cFv.s deleted file mode 100644 index 002afc8067..0000000000 --- a/asm/d/map/d_map/_draw__6dMap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8002AB54: -/* 8002AB54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002AB58 7C 08 02 A6 */ mflr r0 -/* 8002AB5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AB60 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 8002AB64 2C 04 00 00 */ cmpwi r4, 0 -/* 8002AB68 41 80 00 34 */ blt lbl_8002AB9C -/* 8002AB6C 88 03 00 8D */ lbz r0, 0x8d(r3) -/* 8002AB70 28 00 00 00 */ cmplwi r0, 0 -/* 8002AB74 41 82 00 28 */ beq lbl_8002AB9C -/* 8002AB78 38 A0 00 00 */ li r5, 0 -/* 8002AB7C 88 0D 88 E0 */ lbz r0, mNowStayFloorNoDecisionFlg__10dMapInfo_c(r13) -/* 8002AB80 28 00 00 00 */ cmplwi r0, 0 -/* 8002AB84 41 82 00 08 */ beq lbl_8002AB8C -/* 8002AB88 88 AD 88 D8 */ lbz r5, mNowStayFloorNo__10dMapInfo_c(r13) -lbl_8002AB8C: -/* 8002AB8C C0 23 00 50 */ lfs f1, 0x50(r3) -/* 8002AB90 C0 43 00 54 */ lfs f2, 0x54(r3) -/* 8002AB94 C0 63 00 58 */ lfs f3, 0x58(r3) -/* 8002AB98 48 01 51 71 */ bl entry__16renderingDAmap_cFfffiSc -lbl_8002AB9C: -/* 8002AB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002ABA0 7C 08 03 A6 */ mtlr r0 -/* 8002ABA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ABA8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/_move__6dMap_cFffif.s b/asm/d/map/d_map/_move__6dMap_cFffif.s deleted file mode 100644 index 796fd55aeb..0000000000 --- a/asm/d/map/d_map/_move__6dMap_cFffif.s +++ /dev/null @@ -1,550 +0,0 @@ -lbl_8002A32C: -/* 8002A32C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8002A330 7C 08 02 A6 */ mflr r0 -/* 8002A334 90 01 00 64 */ stw r0, 0x64(r1) -/* 8002A338 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8002A33C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8002A340 39 61 00 50 */ addi r11, r1, 0x50 -/* 8002A344 48 33 7E 99 */ bl _savegpr_29 -/* 8002A348 7C 7E 1B 78 */ mr r30, r3 -/* 8002A34C 7C 9F 23 78 */ mr r31, r4 -/* 8002A350 FF E0 18 90 */ fmr f31, f3 -/* 8002A354 80 03 00 7C */ lwz r0, 0x7c(r3) -/* 8002A358 2C 00 FF FF */ cmpwi r0, -1 -/* 8002A35C 40 82 00 AC */ bne lbl_8002A408 -/* 8002A360 93 FE 00 7C */ stw r31, 0x7c(r30) -/* 8002A364 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A368 90 1E 00 80 */ stw r0, 0x80(r30) -/* 8002A36C 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A370 90 1E 00 84 */ stw r0, 0x84(r30) -/* 8002A374 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A378 90 0D 80 B0 */ stw r0, mNextRoomNo__10dMapInfo_c(r13) -/* 8002A37C 38 00 00 00 */ li r0, 0 -/* 8002A380 98 1E 00 8E */ stb r0, 0x8e(r30) -/* 8002A384 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A388 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A38C D0 3E 00 50 */ stfs f1, 0x50(r30) -/* 8002A390 D0 5E 00 54 */ stfs f2, 0x54(r30) -/* 8002A394 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A398 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A39C 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A3A0 4B FF F9 D9 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A3A4 7F C3 F3 78 */ mr r3, r30 -/* 8002A3A8 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A3AC 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A3B0 4B FF FA 6D */ bl calcMapCmPerTexel__6dMap_cFiPf -/* 8002A3B4 7F C3 F3 78 */ mr r3, r30 -/* 8002A3B8 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A3BC 38 BE 00 5C */ addi r5, r30, 0x5c -/* 8002A3C0 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A3C4 4B FF F8 4D */ bl getPack__6dMap_cFiPfPf -/* 8002A3C8 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A3CC C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 8002A3D0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A3D4 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A3D8 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A3DC C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 8002A3E0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8002A3E4 D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002A3E8 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A3EC C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 8002A3F0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A3F4 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A3F8 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A3FC C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 8002A400 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A404 D0 1E 00 54 */ stfs f0, 0x54(r30) -lbl_8002A408: -/* 8002A408 7F C3 F3 78 */ mr r3, r30 -/* 8002A40C 4B FF ED 55 */ bl getStayType__15renderingAmap_cCFv -/* 8002A410 2C 03 00 00 */ cmpwi r3, 0 -/* 8002A414 40 82 00 AC */ bne lbl_8002A4C0 -/* 8002A418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002A41C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002A420 38 63 09 78 */ addi r3, r3, 0x978 -/* 8002A424 38 80 00 32 */ li r4, 0x32 -/* 8002A428 48 00 A7 C1 */ bl isSwitch__12dSv_danBit_cCFi -/* 8002A42C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002A430 41 82 00 90 */ beq lbl_8002A4C0 -/* 8002A434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002A438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002A43C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8002A440 3C 80 80 38 */ lis r4, d_map_d_map__stringBase0@ha /* 0x80378F24@ha */ -/* 8002A444 38 84 8F 24 */ addi r4, r4, d_map_d_map__stringBase0@l /* 0x80378F24@l */ -/* 8002A448 38 84 00 07 */ addi r4, r4, 7 -/* 8002A44C 48 33 E5 49 */ bl strcmp -/* 8002A450 2C 03 00 00 */ cmpwi r3, 0 -/* 8002A454 40 82 00 6C */ bne lbl_8002A4C0 -/* 8002A458 C0 82 82 E4 */ lfs f4, lit_4321(r2) -/* 8002A45C D0 9E 00 64 */ stfs f4, 0x64(r30) -/* 8002A460 C0 02 82 EC */ lfs f0, lit_4688(r2) -/* 8002A464 D0 1E 00 68 */ stfs f0, 0x68(r30) -/* 8002A468 C0 62 82 A0 */ lfs f3, lit_3745(r2) -/* 8002A46C C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 8002A470 80 7E 00 74 */ lwz r3, 0x74(r30) -/* 8002A474 38 03 00 04 */ addi r0, r3, 4 -/* 8002A478 C8 22 82 B8 */ lfd f1, lit_3751(r2) -/* 8002A47C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8002A480 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002A484 3C 00 43 30 */ lis r0, 0x4330 -/* 8002A488 90 01 00 30 */ stw r0, 0x30(r1) -/* 8002A48C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8002A490 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002A494 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8002A498 EC 43 00 32 */ fmuls f2, f3, f0 -/* 8002A49C D0 9E 00 6C */ stfs f4, 0x6c(r30) -/* 8002A4A0 C0 22 82 F0 */ lfs f1, lit_4689(r2) -/* 8002A4A4 C0 0D 88 F0 */ lfs f0, mMinZ__8dMpath_c(r13) -/* 8002A4A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8002A4AC EC 20 10 28 */ fsubs f1, f0, f2 -/* 8002A4B0 C0 1E 00 58 */ lfs f0, 0x58(r30) -/* 8002A4B4 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8002A4B8 D0 1E 00 70 */ stfs f0, 0x70(r30) -/* 8002A4BC 48 00 00 10 */ b lbl_8002A4CC -lbl_8002A4C0: -/* 8002A4C0 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 8002A4C4 D0 1E 00 6C */ stfs f0, 0x6c(r30) -/* 8002A4C8 D0 1E 00 70 */ stfs f0, 0x70(r30) -lbl_8002A4CC: -/* 8002A4CC 83 BE 00 7C */ lwz r29, 0x7c(r30) -/* 8002A4D0 93 FE 00 7C */ stw r31, 0x7c(r30) -/* 8002A4D4 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 8002A4D8 FC 20 F8 90 */ fmr f1, f31 -/* 8002A4DC 48 01 51 ED */ bl move__10dMapInfo_cFif -/* 8002A4E0 38 00 00 00 */ li r0, 0 -/* 8002A4E4 98 1E 00 8E */ stb r0, 0x8e(r30) -/* 8002A4E8 7F C3 F3 78 */ mr r3, r30 -/* 8002A4EC 4B FF FC D1 */ bl getDispType__6dMap_cCFv -/* 8002A4F0 2C 03 00 01 */ cmpwi r3, 1 -/* 8002A4F4 41 82 00 24 */ beq lbl_8002A518 -/* 8002A4F8 40 80 00 08 */ bge lbl_8002A500 -/* 8002A4FC 48 00 00 24 */ b lbl_8002A520 -lbl_8002A500: -/* 8002A500 2C 03 00 05 */ cmpwi r3, 5 -/* 8002A504 41 82 00 08 */ beq lbl_8002A50C -/* 8002A508 48 00 00 18 */ b lbl_8002A520 -lbl_8002A50C: -/* 8002A50C 38 00 00 02 */ li r0, 2 -/* 8002A510 98 1E 00 8E */ stb r0, 0x8e(r30) -/* 8002A514 48 00 00 0C */ b lbl_8002A520 -lbl_8002A518: -/* 8002A518 38 00 00 01 */ li r0, 1 -/* 8002A51C 98 1E 00 8E */ stb r0, 0x8e(r30) -lbl_8002A520: -/* 8002A520 88 1E 00 8E */ lbz r0, 0x8e(r30) -/* 8002A524 2C 00 00 01 */ cmpwi r0, 1 -/* 8002A528 41 82 00 9C */ beq lbl_8002A5C4 -/* 8002A52C 40 80 00 10 */ bge lbl_8002A53C -/* 8002A530 2C 00 00 00 */ cmpwi r0, 0 -/* 8002A534 40 80 00 14 */ bge lbl_8002A548 -/* 8002A538 48 00 02 C0 */ b lbl_8002A7F8 -lbl_8002A53C: -/* 8002A53C 2C 00 00 03 */ cmpwi r0, 3 -/* 8002A540 40 80 02 B8 */ bge lbl_8002A7F8 -/* 8002A544 48 00 01 14 */ b lbl_8002A658 -lbl_8002A548: -/* 8002A548 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A54C 7C 00 E8 00 */ cmpw r0, r29 -/* 8002A550 41 82 02 A8 */ beq lbl_8002A7F8 -/* 8002A554 90 1E 00 80 */ stw r0, 0x80(r30) -/* 8002A558 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A55C 90 1E 00 84 */ stw r0, 0x84(r30) -/* 8002A560 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A564 90 1E 00 88 */ stw r0, 0x88(r30) -/* 8002A568 7F C3 F3 78 */ mr r3, r30 -/* 8002A56C 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A570 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A574 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A578 4B FF F8 01 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A57C 7F C3 F3 78 */ mr r3, r30 -/* 8002A580 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A584 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A588 4B FF F8 95 */ bl calcMapCmPerTexel__6dMap_cFiPf -/* 8002A58C 7F C3 F3 78 */ mr r3, r30 -/* 8002A590 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A594 38 BE 00 5C */ addi r5, r30, 0x5c -/* 8002A598 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A59C 4B FF F6 75 */ bl getPack__6dMap_cFiPfPf -/* 8002A5A0 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A5A4 C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 8002A5A8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A5AC D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A5B0 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A5B4 C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 8002A5B8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8002A5BC D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002A5C0 48 00 02 38 */ b lbl_8002A7F8 -lbl_8002A5C4: -/* 8002A5C4 88 1E 00 8F */ lbz r0, 0x8f(r30) -/* 8002A5C8 2C 00 00 01 */ cmpwi r0, 1 -/* 8002A5CC 41 82 00 4C */ beq lbl_8002A618 -/* 8002A5D0 40 80 02 28 */ bge lbl_8002A7F8 -/* 8002A5D4 2C 00 00 00 */ cmpwi r0, 0 -/* 8002A5D8 40 80 00 08 */ bge lbl_8002A5E0 -/* 8002A5DC 48 00 02 1C */ b lbl_8002A7F8 -lbl_8002A5E0: -/* 8002A5E0 80 7E 00 80 */ lwz r3, 0x80(r30) -/* 8002A5E4 80 0D 80 B0 */ lwz r0, mNextRoomNo__10dMapInfo_c(r13) -/* 8002A5E8 7C 03 00 00 */ cmpw r3, r0 -/* 8002A5EC 41 82 02 0C */ beq lbl_8002A7F8 -/* 8002A5F0 38 00 00 01 */ li r0, 1 -/* 8002A5F4 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A5F8 38 00 00 3C */ li r0, 0x3c -/* 8002A5FC 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A600 80 0D 80 B0 */ lwz r0, mNextRoomNo__10dMapInfo_c(r13) -/* 8002A604 7C 00 07 74 */ extsb r0, r0 -/* 8002A608 90 1E 00 84 */ stw r0, 0x84(r30) -/* 8002A60C 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 8002A610 90 1E 00 88 */ stw r0, 0x88(r30) -/* 8002A614 48 00 01 E4 */ b lbl_8002A7F8 -lbl_8002A618: -/* 8002A618 88 7E 00 90 */ lbz r3, 0x90(r30) -/* 8002A61C 38 03 FF FF */ addi r0, r3, -1 -/* 8002A620 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A624 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A628 28 00 00 00 */ cmplwi r0, 0 -/* 8002A62C 40 82 01 CC */ bne lbl_8002A7F8 -/* 8002A630 38 00 00 00 */ li r0, 0 -/* 8002A634 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A638 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 8002A63C 90 1E 00 80 */ stw r0, 0x80(r30) -/* 8002A640 7F C3 F3 78 */ mr r3, r30 -/* 8002A644 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A648 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A64C 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A650 4B FF F7 29 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A654 48 00 01 A4 */ b lbl_8002A7F8 -lbl_8002A658: -/* 8002A658 88 1E 00 8F */ lbz r0, 0x8f(r30) -/* 8002A65C 28 00 00 06 */ cmplwi r0, 6 -/* 8002A660 41 81 01 98 */ bgt lbl_8002A7F8 -/* 8002A664 3C 60 80 3A */ lis r3, lit_4694@ha /* 0x803A6F6C@ha */ -/* 8002A668 38 63 6F 6C */ addi r3, r3, lit_4694@l /* 0x803A6F6C@l */ -/* 8002A66C 54 00 10 3A */ slwi r0, r0, 2 -/* 8002A670 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8002A674 7C 09 03 A6 */ mtctr r0 -/* 8002A678 4E 80 04 20 */ bctr -/* 8002A67C 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 8002A680 80 6D 80 B0 */ lwz r3, mNextRoomNo__10dMapInfo_c(r13) -/* 8002A684 7C 00 18 00 */ cmpw r0, r3 -/* 8002A688 41 82 01 70 */ beq lbl_8002A7F8 -/* 8002A68C 7C 60 07 74 */ extsb r0, r3 -/* 8002A690 90 1E 00 84 */ stw r0, 0x84(r30) -/* 8002A694 80 1E 00 80 */ lwz r0, 0x80(r30) -/* 8002A698 90 1E 00 88 */ stw r0, 0x88(r30) -/* 8002A69C 38 60 00 1E */ li r3, 0x1e -/* 8002A6A0 98 7E 00 90 */ stb r3, 0x90(r30) -/* 8002A6A4 38 00 00 01 */ li r0, 1 -/* 8002A6A8 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A6AC 98 7E 00 90 */ stb r3, 0x90(r30) -/* 8002A6B0 48 00 01 48 */ b lbl_8002A7F8 -/* 8002A6B4 88 7E 00 90 */ lbz r3, 0x90(r30) -/* 8002A6B8 28 03 00 00 */ cmplwi r3, 0 -/* 8002A6BC 41 82 00 0C */ beq lbl_8002A6C8 -/* 8002A6C0 38 03 FF FF */ addi r0, r3, -1 -/* 8002A6C4 98 1E 00 90 */ stb r0, 0x90(r30) -lbl_8002A6C8: -/* 8002A6C8 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A6CC 28 00 00 00 */ cmplwi r0, 0 -/* 8002A6D0 40 82 01 28 */ bne lbl_8002A7F8 -/* 8002A6D4 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 8002A6D8 80 1E 00 88 */ lwz r0, 0x88(r30) -/* 8002A6DC 7C 03 00 00 */ cmpw r3, r0 -/* 8002A6E0 41 82 01 18 */ beq lbl_8002A7F8 -/* 8002A6E4 38 00 00 02 */ li r0, 2 -/* 8002A6E8 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A6EC 38 00 00 05 */ li r0, 5 -/* 8002A6F0 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A6F4 48 00 01 04 */ b lbl_8002A7F8 -/* 8002A6F8 88 7E 00 90 */ lbz r3, 0x90(r30) -/* 8002A6FC 38 03 FF FF */ addi r0, r3, -1 -/* 8002A700 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A704 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A708 28 00 00 00 */ cmplwi r0, 0 -/* 8002A70C 40 82 00 EC */ bne lbl_8002A7F8 -/* 8002A710 38 00 00 03 */ li r0, 3 -/* 8002A714 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A718 38 00 00 14 */ li r0, 0x14 -/* 8002A71C 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A720 48 00 00 D8 */ b lbl_8002A7F8 -/* 8002A724 88 7E 00 90 */ lbz r3, 0x90(r30) -/* 8002A728 38 03 FF FF */ addi r0, r3, -1 -/* 8002A72C 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A730 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A734 28 00 00 00 */ cmplwi r0, 0 -/* 8002A738 40 82 00 C0 */ bne lbl_8002A7F8 -/* 8002A73C 80 1E 00 84 */ lwz r0, 0x84(r30) -/* 8002A740 90 1E 00 80 */ stw r0, 0x80(r30) -/* 8002A744 7F C3 F3 78 */ mr r3, r30 -/* 8002A748 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A74C 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A750 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A754 4B FF F6 25 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A758 7F C3 F3 78 */ mr r3, r30 -/* 8002A75C 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A760 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A764 4B FF F6 B9 */ bl calcMapCmPerTexel__6dMap_cFiPf -/* 8002A768 7F C3 F3 78 */ mr r3, r30 -/* 8002A76C 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8002A770 38 BE 00 5C */ addi r5, r30, 0x5c -/* 8002A774 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A778 4B FF F4 99 */ bl getPack__6dMap_cFiPfPf -/* 8002A77C C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A780 C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 8002A784 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A788 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A78C C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A790 C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 8002A794 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8002A798 D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002A79C 38 00 00 04 */ li r0, 4 -/* 8002A7A0 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A7A4 38 00 00 05 */ li r0, 5 -/* 8002A7A8 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A7AC 48 00 00 4C */ b lbl_8002A7F8 -/* 8002A7B0 88 7E 00 90 */ lbz r3, 0x90(r30) -/* 8002A7B4 38 03 FF FF */ addi r0, r3, -1 -/* 8002A7B8 98 1E 00 90 */ stb r0, 0x90(r30) -/* 8002A7BC 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A7C0 28 00 00 00 */ cmplwi r0, 0 -/* 8002A7C4 40 82 00 34 */ bne lbl_8002A7F8 -/* 8002A7C8 38 00 00 05 */ li r0, 5 -/* 8002A7CC 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A7D0 48 00 00 28 */ b lbl_8002A7F8 -/* 8002A7D4 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 8002A7D8 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 8002A7DC 7C 03 00 00 */ cmpw r3, r0 -/* 8002A7E0 40 82 00 18 */ bne lbl_8002A7F8 -/* 8002A7E4 38 00 00 06 */ li r0, 6 -/* 8002A7E8 98 1E 00 8F */ stb r0, 0x8f(r30) -/* 8002A7EC 48 00 00 0C */ b lbl_8002A7F8 -/* 8002A7F0 38 00 00 00 */ li r0, 0 -/* 8002A7F4 98 1E 00 8F */ stb r0, 0x8f(r30) -lbl_8002A7F8: -/* 8002A7F8 88 1E 00 8E */ lbz r0, 0x8e(r30) -/* 8002A7FC 2C 00 00 01 */ cmpwi r0, 1 -/* 8002A800 41 82 00 18 */ beq lbl_8002A818 -/* 8002A804 40 80 00 08 */ bge lbl_8002A80C -/* 8002A808 48 00 03 24 */ b lbl_8002AB2C -lbl_8002A80C: -/* 8002A80C 2C 00 00 03 */ cmpwi r0, 3 -/* 8002A810 40 80 03 1C */ bge lbl_8002AB2C -/* 8002A814 48 00 00 A0 */ b lbl_8002A8B4 -lbl_8002A818: -/* 8002A818 88 1E 00 8F */ lbz r0, 0x8f(r30) -/* 8002A81C 2C 00 00 01 */ cmpwi r0, 1 -/* 8002A820 41 82 00 0C */ beq lbl_8002A82C -/* 8002A824 40 80 03 08 */ bge lbl_8002AB2C -/* 8002A828 48 00 03 04 */ b lbl_8002AB2C -lbl_8002A82C: -/* 8002A82C 7F C3 F3 78 */ mr r3, r30 -/* 8002A830 80 9E 00 88 */ lwz r4, 0x88(r30) -/* 8002A834 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A838 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A83C 4B FF F5 3D */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A840 7F C3 F3 78 */ mr r3, r30 -/* 8002A844 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8002A848 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8002A84C 38 C1 00 28 */ addi r6, r1, 0x28 -/* 8002A850 4B FF F5 29 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A854 C0 42 82 E0 */ lfs f2, lit_4284(r2) -/* 8002A858 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A85C C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 8002A860 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002A864 3C 00 43 30 */ lis r0, 0x4330 -/* 8002A868 90 01 00 30 */ stw r0, 0x30(r1) -/* 8002A86C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8002A870 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8002A874 C0 02 82 F4 */ lfs f0, lit_4690(r2) -/* 8002A878 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8002A87C EC 42 00 28 */ fsubs f2, f2, f0 -/* 8002A880 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A884 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8002A888 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002A88C EC 02 00 32 */ fmuls f0, f2, f0 -/* 8002A890 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A894 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A898 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A89C C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8002A8A0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002A8A4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8002A8A8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A8AC D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002A8B0 48 00 02 7C */ b lbl_8002AB2C -lbl_8002A8B4: -/* 8002A8B4 88 1E 00 8F */ lbz r0, 0x8f(r30) -/* 8002A8B8 2C 00 00 04 */ cmpwi r0, 4 -/* 8002A8BC 41 82 02 10 */ beq lbl_8002AACC -/* 8002A8C0 40 80 00 14 */ bge lbl_8002A8D4 -/* 8002A8C4 2C 00 00 02 */ cmpwi r0, 2 -/* 8002A8C8 41 82 00 18 */ beq lbl_8002A8E0 -/* 8002A8CC 40 80 00 64 */ bge lbl_8002A930 -/* 8002A8D0 48 00 02 5C */ b lbl_8002AB2C -lbl_8002A8D4: -/* 8002A8D4 2C 00 00 06 */ cmpwi r0, 6 -/* 8002A8D8 41 82 02 4C */ beq lbl_8002AB24 -/* 8002A8DC 48 00 02 50 */ b lbl_8002AB2C -lbl_8002A8E0: -/* 8002A8E0 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A8E4 C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 8002A8E8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002A8EC 3C 00 43 30 */ lis r0, 0x4330 -/* 8002A8F0 90 01 00 30 */ stw r0, 0x30(r1) -/* 8002A8F4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8002A8F8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8002A8FC C0 02 82 F8 */ lfs f0, lit_4691(r2) -/* 8002A900 EF E1 00 24 */ fdivs f31, f1, f0 -/* 8002A904 7F C3 F3 78 */ mr r3, r30 -/* 8002A908 38 80 00 2F */ li r4, 0x2f -/* 8002A90C 38 A0 00 32 */ li r5, 0x32 -/* 8002A910 FC 20 F8 90 */ fmr f1, f31 -/* 8002A914 4B FF EE 95 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002A918 7F C3 F3 78 */ mr r3, r30 -/* 8002A91C 38 80 00 21 */ li r4, 0x21 -/* 8002A920 38 A0 00 2B */ li r5, 0x2b -/* 8002A924 FC 20 F8 90 */ fmr f1, f31 -/* 8002A928 4B FF EE 81 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002A92C 48 00 02 00 */ b lbl_8002AB2C -lbl_8002A930: -/* 8002A930 7F C3 F3 78 */ mr r3, r30 -/* 8002A934 80 9E 00 88 */ lwz r4, 0x88(r30) -/* 8002A938 38 BE 00 50 */ addi r5, r30, 0x50 -/* 8002A93C 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A940 4B FF F4 39 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A944 7F C3 F3 78 */ mr r3, r30 -/* 8002A948 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8002A94C 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8002A950 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8002A954 4B FF F4 25 */ bl calcMapCenterXZ__6dMap_cFiPfPf -/* 8002A958 C0 42 82 E0 */ lfs f2, lit_4284(r2) -/* 8002A95C 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002A960 C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 8002A964 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002A968 3C 00 43 30 */ lis r0, 0x4330 -/* 8002A96C 90 01 00 30 */ stw r0, 0x30(r1) -/* 8002A970 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8002A974 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8002A978 C0 02 82 FC */ lfs f0, lit_4692(r2) -/* 8002A97C EC 01 00 24 */ fdivs f0, f1, f0 -/* 8002A980 EF E2 00 28 */ fsubs f31, f2, f0 -/* 8002A984 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8002A988 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8002A98C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002A990 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8002A994 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A998 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002A99C C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002A9A0 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8002A9A4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002A9A8 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8002A9AC EC 01 00 2A */ fadds f0, f1, f0 -/* 8002A9B0 D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002A9B4 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 8002A9B8 80 1E 00 88 */ lwz r0, 0x88(r30) -/* 8002A9BC 7C 03 00 00 */ cmpw r3, r0 -/* 8002A9C0 40 82 00 34 */ bne lbl_8002A9F4 -/* 8002A9C4 7F C3 F3 78 */ mr r3, r30 -/* 8002A9C8 38 80 00 0A */ li r4, 0xa -/* 8002A9CC 38 A0 00 11 */ li r5, 0x11 -/* 8002A9D0 FC 20 F8 90 */ fmr f1, f31 -/* 8002A9D4 4B FF ED D5 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002A9D8 7F C3 F3 78 */ mr r3, r30 -/* 8002A9DC 38 80 00 12 */ li r4, 0x12 -/* 8002A9E0 38 A0 00 19 */ li r5, 0x19 -/* 8002A9E4 C0 02 82 E0 */ lfs f0, lit_4284(r2) -/* 8002A9E8 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 8002A9EC 4B FF ED BD */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002A9F0 48 00 00 2C */ b lbl_8002AA1C -lbl_8002A9F4: -/* 8002A9F4 7F C3 F3 78 */ mr r3, r30 -/* 8002A9F8 38 80 00 0A */ li r4, 0xa -/* 8002A9FC 38 A0 00 11 */ li r5, 0x11 -/* 8002AA00 EC 22 F8 28 */ fsubs f1, f2, f31 -/* 8002AA04 4B FF ED A5 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002AA08 7F C3 F3 78 */ mr r3, r30 -/* 8002AA0C 38 80 00 12 */ li r4, 0x12 -/* 8002AA10 38 A0 00 19 */ li r5, 0x19 -/* 8002AA14 FC 20 F8 90 */ fmr f1, f31 -/* 8002AA18 4B FF ED 91 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -lbl_8002AA1C: -/* 8002AA1C 7F C3 F3 78 */ mr r3, r30 -/* 8002AA20 80 9E 00 88 */ lwz r4, 0x88(r30) -/* 8002AA24 38 A1 00 1C */ addi r5, r1, 0x1c -/* 8002AA28 4B FF F3 F5 */ bl calcMapCmPerTexel__6dMap_cFiPf -/* 8002AA2C 7F C3 F3 78 */ mr r3, r30 -/* 8002AA30 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8002AA34 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8002AA38 4B FF F3 E5 */ bl calcMapCmPerTexel__6dMap_cFiPf -/* 8002AA3C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 8002AA40 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 8002AA44 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002AA48 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8002AA4C EC 01 00 2A */ fadds f0, f1, f0 -/* 8002AA50 D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 8002AA54 7F C3 F3 78 */ mr r3, r30 -/* 8002AA58 80 9E 00 88 */ lwz r4, 0x88(r30) -/* 8002AA5C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8002AA60 38 C1 00 10 */ addi r6, r1, 0x10 -/* 8002AA64 4B FF F1 AD */ bl getPack__6dMap_cFiPfPf -/* 8002AA68 7F C3 F3 78 */ mr r3, r30 -/* 8002AA6C 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 8002AA70 38 A1 00 0C */ addi r5, r1, 0xc -/* 8002AA74 38 C1 00 08 */ addi r6, r1, 8 -/* 8002AA78 4B FF F1 99 */ bl getPack__6dMap_cFiPfPf -/* 8002AA7C C0 21 00 14 */ lfs f1, 0x14(r1) -/* 8002AA80 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8002AA84 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002AA88 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8002AA8C EC 41 00 2A */ fadds f2, f1, f0 -/* 8002AA90 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8002AA94 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8002AA98 C0 01 00 08 */ lfs f0, 8(r1) -/* 8002AA9C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8002AAA0 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 8002AAA4 EC 01 00 2A */ fadds f0, f1, f0 -/* 8002AAA8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8002AAAC C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 8002AAB0 EC 00 10 2A */ fadds f0, f0, f2 -/* 8002AAB4 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 8002AAB8 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 8002AABC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8002AAC0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8002AAC4 D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 8002AAC8 48 00 00 64 */ b lbl_8002AB2C -lbl_8002AACC: -/* 8002AACC C0 42 82 E0 */ lfs f2, lit_4284(r2) -/* 8002AAD0 88 1E 00 90 */ lbz r0, 0x90(r30) -/* 8002AAD4 C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 8002AAD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002AADC 3C 00 43 30 */ lis r0, 0x4330 -/* 8002AAE0 90 01 00 30 */ stw r0, 0x30(r1) -/* 8002AAE4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 8002AAE8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8002AAEC C0 02 82 F8 */ lfs f0, lit_4691(r2) -/* 8002AAF0 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8002AAF4 EF E2 00 28 */ fsubs f31, f2, f0 -/* 8002AAF8 7F C3 F3 78 */ mr r3, r30 -/* 8002AAFC 38 80 00 2F */ li r4, 0x2f -/* 8002AB00 38 A0 00 32 */ li r5, 0x32 -/* 8002AB04 FC 20 F8 90 */ fmr f1, f31 -/* 8002AB08 4B FF EC A1 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002AB0C 7F C3 F3 78 */ mr r3, r30 -/* 8002AB10 38 80 00 21 */ li r4, 0x21 -/* 8002AB14 38 A0 00 2B */ li r5, 0x2b -/* 8002AB18 FC 20 F8 90 */ fmr f1, f31 -/* 8002AB1C 4B FF EC 8D */ bl setMapPaletteColorAlphaPer__6dMap_cFiif -/* 8002AB20 48 00 00 0C */ b lbl_8002AB2C -lbl_8002AB24: -/* 8002AB24 7F C3 F3 78 */ mr r3, r30 -/* 8002AB28 4B FF EC 25 */ bl copyPalette__6dMap_cFv -lbl_8002AB2C: -/* 8002AB2C 38 00 00 01 */ li r0, 1 -/* 8002AB30 98 1E 00 8D */ stb r0, 0x8d(r30) -/* 8002AB34 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8002AB38 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8002AB3C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8002AB40 48 33 76 E9 */ bl _restgpr_29 -/* 8002AB44 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8002AB48 7C 08 03 A6 */ mtlr r0 -/* 8002AB4C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8002AB50 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/_remove__6dMap_cFv.s b/asm/d/map/d_map/_remove__6dMap_cFv.s deleted file mode 100644 index ff3409ed9e..0000000000 --- a/asm/d/map/d_map/_remove__6dMap_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80029A1C: -/* 80029A1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80029A20 7C 08 02 A6 */ mflr r0 -/* 80029A24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029A28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80029A2C 7C 7F 1B 78 */ mr r31, r3 -/* 80029A30 80 63 00 4C */ lwz r3, 0x4c(r3) -/* 80029A34 28 03 00 00 */ cmplwi r3, 0 -/* 80029A38 41 82 00 10 */ beq lbl_80029A48 -/* 80029A3C 48 2A 53 25 */ bl __dla__FPv -/* 80029A40 38 00 00 00 */ li r0, 0 -/* 80029A44 90 1F 00 4C */ stw r0, 0x4c(r31) -lbl_80029A48: -/* 80029A48 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 80029A4C 28 03 00 00 */ cmplwi r3, 0 -/* 80029A50 41 82 00 10 */ beq lbl_80029A60 -/* 80029A54 48 2A 52 E9 */ bl __dl__FPv -/* 80029A58 38 00 00 00 */ li r0, 0 -/* 80029A5C 90 1F 00 48 */ stw r0, 0x48(r31) -lbl_80029A60: -/* 80029A60 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80029A64 28 03 00 00 */ cmplwi r3, 0 -/* 80029A68 41 82 00 10 */ beq lbl_80029A78 -/* 80029A6C 48 2A 52 D1 */ bl __dl__FPv -/* 80029A70 38 00 00 00 */ li r0, 0 -/* 80029A74 90 1F 00 44 */ stw r0, 0x44(r31) -lbl_80029A78: -/* 80029A78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80029A7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80029A80 7C 08 03 A6 */ mtlr r0 -/* 80029A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029A88 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/afterDrawPath__15renderingAmap_cFv.s b/asm/d/map/d_map/afterDrawPath__15renderingAmap_cFv.s deleted file mode 100644 index 9f672021f3..0000000000 --- a/asm/d/map/d_map/afterDrawPath__15renderingAmap_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800289D0: -/* 800289D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800289D4 7C 08 02 A6 */ mflr r0 -/* 800289D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800289DC 48 01 79 21 */ bl afterDrawPath__28renderingPlusDoorAndCursor_cFv -/* 800289E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800289E4 7C 08 03 A6 */ mtlr r0 -/* 800289E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800289EC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/beforeDrawPath__15renderingAmap_cFv.s b/asm/d/map/d_map/beforeDrawPath__15renderingAmap_cFv.s deleted file mode 100644 index 62804caa65..0000000000 --- a/asm/d/map/d_map/beforeDrawPath__15renderingAmap_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80028960: -/* 80028960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028964 7C 08 02 A6 */ mflr r0 -/* 80028968 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002896C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028970 7C 7F 1B 78 */ mr r31, r3 -/* 80028974 48 00 02 41 */ bl isDrawOutSideTrim__15renderingAmap_cFv -/* 80028978 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002897C 41 82 00 40 */ beq lbl_800289BC -/* 80028980 38 00 00 00 */ li r0, 0 -/* 80028984 90 1F 00 38 */ stw r0, 0x38(r31) -/* 80028988 7F E3 FB 78 */ mr r3, r31 -/* 8002898C 48 00 02 C1 */ bl getOutSideBlackLineNumber__15renderingAmap_cFv -lbl_80028990: -/* 80028990 7F E3 FB 78 */ mr r3, r31 -/* 80028994 81 9F 00 00 */ lwz r12, 0(r31) -/* 80028998 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8002899C 7D 89 03 A6 */ mtctr r12 -/* 800289A0 4E 80 04 21 */ bctrl -/* 800289A4 7F E3 FB 78 */ mr r3, r31 -/* 800289A8 48 00 02 B9 */ bl isOutSideBlackLine__15renderingAmap_cFv -/* 800289AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800289B0 40 82 FF E0 */ bne lbl_80028990 -/* 800289B4 38 00 00 02 */ li r0, 2 -/* 800289B8 90 1F 00 38 */ stw r0, 0x38(r31) -lbl_800289BC: -/* 800289BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800289C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800289C4 7C 08 03 A6 */ mtlr r0 -/* 800289C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800289CC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/calcMapCenterXZ__6dMap_cFiPfPf.s b/asm/d/map/d_map/calcMapCenterXZ__6dMap_cFiPfPf.s deleted file mode 100644 index 6ba0383bf1..0000000000 --- a/asm/d/map/d_map/calcMapCenterXZ__6dMap_cFiPfPf.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80029D78: -/* 80029D78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80029D7C 7C 08 02 A6 */ mflr r0 -/* 80029D80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80029D84 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80029D88 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80029D8C 7C BE 2B 78 */ mr r30, r5 -/* 80029D90 7C DF 33 78 */ mr r31, r6 -/* 80029D94 C0 62 82 E4 */ lfs f3, lit_4321(r2) -/* 80029D98 FC 00 18 90 */ fmr f0, f3 -/* 80029D9C 2C 04 00 00 */ cmpwi r4, 0 -/* 80029DA0 41 80 00 4C */ blt lbl_80029DEC -/* 80029DA4 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 80029DA8 D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80029DAC D0 61 00 0C */ stfs f3, 0xc(r1) -/* 80029DB0 D0 61 00 08 */ stfs f3, 8(r1) -/* 80029DB4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80029DB8 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80029DBC 38 E1 00 0C */ addi r7, r1, 0xc -/* 80029DC0 39 01 00 08 */ addi r8, r1, 8 -/* 80029DC4 4B FF FC C9 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf -/* 80029DC8 C0 42 82 A0 */ lfs f2, lit_3745(r2) -/* 80029DCC C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80029DD0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80029DD4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80029DD8 EC 62 00 32 */ fmuls f3, f2, f0 -/* 80029DDC C0 21 00 08 */ lfs f1, 8(r1) -/* 80029DE0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80029DE4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80029DE8 EC 02 00 32 */ fmuls f0, f2, f0 -lbl_80029DEC: -/* 80029DEC 28 1E 00 00 */ cmplwi r30, 0 -/* 80029DF0 41 82 00 08 */ beq lbl_80029DF8 -/* 80029DF4 D0 7E 00 00 */ stfs f3, 0(r30) -lbl_80029DF8: -/* 80029DF8 28 1F 00 00 */ cmplwi r31, 0 -/* 80029DFC 41 82 00 08 */ beq lbl_80029E04 -/* 80029E00 D0 1F 00 00 */ stfs f0, 0(r31) -lbl_80029E04: -/* 80029E04 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80029E08 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80029E0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80029E10 7C 08 03 A6 */ mtlr r0 -/* 80029E14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029E18 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/calcMapCmPerTexel__6dMap_cFiPf.s b/asm/d/map/d_map/calcMapCmPerTexel__6dMap_cFiPf.s deleted file mode 100644 index e00a1fdb02..0000000000 --- a/asm/d/map/d_map/calcMapCmPerTexel__6dMap_cFiPf.s +++ /dev/null @@ -1,98 +0,0 @@ -lbl_80029E1C: -/* 80029E1C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80029E20 7C 08 02 A6 */ mflr r0 -/* 80029E24 90 01 00 54 */ stw r0, 0x54(r1) -/* 80029E28 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80029E2C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80029E30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80029E34 48 33 83 A9 */ bl _savegpr_29 -/* 80029E38 7C 7D 1B 78 */ mr r29, r3 -/* 80029E3C 7C 9E 23 79 */ or. r30, r4, r4 -/* 80029E40 7C BF 2B 78 */ mr r31, r5 -/* 80029E44 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 80029E48 41 80 01 10 */ blt lbl_80029F58 -/* 80029E4C 4B FF F3 15 */ bl getStayType__15renderingAmap_cCFv -/* 80029E50 2C 03 00 00 */ cmpwi r3, 0 -/* 80029E54 40 82 00 AC */ bne lbl_80029F00 -/* 80029E58 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 80029E5C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80029E60 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80029E64 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80029E68 D0 01 00 08 */ stfs f0, 8(r1) -/* 80029E6C 7F A3 EB 78 */ mr r3, r29 -/* 80029E70 7F C4 F3 78 */ mr r4, r30 -/* 80029E74 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80029E78 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80029E7C 38 E1 00 0C */ addi r7, r1, 0xc -/* 80029E80 39 01 00 08 */ addi r8, r1, 8 -/* 80029E84 4B FF FC 09 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf -/* 80029E88 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80029E8C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80029E90 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80029E94 C0 21 00 08 */ lfs f1, 8(r1) -/* 80029E98 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80029E9C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80029EA0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80029EA4 4C 41 13 82 */ cror 2, 1, 2 -/* 80029EA8 40 82 00 0C */ bne lbl_80029EB4 -/* 80029EAC FC 60 10 90 */ fmr f3, f2 -/* 80029EB0 48 00 00 08 */ b lbl_80029EB8 -lbl_80029EB4: -/* 80029EB4 FC 60 00 90 */ fmr f3, f0 -lbl_80029EB8: -/* 80029EB8 A0 1D 00 7A */ lhz r0, 0x7a(r29) -/* 80029EBC C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 80029EC0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80029EC4 3C 80 43 30 */ lis r4, 0x4330 -/* 80029EC8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80029ECC C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80029ED0 EC 40 08 28 */ fsubs f2, f0, f1 -/* 80029ED4 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 80029ED8 38 03 00 04 */ addi r0, r3, 4 -/* 80029EDC C8 22 82 B8 */ lfd f1, lit_3751(r2) -/* 80029EE0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80029EE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80029EE8 90 81 00 20 */ stw r4, 0x20(r1) -/* 80029EEC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80029EF0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80029EF4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80029EF8 EC 03 00 24 */ fdivs f0, f3, f0 -/* 80029EFC 48 00 00 5C */ b lbl_80029F58 -lbl_80029F00: -/* 80029F00 C3 E2 82 E4 */ lfs f31, lit_4321(r2) -/* 80029F04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029F08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029F0C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 80029F10 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80029F14 7D 89 03 A6 */ mtctr r12 -/* 80029F18 4E 80 04 21 */ bctrl -/* 80029F1C 28 03 00 00 */ cmplwi r3, 0 -/* 80029F20 41 82 00 08 */ beq lbl_80029F28 -/* 80029F24 C3 E3 00 20 */ lfs f31, 0x20(r3) -lbl_80029F28: -/* 80029F28 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 80029F2C FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80029F30 40 82 00 08 */ bne lbl_80029F38 -/* 80029F34 C3 E2 82 E8 */ lfs f31, lit_4503(r2) -lbl_80029F38: -/* 80029F38 A0 1D 00 7A */ lhz r0, 0x7a(r29) -/* 80029F3C C8 22 82 B0 */ lfd f1, lit_3749(r2) -/* 80029F40 90 01 00 24 */ stw r0, 0x24(r1) -/* 80029F44 3C 00 43 30 */ lis r0, 0x4330 -/* 80029F48 90 01 00 20 */ stw r0, 0x20(r1) -/* 80029F4C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80029F50 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80029F54 EC 1F 00 24 */ fdivs f0, f31, f0 -lbl_80029F58: -/* 80029F58 28 1F 00 00 */ cmplwi r31, 0 -/* 80029F5C 41 82 00 08 */ beq lbl_80029F64 -/* 80029F60 D0 1F 00 00 */ stfs f0, 0(r31) -lbl_80029F64: -/* 80029F64 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80029F68 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80029F6C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80029F70 48 33 82 B9 */ bl _restgpr_29 -/* 80029F74 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80029F78 7C 08 03 A6 */ mtlr r0 -/* 80029F7C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80029F80 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/copyPalette__6dMap_cFiif.s b/asm/d/map/d_map/copyPalette__6dMap_cFiif.s deleted file mode 100644 index b5f5637e0c..0000000000 --- a/asm/d/map/d_map/copyPalette__6dMap_cFiif.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8002A064: -/* 8002A064 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002A068 7C 08 02 A6 */ mflr r0 -/* 8002A06C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002A070 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 8002A074 54 87 18 38 */ slwi r7, r4, 3 -/* 8002A078 7D 20 3A 14 */ add r9, r0, r7 -/* 8002A07C 80 63 00 40 */ lwz r3, 0x40(r3) -/* 8002A080 54 A0 18 38 */ slwi r0, r5, 3 -/* 8002A084 7C 63 02 2E */ lhzx r3, r3, r0 -/* 8002A088 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 8002A08C 41 82 00 18 */ beq lbl_8002A0A4 -/* 8002A090 54 66 CE 38 */ rlwinm r6, r3, 0x19, 0x18, 0x1c -/* 8002A094 54 65 F6 38 */ rlwinm r5, r3, 0x1e, 0x18, 0x1c -/* 8002A098 54 64 1E 38 */ rlwinm r4, r3, 3, 0x18, 0x1c -/* 8002A09C 38 00 00 FF */ li r0, 0xff -/* 8002A0A0 48 00 00 14 */ b lbl_8002A0B4 -lbl_8002A0A4: -/* 8002A0A4 54 66 E6 36 */ rlwinm r6, r3, 0x1c, 0x18, 0x1b -/* 8002A0A8 54 65 06 36 */ rlwinm r5, r3, 0, 0x18, 0x1b -/* 8002A0AC 54 64 26 36 */ rlwinm r4, r3, 4, 0x18, 0x1b -/* 8002A0B0 54 60 CE 34 */ rlwinm r0, r3, 0x19, 0x18, 0x1a -lbl_8002A0B4: -/* 8002A0B4 54 C6 06 3E */ clrlwi r6, r6, 0x18 -/* 8002A0B8 54 A8 06 3E */ clrlwi r8, r5, 0x18 -/* 8002A0BC 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8002A0C0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8002A0C4 C8 42 82 B0 */ lfd f2, lit_3749(r2) -/* 8002A0C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8002A0CC 3C 00 43 30 */ lis r0, 0x4330 -/* 8002A0D0 90 01 00 08 */ stw r0, 8(r1) -/* 8002A0D4 C8 01 00 08 */ lfd f0, 8(r1) -/* 8002A0D8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8002A0DC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8002A0E0 FC 00 00 1E */ fctiwz f0, f0 -/* 8002A0E4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8002A0E8 80 61 00 14 */ lwz r3, 0x14(r1) -/* 8002A0EC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002A0F0 28 00 00 E0 */ cmplwi r0, 0xe0 -/* 8002A0F4 54 A0 06 36 */ rlwinm r0, r5, 0, 0x18, 0x1b -/* 8002A0F8 50 C0 25 2E */ rlwimi r0, r6, 4, 0x14, 0x17 -/* 8002A0FC 50 80 E7 3E */ rlwimi r0, r4, 0x1c, 0x1c, 0x1f -/* 8002A100 50 60 3C 66 */ rlwimi r0, r3, 7, 0x11, 0x13 -/* 8002A104 41 80 00 14 */ blt lbl_8002A118 -/* 8002A108 55 00 15 B4 */ rlwinm r0, r8, 2, 0x16, 0x1a -/* 8002A10C 50 C0 3C 6A */ rlwimi r0, r6, 7, 0x11, 0x15 -/* 8002A110 50 80 EE FE */ rlwimi r0, r4, 0x1d, 0x1b, 0x1f -/* 8002A114 60 00 80 00 */ ori r0, r0, 0x8000 -lbl_8002A118: -/* 8002A118 B0 09 00 00 */ sth r0, 0(r9) -/* 8002A11C B0 09 00 02 */ sth r0, 2(r9) -/* 8002A120 B0 09 00 04 */ sth r0, 4(r9) -/* 8002A124 B0 09 00 06 */ sth r0, 6(r9) -/* 8002A128 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 8002A12C 7C 60 3A 14 */ add r3, r0, r7 -/* 8002A130 38 80 00 08 */ li r4, 8 -/* 8002A134 48 31 14 A9 */ bl DCStoreRange -/* 8002A138 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002A13C 7C 08 03 A6 */ mtlr r0 -/* 8002A140 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002A144 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/copyPalette__6dMap_cFv.s b/asm/d/map/d_map/copyPalette__6dMap_cFv.s deleted file mode 100644 index fe16cd9d27..0000000000 --- a/asm/d/map/d_map/copyPalette__6dMap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8002974C: -/* 8002974C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80029750 7C 08 02 A6 */ mflr r0 -/* 80029754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029758 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002975C 7C 7F 1B 78 */ mr r31, r3 -/* 80029760 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80029764 80 9F 00 40 */ lwz r4, 0x40(r31) -/* 80029768 38 A0 01 98 */ li r5, 0x198 -/* 8002976C 48 24 61 D1 */ bl cLib_memCpy__FPvPCvUl -/* 80029770 7F E3 FB 78 */ mr r3, r31 -/* 80029774 4B FF F9 ED */ bl getStayType__15renderingAmap_cCFv -/* 80029778 2C 03 00 00 */ cmpwi r3, 0 -/* 8002977C 40 82 00 18 */ bne lbl_80029794 -/* 80029780 7F E3 FB 78 */ mr r3, r31 -/* 80029784 38 80 00 01 */ li r4, 1 -/* 80029788 38 A0 00 2C */ li r5, 0x2c -/* 8002978C C0 22 82 E0 */ lfs f1, lit_4284(r2) -/* 80029790 48 00 08 D5 */ bl copyPalette__6dMap_cFiif -lbl_80029794: -/* 80029794 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80029798 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002979C 7C 08 03 A6 */ mtlr r0 -/* 800297A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800297A4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/drawPath__15renderingAmap_cFv.s b/asm/d/map/d_map/drawPath__15renderingAmap_cFv.s deleted file mode 100644 index 7847df1cbb..0000000000 --- a/asm/d/map/d_map/drawPath__15renderingAmap_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80028A10: -/* 80028A10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028A14 7C 08 02 A6 */ mflr r0 -/* 80028A18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028A1C 48 01 42 A9 */ bl drawPath__11dDrawPath_cFv -/* 80028A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028A24 7C 08 03 A6 */ mtlr r0 -/* 80028A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028A2C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/draw__15renderingAmap_cFv.s b/asm/d/map/d_map/draw__15renderingAmap_cFv.s deleted file mode 100644 index 1755b1c6d4..0000000000 --- a/asm/d/map/d_map/draw__15renderingAmap_cFv.s +++ /dev/null @@ -1,254 +0,0 @@ -lbl_800284D0: -/* 800284D0 94 21 FE C0 */ stwu r1, -0x140(r1) -/* 800284D4 7C 08 02 A6 */ mflr r0 -/* 800284D8 90 01 01 44 */ stw r0, 0x144(r1) -/* 800284DC 93 E1 01 3C */ stw r31, 0x13c(r1) -/* 800284E0 7C 7F 1B 78 */ mr r31, r3 -/* 800284E4 80 8D 88 00 */ lwz r4, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 800284E8 A8 C4 01 AA */ lha r6, 0x1aa(r4) -/* 800284EC 3C A0 80 43 */ lis r5, g_Counter@ha /* 0x80430CD8@ha */ -/* 800284F0 38 A5 0C D8 */ addi r5, r5, g_Counter@l /* 0x80430CD8@l */ -/* 800284F4 80 A5 00 00 */ lwz r5, 0(r5) -/* 800284F8 7C 05 33 96 */ divwu r0, r5, r6 -/* 800284FC 7C 00 31 D6 */ mullw r0, r0, r6 -/* 80028500 7C 00 28 50 */ subf r0, r0, r5 -/* 80028504 C8 02 82 B0 */ lfd f0, lit_3749(r2) -/* 80028508 90 01 00 0C */ stw r0, 0xc(r1) -/* 8002850C 3D 00 43 30 */ lis r8, 0x4330 -/* 80028510 91 01 00 08 */ stw r8, 8(r1) -/* 80028514 C8 21 00 08 */ lfd f1, 8(r1) -/* 80028518 EC 61 00 28 */ fsubs f3, f1, f0 -/* 8002851C C8 42 82 B8 */ lfd f2, lit_3751(r2) -/* 80028520 6C C0 80 00 */ xoris r0, r6, 0x8000 -/* 80028524 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028528 91 01 00 10 */ stw r8, 0x10(r1) -/* 8002852C C8 21 00 10 */ lfd f1, 0x10(r1) -/* 80028530 EC 21 10 28 */ fsubs f1, f1, f2 -/* 80028534 EC 43 08 24 */ fdivs f2, f3, f1 -/* 80028538 C0 62 82 A0 */ lfs f3, lit_3745(r2) -/* 8002853C C0 22 82 A4 */ lfs f1, lit_3746(r2) -/* 80028540 EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028544 C0 22 82 A8 */ lfs f1, lit_3747(r2) -/* 80028548 EC 22 08 28 */ fsubs f1, f2, f1 -/* 8002854C FC 20 08 1E */ fctiwz f1, f1 -/* 80028550 D8 21 00 18 */ stfd f1, 0x18(r1) -/* 80028554 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80028558 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8002855C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80028560 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80028564 7C 25 04 2E */ lfsx f1, r5, r0 -/* 80028568 EC 23 00 72 */ fmuls f1, f3, f1 -/* 8002856C EC 23 08 2A */ fadds f1, f3, f1 -/* 80028570 88 A4 01 98 */ lbz r5, 0x198(r4) -/* 80028574 90 A1 00 24 */ stw r5, 0x24(r1) -/* 80028578 91 01 00 20 */ stw r8, 0x20(r1) -/* 8002857C C8 41 00 20 */ lfd f2, 0x20(r1) -/* 80028580 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028584 88 04 01 9C */ lbz r0, 0x19c(r4) -/* 80028588 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8002858C 91 01 00 28 */ stw r8, 0x28(r1) -/* 80028590 C8 41 00 28 */ lfd f2, 0x28(r1) -/* 80028594 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028598 90 A1 00 34 */ stw r5, 0x34(r1) -/* 8002859C 91 01 00 30 */ stw r8, 0x30(r1) -/* 800285A0 C8 41 00 30 */ lfd f2, 0x30(r1) -/* 800285A4 EC 42 00 28 */ fsubs f2, f2, f0 -/* 800285A8 EC 43 10 28 */ fsubs f2, f3, f2 -/* 800285AC EC 41 00 B2 */ fmuls f2, f1, f2 -/* 800285B0 EC 44 10 2A */ fadds f2, f4, f2 -/* 800285B4 FC 40 10 1E */ fctiwz f2, f2 -/* 800285B8 D8 41 00 38 */ stfd f2, 0x38(r1) -/* 800285BC 80 A1 00 3C */ lwz r5, 0x3c(r1) -/* 800285C0 88 C4 01 99 */ lbz r6, 0x199(r4) -/* 800285C4 90 C1 00 44 */ stw r6, 0x44(r1) -/* 800285C8 91 01 00 40 */ stw r8, 0x40(r1) -/* 800285CC C8 41 00 40 */ lfd f2, 0x40(r1) -/* 800285D0 EC 82 00 28 */ fsubs f4, f2, f0 -/* 800285D4 88 04 01 9D */ lbz r0, 0x19d(r4) -/* 800285D8 90 01 00 4C */ stw r0, 0x4c(r1) -/* 800285DC 91 01 00 48 */ stw r8, 0x48(r1) -/* 800285E0 C8 41 00 48 */ lfd f2, 0x48(r1) -/* 800285E4 EC 62 00 28 */ fsubs f3, f2, f0 -/* 800285E8 90 C1 00 54 */ stw r6, 0x54(r1) -/* 800285EC 91 01 00 50 */ stw r8, 0x50(r1) -/* 800285F0 C8 41 00 50 */ lfd f2, 0x50(r1) -/* 800285F4 EC 42 00 28 */ fsubs f2, f2, f0 -/* 800285F8 EC 43 10 28 */ fsubs f2, f3, f2 -/* 800285FC EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028600 EC 44 10 2A */ fadds f2, f4, f2 -/* 80028604 FC 40 10 1E */ fctiwz f2, f2 -/* 80028608 D8 41 00 58 */ stfd f2, 0x58(r1) -/* 8002860C 80 C1 00 5C */ lwz r6, 0x5c(r1) -/* 80028610 88 E4 01 9A */ lbz r7, 0x19a(r4) -/* 80028614 90 E1 00 64 */ stw r7, 0x64(r1) -/* 80028618 91 01 00 60 */ stw r8, 0x60(r1) -/* 8002861C C8 41 00 60 */ lfd f2, 0x60(r1) -/* 80028620 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028624 88 04 01 9E */ lbz r0, 0x19e(r4) -/* 80028628 90 01 00 6C */ stw r0, 0x6c(r1) -/* 8002862C 91 01 00 68 */ stw r8, 0x68(r1) -/* 80028630 C8 41 00 68 */ lfd f2, 0x68(r1) -/* 80028634 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028638 90 E1 00 74 */ stw r7, 0x74(r1) -/* 8002863C 91 01 00 70 */ stw r8, 0x70(r1) -/* 80028640 C8 41 00 70 */ lfd f2, 0x70(r1) -/* 80028644 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80028648 EC 43 10 28 */ fsubs f2, f3, f2 -/* 8002864C EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028650 EC 44 10 2A */ fadds f2, f4, f2 -/* 80028654 FC 40 10 1E */ fctiwz f2, f2 -/* 80028658 D8 41 00 78 */ stfd f2, 0x78(r1) -/* 8002865C 80 E1 00 7C */ lwz r7, 0x7c(r1) -/* 80028660 89 24 01 9B */ lbz r9, 0x19b(r4) -/* 80028664 91 21 00 84 */ stw r9, 0x84(r1) -/* 80028668 91 01 00 80 */ stw r8, 0x80(r1) -/* 8002866C C8 41 00 80 */ lfd f2, 0x80(r1) -/* 80028670 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028674 88 04 01 9F */ lbz r0, 0x19f(r4) -/* 80028678 90 01 00 8C */ stw r0, 0x8c(r1) -/* 8002867C 91 01 00 88 */ stw r8, 0x88(r1) -/* 80028680 C8 41 00 88 */ lfd f2, 0x88(r1) -/* 80028684 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028688 91 21 00 94 */ stw r9, 0x94(r1) -/* 8002868C 91 01 00 90 */ stw r8, 0x90(r1) -/* 80028690 C8 41 00 90 */ lfd f2, 0x90(r1) -/* 80028694 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80028698 EC 03 00 28 */ fsubs f0, f3, f0 -/* 8002869C EC 01 00 32 */ fmuls f0, f1, f0 -/* 800286A0 EC 04 00 2A */ fadds f0, f4, f0 -/* 800286A4 FC 00 00 1E */ fctiwz f0, f0 -/* 800286A8 D8 01 00 98 */ stfd f0, 0x98(r1) -/* 800286AC 81 01 00 9C */ lwz r8, 0x9c(r1) -/* 800286B0 38 80 00 2D */ li r4, 0x2d -/* 800286B4 81 83 00 00 */ lwz r12, 0(r3) -/* 800286B8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800286BC 7D 89 03 A6 */ mtctr r12 -/* 800286C0 4E 80 04 21 */ bctrl -/* 800286C4 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 800286C8 A8 A3 01 AC */ lha r5, 0x1ac(r3) -/* 800286CC 3C 80 80 43 */ lis r4, g_Counter@ha /* 0x80430CD8@ha */ -/* 800286D0 38 84 0C D8 */ addi r4, r4, g_Counter@l /* 0x80430CD8@l */ -/* 800286D4 80 84 00 00 */ lwz r4, 0(r4) -/* 800286D8 7C 04 2B 96 */ divwu r0, r4, r5 -/* 800286DC 7C 00 29 D6 */ mullw r0, r0, r5 -/* 800286E0 7C 00 20 50 */ subf r0, r0, r4 -/* 800286E4 C8 02 82 B0 */ lfd f0, lit_3749(r2) -/* 800286E8 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 800286EC 3D 00 43 30 */ lis r8, 0x4330 -/* 800286F0 91 01 00 A0 */ stw r8, 0xa0(r1) -/* 800286F4 C8 21 00 A0 */ lfd f1, 0xa0(r1) -/* 800286F8 EC 61 00 28 */ fsubs f3, f1, f0 -/* 800286FC C8 42 82 B8 */ lfd f2, lit_3751(r2) -/* 80028700 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 80028704 90 01 00 AC */ stw r0, 0xac(r1) -/* 80028708 91 01 00 A8 */ stw r8, 0xa8(r1) -/* 8002870C C8 21 00 A8 */ lfd f1, 0xa8(r1) -/* 80028710 EC 21 10 28 */ fsubs f1, f1, f2 -/* 80028714 EC 43 08 24 */ fdivs f2, f3, f1 -/* 80028718 C0 62 82 A0 */ lfs f3, lit_3745(r2) -/* 8002871C C0 22 82 A4 */ lfs f1, lit_3746(r2) -/* 80028720 EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028724 C0 22 82 A8 */ lfs f1, lit_3747(r2) -/* 80028728 EC 22 08 28 */ fsubs f1, f2, f1 -/* 8002872C FC 20 08 1E */ fctiwz f1, f1 -/* 80028730 D8 21 00 B0 */ stfd f1, 0xb0(r1) -/* 80028734 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 80028738 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8002873C 3C 80 80 44 */ lis r4, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80028740 38 84 9A 20 */ addi r4, r4, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80028744 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80028748 EC 23 00 72 */ fmuls f1, f3, f1 -/* 8002874C EC 23 08 2A */ fadds f1, f3, f1 -/* 80028750 88 83 01 A0 */ lbz r4, 0x1a0(r3) -/* 80028754 90 81 00 BC */ stw r4, 0xbc(r1) -/* 80028758 91 01 00 B8 */ stw r8, 0xb8(r1) -/* 8002875C C8 41 00 B8 */ lfd f2, 0xb8(r1) -/* 80028760 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028764 88 03 01 A4 */ lbz r0, 0x1a4(r3) -/* 80028768 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 8002876C 91 01 00 C0 */ stw r8, 0xc0(r1) -/* 80028770 C8 41 00 C0 */ lfd f2, 0xc0(r1) -/* 80028774 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028778 90 81 00 CC */ stw r4, 0xcc(r1) -/* 8002877C 91 01 00 C8 */ stw r8, 0xc8(r1) -/* 80028780 C8 41 00 C8 */ lfd f2, 0xc8(r1) -/* 80028784 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80028788 EC 43 10 28 */ fsubs f2, f3, f2 -/* 8002878C EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028790 EC 44 10 2A */ fadds f2, f4, f2 -/* 80028794 FC 40 10 1E */ fctiwz f2, f2 -/* 80028798 D8 41 00 D0 */ stfd f2, 0xd0(r1) -/* 8002879C 80 A1 00 D4 */ lwz r5, 0xd4(r1) -/* 800287A0 88 83 01 A1 */ lbz r4, 0x1a1(r3) -/* 800287A4 90 81 00 DC */ stw r4, 0xdc(r1) -/* 800287A8 91 01 00 D8 */ stw r8, 0xd8(r1) -/* 800287AC C8 41 00 D8 */ lfd f2, 0xd8(r1) -/* 800287B0 EC 82 00 28 */ fsubs f4, f2, f0 -/* 800287B4 88 03 01 A5 */ lbz r0, 0x1a5(r3) -/* 800287B8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 800287BC 91 01 00 E0 */ stw r8, 0xe0(r1) -/* 800287C0 C8 41 00 E0 */ lfd f2, 0xe0(r1) -/* 800287C4 EC 62 00 28 */ fsubs f3, f2, f0 -/* 800287C8 90 81 00 EC */ stw r4, 0xec(r1) -/* 800287CC 91 01 00 E8 */ stw r8, 0xe8(r1) -/* 800287D0 C8 41 00 E8 */ lfd f2, 0xe8(r1) -/* 800287D4 EC 42 00 28 */ fsubs f2, f2, f0 -/* 800287D8 EC 43 10 28 */ fsubs f2, f3, f2 -/* 800287DC EC 41 00 B2 */ fmuls f2, f1, f2 -/* 800287E0 EC 44 10 2A */ fadds f2, f4, f2 -/* 800287E4 FC 40 10 1E */ fctiwz f2, f2 -/* 800287E8 D8 41 00 F0 */ stfd f2, 0xf0(r1) -/* 800287EC 80 C1 00 F4 */ lwz r6, 0xf4(r1) -/* 800287F0 88 83 01 A2 */ lbz r4, 0x1a2(r3) -/* 800287F4 90 81 00 FC */ stw r4, 0xfc(r1) -/* 800287F8 91 01 00 F8 */ stw r8, 0xf8(r1) -/* 800287FC C8 41 00 F8 */ lfd f2, 0xf8(r1) -/* 80028800 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028804 88 03 01 A6 */ lbz r0, 0x1a6(r3) -/* 80028808 90 01 01 04 */ stw r0, 0x104(r1) -/* 8002880C 91 01 01 00 */ stw r8, 0x100(r1) -/* 80028810 C8 41 01 00 */ lfd f2, 0x100(r1) -/* 80028814 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028818 90 81 01 0C */ stw r4, 0x10c(r1) -/* 8002881C 91 01 01 08 */ stw r8, 0x108(r1) -/* 80028820 C8 41 01 08 */ lfd f2, 0x108(r1) -/* 80028824 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80028828 EC 43 10 28 */ fsubs f2, f3, f2 -/* 8002882C EC 41 00 B2 */ fmuls f2, f1, f2 -/* 80028830 EC 44 10 2A */ fadds f2, f4, f2 -/* 80028834 FC 40 10 1E */ fctiwz f2, f2 -/* 80028838 D8 41 01 10 */ stfd f2, 0x110(r1) -/* 8002883C 80 E1 01 14 */ lwz r7, 0x114(r1) -/* 80028840 88 83 01 A3 */ lbz r4, 0x1a3(r3) -/* 80028844 90 81 01 1C */ stw r4, 0x11c(r1) -/* 80028848 91 01 01 18 */ stw r8, 0x118(r1) -/* 8002884C C8 41 01 18 */ lfd f2, 0x118(r1) -/* 80028850 EC 82 00 28 */ fsubs f4, f2, f0 -/* 80028854 88 03 01 A7 */ lbz r0, 0x1a7(r3) -/* 80028858 90 01 01 24 */ stw r0, 0x124(r1) -/* 8002885C 91 01 01 20 */ stw r8, 0x120(r1) -/* 80028860 C8 41 01 20 */ lfd f2, 0x120(r1) -/* 80028864 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80028868 90 81 01 2C */ stw r4, 0x12c(r1) -/* 8002886C 91 01 01 28 */ stw r8, 0x128(r1) -/* 80028870 C8 41 01 28 */ lfd f2, 0x128(r1) -/* 80028874 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80028878 EC 03 00 28 */ fsubs f0, f3, f0 -/* 8002887C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80028880 EC 04 00 2A */ fadds f0, f4, f0 -/* 80028884 FC 00 00 1E */ fctiwz f0, f0 -/* 80028888 D8 01 01 30 */ stfd f0, 0x130(r1) -/* 8002888C 81 01 01 34 */ lwz r8, 0x134(r1) -/* 80028890 7F E3 FB 78 */ mr r3, r31 -/* 80028894 38 80 00 2E */ li r4, 0x2e -/* 80028898 81 9F 00 00 */ lwz r12, 0(r31) -/* 8002889C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800288A0 7D 89 03 A6 */ mtctr r12 -/* 800288A4 4E 80 04 21 */ bctrl -/* 800288A8 7F E3 FB 78 */ mr r3, r31 -/* 800288AC 48 01 75 6D */ bl draw__16renderingDAmap_cFv -/* 800288B0 83 E1 01 3C */ lwz r31, 0x13c(r1) -/* 800288B4 80 01 01 44 */ lwz r0, 0x144(r1) -/* 800288B8 7C 08 03 A6 */ mtlr r0 -/* 800288BC 38 21 01 40 */ addi r1, r1, 0x140 -/* 800288C0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getColor__6dMap_cFi.s b/asm/d/map/d_map/getColor__6dMap_cFi.s deleted file mode 100644 index 4dfde3b545..0000000000 --- a/asm/d/map/d_map/getColor__6dMap_cFi.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80028DF4: -/* 80028DF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80028DF8 7C 08 02 A6 */ mflr r0 -/* 80028DFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80028E00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028E04 48 33 93 D9 */ bl _savegpr_29 -/* 80028E08 7C 9D 23 78 */ mr r29, r4 -/* 80028E0C 3C 80 80 38 */ lis r4, l_iconSize@ha /* 0x80378E48@ha */ -/* 80028E10 3B E4 8E 48 */ addi r31, r4, l_iconSize@l /* 0x80378E48@l */ -/* 80028E14 3B DF 00 44 */ addi r30, r31, 0x44 -/* 80028E18 88 03 00 8E */ lbz r0, 0x8e(r3) -/* 80028E1C 28 00 00 02 */ cmplwi r0, 2 -/* 80028E20 40 82 00 78 */ bne lbl_80028E98 -/* 80028E24 88 03 00 8F */ lbz r0, 0x8f(r3) -/* 80028E28 28 00 00 00 */ cmplwi r0, 0 -/* 80028E2C 41 82 00 6C */ beq lbl_80028E98 -/* 80028E30 28 00 00 06 */ cmplwi r0, 6 -/* 80028E34 40 80 00 64 */ bge lbl_80028E98 -/* 80028E38 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80028E3C 80 83 00 88 */ lwz r4, 0x88(r3) -/* 80028E40 7C 00 20 00 */ cmpw r0, r4 -/* 80028E44 40 82 00 2C */ bne lbl_80028E70 -/* 80028E48 80 A3 00 24 */ lwz r5, 0x24(r3) -/* 80028E4C 7C 05 20 00 */ cmpw r5, r4 -/* 80028E50 40 82 00 0C */ bne lbl_80028E5C -/* 80028E54 3B DF 00 8C */ addi r30, r31, 0x8c -/* 80028E58 48 00 00 6C */ b lbl_80028EC4 -lbl_80028E5C: -/* 80028E5C 80 03 00 84 */ lwz r0, 0x84(r3) -/* 80028E60 7C 05 00 00 */ cmpw r5, r0 -/* 80028E64 40 82 00 60 */ bne lbl_80028EC4 -/* 80028E68 3B DF 00 68 */ addi r30, r31, 0x68 -/* 80028E6C 48 00 00 58 */ b lbl_80028EC4 -lbl_80028E70: -/* 80028E70 80 A3 00 24 */ lwz r5, 0x24(r3) -/* 80028E74 7C 05 20 00 */ cmpw r5, r4 -/* 80028E78 40 82 00 0C */ bne lbl_80028E84 -/* 80028E7C 3B DF 00 68 */ addi r30, r31, 0x68 -/* 80028E80 48 00 00 44 */ b lbl_80028EC4 -lbl_80028E84: -/* 80028E84 80 03 00 84 */ lwz r0, 0x84(r3) -/* 80028E88 7C 05 00 00 */ cmpw r5, r0 -/* 80028E8C 40 82 00 38 */ bne lbl_80028EC4 -/* 80028E90 3B DF 00 8C */ addi r30, r31, 0x8c -/* 80028E94 48 00 00 30 */ b lbl_80028EC4 -lbl_80028E98: -/* 80028E98 80 83 00 24 */ lwz r4, 0x24(r3) -/* 80028E9C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80028EA0 7C 04 00 00 */ cmpw r4, r0 -/* 80028EA4 40 82 00 0C */ bne lbl_80028EB0 -/* 80028EA8 3B DF 00 8C */ addi r30, r31, 0x8c -/* 80028EAC 48 00 00 18 */ b lbl_80028EC4 -lbl_80028EB0: -/* 80028EB0 7C 83 23 78 */ mr r3, r4 -/* 80028EB4 48 01 5E 5D */ bl isVisitedRoom__10dMapInfo_nFi -/* 80028EB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028EBC 41 82 00 08 */ beq lbl_80028EC4 -/* 80028EC0 3B DF 00 68 */ addi r30, r31, 0x68 -lbl_80028EC4: -/* 80028EC4 57 A0 10 3A */ slwi r0, r29, 2 -/* 80028EC8 7C 7E 02 14 */ add r3, r30, r0 -/* 80028ECC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028ED0 48 33 93 59 */ bl _restgpr_29 -/* 80028ED4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80028ED8 7C 08 03 A6 */ mtlr r0 -/* 80028EDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80028EE0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getDecoLineColor__15renderingAmap_cFii.s b/asm/d/map/d_map/getDecoLineColor__15renderingAmap_cFii.s deleted file mode 100644 index 77231281d7..0000000000 --- a/asm/d/map/d_map/getDecoLineColor__15renderingAmap_cFii.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80028FB4: -/* 80028FB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80028FB8 7C 08 02 A6 */ mflr r0 -/* 80028FBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80028FC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028FC4 48 33 92 19 */ bl _savegpr_29 -/* 80028FC8 7C 7D 1B 78 */ mr r29, r3 -/* 80028FCC 7C 9E 23 78 */ mr r30, r4 -/* 80028FD0 7C BF 2B 78 */ mr r31, r5 -/* 80028FD4 4B FF FB E1 */ bl isDrawOutSideTrim__15renderingAmap_cFv -/* 80028FD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028FDC 41 82 00 28 */ beq lbl_80029004 -/* 80028FE0 80 1D 00 38 */ lwz r0, 0x38(r29) -/* 80028FE4 2C 00 00 02 */ cmpwi r0, 2 -/* 80028FE8 41 82 00 1C */ beq lbl_80029004 -/* 80028FEC 80 1D 00 34 */ lwz r0, 0x34(r29) -/* 80028FF0 54 04 10 3A */ slwi r4, r0, 2 -/* 80028FF4 3C 60 80 38 */ lis r3, colorTable@ha /* 0x80378EF8@ha */ -/* 80028FF8 38 03 8E F8 */ addi r0, r3, colorTable@l /* 0x80378EF8@l */ -/* 80028FFC 7C 60 22 14 */ add r3, r0, r4 -/* 80029000 48 00 00 20 */ b lbl_80029020 -lbl_80029004: -/* 80029004 7F A3 EB 78 */ mr r3, r29 -/* 80029008 7F C4 F3 78 */ mr r4, r30 -/* 8002900C 7F E5 FB 78 */ mr r5, r31 -/* 80029010 81 9D 00 00 */ lwz r12, 0(r29) -/* 80029014 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80029018 7D 89 03 A6 */ mtctr r12 -/* 8002901C 4E 80 04 21 */ bctrl -lbl_80029020: -/* 80029020 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029024 48 33 92 05 */ bl _restgpr_29 -/* 80029028 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002902C 7C 08 03 A6 */ mtlr r0 -/* 80029030 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029034 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getDecorationLineWidth__15renderingAmap_cFi.s b/asm/d/map/d_map/getDecorationLineWidth__15renderingAmap_cFi.s deleted file mode 100644 index b8fe2051b8..0000000000 --- a/asm/d/map/d_map/getDecorationLineWidth__15renderingAmap_cFi.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80028CF4: -/* 80028CF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028CF8 7C 08 02 A6 */ mflr r0 -/* 80028CFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028D00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028D04 3B E0 00 00 */ li r31, 0 -/* 80028D08 2C 04 00 04 */ cmpwi r4, 4 -/* 80028D0C 40 82 00 3C */ bne lbl_80028D48 -/* 80028D10 80 03 00 3C */ lwz r0, 0x3c(r3) -/* 80028D14 2C 00 00 01 */ cmpwi r0, 1 -/* 80028D18 41 82 00 20 */ beq lbl_80028D38 -/* 80028D1C 40 80 00 24 */ bge lbl_80028D40 -/* 80028D20 2C 00 00 00 */ cmpwi r0, 0 -/* 80028D24 40 80 00 08 */ bge lbl_80028D2C -/* 80028D28 48 00 00 18 */ b lbl_80028D40 -lbl_80028D2C: -/* 80028D2C 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D30 8B E3 01 A8 */ lbz r31, 0x1a8(r3) -/* 80028D34 48 00 00 0C */ b lbl_80028D40 -lbl_80028D38: -/* 80028D38 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D3C 8B E3 01 A9 */ lbz r31, 0x1a9(r3) -lbl_80028D40: -/* 80028D40 7F E3 FB 78 */ mr r3, r31 -/* 80028D44 48 00 00 7C */ b lbl_80028DC0 -lbl_80028D48: -/* 80028D48 80 03 00 34 */ lwz r0, 0x34(r3) -/* 80028D4C 2C 00 00 02 */ cmpwi r0, 2 -/* 80028D50 41 82 00 3C */ beq lbl_80028D8C -/* 80028D54 40 80 00 14 */ bge lbl_80028D68 -/* 80028D58 2C 00 00 00 */ cmpwi r0, 0 -/* 80028D5C 41 82 00 18 */ beq lbl_80028D74 -/* 80028D60 40 80 00 20 */ bge lbl_80028D80 -/* 80028D64 48 00 00 3C */ b lbl_80028DA0 -lbl_80028D68: -/* 80028D68 2C 00 00 04 */ cmpwi r0, 4 -/* 80028D6C 40 80 00 34 */ bge lbl_80028DA0 -/* 80028D70 48 00 00 28 */ b lbl_80028D98 -lbl_80028D74: -/* 80028D74 80 AD 88 00 */ lwz r5, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D78 AB E5 01 B0 */ lha r31, 0x1b0(r5) -/* 80028D7C 48 00 00 24 */ b lbl_80028DA0 -lbl_80028D80: -/* 80028D80 80 AD 88 00 */ lwz r5, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D84 AB E5 01 B2 */ lha r31, 0x1b2(r5) -/* 80028D88 48 00 00 18 */ b lbl_80028DA0 -lbl_80028D8C: -/* 80028D8C 80 AD 88 00 */ lwz r5, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D90 AB E5 01 B4 */ lha r31, 0x1b4(r5) -/* 80028D94 48 00 00 0C */ b lbl_80028DA0 -lbl_80028D98: -/* 80028D98 80 AD 88 00 */ lwz r5, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028D9C AB E5 01 B6 */ lha r31, 0x1b6(r5) -lbl_80028DA0: -/* 80028DA0 2C 1F 00 00 */ cmpwi r31, 0 -/* 80028DA4 40 81 00 18 */ ble lbl_80028DBC -/* 80028DA8 4B FF FE E9 */ bl getLineWidthSub__15renderingAmap_cFi -/* 80028DAC 7F FF 1A 14 */ add r31, r31, r3 -/* 80028DB0 2C 1F 00 FF */ cmpwi r31, 0xff -/* 80028DB4 40 81 00 08 */ ble lbl_80028DBC -/* 80028DB8 3B E0 00 FF */ li r31, 0xff -lbl_80028DBC: -/* 80028DBC 7F E3 FB 78 */ mr r3, r31 -lbl_80028DC0: -/* 80028DC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028DC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028DC8 7C 08 03 A6 */ mtlr r0 -/* 80028DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028DD0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getDispType__15renderingAmap_cCFv.s b/asm/d/map/d_map/getDispType__15renderingAmap_cCFv.s deleted file mode 100644 index 8a4f4c7b86..0000000000 --- a/asm/d/map/d_map/getDispType__15renderingAmap_cCFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800288C4: -/* 800288C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800288C8 7C 08 02 A6 */ mflr r0 -/* 800288CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800288D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800288D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800288D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800288DC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 800288E0 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800288E4 7D 89 03 A6 */ mtctr r12 -/* 800288E8 4E 80 04 21 */ bctrl -/* 800288EC A0 03 00 0A */ lhz r0, 0xa(r3) -/* 800288F0 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 800288F4 28 00 00 07 */ cmplwi r0, 7 -/* 800288F8 41 81 00 50 */ bgt lbl_80028948 -/* 800288FC 3C 60 80 3A */ lis r3, lit_3806@ha /* 0x803A6F08@ha */ -/* 80028900 38 63 6F 08 */ addi r3, r3, lit_3806@l /* 0x803A6F08@l */ -/* 80028904 54 00 10 3A */ slwi r0, r0, 2 -/* 80028908 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8002890C 7C 09 03 A6 */ mtctr r0 -/* 80028910 4E 80 04 20 */ bctr -/* 80028914 3B E0 00 01 */ li r31, 1 -/* 80028918 48 00 00 30 */ b lbl_80028948 -/* 8002891C 3B E0 00 00 */ li r31, 0 -/* 80028920 48 00 00 28 */ b lbl_80028948 -/* 80028924 3B E0 00 01 */ li r31, 1 -/* 80028928 48 00 00 20 */ b lbl_80028948 -/* 8002892C 3B E0 00 02 */ li r31, 2 -/* 80028930 48 00 00 18 */ b lbl_80028948 -/* 80028934 3B E0 00 03 */ li r31, 3 -/* 80028938 48 00 00 10 */ b lbl_80028948 -/* 8002893C 3B E0 00 04 */ li r31, 4 -/* 80028940 48 00 00 08 */ b lbl_80028948 -/* 80028944 3B E0 00 05 */ li r31, 5 -lbl_80028948: -/* 80028948 7F E3 FB 78 */ mr r3, r31 -/* 8002894C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028954 7C 08 03 A6 */ mtlr r0 -/* 80028958 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002895C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getDispType__6dMap_cCFv.s b/asm/d/map/d_map/getDispType__6dMap_cCFv.s deleted file mode 100644 index f4b74e6bad..0000000000 --- a/asm/d/map/d_map/getDispType__6dMap_cCFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8002A1BC: -/* 8002A1BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002A1C0 7C 08 02 A6 */ mflr r0 -/* 8002A1C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002A1C8 4B FF E6 FD */ bl getDispType__15renderingAmap_cCFv -/* 8002A1CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002A1D0 7C 08 03 A6 */ mtlr r0 -/* 8002A1D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A1D8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getFirstData__6dMap_cFUc.s b/asm/d/map/d_map/getFirstData__6dMap_cFUc.s deleted file mode 100644 index a2c85be852..0000000000 --- a/asm/d/map/d_map/getFirstData__6dMap_cFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8002ABAC: -/* 8002ABAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002ABB0 7C 08 02 A6 */ mflr r0 -/* 8002ABB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ABB8 48 01 5E DD */ bl getFirstData__28renderingPlusDoorAndCursor_cFUc -/* 8002ABBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002ABC0 7C 08 03 A6 */ mtlr r0 -/* 8002ABC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ABC8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getIconGroupNumber__15renderingAmap_cCFUc.s b/asm/d/map/d_map/getIconGroupNumber__15renderingAmap_cCFUc.s deleted file mode 100644 index 811f6ff5c6..0000000000 --- a/asm/d/map/d_map/getIconGroupNumber__15renderingAmap_cCFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80029058: -/* 80029058 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002905C 7C 08 02 A6 */ mflr r0 -/* 80029060 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029064 48 01 7A 81 */ bl getIconGroupNumber__16renderingDAmap_cCFUc -/* 80029068 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002906C 7C 08 03 A6 */ mtlr r0 -/* 80029070 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029074 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c.s b/asm/d/map/d_map/getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c.s deleted file mode 100644 index 3218dd5e09..0000000000 --- a/asm/d/map/d_map/getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80029038: -/* 80029038 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002903C 7C 08 02 A6 */ mflr r0 -/* 80029040 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029044 48 01 7A 99 */ bl getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c -/* 80029048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002904C 7C 08 03 A6 */ mtlr r0 -/* 80029050 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029054 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getIconSize__15renderingAmap_cCFUc.s b/asm/d/map/d_map/getIconSize__15renderingAmap_cCFUc.s deleted file mode 100644 index 4a1276b9cd..0000000000 --- a/asm/d/map/d_map/getIconSize__15renderingAmap_cCFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800284BC: -/* 800284BC 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 800284C0 3C 60 80 38 */ lis r3, l_iconSize@ha /* 0x80378E48@ha */ -/* 800284C4 38 63 8E 48 */ addi r3, r3, l_iconSize@l /* 0x80378E48@l */ -/* 800284C8 7C 23 04 2E */ lfsx f1, r3, r0 -/* 800284CC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getLineColor__11dDrawPath_cFii.s b/asm/d/map/d_map/getLineColor__11dDrawPath_cFii.s deleted file mode 100644 index 584177f07a..0000000000 --- a/asm/d/map/d_map/getLineColor__11dDrawPath_cFii.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8002AD84: -/* 8002AD84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002AD88 7C 08 02 A6 */ mflr r0 -/* 8002AD8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002AD90 81 83 00 00 */ lwz r12, 0(r3) -/* 8002AD94 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8002AD98 7D 89 03 A6 */ mtctr r12 -/* 8002AD9C 4E 80 04 21 */ bctrl -/* 8002ADA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002ADA4 7C 08 03 A6 */ mtlr r0 -/* 8002ADA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ADAC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getLineColor__15renderingAmap_cFii.s b/asm/d/map/d_map/getLineColor__15renderingAmap_cFii.s deleted file mode 100644 index 438ba64935..0000000000 --- a/asm/d/map/d_map/getLineColor__15renderingAmap_cFii.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80028EE4: -/* 80028EE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028EE8 7C 08 02 A6 */ mflr r0 -/* 80028EEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028EF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028EF4 3B ED 80 78 */ la r31, backColor(r13) /* 804505F8-_SDA_BASE_ */ -/* 80028EF8 2C 05 00 04 */ cmpwi r5, 4 -/* 80028EFC 40 82 00 70 */ bne lbl_80028F6C -/* 80028F00 80 03 00 3C */ lwz r0, 0x3c(r3) -/* 80028F04 2C 00 00 01 */ cmpwi r0, 1 -/* 80028F08 41 82 00 3C */ beq lbl_80028F44 -/* 80028F0C 40 80 00 90 */ bge lbl_80028F9C -/* 80028F10 2C 00 00 00 */ cmpwi r0, 0 -/* 80028F14 40 80 00 08 */ bge lbl_80028F1C -/* 80028F18 48 00 00 84 */ b lbl_80028F9C -lbl_80028F1C: -/* 80028F1C 88 02 82 D8 */ lbz r0, borderColor0(r2) -/* 80028F20 98 1F 00 00 */ stb r0, 0(r31) -/* 80028F24 38 62 82 D8 */ la r3, borderColor0(r2) /* 80451CD8-_SDA2_BASE_ */ -/* 80028F28 88 03 00 01 */ lbz r0, 1(r3) -/* 80028F2C 98 1F 00 01 */ stb r0, 1(r31) -/* 80028F30 88 03 00 02 */ lbz r0, 2(r3) -/* 80028F34 98 1F 00 02 */ stb r0, 2(r31) -/* 80028F38 88 03 00 03 */ lbz r0, 3(r3) -/* 80028F3C 98 1F 00 03 */ stb r0, 3(r31) -/* 80028F40 48 00 00 5C */ b lbl_80028F9C -lbl_80028F44: -/* 80028F44 88 02 82 DC */ lbz r0, borderColor1(r2) -/* 80028F48 98 1F 00 00 */ stb r0, 0(r31) -/* 80028F4C 38 62 82 DC */ la r3, borderColor1(r2) /* 80451CDC-_SDA2_BASE_ */ -/* 80028F50 88 03 00 01 */ lbz r0, 1(r3) -/* 80028F54 98 1F 00 01 */ stb r0, 1(r31) -/* 80028F58 88 03 00 02 */ lbz r0, 2(r3) -/* 80028F5C 98 1F 00 02 */ stb r0, 2(r31) -/* 80028F60 88 03 00 03 */ lbz r0, 3(r3) -/* 80028F64 98 1F 00 03 */ stb r0, 3(r31) -/* 80028F68 48 00 00 34 */ b lbl_80028F9C -lbl_80028F6C: -/* 80028F6C 81 83 00 00 */ lwz r12, 0(r3) -/* 80028F70 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80028F74 7D 89 03 A6 */ mtctr r12 -/* 80028F78 4E 80 04 21 */ bctrl -/* 80028F7C 88 03 00 00 */ lbz r0, 0(r3) -/* 80028F80 98 1F 00 00 */ stb r0, 0(r31) -/* 80028F84 88 03 00 01 */ lbz r0, 1(r3) -/* 80028F88 98 1F 00 01 */ stb r0, 1(r31) -/* 80028F8C 88 03 00 02 */ lbz r0, 2(r3) -/* 80028F90 98 1F 00 02 */ stb r0, 2(r31) -/* 80028F94 88 03 00 03 */ lbz r0, 3(r3) -/* 80028F98 98 1F 00 03 */ stb r0, 3(r31) -lbl_80028F9C: -/* 80028F9C 7F E3 FB 78 */ mr r3, r31 -/* 80028FA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028FA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028FA8 7C 08 03 A6 */ mtlr r0 -/* 80028FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028FB0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getLineWidthSub__15renderingAmap_cFi.s b/asm/d/map/d_map/getLineWidthSub__15renderingAmap_cFi.s deleted file mode 100644 index 8b82da8ab9..0000000000 --- a/asm/d/map/d_map/getLineWidthSub__15renderingAmap_cFi.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80028C90: -/* 80028C90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028C94 7C 08 02 A6 */ mflr r0 -/* 80028C98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028C9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028CA0 93 C1 00 08 */ stw r30, 8(r1) -/* 80028CA4 7C 9E 23 78 */ mr r30, r4 -/* 80028CA8 3B E2 82 C0 */ la r31, l_lineWidthPatOff(r2) /* 80451CC0-_SDA2_BASE_ */ -/* 80028CAC 80 83 00 24 */ lwz r4, 0x24(r3) -/* 80028CB0 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80028CB4 7C 04 00 00 */ cmpw r4, r0 -/* 80028CB8 40 82 00 0C */ bne lbl_80028CC4 -/* 80028CBC 3B E2 82 D0 */ la r31, l_lineWidthPatStay(r2) /* 80451CD0-_SDA2_BASE_ */ -/* 80028CC0 48 00 00 18 */ b lbl_80028CD8 -lbl_80028CC4: -/* 80028CC4 7C 83 23 78 */ mr r3, r4 -/* 80028CC8 48 01 60 49 */ bl isVisitedRoom__10dMapInfo_nFi -/* 80028CCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028CD0 41 82 00 08 */ beq lbl_80028CD8 -/* 80028CD4 3B E2 82 C8 */ la r31, l_lineWidthPatOn(r2) /* 80451CC8-_SDA2_BASE_ */ -lbl_80028CD8: -/* 80028CD8 7C 7F F0 AE */ lbzx r3, r31, r30 -/* 80028CDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028CE0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80028CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028CE8 7C 08 03 A6 */ mtlr r0 -/* 80028CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028CF0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getLineWidth__15renderingAmap_cFi.s b/asm/d/map/d_map/getLineWidth__15renderingAmap_cFi.s deleted file mode 100644 index fa47daab43..0000000000 --- a/asm/d/map/d_map/getLineWidth__15renderingAmap_cFi.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80028DD4: -/* 80028DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028DD8 7C 08 02 A6 */ mflr r0 -/* 80028DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028DE0 4B FF FE B1 */ bl getLineWidthSub__15renderingAmap_cFi -/* 80028DE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028DE8 7C 08 03 A6 */ mtlr r0 -/* 80028DEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028DF0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getMapMinMaxXZ__6dMap_cFiPfPfPfPf.s b/asm/d/map/d_map/getMapMinMaxXZ__6dMap_cFiPfPfPfPf.s deleted file mode 100644 index cfdb80ab99..0000000000 --- a/asm/d/map/d_map/getMapMinMaxXZ__6dMap_cFiPfPfPfPf.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_80029A8C: -/* 80029A8C 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80029A90 7C 08 02 A6 */ mflr r0 -/* 80029A94 90 01 00 74 */ stw r0, 0x74(r1) -/* 80029A98 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80029A9C F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80029AA0 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80029AA4 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80029AA8 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 80029AAC F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 80029AB0 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 80029AB4 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 80029AB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029ABC 48 33 87 19 */ bl _savegpr_27 -/* 80029AC0 7C 7B 1B 78 */ mr r27, r3 -/* 80029AC4 7C BC 2B 78 */ mr r28, r5 -/* 80029AC8 7C DD 33 78 */ mr r29, r6 -/* 80029ACC 7C FE 3B 78 */ mr r30, r7 -/* 80029AD0 7D 1F 43 78 */ mr r31, r8 -/* 80029AD4 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 80029AD8 FC 20 00 90 */ fmr f1, f0 -/* 80029ADC FC 40 00 90 */ fmr f2, f0 -/* 80029AE0 FC 60 00 90 */ fmr f3, f0 -/* 80029AE4 2C 04 00 00 */ cmpwi r4, 0 -/* 80029AE8 41 80 00 C0 */ blt lbl_80029BA8 -/* 80029AEC C3 ED 88 E8 */ lfs f31, mMinX__8dMpath_c(r13) -/* 80029AF0 C3 CD 88 F0 */ lfs f30, mMinZ__8dMpath_c(r13) -/* 80029AF4 C3 AD 88 EC */ lfs f29, mMaxX__8dMpath_c(r13) -/* 80029AF8 C3 8D 88 F4 */ lfs f28, mMaxZ__8dMpath_c(r13) -/* 80029AFC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80029B00 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80029B04 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80029B08 D0 01 00 08 */ stfs f0, 8(r1) -/* 80029B0C 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 80029B10 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80029B14 1C 04 04 04 */ mulli r0, r4, 0x404 -/* 80029B18 7C 63 02 14 */ add r3, r3, r0 -/* 80029B1C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 80029B20 28 00 00 00 */ cmplwi r0, 0 -/* 80029B24 41 82 00 1C */ beq lbl_80029B40 -/* 80029B28 7C 83 23 78 */ mr r3, r4 -/* 80029B2C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80029B30 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80029B34 38 C1 00 0C */ addi r6, r1, 0xc -/* 80029B38 38 E1 00 08 */ addi r7, r1, 8 -/* 80029B3C 48 01 56 B9 */ bl getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf -lbl_80029B40: -/* 80029B40 7F 63 DB 78 */ mr r3, r27 -/* 80029B44 48 00 06 79 */ bl getDispType__6dMap_cCFv -/* 80029B48 2C 03 00 04 */ cmpwi r3, 4 -/* 80029B4C 41 82 00 24 */ beq lbl_80029B70 -/* 80029B50 40 80 00 14 */ bge lbl_80029B64 -/* 80029B54 2C 03 00 01 */ cmpwi r3, 1 -/* 80029B58 41 82 00 2C */ beq lbl_80029B84 -/* 80029B5C 40 80 00 3C */ bge lbl_80029B98 -/* 80029B60 48 00 00 10 */ b lbl_80029B70 -lbl_80029B64: -/* 80029B64 2C 03 00 06 */ cmpwi r3, 6 -/* 80029B68 40 80 00 08 */ bge lbl_80029B70 -/* 80029B6C 48 00 00 2C */ b lbl_80029B98 -lbl_80029B70: -/* 80029B70 FC 00 F8 90 */ fmr f0, f31 -/* 80029B74 FC 20 F0 90 */ fmr f1, f30 -/* 80029B78 FC 40 E8 90 */ fmr f2, f29 -/* 80029B7C FC 60 E0 90 */ fmr f3, f28 -/* 80029B80 48 00 00 28 */ b lbl_80029BA8 -lbl_80029B84: -/* 80029B84 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80029B88 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 80029B8C C0 41 00 0C */ lfs f2, 0xc(r1) -/* 80029B90 C0 61 00 08 */ lfs f3, 8(r1) -/* 80029B94 48 00 00 14 */ b lbl_80029BA8 -lbl_80029B98: -/* 80029B98 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80029B9C C0 21 00 10 */ lfs f1, 0x10(r1) -/* 80029BA0 C0 41 00 0C */ lfs f2, 0xc(r1) -/* 80029BA4 C0 61 00 08 */ lfs f3, 8(r1) -lbl_80029BA8: -/* 80029BA8 28 1C 00 00 */ cmplwi r28, 0 -/* 80029BAC 41 82 00 08 */ beq lbl_80029BB4 -/* 80029BB0 D0 1C 00 00 */ stfs f0, 0(r28) -lbl_80029BB4: -/* 80029BB4 28 1D 00 00 */ cmplwi r29, 0 -/* 80029BB8 41 82 00 08 */ beq lbl_80029BC0 -/* 80029BBC D0 3D 00 00 */ stfs f1, 0(r29) -lbl_80029BC0: -/* 80029BC0 28 1E 00 00 */ cmplwi r30, 0 -/* 80029BC4 41 82 00 08 */ beq lbl_80029BCC -/* 80029BC8 D0 5E 00 00 */ stfs f2, 0(r30) -lbl_80029BCC: -/* 80029BCC 28 1F 00 00 */ cmplwi r31, 0 -/* 80029BD0 41 82 00 08 */ beq lbl_80029BD8 -/* 80029BD4 D0 7F 00 00 */ stfs f3, 0(r31) -lbl_80029BD8: -/* 80029BD8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80029BDC CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80029BE0 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80029BE4 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80029BE8 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 80029BEC CB A1 00 40 */ lfd f29, 0x40(r1) -/* 80029BF0 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 80029BF4 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 80029BF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029BFC 48 33 86 25 */ bl _restgpr_27 -/* 80029C00 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80029C04 7C 08 03 A6 */ mtlr r0 -/* 80029C08 38 21 00 70 */ addi r1, r1, 0x70 -/* 80029C0C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c.s b/asm/d/map/d_map/getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c.s deleted file mode 100644 index 6fba451a57..0000000000 --- a/asm/d/map/d_map/getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8002ABCC: -/* 8002ABCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002ABD0 7C 08 02 A6 */ mflr r0 -/* 8002ABD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ABD8 48 01 5E E1 */ bl getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c -/* 8002ABDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002ABE0 7C 08 03 A6 */ mtlr r0 -/* 8002ABE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ABE8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getOutSideBlackLineNumber__15renderingAmap_cFv.s b/asm/d/map/d_map/getOutSideBlackLineNumber__15renderingAmap_cFv.s deleted file mode 100644 index 66ebf32f26..0000000000 --- a/asm/d/map/d_map/getOutSideBlackLineNumber__15renderingAmap_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80028C4C: -/* 80028C4C 38 00 00 00 */ li r0, 0 -/* 80028C50 90 03 00 34 */ stw r0, 0x34(r3) -/* 80028C54 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028C58 A8 63 01 AE */ lha r3, 0x1ae(r3) -/* 80028C5C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getPack__6dMap_cFiPfPf.s b/asm/d/map/d_map/getPack__6dMap_cFiPfPf.s deleted file mode 100644 index 928d432c5e..0000000000 --- a/asm/d/map/d_map/getPack__6dMap_cFiPfPf.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80029C10: -/* 80029C10 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80029C14 7C 08 02 A6 */ mflr r0 -/* 80029C18 90 01 00 54 */ stw r0, 0x54(r1) -/* 80029C1C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80029C20 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80029C24 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 80029C28 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 80029C2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029C30 48 33 85 A9 */ bl _savegpr_28 -/* 80029C34 7C 7C 1B 78 */ mr r28, r3 -/* 80029C38 7C 9D 23 78 */ mr r29, r4 -/* 80029C3C 7C BE 2B 78 */ mr r30, r5 -/* 80029C40 7C DF 33 78 */ mr r31, r6 -/* 80029C44 C3 E2 82 E4 */ lfs f31, lit_4321(r2) -/* 80029C48 FF C0 F8 90 */ fmr f30, f31 -/* 80029C4C 4B FF F5 15 */ bl getStayType__15renderingAmap_cCFv -/* 80029C50 2C 03 00 00 */ cmpwi r3, 0 -/* 80029C54 40 82 00 E4 */ bne lbl_80029D38 -/* 80029C58 C0 02 82 E4 */ lfs f0, lit_4321(r2) -/* 80029C5C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80029C60 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80029C64 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80029C68 D0 01 00 08 */ stfs f0, 8(r1) -/* 80029C6C 7F 83 E3 78 */ mr r3, r28 -/* 80029C70 7F A4 EB 78 */ mr r4, r29 -/* 80029C74 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80029C78 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80029C7C 38 E1 00 0C */ addi r7, r1, 0xc -/* 80029C80 39 01 00 08 */ addi r8, r1, 8 -/* 80029C84 4B FF FE 09 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf -/* 80029C88 C0 A2 82 A0 */ lfs f5, lit_3745(r2) -/* 80029C8C C0 5C 00 58 */ lfs f2, 0x58(r28) -/* 80029C90 80 7C 00 74 */ lwz r3, 0x74(r28) -/* 80029C94 38 03 00 04 */ addi r0, r3, 4 -/* 80029C98 C8 22 82 B8 */ lfd f1, lit_3751(r2) -/* 80029C9C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80029CA0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80029CA4 3C 00 43 30 */ lis r0, 0x4330 -/* 80029CA8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80029CAC C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80029CB0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80029CB4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80029CB8 EC 25 00 32 */ fmuls f1, f5, f0 -/* 80029CBC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80029CC0 EC 80 08 28 */ fsubs f4, f0, f1 -/* 80029CC4 D0 81 00 14 */ stfs f4, 0x14(r1) -/* 80029CC8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80029CCC EC 60 08 28 */ fsubs f3, f0, f1 -/* 80029CD0 D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80029CD4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80029CD8 EC 40 08 2A */ fadds f2, f0, f1 -/* 80029CDC D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80029CE0 C0 01 00 08 */ lfs f0, 8(r1) -/* 80029CE4 EC 20 08 2A */ fadds f1, f0, f1 -/* 80029CE8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80029CEC EC C2 20 28 */ fsubs f6, f2, f4 -/* 80029CF0 EC E1 18 28 */ fsubs f7, f1, f3 -/* 80029CF4 EC 02 20 2A */ fadds f0, f2, f4 -/* 80029CF8 ED 05 00 32 */ fmuls f8, f5, f0 -/* 80029CFC EC 01 18 2A */ fadds f0, f1, f3 -/* 80029D00 EC 65 00 32 */ fmuls f3, f5, f0 -/* 80029D04 FC 06 38 40 */ fcmpo cr0, f6, f7 -/* 80029D08 40 81 00 1C */ ble lbl_80029D24 -/* 80029D0C EC 45 01 B2 */ fmuls f2, f5, f6 -/* 80029D10 EC 08 20 28 */ fsubs f0, f8, f4 -/* 80029D14 EF E2 00 28 */ fsubs f31, f2, f0 -/* 80029D18 EC 01 18 28 */ fsubs f0, f1, f3 -/* 80029D1C EF C2 00 28 */ fsubs f30, f2, f0 -/* 80029D20 48 00 00 18 */ b lbl_80029D38 -lbl_80029D24: -/* 80029D24 EC 45 01 F2 */ fmuls f2, f5, f7 -/* 80029D28 EC 08 20 28 */ fsubs f0, f8, f4 -/* 80029D2C EF E2 00 28 */ fsubs f31, f2, f0 -/* 80029D30 EC 01 18 28 */ fsubs f0, f1, f3 -/* 80029D34 EF C2 00 28 */ fsubs f30, f2, f0 -lbl_80029D38: -/* 80029D38 28 1E 00 00 */ cmplwi r30, 0 -/* 80029D3C 41 82 00 08 */ beq lbl_80029D44 -/* 80029D40 D3 FE 00 00 */ stfs f31, 0(r30) -lbl_80029D44: -/* 80029D44 28 1F 00 00 */ cmplwi r31, 0 -/* 80029D48 41 82 00 08 */ beq lbl_80029D50 -/* 80029D4C D3 DF 00 00 */ stfs f30, 0(r31) -lbl_80029D50: -/* 80029D50 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80029D54 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80029D58 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80029D5C CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80029D60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029D64 48 33 84 C1 */ bl _restgpr_28 -/* 80029D68 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80029D6C 7C 08 03 A6 */ mtlr r0 -/* 80029D70 38 21 00 50 */ addi r1, r1, 0x50 -/* 80029D74 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getPlayerCursorSize__15renderingAmap_cFv.s b/asm/d/map/d_map/getPlayerCursorSize__15renderingAmap_cFv.s deleted file mode 100644 index 94ce07bb28..0000000000 --- a/asm/d/map/d_map/getPlayerCursorSize__15renderingAmap_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80028B04: -/* 80028B04 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028B08 C0 23 01 B8 */ lfs f1, 0x1b8(r3) -/* 80028B0C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getRestartCursorSize__15renderingAmap_cFv.s b/asm/d/map/d_map/getRestartCursorSize__15renderingAmap_cFv.s deleted file mode 100644 index fceb6e1c19..0000000000 --- a/asm/d/map/d_map/getRestartCursorSize__15renderingAmap_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80028B10: -/* 80028B10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028B14 7C 08 02 A6 */ mflr r0 -/* 80028B18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028B1C 81 83 00 00 */ lwz r12, 0(r3) -/* 80028B20 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 80028B24 7D 89 03 A6 */ mtctr r12 -/* 80028B28 4E 80 04 21 */ bctrl -/* 80028B2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028B30 7C 08 03 A6 */ mtlr r0 -/* 80028B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028B38 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getRoomNoSingle__6dMap_cFv.s b/asm/d/map/d_map/getRoomNoSingle__6dMap_cFv.s deleted file mode 100644 index bddb20f9b8..0000000000 --- a/asm/d/map/d_map/getRoomNoSingle__6dMap_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002A254: -/* 8002A254 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002A258 7C 08 02 A6 */ mflr r0 -/* 8002A25C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002A260 88 03 00 8E */ lbz r0, 0x8e(r3) -/* 8002A264 28 00 00 02 */ cmplwi r0, 2 -/* 8002A268 40 82 00 18 */ bne lbl_8002A280 -/* 8002A26C 88 03 00 8F */ lbz r0, 0x8f(r3) -/* 8002A270 28 00 00 06 */ cmplwi r0, 6 -/* 8002A274 41 81 00 0C */ bgt lbl_8002A280 -/* 8002A278 80 63 00 80 */ lwz r3, 0x80(r3) -/* 8002A27C 48 00 00 08 */ b lbl_8002A284 -lbl_8002A280: -/* 8002A280 48 01 5D 6D */ bl getRoomNoSingle__16renderingDAmap_cFv -lbl_8002A284: -/* 8002A284 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002A288 7C 08 03 A6 */ mtlr r0 -/* 8002A28C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A290 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/getStayType__15renderingAmap_cCFv.s b/asm/d/map/d_map/getStayType__15renderingAmap_cCFv.s deleted file mode 100644 index 5cc581655e..0000000000 --- a/asm/d/map/d_map/getStayType__15renderingAmap_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80029160: -/* 80029160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80029164 7C 08 02 A6 */ mflr r0 -/* 80029168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002916C 4B FF F7 59 */ bl getDispType__15renderingAmap_cCFv -/* 80029170 54 60 10 3A */ slwi r0, r3, 2 -/* 80029174 3C 60 80 38 */ lis r3, l_stayType@ha /* 0x80378F08@ha */ -/* 80029178 38 63 8F 08 */ addi r3, r3, l_stayType@l /* 0x80378F08@l */ -/* 8002917C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80029180 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80029184 7C 08 03 A6 */ mtlr r0 -/* 80029188 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002918C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/hasMap__15renderingAmap_cCFv.s b/asm/d/map/d_map/hasMap__15renderingAmap_cCFv.s deleted file mode 100644 index cbb4e24c73..0000000000 --- a/asm/d/map/d_map/hasMap__15renderingAmap_cCFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80029078: -/* 80029078 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002907C 7C 08 02 A6 */ mflr r0 -/* 80029080 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029084 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80029088 48 00 00 D9 */ bl getStayType__15renderingAmap_cCFv -/* 8002908C 3B E0 00 00 */ li r31, 0 -/* 80029090 2C 03 00 01 */ cmpwi r3, 1 -/* 80029094 40 82 00 14 */ bne lbl_800290A8 -/* 80029098 48 01 5C 41 */ bl chkGetMap__10dMapInfo_nFv -/* 8002909C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800290A0 41 82 00 08 */ beq lbl_800290A8 -/* 800290A4 3B E0 00 01 */ li r31, 1 -lbl_800290A8: -/* 800290A8 7F E3 FB 78 */ mr r3, r31 -/* 800290AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800290B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800290B4 7C 08 03 A6 */ mtlr r0 -/* 800290B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800290BC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi.s b/asm/d/map/d_map/isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi.s deleted file mode 100644 index ffe900b781..0000000000 --- a/asm/d/map/d_map/isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi.s +++ /dev/null @@ -1,364 +0,0 @@ -lbl_80029190: -/* 80029190 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80029194 7C 08 02 A6 */ mflr r0 -/* 80029198 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002919C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800291A0 48 33 90 21 */ bl _savegpr_22 -/* 800291A4 7C 77 1B 78 */ mr r23, r3 -/* 800291A8 7C 9B 23 78 */ mr r27, r4 -/* 800291AC 7C BE 2B 78 */ mr r30, r5 -/* 800291B0 7C D6 33 78 */ mr r22, r6 -/* 800291B4 7C FC 3B 78 */ mr r28, r7 -/* 800291B8 3B E0 00 00 */ li r31, 0 -/* 800291BC 4B FF F7 09 */ bl getDispType__15renderingAmap_cCFv -/* 800291C0 7C 7D 1B 78 */ mr r29, r3 -/* 800291C4 7E E3 BB 78 */ mr r3, r23 -/* 800291C8 4B FF FF 99 */ bl getStayType__15renderingAmap_cCFv -/* 800291CC 7C 79 1B 78 */ mr r25, r3 -/* 800291D0 88 7B 00 11 */ lbz r3, 0x11(r27) -/* 800291D4 48 07 32 DD */ bl getTypeToTypeGroupNo__7dTres_cFUc -/* 800291D8 54 78 06 3E */ clrlwi r24, r3, 0x18 -/* 800291DC 7E E3 BB 78 */ mr r3, r23 -/* 800291E0 81 97 00 00 */ lwz r12, 0(r23) -/* 800291E4 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 800291E8 7D 89 03 A6 */ mtctr r12 -/* 800291EC 4E 80 04 21 */ bctrl -/* 800291F0 7C 7A 1B 78 */ mr r26, r3 -/* 800291F4 3A E0 00 00 */ li r23, 0 -/* 800291F8 2C 19 00 01 */ cmpwi r25, 1 -/* 800291FC 40 82 00 14 */ bne lbl_80029210 -/* 80029200 48 01 5A A1 */ bl chkGetCompass__10dMapInfo_nFv -/* 80029204 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80029208 41 82 00 08 */ beq lbl_80029210 -/* 8002920C 3A E0 00 01 */ li r23, 1 -lbl_80029210: -/* 80029210 28 18 00 10 */ cmplwi r24, 0x10 -/* 80029214 41 81 04 BC */ bgt lbl_800296D0 -/* 80029218 3C 60 80 3A */ lis r3, lit_4259@ha /* 0x803A6F28@ha */ -/* 8002921C 38 63 6F 28 */ addi r3, r3, lit_4259@l /* 0x803A6F28@l */ -/* 80029220 57 00 10 3A */ slwi r0, r24, 2 -/* 80029224 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80029228 7C 09 03 A6 */ mtctr r0 -/* 8002922C 4E 80 04 20 */ bctr -/* 80029230 2C 19 00 01 */ cmpwi r25, 1 -/* 80029234 40 82 04 9C */ bne lbl_800296D0 -/* 80029238 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 8002923C 41 82 04 94 */ beq lbl_800296D0 -/* 80029240 88 9B 00 00 */ lbz r4, 0(r27) -/* 80029244 28 04 00 FF */ cmplwi r4, 0xff -/* 80029248 41 82 04 88 */ beq lbl_800296D0 -/* 8002924C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029254 38 63 09 58 */ addi r3, r3, 0x958 -/* 80029258 48 00 B5 91 */ bl isTbox__12dSv_memBit_cCFi -/* 8002925C 2C 03 00 00 */ cmpwi r3, 0 -/* 80029260 40 82 04 70 */ bne lbl_800296D0 -/* 80029264 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029268 41 82 04 68 */ beq lbl_800296D0 -/* 8002926C 3B E0 00 01 */ li r31, 1 -/* 80029270 48 00 04 60 */ b lbl_800296D0 -/* 80029274 2C 19 00 01 */ cmpwi r25, 1 -/* 80029278 40 82 00 24 */ bne lbl_8002929C -/* 8002927C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 80029280 40 82 00 0C */ bne lbl_8002928C -/* 80029284 56 C0 06 3F */ clrlwi. r0, r22, 0x18 -/* 80029288 41 82 04 48 */ beq lbl_800296D0 -lbl_8002928C: -/* 8002928C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029290 41 82 04 40 */ beq lbl_800296D0 -/* 80029294 3B E0 00 01 */ li r31, 1 -/* 80029298 48 00 04 38 */ b lbl_800296D0 -lbl_8002929C: -/* 8002929C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 -/* 800292A0 41 82 04 30 */ beq lbl_800296D0 -/* 800292A4 88 9B 00 10 */ lbz r4, 0x10(r27) -/* 800292A8 28 04 00 FF */ cmplwi r4, 0xff -/* 800292AC 41 82 00 24 */ beq lbl_800292D0 -/* 800292B0 41 82 04 20 */ beq lbl_800296D0 -/* 800292B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800292B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800292BC 88 BB 00 01 */ lbz r5, 1(r27) -/* 800292C0 7C A5 07 74 */ extsb r5, r5 -/* 800292C4 48 00 C0 9D */ bl isSwitch__10dSv_info_cCFii -/* 800292C8 2C 03 00 00 */ cmpwi r3, 0 -/* 800292CC 41 82 04 04 */ beq lbl_800296D0 -lbl_800292D0: -/* 800292D0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800292D4 41 82 03 FC */ beq lbl_800296D0 -/* 800292D8 3B E0 00 01 */ li r31, 1 -/* 800292DC 48 00 03 F4 */ b lbl_800296D0 -/* 800292E0 2C 19 00 01 */ cmpwi r25, 1 -/* 800292E4 40 82 03 EC */ bne lbl_800296D0 -/* 800292E8 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800292EC 41 82 03 E4 */ beq lbl_800296D0 -/* 800292F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800292F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800292F8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800292FC 88 9B 00 00 */ lbz r4, 0(r27) -/* 80029300 48 00 B4 E9 */ bl isTbox__12dSv_memBit_cCFi -/* 80029304 2C 03 00 00 */ cmpwi r3, 0 -/* 80029308 40 82 03 C8 */ bne lbl_800296D0 -/* 8002930C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029310 41 82 03 C0 */ beq lbl_800296D0 -/* 80029314 3B E0 00 01 */ li r31, 1 -/* 80029318 48 00 03 B8 */ b lbl_800296D0 -/* 8002931C 2C 19 00 00 */ cmpwi r25, 0 -/* 80029320 40 82 03 B0 */ bne lbl_800296D0 -/* 80029324 3A E0 00 00 */ li r23, 0 -/* 80029328 48 00 5A B9 */ bl dComIfGp_isLightDropMapVisible__Fv -/* 8002932C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80029330 41 82 00 68 */ beq lbl_80029398 -/* 80029334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002933C 88 03 4E 0C */ lbz r0, 0x4e0c(r3) -/* 80029340 2C 00 00 02 */ cmpwi r0, 2 -/* 80029344 40 82 00 50 */ bne lbl_80029394 -/* 80029348 88 7B 00 00 */ lbz r3, 0(r27) -/* 8002934C 38 03 FF CD */ addi r0, r3, -51 -/* 80029350 28 00 00 01 */ cmplwi r0, 1 -/* 80029354 40 81 00 0C */ ble lbl_80029360 -/* 80029358 2C 03 00 35 */ cmpwi r3, 0x35 -/* 8002935C 40 82 00 30 */ bne lbl_8002938C -lbl_80029360: -/* 80029360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029368 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8002936C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80029370 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80029374 A0 84 00 EE */ lhz r4, 0xee(r4) -/* 80029378 48 00 B6 45 */ bl isEventBit__11dSv_event_cCFUs -/* 8002937C 2C 03 00 00 */ cmpwi r3, 0 -/* 80029380 41 82 00 18 */ beq lbl_80029398 -/* 80029384 3A E0 00 01 */ li r23, 1 -/* 80029388 48 00 00 10 */ b lbl_80029398 -lbl_8002938C: -/* 8002938C 3A E0 00 01 */ li r23, 1 -/* 80029390 48 00 00 08 */ b lbl_80029398 -lbl_80029394: -/* 80029394 3A E0 00 01 */ li r23, 1 -lbl_80029398: -/* 80029398 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 8002939C 41 82 03 34 */ beq lbl_800296D0 -/* 800293A0 3A E0 00 00 */ li r23, 0 -/* 800293A4 88 9B 00 00 */ lbz r4, 0(r27) -/* 800293A8 28 04 00 FF */ cmplwi r4, 0xff -/* 800293AC 41 82 00 20 */ beq lbl_800293CC -/* 800293B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800293B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800293B8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800293BC 48 00 B4 2D */ bl isTbox__12dSv_memBit_cCFi -/* 800293C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800293C4 40 82 00 08 */ bne lbl_800293CC -/* 800293C8 3A E0 00 01 */ li r23, 1 -lbl_800293CC: -/* 800293CC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800293D0 41 82 03 00 */ beq lbl_800296D0 -/* 800293D4 2C 1D 00 03 */ cmpwi r29, 3 -/* 800293D8 40 82 00 24 */ bne lbl_800293FC -/* 800293DC 88 1B 00 01 */ lbz r0, 1(r27) -/* 800293E0 7C 00 07 74 */ extsb r0, r0 -/* 800293E4 7C 00 E0 00 */ cmpw r0, r28 -/* 800293E8 40 82 02 E8 */ bne lbl_800296D0 -/* 800293EC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800293F0 41 82 02 E0 */ beq lbl_800296D0 -/* 800293F4 3B E0 00 01 */ li r31, 1 -/* 800293F8 48 00 02 D8 */ b lbl_800296D0 -lbl_800293FC: -/* 800293FC 2C 1D 00 04 */ cmpwi r29, 4 -/* 80029400 40 82 00 14 */ bne lbl_80029414 -/* 80029404 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029408 41 82 02 C8 */ beq lbl_800296D0 -/* 8002940C 3B E0 00 01 */ li r31, 1 -/* 80029410 48 00 02 C0 */ b lbl_800296D0 -lbl_80029414: -/* 80029414 2C 1D 00 05 */ cmpwi r29, 5 -/* 80029418 40 82 00 1C */ bne lbl_80029434 -/* 8002941C 88 1B 00 01 */ lbz r0, 1(r27) -/* 80029420 7C 00 07 74 */ extsb r0, r0 -/* 80029424 7C 00 E0 00 */ cmpw r0, r28 -/* 80029428 40 82 02 A8 */ bne lbl_800296D0 -/* 8002942C 3B E0 00 01 */ li r31, 1 -/* 80029430 48 00 02 A0 */ b lbl_800296D0 -lbl_80029434: -/* 80029434 3B E0 00 01 */ li r31, 1 -/* 80029438 48 00 02 98 */ b lbl_800296D0 -/* 8002943C 88 9B 00 00 */ lbz r4, 0(r27) -/* 80029440 28 04 00 FF */ cmplwi r4, 0xff -/* 80029444 41 82 00 20 */ beq lbl_80029464 -/* 80029448 41 82 02 88 */ beq lbl_800296D0 -/* 8002944C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029454 38 63 09 58 */ addi r3, r3, 0x958 -/* 80029458 48 00 B3 91 */ bl isTbox__12dSv_memBit_cCFi -/* 8002945C 2C 03 00 00 */ cmpwi r3, 0 -/* 80029460 40 82 02 70 */ bne lbl_800296D0 -lbl_80029464: -/* 80029464 88 9B 00 10 */ lbz r4, 0x10(r27) -/* 80029468 28 04 00 FF */ cmplwi r4, 0xff -/* 8002946C 41 82 00 24 */ beq lbl_80029490 -/* 80029470 41 82 02 60 */ beq lbl_800296D0 -/* 80029474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002947C 88 BB 00 01 */ lbz r5, 1(r27) -/* 80029480 7C A5 07 74 */ extsb r5, r5 -/* 80029484 48 00 BE DD */ bl isSwitch__10dSv_info_cCFii -/* 80029488 2C 03 00 00 */ cmpwi r3, 0 -/* 8002948C 41 82 02 44 */ beq lbl_800296D0 -lbl_80029490: -/* 80029490 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029494 41 82 02 3C */ beq lbl_800296D0 -/* 80029498 3B E0 00 01 */ li r31, 1 -/* 8002949C 48 00 02 34 */ b lbl_800296D0 -/* 800294A0 2C 19 00 01 */ cmpwi r25, 1 -/* 800294A4 40 82 02 2C */ bne lbl_800296D0 -/* 800294A8 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800294AC 41 82 02 24 */ beq lbl_800296D0 -/* 800294B0 88 9B 00 10 */ lbz r4, 0x10(r27) -/* 800294B4 28 04 00 FF */ cmplwi r4, 0xff -/* 800294B8 41 82 00 24 */ beq lbl_800294DC -/* 800294BC 41 82 02 14 */ beq lbl_800296D0 -/* 800294C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800294C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800294C8 88 BB 00 01 */ lbz r5, 1(r27) -/* 800294CC 7C A5 07 74 */ extsb r5, r5 -/* 800294D0 48 00 BE 91 */ bl isSwitch__10dSv_info_cCFii -/* 800294D4 2C 03 00 00 */ cmpwi r3, 0 -/* 800294D8 41 82 01 F8 */ beq lbl_800296D0 -lbl_800294DC: -/* 800294DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800294E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800294E4 38 63 09 58 */ addi r3, r3, 0x958 -/* 800294E8 38 80 00 03 */ li r4, 3 -/* 800294EC 48 00 B4 49 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 800294F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800294F4 40 82 01 DC */ bne lbl_800296D0 -/* 800294F8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800294FC 41 82 01 D4 */ beq lbl_800296D0 -/* 80029500 3B E0 00 01 */ li r31, 1 -/* 80029504 48 00 01 CC */ b lbl_800296D0 -/* 80029508 2C 19 00 01 */ cmpwi r25, 1 -/* 8002950C 40 82 01 C4 */ bne lbl_800296D0 -/* 80029510 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80029514 41 82 01 BC */ beq lbl_800296D0 -/* 80029518 88 9B 00 00 */ lbz r4, 0(r27) -/* 8002951C 28 04 00 FF */ cmplwi r4, 0xff -/* 80029520 41 82 00 20 */ beq lbl_80029540 -/* 80029524 41 82 01 AC */ beq lbl_800296D0 -/* 80029528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002952C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029530 38 63 09 58 */ addi r3, r3, 0x958 -/* 80029534 48 00 B2 B5 */ bl isTbox__12dSv_memBit_cCFi -/* 80029538 2C 03 00 00 */ cmpwi r3, 0 -/* 8002953C 40 82 01 94 */ bne lbl_800296D0 -lbl_80029540: -/* 80029540 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029544 41 82 01 8C */ beq lbl_800296D0 -/* 80029548 3B E0 00 01 */ li r31, 1 -/* 8002954C 48 00 01 84 */ b lbl_800296D0 -/* 80029550 2C 19 00 00 */ cmpwi r25, 0 -/* 80029554 40 82 01 7C */ bne lbl_800296D0 -/* 80029558 88 9B 00 00 */ lbz r4, 0(r27) -/* 8002955C 28 04 00 FF */ cmplwi r4, 0xff -/* 80029560 41 82 01 70 */ beq lbl_800296D0 -/* 80029564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002956C 38 63 09 58 */ addi r3, r3, 0x958 -/* 80029570 48 00 B2 79 */ bl isTbox__12dSv_memBit_cCFi -/* 80029574 2C 03 00 00 */ cmpwi r3, 0 -/* 80029578 41 82 01 58 */ beq lbl_800296D0 -/* 8002957C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80029580 41 82 01 50 */ beq lbl_800296D0 -/* 80029584 3B E0 00 01 */ li r31, 1 -/* 80029588 48 00 01 48 */ b lbl_800296D0 -/* 8002958C 2C 19 00 01 */ cmpwi r25, 1 -/* 80029590 40 82 01 40 */ bne lbl_800296D0 -/* 80029594 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 80029598 41 82 01 38 */ beq lbl_800296D0 -/* 8002959C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800295A0 41 82 01 30 */ beq lbl_800296D0 -/* 800295A4 3B E0 00 01 */ li r31, 1 -/* 800295A8 48 00 01 28 */ b lbl_800296D0 -/* 800295AC 2C 19 00 01 */ cmpwi r25, 1 -/* 800295B0 40 82 01 20 */ bne lbl_800296D0 -/* 800295B4 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800295B8 41 82 01 18 */ beq lbl_800296D0 -/* 800295BC 88 9B 00 00 */ lbz r4, 0(r27) -/* 800295C0 28 04 00 FF */ cmplwi r4, 0xff -/* 800295C4 41 82 00 20 */ beq lbl_800295E4 -/* 800295C8 41 82 01 08 */ beq lbl_800296D0 -/* 800295CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800295D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800295D4 38 63 09 58 */ addi r3, r3, 0x958 -/* 800295D8 48 00 B2 11 */ bl isTbox__12dSv_memBit_cCFi -/* 800295DC 2C 03 00 00 */ cmpwi r3, 0 -/* 800295E0 40 82 00 F0 */ bne lbl_800296D0 -lbl_800295E4: -/* 800295E4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800295E8 41 82 00 E8 */ beq lbl_800296D0 -/* 800295EC 3B E0 00 01 */ li r31, 1 -/* 800295F0 48 00 00 E0 */ b lbl_800296D0 -/* 800295F4 2C 19 00 00 */ cmpwi r25, 0 -/* 800295F8 40 82 00 D8 */ bne lbl_800296D0 -/* 800295FC 88 9B 00 10 */ lbz r4, 0x10(r27) -/* 80029600 28 04 00 FF */ cmplwi r4, 0xff -/* 80029604 41 82 00 24 */ beq lbl_80029628 -/* 80029608 41 82 00 C8 */ beq lbl_800296D0 -/* 8002960C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029614 88 BB 00 01 */ lbz r5, 1(r27) -/* 80029618 7C A5 07 74 */ extsb r5, r5 -/* 8002961C 48 00 BD 45 */ bl isSwitch__10dSv_info_cCFii -/* 80029620 2C 03 00 00 */ cmpwi r3, 0 -/* 80029624 41 82 00 AC */ beq lbl_800296D0 -lbl_80029628: -/* 80029628 3B E0 00 01 */ li r31, 1 -/* 8002962C 48 00 00 A4 */ b lbl_800296D0 -/* 80029630 2C 19 00 01 */ cmpwi r25, 1 -/* 80029634 40 82 00 9C */ bne lbl_800296D0 -/* 80029638 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 8002963C 41 82 00 94 */ beq lbl_800296D0 -/* 80029640 88 9B 00 00 */ lbz r4, 0(r27) -/* 80029644 28 04 00 FF */ cmplwi r4, 0xff -/* 80029648 41 82 00 20 */ beq lbl_80029668 -/* 8002964C 41 82 00 84 */ beq lbl_800296D0 -/* 80029650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029658 38 63 09 58 */ addi r3, r3, 0x958 -/* 8002965C 48 00 B1 8D */ bl isTbox__12dSv_memBit_cCFi -/* 80029660 2C 03 00 00 */ cmpwi r3, 0 -/* 80029664 41 82 00 6C */ beq lbl_800296D0 -lbl_80029668: -/* 80029668 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8002966C 41 82 00 64 */ beq lbl_800296D0 -/* 80029670 3B E0 00 01 */ li r31, 1 -/* 80029674 48 00 00 5C */ b lbl_800296D0 -/* 80029678 2C 19 00 01 */ cmpwi r25, 1 -/* 8002967C 40 82 00 54 */ bne lbl_800296D0 -/* 80029680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80029684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80029688 3B 23 09 58 */ addi r25, r3, 0x958 -/* 8002968C 7F 23 CB 78 */ mr r3, r25 -/* 80029690 38 80 00 03 */ li r4, 3 -/* 80029694 48 00 B2 A1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80029698 2C 03 00 00 */ cmpwi r3, 0 -/* 8002969C 40 82 00 34 */ bne lbl_800296D0 -/* 800296A0 88 9B 00 00 */ lbz r4, 0(r27) -/* 800296A4 28 04 00 FF */ cmplwi r4, 0xff -/* 800296A8 41 82 00 28 */ beq lbl_800296D0 -/* 800296AC 7F 23 CB 78 */ mr r3, r25 -/* 800296B0 48 00 B1 39 */ bl isTbox__12dSv_memBit_cCFi -/* 800296B4 2C 03 00 00 */ cmpwi r3, 0 -/* 800296B8 40 82 00 18 */ bne lbl_800296D0 -/* 800296BC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 -/* 800296C0 41 82 00 10 */ beq lbl_800296D0 -/* 800296C4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800296C8 41 82 00 08 */ beq lbl_800296D0 -/* 800296CC 3B E0 00 01 */ li r31, 1 -lbl_800296D0: -/* 800296D0 7F E3 FB 78 */ mr r3, r31 -/* 800296D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800296D8 48 33 8B 35 */ bl _restgpr_22 -/* 800296DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800296E0 7C 08 03 A6 */ mtlr r0 -/* 800296E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800296E8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isDrawOutSideTrim__15renderingAmap_cFv.s b/asm/d/map/d_map/isDrawOutSideTrim__15renderingAmap_cFv.s deleted file mode 100644 index d95ce0493e..0000000000 --- a/asm/d/map/d_map/isDrawOutSideTrim__15renderingAmap_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80028BB4: -/* 80028BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028BB8 7C 08 02 A6 */ mflr r0 -/* 80028BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028BC4 93 C1 00 08 */ stw r30, 8(r1) -/* 80028BC8 7C 7E 1B 78 */ mr r30, r3 -/* 80028BCC 3B E0 00 00 */ li r31, 0 -/* 80028BD0 4B FF FC F5 */ bl getDispType__15renderingAmap_cCFv -/* 80028BD4 2C 03 00 00 */ cmpwi r3, 0 -/* 80028BD8 41 82 00 44 */ beq lbl_80028C1C -/* 80028BDC 7F C3 F3 78 */ mr r3, r30 -/* 80028BE0 4B FF FC E5 */ bl getDispType__15renderingAmap_cCFv -/* 80028BE4 2C 03 00 04 */ cmpwi r3, 4 -/* 80028BE8 41 82 00 34 */ beq lbl_80028C1C -/* 80028BEC 7F C3 F3 78 */ mr r3, r30 -/* 80028BF0 4B FF FC D5 */ bl getDispType__15renderingAmap_cCFv -/* 80028BF4 2C 03 00 03 */ cmpwi r3, 3 -/* 80028BF8 41 82 00 24 */ beq lbl_80028C1C -/* 80028BFC 7F C3 F3 78 */ mr r3, r30 -/* 80028C00 4B FF FC C5 */ bl getDispType__15renderingAmap_cCFv -/* 80028C04 2C 03 00 02 */ cmpwi r3, 2 -/* 80028C08 41 82 00 14 */ beq lbl_80028C1C -/* 80028C0C 7F C3 F3 78 */ mr r3, r30 -/* 80028C10 4B FF FC B5 */ bl getDispType__15renderingAmap_cCFv -/* 80028C14 2C 03 00 05 */ cmpwi r3, 5 -/* 80028C18 40 82 00 18 */ bne lbl_80028C30 -lbl_80028C1C: -/* 80028C1C 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028C20 A8 63 01 AE */ lha r3, 0x1ae(r3) -/* 80028C24 7C 03 00 D0 */ neg r0, r3 -/* 80028C28 7C 00 18 78 */ andc r0, r0, r3 -/* 80028C2C 54 1F 0F FE */ srwi r31, r0, 0x1f -lbl_80028C30: -/* 80028C30 7F E3 FB 78 */ mr r3, r31 -/* 80028C34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028C38 83 C1 00 08 */ lwz r30, 8(r1) -/* 80028C3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028C40 7C 08 03 A6 */ mtlr r0 -/* 80028C44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028C48 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isDrawRoomIcon__6dMap_cCFii.s b/asm/d/map/d_map/isDrawRoomIcon__6dMap_cCFii.s deleted file mode 100644 index 244779f0d6..0000000000 --- a/asm/d/map/d_map/isDrawRoomIcon__6dMap_cCFii.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8002A294: -/* 8002A294 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002A298 7C 08 02 A6 */ mflr r0 -/* 8002A29C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002A2A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002A2A4 48 33 7F 35 */ bl _savegpr_28 -/* 8002A2A8 7C 7C 1B 78 */ mr r28, r3 -/* 8002A2AC 7C 9D 23 78 */ mr r29, r4 -/* 8002A2B0 7C BF 2B 78 */ mr r31, r5 -/* 8002A2B4 3B C0 00 00 */ li r30, 0 -/* 8002A2B8 81 83 00 00 */ lwz r12, 0(r3) -/* 8002A2BC 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 8002A2C0 7D 89 03 A6 */ mtctr r12 -/* 8002A2C4 4E 80 04 21 */ bctrl -/* 8002A2C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002A2CC 40 82 00 0C */ bne lbl_8002A2D8 -/* 8002A2D0 7C 1D F8 00 */ cmpw r29, r31 -/* 8002A2D4 40 82 00 08 */ bne lbl_8002A2DC -lbl_8002A2D8: -/* 8002A2D8 3B C0 00 01 */ li r30, 1 -lbl_8002A2DC: -/* 8002A2DC 7F 83 E3 78 */ mr r3, r28 -/* 8002A2E0 4B FF EE 3D */ bl isRendAllRoom__15renderingAmap_cCFv -/* 8002A2E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002A2E8 41 82 00 28 */ beq lbl_8002A310 -/* 8002A2EC 3B E0 00 00 */ li r31, 0 -/* 8002A2F0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8002A2F4 40 82 00 14 */ bne lbl_8002A308 -/* 8002A2F8 7F A3 EB 78 */ mr r3, r29 -/* 8002A2FC 48 01 4A 15 */ bl isVisitedRoom__10dMapInfo_nFi -/* 8002A300 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002A304 41 82 00 08 */ beq lbl_8002A30C -lbl_8002A308: -/* 8002A308 3B E0 00 01 */ li r31, 1 -lbl_8002A30C: -/* 8002A30C 7F FE FB 78 */ mr r30, r31 -lbl_8002A310: -/* 8002A310 7F C3 F3 78 */ mr r3, r30 -/* 8002A314 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002A318 48 33 7F 0D */ bl _restgpr_28 -/* 8002A31C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002A320 7C 08 03 A6 */ mtlr r0 -/* 8002A324 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002A328 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isDrawRoom__6dMap_cCFii.s b/asm/d/map/d_map/isDrawRoom__6dMap_cCFii.s deleted file mode 100644 index a5580da46e..0000000000 --- a/asm/d/map/d_map/isDrawRoom__6dMap_cCFii.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8002A1DC: -/* 8002A1DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002A1E0 7C 08 02 A6 */ mflr r0 -/* 8002A1E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002A1E8 88 03 00 8E */ lbz r0, 0x8e(r3) -/* 8002A1EC 28 00 00 02 */ cmplwi r0, 2 -/* 8002A1F0 40 82 00 50 */ bne lbl_8002A240 -/* 8002A1F4 88 03 00 8F */ lbz r0, 0x8f(r3) -/* 8002A1F8 28 00 00 03 */ cmplwi r0, 3 -/* 8002A1FC 41 80 00 30 */ blt lbl_8002A22C -/* 8002A200 41 81 00 2C */ bgt lbl_8002A22C -/* 8002A204 38 A0 00 00 */ li r5, 0 -/* 8002A208 80 03 00 84 */ lwz r0, 0x84(r3) -/* 8002A20C 7C 04 00 00 */ cmpw r4, r0 -/* 8002A210 41 82 00 10 */ beq lbl_8002A220 -/* 8002A214 80 03 00 88 */ lwz r0, 0x88(r3) -/* 8002A218 7C 04 00 00 */ cmpw r4, r0 -/* 8002A21C 40 82 00 08 */ bne lbl_8002A224 -lbl_8002A220: -/* 8002A220 38 A0 00 01 */ li r5, 1 -lbl_8002A224: -/* 8002A224 7C A3 2B 78 */ mr r3, r5 -/* 8002A228 48 00 00 1C */ b lbl_8002A244 -lbl_8002A22C: -/* 8002A22C 80 03 00 80 */ lwz r0, 0x80(r3) -/* 8002A230 7C 04 00 50 */ subf r0, r4, r0 -/* 8002A234 7C 00 00 34 */ cntlzw r0, r0 -/* 8002A238 54 03 D9 7E */ srwi r3, r0, 5 -/* 8002A23C 48 00 00 08 */ b lbl_8002A244 -lbl_8002A240: -/* 8002A240 48 01 5C 31 */ bl isDrawRoom__16renderingDAmap_cCFii -lbl_8002A244: -/* 8002A244 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002A248 7C 08 03 A6 */ mtlr r0 -/* 8002A24C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A250 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isDrawType__6dMap_cFi.s b/asm/d/map/d_map/isDrawType__6dMap_cFi.s deleted file mode 100644 index e9f6a9162a..0000000000 --- a/asm/d/map/d_map/isDrawType__6dMap_cFi.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800296EC: -/* 800296EC 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f -/* 800296F0 68 03 00 01 */ xori r3, r0, 1 -/* 800296F4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isOutSideBlackLine__15renderingAmap_cFv.s b/asm/d/map/d_map/isOutSideBlackLine__15renderingAmap_cFv.s deleted file mode 100644 index 27b13898a6..0000000000 --- a/asm/d/map/d_map/isOutSideBlackLine__15renderingAmap_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80028C60: -/* 80028C60 38 A0 00 00 */ li r5, 0 -/* 80028C64 80 83 00 34 */ lwz r4, 0x34(r3) -/* 80028C68 38 04 00 01 */ addi r0, r4, 1 -/* 80028C6C 90 03 00 34 */ stw r0, 0x34(r3) -/* 80028C70 80 83 00 34 */ lwz r4, 0x34(r3) -/* 80028C74 80 6D 88 00 */ lwz r3, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80028C78 A8 03 01 AE */ lha r0, 0x1ae(r3) -/* 80028C7C 7C 04 00 00 */ cmpw r4, r0 -/* 80028C80 40 80 00 08 */ bge lbl_80028C88 -/* 80028C84 38 A0 00 01 */ li r5, 1 -lbl_80028C88: -/* 80028C88 7C A3 2B 78 */ mr r3, r5 -/* 80028C8C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isRendAllRoom__15renderingAmap_cCFv.s b/asm/d/map/d_map/isRendAllRoom__15renderingAmap_cCFv.s deleted file mode 100644 index 7319932c9f..0000000000 --- a/asm/d/map/d_map/isRendAllRoom__15renderingAmap_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002911C: -/* 8002911C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80029120 7C 08 02 A6 */ mflr r0 -/* 80029124 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029128 4B FF F7 9D */ bl getDispType__15renderingAmap_cCFv -/* 8002912C 38 00 00 00 */ li r0, 0 -/* 80029130 2C 03 00 02 */ cmpwi r3, 2 -/* 80029134 41 82 00 18 */ beq lbl_8002914C -/* 80029138 2C 03 00 03 */ cmpwi r3, 3 -/* 8002913C 41 82 00 10 */ beq lbl_8002914C -/* 80029140 2C 03 00 05 */ cmpwi r3, 5 -/* 80029144 41 82 00 08 */ beq lbl_8002914C -/* 80029148 38 00 00 01 */ li r0, 1 -lbl_8002914C: -/* 8002914C 7C 03 03 78 */ mr r3, r0 -/* 80029150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80029154 7C 08 03 A6 */ mtlr r0 -/* 80029158 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002915C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isRendAllRoom__6dMap_cCFv.s b/asm/d/map/d_map/isRendAllRoom__6dMap_cCFv.s deleted file mode 100644 index 74e278dd88..0000000000 --- a/asm/d/map/d_map/isRendAllRoom__6dMap_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800296F8: -/* 800296F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800296FC 7C 08 02 A6 */ mflr r0 -/* 80029700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029704 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80029708 7C 7F 1B 78 */ mr r31, r3 -/* 8002970C 4B FF FA 11 */ bl isRendAllRoom__15renderingAmap_cCFv -/* 80029710 88 1F 00 8E */ lbz r0, 0x8e(r31) -/* 80029714 28 00 00 02 */ cmplwi r0, 2 -/* 80029718 40 82 00 18 */ bne lbl_80029730 -/* 8002971C 88 1F 00 8F */ lbz r0, 0x8f(r31) -/* 80029720 28 00 00 03 */ cmplwi r0, 3 -/* 80029724 41 80 00 0C */ blt lbl_80029730 -/* 80029728 41 81 00 08 */ bgt lbl_80029730 -/* 8002972C 38 60 00 01 */ li r3, 1 -lbl_80029730: -/* 80029730 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80029734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80029738 7C 08 03 A6 */ mtlr r0 -/* 8002973C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029740 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/isRendDoor__15renderingAmap_cCFv.s b/asm/d/map/d_map/isRendDoor__15renderingAmap_cCFv.s deleted file mode 100644 index 5739e7d008..0000000000 --- a/asm/d/map/d_map/isRendDoor__15renderingAmap_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800290C0: -/* 800290C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800290C4 7C 08 02 A6 */ mflr r0 -/* 800290C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800290CC 4B FF F7 F9 */ bl getDispType__15renderingAmap_cCFv -/* 800290D0 38 80 00 01 */ li r4, 1 -/* 800290D4 38 03 FF FF */ addi r0, r3, -1 -/* 800290D8 38 60 FF FF */ li r3, -1 -/* 800290DC 7C 00 20 10 */ subfc r0, r0, r4 -/* 800290E0 7C 03 01 90 */ subfze r0, r3 -/* 800290E4 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800290E8 40 82 00 08 */ bne lbl_800290F0 -/* 800290EC 38 80 00 00 */ li r4, 0 -lbl_800290F0: -/* 800290F0 7C 83 23 78 */ mr r3, r4 -/* 800290F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800290F8 7C 08 03 A6 */ mtlr r0 -/* 800290FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029100 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class.s b/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class.s deleted file mode 100644 index 6c5849cba4..0000000000 --- a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80028A30: -/* 80028A30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028A34 7C 08 02 A6 */ mflr r0 -/* 80028A38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028A3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028A40 93 C1 00 08 */ stw r30, 8(r1) -/* 80028A44 7C 7E 1B 78 */ mr r30, r3 -/* 80028A48 7C 9F 23 78 */ mr r31, r4 -/* 80028A4C 88 84 00 00 */ lbz r4, 0(r4) -/* 80028A50 81 83 00 00 */ lwz r12, 0(r3) -/* 80028A54 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80028A58 7D 89 03 A6 */ mtctr r12 -/* 80028A5C 4E 80 04 21 */ bctrl -/* 80028A60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028A64 41 82 00 88 */ beq lbl_80028AEC -/* 80028A68 7F C3 F3 78 */ mr r3, r30 -/* 80028A6C 48 00 01 49 */ bl isDrawOutSideTrim__15renderingAmap_cFv -/* 80028A70 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028A74 41 82 00 2C */ beq lbl_80028AA0 -/* 80028A78 80 1E 00 38 */ lwz r0, 0x38(r30) -/* 80028A7C 2C 00 00 02 */ cmpwi r0, 2 -/* 80028A80 41 82 00 20 */ beq lbl_80028AA0 -/* 80028A84 88 1F 00 01 */ lbz r0, 1(r31) -/* 80028A88 28 00 00 02 */ cmplwi r0, 2 -/* 80028A8C 40 82 00 60 */ bne lbl_80028AEC -/* 80028A90 7F C3 F3 78 */ mr r3, r30 -/* 80028A94 7F E4 FB 78 */ mr r4, r31 -/* 80028A98 48 01 49 29 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class -/* 80028A9C 48 00 00 50 */ b lbl_80028AEC -lbl_80028AA0: -/* 80028AA0 88 1F 00 01 */ lbz r0, 1(r31) -/* 80028AA4 28 00 00 04 */ cmplwi r0, 4 -/* 80028AA8 40 82 00 38 */ bne lbl_80028AE0 -/* 80028AAC 38 00 00 00 */ li r0, 0 -/* 80028AB0 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80028AB4 48 00 00 1C */ b lbl_80028AD0 -lbl_80028AB8: -/* 80028AB8 7F C3 F3 78 */ mr r3, r30 -/* 80028ABC 7F E4 FB 78 */ mr r4, r31 -/* 80028AC0 48 01 49 01 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class -/* 80028AC4 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 80028AC8 38 03 00 01 */ addi r0, r3, 1 -/* 80028ACC 90 1E 00 3C */ stw r0, 0x3c(r30) -lbl_80028AD0: -/* 80028AD0 80 1E 00 3C */ lwz r0, 0x3c(r30) -/* 80028AD4 2C 00 00 02 */ cmpwi r0, 2 -/* 80028AD8 41 80 FF E0 */ blt lbl_80028AB8 -/* 80028ADC 48 00 00 10 */ b lbl_80028AEC -lbl_80028AE0: -/* 80028AE0 7F C3 F3 78 */ mr r3, r30 -/* 80028AE4 7F E4 FB 78 */ mr r4, r31 -/* 80028AE8 48 01 3E 65 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class -lbl_80028AEC: -/* 80028AEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028AF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80028AF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028AF8 7C 08 03 A6 */ mtlr r0 -/* 80028AFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028B00 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class.s b/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class.s deleted file mode 100644 index a66b037b75..0000000000 --- a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80028B3C: -/* 80028B3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80028B40 7C 08 02 A6 */ mflr r0 -/* 80028B44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028B48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80028B4C 93 C1 00 08 */ stw r30, 8(r1) -/* 80028B50 7C 7E 1B 78 */ mr r30, r3 -/* 80028B54 7C 9F 23 78 */ mr r31, r4 -/* 80028B58 88 84 00 00 */ lbz r4, 0(r4) -/* 80028B5C 81 83 00 00 */ lwz r12, 0(r3) -/* 80028B60 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80028B64 7D 89 03 A6 */ mtctr r12 -/* 80028B68 4E 80 04 21 */ bctrl -/* 80028B6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028B70 41 82 00 2C */ beq lbl_80028B9C -/* 80028B74 7F C3 F3 78 */ mr r3, r30 -/* 80028B78 48 00 00 3D */ bl isDrawOutSideTrim__15renderingAmap_cFv -/* 80028B7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80028B80 41 82 00 10 */ beq lbl_80028B90 -/* 80028B84 80 1E 00 38 */ lwz r0, 0x38(r30) -/* 80028B88 2C 00 00 02 */ cmpwi r0, 2 -/* 80028B8C 40 82 00 10 */ bne lbl_80028B9C -lbl_80028B90: -/* 80028B90 7F C3 F3 78 */ mr r3, r30 -/* 80028B94 7F E4 FB 78 */ mr r4, r31 -/* 80028B98 48 01 3E A9 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class -lbl_80028B9C: -/* 80028B9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80028BA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80028BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028BA8 7C 08 03 A6 */ mtlr r0 -/* 80028BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028BB0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class.s b/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class.s deleted file mode 100644 index e166e0a149..0000000000 --- a/asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800289F0: -/* 800289F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800289F4 7C 08 02 A6 */ mflr r0 -/* 800289F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800289FC 48 01 42 29 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class -/* 80028A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80028A04 7C 08 03 A6 */ mtlr r0 -/* 80028A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028A0C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/resCopy__6dMap_cFv.s b/asm/d/map/d_map/resCopy__6dMap_cFv.s deleted file mode 100644 index 26c74af4b5..0000000000 --- a/asm/d/map/d_map/resCopy__6dMap_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80029818: -/* 80029818 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002981C 7C 08 02 A6 */ mflr r0 -/* 80029820 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029824 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80029828 7C 7F 1B 78 */ mr r31, r3 -/* 8002982C 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80029830 80 9F 00 40 */ lwz r4, 0x40(r31) -/* 80029834 38 A0 01 BC */ li r5, 0x1bc -/* 80029838 48 24 61 05 */ bl cLib_memCpy__FPvPCvUl -/* 8002983C 7F E3 FB 78 */ mr r3, r31 -/* 80029840 4B FF F9 21 */ bl getStayType__15renderingAmap_cCFv -/* 80029844 2C 03 00 00 */ cmpwi r3, 0 -/* 80029848 40 82 00 18 */ bne lbl_80029860 -/* 8002984C 7F E3 FB 78 */ mr r3, r31 -/* 80029850 38 80 00 01 */ li r4, 1 -/* 80029854 38 A0 00 2C */ li r5, 0x2c -/* 80029858 C0 22 82 E0 */ lfs f1, lit_4284(r2) -/* 8002985C 48 00 08 09 */ bl copyPalette__6dMap_cFiif -lbl_80029860: -/* 80029860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80029864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80029868 7C 08 03 A6 */ mtlr r0 -/* 8002986C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029870 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/setAmapPaletteColor__6dMap_cFiUcUcUcUc.s b/asm/d/map/d_map/setAmapPaletteColor__6dMap_cFiUcUcUcUc.s deleted file mode 100644 index bed459f397..0000000000 --- a/asm/d/map/d_map/setAmapPaletteColor__6dMap_cFiUcUcUcUc.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8002A148: -/* 8002A148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002A14C 7C 08 02 A6 */ mflr r0 -/* 8002A150 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002A154 55 00 06 3E */ clrlwi r0, r8, 0x18 -/* 8002A158 28 00 00 E0 */ cmplwi r0, 0xe0 -/* 8002A15C 54 C3 06 36 */ rlwinm r3, r6, 0, 0x18, 0x1b -/* 8002A160 50 A3 25 2E */ rlwimi r3, r5, 4, 0x14, 0x17 -/* 8002A164 50 E3 E7 3E */ rlwimi r3, r7, 0x1c, 0x1c, 0x1f -/* 8002A168 51 03 3C 66 */ rlwimi r3, r8, 7, 0x11, 0x13 -/* 8002A16C 41 80 00 14 */ blt lbl_8002A180 -/* 8002A170 54 C0 15 B4 */ rlwinm r0, r6, 2, 0x16, 0x1a -/* 8002A174 50 A0 3C 6A */ rlwimi r0, r5, 7, 0x11, 0x15 -/* 8002A178 50 E0 EE FE */ rlwimi r0, r7, 0x1d, 0x1b, 0x1f -/* 8002A17C 60 03 80 00 */ ori r3, r0, 0x8000 -lbl_8002A180: -/* 8002A180 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 8002A184 54 84 18 38 */ slwi r4, r4, 3 -/* 8002A188 7C A0 22 14 */ add r5, r0, r4 -/* 8002A18C B0 65 00 00 */ sth r3, 0(r5) -/* 8002A190 B0 65 00 02 */ sth r3, 2(r5) -/* 8002A194 B0 65 00 04 */ sth r3, 4(r5) -/* 8002A198 B0 65 00 06 */ sth r3, 6(r5) -/* 8002A19C 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 8002A1A0 7C 60 22 14 */ add r3, r0, r4 -/* 8002A1A4 38 80 00 08 */ li r4, 8 -/* 8002A1A8 48 31 14 35 */ bl DCStoreRange -/* 8002A1AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002A1B0 7C 08 03 A6 */ mtlr r0 -/* 8002A1B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A1B8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFif.s b/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFif.s deleted file mode 100644 index 918e49b2d0..0000000000 --- a/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFif.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80029F84: -/* 80029F84 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80029F88 7C 08 02 A6 */ mflr r0 -/* 80029F8C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80029F90 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 80029F94 54 87 18 38 */ slwi r7, r4, 3 -/* 80029F98 7D 20 3A 14 */ add r9, r0, r7 -/* 80029F9C 80 63 00 40 */ lwz r3, 0x40(r3) -/* 80029FA0 7C 63 3A 2E */ lhzx r3, r3, r7 -/* 80029FA4 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 80029FA8 41 82 00 18 */ beq lbl_80029FC0 -/* 80029FAC 54 66 CE 38 */ rlwinm r6, r3, 0x19, 0x18, 0x1c -/* 80029FB0 54 65 F6 38 */ rlwinm r5, r3, 0x1e, 0x18, 0x1c -/* 80029FB4 54 64 1E 38 */ rlwinm r4, r3, 3, 0x18, 0x1c -/* 80029FB8 38 00 00 FF */ li r0, 0xff -/* 80029FBC 48 00 00 14 */ b lbl_80029FD0 -lbl_80029FC0: -/* 80029FC0 54 66 E6 36 */ rlwinm r6, r3, 0x1c, 0x18, 0x1b -/* 80029FC4 54 65 06 36 */ rlwinm r5, r3, 0, 0x18, 0x1b -/* 80029FC8 54 64 26 36 */ rlwinm r4, r3, 4, 0x18, 0x1b -/* 80029FCC 54 60 CE 34 */ rlwinm r0, r3, 0x19, 0x18, 0x1a -lbl_80029FD0: -/* 80029FD0 54 C6 06 3E */ clrlwi r6, r6, 0x18 -/* 80029FD4 54 A8 06 3E */ clrlwi r8, r5, 0x18 -/* 80029FD8 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80029FDC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80029FE0 C8 42 82 B0 */ lfd f2, lit_3749(r2) -/* 80029FE4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80029FE8 3C 00 43 30 */ lis r0, 0x4330 -/* 80029FEC 90 01 00 08 */ stw r0, 8(r1) -/* 80029FF0 C8 01 00 08 */ lfd f0, 8(r1) -/* 80029FF4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80029FF8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80029FFC FC 00 00 1E */ fctiwz f0, f0 -/* 8002A000 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8002A004 80 61 00 14 */ lwz r3, 0x14(r1) -/* 8002A008 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002A00C 28 00 00 E0 */ cmplwi r0, 0xe0 -/* 8002A010 54 A0 06 36 */ rlwinm r0, r5, 0, 0x18, 0x1b -/* 8002A014 50 C0 25 2E */ rlwimi r0, r6, 4, 0x14, 0x17 -/* 8002A018 50 80 E7 3E */ rlwimi r0, r4, 0x1c, 0x1c, 0x1f -/* 8002A01C 50 60 3C 66 */ rlwimi r0, r3, 7, 0x11, 0x13 -/* 8002A020 41 80 00 14 */ blt lbl_8002A034 -/* 8002A024 55 00 15 B4 */ rlwinm r0, r8, 2, 0x16, 0x1a -/* 8002A028 50 C0 3C 6A */ rlwimi r0, r6, 7, 0x11, 0x15 -/* 8002A02C 50 80 EE FE */ rlwimi r0, r4, 0x1d, 0x1b, 0x1f -/* 8002A030 60 00 80 00 */ ori r0, r0, 0x8000 -lbl_8002A034: -/* 8002A034 B0 09 00 00 */ sth r0, 0(r9) -/* 8002A038 B0 09 00 02 */ sth r0, 2(r9) -/* 8002A03C B0 09 00 04 */ sth r0, 4(r9) -/* 8002A040 B0 09 00 06 */ sth r0, 6(r9) -/* 8002A044 80 0D 88 00 */ lwz r0, m_res__22dMap_HIO_prm_res_dst_s(r13) -/* 8002A048 7C 60 3A 14 */ add r3, r0, r7 -/* 8002A04C 38 80 00 08 */ li r4, 8 -/* 8002A050 48 31 15 8D */ bl DCStoreRange -/* 8002A054 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002A058 7C 08 03 A6 */ mtlr r0 -/* 8002A05C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002A060 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFiif.s b/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFiif.s deleted file mode 100644 index 3209658e84..0000000000 --- a/asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFiif.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800297A8: -/* 800297A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800297AC 7C 08 02 A6 */ mflr r0 -/* 800297B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800297B4 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 800297B8 39 61 00 18 */ addi r11, r1, 0x18 -/* 800297BC 48 33 8A 1D */ bl _savegpr_28 -/* 800297C0 7C 7C 1B 78 */ mr r28, r3 -/* 800297C4 FF E0 08 90 */ fmr f31, f1 -/* 800297C8 7C 64 28 50 */ subf r3, r4, r5 -/* 800297CC 3B E3 00 01 */ addi r31, r3, 1 -/* 800297D0 7C 9E 23 78 */ mr r30, r4 -/* 800297D4 3B A0 00 00 */ li r29, 0 -/* 800297D8 48 00 00 1C */ b lbl_800297F4 -lbl_800297DC: -/* 800297DC 7F 83 E3 78 */ mr r3, r28 -/* 800297E0 7F C4 F3 78 */ mr r4, r30 -/* 800297E4 FC 20 F8 90 */ fmr f1, f31 -/* 800297E8 48 00 07 9D */ bl setMapPaletteColorAlphaPer__6dMap_cFif -/* 800297EC 3B DE 00 01 */ addi r30, r30, 1 -/* 800297F0 3B BD 00 01 */ addi r29, r29, 1 -lbl_800297F4: -/* 800297F4 7C 1D F8 00 */ cmpw r29, r31 -/* 800297F8 41 80 FF E4 */ blt lbl_800297DC -/* 800297FC CB E1 00 18 */ lfd f31, 0x18(r1) -/* 80029800 39 61 00 18 */ addi r11, r1, 0x18 -/* 80029804 48 33 8A 21 */ bl _restgpr_28 -/* 80029808 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002980C 7C 08 03 A6 */ mtlr r0 -/* 80029810 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029814 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index c44fed9d69..d10b8eeef3 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1899,6 +1899,7 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num); +bool dComIfGp_isLightDropMapVisible(); inline void dComIfGp_itemDataInit() { g_dComIfG_gameInfo.play.itemInit(); diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 73d69d7ddb..a5ac66ec64 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -30,7 +30,13 @@ public: class dDlst_base_c { public: dDlst_base_c() {} + + // hack, remove later + #ifdef NO_INLINE_DLSTBASE_DRAW virtual void draw(); + #else + virtual void draw() {} + #endif }; class dDlst_snapShot_c : public dDlst_base_c { diff --git a/include/d/map/d_map.h b/include/d/map/d_map.h index f813cbc16e..357c91f889 100644 --- a/include/d/map/d_map.h +++ b/include/d/map/d_map.h @@ -1,6 +1,123 @@ #ifndef D_MAP_D_MAP_H #define D_MAP_D_MAP_H -#include "dolphin/types.h" +#include "d/map/d_map_path_dmap.h" +#include "d/d_tresure.h" + +class renderingAmap_c : public renderingPlusDoorAndCursor_c { +public: + /* 800288C4 */ int getDispType() const; + /* 80028BB4 */ bool isDrawOutSideTrim(); + /* 80028C4C */ int getOutSideBlackLineNumber(); + /* 80028C60 */ bool isOutSideBlackLine(); + /* 80028C90 */ int getLineWidthSub(int); + /* 80029160 */ int getStayType() const; + /* 8002AE6C */ renderingAmap_c() {} + + /* 800284D0 */ virtual void draw(); + /* 8002ADB0 */ virtual ~renderingAmap_c() {} + /* 80028EE4 */ virtual GXColor* getLineColor(int, int); + /* 80028DD4 */ virtual int getLineWidth(int); + /* 80028A10 */ virtual void drawPath(); + /* 80028A30 */ virtual void rendering(dDrawPath_c::line_class const*); + /* 80028B3C */ virtual void rendering(dDrawPath_c::poly_class const*); + /* 800289F0 */ virtual void rendering(dDrawPath_c::room_class const*); + /* 80028960 */ virtual void beforeDrawPath(); + /* 800289D0 */ virtual void afterDrawPath(); + /* 80028FB4 */ virtual const GXColor* getDecoLineColor(int, int); + /* 80028CF4 */ virtual s32 getDecorationLineWidth(int); + /* 80029058 */ virtual int getIconGroupNumber(u8) const; + /* 80029078 */ virtual bool hasMap() const; + /* 8002911C */ virtual bool isRendAllRoom() const; + /* 800290C0 */ virtual bool isRendDoor() const; + /* 80029104 */ virtual bool isCheckFloor() const; + /* 80029190 */ virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const; + /* 8002910C */ virtual bool isRendRestart() const; + /* 80029114 */ virtual bool isRendCursor() const; + /* 8002B000 */ virtual bool isRendIcon() const { return true; } + /* 800284BC */ virtual f32 getIconSize(u8) const; + /* 80028B04 */ virtual f32 getPlayerCursorSize(); + /* 80028B10 */ virtual f32 getRestartCursorSize(); + virtual void setAmapPaletteColor(int, u8, u8, u8, u8) = 0; + virtual bool isSpecialOutline() = 0; + + static const int PALETTE_NUMBER = 50; + +private: + /* 0x34 */ s32 m_outSideBlackLineCnt; + /* 0x38 */ s32 field_0x38; + /* 0x3C */ s32 field_0x3c; +}; // Size: 0x40 + +struct dMap_prm_res_s; + +class dMap_c : public renderingAmap_c { +public: + /* 8002974C */ void copyPalette(); + /* 8002A064 */ void copyPalette(int, int, f32); + /* 80029F84 */ void setMapPaletteColorAlphaPer(int, f32); + /* 800297A8 */ void setMapPaletteColorAlphaPer(int, int, f32); + /* 80029818 */ void resCopy(); + /* 80029874 */ dMap_c(int, int, int, int); + /* 80029A1C */ void _remove(); + /* 80029A8C */ void getMapMinMaxXZ(int, f32*, f32*, f32*, f32*); + /* 80029C10 */ void getPack(int, f32*, f32*); + /* 80029D78 */ void calcMapCenterXZ(int, f32*, f32*); + /* 80029E1C */ void calcMapCmPerTexel(int, f32*); + /* 8002A1BC */ int getDispType() const; + /* 8002A32C */ void _move(f32, f32, int, f32); + /* 8002AB54 */ void _draw(); + + /* 8002AF20 */ virtual ~dMap_c() { _remove(); } + /* 800296EC */ virtual bool isDrawType(int); + /* 80028DF4 */ virtual const GXColor* getColor(int); + /* 800296F8 */ virtual bool isRendAllRoom() const; + /* 8002A254 */ virtual int getRoomNoSingle(); + /* 8002A1DC */ virtual bool isDrawRoom(int, int) const; + /* 8002A294 */ virtual bool isDrawRoomIcon(int, int) const; + /* 80029038 */ virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const; + /* 8002ABAC */ virtual dTres_c::typeGroupData_c* getFirstData(u8); + /* 8002ABCC */ virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*); + /* 8002A148 */ virtual void setAmapPaletteColor(int, u8, u8, u8, u8); + /* 80029744 */ virtual bool isSpecialOutline(); + + bool isDraw() const { return renderingDAmap_c::isDraw(); } + + ResTIMG* getResTIMGPointer() { return mResTIMG; } + f32 getTopEdgePlus() { return mTopEdgePlus; } + f32 getPackPlusZ() { return mPackPlusZ; } + f32 getPackZ() { return mPackZ; } + f32 getTexelPerCm() { return 1.0f / field_0x58; } + u16 getTexSizeY() { return mTexSizeY; } + f32 getRightEdgePlus() { return mRightEdgePlus; } + f32 getPackX() { return mPackX; } + +private: + /* 0x40 */ dMap_prm_res_s* m_res_src; + /* 0x44 */ dMap_prm_res_s* m_res; + /* 0x48 */ ResTIMG* mResTIMG; + /* 0x4C */ u8* mImage_p; + /* 0x50 */ f32 mCenterX; + /* 0x54 */ f32 mCenterZ; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 mPackX; + /* 0x60 */ f32 mPackZ; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 mPackPlusZ; + /* 0x6C */ f32 mRightEdgePlus; + /* 0x70 */ f32 mTopEdgePlus; + /* 0x74 */ int field_0x74; + /* 0x78 */ u16 mTexSizeX; + /* 0x7A */ u16 mTexSizeY; + /* 0x7C */ int mStayRoomNo; + /* 0x80 */ int field_0x80; + /* 0x84 */ int field_0x84; + /* 0x88 */ int field_0x88; + /* 0x8C */ u8 field_0x8c; + /* 0x8D */ u8 field_0x8d; + /* 0x8E */ u8 field_0x8e; + /* 0x8F */ u8 field_0x8f; + /* 0x90 */ u8 field_0x90; +}; // Size: 0x94 #endif /* D_MAP_D_MAP_H */ diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index 16dc959ed7..fb8aefc50f 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -46,10 +46,10 @@ public: /* 8003CB00 */ void rendering(dDrawPath_c::group_class const*); /* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*); - /* 8002AD3C */ virtual ~dDrawPath_c(); - /* 8002ABF0 */ virtual bool isDrawType(int); - virtual GXColor* getColor(int) = 0; - /* 8002AD84 */ virtual GXColor* getLineColor(int, int); + /* 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); } virtual int getLineWidth(int) = 0; virtual bool isSwitch(dDrawPath_c::group_class const*) = 0; virtual bool isRenderingFloor(int) = 0; @@ -63,7 +63,7 @@ public: class dDrawPathWithNormalPattern_c : public dDrawPath_c { public: - /* 8002ACE0 */ virtual ~dDrawPathWithNormalPattern_c(); + /* 8002ACE0 */ virtual ~dDrawPathWithNormalPattern_c() {} }; class dRenderingMap_c : public dDrawPathWithNormalPattern_c { @@ -71,15 +71,15 @@ public: /* 8003CD38 */ void makeResTIMG(ResTIMG*, u16, u16, u8*, u8*, u16) const; /* 8003CDAC */ void renderingMap(); - /* 8002AC74 */ virtual ~dRenderingMap_c(); + /* 8002AC74 */ virtual ~dRenderingMap_c() {} virtual void beforeDrawPath() = 0; virtual void afterDrawPath() = 0; + virtual void preDrawPath() = 0; virtual void postDrawPath() = 0; virtual bool isDrawPath() = 0; virtual void preRenderingMap() = 0; virtual void postRenderingMap() = 0; - virtual GXColor* getBackColor() const = 0; }; class dRenderingFDAmap_c : public dRenderingMap_c { @@ -102,10 +102,11 @@ public: /* 8003D0AC */ void drawBack() const; /* 8003D3C0 */ void renderingDecoration(dDrawPath_c::line_class const*); - /* 8002ABF8 */ virtual ~dRenderingFDAmap_c(); + /* 8002ABF8 */ virtual ~dRenderingFDAmap_c() {} /* 8003D188 */ virtual void preRenderingMap(); /* 8003D320 */ virtual void postRenderingMap(); - /* 8003D68C */ virtual GXColor* getDecoLineColor(int, int); + virtual GXColor* getBackColor() const = 0; + /* 8003D68C */ virtual const GXColor* getDecoLineColor(int, int); /* 8003D6B8 */ virtual s32 getDecorationLineWidth(int); bool isDrawAreaCheck(const Vec& param_0) { diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 1f2386c7ac..059531080a 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -21,6 +21,11 @@ public: return (mLayerList + 0x40*layerNo)[roomNo]; } + static f32 getMinX() { return mMinX; } + static f32 getMinZ() { return mMinZ; } + static f32 getMaxX() { return mMaxX; } + static f32 getMaxZ() { return mMaxZ; } + static dDrawPath_c::room_class** mLayerList; // this doesn't seem right, but can't figure it out atm static f32 mMinX; static f32 mMaxX; @@ -61,6 +66,19 @@ public: /* 8003F734 */ static void create(); /* 8003F754 */ static void remove(); + static s8 getNowStayFloorNo() { + JUT_ASSERT(mNowStayFloorNoDecisionFlg); + + s8 floor_no = 0; + if (mNowStayFloorNoDecisionFlg) { + floor_no = mNowStayFloorNo; + } + return floor_no; + } + + static void setNextRoomNoForMapPat0(int i_roomNo) { mNextRoomNo = i_roomNo; } + static int getNextRoomNoForMapPat0() { return mNextRoomNo; } + static int mNextRoomNo; static int mNowStayRoomNo; static s8 mNowStayFloorNo; @@ -85,7 +103,7 @@ public: /* 80040094 */ int getNextDrawRoomNo(int); /* 8003FE18 */ virtual void draw(); - /* 8002B150 */ virtual ~renderingDAmap_c(); + /* 8002B150 */ virtual ~renderingDAmap_c() {} /* 8003FD9C */ virtual bool isSwitch(dDrawPath_c::group_class const*); /* 8003FE54 */ virtual bool isRenderingFloor(int); /* 80040134 */ virtual dDrawPath_c::room_class* getFirstRoomPointer(); @@ -121,13 +139,14 @@ class stage_tgsc_data_class; class renderingPlusDoor_c : public renderingDAmap_c { public: + renderingPlusDoor_c() {} /* 80040574 */ void drawDoor1(); /* 800405B8 */ void drawDoor2(); /* 800405FC */ void drawDoorCommon(stage_tgsc_data_class const*, int, bool); /* 80040710 */ bool checkDispDoorS(int, int, f32); /* 80040838 */ void drawNormalDoorS(stage_tgsc_data_class const*, int, int, bool); - /* 8002B0B4 */ virtual ~renderingPlusDoor_c(); + /* 8002B0B4 */ virtual ~renderingPlusDoor_c() {} /* 8004145C */ virtual void beforeDrawPath(); /* 80040518 */ virtual void afterDrawPath(); virtual bool isRendRestart() const = 0; @@ -141,8 +160,9 @@ public: /* 80040E84 */ void drawTreasureAfterPlayer(); /* 80041208 */ void drawIconSingle(Vec const&, f32, f32); /* 800412C0 */ void drawCursor(Vec const&, s16, int, f32); + renderingPlusDoorAndCursor_c() {} - /* 8002B008 */ virtual ~renderingPlusDoorAndCursor_c(); + /* 8002B008 */ virtual ~renderingPlusDoorAndCursor_c() {} /* 800402FC */ virtual void afterDrawPath(); virtual f32 getIconSize(u8) const = 0; /* 80040ADC */ virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const; diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h index df6e5f8aa8..3c26e0e56f 100644 --- a/include/d/meter/d_meter_map.h +++ b/include/d/meter/d_meter_map.h @@ -4,120 +4,7 @@ #include "d/map/d_map_path_dmap.h" class J2DPicture; - -// move renderingAmap_c + dMap_c later -class renderingAmap_c : public renderingPlusDoorAndCursor_c { -public: - /* 800288C4 */ void getDispType() const; - /* 80028BB4 */ void isDrawOutSideTrim(); - /* 80028C4C */ void getOutSideBlackLineNumber(); - /* 80028C60 */ void isOutSideBlackLine(); - /* 80028C90 */ void getLineWidthSub(int); - /* 80029160 */ void getStayType() const; - /* 8002AE6C */ renderingAmap_c(); - - /* 800284D0 */ virtual void draw(); - /* 8002ADB0 */ virtual ~renderingAmap_c(); - /* 80028EE4 */ virtual GXColor* getLineColor(int, int); - /* 80028DD4 */ virtual int getLineWidth(int); - /* 80028A10 */ virtual void drawPath(); - /* 80028A30 */ virtual void rendering(dDrawPath_c::line_class const*); - /* 80028B3C */ virtual void rendering(dDrawPath_c::poly_class const*); - /* 800289F0 */ virtual void rendering(dDrawPath_c::room_class const*); - /* 80028960 */ virtual void beforeDrawPath(); - /* 800289D0 */ virtual void afterDrawPath(); - /* 80028FB4 */ virtual GXColor* getDecoLineColor(int, int); - /* 80028CF4 */ virtual s32 getDecorationLineWidth(int); - /* 80029058 */ virtual int getIconGroupNumber(u8) const; - /* 80029078 */ virtual bool hasMap() const; - /* 8002911C */ virtual bool isRendAllRoom() const; - /* 800290C0 */ virtual bool isRendDoor() const; - /* 80029104 */ virtual bool isCheckFloor() const; - /* 80029190 */ virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const; - /* 8002910C */ virtual bool isRendRestart() const; - /* 80029114 */ virtual bool isRendCursor() const; - /* 8002B000 */ virtual bool isRendIcon() const; - /* 800284BC */ virtual f32 getIconSize(u8) const; - /* 80028B04 */ virtual f32 getPlayerCursorSize(); - /* 80028B10 */ virtual f32 getRestartCursorSize(); - virtual void setAmapPaletteColor(int, u8, u8, u8, u8) = 0; - virtual bool isSpecialOutline() = 0; - -private: - /* 0x34 */ s32 m_outSideBlackLineCnt; - /* 0x38 */ s32 field_0x38; - /* 0x3C */ s32 field_0x3c; -}; // Size: 0x40 - -class dMap_c : public renderingAmap_c { -public: - /* 8002974C */ void copyPalette(); - /* 8002A064 */ void copyPalette(int, int, f32); - /* 80029F84 */ void setMapPaletteColorAlphaPer(int, f32); - /* 800297A8 */ void setMapPaletteColorAlphaPer(int, int, f32); - /* 80029818 */ void resCopy(); - /* 80029874 */ dMap_c(int, int, int, int); - /* 80029A1C */ void _remove(); - /* 80029A8C */ void getMapMinMaxXZ(int, f32*, f32*, f32*, f32*); - /* 80029C10 */ void getPack(int, f32*, f32*); - /* 80029D78 */ void calcMapCenterXZ(int, f32*, f32*); - /* 80029E1C */ void calcMapCmPerTexel(int, f32*); - /* 8002A1BC */ void getDispType() const; - /* 8002A32C */ void _move(f32, f32, int, f32); - /* 8002AB54 */ void _draw(); - - /* 8002AF20 */ virtual ~dMap_c(); - /* 800296EC */ virtual bool isDrawType(int); - /* 80028DF4 */ virtual GXColor* getColor(int); - /* 800296F8 */ virtual bool isRendAllRoom() const; - /* 8002A254 */ virtual int getRoomNoSingle(); - /* 8002A1DC */ virtual bool isDrawRoom(int, int) const; - /* 8002A294 */ virtual bool isDrawRoomIcon(int, int) const; - /* 80029038 */ virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const; - /* 8002ABAC */ virtual dTres_c::typeGroupData_c* getFirstData(u8); - /* 8002ABCC */ virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*); - /* 8002A148 */ virtual void setAmapPaletteColor(int, u8, u8, u8, u8); - /* 80029744 */ virtual bool isSpecialOutline(); - - bool isDraw() const { return renderingDAmap_c::isDraw(); } - - ResTIMG* getResTIMGPointer() { return mResTIMG; } - f32 getTopEdgePlus() { return mTopEdgePlus; } - f32 getPackPlusZ() { return mPackPlusZ; } - f32 getPackZ() { return mPackZ; } - f32 getTexelPerCm() { return 1.0f / field_0x58; } - u16 getTexSizeY() { return mTexSizeH; } - f32 getRightEdgePlus() { return mRightEdgePlus; } - f32 getPackX() { return mPackX; } - -private: - /* 0x40 */ u8* m_res_src; - /* 0x44 */ u8* m_res; - /* 0x48 */ ResTIMG* mResTIMG; - /* 0x4C */ u8* mImage_p; - /* 0x50 */ f32 mCenterX; - /* 0x54 */ f32 mCenterZ; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 mPackX; - /* 0x60 */ f32 mPackZ; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 mPackPlusZ; - /* 0x6C */ f32 mRightEdgePlus; - /* 0x70 */ f32 mTopEdgePlus; - /* 0x74 */ int field_0x74; - /* 0x78 */ u16 mTexSizeW; - /* 0x7A */ u16 mTexSizeH; - /* 0x7C */ s32 mStayRoomNo; - /* 0x80 */ int field_0x80; - /* 0x84 */ int field_0x84; - /* 0x88 */ int field_0x88; - /* 0x8C */ u8 field_0x8c; - /* 0x8D */ u8 field_0x8d; - /* 0x8E */ u8 field_0x8e; - /* 0x8F */ u8 field_0x8f; - /* 0x90 */ u8 field_0x90; -}; // Size: 0x94 - +class dMap_c; class dMeterMap_c : public dDlst_base_c { public: /* 8020D49C */ static bool isEnableDispMap(); diff --git a/obj_files.mk b/obj_files.mk index 8a4ace86ad..eaf2d0c1c6 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1085,4 +1085,5 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/src/d/bg/d_bg_s_acch.o \ $(BUILD_DIR)/src/d/bg/d_bg_s_poly_pass_chk.o \ $(BUILD_DIR)/src/f_op/f_op_actor_mng.o \ + $(BUILD_DIR)/src/d/map/d_map.o \
\ No newline at end of file diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 4180434c8c..06ef8483c1 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -3,6 +3,8 @@ * */ +#define NO_INLINE_DLSTBASE_DRAW + #include "d/d_bright_check.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 7f76d1fcc6..cc3686d0b8 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_drawlist // +#define NO_INLINE_DLSTBASE_DRAW + #include "d/d_drawlist.h" #include "d/s/d_s_play.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 68bf413a6c..4c3717c882 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_name // +#define NO_INLINE_DLSTBASE_DRAW + #include "d/d_name.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 8f82f3839c..26213d647d 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_scope // +#define NO_INLINE_DLSTBASE_DRAW + #include "d/d_scope.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JUtility/JUTTexture.h" diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 5860fc6bbe..6b90995313 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -3,6 +3,8 @@ * File Select Screen File Info */ +#define NO_INLINE_DLSTBASE_DRAW + #include "d/file/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index 13046935ff..b4d44a065f 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -1,791 +1,439 @@ -// -// Generated By: dol2asm -// Translation Unit: d/map/d_map -// - -#include "d/map/d_map.h" -#include "dol2asm.h" - -// -// Types: -// - -struct renderingPlusDoor_c { - /* 8002B0B4 */ ~renderingPlusDoor_c(); -}; - -struct dTres_c { - struct typeGroupData_c {}; - - struct data_s {}; - - /* 8009C4B0 */ void getTypeToTypeGroupNo(u8); -}; - -struct renderingPlusDoorAndCursor_c { - /* 8002B008 */ ~renderingPlusDoorAndCursor_c(); - /* 800402FC */ void afterDrawPath(); - /* 80040A94 */ void getFirstData(u8); - /* 80040AB8 */ void getNextData(dTres_c::typeGroupData_c*); - /* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const; -}; - -struct dDrawPath_c { - struct room_class {}; - - struct line_class {}; - - struct poly_class {}; - - struct group_class {}; - - /* 8002ABF0 */ bool isDrawType(int); - /* 8002AD3C */ ~dDrawPath_c(); - /* 8002AD84 */ void getLineColor(int, int); - /* 8003CA40 */ void rendering(dDrawPath_c::poly_class const*); - /* 8003CC24 */ void rendering(dDrawPath_c::room_class const*); - /* 8003C94C */ void rendering(dDrawPath_c::line_class const*); - /* 8003CCC4 */ void drawPath(); -}; - -struct Vec {}; - -struct renderingDAmap_c { - /* 8002B150 */ ~renderingDAmap_c(); - /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); - /* 8003FD08 */ void entry(f32, f32, f32, int, s8); - /* 8003FD9C */ void isSwitch(dDrawPath_c::group_class const*); - /* 8003FE18 */ void draw(); - /* 8003FE4C */ void getBackColor() const; - /* 8003FE54 */ void isRenderingFloor(int); - /* 8003FE70 */ void isDrawRoom(int, int) const; - /* 8003FF14 */ void preDrawPath(); - /* 8003FFC4 */ void postDrawPath(); - /* 8003FFEC */ void getRoomNoSingle(); - /* 80040134 */ void getFirstRoomPointer(); - /* 800401E8 */ void getNextRoomPointer(); - /* 800402C0 */ void isDrawPath(); - /* 800402E0 */ bool getFirstDrawLayerNo(); - /* 800402E8 */ void getNextDrawLayerNo(int); - /* 800409B4 */ void isDrawRoomIcon(int, int) const; - /* 800409E0 */ void isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, - Vec const*) const; - /* 80040AE4 */ void getIconGroupNumber(u8) const; -}; - -struct renderingAmap_c { - /* 800284BC */ void getIconSize(u8) const; - /* 800284D0 */ void draw(); - /* 800288C4 */ void getDispType() const; - /* 80028960 */ void beforeDrawPath(); - /* 800289D0 */ void afterDrawPath(); - /* 80028A30 */ void rendering(dDrawPath_c::line_class const*); - /* 80028B3C */ void rendering(dDrawPath_c::poly_class const*); - /* 800289F0 */ void rendering(dDrawPath_c::room_class const*); - /* 80028A10 */ void drawPath(); - /* 80028B04 */ void getPlayerCursorSize(); - /* 80028B10 */ void getRestartCursorSize(); - /* 80028BB4 */ void isDrawOutSideTrim(); - /* 80028C4C */ void getOutSideBlackLineNumber(); - /* 80028C60 */ void isOutSideBlackLine(); - /* 80028C90 */ void getLineWidthSub(int); - /* 80028CF4 */ void getDecorationLineWidth(int); - /* 80028DD4 */ void getLineWidth(int); - /* 80028EE4 */ void getLineColor(int, int); - /* 80028FB4 */ void getDecoLineColor(int, int); - /* 80029058 */ void getIconGroupNumber(u8) const; - /* 80029078 */ void hasMap() const; - /* 800290C0 */ void isRendDoor() const; - /* 80029104 */ bool isCheckFloor() const; - /* 8002910C */ bool isRendRestart() const; - /* 80029114 */ bool isRendCursor() const; - /* 8002911C */ void isRendAllRoom() const; - /* 80029160 */ void getStayType() const; - /* 80029190 */ void isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const; - /* 8002ADB0 */ ~renderingAmap_c(); - /* 8002AE6C */ renderingAmap_c(); - /* 8002B000 */ bool isRendIcon() const; -}; - -struct dSv_memBit_c { - /* 800347E8 */ void isTbox(int) const; - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dSv_danBit_c { - /* 80034BE8 */ void isSwitch(int) const; -}; - -struct dStage_roomControl_c { - static u8 mStatus[65792]; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; +/** + * d_map.cpp + * + */ -struct ResTIMG {}; +#define NO_INLINE_DLSTBASE_DRAW -struct dRenderingMap_c { - /* 8002AC74 */ ~dRenderingMap_c(); - /* 8003CD38 */ void makeResTIMG(ResTIMG*, u16, u16, u8*, u8*, u16) const; -}; +#include "d/map/d_map.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "SSystem/SComponent/c_counter.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" -struct dRenderingFDAmap_c { - /* 8002ABF8 */ ~dRenderingFDAmap_c(); - /* 8003D188 */ void preRenderingMap(); - /* 8003D320 */ void postRenderingMap(); - /* 8003D3C0 */ void renderingDecoration(dDrawPath_c::line_class const*); +struct dMpath_RGB5A3_s { + /* 0x0 */ u16 color; }; -struct dMpath_c { - static f32 mMinX; - static f32 mMaxX; - static f32 mMinZ; - static f32 mMaxZ; +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_c { - /* 80028DF4 */ void getColor(int); - /* 80029038 */ void getIconPosition(dTres_c::typeGroupData_c*) const; - /* 800296EC */ void isDrawType(int); - /* 800296F8 */ void isRendAllRoom() const; - /* 80029744 */ bool isSpecialOutline(); - /* 8002974C */ void copyPalette(); - /* 8002A064 */ void copyPalette(int, int, f32); - /* 80029F84 */ void setMapPaletteColorAlphaPer(int, f32); - /* 800297A8 */ void setMapPaletteColorAlphaPer(int, int, f32); - /* 80029818 */ void resCopy(); - /* 80029874 */ dMap_c(int, int, int, int); - /* 80029A1C */ void _remove(); - /* 80029A8C */ void getMapMinMaxXZ(int, f32*, f32*, f32*, f32*); - /* 80029C10 */ void getPack(int, f32*, f32*); - /* 80029D78 */ void calcMapCenterXZ(int, f32*, f32*); - /* 80029E1C */ void calcMapCmPerTexel(int, f32*); - /* 8002A148 */ void setAmapPaletteColor(int, u8, u8, u8, u8); - /* 8002A1BC */ void getDispType() const; - /* 8002A1DC */ void isDrawRoom(int, int) const; - /* 8002A254 */ void getRoomNoSingle(); - /* 8002A294 */ void isDrawRoomIcon(int, int) const; - /* 8002A32C */ void _move(f32, f32, int, f32); - /* 8002AB54 */ void _draw(); - /* 8002ABAC */ void getFirstData(u8); - /* 8002ABCC */ void getNextData(dTres_c::typeGroupData_c*); - /* 8002AF20 */ ~dMap_c(); +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 u8 m_res[4 + 4 /* padding */]; -}; - -struct dMapInfo_n { - /* 8003ECA0 */ void chkGetCompass(); - /* 8003ECD8 */ void chkGetMap(); - /* 8003ED10 */ void isVisitedRoom(int); - /* 8003F1F4 */ void getRoomMinMaxXZ(int, f32*, f32*, f32*, f32*); -}; - -struct dMapInfo_c { - /* 8003F6C8 */ void move(int, f32); - - static u32 mNextRoomNo; -}; - -struct dDrawPathWithNormalPattern_c { - /* 8002ACE0 */ ~dDrawPathWithNormalPattern_c(); + static dMap_prm_res_s* m_res; }; -struct dDlst_base_c { - /* 8002ABEC */ void draw(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -// -// Forward References: -// - -extern "C" void getIconSize__15renderingAmap_cCFUc(); -extern "C" void draw__15renderingAmap_cFv(); -extern "C" void getDispType__15renderingAmap_cCFv(); -extern "C" void beforeDrawPath__15renderingAmap_cFv(); -extern "C" void afterDrawPath__15renderingAmap_cFv(); -extern "C" void rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class(); -extern "C" void drawPath__15renderingAmap_cFv(); -extern "C" void rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class(); -extern "C" void getPlayerCursorSize__15renderingAmap_cFv(); -extern "C" void getRestartCursorSize__15renderingAmap_cFv(); -extern "C" void rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class(); -extern "C" void isDrawOutSideTrim__15renderingAmap_cFv(); -extern "C" void getOutSideBlackLineNumber__15renderingAmap_cFv(); -extern "C" void isOutSideBlackLine__15renderingAmap_cFv(); -extern "C" void getLineWidthSub__15renderingAmap_cFi(); -extern "C" void getDecorationLineWidth__15renderingAmap_cFi(); -extern "C" void getLineWidth__15renderingAmap_cFi(); -extern "C" void getColor__6dMap_cFi(); -extern "C" void getLineColor__15renderingAmap_cFii(); -extern "C" void getDecoLineColor__15renderingAmap_cFii(); -extern "C" void getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c(); -extern "C" void getIconGroupNumber__15renderingAmap_cCFUc(); -extern "C" void hasMap__15renderingAmap_cCFv(); -extern "C" void isRendDoor__15renderingAmap_cCFv(); -extern "C" bool isCheckFloor__15renderingAmap_cCFv(); -extern "C" bool isRendRestart__15renderingAmap_cCFv(); -extern "C" bool isRendCursor__15renderingAmap_cCFv(); -extern "C" void isRendAllRoom__15renderingAmap_cCFv(); -extern "C" void getStayType__15renderingAmap_cCFv(); -extern "C" void isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi(); -extern "C" void isDrawType__6dMap_cFi(); -extern "C" void isRendAllRoom__6dMap_cCFv(); -extern "C" bool isSpecialOutline__6dMap_cFv(); -extern "C" void copyPalette__6dMap_cFv(); -extern "C" void setMapPaletteColorAlphaPer__6dMap_cFiif(); -extern "C" void resCopy__6dMap_cFv(); -extern "C" void __ct__6dMap_cFiiii(); -extern "C" void _remove__6dMap_cFv(); -extern "C" void getMapMinMaxXZ__6dMap_cFiPfPfPfPf(); -extern "C" void getPack__6dMap_cFiPfPf(); -extern "C" void calcMapCenterXZ__6dMap_cFiPfPf(); -extern "C" void calcMapCmPerTexel__6dMap_cFiPf(); -extern "C" void setMapPaletteColorAlphaPer__6dMap_cFif(); -extern "C" void copyPalette__6dMap_cFiif(); -extern "C" void setAmapPaletteColor__6dMap_cFiUcUcUcUc(); -extern "C" void getDispType__6dMap_cCFv(); -extern "C" void isDrawRoom__6dMap_cCFii(); -extern "C" void getRoomNoSingle__6dMap_cFv(); -extern "C" void isDrawRoomIcon__6dMap_cCFii(); -extern "C" void _move__6dMap_cFffif(); -extern "C" void _draw__6dMap_cFv(); -extern "C" void getFirstData__6dMap_cFUc(); -extern "C" void getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c(); -extern "C" void draw__12dDlst_base_cFv(); -extern "C" bool isDrawType__11dDrawPath_cFi(); -extern "C" void __dt__18dRenderingFDAmap_cFv(); -extern "C" void __dt__15dRenderingMap_cFv(); -extern "C" void __dt__28dDrawPathWithNormalPattern_cFv(); -extern "C" void __dt__11dDrawPath_cFv(); -extern "C" void getLineColor__11dDrawPath_cFii(); -extern "C" void __dt__15renderingAmap_cFv(); -extern "C" void __ct__15renderingAmap_cFv(); -extern "C" void __dt__6dMap_cFv(); -extern "C" bool isRendIcon__15renderingAmap_cCFv(); -extern "C" void __dt__28renderingPlusDoorAndCursor_cFv(); -extern "C" void __dt__19renderingPlusDoor_cFv(); -extern "C" void __dt__16renderingDAmap_cFv(); -extern "C" extern char const* const d_map_d_map__stringBase0; -extern "C" u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */]; - -// -// External References: -// - -extern "C" void dComIfGp_isLightDropMapVisible__Fv(); -extern "C" void isTbox__12dSv_memBit_cCFi(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__12dSv_danBit_cCFi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class(); -extern "C" void drawPath__11dDrawPath_cFv(); -extern "C" void makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs(); -extern "C" void preRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void postRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class(); -extern "C" void chkGetCompass__10dMapInfo_nFv(); -extern "C" void chkGetMap__10dMapInfo_nFv(); -extern "C" void isVisitedRoom__10dMapInfo_nFi(); -extern "C" void getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf(); -extern "C" void move__10dMapInfo_cFif(); -extern "C" void init__16renderingDAmap_cFPUcUsUsUsUs(); -extern "C" void entry__16renderingDAmap_cFfffiSc(); -extern "C" void isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class(); -extern "C" void draw__16renderingDAmap_cFv(); -extern "C" void getBackColor__16renderingDAmap_cCFv(); -extern "C" void isRenderingFloor__16renderingDAmap_cFi(); -extern "C" void isDrawRoom__16renderingDAmap_cCFii(); -extern "C" void preDrawPath__16renderingDAmap_cFv(); -extern "C" void postDrawPath__16renderingDAmap_cFv(); -extern "C" void getRoomNoSingle__16renderingDAmap_cFv(); -extern "C" void getFirstRoomPointer__16renderingDAmap_cFv(); -extern "C" void getNextRoomPointer__16renderingDAmap_cFv(); -extern "C" void isDrawPath__16renderingDAmap_cFv(); -extern "C" bool getFirstDrawLayerNo__16renderingDAmap_cFv(); -extern "C" void getNextDrawLayerNo__16renderingDAmap_cFi(); -extern "C" void afterDrawPath__28renderingPlusDoorAndCursor_cFv(); -extern "C" void isDrawRoomIcon__16renderingDAmap_cCFii(); -extern "C" void isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec(); -extern "C" void getFirstData__28renderingPlusDoorAndCursor_cFUc(); -extern "C" void getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c(); -extern "C" void getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c(); -extern "C" void getIconGroupNumber__16renderingDAmap_cCFUc(); -extern "C" void getTypeToTypeGroupNo__7dTres_cFUc(); -extern "C" void cLib_memCpy__FPvPCvUl(); -extern "C" void* __nw__FUli(); -extern "C" void* __nwa__FUli(); -extern "C" void __dl__FPv(); -extern "C" void __dla__FPv(); -extern "C" void DCStoreRange(); -extern "C" void GXGetTexBufferSize(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern void* __vt__19renderingPlusDoor_c[41]; -extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47]; -extern "C" extern void* __vt__16renderingDAmap_c[38]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -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" u32 mNextRoomNo__10dMapInfo_c; -extern "C" extern u8 mNowStayFloorNo__10dMapInfo_c[4]; -extern "C" extern u8 mNowStayFloorNoDecisionFlg__10dMapInfo_c[4]; -extern "C" f32 mMinX__8dMpath_c; -extern "C" f32 mMaxX__8dMpath_c; -extern "C" f32 mMinZ__8dMpath_c; -extern "C" f32 mMaxZ__8dMpath_c; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80378E48-80378E8C 0054A8 0044+00 2/2 0/0 0/0 .rodata l_iconSize$3698 */ -SECTION_RODATA static u8 const l_iconSize[68] = { - 0x3D, 0xF5, 0xC2, 0x8F, 0x3D, 0xF5, 0xC2, 0x8F, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xF5, - 0xC2, 0x8F, 0x3D, 0xA3, 0xD7, 0x0A, 0x3E, 0x23, 0xD7, 0x0A, 0x3D, 0xF5, 0xC2, 0x8F, - 0x00, 0x00, 0x00, 0x00, 0x3D, 0xF5, 0xC2, 0x8F, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, - 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, - 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, -}; -COMPILER_STRIP_GATE(0x80378E48, &l_iconSize); - /* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getIconSize(u8 param_0) const { - nofralloc -#include "asm/d/map/d_map/getIconSize__15renderingAmap_cCFUc.s" +f32 renderingAmap_c::getIconSize(u8 i_icon) const { + static f32 const l_iconSize[] = { + 0.12f, 0.12f, 0.08f, 0.12f, 0.08f, 0.16f, 0.12f, 0.0f, 0.12f, + 0.08f, 0.08f, 0.08f, 0.08f, 0.08f, 0.08f, 0.08f, 0.08f, + }; + + return l_iconSize[i_icon]; } -#pragma pop -/* ############################################################################################## */ /* 80450D80-80450D88 000280 0004+04 10/10 0/0 0/0 .sbss m_res__22dMap_HIO_prm_res_dst_s */ -u8 dMap_HIO_prm_res_dst_s::m_res[4 + 4 /* padding */]; - -/* 80451CA0-80451CA4 0002A0 0004+00 4/4 0/0 0/0 .sdata2 @3745 */ -SECTION_SDATA2 static f32 lit_3745 = 0.5f; - -/* 80451CA4-80451CA8 0002A4 0004+00 1/1 0/0 0/0 .sdata2 @3746 */ -SECTION_SDATA2 static f32 lit_3746 = 65536.0f; +dMap_prm_res_s* dMap_HIO_prm_res_dst_s::m_res; -/* 80451CA8-80451CB0 0002A8 0004+04 1/1 0/0 0/0 .sdata2 @3747 */ -SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = { - 32768.0f, - /* padding */ - 0.0f, -}; - -/* 80451CB0-80451CB8 0002B0 0008+00 5/5 0/0 0/0 .sdata2 @3749 */ -SECTION_SDATA2 static f64 lit_3749 = 4503599627370496.0 /* cast u32 to float */; - -/* 80451CB8-80451CC0 0002B8 0008+00 4/4 0/0 0/0 .sdata2 @3751 */ -SECTION_SDATA2 static f64 lit_3751 = 4503601774854144.0 /* cast s32 to float */; +inline u8 twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) { + return ((f32)param_0 + (param_2 * ((f32)param_1 - (f32)param_0))); +} /* 800284D0-800288C4 022E10 03F4+00 2/0 0/0 0/0 .text draw__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::draw() { - nofralloc -#include "asm/d/map/d_map/draw__15renderingAmap_cFv.s" +void renderingAmap_c::draw() { + f32 tmp = ((f32)(g_Counter.mCounter0 % dMap_HIO_prm_res_dst_s::m_res->field_0x1aa) / + (f32)dMap_HIO_prm_res_dst_s::m_res->field_0x1aa); + tmp = tmp; + + f32 temp_f1 = 0.5f + ((0.5f * cM_ssin(65536.0f * tmp - 32768.0f))); + u8 temp_r31 = twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x198, + dMap_HIO_prm_res_dst_s::m_res->field_0x19c, temp_f1); + u8 temp_r30 = twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x199, + dMap_HIO_prm_res_dst_s::m_res->field_0x19d, temp_f1); + u8 temp_r29 = twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x19a, + dMap_HIO_prm_res_dst_s::m_res->field_0x19e, temp_f1); + u8 temp_r28 = twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x19b, + dMap_HIO_prm_res_dst_s::m_res->field_0x19f, temp_f1); + setAmapPaletteColor(0x2D, temp_r31, temp_r30, temp_r29, temp_r28); + + f32 tmp2 = (f32)(g_Counter.mCounter0 % dMap_HIO_prm_res_dst_s::m_res->field_0x1ac) / + (f32)dMap_HIO_prm_res_dst_s::m_res->field_0x1ac; + tmp2 = tmp2; + + f32 temp_f1_2 = 0.5f + (0.5f * cM_ssin(65536.0f * tmp2 - 32768.0f)); + u8 temp_r31_2 = + twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x1a0, + dMap_HIO_prm_res_dst_s::m_res->field_0x1a4, temp_f1_2); + u8 temp_r30_2 = + twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x1a1, + dMap_HIO_prm_res_dst_s::m_res->field_0x1a5, temp_f1_2); + u8 temp_r29_2 = + twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x1a2, + dMap_HIO_prm_res_dst_s::m_res->field_0x1a6, temp_f1_2); + u8 temp_r28_2 = + twoValueLineInterpolation(dMap_HIO_prm_res_dst_s::m_res->field_0x1a3, + dMap_HIO_prm_res_dst_s::m_res->field_0x1a7, temp_f1_2); + setAmapPaletteColor(0x2E, temp_r31_2, temp_r30_2, temp_r29_2, temp_r28_2); + + renderingDAmap_c::draw(); } -#pragma pop - -/* ############################################################################################## */ -/* 803A6F08-803A6F28 -00001 0020+00 1/1 0/0 0/0 .data @3806 */ -SECTION_DATA static void* lit_3806[8] = { - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x58), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x60), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x68), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x70), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x78), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x58), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x80), - (void*)(((char*)getDispType__15renderingAmap_cCFv) + 0x50), -}; /* 800288C4-80028960 023204 009C+00 7/6 0/0 0/0 .text getDispType__15renderingAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getDispType() const { - nofralloc -#include "asm/d/map/d_map/getDispType__15renderingAmap_cCFv.s" +int renderingAmap_c::getDispType() const { + int disp_type; + + switch (dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo())) { + case 7: + disp_type = 1; + break; + case 0: + case 5: + disp_type = 0; + break; + case 1: + disp_type = 1; + break; + case 2: + disp_type = 2; + break; + case 3: + disp_type = 3; + break; + case 4: + disp_type = 4; + break; + case 6: + disp_type = 5; + break; + default: + JUT_ASSERT(0); + break; + } + + return disp_type; } -#pragma pop /* 80028960-800289D0 0232A0 0070+00 2/0 0/0 0/0 .text beforeDrawPath__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::beforeDrawPath() { - nofralloc -#include "asm/d/map/d_map/beforeDrawPath__15renderingAmap_cFv.s" +void renderingAmap_c::beforeDrawPath() { + if (isDrawOutSideTrim()) { + field_0x38 = 0; + getOutSideBlackLineNumber(); + + do { + drawPath(); + } while (isOutSideBlackLine()); + + field_0x38 = 2; + } } -#pragma pop /* 800289D0-800289F0 023310 0020+00 2/0 0/0 0/0 .text afterDrawPath__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::afterDrawPath() { - nofralloc -#include "asm/d/map/d_map/afterDrawPath__15renderingAmap_cFv.s" +void renderingAmap_c::afterDrawPath() { + renderingPlusDoorAndCursor_c::afterDrawPath(); } -#pragma pop /* 800289F0-80028A10 023330 0020+00 2/0 0/0 0/0 .text * rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::rendering(dDrawPath_c::room_class const* param_0) { - nofralloc -#include "asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class.s" +void renderingAmap_c::rendering(dDrawPath_c::room_class const* i_room) { + dDrawPath_c::rendering(i_room); } -#pragma pop /* 80028A10-80028A30 023350 0020+00 2/0 0/0 0/0 .text drawPath__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::drawPath() { - nofralloc -#include "asm/d/map/d_map/drawPath__15renderingAmap_cFv.s" +void renderingAmap_c::drawPath() { + dDrawPath_c::drawPath(); } -#pragma pop /* 80028A30-80028B04 023370 00D4+00 2/0 0/0 0/0 .text * rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::rendering(dDrawPath_c::line_class const* param_0) { - nofralloc -#include "asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class.s" +void renderingAmap_c::rendering(dDrawPath_c::line_class const* i_line) { + if (isDrawType(i_line->field_0x0)) { + if (isDrawOutSideTrim() && field_0x38 != 2) { + if (i_line->field_0x1 == 2) { + renderingDecoration(i_line); + } + } else if (i_line->field_0x1 == 4) { + field_0x3c = 0; + + while (field_0x3c < 2) { + renderingDecoration(i_line); + field_0x3c++; + } + } else { + dDrawPath_c::rendering(i_line); + } + } } -#pragma pop /* 80028B04-80028B10 023444 000C+00 2/0 0/0 0/0 .text getPlayerCursorSize__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getPlayerCursorSize() { - nofralloc -#include "asm/d/map/d_map/getPlayerCursorSize__15renderingAmap_cFv.s" +f32 renderingAmap_c::getPlayerCursorSize() { + return dMap_HIO_prm_res_dst_s::m_res->cursor_size; } -#pragma pop /* 80028B10-80028B3C 023450 002C+00 2/0 0/0 0/0 .text getRestartCursorSize__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getRestartCursorSize() { - nofralloc -#include "asm/d/map/d_map/getRestartCursorSize__15renderingAmap_cFv.s" +f32 renderingAmap_c::getRestartCursorSize() { + return getPlayerCursorSize(); } -#pragma pop /* 80028B3C-80028BB4 02347C 0078+00 2/0 0/0 0/0 .text * rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::rendering(dDrawPath_c::poly_class const* param_0) { - nofralloc -#include "asm/d/map/d_map/rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class.s" +void renderingAmap_c::rendering(dDrawPath_c::poly_class const* i_poly) { + if (isDrawType(i_poly->field_0x0) && (!isDrawOutSideTrim() || field_0x38 == 2)) { + dDrawPath_c::rendering(i_poly); + } } -#pragma pop /* 80028BB4-80028C4C 0234F4 0098+00 4/4 0/0 0/0 .text isDrawOutSideTrim__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::isDrawOutSideTrim() { - nofralloc -#include "asm/d/map/d_map/isDrawOutSideTrim__15renderingAmap_cFv.s" +bool renderingAmap_c::isDrawOutSideTrim() { + bool rt = false; + + if (getDispType() == 0 || getDispType() == 4 || getDispType() == 3 || getDispType() == 2 || + getDispType() == 5) + { + rt = dMap_HIO_prm_res_dst_s::m_res->field_0x1ae > 0; + } + + return rt; } -#pragma pop /* 80028C4C-80028C60 02358C 0014+00 1/1 0/0 0/0 .text * getOutSideBlackLineNumber__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getOutSideBlackLineNumber() { - nofralloc -#include "asm/d/map/d_map/getOutSideBlackLineNumber__15renderingAmap_cFv.s" +int renderingAmap_c::getOutSideBlackLineNumber() { + m_outSideBlackLineCnt = 0; + return dMap_HIO_prm_res_dst_s::m_res->field_0x1ae; } -#pragma pop /* 80028C60-80028C90 0235A0 0030+00 1/1 0/0 0/0 .text isOutSideBlackLine__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::isOutSideBlackLine() { - nofralloc -#include "asm/d/map/d_map/isOutSideBlackLine__15renderingAmap_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80451CC0-80451CC8 0002C0 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatOff$3899 */ -SECTION_SDATA2 static u8 l_lineWidthPatOff[5 + 3 /* padding */] = { - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +bool renderingAmap_c::isOutSideBlackLine() { + bool rt = false; + m_outSideBlackLineCnt++; -/* 80451CC8-80451CD0 0002C8 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatOn$3900 */ -SECTION_SDATA2 static u8 l_lineWidthPatOn[5 + 3 /* padding */] = { - 0x06, - 0x06, - 0x06, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; + if (m_outSideBlackLineCnt < dMap_HIO_prm_res_dst_s::m_res->field_0x1ae) { + rt = true; + } -/* 80451CD0-80451CD8 0002D0 0005+03 1/1 0/0 0/0 .sdata2 l_lineWidthPatStay$3901 */ -SECTION_SDATA2 static u8 l_lineWidthPatStay[5 + 3 /* padding */] = { - 0x06, - 0x06, - 0x0C, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; + return rt; +} /* 80028C90-80028CF4 0235D0 0064+00 2/2 0/0 0/0 .text getLineWidthSub__15renderingAmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getLineWidthSub(int param_0) { - nofralloc -#include "asm/d/map/d_map/getLineWidthSub__15renderingAmap_cFi.s" +int renderingAmap_c::getLineWidthSub(int i_no) { + static const u8 l_lineWidthPatOff[] = {0x00, 0x00, 0x06, 0x00, 0x00}; + static const u8 l_lineWidthPatOn[] = {0x06, 0x06, 0x06, 0x00, 0x00}; + static const u8 l_lineWidthPatStay[] = {0x06, 0x06, 0x0C, 0x00, 0x00}; + + const u8* pat = l_lineWidthPatOff; + + if (mRoomNo == mRoomNoSingle) { + pat = l_lineWidthPatStay; + } else if (dMapInfo_n::isVisitedRoom(mRoomNo)) { + pat = l_lineWidthPatOn; + } + + return pat[i_no]; } -#pragma pop /* 80028CF4-80028DD4 023634 00E0+00 2/0 0/0 0/0 .text getDecorationLineWidth__15renderingAmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getDecorationLineWidth(int param_0) { - nofralloc -#include "asm/d/map/d_map/getDecorationLineWidth__15renderingAmap_cFi.s" +s32 renderingAmap_c::getDecorationLineWidth(int param_0) { + int var_r31 = 0; + + if (param_0 == 4) { + switch (field_0x3c) { + case 0: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1a8; + break; + case 1: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1a9; + break; + } + + return var_r31; + } + + switch (m_outSideBlackLineCnt) { + case 0: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1b0; + break; + case 1: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1b2; + break; + case 2: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1b4; + break; + case 3: + var_r31 = dMap_HIO_prm_res_dst_s::m_res->field_0x1b6; + break; + } + + if (var_r31 > 0) { + var_r31 += getLineWidthSub(param_0); + + if (var_r31 > 0xFF) { + var_r31 = 0xFF; + } + } + + return var_r31; } -#pragma pop /* 80028DD4-80028DF4 023714 0020+00 2/0 0/0 0/0 .text getLineWidth__15renderingAmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getLineWidth(int param_0) { - nofralloc -#include "asm/d/map/d_map/getLineWidth__15renderingAmap_cFi.s" +int renderingAmap_c::getLineWidth(int i_no) { + return getLineWidthSub(i_no); } -#pragma pop - -/* ############################################################################################## */ -/* 80378E8C-80378EB0 0054EC 0024+00 0/1 0/0 0/0 .rodata l_dungeon_offColor$3937 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_offColor[36] = { - 0x08, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, - 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80378E8C, &l_dungeon_offColor); -#pragma pop - -/* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_onColor[36] = { - 0x28, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, - 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80378EB0, &l_dungeon_onColor); -#pragma pop - -/* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dungeon_stayColor[36] = { - 0x48, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, - 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80378ED4, &l_dungeon_stayColor); -#pragma pop /* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getColor(int param_0) { - nofralloc -#include "asm/d/map/d_map/getColor__6dMap_cFi.s" +const GXColor* dMap_c::getColor(int i_no) { + static GXColor const l_dungeon_offColor[] = { + {0x08, 0x00, 0x00, 0x00}, {0x0C, 0x00, 0x00, 0x00}, {0x10, 0x00, 0x00, 0x00}, + {0x04, 0x00, 0x00, 0x00}, {0x14, 0x00, 0x00, 0x00}, {0x18, 0x00, 0x00, 0x00}, + {0x1C, 0x00, 0x00, 0x00}, {0x20, 0x00, 0x00, 0x00}, {0x24, 0x00, 0x00, 0x00}, + }; + + static GXColor const l_dungeon_onColor[] = { + {0x28, 0x00, 0x00, 0x00}, {0x2C, 0x00, 0x00, 0x00}, {0x30, 0x00, 0x00, 0x00}, + {0x04, 0x00, 0x00, 0x00}, {0x34, 0x00, 0x00, 0x00}, {0x38, 0x00, 0x00, 0x00}, + {0x3C, 0x00, 0x00, 0x00}, {0x40, 0x00, 0x00, 0x00}, {0x44, 0x00, 0x00, 0x00}, + }; + + static GXColor const l_dungeon_stayColor[] = { + {0x48, 0x00, 0x00, 0x00}, {0x4C, 0x00, 0x00, 0x00}, {0x50, 0x00, 0x00, 0x00}, + {0x04, 0x00, 0x00, 0x00}, {0x54, 0x00, 0x00, 0x00}, {0x58, 0x00, 0x00, 0x00}, + {0x5C, 0x00, 0x00, 0x00}, {0x60, 0x00, 0x00, 0x00}, {0x64, 0x00, 0x00, 0x00}, + }; + + const GXColor* color_tbl = l_dungeon_offColor; + + if (field_0x8e == 2 && field_0x8f != 0 && field_0x8f < 6) { + if (mRoomNoSingle == field_0x88) { + if (mRoomNo == field_0x88) { + color_tbl = l_dungeon_stayColor; + } else if (mRoomNo == field_0x84) { + color_tbl = l_dungeon_onColor; + } + } else if (mRoomNo == field_0x88) { + color_tbl = l_dungeon_onColor; + } else if (mRoomNo == field_0x84) { + color_tbl = l_dungeon_stayColor; + } + } else if (mRoomNo == mRoomNoSingle) { + color_tbl = l_dungeon_stayColor; + } else if (dMapInfo_n::isVisitedRoom(mRoomNo)) { + color_tbl = l_dungeon_onColor; + } + + return &color_tbl[i_no]; } -#pragma pop - -/* ############################################################################################## */ -/* 804505F8-80450600 000078 0004+04 1/1 0/0 0/0 .sdata backColor$3972 */ -SECTION_SDATA static u8 backColor[4 + 4 /* padding */] = { - 0x04, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80451CD8-80451CDC 0002D8 0004+00 1/1 0/0 0/0 .sdata2 borderColor0$3975 */ -SECTION_SDATA2 static u8 borderColor0[4] = { - 0xB4, - 0x00, - 0x00, - 0x00, -}; - -/* 80451CDC-80451CE0 0002DC 0004+00 1/1 0/0 0/0 .sdata2 borderColor1$3976 */ -SECTION_SDATA2 static u8 borderColor1[4] = { - 0xB8, - 0x00, - 0x00, - 0x00, -}; /* 80028EE4-80028FB4 023824 00D0+00 2/0 0/0 0/0 .text getLineColor__15renderingAmap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getLineColor(int param_0, int param_1) { - nofralloc -#include "asm/d/map/d_map/getLineColor__15renderingAmap_cFii.s" +GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) { + static GXColor backColor = {0x04, 0x00, 0x00, 0x00}; + static const GXColor borderColor0 = {0xB4, 0x00, 0x00, 0x00}; + static const GXColor borderColor1 = {0xB8, 0x00, 0x00, 0x00}; + + GXColor* color = &backColor; + + if (param_1 == 4) { + switch (field_0x3c) { + case 0: + *color = borderColor0; + break; + case 1: + *color = borderColor1; + break; + default: + JUT_ASSERT(0); + break; + } + } else { + *color = *getColor(param_0); + } + + return color; } -#pragma pop - -/* ############################################################################################## */ -/* 80378EF8-80378F08 005558 0010+00 1/1 0/0 0/0 .rodata colorTable$3993 */ -SECTION_RODATA static u8 const colorTable[16] = { - 0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80378EF8, &colorTable); /* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getDecoLineColor(int param_0, int param_1) { - nofralloc -#include "asm/d/map/d_map/getDecoLineColor__15renderingAmap_cFii.s" +const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) { + static GXColor const colorTable[] = { + {0xBC, 0x00, 0x00, 0x00}, + {0xC0, 0x00, 0x00, 0x00}, + {0xC4, 0x00, 0x00, 0x00}, + {0xC8, 0x00, 0x00, 0x00}, + }; + + const GXColor* color; + if (isDrawOutSideTrim() && field_0x38 != 2) { + JUT_ASSERT(m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0]))); + color = &colorTable[m_outSideBlackLineCnt]; + } else { + color = getLineColor(param_0, param_1); + } + + return color; } -#pragma pop /* 80029038-80029058 023978 0020+00 1/0 0/0 0/0 .text * getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getIconPosition(dTres_c::typeGroupData_c* param_0) const { - nofralloc -#include "asm/d/map/d_map/getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c.s" +const Vec* dMap_c::getIconPosition(dTres_c::typeGroupData_c* i_data) const { + return renderingPlusDoorAndCursor_c::getIconPosition(i_data); } -#pragma pop /* 80029058-80029078 023998 0020+00 2/0 0/0 0/0 .text getIconGroupNumber__15renderingAmap_cCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getIconGroupNumber(u8 param_0) const { - nofralloc -#include "asm/d/map/d_map/getIconGroupNumber__15renderingAmap_cCFUc.s" +int renderingAmap_c::getIconGroupNumber(u8 param_0) const { + return renderingDAmap_c::getIconGroupNumber(param_0); } -#pragma pop /* 80029078-800290C0 0239B8 0048+00 2/0 0/0 0/0 .text hasMap__15renderingAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::hasMap() const { - nofralloc -#include "asm/d/map/d_map/hasMap__15renderingAmap_cCFv.s" +bool renderingAmap_c::hasMap() const { + int stay_type = getStayType(); + + return stay_type == 1 && dMapInfo_n::chkGetMap(); } -#pragma pop /* 800290C0-80029104 023A00 0044+00 2/0 0/0 0/0 .text isRendDoor__15renderingAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::isRendDoor() const { - nofralloc -#include "asm/d/map/d_map/isRendDoor__15renderingAmap_cCFv.s" +bool renderingAmap_c::isRendDoor() const { + int disp_type = getDispType(); + return disp_type == 1 || disp_type == 2; } -#pragma pop /* 80029104-8002910C 023A44 0008+00 2/0 0/0 0/0 .text isCheckFloor__15renderingAmap_cCFv */ @@ -807,635 +455,895 @@ bool renderingAmap_c::isRendCursor() const { /* 8002911C-80029160 023A5C 0044+00 3/2 0/0 0/0 .text isRendAllRoom__15renderingAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::isRendAllRoom() const { - nofralloc -#include "asm/d/map/d_map/isRendAllRoom__15renderingAmap_cCFv.s" +bool renderingAmap_c::isRendAllRoom() const { + int disp_type = getDispType(); + return disp_type != 2 && disp_type != 3 && disp_type != 5; } -#pragma pop - -/* ############################################################################################## */ -/* 80378F08-80378F24 005568 001C+00 1/1 0/0 0/0 .rodata l_stayType$4046 */ -SECTION_RODATA static u8 const l_stayType[28] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80378F08, &l_stayType); /* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::getStayType() const { - nofralloc -#include "asm/d/map/d_map/getStayType__15renderingAmap_cCFv.s" +int renderingAmap_c::getStayType() const { + static int const l_stayType[] = {0, 1, 0, 0, 0, 0, 0}; + + return l_stayType[getDispType()]; } -#pragma pop - -/* ############################################################################################## */ -/* 803A6F28-803A6F6C -00001 0044+00 1/1 0/0 0/0 .data @4259 */ -SECTION_DATA static void* lit_4259[17] = { - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0xA0), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0xE4), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x150), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x310), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x18C), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x2AC), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x540), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x540), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0xE4), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x378), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x3C0), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x3FC), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x41C), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x464), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x464), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x4A0), - (void*)(((char*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi) + 0x4E8), -}; /* 80029190-800296EC 023AD0 055C+00 3/0 0/0 0/0 .text * isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* param_0, bool param_1, - bool param_2, int param_3) const { - nofralloc -#include "asm/d/map/d_map/isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi.s" +bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2, + int param_3) const { + JUT_ASSERT(i_data != 0); + + bool var_r31 = false; + int disp_type = getDispType(); + int stay_type = getStayType(); + int group_no = dTres_c::getTypeToTypeGroupNo(i_data->mType); + bool has_map = hasMap(); + + bool var_r23 = false; + if (stay_type == 1 && dMapInfo_n::chkGetCompass()) { + var_r23 = true; + } + + switch (group_no) { + case 0: + if (stay_type == 1) { + JUT_ASSERT(i_data->mNo != 255); + + if (var_r23 && i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo) && param_1) { + var_r31 = true; + } + } + break; + case 1: + case 8: + if (stay_type == 1) { + if ((has_map || param_2) && param_1) { + var_r31 = true; + } + } else if (param_2) { + if ((i_data->mSwBit == 255 || + (i_data->mSwBit != 255 && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo))) && + param_1) + { + var_r31 = true; + } + } + break; + case 2: + if (stay_type == 1) { + if (var_r23 && !dComIfGs_isTbox(i_data->mNo) && param_1) { + var_r31 = true; + } + } + break; + case 4: + if (stay_type == 0) { + bool temp_r23_2 = false; + + if (dComIfGp_isLightDropMapVisible()) { + if (dComIfGp_getStartStageDarkArea() == 2) { + int temp_r3 = i_data->mNo; + if (temp_r3 == 0x33 || temp_r3 == 0x34 || temp_r3 == 0x35) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) { + temp_r23_2 = true; + } + } else { + temp_r23_2 = true; + } + } else { + temp_r23_2 = true; + } + } + + if (temp_r23_2) { + JUT_ASSERT(i_data->mNo != 255); + bool temp_r23_3 = false; + if (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo)) { + temp_r23_3 = true; + } + + if (temp_r23_3) { + if (disp_type == 3) { + if (i_data->mRoomNo == param_3 && param_1) { + var_r31 = true; + } + } else if (disp_type == 4) { + if (param_1) { + var_r31 = true; + } + } else if (disp_type == 5) { + if (i_data->mRoomNo == param_3) { + var_r31 = true; + } + } else { + var_r31 = true; + } + } + } + } + break; + case 5: + if (((i_data->mNo == 255 || (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo))) && + (i_data->mSwBit == 255 || + (i_data->mSwBit != 255 && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo)))) && + param_1) + { + var_r31 = true; + } + break; + case 3: + if (stay_type == 1 && var_r23) { + if ((i_data->mSwBit == 255 || + (i_data->mSwBit != 255 && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo))) && + !dComIfGs_isStageBossEnemy() && param_1) + { + var_r31 = true; + } + } + break; + case 9: + if (stay_type == 1 && var_r23) { + if ((i_data->mNo == 255 || (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo))) && + param_1) + { + var_r31 = true; + } + } + break; + case 10: + if (stay_type == 0 && i_data->mNo != 0xFF && dComIfGs_isTbox(i_data->mNo) && param_1) { + var_r31 = true; + } + break; + case 11: + if (stay_type == 1 && var_r23 && param_1) { + var_r31 = true; + } + break; + case 12: + if (stay_type == 1 && var_r23) { + if ((i_data->mNo == 255 || (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo))) && + param_1) + { + var_r31 = true; + } + } + break; + case 13: + case 14: + if (stay_type == 0) { + if (i_data->mSwBit == 255 || + (i_data->mSwBit != 255 && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo))) + { + var_r31 = true; + } + } + break; + case 15: + if (stay_type == 1 && var_r23) { + if ((i_data->mNo == 255 || (i_data->mNo != 255 && dComIfGs_isTbox(i_data->mNo))) && + param_1) + { + var_r31 = true; + } + } + break; + case 16: + if (stay_type == 1 && !dComIfGs_isStageBossEnemy() && i_data->mNo != 255 && + !dComIfGs_isTbox(i_data->mNo) && var_r23 && param_1) + { + var_r31 = true; + } + break; + default: + JUT_ASSERT(0); + break; + } + + return var_r31; } -#pragma pop /* 800296EC-800296F8 02402C 000C+00 1/0 0/0 0/0 .text isDrawType__6dMap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::isDrawType(int param_0) { - nofralloc -#include "asm/d/map/d_map/isDrawType__6dMap_cFi.s" +bool dMap_c::isDrawType(int param_0) { + return (param_0 & 0x80) == 0; } -#pragma pop /* 800296F8-80029744 024038 004C+00 1/0 0/0 0/0 .text isRendAllRoom__6dMap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::isRendAllRoom() const { - nofralloc -#include "asm/d/map/d_map/isRendAllRoom__6dMap_cCFv.s" +bool dMap_c::isRendAllRoom() const { + bool rt = renderingAmap_c::isRendAllRoom(); + if (field_0x8e == 2 && field_0x8f >= 3 && field_0x8f <= 3) { + rt = true; + } + + return rt; } -#pragma pop /* 80029744-8002974C 024084 0008+00 1/0 0/0 0/0 .text isSpecialOutline__6dMap_cFv */ bool dMap_c::isSpecialOutline() { return false; } -/* ############################################################################################## */ -/* 80451CE0-80451CE4 0002E0 0004+00 4/4 0/0 0/0 .sdata2 @4284 */ -SECTION_SDATA2 static f32 lit_4284 = 1.0f; - /* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text copyPalette__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::copyPalette() { - nofralloc -#include "asm/d/map/d_map/copyPalette__6dMap_cFv.s" +void dMap_c::copyPalette() { + JUT_ASSERT(m_res != 0); + + cLib_memCpy(m_res, m_res_src, sizeof(dMap_HIO_prm_res_dst_s::m_res->palette_data)); + if (getStayType() == 0) { + copyPalette(1, 0x2C, 1.0f); + } } -#pragma pop /* 800297A8-80029818 0240E8 0070+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFiif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) { - nofralloc -#include "asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFiif.s" +void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) { + int temp_r28 = (param_1 - param_0) + 1; + int temp_r30 = param_0; + + for (int i = 0; i < temp_r28; i++) { + setMapPaletteColorAlphaPer(temp_r30, param_2); + temp_r30++; + } } -#pragma pop /* 80029818-80029874 024158 005C+00 1/1 0/0 0/0 .text resCopy__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::resCopy() { - nofralloc -#include "asm/d/map/d_map/resCopy__6dMap_cFv.s" +void dMap_c::resCopy() { + cLib_memCpy(m_res, m_res_src, sizeof(dMap_prm_res_s)); + if (getStayType() == 0) { + copyPalette(1, 0x2C, 1.0f); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378F24 = "Always"; -#pragma pop - -/* 803A6F6C-803A6F88 -00001 001C+00 1/1 0/0 0/0 .data @4694 */ -SECTION_DATA static void* lit_4694[7] = { - (void*)(((char*)_move__6dMap_cFffif) + 0x350), (void*)(((char*)_move__6dMap_cFffif) + 0x388), - (void*)(((char*)_move__6dMap_cFffif) + 0x3CC), (void*)(((char*)_move__6dMap_cFffif) + 0x3F8), - (void*)(((char*)_move__6dMap_cFffif) + 0x484), (void*)(((char*)_move__6dMap_cFffif) + 0x4A8), - (void*)(((char*)_move__6dMap_cFffif) + 0x4C4), -}; -/* 803A6F88-803A6F94 0040A8 000C+00 1/1 48/48 0/0 .data __vt__12dDlst_base_c */ -SECTION_DATA extern void* __vt__12dDlst_base_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, -}; +/* 80029874-80029A1C 0241B4 01A8+00 0/0 1/1 0/0 .text __ct__6dMap_cFiiii */ +dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { + m_res_src = NULL; + m_res = NULL; + mResTIMG = NULL; + mImage_p = NULL; -/* 803A6F94-803A6FD4 0040B4 0040+00 9/9 5/5 0/0 .data __vt__28dDrawPathWithNormalPattern_c */ -SECTION_DATA extern void* __vt__28dDrawPathWithNormalPattern_c[16] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, - (void*)__dt__28dDrawPathWithNormalPattern_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, -}; + mCenterX = 0.0f; + mCenterZ = 0.0f; + field_0x58 = 1.0f; + mPackX = 0.0f; + mPackZ = 0.0f; + field_0x64 = 0.0f; + mPackPlusZ = 0.0f; + mRightEdgePlus = 0.0f; + mTopEdgePlus = 0.0f; -/* 803A6FD4-803A7030 0040F4 005C+00 8/8 5/5 0/0 .data __vt__15dRenderingMap_c */ -SECTION_DATA extern void* __vt__15dRenderingMap_c[23] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, - (void*)__dt__15dRenderingMap_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; + field_0x74 = 0; + mTexSizeX = 0; + mTexSizeY = 0; + mStayRoomNo = -1; + field_0x80 = -1; + field_0x84 = -1; + field_0x88 = -1; -/* 803A7030-803A70F4 004150 00C4+00 2/2 0/0 0/0 .data __vt__6dMap_c */ -SECTION_DATA extern void* __vt__6dMap_c[49] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15renderingAmap_cFv, - (void*)__dt__6dMap_cFv, - (void*)isDrawType__6dMap_cFi, - (void*)getColor__6dMap_cFi, - (void*)getLineColor__15renderingAmap_cFii, - (void*)getLineWidth__15renderingAmap_cFi, - (void*)isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__16renderingDAmap_cFi, - (void*)getFirstRoomPointer__16renderingDAmap_cFv, - (void*)getNextRoomPointer__16renderingDAmap_cFv, - (void*)drawPath__15renderingAmap_cFv, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__15renderingAmap_cFv, - (void*)afterDrawPath__15renderingAmap_cFv, - (void*)preDrawPath__16renderingDAmap_cFv, - (void*)postDrawPath__16renderingDAmap_cFv, - (void*)isDrawPath__16renderingDAmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)getBackColor__16renderingDAmap_cCFv, - (void*)getDecoLineColor__15renderingAmap_cFii, - (void*)getDecorationLineWidth__15renderingAmap_cFi, - (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, - (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, - (void*)getIconGroupNumber__15renderingAmap_cCFUc, - (void*)hasMap__15renderingAmap_cCFv, - (void*)isRendAllRoom__6dMap_cCFv, - (void*)isRendDoor__15renderingAmap_cCFv, - (void*)isCheckFloor__15renderingAmap_cCFv, - (void*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi, - (void*)getRoomNoSingle__6dMap_cFv, - (void*)isDrawRoom__6dMap_cCFii, - (void*)isDrawRoomIcon__6dMap_cCFii, - (void*)isRendRestart__15renderingAmap_cCFv, - (void*)isRendCursor__15renderingAmap_cCFv, - (void*)isRendIcon__15renderingAmap_cCFv, - (void*)getIconSize__15renderingAmap_cCFUc, - (void*)getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c, - (void*)getFirstData__6dMap_cFUc, - (void*)getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c, - (void*)getPlayerCursorSize__15renderingAmap_cFv, - (void*)getRestartCursorSize__15renderingAmap_cFv, - (void*)setAmapPaletteColor__6dMap_cFiUcUcUcUc, - (void*)isSpecialOutline__6dMap_cFv, -}; + field_0x8c = 0; + field_0x8d = 0; + field_0x8e = 0; + field_0x8f = 0; + field_0x90 = 0; -/* 80451CE4-80451CE8 0002E4 0004+00 7/7 0/0 0/0 .sdata2 @4321 */ -SECTION_SDATA2 static u8 lit_4321[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; + m_res = new (0x20) dMap_prm_res_s; + JUT_ASSERT(m_res != 0); -/* 80029874-80029A1C 0241B4 01A8+00 0/0 1/1 0/0 .text __ct__6dMap_cFiiii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { - nofralloc -#include "asm/d/map/d_map/__ct__6dMap_cFiiii.s" + dMap_HIO_prm_res_dst_s::m_res = m_res; + + m_res_src = (dMap_prm_res_s*)dComIfG_getObjectRes("Always", 0x45); + resCopy(); + + mTexSizeX = param_0; + mTexSizeY = param_1; + + if (dMap_HIO_prm_res_dst_s::m_res->field_0x1ae > 0) { + field_0x74 = dMap_HIO_prm_res_dst_s::m_res->field_0x1b0 / 6; + } + + int buffer_size = GXGetTexBufferSize(param_2, param_3, 9, GX_FALSE, 0); + mImage_p = new (0x20) u8[buffer_size]; + JUT_ASSERT(mImage_p != 0); + + renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY); + + mResTIMG = new (0x20) ResTIMG; + JUT_ASSERT(mResTIMG != 0); + + makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33); } -#pragma pop /* 80029A1C-80029A8C 02435C 0070+00 1/1 0/0 0/0 .text _remove__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::_remove() { - nofralloc -#include "asm/d/map/d_map/_remove__6dMap_cFv.s" +void dMap_c::_remove() { + if (mImage_p != NULL) { + delete[] mImage_p; + mImage_p = NULL; + } + + if (mResTIMG != NULL) { + delete mResTIMG; + mResTIMG = NULL; + } + + if (m_res != NULL) { + delete m_res; + m_res = NULL; + } } -#pragma pop /* 80029A8C-80029C10 0243CC 0184+00 3/3 0/0 0/0 .text getMapMinMaxXZ__6dMap_cFiPfPfPfPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getMapMinMaxXZ(int param_0, f32* param_1, f32* param_2, f32* param_3, - f32* param_4) { - nofralloc -#include "asm/d/map/d_map/getMapMinMaxXZ__6dMap_cFiPfPfPfPf.s" +void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param_3, f32* param_4) { + f32 var_f0 = 0.0f; + f32 var_f1 = 0.0f; + f32 var_f2 = 0.0f; + f32 var_f3 = 0.0f; + + JUT_ASSERT(i_roomNo >= 0); + + if (i_roomNo >= 0) { + f32 temp_f31 = dMpath_c::getMinX(); + f32 temp_f30 = dMpath_c::getMinZ(); + f32 temp_f29 = dMpath_c::getMaxX(); + f32 temp_f28 = dMpath_c::getMaxZ(); + + f32 sp14 = 0.0f; + f32 sp10 = 0.0f; + f32 spC = 0.0f; + f32 sp8 = 0.0f; + + dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo); + JUT_ASSERT(fileList2_p != 0); + + if (fileList2_p != NULL) { + dMapInfo_n::getRoomMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8); + } + + switch (getDispType()) { + default: + JUT_ASSERT(0); + case 4: + case 0: + var_f0 = temp_f31; + var_f1 = temp_f30; + var_f2 = temp_f29; + var_f3 = temp_f28; + break; + case 1: + var_f0 = sp14; + var_f1 = sp10; + var_f2 = spC; + var_f3 = sp8; + break; + case 5: + case 2: + case 3: + var_f0 = sp14; + var_f1 = sp10; + var_f2 = spC; + var_f3 = sp8; + } + } + + if (param_1 != NULL) { + *param_1 = var_f0; + } + + if (param_2 != NULL) { + *param_2 = var_f1; + } + + if (param_3 != NULL) { + *param_3 = var_f2; + } + + if (param_4 != NULL) { + *param_4 = var_f3; + } } -#pragma pop /* 80029C10-80029D78 024550 0168+00 1/1 0/0 0/0 .text getPack__6dMap_cFiPfPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) { - nofralloc -#include "asm/d/map/d_map/getPack__6dMap_cFiPfPf.s" +void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) { + f32 var_f31 = 0.0f; + f32 var_f30 = 0.0f; + + if (getStayType() == 0) { + f32 sp14 = 0.0f; + f32 sp10 = 0.0f; + f32 spC = 0.0f; + f32 sp8 = 0.0f; + getMapMinMaxXZ(param_0, &sp14, &sp10, &spC, &sp8); + + f32 temp_f1 = (field_0x58 * (f32)(field_0x74 + 4)) * 0.5f; + sp14 -= temp_f1; + sp10 -= temp_f1; + spC += temp_f1; + sp8 += temp_f1; + + f32 temp_f6 = spC - sp14; + f32 temp_f7 = sp8 - sp10; + f32 temp_f8 = (spC + sp14) * 0.5f; + f32 temp_f3_2 = (sp8 + sp10) * 0.5f; + + if (temp_f6 > temp_f7) { + var_f31 = (temp_f6 * 0.5f) - (temp_f8 - sp14); + var_f30 = (temp_f6 * 0.5f) - (sp8 - temp_f3_2); + } else { + var_f31 = (temp_f7 * 0.5f) - (temp_f8 - sp14); + var_f30 = (temp_f7 * 0.5f) - (sp8 - temp_f3_2); + } + } + + if (param_1 != NULL) { + *param_1 = var_f31; + } + + if (param_2 != NULL) { + *param_2 = var_f30; + } } -#pragma pop /* 80029D78-80029E1C 0246B8 00A4+00 1/1 0/0 0/0 .text calcMapCenterXZ__6dMap_cFiPfPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::calcMapCenterXZ(int param_0, f32* param_1, f32* param_2) { - nofralloc -#include "asm/d/map/d_map/calcMapCenterXZ__6dMap_cFiPfPf.s" -} -#pragma pop +void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) { + f32 var_f31 = 0.0f; + f32 var_f30 = 0.0f; + + JUT_ASSERT(i_roomNo >= 0); + + if (i_roomNo >= 0) { + f32 sp14 = 0.0f; + f32 sp10 = 0.0f; + f32 spC = 0.0f; + f32 sp8 = 0.0f; + getMapMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8); -/* ############################################################################################## */ -/* 80451CE8-80451CEC 0002E8 0004+00 1/1 0/0 0/0 .sdata2 @4503 */ -SECTION_SDATA2 static f32 lit_4503 = 10800.0f; + var_f31 = (spC + sp14) * 0.5f; + var_f30 = (sp8 + sp10) * 0.5f; + } + + if (param_1 != NULL) { + *param_1 = var_f31; + } + + if (param_2 != NULL) { + *param_2 = var_f30; + } +} /* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text calcMapCmPerTexel__6dMap_cFiPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::calcMapCmPerTexel(int param_0, f32* param_1) { - nofralloc -#include "asm/d/map/d_map/calcMapCmPerTexel__6dMap_cFiPf.s" +void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { + JUT_ASSERT(i_roomNo >= 0); + JUT_ASSERT(ip_cmPerTexel != 0); + + f32 cmPerTexel = 0.0f; + JUT_ASSERT(mTexSizeY != 0); + + if (i_roomNo >= 0) { + if (getStayType() == 0) { + f32 sp14 = 0.0f; + f32 sp10 = 0.0f; + f32 spC = 0.0f; + f32 sp8 = 0.0f; + getMapMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8); + + f32 temp_f2 = spC - sp14; + f32 temp_f0 = sp8 - sp10; + f32 var_f3; + if (temp_f2 >= temp_f0) { + var_f3 = temp_f2; + } else { + var_f3 = temp_f0; + } + + cmPerTexel = var_f3 / ((f32)mTexSizeY - (f32)(field_0x74 + 4)); + } else { + f32 var_f31 = 0.0f; + + stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo(); + JUT_ASSERT(pstag != 0); + + if (pstag != NULL) { + var_f31 = pstag->field_0x20; + } + + if (var_f31 == 0.0f) { + var_f31 = 10800.0f; + } + + cmPerTexel = var_f31 / (f32)mTexSizeY; + } + } + + JUT_ASSERT(cmPerTexel != 0.0f); + + if (ip_cmPerTexel != NULL) { + *ip_cmPerTexel = cmPerTexel; + } +} + +inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u8& b, u8& a) { + u16 temp_r0; + int t_r; + int t_g; + int t_b; + int t_a; + + temp_r0 = palette.field_0x0.color; + if (temp_r0 & 0x8000) { + t_r = ((temp_r0 >> 7) & 0xF8) | (r >> 5); + t_g = ((temp_r0 >> 2) & 0xF8) | (g >> 5); + t_b = ((temp_r0 << 3) & 0xF8) | (b >> 5); + t_a = 0xFF; + } else { + t_r = ((temp_r0 >> 4) & 0xF0) | (r >> 4); + t_g = ((temp_r0 >> 0) & 0xF0) | (g >> 4); + t_b = ((temp_r0 << 4) & 0xF0) | (b >> 4); + t_a = ((temp_r0 >> 7) & 0xE0) | (a >> 3) | (a >> 6); + } + + r = t_r; + g = t_g; + b = t_b; + a = t_a; } -#pragma pop /* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::setMapPaletteColorAlphaPer(int param_0, f32 param_1) { - nofralloc -#include "asm/d/map/d_map/setMapPaletteColorAlphaPer__6dMap_cFif.s" +void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) { + JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER); + + int pixel; + u8 scaled_a = 0; + u8 r = 0; + u8 g = 0; + u8 b = 0; + u8 a = 0; + dMpath_RGB5A3_palDt_s& temp_r31 = dMap_HIO_prm_res_dst_s::m_res->palette_data[i_paletteNo]; + getRGBA_RGB5A3(m_res_src->palette_data[i_paletteNo], r, g, b, a); + + scaled_a = a * param_1; + if (scaled_a >= 0xE0) { + pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | ((b & 0xF8) >> 3) | 0x8000; + } else { + pixel = ((r & 0xF0) << 4) | (g & 0xF0) | ((b & 0xF0) >> 4) | ((scaled_a & 0xE0) << 7); + } + + temp_r31.field_0x0.color = pixel; + temp_r31.field_0x2.color = pixel; + temp_r31.field_0x4.color = pixel; + temp_r31.field_0x6.color = pixel; + DCStoreRange(&dMap_HIO_prm_res_dst_s::m_res->palette_data[i_paletteNo], + sizeof(dMpath_RGB5A3_palDt_s)); } -#pragma pop /* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text copyPalette__6dMap_cFiif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::copyPalette(int param_0, int param_1, f32 param_2) { - nofralloc -#include "asm/d/map/d_map/copyPalette__6dMap_cFiif.s" +void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) { + JUT_ASSERT(i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER); + JUT_ASSERT(i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER); + + int pixel; + u8 scaled_a = 0; + u8 r = 0; + u8 g = 0; + u8 b = 0; + u8 a = 0; + dMpath_RGB5A3_palDt_s& temp_r31 = dMap_HIO_prm_res_dst_s::m_res->palette_data[i_dstPaletteNo]; + getRGBA_RGB5A3(m_res_src->palette_data[i_srcPaletteNo], r, g, b, a); + + scaled_a = a * param_2; + if (scaled_a >= 0xE0) { + pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | ((b & 0xF8) >> 3) | 0x8000; + } else { + pixel = ((r & 0xF0) << 4) | (g & 0xF0) | ((b & 0xF0) >> 4) | ((scaled_a & 0xE0) << 7); + } + + temp_r31.field_0x0.color = pixel; + temp_r31.field_0x2.color = pixel; + temp_r31.field_0x4.color = pixel; + temp_r31.field_0x6.color = pixel; + DCStoreRange(&dMap_HIO_prm_res_dst_s::m_res->palette_data[i_dstPaletteNo], + sizeof(dMpath_RGB5A3_palDt_s)); } -#pragma pop /* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::setAmapPaletteColor(int param_0, u8 param_1, u8 param_2, u8 param_3, u8 param_4) { - nofralloc -#include "asm/d/map/d_map/setAmapPaletteColor__6dMap_cFiUcUcUcUc.s" +void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) { + JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER); + + int pixel; + if (i_scaledA >= 0xE0) { + pixel = ((i_r & 0xF8) << 7) | ((i_g & 0xF8) << 2) | ((i_b & 0xF8) >> 3) | 0x8000; + } else { + pixel = + ((i_r & 0xF0) << 4) | (i_g & 0xF0) | ((i_b & 0xF0) >> 4) | ((i_scaledA & 0xE0) << 7); + } + + dMpath_RGB5A3_palDt_s& temp_r31 = dMap_HIO_prm_res_dst_s::m_res->palette_data[i_paletteNo]; + temp_r31.field_0x0.color = pixel; + temp_r31.field_0x2.color = pixel; + temp_r31.field_0x4.color = pixel; + temp_r31.field_0x6.color = pixel; + DCStoreRange(&dMap_HIO_prm_res_dst_s::m_res->palette_data[i_paletteNo], + sizeof(dMpath_RGB5A3_palDt_s)); } -#pragma pop /* 8002A1BC-8002A1DC 024AFC 0020+00 2/2 0/0 0/0 .text getDispType__6dMap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getDispType() const { - nofralloc -#include "asm/d/map/d_map/getDispType__6dMap_cCFv.s" +int dMap_c::getDispType() const { + return renderingAmap_c::getDispType(); } -#pragma pop /* 8002A1DC-8002A254 024B1C 0078+00 1/0 0/0 0/0 .text isDrawRoom__6dMap_cCFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::isDrawRoom(int param_0, int param_1) const { - nofralloc -#include "asm/d/map/d_map/isDrawRoom__6dMap_cCFii.s" +bool dMap_c::isDrawRoom(int param_0, int param_1) const { + if (field_0x8e == 2) { + if (field_0x8f >= 3 && field_0x8f <= 3) { + return param_0 == field_0x84 || param_0 == field_0x88; + } else { + return param_0 == field_0x80; + } + } else { + return renderingDAmap_c::isDrawRoom(param_0, param_1); + } } -#pragma pop /* 8002A254-8002A294 024B94 0040+00 1/0 0/0 0/0 .text getRoomNoSingle__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getRoomNoSingle() { - nofralloc -#include "asm/d/map/d_map/getRoomNoSingle__6dMap_cFv.s" +int dMap_c::getRoomNoSingle() { + if (field_0x8e == 2 && field_0x8f <= 6) { + return field_0x80; + } else { + return renderingDAmap_c::getRoomNoSingle(); + } } -#pragma pop /* 8002A294-8002A32C 024BD4 0098+00 1/0 0/0 0/0 .text isDrawRoomIcon__6dMap_cCFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const { - nofralloc -#include "asm/d/map/d_map/isDrawRoomIcon__6dMap_cCFii.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0"; -#pragma pop - -/* 80451CEC-80451CF0 0002EC 0004+00 1/1 0/0 0/0 .sdata2 @4688 */ -SECTION_SDATA2 static f32 lit_4688 = -3710.0f; +bool dMap_c::isDrawRoomIcon(int param_0, int param_1) const { + bool var_r30 = hasMap() || param_0 == param_1; + if (renderingAmap_c::isRendAllRoom()) { + var_r30 = var_r30 || dMapInfo_n::isVisitedRoom(param_0); + } -/* 80451CF0-80451CF4 0002F0 0004+00 1/1 0/0 0/0 .sdata2 @4689 */ -SECTION_SDATA2 static f32 lit_4689 = -22397.0f; - -/* 80451CF4-80451CF8 0002F4 0004+00 1/1 0/0 0/0 .sdata2 @4690 */ -SECTION_SDATA2 static f32 lit_4690 = 60.0f; - -/* 80451CF8-80451CFC 0002F8 0004+00 1/1 0/0 0/0 .sdata2 @4691 */ -SECTION_SDATA2 static f32 lit_4691 = 5.0f; - -/* 80451CFC-80451D00 0002FC 0004+00 1/1 0/0 0/0 .sdata2 @4692 */ -SECTION_SDATA2 static f32 lit_4692 = 20.0f; + return var_r30; +} /* 8002A32C-8002AB54 024C6C 0828+00 1/0 1/1 0/0 .text _move__6dMap_cFffif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::_move(f32 param_0, f32 param_1, int param_2, f32 param_3) { - nofralloc -#include "asm/d/map/d_map/_move__6dMap_cFffif.s" +void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) { + if (mStayRoomNo == -1) { + mStayRoomNo = i_roomNo; + field_0x80 = mStayRoomNo; + field_0x84 = mStayRoomNo; + dMapInfo_c::setNextRoomNoForMapPat0(mStayRoomNo); + + field_0x8e = 0; + field_0x8f = 0; + field_0x90 = 0; + mCenterX = i_centerX; + mCenterZ = i_centerZ; + + calcMapCenterXZ(field_0x80, &mCenterX, &mCenterZ); + calcMapCmPerTexel(field_0x80, &field_0x58); + getPack(field_0x80, &mPackX, &mPackZ); + + mCenterX += mPackX; + mCenterZ -= mPackZ; + mCenterX += field_0x64; + mCenterZ += mPackPlusZ; + } + + if (getStayType() == 0 && dComIfGs_isSaveDunSwitch(0x32) && + strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) + { + field_0x64 = 0.0f; + mPackPlusZ = -3710.0f; + + f32 temp = (field_0x58 * (f32)(field_0x74 + 4)) * 0.5f; + mRightEdgePlus = 0.0f; + mTopEdgePlus = ((-22397.0f - dMpath_c::getMinZ()) - temp) / field_0x58; + } else { + mRightEdgePlus = 0.0f; + mTopEdgePlus = 0.0f; + } + + int temp_r29 = mStayRoomNo; + mStayRoomNo = i_roomNo; + + dMapInfo_c::move(mStayRoomNo, param_3); + field_0x8e = 0; + + switch (getDispType()) { + default: + case 0: + JUT_ASSERT(0); + break; + case 5: + field_0x8e = 2; + break; + case 1: + field_0x8e = 1; + break; + } + + switch (field_0x8e) { + case 0: + if (mStayRoomNo != temp_r29) { + field_0x80 = mStayRoomNo; + field_0x84 = mStayRoomNo; + field_0x88 = mStayRoomNo; + + calcMapCenterXZ(field_0x80, &mCenterX, &mCenterZ); + calcMapCmPerTexel(field_0x80, &field_0x58); + getPack(field_0x80, &mPackX, &mPackZ); + + mCenterX += mPackX; + mCenterZ -= mPackZ; + } + break; + case 1: + switch (field_0x8f) { + case 0: + if (field_0x80 != dMapInfo_c::getNextRoomNoForMapPat0()) { + field_0x8f = 1; + field_0x90 = 60; + field_0x84 = (s8)dMapInfo_c::getNextRoomNoForMapPat0(); + field_0x88 = field_0x80; + } + break; + case 1: + field_0x90--; + if (field_0x90 == 0) { + field_0x8f = 0; + field_0x80 = field_0x84; + calcMapCenterXZ(field_0x80, &mCenterX, &mCenterZ); + } + break; + } + break; + case 2: + switch (field_0x8f) { + case 0: + if (field_0x80 != dMapInfo_c::getNextRoomNoForMapPat0()) { + field_0x84 = (s8)dMapInfo_c::getNextRoomNoForMapPat0(); + field_0x88 = field_0x80; + field_0x90 = 30; + field_0x8f = 1; + field_0x90 = 30; + } + break; + case 1: + if (field_0x90 != 0) { + field_0x90--; + } + + if (field_0x90 == 0 && mStayRoomNo != field_0x88) { + field_0x8f = 2; + field_0x90 = 5; + } + break; + case 2: + field_0x90--; + if (field_0x90 == 0) { + field_0x8f = 3; + field_0x90 = 20; + } + break; + case 3: + field_0x90--; + if (field_0x90 == 0) { + field_0x80 = field_0x84; + + calcMapCenterXZ(field_0x80, &mCenterX, &mCenterZ); + calcMapCmPerTexel(field_0x80, &field_0x58); + getPack(field_0x80, &mPackX, &mPackZ); + + mCenterX += mPackX; + mCenterZ -= mPackZ; + field_0x8f = 4; + field_0x90 = 5; + } + break; + case 4: + field_0x90--; + if (field_0x90 == 0) { + field_0x8f = 5; + } + break; + case 5: + if (field_0x84 == mStayRoomNo) { + field_0x8f = 6; + } + break; + case 6: + field_0x8f = 0; + break; + } + break; + } + + switch (field_0x8e) { + case 0: + break; + case 1: + switch (field_0x8f) { + case 0: + break; + case 1: + calcMapCenterXZ(field_0x88, &mCenterX, &mCenterZ); + f32 sp2C, sp28; + calcMapCenterXZ(field_0x84, &sp2C, &sp28); + + f32 temp_f2 = 1.0f - ((f32)field_0x90 / 60.0f); + mCenterX += temp_f2 * (sp2C - mCenterX); + mCenterZ += temp_f2 * (sp28 - mCenterZ); + break; + } + break; + case 2: + switch (field_0x8f) { + case 2: + f32 temp_f31 = (f32)field_0x90 / 5.0f; + setMapPaletteColorAlphaPer(0x2F, 0x32, temp_f31); + setMapPaletteColorAlphaPer(0x21, 0x2B, temp_f31); + break; + case 3: + calcMapCenterXZ(field_0x88, &mCenterX, &mCenterZ); + f32 sp24, sp20; + calcMapCenterXZ(field_0x84, &sp24, &sp20); + + f32 temp_f31_2 = 1.0f - ((f32)field_0x90 / 20.0f); + mCenterX += temp_f31_2 * (sp24 - mCenterX); + mCenterZ += temp_f31_2 * (sp20 - mCenterZ); + + if (mStayRoomNo == field_0x88) { + setMapPaletteColorAlphaPer(0xA, 0x11, temp_f31_2); + setMapPaletteColorAlphaPer(0x12, 0x19, 1.0f - temp_f31_2); + } else { + setMapPaletteColorAlphaPer(0xA, 0x11, 1.0f - temp_f31_2); + setMapPaletteColorAlphaPer(0x12, 0x19, temp_f31_2); + } + + f32 sp1C, sp18; + calcMapCmPerTexel(field_0x88, &sp1C); + calcMapCmPerTexel(field_0x84, &sp18); + field_0x58 = sp1C + (temp_f31_2 * (sp18 - sp1C)); + + f32 sp14, sp10, spC, sp8; + getPack(field_0x88, &sp14, &sp10); + getPack(field_0x84, &spC, &sp8); + + sp14 += temp_f31_2 * (spC - sp14); + sp10 += temp_f31_2 * (sp8 - sp10); + mCenterX += sp14; + mCenterZ -= sp10; + break; + case 4: + f32 temp_f31_3 = 1.0f - ((f32)field_0x90 / 5.0f); + setMapPaletteColorAlphaPer(0x2F, 0x32, temp_f31_3); + setMapPaletteColorAlphaPer(0x21, 0x2B, temp_f31_3); + break; + case 6: + copyPalette(); + break; + } + break; + } + + field_0x8d = 1; } -#pragma pop /* 8002AB54-8002ABAC 025494 0058+00 0/0 1/1 0/0 .text _draw__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::_draw() { - nofralloc -#include "asm/d/map/d_map/_draw__6dMap_cFv.s" +void dMap_c::_draw() { + if (mStayRoomNo >= 0 && field_0x8d != 0) { + s8 floor_no = dMapInfo_c::getNowStayFloorNo(); + entry(mCenterX, mCenterZ, field_0x58, mStayRoomNo, floor_no); + } } -#pragma pop /* 8002ABAC-8002ABCC 0254EC 0020+00 1/0 0/0 0/0 .text getFirstData__6dMap_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getFirstData(u8 param_0) { - nofralloc -#include "asm/d/map/d_map/getFirstData__6dMap_cFUc.s" +dTres_c::typeGroupData_c* dMap_c::getFirstData(u8 param_0) { + return renderingPlusDoorAndCursor_c::getFirstData(param_0); } -#pragma pop /* 8002ABCC-8002ABEC 02550C 0020+00 1/0 0/0 0/0 .text * getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMap_c::getNextData(dTres_c::typeGroupData_c* param_0) { - nofralloc -#include "asm/d/map/d_map/getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c.s" +dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0) { + return renderingPlusDoorAndCursor_c::getNextData(param_0); } -#pragma pop -/* 8002ABEC-8002ABF0 02552C 0004+00 3/0 3/0 0/0 .text draw__12dDlst_base_cFv */ +// TODO: this is supposed to be auto-generated, but its not getting put in the right order void dDlst_base_c::draw() { /* empty function */ -} - -/* 8002ABF0-8002ABF8 025530 0008+00 3/0 7/0 0/0 .text isDrawType__11dDrawPath_cFi */ -bool dDrawPath_c::isDrawType(int param_0) { - return true; -} - -/* 8002ABF8-8002AC74 025538 007C+00 0/0 1/0 0/0 .text __dt__18dRenderingFDAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dRenderingFDAmap_c::~dRenderingFDAmap_c() { - nofralloc -#include "asm/d/map/d_map/__dt__18dRenderingFDAmap_cFv.s" -} -#pragma pop - -/* 8002AC74-8002ACE0 0255B4 006C+00 1/0 0/0 0/0 .text __dt__15dRenderingMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dRenderingMap_c::~dRenderingMap_c() { - nofralloc -#include "asm/d/map/d_map/__dt__15dRenderingMap_cFv.s" -} -#pragma pop - -/* 8002ACE0-8002AD3C 025620 005C+00 1/0 0/0 0/0 .text __dt__28dDrawPathWithNormalPattern_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDrawPathWithNormalPattern_c::~dDrawPathWithNormalPattern_c() { - nofralloc -#include "asm/d/map/d_map/__dt__28dDrawPathWithNormalPattern_cFv.s" -} -#pragma pop - -/* 8002AD3C-8002AD84 02567C 0048+00 0/0 1/0 0/0 .text __dt__11dDrawPath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDrawPath_c::~dDrawPath_c() { - nofralloc -#include "asm/d/map/d_map/__dt__11dDrawPath_cFv.s" -} -#pragma pop - -/* 8002AD84-8002ADB0 0256C4 002C+00 2/0 7/0 0/0 .text getLineColor__11dDrawPath_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::getLineColor(int param_0, int param_1) { - nofralloc -#include "asm/d/map/d_map/getLineColor__11dDrawPath_cFii.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A70F4-803A71B8 004214 00C4+00 3/3 0/0 0/0 .data __vt__15renderingAmap_c */ -SECTION_DATA extern void* __vt__15renderingAmap_c[49] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15renderingAmap_cFv, - (void*)__dt__15renderingAmap_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__15renderingAmap_cFii, - (void*)getLineWidth__15renderingAmap_cFi, - (void*)isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__16renderingDAmap_cFi, - (void*)getFirstRoomPointer__16renderingDAmap_cFv, - (void*)getNextRoomPointer__16renderingDAmap_cFv, - (void*)drawPath__15renderingAmap_cFv, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__15renderingAmap_cFv, - (void*)afterDrawPath__15renderingAmap_cFv, - (void*)preDrawPath__16renderingDAmap_cFv, - (void*)postDrawPath__16renderingDAmap_cFv, - (void*)isDrawPath__16renderingDAmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)getBackColor__16renderingDAmap_cCFv, - (void*)getDecoLineColor__15renderingAmap_cFii, - (void*)getDecorationLineWidth__15renderingAmap_cFi, - (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, - (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, - (void*)getIconGroupNumber__15renderingAmap_cCFUc, - (void*)hasMap__15renderingAmap_cCFv, - (void*)isRendAllRoom__15renderingAmap_cCFv, - (void*)isRendDoor__15renderingAmap_cCFv, - (void*)isCheckFloor__15renderingAmap_cCFv, - (void*)isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi, - (void*)getRoomNoSingle__16renderingDAmap_cFv, - (void*)isDrawRoom__16renderingDAmap_cCFii, - (void*)isDrawRoomIcon__16renderingDAmap_cCFii, - (void*)isRendRestart__15renderingAmap_cCFv, - (void*)isRendCursor__15renderingAmap_cCFv, - (void*)isRendIcon__15renderingAmap_cCFv, - (void*)getIconSize__15renderingAmap_cCFUc, - (void*)getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c, - (void*)getFirstData__28renderingPlusDoorAndCursor_cFUc, - (void*)getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c, - (void*)getPlayerCursorSize__15renderingAmap_cFv, - (void*)getRestartCursorSize__15renderingAmap_cFv, - (void*)NULL, - (void*)NULL, -}; - -/* 8002ADB0-8002AE6C 0256F0 00BC+00 1/0 0/0 0/0 .text __dt__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingAmap_c::~renderingAmap_c() { - nofralloc -#include "asm/d/map/d_map/__dt__15renderingAmap_cFv.s" -} -#pragma pop - -/* 8002AE6C-8002AF20 0257AC 00B4+00 1/1 0/0 0/0 .text __ct__15renderingAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingAmap_c::renderingAmap_c() { - nofralloc -#include "asm/d/map/d_map/__ct__15renderingAmap_cFv.s" -} -#pragma pop - -/* 8002AF20-8002B000 025860 00E0+00 1/0 0/0 0/0 .text __dt__6dMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMap_c::~dMap_c() { - nofralloc -#include "asm/d/map/d_map/__dt__6dMap_cFv.s" -} -#pragma pop - -/* 8002B000-8002B008 025940 0008+00 2/0 0/0 0/0 .text isRendIcon__15renderingAmap_cCFv */ -bool renderingAmap_c::isRendIcon() const { - return true; -} - -/* 8002B008-8002B0B4 025948 00AC+00 0/0 1/0 0/0 .text __dt__28renderingPlusDoorAndCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingPlusDoorAndCursor_c::~renderingPlusDoorAndCursor_c() { - nofralloc -#include "asm/d/map/d_map/__dt__28renderingPlusDoorAndCursor_cFv.s" -} -#pragma pop - -/* 8002B0B4-8002B150 0259F4 009C+00 0/0 1/0 0/0 .text __dt__19renderingPlusDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingPlusDoor_c::~renderingPlusDoor_c() { - nofralloc -#include "asm/d/map/d_map/__dt__19renderingPlusDoor_cFv.s" -} -#pragma pop - -/* 8002B150-8002B1DC 025A90 008C+00 0/0 1/0 0/0 .text __dt__16renderingDAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm renderingDAmap_c::~renderingDAmap_c() { - nofralloc -#include "asm/d/map/d_map/__dt__16renderingDAmap_cFv.s" -} -#pragma pop - -/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +}
\ No newline at end of file diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index 5254cee5bb..fa281a8f4f 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -373,7 +373,7 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li } /* 8003D68C-8003D6B8 037FCC 002C+00 1/0 6/0 0/0 .text getDecoLineColor__18dRenderingFDAmap_cFii */ -GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) { +const GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) { return getLineColor(param_0, param_1); } diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index c33e749198..1f8bdaf88a 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -3,6 +3,8 @@ * Fish Journal */ +#define NO_INLINE_DLSTBASE_DRAW + #include "d/menu/d_menu_fishing.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 534c731d80..a15a92efd2 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -3,6 +3,8 @@ * Menu - Insect List */ +#define NO_INLINE_DLSTBASE_DRAW + #include "d/menu/d_menu_insect.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 7eb642a0c9..55c042e6aa 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/menu/d_menu_save // +#define NO_INLINE_DLSTBASE_DRAW + #include "d/menu/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 756415815e..9f6019de39 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -3,6 +3,8 @@ * Hidden Skills - Menu */ +#define NO_INLINE_DLSTBASE_DRAW + #include "d/menu/d_menu_skill.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index e3118231d1..f0ea435b92 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -5,6 +5,7 @@ #include "d/meter/d_meter_map.h" #include "JSystem/J2DGraph/J2DGrafContext.h" +#include "d/map/d_map.h" #include "d/menu/d_menu_window.h" #include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" |