diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2020-12-05 20:30:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 23:30:55 -0500 |
| commit | 2fbecbc1daca79c835ed235b074fa8997623ab84 (patch) | |
| tree | 658b34c4a3453fadf1e813ddcd767918897bd0ae /include/m_Do | |
| parent | fb1217e3f95c64dc5dcc096c246704f26803c2ac (diff) | |
d_item (#18)
* item_funcs ok
* item_getcheck_func ok
* remove unnecessary asm file
* execItemGet / checkItemGet ok, add enums for readability
* fix return types
Diffstat (limited to 'include/m_Do')
| -rw-r--r-- | include/m_Do/m_Do_main/asm/func_80005D4C.s | 4 | ||||
| -rw-r--r-- | include/m_Do/m_Do_main/asm/func_80006454.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/m_Do/m_Do_main/asm/func_80005D4C.s b/include/m_Do/m_Do_main/asm/func_80005D4C.s index d6c2a7cece..46268ebcbe 100644 --- a/include/m_Do/m_Do_main/asm/func_80005D4C.s +++ b/include/m_Do/m_Do_main/asm/func_80005D4C.s @@ -201,8 +201,8 @@ lbl_80006014: /* 8000602C 00002F6C 48 2C D1 ED */ bl JKRAramHeap_NS_dump lbl_80006030: /* 80006030 00002F70 48 25 C4 41 */ bl DynamicModuleControlBase_NS_dump -/* 80006034 00002F74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80006038 00002F78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80006034 00002F74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80006038 00002F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000603C 00002F7C 3C 63 00 02 */ addis r3, r3, 2 /* 80006040 00002F80 38 63 C2 F8 */ addi r3, r3, -15624 /* 80006044 00002F84 48 03 65 F5 */ bl dRes_control_c_NS_dump diff --git a/include/m_Do/m_Do_main/asm/func_80006454.s b/include/m_Do/m_Do_main/asm/func_80006454.s index 6d9751625a..8c188e8d07 100644 --- a/include/m_Do/m_Do_main/asm/func_80006454.s +++ b/include/m_Do/m_Do_main/asm/func_80006454.s @@ -49,8 +49,8 @@ lbl_800064A8: /* 8000650C 0000344C 80 6D 86 F8 */ lwz r3, lbl_80450C78-_SDA_BASE_(r13) /* 80006510 00003450 98 83 00 11 */ stb r4, 0x11(r3) lbl_80006514: -/* 80006514 00003454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80006518 00003458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80006514 00003454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80006518 00003458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000651C 0000345C 48 02 66 C9 */ bl dComIfG_inf_c_NS_ct /* 80006520 00003460 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13) /* 80006524 00003464 7C 00 07 75 */ extsb. r0, r0 |