diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2020-12-14 11:07:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 14:07:29 -0500 |
| commit | 22bda03652efbecd77e1fa3597dfdecee768ec06 (patch) | |
| tree | f5dc8ef07a1b0974743304c1b2a75c1f3e2e8d8a /src/d/d_save/d_save.cpp | |
| parent | 43ac7130b96b9967930582c87f8fafa34cd43369 (diff) | |
more d_item / d_a_horse_static done (#32)
* more d_item funcs done / add dSv_info_c to gameinfo
* checkWait ok / remove asm
Diffstat (limited to 'src/d/d_save/d_save.cpp')
| -rw-r--r-- | src/d/d_save/d_save.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 6c0f028bb0..4fdff69044 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -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; } |