mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix BGS softlock for shopsanity

This commit is contained in:
Garrett Cox 2022-09-18 13:25:09 -05:00
parent 526aa951cd
commit 5fdb961ea4
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View File

@ -1740,6 +1740,16 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, GlobalContext* globalCt
EnGirlA* selectedItem; EnGirlA* selectedItem;
u8 talkState = Message_GetState(&globalCtx->msgCtx); u8 talkState = Message_GetState(&globalCtx->msgCtx);
// BGS displays two text boxes when given, which breaks this actor as it expected the second
// text box to be a yes/no prompt, so ensure the yes/no prompt is displaying now.
ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(globalCtx->sceneNum, this->cursorIndex);
if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
if (getItemEntry.getItemId == GI_SWORD_BGS && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(globalCtx)) {
Message_ContinueTextbox(globalCtx, 0x6B);
}
}
if (talkState == TEXT_STATE_CHOICE) { if (talkState == TEXT_STATE_CHOICE) {
if (Message_ShouldAdvance(globalCtx)) { if (Message_ShouldAdvance(globalCtx)) {
EnOssan_ResetItemPosition(this); EnOssan_ResetItemPosition(this);