aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan J. Martínez <jjm@usebox.net>2022-05-19 06:05:40 +0000
committerJuan J. Martínez <jjm@usebox.net>2022-05-19 06:05:40 +0000
commit978efe9ebb559134449bb2ecb2414bf5fe7e27c2 (patch)
treeca35c17d457a4ea9a799cb694d45fe07afa60155
parentd9b276b534c40354ab381261f36ac826f2e4fa4a (diff)
parent9d1b4fd5192bb17d4fca1a88e66307a031d0615f (diff)
downloadubox-msx-lib-978efe9ebb559134449bb2ecb2414bf5fe7e27c2.tar.gz
ubox-msx-lib-978efe9ebb559134449bb2ecb2414bf5fe7e27c2.zip
Merge branch 'master' into 'master'
indentation: replaced spaces with tabs See merge request reidrac/ubox-msx-lib!27
-rw-r--r--src/ubox/ubox_isr.z804
-rw-r--r--src/ubox/ubox_read_ctl.z808
-rw-r--r--src/ubox/ubox_set_sprite_pat16_flip.z808
-rw-r--r--src/ubox/ubox_set_sprite_pat8_flip.z808
4 files changed, 14 insertions, 14 deletions
diff --git a/src/ubox/ubox_isr.z80 b/src/ubox/ubox_isr.z80
index cceb2c6..f25e35d 100644
--- a/src/ubox/ubox_isr.z80
+++ b/src/ubox/ubox_isr.z80
@@ -32,7 +32,7 @@ _ubox_init_isr::
ret
ubox_isr:
- push af
+ push af
push ix
push iy
push bc
@@ -67,7 +67,7 @@ no_user_isr:
pop bc
pop iy
pop ix
- pop af
+ pop af
ret
.area _DATA
diff --git a/src/ubox/ubox_read_ctl.z80 b/src/ubox/ubox_read_ctl.z80
index 91963c0..ae4fff9 100644
--- a/src/ubox/ubox_read_ctl.z80
+++ b/src/ubox/ubox_read_ctl.z80
@@ -35,8 +35,8 @@ call_psg:
call RDPSG
ei
cpl
- and #0x3f
- ld e, a
+ and #0x3f
+ ld e, a
; button 2 (M)
ld a, #4
@@ -46,9 +46,9 @@ call_psg:
rra
ld a, #0x20
jr nc, joy_extra_m
- xor a
+ xor a
joy_extra_m:
- or e
+ or e
ld l, a
ret
diff --git a/src/ubox/ubox_set_sprite_pat16_flip.z80 b/src/ubox/ubox_set_sprite_pat16_flip.z80
index 5631808..52f4ab7 100644
--- a/src/ubox/ubox_set_sprite_pat16_flip.z80
+++ b/src/ubox/ubox_set_sprite_pat16_flip.z80
@@ -46,10 +46,10 @@ flip0:
flip_and_copy:
ld a, (de)
ld c, a
- rlca
- rlca
- xor c
- and #0xaa
+ rlca
+ rlca
+ xor c
+ and #0xaa
xor c
ld c, a
rlca
diff --git a/src/ubox/ubox_set_sprite_pat8_flip.z80 b/src/ubox/ubox_set_sprite_pat8_flip.z80
index fdcf9ec..b453253 100644
--- a/src/ubox/ubox_set_sprite_pat8_flip.z80
+++ b/src/ubox/ubox_set_sprite_pat8_flip.z80
@@ -31,10 +31,10 @@ flip0:
flip_and_copy:
ld a, (de)
ld c, a
- rlca
- rlca
- xor c
- and #0xaa
+ rlca
+ rlca
+ xor c
+ and #0xaa
xor c
ld c, a
rlca