mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-03 08:53:16 -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/d_map.s
+42 -42
View File
@@ -268,8 +268,8 @@ renderingAmap_c_NS_getDispType:
/* 800288C8 00025808 7C 08 02 A6 */ mflr r0
/* 800288CC 0002580C 90 01 00 14 */ stw r0, 0x14(r1)
/* 800288D0 00025810 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800288D4 00025814 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800288D8 00025818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800288D4 00025814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800288D8 00025818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800288DC 0002581C 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 800288E0 00025820 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 800288E4 00025824 7D 89 03 A6 */ mtctr r12
@@ -935,8 +935,8 @@ lbl_80029210:
/* 80029240 00026180 88 9B 00 00 */ lbz r4, 0(r27)
/* 80029244 00026184 28 04 00 FF */ cmplwi r4, 0xff
/* 80029248 00026188 41 82 04 88 */ beq lbl_800296D0
/* 8002924C 0002618C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029250 00026190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002924C 0002618C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029250 00026190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029254 00026194 38 63 09 58 */ addi r3, r3, 0x958
/* 80029258 00026198 48 00 B5 91 */ bl isTbox__12dSv_memBit_cCFi
/* 8002925C 0002619C 2C 03 00 00 */ cmpwi r3, 0
@@ -963,8 +963,8 @@ lbl_8002929C:
/* 800292A8 000261E8 28 04 00 FF */ cmplwi r4, 0xff
/* 800292AC 000261EC 41 82 00 24 */ beq lbl_800292D0
/* 800292B0 000261F0 41 82 04 20 */ beq lbl_800296D0
/* 800292B4 000261F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800292B8 000261F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800292B4 000261F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800292B8 000261F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800292BC 000261FC 88 BB 00 01 */ lbz r5, 1(r27)
/* 800292C0 00026200 7C A5 07 74 */ extsb r5, r5
/* 800292C4 00026204 48 00 C0 9D */ bl isSwitch__10dSv_info_cCFii
@@ -979,8 +979,8 @@ lbl_800292D0:
/* 800292E4 00026224 40 82 03 EC */ bne lbl_800296D0
/* 800292E8 00026228 56 E0 06 3F */ clrlwi. r0, r23, 0x18
/* 800292EC 0002622C 41 82 03 E4 */ beq lbl_800296D0
/* 800292F0 00026230 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800292F4 00026234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800292F0 00026230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800292F4 00026234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800292F8 00026238 38 63 09 58 */ addi r3, r3, 0x958
/* 800292FC 0002623C 88 9B 00 00 */ lbz r4, 0(r27)
/* 80029300 00026240 48 00 B4 E9 */ bl isTbox__12dSv_memBit_cCFi
@@ -996,8 +996,8 @@ lbl_800292D0:
/* 80029328 00026268 48 00 5A B9 */ bl dComIfGp_isLightDropMapVisible
/* 8002932C 0002626C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80029330 00026270 41 82 00 68 */ beq lbl_80029398
/* 80029334 00026274 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029338 00026278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029334 00026274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029338 00026278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002933C 0002627C 88 03 4E 0C */ lbz r0, 0x4e0c(r3)
/* 80029340 00026280 2C 00 00 02 */ cmpwi r0, 2
/* 80029344 00026284 40 82 00 50 */ bne lbl_80029394
@@ -1008,8 +1008,8 @@ lbl_800292D0:
/* 80029358 00026298 2C 03 00 35 */ cmpwi r3, 0x35
/* 8002935C 0002629C 40 82 00 30 */ bne lbl_8002938C
lbl_80029360:
/* 80029360 000262A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029364 000262A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029360 000262A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029364 000262A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029368 000262A8 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 8002936C 000262AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha
/* 80029370 000262B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l
@@ -1031,8 +1031,8 @@ lbl_80029398:
/* 800293A4 000262E4 88 9B 00 00 */ lbz r4, 0(r27)
/* 800293A8 000262E8 28 04 00 FF */ cmplwi r4, 0xff
/* 800293AC 000262EC 41 82 00 20 */ beq lbl_800293CC
/* 800293B0 000262F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800293B4 000262F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800293B0 000262F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800293B4 000262F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800293B8 000262F8 38 63 09 58 */ addi r3, r3, 0x958
/* 800293BC 000262FC 48 00 B4 2D */ bl isTbox__12dSv_memBit_cCFi
/* 800293C0 00026300 2C 03 00 00 */ cmpwi r3, 0
@@ -1074,8 +1074,8 @@ lbl_80029434:
/* 80029440 00026380 28 04 00 FF */ cmplwi r4, 0xff
/* 80029444 00026384 41 82 00 20 */ beq lbl_80029464
/* 80029448 00026388 41 82 02 88 */ beq lbl_800296D0
/* 8002944C 0002638C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029450 00026390 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002944C 0002638C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029450 00026390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029454 00026394 38 63 09 58 */ addi r3, r3, 0x958
/* 80029458 00026398 48 00 B3 91 */ bl isTbox__12dSv_memBit_cCFi
/* 8002945C 0002639C 2C 03 00 00 */ cmpwi r3, 0
@@ -1085,8 +1085,8 @@ lbl_80029464:
/* 80029468 000263A8 28 04 00 FF */ cmplwi r4, 0xff
/* 8002946C 000263AC 41 82 00 24 */ beq lbl_80029490
/* 80029470 000263B0 41 82 02 60 */ beq lbl_800296D0
/* 80029474 000263B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029478 000263B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029474 000263B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029478 000263B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002947C 000263BC 88 BB 00 01 */ lbz r5, 1(r27)
/* 80029480 000263C0 7C A5 07 74 */ extsb r5, r5
/* 80029484 000263C4 48 00 BE DD */ bl isSwitch__10dSv_info_cCFii
@@ -1105,16 +1105,16 @@ lbl_80029490:
/* 800294B4 000263F4 28 04 00 FF */ cmplwi r4, 0xff
/* 800294B8 000263F8 41 82 00 24 */ beq lbl_800294DC
/* 800294BC 000263FC 41 82 02 14 */ beq lbl_800296D0
/* 800294C0 00026400 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800294C4 00026404 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800294C0 00026400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800294C4 00026404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800294C8 00026408 88 BB 00 01 */ lbz r5, 1(r27)
/* 800294CC 0002640C 7C A5 07 74 */ extsb r5, r5
/* 800294D0 00026410 48 00 BE 91 */ bl isSwitch__10dSv_info_cCFii
/* 800294D4 00026414 2C 03 00 00 */ cmpwi r3, 0
/* 800294D8 00026418 41 82 01 F8 */ beq lbl_800296D0
lbl_800294DC:
/* 800294DC 0002641C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800294E0 00026420 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800294DC 0002641C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800294E0 00026420 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800294E4 00026424 38 63 09 58 */ addi r3, r3, 0x958
/* 800294E8 00026428 38 80 00 03 */ li r4, 3
/* 800294EC 0002642C 48 00 B4 49 */ bl isDungeonItem__12dSv_memBit_cCFi
@@ -1132,8 +1132,8 @@ lbl_800294DC:
/* 8002951C 0002645C 28 04 00 FF */ cmplwi r4, 0xff
/* 80029520 00026460 41 82 00 20 */ beq lbl_80029540
/* 80029524 00026464 41 82 01 AC */ beq lbl_800296D0
/* 80029528 00026468 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8002952C 0002646C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029528 00026468 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002952C 0002646C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029530 00026470 38 63 09 58 */ addi r3, r3, 0x958
/* 80029534 00026474 48 00 B2 B5 */ bl isTbox__12dSv_memBit_cCFi
/* 80029538 00026478 2C 03 00 00 */ cmpwi r3, 0
@@ -1148,8 +1148,8 @@ lbl_80029540:
/* 80029558 00026498 88 9B 00 00 */ lbz r4, 0(r27)
/* 8002955C 0002649C 28 04 00 FF */ cmplwi r4, 0xff
/* 80029560 000264A0 41 82 01 70 */ beq lbl_800296D0
/* 80029564 000264A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029568 000264A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029564 000264A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029568 000264A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002956C 000264AC 38 63 09 58 */ addi r3, r3, 0x958
/* 80029570 000264B0 48 00 B2 79 */ bl isTbox__12dSv_memBit_cCFi
/* 80029574 000264B4 2C 03 00 00 */ cmpwi r3, 0
@@ -1174,8 +1174,8 @@ lbl_80029540:
/* 800295C0 00026500 28 04 00 FF */ cmplwi r4, 0xff
/* 800295C4 00026504 41 82 00 20 */ beq lbl_800295E4
/* 800295C8 00026508 41 82 01 08 */ beq lbl_800296D0
/* 800295CC 0002650C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800295D0 00026510 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800295CC 0002650C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800295D0 00026510 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800295D4 00026514 38 63 09 58 */ addi r3, r3, 0x958
/* 800295D8 00026518 48 00 B2 11 */ bl isTbox__12dSv_memBit_cCFi
/* 800295DC 0002651C 2C 03 00 00 */ cmpwi r3, 0
@@ -1191,8 +1191,8 @@ lbl_800295E4:
/* 80029600 00026540 28 04 00 FF */ cmplwi r4, 0xff
/* 80029604 00026544 41 82 00 24 */ beq lbl_80029628
/* 80029608 00026548 41 82 00 C8 */ beq lbl_800296D0
/* 8002960C 0002654C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029610 00026550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002960C 0002654C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029610 00026550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029614 00026554 88 BB 00 01 */ lbz r5, 1(r27)
/* 80029618 00026558 7C A5 07 74 */ extsb r5, r5
/* 8002961C 0002655C 48 00 BD 45 */ bl isSwitch__10dSv_info_cCFii
@@ -1209,8 +1209,8 @@ lbl_80029628:
/* 80029644 00026584 28 04 00 FF */ cmplwi r4, 0xff
/* 80029648 00026588 41 82 00 20 */ beq lbl_80029668
/* 8002964C 0002658C 41 82 00 84 */ beq lbl_800296D0
/* 80029650 00026590 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029654 00026594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029650 00026590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029654 00026594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029658 00026598 38 63 09 58 */ addi r3, r3, 0x958
/* 8002965C 0002659C 48 00 B1 8D */ bl isTbox__12dSv_memBit_cCFi
/* 80029660 000265A0 2C 03 00 00 */ cmpwi r3, 0
@@ -1222,8 +1222,8 @@ lbl_80029668:
/* 80029674 000265B4 48 00 00 5C */ b lbl_800296D0
/* 80029678 000265B8 2C 19 00 01 */ cmpwi r25, 1
/* 8002967C 000265BC 40 82 00 54 */ bne lbl_800296D0
/* 80029680 000265C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029684 000265C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029680 000265C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029684 000265C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029688 000265C8 3B 23 09 58 */ addi r25, r3, 0x958
/* 8002968C 000265CC 7F 23 CB 78 */ mr r3, r25
/* 80029690 000265D0 38 80 00 03 */ li r4, 3
@@ -1417,8 +1417,8 @@ dMap_c:
/* 80029938 00026878 3C 60 80 38 */ lis r3, lbl_80378F24@ha
/* 8002993C 0002687C 38 63 8F 24 */ addi r3, r3, lbl_80378F24@l
/* 80029940 00026880 38 80 00 45 */ li r4, 0x45
/* 80029944 00026884 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 80029948 00026888 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80029944 00026884 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 80029948 00026888 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 8002994C 0002688C 3C A5 00 02 */ addis r5, r5, 2
/* 80029950 00026890 38 C0 00 80 */ li r6, 0x80
/* 80029954 00026894 38 A5 C2 F8 */ addi r5, r5, -15624
@@ -1824,8 +1824,8 @@ lbl_80029EB8:
/* 80029EFC 00026E3C 48 00 00 5C */ b lbl_80029F58
lbl_80029F00:
/* 80029F00 00026E40 C3 E2 82 E4 */ lfs f31, lbl_80451CE4-_SDA2_BASE_(r2)
/* 80029F04 00026E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80029F08 00026E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80029F04 00026E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80029F08 00026E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80029F0C 00026E4C 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 80029F10 00026E50 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 80029F14 00026E54 7D 89 03 A6 */ mtctr r12
@@ -2185,15 +2185,15 @@ lbl_8002A408:
/* 8002A40C 0002734C 4B FF ED 55 */ bl renderingAmap_c_NS_getStayType
/* 8002A410 00027350 2C 03 00 00 */ cmpwi r3, 0
/* 8002A414 00027354 40 82 00 AC */ bne lbl_8002A4C0
/* 8002A418 00027358 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8002A41C 0002735C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002A418 00027358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002A41C 0002735C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002A420 00027360 38 63 09 78 */ addi r3, r3, 0x978
/* 8002A424 00027364 38 80 00 32 */ li r4, 0x32
/* 8002A428 00027368 48 00 A7 C1 */ bl isSwitch__12dSv_danBit_cCFi
/* 8002A42C 0002736C 2C 03 00 00 */ cmpwi r3, 0
/* 8002A430 00027370 41 82 00 90 */ beq lbl_8002A4C0
/* 8002A434 00027374 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8002A438 00027378 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002A434 00027374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002A438 00027378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002A43C 0002737C 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 8002A440 00027380 3C 80 80 38 */ lis r4, lbl_80378F24@ha
/* 8002A444 00027384 38 84 8F 24 */ addi r4, r4, lbl_80378F24@l