rearrange files, work on data making script

Former-commit-id: 52ffc236296fe46bfcc6ea0d27d88489e097f451 [formerly 169f5b85d7ef5da9a7e3e97867e5ebba3f8cd098] Former-commit-id: 8e9686e6bf6596d7aa28bedc7bade53bbbf2bfda
2017-05-10 14:10:21 -05:00 · 2017-05-10 14:10:21 -05:00 · c4abb5ab77
parent c40657c8ab
commit c4abb5ab77
735 changed files with 58 additions and 40 deletions
--- a/disassembly/GE007.rom.asm
+++ b/disassembly/GE007.rom.asm
@ -17,17 +17,7 @@ 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"
-
-ob_end:
-insert ob_end.seg, "ob/ob_end.seg", (origin() - $008f7de0)
+include "ob/seg_ob.asm"

 include "images/images.asm"

--- a/disassembly/GE007.sym.REMOVED.git-id
+++ b/disassembly/GE007.sym.REMOVED.git-id
@ -1 +1 @@
-1491c6f3f0da1b1db10a1053d5971a5c4c99b62f
+640f3d061e292c1dd567f397f75e659a08248e5c
--- a/disassembly/bg/Tbg.asm.REMOVED.git-id
+++ b/disassembly/bg/Tbg.asm.REMOVED.git-id
@ -1 +0,0 @@
-c0342c6c68303e3869db34dad297b3ad3acc3932
--- a/disassembly/bg/bg.asm.REMOVED.git-id
+++ b/disassembly/bg/bg.asm.REMOVED.git-id
@ -1 +0,0 @@
-50974df7a9eef5b88a6ba402d435007ba58f3dd2
--- a/disassembly/bg/setup.asm.REMOVED.git-id
+++ b/disassembly/bg/setup.asm.REMOVED.git-id
@ -1 +0,0 @@
-0249f0f79a931b2b6d871f650a254f969f52e08b
--- a/disassembly/brief/brief.asm.REMOVED.git-id
+++ b/disassembly/brief/brief.asm.REMOVED.git-id
@ -1 +0,0 @@
-a51b538ff604bb62ae28a61b1739e1b3c495521e
--- a/disassembly/chr/chr.asm.REMOVED.git-id
+++ b/disassembly/chr/chr.asm.REMOVED.git-id
@ -1 +0,0 @@
-728eab89627d5396e9cd983e4eaf308dd3487480
--- a/disassembly/code/stack.inc
+++ b/disassembly/code/stack.inc
@ -29,4 +29,7 @@ sp_main:

 base $803B3950
 sp_audi:
+
+base $803B4950
+sp_unknown:
 seg_sp_end:
--- a/disassembly/g_view/g_items.asm.REMOVED.git-id
+++ b/disassembly/g_view/g_items.asm.REMOVED.git-id
@ -1 +0,0 @@
-c70f02d762a71c39ae8fbbd9c4f710a9707563af
--- a/disassembly/ob/Tbg.asm.REMOVED.git-id
+++ b/disassembly/ob/Tbg.asm.REMOVED.git-id
@ -0,0 +1 @@
+a183b80091c92722473c52ba668eade183a7b574
--- a/disassembly/ob/Tbg/Tbg_ame_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_ame_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_arch_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_arch_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_arec_all_p_stanZ
+++ b/disassembly/ob/Tbg/Tbg_arec_all_p_stanZ
--- a/disassembly/ob/Tbg/Tbg_ark_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_ark_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_ash_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_ash_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_azt_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_azt_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_cat_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_cat_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_cave_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_cave_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_crad_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_crad_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_cryp_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_cryp_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_dam_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_dam_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_depo_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_depo_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_dest_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_dest_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_dish_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_dish_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_imp_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_imp_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_jun_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_jun_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_len_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_len_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_oat_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_oat_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_pete_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_pete_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_ref_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_ref_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_run_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_run_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_sev_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_sev_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_sevb_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_sevb_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_sevx_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_sevx_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_silo_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_silo_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_stat_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_stat_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/Tbg/Tbg_tra_all_p_stanZ.REMOVED.git-id
+++ b/disassembly/ob/Tbg/Tbg_tra_all_p_stanZ.REMOVED.git-id
--- a/disassembly/ob/bg.asm.REMOVED.git-id
+++ b/disassembly/ob/bg.asm.REMOVED.git-id
@ -0,0 +1 @@
+31884f76be69c5e0a7ef5d4a79b1205a5b352ce0
--- a/disassembly/ob/bg/bg_ame_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_ame_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_arch_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_arch_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_arec_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_arec_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_ark_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_ark_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_ash_all_p.seg
+++ b/disassembly/ob/bg/bg_ash_all_p.seg
--- a/disassembly/ob/bg/bg_azt_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_azt_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_cat_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_cat_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_cave_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_cave_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_crad_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_crad_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_cryp_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_cryp_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_dam_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_dam_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_depo_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_depo_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_dest_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_dest_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_dish_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_dish_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_imp_all_p.seg
+++ b/disassembly/ob/bg/bg_imp_all_p.seg
--- a/disassembly/ob/bg/bg_jun_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_jun_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_len_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_len_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_oat_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_oat_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_pete_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_pete_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_ref_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_ref_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_run_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_run_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_sev_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_sev_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_sevb_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_sevb_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_sevx_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_sevx_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_silo_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_silo_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_stat_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_stat_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/bg/bg_tra_all_p.seg.REMOVED.git-id
+++ b/disassembly/ob/bg/bg_tra_all_p.seg.REMOVED.git-id
--- a/disassembly/ob/brief.asm.REMOVED.git-id
+++ b/disassembly/ob/brief.asm.REMOVED.git-id
@ -0,0 +1 @@
+0cde67261d0d1e476f260cc8a82b52fd70083c7b
--- a/disassembly/ob/brief/UbriefarchZ
+++ b/disassembly/ob/brief/UbriefarchZ
--- a/disassembly/ob/brief/UbriefarkZ
+++ b/disassembly/ob/brief/UbriefarkZ
--- a/disassembly/ob/brief/UbriefaztZ
+++ b/disassembly/ob/brief/UbriefaztZ
--- a/disassembly/ob/brief/UbriefcaveZ
+++ b/disassembly/ob/brief/UbriefcaveZ
--- a/disassembly/ob/brief/UbriefcontrolZ
+++ b/disassembly/ob/brief/UbriefcontrolZ
--- a/disassembly/ob/brief/UbriefcradZ
+++ b/disassembly/ob/brief/UbriefcradZ
--- a/disassembly/ob/brief/UbriefcrypZ
+++ b/disassembly/ob/brief/UbriefcrypZ
--- a/disassembly/ob/brief/UbriefdamZ
+++ b/disassembly/ob/brief/UbriefdamZ
--- a/disassembly/ob/brief/UbriefdepoZ
+++ b/disassembly/ob/brief/UbriefdepoZ
--- a/disassembly/ob/brief/UbriefdestZ
+++ b/disassembly/ob/brief/UbriefdestZ
--- a/disassembly/ob/brief/UbriefjunZ
+++ b/disassembly/ob/brief/UbriefjunZ
--- a/disassembly/ob/brief/UbriefpeteZ
+++ b/disassembly/ob/brief/UbriefpeteZ
--- a/disassembly/ob/brief/UbriefrunZ
+++ b/disassembly/ob/brief/UbriefrunZ
--- a/disassembly/ob/brief/UbriefsevbZ
+++ b/disassembly/ob/brief/UbriefsevbZ
--- a/disassembly/ob/brief/UbriefsevbunkerZ
+++ b/disassembly/ob/brief/UbriefsevbunkerZ
--- a/disassembly/ob/brief/UbriefsevxZ
+++ b/disassembly/ob/brief/UbriefsevxZ
--- a/disassembly/ob/brief/UbriefsevxbZ
+++ b/disassembly/ob/brief/UbriefsevxbZ
--- a/disassembly/ob/brief/UbriefsiloZ
+++ b/disassembly/ob/brief/UbriefsiloZ
--- a/disassembly/ob/brief/UbriefstatueZ
+++ b/disassembly/ob/brief/UbriefstatueZ
--- a/disassembly/ob/brief/UbrieftraZ
+++ b/disassembly/ob/brief/UbrieftraZ
--- a/disassembly/ob/chr.asm.REMOVED.git-id
+++ b/disassembly/ob/chr.asm.REMOVED.git-id
@ -0,0 +1 @@
+6cf2ad922e27ae933749ad316f0fd9e558e6c3dd
--- a/disassembly/ob/chr/CarmourguardZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CarmourguardZ.REMOVED.git-id
--- a/disassembly/ob/chr/CbaronsamediZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CbaronsamediZ.REMOVED.git-id
--- a/disassembly/ob/chr/CbluecamguardZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CbluecamguardZ.REMOVED.git-id
--- a/disassembly/ob/chr/CbluemanZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CbluemanZ.REMOVED.git-id
--- a/disassembly/ob/chr/CbluewomanZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CbluewomanZ.REMOVED.git-id
--- a/disassembly/ob/chr/CboilerbondZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CboilerbondZ.REMOVED.git-id
--- a/disassembly/ob/chr/CboilertrevZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CboilertrevZ.REMOVED.git-id
--- a/disassembly/ob/chr/CborisZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CborisZ.REMOVED.git-id
--- a/disassembly/ob/chr/CcamguardZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CcamguardZ.REMOVED.git-id
--- a/disassembly/ob/chr/CcardimanZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CcardimanZ.REMOVED.git-id
--- a/disassembly/ob/chr/CcheckmanZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CcheckmanZ.REMOVED.git-id
--- a/disassembly/ob/chr/CcommguardZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CcommguardZ.REMOVED.git-id
--- a/disassembly/ob/chr/CdjbondZ.REMOVED.git-id
+++ b/disassembly/ob/chr/CdjbondZ.REMOVED.git-id
--- a/Show More
+++ b/Show More