whole thing now builds

Former-commit-id: 3285770bf73d351b2908004b8784d1f45ecc49e7 [formerly f0e368159305fddb4f6aae28a37b4dcc2ab62536] Former-commit-id: 76a36565527d01b52982e0ed34cadb821874eb7c
2017-05-06 09:59:16 -05:00 · 2017-05-06 09:59:16 -05:00 · e9c8598855
parent d52228354d
commit e9c8598855
7 changed files with 13 additions and 2 deletions
--- 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()
+
--- a/disassembly/boot.asm.REMOVED.git-id
+++ b/disassembly/boot.asm.REMOVED.git-id
@ -1 +1 @@
-93f6a3080e47f9c3bb8ff570b426b3e1a519b3cc
+23b41f2cb6edebefff4a2dbde59bce5a9a9516bf
--- a/disassembly/boot.bin.REMOVED.git-id
+++ b/disassembly/boot.bin.REMOVED.git-id
@ -0,0 +1 @@
+8fe43b2810737d05df566884e186a04f875cdcf1
--- 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)
--- a/disassembly/rarezip/rarezip.bin.REMOVED.git-id
+++ b/disassembly/rarezip/rarezip.bin.REMOVED.git-id
@ -0,0 +1 @@
+8cb70edcb1b2882f75a6814177d8e5b5a56eecc2
--- a/disassembly/rodata/021990.rz.REMOVED.git-id
+++ b/disassembly/rodata/021990.rz.REMOVED.git-id
@ -0,0 +1 @@
+4506f249c41dba6300ea0debdf3931e80990c229
--- 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:
+
+