diff --git a/README.md b/README.md index bdf8b7c..d323ea5 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ ScoreIncrement points are then awarded. - Up — Sonic/Hard drop - Down — Soft drop/Lock - Left/Right — Move +- A+B+Select — Bail to main menu if paused ### Game Over - A — Restart immediately diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 0d03340..7ddf83f 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 734f9f2..bc1585b 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ diff --git a/patch_pocket.py b/patch_pocket.py index 4ab6c6a..4e37379 100644 --- a/patch_pocket.py +++ b/patch_pocket.py @@ -1,5 +1,5 @@ logo = b"\x01\x10\xCE\xEF\x00\x00\x44\xAA\x00\x74\x00\x18\x11\x95\x00\x34\x00\x1A\x00\xD5\x00\x22\x00\x69\x6F\xF6\xF7\x73\x09\x90\xE1\x10\x44\x40\x9A\x90\xD5\xD0\x44\x30\xA9\x21\x5D\x48\x22\xE0\xF8\x60" -with open('bin/DMGTRIS.GBC', 'rb+') as f: +with open('bin/DMGTRIS.pocket', 'rb+') as f: f.seek(0x104) f.write(logo) diff --git a/src/field.asm b/src/field.asm index 8907043..bd0f769 100644 --- a/src/field.asm +++ b/src/field.asm @@ -1184,6 +1184,10 @@ FieldProcess:: ; ************************************************************** ; HANDLE UP + ; Assume 1G or lower. + ld a, 1 + ldh [hWantedG], a + ; Is a hard/sonic drop requested? Skip if in 20G mode. ldh a, [hCurrentGravityPerTick] cp a, 20 diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm index 56dd017..4d52ab9 100644 --- a/src/state_gameplay.asm +++ b/src/state_gameplay.asm @@ -506,7 +506,21 @@ gameOverMode: pauseMode: - ldh a, [hStartState] + ; Quick reset. + ldh a, [hAState] + cp a, 0 + jr z, :+ + ldh a, [hBState] + cp a, 0 + jr z, :+ + ldh a, [hSelectState] + cp a, 0 + jr z, :+ + call SwitchToTitle + jp EventLoopPostHandler + + ; Unpause +: ldh a, [hStartState] cp a, 1 jr nz, :+ call FromBackupField