diff --git a/setup.cfg b/setup.cfg index faf1aaa..20f4a2e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = supSMSASM -version = 0.0.5b1 +version = 0.0.5 author = sup39 author_email = sms@sup39.dev description = A tool to make Gecko code from ASM for SMS diff --git a/src/supSMSASM/cli.py b/src/supSMSASM/cli.py index 520f82d..2289a6b 100644 --- a/src/supSMSASM/cli.py +++ b/src/supSMSASM/cli.py @@ -95,7 +95,9 @@ def asm2gecko(fnIn, dolver): for line in lines[8:]: if not re.match('^[0-9a-f]{8} \w', line): continue cols = line.split() - if len(cols) != 5: continue + if len(cols) == 6 and cols[2] == 'F': # @function + cols = cols[:2]+cols[3:] + elif len(cols) != 5: continue addr, _, sec, _, name = cols if sec == '.text': asmSymbs[name] = addr