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/Z2AudioLib | |
| 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/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s | 4 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s index d128015a86..a6e1d10964 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s @@ -214,8 +214,8 @@ lbl_802C4160: /* 802C4198 002C10D8 FF C0 08 90 */ fmr f30, f1 /* 802C419C 002C10DC 48 00 01 30 */ b lbl_802C42CC lbl_802C41A0: -/* 802C41A0 002C10E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802C41A4 002C10E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802C41A0 002C10E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802C41A4 002C10E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802C41A8 002C10E8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 802C41AC 002C10EC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802C41B0 002C10F0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index caedb6d864..3c403a7669 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -1146,15 +1146,15 @@ lbl_802B7B58: /* 802B7BA4 002B4AE4 38 C0 04 4C */ li r6, 0x44c /* 802B7BA8 002B4AE8 38 E0 05 DC */ li r7, 0x5dc /* 802B7BAC 002B4AEC 48 00 7D D5 */ bl Z2SoundObjMgr_NS_setForceBattleArea -/* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802B7BB0 002B4AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802B7BB4 002B4AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BB8 002B4AF8 38 80 00 2E */ li r4, 0x2e /* 802B7BBC 002B4AFC 38 A0 00 00 */ li r5, 0 /* 802B7BC0 002B4B00 4B D7 D7 A1 */ bl isSwitch__10dSv_info_cCFii /* 802B7BC4 002B4B04 2C 03 00 00 */ cmpwi r3, 0 /* 802B7BC8 002B4B08 41 82 00 3C */ beq lbl_802B7C04 -/* 802B7BCC 002B4B0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802B7BD0 002B4B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802B7BCC 002B4B0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802B7BD0 002B4B10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B7BD4 002B4B14 38 80 00 11 */ li r4, 0x11 /* 802B7BD8 002B4B18 38 A0 00 00 */ li r5, 0 /* 802B7BDC 002B4B1C 4B D7 D7 85 */ bl isSwitch__10dSv_info_cCFii |