diff options
author | mid-kid <esteve.varela@gmail.com> | 2020-09-11 14:03:40 +0200 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2020-09-11 14:03:40 +0200 |
commit | a946e0ba851ad41b8d434e7494824128b247935a (patch) | |
tree | 129803fd4657e93f10a7c024b2eefd4e9f44085b | |
parent | e3dcbcde48466cb07522bd5bf98559aec05a9b07 (diff) |
Convert tabs to spaces...
-rw-r--r-- | data/text_chars.asm | 4 | ||||
-rw-r--r-- | include/macros.inc | 18 | ||||
-rw-r--r-- | source/bank_00.asm | 26 | ||||
-rw-r--r-- | source/bank_02.asm | 22 |
4 files changed, 35 insertions, 35 deletions
diff --git a/data/text_chars.asm b/data/text_chars.asm index 0af5ccf..f53aa16 100644 --- a/data/text_chars.asm +++ b/data/text_chars.asm @@ -264,7 +264,7 @@ _y = \2 _pos = $20 * (_x + 8 * _y) ; Max char width = 2 tiles, width = 8 chars _pos = _pos + 4 * _y ; Characters are 2 pixels taller than a tile _pos = _pos + $f0 * (_y / 4) ; Every 4 rows skip a whole tile - dw _pos + dw _pos endm text_chars_offsets:: @@ -272,7 +272,7 @@ y = 0 rept 32 ; height of image in characters x = 0 rept 8 ; width of image in characters - def_tile x, y + def_tile x, y x = x + 1 endr y = y + 1 diff --git a/include/macros.inc b/include/macros.inc index d93bfd0..8b95257 100644 --- a/include/macros.inc +++ b/include/macros.inc @@ -1,11 +1,11 @@ farcall: macro - push af - ld a, LOW(\1) - ld [w_farcall_target + 0], a - ld a, HIGH(\1) - ld [w_farcall_target + 1], a - ld a, BANK(\1) - ld [w_bank_temp], a - pop af - call _farcall + push af + ld a, LOW(\1) + ld [w_farcall_target + 0], a + ld a, HIGH(\1) + ld [w_farcall_target + 1], a + ld a, BANK(\1) + ld [w_bank_temp], a + pop af + call _farcall endm diff --git a/source/bank_00.asm b/source/bank_00.asm index c2c5c85..c66c27d 100644 --- a/source/bank_00.asm +++ b/source/bank_00.asm @@ -437,16 +437,16 @@ vwf_char_draw:: inc de ld [de], a - ; Write tiles stored in the buffer + ; Write tiles stored in the buffer ld bc, w_vwf_char_buffer - ; Ignore hblank (update during vblank?) + ; Ignore hblank (update during vblank?) ld a, [w_c336] bit 7, a jr z, .write_tile_ignore_hblank_loop .write_tile_loop - ; Get location to write to + ; Get location to write to ld a, [bc] ld l, a inc bc @@ -455,7 +455,7 @@ vwf_char_draw:: or l jr z, .write_tile_done - ; Get mask in e, and pixels in d + ; Get mask in e, and pixels in d inc bc ld a, [bc] ld e, a @@ -474,7 +474,7 @@ vwf_char_draw:: and STATF_LCD jr nz, .hblank_enter - ; Write pixels high bit, preserving background + ; Write pixels high bit, preserving background ld a, d xor [hl] and e @@ -489,7 +489,7 @@ vwf_char_draw:: and STATF_LCD jr nz, .hblank_next - ; Write 8 pixels low bit, preserving background + ; Write 8 pixels low bit, preserving background ld a, d xor [hl] and e @@ -504,7 +504,7 @@ vwf_char_draw:: ret .write_tile_ignore_hblank_loop - ; Get location to write to + ; Get location to write to ld a, [bc] ld l, a inc bc @@ -513,7 +513,7 @@ vwf_char_draw:: or l jr z, .write_tile_done - ; Get mask in e, and pixels in d + ; Get mask in e, and pixels in d inc bc ld a, [bc] ld e, a @@ -521,7 +521,7 @@ vwf_char_draw:: ld a, [bc] inc bc - ; Write pixels high bit, preserving background + ; Write pixels high bit, preserving background xor [hl] and e xor [hl] @@ -529,7 +529,7 @@ vwf_char_draw:: ld a, [bc] inc bc - ; Write 8 pixels low bit, preserving background + ; Write 8 pixels low bit, preserving background xor [hl] and e xor [hl] @@ -540,12 +540,12 @@ vwf_char_draw:: db $ff, $7f, $3f, $1f, $0f, $07, $03, $01 .Data_000_0a2c: - db $00 + db $00 .pixel_masks_left: - db $80, $c0, $e0, $f0, $f8, $fc, $fe, $ff + db $80, $c0, $e0, $f0, $f8, $fc, $fe, $ff - db $00, $00, $68, $01, $d0, $02, $38, $04, $a0, $05, $08, $07, $70, $08, $d8, $09, $40, $0b, $a8, $0c, $fa, $57, $c3, $a7, $c8, $f0, $00, $f6, $30, $e0, $00, $f0, $4d, $3e, $01, $e0, $4d, $10, $6f + db $00, $00, $68, $01, $d0, $02, $38, $04, $a0, $05, $08, $07, $70, $08, $d8, $09, $40, $0b, $a8, $0c, $fa, $57, $c3, $a7, $c8, $f0, $00, $f6, $30, $e0, $00, $f0, $4d, $3e, $01, $e0, $4d, $10, $6f SECTION "vram_copy", ROM0[$0fbd] ; Parameters: diff --git a/source/bank_02.asm b/source/bank_02.asm index cf93d5f..54935ae 100644 --- a/source/bank_02.asm +++ b/source/bank_02.asm @@ -25,14 +25,14 @@ text_char_print:: ld e, a ld a, [hl+] - ; Check if we've reached the end of the string + ; Check if we've reached the end of the string ld d, a and e cp TX_EOM jp z, farcall_ret push hl - ; Check for line feed + ; Check for line feed ld a, e cp LOW(TX_LF) jr nz, .not_line_feed @@ -41,7 +41,7 @@ text_char_print:: jr z, .line_feed .not_line_feed - ; Draw ピ one pixel higher + ; Draw ピ one pixel higher ld a, e cp "ピ" jr nz, .not_pi @@ -51,10 +51,10 @@ text_char_print:: dec c .not_pi - ; Draw character + ; Draw character farcall text_char_draw - ; Leave two pixels space between each character + ; Leave two pixels space between each character ld hl, w_text_cur_x add 2 add [hl] @@ -62,7 +62,7 @@ text_char_print:: jr .done .line_feed - ; Advance to the next line + ; Advance to the next line ld a, [w_textbox_x] ld [w_text_cur_x], a ld a, [w_text_cur_y] @@ -70,14 +70,14 @@ text_char_print:: ld [w_text_cur_y], a .done - ; Back up string pointer + ; Back up string pointer pop hl ld a, l ld [w_text_cur_string + 0], a ld a, h ld [w_text_cur_string + 1], a - ; Check if the next character is a terminator + ; Check if the next character is a terminator ld a, [hl+] and [hl] cp TX_EOM @@ -92,7 +92,7 @@ text_char_print:: text_char_draw:: push de - ; Get char address + ; Get char address sla e rl d ld hl, text_chars_offsets @@ -112,7 +112,7 @@ text_char_draw:: ld a, b ld [w_vwf_char_start_x], a - ; Get character width + ; Get character width pop de ld hl, text_chars_widths add hl, de @@ -120,7 +120,7 @@ text_char_draw:: and a jp z, farcall_ret - ; Check we aren't drawing outside the textbox + ; Check we aren't drawing outside the textbox push af add b ld hl, w_textbox_width |