mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-24 01:31:37 -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;