From: sparky4 <sparky4@cock.li>
Date: Thu, 15 Oct 2015 18:23:09 +0000 (-0500)
Subject: converting...
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=60d62fcab6d8310dc1ab11b40906e9a59e4c9c6a;p=16.git

converting...
---

diff --git a/16.exe b/16.exe
index 89e526cf..0939614d 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/16.map b/16.map
index 53f038f1..94917507 100755
--- a/16.map
+++ b/16.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: 16.exe
 creating a DOS executable
 
@@ -664,4 +664,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00022a40 (141888.)
 Entry point address: 08e3:0072
-Link time: 00:00.02
+Link time: 00:00.64
diff --git a/bakapi.exe b/bakapi.exe
index a6e722e2..7d201c9a 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/bakapi.map b/bakapi.map
index 33c61a46..37edcfd6 100755
--- a/bakapi.map
+++ b/bakapi.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: bakapi.exe
 creating a DOS executable
 
@@ -13,7 +13,7 @@ creating a DOS executable
 Group                           Address              Size
 =====                           =======              ====
 
-DGROUP                          1405:0000            0000f070
+DGROUP                          1422:0000            0000f070
 
 
 
@@ -36,26 +36,26 @@ timer_TEXT             CODE           AUTO           0000:7a20       00000235
 _TEXT                  CODE           AUTO           07c6:0000       0000907d
 modex16_TEXT           CODE           AUTO           07c6:9080       00002550
 16text_TEXT            CODE           AUTO           07c6:b5d0       0000010d
-bakapee_TEXT           CODE           AUTO           07c6:b6e0       00000b60
-16_in13_DATA           FAR_DATA       AUTO           13ea:0000       000001a4
-FAR_DATA               FAR_DATA       AUTO           1404:0004       00000000
-_NULL                  BEGDATA        DGROUP         1405:0000       00000020
-_AFTERNULL             BEGDATA        DGROUP         1407:0000       00000002
-CONST                  DATA           DGROUP         1407:0002       00000076
-CONST2                 DATA           DGROUP         140e:0008       0000010a
-_DATA                  DATA           DGROUP         1420:0000       00000599
-XIB                    DATA           DGROUP         1479:000a       00000000
-XI                     DATA           DGROUP         1479:000a       00000036
-XIE                    DATA           DGROUP         147d:0000       00000000
-YIB                    DATA           DGROUP         147d:0000       00000000
-YI                     DATA           DGROUP         147d:0000       00000018
-YIE                    DATA           DGROUP         147e:0008       00000000
-STRINGS                DATA           DGROUP         147e:0008       00000000
-DATA                   DATA           DGROUP         147e:0008       00000000
-_emu_init_start        EMU            DGROUP         147e:0008       00000000
-_emu_init_end          EMU            DGROUP         147e:0008       00000000
-_BSS                   BSS            DGROUP         147f:0000       00000e02
-STACK                  STACK          DGROUP         1560:0000       0000dac0
+bakapee_TEXT           CODE           AUTO           07c6:b6e0       00000d2b
+16_in13_DATA           FAR_DATA       AUTO           1407:0000       000001a4
+FAR_DATA               FAR_DATA       AUTO           1421:0004       00000000
+_NULL                  BEGDATA        DGROUP         1422:0000       00000020
+_AFTERNULL             BEGDATA        DGROUP         1424:0000       00000002
+CONST                  DATA           DGROUP         1424:0002       00000076
+CONST2                 DATA           DGROUP         142b:0008       0000010a
+_DATA                  DATA           DGROUP         143d:0000       00000599
+XIB                    DATA           DGROUP         1496:000a       00000000
+XI                     DATA           DGROUP         1496:000a       00000036
+XIE                    DATA           DGROUP         149a:0000       00000000
+YIB                    DATA           DGROUP         149a:0000       00000000
+YI                     DATA           DGROUP         149a:0000       00000018
+YIE                    DATA           DGROUP         149b:0008       00000000
+STRINGS                DATA           DGROUP         149b:0008       00000000
+DATA                   DATA           DGROUP         149b:0008       00000000
+_emu_init_start        EMU            DGROUP         149b:0008       00000000
+_emu_init_end          EMU            DGROUP         149b:0008       00000000
+_BSS                   BSS            DGROUP         149c:0000       00000e02
+STACK                  STACK          DGROUP         157d:0000       0000dac0
 
 
                         +----------------+
@@ -71,7 +71,7 @@ Address        Symbol
 Module: bakapi.o(/dos/z/16/src/bakapi.c)
 0000:00de      main_
 Module: 16_in.o(/dos/z/16/src/lib/16_in.c)
-1405:07be+     _inpu
+1422:07be+     _inpu
 0000:03c0+     INL_KeyService_
 0000:065a+     Mouse_
 0000:06b2+     IN_GetJoyAbs_
@@ -119,9 +119,9 @@ Module: 16_mm.o(/dos/z/16/src/lib/16_mm.c)
 0000:498c+     MM_TotalFree_
 0000:4a22*     MM_Report_
 0000:53da*     MM_BombOnError_
-1405:0920+     _beforesort
-1405:0924+     _aftersort
-1405:0928+     _XMSaddr
+1422:0920+     _beforesort
+1422:0924+     _aftersort
+1422:0928+     _XMSaddr
 Module: wcpu.o(/dos/z/16/src/lib/wcpu/wcpu.c)
 0000:5410      detectcpu_
 Module: 16_head.o(/dos/z/16/src/lib/16_head.c)
@@ -139,9 +139,9 @@ Module: 16_ca.o(/dos/z/16/src/lib/16_ca.c)
 0000:5b50*     CAL_OptimizeNodes_
 0000:5c00*     CA_Startup_
 0000:5c50*     CA_Shutdown_
-1405:0930*     _finishcachebox
-1405:0934*     _updatecachebox
-1405:0938*     _drawcachebox
+1422:0930*     _finishcachebox
+1422:0934*     _updatecachebox
+1422:0938*     _drawcachebox
 Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:5cbc      KITTENGETS
 0000:5d1c*     kittenopen_
@@ -152,7 +152,7 @@ Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:6274+     get_line_
 0000:62e6+     db_fetch_
 0000:637c+     db_insert_
-1405:04a4+     __kitten_catalog
+1422:04a4+     __kitten_catalog
 Module: 16_hc.o(/dos/z/16/src/lib/16_hc.c)
 0000:663c+     LargestFreeBlock_
 0000:66ca+     _coreleft_
@@ -226,22 +226,22 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c)
 07c6:b4da*     pdump_
 07c6:b53a      cls_
 07c6:b5a8+     modexWaitBorder_
-1405:04d4      _VGA
+1422:04d4      _VGA
 Module: gfx.lib(/dos/z/16/src/lib/16text.c)
 07c6:b646      textInit_
-1405:1244      _romFonts
+1422:1244      _romFonts
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(kbhit.c)
 07c6:00c6      kbhit_
 Module: gfx.lib(/dos/z/16/src/lib/bakapee.c)
 07c6:b724+     colortest_
 07c6:b778+     colorz_
 07c6:b7de+     ssd_
-07c6:b8fc+     dingpp_
-07c6:b96e+     dingo_
-07c6:ba04+     dingas_
-07c6:bab2+     dingu_
-07c6:bb14+     dingq_
-07c6:bbb4      ding_
+07c6:b95e+     dingpp_
+07c6:b9d0+     dingo_
+07c6:badc+     dingas_
+07c6:bb8a+     dingu_
+07c6:bbec+     dingq_
+07c6:bc8c      ding_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(getch.c)
 07c6:00dd      getch_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(printf.c)
@@ -250,10 +250,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(scanf.c)
 07c6:01d6+     vscanf_
 07c6:0204      scanf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart)
-1405:0000*     __nullarea
-1405:04f4*     __ovlflag
-1405:04f5*     __intno
-1405:04f6*     __ovlvec
+1422:0000*     __nullarea
+1422:04f4*     __ovlflag
+1422:04f5*     __intno
+1422:04f6*     __ovlvec
 07c6:022c      _cstart_
 07c6:02ff*     _Not_Enough_Memory_
 07c6:0431      __exit_
@@ -263,10 +263,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm)
 07c6:04b8      _big_code_
 07c6:04b8*     CodeModelMismatch
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(argcv.c)
-1405:125c      __argv
-1405:1260      ___argv
-1405:1264      __argc
-1405:1266      ___argc
+1422:125c      __argv
+1422:1260      ___argv
+1422:1264      __argc
+1422:1266      ___argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(intx086.c)
 07c6:04b8+     int86x_
 07c6:063b      int86_
@@ -288,28 +288,28 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c)
 07c6:07e4      _memavl_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c)
 07c6:0829      _nmalloc_
-1405:04fa      ___nheapbeg
-1405:04fc      ___MiniHeapRover
-1405:04fe      ___LargestSizeB4MiniHeapRover
+1422:04fa      ___nheapbeg
+1422:04fc      ___MiniHeapRover
+1422:04fe      ___LargestSizeB4MiniHeapRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c)
 07c6:0903      _fmalloc_
 07c6:0903      malloc_
-1405:0500      ___fheap
-1405:0502      ___fheapRover
-1405:0504      ___LargestSizeB4Rover
+1422:0500      ___fheap
+1422:0502      ___fheapRover
+1422:0504      ___LargestSizeB4Rover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c)
 07c6:0a78      _ffree_
 07c6:0a78      free_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c)
 07c6:0ae5      _nfree_
-1405:1268+     ___MiniHeapFreeRover
+1422:1268+     ___MiniHeapFreeRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c)
 07c6:0be0+     _null_exit_rtn_
 07c6:0be0+     __null_int23_exit_
 07c6:0be1      exit_
 07c6:0c02+     _exit_
-1405:0506+     ___int23_exit
-1405:050a      ___FPE_handler_exit
+1422:0506+     ___int23_exit
+1422:050a      ___FPE_handler_exit
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ptc.asm)
 07c6:0c1e      __PTC
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c)
@@ -328,7 +328,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c)
 07c6:15c5      __doclose_
 07c6:170f      __shutdown_stream_
 07c6:1729      fclose_
-1405:126a+     ___RmTmpFileFn
+1422:126a+     ___RmTmpFileFn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(clockdos.c)
 07c6:1794+     __ibm_bios_get_ticks_
 07c6:180b      clock_
@@ -337,7 +337,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ftell.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fseek.c)
 07c6:1a18      fseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(istable.c)
-1405:0098      __IsTable
+1422:0098      __IsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c)
 07c6:1c10      tolower_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(unlnk.c)
@@ -372,31 +372,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c)
 07c6:240b      stackavail_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm)
-1405:0516      __8087
-1405:0517      __real87
-1405:0518      __dos87emucall
-1405:051a      __dos87real
+1422:0516      __8087
+1422:0517      __real87
+1422:0518      __dos87emucall
+1422:051a      __dos87real
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c)
 07c6:241a*     __exit_with_msg_
 07c6:241f      __fatal_runtime_error_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata)
-1405:051c      __curbrk
-1405:0524      __STACKLOW
-1405:0526      __STACKTOP
-1405:0528      __cbyte
-1405:052a      __child
-1405:052c      __no87
-1405:0539      ___FPE_handler
-1405:051e      __psp
-1405:052d      __get_ovl_stack
-1405:0531      __restore_ovl_stack
-1405:0535      __close_ovl_file
-1405:053d      __LpCmdLine
-1405:0541      __LpPgmName
-1405:0520      __osmajor
-1405:0521      __osminor
-1405:0522      __osmode
-1405:0523      __HShift
+1422:051c      __curbrk
+1422:0524      __STACKLOW
+1422:0526      __STACKTOP
+1422:0528      __cbyte
+1422:052a      __child
+1422:052c      __no87
+1422:0539      ___FPE_handler
+1422:051e      __psp
+1422:052d      __get_ovl_stack
+1422:0531      __restore_ovl_stack
+1422:0535      __close_ovl_file
+1422:053d      __LpCmdLine
+1422:0541      __LpPgmName
+1422:0520      __osmajor
+1422:0521      __osminor
+1422:0522      __osmode
+1422:0523      __HShift
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c)
 07c6:243e+     __fill_buffer_
 07c6:268d      fgetc_
@@ -405,9 +405,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fwrite.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(delay.c)
 07c6:2b4d      delay_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c)
-1405:0546      ___iob
-1405:1272      ___ClosedStreams
-1405:1276      ___OpenStreams
+1422:0546      ___iob
+1422:1272      ___ClosedStreams
+1422:1276      ___OpenStreams
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprtf.c)
 07c6:2cc6      __fprtf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ungetc.c)
@@ -422,7 +422,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c)
 07c6:43d5      __FiniRtns
 07c6:43d5*     __FFiniRtns
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c)
-1405:06ae      ___uselfn
+1422:06ae      ___uselfn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg)
 07c6:443a      __DOSseg__
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c)
@@ -448,7 +448,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(allocseg.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmemneed.c)
 07c6:4f1c      __fmemneed_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(alphabet.c)
-1405:0022      ___Alphabet
+1422:0022      ___Alphabet
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(__lseek.c)
 07c6:4f1f      __lseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
@@ -458,18 +458,18 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
 07c6:4fcd*     __set_errno_dos_reterr_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c)
 07c6:4fd8*     __get_errno_ptr_
-1405:127e      _errno
+1422:127e      _errno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c)
 07c6:4fdf      __GetIOMode_
 07c6:5014      __SetIOMode_nogrow_
-1405:06c4      ___NFiles
-1405:06c6      ___init_mode
-1405:06ee      ___io_mode
+1422:06c4      ___NFiles
+1422:06c6      ___init_mode
+1422:06ee      ___io_mode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c)
 07c6:5049*     __set_commode_
-1405:06f2      __commode
+1422:06f2      __commode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c)
-1405:06f4      __fmode
+1422:06f4      __fmode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c)
 07c6:5055      __chktty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c)
@@ -496,9 +496,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c)
 07c6:565c      isatty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c)
 07c6:5678*     __get_doserrno_ptr_
-1405:1280      __doserrno
+1422:1280      __doserrno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c)
-1405:06f6      ___umaskval
+1422:06f6      ___umaskval
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c)
 07c6:567f      _dos_creat_
 07c6:56a3*     _dos_creatnew_
@@ -509,9 +509,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stiomode.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(vsprintf.c)
 07c6:58ac      vsprintf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(environ.c)
-1405:1284      ___env_mask
-1405:1288      _environ
-1405:128c*     __wenviron
+1422:1284      ___env_mask
+1422:1288      _environ
+1422:128c*     __wenviron
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbterm.c)
 07c6:58ee      _mbterm_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbsnextc.c)
@@ -532,7 +532,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c)
 07c6:5e44      __chk8087_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c)
 07c6:5eb4      __EnterWVIDEO_
-1405:0716+     ___WD_Present
+1422:0716+     ___WD_Present
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flushall.c)
 07c6:5ed8      __flushall_
 07c6:5f6c      flushall_
@@ -554,41 +554,41 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ioexit.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c)
 07c6:65b4      __prtf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c)
-1405:0718      ___IsDBCS
+1422:0718      ___IsDBCS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c)
 07c6:7716*     _ismbblead_
-1405:1290      ___MBCSIsTable
+1422:1290      ___MBCSIsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbtowc.c)
 07c6:7732      mbtowc_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bits.c)
-1405:019a      __Bits
+1422:019a      __Bits
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fdfs086.asm)
 07c6:7850      __FDFS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c)
-1405:071a      ___EFG_printf
-1405:071e      ___EFG_scanf
+1422:071a      ___EFG_printf
+1422:071e      ___EFG_scanf
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i8m086.asm)
 07c6:78c7*     __I8M
 07c6:78c7      __U8M
 07c6:78ac*     __I8ME
 07c6:78ac*     __U8ME
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c)
-1405:1392      ____Argv
-1405:1396      ____Argc
+1422:1392      ____Argv
+1422:1396      ____Argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c)
-1405:0722      __amblksiz
+1422:0722      __amblksiz
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086)
-1405:074a      __Start_XI
-1405:0780      __End_XI
-1405:0780      __Start_YI
-1405:0798      __End_YI
+1422:074a      __Start_XI
+1422:0780      __End_XI
+1422:0780      __Start_YI
+1422:0798      __End_YI
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c)
-1405:1398      ___historical_splitparms
+1422:1398      ___historical_splitparms
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dointr)
 07c6:7a12      _DoINTR_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c)
 07c6:7d8b*     _heapenable_
-1405:0724      ___heap_enabled
+1422:0724      ___heap_enabled
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sbrk.c)
 07c6:7d9c*     sbrk_
 07c6:7dac      __brk_
@@ -602,16 +602,16 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c)
 07c6:809f      __freeenvp_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c)
 07c6:813b      __mbinit_
-1405:0726      ___MBCodePage
+1422:0726      ___MBCodePage
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c)
 07c6:8216      _mbdtoupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c)
 07c6:8224      toupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c)
-1405:0728      __8087cw
+1422:0728      __8087cw
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c)
-1405:072a      ___Save8087
-1405:072e      ___Rest8087
+1422:072a      ___Save8087
+1422:072e      ___Rest8087
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c)
 07c6:8233      __GrabFP87_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm)
@@ -650,7 +650,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c)
 07c6:9019      _bexpand_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
-1405:0748      ___FPE_int
+1422:0748      ___FPE_int
 
 
                         +--------------------+
@@ -666,6 +666,6 @@ gfx.lib
                         +-----------------------+
 
 Stack size:  dac0 (56000.)
-Memory size:  000230c0 (143552.)
+Memory size:  00023290 (144016.)
 Entry point address: 07c6:022c
-Link time: 00:00.39
+Link time: 00:00.31
diff --git a/exmmtest.map b/exmmtest.map
index 787d90cf..53ff1d55 100755
--- a/exmmtest.map
+++ b/exmmtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: exmmtest.exe
 creating a DOS executable
 
@@ -577,4 +577,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d520 (120096.)
 Entry point address: 0000:8024
-Link time: 00:00.21
+Link time: 00:00.91
diff --git a/fmemtest.map b/fmemtest.map
index 76ebf4ba..4fb6d6de 100755
--- a/fmemtest.map
+++ b/fmemtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: fmemtest.exe
 creating a DOS executable
 
@@ -576,4 +576,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d3e0 (119776.)
 Entry point address: 0000:7e06
-Link time: 00:00.12
+Link time: 00:00.18
diff --git a/fontgfx.map b/fontgfx.map
index 00967d83..f89fe82c 100755
--- a/fontgfx.map
+++ b/fontgfx.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: fontgfx.exe
 creating a DOS executable
 
@@ -638,4 +638,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00020eb0 (134832.)
 Entry point address: 0000:7c3a
-Link time: 00:00.32
+Link time: 00:00.33
diff --git a/fonttest.map b/fonttest.map
index eb1f9faf..7244bc07 100755
--- a/fonttest.map
+++ b/fonttest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: fonttest.exe
 creating a DOS executable
 
@@ -588,4 +588,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001d960 (121184.)
 Entry point address: 0000:7d82
-Link time: 00:00.16
+Link time: 00:00.44
diff --git a/inputest.map b/inputest.map
index b82ddb38..1e0f7cbb 100755
--- a/inputest.map
+++ b/inputest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: inputest.exe
 creating a DOS executable
 
@@ -572,4 +572,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d1b0 (119216.)
 Entry point address: 0000:7ad2
-Link time: 00:00.61
+Link time: 00:00.65
diff --git a/maptest.map b/maptest.map
index 6b5a3d55..2be76dbd 100755
--- a/maptest.map
+++ b/maptest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: maptest.exe
 creating a DOS executable
 
@@ -658,4 +658,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00022870 (141424.)
 Entry point address: 08da:0072
-Link time: 00:00.82
+Link time: 00:00.48
diff --git a/palettec.map b/palettec.map
index 0dcffdc4..658a8b4e 100755
--- a/palettec.map
+++ b/palettec.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: palettec.exe
 creating a DOS executable
 
@@ -636,4 +636,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00020970 (133488.)
 Entry point address: 0000:7c86
-Link time: 00:00.32
+Link time: 00:00.59
diff --git a/palettel.map b/palettel.map
index 520d30ab..64305ed9 100755
--- a/palettel.map
+++ b/palettel.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:09
 Executable Image: palettel.exe
 creating a DOS executable
 
@@ -642,4 +642,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00020a40 (133696.)
 Entry point address: 0000:7d30
-Link time: 00:00.65
+Link time: 00:00.61
diff --git a/pcxtest.map b/pcxtest.map
index 1f985aa8..8a270096 100755
--- a/pcxtest.map
+++ b/pcxtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: pcxtest.exe
 creating a DOS executable
 
@@ -507,4 +507,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001a390 (107408.)
 Entry point address: 0000:02d8
-Link time: 00:00.90
+Link time: 00:00.37
diff --git a/pcxtest2.map b/pcxtest2.map
index 8fb365ea..2953c44d 100755
--- a/pcxtest2.map
+++ b/pcxtest2.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: pcxtest2.exe
 creating a DOS executable
 
@@ -507,4 +507,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001a3b0 (107440.)
 Entry point address: 0000:02f8
-Link time: 00:00.02
+Link time: 00:00.20
diff --git a/scroll.exe b/scroll.exe
index 31163064..1ee755bd 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/scroll.map b/scroll.map
index ad30b205..c867b94c 100755
--- a/scroll.map
+++ b/scroll.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: scroll.exe
 creating a DOS executable
 
@@ -13,7 +13,7 @@ creating a DOS executable
 Group                           Address              Size
 =====                           =======              ====
 
-DGROUP                          19e4:0000            0000f880
+DGROUP                          19ef:0000            0000f880
 
 
 
@@ -36,30 +36,30 @@ kitten_TEXT            CODE           AUTO           0000:79b0       0000080a
 16_hc_TEXT             CODE           AUTO           0000:81c0       0000158b
 timer_TEXT             CODE           AUTO           0000:9750       00000235
 _TEXT                  CODE           AUTO           0999:0000       00009db9
-scroll16_TEXT          CODE           AUTO           0999:9dc0       0000364d
-bitmap_TEXT            CODE           AUTO           0999:d410       00000605
-planar_TEXT            CODE           AUTO           0999:da20       00000275
-16text_TEXT            CODE           AUTO           0999:dca0       0000010d
-modex16_TEXT           CODE           AUTO           1774:0000       00002550
-16_in13_DATA           FAR_DATA       AUTO           19c9:0000       000001a4
-FAR_DATA               FAR_DATA       AUTO           19e3:0004       00000000
-_NULL                  BEGDATA        DGROUP         19e4:0000       00000020
-_AFTERNULL             BEGDATA        DGROUP         19e6:0000       00000002
-CONST                  DATA           DGROUP         19e6:0002       00000076
-CONST2                 DATA           DGROUP         19ed:0008       00000132
-_DATA                  DATA           DGROUP         1a01:0000       00000b14
-XIB                    DATA           DGROUP         1ab2:0004       00000000
-XI                     DATA           DGROUP         1ab2:0004       0000003c
-XIE                    DATA           DGROUP         1ab6:0000       00000000
-YIB                    DATA           DGROUP         1ab6:0000       00000000
-YI                     DATA           DGROUP         1ab6:0000       00000018
-YIE                    DATA           DGROUP         1ab7:0008       00000000
-STRINGS                DATA           DGROUP         1ab7:0008       00000000
-DATA                   DATA           DGROUP         1ab7:0008       00000000
-_emu_init_start        EMU            DGROUP         1ab7:0008       00000000
-_emu_init_end          EMU            DGROUP         1ab7:0008       00000000
-_BSS                   BSS            DGROUP         1ab8:0000       00001076
-STACK                  STACK          DGROUP         1bc0:0000       0000dac0
+scroll16_TEXT          CODE           AUTO           0999:9dc0       000036f5
+bitmap_TEXT            CODE           AUTO           0999:d4c0       00000605
+planar_TEXT            CODE           AUTO           0999:dad0       00000275
+16text_TEXT            CODE           AUTO           0999:dd50       0000010d
+modex16_TEXT           CODE           AUTO           177f:0000       00002550
+16_in13_DATA           FAR_DATA       AUTO           19d4:0000       000001a4
+FAR_DATA               FAR_DATA       AUTO           19ee:0004       00000000
+_NULL                  BEGDATA        DGROUP         19ef:0000       00000020
+_AFTERNULL             BEGDATA        DGROUP         19f1:0000       00000002
+CONST                  DATA           DGROUP         19f1:0002       00000076
+CONST2                 DATA           DGROUP         19f8:0008       00000132
+_DATA                  DATA           DGROUP         1a0c:0000       00000b14
+XIB                    DATA           DGROUP         1abd:0004       00000000
+XI                     DATA           DGROUP         1abd:0004       0000003c
+XIE                    DATA           DGROUP         1ac1:0000       00000000
+YIB                    DATA           DGROUP         1ac1:0000       00000000
+YI                     DATA           DGROUP         1ac1:0000       00000018
+YIE                    DATA           DGROUP         1ac2:0008       00000000
+STRINGS                DATA           DGROUP         1ac2:0008       00000000
+DATA                   DATA           DGROUP         1ac2:0008       00000000
+_emu_init_start        EMU            DGROUP         1ac2:0008       00000000
+_emu_init_end          EMU            DGROUP         1ac2:0008       00000000
+_BSS                   BSS            DGROUP         1ac3:0000       00001076
+STACK                  STACK          DGROUP         1bcb:0000       0000dac0
 
 
                         +----------------+
@@ -73,18 +73,18 @@ Address        Symbol
 =======        ======
 
 Module: scroll.o(/dos/z/16/src/scroll.c)
-19e4:0d40+     _mv
-19e4:0d70+     _player
-19e4:0e70+     _spri
-19e4:0e74+     _mask
-19e4:0e78+     _p
-19e4:0e7c*     _t
-19e4:0e80+     _screen
-19e4:0ea4+     _screen3
-19e4:0ec8+     _screen2
-19e4:0eec+     _bg
-19e4:0ef0+     _gvar
-19e4:0f28+     _bakapee
+19ef:0d40+     _mv
+19ef:0d70+     _player
+19ef:0e70+     _spri
+19ef:0e74+     _mask
+19ef:0e78+     _p
+19ef:0e7c*     _t
+19ef:0e80+     _screen
+19ef:0ea4+     _screen3
+19ef:0ec8+     _screen2
+19ef:0eec+     _bg
+19ef:0ef0+     _gvar
+19ef:0f28+     _bakapee
 0000:023a      main_
 Module: mapread.o(/dos/z/16/src/lib/mapread.c)
 0000:0eb8+     jsoneq_
@@ -94,7 +94,7 @@ Module: jsmn.o(/dos/z/16/src/lib/jsmn/jsmn.c)
 0000:1a62      jsmn_parse_
 0000:1f5e      jsmn_init_
 Module: 16_in.o(/dos/z/16/src/lib/16_in.c)
-19e4:0f4e+     _inpu
+19ef:0f4e+     _inpu
 0000:20f0+     INL_KeyService_
 0000:238a+     Mouse_
 0000:23e2+     IN_GetJoyAbs_
@@ -142,9 +142,9 @@ Module: 16_mm.o(/dos/z/16/src/lib/16_mm.c)
 0000:66bc+     MM_TotalFree_
 0000:6752*     MM_Report_
 0000:710a*     MM_BombOnError_
-19e4:10b0+     _beforesort
-19e4:10b4+     _aftersort
-19e4:10b8+     _XMSaddr
+19ef:10b0+     _beforesort
+19ef:10b4+     _aftersort
+19ef:10b8+     _XMSaddr
 Module: wcpu.o(/dos/z/16/src/lib/wcpu/wcpu.c)
 0000:7140      detectcpu_
 Module: 16_head.o(/dos/z/16/src/lib/16_head.c)
@@ -162,9 +162,9 @@ Module: 16_ca.o(/dos/z/16/src/lib/16_ca.c)
 0000:7880*     CAL_OptimizeNodes_
 0000:7930*     CA_Startup_
 0000:7980*     CA_Shutdown_
-19e4:10c0*     _finishcachebox
-19e4:10c4*     _updatecachebox
-19e4:10c8*     _drawcachebox
+19ef:10c0*     _finishcachebox
+19ef:10c4*     _updatecachebox
+19ef:10c8*     _drawcachebox
 Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:79ec      KITTENGETS
 0000:7a4c*     kittenopen_
@@ -175,7 +175,7 @@ Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:7fa4+     get_line_
 0000:8016+     db_fetch_
 0000:80ac+     db_insert_
-19e4:04d4+     __kitten_catalog
+19ef:04d4+     __kitten_catalog
 Module: 16_hc.o(/dos/z/16/src/lib/16_hc.c)
 0000:836c+     LargestFreeBlock_
 0000:83fa+     _coreleft_
@@ -202,100 +202,100 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c)
 0999:0042      _fmalloc_
 0999:0042      malloc_
-19e4:04f6      ___fheap
-19e4:04f8      ___fheapRover
-19e4:04fa      ___LargestSizeB4Rover
+19ef:04f6      ___fheap
+19ef:04f8      ___fheapRover
+19ef:04fa      ___LargestSizeB4Rover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm)
 0999:01bf      __PIA
 0999:01b8*     __PIS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(printf.c)
 0999:01d6      printf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c)
-19e4:04fc      ___iob
-19e4:10d4      ___ClosedStreams
-19e4:10d8      ___OpenStreams
+19ef:04fc      ___iob
+19ef:10d4      ___ClosedStreams
+19ef:10d8      ___OpenStreams
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprintf.c)
 0999:0205      fprintf_
 Module: gfx.lib(/dos/z/16/src/lib/scroll16.c)
 0999:9e0e      walk_
 0999:ba0e+     mapScrollRight_
-0999:bcec+     mapScrollLeft_
-0999:bfa0+     mapScrollUp_
-0999:c28e+     mapScrollDown_
-0999:c5ae      chkmap_
-0999:c73e      mapGoTo_
-0999:c9a6+     mapDrawTile_
-0999:caca+     mapDrawRow_
-0999:cc1e+     mapDrawCol_
-0999:cd88+     mapDrawWRow_
-0999:ceb6*     mapDrawWCol_
-0999:d000      shinku_
-0999:d188+     animatePlayer_
+0999:bd08+     mapScrollLeft_
+0999:bfbc+     mapScrollUp_
+0999:c2aa+     mapScrollDown_
+0999:c5d6      chkmap_
+0999:c766      mapGoTo_
+0999:c9da+     mapDrawTile_
+0999:cafe+     mapDrawRow_
+0999:cc6c+     mapDrawCol_
+0999:cdf4+     mapDrawWRow_
+0999:cf42*     mapDrawWCol_
+0999:d0a8      shinku_
+0999:d230+     animatePlayer_
 Module: gfx.lib(/dos/z/16/src/lib/bitmap.c)
-0999:d74e      bitmapLoadPcx_
-0999:d8aa*     bitmapLoadPcxTiles_
+0999:d7fe      bitmapLoadPcx_
+0999:d95a*     bitmapLoadPcxTiles_
 Module: gfx.lib(/dos/z/16/src/lib/planar.c)
-0999:da20      planar_buf_from_bitmap_
-0999:db40+     planar_buf_alloc_
-0999:dc3a*     planar_buf_free_
+0999:dad0      planar_buf_from_bitmap_
+0999:dbf0+     planar_buf_alloc_
+0999:dcea*     planar_buf_free_
 Module: gfx.lib(/dos/z/16/src/lib/16text.c)
-0999:dd16      textInit_
-19e4:1160      _romFonts
+0999:ddc6      textInit_
+19ef:1160      _romFonts
 Module: gfx.lib(/dos/z/16/src/lib/modex16.c)
-1774:01f4      VGAmodeX_
-1774:0286+     vgaGetMode_
-1774:02bc+     modexEnter_
-1774:046e*     modexLeave_
-1774:0486+     modexsetBaseXMode_
-1774:04d8      modexDefaultPage_
-1774:053a      modexNextPage_
-1774:0606      modexNextPageFlexibleSize_
-1774:06d4      modexShowPage_
-1774:07d0*     modexPanPage_
-1774:0820*     modexSelectPlane_
-1774:0844      modexClearRegion_
-1774:095c*     oldDrawBmp_
-1774:0ac2*     CDrawBmp_
-1774:0c26*     modexDrawBmp_
-1774:0c8c+     modexDrawBmpRegion_
-1774:0df6*     modex_sparky4_DrawBmpRegion_
-1774:0f60*     modexDrawPlanarBuf_
-1774:0f7e*     modexDrawSprite_
-1774:0fe4+     modexDrawSpriteRegion_
-1774:115c      modexCopyPageRegion_
-1774:12c6*     modexFadeOn_
-1774:12f6*     modexFadeOff_
-1774:1324*     modexFlashOn_
-1774:1352*     modexFlashOff_
-1774:1422+     modexPalSave_
-1774:1478      modexNewPal_
-1774:14c8*     modexLoadPalFile_
-1774:15aa*     modexSavePalFile_
-1774:1622*     modexPalBlack_
-1774:164c*     modexPalWhite_
-1774:1676+     modexPalUpdate_
-1774:1be6+     modexPalUpdate1_
-1774:1c60*     modexPalUpdate0_
-1774:1cac+     chkcolor_
-1774:1fc4+     modexputPixel_
-1774:2052*     modexgetPixel_
-1774:20d8*     modexhlin_
-1774:2144      modexprint_
-1774:22de*     modexprintbig_
-1774:245a      pdump_
-1774:24ba*     cls_
-1774:2528      modexWaitBorder_
-19e4:0b54+     _VGA
+177f:01f4      VGAmodeX_
+177f:0286+     vgaGetMode_
+177f:02bc+     modexEnter_
+177f:046e*     modexLeave_
+177f:0486+     modexsetBaseXMode_
+177f:04d8      modexDefaultPage_
+177f:053a      modexNextPage_
+177f:0606      modexNextPageFlexibleSize_
+177f:06d4      modexShowPage_
+177f:07d0*     modexPanPage_
+177f:0820*     modexSelectPlane_
+177f:0844      modexClearRegion_
+177f:095c*     oldDrawBmp_
+177f:0ac2*     CDrawBmp_
+177f:0c26*     modexDrawBmp_
+177f:0c8c+     modexDrawBmpRegion_
+177f:0df6*     modex_sparky4_DrawBmpRegion_
+177f:0f60*     modexDrawPlanarBuf_
+177f:0f7e*     modexDrawSprite_
+177f:0fe4+     modexDrawSpriteRegion_
+177f:115c      modexCopyPageRegion_
+177f:12c6*     modexFadeOn_
+177f:12f6*     modexFadeOff_
+177f:1324*     modexFlashOn_
+177f:1352*     modexFlashOff_
+177f:1422+     modexPalSave_
+177f:1478      modexNewPal_
+177f:14c8*     modexLoadPalFile_
+177f:15aa*     modexSavePalFile_
+177f:1622*     modexPalBlack_
+177f:164c*     modexPalWhite_
+177f:1676+     modexPalUpdate_
+177f:1be6+     modexPalUpdate1_
+177f:1c60*     modexPalUpdate0_
+177f:1cac+     chkcolor_
+177f:1fc4+     modexputPixel_
+177f:2052*     modexgetPixel_
+177f:20d8*     modexhlin_
+177f:2144      modexprint_
+177f:22de*     modexprintbig_
+177f:245a      pdump_
+177f:24ba*     cls_
+177f:2528      modexWaitBorder_
+19ef:0b54+     _VGA
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sound.c)
 0999:0234      sound_
 0999:026f      nosound_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(atoi.c)
 0999:027b      atoi_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart)
-19e4:0000*     __nullarea
-19e4:0b68*     __ovlflag
-19e4:0b69*     __intno
-19e4:0b6a*     __ovlvec
+19ef:0000*     __nullarea
+19ef:0b68*     __ovlflag
+19ef:0b69*     __intno
+19ef:0b6a*     __ovlvec
 0999:0316      _cstart_
 0999:03e9*     _Not_Enough_Memory_
 0999:051b      __exit_
@@ -305,10 +305,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm)
 0999:05a2      _big_code_
 0999:05a2*     CodeModelMismatch
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(argcv.c)
-19e4:1a78      __argv
-19e4:1a7c      ___argv
-19e4:1a80      __argc
-19e4:1a82      ___argc
+19ef:1a78      __argv
+19ef:1a7c      ___argv
+19ef:1a80      __argc
+19ef:1a82      ___argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strncmp.c)
 0999:05a2      strncmp_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strstr.c)
@@ -322,7 +322,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fread.c)
 0999:0bb6      fread_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c)
 0999:0f2d      __get_errno_ptr_
-19e4:1a84      _errno
+19ef:1a84      _errno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(frealloc.c)
 0999:0f34*     _frealloc_
 0999:0f34      realloc_
@@ -351,22 +351,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c)
 0999:13ac      _memavl_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c)
 0999:13f1      _nmalloc_
-19e4:0b6e      ___nheapbeg
-19e4:0b70      ___MiniHeapRover
-19e4:0b72      ___LargestSizeB4MiniHeapRover
+19ef:0b6e      ___nheapbeg
+19ef:0b70      ___MiniHeapRover
+19ef:0b72      ___LargestSizeB4MiniHeapRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c)
 0999:14cb      _ffree_
 0999:14cb      free_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c)
 0999:1538      _nfree_
-19e4:1a86+     ___MiniHeapFreeRover
+19ef:1a86+     ___MiniHeapFreeRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c)
 0999:1633+     _null_exit_rtn_
 0999:1633+     __null_int23_exit_
 0999:1634      exit_
 0999:1655+     _exit_
-19e4:0b74+     ___int23_exit
-19e4:0b78      ___FPE_handler_exit
+19ef:0b74+     ___int23_exit
+19ef:0b78      ___FPE_handler_exit
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c)
 0999:1671      ultoa_
 0999:172f*     ltoa_
@@ -376,7 +376,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c)
 0999:1ae1      __doclose_
 0999:1c2b      __shutdown_stream_
 0999:1c45      fclose_
-19e4:1a88+     ___RmTmpFileFn
+19ef:1a88+     ___RmTmpFileFn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(clockdos.c)
 0999:1cb0+     __ibm_bios_get_ticks_
 0999:1d27      clock_
@@ -387,7 +387,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ftell.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fseek.c)
 0999:1f4b      fseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(istable.c)
-19e4:0098      __IsTable
+19ef:0098      __IsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c)
 0999:2143      tolower_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(unlnk.c)
@@ -422,31 +422,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c)
 0999:293d      stackavail_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm)
-19e4:0b84      __8087
-19e4:0b85      __real87
-19e4:0b86      __dos87emucall
-19e4:0b88      __dos87real
+19ef:0b84      __8087
+19ef:0b85      __real87
+19ef:0b86      __dos87emucall
+19ef:0b88      __dos87real
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c)
 0999:294c*     __exit_with_msg_
 0999:2951      __fatal_runtime_error_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata)
-19e4:0b8a      __curbrk
-19e4:0b92      __STACKLOW
-19e4:0b94      __STACKTOP
-19e4:0b96      __cbyte
-19e4:0b98      __child
-19e4:0b9a      __no87
-19e4:0ba7      ___FPE_handler
-19e4:0b8c      __psp
-19e4:0b9b      __get_ovl_stack
-19e4:0b9f      __restore_ovl_stack
-19e4:0ba3      __close_ovl_file
-19e4:0bab      __LpCmdLine
-19e4:0baf      __LpPgmName
-19e4:0b8e      __osmajor
-19e4:0b8f      __osminor
-19e4:0b90      __osmode
-19e4:0b91      __HShift
+19ef:0b8a      __curbrk
+19ef:0b92      __STACKLOW
+19ef:0b94      __STACKTOP
+19ef:0b96      __cbyte
+19ef:0b98      __child
+19ef:0b9a      __no87
+19ef:0ba7      ___FPE_handler
+19ef:0b8c      __psp
+19ef:0b9b      __get_ovl_stack
+19ef:0b9f      __restore_ovl_stack
+19ef:0ba3      __close_ovl_file
+19ef:0bab      __LpCmdLine
+19ef:0baf      __LpPgmName
+19ef:0b8e      __osmajor
+19ef:0b8f      __osminor
+19ef:0b90      __osmode
+19ef:0b91      __HShift
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mem.c)
 0999:2970      __MemAllocator
 0999:2a3a      __MemFree
@@ -464,7 +464,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ioexit.c)
 0999:31a0*     fcloseall_
 0999:31a7      __full_io_exit_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fltused.c)
-19e4:0bb4      _fltused_
+19ef:0bb4      _fltused_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c)
 0999:31b1      __fill_buffer_
 0999:3400      fgetc_
@@ -481,7 +481,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c)
 0999:39e6      __FiniRtns
 0999:39e6*     __FFiniRtns
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c)
-19e4:0bba      ___uselfn
+19ef:0bba      ___uselfn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg)
 0999:3a4a      __DOSseg__
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c)
@@ -490,9 +490,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c)
 0999:3dde      __Fini_Argv_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c)
 0999:3e08*     __set_commode_
-19e4:0bbc      __commode
+19ef:0bbc      __commode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c)
-19e4:0bbe      __fmode
+19ef:0bbe      __fmode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c)
 0999:3e14      __chktty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c)
@@ -523,7 +523,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grownear.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmemneed.c)
 0999:4afa      __nmemneed_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(alphabet.c)
-19e4:0050      ___Alphabet
+19ef:0050      ___Alphabet
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(__lseek.c)
 0999:4afd      __lseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
@@ -534,9 +534,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c)
 0999:4bb6      __GetIOMode_
 0999:4beb      __SetIOMode_nogrow_
-19e4:0bd4      ___NFiles
-19e4:0bd6      ___init_mode
-19e4:0bfe      ___io_mode
+19ef:0bd4      ___NFiles
+19ef:0bd6      ___init_mode
+19ef:0bfe      ___io_mode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_clse.c)
 0999:4c20      __close_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flush.c)
@@ -556,9 +556,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c)
 0999:4f36      isatty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c)
 0999:4f52*     __get_doserrno_ptr_
-19e4:1a94      __doserrno
+19ef:1a94      __doserrno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c)
-19e4:0c02      ___umaskval
+19ef:0c02      ___umaskval
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c)
 0999:4f59      _dos_creat_
 0999:4f7d*     _dos_creatnew_
@@ -569,9 +569,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stiomode.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(vsprintf.c)
 0999:5186      vsprintf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(environ.c)
-19e4:1a98      ___env_mask
-19e4:1a9c      _environ
-19e4:1aa0*     __wenviron
+19ef:1a98      ___env_mask
+19ef:1a9c      _environ
+19ef:1aa0*     __wenviron
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbterm.c)
 0999:51c8      _mbterm_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbsnextc.c)
@@ -592,12 +592,12 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c)
 0999:571e      __chk8087_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c)
 0999:578e      __EnterWVIDEO_
-19e4:0c22+     ___WD_Present
+19ef:0c22+     ___WD_Present
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c)
 0999:57b2*     _heapenable_
-19e4:0c24      ___heap_enabled
+19ef:0c24      ___heap_enabled
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c)
-19e4:0c26      __amblksiz
+19ef:0c26      __amblksiz
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fputc.c)
 0999:57c3      fputc_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c)
@@ -612,15 +612,15 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(gtche.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(qwrit.c)
 0999:6bcc      __qwrite_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c)
-19e4:1aa4      ____Argv
-19e4:1aa8      ____Argc
+19ef:1aa4      ____Argv
+19ef:1aa8      ____Argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086)
-19e4:0ce4      __Start_XI
-19e4:0d20      __End_XI
-19e4:0d20      __Start_YI
-19e4:0d38      __End_YI
+19ef:0ce4      __Start_XI
+19ef:0d20      __End_XI
+19ef:0d20      __Start_YI
+19ef:0d38      __End_YI
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c)
-19e4:1aaa      ___historical_splitparms
+19ef:1aaa      ___historical_splitparms
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c)
 0999:6c2c      _bfree_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c)
@@ -636,22 +636,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c)
 0999:70be      __setenvp_
 0999:724a      __freeenvp_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c)
-19e4:0c28      ___IsDBCS
+19ef:0c28      ___IsDBCS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c)
 0999:72a8*     _ismbblead_
-19e4:1ab0      ___MBCSIsTable
+19ef:1ab0      ___MBCSIsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c)
 0999:7302      __mbinit_
-19e4:0c2a      ___MBCodePage
+19ef:0c2a      ___MBCodePage
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c)
 0999:73dd      _mbdtoupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c)
 0999:73eb      toupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c)
-19e4:0c2c      __8087cw
+19ef:0c2c      __8087cw
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c)
-19e4:0c2e      ___Save8087
-19e4:0c32      ___Rest8087
+19ef:0c2e      ___Save8087
+19ef:0c32      ___Rest8087
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c)
 0999:73fa      __GrabFP87_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm)
@@ -665,8 +665,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c)
 0999:75c5      strupr_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c)
-19e4:0c36      ___EFG_printf
-19e4:0c3a      ___EFG_scanf
+19ef:0c36      ___EFG_printf
+19ef:0c3a      ___EFG_scanf
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c)
 0999:760d      ulltoa_
 0999:774a*     lltoa_
@@ -705,7 +705,7 @@ Module: /dos/fdos/watcom2/lib286/math87h.lib(strtod.c)
 0999:9844+     __Strtold_
 0999:9a83      strtod_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
-19e4:0ce2      ___FPE_int
+19ef:0ce2      ___FPE_int
 Module: /dos/fdos/watcom2/lib286/math87h.lib(ldclass.c)
 0999:9c30      __LDClass_
 0999:9cb6*     _FLClass_
@@ -716,14 +716,14 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(seterrno.c)
 0999:9d9e      __set_ERANGE_
 0999:9daa*     __set_EINVAL_
 Module: /dos/fdos/watcom2/lib286/math87h.lib(inf_nan.c)
-19e4:019a*     ___f_infinity
-19e4:019e*     ___f_posqnan
-19e4:01a2      ___d_infinity
-19e4:01aa      ___d_posqnan
-19e4:01b2*     ___ld_infinity
-19e4:01ba*     ___ld_posqnan
+19ef:019a*     ___f_infinity
+19ef:019e*     ___f_posqnan
+19ef:01a2      ___d_infinity
+19ef:01aa      ___d_posqnan
+19ef:01b2*     ___ld_infinity
+19ef:01ba*     ___ld_posqnan
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(hugeval.c)
-19e4:01c2      __HugeValue
+19ef:01c2      __HugeValue
 
 
                         +--------------------+
@@ -741,6 +741,6 @@ gfx.lib
                         +-----------------------+
 
 Stack size:  dac0 (56000.)
-Memory size:  000296c0 (169664.)
+Memory size:  00029770 (169840.)
 Entry point address: 0999:0316
-Link time: 00:00.40
+Link time: 00:00.95
diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 90e581c0..9b500b91 100755
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -4,7 +4,7 @@
  * This file is part of Project 16.
  *
  * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as publiSCREEN_HEIGHTed by
+ * it under the terms of the GNU General Public License as publipage->shed by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You SCREEN_HEIGHTould have received a copy of the GNU General Public License
+ * You page->should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
  * write to the Free Software Foundation, Inc., 51 Franklin Street,
  * Fifth Floor, Boston, MA 02110-1301 USA.
@@ -45,20 +45,20 @@ void colorz(page_t *page, bakapee_t *pee)
 //slow spectrum down
 void ssd(page_t *page, bakapee_t *pee, word svq)
 {
-	if(pee->sy < SCREEN_HEIGHT+1)
+	if(pee->sy < page->sh+1)
 	{
-		if(pee->sx < SCREEN_WIDTH+1)
+		if(pee->sx < page->sw+1)
 		{
 			//mxPutPixel(sx, sy, coor);
 			//printf("%d %d %d %d\n", pee->sx, pee->sy, svq, pee->coor);
 			dingpp(page, pee);
 			pee->sx++;
 		}else pee->sx = 0;
-		if(pee->sx == SCREEN_WIDTH)
+		if(pee->sx == page->sw)
 		{
 			pee->sy++;
 			if(svq == 7) pee->coor++;
-			if(pee->sy == SCREEN_HEIGHT && svq == 8) pee->coor = rand()%256;
+			if(pee->sy == page->sh && svq == 8) pee->coor = rand()%256;
 		}
 	}else pee->sy = 0;
 }
@@ -73,18 +73,18 @@ void dingpp(page_t *page, bakapee_t *pee)
 #endif
 }
 
-void dingo(bakapee_t *pee)
+void dingo(page_t *page, bakapee_t *pee)
 {
 	#ifdef TILE
-	if(pee->xx<0) pee->xx=(SCREEN_WIDTH-TILEWH);
-	if(pee->yy<0) pee->yy=(SCREEN_HEIGHT-TILEWH);
-	if(pee->xx>(SCREEN_WIDTH-TILEWH)) pee->xx=0;
-	if(pee->yy>(SCREEN_HEIGHT-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
+	if(pee->xx<0) pee->xx=(page->sw-TILEWH);
+	if(pee->yy<0) pee->yy=(page->sh-TILEWH);
+	if(pee->xx>(page->sw-TILEWH)) pee->xx=0;
+	if(pee->yy>(page->sh-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
 	#else
-	if(pee->xx<0) pee->xx=SCREEN_WIDTH;
-	if(pee->yy<0) pee->yy=SCREEN_HEIGHT;
-	if(pee->xx>SCREEN_WIDTH) pee->xx=0;
-	if(pee->yy>SCREEN_HEIGHT) pee->yy=0;
+	if(pee->xx<0) pee->xx=page->sw;
+	if(pee->yy<0) pee->yy=page->sh;
+	if(pee->xx>page->sw) pee->xx=0;
+	if(pee->yy>page->sh) pee->yy=0;
 	#endif
 }
 
@@ -162,15 +162,15 @@ void ding(page_t *page, bakapee_t *pee, word q)
 	{
 		case 1:
 			dingq(pee);
-			if(pee->xx==SCREEN_WIDTH){pee->bakax=0;}
+			if(pee->xx==page->sw){pee->bakax=0;}
 			if(pee->xx==0){pee->bakax=1;}
-			if(pee->yy==SCREEN_HEIGHT){pee->bakay=0;}
+			if(pee->yy==page->sh){pee->bakay=0;}
 			if(pee->yy==0){pee->bakay=1;}
 		break;
 		case 2:
 			dingq(pee);
 			dingas(pee);
-			dingo(pee);
+			dingo(page, pee);
 			dingpp(page, pee);	//plot the pixel/tile
 #ifdef TILE
 			modexClearRegion(page, (rand()*TILEWH)%page->width, (rand()*TILEWH)%(page->height), TILEWH, TILEWH, 0);
@@ -180,13 +180,13 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		break;
 		case 3:
 			dingq(pee);
-			if(pee->xx!=SCREEN_WIDTH||pee->yy!=SCREEN_HEIGHT)
+			if(pee->xx!=page->sw||pee->yy!=page->sh)
 			{
 				if(pee->xx==0){pee->bakax=1;pee->bakay=-1;d3y=1;}
 				if(pee->yy==0){pee->bakax=1;pee->bakay=0;d3y=1;}
-				if(pee->xx==SCREEN_WIDTH){pee->bakax=-1;pee->bakay=-1;d3y=1;}
-				if(pee->yy==SCREEN_HEIGHT){pee->bakax=1;pee->bakay=0;d3y=1;}
-			}else if(pee->xx==SCREEN_WIDTH&&pee->yy==SCREEN_HEIGHT) pee->xx=pee->yy=0;
+				if(pee->xx==page->sw){pee->bakax=-1;pee->bakay=-1;d3y=1;}
+				if(pee->yy==page->sh){pee->bakax=1;pee->bakay=0;d3y=1;}
+			}else if(pee->xx==page->sw&&pee->yy==page->sh) pee->xx=pee->yy=0;
 			if(d3y)
 			{
 				if(pee->bakay<0)
@@ -213,7 +213,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		case 4:
 			dingq(pee);
 			dingas(pee);
-			dingo(pee);
+			dingo(page, pee);
 			dingpp(page, pee);	//plot the pixel/tile
 		break;
 		case 5:
@@ -232,7 +232,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		break;
 		case 8:
 			colorz(page, pee);
-			modexprint(page, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, 1, 47, 0, "bakapi");
+			modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi");
 		break;
 		case 9:
 			if(pee->coor <= HGQ)
diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h
index a20dc095..3e228a4a 100755
--- a/src/lib/bakapee.h
+++ b/src/lib/bakapee.h
@@ -45,7 +45,7 @@ void colortest(page_t *page, bakapee_t *pee);
 void colorz(page_t *page, bakapee_t *pee);
 void ssd(page_t *page, bakapee_t *pee, word svq);
 void dingpp(page_t *page, bakapee_t *pee);
-void dingo(bakapee_t *pee);
+void dingo(page_t *page, bakapee_t *pee);
 void dingas(bakapee_t *pee);
 void dingu(bakapee_t *pee);
 void dingq(bakapee_t *pee);
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index d5441ce2..43e94ba3 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -300,7 +300,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 	}
 
 	/* draw the next column */
-	x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth;
+	x= mv[id].page->sw + mv[id].map->tiles->tileWidth;
 	if(player[plid].q%4)
 		if(id==0)
 			mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x, player, mv->page->dx);
@@ -384,7 +384,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 	}
 
 	/* draw the next row */
-	y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight;
+	y= mv[id].page->sh + mv[id].map->tiles->tileHeight;
 	if(player[plid].q%3)
 		if(id==0)
 			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+15, y, player, mv->page->dy);
@@ -455,7 +455,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 	modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
 	py=0;
 	i=mv->ty * mv->map->width + mv->tx;
-	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
+	for(ty=mv->ty-1; py < mv->page->sh+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
 		mapDrawWRow(mv, tx-1, ty, py);
 	i+=mv->map->width - tx;
 	}
@@ -513,7 +513,7 @@ void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word p
 //printf("y: %d\n", poopoffset);
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=poopoffset; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	for(x=poopoffset; x<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -533,7 +533,7 @@ void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word p
 
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=poopoffset; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	for(y=poopoffset; y<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
 		/* we are in the map, so copy away! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -549,7 +549,7 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)
 
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	for(x=0; x<mv->page->sw+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -568,7 +568,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	for(y=0; y<mv->page->sh+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
 		/* we are in the map, so copy away! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
diff --git a/test.map b/test.map
index bc2df6c9..821909f1 100755
--- a/test.map
+++ b/test.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: test.exe
 creating a DOS executable
 
@@ -410,4 +410,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00016aa0 (92832.)
 Entry point address: 0000:0222
-Link time: 00:00.92
+Link time: 00:00.83
diff --git a/test2.map b/test2.map
index 3023003a..7645c414 100755
--- a/test2.map
+++ b/test2.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: test2.exe
 creating a DOS executable
 
@@ -422,4 +422,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  000176e0 (95968.)
 Entry point address: 0000:0210
-Link time: 00:00.03
+Link time: 00:00.33
diff --git a/vgmtest.map b/vgmtest.map
index a5ee502e..753bc9d9 100755
--- a/vgmtest.map
+++ b/vgmtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/15 13:12:45
+Created on:       15/10/15 13:23:08
 Executable Image: vgmtest.exe
 creating a DOS executable
 
@@ -606,4 +606,4 @@ vgmsnd.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001f460 (128096.)
 Entry point address: 0000:7d06
-Link time: 00:00.13
+Link time: 00:00.44