mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-17 21:33:42 -04: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 20:30:55 -08: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/a/npc/d_a_npc_cd.s
+16 -16
View File
@@ -266,8 +266,8 @@ lbl_80156384:
/* 80156394 001532D4 7C 84 02 14 */ add r4, r4, r0
/* 80156398 001532D8 80 84 00 04 */ lwz r4, 4(r4)
lbl_8015639C:
/* 8015639C 001532DC 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801563A0 001532E0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 8015639C 001532DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801563A0 001532E0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801563A4 001532E4 3C A5 00 02 */ addis r5, r5, 2
/* 801563A8 001532E8 38 C0 00 80 */ li r6, 0x80
/* 801563AC 001532EC 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -892,8 +892,8 @@ lbl_80156CD4:
/* 80156D28 00153C68 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80156D2C 00153C6C 93 C1 00 08 */ stw r30, 8(r1)
/* 80156D30 00153C70 7C 7E 1B 78 */ mr r30, r3
/* 80156D34 00153C74 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80156D38 00153C78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80156D34 00153C74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80156D38 00153C78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80156D3C 00153C7C 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 80156D40 00153C80 7F E3 FB 78 */ mr r3, r31
/* 80156D44 00153C84 38 9E 07 24 */ addi r4, r30, 0x724
@@ -914,8 +914,8 @@ lbl_80156CD4:
/* 80156D80 00153CC0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80156D84 00153CC4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80156D88 00153CC8 7C 7F 1B 78 */ mr r31, r3
/* 80156D8C 00153CCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80156D90 00153CD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80156D8C 00153CCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80156D90 00153CD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80156D94 00153CD4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80156D98 00153CD8 38 9F 07 24 */ addi r4, r31, 0x724
/* 80156D9C 00153CDC 4B F1 E3 65 */ bl dBgS_NS_GetRoomId
@@ -1085,8 +1085,8 @@ lbl_80156FF0:
/* 8015700C 00153F4C 88 1F 09 E8 */ lbz r0, 0x9e8(r31)
/* 80157010 00153F50 28 00 00 00 */ cmplwi r0, 0
/* 80157014 00153F54 41 82 00 24 */ beq lbl_80157038
/* 80157018 00153F58 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015701C 00153F5C 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80157018 00153F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015701C 00153F5C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80157020 00153F60 80 04 5F 88 */ lwz r0, 0x5f88(r4)
/* 80157024 00153F64 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80157028 00153F68 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1099,8 +1099,8 @@ lbl_80157038:
/* 80157040 00153F80 88 1F 09 E8 */ lbz r0, 0x9e8(r31)
/* 80157044 00153F84 28 00 00 00 */ cmplwi r0, 0
/* 80157048 00153F88 41 82 00 24 */ beq lbl_8015706C
/* 8015704C 00153F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80157050 00153F90 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 8015704C 00153F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80157050 00153F90 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80157054 00153F94 80 04 5F 80 */ lwz r0, 0x5f80(r4)
/* 80157058 00153F98 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 8015705C 00153F9C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1376,8 +1376,8 @@ daNpcCd_c_NS_setHitodamaParticle:
/* 80157444 00154384 3B E0 00 00 */ li r31, 0
/* 80157448 00154388 3B A0 00 00 */ li r29, 0
/* 8015744C 0015438C 3B 80 00 00 */ li r28, 0
/* 80157450 00154390 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80157454 00154394 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l
/* 80157450 00154390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80157454 00154394 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l
lbl_80157458:
/* 80157458 00154398 80 7A 5D 3C */ lwz r3, 0x5d3c(r26)
/* 8015745C 0015439C 38 00 00 FF */ li r0, 0xff
@@ -1450,8 +1450,8 @@ daNpcCd_c_NS_getNpcMdlDataP:
lbl_80157558:
/* 80157558 00154498 80 65 00 00 */ lwz r3, 0(r5)
/* 8015755C 0015449C 80 85 00 04 */ lwz r4, 4(r5)
/* 80157560 001544A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80157564 001544A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80157560 001544A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80157564 001544A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80157568 001544A8 3C A5 00 02 */ addis r5, r5, 2
/* 8015756C 001544AC 38 C0 00 80 */ li r6, 0x80
/* 80157570 001544B0 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1482,8 +1482,8 @@ lbl_801575C0:
/* 801575C4 00154504 2C 04 00 00 */ cmpwi r4, 0
/* 801575C8 00154508 40 81 00 24 */ ble lbl_801575EC
/* 801575CC 0015450C 80 63 00 00 */ lwz r3, 0(r3)
/* 801575D0 00154510 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801575D4 00154514 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801575D0 00154510 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801575D4 00154514 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801575D8 00154518 3C A5 00 02 */ addis r5, r5, 2
/* 801575DC 0015451C 38 C0 00 80 */ li r6, 0x80
/* 801575E0 00154520 38 A5 C2 F8 */ addi r5, r5, -15624
asm/d/a/npc/d_a_npc_cd2.s
+24 -24
View File
@@ -225,8 +225,8 @@ lbl_80157FC8:
/* 80157FD0 00154F10 38 80 00 05 */ li r4, 5
lbl_80157FD4:
/* 80157FD4 00154F14 7F C3 F3 78 */ mr r3, r30
/* 80157FD8 00154F18 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80157FDC 00154F1C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80157FD8 00154F18 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80157FDC 00154F1C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80157FE0 00154F20 3C A5 00 02 */ addis r5, r5, 2
/* 80157FE4 00154F24 38 C0 00 80 */ li r6, 0x80
/* 80157FE8 00154F28 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -531,8 +531,8 @@ lbl_801583E4:
/* 801583EC 0015532C 38 60 00 00 */ li r3, 0
/* 801583F0 00155330 48 00 00 1C */ b lbl_8015840C
lbl_801583F4:
/* 801583F4 00155334 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801583F8 00155338 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801583F4 00155334 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801583F8 00155338 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801583FC 0015533C 3C A5 00 02 */ addis r5, r5, 2
/* 80158400 00155340 38 C0 00 80 */ li r6, 0x80
/* 80158404 00155344 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1162,8 +1162,8 @@ lbl_80158D40:
/* 80158D94 00155CD4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80158D98 00155CD8 93 C1 00 08 */ stw r30, 8(r1)
/* 80158D9C 00155CDC 7C 7E 1B 78 */ mr r30, r3
/* 80158DA0 00155CE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80158DA4 00155CE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80158DA0 00155CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80158DA4 00155CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80158DA8 00155CE8 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 80158DAC 00155CEC 7F E3 FB 78 */ mr r3, r31
/* 80158DB0 00155CF0 38 9E 07 28 */ addi r4, r30, 0x728
@@ -1184,8 +1184,8 @@ lbl_80158D40:
/* 80158DEC 00155D2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80158DF0 00155D30 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80158DF4 00155D34 7C 7F 1B 78 */ mr r31, r3
/* 80158DF8 00155D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80158DFC 00155D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80158DF8 00155D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80158DFC 00155D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80158E00 00155D40 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80158E04 00155D44 38 9F 07 28 */ addi r4, r31, 0x728
/* 80158E08 00155D48 4B F1 C2 F9 */ bl dBgS_NS_GetRoomId
@@ -1432,8 +1432,8 @@ lbl_80159178:
/* 80159194 001560D4 88 1F 0A C6 */ lbz r0, 0xac6(r31)
/* 80159198 001560D8 28 00 00 00 */ cmplwi r0, 0
/* 8015919C 001560DC 41 82 00 24 */ beq lbl_801591C0
/* 801591A0 001560E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801591A4 001560E4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 801591A0 001560E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801591A4 001560E4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 801591A8 001560E8 80 04 5F 88 */ lwz r0, 0x5f88(r4)
/* 801591AC 001560EC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 801591B0 001560F0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1467,8 +1467,8 @@ lbl_80159214:
/* 80159214 00156154 88 1F 0A C6 */ lbz r0, 0xac6(r31)
/* 80159218 00156158 28 00 00 00 */ cmplwi r0, 0
/* 8015921C 0015615C 41 82 00 24 */ beq lbl_80159240
/* 80159220 00156160 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80159224 00156164 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80159220 00156160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80159224 00156164 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80159228 00156168 80 04 5F 80 */ lwz r0, 0x5f80(r4)
/* 8015922C 0015616C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 80159230 00156170 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l
@@ -1748,8 +1748,8 @@ daNpcCd2_c_NS_setHitodamaParticle:
/* 80159628 00156568 3B E0 00 00 */ li r31, 0
/* 8015962C 0015656C 3B A0 00 00 */ li r29, 0
/* 80159630 00156570 3B 80 00 00 */ li r28, 0
/* 80159634 00156574 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80159638 00156578 3B 43 61 C0 */ addi r26, r3, lbl_804061C0@l
/* 80159634 00156574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80159638 00156578 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l
lbl_8015963C:
/* 8015963C 0015657C 80 7A 5D 3C */ lwz r3, 0x5d3c(r26)
/* 80159640 00156580 38 00 00 FF */ li r0, 0xff
@@ -1861,8 +1861,8 @@ lbl_801597A8:
/* 801597D0 00156710 7C 7F 1B 78 */ mr r31, r3
/* 801597D4 00156714 38 00 00 00 */ li r0, 0
/* 801597D8 00156718 90 0D 8A 84 */ stw r0, lbl_80451004-_SDA_BASE_(r13)
/* 801597DC 0015671C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801597E0 00156720 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801597DC 0015671C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801597E0 00156720 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801597E4 00156724 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 801597E8 00156728 4B EC 0F 29 */ bl fopAcM_searchActorAngleY
/* 801597EC 0015672C B0 6D 8A 8C */ sth r3, lbl_8045100C-_SDA_BASE_(r13)
@@ -1886,8 +1886,8 @@ lbl_801597A8:
/* 8015982C 0015676C 39 61 00 20 */ addi r11, r1, 0x20
/* 80159830 00156770 48 20 89 AD */ bl _savegpr_29
/* 80159834 00156774 7C 7D 1B 78 */ mr r29, r3
/* 80159838 00156778 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8015983C 0015677C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80159838 00156778 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015983C 0015677C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80159840 00156780 80 7F 5D AC */ lwz r3, 0x5dac(r31)
/* 80159844 00156784 C0 3D 04 D4 */ lfs f1, 0x4d4(r29)
/* 80159848 00156788 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
@@ -1952,8 +1952,8 @@ daNpcCd2_c_NS_getNpcMdlDataP:
lbl_8015991C:
/* 8015991C 0015685C 80 65 00 00 */ lwz r3, 0(r5)
/* 80159920 00156860 80 85 00 04 */ lwz r4, 4(r5)
/* 80159924 00156864 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159928 00156868 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159924 00156864 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159928 00156868 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015992C 0015686C 3C A5 00 02 */ addis r5, r5, 2
/* 80159930 00156870 38 C0 00 80 */ li r6, 0x80
/* 80159934 00156874 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1984,8 +1984,8 @@ lbl_80159984:
/* 80159988 001568C8 2C 04 00 00 */ cmpwi r4, 0
/* 8015998C 001568CC 40 81 00 24 */ ble lbl_801599B0
/* 80159990 001568D0 80 63 00 00 */ lwz r3, 0(r3)
/* 80159994 001568D4 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159998 001568D8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159994 001568D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159998 001568D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8015999C 001568DC 3C A5 00 02 */ addis r5, r5, 2
/* 801599A0 001568E0 38 C0 00 80 */ li r6, 0x80
/* 801599A4 001568E4 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -2018,8 +2018,8 @@ lbl_801599F8:
/* 801599FC 0015693C 2C 04 FF FF */ cmpwi r4, -1
/* 80159A00 00156940 41 82 00 24 */ beq lbl_80159A24
/* 80159A04 00156944 80 63 00 00 */ lwz r3, 0(r3)
/* 80159A08 00156948 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80159A0C 0015694C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80159A08 00156948 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80159A0C 0015694C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 80159A10 00156950 3C A5 00 02 */ addis r5, r5, 2
/* 80159A14 00156954 38 C0 00 80 */ li r6, 0x80
/* 80159A18 00156958 38 A5 C2 F8 */ addi r5, r5, -15624