summaryrefslogtreecommitdiff
path: root/asm/d/msg/d_msg_object
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-06-29 13:19:09 -0700
committerGitHub <noreply@github.com>2022-06-29 22:19:09 +0200
commit046d178003035ea87d3042a61917c2d482c68c74 (patch)
tree4240e760d8d40201ca4ec96634da8abff211f6bb /asm/d/msg/d_msg_object
parentcd5b02450cf278cbeb2c8bb90be1ad22518938c7 (diff)
work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress
Diffstat (limited to 'asm/d/msg/d_msg_object')
-rw-r--r--asm/d/msg/d_msg_object/changeFlowGroupLocal__12dMsgObject_cFl.s18
-rw-r--r--asm/d/msg/d_msg_object/demoMessageGroupLocal__12dMsgObject_cFv.s12
-rw-r--r--asm/d/msg/d_msg_object/endFlowGroupLocal__12dMsgObject_cFv.s4
-rw-r--r--asm/d/msg/d_msg_object/getItemEquipButton__12dMsgObject_cFv.s6
-rw-r--r--asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s12
-rw-r--r--asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s12
-rw-r--r--asm/d/msg/d_msg_object/isGetItemMessage__12dMsgObject_cFv.s6
-rw-r--r--asm/d/msg/d_msg_object/isHowlHearingMode__12dMsgObject_cFv.s12
-rw-r--r--asm/d/msg/d_msg_object/isHowlMessage__12dMsgObject_cFv.s6
-rw-r--r--asm/d/msg/d_msg_object/isKanbanMessage__12dMsgObject_cFv.s14
-rw-r--r--asm/d/msg/d_msg_object/readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s40
-rw-r--r--asm/d/msg/d_msg_object/setEquipBombInfo__12dMsgObject_cFv.s12
-rw-r--r--asm/d/msg/d_msg_object/setSelectCancelPos__12dMsgObject_cFUc.s6
13 files changed, 0 insertions, 160 deletions
diff --git a/asm/d/msg/d_msg_object/changeFlowGroupLocal__12dMsgObject_cFl.s b/asm/d/msg/d_msg_object/changeFlowGroupLocal__12dMsgObject_cFl.s
deleted file mode 100644
index 50533c792a..0000000000
--- a/asm/d/msg/d_msg_object/changeFlowGroupLocal__12dMsgObject_cFl.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_80236C90:
-/* 80236C90 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80236C94 7C 08 02 A6 */ mflr r0
-/* 80236C98 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80236C9C 38 00 00 01 */ li r0, 1
-/* 80236CA0 98 03 01 9C */ stb r0, 0x19c(r3)
-/* 80236CA4 38 00 0B B8 */ li r0, 0xbb8
-/* 80236CA8 6C 03 80 00 */ xoris r3, r0, 0x8000
-/* 80236CAC 38 04 F4 48 */ addi r0, r4, -3000
-/* 80236CB0 7C 00 18 14 */ addc r0, r0, r3
-/* 80236CB4 7C 60 01 10 */ subfe r3, r0, r0
-/* 80236CB8 A8 0D 8B 48 */ lha r0, s_groupID(r13)
-/* 80236CBC 7C 03 18 78 */ andc r3, r0, r3
-/* 80236CC0 48 00 14 05 */ bl changeGroup__12dMsgObject_cFs
-/* 80236CC4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80236CC8 7C 08 03 A6 */ mtlr r0
-/* 80236CCC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80236CD0 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/demoMessageGroupLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/demoMessageGroupLocal__12dMsgObject_cFv.s
deleted file mode 100644
index ac348abe13..0000000000
--- a/asm/d/msg/d_msg_object/demoMessageGroupLocal__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80236CD4:
-/* 80236CD4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80236CD8 7C 08 02 A6 */ mflr r0
-/* 80236CDC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80236CE0 38 00 00 00 */ li r0, 0
-/* 80236CE4 98 03 01 9C */ stb r0, 0x19c(r3)
-/* 80236CE8 38 60 00 00 */ li r3, 0
-/* 80236CEC 48 00 13 D9 */ bl changeGroup__12dMsgObject_cFs
-/* 80236CF0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80236CF4 7C 08 03 A6 */ mtlr r0
-/* 80236CF8 38 21 00 10 */ addi r1, r1, 0x10
-/* 80236CFC 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/endFlowGroupLocal__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/endFlowGroupLocal__12dMsgObject_cFv.s
deleted file mode 100644
index bb7338c096..0000000000
--- a/asm/d/msg/d_msg_object/endFlowGroupLocal__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_80236D00:
-/* 80236D00 38 00 00 00 */ li r0, 0
-/* 80236D04 98 03 01 9C */ stb r0, 0x19c(r3)
-/* 80236D08 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/getItemEquipButton__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getItemEquipButton__12dMsgObject_cFv.s
deleted file mode 100644
index 084d9c1dca..0000000000
--- a/asm/d/msg/d_msg_object/getItemEquipButton__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_80238638:
-/* 80238638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8023863C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80238640 80 63 5D BC */ lwz r3, 0x5dbc(r3)
-/* 80238644 88 63 01 A4 */ lbz r3, 0x1a4(r3)
-/* 80238648 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s
deleted file mode 100644
index 0eb164f000..0000000000
--- a/asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_802385B4:
-/* 802385B4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 802385B8 7C 08 02 A6 */ mflr r0
-/* 802385BC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 802385C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 802385C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 802385C8 80 63 5D BC */ lwz r3, 0x5dbc(r3)
-/* 802385CC 4B FF F0 71 */ bl getSelectBombBagIDLocal__12dMsgObject_cFv
-/* 802385D0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 802385D4 7C 08 03 A6 */ mtlr r0
-/* 802385D8 38 21 00 10 */ addi r1, r1, 0x10
-/* 802385DC 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s
deleted file mode 100644
index 02b2c561c6..0000000000
--- a/asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_802385E0:
-/* 802385E0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 802385E4 7C 08 02 A6 */ mflr r0
-/* 802385E8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 802385EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 802385F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 802385F4 80 63 5D BC */ lwz r3, 0x5dbc(r3)
-/* 802385F8 4B FF F0 95 */ bl getSelectBombPriceLocal__12dMsgObject_cFv
-/* 802385FC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80238600 7C 08 03 A6 */ mtlr r0
-/* 80238604 38 21 00 10 */ addi r1, r1, 0x10
-/* 80238608 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/isGetItemMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isGetItemMessage__12dMsgObject_cFv.s
deleted file mode 100644
index 916ee31429..0000000000
--- a/asm/d/msg/d_msg_object/isGetItemMessage__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_802370A8:
-/* 802370A8 88 03 01 9A */ lbz r0, 0x19a(r3)
-/* 802370AC 20 00 00 09 */ subfic r0, r0, 9
-/* 802370B0 7C 00 00 34 */ cntlzw r0, r0
-/* 802370B4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
-/* 802370B8 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/isHowlHearingMode__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isHowlHearingMode__12dMsgObject_cFv.s
deleted file mode 100644
index d661606901..0000000000
--- a/asm/d/msg/d_msg_object/isHowlHearingMode__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80238588:
-/* 80238588 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8023858C 7C 08 02 A6 */ mflr r0
-/* 80238590 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80238594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80238598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8023859C 80 63 5D BC */ lwz r3, 0x5dbc(r3)
-/* 802385A0 4B FF F3 35 */ bl isHowlHearingModeLocal__12dMsgObject_cFv
-/* 802385A4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 802385A8 7C 08 03 A6 */ mtlr r0
-/* 802385AC 38 21 00 10 */ addi r1, r1, 0x10
-/* 802385B0 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/isHowlMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isHowlMessage__12dMsgObject_cFv.s
deleted file mode 100644
index 88241dd0ee..0000000000
--- a/asm/d/msg/d_msg_object/isHowlMessage__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_802370E8:
-/* 802370E8 88 03 01 9A */ lbz r0, 0x19a(r3)
-/* 802370EC 20 00 00 11 */ subfic r0, r0, 0x11
-/* 802370F0 7C 00 00 34 */ cntlzw r0, r0
-/* 802370F4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
-/* 802370F8 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/isKanbanMessage__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/isKanbanMessage__12dMsgObject_cFv.s
deleted file mode 100644
index 7709f78a7d..0000000000
--- a/asm/d/msg/d_msg_object/isKanbanMessage__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_802370BC:
-/* 802370BC 88 03 01 9A */ lbz r0, 0x19a(r3)
-/* 802370C0 28 00 00 02 */ cmplwi r0, 2
-/* 802370C4 41 82 00 14 */ beq lbl_802370D8
-/* 802370C8 28 00 00 06 */ cmplwi r0, 6
-/* 802370CC 41 82 00 0C */ beq lbl_802370D8
-/* 802370D0 28 00 00 0F */ cmplwi r0, 0xf
-/* 802370D4 40 82 00 0C */ bne lbl_802370E0
-lbl_802370D8:
-/* 802370D8 38 60 00 01 */ li r3, 1
-/* 802370DC 4E 80 00 20 */ blr
-lbl_802370E0:
-/* 802370E0 38 60 00 00 */ li r3, 0
-/* 802370E4 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s b/asm/d/msg/d_msg_object/readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s
deleted file mode 100644
index 6a90e2a4b6..0000000000
--- a/asm/d/msg/d_msg_object/readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_80236BF8:
-/* 80236BF8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80236BFC 7C 08 02 A6 */ mflr r0
-/* 80236C00 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80236C04 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80236C08 93 C1 00 08 */ stw r30, 8(r1)
-/* 80236C0C 7C 9E 23 78 */ mr r30, r4
-/* 80236C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80236C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80236C18 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
-/* 80236C1C 81 8C 00 BC */ lwz r12, 0xbc(r12)
-/* 80236C20 7D 89 03 A6 */ mtctr r12
-/* 80236C24 4E 80 04 21 */ bctrl
-/* 80236C28 8B E3 00 28 */ lbz r31, 0x28(r3)
-/* 80236C2C 3C 60 80 43 */ lis r3, arcName@ha /* 0x8043069C@ha */
-/* 80236C30 38 63 06 9C */ addi r3, r3, arcName@l /* 0x8043069C@l */
-/* 80236C34 3C 80 80 3A */ lis r4, d_msg_d_msg_object__stringBase0@ha /* 0x80399660@ha */
-/* 80236C38 38 84 96 60 */ addi r4, r4, d_msg_d_msg_object__stringBase0@l /* 0x80399660@l */
-/* 80236C3C 38 84 00 6F */ addi r4, r4, 0x6f
-/* 80236C40 7F E5 FB 78 */ mr r5, r31
-/* 80236C44 4C C6 31 82 */ crclr 6
-/* 80236C48 48 12 F8 95 */ bl sprintf
-/* 80236C4C 3C 60 80 43 */ lis r3, arcName@ha /* 0x8043069C@ha */
-/* 80236C50 38 63 06 9C */ addi r3, r3, arcName@l /* 0x8043069C@l */
-/* 80236C54 38 80 00 00 */ li r4, 0
-/* 80236C58 38 A0 00 01 */ li r5, 1
-/* 80236C5C 38 C0 00 00 */ li r6, 0
-/* 80236C60 4B DD F5 81 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap
-/* 80236C64 90 7E 00 00 */ stw r3, 0(r30)
-/* 80236C68 2C 1F 00 63 */ cmpwi r31, 0x63
-/* 80236C6C 40 82 00 08 */ bne lbl_80236C74
-/* 80236C70 3B E0 00 09 */ li r31, 9
-lbl_80236C74:
-/* 80236C74 B3 ED 8B 48 */ sth r31, s_groupID(r13)
-/* 80236C78 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80236C7C 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80236C80 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80236C84 7C 08 03 A6 */ mtlr r0
-/* 80236C88 38 21 00 10 */ addi r1, r1, 0x10
-/* 80236C8C 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/setEquipBombInfo__12dMsgObject_cFv.s b/asm/d/msg/d_msg_object/setEquipBombInfo__12dMsgObject_cFv.s
deleted file mode 100644
index 6a02240cb8..0000000000
--- a/asm/d/msg/d_msg_object/setEquipBombInfo__12dMsgObject_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_8023860C:
-/* 8023860C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80238610 7C 08 02 A6 */ mflr r0
-/* 80238614 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80238618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8023861C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80238620 80 63 5D BC */ lwz r3, 0x5dbc(r3)
-/* 80238624 4B FF F1 19 */ bl setEquipBombInfoLocal__12dMsgObject_cFv
-/* 80238628 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8023862C 7C 08 03 A6 */ mtlr r0
-/* 80238630 38 21 00 10 */ addi r1, r1, 0x10
-/* 80238634 4E 80 00 20 */ blr
diff --git a/asm/d/msg/d_msg_object/setSelectCancelPos__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSelectCancelPos__12dMsgObject_cFUc.s
deleted file mode 100644
index a95456d820..0000000000
--- a/asm/d/msg/d_msg_object/setSelectCancelPos__12dMsgObject_cFUc.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_8023864C:
-/* 8023864C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80238650 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80238654 80 84 5D BC */ lwz r4, 0x5dbc(r4)
-/* 80238658 98 64 01 A1 */ stb r3, 0x1a1(r4)
-/* 8023865C 4E 80 00 20 */ blr