Got rid of redundant __asmPlasm_bank2

Platform/Apple/virtual/src/core/mem.s

@@ -316,7 +316,6 @@ loMemBegin: !pseudopc $800 {
 	jmp j_main_dispatch
 	jmp j_aux_dispatch
 	jmp __asmPlasm
-	jmp __asmPlasm_bank2
 
 ; Vectors for debug macros
 	jmp __safeBell
@@ -460,10 +459,9 @@ disk_rewind: !zone
 ; 5. Restore PLASMA's X register, and advance it over the parameter(s)
 ; 6. Store A=lo/Y=hi into PLASMA return value
 ; 7. Return to PLASMA
-__asmPlasm_bank2:
+__asmPlasm:
 	bit setLcRW+lcBank2
 	bit setLcRW+lcBank2
-__asmPlasm: !zone
 	cpx #$11
 	bcs .badx	; X must be in range 0..$10
 	; adjust PLASMA stack pointer to skip over params

Platform/Apple/virtual/src/include/mem.i

@@ -471,15 +471,10 @@ HEAP_COLLECT = $24
     ldy #nArgs
     jsr _asmPlasm
 }
-!macro asmPlasm_bank2 nArgs {
-    ldy #nArgs
-    jsr _asmPlasm_bank2
-}
 _asmPlasm = auxLoader+3
-_asmPlasm_bank2 = _asmPlasm+3
 
 ; Debug support routines (defined in core/mem.s)
-_safeBell   = _asmPlasm_bank2+3
+_safeBell   = _asmPlasm+3
 _safeCout   = _safeBell+3
 _safePrbyte = _safeCout+3
 _safeHome   = _safePrbyte+3

Platform/Apple/virtual/src/plasma/gameloop.pla

@@ -782,7 +782,7 @@ end
 // Set up the font engine
 // Params: pFont
 asm setFont
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   jmp SetFont
 end
 
@@ -790,21 +790,21 @@ end
 // Use the font engine to clear the current text window.
 // Parameters: top, bottom, left, right
 export asm setWindow
-  +asmPlasm_bank2 4
+  +asmPlasm 4
   jmp SetWindow
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Save the cursor position (1 save slot)
 asm saveCursor
-  +asmPlasm_bank2 0
+  +asmPlasm 0
   jmp SaveCursor
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Restore the cursor position (1 save slot)
 asm restoreCursor
-  +asmPlasm_bank2 0
+  +asmPlasm 0
   jmp RestCursor
 end
 
@@ -812,7 +812,7 @@ end
 // Read a keyboard string up to 40 chars using the Font Engine. Returns a zero-terminated string
 // in the input buffer at $200, with the length stored in $2FF.
 asm rawGetStr
-  +asmPlasm_bank2 0
+  +asmPlasm 0
   jmp GetStr
 end
 
@@ -820,7 +820,7 @@ end
 // Use the font engine to clear the current text window
 // Params: None
 export asm clearWindow
-  +asmPlasm_bank2 0
+  +asmPlasm 0
   jmp ClearWindow
 end
 
@@ -828,7 +828,7 @@ end
 // Use the font engine to copy the current text window to hi-res page 2
 // Params: None
 asm copyWindow
-  +asmPlasm_bank2 0
+  +asmPlasm 0
   jmp CopyWindow
 end
 
@@ -836,7 +836,7 @@ end
 // Display a character using the font engine.
 // Params: ch
 export asm displayChar
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   jmp DisplayChar
 end
 
@@ -844,7 +844,7 @@ end
 // Display a string using the font engine.
 // Params: pStr
 export asm displayStr
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   jmp DisplayStr
 end
 
@@ -852,14 +852,14 @@ end
 // Calculate string width using the font engine.
 // Params: pStr
 export asm calcWidth
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   jmp CalcWidth
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Get the address of the given hi-res screen line
 export asm getScreenLine
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   jmp GetScreenLine
 end
 
@@ -867,7 +867,7 @@ end
 // Display a string using the font engine but not its parser.
 // Params: pStr
 export asm rawDisplayStr
-  +asmPlasm_bank2 1
+  +asmPlasm 1
   sta pTmp
   sty pTmp+1
   ldy #0