diff options
| author | roeming <brother64youyou@gmail.com> | 2025-12-07 20:09:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-07 17:09:47 -0800 |
| commit | 07a4e6b05289b7efcd37f9c69afb8336c0171aa0 (patch) | |
| tree | bfe2a1297687b67d6539eb5102d8af992b591369 /src/d/actor/d_a_npc_chat.cpp | |
| parent | e82c27fd001994abdd894f94d62b7e628b446c8e (diff) | |
match debug for D_menu_fmap2_d (#2925)
* menu_fmap2d debug progress
* match debug for d_menu_fmap2D
* fix broken function
* fix weird shield mismatch
* fix other shield mismatch
* fix suggestions
* fix func for wii version
* match func for all versions
* remove cast from saveBitLabels
Diffstat (limited to 'src/d/actor/d_a_npc_chat.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_chat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 0fd2cc3734..e5514c21e9 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2383,7 +2383,7 @@ int daNpcChat_c::getObjNum() { } // dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town - if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && objNum == OBJ_CELEB_BAG_M) { objNum = OBJ_MARO_BAG_M; } @@ -2427,7 +2427,7 @@ int daNpcChat_c::getObjNum() { } // dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town - if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) && + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) && objNum == OBJ_CELEB_BAG_W) { objNum = OBJ_MARO_BAG_W; } |