Compare commits

...

3 Commits

Author SHA1 Message Date
Randy Thiemann 33e1bf3520 Add internal button swap. 2023-10-21 14:07:28 +02:00
Randy Thiemann 8844b163b9 Improve title screen. 2023-10-21 14:00:28 +02:00
Randy Thiemann 2aa9f605e4 Fix sticky flag. 2023-10-21 14:00:08 +02:00
10 changed files with 77 additions and 31 deletions

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

@ -255,10 +255,16 @@ Tiles::
DB $00,$FF,$55,$FF,$FF,$FF,$00,$00 DB $00,$FF,$55,$FF,$FF,$FF,$00,$00
DB $DB,$E7,$A5,$C3,$42,$81,$81,$00 DB $DB,$E7,$A5,$C3,$42,$81,$81,$00
DB $42,$81,$A5,$C3,$DB,$E7,$00,$00 DB $42,$81,$A5,$C3,$DB,$E7,$00,$00
DB $00,$00,$00,$00,$00,$00,$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,$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:: TilesEnd::

View File

@ -42,6 +42,18 @@ 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,$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 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
@ -59,17 +71,7 @@ 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
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:: TitleScreenTilemapEnd::

View File

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

View File

@ -1,5 +1,5 @@
#Emulicious settings file #Emulicious settings file
#Fri Oct 20 18:08:57 CEST 2023 #Sat Oct 21 14:06:55 CEST 2023
WindowProfilerWindowOpen=false WindowProfilerWindowOpen=false
WindowEventViewerWindowHeight=1416 WindowEventViewerWindowHeight=1416
WindowEventViewerWindowDivider=876 WindowEventViewerWindowDivider=876
@ -7,7 +7,7 @@ WindowMemoryTracerWindowY=631
WindowMemoryTracerWindowX=383 WindowMemoryTracerWindowX=383
Update=2 Update=2
AudioSync=false AudioSync=false
DebuggerMemoryTabVisibleRect=0,0,583,128 DebuggerMemoryTabVisibleRect=0,0,687,128
WindowProfilerWindowWidth=1073 WindowProfilerWindowWidth=1073
UninitializedMemoryBreakpointSuspend=true UninitializedMemoryBreakpointSuspend=true
GameBoyErrorBreakpointEnabled32=false GameBoyErrorBreakpointEnabled32=false
@ -203,10 +203,11 @@ WindowEmuliciousHeight=781
WindowSpriteViewerHeight=527 WindowSpriteViewerHeight=527
GameBoyErrorBreakpointMessage32= GameBoyErrorBreakpointMessage32=
InterruptBreakpointCondition= InterruptBreakpointCondition=
Recent0=C\:\\workspace\\dmgtris\\bin\\out.gb Recent1=C\:\\workspace\\dmgtris\\bin\\out.gb
Recent0=K\:\\TGM\\dmgtris\\bin\\out.gb
GameBoyErrorBreakpointMessage20= GameBoyErrorBreakpointMessage20=
WindowEmuliciousY=445 WindowEmuliciousY=509
WindowEmuliciousX=1412 WindowEmuliciousX=-1010
GameBoyErrorBreakpointEnabled9=false GameBoyErrorBreakpointEnabled9=false
GameBoyErrorBreakpointEnabled8=false GameBoyErrorBreakpointEnabled8=false
GameBoyErrorBreakpointEnabled7=false GameBoyErrorBreakpointEnabled7=false
@ -286,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
@ -299,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

View File

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

View File

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