diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/CreateHeap__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/CreateHeap__14daObjLv3saka_cFv.s deleted file mode 100644 index 220d5b08fce..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/CreateHeap__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80C5BFA0: -/* 80C5BFA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5BFA4 7C 08 02 A6 */ mflr r0 -/* 80C5BFA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5BFAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5BFB0 7C 7F 1B 78 */ mr r31, r3 -/* 80C5BFB4 38 60 00 C0 */ li r3, 0xc0 -/* 80C5BFB8 4B 67 2C 95 */ bl __nw__FUl -/* 80C5BFBC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C5BFC0 41 82 00 0C */ beq lbl_80C5BFCC -/* 80C5BFC4 4B 41 F9 AD */ bl __ct__4dBgWFv -/* 80C5BFC8 7C 60 1B 78 */ mr r0, r3 -lbl_80C5BFCC: -/* 80C5BFCC 90 1F 05 A8 */ stw r0, 0x5a8(r31) -/* 80C5BFD0 80 1F 05 A8 */ lwz r0, 0x5a8(r31) -/* 80C5BFD4 28 00 00 00 */ cmplwi r0, 0 -/* 80C5BFD8 41 82 00 58 */ beq lbl_80C5C030 -/* 80C5BFDC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5BFE0 54 00 36 BA */ rlwinm r0, r0, 6, 0x1a, 0x1d -/* 80C5BFE4 3C 60 80 C6 */ lis r3, l_arcName@ha /* 0x80C5C3F0@ha */ -/* 80C5BFE8 38 63 C3 F0 */ addi r3, r3, l_arcName@l /* 0x80C5C3F0@l */ -/* 80C5BFEC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80C5BFF0 3C 80 80 C6 */ lis r4, l_dzbIdx2@ha /* 0x80C5C3CC@ha */ -/* 80C5BFF4 38 84 C3 CC */ addi r4, r4, l_dzbIdx2@l /* 0x80C5C3CC@l */ -/* 80C5BFF8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C5BFFC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C000 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C004 3C A5 00 02 */ addis r5, r5, 2 -/* 80C5C008 38 C0 00 80 */ li r6, 0x80 -/* 80C5C00C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C5C010 4B 3E 02 DD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5C014 7C 64 1B 78 */ mr r4, r3 -/* 80C5C018 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5C01C 38 A0 00 01 */ li r5, 1 -/* 80C5C020 38 DF 05 6C */ addi r6, r31, 0x56c -/* 80C5C024 4B 41 DF 15 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C5C028 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C02C 41 82 00 14 */ beq lbl_80C5C040 -lbl_80C5C030: -/* 80C5C030 38 00 00 00 */ li r0, 0 -/* 80C5C034 90 1F 05 A8 */ stw r0, 0x5a8(r31) -/* 80C5C038 38 60 00 00 */ li r3, 0 -/* 80C5C03C 48 00 00 08 */ b lbl_80C5C044 -lbl_80C5C040: -/* 80C5C040 38 60 00 01 */ li r3, 1 -lbl_80C5C044: -/* 80C5C044 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C04C 7C 08 03 A6 */ mtlr r0 -/* 80C5C050 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C054 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Create__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Create__14daObjLv3saka_cFv.s deleted file mode 100644 index aecb2e2c72f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Create__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80C5BED8: -/* 80C5BED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5BEDC 7C 08 02 A6 */ mflr r0 -/* 80C5BEE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5BEE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5BEE8 7C 7F 1B 78 */ mr r31, r3 -/* 80C5BEEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BEF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BEF4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5BEF8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5BEFC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5BF00 7C 05 07 74 */ extsb r5, r0 -/* 80C5BF04 4B 3D 94 5D */ bl isSwitch__10dSv_info_cCFii -/* 80C5BF08 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5BF0C 41 82 00 48 */ beq lbl_80C5BF54 -/* 80C5BF10 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C5BF14 4B 60 C2 C1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5BF18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5BF1C 41 82 00 18 */ beq lbl_80C5BF34 -/* 80C5BF20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BF24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BF28 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5BF2C 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C5BF30 4B 41 83 21 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C5BF34: -/* 80C5BF34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BF38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BF3C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5BF40 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5BF44 7F E5 FB 78 */ mr r5, r31 -/* 80C5BF48 4B 41 8A C1 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C5BF4C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5BF50 4B 41 FA 71 */ bl Move__4dBgWFv -lbl_80C5BF54: -/* 80C5BF54 7F E3 FB 78 */ mr r3, r31 -/* 80C5BF58 4B FF FF 01 */ bl initBaseMtx__14daObjLv3saka_cFv -/* 80C5BF5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BF60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BF64 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5BF68 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5BF6C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C5BF70 7C 05 07 74 */ extsb r5, r0 -/* 80C5BF74 4B 3D 93 ED */ bl isSwitch__10dSv_info_cCFii -/* 80C5BF78 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5BF7C 41 82 00 0C */ beq lbl_80C5BF88 -/* 80C5BF80 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5BF84 4B 41 FA 3D */ bl Move__4dBgWFv -lbl_80C5BF88: -/* 80C5BF88 38 60 00 01 */ li r3, 1 -/* 80C5BF8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5BF90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5BF94 7C 08 03 A6 */ mtlr r0 -/* 80C5BF98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5BF9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Delete__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Delete__14daObjLv3saka_cFv.s deleted file mode 100644 index 21c6f7c778c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Delete__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C5C27C: -/* 80C5C27C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C280 7C 08 02 A6 */ mflr r0 -/* 80C5C284 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C288 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C28C 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C290 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 80C5C294 28 03 00 00 */ cmplwi r3, 0 -/* 80C5C298 41 82 00 24 */ beq lbl_80C5C2BC -/* 80C5C29C 4B 60 BF 39 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5C2A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C2A4 41 82 00 18 */ beq lbl_80C5C2BC -/* 80C5C2A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C2AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C2B0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5C2B4 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5C2B8 4B 41 7F 99 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C5C2BC: -/* 80C5C2BC 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C5C2C0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5C2C4 54 00 36 BA */ rlwinm r0, r0, 6, 0x1a, 0x1d -/* 80C5C2C8 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C5C3F0@ha */ -/* 80C5C2CC 38 84 C3 F0 */ addi r4, r4, l_arcName@l /* 0x80C5C3F0@l */ -/* 80C5C2D0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C5C2D4 4B 3D 0D 35 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C5C2D8 38 60 00 01 */ li r3, 1 -/* 80C5C2DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C2E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C2E4 7C 08 03 A6 */ mtlr r0 -/* 80C5C2E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C2EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Execute__14daObjLv3saka_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Execute__14daObjLv3saka_cFPPA3_A4_f.s deleted file mode 100644 index 5ba4d38fca9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Execute__14daObjLv3saka_cFPPA3_A4_f.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C5C0FC: -/* 80C5C0FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C100 7C 08 02 A6 */ mflr r0 -/* 80C5C104 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C10C 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5C110 7C 7E 1B 78 */ mr r30, r3 -/* 80C5C114 7C 9F 23 78 */ mr r31, r4 -/* 80C5C118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C11C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C120 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C5C124 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C5C128 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C5C12C 7C 05 07 74 */ extsb r5, r0 -/* 80C5C130 4B 3D 92 31 */ bl isSwitch__10dSv_info_cCFii -/* 80C5C134 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5C138 41 82 00 10 */ beq lbl_80C5C148 -/* 80C5C13C 7F C3 F3 78 */ mr r3, r30 -/* 80C5C140 48 00 00 B9 */ bl setWtrDzb__14daObjLv3saka_cFv -/* 80C5C144 48 00 00 0C */ b lbl_80C5C150 -lbl_80C5C148: -/* 80C5C148 7F C3 F3 78 */ mr r3, r30 -/* 80C5C14C 48 00 00 31 */ bl setNrmDzb__14daObjLv3saka_cFv -lbl_80C5C150: -/* 80C5C150 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80C5C154 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5C158 7F C3 F3 78 */ mr r3, r30 -/* 80C5C15C 4B FF FD 1D */ bl setBaseMtx__14daObjLv3saka_cFv -/* 80C5C160 38 60 00 01 */ li r3, 1 -/* 80C5C164 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C168 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5C16C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C170 7C 08 03 A6 */ mtlr r0 -/* 80C5C174 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C178 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/create1st__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/create1st__14daObjLv3saka_cFv.s deleted file mode 100644 index f7273265cf9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/create1st__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80C5C058: -/* 80C5C058 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C05C 7C 08 02 A6 */ mflr r0 -/* 80C5C060 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C064 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C068 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C06C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C5C070 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5C074 54 00 36 BA */ rlwinm r0, r0, 6, 0x1a, 0x1d -/* 80C5C078 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C5C3F0@ha */ -/* 80C5C07C 38 84 C3 F0 */ addi r4, r4, l_arcName@l /* 0x80C5C3F0@l */ -/* 80C5C080 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C5C084 4B 3D 0E 39 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5C088 7C 60 1B 78 */ mr r0, r3 -/* 80C5C08C 2C 00 00 04 */ cmpwi r0, 4 -/* 80C5C090 40 82 00 54 */ bne lbl_80C5C0E4 -/* 80C5C094 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5C098 54 00 36 BA */ rlwinm r0, r0, 6, 0x1a, 0x1d -/* 80C5C09C 7F E3 FB 78 */ mr r3, r31 -/* 80C5C0A0 3C 80 80 C6 */ lis r4, l_arcName@ha /* 0x80C5C3F0@ha */ -/* 80C5C0A4 38 84 C3 F0 */ addi r4, r4, l_arcName@l /* 0x80C5C3F0@l */ -/* 80C5C0A8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C5C0AC 3C A0 80 C6 */ lis r5, l_dzbIdx@ha /* 0x80C5C3C4@ha */ -/* 80C5C0B0 38 A5 C3 C4 */ addi r5, r5, l_dzbIdx@l /* 0x80C5C3C4@l */ -/* 80C5C0B4 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80C5C0B8 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C5C0BC 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C5C0C0 3C E0 80 C6 */ lis r7, l_heap_size@ha /* 0x80C5C3D4@ha */ -/* 80C5C0C4 38 E7 C3 D4 */ addi r7, r7, l_heap_size@l /* 0x80C5C3D4@l */ -/* 80C5C0C8 7C E7 00 2E */ lwzx r7, r7, r0 -/* 80C5C0CC 39 00 00 00 */ li r8, 0 -/* 80C5C0D0 4B 41 C6 ED */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C5C0D4 7C 60 1B 78 */ mr r0, r3 -/* 80C5C0D8 2C 00 00 05 */ cmpwi r0, 5 -/* 80C5C0DC 40 82 00 08 */ bne lbl_80C5C0E4 -/* 80C5C0E0 48 00 00 08 */ b lbl_80C5C0E8 -lbl_80C5C0E4: -/* 80C5C0E4 7C 03 03 78 */ mr r3, r0 -lbl_80C5C0E8: -/* 80C5C0E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C0EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C0F0 7C 08 03 A6 */ mtlr r0 -/* 80C5C0F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C0F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c.s deleted file mode 100644 index 3a5c49a8cd6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C350: -/* 80C5C350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C354 7C 08 02 A6 */ mflr r0 -/* 80C5C358 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C35C 4B 41 C5 81 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C5C360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C364 7C 08 03 A6 */ mtlr r0 -/* 80C5C368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c.s deleted file mode 100644 index 9713ad32ca0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C5C390: -/* 80C5C390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C394 7C 08 02 A6 */ mflr r0 -/* 80C5C398 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C39C 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C5C3A0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C5C3A4 7D 89 03 A6 */ mtctr r12 -/* 80C5C3A8 4E 80 04 21 */ bctrl -/* 80C5C3AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C3B0 7C 08 03 A6 */ mtlr r0 -/* 80C5C3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C3B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c.s deleted file mode 100644 index 0d893e98be6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C370: -/* 80C5C370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C374 7C 08 02 A6 */ mflr r0 -/* 80C5C378 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C37C 4B 41 C5 D5 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C5C380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C384 7C 08 03 A6 */ mtlr r0 -/* 80C5C388 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C38C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_create1st__FP14daObjLv3saka_c.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_create1st__FP14daObjLv3saka_c.s deleted file mode 100644 index 2d80341f026..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_create1st__FP14daObjLv3saka_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C5C2F0: -/* 80C5C2F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C2F4 7C 08 02 A6 */ mflr r0 -/* 80C5C2F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C2FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C300 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C304 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5C308 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5C30C 40 82 00 28 */ bne lbl_80C5C334 -/* 80C5C310 28 1F 00 00 */ cmplwi r31, 0 -/* 80C5C314 41 82 00 14 */ beq lbl_80C5C328 -/* 80C5C318 4B 41 C3 0D */ bl __ct__16dBgS_MoveBgActorFv -/* 80C5C31C 3C 60 80 C6 */ lis r3, __vt__14daObjLv3saka_c@ha /* 0x80C5C448@ha */ -/* 80C5C320 38 03 C4 48 */ addi r0, r3, __vt__14daObjLv3saka_c@l /* 0x80C5C448@l */ -/* 80C5C324 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C5C328: -/* 80C5C328 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C5C32C 60 00 00 08 */ ori r0, r0, 8 -/* 80C5C330 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C5C334: -/* 80C5C334 7F E3 FB 78 */ mr r3, r31 -/* 80C5C338 4B FF FD 21 */ bl create1st__14daObjLv3saka_cFv -/* 80C5C33C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C344 7C 08 03 A6 */ mtlr r0 -/* 80C5C348 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C34C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/initBaseMtx__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/initBaseMtx__14daObjLv3saka_cFv.s deleted file mode 100644 index a927997d50e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/initBaseMtx__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5BE58: -/* 80C5BE58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5BE5C 7C 08 02 A6 */ mflr r0 -/* 80C5BE60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5BE64 48 00 00 15 */ bl setBaseMtx__14daObjLv3saka_cFv -/* 80C5BE68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5BE6C 7C 08 03 A6 */ mtlr r0 -/* 80C5BE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5BE74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setBaseMtx__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setBaseMtx__14daObjLv3saka_cFv.s deleted file mode 100644 index b6ef2ade444..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setBaseMtx__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C5BE78: -/* 80C5BE78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5BE7C 7C 08 02 A6 */ mflr r0 -/* 80C5BE80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5BE84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5BE88 7C 7F 1B 78 */ mr r31, r3 -/* 80C5BE8C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5BE90 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5BE94 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C5BE98 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C5BE9C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C5BEA0 4B 6E AA 49 */ bl PSMTXTrans -/* 80C5BEA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5BEA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5BEAC A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C5BEB0 4B 3B 05 85 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C5BEB4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5BEB8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5BEBC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80C5BEC0 4B 6E A5 F1 */ bl PSMTXCopy -/* 80C5BEC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5BEC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5BECC 7C 08 03 A6 */ mtlr r0 -/* 80C5BED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5BED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setNrmDzb__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setNrmDzb__14daObjLv3saka_cFv.s deleted file mode 100644 index 46f068565f7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setNrmDzb__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C5C17C: -/* 80C5C17C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C180 7C 08 02 A6 */ mflr r0 -/* 80C5C184 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C188 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C18C 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C190 80 63 05 68 */ lwz r3, 0x568(r3) -/* 80C5C194 4B 60 C0 41 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5C198 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C19C 40 82 00 48 */ bne lbl_80C5C1E4 -/* 80C5C1A0 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5C1A4 4B 60 C0 31 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5C1A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C1AC 41 82 00 18 */ beq lbl_80C5C1C4 -/* 80C5C1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C1B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C1B8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5C1BC 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5C1C0 4B 41 80 91 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C5C1C4: -/* 80C5C1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C1C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C1CC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5C1D0 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C5C1D4 7F E5 FB 78 */ mr r5, r31 -/* 80C5C1D8 4B 41 88 31 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C5C1DC 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C5C1E0 4B 41 F7 E1 */ bl Move__4dBgWFv -lbl_80C5C1E4: -/* 80C5C1E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C1E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C1EC 7C 08 03 A6 */ mtlr r0 -/* 80C5C1F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C1F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setWtrDzb__14daObjLv3saka_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setWtrDzb__14daObjLv3saka_cFv.s deleted file mode 100644 index 0708ba5756a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setWtrDzb__14daObjLv3saka_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C5C1F8: -/* 80C5C1F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C1FC 7C 08 02 A6 */ mflr r0 -/* 80C5C200 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C204 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C208 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C20C 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 80C5C210 4B 60 BF C5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5C214 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C218 40 82 00 48 */ bne lbl_80C5C260 -/* 80C5C21C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C5C220 4B 60 BF B5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C5C224 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5C228 41 82 00 18 */ beq lbl_80C5C240 -/* 80C5C22C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C230 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C234 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5C238 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C5C23C 4B 41 80 15 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C5C240: -/* 80C5C240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C248 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5C24C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5C250 7F E5 FB 78 */ mr r5, r31 -/* 80C5C254 4B 41 87 B5 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C5C258 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5C25C 4B 41 F7 65 */ bl Move__4dBgWFv -lbl_80C5C260: -/* 80C5C260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C264 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C268 7C 08 03 A6 */ mtlr r0 -/* 80C5C26C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C270 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h b/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h index c2c07f65d8e..095211074a9 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h +++ b/include/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_LV3SAKA00_H #define D_A_OBJ_LV3SAKA00_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" + +class daObjLv3saka_c : public dBgS_MoveBgActor { +public: + /* 80C5BE58 */ void initBaseMtx(); + /* 80C5BE78 */ void setBaseMtx(); + /* 80C5BED8 */ int Create(); + /* 80C5BFA0 */ int CreateHeap(); + /* 80C5C058 */ int create1st(); + /* 80C5C0FC */ int Execute(Mtx**); + /* 80C5C17C */ void setNrmDzb(); + /* 80C5C1F8 */ void setWtrDzb(); + /* 80C5C274 */ int Draw(); + /* 80C5C27C */ int Delete(); + + u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } + u8 getType() { return fopAcM_GetParamBit(this, 28, 4) & 0xFF; } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ dBgW* mpBgW2; +}; #endif /* D_A_OBJ_LV3SAKA00_H */ diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp index 8124b5ab074..11475b50d8e 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp @@ -1,354 +1,185 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv3saka00 +// d_a_obj_lv3saka00.cpp +// Object: lv3saka00 (Lakebed Temple) // #include "rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjLv3saka_c { - /* 80C5BE58 */ void initBaseMtx(); - /* 80C5BE78 */ void setBaseMtx(); - /* 80C5BED8 */ void Create(); - /* 80C5BFA0 */ void CreateHeap(); - /* 80C5C058 */ void create1st(); - /* 80C5C0FC */ void Execute(f32 (**)[3][4]); - /* 80C5C17C */ void setNrmDzb(); - /* 80C5C1F8 */ void setWtrDzb(); - /* 80C5C274 */ bool Draw(); - /* 80C5C27C */ void Delete(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct cXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__14daObjLv3saka_cFv(); -extern "C" void setBaseMtx__14daObjLv3saka_cFv(); -extern "C" void Create__14daObjLv3saka_cFv(); -extern "C" void CreateHeap__14daObjLv3saka_cFv(); -extern "C" void create1st__14daObjLv3saka_cFv(); -extern "C" void Execute__14daObjLv3saka_cFPPA3_A4_f(); -extern "C" void setNrmDzb__14daObjLv3saka_cFv(); -extern "C" void setWtrDzb__14daObjLv3saka_cFv(); -extern "C" bool Draw__14daObjLv3saka_cFv(); -extern "C" void Delete__14daObjLv3saka_cFv(); -extern "C" static void daObjLv3saka_create1st__FP14daObjLv3saka_c(); -extern "C" static void daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c(); -extern "C" static void daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c(); -extern "C" static void daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c(); -extern "C" extern char const* const d_a_obj_lv3saka00__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -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 Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80C5BE58-80C5BE78 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/initBaseMtx__14daObjLv3saka_cFv.s" +void daObjLv3saka_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80C5BE78-80C5BED8 000098 0060+00 2/2 0/0 0/0 .text setBaseMtx__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setBaseMtx__14daObjLv3saka_cFv.s" +void daObjLv3saka_c::setBaseMtx() { + MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z); + mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* 80C5BED8-80C5BFA0 0000F8 00C8+00 1/0 0/0 0/0 .text Create__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Create__14daObjLv3saka_cFv.s" +int daObjLv3saka_c::Create() { + if (i_fopAcM_isSwitch(this, getSwbit())) { + if (mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + dComIfG_Bgsp().Regist(mpBgW2, this); + mpBgW2->Move(); + } + + initBaseMtx(); + + if (i_fopAcM_isSwitch(this, getSwbit())) { + mpBgW2->Move(); + } + + return 1; } -#pragma pop /* ############################################################################################## */ /* 80C5C3C4-80C5C3CC 000000 0008+00 1/1 0/0 0/0 .rodata l_dzbIdx */ -SECTION_RODATA static u8 const l_dzbIdx[8] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, -}; -COMPILER_STRIP_GATE(0x80C5C3C4, &l_dzbIdx); +static int const l_dzbIdx[] = {3, 3}; /* 80C5C3CC-80C5C3D4 000008 0008+00 1/1 0/0 0/0 .rodata l_dzbIdx2 */ -SECTION_RODATA static u8 const l_dzbIdx2[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x80C5C3CC, &l_dzbIdx2); - -/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C5C3DC = "Obj_saka"; -SECTION_DEAD static char const* const stringBase_80C5C3E5 = "Obj_saka2"; -#pragma pop +static int const l_dzbIdx2[] = {4, 4}; /* 80C5C3F0-80C5C3F8 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[2] = { - (void*)&d_a_obj_lv3saka00__stringBase0, - (void*)(((char*)&d_a_obj_lv3saka00__stringBase0) + 0x9), -}; +static char* l_arcName[] = {"Obj_saka", "Obj_saka2"}; /* 80C5BFA0-80C5C058 0001C0 00B8+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/CreateHeap__14daObjLv3saka_cFv.s" +int daObjLv3saka_c::CreateHeap() { + mpBgW2 = new dBgW(); + if (mpBgW2 == NULL || + mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[getType()], l_dzbIdx2[getType()]), 1, + &mBgMtx)) + { + mpBgW2 = NULL; + return 0; + } + + return 1; } -#pragma pop /* ############################################################################################## */ /* 80C5C3D4-80C5C3DC 000010 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ -SECTION_RODATA static u8 const l_heap_size[8] = { - 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x29, 0x00, -}; -COMPILER_STRIP_GATE(0x80C5C3D4, &l_heap_size); +static int const l_heap_size[] = {0x00004E00, 0x00002900}; /* 80C5C058-80C5C0FC 000278 00A4+00 1/1 0/0 0/0 .text create1st__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/create1st__14daObjLv3saka_cFv.s" +int daObjLv3saka_c::create1st() { + int phase = dComIfG_resLoad(&mPhase, l_arcName[getType()]); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName[getType()], l_dzbIdx[getType()], dBgS_MoveBGProc_TypicalRotY, + l_heap_size[getType()], NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 80C5C0FC-80C5C17C 00031C 0080+00 1/0 0/0 0/0 .text Execute__14daObjLv3saka_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Execute__14daObjLv3saka_cFPPA3_A4_f.s" +int daObjLv3saka_c::Execute(Mtx** param_0) { + if (i_fopAcM_isSwitch(this, getSwbit())) { + setWtrDzb(); + } else { + setNrmDzb(); + } + + *param_0 = &mBgMtx; + setBaseMtx(); + + return 1; } -#pragma pop /* 80C5C17C-80C5C1F8 00039C 007C+00 1/1 0/0 0/0 .text setNrmDzb__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::setNrmDzb() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setNrmDzb__14daObjLv3saka_cFv.s" +void daObjLv3saka_c::setNrmDzb() { + if (!mpBgW->ChkUsed()) { + if (mpBgW2->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW2); + } + dComIfG_Bgsp().Regist(mpBgW, this); + mpBgW->Move(); + } } -#pragma pop /* 80C5C1F8-80C5C274 000418 007C+00 1/1 0/0 0/0 .text setWtrDzb__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::setWtrDzb() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/setWtrDzb__14daObjLv3saka_cFv.s" +void daObjLv3saka_c::setWtrDzb() { + if (!mpBgW2->ChkUsed()) { + if (mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + dComIfG_Bgsp().Regist(mpBgW2, this); + mpBgW2->Move(); + } } -#pragma pop /* 80C5C274-80C5C27C 000494 0008+00 1/0 0/0 0/0 .text Draw__14daObjLv3saka_cFv */ -bool daObjLv3saka_c::Draw() { - return true; +int daObjLv3saka_c::Draw() { + return 1; } /* 80C5C27C-80C5C2F0 00049C 0074+00 1/0 0/0 0/0 .text Delete__14daObjLv3saka_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjLv3saka_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/Delete__14daObjLv3saka_cFv.s" +int daObjLv3saka_c::Delete() { + if (mpBgW2 != NULL && mpBgW2->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW2); + } + dComIfG_resDelete(&mPhase, l_arcName[getType()]); + return 1; } -#pragma pop /* ############################################################################################## */ -/* 80C5C3F8-80C5C418 -00001 0020+00 1/0 0/0 0/0 .data daObjLv3saka_METHODS */ -SECTION_DATA static void* daObjLv3saka_METHODS[8] = { - (void*)daObjLv3saka_create1st__FP14daObjLv3saka_c, - (void*)daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c, - (void*)daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c, - (void*)NULL, - (void*)daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C5C418-80C5C448 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv3R10Saka */ -SECTION_DATA extern void* g_profile_Obj_Lv3R10Saka[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D40000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02100000, (void*)&daObjLv3saka_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80C5C448-80C5C470 000058 0028+00 1/1 0/0 0/0 .data __vt__14daObjLv3saka_c */ -SECTION_DATA extern void* __vt__14daObjLv3saka_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjLv3saka_cFv, - (void*)Create__14daObjLv3saka_cFv, - (void*)Execute__14daObjLv3saka_cFPPA3_A4_f, - (void*)Draw__14daObjLv3saka_cFv, - (void*)Delete__14daObjLv3saka_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - /* 80C5C2F0-80C5C350 000510 0060+00 1/0 0/0 0/0 .text daObjLv3saka_create1st__FP14daObjLv3saka_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv3saka_create1st(daObjLv3saka_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_create1st__FP14daObjLv3saka_c.s" +static int daObjLv3saka_create1st(daObjLv3saka_c* i_this) { + fopAcM_SetupActor(i_this, daObjLv3saka_c); + return i_this->create1st(); } -#pragma pop /* 80C5C350-80C5C370 000570 0020+00 1/0 0/0 0/0 .text * daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv3saka_MoveBGDelete(daObjLv3saka_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c.s" +static int daObjLv3saka_MoveBGDelete(daObjLv3saka_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C5C370-80C5C390 000590 0020+00 1/0 0/0 0/0 .text * daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv3saka_MoveBGExecute(daObjLv3saka_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c.s" +static int daObjLv3saka_MoveBGExecute(daObjLv3saka_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C5C390-80C5C3BC 0005B0 002C+00 1/0 0/0 0/0 .text daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjLv3saka_MoveBGDraw(daObjLv3saka_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00/daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c.s" +static int daObjLv3saka_MoveBGDraw(daObjLv3saka_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop + +/* 80C5C3F8-80C5C418 -00001 0020+00 1/0 0/0 0/0 .data daObjLv3saka_METHODS */ +static actor_method_class daObjLv3saka_METHODS = { + (process_method_func)daObjLv3saka_create1st, (process_method_func)daObjLv3saka_MoveBGDelete, + (process_method_func)daObjLv3saka_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjLv3saka_MoveBGDraw}; + +/* 80C5C418-80C5C448 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv3R10Saka */ +extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { + -3, // mLayerID + 3, // mListID + -3, // mListPrio + PROC_Obj_Lv3R10Saka, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjLv3saka_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0210, // mPriority + &daObjLv3saka_METHODS, // mSubMtd + 0x00040100, // mStatus + 0, // mActorType + 14, // mCullType +}; /* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */