diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-10-08 01:32:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 15:32:29 -0700 |
| commit | 1f3948e40ef095bb758914cce6fc652091cf4f4a (patch) | |
| tree | a7d2c024e62d8824b13d20c6d4bebea57f2205b9 | |
| parent | 24b6124609b03acc800b2b8231567f13b3f0b0c8 (diff) | |
d_map_path_dmap OK (#2201)
* d_map_path_dmap work
* d_map_path_dmap OK
* Probable inheritance for dalv4CandleDemoTag_c
* daObjFuta_c OK
* daObjHHASHI_c OK
62 files changed, 753 insertions, 5547 deletions
diff --git a/asm/d/map/d_map_path_dmap/__sinit_d_map_path_dmap_cpp.s b/asm/d/map/d_map_path_dmap/__sinit_d_map_path_dmap_cpp.s deleted file mode 100644 index 928bab13be..0000000000 --- a/asm/d/map/d_map_path_dmap/__sinit_d_map_path_dmap_cpp.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80041460: -/* 80041460 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 80041464 C0 23 0A E8 */ lfs f1, __float_max@l(r3) /* 0x80450AE8@l */ -/* 80041468 D0 2D 88 E8 */ stfs f1, mMinX__8dMpath_c(r13) -/* 8004146C FC 00 08 50 */ fneg f0, f1 -/* 80041470 D0 0D 88 EC */ stfs f0, mMaxX__8dMpath_c(r13) -/* 80041474 D0 2D 88 F0 */ stfs f1, mMinZ__8dMpath_c(r13) -/* 80041478 D0 0D 88 F4 */ stfs f0, mMaxZ__8dMpath_c(r13) -/* 8004147C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/createWork__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/createWork__8dMpath_cFv.s deleted file mode 100644 index 7809b8a683..0000000000 --- a/asm/d/map/d_map_path_dmap/createWork__8dMpath_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8003F7E8: -/* 8003F7E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003F7EC 7C 08 02 A6 */ mflr r0 -/* 8003F7F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003F7F4 38 60 02 00 */ li r3, 0x200 -/* 8003F7F8 48 28 F4 55 */ bl __nw__FUl -/* 8003F7FC 90 6D 88 E4 */ stw r3, mLayerList__8dMpath_c(r13) -/* 8003F800 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003F804 7C 08 03 A6 */ mtlr r0 -/* 8003F808 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003F80C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv.s b/asm/d/map/d_map_path_dmap/drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv.s deleted file mode 100644 index 8dedf96dd0..0000000000 --- a/asm/d/map/d_map_path_dmap/drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv.s +++ /dev/null @@ -1,235 +0,0 @@ -lbl_80040E84: -/* 80040E84 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80040E88 7C 08 02 A6 */ mflr r0 -/* 80040E8C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80040E90 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80040E94 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80040E98 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80040E9C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80040EA0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040EA4 48 32 13 15 */ bl _savegpr_20 -/* 80040EA8 7C 7F 1B 78 */ mr r31, r3 -/* 80040EAC 81 83 00 00 */ lwz r12, 0(r3) -/* 80040EB0 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 80040EB4 7D 89 03 A6 */ mtctr r12 -/* 80040EB8 4E 80 04 21 */ bctrl -/* 80040EBC 7C 74 1B 78 */ mr r20, r3 -/* 80040EC0 48 31 A6 CD */ bl GXClearVtxDesc -/* 80040EC4 38 60 00 09 */ li r3, 9 -/* 80040EC8 38 80 00 01 */ li r4, 1 -/* 80040ECC 48 31 9F ED */ bl GXSetVtxDesc -/* 80040ED0 38 60 00 0D */ li r3, 0xd -/* 80040ED4 38 80 00 02 */ li r4, 2 -/* 80040ED8 48 31 9F E1 */ bl GXSetVtxDesc -/* 80040EDC 38 60 00 00 */ li r3, 0 -/* 80040EE0 38 80 00 09 */ li r4, 9 -/* 80040EE4 38 A0 00 00 */ li r5, 0 -/* 80040EE8 38 C0 00 04 */ li r6, 4 -/* 80040EEC 38 E0 00 00 */ li r7, 0 -/* 80040EF0 48 31 A6 D5 */ bl GXSetVtxAttrFmt -/* 80040EF4 38 60 00 00 */ li r3, 0 -/* 80040EF8 38 80 00 0D */ li r4, 0xd -/* 80040EFC 38 A0 00 01 */ li r5, 1 -/* 80040F00 38 C0 00 00 */ li r6, 0 -/* 80040F04 38 E0 00 00 */ li r7, 0 -/* 80040F08 48 31 A6 BD */ bl GXSetVtxAttrFmt -/* 80040F0C 38 60 00 0D */ li r3, 0xd -/* 80040F10 38 82 84 AC */ la r4, l_iconTex0_4605(r2) /* 80451EAC-_SDA2_BASE_ */ -/* 80040F14 38 A0 00 02 */ li r5, 2 -/* 80040F18 48 31 AC 11 */ bl GXSetArray -/* 80040F1C 7F E3 FB 78 */ mr r3, r31 -/* 80040F20 4B FF C0 21 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv -/* 80040F24 3A E0 00 00 */ li r23, 0 -/* 80040F28 3B C0 00 00 */ li r30, 0 -/* 80040F2C 3B 42 84 B4 */ la r26, tboxNotStayColor_4624(r2) /* 80451EB4-_SDA2_BASE_ */ -/* 80040F30 3B 22 84 7C */ la r25, l_treasureStartColor(r2) /* 80451E7C-_SDA2_BASE_ */ -/* 80040F34 56 98 06 3E */ clrlwi r24, r20, 0x18 -/* 80040F38 3C 60 80 38 */ lis r3, l_treasureDispList_4606@ha /* 0x80379CB8@ha */ -/* 80040F3C 3B 63 9C B8 */ addi r27, r3, l_treasureDispList_4606@l /* 0x80379CB8@l */ -lbl_80040F40: -/* 80040F40 7F BB F2 14 */ add r29, r27, r30 -/* 80040F44 88 9D 00 00 */ lbz r4, 0(r29) -/* 80040F48 7C 95 23 78 */ mr r21, r4 -/* 80040F4C 7F E3 FB 78 */ mr r3, r31 -/* 80040F50 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040F54 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 80040F58 7D 89 03 A6 */ mtctr r12 -/* 80040F5C 4E 80 04 21 */ bctrl -/* 80040F60 7C 76 1B 78 */ mr r22, r3 -/* 80040F64 7F E3 FB 78 */ mr r3, r31 -/* 80040F68 7E A4 AB 78 */ mr r4, r21 -/* 80040F6C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040F70 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 80040F74 7D 89 03 A6 */ mtctr r12 -/* 80040F78 4E 80 04 21 */ bctrl -/* 80040F7C 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80040F80 41 82 02 48 */ beq lbl_800411C8 -/* 80040F84 7F E3 FB 78 */ mr r3, r31 -/* 80040F88 7E A4 AB 78 */ mr r4, r21 -/* 80040F8C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040F90 81 8C 00 A4 */ lwz r12, 0xa4(r12) -/* 80040F94 7D 89 03 A6 */ mtctr r12 -/* 80040F98 4E 80 04 21 */ bctrl -/* 80040F9C C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80040FA0 EF C0 00 72 */ fmuls f30, f0, f1 -/* 80040FA4 48 31 D6 C1 */ bl GXInvalidateTexAll -/* 80040FA8 80 1D 00 04 */ lwz r0, 4(r29) -/* 80040FAC 54 00 10 3A */ slwi r0, r0, 2 -/* 80040FB0 3C 60 80 42 */ lis r3, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */ -/* 80040FB4 38 63 46 84 */ addi r3, r3, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */ -/* 80040FB8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80040FBC 38 80 00 00 */ li r4, 0 -/* 80040FC0 48 31 D4 55 */ bl GXLoadTexObj -/* 80040FC4 80 7D 00 08 */ lwz r3, 8(r29) -/* 80040FC8 88 03 00 00 */ lbz r0, 0(r3) -/* 80040FCC 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040FD0 88 03 00 01 */ lbz r0, 1(r3) -/* 80040FD4 98 01 00 19 */ stb r0, 0x19(r1) -/* 80040FD8 88 03 00 02 */ lbz r0, 2(r3) -/* 80040FDC 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80040FE0 88 03 00 03 */ lbz r0, 3(r3) -/* 80040FE4 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80040FE8 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80040FEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80040FF0 38 60 00 02 */ li r3, 2 -/* 80040FF4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80040FF8 48 31 E3 85 */ bl GXSetTevColor -/* 80040FFC 88 61 00 18 */ lbz r3, 0x18(r1) -/* 80041000 38 03 00 04 */ addi r0, r3, 4 -/* 80041004 98 01 00 18 */ stb r0, 0x18(r1) -/* 80041008 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8004100C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80041010 38 60 00 03 */ li r3, 3 -/* 80041014 38 81 00 10 */ addi r4, r1, 0x10 -/* 80041018 48 31 E3 65 */ bl GXSetTevColor -/* 8004101C 3A 80 00 00 */ li r20, 0 -/* 80041020 56 BD 06 3E */ clrlwi r29, r21, 0x18 -/* 80041024 C3 E2 84 A8 */ lfs f31, lit_4600(r2) -/* 80041028 48 00 01 90 */ b lbl_800411B8 -lbl_8004102C: -/* 8004102C 7F E3 FB 78 */ mr r3, r31 -/* 80041030 7E C4 B3 78 */ mr r4, r22 -/* 80041034 81 9F 00 00 */ lwz r12, 0(r31) -/* 80041038 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8004103C 7D 89 03 A6 */ mtctr r12 -/* 80041040 4E 80 04 21 */ bctrl -/* 80041044 7C 75 1B 78 */ mr r21, r3 -/* 80041048 28 1D 00 00 */ cmplwi r29, 0 -/* 8004104C 40 82 00 90 */ bne lbl_800410DC -/* 80041050 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80041054 88 16 00 01 */ lbz r0, 1(r22) -/* 80041058 7C 00 07 74 */ extsb r0, r0 -/* 8004105C 7C 03 00 00 */ cmpw r3, r0 -/* 80041060 41 82 00 28 */ beq lbl_80041088 -/* 80041064 88 02 84 B4 */ lbz r0, tboxNotStayColor_4624(r2) -/* 80041068 98 01 00 18 */ stb r0, 0x18(r1) -/* 8004106C 88 1A 00 01 */ lbz r0, 1(r26) -/* 80041070 98 01 00 19 */ stb r0, 0x19(r1) -/* 80041074 88 1A 00 02 */ lbz r0, 2(r26) -/* 80041078 98 01 00 1A */ stb r0, 0x1a(r1) -/* 8004107C 88 1A 00 03 */ lbz r0, 3(r26) -/* 80041080 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80041084 48 00 00 24 */ b lbl_800410A8 -lbl_80041088: -/* 80041088 88 02 84 7C */ lbz r0, l_treasureStartColor(r2) -/* 8004108C 98 01 00 18 */ stb r0, 0x18(r1) -/* 80041090 88 19 00 01 */ lbz r0, 1(r25) -/* 80041094 98 01 00 19 */ stb r0, 0x19(r1) -/* 80041098 88 19 00 02 */ lbz r0, 2(r25) -/* 8004109C 98 01 00 1A */ stb r0, 0x1a(r1) -/* 800410A0 88 19 00 03 */ lbz r0, 3(r25) -/* 800410A4 98 01 00 1B */ stb r0, 0x1b(r1) -lbl_800410A8: -/* 800410A8 80 01 00 18 */ lwz r0, 0x18(r1) -/* 800410AC 90 01 00 0C */ stw r0, 0xc(r1) -/* 800410B0 38 60 00 02 */ li r3, 2 -/* 800410B4 38 81 00 0C */ addi r4, r1, 0xc -/* 800410B8 48 31 E2 C5 */ bl GXSetTevColor -/* 800410BC 88 61 00 18 */ lbz r3, 0x18(r1) -/* 800410C0 38 03 00 04 */ addi r0, r3, 4 -/* 800410C4 98 01 00 18 */ stb r0, 0x18(r1) -/* 800410C8 80 01 00 18 */ lwz r0, 0x18(r1) -/* 800410CC 90 01 00 08 */ stw r0, 8(r1) -/* 800410D0 38 60 00 03 */ li r3, 3 -/* 800410D4 38 81 00 08 */ addi r4, r1, 8 -/* 800410D8 48 31 E2 A5 */ bl GXSetTevColor -lbl_800410DC: -/* 800410DC 38 00 00 00 */ li r0, 0 -/* 800410E0 C0 75 00 00 */ lfs f3, 0(r21) -/* 800410E4 C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 800410E8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 800410EC EC 3F 00 32 */ fmuls f1, f31, f0 -/* 800410F0 EC 02 08 28 */ fsubs f0, f2, f1 -/* 800410F4 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 800410F8 4C 41 13 82 */ cror 2, 1, 2 -/* 800410FC 40 82 00 48 */ bne lbl_80041144 -/* 80041100 EC 02 08 2A */ fadds f0, f2, f1 -/* 80041104 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80041108 4C 40 13 82 */ cror 2, 0, 2 -/* 8004110C 40 82 00 38 */ bne lbl_80041144 -/* 80041110 C0 75 00 08 */ lfs f3, 8(r21) -/* 80041114 C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 80041118 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8004111C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80041120 EC 02 08 28 */ fsubs f0, f2, f1 -/* 80041124 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80041128 4C 41 13 82 */ cror 2, 1, 2 -/* 8004112C 40 82 00 18 */ bne lbl_80041144 -/* 80041130 EC 02 08 2A */ fadds f0, f2, f1 -/* 80041134 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80041138 4C 40 13 82 */ cror 2, 0, 2 -/* 8004113C 40 82 00 08 */ bne lbl_80041144 -/* 80041140 38 00 00 01 */ li r0, 1 -lbl_80041144: -/* 80041144 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80041148 41 82 00 50 */ beq lbl_80041198 -/* 8004114C 7F E3 FB 78 */ mr r3, r31 -/* 80041150 7E C4 B3 78 */ mr r4, r22 -/* 80041154 80 BF 00 2C */ lwz r5, 0x2c(r31) -/* 80041158 88 DF 00 30 */ lbz r6, 0x30(r31) -/* 8004115C 7C C6 07 74 */ extsb r6, r6 -/* 80041160 7F 07 C3 78 */ mr r7, r24 -/* 80041164 39 00 00 01 */ li r8, 1 -/* 80041168 7E A9 AB 78 */ mr r9, r21 -/* 8004116C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80041170 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80041174 7D 89 03 A6 */ mtctr r12 -/* 80041178 4E 80 04 21 */ bctrl -/* 8004117C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80041180 41 82 00 18 */ beq lbl_80041198 -/* 80041184 7F E3 FB 78 */ mr r3, r31 -/* 80041188 7E A4 AB 78 */ mr r4, r21 -/* 8004118C FC 20 F0 90 */ fmr f1, f30 -/* 80041190 FC 40 F0 90 */ fmr f2, f30 -/* 80041194 48 00 00 75 */ bl drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff -lbl_80041198: -/* 80041198 7F E3 FB 78 */ mr r3, r31 -/* 8004119C 7E C4 B3 78 */ mr r4, r22 -/* 800411A0 81 9F 00 00 */ lwz r12, 0(r31) -/* 800411A4 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 800411A8 7D 89 03 A6 */ mtctr r12 -/* 800411AC 4E 80 04 21 */ bctrl -/* 800411B0 7C 76 1B 78 */ mr r22, r3 -/* 800411B4 3A 94 00 01 */ addi r20, r20, 1 -lbl_800411B8: -/* 800411B8 7C 14 E0 00 */ cmpw r20, r28 -/* 800411BC 40 80 00 0C */ bge lbl_800411C8 -/* 800411C0 28 16 00 00 */ cmplwi r22, 0 -/* 800411C4 40 82 FE 68 */ bne lbl_8004102C -lbl_800411C8: -/* 800411C8 3A F7 00 01 */ addi r23, r23, 1 -/* 800411CC 2C 17 00 0B */ cmpwi r23, 0xb -/* 800411D0 3B DE 00 0C */ addi r30, r30, 0xc -/* 800411D4 41 80 FD 6C */ blt lbl_80040F40 -/* 800411D8 7F E3 FB 78 */ mr r3, r31 -/* 800411DC 4B FF BC 9D */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv -/* 800411E0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 800411E4 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 800411E8 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 800411EC CB C1 00 50 */ lfd f30, 0x50(r1) -/* 800411F0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800411F4 48 32 10 11 */ bl _restgpr_20 -/* 800411F8 80 01 00 74 */ lwz r0, 0x74(r1) -/* 800411FC 7C 08 03 A6 */ mtlr r0 -/* 80041200 38 21 00 70 */ addi r1, r1, 0x70 -/* 80041204 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/drawTreasure__28renderingPlusDoorAndCursor_cFv.s b/asm/d/map/d_map_path_dmap/drawTreasure__28renderingPlusDoorAndCursor_cFv.s deleted file mode 100644 index c4d2fd80c5..0000000000 --- a/asm/d/map/d_map_path_dmap/drawTreasure__28renderingPlusDoorAndCursor_cFv.s +++ /dev/null @@ -1,235 +0,0 @@ -lbl_80040B00: -/* 80040B00 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80040B04 7C 08 02 A6 */ mflr r0 -/* 80040B08 90 01 00 74 */ stw r0, 0x74(r1) -/* 80040B0C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80040B10 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80040B14 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80040B18 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80040B1C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040B20 48 32 16 99 */ bl _savegpr_20 -/* 80040B24 7C 7F 1B 78 */ mr r31, r3 -/* 80040B28 81 83 00 00 */ lwz r12, 0(r3) -/* 80040B2C 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 80040B30 7D 89 03 A6 */ mtctr r12 -/* 80040B34 4E 80 04 21 */ bctrl -/* 80040B38 7C 74 1B 78 */ mr r20, r3 -/* 80040B3C 48 31 AA 51 */ bl GXClearVtxDesc -/* 80040B40 38 60 00 09 */ li r3, 9 -/* 80040B44 38 80 00 01 */ li r4, 1 -/* 80040B48 48 31 A3 71 */ bl GXSetVtxDesc -/* 80040B4C 38 60 00 0D */ li r3, 0xd -/* 80040B50 38 80 00 02 */ li r4, 2 -/* 80040B54 48 31 A3 65 */ bl GXSetVtxDesc -/* 80040B58 38 60 00 00 */ li r3, 0 -/* 80040B5C 38 80 00 09 */ li r4, 9 -/* 80040B60 38 A0 00 00 */ li r5, 0 -/* 80040B64 38 C0 00 04 */ li r6, 4 -/* 80040B68 38 E0 00 00 */ li r7, 0 -/* 80040B6C 48 31 AA 59 */ bl GXSetVtxAttrFmt -/* 80040B70 38 60 00 00 */ li r3, 0 -/* 80040B74 38 80 00 0D */ li r4, 0xd -/* 80040B78 38 A0 00 01 */ li r5, 1 -/* 80040B7C 38 C0 00 00 */ li r6, 0 -/* 80040B80 38 E0 00 00 */ li r7, 0 -/* 80040B84 48 31 AA 41 */ bl GXSetVtxAttrFmt -/* 80040B88 38 60 00 0D */ li r3, 0xd -/* 80040B8C 38 82 84 9C */ la r4, l_iconTex0_4523(r2) /* 80451E9C-_SDA2_BASE_ */ -/* 80040B90 38 A0 00 02 */ li r5, 2 -/* 80040B94 48 31 AF 95 */ bl GXSetArray -/* 80040B98 7F E3 FB 78 */ mr r3, r31 -/* 80040B9C 4B FF C3 A5 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv -/* 80040BA0 3A E0 00 00 */ li r23, 0 -/* 80040BA4 3B C0 00 00 */ li r30, 0 -/* 80040BA8 3B 42 84 A4 */ la r26, tboxNotStayColor_4542(r2) /* 80451EA4-_SDA2_BASE_ */ -/* 80040BAC 3B 22 84 7C */ la r25, l_treasureStartColor(r2) /* 80451E7C-_SDA2_BASE_ */ -/* 80040BB0 56 98 06 3E */ clrlwi r24, r20, 0x18 -/* 80040BB4 3C 60 80 38 */ lis r3, l_treasureDispList_4524@ha /* 0x80379C88@ha */ -/* 80040BB8 3B 63 9C 88 */ addi r27, r3, l_treasureDispList_4524@l /* 0x80379C88@l */ -lbl_80040BBC: -/* 80040BBC 7F BB F2 14 */ add r29, r27, r30 -/* 80040BC0 88 9D 00 00 */ lbz r4, 0(r29) -/* 80040BC4 7C 95 23 78 */ mr r21, r4 -/* 80040BC8 7F E3 FB 78 */ mr r3, r31 -/* 80040BCC 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040BD0 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 80040BD4 7D 89 03 A6 */ mtctr r12 -/* 80040BD8 4E 80 04 21 */ bctrl -/* 80040BDC 7C 76 1B 78 */ mr r22, r3 -/* 80040BE0 7F E3 FB 78 */ mr r3, r31 -/* 80040BE4 7E A4 AB 78 */ mr r4, r21 -/* 80040BE8 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040BEC 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 80040BF0 7D 89 03 A6 */ mtctr r12 -/* 80040BF4 4E 80 04 21 */ bctrl -/* 80040BF8 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80040BFC 41 82 02 48 */ beq lbl_80040E44 -/* 80040C00 7F E3 FB 78 */ mr r3, r31 -/* 80040C04 7E A4 AB 78 */ mr r4, r21 -/* 80040C08 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040C0C 81 8C 00 A4 */ lwz r12, 0xa4(r12) -/* 80040C10 7D 89 03 A6 */ mtctr r12 -/* 80040C14 4E 80 04 21 */ bctrl -/* 80040C18 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80040C1C EF C0 00 72 */ fmuls f30, f0, f1 -/* 80040C20 48 31 DA 45 */ bl GXInvalidateTexAll -/* 80040C24 80 1D 00 04 */ lwz r0, 4(r29) -/* 80040C28 54 00 10 3A */ slwi r0, r0, 2 -/* 80040C2C 3C 60 80 42 */ lis r3, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */ -/* 80040C30 38 63 46 84 */ addi r3, r3, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */ -/* 80040C34 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80040C38 38 80 00 00 */ li r4, 0 -/* 80040C3C 48 31 D7 D9 */ bl GXLoadTexObj -/* 80040C40 80 7D 00 08 */ lwz r3, 8(r29) -/* 80040C44 88 03 00 00 */ lbz r0, 0(r3) -/* 80040C48 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040C4C 88 03 00 01 */ lbz r0, 1(r3) -/* 80040C50 98 01 00 19 */ stb r0, 0x19(r1) -/* 80040C54 88 03 00 02 */ lbz r0, 2(r3) -/* 80040C58 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80040C5C 88 03 00 03 */ lbz r0, 3(r3) -/* 80040C60 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80040C64 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80040C68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80040C6C 38 60 00 02 */ li r3, 2 -/* 80040C70 38 81 00 14 */ addi r4, r1, 0x14 -/* 80040C74 48 31 E7 09 */ bl GXSetTevColor -/* 80040C78 88 61 00 18 */ lbz r3, 0x18(r1) -/* 80040C7C 38 03 00 04 */ addi r0, r3, 4 -/* 80040C80 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040C84 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80040C88 90 01 00 10 */ stw r0, 0x10(r1) -/* 80040C8C 38 60 00 03 */ li r3, 3 -/* 80040C90 38 81 00 10 */ addi r4, r1, 0x10 -/* 80040C94 48 31 E6 E9 */ bl GXSetTevColor -/* 80040C98 3A 80 00 00 */ li r20, 0 -/* 80040C9C 56 BD 06 3E */ clrlwi r29, r21, 0x18 -/* 80040CA0 C3 E2 84 A8 */ lfs f31, lit_4600(r2) -/* 80040CA4 48 00 01 90 */ b lbl_80040E34 -lbl_80040CA8: -/* 80040CA8 7F E3 FB 78 */ mr r3, r31 -/* 80040CAC 7E C4 B3 78 */ mr r4, r22 -/* 80040CB0 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040CB4 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80040CB8 7D 89 03 A6 */ mtctr r12 -/* 80040CBC 4E 80 04 21 */ bctrl -/* 80040CC0 7C 75 1B 78 */ mr r21, r3 -/* 80040CC4 28 1D 00 00 */ cmplwi r29, 0 -/* 80040CC8 40 82 00 90 */ bne lbl_80040D58 -/* 80040CCC 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80040CD0 88 16 00 01 */ lbz r0, 1(r22) -/* 80040CD4 7C 00 07 74 */ extsb r0, r0 -/* 80040CD8 7C 03 00 00 */ cmpw r3, r0 -/* 80040CDC 41 82 00 28 */ beq lbl_80040D04 -/* 80040CE0 88 02 84 A4 */ lbz r0, tboxNotStayColor_4542(r2) -/* 80040CE4 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040CE8 88 1A 00 01 */ lbz r0, 1(r26) -/* 80040CEC 98 01 00 19 */ stb r0, 0x19(r1) -/* 80040CF0 88 1A 00 02 */ lbz r0, 2(r26) -/* 80040CF4 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80040CF8 88 1A 00 03 */ lbz r0, 3(r26) -/* 80040CFC 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80040D00 48 00 00 24 */ b lbl_80040D24 -lbl_80040D04: -/* 80040D04 88 02 84 7C */ lbz r0, l_treasureStartColor(r2) -/* 80040D08 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040D0C 88 19 00 01 */ lbz r0, 1(r25) -/* 80040D10 98 01 00 19 */ stb r0, 0x19(r1) -/* 80040D14 88 19 00 02 */ lbz r0, 2(r25) -/* 80040D18 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80040D1C 88 19 00 03 */ lbz r0, 3(r25) -/* 80040D20 98 01 00 1B */ stb r0, 0x1b(r1) -lbl_80040D24: -/* 80040D24 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80040D28 90 01 00 0C */ stw r0, 0xc(r1) -/* 80040D2C 38 60 00 02 */ li r3, 2 -/* 80040D30 38 81 00 0C */ addi r4, r1, 0xc -/* 80040D34 48 31 E6 49 */ bl GXSetTevColor -/* 80040D38 88 61 00 18 */ lbz r3, 0x18(r1) -/* 80040D3C 38 03 00 04 */ addi r0, r3, 4 -/* 80040D40 98 01 00 18 */ stb r0, 0x18(r1) -/* 80040D44 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80040D48 90 01 00 08 */ stw r0, 8(r1) -/* 80040D4C 38 60 00 03 */ li r3, 3 -/* 80040D50 38 81 00 08 */ addi r4, r1, 8 -/* 80040D54 48 31 E6 29 */ bl GXSetTevColor -lbl_80040D58: -/* 80040D58 38 00 00 00 */ li r0, 0 -/* 80040D5C C0 75 00 00 */ lfs f3, 0(r21) -/* 80040D60 C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 80040D64 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80040D68 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80040D6C EC 02 08 28 */ fsubs f0, f2, f1 -/* 80040D70 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80040D74 4C 41 13 82 */ cror 2, 1, 2 -/* 80040D78 40 82 00 48 */ bne lbl_80040DC0 -/* 80040D7C EC 02 08 2A */ fadds f0, f2, f1 -/* 80040D80 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80040D84 4C 40 13 82 */ cror 2, 0, 2 -/* 80040D88 40 82 00 38 */ bne lbl_80040DC0 -/* 80040D8C C0 75 00 08 */ lfs f3, 8(r21) -/* 80040D90 C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 80040D94 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80040D98 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80040D9C EC 02 08 28 */ fsubs f0, f2, f1 -/* 80040DA0 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80040DA4 4C 41 13 82 */ cror 2, 1, 2 -/* 80040DA8 40 82 00 18 */ bne lbl_80040DC0 -/* 80040DAC EC 02 08 2A */ fadds f0, f2, f1 -/* 80040DB0 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80040DB4 4C 40 13 82 */ cror 2, 0, 2 -/* 80040DB8 40 82 00 08 */ bne lbl_80040DC0 -/* 80040DBC 38 00 00 01 */ li r0, 1 -lbl_80040DC0: -/* 80040DC0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80040DC4 41 82 00 50 */ beq lbl_80040E14 -/* 80040DC8 7F E3 FB 78 */ mr r3, r31 -/* 80040DCC 7E C4 B3 78 */ mr r4, r22 -/* 80040DD0 80 BF 00 2C */ lwz r5, 0x2c(r31) -/* 80040DD4 88 DF 00 30 */ lbz r6, 0x30(r31) -/* 80040DD8 7C C6 07 74 */ extsb r6, r6 -/* 80040DDC 7F 07 C3 78 */ mr r7, r24 -/* 80040DE0 39 00 00 01 */ li r8, 1 -/* 80040DE4 7E A9 AB 78 */ mr r9, r21 -/* 80040DE8 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040DEC 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80040DF0 7D 89 03 A6 */ mtctr r12 -/* 80040DF4 4E 80 04 21 */ bctrl -/* 80040DF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80040DFC 41 82 00 18 */ beq lbl_80040E14 -/* 80040E00 7F E3 FB 78 */ mr r3, r31 -/* 80040E04 7E A4 AB 78 */ mr r4, r21 -/* 80040E08 FC 20 F0 90 */ fmr f1, f30 -/* 80040E0C FC 40 F0 90 */ fmr f2, f30 -/* 80040E10 48 00 03 F9 */ bl drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff -lbl_80040E14: -/* 80040E14 7F E3 FB 78 */ mr r3, r31 -/* 80040E18 7E C4 B3 78 */ mr r4, r22 -/* 80040E1C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80040E20 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 80040E24 7D 89 03 A6 */ mtctr r12 -/* 80040E28 4E 80 04 21 */ bctrl -/* 80040E2C 7C 76 1B 78 */ mr r22, r3 -/* 80040E30 3A 94 00 01 */ addi r20, r20, 1 -lbl_80040E34: -/* 80040E34 7C 14 E0 00 */ cmpw r20, r28 -/* 80040E38 40 80 00 0C */ bge lbl_80040E44 -/* 80040E3C 28 16 00 00 */ cmplwi r22, 0 -/* 80040E40 40 82 FE 68 */ bne lbl_80040CA8 -lbl_80040E44: -/* 80040E44 3A F7 00 01 */ addi r23, r23, 1 -/* 80040E48 2C 17 00 04 */ cmpwi r23, 4 -/* 80040E4C 3B DE 00 0C */ addi r30, r30, 0xc -/* 80040E50 41 80 FD 6C */ blt lbl_80040BBC -/* 80040E54 7F E3 FB 78 */ mr r3, r31 -/* 80040E58 4B FF C0 21 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv -/* 80040E5C E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80040E60 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80040E64 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80040E68 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80040E6C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040E70 48 32 13 95 */ bl _restgpr_20 -/* 80040E74 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80040E78 7C 08 03 A6 */ mtlr r0 -/* 80040E7C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80040E80 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s deleted file mode 100644 index 81aced9096..0000000000 --- a/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8003FBD0: -/* 8003FBD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003FBD4 7C 08 02 A6 */ mflr r0 -/* 8003FBD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003FBDC 88 0D 80 B6 */ lbz r0, data_80450636(r13) -/* 8003FBE0 28 00 00 00 */ cmplwi r0, 0 -/* 8003FBE4 41 82 00 7C */ beq lbl_8003FC60 -/* 8003FBE8 38 C0 00 00 */ li r6, 0 -/* 8003FBEC 38 60 00 00 */ li r3, 0 -/* 8003FBF0 38 A0 00 00 */ li r5, 0 -lbl_8003FBF4: -/* 8003FBF4 38 80 00 00 */ li r4, 0 -/* 8003FBF8 38 00 00 02 */ li r0, 2 -/* 8003FBFC 7C 09 03 A6 */ mtctr r0 -lbl_8003FC00: -/* 8003FC00 80 0D 88 E4 */ lwz r0, mLayerList__8dMpath_c(r13) -/* 8003FC04 7C 00 22 14 */ add r0, r0, r4 -/* 8003FC08 7C A3 01 2E */ stwx r5, r3, r0 -/* 8003FC0C 38 84 01 00 */ addi r4, r4, 0x100 -/* 8003FC10 42 00 FF F0 */ bdnz lbl_8003FC00 -/* 8003FC14 38 C6 00 01 */ addi r6, r6, 1 -/* 8003FC18 2C 06 00 40 */ cmpwi r6, 0x40 -/* 8003FC1C 38 63 00 04 */ addi r3, r3, 4 -/* 8003FC20 41 80 FF D4 */ blt lbl_8003FBF4 -/* 8003FC24 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 8003FC28 C0 23 0A E8 */ lfs f1, __float_max@l(r3) /* 0x80450AE8@l */ -/* 8003FC2C D0 2D 88 E8 */ stfs f1, mMinX__8dMpath_c(r13) -/* 8003FC30 FC 00 08 50 */ fneg f0, f1 -/* 8003FC34 D0 0D 88 EC */ stfs f0, mMaxX__8dMpath_c(r13) -/* 8003FC38 D0 2D 88 F0 */ stfs f1, mMinZ__8dMpath_c(r13) -/* 8003FC3C D0 0D 88 F4 */ stfs f0, mMaxZ__8dMpath_c(r13) -/* 8003FC40 38 00 00 7F */ li r0, 0x7f -/* 8003FC44 98 0D 80 B4 */ stb r0, mBottomFloorNo__8dMpath_c+0x0(r13) -/* 8003FC48 38 00 FF 80 */ li r0, -128 -/* 8003FC4C 98 0D 80 B5 */ stb r0, mBottomFloorNo__8dMpath_c+0x1(r13) -/* 8003FC50 38 00 00 00 */ li r0, 0 -/* 8003FC54 98 0D 80 B6 */ stb r0, data_80450636(r13) -/* 8003FC58 98 0D 89 08 */ stb r0, data_80450E88(r13) -/* 8003FC5C 4B FF FA B9 */ bl reset__10dMapInfo_cFv -lbl_8003FC60: -/* 8003FC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003FC64 7C 08 03 A6 */ mtlr r0 -/* 8003FC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003FC6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/CreateHeap__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/CreateHeap__11daObjFuta_cFv.s deleted file mode 100644 index 0e12d33cf4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/CreateHeap__11daObjFuta_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C1DF2C: -/* 80C1DF2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DF30 7C 08 02 A6 */ mflr r0 -/* 80C1DF34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DF38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1DF3C 7C 7F 1B 78 */ mr r31, r3 -/* 80C1DF40 3C 60 80 C2 */ lis r3, l_arcName@ha /* 0x80C1EEC4@ha */ -/* 80C1DF44 38 63 EE C4 */ addi r3, r3, l_arcName@l /* 0x80C1EEC4@l */ -/* 80C1DF48 80 63 00 00 */ lwz r3, 0(r3) -/* 80C1DF4C 38 80 00 04 */ li r4, 4 -/* 80C1DF50 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1DF54 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1DF58 3C A5 00 02 */ addis r5, r5, 2 -/* 80C1DF5C 38 C0 00 80 */ li r6, 0x80 -/* 80C1DF60 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C1DF64 4B 41 E3 89 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C1DF68 3C 80 00 08 */ lis r4, 8 -/* 80C1DF6C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C1DF70 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C1DF74 4B 3F 6C E1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C1DF78 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C1DF7C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1DF80 30 03 FF FF */ addic r0, r3, -1 -/* 80C1DF84 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C1DF88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1DF8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DF90 7C 08 03 A6 */ mtlr r0 -/* 80C1DF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DF98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Create__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Create__11daObjFuta_cFv.s deleted file mode 100644 index 5c5b88d1c3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Create__11daObjFuta_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80C1DE94: -/* 80C1DE94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DE98 7C 08 02 A6 */ mflr r0 -/* 80C1DE9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DEA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1DEA4 7C 7F 1B 78 */ mr r31, r3 -/* 80C1DEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1DEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1DEB0 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C1DEB4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C1DEB8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C1DEBC A0 84 01 50 */ lhz r4, 0x150(r4) -/* 80C1DEC0 4B 41 6A FD */ bl isEventBit__11dSv_event_cCFUs -/* 80C1DEC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C1DEC8 41 82 00 18 */ beq lbl_80C1DEE0 -/* 80C1DECC 38 00 00 02 */ li r0, 2 -/* 80C1DED0 98 1F 05 BE */ stb r0, 0x5be(r31) -/* 80C1DED4 7F E3 FB 78 */ mr r3, r31 -/* 80C1DED8 48 00 0D DD */ bl mode_end__11daObjFuta_cFv -/* 80C1DEDC 48 00 00 14 */ b lbl_80C1DEF0 -lbl_80C1DEE0: -/* 80C1DEE0 38 00 00 00 */ li r0, 0 -/* 80C1DEE4 98 1F 05 BE */ stb r0, 0x5be(r31) -/* 80C1DEE8 7F E3 FB 78 */ mr r3, r31 -/* 80C1DEEC 48 00 0C F1 */ bl mode_wait__11daObjFuta_cFv -lbl_80C1DEF0: -/* 80C1DEF0 7F E3 FB 78 */ mr r3, r31 -/* 80C1DEF4 4B FF FE 99 */ bl initBaseMtx__11daObjFuta_cFv -/* 80C1DEF8 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1DEFC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C1DF00 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C1DF04 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1DF08 80 83 00 04 */ lwz r4, 4(r3) -/* 80C1DF0C 7F E3 FB 78 */ mr r3, r31 -/* 80C1DF10 4B 3F C6 69 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C1DF14 38 60 00 01 */ li r3, 1 -/* 80C1DF18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1DF1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DF20 7C 08 03 A6 */ mtlr r0 -/* 80C1DF24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DF28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Delete__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Delete__11daObjFuta_cFv.s deleted file mode 100644 index 0d5fa016ba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Delete__11daObjFuta_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80C1ED68: -/* 80C1ED68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1ED6C 7C 08 02 A6 */ mflr r0 -/* 80C1ED70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1ED74 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1EEC4@ha */ -/* 80C1ED78 38 84 EE C4 */ addi r4, r4, l_arcName@l /* 0x80C1EEC4@l */ -/* 80C1ED7C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1ED80 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C1ED84 4B 40 E2 85 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C1ED88 38 60 00 01 */ li r3, 1 -/* 80C1ED8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1ED90 7C 08 03 A6 */ mtlr r0 -/* 80C1ED94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1ED98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Draw__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Draw__11daObjFuta_cFv.s deleted file mode 100644 index 08edcc3862..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Draw__11daObjFuta_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C1ECC4: -/* 80C1ECC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1ECC8 7C 08 02 A6 */ mflr r0 -/* 80C1ECCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1ECD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1ECD4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1ECD8 7C 7E 1B 78 */ mr r30, r3 -/* 80C1ECDC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1ECE0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1ECE4 38 80 00 10 */ li r4, 0x10 -/* 80C1ECE8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C1ECEC 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C1ECF0 4B 58 4A D5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C1ECF4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1ECF8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1ECFC 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C1ED00 80 84 00 04 */ lwz r4, 4(r4) -/* 80C1ED04 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C1ED08 4B 58 60 99 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C1ED0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1ED10 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1ED14 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C1ED18 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C1ED1C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C1ED20 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C1ED24 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C1ED28 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C1ED2C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C1ED30 4B 3E EF 95 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C1ED34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1ED38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1ED3C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C1ED40 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C1ED44 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C1ED48 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C1ED4C 38 60 00 01 */ li r3, 1 -/* 80C1ED50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1ED54 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1ED58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1ED5C 7C 08 03 A6 */ mtlr r0 -/* 80C1ED60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1ED64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Execute__11daObjFuta_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Execute__11daObjFuta_cFPPA3_A4_f.s deleted file mode 100644 index 15dba662dc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Execute__11daObjFuta_cFPPA3_A4_f.s +++ /dev/null @@ -1,700 +0,0 @@ -lbl_80C1E020: -/* 80C1E020 94 21 FE 90 */ stwu r1, -0x170(r1) -/* 80C1E024 7C 08 02 A6 */ mflr r0 -/* 80C1E028 90 01 01 74 */ stw r0, 0x174(r1) -/* 80C1E02C 39 61 01 70 */ addi r11, r1, 0x170 -/* 80C1E030 4B 74 41 AD */ bl _savegpr_29 -/* 80C1E034 7C 7E 1B 78 */ mr r30, r3 -/* 80C1E038 7C 9D 23 78 */ mr r29, r4 -/* 80C1E03C 3C 80 80 C2 */ lis r4, lit_1109@ha /* 0x80C1EF90@ha */ -/* 80C1E040 3B E4 EF 90 */ addi r31, r4, lit_1109@l /* 0x80C1EF90@l */ -/* 80C1E044 48 00 0A F5 */ bl mode_proc_call__11daObjFuta_cFv -/* 80C1E048 88 1F 00 4C */ lbz r0, 0x4c(r31) -/* 80C1E04C 7C 00 07 75 */ extsb. r0, r0 -/* 80C1E050 40 82 0A 1C */ bne lbl_80C1EA6C -/* 80C1E054 38 61 01 58 */ addi r3, r1, 0x158 -/* 80C1E058 38 80 FF F5 */ li r4, -11 -/* 80C1E05C 38 A0 00 00 */ li r5, 0 -/* 80C1E060 38 C0 03 83 */ li r6, 0x383 -/* 80C1E064 4B 64 93 91 */ bl __ct__5csXyzFsss -/* 80C1E068 80 01 01 58 */ lwz r0, 0x158(r1) -/* 80C1E06C 90 1F 02 48 */ stw r0, 0x248(r31) -/* 80C1E070 A0 01 01 5C */ lhz r0, 0x15c(r1) -/* 80C1E074 B0 1F 02 4C */ sth r0, 0x24c(r31) -/* 80C1E078 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E07C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E080 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E084 38 BF 00 40 */ addi r5, r31, 0x40 -/* 80C1E088 4B FF FC 91 */ bl __register_global_object -/* 80C1E08C 38 61 01 50 */ addi r3, r1, 0x150 -/* 80C1E090 38 80 02 5A */ li r4, 0x25a -/* 80C1E094 38 A0 00 00 */ li r5, 0 -/* 80C1E098 38 C0 02 81 */ li r6, 0x281 -/* 80C1E09C 4B 64 93 59 */ bl __ct__5csXyzFsss -/* 80C1E0A0 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E0A4 80 01 01 50 */ lwz r0, 0x150(r1) -/* 80C1E0A8 90 03 00 06 */ stw r0, 6(r3) -/* 80C1E0AC A0 01 01 54 */ lhz r0, 0x154(r1) -/* 80C1E0B0 B0 03 00 0A */ sth r0, 0xa(r3) -/* 80C1E0B4 38 63 00 06 */ addi r3, r3, 6 -/* 80C1E0B8 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E0BC 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E0C0 38 BF 00 50 */ addi r5, r31, 0x50 -/* 80C1E0C4 4B FF FC 55 */ bl __register_global_object -/* 80C1E0C8 38 61 01 48 */ addi r3, r1, 0x148 -/* 80C1E0CC 38 80 03 5A */ li r4, 0x35a -/* 80C1E0D0 38 A0 00 00 */ li r5, 0 -/* 80C1E0D4 38 C0 00 2A */ li r6, 0x2a -/* 80C1E0D8 4B 64 93 1D */ bl __ct__5csXyzFsss -/* 80C1E0DC 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E0E0 80 01 01 48 */ lwz r0, 0x148(r1) -/* 80C1E0E4 90 03 00 0C */ stw r0, 0xc(r3) -/* 80C1E0E8 A0 01 01 4C */ lhz r0, 0x14c(r1) -/* 80C1E0EC B0 03 00 10 */ sth r0, 0x10(r3) -/* 80C1E0F0 38 63 00 0C */ addi r3, r3, 0xc -/* 80C1E0F4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E0F8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E0FC 38 BF 00 5C */ addi r5, r31, 0x5c -/* 80C1E100 4B FF FC 19 */ bl __register_global_object -/* 80C1E104 38 61 01 40 */ addi r3, r1, 0x140 -/* 80C1E108 38 80 02 78 */ li r4, 0x278 -/* 80C1E10C 38 A0 00 00 */ li r5, 0 -/* 80C1E110 38 C0 FD D8 */ li r6, -552 -/* 80C1E114 4B 64 92 E1 */ bl __ct__5csXyzFsss -/* 80C1E118 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E11C 80 01 01 40 */ lwz r0, 0x140(r1) -/* 80C1E120 90 03 00 12 */ stw r0, 0x12(r3) -/* 80C1E124 A0 01 01 44 */ lhz r0, 0x144(r1) -/* 80C1E128 B0 03 00 16 */ sth r0, 0x16(r3) -/* 80C1E12C 38 63 00 12 */ addi r3, r3, 0x12 -/* 80C1E130 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E134 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E138 38 BF 00 68 */ addi r5, r31, 0x68 -/* 80C1E13C 4B FF FB DD */ bl __register_global_object -/* 80C1E140 38 61 01 38 */ addi r3, r1, 0x138 -/* 80C1E144 38 80 00 46 */ li r4, 0x46 -/* 80C1E148 38 A0 00 00 */ li r5, 0 -/* 80C1E14C 38 C0 FC D0 */ li r6, -816 -/* 80C1E150 4B 64 92 A5 */ bl __ct__5csXyzFsss -/* 80C1E154 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E158 80 01 01 38 */ lwz r0, 0x138(r1) -/* 80C1E15C 90 03 00 18 */ stw r0, 0x18(r3) -/* 80C1E160 A0 01 01 3C */ lhz r0, 0x13c(r1) -/* 80C1E164 B0 03 00 1C */ sth r0, 0x1c(r3) -/* 80C1E168 38 63 00 18 */ addi r3, r3, 0x18 -/* 80C1E16C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E170 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E174 38 BF 00 74 */ addi r5, r31, 0x74 -/* 80C1E178 4B FF FB A1 */ bl __register_global_object -/* 80C1E17C 38 61 01 30 */ addi r3, r1, 0x130 -/* 80C1E180 38 80 FE 09 */ li r4, -503 -/* 80C1E184 38 A0 00 00 */ li r5, 0 -/* 80C1E188 38 C0 FD 93 */ li r6, -621 -/* 80C1E18C 4B 64 92 69 */ bl __ct__5csXyzFsss -/* 80C1E190 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E194 80 01 01 30 */ lwz r0, 0x130(r1) -/* 80C1E198 90 03 00 1E */ stw r0, 0x1e(r3) -/* 80C1E19C A0 01 01 34 */ lhz r0, 0x134(r1) -/* 80C1E1A0 B0 03 00 22 */ sth r0, 0x22(r3) -/* 80C1E1A4 38 63 00 1E */ addi r3, r3, 0x1e -/* 80C1E1A8 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E1AC 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E1B0 38 BF 00 80 */ addi r5, r31, 0x80 -/* 80C1E1B4 4B FF FB 65 */ bl __register_global_object -/* 80C1E1B8 38 61 01 28 */ addi r3, r1, 0x128 -/* 80C1E1BC 38 80 FC FA */ li r4, -774 -/* 80C1E1C0 38 A0 00 00 */ li r5, 0 -/* 80C1E1C4 38 C0 FF A1 */ li r6, -95 -/* 80C1E1C8 4B 64 92 2D */ bl __ct__5csXyzFsss -/* 80C1E1CC 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E1D0 80 01 01 28 */ lwz r0, 0x128(r1) -/* 80C1E1D4 90 03 00 24 */ stw r0, 0x24(r3) -/* 80C1E1D8 A0 01 01 2C */ lhz r0, 0x12c(r1) -/* 80C1E1DC B0 03 00 28 */ sth r0, 0x28(r3) -/* 80C1E1E0 38 63 00 24 */ addi r3, r3, 0x24 -/* 80C1E1E4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E1E8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E1EC 38 BF 00 8C */ addi r5, r31, 0x8c -/* 80C1E1F0 4B FF FB 29 */ bl __register_global_object -/* 80C1E1F4 38 61 01 20 */ addi r3, r1, 0x120 -/* 80C1E1F8 38 80 FD A1 */ li r4, -607 -/* 80C1E1FC 38 A0 00 00 */ li r5, 0 -/* 80C1E200 38 C0 01 C8 */ li r6, 0x1c8 -/* 80C1E204 4B 64 91 F1 */ bl __ct__5csXyzFsss -/* 80C1E208 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E20C 80 01 01 20 */ lwz r0, 0x120(r1) -/* 80C1E210 90 03 00 2A */ stw r0, 0x2a(r3) -/* 80C1E214 A0 01 01 24 */ lhz r0, 0x124(r1) -/* 80C1E218 B0 03 00 2E */ sth r0, 0x2e(r3) -/* 80C1E21C 38 63 00 2A */ addi r3, r3, 0x2a -/* 80C1E220 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E224 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E228 38 BF 00 98 */ addi r5, r31, 0x98 -/* 80C1E22C 4B FF FA ED */ bl __register_global_object -/* 80C1E230 38 61 01 18 */ addi r3, r1, 0x118 -/* 80C1E234 38 80 FF 8B */ li r4, -117 -/* 80C1E238 38 A0 00 00 */ li r5, 0 -/* 80C1E23C 38 C0 02 DA */ li r6, 0x2da -/* 80C1E240 4B 64 91 B5 */ bl __ct__5csXyzFsss -/* 80C1E244 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E248 80 01 01 18 */ lwz r0, 0x118(r1) -/* 80C1E24C 90 03 00 30 */ stw r0, 0x30(r3) -/* 80C1E250 A0 01 01 1C */ lhz r0, 0x11c(r1) -/* 80C1E254 B0 03 00 34 */ sth r0, 0x34(r3) -/* 80C1E258 38 63 00 30 */ addi r3, r3, 0x30 -/* 80C1E25C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E260 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E264 38 BF 00 A4 */ addi r5, r31, 0xa4 -/* 80C1E268 4B FF FA B1 */ bl __register_global_object -/* 80C1E26C 38 61 01 10 */ addi r3, r1, 0x110 -/* 80C1E270 38 80 01 9A */ li r4, 0x19a -/* 80C1E274 38 A0 00 00 */ li r5, 0 -/* 80C1E278 38 C0 02 4F */ li r6, 0x24f -/* 80C1E27C 4B 64 91 79 */ bl __ct__5csXyzFsss -/* 80C1E280 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E284 80 01 01 10 */ lwz r0, 0x110(r1) -/* 80C1E288 90 03 00 36 */ stw r0, 0x36(r3) -/* 80C1E28C A0 01 01 14 */ lhz r0, 0x114(r1) -/* 80C1E290 B0 03 00 3A */ sth r0, 0x3a(r3) -/* 80C1E294 38 63 00 36 */ addi r3, r3, 0x36 -/* 80C1E298 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E29C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E2A0 38 BF 00 B0 */ addi r5, r31, 0xb0 -/* 80C1E2A4 4B FF FA 75 */ bl __register_global_object -/* 80C1E2A8 38 61 01 08 */ addi r3, r1, 0x108 -/* 80C1E2AC 38 80 02 AE */ li r4, 0x2ae -/* 80C1E2B0 38 A0 00 00 */ li r5, 0 -/* 80C1E2B4 38 C0 00 88 */ li r6, 0x88 -/* 80C1E2B8 4B 64 91 3D */ bl __ct__5csXyzFsss -/* 80C1E2BC 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E2C0 80 01 01 08 */ lwz r0, 0x108(r1) -/* 80C1E2C4 90 03 00 3C */ stw r0, 0x3c(r3) -/* 80C1E2C8 A0 01 01 0C */ lhz r0, 0x10c(r1) -/* 80C1E2CC B0 03 00 40 */ sth r0, 0x40(r3) -/* 80C1E2D0 38 63 00 3C */ addi r3, r3, 0x3c -/* 80C1E2D4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E2D8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E2DC 38 BF 00 BC */ addi r5, r31, 0xbc -/* 80C1E2E0 4B FF FA 39 */ bl __register_global_object -/* 80C1E2E4 38 61 01 00 */ addi r3, r1, 0x100 -/* 80C1E2E8 38 80 02 3C */ li r4, 0x23c -/* 80C1E2EC 38 A0 00 00 */ li r5, 0 -/* 80C1E2F0 38 C0 FE 91 */ li r6, -367 -/* 80C1E2F4 4B 64 91 01 */ bl __ct__5csXyzFsss -/* 80C1E2F8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E2FC 80 01 01 00 */ lwz r0, 0x100(r1) -/* 80C1E300 90 03 00 42 */ stw r0, 0x42(r3) -/* 80C1E304 A0 01 01 04 */ lhz r0, 0x104(r1) -/* 80C1E308 B0 03 00 46 */ sth r0, 0x46(r3) -/* 80C1E30C 38 63 00 42 */ addi r3, r3, 0x42 -/* 80C1E310 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E314 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E318 38 BF 00 C8 */ addi r5, r31, 0xc8 -/* 80C1E31C 4B FF F9 FD */ bl __register_global_object -/* 80C1E320 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 80C1E324 38 80 00 98 */ li r4, 0x98 -/* 80C1E328 38 A0 00 00 */ li r5, 0 -/* 80C1E32C 38 C0 FD 7E */ li r6, -642 -/* 80C1E330 4B 64 90 C5 */ bl __ct__5csXyzFsss -/* 80C1E334 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E338 80 01 00 F8 */ lwz r0, 0xf8(r1) -/* 80C1E33C 90 03 00 48 */ stw r0, 0x48(r3) -/* 80C1E340 A0 01 00 FC */ lhz r0, 0xfc(r1) -/* 80C1E344 B0 03 00 4C */ sth r0, 0x4c(r3) -/* 80C1E348 38 63 00 48 */ addi r3, r3, 0x48 -/* 80C1E34C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E350 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E354 38 BF 00 D4 */ addi r5, r31, 0xd4 -/* 80C1E358 4B FF F9 C1 */ bl __register_global_object -/* 80C1E35C 38 61 00 F0 */ addi r3, r1, 0xf0 -/* 80C1E360 38 80 FE BB */ li r4, -325 -/* 80C1E364 38 A0 00 00 */ li r5, 0 -/* 80C1E368 38 C0 FD DA */ li r6, -550 -/* 80C1E36C 4B 64 90 89 */ bl __ct__5csXyzFsss -/* 80C1E370 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E374 80 01 00 F0 */ lwz r0, 0xf0(r1) -/* 80C1E378 90 03 00 4E */ stw r0, 0x4e(r3) -/* 80C1E37C A0 01 00 F4 */ lhz r0, 0xf4(r1) -/* 80C1E380 B0 03 00 52 */ sth r0, 0x52(r3) -/* 80C1E384 38 63 00 4E */ addi r3, r3, 0x4e -/* 80C1E388 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E38C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E390 38 BF 00 E0 */ addi r5, r31, 0xe0 -/* 80C1E394 4B FF F9 85 */ bl __register_global_object -/* 80C1E398 38 61 00 E8 */ addi r3, r1, 0xe8 -/* 80C1E39C 38 80 FD 12 */ li r4, -750 -/* 80C1E3A0 38 A0 00 00 */ li r5, 0 -/* 80C1E3A4 38 C0 FF 6A */ li r6, -150 -/* 80C1E3A8 4B 64 90 4D */ bl __ct__5csXyzFsss -/* 80C1E3AC 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E3B0 80 01 00 E8 */ lwz r0, 0xe8(r1) -/* 80C1E3B4 90 03 00 54 */ stw r0, 0x54(r3) -/* 80C1E3B8 A0 01 00 EC */ lhz r0, 0xec(r1) -/* 80C1E3BC B0 03 00 58 */ sth r0, 0x58(r3) -/* 80C1E3C0 38 63 00 54 */ addi r3, r3, 0x54 -/* 80C1E3C4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E3C8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E3CC 38 BF 00 EC */ addi r5, r31, 0xec -/* 80C1E3D0 4B FF F9 49 */ bl __register_global_object -/* 80C1E3D4 38 61 00 E0 */ addi r3, r1, 0xe0 -/* 80C1E3D8 38 80 FE 3E */ li r4, -450 -/* 80C1E3DC 38 A0 00 00 */ li r5, 0 -/* 80C1E3E0 38 C0 00 96 */ li r6, 0x96 -/* 80C1E3E4 4B 64 90 11 */ bl __ct__5csXyzFsss -/* 80C1E3E8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E3EC 80 01 00 E0 */ lwz r0, 0xe0(r1) -/* 80C1E3F0 90 03 00 5A */ stw r0, 0x5a(r3) -/* 80C1E3F4 A0 01 00 E4 */ lhz r0, 0xe4(r1) -/* 80C1E3F8 B0 03 00 5E */ sth r0, 0x5e(r3) -/* 80C1E3FC 38 63 00 5A */ addi r3, r3, 0x5a -/* 80C1E400 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E404 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E408 38 BF 00 F8 */ addi r5, r31, 0xf8 -/* 80C1E40C 4B FF F9 0D */ bl __register_global_object -/* 80C1E410 38 61 00 D8 */ addi r3, r1, 0xd8 -/* 80C1E414 38 80 FF 6A */ li r4, -150 -/* 80C1E418 38 A0 00 00 */ li r5, 0 -/* 80C1E41C 38 C0 01 C2 */ li r6, 0x1c2 -/* 80C1E420 4B 64 8F D5 */ bl __ct__5csXyzFsss -/* 80C1E424 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E428 80 01 00 D8 */ lwz r0, 0xd8(r1) -/* 80C1E42C 90 03 00 60 */ stw r0, 0x60(r3) -/* 80C1E430 A0 01 00 DC */ lhz r0, 0xdc(r1) -/* 80C1E434 B0 03 00 64 */ sth r0, 0x64(r3) -/* 80C1E438 38 63 00 60 */ addi r3, r3, 0x60 -/* 80C1E43C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E440 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E444 38 BF 01 04 */ addi r5, r31, 0x104 -/* 80C1E448 4B FF F8 D1 */ bl __register_global_object -/* 80C1E44C 38 61 00 D0 */ addi r3, r1, 0xd0 -/* 80C1E450 38 80 00 96 */ li r4, 0x96 -/* 80C1E454 38 A0 00 00 */ li r5, 0 -/* 80C1E458 38 C0 02 EE */ li r6, 0x2ee -/* 80C1E45C 4B 64 8F 99 */ bl __ct__5csXyzFsss -/* 80C1E460 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E464 80 01 00 D0 */ lwz r0, 0xd0(r1) -/* 80C1E468 90 03 00 66 */ stw r0, 0x66(r3) -/* 80C1E46C A0 01 00 D4 */ lhz r0, 0xd4(r1) -/* 80C1E470 B0 03 00 6A */ sth r0, 0x6a(r3) -/* 80C1E474 38 63 00 66 */ addi r3, r3, 0x66 -/* 80C1E478 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E47C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E480 38 BF 01 10 */ addi r5, r31, 0x110 -/* 80C1E484 4B FF F8 95 */ bl __register_global_object -/* 80C1E488 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 80C1E48C 38 80 01 C2 */ li r4, 0x1c2 -/* 80C1E490 38 A0 00 00 */ li r5, 0 -/* 80C1E494 38 C0 01 C2 */ li r6, 0x1c2 -/* 80C1E498 4B 64 8F 5D */ bl __ct__5csXyzFsss -/* 80C1E49C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E4A0 80 01 00 C8 */ lwz r0, 0xc8(r1) -/* 80C1E4A4 90 03 00 6C */ stw r0, 0x6c(r3) -/* 80C1E4A8 A0 01 00 CC */ lhz r0, 0xcc(r1) -/* 80C1E4AC B0 03 00 70 */ sth r0, 0x70(r3) -/* 80C1E4B0 38 63 00 6C */ addi r3, r3, 0x6c -/* 80C1E4B4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E4B8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E4BC 38 BF 01 1C */ addi r5, r31, 0x11c -/* 80C1E4C0 4B FF F8 59 */ bl __register_global_object -/* 80C1E4C4 38 61 00 C0 */ addi r3, r1, 0xc0 -/* 80C1E4C8 38 80 02 EE */ li r4, 0x2ee -/* 80C1E4CC 38 A0 00 00 */ li r5, 0 -/* 80C1E4D0 38 C0 00 96 */ li r6, 0x96 -/* 80C1E4D4 4B 64 8F 21 */ bl __ct__5csXyzFsss -/* 80C1E4D8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E4DC 80 01 00 C0 */ lwz r0, 0xc0(r1) -/* 80C1E4E0 90 03 00 72 */ stw r0, 0x72(r3) -/* 80C1E4E4 A0 01 00 C4 */ lhz r0, 0xc4(r1) -/* 80C1E4E8 B0 03 00 76 */ sth r0, 0x76(r3) -/* 80C1E4EC 38 63 00 72 */ addi r3, r3, 0x72 -/* 80C1E4F0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E4F4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E4F8 38 BF 01 28 */ addi r5, r31, 0x128 -/* 80C1E4FC 4B FF F8 1D */ bl __register_global_object -/* 80C1E500 38 61 00 B8 */ addi r3, r1, 0xb8 -/* 80C1E504 38 80 01 C2 */ li r4, 0x1c2 -/* 80C1E508 38 A0 00 00 */ li r5, 0 -/* 80C1E50C 38 C0 FF 6A */ li r6, -150 -/* 80C1E510 4B 64 8E E5 */ bl __ct__5csXyzFsss -/* 80C1E514 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E518 80 01 00 B8 */ lwz r0, 0xb8(r1) -/* 80C1E51C 90 03 00 78 */ stw r0, 0x78(r3) -/* 80C1E520 A0 01 00 BC */ lhz r0, 0xbc(r1) -/* 80C1E524 B0 03 00 7C */ sth r0, 0x7c(r3) -/* 80C1E528 38 63 00 78 */ addi r3, r3, 0x78 -/* 80C1E52C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E530 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E534 38 BF 01 34 */ addi r5, r31, 0x134 -/* 80C1E538 4B FF F7 E1 */ bl __register_global_object -/* 80C1E53C 38 61 00 B0 */ addi r3, r1, 0xb0 -/* 80C1E540 38 80 00 96 */ li r4, 0x96 -/* 80C1E544 38 A0 00 00 */ li r5, 0 -/* 80C1E548 38 C0 FE 3E */ li r6, -450 -/* 80C1E54C 4B 64 8E A9 */ bl __ct__5csXyzFsss -/* 80C1E550 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E554 80 01 00 B0 */ lwz r0, 0xb0(r1) -/* 80C1E558 90 03 00 7E */ stw r0, 0x7e(r3) -/* 80C1E55C A0 01 00 B4 */ lhz r0, 0xb4(r1) -/* 80C1E560 B0 03 00 82 */ sth r0, 0x82(r3) -/* 80C1E564 38 63 00 7E */ addi r3, r3, 0x7e -/* 80C1E568 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E56C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E570 38 BF 01 40 */ addi r5, r31, 0x140 -/* 80C1E574 4B FF F7 A5 */ bl __register_global_object -/* 80C1E578 38 61 00 A8 */ addi r3, r1, 0xa8 -/* 80C1E57C 38 80 FF 6A */ li r4, -150 -/* 80C1E580 38 A0 00 00 */ li r5, 0 -/* 80C1E584 38 C0 FD 12 */ li r6, -750 -/* 80C1E588 4B 64 8E 6D */ bl __ct__5csXyzFsss -/* 80C1E58C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E590 80 01 00 A8 */ lwz r0, 0xa8(r1) -/* 80C1E594 90 03 00 84 */ stw r0, 0x84(r3) -/* 80C1E598 A0 01 00 AC */ lhz r0, 0xac(r1) -/* 80C1E59C B0 03 00 88 */ sth r0, 0x88(r3) -/* 80C1E5A0 38 63 00 84 */ addi r3, r3, 0x84 -/* 80C1E5A4 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E5A8 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E5AC 38 BF 01 4C */ addi r5, r31, 0x14c -/* 80C1E5B0 4B FF F7 69 */ bl __register_global_object -/* 80C1E5B4 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 80C1E5B8 38 80 FE 3E */ li r4, -450 -/* 80C1E5BC 38 A0 00 00 */ li r5, 0 -/* 80C1E5C0 38 C0 FE 3E */ li r6, -450 -/* 80C1E5C4 4B 64 8E 31 */ bl __ct__5csXyzFsss -/* 80C1E5C8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E5CC 80 01 00 A0 */ lwz r0, 0xa0(r1) -/* 80C1E5D0 90 03 00 8A */ stw r0, 0x8a(r3) -/* 80C1E5D4 A0 01 00 A4 */ lhz r0, 0xa4(r1) -/* 80C1E5D8 B0 03 00 8E */ sth r0, 0x8e(r3) -/* 80C1E5DC 38 63 00 8A */ addi r3, r3, 0x8a -/* 80C1E5E0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E5E4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E5E8 38 BF 01 58 */ addi r5, r31, 0x158 -/* 80C1E5EC 4B FF F7 2D */ bl __register_global_object -/* 80C1E5F0 38 61 00 98 */ addi r3, r1, 0x98 -/* 80C1E5F4 38 80 FD 12 */ li r4, -750 -/* 80C1E5F8 38 A0 00 00 */ li r5, 0 -/* 80C1E5FC 38 C0 FF 6A */ li r6, -150 -/* 80C1E600 4B 64 8D F5 */ bl __ct__5csXyzFsss -/* 80C1E604 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E608 80 01 00 98 */ lwz r0, 0x98(r1) -/* 80C1E60C 90 03 00 90 */ stw r0, 0x90(r3) -/* 80C1E610 A0 01 00 9C */ lhz r0, 0x9c(r1) -/* 80C1E614 B0 03 00 94 */ sth r0, 0x94(r3) -/* 80C1E618 38 63 00 90 */ addi r3, r3, 0x90 -/* 80C1E61C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E620 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E624 38 BF 01 64 */ addi r5, r31, 0x164 -/* 80C1E628 4B FF F6 F1 */ bl __register_global_object -/* 80C1E62C 38 61 00 90 */ addi r3, r1, 0x90 -/* 80C1E630 38 80 FE 3E */ li r4, -450 -/* 80C1E634 38 A0 00 00 */ li r5, 0 -/* 80C1E638 38 C0 00 96 */ li r6, 0x96 -/* 80C1E63C 4B 64 8D B9 */ bl __ct__5csXyzFsss -/* 80C1E640 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E644 80 01 00 90 */ lwz r0, 0x90(r1) -/* 80C1E648 90 03 00 96 */ stw r0, 0x96(r3) -/* 80C1E64C A0 01 00 94 */ lhz r0, 0x94(r1) -/* 80C1E650 B0 03 00 9A */ sth r0, 0x9a(r3) -/* 80C1E654 38 63 00 96 */ addi r3, r3, 0x96 -/* 80C1E658 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E65C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E660 38 BF 01 70 */ addi r5, r31, 0x170 -/* 80C1E664 4B FF F6 B5 */ bl __register_global_object -/* 80C1E668 38 61 00 88 */ addi r3, r1, 0x88 -/* 80C1E66C 38 80 FF 6A */ li r4, -150 -/* 80C1E670 38 A0 00 00 */ li r5, 0 -/* 80C1E674 38 C0 01 C2 */ li r6, 0x1c2 -/* 80C1E678 4B 64 8D 7D */ bl __ct__5csXyzFsss -/* 80C1E67C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E680 80 01 00 88 */ lwz r0, 0x88(r1) -/* 80C1E684 90 03 00 9C */ stw r0, 0x9c(r3) -/* 80C1E688 A0 01 00 8C */ lhz r0, 0x8c(r1) -/* 80C1E68C B0 03 00 A0 */ sth r0, 0xa0(r3) -/* 80C1E690 38 63 00 9C */ addi r3, r3, 0x9c -/* 80C1E694 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E698 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E69C 38 BF 01 7C */ addi r5, r31, 0x17c -/* 80C1E6A0 4B FF F6 79 */ bl __register_global_object -/* 80C1E6A4 38 61 00 80 */ addi r3, r1, 0x80 -/* 80C1E6A8 38 80 00 96 */ li r4, 0x96 -/* 80C1E6AC 38 A0 00 00 */ li r5, 0 -/* 80C1E6B0 38 C0 02 EE */ li r6, 0x2ee -/* 80C1E6B4 4B 64 8D 41 */ bl __ct__5csXyzFsss -/* 80C1E6B8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E6BC 80 01 00 80 */ lwz r0, 0x80(r1) -/* 80C1E6C0 90 03 00 A2 */ stw r0, 0xa2(r3) -/* 80C1E6C4 A0 01 00 84 */ lhz r0, 0x84(r1) -/* 80C1E6C8 B0 03 00 A6 */ sth r0, 0xa6(r3) -/* 80C1E6CC 38 63 00 A2 */ addi r3, r3, 0xa2 -/* 80C1E6D0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E6D4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E6D8 38 BF 01 88 */ addi r5, r31, 0x188 -/* 80C1E6DC 4B FF F6 3D */ bl __register_global_object -/* 80C1E6E0 38 61 00 78 */ addi r3, r1, 0x78 -/* 80C1E6E4 38 80 01 C2 */ li r4, 0x1c2 -/* 80C1E6E8 38 A0 00 00 */ li r5, 0 -/* 80C1E6EC 38 C0 01 C2 */ li r6, 0x1c2 -/* 80C1E6F0 4B 64 8D 05 */ bl __ct__5csXyzFsss -/* 80C1E6F4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E6F8 80 01 00 78 */ lwz r0, 0x78(r1) -/* 80C1E6FC 90 03 00 A8 */ stw r0, 0xa8(r3) -/* 80C1E700 A0 01 00 7C */ lhz r0, 0x7c(r1) -/* 80C1E704 B0 03 00 AC */ sth r0, 0xac(r3) -/* 80C1E708 38 63 00 A8 */ addi r3, r3, 0xa8 -/* 80C1E70C 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E710 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E714 38 BF 01 94 */ addi r5, r31, 0x194 -/* 80C1E718 4B FF F6 01 */ bl __register_global_object -/* 80C1E71C 38 61 00 70 */ addi r3, r1, 0x70 -/* 80C1E720 38 80 02 EE */ li r4, 0x2ee -/* 80C1E724 38 A0 00 00 */ li r5, 0 -/* 80C1E728 38 C0 00 96 */ li r6, 0x96 -/* 80C1E72C 4B 64 8C C9 */ bl __ct__5csXyzFsss -/* 80C1E730 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E734 80 01 00 70 */ lwz r0, 0x70(r1) -/* 80C1E738 90 03 00 AE */ stw r0, 0xae(r3) -/* 80C1E73C A0 01 00 74 */ lhz r0, 0x74(r1) -/* 80C1E740 B0 03 00 B2 */ sth r0, 0xb2(r3) -/* 80C1E744 38 63 00 AE */ addi r3, r3, 0xae -/* 80C1E748 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E74C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E750 38 BF 01 A0 */ addi r5, r31, 0x1a0 -/* 80C1E754 4B FF F5 C5 */ bl __register_global_object -/* 80C1E758 38 61 00 68 */ addi r3, r1, 0x68 -/* 80C1E75C 38 80 01 C2 */ li r4, 0x1c2 -/* 80C1E760 38 A0 00 00 */ li r5, 0 -/* 80C1E764 38 C0 FF 6A */ li r6, -150 -/* 80C1E768 4B 64 8C 8D */ bl __ct__5csXyzFsss -/* 80C1E76C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E770 80 01 00 68 */ lwz r0, 0x68(r1) -/* 80C1E774 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80C1E778 A0 01 00 6C */ lhz r0, 0x6c(r1) -/* 80C1E77C B0 03 00 B8 */ sth r0, 0xb8(r3) -/* 80C1E780 38 63 00 B4 */ addi r3, r3, 0xb4 -/* 80C1E784 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E788 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E78C 38 BF 01 AC */ addi r5, r31, 0x1ac -/* 80C1E790 4B FF F5 89 */ bl __register_global_object -/* 80C1E794 38 61 00 60 */ addi r3, r1, 0x60 -/* 80C1E798 38 80 00 96 */ li r4, 0x96 -/* 80C1E79C 38 A0 00 00 */ li r5, 0 -/* 80C1E7A0 38 C0 FE 3E */ li r6, -450 -/* 80C1E7A4 4B 64 8C 51 */ bl __ct__5csXyzFsss -/* 80C1E7A8 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E7AC 80 01 00 60 */ lwz r0, 0x60(r1) -/* 80C1E7B0 90 03 00 BA */ stw r0, 0xba(r3) -/* 80C1E7B4 A0 01 00 64 */ lhz r0, 0x64(r1) -/* 80C1E7B8 B0 03 00 BE */ sth r0, 0xbe(r3) -/* 80C1E7BC 38 63 00 BA */ addi r3, r3, 0xba -/* 80C1E7C0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E7C4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E7C8 38 BF 01 B8 */ addi r5, r31, 0x1b8 -/* 80C1E7CC 4B FF F5 4D */ bl __register_global_object -/* 80C1E7D0 38 61 00 58 */ addi r3, r1, 0x58 -/* 80C1E7D4 38 80 FF 6A */ li r4, -150 -/* 80C1E7D8 38 A0 00 00 */ li r5, 0 -/* 80C1E7DC 38 C0 FD 12 */ li r6, -750 -/* 80C1E7E0 4B 64 8C 15 */ bl __ct__5csXyzFsss -/* 80C1E7E4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E7E8 80 01 00 58 */ lwz r0, 0x58(r1) -/* 80C1E7EC 90 03 00 C0 */ stw r0, 0xc0(r3) -/* 80C1E7F0 A0 01 00 5C */ lhz r0, 0x5c(r1) -/* 80C1E7F4 B0 03 00 C4 */ sth r0, 0xc4(r3) -/* 80C1E7F8 38 63 00 C0 */ addi r3, r3, 0xc0 -/* 80C1E7FC 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E800 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E804 38 BF 01 C4 */ addi r5, r31, 0x1c4 -/* 80C1E808 4B FF F5 11 */ bl __register_global_object -/* 80C1E80C 38 61 00 50 */ addi r3, r1, 0x50 -/* 80C1E810 38 80 FE 3E */ li r4, -450 -/* 80C1E814 38 A0 00 00 */ li r5, 0 -/* 80C1E818 38 C0 FE 3E */ li r6, -450 -/* 80C1E81C 4B 64 8B D9 */ bl __ct__5csXyzFsss -/* 80C1E820 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E824 80 01 00 50 */ lwz r0, 0x50(r1) -/* 80C1E828 90 03 00 C6 */ stw r0, 0xc6(r3) -/* 80C1E82C A0 01 00 54 */ lhz r0, 0x54(r1) -/* 80C1E830 B0 03 00 CA */ sth r0, 0xca(r3) -/* 80C1E834 38 63 00 C6 */ addi r3, r3, 0xc6 -/* 80C1E838 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E83C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E840 38 BF 01 D0 */ addi r5, r31, 0x1d0 -/* 80C1E844 4B FF F4 D5 */ bl __register_global_object -/* 80C1E848 38 61 00 48 */ addi r3, r1, 0x48 -/* 80C1E84C 38 80 FD 44 */ li r4, -700 -/* 80C1E850 38 A0 00 00 */ li r5, 0 -/* 80C1E854 38 C0 FF 6A */ li r6, -150 -/* 80C1E858 4B 64 8B 9D */ bl __ct__5csXyzFsss -/* 80C1E85C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E860 80 01 00 48 */ lwz r0, 0x48(r1) -/* 80C1E864 90 03 00 CC */ stw r0, 0xcc(r3) -/* 80C1E868 A0 01 00 4C */ lhz r0, 0x4c(r1) -/* 80C1E86C B0 03 00 D0 */ sth r0, 0xd0(r3) -/* 80C1E870 38 63 00 CC */ addi r3, r3, 0xcc -/* 80C1E874 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E878 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E87C 38 BF 01 DC */ addi r5, r31, 0x1dc -/* 80C1E880 4B FF F4 99 */ bl __register_global_object -/* 80C1E884 38 61 00 40 */ addi r3, r1, 0x40 -/* 80C1E888 38 80 FF 38 */ li r4, -200 -/* 80C1E88C 38 A0 00 00 */ li r5, 0 -/* 80C1E890 38 C0 01 5E */ li r6, 0x15e -/* 80C1E894 4B 64 8B 61 */ bl __ct__5csXyzFsss -/* 80C1E898 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E89C 80 01 00 40 */ lwz r0, 0x40(r1) -/* 80C1E8A0 90 03 00 D2 */ stw r0, 0xd2(r3) -/* 80C1E8A4 A0 01 00 44 */ lhz r0, 0x44(r1) -/* 80C1E8A8 B0 03 00 D6 */ sth r0, 0xd6(r3) -/* 80C1E8AC 38 63 00 D2 */ addi r3, r3, 0xd2 -/* 80C1E8B0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E8B4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E8B8 38 BF 01 E8 */ addi r5, r31, 0x1e8 -/* 80C1E8BC 4B FF F4 5D */ bl __register_global_object -/* 80C1E8C0 38 61 00 38 */ addi r3, r1, 0x38 -/* 80C1E8C4 38 80 01 2C */ li r4, 0x12c -/* 80C1E8C8 38 A0 00 00 */ li r5, 0 -/* 80C1E8CC 38 C0 02 BC */ li r6, 0x2bc -/* 80C1E8D0 4B 64 8B 25 */ bl __ct__5csXyzFsss -/* 80C1E8D4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E8D8 80 01 00 38 */ lwz r0, 0x38(r1) -/* 80C1E8DC 90 03 00 D8 */ stw r0, 0xd8(r3) -/* 80C1E8E0 A0 01 00 3C */ lhz r0, 0x3c(r1) -/* 80C1E8E4 B0 03 00 DC */ sth r0, 0xdc(r3) -/* 80C1E8E8 38 63 00 D8 */ addi r3, r3, 0xd8 -/* 80C1E8EC 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E8F0 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E8F4 38 BF 01 F4 */ addi r5, r31, 0x1f4 -/* 80C1E8F8 4B FF F4 21 */ bl __register_global_object -/* 80C1E8FC 38 61 00 30 */ addi r3, r1, 0x30 -/* 80C1E900 38 80 02 BC */ li r4, 0x2bc -/* 80C1E904 38 A0 00 00 */ li r5, 0 -/* 80C1E908 38 C0 00 C8 */ li r6, 0xc8 -/* 80C1E90C 4B 64 8A E9 */ bl __ct__5csXyzFsss -/* 80C1E910 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E914 80 01 00 30 */ lwz r0, 0x30(r1) -/* 80C1E918 90 03 00 DE */ stw r0, 0xde(r3) -/* 80C1E91C A0 01 00 34 */ lhz r0, 0x34(r1) -/* 80C1E920 B0 03 00 E2 */ sth r0, 0xe2(r3) -/* 80C1E924 38 63 00 DE */ addi r3, r3, 0xde -/* 80C1E928 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E92C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E930 38 BF 02 00 */ addi r5, r31, 0x200 -/* 80C1E934 4B FF F3 E5 */ bl __register_global_object -/* 80C1E938 38 61 00 28 */ addi r3, r1, 0x28 -/* 80C1E93C 38 80 00 C8 */ li r4, 0xc8 -/* 80C1E940 38 A0 00 00 */ li r5, 0 -/* 80C1E944 38 C0 FE D4 */ li r6, -300 -/* 80C1E948 4B 64 8A AD */ bl __ct__5csXyzFsss -/* 80C1E94C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E950 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80C1E954 90 03 00 E4 */ stw r0, 0xe4(r3) -/* 80C1E958 A0 01 00 2C */ lhz r0, 0x2c(r1) -/* 80C1E95C B0 03 00 E8 */ sth r0, 0xe8(r3) -/* 80C1E960 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 80C1E964 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E968 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E96C 38 BF 02 0C */ addi r5, r31, 0x20c -/* 80C1E970 4B FF F3 A9 */ bl __register_global_object -/* 80C1E974 38 61 00 20 */ addi r3, r1, 0x20 -/* 80C1E978 38 80 FE D4 */ li r4, -300 -/* 80C1E97C 38 A0 00 00 */ li r5, 0 -/* 80C1E980 38 C0 FD 44 */ li r6, -700 -/* 80C1E984 4B 64 8A 71 */ bl __ct__5csXyzFsss -/* 80C1E988 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E98C 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80C1E990 90 03 00 EA */ stw r0, 0xea(r3) -/* 80C1E994 A0 01 00 24 */ lhz r0, 0x24(r1) -/* 80C1E998 B0 03 00 EE */ sth r0, 0xee(r3) -/* 80C1E99C 38 63 00 EA */ addi r3, r3, 0xea -/* 80C1E9A0 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E9A4 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E9A8 38 BF 02 18 */ addi r5, r31, 0x218 -/* 80C1E9AC 4B FF F3 6D */ bl __register_global_object -/* 80C1E9B0 38 61 00 18 */ addi r3, r1, 0x18 -/* 80C1E9B4 38 80 FD 44 */ li r4, -700 -/* 80C1E9B8 38 A0 00 00 */ li r5, 0 -/* 80C1E9BC 38 C0 FF 38 */ li r6, -200 -/* 80C1E9C0 4B 64 8A 35 */ bl __ct__5csXyzFsss -/* 80C1E9C4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1E9C8 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80C1E9CC 90 03 00 F0 */ stw r0, 0xf0(r3) -/* 80C1E9D0 A0 01 00 1C */ lhz r0, 0x1c(r1) -/* 80C1E9D4 B0 03 00 F4 */ sth r0, 0xf4(r3) -/* 80C1E9D8 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 80C1E9DC 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1E9E0 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1E9E4 38 BF 02 24 */ addi r5, r31, 0x224 -/* 80C1E9E8 4B FF F3 31 */ bl __register_global_object -/* 80C1E9EC 38 61 00 10 */ addi r3, r1, 0x10 -/* 80C1E9F0 38 80 FF 38 */ li r4, -200 -/* 80C1E9F4 38 A0 00 00 */ li r5, 0 -/* 80C1E9F8 38 C0 01 2C */ li r6, 0x12c -/* 80C1E9FC 4B 64 89 F9 */ bl __ct__5csXyzFsss -/* 80C1EA00 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1EA04 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80C1EA08 90 03 00 F6 */ stw r0, 0xf6(r3) -/* 80C1EA0C A0 01 00 14 */ lhz r0, 0x14(r1) -/* 80C1EA10 B0 03 00 FA */ sth r0, 0xfa(r3) -/* 80C1EA14 38 63 00 F6 */ addi r3, r3, 0xf6 -/* 80C1EA18 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1EA1C 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1EA20 38 BF 02 30 */ addi r5, r31, 0x230 -/* 80C1EA24 4B FF F2 F5 */ bl __register_global_object -/* 80C1EA28 38 61 00 08 */ addi r3, r1, 8 -/* 80C1EA2C 38 80 01 2C */ li r4, 0x12c -/* 80C1EA30 38 A0 00 00 */ li r5, 0 -/* 80C1EA34 38 C0 02 BC */ li r6, 0x2bc -/* 80C1EA38 4B 64 89 BD */ bl __ct__5csXyzFsss -/* 80C1EA3C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1EA40 80 01 00 08 */ lwz r0, 8(r1) -/* 80C1EA44 90 03 00 FC */ stw r0, 0xfc(r3) -/* 80C1EA48 A0 01 00 0C */ lhz r0, 0xc(r1) -/* 80C1EA4C B0 03 01 00 */ sth r0, 0x100(r3) -/* 80C1EA50 38 63 00 FC */ addi r3, r3, 0xfc -/* 80C1EA54 3C 80 80 C2 */ lis r4, __dt__5csXyzFv@ha /* 0x80C1EAFC@ha */ -/* 80C1EA58 38 84 EA FC */ addi r4, r4, __dt__5csXyzFv@l /* 0x80C1EAFC@l */ -/* 80C1EA5C 38 BF 02 3C */ addi r5, r31, 0x23c -/* 80C1EA60 4B FF F2 B9 */ bl __register_global_object -/* 80C1EA64 38 00 00 01 */ li r0, 1 -/* 80C1EA68 98 1F 00 4C */ stb r0, 0x4c(r31) -lbl_80C1EA6C: -/* 80C1EA6C 88 1E 05 C8 */ lbz r0, 0x5c8(r30) -/* 80C1EA70 28 00 00 00 */ cmplwi r0, 0 -/* 80C1EA74 41 82 00 50 */ beq lbl_80C1EAC4 -/* 80C1EA78 A0 1E 05 CA */ lhz r0, 0x5ca(r30) -/* 80C1EA7C 28 00 00 2B */ cmplwi r0, 0x2b -/* 80C1EA80 40 80 00 2C */ bge lbl_80C1EAAC -/* 80C1EA84 1C 00 00 06 */ mulli r0, r0, 6 -/* 80C1EA88 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80C1EA8C 7C 03 02 AE */ lhax r0, r3, r0 -/* 80C1EA90 B0 1E 05 B8 */ sth r0, 0x5b8(r30) -/* 80C1EA94 A0 1E 05 CA */ lhz r0, 0x5ca(r30) -/* 80C1EA98 1C 00 00 06 */ mulli r0, r0, 6 -/* 80C1EA9C 7C 63 02 14 */ add r3, r3, r0 -/* 80C1EAA0 A8 03 00 04 */ lha r0, 4(r3) -/* 80C1EAA4 B0 1E 05 BC */ sth r0, 0x5bc(r30) -/* 80C1EAA8 48 00 00 10 */ b lbl_80C1EAB8 -lbl_80C1EAAC: -/* 80C1EAAC 38 00 00 00 */ li r0, 0 -/* 80C1EAB0 B0 1E 05 BC */ sth r0, 0x5bc(r30) -/* 80C1EAB4 B0 1E 05 B8 */ sth r0, 0x5b8(r30) -lbl_80C1EAB8: -/* 80C1EAB8 A0 7E 05 CA */ lhz r3, 0x5ca(r30) -/* 80C1EABC 38 03 00 01 */ addi r0, r3, 1 -/* 80C1EAC0 B0 1E 05 CA */ sth r0, 0x5ca(r30) -lbl_80C1EAC4: -/* 80C1EAC4 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80C1EAC8 90 1D 00 00 */ stw r0, 0(r29) -/* 80C1EACC 7F C3 F3 78 */ mr r3, r30 -/* 80C1EAD0 4B FF F2 F9 */ bl setBaseMtx__11daObjFuta_cFv -/* 80C1EAD4 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 80C1EAD8 38 03 00 01 */ addi r0, r3, 1 -/* 80C1EADC 90 1E 05 C0 */ stw r0, 0x5c0(r30) -/* 80C1EAE0 38 60 00 01 */ li r3, 1 -/* 80C1EAE4 39 61 01 70 */ addi r11, r1, 0x170 -/* 80C1EAE8 4B 74 37 41 */ bl _restgpr_29 -/* 80C1EAEC 80 01 01 74 */ lwz r0, 0x174(r1) -/* 80C1EAF0 7C 08 03 A6 */ mtlr r0 -/* 80C1EAF4 38 21 01 70 */ addi r1, r1, 0x170 -/* 80C1EAF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/__dt__5csXyzFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/__dt__5csXyzFv.s deleted file mode 100644 index 584145a483..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/__dt__5csXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C1EAFC: -/* 80C1EAFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EB00 7C 08 02 A6 */ mflr r0 -/* 80C1EB04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EB08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1EB0C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C1EB10 41 82 00 10 */ beq lbl_80C1EB20 -/* 80C1EB14 7C 80 07 35 */ extsh. r0, r4 -/* 80C1EB18 40 81 00 08 */ ble lbl_80C1EB20 -/* 80C1EB1C 4B 6B 02 21 */ bl __dl__FPv -lbl_80C1EB20: -/* 80C1EB20 7F E3 FB 78 */ mr r3, r31 -/* 80C1EB24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1EB28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EB2C 7C 08 03 A6 */ mtlr r0 -/* 80C1EB30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EB34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/create1st__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/create1st__11daObjFuta_cFv.s deleted file mode 100644 index cc3a3f91c5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/create1st__11daObjFuta_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80C1DF9C: -/* 80C1DF9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DFA0 7C 08 02 A6 */ mflr r0 -/* 80C1DFA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DFA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1DFAC 7C 7F 1B 78 */ mr r31, r3 -/* 80C1DFB0 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C1DFB4 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1EEC4@ha */ -/* 80C1DFB8 38 84 EE C4 */ addi r4, r4, l_arcName@l /* 0x80C1EEC4@l */ -/* 80C1DFBC 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1DFC0 4B 40 EE FD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C1DFC4 7C 60 1B 78 */ mr r0, r3 -/* 80C1DFC8 2C 00 00 04 */ cmpwi r0, 4 -/* 80C1DFCC 40 82 00 3C */ bne lbl_80C1E008 -/* 80C1DFD0 7F E3 FB 78 */ mr r3, r31 -/* 80C1DFD4 3C 80 80 C2 */ lis r4, l_arcName@ha /* 0x80C1EEC4@ha */ -/* 80C1DFD8 38 84 EE C4 */ addi r4, r4, l_arcName@l /* 0x80C1EEC4@l */ -/* 80C1DFDC 80 84 00 00 */ lwz r4, 0(r4) -/* 80C1DFE0 38 A0 00 07 */ li r5, 7 -/* 80C1DFE4 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C1DFE8 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C1DFEC 38 E0 0B 00 */ li r7, 0xb00 -/* 80C1DFF0 39 00 00 00 */ li r8, 0 -/* 80C1DFF4 4B 45 A7 C9 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C1DFF8 7C 60 1B 78 */ mr r0, r3 -/* 80C1DFFC 2C 00 00 05 */ cmpwi r0, 5 -/* 80C1E000 40 82 00 08 */ bne lbl_80C1E008 -/* 80C1E004 48 00 00 08 */ b lbl_80C1E00C -lbl_80C1E008: -/* 80C1E008 7C 03 03 78 */ mr r3, r0 -lbl_80C1E00C: -/* 80C1E00C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1E010 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1E014 7C 08 03 A6 */ mtlr r0 -/* 80C1E018 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1E01C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDelete__FP11daObjFuta_c.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDelete__FP11daObjFuta_c.s deleted file mode 100644 index 934555bb1b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDelete__FP11daObjFuta_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1EDFC: -/* 80C1EDFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EE00 7C 08 02 A6 */ mflr r0 -/* 80C1EE04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EE08 4B 45 9A D5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C1EE0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EE10 7C 08 03 A6 */ mtlr r0 -/* 80C1EE14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EE18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDraw__FP11daObjFuta_c.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDraw__FP11daObjFuta_c.s deleted file mode 100644 index e3d6170a83..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDraw__FP11daObjFuta_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1EE3C: -/* 80C1EE3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EE40 7C 08 02 A6 */ mflr r0 -/* 80C1EE44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EE48 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C1EE4C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C1EE50 7D 89 03 A6 */ mtctr r12 -/* 80C1EE54 4E 80 04 21 */ bctrl -/* 80C1EE58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EE5C 7C 08 03 A6 */ mtlr r0 -/* 80C1EE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EE64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGExecute__FP11daObjFuta_c.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGExecute__FP11daObjFuta_c.s deleted file mode 100644 index 0508ee3a86..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGExecute__FP11daObjFuta_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1EE1C: -/* 80C1EE1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EE20 7C 08 02 A6 */ mflr r0 -/* 80C1EE24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EE28 4B 45 9B 29 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C1EE2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EE30 7C 08 03 A6 */ mtlr r0 -/* 80C1EE34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EE38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_create1st__FP11daObjFuta_c.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_create1st__FP11daObjFuta_c.s deleted file mode 100644 index d6f9ee7f50..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_create1st__FP11daObjFuta_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C1ED9C: -/* 80C1ED9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EDA0 7C 08 02 A6 */ mflr r0 -/* 80C1EDA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EDA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1EDAC 7C 7F 1B 78 */ mr r31, r3 -/* 80C1EDB0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C1EDB4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C1EDB8 40 82 00 28 */ bne lbl_80C1EDE0 -/* 80C1EDBC 28 1F 00 00 */ cmplwi r31, 0 -/* 80C1EDC0 41 82 00 14 */ beq lbl_80C1EDD4 -/* 80C1EDC4 4B 45 98 61 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C1EDC8 3C 60 80 C2 */ lis r3, __vt__11daObjFuta_c@ha /* 0x80C1EF60@ha */ -/* 80C1EDCC 38 03 EF 60 */ addi r0, r3, __vt__11daObjFuta_c@l /* 0x80C1EF60@l */ -/* 80C1EDD0 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C1EDD4: -/* 80C1EDD4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C1EDD8 60 00 00 08 */ ori r0, r0, 8 -/* 80C1EDDC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C1EDE0: -/* 80C1EDE0 7F E3 FB 78 */ mr r3, r31 -/* 80C1EDE4 4B FF F1 B9 */ bl create1st__11daObjFuta_cFv -/* 80C1EDE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1EDEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EDF0 7C 08 03 A6 */ mtlr r0 -/* 80C1EDF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EDF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/initBaseMtx__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/initBaseMtx__11daObjFuta_cFv.s deleted file mode 100644 index 06509a2322..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/initBaseMtx__11daObjFuta_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C1DD8C: -/* 80C1DD8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DD90 7C 08 02 A6 */ mflr r0 -/* 80C1DD94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DD98 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80C1DD9C C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80C1DDA0 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80C1DDA4 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80C1DDA8 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80C1DDAC C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80C1DDB0 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80C1DDB4 48 00 00 15 */ bl setBaseMtx__11daObjFuta_cFv -/* 80C1DDB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DDBC 7C 08 03 A6 */ mtlr r0 -/* 80C1DDC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DDC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_end__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_end__11daObjFuta_cFv.s deleted file mode 100644 index e2b440eee0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_end__11daObjFuta_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80C1ECB4: -/* 80C1ECB4 3C 80 80 C2 */ lis r4, lit_3995@ha /* 0x80C1EE88@ha */ -/* 80C1ECB8 C0 04 EE 88 */ lfs f0, lit_3995@l(r4) /* 0x80C1EE88@l */ -/* 80C1ECBC D0 03 05 AC */ stfs f0, 0x5ac(r3) -/* 80C1ECC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_move__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_move__11daObjFuta_cFv.s deleted file mode 100644 index 1f405ba56d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_move__11daObjFuta_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C1EC44: -/* 80C1EC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EC48 7C 08 02 A6 */ mflr r0 -/* 80C1EC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1EC54 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1EC58 7C 7E 1B 78 */ mr r30, r3 -/* 80C1EC5C 3C 60 80 C2 */ lis r3, lit_3644@ha /* 0x80C1EE78@ha */ -/* 80C1EC60 3B E3 EE 78 */ addi r31, r3, lit_3644@l /* 0x80C1EE78@l */ -/* 80C1EC64 A0 1E 05 CA */ lhz r0, 0x5ca(r30) -/* 80C1EC68 28 00 00 0C */ cmplwi r0, 0xc -/* 80C1EC6C 40 81 00 30 */ ble lbl_80C1EC9C -/* 80C1EC70 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80C1EC74 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80C1EC78 C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 80C1EC7C C0 7F 00 18 */ lfs f3, 0x18(r31) -/* 80C1EC80 C0 9F 00 1C */ lfs f4, 0x1c(r31) -/* 80C1EC84 4B 65 0C F9 */ bl cLib_addCalc__FPfffff -/* 80C1EC88 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80C1EC8C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80C1EC90 40 82 00 0C */ bne lbl_80C1EC9C -/* 80C1EC94 38 00 00 02 */ li r0, 2 -/* 80C1EC98 98 1E 05 BE */ stb r0, 0x5be(r30) -lbl_80C1EC9C: -/* 80C1EC9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1ECA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1ECA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1ECA8 7C 08 03 A6 */ mtlr r0 -/* 80C1ECAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1ECB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_proc_call__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_proc_call__11daObjFuta_cFv.s deleted file mode 100644 index de0651235b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_proc_call__11daObjFuta_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80C1EB38: -/* 80C1EB38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1EB3C 7C 08 02 A6 */ mflr r0 -/* 80C1EB40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1EB44 3C 80 80 C2 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C1EEA4@ha */ -/* 80C1EB48 38 E4 EE A4 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C1EEA4@l */ -/* 80C1EB4C 3C 80 80 C2 */ lis r4, struct_80C1F1D8+0x102@ha /* 0x80C1F2DA@ha */ -/* 80C1EB50 38 C4 F2 DA */ addi r6, r4, struct_80C1F1D8+0x102@l /* 0x80C1F2DA@l */ -/* 80C1EB54 88 06 00 00 */ lbz r0, 0(r6) -/* 80C1EB58 7C 00 07 75 */ extsb. r0, r0 -/* 80C1EB5C 40 82 00 58 */ bne lbl_80C1EBB4 -/* 80C1EB60 80 87 00 24 */ lwz r4, 0x24(r7) -/* 80C1EB64 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80C1EB68 90 87 00 48 */ stw r4, 0x48(r7) -/* 80C1EB6C 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80C1EB70 80 07 00 2C */ lwz r0, 0x2c(r7) -/* 80C1EB74 90 07 00 50 */ stw r0, 0x50(r7) -/* 80C1EB78 38 A7 00 48 */ addi r5, r7, 0x48 -/* 80C1EB7C 80 87 00 30 */ lwz r4, 0x30(r7) -/* 80C1EB80 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80C1EB84 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C1EB88 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C1EB8C 80 07 00 38 */ lwz r0, 0x38(r7) -/* 80C1EB90 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C1EB94 80 87 00 3C */ lwz r4, 0x3c(r7) -/* 80C1EB98 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80C1EB9C 90 85 00 18 */ stw r4, 0x18(r5) -/* 80C1EBA0 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80C1EBA4 80 07 00 44 */ lwz r0, 0x44(r7) -/* 80C1EBA8 90 05 00 20 */ stw r0, 0x20(r5) -/* 80C1EBAC 38 00 00 01 */ li r0, 1 -/* 80C1EBB0 98 06 00 00 */ stb r0, 0(r6) -lbl_80C1EBB4: -/* 80C1EBB4 88 03 05 BE */ lbz r0, 0x5be(r3) -/* 80C1EBB8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C1EBBC 39 87 00 48 */ addi r12, r7, 0x48 -/* 80C1EBC0 7D 8C 02 14 */ add r12, r12, r0 -/* 80C1EBC4 4B 74 34 C1 */ bl __ptmf_scall -/* 80C1EBC8 60 00 00 00 */ nop -/* 80C1EBCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1EBD0 7C 08 03 A6 */ mtlr r0 -/* 80C1EBD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1EBD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_wait__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_wait__11daObjFuta_cFv.s deleted file mode 100644 index 6a613021b7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_wait__11daObjFuta_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C1EBDC: -/* 80C1EBDC 3C 80 80 43 */ lis r4, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80C1EBE0 C4 04 0C F4 */ lfsu f0, Zero__4cXyz@l(r4) /* 0x80430CF4@l */ -/* 80C1EBE4 D0 03 05 AC */ stfs f0, 0x5ac(r3) -/* 80C1EBE8 C0 04 00 04 */ lfs f0, 4(r4) -/* 80C1EBEC D0 03 05 B0 */ stfs f0, 0x5b0(r3) -/* 80C1EBF0 C0 04 00 08 */ lfs f0, 8(r4) -/* 80C1EBF4 D0 03 05 B4 */ stfs f0, 0x5b4(r3) -/* 80C1EBF8 3C 80 80 45 */ lis r4, Zero__5csXyz@ha /* 0x80451160@ha */ -/* 80C1EBFC AC 04 11 60 */ lhau r0, Zero__5csXyz@l(r4) /* 0x80451160@l */ -/* 80C1EC00 B0 03 05 B8 */ sth r0, 0x5b8(r3) -/* 80C1EC04 A8 04 00 02 */ lha r0, 2(r4) -/* 80C1EC08 B0 03 05 BA */ sth r0, 0x5ba(r3) -/* 80C1EC0C A8 04 00 04 */ lha r0, 4(r4) -/* 80C1EC10 B0 03 05 BC */ sth r0, 0x5bc(r3) -/* 80C1EC14 88 03 05 BF */ lbz r0, 0x5bf(r3) -/* 80C1EC18 28 00 00 00 */ cmplwi r0, 0 -/* 80C1EC1C 4D 82 00 20 */ beqlr -/* 80C1EC20 3C 80 80 C2 */ lis r4, lit_3985@ha /* 0x80C1EE84@ha */ -/* 80C1EC24 C0 04 EE 84 */ lfs f0, lit_3985@l(r4) /* 0x80C1EE84@l */ -/* 80C1EC28 D0 03 05 C4 */ stfs f0, 0x5c4(r3) -/* 80C1EC2C 38 00 00 01 */ li r0, 1 -/* 80C1EC30 98 03 05 BE */ stb r0, 0x5be(r3) -/* 80C1EC34 98 03 05 C8 */ stb r0, 0x5c8(r3) -/* 80C1EC38 38 00 00 00 */ li r0, 0 -/* 80C1EC3C B0 03 05 CA */ sth r0, 0x5ca(r3) -/* 80C1EC40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/setBaseMtx__11daObjFuta_cFv.s b/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/setBaseMtx__11daObjFuta_cFv.s deleted file mode 100644 index 1d18af1507..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/setBaseMtx__11daObjFuta_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80C1DDC8: -/* 80C1DDC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1DDCC 7C 08 02 A6 */ mflr r0 -/* 80C1DDD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1DDD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1DDD8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1DDDC 7C 7E 1B 78 */ mr r30, r3 -/* 80C1DDE0 3C 60 80 C2 */ lis r3, lit_3644@ha /* 0x80C1EE78@ha */ -/* 80C1DDE4 3B E3 EE 78 */ addi r31, r3, lit_3644@l /* 0x80C1EE78@l */ -/* 80C1DDE8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1DDEC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1DDF0 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80C1DDF4 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80C1DDF8 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80C1DDFC 4B 72 8A ED */ bl PSMTXTrans -/* 80C1DE00 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1DE04 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1DE08 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80C1DE0C 4B 3E E6 29 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C1DE10 C0 3E 05 AC */ lfs f1, 0x5ac(r30) -/* 80C1DE14 C0 5E 05 B0 */ lfs f2, 0x5b0(r30) -/* 80C1DE18 C0 7E 05 B4 */ lfs f3, 0x5b4(r30) -/* 80C1DE1C 4B 3E EF 81 */ bl transM__14mDoMtx_stack_cFfff -/* 80C1DE20 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C1DE24 C0 5F 00 04 */ lfs f2, 4(r31) -/* 80C1DE28 FC 60 08 90 */ fmr f3, f1 -/* 80C1DE2C 4B 3E EF 71 */ bl transM__14mDoMtx_stack_cFfff -/* 80C1DE30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1DE34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1DE38 A8 9E 05 B8 */ lha r4, 0x5b8(r30) -/* 80C1DE3C A8 BE 05 BA */ lha r5, 0x5ba(r30) -/* 80C1DE40 A8 DE 05 BC */ lha r6, 0x5bc(r30) -/* 80C1DE44 4B 3E E4 5D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C1DE48 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C1DE4C C0 5F 00 08 */ lfs f2, 8(r31) -/* 80C1DE50 FC 60 08 90 */ fmr f3, f1 -/* 80C1DE54 4B 3E EF 49 */ bl transM__14mDoMtx_stack_cFfff -/* 80C1DE58 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1DE5C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1DE60 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C1DE64 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C1DE68 4B 72 86 49 */ bl PSMTXCopy -/* 80C1DE6C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1DE70 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1DE74 38 9E 05 6C */ addi r4, r30, 0x56c -/* 80C1DE78 4B 72 86 39 */ bl PSMTXCopy -/* 80C1DE7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1DE80 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1DE84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1DE88 7C 08 03 A6 */ mtlr r0 -/* 80C1DE8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1DE90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CheckCull__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CheckCull__13daObjHHASHI_cFv.s deleted file mode 100644 index 3d800738e2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CheckCull__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_805805F4: -/* 805805F4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 805805F8 7C 08 02 A6 */ mflr r0 -/* 805805FC 90 01 00 64 */ stw r0, 0x64(r1) -/* 80580600 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80580604 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80580608 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8058060C F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80580610 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580614 4B DE 1B BD */ bl _savegpr_26 -/* 80580618 7C 7D 1B 78 */ mr r29, r3 -/* 8058061C 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 80580620 3B 63 14 AC */ addi r27, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 80580624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80580628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058062C 83 43 5D AC */ lwz r26, 0x5dac(r3) -/* 80580630 3B E0 00 00 */ li r31, 0 -/* 80580634 3B C0 00 00 */ li r30, 0 -/* 80580638 3B 80 00 00 */ li r28, 0 -/* 8058063C C3 FB 00 74 */ lfs f31, 0x74(r27) -/* 80580640 C3 DB 00 D8 */ lfs f30, 0xd8(r27) -lbl_80580644: -/* 80580644 7C 7D E2 14 */ add r3, r29, r28 -/* 80580648 C0 23 05 B8 */ lfs f1, 0x5b8(r3) -/* 8058064C C0 03 05 B0 */ lfs f0, 0x5b0(r3) -/* 80580650 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80580654 D3 E1 00 10 */ stfs f31, 0x10(r1) -/* 80580658 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8058065C C0 3A 04 D8 */ lfs f1, 0x4d8(r26) -/* 80580660 C0 1A 04 D0 */ lfs f0, 0x4d0(r26) -/* 80580664 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80580668 D3 E1 00 1C */ stfs f31, 0x1c(r1) -/* 8058066C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80580670 38 61 00 0C */ addi r3, r1, 0xc -/* 80580674 38 81 00 18 */ addi r4, r1, 0x18 -/* 80580678 4B DC 6D 25 */ bl PSVECSquareDistance -/* 8058067C FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80580680 40 81 00 58 */ ble lbl_805806D8 -/* 80580684 FC 00 08 34 */ frsqrte f0, f1 -/* 80580688 C8 9B 00 C0 */ lfd f4, 0xc0(r27) -/* 8058068C FC 44 00 32 */ fmul f2, f4, f0 -/* 80580690 C8 7B 00 C8 */ lfd f3, 0xc8(r27) -/* 80580694 FC 00 00 32 */ fmul f0, f0, f0 -/* 80580698 FC 01 00 32 */ fmul f0, f1, f0 -/* 8058069C FC 03 00 28 */ fsub f0, f3, f0 -/* 805806A0 FC 02 00 32 */ fmul f0, f2, f0 -/* 805806A4 FC 44 00 32 */ fmul f2, f4, f0 -/* 805806A8 FC 00 00 32 */ fmul f0, f0, f0 -/* 805806AC FC 01 00 32 */ fmul f0, f1, f0 -/* 805806B0 FC 03 00 28 */ fsub f0, f3, f0 -/* 805806B4 FC 02 00 32 */ fmul f0, f2, f0 -/* 805806B8 FC 44 00 32 */ fmul f2, f4, f0 -/* 805806BC FC 00 00 32 */ fmul f0, f0, f0 -/* 805806C0 FC 01 00 32 */ fmul f0, f1, f0 -/* 805806C4 FC 03 00 28 */ fsub f0, f3, f0 -/* 805806C8 FC 02 00 32 */ fmul f0, f2, f0 -/* 805806CC FC 21 00 32 */ fmul f1, f1, f0 -/* 805806D0 FC 20 08 18 */ frsp f1, f1 -/* 805806D4 48 00 00 88 */ b lbl_8058075C -lbl_805806D8: -/* 805806D8 C8 1B 00 D0 */ lfd f0, 0xd0(r27) -/* 805806DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805806E0 40 80 00 10 */ bge lbl_805806F0 -/* 805806E4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805806E8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 805806EC 48 00 00 70 */ b lbl_8058075C -lbl_805806F0: -/* 805806F0 D0 21 00 08 */ stfs f1, 8(r1) -/* 805806F4 80 81 00 08 */ lwz r4, 8(r1) -/* 805806F8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 805806FC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80580700 7C 03 00 00 */ cmpw r3, r0 -/* 80580704 41 82 00 14 */ beq lbl_80580718 -/* 80580708 40 80 00 40 */ bge lbl_80580748 -/* 8058070C 2C 03 00 00 */ cmpwi r3, 0 -/* 80580710 41 82 00 20 */ beq lbl_80580730 -/* 80580714 48 00 00 34 */ b lbl_80580748 -lbl_80580718: -/* 80580718 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8058071C 41 82 00 0C */ beq lbl_80580728 -/* 80580720 38 00 00 01 */ li r0, 1 -/* 80580724 48 00 00 28 */ b lbl_8058074C -lbl_80580728: -/* 80580728 38 00 00 02 */ li r0, 2 -/* 8058072C 48 00 00 20 */ b lbl_8058074C -lbl_80580730: -/* 80580730 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80580734 41 82 00 0C */ beq lbl_80580740 -/* 80580738 38 00 00 05 */ li r0, 5 -/* 8058073C 48 00 00 10 */ b lbl_8058074C -lbl_80580740: -/* 80580740 38 00 00 03 */ li r0, 3 -/* 80580744 48 00 00 08 */ b lbl_8058074C -lbl_80580748: -/* 80580748 38 00 00 04 */ li r0, 4 -lbl_8058074C: -/* 8058074C 2C 00 00 01 */ cmpwi r0, 1 -/* 80580750 40 82 00 0C */ bne lbl_8058075C -/* 80580754 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80580758 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8058075C: -/* 8058075C FC 01 F0 40 */ fcmpo cr0, f1, f30 -/* 80580760 40 81 00 2C */ ble lbl_8058078C -/* 80580764 7F A3 EB 78 */ mr r3, r29 -/* 80580768 7F C4 F3 78 */ mr r4, r30 -/* 8058076C 48 00 00 59 */ bl checkViewArea__13daObjHHASHI_cFi -/* 80580770 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80580774 40 82 00 18 */ bne lbl_8058078C -/* 80580778 3B FF 00 01 */ addi r31, r31, 1 -/* 8058077C 2C 1F 00 32 */ cmpwi r31, 0x32 -/* 80580780 40 82 00 0C */ bne lbl_8058078C -/* 80580784 7F A3 EB 78 */ mr r3, r29 -/* 80580788 4B A9 94 F5 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_8058078C: -/* 8058078C 3B DE 00 01 */ addi r30, r30, 1 -/* 80580790 2C 1E 00 32 */ cmpwi r30, 0x32 -/* 80580794 3B 9C 00 0C */ addi r28, r28, 0xc -/* 80580798 41 80 FE AC */ blt lbl_80580644 -/* 8058079C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 805807A0 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 805807A4 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 805807A8 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 805807AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 805807B0 4B DE 1A 6D */ bl _restgpr_26 -/* 805807B4 80 01 00 64 */ lwz r0, 0x64(r1) -/* 805807B8 7C 08 03 A6 */ mtlr r0 -/* 805807BC 38 21 00 60 */ addi r1, r1, 0x60 -/* 805807C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CreateHeap__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CreateHeap__13daObjHHASHI_cFv.s deleted file mode 100644 index 9810b7a4a0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CreateHeap__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80580DA4: -/* 80580DA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80580DA8 7C 08 02 A6 */ mflr r0 -/* 80580DAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80580DB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80580DB4 4B DE 14 1D */ bl _savegpr_26 -/* 80580DB8 7C 7F 1B 78 */ mr r31, r3 -/* 80580DBC 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x805815E4@ha */ -/* 80580DC0 38 63 15 E4 */ addi r3, r3, l_arcName@l /* 0x805815E4@l */ -/* 80580DC4 80 63 00 00 */ lwz r3, 0(r3) -/* 80580DC8 3C 80 80 58 */ lis r4, d_a_obj_hhashi__stringBase0@ha /* 0x805815AC@ha */ -/* 80580DCC 38 84 15 AC */ addi r4, r4, d_a_obj_hhashi__stringBase0@l /* 0x805815AC@l */ -/* 80580DD0 38 84 00 09 */ addi r4, r4, 9 -/* 80580DD4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80580DD8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80580DDC 3F A5 00 02 */ addis r29, r5, 2 -/* 80580DE0 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80580DE4 7F A5 EB 78 */ mr r5, r29 -/* 80580DE8 38 C0 00 80 */ li r6, 0x80 -/* 80580DEC 4B AB B5 91 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80580DF0 7C 7C 1B 78 */ mr r28, r3 -/* 80580DF4 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x805815E4@ha */ -/* 80580DF8 38 63 15 E4 */ addi r3, r3, l_arcName@l /* 0x805815E4@l */ -/* 80580DFC 80 63 00 00 */ lwz r3, 0(r3) -/* 80580E00 3C 80 80 58 */ lis r4, d_a_obj_hhashi__stringBase0@ha /* 0x805815AC@ha */ -/* 80580E04 38 84 15 AC */ addi r4, r4, d_a_obj_hhashi__stringBase0@l /* 0x805815AC@l */ -/* 80580E08 38 84 00 18 */ addi r4, r4, 0x18 -/* 80580E0C 7F A5 EB 78 */ mr r5, r29 -/* 80580E10 38 C0 00 80 */ li r6, 0x80 -/* 80580E14 4B AB B5 69 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80580E18 7C 7B 1B 78 */ mr r27, r3 -/* 80580E1C 3B 40 00 00 */ li r26, 0 -/* 80580E20 3B C0 00 00 */ li r30, 0 -/* 80580E24 3F A0 11 00 */ lis r29, 0x1100 /* 0x11000084@ha */ -lbl_80580E28: -/* 80580E28 7F 63 DB 78 */ mr r3, r27 -/* 80580E2C 3C 80 00 02 */ lis r4, 2 -/* 80580E30 38 BD 00 84 */ addi r5, r29, 0x0084 /* 0x11000084@l */ -/* 80580E34 4B A9 3E 21 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80580E38 38 1E 0F 50 */ addi r0, r30, 0xf50 -/* 80580E3C 7C 7F 01 2E */ stwx r3, r31, r0 -/* 80580E40 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 80580E44 28 00 00 00 */ cmplwi r0, 0 -/* 80580E48 40 82 00 0C */ bne lbl_80580E54 -/* 80580E4C 38 60 00 00 */ li r3, 0 -/* 80580E50 48 00 00 38 */ b lbl_80580E88 -lbl_80580E54: -/* 80580E54 3B 5A 00 01 */ addi r26, r26, 1 -/* 80580E58 2C 1A 00 32 */ cmpwi r26, 0x32 -/* 80580E5C 3B DE 00 04 */ addi r30, r30, 4 -/* 80580E60 41 80 FF C8 */ blt lbl_80580E28 -/* 80580E64 7F 83 E3 78 */ mr r3, r28 -/* 80580E68 3C 80 00 08 */ lis r4, 8 -/* 80580E6C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80580E70 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80580E74 4B A9 3D E1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80580E78 90 7F 0F 4C */ stw r3, 0xf4c(r31) -/* 80580E7C 80 7F 0F 4C */ lwz r3, 0xf4c(r31) -/* 80580E80 30 03 FF FF */ addic r0, r3, -1 -/* 80580E84 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80580E88: -/* 80580E88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80580E8C 4B DE 13 91 */ bl _restgpr_26 -/* 80580E90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80580E94 7C 08 03 A6 */ mtlr r0 -/* 80580E98 38 21 00 20 */ addi r1, r1, 0x20 -/* 80580E9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Delete__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Delete__13daObjHHASHI_cFv.s deleted file mode 100644 index f18a2bb729..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Delete__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8058140C: -/* 8058140C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80581410 7C 08 02 A6 */ mflr r0 -/* 80581414 90 01 00 14 */ stw r0, 0x14(r1) -/* 80581418 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058141C 7C 7F 1B 78 */ mr r31, r3 -/* 80581420 88 03 11 99 */ lbz r0, 0x1199(r3) -/* 80581424 28 00 00 00 */ cmplwi r0, 0 -/* 80581428 41 82 00 50 */ beq lbl_80581478 -/* 8058142C 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x805815E4@ha */ -/* 80581430 38 63 15 E4 */ addi r3, r3, l_arcName@l /* 0x805815E4@l */ -/* 80581434 80 63 00 00 */ lwz r3, 0(r3) -/* 80581438 3C 80 80 58 */ lis r4, d_a_obj_hhashi__stringBase0@ha /* 0x805815AC@ha */ -/* 8058143C 38 84 15 AC */ addi r4, r4, d_a_obj_hhashi__stringBase0@l /* 0x805815AC@l */ -/* 80581440 38 84 00 18 */ addi r4, r4, 0x18 -/* 80581444 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80581448 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058144C 3C A5 00 02 */ addis r5, r5, 2 -/* 80581450 38 C0 00 80 */ li r6, 0x80 -/* 80581454 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80581458 4B AB AF 25 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8058145C 7C 64 1B 78 */ mr r4, r3 -/* 80581460 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80581464 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80581468 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8058146C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80581470 7C 05 07 74 */ extsb r5, r0 -/* 80581474 4B AA B6 BD */ bl removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai -lbl_80581478: -/* 80581478 38 7F 10 18 */ addi r3, r31, 0x1018 -/* 8058147C 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x805815E4@ha */ -/* 80581480 38 84 15 E4 */ addi r4, r4, l_arcName@l /* 0x805815E4@l */ -/* 80581484 80 84 00 00 */ lwz r4, 0(r4) -/* 80581488 4B AA BB 81 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8058148C 38 60 00 01 */ li r3, 1 -/* 80581490 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80581494 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80581498 7C 08 03 A6 */ mtlr r0 -/* 8058149C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805814A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Draw__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Draw__13daObjHHASHI_cFv.s deleted file mode 100644 index a2aaa61e49..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Draw__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_805812BC: -/* 805812BC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805812C0 7C 08 02 A6 */ mflr r0 -/* 805812C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 805812C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 805812CC 4B DE 0F 09 */ bl _savegpr_27 -/* 805812D0 7C 7E 1B 78 */ mr r30, r3 -/* 805812D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805812D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805812DC 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 805812E0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 805812E4 28 00 00 00 */ cmplwi r0, 0 -/* 805812E8 41 82 00 5C */ beq lbl_80581344 -/* 805812EC 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 805812F0 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 805812F4 C0 03 00 D8 */ lfs f0, 0xd8(r3) -/* 805812F8 EC 41 00 28 */ fsubs f2, f1, f0 -/* 805812FC C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80581300 C0 03 00 E0 */ lfs f0, 0xe0(r3) -/* 80581304 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80581308 EC 22 00 B2 */ fmuls f1, f2, f2 -/* 8058130C EC 00 00 32 */ fmuls f0, f0, f0 -/* 80581310 EC 21 00 2A */ fadds f1, f1, f0 -/* 80581314 3C 60 80 58 */ lis r3, lit_3923@ha /* 0x80581520@ha */ -/* 80581318 C0 03 15 20 */ lfs f0, lit_3923@l(r3) /* 0x80581520@l */ -/* 8058131C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80581320 40 81 00 0C */ ble lbl_8058132C -/* 80581324 FC 00 08 34 */ frsqrte f0, f1 -/* 80581328 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_8058132C: -/* 8058132C 3C 60 80 58 */ lis r3, lit_4485@ha /* 0x805815A8@ha */ -/* 80581330 C0 03 15 A8 */ lfs f0, lit_4485@l(r3) /* 0x805815A8@l */ -/* 80581334 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80581338 40 80 00 0C */ bge lbl_80581344 -/* 8058133C 38 60 00 01 */ li r3, 1 -/* 80581340 48 00 00 B4 */ b lbl_805813F4 -lbl_80581344: -/* 80581344 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80581348 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8058134C 38 80 00 10 */ li r4, 0x10 -/* 80581350 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80581354 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80581358 4B C2 24 6D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8058135C 80 1E 05 A4 */ lwz r0, 0x5a4(r30) -/* 80581360 2C 00 00 00 */ cmpwi r0, 0 -/* 80581364 40 82 00 1C */ bne lbl_80581380 -/* 80581368 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8058136C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80581370 80 9E 0F 4C */ lwz r4, 0xf4c(r30) -/* 80581374 80 84 00 04 */ lwz r4, 4(r4) -/* 80581378 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8058137C 4B C2 3A 25 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -lbl_80581380: -/* 80581380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80581384 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80581388 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8058138C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80581390 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80581394 90 03 00 48 */ stw r0, 0x48(r3) -/* 80581398 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8058139C 90 03 00 4C */ stw r0, 0x4c(r3) -/* 805813A0 80 1E 05 A4 */ lwz r0, 0x5a4(r30) -/* 805813A4 2C 00 00 00 */ cmpwi r0, 0 -/* 805813A8 40 82 00 10 */ bne lbl_805813B8 -/* 805813AC 80 7E 0F 4C */ lwz r3, 0xf4c(r30) -/* 805813B0 4B A8 C9 15 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 805813B4 48 00 00 3C */ b lbl_805813F0 -lbl_805813B8: -/* 805813B8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 805813BC 7C 00 07 74 */ extsb r0, r0 -/* 805813C0 7C 1C 03 78 */ mr r28, r0 -/* 805813C4 3B 60 00 00 */ li r27, 0 -/* 805813C8 3B A0 00 00 */ li r29, 0 -lbl_805813CC: -/* 805813CC 7F E3 FB 78 */ mr r3, r31 -/* 805813D0 38 1D 0F 50 */ addi r0, r29, 0xf50 -/* 805813D4 7C 9E 00 2E */ lwzx r4, r30, r0 -/* 805813D8 7F 85 E3 78 */ mr r5, r28 -/* 805813DC 4B AA B7 8D */ bl entrySimpleModel__14dComIfG_play_cFP8J3DModeli -/* 805813E0 3B 7B 00 01 */ addi r27, r27, 1 -/* 805813E4 2C 1B 00 32 */ cmpwi r27, 0x32 -/* 805813E8 3B BD 00 04 */ addi r29, r29, 4 -/* 805813EC 41 80 FF E0 */ blt lbl_805813CC -lbl_805813F0: -/* 805813F0 38 60 00 01 */ li r3, 1 -lbl_805813F4: -/* 805813F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 805813F8 4B DE 0E 29 */ bl _restgpr_27 -/* 805813FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80581400 7C 08 03 A6 */ mtlr r0 -/* 80581404 38 21 00 20 */ addi r1, r1, 0x20 -/* 80581408 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Execute__13daObjHHASHI_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Execute__13daObjHHASHI_cFPPA3_A4_f.s deleted file mode 100644 index 00762a37d4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Execute__13daObjHHASHI_cFPPA3_A4_f.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80581210: -/* 80581210 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80581214 7C 08 02 A6 */ mflr r0 -/* 80581218 90 01 00 24 */ stw r0, 0x24(r1) -/* 8058121C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80581220 4B DE 0F BD */ bl _savegpr_29 -/* 80581224 7C 7D 1B 78 */ mr r29, r3 -/* 80581228 7C 9E 23 78 */ mr r30, r4 -/* 8058122C 4B FF EF 85 */ bl Obj_Damage__13daObjHHASHI_cFv -/* 80581230 80 1D 05 A4 */ lwz r0, 0x5a4(r29) -/* 80581234 2C 00 00 02 */ cmpwi r0, 2 -/* 80581238 40 82 00 30 */ bne lbl_80581268 -/* 8058123C 3B E0 00 00 */ li r31, 0 -/* 80581240 48 00 00 14 */ b lbl_80581254 -lbl_80581244: -/* 80581244 7F A3 EB 78 */ mr r3, r29 -/* 80581248 7F E4 FB 78 */ mr r4, r31 -/* 8058124C 4B FF F1 F1 */ bl Hahen_Motion__13daObjHHASHI_cFs -/* 80581250 3B FF 00 01 */ addi r31, r31, 1 -lbl_80581254: -/* 80581254 7F E0 07 34 */ extsh r0, r31 -/* 80581258 2C 00 00 32 */ cmpwi r0, 0x32 -/* 8058125C 41 80 FF E8 */ blt lbl_80581244 -/* 80581260 7F A3 EB 78 */ mr r3, r29 -/* 80581264 4B FF F3 91 */ bl CheckCull__13daObjHHASHI_cFv -lbl_80581268: -/* 80581268 38 1D 05 6C */ addi r0, r29, 0x56c -/* 8058126C 90 1E 00 00 */ stw r0, 0(r30) -/* 80581270 7F A3 EB 78 */ mr r3, r29 -/* 80581274 4B FF FA 0D */ bl setBaseMtx__13daObjHHASHI_cFv -/* 80581278 80 1D 05 A4 */ lwz r0, 0x5a4(r29) -/* 8058127C 2C 00 00 02 */ cmpwi r0, 2 -/* 80581280 41 82 00 0C */ beq lbl_8058128C -/* 80581284 7F A3 EB 78 */ mr r3, r29 -/* 80581288 4B FF E7 91 */ bl setCcCylinder__13daObjHHASHI_cFv -lbl_8058128C: -/* 8058128C A8 7D 0F 46 */ lha r3, 0xf46(r29) -/* 80581290 2C 03 00 00 */ cmpwi r3, 0 -/* 80581294 41 82 00 0C */ beq lbl_805812A0 -/* 80581298 38 03 FF FF */ addi r0, r3, -1 -/* 8058129C B0 1D 0F 46 */ sth r0, 0xf46(r29) -lbl_805812A0: -/* 805812A0 38 60 00 01 */ li r3, 1 -/* 805812A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 805812A8 4B DE 0F 81 */ bl _restgpr_29 -/* 805812AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805812B0 7C 08 03 A6 */ mtlr r0 -/* 805812B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 805812B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Hahen_Motion__13daObjHHASHI_cFs.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Hahen_Motion__13daObjHHASHI_cFs.s deleted file mode 100644 index 9cf19a1262..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Hahen_Motion__13daObjHHASHI_cFs.s +++ /dev/null @@ -1,115 +0,0 @@ -lbl_8058043C: -/* 8058043C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80580440 7C 08 02 A6 */ mflr r0 -/* 80580444 90 01 00 54 */ stw r0, 0x54(r1) -/* 80580448 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8058044C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80580450 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580454 4B DE 1D 79 */ bl _savegpr_25 -/* 80580458 7C 79 1B 78 */ mr r25, r3 -/* 8058045C 3C A0 80 58 */ lis r5, ccCylSrc@ha /* 0x805814AC@ha */ -/* 80580460 3B E5 14 AC */ addi r31, r5, ccCylSrc@l /* 0x805814AC@l */ -/* 80580464 7C 9E 07 34 */ extsh r30, r4 -/* 80580468 7F 59 F2 14 */ add r26, r25, r30 -/* 8058046C 88 1A 0F 14 */ lbz r0, 0xf14(r26) -/* 80580470 28 00 00 01 */ cmplwi r0, 1 -/* 80580474 41 82 01 60 */ beq lbl_805805D4 -/* 80580478 4B FF FE E1 */ bl Wall_Check__13daObjHHASHI_cFs -/* 8058047C 1F BE 00 0C */ mulli r29, r30, 0xc -/* 80580480 7F 99 EA 14 */ add r28, r25, r29 -/* 80580484 C0 3C 05 B4 */ lfs f1, 0x5b4(r28) -/* 80580488 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 8058048C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580490 40 80 00 CC */ bge lbl_8058055C -/* 80580494 C3 FC 08 0C */ lfs f31, 0x80c(r28) -/* 80580498 D0 1C 05 B4 */ stfs f0, 0x5b4(r28) -/* 8058049C 80 19 05 A4 */ lwz r0, 0x5a4(r25) -/* 805804A0 2C 00 00 02 */ cmpwi r0, 2 -/* 805804A4 40 82 00 60 */ bne lbl_80580504 -/* 805804A8 C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 805804AC 4B CE 74 A9 */ bl cM_rndF__Ff -/* 805804B0 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 805804B4 EC 00 08 2A */ fadds f0, f0, f1 -/* 805804B8 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 805804BC EC 01 00 2A */ fadds f0, f1, f0 -/* 805804C0 FC 00 00 50 */ fneg f0, f0 -/* 805804C4 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 805804C8 D0 1C 08 0C */ stfs f0, 0x80c(r28) -/* 805804CC 7F 9B E3 78 */ mr r27, r28 -/* 805804D0 4B CE 74 85 */ bl cM_rndF__Ff -/* 805804D4 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 805804D8 EC 20 08 2A */ fadds f1, f0, f1 -/* 805804DC C0 1B 08 08 */ lfs f0, 0x808(r27) -/* 805804E0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 805804E4 D0 1B 08 08 */ stfs f0, 0x808(r27) -/* 805804E8 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 805804EC 4B CE 74 69 */ bl cM_rndF__Ff -/* 805804F0 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 805804F4 EC 20 08 2A */ fadds f1, f0, f1 -/* 805804F8 C0 1B 08 10 */ lfs f0, 0x810(r27) -/* 805804FC EC 00 00 72 */ fmuls f0, f0, f1 -/* 80580500 D0 1B 08 10 */ stfs f0, 0x810(r27) -lbl_80580504: -/* 80580504 C0 3C 08 0C */ lfs f1, 0x80c(r28) -/* 80580508 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 8058050C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580510 40 80 00 0C */ bge lbl_8058051C -/* 80580514 38 00 00 01 */ li r0, 1 -/* 80580518 98 1A 0F 14 */ stb r0, 0xf14(r26) -lbl_8058051C: -/* 8058051C C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 80580520 4B CE 74 6D */ bl cM_rndFX__Ff -/* 80580524 FC 00 08 1E */ fctiwz f0, f1 -/* 80580528 D8 01 00 08 */ stfd f0, 8(r1) -/* 8058052C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80580530 1F 5E 00 06 */ mulli r26, r30, 6 -/* 80580534 7C 79 D2 14 */ add r3, r25, r26 -/* 80580538 B0 03 0D E8 */ sth r0, 0xde8(r3) -/* 8058053C C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 80580540 4B CE 74 4D */ bl cM_rndFX__Ff -/* 80580544 FC 00 08 1E */ fctiwz f0, f1 -/* 80580548 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8058054C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80580550 7C 79 D2 14 */ add r3, r25, r26 -/* 80580554 B0 03 0D EA */ sth r0, 0xdea(r3) -/* 80580558 48 00 00 7C */ b lbl_805805D4 -lbl_8058055C: -/* 8058055C C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 80580560 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580564 4C 41 13 82 */ cror 2, 1, 2 -/* 80580568 40 82 00 6C */ bne lbl_805805D4 -/* 8058056C C0 3C 08 0C */ lfs f1, 0x80c(r28) -/* 80580570 C0 19 05 30 */ lfs f0, 0x530(r25) -/* 80580574 EC 01 00 2A */ fadds f0, f1, f0 -/* 80580578 D0 1C 08 0C */ stfs f0, 0x80c(r28) -/* 8058057C C0 3C 05 B0 */ lfs f1, 0x5b0(r28) -/* 80580580 C0 1C 08 08 */ lfs f0, 0x808(r28) -/* 80580584 EC 01 00 2A */ fadds f0, f1, f0 -/* 80580588 D0 1C 05 B0 */ stfs f0, 0x5b0(r28) -/* 8058058C C0 3C 05 B4 */ lfs f1, 0x5b4(r28) -/* 80580590 C0 1C 08 0C */ lfs f0, 0x80c(r28) -/* 80580594 EC 01 00 2A */ fadds f0, f1, f0 -/* 80580598 D0 1C 05 B4 */ stfs f0, 0x5b4(r28) -/* 8058059C C0 3C 05 B8 */ lfs f1, 0x5b8(r28) -/* 805805A0 C0 1C 08 10 */ lfs f0, 0x810(r28) -/* 805805A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805805A8 D0 1C 05 B8 */ stfs f0, 0x5b8(r28) -/* 805805AC 1C 1E 00 06 */ mulli r0, r30, 6 -/* 805805B0 7C 99 02 14 */ add r4, r25, r0 -/* 805805B4 A8 64 0C BC */ lha r3, 0xcbc(r4) -/* 805805B8 A8 04 0D E8 */ lha r0, 0xde8(r4) -/* 805805BC 7C 03 02 14 */ add r0, r3, r0 -/* 805805C0 B0 04 0C BC */ sth r0, 0xcbc(r4) -/* 805805C4 A8 64 0C BE */ lha r3, 0xcbe(r4) -/* 805805C8 A8 04 0D EA */ lha r0, 0xdea(r4) -/* 805805CC 7C 03 02 14 */ add r0, r3, r0 -/* 805805D0 B0 04 0C BE */ sth r0, 0xcbe(r4) -lbl_805805D4: -/* 805805D4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 805805D8 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 805805DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 805805E0 4B DE 1C 39 */ bl _restgpr_25 -/* 805805E4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 805805E8 7C 08 03 A6 */ mtlr r0 -/* 805805EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 805805F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Obj_Damage__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Obj_Damage__13daObjHHASHI_cFv.s deleted file mode 100644 index 2b9fa4281d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Obj_Damage__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_805801B0: -/* 805801B0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 805801B4 7C 08 02 A6 */ mflr r0 -/* 805801B8 90 01 00 44 */ stw r0, 0x44(r1) -/* 805801BC 39 61 00 40 */ addi r11, r1, 0x40 -/* 805801C0 4B DE 20 19 */ bl _savegpr_28 -/* 805801C4 7C 7D 1B 78 */ mr r29, r3 -/* 805801C8 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 805801CC 3B E3 14 AC */ addi r31, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 805801D0 A8 1D 0F 46 */ lha r0, 0xf46(r29) -/* 805801D4 2C 00 00 00 */ cmpwi r0, 0 -/* 805801D8 40 82 01 68 */ bne lbl_80580340 -/* 805801DC 38 7D 10 3C */ addi r3, r29, 0x103c -/* 805801E0 4B B0 36 51 */ bl Move__10dCcD_GSttsFv -/* 805801E4 38 7D 10 5C */ addi r3, r29, 0x105c -/* 805801E8 4B B0 42 79 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 805801EC 28 03 00 00 */ cmplwi r3, 0 -/* 805801F0 41 82 01 50 */ beq lbl_80580340 -/* 805801F4 38 00 00 0A */ li r0, 0xa -/* 805801F8 B0 1D 0F 46 */ sth r0, 0xf46(r29) -/* 805801FC 38 7D 10 5C */ addi r3, r29, 0x105c -/* 80580200 4B B0 42 F9 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80580204 4B CE 38 45 */ bl GetAc__8cCcD_ObjFv -/* 80580208 7C 7E 1B 78 */ mr r30, r3 -/* 8058020C 3B 9D 11 30 */ addi r28, r29, 0x1130 -/* 80580210 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80580214 7F 84 E3 78 */ mr r4, r28 -/* 80580218 4B CF 09 ED */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8058021C A8 1E 00 08 */ lha r0, 8(r30) -/* 80580220 2C 00 01 D7 */ cmpwi r0, 0x1d7 -/* 80580224 40 82 00 E0 */ bne lbl_80580304 -/* 80580228 A8 7D 05 AA */ lha r3, 0x5aa(r29) -/* 8058022C 38 03 00 01 */ addi r0, r3, 1 -/* 80580230 B0 1D 05 AA */ sth r0, 0x5aa(r29) -/* 80580234 28 1E 00 00 */ cmplwi r30, 0 -/* 80580238 41 82 00 0C */ beq lbl_80580244 -/* 8058023C 80 1E 00 04 */ lwz r0, 4(r30) -/* 80580240 48 00 00 08 */ b lbl_80580248 -lbl_80580244: -/* 80580244 38 00 FF FF */ li r0, -1 -lbl_80580248: -/* 80580248 90 01 00 08 */ stw r0, 8(r1) -/* 8058024C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80580250 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80580254 38 81 00 08 */ addi r4, r1, 8 -/* 80580258 4B A9 95 A1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8058025C 28 03 00 00 */ cmplwi r3, 0 -/* 80580260 41 82 00 30 */ beq lbl_80580290 -/* 80580264 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80580268 C8 3F 00 90 */ lfd f1, 0x90(r31) -/* 8058026C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80580270 90 01 00 24 */ stw r0, 0x24(r1) -/* 80580274 3C 00 43 30 */ lis r0, 0x4330 -/* 80580278 90 01 00 20 */ stw r0, 0x20(r1) -/* 8058027C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80580280 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80580284 D0 1D 0C B8 */ stfs f0, 0xcb8(r29) -/* 80580288 88 03 18 28 */ lbz r0, 0x1828(r3) -/* 8058028C 98 1D 05 A8 */ stb r0, 0x5a8(r29) -lbl_80580290: -/* 80580290 88 7D 05 A8 */ lbz r3, 0x5a8(r29) -/* 80580294 2C 03 00 01 */ cmpwi r3, 1 -/* 80580298 40 82 00 18 */ bne lbl_805802B0 -/* 8058029C C0 3D 0C B8 */ lfs f1, 0xcb8(r29) -/* 805802A0 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 805802A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805802A8 D0 1D 0C B8 */ stfs f0, 0xcb8(r29) -/* 805802AC 48 00 00 1C */ b lbl_805802C8 -lbl_805802B0: -/* 805802B0 7C 60 07 75 */ extsb. r0, r3 -/* 805802B4 40 82 00 14 */ bne lbl_805802C8 -/* 805802B8 C0 3D 0C B8 */ lfs f1, 0xcb8(r29) -/* 805802BC C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 805802C0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805802C4 D0 1D 0C B8 */ stfs f0, 0xcb8(r29) -lbl_805802C8: -/* 805802C8 7F A3 EB 78 */ mr r3, r29 -/* 805802CC 7F 84 E3 78 */ mr r4, r28 -/* 805802D0 4B FF F7 C1 */ bl Set_Hahen__13daObjHHASHI_cFP4cXyz -/* 805802D4 C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 805802D8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 805802DC C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 805802E0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805802E4 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 805802E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805802EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805802F0 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 805802F4 38 80 00 07 */ li r4, 7 -/* 805802F8 38 A0 00 01 */ li r5, 1 -/* 805802FC 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80580300 4B AE F7 25 */ bl StartShock__12dVibration_cFii4cXyz -lbl_80580304: -/* 80580304 38 7D 10 5C */ addi r3, r29, 0x105c -/* 80580308 4B B0 41 B1 */ bl ResetTgHit__12dCcD_GObjInfFv -/* 8058030C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80580310 7C 03 07 74 */ extsb r3, r0 -/* 80580314 3C 80 00 07 */ lis r4, 0x0007 /* 0x00070060@ha */ -/* 80580318 38 04 00 60 */ addi r0, r4, 0x0060 /* 0x00070060@l */ -/* 8058031C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80580320 4B AA CD 4D */ bl dComIfGp_getReverb__Fi -/* 80580324 7C 67 1B 78 */ mr r7, r3 -/* 80580328 38 7E 06 3C */ addi r3, r30, 0x63c -/* 8058032C 38 81 00 0C */ addi r4, r1, 0xc -/* 80580330 88 BE 18 28 */ lbz r5, 0x1828(r30) -/* 80580334 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 80580338 38 C0 00 00 */ li r6, 0 -/* 8058033C 4B D4 1E 59 */ bl startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc -lbl_80580340: -/* 80580340 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580344 4B DE 1E E1 */ bl _restgpr_28 -/* 80580348 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8058034C 7C 08 03 A6 */ mtlr r0 -/* 80580350 38 21 00 40 */ addi r1, r1, 0x40 -/* 80580354 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Roll_Set__13daObjHHASHI_cFP4cXyzfs.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Roll_Set__13daObjHHASHI_cFP4cXyzfs.s deleted file mode 100644 index 92d8f0f11c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Roll_Set__13daObjHHASHI_cFP4cXyzfs.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_80580A48: -/* 80580A48 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80580A4C 7C 08 02 A6 */ mflr r0 -/* 80580A50 90 01 00 74 */ stw r0, 0x74(r1) -/* 80580A54 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80580A58 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80580A5C DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80580A60 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80580A64 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 80580A68 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 80580A6C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580A70 4B DE 17 61 */ bl _savegpr_26 -/* 80580A74 7C 7B 1B 78 */ mr r27, r3 -/* 80580A78 7C 9E 23 78 */ mr r30, r4 -/* 80580A7C FF A0 08 90 */ fmr f29, f1 -/* 80580A80 7C BA 2B 78 */ mr r26, r5 -/* 80580A84 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 80580A88 3B E3 14 AC */ addi r31, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 80580A8C C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 80580A90 4B CE 6E FD */ bl cM_rndFX__Ff -/* 80580A94 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 80580A98 EC 00 08 2A */ fadds f0, f0, f1 -/* 80580A9C EF DD 00 32 */ fmuls f30, f29, f0 -/* 80580AA0 7F 5C 07 34 */ extsh r28, r26 -/* 80580AA4 1F BC 00 0C */ mulli r29, r28, 0xc -/* 80580AA8 7F 5B EA 14 */ add r26, r27, r29 -/* 80580AAC 38 7A 05 B0 */ addi r3, r26, 0x5b0 -/* 80580AB0 7F C4 F3 78 */ mr r4, r30 -/* 80580AB4 4B CF 01 51 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80580AB8 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80580ABC EF E0 07 72 */ fmuls f31, f0, f29 -/* 80580AC0 54 7E 04 38 */ rlwinm r30, r3, 0, 0x10, 0x1c -/* 80580AC4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80580AC8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80580ACC 7C 03 F4 2E */ lfsx f0, r3, r30 -/* 80580AD0 EF BF 00 32 */ fmuls f29, f31, f0 -/* 80580AD4 38 7A 0A 60 */ addi r3, r26, 0xa60 -/* 80580AD8 4B DC 66 61 */ bl PSVECSquareMag -/* 80580ADC C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80580AE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580AE4 40 81 00 58 */ ble lbl_80580B3C -/* 80580AE8 FC 00 08 34 */ frsqrte f0, f1 -/* 80580AEC C8 9F 00 C0 */ lfd f4, 0xc0(r31) -/* 80580AF0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80580AF4 C8 7F 00 C8 */ lfd f3, 0xc8(r31) -/* 80580AF8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80580AFC FC 01 00 32 */ fmul f0, f1, f0 -/* 80580B00 FC 03 00 28 */ fsub f0, f3, f0 -/* 80580B04 FC 02 00 32 */ fmul f0, f2, f0 -/* 80580B08 FC 44 00 32 */ fmul f2, f4, f0 -/* 80580B0C FC 00 00 32 */ fmul f0, f0, f0 -/* 80580B10 FC 01 00 32 */ fmul f0, f1, f0 -/* 80580B14 FC 03 00 28 */ fsub f0, f3, f0 -/* 80580B18 FC 02 00 32 */ fmul f0, f2, f0 -/* 80580B1C FC 44 00 32 */ fmul f2, f4, f0 -/* 80580B20 FC 00 00 32 */ fmul f0, f0, f0 -/* 80580B24 FC 01 00 32 */ fmul f0, f1, f0 -/* 80580B28 FC 03 00 28 */ fsub f0, f3, f0 -/* 80580B2C FC 02 00 32 */ fmul f0, f2, f0 -/* 80580B30 FC 21 00 32 */ fmul f1, f1, f0 -/* 80580B34 FC 20 08 18 */ frsp f1, f1 -/* 80580B38 48 00 00 88 */ b lbl_80580BC0 -lbl_80580B3C: -/* 80580B3C C8 1F 00 D0 */ lfd f0, 0xd0(r31) -/* 80580B40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580B44 40 80 00 10 */ bge lbl_80580B54 -/* 80580B48 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80580B4C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80580B50 48 00 00 70 */ b lbl_80580BC0 -lbl_80580B54: -/* 80580B54 D0 21 00 08 */ stfs f1, 8(r1) -/* 80580B58 80 81 00 08 */ lwz r4, 8(r1) -/* 80580B5C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80580B60 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80580B64 7C 03 00 00 */ cmpw r3, r0 -/* 80580B68 41 82 00 14 */ beq lbl_80580B7C -/* 80580B6C 40 80 00 40 */ bge lbl_80580BAC -/* 80580B70 2C 03 00 00 */ cmpwi r3, 0 -/* 80580B74 41 82 00 20 */ beq lbl_80580B94 -/* 80580B78 48 00 00 34 */ b lbl_80580BAC -lbl_80580B7C: -/* 80580B7C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80580B80 41 82 00 0C */ beq lbl_80580B8C -/* 80580B84 38 00 00 01 */ li r0, 1 -/* 80580B88 48 00 00 28 */ b lbl_80580BB0 -lbl_80580B8C: -/* 80580B8C 38 00 00 02 */ li r0, 2 -/* 80580B90 48 00 00 20 */ b lbl_80580BB0 -lbl_80580B94: -/* 80580B94 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80580B98 41 82 00 0C */ beq lbl_80580BA4 -/* 80580B9C 38 00 00 05 */ li r0, 5 -/* 80580BA0 48 00 00 10 */ b lbl_80580BB0 -lbl_80580BA4: -/* 80580BA4 38 00 00 03 */ li r0, 3 -/* 80580BA8 48 00 00 08 */ b lbl_80580BB0 -lbl_80580BAC: -/* 80580BAC 38 00 00 04 */ li r0, 4 -lbl_80580BB0: -/* 80580BB0 2C 00 00 01 */ cmpwi r0, 1 -/* 80580BB4 40 82 00 0C */ bne lbl_80580BC0 -/* 80580BB8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80580BBC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80580BC0: -/* 80580BC0 C0 1F 00 E4 */ lfs f0, 0xe4(r31) -/* 80580BC4 EC 20 08 24 */ fdivs f1, f0, f1 -/* 80580BC8 C0 1B 05 30 */ lfs f0, 0x530(r27) -/* 80580BCC EC 5E 00 2A */ fadds f2, f30, f0 -/* 80580BD0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80580BD4 38 03 9A 20 */ addi r0, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80580BD8 7C 60 F2 14 */ add r3, r0, r30 -/* 80580BDC C0 03 00 04 */ lfs f0, 4(r3) -/* 80580BE0 EC 7F 00 32 */ fmuls f3, f31, f0 -/* 80580BE4 EC 01 07 72 */ fmuls f0, f1, f29 -/* 80580BE8 7C 7B EA 14 */ add r3, r27, r29 -/* 80580BEC D0 03 08 08 */ stfs f0, 0x808(r3) -/* 80580BF0 D0 43 08 0C */ stfs f2, 0x80c(r3) -/* 80580BF4 EC 01 00 F2 */ fmuls f0, f1, f3 -/* 80580BF8 D0 03 08 10 */ stfs f0, 0x810(r3) -/* 80580BFC C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 80580C00 4B CE 6D 8D */ bl cM_rndFX__Ff -/* 80580C04 FC 00 08 1E */ fctiwz f0, f1 -/* 80580C08 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80580C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80580C10 1F 5C 00 06 */ mulli r26, r28, 6 -/* 80580C14 7C 7B D2 14 */ add r3, r27, r26 -/* 80580C18 B0 03 0D E8 */ sth r0, 0xde8(r3) -/* 80580C1C C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 80580C20 4B CE 6D 6D */ bl cM_rndFX__Ff -/* 80580C24 FC 00 08 1E */ fctiwz f0, f1 -/* 80580C28 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80580C2C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80580C30 7C 9B D2 14 */ add r4, r27, r26 -/* 80580C34 B0 04 0D EA */ sth r0, 0xdea(r4) -/* 80580C38 A8 64 0C BC */ lha r3, 0xcbc(r4) -/* 80580C3C 38 03 10 00 */ addi r0, r3, 0x1000 -/* 80580C40 B0 04 0C BC */ sth r0, 0xcbc(r4) -/* 80580C44 A8 64 0C BE */ lha r3, 0xcbe(r4) -/* 80580C48 38 03 10 00 */ addi r0, r3, 0x1000 -/* 80580C4C B0 04 0C BE */ sth r0, 0xcbe(r4) -/* 80580C50 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80580C54 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80580C58 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80580C5C CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80580C60 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 80580C64 CB A1 00 40 */ lfd f29, 0x40(r1) -/* 80580C68 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580C6C 4B DE 15 B1 */ bl _restgpr_26 -/* 80580C70 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80580C74 7C 08 03 A6 */ mtlr r0 -/* 80580C78 38 21 00 70 */ addi r1, r1, 0x70 -/* 80580C7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Rolling__13daObjHHASHI_cFP4cXyzffSc.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Rolling__13daObjHHASHI_cFP4cXyzffSc.s deleted file mode 100644 index 342bcb9bc3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Rolling__13daObjHHASHI_cFP4cXyzffSc.s +++ /dev/null @@ -1,139 +0,0 @@ -lbl_80580854: -/* 80580854 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80580858 7C 08 02 A6 */ mflr r0 -/* 8058085C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80580860 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80580864 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80580868 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 8058086C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80580870 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 80580874 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 80580878 39 61 00 40 */ addi r11, r1, 0x40 -/* 8058087C 4B DE 19 59 */ bl _savegpr_27 -/* 80580880 7C 7D 1B 78 */ mr r29, r3 -/* 80580884 7C 9E 23 78 */ mr r30, r4 -/* 80580888 FF A0 08 90 */ fmr f29, f1 -/* 8058088C FF C0 10 90 */ fmr f30, f2 -/* 80580890 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 80580894 3B 83 14 AC */ addi r28, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 80580898 98 BD 05 A8 */ stb r5, 0x5a8(r29) -/* 8058089C 80 1D 05 A4 */ lwz r0, 0x5a4(r29) -/* 805808A0 2C 00 00 02 */ cmpwi r0, 2 -/* 805808A4 40 82 01 74 */ bne lbl_80580A18 -/* 805808A8 3B E0 00 00 */ li r31, 0 -/* 805808AC C3 FC 00 74 */ lfs f31, 0x74(r28) -/* 805808B0 48 00 01 5C */ b lbl_80580A0C -lbl_805808B4: -/* 805808B4 C0 3E 00 08 */ lfs f1, 8(r30) -/* 805808B8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 805808BC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 805808C0 D3 E1 00 10 */ stfs f31, 0x10(r1) -/* 805808C4 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 805808C8 7F FB 07 34 */ extsh r27, r31 -/* 805808CC 1C 1B 00 0C */ mulli r0, r27, 0xc -/* 805808D0 7C 7D 02 14 */ add r3, r29, r0 -/* 805808D4 C0 23 05 B8 */ lfs f1, 0x5b8(r3) -/* 805808D8 C0 03 05 B0 */ lfs f0, 0x5b0(r3) -/* 805808DC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805808E0 D3 E1 00 1C */ stfs f31, 0x1c(r1) -/* 805808E4 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 805808E8 38 61 00 0C */ addi r3, r1, 0xc -/* 805808EC 38 81 00 18 */ addi r4, r1, 0x18 -/* 805808F0 4B DC 6A AD */ bl PSVECSquareDistance -/* 805808F4 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 805808F8 40 81 00 58 */ ble lbl_80580950 -/* 805808FC FC 00 08 34 */ frsqrte f0, f1 -/* 80580900 C8 9C 00 C0 */ lfd f4, 0xc0(r28) -/* 80580904 FC 44 00 32 */ fmul f2, f4, f0 -/* 80580908 C8 7C 00 C8 */ lfd f3, 0xc8(r28) -/* 8058090C FC 00 00 32 */ fmul f0, f0, f0 -/* 80580910 FC 01 00 32 */ fmul f0, f1, f0 -/* 80580914 FC 03 00 28 */ fsub f0, f3, f0 -/* 80580918 FC 02 00 32 */ fmul f0, f2, f0 -/* 8058091C FC 44 00 32 */ fmul f2, f4, f0 -/* 80580920 FC 00 00 32 */ fmul f0, f0, f0 -/* 80580924 FC 01 00 32 */ fmul f0, f1, f0 -/* 80580928 FC 03 00 28 */ fsub f0, f3, f0 -/* 8058092C FC 02 00 32 */ fmul f0, f2, f0 -/* 80580930 FC 44 00 32 */ fmul f2, f4, f0 -/* 80580934 FC 00 00 32 */ fmul f0, f0, f0 -/* 80580938 FC 01 00 32 */ fmul f0, f1, f0 -/* 8058093C FC 03 00 28 */ fsub f0, f3, f0 -/* 80580940 FC 02 00 32 */ fmul f0, f2, f0 -/* 80580944 FC 21 00 32 */ fmul f1, f1, f0 -/* 80580948 FC 20 08 18 */ frsp f1, f1 -/* 8058094C 48 00 00 88 */ b lbl_805809D4 -lbl_80580950: -/* 80580950 C8 1C 00 D0 */ lfd f0, 0xd0(r28) -/* 80580954 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80580958 40 80 00 10 */ bge lbl_80580968 -/* 8058095C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80580960 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80580964 48 00 00 70 */ b lbl_805809D4 -lbl_80580968: -/* 80580968 D0 21 00 08 */ stfs f1, 8(r1) -/* 8058096C 80 81 00 08 */ lwz r4, 8(r1) -/* 80580970 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80580974 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80580978 7C 03 00 00 */ cmpw r3, r0 -/* 8058097C 41 82 00 14 */ beq lbl_80580990 -/* 80580980 40 80 00 40 */ bge lbl_805809C0 -/* 80580984 2C 03 00 00 */ cmpwi r3, 0 -/* 80580988 41 82 00 20 */ beq lbl_805809A8 -/* 8058098C 48 00 00 34 */ b lbl_805809C0 -lbl_80580990: -/* 80580990 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80580994 41 82 00 0C */ beq lbl_805809A0 -/* 80580998 38 00 00 01 */ li r0, 1 -/* 8058099C 48 00 00 28 */ b lbl_805809C4 -lbl_805809A0: -/* 805809A0 38 00 00 02 */ li r0, 2 -/* 805809A4 48 00 00 20 */ b lbl_805809C4 -lbl_805809A8: -/* 805809A8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805809AC 41 82 00 0C */ beq lbl_805809B8 -/* 805809B0 38 00 00 05 */ li r0, 5 -/* 805809B4 48 00 00 10 */ b lbl_805809C4 -lbl_805809B8: -/* 805809B8 38 00 00 03 */ li r0, 3 -/* 805809BC 48 00 00 08 */ b lbl_805809C4 -lbl_805809C0: -/* 805809C0 38 00 00 04 */ li r0, 4 -lbl_805809C4: -/* 805809C4 2C 00 00 01 */ cmpwi r0, 1 -/* 805809C8 40 82 00 0C */ bne lbl_805809D4 -/* 805809CC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805809D0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_805809D4: -/* 805809D4 FC 01 E8 40 */ fcmpo cr0, f1, f29 -/* 805809D8 40 80 00 30 */ bge lbl_80580A08 -/* 805809DC 3B 7B 0F 14 */ addi r27, r27, 0xf14 -/* 805809E0 7C 1D D8 AE */ lbzx r0, r29, r27 -/* 805809E4 28 00 00 01 */ cmplwi r0, 1 -/* 805809E8 40 82 00 20 */ bne lbl_80580A08 -/* 805809EC 7F A3 EB 78 */ mr r3, r29 -/* 805809F0 7F C4 F3 78 */ mr r4, r30 -/* 805809F4 FC 20 F0 90 */ fmr f1, f30 -/* 805809F8 7F E5 FB 78 */ mr r5, r31 -/* 805809FC 48 00 00 4D */ bl Roll_Set__13daObjHHASHI_cFP4cXyzfs -/* 80580A00 38 00 00 00 */ li r0, 0 -/* 80580A04 7C 1D D9 AE */ stbx r0, r29, r27 -lbl_80580A08: -/* 80580A08 3B FF 00 01 */ addi r31, r31, 1 -lbl_80580A0C: -/* 80580A0C 7F E0 07 34 */ extsh r0, r31 -/* 80580A10 2C 00 00 32 */ cmpwi r0, 0x32 -/* 80580A14 41 80 FE A0 */ blt lbl_805808B4 -lbl_80580A18: -/* 80580A18 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 80580A1C CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80580A20 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80580A24 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80580A28 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 80580A2C CB A1 00 40 */ lfd f29, 0x40(r1) -/* 80580A30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80580A34 4B DE 17 ED */ bl _restgpr_27 -/* 80580A38 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80580A3C 7C 08 03 A6 */ mtlr r0 -/* 80580A40 38 21 00 70 */ addi r1, r1, 0x70 -/* 80580A44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Hahen__13daObjHHASHI_cFP4cXyz.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Hahen__13daObjHHASHI_cFP4cXyz.s deleted file mode 100644 index b0e185ec0e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Hahen__13daObjHHASHI_cFP4cXyz.s +++ /dev/null @@ -1,170 +0,0 @@ -lbl_8057FA90: -/* 8057FA90 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8057FA94 7C 08 02 A6 */ mflr r0 -/* 8057FA98 90 01 00 54 */ stw r0, 0x54(r1) -/* 8057FA9C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8057FAA0 4B DE 27 39 */ bl _savegpr_28 -/* 8057FAA4 7C 7C 1B 78 */ mr r28, r3 -/* 8057FAA8 7C 9D 23 78 */ mr r29, r4 -/* 8057FAAC 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 8057FAB0 3B C3 14 AC */ addi r30, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 8057FAB4 38 61 00 24 */ addi r3, r1, 0x24 -/* 8057FAB8 38 80 00 00 */ li r4, 0 -/* 8057FABC 38 A0 00 00 */ li r5, 0 -/* 8057FAC0 38 C0 00 00 */ li r6, 0 -/* 8057FAC4 4B CE 79 31 */ bl __ct__5csXyzFsss -/* 8057FAC8 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 8057FACC 7C 03 07 74 */ extsb r3, r0 -/* 8057FAD0 4B AA D5 9D */ bl dComIfGp_getReverb__Fi -/* 8057FAD4 7C 67 1B 78 */ mr r7, r3 -/* 8057FAD8 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080162@ha */ -/* 8057FADC 38 03 01 62 */ addi r0, r3, 0x0162 /* 0x00080162@l */ -/* 8057FAE0 90 01 00 20 */ stw r0, 0x20(r1) -/* 8057FAE4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8057FAE8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8057FAEC 80 63 00 00 */ lwz r3, 0(r3) -/* 8057FAF0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8057FAF4 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 8057FAF8 38 C0 00 00 */ li r6, 0 -/* 8057FAFC C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FB00 FC 40 08 90 */ fmr f2, f1 -/* 8057FB04 C0 7E 00 48 */ lfs f3, 0x48(r30) -/* 8057FB08 FC 80 18 90 */ fmr f4, f3 -/* 8057FB0C 39 00 00 00 */ li r8, 0 -/* 8057FB10 4B D2 BE 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8057FB14 80 1C 05 A4 */ lwz r0, 0x5a4(r28) -/* 8057FB18 2C 00 00 00 */ cmpwi r0, 0 -/* 8057FB1C 40 82 01 FC */ bne lbl_8057FD18 -/* 8057FB20 C0 5C 04 D8 */ lfs f2, 0x4d8(r28) -/* 8057FB24 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 8057FB28 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8057FB2C EC 21 00 2A */ fadds f1, f1, f0 -/* 8057FB30 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8057FB34 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8057FB38 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 8057FB3C D0 41 00 34 */ stfs f2, 0x34(r1) -/* 8057FB40 C0 1C 0C B8 */ lfs f0, 0xcb8(r28) -/* 8057FB44 FC 00 00 1E */ fctiwz f0, f0 -/* 8057FB48 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 8057FB4C 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8057FB50 B0 01 00 26 */ sth r0, 0x26(r1) -/* 8057FB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057FB58 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057FB5C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057FB60 38 80 00 00 */ li r4, 0 -/* 8057FB64 90 81 00 08 */ stw r4, 8(r1) -/* 8057FB68 38 00 FF FF */ li r0, -1 -/* 8057FB6C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057FB70 90 81 00 10 */ stw r4, 0x10(r1) -/* 8057FB74 90 81 00 14 */ stw r4, 0x14(r1) -/* 8057FB78 90 81 00 18 */ stw r4, 0x18(r1) -/* 8057FB7C 38 80 00 00 */ li r4, 0 -/* 8057FB80 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008710@ha */ -/* 8057FB84 38 A5 87 10 */ addi r5, r5, 0x8710 /* 0x00008710@l */ -/* 8057FB88 7F A6 EB 78 */ mr r6, r29 -/* 8057FB8C 38 FC 01 0C */ addi r7, r28, 0x10c -/* 8057FB90 39 01 00 24 */ addi r8, r1, 0x24 -/* 8057FB94 39 20 00 00 */ li r9, 0 -/* 8057FB98 39 40 00 FF */ li r10, 0xff -/* 8057FB9C C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FBA0 4B AC CE F1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8057FBA4 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057FBA8 38 80 00 00 */ li r4, 0 -/* 8057FBAC 90 81 00 08 */ stw r4, 8(r1) -/* 8057FBB0 38 00 FF FF */ li r0, -1 -/* 8057FBB4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057FBB8 90 81 00 10 */ stw r4, 0x10(r1) -/* 8057FBBC 90 81 00 14 */ stw r4, 0x14(r1) -/* 8057FBC0 90 81 00 18 */ stw r4, 0x18(r1) -/* 8057FBC4 38 80 00 00 */ li r4, 0 -/* 8057FBC8 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008711@ha */ -/* 8057FBCC 38 A5 87 11 */ addi r5, r5, 0x8711 /* 0x00008711@l */ -/* 8057FBD0 7F A6 EB 78 */ mr r6, r29 -/* 8057FBD4 38 FC 01 0C */ addi r7, r28, 0x10c -/* 8057FBD8 39 01 00 24 */ addi r8, r1, 0x24 -/* 8057FBDC 39 20 00 00 */ li r9, 0 -/* 8057FBE0 39 40 00 FF */ li r10, 0xff -/* 8057FBE4 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FBE8 4B AC CE A9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8057FBEC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057FBF0 38 80 00 00 */ li r4, 0 -/* 8057FBF4 90 81 00 08 */ stw r4, 8(r1) -/* 8057FBF8 38 00 FF FF */ li r0, -1 -/* 8057FBFC 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057FC00 90 81 00 10 */ stw r4, 0x10(r1) -/* 8057FC04 90 81 00 14 */ stw r4, 0x14(r1) -/* 8057FC08 90 81 00 18 */ stw r4, 0x18(r1) -/* 8057FC0C 38 80 00 00 */ li r4, 0 -/* 8057FC10 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008712@ha */ -/* 8057FC14 38 A5 87 12 */ addi r5, r5, 0x8712 /* 0x00008712@l */ -/* 8057FC18 7F A6 EB 78 */ mr r6, r29 -/* 8057FC1C 38 FC 01 0C */ addi r7, r28, 0x10c -/* 8057FC20 39 01 00 24 */ addi r8, r1, 0x24 -/* 8057FC24 39 20 00 00 */ li r9, 0 -/* 8057FC28 39 40 00 FF */ li r10, 0xff -/* 8057FC2C C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FC30 4B AC CE 61 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8057FC34 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057FC38 38 80 00 00 */ li r4, 0 -/* 8057FC3C 90 81 00 08 */ stw r4, 8(r1) -/* 8057FC40 38 00 FF FF */ li r0, -1 -/* 8057FC44 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057FC48 90 81 00 10 */ stw r4, 0x10(r1) -/* 8057FC4C 90 81 00 14 */ stw r4, 0x14(r1) -/* 8057FC50 90 81 00 18 */ stw r4, 0x18(r1) -/* 8057FC54 38 80 00 00 */ li r4, 0 -/* 8057FC58 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008713@ha */ -/* 8057FC5C 38 A5 87 13 */ addi r5, r5, 0x8713 /* 0x00008713@l */ -/* 8057FC60 38 DC 04 D0 */ addi r6, r28, 0x4d0 -/* 8057FC64 38 FC 01 0C */ addi r7, r28, 0x10c -/* 8057FC68 39 1C 04 E4 */ addi r8, r28, 0x4e4 -/* 8057FC6C 39 20 00 00 */ li r9, 0 -/* 8057FC70 39 40 00 FF */ li r10, 0xff -/* 8057FC74 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FC78 4B AC CE 19 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8057FC7C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057FC80 38 80 00 00 */ li r4, 0 -/* 8057FC84 90 81 00 08 */ stw r4, 8(r1) -/* 8057FC88 38 00 FF FF */ li r0, -1 -/* 8057FC8C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057FC90 90 81 00 10 */ stw r4, 0x10(r1) -/* 8057FC94 90 81 00 14 */ stw r4, 0x14(r1) -/* 8057FC98 90 81 00 18 */ stw r4, 0x18(r1) -/* 8057FC9C 38 80 00 00 */ li r4, 0 -/* 8057FCA0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008714@ha */ -/* 8057FCA4 38 A5 87 14 */ addi r5, r5, 0x8714 /* 0x00008714@l */ -/* 8057FCA8 38 DC 04 D0 */ addi r6, r28, 0x4d0 -/* 8057FCAC 38 FC 01 0C */ addi r7, r28, 0x10c -/* 8057FCB0 39 1C 04 E4 */ addi r8, r28, 0x4e4 -/* 8057FCB4 39 20 00 00 */ li r9, 0 -/* 8057FCB8 39 40 00 FF */ li r10, 0xff -/* 8057FCBC C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8057FCC0 4B AC CD D1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8057FCC4 7F 83 E3 78 */ mr r3, r28 -/* 8057FCC8 38 80 00 00 */ li r4, 0 -/* 8057FCCC 38 A0 00 32 */ li r5, 0x32 -/* 8057FCD0 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8057FCD4 FC 40 08 90 */ fmr f2, f1 -/* 8057FCD8 C0 7E 00 4C */ lfs f3, 0x4c(r30) -/* 8057FCDC FC 80 18 90 */ fmr f4, f3 -/* 8057FCE0 48 00 00 C9 */ bl Set_Speed__13daObjHHASHI_cFssffff -/* 8057FCE4 38 00 00 02 */ li r0, 2 -/* 8057FCE8 90 1C 05 A4 */ stw r0, 0x5a4(r28) -/* 8057FCEC 80 7C 05 68 */ lwz r3, 0x568(r28) -/* 8057FCF0 28 03 00 00 */ cmplwi r3, 0 -/* 8057FCF4 41 82 00 24 */ beq lbl_8057FD18 -/* 8057FCF8 4B CE 84 DD */ bl ChkUsed__9cBgW_BgIdCFv -/* 8057FCFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8057FD00 41 82 00 18 */ beq lbl_8057FD18 -/* 8057FD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057FD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057FD0C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8057FD10 80 9C 05 68 */ lwz r4, 0x568(r28) -/* 8057FD14 4B AF 45 3D */ bl Release__4cBgSFP9dBgW_Base -lbl_8057FD18: -/* 8057FD18 39 61 00 50 */ addi r11, r1, 0x50 -/* 8057FD1C 4B DE 25 09 */ bl _restgpr_28 -/* 8057FD20 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8057FD24 7C 08 03 A6 */ mtlr r0 -/* 8057FD28 38 21 00 50 */ addi r1, r1, 0x50 -/* 8057FD2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Speed__13daObjHHASHI_cFssffff.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Speed__13daObjHHASHI_cFssffff.s deleted file mode 100644 index d81acd1816..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Speed__13daObjHHASHI_cFssffff.s +++ /dev/null @@ -1,263 +0,0 @@ -lbl_8057FDA8: -/* 8057FDA8 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 8057FDAC 7C 08 02 A6 */ mflr r0 -/* 8057FDB0 90 01 01 24 */ stw r0, 0x124(r1) -/* 8057FDB4 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 8057FDB8 F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 8057FDBC DB C1 01 00 */ stfd f30, 0x100(r1) -/* 8057FDC0 F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 8057FDC4 DB A1 00 F0 */ stfd f29, 0xf0(r1) -/* 8057FDC8 F3 A1 00 F8 */ psq_st f29, 248(r1), 0, 0 /* qr0 */ -/* 8057FDCC DB 81 00 E0 */ stfd f28, 0xe0(r1) -/* 8057FDD0 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* qr0 */ -/* 8057FDD4 DB 61 00 D0 */ stfd f27, 0xd0(r1) -/* 8057FDD8 F3 61 00 D8 */ psq_st f27, 216(r1), 0, 0 /* qr0 */ -/* 8057FDDC DB 41 00 C0 */ stfd f26, 0xc0(r1) -/* 8057FDE0 F3 41 00 C8 */ psq_st f26, 200(r1), 0, 0 /* qr0 */ -/* 8057FDE4 DB 21 00 B0 */ stfd f25, 0xb0(r1) -/* 8057FDE8 F3 21 00 B8 */ psq_st f25, 184(r1), 0, 0 /* qr0 */ -/* 8057FDEC DB 01 00 A0 */ stfd f24, 0xa0(r1) -/* 8057FDF0 F3 01 00 A8 */ psq_st f24, 168(r1), 0, 0 /* qr0 */ -/* 8057FDF4 DA E1 00 90 */ stfd f23, 0x90(r1) -/* 8057FDF8 F2 E1 00 98 */ psq_st f23, 152(r1), 0, 0 /* qr0 */ -/* 8057FDFC DA C1 00 80 */ stfd f22, 0x80(r1) -/* 8057FE00 F2 C1 00 88 */ psq_st f22, 136(r1), 0, 0 /* qr0 */ -/* 8057FE04 DA A1 00 70 */ stfd f21, 0x70(r1) -/* 8057FE08 F2 A1 00 78 */ psq_st f21, 120(r1), 0, 0 /* qr0 */ -/* 8057FE0C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8057FE10 4B DE 23 B1 */ bl _savegpr_22 -/* 8057FE14 7C 7B 1B 78 */ mr r27, r3 -/* 8057FE18 FF 20 10 90 */ fmr f25, f2 -/* 8057FE1C FF 40 18 90 */ fmr f26, f3 -/* 8057FE20 FF 60 20 90 */ fmr f27, f4 -/* 8057FE24 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 8057FE28 3B E3 14 AC */ addi r31, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 8057FE2C 7C 9C 07 34 */ extsh r28, r4 -/* 8057FE30 7C BD 07 34 */ extsh r29, r5 -/* 8057FE34 3B DD FF EC */ addi r30, r29, -20 -/* 8057FE38 C3 9F 00 58 */ lfs f28, 0x58(r31) -/* 8057FE3C C3 BF 00 60 */ lfs f29, 0x60(r31) -/* 8057FE40 C3 DF 00 68 */ lfs f30, 0x68(r31) -/* 8057FE44 CB FF 00 90 */ lfd f31, 0x90(r31) -/* 8057FE48 3E E0 43 30 */ lis r23, 0x4330 -/* 8057FE4C C2 FF 00 6C */ lfs f23, 0x6c(r31) -/* 8057FE50 C3 1F 00 74 */ lfs f24, 0x74(r31) -/* 8057FE54 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057FE58 3B 03 D4 70 */ addi r24, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057FE5C 1F 3C 00 0C */ mulli r25, r28, 0xc -/* 8057FE60 1F 5C 00 06 */ mulli r26, r28, 6 -/* 8057FE64 48 00 01 68 */ b lbl_8057FFCC -lbl_8057FE68: -/* 8057FE68 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8057FE6C 4B CE 7B 21 */ bl cM_rndFX__Ff -/* 8057FE70 C0 1B 04 D8 */ lfs f0, 0x4d8(r27) -/* 8057FE74 EE A0 08 2A */ fadds f21, f0, f1 -/* 8057FE78 FC 20 D8 90 */ fmr f1, f27 -/* 8057FE7C 4B CE 7A D9 */ bl cM_rndF__Ff -/* 8057FE80 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 8057FE84 EC 00 D0 2A */ fadds f0, f0, f26 -/* 8057FE88 EE C0 08 2A */ fadds f22, f0, f1 -/* 8057FE8C C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8057FE90 4B CE 7A FD */ bl cM_rndFX__Ff -/* 8057FE94 C0 1B 04 D0 */ lfs f0, 0x4d0(r27) -/* 8057FE98 EC 00 08 2A */ fadds f0, f0, f1 -/* 8057FE9C 7E DB CA 14 */ add r22, r27, r25 -/* 8057FEA0 D0 16 05 B0 */ stfs f0, 0x5b0(r22) -/* 8057FEA4 D2 D6 05 B4 */ stfs f22, 0x5b4(r22) -/* 8057FEA8 D2 B6 05 B8 */ stfs f21, 0x5b8(r22) -/* 8057FEAC C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 8057FEB0 4B CE 7A A5 */ bl cM_rndF__Ff -/* 8057FEB4 EE DC 08 2A */ fadds f22, f28, f1 -/* 8057FEB8 C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 8057FEBC 4B CE 7A 99 */ bl cM_rndF__Ff -/* 8057FEC0 EE BD 08 2A */ fadds f21, f29, f1 -/* 8057FEC4 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 8057FEC8 4B CE 7A 8D */ bl cM_rndF__Ff -/* 8057FECC EC 1C 08 2A */ fadds f0, f28, f1 -/* 8057FED0 D0 16 0A 60 */ stfs f0, 0xa60(r22) -/* 8057FED4 D2 B6 0A 64 */ stfs f21, 0xa64(r22) -/* 8057FED8 D2 D6 0A 68 */ stfs f22, 0xa68(r22) -/* 8057FEDC FC 20 C8 90 */ fmr f1, f25 -/* 8057FEE0 4B CE 7A AD */ bl cM_rndFX__Ff -/* 8057FEE4 C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 8057FEE8 4B CE 7A A5 */ bl cM_rndFX__Ff -/* 8057FEEC EE BE 08 2A */ fadds f21, f30, f1 -/* 8057FEF0 C0 3F 00 70 */ lfs f1, 0x70(r31) -/* 8057FEF4 4B CE 7A 99 */ bl cM_rndFX__Ff -/* 8057FEF8 FC 00 08 1E */ fctiwz f0, f1 -/* 8057FEFC D8 01 00 08 */ stfd f0, 8(r1) -/* 8057FF00 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8057FF04 7C 00 07 34 */ extsh r0, r0 -/* 8057FF08 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8057FF0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FF10 92 E1 00 10 */ stw r23, 0x10(r1) -/* 8057FF14 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8057FF18 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 8057FF1C C0 1B 0C B8 */ lfs f0, 0xcb8(r27) -/* 8057FF20 EC 00 B8 28 */ fsubs f0, f0, f23 -/* 8057FF24 EC 00 08 2A */ fadds f0, f0, f1 -/* 8057FF28 FC 00 00 1E */ fctiwz f0, f0 -/* 8057FF2C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8057FF30 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 8057FF34 D3 16 08 08 */ stfs f24, 0x808(r22) -/* 8057FF38 D3 16 08 0C */ stfs f24, 0x80c(r22) -/* 8057FF3C D2 B6 08 10 */ stfs f21, 0x810(r22) -/* 8057FF40 7F 03 C3 78 */ mr r3, r24 -/* 8057FF44 4B A8 C4 99 */ bl mDoMtx_YrotS__FPA4_fs -/* 8057FF48 38 96 08 08 */ addi r4, r22, 0x808 -/* 8057FF4C 7F 03 C3 78 */ mr r3, r24 -/* 8057FF50 7C 85 23 78 */ mr r5, r4 -/* 8057FF54 4B DC 6E 19 */ bl PSMTXMultVec -/* 8057FF58 D2 B6 08 0C */ stfs f21, 0x80c(r22) -/* 8057FF5C C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8057FF60 4B CE 7A 2D */ bl cM_rndFX__Ff -/* 8057FF64 FC 00 08 1E */ fctiwz f0, f1 -/* 8057FF68 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8057FF6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8057FF70 7E DB D2 14 */ add r22, r27, r26 -/* 8057FF74 B0 16 0D E8 */ sth r0, 0xde8(r22) -/* 8057FF78 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 8057FF7C 4B CE 7A 11 */ bl cM_rndFX__Ff -/* 8057FF80 FC 00 08 1E */ fctiwz f0, f1 -/* 8057FF84 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8057FF88 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8057FF8C B0 16 0D EA */ sth r0, 0xdea(r22) -/* 8057FF90 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 8057FF94 4B CE 79 F9 */ bl cM_rndFX__Ff -/* 8057FF98 FC 00 08 1E */ fctiwz f0, f1 -/* 8057FF9C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8057FFA0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8057FFA4 B0 16 0C BC */ sth r0, 0xcbc(r22) -/* 8057FFA8 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 8057FFAC 4B CE 79 E1 */ bl cM_rndFX__Ff -/* 8057FFB0 FC 00 08 1E */ fctiwz f0, f1 -/* 8057FFB4 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 8057FFB8 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8057FFBC B0 16 0C BE */ sth r0, 0xcbe(r22) -/* 8057FFC0 3B 9C 00 01 */ addi r28, r28, 1 -/* 8057FFC4 3B 5A 00 06 */ addi r26, r26, 6 -/* 8057FFC8 3B 39 00 0C */ addi r25, r25, 0xc -lbl_8057FFCC: -/* 8057FFCC 7C 1C F0 00 */ cmpw r28, r30 -/* 8057FFD0 41 80 FE 98 */ blt lbl_8057FE68 -/* 8057FFD4 7F D7 F3 78 */ mr r23, r30 -/* 8057FFD8 C3 DF 00 58 */ lfs f30, 0x58(r31) -/* 8057FFDC C3 BF 00 60 */ lfs f29, 0x60(r31) -/* 8057FFE0 C3 9F 00 80 */ lfs f28, 0x80(r31) -/* 8057FFE4 C3 3F 00 84 */ lfs f25, 0x84(r31) -/* 8057FFE8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8057FFEC 3B 23 9A 20 */ addi r25, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8057FFF0 1F 5E 00 0C */ mulli r26, r30, 0xc -/* 8057FFF4 1F 9E 00 06 */ mulli r28, r30, 6 -/* 8057FFF8 48 00 01 40 */ b lbl_80580138 -lbl_8057FFFC: -/* 8057FFFC C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80580000 4B CE 79 8D */ bl cM_rndFX__Ff -/* 80580004 C0 1B 04 D8 */ lfs f0, 0x4d8(r27) -/* 80580008 EE C0 08 2A */ fadds f22, f0, f1 -/* 8058000C FC 20 D8 90 */ fmr f1, f27 -/* 80580010 4B CE 79 7D */ bl cM_rndFX__Ff -/* 80580014 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 80580018 EC 00 D0 2A */ fadds f0, f0, f26 -/* 8058001C EE A0 08 2A */ fadds f21, f0, f1 -/* 80580020 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80580024 4B CE 79 69 */ bl cM_rndFX__Ff -/* 80580028 C0 1B 04 D0 */ lfs f0, 0x4d0(r27) -/* 8058002C EC 00 08 2A */ fadds f0, f0, f1 -/* 80580030 7E DB D2 14 */ add r22, r27, r26 -/* 80580034 D0 16 05 B0 */ stfs f0, 0x5b0(r22) -/* 80580038 D2 B6 05 B4 */ stfs f21, 0x5b4(r22) -/* 8058003C D2 D6 05 B8 */ stfs f22, 0x5b8(r22) -/* 80580040 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80580044 4B CE 79 11 */ bl cM_rndF__Ff -/* 80580048 EE DE 08 2A */ fadds f22, f30, f1 -/* 8058004C C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 80580050 4B CE 79 05 */ bl cM_rndF__Ff -/* 80580054 EE BD 08 2A */ fadds f21, f29, f1 -/* 80580058 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 8058005C 4B CE 78 F9 */ bl cM_rndF__Ff -/* 80580060 EC 1E 08 2A */ fadds f0, f30, f1 -/* 80580064 D0 16 0A 60 */ stfs f0, 0xa60(r22) -/* 80580068 D2 B6 0A 64 */ stfs f21, 0xa64(r22) -/* 8058006C D2 D6 0A 68 */ stfs f22, 0xa68(r22) -/* 80580070 C0 3F 00 80 */ lfs f1, 0x80(r31) -/* 80580074 4B CE 79 19 */ bl cM_rndFX__Ff -/* 80580078 EE DC 08 2A */ fadds f22, f28, f1 -/* 8058007C FC 20 E0 90 */ fmr f1, f28 -/* 80580080 4B CE 79 0D */ bl cM_rndFX__Ff -/* 80580084 EE B9 08 2A */ fadds f21, f25, f1 -/* 80580088 C0 3F 00 88 */ lfs f1, 0x88(r31) -/* 8058008C 4B CE 79 01 */ bl cM_rndFX__Ff -/* 80580090 FC 00 08 1E */ fctiwz f0, f1 -/* 80580094 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80580098 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8058009C C0 1B 05 30 */ lfs f0, 0x530(r27) -/* 805800A0 EC 35 00 2A */ fadds f1, f21, f0 -/* 805800A4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 805800A8 7C 79 02 14 */ add r3, r25, r0 -/* 805800AC C0 03 00 04 */ lfs f0, 4(r3) -/* 805800B0 EC 56 00 32 */ fmuls f2, f22, f0 -/* 805800B4 C0 03 00 00 */ lfs f0, 0(r3) -/* 805800B8 EC 16 00 32 */ fmuls f0, f22, f0 -/* 805800BC D0 16 08 08 */ stfs f0, 0x808(r22) -/* 805800C0 D0 36 08 0C */ stfs f1, 0x80c(r22) -/* 805800C4 D0 56 08 10 */ stfs f2, 0x810(r22) -/* 805800C8 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 805800CC 4B CE 78 C1 */ bl cM_rndFX__Ff -/* 805800D0 FC 00 08 1E */ fctiwz f0, f1 -/* 805800D4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 805800D8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805800DC 7E DB E2 14 */ add r22, r27, r28 -/* 805800E0 B0 16 0D E8 */ sth r0, 0xde8(r22) -/* 805800E4 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 805800E8 4B CE 78 A5 */ bl cM_rndFX__Ff -/* 805800EC FC 00 08 1E */ fctiwz f0, f1 -/* 805800F0 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 805800F4 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 805800F8 B0 16 0D EA */ sth r0, 0xdea(r22) -/* 805800FC C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80580100 4B CE 78 8D */ bl cM_rndFX__Ff -/* 80580104 FC 00 08 1E */ fctiwz f0, f1 -/* 80580108 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8058010C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80580110 B0 16 0C BC */ sth r0, 0xcbc(r22) -/* 80580114 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80580118 4B CE 78 75 */ bl cM_rndFX__Ff -/* 8058011C FC 00 08 1E */ fctiwz f0, f1 -/* 80580120 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80580124 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80580128 B0 16 0C BE */ sth r0, 0xcbe(r22) -/* 8058012C 3A F7 00 01 */ addi r23, r23, 1 -/* 80580130 3B 9C 00 06 */ addi r28, r28, 6 -/* 80580134 3B 5A 00 0C */ addi r26, r26, 0xc -lbl_80580138: -/* 80580138 7C 17 E8 00 */ cmpw r23, r29 -/* 8058013C 41 80 FE C0 */ blt lbl_8057FFFC -/* 80580140 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 80580144 CB E1 01 10 */ lfd f31, 0x110(r1) -/* 80580148 E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 8058014C CB C1 01 00 */ lfd f30, 0x100(r1) -/* 80580150 E3 A1 00 F8 */ psq_l f29, 248(r1), 0, 0 /* qr0 */ -/* 80580154 CB A1 00 F0 */ lfd f29, 0xf0(r1) -/* 80580158 E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* qr0 */ -/* 8058015C CB 81 00 E0 */ lfd f28, 0xe0(r1) -/* 80580160 E3 61 00 D8 */ psq_l f27, 216(r1), 0, 0 /* qr0 */ -/* 80580164 CB 61 00 D0 */ lfd f27, 0xd0(r1) -/* 80580168 E3 41 00 C8 */ psq_l f26, 200(r1), 0, 0 /* qr0 */ -/* 8058016C CB 41 00 C0 */ lfd f26, 0xc0(r1) -/* 80580170 E3 21 00 B8 */ psq_l f25, 184(r1), 0, 0 /* qr0 */ -/* 80580174 CB 21 00 B0 */ lfd f25, 0xb0(r1) -/* 80580178 E3 01 00 A8 */ psq_l f24, 168(r1), 0, 0 /* qr0 */ -/* 8058017C CB 01 00 A0 */ lfd f24, 0xa0(r1) -/* 80580180 E2 E1 00 98 */ psq_l f23, 152(r1), 0, 0 /* qr0 */ -/* 80580184 CA E1 00 90 */ lfd f23, 0x90(r1) -/* 80580188 E2 C1 00 88 */ psq_l f22, 136(r1), 0, 0 /* qr0 */ -/* 8058018C CA C1 00 80 */ lfd f22, 0x80(r1) -/* 80580190 E2 A1 00 78 */ psq_l f21, 120(r1), 0, 0 /* qr0 */ -/* 80580194 CA A1 00 70 */ lfd f21, 0x70(r1) -/* 80580198 39 61 00 70 */ addi r11, r1, 0x70 -/* 8058019C 4B DE 20 71 */ bl _restgpr_22 -/* 805801A0 80 01 01 24 */ lwz r0, 0x124(r1) -/* 805801A4 7C 08 03 A6 */ mtlr r0 -/* 805801A8 38 21 01 20 */ addi r1, r1, 0x120 -/* 805801AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Wall_Check__13daObjHHASHI_cFs.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Wall_Check__13daObjHHASHI_cFs.s deleted file mode 100644 index af40cc8a9a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Wall_Check__13daObjHHASHI_cFs.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80580358: -/* 80580358 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 8058035C 7C 08 02 A6 */ mflr r0 -/* 80580360 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80580364 93 E1 00 9C */ stw r31, 0x9c(r1) -/* 80580368 93 C1 00 98 */ stw r30, 0x98(r1) -/* 8058036C 7C 7F 1B 78 */ mr r31, r3 -/* 80580370 7C 9E 23 78 */ mr r30, r4 -/* 80580374 38 61 00 20 */ addi r3, r1, 0x20 -/* 80580378 4B AF 78 F1 */ bl __ct__11dBgS_LinChkFv -/* 8058037C 7F C0 07 34 */ extsh r0, r30 -/* 80580380 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80580384 7C 7F 02 14 */ add r3, r31, r0 -/* 80580388 C0 43 05 B8 */ lfs f2, 0x5b8(r3) -/* 8058038C C0 03 08 10 */ lfs f0, 0x810(r3) -/* 80580390 3B C3 08 10 */ addi r30, r3, 0x810 -/* 80580394 EC 82 00 2A */ fadds f4, f2, f0 -/* 80580398 C0 63 05 B4 */ lfs f3, 0x5b4(r3) -/* 8058039C C0 23 05 B0 */ lfs f1, 0x5b0(r3) -/* 805803A0 C0 03 08 08 */ lfs f0, 0x808(r3) -/* 805803A4 3B E3 08 08 */ addi r31, r3, 0x808 -/* 805803A8 EC 01 00 2A */ fadds f0, f1, f0 -/* 805803AC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805803B0 D0 61 00 18 */ stfs f3, 0x18(r1) -/* 805803B4 D0 81 00 1C */ stfs f4, 0x1c(r1) -/* 805803B8 D0 21 00 08 */ stfs f1, 8(r1) -/* 805803BC D0 61 00 0C */ stfs f3, 0xc(r1) -/* 805803C0 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 805803C4 38 61 00 20 */ addi r3, r1, 0x20 -/* 805803C8 38 81 00 08 */ addi r4, r1, 8 -/* 805803CC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 805803D0 38 C0 00 00 */ li r6, 0 -/* 805803D4 4B AF 79 91 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 805803D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805803DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805803E0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 805803E4 38 81 00 20 */ addi r4, r1, 0x20 -/* 805803E8 4B AF 3F CD */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 805803EC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 805803F0 28 00 00 01 */ cmplwi r0, 1 -/* 805803F4 40 82 00 24 */ bne lbl_80580418 -/* 805803F8 3C 60 80 58 */ lis r3, lit_4006@ha /* 0x8058154C@ha */ -/* 805803FC C0 23 15 4C */ lfs f1, lit_4006@l(r3) /* 0x8058154C@l */ -/* 80580400 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80580404 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80580408 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8058040C C0 1E 00 00 */ lfs f0, 0(r30) -/* 80580410 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80580414 D0 1E 00 00 */ stfs f0, 0(r30) -lbl_80580418: -/* 80580418 38 61 00 20 */ addi r3, r1, 0x20 -/* 8058041C 38 80 FF FF */ li r4, -1 -/* 80580420 4B AF 78 BD */ bl __dt__11dBgS_LinChkFv -/* 80580424 83 E1 00 9C */ lwz r31, 0x9c(r1) -/* 80580428 83 C1 00 98 */ lwz r30, 0x98(r1) -/* 8058042C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80580430 7C 08 03 A6 */ mtlr r0 -/* 80580434 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80580438 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__4cXyzFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__4cXyzFv.s deleted file mode 100644 index c70d216ec5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8057FD30: -/* 8057FD30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057FD34 7C 08 02 A6 */ mflr r0 -/* 8057FD38 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FD3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057FD40 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8057FD44 41 82 00 10 */ beq lbl_8057FD54 -/* 8057FD48 7C 80 07 35 */ extsh. r0, r4 -/* 8057FD4C 40 81 00 08 */ ble lbl_8057FD54 -/* 8057FD50 4B D4 EF ED */ bl __dl__FPv -lbl_8057FD54: -/* 8057FD54 7F E3 FB 78 */ mr r3, r31 -/* 8057FD58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057FD5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FD60 7C 08 03 A6 */ mtlr r0 -/* 8057FD64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FD68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__5csXyzFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__5csXyzFv.s deleted file mode 100644 index bc2db0f7ec..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__5csXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8057FD6C: -/* 8057FD6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057FD70 7C 08 02 A6 */ mflr r0 -/* 8057FD74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FD78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057FD7C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8057FD80 41 82 00 10 */ beq lbl_8057FD90 -/* 8057FD84 7C 80 07 35 */ extsh. r0, r4 -/* 8057FD88 40 81 00 08 */ ble lbl_8057FD90 -/* 8057FD8C 4B D4 EF B1 */ bl __dl__FPv -lbl_8057FD90: -/* 8057FD90 7F E3 FB 78 */ mr r3, r31 -/* 8057FD94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057FD98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FD9C 7C 08 03 A6 */ mtlr r0 -/* 8057FDA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FDA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGAabFv.s deleted file mode 100644 index df179d7b9f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80581174: -/* 80581174 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80581178 7C 08 02 A6 */ mflr r0 -/* 8058117C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80581180 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80581184 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80581188 41 82 00 1C */ beq lbl_805811A4 -/* 8058118C 3C A0 80 58 */ lis r5, __vt__8cM3dGAab@ha /* 0x80581644@ha */ -/* 80581190 38 05 16 44 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80581644@l */ -/* 80581194 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80581198 7C 80 07 35 */ extsh. r0, r4 -/* 8058119C 40 81 00 08 */ ble lbl_805811A4 -/* 805811A0 4B D4 DB 9D */ bl __dl__FPv -lbl_805811A4: -/* 805811A4 7F E3 FB 78 */ mr r3, r31 -/* 805811A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805811AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805811B0 7C 08 03 A6 */ mtlr r0 -/* 805811B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 805811B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGCylFv.s deleted file mode 100644 index 66f20265b5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8058112C: -/* 8058112C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80581130 7C 08 02 A6 */ mflr r0 -/* 80581134 90 01 00 14 */ stw r0, 0x14(r1) -/* 80581138 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058113C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80581140 41 82 00 1C */ beq lbl_8058115C -/* 80581144 3C A0 80 58 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80581638@ha */ -/* 80581148 38 05 16 38 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80581638@l */ -/* 8058114C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80581150 7C 80 07 35 */ extsh. r0, r4 -/* 80581154 40 81 00 08 */ ble lbl_8058115C -/* 80581158 4B D4 DB E5 */ bl __dl__FPv -lbl_8058115C: -/* 8058115C 7F E3 FB 78 */ mr r3, r31 -/* 80581160 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80581164 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80581168 7C 08 03 A6 */ mtlr r0 -/* 8058116C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80581170 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/checkViewArea__13daObjHHASHI_cFi.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/checkViewArea__13daObjHHASHI_cFi.s deleted file mode 100644 index 574d0fd005..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/checkViewArea__13daObjHHASHI_cFi.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_805807C4: -/* 805807C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805807C8 7C 08 02 A6 */ mflr r0 -/* 805807CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 805807D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 805807D4 7C 60 1B 78 */ mr r0, r3 -/* 805807D8 3C 60 80 58 */ lis r3, ccCylSrc@ha /* 0x805814AC@ha */ -/* 805807DC 3B E3 14 AC */ addi r31, r3, ccCylSrc@l /* 0x805814AC@l */ -/* 805807E0 1C 64 00 0C */ mulli r3, r4, 0xc -/* 805807E4 38 63 05 B0 */ addi r3, r3, 0x5b0 -/* 805807E8 7C 60 1A 14 */ add r3, r0, r3 -/* 805807EC 38 81 00 08 */ addi r4, r1, 8 -/* 805807F0 4B A9 4B 21 */ bl mDoLib_project__FP3VecP3Vec -/* 805807F4 38 60 00 00 */ li r3, 0 -/* 805807F8 C0 41 00 08 */ lfs f2, 8(r1) -/* 805807FC C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 80580800 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80580804 4C 41 13 82 */ cror 2, 1, 2 -/* 80580808 40 82 00 38 */ bne lbl_80580840 -/* 8058080C C0 1F 00 DC */ lfs f0, 0xdc(r31) -/* 80580810 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80580814 4C 40 13 82 */ cror 2, 0, 2 -/* 80580818 40 82 00 28 */ bne lbl_80580840 -/* 8058081C C0 41 00 0C */ lfs f2, 0xc(r1) -/* 80580820 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80580824 4C 41 13 82 */ cror 2, 1, 2 -/* 80580828 40 82 00 18 */ bne lbl_80580840 -/* 8058082C C0 1F 00 E0 */ lfs f0, 0xe0(r31) -/* 80580830 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80580834 4C 40 13 82 */ cror 2, 0, 2 -/* 80580838 40 82 00 08 */ bne lbl_80580840 -/* 8058083C 38 60 00 01 */ li r3, 1 -lbl_80580840: -/* 80580840 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80580844 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80580848 7C 08 03 A6 */ mtlr r0 -/* 8058084C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80580850 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/create__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/create__13daObjHHASHI_cFv.s deleted file mode 100644 index bd8d4120e6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/create__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,169 +0,0 @@ -lbl_80580EA0: -/* 80580EA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80580EA4 7C 08 02 A6 */ mflr r0 -/* 80580EA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80580EAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80580EB0 4B DE 13 2D */ bl _savegpr_29 -/* 80580EB4 7C 7F 1B 78 */ mr r31, r3 -/* 80580EB8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80580EBC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80580EC0 40 82 01 54 */ bne lbl_80581014 -/* 80580EC4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80580EC8 41 82 01 40 */ beq lbl_80581008 -/* 80580ECC 7C 1E 03 78 */ mr r30, r0 -/* 80580ED0 4B AF 77 55 */ bl __ct__16dBgS_MoveBgActorFv -/* 80580ED4 3C 60 80 58 */ lis r3, __vt__13daObjHHASHI_c@ha /* 0x80581650@ha */ -/* 80580ED8 38 03 16 50 */ addi r0, r3, __vt__13daObjHHASHI_c@l /* 0x80581650@l */ -/* 80580EDC 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80580EE0 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80580EE4 3C 80 80 58 */ lis r4, __ct__4cXyzFv@ha /* 0x805811C0@ha */ -/* 80580EE8 38 84 11 C0 */ addi r4, r4, __ct__4cXyzFv@l /* 0x805811C0@l */ -/* 80580EEC 3C A0 80 58 */ lis r5, __dt__4cXyzFv@ha /* 0x8057FD30@ha */ -/* 80580EF0 38 A5 FD 30 */ addi r5, r5, __dt__4cXyzFv@l /* 0x8057FD30@l */ -/* 80580EF4 38 C0 00 0C */ li r6, 0xc -/* 80580EF8 38 E0 00 32 */ li r7, 0x32 -/* 80580EFC 4B DE 0E 65 */ bl __construct_array -/* 80580F00 38 7E 08 08 */ addi r3, r30, 0x808 -/* 80580F04 3C 80 80 58 */ lis r4, __ct__4cXyzFv@ha /* 0x805811C0@ha */ -/* 80580F08 38 84 11 C0 */ addi r4, r4, __ct__4cXyzFv@l /* 0x805811C0@l */ -/* 80580F0C 3C A0 80 58 */ lis r5, __dt__4cXyzFv@ha /* 0x8057FD30@ha */ -/* 80580F10 38 A5 FD 30 */ addi r5, r5, __dt__4cXyzFv@l /* 0x8057FD30@l */ -/* 80580F14 38 C0 00 0C */ li r6, 0xc -/* 80580F18 38 E0 00 32 */ li r7, 0x32 -/* 80580F1C 4B DE 0E 45 */ bl __construct_array -/* 80580F20 38 7E 0A 60 */ addi r3, r30, 0xa60 -/* 80580F24 3C 80 80 58 */ lis r4, __ct__4cXyzFv@ha /* 0x805811C0@ha */ -/* 80580F28 38 84 11 C0 */ addi r4, r4, __ct__4cXyzFv@l /* 0x805811C0@l */ -/* 80580F2C 3C A0 80 58 */ lis r5, __dt__4cXyzFv@ha /* 0x8057FD30@ha */ -/* 80580F30 38 A5 FD 30 */ addi r5, r5, __dt__4cXyzFv@l /* 0x8057FD30@l */ -/* 80580F34 38 C0 00 0C */ li r6, 0xc -/* 80580F38 38 E0 00 32 */ li r7, 0x32 -/* 80580F3C 4B DE 0E 25 */ bl __construct_array -/* 80580F40 38 7E 0C BC */ addi r3, r30, 0xcbc -/* 80580F44 3C 80 80 58 */ lis r4, __ct__5csXyzFv@ha /* 0x805811BC@ha */ -/* 80580F48 38 84 11 BC */ addi r4, r4, __ct__5csXyzFv@l /* 0x805811BC@l */ -/* 80580F4C 3C A0 80 58 */ lis r5, __dt__5csXyzFv@ha /* 0x8057FD6C@ha */ -/* 80580F50 38 A5 FD 6C */ addi r5, r5, __dt__5csXyzFv@l /* 0x8057FD6C@l */ -/* 80580F54 38 C0 00 06 */ li r6, 6 -/* 80580F58 38 E0 00 32 */ li r7, 0x32 -/* 80580F5C 4B DE 0E 05 */ bl __construct_array -/* 80580F60 38 7E 0D E8 */ addi r3, r30, 0xde8 -/* 80580F64 3C 80 80 58 */ lis r4, __ct__5csXyzFv@ha /* 0x805811BC@ha */ -/* 80580F68 38 84 11 BC */ addi r4, r4, __ct__5csXyzFv@l /* 0x805811BC@l */ -/* 80580F6C 3C A0 80 58 */ lis r5, __dt__5csXyzFv@ha /* 0x8057FD6C@ha */ -/* 80580F70 38 A5 FD 6C */ addi r5, r5, __dt__5csXyzFv@l /* 0x8057FD6C@l */ -/* 80580F74 38 C0 00 06 */ li r6, 6 -/* 80580F78 38 E0 00 32 */ li r7, 0x32 -/* 80580F7C 4B DE 0D E5 */ bl __construct_array -/* 80580F80 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80580F84 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80580F88 90 1E 10 38 */ stw r0, 0x1038(r30) -/* 80580F8C 38 7E 10 3C */ addi r3, r30, 0x103c -/* 80580F90 4B B0 27 D1 */ bl __ct__10dCcD_GSttsFv -/* 80580F94 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80580F98 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80580F9C 90 7E 10 38 */ stw r3, 0x1038(r30) -/* 80580FA0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80580FA4 90 1E 10 3C */ stw r0, 0x103c(r30) -/* 80580FA8 3B BE 10 5C */ addi r29, r30, 0x105c -/* 80580FAC 7F A3 EB 78 */ mr r3, r29 -/* 80580FB0 4B B0 2A 79 */ bl __ct__12dCcD_GObjInfFv -/* 80580FB4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80580FB8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80580FBC 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80580FC0 3C 60 80 58 */ lis r3, __vt__8cM3dGAab@ha /* 0x80581644@ha */ -/* 80580FC4 38 03 16 44 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80581644@l */ -/* 80580FC8 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80580FCC 3C 60 80 58 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80581638@ha */ -/* 80580FD0 38 03 16 38 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80581638@l */ -/* 80580FD4 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80580FD8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80580FDC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80580FE0 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80580FE4 38 03 00 58 */ addi r0, r3, 0x58 -/* 80580FE8 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80580FEC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80580FF0 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80580FF4 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80580FF8 38 03 00 2C */ addi r0, r3, 0x2c -/* 80580FFC 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80581000 38 03 00 84 */ addi r0, r3, 0x84 -/* 80581004 90 1D 01 38 */ stw r0, 0x138(r29) -lbl_80581008: -/* 80581008 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8058100C 60 00 00 08 */ ori r0, r0, 8 -/* 80581010 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80581014: -/* 80581014 38 7F 10 18 */ addi r3, r31, 0x1018 -/* 80581018 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x805815E4@ha */ -/* 8058101C 38 84 15 E4 */ addi r4, r4, l_arcName@l /* 0x805815E4@l */ -/* 80581020 80 84 00 00 */ lwz r4, 0(r4) -/* 80581024 4B AA BE 99 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80581028 7C 7D 1B 78 */ mr r29, r3 -/* 8058102C 2C 1D 00 04 */ cmpwi r29, 4 -/* 80581030 40 82 00 E0 */ bne lbl_80581110 -/* 80581034 3C 60 80 58 */ lis r3, lit_4365@ha /* 0x80581594@ha */ -/* 80581038 C0 03 15 94 */ lfs f0, lit_4365@l(r3) /* 0x80581594@l */ -/* 8058103C D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80581040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80581044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80581048 3F C3 00 02 */ addis r30, r3, 2 -/* 8058104C 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80581050 7F C3 F3 78 */ mr r3, r30 -/* 80581054 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x805815E4@ha */ -/* 80581058 38 84 15 E4 */ addi r4, r4, l_arcName@l /* 0x805815E4@l */ -/* 8058105C 80 84 00 00 */ lwz r4, 0(r4) -/* 80581060 3C A0 80 58 */ lis r5, d_a_obj_hhashi__stringBase0@ha /* 0x805815AC@ha */ -/* 80581064 38 A5 15 AC */ addi r5, r5, d_a_obj_hhashi__stringBase0@l /* 0x805815AC@l */ -/* 80581068 38 A5 00 27 */ addi r5, r5, 0x27 -/* 8058106C 4B AB B6 4D */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 80581070 7C 65 1B 78 */ mr r5, r3 -/* 80581074 7F E3 FB 78 */ mr r3, r31 -/* 80581078 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x805815E4@ha */ -/* 8058107C 38 84 15 E4 */ addi r4, r4, l_arcName@l /* 0x805815E4@l */ -/* 80581080 80 84 00 00 */ lwz r4, 0(r4) -/* 80581084 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80581088 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 8058108C 38 E0 6D C0 */ li r7, 0x6dc0 -/* 80581090 39 00 00 00 */ li r8, 0 -/* 80581094 4B AF 77 29 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80581098 7C 7D 1B 78 */ mr r29, r3 -/* 8058109C 2C 1D 00 05 */ cmpwi r29, 5 -/* 805810A0 40 82 00 08 */ bne lbl_805810A8 -/* 805810A4 48 00 00 70 */ b lbl_80581114 -lbl_805810A8: -/* 805810A8 7F E3 FB 78 */ mr r3, r31 -/* 805810AC 4B FF E9 0D */ bl initCcCylinder__13daObjHHASHI_cFv -/* 805810B0 80 7F 0F 4C */ lwz r3, 0xf4c(r31) -/* 805810B4 38 03 00 24 */ addi r0, r3, 0x24 -/* 805810B8 90 1F 05 04 */ stw r0, 0x504(r31) -/* 805810BC 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x805815E4@ha */ -/* 805810C0 38 63 15 E4 */ addi r3, r3, l_arcName@l /* 0x805815E4@l */ -/* 805810C4 80 63 00 00 */ lwz r3, 0(r3) -/* 805810C8 3C 80 80 58 */ lis r4, d_a_obj_hhashi__stringBase0@ha /* 0x805815AC@ha */ -/* 805810CC 38 84 15 AC */ addi r4, r4, d_a_obj_hhashi__stringBase0@l /* 0x805815AC@l */ -/* 805810D0 38 84 00 18 */ addi r4, r4, 0x18 -/* 805810D4 7F C5 F3 78 */ mr r5, r30 -/* 805810D8 38 C0 00 80 */ li r6, 0x80 -/* 805810DC 4B AB B2 A1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 805810E0 7C 64 1B 78 */ mr r4, r3 -/* 805810E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805810E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805810EC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 805810F0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 805810F4 7C 05 07 74 */ extsb r5, r0 -/* 805810F8 38 C0 00 00 */ li r6, 0 -/* 805810FC 4B AA B9 F5 */ bl addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc -/* 80581100 38 00 00 01 */ li r0, 1 -/* 80581104 98 1F 11 99 */ stb r0, 0x1199(r31) -/* 80581108 7F E3 FB 78 */ mr r3, r31 -/* 8058110C 4B FF FC 79 */ bl daObjHHASHI_Execute__FP13daObjHHASHI_c -lbl_80581110: -/* 80581110 7F A3 EB 78 */ mr r3, r29 -lbl_80581114: -/* 80581114 39 61 00 20 */ addi r11, r1, 0x20 -/* 80581118 4B DE 11 11 */ bl _restgpr_29 -/* 8058111C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80581120 7C 08 03 A6 */ mtlr r0 -/* 80581124 38 21 00 20 */ addi r1, r1, 0x20 -/* 80581128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 48c6e305e5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057FA4C: -/* 8057FA4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057FA50 7C 08 02 A6 */ mflr r0 -/* 8057FA54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FA58 48 00 14 49 */ bl create__13daObjHHASHI_cFv -/* 8057FA5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FA60 7C 08 03 A6 */ mtlr r0 -/* 8057FA64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FA68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Delete__FP13daObjHHASHI_c.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Delete__FP13daObjHHASHI_c.s deleted file mode 100644 index 35601abb19..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Delete__FP13daObjHHASHI_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8057FA6C: -/* 8057FA6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057FA70 7C 08 02 A6 */ mflr r0 -/* 8057FA74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FA78 4B AF 8E 65 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 8057FA7C 38 60 00 01 */ li r3, 1 -/* 8057FA80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FA84 7C 08 03 A6 */ mtlr r0 -/* 8057FA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FA8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Draw__FP13daObjHHASHI_c.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Draw__FP13daObjHHASHI_c.s deleted file mode 100644 index 7e5001f2be..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Draw__FP13daObjHHASHI_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80580D58: -/* 80580D58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80580D5C 7C 08 02 A6 */ mflr r0 -/* 80580D60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80580D64 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80580D68 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80580D6C 7D 89 03 A6 */ mtctr r12 -/* 80580D70 4E 80 04 21 */ bctrl -/* 80580D74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80580D78 7C 08 03 A6 */ mtlr r0 -/* 80580D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80580D80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Execute__FP13daObjHHASHI_c.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Execute__FP13daObjHHASHI_c.s deleted file mode 100644 index dbc405537d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Execute__FP13daObjHHASHI_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80580D84: -/* 80580D84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80580D88 7C 08 02 A6 */ mflr r0 -/* 80580D8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80580D90 4B AF 7B C1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80580D94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80580D98 7C 08 03 A6 */ mtlr r0 -/* 80580D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80580DA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/func_805811CC.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/func_805811CC.s deleted file mode 100644 index dcf3709f0d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/func_805811CC.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_805811CC: -/* 805811CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805811D0 7C 08 02 A6 */ mflr r0 -/* 805811D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805811D8 3C 80 80 58 */ lis r4, ccCylSrc@ha /* 0x805814AC@ha */ -/* 805811DC 38 84 14 AC */ addi r4, r4, ccCylSrc@l /* 0x805814AC@l */ -/* 805811E0 C0 24 00 EC */ lfs f1, 0xec(r4) -/* 805811E4 C0 44 00 F0 */ lfs f2, 0xf0(r4) -/* 805811E8 FC 60 08 90 */ fmr f3, f1 -/* 805811EC C0 84 00 F4 */ lfs f4, 0xf4(r4) -/* 805811F0 C0 A4 00 F8 */ lfs f5, 0xf8(r4) -/* 805811F4 FC C0 20 90 */ fmr f6, f4 -/* 805811F8 4B A9 93 51 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 805811FC 38 60 00 04 */ li r3, 4 -/* 80581200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80581204 7C 08 03 A6 */ mtlr r0 -/* 80581208 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058120C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/initCcCylinder__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/initCcCylinder__13daObjHHASHI_cFv.s deleted file mode 100644 index 2b42a6dfc6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/initCcCylinder__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8057F9B8: -/* 8057F9B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057F9BC 7C 08 02 A6 */ mflr r0 -/* 8057F9C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057F9C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057F9C8 7C 7F 1B 78 */ mr r31, r3 -/* 8057F9CC 38 7F 10 20 */ addi r3, r31, 0x1020 -/* 8057F9D0 38 80 00 FF */ li r4, 0xff -/* 8057F9D4 38 A0 00 FF */ li r5, 0xff -/* 8057F9D8 7F E6 FB 78 */ mr r6, r31 -/* 8057F9DC 4B B0 3E 85 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8057F9E0 38 7F 10 5C */ addi r3, r31, 0x105c -/* 8057F9E4 3C 80 80 58 */ lis r4, ccCylSrc@ha /* 0x805814AC@ha */ -/* 8057F9E8 38 84 14 AC */ addi r4, r4, ccCylSrc@l /* 0x805814AC@l */ -/* 8057F9EC 4B B0 4E C9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 8057F9F0 38 1F 10 20 */ addi r0, r31, 0x1020 -/* 8057F9F4 90 1F 10 A0 */ stw r0, 0x10a0(r31) -/* 8057F9F8 38 7F 11 80 */ addi r3, r31, 0x1180 -/* 8057F9FC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8057FA00 4B CE F7 DD */ bl SetC__8cM3dGCylFRC4cXyz -/* 8057FA04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057FA08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FA0C 7C 08 03 A6 */ mtlr r0 -/* 8057FA10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FA14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setBaseMtx__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setBaseMtx__13daObjHHASHI_cFv.s deleted file mode 100644 index b06cef68f6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setBaseMtx__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80580C80: -/* 80580C80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80580C84 7C 08 02 A6 */ mflr r0 -/* 80580C88 90 01 00 24 */ stw r0, 0x24(r1) -/* 80580C8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80580C90 4B DE 15 45 */ bl _savegpr_27 -/* 80580C94 7C 7B 1B 78 */ mr r27, r3 -/* 80580C98 80 03 05 A4 */ lwz r0, 0x5a4(r3) -/* 80580C9C 2C 00 00 02 */ cmpwi r0, 2 -/* 80580CA0 40 82 00 6C */ bne lbl_80580D0C -/* 80580CA4 3B 80 00 00 */ li r28, 0 -/* 80580CA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80580CAC 3B E3 D4 70 */ addi r31, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80580CB0 48 00 00 4C */ b lbl_80580CFC -lbl_80580CB4: -/* 80580CB4 7F 9E 07 34 */ extsh r30, r28 -/* 80580CB8 1C 1E 00 0C */ mulli r0, r30, 0xc -/* 80580CBC 7F BB 02 14 */ add r29, r27, r0 -/* 80580CC0 38 7D 05 B0 */ addi r3, r29, 0x5b0 -/* 80580CC4 4B A8 C0 A1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80580CC8 1C 7E 00 06 */ mulli r3, r30, 6 -/* 80580CCC 38 63 0C BC */ addi r3, r3, 0xcbc -/* 80580CD0 7C 7B 1A 14 */ add r3, r27, r3 -/* 80580CD4 4B A8 C2 71 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80580CD8 38 7D 0A 60 */ addi r3, r29, 0xa60 -/* 80580CDC 4B A8 C1 95 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80580CE0 7F E3 FB 78 */ mr r3, r31 -/* 80580CE4 57 C4 10 3A */ slwi r4, r30, 2 -/* 80580CE8 38 04 0F 50 */ addi r0, r4, 0xf50 -/* 80580CEC 7C 9B 00 2E */ lwzx r4, r27, r0 -/* 80580CF0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80580CF4 4B DC 57 BD */ bl PSMTXCopy -/* 80580CF8 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80580CFC: -/* 80580CFC 7F 80 07 34 */ extsh r0, r28 -/* 80580D00 2C 00 00 32 */ cmpwi r0, 0x32 -/* 80580D04 41 80 FF B0 */ blt lbl_80580CB4 -/* 80580D08 48 00 00 28 */ b lbl_80580D30 -lbl_80580D0C: -/* 80580D0C 38 7B 04 D0 */ addi r3, r27, 0x4d0 -/* 80580D10 4B A8 C0 55 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80580D14 38 7B 04 E4 */ addi r3, r27, 0x4e4 -/* 80580D18 4B A8 C2 2D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80580D1C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80580D20 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80580D24 80 9B 0F 4C */ lwz r4, 0xf4c(r27) -/* 80580D28 38 84 00 24 */ addi r4, r4, 0x24 -/* 80580D2C 4B DC 57 85 */ bl PSMTXCopy -lbl_80580D30: -/* 80580D30 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80580D34 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80580D38 38 9B 05 6C */ addi r4, r27, 0x56c -/* 80580D3C 4B DC 57 75 */ bl PSMTXCopy -/* 80580D40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80580D44 4B DE 14 DD */ bl _restgpr_27 -/* 80580D48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80580D4C 7C 08 03 A6 */ mtlr r0 -/* 80580D50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80580D54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setCcCylinder__13daObjHHASHI_cFv.s b/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setCcCylinder__13daObjHHASHI_cFv.s deleted file mode 100644 index 80f9d2961d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setCcCylinder__13daObjHHASHI_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8057FA18: -/* 8057FA18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057FA1C 7C 08 02 A6 */ mflr r0 -/* 8057FA20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057FA24 7C 64 1B 78 */ mr r4, r3 -/* 8057FA28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057FA2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057FA30 38 63 23 3C */ addi r3, r3, 0x233c -/* 8057FA34 38 84 10 5C */ addi r4, r4, 0x105c -/* 8057FA38 4B CE 51 71 */ bl Set__4cCcSFP8cCcD_Obj -/* 8057FA3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057FA40 7C 08 03 A6 */ mtlr r0 -/* 8057FA44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057FA48 4E 80 00 20 */ blr diff --git a/include/Z2AudioLib/Z2DebugSys.h b/include/Z2AudioLib/Z2DebugSys.h new file mode 100644 index 0000000000..285228d3e1 --- /dev/null +++ b/include/Z2AudioLib/Z2DebugSys.h @@ -0,0 +1,10 @@ +#ifndef Z2DEBUGSYS_H +#define Z2DEBUGSYS_H + +#include "JSystem/JAudio2/JASGadget.h" + +// Only here for instance sub. No known code. +struct Z2DebugSys : public JASGlobalInstance<Z2DebugSys> { +}; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2Instances.h b/include/Z2AudioLib/Z2Instances.h new file mode 100644 index 0000000000..71e2fa7433 --- /dev/null +++ b/include/Z2AudioLib/Z2Instances.h @@ -0,0 +1,36 @@ +#ifndef Z2INSTANCES_H +#define Z2INSTANCES_H + +#include "Z2AudioLib/Z2WolfHowlMgr.h" +#include "Z2AudioLib/Z2DebugSys.h" +#include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JAUSoundTable.h" + +#define AUDIO_INSTANCES \ + JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ + JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ + Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ + Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ + Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ + Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ + Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ + JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ + Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ + Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ + JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ + JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ + JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ + Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ + JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ + JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ + JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ + JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ + Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ + Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ + Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ + Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ + Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ + Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ + Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; + +#endif
\ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h index c776a468e6..515ebb69b2 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2.h @@ -14,6 +14,10 @@ struct Z2SpeechStarter : public Z2SoundStarter { f32, u32); }; +// Only here for instance sub. No known code. +struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> { +}; + struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> { /* 802CBC60 */ Z2SpeechMgr2(); /* 802CBD88 */ void setString(u16 const*, s16, u8, u16); diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index d131368b87..87e8631562 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -42,6 +42,10 @@ public: /* 0x8 */ f32* mpFloatData; // might be Vec or cXyz instead }; + struct layer_data { + /* 0x0 */ room_class* mRooms[0x2][0x40]; + }; + /* 8003CB00 */ void rendering(dDrawPath_c::group_class const*); /* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*); diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 059531080a..06708d174e 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -18,7 +18,7 @@ public: /* 8003FBD0 */ static void reset(); /* 8003FC70 */ static void remove(); static dDrawPath_c::room_class* getRoomPointer(int layerNo, int roomNo) { - return (mLayerList + 0x40*layerNo)[roomNo]; + return mLayerList->mRooms[layerNo][roomNo]; } static f32 getMinX() { return mMinX; } @@ -26,7 +26,7 @@ public: static f32 getMaxX() { return mMaxX; } static f32 getMaxZ() { return mMaxZ; } - static dDrawPath_c::room_class** mLayerList; // this doesn't seem right, but can't figure it out atm + static dDrawPath_c::layer_data* mLayerList; // this doesn't seem right, but can't figure it out atm static f32 mMinX; static f32 mMaxX; static f32 mMinZ; @@ -111,10 +111,12 @@ public: /* 8003FF14 */ virtual void preDrawPath(); /* 8003FFC4 */ virtual void postDrawPath(); /* 800402C0 */ virtual bool isDrawPath(); - /* 8003FE4C */ virtual GXColor* getBackColor() const; + /* 8003FE4C */ virtual const GXColor* getBackColor() const; /* 800402E0 */ virtual int getFirstDrawLayerNo(); /* 800402E8 */ virtual int getNextDrawLayerNo(int); - /* 800409E0 */ virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, + + // See cpp for argument type change comment + /* 800409E0 */ virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, int, bool, Vec const*) const; /* 80040AE4 */ virtual int getIconGroupNumber(u8) const; virtual bool hasMap() const = 0; diff --git a/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h b/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h index 010cb7818b..a1b39a274c 100644 --- a/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h +++ b/include/rel/d/a/e/d_a_e_fm/d_a_e_fm.h @@ -1,6 +1,8 @@ #ifndef D_A_E_FM_H #define D_A_E_FM_H + #include "f_op/f_op_actor_mng.h" +#include "Z2AudioLib/Z2Creature.h" /** * @ingroup actors-enemies @@ -11,9 +13,13 @@ * */ class e_fm_class : public fopEn_enemy_c { +public: /* 804F9B64 */ e_fm_class(); -private: - /* 0x5ac */ u8 field_0x5ac[0x1b084 - 0x5ac]; + /* 0x005AC */ u8 field_0x5ac[0x63c - 0x5ac]; + /* 0x0063C */ Z2CreatureFM field_0x63c; + /* 0x00760 */ u8 field_0x760[0x1828 - 0x760]; + /* 0x01828 */ u8 field_0x1828; + /* 0x01829 */ u8 field_0x1829[0x1b084 - 0x1829]; }; STATIC_ASSERT(sizeof(e_fm_class) == 0x1b084); diff --git a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h index deb9e958a5..1b0004646d 100644 --- a/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h +++ b/include/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h @@ -2,6 +2,7 @@ #define D_A_OBJ_HFUTA_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -11,26 +12,45 @@ * @details * */ -class daObjFuta_c : public fopAc_ac_c { +class daObjFuta_c : public dBgS_MoveBgActor { public: + enum Mode { + MODE_0, + MODE_1, + MODE_2, + }; + + typedef void (daObjFuta_c::*modeFunc)(); + /* 80C1DD8C */ void initBaseMtx(); /* 80C1DDC8 */ void setBaseMtx(); - /* 80C1DE94 */ void Create(); - /* 80C1DF2C */ void CreateHeap(); - /* 80C1DF9C */ void create1st(); - /* 80C1E020 */ void Execute(f32 (**)[3][4]); + /* 80C1DE94 */ int Create(); + /* 80C1DF2C */ int CreateHeap(); + /* 80C1DF9C */ int create1st(); + /* 80C1E020 */ int Execute(f32 (**)[3][4]); /* 80C1EB38 */ void mode_proc_call(); /* 80C1EBDC */ void mode_wait(); /* 80C1EC44 */ void mode_move(); /* 80C1ECB4 */ void mode_end(); - /* 80C1ECC4 */ void Draw(); - /* 80C1ED68 */ void Delete(); + /* 80C1ECC4 */ int Draw(); + /* 80C1ED68 */ int Delete(); + + void setMode(u8 mode) { mMode = mode; } private: - /* 0x568 */ u8 field_0x568[0x5cc - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ cXyz mTransM; + /* 0x5B8 */ csXyz mZXYRotationM; + /* 0x5BE */ u8 mMode; + /* 0x5BF */ u8 field_0x5bf; + /* 0x5C0 */ int field_0x5c0; + /* 0x5C4 */ f32 field_0x5c4; + /* 0x5C8 */ u8 field_0x5c8; + /* 0x5CA */ u16 mRotationIndex; }; -STATIC_ASSERT(sizeof(daObjFuta_c) == 0x5cc); +//STATIC_ASSERT(sizeof(daObjFuta_c) == 0x5cc); #endif /* D_A_OBJ_HFUTA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h index 754c8f6fa2..78a655c8ae 100644 --- a/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h +++ b/include/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h @@ -2,6 +2,8 @@ #define D_A_OBJ_HHASHI_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects @@ -11,7 +13,7 @@ * @details * */ -class daObjHHASHI_c : public fopAc_ac_c { +class daObjHHASHI_c : public dBgS_MoveBgActor { public: /* 8057F9B8 */ void initCcCylinder(); /* 8057FA18 */ void setCcCylinder(); @@ -21,19 +23,39 @@ public: /* 80580358 */ void Wall_Check(s16); /* 8058043C */ void Hahen_Motion(s16); /* 805805F4 */ void CheckCull(); - /* 805807C4 */ void checkViewArea(int); + /* 805807C4 */ bool checkViewArea(int); /* 80580854 */ void Rolling(cXyz*, f32, f32, s8); /* 80580A48 */ void Roll_Set(cXyz*, f32, s16); /* 80580C80 */ void setBaseMtx(); - /* 80580DA4 */ void CreateHeap(); - /* 80580EA0 */ void create(); - /* 805811CC */ void Create(); - /* 80581210 */ void Execute(f32 (**)[3][4]); - /* 805812BC */ void Draw(); - /* 8058140C */ void Delete(); + /* 80580DA4 */ int CreateHeap(); + /* 80580EA0 */ int create(); + /* 805811CC */ int Create(); + /* 80581210 */ int Execute(f32 (**)[3][4]); + /* 805812BC */ int Draw(); + /* 8058140C */ int Delete(); private: - /* 0x568 */ u8 field_0x568[0x119c - 0x568]; + /* 0x05A0 */ int field_0x5a0; + /* 0x05A4 */ int field_0x5a4; + /* 0x05A8 */ s8 field_0x5a8; + /* 0x05AA */ s16 field_0x5aa; + /* 0x05AC */ int field_0x5ac; + /* 0x05B0 */ cXyz field_0x5b0[50]; + /* 0x0808 */ cXyz field_0x808[50]; + /* 0x0A60 */ cXyz field_0xa60[50]; + /* 0x0CB8 */ f32 field_0xcb8; + /* 0x0CBC */ csXyz field_0xcbc[50]; + /* 0x0DE8 */ csXyz field_0xde8[50]; + /* 0x0F14 */ u8 field_0xf14[50]; + /* 0x0F46 */ s16 field_0xf46; + /* 0x0F48 */ int field_0xf48; + /* 0x0F4C */ J3DModel* mModel; + /* 0x0F50 */ J3DModel* mShardModels[50]; + /* 0x1018 */ request_of_phase_process_class mPhase; + /* 0x1020 */ dCcD_Stts mStts; + /* 0x105c */ dCcD_Cyl mCyl; + /* 0x1198 */ u8 field_0x1198; + /* 0x1199 */ u8 field_0x1199; }; STATIC_ASSERT(sizeof(daObjHHASHI_c) == 0x119c); diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h index ea2a4c9ac4..aad0a1ec95 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h +++ b/include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h @@ -5,12 +5,6 @@ #include "d/event/d_event_lib.h" #include "rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.h" -// idk how this works atm. dEvLib_callback_c seems to need to be inherited, but this data comes -// before it. the fopAc_ac_c struct size is 100% correct, so do not change it -struct temp { - /* 0x568 */ u8 field_0x568[0x570 - 0x568]; -}; - /** * @ingroup actors-objects * @class dalv4CandleDemoTag_c @@ -19,7 +13,7 @@ struct temp { * @details * */ -class dalv4CandleDemoTag_c : public fopAc_ac_c, temp, public dEvLib_callback_c { +class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c { public: dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {} diff --git a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp index 7d4255ddfc..46ac295e5e 100644 --- a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp @@ -4,10 +4,8 @@ */ #include "rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.h" -#include "JSystem/JAudio2/JASAudioThread.h" -#include "JSystem/JAudio2/JAUSoundTable.h" #include "SSystem/SComponent/c_math.h" -#include "Z2AudioLib/Z2WolfHowlMgr.h" +#include "Z2AudioLib/Z2Instances.h" #include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "d/com/d_com_inf_game.h" @@ -451,104 +449,4 @@ extern actor_process_profile_definition g_profile_OBJ_BALLOON = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BA902C-80BA9030 000084 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; - -/* 80BA9030-80BA9034 000088 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; - -/* 80BA9034-80BA9038 00008C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; - -/* 80BA9038-80BA903C 000090 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; - -/* 80BA903C-80BA9040 000094 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; - -/* 80BA9040-80BA9044 000098 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; - -/* 80BA9044-80BA9048 00009C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_80BA9044[4]; -#pragma pop - -/* 80BA9048-80BA904C 0000A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; - -/* 80BA904C-80BA9050 0000A4 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; - -/* 80BA9050-80BA9054 0000A8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; - -/* 80BA9054-80BA9058 0000AC 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; - -/* 80BA9058-80BA905C 0000B0 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; - -/* 80BA905C-80BA9060 0000B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; - -/* 80BA9060-80BA9064 0000B8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; - -/* 80BA9064-80BA9068 0000BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; - -/* 80BA9068-80BA906C 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; - -/* 80BA906C-80BA9070 0000C4 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; - -/* 80BA9070-80BA9074 0000C8 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; - -/* 80BA9074-80BA9078 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; - -/* 80BA9078-80BA907C 0000D0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; - -/* 80BA907C-80BA9080 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; - -/* 80BA9080-80BA9084 0000D8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; - -/* 80BA9084-80BA9088 0000DC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; - -/* 80BA9088-80BA908C 0000E0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80BA9088[4]; -#pragma pop - -/* 80BA908C-80BA9090 0000E4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; +AUDIO_INSTANCES; diff --git a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp index d5984fbcec..2203343b01 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp @@ -4,144 +4,55 @@ */ #include "rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void initBaseMtx__11daObjFuta_cFv(); -extern "C" void setBaseMtx__11daObjFuta_cFv(); -extern "C" void Create__11daObjFuta_cFv(); -extern "C" void CreateHeap__11daObjFuta_cFv(); -extern "C" void create1st__11daObjFuta_cFv(); -extern "C" void Execute__11daObjFuta_cFPPA3_A4_f(); -extern "C" void __dt__5csXyzFv(); -extern "C" void mode_proc_call__11daObjFuta_cFv(); -extern "C" void mode_wait__11daObjFuta_cFv(); -extern "C" void mode_move__11daObjFuta_cFv(); -extern "C" void mode_end__11daObjFuta_cFv(); -extern "C" void Draw__11daObjFuta_cFv(); -extern "C" void Delete__11daObjFuta_cFv(); -extern "C" static void daObjFuta_create1st__FP11daObjFuta_c(); -extern "C" static void daObjFuta_MoveBGDelete__FP11daObjFuta_c(); -extern "C" static void daObjFuta_MoveBGExecute__FP11daObjFuta_c(); -extern "C" static void daObjFuta_MoveBGDraw__FP11daObjFuta_c(); -extern "C" extern char const* const d_a_obj_hfuta__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__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 __ct__5csXyzFsss(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" f32 Zero__4cXyz[3]; -extern "C" u8 Zero__5csXyz[4]; -extern "C" void __register_global_object(); - -// -// Declarations: -// +#include "d/com/d_com_inf_game.h" +#include "Z2AudioLib/Z2WolfHowlMgr.h" +#include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JAUSoundTable.h" +#include "Z2AudioLib/Z2Instances.h" /* 80C1DD8C-80C1DDC8 0000EC 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/initBaseMtx__11daObjFuta_cFv.s" +void daObjFuta_c::initBaseMtx() { + mModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop - -/* ############################################################################################## */ -/* 80C1EE78-80C1EE7C 000000 0004+00 2/2 0/0 0/0 .rodata @3644 */ -SECTION_RODATA static u8 const lit_3644[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C1EE78, &lit_3644); - -/* 80C1EE7C-80C1EE80 000004 0004+00 0/1 0/0 0/0 .rodata @3645 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3645 = 87.5f; -COMPILER_STRIP_GATE(0x80C1EE7C, &lit_3645); -#pragma pop - -/* 80C1EE80-80C1EE84 000008 0004+00 0/1 0/0 0/0 .rodata @3646 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3646 = -87.5f; -COMPILER_STRIP_GATE(0x80C1EE80, &lit_3646); -#pragma pop /* 80C1DDC8-80C1DE94 000128 00CC+00 2/2 0/0 0/0 .text setBaseMtx__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/setBaseMtx__11daObjFuta_cFv.s" +// Matches with literals +void daObjFuta_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::transM(mTransM.x, mTransM.y, mTransM.z); + mDoMtx_stack_c::transM(0.0f, 87.5f, 0.0f); + mDoMtx_stack_c::ZXYrotM(mZXYRotationM.x, mZXYRotationM.y, mZXYRotationM.z); + mDoMtx_stack_c::transM(0.0f, -87.5f, 0.0f); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), (MtxP)&mBgMtx); } -#pragma pop /* 80C1DE94-80C1DF2C 0001F4 0098+00 1/0 0/0 0/0 .text Create__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Create__11daObjFuta_cFv.s" +int daObjFuta_c::Create() { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[168])) { + setMode(MODE_2); + mode_end(); + } else { + setMode(MODE_0); + mode_wait(); + } + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C1EE98-80C1EE98 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C1EE98 = "Obj_hfuta"; -#pragma pop /* 80C1EEA4-80C1EEB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80C1EEB0-80C1EEC4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -152,546 +63,181 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80C1EEC4-80C1EEC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hfuta__stringBase0; +static char* l_arcName = "Obj_hfuta"; /* 80C1DF2C-80C1DF9C 00028C 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/CreateHeap__11daObjFuta_cFv.s" +int daObjFuta_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(204, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mModel != NULL ? 1 : 0; } -#pragma pop /* 80C1DF9C-80C1E020 0002FC 0084+00 1/1 0/0 0/0 .text create1st__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/create1st__11daObjFuta_cFv.s" +int daObjFuta_c::create1st() { + int rv = dComIfG_resLoad(&mPhase, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + rv = MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0xb00, NULL); + if (rv == cPhs_ERROR_e) { + return rv; + } + } + return rv; } -#pragma pop - -/* ############################################################################################## */ -/* 80C1EF90-80C1EF94 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80C1EF94-80C1EF98 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EF98-80C1EF9C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EF9C-80C1EFA0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFA0-80C1EFA4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFA4-80C1EFA8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFA8-80C1EFAC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFAC-80C1EFB0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFB0-80C1EFB4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFB4-80C1EFB8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFB8-80C1EFBC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFBC-80C1EFC0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFC0-80C1EFC4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFC4-80C1EFC8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFC8-80C1EFCC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFCC-80C1EFD0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - -/* 80C1EFD0-80C1EFE0 000048 000C+04 0/1 0/0 0/0 .bss @3687 */ -#pragma push -#pragma force_active on -static u8 lit_3687[12 + 4 /* padding */]; -#pragma pop - -/* 80C1EFE0-80C1EFEC 000058 000C+00 0/1 0/0 0/0 .bss @3690 */ -#pragma push -#pragma force_active on -static u8 lit_3690[12]; -#pragma pop - -/* 80C1EFEC-80C1EFF8 000064 000C+00 0/1 0/0 0/0 .bss @3691 */ -#pragma push -#pragma force_active on -static u8 lit_3691[12]; -#pragma pop - -/* 80C1EFF8-80C1F004 000070 000C+00 0/1 0/0 0/0 .bss @3692 */ -#pragma push -#pragma force_active on -static u8 lit_3692[12]; -#pragma pop - -/* 80C1F004-80C1F010 00007C 000C+00 0/1 0/0 0/0 .bss @3693 */ -#pragma push -#pragma force_active on -static u8 lit_3693[12]; -#pragma pop - -/* 80C1F010-80C1F01C 000088 000C+00 0/1 0/0 0/0 .bss @3694 */ -#pragma push -#pragma force_active on -static u8 lit_3694[12]; -#pragma pop - -/* 80C1F01C-80C1F028 000094 000C+00 0/1 0/0 0/0 .bss @3695 */ -#pragma push -#pragma force_active on -static u8 lit_3695[12]; -#pragma pop - -/* 80C1F028-80C1F034 0000A0 000C+00 0/1 0/0 0/0 .bss @3696 */ -#pragma push -#pragma force_active on -static u8 lit_3696[12]; -#pragma pop - -/* 80C1F034-80C1F040 0000AC 000C+00 0/1 0/0 0/0 .bss @3697 */ -#pragma push -#pragma force_active on -static u8 lit_3697[12]; -#pragma pop - -/* 80C1F040-80C1F04C 0000B8 000C+00 0/1 0/0 0/0 .bss @3698 */ -#pragma push -#pragma force_active on -static u8 lit_3698[12]; -#pragma pop - -/* 80C1F04C-80C1F058 0000C4 000C+00 0/1 0/0 0/0 .bss @3699 */ -#pragma push -#pragma force_active on -static u8 lit_3699[12]; -#pragma pop - -/* 80C1F058-80C1F064 0000D0 000C+00 0/1 0/0 0/0 .bss @3700 */ -#pragma push -#pragma force_active on -static u8 lit_3700[12]; -#pragma pop - -/* 80C1F064-80C1F070 0000DC 000C+00 0/1 0/0 0/0 .bss @3701 */ -#pragma push -#pragma force_active on -static u8 lit_3701[12]; -#pragma pop - -/* 80C1F070-80C1F07C 0000E8 000C+00 0/1 0/0 0/0 .bss @3702 */ -#pragma push -#pragma force_active on -static u8 lit_3702[12]; -#pragma pop - -/* 80C1F07C-80C1F088 0000F4 000C+00 0/1 0/0 0/0 .bss @3703 */ -#pragma push -#pragma force_active on -static u8 lit_3703[12]; -#pragma pop - -/* 80C1F088-80C1F094 000100 000C+00 0/1 0/0 0/0 .bss @3704 */ -#pragma push -#pragma force_active on -static u8 lit_3704[12]; -#pragma pop - -/* 80C1F094-80C1F0A0 00010C 000C+00 0/1 0/0 0/0 .bss @3705 */ -#pragma push -#pragma force_active on -static u8 lit_3705[12]; -#pragma pop - -/* 80C1F0A0-80C1F0AC 000118 000C+00 0/1 0/0 0/0 .bss @3706 */ -#pragma push -#pragma force_active on -static u8 lit_3706[12]; -#pragma pop - -/* 80C1F0AC-80C1F0B8 000124 000C+00 0/1 0/0 0/0 .bss @3707 */ -#pragma push -#pragma force_active on -static u8 lit_3707[12]; -#pragma pop - -/* 80C1F0B8-80C1F0C4 000130 000C+00 0/1 0/0 0/0 .bss @3708 */ -#pragma push -#pragma force_active on -static u8 lit_3708[12]; -#pragma pop - -/* 80C1F0C4-80C1F0D0 00013C 000C+00 0/1 0/0 0/0 .bss @3709 */ -#pragma push -#pragma force_active on -static u8 lit_3709[12]; -#pragma pop - -/* 80C1F0D0-80C1F0DC 000148 000C+00 0/1 0/0 0/0 .bss @3710 */ -#pragma push -#pragma force_active on -static u8 lit_3710[12]; -#pragma pop - -/* 80C1F0DC-80C1F0E8 000154 000C+00 0/1 0/0 0/0 .bss @3711 */ -#pragma push -#pragma force_active on -static u8 lit_3711[12]; -#pragma pop - -/* 80C1F0E8-80C1F0F4 000160 000C+00 0/1 0/0 0/0 .bss @3712 */ -#pragma push -#pragma force_active on -static u8 lit_3712[12]; -#pragma pop - -/* 80C1F0F4-80C1F100 00016C 000C+00 0/1 0/0 0/0 .bss @3713 */ -#pragma push -#pragma force_active on -static u8 lit_3713[12]; -#pragma pop - -/* 80C1F100-80C1F10C 000178 000C+00 0/1 0/0 0/0 .bss @3714 */ -#pragma push -#pragma force_active on -static u8 lit_3714[12]; -#pragma pop - -/* 80C1F10C-80C1F118 000184 000C+00 0/1 0/0 0/0 .bss @3715 */ -#pragma push -#pragma force_active on -static u8 lit_3715[12]; -#pragma pop - -/* 80C1F118-80C1F124 000190 000C+00 0/1 0/0 0/0 .bss @3716 */ -#pragma push -#pragma force_active on -static u8 lit_3716[12]; -#pragma pop - -/* 80C1F124-80C1F130 00019C 000C+00 0/1 0/0 0/0 .bss @3717 */ -#pragma push -#pragma force_active on -static u8 lit_3717[12]; -#pragma pop - -/* 80C1F130-80C1F13C 0001A8 000C+00 0/1 0/0 0/0 .bss @3718 */ -#pragma push -#pragma force_active on -static u8 lit_3718[12]; -#pragma pop - -/* 80C1F13C-80C1F148 0001B4 000C+00 0/1 0/0 0/0 .bss @3719 */ -#pragma push -#pragma force_active on -static u8 lit_3719[12]; -#pragma pop - -/* 80C1F148-80C1F154 0001C0 000C+00 0/1 0/0 0/0 .bss @3720 */ -#pragma push -#pragma force_active on -static u8 lit_3720[12]; -#pragma pop - -/* 80C1F154-80C1F160 0001CC 000C+00 0/1 0/0 0/0 .bss @3721 */ -#pragma push -#pragma force_active on -static u8 lit_3721[12]; -#pragma pop - -/* 80C1F160-80C1F16C 0001D8 000C+00 0/1 0/0 0/0 .bss @3722 */ -#pragma push -#pragma force_active on -static u8 lit_3722[12]; -#pragma pop - -/* 80C1F16C-80C1F178 0001E4 000C+00 0/1 0/0 0/0 .bss @3723 */ -#pragma push -#pragma force_active on -static u8 lit_3723[12]; -#pragma pop -/* 80C1F178-80C1F184 0001F0 000C+00 0/1 0/0 0/0 .bss @3724 */ +// Required padding #pragma push #pragma force_active on -static u8 lit_3724[12]; +static u8 sbss_padding[0x40]; #pragma pop -/* 80C1F184-80C1F190 0001FC 000C+00 0/1 0/0 0/0 .bss @3725 */ -#pragma push -#pragma force_active on -static u8 lit_3725[12]; -#pragma pop - -/* 80C1F190-80C1F19C 000208 000C+00 0/1 0/0 0/0 .bss @3726 */ -#pragma push -#pragma force_active on -static u8 lit_3726[12]; -#pragma pop - -/* 80C1F19C-80C1F1A8 000214 000C+00 0/1 0/0 0/0 .bss @3727 */ -#pragma push -#pragma force_active on -static u8 lit_3727[12]; -#pragma pop - -/* 80C1F1A8-80C1F1B4 000220 000C+00 0/1 0/0 0/0 .bss @3728 */ -#pragma push -#pragma force_active on -static u8 lit_3728[12]; -#pragma pop - -/* 80C1F1B4-80C1F1C0 00022C 000C+00 0/1 0/0 0/0 .bss @3729 */ -#pragma push -#pragma force_active on -static u8 lit_3729[12]; -#pragma pop - -/* 80C1F1C0-80C1F1CC 000238 000C+00 0/1 0/0 0/0 .bss @3730 */ -#pragma push -#pragma force_active on -static u8 lit_3730[12]; -#pragma pop - -/* 80C1F1CC-80C1F1D8 000244 000C+00 0/1 0/0 0/0 .bss @3731 */ -#pragma push -#pragma force_active on -static u8 lit_3731[12]; -#pragma pop - -/* 80C1F1D8-80C1F2DC -00001 0104+00 1/2 0/0 0/0 .bss None */ -/* 80C1F1D8 0102+00 data_80C1F1D8 l_rot_data$3686 */ -/* 80C1F2DA 0002+00 data_80C1F2DA None */ -static u8 struct_80C1F1D8[260]; - /* 80C1E020-80C1EAFC 000380 0ADC+00 1/0 0/0 0/0 .text Execute__11daObjFuta_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Execute__11daObjFuta_cFPPA3_A4_f.s" +int daObjFuta_c::Execute(f32 (**mtx)[3][4]) { + mode_proc_call(); + static const csXyz l_rot_data[43] = { + csXyz(-11, 0, 899), + csXyz(602, 0, 641), + csXyz(858, 0, 42), + csXyz(632, 0, -552), + csXyz(70, 0, -816), + csXyz(-503, 0, -621), + csXyz(-774, 0, -95), + csXyz(-607, 0, 456), + csXyz(-117, 0, 730), + csXyz(410, 0, 591), + csXyz(686, 0, 136), + csXyz(572, 0, -367), + csXyz(152, 0, -642), + csXyz(-325, 0, -550), + csXyz(-750, 0, -150), + csXyz(-450, 0, 150), + csXyz(-150, 0, 450), + csXyz(150, 0, 750), + csXyz(450, 0, 450), + csXyz(750, 0, 150), + csXyz(450, 0, -150), + csXyz(150, 0, -450), + csXyz(-150, 0, -750), + csXyz(-450, 0, -450), + csXyz(-750, 0, -150), + csXyz(-450, 0, 150), + csXyz(-150, 0, 450), + csXyz(150, 0, 750), + csXyz(450, 0, 450), + csXyz(750, 0, 150), + csXyz(450, 0, -150), + csXyz(150, 0, -450), + csXyz(-150, 0, -750), + csXyz(-450, 0, -450), + csXyz(-700, 0, -150), + csXyz(-200, 0, 350), + csXyz(300, 0, 700), + csXyz(700, 0, 200), + csXyz(200, 0, -300), + csXyz(-300, 0, -700), + csXyz(-700, 0, -200), + csXyz(-200, 0, 300), + csXyz(300, 0, 700), + }; + if (field_0x5c8 != 0) { + if (mRotationIndex < 43) { + mZXYRotationM.x = l_rot_data[mRotationIndex].x; + mZXYRotationM.z = l_rot_data[mRotationIndex].z; + } else { + mZXYRotationM.z = 0; + mZXYRotationM.x = 0; + } + mRotationIndex++; + } + *mtx = &mBgMtx; + setBaseMtx(); + field_0x5c0++; + return 1; } -#pragma pop - -/* 80C1EAFC-80C1EB38 000E5C 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm csXyz::~csXyz() { -extern "C" asm void __dt__5csXyzFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/__dt__5csXyzFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C1EEC8-80C1EED4 -00001 000C+00 0/1 0/0 0/0 .data @3966 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3966[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_wait__11daObjFuta_cFv, -}; -#pragma pop - -/* 80C1EED4-80C1EEE0 -00001 000C+00 0/1 0/0 0/0 .data @3967 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3967[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_move__11daObjFuta_cFv, -}; -#pragma pop - -/* 80C1EEE0-80C1EEEC -00001 000C+00 0/1 0/0 0/0 .data @3968 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3968[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_end__11daObjFuta_cFv, -}; -#pragma pop - -/* 80C1EEEC-80C1EF10 000048 0024+00 0/1 0/0 0/0 .data l_func$3965 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop /* 80C1EB38-80C1EBDC 000E98 00A4+00 1/1 0/0 0/0 .text mode_proc_call__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::mode_proc_call() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_proc_call__11daObjFuta_cFv.s" +void daObjFuta_c::mode_proc_call() { + static const modeFunc l_func[] = { + &daObjFuta_c::mode_wait, + &daObjFuta_c::mode_move, + &daObjFuta_c::mode_end, + }; + + (this->*(l_func[mMode]))(); } -#pragma pop - -/* ############################################################################################## */ -/* 80C1EE84-80C1EE88 00000C 0004+00 1/1 0/0 0/0 .rodata @3985 */ -SECTION_RODATA static f32 const lit_3985 = 900.0f; -COMPILER_STRIP_GATE(0x80C1EE84, &lit_3985); /* 80C1EBDC-80C1EC44 000F3C 0068+00 2/1 0/0 0/0 .text mode_wait__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::mode_wait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_wait__11daObjFuta_cFv.s" +void daObjFuta_c::mode_wait() { + mTransM = cXyz::Zero; + mZXYRotationM = csXyz::Zero; + if (field_0x5bf != 0) { + field_0x5c4 = 900.0f; + setMode(MODE_1); + field_0x5c8 = 1; + mRotationIndex = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C1EE88-80C1EE8C 000010 0004+00 1/2 0/0 0/0 .rodata @3995 */ -SECTION_RODATA static f32 const lit_3995 = 120.0f; -COMPILER_STRIP_GATE(0x80C1EE88, &lit_3995); - -/* 80C1EE8C-80C1EE90 000014 0004+00 0/1 0/0 0/0 .rodata @3996 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3996 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C1EE8C, &lit_3996); -#pragma pop - -/* 80C1EE90-80C1EE94 000018 0004+00 0/1 0/0 0/0 .rodata @3997 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3997 = 5.0f; -COMPILER_STRIP_GATE(0x80C1EE90, &lit_3997); -#pragma pop - -/* 80C1EE94-80C1EE98 00001C 0004+00 0/1 0/0 0/0 .rodata @3998 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3998 = 2.0f; -COMPILER_STRIP_GATE(0x80C1EE94, &lit_3998); -#pragma pop /* 80C1EC44-80C1ECB4 000FA4 0070+00 1/0 0/0 0/0 .text mode_move__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::mode_move() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_move__11daObjFuta_cFv.s" +void daObjFuta_c::mode_move() { + if (mRotationIndex > 12) { + if (cLib_addCalc(&mTransM.x, 120.0f, 0.1f, 5.0f, 2.0f) == 0.0f) + { + setMode(MODE_2); + } + } } -#pragma pop /* 80C1ECB4-80C1ECC4 001014 0010+00 2/1 0/0 0/0 .text mode_end__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::mode_end() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/mode_end__11daObjFuta_cFv.s" +void daObjFuta_c::mode_end() { + mTransM.x = 120.0f; } -#pragma pop /* 80C1ECC4-80C1ED68 001024 00A4+00 1/0 0/0 0/0 .text Draw__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Draw__11daObjFuta_cFv.s" +int daObjFuta_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C1ED68-80C1ED9C 0010C8 0034+00 1/0 0/0 0/0 .text Delete__11daObjFuta_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFuta_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/Delete__11daObjFuta_cFv.s" +int daObjFuta_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} + +/* 80C1ED9C-80C1EDFC 0010FC 0060+00 1/0 0/0 0/0 .text daObjFuta_create1st__FP11daObjFuta_c */ +static int daObjFuta_create1st(daObjFuta_c* i_this) { + fopAcM_SetupActor(i_this, daObjFuta_c); + return i_this->create1st(); +} + +/* 80C1EDFC-80C1EE1C 00115C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDelete__FP11daObjFuta_c */ +static int daObjFuta_MoveBGDelete(daObjFuta_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C1EE1C-80C1EE3C 00117C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGExecute__FP11daObjFuta_c */ +static int daObjFuta_MoveBGExecute(daObjFuta_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C1EE3C-80C1EE68 00119C 002C+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDraw__FP11daObjFuta_c */ +static int daObjFuta_MoveBGDraw(daObjFuta_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* ############################################################################################## */ /* 80C1EF10-80C1EF30 -00001 0020+00 1/0 0/0 0/0 .data daObjFuta_METHODS */ static actor_method_class daObjFuta_METHODS = { - (process_method_func)daObjFuta_create1st__FP11daObjFuta_c, - (process_method_func)daObjFuta_MoveBGDelete__FP11daObjFuta_c, - (process_method_func)daObjFuta_MoveBGExecute__FP11daObjFuta_c, - 0, - (process_method_func)daObjFuta_MoveBGDraw__FP11daObjFuta_c, + (process_method_func)daObjFuta_create1st, + (process_method_func)daObjFuta_MoveBGDelete, + (process_method_func)daObjFuta_MoveBGExecute, + NULL, + (process_method_func)daObjFuta_MoveBGDraw, }; /* 80C1EF30-80C1EF60 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Hfuta */ @@ -712,230 +258,4 @@ extern actor_process_profile_definition g_profile_Obj_Hfuta = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80C1EF60-80C1EF88 0000BC 0028+00 1/1 0/0 0/0 .data __vt__11daObjFuta_c */ -SECTION_DATA extern void* __vt__11daObjFuta_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daObjFuta_cFv, - (void*)Create__11daObjFuta_cFv, - (void*)Execute__11daObjFuta_cFPPA3_A4_f, - (void*)Draw__11daObjFuta_cFv, - (void*)Delete__11daObjFuta_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C1ED9C-80C1EDFC 0010FC 0060+00 1/0 0/0 0/0 .text daObjFuta_create1st__FP11daObjFuta_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFuta_create1st(daObjFuta_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_create1st__FP11daObjFuta_c.s" -} -#pragma pop - -/* 80C1EDFC-80C1EE1C 00115C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDelete__FP11daObjFuta_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFuta_MoveBGDelete(daObjFuta_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDelete__FP11daObjFuta_c.s" -} -#pragma pop - -/* 80C1EE1C-80C1EE3C 00117C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGExecute__FP11daObjFuta_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFuta_MoveBGExecute(daObjFuta_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGExecute__FP11daObjFuta_c.s" -} -#pragma pop - -/* 80C1EE3C-80C1EE68 00119C 002C+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDraw__FP11daObjFuta_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFuta_MoveBGDraw(daObjFuta_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta/daObjFuta_MoveBGDraw__FP11daObjFuta_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C1F2DC-80C1F2E0 000354 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2DC[4]; -#pragma pop - -/* 80C1F2E0-80C1F2E4 000358 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2E0[4]; -#pragma pop - -/* 80C1F2E4-80C1F2E8 00035C 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2E4[4]; -#pragma pop - -/* 80C1F2E8-80C1F2EC 000360 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2E8[4]; -#pragma pop - -/* 80C1F2EC-80C1F2F0 000364 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F2EC[4]; -#pragma pop - -/* 80C1F2F0-80C1F2F4 000368 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F2F0[4]; -#pragma pop - -/* 80C1F2F4-80C1F2F8 00036C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F2F4[4]; -#pragma pop - -/* 80C1F2F8-80C1F2FC 000370 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2F8[4]; -#pragma pop - -/* 80C1F2FC-80C1F300 000374 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_80C1F2FC[4]; -#pragma pop - -/* 80C1F300-80C1F304 000378 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_80C1F300[4]; -#pragma pop - -/* 80C1F304-80C1F308 00037C 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F304[4]; -#pragma pop - -/* 80C1F308-80C1F30C 000380 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F308[4]; -#pragma pop - -/* 80C1F30C-80C1F310 000384 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F30C[4]; -#pragma pop - -/* 80C1F310-80C1F314 000388 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F310[4]; -#pragma pop - -/* 80C1F314-80C1F318 00038C 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80C1F314[4]; -#pragma pop - -/* 80C1F318-80C1F31C 000390 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_80C1F318[4]; -#pragma pop - -/* 80C1F31C-80C1F320 000394 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_80C1F31C[4]; -#pragma pop - -/* 80C1F320-80C1F324 000398 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_80C1F320[4]; -#pragma pop - -/* 80C1F324-80C1F328 00039C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F324[4]; -#pragma pop - -/* 80C1F328-80C1F32C 0003A0 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F328[4]; -#pragma pop - -/* 80C1F32C-80C1F330 0003A4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F32C[4]; -#pragma pop - -/* 80C1F330-80C1F334 0003A8 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F330[4]; -#pragma pop - -/* 80C1F334-80C1F338 0003AC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F334[4]; -#pragma pop - -/* 80C1F338-80C1F33C 0003B0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_80C1F338[4]; -#pragma pop - -/* 80C1F33C-80C1F340 0003B4 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_80C1F33C[4]; -#pragma pop - -/* 80C1EE98-80C1EE98 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +AUDIO_INSTANCES; diff --git a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp index f78a5f5636..9a09cf9236 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp @@ -4,132 +4,14 @@ */ #include "rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.h" +#include "rel/d/a/e/d_a_e_fm/d_a_e_fm.h" #include "d/cc/d_cc_d.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void initCcCylinder__13daObjHHASHI_cFv(); -extern "C" void setCcCylinder__13daObjHHASHI_cFv(); -extern "C" static void daObjHHASHI_Create__FP10fopAc_ac_c(); -extern "C" static void daObjHHASHI_Delete__FP13daObjHHASHI_c(); -extern "C" void Set_Hahen__13daObjHHASHI_cFP4cXyz(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __dt__5csXyzFv(); -extern "C" void Set_Speed__13daObjHHASHI_cFssffff(); -extern "C" void Obj_Damage__13daObjHHASHI_cFv(); -extern "C" void Wall_Check__13daObjHHASHI_cFs(); -extern "C" void Hahen_Motion__13daObjHHASHI_cFs(); -extern "C" void CheckCull__13daObjHHASHI_cFv(); -extern "C" void checkViewArea__13daObjHHASHI_cFi(); -extern "C" void Rolling__13daObjHHASHI_cFP4cXyzffSc(); -extern "C" void Roll_Set__13daObjHHASHI_cFP4cXyzfs(); -extern "C" void setBaseMtx__13daObjHHASHI_cFv(); -extern "C" static void daObjHHASHI_Draw__FP13daObjHHASHI_c(); -extern "C" static void daObjHHASHI_Execute__FP13daObjHHASHI_c(); -extern "C" void CreateHeap__13daObjHHASHI_cFv(); -extern "C" void create__13daObjHHASHI_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" static bool daObjHHASHI_IsDelete__FP13daObjHHASHI_c(); -extern "C" void Create__13daObjHHASHI_cFv(); -extern "C" void Execute__13daObjHHASHI_cFPPA3_A4_f(); -extern "C" void Draw__13daObjHHASHI_cFv(); -extern "C" void Delete__13daObjHHASHI_cFv(); -extern "C" extern char const* const d_a_obj_hhashi__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void mDoLib_project__FP3VecP3Vec(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc(); -extern "C" void removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai(); -extern "C" void entrySimpleModel__14dComIfG_play_cFP8J3DModeli(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void __ct__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 __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void ResetTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "d/cc/d_cc_uty.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "m_Do/m_Do_lib.h" +#include "SSystem/SComponent/c_math.h" /* ############################################################################################## */ /* 805814AC-805814F0 000000 0044+00 10/10 0/0 0/0 .rodata ccCylSrc$3773 */ @@ -149,505 +31,384 @@ const static dCcD_SrcCyl ccCylSrc = { /* 8057F9B8-8057FA18 000078 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::initCcCylinder() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/initCcCylinder__13daObjHHASHI_cFv.s" +void daObjHHASHI_c::initCcCylinder() { + mStts.Init(0xff, 0xff, this); + mCyl.Set(ccCylSrc); + mCyl.SetStts(&mStts); + mCyl.SetC(current.pos); } -#pragma pop /* 8057FA18-8057FA4C 0000D8 0034+00 1/1 0/0 0/0 .text setCcCylinder__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::setCcCylinder() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setCcCylinder__13daObjHHASHI_cFv.s" +void daObjHHASHI_c::setCcCylinder() { + dComIfG_Ccsp()->Set(&mCyl); } -#pragma pop /* 8057FA4C-8057FA6C 00010C 0020+00 1/0 0/0 0/0 .text daObjHHASHI_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjHHASHI_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Create__FP10fopAc_ac_c.s" +static int daObjHHASHI_Create(fopAc_ac_c* i_this) { + fopAcM_GetID(i_this); + return static_cast<daObjHHASHI_c*>(i_this)->create(); } -#pragma pop /* 8057FA6C-8057FA90 00012C 0024+00 1/0 0/0 0/0 .text daObjHHASHI_Delete__FP13daObjHHASHI_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjHHASHI_Delete(daObjHHASHI_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Delete__FP13daObjHHASHI_c.s" +static int daObjHHASHI_Delete(daObjHHASHI_c* i_this) { + fopAcM_GetID(i_this); + i_this->MoveBGDelete(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 805814F0-805814F4 000044 0004+00 0/2 0/0 0/0 .rodata @3844 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3844 = 1.0f; -COMPILER_STRIP_GATE(0x805814F0, &lit_3844); -#pragma pop - -/* 805814F4-805814F8 000048 0004+00 0/2 0/0 0/0 .rodata @3845 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3845 = -1.0f; -COMPILER_STRIP_GATE(0x805814F4, &lit_3845); -#pragma pop - -/* 805814F8-805814FC 00004C 0004+00 0/1 0/0 0/0 .rodata @3846 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3846 = 300.0f; -COMPILER_STRIP_GATE(0x805814F8, &lit_3846); -#pragma pop - -/* 805814FC-80581500 000050 0004+00 0/1 0/0 0/0 .rodata @3847 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3847 = 50.0f; -COMPILER_STRIP_GATE(0x805814FC, &lit_3847); -#pragma pop /* 8057FA90-8057FD30 000150 02A0+00 1/1 0/0 0/0 .text Set_Hahen__13daObjHHASHI_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Set_Hahen(cXyz* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Hahen__13daObjHHASHI_cFP4cXyz.s" -} -#pragma pop - -/* 8057FD30-8057FD6C 0003F0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cXyz::~cXyz() { -extern "C" asm void __dt__4cXyzFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__4cXyzFv.s" -} -#pragma pop - -/* 8057FD6C-8057FDA8 00042C 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm csXyz::~csXyz() { -extern "C" asm void __dt__5csXyzFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__5csXyzFv.s" +void daObjHHASHI_c::Set_Hahen(cXyz* param_1) { + csXyz cStack_38(0, 0, 0); + fopAcM_seStartCurrent(this, Z2SE_OBJ_FM_BREAK_PILLAR, 0); + if (field_0x5a4 == 0) { + cXyz cStack_30(current.pos.x, current.pos.y + 300.0f, current.pos.z); + cStack_38.y = field_0xcb8; + dComIfGp_particle_set(0x8710, param_1, &tevStr, &cStack_38, 0); + dComIfGp_particle_set(0x8711, param_1, &tevStr, &cStack_38, 0); + dComIfGp_particle_set(0x8712, param_1, &tevStr, &cStack_38, 0); + dComIfGp_particle_set(0x8713, ¤t.pos, &tevStr, &shape_angle, 0); + dComIfGp_particle_set(0x8714, ¤t.pos, &tevStr, &shape_angle, 0); + Set_Speed(0, 50, 50.0f, 50.0f, 300.0f, 300.0f); + field_0x5a4 = 2; + if (mpBgW != NULL && + mpBgW->ChkUsed()) + { + if (!dComIfG_Bgsp().Release(mpBgW)) { + OS_REPORT("Release Error\n"); + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80581500-80581504 000054 0004+00 0/1 0/0 0/0 .rodata @3915 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3915 = 70.0f; -COMPILER_STRIP_GATE(0x80581500, &lit_3915); -#pragma pop - -/* 80581504-80581508 000058 0004+00 0/1 0/0 0/0 .rodata @3916 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3916 = 0.5f; -COMPILER_STRIP_GATE(0x80581504, &lit_3916); -#pragma pop - -/* 80581508-8058150C 00005C 0004+00 0/1 0/0 0/0 .rodata @3917 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3917 = 2.5f; -COMPILER_STRIP_GATE(0x80581508, &lit_3917); -#pragma pop - -/* 8058150C-80581510 000060 0004+00 0/1 0/0 0/0 .rodata @3918 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3918 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(0x8058150C, &lit_3918); -#pragma pop - -/* 80581510-80581514 000064 0004+00 0/1 0/0 0/0 .rodata @3919 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3919 = 1.5f; -COMPILER_STRIP_GATE(0x80581510, &lit_3919); -#pragma pop - -/* 80581514-80581518 000068 0004+00 0/1 0/0 0/0 .rodata @3920 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3920 = 30.0f; -COMPILER_STRIP_GATE(0x80581514, &lit_3920); -#pragma pop - -/* 80581518-8058151C 00006C 0004+00 0/1 0/0 0/0 .rodata @3921 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3921 = 32768.0f; -COMPILER_STRIP_GATE(0x80581518, &lit_3921); -#pragma pop - -/* 8058151C-80581520 000070 0004+00 0/1 0/0 0/0 .rodata @3922 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3922 = 8192.0f; -COMPILER_STRIP_GATE(0x8058151C, &lit_3922); -#pragma pop - -/* 80581520-80581524 000074 0004+00 1/7 0/0 0/0 .rodata @3923 */ -SECTION_RODATA static u8 const lit_3923[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80581520, &lit_3923); - -/* 80581524-80581528 000078 0004+00 0/1 0/0 0/0 .rodata @3924 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3924 = 15000.0f; -COMPILER_STRIP_GATE(0x80581524, &lit_3924); -#pragma pop - -/* 80581528-8058152C 00007C 0004+00 0/1 0/0 0/0 .rodata @3925 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3925 = 65536.0f; -COMPILER_STRIP_GATE(0x80581528, &lit_3925); -#pragma pop - -/* 8058152C-80581530 000080 0004+00 0/1 0/0 0/0 .rodata @3926 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3926 = 20.0f; -COMPILER_STRIP_GATE(0x8058152C, &lit_3926); -#pragma pop - -/* 80581530-80581534 000084 0004+00 0/1 0/0 0/0 .rodata @3927 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(0x80581530, &lit_3927); -#pragma pop - -/* 80581534-8058153C 000088 0004+04 0/1 0/0 0/0 .rodata @3928 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3928[1 + 1 /* padding */] = { - 32000.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80581534, &lit_3928); -#pragma pop - -/* 8058153C-80581544 000090 0008+00 0/2 0/0 0/0 .rodata @3931 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3931[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8058153C, &lit_3931); -#pragma pop /* 8057FDA8-805801B0 000468 0408+00 1/1 0/0 0/0 .text Set_Speed__13daObjHHASHI_cFssffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Set_Speed(s16 param_0, s16 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Set_Speed__13daObjHHASHI_cFssffff.s" +void daObjHHASHI_c::Set_Speed(s16 param_1, s16 param_2, f32 param_3, f32 param_4, f32 param_5, + f32 param_6) { + csXyz cStack_f0; + for (int i = param_1; i < param_2 - 20; i++) { + field_0x5b0[i].set(current.pos.x + cM_rndFX(70.0f), + (current.pos.y + param_5) + cM_rndF(param_6), + current.pos.z + cM_rndFX(70.0f)); + field_0xa60[i].set(cM_rndF(2.5f) + 0.5f, cM_rndF(1.5f) + 1.1f, cM_rndF(2.5f) + 0.5f); + cM_rndFX(param_4); + f32 fVar1 = cM_rndFX(30.0f) + 30.0f; + s16 rot = (s16)cM_rndFX(8192.0f) + + (field_0xcb8 - 32768.0f); + field_0x808[i].set(0.0f, 0.0f, fVar1); + mDoMtx_stack_c::YrotS(rot); + mDoMtx_stack_c::multVec(&field_0x808[i], &field_0x808[i]); + field_0x808[i].y = fVar1; + field_0xde8[i].x = cM_rndFX(15000.0f); + field_0xde8[i].y = cM_rndFX(15000.0f); + field_0xcbc[i].x = cM_rndFX(65536.0f); + field_0xcbc[i].y = cM_rndFX(65536.0f); + } + for (int i = param_2 - 20; i < param_2; i++) { + field_0x5b0[i].set(current.pos.x + cM_rndFX(70.0f), + (current.pos.y + param_5) + cM_rndFX(param_6), + current.pos.z + cM_rndFX(70.0f)); + field_0xa60[i].set(cM_rndF(2.5f) + 0.5f, cM_rndF(1.5f) + 1.1f, cM_rndF(2.5f) + 0.5f); + f32 dVar10; + f32 dVar12 = cM_rndFX(20.0f) + 20.0f; + dVar10 = cM_rndFX(20.0f) + 10.0f; + s16 sVar6 = cM_rndFX(32000.0f); + f32 dVar13 = dVar10 + gravity; + f32 dVar14 = dVar12 * cM_scos(sVar6); + field_0x808[i].set((dVar12 * cM_ssin(sVar6)), dVar13, dVar14); + field_0xde8[i].x = cM_rndFX(15000.0f); + field_0xde8[i].y = cM_rndFX(15000.0f); + field_0xcbc[i].x = cM_rndFX(65536.0f); + field_0xcbc[i].y = cM_rndFX(65536.0f); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80581544-80581548 000098 0004+00 0/1 0/0 0/0 .rodata @3979 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3979 = 16384.0f; -COMPILER_STRIP_GATE(0x80581544, &lit_3979); -#pragma pop - -/* 80581548-8058154C 00009C 0004+00 0/1 0/0 0/0 .rodata @3980 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3980 = 100.0f; -COMPILER_STRIP_GATE(0x80581548, &lit_3980); -#pragma pop /* 805801B0-80580358 000870 01A8+00 1/1 0/0 0/0 .text Obj_Damage__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Obj_Damage() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Obj_Damage__13daObjHHASHI_cFv.s" +void daObjHHASHI_c::Obj_Damage() { + if (field_0xf46 == 0) { + mStts.Move(); + if (mCyl.ChkTgHit()) { + cXyz& playerPos = fopAcM_GetPosition(daPy_getPlayerActorClass()); + field_0xf46 = 10; + e_fm_class* tgActor = (e_fm_class*)dCc_GetAc(mCyl.GetTgHitObj()->GetAc()); + cXyz* tgHitPos = mCyl.GetTgHitPosP(); + cLib_targetAngleY(¤t.pos, tgHitPos); + if (fopAcM_GetName(tgActor) == PROC_E_FM) { + field_0x5aa++; + e_fm_class* fm = (e_fm_class*)fopAcM_SearchByID(fopAcM_GetID(tgActor)); + if (fm != NULL) { + field_0xcb8 = tgActor->shape_angle.y; + field_0x5a8 = fm->field_0x1828;; + } + if (field_0x5a8 == 1) { + field_0xcb8 += 16384.0f; + } else if (field_0x5a8 == 0) { + field_0xcb8 -= 16384.0f; + } + Set_Hahen(tgHitPos); + dComIfGp_getVibration().StartShock(7, 1, cXyz(0.0f, 1.0f, 0.0f)); + } + mCyl.ResetTgHit(); + // !@bug: I'm not quite sure but it seems like the access to tgActor fields is outside + // proc name check so it might not be the right type of actor + tgActor->field_0x63c.startChainSound( + Z2SE_EN_FM_CHAIN_HIT, tgActor->field_0x1828, 100.0f, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 8058154C-80581550 0000A0 0004+00 1/1 0/0 0/0 .rodata @4006 */ -SECTION_RODATA static f32 const lit_4006 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(0x8058154C, &lit_4006); /* 80580358-8058043C 000A18 00E4+00 1/1 0/0 0/0 .text Wall_Check__13daObjHHASHI_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Wall_Check(s16 param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Wall_Check__13daObjHHASHI_cFs.s" +void daObjHHASHI_c::Wall_Check(s16 idx) { + dBgS_LinChk linChk; + cXyz cStack_8c( + field_0x5b0[idx].x + field_0x808[idx].x, + field_0x5b0[idx].y, + field_0x5b0[idx].z + field_0x808[idx].z); + cXyz cStack_98(field_0x5b0[idx].x, + field_0x5b0[idx].y, field_0x5b0[idx].z); + linChk.Set(&cStack_98, &cStack_8c, NULL); + if (dComIfG_Bgsp().LineCross(&linChk) == 1) { + field_0x808[idx].x = -0.05f * field_0x808[idx].x; + field_0x808[idx].z = -0.05f * field_0x808[idx].z; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80581550-80581554 0000A4 0004+00 0/1 0/0 0/0 .rodata @4035 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4035 = 15.0f; -COMPILER_STRIP_GATE(0x80581550, &lit_4035); -#pragma pop - -/* 80581554-80581558 0000A8 0004+00 0/1 0/0 0/0 .rodata @4036 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4036 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80581554, &lit_4036); -#pragma pop - -/* 80581558-8058155C 0000AC 0004+00 0/2 0/0 0/0 .rodata @4037 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4037 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80581558, &lit_4037); -#pragma pop - -/* 8058155C-80581560 0000B0 0004+00 0/2 0/0 0/0 .rodata @4038 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4038 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x8058155C, &lit_4038); -#pragma pop - -/* 80581560-80581564 0000B4 0004+00 0/1 0/0 0/0 .rodata @4039 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4039 = 4.0f; -COMPILER_STRIP_GATE(0x80581560, &lit_4039); -#pragma pop - -/* 80581564-80581568 0000B8 0004+00 0/2 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4040 = 5000.0f; -COMPILER_STRIP_GATE(0x80581564, &lit_4040); -#pragma pop - -/* 80581568-8058156C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4041 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4041 = 5.0f; -COMPILER_STRIP_GATE(0x80581568, &lit_4041); -#pragma pop /* 8058043C-805805F4 000AFC 01B8+00 1/1 0/0 0/0 .text Hahen_Motion__13daObjHHASHI_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Hahen_Motion(s16 param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Hahen_Motion__13daObjHHASHI_cFs.s" +void daObjHHASHI_c::Hahen_Motion(s16 param_1) { + if (field_0xf14[param_1] != 1) { + f32 dVar6 = 5.0f; + Wall_Check(param_1); + if (field_0x5b0[param_1].y < dVar6 + 10.0f) { + f32 dVar5 = field_0x808[param_1].y; + field_0x5b0[param_1].y = dVar6 + 10.0f; + if (field_0x5a4 == 2) { + field_0x808[param_1].y = (dVar5 * -((cM_rndF(0.2f) + 0.2f) + 0.3f)); + field_0x808[param_1].x = field_0x808[param_1].x * (cM_rndF(0.3f) + 0.7f); + field_0x808[param_1].z = field_0x808[param_1].z * (cM_rndF(0.3f) + 0.7f); + } + if (field_0x808[param_1].y < 4.0f) { + field_0xf14[param_1] = 1; + } + field_0xde8[param_1].x = cM_rndFX(5000.0f); + field_0xde8[param_1].y = cM_rndFX(5000.0f); + + } else { + if (field_0x5b0[param_1].y >= dVar6) { + field_0x808[param_1].y += gravity; + field_0x5b0[param_1].x += field_0x808[param_1].x; + field_0x5b0[param_1].y += field_0x808[param_1].y; + field_0x5b0[param_1].z += field_0x808[param_1].z; + field_0xcbc[param_1].x += field_0xde8[param_1].x; + field_0xcbc[param_1].y += field_0xde8[param_1].y; + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 8058156C-80581574 0000C0 0008+00 0/3 0/0 0/0 .rodata @4103 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4103[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8058156C, &lit_4103); -#pragma pop - -/* 80581574-8058157C 0000C8 0008+00 0/3 0/0 0/0 .rodata @4104 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4104[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80581574, &lit_4104); -#pragma pop - -/* 8058157C-80581584 0000D0 0008+00 0/3 0/0 0/0 .rodata @4105 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4105[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8058157C, &lit_4105); -#pragma pop - -/* 80581584-80581588 0000D8 0004+00 0/1 0/0 0/0 .rodata @4106 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4106 = 1500.0f; -COMPILER_STRIP_GATE(0x80581584, &lit_4106); -#pragma pop /* 805805F4-805807C4 000CB4 01D0+00 1/1 0/0 0/0 .text CheckCull__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::CheckCull() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CheckCull__13daObjHHASHI_cFv.s" +void daObjHHASHI_c::CheckCull() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz& playerPos = fopAcM_GetPosition(player); + int culledNum = 0; + for (int i = 0; i < 50; i++) { + f32 dVar6 = field_0x5b0[i].absXZ(playerPos); + if (dVar6 > 1500.0f && !checkViewArea(i)) { + culledNum++; + if (culledNum == 50) { + fopAcM_delete(this); + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80581588-8058158C 0000DC 0004+00 0/1 0/0 0/0 .rodata @4119 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4119 = 608.0f; -COMPILER_STRIP_GATE(0x80581588, &lit_4119); -#pragma pop - -/* 8058158C-80581590 0000E0 0004+00 0/1 0/0 0/0 .rodata @4120 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4120 = 448.0f; -COMPILER_STRIP_GATE(0x8058158C, &lit_4120); -#pragma pop /* 805807C4-80580854 000E84 0090+00 1/1 0/0 0/0 .text checkViewArea__13daObjHHASHI_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::checkViewArea(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/checkViewArea__13daObjHHASHI_cFi.s" +bool daObjHHASHI_c::checkViewArea(int param_1) { + Vec local_20; + mDoLib_project(&field_0x5b0[param_1], &local_20); + bool rv = false; + if (local_20.x >= 0.0f && local_20.x <= 608.0f && local_20.y >= 0.0f && local_20.y <= 448.0f) { + rv = true; + } + return rv; } -#pragma pop /* 80580854-80580A48 000F14 01F4+00 0/0 0/0 1/1 .text Rolling__13daObjHHASHI_cFP4cXyzffSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Rolling(cXyz* param_0, f32 param_1, f32 param_2, s8 param_3) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Rolling__13daObjHHASHI_cFP4cXyzffSc.s" +void daObjHHASHI_c::Rolling(cXyz* param_1, f32 param_2, f32 param_3, s8 param_4) { + field_0x5a8 = param_4; + if (field_0x5a4 == 2) { + for (s16 i = 0; i < 0x32; i++) { + if (param_1->absXZ(field_0x5b0[i]) < param_2 && field_0xf14[i] == 1) { + Roll_Set(param_1, param_3, i); + field_0xf14[i] = 0; + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80581590-80581594 0000E4 0004+00 0/1 0/0 0/0 .rodata @4214 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4214 = 3.0f; -COMPILER_STRIP_GATE(0x80581590, &lit_4214); -#pragma pop /* 80580A48-80580C80 001108 0238+00 1/1 0/0 0/0 .text Roll_Set__13daObjHHASHI_cFP4cXyzfs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Roll_Set(cXyz* param_0, f32 param_1, s16 param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Roll_Set__13daObjHHASHI_cFP4cXyzfs.s" +void daObjHHASHI_c::Roll_Set(cXyz* param_1, f32 param_2, s16 idx) { + f32 dVar10 = (param_2 * (0.7f + cM_rndFX(0.2f))); + s16 angleY = cLib_targetAngleY(&field_0x5b0[idx], param_1); + f32 dVar9 = ((-1.0f * param_2) * cM_ssin(angleY)); + f32 dVar11 = (3.0f / field_0xa60[idx].abs()); + f32 dVar13 = dVar10 + gravity; + f32 dVar14 = ((-1.0f * param_2) * cM_scos(angleY)); + field_0x808[idx].set(dVar11 * dVar9, dVar13, dVar11 * dVar14); + field_0xde8[idx].x = cM_rndFX(5000.0f); + field_0xde8[idx].y = cM_rndFX(5000.0f); + field_0xcbc[idx].x += 0x1000; + field_0xcbc[idx].y += 0x1000; } -#pragma pop /* 80580C80-80580D58 001340 00D8+00 1/1 0/0 0/0 .text setBaseMtx__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/setBaseMtx__13daObjHHASHI_cFv.s" +void daObjHHASHI_c::setBaseMtx() { + if (field_0x5a4 == 2) { + for (s16 i = 0; i < 50; i++) { + mDoMtx_stack_c::transS(field_0x5b0[i]); + mDoMtx_stack_c::ZXYrotM(field_0xcbc[i]); + mDoMtx_stack_c::scaleM(field_0xa60[i]); + mShardModels[i]->setBaseTRMtx(mDoMtx_stack_c::get()); + } + } else { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + } + cMtx_copy(mDoMtx_stack_c::get(), (MtxP)&mBgMtx); } -#pragma pop /* 80580D58-80580D84 001418 002C+00 1/0 0/0 0/0 .text daObjHHASHI_Draw__FP13daObjHHASHI_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjHHASHI_Draw(daObjHHASHI_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Draw__FP13daObjHHASHI_c.s" +static int daObjHHASHI_Draw(daObjHHASHI_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80580D84-80580DA4 001444 0020+00 2/1 0/0 0/0 .text daObjHHASHI_Execute__FP13daObjHHASHI_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjHHASHI_Execute(daObjHHASHI_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/daObjHHASHI_Execute__FP13daObjHHASHI_c.s" +static int daObjHHASHI_Execute(daObjHHASHI_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop - -/* ############################################################################################## */ -/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_805815AC = "L_hhashi"; -SECTION_DEAD static char const* const stringBase_805815B5 = "L_hhashi00.bmd"; -SECTION_DEAD static char const* const stringBase_805815C4 = "L_hhashi02.bmd"; -#pragma pop /* 805815E4-805815E8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hhashi__stringBase0; +static char* l_arcName = "L_hhashi"; /* 80580DA4-80580EA0 001464 00FC+00 1/0 0/0 0/0 .text CreateHeap__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/CreateHeap__13daObjHHASHI_cFv.s" +int daObjHHASHI_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi00.bmd"); + JUT_ASSERT(90, modelData != 0); + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); + JUT_ASSERT(93, modelData2 != 0); + for (int i = 0; i < 50; i++) { + mShardModels[i] = mDoExt_J3DModel__create(modelData2, 0x20000, 0x11000084); + if (mShardModels[i] == NULL) { + return FALSE; + } + } + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mModel != 0 ? TRUE : FALSE; } -#pragma pop -/* ############################################################################################## */ -/* 80581594-80581598 0000E8 0004+00 1/1 0/0 0/0 .rodata @4365 */ -SECTION_RODATA static f32 const lit_4365 = -9.0f; -COMPILER_STRIP_GATE(0x80581594, &lit_4365); +/* 80580EA0-8058112C 001560 028C+00 1/1 0/0 0/0 .text create__13daObjHHASHI_cFv */ +int daObjHHASHI_c::create() { + fopAcM_SetupActor(this, daObjHHASHI_c); + int rv = dComIfG_resLoad(&mPhase, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + gravity = -9.0f; + int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "L_hhashi00.dzb"); + JUT_ASSERT(1112, dzb_id != -1); + rv = MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x6dc0, NULL); + if (rv == cPhs_ERROR_e) { + return rv; + } + initCcCylinder(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); + JUT_ASSERT(1133, modelData != 0); + dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0); + field_0x1199 = 1; + daObjHHASHI_Execute(this); + } + return rv; +} -/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_805815D3 = "L_hhashi00.dzb"; -#pragma pop +/* 805811C4-805811CC 001884 0008+00 1/0 0/0 0/0 .text daObjHHASHI_IsDelete__FP13daObjHHASHI_c */ +static int daObjHHASHI_IsDelete(daObjHHASHI_c* param_0) { + return 1; +} + +/* 805811CC-80581210 00188C 0044+00 1/0 0/0 0/0 .text Create__13daObjHHASHI_cFv */ +int daObjHHASHI_c::Create() { + fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f); + return cPhs_COMPLEATE_e; +} + +/* 80581210-805812BC 0018D0 00AC+00 1/0 0/0 0/0 .text Execute__13daObjHHASHI_cFPPA3_A4_f + */ +int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) { + Obj_Damage(); + if (field_0x5a4 == 2) { + for (s16 i = 0; i < 50; i++) { + Hahen_Motion(i); + } + CheckCull(); + } + *param_1 = &mBgMtx; + setBaseMtx(); + if (field_0x5a4 != 2) { + setCcCylinder(); + } + if (field_0xf46 != 0) { + field_0xf46--; + } + return 1; +} + +/* 805812BC-8058140C 00197C 0150+00 1/0 0/0 0/0 .text Draw__13daObjHHASHI_cFv */ +int daObjHHASHI_c::Draw() { + if (dComIfGp_event_runCheck()) { + camera_class* pCamera = dComIfGp_getCamera(0); + f32 xdiff = current.pos.x - pCamera->mLookat.mEye.x; + f32 zdiff = current.pos.z - pCamera->mLookat.mEye.z; + if (JMAFastSqrt(xdiff * xdiff + zdiff * zdiff) < 200.0f) { + return 1; + } + } + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + if (field_0x5a4 == 0) { + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + } + dComIfGd_setListBG(); + if (field_0x5a4 == 0) { + mDoExt_modelUpdateDL(mModel); + } else { + int roomNo = fopAcM_GetRoomNo(this); + for (int i = 0; i < 50; i++) { + dComIfGp_entrySimpleModel(mShardModels[i], roomNo); + } + } + return 1; +} + +/* 8058140C-805814A4 001ACC 0098+00 1/0 0/0 0/0 .text Delete__13daObjHHASHI_cFv */ +int daObjHHASHI_c::Delete() { + if (field_0x1199 != 0) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); + dComIfGp_removeSimpleModel(modelData, fopAcM_GetRoomNo(this)); + } + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} /* 805815E8-80581608 -00001 0020+00 1/0 0/0 0/0 .data l_daObjHHASHI_Method */ static actor_method_class l_daObjHHASHI_Method = { - (process_method_func)daObjHHASHI_Create__FP10fopAc_ac_c, - (process_method_func)daObjHHASHI_Delete__FP13daObjHHASHI_c, - (process_method_func)daObjHHASHI_Execute__FP13daObjHHASHI_c, - (process_method_func)daObjHHASHI_IsDelete__FP13daObjHHASHI_c, - (process_method_func)daObjHHASHI_Draw__FP13daObjHHASHI_c, + (process_method_func)daObjHHASHI_Create, + (process_method_func)daObjHHASHI_Delete, + (process_method_func)daObjHHASHI_Execute, + (process_method_func)daObjHHASHI_IsDelete, + (process_method_func)daObjHHASHI_Draw, }; /* 80581608-80581638 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HHASHI */ @@ -668,156 +429,4 @@ extern actor_process_profile_definition g_profile_Obj_HHASHI = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80581638-80581644 000054 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80581644-80581650 000060 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80581650-80581678 00006C 0028+00 1/1 0/0 0/0 .data __vt__13daObjHHASHI_c */ -SECTION_DATA extern void* __vt__13daObjHHASHI_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daObjHHASHI_cFv, - (void*)Create__13daObjHHASHI_cFv, - (void*)Execute__13daObjHHASHI_cFPPA3_A4_f, - (void*)Draw__13daObjHHASHI_cFv, - (void*)Delete__13daObjHHASHI_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80580EA0-8058112C 001560 028C+00 1/1 0/0 0/0 .text create__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/create__13daObjHHASHI_cFv.s" -} -#pragma pop - -/* 8058112C-80581174 0017EC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80581174-805811BC 001834 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 805811BC-805811C0 00187C 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -// csXyz::csXyz() { -extern "C" asm void __ct__5csXyzFv() { - /* empty function */ -} - -/* 805811C0-805811C4 001880 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -// cXyz::cXyz() { -extern "C" asm void __ct__4cXyzFv() { - /* empty function */ -} - -/* 805811C4-805811CC 001884 0008+00 1/0 0/0 0/0 .text daObjHHASHI_IsDelete__FP13daObjHHASHI_c */ -static bool daObjHHASHI_IsDelete(daObjHHASHI_c* param_0) { - return true; -} - -/* ############################################################################################## */ -/* 80581598-8058159C 0000EC 0004+00 0/1 0/0 0/0 .rodata @4443 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4443 = -1000.0f; -COMPILER_STRIP_GATE(0x80581598, &lit_4443); -#pragma pop - -/* 8058159C-805815A0 0000F0 0004+00 0/1 0/0 0/0 .rodata @4444 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4444 = -500.0f; -COMPILER_STRIP_GATE(0x8058159C, &lit_4444); -#pragma pop - -/* 805815A0-805815A4 0000F4 0004+00 0/1 0/0 0/0 .rodata @4445 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4445 = 1000.0f; -COMPILER_STRIP_GATE(0x805815A0, &lit_4445); -#pragma pop - -/* 805815A4-805815A8 0000F8 0004+00 0/1 0/0 0/0 .rodata @4446 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4446 = 500.0f; -COMPILER_STRIP_GATE(0x805815A4, &lit_4446); -#pragma pop - -/* 805811CC-80581210 00188C 0044+00 1/0 0/0 0/0 .text Create__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/func_805811CC.s" -} -#pragma pop - -/* 80581210-805812BC 0018D0 00AC+00 1/0 0/0 0/0 .text Execute__13daObjHHASHI_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Execute__13daObjHHASHI_cFPPA3_A4_f.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 805815A8-805815AC 0000FC 0004+00 1/1 0/0 0/0 .rodata @4485 */ -SECTION_RODATA static f32 const lit_4485 = 200.0f; -COMPILER_STRIP_GATE(0x805815A8, &lit_4485); - -/* 805812BC-8058140C 00197C 0150+00 1/0 0/0 0/0 .text Draw__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Draw__13daObjHHASHI_cFv.s" -} -#pragma pop - -/* 8058140C-805814A4 001ACC 0098+00 1/0 0/0 0/0 .text Delete__13daObjHHASHI_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjHHASHI_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi/Delete__13daObjHHASHI_cFv.s" -} -#pragma pop - /* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 5e6d941325..2d1f793237 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -8,158 +8,7 @@ #include "d/com/d_com_inf_game.h" #include "d/map/d_map_path.h" #include "d/meter/d_meter_HIO.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void chkGetCompass__10dMapInfo_nFv(); -extern "C" void chkGetMap__10dMapInfo_nFv(); -extern "C" void isVisitedRoom__10dMapInfo_nFi(); -extern "C" void correctionOriginPos__10dMapInfo_nFScP3Vec(); -extern "C" void offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec(); -extern "C" void rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec(); -extern "C" void getMapPlayerPos__10dMapInfo_nFv(); -extern "C" void getMapPlayerAngleY__10dMapInfo_nFv(); -extern "C" void getConstRestartIconPointer__10dMapInfo_nFv(); -extern "C" void getMapRestartPos__10dMapInfo_nFv(); -extern "C" void getMapRestartAngleY__10dMapInfo_nFv(); -extern "C" void getRoomCenter__10dMapInfo_nFiPfPf(); -extern "C" void getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf(); -extern "C" void getFloorParameter__10dMapInfo_nFfPScPfPfPfPf(); -extern "C" void calcFloorNo__10dMapInfo_cFfbi(); -extern "C" void calcNowStayFloorNo__10dMapInfo_cFfb(); -extern "C" void move__10dMapInfo_cFif(); -extern "C" void init__10dMapInfo_cFv(); -extern "C" void reset__10dMapInfo_cFv(); -extern "C" void create__10dMapInfo_cFv(); -extern "C" void remove__10dMapInfo_cFv(); -extern "C" u8 isExistMapPathData__8dMpath_cFv(); -extern "C" void getTopBottomFloorNo__8dMpath_cFPScPSc(); -extern "C" void createWork__8dMpath_cFv(); -extern "C" void setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc(); -extern "C" void setPointer__8dMpath_cFScPvi(); -extern "C" void create__8dMpath_cFv(); -extern "C" void reset__8dMpath_cFv(); -extern "C" void remove__8dMpath_cFv(); -extern "C" void calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi(); -extern "C" void init__16renderingDAmap_cFPUcUsUsUsUs(); -extern "C" void entry__16renderingDAmap_cFfffiSc(); -extern "C" void isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class(); -extern "C" void draw__16renderingDAmap_cFv(); -extern "C" void getBackColor__16renderingDAmap_cCFv(); -extern "C" void isRenderingFloor__16renderingDAmap_cFi(); -extern "C" void setSingleRoomSetting__16renderingDAmap_cFv(); -extern "C" void isDrawRoom__16renderingDAmap_cCFii(); -extern "C" void preDrawPath__16renderingDAmap_cFv(); -extern "C" void postDrawPath__16renderingDAmap_cFv(); -extern "C" void getRoomNoSingle__16renderingDAmap_cFv(); -extern "C" void getFirstDrawRoomNo__16renderingDAmap_cFv(); -extern "C" void getNextDrawRoomNo__16renderingDAmap_cFi(); -extern "C" void getFirstRoomPointer__16renderingDAmap_cFv(); -extern "C" void getNextRoomPointer__16renderingDAmap_cFv(); -extern "C" void isDrawPath__16renderingDAmap_cFv(); -extern "C" bool getFirstDrawLayerNo__16renderingDAmap_cFv(); -extern "C" void getNextDrawLayerNo__16renderingDAmap_cFi(); -extern "C" void afterDrawPath__28renderingPlusDoorAndCursor_cFv(); -extern "C" void afterDrawPath__19renderingPlusDoor_cFv(); -extern "C" void drawDoor1__19renderingPlusDoor_cFv(); -extern "C" void drawDoor2__19renderingPlusDoor_cFv(); -extern "C" void drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib(); -extern "C" void checkDispDoorS__19renderingPlusDoor_cFiif(); -extern "C" void drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib(); -extern "C" void isDrawRoomIcon__16renderingDAmap_cCFii(); -extern "C" void isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec(); -extern "C" void getFirstData__28renderingPlusDoorAndCursor_cFUc(); -extern "C" void getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c(); -extern "C" void getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c(); -extern "C" void getIconGroupNumber__16renderingDAmap_cCFUc(); -extern "C" void drawTreasure__28renderingPlusDoorAndCursor_cFv(); -extern "C" void drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv(); -extern "C" void drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff(); -extern "C" void drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif(); -extern "C" void beforeDrawPath__19renderingPlusDoor_cFv(); -extern "C" void __sinit_d_map_path_dmap_cpp(); -extern "C" extern void* __vt__19renderingPlusDoor_c[41]; -extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47]; -extern "C" extern void* __vt__16renderingDAmap_c[38]; -extern "C" u32 mNextRoomNo__10dMapInfo_c; -extern "C" u8 mNowStayRoomNo__10dMapInfo_c[4]; -extern "C" u8 mNowStayFloorNoDecisionFlg__10dMapInfo_c[4]; -extern "C" u8 mNowStayFloorNo__10dMapInfo_c[4]; -extern "C" u8 mLayerList__8dMpath_c[4]; -extern "C" u8 mBottomFloorNo__8dMpath_c; -extern "C" f32 mMinX__8dMpath_c; -extern "C" f32 mMaxX__8dMpath_c; -extern "C" f32 mMinZ__8dMpath_c; -extern "C" f32 mMaxZ__8dMpath_c; -extern "C" f32 mAllCenterX__8dMpath_c; -extern "C" f32 mAllCenterZ__8dMpath_c; -extern "C" f32 mAllSizeX__8dMpath_c; -extern "C" f32 mAllSizeZ__8dMpath_c; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void dStage_GetKeepDoorInfo__Fv(); -extern "C" void dStage_GetRoomKeepDoorInfo__Fv(); -extern "C" bool isDrawType__11dDrawPath_cFi(); -extern "C" void getLineColor__11dDrawPath_cFii(); -extern "C" void __dt__28renderingPlusDoorAndCursor_cFv(); -extern "C" void __dt__19renderingPlusDoor_cFv(); -extern "C" void __dt__16renderingDAmap_cFv(); -extern "C" void dComIfGs_isVisitedRoom__Fi(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv(); -extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class(); -extern "C" void drawPath__11dDrawPath_cFv(); -extern "C" void renderingMap__15dRenderingMap_cFv(); -extern "C" void setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv(); -extern "C" void setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv(); -extern "C" void preRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void postRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void getDecoLineColor__18dRenderingFDAmap_cFii(); -extern "C" void getDecorationLineWidth__18dRenderingFDAmap_cFi(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void getFirstData__7dTres_cFUc(); -extern "C" void getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c(); -extern "C" void getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c(); -extern "C" void* __nw__FUl(); -extern "C" void GXClearVtxDesc(); -extern "C" void GXInvalidateTexAll(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" u8 m_texObjAgg__8dMpath_n[28]; -extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; - -// -// Declarations: -// +#include "float.h" /* 8003ECA0-8003ECD8 0395E0 0038+00 0/0 3/3 0/0 .text chkGetCompass__10dMapInfo_nFv */ bool dMapInfo_n::chkGetCompass() { @@ -515,20 +364,20 @@ void dMapInfo_c::remove() {} /* ############################################################################################## */ /* 80450E64-80450E68 000364 0004+00 5/5 1/1 0/0 .sbss mLayerList__8dMpath_c */ -dDrawPath_c::room_class** dMpath_c::mLayerList; +dDrawPath_c::layer_data* dMpath_c::mLayerList; /* 80450E68-80450E6C 000368 0004+00 3/3 1/1 0/0 .sbss mMinX__8dMpath_c */ // these are needed for sinit, but its got reversed reg alloc? -f32 dMpath_c::mMinX /* = FLT_MAX */; +f32 dMpath_c::mMinX = FLT_MAX; /* 80450E6C-80450E70 00036C 0004+00 3/3 1/1 0/0 .sbss mMaxX__8dMpath_c */ -f32 dMpath_c::mMaxX /* = -FLT_MAX */; +f32 dMpath_c::mMaxX = -FLT_MAX; /* 80450E70-80450E74 000370 0004+00 3/3 2/2 0/0 .sbss mMinZ__8dMpath_c */ -f32 dMpath_c::mMinZ /* = FLT_MAX */; +f32 dMpath_c::mMinZ = FLT_MAX; /* 80450E74-80450E78 000374 0004+00 3/3 1/1 0/0 .sbss mMaxZ__8dMpath_c */ -f32 dMpath_c::mMaxZ /* = -FLT_MAX */; +f32 dMpath_c::mMaxZ = -FLT_MAX; /* 80450E78-80450E7C 000378 0004+00 1/1 2/2 0/0 .sbss mAllCenterX__8dMpath_c */ f32 dMpath_c::mAllCenterX; @@ -552,7 +401,7 @@ bool dMpath_c::isExistMapPathData() { /* ############################################################################################## */ /* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */ -SECTION_SDATA int dMapInfo_c::mNextRoomNo = -1; +int dMapInfo_c::mNextRoomNo = -1; /* 80450634 0001+00 data_80450634 None */ s8 dMpath_c::mBottomFloorNo = 127; @@ -584,14 +433,10 @@ int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) { } /* 8003F7E8-8003F810 03A128 0028+00 0/0 1/1 0/0 .text createWork__8dMpath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_c::createWork() { - nofralloc -#include "asm/d/map/d_map_path_dmap/createWork__8dMpath_cFv.s" +void dMpath_c::createWork() { + mLayerList = new dDrawPath_c::layer_data; + JUT_ASSERT(1416, mLayerList!=0); } -#pragma pop /* 8003F810-8003FA40 03A150 0230+00 1/1 1/1 0/0 .text * setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc */ @@ -715,7 +560,7 @@ void dMpath_c::setPointer(s8 i_roomNo, void* i_data, int i_mapLayerNo) { mAllSizeX = mMaxX - mMinX; mAllSizeZ = mMaxZ - mMinZ; - (mLayerList + i_mapLayerNo * 0x40)[(s8)i_roomNo] = room; + mLayerList->mRooms[i_mapLayerNo][(s8)i_roomNo] = room; } } #pragma pop @@ -734,17 +579,27 @@ void dMpath_c::create() { /* ############################################################################################## */ /* 80450636-80450638 0000B6 0002+00 2/2 0/0 0/0 .sdata None */ -SECTION_SDATA static u8 data_80450636 = 0x01; +static u8 data_80450636 = 0x01; /* 8003FBD0-8003FC70 03A510 00A0+00 2/2 0/0 0/0 .text reset__8dMpath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_c::reset() { - nofralloc -#include "asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s" +void dMpath_c::reset() { + if (data_80450636) { + for (int i = 0; i < 0x40; i++) { + for (int j = 0; j < 2; j++) { + mLayerList->mRooms[j][i] = NULL; + } + } + mMinX = FLT_MAX; + mMaxX = -FLT_MAX; + mMinZ = FLT_MAX; + mMaxZ = -FLT_MAX; + mBottomFloorNo = 127; + mTopFloorNo = -128; + data_80450636 = 0; + data_80450E88 = 0; + dMapInfo_c::reset(); + } } -#pragma pop /* 8003FC70-8003FCA4 03A5B0 0034+00 0/0 1/1 0/0 .text remove__8dMpath_cFv */ void dMpath_c::remove() { @@ -809,11 +664,11 @@ void renderingDAmap_c::draw() { /* ############################################################################################## */ /* 80451E48-80451E4C 000448 0004+00 1/1 0/0 0/0 .sdata2 l_mapBaseColor$4239 */ -SECTION_SDATA2 static GXColor l_mapBaseColor = {4, 0, 0, 0}; +static const GXColor l_mapBaseColor = {4, 0, 0, 0}; /* 8003FE4C-8003FE54 03A78C 0008+00 3/0 3/0 0/0 .text getBackColor__16renderingDAmap_cCFv */ -GXColor* renderingDAmap_c::getBackColor() const { +const GXColor* renderingDAmap_c::getBackColor() const { return &l_mapBaseColor; } @@ -1046,19 +901,19 @@ void renderingPlusDoor_c::drawDoor2() { /* ############################################################################################## */ /* 80451E58-80451E5C 000458 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhite */ -SECTION_SDATA2 static GXColor l_doorWhite = {100, 0, 0, 0}; +static const GXColor l_doorWhite = {100, 0, 0, 0}; /* 80451E5C-80451E60 00045C 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhiteNoStay */ -SECTION_SDATA2 static GXColor l_doorWhiteNoStay = {108, 0, 0, 0}; +static const GXColor l_doorWhiteNoStay = {108, 0, 0, 0}; /* 80451E60-80451E64 000460 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhite2 */ -SECTION_SDATA2 static GXColor l_doorWhite2 = {100, 0, 0, 0}; +static const GXColor l_doorWhite2 = {100, 0, 0, 0}; /* 80451E64-80451E68 000464 0004+00 1/1 0/0 0/0 .sdata2 l_doorWhiteNoStay2 */ -SECTION_SDATA2 static GXColor l_doorWhiteNoStay2 = {108, 0, 0, 0}; +static const GXColor l_doorWhiteNoStay2 = {108, 0, 0, 0}; /* 80451E68-80451E70 000468 0008+00 1/1 0/0 0/0 .sdata2 l_tex0$4406 */ -SECTION_SDATA2 static u8 l_tex0[8] = { +static const u8 l_tex0[8] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, }; @@ -1074,7 +929,7 @@ void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0); - GXSetArray(GX_VA_TEX0, l_tex0, 2); + GXSetArray(GX_VA_TEX0, (void*)l_tex0, 2); setTevSettingIntensityTextureToCI(); @@ -1162,9 +1017,11 @@ bool renderingDAmap_c::isDrawRoomIcon(int param_0, int param_1) const { } /* 800409E0-80040A94 03B320 00B4+00 3/0 3/0 0/0 .text - * isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec */ + * isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siiibPC3Vec */ +// drawTreasure and drawTreasureAfterPlayer match required a change of param_3 to int rather than bool. +// Nothing else made sense considering the assembly generated. bool renderingDAmap_c::isDrawIconSingle(dTres_c::data_s const* data, int param_1, int param_2, - bool param_3, bool param_4, Vec const* param_5) const { + int param_3, bool param_4, Vec const* param_5) const { bool draw_room_icon = isDrawRoomIcon(data->mRoomNo, param_1); bool tmp = false; @@ -1205,50 +1062,47 @@ int renderingDAmap_c::getIconGroupNumber(u8 param_0) const { } /* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */ -SECTION_SDATA2 static GXColor l_entranceStartColor = {148, 0, 0, 0}; +static const GXColor l_entranceStartColor = {148, 0, 0, 0}; /* 80451E78-80451E7C 000478 0004+00 1/0 0/0 0/0 .sdata2 l_entranceLv8StartColor */ -SECTION_SDATA2 static GXColor l_entranceLv8StartColor = {156, 0, 0, 0}; +static const GXColor l_entranceLv8StartColor = {156, 0, 0, 0}; /* 80451E7C-80451E80 00047C 0004+00 3/2 0/0 0/0 .sdata2 l_treasureStartColor */ -SECTION_SDATA2 static GXColor l_treasureStartColor = {124, 0, 0, 0}; +static const GXColor l_treasureStartColor = {124, 0, 0, 0}; /* 80451E80-80451E84 000480 0004+00 1/0 0/0 0/0 .sdata2 l_smallKeyStartColor */ -SECTION_SDATA2 static GXColor l_smallKeyStartColor = {132, 0, 0, 0}; +static const GXColor l_smallKeyStartColor = {132, 0, 0, 0}; /* 80451E84-80451E88 000484 0004+00 1/0 0/0 0/0 .sdata2 l_bossStartColor */ -SECTION_SDATA2 static GXColor l_bossStartColor = {136, 0, 0, 0}; +static const GXColor l_bossStartColor = {136, 0, 0, 0}; /* 80451E88-80451E8C 000488 0004+00 1/0 0/0 0/0 .sdata2 l_npc0StartColor */ -SECTION_SDATA2 static GXColor l_npc0StartColor = {140, 0, 0, 0}; +static const GXColor l_npc0StartColor = {140, 0, 0, 0}; /* 80451E8C-80451E90 00048C 0004+00 1/0 0/0 0/0 .sdata2 l_destinationStartColor */ -SECTION_SDATA2 static GXColor l_destinationStartColor = {144, 0, 0, 0}; +static const GXColor l_destinationStartColor = {144, 0, 0, 0}; /* 80451E90-80451E94 000490 0004+00 1/0 0/0 0/0 .sdata2 l_npcYkmStartColor */ -SECTION_SDATA2 static GXColor l_npcYkmStartColor = {140, 0, 0, 0}; +static const GXColor l_npcYkmStartColor = {140, 0, 0, 0}; /* 80451E94-80451E98 000494 0004+00 1/0 0/0 0/0 .sdata2 l_npcYkwStartColor */ -SECTION_SDATA2 static GXColor l_npcYkwStartColor = {140, 0, 0, 0}; +static const GXColor l_npcYkwStartColor = {140, 0, 0, 0}; /* 80451E98-80451E9C 000498 0004+00 1/0 0/0 0/0 .sdata2 l_tksStartColor */ -SECTION_SDATA2 static GXColor l_tksStartColor = {164, 0, 0, 0}; +static const GXColor l_tksStartColor = {164, 0, 0, 0}; /* 80451E9C-80451EA4 00049C 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4523 */ -SECTION_SDATA2 static u8 l_iconTex0_4523[8] = { +static const u8 l_iconTex0_4523[8] = { 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, }; /* 80451EA4-80451EA8 0004A4 0004+00 1/1 0/0 0/0 .sdata2 tboxNotStayColor$4542 */ -SECTION_SDATA2 static GXColor tboxNotStayColor_4542 = {128, 0, 0, 0}; - -/* 80451EA8-80451EAC 0004A8 0004+00 2/2 0/0 0/0 .sdata2 @4600 */ -SECTION_SDATA2 static f32 lit_4600 = 2.0f; +static const GXColor tboxNotStayColor_4542 = {128, 0, 0, 0}; struct treasureDispData { /* 0x0 */ u8 field_0x0; /* 0x4 */ int field_0x4; - /* 0x8 */ GXColor* field_0x8; + /* 0x8 */ const GXColor* field_0x8; }; /* 80379C88-80379CB8 -00001 0030+00 1/1 0/0 0/0 .rodata l_treasureDispList$4524 */ @@ -1261,7 +1115,6 @@ static const treasureDispData l_treasureDispList_4524[4] = { /* 80040B00-80040E84 03B440 0384+00 1/1 0/0 0/0 .text * drawTreasure__28renderingPlusDoorAndCursor_cFv */ -#ifdef NONMATCHING void renderingPlusDoorAndCursor_c::drawTreasure() { bool rend_all_room = isRendAllRoom(); @@ -1270,7 +1123,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0); - GXSetArray(GX_VA_TEX0, l_iconTex0_4523, 2); + GXSetArray(GX_VA_TEX0, (void*)l_iconTex0_4523, 2); setTevSettingIntensityTextureToCI(); @@ -1288,7 +1141,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList_4524[i].field_0x4); GXLoadTexObj(texObj_p, GX_TEXMAP0); GXColor sp18; - GXColor* temp_r3_2 = l_treasureDispList_4524[i].field_0x8; + const GXColor* temp_r3_2 = l_treasureDispList_4524[i].field_0x8; sp18.r = temp_r3_2->r; sp18.g = temp_r3_2->g; sp18.b = temp_r3_2->b; @@ -1329,16 +1182,6 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { setTevSettingNonTextureDirectColor(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingPlusDoorAndCursor_c::drawTreasure() { - nofralloc -#include "asm/d/map/d_map_path_dmap/drawTreasure__28renderingPlusDoorAndCursor_cFv.s" -} -#pragma pop -#endif /* 80379CB8-80379D3C -00001 0084+00 1/1 0/0 0/0 .rodata l_treasureDispList$4606 */ static const treasureDispData l_treasureDispList_4606[11] = { @@ -1349,12 +1192,12 @@ static const treasureDispData l_treasureDispList_4606[11] = { }; /* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */ -SECTION_SDATA2 static u8 l_iconTex0_4605[8] = { +static const u8 l_iconTex0_4605[8] = { 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, }; /* 80451EB4-80451EB8 0004B4 0004+00 1/1 0/0 0/0 .sdata2 tboxNotStayColor$4624 */ -SECTION_SDATA2 static u8 tboxNotStayColor_4624[4] = { +static const GXColor tboxNotStayColor_4624 = { 0x80, 0x00, 0x00, @@ -1363,14 +1206,73 @@ SECTION_SDATA2 static u8 tboxNotStayColor_4624[4] = { /* 80040E84-80041208 03B7C4 0384+00 1/1 0/0 0/0 .text * drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() { - nofralloc -#include "asm/d/map/d_map_path_dmap/drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv.s" +void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() { + bool rend_all_room = isRendAllRoom(); + + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB565, 0); + GXSetArray(GX_VA_TEX0, (void*)l_iconTex0_4605, 2); + + setTevSettingIntensityTextureToCI(); + + for (int i = 0; i < 11; i++) { + dTres_c::typeGroupData_c* typeGroupData_p; + u8 tmp = l_treasureDispList_4606[i].field_0x0; + typeGroupData_p = getFirstData(tmp); + int group_num = getIconGroupNumber(tmp); + + if (group_num != 0) { + f32 icon_size = getIconSize(tmp) * mCmPerTexel; + + GXInvalidateTexAll(); + GXTexObj* texObj_p = + dMpath_n::m_texObjAgg.getTexObjPointer(l_treasureDispList_4606[i].field_0x4); + GXLoadTexObj(texObj_p, GX_TEXMAP0); + GXColor sp18; + const GXColor* temp_r3_2 = l_treasureDispList_4606[i].field_0x8; + sp18.r = temp_r3_2->r; + sp18.g = temp_r3_2->g; + sp18.b = temp_r3_2->b; + sp18.a = temp_r3_2->a; + + GXSetTevColor(GX_TEVREG1, sp18); + + sp18.r += 4; + GXSetTevColor(GX_TEVREG2, sp18); + + for (int j = 0; j < group_num && typeGroupData_p != NULL; j++) { + const Vec* icon_pos = getIconPosition(typeGroupData_p); + + if (tmp == 0) { + if (mRoomNoSingle != typeGroupData_p->getRoomNo()) { + sp18 = tboxNotStayColor_4624; + } else { + sp18 = l_treasureStartColor; + } + + GXSetTevColor(GX_TEVREG1, sp18); + + sp18.r += 4; + GXSetTevColor(GX_TEVREG2, sp18); + } + + if (isDrawAreaCheck(*icon_pos) && + isDrawIconSingle(typeGroupData_p->getConstDataPointer(), mRoomNoSingle, + mRenderedFloor, rend_all_room, true, icon_pos)) + { + drawIconSingle(*icon_pos, icon_size, icon_size); + } + + typeGroupData_p = getNextData(typeGroupData_p); + } + } + } + + setTevSettingNonTextureDirectColor(); } -#pragma pop /* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text * drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */ @@ -1434,156 +1336,3 @@ void renderingPlusDoorAndCursor_c::drawCursor(Vec const& param_0, s16 param_1, i /* 8004145C-80041460 03BD9C 0004+00 2/0 0/0 0/0 .text beforeDrawPath__19renderingPlusDoor_cFv */ void renderingPlusDoor_c::beforeDrawPath() {} - -/* 80041460-80041480 03BDA0 0020+00 0/0 1/0 0/0 .text __sinit_d_map_path_dmap_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_map_path_dmap_cpp(){nofralloc -#include "asm/d/map/d_map_path_dmap/__sinit_d_map_path_dmap_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80041460, __sinit_d_map_path_dmap_cpp); -#pragma pop - -/* ############################################################################################## */ -/* 803A7D80-803A7E24 004EA0 00A4+00 0/0 7/7 0/0 .data __vt__19renderingPlusDoor_c */ -SECTION_DATA extern void* __vt__19renderingPlusDoor_c[41] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16renderingDAmap_cFv, - (void*)__dt__19renderingPlusDoor_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__16renderingDAmap_cFi, - (void*)getFirstRoomPointer__16renderingDAmap_cFv, - (void*)getNextRoomPointer__16renderingDAmap_cFv, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__19renderingPlusDoor_cFv, - (void*)afterDrawPath__19renderingPlusDoor_cFv, - (void*)preDrawPath__16renderingDAmap_cFv, - (void*)postDrawPath__16renderingDAmap_cFv, - (void*)isDrawPath__16renderingDAmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)getBackColor__16renderingDAmap_cCFv, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, - (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, - (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, - (void*)getIconGroupNumber__16renderingDAmap_cCFUc, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)getRoomNoSingle__16renderingDAmap_cFv, - (void*)isDrawRoom__16renderingDAmap_cCFii, - (void*)isDrawRoomIcon__16renderingDAmap_cCFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 803A7E24-803A7EE0 004F44 00BC+00 0/0 4/4 0/0 .data __vt__28renderingPlusDoorAndCursor_c */ -SECTION_DATA extern void* __vt__28renderingPlusDoorAndCursor_c[47] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16renderingDAmap_cFv, - (void*)__dt__28renderingPlusDoorAndCursor_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__16renderingDAmap_cFi, - (void*)getFirstRoomPointer__16renderingDAmap_cFv, - (void*)getNextRoomPointer__16renderingDAmap_cFv, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)beforeDrawPath__19renderingPlusDoor_cFv, - (void*)afterDrawPath__28renderingPlusDoorAndCursor_cFv, - (void*)preDrawPath__16renderingDAmap_cFv, - (void*)postDrawPath__16renderingDAmap_cFv, - (void*)isDrawPath__16renderingDAmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)getBackColor__16renderingDAmap_cCFv, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, - (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, - (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, - (void*)getIconGroupNumber__16renderingDAmap_cCFUc, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)getRoomNoSingle__16renderingDAmap_cFv, - (void*)isDrawRoom__16renderingDAmap_cCFii, - (void*)isDrawRoomIcon__16renderingDAmap_cCFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c, - (void*)getFirstData__28renderingPlusDoorAndCursor_cFUc, - (void*)getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c, - (void*)NULL, - (void*)NULL, -}; - -/* 803A7EE0-803A7F78 005000 0098+00 0/0 8/8 0/0 .data __vt__16renderingDAmap_c */ -SECTION_DATA extern void* __vt__16renderingDAmap_c[38] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__16renderingDAmap_cFv, - (void*)__dt__16renderingDAmap_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class, - (void*)isRenderingFloor__16renderingDAmap_cFi, - (void*)getFirstRoomPointer__16renderingDAmap_cFv, - (void*)getNextRoomPointer__16renderingDAmap_cFv, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)NULL, - (void*)NULL, - (void*)preDrawPath__16renderingDAmap_cFv, - (void*)postDrawPath__16renderingDAmap_cFv, - (void*)isDrawPath__16renderingDAmap_cFv, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)getBackColor__16renderingDAmap_cCFv, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, - (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, - (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, - (void*)getIconGroupNumber__16renderingDAmap_cCFUc, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)getRoomNoSingle__16renderingDAmap_cFv, - (void*)isDrawRoom__16renderingDAmap_cCFii, - (void*)isDrawRoomIcon__16renderingDAmap_cCFii, -}; diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp index b86697bdb2..4d3321b4fe 100644 --- a/src/d/menu/d_menu_dmap_map.cpp +++ b/src/d/menu/d_menu_dmap_map.cpp @@ -272,7 +272,7 @@ extern "C" bool getFirstDrawLayerNo__16renderingDAmap_cFv(); extern "C" void getNextDrawLayerNo__16renderingDAmap_cFi(); extern "C" void afterDrawPath__19renderingPlusDoor_cFv(); extern "C" void isDrawRoomIcon__16renderingDAmap_cCFii(); -extern "C" void isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec(); +extern "C" void isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siiibPC3Vec(); extern "C" void getIconGroupNumber__16renderingDAmap_cCFUc(); extern "C" void getFirstData__7dTres_cFUc(); extern "C" void getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c(); @@ -1549,7 +1549,7 @@ SECTION_DATA extern void* __vt__15renderingDmap_c[43 + 1 /* padding */] = { (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, (void*)getFirstDrawLayerNo__16renderingDAmap_cFv, (void*)getNextDrawLayerNo__16renderingDAmap_cFi, - (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siibbPC3Vec, + (void*)isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siiibPC3Vec, (void*)getIconGroupNumber__16renderingDAmap_cCFUc, (void*)hasMap__15renderingDmap_cCFv, (void*)isRendAllRoom__15renderingDmap_cCFv, |