no more need for the rom

Former-commit-id: b3af4fa98df129bb5b11514af4aa000fa3c17525 [formerly d7cb0435c3731a37fb7044535fadc4b9eec63aa0] Former-commit-id: 94756a8c7a08ff6ef5189b506f7878fefa4f5411
2017-05-06 14:32:42 -05:00 · 2017-05-06 14:32:42 -05:00 · ce67cc2a11
parent c8bf8e5cb6
commit ce67cc2a11
47 changed files with 57 additions and 12 deletions
--- a/disassembly/GE007.rom.asm
+++ b/disassembly/GE007.rom.asm
@ -1,6 +1,7 @@
 arch n64.cpu
 endian msb
 output "GE007.n64", create
+fill $00c00000, $FF
 include "lib/N64.INC"
 origin $00000000

@ -11,9 +12,23 @@ include "code/rarezip.asm"
 include "code/tlb_code.asm"
 include "unk/unknown.asm"
 include "ramrom/ramrom.asm"
+include "font/fonts.asm"
+include "m/music.asm"
+include "bg/bg.asm"
+include "chr/chr.asm"
+include "g_view/g_items.asm"
+include "props/props.asm"
+include "bg/Tbg.asm"
+include "brief/brief.asm"
+include "bg/setup.asm"
+include "text/text.asm"

-include "bss/bss.asm"
-include "bss/80300000.asm"
+ob_end:
+insert ob_end.seg, "ob/ob_end.seg", (origin() - $008f7de0)
+
+include "images/images.asm"
+
+include "code/bss.asm"
+include "code/80300000.asm"

-insert retailrom_raw, "GoldenEye007.z64", origin()

--- a/disassembly/GE007.sym.REMOVED.git-id
+++ b/disassembly/GE007.sym.REMOVED.git-id
@ -1 +1 @@
-b1e915d996fec4c302cfa732c4a771f7d7e52e2f
+bc2e8453577ce480fb810ded3b4e2466849e21c5
--- a/disassembly/bg/Tbg.asm.REMOVED.git-id
+++ b/disassembly/bg/Tbg.asm.REMOVED.git-id
@ -0,0 +1 @@
+c0342c6c68303e3869db34dad297b3ad3acc3932
--- a/disassembly/bg/Tbg_arec_all_p_stanZ
+++ b/disassembly/bg/Tbg_arec_all_p_stanZ
--- a/disassembly/bg/bg.asm.REMOVED.git-id
+++ b/disassembly/bg/bg.asm.REMOVED.git-id
@ -0,0 +1 @@
+50974df7a9eef5b88a6ba402d435007ba58f3dd2
--- a/disassembly/bg/setup.asm.REMOVED.git-id
+++ b/disassembly/bg/setup.asm.REMOVED.git-id
@ -0,0 +1 @@
+3b92b5a06b18b4d223ab86b4f14cf90cc11b959a
--- a/disassembly/brief/UbriefarchZ
+++ b/disassembly/brief/UbriefarchZ
--- a/disassembly/brief/UbriefarkZ
+++ b/disassembly/brief/UbriefarkZ
--- a/disassembly/brief/UbriefaztZ
+++ b/disassembly/brief/UbriefaztZ
--- a/disassembly/brief/UbriefcaveZ
+++ b/disassembly/brief/UbriefcaveZ
--- a/disassembly/brief/UbriefcontrolZ
+++ b/disassembly/brief/UbriefcontrolZ
--- a/disassembly/brief/UbriefcradZ
+++ b/disassembly/brief/UbriefcradZ
--- a/disassembly/brief/UbriefcrypZ
+++ b/disassembly/brief/UbriefcrypZ
--- a/disassembly/brief/UbriefdamZ
+++ b/disassembly/brief/UbriefdamZ
--- a/disassembly/brief/UbriefdepoZ
+++ b/disassembly/brief/UbriefdepoZ
--- a/disassembly/brief/UbriefdestZ
+++ b/disassembly/brief/UbriefdestZ
--- a/disassembly/brief/UbriefjunZ
+++ b/disassembly/brief/UbriefjunZ
--- a/disassembly/brief/UbriefpeteZ
+++ b/disassembly/brief/UbriefpeteZ
--- a/disassembly/brief/UbriefrunZ
+++ b/disassembly/brief/UbriefrunZ
--- a/disassembly/brief/UbriefsevbZ
+++ b/disassembly/brief/UbriefsevbZ
--- a/disassembly/brief/UbriefsevbunkerZ
+++ b/disassembly/brief/UbriefsevbunkerZ
--- a/disassembly/brief/UbriefsevxZ
+++ b/disassembly/brief/UbriefsevxZ
--- a/disassembly/brief/UbriefsevxbZ
+++ b/disassembly/brief/UbriefsevxbZ
--- a/disassembly/brief/UbriefsiloZ
+++ b/disassembly/brief/UbriefsiloZ
--- a/disassembly/brief/UbriefstatueZ
+++ b/disassembly/brief/UbriefstatueZ
--- a/disassembly/brief/UbrieftraZ
+++ b/disassembly/brief/UbrieftraZ
--- a/disassembly/brief/brief.asm.REMOVED.git-id
+++ b/disassembly/brief/brief.asm.REMOVED.git-id
@ -0,0 +1 @@
+a51b538ff604bb62ae28a61b1739e1b3c495521e
--- a/disassembly/chr/chr.asm.REMOVED.git-id
+++ b/disassembly/chr/chr.asm.REMOVED.git-id
@ -0,0 +1 @@
+728eab89627d5396e9cd983e4eaf308dd3487480
--- a/disassembly/code/80300000.asm
+++ b/disassembly/code/80300000.asm
--- a/disassembly/code/bss.asm
+++ b/disassembly/code/bss.asm
--- a/disassembly/font/fonts.asm
+++ b/disassembly/font/fonts.asm
@ -0,0 +1,14 @@
+base origin()
+font_rom_start:
+
+//vaddr is unknown
+//base $vaddr
+//font_vaddr:
+
+insert font_table1_controller_small, "first_font_table_controller_small", (origin() - $002E63F0)
+insert font_table2_controller_small, "second_font_table_controller_small", (origin() - $002E6694)
+insert font_table1_controller_large, "first_font_table_controller_large", (origin() - $002E88A0)
+insert font_table2_controller_large, "second_font_table_controller_large", (origin() - $002E8B44)
+
+
+font_rom_end:
--- a/disassembly/g_view/GgoldengunZ.REMOVED.git-id
+++ b/disassembly/g_view/GgoldengunZ.REMOVED.git-id
@ -0,0 +1 @@
+a3d1c27d1b93f5f3562768ae726c0acf45a01474
--- a/disassembly/g_view/g_items.asm.REMOVED.git-id
+++ b/disassembly/g_view/g_items.asm.REMOVED.git-id
@ -0,0 +1 @@
+c70f02d762a71c39ae8fbbd9c4f710a9707563af
--- a/disassembly/images/images.asm
+++ b/disassembly/images/images.asm
@ -0,0 +1,10 @@
+base origin()
+images_rom_start:
+
+//vaddr is unknown
+//base $vaddr
+//images_vaddr:
+
+insert images, "images", (origin() - $008f7df0)
+
+images_rom_end:
--- a/disassembly/m/music.asm.REMOVED.git-id
+++ b/disassembly/m/music.asm.REMOVED.git-id
@ -0,0 +1 @@
+a925b59646af1f1959609294980517fc768679f3
--- a/disassembly/props/props.asm.REMOVED.git-id
+++ b/disassembly/props/props.asm.REMOVED.git-id
@ -0,0 +1 @@
+fa7aa332e1f366b30d6585798ca799c6288a1b59
--- a/disassembly/ramrom/ramrom.asm
+++ b/disassembly/ramrom/ramrom.asm
@ -3,7 +3,7 @@ ramrom_rom_start:

 //vaddr is unknown
 //base $vaddr
-ramrom_start:
+//ramrom_vaddr:

 insert ramrom_Dam_1, "Dam_1", (origin() - $002BF2D0)
 insert ramrom_Dam_2, "Dam_2",  (origin() - $002C44D0)
@ -20,4 +20,4 @@ insert ramrom_Frigate_1, "Frigate_1",  (origin() - $002DD770)
 insert ramrom_Frigate_2, "Frigate_2",  (origin() - $002DF120)
 insert ramrom_Train, "Train",  (origin() - $002E2600)

-ramrom_end:
+ramrom_rom_end:
--- a/disassembly/rodata/021990.rz.REMOVED.git-id
+++ b/disassembly/rodata/021990.rz.REMOVED.git-id
@ -1 +1 @@
-4506f249c41dba6300ea0debdf3931e80990c229
+8cbf680f259288e6802946bdf5b16bca1e78437b
--- a/disassembly/rodata/pad_to_33590
+++ b/disassembly/rodata/pad_to_33590
--- a/disassembly/rodata/rodata.asm
+++ b/disassembly/rodata/rodata.asm
@ -16,4 +16,5 @@ insert rodata_rz, "021990.rz"
 base $8005D2E0
 rodata_end:

+insert padding,"pad_to_33590"

--- a/disassembly/text/LoatJ
+++ b/disassembly/text/LoatJ
--- a/disassembly/text/text.asm.REMOVED.git-id
+++ b/disassembly/text/text.asm.REMOVED.git-id
@ -0,0 +1 @@
+6e674f0a50ba9db472c4a70531ce657f140a8cc5
--- a/out/unk/117880_24EB30.REMOVED.git-id
+++ b/out/unk/117880_24EB30.REMOVED.git-id
@ -1 +0,0 @@
-565dc801a6fc3526360e4ce5675f06417a1d2e07
--- a/out/unk/24EB30_296565.REMOVED.git-id
+++ b/out/unk/24EB30_296565.REMOVED.git-id
@ -1 +0,0 @@
-b5acadeb72800c568ec60093abdd6714d960318b
--- a/out/unk/296565_298587.rz.REMOVED.git-id
+++ b/out/unk/296565_298587.rz.REMOVED.git-id
@ -1 +0,0 @@
-81dc1120bd7f215359fd65a7ea6cc0eb2a2459fe
--- a/out/unk/298587_2bf2d0.REMOVED.git-id
+++ b/out/unk/298587_2bf2d0.REMOVED.git-id
@ -1 +0,0 @@
-64ceb0175981d09dfe8df12b672d63c62280380b
--- a/out/unk/FF_to_eof.REMOVED.git-id
+++ b/out/unk/FF_to_eof.REMOVED.git-id
@ -1 +0,0 @@
-0a59782186349bf0b2f92de096549012b66c82f4