This commit is contained in:
Randy Thiemann 2023-10-21 15:14:45 +02:00
parent e96ec41e8b
commit c5dd424e03
3 changed files with 19 additions and 19 deletions

View File

@ -74,7 +74,7 @@ sPieceYOffsets:: ; How to draw each piece. Y-offsets of the sprites.
sSpeedCurve:: ; Speed curve of the game. sSpeedCurve:: ; Speed curve of the game.
dw $0000 ; Level 0000 dw $0000 ; Level 0000
db 1, 64 ; 1G every 16 frames db 1, 16 ; 1G every 16 frames
db 25, 14, 30, 40 ; ARE, DAS, LOCK, LINECLEAR db 25, 14, 30, 40 ; ARE, DAS, LOCK, LINECLEAR
dw $0015 ; Level 0015 dw $0015 ; Level 0015

View File

@ -485,8 +485,8 @@ TrySpawnPiece::
; Check if the piece can spawn. ; Check if the piece can spawn.
ld d, h ld d, h
ld e, l ld e, l
call GetPieceData call GetPieceDataFast
call CanPieceFit call CanPieceFitFast
; A will be $FF if the piece can fit. ; A will be $FF if the piece can fit.
cp a, $FF cp a, $FF
@ -507,8 +507,8 @@ TrySpawnPiece::
call XYToSFieldPtr call XYToSFieldPtr
ld d, h ld d, h
ld e, l ld e, l
call GetPieceData call GetPieceDataFast
jp CanPieceFit jp CanPieceFitFast
@ -787,7 +787,7 @@ FieldProcess::
ld b, a ld b, a
add hl, bc add hl, bc
pop bc pop bc
call CanPieceFit call CanPieceFit ; This does have to be the "slow" version.
cp a, $FF cp a, $FF
jr nz, .maybekick jr nz, .maybekick
ldh a, [hWantRotation] ldh a, [hWantRotation]
@ -825,9 +825,9 @@ FieldProcess::
call XYToSFieldPtr call XYToSFieldPtr
ld d, h ld d, h
ld e, l ld e, l
ldh a, [hPieceDataBase] ldh a, [hPieceDataBaseFast]
ld l, a ld l, a
ldh a, [hPieceDataBase+1] ldh a, [hPieceDataBaseFast+1]
ld h, a ld h, a
ldh a, [hWantRotation] ldh a, [hWantRotation]
rlc a rlc a
@ -838,7 +838,7 @@ FieldProcess::
ld b, a ld b, a
add hl, bc add hl, bc
pop bc pop bc
call CanPieceFit call CanPieceFitFast
cp a, $FF cp a, $FF
jr nz, .trykickleft jr nz, .trykickleft
ldh a, [hCurrentPieceX] ldh a, [hCurrentPieceX]
@ -859,9 +859,9 @@ FieldProcess::
call XYToSFieldPtr call XYToSFieldPtr
ld d, h ld d, h
ld e, l ld e, l
ldh a, [hPieceDataBase] ldh a, [hPieceDataBaseFast]
ld l, a ld l, a
ldh a, [hPieceDataBase+1] ldh a, [hPieceDataBaseFast+1]
ld h, a ld h, a
ldh a, [hWantRotation] ldh a, [hWantRotation]
rlc a rlc a
@ -872,7 +872,7 @@ FieldProcess::
ld b, a ld b, a
add hl, bc add hl, bc
pop bc pop bc
call CanPieceFit call CanPieceFitFast
cp a, $FF cp a, $FF
jr nz, .norot jr nz, .norot
ldh a, [hCurrentPieceX] ldh a, [hCurrentPieceX]
@ -924,8 +924,8 @@ FieldProcess::
call XYToSFieldPtr call XYToSFieldPtr
ld d, h ld d, h
ld e, l ld e, l
call GetPieceData call GetPieceDataFast
call CanPieceFit call CanPieceFitFast
cp a, $FF cp a, $FF
jr nz, .donemanipulating jr nz, .donemanipulating
ldh a, [hWantX] ldh a, [hWantX]
@ -941,8 +941,8 @@ FieldProcess::
call XYToSFieldPtr call XYToSFieldPtr
ld d, h ld d, h
ld e, l ld e, l
call GetPieceData call GetPieceDataFast
call CanPieceFit call CanPieceFitFast
cp a, $FF cp a, $FF
jr z, .notgrounded jr z, .notgrounded

View File

@ -1,5 +1,5 @@
#Emulicious settings file #Emulicious settings file
#Sat Oct 21 15:08:21 CEST 2023 #Sat Oct 21 15:13:26 CEST 2023
WindowProfilerWindowOpen=false WindowProfilerWindowOpen=false
WindowEventViewerWindowHeight=1416 WindowEventViewerWindowHeight=1416
WindowEventViewerWindowDivider=876 WindowEventViewerWindowDivider=876
@ -287,8 +287,8 @@ SouthPanelHeight=1064
SMSbuttonsKeyboard=false SMSbuttonsKeyboard=false
StackSplitLocation=534 StackSplitLocation=534
WindowMemoryEditorHeight=534 WindowMemoryEditorHeight=534
GBGamepadKeyboard=false
WindowTilemapViewerWidth=404 WindowTilemapViewerWidth=404
GBGamepadKeyboard=false
UninitializedMemoryBreakpointCondition= UninitializedMemoryBreakpointCondition=
GameBoyErrorBreakpointSuspend19=true GameBoyErrorBreakpointSuspend19=true
GameBoyErrorBreakpointSuspend18=true GameBoyErrorBreakpointSuspend18=true
@ -300,5 +300,5 @@ WindowSpriteViewerOpen=false
WindowProfilerWindowY=639 WindowProfilerWindowY=639
WindowProfilerWindowX=461 WindowProfilerWindowX=461
Scale=5.0 Scale=5.0
WindowProfilerWindowProcedureProfiler=true
KeyboardRequireWindowFocus=true KeyboardRequireWindowFocus=true
WindowProfilerWindowProcedureProfiler=true