From 84bbd2ae14e47efc57042fa09a785357e786a86a Mon Sep 17 00:00:00 2001
From: Arceveti <arceveti@gmail.com>
Date: Tue, 4 Jan 2022 22:55:19 -0800
Subject: [PATCH 1/2] JP Baserom is no longer required for US build

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index eddd7ea67..bcfd63318 100644
--- a/Makefile
+++ b/Makefile
@@ -325,10 +325,6 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
     ifeq ($(DUMMY),FAIL)
       $(error Failed to extract assets)
     endif
-    DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
-    ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
-    endif
   endif
 
   # Make tools if out of date

From 0789cf118e9504275cfc5d43a6d4b7fa65f6a970 Mon Sep 17 00:00:00 2001
From: Arceveti <arceveti@gmail.com>
Date: Mon, 10 Jan 2022 20:50:37 -0800
Subject: [PATCH 2/2] Only extract assets from JP/EU/SH roms if they exist

---
 Makefile                     | 20 +++++++++++++++++++-
 include/config/config_game.h |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index bcfd63318..e0f8a9928 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,25 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
   ifeq ($(NOEXTRACT),0)
     DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
     ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+      $(error Failed to extract assets from US ROM)
+    endif
+    ifneq (,$(wildcard baserom.jp.z64))
+      DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from JP ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.eu.z64))
+      DUMMY != $(PYTHON) extract_assets.py eu >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from EU ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.sh.z64))
+      DUMMY != $(PYTHON) extract_assets.py sh >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from SH ROM)
+      endif
     endif
   endif
 
diff --git a/include/config/config_game.h b/include/config/config_game.h
index 516e288b5..f08037673 100644
--- a/include/config/config_game.h
+++ b/include/config/config_game.h
@@ -58,7 +58,7 @@
 
 // Include the English characters that were missing from US segment2
 // J, Q, V, X, Z, ¨, !, !!, ?, &, %, ., and the beta key.
-// [MAKE SURE TO ALSO BUILD FROM JP/SH AND EU TO OBTAIN THE ASSETS]
+// [MAKE SURE TO HAVE EU AND JP/SH BASEROMS TO OBTAIN THE ASSETS]
 // If this is disabled, backup assets will be used.
 // #define COMPLETE_EN_US_SEGMENT2