Finished cleanup of START_LOAD/FINISH_LOAD

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

@@ -29,8 +29,8 @@ MAX_SEGS	= 96
 
 DO_COMP_CHECKSUMS = 0		; during compression debugging
 DEBUG_DECOMP 	= 0
-DEBUG		= 1
-SANITY_CHECK	= 1		; also prints out request data
+DEBUG		= 0
+SANITY_CHECK	= 0		; also prints out request data
 
 ; Zero page temporary variables
 tmp		= $2	; len 2

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

@@ -426,7 +426,7 @@ def makeRandomGroup(mapCode)
   word enemyFunc
 
   enemiesModule = mmgr(QUEUE_LOAD, MODULE_GEN_ENEMIES<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, WITH_CLOSE)
+  mmgr(FINISH_LOAD, 0)
 
   global=>p_enemyGroups = NULL
   enemyFunc = enemiesModule()=>enemy_forZone(mapCode)

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

@@ -175,7 +175,6 @@ end
 def _saveGame()
 
   // Perform garbage collection and record the size of the heap so we can restore it correctly
-  mmgr(FINISH_LOAD, WITH_CLOSE)
   global=>w_heapSize = mmgr(HEAP_COLLECT, 0) - HEAP_BOTTOM
 
   // Copy data to main memory
@@ -265,7 +264,7 @@ def newGame()
   global->b_curAvatar = 0
   playersModule = mmgr(QUEUE_LOAD, MODULE_GEN_PLAYERS<<8 | RES_TYPE_MODULE)
   globalScriptsModule = mmgr(QUEUE_LOAD, MODULE_GEN_GLOBAL_SCRIPTS<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
   playersModule()=>makeInitialParty()
   if sc_newGame >= 0; globalScriptsModule()=>sc_newGame(); fin
 end

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

@@ -1065,10 +1065,8 @@ end
 export def setSky(num)
   // hack for end-game screen
   if num == 99
-    mmgr(START_LOAD, 1)
     flipToPage1()
     loadFrameImg(4)
-    mmgr(FINISH_LOAD, WITH_CLOSE)
     while 1; loop  // 1 infinite loop
   fin
   skyNum = num
@@ -1107,6 +1105,7 @@ def loadFrameImg(img)
     mmgr(SET_MEM_TARGET, $2000)
     mmgr(QUEUE_LOAD,     img<<8 | RES_TYPE_SCREEN)
     mmgr(LOCK_MEMORY,    $2000)
+    mmgr(FINISH_LOAD, 0)
     frameLoaded = img
   fin
 end
@@ -1226,11 +1225,10 @@ def initMap(x, y, dir)
   else
     mmgr(QUEUE_LOAD, CODE_TILE_ENGINE<<8 | RES_TYPE_CODE)
   fin
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
   renderLoaded = TRUE
   diskActivity(0)
   loadFrameImg(mapIs3D+2)
-  mmgr(FINISH_LOAD, WITH_CLOSE)
 
   // Load the map
   diskActivity($FF)
@@ -1240,7 +1238,7 @@ def initMap(x, y, dir)
   else
     pMap = mmgr(QUEUE_LOAD, mapNum<<8 | RES_TYPE_2D_MAP)
   fin
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
   diskActivity(0)
 
   // Clear all the windows to the background color (hi-bit set)
@@ -1525,7 +1523,6 @@ def setMap(is3D, num, x, y, dir)
     needRender = TRUE
   else
     flipToPage1()
-    mmgr(FINISH_LOAD, WITH_CLOSE)
     showMapName("Traveling...")
     setMapWindow(); clearWindow()
     setWindow2();   clearWindow()
@@ -1763,7 +1760,7 @@ export def setPortrait(portraitNum)
   diskActivity($FF)
   mmgr(START_LOAD, 2) // portraits are in partition 2
   curPortrait = auxMmgr(QUEUE_LOAD, portraitNum<<8 | RES_TYPE_PORTRAIT)
-  mmgr(FINISH_LOAD, WITH_CLOSE)
+  mmgr(FINISH_LOAD, 0)
   diskActivity(0)
   animFrame = 0
   animFlags = readAuxByte(curPortrait)
@@ -1871,7 +1868,6 @@ def loadEngine(moduleNum)
   saveMapPos()
   flipToPage1()
   diskActivity($FF)
-  mmgr(FINISH_LOAD, WITH_CLOSE)
   if renderLoaded and mapIs3D
     auxMmgr(FREE_MEMORY, expandVec)
   fin
@@ -1881,7 +1877,7 @@ def loadEngine(moduleNum)
   curPortrait = NULL
   mmgr(START_LOAD, 1) // code is in partition 1
   p_engine = mmgr(QUEUE_LOAD, moduleNum<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)  // fairly safe, I think?
+  mmgr(FINISH_LOAD, 0)
   diskActivity(0)
   return p_engine()  // return function table
 end
@@ -2124,10 +2120,9 @@ def addItem()
 
   if n_item >= 2
     // Load the module that is capable of creating items
-    mmgr(FINISH_LOAD, WITH_CLOSE)
     mmgr(START_LOAD, 1) // code is in partition 1
     p_module = mmgr(QUEUE_LOAD, MODULE_GEN_ITEMS<<8 | RES_TYPE_MODULE)
-    mmgr(FINISH_LOAD, WITH_CLOSE)
+    mmgr(FINISH_LOAD, 0)
 
     // Figure out which item function to call there, and create the item
     funcTbl = p_module()
@@ -2238,7 +2233,7 @@ def loadTitle()
   mmgr(SET_MEM_TARGET, $2000)
   mmgr(QUEUE_LOAD,     1<<8 | RES_TYPE_SCREEN)  // title screen is fixed at #1
   mmgr(LOCK_MEMORY,    $2000)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD,    0)
   frameLoaded = 1
   ^$C050     // graphics
   ^$C057     // hi-res
@@ -2257,7 +2252,7 @@ def loadTitle()
   mmgr(SET_MEM_TARGET, $9000)
   pFont = mmgr(QUEUE_LOAD, 1<<8 | RES_TYPE_FONT)
   mmgr(LOCK_MEMORY, pFont)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
 
   // Tell the font engine where to find its font
   setFont(pFont)
@@ -2377,10 +2372,9 @@ export def createAndAddUnique(moduleID, creationFuncNum, pList)
   // Load the module that is capable of creating the thing
   flipToPage1()
   diskActivity($FF)
-  mmgr(FINISH_LOAD, WITH_CLOSE)
   mmgr(START_LOAD, 1) // code is in partition 1
   p_module = mmgr(QUEUE_LOAD, moduleID<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
   diskActivity(0)
 
   // Figure out which creation function to call there, and create the thing
@@ -2394,7 +2388,6 @@ export def createAndAddUnique(moduleID, creationFuncNum, pList)
   fin
 
   // Finished with the module now.
-  mmgr(FINISH_LOAD, WITH_CLOSE)
   mmgr(FREE_MEMORY, p_module)
 end
 
@@ -2525,7 +2518,7 @@ def startGame(ask)
   // Create a new game or load an existing one
   mmgr(START_LOAD, 1) // code is in partition 1
   p_module = mmgr(QUEUE_LOAD, MODULE_DISKOPS<<8 | RES_TYPE_MODULE)
-  mmgr(FINISH_LOAD, LEAVE_OPEN)
+  mmgr(FINISH_LOAD, 0)
   if p_module()=>diskops_newOrLoadGame(ask)
     mapIs3D = q_mapIs3D
     mapNum = q_mapNum

Platform/Apple/virtual/src/plasma/globalDefs.plh

@@ -58,10 +58,6 @@ const HEAP_ALLOC     = $22
 const HEAP_INTERN    = $23
 const HEAP_COLLECT   = $24
 
-// Constants for FINISH_LOAD
-const WITH_CLOSE     = 0
-const LEAVE_OPEN     = 1
-
 // Heap location in memory
 const HEAP_BOTTOM    = $EF00
 const HEAP_SIZE      = $C00

Platform/Apple/virtual/src/raycast/render.s

@@ -1643,7 +1643,6 @@ loadTextures: !zone
 	; finalize the load, and close the queue because textures are the last thing
 	; to load.
 	lda #FINISH_LOAD
-	ldx #0
 	jsr mainLoader
 	; finally, init the scripts.
 	pla

Platform/Apple/virtual/src/tile/tileEngine.s

@@ -285,7 +285,6 @@ LOAD_ALL_TILES
 }
 
 !macro finishLoad keepOpen {
-       LDX #keepOpen   ; 1 to keep open for next load, 0 for close so you can flip to HGR page 2
        LDA #FINISH_LOAD
        JSR mainLoader
 }