Temporary workarounds.

This commit is contained in:
Martin Haye 2017-01-07 11:25:01 -08:00
parent 845239c2cf
commit ae4210a050
3 changed files with 12 additions and 3 deletions

View File

@ -1285,6 +1285,9 @@ class A2PackPartitions
tileSets.each { k,v -> chunks.add([type:TYPE_TILE_SET, num:v.num, name:k, buf:compress(v.buf)]) }
maps3D.each { k,v -> chunks.add([type:TYPE_3D_MAP, num:v.num, name:k, buf:compress(v.buf)]) }
textures.each { k,v -> chunks.add([type:TYPE_TEXTURE_IMG, num:v.num, name:k, buf:compress(v.buf)]) }
//portraits.each { k,v -> chunks.add([type:TYPE_PORTRAIT, num:v.num, name:k, buf:compress(v.buf)]) }
}
else if (partNum == 3) {
portraits.each { k,v -> chunks.add([type:TYPE_PORTRAIT, num:v.num, name:k, buf:compress(v.buf)]) }
}
@ -1823,12 +1826,16 @@ class A2PackPartitions
println "Writing output file."
new File("build/root").mkdir()
def part1Path = new File("build/root/game.part.1.bin").path
new File(part1Path).withOutputStream { stream -> writePartition(stream, 1) }
def part2Path = new File("build/root/game.part.2.bin").path
new File(part2Path).withOutputStream { stream -> writePartition(stream, 2) }
def part3Path = new File("build/root/game.part.3.bin").path
new File(part3Path).withOutputStream { stream -> writePartition(stream, 3) }
// Print stats (unless there's a warning, in which case focus the user on that)
if (nWarnings == 0)
reportSizes()

View File

@ -206,7 +206,7 @@ init: !zone
; We'll set up 8 initial segments:
; 0: main $0000 -> 4, active + locked
; 1: aux $0000 -> 2, active + locked
; 2: aux $0200 -> 3, inactive
; 2: aux $0800 -> 3, inactive ; TEMPORARY: until we figure out prob w aux screen holes
; 3: aux $BFFD -> 0, active + locked
; 4: main $0xxx -> 5, inactive (xxx = end of mem mgr low mem portion)
; 5: main $4000 -> 6, active + locked
@ -240,7 +240,7 @@ init: !zone
inx
stx tSegLink+8
; Then the addresses
lda #2
lda #8 ; Temporarily avoid aux screen holes; normally this would be 2.
sta tSegAdrHi+2
lda #$BF
sta tSegAdrHi+3
@ -2887,10 +2887,12 @@ tableEnd = *
; Be careful not to grow past the size of the LC bank
!ifdef PASS2 {
!if DEBUG {
!warn "mmgr spare: ", lx47Decomp - tableEnd
!if tableEnd >= lx47Decomp {
!error "Memory manager grew too large."
}
} ; DEBUG
} else { ;PASS2
!set PASS2=1
}

View File

@ -1859,7 +1859,7 @@ export def setPortrait(portraitNum)
restoreCursor()
// Load the portrait image and display it
mmgr(START_LOAD, 2) // portraits are in partition 2
mmgr(START_LOAD, 3) // portraits are in partition 3 // FOO 3 temporarily
curPortrait = auxMmgr(QUEUE_LOAD, portraitNum<<8 | RES_TYPE_PORTRAIT)
mmgr(FINISH_LOAD, 0)
anyAnims = TRUE // for now; might get cleared if we discover otherwise on advance