diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-22 18:54:22 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-22 18:54:22 +0200 |
| commit | 15896c5a165d9d8bcfd02e3617e3ab7f10602b5f (patch) | |
| tree | cfc589be7590138df572e951a3b414ef4ce8a8f0 /arm9/src/unk_0206015C.c | |
| parent | 595b90d91c903837b4b0199159a2dece90ea4dee (diff) | |
| parent | 1e7dcfbf615f387c3b4a8a7577ff36dd57922f60 (diff) | |
Merge branch 'master' into unk_02016B94
Diffstat (limited to 'arm9/src/unk_0206015C.c')
| -rw-r--r-- | arm9/src/unk_0206015C.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index 3d295156..a217f52c 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -111,7 +111,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0) case 5: unkStruct1->unkE += 1; - if (unkStruct1->unkE < 0x3c && !(gMain.unk48 & 1)) + if (unkStruct1->unkE < 0x3c && !(gMain.newKeys & 1)) break; MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4); |