Had to increase decompression underlap back to 5. Don't really want to mess with it and figure out why. Also, changed invalid encounter chance from fatal error to just a warning, so Seth can fix them.

This commit is contained in:
Martin Haye 2022-01-28 08:16:05 -08:00
parent accf0d42fe
commit 0c30fadee3
2 changed files with 9 additions and 5 deletions

View File

@ -1664,7 +1664,7 @@ class A2PackPartitions
// Note: Always need to be checking this, even though it does take time. Things like gen_flags.b
// can blow it out -- has something to do with repeated similar strings?
if (uncompressedLen - compressedLen > 0) {
def underlap = 3
def underlap = 5
def checkData = new byte[uncompressedLen+underlap]
def initialOffset = uncompressedLen - compressedLen + underlap
System.arraycopy(compressedData, 0, checkData, initialOffset, compressedLen)
@ -5907,9 +5907,12 @@ end
def y = blk.field[2].text().toInteger()
def maxDist = blk.field[3].text().toInteger()
def chance = (int)(blk.field[4].text().toFloat() * 10.0)
assert chance > 0 && chance <= 1000
outIndented("addEncounterZone(${escapeString(code)}, $x, $y, $maxDist, $chance)\n")
addMapDep("encounterZone", code.toLowerCase())
if (chance <= 0 || chance > 1000)
printWarning("Invalid encounter chance ${blk.field[4].text()} - should be >0.0, <=100.0. Skipping.")
else {
outIndented("addEncounterZone(${escapeString(code)}, $x, $y, $maxDist, $chance)\n")
addMapDep("encounterZone", code.toLowerCase())
}
}
def packClrEncounterZones(blk)

View File

@ -35,7 +35,8 @@ DEBUG = 0
; Note: 3 is sufficient for 99% of cases. Found a case (gen_flags.b) requiring 5,
; something to do with repeated similar strings, but randomized the order to get
; back down to 3.
UNDERLAP = 3
; 2022-01-28: Found another case, and randomization didn't help. Back up to 5.
UNDERLAP = 5
; Zero page temporary variables.
; Don't move these - they overlap in clever ways with ProRWTS shadows (see below)