falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more d_item / d_a_horse_static done (#32) 

* more d_item funcs done / add dSv_info_c to gameinfo

* checkWait ok / remove asm
This commit is contained in:
TakaRikka 2020-12-14 11:07:29 -08:00 committed by GitHub
parent 43ac7130b9
commit 22bda03652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 345 additions and 945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/d/d_a/d_a_horse_static/asm/func_80037C7C.s
View File

@ -1,5 +0,0 @@
/* 80037C7C 00034BBC A8 03 05 B4 */ lha r0, 0x5b4(r3)
/* 80037C80 00034BC0 20 00 00 2A */ subfic r0, r0, 0x2a
/* 80037C84 00034BC4 7C 00 00 34 */ cntlzw r0, r0
/* 80037C88 00034BC8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 80037C8C 00034BCC 4E 80 00 20 */ blr

7
include/d/d_com/d_com_inf_game/d_com_inf_game.h
View File

@ -60,11 +60,8 @@ struct item_func{
// 16 bytes too big, figure out later
class dComIfG_inf_c {
public:
/* 0x00000 */ dSv_save_c save_file;
/* 0x00958 */ dSv_memory_c memory;
/* 0x00978 */ u8 unk1[0x3C];
/* 0x009B4 */ dSv_zone_c zone;
/* 0x009D4 */ u8 unk2[0x564];
/* 0x00000 */ dSv_info_c info;
/* 0x00EEC */ u8 unk2[0x4C];
/* 0x00F38 */ dComIfG_play_c play;
/* 0x01038 */ u8 unk3[0x3B50];
/* 0x04B88 */ dCcMassS_Mng mass_mng;

17
include/d/d_item/d_item/asm/func_80099A70.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099AE4.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099D30.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099D8C.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099E30.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099E74.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099EB8.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099EFC.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099F40.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099F84.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_80099FC8.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009A00C.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009A050.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009A1FC.s
View File

@ -1,17 +0,0 @@
/* 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

29
include/d/d_item/d_item/asm/func_8009A308.s
View File

@ -1,29 +0,0 @@
/* 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

29
include/d/d_item/d_item/asm/func_8009A378.s
View File

@ -1,29 +0,0 @@
/* 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

29
include/d/d_item/d_item/asm/func_8009A3E8.s
View File

@ -1,29 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009AB48.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009AB8C.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009ABD0.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009AC14.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009AC58.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009AC9C.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009ACE0.s
View File

@ -1,17 +0,0 @@
/* 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

7
include/d/d_item/d_item/asm/func_8009AE7C.s
View File

@ -1,7 +0,0 @@
/* 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

7
include/d/d_item/d_item/asm/func_8009AEA0.s
View File

@ -1,7 +0,0 @@
/* 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

7
include/d/d_item/d_item/asm/func_8009AEBC.s
View File

@ -1,7 +0,0 @@
/* 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

7
include/d/d_item/d_item/asm/func_8009AED8.s
View File

@ -1,7 +0,0 @@
/* 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

7
include/d/d_item/d_item/asm/func_8009AEF4.s
View File

@ -1,7 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009B3A0.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009B3E4.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009B428.s
View File

@ -1,17 +0,0 @@
/* 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

17
include/d/d_item/d_item/asm/func_8009B46C.s
View File

@ -1,17 +0,0 @@
/* 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

21
include/d/d_save/d_save/d_save.h
View File

@ -325,7 +325,7 @@ enum Shields {
};
enum Armors {
HEROS_CLOTHES_FLAG
KOKIRI_CLOTHES_FLAG
};
enum DungeonItem {
@ -351,16 +351,11 @@ class dSv_player_status_a_c {
u16 getRupeeMax(void) const;
int isMagicFlag(u8) const;
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;
}
u16& getCurrentHealth() { return current_health; }
u8& getScent() { return equipment[3];}
void setWalletLV(u8 lv) { current_wallet = lv;}
void setLanternOil(u16 amount) { max_lantern_oil = amount; current_lantern_oil = amount; }
private:
u16 max_health;
@ -543,6 +538,7 @@ class dSv_player_item_max_c {
u8 getBombNum(u8) const;
void setBowCapacity(u8 max) { item_capacities[0] = max; }
u8 getBowCapacity(){ return item_capacities[0];}
private:
u8 item_capacities[8];
@ -917,6 +913,9 @@ class dSv_info_c {
void card_to_memory(char*, int);
void initdata_to_card(char*, int);
dSv_save_c& getSaveFile(){ return save_file; }
dSv_memory_c& getMemory(){ return memory; }
private:
dSv_save_c save_file;
dSv_memory_c memory;

14
src/d/d_a/d_a_horse_static.cpp
View File

@ -1,20 +1,12 @@
#include "d/d_a/d_a_horse_static/d_a_horse_static.h"
#include "global.h"
// 1 instruction off
#ifdef NONMATCHING
u32 e_wb_class::checkWait(void){
u32 temp;
temp = (0x2a - (this->unk1460)); // missing a cntlzw
return temp >> 5 & 0xff;
temp = __cntlzw(0x2a - this->unk1460);
return (u8)(temp >> 5);
}
#else
asm u32 e_wb_class::checkWait(void) {
nofralloc
#include "d/d_a/d_a_horse_static/asm/func_80037C7C.s"
}
#endif
void e_wb_class::setPlayerRideNow(void){
this->unk1680 = 0x67;
@ -29,7 +21,7 @@ void e_wb_class::setPlayerRide(void){
this->unk1460 = 0;
this->unk1726 |= 3;
setLinkRiding(true); // needs something else here
setLinkRiding(true); // needs to call Z2CreatureRide
}
#else
asm void e_wb_class::setPlayerRide(void) {

688
src/d/d_item/d_item.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/d/d_save/d_save.cpp
View File

@ -93,7 +93,7 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const {
int dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
if (i_magic == 0) {
return g_dComIfG_gameInfo.save_file.getEventFlags().isEventBit(0x2304);
return g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().isEventBit(0x2304);
}
return (this->magic_flag & (u8)(1 << i_magic)) ? 1 : 0;
}
@ -252,7 +252,7 @@ void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) {
int select_item_index = DEFAULT_SELECT_ITEM_INDEX;
do {
if (current_items_index == g_dComIfG_gameInfo.save_file.getPlayerStatusA().getSelectItemIndex(select_item_index)) {
if (current_items_index == g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex(select_item_index)) {
dComIfGp_setSelectItem(select_item_index);
}
select_item_index++;
@ -632,7 +632,7 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) {
u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, short param_2) {
int iVar3 = this->bottles[i_bottleIdx] + param_2;
g_dComIfG_gameInfo.save_file.getPlayerItem().getItem((u8)(i_bottleIdx + 0xB), true);
g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().getItem((u8)(i_bottleIdx + 0xB), true);
if (iVar3 < 0) {
this->bottles[i_bottleIdx] = 0;
@ -676,7 +676,7 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
u8 iVar3;
iVar3 = 0x1;
if (g_dComIfG_gameInfo.save_file.getPlayerGetItem().isFirstBit(BOMB_BAG_LV2)) {
if (g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2)) {
iVar3 = 0x2;
}