Merge with Master

This commit is contained in:
Skeli
2021-10-14 17:28:08 -04:00
22 changed files with 459 additions and 83 deletions

View File

@@ -73,7 +73,7 @@ SpecialBuffers = {
def StringFileConverter(fileName: str):
stringToWrite = ".thumb\n.text\n.align 2\n\n"
with open(fileName, 'r', encoding="ISO-8859-1") as file:
with open(fileName, 'r', encoding="utf-8") as file:
maxLength = 0
fillFF = False
readingState = 0
@@ -203,7 +203,7 @@ def ProcessString(string: str, lineNum: int, maxLength=0, fillWithFF=False) -> s
def PokeByteTableMaker():
dictionary = {}
with open(CharMap, 'r', encoding="ISO-8859-1") as file:
with open(CharMap, 'r', encoding="utf-8") as file:
for line in file:
if line.strip() != "/FF" and line.strip() != "":
if line[2] == '=' and line[3] != "":

View File

@@ -5,7 +5,7 @@ from glob import glob
# Data
TM_HM_COUNT = 128
TUTOR_COUNT = 146
SPECIES_COUNT = 0x4EC + 1
SPECIES_COUNT = 0x4F3 + 1
TM_OUTPUT = "assembly/generated/tm_compatibility.s"
TUTOR_OUTPUT = "assembly/generated/tutor_compatibility.s"