use bass to assemble data sections for now

all LnameE text is added Former-commit-id: ff90f89bd019d5d0f6f25b4f0fdd8bc76ed9c617 [formerly 0beac7d6def51c5376cb603d3f46495973761ef5] [formerly 37dbae7ea9f5723857742917092eb38fe746b318 [formerly 58fbc0dfb26a9e87d2cc8645dedd0de19d1ab65d]] Former-commit-id: 50f8ef7cbcbd3c7cdafca6a0293d05187686f2ed [formerly ab3abd4cfea63f38f53943b660234df45db1ff58] Former-commit-id: ad20ec5d86ca3a2dc746df6cc500d5b07dbb9ca4
2017-08-15 16:39:51 -05:00 · 2017-08-15 16:39:51 -05:00 · 3812f3b8da
parent 127b955632
commit 3812f3b8da
96 changed files with 328 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 *.z64
 build/*
 *.s~
+*.rz
--- a/Makefile.REMOVED.git-id
+++ b/Makefile.REMOVED.git-id
@ -1 +1 @@
-a6fb803af188931fb99ebefe9a720b8ec917e13c
+8d71f11770202fe889e79c0246ef557b3174108a
--- a/Makefile.data
+++ b/Makefile.data
@ -1,4 +0,0 @@
-TARGET = ge007.u
-LD_SCRIPT = $(TARGET).ld
-OBSEG_DIR = obseg
-
--- a/Makefile.data.REMOVED.git-id
+++ b/Makefile.data.REMOVED.git-id
@ -0,0 +1 @@
+1ab24bb2966f8e4312ac80fa66ff2d5427e67a98
--- a/obseg/BASS.INC
+++ b/obseg/BASS.INC
@ -0,0 +1,5 @@
+macro align(size) { // Align Byte Amount
+  while (pc() % {size}) {
+    db 0
+  }
+}
--- a/obseg/ob_seg.s.REMOVED.git-id
+++ b/obseg/ob_seg.s.REMOVED.git-id
@ -1 +1 @@
-948719a3113b23287108dd20116ea649a52ae3fe
+2d2bc148715585778e77863a996f5f3e9a620020
--- a/obseg/text/LameE
+++ b/obseg/text/LameE
--- a/obseg/text/LameE.asm
+++ b/obseg/text/LameE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LameE.bin", create
+
+base $00000000
+seg_LameE_start:
+seg_LameE_header_start:
+
+ptr_seg_LameE_start:
+ dw seg_LameE_start
+
+seg_LameE_header_end:
+seg_LameE_strings_start:
+
+seg_LameE_strings_end:
+seg_LameE_end:
+align(32)
--- a/obseg/text/LarchE.REMOVED.git-id
+++ b/obseg/text/LarchE.REMOVED.git-id
@ -1 +0,0 @@
-1d38f297cbca42ee050ed5b36d47aeed5707aedb
--- a/obseg/text/LarchE.asm.REMOVED.git-id
+++ b/obseg/text/LarchE.asm.REMOVED.git-id
@ -0,0 +1 @@
+a854d63d7e41db34efba117953c238f58015d309
--- a/obseg/text/LarecE.REMOVED.git-id
+++ b/obseg/text/LarecE.REMOVED.git-id
@ -1 +0,0 @@
-f37097d1869d001ff23f314f6a31cd0972570499
--- a/obseg/text/LarecE.asm.REMOVED.git-id
+++ b/obseg/text/LarecE.asm.REMOVED.git-id
@ -0,0 +1 @@
+d94dea9d29d8029cc74470ab3272c6049c7af79d
--- a/obseg/text/LarkE.REMOVED.git-id
+++ b/obseg/text/LarkE.REMOVED.git-id
@ -1 +0,0 @@
-1fb95cf731d808d2da30cdbe48f3effedbdde1af
--- a/obseg/text/LarkE.asm.REMOVED.git-id
+++ b/obseg/text/LarkE.asm.REMOVED.git-id
@ -0,0 +1 @@
+9663bca0d6d900c09f75483ab2a4fc3e884f8e47
--- a/obseg/text/LashE
+++ b/obseg/text/LashE
--- a/obseg/text/LashE.asm
+++ b/obseg/text/LashE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LashE.bin", create
+
+base $00000000
+seg_LashE_start:
+seg_LashE_header_start:
+
+ptr_seg_LashE_start:
+ dw seg_LashE_start
+
+seg_LashE_header_end:
+seg_LashE_strings_start:
+
+seg_LashE_strings_end:
+seg_LashE_end:
+align(32)
--- a/obseg/text/LaztE.REMOVED.git-id
+++ b/obseg/text/LaztE.REMOVED.git-id
@ -1 +0,0 @@
-0c35ea45707fba73fa3d260ce19e152a224e9cd0
--- a/obseg/text/LaztE.asm.REMOVED.git-id
+++ b/obseg/text/LaztE.asm.REMOVED.git-id
@ -0,0 +1 @@
+0630e26bed7837f8ac5ea4678a2988ba54e038bd
--- a/obseg/text/LcatE
+++ b/obseg/text/LcatE
--- a/obseg/text/LcatE.asm
+++ b/obseg/text/LcatE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LcatE.bin", create
+
+base $00000000
+seg_LcatE_start:
+seg_LcatE_header_start:
+
+ptr_seg_LcatE_start:
+ dw seg_LcatE_start
+
+seg_LcatE_header_end:
+seg_LcatE_strings_start:
+
+seg_LcatE_strings_end:
+seg_LcatE_end:
+align(32)
--- a/obseg/text/LcaveE
+++ b/obseg/text/LcaveE
--- a/obseg/text/LcaveE.asm.REMOVED.git-id
+++ b/obseg/text/LcaveE.asm.REMOVED.git-id
@ -0,0 +1 @@
+9170abc0969216a2781f41cd919546c61529781b
--- a/obseg/text/LcradE.REMOVED.git-id
+++ b/obseg/text/LcradE.REMOVED.git-id
@ -1 +0,0 @@
-1feedf2228d194e3ce8c1cd5e992f88c24b2c0d2
--- a/obseg/text/LcradE.asm.REMOVED.git-id
+++ b/obseg/text/LcradE.asm.REMOVED.git-id
@ -0,0 +1 @@
+03df697f631924a4b8f36bbcde3ac053f84084ea
--- a/obseg/text/LcrypE
+++ b/obseg/text/LcrypE
--- a/obseg/text/LcrypE.asm.REMOVED.git-id
+++ b/obseg/text/LcrypE.asm.REMOVED.git-id
@ -0,0 +1 @@
+7a2653b272b7ec946a622d55351a8385da872b9d
--- a/obseg/text/LdamE.REMOVED.git-id
+++ b/obseg/text/LdamE.REMOVED.git-id
@ -1 +0,0 @@
-96a309cab15b88d4098ec9d18ba944b0a6a7bab3
--- a/obseg/text/LdamE.asm.REMOVED.git-id
+++ b/obseg/text/LdamE.asm.REMOVED.git-id
@ -0,0 +1 @@
+38f0a0f3542769d0887e10788d23e2c651f0b518
--- a/obseg/text/LdepoE
+++ b/obseg/text/LdepoE
--- a/obseg/text/LdepoE.asm.REMOVED.git-id
+++ b/obseg/text/LdepoE.asm.REMOVED.git-id
@ -0,0 +1 @@
+de7270dfc1b05bb95cad652a16013ad2ca2f2433
--- a/obseg/text/LdestE.REMOVED.git-id
+++ b/obseg/text/LdestE.REMOVED.git-id
@ -1 +0,0 @@
-88a0ec1a75445d6a2e15e97722dce414058af660
--- a/obseg/text/LdestE.asm.REMOVED.git-id
+++ b/obseg/text/LdestE.asm.REMOVED.git-id
@ -0,0 +1 @@
+293699415deed16b4a4c979d9c051e013ea176b0
--- a/obseg/text/LdishE
+++ b/obseg/text/LdishE
--- a/obseg/text/LdishE.asm
+++ b/obseg/text/LdishE.asm
@ -0,0 +1,19 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LdishE.bin", create
+
+base $00000000
+seg_LdishE_start:
+seg_LdishE_header_start:
+
+ptr_seg_LdishE_start:
+ dw seg_LdishE_start
+
+seg_LdishE_header_end:
+seg_LdishE_strings_start:
+
+seg_LdishE_strings_end:
+seg_LdishE_end:
+align(32)
+
--- a/obseg/text/LearE
+++ b/obseg/text/LearE
--- a/obseg/text/LearE.asm
+++ b/obseg/text/LearE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LearE.bin", create
+
+base $00000000
+seg_LearE_start:
+seg_LearE_header_start:
+
+ptr_seg_LearE_start:
+ dw seg_LearE_start
+
+seg_LearE_header_end:
+seg_LearE_strings_start:
+
+seg_LearE_strings_end:
+seg_LearE_end:
+align(32)
--- a/obseg/text/LeldE
+++ b/obseg/text/LeldE
--- a/obseg/text/LeldE.asm
+++ b/obseg/text/LeldE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LeldE.bin", create
+
+base $00000000
+seg_LeldE_start:
+seg_LeldE_header_start:
+
+ptr_seg_LeldE_start:
+ dw seg_LeldE_start
+
+seg_LeldE_header_end:
+seg_LeldE_strings_start:
+
+seg_LeldE_strings_end:
+seg_LeldE_end:
+align(32)
--- a/obseg/text/LgunE.REMOVED.git-id
+++ b/obseg/text/LgunE.REMOVED.git-id
@ -1 +0,0 @@
-890c5ff02a8c43bfcb60afffaf6f0684b929aaa2
--- a/obseg/text/LgunE.asm.REMOVED.git-id
+++ b/obseg/text/LgunE.asm.REMOVED.git-id
@ -0,0 +1 @@
+173ccc9d55a3b33bf329a3b977b41dba93d1b7cd
--- a/obseg/text/LimpE
+++ b/obseg/text/LimpE
--- a/obseg/text/LimpE.asm
+++ b/obseg/text/LimpE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LimpE.bin", create
+
+base $00000000
+seg_LimpE_start:
+seg_LimpE_header_start:
+
+ptr_seg_LimpE_start:
+ dw seg_LimpE_start
+
+seg_LimpE_header_end:
+seg_LimpE_strings_start:
+
+seg_LimpE_strings_end:
+seg_LimpE_end:
+align(32)
--- a/obseg/text/LjunE.REMOVED.git-id
+++ b/obseg/text/LjunE.REMOVED.git-id
@ -1 +0,0 @@
-da31cb10aa587da2645316e645816a15d2bac26d
--- a/obseg/text/LjunE.asm.REMOVED.git-id
+++ b/obseg/text/LjunE.asm.REMOVED.git-id
@ -0,0 +1 @@
+ca842af4eb5143708298339a91fe92d766eeb624
--- a/obseg/text/LleeE
+++ b/obseg/text/LleeE
--- a/obseg/text/LleeE.asm
+++ b/obseg/text/LleeE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LleeE.bin", create
+
+base $00000000
+seg_LleeE_start:
+seg_LleeE_header_start:
+
+ptr_seg_LleeE_start:
+ dw seg_LleeE_start
+
+seg_LleeE_header_end:
+seg_LleeE_strings_start:
+
+seg_LleeE_strings_end:
+seg_LleeE_end:
+align(32)
--- a/obseg/text/LlenE.REMOVED.git-id
+++ b/obseg/text/LlenE.REMOVED.git-id
@ -1 +0,0 @@
-7e1d657b76ec7b3a486654a540b649b1ac63c873
--- a/obseg/text/LlenE.asm.REMOVED.git-id
+++ b/obseg/text/LlenE.asm.REMOVED.git-id
@ -0,0 +1 @@
+0522b05791a503bde7cc872e3429d88c46dab87f
--- a/obseg/text/LlipE
+++ b/obseg/text/LlipE
--- a/obseg/text/LlipE.asm
+++ b/obseg/text/LlipE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LlipE.bin", create
+
+base $00000000
+seg_LlipE_start:
+seg_LlipE_header_start:
+
+ptr_seg_LlipE_start:
+ dw seg_LlipE_start
+
+seg_LlipE_header_end:
+seg_LlipE_strings_start:
+
+seg_LlipE_strings_end:
+seg_LlipE_end:
+align(32)
--- a/obseg/text/LlueE
+++ b/obseg/text/LlueE
--- a/obseg/text/LlueE.asm
+++ b/obseg/text/LlueE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LlueE.bin", create
+
+base $00000000
+seg_LlueE_start:
+seg_LlueE_header_start:
+
+ptr_seg_LlueE_start:
+ dw seg_LlueE_start
+
+seg_LlueE_header_end:
+seg_LlueE_strings_start:
+
+seg_LlueE_strings_end:
+seg_LlueE_end:
+align(32)
--- a/obseg/text/LmiscE
+++ b/obseg/text/LmiscE
--- a/obseg/text/LmiscE.asm.REMOVED.git-id
+++ b/obseg/text/LmiscE.asm.REMOVED.git-id
@ -0,0 +1 @@
+8d3f806d691da90ab285812173e6ffc2d62ca495
--- a/obseg/text/LmpmenuE
+++ b/obseg/text/LmpmenuE
--- a/obseg/text/LmpmenuE.asm.REMOVED.git-id
+++ b/obseg/text/LmpmenuE.asm.REMOVED.git-id
@ -0,0 +1 @@
+8631661462f6248042a2db026cf4dfd8afa14d4b
--- a/obseg/text/LmpweaponsE
+++ b/obseg/text/LmpweaponsE
--- a/obseg/text/LmpweaponsE.asm.REMOVED.git-id
+++ b/obseg/text/LmpweaponsE.asm.REMOVED.git-id
@ -0,0 +1 @@
+0ee1a109672595765c796679ecd3d283f66673eb
--- a/obseg/text/LoatE
+++ b/obseg/text/LoatE
--- a/obseg/text/LoatE.asm
+++ b/obseg/text/LoatE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LoatE.bin", create
+
+base $00000000
+seg_LoatE_start:
+seg_LoatE_header_start:
+
+ptr_seg_LoatE_start:
+ dw seg_LoatE_start
+
+seg_LoatE_header_end:
+seg_LoatE_strings_start:
+
+seg_LoatE_strings_end:
+seg_LoatE_end:
+align(32)
--- a/obseg/text/LoptionsE
+++ b/obseg/text/LoptionsE
--- a/obseg/text/LoptionsE.asm.REMOVED.git-id
+++ b/obseg/text/LoptionsE.asm.REMOVED.git-id
@ -0,0 +1 @@
+1ab1741bff6f0ec3e223b8877a7854a1d5d519dd
--- a/obseg/text/LpamE
+++ b/obseg/text/LpamE
--- a/obseg/text/LpamE.asm
+++ b/obseg/text/LpamE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LpamE.bin", create
+
+base $00000000
+seg_LpamE_start:
+seg_LpamE_header_start:
+
+ptr_seg_LpamE_start:
+ dw seg_LpamE_start
+
+seg_LpamE_header_end:
+seg_LpamE_strings_start:
+
+seg_LpamE_strings_end:
+seg_LpamE_end:
+align(32)
--- a/obseg/text/LpeteE.REMOVED.git-id
+++ b/obseg/text/LpeteE.REMOVED.git-id
@ -1 +0,0 @@
-d511b295e578c5bcbf2d5bbb7decf44d928bf1d1
--- a/obseg/text/LpeteE.asm.REMOVED.git-id
+++ b/obseg/text/LpeteE.asm.REMOVED.git-id
@ -0,0 +1 @@
+c3b2f36629ca45842e9887837f95b7fdc33aed7c
--- a/obseg/text/LpropobjE
+++ b/obseg/text/LpropobjE
--- a/obseg/text/LpropobjE.asm.REMOVED.git-id
+++ b/obseg/text/LpropobjE.asm.REMOVED.git-id
@ -0,0 +1 @@
+d1d62aa0d5708f10abcea24172afdf26db683138
--- a/obseg/text/LrefE
+++ b/obseg/text/LrefE
--- a/obseg/text/LrefE.asm
+++ b/obseg/text/LrefE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LrefE.bin", create
+
+base $00000000
+seg_LrefE_start:
+seg_LrefE_header_start:
+
+ptr_seg_LrefE_start:
+ dw seg_LrefE_start
+
+seg_LrefE_header_end:
+seg_LrefE_strings_start:
+
+seg_LrefE_strings_end:
+seg_LrefE_end:
+align(32)
--- a/obseg/text/LritE
+++ b/obseg/text/LritE
--- a/obseg/text/LritE.asm
+++ b/obseg/text/LritE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LritE.bin", create
+
+base $00000000
+seg_LritE_start:
+seg_LritE_header_start:
+
+ptr_seg_LritE_start:
+ dw seg_LritE_start
+
+seg_LritE_header_end:
+seg_LritE_strings_start:
+
+seg_LritE_strings_end:
+seg_LritE_end:
+align(32)
--- a/obseg/text/LrunE
+++ b/obseg/text/LrunE
--- a/obseg/text/LrunE.asm.REMOVED.git-id
+++ b/obseg/text/LrunE.asm.REMOVED.git-id
@ -0,0 +1 @@
+84e14b64eb3d1c7d73b1fdaaf67a3b708720b53f
--- a/obseg/text/LsevE.REMOVED.git-id
+++ b/obseg/text/LsevE.REMOVED.git-id
@ -1 +0,0 @@
-fa975616e60b39a76a494dac819156db6c9362c4
--- a/obseg/text/LsevE.asm.REMOVED.git-id
+++ b/obseg/text/LsevE.asm.REMOVED.git-id
@ -0,0 +1 @@
+bd69daeb538891b91b21ff47de2e845a1c4e6710
--- a/obseg/text/LsevbE.REMOVED.git-id
+++ b/obseg/text/LsevbE.REMOVED.git-id
@ -1 +0,0 @@
-e79956c696737d06b437563d8ff26704501021d4
--- a/obseg/text/LsevbE.asm.REMOVED.git-id
+++ b/obseg/text/LsevbE.asm.REMOVED.git-id
@ -0,0 +1 @@
+4f339be21c0def21cca461396817148cfa714dc2
--- a/obseg/text/LsevxE.REMOVED.git-id
+++ b/obseg/text/LsevxE.REMOVED.git-id
@ -1 +0,0 @@
-9ea9d997c10e8c909ac74c7727e128c39d41c616
--- a/obseg/text/LsevxE.asm.REMOVED.git-id
+++ b/obseg/text/LsevxE.asm.REMOVED.git-id
@ -0,0 +1 @@
+c8a6bfbbb8a703f0f7b615d971c4217c950a2b3a
--- a/obseg/text/LsevxbE.REMOVED.git-id
+++ b/obseg/text/LsevxbE.REMOVED.git-id
@ -1 +0,0 @@
-9c39c9c6df97ab39dcd8c7999380b1d0557aa3f2
--- a/obseg/text/LsevxbE.asm.REMOVED.git-id
+++ b/obseg/text/LsevxbE.asm.REMOVED.git-id
@ -0,0 +1 @@
+a5cea489efde27634ec0f8248ca61aee99fe783c
--- a/obseg/text/LshoE
+++ b/obseg/text/LshoE
--- a/obseg/text/LshoE.asm
+++ b/obseg/text/LshoE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LshoE.bin", create
+
+base $00000000
+seg_LshoE_start:
+seg_LshoE_header_start:
+
+ptr_seg_LshoE_start:
+ dw seg_LshoE_start
+
+seg_LshoE_header_end:
+seg_LshoE_strings_start:
+
+seg_LshoE_strings_end:
+seg_LshoE_end:
+align(32)
--- a/obseg/text/LsiloE.REMOVED.git-id
+++ b/obseg/text/LsiloE.REMOVED.git-id
@ -1 +0,0 @@
-15b5e957d162f58a4954229fe042251a375c3dd5
--- a/obseg/text/LsiloE.asm.REMOVED.git-id
+++ b/obseg/text/LsiloE.asm.REMOVED.git-id
@ -0,0 +1 @@
+755bf3f8cac62cb46fb4a88bc52712472dfa0eb6
--- a/obseg/text/LstatE.REMOVED.git-id
+++ b/obseg/text/LstatE.REMOVED.git-id
@ -1 +0,0 @@
-5b7f8113534ec23d8dacd70a6277b02902405703
--- a/obseg/text/LstatE.asm.REMOVED.git-id
+++ b/obseg/text/LstatE.asm.REMOVED.git-id
@ -0,0 +1 @@
+660ea7949f06ec67678388968dc627d6b9114cb6
--- a/obseg/text/LtitleE.REMOVED.git-id
+++ b/obseg/text/LtitleE.REMOVED.git-id
@ -1 +0,0 @@
-6e9551f7057d85ff6ad74ed48f12b8066687476c
--- a/obseg/text/LtitleE.asm.REMOVED.git-id
+++ b/obseg/text/LtitleE.asm.REMOVED.git-id
@ -0,0 +1 @@
+1ad23ddca7e2584bd4ba04a8c3fcc8bbdcf75356
--- a/obseg/text/LtraE.REMOVED.git-id
+++ b/obseg/text/LtraE.REMOVED.git-id
@ -1 +0,0 @@
-822a4158897babca955798d66f3621495e2132f6
--- a/obseg/text/LtraE.asm.REMOVED.git-id
+++ b/obseg/text/LtraE.asm.REMOVED.git-id
@ -0,0 +1 @@
+02cae5eda0223b6aaa6fa43da45dfe26e2099688
--- a/obseg/text/LwaxE
+++ b/obseg/text/LwaxE
--- a/obseg/text/LwaxE.asm
+++ b/obseg/text/LwaxE.asm
@ -0,0 +1,18 @@
+arch n64.cpu
+endian msb
+include "../BASS.INC"
+output "LwaxE.bin", create
+
+base $00000000
+seg_LwaxE_start:
+seg_LwaxE_header_start:
+
+ptr_seg_LwaxE_start:
+ dw seg_LwaxE_start
+
+seg_LwaxE_header_end:
+seg_LwaxE_strings_start:
+
+seg_LwaxE_strings_end:
+seg_LwaxE_end:
+align(32)
--- a/tools/1172compress.sh
+++ b/tools/1172compress.sh
@ -1,5 +1,5 @@
 #!/bin/bash
 echo -n -e \\x11\\x72 > header.tmp
 cat $1| gzip --no-name --best | tail --bytes=+11 | head --bytes=-8 > $1.tmp
-cat header.tmp $1.tmp > $1.rz
+cat header.tmp $1.tmp > $2
 rm header.tmp $1.tmp
--- a/tools/data_compress.sh
+++ b/tools/data_compress.sh
@ -9,7 +9,7 @@ echo "truncate $1 to 0xC00000"
 cat $1 | head --bytes=12582912 > $1.tmp

 echo "compress data segment"
-tools/1172compress.sh data_seg
+tools/1172compress.sh data_seg data_seg.rz


 echo "inject data segment"