From e9c8598855e32d2416307071d53dc3519b1fd22d Mon Sep 17 00:00:00 2001
From: Larry <kholdfuzion@gmail.com>
Date: Sat, 6 May 2017 09:59:16 -0500
Subject: [PATCH] whole thing now builds

Former-commit-id: 3285770bf73d351b2908004b8784d1f45ecc49e7 [formerly f0e368159305fddb4f6aae28a37b4dcc2ab62536]
Former-commit-id: 76a36565527d01b52982e0ed34cadb821874eb7c
---
 disassembly/GE007.rom.asm                      | 3 ++-
 disassembly/boot.asm.REMOVED.git-id            | 2 +-
 disassembly/boot.bin.REMOVED.git-id            | 1 +
 disassembly/rarezip/rarezip.asm                | 2 ++
 disassembly/rarezip/rarezip.bin.REMOVED.git-id | 1 +
 disassembly/rodata/021990.rz.REMOVED.git-id    | 1 +
 disassembly/rodata/rodata.asm                  | 5 +++++
 7 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 disassembly/boot.bin.REMOVED.git-id
 create mode 100644 disassembly/rarezip/rarezip.bin.REMOVED.git-id
 create mode 100644 disassembly/rodata/021990.rz.REMOVED.git-id

diff --git a/disassembly/GE007.rom.asm b/disassembly/GE007.rom.asm
index 319ecc0..5b91b9e 100644
--- a/disassembly/GE007.rom.asm
+++ b/disassembly/GE007.rom.asm
@@ -6,9 +6,10 @@ origin $00000000
 
 include "rom/romheader.asm"
 include "boot.asm"
-include "libultra_rom.asm"
 include "rodata/rodata.asm"
 include "rarezip/rarezip.asm"
 include "bss/bss.asm"
 include "bss/80300000.asm"
 
+insert retailrom_raw, "GoldenEye007.z64", origin()
+
diff --git a/disassembly/boot.asm.REMOVED.git-id b/disassembly/boot.asm.REMOVED.git-id
index cf521d4..a0abfce 100644
--- a/disassembly/boot.asm.REMOVED.git-id
+++ b/disassembly/boot.asm.REMOVED.git-id
@@ -1 +1 @@
-93f6a3080e47f9c3bb8ff570b426b3e1a519b3cc
\ No newline at end of file
+23b41f2cb6edebefff4a2dbde59bce5a9a9516bf
\ No newline at end of file
diff --git a/disassembly/boot.bin.REMOVED.git-id b/disassembly/boot.bin.REMOVED.git-id
new file mode 100644
index 0000000..f2f932d
--- /dev/null
+++ b/disassembly/boot.bin.REMOVED.git-id
@@ -0,0 +1 @@
+8fe43b2810737d05df566884e186a04f875cdcf1
\ No newline at end of file
diff --git a/disassembly/rarezip/rarezip.asm b/disassembly/rarezip/rarezip.asm
index 4bb8932..a213717 100644
--- a/disassembly/rarezip/rarezip.asm
+++ b/disassembly/rarezip/rarezip.asm
@@ -3,3 +3,5 @@ RareZip_vaddr:
 
 base $7020141C
 decompressfile:
+
+insert binaryrarezipcode, "rarezip.bin", (origin() - $033590)
diff --git a/disassembly/rarezip/rarezip.bin.REMOVED.git-id b/disassembly/rarezip/rarezip.bin.REMOVED.git-id
new file mode 100644
index 0000000..25582c3
--- /dev/null
+++ b/disassembly/rarezip/rarezip.bin.REMOVED.git-id
@@ -0,0 +1 @@
+8cb70edcb1b2882f75a6814177d8e5b5a56eecc2
\ No newline at end of file
diff --git a/disassembly/rodata/021990.rz.REMOVED.git-id b/disassembly/rodata/021990.rz.REMOVED.git-id
new file mode 100644
index 0000000..ab28902
--- /dev/null
+++ b/disassembly/rodata/021990.rz.REMOVED.git-id
@@ -0,0 +1 @@
+4506f249c41dba6300ea0debdf3931e80990c229
\ No newline at end of file
diff --git a/disassembly/rodata/rodata.asm b/disassembly/rodata/rodata.asm
index 17fa932..c9fcefd 100644
--- a/disassembly/rodata/rodata.asm
+++ b/disassembly/rodata/rodata.asm
@@ -5,5 +5,10 @@ base $80020D90
 rodata_start:
 //insert rsp.bin, "rsp.bin"
 
+//compressed binary for now
+insert rodata_rz, "021990.rz"
+
 base $8005D2E0
 rodata_end:
+
+