mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -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_com/d_com_inf_game/asm/func_8002B22C.s
+2 -2
View File
@@ -19,8 +19,8 @@ lbl_8002B260:
/* 8002B270 000281B0 88 1F 4F 51 */ lbz r0, 0x4f51(r31)
/* 8002B274 000281B4 28 00 00 02 */ cmplwi r0, 2
/* 8002B278 000281B8 40 82 00 14 */ bne lbl_8002B28C
/* 8002B27C 000281BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002B27C 000281BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8002B284 000281C4 38 63 4E C4 */ addi r3, r3, 0x4ec4
/* 8002B288 000281C8 4B FF 90 B1 */ bl dStage_roomControl_c_NS_initZone
lbl_8002B28C:
include/d/d_com/d_com_inf_game/d_com_inf_game.h
+24 -1
View File
@@ -36,6 +36,27 @@ class dComIfG_camera_info_class {
u8 unk[0x38];
};
struct item_func{
float hearts; //bf80
u32 rupees; //bf84
s16 small_keys; //bf88
s16 kakera_heart; //bf8a
s16 magic; //bf8c
u16 unk; //bf8e
s16 magic_lv; //bf90
u8 unk2[2]; //bf92/93 // removed stuff?
u32 unk3; //bf94 //related to lantern?
u32 unk4; //bf98 //related to lantern?
u32 unk5; //bf9c //related to lantern?
u32 unk6; //bfa0 //related to oxygen?
u32 unk7; //bfa4 //related to oxygen?
u32 unk8; //bfa8 //related to oxygen?
u32 unk9; //bfac //related to oxygen?
u32 unk10; //bfb0 //related to oxygen?
s16 arrows; //bfb4
s16 seeds; //bfb6
};
// 16 bytes too big, figure out later
class dComIfG_inf_c {
public:
@@ -61,7 +82,9 @@ class dComIfG_inf_c {
/* 0x05B04 */ u8 unk10[0x244];
/* 0x05D48 */ dDlst_window_c draw_list_window;
/* 0x05D74 */ dComIfG_camera_info_class camera_info_class;
/* 0x05DAC */ u8 unk11[0x190];
/* 0x05DAC */ u8 unk11[0x14];
/* 0x05DC0 */ item_func give_item;
/* 0x05DF8 */ u8 unk35[0x144];
/* 0x05F3C */ u32 unk12;
/* 0x05F30 */ u32 unk13;
/* 0x05F34 */ u32 unk14;
include/d/d_file/d_file_sel_info/asm/func_80192954.s
+4 -4
View File
@@ -15,8 +15,8 @@
/* 8019298C 0018F8CC 28 00 00 01 */ cmplwi r0, 1
/* 80192990 0018F8D0 40 82 00 8C */ bne lbl_80192A1C
/* 80192994 0018F8D4 54 C6 06 3E */ clrlwi r6, r6, 0x18
/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801929A0 0018F8E0 88 05 0F 18 */ lbz r0, 0xf18(r5)
/* 801929A4 0018F8E4 7C 06 00 40 */ cmplw r6, r0
/* 801929A8 0018F8E8 40 82 00 74 */ bne lbl_80192A1C
@@ -25,8 +25,8 @@
/* 801929B4 0018F8F4 48 00 00 ED */ bl setHeartCnt__12dFile_info_cFP10dSv_save_c
/* 801929B8 0018F8F8 38 00 00 0C */ li r0, 0xc
/* 801929BC 0018F8FC B0 1D 00 02 */ sth r0, 2(r29)
/* 801929C0 0018F900 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801929C0 0018F900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801929C8 0018F908 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801929CC 0018F90C 80 7F 00 2C */ lwz r3, 0x2c(r31)
/* 801929D0 0018F910 48 1D 61 5D */ bl strcpy
include/d/d_file/d_file_sel_info/asm/func_80192D60.s
+2 -2
View File
@@ -2,8 +2,8 @@
/* 80192D64 0018FCA4 7C 08 02 A6 */ mflr r0
/* 80192D68 0018FCA8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80192D6C 0018FCAC 7C 66 1B 78 */ mr r6, r3
/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80192D78 0018FCB8 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 80192D7C 0018FCBC 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 80192D80 0018FCC0 38 A3 01 B8 */ addi r5, r3, 0x1b8
include/d/d_file/d_file_sel_info/asm/func_80192D9C.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 80192DA8 0018FCE8 39 61 00 50 */ addi r11, r1, 0x50
/* 80192DAC 0018FCEC 48 1C F4 31 */ bl _savegpr_29
/* 80192DB0 0018FCF0 7C 7D 1B 78 */ mr r29, r3
/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80192DBC 0018FCFC 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80192DC0 0018FD00 80 7D 00 0C */ lwz r3, 0xc(r29)
/* 80192DC4 0018FD04 28 03 00 00 */ cmplwi r3, 0
include/d/d_item/d_item/asm/func_80097E8C.s
+21
View File
@@ -0,0 +1,21 @@
/* 80097E8C 00094DCC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80097E90 00094DD0 7C 08 02 A6 */ mflr r0
/* 80097E94 00094DD4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80097E98 00094DD8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80097E9C 00094DDC 7C 7F 1B 78 */ mr r31, r3
/* 80097EA0 00094DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80097EA4 00094DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80097EA8 00094DE8 38 63 00 CC */ addi r3, r3, 0xcc
/* 80097EAC 00094DEC 7F E4 FB 78 */ mr r4, r31
/* 80097EB0 00094DF0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc
/* 80097EB4 00094DF4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d
/* 80097EB8 00094DF8 3C 60 80 3B */ lis r3, item_func_ptr@ha
/* 80097EBC 00094DFC 38 63 F1 78 */ addi r3, r3, item_func_ptr@l
/* 80097EC0 00094E00 7D 83 00 2E */ lwzx r12, r3, r0
/* 80097EC4 00094E04 7D 89 03 A6 */ mtctr r12
/* 80097EC8 00094E08 4E 80 04 21 */ bctrl
/* 80097ECC 00094E0C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80097ED0 00094E10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80097ED4 00094E14 7C 08 03 A6 */ mtlr r0
/* 80097ED8 00094E18 38 21 00 10 */ addi r1, r1, 0x10
/* 80097EDC 00094E1C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80097EE0.s
+20
View File
@@ -0,0 +1,20 @@
/* 80097EE0 00094E20 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80097EE4 00094E24 7C 08 02 A6 */ mflr r0
/* 80097EE8 00094E28 90 01 00 14 */ stw r0, 0x14(r1)
/* 80097EEC 00094E2C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80097EF0 00094E30 7C 9F 23 78 */ mr r31, r4
/* 80097EF4 00094E34 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d
/* 80097EF8 00094E38 3C 60 80 3B */ lis r3, item_getcheck_func_ptr@ha
/* 80097EFC 00094E3C 38 63 F5 78 */ addi r3, r3, item_getcheck_func_ptr@l
/* 80097F00 00094E40 7D 83 00 2E */ lwzx r12, r3, r0
/* 80097F04 00094E44 7D 89 03 A6 */ mtctr r12
/* 80097F08 00094E48 4E 80 04 21 */ bctrl
/* 80097F0C 00094E4C 2C 03 FF FF */ cmpwi r3, -1
/* 80097F10 00094E50 40 82 00 08 */ bne lbl_80097F18
/* 80097F14 00094E54 7F E3 FB 78 */ mr r3, r31
lbl_80097F18:
/* 80097F18 00094E58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80097F1C 00094E5C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80097F20 00094E60 7C 08 03 A6 */ mtlr r0
/* 80097F24 00094E64 38 21 00 10 */ addi r1, r1, 0x10
/* 80097F28 00094E68 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_800982B4.s
+36
View File
@@ -0,0 +1,36 @@
/* 800982B4 000951F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800982B8 000951F8 7C 08 02 A6 */ mflr r0
/* 800982BC 000951FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 800982C0 00095200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800982C4 00095204 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 800982C8 00095208 A8 64 5D CA */ lha r3, 0x5dca(r4)
/* 800982CC 0009520C 38 03 00 05 */ addi r0, r3, 5
/* 800982D0 00095210 B0 04 5D CA */ sth r0, 0x5dca(r4)
/* 800982D4 00095214 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge
/* 800982D8 00095218 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 800982DC 0009521C C8 22 91 E0 */ lfd f1, lbl_80452BE0-_SDA2_BASE_(r2)
/* 800982E0 00095220 90 01 00 0C */ stw r0, 0xc(r1)
/* 800982E4 00095224 3C 00 43 30 */ lis r0, 0x4330
/* 800982E8 00095228 90 01 00 08 */ stw r0, 8(r1)
/* 800982EC 0009522C C8 01 00 08 */ lfd f0, 8(r1)
/* 800982F0 00095230 EC 20 08 28 */ fsubs f1, f0, f1
/* 800982F4 00095234 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800982F8 00095238 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800982FC 0009523C C0 03 5D C0 */ lfs f0, 0x5dc0(r3)
/* 80098300 00095240 EC 00 08 2A */ fadds f0, f0, f1
/* 80098304 00095244 D0 03 5D C0 */ stfs f0, 0x5dc0(r3)
/* 80098308 00095248 38 00 00 00 */ li r0, 0
/* 8009830C 0009524C 98 03 5E B6 */ stb r0, 0x5eb6(r3)
/* 80098310 00095250 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 80098314 00095254 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 80098318 00095258 7D 89 03 A6 */ mtctr r12
/* 8009831C 0009525C 4E 80 04 21 */ bctrl
/* 80098320 00095260 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80098324 00095264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098328 00095268 38 63 09 58 */ addi r3, r3, 0x958
/* 8009832C 0009526C 38 80 00 04 */ li r4, 4
/* 80098330 00095270 4B F9 C5 E9 */ bl onDungeonItem__12dSv_memBit_cFi
/* 80098334 00095274 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80098338 00095278 7C 08 03 A6 */ mtlr r0
/* 8009833C 0009527C 38 21 00 10 */ addi r1, r1, 0x10
/* 80098340 00095280 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_800986C4.s
+21
View File
@@ -0,0 +1,21 @@
/* 800986C4 00095604 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800986C8 00095608 7C 08 02 A6 */ mflr r0
/* 800986CC 0009560C 90 01 00 14 */ stw r0, 0x14(r1)
/* 800986D0 00095610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800986D4 00095614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800986D8 00095618 38 63 01 00 */ addi r3, r3, 0x100
/* 800986DC 0009561C 38 80 00 01 */ li r4, 1
/* 800986E0 00095620 38 A0 00 02 */ li r5, 2
/* 800986E4 00095624 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc
/* 800986E8 00095628 38 60 00 3F */ li r3, 0x3f
/* 800986EC 0009562C 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword
/* 800986F0 00095630 88 AD 87 E4 */ lbz r5, lbl_80450D64-_SDA_BASE_(r13)
/* 800986F4 00095634 7C A5 07 74 */ extsb r5, r5
/* 800986F8 00095638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800986FC 0009563C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098700 00095640 38 80 00 1C */ li r4, 0x1c
/* 80098704 00095644 4B F9 CA FD */ bl onSwitch__10dSv_info_cFii
/* 80098708 00095648 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009870C 0009564C 7C 08 03 A6 */ mtlr r0
/* 80098710 00095650 38 21 00 10 */ addi r1, r1, 0x10
/* 80098714 00095654 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_800987B4.s
+18
View File
@@ -0,0 +1,18 @@
/* 800987B4 000956F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800987B8 000956F8 7C 08 02 A6 */ mflr r0
/* 800987BC 000956FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 800987C0 00095700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800987C4 00095704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800987C8 00095708 38 63 00 9C */ addi r3, r3, 0x9c
/* 800987CC 0009570C 38 80 00 04 */ li r4, 4
/* 800987D0 00095710 38 A0 00 43 */ li r5, 0x43
/* 800987D4 00095714 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc
/* 800987D8 00095718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800987DC 0009571C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 800987E0 00095720 38 00 00 1E */ li r0, 0x1e
/* 800987E4 00095724 98 03 00 EC */ stb r0, 0xec(r3)
/* 800987E8 00095728 98 03 00 F8 */ stb r0, 0xf8(r3)
/* 800987EC 0009572C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800987F0 00095730 7C 08 03 A6 */ mtlr r0
/* 800987F4 00095734 38 21 00 10 */ addi r1, r1, 0x10
/* 800987F8 00095738 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80098AB0.s
+6
View File
@@ -0,0 +1,6 @@
/* 80098AB0 000959F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80098AB4 000959F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098AB8 000959F8 38 00 00 3C */ li r0, 0x3c
/* 80098ABC 000959FC 98 03 00 EC */ stb r0, 0xec(r3)
/* 80098AC0 00095A00 98 03 00 F8 */ stb r0, 0xf8(r3)
/* 80098AC4 00095A04 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80098AE0.s
+6
View File
@@ -0,0 +1,6 @@
/* 80098AE0 00095A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80098AE4 00095A24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098AE8 00095A28 38 00 00 64 */ li r0, 0x64
/* 80098AEC 00095A2C 98 03 00 EC */ stb r0, 0xec(r3)
/* 80098AF0 00095A30 98 03 00 F8 */ stb r0, 0xf8(r3)
/* 80098AF4 00095A34 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80098EE4.s
+43
View File
@@ -0,0 +1,43 @@
/* 80098EE4 00095E24 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80098EE8 00095E28 7C 08 02 A6 */ mflr r0
/* 80098EEC 00095E2C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80098EF0 00095E30 39 61 00 20 */ addi r11, r1, 0x20
/* 80098EF4 00095E34 48 2C 92 E9 */ bl _savegpr_29
/* 80098EF8 00095E38 3B C0 00 FF */ li r30, 0xff
/* 80098EFC 00095E3C 3B A0 00 00 */ li r29, 0
/* 80098F00 00095E40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80098F04 00095E44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098F08 00095E48 3B E3 00 9C */ addi r31, r3, 0x9c
lbl_80098F0C:
/* 80098F0C 00095E4C 7F E3 FB 78 */ mr r3, r31
/* 80098F10 00095E50 38 9D 00 0B */ addi r4, r29, 0xb
/* 80098F14 00095E54 38 A0 00 01 */ li r5, 1
/* 80098F18 00095E58 4B F9 A1 19 */ bl getItem__17dSv_player_item_cCFib
/* 80098F1C 00095E5C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80098F20 00095E60 28 00 00 60 */ cmplwi r0, 0x60
/* 80098F24 00095E64 40 82 00 0C */ bne lbl_80098F30
/* 80098F28 00095E68 7F BE EB 78 */ mr r30, r29
/* 80098F2C 00095E6C 48 00 00 10 */ b lbl_80098F3C
lbl_80098F30:
/* 80098F30 00095E70 3B BD 00 01 */ addi r29, r29, 1
/* 80098F34 00095E74 2C 1D 00 04 */ cmpwi r29, 4
/* 80098F38 00095E78 41 80 FF D4 */ blt lbl_80098F0C
lbl_80098F3C:
/* 80098F3C 00095E7C 2C 1E 00 FF */ cmpwi r30, 0xff
/* 80098F40 00095E80 41 82 00 28 */ beq lbl_80098F68
/* 80098F44 00095E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80098F48 00095E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80098F4C 00095E8C 38 63 00 EC */ addi r3, r3, 0xec
/* 80098F50 00095E90 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 80098F54 00095E94 38 A0 00 0A */ li r5, 0xa
/* 80098F58 00095E98 4B F9 B0 35 */ bl setBottleNum__24dSv_player_item_record_cFUcUc
/* 80098F5C 00095E9C 7F E3 FB 78 */ mr r3, r31
/* 80098F60 00095EA0 38 80 00 76 */ li r4, 0x76
/* 80098F64 00095EA4 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc
lbl_80098F68:
/* 80098F68 00095EA8 39 61 00 20 */ addi r11, r1, 0x20
/* 80098F6C 00095EAC 48 2C 92 BD */ bl _restgpr_29
/* 80098F70 00095EB0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80098F74 00095EB4 7C 08 03 A6 */ mtlr r0
/* 80098F78 00095EB8 38 21 00 20 */ addi r1, r1, 0x20
/* 80098F7C 00095EBC 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099A70.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099A70 000969B0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099A74 000969B4 7C 08 02 A6 */ mflr r0
/* 80099A78 000969B8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099A7C 000969BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099A80 000969C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099A84 000969C4 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099A88 000969C8 38 80 00 12 */ li r4, 0x12
/* 80099A8C 000969CC 38 A0 00 01 */ li r5, 1
/* 80099A90 000969D0 4B F9 95 A1 */ bl getItem__17dSv_player_item_cCFib
/* 80099A94 000969D4 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099A98 000969D8 20 00 00 25 */ subfic r0, r0, 0x25
/* 80099A9C 000969DC 7C 00 00 34 */ cntlzw r0, r0
/* 80099AA0 000969E0 54 03 D9 7E */ srwi r3, r0, 5
/* 80099AA4 000969E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099AA8 000969E8 7C 08 03 A6 */ mtlr r0
/* 80099AAC 000969EC 38 21 00 10 */ addi r1, r1, 0x10
/* 80099AB0 000969F0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099AE4.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099AE4 00096A24 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099AE8 00096A28 7C 08 02 A6 */ mflr r0
/* 80099AEC 00096A2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099AF0 00096A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099AF4 00096A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099AF8 00096A38 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099AFC 00096A3C 38 80 00 12 */ li r4, 0x12
/* 80099B00 00096A40 38 A0 00 01 */ li r5, 1
/* 80099B04 00096A44 4B F9 95 2D */ bl getItem__17dSv_player_item_cCFib
/* 80099B08 00096A48 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099B0C 00096A4C 20 00 00 27 */ subfic r0, r0, 0x27
/* 80099B10 00096A50 7C 00 00 34 */ cntlzw r0, r0
/* 80099B14 00096A54 54 03 D9 7E */ srwi r3, r0, 5
/* 80099B18 00096A58 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099B1C 00096A5C 7C 08 03 A6 */ mtlr r0
/* 80099B20 00096A60 38 21 00 10 */ addi r1, r1, 0x10
/* 80099B24 00096A64 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099C20.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099C20 00096B60 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099C24 00096B64 7C 08 02 A6 */ mflr r0
/* 80099C28 00096B68 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099C2C 00096B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099C30 00096B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099C34 00096B74 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099C38 00096B78 38 80 00 12 */ li r4, 0x12
/* 80099C3C 00096B7C 38 A0 00 01 */ li r5, 1
/* 80099C40 00096B80 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib
/* 80099C44 00096B84 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099C48 00096B88 20 00 00 2D */ subfic r0, r0, 0x2d
/* 80099C4C 00096B8C 7C 00 00 34 */ cntlzw r0, r0
/* 80099C50 00096B90 54 03 D9 7E */ srwi r3, r0, 5
/* 80099C54 00096B94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099C58 00096B98 7C 08 03 A6 */ mtlr r0
/* 80099C5C 00096B9C 38 21 00 10 */ addi r1, r1, 0x10
/* 80099C60 00096BA0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099D30.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099D30 00096C70 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099D34 00096C74 7C 08 02 A6 */ mflr r0
/* 80099D38 00096C78 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099D3C 00096C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099D40 00096C80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099D44 00096C84 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099D48 00096C88 38 80 00 12 */ li r4, 0x12
/* 80099D4C 00096C8C 38 A0 00 01 */ li r5, 1
/* 80099D50 00096C90 4B F9 92 E1 */ bl getItem__17dSv_player_item_cCFib
/* 80099D54 00096C94 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099D58 00096C98 20 00 00 25 */ subfic r0, r0, 0x25
/* 80099D5C 00096C9C 7C 00 00 34 */ cntlzw r0, r0
/* 80099D60 00096CA0 54 03 D9 7E */ srwi r3, r0, 5
/* 80099D64 00096CA4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099D68 00096CA8 7C 08 03 A6 */ mtlr r0
/* 80099D6C 00096CAC 38 21 00 10 */ addi r1, r1, 0x10
/* 80099D70 00096CB0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099D8C.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099D8C 00096CCC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099D90 00096CD0 7C 08 02 A6 */ mflr r0
/* 80099D94 00096CD4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099D98 00096CD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099D9C 00096CDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099DA0 00096CE0 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099DA4 00096CE4 38 80 00 14 */ li r4, 0x14
/* 80099DA8 00096CE8 38 A0 00 01 */ li r5, 1
/* 80099DAC 00096CEC 4B F9 92 85 */ bl getItem__17dSv_player_item_cCFib
/* 80099DB0 00096CF0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099DB4 00096CF4 20 00 00 3D */ subfic r0, r0, 0x3d
/* 80099DB8 00096CF8 7C 00 00 34 */ cntlzw r0, r0
/* 80099DBC 00096CFC 54 03 D9 7E */ srwi r3, r0, 5
/* 80099DC0 00096D00 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099DC4 00096D04 7C 08 03 A6 */ mtlr r0
/* 80099DC8 00096D08 38 21 00 10 */ addi r1, r1, 0x10
/* 80099DCC 00096D0C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099E30.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099E30 00096D70 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099E34 00096D74 7C 08 02 A6 */ mflr r0
/* 80099E38 00096D78 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099E3C 00096D7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099E40 00096D80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099E44 00096D84 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099E48 00096D88 38 80 00 00 */ li r4, 0
/* 80099E4C 00096D8C 38 A0 00 01 */ li r5, 1
/* 80099E50 00096D90 4B F9 91 E1 */ bl getItem__17dSv_player_item_cCFib
/* 80099E54 00096D94 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099E58 00096D98 20 00 00 40 */ subfic r0, r0, 0x40
/* 80099E5C 00096D9C 7C 00 00 34 */ cntlzw r0, r0
/* 80099E60 00096DA0 54 03 D9 7E */ srwi r3, r0, 5
/* 80099E64 00096DA4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099E68 00096DA8 7C 08 03 A6 */ mtlr r0
/* 80099E6C 00096DAC 38 21 00 10 */ addi r1, r1, 0x10
/* 80099E70 00096DB0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099E74.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099E74 00096DB4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099E78 00096DB8 7C 08 02 A6 */ mflr r0
/* 80099E7C 00096DBC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099E80 00096DC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099E84 00096DC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099E88 00096DC8 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099E8C 00096DCC 38 80 00 02 */ li r4, 2
/* 80099E90 00096DD0 38 A0 00 01 */ li r5, 1
/* 80099E94 00096DD4 4B F9 91 9D */ bl getItem__17dSv_player_item_cCFib
/* 80099E98 00096DD8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099E9C 00096DDC 20 00 00 41 */ subfic r0, r0, 0x41
/* 80099EA0 00096DE0 7C 00 00 34 */ cntlzw r0, r0
/* 80099EA4 00096DE4 54 03 D9 7E */ srwi r3, r0, 5
/* 80099EA8 00096DE8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099EAC 00096DEC 7C 08 03 A6 */ mtlr r0
/* 80099EB0 00096DF0 38 21 00 10 */ addi r1, r1, 0x10
/* 80099EB4 00096DF4 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099EB8.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099EB8 00096DF8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099EBC 00096DFC 7C 08 02 A6 */ mflr r0
/* 80099EC0 00096E00 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099EC4 00096E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099EC8 00096E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099ECC 00096E0C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099ED0 00096E10 38 80 00 06 */ li r4, 6
/* 80099ED4 00096E14 38 A0 00 01 */ li r5, 1
/* 80099ED8 00096E18 4B F9 91 59 */ bl getItem__17dSv_player_item_cCFib
/* 80099EDC 00096E1C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099EE0 00096E20 20 00 00 42 */ subfic r0, r0, 0x42
/* 80099EE4 00096E24 7C 00 00 34 */ cntlzw r0, r0
/* 80099EE8 00096E28 54 03 D9 7E */ srwi r3, r0, 5
/* 80099EEC 00096E2C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099EF0 00096E30 7C 08 03 A6 */ mtlr r0
/* 80099EF4 00096E34 38 21 00 10 */ addi r1, r1, 0x10
/* 80099EF8 00096E38 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099EFC.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099EFC 00096E3C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099F00 00096E40 7C 08 02 A6 */ mflr r0
/* 80099F04 00096E44 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099F08 00096E48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099F0C 00096E4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099F10 00096E50 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099F14 00096E54 38 80 00 04 */ li r4, 4
/* 80099F18 00096E58 38 A0 00 00 */ li r5, 0
/* 80099F1C 00096E5C 4B F9 91 15 */ bl getItem__17dSv_player_item_cCFib
/* 80099F20 00096E60 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099F24 00096E64 20 00 00 43 */ subfic r0, r0, 0x43
/* 80099F28 00096E68 7C 00 00 34 */ cntlzw r0, r0
/* 80099F2C 00096E6C 54 03 D9 7E */ srwi r3, r0, 5
/* 80099F30 00096E70 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099F34 00096E74 7C 08 03 A6 */ mtlr r0
/* 80099F38 00096E78 38 21 00 10 */ addi r1, r1, 0x10
/* 80099F3C 00096E7C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099F40.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099F40 00096E80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099F44 00096E84 7C 08 02 A6 */ mflr r0
/* 80099F48 00096E88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099F4C 00096E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099F50 00096E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099F54 00096E94 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099F58 00096E98 38 80 00 09 */ li r4, 9
/* 80099F5C 00096E9C 38 A0 00 01 */ li r5, 1
/* 80099F60 00096EA0 4B F9 90 D1 */ bl getItem__17dSv_player_item_cCFib
/* 80099F64 00096EA4 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099F68 00096EA8 20 00 00 44 */ subfic r0, r0, 0x44
/* 80099F6C 00096EAC 7C 00 00 34 */ cntlzw r0, r0
/* 80099F70 00096EB0 54 03 D9 7E */ srwi r3, r0, 5
/* 80099F74 00096EB4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099F78 00096EB8 7C 08 03 A6 */ mtlr r0
/* 80099F7C 00096EBC 38 21 00 10 */ addi r1, r1, 0x10
/* 80099F80 00096EC0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099F84.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099F84 00096EC4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099F88 00096EC8 7C 08 02 A6 */ mflr r0
/* 80099F8C 00096ECC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099F90 00096ED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099F94 00096ED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099F98 00096ED8 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099F9C 00096EDC 38 80 00 03 */ li r4, 3
/* 80099FA0 00096EE0 38 A0 00 01 */ li r5, 1
/* 80099FA4 00096EE4 4B F9 90 8D */ bl getItem__17dSv_player_item_cCFib
/* 80099FA8 00096EE8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099FAC 00096EEC 20 00 00 45 */ subfic r0, r0, 0x45
/* 80099FB0 00096EF0 7C 00 00 34 */ cntlzw r0, r0
/* 80099FB4 00096EF4 54 03 D9 7E */ srwi r3, r0, 5
/* 80099FB8 00096EF8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80099FBC 00096EFC 7C 08 03 A6 */ mtlr r0
/* 80099FC0 00096F00 38 21 00 10 */ addi r1, r1, 0x10
/* 80099FC4 00096F04 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_80099FC8.s
+17
View File
@@ -0,0 +1,17 @@
/* 80099FC8 00096F08 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80099FCC 00096F0C 7C 08 02 A6 */ mflr r0
/* 80099FD0 00096F10 90 01 00 14 */ stw r0, 0x14(r1)
/* 80099FD4 00096F14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80099FD8 00096F18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80099FDC 00096F1C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80099FE0 00096F20 38 80 00 08 */ li r4, 8
/* 80099FE4 00096F24 38 A0 00 01 */ li r5, 1
/* 80099FE8 00096F28 4B F9 90 49 */ bl getItem__17dSv_player_item_cCFib
/* 80099FEC 00096F2C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80099FF0 00096F30 20 00 00 46 */ subfic r0, r0, 0x46
/* 80099FF4 00096F34 7C 00 00 34 */ cntlzw r0, r0
/* 80099FF8 00096F38 54 03 D9 7E */ srwi r3, r0, 5
/* 80099FFC 00096F3C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A000 00096F40 7C 08 03 A6 */ mtlr r0
/* 8009A004 00096F44 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A008 00096F48 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A00C.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009A00C 00096F4C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A010 00096F50 7C 08 02 A6 */ mflr r0
/* 8009A014 00096F54 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A018 00096F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A01C 00096F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A020 00096F60 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A024 00096F64 38 80 00 0A */ li r4, 0xa
/* 8009A028 00096F68 38 A0 00 01 */ li r5, 1
/* 8009A02C 00096F6C 4B F9 90 05 */ bl getItem__17dSv_player_item_cCFib
/* 8009A030 00096F70 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A034 00096F74 20 00 00 47 */ subfic r0, r0, 0x47
/* 8009A038 00096F78 7C 00 00 34 */ cntlzw r0, r0
/* 8009A03C 00096F7C 54 03 D9 7E */ srwi r3, r0, 5
/* 8009A040 00096F80 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A044 00096F84 7C 08 03 A6 */ mtlr r0
/* 8009A048 00096F88 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A04C 00096F8C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A050.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009A050 00096F90 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A054 00096F94 7C 08 02 A6 */ mflr r0
/* 8009A058 00096F98 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A05C 00096F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A060 00096FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A064 00096FA4 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A068 00096FA8 38 80 00 01 */ li r4, 1
/* 8009A06C 00096FAC 38 A0 00 01 */ li r5, 1
/* 8009A070 00096FB0 4B F9 8F C1 */ bl getItem__17dSv_player_item_cCFib
/* 8009A074 00096FB4 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A078 00096FB8 20 00 00 48 */ subfic r0, r0, 0x48
/* 8009A07C 00096FBC 7C 00 00 34 */ cntlzw r0, r0
/* 8009A080 00096FC0 54 03 D9 7E */ srwi r3, r0, 5
/* 8009A084 00096FC4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A088 00096FC8 7C 08 03 A6 */ mtlr r0
/* 8009A08C 00096FCC 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A090 00096FD0 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A0C8.s
+82
View File
@@ -0,0 +1,82 @@
/* 8009A0C8 00097008 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8009A0CC 0009700C 7C 08 02 A6 */ mflr r0
/* 8009A0D0 00097010 90 01 00 24 */ stw r0, 0x24(r1)
/* 8009A0D4 00097014 39 61 00 20 */ addi r11, r1, 0x20
/* 8009A0D8 00097018 48 2C 80 F9 */ bl _savegpr_26
/* 8009A0DC 0009701C 3B E0 00 01 */ li r31, 1
/* 8009A0E0 00097020 7F FE FB 78 */ mr r30, r31
/* 8009A0E4 00097024 7F FD FB 78 */ mr r29, r31
/* 8009A0E8 00097028 7F FC FB 78 */ mr r28, r31
/* 8009A0EC 0009702C 7F FB FB 78 */ mr r27, r31
/* 8009A0F0 00097030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A0F4 00097034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A0F8 00097038 3B 43 00 9C */ addi r26, r3, 0x9c
/* 8009A0FC 0009703C 7F 43 D3 78 */ mr r3, r26
/* 8009A100 00097040 38 80 00 14 */ li r4, 0x14
/* 8009A104 00097044 38 A0 00 01 */ li r5, 1
/* 8009A108 00097048 4B F9 8F 29 */ bl getItem__17dSv_player_item_cCFib
/* 8009A10C 0009704C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A110 00097050 28 00 00 4A */ cmplwi r0, 0x4a
/* 8009A114 00097054 41 82 00 24 */ beq lbl_8009A138
/* 8009A118 00097058 7F 43 D3 78 */ mr r3, r26
/* 8009A11C 0009705C 38 80 00 14 */ li r4, 0x14
/* 8009A120 00097060 38 A0 00 01 */ li r5, 1
/* 8009A124 00097064 4B F9 8F 0D */ bl getItem__17dSv_player_item_cCFib
/* 8009A128 00097068 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A12C 0009706C 28 00 00 5B */ cmplwi r0, 0x5b
/* 8009A130 00097070 41 82 00 08 */ beq lbl_8009A138
/* 8009A134 00097074 3B 60 00 00 */ li r27, 0
lbl_8009A138:
/* 8009A138 00097078 57 60 06 3F */ clrlwi. r0, r27, 0x18
/* 8009A13C 0009707C 40 82 00 24 */ bne lbl_8009A160
/* 8009A140 00097080 7F 43 D3 78 */ mr r3, r26
/* 8009A144 00097084 38 80 00 14 */ li r4, 0x14
/* 8009A148 00097088 38 A0 00 01 */ li r5, 1
/* 8009A14C 0009708C 4B F9 8E E5 */ bl getItem__17dSv_player_item_cCFib
/* 8009A150 00097090 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A154 00097094 28 00 00 5D */ cmplwi r0, 0x5d
/* 8009A158 00097098 41 82 00 08 */ beq lbl_8009A160
/* 8009A15C 0009709C 3B 80 00 00 */ li r28, 0
lbl_8009A160:
/* 8009A160 000970A0 57 80 06 3F */ clrlwi. r0, r28, 0x18
/* 8009A164 000970A4 40 82 00 24 */ bne lbl_8009A188
/* 8009A168 000970A8 7F 43 D3 78 */ mr r3, r26
/* 8009A16C 000970AC 38 80 00 14 */ li r4, 0x14
/* 8009A170 000970B0 38 A0 00 01 */ li r5, 1
/* 8009A174 000970B4 4B F9 8E BD */ bl getItem__17dSv_player_item_cCFib
/* 8009A178 000970B8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A17C 000970BC 28 00 00 5C */ cmplwi r0, 0x5c
/* 8009A180 000970C0 41 82 00 08 */ beq lbl_8009A188
/* 8009A184 000970C4 3B A0 00 00 */ li r29, 0
lbl_8009A188:
/* 8009A188 000970C8 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 8009A18C 000970CC 40 82 00 24 */ bne lbl_8009A1B0
/* 8009A190 000970D0 7F 43 D3 78 */ mr r3, r26
/* 8009A194 000970D4 38 80 00 14 */ li r4, 0x14
/* 8009A198 000970D8 38 A0 00 01 */ li r5, 1
/* 8009A19C 000970DC 4B F9 8E 95 */ bl getItem__17dSv_player_item_cCFib
/* 8009A1A0 000970E0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A1A4 000970E4 28 00 00 5E */ cmplwi r0, 0x5e
/* 8009A1A8 000970E8 41 82 00 08 */ beq lbl_8009A1B0
/* 8009A1AC 000970EC 3B C0 00 00 */ li r30, 0
lbl_8009A1B0:
/* 8009A1B0 000970F0 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8009A1B4 000970F4 40 82 00 24 */ bne lbl_8009A1D8
/* 8009A1B8 000970F8 7F 43 D3 78 */ mr r3, r26
/* 8009A1BC 000970FC 38 80 00 14 */ li r4, 0x14
/* 8009A1C0 00097100 38 A0 00 01 */ li r5, 1
/* 8009A1C4 00097104 4B F9 8E 6D */ bl getItem__17dSv_player_item_cCFib
/* 8009A1C8 00097108 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A1CC 0009710C 28 00 00 5F */ cmplwi r0, 0x5f
/* 8009A1D0 00097110 41 82 00 08 */ beq lbl_8009A1D8
/* 8009A1D4 00097114 3B E0 00 00 */ li r31, 0
lbl_8009A1D8:
/* 8009A1D8 00097118 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009A1DC 0009711C 30 03 FF FF */ addic r0, r3, -1
/* 8009A1E0 00097120 7C 60 19 10 */ subfe r3, r0, r3
/* 8009A1E4 00097124 39 61 00 20 */ addi r11, r1, 0x20
/* 8009A1E8 00097128 48 2C 80 35 */ bl _restgpr_26
/* 8009A1EC 0009712C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8009A1F0 00097130 7C 08 03 A6 */ mtlr r0
/* 8009A1F4 00097134 38 21 00 20 */ addi r1, r1, 0x20
/* 8009A1F8 00097138 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A1FC.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009A1FC 0009713C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A200 00097140 7C 08 02 A6 */ mflr r0
/* 8009A204 00097144 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A208 00097148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A20C 0009714C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A210 00097150 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A214 00097154 38 80 00 17 */ li r4, 0x17
/* 8009A218 00097158 38 A0 00 01 */ li r5, 1
/* 8009A21C 0009715C 4B F9 8E 15 */ bl getItem__17dSv_player_item_cCFib
/* 8009A220 00097160 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A224 00097164 20 00 00 4B */ subfic r0, r0, 0x4b
/* 8009A228 00097168 7C 00 00 34 */ cntlzw r0, r0
/* 8009A22C 0009716C 54 03 D9 7E */ srwi r3, r0, 5
/* 8009A230 00097170 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A234 00097174 7C 08 03 A6 */ mtlr r0
/* 8009A238 00097178 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A23C 0009717C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A308.s
+29
View File
@@ -0,0 +1,29 @@
/* 8009A308 00097248 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A30C 0009724C 7C 08 02 A6 */ mflr r0
/* 8009A310 00097250 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A314 00097254 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8009A318 00097258 3B E0 00 00 */ li r31, 0
/* 8009A31C 0009725C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A320 00097260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A324 00097264 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A328 00097268 38 80 00 04 */ li r4, 4
/* 8009A32C 0009726C 38 A0 00 00 */ li r5, 0
/* 8009A330 00097270 4B F9 8D 01 */ bl getItem__17dSv_player_item_cCFib
/* 8009A334 00097274 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A338 00097278 28 00 00 43 */ cmplwi r0, 0x43
/* 8009A33C 0009727C 40 82 00 1C */ bne lbl_8009A358
/* 8009A340 00097280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A344 00097284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A348 00097288 88 03 00 F8 */ lbz r0, 0xf8(r3)
/* 8009A34C 0009728C 28 00 00 1E */ cmplwi r0, 0x1e
/* 8009A350 00097290 41 80 00 08 */ blt lbl_8009A358
/* 8009A354 00097294 3B E0 00 01 */ li r31, 1
lbl_8009A358:
/* 8009A358 00097298 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009A35C 0009729C 30 03 FF FF */ addic r0, r3, -1
/* 8009A360 000972A0 7C 60 19 10 */ subfe r3, r0, r3
/* 8009A364 000972A4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8009A368 000972A8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A36C 000972AC 7C 08 03 A6 */ mtlr r0
/* 8009A370 000972B0 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A374 000972B4 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A378.s
+29
View File
@@ -0,0 +1,29 @@
/* 8009A378 000972B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A37C 000972BC 7C 08 02 A6 */ mflr r0
/* 8009A380 000972C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A384 000972C4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8009A388 000972C8 3B E0 00 00 */ li r31, 0
/* 8009A38C 000972CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A390 000972D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A394 000972D4 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A398 000972D8 38 80 00 04 */ li r4, 4
/* 8009A39C 000972DC 38 A0 00 00 */ li r5, 0
/* 8009A3A0 000972E0 4B F9 8C 91 */ bl getItem__17dSv_player_item_cCFib
/* 8009A3A4 000972E4 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A3A8 000972E8 28 00 00 43 */ cmplwi r0, 0x43
/* 8009A3AC 000972EC 40 82 00 1C */ bne lbl_8009A3C8
/* 8009A3B0 000972F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A3B4 000972F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A3B8 000972F8 88 03 00 F8 */ lbz r0, 0xf8(r3)
/* 8009A3BC 000972FC 28 00 00 3C */ cmplwi r0, 0x3c
/* 8009A3C0 00097300 41 80 00 08 */ blt lbl_8009A3C8
/* 8009A3C4 00097304 3B E0 00 01 */ li r31, 1
lbl_8009A3C8:
/* 8009A3C8 00097308 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009A3CC 0009730C 30 03 FF FF */ addic r0, r3, -1
/* 8009A3D0 00097310 7C 60 19 10 */ subfe r3, r0, r3
/* 8009A3D4 00097314 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8009A3D8 00097318 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A3DC 0009731C 7C 08 03 A6 */ mtlr r0
/* 8009A3E0 00097320 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A3E4 00097324 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009A3E8.s
+29
View File
@@ -0,0 +1,29 @@
/* 8009A3E8 00097328 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009A3EC 0009732C 7C 08 02 A6 */ mflr r0
/* 8009A3F0 00097330 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009A3F4 00097334 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8009A3F8 00097338 3B E0 00 00 */ li r31, 0
/* 8009A3FC 0009733C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A400 00097340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A404 00097344 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009A408 00097348 38 80 00 04 */ li r4, 4
/* 8009A40C 0009734C 38 A0 00 00 */ li r5, 0
/* 8009A410 00097350 4B F9 8C 21 */ bl getItem__17dSv_player_item_cCFib
/* 8009A414 00097354 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009A418 00097358 28 00 00 43 */ cmplwi r0, 0x43
/* 8009A41C 0009735C 40 82 00 1C */ bne lbl_8009A438
/* 8009A420 00097360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009A424 00097364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009A428 00097368 88 03 00 F8 */ lbz r0, 0xf8(r3)
/* 8009A42C 0009736C 28 00 00 64 */ cmplwi r0, 0x64
/* 8009A430 00097370 41 80 00 08 */ blt lbl_8009A438
/* 8009A434 00097374 3B E0 00 01 */ li r31, 1
lbl_8009A438:
/* 8009A438 00097378 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009A43C 0009737C 30 03 FF FF */ addic r0, r3, -1
/* 8009A440 00097380 7C 60 19 10 */ subfe r3, r0, r3
/* 8009A444 00097384 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8009A448 00097388 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009A44C 0009738C 7C 08 03 A6 */ mtlr r0
/* 8009A450 00097390 38 21 00 10 */ addi r1, r1, 0x10
/* 8009A454 00097394 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AB48.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009AB48 00097A88 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009AB4C 00097A8C 7C 08 02 A6 */ mflr r0
/* 8009AB50 00097A90 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009AB54 00097A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AB58 00097A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AB5C 00097A9C 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009AB60 00097AA0 38 80 00 15 */ li r4, 0x15
/* 8009AB64 00097AA4 38 A0 00 01 */ li r5, 1
/* 8009AB68 00097AA8 4B F9 84 C9 */ bl getItem__17dSv_player_item_cCFib
/* 8009AB6C 00097AAC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009AB70 00097AB0 20 00 00 80 */ subfic r0, r0, 0x80
/* 8009AB74 00097AB4 7C 00 00 34 */ cntlzw r0, r0
/* 8009AB78 00097AB8 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AB7C 00097ABC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009AB80 00097AC0 7C 08 03 A6 */ mtlr r0
/* 8009AB84 00097AC4 38 21 00 10 */ addi r1, r1, 0x10
/* 8009AB88 00097AC8 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AB8C.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009AB8C 00097ACC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009AB90 00097AD0 7C 08 02 A6 */ mflr r0
/* 8009AB94 00097AD4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009AB98 00097AD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AB9C 00097ADC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009ABA0 00097AE0 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009ABA4 00097AE4 38 80 00 15 */ li r4, 0x15
/* 8009ABA8 00097AE8 38 A0 00 01 */ li r5, 1
/* 8009ABAC 00097AEC 4B F9 84 85 */ bl getItem__17dSv_player_item_cCFib
/* 8009ABB0 00097AF0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009ABB4 00097AF4 20 00 00 81 */ subfic r0, r0, 0x81
/* 8009ABB8 00097AF8 7C 00 00 34 */ cntlzw r0, r0
/* 8009ABBC 00097AFC 54 03 D9 7E */ srwi r3, r0, 5
/* 8009ABC0 00097B00 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009ABC4 00097B04 7C 08 03 A6 */ mtlr r0
/* 8009ABC8 00097B08 38 21 00 10 */ addi r1, r1, 0x10
/* 8009ABCC 00097B0C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009ABD0.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009ABD0 00097B10 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009ABD4 00097B14 7C 08 02 A6 */ mflr r0
/* 8009ABD8 00097B18 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009ABDC 00097B1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009ABE0 00097B20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009ABE4 00097B24 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009ABE8 00097B28 38 80 00 15 */ li r4, 0x15
/* 8009ABEC 00097B2C 38 A0 00 01 */ li r5, 1
/* 8009ABF0 00097B30 4B F9 84 41 */ bl getItem__17dSv_player_item_cCFib
/* 8009ABF4 00097B34 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009ABF8 00097B38 20 00 00 82 */ subfic r0, r0, 0x82
/* 8009ABFC 00097B3C 7C 00 00 34 */ cntlzw r0, r0
/* 8009AC00 00097B40 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AC04 00097B44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009AC08 00097B48 7C 08 03 A6 */ mtlr r0
/* 8009AC0C 00097B4C 38 21 00 10 */ addi r1, r1, 0x10
/* 8009AC10 00097B50 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AC14.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009AC14 00097B54 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009AC18 00097B58 7C 08 02 A6 */ mflr r0
/* 8009AC1C 00097B5C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009AC20 00097B60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AC24 00097B64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AC28 00097B68 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009AC2C 00097B6C 38 80 00 15 */ li r4, 0x15
/* 8009AC30 00097B70 38 A0 00 01 */ li r5, 1
/* 8009AC34 00097B74 4B F9 83 FD */ bl getItem__17dSv_player_item_cCFib
/* 8009AC38 00097B78 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009AC3C 00097B7C 20 00 00 83 */ subfic r0, r0, 0x83
/* 8009AC40 00097B80 7C 00 00 34 */ cntlzw r0, r0
/* 8009AC44 00097B84 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AC48 00097B88 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009AC4C 00097B8C 7C 08 03 A6 */ mtlr r0
/* 8009AC50 00097B90 38 21 00 10 */ addi r1, r1, 0x10
/* 8009AC54 00097B94 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AC58.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009AC58 00097B98 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009AC5C 00097B9C 7C 08 02 A6 */ mflr r0
/* 8009AC60 00097BA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009AC64 00097BA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AC68 00097BA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AC6C 00097BAC 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009AC70 00097BB0 38 80 00 16 */ li r4, 0x16
/* 8009AC74 00097BB4 38 A0 00 01 */ li r5, 1
/* 8009AC78 00097BB8 4B F9 83 B9 */ bl getItem__17dSv_player_item_cCFib
/* 8009AC7C 00097BBC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009AC80 00097BC0 20 00 00 84 */ subfic r0, r0, 0x84
/* 8009AC84 00097BC4 7C 00 00 34 */ cntlzw r0, r0
/* 8009AC88 00097BC8 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AC8C 00097BCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009AC90 00097BD0 7C 08 03 A6 */ mtlr r0
/* 8009AC94 00097BD4 38 21 00 10 */ addi r1, r1, 0x10
/* 8009AC98 00097BD8 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AC9C.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009AC9C 00097BDC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009ACA0 00097BE0 7C 08 02 A6 */ mflr r0
/* 8009ACA4 00097BE4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009ACA8 00097BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009ACAC 00097BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009ACB0 00097BF0 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009ACB4 00097BF4 38 80 00 13 */ li r4, 0x13
/* 8009ACB8 00097BF8 38 A0 00 01 */ li r5, 1
/* 8009ACBC 00097BFC 4B F9 83 75 */ bl getItem__17dSv_player_item_cCFib
/* 8009ACC0 00097C00 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009ACC4 00097C04 20 00 00 90 */ subfic r0, r0, 0x90
/* 8009ACC8 00097C08 7C 00 00 34 */ cntlzw r0, r0
/* 8009ACCC 00097C0C 54 03 D9 7E */ srwi r3, r0, 5
/* 8009ACD0 00097C10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009ACD4 00097C14 7C 08 03 A6 */ mtlr r0
/* 8009ACD8 00097C18 38 21 00 10 */ addi r1, r1, 0x10
/* 8009ACDC 00097C1C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009ACE0.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009ACE0 00097C20 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009ACE4 00097C24 7C 08 02 A6 */ mflr r0
/* 8009ACE8 00097C28 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009ACEC 00097C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009ACF0 00097C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009ACF4 00097C34 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009ACF8 00097C38 38 80 00 13 */ li r4, 0x13
/* 8009ACFC 00097C3C 38 A0 00 01 */ li r5, 1
/* 8009AD00 00097C40 4B F9 83 31 */ bl getItem__17dSv_player_item_cCFib
/* 8009AD04 00097C44 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009AD08 00097C48 20 00 00 91 */ subfic r0, r0, 0x91
/* 8009AD0C 00097C4C 7C 00 00 34 */ cntlzw r0, r0
/* 8009AD10 00097C50 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AD14 00097C54 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009AD18 00097C58 7C 08 03 A6 */ mtlr r0
/* 8009AD1C 00097C5C 38 21 00 10 */ addi r1, r1, 0x10
/* 8009AD20 00097C60 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AE7C.s
+7
View File
@@ -0,0 +1,7 @@
/* 8009AE7C 00097DBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AE80 00097DC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AE84 00097DC4 88 03 00 16 */ lbz r0, 0x16(r3)
/* 8009AE88 00097DC8 20 00 00 B0 */ subfic r0, r0, 0xb0
/* 8009AE8C 00097DCC 7C 00 00 34 */ cntlzw r0, r0
/* 8009AE90 00097DD0 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AE94 00097DD4 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AEA0.s
+7
View File
@@ -0,0 +1,7 @@
/* 8009AEA0 00097DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AEA4 00097DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AEA8 00097DE8 88 03 00 16 */ lbz r0, 0x16(r3)
/* 8009AEAC 00097DEC 20 00 00 B2 */ subfic r0, r0, 0xb2
/* 8009AEB0 00097DF0 7C 00 00 34 */ cntlzw r0, r0
/* 8009AEB4 00097DF4 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AEB8 00097DF8 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AEBC.s
+7
View File
@@ -0,0 +1,7 @@
/* 8009AEBC 00097DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AEC0 00097E00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AEC4 00097E04 88 03 00 16 */ lbz r0, 0x16(r3)
/* 8009AEC8 00097E08 20 00 00 B3 */ subfic r0, r0, 0xb3
/* 8009AECC 00097E0C 7C 00 00 34 */ cntlzw r0, r0
/* 8009AED0 00097E10 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AED4 00097E14 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AED8.s
+7
View File
@@ -0,0 +1,7 @@
/* 8009AED8 00097E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AEDC 00097E1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AEE0 00097E20 88 03 00 16 */ lbz r0, 0x16(r3)
/* 8009AEE4 00097E24 20 00 00 B4 */ subfic r0, r0, 0xb4
/* 8009AEE8 00097E28 7C 00 00 34 */ cntlzw r0, r0
/* 8009AEEC 00097E2C 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AEF0 00097E30 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009AEF4.s
+7
View File
@@ -0,0 +1,7 @@
/* 8009AEF4 00097E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009AEF8 00097E38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009AEFC 00097E3C 88 03 00 16 */ lbz r0, 0x16(r3)
/* 8009AF00 00097E40 20 00 00 B5 */ subfic r0, r0, 0xb5
/* 8009AF04 00097E44 7C 00 00 34 */ cntlzw r0, r0
/* 8009AF08 00097E48 54 03 D9 7E */ srwi r3, r0, 5
/* 8009AF0C 00097E4C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B3A0.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009B3A0 000982E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009B3A4 000982E4 7C 08 02 A6 */ mflr r0
/* 8009B3A8 000982E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009B3AC 000982EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B3B0 000982F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B3B4 000982F4 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009B3B8 000982F8 38 80 00 16 */ li r4, 0x16
/* 8009B3BC 000982FC 38 A0 00 01 */ li r5, 1
/* 8009B3C0 00098300 4B F9 7C 71 */ bl getItem__17dSv_player_item_cCFib
/* 8009B3C4 00098304 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B3C8 00098308 20 00 00 E9 */ subfic r0, r0, 0xe9
/* 8009B3CC 0009830C 7C 00 00 34 */ cntlzw r0, r0
/* 8009B3D0 00098310 54 03 D9 7E */ srwi r3, r0, 5
/* 8009B3D4 00098314 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009B3D8 00098318 7C 08 03 A6 */ mtlr r0
/* 8009B3DC 0009831C 38 21 00 10 */ addi r1, r1, 0x10
/* 8009B3E0 00098320 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B3E4.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009B3E4 00098324 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009B3E8 00098328 7C 08 02 A6 */ mflr r0
/* 8009B3EC 0009832C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009B3F0 00098330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B3F4 00098334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B3F8 00098338 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009B3FC 0009833C 38 80 00 16 */ li r4, 0x16
/* 8009B400 00098340 38 A0 00 01 */ li r5, 1
/* 8009B404 00098344 4B F9 7C 2D */ bl getItem__17dSv_player_item_cCFib
/* 8009B408 00098348 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B40C 0009834C 20 00 00 EA */ subfic r0, r0, 0xea
/* 8009B410 00098350 7C 00 00 34 */ cntlzw r0, r0
/* 8009B414 00098354 54 03 D9 7E */ srwi r3, r0, 5
/* 8009B418 00098358 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009B41C 0009835C 7C 08 03 A6 */ mtlr r0
/* 8009B420 00098360 38 21 00 10 */ addi r1, r1, 0x10
/* 8009B424 00098364 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B428.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009B428 00098368 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009B42C 0009836C 7C 08 02 A6 */ mflr r0
/* 8009B430 00098370 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009B434 00098374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B438 00098378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B43C 0009837C 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009B440 00098380 38 80 00 16 */ li r4, 0x16
/* 8009B444 00098384 38 A0 00 01 */ li r5, 1
/* 8009B448 00098388 4B F9 7B E9 */ bl getItem__17dSv_player_item_cCFib
/* 8009B44C 0009838C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B450 00098390 20 00 00 EB */ subfic r0, r0, 0xeb
/* 8009B454 00098394 7C 00 00 34 */ cntlzw r0, r0
/* 8009B458 00098398 54 03 D9 7E */ srwi r3, r0, 5
/* 8009B45C 0009839C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009B460 000983A0 7C 08 03 A6 */ mtlr r0
/* 8009B464 000983A4 38 21 00 10 */ addi r1, r1, 0x10
/* 8009B468 000983A8 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B46C.s
+17
View File
@@ -0,0 +1,17 @@
/* 8009B46C 000983AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009B470 000983B0 7C 08 02 A6 */ mflr r0
/* 8009B474 000983B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009B478 000983B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B47C 000983BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B480 000983C0 38 63 00 9C */ addi r3, r3, 0x9c
/* 8009B484 000983C4 38 80 00 12 */ li r4, 0x12
/* 8009B488 000983C8 38 A0 00 01 */ li r5, 1
/* 8009B48C 000983CC 4B F9 7B A5 */ bl getItem__17dSv_player_item_cCFib
/* 8009B490 000983D0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B494 000983D4 20 00 00 EC */ subfic r0, r0, 0xec
/* 8009B498 000983D8 7C 00 00 34 */ cntlzw r0, r0
/* 8009B49C 000983DC 54 03 D9 7E */ srwi r3, r0, 5
/* 8009B4A0 000983E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009B4A4 000983E4 7C 08 03 A6 */ mtlr r0
/* 8009B4A8 000983E8 38 21 00 10 */ addi r1, r1, 0x10
/* 8009B4AC 000983EC 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B688.s
+21
View File
@@ -0,0 +1,21 @@
/* 8009B688 000985C8 38 A0 00 00 */ li r5, 0
/* 8009B68C 000985CC 38 03 FF F6 */ addi r0, r3, -10
/* 8009B690 000985D0 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8009B694 000985D4 28 00 00 03 */ cmplwi r0, 3
/* 8009B698 000985D8 40 81 00 30 */ ble lbl_8009B6C8
/* 8009B69C 000985DC 54 64 06 3E */ clrlwi r4, r3, 0x18
/* 8009B6A0 000985E0 20 04 00 70 */ subfic r0, r4, 0x70
/* 8009B6A4 000985E4 7C 00 00 34 */ cntlzw r0, r0
/* 8009B6A8 000985E8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8009B6AC 000985EC 20 04 00 71 */ subfic r0, r4, 0x71
/* 8009B6B0 000985F0 7C 00 00 34 */ cntlzw r0, r0
/* 8009B6B4 000985F4 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f
/* 8009B6B8 000985F8 7C 60 03 79 */ or. r0, r3, r0
/* 8009B6BC 000985FC 40 82 00 0C */ bne lbl_8009B6C8
/* 8009B6C0 00098600 28 04 00 72 */ cmplwi r4, 0x72
/* 8009B6C4 00098604 40 82 00 08 */ bne lbl_8009B6CC
lbl_8009B6C8:
/* 8009B6C8 00098608 38 A0 00 01 */ li r5, 1
lbl_8009B6CC:
/* 8009B6CC 0009860C 7C A3 2B 78 */ mr r3, r5
/* 8009B6D0 00098610 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B708.s
+35
View File
@@ -0,0 +1,35 @@
/* 8009B708 00098648 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B70C 0009864C 2C 00 00 9D */ cmpwi r0, 0x9d
/* 8009B710 00098650 41 82 00 5C */ beq lbl_8009B76C
/* 8009B714 00098654 40 80 00 3C */ bge lbl_8009B750
/* 8009B718 00098658 2C 00 00 75 */ cmpwi r0, 0x75
/* 8009B71C 0009865C 41 82 00 58 */ beq lbl_8009B774
/* 8009B720 00098660 40 80 00 24 */ bge lbl_8009B744
/* 8009B724 00098664 2C 00 00 6D */ cmpwi r0, 0x6d
/* 8009B728 00098668 40 80 00 10 */ bge lbl_8009B738
/* 8009B72C 0009866C 2C 00 00 60 */ cmpwi r0, 0x60
/* 8009B730 00098670 40 80 00 3C */ bge lbl_8009B76C
/* 8009B734 00098674 48 00 00 40 */ b lbl_8009B774
lbl_8009B738:
/* 8009B738 00098678 2C 00 00 73 */ cmpwi r0, 0x73
/* 8009B73C 0009867C 40 80 00 30 */ bge lbl_8009B76C
/* 8009B740 00098680 48 00 00 34 */ b lbl_8009B774
lbl_8009B744:
/* 8009B744 00098684 2C 00 00 80 */ cmpwi r0, 0x80
/* 8009B748 00098688 40 80 00 2C */ bge lbl_8009B774
/* 8009B74C 0009868C 48 00 00 20 */ b lbl_8009B76C
lbl_8009B750:
/* 8009B750 00098690 2C 00 00 EF */ cmpwi r0, 0xef
/* 8009B754 00098694 40 80 00 10 */ bge lbl_8009B764
/* 8009B758 00098698 2C 00 00 9F */ cmpwi r0, 0x9f
/* 8009B75C 0009869C 41 82 00 10 */ beq lbl_8009B76C
/* 8009B760 000986A0 48 00 00 14 */ b lbl_8009B774
lbl_8009B764:
/* 8009B764 000986A4 2C 00 00 F3 */ cmpwi r0, 0xf3
/* 8009B768 000986A8 40 80 00 0C */ bge lbl_8009B774
lbl_8009B76C:
/* 8009B76C 000986AC 38 60 00 01 */ li r3, 1
/* 8009B770 000986B0 4E 80 00 20 */ blr
lbl_8009B774:
/* 8009B774 000986B4 38 60 00 00 */ li r3, 0
/* 8009B778 000986B8 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B79C.s
+12
View File
@@ -0,0 +1,12 @@
/* 8009B79C 000986DC 38 80 00 00 */ li r4, 0
/* 8009B7A0 000986E0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009B7A4 000986E4 2C 00 00 D8 */ cmpwi r0, 0xd8
/* 8009B7A8 000986E8 40 80 00 14 */ bge lbl_8009B7BC
/* 8009B7AC 000986EC 2C 00 00 C0 */ cmpwi r0, 0xc0
/* 8009B7B0 000986F0 40 80 00 08 */ bge lbl_8009B7B8
/* 8009B7B4 000986F4 48 00 00 08 */ b lbl_8009B7BC
lbl_8009B7B8:
/* 8009B7B8 000986F8 38 80 00 01 */ li r4, 1
lbl_8009B7BC:
/* 8009B7BC 000986FC 7C 83 23 78 */ mr r3, r4
/* 8009B7C0 00098700 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B7C4.s
+107
View File
@@ -0,0 +1,107 @@
/* 8009B7C4 00098704 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009B7C8 00098708 7C 08 02 A6 */ mflr r0
/* 8009B7CC 0009870C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8009B7D0 00098710 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8009B7D4 00098714 7C 7F 1B 78 */ mr r31, r3
/* 8009B7D8 00098718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B7DC 0009871C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B7E0 00098720 38 80 00 00 */ li r4, 0
/* 8009B7E4 00098724 4B F9 73 15 */ bl isMagicFlag__21dSv_player_status_a_cCFUc
/* 8009B7E8 00098728 2C 03 00 00 */ cmpwi r3, 0
/* 8009B7EC 0009872C 40 82 00 1C */ bne lbl_8009B808
/* 8009B7F0 00098730 2C 1F 00 08 */ cmpwi r31, 8
/* 8009B7F4 00098734 41 82 00 0C */ beq lbl_8009B800
/* 8009B7F8 00098738 2C 1F 00 09 */ cmpwi r31, 9
/* 8009B7FC 0009873C 40 82 00 0C */ bne lbl_8009B808
lbl_8009B800:
/* 8009B800 00098740 38 60 00 01 */ li r3, 1
/* 8009B804 00098744 48 00 01 28 */ b lbl_8009B92C
lbl_8009B808:
/* 8009B808 00098748 2C 1F 00 11 */ cmpwi r31, 0x11
/* 8009B80C 0009874C 40 82 00 28 */ bne lbl_8009B834
/* 8009B810 00098750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B814 00098754 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B818 00098758 38 63 00 CC */ addi r3, r3, 0xcc
/* 8009B81C 0009875C 38 80 00 43 */ li r4, 0x43
/* 8009B820 00098760 4B F9 86 A9 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8009B824 00098764 2C 03 00 00 */ cmpwi r3, 0
/* 8009B828 00098768 40 82 00 8C */ bne lbl_8009B8B4
/* 8009B82C 0009876C 38 60 00 01 */ li r3, 1
/* 8009B830 00098770 48 00 00 FC */ b lbl_8009B92C
lbl_8009B834:
/* 8009B834 00098774 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009B838 00098778 4B FF FE 9D */ bl isArrow
/* 8009B83C 0009877C 2C 03 00 00 */ cmpwi r3, 0
/* 8009B840 00098780 41 82 00 74 */ beq lbl_8009B8B4
/* 8009B844 00098784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B848 00098788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B84C 0009878C 38 63 00 CC */ addi r3, r3, 0xcc
/* 8009B850 00098790 38 80 00 43 */ li r4, 0x43
/* 8009B854 00098794 4B F9 86 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8009B858 00098798 2C 03 00 00 */ cmpwi r3, 0
/* 8009B85C 0009879C 40 82 00 0C */ bne lbl_8009B868
/* 8009B860 000987A0 38 60 00 01 */ li r3, 1
/* 8009B864 000987A4 48 00 00 C8 */ b lbl_8009B92C
lbl_8009B868:
/* 8009B868 000987A8 38 60 00 00 */ li r3, 0
/* 8009B86C 000987AC 4B F9 11 11 */ bl dComIfG_play_c_NS_getLayerNo
/* 8009B870 000987B0 2C 03 00 0D */ cmpwi r3, 0xd
/* 8009B874 000987B4 41 82 00 14 */ beq lbl_8009B888
/* 8009B878 000987B8 38 60 00 00 */ li r3, 0
/* 8009B87C 000987BC 4B F9 11 01 */ bl dComIfG_play_c_NS_getLayerNo
/* 8009B880 000987C0 2C 03 00 0E */ cmpwi r3, 0xe
/* 8009B884 000987C4 40 82 00 30 */ bne lbl_8009B8B4
lbl_8009B888:
/* 8009B888 000987C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B88C 000987CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B890 000987D0 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 8009B894 000987D4 3C 80 80 38 */ lis r4, lbl_8037B0D0@ha
/* 8009B898 000987D8 38 84 B0 D0 */ addi r4, r4, lbl_8037B0D0@l
/* 8009B89C 000987DC 38 A0 00 06 */ li r5, 6
/* 8009B8A0 000987E0 48 2C D0 B5 */ bl func_80368954
/* 8009B8A4 000987E4 2C 03 00 00 */ cmpwi r3, 0
/* 8009B8A8 000987E8 41 82 00 0C */ beq lbl_8009B8B4
/* 8009B8AC 000987EC 38 60 00 01 */ li r3, 1
/* 8009B8B0 000987F0 48 00 00 7C */ b lbl_8009B92C
lbl_8009B8B4:
/* 8009B8B4 000987F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B8B8 000987F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B8BC 000987FC 38 63 00 CC */ addi r3, r3, 0xcc
/* 8009B8C0 00098800 38 80 00 50 */ li r4, 0x50
/* 8009B8C4 00098804 4B F9 86 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8009B8C8 00098808 2C 03 00 00 */ cmpwi r3, 0
/* 8009B8CC 0009880C 40 82 00 1C */ bne lbl_8009B8E8
/* 8009B8D0 00098810 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009B8D4 00098814 4B FF FD B5 */ bl isBomb
/* 8009B8D8 00098818 2C 03 00 00 */ cmpwi r3, 0
/* 8009B8DC 0009881C 41 82 00 0C */ beq lbl_8009B8E8
/* 8009B8E0 00098820 38 60 00 01 */ li r3, 1
/* 8009B8E4 00098824 48 00 00 48 */ b lbl_8009B92C
lbl_8009B8E8:
/* 8009B8E8 00098828 2C 1F 00 1F */ cmpwi r31, 0x1f
/* 8009B8EC 0009882C 40 82 00 08 */ bne lbl_8009B8F4
/* 8009B8F0 00098830 3B E0 00 00 */ li r31, 0
lbl_8009B8F4:
/* 8009B8F4 00098834 38 60 00 4B */ li r3, 0x4b
/* 8009B8F8 00098838 38 80 00 01 */ li r4, 1
/* 8009B8FC 0009883C 4B FF C5 E5 */ bl checkItemGet__FUci
/* 8009B900 00098840 2C 03 00 00 */ cmpwi r3, 0
/* 8009B904 00098844 40 82 00 10 */ bne lbl_8009B914
/* 8009B908 00098848 2C 1F 00 12 */ cmpwi r31, 0x12
/* 8009B90C 0009884C 40 82 00 08 */ bne lbl_8009B914
/* 8009B910 00098850 3B E0 00 01 */ li r31, 1
lbl_8009B914:
/* 8009B914 00098854 2C 1F 00 08 */ cmpwi r31, 8
/* 8009B918 00098858 41 82 00 0C */ beq lbl_8009B924
/* 8009B91C 0009885C 2C 1F 00 09 */ cmpwi r31, 9
/* 8009B920 00098860 40 82 00 08 */ bne lbl_8009B928
lbl_8009B924:
/* 8009B924 00098864 3B E0 00 01 */ li r31, 1
lbl_8009B928:
/* 8009B928 00098868 57 E3 06 3E */ clrlwi r3, r31, 0x18
lbl_8009B92C:
/* 8009B92C 0009886C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8009B930 00098870 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8009B934 00098874 7C 08 03 A6 */ mtlr r0
/* 8009B938 00098878 38 21 00 10 */ addi r1, r1, 0x10
/* 8009B93C 0009887C 4E 80 00 20 */ blr
include/d/d_item/d_item/asm/func_8009B940.s
+185
View File
@@ -0,0 +1,185 @@
/* 8009B940 00098880 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 8009B944 00098884 7C 08 02 A6 */ mflr r0
/* 8009B948 00098888 90 01 00 54 */ stw r0, 0x54(r1)
/* 8009B94C 0009888C 39 61 00 50 */ addi r11, r1, 0x50
/* 8009B950 00098890 48 2C 68 69 */ bl func_803621B8
/* 8009B954 00098894 7C 7E 1B 78 */ mr r30, r3
/* 8009B958 00098898 7C 9F 23 78 */ mr r31, r4
/* 8009B95C 0009889C 3B 20 00 00 */ li r25, 0
/* 8009B960 000988A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009B964 000988A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009B968 000988A8 3B 43 00 9C */ addi r26, r3, 0x9c
/* 8009B96C 000988AC 3B 83 00 EC */ addi r28, r3, 0xec
/* 8009B970 000988B0 3B 61 00 08 */ addi r27, r1, 8
/* 8009B974 000988B4 48 00 00 80 */ b lbl_8009B9F4
lbl_8009B978:
/* 8009B978 000988B8 7F 43 D3 78 */ mr r3, r26
/* 8009B97C 000988BC 57 24 06 3E */ clrlwi r4, r25, 0x18
/* 8009B980 000988C0 38 84 00 0F */ addi r4, r4, 0xf
/* 8009B984 000988C4 38 A0 00 00 */ li r5, 0
/* 8009B988 000988C8 4B F9 76 A9 */ bl getItem__17dSv_player_item_cCFib
/* 8009B98C 000988CC 57 35 06 3E */ clrlwi r21, r25, 0x18
/* 8009B990 000988D0 7C 7B A9 AE */ stbx r3, r27, r21
/* 8009B994 000988D4 7C 7B A8 AE */ lbzx r3, r27, r21
/* 8009B998 000988D8 28 03 00 50 */ cmplwi r3, 0x50
/* 8009B99C 000988DC 40 82 00 18 */ bne lbl_8009B9B4
/* 8009B9A0 000988E0 38 80 00 00 */ li r4, 0
/* 8009B9A4 000988E4 56 A0 10 3A */ slwi r0, r21, 2
/* 8009B9A8 000988E8 38 61 00 0C */ addi r3, r1, 0xc
/* 8009B9AC 000988EC 7C 83 01 2E */ stwx r4, r3, r0
/* 8009B9B0 000988F0 48 00 00 40 */ b lbl_8009B9F0
lbl_8009B9B4:
/* 8009B9B4 000988F4 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 8009B9B8 000988F8 7C 03 00 40 */ cmplw r3, r0
/* 8009B9BC 000988FC 40 82 00 24 */ bne lbl_8009B9E0
/* 8009B9C0 00098900 7F 83 E3 78 */ mr r3, r28
/* 8009B9C4 00098904 7F 24 CB 78 */ mr r4, r25
/* 8009B9C8 00098908 4B F9 85 B5 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8009B9CC 0009890C 54 64 06 3E */ clrlwi r4, r3, 0x18
/* 8009B9D0 00098910 56 A0 10 3A */ slwi r0, r21, 2
/* 8009B9D4 00098914 38 61 00 0C */ addi r3, r1, 0xc
/* 8009B9D8 00098918 7C 83 01 2E */ stwx r4, r3, r0
/* 8009B9DC 0009891C 48 00 00 14 */ b lbl_8009B9F0
lbl_8009B9E0:
/* 8009B9E0 00098920 38 80 FF FF */ li r4, -1
/* 8009B9E4 00098924 56 A0 10 3A */ slwi r0, r21, 2
/* 8009B9E8 00098928 38 61 00 0C */ addi r3, r1, 0xc
/* 8009B9EC 0009892C 7C 83 01 2E */ stwx r4, r3, r0
lbl_8009B9F0:
/* 8009B9F0 00098930 3B 39 00 01 */ addi r25, r25, 1
lbl_8009B9F4:
/* 8009B9F4 00098934 57 20 06 3E */ clrlwi r0, r25, 0x18
/* 8009B9F8 00098938 28 00 00 03 */ cmplwi r0, 3
/* 8009B9FC 0009893C 41 80 FF 7C */ blt lbl_8009B978
/* 8009BA00 00098940 3B 00 00 00 */ li r24, 0
/* 8009BA04 00098944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8009BA08 00098948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8009BA0C 0009894C 3B 63 00 F8 */ addi r27, r3, 0xf8
/* 8009BA10 00098950 3B 23 0F 38 */ addi r25, r3, 0xf38
/* 8009BA14 00098954 3B A1 00 08 */ addi r29, r1, 8
/* 8009BA18 00098958 3B 81 00 0C */ addi r28, r1, 0xc
/* 8009BA1C 0009895C 48 00 01 94 */ b lbl_8009BBB0
lbl_8009BA20:
/* 8009BA20 00098960 3A E0 FF FF */ li r23, -1
/* 8009BA24 00098964 3A C0 FF FF */ li r22, -1
/* 8009BA28 00098968 38 80 00 00 */ li r4, 0
/* 8009BA2C 0009896C 48 00 00 24 */ b lbl_8009BA50
lbl_8009BA30:
/* 8009BA30 00098970 54 83 06 3E */ clrlwi r3, r4, 0x18
/* 8009BA34 00098974 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d
/* 8009BA38 00098978 7C 1C 00 2E */ lwzx r0, r28, r0
/* 8009BA3C 0009897C 2C 00 00 00 */ cmpwi r0, 0
/* 8009BA40 00098980 40 82 00 0C */ bne lbl_8009BA4C
/* 8009BA44 00098984 7C 77 1B 78 */ mr r23, r3
/* 8009BA48 00098988 3A C0 00 00 */ li r22, 0
lbl_8009BA4C:
/* 8009BA4C 0009898C 38 84 00 01 */ addi r4, r4, 1
lbl_8009BA50:
/* 8009BA50 00098990 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 8009BA54 00098994 28 00 00 03 */ cmplwi r0, 3
/* 8009BA58 00098998 41 80 FF D8 */ blt lbl_8009BA30
/* 8009BA5C 0009899C 3A A0 00 00 */ li r21, 0
/* 8009BA60 000989A0 48 00 00 44 */ b lbl_8009BAA4
lbl_8009BA64:
/* 8009BA64 000989A4 56 A4 06 3E */ clrlwi r4, r21, 0x18
/* 8009BA68 000989A8 56 A0 15 BA */ rlwinm r0, r21, 2, 0x16, 0x1d
/* 8009BA6C 000989AC 7E 9C 00 2E */ lwzx r20, r28, r0
/* 8009BA70 000989B0 2C 14 00 00 */ cmpwi r20, 0
/* 8009BA74 000989B4 40 81 00 2C */ ble lbl_8009BAA0
/* 8009BA78 000989B8 7C 14 B0 00 */ cmpw r20, r22
/* 8009BA7C 000989BC 40 81 00 24 */ ble lbl_8009BAA0
/* 8009BA80 000989C0 7F 63 DB 78 */ mr r3, r27
/* 8009BA84 000989C4 7C 9D 20 AE */ lbzx r4, r29, r4
/* 8009BA88 000989C8 4B F9 86 71 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BA8C 000989CC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8009BA90 000989D0 7C 14 00 00 */ cmpw r20, r0
/* 8009BA94 000989D4 41 82 00 0C */ beq lbl_8009BAA0
/* 8009BA98 000989D8 56 B7 06 3E */ clrlwi r23, r21, 0x18
/* 8009BA9C 000989DC 7E 96 A3 78 */ mr r22, r20
lbl_8009BAA0:
/* 8009BAA0 000989E0 3A B5 00 01 */ addi r21, r21, 1
lbl_8009BAA4:
/* 8009BAA4 000989E4 56 A0 06 3E */ clrlwi r0, r21, 0x18
/* 8009BAA8 000989E8 28 00 00 03 */ cmplwi r0, 3
/* 8009BAAC 000989EC 41 80 FF B8 */ blt lbl_8009BA64
/* 8009BAB0 000989F0 2C 17 FF FF */ cmpwi r23, -1
/* 8009BAB4 000989F4 40 82 00 0C */ bne lbl_8009BAC0
/* 8009BAB8 000989F8 57 E3 06 3E */ clrlwi r3, r31, 0x18
/* 8009BABC 000989FC 48 00 01 04 */ b lbl_8009BBC0
lbl_8009BAC0:
/* 8009BAC0 00098A00 2C 16 00 00 */ cmpwi r22, 0
/* 8009BAC4 00098A04 40 82 00 68 */ bne lbl_8009BB2C
/* 8009BAC8 00098A08 7F 63 DB 78 */ mr r3, r27
/* 8009BACC 00098A0C 7F C4 F3 78 */ mr r4, r30
/* 8009BAD0 00098A10 4B F9 86 29 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BAD4 00098A14 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 8009BAD8 00098A18 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 8009BADC 00098A1C 7C 03 00 40 */ cmplw r3, r0
/* 8009BAE0 00098A20 41 80 00 20 */ blt lbl_8009BB00
/* 8009BAE4 00098A24 7F 43 D3 78 */ mr r3, r26
/* 8009BAE8 00098A28 7F C4 F3 78 */ mr r4, r30
/* 8009BAEC 00098A2C 7F E5 FB 78 */ mr r5, r31
/* 8009BAF0 00098A30 38 C0 00 01 */ li r6, 1
/* 8009BAF4 00098A34 4B F9 7F 5D */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb
/* 8009BAF8 00098A38 38 60 00 00 */ li r3, 0
/* 8009BAFC 00098A3C 48 00 00 C4 */ b lbl_8009BBC0
lbl_8009BB00:
/* 8009BB00 00098A40 7F 43 D3 78 */ mr r3, r26
/* 8009BB04 00098A44 7F C4 F3 78 */ mr r4, r30
/* 8009BB08 00098A48 7F E5 FB 78 */ mr r5, r31
/* 8009BB0C 00098A4C 38 C0 00 01 */ li r6, 1
/* 8009BB10 00098A50 4B F9 7F 41 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb
/* 8009BB14 00098A54 7F 63 DB 78 */ mr r3, r27
/* 8009BB18 00098A58 7F C4 F3 78 */ mr r4, r30
/* 8009BB1C 00098A5C 4B F9 85 DD */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BB20 00098A60 7C 03 F8 50 */ subf r0, r3, r31
/* 8009BB24 00098A64 54 1F 06 3E */ clrlwi r31, r0, 0x18
/* 8009BB28 00098A68 48 00 00 6C */ b lbl_8009BB94
lbl_8009BB2C:
/* 8009BB2C 00098A6C 7F 63 DB 78 */ mr r3, r27
/* 8009BB30 00098A70 38 81 00 08 */ addi r4, r1, 8
/* 8009BB34 00098A74 7E 84 B8 AE */ lbzx r20, r4, r23
/* 8009BB38 00098A78 7E 84 A3 78 */ mr r4, r20
/* 8009BB3C 00098A7C 4B F9 85 BD */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BB40 00098A80 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 8009BB44 00098A84 57 F5 06 3E */ clrlwi r21, r31, 0x18
/* 8009BB48 00098A88 7C 16 AA 14 */ add r0, r22, r21
/* 8009BB4C 00098A8C 7C 03 00 00 */ cmpw r3, r0
/* 8009BB50 00098A90 41 80 00 1C */ blt lbl_8009BB6C
/* 8009BB54 00098A94 7F 23 CB 78 */ mr r3, r25
/* 8009BB58 00098A98 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 8009BB5C 00098A9C 7E A5 AB 78 */ mr r5, r21
/* 8009BB60 00098AA0 4B F8 F8 0D */ bl dComIfG_play_c_NS_setItemBombNumCount
/* 8009BB64 00098AA4 38 60 00 00 */ li r3, 0
/* 8009BB68 00098AA8 48 00 00 58 */ b lbl_8009BBC0
lbl_8009BB6C:
/* 8009BB6C 00098AAC 7F 23 CB 78 */ mr r3, r25
/* 8009BB70 00098AB0 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 8009BB74 00098AB4 7E A5 AB 78 */ mr r5, r21
/* 8009BB78 00098AB8 4B F8 F7 F5 */ bl dComIfG_play_c_NS_setItemBombNumCount
/* 8009BB7C 00098ABC 7F 63 DB 78 */ mr r3, r27
/* 8009BB80 00098AC0 7E 84 A3 78 */ mr r4, r20
/* 8009BB84 00098AC4 4B F9 85 75 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BB88 00098AC8 7C 16 18 50 */ subf r0, r22, r3
/* 8009BB8C 00098ACC 7C 00 A8 50 */ subf r0, r0, r21
/* 8009BB90 00098AD0 54 1F 06 3E */ clrlwi r31, r0, 0x18
lbl_8009BB94:
/* 8009BB94 00098AD4 7F 63 DB 78 */ mr r3, r27
/* 8009BB98 00098AD8 7C 9D B8 AE */ lbzx r4, r29, r23
/* 8009BB9C 00098ADC 4B F9 85 5D */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 8009BBA0 00098AE0 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 8009BBA4 00098AE4 56 E0 10 3A */ slwi r0, r23, 2
/* 8009BBA8 00098AE8 7C 7C 01 2E */ stwx r3, r28, r0
/* 8009BBAC 00098AEC 3B 18 00 01 */ addi r24, r24, 1
lbl_8009BBB0:
/* 8009BBB0 00098AF0 57 00 06 3E */ clrlwi r0, r24, 0x18
/* 8009BBB4 00098AF4 28 00 00 03 */ cmplwi r0, 3
/* 8009BBB8 00098AF8 41 80 FE 68 */ blt lbl_8009BA20
/* 8009BBBC 00098AFC 57 E3 06 3E */ clrlwi r3, r31, 0x18
lbl_8009BBC0:
/* 8009BBC0 00098B00 39 61 00 50 */ addi r11, r1, 0x50
/* 8009BBC4 00098B04 48 2C 66 41 */ bl func_80362204
/* 8009BBC8 00098B08 80 01 00 54 */ lwz r0, 0x54(r1)
/* 8009BBCC 00098B0C 7C 08 03 A6 */ mtlr r0
/* 8009BBD0 00098B10 38 21 00 50 */ addi r1, r1, 0x50
/* 8009BBD4 00098B14 4E 80 00 20 */ blr
include/d/d_item/d_item/d_item.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef D_ITEM_H_
#define D_ITEM_H_
int checkItemGet(u8,int);
extern int (*item_func_ptr[256])(void);
extern int (*item_getcheck_func_ptr[256])(void);
#endif
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