mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-03 17:02:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fully split / more work on d_com_inf_game (#81)

Browse Source 
* split d_com_inf_game

* fix func name

* start some dcomifg funcs

* fix

* clang-format

* change dComIfGs_setWarpItemData back to inline asm for now

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
TakaRikka
2021-01-10 06:00:45 -08:00
committed by GitHub
parent 2d1d72e1c9
commit 8cf6641bd4
195 changed files with 7912 additions and 6930 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_save/d_save/asm/func_80035A04.s
+1 -1
View File
@@ -99,7 +99,7 @@ lbl_80035B60:
/* 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
/* 80035B80 00032AC0 4B FF 58 29 */ bl setNowVibration__14dComIfG_play_cFUc
/* 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
include/d/d_save/d_save/d_save.h
+4
View File
@@ -326,6 +326,7 @@ public:
u16 getRupeeMax(void) const;
int isMagicFlag(u8) const;
u16& getMaxLife() { return mMaxHealth; }
u16& getLife() { return mCurrentHealth; }
u16& getRupee() { return mCurrentRupees; }
u16& getOil() { return mCurrentLanternOil; }
@@ -339,6 +340,7 @@ public:
void setRupee(u16 rupees) { mCurrentRupees = rupees; }
void setLife(u16 life) { mCurrentHealth = life; }
void setMaxLife(u8 max) { mMaxHealth = max; }
void setSelectEquip(int item_index, u8 item) { mEquipment[item_index] = item; }
private:
u16 mMaxHealth;
@@ -642,6 +644,7 @@ public:
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_player_last_mark_info_c& getPlayerLastMarkInfo() { return player_last_mark; }
dSv_light_drop_c& getLightDrop() { return light_drop; }
dSv_player_get_item_c& getPlayerGetItem() { return player_get_item; }
@@ -865,6 +868,7 @@ public:
dSv_player_get_item_c& getPlayerGetItem() { return player.getPlayerGetItem(); }
dSv_player_item_record_c& getPlayerItemRecord() { return player.getPlayerItemRecord(); }
dSv_player_item_max_c& getPlayerItemMax() { return player.getPlayerItemMax(); }
dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return player.getPlayerLastMarkInfo(); }
dSv_player_item_c& getPlayerItem() { return player.getPlayerItem(); }
dSv_player_collect_c& getPlayerCollect() { return player.getPlayerCollect(); }
dSv_light_drop_c& getLightDrop() { return player.getLightDrop(); }