From 6140b2ec8f06e37ce29385096a4425b2a7207736 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Sun, 30 Mar 2025 17:29:59 +0100 Subject: NTSC Support (N64) (#4198) * copy n64 pal 10 doing this so i can check diffs i make * transfer german->jp icon item * overlays, message data, icon item jpn, audio, code todo: title_static, gameplay keep * add kanji and fix title cards * title static * spell folder correctly * boss title cards, do action, icon item, item name, map name * headers for jpn stuff * gameplay_keep * Scenes, audio, jp text extraction, rom support, overlay fixes, sheik & darunia todo: test & disable darunia fix cvar for ntsc * msgptr init fix * icon item offsets * comment out title cards until zapd can fix itself (we extract these in a different file anyway) * compile and font implemented to get past title screen * file select * message, kaleido and everything else but rando * uintptr_t * rando and custom messages working! * ntsc-j 1.0 support * n64 logo? * copy ntsc 10 to 11 * ntsc 11 extraction * change title version names * copy ntsc 11 to 12 * ntsc 12 extraction * clean up some todos * re checkout submodules post merge * fix US filename * support cross-version filenames * add new versions to non-mq list * use correct message table init * Fix ntsc nes message table overriding pal nes message table * actual fix, allows extraction * fix file name using wrong font of file being hovered over * Fix barinade crash * re-add pal * better jabu fix and revert LUS * fix gerudo title cards * better better owl select * more owl fixes * build * fix some name decode issues * Switch Language Mid Text * Fix PAL displaying for JP filenames * Fix AskToEquip Crash * Disable Credits Timing Fix on NTSC * Fix JP Text positioning * basic language switching (BIG todo: file select, title screen) * Title Screen Hopefully working * add ntsc to linux appimage stuff, TODO: add .v64/.n64 support * Update OTRExporter * Fix pause to decide offset * Fix bomb item name crash * fix fire arrows and PoH * builds * update asset changes and fix menu language changing * fix name decode * Fix crashes and add rando/boss rush select stuff * Revive debug feature by setting language cvar too * Fix ocarina text speed softlock, and update jp text speed changes * Merge remote-tracking branch 'upstream/develop' into NTSC * Fix options menu and let pal use japanese fully * Resolve some suggestions * match up gTextSpeed changes to english (still broken!) * Fix text speed crash * Set default filename language on save init funcs * bump otrexporter * Display same correct info for n64 ntsc-j and ntsc-u * quicktext more closely aligned with decomp * linux appimage v64/n64 checksums * bump zapd * Credits Fix Tooltip Adjusted * update supported hashes json * update shasums to include JP n64 --- scripts/linux/appimage/soh.sh.in | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'scripts/linux') diff --git a/scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh.in index 71121a5ff..1d148cdfc 100644 --- a/scripts/linux/appimage/soh.sh.in +++ b/scripts/linux/appimage/soh.sh.in @@ -92,6 +92,42 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do 166c02770d67fcc3954c443eb400a6a3573d3fc0) # n64 ROMHASH=517bd9714c73cb96c21e7c2ef640d7b55186102f ;; + 79a4f053d34018e59279e6d4b83c7daccd985c87) # v64 + ROMHASH=ad69c91157f6705e8ab06c79fe08aad47bb57ba7 + ;; + 82fafee9c6ac7946739282958364ce606077ac65) # n64 + ROMHASH=ad69c91157f6705e8ab06c79fe08aad47bb57ba7 + ;; + 18cd0eb65914a21d8fa08dfe71c29d865e9d728a) # v64 + ROMHASH=d3ecb253776cd847a5aa63d859d8c89a2f37b364 + ;; + 07940d5609e04b7caac63570731e01189129212e) # n64 + ROMHASH=d3ecb253776cd847a5aa63d859d8c89a2f37b364 + ;; + 3ac86253e0c0d55486d212e647350c1527b9c92d) # v64 + ROMHASH=41b3bdc48d98c48529219919015a1af22f5057c2 + ;; + 70bf30a9980026e615a1ae8d2735a773cf9fcc94) # n64 + ROMHASH=41b3bdc48d98c48529219919015a1af22f5057c2 + ;; + f9e2b6840b9103e9707ea390089a7b6943592a98) # v64 + ROMHASH=c892bbda3993e66bd0d56a10ecd30b1ee612210f + ;; + 2fae1601aa7ae8d3e03ba3f4dcdfca3a36002ac5) # n64 + ROMHASH=c892bbda3993e66bd0d56a10ecd30b1ee612210f + ;; + 1181034d5f9533f53ebe8e1c781badbee115f5aa) # v64 + ROMHASH=dbfc81f655187dc6fefd93fa6798face770d579d + ;; + 07477067943abe8d0c50285eb4a6cb9ece99e79b) # n64 + ROMHASH=dbfc81f655187dc6fefd93fa6798face770d579d + ;; + 2d8fb7140a9c5d11ce614561e5a36ffef0c17540) # v64 + ROMHASH=fa5f5942b27480d60243c2d52c0e93e26b9e6b86 + ;; + d90bbe422ac728ac54ac6a2c9fec942f7ff04df9) # n64 + ROMHASH=fa5f5942b27480d60243c2d52c0e93e26b9e6b86 + ;; esac case "$ROMHASH" in @@ -125,6 +161,30 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do continue fi ;; + ad69c91157f6705e8ab06c79fe08aad47bb57ba7|c892bbda3993e66bd0d56a10ecd30b1ee612210f) + if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then + ROM=N64_NTSC_10 + OTRNAME="oot.otr" + else + continue + fi + ;; + d3ecb253776cd847a5aa63d859d8c89a2f37b364|dbfc81f655187dc6fefd93fa6798face770d579d) + if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then + ROM=N64_NTSC_11 + OTRNAME="oot.otr" + else + continue + fi + ;; + 41b3bdc48d98c48529219919015a1af22f5057c2|fa5f5942b27480d60243c2d52c0e93e26b9e6b86) + if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then + ROM=N64_NTSC_12 + OTRNAME="oot.otr" + else + continue + fi + ;; f46239439f59a2a594ef83cf68ef65043b1bffe2) if [[ ! -e "$SHIP_HOME"/oot-mq.otr ]]; then ROM=GC_MQ_PAL_F -- cgit v1.2.3