From ad7e9e07e22968d48ff20d4ba57e6b0f98a275ee Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 6 Oct 2023 17:59:49 +0200 Subject: [PATCH] Fix .init/.sinit alignment --- Makefile | 6 +++--- asm/main.s | 4 ++-- asm/ov00.s | 4 ++-- asm/ov01.s | 4 ++-- asm/ov02.s | 4 ++-- asm/ov03.s | 4 ++-- asm/ov04.s | 4 ++-- asm/ov05.s | 2 +- asm/ov06.s | 4 ++-- asm/ov07.s | 4 ++-- asm/ov08.s | 4 ++-- asm/ov09.s | 4 ++-- asm/ov10.s | 4 ++-- asm/ov11.s | 6 +++--- asm/ov12.s | 4 ++-- asm/ov13.s | 2 +- asm/ov14.s | 4 ++-- asm/ov15.s | 4 ++-- asm/ov16.s | 4 ++-- asm/ov17.s | 4 ++-- asm/ov18.s | 4 ++-- asm/ov19.s | 4 ++-- asm/ov20.s | 4 ++-- asm/ov21.s | 4 ++-- asm/ov22.s | 4 ++-- asm/ov23.s | 4 ++-- asm/ov24.s | 4 ++-- asm/ov25.s | 4 ++-- asm/ov26.s | 4 ++-- asm/ov27.s | 4 ++-- asm/ov28.s | 4 ++-- asm/ov29.s | 4 ++-- asm/ov30.s | 4 ++-- asm/ov31.s | 4 ++-- asm/ov32.s | 4 ++-- asm/ov33.s | 4 ++-- asm/ov34.s | 4 ++-- asm/ov35.s | 4 ++-- asm/ov36.s | 4 ++-- asm/ov37.s | 4 ++-- asm/ov38.s | 4 ++-- asm/ov39.s | 4 ++-- asm/ov40.s | 4 ++-- asm/ov41.s | 4 ++-- asm/ov42.s | 4 ++-- asm/ov43.s | 4 ++-- asm/ov44.s | 4 ++-- asm/ov45.s | 4 ++-- asm/ov46.s | 4 ++-- asm/ov47.s | 4 ++-- asm/ov48.s | 4 ++-- asm/ov49.s | 4 ++-- asm/ov50.s | 4 ++-- asm/ov51.s | 16 ++-------------- asm/ov52.s | 4 ++-- asm/ov53.s | 4 ++-- asm/ov54.s | 4 ++-- asm/ov55.s | 4 ++-- asm/ov56.s | 4 ++-- asm/ov57.s | 4 ++-- asm/ov58.s | 4 ++-- asm/ov59.s | 4 ++-- asm/ov60.s | 4 ++-- asm/ov61.s | 4 ++-- tools/lcf.py | 4 +--- 65 files changed, 129 insertions(+), 143 deletions(-) diff --git a/Makefile b/Makefile index d30c9edf..3772fa14 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ tools: cd $(TOOLS_DIR)/compress && $(MAKE) .PHONY: arm9 -arm9: setup lcf link +arm9: link $(MAKE) compress .PHONY: setup @@ -51,7 +51,7 @@ clean: rm -r build/ .PHONY: lcf -lcf: $(TOOLS_DIR)/lcf.py +lcf: setup $(TOOLS_DIR)/lcf.py python $(TOOLS_DIR)/lcf.py $(ASM_OBJS): $(TARGET_DIR)/%.o: %.s @@ -63,7 +63,7 @@ $(CXX_OBJS): $(TARGET_DIR)/%.o: %.cpp LM_LICENSE_FILE=$(MW_LICENSE) $(MW_CC) $(CC_FLAGS) $< -o $@ .PHONY: link -link: $(ASM_OBJS) $(CXX_OBJS) +link: lcf $(ASM_OBJS) $(CXX_OBJS) cd $(TARGET_DIR) && LM_LICENSE_FILE=$(MW_LICENSE) $(MW_LD) $(LD_FLAGS) $(LCF_FILE) @$(OBJS_FILE) .PHONY: compress diff --git a/asm/main.s b/asm/main.s index 742f037f..b3f99246 100644 --- a/asm/main.s +++ b/asm/main.s @@ -110598,7 +110598,7 @@ _02050c00: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, ip, pc} arm_func_end func_02050a20 - .section .init + .section .init, 4, 1, 4 .global func_02050ca0 arm_func_start func_02050ca0 func_02050ca0: ; 0x02050ca0 @@ -139327,7 +139327,7 @@ data_02057220: ; 0x02057220 .byte 0x14, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .section .sinit + .section .sinit, 4, 1, 4 .global data_0205725c data_0205725c: ; 0x0205725c .byte 0xa0, 0x0c, 0x05, 0x02 diff --git a/asm/ov00.s b/asm/ov00.s index d896b600..21da5a5c 100644 --- a/asm/ov00.s +++ b/asm/ov00.s @@ -136444,7 +136444,7 @@ data_ov00_020df334: ; 0x020df334 data_ov00_020df336: ; 0x020df336 .byte 0x88, 0x13 - .section .init + .section .init, 4, 1, 4 .global func_ov00_020df338 arm_func_start func_ov00_020df338 func_ov00_020df338: ; 0x020df338 @@ -139555,7 +139555,7 @@ func_ov00_020e1e74: ; 0x020e1e74 _020e1e80: .word func_ov08_021136ec _020e1e84: .word data_ov00_020eed2c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov00_020e1e88 data_ov00_020e1e88: ; 0x020e1e88 .byte 0x38, 0xf3, 0x0d, 0x02 diff --git a/asm/ov01.s b/asm/ov01.s index ec2d6717..7e40b4fa 100644 --- a/asm/ov01.s +++ b/asm/ov01.s @@ -15140,9 +15140,9 @@ data_ov01_020f88f0: ; 0x020f88f0 data_ov01_020f88f2: ; 0x020f88f2 .byte 0x02, 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov01_020f8900 diff --git a/asm/ov02.s b/asm/ov02.s index a78cf9fc..87d57248 100644 --- a/asm/ov02.s +++ b/asm/ov02.s @@ -9878,7 +9878,7 @@ data_ov02_020f6970: ; 0x020f6970 data_ov02_020f6974: ; 0x020f6974 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov02_020f6978 arm_func_start func_ov02_020f6978 func_ov02_020f6978: ; 0x020f6978 @@ -9896,7 +9896,7 @@ _020f6998: .word data_ov02_020f716c _020f699c: .word func_ov02_020f66d0 _020f69a0: .word data_ov02_020f7160 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov02_020f69a4 data_ov02_020f69a4: ; 0x020f69a4 .byte 0x78, 0x69, 0x0f, 0x02 diff --git a/asm/ov03.s b/asm/ov03.s index e615a57e..03f3f097 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -42883,7 +42883,7 @@ data_ov03_020ffe20: ; 0x020ffe20 data_ov03_020ffe24: ; 0x020ffe24 .byte 0xb4, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov03_020ffe28 arm_func_start func_ov03_020ffe28 func_ov03_020ffe28: ; 0x020ffe28 @@ -43043,7 +43043,7 @@ _020fffc0: .word func_ov03_020fbcc8 _020fffc4: .word func_0203ebc8 _020fffc8: .word data_ov03_02100ab8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov03_020fffcc data_ov03_020fffcc: ; 0x020fffcc .byte 0x28, 0xfe, 0x0f, 0x02 diff --git a/asm/ov04.s b/asm/ov04.s index 1c5c021e..1009d40e 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -30516,7 +30516,7 @@ data_ov04_0210fd48: ; 0x0210fd48 .ascii "vr01_Demo01" .byte 0x00, 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov04_0210fd58 arm_func_start func_ov04_0210fd58 func_ov04_0210fd58: ; 0x0210fd58 @@ -30544,7 +30544,7 @@ func_ov04_0210fd7c: ; 0x0210fd7c _0210fd8c: .word data_ov04_02110cb4 .global data_ov04_0210fd90 - .section .sinit + .section .sinit, 4, 1, 4 data_ov04_0210fd90: ; 0x0210fd90 .byte 0x58, 0xfd, 0x10, 0x02 .global data_ov04_0210fd94 diff --git a/asm/ov05.s b/asm/ov05.s index ccedaeb2..ebbfd540 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -20904,7 +20904,7 @@ data_ov05_021123b4: ; 0x021123b4 data_ov05_021123b8: ; 0x021123b8 .byte 0x00, 0xf0, 0x00, 0x00 - .section .sinit + .section .sinit, 4, 1, 4 .global func_ov05_021123bc arm_func_start func_ov05_021123bc func_ov05_021123bc: ; 0x021123bc diff --git a/asm/ov06.s b/asm/ov06.s index 7139d7ed..d7cc5f63 100644 --- a/asm/ov06.s +++ b/asm/ov06.s @@ -5028,9 +5028,9 @@ data_ov06_0210398c: ; 0x0210398c .byte 0x6c, 0x39, 0x10, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00 .byte 0x01, 0x01, 0x00, 0x00, 0x54, 0x39, 0x10, 0x02, 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov06_021039c0 diff --git a/asm/ov07.s b/asm/ov07.s index aaf0e75d..f3fbf5c7 100644 --- a/asm/ov07.s +++ b/asm/ov07.s @@ -2340,9 +2340,9 @@ data_ov07_02102930: ; 0x02102930 data_ov07_02102934: ; 0x02102934 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov07_02102940 diff --git a/asm/ov08.s b/asm/ov08.s index c686e7c5..fc87a922 100644 --- a/asm/ov08.s +++ b/asm/ov08.s @@ -1192,9 +1192,9 @@ _02113ac0: .rodata - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov08_02113b00 diff --git a/asm/ov09.s b/asm/ov09.s index 4b7fb665..783df39f 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -20497,7 +20497,7 @@ data_ov09_0211e49c: ; 0x0211e49c data_ov09_0211e4a0: ; 0x0211e4a0 .byte 0x15, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov09_0211e4a4 arm_func_start func_ov09_0211e4a4 func_ov09_0211e4a4: ; 0x0211e4a4 @@ -20651,7 +20651,7 @@ func_ov09_0211e64c: ; 0x0211e64c arm_func_end func_ov09_0211e64c _0211e65c: .word data_027e1094 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov09_0211e660 data_ov09_0211e660: ; 0x0211e660 .byte 0xa4, 0xe4, 0x11, 0x02 diff --git a/asm/ov10.s b/asm/ov10.s index d4305034..e0225dc6 100644 --- a/asm/ov10.s +++ b/asm/ov10.s @@ -19192,9 +19192,9 @@ data_ov10_0211ea04: ; 0x0211ea04 .ascii "Menu/Bg/rplBg.bin" .byte 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov10_0211ea20 diff --git a/asm/ov11.s b/asm/ov11.s index 56376a3b..47c4d685 100644 --- a/asm/ov11.s +++ b/asm/ov11.s @@ -52843,7 +52843,7 @@ func_ov11_0212b9f8: ; 0x0212b9f8 ldmia sp!, {r4, pc} arm_func_end func_ov11_0212b9f8 - .data + .rodata .global data_ov11_0212ba0c data_ov11_0212ba0c: ; 0x0212ba0c .byte 0xff, 0xff @@ -64947,9 +64947,9 @@ data_ov11_0212ecfe: ; 0x0212ecfe data_ov11_0212ecff: ; 0x0212ecff .byte 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov11_0212ed20 diff --git a/asm/ov12.s b/asm/ov12.s index 3ae77c03..284e2043 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -44826,7 +44826,7 @@ data_ov12_021354b4: ; 0x021354b4 .ascii "Menu/Bg/simpleBg.bin" .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov12_021354cc arm_func_start func_ov12_021354cc func_ov12_021354cc: ; 0x021354cc @@ -45153,7 +45153,7 @@ func_ov12_021358e0: ; 0x021358e0 _021358ec: .word func_ov12_021341f0 _021358f0: .word data_ov12_0213deb0 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov12_021358f4 data_ov12_021358f4: ; 0x021358f4 .byte 0xcc, 0x54, 0x13, 0x02 diff --git a/asm/ov13.s b/asm/ov13.s index ed3ded00..0ffca08a 100644 --- a/asm/ov13.s +++ b/asm/ov13.s @@ -4218,7 +4218,7 @@ data_ov13_021160d4: ; 0x021160d4 .ascii "/Menu/Bg/pslnkDBg.bin" .byte 0x00, 0x00, 0x00 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov13_021160ec data_ov13_021160ec: ; 0x021160ec .byte 0x04, 0x4b, 0x11, 0x02 diff --git a/asm/ov14.s b/asm/ov14.s index b9648a60..56f402af 100644 --- a/asm/ov14.s +++ b/asm/ov14.s @@ -67236,7 +67236,7 @@ data_ov14_021541d4: ; 0x021541d4 .ascii "Menu/UI_main/UIMBig.bin" .byte 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov14_021541ec arm_func_start func_ov14_021541ec func_ov14_021541ec: ; 0x021541ec @@ -69143,7 +69143,7 @@ _02155840: .word func_ov14_02152880 _02155844: .word func_0203ebc8 _02155848: .word data_ov14_0215b488 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov14_0215584c data_ov14_0215584c: ; 0x0215584c .byte 0xec, 0x41, 0x15, 0x02 diff --git a/asm/ov15.s b/asm/ov15.s index f0ddabfe..1a227569 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -124897,7 +124897,7 @@ data_ov15_0218737c: ; 0x0218737c data_ov15_02187380: ; 0x02187380 .byte 0x92, 0x00, 0x05, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov15_02187384 arm_func_start func_ov15_02187384 func_ov15_02187384: ; 0x02187384 @@ -127399,7 +127399,7 @@ func_ov15_021892b0: ; 0x021892b0 arm_func_end func_ov15_021892b0 _021892cc: .word data_ov15_0218ebac - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov15_021892d0 data_ov15_021892d0: ; 0x021892d0 .byte 0x84, 0x73, 0x18, 0x02 diff --git a/asm/ov16.s b/asm/ov16.s index d7809e6f..4720a6d9 100644 --- a/asm/ov16.s +++ b/asm/ov16.s @@ -913,9 +913,9 @@ data_ov16_02120148: ; 0x02120148 data_ov16_0212014c: ; 0x0212014c .byte 0x00, 0xdc, 0x01, 0x00 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov16_02120160 diff --git a/asm/ov17.s b/asm/ov17.s index 4b939580..cf577429 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -20180,7 +20180,7 @@ data_ov17_0216b2a4: ; 0x0216b2a4 .byte 0xca, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x48, 0xb2, 0x16, 0x02 .byte 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov17_0216b2c4 arm_func_start func_ov17_0216b2c4 func_ov17_0216b2c4: ; 0x0216b2c4 @@ -20767,7 +20767,7 @@ _0216b958: .word func_ov17_0216a818 _0216b95c: .word func_0203ebc8 _0216b960: .word data_ov17_0216d0f8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov17_0216b964 data_ov17_0216b964: ; 0x0216b964 .byte 0xc4, 0xb2, 0x16, 0x02 diff --git a/asm/ov18.s b/asm/ov18.s index 20821ec2..7a275bbb 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -20153,7 +20153,7 @@ data_ov18_0216b778: ; 0x0216b778 data_ov18_0216b77c: ; 0x0216b77c .byte 0xf2, 0xff, 0xff, 0xff - .section .init + .section .init, 4, 1, 4 .global func_ov18_0216b780 arm_func_start func_ov18_0216b780 func_ov18_0216b780: ; 0x0216b780 @@ -20855,7 +20855,7 @@ _0216c040: .word func_ov18_0216a0e0 _0216c044: .word func_0203e7b4 _0216c048: .word data_ov18_0216d678 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov18_0216c04c data_ov18_0216c04c: ; 0x0216c04c .byte 0x80, 0xb7, 0x16, 0x02 diff --git a/asm/ov19.s b/asm/ov19.s index f92a25d3..66fced6f 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -10580,7 +10580,7 @@ data_ov19_02175f02: ; 0x02175f02 data_ov19_02175f03: ; 0x02175f03 .byte 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov19_02175f04 arm_func_start func_ov19_02175f04 func_ov19_02175f04: ; 0x02175f04 @@ -10879,7 +10879,7 @@ _021762c8: .word func_ov19_021756c4 _021762cc: .word func_0203e7b4 _021762d0: .word data_ov19_02177658 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov19_021762d4 data_ov19_021762d4: ; 0x021762d4 .byte 0x04, 0x5f, 0x17, 0x02 diff --git a/asm/ov20.s b/asm/ov20.s index fc69a183..b16fd6e9 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -12709,7 +12709,7 @@ data_ov20_02177aec: ; 0x02177aec data_ov20_02177af0: ; 0x02177af0 .byte 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov20_02177af4 arm_func_start func_ov20_02177af4 func_ov20_02177af4: ; 0x02177af4 @@ -13301,7 +13301,7 @@ _0217828c: .word func_ov20_021775d0 _02178290: .word func_0203e7b4 _02178294: .word data_ov20_0217970c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov20_02178298 data_ov20_02178298: ; 0x02178298 .byte 0xf4, 0x7a, 0x17, 0x02 diff --git a/asm/ov21.s b/asm/ov21.s index c6893f9b..558dd982 100644 --- a/asm/ov21.s +++ b/asm/ov21.s @@ -4447,7 +4447,7 @@ data_ov21_02170ce4: ; 0x02170ce4 data_ov21_02170ce8: ; 0x02170ce8 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov21_02170cec arm_func_start func_ov21_02170cec func_ov21_02170cec: ; 0x02170cec @@ -4648,7 +4648,7 @@ _02170f58: .word func_ov21_02170974 _02170f5c: .word func_0203ebc8 _02170f60: .word data_ov21_02171ca8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov21_02170f64 data_ov21_02170f64: ; 0x02170f64 .byte 0xec, 0x0c, 0x17, 0x02 diff --git a/asm/ov22.s b/asm/ov22.s index 1ebf4983..3b0aa943 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -14298,7 +14298,7 @@ data_ov22_021789c0: ; 0x021789c0 data_ov22_021789c4: ; 0x021789c4 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov22_021789c8 arm_func_start func_ov22_021789c8 func_ov22_021789c8: ; 0x021789c8 @@ -14797,7 +14797,7 @@ _02178fec: .word func_ov22_02178308 _02178ff0: .word data_ov22_0217a620 .global data_ov22_02178ff4 - .section .sinit + .section .sinit, 4, 1, 4 data_ov22_02178ff4: ; 0x02178ff4 .byte 0xc8, 0x89, 0x17, 0x02 .global data_ov22_02178ff8 diff --git a/asm/ov23.s b/asm/ov23.s index 2670c3f3..5d873297 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -15185,7 +15185,7 @@ data_ov23_02179690: ; 0x02179690 data_ov23_02179694: ; 0x02179694 .byte 0x00, 0x10, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov23_02179698 arm_func_start func_ov23_02179698 func_ov23_02179698: ; 0x02179698 @@ -15666,7 +15666,7 @@ _02179cd4: .word func_ov23_02177978 _02179cd8: .word func_0203ebc8 _02179cdc: .word data_ov23_0217ad6c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov23_02179ce0 data_ov23_02179ce0: ; 0x02179ce0 .byte 0x98, 0x96, 0x17, 0x02 diff --git a/asm/ov24.s b/asm/ov24.s index b9745af5..4c0fe070 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -14986,7 +14986,7 @@ data_ov24_021795c8: ; 0x021795c8 data_ov24_021795cc: ; 0x021795cc .byte 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov24_021795d0 arm_func_start func_ov24_021795d0 func_ov24_021795d0: ; 0x021795d0 @@ -15608,7 +15608,7 @@ _02179e10: .word func_ov24_02179048 _02179e14: .word func_0203ebc8 _02179e18: .word data_ov24_0217b150 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov24_02179e1c data_ov24_02179e1c: ; 0x02179e1c .byte 0xd0, 0x95, 0x17, 0x02 diff --git a/asm/ov25.s b/asm/ov25.s index 876e14ea..571b832a 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -14685,7 +14685,7 @@ data_ov25_02179678: ; 0x02179678 data_ov25_0217967c: ; 0x0217967c .byte 0x04, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov25_02179680 arm_func_start func_ov25_02179680 func_ov25_02179680: ; 0x02179680 @@ -15078,7 +15078,7 @@ _02179b8c: .word data_ov25_0217a680 _02179b90: .word func_ov00_020cceec _02179b94: .word data_ov25_0217aa04 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov25_02179b98 data_ov25_02179b98: ; 0x02179b98 .byte 0x80, 0x96, 0x17, 0x02 diff --git a/asm/ov26.s b/asm/ov26.s index 5bc0d8e1..6f090845 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -16190,7 +16190,7 @@ data_ov26_021797bc: ; 0x021797bc .byte 0xe8, 0x96, 0x17, 0x02, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xb4, 0x96, 0x17, 0x02, 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov26_021797dc arm_func_start func_ov26_021797dc func_ov26_021797dc: ; 0x021797dc @@ -16810,7 +16810,7 @@ _0217a014: .word func_ov26_02178fb4 _0217a018: .word func_0203ebc8 _0217a01c: .word data_ov26_0217b5a8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov26_0217a020 data_ov26_0217a020: ; 0x0217a020 .byte 0xdc, 0x97, 0x17, 0x02 diff --git a/asm/ov27.s b/asm/ov27.s index 692e4fe9..d654dd9c 100644 --- a/asm/ov27.s +++ b/asm/ov27.s @@ -14185,7 +14185,7 @@ data_ov27_02179134: ; 0x02179134 data_ov27_02179138: ; 0x02179138 .byte 0x08, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov27_0217913c arm_func_start func_ov27_0217913c func_ov27_0217913c: ; 0x0217913c @@ -14440,7 +14440,7 @@ _02179468: .word func_ov27_02178ae4 _0217946c: .word func_0203ebc8 _02179470: .word data_ov27_0217a1a8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov27_02179474 data_ov27_02179474: ; 0x02179474 .byte 0x3c, 0x91, 0x17, 0x02 diff --git a/asm/ov28.s b/asm/ov28.s index 00c728c5..e5ac84c6 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -13862,7 +13862,7 @@ data_ov28_021784fc: ; 0x021784fc data_ov28_02178500: ; 0x02178500 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov28_02178504 arm_func_start func_ov28_02178504 func_ov28_02178504: ; 0x02178504 @@ -14163,7 +14163,7 @@ _02178888: .word func_ov28_02177900 _0217888c: .word func_0203e7b4 _02178890: .word data_ov28_02179cb8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov28_02178894 data_ov28_02178894: ; 0x02178894 .byte 0x04, 0x85, 0x17, 0x02 diff --git a/asm/ov29.s b/asm/ov29.s index 11e4c45e..cd45bb97 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -14254,7 +14254,7 @@ data_ov29_021794a8: ; 0x021794a8 data_ov29_021794ac: ; 0x021794ac .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov29_021794b0 arm_func_start func_ov29_021794b0 func_ov29_021794b0: ; 0x021794b0 @@ -14554,7 +14554,7 @@ _02179818: .word func_ov29_02179208 _0217981c: .word func_ov29_02179214 _02179820: .word data_ov29_0217bd50 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov29_02179824 data_ov29_02179824: ; 0x02179824 .byte 0xb0, 0x94, 0x17, 0x02 diff --git a/asm/ov30.s b/asm/ov30.s index 3e2182c3..deebdaf0 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -16186,7 +16186,7 @@ data_ov30_0218881c: ; 0x0218881c data_ov30_02188820: ; 0x02188820 .byte 0x00, 0x10, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov30_02188824 arm_func_start func_ov30_02188824 func_ov30_02188824: ; 0x02188824 @@ -16329,7 +16329,7 @@ _02188a20: .word func_ov30_021847b0 _02188a24: .word func_0203e7b4 _02188a28: .word data_ov30_02189530 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov30_02188a2c data_ov30_02188a2c: ; 0x02188a2c .byte 0x24, 0x88, 0x18, 0x02 diff --git a/asm/ov31.s b/asm/ov31.s index b7fb55be..35b7a8b3 100644 --- a/asm/ov31.s +++ b/asm/ov31.s @@ -8211,7 +8211,7 @@ data_ov31_02181b64: ; 0x02181b64 data_ov31_02181b68: ; 0x02181b68 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov31_02181b6c arm_func_start func_ov31_02181b6c func_ov31_02181b6c: ; 0x02181b6c @@ -8561,7 +8561,7 @@ _02182074: .word func_ov31_02181448 _02182078: .word func_0203e7b4 _0218207c: .word data_ov31_021841d4 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov31_02182080 data_ov31_02182080: ; 0x02182080 .byte 0x6c, 0x1b, 0x18, 0x02 diff --git a/asm/ov32.s b/asm/ov32.s index 7940a8cd..34358efb 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -11143,7 +11143,7 @@ data_ov32_02184d34: ; 0x02184d34 data_ov32_02184d38: ; 0x02184d38 .byte 0x03, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov32_02184d3c arm_func_start func_ov32_02184d3c func_ov32_02184d3c: ; 0x02184d3c @@ -11611,7 +11611,7 @@ _021853bc: .word func_ov32_0218468c _021853c0: .word func_0203e7b4 _021853c4: .word data_ov32_021862f0 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov32_021853c8 data_ov32_021853c8: ; 0x021853c8 .byte 0x3c, 0x4d, 0x18, 0x02 diff --git a/asm/ov33.s b/asm/ov33.s index 0727ab69..461f79cf 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -4852,7 +4852,7 @@ data_ov33_0217fb88: ; 0x0217fb88 data_ov33_0217fb8c: ; 0x0217fb8c .byte 0x00, 0x50, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov33_0217fb90 arm_func_start func_ov33_0217fb90 func_ov33_0217fb90: ; 0x0217fb90 @@ -5076,7 +5076,7 @@ _0217fe88: .word func_ov33_0217f658 _0217fe8c: .word func_0203e7b4 _0217fe90: .word data_ov33_02180618 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov33_0217fe94 data_ov33_0217fe94: ; 0x0217fe94 .byte 0x90, 0xfb, 0x17, 0x02 diff --git a/asm/ov34.s b/asm/ov34.s index 5ef732db..703afad2 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -11152,7 +11152,7 @@ data_ov34_02185810: ; 0x02185810 data_ov34_02185814: ; 0x02185814 .byte 0x29, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov34_02185818 arm_func_start func_ov34_02185818 func_ov34_02185818: ; 0x02185818 @@ -11318,7 +11318,7 @@ _02185a58: .word data_ov34_021863a0 _02185a5c: .word data_02057200 _02185a60: .word data_ov34_02186070 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov34_02185a64 data_ov34_02185a64: ; 0x02185a64 .byte 0x18, 0x58, 0x18, 0x02 diff --git a/asm/ov35.s b/asm/ov35.s index f19194b5..269296af 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -11797,7 +11797,7 @@ data_ov35_02185660: ; 0x02185660 data_ov35_02185664: ; 0x02185664 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov35_02185668 arm_func_start func_ov35_02185668 func_ov35_02185668: ; 0x02185668 @@ -11988,7 +11988,7 @@ _021858f4: .word func_ov35_02184810 _021858f8: .word func_0203e7b4 _021858fc: .word data_ov35_02186fec - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov35_02185900 data_ov35_02185900: ; 0x02185900 .byte 0x68, 0x56, 0x18, 0x02 diff --git a/asm/ov36.s b/asm/ov36.s index ce8d0d25..ce6b8092 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -12907,7 +12907,7 @@ data_ov36_02186bac: ; 0x02186bac data_ov36_02186bb0: ; 0x02186bb0 .ascii "LLUN" - .section .init + .section .init, 4, 1, 4 .global func_ov36_02186bb4 arm_func_start func_ov36_02186bb4 func_ov36_02186bb4: ; 0x02186bb4 @@ -12952,7 +12952,7 @@ _02186c28: .word func_ov36_02185ffc _02186c2c: .word func_0203e7b4 _02186c30: .word data_ov36_02186fc0 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov36_02186c34 data_ov36_02186c34: ; 0x02186c34 .byte 0xb4, 0x6b, 0x18, 0x02 diff --git a/asm/ov37.s b/asm/ov37.s index f3fe4419..0e11adbf 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -15341,7 +15341,7 @@ data_ov37_02188688: ; 0x02188688 data_ov37_0218868c: ; 0x0218868c .byte 0x08, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov37_02188690 arm_func_start func_ov37_02188690 func_ov37_02188690: ; 0x02188690 @@ -15573,7 +15573,7 @@ _021889a8: .word data_ov37_02188f00 _021889ac: .word func_ov00_020cceec _021889b0: .word data_ov37_0218922c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov37_021889b4 data_ov37_021889b4: ; 0x021889b4 .byte 0x90, 0x86, 0x18, 0x02 diff --git a/asm/ov38.s b/asm/ov38.s index 6a5f35ae..a922270a 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -14754,7 +14754,7 @@ data_ov38_02188adc: ; 0x02188adc data_ov38_02188ae0: ; 0x02188ae0 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov38_02188ae4 arm_func_start func_ov38_02188ae4 func_ov38_02188ae4: ; 0x02188ae4 @@ -14862,7 +14862,7 @@ _02188c54: .word func_ov38_021884dc _02188c58: .word func_0203e7b4 _02188c5c: .word data_ov38_02189464 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov38_02188c60 data_ov38_02188c60: ; 0x02188c60 .byte 0xe4, 0x8a, 0x18, 0x02 diff --git a/asm/ov39.s b/asm/ov39.s index a78723a3..b497253e 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -13257,7 +13257,7 @@ data_ov39_02186960: ; 0x02186960 data_ov39_02186964: ; 0x02186964 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov39_02186968 arm_func_start func_ov39_02186968 func_ov39_02186968: ; 0x02186968 @@ -13285,7 +13285,7 @@ _021869b0: .word data_ov39_02186cc0 _021869b4: .word data_ov39_02186cc0 _021869b8: .word data_ov39_02186a28 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov39_021869bc data_ov39_021869bc: ; 0x021869bc .byte 0x68, 0x69, 0x18, 0x02 diff --git a/asm/ov40.s b/asm/ov40.s index ad29b1f3..3b352c0c 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -16344,7 +16344,7 @@ data_ov40_02188350: ; 0x02188350 .ascii "mt_gd_sandB_f" .byte 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov40_02188360 arm_func_start func_ov40_02188360 func_ov40_02188360: ; 0x02188360 @@ -16580,7 +16580,7 @@ _021885f8: .word func_ov40_02187380 _021885fc: .word func_0203e7b4 _02188600: .word data_ov40_0219a180 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov40_02188604 data_ov40_02188604: ; 0x02188604 .byte 0x60, 0x83, 0x18, 0x02 diff --git a/asm/ov41.s b/asm/ov41.s index 25c09ce3..1981c93f 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -6006,7 +6006,7 @@ data_ov41_0218e090: ; 0x0218e090 data_ov41_0218e094: ; 0x0218e094 .byte 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov41_0218e098 arm_func_start func_ov41_0218e098 func_ov41_0218e098: ; 0x0218e098 @@ -6200,7 +6200,7 @@ _0218e300: .word data_ov41_0218e85c _0218e304: .word func_ov00_020cceec _0218e308: .word data_ov41_0218eb44 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov41_0218e30c data_ov41_0218e30c: ; 0x0218e30c .byte 0x98, 0xe0, 0x18, 0x02 diff --git a/asm/ov42.s b/asm/ov42.s index 0a3d38c0..74b9c3b1 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -3933,7 +3933,7 @@ data_ov42_0218c73c: ; 0x0218c73c data_ov42_0218c740: ; 0x0218c740 .ascii "LLUN" - .section .init + .section .init, 4, 1, 4 .global func_ov42_0218c744 arm_func_start func_ov42_0218c744 func_ov42_0218c744: ; 0x0218c744 @@ -3991,7 +3991,7 @@ _0218c7ec: .word 0x4d544752 _0218c7f0: .word func_ov42_0218b944 _0218c7f4: .word data_ov42_0218cd68 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov42_0218c7f8 data_ov42_0218c7f8: ; 0x0218c7f8 .byte 0x44, 0xc7, 0x18, 0x02 diff --git a/asm/ov43.s b/asm/ov43.s index 705e1320..f786c8b6 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -4698,7 +4698,7 @@ data_ov43_0218d40c: ; 0x0218d40c data_ov43_0218d410: ; 0x0218d410 .byte 0x01, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov43_0218d414 arm_func_start func_ov43_0218d414 func_ov43_0218d414: ; 0x0218d414 @@ -4818,7 +4818,7 @@ _0218d5b4: .word func_ov43_0218b018 _0218d5b8: .word func_0203e7b4 _0218d5bc: .word data_ov43_0218db4c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov43_0218d5c0 data_ov43_0218d5c0: ; 0x0218d5c0 .byte 0x14, 0xd4, 0x18, 0x02 diff --git a/asm/ov44.s b/asm/ov44.s index e539794c..85e1f2f5 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -7105,7 +7105,7 @@ data_ov44_0218ea94: ; 0x0218ea94 data_ov44_0218ea98: ; 0x0218ea98 .byte 0x9a, 0x01, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov44_0218ea9c arm_func_start func_ov44_0218ea9c func_ov44_0218ea9c: ; 0x0218ea9c @@ -7614,7 +7614,7 @@ _0218f1c0: .word func_ov44_0218e320 _0218f1c4: .word func_0203e7b4 _0218f1c8: .word data_ov44_0219001c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov44_0218f1cc data_ov44_0218f1cc: ; 0x0218f1cc .byte 0x9c, 0xea, 0x18, 0x02 diff --git a/asm/ov45.s b/asm/ov45.s index fe43e23b..64114173 100644 --- a/asm/ov45.s +++ b/asm/ov45.s @@ -6570,7 +6570,7 @@ data_ov45_0218e3e0: ; 0x0218e3e0 data_ov45_0218e3e4: ; 0x0218e3e4 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov45_0218e3e8 arm_func_start func_ov45_0218e3e8 func_ov45_0218e3e8: ; 0x0218e3e8 @@ -6637,7 +6637,7 @@ _0218e49c: .word func_ov45_0218c4c4 _0218e4a0: .word func_0203e7b4 _0218e4a4: .word data_ov45_0218edc8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov45_0218e4a8 data_ov45_0218e4a8: ; 0x0218e4a8 .byte 0xe8, 0xe3, 0x18, 0x02 diff --git a/asm/ov46.s b/asm/ov46.s index 4b95a7ee..e7a7ed70 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -5260,7 +5260,7 @@ data_ov46_021944a4: ; 0x021944a4 data_ov46_021944a8: ; 0x021944a8 .byte 0x04, 0x04, 0x04, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov46_021944ac arm_func_start func_ov46_021944ac func_ov46_021944ac: ; 0x021944ac @@ -5385,7 +5385,7 @@ _02194630: .word data_ov46_02194c68 _02194634: .word data_02057200 _02194638: .word data_ov46_02194a6c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov46_0219463c data_ov46_0219463c: ; 0x0219463c .byte 0xac, 0x44, 0x19, 0x02 diff --git a/asm/ov47.s b/asm/ov47.s index 65a280b6..034254e6 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -5127,7 +5127,7 @@ data_ov47_021942ec: ; 0x021942ec data_ov47_021942ee: ; 0x021942ee .byte 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov47_021942f0 arm_func_start func_ov47_021942f0 func_ov47_021942f0: ; 0x021942f0 @@ -5278,7 +5278,7 @@ _021944dc: .word func_ov47_02193a54 _021944e0: .word func_0203e7b4 _021944e4: .word data_ov47_02194a6c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov47_021944e8 data_ov47_021944e8: ; 0x021944e8 .byte 0xf0, 0x42, 0x19, 0x02 diff --git a/asm/ov48.s b/asm/ov48.s index 4b254079..1ce8c3fb 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -5749,7 +5749,7 @@ data_ov48_021946b8: ; 0x021946b8 data_ov48_021946bc: ; 0x021946bc .byte 0x00, 0x70, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov48_021946c0 arm_func_start func_ov48_021946c0 func_ov48_021946c0: ; 0x021946c0 @@ -6047,7 +6047,7 @@ _02194ac8: .word func_ov48_021940ac _02194acc: .word func_0203e7b4 _02194ad0: .word data_ov48_021954d8 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov48_02194ad4 data_ov48_02194ad4: ; 0x02194ad4 .byte 0xc0, 0x46, 0x19, 0x02 diff --git a/asm/ov49.s b/asm/ov49.s index 66c942c4..0e60f86a 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -3486,7 +3486,7 @@ data_ov49_021982b4: ; 0x021982b4 data_ov49_021982c4: ; 0x021982c4 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov49_021982c8 arm_func_start func_ov49_021982c8 func_ov49_021982c8: ; 0x021982c8 @@ -3612,7 +3612,7 @@ _02198468: .word func_ov49_02197cf4 _0219846c: .word func_0203e7b4 _02198470: .word data_ov49_0219896c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov49_02198474 data_ov49_02198474: ; 0x02198474 .byte 0xc8, 0x82, 0x19, 0x02 diff --git a/asm/ov50.s b/asm/ov50.s index 2ca2e591..e758f6a4 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -3889,7 +3889,7 @@ data_ov50_02198824: ; 0x02198824 data_ov50_02198828: ; 0x02198828 .byte 0x8e, 0x03, 0x8e, 0x03 - .section .init + .section .init, 4, 1, 4 .global func_ov50_0219882c arm_func_start func_ov50_0219882c func_ov50_0219882c: ; 0x0219882c @@ -3997,7 +3997,7 @@ _0219899c: .word data_ov50_02198ad8 _021989a0: .word func_ov00_020cceec _021989a4: .word data_ov50_02198ce0 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov50_021989a8 data_ov50_021989a8: ; 0x021989a8 .byte 0x2c, 0x88, 0x19, 0x02 diff --git a/asm/ov51.s b/asm/ov51.s index 7f98cfa7..389c895a 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -3544,7 +3544,7 @@ data_ov51_02198298: ; 0x02198298 data_ov51_0219829c: ; 0x0219829c .byte 0x9a, 0x01, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov51_021982a0 arm_func_start func_ov51_021982a0 func_ov51_021982a0: ; 0x021982a0 @@ -3707,7 +3707,7 @@ _021984a4: .word func_ov51_021977d0 _021984a8: .word func_0203e7b4 _021984ac: .word data_ov51_02198b00 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov51_021984b0 data_ov51_021984b0: ; 0x021984b0 .byte 0xa0, 0x82, 0x19, 0x02 @@ -3725,18 +3725,6 @@ data_ov51_021984c0: ; 0x021984c0 .byte 0x70, 0x84, 0x19, 0x02 .data - .global data_ov51_021984d0 -data_ov51_021984d0: ; 0x021984d0 - .byte 0x00, 0x00, 0x00, 0x00 - .global data_ov51_021984d4 -data_ov51_021984d4: ; 0x021984d4 - .byte 0x00, 0x00, 0x00, 0x00 - .global data_ov51_021984d8 -data_ov51_021984d8: ; 0x021984d8 - .byte 0x00, 0x00, 0x00, 0x00 - .global data_ov51_021984dc -data_ov51_021984dc: ; 0x021984dc - .byte 0x00, 0x00, 0x00, 0x00 .global data_ov51_021984e0 data_ov51_021984e0: ; 0x021984e0 .byte 0x00, 0x00, 0x00, 0x00 diff --git a/asm/ov52.s b/asm/ov52.s index 2a31cb59..ee12f137 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -2833,7 +2833,7 @@ data_ov52_021978cc: ; 0x021978cc data_ov52_021978d0: ; 0x021978d0 .byte 0x66, 0x1a, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov52_021978d4 arm_func_start func_ov52_021978d4 func_ov52_021978d4: ; 0x021978d4 @@ -2878,7 +2878,7 @@ _02197948: .word func_ov52_02196ddc _0219794c: .word func_0203e7b4 _02197950: .word data_ov52_02197c74 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov52_02197954 data_ov52_02197954: ; 0x02197954 .byte 0xd4, 0x78, 0x19, 0x02 diff --git a/asm/ov53.s b/asm/ov53.s index 2e8e4532..4857f8e5 100644 --- a/asm/ov53.s +++ b/asm/ov53.s @@ -1455,7 +1455,7 @@ data_ov53_02199fc0: ; 0x02199fc0 .rodata - .section .init + .section .init, 4, 1, 4 .global func_ov53_02199fc4 arm_func_start func_ov53_02199fc4 func_ov53_02199fc4: ; 0x02199fc4 @@ -1507,7 +1507,7 @@ _0219a064: .word data_ov53_0219a5f0 _0219a068: .word data_ov53_0219a670 _0219a06c: .word data_ov53_0219a5e4 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov53_0219a070 data_ov53_0219a070: ; 0x0219a070 .byte 0xc4, 0x9f, 0x19, 0x02 diff --git a/asm/ov54.s b/asm/ov54.s index f22831f8..14e6b0a4 100644 --- a/asm/ov54.s +++ b/asm/ov54.s @@ -919,7 +919,7 @@ data_ov54_0219991c: ; 0x0219991c data_ov54_02199920: ; 0x02199920 .byte 0x00, 0x08, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov54_02199924 arm_func_start func_ov54_02199924 func_ov54_02199924: ; 0x02199924 @@ -938,7 +938,7 @@ _02199948: .word data_ov54_02199a2c _0219994c: .word 0x020a95a5 _02199950: .word data_ov54_02199a20 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov54_02199954 data_ov54_02199954: ; 0x02199954 .byte 0x24, 0x99, 0x19, 0x02 diff --git a/asm/ov55.s b/asm/ov55.s index 42bbdc5c..c625541e 100644 --- a/asm/ov55.s +++ b/asm/ov55.s @@ -837,7 +837,7 @@ data_ov55_021997d8: ; 0x021997d8 data_ov55_021997e8: ; 0x021997e8 .byte 0x00, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov55_021997ec arm_func_start func_ov55_021997ec func_ov55_021997ec: ; 0x021997ec @@ -856,7 +856,7 @@ _02199810: .word data_ov55_021998ac _02199814: .word func_ov00_020a95a4 + 1 _02199818: .word data_ov55_021998a0 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov55_0219981c data_ov55_0219981c: ; 0x0219981c .byte 0xec, 0x97, 0x19, 0x02 diff --git a/asm/ov56.s b/asm/ov56.s index dd1be951..3621b650 100644 --- a/asm/ov56.s +++ b/asm/ov56.s @@ -487,7 +487,7 @@ data_ov56_02199320: ; 0x02199320 data_ov56_02199324: ; 0x02199324 .byte 0x33, 0xff, 0xff, 0xff - .section .init + .section .init, 4, 1, 4 .global func_ov56_02199328 arm_func_start func_ov56_02199328 func_ov56_02199328: ; 0x02199328 @@ -515,7 +515,7 @@ _02199370: .word data_ov56_02199400 _02199374: .word data_ov56_02199474 _02199378: .word data_ov56_02199468 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov56_0219937c data_ov56_0219937c: ; 0x0219937c .byte 0x28, 0x93, 0x19, 0x02 diff --git a/asm/ov57.s b/asm/ov57.s index 5e14b8e4..e96ad9ab 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -2181,7 +2181,7 @@ data_ov57_0219a998: ; 0x0219a998 data_ov57_0219a99c: ; 0x0219a99c .byte 0xcd, 0x04, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov57_0219a9a0 arm_func_start func_ov57_0219a9a0 func_ov57_0219a9a0: ; 0x0219a9a0 @@ -2222,7 +2222,7 @@ _0219aa04: .word data_ov57_0219ab1c _0219aa08: .word func_ov57_0219a980 _0219aa0c: .word data_ov57_0219ab1c - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov57_0219aa10 data_ov57_0219aa10: ; 0x0219aa10 .byte 0xa0, 0xa9, 0x19, 0x02 diff --git a/asm/ov58.s b/asm/ov58.s index 44629e56..e523dfbd 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -3298,7 +3298,7 @@ data_ov58_0219ad78: ; 0x0219ad78 data_ov58_0219ad7c: ; 0x0219ad7c .byte 0x64, 0x00, 0x00, 0x00 - .section .init + .section .init, 4, 1, 4 .global func_ov58_0219ad80 arm_func_start func_ov58_0219ad80 func_ov58_0219ad80: ; 0x0219ad80 @@ -3368,7 +3368,7 @@ _0219ae70: .word data_ov58_0219aeec _0219ae74: .word func_ov58_0219a440 _0219ae78: .word data_ov58_0219b0e4 - .section .sinit + .section .sinit, 4, 1, 4 .global data_ov58_0219ae7c data_ov58_0219ae7c: ; 0x0219ae7c .byte 0x80, 0xad, 0x19, 0x02 diff --git a/asm/ov59.s b/asm/ov59.s index 04a625b5..2909aea9 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -2550,9 +2550,9 @@ data_ov59_0219b120: ; 0x0219b120 .byte 0x00, 0x00, 0x00, 0x00 .global data_ov59_0219b124 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov59_0219b140 diff --git a/asm/ov60.s b/asm/ov60.s index 9bf63b29..925dda4f 100644 --- a/asm/ov60.s +++ b/asm/ov60.s @@ -12052,9 +12052,9 @@ data_ov60_021476e8: ; 0x021476e8 .byte 0x00, 0x00, 0x00, 0x00 .global data_ov60_021476ec - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov60_02147700 diff --git a/asm/ov61.s b/asm/ov61.s index fed97793..9381d1d5 100644 --- a/asm/ov61.s +++ b/asm/ov61.s @@ -75225,9 +75225,9 @@ data_ov61_0217a604: ; 0x0217a604 .byte 0xc4, 0xe9, 0x17, 0x02 .global data_ov61_0217a608 - .section .init + .section .init, 4, 1, 4 - .section .sinit + .section .sinit, 4, 1, 4 .data .global data_ov61_0217a620 diff --git a/tools/lcf.py b/tools/lcf.py index eabdc1bf..45b066b3 100644 --- a/tools/lcf.py +++ b/tools/lcf.py @@ -240,13 +240,11 @@ with open(f'{BUILD}arm9_linker_script.lcf', 'w') as file: file.write('\n') file.write('SECTIONS {\n') file.write(' .arm9 : {\n') - file.write(' ALIGNALL(4);\n') - file.write(' . = ALIGN(32);\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.text)\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.init)\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.rodata)\n') - file.write(' . = ALIGN(4);\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.sinit)\n') + file.write(' . = ALIGN(32);\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.data)\n') for obj in ARM9_OBJECTS: file.write(f' {name(obj)}(.bss)\n') file.write(' . = ALIGN(32);\n')