pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gfx-fixes-again' into master.

Browse Source 
Various whitespace and formatting changes.
This commit is contained in:
Bryan Bishop 2013-06-25 23:48:44 -05:00
commit bd6a985317
3 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -37,3 +37,5 @@ pokecrystal.rtc
# some users are dumping png.py into extras/ # some users are dumping png.py into extras/
extras/png.py extras/png.py
*$py.class

25
extras/gfx.py
View File

@ -27,7 +27,7 @@ def mkdir_p(path):
else: raise else: raise
def hex_dump(input, debug = True): def hex_dump(input, debug=True):
""" """
Display hex dump in rows of 16 bytes. Display hex dump in rows of 16 bytes.
""" """
@ -58,7 +58,6 @@ def hex_dump(input, debug = True):
for char in range(margin): for char in range(margin):
output += ' ' output += ' '
#
for byte in range(bytes_per_line): for byte in range(bytes_per_line):
output += hex(byte)[2:].zfill(2) + ' ' output += hex(byte)[2:].zfill(2) + ' '
output = output[:-1] # last space output = output[:-1] # last space
@ -201,7 +200,7 @@ class Compressed:
Compress 2bpp data. Compress 2bpp data.
""" """
def __init__(self, image = None, mode = 'horiz', size = None): def __init__(self, image=None, mode='horiz', size=None):
assert image, 'need something to compress!' assert image, 'need something to compress!'
image = list(image) image = list(image)
self.image = image self.image = image
@ -598,7 +597,7 @@ class Decompressed:
data can be fed in from rom if [start] is specified data can be fed in from rom if [start] is specified
""" """
def __init__(self, lz = None, mode = None, size = None, start = 0): def __init__(self, lz=None, mode=None, size=None, start=0):
# todo: play nice with Compressed # todo: play nice with Compressed
assert lz, 'need something to compress!' assert lz, 'need something to compress!'
@ -831,7 +830,7 @@ unowns = 0x124000
num_unowns = 26 num_unowns = 26
unown_dex = 201 unown_dex = 201
def decompress_monster_by_id(id = 0, type = front): def decompress_monster_by_id(id=0, type=front):
# no unowns here # no unowns here
if id + 1 == unown_dex: return None if id + 1 == unown_dex: return None
# get size # get size
@ -847,7 +846,7 @@ def decompress_monster_by_id(id = 0, type = front):
monster = Decompressed(rom, 'vert', size, address) monster = Decompressed(rom, 'vert', size, address)
return monster return monster
def decompress_monsters(type = front): def decompress_monsters(type=front):
for id in range(num_monsters): for id in range(num_monsters):
# decompress # decompress
monster = decompress_monster_by_id(id, type) monster = decompress_monster_by_id(id, type)
@ -865,7 +864,7 @@ def decompress_monsters(type = front):
to_file(folder+filename, monster.pic) to_file(folder+filename, monster.pic)
def decompress_unown_by_id(letter, type = front): def decompress_unown_by_id(letter, type=front):
# get size # get size
if type == front: if type == front:
size = sizes[unown_dex-1] size = sizes[unown_dex-1]
@ -879,7 +878,7 @@ def decompress_unown_by_id(letter, type = front):
unown = Decompressed(rom, 'vert', size, address) unown = Decompressed(rom, 'vert', size, address)
return unown return unown
def decompress_unowns(type = front): def decompress_unowns(type=front):
for letter in range(num_unowns): for letter in range(num_unowns):
# decompress # decompress
unown = decompress_unown_by_id(letter, type) unown = decompress_unown_by_id(letter, type)
@ -993,7 +992,7 @@ def decompress_misc():
gfx = Decompressed( rom, mode, None, address ) gfx = Decompressed( rom, mode, None, address )
to_file(filename, gfx.output) to_file(filename, gfx.output)
def decompress_all(debug = False): def decompress_all(debug=False):
""" """
Decompress all known compressed data in baserom. Decompress all known compressed data in baserom.
""" """
@ -1028,7 +1027,7 @@ def decompress_all(debug = False):
return return
def decompress_from_address(address, mode='horiz', filename = 'de.2bpp', size = None): def decompress_from_address(address, mode='horiz', filename='de.2bpp', size=None):
""" """
Write decompressed data from an address to a 2bpp file. Write decompressed data from an address to a 2bpp file.
""" """
@ -1036,7 +1035,7 @@ def decompress_from_address(address, mode='horiz', filename = 'de.2bpp', size =
to_file(filename, image.pic) to_file(filename, image.pic)
def decompress_file(filein, fileout, mode = 'horiz', size = None): def decompress_file(filein, fileout, mode='horiz', size=None):
f = open(filein, 'rb') f = open(filein, 'rb')
image = f.read() image = f.read()
f.close() f.close()
@ -1046,7 +1045,7 @@ def decompress_file(filein, fileout, mode = 'horiz', size = None):
to_file(fileout, de.pic) to_file(fileout, de.pic)
def compress_file(filein, fileout, mode = 'horiz'): def compress_file(filein, fileout, mode='horiz'):
f = open(filein, 'rb') f = open(filein, 'rb')
image = f.read() image = f.read()
f.close() f.close()
@ -1099,7 +1098,7 @@ def hex_to_rgb(word):
blue = word & 0b11111 blue = word & 0b11111
return (red, green, blue) return (red, green, blue)
def grab_palettes(address, length = 0x80): def grab_palettes(address, length=0x80):
output = '' output = ''
for word in range(length/2): for word in range(length/2):
color = ord(rom[address+1])*0x100 + ord(rom[address]) color = ord(rom[address+1])*0x100 + ord(rom[address])