mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-12 19:04:38 +00:00
Merge branch 'main' into doc/cutscene_index
This commit is contained in:
commit
450e24e899
177 changed files with 780 additions and 720 deletions
|
@ -3986,7 +3986,7 @@ void Interface_Draw(PlayState* play) {
|
|||
}
|
||||
}
|
||||
|
||||
#if OOT_DEBUG
|
||||
#if DEBUG_FEATURES
|
||||
if (pauseCtx->debugState == 3) {
|
||||
FlagSet_Update(play);
|
||||
}
|
||||
|
@ -4012,7 +4012,7 @@ void Interface_Update(PlayState* play) {
|
|||
s16 risingAlpha;
|
||||
u16 action;
|
||||
|
||||
#if OOT_DEBUG
|
||||
#if OOT_PAL && DEBUG_FEATURES
|
||||
{
|
||||
Input* debugInput = &play->state.input[2];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue