M src/Dialog.asm +12 -12
@@ 27,7 27,7 @@ Dialog: MACRO ?uiImage
patternName:
PatternNameTable 10000H
drawCommand:
- VDPCommand 0, Video_X_BYTE * 100H, Dialog_START_X, Video_X_BYTE * 100H + Dialog_START_Y, 0, 0, 0DDH, 0, VDPCommand_LMMM | VDPCommand_TIMP
+ VDPCommand 0, 100H << Video_4BPU, Dialog_START_X, (100H << Video_4BPU) + Dialog_START_Y, 0, 0, 0DDH, 0, VDPCommand_LMMM | VDPCommand_TIMP
ENDM
; ix = this
@@ 118,19 118,19 @@ Clear:
ld d,ixh
ld iy,Dialog.drawCommand
add iy,de
- ld (iy + VDPCommand.dx),Dialog_START_X * Video_X_SCALE
- IF Video_X_SCALE > 1
- ld (iy + VDPCommand.dx + 1),Dialog_START_X * Video_X_SCALE >> 8
+ ld (iy + VDPCommand.dx),Dialog_START_X << Video_HIRES
+ IF Video_HIRES
+ ld (iy + VDPCommand.dx + 1),Dialog_START_X << Video_HIRES >> 8
ENDIF
ld (iy + VDPCommand.dy),Dialog_START_Y
- ld (iy + VDPCommand.nx),Dialog_LINE_WIDTH * Video_X_SCALE
- IF Video_X_SCALE > 1
- ld (iy + VDPCommand.nx + 1),Dialog_LINE_WIDTH * Video_X_SCALE >> 8
+ ld (iy + VDPCommand.nx),Dialog_LINE_WIDTH << Video_HIRES
+ IF Video_HIRES
+ ld (iy + VDPCommand.nx + 1),Dialog_LINE_WIDTH << Video_HIRES >> 8
ENDIF
ld (iy + VDPCommand.ny),Dialog_LINE_HEIGHT * Dialog_LINE_COUNT
ld (iy + VDPCommand.command),VDPCommand_HMMV
call VDPCommand_ExecuteS2IY
- IF Video_X_SCALE > 1
+ IF Video_HIRES
ld (iy + VDPCommand.nx + 1),0
ENDIF
ld (iy + VDPCommand.command),VDPCommand_LMMM | VDPCommand_TIMP
@@ 154,9 154,9 @@ Loop:
ld (ix + Dialog.text + 1),d
cp 10
jr nz,NoNewline
- ld (iy + VDPCommand.dx),Dialog_START_X * Video_X_SCALE
- IF Video_X_SCALE > 1
- ld (iy + VDPCommand.dx + 1),Dialog_START_X * Video_X_SCALE >> 8
+ ld (iy + VDPCommand.dx),Dialog_START_X << Video_HIRES
+ IF Video_HIRES
+ ld (iy + VDPCommand.dx + 1),Dialog_START_X << Video_HIRES >> 8
ENDIF
ld a,(iy + VDPCommand.dy)
add a,Dialog_LINE_HEIGHT
@@ 183,7 183,7 @@ NoKerning:
ld a,(iy + VDPCommand.dx)
add a,(iy + VDPCommand.nx)
ld (iy + VDPCommand.dx),a
- IF Video_X_SCALE > 1
+ IF Video_HIRES
ld a,(iy + VDPCommand.dx + 1)
adc a,0
ld (iy + VDPCommand.dx + 1),a
M src/Glyph.asm +1 -1
@@ 30,7 30,7 @@ Glyph_SetCopyHL:
ld (iy + VDPCommand.sy),a
inc hl
ld a,(hl)
- IF Video_X_SCALE = 2
+ IF Video_HIRES
add a,a
ENDIF
ld (iy + VDPCommand.nx),a
M src/Image.asm +1 -1
@@ 7,7 7,7 @@ Image: MACRO ?width, ?height, ?palette,
height:
dw ?height
size:
- dw ?width * ?height / Video_X_BYTE
+ dw ?width * ?height >> Video_4BPU
palette:
dw ?palette
pixelData:
M src/MapView.asm +21 -21
@@ 13,7 13,7 @@ MapView: MACRO
position:
Vector2W MapView_OFFSET_X, MapView_OFFSET_Y
verticalDrawCommand:
- VDPCommand 0, 0, 0, MapView_PAGE << 8, 4 * Video_X_SCALE, 100H, 0, 0, VDPCommand_HMMC
+ VDPCommand 0, 0, 0, MapView_PAGE << 8, 4 << Video_HIRES, 100H, 0, 0, VDPCommand_HMMC
ENDM
; de = map
@@ 209,7 209,7 @@ MapView_DrawTileColumn: PROC
ld iyh,e
exx ; set-up for output
ld c,iyl
- IF Video_X_SCALE = 2
+ IF Video_HIRES
xor a
sla c
rla
@@ 236,12 236,12 @@ MapView_DrawTileColumn: PROC
out (c),d
ld a,iyl
and 0CH
- IF Video_X_BYTE = 2
+ IF Video_4BPU
rrca
ENDIF
ld l,a
ld c,VDP_PORT_3
- ld de,(16 - 4) / Video_X_BYTE
+ ld de,16 - 4 >> Video_4BPU
exx
inc d ; set-up tile iteration
ld e,0
@@ 351,7 351,7 @@ DrawColumnTile12:
; hl = tile pixels
MapView_DrawColumnTile_M: MACRO ?lines
REPT ?lines
- REPT 4 / Video_X_BYTE
+ REPT 4 >> Video_4BPU
outi
ENDM
add hl,de
@@ 369,10 369,10 @@ MapView_DrawTileRow: PROC
ld iyh,e
exx ; set-up for output
ld a,iyh
- and Video_X_BYTE = 2 ? 80H : 0C0H
+ and 0C0H << Video_4BPU
or MapView_PAGE
rlca
- IF Video_X_BYTE = 1
+ IF !Video_4BPU
rlca
ENDIF
di
@@ 386,11 386,11 @@ MapView_DrawTileRow: PROC
add a,a
add a,a
add a,a
- IF Video_X_BYTE = 1
+ IF !Video_4BPU
add a,a
ENDIF
ld l,a
- IF Video_X_BYTE = 2
+ IF Video_4BPU
srl d
ENDIF
set 6,d
@@ 500,7 500,7 @@ DrawRowTile12:
MapView_GetTileSource_M: MACRO
ld a,(ix + Tile.image.bank)
ld (ROMMapper_instance.pageA000.BANK_SELECT),a
- IF Video_X_BYTE = 2
+ IF Video_4BPU
ld h,(ix + Tile.image.address)
add hl,hl
rr l
@@ 515,46 515,46 @@ MapView_DrawRowTile_M: MACRO ?pixels
ld a,l
MapView_DrawRowTileLine_M ?pixels
IF ?pixels != 16
- add a,16 / Video_X_BYTE
+ add a,16 >> Video_4BPU
ld l,a
ENDIF
- IF Video_X_BYTE = 2
+ IF Video_4BPU
set 7,e
ELSE
inc d
ENDIF
MapView_DrawRowTileLine_M ?pixels
IF ?pixels != 16
- add a,16 / Video_X_BYTE
+ add a,16 >> Video_4BPU
ld l,a
ENDIF
- IF Video_X_BYTE = 2
+ IF Video_4BPU
res 7,e
ENDIF
inc d
MapView_DrawRowTileLine_M ?pixels
IF ?pixels != 16
- add a,16 / Video_X_BYTE
+ add a,16 >> Video_4BPU
ld l,a
ENDIF
- IF Video_X_BYTE = 2
+ IF Video_4BPU
set 7,e
ELSE
inc d
ENDIF
MapView_DrawRowTileLine_M ?pixels
IF ?pixels != 16
- add a,(-48 + ?pixels) / Video_X_BYTE
- and ~(33H / Video_X_BYTE)
+ add a,-48 + ?pixels >> Video_4BPU
+ and ~33H >> Video_4BPU
ENDIF
ld l,a
- IF Video_X_BYTE = 1
+ IF !Video_4BPU
dec d
dec d
ENDIF
dec d
ld a,e
- add a,(-100H + ?pixels) / Video_X_BYTE
+ add a,-100H + ?pixels >> Video_4BPU
ld e,a
ENDM
@@ 567,7 567,7 @@ MapView_DrawRowTileLine_M: MACRO ?pixels
ei
out (c),d
dec c
- REPT ?pixels / Video_X_BYTE
+ REPT ?pixels >> Video_4BPU
outi
ENDM
ENDM
M src/split/DialogSplit.asm +1 -1
@@ 13,7 13,7 @@ DialogSplit: MACRO
VDPRegister 1
mode8:
VDPRegister 8
- VDPRegister 2, 1 * Video_X_BYTE << 5 | 00011111B
+ VDPRegister 2, 1 << Video_4BPU << 5 | 00011111B
verticalOffset1:
VDPRegister 23
color10:
M src/video/VRAMTableCopy.asm +9 -9
@@ 3,9 3,9 @@
;
VRAMTableCopy: MACRO ?source = 0, ?destination = 0, ?size = 0
super:
- VDPCommand 0, ?source >> (Video_MODE < 7 ? 7 : 8),
- 0, ?destination >> (Video_MODE < 7 ? 7 : 8),
- Video_X_SCALE = 2 ? 200H : 100H, ?size >> (Video_MODE < 7 ? 7 : 8),
+ VDPCommand 0, ?source << Video_4BPU >> 8,
+ 0, ?destination << Video_4BPU >> 8,
+ 100H << Video_HIRES, ?size << Video_4BPU >> 8,
0, 0, VDPCommand_YMMM
ENDM
@@ 14,14 14,14 @@ VRAMTableCopy: MACRO ?source = 0, ?desti
; iy = this
VRAMTableCopy_SetSourceIY:
ld a,l
- and Video_X_BYTE = 2 ? 7FH : a
+ and Video_4BPU ? 7FH : a
call nz,System_ThrowException
ld e,(ix + VRAMTable.address)
ld d,(ix + VRAMTable.address + 1)
add hl,de
ld a,(ix + VRAMTable.address + 2)
adc a,0
- IF Video_X_BYTE = 2
+ IF Video_4BPU
add hl,hl
adc a,a
ENDIF
@@ 34,14 34,14 @@ VRAMTableCopy_SetSourceIY:
; iy = this
VRAMTableCopy_SetDestinationIY:
ld a,l
- and Video_X_BYTE = 2 ? 7FH : a
+ and Video_4BPU ? 7FH : a
call nz,System_ThrowException
ld e,(ix + VRAMTable.address)
ld d,(ix + VRAMTable.address + 1)
add hl,de
ld a,(ix + VRAMTable.address + 2)
adc a,0
- IF Video_X_BYTE = 2
+ IF Video_4BPU
add hl,hl
adc a,a
ENDIF
@@ 53,9 53,9 @@ VRAMTableCopy_SetDestinationIY:
; iy = this
VRAMTableCopy_SetSizeIY:
ld a,c
- and Video_X_BYTE = 2 ? 7FH : a
+ and Video_4BPU ? 7FH : a
call nz,System_ThrowException
- IF Video_X_BYTE = 2
+ IF Video_4BPU
xor a
sla c
rl b
M src/video/Video.asm +2 -2
@@ 17,8 17,8 @@
INCLUDE "VDPCommandEx.asm"
Video_MODE: equ 5
-Video_X_BYTE: equ Video_MODE < 7 ? 2 : 1
-Video_X_SCALE: equ Video_MODE = 6 || Video_MODE = 7 ? 2 : 1
+Video_4BPU: equ Video_MODE < 7 ? 1 : 0 ; 8 or 4 bits per x-unit
+Video_HIRES: equ Video_MODE = 6 || Video_MODE = 7 ? 1 : 0 ; 1 or 2 pixels per x-unit
Video_VERTICAL_ADJUST: equ -2