pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #722 from entrpntr/fix-used-space

Browse Source 
Update used_space.py and mapreader.py tools for rgbds v0.4.0.
This commit is contained in:
Rangi 2020-06-02 08:33:15 -04:00 committed by GitHub
commit 84959e35b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -29,6 +29,9 @@
baserom.txt
pokecrystal.txt
# used_space.py
used_space.png
# for vim configuration
# url: http://www.vim.org/scripts/script.php?script_id=441
.lvimrc

11
tools/mapreader.py
View File

@ -38,10 +38,11 @@ class MapReader:
bank_types = {
'HRAM' : { 'size': 0x80, 'banked': False, },
'OAM' : { 'size': 0xA0, 'banked': False, },
'ROM Bank' : { 'size': 0x4000, 'banked': True, },
'SRAM Bank': { 'size': 0x2000, 'banked': True, },
'VRAM Bank': { 'size': 0x1000, 'banked': True, },
'WRAM Bank': { 'size': 0x2000, 'banked': True, },
'ROM0 bank': { 'size': 0x4000, 'banked': True, },
'ROMX bank': { 'size': 0x4000, 'banked': True, },
'SRAM bank': { 'size': 0x2000, 'banked': True, },
'VRAM bank': { 'size': 0x1000, 'banked': True, },
'WRAM bank': { 'size': 0x2000, 'banked': True, },
}
# FSM states
@ -52,7 +53,7 @@ class MapReader:
# $506D = TypeMatchups
section_data_regex = re.compile('\$([0-9A-Fa-f]{4}) = (.*)')
# $3ED2 bytes
slack_regex = re.compile('\$([0-9A-Fa-f]{4}) bytes')
slack_regex = re.compile('\$([0-9A-Fa-f]{4}) bytes?')
def __init__(self, *args, **kwargs):
self.__dict__.update(kwargs)

3
tools/used_space.py
View File

@ -38,7 +38,8 @@ def main():
default_bank_data = {'sections': [], 'used': 0, 'slack': bank_size}
for bank in range(num_banks):
hits = [0] * pixels_per_bank
data = r.bank_data['ROM Bank'].get(bank, default_bank_data)
bank_data = r.bank_data['ROM0 bank'] if bank == 0 else r.bank_data['ROMX bank']
data = bank_data.get(bank, default_bank_data)
for s in data['sections']:
beg = s['beg'] & bank_mask
end = s['end'] & bank_mask