diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-02-20 10:25:31 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-02-20 10:25:31 -0500 |
| commit | d102f73e7a1bb18745cdedc034baee3c88aeb065 (patch) | |
| tree | 8ec4492439f311ab670ed99e5cc5d40118522237 /src/d/d_save/d_save.cpp | |
| parent | b0499177ef7e08594fbac1665d1ac6f8dc9d0d47 (diff) | |
| parent | 5c83d2532c610dc9eb5fb4f36c250174c79964e4 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/tp
Diffstat (limited to 'src/d/d_save/d_save.cpp')
| -rw-r--r-- | src/d/d_save/d_save.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 0b9f93475a..95a49856e9 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -2,10 +2,10 @@ #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "d/d_save/d_save_init/d_save_init.h" +#include "msl_c/string.h" #include "os/OS.h" extern "C" { -char* strcpy(char*, const char*); int dStage_roomControl_c_NS_getZoneNo(int); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); u8 dComIfGs_getBottleMax(void); @@ -32,7 +32,6 @@ void getVibration__19dSv_player_config_cFv(void); void init__10dSv_save_cFv(void); void isEventBit__11dSv_event_cCFUs(void); void isFirstBit__21dSv_player_get_item_cCFUc(void); -void memcpy(void*, const void*, int); void offEventBit__11dSv_event_cFUs(void); void onEventBit__11dSv_event_cFUs(void); void setBombNum__24dSv_player_item_record_cFUcUc(void); @@ -371,8 +370,8 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { return 0xFF; } } - // 合成アイテム不定＝＝＝＞%d, %d\n - // Uncertain combination item＝＝＝＞%d, %d\n + // ACes聁%d, %d\n + // Uncertain combination item%d, %d\n OSReport_Error(lbl_80379234 + 9, item_id_2, item_id_1); } } |