diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-01-03 02:15:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 05:15:52 -0500 |
| commit | ab8dee5c141f54f038569e1fffd0c91594aae5a3 (patch) | |
| tree | ff1fc4d0a6b49168cab262d7a3ee944dcb7c8792 /src/d/d_save/d_save.cpp | |
| parent | ee0bb8f5c65d81c5c0c9ed8198ee6bf928d40e33 (diff) | |
dSv_player_item_c setWarashibeItem (#56)
* dsv_player_item_c::setWarashibeItem
* add slot name
Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'src/d/d_save/d_save.cpp')
| -rw-r--r-- | src/d/d_save/d_save.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 0bb7d5823d..ae961056b0 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -569,9 +569,21 @@ u8 dSv_player_item_c::checkBombBag(u8 param_1) { return counter; } -asm void dSv_player_item_c::setWarashibeItem(u8) { - nofralloc -#include "d/d_save/d_save/asm/func_80033C2C.s" +void dSv_player_item_c::setWarashibeItem(u8 i_item_id) { + u32 select_item_index; + + g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, i_item_id); + g_dComIfG_gameInfo.setPlayUnkWarashibe1(SLOT_21); + g_dComIfG_gameInfo.setPlayUnkWarashibe2(i_item_id); + + for (int i = 0; i < 4; i++) { + select_item_index = + g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getSelectItemIndex( + (u8)i); + if (select_item_index == SLOT_21) { + dComIfGp_setSelectItem((u8)i); + } + } } void dSv_player_item_c::setRodTypeLevelUp(void) { |