From 0c722361e2df020fdd894b28fc62941065f6a702 Mon Sep 17 00:00:00 2001 From: sup39 Date: Tue, 7 Feb 2023 15:35:16 +0900 Subject: [PATCH] [v0.0.9] set C0 code location to 0, fix optional version --- setup.cfg | 2 +- src/supSMSASM/cli.py | 2 +- src/supSMSASM/ldscript/GMSE01.ld | 1 + src/supSMSASM/ldscript/common.ld | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index dbc772a..fd6e506 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = supSMSASM -version = 0.0.8 +version = 0.0.9 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 d94e716..51a970c 100644 --- a/src/supSMSASM/cli.py +++ b/src/supSMSASM/cli.py @@ -204,7 +204,7 @@ def main(): sys.exit(1) fnIn = argv[1] - verIn = argv[2] + verIn = argv[2] if len(argv) > 2 else 'JP' if verIn.lower() == 'all': ans = '' indent = ' ' diff --git a/src/supSMSASM/ldscript/GMSE01.ld b/src/supSMSASM/ldscript/GMSE01.ld index a5dd15d..00ac937 100644 --- a/src/supSMSASM/ldscript/GMSE01.ld +++ b/src/supSMSASM/ldscript/GMSE01.ld @@ -2,6 +2,7 @@ "SMS__GMSE01" = 1; "SMS__US" = 1; "$r13" = 0x804141c0; +"gpApplication" = 0x803E9700; "TRK_MINNOW_DOLPHIN.TRK_memcpy" = 0x80003244; "TRK_MINNOW_DOLPHIN.TRK_memset" = 0x80003268; "TRK_MINNOW_DOLPHIN.__TRK_reset" = 0x800051cc; diff --git a/src/supSMSASM/ldscript/common.ld b/src/supSMSASM/ldscript/common.ld index 279a95a..fff3154 100644 --- a/src/supSMSASM/ldscript/common.ld +++ b/src/supSMSASM/ldscript/common.ld @@ -1,5 +1,5 @@ SECTIONS { - . = DEFINED($$) ? $$ : 0x817f9800; + . = DEFINED($$) ? $$ : 0; .text : ALIGN(4) { *(.text) } .rodata : ALIGN(4) { *(.rodata) } }