Refactored code to save space when running standalone modules like combat and player-info.

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

@@ -414,8 +414,8 @@ SWXX:	bit monrts		; set V to denote SWX (not SBX)
 .shst	lda evalStkH+1,x	; get hi byte of pointer to store to
 	cmp #$D0		; in $0000.CFFF range,
 	bcc .norm		;	just do normal store
-	inc setLcRW+lcBank2	; PLASMA normally write-protects the LC,
+	sta setLcRW+lcBank2	; PLASMA normally write-protects the LC,
-	inc setLcRW+lcBank2	; 	but let's allow writing there. Don't use BIT as it affects V flg.
+	sta setLcRW+lcBank2	; 	but let's allow writing there. Don't use BIT as it affects V flg.
 	cmp #$E0		; in $E000.FFFF range do normal store after write-enable
 	bcs .norm
 	sty tmp

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

@@ -1265,6 +1265,7 @@ def initMap(x, y, dir)
   setWindow2()
   initDisplay(mapNum, pMap, x, y, dir)
   needRender = FALSE
+  textDrawn = FALSE
   curPortrait = 0
 
   // Display the party characters
@@ -1861,29 +1862,24 @@ def restoreMapPos()
 end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// Load the Party engine and show data for the given player
+def loadEngine(moduleNum)
-def showPlayerSheet(num)
+  word p_engine
-  word partyEngine
-  word x, y
-  byte dir
-
   saveMapPos()
-
-  // Load the party engine
   flipToPage1()
+  diskActivity($FF)
   mmgr(RESET_MEMORY, 0)
   renderLoaded = FALSE
-  mmgr(START_LOAD, 1) // partition 1=code
+  mmgr(START_LOAD, 1) // code is in partition 1
-  partyEngine = mmgr(QUEUE_LOAD, MODULE_PARTY<<8 | RES_TYPE_MODULE)
+  p_engine = mmgr(QUEUE_LOAD, moduleNum<<8 | RES_TYPE_MODULE)
   mmgr(FINISH_LOAD, LEAVE_OPEN)
+  diskActivity(0)
+  return p_engine()  // return function table
+end
 
-  // Run the party engine
+///////////////////////////////////////////////////////////////////////////////////////////////////
-  partyEngine()=>party_showPlayerSheet(num)
+// Load the Party engine and show data for the given player
-
+def showPlayerSheet(num)
-  // Resume where we left off
+  loadEngine(MODULE_PARTY)=>party_showPlayerSheet(num)
-  textDrawn = TRUE
-  clearPortrait()
-  setWindow2()
   restoreMapPos()
 end
 
@@ -1946,33 +1942,10 @@ end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 def doCombat(mapCode)
-  word combatEngine
+  // Handled in a separate module. Clear enemies out of the heap when finished.
-  word x, y
+  loadEngine(MODULE_COMBAT)=>combat_zoneEncounter(mapCode)
-  byte dir
-
-  saveMapPos()
-
-  // Load the combat engine
-  flipToPage1()
-  diskActivity($FF)
-  mmgr(RESET_MEMORY, 0)
-  renderLoaded = FALSE
-  mmgr(START_LOAD, 1) // code is in partition 1
-  combatEngine = mmgr(QUEUE_LOAD, MODULE_COMBAT<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
-  diskActivity(0)
-
-  // Run the combat engine
-  combatEngine()=>combat_zoneEncounter(mapCode)
-
-  // Clear enemies out of the heap
   global=>p_enemyGroups = NULL
   mmgr(HEAP_COLLECT, 0)
-
-  // Resume where we left off
-  textDrawn = TRUE
-  clearPortrait()
-  setWindow2()
   restoreMapPos()
 end