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/ovlp/d_ovlp_fade.s
+2 -2
View File
@@ -133,8 +133,8 @@ dOvlpFd_FadeIn:
/* 80252334 0024F274 2C 03 00 04 */ cmpwi r3, 4
/* 80252338 0024F278 40 82 00 60 */ bne lbl_80252398
lbl_8025233C:
/* 8025233C 0024F27C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252340 0024F280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025233C 0024F27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252340 0024F280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252344 0024F284 88 03 4E 1C */ lbz r0, 0x4e1c(r3)
/* 80252348 0024F288 2C 00 00 01 */ cmpwi r0, 1
/* 8025234C 0024F28C 40 82 00 08 */ bne lbl_80252354
asm/d/ovlp/d_ovlp_fade2.s
+20 -20
View File
@@ -303,8 +303,8 @@
/* 80252920 0024F860 B0 05 80 00 */ sth r0, -0x8000(r5)
/* 80252924 0024F864 98 85 80 00 */ stb r4, -0x8000(r5)
/* 80252928 0024F868 98 65 80 00 */ stb r3, -0x8000(r5)
/* 8025292C 0024F86C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252930 0024F870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025292C 0024F86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252930 0024F870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252934 0024F874 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80252938 0024F878 C0 02 B4 24 */ lfs f0, lbl_80454E24-_SDA2_BASE_(r2)
/* 8025293C 0024F87C D0 01 00 14 */ stfs f0, 0x14(r1)
@@ -350,8 +350,8 @@ dOvlpFd2_c:
/* 802529D0 0024F910 80 05 00 08 */ lwz r0, 8(r5)
/* 802529D4 0024F914 90 03 00 D4 */ stw r0, 0xd4(r3)
/* 802529D8 0024F918 38 00 00 00 */ li r0, 0
/* 802529DC 0024F91C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 802529E0 0024F920 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 802529DC 0024F91C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 802529E0 0024F920 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 802529E4 0024F924 98 04 5E B8 */ stb r0, 0x5eb8(r4)
/* 802529E8 0024F928 38 00 00 02 */ li r0, 2
/* 802529EC 0024F92C 98 03 01 1D */ stb r0, 0x11d(r3)
@@ -382,8 +382,8 @@ dOvlpFd2_c:
/* 80252A50 0024F990 98 1F 01 1D */ stb r0, 0x11d(r31)
lbl_80252A54:
/* 80252A54 0024F994 38 00 00 00 */ li r0, 0
/* 80252A58 0024F998 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252A5C 0024F99C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252A58 0024F998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252A5C 0024F99C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252A60 0024F9A0 98 03 5D 44 */ stb r0, 0x5d44(r3)
lbl_80252A64:
/* 80252A64 0024F9A4 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -397,8 +397,8 @@ lbl_80252A64:
/* 80252A84 0024F9C4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80252A88 0024F9C8 7C 7F 1B 78 */ mr r31, r3
/* 80252A8C 0024F9CC 38 00 00 00 */ li r0, 0
/* 80252A90 0024F9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252A94 0024F9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252A90 0024F9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252A94 0024F9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252A98 0024F9D8 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 80252A9C 0024F9DC 38 7F 01 12 */ addi r3, r31, 0x112
/* 80252AA0 0024F9E0 38 80 07 D0 */ li r4, 0x7d0
@@ -502,8 +502,8 @@ lbl_80252B8C:
/* 80252C18 0024FB58 38 80 00 00 */ li r4, 0
/* 80252C1C 0024FB5C 98 9F 01 1C */ stb r4, 0x11c(r31)
/* 80252C20 0024FB60 38 00 00 01 */ li r0, 1
/* 80252C24 0024FB64 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252C28 0024FB68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252C24 0024FB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252C28 0024FB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252C2C 0024FB6C 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 80252C30 0024FB70 98 83 5E B8 */ stb r4, 0x5eb8(r3)
/* 80252C34 0024FB74 3C 60 80 3C */ lis r3, lbl_803C2D14@ha
@@ -547,15 +547,15 @@ lbl_80252CC4:
/* 80252CC4 0024FC04 7F E3 FB 78 */ mr r3, r31
/* 80252CC8 0024FC08 4B DC B8 55 */ bl fopOvlpM_Done
/* 80252CCC 0024FC0C 38 00 00 01 */ li r0, 1
/* 80252CD0 0024FC10 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252CD4 0024FC14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252CD0 0024FC10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252CD4 0024FC14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252CD8 0024FC18 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 80252CDC 0024FC1C 98 03 5E B8 */ stb r0, 0x5eb8(r3)
/* 80252CE0 0024FC20 48 00 00 18 */ b lbl_80252CF8
lbl_80252CE4:
/* 80252CE4 0024FC24 38 00 00 00 */ li r0, 0
/* 80252CE8 0024FC28 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252CEC 0024FC2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252CE8 0024FC28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252CEC 0024FC2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252CF0 0024FC30 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 80252CF4 0024FC34 4B DC B7 91 */ bl fopOvlpM_SceneIsStop
lbl_80252CF8:
@@ -572,8 +572,8 @@ lbl_80252CF8:
/* 80252D20 0024FC60 88 03 01 1C */ lbz r0, 0x11c(r3)
/* 80252D24 0024FC64 28 00 00 00 */ cmplwi r0, 0
/* 80252D28 0024FC68 40 82 00 2C */ bne lbl_80252D54
/* 80252D2C 0024FC6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252D30 0024FC70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252D2C 0024FC6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252D30 0024FC70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252D34 0024FC74 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 80252D38 0024FC78 38 83 02 3C */ addi r4, r3, 0x23c
/* 80252D3C 0024FC7C 38 A3 02 40 */ addi r5, r3, 0x240
@@ -583,8 +583,8 @@ lbl_80252CF8:
/* 80252D4C 0024FC8C 98 1F 01 1C */ stb r0, 0x11c(r31)
/* 80252D50 0024FC90 48 00 00 98 */ b lbl_80252DE8
lbl_80252D54:
/* 80252D54 0024FC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252D58 0024FC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252D54 0024FC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252D58 0024FC98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252D5C 0024FC9C 88 03 5D 44 */ lbz r0, 0x5d44(r3)
/* 80252D60 0024FCA0 2C 00 00 00 */ cmpwi r0, 0
/* 80252D64 0024FCA4 40 82 00 84 */ bne lbl_80252DE8
@@ -613,8 +613,8 @@ lbl_80252D54:
/* 80252DC0 0024FD00 3C 60 80 3E */ lis r3, lbl_803DD470@ha
/* 80252DC4 0024FD04 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l
/* 80252DC8 0024FD08 48 0F 36 E9 */ bl PSMTXCopy
/* 80252DCC 0024FD0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80252DD0 0024FD10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80252DCC 0024FD0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80252DD0 0024FD10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80252DD4 0024FD14 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 80252DD8 0024FD18 38 83 02 3C */ addi r4, r3, 0x23c
/* 80252DDC 0024FD1C 38 A3 02 40 */ addi r5, r3, 0x240
asm/d/ovlp/d_ovlp_fade3.s
+18 -18
View File
@@ -324,8 +324,8 @@
/* 802533CC 0025030C B0 05 80 00 */ sth r0, -0x8000(r5)
/* 802533D0 00250310 98 85 80 00 */ stb r4, -0x8000(r5)
/* 802533D4 00250314 98 65 80 00 */ stb r3, -0x8000(r5)
/* 802533D8 00250318 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802533DC 0025031C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802533D8 00250318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802533DC 0025031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802533E0 00250320 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 802533E4 00250324 C0 02 B4 5C */ lfs f0, lbl_80454E5C-_SDA2_BASE_(r2)
/* 802533E8 00250328 D0 01 00 14 */ stfs f0, 0x14(r1)
@@ -376,8 +376,8 @@ dOvlpFd3_c:
/* 80253490 002503D0 80 04 00 08 */ lwz r0, 8(r4)
/* 80253494 002503D4 90 1F 00 D4 */ stw r0, 0xd4(r31)
/* 80253498 002503D8 38 00 00 00 */ li r0, 0
/* 8025349C 002503DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802534A0 002503E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025349C 002503DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802534A0 002503E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802534A4 002503E4 98 03 5E B8 */ stb r0, 0x5eb8(r3)
/* 802534A8 002503E8 38 00 00 02 */ li r0, 2
/* 802534AC 002503EC 98 1F 01 1D */ stb r0, 0x11d(r31)
@@ -439,8 +439,8 @@ lbl_80253500:
/* 80253584 002504C4 98 1F 01 1D */ stb r0, 0x11d(r31)
lbl_80253588:
/* 80253588 002504C8 38 00 00 00 */ li r0, 0
/* 8025358C 002504CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80253590 002504D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025358C 002504CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80253590 002504D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80253594 002504D4 98 03 5D 44 */ stb r0, 0x5d44(r3)
lbl_80253598:
/* 80253598 002504D8 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -454,8 +454,8 @@ lbl_80253598:
/* 802535B8 002504F8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802535BC 002504FC 7C 7F 1B 78 */ mr r31, r3
/* 802535C0 00250500 38 00 00 00 */ li r0, 0
/* 802535C4 00250504 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 802535C8 00250508 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 802535C4 00250504 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 802535C8 00250508 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 802535CC 0025050C 98 04 5D 44 */ stb r0, 0x5d44(r4)
/* 802535D0 00250510 88 03 01 1D */ lbz r0, 0x11d(r3)
/* 802535D4 00250514 7C 00 07 75 */ extsb. r0, r0
@@ -533,8 +533,8 @@ lbl_80253678:
/* 802536E4 00250624 7C 03 02 14 */ add r0, r3, r0
/* 802536E8 00250628 B0 1F 01 10 */ sth r0, 0x110(r31)
/* 802536EC 0025062C 38 00 00 01 */ li r0, 1
/* 802536F0 00250630 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802536F4 00250634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802536F0 00250630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802536F4 00250634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802536F8 00250638 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 802536FC 0025063C 3C 60 80 3C */ lis r3, lbl_803C2D94@ha
/* 80253700 00250640 38 83 2D 94 */ addi r4, r3, lbl_803C2D94@l
@@ -573,8 +573,8 @@ lbl_8025377C:
/* 8025377C 002506BC 7F E3 FB 78 */ mr r3, r31
/* 80253780 002506C0 4B DC AD 9D */ bl fopOvlpM_Done
/* 80253784 002506C4 38 00 00 01 */ li r0, 1
/* 80253788 002506C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8025378C 002506CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80253788 002506C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8025378C 002506CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80253790 002506D0 98 03 5D 44 */ stb r0, 0x5d44(r3)
/* 80253794 002506D4 98 03 5E B8 */ stb r0, 0x5eb8(r3)
lbl_80253798:
@@ -594,8 +594,8 @@ lbl_80253798:
/* 802537CC 0025070C 88 1F 01 1C */ lbz r0, 0x11c(r31)
/* 802537D0 00250710 28 00 00 00 */ cmplwi r0, 0
/* 802537D4 00250714 40 82 00 2C */ bne lbl_80253800
/* 802537D8 00250718 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802537DC 0025071C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802537D8 00250718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802537DC 0025071C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802537E0 00250720 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 802537E4 00250724 38 83 02 3C */ addi r4, r3, 0x23c
/* 802537E8 00250728 38 A3 02 40 */ addi r5, r3, 0x240
@@ -605,8 +605,8 @@ lbl_80253798:
/* 802537F8 00250738 98 1F 01 1C */ stb r0, 0x11c(r31)
/* 802537FC 0025073C 48 00 00 6C */ b lbl_80253868
lbl_80253800:
/* 80253800 00250740 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80253804 00250744 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80253800 00250740 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80253804 00250744 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80253808 00250748 88 03 5D 44 */ lbz r0, 0x5d44(r3)
/* 8025380C 0025074C 2C 00 00 00 */ cmpwi r0, 0
/* 80253810 00250750 40 82 00 58 */ bne lbl_80253868
@@ -624,8 +624,8 @@ lbl_80253800:
/* 80253840 00250780 3C 60 80 3E */ lis r3, lbl_803DD470@ha
/* 80253844 00250784 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l
/* 80253848 00250788 48 0F 2C 69 */ bl PSMTXCopy
/* 8025384C 0025078C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80253850 00250790 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025384C 0025078C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80253850 00250790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80253854 00250794 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 80253858 00250798 38 83 02 3C */ addi r4, r3, 0x23c
/* 8025385C 0025079C 38 A3 02 40 */ addi r5, r3, 0x240