From edbfedfdd02cf407966d0c86b469971896daae3c Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Wed, 26 Jun 2024 20:43:37 +0930 Subject: [PATCH] Changed paths for new data subtree --- .gitignore | 1 + scripts/loaders/RomLoader.gd | 6 +++--- scripts/loaders/SaveLoader.gd | 2 +- scripts/loaders/StringLoader.gd | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e79907d..eafb156 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ downloaded_saves/ .import/ build/ output/ +scratch/ diff --git a/scripts/loaders/RomLoader.gd b/scripts/loaders/RomLoader.gd index acaf958..b2b6875 100644 --- a/scripts/loaders/RomLoader.gd +++ b/scripts/loaders/RomLoader.gd @@ -136,10 +136,10 @@ func _ready(): thread = Thread.new() structdefs.merge(STRUCT.get_base_structarraytypes()) STRUCT.parse_struct_definitions_from_tsv_filename('res://data/structs_SNES_stubs.tsv', structdefs) - STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs_SNES_stubs.tsv', structdefs) + STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs/SNES_stubs.tsv', structdefs) structdefs.merge(STRUCT_SNES.get_structtypes(), true) # Overwrite the stubs! - STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs_SNES_save.tsv', structdefs) - STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs_SNES.tsv', structdefs) + STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs/SNES_save.tsv', structdefs) + STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs/SNES.tsv', structdefs) var _error := psx_productcode_regex.compile('(S[A-Z]{3}_\\d{3}\\.\\d{2});(\\d)') # Debugging breakpoint pass diff --git a/scripts/loaders/SaveLoader.gd b/scripts/loaders/SaveLoader.gd index 8f87b3d..78db6be 100644 --- a/scripts/loaders/SaveLoader.gd +++ b/scripts/loaders/SaveLoader.gd @@ -167,4 +167,4 @@ func delete_save_slot(sram: File, slot_id: int): sram.store_16(0) func _ready(): - STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs_SNES_save.tsv', struct_types) + STRUCT.parse_struct_definitions_from_tsv_filename('res://data/5/structs/SNES_save.tsv', struct_types) diff --git a/scripts/loaders/StringLoader.gd b/scripts/loaders/StringLoader.gd index 5236f7c..cc7800d 100644 --- a/scripts/loaders/StringLoader.gd +++ b/scripts/loaders/StringLoader.gd @@ -8,11 +8,11 @@ var tables_raw = {} var tables = {} var glyph_tables := { - 'RPGe_dialog': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_RPGe.txt'), - 'RPGe_small': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_small_RPGe.txt'), - 'SNES_dialog': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_SNES.txt'), - 'SNES_kanji': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_kanji_SNES.txt'), - 'SNES_small': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_small_SNES.txt'), + 'RPGe_dialog': Common.load_glyph_table('res://data/5/glyphs/SNES_dialog_RPGe.txt'), + 'RPGe_small': Common.load_glyph_table('res://data/5/glyphs/SNES_small_RPGe.txt'), + 'SNES_dialog': Common.load_glyph_table('res://data/5/glyphs/SNES_dialog.txt'), + 'SNES_kanji': Common.load_glyph_table('res://data/5/glyphs/SNES_dialog_kanji.txt'), + 'SNES_small': Common.load_glyph_table('res://data/5/glyphs/SNES_small.txt'), } static func decode_string(bytes, glyph_table: PoolStringArray, trim_trailing_whitespace: bool = true) -> String: