mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 19:02:19 -05:00
Code Issues Projects Releases Wiki Activity

Tweak: Reset trade item cycling when pausing or changing pages (#2808)

Browse Source 
* reset trade select when unpausing

* move trade select reset to kaleido init and handle when changing pages
This commit is contained in:
Adam Bird 2023-05-03 21:45:41 -04:00 committed by GitHub
parent 2845a29e28
commit f81b042843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -922,3 +922,8 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
} }
} }
} }
void KaleidoScope_ResetTradeSelect() {
gSelectingMask = false;
gSelectingAdultTrade = false;
}

2
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
View File

@ -37,4 +37,6 @@ void PauseMapMark_Draw(PlayState* play);
void KaleidoScope_UpdateCursorSize(PauseContext* pauseCtx); void KaleidoScope_UpdateCursorSize(PauseContext* pauseCtx);
void KaleidoScope_ResetTradeSelect();
#endif #endif

4
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View File

@ -940,6 +940,8 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
gSaveContext.unk_13EA = 0; gSaveContext.unk_13EA = 0;
Interface_ChangeAlpha(50); Interface_ChangeAlpha(50);
KaleidoScope_ResetTradeSelect();
} }
void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) { void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) {
@ -3587,6 +3589,8 @@ void KaleidoScope_Update(PlayState* play)
} }
} }
KaleidoScope_ResetTradeSelect();
pauseCtx->state = 4; pauseCtx->state = 4;
break; break;