Merge branch 'organizing' into master

Everything works in pokecrystal, so it's time to merge.
This commit is contained in:
Bryan Bishop
2013-08-03 16:51:46 -05:00
29 changed files with 54 additions and 9 deletions

1
pokemontools/__init__.py Normal file
View File

@@ -0,0 +1 @@
import crystal

44
setup.py Normal file
View File

@@ -0,0 +1,44 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import os
import sys
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
# for uploading to pypi
if sys.argv[-1] == 'publish':
os.system('python setup.py sdist upload')
sys.exit()
# There's some intersection with requirements.txt but pypi can't handle git
# dependencies.
requires = [
"mock",
]
setup(
name="pokemontools",
version="1.0",
description="Tools for compiling and disassembling Pokémon Red and Pokémon Crystal.",
long_description=open("README.md", "r").read(),
license="BSD",
author="Bryan Bishop",
author_email="kanzure@gmail.com",
url="https://github.com/kanzure/pokemon-reverse-engineering-tools",
packages=["pokemontools"],
package_dir={"pokemontools": "pokemontools"},
include_package_data=True,
install_requires=requires,
platforms="any",
classifiers=[
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
]
)

View File

@@ -10,7 +10,7 @@ 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 (
from pokemontools.dump_sections import (
upper_hex,
format_bank_number,
calculate_bank_quantity,

View File

@@ -8,38 +8,38 @@ import hashlib
import random
import json
from interval_map import IntervalMap
from chars import chars, jap_chars
from pokemontools.interval_map import IntervalMap
from pokemontools.chars import chars, jap_chars
from romstr import (
from pokemontools.romstr import (
RomStr,
AsmList,
)
from item_constants import (
from pokemontools.item_constants import (
item_constants,
find_item_label_by_id,
generate_item_constants,
)
from pointers import (
from pokemontools.pointers import (
calculate_bank,
calculate_pointer,
)
from pksv import (
from pokemontools.pksv import (
pksv_gs,
pksv_crystal,
)
from labels import (
from pokemontools.labels import (
remove_quoted_text,
line_has_comment_address,
line_has_label,
get_label_from_line,
)
from crystal import (
from pokemontools.crystal import (
rom,
load_rom,
rom_until,