encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_item (#18)

Browse Source 
* item_funcs ok

* item_getcheck_func ok

* remove unnecessary asm file

* execItemGet / checkItemGet ok, add enums for readability

* fix return types
This commit is contained in:
TakaRikka
2020-12-05 23:30:55 -05:00
committed by GitHub
parent fb1217e3f9
commit 2fbecbc1da
227 changed files with 11251 additions and 11624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/cc/d_cc_s.s
+6 -6
View File
@@ -769,8 +769,8 @@ lbl_800869A0:
/* 800869A4 000838E4 7F 43 D3 78 */ mr r3, r26
/* 800869A8 000838E8 48 1D D0 A1 */ bl cCcD_Obj_NS_GetAc
/* 800869AC 000838EC 7C 65 1B 78 */ mr r5, r3
/* 800869B0 000838F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800869B4 000838F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800869B0 000838F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800869B4 000838F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800869B8 000838F8 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 800869BC 000838FC 38 80 00 02 */ li r4, 2
/* 800869C0 00083900 7F C6 F3 78 */ mr r6, r30
@@ -801,8 +801,8 @@ lbl_80086A0C:
/* 80086A10 00083950 7F 43 D3 78 */ mr r3, r26
/* 80086A14 00083954 48 1D D0 35 */ bl cCcD_Obj_NS_GetAc
/* 80086A18 00083958 7C 65 1B 78 */ mr r5, r3
/* 80086A1C 0008395C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80086A20 00083960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80086A1C 0008395C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80086A20 00083960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80086A24 00083964 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 80086A28 00083968 7F 64 DB 78 */ mr r4, r27
/* 80086A2C 0008396C 7F C6 F3 78 */ mr r6, r30
@@ -828,8 +828,8 @@ lbl_80086A44:
/* 80086A78 000839B8 7F 43 D3 78 */ mr r3, r26
/* 80086A7C 000839BC 48 1D CF CD */ bl cCcD_Obj_NS_GetAc
/* 80086A80 000839C0 7C 65 1B 78 */ mr r5, r3
/* 80086A84 000839C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80086A88 000839C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80086A84 000839C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80086A88 000839C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80086A8C 000839CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 80086A90 000839D0 88 9A 00 BA */ lbz r4, 0xba(r26)
/* 80086A94 000839D4 7F C6 F3 78 */ mr r6, r30
asm/d/cc/d_cc_uty.s
+8 -8
View File
@@ -16,8 +16,8 @@ lbl_800873C0:
.global cc_pl_cut_bit_get
cc_pl_cut_bit_get:
/* 800873D4 00084314 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800873D8 00084318 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800873D4 00084314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800873D8 00084318 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800873DC 0008431C 80 83 5D AC */ lwz r4, 0x5dac(r3)
/* 800873E0 00084320 38 60 00 00 */ li r3, 0
/* 800873E4 00084324 88 04 05 68 */ lbz r0, 0x568(r4)
@@ -660,8 +660,8 @@ lbl_80087BF0:
/* 80087C24 00084B64 48 2D A5 A9 */ bl func_803621CC
/* 80087C28 00084B68 7C 7B 1B 78 */ mr r27, r3
/* 80087C2C 00084B6C 7C 9C 23 78 */ mr r28, r4
/* 80087C30 00084B70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80087C34 00084B74 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80087C30 00084B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80087C34 00084B74 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80087C38 00084B78 83 DF 5D AC */ lwz r30, 0x5dac(r31)
/* 80087C3C 00084B7C 7F 83 E3 78 */ mr r3, r28
/* 80087C40 00084B80 4B FF FE 19 */ bl at_power_check
@@ -834,8 +834,8 @@ lbl_80087E9C:
/* 80087E9C 00084DDC 88 1C 00 20 */ lbz r0, 0x20(r28)
/* 80087EA0 00084DE0 28 00 00 01 */ cmplwi r0, 1
/* 80087EA4 00084DE4 40 82 00 78 */ bne lbl_80087F1C
/* 80087EA8 00084DE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80087EAC 00084DEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80087EA8 00084DE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80087EAC 00084DEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80087EB0 00084DF0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80087EB4 00084DF4 80 03 05 74 */ lwz r0, 0x574(r3)
/* 80087EB8 00084DF8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
@@ -847,8 +847,8 @@ lbl_80087E9C:
/* 80087ED0 00084E10 54 00 0C 3C */ rlwinm r0, r0, 1, 0x10, 0x1e
/* 80087ED4 00084E14 B0 1C 00 1C */ sth r0, 0x1c(r28)
lbl_80087ED8:
/* 80087ED8 00084E18 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80087EDC 00084E1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80087ED8 00084E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80087EDC 00084E1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80087EE0 00084E20 88 03 00 14 */ lbz r0, 0x14(r3)
/* 80087EE4 00084E24 28 00 00 3F */ cmplwi r0, 0x3f
/* 80087EE8 00084E28 40 82 00 14 */ bne lbl_80087EFC