src/field.asm

@@ -757,15 +757,7 @@ FieldProcess::
 
     ; Want rotate CCW?
 .wantrotccw
-    ld a, [hSwapAB]
+    ldh a, [hAState]
-    cp a, 0
-    jr z, .ldb1
-.lda1
-    ld a, [hAState]
-    jr .cp1
-.ldb1
-    ld a, [hBState]
-.cp1
     cp a, 1
     jr nz, .wantrotcw
     ldh a, [hWantRotation]
@@ -776,15 +768,7 @@ FieldProcess::
 
     ; Want rotate CW?
 .wantrotcw
-    ld a, [hSwapAB]
+    ldh a, [hBState]
-    cp a, 0
-    jr z, .lda2
-.ldb2
-    ld a, [hBState]
-    jr .cp2
-.lda2
-    ld a, [hAState]
-.cp2
     cp a, 1
     jr nz, .moverotrequested
     ldh a, [hWantRotation]
@@ -1383,9 +1367,7 @@ FieldDelay::
     call LevelUp
     ret
 
-:   xor a, a
+:   ldh a, [hLineClearCt]
-    ldh [hRequiresLineClear], a
-    ldh a, [hLineClearCt]
     ld e, a
     call LevelUp
     ld c, a

src/main.asm

@@ -10,7 +10,6 @@ INCLUDE "res/title_map.inc"
 
 SECTION "Globals", HRAM
 hGameState:: ds 1
-hSwapAB:: ds 1
 
 
 SECTION "Stack", WRAM0
@@ -41,8 +40,6 @@ Main::
     call CopyOAMHandler
 
     ; Zero out the ram where needed.
-    xor a, a
-    ldh [hSwapAB], a
     call TimeInit
     call IntrInit
     call InputInit

src/res/tiles.inc

@@ -255,16 +255,10 @@ Tiles::
     DB $00,$FF,$55,$FF,$FF,$FF,$00,$00
     DB $DB,$E7,$A5,$C3,$42,$81,$81,$00
     DB $42,$81,$A5,$C3,$DB,$E7,$00,$00
-    DB $10,$10,$38,$38,$7C,$7C,$10,$10
+    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $7C,$7C,$38,$38,$10,$10,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$28,$28,$6C,$6C,$FE,$FE
+    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $6C,$6C,$28,$28,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$18,$18,$18,$18,$30,$30
-    DB $30,$30,$60,$60,$60,$60,$00,$00
-    DB $F0,$F0,$C0,$C0,$C0,$C0,$C0,$C0
-    DB $C0,$C0,$C0,$C0,$F0,$F0,$00,$00
-    DB $0F,$0F,$03,$03,$03,$03,$03,$03
-    DB $03,$03,$03,$03,$0F,$0F,$00,$00
 TilesEnd::
 
 

src/res/title_map.inc

@@ -42,18 +42,6 @@ DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$7E,$01,$57,$50
-DB $61,$50,$57,$01,$01,$81,$42,$42,$42,$42
-DB $82,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01,$7F,$01,$4D,$60,$5F,$5F,$5A,$59
-DB $5E,$01,$81,$4C,$80,$4D,$82,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
@@ -71,7 +59,17 @@ DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
-DB $01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
+DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
 TitleScreenTilemapEnd::
 
 

src/state_gameplay.asm

@@ -180,15 +180,7 @@ fetchPieceMode:
     ; Check if IRS is requested.
     ; Apply the rotation if so.
 .checkIRSA
-    ld a, [hSwapAB]
-    cp a, 0
-    jr z, .lda1
-.ldb1
-    ld a, [hBState]
-    jr .cp1
-.lda1
     ld a, [hAState]
-.cp1
     cp a, 0
     jr z, .checkIRSB
     ld a, 1
@@ -197,15 +189,7 @@ fetchPieceMode:
     call SFXEnqueue
 
 .checkIRSB
-    ld a, [hSwapAB]
-    cp a, 0
-    jr z, .ldb2
-.lda2
-    ld a, [hAState]
-    jr .cp1
-.ldb2
     ld a, [hBState]
-.cp2
     cp a, 0
     jr z, .checkJingle
     ld a, 3

tools/Emulicious.ini

@@ -1,5 +1,5 @@
 #Emulicious settings file
-#Sat Oct 21 14:06:55 CEST 2023
+#Fri Oct 20 18:08:57 CEST 2023
 WindowProfilerWindowOpen=false
 WindowEventViewerWindowHeight=1416
 WindowEventViewerWindowDivider=876
@@ -7,7 +7,7 @@ WindowMemoryTracerWindowY=631
 WindowMemoryTracerWindowX=383
 Update=2
 AudioSync=false
-DebuggerMemoryTabVisibleRect=0,0,687,128
+DebuggerMemoryTabVisibleRect=0,0,583,128
 WindowProfilerWindowWidth=1073
 UninitializedMemoryBreakpointSuspend=true
 GameBoyErrorBreakpointEnabled32=false
@@ -203,11 +203,10 @@ WindowEmuliciousHeight=781
 WindowSpriteViewerHeight=527
 GameBoyErrorBreakpointMessage32=
 InterruptBreakpointCondition=
-Recent1=C\:\\workspace\\dmgtris\\bin\\out.gb
+Recent0=C\:\\workspace\\dmgtris\\bin\\out.gb
-Recent0=K\:\\TGM\\dmgtris\\bin\\out.gb
 GameBoyErrorBreakpointMessage20=
-WindowEmuliciousY=509
+WindowEmuliciousY=445
-WindowEmuliciousX=-1010
+WindowEmuliciousX=1412
 GameBoyErrorBreakpointEnabled9=false
 GameBoyErrorBreakpointEnabled8=false
 GameBoyErrorBreakpointEnabled7=false
@@ -287,8 +286,8 @@ SouthPanelHeight=1064
 SMSbuttonsKeyboard=false
 StackSplitLocation=534
 WindowMemoryEditorHeight=534
-WindowTilemapViewerWidth=404
 GBGamepadKeyboard=false
+WindowTilemapViewerWidth=404
 UninitializedMemoryBreakpointCondition=
 GameBoyErrorBreakpointSuspend19=true
 GameBoyErrorBreakpointSuspend18=true
@@ -300,5 +299,5 @@ WindowSpriteViewerOpen=false
 WindowProfilerWindowY=639
 WindowProfilerWindowX=461
 Scale=5.0
-KeyboardRequireWindowFocus=true
 WindowProfilerWindowProcedureProfiler=true
+KeyboardRequireWindowFocus=true

tools/GBMB/gbmb.ini

@@ -1,5 +1,5 @@
 [General]
-GBMPath=K:\TGM\dmgtris\src\res\sources\
+GBMPath=C:\workspace\dmgtris\src\res\sources\
 GBRPath=C:\workspace\dmgtris\src\res\
 
 ViewInfoPanel=1
@@ -10,8 +10,7 @@ rem ViewDoubleMarkers=1
 rem ViewPropertyColors=1
 
 [Recently used files]
-F0=k:\tgm\dmgtris\src\res\sources\title_map.gbm
+F0=c:\workspace\dmgtris\src\res\sources\title_map.gbm
-F1=c:\workspace\dmgtris\src\res\sources\title_map.gbm
+F1=c:\workspace\dmgtris\src\res\sources\gameplay_map.gbm
-F2=c:\workspace\dmgtris\src\res\sources\gameplay_map.gbm
+F2=c:\workspace\dmgtris\src\res\gameplay.gbm
-F3=c:\workspace\dmgtris\src\res\gameplay.gbm
+F3=c:\workspace\dmgtris\gameplay.gbm
-F4=c:\workspace\dmgtris\gameplay.gbm

tools/projects/out.bps

@@ -0,0 +1 @@
+type=instruction address=gameOverMode%20+%2079 end=gameOverMode%20+%2081 enabled=true suspend=true condition= message=