diff --git a/include/atari_lynx_hardware.mfk b/include/atari_lynx_hardware.mfk index 035f62f6..124f74a6 100644 --- a/include/atari_lynx_hardware.mfk +++ b/include/atari_lynx_hardware.mfk @@ -1,42 +1,42 @@ -#if not(ATARI_LYNX) +#FFFFFF#if not(ATARI_LYNX) #warn atari lynx module should be only used on atari lynx #endif -word TMPADRL @$fc00 -word TILTACUM @$fc02 -word HOFF @$fc04 -word VOFF @$fc06 -word VIDBASE @$fc08 -word COLLBASE @$fc0a -word VIDADRL @$fc0c -word COLLADRL @$fc0e -word SCBNEXT @$fc10 -word SPRDLINE @$fc12 -word HPOSSTRT @$fc14 -word VPOSSTRT @$fc16 -word SPRHSIZ @$fc18 -word SPRVSIZ @$fc1a -word STRETCH @$fc1c -word TILT @$fc1e -word SPRDOFF @$fc20 -word SPRVPOS @$fc22 -word COLLOFF @$fc24 -word VSIZACUM @$fc26 -word HSIZOFF @$fc28 -word VSIZOFF @$fc2a -word SCBADR @$fc2c -word PROCADR @$fc2e -byte SPRCTRL0 @$fc80 -byte SPRCTRL1 @$fc81 -byte SPRCOLL @$fc82 -byte SPRINT @$fc83 +word TMPADRL @$fc00 +word TILTACUM @$fc02 +word HOFF @$fc04 +word VOFF @$fc06 +word VIDBASE @$fc08 +word COLLBASE @$fc0a +word VIDADRL @$fc0c +word COLLADRL @$fc0e +word SCBNEXT @$fc10 +word SPRDLINE @$fc12 +word HPOSSTRT @$fc14 +word VPOSSTRT @$fc16 +word SPRHSIZ @$fc18 +word SPRVSIZ @$fc1a +word STRETCH @$fc1c +word TILT @$fc1e +word SPRDOFF @$fc20 +word SPRVPOS @$fc22 +word COLLOFF @$fc24 +word VSIZACUM @$fc26 +word HSIZOFF @$fc28 +word VSIZOFF @$fc2a +word SCBADR @$fc2c +word PROCADR @$fc2e +byte SPRCTRL0 @$fc80 +byte SPRCTRL1 @$fc81 +byte SPRCOLL @$fc82 +byte SPRINT @$fc83 -byte SUZYBUSEN @$fc90 -byte SPRGO @$fc91 -byte SPRSYS @$fc92 - -byte JOYSTICK @$fcb0 -byte SWITCHES @$fcb1 +byte SUZYBUSEN $fc90 +byte SPRGO $fc91 +byte SPRSYS $fc92 + +byte JOYSTICK $fcb0 +byte SWITCHES $fcb1 word DISPADR @$fd94 byte SUZYDONEACK @$fd90 @@ -95,27 +95,27 @@ const byte DISPLAY_FLIPPED=%0010 const byte DISPLAY_ENABLE=%0001 // suzy sprite type -const byte TYPE_BACKGROUND =00 -const byte TYPE_BACKNONCOLL =01 -const byte TYPE_BSHADOW =02 -const byte TYPE_BOUNDARY =03 -const byte TYPE_NORMAL =04 -const byte TYPE_NONCOLL =05 -const byte TYPE_XOR =06 -const byte TYPE_SHADOW =07 +const byte TYPE_BACKGROUND =00 +const byte TYPE_BACKNONCOLL =01 +const byte TYPE_BSHADOW =02 +const byte TYPE_BOUNDARY =03 +const byte TYPE_NORMAL =04 +const byte TYPE_NONCOLL =05 +const byte TYPE_XOR =06 +const byte TYPE_SHADOW =07 // suzy drawing flags -const byte LITERAL =$80 -const byte PACKED =$00 -const byte ALGO3 =$40 -const byte RENONE =$00 -const byte REHV =$10 -const byte REHVS =$20 -const byte REHVST =$30 -const byte REUSEPAL =$08 -const byte SKIP =$04 -const byte DRAWUP =$02 -const byte DRAWLEFT =$01 +const byte LITERAL =$80 +const byte PACKED =$00 +const byte ALGO3 =$40 +const byte RENONE =$00 +const byte REHV =$10 +const byte REHVS =$20 +const byte REHVST =$30 +const byte REUSEPAL =$08 +const byte SKIP =$04 +const byte DRAWUP =$02 +const byte DRAWLEFT =$01 const byte BPP_1 = %00000000 const byte BPP_2 = %01000000 @@ -129,12 +129,12 @@ array(byte) palette_ram_blue_red[16] @$FDb0 //joystick -const byte BTN_A= %00000001 -const byte BTN_B= %00000010 -const byte BTN_R= %00010000 -const byte BTN_L= %00100000 -const byte BTN_D= %01000000 -const byte BTN_U= %10000000 +const byte BTN_A=%00000001 +const byte BTN_B=%00000010 +const byte BTN_R=%00010000 +const byte BTN_L=%00100000 +const byte BTN_D=%01000000 +const byte BTN_U=%10000000 inline void read_joy1() { reset_joy() @@ -173,7 +173,7 @@ void lynx_init() { // wait for suzy to finish rendering void lynx_wait_suzy() { asm { -waitsuzy: +waitsuzy: stz CPUSLEEP lda SPRSYS lsr