From a0f980c31c6afdd86c839bf6b123ba91e81b68a4 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 16 Sep 2023 09:52:56 +0200 Subject: [PATCH] Fix link error in ov11 --- Makefile | 2 +- asm/global.inc | 1 - asm/ov11.s | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 132d1d04..6539df8e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ MW_LICENSE := $(TOOLS_DIR)/mwccarm/license.dat ASM_FLAGS := -proc arm5te -i asm -msgstyle gcc CC_FLAGS := -O1 -thumb -LD_FLAGS := -proc arm946e -nostdlib -interworking -m func_02000800 -map closure,unused -o main.bin -msgstyle gcc +LD_FLAGS := -proc arm946e -nostdlib -interworking -nodead -m func_02000800 -map closure,unused -o main.bin -msgstyle gcc .PHONY: all all: arm9 diff --git a/asm/global.inc b/asm/global.inc index dc5de8e9..7d2a6e9d 100644 --- a/asm/global.inc +++ b/asm/global.inc @@ -209339,7 +209339,6 @@ .extern data_ov37_0217f370 .extern data_ov37_0217f374 .extern data_ov37_0217f460 -.extern data_ov37_0217f464 .extern data_ov37_0217f4d0 .extern data_ov37_0217f53c .extern data_ov37_0217f650 diff --git a/asm/ov11.s b/asm/ov11.s index 6eee2f5c..18a641d7 100644 --- a/asm/ov11.s +++ b/asm/ov11.s @@ -4187,7 +4187,7 @@ func_ov11_02114c04: ; 0x02114c04 mvn r0, r0 pop {r3, r4, r5, pc} _02114c36: - ldr r5, _02114c58 ; =data_ov37_0217f464 + ldr r5, _02114c58 ; =data_ov61_0217f464 ldr r0, [r5] cmp r0, #0 bne _02114c4c @@ -4205,7 +4205,7 @@ _02114c4c: thumb_func_end func_ov11_02114c04 _02114c50: .word data_ov11_0212ed24 _02114c54: .word data_ov11_0212ed2c -_02114c58: .word data_ov37_0217f464 +_02114c58: .word data_ov61_0217f464 .global func_ov11_02114c5c thumb_func_start func_ov11_02114c5c