1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 03:14:38 +00:00

Merge branch 'master' into doc_pause_menu

This commit is contained in:
Dragorn421 2023-06-27 14:29:20 +02:00
commit eb75e00f91
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
94 changed files with 583 additions and 450 deletions

View file

@ -514,7 +514,7 @@ void Play_Update(PlayState* this) {
}
}
if (this->transitionMode) { // != TRANS_MODE_OFF
if ((u32)this->transitionMode != TRANS_MODE_OFF) {
switch (this->transitionMode) {
case TRANS_MODE_SETUP:
if (this->transitionTrigger != TRANS_TRIGGER_END) {