diff --git a/src/constants.asm b/src/constants.asm index 0ed49e2..f74abdb 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -74,7 +74,7 @@ sPieceYOffsets:: ; How to draw each piece. Y-offsets of the sprites. sSpeedCurve:: ; Speed curve of the game. 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 dw $0015 ; Level 0015 diff --git a/src/field.asm b/src/field.asm index a5207f2..de26834 100644 --- a/src/field.asm +++ b/src/field.asm @@ -485,8 +485,8 @@ TrySpawnPiece:: ; Check if the piece can spawn. ld d, h ld e, l - call GetPieceData - call CanPieceFit + call GetPieceDataFast + call CanPieceFitFast ; A will be $FF if the piece can fit. cp a, $FF @@ -507,8 +507,8 @@ TrySpawnPiece:: call XYToSFieldPtr ld d, h ld e, l - call GetPieceData - jp CanPieceFit + call GetPieceDataFast + jp CanPieceFitFast @@ -787,7 +787,7 @@ FieldProcess:: ld b, a add hl, bc pop bc - call CanPieceFit + call CanPieceFit ; This does have to be the "slow" version. cp a, $FF jr nz, .maybekick ldh a, [hWantRotation] @@ -825,9 +825,9 @@ FieldProcess:: call XYToSFieldPtr ld d, h ld e, l - ldh a, [hPieceDataBase] + ldh a, [hPieceDataBaseFast] ld l, a - ldh a, [hPieceDataBase+1] + ldh a, [hPieceDataBaseFast+1] ld h, a ldh a, [hWantRotation] rlc a @@ -838,7 +838,7 @@ FieldProcess:: ld b, a add hl, bc pop bc - call CanPieceFit + call CanPieceFitFast cp a, $FF jr nz, .trykickleft ldh a, [hCurrentPieceX] @@ -859,9 +859,9 @@ FieldProcess:: call XYToSFieldPtr ld d, h ld e, l - ldh a, [hPieceDataBase] + ldh a, [hPieceDataBaseFast] ld l, a - ldh a, [hPieceDataBase+1] + ldh a, [hPieceDataBaseFast+1] ld h, a ldh a, [hWantRotation] rlc a @@ -872,7 +872,7 @@ FieldProcess:: ld b, a add hl, bc pop bc - call CanPieceFit + call CanPieceFitFast cp a, $FF jr nz, .norot ldh a, [hCurrentPieceX] @@ -924,8 +924,8 @@ FieldProcess:: call XYToSFieldPtr ld d, h ld e, l - call GetPieceData - call CanPieceFit + call GetPieceDataFast + call CanPieceFitFast cp a, $FF jr nz, .donemanipulating ldh a, [hWantX] @@ -941,8 +941,8 @@ FieldProcess:: call XYToSFieldPtr ld d, h ld e, l - call GetPieceData - call CanPieceFit + call GetPieceDataFast + call CanPieceFitFast cp a, $FF jr z, .notgrounded diff --git a/tools/Emulicious.ini b/tools/Emulicious.ini index 052a4e8..0de2e0b 100644 --- a/tools/Emulicious.ini +++ b/tools/Emulicious.ini @@ -1,5 +1,5 @@ #Emulicious settings file -#Sat Oct 21 15:08:21 CEST 2023 +#Sat Oct 21 15:13:26 CEST 2023 WindowProfilerWindowOpen=false WindowEventViewerWindowHeight=1416 WindowEventViewerWindowDivider=876 @@ -287,8 +287,8 @@ SouthPanelHeight=1064 SMSbuttonsKeyboard=false StackSplitLocation=534 WindowMemoryEditorHeight=534 -GBGamepadKeyboard=false WindowTilemapViewerWidth=404 +GBGamepadKeyboard=false UninitializedMemoryBreakpointCondition= GameBoyErrorBreakpointSuspend19=true GameBoyErrorBreakpointSuspend18=true @@ -300,5 +300,5 @@ WindowSpriteViewerOpen=false WindowProfilerWindowY=639 WindowProfilerWindowX=461 Scale=5.0 -WindowProfilerWindowProcedureProfiler=true KeyboardRequireWindowFocus=true +WindowProfilerWindowProcedureProfiler=true