diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2024-05-18 17:49:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 19:49:49 -0300 |
| commit | 80eaf7d2e53fd328ed2e76d39e3d634ae920931f (patch) | |
| tree | 845ec6d23f3731e2d53f83434e81af567a57ae33 /tools | |
| parent | 36ac4066c9d9542ef3e65f260c1fd60a12f12619 (diff) | |
support for EU rev 0, updates to tools, other cleanup (#255)
* srceu
* remove warning
* and some cleanup
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/comptool.py | 5 | ||||
| -rwxr-xr-x | tools/format.py | 3 | ||||
| -rw-r--r-- | tools/requirements-python.txt | 4 | ||||
| m--------- | tools/splat | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/comptool.py b/tools/comptool.py index 4bb3ff2a..cc858e5d 100644 --- a/tools/comptool.py +++ b/tools/comptool.py @@ -36,8 +36,8 @@ file_names_pal = [ "ast_star_wolf", "ast_allies", "ast_corneria", "ast_meteo", "ast_titania", "ast_7_ti_2", "ast_8_ti", "ast_9_ti", "ast_A_ti",
"ast_7_ti_1", "ast_sector_x", "ast_sector_z", "ast_aquas", "ast_area_6", "ast_venom_1", "ast_venom_2", "ast_ve1_boss",
"ast_bolse", "ast_fortuna", "ast_sector_y", "ast_solar", "ast_zoness", "ast_katina", "ast_macbeth", "ast_warp_zone",
- "ast_title", "ast_map", "ast_option", "ast_vs_menu", "ast_text", "ast_unk_1", "ast_unk_2", "ast_unk_3",
- "ast_unk_4", "ast_unk_5", "ast_unk_6", "ast_unk_7", "ast_unk_8", "ast_unk_9", "ast_font_3d", "ast_andross","ast_logo", "ast_ending",
+ "ast_title", "ast_map", "ast_map_en", "ast_map_fr", "ast_map_de", "ast_option", "ast_option_en", "ast_option_fr",
+ "ast_option_de", "ast_vs_menu", "ast_vs_menu_en", "ast_vs_menu_fr", "ast_vs_menu_de", "ast_text", "ast_font_3d", "ast_andross","ast_logo", "ast_ending",
"ast_ending_award_front", "ast_ending_award_back", "ast_ending_expert", "ast_training", "ast_radio_de", "ovl_i1", "ovl_i2", "ovl_i3",
"ovl_i4", "ovl_i5", "ovl_i6", "ovl_menu", "ovl_ending", "ovl_unused", "ast_radio_en", "ast_radio_fr"
]
@@ -63,7 +63,6 @@ def get_version_info(ROM): decomp_inds = decomp_inds_ntsc
version = "LN" if region == "G" else "US"
elif region == "P" or region == "U":
- print("Warning: PAL menu assets are not fully documented.")
file_names = file_names_pal
decomp_inds = decomp_inds_pal
version = "AU" if region == "U" else "EU"
diff --git a/tools/format.py b/tools/format.py index 6a414fad..c7b51218 100755 --- a/tools/format.py +++ b/tools/format.py @@ -186,7 +186,8 @@ def main(): files = args.files extra_files = [] else: - files = glob.glob("src/**/*.c", recursive=True) + files = glob.glob("src*/**/*.c", recursive=True) + files = [x for x in files if "assets" not in x] extra_files = glob.glob("assets/**/*.xml", recursive=True) format_files(files, extra_files, nb_jobs) diff --git a/tools/requirements-python.txt b/tools/requirements-python.txt index 89c031b8..b9e6d519 100644 --- a/tools/requirements-python.txt +++ b/tools/requirements-python.txt @@ -1,5 +1,5 @@ -spimdisasm==1.24.2 -rabbitizer==1.7.0 +spimdisasm==1.25.1 +rabbitizer==1.10.0 PyYAML pylibyaml tqdm diff --git a/tools/splat b/tools/splat -Subproject 6bc689f21dc3597799294942858ae914fadb6da +Subproject 441af8f682454154aae6d593d0938f23c747a1b |