fixed a merge issue i plan on cleaning TAIL and working on 16 core

diff --git a/16/vgmtools b/16/vgmtools
index 057e0126a66a4d287508d79f9a407a0a30293c5f..227be76a9543731cef28e46d2cf690064256515c 160000 (submodule)
--- a/16/vgmtools
+++ b/16/vgmtools
@@ -1 +1 @@
-Subproject commit 057e0126a66a4d287508d79f9a407a0a30293c5f
+Subproject commit 227be76a9543731cef28e46d2cf690064256515c

diff --git a/palllist.exe b/palllist.exe
deleted file mode 100755 (executable)
index ae114a6..0000000
Binary files a/palllist.exe and /dev/null differ

diff --git a/sdtest.exe b/sdtest.exe
deleted file mode 100755 (executable)
index 014b54d..0000000
Binary files a/sdtest.exe and /dev/null differ

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 536aea9e8fa747b32609dc434d70d5234796dede..d308ffac3ff3f8eddc0dc63fce15a46bd74070aa 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -52,12 +52,20 @@
        if(gvar.in.inst->Keyboard[88]){ panswitch=!panswitch;                                                   IN_UserInput(1, &gvar); } \\r
        TAIL_FUNCTIONKEYFUNCTIONS0EXE\r
 \r
+\r
 #define RFDEBUGFUNCTIONS\r
 #ifdef __DEBUG_RF__\r
 #undef RFDEBUGFUNCTIONS\r
 #define RFDEBUGFUNCTIONS \\r
-       if(gvar.in.inst->Keyboard[sc_F11]){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap;             IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;                    IN_UserInput(1, &gvar); }\r
+       switch(gvar.in.inst->CurCode) \\r
+       { \\r
+               case sc_F11: \\r
+                       dbg_pagedelayrendermap=!dbg_pagedelayrendermap;         IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_F9: \\r
+                       dbg_pagenorendermap=!dbg_pagenorendermap;                       IN_UserInput(1, &gvar); \\r
+               break; \\r
+       }\r
 #endif\r
 \r
 /*#define MAPDEBUGFUNCTIONS\r
@@ -75,20 +83,47 @@
 #endif*/\r
 \r
 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \\r
-       if(gvar.in.inst->Keyboard[sc_F4]){ turboXT(12);                                                                 IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[68/*sc_F10*/]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;                     IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_F8]){ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;                IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page, 0, 1);                                         IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page, 0, 0);                                         IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss;                   IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(0, &gvar);                                                 IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                               IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_Q]){ VL_modexPrintTextBox(&gvar);                                          IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_W]){ VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar);   IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                       IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_M]){ MM_ShowMemory(&gvar); MM_DumpData (&gvar);                    IN_UserInput(1, &gvar); } \\r
+       switch(gvar.in.inst->CurCode) \\r
+       { \\r
+               case sc_F4: \\r
+                       turboXT(12);                                                                                            IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_F10: \\r
+                       gvar.kurokku.fpscap=!gvar.kurokku.fpscap;                                       IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_F8: \\r
+                       gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;           IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_F7: \\r
+                       VL_ShowPage(&gvar.video.page, 0, 1);                                            IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_F6: \\r
+                       VL_ShowPage(&gvar.video.page, 0, 0);                                            IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_T: \\r
+                       gvar.video.vga_state.rss=!gvar.video.vga_state.rss;                     IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_P: \\r
+                       modexpdump(0, &gvar);                                                                           IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_Y: \\r
+                       dbg_delayanimation=!dbg_delayanimation;                                         IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_Q: \\r
+                       VL_modexPrintTextBox(&gvar);                                                            IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_W: \\r
+                       VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar);     IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_LBrkt: \\r
+                       ShowPalVal (&gvar);                                                                                     IN_UserInput(1, &gvar); \\r
+               break; \\r
+               case sc_M: \\r
+                       MM_ShowMemory(&gvar);           MM_DumpData (&gvar);                    IN_UserInput(1, &gvar); \\r
+               break; \\r
+       } \\r
        RFDEBUGFUNCTIONS\r
-//FIZZLEFADEFUNCTION\r
+       //FIZZLEFADEFUNCTION\r
 \r
 #define TAIL_PANKEYFUN \\r
        TAIL_PANKEYFUNZC \\r