pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix splat issues

Browse Source
This commit is contained in:
Alex Bates 2020-11-02 16:39:29 +00:00
parent 134fcbfa44
commit b4a19e09e5
4 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -99,7 +99,7 @@ submodules:
split: split:
rm -rf bin img rm -rf bin img
$(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8 $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS img
split-%: split-%:
$(SPLAT) --modes ld $* $(SPLAT) --modes ld $*
@ -156,15 +156,12 @@ $(BUILD_DIR)/%.rgba32.png: %.png
$(BUILD_DIR)/%.ci8.png: %.png $(BUILD_DIR)/%.ci8.png: %.png
@mkdir -p $(shell dirname $@) @mkdir -p $(shell dirname $@)
$(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS) $(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS)
$(BUILD_DIR)/%.ci8palette.png: %.png
@mkdir -p $(shell dirname $@)
$(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS)
$(BUILD_DIR)/%.ci4.png: %.png $(BUILD_DIR)/%.ci4.png: %.png
@mkdir -p $(shell dirname $@) @mkdir -p $(shell dirname $@)
$(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS) $(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS)
$(BUILD_DIR)/%.ci4palette.png: %.png $(BUILD_DIR)/%.palette.png: %.png
@mkdir -p $(shell dirname $@) @mkdir -p $(shell dirname $@)
$(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS) $(PYTHON) tools/convert_image.py palette $< $@ $(IMG_FLAGS)
$(BUILD_DIR)/%.ia4.png: %.png $(BUILD_DIR)/%.ia4.png: %.png
@mkdir -p $(shell dirname $@) @mkdir -p $(shell dirname $@)
$(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS) $(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS)

2
tools/convert_image.py
View File

@ -84,7 +84,7 @@ class Converter():
for a, b in iter_in_groups(row, 2): for a, b in iter_in_groups(row, 2):
byte = (a << 4) | b byte = (a << 4) | b
f.write(byte.to_bytes(1, byteorder="big")) f.write(byte.to_bytes(1, byteorder="big"))
elif self.mode == "ci8palette" or self.mode == "ci4palette": elif self.mode == "palette":
img.preamble(True) img.preamble(True)
palette = img.palette(alpha="force") palette = img.palette(alpha="force")

2
tools/n64splat

@ -1 +1 @@
Subproject commit bc9b7e9f0ef0afab6a28e4faa7ab0c43cf045d83 Subproject commit 23a4ba2652f929a71e5e6b2ff759ae63304b24aa

36
tools/splat.yaml
View File

@ -213,8 +213,8 @@ segments:
- [0x8e790, "c", "code_8e790_len_2850"] - [0x8e790, "c", "code_8e790_len_2850"]
- [0x90fe0, "bin"] - [0x90fe0, "bin"]
- [0x93CD0, ci4, ui/hammer, 32, 32] - [0x93CD0, ci4, ui/hammer, 32, 32]
- [0x93ED0, ci4palette, ui/hammer] - [0x93ED0, palette, ui/hammer]
- [0x93EF0, ci4palette, ui/hammer.disabled] - [0x93EF0, palette, ui/hammer.disabled]
- [0x93FF0, bin] - [0x93FF0, bin]
- [0x9D658, rgba32, ui/stat_heart, 16, 16] - [0x9D658, rgba32, ui/stat_heart, 16, 16]
- [0x9DA58, bin] - [0x9DA58, bin]
@ -284,7 +284,7 @@ segments:
- [0x10AF70, bin] # TODO - [0x10AF70, bin] # TODO
- [0x1164B8, ci8, peach_letter, 150, 105] - [0x1164B8, ci8, peach_letter, 150, 105]
- [0x11A23E, bin] - [0x11A23E, bin]
- [0x11A240, ci8palette, peach_letter] - [0x11A240, palette, peach_letter]
- [0x11A440, bin] - [0x11A440, bin]
- [0x131340, bin] - [0x131340, bin]
- type: code - type: code
@ -298,26 +298,26 @@ segments:
- [0x1421C0, "c"] - [0x1421C0, "c"]
- [0x1422A0, "bin"] - [0x1422A0, "bin"]
- [0x1443F0, ci8, pause/world_map, 320, 320] - [0x1443F0, ci8, pause/world_map, 320, 320]
- [0x15D3F0, ci8palette, pause/world_map] - [0x15D3F0, palette, pause/world_map]
- [0x15D5F0, ci4, pause/spirits_bg, 128, 110] - [0x15D5F0, ci4, pause/spirits_bg, 128, 110]
- [0x15F170, ci4palette, pause/spirits_bg] - [0x15F170, palette, pause/spirits_bg]
- [0x15F270, bin] - [0x15F270, bin]
- [0x15F970, ci4, pause/banner_hp, 64, 16] - [0x15F970, ci4, pause/banner_hp, 64, 16]
- [0x15FB70, ci4palette, pause/banner_hp] - [0x15FB70, palette, pause/banner_hp]
- [0x15FD70, ci4, pause/banner_fp, 64, 16] - [0x15FD70, ci4, pause/banner_fp, 64, 16]
- [0x15FF70, ci4palette, pause/banner_fp] - [0x15FF70, palette, pause/banner_fp]
- [0x160170, ci4, pause/banner_bp, 64, 16] - [0x160170, ci4, pause/banner_bp, 64, 16]
- [0x160370, ci4palette, pause/banner_bp] - [0x160370, palette, pause/banner_bp]
- [0x160570, ci4, pause/banner_boots, 48, 16] - [0x160570, ci4, pause/banner_boots, 48, 16]
- [0x1606F0, ci4palette, pause/banner_boots] - [0x1606F0, palette, pause/banner_boots]
- [0x1608F0, ci4, pause/banner_hammer, 48, 16] - [0x1608F0, ci4, pause/banner_hammer, 48, 16]
- [0x160A70, ci4palette, pause/banner_hammer] - [0x160A70, palette, pause/banner_hammer]
- [0x160C70, ci4, pause/banner_star_energy, 48, 16] - [0x160C70, ci4, pause/banner_star_energy, 48, 16]
- [0x160DF0, ci4palette, pause/banner_star_energy] - [0x160DF0, palette, pause/banner_star_energy]
- [0x160FF0, ci4, pause/available, 64, 16] - [0x160FF0, ci4, pause/available, 64, 16]
- [0x1611F0, ci4palette, pause/available] - [0x1611F0, palette, pause/available]
- [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16] - [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16]
- [0x1617F0, ci4palette, pause/prompt_check_abilities] - [0x1617F0, palette, pause/prompt_check_abilities]
- [0x1619F0, bin] - [0x1619F0, bin]
- type: code - type: code
start: 0x163400 start: 0x163400
@ -356,16 +356,16 @@ segments:
- [0x2051B0, rgba16, title/logo_is, 256, 122] - [0x2051B0, rgba16, title/logo_is, 256, 122]
- [0x2131B0, rgba16, title/logo_nintendo, 256, 48] - [0x2131B0, rgba16, title/logo_nintendo, 256, 48]
- [0x2191B0, ci8, title/bg_1, 264, 162] - [0x2191B0, ci8, title/bg_1, 264, 162]
- [0x2238C0, ci8palette, title/bg_1] - [0x2238C0, palette, title/bg_1]
- [0x223AC0, ci8, title/bg_2, 264, 162] - [0x223AC0, ci8, title/bg_2, 264, 162]
- [0x22E1D0, ci8palette, title/bg_2] - [0x22E1D0, palette, title/bg_2]
- [0x22E3D0, ci8, title/bg_3, 264, 162] - [0x22E3D0, ci8, title/bg_3, 264, 162]
- [0x238AE0, ci8palette, title/bg_3] - [0x238AE0, palette, title/bg_3]
- [0x238CE0, ci8, title/bg_4, 264, 162] - [0x238CE0, ci8, title/bg_4, 264, 162]
- [0x2433F0, ci8palette, title/bg_4] - [0x2433F0, palette, title/bg_4]
- [0x2435F0, ia8, title/tape, 128, 128] - [0x2435F0, ia8, title/tape, 128, 128]
- [0x2475F0, ci8, title/bowser_silhouette, 128, 128] - [0x2475F0, ci8, title/bowser_silhouette, 128, 128]
- [0x24B5F0, ci8palette, title/bowser_silhouette] - [0x24B5F0, palette, title/bowser_silhouette]
- [0x24B7F0, bin] - [0x24B7F0, bin]
- type: code - type: code
start: 0x3169F0 start: 0x3169F0