From 2e9caa75d77d368ead271268406a24a1052b9d85 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 13:44:03 -0500 Subject: Move extras/ into a git submodule. --- extras | 1 + extras/test_dump_sections.py | 74 -------------------------------------------- 2 files changed, 1 insertion(+), 74 deletions(-) create mode 160000 extras delete mode 100644 extras/test_dump_sections.py (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras new file mode 160000 index 000000000..13dfbba8d --- /dev/null +++ b/extras @@ -0,0 +1 @@ +Subproject commit 13dfbba8d21b843cc3bb871ed06088ca72cde8c3 diff --git a/extras/test_dump_sections.py b/extras/test_dump_sections.py deleted file mode 100644 index b73b86f6a..000000000 --- a/extras/test_dump_sections.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- - -try: - import unittest2 as unittest -except ImportError: - import unittest - -# check for things we need in unittest -if not hasattr(unittest.TestCase, 'setUpClass'): - sys.stderr.write("The unittest2 module or Python 2.7 is required to run this script.") - sys.exit(1) - -from dump_sections import ( - upper_hex, - format_bank_number, - calculate_bank_quantity, - dump_section, - dump_incbin_for_section, -) - -class TestDumpSections(unittest.TestCase): - def test_upper_hex(self): - number = 0x52 - self.assertEquals(number, int("0x" + upper_hex(number), 16)) - - number = 0x1 - self.assertEquals(number, int("0x" + upper_hex(number), 16)) - - number = 0x0 - self.assertEquals(number, int("0x" + upper_hex(number), 16)) - - number = 0xAA - self.assertEquals(number, int("0x" + upper_hex(number), 16)) - - number = 0xFFFFAAA0000 - self.assertEquals(number, int("0x" + upper_hex(number), 16)) - - def test_format_bank_number(self): - address = 0x0 - self.assertEquals("0", format_bank_number(address)) - - address = 0x4000 - self.assertEquals("1", format_bank_number(address)) - - address = 0x1FC000 - self.assertEquals("7F", format_bank_number(address)) - - def test_dump_section(self): - self.assertIn("SECTION", dump_section(str(0))) - self.assertIn("HOME", dump_section(str(0))) - self.assertNotIn("HOME", dump_section(str(1))) - self.assertIn("DATA", dump_section(str(2))) - self.assertIn("BANK", dump_section(str(40))) - self.assertNotIn("BANK", dump_section(str(0))) - - def test_dump_incbin_for_section(self): - self.assertIn("INCBIN", dump_incbin_for_section(0)) - - def test_dump_incbin_for_section_separator(self): - separator = "\n\n" - self.assertIn(separator, dump_incbin_for_section(0, separator=separator)) - - separator = "\t\t" # dumb - self.assertIn(separator, dump_incbin_for_section(0, separator=separator)) - - def test_dump_incbin_for_section_default(self): - rom = "baserom.gbc" - self.assertIn(rom, dump_incbin_for_section(0)) - - rom = "baserom" - self.assertIn(rom, dump_incbin_for_section(0x4000)) - -if __name__ == "__main__": - unittest.main() -- cgit v1.2.3 From a5f1029d1cefb93ddbaad3261d27eefa3b17929f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 16:17:25 -0500 Subject: update extras submodule to latest master branch --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras index 13dfbba8d..a14c36ead 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 13dfbba8d21b843cc3bb871ed06088ca72cde8c3 +Subproject commit a14c36eadb75ea3d6fbc4cb3f382d7c9785d9fe9 -- cgit v1.2.3 From 2b7b3b6dc2bf8052de8747b353205963b6aa22f4 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 16:22:08 -0500 Subject: update extras submodule on the "organizing" branch The eggified version of all of the python stuff will probably not work immediately. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras index a14c36ead..a76acbadd 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit a14c36eadb75ea3d6fbc4cb3f382d7c9785d9fe9 +Subproject commit a76acbadd2571c0d73b0797b2b68e205ab882b64 -- cgit v1.2.3 From 4619cf13def369c9612621c4689bad364b14bee3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 16:54:28 -0500 Subject: reset extras submodule to branch master The eggify branch was a success, so the submodule's upstream changes have been merged in. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras index a76acbadd..0403a4a90 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit a76acbadd2571c0d73b0797b2b68e205ab882b64 +Subproject commit 0403a4a90d473cc0a4bf5c53677c0a84406bc4ad -- cgit v1.2.3 From 268a2d28fdbacf48ea5e9d0cbac37ac4deee7082 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 3 Aug 2013 20:13:37 -0500 Subject: probably fix the pngs target for make Update the submodule to a version where gfx.py is able to handle the current paths. Make some other fixes to Makefile to call gfx.py correctly. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras index 0403a4a90..3011f9243 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 0403a4a90d473cc0a4bf5c53677c0a84406bc4ad +Subproject commit 3011f9243cbe4b0de7ab2392941385c705697909 -- cgit v1.2.3 From 94f5f61265b9654925b66dca7c3256668435eeea Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Tue, 27 Aug 2013 11:15:19 -0500 Subject: bump extras submodule to v1.1.0 The extras submodule is provided by pokemon-reverse-engineering-tools v1.1.0 at commit 016f0206b5029fc83a6200be29b0f980c76dfd90. --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras/test_dump_sections.py') diff --git a/extras b/extras index 3011f9243..016f0206b 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 3011f9243cbe4b0de7ab2392941385c705697909 +Subproject commit 016f0206b5029fc83a6200be29b0f980c76dfd90 -- cgit v1.2.3