Add in extended regions.

NTSC-K not working.
luckytyphlosion · Sep 24, 2022 · 39f77f6 · 39f77f6
1 parent 1757bed
commit 39f77f6
Show file tree

Hide file tree

Showing 7 changed files with 249 additions and 0 deletions.
diff --git a/data/RMCE01_custom_top_10_gecko_codes_template.ini b/data/RMCE01_custom_top_10_gecko_codes_template.ini
@@ -57,9 +57,56 @@ DE000000 90009380
 62000000 00000001
 E0000000 80008000
 
+$Load files from NAND [_tZ]
+* https://discord.com/channels/214574342137315328/543944508295872512/926997372821729290
+06005000 0000000A
+2F524D43 5830312F
+00000000 00000000
+C2222638 00000027
+9421FFA0 7C0802A6
+90010064 BFA1004C
+3961002C 7C6BE5AA
+48000021 80012858
+8016ADBC 8016AF3C
+80229490 8016B15C
+8016B2E4 800126F0
+7FE802A6 7C651B78
+3C608000 38635007
+7CA42B78 38A00064
+38000000 98030001
+819F0018 7D8903A6
+4E800421 3C608000
+38635000 38800001
+819F0004 7D8903A6
+4E800421 2C030000
+4FC00382 419E0084
+7C7E1B78 3BA1001F
+57BD0034 7FC3F378
+7FA4EB78 819F0008
+7D8903A6 4E800421
+83BD0000 80610044
+2C030000 41820008
+93A30000 7FA3EB78
+38800020 80A10034
+819F000C 7D8903A6
+4E800421 7FA5EB78
+7C7D1B78 7FC3F378
+7FA4EB78 819F0010
+7D8903A6 4E800421
+7FC3F378 819F0014
+7D8903A6 4E800421
+4FDEF182 7FA3EB78
+39610030 7C8BC4AA
+BBA1004C 80010064
+38210060 7C0803A6
+419E0008 4E800020
+806BFFFC 9421FF00
+60000000 60000000
+
 [Gecko_Enabled]
 $Directly Transition From Top 10 Into Watch Replay Screen (Ghost Type PB)
 $Skip to Rankings and Select Top 10 by Default
 $Msg Editor
 $Custom Top 10
 $Ultimate License Unlocker (0 stars)
+$Load files from NAND
diff --git a/data/RMCJ01_custom_top_10_gecko_codes_template.ini b/data/RMCJ01_custom_top_10_gecko_codes_template.ini
@@ -57,9 +57,56 @@ DE000000 90009380
 62000000 00000001
 E0000000 80008000
 
+$Load files from NAND [_tZ]
+* https://discord.com/channels/214574342137315328/543944508295872512/926997372821729290
+06005000 0000000A
+2F524D43 5830312F
+00000000 00000000
+C22225F8 00000027
+9421FFA0 7C0802A6
+90010064 BFA1004C
+3961002C 7C6BE5AA
+48000021 800132DC
+8016AD7C 8016AEFC
+80229734 8016B11C
+8016B2A4 80013174
+7FE802A6 7C651B78
+3C608000 38635007
+7CA42B78 38A00064
+38000000 98030001
+819F0018 7D8903A6
+4E800421 3C608000
+38635000 38800001
+819F0004 7D8903A6
+4E800421 2C030000
+4FC00382 419E0084
+7C7E1B78 3BA1001F
+57BD0034 7FC3F378
+7FA4EB78 819F0008
+7D8903A6 4E800421
+83BD0000 80610044
+2C030000 41820008
+93A30000 7FA3EB78
+38800020 80A10034
+819F000C 7D8903A6
+4E800421 7FA5EB78
+7C7D1B78 7FC3F378
+7FA4EB78 819F0010
+7D8903A6 4E800421
+7FC3F378 819F0014
+7D8903A6 4E800421
+4FDEF182 7FA3EB78
+39610030 7C8BC4AA
+BBA1004C 80010064
+38210060 7C0803A6
+419E0008 4E800020
+806BFFFC 9421FF00
+60000000 60000000
+
 [Gecko_Enabled]
 $Directly Transition From Top 10 Into Watch Replay Screen (Ghost Type PB)
 $Skip to Rankings and Select Top 10 by Default
 $Msg Editor
 $Custom Top 10
 $Ultimate License Unlocker (0 stars)
+$Load files from NAND
diff --git a/data/RMCK01_custom_top_10_gecko_codes_template.ini b/data/RMCK01_custom_top_10_gecko_codes_template.ini
@@ -57,9 +57,56 @@ DE000000 90009380
 62000000 00000001
 E0000000 80008000
 
+$Load files from NAND [_tZ]
+* https://discord.com/channels/657006723412000799/657006723412000802/1022575693466435694
+06005000 0000000A
+2F524D43 5830312F
+00000000 00000000
+C2222A4C 00000027
+9421FFA0 7C0802A6
+90010064 BFA1004C
+3961002C 7C6BE5AA
+48000021 80013420
+8016AEF8 8016B078
+80229B88 8016B298
+8016B420 800132B8
+7FE802A6 7C651B78
+3C608000 38635007
+7CA42B78 38A00064
+38000000 98030001
+819F0018 7D8903A6
+4E800421 3C608000
+38635000 38800001
+819F0004 7D8903A6
+4E800421 2C030000
+4FC00382 419E0084
+7C7E1B78 3BA1001F
+57BD0034 7FC3F378
+7FA4EB78 819F0008
+7D8903A6 4E800421
+83BD0000 80610044
+2C030000 41820008
+93A30000 7FA3EB78
+38800020 80A10034
+819F000C 7D8903A6
+4E800421 7FA5EB78
+7C7D1B78 7FC3F378
+7FA4EB78 819F0010
+7D8903A6 4E800421
+7FC3F378 819F0014
+7D8903A6 4E800421
+4FDEF182 7FA3EB78
+39610030 7C8BC4AA
+BBA1004C 80010064
+38210060 7C0803A6
+419E0008 4E800020
+806BFFFC 9421FF00
+60000000 60000000
+
 [Gecko_Enabled]
 $Directly Transition From Top 10 Into Watch Replay Screen (Ghost Type PB)
 $Skip to Rankings and Select Top 10 by Default
 $Msg Editor
 $Custom Top 10
 $Ultimate License Unlocker (0 stars)
+$Load files from NAND
diff --git a/data/RMCP01_custom_top_10_gecko_codes_template.ini b/data/RMCP01_custom_top_10_gecko_codes_template.ini
@@ -57,9 +57,56 @@ DE000000 90009380
 62000000 00000001
 E0000000 80008000
 
+$Load files from NAND [_tZ]
+* https://discord.com/channels/214574342137315328/543944508295872512/926997372821729290
+06005000 0000000A
+2F524D43 5830312F
+00000000 00000000
+C22226D8 00000027
+9421FFA0 7C0802A6
+90010064 BFA1004C
+3961002C 7C6BE5AA
+48000021 800133B8
+8016AE5C 8016AFDC
+80229814 8016B1FC
+8016B384 80013250
+7FE802A6 7C651B78
+3C608000 38635007
+7CA42B78 38A00064
+38000000 98030001
+819F0018 7D8903A6
+4E800421 3C608000
+38635000 38800001
+819F0004 7D8903A6
+4E800421 2C030000
+4FC00382 419E0084
+7C7E1B78 3BA1001F
+57BD0034 7FC3F378
+7FA4EB78 819F0008
+7D8903A6 4E800421
+83BD0000 80610044
+2C030000 41820008
+93A30000 7FA3EB78
+38800020 80A10034
+819F000C 7D8903A6
+4E800421 7FA5EB78
+7C7D1B78 7FC3F378
+7FA4EB78 819F0010
+7D8903A6 4E800421
+7FC3F378 819F0014
+7D8903A6 4E800421
+4FDEF182 7FA3EB78
+39610030 7C8BC4AA
+BBA1004C 80010064
+38210060 7C0803A6
+419E0008 4E800020
+806BFFFC 9421FF00
+60000000 60000000
+
 [Gecko_Enabled]
 $Directly Transition From Top 10 Into Watch Replay Screen (Ghost Type PB)
 $Skip to Rankings and Select Top 10 by Default
 $Msg Editor
 $Custom Top 10
 $Ultimate License Unlocker (0 stars)
+$Load files from NAND
diff --git a/mkw_filesys.py b/mkw_filesys.py
@@ -52,6 +52,33 @@ def add_fancy_km_h_race_szs_if_necessary(speedometer, region):
     else:
         dolphin_nand_race_szs_filepath.unlink(missing_ok=True)
 
+extended_region_src_files_by_region = {
+    "PAL": (
+        "Channel.szs", "MenuSingle.szs"
+    ),
+    "NTSC-U": (
+        "Channel.szs", "MenuSingle.szs"
+    ),
+    "NTSC-J": (
+        "Channel.szs", "MenuSingle.szs"
+    ),
+    "NTSC-K": (
+        "Channel_R.szs", "MenuSingle_R.szs"
+    )
+}
+
+def add_extended_region_files(region):
+    dolphin_nand_scene_ui_dirpath = pathlib.Path("dolphin/User/Wii/RMCX01/Scene/UI")
+    dolphin_nand_scene_ui_dirpath.mkdir(parents=True, exist_ok=True)
+
+    extended_region_src_files = extended_region_src_files_by_region[region.name]
+    for extended_region_src_file in extended_region_src_files:
+        extended_region_src_filepath = pathlib.Path(f"data/extended_regions/{extended_region_src_file}")
+        extended_region_dest_filepath = pathlib.Path(f"dolphin/User/Wii/RMCX01/Scene/UI/{extended_region_src_file}")
+
+        if not extended_region_dest_filepath.is_file():
+            shutil.copy(extended_region_src_filepath, extended_region_dest_filepath)
+
 hq_textures_src_filenames = (
     "data/tex1_64x64_8b7aa8aaa750b196_5.png",
     "data/tex1_64x64_a23e5f789681e0b3_5.png",

diff --git a/record_ghost.py b/record_ghost.py
@@ -140,6 +140,8 @@ def record_ghost(rkg_file_main, output_video_filename, mkw_iso, rkg_file_compari
 
     checkpoint = read_checkpoint(checkpoint_filename)
 
+    mkw_filesys.add_extended_region_files(mkw_iso.region)
+
     if timeline_settings.type in (TIMELINE_FROM_TOP_10_LEADERBOARD, TIMELINE_FROM_MK_CHANNEL_GHOST_SCREEN) and checkpoint_not_passed(checkpoint, CHECKPOINT_DUMPING_TOP_10):
         rkg, rkg_comparison = import_ghost_to_save.import_ghost_to_save(
             f"data/{mkw_iso.region.title_id}/rksys.dat", rkg_file_main,

diff --git a/sample_ymls/test_extended_regions.yml b/sample_ymls/test_extended_regions.yml
@@ -0,0 +1,32 @@
+unbuffered-output: true
+iso-filename: "../../RMCE 01/RMCK01.wbfs"
+output-video-filename: test_extended_regions_out.mp4
+track-name: DS Airship Fortress
+input-display: gcn
+hq-textures: true
+
+timeline: top10
+top-10-chadsoft: "https://www.chadsoft.co.uk/time-trials/leaderboard/0C/18CD017684B99463C70D1EAC9BD39F656B6ADEDA/05.html"
+top-10-location: Slovenia
+top-10-title: "200cc DS Airship Fortress (Glitch) Top 10"
+mk-channel-ghost-description: "ロックマンエグ훈민정음"
+
+encode-type: crf
+video-codec: libx264
+audio-codec: libopus
+crf-value: 15
+youtube-settings: true
+keep-window: true
+chadsoft-read-cache: true
+chadsoft-write-cache: true
+encode-only: false
+input-display-dont-create: false
+dolphin-resolution: 480p
+h26x-preset: veryfast
+game-volume: 1
+music-volume: 1
+output-width: null
+
+speedometer: standard
+speedometer-metric: xz
+music-filename: bgm