From 01fb7c3ccc69be18e54ac59ebec035e6be6f7add Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Sep 2019 20:45:49 +1000
Subject: [PATCH] Inject globals file into ROM

---
 Makefile     | 2 +-
 tools/inject | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b4a5d853f..7969d1dae 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ testall:
 
 all: setup lang globals
 
-rom: $(B_SETUP_BINZ_FILES)
+rom: $(B_SETUP_BINZ_FILES) $(B_DIR)/Uglobals
 	tools/inject pd.$(ROMID).z64
 
 clean:
diff --git a/tools/inject b/tools/inject
index ac866a0a3..46d78dd8f 100755
--- a/tools/inject
+++ b/tools/inject
@@ -34,7 +34,9 @@ class Injector:
         self.rompart3 = rombuffer[0x001a15c0:0x00ed83a0]
         self.rompart4 = rombuffer[0x01d5ca00:]
 
-        globals = self.rareunzip(rombuffer[0x39850:])
+        fp = open('build/ntsc-final/Uglobals', 'rb')
+        globals = fp.read()
+        fp.close()
 
         self.globaltop = globals[0:0x28080]
         self.globalbot = globals[0x2a000:]