diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2023-11-05 07:43:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 07:43:24 -0600 |
| commit | 20bb36c16419fb2811ea68583ba00a53abe739e6 (patch) | |
| tree | 0463b2f6b8362905cbcf2cdd4e9d889b5098bcac /soh/src/code/game.c | |
| parent | 051314e8b1f452cbfa62abe7decac73b8b5ae071 (diff) | |
| parent | 129f410aba106b10b72e79a0d075464e95021db4 (diff) | |
Merge pull request #3352 from Archez/mergeDevelopIntoRando4
Merge develop into develop-rando
Diffstat (limited to 'soh/src/code/game.c')
| -rw-r--r-- | soh/src/code/game.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/soh/src/code/game.c b/soh/src/code/game.c index 4167a5a96..b46aa4ebd 100644 --- a/soh/src/code/game.c +++ b/soh/src/code/game.c @@ -93,7 +93,7 @@ void func_800C4344(GameState* gameState) { HREG(95) = CHECK_BTN_ALL(selectedInput->press.button, hReg82); } - if (gIsCtrlr2Valid) { + if (CVarGetInteger("gRegEditEnabled", 0) || gIsCtrlr2Valid) { func_8006390C(&gameState->input[1]); } |