d_a_tag_sppath OK (#2151)

This commit is contained in:
doop
2024-05-08 15:14:04 -07:00
committed by GitHub
parent 6713925172
commit 1cc0621462
16 changed files with 213 additions and 1464 deletions
+4 -4
View File
@@ -21,8 +21,8 @@ Total | 54.640219% | 2196904 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 54.640219% | 2196904 | 4020672
RELs | 38.593660% | 4438396 | 11500324
Total | 42.750478% | 6635300 | 15520996
RELs | 38.629138% | 4442476 | 11500324
Total | 42.776765% | 6639380 | 15520996
## RELs
@@ -763,7 +763,7 @@ d_a_tag_shop_camera | 100.000000% | 1196 | 1196
d_a_tag_shop_item | 100.000000% | 2756 | 2756
d_a_tag_smk_emt | 100.000000% | 1572 | 1572
d_a_tag_spinner | 100.000000% | 1928 | 1928
d_a_tag_sppath | 33.333333% | 2040 | 6120
d_a_tag_sppath | 100.000000% | 6120 | 6120
d_a_tag_spring | 100.000000% | 1896 | 1896
d_a_tag_ss_drink | 100.000000% | 3936 | 3936
d_a_tag_statue_evt | 100.000000% | 7328 | 7328
@@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244
d_a_warp_bug | 100.000000% | 2024 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 38.593660% | 4438396 | 11500324
Total | 38.629138% | 4442476 | 11500324
@@ -1,20 +0,0 @@
lbl_80D62BC8:
/* 80D62BC8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D62BCC 7C 08 02 A6 */ mflr r0
/* 80D62BD0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D62BD4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D62BD8 7C 7F 1B 79 */ or. r31, r3, r3
/* 80D62BDC 41 82 00 1C */ beq lbl_80D62BF8
/* 80D62BE0 3C A0 80 D6 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80D62CF4@ha */
/* 80D62BE4 38 05 2C F4 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80D62CF4@l */
/* 80D62BE8 90 1F 00 00 */ stw r0, 0(r31)
/* 80D62BEC 7C 80 07 35 */ extsh. r0, r4
/* 80D62BF0 40 81 00 08 */ ble lbl_80D62BF8
/* 80D62BF4 4B 56 C1 49 */ bl __dl__FPv
lbl_80D62BF8:
/* 80D62BF8 7F E3 FB 78 */ mr r3, r31
/* 80D62BFC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D62C00 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D62C04 7C 08 03 A6 */ mtlr r0
/* 80D62C08 38 21 00 10 */ addi r1, r1, 0x10
/* 80D62C0C 4E 80 00 20 */ blr
@@ -1,26 +0,0 @@
lbl_80D61DB8:
/* 80D61DB8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61DBC 7C 08 02 A6 */ mflr r0
/* 80D61DC0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61DC4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61DC8 7C 7F 1B 79 */ or. r31, r3, r3
/* 80D61DCC 41 82 00 30 */ beq lbl_80D61DFC
/* 80D61DD0 3C 60 80 D6 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80D62D00@ha */
/* 80D61DD4 38 03 2D 00 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80D62D00@l */
/* 80D61DD8 90 1F 00 00 */ stw r0, 0(r31)
/* 80D61DDC 41 82 00 10 */ beq lbl_80D61DEC
/* 80D61DE0 3C 60 80 D6 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80D62CF4@ha */
/* 80D61DE4 38 03 2C F4 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80D62CF4@l */
/* 80D61DE8 90 1F 00 00 */ stw r0, 0(r31)
lbl_80D61DEC:
/* 80D61DEC 7C 80 07 35 */ extsh. r0, r4
/* 80D61DF0 40 81 00 0C */ ble lbl_80D61DFC
/* 80D61DF4 7F E3 FB 78 */ mr r3, r31
/* 80D61DF8 4B 56 CF 45 */ bl __dl__FPv
lbl_80D61DFC:
/* 80D61DFC 7F E3 FB 78 */ mr r3, r31
/* 80D61E00 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61E04 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61E08 7C 08 03 A6 */ mtlr r0
/* 80D61E0C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61E10 4E 80 00 20 */ blr
@@ -1,85 +0,0 @@
lbl_80D61EC4:
/* 80D61EC4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61EC8 7C 08 02 A6 */ mflr r0
/* 80D61ECC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61ED0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61ED4 93 C1 00 08 */ stw r30, 8(r1)
/* 80D61ED8 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D61EDC 7C 9F 23 78 */ mr r31, r4
/* 80D61EE0 41 82 01 00 */ beq lbl_80D61FE0
/* 80D61EE4 34 1E 06 AC */ addic. r0, r30, 0x6ac
/* 80D61EE8 41 82 00 54 */ beq lbl_80D61F3C
/* 80D61EEC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80D61EF0 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80D61EF4 90 7E 06 C4 */ stw r3, 0x6c4(r30)
/* 80D61EF8 38 03 00 20 */ addi r0, r3, 0x20
/* 80D61EFC 90 1E 06 C8 */ stw r0, 0x6c8(r30)
/* 80D61F00 34 1E 06 C8 */ addic. r0, r30, 0x6c8
/* 80D61F04 41 82 00 24 */ beq lbl_80D61F28
/* 80D61F08 3C 60 80 D6 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80D62D00@ha */
/* 80D61F0C 38 03 2D 00 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80D62D00@l */
/* 80D61F10 90 1E 06 C8 */ stw r0, 0x6c8(r30)
/* 80D61F14 34 1E 06 C8 */ addic. r0, r30, 0x6c8
/* 80D61F18 41 82 00 10 */ beq lbl_80D61F28
/* 80D61F1C 3C 60 80 D6 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80D62CF4@ha */
/* 80D61F20 38 03 2C F4 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80D62CF4@l */
/* 80D61F24 90 1E 06 C8 */ stw r0, 0x6c8(r30)
lbl_80D61F28:
/* 80D61F28 34 1E 06 AC */ addic. r0, r30, 0x6ac
/* 80D61F2C 41 82 00 10 */ beq lbl_80D61F3C
/* 80D61F30 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80D61F34 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80D61F38 90 1E 06 C4 */ stw r0, 0x6c4(r30)
lbl_80D61F3C:
/* 80D61F3C 34 1E 05 70 */ addic. r0, r30, 0x570
/* 80D61F40 41 82 00 84 */ beq lbl_80D61FC4
/* 80D61F44 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80D61F48 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80D61F4C 90 7E 05 AC */ stw r3, 0x5ac(r30)
/* 80D61F50 38 03 00 2C */ addi r0, r3, 0x2c
/* 80D61F54 90 1E 06 90 */ stw r0, 0x690(r30)
/* 80D61F58 38 03 00 84 */ addi r0, r3, 0x84
/* 80D61F5C 90 1E 06 A8 */ stw r0, 0x6a8(r30)
/* 80D61F60 34 1E 06 74 */ addic. r0, r30, 0x674
/* 80D61F64 41 82 00 54 */ beq lbl_80D61FB8
/* 80D61F68 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80D61F6C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80D61F70 90 7E 06 90 */ stw r3, 0x690(r30)
/* 80D61F74 38 03 00 58 */ addi r0, r3, 0x58
/* 80D61F78 90 1E 06 A8 */ stw r0, 0x6a8(r30)
/* 80D61F7C 34 1E 06 94 */ addic. r0, r30, 0x694
/* 80D61F80 41 82 00 10 */ beq lbl_80D61F90
/* 80D61F84 3C 60 80 D6 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80D62D0C@ha */
/* 80D61F88 38 03 2D 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D62D0C@l */
/* 80D61F8C 90 1E 06 A8 */ stw r0, 0x6a8(r30)
lbl_80D61F90:
/* 80D61F90 34 1E 06 74 */ addic. r0, r30, 0x674
/* 80D61F94 41 82 00 24 */ beq lbl_80D61FB8
/* 80D61F98 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 80D61F9C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80D61FA0 90 1E 06 90 */ stw r0, 0x690(r30)
/* 80D61FA4 34 1E 06 74 */ addic. r0, r30, 0x674
/* 80D61FA8 41 82 00 10 */ beq lbl_80D61FB8
/* 80D61FAC 3C 60 80 D6 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D62D18@ha */
/* 80D61FB0 38 03 2D 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D62D18@l */
/* 80D61FB4 90 1E 06 8C */ stw r0, 0x68c(r30)
lbl_80D61FB8:
/* 80D61FB8 38 7E 05 70 */ addi r3, r30, 0x570
/* 80D61FBC 38 80 00 00 */ li r4, 0
/* 80D61FC0 4B 32 21 25 */ bl __dt__12dCcD_GObjInfFv
lbl_80D61FC4:
/* 80D61FC4 7F C3 F3 78 */ mr r3, r30
/* 80D61FC8 38 80 00 00 */ li r4, 0
/* 80D61FCC 4B 2B 6C C1 */ bl __dt__10fopAc_ac_cFv
/* 80D61FD0 7F E0 07 35 */ extsh. r0, r31
/* 80D61FD4 40 81 00 0C */ ble lbl_80D61FE0
/* 80D61FD8 7F C3 F3 78 */ mr r3, r30
/* 80D61FDC 4B 56 CD 61 */ bl __dl__FPv
lbl_80D61FE0:
/* 80D61FE0 7F C3 F3 78 */ mr r3, r30
/* 80D61FE4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61FE8 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D61FEC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61FF0 7C 08 03 A6 */ mtlr r0
/* 80D61FF4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61FF8 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_80D61E5C:
/* 80D61E5C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61E60 7C 08 02 A6 */ mflr r0
/* 80D61E64 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61E68 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61E6C 7C 7F 1B 79 */ or. r31, r3, r3
/* 80D61E70 41 82 00 1C */ beq lbl_80D61E8C
/* 80D61E74 3C A0 80 D6 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D62D18@ha */
/* 80D61E78 38 05 2D 18 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D62D18@l */
/* 80D61E7C 90 1F 00 18 */ stw r0, 0x18(r31)
/* 80D61E80 7C 80 07 35 */ extsh. r0, r4
/* 80D61E84 40 81 00 08 */ ble lbl_80D61E8C
/* 80D61E88 4B 56 CE B5 */ bl __dl__FPv
lbl_80D61E8C:
/* 80D61E8C 7F E3 FB 78 */ mr r3, r31
/* 80D61E90 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61E94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61E98 7C 08 03 A6 */ mtlr r0
/* 80D61E9C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61EA0 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_80D61E14:
/* 80D61E14 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61E18 7C 08 02 A6 */ mflr r0
/* 80D61E1C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61E20 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61E24 7C 7F 1B 79 */ or. r31, r3, r3
/* 80D61E28 41 82 00 1C */ beq lbl_80D61E44
/* 80D61E2C 3C A0 80 D6 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80D62D0C@ha */
/* 80D61E30 38 05 2D 0C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80D62D0C@l */
/* 80D61E34 90 1F 00 14 */ stw r0, 0x14(r31)
/* 80D61E38 7C 80 07 35 */ extsh. r0, r4
/* 80D61E3C 40 81 00 08 */ ble lbl_80D61E44
/* 80D61E40 4B 56 CE FD */ bl __dl__FPv
lbl_80D61E44:
/* 80D61E44 7F E3 FB 78 */ mr r3, r31
/* 80D61E48 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61E4C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61E50 7C 08 03 A6 */ mtlr r0
/* 80D61E54 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61E58 4E 80 00 20 */ blr
@@ -1,20 +0,0 @@
lbl_80D62978:
/* 80D62978 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D6297C 7C 08 02 A6 */ mflr r0
/* 80D62980 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D62984 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D62988 7C 7F 1B 79 */ or. r31, r3, r3
/* 80D6298C 41 82 00 1C */ beq lbl_80D629A8
/* 80D62990 3C A0 80 D6 */ lis r5, __vt__8cM3dGLin@ha /* 0x80D62CE8@ha */
/* 80D62994 38 05 2C E8 */ addi r0, r5, __vt__8cM3dGLin@l /* 0x80D62CE8@l */
/* 80D62998 90 1F 00 18 */ stw r0, 0x18(r31)
/* 80D6299C 7C 80 07 35 */ extsh. r0, r4
/* 80D629A0 40 81 00 08 */ ble lbl_80D629A8
/* 80D629A4 4B 56 C3 99 */ bl __dl__FPv
lbl_80D629A8:
/* 80D629A8 7F E3 FB 78 */ mr r3, r31
/* 80D629AC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D629B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D629B4 7C 08 03 A6 */ mtlr r0
/* 80D629B8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D629BC 4E 80 00 20 */ blr
@@ -1,112 +0,0 @@
lbl_80D61C18:
/* 80D61C18 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D61C1C 7C 08 02 A6 */ mflr r0
/* 80D61C20 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D61C24 39 61 00 20 */ addi r11, r1, 0x20
/* 80D61C28 4B 60 05 B5 */ bl _savegpr_29
/* 80D61C2C 7C 7F 1B 78 */ mr r31, r3
/* 80D61C30 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D61C34 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D61C38 40 82 00 A8 */ bne lbl_80D61CE0
/* 80D61C3C 7F E0 FB 79 */ or. r0, r31, r31
/* 80D61C40 41 82 00 94 */ beq lbl_80D61CD4
/* 80D61C44 7C 1E 03 78 */ mr r30, r0
/* 80D61C48 4B 2B 6F 1D */ bl __ct__10fopAc_ac_cFv
/* 80D61C4C 3B BE 05 70 */ addi r29, r30, 0x570
/* 80D61C50 7F A3 EB 78 */ mr r3, r29
/* 80D61C54 4B 32 1D D5 */ bl __ct__12dCcD_GObjInfFv
/* 80D61C58 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 80D61C5C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 80D61C60 90 1D 01 20 */ stw r0, 0x120(r29)
/* 80D61C64 3C 60 80 D6 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D62D18@ha */
/* 80D61C68 38 03 2D 18 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D62D18@l */
/* 80D61C6C 90 1D 01 1C */ stw r0, 0x11c(r29)
/* 80D61C70 3C 60 80 D6 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80D62D0C@ha */
/* 80D61C74 38 03 2D 0C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D62D0C@l */
/* 80D61C78 90 1D 01 38 */ stw r0, 0x138(r29)
/* 80D61C7C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
/* 80D61C80 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
/* 80D61C84 90 7D 01 20 */ stw r3, 0x120(r29)
/* 80D61C88 38 03 00 58 */ addi r0, r3, 0x58
/* 80D61C8C 90 1D 01 38 */ stw r0, 0x138(r29)
/* 80D61C90 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
/* 80D61C94 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
/* 80D61C98 90 7D 00 3C */ stw r3, 0x3c(r29)
/* 80D61C9C 38 03 00 2C */ addi r0, r3, 0x2c
/* 80D61CA0 90 1D 01 20 */ stw r0, 0x120(r29)
/* 80D61CA4 38 03 00 84 */ addi r0, r3, 0x84
/* 80D61CA8 90 1D 01 38 */ stw r0, 0x138(r29)
/* 80D61CAC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 80D61CB0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 80D61CB4 90 1E 06 C4 */ stw r0, 0x6c4(r30)
/* 80D61CB8 38 7E 06 C8 */ addi r3, r30, 0x6c8
/* 80D61CBC 4B 32 1A A5 */ bl __ct__10dCcD_GSttsFv
/* 80D61CC0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 80D61CC4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 80D61CC8 90 7E 06 C4 */ stw r3, 0x6c4(r30)
/* 80D61CCC 38 03 00 20 */ addi r0, r3, 0x20
/* 80D61CD0 90 1E 06 C8 */ stw r0, 0x6c8(r30)
lbl_80D61CD4:
/* 80D61CD4 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D61CD8 60 00 00 08 */ ori r0, r0, 8
/* 80D61CDC 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D61CE0:
/* 80D61CE0 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D61CE4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f
/* 80D61CE8 98 1F 06 E9 */ stb r0, 0x6e9(r31)
/* 80D61CEC 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D61CF0 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f
/* 80D61CF4 98 1F 06 EA */ stb r0, 0x6ea(r31)
/* 80D61CF8 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D61CFC 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 80D61D00 2C 03 00 FF */ cmpwi r3, 0xff
/* 80D61D04 41 82 00 1C */ beq lbl_80D61D20
/* 80D61D08 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
/* 80D61D0C 7C 04 07 74 */ extsb r4, r0
/* 80D61D10 4B 2E FA DD */ bl dPath_GetRoomPath__Fii
/* 80D61D14 90 7F 05 68 */ stw r3, 0x568(r31)
/* 80D61D18 28 03 00 00 */ cmplwi r3, 0
/* 80D61D1C 40 82 00 0C */ bne lbl_80D61D28
lbl_80D61D20:
/* 80D61D20 38 60 00 05 */ li r3, 5
/* 80D61D24 48 00 00 7C */ b lbl_80D61DA0
lbl_80D61D28:
/* 80D61D28 38 7F 06 AC */ addi r3, r31, 0x6ac
/* 80D61D2C 38 80 00 00 */ li r4, 0
/* 80D61D30 38 A0 00 FF */ li r5, 0xff
/* 80D61D34 7F E6 FB 78 */ mr r6, r31
/* 80D61D38 4B 32 1B 29 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c
/* 80D61D3C 38 7F 05 70 */ addi r3, r31, 0x570
/* 80D61D40 3C 80 80 D6 */ lis r4, l_cylSrc@ha /* 0x80D62C54@ha */
/* 80D61D44 38 84 2C 54 */ addi r4, r4, l_cylSrc@l /* 0x80D62C54@l */
/* 80D61D48 4B 32 2B 6D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl
/* 80D61D4C 38 1F 06 AC */ addi r0, r31, 0x6ac
/* 80D61D50 90 1F 05 B4 */ stw r0, 0x5b4(r31)
/* 80D61D54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D61D58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D61D5C 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 80D61D60 3C 80 80 D6 */ lis r4, d_a_tag_sppath__stringBase0@ha /* 0x80D62C4C@ha */
/* 80D61D64 38 84 2C 4C */ addi r4, r4, d_a_tag_sppath__stringBase0@l /* 0x80D62C4C@l */
/* 80D61D68 4B 60 6C 2D */ bl strcmp
/* 80D61D6C 2C 03 00 00 */ cmpwi r3, 0
/* 80D61D70 40 82 00 20 */ bne lbl_80D61D90
/* 80D61D74 3C 60 80 D6 */ lis r3, lit_3694@ha /* 0x80D62C18@ha */
/* 80D61D78 C0 03 2C 18 */ lfs f0, lit_3694@l(r3) /* 0x80D62C18@l */
/* 80D61D7C D0 1F 06 F0 */ stfs f0, 0x6f0(r31)
/* 80D61D80 38 7F 06 94 */ addi r3, r31, 0x694
/* 80D61D84 C0 3F 06 F0 */ lfs f1, 0x6f0(r31)
/* 80D61D88 4B 50 D4 71 */ bl SetH__8cM3dGCylFf
/* 80D61D8C 48 00 00 10 */ b lbl_80D61D9C
lbl_80D61D90:
/* 80D61D90 3C 60 80 D6 */ lis r3, lit_3695@ha /* 0x80D62C1C@ha */
/* 80D61D94 C0 03 2C 1C */ lfs f0, lit_3695@l(r3) /* 0x80D62C1C@l */
/* 80D61D98 D0 1F 06 F0 */ stfs f0, 0x6f0(r31)
lbl_80D61D9C:
/* 80D61D9C 38 60 00 04 */ li r3, 4
lbl_80D61DA0:
/* 80D61DA0 39 61 00 20 */ addi r11, r1, 0x20
/* 80D61DA4 4B 60 04 85 */ bl _restgpr_29
/* 80D61DA8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D61DAC 7C 08 03 A6 */ mtlr r0
/* 80D61DB0 38 21 00 20 */ addi r1, r1, 0x20
/* 80D61DB4 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D61EA4:
/* 80D61EA4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61EA8 7C 08 02 A6 */ mflr r0
/* 80D61EAC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61EB0 4B FF FD 69 */ bl create__13daTagSppath_cFv
/* 80D61EB4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61EB8 7C 08 03 A6 */ mtlr r0
/* 80D61EBC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61EC0 4E 80 00 20 */ blr
@@ -1,11 +0,0 @@
lbl_80D61FFC:
/* 80D61FFC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D62000 7C 08 02 A6 */ mflr r0
/* 80D62004 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D62008 38 80 FF FF */ li r4, -1
/* 80D6200C 4B FF FE B9 */ bl __dt__13daTagSppath_cFv
/* 80D62010 38 60 00 01 */ li r3, 1
/* 80D62014 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D62018 7C 08 03 A6 */ mtlr r0
/* 80D6201C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D62020 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D62BA0:
/* 80D62BA0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D62BA4 7C 08 02 A6 */ mflr r0
/* 80D62BA8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D62BAC 4B FF FE 15 */ bl execute__13daTagSppath_cFv
/* 80D62BB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D62BB4 7C 08 03 A6 */ mtlr r0
/* 80D62BB8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D62BBC 4E 80 00 20 */ blr
@@ -1,132 +0,0 @@
lbl_80D629C0:
/* 80D629C0 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 80D629C4 7C 08 02 A6 */ mflr r0
/* 80D629C8 90 01 00 44 */ stw r0, 0x44(r1)
/* 80D629CC DB E1 00 30 */ stfd f31, 0x30(r1)
/* 80D629D0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */
/* 80D629D4 39 61 00 30 */ addi r11, r1, 0x30
/* 80D629D8 4B 5F F8 01 */ bl _savegpr_28
/* 80D629DC 7C 7E 1B 78 */ mr r30, r3
/* 80D629E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D629E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D629E8 83 E3 5D AC */ lwz r31, 0x5dac(r3)
/* 80D629EC 7F E3 FB 78 */ mr r3, r31
/* 80D629F0 81 9F 06 28 */ lwz r12, 0x628(r31)
/* 80D629F4 81 8C 01 98 */ lwz r12, 0x198(r12)
/* 80D629F8 7D 89 03 A6 */ mtctr r12
/* 80D629FC 4E 80 04 21 */ bctrl
/* 80D62A00 28 03 00 00 */ cmplwi r3, 0
/* 80D62A04 41 82 00 54 */ beq lbl_80D62A58
/* 80D62A08 88 9E 06 E9 */ lbz r4, 0x6e9(r30)
/* 80D62A0C 28 04 00 FF */ cmplwi r4, 0xff
/* 80D62A10 41 82 00 20 */ beq lbl_80D62A30
/* 80D62A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D62A18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D62A1C 88 1E 04 BA */ lbz r0, 0x4ba(r30)
/* 80D62A20 7C 05 07 74 */ extsb r5, r0
/* 80D62A24 4B 2D 29 3D */ bl isSwitch__10dSv_info_cCFii
/* 80D62A28 2C 03 00 00 */ cmpwi r3, 0
/* 80D62A2C 41 82 00 2C */ beq lbl_80D62A58
lbl_80D62A30:
/* 80D62A30 88 9E 06 EA */ lbz r4, 0x6ea(r30)
/* 80D62A34 28 04 00 FF */ cmplwi r4, 0xff
/* 80D62A38 41 82 00 28 */ beq lbl_80D62A60
/* 80D62A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D62A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D62A44 88 1E 04 BA */ lbz r0, 0x4ba(r30)
/* 80D62A48 7C 05 07 74 */ extsb r5, r0
/* 80D62A4C 4B 2D 29 15 */ bl isSwitch__10dSv_info_cCFii
/* 80D62A50 2C 03 00 00 */ cmpwi r3, 0
/* 80D62A54 41 82 00 0C */ beq lbl_80D62A60
lbl_80D62A58:
/* 80D62A58 38 60 00 01 */ li r3, 1
/* 80D62A5C 48 00 01 24 */ b lbl_80D62B80
lbl_80D62A60:
/* 80D62A60 83 9E 05 68 */ lwz r28, 0x568(r30)
/* 80D62A64 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */
/* 80D62A68 C3 E3 0A E8 */ lfs f31, __float_max@l(r3) /* 0x80450AE8@l */
/* 80D62A6C 48 00 00 64 */ b lbl_80D62AD0
lbl_80D62A70:
/* 80D62A70 7F C3 F3 78 */ mr r3, r30
/* 80D62A74 38 81 00 14 */ addi r4, r1, 0x14
/* 80D62A78 7F 85 E3 78 */ mr r5, r28
/* 80D62A7C 4B FF F5 A9 */ bl getNearPathPos__13daTagSppath_cFP4cXyzP5dPath
/* 80D62A80 7C 7D 1B 78 */ mr r29, r3
/* 80D62A84 38 61 00 14 */ addi r3, r1, 0x14
/* 80D62A88 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 80D62A8C 4B 5E 49 11 */ bl PSVECSquareDistance
/* 80D62A90 FC 01 F8 40 */ fcmpo cr0, f1, f31
/* 80D62A94 40 80 00 28 */ bge lbl_80D62ABC
/* 80D62A98 FF E0 08 90 */ fmr f31, f1
/* 80D62A9C C0 01 00 14 */ lfs f0, 0x14(r1)
/* 80D62AA0 D0 1E 04 D0 */ stfs f0, 0x4d0(r30)
/* 80D62AA4 C0 01 00 18 */ lfs f0, 0x18(r1)
/* 80D62AA8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30)
/* 80D62AAC C0 01 00 1C */ lfs f0, 0x1c(r1)
/* 80D62AB0 D0 1E 04 D8 */ stfs f0, 0x4d8(r30)
/* 80D62AB4 93 9E 05 6C */ stw r28, 0x56c(r30)
/* 80D62AB8 B3 BE 06 EC */ sth r29, 0x6ec(r30)
lbl_80D62ABC:
/* 80D62ABC 7F 83 E3 78 */ mr r3, r28
/* 80D62AC0 88 1E 04 E2 */ lbz r0, 0x4e2(r30)
/* 80D62AC4 7C 04 07 74 */ extsb r4, r0
/* 80D62AC8 4B 2E ED D1 */ bl dPath_GetNextRoomPath__FPC5dPathi
/* 80D62ACC 7C 7C 1B 78 */ mr r28, r3
lbl_80D62AD0:
/* 80D62AD0 28 1C 00 00 */ cmplwi r28, 0
/* 80D62AD4 40 82 FF 9C */ bne lbl_80D62A70
/* 80D62AD8 80 7E 05 6C */ lwz r3, 0x56c(r30)
/* 80D62ADC 88 03 00 04 */ lbz r0, 4(r3)
/* 80D62AE0 28 00 00 00 */ cmplwi r0, 0
/* 80D62AE4 40 82 00 44 */ bne lbl_80D62B28
/* 80D62AE8 88 83 00 06 */ lbz r4, 6(r3)
/* 80D62AEC 28 04 00 FF */ cmplwi r4, 0xff
/* 80D62AF0 41 82 00 20 */ beq lbl_80D62B10
/* 80D62AF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D62AF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D62AFC 88 1E 04 BA */ lbz r0, 0x4ba(r30)
/* 80D62B00 7C 05 07 74 */ extsb r5, r0
/* 80D62B04 4B 2D 28 5D */ bl isSwitch__10dSv_info_cCFii
/* 80D62B08 2C 03 00 00 */ cmpwi r3, 0
/* 80D62B0C 40 82 00 10 */ bne lbl_80D62B1C
lbl_80D62B10:
/* 80D62B10 38 00 00 01 */ li r0, 1
/* 80D62B14 98 1E 06 E8 */ stb r0, 0x6e8(r30)
/* 80D62B18 48 00 00 18 */ b lbl_80D62B30
lbl_80D62B1C:
/* 80D62B1C 38 00 00 02 */ li r0, 2
/* 80D62B20 98 1E 06 E8 */ stb r0, 0x6e8(r30)
/* 80D62B24 48 00 00 0C */ b lbl_80D62B30
lbl_80D62B28:
/* 80D62B28 38 00 00 00 */ li r0, 0
/* 80D62B2C 98 1E 06 E8 */ stb r0, 0x6e8(r30)
lbl_80D62B30:
/* 80D62B30 C0 7E 04 D8 */ lfs f3, 0x4d8(r30)
/* 80D62B34 C0 5E 04 D4 */ lfs f2, 0x4d4(r30)
/* 80D62B38 3C 60 80 D6 */ lis r3, lit_4167@ha /* 0x80D62C48@ha */
/* 80D62B3C C0 23 2C 48 */ lfs f1, lit_4167@l(r3) /* 0x80D62C48@l */
/* 80D62B40 C0 1E 06 F0 */ lfs f0, 0x6f0(r30)
/* 80D62B44 EC 01 00 32 */ fmuls f0, f1, f0
/* 80D62B48 EC 22 00 28 */ fsubs f1, f2, f0
/* 80D62B4C C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
/* 80D62B50 D0 01 00 08 */ stfs f0, 8(r1)
/* 80D62B54 D0 21 00 0C */ stfs f1, 0xc(r1)
/* 80D62B58 D0 61 00 10 */ stfs f3, 0x10(r1)
/* 80D62B5C 38 7E 06 94 */ addi r3, r30, 0x694
/* 80D62B60 38 81 00 08 */ addi r4, r1, 8
/* 80D62B64 4B 50 C6 79 */ bl SetC__8cM3dGCylFRC4cXyz
/* 80D62B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D62B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D62B70 38 63 23 3C */ addi r3, r3, 0x233c
/* 80D62B74 38 9E 05 70 */ addi r4, r30, 0x570
/* 80D62B78 4B 50 20 31 */ bl Set__4cCcSFP8cCcD_Obj
/* 80D62B7C 38 60 00 01 */ li r3, 1
lbl_80D62B80:
/* 80D62B80 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */
/* 80D62B84 CB E1 00 30 */ lfd f31, 0x30(r1)
/* 80D62B88 39 61 00 30 */ addi r11, r1, 0x30
/* 80D62B8C 4B 5F F6 99 */ bl _restgpr_28
/* 80D62B90 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80D62B94 7C 08 03 A6 */ mtlr r0
/* 80D62B98 38 21 00 40 */ addi r1, r1, 0x40
/* 80D62B9C 4E 80 00 20 */ blr
+3
View File
@@ -24,6 +24,9 @@ public:
void set(const Vec& i_start, const Vec& i_end) { SetStartEnd(i_start, i_end); }
const cXyz& GetStartP(void) const { return mStart; }
cXyz& GetStartP(void) { return mStart; }
cXyz& GetStart() { return mStart; }
const cXyz& GetStart() const { return mStart; }
const cXyz& GetEndP(void) const { return mEnd; }
cXyz& GetEndP(void) { return mEnd; }
cXyz& GetEnd() { return mEnd; }
@@ -1,15 +1,26 @@
#ifndef D_A_TAG_SPPATH_H
#define D_A_TAG_SPPATH_H
#include "f_op/f_op_actor.h"
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_path.h"
class daTagSppath_c : public fopAc_ac_c {
public:
/* 80D61C18 */ void create();
/* 80D61C18 */ int create();
/* 80D61EC4 */ ~daTagSppath_c();
/* 80D62024 */ void getNearPathPos(cXyz*, dPath*);
/* 80D629C0 */ void execute();
/* 80D62024 */ int getNearPathPos(cXyz*, dPath*);
/* 80D629C0 */ int execute();
/* 0x568 */ dPath* mpInitPath;
/* 0x56C */ dPath* mpBestPath;
/* 0x570 */ dCcD_Cyl mCyl;
/* 0x6AC */ dCcD_Stts mStts;
/* 0x6E8 */ u8 field_0x6e8;
/* 0x6E9 */ u8 mSwNo1;
/* 0x6EA */ u8 mSwNo2;
/* 0x6EC */ u16 mBestNo;
/* 0x6F0 */ f32 mHeight;
};
#endif /* D_A_TAG_SPPATH_H */
File diff suppressed because it is too large Load Diff