diff --git a/include/pokedex.h b/include/pokedex.h index 2c12874..fc4b1c6 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -78,7 +78,7 @@ struct PokedexScreenData u16 field_6C; }; -struct PokedexScreenData* gPokedexScreenDataPtr; +extern struct PokedexScreenData* gPokedexScreenDataPtr; enum { diff --git a/scripts/string.py b/scripts/string.py index 8bf724f..15ef6b6 100644 --- a/scripts/string.py +++ b/scripts/string.py @@ -73,7 +73,7 @@ SpecialBuffers = { def StringFileConverter(fileName: str): stringToWrite = ".thumb\n.text\n.align 2\n\n" - with open(fileName, 'r', encoding="utf-8") as file: + with open(fileName, 'r', encoding="ISO-8859-1") 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="utf-8") as file: + with open(CharMap, 'r', encoding="ISO-8859-1") as file: for line in file: if line.strip() != "/FF" and line.strip() != "": if line[2] == '=' and line[3] != "":