From 8d2599d1b7f2bd40b24ea6b5cccf5e96dbe03851 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 22 Jan 2021 06:39:12 -0500 Subject: [PATCH] dBgS: Initial dBgS_PolyPassChk class skeleton --- asm/d/a/d_a_npc.s | 2 +- asm/d/a/obj/d_a_obj_item.s | 2 +- asm/d/bg/d_bg_w.s | 4 +- asm/d/bg/s/d_bg_s_acch.s | 4 +- asm/d/bg/s/d_bg_s_chk.s | 4 +- asm/d/bg/s/gnd/d_bg_s_gnd_chk.s | 6 +- asm/d/bg/s/lin/d_bg_s_lin_chk.s | 16 ++-- asm/d/bg/w/d_bg_w_kcol.s | 4 +- asm/f/op/actor/f_op_actor_mng.s | 4 +- include/d/d_a/d_a_alink/asm/func_800CF380.s | 8 +- include/d/d_a/d_a_alink/asm/func_800E5BB4.s | 32 +++---- include/d/d_a/d_a_alink/asm/func_801127F0.s | 10 +-- include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h | 88 ++++++++++++++----- include/d/d_camera/asm/func_8016008C.s | 4 +- include/d/d_camera/asm/func_801658C0.s | 8 +- include/d/d_camera/asm/func_80165CE0.s | 2 +- include/d/d_camera/asm/func_80167EF4.s | 2 +- include/d/d_camera/asm/func_80167FEC.s | 12 +-- .../d_kankyo_rain/asm/func_8005CDD0.s | 2 +- .../d_kankyo_rain/asm/func_8005CF78.s | 2 +- .../d_kankyo_rain/asm/func_8005FD48.s | 2 +- ldscript.lcf | 2 +- src/d/d_bg/d_bg_s_poly_pass_chk.cpp | 45 +++++----- 23 files changed, 155 insertions(+), 110 deletions(-) diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 1f601c4128b..3828cf0c67a 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -9964,7 +9964,7 @@ daBaseNpc_c: /* 8014E710 0014B650 38 03 00 18 */ addi r0, r3, 0x18 /* 8014E714 0014B654 90 1E 00 24 */ stw r0, 0x24(r30) /* 8014E718 0014B658 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8014E71C 0014B65C 4B F2 A7 4D */ bl dBgS_PolyPassChk_NS_SetObj +/* 8014E71C 0014B65C 4B F2 A7 4D */ bl SetObj__16dBgS_PolyPassChkFv /* 8014E720 0014B660 38 7F 07 58 */ addi r3, r31, 0x758 /* 8014E724 0014B664 48 17 1C A5 */ bl __ct__10Z2CreatureFv /* 8014E728 0014B668 3B DF 07 EC */ addi r30, r31, 0x7ec diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index 73a5fd39729..d9a12a34b35 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -752,7 +752,7 @@ daItem_c_NS__daItem_create: /* 8015B838 00158778 38 03 00 18 */ addi r0, r3, 0x18 /* 8015B83C 0015877C 90 1C 00 24 */ stw r0, 0x24(r28) /* 8015B840 00158780 38 7C 00 14 */ addi r3, r28, 0x14 -/* 8015B844 00158784 4B F1 D6 25 */ bl dBgS_PolyPassChk_NS_SetObj +/* 8015B844 00158784 4B F1 D6 25 */ bl SetObj__16dBgS_PolyPassChkFv /* 8015B848 00158788 38 7D 07 64 */ addi r3, r29, 0x764 /* 8015B84C 0015878C 4B F1 A6 61 */ bl dBgS_AcchCir /* 8015B850 00158790 3C 60 80 3C */ lis r3, lbl_803C3728@ha diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index 6906caa73fa..efaa4fc50c8 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -5669,7 +5669,7 @@ lbl_8007E220: /* 8007E238 0007B178 2C 1C 00 08 */ cmpwi r28, 8 /* 8007E23C 0007B17C 40 82 00 1C */ bne lbl_8007E258 /* 8007E240 0007B180 7F E3 FB 78 */ mr r3, r31 -/* 8007E244 0007B184 4B FF AC C1 */ bl dBgS_PolyPassChk_NS_ChkNoHorse +/* 8007E244 0007B184 4B FF AC C1 */ bl ChkNoHorse__16dBgS_PolyPassChkFv /* 8007E248 0007B188 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007E24C 0007B18C 41 82 00 0C */ beq lbl_8007E258 /* 8007E250 0007B190 38 60 00 01 */ li r3, 1 @@ -5678,7 +5678,7 @@ lbl_8007E258: /* 8007E258 0007B198 2C 1C 00 09 */ cmpwi r28, 9 /* 8007E25C 0007B19C 40 82 00 80 */ bne lbl_8007E2DC /* 8007E260 0007B1A0 7F E3 FB 78 */ mr r3, r31 -/* 8007E264 0007B1A4 4B FF AC A1 */ bl dBgS_PolyPassChk_NS_ChkNoHorse +/* 8007E264 0007B1A4 4B FF AC A1 */ bl ChkNoHorse__16dBgS_PolyPassChkFv /* 8007E268 0007B1A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007E26C 0007B1AC 41 82 00 0C */ beq lbl_8007E278 /* 8007E270 0007B1B0 38 60 00 01 */ li r3, 1 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index 8d2c090ccb1..c5ca0503dc6 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -1114,7 +1114,7 @@ lbl_80076E74: /* 80076E74 00073DB4 38 61 00 38 */ addi r3, r1, 0x38 /* 80076E78 00073DB8 48 00 21 7D */ bl dBgS_RoofChk /* 80076E7C 00073DBC 38 61 00 5C */ addi r3, r1, 0x5c -/* 80076E80 00073DC0 48 00 20 6D */ bl dBgS_PolyPassChk_NS_SetUnderwaterRoof +/* 80076E80 00073DC0 48 00 20 6D */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 80076E84 00073DC4 80 7E 00 30 */ lwz r3, 0x30(r30) /* 80076E88 00073DC8 C0 03 00 00 */ lfs f0, 0(r3) /* 80076E8C 00073DCC D0 01 00 74 */ stfs f0, 0x74(r1) @@ -1152,7 +1152,7 @@ lbl_80076ED8: /* 80076F04 00073E44 48 00 1C 8D */ bl dBgS_SplGrpChk_NS_Set /* 80076F08 00073E48 38 7E 01 A4 */ addi r3, r30, 0x1a4 /* 80076F0C 00073E4C 38 9E 00 14 */ addi r4, r30, 0x14 -/* 80076F10 00073E50 48 00 1E FD */ bl dBgS_PolyPassChk_NS_SetPassChkInfo +/* 80076F10 00073E50 48 00 1E FD */ bl SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk /* 80076F14 00073E54 7F E3 FB 78 */ mr r3, r31 /* 80076F18 00073E58 38 9E 01 80 */ addi r4, r30, 0x180 /* 80076F1C 00073E5C 4B FF E6 49 */ bl dBgS_NS_SplGrpChk diff --git a/asm/d/bg/s/d_bg_s_chk.s b/asm/d/bg/s/d_bg_s_chk.s index 60ac0c862ac..f4902047f87 100644 --- a/asm/d/bg/s/d_bg_s_chk.s +++ b/asm/d/bg/s/d_bg_s_chk.s @@ -10,7 +10,7 @@ dBgS_Chk: /* 800774A4 000743E4 90 01 00 14 */ stw r0, 0x14(r1) /* 800774A8 000743E8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800774AC 000743EC 7C 7F 1B 78 */ mr r31, r3 -/* 800774B0 000743F0 48 00 18 B5 */ bl dBgS_PolyPassChk +/* 800774B0 000743F0 48 00 18 B5 */ bl __ct__16dBgS_PolyPassChkFv /* 800774B4 000743F4 38 7F 00 10 */ addi r3, r31, 0x10 /* 800774B8 000743F8 48 00 06 E9 */ bl dBgS_GrpPassChk /* 800774BC 000743FC 3C 60 80 3B */ lis r3, lbl_803AB670@ha @@ -45,7 +45,7 @@ dBgS_Chk_NS_dtor: /* 80077524 00074464 48 00 06 A1 */ bl dBgS_GrpPassChk_NS_dtor /* 80077528 00074468 7F C3 F3 78 */ mr r3, r30 /* 8007752C 0007446C 38 80 00 00 */ li r4, 0 -/* 80077530 00074470 48 00 18 81 */ bl dBgS_PolyPassChk_NS_dtor +/* 80077530 00074470 48 00 18 81 */ bl __dt__16dBgS_PolyPassChkFv /* 80077534 00074474 7F E0 07 35 */ extsh. r0, r31 /* 80077538 00074478 40 81 00 0C */ ble lbl_80077544 /* 8007753C 0007447C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s index 26fb31a1322..9fb9639f55d 100644 --- a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s +++ b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s @@ -88,7 +88,7 @@ lbl_8007765C: /* 800776AC 000745EC 38 03 00 24 */ addi r0, r3, 0x24 /* 800776B0 000745F0 90 1F 00 4C */ stw r0, 0x4c(r31) /* 800776B4 000745F4 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800776B8 000745F8 48 00 17 B1 */ bl dBgS_PolyPassChk_NS_SetObj +/* 800776B8 000745F8 48 00 17 B1 */ bl SetObj__16dBgS_PolyPassChkFv /* 800776BC 000745FC 3C 60 80 3B */ lis r3, lbl_803AB748@ha /* 800776C0 00074600 38 63 B7 48 */ addi r3, r3, lbl_803AB748@l /* 800776C4 00074604 90 7F 00 10 */ stw r3, 0x10(r31) @@ -170,7 +170,7 @@ lbl_80077794: /* 800777E4 00074724 38 03 00 24 */ addi r0, r3, 0x24 /* 800777E8 00074728 90 1F 00 4C */ stw r0, 0x4c(r31) /* 800777EC 0007472C 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800777F0 00074730 48 00 16 79 */ bl dBgS_PolyPassChk_NS_SetObj +/* 800777F0 00074730 48 00 16 79 */ bl SetObj__16dBgS_PolyPassChkFv /* 800777F4 00074734 3C 60 80 3B */ lis r3, lbl_803AB718@ha /* 800777F8 00074738 38 63 B7 18 */ addi r3, r3, lbl_803AB718@l /* 800777FC 0007473C 90 7F 00 10 */ stw r3, 0x10(r31) @@ -334,7 +334,7 @@ dBgS_CamGndChk_Wtr: /* 80077A34 00074974 38 03 00 24 */ addi r0, r3, 0x24 /* 80077A38 00074978 90 1F 00 4C */ stw r0, 0x4c(r31) /* 80077A3C 0007497C 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80077A40 00074980 48 00 14 41 */ bl dBgS_PolyPassChk_NS_SetCam +/* 80077A40 00074980 48 00 14 41 */ bl SetCam__16dBgS_PolyPassChkFv /* 80077A44 00074984 3C 60 80 3B */ lis r3, lbl_803AB688@ha /* 80077A48 00074988 38 63 B6 88 */ addi r3, r3, lbl_803AB688@l /* 80077A4C 0007498C 90 7F 00 10 */ stw r3, 0x10(r31) diff --git a/asm/d/bg/s/lin/d_bg_s_lin_chk.s b/asm/d/bg/s/lin/d_bg_s_lin_chk.s index ba8809fe738..69a5b5d3a2c 100644 --- a/asm/d/bg/s/lin/d_bg_s_lin_chk.s +++ b/asm/d/bg/s/lin/d_bg_s_lin_chk.s @@ -113,7 +113,7 @@ dBgS_CamLinChk: /* 80077DD8 00074D18 38 03 00 24 */ addi r0, r3, 0x24 /* 80077DDC 00074D1C 90 1F 00 68 */ stw r0, 0x68(r31) /* 80077DE0 00074D20 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077DE4 00074D24 48 00 10 9D */ bl dBgS_PolyPassChk_NS_SetCam +/* 80077DE4 00074D24 48 00 10 9D */ bl SetCam__16dBgS_PolyPassChkFv /* 80077DE8 00074D28 7F E3 FB 78 */ mr r3, r31 /* 80077DEC 00074D2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80077DF0 00074D30 80 01 00 14 */ lwz r0, 0x14(r1) @@ -233,7 +233,7 @@ dBgS_ObjLinChk: /* 80077F90 00074ED0 38 03 00 24 */ addi r0, r3, 0x24 /* 80077F94 00074ED4 90 1F 00 68 */ stw r0, 0x68(r31) /* 80077F98 00074ED8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077F9C 00074EDC 48 00 0E CD */ bl dBgS_PolyPassChk_NS_SetObj +/* 80077F9C 00074EDC 48 00 0E CD */ bl SetObj__16dBgS_PolyPassChkFv /* 80077FA0 00074EE0 7F E3 FB 78 */ mr r3, r31 /* 80077FA4 00074EE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80077FA8 00074EE8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -293,7 +293,7 @@ dBgS_LinkLinChk: /* 80078064 00074FA4 38 03 00 24 */ addi r0, r3, 0x24 /* 80078068 00074FA8 90 1F 00 68 */ stw r0, 0x68(r31) /* 8007806C 00074FAC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078070 00074FB0 48 00 0E 29 */ bl dBgS_PolyPassChk_NS_SetLink +/* 80078070 00074FB0 48 00 0E 29 */ bl SetLink__16dBgS_PolyPassChkFv /* 80078074 00074FB4 7F E3 FB 78 */ mr r3, r31 /* 80078078 00074FB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007807C 00074FBC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -350,7 +350,7 @@ lbl_800780E8: /* 80078138 00075078 38 03 00 24 */ addi r0, r3, 0x24 /* 8007813C 0007507C 90 1F 00 68 */ stw r0, 0x68(r31) /* 80078140 00075080 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078144 00075084 48 00 0D 79 */ bl dBgS_PolyPassChk_NS_SetBomb +/* 80078144 00075084 48 00 0D 79 */ bl SetBomb__16dBgS_PolyPassChkFv /* 80078148 00075088 7F E3 FB 78 */ mr r3, r31 /* 8007814C 0007508C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80078150 00075090 80 01 00 14 */ lwz r0, 0x14(r1) @@ -409,7 +409,7 @@ dBgS_ArrowLinChk: /* 8007820C 0007514C 38 03 00 24 */ addi r0, r3, 0x24 /* 80078210 00075150 90 1F 00 68 */ stw r0, 0x68(r31) /* 80078214 00075154 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80078218 00075158 48 00 0C 99 */ bl dBgS_PolyPassChk_NS_SetArrow +/* 80078218 00075158 48 00 0C 99 */ bl SetArrow__16dBgS_PolyPassChkFv /* 8007821C 0007515C 80 1F 00 6C */ lwz r0, 0x6c(r31) /* 80078220 00075160 60 00 00 01 */ ori r0, r0, 1 /* 80078224 00075164 90 1F 00 6C */ stw r0, 0x6c(r31) @@ -472,7 +472,7 @@ dBgS_BoomerangLinChk: /* 800782EC 0007522C 38 03 00 24 */ addi r0, r3, 0x24 /* 800782F0 00075230 90 1F 00 68 */ stw r0, 0x68(r31) /* 800782F4 00075234 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800782F8 00075238 48 00 0B DD */ bl dBgS_PolyPassChk_NS_SetBoomerang +/* 800782F8 00075238 48 00 0B DD */ bl SetBoomerang__16dBgS_PolyPassChkFv /* 800782FC 0007523C 7F E3 FB 78 */ mr r3, r31 /* 80078300 00075240 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80078304 00075244 80 01 00 14 */ lwz r0, 0x14(r1) @@ -532,7 +532,7 @@ dBgS_RopeLinChk: /* 800783C0 00075300 38 03 00 24 */ addi r0, r3, 0x24 /* 800783C4 00075304 90 1F 00 68 */ stw r0, 0x68(r31) /* 800783C8 00075308 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800783CC 0007530C 48 00 0B 15 */ bl dBgS_PolyPassChk_NS_SetRope +/* 800783CC 0007530C 48 00 0B 15 */ bl SetRope__16dBgS_PolyPassChkFv /* 800783D0 00075310 7F E3 FB 78 */ mr r3, r31 /* 800783D4 00075314 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800783D8 00075318 80 01 00 14 */ lwz r0, 0x14(r1) @@ -589,7 +589,7 @@ lbl_80078444: /* 80078494 000753D4 38 03 00 24 */ addi r0, r3, 0x24 /* 80078498 000753D8 90 1F 00 68 */ stw r0, 0x68(r31) /* 8007849C 000753DC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800784A0 000753E0 48 00 0A 59 */ bl dBgS_PolyPassChk_NS_SetHorse +/* 800784A0 000753E0 48 00 0A 59 */ bl SetHorse__16dBgS_PolyPassChkFv /* 800784A4 000753E4 7F E3 FB 78 */ mr r3, r31 /* 800784A8 000753E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800784AC 000753EC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index 80c93162765..1fd39ff1bcc 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -450,7 +450,7 @@ lbl_8007ED44: /* 8007ED4C 0007BC8C 2C 00 00 08 */ cmpwi r0, 8 /* 8007ED50 0007BC90 40 82 00 1C */ bne lbl_8007ED6C /* 8007ED54 0007BC94 7F E3 FB 78 */ mr r3, r31 -/* 8007ED58 0007BC98 4B FF A1 AD */ bl dBgS_PolyPassChk_NS_ChkNoHorse +/* 8007ED58 0007BC98 4B FF A1 AD */ bl ChkNoHorse__16dBgS_PolyPassChkFv /* 8007ED5C 0007BC9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007ED60 0007BCA0 41 82 00 0C */ beq lbl_8007ED6C /* 8007ED64 0007BCA4 38 60 00 01 */ li r3, 1 @@ -461,7 +461,7 @@ lbl_8007ED6C: /* 8007ED74 0007BCB4 2C 00 00 09 */ cmpwi r0, 9 /* 8007ED78 0007BCB8 40 82 00 5C */ bne lbl_8007EDD4 /* 8007ED7C 0007BCBC 7F E3 FB 78 */ mr r3, r31 -/* 8007ED80 0007BCC0 4B FF A1 85 */ bl dBgS_PolyPassChk_NS_ChkNoHorse +/* 8007ED80 0007BCC0 4B FF A1 85 */ bl ChkNoHorse__16dBgS_PolyPassChkFv /* 8007ED84 0007BCC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007ED88 0007BCC8 41 82 00 0C */ beq lbl_8007ED94 /* 8007ED8C 0007BCCC 38 60 00 01 */ li r3, 1 diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index 5f0a7ee5f34..226f9c25cc5 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -5062,7 +5062,7 @@ fopAcM_initManager: /* 8001DE90 0001ADD0 38 03 00 24 */ addi r0, r3, 0x24 /* 8001DE94 0001ADD4 90 1E 00 4C */ stw r0, 0x4c(r30) /* 8001DE98 0001ADD8 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8001DE9C 0001ADDC 48 05 AF CD */ bl dBgS_PolyPassChk_NS_SetObj +/* 8001DE9C 0001ADDC 48 05 AF CD */ bl SetObj__16dBgS_PolyPassChkFv /* 8001DEA0 0001ADE0 7F C3 F3 78 */ mr r3, r30 .global dBgS_ObjGndChk_NS_dtor /* 8001DEA4 0001ADE4 3C 80 80 02 */ lis r4, dBgS_ObjGndChk_NS_dtor@ha @@ -5083,7 +5083,7 @@ fopAcM_initManager: /* 8001DEDC 0001AE1C 38 03 00 24 */ addi r0, r3, 0x24 /* 8001DEE0 0001AE20 90 1E 00 34 */ stw r0, 0x34(r30) /* 8001DEE4 0001AE24 38 7E 00 24 */ addi r3, r30, 0x24 -/* 8001DEE8 0001AE28 48 05 AF 81 */ bl dBgS_PolyPassChk_NS_SetObj +/* 8001DEE8 0001AE28 48 05 AF 81 */ bl SetObj__16dBgS_PolyPassChkFv /* 8001DEEC 0001AE2C 7F C3 F3 78 */ mr r3, r30 .global dBgS_ObjRoofChk_NS_dtor /* 8001DEF0 0001AE30 3C 80 80 02 */ lis r4, dBgS_ObjRoofChk_NS_dtor@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index 1a14697d9cc..04d92a16661 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -208,7 +208,7 @@ /* 800CF67C 000CC5BC 38 03 00 18 */ addi r0, r3, 0x18 /* 800CF680 000CC5C0 90 1A 00 24 */ stw r0, 0x24(r26) /* 800CF684 000CC5C4 38 7A 00 14 */ addi r3, r26, 0x14 -/* 800CF688 000CC5C8 4B FA 98 11 */ bl dBgS_PolyPassChk_NS_SetLink +/* 800CF688 000CC5C8 4B FA 98 11 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF68C 000CC5CC 38 7F 1B 48 */ addi r3, r31, 0x1b48 /* 800CF690 000CC5D0 4B FA 89 A1 */ bl dBgS_LinkLinChk /* 800CF694 000CC5D4 38 7F 1B B8 */ addi r3, r31, 0x1bb8 @@ -230,7 +230,7 @@ /* 800CF6D4 000CC614 38 03 00 24 */ addi r0, r3, 0x24 /* 800CF6D8 000CC618 90 1A 00 4C */ stw r0, 0x4c(r26) /* 800CF6DC 000CC61C 38 7A 00 3C */ addi r3, r26, 0x3c -/* 800CF6E0 000CC620 4B FA 97 B9 */ bl dBgS_PolyPassChk_NS_SetLink +/* 800CF6E0 000CC620 4B FA 97 B9 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF6E4 000CC624 3B 5F 1D 5C */ addi r26, r31, 0x1d5c /* 800CF6E8 000CC628 7F 43 D3 78 */ mr r3, r26 /* 800CF6EC 000CC62C 4B FA 99 09 */ bl dBgS_RoofChk @@ -244,7 +244,7 @@ /* 800CF70C 000CC64C 38 03 00 24 */ addi r0, r3, 0x24 /* 800CF710 000CC650 90 1A 00 34 */ stw r0, 0x34(r26) /* 800CF714 000CC654 38 7A 00 24 */ addi r3, r26, 0x24 -/* 800CF718 000CC658 4B FA 97 81 */ bl dBgS_PolyPassChk_NS_SetLink +/* 800CF718 000CC658 4B FA 97 81 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF71C 000CC65C 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800CF720 000CC660 4B FA 89 11 */ bl dBgS_LinkLinChk /* 800CF724 000CC664 38 7F 1E 1C */ addi r3, r31, 0x1e1c @@ -270,7 +270,7 @@ /* 800CF774 000CC6B4 38 03 00 24 */ addi r0, r3, 0x24 /* 800CF778 000CC6B8 90 1A 00 4C */ stw r0, 0x4c(r26) /* 800CF77C 000CC6BC 38 7A 00 3C */ addi r3, r26, 0x3c -/* 800CF780 000CC6C0 4B FA 96 E9 */ bl dBgS_PolyPassChk_NS_SetObj +/* 800CF780 000CC6C0 4B FA 96 E9 */ bl SetObj__16dBgS_PolyPassChkFv /* 800CF784 000CC6C4 38 7F 1F 28 */ addi r3, r31, 0x1f28 /*.global mDoExt_AnmRatioPack*/ /* 800CF788 000CC6C8 3C 80 80 14 */ lis r4, mDoExt_AnmRatioPack@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800E5BB4.s b/include/d/d_a/d_a_alink/asm/func_800E5BB4.s index 58646a31a21..e21e89e3aa5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5BB4.s @@ -12,21 +12,21 @@ /* 800E5BE0 000E2B20 7F E4 FB 78 */ mr r4, r31 /* 800E5BE4 000E2B24 48 07 90 D5 */ bl daPy_actorKeep_c_NS_setData /* 800E5BE8 000E2B28 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5BEC 000E2B2C 4B F9 32 89 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 800E5BEC 000E2B2C 4B F9 32 89 */ bl ClrObj__16dBgS_PolyPassChkFv /* 800E5BF0 000E2B30 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5BF4 000E2B34 4B F9 32 D5 */ bl dBgS_PolyPassChk_NS_ClrBomb +/* 800E5BF4 000E2B34 4B F9 32 D5 */ bl ClrBomb__16dBgS_PolyPassChkFv /* 800E5BF8 000E2B38 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5BFC 000E2B3C 4B F9 33 8D */ bl dBgS_PolyPassChk_NS_ClrStatue +/* 800E5BFC 000E2B3C 4B F9 33 8D */ bl ClrStatue__16dBgS_PolyPassChkFv /* 800E5C00 000E2B40 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5C04 000E2B44 4B F9 32 A1 */ bl dBgS_PolyPassChk_NS_ClrLink +/* 800E5C04 000E2B44 4B F9 32 A1 */ bl ClrLink__16dBgS_PolyPassChkFv /* 800E5C08 000E2B48 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C0C 000E2B4C 4B F9 32 69 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 800E5C0C 000E2B4C 4B F9 32 69 */ bl ClrObj__16dBgS_PolyPassChkFv /* 800E5C10 000E2B50 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C14 000E2B54 4B F9 32 B5 */ bl dBgS_PolyPassChk_NS_ClrBomb +/* 800E5C14 000E2B54 4B F9 32 B5 */ bl ClrBomb__16dBgS_PolyPassChkFv /* 800E5C18 000E2B58 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C1C 000E2B5C 4B F9 33 6D */ bl dBgS_PolyPassChk_NS_ClrStatue +/* 800E5C1C 000E2B5C 4B F9 33 6D */ bl ClrStatue__16dBgS_PolyPassChkFv /* 800E5C20 000E2B60 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C24 000E2B64 4B F9 32 81 */ bl dBgS_PolyPassChk_NS_ClrLink +/* 800E5C24 000E2B64 4B F9 32 81 */ bl ClrLink__16dBgS_PolyPassChkFv /* 800E5C28 000E2B68 A8 1F 00 08 */ lha r0, 8(r31) /* 800E5C2C 000E2B6C 2C 00 02 21 */ cmpwi r0, 0x221 /* 800E5C30 000E2B70 41 82 00 0C */ beq lbl_800E5C3C @@ -34,17 +34,17 @@ /* 800E5C38 000E2B78 40 82 00 18 */ bne lbl_800E5C50 lbl_800E5C3C: /* 800E5C3C 000E2B7C 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5C40 000E2B80 4B F9 32 7D */ bl dBgS_PolyPassChk_NS_SetBomb +/* 800E5C40 000E2B80 4B F9 32 7D */ bl SetBomb__16dBgS_PolyPassChkFv /* 800E5C44 000E2B84 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C48 000E2B88 4B F9 32 75 */ bl dBgS_PolyPassChk_NS_SetBomb +/* 800E5C48 000E2B88 4B F9 32 75 */ bl SetBomb__16dBgS_PolyPassChkFv /* 800E5C4C 000E2B8C 48 00 00 58 */ b lbl_800E5CA4 lbl_800E5C50: /* 800E5C50 000E2B90 2C 00 01 98 */ cmpwi r0, 0x198 /* 800E5C54 000E2B94 40 82 00 18 */ bne lbl_800E5C6C /* 800E5C58 000E2B98 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5C5C 000E2B9C 4B F9 33 21 */ bl dBgS_PolyPassChk_NS_SetStatue +/* 800E5C5C 000E2B9C 4B F9 33 21 */ bl SetStatue__16dBgS_PolyPassChkFv /* 800E5C60 000E2BA0 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C64 000E2BA4 4B F9 33 19 */ bl dBgS_PolyPassChk_NS_SetStatue +/* 800E5C64 000E2BA4 4B F9 33 19 */ bl SetStatue__16dBgS_PolyPassChkFv /* 800E5C68 000E2BA8 48 00 00 3C */ b lbl_800E5CA4 lbl_800E5C6C: /* 800E5C6C 000E2BAC 2C 00 02 FC */ cmpwi r0, 0x2fc @@ -53,15 +53,15 @@ lbl_800E5C6C: /* 800E5C78 000E2BB8 2C 00 00 03 */ cmpwi r0, 3 /* 800E5C7C 000E2BBC 40 82 00 18 */ bne lbl_800E5C94 /* 800E5C80 000E2BC0 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5C84 000E2BC4 4B F9 32 15 */ bl dBgS_PolyPassChk_NS_SetLink +/* 800E5C84 000E2BC4 4B F9 32 15 */ bl SetLink__16dBgS_PolyPassChkFv /* 800E5C88 000E2BC8 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5C8C 000E2BCC 4B F9 32 0D */ bl dBgS_PolyPassChk_NS_SetLink +/* 800E5C8C 000E2BCC 4B F9 32 0D */ bl SetLink__16dBgS_PolyPassChkFv /* 800E5C90 000E2BD0 48 00 00 14 */ b lbl_800E5CA4 lbl_800E5C94: /* 800E5C94 000E2BD4 38 7E 1E B4 */ addi r3, r30, 0x1eb4 -/* 800E5C98 000E2BD8 4B F9 31 D1 */ bl dBgS_PolyPassChk_NS_SetObj +/* 800E5C98 000E2BD8 4B F9 31 D1 */ bl SetObj__16dBgS_PolyPassChkFv /* 800E5C9C 000E2BDC 38 7E 1F 08 */ addi r3, r30, 0x1f08 -/* 800E5CA0 000E2BE0 4B F9 31 C9 */ bl dBgS_PolyPassChk_NS_SetObj +/* 800E5CA0 000E2BE0 4B F9 31 C9 */ bl SetObj__16dBgS_PolyPassChkFv lbl_800E5CA4: /* 800E5CA4 000E2BE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E5CA8 000E2BE8 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801127F0.s b/include/d/d_a/d_a_alink/asm/func_801127F0.s index 6a041087a74..84e773a5d21 100644 --- a/include/d/d_a/d_a_alink/asm/func_801127F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801127F0.s @@ -92,7 +92,7 @@ lbl_80112918: /* 80112944 0010F884 38 03 00 18 */ addi r0, r3, 0x18 /* 80112948 0010F888 90 1D 00 24 */ stw r0, 0x24(r29) /* 8011294C 0010F88C 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80112950 0010F890 4B F6 65 19 */ bl dBgS_PolyPassChk_NS_SetObj +/* 80112950 0010F890 4B F6 65 19 */ bl SetObj__16dBgS_PolyPassChkFv lbl_80112954: /* 80112954 0010F894 93 BF 07 78 */ stw r29, 0x778(r31) /* 80112958 0010F898 38 60 00 20 */ li r3, 0x20 @@ -244,16 +244,16 @@ lbl_80112A94: /* 80112B88 0010FAC8 90 03 00 2C */ stw r0, 0x2c(r3) /* 80112B8C 0010FACC 80 7F 07 78 */ lwz r3, 0x778(r31) /* 80112B90 0010FAD0 38 63 00 14 */ addi r3, r3, 0x14 -/* 80112B94 0010FAD4 4B F6 62 E1 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 80112B94 0010FAD4 4B F6 62 E1 */ bl ClrObj__16dBgS_PolyPassChkFv /* 80112B98 0010FAD8 80 7F 07 78 */ lwz r3, 0x778(r31) /* 80112B9C 0010FADC 38 63 00 14 */ addi r3, r3, 0x14 -/* 80112BA0 0010FAE0 4B F6 63 F5 */ bl dBgS_PolyPassChk_NS_SetIronBall +/* 80112BA0 0010FAE0 4B F6 63 F5 */ bl SetIronBall__16dBgS_PolyPassChkFv /* 80112BA4 0010FAE4 80 7F 07 80 */ lwz r3, 0x780(r31) /* 80112BA8 0010FAE8 38 63 00 58 */ addi r3, r3, 0x58 -/* 80112BAC 0010FAEC 4B F6 62 C9 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 80112BAC 0010FAEC 4B F6 62 C9 */ bl ClrObj__16dBgS_PolyPassChkFv /* 80112BB0 0010FAF0 80 7F 07 80 */ lwz r3, 0x780(r31) /* 80112BB4 0010FAF4 38 63 00 58 */ addi r3, r3, 0x58 -/* 80112BB8 0010FAF8 4B F6 63 DD */ bl dBgS_PolyPassChk_NS_SetIronBall +/* 80112BB8 0010FAF8 4B F6 63 DD */ bl SetIronBall__16dBgS_PolyPassChkFv /* 80112BBC 0010FAFC 38 00 00 00 */ li r0, 0 /* 80112BC0 0010FB00 90 1F 32 D4 */ stw r0, 0x32d4(r31) /* 80112BC4 0010FB04 80 7F 07 6C */ lwz r3, 0x76c(r31) diff --git a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h index 224cecc402c..75825ee2cc7 100644 --- a/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h +++ b/include/d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h @@ -3,6 +3,52 @@ #include "dolphin/types.h" +class cBgS_PolyPassChk { +public: + virtual ~cBgS_PolyPassChk() {} +}; + +class dBgS_PolyPassChk : public cBgS_PolyPassChk { +public: + dBgS_PolyPassChk(); + ~dBgS_PolyPassChk(); + + bool ChkNoHorse(); + + void ClrBomb(); + void ClrCam(); + void ClrIronBall(); + void ClrLink(); + void ClrObj(); + void ClrStatue(); + + void SetArrow(); + void SetBomb(); + void SetBoomerang(); + void SetCam(); + void SetHorse(); + void SetIronBall(); + void SetLink(); + void SetObj(); + void SetPassChkInfo(dBgS_PolyPassChk& chk); + void SetRope(); + void SetStatue(); + void SetUnderwaterRoof(); + +private: + bool mObject; + bool mCamera; + bool mLink; + bool mArrow; + bool mBomb; + bool mBoomerang; + bool mRope; + bool mUnderwaterRoof; + bool mHorse; + bool mStatue; + bool mIronBall; +}; + // Additional symbols needed for d_bg_s_poly_pass_chk.cpp // autogenerated by split.py v0.3 at 2021-01-22 10:32:31.026275 extern u8 lbl_803ABA38; @@ -11,31 +57,31 @@ extern u8 lbl_803ABA44; // Additional symbols needed for d_bg_s_poly_pass_chk.cpp // autogenerated by split.py v0.3 at 2021-01-22 10:32:31.090542 extern "C" { -void dBgS_PolyPassChk(void); -void dBgS_PolyPassChk_NS_dtor(void); +void __ct__16dBgS_PolyPassChkFv(void); +void __dt__16dBgS_PolyPassChkFv(void); -void dBgS_PolyPassChk_NS_ChkNoHorse(void); +void ChkNoHorse__16dBgS_PolyPassChkFv(void); -void dBgS_PolyPassChk_NS_ClrBomb(void); -void dBgS_PolyPassChk_NS_ClrCam(void); -void dBgS_PolyPassChk_NS_ClrLink(void); -void dBgS_PolyPassChk_NS_ClrObj(void); -void dBgS_PolyPassChk_NS_ClrStatue(void); +void ClrBomb__16dBgS_PolyPassChkFv(void); +void ClrCam__16dBgS_PolyPassChkFv(void); +void ClrLink__16dBgS_PolyPassChkFv(void); +void ClrObj__16dBgS_PolyPassChkFv(void); +void ClrStatue__16dBgS_PolyPassChkFv(void); -void dBgS_PolyPassChk_NS_SetArrow(void); -void dBgS_PolyPassChk_NS_SetBomb(void); -void dBgS_PolyPassChk_NS_SetBoomerang(void); -void dBgS_PolyPassChk_NS_SetCam(void); -void dBgS_PolyPassChk_NS_SetHorse(void); -void dBgS_PolyPassChk_NS_SetIronBall(void); -void dBgS_PolyPassChk_NS_SetLink(void); -void dBgS_PolyPassChk_NS_SetObj(void); -void dBgS_PolyPassChk_NS_SetPassChkInfo(void); -void dBgS_PolyPassChk_NS_SetRope(void); -void dBgS_PolyPassChk_NS_SetStatue(void); -void dBgS_PolyPassChk_NS_SetUnderwaterRoof(void); +void SetArrow__16dBgS_PolyPassChkFv(void); +void SetBomb__16dBgS_PolyPassChkFv(void); +void SetBoomerang__16dBgS_PolyPassChkFv(void); +void SetCam__16dBgS_PolyPassChkFv(void); +void SetHorse__16dBgS_PolyPassChkFv(void); +void SetIronBall__16dBgS_PolyPassChkFv(void); +void SetLink__16dBgS_PolyPassChkFv(void); +void SetObj__16dBgS_PolyPassChkFv(void); +void SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk(void); +void SetRope__16dBgS_PolyPassChkFv(void); +void SetStatue__16dBgS_PolyPassChkFv(void); +void SetUnderwaterRoof__16dBgS_PolyPassChkFv(void); -void func_80078FA0(void); +void ClrIronBall__16dBgS_PolyPassChkFv(void); void func_80078FAC(void); } diff --git a/include/d/d_camera/asm/func_8016008C.s b/include/d/d_camera/asm/func_8016008C.s index 6cb0fd300af..34fd884d07b 100644 --- a/include/d/d_camera/asm/func_8016008C.s +++ b/include/d/d_camera/asm/func_8016008C.s @@ -41,7 +41,7 @@ /* 8016011C 0015D05C 3B 63 00 24 */ addi r27, r3, 0x24 /* 80160120 0015D060 93 7A 00 4C */ stw r27, 0x4c(r26) /* 80160124 0015D064 38 7A 00 3C */ addi r3, r26, 0x3c -/* 80160128 0015D068 4B F1 8D 59 */ bl dBgS_PolyPassChk_NS_SetCam +/* 80160128 0015D068 4B F1 8D 59 */ bl SetCam__16dBgS_PolyPassChkFv /* 8016012C 0015D06C 3B 5E 03 2C */ addi r26, r30, 0x32c /* 80160130 0015D070 7F 43 D3 78 */ mr r3, r26 /* 80160134 0015D074 4B F1 74 49 */ bl dBgS_GndChk @@ -52,7 +52,7 @@ /* 80160148 0015D088 93 BA 00 3C */ stw r29, 0x3c(r26) /* 8016014C 0015D08C 93 7A 00 4C */ stw r27, 0x4c(r26) /* 80160150 0015D090 38 7A 00 3C */ addi r3, r26, 0x3c -/* 80160154 0015D094 4B F1 8D 2D */ bl dBgS_PolyPassChk_NS_SetCam +/* 80160154 0015D094 4B F1 8D 2D */ bl SetCam__16dBgS_PolyPassChkFv /* 80160158 0015D098 3C 60 80 3C */ lis r3, lbl_803BA7EC@ha /* 8016015C 0015D09C 38 03 A7 EC */ addi r0, r3, lbl_803BA7EC@l /* 80160160 0015D0A0 90 1E 06 08 */ stw r0, 0x608(r30) diff --git a/include/d/d_camera/asm/func_801658C0.s b/include/d/d_camera/asm/func_801658C0.s index e84ce07fa1f..5243999ade0 100644 --- a/include/d/d_camera/asm/func_801658C0.s +++ b/include/d/d_camera/asm/func_801658C0.s @@ -10,15 +10,15 @@ /* 801658E4 00162824 54 E0 04 21 */ rlwinm. r0, r7, 0, 0x10, 0x10 /* 801658E8 00162828 41 82 00 18 */ beq lbl_80165900 /* 801658EC 0016282C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 801658F0 00162830 4B F1 35 9D */ bl dBgS_PolyPassChk_NS_ClrCam +/* 801658F0 00162830 4B F1 35 9D */ bl ClrCam__16dBgS_PolyPassChkFv /* 801658F4 00162834 38 7F 00 58 */ addi r3, r31, 0x58 -/* 801658F8 00162838 4B F1 35 71 */ bl dBgS_PolyPassChk_NS_SetObj +/* 801658F8 00162838 4B F1 35 71 */ bl SetObj__16dBgS_PolyPassChkFv /* 801658FC 0016283C 48 00 00 14 */ b lbl_80165910 lbl_80165900: /* 80165900 00162840 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80165904 00162844 4B F1 35 71 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 80165904 00162844 4B F1 35 71 */ bl ClrObj__16dBgS_PolyPassChkFv /* 80165908 00162848 38 7F 00 58 */ addi r3, r31, 0x58 -/* 8016590C 0016284C 4B F1 35 75 */ bl dBgS_PolyPassChk_NS_SetCam +/* 8016590C 0016284C 4B F1 35 75 */ bl SetCam__16dBgS_PolyPassChkFv lbl_80165910: /* 80165910 00162850 7F E3 FB 78 */ mr r3, r31 /* 80165914 00162854 7F 84 E3 78 */ mr r4, r28 diff --git a/include/d/d_camera/asm/func_80165CE0.s b/include/d/d_camera/asm/func_80165CE0.s index e300a27b21d..4aae3500b9c 100644 --- a/include/d/d_camera/asm/func_80165CE0.s +++ b/include/d/d_camera/asm/func_80165CE0.s @@ -24,7 +24,7 @@ /* 80165D3C 00162C7C 3B 23 00 30 */ addi r25, r3, 0x30 /* 80165D40 00162C80 93 21 00 7C */ stw r25, 0x7c(r1) /* 80165D44 00162C84 38 7E 00 38 */ addi r3, r30, 0x38 -/* 80165D48 00162C88 4B F1 31 39 */ bl dBgS_PolyPassChk_NS_SetCam +/* 80165D48 00162C88 4B F1 31 39 */ bl SetCam__16dBgS_PolyPassChkFv /* 80165D4C 00162C8C 93 A1 00 14 */ stw r29, 0x14(r1) /* 80165D50 00162C90 93 01 00 1C */ stw r24, 0x1c(r1) /* 80165D54 00162C94 C0 1D 00 00 */ lfs f0, 0(r29) diff --git a/include/d/d_camera/asm/func_80167EF4.s b/include/d/d_camera/asm/func_80167EF4.s index de174087dae..bdf70a4ffb1 100644 --- a/include/d/d_camera/asm/func_80167EF4.s +++ b/include/d/d_camera/asm/func_80167EF4.s @@ -16,7 +16,7 @@ /* 80167F30 00164E70 38 61 00 68 */ addi r3, r1, 0x68 /* 80167F34 00164E74 4B F1 10 C1 */ bl dBgS_RoofChk /* 80167F38 00164E78 38 61 00 8C */ addi r3, r1, 0x8c -/* 80167F3C 00164E7C 4B F1 0F B1 */ bl dBgS_PolyPassChk_NS_SetUnderwaterRoof +/* 80167F3C 00164E7C 4B F1 0F B1 */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 80167F40 00164E80 C0 01 00 08 */ lfs f0, 8(r1) /* 80167F44 00164E84 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80167F48 00164E88 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80167FEC.s b/include/d/d_camera/asm/func_80167FEC.s index a8bb4cff41a..06de8e46d82 100644 --- a/include/d/d_camera/asm/func_80167FEC.s +++ b/include/d/d_camera/asm/func_80167FEC.s @@ -55,7 +55,7 @@ lbl_80168098: /* 801680C0 00165000 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801680C4 00165004 4B F1 0F 31 */ bl dBgS_RoofChk /* 801680C8 00165008 38 61 01 04 */ addi r3, r1, 0x104 -/* 801680CC 0016500C 4B F1 0E 21 */ bl dBgS_PolyPassChk_NS_SetUnderwaterRoof +/* 801680CC 0016500C 4B F1 0E 21 */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 801680D0 00165010 C0 01 00 74 */ lfs f0, 0x74(r1) /* 801680D4 00165014 D0 01 01 1C */ stfs f0, 0x11c(r1) /* 801680D8 00165018 C0 01 00 78 */ lfs f0, 0x78(r1) @@ -86,12 +86,12 @@ lbl_80168110: /* 80168138 00165078 38 03 00 24 */ addi r0, r3, 0x24 /* 8016813C 0016507C 90 01 00 D8 */ stw r0, 0xd8(r1) /* 80168140 00165080 38 7B 00 3C */ addi r3, r27, 0x3c -/* 80168144 00165084 4B F1 0D 3D */ bl dBgS_PolyPassChk_NS_SetCam +/* 80168144 00165084 4B F1 0D 3D */ bl SetCam__16dBgS_PolyPassChkFv /* 80168148 00165088 3B 61 00 C8 */ addi r27, r1, 0xc8 /* 8016814C 0016508C 7F 63 DB 78 */ mr r3, r27 -/* 80168150 00165090 4B F1 0D 3D */ bl dBgS_PolyPassChk_NS_ClrCam +/* 80168150 00165090 4B F1 0D 3D */ bl ClrCam__16dBgS_PolyPassChkFv /* 80168154 00165094 7F 63 DB 78 */ mr r3, r27 -/* 80168158 00165098 4B F1 0D 11 */ bl dBgS_PolyPassChk_NS_SetObj +/* 80168158 00165098 4B F1 0D 11 */ bl SetObj__16dBgS_PolyPassChkFv /* 8016815C 0016509C 38 61 00 8C */ addi r3, r1, 0x8c /* 80168160 001650A0 38 81 00 80 */ addi r4, r1, 0x80 /* 80168164 001650A4 48 0F FB C5 */ bl SetPos__11cBgS_GndChkFPC4cXyz @@ -100,9 +100,9 @@ lbl_80168110: /* 80168170 001650B0 4B F0 C3 31 */ bl cBgS_NS_GroundCross /* 80168174 001650B4 FF E0 08 90 */ fmr f31, f1 /* 80168178 001650B8 38 7C 03 68 */ addi r3, r28, 0x368 -/* 8016817C 001650BC 4B F1 0D 05 */ bl dBgS_PolyPassChk_NS_SetCam +/* 8016817C 001650BC 4B F1 0D 05 */ bl SetCam__16dBgS_PolyPassChkFv /* 80168180 001650C0 38 7C 03 68 */ addi r3, r28, 0x368 -/* 80168184 001650C4 4B F1 0C F1 */ bl dBgS_PolyPassChk_NS_ClrObj +/* 80168184 001650C4 4B F1 0C F1 */ bl ClrObj__16dBgS_PolyPassChkFv /* 80168188 001650C8 38 7C 03 2C */ addi r3, r28, 0x32c /* 8016818C 001650CC 38 81 00 80 */ addi r4, r1, 0x80 /* 80168190 001650D0 48 0F FB 99 */ bl SetPos__11cBgS_GndChkFPC4cXyz diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s index 8fa4bdd9b08..e0fa7a45b47 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s @@ -20,7 +20,7 @@ /* 8005CE1C 00059D5C 38 03 00 24 */ addi r0, r3, 0x24 /* 8005CE20 00059D60 90 01 00 B0 */ stw r0, 0xb0(r1) /* 8005CE24 00059D64 38 7D 00 3C */ addi r3, r29, 0x3c -/* 8005CE28 00059D68 48 01 C0 41 */ bl dBgS_PolyPassChk_NS_SetObj +/* 8005CE28 00059D68 48 01 C0 41 */ bl SetObj__16dBgS_PolyPassChkFv /* 8005CE2C 00059D6C 3C 60 80 3B */ lis r3, lbl_803AB6E8@ha /* 8005CE30 00059D70 38 63 B6 E8 */ addi r3, r3, lbl_803AB6E8@l /* 8005CE34 00059D74 90 61 00 74 */ stw r3, 0x74(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s index c80bf34d7a5..6023b375edd 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s @@ -24,7 +24,7 @@ /* 8005CFD4 00059F14 38 03 00 24 */ addi r0, r3, 0x24 /* 8005CFD8 00059F18 90 01 00 BC */ stw r0, 0xbc(r1) /* 8005CFDC 00059F1C 38 7C 00 3C */ addi r3, r28, 0x3c -/* 8005CFE0 00059F20 48 01 BE 89 */ bl dBgS_PolyPassChk_NS_SetObj +/* 8005CFE0 00059F20 48 01 BE 89 */ bl SetObj__16dBgS_PolyPassChkFv /* 8005CFE4 00059F24 3C 60 80 3B */ lis r3, lbl_803AB6E8@ha /* 8005CFE8 00059F28 38 63 B6 E8 */ addi r3, r3, lbl_803AB6E8@l /* 8005CFEC 00059F2C 90 61 00 80 */ stw r3, 0x80(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s index 7b0ea7941e4..23f449b0898 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s @@ -65,7 +65,7 @@ /* 8005FE48 0005CD88 38 03 00 24 */ addi r0, r3, 0x24 /* 8005FE4C 0005CD8C 90 01 01 2C */ stw r0, 0x12c(r1) /* 8005FE50 0005CD90 38 75 00 3C */ addi r3, r21, 0x3c -/* 8005FE54 0005CD94 48 01 90 15 */ bl dBgS_PolyPassChk_NS_SetObj +/* 8005FE54 0005CD94 48 01 90 15 */ bl SetObj__16dBgS_PolyPassChkFv /* 8005FE58 0005CD98 3C 60 80 3B */ lis r3, lbl_803AB6E8@ha /* 8005FE5C 0005CD9C 38 63 B6 E8 */ addi r3, r3, lbl_803AB6E8@l /* 8005FE60 0005CDA0 90 61 00 F0 */ stw r3, 0xf0(r1) diff --git a/ldscript.lcf b/ldscript.lcf index 4eb110b36f3..3dfae138eb0 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3139,7 +3139,7 @@ func_8002CAF0 __ct__14JAISoundHandleFv dispose__14Z2SoundObjBaseFv func_80078FAC -func_80078FA0 +ClrIronBall__16dBgS_PolyPassChkFv } /* .init 80003100 - 80005600 diff --git a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp index da1b57b5080..990a5d612af 100644 --- a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp +++ b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp @@ -3,159 +3,158 @@ #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h" #include "global.h" -extern "C" { // __ct__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::dBgS_PolyPassChk(void) -asm void dBgS_PolyPassChk(void) { +asm dBgS_PolyPassChk::dBgS_PolyPassChk() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078D64.s" } // __dt__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::~dBgS_PolyPassChk(void) -asm void dBgS_PolyPassChk_NS_dtor(void) { +asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s" } // SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk // dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk&) -asm void dBgS_PolyPassChk_NS_SetPassChkInfo(void) { +asm void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk&) { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s" } // SetObj__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetObj(void) -asm void dBgS_PolyPassChk_NS_SetObj(void) { +asm void dBgS_PolyPassChk::SetObj() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E68.s" } // ClrObj__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrObj(void) -asm void dBgS_PolyPassChk_NS_ClrObj(void) { +asm void dBgS_PolyPassChk::ClrObj() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E74.s" } // SetCam__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetCam(void) -asm void dBgS_PolyPassChk_NS_SetCam(void) { +asm void dBgS_PolyPassChk::SetCam() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E80.s" } // ClrCam__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrCam(void) -asm void dBgS_PolyPassChk_NS_ClrCam(void) { +asm void dBgS_PolyPassChk::ClrCam() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s" } // SetLink__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetLink(void) -asm void dBgS_PolyPassChk_NS_SetLink(void) { +asm void dBgS_PolyPassChk::SetLink() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078E98.s" } // ClrLink__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrLink(void) -asm void dBgS_PolyPassChk_NS_ClrLink(void) { +asm void dBgS_PolyPassChk::ClrLink() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s" } // SetArrow__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetArrow(void) -asm void dBgS_PolyPassChk_NS_SetArrow(void) { +asm void dBgS_PolyPassChk::SetArrow() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s" } // SetBomb__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetBomb(void) -asm void dBgS_PolyPassChk_NS_SetBomb(void) { +asm void dBgS_PolyPassChk::SetBomb() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s" } // ClrBomb__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrBomb(void) -asm void dBgS_PolyPassChk_NS_ClrBomb(void) { +asm void dBgS_PolyPassChk::ClrBomb() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s" } // SetBoomerang__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetBoomerang(void) -asm void dBgS_PolyPassChk_NS_SetBoomerang(void) { +asm void dBgS_PolyPassChk::SetBoomerang() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s" } // SetRope__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetRope(void) -asm void dBgS_PolyPassChk_NS_SetRope(void) { +asm void dBgS_PolyPassChk::SetRope() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s" } // SetUnderwaterRoof__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetUnderwaterRoof(void) -asm void dBgS_PolyPassChk_NS_SetUnderwaterRoof(void) { +asm void dBgS_PolyPassChk::SetUnderwaterRoof() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s" } // SetHorse__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetHorse(void) -asm void dBgS_PolyPassChk_NS_SetHorse(void) { +asm void dBgS_PolyPassChk::SetHorse() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s" } // ChkNoHorse__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ChkNoHorse(void) -asm void dBgS_PolyPassChk_NS_ChkNoHorse(void) { +asm bool dBgS_PolyPassChk::ChkNoHorse() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078F04.s" } // SetStatue__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetStatue(void) -asm void dBgS_PolyPassChk_NS_SetStatue(void) { +asm void dBgS_PolyPassChk::SetStatue() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s" } // ClrStatue__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrStatue(void) -asm void dBgS_PolyPassChk_NS_ClrStatue(void) { +asm void dBgS_PolyPassChk::ClrStatue() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078F88.s" } // SetIronBall__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::SetIronBall(void) -asm void dBgS_PolyPassChk_NS_SetIronBall(void) { +asm void dBgS_PolyPassChk::SetIronBall() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078F94.s" } // ClrIronBall__16dBgS_PolyPassChkFv // dBgS_PolyPassChk::ClrIronBall(void) -asm void func_80078FA0(void) { +asm void dBgS_PolyPassChk::ClrIronBall() { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s" } +extern "C" { // __dt__16cBgS_PolyPassChkFv // cBgS_PolyPassChk::~cBgS_PolyPassChk(void) asm void func_80078FAC(void) { nofralloc #include "d/d_bg/d_bg_s/polypass/asm/func_80078FAC.s" } - };