This commit is contained in:
Randy Thiemann 2023-10-21 21:03:50 +02:00
parent 91d99e45f4
commit 8d474b3638
5 changed files with 28 additions and 47 deletions

View File

@ -71,6 +71,24 @@ sGo:: db " GO "
sPause:: sPause::
db "P A U S E " db "P A U S E "
db " P A U S E" db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
db "P A U S E "
db " P A U S E"
sPieceXOffsets:: ; How to draw each piece. X-offsets of the sprites. sPieceXOffsets:: ; How to draw each piece. X-offsets of the sprites.
db 0, 8, 16, 24 ; I db 0, 8, 16, 24 ; I
db 0, 8, 8, 16 ; Z db 0, 8, 8, 16 ; Z

View File

@ -1226,7 +1226,7 @@ GetTileShade:
cp a, 2 cp a, 2
jp c, .s6 jp c, .s6
cp a, 3 cp a, 3
jp c, .s5 jr c, .s5
cp a, 5 cp a, 5
jr c, .s4 jr c, .s4
cp a, 6 cp a, 6

View File

@ -100,7 +100,7 @@ EventLoopPostHandler::
; This will chain jump into the vblank handler. ; This will chain jump into the vblank handler.
jp hOAMDMA jp hOAMDMA
; The VBlank Handler is expected to end with jp EventLoop. ; The VBlank Handler is expected to end with jr EventLoop.
ENDC ENDC

View File

@ -457,12 +457,12 @@ gameOverMode:
ldh [hMode], a ldh [hMode], a
ld a, LEADY_GO_TIME ld a, LEADY_GO_TIME
ldh [hModeCounter], a ldh [hModeCounter], a
jp drawStaticInfo jr drawStaticInfo
; Quit ; Quit
: ldh a, [hBState] : ldh a, [hBState]
cp a, 1 cp a, 1
jp nz, drawStaticInfo jr nz, drawStaticInfo
call SwitchToTitle call SwitchToTitle
jp EventLoopPostHandler jp EventLoopPostHandler
@ -473,7 +473,7 @@ pauseMode:
jr nz, :+ jr nz, :+
ldh a, [hPrePause] ldh a, [hPrePause]
ldh [hMode], a ldh [hMode], a
jp drawStaticInfo jr drawStaticInfo
; Draw PAUSE all over the field, but not if we came from delay mode. ; Draw PAUSE all over the field, but not if we came from delay mode.
: ldh a, [hPrePause] : ldh a, [hPrePause]
@ -481,44 +481,7 @@ pauseMode:
jr z, drawStaticInfo jr z, drawStaticInfo
ld de, sPause ld de, sPause
ld hl, wField+(4*10) ld hl, wField+(4*10)
ld bc, 20 ld bc, 200
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(6*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(8*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(10*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(12*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(14*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(16*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(18*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(20*10)
ld bc, 20
call UnsafeMemCopy
ld de, sPause
ld hl, wField+(22*10)
ld bc, 20
call UnsafeMemCopy
jr drawStaticInfo jr drawStaticInfo

View File

@ -92,14 +92,14 @@ TitleEventLoopHandler::
: ldh a, [hUpState] : ldh a, [hUpState]
cp a, 1 cp a, 1
jr nz, :+ jr nz, :+
jp IncrementLevel jr IncrementLevel
jp EventLoopPostHandler jp EventLoopPostHandler
; Start level down? ; Start level down?
: ldh a, [hDownState] : ldh a, [hDownState]
cp a, 1 cp a, 1
jr nz, :+ jr nz, :+
jp DecrementLevel jr DecrementLevel
: jp EventLoopPostHandler : jp EventLoopPostHandler
@ -115,7 +115,7 @@ DecrementLevel:
ldh [hStartSpeed], a ldh [hStartSpeed], a
ld a, h ld a, h
ldh [hStartSpeed+1], a ldh [hStartSpeed+1], a
jp CheckLevelRange jr CheckLevelRange
IncrementLevel: IncrementLevel:
; Increment ; Increment
@ -129,7 +129,7 @@ IncrementLevel:
ldh [hStartSpeed], a ldh [hStartSpeed], a
ld a, h ld a, h
ldh [hStartSpeed+1], a ldh [hStartSpeed+1], a
jp CheckLevelRange jr CheckLevelRange
CheckLevelRange: CheckLevelRange: