falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tilesets with 256 colors

This commit is contained in:
octorock 2021-10-29 22:43:56 +02:00
parent 0f7d5fa29a
commit c913513bc1
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
assets/mapData.json
View File

@ -4564,7 +4564,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_0_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz",
"start": 4582652, "start": 4582652,
"size": 17751, "size": 17751,
"type": "tileset" "type": "tileset"
@ -4582,7 +4582,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_1_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz",
"start": 4604164, "start": 4604164,
"size": 11540, "size": 11540,
"type": "tileset" "type": "tileset"
@ -4600,7 +4600,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_2_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz",
"start": 4616860, "start": 4616860,
"size": 9324, "size": 9324,
"type": "tileset" "type": "tileset"
@ -4618,7 +4618,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_3_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz",
"start": 4627280, "start": 4627280,
"size": 9204, "size": 9204,
"type": "tileset" "type": "tileset"
@ -4636,7 +4636,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_4_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz",
"start": 4637568, "start": 4637568,
"size": 8933, "size": 8933,
"type": "tileset" "type": "tileset"
@ -4654,7 +4654,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_5_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz",
"start": 4647596, "start": 4647596,
"size": 10216, "size": 10216,
"type": "tileset" "type": "tileset"
@ -4672,7 +4672,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_6_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz",
"start": 4659316, "start": 4659316,
"size": 20013, "size": 20013,
"type": "tileset" "type": "tileset"
@ -4690,7 +4690,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_7_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz",
"start": 4681224, "start": 4681224,
"size": 13589, "size": 13589,
"type": "tileset" "type": "tileset"
@ -4708,7 +4708,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_8_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz",
"start": 4697552, "start": 4697552,
"size": 16289, "size": 16289,
"type": "tileset" "type": "tileset"
@ -4726,7 +4726,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_9_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz",
"start": 4715288, "start": 4715288,
"size": 11535, "size": 11535,
"type": "tileset" "type": "tileset"
@ -4744,7 +4744,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_10_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz",
"start": 4728260, "start": 4728260,
"size": 11703, "size": 11703,
"type": "tileset" "type": "tileset"
@ -4762,7 +4762,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_11_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz",
"start": 4741872, "start": 4741872,
"size": 9865, "size": 9865,
"type": "tileset" "type": "tileset"
@ -4786,7 +4786,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_12_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz",
"start": 4776476, "start": 4776476,
"size": 12221, "size": 12221,
"type": "tileset" "type": "tileset"
@ -4804,7 +4804,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_13_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz",
"start": 4789884, "start": 4789884,
"size": 11968, "size": 11968,
"type": "tileset" "type": "tileset"
@ -4822,7 +4822,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_14_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz",
"start": 4803020, "start": 4803020,
"size": 12141, "size": 12141,
"type": "tileset" "type": "tileset"
@ -4840,7 +4840,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_15_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz",
"start": 4816332, "start": 4816332,
"size": 7859, "size": 7859,
"type": "tileset" "type": "tileset"
@ -4858,7 +4858,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_16_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz",
"start": 4825372, "start": 4825372,
"size": 12332, "size": 12332,
"type": "tileset" "type": "tileset"
@ -4876,7 +4876,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_17_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz",
"start": 4838892, "start": 4838892,
"size": 10416, "size": 10416,
"type": "tileset" "type": "tileset"
@ -4894,7 +4894,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_18_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz",
"start": 4850488, "start": 4850488,
"size": 12716, "size": 12716,
"type": "tileset" "type": "tileset"
@ -4912,7 +4912,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_MinishHouseInteriors_19_0.4bpp.lz", "path": "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz",
"start": 4864384, "start": 4864384,
"size": 12254, "size": 12254,
"type": "tileset" "type": "tileset"
@ -4930,7 +4930,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_0_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz",
"start": 4877984, "start": 4877984,
"size": 8598, "size": 8598,
"type": "tileset" "type": "tileset"
@ -4948,7 +4948,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_1_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz",
"start": 4888052, "start": 4888052,
"size": 10686, "size": 10686,
"type": "tileset" "type": "tileset"
@ -4966,7 +4966,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_2_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz",
"start": 4900128, "start": 4900128,
"size": 9694, "size": 9694,
"type": "tileset" "type": "tileset"
@ -4984,7 +4984,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_3_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz",
"start": 4911288, "start": 4911288,
"size": 10723, "size": 10723,
"type": "tileset" "type": "tileset"
@ -5002,7 +5002,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_4_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz",
"start": 4923412, "start": 4923412,
"size": 9306, "size": 9306,
"type": "tileset" "type": "tileset"
@ -5020,7 +5020,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_5_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz",
"start": 4934204, "start": 4934204,
"size": 12389, "size": 12389,
"type": "tileset" "type": "tileset"
@ -5038,7 +5038,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_6_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz",
"start": 4949944, "start": 4949944,
"size": 12973, "size": 12973,
"type": "tileset" "type": "tileset"
@ -5056,7 +5056,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_7_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz",
"start": 4964716, "start": 4964716,
"size": 17700, "size": 17700,
"type": "tileset" "type": "tileset"
@ -5074,7 +5074,7 @@
"type": "map_mapping2" "type": "map_mapping2"
}, },
{ {
"path": "tilesets/gAreaTileset_TownMinishHoles_8_0.4bpp.lz", "path": "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz",
"start": 4985452, "start": 4985452,
"size": 13622, "size": 13622,
"type": "tileset" "type": "tileset"

14
tools/asset_extractor/asset_extractor.py
View File

@ -155,11 +155,13 @@ def run_gbagfx(path_in, path_out, options):
subprocess.check_call([os.path.join('tools', 'gbagfx', 'gbagfx'), path_in, path_out] + options) subprocess.check_call([os.path.join('tools', 'gbagfx', 'gbagfx'), path_in, path_out] + options)
def extract_tileset(path): def extract_tileset(path):
assert(path.endswith('.4bpp.lz')) assert(path.endswith('.4bpp.lz') or path.endswith('.8bpp.lz'))
base = path[0:-8] base = path[0:-8]
bpp_extension = path[-8:-3]
# subprocess.call(['cp', path, path+'.bkp']) # subprocess.call(['cp', path, path+'.bkp'])
run_gbagfx(path, base+'.4bpp', []) # decompress run_gbagfx(path, base+bpp_extension, []) # decompress
run_gbagfx(base+'.4bpp', base+'.png', ['-mwidth', '32']) # convert to png run_gbagfx(base+bpp_extension, base+'.png', ['-mwidth', '32']) # convert to png
# TODO automatically generate tileset entries from tileset_headers.s # TODO automatically generate tileset entries from tileset_headers.s
# TODO Possible to set the correct palette? Or not, because there is a set of palettes that can be chosen and the correct palette is only defined by the metatile? # TODO Possible to set the correct palette? Or not, because there is a set of palettes that can be chosen and the correct palette is only defined by the metatile?
@ -173,8 +175,12 @@ def extract_graphic(path, options):
base = path[0:-5] base = path[0:-5]
elif path.endswith('.4bpp.lz'): elif path.endswith('.4bpp.lz'):
base = path[0:-8] base = path[0:-8]
elif path.endswith('.8bpp'):
base = path[0:-5]
elif path.endswith('.8bpp.lz'):
base = path[0:-8]
else: else:
assert(False, f'Invalid graphic extension {path}') assert False, f'Invalid graphic extension {path}'
params = [] params = []
for key in options: for key in options: