mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -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
include/d/d_save/d_save/asm/func_80032AF8.s
+2 -2
View File
@@ -3,8 +3,8 @@
/* 80032B00 0002FA40 90 01 00 14 */ stw r0, 0x14(r1)
/* 80032B04 0002FA44 54 84 06 3F */ clrlwi. r4, r4, 0x18
/* 80032B08 0002FA48 40 82 00 1C */ bne lbl_80032B24
/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304
/* 80032B1C 0002FA5C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs
include/d/d_save/d_save/asm/func_80032FB8.s
+2 -2
View File
@@ -10,8 +10,8 @@
/* 80032FDC 0002FF1C 48 00 03 1D */ bl setLineUpItem__17dSv_player_item_cFv
lbl_80032FE0:
/* 80032FE0 0002FF20 3B C0 00 00 */ li r30, 0
/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
lbl_80032FEC:
/* 80032FEC 0002FF2C 7F E3 FB 78 */ mr r3, r31
/* 80032FF0 0002FF30 7F C4 F3 78 */ mr r4, r30
include/d/d_save/d_save/asm/func_80033030.s
+6 -6
View File
@@ -10,8 +10,8 @@
/* 80033054 0002FF94 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 80033058 0002FF98 41 82 02 7C */ beq lbl_800332D4
/* 8003305C 0002FF9C 3B C0 00 00 */ li r30, 0
/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
lbl_80033068:
/* 80033068 0002FFA8 7F E3 FB 78 */ mr r3, r31
/* 8003306C 0002FFAC 7F C4 F3 78 */ mr r4, r30
@@ -30,8 +30,8 @@ lbl_80033094:
/* 8003309C 0002FFDC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 800330A0 0002FFE0 28 00 00 FF */ cmplwi r0, 0xff
/* 800330A4 0002FFE4 41 82 02 24 */ beq lbl_800332C8
/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800330B0 0002FFF0 7F C4 F3 78 */ mr r4, r30
/* 800330B4 0002FFF4 4B FF F9 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 800330B8 0002FFF8 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -162,8 +162,8 @@ lbl_80033254:
lbl_8003325C:
/* 8003325C 0003019C 2C 1E 00 03 */ cmpwi r30, 3
/* 80033260 000301A0 40 82 00 4C */ bne lbl_800332AC
/* 80033264 000301A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033264 000301A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8003326C 000301AC 7F C4 F3 78 */ mr r4, r30
/* 80033270 000301B0 4B FF F7 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 80033274 000301B4 54 60 06 3F */ clrlwi. r0, r3, 0x18
include/d/d_save/d_save/asm/func_80033370.s
+2 -2
View File
@@ -33,8 +33,8 @@ lbl_800333B4:
/* 800333EC 0003032C 48 1E A8 D9 */ bl dMeter2Info_c_NS_setHotSpringTimer
lbl_800333F0:
/* 800333F0 00030330 3B A0 00 00 */ li r29, 0
/* 800333F4 00030334 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 800333F4 00030334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 800333FC 0003033C 3B FF 00 0B */ addi r31, r31, 0xb
lbl_80033400:
/* 80033400 00030340 7F C3 F3 78 */ mr r3, r30
include/d/d_save/d_save/asm/func_80033494.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 800334A0 000303E0 39 61 00 20 */ addi r11, r1, 0x20
/* 800334A4 000303E4 48 32 ED 39 */ bl _savegpr_29
/* 800334A8 000303E8 3B A0 00 00 */ li r29, 0
/* 800334AC 000303EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800334AC 000303EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800334B4 000303F4 3B E3 00 9C */ addi r31, r3, 0x9c
lbl_800334B8:
/* 800334B8 000303F8 7F E3 FB 78 */ mr r3, r31
include/d/d_save/d_save/asm/func_80033514.s
+2 -2
View File
@@ -5,8 +5,8 @@
/* 80033524 00030464 48 32 EC B5 */ bl _savegpr_28
/* 80033528 00030468 7C 9C 23 78 */ mr r28, r4
/* 8003352C 0003046C 3B A0 00 00 */ li r29, 0
/* 80033530 00030470 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033530 00030470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033538 00030478 3B E3 00 9C */ addi r31, r3, 0x9c
lbl_8003353C:
/* 8003353C 0003047C 7F E3 FB 78 */ mr r3, r31
include/d/d_save/d_save/asm/func_80033598.s
+16 -16
View File
@@ -9,16 +9,16 @@
/* 800335B8 000304F8 7F C3 F3 78 */ mr r3, r30
/* 800335BC 000304FC 4B FF F3 5D */ bl dSv_item_rename__FUc
/* 800335C0 00030500 7C 7E 1B 78 */ mr r30, r3
/* 800335C4 00030504 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800335C4 00030504 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800335CC 0003050C 57 FF 06 3E */ clrlwi r31, r31, 0x18
/* 800335D0 00030510 7F E4 FB 78 */ mr r4, r31
/* 800335D4 00030514 4B FF F4 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 800335D8 00030518 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 800335DC 0003051C 28 00 00 0B */ cmplwi r0, 0xb
/* 800335E0 00030520 41 80 00 C4 */ blt lbl_800336A4
/* 800335E4 00030524 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800335E4 00030524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800335EC 0003052C 7F E4 FB 78 */ mr r4, r31
/* 800335F0 00030530 4B FF F4 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 800335F4 00030534 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -27,8 +27,8 @@
/* 80033600 00030540 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80033604 00030544 28 00 00 6B */ cmplwi r0, 0x6b
/* 80033608 00030548 40 82 00 24 */ bne lbl_8003362C
/* 8003360C 0003054C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003360C 0003054C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033614 00030554 7F E4 FB 78 */ mr r4, r31
/* 80033618 00030558 4B FF F4 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3
@@ -36,8 +36,8 @@
/* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80033628 00030568 48 1E A6 9D */ bl dMeter2Info_c_NS_setHotSpringTimer
lbl_8003362C:
/* 8003362C 0003056C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003362C 0003056C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033634 00030574 7F E4 FB 78 */ mr r4, r31
/* 80033638 00030578 4B FF F4 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 8003363C 0003057C 7C 60 1B 78 */ mr r0, r3
@@ -45,23 +45,23 @@ lbl_8003362C:
/* 80033644 00030584 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033648 00030588 7F C5 F3 78 */ mr r5, r30
/* 8003364C 0003058C 4B FF F9 6D */ bl setItem__17dSv_player_item_cFiUc
/* 80033650 00030590 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033650 00030590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033658 00030598 7F E4 FB 78 */ mr r4, r31
/* 8003365C 0003059C 4B FF F4 01 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 80033660 000305A0 7C 60 1B 78 */ mr r0, r3
/* 80033664 000305A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033664 000305A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8003366C 000305AC 38 63 00 9C */ addi r3, r3, 0x9c
/* 80033670 000305B0 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033674 000305B4 7F C5 F3 78 */ mr r5, r30
/* 80033678 000305B8 4B FF F9 41 */ bl setItem__17dSv_player_item_cFiUc
/* 8003367C 000305BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003367C 000305BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033684 000305C4 7F E4 FB 78 */ mr r4, r31
/* 80033688 000305C8 4B FF F3 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 8003368C 000305CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8003368C 000305CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 80033694 000305D4 98 64 5E 7D */ stb r3, 0x5e7d(r4)
/* 80033698 000305D8 9B C4 5E 7E */ stb r30, 0x5e7e(r4)
/* 8003369C 000305DC 7F E3 FB 78 */ mr r3, r31
include/d/d_save/d_save/asm/func_80033754.s
+2 -2
View File
@@ -5,8 +5,8 @@
/* 80033764 000306A4 48 32 EA 71 */ bl _savegpr_27
/* 80033768 000306A8 3B 60 00 00 */ li r27, 0
/* 8003376C 000306AC 3B E0 00 00 */ li r31, 0
/* 80033770 000306B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033770 000306B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc
/* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0
/* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha
include/d/d_save/d_save/asm/func_80033828.s
+6 -6
View File
@@ -22,21 +22,21 @@ lbl_80033854:
/* 80033878 000307B8 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 8003387C 000307BC 28 00 00 50 */ cmplwi r0, 0x50
/* 80033880 000307C0 41 82 00 30 */ beq lbl_800338B0
/* 80033884 000307C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033884 000307C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8003388C 000307CC 38 63 00 F8 */ addi r3, r3, 0xf8
/* 80033890 000307D0 7F C4 F3 78 */ mr r4, r30
/* 80033894 000307D4 48 00 08 65 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033898 000307D8 7C 65 1B 78 */ mr r5, r3
/* 8003389C 000307DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003389C 000307DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec
/* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 800338AC 000307EC 48 00 06 C1 */ bl setBombNum__24dSv_player_item_record_cFUcUc
lbl_800338B0:
/* 800338B0 000307F0 3B A0 00 00 */ li r29, 0
/* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 800338B4 000307F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 800338BC 000307FC 3B FF 00 0F */ addi r31, r31, 0xf
lbl_800338C0:
/* 800338C0 00030800 7F C3 F3 78 */ mr r3, r30
include/d/d_save/d_save/asm/func_80033910.s
+6 -6
View File
@@ -23,8 +23,8 @@ lbl_80033940:
/* 80033964 000308A4 57 60 06 3E */ clrlwi r0, r27, 0x18
/* 80033968 000308A8 28 00 00 50 */ cmplwi r0, 0x50
/* 8003396C 000308AC 41 82 00 54 */ beq lbl_800339C0
/* 80033970 000308B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033974 000308B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033970 000308B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033974 000308B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033978 000308B8 3B C3 00 F8 */ addi r30, r3, 0xf8
/* 8003397C 000308BC 7F C3 F3 78 */ mr r3, r30
/* 80033980 000308C0 7F 64 DB 78 */ mr r4, r27
@@ -38,16 +38,16 @@ lbl_80033940:
/* 800339A0 000308E0 48 00 07 59 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 800339A4 000308E4 7C 7C 1B 78 */ mr r28, r3
lbl_800339A8:
/* 800339A8 000308E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800339AC 000308EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800339A8 000308E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800339AC 000308EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800339B0 000308F0 38 63 00 EC */ addi r3, r3, 0xec
/* 800339B4 000308F4 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 800339B8 000308F8 7F 85 E3 78 */ mr r5, r28
/* 800339BC 000308FC 48 00 05 B1 */ bl setBombNum__24dSv_player_item_record_cFUcUc
lbl_800339C0:
/* 800339C0 00030900 3B A0 00 00 */ li r29, 0
/* 800339C4 00030904 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800339C8 00030908 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 800339C4 00030904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800339C8 00030908 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 800339CC 0003090C 3B FF 00 0F */ addi r31, r31, 0xf
lbl_800339D0:
/* 800339D0 00030910 7F C3 F3 78 */ mr r3, r30
include/d/d_save/d_save/asm/func_80033A88.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 80033A94 000309D4 39 61 00 20 */ addi r11, r1, 0x20
/* 80033A98 000309D8 48 32 E7 45 */ bl _savegpr_29
/* 80033A9C 000309DC 3B A0 00 00 */ li r29, 0
/* 80033AA0 000309E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033AA4 000309E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033AA0 000309E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033AA4 000309E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033AA8 000309E8 3B E3 00 9C */ addi r31, r3, 0x9c
lbl_80033AAC:
/* 80033AAC 000309EC 7F E3 FB 78 */ mr r3, r31
include/d/d_save/d_save/asm/func_80033B08.s
+6 -6
View File
@@ -6,8 +6,8 @@
/* 80033B1C 00030A5C 7C 9B 23 78 */ mr r27, r4
/* 80033B20 00030A60 7C BE 2B 78 */ mr r30, r5
/* 80033B24 00030A64 3B E0 00 00 */ li r31, 0
/* 80033B28 00030A68 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033B2C 00030A6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033B28 00030A68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033B2C 00030A6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033B30 00030A70 3B A3 00 9C */ addi r29, r3, 0x9c
lbl_80033B34:
/* 80033B34 00030A74 7F A3 EB 78 */ mr r3, r29
@@ -26,8 +26,8 @@ lbl_80033B34:
/* 80033B68 00030AA8 57 60 06 3E */ clrlwi r0, r27, 0x18
/* 80033B6C 00030AAC 28 00 00 50 */ cmplwi r0, 0x50
/* 80033B70 00030AB0 41 82 00 64 */ beq lbl_80033BD4
/* 80033B74 00030AB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033B78 00030AB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033B74 00030AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033B78 00030AB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033B7C 00030ABC 3B 83 00 F8 */ addi r28, r3, 0xf8
/* 80033B80 00030AC0 7F 83 E3 78 */ mr r3, r28
/* 80033B84 00030AC4 7F 64 DB 78 */ mr r4, r27
@@ -41,8 +41,8 @@ lbl_80033B34:
/* 80033BA4 00030AE4 48 00 05 55 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033BA8 00030AE8 7C 7E 1B 78 */ mr r30, r3
lbl_80033BAC:
/* 80033BAC 00030AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033BB0 00030AF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033BAC 00030AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033BB0 00030AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033BB4 00030AF4 38 63 00 EC */ addi r3, r3, 0xec
/* 80033BB8 00030AF8 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 80033BBC 00030AFC 7F C5 F3 78 */ mr r5, r30
include/d/d_save/d_save/asm/func_80033C2C.s
+4 -4
View File
@@ -4,15 +4,15 @@
/* 80033C38 00030B78 39 61 00 20 */ addi r11, r1, 0x20
/* 80033C3C 00030B7C 48 32 E5 A1 */ bl _savegpr_29
/* 80033C40 00030B80 7C 9D 23 78 */ mr r29, r4
/* 80033C44 00030B84 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033C48 00030B88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033C44 00030B84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033C48 00030B88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033C4C 00030B8C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80033C50 00030B90 38 80 00 15 */ li r4, 0x15
/* 80033C54 00030B94 7F A5 EB 78 */ mr r5, r29
/* 80033C58 00030B98 4B FF F3 61 */ bl setItem__17dSv_player_item_cFiUc
/* 80033C5C 00030B9C 38 00 00 15 */ li r0, 0x15
/* 80033C60 00030BA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033C64 00030BA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80033C60 00030BA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033C64 00030BA4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80033C68 00030BA8 98 1F 5E 7D */ stb r0, 0x5e7d(r31)
/* 80033C6C 00030BAC 9B BF 5E 7E */ stb r29, 0x5e7e(r31)
/* 80033C70 00030BB0 3B A0 00 00 */ li r29, 0
include/d/d_save/d_save/asm/func_80033D40.s
+6 -6
View File
@@ -15,8 +15,8 @@ lbl_80033D70:
/* 80033D74 00030CB4 41 82 00 70 */ beq lbl_80033DE4
/* 80033D78 00030CB8 48 00 00 9C */ b lbl_80033E14
lbl_80033D7C:
/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033D84 00030CC4 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033D88 00030CC8 38 80 00 3D */ li r4, 0x3d
/* 80033D8C 00030CCC 48 00 01 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc
@@ -30,8 +30,8 @@ lbl_80033DA4:
/* 80033DA8 00030CE8 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DAC 00030CEC 48 00 00 68 */ b lbl_80033E14
lbl_80033DB0:
/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033DB8 00030CF8 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DBC 00030CFC 38 80 00 3D */ li r4, 0x3d
/* 80033DC0 00030D00 48 00 01 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc
@@ -45,8 +45,8 @@ lbl_80033DD8:
/* 80033DDC 00030D1C 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DE0 00030D20 48 00 00 34 */ b lbl_80033E14
lbl_80033DE4:
/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033DEC 00030D2C 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DF0 00030D30 38 80 00 3D */ li r4, 0x3d
/* 80033DF4 00030D34 48 00 00 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
include/d/d_save/d_save/asm/func_80033F9C.s
+2 -2
View File
@@ -8,8 +8,8 @@
/* 80033FB8 00030EF8 88 7F 00 04 */ lbz r3, 4(r31)
/* 80033FBC 00030EFC 7C A0 07 34 */ extsh r0, r5
/* 80033FC0 00030F00 7F C3 02 14 */ add r30, r3, r0
/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80033FCC 00030F0C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb
/* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18
include/d/d_save/d_save/asm/func_800340F8.s
+2 -2
View File
@@ -6,8 +6,8 @@
/* 8003410C 0003104C 7C 7D 1B 78 */ mr r29, r3
/* 80034110 00031050 7C 9E 23 78 */ mr r30, r4
/* 80034114 00031054 3B E0 00 01 */ li r31, 1
/* 80034118 00031058 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80034118 00031058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80034120 00031060 38 63 00 CC */ addi r3, r3, 0xcc
/* 80034124 00031064 38 80 00 4F */ li r4, 0x4f
/* 80034128 00031068 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
include/d/d_save/d_save/asm/func_80034644.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 80034650 00031590 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13)
/* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0
/* 80034658 00031598 41 82 00 18 */ beq lbl_80034670
/* 8003465C 0003159C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003465C 0003159C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80034668 000315A8 4B FF 6D 49 */ bl dComIfG_play_c_NS_getNowVibration
/* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674
include/d/d_save/d_save/asm/func_80035798.s
+16 -16
View File
@@ -8,8 +8,8 @@
/* 800357B4 000326F4 3A C0 00 00 */ li r22, 0
/* 800357B8 000326F8 3B C0 00 00 */ li r30, 0
/* 800357BC 000326FC 3B E0 00 00 */ li r31, 0
/* 800357C0 00032700 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800357C4 00032704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800357C0 00032700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800357C4 00032704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800357C8 00032708 3B A3 07 F0 */ addi r29, r3, 0x7f0
/* 800357CC 0003270C 7F A3 EB 78 */ mr r3, r29
/* 800357D0 00032710 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -38,15 +38,15 @@
/* 8003582C 0003276C 4B FF F1 79 */ bl offEventBit__11dSv_event_cFUs
/* 80035830 00032770 3A C0 00 01 */ li r22, 1
lbl_80035834:
/* 80035834 00032774 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035838 00032778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035834 00032774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035838 00032778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8003583C 0003277C 38 63 00 CC */ addi r3, r3, 0xcc
/* 80035840 00032780 38 80 00 48 */ li r4, 0x48
/* 80035844 00032784 4B FF E6 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80035848 00032788 2C 03 00 00 */ cmpwi r3, 0
/* 8003584C 0003278C 41 82 00 5C */ beq lbl_800358A8
/* 80035850 00032790 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035854 00032794 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035850 00032790 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035854 00032794 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035858 00032798 3B 23 00 9C */ addi r25, r3, 0x9c
/* 8003585C 0003279C 7F 23 CB 78 */ mr r3, r25
/* 80035860 000327A0 38 80 00 01 */ li r4, 1
@@ -59,8 +59,8 @@ lbl_80035834:
/* 8003587C 000327BC 38 80 00 01 */ li r4, 1
/* 80035880 000327C0 38 A0 00 48 */ li r5, 0x48
/* 80035884 000327C4 4B FF D7 35 */ bl setItem__17dSv_player_item_cFiUc
/* 80035888 000327C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 80035888 000327C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 80035890 000327D0 A3 E4 00 08 */ lhz r31, 8(r4)
/* 80035894 000327D4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80035898 000327D8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
@@ -70,15 +70,15 @@ lbl_80035834:
lbl_800358A8:
/* 800358A8 000327E8 1C 18 0A 94 */ mulli r0, r24, 0xa94
/* 800358AC 000327EC 7F 9C 02 14 */ add r28, r28, r0
/* 800358B0 000327F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800358B4 000327F4 3B 03 61 C0 */ addi r24, r3, lbl_804061C0@l
/* 800358B0 000327F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800358B4 000327F4 3B 03 61 C0 */ addi r24, r3, g_dComIfG_gameInfo@l
/* 800358B8 000327F8 83 38 0F 28 */ lwz r25, 0xf28(r24)
/* 800358BC 000327FC 83 58 0F 2C */ lwz r26, 0xf2c(r24)
/* 800358C0 00032800 48 30 CE 3D */ bl OSGetTime
/* 800358C4 00032804 7C BA 20 10 */ subfc r5, r26, r4
/* 800358C8 00032808 7C 19 19 10 */ subfe r0, r25, r3
/* 800358CC 0003280C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800358D0 00032810 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 800358CC 0003280C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800358D0 00032810 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 800358D4 00032814 80 64 0F 30 */ lwz r3, 0xf30(r4)
/* 800358D8 00032818 80 84 0F 34 */ lwz r4, 0xf34(r4)
/* 800358DC 0003281C 7F 25 20 14 */ addc r25, r5, r4
@@ -136,14 +136,14 @@ lbl_800359A0:
/* 800359A0 000328E0 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 800359A4 000328E4 28 00 00 01 */ cmplwi r0, 1
/* 800359A8 000328E8 40 82 00 28 */ bne lbl_800359D0
/* 800359AC 000328EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800359B0 000328F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800359AC 000328EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800359B0 000328F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800359B4 000328F4 38 63 00 9C */ addi r3, r3, 0x9c
/* 800359B8 000328F8 38 80 00 01 */ li r4, 1
/* 800359BC 000328FC 38 A0 00 FF */ li r5, 0xff
/* 800359C0 00032900 4B FF D5 F9 */ bl setItem__17dSv_player_item_cFiUc
/* 800359C4 00032904 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800359C8 00032908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800359C4 00032904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800359C8 00032908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800359CC 0003290C B3 E3 00 08 */ sth r31, 8(r3)
lbl_800359D0:
/* 800359D0 00032910 3C 60 80 38 */ lis r3, lbl_80379234@ha
include/d/d_save/d_save/asm/func_80035A04.s
+14 -14
View File
@@ -5,15 +5,15 @@
/* 80035A14 00032954 93 C1 00 08 */ stw r30, 8(r1)
/* 80035A18 00032958 1C 05 0A 94 */ mulli r0, r5, 0xa94
/* 80035A1C 0003295C 7C 84 02 14 */ add r4, r4, r0
/* 80035A20 00032960 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035A24 00032964 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035A20 00032960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035A24 00032964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035A28 00032968 38 A0 09 58 */ li r5, 0x958
/* 80035A2C 0003296C 4B FC DB 15 */ bl func_80003540
/* 80035A30 00032970 48 30 AB 61 */ bl OSGetSoundMode
/* 80035A34 00032974 28 03 00 00 */ cmplwi r3, 0
/* 80035A38 00032978 40 82 00 28 */ bne lbl_80035A60
/* 80035A3C 0003297C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035A40 00032980 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035A3C 0003297C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035A40 00032980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035A44 00032984 38 63 01 E0 */ addi r3, r3, 0x1e0
/* 80035A48 00032988 38 80 00 00 */ li r4, 0
/* 80035A4C 0003298C 4B FF EC 41 */ bl setSound__19dSv_player_config_cFUc
@@ -22,8 +22,8 @@
/* 80035A58 00032998 48 29 7E 31 */ bl Z2AudioMgr_NS_setOutputMode
/* 80035A5C 0003299C 48 00 00 4C */ b lbl_80035AA8
lbl_80035A60:
/* 80035A60 000329A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035A64 000329A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035A60 000329A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035A64 000329A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035A68 000329A8 3B E3 01 E0 */ addi r31, r3, 0x1e0
/* 80035A6C 000329AC 7F E3 FB 78 */ mr r3, r31
/* 80035A70 000329B0 4B FF EC 15 */ bl getSound__19dSv_player_config_cFv
@@ -42,8 +42,8 @@ lbl_80035A90:
/* 80035AA0 000329E0 38 80 00 01 */ li r4, 1
/* 80035AA4 000329E4 48 29 7D E5 */ bl Z2AudioMgr_NS_setOutputMode
lbl_80035AA8:
/* 80035AA8 000329E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035AAC 000329EC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80035AA8 000329E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035AAC 000329EC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80035AB0 000329F0 A0 1F 00 02 */ lhz r0, 2(r31)
/* 80035AB4 000329F4 28 00 00 0C */ cmplwi r0, 0xc
/* 80035AB8 000329F8 40 80 00 0C */ bge lbl_80035AC4
@@ -53,8 +53,8 @@ lbl_80035AC4:
/* 80035AC4 00032A04 38 60 00 06 */ li r3, 6
/* 80035AC8 00032A08 38 80 00 00 */ li r4, 0
/* 80035ACC 00032A0C 4B FF 95 75 */ bl dComIfGs_setKeyNum
/* 80035AD0 00032A10 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035AD4 00032A14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035AD0 00032A10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035AD4 00032A14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035AD8 00032A18 3B C3 00 9C */ addi r30, r3, 0x9c
/* 80035ADC 00032A1C 7F C3 F3 78 */ mr r3, r30
/* 80035AE0 00032A20 38 80 00 09 */ li r4, 9
@@ -96,12 +96,12 @@ lbl_80035B60:
/* 80035B68 00032AA8 38 7F 01 E0 */ addi r3, r31, 0x1e0
/* 80035B6C 00032AAC 4B FF EB 29 */ bl getVibration__19dSv_player_config_cFv
/* 80035B70 00032AB0 7C 64 1B 78 */ mr r4, r3
/* 80035B74 00032AB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035B78 00032AB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035B74 00032AB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035B78 00032AB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035B7C 00032ABC 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80035B80 00032AC0 4B FF 58 29 */ bl dComIfG_play_c_NS_setNowVibration
/* 80035B84 00032AC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80035B88 00032AC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80035B84 00032AC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035B88 00032AC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035B8C 00032ACC 38 83 00 58 */ addi r4, r3, 0x58
/* 80035B90 00032AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80035B94 00032AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
include/d/d_save/d_save/d_save.h
+345 -89
View File
@@ -15,95 +15,298 @@ enum Wallets {
};
enum ItemTable {
ORDON_SHIELD = 42,
WOODEN_SHIELD,
HYLIAN_SHIELD,
OOCCOOS_NOTE,
ORDON_CLOTHES,
HEROS_CLOTHES,
MAGIC_ARMOR,
ZORA_ARMOR,
HAWKEYE = 62,
WOODEN_SWORD,
GALE_BOOMERANG,
SPINNER,
BALL_AND_CHAIN,
HEROS_BOW,
CLAWSHOT,
IRON_BOOTS,
DOMINION_ROD,
DOUBLE_CLAWSHOTS,
LANTERN,
MASTER_SWORD,
FISHING_ROD,
SLINGSHOT,
DOMINION_ROD_2, // unused?
GIANT_BOMB_BAG = 79,
EMPTY_BOMBBAG,
BAG_AND_BOMBS,
UNUSED_BOMB_BAG,
FIRE_ARROW, // unused?
QUIVER,
BIG_QUIVER,
GIANT_QUIVER,
UNUSED_FISHING_ROD = 88,
HEROS_BOW_BOMBS,
HEROS_BOW_HAWKEYE,
ROD_BEE_LARVA,
ROD_CORAL_EARRING,
ROD_WORM,
ROD_CORAL_EARRING_BEE_LARVA,
ROD_CORAL_EARRING_WORM,
EMPTY_BOTTLE,
RED_POTION,
MAGIC_POTION,
BLUE_POTION,
MILK,
HALF_MILK,
LANTERN_OIL,
WATER,
LANTERN_OIL_2, // unused?
RED_POTION_2, // unused?
NASTY_SOUP,
HOT_SPRING_WATER,
FAIRY,
HOT_SPRING_WATER_2, // unused?
LANTERN_OIL_3, // unused?
LANTERN_OIL_4, // unused?
REGULAR_BOMBS,
WATER_BOMBS,
BOMBLINGS,
FAIRY_TEARS,
WORM,
FAIRY_TEARS_2, // unused?
BEE_LARVA,
RARE_CHU,
RED_CHU,
BLUE_CHU,
GREEN_CHU,
YELLOW_CHU,
PURPLE_CHU,
SIMPLE_SOUP,
GOOD_SOUP,
SUPERB_SOUP,
RENADOS_LETTER,
INVOICE,
WOODEN_STATUE,
ILIAS_CHARM,
HORSE_CALL,
AURUS_MEMO = 144,
ASHEIS_SKETCH,
LANTERN_2 = 156, // unused?
LANTERN_OIL_5, // unused?
BEE_LARVA_2, // unused?
BLACK_CHU_JELLY, // unused?
TEAR_OF_LIGHT, // unused?
VESSEL_OF_LIGHT, // unused?
VESSEL_OF_LIGHT_2, // unused?
ANCIENT_SKY_BOOK_EMPTY = 233,
ANCIENT_SKY_BOOK_PARTIAL,
ANCIENT_SKY_BOOK_FILLED,
NO_ITEM = 255
AIR_LETTER = 234,
ANCIENT_DOCUMENT = 233,
ANCIENT_DOCUMENT2 = 235,
ARMOR = 48,
ARROW_1 = 17,
ARROW_10 = 14,
ARROW_20 = 15,
ARROW_30 = 16,
ARROW_LV1 = 84,
ARROW_LV2 = 85,
ARROW_LV3 = 86,
ASHS_SCRIBBLING = 145,
BEE_CHILD = 118,
BEE_ROD = 91,
BILL = 129,
BLUE_BOTTLE = 99,
BLUE_RUPEE = 2,
BOMB_10 = 11,
BOMB_20 = 12,
BOMB_30 = 13,
BOMB_5 = 10,
BOMB_ARROW = 89,
BOMB_BAG_LV1 = 80,
BOMB_BAG_LV2 = 79,
BOMB_INSECT_10 = 27,
BOMB_INSECT_20 = 28,
BOMB_INSECT_30 = 29,
BOMB_INSECT_5 = 26,
BOMB_IN_BAG = 81,
BOOMERANG = 64,
BOSSRIDER_KEY = 243,
BOSS_KEY = 38,
BOW = 67,
CHUCHU_BLACK = 159,
CHUCHU_BLUE = 121,
CHUCHU_GREEN = 122,
CHUCHU_PURPLE = 124,
CHUCHU_RARE = 119,
CHUCHU_RED = 120,
CHUCHU_YELLOW = 123,
CHUCHU_YELLOW2 = 156,
COMPUS = 36,
COPY_ROD = 70,
COPY_ROD_2 = 76,
DROP_BOTTLE = 117,
DROP_CONTAINER = 161,
DROP_CONTAINER02 = 162,
DROP_CONTAINER03 = 163,
DUNGEON_BACK = 39,
DUNGEON_EXIT = 37,
DUNGEON_EXIT_2 = 51,
EMPTY_BOTTLE = 96,
FAIRY = 108,
FAIRY_DROP = 115,
FILLED_CONTAINER = 164,
FISHING_ROD_1 = 74,
F_ANT = 213,
F_BEETLE = 193,
F_BUTTERFLY = 195,
F_DANGOMUSHI = 203,
F_DRAGONFLY = 211,
F_GRASSHOPPER = 199,
F_LADYBUG = 207,
F_MANTIS = 205,
F_MAYFLY = 215,
F_NANAFUSHI = 201,
F_SNAIL = 209,
F_STAG_BEETLE = 197,
GREEN_BOTTLE = 98,
GREEN_RUPEE = 1,
HALF_MILK_BOTTLE = 101,
HAWK_ARROW = 90,
HAWK_EYE = 62,
HEART = 0,
HOOKSHOT = 68,
HORSE_FLUTE = 132,
HOT_SPRING = 107,
HOT_SPRING_2 = 109,
HVY_BOOTS = 69,
HYLIA_SHIELD = 44,
IRIAS_PENDANT = 131,
IRONBALL = 66,
JEWEL_BEE_ROD = 94,
JEWEL_ROD = 92,
JEWEL_WORM_ROD = 95,
KAKERA_HEART = 33,
KANTERA = 72,
KANTERA2 = 248,
KEY_OF_CARAVAN = 252,
KEY_OF_FILONE = 254,
L2_KEY_PIECES1 = 249,
L2_KEY_PIECES2 = 250,
L2_KEY_PIECES3 = 251,
LETTER = 128,
LIGHT_ARROW = 83,
LIGHT_DROP = 160,
LIGHT_SWORD = 73,
LINKS_SAVINGS = 237,
LURE_ROD = 88,
LV1_SOUP = 125,
LV2_BOSS_KEY = 253,
LV2_SOUP = 126,
LV3_SOUP = 127,
LV5_BOSS_KEY = 246,
LV7_DUNGEON_EXIT = 236,
L_MAGIC = 9,
MAGIC_LV1 = 50,
MAP = 35,
MASTER_SWORD = 41,
MILK_BOTTLE = 100,
MIRROR_PIECE_2 = 165,
MIRROR_PIECE_3 = 166,
MIRROR_PIECE_4 = 167,
M_ANT = 212,
M_BEETLE = 192,
M_BUTTERFLY = 194,
M_DANGOMUSHI = 202,
M_DRAGONFLY = 210,
M_GRASSHOPPER = 198,
M_LADYBUG = 206,
M_MANTIS = 204,
M_MAYFLY = 214,
M_NANAFUSHI = 200,
M_SNAIL = 208,
M_STAG_BEETLE = 196,
NORMAL_BOMB = 112,
NO_ITEM = 255,
OIL = 111,
OIL2 = 110,
OIL_BOTTLE = 102,
OIL_BOTTLE3 = 157,
OIL_BOTTLE_2 = 104,
ORANGE_RUPEE = 6,
PACHINKO = 75,
PACHINKO_SHOT = 18,
POKE_BOMB = 114,
POU_FIRE1 = 239,
POU_FIRE2 = 240,
POU_FIRE3 = 241,
POU_FIRE4 = 242,
POU_SPIRIT = 224,
PURPLE_RUPEE = 5,
RAFRELS_MEMO = 144,
RECOVERY_FAILY = 30,
RED_BOTTLE = 97,
RED_BOTTLE_2 = 105,
RED_RUPEE = 4,
SHIELD = 43,
SHOP_BEE_CHILD = 158,
SILVER_RUPEE = 7,
SMALL_KEY = 32,
SMALL_KEY2 = 238,
SMELL_CHILDREN = 180,
SMELL_FISH = 179,
SMELL_MEDICINE = 181,
SMELL_POH = 178,
SMELL_PUMPKIN = 177,
SMELL_YELIA_POUCH = 176,
SPINNER = 65,
SURFBOARD = 247,
SWORD = 40,
S_MAGIC = 8,
TASTE = 245,
TKS_LETTER = 45,
TOMATO_PUREE = 244,
TRIPLE_HEART = 31,
UGLY_SOUP = 106,
UTAWA_HEART = 34,
WALLET_LV1 = 52,
WALLET_LV2 = 53,
WALLET_LV3 = 54,
WATER_BOMB = 113,
WATER_BOMB_10 = 23,
WATER_BOMB_20 = 24,
WATER_BOMB_30 = 25,
WATER_BOMB_5 = 22,
WATER_BOTTLE = 103,
WEARS_CASUAL = 46,
WEAR_KOKIRI = 47,
WEAR_ZORA = 49,
WOOD_SHIELD = 42,
WOOD_STATUE = 130,
WOOD_STICK = 63,
WORM = 116,
WORM_ROD = 93,
W_HOOKSHOT = 71,
YELLOW_RUPEE = 3,
ZORAS_JEWEL = 61,
noentry1 = 19,
noentry10 = 77,
noentry11 = 78,
noentry12 = 82,
noentry13 = 87,
noentry14 = 133,
noentry15 = 134,
noentry16 = 135,
noentry17 = 136,
noentry18 = 137,
noentry19 = 138,
noentry2 = 20,
noentry20 = 139,
noentry21 = 140,
noentry22 = 141,
noentry23 = 142,
noentry24 = 143,
noentry25 = 146,
noentry26 = 147,
noentry27 = 148,
noentry28 = 149,
noentry29 = 150,
noentry3 = 21,
noentry30 = 151,
noentry31 = 152,
noentry32 = 153,
noentry33 = 154,
noentry34 = 155,
noentry35 = 168,
noentry36 = 169,
noentry37 = 170,
noentry38 = 171,
noentry39 = 172,
noentry4 = 55,
noentry40 = 173,
noentry41 = 174,
noentry42 = 175,
noentry43 = 182,
noentry44 = 183,
noentry45 = 184,
noentry46 = 185,
noentry47 = 186,
noentry48 = 187,
noentry49 = 188,
noentry5 = 56,
noentry50 = 189,
noentry51 = 190,
noentry52 = 191,
noentry53 = 216,
noentry54 = 217,
noentry55 = 218,
noentry56 = 219,
noentry57 = 220,
noentry58 = 221,
noentry59 = 222,
noentry6 = 57,
noentry60 = 223,
noentry61 = 225,
noentry62 = 226,
noentry63 = 227,
noentry64 = 228,
noentry65 = 229,
noentry66 = 230,
noentry67 = 231,
noentry68 = 232,
noentry7 = 58,
noentry8 = 59,
noentry9 = 60
};
enum EquipmentBits{
CLOTHING_BITFIELD,
SWORD_BITFIELD,
SHIELD_BITFIELD
};
enum Swords{
ORDON_SWORD_FLAG,
MASTER_SWORD_FLAG,
WOODEN_SWORD_FLAG,
LIGHT_SWORD_FLAG
};
enum Shields{
ORDON_SHIELD_FLAG,
HYLIAN_SHIELD_FLAG,
WOODEN_SHIELD_FLAG
};
enum Armors{
HEROS_CLOTHES_FLAG
};
enum DungeonItem{
MAP_FLAG,
COMPASS_FLAG,
BOSS_KEY_FLAG,
OOCCOO_NOTE_FLAG = 6
};
enum AreaVessel{
FARON_VESSEL,
ELDIN_VESSEL,
LANAYRU_VESSEL
};
class dSv_player_status_a_c {
@@ -119,6 +322,13 @@ class dSv_player_status_a_c {
inline u16& getCurrentHealth() {
return current_health;
}
inline void setWalletLV(u8 lv){
current_wallet = lv;
}
void setLanternOil(u16 amount){
max_lantern_oil = amount;
current_lantern_oil = amount;
}
private:
u16 max_health;
@@ -284,6 +494,10 @@ class dSv_player_item_record_c {
u8 addBottleNum(u8, short);
u8 getBottleNum(u8) const;
void setBowAmount(u8 amount){
bow = amount;
}
private:
u8 bow;
u8 bomb_bags[3];
@@ -298,6 +512,10 @@ class dSv_player_item_max_c {
void setBombNum(u8, u8);
u8 getBombNum(u8) const;
void setBowCapacity(u8 max){
item_capacities[0] = max;
}
private:
u8 item_capacities[8];
};
@@ -312,6 +530,10 @@ class dSv_player_collect_c {
void onCollectMirror(u8);
bool isCollectMirror(u8) const;
u8 getPoeCount(){
return poe_count;
}
private:
u8 unk0[8];
u8 unk8;
@@ -424,6 +646,31 @@ class dSv_player_c {
dSv_player_status_a_c getPlayerStatusA() {
return player_status_a;
}
dSv_player_item_c& getPlayerItem(){
return player_item;
}
dSv_player_collect_c& getPlayerCollect(){
return player_collect;
}
dSv_player_item_record_c& getPlayerItemRecord(){
return player_item_record;
}
dSv_player_item_max_c& getPlayerItemMax(){
return player_item_max;
}
dSv_light_drop_c& getLightDrop(){
return light_drop;
}
dSv_player_get_item_c& getPlayerGetItem(){
return player_get_item;
}
void setPlayerStatusAWalletLV(u8 lv) {
player_status_a.setWalletLV(lv);
}
void setPlayerStatusAOil(u16 amount){
player_status_a.setLanternOil(amount);
}
private:
dSv_player_status_a_c player_status_a;
@@ -461,6 +708,10 @@ class dSv_memBit_c {
void onDungeonItem(int);
bool isDungeonItem(int) const;
u8 getSmallKeys(){
return small_key_flags;
}
private:
u32 area_flags_bitfields1[2];
u32 area_flags_bitfields2[4];
@@ -631,6 +882,11 @@ class dSv_save_c {
void init(void);
dSv_memory2_c* getSave2(int);
inline dSv_player_c& getPlayer() {return player; }
dSv_event_c& getEventFlags() {return event_flags;}
void setPlayerStatusAWallet(u8 lv){
player.setPlayerStatusAWalletLV(lv);
}
static const int STAGE_MAX = 4;
include/d/d_save/d_save_HIO/asm/func_8025BBAC.s
+2 -2
View File
@@ -5,8 +5,8 @@
/* 8025BBBC 00258AFC 48 10 66 21 */ bl _savegpr_29
/* 8025BBC0 00258B00 7C 7D 1B 78 */ mr r29, r3
/* 8025BBC4 00258B04 3B C0 00 00 */ li r30, 0
/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8025BBD0 00258B10 3B E3 09 58 */ addi r31, r3, 0x958
lbl_8025BBD4:
/* 8025BBD4 00258B14 7F E3 FB 78 */ mr r3, r31