falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_table OK (#2076) 

* Initial pass, 1 nonmatching

* Some cleanup, got the last mostly matching

* d_a_obj_table decomp OK

* Format pass

* Minor cleanup pass

* Removing unused asm files

* Updating a magic number with an appropriate method

* fix compiler zip endpoint (#2077)

* remove dkp dependency (#2078)

* Some changes and cleanup to address PR feedback

* Cleaning up static Create method with Taka's help

---------

Co-authored-by: GinNoOokami <noreply>
Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
This commit is contained in:
Jeff Padgham 2024-02-25 21:54:23 -08:00 committed by GitHub
parent d72e2c95e5
commit 0e41460e3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 188 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/CreateHeap__12daObjTable_cFv.s
View File

@ -1,29 +0,0 @@
lbl_80D06560:
/* 80D06560 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D06564 7C 08 02 A6 */ mflr r0
/* 80D06568 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D0656C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D06570 7C 7F 1B 78 */ mr r31, r3
/* 80D06574 3C 60 80 D0 */ lis r3, l_arcName@ha /* 0x80D06C1C@ha */
/* 80D06578 38 63 6C 1C */ addi r3, r3, l_arcName@l /* 0x80D06C1C@l */
/* 80D0657C 80 63 00 00 */ lwz r3, 0(r3)
/* 80D06580 38 80 00 05 */ li r4, 5
/* 80D06584 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D06588 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D0658C 3C A5 00 02 */ addis r5, r5, 2
/* 80D06590 38 C0 00 80 */ li r6, 0x80
/* 80D06594 38 A5 C2 F8 */ addi r5, r5, -15624
/* 80D06598 4B 33 5D 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80D0659C 3C 80 00 08 */ lis r4, 8
/* 80D065A0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */
/* 80D065A4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */
/* 80D065A8 4B 30 E6 AD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 80D065AC 90 7F 05 A0 */ stw r3, 0x5a0(r31)
/* 80D065B0 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D065B4 30 03 FF FF */ addic r0, r3, -1
/* 80D065B8 7C 60 19 10 */ subfe r3, r0, r3
/* 80D065BC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D065C0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D065C4 7C 08 03 A6 */ mtlr r0
/* 80D065C8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D065CC 4E 80 00 20 */ blr

238
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Create__12daObjTable_cFv.s
View File

@ -1,238 +0,0 @@
lbl_80D065D0:
/* 80D065D0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D065D4 7C 08 02 A6 */ mflr r0
/* 80D065D8 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D065DC 39 61 00 20 */ addi r11, r1, 0x20
/* 80D065E0 4B 65 BB FD */ bl _savegpr_29
/* 80D065E4 7C 7F 1B 78 */ mr r31, r3
/* 80D065E8 80 83 05 A0 */ lwz r4, 0x5a0(r3)
/* 80D065EC 80 84 00 04 */ lwz r4, 4(r4)
/* 80D065F0 4B 31 3F 89 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData
/* 80D065F4 4B 4A 5F 89 */ bl dKy_darkworld_check__Fv
/* 80D065F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D065FC 40 82 00 18 */ bne lbl_80D06614
/* 80D06600 38 60 00 18 */ li r3, 0x18
/* 80D06604 38 80 00 4B */ li r4, 0x4b
/* 80D06608 4B 32 71 39 */ bl dComIfGs_isStageSwitch__Fii
/* 80D0660C 2C 03 00 00 */ cmpwi r3, 0
/* 80D06610 41 82 00 68 */ beq lbl_80D06678
lbl_80D06614:
/* 80D06614 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D06618 80 63 00 04 */ lwz r3, 4(r3)
/* 80D0661C 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D06620 80 63 00 00 */ lwz r3, 0(r3)
/* 80D06624 80 63 00 08 */ lwz r3, 8(r3)
/* 80D06628 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D0662C 60 00 00 01 */ ori r0, r0, 1
/* 80D06630 90 03 00 0C */ stw r0, 0xc(r3)
/* 80D06634 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D06638 80 63 00 04 */ lwz r3, 4(r3)
/* 80D0663C 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D06640 80 63 00 04 */ lwz r3, 4(r3)
/* 80D06644 80 63 00 08 */ lwz r3, 8(r3)
/* 80D06648 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D0664C 60 00 00 01 */ ori r0, r0, 1
/* 80D06650 90 03 00 0C */ stw r0, 0xc(r3)
/* 80D06654 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D06658 80 63 00 04 */ lwz r3, 4(r3)
/* 80D0665C 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D06660 80 63 00 08 */ lwz r3, 8(r3)
/* 80D06664 80 63 00 08 */ lwz r3, 8(r3)
/* 80D06668 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D0666C 60 00 00 01 */ ori r0, r0, 1
/* 80D06670 90 03 00 0C */ stw r0, 0xc(r3)
/* 80D06674 48 00 01 74 */ b lbl_80D067E8
lbl_80D06678:
/* 80D06678 38 60 00 00 */ li r3, 0
/* 80D0667C 4B 32 63 01 */ bl getLayerNo__14dComIfG_play_cFi
/* 80D06680 2C 03 00 04 */ cmpwi r3, 4
/* 80D06684 40 82 01 44 */ bne lbl_80D067C8
/* 80D06688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D0668C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D06690 3B A3 07 F0 */ addi r29, r3, 0x7f0
/* 80D06694 7F A3 EB 78 */ mr r3, r29
/* 80D06698 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D0669C 3B C4 72 88 */ addi r30, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D066A0 A0 9E 02 D2 */ lhz r4, 0x2d2(r30)
/* 80D066A4 4B 32 E3 19 */ bl isEventBit__11dSv_event_cCFUs
/* 80D066A8 2C 03 00 00 */ cmpwi r3, 0
/* 80D066AC 40 82 00 24 */ bne lbl_80D066D0
/* 80D066B0 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D066B4 80 63 00 04 */ lwz r3, 4(r3)
/* 80D066B8 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D066BC 80 63 00 00 */ lwz r3, 0(r3)
/* 80D066C0 80 63 00 08 */ lwz r3, 8(r3)
/* 80D066C4 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D066C8 60 00 00 01 */ ori r0, r0, 1
/* 80D066CC 90 03 00 0C */ stw r0, 0xc(r3)
lbl_80D066D0:
/* 80D066D0 7F A3 EB 78 */ mr r3, r29
/* 80D066D4 A0 9E 02 D2 */ lhz r4, 0x2d2(r30)
/* 80D066D8 4B 32 E2 E5 */ bl isEventBit__11dSv_event_cCFUs
/* 80D066DC 2C 03 00 00 */ cmpwi r3, 0
/* 80D066E0 41 82 00 5C */ beq lbl_80D0673C
/* 80D066E4 7F A3 EB 78 */ mr r3, r29
/* 80D066E8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D066EC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D066F0 A0 84 02 14 */ lhz r4, 0x214(r4)
/* 80D066F4 4B 32 E2 C9 */ bl isEventBit__11dSv_event_cCFUs
/* 80D066F8 2C 03 00 00 */ cmpwi r3, 0
/* 80D066FC 41 82 00 40 */ beq lbl_80D0673C
/* 80D06700 7F A3 EB 78 */ mr r3, r29
/* 80D06704 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06708 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D0670C A0 84 02 16 */ lhz r4, 0x216(r4)
/* 80D06710 4B 32 E2 AD */ bl isEventBit__11dSv_event_cCFUs
/* 80D06714 2C 03 00 00 */ cmpwi r3, 0
/* 80D06718 40 82 00 24 */ bne lbl_80D0673C
/* 80D0671C 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D06720 80 63 00 04 */ lwz r3, 4(r3)
/* 80D06724 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D06728 80 63 00 04 */ lwz r3, 4(r3)
/* 80D0672C 80 63 00 08 */ lwz r3, 8(r3)
/* 80D06730 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D06734 60 00 00 01 */ ori r0, r0, 1
/* 80D06738 90 03 00 0C */ stw r0, 0xc(r3)
lbl_80D0673C:
/* 80D0673C 7F A3 EB 78 */ mr r3, r29
/* 80D06740 A0 9E 02 D2 */ lhz r4, 0x2d2(r30)
/* 80D06744 4B 32 E2 79 */ bl isEventBit__11dSv_event_cCFUs
/* 80D06748 2C 03 00 00 */ cmpwi r3, 0
/* 80D0674C 41 82 00 9C */ beq lbl_80D067E8
/* 80D06750 7F A3 EB 78 */ mr r3, r29
/* 80D06754 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06758 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D0675C A0 84 02 14 */ lhz r4, 0x214(r4)
/* 80D06760 4B 32 E2 5D */ bl isEventBit__11dSv_event_cCFUs
/* 80D06764 2C 03 00 00 */ cmpwi r3, 0
/* 80D06768 41 82 00 80 */ beq lbl_80D067E8
/* 80D0676C 7F A3 EB 78 */ mr r3, r29
/* 80D06770 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06774 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D06778 A0 84 02 16 */ lhz r4, 0x216(r4)
/* 80D0677C 4B 32 E2 41 */ bl isEventBit__11dSv_event_cCFUs
/* 80D06780 2C 03 00 00 */ cmpwi r3, 0
/* 80D06784 41 82 00 64 */ beq lbl_80D067E8
/* 80D06788 7F A3 EB 78 */ mr r3, r29
/* 80D0678C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06790 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D06794 A0 84 02 18 */ lhz r4, 0x218(r4)
/* 80D06798 4B 32 E2 25 */ bl isEventBit__11dSv_event_cCFUs
/* 80D0679C 2C 03 00 00 */ cmpwi r3, 0
/* 80D067A0 40 82 00 48 */ bne lbl_80D067E8
/* 80D067A4 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D067A8 80 63 00 04 */ lwz r3, 4(r3)
/* 80D067AC 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D067B0 80 63 00 08 */ lwz r3, 8(r3)
/* 80D067B4 80 63 00 08 */ lwz r3, 8(r3)
/* 80D067B8 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D067BC 60 00 00 01 */ ori r0, r0, 1
/* 80D067C0 90 03 00 0C */ stw r0, 0xc(r3)
/* 80D067C4 48 00 00 24 */ b lbl_80D067E8
lbl_80D067C8:
/* 80D067C8 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D067CC 80 63 00 04 */ lwz r3, 4(r3)
/* 80D067D0 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D067D4 80 63 00 04 */ lwz r3, 4(r3)
/* 80D067D8 80 63 00 08 */ lwz r3, 8(r3)
/* 80D067DC 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D067E0 60 00 00 01 */ ori r0, r0, 1
/* 80D067E4 90 03 00 0C */ stw r0, 0xc(r3)
lbl_80D067E8:
/* 80D067E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D067EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D067F0 3B A3 07 F0 */ addi r29, r3, 0x7f0
/* 80D067F4 7F A3 EB 78 */ mr r3, r29
/* 80D067F8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D067FC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D06800 A0 84 00 CE */ lhz r4, 0xce(r4)
/* 80D06804 4B 32 E1 B9 */ bl isEventBit__11dSv_event_cCFUs
/* 80D06808 2C 03 00 00 */ cmpwi r3, 0
/* 80D0680C 41 82 00 68 */ beq lbl_80D06874
/* 80D06810 7F A3 EB 78 */ mr r3, r29
/* 80D06814 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06818 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D0681C A0 84 02 18 */ lhz r4, 0x218(r4)
/* 80D06820 4B 32 E1 9D */ bl isEventBit__11dSv_event_cCFUs
/* 80D06824 2C 03 00 00 */ cmpwi r3, 0
/* 80D06828 40 82 00 20 */ bne lbl_80D06848
/* 80D0682C 7F A3 EB 78 */ mr r3, r29
/* 80D06830 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D06834 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D06838 A0 84 02 10 */ lhz r4, 0x210(r4)
/* 80D0683C 4B 32 E1 81 */ bl isEventBit__11dSv_event_cCFUs
/* 80D06840 2C 03 00 00 */ cmpwi r3, 0
/* 80D06844 40 82 00 30 */ bne lbl_80D06874
lbl_80D06848:
/* 80D06848 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D0684C 80 63 00 04 */ lwz r3, 4(r3)
/* 80D06850 80 63 00 60 */ lwz r3, 0x60(r3)
/* 80D06854 80 63 00 10 */ lwz r3, 0x10(r3)
/* 80D06858 80 63 00 08 */ lwz r3, 8(r3)
/* 80D0685C 80 03 00 0C */ lwz r0, 0xc(r3)
/* 80D06860 60 00 00 01 */ ori r0, r0, 1
/* 80D06864 90 03 00 0C */ stw r0, 0xc(r3)
/* 80D06868 38 00 00 00 */ li r0, 0
/* 80D0686C 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80D06870 48 00 00 38 */ b lbl_80D068A8
lbl_80D06874:
/* 80D06874 3C 60 20 00 */ lis r3, 0x2000 /* 0x2000000A@ha */
/* 80D06878 38 03 00 0A */ addi r0, r3, 0x000A /* 0x2000000A@l */
/* 80D0687C 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80D06880 4B 4A 5C FD */ bl dKy_darkworld_check__Fv
/* 80D06884 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D06888 38 00 00 62 */ li r0, 0x62
/* 80D0688C 41 82 00 08 */ beq lbl_80D06894
/* 80D06890 38 00 00 DA */ li r0, 0xda
lbl_80D06894:
/* 80D06894 98 1F 05 44 */ stb r0, 0x544(r31)
/* 80D06898 88 1F 05 44 */ lbz r0, 0x544(r31)
/* 80D0689C 98 1F 05 45 */ stb r0, 0x545(r31)
/* 80D068A0 88 1F 05 44 */ lbz r0, 0x544(r31)
/* 80D068A4 98 1F 05 47 */ stb r0, 0x547(r31)
lbl_80D068A8:
/* 80D068A8 C0 5F 04 D8 */ lfs f2, 0x4d8(r31)
/* 80D068AC 3C 60 80 D0 */ lis r3, lit_4017@ha /* 0x80D06C04@ha */
/* 80D068B0 C0 23 6C 04 */ lfs f1, lit_4017@l(r3) /* 0x80D06C04@l */
/* 80D068B4 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 80D068B8 EC 21 00 2A */ fadds f1, f1, f0
/* 80D068BC C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 80D068C0 D0 1F 05 50 */ stfs f0, 0x550(r31)
/* 80D068C4 D0 3F 05 54 */ stfs f1, 0x554(r31)
/* 80D068C8 D0 5F 05 58 */ stfs f2, 0x558(r31)
/* 80D068CC 38 7F 05 AC */ addi r3, r31, 0x5ac
/* 80D068D0 7F E4 FB 78 */ mr r4, r31
/* 80D068D4 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D068D8 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 80D068DC 7C 05 07 34 */ extsh r5, r0
/* 80D068E0 38 C0 00 00 */ li r6, 0
/* 80D068E4 38 E0 00 00 */ li r7, 0
/* 80D068E8 4B 54 36 A9 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c
/* 80D068EC 4B 53 17 AD */ bl endFlowGroup__12dMsgObject_cFv
/* 80D068F0 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D068F4 38 03 00 24 */ addi r0, r3, 0x24
/* 80D068F8 90 1F 05 04 */ stw r0, 0x504(r31)
/* 80D068FC 38 7F 04 D0 */ addi r3, r31, 0x4d0
/* 80D06900 4B 30 64 65 */ bl transS__14mDoMtx_stack_cFRC4cXyz
/* 80D06904 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D06908 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D0690C A8 9F 04 E6 */ lha r4, 0x4e6(r31)
/* 80D06910 4B 30 5B 25 */ bl mDoMtx_YrotM__FPA4_fs
/* 80D06914 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D06918 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D0691C 38 9F 05 6C */ addi r4, r31, 0x56c
/* 80D06920 4B 63 FB 91 */ bl PSMTXCopy
/* 80D06924 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D06928 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D0692C 80 9F 05 A0 */ lwz r4, 0x5a0(r31)
/* 80D06930 38 84 00 24 */ addi r4, r4, 0x24
/* 80D06934 4B 63 FB 7D */ bl PSMTXCopy
/* 80D06938 38 00 FF FF */ li r0, -1
/* 80D0693C B0 1F 05 FC */ sth r0, 0x5fc(r31)
/* 80D06940 38 60 00 04 */ li r3, 4
/* 80D06944 39 61 00 20 */ addi r11, r1, 0x20
/* 80D06948 4B 65 B8 E1 */ bl _restgpr_29
/* 80D0694C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D06950 7C 08 03 A6 */ mtlr r0
/* 80D06954 38 21 00 20 */ addi r1, r1, 0x20
/* 80D06958 4E 80 00 20 */ blr

14
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Delete__12daObjTable_cFv.s
View File

@ -1,14 +0,0 @@
lbl_80D06BC8:
/* 80D06BC8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D06BCC 7C 08 02 A6 */ mflr r0
/* 80D06BD0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D06BD4 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D06C1C@ha */
/* 80D06BD8 38 84 6C 1C */ addi r4, r4, l_arcName@l /* 0x80D06C1C@l */
/* 80D06BDC 80 84 00 00 */ lwz r4, 0(r4)
/* 80D06BE0 38 63 05 A4 */ addi r3, r3, 0x5a4
/* 80D06BE4 4B 32 64 25 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 80D06BE8 38 60 00 01 */ li r3, 1
/* 80D06BEC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D06BF0 7C 08 03 A6 */ mtlr r0
/* 80D06BF4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D06BF8 4E 80 00 20 */ blr

61
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Draw__12daObjTable_cFv.s
View File

@ -1,61 +0,0 @@
lbl_80D06AD8:
/* 80D06AD8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D06ADC 7C 08 02 A6 */ mflr r0
/* 80D06AE0 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D06AE4 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80D06AE8 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80D06AEC 7C 7F 1B 78 */ mr r31, r3
/* 80D06AF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80D06AF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80D06AF8 38 80 00 10 */ li r4, 0x10
/* 80D06AFC 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 80D06B00 38 DF 01 0C */ addi r6, r31, 0x10c
/* 80D06B04 4B 49 CC C1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
/* 80D06B08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80D06B0C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80D06B10 80 9F 05 A0 */ lwz r4, 0x5a0(r31)
/* 80D06B14 80 84 00 04 */ lwz r4, 4(r4)
/* 80D06B18 38 BF 01 0C */ addi r5, r31, 0x10c
/* 80D06B1C 4B 49 E2 85 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 80D06B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D06B24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D06B28 80 04 5F 70 */ lwz r0, 0x5f70(r4)
/* 80D06B2C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80D06B30 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */
/* 80D06B34 90 1E 00 48 */ stw r0, 0x48(r30)
/* 80D06B38 80 04 5F 74 */ lwz r0, 0x5f74(r4)
/* 80D06B3C 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80D06B40 80 7F 05 A0 */ lwz r3, 0x5a0(r31)
/* 80D06B44 4B 30 71 81 */ bl mDoExt_modelUpdateDL__FP8J3DModel
/* 80D06B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D06B4C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D06B50 80 05 5F 80 */ lwz r0, 0x5f80(r5)
/* 80D06B54 90 1E 00 48 */ stw r0, 0x48(r30)
/* 80D06B58 80 05 5F 84 */ lwz r0, 0x5f84(r5)
/* 80D06B5C 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80D06B60 C0 7F 04 D8 */ lfs f3, 0x4d8(r31)
/* 80D06B64 3C 60 80 D0 */ lis r3, lit_4017@ha /* 0x80D06C04@ha */
/* 80D06B68 C0 03 6C 04 */ lfs f0, lit_4017@l(r3) /* 0x80D06C04@l */
/* 80D06B6C C0 5F 04 D4 */ lfs f2, 0x4d4(r31)
/* 80D06B70 EC 20 10 2A */ fadds f1, f0, f2
/* 80D06B74 C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 80D06B78 D0 01 00 08 */ stfs f0, 8(r1)
/* 80D06B7C D0 21 00 0C */ stfs f1, 0xc(r1)
/* 80D06B80 D0 61 00 10 */ stfs f3, 0x10(r1)
/* 80D06B84 80 9F 05 F8 */ lwz r4, 0x5f8(r31)
/* 80D06B88 38 65 61 C0 */ addi r3, r5, 0x61c0
/* 80D06B8C 38 A0 00 01 */ li r5, 1
/* 80D06B90 80 DF 05 A0 */ lwz r6, 0x5a0(r31)
/* 80D06B94 38 E1 00 08 */ addi r7, r1, 8
/* 80D06B98 3D 00 80 D0 */ lis r8, lit_4077@ha /* 0x80D06C08@ha */
/* 80D06B9C C0 28 6C 08 */ lfs f1, lit_4077@l(r8) /* 0x80D06C08@l */
/* 80D06BA0 39 1F 01 0C */ addi r8, r31, 0x10c
/* 80D06BA4 4B 34 F0 D1 */ bl setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c
/* 80D06BA8 90 7F 05 F8 */ stw r3, 0x5f8(r31)
/* 80D06BAC 38 60 00 01 */ li r3, 1
/* 80D06BB0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80D06BB4 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 80D06BB8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D06BBC 7C 08 03 A6 */ mtlr r0
/* 80D06BC0 38 21 00 20 */ addi r1, r1, 0x20
/* 80D06BC4 4E 80 00 20 */ blr

99
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Execute__12daObjTable_cFPPA3_A4_f.s
View File

@ -1,99 +0,0 @@
lbl_80D0695C:
/* 80D0695C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D06960 7C 08 02 A6 */ mflr r0
/* 80D06964 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D06968 39 61 00 20 */ addi r11, r1, 0x20
/* 80D0696C 4B 65 B8 71 */ bl _savegpr_29
/* 80D06970 7C 7E 1B 78 */ mr r30, r3
/* 80D06974 7C 9F 23 78 */ mr r31, r4
/* 80D06978 A0 03 00 FA */ lhz r0, 0xfa(r3)
/* 80D0697C 60 00 00 01 */ ori r0, r0, 1
/* 80D06980 B0 03 00 FA */ sth r0, 0xfa(r3)
/* 80D06984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D06988 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D0698C 88 1D 4F AD */ lbz r0, 0x4fad(r29)
/* 80D06990 28 00 00 00 */ cmplwi r0, 0
/* 80D06994 41 82 00 FC */ beq lbl_80D06A90
/* 80D06998 A0 1E 00 F8 */ lhz r0, 0xf8(r30)
/* 80D0699C 28 00 00 01 */ cmplwi r0, 1
/* 80D069A0 40 82 00 84 */ bne lbl_80D06A24
/* 80D069A4 38 7E 05 AC */ addi r3, r30, 0x5ac
/* 80D069A8 7F C4 F3 78 */ mr r4, r30
/* 80D069AC 38 A0 00 00 */ li r5, 0
/* 80D069B0 38 C0 00 00 */ li r6, 0
/* 80D069B4 4B 54 39 25 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci
/* 80D069B8 2C 03 00 00 */ cmpwi r3, 0
/* 80D069BC 41 82 00 F8 */ beq lbl_80D06AB4
/* 80D069C0 38 7D 4E C8 */ addi r3, r29, 0x4ec8
/* 80D069C4 7F C4 F3 78 */ mr r4, r30
/* 80D069C8 4B 33 BB 51 */ bl reset__14dEvt_control_cFPv
/* 80D069CC 3C 60 80 D0 */ lis r3, d_a_obj_table__stringBase0@ha /* 0x80D06C0C@ha */
/* 80D069D0 38 03 6C 0C */ addi r0, r3, d_a_obj_table__stringBase0@l /* 0x80D06C0C@l */
/* 80D069D4 90 1E 01 00 */ stw r0, 0x100(r30)
/* 80D069D8 3B BD 4F F8 */ addi r29, r29, 0x4ff8
/* 80D069DC 7F A3 EB 78 */ mr r3, r29
/* 80D069E0 80 9E 01 00 */ lwz r4, 0x100(r30)
/* 80D069E4 4B 33 FE 1D */ bl setObjectArchive__16dEvent_manager_cFPc
/* 80D069E8 7F A3 EB 78 */ mr r3, r29
/* 80D069EC 7F C4 F3 78 */ mr r4, r30
/* 80D069F0 3C A0 80 D0 */ lis r5, d_a_obj_table__stringBase0@ha /* 0x80D06C0C@ha */
/* 80D069F4 38 A5 6C 0C */ addi r5, r5, d_a_obj_table__stringBase0@l /* 0x80D06C0C@l */
/* 80D069F8 38 A5 00 06 */ addi r5, r5, 6
/* 80D069FC 38 C0 00 FF */ li r6, 0xff
/* 80D06A00 4B 34 0D 59 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
/* 80D06A04 B0 7E 05 FC */ sth r3, 0x5fc(r30)
/* 80D06A08 7F C3 F3 78 */ mr r3, r30
/* 80D06A0C A8 9E 05 FC */ lha r4, 0x5fc(r30)
/* 80D06A10 38 A0 00 01 */ li r5, 1
/* 80D06A14 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */
/* 80D06A18 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */
/* 80D06A1C 4B 31 4B C9 */ bl fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs
/* 80D06A20 48 00 00 94 */ b lbl_80D06AB4
lbl_80D06A24:
/* 80D06A24 3B BD 4F F8 */ addi r29, r29, 0x4ff8
/* 80D06A28 7F A3 EB 78 */ mr r3, r29
/* 80D06A2C 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D06C1C@ha */
/* 80D06A30 38 84 6C 1C */ addi r4, r4, l_arcName@l /* 0x80D06C1C@l */
/* 80D06A34 80 84 00 00 */ lwz r4, 0(r4)
/* 80D06A38 38 A0 00 00 */ li r5, 0
/* 80D06A3C 38 C0 00 00 */ li r6, 0
/* 80D06A40 4B 34 10 DD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci
/* 80D06A44 2C 03 FF FF */ cmpwi r3, -1
/* 80D06A48 41 82 00 6C */ beq lbl_80D06AB4
/* 80D06A4C A0 1E 00 F8 */ lhz r0, 0xf8(r30)
/* 80D06A50 28 00 00 02 */ cmplwi r0, 2
/* 80D06A54 40 82 00 60 */ bne lbl_80D06AB4
/* 80D06A58 A8 9E 05 FC */ lha r4, 0x5fc(r30)
/* 80D06A5C 2C 04 FF FF */ cmpwi r4, -1
/* 80D06A60 41 82 00 54 */ beq lbl_80D06AB4
/* 80D06A64 7F A3 EB 78 */ mr r3, r29
/* 80D06A68 4B 34 10 11 */ bl endCheck__16dEvent_manager_cFs
/* 80D06A6C 2C 03 00 00 */ cmpwi r3, 0
/* 80D06A70 41 82 00 44 */ beq lbl_80D06AB4
/* 80D06A74 38 00 FF FF */ li r0, -1
/* 80D06A78 B0 1E 05 FC */ sth r0, 0x5fc(r30)
/* 80D06A7C 38 00 00 07 */ li r0, 7
/* 80D06A80 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 80D06A84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 80D06A88 98 03 00 C1 */ stb r0, 0xc1(r3)
/* 80D06A8C 48 00 00 28 */ b lbl_80D06AB4
lbl_80D06A90:
/* 80D06A90 38 7E 05 AC */ addi r3, r30, 0x5ac
/* 80D06A94 7F C4 F3 78 */ mr r4, r30
/* 80D06A98 80 1E 00 B0 */ lwz r0, 0xb0(r30)
/* 80D06A9C 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 80D06AA0 7C 05 07 34 */ extsh r5, r0
/* 80D06AA4 38 C0 00 00 */ li r6, 0
/* 80D06AA8 38 E0 00 00 */ li r7, 0
/* 80D06AAC 4B 54 34 E5 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c
/* 80D06AB0 4B 53 15 E9 */ bl endFlowGroup__12dMsgObject_cFv
lbl_80D06AB4:
/* 80D06AB4 38 1E 05 6C */ addi r0, r30, 0x56c
/* 80D06AB8 90 1F 00 00 */ stw r0, 0(r31)
/* 80D06ABC 38 60 00 01 */ li r3, 1
/* 80D06AC0 39 61 00 20 */ addi r11, r1, 0x20
/* 80D06AC4 4B 65 B7 65 */ bl _restgpr_29
/* 80D06AC8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D06ACC 7C 08 03 A6 */ mtlr r0
/* 80D06AD0 38 21 00 20 */ addi r1, r1, 0x20
/* 80D06AD4 4E 80 00 20 */ blr

48
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Create__FP10fopAc_ac_c.s
View File

@ -1,48 +0,0 @@
lbl_80D064B0:
/* 80D064B0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D064B4 7C 08 02 A6 */ mflr r0
/* 80D064B8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D064BC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D064C0 93 C1 00 08 */ stw r30, 8(r1)
/* 80D064C4 7C 7F 1B 78 */ mr r31, r3
/* 80D064C8 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D064CC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D064D0 40 82 00 34 */ bne lbl_80D06504
/* 80D064D4 7F E0 FB 79 */ or. r0, r31, r31
/* 80D064D8 41 82 00 20 */ beq lbl_80D064F8
/* 80D064DC 7C 1E 03 78 */ mr r30, r0
/* 80D064E0 4B 37 21 45 */ bl __ct__16dBgS_MoveBgActorFv
/* 80D064E4 3C 60 80 D0 */ lis r3, __vt__12daObjTable_c@ha /* 0x80D06C70@ha */
/* 80D064E8 38 03 6C 70 */ addi r0, r3, __vt__12daObjTable_c@l /* 0x80D06C70@l */
/* 80D064EC 90 1E 05 9C */ stw r0, 0x59c(r30)
/* 80D064F0 38 7E 05 AC */ addi r3, r30, 0x5ac
/* 80D064F4 4B 54 3A 0D */ bl __ct__10dMsgFlow_cFv
lbl_80D064F8:
/* 80D064F8 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D064FC 60 00 00 08 */ ori r0, r0, 8
/* 80D06500 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D06504:
/* 80D06504 38 7F 05 A4 */ addi r3, r31, 0x5a4
/* 80D06508 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D06C1C@ha */
/* 80D0650C 38 84 6C 1C */ addi r4, r4, l_arcName@l /* 0x80D06C1C@l */
/* 80D06510 80 84 00 00 */ lwz r4, 0(r4)
/* 80D06514 4B 32 69 A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
/* 80D06518 2C 03 00 04 */ cmpwi r3, 4
/* 80D0651C 40 82 00 2C */ bne lbl_80D06548
/* 80D06520 7F E3 FB 78 */ mr r3, r31
/* 80D06524 3C 80 80 D0 */ lis r4, l_arcName@ha /* 0x80D06C1C@ha */
/* 80D06528 38 84 6C 1C */ addi r4, r4, l_arcName@l /* 0x80D06C1C@l */
/* 80D0652C 80 84 00 00 */ lwz r4, 0(r4)
/* 80D06530 38 A0 00 08 */ li r5, 8
/* 80D06534 38 C0 00 00 */ li r6, 0
/* 80D06538 38 E0 40 00 */ li r7, 0x4000
/* 80D0653C 39 00 00 00 */ li r8, 0
/* 80D06540 4B 37 22 7D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f
/* 80D06544 2C 03 00 05 */ cmpwi r3, 5
lbl_80D06548:
/* 80D06548 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D0654C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D06550 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D06554 7C 08 03 A6 */ mtlr r0
/* 80D06558 38 21 00 10 */ addi r1, r1, 0x10
/* 80D0655C 4E 80 00 20 */ blr

10
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Delete__FP12daObjTable_c.s
View File

@ -1,10 +0,0 @@
lbl_80D0648C:
/* 80D0648C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D06490 7C 08 02 A6 */ mflr r0
/* 80D06494 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D06498 4B 37 24 45 */ bl MoveBGDelete__16dBgS_MoveBgActorFv
/* 80D0649C 38 60 00 01 */ li r3, 1
/* 80D064A0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D064A4 7C 08 03 A6 */ mtlr r0
/* 80D064A8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D064AC 4E 80 00 20 */ blr

12
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Draw__FP12daObjTable_c.s
View File

@ -1,12 +0,0 @@
lbl_80D06438:
/* 80D06438 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D0643C 7C 08 02 A6 */ mflr r0
/* 80D06440 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D06444 81 83 05 9C */ lwz r12, 0x59c(r3)
/* 80D06448 81 8C 00 14 */ lwz r12, 0x14(r12)
/* 80D0644C 7D 89 03 A6 */ mtctr r12
/* 80D06450 4E 80 04 21 */ bctrl
/* 80D06454 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D06458 7C 08 03 A6 */ mtlr r0
/* 80D0645C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D06460 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Execute__FP12daObjTable_c.s
View File

@ -1,9 +0,0 @@
lbl_80D06464:
/* 80D06464 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D06468 7C 08 02 A6 */ mflr r0
/* 80D0646C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D06470 4B 37 24 E1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv
/* 80D06474 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D06478 7C 08 03 A6 */ mtlr r0
/* 80D0647C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D06480 4E 80 00 20 */ blr

24
include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h
View File

@ -2,8 +2,30 @@
#define D_A_OBJ_TABLE_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "d/msg/d_msg_flow.h"
#include "f_op/f_op_actor_mng.h"
class daObjTable_c : public dBgS_MoveBgActor {
public:
/* 80D06560 */ int CreateHeap();
/* 80D065D0 */ int Create();
/* 80D0695C */ int Execute(Mtx**);
/* 80D06AD8 */ int Draw();
/* 80D06BC8 */ int Delete();
inline void initBaseMtx();
inline void setBaseMtx();
inline int create();
s16 getMessageNo() { return (s16)fopAcM_GetParamBit(this, 0, 16); }
/* 0x5A0 */ J3DModel* mpModel;
/* 0x5A4 */ request_of_phase_process_class mPhaseReq;
/* 0x5AC */ dMsgFlow_c mMsgFlow;
/* 0x5F8 */ u32 mShadowKey;
/* 0x5FC */ s16 mEventID;
}; // Size: 0x600
STATIC_ASSERT(sizeof(daObjTable_c) == 0x600);
#endif /* D_A_OBJ_TABLE_H */

359
rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp
View File

@ -4,110 +4,52 @@
*/
#include "rel/d/a/obj/d_a_obj_table/d_a_obj_table.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "d/bg/d_bg_w.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/meter/d_meter2_info.h"
#include "dol2asm.h"
#include "d/msg/d_msg_object.h"
class daObjTable_c : public dBgS_MoveBgActor {
/* 80D06560 */ int CreateHeap();
/* 80D065D0 */ int Create();
/* 80D0695C */ int Execute(Mtx**);
/* 80D06AD8 */ int Draw();
/* 80D06BC8 */ int Delete();
/* 80D06C1C-80D06C20 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */
static char* l_arcName = "Table";
u32 getMessageNo() { return fopAcM_GetParam(this); }
void daObjTable_c::initBaseMtx() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
setBaseMtx();
}
/* 0x5A0 */ J3DModel* mpModel;
/* 0x5A4 */ request_of_phase_process_class mPhaseReq;
/* 0x5AC */ dMsgFlow_c mMsgFlow;
/* 0x5F8 */ u32 field_0x5f8;
/* 0x5FC */ s16 field_0x5fc;
}; // Size: 0x600
void daObjTable_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
}
//
// Forward References:
//
int daObjTable_c::create() {
fopAcM_SetupActor(this, daObjTable_c);
extern "C" static void daObjTable_Draw__FP12daObjTable_c();
extern "C" static void daObjTable_Execute__FP12daObjTable_c();
extern "C" static bool daObjTable_IsDelete__FP12daObjTable_c();
extern "C" static void daObjTable_Delete__FP12daObjTable_c();
extern "C" static void daObjTable_Create__FP10fopAc_ac_c();
extern "C" void CreateHeap__12daObjTable_cFv();
extern "C" void Create__12daObjTable_cFv();
extern "C" void Execute__12daObjTable_cFPPA3_A4_f();
extern "C" void Draw__12daObjTable_cFv();
extern "C" void Delete__12daObjTable_cFv();
extern "C" extern char const* const d_a_obj_table__stringBase0;
int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(l_arcName, 8, NULL, 0x4000, NULL);
if (phase_state == cPhs_ERROR_e) {
return phase_state;
}
}
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
extern "C" void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs();
extern "C" void getLayerNo__14dComIfG_play_cFi();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGs_isStageSwitch__Fii();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void reset__14dEvt_control_cFPv();
extern "C" void setObjectArchive__16dEvent_manager_cFPc();
extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc();
extern "C" void endCheck__16dEvent_manager_cFs();
extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci();
extern "C" void setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void dKy_darkworld_check__Fv();
extern "C" void endFlowGroup__12dMsgObject_cFv();
extern "C" void __ct__10dMsgFlow_cFv();
extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c();
extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci();
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];
//
// Declarations:
//
return phase_state;
}
/* 80D06438-80D06464 000078 002C+00 1/0 0/0 0/0 .text daObjTable_Draw__FP12daObjTable_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObjTable_Draw(daObjTable_c* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Draw__FP12daObjTable_c.s"
static int daObjTable_Draw(daObjTable_c* i_this) {
return i_this->Draw();
}
#pragma pop
/* 80D06464-80D06484 0000A4 0020+00 1/0 0/0 0/0 .text daObjTable_Execute__FP12daObjTable_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObjTable_Execute(daObjTable_c* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Execute__FP12daObjTable_c.s"
static int daObjTable_Execute(daObjTable_c* i_this) {
return i_this->MoveBGExecute();
}
#pragma pop
/* 80D06484-80D0648C 0000C4 0008+00 1/0 0/0 0/0 .text daObjTable_IsDelete__FP12daObjTable_c */
static int daObjTable_IsDelete(daObjTable_c* i_this) {
@ -116,129 +58,158 @@ static int daObjTable_IsDelete(daObjTable_c* i_this) {
/* 80D0648C-80D064B0 0000CC 0024+00 1/0 0/0 0/0 .text daObjTable_Delete__FP12daObjTable_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObjTable_Delete(daObjTable_c* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Delete__FP12daObjTable_c.s"
static int daObjTable_Delete(daObjTable_c* i_this) {
i_this->MoveBGDelete();
return 1;
}
#pragma pop
/* 80D06C1C-80D06C20 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */
static char* l_arcName = "Table";
/* 80D06C20-80D06C40 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTable_Method */
SECTION_DATA static void* l_daObjTable_Method[8] = {
(void*)daObjTable_Create__FP10fopAc_ac_c,
(void*)daObjTable_Delete__FP12daObjTable_c,
(void*)daObjTable_Execute__FP12daObjTable_c,
(void*)daObjTable_IsDelete__FP12daObjTable_c,
(void*)daObjTable_Draw__FP12daObjTable_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 80D06C40-80D06C70 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Table */
SECTION_DATA extern void* g_profile_Obj_Table[12] = {
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
(void*)0x00B80000, (void*)&g_fpcLf_Method,
(void*)0x00000600, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02AB0000, (void*)&l_daObjTable_Method,
(void*)0x00040000, (void*)0x000E0000,
};
/* 80D06C70-80D06C98 000054 0028+00 1/1 0/0 0/0 .data __vt__12daObjTable_c */
SECTION_DATA extern void* __vt__12daObjTable_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__12daObjTable_cFv,
(void*)Create__12daObjTable_cFv,
(void*)Execute__12daObjTable_cFPPA3_A4_f,
(void*)Draw__12daObjTable_cFv,
(void*)Delete__12daObjTable_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 80D064B0-80D06560 0000F0 00B0+00 1/0 0/0 0/0 .text daObjTable_Create__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int daObjTable_Create(fopAc_ac_c* i_this) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/daObjTable_Create__FP10fopAc_ac_c.s"
static int daObjTable_Create(fopAc_ac_c* i_this) {
return static_cast<daObjTable_c*>(i_this)->create();
}
#pragma pop
/* 80D06560-80D065D0 0001A0 0070+00 1/0 0/0 0/0 .text CreateHeap__12daObjTable_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObjTable_c::CreateHeap() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/CreateHeap__12daObjTable_cFv.s"
}
#pragma pop
int daObjTable_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
/* ############################################################################################## */
/* 80D06C04-80D06C08 000000 0004+00 2/2 0/0 0/0 .rodata @4017 */
SECTION_RODATA static f32 const lit_4017 = 100.0f;
COMPILER_STRIP_GATE(0x80D06C04, &lit_4017);
if (mpModel == NULL) {
return false;
}
return true;
}
/* 80D065D0-80D0695C 000210 038C+00 1/0 0/0 0/0 .text Create__12daObjTable_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObjTable_c::Create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Create__12daObjTable_cFv.s"
}
#pragma pop
int daObjTable_c::Create() {
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
if (dKy_darkworld_check() || dComIfGs_isStageSwitch(0x18, 0x4b)) {
mpModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide();
mpModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide();
mpModel->getModelData()->getMaterialNodePointer(2)->getShape()->hide();
} else {
if (dComIfG_play_c::getLayerNo(0) == 4) {
if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) {
mpModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide();
}
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) &&
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) &&
!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267]))
{
mpModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide();
}
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) &&
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) &&
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267]) &&
!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268]))
{
mpModel->getModelData()->getMaterialNodePointer(2)->getShape()->hide();
}
} else {
mpModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide();
}
}
/* ############################################################################################## */
/* 80D06C0C-80D06C0C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80D06C12 = "TABLE_MAP";
#pragma pop
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[103]) &&
!(!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268]) &&
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[264])))
{
mpModel->getModelData()->getMaterialNodePointer(4)->getShape()->hide();
mAttentionInfo.mFlags = 0;
} else {
mAttentionInfo.mFlags = 0x2000000a;
mAttentionInfo.field_0x0[0] = dKy_darkworld_check() ? 218 : 98;
mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0];
mAttentionInfo.field_0x0[3] = mAttentionInfo.field_0x0[0];
}
mAttentionInfo.mPosition.set(current.pos.x, current.pos.y + 100.0f, current.pos.z);
mMsgFlow.init(this, getMessageNo(), 0, NULL);
dMsgObject_endFlowGroup();
initBaseMtx();
mEventID = -1;
return cPhs_COMPLEATE_e;
}
/* 80D0695C-80D06AD8 00059C 017C+00 1/0 0/0 0/0 .text Execute__12daObjTable_cFPPA3_A4_f
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObjTable_c::Execute(Mtx** i_mtx) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Execute__12daObjTable_cFPPA3_A4_f.s"
}
#pragma pop
int daObjTable_c::Execute(Mtx** i_mtx) {
mEvtInfo.i_onCondition(1);
/* ############################################################################################## */
/* 80D06C08-80D06C0C 000004 0004+00 1/1 0/0 0/0 .rodata @4077 */
SECTION_RODATA static f32 const lit_4077 = 500.0f;
COMPILER_STRIP_GATE(0x80D06C08, &lit_4077);
dComIfG_inf_c& gameInfo = g_dComIfG_gameInfo;
if (i_dComIfGp_event_runCheck()) {
if (mEvtInfo.checkCommandTalk()) {
if (mMsgFlow.doFlow(this, NULL, 0) != 0) {
gameInfo.getPlay().getEvent().reset(this); // Fake match?
mEvtInfo.setArchiveName("Table");
i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName());
mEventID = i_dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1);
fopAcM_orderChangeEventId(this, mEventID, 1, -1);
}
} else if (i_dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 &&
mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1 &&
i_dComIfGp_getEventManager().endCheck(mEventID))
{
mEventID = -1;
dMeter2Info_setPauseStatus(7);
}
} else {
mMsgFlow.init(this, getMessageNo(), 0, NULL);
dMsgObject_endFlowGroup();
}
*i_mtx = &mBgMtx;
return 1;
}
/* 80D06AD8-80D06BC8 000718 00F0+00 1/0 0/0 0/0 .text Draw__12daObjTable_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObjTable_c::Draw() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Draw__12daObjTable_cFv.s"
int daObjTable_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
cXyz v(current.pos.x, current.pos.y + 100.0f, current.pos.z);
mShadowKey =
dComIfGd_setRealShadow(mShadowKey, 1, mpModel, &v, 500.0f, current.pos.y, &mTevStr);
return 1;
}
#pragma pop
/* 80D06BC8-80D06BFC 000808 0034+00 1/0 0/0 0/0 .text Delete__12daObjTable_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daObjTable_c::Delete() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_table/d_a_obj_table/Delete__12daObjTable_cFv.s"
int daObjTable_c::Delete() {
dComIfG_resDelete(&mPhaseReq, l_arcName);
return 1;
}
#pragma pop
/* 80D06C20-80D06C40 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTable_Method */
static actor_method_class l_daObjTable_Method = {
(process_method_func)daObjTable_Create, (process_method_func)daObjTable_Delete,
(process_method_func)daObjTable_Execute, (process_method_func)daObjTable_IsDelete,
(process_method_func)daObjTable_Draw,
};
/* 80D06C40-80D06C70 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Table */
extern actor_process_profile_definition g_profile_Obj_Table = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
PROC_Obj_Table,
&g_fpcLf_Method.mBase,
sizeof(daObjTable_c),
0,
0,
&g_fopAc_Method.base,
0x02AB,
&l_daObjTable_Method,
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};