From 48e86b6de3e0b6de1d1ebda595bd0f72e5f0fff7 Mon Sep 17 00:00:00 2001 From: Stan H Date: Thu, 21 Mar 2019 19:09:43 +0100 Subject: [PATCH] rodata D7C40 -> D7C44 --- data/const_data_D7C40.s | 13 ------------- data/const_data_D7C44.s | 5 +++++ ldscript.txt | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 data/const_data_D7C40.s create mode 100644 data/const_data_D7C44.s diff --git a/data/const_data_D7C40.s b/data/const_data_D7C40.s deleted file mode 100644 index f17ea4d4..00000000 --- a/data/const_data_D7C40.s +++ /dev/null @@ -1,13 +0,0 @@ - .section .rodata - -@ .global gUnknown_080D7C40 -@ gUnknown_080D7C40: @ 0x080D7C40 -@ .incbin "baserom.gba", 0xD7C40, 0x2 - -@ .global gUnknown_080D7C42 -@ gUnknown_080D7C42: @ 0x080D7C42 -@ .incbin "baserom.gba", 0xD7C42, 0x2 - - .global gUnknown_080D7C44 -gUnknown_080D7C44: @ 0x080D7C44 - .incbin "baserom.gba", 0xD7C44, 0x2A0 diff --git a/data/const_data_D7C44.s b/data/const_data_D7C44.s new file mode 100644 index 00000000..38ff1ed7 --- /dev/null +++ b/data/const_data_D7C44.s @@ -0,0 +1,5 @@ + .section .rodata + + .global gUnknown_080D7C44 +gUnknown_080D7C44: @ 0x080D7C44 + .incbin "baserom.gba", 0xD7C44, 0x2A0 diff --git a/ldscript.txt b/ldscript.txt index be3de43c..81fdbbc4 100644 --- a/ldscript.txt +++ b/ldscript.txt @@ -199,7 +199,7 @@ SECTIONS . = ALIGN(4); data/const_data_D7A6C.o(.rodata); . = ALIGN(4); src/bmbattle.o(.rodata); . = ALIGN(4); src/bmtrade.o(.rodata); - . = ALIGN(4); data/const_data_D7C40.o(.rodata); + . = ALIGN(4); data/const_data_D7C44.o(.rodata); . = ALIGN(4); src/bmio.o(.rodata); . = ALIGN(4); data/const_data_D7F5C.o(.rodata); . = ALIGN(4); data/text.o(.rodata);