Merge pull request #60 from yenatch/dependencies

wram: fix section address allocation

1 files changed, 10 insertions, 10 deletions

diff --git a/pokemontools/wram.py b/pokemontools/wram.py
index 8affd26..dbff309 100644
--- a/pokemontools/wram.py
+++ b/pokemontools/wram.py
@@ -52,16 +52,16 @@ def read_bss_sections(bss):
             if '[' in type_:
                 address = int(bracket_value(type_).replace('$','0x'), 16)
             else:
-                if address == None or bank != section['bank']:
-                    for type__, addr in [
-                        ('VRAM',  0x8000),
-                        ('SRAM',  0xa000),
-                        ('WRAM0', 0xc000),
-                        ('WRAMX', 0xd000),
-                        ('HRAM',  0xff80),
-                    ]:
-                        if type__ == type_ and section['type'] == type__:
-                            address = addr
+                types = {
+                    'VRAM':  0x8000,
+                    'SRAM':  0xa000,
+                    'WRAM0': 0xc000,
+                    'WRAMX': 0xd000,
+                    'HRAM':  0xff80,
+                }
+                if address == None or bank != section['bank'] or section['type'] != type_:
+                    if type_ in types.keys():
+                        address = types[type_]
                 # else: keep going from this address
 
             section = {