diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-02 08:33:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 08:33:15 -0400 |
| commit | 84959e35b53c12159084b3ab9ae077b71f9972ba (patch) | |
| tree | 9e403371727708a384ad51dbb901f4574774a64c | |
| parent | 4f49a1f2f0044c10b2d447e35d8c05f3381ea49c (diff) | |
| parent | c37e8a65d874ed8a068fd662c717e8e6c41ae944 (diff) | |
Merge pull request #722 from entrpntr/fix-used-space
Update used_space.py and mapreader.py tools for rgbds v0.4.0.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | tools/mapreader.py | 11 | ||||
| -rw-r--r-- | tools/used_space.py | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index c9036fa4b..8f7b9a932 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/tools/mapreader.py b/tools/mapreader.py index 8a29e5235..de2ec3423 100644 --- a/tools/mapreader.py +++ b/tools/mapreader.py @@ -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) diff --git a/tools/used_space.py b/tools/used_space.py index 3fc401f57..34f8e492d 100644 --- a/tools/used_space.py +++ b/tools/used_space.py @@ -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 |