From f01196d7973b622cd3c3f36a8e03e5280ae69938 Mon Sep 17 00:00:00 2001 From: Larry Date: Wed, 16 Aug 2017 12:17:18 -0500 Subject: [PATCH] changes all over Former-commit-id: 244aab14c50a64844f9b179ca8ddcfacfba17a1b [formerly 110f0cffccc4a295af61177993c26ee6b412f699] [formerly 62528fd5e9f1720dced5ab20aace71494177ff7b [formerly d8f76cecec41cfc82573cb1095213c8cf5c0cb3b]] Former-commit-id: b05083531e0d9f1b04d7b20d495cb2faf8af6e4d [formerly fe0d00f05ac439489166de9662651bec68fa877c] Former-commit-id: a9bd437dc8f625718d1d2e53236913f66a626523 --- bin/animationtable_entries.bin.REMOVED.git-id | 1 + bin/ge007.u.117880.unknown.bin | Bin 0 -> 192 bytes bin/ge007.u.117880.unknown.bin.REMOVED.git-id | 1 - bin/ge007.u.117940.unknown.bin.REMOVED.git-id | 1 + bin/ge007.u.123040.unknown.bin.REMOVED.git-id | 1 + bin/romfiles.s | 15 +++++++++++++++ font/font.s | 4 ++++ globals.inc | 14 ++++++++++++++ globals.inc.REMOVED.git-id | 1 - music/music.s.REMOVED.git-id | 2 +- music/music_number_music_samples.bin | Bin 4 -> 0 bytes src/data.s.REMOVED.git-id | 2 +- src/rarezip.s.REMOVED.git-id | 2 +- src/tlbcode.s.REMOVED.git-id | 2 +- 14 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 bin/animationtable_entries.bin.REMOVED.git-id create mode 100644 bin/ge007.u.117880.unknown.bin delete mode 100644 bin/ge007.u.117880.unknown.bin.REMOVED.git-id create mode 100644 bin/ge007.u.117940.unknown.bin.REMOVED.git-id create mode 100644 bin/ge007.u.123040.unknown.bin.REMOVED.git-id create mode 100644 globals.inc delete mode 100644 globals.inc.REMOVED.git-id delete mode 100644 music/music_number_music_samples.bin diff --git a/bin/animationtable_entries.bin.REMOVED.git-id b/bin/animationtable_entries.bin.REMOVED.git-id new file mode 100644 index 0000000..38d7f6b --- /dev/null +++ b/bin/animationtable_entries.bin.REMOVED.git-id @@ -0,0 +1 @@ +114ee9531d15b6f4981cd9aa9a8a9e53b85ec8c3 \ No newline at end of file diff --git a/bin/ge007.u.117880.unknown.bin b/bin/ge007.u.117880.unknown.bin new file mode 100644 index 0000000000000000000000000000000000000000..2824f8a5ddfa8f792234920f224a69f19d9925c7 GIT binary patch literal 192 zcmZXNOAbIl5JYPjf=qluVkMlx+QPN$oXTe$$Rz~bjg?yTOLbMxOd!>*-k79WrlS`j zFfsqR_vIFa!xf8CVPvN2@$tLQUgin`=Z1Vk3|+wBxJc*FSp;&o0@7dMR!P)T&lkV* KqonWO#{oAxP#H)7 literal 0 HcmV?d00001 diff --git a/bin/ge007.u.117880.unknown.bin.REMOVED.git-id b/bin/ge007.u.117880.unknown.bin.REMOVED.git-id deleted file mode 100644 index 88842d7..0000000 --- a/bin/ge007.u.117880.unknown.bin.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e61baa61382bba883917e784b3d9a698a3cf9cce \ No newline at end of file diff --git a/bin/ge007.u.117940.unknown.bin.REMOVED.git-id b/bin/ge007.u.117940.unknown.bin.REMOVED.git-id new file mode 100644 index 0000000..2540c88 --- /dev/null +++ b/bin/ge007.u.117940.unknown.bin.REMOVED.git-id @@ -0,0 +1 @@ +6267a7eb9df73177ac8c6b85078864166e52efcb \ No newline at end of file diff --git a/bin/ge007.u.123040.unknown.bin.REMOVED.git-id b/bin/ge007.u.123040.unknown.bin.REMOVED.git-id new file mode 100644 index 0000000..c9f3bef --- /dev/null +++ b/bin/ge007.u.123040.unknown.bin.REMOVED.git-id @@ -0,0 +1 @@ +d4445fb9d76138481ab58a503847d8389cf3713d \ No newline at end of file diff --git a/bin/romfiles.s b/bin/romfiles.s index 25880a0..caa6f42 100644 --- a/bin/romfiles.s +++ b/bin/romfiles.s @@ -5,6 +5,21 @@ unknown: .incbin "bin/ge007.u.117880.unknown.bin" unknown_end: +.global unknown117940 +unknown117940: +.incbin "bin/ge007.u.117940.unknown.bin" +unknown117940_end: + +.global unknown123040 +unknown123040: +.incbin "bin/ge007.u.123040.unknown.bin" +unknown123040_end: + +.global animation_table +animation_table: +.incbin "bin/animationtable_entries.bin" +animation_table_end: + .global Globalimagetable Globalimagetable: .incbin "bin/ge007.u.29D160.Globalimagetable.bin" diff --git a/font/font.s b/font/font.s index c7ca41c..7526737 100644 --- a/font/font.s +++ b/font/font.s @@ -1,17 +1,21 @@ .section .font +.global font_first_font_table_controller_small font_first_font_table_controller_small: .incbin "font/font_first_font_table_controller_small.bin" font_first_font_table_controller_small_end: +.global font_second_font_table_controller_small font_second_font_table_controller_small: .incbin "font/font_second_font_table_controller_small.bin" font_second_font_table_controller_small_end: +.global font_first_font_table_controller_large font_first_font_table_controller_large: .incbin "font/font_first_font_table_controller_large.bin" font_first_font_table_controller_large_end: +.global font_second_font_table_controller_large font_second_font_table_controller_large: .incbin "font/font_second_font_table_controller_large.bin" font_second_font_table_controller_large_end: diff --git a/globals.inc b/globals.inc new file mode 100644 index 0000000..24eb887 --- /dev/null +++ b/globals.inc @@ -0,0 +1,14 @@ +# globally accessible functions and data +# these will be accessible by C code and show up in the .map file + +# need to be moved to proper spots in .s + +.global decompress.buildtable +.global decompress.inflate +.global decompress.type0 +.global decompress.type1 +.global decompress.type2 +.global decompress.table +.global decompress.start +.global decompress.entry + diff --git a/globals.inc.REMOVED.git-id b/globals.inc.REMOVED.git-id deleted file mode 100644 index 12d6da5..0000000 --- a/globals.inc.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -f0767ce56e8eda07d3daa42b84323aa64b2caaff \ No newline at end of file diff --git a/music/music.s.REMOVED.git-id b/music/music.s.REMOVED.git-id index 5d12d77..c6fd075 100644 --- a/music/music.s.REMOVED.git-id +++ b/music/music.s.REMOVED.git-id @@ -1 +1 @@ -b7c63cba4f6c59131f31aef2e9a2a67fbe4c7dc4 \ No newline at end of file +954957cb1b2faec1337e23387e35ca3557108fe3 \ No newline at end of file diff --git a/music/music_number_music_samples.bin b/music/music_number_music_samples.bin deleted file mode 100644 index 08b020895aa050e6326829e2113c9bbdcdc545a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZRuXJ7yT0Kou2 diff --git a/src/data.s.REMOVED.git-id b/src/data.s.REMOVED.git-id index 0794718..6e77856 100644 --- a/src/data.s.REMOVED.git-id +++ b/src/data.s.REMOVED.git-id @@ -1 +1 @@ -bf2ed97c8d8d236956128d619315efb6554e0ea2 \ No newline at end of file +3f1bc06d9797c1e84a40501bad179ae934d5c8cb \ No newline at end of file diff --git a/src/rarezip.s.REMOVED.git-id b/src/rarezip.s.REMOVED.git-id index c17c379..0516ff5 100644 --- a/src/rarezip.s.REMOVED.git-id +++ b/src/rarezip.s.REMOVED.git-id @@ -1 +1 @@ -90bf7a01225d1e5a6d45e55649d107596e59b669 \ No newline at end of file +c916ae32392a8245b21d1d75dd861fb84e100035 \ No newline at end of file diff --git a/src/tlbcode.s.REMOVED.git-id b/src/tlbcode.s.REMOVED.git-id index b501934..e9cc2a0 100644 --- a/src/tlbcode.s.REMOVED.git-id +++ b/src/tlbcode.s.REMOVED.git-id @@ -1 +1 @@ -bddd100630bc4376928228f5cd8fd5d1ce1e09cc \ No newline at end of file +3464ca32a734a1558cc3b513e80d3ab892d5b67e \ No newline at end of file