diff --git a/Progress.md b/Progress.md index 15c264c08b..c392a4ba32 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 | 29.098045% | 1046524 | 3596544 +.text | 29.144201% | 1048184 | 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 | 36.572493% | 1470460 | 4020672 +Total | 36.613780% | 1472120 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 36.572493% | 1470460 | 4020672 -RELs | 33.847533% | 3892576 | 11500324 -Total | 34.553427% | 5363036 | 15520996 +main.dol | 36.613780% | 1472120 | 4020672 +RELs | 33.883741% | 3896740 | 11500324 +Total | 34.590950% | 5368860 | 15520996 ## RELs @@ -47,7 +47,7 @@ d_a_b_go | 44.671347% | 2800 | 6268 d_a_b_gos | 43.551689% | 3404 | 7816 d_a_b_mgn | 26.103833% | 15064 | 57708 d_a_b_ob | 26.856326% | 15784 | 58772 -d_a_b_oh | 32.611348% | 4276 | 13112 +d_a_b_oh | 35.387431% | 4640 | 13112 d_a_b_oh2 | 100.000000% | 5532 | 5532 d_a_b_tn | 24.850960% | 21176 | 85212 d_a_b_yo | 25.613486% | 14404 | 56236 @@ -83,7 +83,7 @@ d_a_door_mbossL1 | 34.467633% | 10372 | 30092 d_a_door_push | 37.997725% | 2672 | 7032 d_a_door_shutter | 37.465797% | 14240 | 38008 d_a_door_spiral | 100.000000% | 504 | 504 -d_a_dshutter | 46.003263% | 2256 | 4904 +d_a_dshutter | 94.779772% | 4648 | 4904 d_a_e_ai | 28.308171% | 5100 | 18016 d_a_e_arrow | 35.306882% | 4556 | 12904 d_a_e_ba | 28.140394% | 5484 | 19488 @@ -501,7 +501,7 @@ d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 d_a_obj_lv4chandelier | 26.284971% | 4848 | 18444 d_a_obj_lv4digsand | 43.888433% | 2140 | 4876 -d_a_obj_lv4floor | 49.786020% | 1396 | 2804 +d_a_obj_lv4floor | 100.000000% | 2804 | 2804 d_a_obj_lv4gear | 42.242704% | 1100 | 2604 d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.847533% | 3892576 | 11500324 +Total | 33.883741% | 3896740 | 11500324 diff --git a/asm/d/d_stage/dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 5889e040db..0000000000 --- a/asm/d/d_stage/dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8002556C: -/* 8002556C 2C 05 00 00 */ cmpwi r5, 0 -/* 80025570 40 82 00 0C */ bne lbl_8002557C -/* 80025574 38 60 00 01 */ li r3, 1 -/* 80025578 4E 80 00 20 */ blr -lbl_8002557C: -/* 8002557C 80 04 00 08 */ lwz r0, 8(r4) -/* 80025580 90 03 00 04 */ stw r0, 4(r3) -/* 80025584 38 60 00 01 */ li r3, 1 -/* 80025588 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index c4f9c52114..0000000000 --- a/asm/d/d_stage/dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80026400: -/* 80026400 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80026404 7C 08 02 A6 */ mflr r0 -/* 80026408 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002640C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80026410 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80026414 7C 7E 1B 78 */ mr r30, r3 -/* 80026418 83 E4 00 08 */ lwz r31, 8(r4) -/* 8002641C 28 1F 00 00 */ cmplwi r31, 0 -/* 80026420 40 82 00 0C */ bne lbl_8002642C -/* 80026424 38 60 00 01 */ li r3, 1 -/* 80026428 48 00 00 1C */ b lbl_80026444 -lbl_8002642C: -/* 8002642C 7F E3 FB 78 */ mr r3, r31 -/* 80026430 38 81 00 09 */ addi r4, r1, 9 -/* 80026434 38 A1 00 08 */ addi r5, r1, 8 -/* 80026438 48 01 93 D9 */ bl setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc -/* 8002643C 93 FE 00 08 */ stw r31, 8(r30) -/* 80026440 38 60 00 01 */ li r3, 1 -lbl_80026444: -/* 80026444 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80026448 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8002644C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80026450 7C 08 03 A6 */ mtlr r0 -/* 80026454 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026458 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index d8997a2f7c..0000000000 --- a/asm/d/d_stage/dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002634C: -/* 8002634C 38 04 00 04 */ addi r0, r4, 4 -/* 80026350 90 03 00 00 */ stw r0, 0(r3) -/* 80026354 38 60 00 01 */ li r3, 1 -/* 80026358 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv.s deleted file mode 100644 index a57b956099..0000000000 --- a/asm/d/d_stage/dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800263D0: -/* 800263D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800263D4 7C 08 02 A6 */ mflr r0 -/* 800263D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800263DC 88 63 00 04 */ lbz r3, 4(r3) -/* 800263E0 38 A0 00 01 */ li r5, 1 -/* 800263E4 38 84 00 04 */ addi r4, r4, 4 -/* 800263E8 48 01 96 59 */ bl setPointer__8dMpath_cFScPvi -/* 800263EC 38 60 00 01 */ li r3, 1 -/* 800263F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800263F4 7C 08 03 A6 */ mtlr r0 -/* 800263F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800263FC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_mapPathInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_mapPathInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 6451c0e675..0000000000 --- a/asm/d/d_stage/dStage_mapPathInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800263A0: -/* 800263A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800263A4 7C 08 02 A6 */ mflr r0 -/* 800263A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800263AC 88 63 00 04 */ lbz r3, 4(r3) -/* 800263B0 38 A0 00 00 */ li r5, 0 -/* 800263B4 38 84 00 04 */ addi r4, r4, 4 -/* 800263B8 48 01 96 89 */ bl setPointer__8dMpath_cFScPvi -/* 800263BC 38 60 00 01 */ li r3, 1 -/* 800263C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800263C4 7C 08 03 A6 */ mtlr r0 -/* 800263C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800263CC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_mecoInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_mecoInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index 756a6debd3..0000000000 --- a/asm/d/d_stage/dStage_mecoInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80026298: -/* 80026298 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002629C 7C 08 02 A6 */ mflr r0 -/* 800262A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800262A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800262A8 3B E4 00 04 */ addi r31, r4, 4 -/* 800262AC 7F E4 FB 78 */ mr r4, r31 -/* 800262B0 81 83 00 00 */ lwz r12, 0(r3) -/* 800262B4 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800262B8 7D 89 03 A6 */ mtctr r12 -/* 800262BC 4E 80 04 21 */ bctrl -/* 800262C0 28 1F 00 00 */ cmplwi r31, 0 -/* 800262C4 41 82 00 40 */ beq lbl_80026304 -/* 800262C8 80 DF 00 04 */ lwz r6, 4(r31) -/* 800262CC 38 E0 00 00 */ li r7, 0 -/* 800262D0 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 800262D4 38 83 60 94 */ addi r4, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 800262D8 48 00 00 20 */ b lbl_800262F8 -lbl_800262DC: -/* 800262DC 88 A6 00 01 */ lbz r5, 1(r6) -/* 800262E0 88 06 00 00 */ lbz r0, 0(r6) -/* 800262E4 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 800262E8 7C 64 02 14 */ add r3, r4, r0 -/* 800262EC 98 A3 03 F8 */ stb r5, 0x3f8(r3) -/* 800262F0 38 C6 00 02 */ addi r6, r6, 2 -/* 800262F4 38 E7 00 01 */ addi r7, r7, 1 -lbl_800262F8: -/* 800262F8 80 1F 00 00 */ lwz r0, 0(r31) -/* 800262FC 7C 07 00 00 */ cmpw r7, r0 -/* 80026300 41 80 FF DC */ blt lbl_800262DC -lbl_80026304: -/* 80026304 38 60 00 01 */ li r3, 1 -/* 80026308 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002630C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80026310 7C 08 03 A6 */ mtlr r0 -/* 80026314 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026318 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_memaInfoInit__FP11dStage_dt_cPviPv.s b/asm/d/d_stage/dStage_memaInfoInit__FP11dStage_dt_cPviPv.s deleted file mode 100644 index ad0b0aeab0..0000000000 --- a/asm/d/d_stage/dStage_memaInfoInit__FP11dStage_dt_cPviPv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80026218: -/* 80026218 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002621C 7C 08 02 A6 */ mflr r0 -/* 80026220 90 01 00 24 */ stw r0, 0x24(r1) -/* 80026224 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026228 48 33 BF B5 */ bl _savegpr_29 -/* 8002622C 3B E4 00 04 */ addi r31, r4, 4 -/* 80026230 7F E4 FB 78 */ mr r4, r31 -/* 80026234 81 83 00 00 */ lwz r12, 0(r3) -/* 80026238 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 8002623C 7D 89 03 A6 */ mtctr r12 -/* 80026240 4E 80 04 21 */ bctrl -/* 80026244 28 1F 00 00 */ cmplwi r31, 0 -/* 80026248 41 82 00 34 */ beq lbl_8002627C -/* 8002624C 83 DF 00 04 */ lwz r30, 4(r31) -/* 80026250 3B A0 00 00 */ li r29, 0 -/* 80026254 48 00 00 1C */ b lbl_80026270 -lbl_80026258: -/* 80026258 7F A3 EB 78 */ mr r3, r29 -/* 8002625C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80026260 38 84 03 80 */ addi r4, r4, 0x380 -/* 80026264 4B FF E5 E1 */ bl createMemoryBlock__20dStage_roomControl_cFiUl -/* 80026268 3B DE 00 04 */ addi r30, r30, 4 -/* 8002626C 3B BD 00 01 */ addi r29, r29, 1 -lbl_80026270: -/* 80026270 80 1F 00 00 */ lwz r0, 0(r31) -/* 80026274 7C 1D 00 00 */ cmpw r29, r0 -/* 80026278 41 80 FF E0 */ blt lbl_80026258 -lbl_8002627C: -/* 8002627C 38 60 00 01 */ li r3, 1 -/* 80026280 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026284 48 33 BF A5 */ bl _restgpr_29 -/* 80026288 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002628C 7C 08 03 A6 */ mtlr r0 -/* 80026290 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026294 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getMapInfo2__15dStage_roomDt_cCFi.s b/asm/d/d_stage/getMapInfo2__15dStage_roomDt_cCFi.s deleted file mode 100644 index f9f37cc3bb..0000000000 --- a/asm/d/d_stage/getMapInfo2__15dStage_roomDt_cCFi.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80025370: -/* 80025370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025374 7C 08 02 A6 */ mflr r0 -/* 80025378 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002537C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80025380 7C 9F 23 78 */ mr r31, r4 -/* 80025384 81 83 00 00 */ lwz r12, 0(r3) -/* 80025388 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8002538C 7D 89 03 A6 */ mtctr r12 -/* 80025390 4E 80 04 21 */ bctrl -/* 80025394 28 03 00 00 */ cmplwi r3, 0 -/* 80025398 41 82 00 1C */ beq lbl_800253B4 -/* 8002539C 80 83 00 00 */ lwz r4, 0(r3) -/* 800253A0 2C 04 00 00 */ cmpwi r4, 0 -/* 800253A4 41 82 00 10 */ beq lbl_800253B4 -/* 800253A8 80 03 00 04 */ lwz r0, 4(r3) -/* 800253AC 28 00 00 00 */ cmplwi r0, 0 -/* 800253B0 40 82 00 0C */ bne lbl_800253BC -lbl_800253B4: -/* 800253B4 38 60 00 00 */ li r3, 0 -/* 800253B8 48 00 00 30 */ b lbl_800253E8 -lbl_800253BC: -/* 800253BC 7C 03 03 78 */ mr r3, r0 -/* 800253C0 7C 89 03 A6 */ mtctr r4 -/* 800253C4 2C 04 00 00 */ cmpwi r4, 0 -/* 800253C8 40 81 00 1C */ ble lbl_800253E4 -lbl_800253CC: -/* 800253CC 88 03 00 35 */ lbz r0, 0x35(r3) -/* 800253D0 7C 1F 00 00 */ cmpw r31, r0 -/* 800253D4 40 82 00 08 */ bne lbl_800253DC -/* 800253D8 48 00 00 10 */ b lbl_800253E8 -lbl_800253DC: -/* 800253DC 38 63 00 38 */ addi r3, r3, 0x38 -/* 800253E0 42 00 FF EC */ bdnz lbl_800253CC -lbl_800253E4: -/* 800253E4 38 60 00 00 */ li r3, 0 -lbl_800253E8: -/* 800253E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800253EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800253F0 7C 08 03 A6 */ mtlr r0 -/* 800253F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800253F8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/getMapInfo2__16dStage_stageDt_cCFi.s b/asm/d/d_stage/getMapInfo2__16dStage_stageDt_cCFi.s deleted file mode 100644 index 38275c557a..0000000000 --- a/asm/d/d_stage/getMapInfo2__16dStage_stageDt_cCFi.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80025404: -/* 80025404 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025408 7C 08 02 A6 */ mflr r0 -/* 8002540C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025410 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80025414 7C 9F 23 78 */ mr r31, r4 -/* 80025418 81 83 00 00 */ lwz r12, 0(r3) -/* 8002541C 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 80025420 7D 89 03 A6 */ mtctr r12 -/* 80025424 4E 80 04 21 */ bctrl -/* 80025428 28 03 00 00 */ cmplwi r3, 0 -/* 8002542C 41 82 00 1C */ beq lbl_80025448 -/* 80025430 80 83 00 00 */ lwz r4, 0(r3) -/* 80025434 2C 04 00 00 */ cmpwi r4, 0 -/* 80025438 41 82 00 10 */ beq lbl_80025448 -/* 8002543C 80 03 00 04 */ lwz r0, 4(r3) -/* 80025440 28 00 00 00 */ cmplwi r0, 0 -/* 80025444 40 82 00 0C */ bne lbl_80025450 -lbl_80025448: -/* 80025448 38 60 00 00 */ li r3, 0 -/* 8002544C 48 00 00 30 */ b lbl_8002547C -lbl_80025450: -/* 80025450 7C 03 03 78 */ mr r3, r0 -/* 80025454 7C 89 03 A6 */ mtctr r4 -/* 80025458 2C 04 00 00 */ cmpwi r4, 0 -/* 8002545C 40 81 00 1C */ ble lbl_80025478 -lbl_80025460: -/* 80025460 88 03 00 35 */ lbz r0, 0x35(r3) -/* 80025464 7C 1F 00 00 */ cmpw r31, r0 -/* 80025468 40 82 00 08 */ bne lbl_80025470 -/* 8002546C 48 00 00 10 */ b lbl_8002547C -lbl_80025470: -/* 80025470 38 63 00 38 */ addi r3, r3, 0x38 -/* 80025474 42 00 FF EC */ bdnz lbl_80025460 -lbl_80025478: -/* 80025478 38 60 00 00 */ li r3, 0 -lbl_8002547C: -/* 8002547C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80025480 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80025484 7C 08 03 A6 */ mtlr r0 -/* 80025488 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002548C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/getNextDrawRoomNo__16renderingDAmap_cFi.s b/asm/d/map/d_map_path_dmap/getNextDrawRoomNo__16renderingDAmap_cFi.s deleted file mode 100644 index db7405b1c7..0000000000 --- a/asm/d/map/d_map_path_dmap/getNextDrawRoomNo__16renderingDAmap_cFi.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80040094: -/* 80040094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80040098 7C 08 02 A6 */ mflr r0 -/* 8004009C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800400A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800400A4 93 C1 00 08 */ stw r30, 8(r1) -/* 800400A8 7C 7E 1B 78 */ mr r30, r3 -/* 800400AC 3B E4 00 01 */ addi r31, r4, 1 -/* 800400B0 81 83 00 00 */ lwz r12, 0(r3) -/* 800400B4 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 800400B8 7D 89 03 A6 */ mtctr r12 -/* 800400BC 4E 80 04 21 */ bctrl -/* 800400C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800400C4 41 82 00 50 */ beq lbl_80040114 -/* 800400C8 2C 1F 00 40 */ cmpwi r31, 0x40 -/* 800400CC 41 80 00 20 */ blt lbl_800400EC -/* 800400D0 3B E0 FF FF */ li r31, -1 -/* 800400D4 48 00 00 44 */ b lbl_80040118 -lbl_800400D8: -/* 800400D8 3B FF 00 01 */ addi r31, r31, 1 -/* 800400DC 2C 1F 00 40 */ cmpwi r31, 0x40 -/* 800400E0 41 80 00 0C */ blt lbl_800400EC -/* 800400E4 3B E0 FF FF */ li r31, -1 -/* 800400E8 48 00 00 30 */ b lbl_80040118 -lbl_800400EC: -/* 800400EC 7F C3 F3 78 */ mr r3, r30 -/* 800400F0 7F E4 FB 78 */ mr r4, r31 -/* 800400F4 80 BE 00 2C */ lwz r5, 0x2c(r30) -/* 800400F8 81 9E 00 00 */ lwz r12, 0(r30) -/* 800400FC 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 80040100 7D 89 03 A6 */ mtctr r12 -/* 80040104 4E 80 04 21 */ bctrl -/* 80040108 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8004010C 41 82 FF CC */ beq lbl_800400D8 -/* 80040110 48 00 00 08 */ b lbl_80040118 -lbl_80040114: -/* 80040114 3B E0 FF FF */ li r31, -1 -lbl_80040118: -/* 80040118 7F E3 FB 78 */ mr r3, r31 -/* 8004011C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80040120 83 C1 00 08 */ lwz r30, 8(r1) -/* 80040124 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80040128 7C 08 03 A6 */ mtlr r0 -/* 8004012C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80040130 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/isDrawRoom__16renderingDAmap_cCFii.s b/asm/d/map/d_map_path_dmap/isDrawRoom__16renderingDAmap_cCFii.s deleted file mode 100644 index 97dcbc55d1..0000000000 --- a/asm/d/map/d_map_path_dmap/isDrawRoom__16renderingDAmap_cCFii.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8003FE70: -/* 8003FE70 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003FE74 7C 08 02 A6 */ mflr r0 -/* 8003FE78 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003FE7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003FE80 48 32 23 59 */ bl _savegpr_28 -/* 8003FE84 7C 7C 1B 78 */ mr r28, r3 -/* 8003FE88 7C 9D 23 78 */ mr r29, r4 -/* 8003FE8C 7C BF 2B 78 */ mr r31, r5 -/* 8003FE90 3B C0 00 00 */ li r30, 0 -/* 8003FE94 81 83 00 00 */ lwz r12, 0(r3) -/* 8003FE98 81 8C 00 78 */ lwz r12, 0x78(r12) -/* 8003FE9C 7D 89 03 A6 */ mtctr r12 -/* 8003FEA0 4E 80 04 21 */ bctrl -/* 8003FEA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003FEA8 40 82 00 0C */ bne lbl_8003FEB4 -/* 8003FEAC 7C 1D F8 00 */ cmpw r29, r31 -/* 8003FEB0 40 82 00 08 */ bne lbl_8003FEB8 -lbl_8003FEB4: -/* 8003FEB4 3B C0 00 01 */ li r30, 1 -lbl_8003FEB8: -/* 8003FEB8 7F 83 E3 78 */ mr r3, r28 -/* 8003FEBC 81 9C 00 00 */ lwz r12, 0(r28) -/* 8003FEC0 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 8003FEC4 7D 89 03 A6 */ mtctr r12 -/* 8003FEC8 4E 80 04 21 */ bctrl -/* 8003FECC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003FED0 41 82 00 28 */ beq lbl_8003FEF8 -/* 8003FED4 3B E0 00 00 */ li r31, 0 -/* 8003FED8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8003FEDC 40 82 00 14 */ bne lbl_8003FEF0 -/* 8003FEE0 7F A3 EB 78 */ mr r3, r29 -/* 8003FEE4 4B FF EE 2D */ bl isVisitedRoom__10dMapInfo_nFi -/* 8003FEE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003FEEC 41 82 00 08 */ beq lbl_8003FEF4 -lbl_8003FEF0: -/* 8003FEF0 3B E0 00 01 */ li r31, 1 -lbl_8003FEF4: -/* 8003FEF4 7F FE FB 78 */ mr r30, r31 -lbl_8003FEF8: -/* 8003FEF8 7F C3 F3 78 */ mr r3, r30 -/* 8003FEFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003FF00 48 32 23 25 */ bl _restgpr_28 -/* 8003FF04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003FF08 7C 08 03 A6 */ mtlr r0 -/* 8003FF0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003FF10 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc.s b/asm/d/map/d_map_path_dmap/setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc.s deleted file mode 100644 index cef54d69e4..0000000000 --- a/asm/d/map/d_map_path_dmap/setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc.s +++ /dev/null @@ -1,158 +0,0 @@ -lbl_8003F810: -/* 8003F810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003F814 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003F818 38 C0 00 00 */ li r6, 0 -/* 8003F81C 80 E3 00 04 */ lwz r7, 4(r3) -/* 8003F820 3C 00 80 00 */ lis r0, 0x8000 -/* 8003F824 7C 07 00 40 */ cmplw r7, r0 -/* 8003F828 41 80 00 E0 */ blt lbl_8003F908 -/* 8003F82C 7C E8 3B 78 */ mr r8, r7 -/* 8003F830 39 20 00 00 */ li r9, 0 -/* 8003F834 48 00 00 44 */ b lbl_8003F878 -lbl_8003F838: -/* 8003F838 88 E8 00 00 */ lbz r7, 0(r8) -/* 8003F83C 7C E6 07 74 */ extsb r6, r7 -/* 8003F840 88 04 00 00 */ lbz r0, 0(r4) -/* 8003F844 7C 00 07 74 */ extsb r0, r0 -/* 8003F848 7C 06 00 00 */ cmpw r6, r0 -/* 8003F84C 40 80 00 08 */ bge lbl_8003F854 -/* 8003F850 98 E4 00 00 */ stb r7, 0(r4) -lbl_8003F854: -/* 8003F854 88 E8 00 00 */ lbz r7, 0(r8) -/* 8003F858 7C E6 07 74 */ extsb r6, r7 -/* 8003F85C 88 05 00 00 */ lbz r0, 0(r5) -/* 8003F860 7C 00 07 74 */ extsb r0, r0 -/* 8003F864 7C 06 00 00 */ cmpw r6, r0 -/* 8003F868 40 81 00 08 */ ble lbl_8003F870 -/* 8003F86C 98 E5 00 00 */ stb r7, 0(r5) -lbl_8003F870: -/* 8003F870 39 08 00 08 */ addi r8, r8, 8 -/* 8003F874 39 29 00 01 */ addi r9, r9, 1 -lbl_8003F878: -/* 8003F878 88 C3 00 00 */ lbz r6, 0(r3) -/* 8003F87C 7C 09 30 00 */ cmpw r9, r6 -/* 8003F880 41 80 FF B8 */ blt lbl_8003F838 -/* 8003F884 80 83 00 04 */ lwz r4, 4(r3) -/* 8003F888 38 06 FF FF */ addi r0, r6, -1 -/* 8003F88C 54 00 18 38 */ slwi r0, r0, 3 -/* 8003F890 7C 84 02 14 */ add r4, r4, r0 -/* 8003F894 80 A4 00 04 */ lwz r5, 4(r4) -/* 8003F898 88 84 00 01 */ lbz r4, 1(r4) -/* 8003F89C 38 04 FF FF */ addi r0, r4, -1 -/* 8003F8A0 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 8003F8A4 7C 85 02 14 */ add r4, r5, r0 -/* 8003F8A8 88 A4 00 04 */ lbz r5, 4(r4) -/* 8003F8AC 28 05 00 00 */ cmplwi r5, 0 -/* 8003F8B0 41 82 00 2C */ beq lbl_8003F8DC -/* 8003F8B4 80 84 00 10 */ lwz r4, 0x10(r4) -/* 8003F8B8 38 05 FF FF */ addi r0, r5, -1 -/* 8003F8BC 54 00 18 38 */ slwi r0, r0, 3 -/* 8003F8C0 7C A4 02 14 */ add r5, r4, r0 -/* 8003F8C4 80 85 00 04 */ lwz r4, 4(r5) -/* 8003F8C8 88 05 00 01 */ lbz r0, 1(r5) -/* 8003F8CC 54 00 08 3C */ slwi r0, r0, 1 -/* 8003F8D0 7C 04 02 14 */ add r0, r4, r0 -/* 8003F8D4 7C 63 00 50 */ subf r3, r3, r0 -/* 8003F8D8 48 00 01 5C */ b lbl_8003FA34 -lbl_8003F8DC: -/* 8003F8DC 80 A4 00 08 */ lwz r5, 8(r4) -/* 8003F8E0 88 84 00 02 */ lbz r4, 2(r4) -/* 8003F8E4 38 04 FF FF */ addi r0, r4, -1 -/* 8003F8E8 54 00 18 38 */ slwi r0, r0, 3 -/* 8003F8EC 7C A5 02 14 */ add r5, r5, r0 -/* 8003F8F0 80 85 00 04 */ lwz r4, 4(r5) -/* 8003F8F4 88 05 00 02 */ lbz r0, 2(r5) -/* 8003F8F8 54 00 08 3C */ slwi r0, r0, 1 -/* 8003F8FC 7C 04 02 14 */ add r0, r4, r0 -/* 8003F900 7C 63 00 50 */ subf r3, r3, r0 -/* 8003F904 48 00 01 30 */ b lbl_8003FA34 -lbl_8003F908: -/* 8003F908 7C 03 3A 14 */ add r0, r3, r7 -/* 8003F90C 90 03 00 04 */ stw r0, 4(r3) -/* 8003F910 80 03 00 08 */ lwz r0, 8(r3) -/* 8003F914 7C 03 02 14 */ add r0, r3, r0 -/* 8003F918 90 03 00 08 */ stw r0, 8(r3) -/* 8003F91C 80 E3 00 04 */ lwz r7, 4(r3) -/* 8003F920 39 00 00 00 */ li r8, 0 -/* 8003F924 7C 60 1B 78 */ mr r0, r3 -/* 8003F928 48 00 00 FC */ b lbl_8003FA24 -lbl_8003F92C: -/* 8003F92C 81 27 00 04 */ lwz r9, 4(r7) -/* 8003F930 7D 20 4A 14 */ add r9, r0, r9 -/* 8003F934 91 27 00 04 */ stw r9, 4(r7) -/* 8003F938 81 47 00 04 */ lwz r10, 4(r7) -/* 8003F93C 39 60 00 00 */ li r11, 0 -/* 8003F940 48 00 00 98 */ b lbl_8003F9D8 -lbl_8003F944: -/* 8003F944 80 CA 00 10 */ lwz r6, 0x10(r10) -/* 8003F948 81 2A 00 08 */ lwz r9, 8(r10) -/* 8003F94C 7D 20 4A 14 */ add r9, r0, r9 -/* 8003F950 91 2A 00 08 */ stw r9, 8(r10) -/* 8003F954 81 8A 00 08 */ lwz r12, 8(r10) -/* 8003F958 3B E0 00 00 */ li r31, 0 -/* 8003F95C 48 00 00 24 */ b lbl_8003F980 -lbl_8003F960: -/* 8003F960 81 2C 00 04 */ lwz r9, 4(r12) -/* 8003F964 88 CC 00 02 */ lbz r6, 2(r12) -/* 8003F968 54 C6 08 3C */ slwi r6, r6, 1 -/* 8003F96C 7C C9 32 14 */ add r6, r9, r6 -/* 8003F970 7D 20 4A 14 */ add r9, r0, r9 -/* 8003F974 91 2C 00 04 */ stw r9, 4(r12) -/* 8003F978 39 8C 00 08 */ addi r12, r12, 8 -/* 8003F97C 3B FF 00 01 */ addi r31, r31, 1 -lbl_8003F980: -/* 8003F980 89 2A 00 02 */ lbz r9, 2(r10) -/* 8003F984 7C 1F 48 00 */ cmpw r31, r9 -/* 8003F988 41 80 FF D8 */ blt lbl_8003F960 -/* 8003F98C 81 2A 00 10 */ lwz r9, 0x10(r10) -/* 8003F990 7D 20 4A 14 */ add r9, r0, r9 -/* 8003F994 91 2A 00 10 */ stw r9, 0x10(r10) -/* 8003F998 81 8A 00 10 */ lwz r12, 0x10(r10) -/* 8003F99C 3B E0 00 00 */ li r31, 0 -/* 8003F9A0 48 00 00 24 */ b lbl_8003F9C4 -lbl_8003F9A4: -/* 8003F9A4 81 2C 00 04 */ lwz r9, 4(r12) -/* 8003F9A8 88 CC 00 01 */ lbz r6, 1(r12) -/* 8003F9AC 54 C6 08 3C */ slwi r6, r6, 1 -/* 8003F9B0 7C C9 32 14 */ add r6, r9, r6 -/* 8003F9B4 7D 20 4A 14 */ add r9, r0, r9 -/* 8003F9B8 91 2C 00 04 */ stw r9, 4(r12) -/* 8003F9BC 39 8C 00 08 */ addi r12, r12, 8 -/* 8003F9C0 3B FF 00 01 */ addi r31, r31, 1 -lbl_8003F9C4: -/* 8003F9C4 89 2A 00 04 */ lbz r9, 4(r10) -/* 8003F9C8 7C 1F 48 00 */ cmpw r31, r9 -/* 8003F9CC 41 80 FF D8 */ blt lbl_8003F9A4 -/* 8003F9D0 39 4A 00 14 */ addi r10, r10, 0x14 -/* 8003F9D4 39 6B 00 01 */ addi r11, r11, 1 -lbl_8003F9D8: -/* 8003F9D8 89 27 00 01 */ lbz r9, 1(r7) -/* 8003F9DC 7C 0B 48 00 */ cmpw r11, r9 -/* 8003F9E0 41 80 FF 64 */ blt lbl_8003F944 -/* 8003F9E4 89 67 00 00 */ lbz r11, 0(r7) -/* 8003F9E8 7D 6A 07 74 */ extsb r10, r11 -/* 8003F9EC 89 24 00 00 */ lbz r9, 0(r4) -/* 8003F9F0 7D 29 07 74 */ extsb r9, r9 -/* 8003F9F4 7C 0A 48 00 */ cmpw r10, r9 -/* 8003F9F8 40 80 00 08 */ bge lbl_8003FA00 -/* 8003F9FC 99 64 00 00 */ stb r11, 0(r4) -lbl_8003FA00: -/* 8003FA00 89 67 00 00 */ lbz r11, 0(r7) -/* 8003FA04 7D 6A 07 74 */ extsb r10, r11 -/* 8003FA08 89 25 00 00 */ lbz r9, 0(r5) -/* 8003FA0C 7D 29 07 74 */ extsb r9, r9 -/* 8003FA10 7C 0A 48 00 */ cmpw r10, r9 -/* 8003FA14 40 81 00 08 */ ble lbl_8003FA1C -/* 8003FA18 99 65 00 00 */ stb r11, 0(r5) -lbl_8003FA1C: -/* 8003FA1C 38 E7 00 08 */ addi r7, r7, 8 -/* 8003FA20 39 08 00 01 */ addi r8, r8, 1 -lbl_8003FA24: -/* 8003FA24 89 23 00 00 */ lbz r9, 0(r3) -/* 8003FA28 7C 08 48 00 */ cmpw r8, r9 -/* 8003FA2C 41 80 FF 00 */ blt lbl_8003F92C -/* 8003FA30 7C C3 33 78 */ mr r3, r6 -lbl_8003FA34: -/* 8003FA34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003FA38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003FA3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/__sinit_d_a_b_oh_cpp.s b/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/__sinit_d_a_b_oh_cpp.s deleted file mode 100644 index bb6ef48814..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/__sinit_d_a_b_oh_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8061D984: -/* 8061D984 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061D988 7C 08 02 A6 */ mflr r0 -/* 8061D98C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061D990 3C 60 80 62 */ lis r3, l_HIO@ha /* 0x8061DBC4@ha */ -/* 8061D994 38 63 DB C4 */ addi r3, r3, l_HIO@l /* 0x8061DBC4@l */ -/* 8061D998 4B FF DD 95 */ bl __ct__12daB_OH_HIO_cFv -/* 8061D99C 3C 80 80 62 */ lis r4, __dt__12daB_OH_HIO_cFv@ha /* 0x8061D93C@ha */ -/* 8061D9A0 38 84 D9 3C */ addi r4, r4, __dt__12daB_OH_HIO_cFv@l /* 0x8061D93C@l */ -/* 8061D9A4 3C A0 80 62 */ lis r5, lit_3645@ha /* 0x8061DBB8@ha */ -/* 8061D9A8 38 A5 DB B8 */ addi r5, r5, lit_3645@l /* 0x8061DBB8@l */ -/* 8061D9AC 4B FF DD 0D */ bl __register_global_object -/* 8061D9B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061D9B4 7C 08 03 A6 */ mtlr r0 -/* 8061D9B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061D9BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Delete__FP10b_oh_class.s b/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Delete__FP10b_oh_class.s deleted file mode 100644 index 26c807a410..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Delete__FP10b_oh_class.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8061D064: -/* 8061D064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061D068 7C 08 02 A6 */ mflr r0 -/* 8061D06C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061D070 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061D074 7C 7F 1B 78 */ mr r31, r3 -/* 8061D078 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 8061D07C 3C 80 80 62 */ lis r4, d_a_b_oh__stringBase0@ha /* 0x8061DA74@ha */ -/* 8061D080 38 84 DA 74 */ addi r4, r4, d_a_b_oh__stringBase0@l /* 0x8061DA74@l */ -/* 8061D084 4B A0 FF 85 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8061D088 88 1F 1F 86 */ lbz r0, 0x1f86(r31) -/* 8061D08C 28 00 00 00 */ cmplwi r0, 0 -/* 8061D090 41 82 00 10 */ beq lbl_8061D0A0 -/* 8061D094 38 00 00 00 */ li r0, 0 -/* 8061D098 3C 60 80 62 */ lis r3, struct_8061DBB4+0x1@ha /* 0x8061DBB5@ha */ -/* 8061D09C 98 03 DB B5 */ stb r0, struct_8061DBB4+0x1@l(r3) /* 0x8061DBB5@l */ -lbl_8061D0A0: -/* 8061D0A0 38 60 00 01 */ li r3, 1 -/* 8061D0A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061D0A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061D0AC 7C 08 03 A6 */ mtlr r0 -/* 8061D0B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061D0B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Draw__FP10b_oh_class.s b/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Draw__FP10b_oh_class.s deleted file mode 100644 index 82b84e4950..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/daB_OH_Draw__FP10b_oh_class.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8061B8B0: -/* 8061B8B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8061B8B4 7C 08 02 A6 */ mflr r0 -/* 8061B8B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8061B8BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8061B8C0 93 C1 00 08 */ stw r30, 8(r1) -/* 8061B8C4 7C 7E 1B 78 */ mr r30, r3 -/* 8061B8C8 A8 03 05 CE */ lha r0, 0x5ce(r3) -/* 8061B8CC 2C 00 00 0B */ cmpwi r0, 0xb -/* 8061B8D0 40 82 00 0C */ bne lbl_8061B8DC -/* 8061B8D4 38 60 00 01 */ li r3, 1 -/* 8061B8D8 48 00 00 70 */ b lbl_8061B948 -lbl_8061B8DC: -/* 8061B8DC 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 8061B8E0 83 E3 00 04 */ lwz r31, 4(r3) -/* 8061B8E4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061B8E8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061B8EC 38 80 00 00 */ li r4, 0 -/* 8061B8F0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8061B8F4 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8061B8F8 4B B8 7E CD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8061B8FC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8061B900 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8061B904 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061B908 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8061B90C 4B B8 94 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8061B910 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061B914 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8061B918 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061B91C 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061B920 4B 9F 1D B9 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8061B924 80 9F 00 04 */ lwz r4, 4(r31) -/* 8061B928 80 7E 05 C4 */ lwz r3, 0x5c4(r30) -/* 8061B92C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8061B930 38 84 00 58 */ addi r4, r4, 0x58 -/* 8061B934 4B 9F 1E 75 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 8061B938 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 8061B93C 38 80 00 00 */ li r4, 0 -/* 8061B940 4B 9F 2E 81 */ bl entryDL__21mDoExt_invisibleModelFP4cXyz -/* 8061B944 38 60 00 01 */ li r3, 1 -lbl_8061B948: -/* 8061B948 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8061B94C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8061B950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8061B954 7C 08 03 A6 */ mtlr r0 -/* 8061B958 38 21 00 10 */ addi r1, r1, 0x10 -/* 8061B95C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/non__FP10b_oh_class.s b/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/non__FP10b_oh_class.s deleted file mode 100644 index d9ccab9d33..0000000000 --- a/asm/rel/d/a/b/d_a_b_oh/d_a_b_oh/non__FP10b_oh_class.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8061C298: -/* 8061C298 38 00 00 06 */ li r0, 6 -/* 8061C29C B0 03 05 F4 */ sth r0, 0x5f4(r3) -/* 8061C2A0 A8 03 05 D0 */ lha r0, 0x5d0(r3) -/* 8061C2A4 2C 00 00 01 */ cmpwi r0, 1 -/* 8061C2A8 4D 82 00 20 */ beqlr -/* 8061C2AC 4C 80 00 20 */ bgelr -/* 8061C2B0 2C 00 00 00 */ cmpwi r0, 0 -/* 8061C2B4 4D 80 00 20 */ bltlr -/* 8061C2B8 38 00 00 01 */ li r0, 1 -/* 8061C2BC B0 03 05 D0 */ sth r0, 0x5d0(r3) -/* 8061C2C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/CreateHeap__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/CreateHeap__7daDsh_cFv.s deleted file mode 100644 index bff4d903c3..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/CreateHeap__7daDsh_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8046751C: -/* 8046751C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467520 7C 08 02 A6 */ mflr r0 -/* 80467524 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467528 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046752C 7C 7F 1B 78 */ mr r31, r3 -/* 80467530 88 03 05 BB */ lbz r0, 0x5bb(r3) -/* 80467534 54 00 10 3A */ slwi r0, r0, 2 -/* 80467538 3C 60 80 46 */ lis r3, l_arcName@ha /* 0x80467F7C@ha */ -/* 8046753C 38 63 7F 7C */ addi r3, r3, l_arcName@l /* 0x80467F7C@l */ -/* 80467540 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80467544 3C 80 80 46 */ lis r4, l_bmd@ha /* 0x80467F04@ha */ -/* 80467548 38 84 7F 04 */ addi r4, r4, l_bmd@l /* 0x80467F04@l */ -/* 8046754C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80467550 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80467554 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80467558 3C A5 00 02 */ addis r5, r5, 2 -/* 8046755C 38 C0 00 80 */ li r6, 0x80 -/* 80467560 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80467564 4B BD 4D 89 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80467568 3C 80 00 08 */ lis r4, 8 -/* 8046756C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80467570 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80467574 4B BA D6 E1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80467578 90 7F 05 B0 */ stw r3, 0x5b0(r31) -/* 8046757C 80 7F 05 B0 */ lwz r3, 0x5b0(r31) -/* 80467580 30 03 FF FF */ addic r0, r3, -1 -/* 80467584 7C 60 19 10 */ subfe r3, r0, r3 -/* 80467588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046758C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467590 7C 08 03 A6 */ mtlr r0 -/* 80467594 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Draw__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Draw__7daDsh_cFv.s deleted file mode 100644 index 2f2c83cc1e..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Draw__7daDsh_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8046759C: -/* 8046759C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804675A0 7C 08 02 A6 */ mflr r0 -/* 804675A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804675A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804675AC 93 C1 00 08 */ stw r30, 8(r1) -/* 804675B0 7C 7E 1B 78 */ mr r30, r3 -/* 804675B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804675B8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804675BC 38 80 00 10 */ li r4, 0x10 -/* 804675C0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804675C4 38 DE 01 0C */ addi r6, r30, 0x10c -/* 804675C8 4B D3 C1 FD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 804675CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804675D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804675D4 80 9E 05 B0 */ lwz r4, 0x5b0(r30) -/* 804675D8 80 84 00 04 */ lwz r4, 4(r4) -/* 804675DC 38 BE 01 0C */ addi r5, r30, 0x10c -/* 804675E0 4B D3 D7 C1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 804675E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804675E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804675EC 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 804675F0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 804675F4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 804675F8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 804675FC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80467600 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80467604 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80467608 4B BA 66 BD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8046760C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80467610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80467614 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80467618 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8046761C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80467620 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80467624 38 60 00 01 */ li r3, 1 -/* 80467628 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046762C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80467630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467634 7C 08 03 A6 */ mtlr r0 -/* 80467638 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046763C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Execute__7daDsh_cFPPA3_A4_f.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Execute__7daDsh_cFPPA3_A4_f.s deleted file mode 100644 index e2a52ed3ef..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/Execute__7daDsh_cFPPA3_A4_f.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80467640: -/* 80467640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467644 7C 08 02 A6 */ mflr r0 -/* 80467648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8046764C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467650 93 C1 00 08 */ stw r30, 8(r1) -/* 80467654 7C 7E 1B 78 */ mr r30, r3 -/* 80467658 7C 9F 23 78 */ mr r31, r4 -/* 8046765C 48 00 01 21 */ bl callExecute__7daDsh_cFv -/* 80467660 7F C3 F3 78 */ mr r3, r30 -/* 80467664 48 00 00 31 */ bl setMtx__7daDsh_cFv -/* 80467668 38 1E 05 6C */ addi r0, r30, 0x56c -/* 8046766C 90 1F 00 00 */ stw r0, 0(r31) -/* 80467670 38 7E 05 B8 */ addi r3, r30, 0x5b8 -/* 80467674 48 00 07 85 */ bl func_80467DF8 -/* 80467678 38 60 00 01 */ li r3, 1 -/* 8046767C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467680 83 C1 00 08 */ lwz r30, 8(r1) -/* 80467684 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467688 7C 08 03 A6 */ mtlr r0 -/* 8046768C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467690 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/__dt__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/__dt__7daDsh_cFv.s deleted file mode 100644 index 1022dc59b3..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/__dt__7daDsh_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80467498: -/* 80467498 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046749C 7C 08 02 A6 */ mflr r0 -/* 804674A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804674A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804674A8 93 C1 00 08 */ stw r30, 8(r1) -/* 804674AC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 804674B0 7C 9F 23 78 */ mr r31, r4 -/* 804674B4 41 82 00 4C */ beq lbl_80467500 -/* 804674B8 3C 60 80 47 */ lis r3, __vt__7daDsh_c@ha /* 0x80468044@ha */ -/* 804674BC 38 03 80 44 */ addi r0, r3, __vt__7daDsh_c@l /* 0x80468044@l */ -/* 804674C0 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 804674C4 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 804674C8 38 80 FF FF */ li r4, -1 -/* 804674CC 4B BC 7E 5D */ bl __dt__19dComIfG_resLoader_cFv -/* 804674D0 28 1E 00 00 */ cmplwi r30, 0 -/* 804674D4 41 82 00 1C */ beq lbl_804674F0 -/* 804674D8 3C 60 80 3B */ lis r3, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 804674DC 38 03 B9 A0 */ addi r0, r3, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 804674E0 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 804674E4 7F C3 F3 78 */ mr r3, r30 -/* 804674E8 38 80 00 00 */ li r4, 0 -/* 804674EC 4B BB 17 A1 */ bl __dt__10fopAc_ac_cFv -lbl_804674F0: -/* 804674F0 7F E0 07 35 */ extsh. r0, r31 -/* 804674F4 40 81 00 0C */ ble lbl_80467500 -/* 804674F8 7F C3 F3 78 */ mr r3, r30 -/* 804674FC 4B E6 78 41 */ bl __dl__FPv -lbl_80467500: -/* 80467500 7F C3 F3 78 */ mr r3, r30 -/* 80467504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467508 83 C1 00 08 */ lwz r30, 8(r1) -/* 8046750C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467510 7C 08 03 A6 */ mtlr r0 -/* 80467514 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467518 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callExecute__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callExecute__7daDsh_cFv.s deleted file mode 100644 index 62037905a1..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callExecute__7daDsh_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8046777C: -/* 8046777C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467780 7C 08 02 A6 */ mflr r0 -/* 80467784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467788 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046778C 7C 7F 1B 78 */ mr r31, r3 -/* 80467790 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80467794 38 63 00 0C */ addi r3, r3, 0xc -/* 80467798 4B EF A8 81 */ bl __ptmf_test -/* 8046779C 2C 03 00 00 */ cmpwi r3, 0 -/* 804677A0 40 82 00 0C */ bne lbl_804677AC -/* 804677A4 38 60 00 01 */ li r3, 1 -/* 804677A8 48 00 00 18 */ b lbl_804677C0 -lbl_804677AC: -/* 804677AC 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 804677B0 39 83 00 0C */ addi r12, r3, 0xc -/* 804677B4 7F E3 FB 78 */ mr r3, r31 -/* 804677B8 4B EF A8 CD */ bl __ptmf_scall -/* 804677BC 60 00 00 00 */ nop -lbl_804677C0: -/* 804677C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804677C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804677C8 7C 08 03 A6 */ mtlr r0 -/* 804677CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804677D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callInit__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callInit__7daDsh_cFv.s deleted file mode 100644 index 382c22c0a5..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/callInit__7daDsh_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8046772C: -/* 8046772C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467730 7C 08 02 A6 */ mflr r0 -/* 80467734 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467738 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8046773C 7C 7F 1B 78 */ mr r31, r3 -/* 80467740 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 80467744 4B EF A8 D5 */ bl __ptmf_test -/* 80467748 2C 03 00 00 */ cmpwi r3, 0 -/* 8046774C 40 82 00 0C */ bne lbl_80467758 -/* 80467750 38 60 00 01 */ li r3, 1 -/* 80467754 48 00 00 14 */ b lbl_80467768 -lbl_80467758: -/* 80467758 81 9F 05 B4 */ lwz r12, 0x5b4(r31) -/* 8046775C 7F E3 FB 78 */ mr r3, r31 -/* 80467760 4B EF A9 25 */ bl __ptmf_scall -/* 80467764 60 00 00 00 */ nop -lbl_80467768: -/* 80467768 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8046776C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467770 7C 08 03 A6 */ mtlr r0 -/* 80467774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467778 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Create__FP10fopAc_ac_c.s deleted file mode 100644 index acef8da315..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_80467C7C: -/* 80467C7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467C80 7C 08 02 A6 */ mflr r0 -/* 80467C84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467C88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467C8C 93 C1 00 08 */ stw r30, 8(r1) -/* 80467C90 7C 7F 1B 78 */ mr r31, r3 -/* 80467C94 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80467C98 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80467C9C 40 82 00 34 */ bne lbl_80467CD0 -/* 80467CA0 7F E0 FB 79 */ or. r0, r31, r31 -/* 80467CA4 41 82 00 20 */ beq lbl_80467CC4 -/* 80467CA8 7C 1E 03 78 */ mr r30, r0 -/* 80467CAC 4B C1 09 79 */ bl __ct__16dBgS_MoveBgActorFv -/* 80467CB0 3C 60 80 47 */ lis r3, __vt__7daDsh_c@ha /* 0x80468044@ha */ -/* 80467CB4 38 03 80 44 */ addi r0, r3, __vt__7daDsh_c@l /* 0x80468044@l */ -/* 80467CB8 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80467CBC 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80467CC0 4B BC 76 55 */ bl __ct__19dComIfG_resLoader_cFv -lbl_80467CC4: -/* 80467CC4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80467CC8 60 00 00 08 */ ori r0, r0, 8 -/* 80467CCC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80467CD0: -/* 80467CD0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80467CD4 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80467CD8 98 1F 05 BB */ stb r0, 0x5bb(r31) -/* 80467CDC 3C 60 80 47 */ lis r3, data_80468174@ha /* 0x80468174@ha */ -/* 80467CE0 38 83 81 74 */ addi r4, r3, data_80468174@l /* 0x80468174@l */ -/* 80467CE4 88 04 00 00 */ lbz r0, 0(r4) -/* 80467CE8 7C 00 07 75 */ extsb. r0, r0 -/* 80467CEC 40 82 00 28 */ bne lbl_80467D14 -/* 80467CF0 88 1F 05 BB */ lbz r0, 0x5bb(r31) -/* 80467CF4 54 00 10 3A */ slwi r0, r0, 2 -/* 80467CF8 3C 60 80 46 */ lis r3, l_arcName@ha /* 0x80467F7C@ha */ -/* 80467CFC 38 63 7F 7C */ addi r3, r3, l_arcName@l /* 0x80467F7C@l */ -/* 80467D00 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80467D04 3C 60 80 46 */ lis r3, data_80467FE8@ha /* 0x80467FE8@ha */ -/* 80467D08 90 03 7F E8 */ stw r0, data_80467FE8@l(r3) /* 0x80467FE8@l */ -/* 80467D0C 38 00 00 01 */ li r0, 1 -/* 80467D10 98 04 00 00 */ stb r0, 0(r4) -lbl_80467D14: -/* 80467D14 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80467D18 3C 80 80 46 */ lis r4, data_80467FE8@ha /* 0x80467FE8@ha */ -/* 80467D1C 38 84 7F E8 */ addi r4, r4, data_80467FE8@l /* 0x80467FE8@l */ -/* 80467D20 38 A0 00 00 */ li r5, 0 -/* 80467D24 4B BC 76 91 */ bl load__19dComIfG_resLoader_cFPPCcP7JKRHeap -/* 80467D28 7C 7E 1B 78 */ mr r30, r3 -/* 80467D2C 2C 1E 00 04 */ cmpwi r30, 4 -/* 80467D30 40 82 00 AC */ bne lbl_80467DDC -/* 80467D34 88 1F 05 BB */ lbz r0, 0x5bb(r31) -/* 80467D38 54 00 10 3A */ slwi r0, r0, 2 -/* 80467D3C 7F E3 FB 78 */ mr r3, r31 -/* 80467D40 3C 80 80 46 */ lis r4, l_arcName@ha /* 0x80467F7C@ha */ -/* 80467D44 38 84 7F 7C */ addi r4, r4, l_arcName@l /* 0x80467F7C@l */ -/* 80467D48 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80467D4C 3C A0 80 46 */ lis r5, l_dzb@ha /* 0x80467F10@ha */ -/* 80467D50 38 A5 7F 10 */ addi r5, r5, l_dzb@l /* 0x80467F10@l */ -/* 80467D54 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80467D58 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80467D5C 38 C6 5A 24 */ addi r6, r6, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80467D60 3C E0 80 46 */ lis r7, l_heap_size@ha /* 0x80467F1C@ha */ -/* 80467D64 38 E7 7F 1C */ addi r7, r7, l_heap_size@l /* 0x80467F1C@l */ -/* 80467D68 7C E7 00 2E */ lwzx r7, r7, r0 -/* 80467D6C 39 00 00 00 */ li r8, 0 -/* 80467D70 4B C1 0A 4D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80467D74 7C 7E 1B 78 */ mr r30, r3 -/* 80467D78 2C 1E 00 05 */ cmpwi r30, 5 -/* 80467D7C 40 82 00 0C */ bne lbl_80467D88 -/* 80467D80 3B C0 00 05 */ li r30, 5 -/* 80467D84 48 00 00 58 */ b lbl_80467DDC -lbl_80467D88: -/* 80467D88 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80467D8C 98 1F 05 BA */ stb r0, 0x5ba(r31) -/* 80467D90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80467D94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80467D98 88 9F 05 BA */ lbz r4, 0x5ba(r31) -/* 80467D9C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80467DA0 7C 05 07 74 */ extsb r5, r0 -/* 80467DA4 4B BC D5 BD */ bl isSwitch__10dSv_info_cCFii -/* 80467DA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80467DAC 7F E3 FB 78 */ mr r3, r31 -/* 80467DB0 3C 80 80 47 */ lis r4, l_openWaitAction@ha /* 0x804680B0@ha */ -/* 80467DB4 38 84 80 B0 */ addi r4, r4, l_openWaitAction@l /* 0x804680B0@l */ -/* 80467DB8 41 82 00 0C */ beq lbl_80467DC4 -/* 80467DBC 3C 80 80 47 */ lis r4, l_closeWaitAction@ha /* 0x804680E0@ha */ -/* 80467DC0 38 84 80 E0 */ addi r4, r4, l_closeWaitAction@l /* 0x804680E0@l */ -lbl_80467DC4: -/* 80467DC4 4B FF F9 45 */ bl setAction__7daDsh_cFPQ27daDsh_c8action_c -/* 80467DC8 7F E3 FB 78 */ mr r3, r31 -/* 80467DCC 4B FF F8 C9 */ bl setMtx__7daDsh_cFv -/* 80467DD0 80 7F 05 24 */ lwz r3, 0x524(r31) -/* 80467DD4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80467DD8 90 1F 05 04 */ stw r0, 0x504(r31) -lbl_80467DDC: -/* 80467DDC 7F C3 F3 78 */ mr r3, r30 -/* 80467DE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467DE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80467DE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467DEC 7C 08 03 A6 */ mtlr r0 -/* 80467DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467DF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Delete__FP7daDsh_c.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Delete__FP7daDsh_c.s deleted file mode 100644 index 1aaf9e1278..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Delete__FP7daDsh_c.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80467C34: -/* 80467C34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467C38 7C 08 02 A6 */ mflr r0 -/* 80467C3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467C40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467C44 93 C1 00 08 */ stw r30, 8(r1) -/* 80467C48 7C 7E 1B 78 */ mr r30, r3 -/* 80467C4C 4B C1 0C 91 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80467C50 7C 7F 1B 78 */ mr r31, r3 -/* 80467C54 7F C3 F3 78 */ mr r3, r30 -/* 80467C58 38 80 FF FF */ li r4, -1 -/* 80467C5C 4B FF F8 3D */ bl __dt__7daDsh_cFv -/* 80467C60 7F E3 FB 78 */ mr r3, r31 -/* 80467C64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467C68 83 C1 00 08 */ lwz r30, 8(r1) -/* 80467C6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467C70 7C 08 03 A6 */ mtlr r0 -/* 80467C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467C78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Draw__FP7daDsh_c.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Draw__FP7daDsh_c.s deleted file mode 100644 index 2cde5df4c3..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Draw__FP7daDsh_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80467BE0: -/* 80467BE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467BE4 7C 08 02 A6 */ mflr r0 -/* 80467BE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467BEC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80467BF0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80467BF4 7D 89 03 A6 */ mtctr r12 -/* 80467BF8 4E 80 04 21 */ bctrl -/* 80467BFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467C00 7C 08 03 A6 */ mtlr r0 -/* 80467C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467C08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Execute__FP7daDsh_c.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Execute__FP7daDsh_c.s deleted file mode 100644 index d395a7b74b..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Execute__FP7daDsh_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80467C0C: -/* 80467C0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467C10 7C 08 02 A6 */ mflr r0 -/* 80467C14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467C18 4B C1 0D 39 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80467C1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467C20 7C 08 03 A6 */ mtlr r0 -/* 80467C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467C28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeCloseWait__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeCloseWait__7daDsh_cFv.s deleted file mode 100644 index 72928b9c51..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeCloseWait__7daDsh_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80467A80: -/* 80467A80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467A84 7C 08 02 A6 */ mflr r0 -/* 80467A88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467A8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467A90 7C 7F 1B 78 */ mr r31, r3 -/* 80467A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80467A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80467A9C 88 9F 05 BA */ lbz r4, 0x5ba(r31) -/* 80467AA0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80467AA4 7C 05 07 74 */ extsb r5, r0 -/* 80467AA8 4B BC D8 B9 */ bl isSwitch__10dSv_info_cCFii -/* 80467AAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80467AB0 40 82 00 14 */ bne lbl_80467AC4 -/* 80467AB4 7F E3 FB 78 */ mr r3, r31 -/* 80467AB8 3C 80 80 47 */ lis r4, l_closeAction@ha /* 0x804680F8@ha */ -/* 80467ABC 38 84 80 F8 */ addi r4, r4, l_closeAction@l /* 0x804680F8@l */ -/* 80467AC0 4B FF FC 49 */ bl setAction__7daDsh_cFPQ27daDsh_c8action_c -lbl_80467AC4: -/* 80467AC4 38 60 00 01 */ li r3, 1 -/* 80467AC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467ACC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467AD0 7C 08 03 A6 */ mtlr r0 -/* 80467AD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467AD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeClose__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeClose__7daDsh_cFv.s deleted file mode 100644 index d53db96cca..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeClose__7daDsh_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80467B04: -/* 80467B04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467B08 7C 08 02 A6 */ mflr r0 -/* 80467B0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467B10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467B14 7C 7F 1B 78 */ mr r31, r3 -/* 80467B18 A8 03 05 B8 */ lha r0, 0x5b8(r3) -/* 80467B1C 2C 00 00 00 */ cmpwi r0, 0 -/* 80467B20 41 82 00 2C */ beq lbl_80467B4C -/* 80467B24 3C 60 80 46 */ lis r3, lit_3802@ha /* 0x80467F38@ha */ -/* 80467B28 C0 23 7F 38 */ lfs f1, lit_3802@l(r3) /* 0x80467F38@l */ -/* 80467B2C 4B DF FE 61 */ bl cM_rndFX__Ff -/* 80467B30 C0 5F 04 AC */ lfs f2, 0x4ac(r31) -/* 80467B34 3C 60 80 45 */ lis r3, OPEN_SIZE__7daDsh_c@ha /* 0x80451D30@ha */ -/* 80467B38 C0 03 1D 30 */ lfs f0, OPEN_SIZE__7daDsh_c@l(r3) /* 0x80451D30@l */ -/* 80467B3C EC 02 00 28 */ fsubs f0, f2, f0 -/* 80467B40 EC 00 08 2A */ fadds f0, f0, f1 -/* 80467B44 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80467B48 48 00 00 80 */ b lbl_80467BC8 -lbl_80467B4C: -/* 80467B4C 38 7F 04 FC */ addi r3, r31, 0x4fc -/* 80467B50 3C 80 80 45 */ lis r4, CLOSE_SPEED__7daDsh_c@ha /* 0x80451D48@ha */ -/* 80467B54 C0 24 1D 48 */ lfs f1, CLOSE_SPEED__7daDsh_c@l(r4) /* 0x80451D48@l */ -/* 80467B58 C0 5F 05 30 */ lfs f2, 0x530(r31) -/* 80467B5C 4B E0 8B E5 */ bl cLib_chaseF__FPfff -/* 80467B60 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80467B64 C0 1F 04 FC */ lfs f0, 0x4fc(r31) -/* 80467B68 EC 01 00 2A */ fadds f0, f1, f0 -/* 80467B6C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80467B70 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80467B74 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80467B78 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80467B7C 40 81 00 4C */ ble lbl_80467BC8 -/* 80467B80 D0 3F 04 D4 */ stfs f1, 0x4d4(r31) -/* 80467B84 C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 80467B88 3C 60 80 45 */ lis r3, CLOSE_BOUND_SPEED__7daDsh_c@ha /* 0x80451D4C@ha */ -/* 80467B8C C0 03 1D 4C */ lfs f0, CLOSE_BOUND_SPEED__7daDsh_c@l(r3) /* 0x80451D4C@l */ -/* 80467B90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80467B94 40 81 00 24 */ ble lbl_80467BB8 -/* 80467B98 3C 60 80 45 */ lis r3, CLOSE_BOUND_RATIO__7daDsh_c@ha /* 0x80451D50@ha */ -/* 80467B9C C0 03 1D 50 */ lfs f0, CLOSE_BOUND_RATIO__7daDsh_c@l(r3) /* 0x80451D50@l */ -/* 80467BA0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80467BA4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80467BA8 3C 60 80 46 */ lis r3, lit_3803@ha /* 0x80467F3C@ha */ -/* 80467BAC C0 03 7F 3C */ lfs f0, lit_3803@l(r3) /* 0x80467F3C@l */ -/* 80467BB0 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80467BB4 48 00 00 14 */ b lbl_80467BC8 -lbl_80467BB8: -/* 80467BB8 7F E3 FB 78 */ mr r3, r31 -/* 80467BBC 3C 80 80 47 */ lis r4, l_openWaitAction@ha /* 0x804680B0@ha */ -/* 80467BC0 38 84 80 B0 */ addi r4, r4, l_openWaitAction@l /* 0x804680B0@l */ -/* 80467BC4 4B FF FB 45 */ bl setAction__7daDsh_cFPQ27daDsh_c8action_c -lbl_80467BC8: -/* 80467BC8 38 60 00 01 */ li r3, 1 -/* 80467BCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467BD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467BD4 7C 08 03 A6 */ mtlr r0 -/* 80467BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467BDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpenWait__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpenWait__7daDsh_cFv.s deleted file mode 100644 index ac395b1056..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpenWait__7daDsh_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_804677E4: -/* 804677E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804677E8 7C 08 02 A6 */ mflr r0 -/* 804677EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804677F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804677F4 7C 7F 1B 78 */ mr r31, r3 -/* 804677F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804677FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80467800 88 9F 05 BA */ lbz r4, 0x5ba(r31) -/* 80467804 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80467808 7C 05 07 74 */ extsb r5, r0 -/* 8046780C 4B BC DB 55 */ bl isSwitch__10dSv_info_cCFii -/* 80467810 2C 03 00 00 */ cmpwi r3, 0 -/* 80467814 41 82 00 14 */ beq lbl_80467828 -/* 80467818 7F E3 FB 78 */ mr r3, r31 -/* 8046781C 3C 80 80 47 */ lis r4, l_openAction@ha /* 0x804680C8@ha */ -/* 80467820 38 84 80 C8 */ addi r4, r4, l_openAction@l /* 0x804680C8@l */ -/* 80467824 4B FF FE E5 */ bl setAction__7daDsh_cFPQ27daDsh_c8action_c -lbl_80467828: -/* 80467828 38 60 00 01 */ li r3, 1 -/* 8046782C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467834 7C 08 03 A6 */ mtlr r0 -/* 80467838 38 21 00 10 */ addi r1, r1, 0x10 -/* 8046783C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpen__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpen__7daDsh_cFv.s deleted file mode 100644 index 313fff78c9..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/executeOpen__7daDsh_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80467988: -/* 80467988 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046798C 7C 08 02 A6 */ mflr r0 -/* 80467990 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467994 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80467998 7C 7F 1B 78 */ mr r31, r3 -/* 8046799C A8 03 05 B8 */ lha r0, 0x5b8(r3) -/* 804679A0 2C 00 00 00 */ cmpwi r0, 0 -/* 804679A4 41 82 00 20 */ beq lbl_804679C4 -/* 804679A8 3C 60 80 46 */ lis r3, lit_3802@ha /* 0x80467F38@ha */ -/* 804679AC C0 23 7F 38 */ lfs f1, lit_3802@l(r3) /* 0x80467F38@l */ -/* 804679B0 4B DF FF DD */ bl cM_rndFX__Ff -/* 804679B4 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 804679B8 EC 00 08 2A */ fadds f0, f0, f1 -/* 804679BC D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 804679C0 48 00 00 8C */ b lbl_80467A4C -lbl_804679C4: -/* 804679C4 38 7F 04 FC */ addi r3, r31, 0x4fc -/* 804679C8 3C 80 80 45 */ lis r4, OPEN_SPEED__7daDsh_c@ha /* 0x80451D38@ha */ -/* 804679CC C0 24 1D 38 */ lfs f1, OPEN_SPEED__7daDsh_c@l(r4) /* 0x80451D38@l */ -/* 804679D0 C0 5F 05 30 */ lfs f2, 0x530(r31) -/* 804679D4 4B E0 8D 6D */ bl cLib_chaseF__FPfff -/* 804679D8 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 804679DC C0 1F 04 FC */ lfs f0, 0x4fc(r31) -/* 804679E0 EC 01 00 2A */ fadds f0, f1, f0 -/* 804679E4 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 804679E8 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 804679EC 3C 60 80 45 */ lis r3, OPEN_SIZE__7daDsh_c@ha /* 0x80451D30@ha */ -/* 804679F0 C0 03 1D 30 */ lfs f0, OPEN_SIZE__7daDsh_c@l(r3) /* 0x80451D30@l */ -/* 804679F4 EC 21 00 28 */ fsubs f1, f1, f0 -/* 804679F8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804679FC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80467A00 40 80 00 4C */ bge lbl_80467A4C -/* 80467A04 D0 3F 04 D4 */ stfs f1, 0x4d4(r31) -/* 80467A08 C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 80467A0C 3C 60 80 45 */ lis r3, OPEN_BOUND_SPEED__7daDsh_c@ha /* 0x80451D3C@ha */ -/* 80467A10 C0 03 1D 3C */ lfs f0, OPEN_BOUND_SPEED__7daDsh_c@l(r3) /* 0x80451D3C@l */ -/* 80467A14 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80467A18 40 80 00 24 */ bge lbl_80467A3C -/* 80467A1C 3C 60 80 45 */ lis r3, OPEN_BOUND_RATIO__7daDsh_c@ha /* 0x80451D40@ha */ -/* 80467A20 C0 03 1D 40 */ lfs f0, OPEN_BOUND_RATIO__7daDsh_c@l(r3) /* 0x80451D40@l */ -/* 80467A24 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80467A28 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80467A2C 3C 60 80 46 */ lis r3, lit_3803@ha /* 0x80467F3C@ha */ -/* 80467A30 C0 03 7F 3C */ lfs f0, lit_3803@l(r3) /* 0x80467F3C@l */ -/* 80467A34 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80467A38 48 00 00 14 */ b lbl_80467A4C -lbl_80467A3C: -/* 80467A3C 7F E3 FB 78 */ mr r3, r31 -/* 80467A40 3C 80 80 47 */ lis r4, l_closeWaitAction@ha /* 0x804680E0@ha */ -/* 80467A44 38 84 80 E0 */ addi r4, r4, l_closeWaitAction@l /* 0x804680E0@l */ -/* 80467A48 4B FF FC C1 */ bl setAction__7daDsh_cFPQ27daDsh_c8action_c -lbl_80467A4C: -/* 80467A4C 38 60 00 01 */ li r3, 1 -/* 80467A50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80467A54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467A58 7C 08 03 A6 */ mtlr r0 -/* 80467A5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467A60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initCloseWait__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initCloseWait__7daDsh_cFv.s deleted file mode 100644 index bf1d6fda75..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initCloseWait__7daDsh_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80467A64: -/* 80467A64 C0 23 04 AC */ lfs f1, 0x4ac(r3) -/* 80467A68 3C 80 80 45 */ lis r4, OPEN_SIZE__7daDsh_c@ha /* 0x80451D30@ha */ -/* 80467A6C C0 04 1D 30 */ lfs f0, OPEN_SIZE__7daDsh_c@l(r4) /* 0x80451D30@l */ -/* 80467A70 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80467A74 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 80467A78 38 60 00 01 */ li r3, 1 -/* 80467A7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initClose__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initClose__7daDsh_cFv.s deleted file mode 100644 index f166effe79..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initClose__7daDsh_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80467ADC: -/* 80467ADC 38 00 00 00 */ li r0, 0 -/* 80467AE0 B0 03 05 B8 */ sth r0, 0x5b8(r3) -/* 80467AE4 3C 80 80 46 */ lis r4, lit_3781@ha /* 0x80467F28@ha */ -/* 80467AE8 C0 04 7F 28 */ lfs f0, lit_3781@l(r4) /* 0x80467F28@l */ -/* 80467AEC D0 03 04 FC */ stfs f0, 0x4fc(r3) -/* 80467AF0 3C 80 80 45 */ lis r4, CLOSE_ACCEL__7daDsh_c@ha /* 0x80451D44@ha */ -/* 80467AF4 C0 04 1D 44 */ lfs f0, CLOSE_ACCEL__7daDsh_c@l(r4) /* 0x80451D44@l */ -/* 80467AF8 D0 03 05 30 */ stfs f0, 0x530(r3) -/* 80467AFC 38 60 00 01 */ li r3, 1 -/* 80467B00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpenWait__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpenWait__7daDsh_cFv.s deleted file mode 100644 index 8c2e1a1784..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpenWait__7daDsh_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_804677D4: -/* 804677D4 C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 804677D8 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 804677DC 38 60 00 01 */ li r3, 1 -/* 804677E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpen__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpen__7daDsh_cFv.s deleted file mode 100644 index ce28097b19..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/initOpen__7daDsh_cFv.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_80467840: -/* 80467840 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80467844 7C 08 02 A6 */ mflr r0 -/* 80467848 90 01 00 34 */ stw r0, 0x34(r1) -/* 8046784C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80467850 4B EF A9 8D */ bl _savegpr_29 -/* 80467854 7C 7E 1B 78 */ mr r30, r3 -/* 80467858 3C 60 80 46 */ lis r3, l_bmd@ha /* 0x80467F04@ha */ -/* 8046785C 3B E3 7F 04 */ addi r31, r3, l_bmd@l /* 0x80467F04@l */ -/* 80467860 38 00 00 00 */ li r0, 0 -/* 80467864 B0 1E 05 B8 */ sth r0, 0x5b8(r30) -/* 80467868 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 8046786C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80467870 3C 60 80 45 */ lis r3, OPEN_ACCEL__7daDsh_c@ha /* 0x80451D34@ha */ -/* 80467874 C0 03 1D 34 */ lfs f0, OPEN_ACCEL__7daDsh_c@l(r3) /* 0x80451D34@l */ -/* 80467878 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 8046787C C0 5E 04 B0 */ lfs f2, 0x4b0(r30) -/* 80467880 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80467884 C0 1E 04 AC */ lfs f0, 0x4ac(r30) -/* 80467888 EC 21 00 2A */ fadds f1, f1, f0 -/* 8046788C C0 1E 04 A8 */ lfs f0, 0x4a8(r30) -/* 80467890 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80467894 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80467898 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8046789C 38 61 00 10 */ addi r3, r1, 0x10 -/* 804678A0 4B BB 64 E5 */ bl waterCheck__11fopAcM_wt_cFPC4cXyz -/* 804678A4 7C 7D 1B 78 */ mr r29, r3 -/* 804678A8 38 61 00 10 */ addi r3, r1, 0x10 -/* 804678AC 4B BB 64 11 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 804678B0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 804678B4 41 82 00 6C */ beq lbl_80467920 -/* 804678B8 3C 60 80 45 */ lis r3, mWaterY__11fopAcM_wt_c@ha /* 0x80450CD8@ha */ -/* 804678BC C0 23 0C D8 */ lfs f1, mWaterY__11fopAcM_wt_c@l(r3) /* 0x80450CD8@l */ -/* 804678C0 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 804678C4 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 804678C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804678CC 40 81 00 54 */ ble lbl_80467920 -/* 804678D0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804678D4 7C 03 07 74 */ extsb r3, r0 -/* 804678D8 4B BC 57 95 */ bl dComIfGp_getReverb__Fi -/* 804678DC 7C 67 1B 78 */ mr r7, r3 -/* 804678E0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080198@ha */ -/* 804678E4 38 03 01 98 */ addi r0, r3, 0x0198 /* 0x00080198@l */ -/* 804678E8 90 01 00 0C */ stw r0, 0xc(r1) -/* 804678EC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804678F0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804678F4 80 63 00 00 */ lwz r3, 0(r3) -/* 804678F8 38 81 00 0C */ addi r4, r1, 0xc -/* 804678FC 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80467900 38 C0 00 00 */ li r6, 0 -/* 80467904 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80467908 FC 40 08 90 */ fmr f2, f1 -/* 8046790C C0 7F 00 30 */ lfs f3, 0x30(r31) -/* 80467910 FC 80 18 90 */ fmr f4, f3 -/* 80467914 39 00 00 00 */ li r8, 0 -/* 80467918 4B E4 40 6D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8046791C 48 00 00 50 */ b lbl_8046796C -lbl_80467920: -/* 80467920 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80467924 7C 03 07 74 */ extsb r3, r0 -/* 80467928 4B BC 57 45 */ bl dComIfGp_getReverb__Fi -/* 8046792C 7C 67 1B 78 */ mr r7, r3 -/* 80467930 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080190@ha */ -/* 80467934 38 03 01 90 */ addi r0, r3, 0x0190 /* 0x00080190@l */ -/* 80467938 90 01 00 08 */ stw r0, 8(r1) -/* 8046793C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80467940 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80467944 80 63 00 00 */ lwz r3, 0(r3) -/* 80467948 38 81 00 08 */ addi r4, r1, 8 -/* 8046794C 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80467950 38 C0 00 00 */ li r6, 0 -/* 80467954 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80467958 FC 40 08 90 */ fmr f2, f1 -/* 8046795C C0 7F 00 30 */ lfs f3, 0x30(r31) -/* 80467960 FC 80 18 90 */ fmr f4, f3 -/* 80467964 39 00 00 00 */ li r8, 0 -/* 80467968 4B E4 40 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8046796C: -/* 8046796C 38 60 00 01 */ li r3, 1 -/* 80467970 39 61 00 30 */ addi r11, r1, 0x30 -/* 80467974 4B EF A8 B5 */ bl _restgpr_29 -/* 80467978 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8046797C 7C 08 03 A6 */ mtlr r0 -/* 80467980 38 21 00 30 */ addi r1, r1, 0x30 -/* 80467984 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setAction__7daDsh_cFPQ27daDsh_c8action_c.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setAction__7daDsh_cFPQ27daDsh_c8action_c.s deleted file mode 100644 index 0b54dbbf7f..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setAction__7daDsh_cFPQ27daDsh_c8action_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80467708: -/* 80467708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8046770C 7C 08 02 A6 */ mflr r0 -/* 80467710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80467714 90 83 05 B4 */ stw r4, 0x5b4(r3) -/* 80467718 48 00 00 15 */ bl callInit__7daDsh_cFv -/* 8046771C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80467720 7C 08 03 A6 */ mtlr r0 -/* 80467724 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467728 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setMtx__7daDsh_cFv.s b/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setMtx__7daDsh_cFv.s deleted file mode 100644 index 4ba670075c..0000000000 --- a/asm/rel/d/a/d_a_dshutter/d_a_dshutter/setMtx__7daDsh_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80467694: -/* 80467694 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80467698 7C 08 02 A6 */ mflr r0 -/* 8046769C 90 01 00 14 */ stw r0, 0x14(r1) -/* 804676A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804676A4 7C 7F 1B 78 */ mr r31, r3 -/* 804676A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804676AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804676B0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 804676B4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 804676B8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 804676BC 4B ED F2 2D */ bl PSMTXTrans -/* 804676C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804676C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804676C8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 804676CC 4B BA 4D 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 804676D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804676D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804676D8 80 9F 05 B0 */ lwz r4, 0x5b0(r31) -/* 804676DC 38 84 00 24 */ addi r4, r4, 0x24 -/* 804676E0 4B ED ED D1 */ bl PSMTXCopy -/* 804676E4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804676E8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804676EC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 804676F0 4B ED ED C1 */ bl PSMTXCopy -/* 804676F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804676F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804676FC 7C 08 03 A6 */ mtlr r0 -/* 80467700 38 21 00 10 */ addi r1, r1, 0x10 -/* 80467704 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/CreateHeap__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/CreateHeap__15daObjLv4Floor_cFv.s deleted file mode 100644 index f7ccf261e9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/CreateHeap__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C678D4: -/* 80C678D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C678D8 7C 08 02 A6 */ mflr r0 -/* 80C678DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C678E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C678E4 7C 7F 1B 78 */ mr r31, r3 -/* 80C678E8 3C 60 80 C6 */ lis r3, l_arcName@ha /* 0x80C67DBC@ha */ -/* 80C678EC 38 63 7D BC */ addi r3, r3, l_arcName@l /* 0x80C67DBC@l */ -/* 80C678F0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C678F4 38 80 00 04 */ li r4, 4 -/* 80C678F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C678FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C67900 3C A5 00 02 */ addis r5, r5, 2 -/* 80C67904 38 C0 00 80 */ li r6, 0x80 -/* 80C67908 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C6790C 4B 3D 49 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C67910 3C 80 00 08 */ lis r4, 8 -/* 80C67914 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C67918 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6791C 4B 3A D3 39 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C67920 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C67924 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C67928 30 03 FF FF */ addic r0, r3, -1 -/* 80C6792C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C67930 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67934 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67938 7C 08 03 A6 */ mtlr r0 -/* 80C6793C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67940 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Create__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Create__15daObjLv4Floor_cFv.s deleted file mode 100644 index 52955a4616..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Create__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80C678B0: -/* 80C678B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C678B4 7C 08 02 A6 */ mflr r0 -/* 80C678B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C678BC 4B FF FF 3D */ bl initBaseMtx__15daObjLv4Floor_cFv -/* 80C678C0 38 60 00 01 */ li r3, 1 -/* 80C678C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C678C8 7C 08 03 A6 */ mtlr r0 -/* 80C678CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C678D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Delete__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Delete__15daObjLv4Floor_cFv.s deleted file mode 100644 index 9d47441205..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Delete__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80C67C78: -/* 80C67C78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67C7C 7C 08 02 A6 */ mflr r0 -/* 80C67C80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67C84 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C67DBC@ha */ -/* 80C67C88 38 84 7D BC */ addi r4, r4, l_arcName@l /* 0x80C67DBC@l */ -/* 80C67C8C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C67C90 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C67C94 4B 3C 53 75 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C67C98 38 60 00 01 */ li r3, 1 -/* 80C67C9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67CA0 7C 08 03 A6 */ mtlr r0 -/* 80C67CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67CA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Draw__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Draw__15daObjLv4Floor_cFv.s deleted file mode 100644 index ab445dd740..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Draw__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C67BD4: -/* 80C67BD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67BD8 7C 08 02 A6 */ mflr r0 -/* 80C67BDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67BE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67BE4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C67BE8 7C 7E 1B 78 */ mr r30, r3 -/* 80C67BEC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C67BF0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C67BF4 38 80 00 10 */ li r4, 0x10 -/* 80C67BF8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C67BFC 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C67C00 4B 53 BB C5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C67C04 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C67C08 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C67C0C 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C67C10 80 84 00 04 */ lwz r4, 4(r4) -/* 80C67C14 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C67C18 4B 53 D1 89 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C67C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C67C20 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C67C24 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C67C28 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C67C2C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C67C30 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C67C34 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C67C38 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C67C3C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C67C40 4B 3A 60 85 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C67C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C67C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C67C4C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C67C50 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C67C54 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C67C58 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C67C5C 38 60 00 01 */ li r3, 1 -/* 80C67C60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67C64 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C67C68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67C6C 7C 08 03 A6 */ mtlr r0 -/* 80C67C70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67C74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Execute__15daObjLv4Floor_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Execute__15daObjLv4Floor_cFPPA3_A4_f.s deleted file mode 100644 index 638df12673..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/Execute__15daObjLv4Floor_cFPPA3_A4_f.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C679E4: -/* 80C679E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C679E8 7C 08 02 A6 */ mflr r0 -/* 80C679EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C679F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C679F4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C679F8 7C 7E 1B 78 */ mr r30, r3 -/* 80C679FC 7C 9F 23 78 */ mr r31, r4 -/* 80C67A00 48 00 00 31 */ bl action__15daObjLv4Floor_cFv -/* 80C67A04 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80C67A08 90 1F 00 00 */ stw r0, 0(r31) -/* 80C67A0C 7F C3 F3 78 */ mr r3, r30 -/* 80C67A10 4B FF FE 25 */ bl setBaseMtx__15daObjLv4Floor_cFv -/* 80C67A14 38 60 00 01 */ li r3, 1 -/* 80C67A18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67A1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C67A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67A24 7C 08 03 A6 */ mtlr r0 -/* 80C67A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67A2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/action__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/action__15daObjLv4Floor_cFv.s deleted file mode 100644 index 074018a462..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/action__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80C67A30: -/* 80C67A30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67A34 7C 08 02 A6 */ mflr r0 -/* 80C67A38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67A3C 3C 80 80 C6 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C67D9C@ha */ -/* 80C67A40 38 E4 7D 9C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C67D9C@l */ -/* 80C67A44 3C 80 80 C6 */ lis r4, data_80C67E80@ha /* 0x80C67E80@ha */ -/* 80C67A48 38 C4 7E 80 */ addi r6, r4, data_80C67E80@l /* 0x80C67E80@l */ -/* 80C67A4C 88 06 00 00 */ lbz r0, 0(r6) -/* 80C67A50 7C 00 07 75 */ extsb. r0, r0 -/* 80C67A54 40 82 00 58 */ bne lbl_80C67AAC -/* 80C67A58 80 87 00 24 */ lwz r4, 0x24(r7) -/* 80C67A5C 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80C67A60 90 87 00 48 */ stw r4, 0x48(r7) -/* 80C67A64 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80C67A68 80 07 00 2C */ lwz r0, 0x2c(r7) -/* 80C67A6C 90 07 00 50 */ stw r0, 0x50(r7) -/* 80C67A70 38 A7 00 48 */ addi r5, r7, 0x48 -/* 80C67A74 80 87 00 30 */ lwz r4, 0x30(r7) -/* 80C67A78 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80C67A7C 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C67A80 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C67A84 80 07 00 38 */ lwz r0, 0x38(r7) -/* 80C67A88 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C67A8C 80 87 00 3C */ lwz r4, 0x3c(r7) -/* 80C67A90 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80C67A94 90 85 00 18 */ stw r4, 0x18(r5) -/* 80C67A98 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80C67A9C 80 07 00 44 */ lwz r0, 0x44(r7) -/* 80C67AA0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80C67AA4 38 00 00 01 */ li r0, 1 -/* 80C67AA8 98 06 00 00 */ stb r0, 0(r6) -lbl_80C67AAC: -/* 80C67AAC 88 03 05 B0 */ lbz r0, 0x5b0(r3) -/* 80C67AB0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C67AB4 39 87 00 48 */ addi r12, r7, 0x48 -/* 80C67AB8 7D 8C 02 14 */ add r12, r12, r0 -/* 80C67ABC 4B 6F A5 C9 */ bl __ptmf_scall -/* 80C67AC0 60 00 00 00 */ nop -/* 80C67AC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67AC8 7C 08 03 A6 */ mtlr r0 -/* 80C67ACC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67AD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/create1st__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/create1st__15daObjLv4Floor_cFv.s deleted file mode 100644 index d250653ae2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/create1st__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80C67944: -/* 80C67944 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67948 7C 08 02 A6 */ mflr r0 -/* 80C6794C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67950 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67954 7C 7F 1B 78 */ mr r31, r3 -/* 80C67958 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C6795C 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C67DBC@ha */ -/* 80C67960 38 84 7D BC */ addi r4, r4, l_arcName@l /* 0x80C67DBC@l */ -/* 80C67964 80 84 00 00 */ lwz r4, 0(r4) -/* 80C67968 4B 3C 55 55 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6796C 2C 03 00 04 */ cmpwi r3, 4 -/* 80C67970 41 82 00 08 */ beq lbl_80C67978 -/* 80C67974 48 00 00 5C */ b lbl_80C679D0 -lbl_80C67978: -/* 80C67978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6797C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C67980 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C67984 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C67988 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6798C 7C 05 07 74 */ extsb r5, r0 -/* 80C67990 4B 3C D9 D1 */ bl isSwitch__10dSv_info_cCFii -/* 80C67994 2C 03 00 00 */ cmpwi r3, 0 -/* 80C67998 41 82 00 0C */ beq lbl_80C679A4 -/* 80C6799C 38 60 00 05 */ li r3, 5 -/* 80C679A0 48 00 00 30 */ b lbl_80C679D0 -lbl_80C679A4: -/* 80C679A4 7F E3 FB 78 */ mr r3, r31 -/* 80C679A8 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C67DBC@ha */ -/* 80C679AC 38 84 7D BC */ addi r4, r4, l_arcName@l /* 0x80C67DBC@l */ -/* 80C679B0 80 84 00 00 */ lwz r4, 0(r4) -/* 80C679B4 38 A0 00 07 */ li r5, 7 -/* 80C679B8 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C679BC 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C679C0 38 E0 40 00 */ li r7, 0x4000 -/* 80C679C4 39 00 00 00 */ li r8, 0 -/* 80C679C8 4B 41 0D F5 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C679CC 2C 03 00 05 */ cmpwi r3, 5 -lbl_80C679D0: -/* 80C679D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C679D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C679D8 7C 08 03 A6 */ mtlr r0 -/* 80C679DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C679E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDelete__FP15daObjLv4Floor_c.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDelete__FP15daObjLv4Floor_c.s deleted file mode 100644 index d86683db66..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDelete__FP15daObjLv4Floor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C67D0C: -/* 80C67D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67D10 7C 08 02 A6 */ mflr r0 -/* 80C67D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67D18 4B 41 0B C5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C67D1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67D20 7C 08 03 A6 */ mtlr r0 -/* 80C67D24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67D28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDraw__FP15daObjLv4Floor_c.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDraw__FP15daObjLv4Floor_c.s deleted file mode 100644 index 88b5af336b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGDraw__FP15daObjLv4Floor_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C67D4C: -/* 80C67D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67D50 7C 08 02 A6 */ mflr r0 -/* 80C67D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67D58 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C67D5C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C67D60 7D 89 03 A6 */ mtctr r12 -/* 80C67D64 4E 80 04 21 */ bctrl -/* 80C67D68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67D6C 7C 08 03 A6 */ mtlr r0 -/* 80C67D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67D74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGExecute__FP15daObjLv4Floor_c.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGExecute__FP15daObjLv4Floor_c.s deleted file mode 100644 index c6d47572d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_MoveBGExecute__FP15daObjLv4Floor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C67D2C: -/* 80C67D2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67D30 7C 08 02 A6 */ mflr r0 -/* 80C67D34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67D38 4B 41 0C 19 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C67D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67D40 7C 08 03 A6 */ mtlr r0 -/* 80C67D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67D48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_create1st__FP15daObjLv4Floor_c.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_create1st__FP15daObjLv4Floor_c.s deleted file mode 100644 index f62a171a33..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/daObjLv4Floor_create1st__FP15daObjLv4Floor_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C67CAC: -/* 80C67CAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67CB0 7C 08 02 A6 */ mflr r0 -/* 80C67CB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67CB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67CBC 7C 7F 1B 78 */ mr r31, r3 -/* 80C67CC0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C67CC4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C67CC8 40 82 00 28 */ bne lbl_80C67CF0 -/* 80C67CCC 28 1F 00 00 */ cmplwi r31, 0 -/* 80C67CD0 41 82 00 14 */ beq lbl_80C67CE4 -/* 80C67CD4 4B 41 09 51 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C67CD8 3C 60 80 C6 */ lis r3, __vt__15daObjLv4Floor_c@ha /* 0x80C67E58@ha */ -/* 80C67CDC 38 03 7E 58 */ addi r0, r3, __vt__15daObjLv4Floor_c@l /* 0x80C67E58@l */ -/* 80C67CE0 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C67CE4: -/* 80C67CE4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C67CE8 60 00 00 08 */ ori r0, r0, 8 -/* 80C67CEC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C67CF0: -/* 80C67CF0 7F E3 FB 78 */ mr r3, r31 -/* 80C67CF4 4B FF FC 51 */ bl create1st__15daObjLv4Floor_cFv -/* 80C67CF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67D00 7C 08 03 A6 */ mtlr r0 -/* 80C67D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67D08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/initBaseMtx__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/initBaseMtx__15daObjLv4Floor_cFv.s deleted file mode 100644 index db16e7c046..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/initBaseMtx__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C677F8: -/* 80C677F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C677FC 7C 08 02 A6 */ mflr r0 -/* 80C67800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67804 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80C67808 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80C6780C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80C67810 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80C67814 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80C67818 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80C6781C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80C67820 48 00 00 15 */ bl setBaseMtx__15daObjLv4Floor_cFv -/* 80C67824 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67828 7C 08 03 A6 */ mtlr r0 -/* 80C6782C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67830 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_dead__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_dead__15daObjLv4Floor_cFv.s deleted file mode 100644 index a7cadd3f0c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_dead__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C67BB4: -/* 80C67BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67BB8 7C 08 02 A6 */ mflr r0 -/* 80C67BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67BC0 4B 3B 20 BD */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C67BC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67BC8 7C 08 03 A6 */ mtlr r0 -/* 80C67BCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67BD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_dead__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_dead__15daObjLv4Floor_cFv.s deleted file mode 100644 index 920a23b457..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_dead__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80C67BA8: -/* 80C67BA8 38 00 00 02 */ li r0, 2 -/* 80C67BAC 98 03 05 B0 */ stb r0, 0x5b0(r3) -/* 80C67BB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_move__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_move__15daObjLv4Floor_cFv.s deleted file mode 100644 index f27c3c86fb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_init_move__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80C67B28: -/* 80C67B28 3C 80 80 C6 */ lis r4, lit_3704@ha /* 0x80C67D80@ha */ -/* 80C67B2C C0 04 7D 80 */ lfs f0, lit_3704@l(r4) /* 0x80C67D80@l */ -/* 80C67B30 D0 03 04 FC */ stfs f0, 0x4fc(r3) -/* 80C67B34 38 00 00 01 */ li r0, 1 -/* 80C67B38 98 03 05 B0 */ stb r0, 0x5b0(r3) -/* 80C67B3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_move__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_move__15daObjLv4Floor_cFv.s deleted file mode 100644 index df5b68bbe3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_move__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C67B40: -/* 80C67B40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67B44 7C 08 02 A6 */ mflr r0 -/* 80C67B48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67B4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67B50 93 C1 00 08 */ stw r30, 8(r1) -/* 80C67B54 7C 7E 1B 78 */ mr r30, r3 -/* 80C67B58 3C 60 80 C6 */ lis r3, lit_3704@ha /* 0x80C67D80@ha */ -/* 80C67B5C 3B E3 7D 80 */ addi r31, r3, lit_3704@l /* 0x80C67D80@l */ -/* 80C67B60 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 80C67B64 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C67B68 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80C67B6C 4B 60 8B D5 */ bl cLib_chaseF__FPfff -/* 80C67B70 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80C67B74 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80C67B78 C0 5E 04 FC */ lfs f2, 0x4fc(r30) -/* 80C67B7C 4B 60 8B C5 */ bl cLib_chaseF__FPfff -/* 80C67B80 2C 03 00 00 */ cmpwi r3, 0 -/* 80C67B84 41 82 00 0C */ beq lbl_80C67B90 -/* 80C67B88 7F C3 F3 78 */ mr r3, r30 -/* 80C67B8C 48 00 00 1D */ bl mode_init_dead__15daObjLv4Floor_cFv -lbl_80C67B90: -/* 80C67B90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67B94 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C67B98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67B9C 7C 08 03 A6 */ mtlr r0 -/* 80C67BA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67BA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_wait__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_wait__15daObjLv4Floor_cFv.s deleted file mode 100644 index 209f2f93af..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/mode_wait__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80C67AD4: -/* 80C67AD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67AD8 7C 08 02 A6 */ mflr r0 -/* 80C67ADC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67AE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67AE4 7C 7F 1B 78 */ mr r31, r3 -/* 80C67AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C67AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C67AF0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C67AF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C67AF8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C67AFC 7C 05 07 74 */ extsb r5, r0 -/* 80C67B00 4B 3C D8 61 */ bl isSwitch__10dSv_info_cCFii -/* 80C67B04 2C 03 00 00 */ cmpwi r3, 0 -/* 80C67B08 41 82 00 0C */ beq lbl_80C67B14 -/* 80C67B0C 7F E3 FB 78 */ mr r3, r31 -/* 80C67B10 48 00 00 19 */ bl mode_init_move__15daObjLv4Floor_cFv -lbl_80C67B14: -/* 80C67B14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C67B18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C67B1C 7C 08 03 A6 */ mtlr r0 -/* 80C67B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C67B24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/setBaseMtx__15daObjLv4Floor_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/setBaseMtx__15daObjLv4Floor_cFv.s deleted file mode 100644 index 4573c1e070..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor/setBaseMtx__15daObjLv4Floor_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80C67834: -/* 80C67834 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C67838 7C 08 02 A6 */ mflr r0 -/* 80C6783C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C67840 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C67844 7C 7F 1B 78 */ mr r31, r3 -/* 80C67848 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6784C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C67850 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C67854 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C67858 C0 1F 05 AC */ lfs f0, 0x5ac(r31) -/* 80C6785C EC 42 00 2A */ fadds f2, f2, f0 -/* 80C67860 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C67864 4B 6D F0 85 */ bl PSMTXTrans -/* 80C67868 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6786C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C67870 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C67874 4B 3A 4B C1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C67878 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6787C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C67880 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C67884 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C67888 4B 6D EC 29 */ bl PSMTXCopy -/* 80C6788C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C67890 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C67894 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80C67898 4B 6D EC 19 */ bl PSMTXCopy -/* 80C6789C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C678A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C678A4 7C 08 03 A6 */ mtlr r0 -/* 80C678A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C678AC 4E 80 00 20 */ blr diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 6b0ed898c0..743a861477 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -14,7 +14,7 @@ public: /* 8003F760 */ static int getTopBottomFloorNo(s8*, s8*); /* 8003F7E8 */ static void createWork(); /* 8003FA40 */ static void setPointer(s8, void*, int); - /* 8003F810 */ static void setPointer(dDrawPath_c::room_class*, s8*, s8*); + /* 8003F810 */ static int setPointer(dDrawPath_c::room_class*, s8*, s8*); /* 8003FB70 */ static void create(); /* 8003FBD0 */ static void reset(); /* 8003FC70 */ static void remove(); diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 05cb74ad5d..8e81f30ffa 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -21,6 +21,12 @@ struct actor_process_profile_definition { /* 0x2D */ u8 mCullType; }; +// Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT) +struct actor_process_profile_definition2 { + /* 0x00 */ actor_process_profile_definition def; + /* 0x30 */ u32 field_0x30; +}; + enum { ACTOR_TYPE_ENEMY = 2, }; diff --git a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp index fced1cab78..ec7a411aaa 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -13,12 +13,6 @@ // Forward References: // -extern "C" void __dt__7daDsh_cFv(); -extern "C" void CreateHeap__7daDsh_cFv(); -extern "C" void Draw__7daDsh_cFv(); -extern "C" void Execute__7daDsh_cFPPA3_A4_f(); -extern "C" void setMtx__7daDsh_cFv(); -extern "C" void setAction__7daDsh_cFPQ27daDsh_c8action_c(); extern "C" void callInit__7daDsh_cFv(); extern "C" void callExecute__7daDsh_cFv(); extern "C" void initOpenWait__7daDsh_cFv(); @@ -29,82 +23,17 @@ extern "C" void initCloseWait__7daDsh_cFv(); extern "C" void executeCloseWait__7daDsh_cFv(); extern "C" void initClose__7daDsh_cFv(); extern "C" void executeClose__7daDsh_cFv(); -extern "C" static void daDsh_Draw__FP7daDsh_c(); -extern "C" static void daDsh_Execute__FP7daDsh_c(); -extern "C" static bool daDsh_IsDelete__FP7daDsh_c(); -extern "C" static void daDsh_Delete__FP7daDsh_c(); -extern "C" static void daDsh_Create__FP10fopAc_ac_c(); extern "C" s16 func_80467DF8(s16*); -extern "C" void __sinit_d_a_dshutter_cpp(); -extern "C" extern char const* const d_a_dshutter__stringBase0; // // External References: // -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void waterCheck__11fopAcM_wt_cFPC4cXyz(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void __ct__19dComIfG_resLoader_cFv(); -extern "C" void __dt__19dComIfG_resLoader_cFv(); -extern "C" void load__19dComIfG_resLoader_cFPPCcP7JKRHeap(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool Delete__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cM_rndFX__Ff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" u32 OPEN_SIZE__7daDsh_c; -extern "C" f32 OPEN_ACCEL__7daDsh_c; -extern "C" f32 OPEN_SPEED__7daDsh_c; -extern "C" f32 OPEN_BOUND_SPEED__7daDsh_c; -extern "C" f32 OPEN_BOUND_RATIO__7daDsh_c; -extern "C" f32 CLOSE_ACCEL__7daDsh_c; -extern "C" f32 CLOSE_SPEED__7daDsh_c; -extern "C" f32 CLOSE_BOUND_SPEED__7daDsh_c; -extern "C" f32 CLOSE_BOUND_RATIO__7daDsh_c; - -SECTION_DATA extern void* __vt__7daDsh_c[10]; - // // Declarations: // /* ############################################################################################## */ -/* 80467F40-80467F40 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80467F40 = "K_tetd"; -SECTION_DEAD static char const* const stringBase_80467F47 = "S_bsaku00"; -SECTION_DEAD static char const* const stringBase_80467F51 = "S_lv7saku"; -SECTION_DEAD static char const* const stringBase_80467F5B = ""; -#pragma pop /* 80467F5C-80467F68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -707,14 +636,7 @@ static u8 data_80468170[4]; /* 80468174-80468178 000104 0004+00 1/1 0/0 0/0 .bss None */ static s8 data_80468174[4]; -/* 80467FE8-80467FF0 -00001 0008+00 1/1 0/0 0/0 .data l_resName$localstatic3$create__7daDsh_cFv */ -SECTION_DATA static void* data_80467FE8[2] = { - (void*)NULL, - (void*)(((char*)&d_a_dshutter__stringBase0) + 0x1B), -}; - /* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text daDsh_Create__FP10fopAc_ac_c */ -#ifdef NONMATCHING int daDsh_c::create() { if (!fopAcM_CheckCondition(this, 8)) { new (this) daDsh_c(); @@ -734,9 +656,9 @@ int daDsh_c::create() { } else { mSw = getSw(); - setAction(i_fopAcM_isSwitch(this, mSw) ? &l_openWaitAction : &l_closeWaitAction); + setAction(dComIfGs_isSwitch(mSw, fopAcM_GetHomeRoomNo(this)) ? &l_closeWaitAction : &l_openWaitAction); setMtx(); - fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_SetMtx(this, model->getBaseTRMtx()); } } @@ -746,16 +668,6 @@ int daDsh_c::create() { static int daDsh_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daDsh_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_dshutter/d_a_dshutter/daDsh_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif /* 80467DF8-80467E14 0009D8 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPs */ #pragma push @@ -789,12 +701,23 @@ static actor_method_class l_daDsh_Method = { }; /* 80468010-80468044 -00001 0034+00 0/0 0/0 1/0 .data g_profile_DSHUTTER */ -SECTION_DATA extern void* g_profile_DSHUTTER[13] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x022C0000, (void*)&g_fpcLf_Method, - (void*)0x000005BC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01280000, (void*)&l_daDsh_Method, - (void*)0x00044000, (void*)NULL, - (void*)NULL, +extern actor_process_profile_definition2 g_profile_DSHUTTER = { + { + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_DSHUTTER, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daDsh_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0128, // mPriority + &l_daDsh_Method, // mSubMtd + 0x00044000, // mStatus + 0, // mActorType + 0, // mCullType + }, + 0, }; + diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 7c6c0ec169..49e9d09fe0 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -597,74 +597,72 @@ asm void dMpath_c::createWork() { /* 8003F810-8003FA40 03A150 0230+00 1/1 1/1 0/0 .text * setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc */ -// close -#ifdef NONMATCHING int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param_2) { int var_r6 = 0; if ((u32)i_room->mpFloor >= 0x80000000) { dDrawPath_c::floor_class* floor_p = i_room->mpFloor; - for (int i = 0; i < i_room->field_0x0; i++) { - if (floor_p->field_0x0 < *param_1) { - *param_1 = floor_p->field_0x0; + for (int i = 0; i < i_room->mFloorNum; i++) { + if (floor_p->mFloorNo < *param_1) { + *param_1 = floor_p->mFloorNo; } - if (floor_p->field_0x0 > *param_2) { - *param_2 = floor_p->field_0x0; + if (floor_p->mFloorNo > *param_2) { + *param_2 = floor_p->mFloorNo; } floor_p++; } - dDrawPath_c::floor_class* floor_e = &i_room->mpFloor[i_room->field_0x0 - 1]; - dDrawPath_c::group_class* group_e = &floor_e->mpGroup[floor_e->field_0x1 - 1]; + dDrawPath_c::floor_class* floor_e = &i_room->mpFloor[i_room->mFloorNum - 1]; + dDrawPath_c::group_class* group_e = &floor_e->mpGroup[floor_e->mGroupNum - 1]; - if (group_e->field_0x4 != 0) { - dDrawPath_c::poly_class* poly_e = &group_e->mpPoly[group_e->field_0x4 - 1]; - return (u32)(poly_e->field_0x4 + poly_e->field_0x1) - (u32)i_room; + if (group_e->mPolyNum != 0) { + dDrawPath_c::poly_class* poly_e = &group_e->mpPoly[group_e->mPolyNum - 1]; + return (u32)(poly_e->mpData + poly_e->mDataNum) - (u32)i_room; } - dDrawPath_c::line_class* line_e = &group_e->mpLine[group_e->field_0x2 - 1]; - return (u32)(line_e->unk4 + line_e->unk2) - (u32)i_room; + dDrawPath_c::line_class* line_e = &group_e->mpLine[group_e->mLineNum - 1]; + return (u32)(line_e->mpData + line_e->mDataNum) - (u32)i_room; } i_room->mpFloor = (dDrawPath_c::floor_class*)((u32)i_room + (u32)i_room->mpFloor); - i_room->field_0x8 = (f32*)((u32)i_room + (u32)i_room->field_0x8); + i_room->mpFloatData = (f32*)((u32)i_room + (u32)i_room->mpFloatData); dDrawPath_c::floor_class* floor_p = i_room->mpFloor; - for (int i = 0; i < i_room->field_0x0; i++) { - int room = (int)i_room; + int room = (int)i_room; + for (int i = 0; i < i_room->mFloorNum; i++) { floor_p->mpGroup = (dDrawPath_c::group_class*)(room + (u32)floor_p->mpGroup); dDrawPath_c::group_class* group_p = floor_p->mpGroup; - for (int j = 0; j < floor_p->field_0x1; j++) { + for (int j = 0; j < floor_p->mGroupNum; j++) { var_r6 = (u32)group_p->mpPoly; group_p->mpLine = (dDrawPath_c::line_class*)(room + (u32)group_p->mpLine); dDrawPath_c::line_class* line_p = group_p->mpLine; - for (int k = 0; k < group_p->field_0x2; k++) { - var_r6 = (u32)(line_p->unk4 + line_p->unk2); - line_p->unk4 += room; + for (int k = 0; k < group_p->mLineNum; k++) { + var_r6 = (u32)(line_p->mpData + line_p->mDataNum); + line_p->mpData = (u16*)(room + (u32)line_p->mpData); line_p++; } group_p->mpPoly = (dDrawPath_c::poly_class*)(room + (u32)group_p->mpPoly); dDrawPath_c::poly_class* poly_p = group_p->mpPoly; - for (int l = 0; l < group_p->field_0x4; l++) { - var_r6 = (u32)(poly_p->field_0x4 + poly_p->field_0x1); - poly_p->field_0x4 += room; + for (int l = 0; l < group_p->mPolyNum; l++) { + var_r6 = (u32)(poly_p->mpData + poly_p->mDataNum); + poly_p->mpData = (u16*)(room + (u32)poly_p->mpData); poly_p++; } group_p++; } - if (floor_p->field_0x0 < *param_1) { - *param_1 = floor_p->field_0x0; + if (floor_p->mFloorNo < *param_1) { + *param_1 = floor_p->mFloorNo; } - if (floor_p->field_0x0 > *param_2) { - *param_2 = floor_p->field_0x0; + if (floor_p->mFloorNo > *param_2) { + *param_2 = floor_p->mFloorNo; } floor_p++; @@ -672,16 +670,6 @@ int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param return var_r6; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_c::setPointer(dDrawPath_c::room_class* param_0, s8* param_1, s8* param_2) { - nofralloc -#include "asm/d/map/d_map_path_dmap/setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc.s" -} -#pragma pop -#endif struct map_path_class { int field_0x0; @@ -842,36 +830,13 @@ void renderingDAmap_c::setSingleRoomSetting() {} /* 8003FE70-8003FF14 03A7B0 00A4+00 3/0 3/1 0/0 .text isDrawRoom__16renderingDAmap_cCFii */ -// regalloc. probably supposed to be a one liner or some kind of ternary -#ifdef NONMATCHING bool renderingDAmap_c::isDrawRoom(int param_0, int param_1) const { - bool var_r31; - bool var_r30 = false; - if (hasMap() || param_0 == param_1) { - var_r30 = true; - } - + bool rv = hasMap() || param_0 == param_1; if (isRendAllRoom()) { - var_r31 = false; - if (var_r30 || dMapInfo_n::isVisitedRoom(param_1)) { - var_r31 = true; - } - - var_r30 = var_r31; + rv = rv || dMapInfo_n::isVisitedRoom(param_0); } - - return var_r30; + return rv; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool renderingDAmap_c::isDrawRoom(int param_0, int param_1) const { - nofralloc -#include "asm/d/map/d_map_path_dmap/isDrawRoom__16renderingDAmap_cCFii.s" -} -#pragma pop -#endif /* 8003FF14-8003FFC4 03A854 00B0+00 3/0 3/0 0/0 .text preDrawPath__16renderingDAmap_cFv */ @@ -928,8 +893,6 @@ int renderingDAmap_c::getFirstDrawRoomNo() { } /* 80040094-80040134 03A9D4 00A0+00 2/2 0/0 0/0 .text getNextDrawRoomNo__16renderingDAmap_cFi */ -// weird loop -#ifdef NONMATCHING int renderingDAmap_c::getNextDrawRoomNo(int param_0) { int i = param_0 + 1; @@ -937,11 +900,13 @@ int renderingDAmap_c::getNextDrawRoomNo(int param_0) { if (i >= 64) { i = -1; } else { - for (; i < 64; ++i) { - if (isDrawRoom(i, mRoomNoSingle)) { - return i; + while (!isDrawRoom(i, mRoomNoSingle)) { + i++; + if (i >= 64) { + i = -1; + break; } - } + } } } else { i = -1; @@ -949,16 +914,6 @@ int renderingDAmap_c::getNextDrawRoomNo(int param_0) { return i; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int renderingDAmap_c::getNextDrawRoomNo(int param_0) { - nofralloc -#include "asm/d/map/d_map_path_dmap/getNextDrawRoomNo__16renderingDAmap_cFi.s" -} -#pragma pop -#endif /* 80040134-800401E8 03AA74 00B4+00 3/0 3/0 0/0 .text getFirstRoomPointer__16renderingDAmap_cFv */ dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() {