X-Git-Url: http://git.shiar.nl/wormy.git/blobdiff_plain/5df4f3685fcfcfe6d79661a8f54d256c2e987a59..7ec10d8466fbe267a3d0a8fe8fbfaed79adbf07f:/worm.z80

diff --git a/worm.z80 b/worm.z80
index 2db4d9c..a5cdab9 100644
--- a/worm.z80
+++ b/worm.z80
@@ -1,7 +1,7 @@
 ; Title                      : Worm
-; Version                    : 89%
-; Release Date               : april 2000???
-; Filename                   : worm.86p (4kb)
+; Version                    : 91%
+; Release Date               : may 2000
+; Filename                   : worm.86p (5kb)
 ; Author(s)                  : Shiar
 ; Email Address              : shiar@mailroom.com
 ; ICQ UIN                    : #43840958
@@ -16,14 +16,14 @@
 ;----------- TO-DO -----------
 ;-----------------------------
 
-; 89% = DONE
+; 91% = DONE
 
-;  3% * linkplay
-;  1% * titlescreen
+;  2% * fix deaths linkplay and transmit game/level data
 ;  2% * make linkplay available for all gametypes (not just deathmatch)
-;     * game types:
-;  1%   * ctf: take enemy flag (right-bottom) and return to your flag (left-top)
-;  1%   * domination?: take control points by running over them and hold them
+;  1% * fix pea XOR problem in ctf (+dom?)
+;     * fix wormstop
+;  1% * domination?: take control points by running over them and hold them
+;     * customizable keys
 ;     * complete readme (+custom level info)
 ;  2% * ... (pollish, &&&)
 
@@ -37,6 +37,12 @@
 ;-----------------------------
 ;-----------------------------
 
+#define buffer      ;use display buffer (otherwise write directly to screen)
+#define readymask   ;"grays" out the field before starting a level
+
+;#define readytext  ;displays "prepare" before level starts
+;#define invincible ;worms cannot die =)
+
 #define cal call
 #define psh push
 #define dnz djnz
@@ -68,9 +74,10 @@ _SET_MM_NUM_BYTES  = $464F ;number of bytes for mm.ldir = ahl
 _mm_ldir           = $52ED ;24bit ldir
 _RAM_PAGE_1        = $47E3 ;set $8000+ to page 1
 _RAM_PAGE_7        = $47F3
-_PTEMP_END         = $D29A
+_PTEMP_END         = $D29A ;end of VAT
 _load_ram_ahl      = $462F ;ahl->page+hl
 _writeb_inc_ahl    = $5567 ;ld (ahl),c
+_jforce            = $409C ;TI-OS stack restored
 
 ;-----------------------------
 ;------- data  storage -------
@@ -78,31 +85,35 @@ _writeb_inc_ahl    = $5567 ;ld (ahl),c
 
 ;--- permanent
 
-resbit = 2                        ;and%111110**
-
 ScrBuffer   = $8820 ;-A7FF (20*FF=1FE0)
-worm1p      = $A800 ;-ABFF (400)      %10101O00
-worm1       = $AC00 ;-AC1D (30d)
-worm2       = $AC1E ;-AC3B (1E)
-worm3       = $AC3C ;-AC59 (1E)
-worm4       = $AC5A ;-AC77 (1E)
-balls       = $AC78 ;-ACFF (3x45d)
+worm2p      = $A800 ;-ABFF (400)      %10101O00
+worm1       = $AC00 ;-AC1D (31d)
+worm2       = $AC1F ;-AC3B (1F)
+worm3       = $AC3E ;-AC59 (1F)
+worm4       = $AC5D ;-AC77 (1F)
+balls       = $AC7C ;-ACFF (3x43d)
 SinCosTable = $AD00 ;-AE00 (4x40)
         ;free $AE01 ;-AFFF (1FF)
-worm2p      = $B000 ;-B3FF (400)      %10110O00
-DispBuffer  = $B400 ;-B790 (10x57d)
-        ;free $B791 ;-B7FF (6F)
+worm1p      = $B000 ;-B7FF (800)      %1011O000
 worm3p      = $B800 ;-BBFF (400)      %10111O00
-        ;free $BC00 ;-BFFF (400)
+        ;free $BF91 ;-BFFF (6F)
 
      ;program $D748 ;-E7FF (106D+4A)
         ;free $E800 ;-EFFF (800)
 worm4p      = $F000 ;-F3FF (400)      %11110O00
 leveldata   = $F400 ;-FA70 (<=671)
 
+peaspos = $AE01
+
 ;--- temporary
 
-templevels  = $B400 ;(3*levelstr_on_calc)
+templevels  = $BC00 ;(3*strings) @init
+namelength  = $BC00 ;(1)         @menu
+#ifdef buffer
+DispBuffer  = $BC00 ;(10x57d)    @game
+#else
+DispBuffer  = $FC70
+#endif
 
 ;-----------------------------
 ;------- program start -------
@@ -110,7 +121,7 @@ templevels  = $B400 ;(3*levelstr_on_calc)
 
 .org _asm_exec_ram
 
-WormVersion = 089
+WormVersion = 091
 
 start:
   nop
@@ -120,7 +131,7 @@ start:
   .dw WormIcon
 
 WormMsg:
-  .db "WORM by SHIAR -- pre-beta 89%",0
+  .db "WORM by SHIAR -- pre-beta 91%",0
 WormIcon:
   .db 9,2
   .db %10010110,%01101111
@@ -134,13 +145,12 @@ WormIcon:
   .db %11000011,%10000000
 
 levelhead  = 'w'
-levelhead2 = 89 ;worm levels header = "89"
+levelhead2 = 91 ;worm levels header = "91"
 
 Start:
   ld  (SpSave),sp
   cal _runindicoff
   cal _flushallmenus
-  cal _clrLCD
 
   cal _RAM_PAGE_7
   ld  hl,$BFFF ;VAT start
@@ -231,13 +241,17 @@ searchcomplete:
   or  a
   sbc hl,bc
   pop hl
-  jp  z,levelloaded ;no ext files
+  jp  z,_clrWindow ;no ext files: exit
 dispnextlevel:
   cal _RAM_PAGE_1
   psh hl
   cal _clrWindow
-  ld  a,4
+  ld  a,2
   ld  (_curRow),a
+  ld  hl,txtLevsel
+  cal _puts ;"< Select levels: >"
+  ld  hl,$0004
+  ld  (_curRow),hl
   pop hl
   ld  a,(hl)
   cp  255
@@ -351,17 +365,32 @@ NegativeSineWave:
   ld  (curlevel),a
 DisplayMenu:
   cal _clrWindow
-  ld  hl,txtWelcome
-  cal _puts
+  ld  de,$FC42 ;(10,2)
+  ld  hl,wtPicture
+  ld  a,16 ;height
+disptitleloop:
+  ld  bc,8 ;width
+  ldir
+  ex  de,hl
+  ld  bc,8 ;next line
+  add hl,bc
+  ex  de,hl
+  dec a
+  jr  nz,disptitleloop
+
+  ld  hl,txtMenu
+  ld  de,$0D5A
+  ld  (_penCol),de
+  cal _vputs ;by Shiar
   ld  de,$0207
   ld  (_curRow),de
   cal _puts ;---
   dec e ;$0206
   ld  (_curRow),de
-  cal _puts ;Level
+  cal _puts ;Level <00>
   dec e ;$0205
   ld  (_curRow),de
-  cal _puts ;Worms: 2
+  cal _puts ;Worms <2>
   dec e ;$0204
   ld  (_curRow),de
   ld  hl,(CURtxtGame)
@@ -381,6 +410,8 @@ select:
 notselect
   cp  K_EXIT
   jp  z,ExitNoStats
+  cp  K_LEFT
+  jr  z,selleft
   cp  K_RIGHT
   ld  a,b
   jr  nz,mainMenu
@@ -398,18 +429,32 @@ changelevel:
   ld  hl,nrlevels
   add hl,de
   ld  d,(hl) ;max level for sel.game
+curlevel =$+1
   ld  a,1
-curlevel =$-1
   inc a
   cp  d
   jr  c,changedlevel
-  ld  a,1
+  ld  a,d
 changedlevel:
   ld  (curlevel),a
-dispcurlevel:
-  ld  hl,$0806
+_dispcurlevel:
+  ld  hl,$0906
   ld  (_curRow),hl
   cal showA
+_mainMenu:
+  jr  mainMenu
+
+selleft:
+  ld  a,b
+  dec a
+  jr  z,bchangenrworms
+  dec a
+  jr  nz,mainMenu
+
+bchangelevel:
+  ld  a,(curlevel)
+  dec a
+  jr  nz,changedlevel
   jr  mainMenu
 
 changegame:
@@ -431,33 +476,42 @@ okilydokily:
   cal _puts
   ld  (NEXTtxtGame),hl
 howmanyworms:
+  ld  hl,nrworms
   ld  a,(Gametype)
   cp  2
-  ld  a,1
-  jr  c,oneworm
-nrworms =$+1
-  ld  a,2
-oneworm:
-  jr  dispnrworms ;jr mainMenu
+  ld  (hl),1
+  jr  c,dispnrworms
+  inc (hl) ;2
+  jr  dispnrworms ;mainMenu
 
 changenrworms:
   ld  a,(Gametype)
-  cp  2
-  jr  c,mainMenu ;type 0/1
+  cp  2 ;&&
+  jr  c,_mainMenu ;type 0/1
   ld  hl,nrworms
   ld  a,(hl)
   inc a
   cp  5
-  jr  c,changednrworms
-  ld  a,1
+  jr  nc,dispcurlevel
 changednrworms:
   ld  (hl),a
 dispnrworms:
+  ld  a,(hl) ;hl=nrworms
   ld  hl,$0905
   ld  (_curRow),hl
-  cal showA
+  add a,'0'
+  cal _putc
+dispcurlevel
   ld  a,(curlevel)
-  jr  dispcurlevel ;mainMenu
+  jr  _dispcurlevel ;mainMenu
+
+bchangenrworms:
+  ld  hl,nrworms
+  ld  a,(hl)
+  dec a
+  cp  2 ;2-4
+  jr  nc,changednrworms
+  jr  dispcurlevel
 
 menucall:
   psh bc
@@ -511,20 +565,25 @@ changeworms:
   cp  2
   ld  a,1
   jr  c,wormnrname
-  ld  a,(nrworms)
+nrworms =$+1
+  ld  a,1
 wormnrname:
   add a,'0'
   cal _putc
   sub '0'
+
+  ld  d,a  ;1x
   add a,a  ;2x
   ld  e,a
   add a,a  ;4x
   add a,a  ;8x
   add a,a ;16x
   add a,e ;18x
+  add a,d ;19x
   ld  e,a
-  ld  d,0
-  ld  ix,worm1name-18
+  ld  d,0 ;de=a
+
+  ld  ix,worm1name-19
   add ix,de
   ld  a,maxnamelength
   cal entername
@@ -533,7 +592,7 @@ wormnrname:
 
 entername:
   ld  h,1
-  ld  l,h
+  ld  l,h ;)
   ld  (_curRow),hl
   ld  (namelength),a
 enternameloop:
@@ -595,16 +654,14 @@ waitnokeypressed:
   jr  nz,waitnokeypressed
   ret
 
-namelength:
-  .db 0
 chartable:
-  .db 0,".<>!",0,0,0,0
-  .db 0,"xtoje0",0      ;enter..clear
-  .db " wsnid9",0       ;(-)..custom
-  .db "zvrmhc8",0       ;dot..del
-  .db "yuqlgb7#"        ;0..xvar
-  .db 0,"-pkfa6'"       ;on..alpha
-  .db "54321*",0,0      ;F5..more
+  .db 0,".<>!",0,0,0,0  ;down,L,R,up
+  .db 0,"XTOJE0",0      ;enter..clear
+  .db " WSNID9",0       ;(-)..custom
+  .db "ZVRMHC8",0       ;dot..del
+  .db "YUQLGB7#"        ;0..xvar
+  .db $D9,"-PKFA6'"     ;on..alpha
+  .db "54321*",0,$D0    ;F5..more
 
 ;--proc
 
@@ -635,6 +692,17 @@ skipworms:
 skipballs:
   inc hl
   dnz skipballs
+
+skipflags:
+  ld  a,(Gametype)
+  cp  gamectf
+  jr  nz,noflagstoskip
+  inc hl
+  inc hl
+  inc hl
+  inc hl
+noflagstoskip:
+
   cal skiplines ;lines
 skiplines: ;boxes
   ld  a,(hl) ;lines/boxes
@@ -642,6 +710,7 @@ skiplines: ;boxes
   add a,a
   inc a
   ld  b,a ;4x(hl)+1
+
 skiplb
   inc hl
   dnz skiplb
@@ -701,27 +770,32 @@ linkmatch:
   cal _clrWindow
   ld  a,WormVersion
   cal send
-  jr  c,client ;2nd
+  jr  nc,client ;2nd
 
 host:
   ld  hl,txtWaiting
   cal _puts
   cal receive
   cp  WormVersion
-  jp  nz,LinkBreak
+  jp  nz,linkiniterror
   cal send
 
-  ld  hl,SwapPos
-  ld  (hl),$f6
   jr  multiplayer
 
+linkiniterror:
+  pop hl
+  jp  DisplayMenu
+
 client:
   ld  hl,txtReceive
   cal _puts
-  cal receive
+  cal Qreceive
+  jp  c,linkiniterror
   cp  WormVersion
-  jp  nz,LinkBreak
+  jp  nz,linkiniterror
 
+  ld  hl,SwapPos
+  ld  (hl),$f6
 multiplayer:
   ld  a,2
   ld  (nrworms),a
@@ -744,30 +818,25 @@ GameOver:
   ld  (worm2+score+1),hl
   ld  (worm3+score+1),hl
   ld  (worm4+score+1),hl
-  ld  hl,worm1set+4
-  ld  de,worm1+lives
-;&&&>*
-  cal _MOV5B ;9xld(de),(hl)
-  cal _mov9b
-  ld  hl,worm2set+4
-  ld  de,worm2+lives
-  cal _MOV5B
-  cal _mov9b
-  ld  hl,worm3set+4
-  ld  de,worm3+lives
-  cal _MOV5B
-  cal _mov9b
-  ld  hl,worm4set+4
-  ld  de,worm4+lives
-  cal _MOV5B
-  cal _mov9b
+  ld  hl,worm1set
+  ld  de,worm1+head
+  ld  a,4 ;4x (all worms)
+createwormsloop:
+  ld  bc,19
+  ldir ;copy 19 bytes
+  ex  de,hl
+  ld  bc,head
+  add hl,bc
+  ex  de,hl ;de=wormX+head
+  dec a     ;loop
+  jr  nz,createwormsloop
 
   ld  a,(Gametype)
   cp  1 ;=peaworm
   jr  nz,worminitdone
-  ld  (worm1+lives),a ;&&&<*
+  ld  (worm1+lives),a
 worminitdone:
-  pop hl
+  pop hl ;begin of current level
 
 StartLevel:
   ld  de,Left
@@ -832,31 +901,10 @@ setsprite:
   ldir
 toobad_noballs:
 
-#ifdef 0
-  ld  a,(gameCar)
-  and _datahunt
-  jr  z,nohunter
-  ld  a,huntersize
-  ld  (worm2+grow),a
-nohunter:
-#endif
-
   ex  de,hl
+#ifndef invincible
   ld  (thislevel),de
-  psh de
-  ld  hl,worm1set
-  ld  de,worm1+head
-  cal _MOV4B
-  ld  hl,worm2set
-  ld  de,worm2+head
-  cal _MOV4B
-  ld  hl,worm3set
-  ld  de,worm3+head
-  cal _MOV4B
-  ld  hl,worm4set
-  ld  de,worm4+head
-  cal _MOV4B
-  pop de
+#endif
 
   ld  hl,worm1
   ld  a,(gameCar)
@@ -956,9 +1004,21 @@ NoVertShift:
   ld  c,64
   ldir
 
-;-draw lines-
 
   pop hl                         ; << levelp
+  ld  a,(Gametype)
+  cp  gamectf
+  jr  nz,noctf
+  ld  de,peaspos
+  ld  bc,4
+  ldir
+  psh hl
+  cal DrawAllPeas
+  pop hl
+noctf:
+
+;-draw lines-
+
   ld  a,(hl)
   inc hl
   or  a
@@ -1015,6 +1075,27 @@ noboxes:
 nofood:
   ld  bc,(worm1+pos)
   cal DisplayField
+
+#ifdef readymask
+  ld  hl,$FC70
+  ld  d,%10101010
+  ld  c,56
+maskloop:
+  ld  a,d
+  xor %11111111
+  ld  d,a
+  ld  b,$10
+maskline:
+  ld  a,(hl)
+  or  d
+  ld  (hl),a
+  inc hl
+  dnz maskline
+  dec c
+  jr  nz,maskloop
+#endif
+
+#ifdef readytext
   ld  hl,$FDE0
   ld  de,$FDE1
   ld  (hl),%11111111
@@ -1026,6 +1107,7 @@ nofood:
   ld  hl,txtReady
   cal _puts
   res 3,(iy+5)
+#endif
 
   ld  a,0
 gameCar =$-1
@@ -1052,10 +1134,11 @@ SwapPos: ;$18 xx -> $F6 xx
   ld  (worm2+heading),a
 initfinished:
 
-  ld  b,0
+  ld  b,startdelay
 ReadyDelay:
   halt
   dnz ReadyDelay
+  cal releasekeys
 
 ;-----------------------------
 ;----------- LOOP ------------
@@ -1091,7 +1174,10 @@ Delay:
   jr  nz,Delay
 NoDelay:
 
-  cal handlethoseneatlittleballs
+  ld  a,0
+nrballs =$-1
+  or  a
+  cal nz,handlethoseneatlittleballs
 
   ld  ix,worm1
   ld  a,(nrworms)
@@ -1127,6 +1213,9 @@ CheckExit:
   jr  Exit
 
 WormDead:
+#ifdef invincible
+  jp  stopworm
+#else
   ld  a,2
   ld  (flashtime),a
   ld  (ix+delay),respawndelay
@@ -1155,6 +1244,7 @@ thislevel =$+1
   ld  a,$A7 ;exit@end of turn
   ld  (CheckExit),a ;set exit state
   ret ;finish turn
+#endif
 
 Exit:
   ld  sp,0 ;pop all
@@ -1186,7 +1276,7 @@ displayWormStats:
   ld  bc,input-died
   add hl,bc ;+input
   xor a
-  cp  (hl)
+  cp  (hl)  ;input=0 = link
   jr  nz,NoLinkIndic
   ld  b,7
   inc hl ;+left
@@ -1212,9 +1302,9 @@ NoLinkIndic:
   ld  a,13
   ld  (_curCol),a
   ld  a,(hl) ;worm+died
-  psh hl
   cal showA
   pop hl
+  psh hl
 
   ld  a,16
   ld  (_curCol),a
@@ -1234,7 +1324,6 @@ NoLinkIndic:
 checkhilevel:
   ld  hl,nrlevels
   ld  a,(Level)
-  inc a
   cp  (hl)
   jr  c,hilevelcheckdone
   ld  (hl),a    ;save local
@@ -1281,13 +1370,16 @@ NotNewHigh: ;de=current hiscore
   cal showHL
 hiscorecheckdone:
 
+  cal releasekeys
 waitkey:
   halt
   halt
   cal GET_KEY
   cp  K_ENTER
   jp  z,DisplayMenu
-;  cp  K_EXIT
+  cp  K_SECOND
+  jp  z,DisplayMenu
+  cp  K_EXIT
   jr  nz,waitkey
 
 ;x123456789012345678901
@@ -1317,11 +1409,14 @@ ExitNoStats:
   cal _SET_MM_NUM_BYTES
   cal _mm_ldir
 
+  cal releasekeys
   res 4,(iy+9)
   set 2,(iy+13)
   jp  _clrWindow
 
 loadhiscoreposinahl:
+  ld  a,(Level)
+  ld  b,a
   ld  a,(Gametype)
   or  a
 externalhiscoresavepos:
@@ -1330,63 +1425,19 @@ hiscrposa =$-1
   ld  hl,0
 hiscrposhl =$-2
   ret z ;(Gametype)=0
+addlevelposition:
   cal _AHL_PLUS_2_PG3
+  dnz addlevelposition
   ret
 
 ;-----------------------------
 ;----------- worm ------------
 ;-----------------------------
 
-inlink:
-  ld  a,0
-sendbyte =$-1
-  ld  b,(ix+left)
-  dec b
-  jr  z,receivefirst
-  cal send
-  cal receive
-  ld  l,a
-  ret
-receivefirst:
-  psh af
-  cal receive
-  ld   l,a
-  pop  af
-  psh hl
-  cal send
-  pop  hl
-  ret
-
-inkeys: ;use jp not call!
-  out (1),a ;nop\nop
-  in  a,(1)
-  ld  b,a
-  and (ix+right)
-  jr  z,notright
-  ld  a,l
-  add a,8
-  ld  l,a
-notright:
-  ld  a,b
-  and (ix+left)
-  ret z
-  ld  a,l
-  sub 8
-  ld  l,a
-  ret
-
-chkinput:
-  ld  bc,donediddelydone
-  psh bc ;ret-dest.
-inputcall:
-  ld  a,(ix+input)
-  or  a
-  jr  nz,inkeys
-  jr  inlink
-
 respawncheck:
   cp  respawndelay-1
   jr  nz,unnamedlabel
+  cal saverespawncounter
 removeworm:
   ld  h,(ix+tail+1)
   ld  l,(ix+tail)
@@ -1398,7 +1449,7 @@ removewormloop:
   inc hl
   ld  b,(hl)
   inc hl
-  res resbit,h
+  cal resbit
   psh hl
   cal res4pixels
   pop hl
@@ -1417,7 +1468,9 @@ safewormsizedone:
 
   ;de=ix+head
   ld  (ix+tail+1),d
-  ld  (ix+tail),e
+  ld  (ix+tail),e ;head=tail/size=0
+  jr  norespawn
+  ret
 
 unnamedlabel:
   cp  1
@@ -1430,7 +1483,54 @@ respawndue:
   cp  l   ;changed?
   ret z
 saverespawncounter:
-  ld  (ix+delay),h
+  ld  (ix+delay),a
+norespawn:
+  ld  a,(gameCar)
+  and _datalink
+  jr  nz,inlink
+  ret
+
+inkeys: ;use jp not call!
+  out (1),a ;nop\nop
+  in  a,(1)
+  ld  b,a
+  and (ix+right)
+  jr  z,notright
+  ld  a,l
+  add a,8
+  ld  l,a
+notright:
+  ld  a,b
+  and (ix+left)
+  ret z
+  ld  a,l
+  sub 8
+  ld  l,a
+  ret
+
+inputcall:
+  ld  a,(ix+input)
+  or  a
+  jr  nz,inkeys
+
+inlink:
+  ld  a,0
+sendbyte =$-1
+  ld  b,(ix+left)
+  dec b
+  jr  z,receivefirst
+  cal send
+  cal receive
+  ld  l,a
+  ret
+receivefirst:
+  psh af
+  cal receive
+  ld  l,a
+  pop af
+  psh hl
+  cal send
+  pop hl
   ret
 
 ;------- handle worm ---------
@@ -1438,10 +1538,10 @@ saverespawncounter:
 HandleWorm:
   ld  a,(ix+delay)
   dec a
-  jr  nz,respawncheck
+  jp  nz,respawncheck
 
   ld  l,(ix+heading)
-  jr  chkinput
+  cal inputcall
 donediddelydone:
   ld  a,l
   ld  (sendbyte),a
@@ -1453,6 +1553,18 @@ donediddelydone:
   ld  e,(ix+pos2)
   ld  d,(ix+pos2+1)
 
+  psh hl
+  ld  hl,previouspos
+  ld  (hl),c
+  inc hl
+  ld  (hl),b
+  inc hl
+  inc hl
+  ld  (hl),e
+  inc hl
+  ld  (hl),d
+  pop hl
+
 ;-------- move worm ----------
 
 Wormmove:
@@ -1511,27 +1623,19 @@ GotFour:
 Hitworm:
   ld  a,(gameCar)
   ld  h,a
-  and _datafood
-  jp  z,WormDead
+  and _datadie
+  cal z,checkhitotherworm
+  ld  a,h
+  and _datamultpeas ;&&bit
+  jr  nz,multiple_peas
   ld  a,h
-  and _datahunt
-  cal nz,checkhitotherworm
+  and _datafood
+  jp  z,WormDead ;no food
 
   ld  hl,0
 PeaY =$-2
 PeaX =$-1
-  ld  a,(sprsize)
-  inc a
-  ld  d,a
-  ld  a,b
-  sub h
-  inc a
-  cp  d ;=(sprsize)+1
-  jp  nc,WormDead
-  ld  a,c
-  sub l
-  inc a
-  cp  d
+  cal chkpeahit
   jp  nc,WormDead
   cal DrawPea ;remove pea
   ld  a,(ix+grow)
@@ -1545,10 +1649,10 @@ peagrowth =$-1
   ld  de,10
   cal IncScore
   pop af
-  jr  nz,still_alive_not_dead
+  jp  nz,Drawworm ;continue
   ld  a,(gameCar)
   and _datafoodl
-  jr  z,still_alive_not_dead
+  jp  z,Drawworm
   ld  a,(Gametype)
   or  a
   jp  nz,Exit ;stack restored
@@ -1563,20 +1667,94 @@ peagrowth =$-1
   cal _HLTIMES10
   ex  de,hl
   cal IncScore ;score+(40*level)
+  cal removeworm
   pop hl                         ; << call
   pop hl                         ; << call
   pop hl                         ; << levelp new
   jp  StartLevel
 
+chkpeahit: ;hl=peapos
+  ld  a,(sprsize)
+  inc a
+  ld  d,a
+  ld  a,b
+  sub h
+  inc a
+  cp  d ;=(sprsize)+1
+  ret nc ;nc=no pea
+  ld  a,c
+  sub l
+  inc a
+  cp  d
+  ret ;c=pea
+
+flagcaptured:
+  psh hl
+  ld  de,30
+  cal IncScore
+  pop hl
+sillylabel:
+  cal WormDead
+DrawAllPeas:
+  ld  hl,(peaspos)
+  cal DrawPea
+  ld  hl,(peaspos+2)
+  jp  DrawPea
+
+multiple_peas:
+  ld  hl,(peaspos) ;1st pea
+  psh hl
+  ld  a,(ix+reserv)
+  ld  e,a ;push a
+  and %01
+  jr  nz,sel_ownpea
+  ld  hl,(peaspos+2) ;2nd pea
+sel_ownpea:
+  cal chkpeahit
+  pop hl ;(peapos) 1st pea
+  jp  c,stopworm ;own pea hit
+
+  ld  a,e ;peek a (that x86 asm for pop\push ;)
+  and %01
+  jr  z,sel_otherpea
+  ld  hl,(peaspos+2) ;2nd pea
+sel_otherpea:
+  cal chkpeahit
+  jp  c,hitflag
+
+;no peas hit
+  ld  a,e
+  cal flagtoken
+  jp  z,WormDead
+  ld  b,a ;%10
+  srl b   ;%01
+  add a,b ;%11
+  ld  (ix+reserv),a
+  cal DrawPea ;restore own flag
+  jr  sillylabel ;inv both\die
+
+hitflag: ;correct pea hit
+  ld  a,e ;pop a
+  xor %01 ;0=1;1=0
+  ld  (ix+reserv),a
+  cal flagtoken
+  psh af ;safe z-flag
+  cal DrawPea ;remove
+  pop af
+  jr  z,flagcaptured
+  jr  stopworm
+
+flagtoken:
+  and %01 ;current
+  add a,a ;<< for cp
+  ld  b,a ;in b
+  ld  a,e
+  and %10 ;own
+  cp  b   ;same?
+  ret ;Z=yes: no flag taken
+
 ;-----------------------------
 
-checkhitotherworm:
-  .db $dd,$7d ;ld a,lx
-  cp  worm2&255
-  ret nz
-ThisIsJustASillyUselessLabel:
-  ld  hl,(worm1+tail)
-  ld  de,(worm1+head)
 nextotherwormbit:
   ld  a,c
   sub (hl)
@@ -1588,13 +1766,14 @@ nextotherwormbit:
   sub (hl)
   inc a
   cp  4
-  jr  c,otherwormHIT ;yes
+  ret c ;nz ;yes
 nothit1:
   inc hl
-  res resbit,h
+  cal resbit
+ChkWorm:
   cal _cphlde
   jr  nz,nextotherwormbit
-  ret
+  ret ;z
 
 checkhitlapline:
   ld  a,63
@@ -1617,29 +1796,44 @@ nolap:
   ld  (ix+reserv),a
   ret
 
-otherwormHIT:
-  psh ix
-  ld  de,10
-  cal IncScore
+checkhitotherworm:
+ .db  $dd,$7d ;ld a,lx
+  cp  worm2&255
+ psh ix
+ jr nz,chkworm2 ; ret nz
   ld  ix,worm1
-  cal WormDead
-  pop ix
-  pop bc
-still_alive_not_dead:
+ jr chkworm
+chkworm2:
+ ld ix,worm2
+
+chkworm:
+ ld h,(ix+tail+1)
+ ld l,(ix+tail)
+ ld e,(ix+head)
+ ld d,(ix+head+1)
+  cal ChkWorm
+ pop ix
+  ret z ;not hit
+  pop bc ;call
+stopworm:
+  ld  bc,0
+previouspos =$-2
+  ld  de,0
+  ld  (ix+pos),c
+  ld  (ix+pos+1),b
+  ld  (ix+pos2),e
+  ld  (ix+pos2+1),d
+  ret
 
 ;-------- draw worm ----------
 
 Drawworm:
-  ld  a,(gameCar)
-  and _datahunt
-  cal nz,HuntingTimeScore
-
   ld  c,(ix+pos)
   ld  b,(ix+pos+1)
 
-  ld  a,(gameCar)
-  and _datalaps
-  cal nz,checkhitlapline
+  ld  a,(Gametype)
+  cp  gamerace
+  cal z,checkhitlapline
 
   ld  l,(ix+head)
   ld  h,(ix+head+1)
@@ -1647,7 +1841,7 @@ Drawworm:
   inc hl
   ld  (hl),b
   inc hl
-  res resbit,h
+  cal resbit
   ld  (ix+head),l
   ld  (ix+head+1),h
 
@@ -1666,7 +1860,7 @@ removetail:
   inc hl
   ld  b,(hl)
   inc hl
-  res resbit,h
+  cal resbit
   ld  (ix+tail),l
   ld  (ix+tail+1),h
 
@@ -1689,13 +1883,8 @@ ResPixel:
 ;-----------------------------
 
 handlethoseneatlittleballs:
-  ld  a,0
-nrballs =$-1
-  or  a
-  ret z
-
   ld  hl,balls
-  ld  b,a
+  ld  b,a ;a=(nrballs)
 handleballs
   psh bc
   psh hl
@@ -1788,6 +1977,22 @@ checkballhit:
 ;----------- procs -----------
 ;-----------------------------
 
+releasekeys:
+  halt
+  ld  a,%10000000    ;all key-masks
+  out (1),a
+  in  a,(1)
+  inc a              ;cp %11111111 (no keys pressed)
+  jr  nz,releasekeys ;keep waitin
+  cal GET_KEY        ;clear buffer
+  ret
+
+resbit:
+  ld  a,h
+  and (ix+storepos)
+  ld  h,a
+  ret
+
 randompos:
   ld  b,a
 Random: ;(2..b+2)
@@ -1839,8 +2044,7 @@ DrawPea: ;hl=(PeaY)
   ld  c,l
   ld  de,peasprite
 spritepos =$-2
-  cal PutSprite ;||-ed
-  ret
+  jp  PutSprite ;||-ed
 
 ;----------- score -----------
 
@@ -1854,14 +2058,6 @@ divideagain: ;3x
   pop hl
   ret
 
-HuntingTimeScore:
-  .db $dd,$7d ;ld a,lx
-  cp  worm2&255
-  ret z ;=worm#2
-  dec (ix+reserv)
-  ret nz
-  ld  hl,10
-
 IncScore:
   ld  h,(ix+score+1)
   ld  l,(ix+score)
@@ -2045,10 +2241,10 @@ NotMaxYScroll:
   jr  nc,NotMinXScroll
   xor a
 NotMinXScroll:
-  cp 128
+  cp  128
 FieldWidth = $-1
-  jr c,NotMaxXScroll
-  ld a,(FieldWidth)
+  jr  c,NotMaxXScroll
+  ld  a,(FieldWidth)
 NotMaxXScroll:
   psh af                        ; >> 3
   and %11111000
@@ -2066,7 +2262,7 @@ NotMaxXScroll:
   inc c
 CopyScreen:
   add hl,bc
-  ld b,57
+  ld  b,57
 CopyScreenLoop:
   psh bc                        ; >> 4
   ld  bc,16
@@ -2121,10 +2317,12 @@ Bit7:
 AfterShiftDelay:
   halt
 AfterShift:
+#ifdef buffer
   ld  hl,DispBuffer
   ld  de,$fc00+$70
   ld  bc,1024-$70
   ldir
+#endif
   pop de                         ; << 1
   pop bc                         ; << 0k
   ret
@@ -2464,6 +2662,13 @@ boxloop:
 
 TIMEOUT = $1000
 
+LinkBreak:
+  pop hl
+  ld  a,D0HD1H
+  out (7),a
+  jp  Exit
+
+
 receive:
   cal GET_KEY
   cp  K_EXIT
@@ -2472,13 +2677,17 @@ receive:
   and %11
   cp  %11
   jr  z,receive
-  cal Qreceive
+  in  a,(7)
+  and %11
+  cp  %11
+  jr  z,receive
+  ld  b,8
+  cal ReceiveCont
   jr  c,receive
   ret
 
 Qreceive:
   ld  b,8
-  jr  ReceiveCont
 receiveloop:
   ld  de,TIMEOUT
 WaitRecBit:
@@ -2487,16 +2696,16 @@ WaitRecBit:
   cp  %11
   jr  z,WaitRecBit
 ReceiveCont:
-  sub 2
-  ld  a,2
+  sub %10
+  ld  a,%10
   ld  d,D0LD1H
   jr  c,ReceiveLow
   rra
   ld  d,D0HD1L
 ReceiveLow:
-  rr c
-  ld (AckBit),a
-  ld a,d
+  rr  c
+  ld  (AckBit),a
+  ld  a,d
   out (7),a
   ld  de,TIMEOUT
 WaitAckRec:
@@ -2515,13 +2724,15 @@ WaitReadyRec:
   jr  nz,WaitReadyRec
 ReadyRec:
   dnz receiveloop
-  jr  LinkSuccess
+  ld  a,c
+  ret
 
 send:
-  ld  b,9
   ld  c,a
+  ld  b,8+1
   jr  SendAcked
-SendBits:
+
+sendloop:
   rr  c
   ld  a,D0LD1H
   jr  nc,SendLow
@@ -2540,19 +2751,13 @@ WaitReadySend:
   cal CheckLink
   cp  %11
   jr  nz,WaitReadySend
-  dnz SendBits
+  dnz sendloop
 LinkSuccess:
-  ld  a,c ;pop a
-  ret
-
+ .db  $F6 ;or NN (skip scf)
 LinkFailed:
   scf
-  ld a,c
+  ld  a,c
   ret
-LinkBreak:
-  ld  a,D0HD1H
-  out (7),a
-  jp  Exit
 
 CheckLink:
   pop hl
@@ -2563,19 +2768,19 @@ CheckLink:
 
   ld  a,$BF
   out (1),a
-  nop \ nop
+; nop \ nop
   in  a,(1)
   psh af
   ld  a,%11111111
   out (1),a
   pop af
   bit 6,a
+  jr  z,LinkFailed
 
   in  a,(7)
   and %11
   jp  (hl)
 
-
 ;-----------------------------
 ;---------- levels -----------
 ;-----------------------------
@@ -2599,20 +2804,37 @@ LevelDefM:
 ;---------- data -------------
 ;-----------------------------
 
-txtWelcome: .db "Welcome to Worm!! ",
-            .db "by Shiar",0
+wtPicture:
+.db %00011110,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000
+.db %00111110,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000
+.db %01110000,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000,%00000000
+.db %01100000,%01111100,%00000001,%11111111,%00000000,%11110000,%01111001,%11100000
+.db %11100000,%11111110,%00000011,%11111111,%10000011,%11111000,%11111111,%11110000
+.db %11000001,%11000111,%00000111,%00000001,%11000111,%10011001,%11001111,%00111000
+.db %11000001,%10000011,%00000110,%00000000,%11100110,%00000001,%10011111,%10011000
+.db %11000001,%10000011,%00000110,%11000000,%01101110,%00000011,%10111001,%11011100
+.db %11000001,%11000111,%00000110,%11000000,%01101100,%00000011,%00110000,%11001100
+.db %11000000,%11000110,%00000110,%11000000,%01101100,%00000011,%00110000,%11001100
+.db %11100000,%11101110,%00001110,%11000000,%01101100,%00000011,%00111001,%11001100
+.db %01100000,%01111100,%00001100,%11000000,%01101100,%00000011,%00011111,%10001100
+.db %01110000,%00111000,%00011100,%11100000,%11101110,%00000011,%00001111,%00001100
+.db %00111000,%11111110,%00111000,%01110001,%11000110,%00000011,%10000000,%00011100
+.db %00011111,%11101111,%11110000,%00111111,%10000111,%00000001,%10000000,%00011000
+.db %00001111,%10000011,%11100000,%00011111,%00000011,%00000001,%10000000,%00011000
+
+txtMenu:    .db "by Shiar",0
             .db "Have fun!",0 ;4th menu item
-            .db "Level 00",0 ;3rd
-            .db "Worms: 0",0 ;2nd
+            .db "Level ",$CF,"??",5,0 ;3rd
+            .db "Worms ",$CF,"?",5,0  ;2nd
 txtGame:    .db "Singleplayer",0  ;0 (1st)
-txtGame2:   .db "Peaworm     ",0  ;1
+txtGame2:   .db "Peaworm     ",0  ;1 (next 1st)
             .db "Deathmatch",0    ;2
             .db "Foodmatch ",0    ;3
-            .db "LinkMatch",0     ;4 (>options)
-            .db "Hunting  ",0     ;5
-            .db "Race   ",0       ;6
-            .db "CTF ",0          ;7
-            .db "Domination",0    ;(>=8)
+            .db "LinkMatch",0     ;4
+            .db "Race     ",0     ;5
+            .db "CTF ",0          ;6
+            .db "Domination",0    ;7
+txtLevsel:  .db $CF," Select levels: ",5,0
 txtName:    .db "Enter name player ",0
 txtWaiting: .db "Waiting...",0
 txtReceive: .db "Receiving..." ;,0
@@ -2640,25 +2862,34 @@ txtGO:     .db "----- GAME OVER -----",0
 
 gamesdata:
 
-_datalink  = %00000001
-_datalivel = %00000010 ;ix+lives=0 limit
+_datalink  = %00000001 ;linkplay
+_datalivel = %00000010 ;lives=0 limit
 _datafoodl = %00000100 ;left=0 limit
 _datanextl = %00001000 ;next level if left=0
 _datasingl = %00001000 ;singleplayer=1
 _datafood  = %00010000 ;food present
-_datahunt  = %00100000
-_datalaps  = %01000000 ;give lap score
+_________  = %00100000 ;
+_datadie   = %01000000 ;worm dies on impact
 _datascore = %10000000 ;score>=100 limit
+_datamultpeas = %00100000
+
+gamesingle   =  0
+datasingle: .db %01011110
+gamepeas     =  1
+datapeas:   .db %01011010
+gamedeathm   =  2
+datadeathm: .db %01000010
+gamefoodm    =  3
+datafoodm:  .db %11010000
+gamelinkm    =  4
+datalinkm:  .db %01000011
+gamerace     =  5
+datarace:   .db %10000000
+gamectf      =  6
+datactf:    .db %11100000
+gamedomin    =  7
+datadomin:  .db %01000000 ;==(8 modes)
 
-datasingle: .db %00011110
-datapeas:   .db %00011010
-datadeathm: .db %00000010
-datafoodm:  .db %10010000
-datalinkm:  .db %00000011
-datahuntin: .db %10100000
-datarace:   .db %11000000
-datactf:    .db %00000000 ;==(8 modes)
-;datadomin:  .db %00000000
 datalevels: .dw LevelDef, LevelDef
             .dw LevelDefM,LevelDefM
             .dw LevelDefM,LevelDefM
@@ -2666,19 +2897,18 @@ datalevels: .dw LevelDef, LevelDef
 nrlevels:   .db 2,2,2,2,2,2,2,2
 
 worm1set:  .dw worm1p,worm1p
-           .db 3,0,%01111110,%10,%100 ;< >
+           .db %11110111,3,%00,%01111110,%10,%100 ;< >
 worm1name: .db "worm #01",0
 worm2set:  .dw worm2p,worm2p
-           .db 3,0,%00111111,%10000,%1000 ;f1 f2
+           .db %11111011,3,%11,%00111111,%10000,%1000 ;f1 f2
 worm2name: .db "worm #02",0
 worm3set:  .dw worm3p,worm3p
-           .db 3,0,%01011111,%10,%100 ;sto ,
+           .db %11111011,3,0,%01011111,%10,%100 ;sto ,
 worm3name: .db "worm #03",0
 worm4set:  .dw worm4p,worm4p
-           .db 3,0,%01111101,%10,%1 ;enter +
+           .db %11111011,3,0,%01111101,%10,%1 ;enter +
 worm4name: .db "worm #04",0
 
-hipeaworm: .dw 0
 end:
 
 defsprsize   = 4
@@ -2696,21 +2926,23 @@ grow     = 6   ;level
 died     = 8   ;game
 score    = 9   ;game
 delay    = 11  ;game
-
-head     = 12  ;level
-tail     = 14  ;level
-lives    = 16  ;game
-reserv   = 17  ;loop
+               ;19B @game
+head     = 12  ;4B (head=tail)
+tail     = 14  ;also@next level
+storepos = 16
+lives    = 17
+reserv   = 18  ;loop
  ;race:lap
- ;hunt:time
-input    = 18  ;&
-left     = 19  ;&
-right    = 20  ;&
-name     = 21  ;game
-wormsize = 30
-
-respawndelay  = 80
-maxnamelength = 9
+ ;ctf:pea
+input    = 19
+left     = 20
+right    = 21
+name     = 22
+wormsize = 31
+
+startdelay    = 30
+respawndelay  = 30
+maxnamelength = 8+1
 
 ;-----------------------------
 ;----------- end -------------