From e758a161c22071cc6f8f6ff4cd8521c2f9b9cea3 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Wed, 10 Aug 2022 19:10:26 -0400 Subject: [PATCH] Remove dupliate .baligns Former-commit-id: c3b5f8a821b211a5ccff4d93eff804efe457e8c5 --- asm/Dolphin/GBA/GBA.s | 2 -- asm/Dolphin/card/CARDBios.s | 1 - asm/Dolphin/dtk.s | 1 - asm/Dolphin/pad/pad.s | 2 -- asm/Dolphin/si/SIBios.s | 1 - asm/Dolphin/vi.s | 1 - asm/MetroidPrime/main.s | 1 - asm/Runtime/FILE_POS.s | 1 - asm/Runtime/abort_exit.s | 1 - asm/Runtime/alloc.s | 1 - asm/Runtime/e_log.s | 1 - asm/Runtime/global_destructor_chain.s | 1 - asm/Runtime/uart_console_io.s | 1 - asm/musyx/hardware.s | 1 - asm/musyx/hw_aramdma.s | 1 - asm/musyx/hw_dolphin.s | 1 - asm/musyx/hw_dspctrl.s | 1 - asm/musyx/s_data.s | 1 - asm/musyx/snd3d.s | 1 - asm/musyx/stream.s | 1 - asm/musyx/synth.s | 1 - asm/musyx/synthdata.s | 1 - asm/musyx/synthvoice.s | 1 - 23 files changed, 25 deletions(-) diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s index eb784409..4064d687 100644 --- a/asm/Dolphin/GBA/GBA.s +++ b/asm/Dolphin/GBA/GBA.s @@ -2,7 +2,6 @@ .section .bss .balign 8 -.balign 4 .global lbl_8056A0A0 lbl_8056A0A0: @@ -13,7 +12,6 @@ __GBA: .section .sbss, "wa" .balign 8 -.balign 4 .global __GBAReset __GBAReset: .skip 0x4 diff --git a/asm/Dolphin/card/CARDBios.s b/asm/Dolphin/card/CARDBios.s index 6573908b..5e1c5345 100644 --- a/asm/Dolphin/card/CARDBios.s +++ b/asm/Dolphin/card/CARDBios.s @@ -29,7 +29,6 @@ lbl_805A8BF0: .section .sbss, "wa" .balign 8 -.balign 4 .global __CARDEncode __CARDEncode: .skip 0x8 diff --git a/asm/Dolphin/dtk.s b/asm/Dolphin/dtk.s index 95897580..8c5f6096 100644 --- a/asm/Dolphin/dtk.s +++ b/asm/Dolphin/dtk.s @@ -26,7 +26,6 @@ lbl_80569A28: .section .sbss, "wa" .balign 8 -.balign 4 .global lbl_805A9B98 lbl_805A9B98: .skip 0x4 diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s index ea60b245..90e60746 100644 --- a/asm/Dolphin/pad/pad.s +++ b/asm/Dolphin/pad/pad.s @@ -10,8 +10,6 @@ lbl_80542000: .section .sbss .balign 8 -.balign 4 - Initialized: .skip 0x4 diff --git a/asm/Dolphin/si/SIBios.s b/asm/Dolphin/si/SIBios.s index 80a07706..d426134b 100644 --- a/asm/Dolphin/si/SIBios.s +++ b/asm/Dolphin/si/SIBios.s @@ -78,7 +78,6 @@ __SIVersion: .section .sbss, "wa" .balign 8 -.balign 4 .global lbl_805A9BD0 lbl_805A9BD0: .skip 0x4 diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index 6a797c21..ce98b28c 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -197,7 +197,6 @@ lbl_805A8B7C: .section .sbss, "wa" .balign 8 -.balign 4 lbl_805A9958: .skip 0x4 lbl_805A995C: diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index 781bc819..bd21773b 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -826,7 +826,6 @@ lbl_805A6BCC: .section .sbss, "wa" .balign 8 -.balign 4 .global gpResourceFactory gpResourceFactory: .skip 0x4 diff --git a/asm/Runtime/FILE_POS.s b/asm/Runtime/FILE_POS.s index b4b7fb7d..ccc9f7fa 100644 --- a/asm/Runtime/FILE_POS.s +++ b/asm/Runtime/FILE_POS.s @@ -2,7 +2,6 @@ .section .sbss .balign 8 -.balign 4 .global lbl_805A99D0 lbl_805A99D0: .skip 0x8 diff --git a/asm/Runtime/abort_exit.s b/asm/Runtime/abort_exit.s index 9e87c02c..85f2691a 100644 --- a/asm/Runtime/abort_exit.s +++ b/asm/Runtime/abort_exit.s @@ -7,7 +7,6 @@ lbl_80542198: .section .sbss .balign 8 -.balign 4 .global lbl_805A99B8 lbl_805A99B8: .skip 0x4 diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 38d12259..ba82f614 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -20,7 +20,6 @@ lbl_803D85C0: .section .sbss .balign 8 -.balign 4 .global lbl_805A99C8 lbl_805A99C8: .skip 0x8 diff --git a/asm/Runtime/e_log.s b/asm/Runtime/e_log.s index 1f305201..81711d8b 100644 --- a/asm/Runtime/e_log.s +++ b/asm/Runtime/e_log.s @@ -2,7 +2,6 @@ .section .sbss .balign 8 -.balign 4 .global lbl_805A99E0 lbl_805A99E0: .skip 0x8 diff --git a/asm/Runtime/global_destructor_chain.s b/asm/Runtime/global_destructor_chain.s index f1f9363a..c9a085ac 100644 --- a/asm/Runtime/global_destructor_chain.s +++ b/asm/Runtime/global_destructor_chain.s @@ -40,6 +40,5 @@ __destroy_global_chain_reference: .section .sbss .balign 8 -.balign 4 __global_destructor_chain: .skip 0x8 diff --git a/asm/Runtime/uart_console_io.s b/asm/Runtime/uart_console_io.s index 2055c9ea..47576a67 100644 --- a/asm/Runtime/uart_console_io.s +++ b/asm/Runtime/uart_console_io.s @@ -2,7 +2,6 @@ .section .sbss .balign 8 -.balign 4 .global lbl_805A99D8 lbl_805A99D8: .skip 0x8 diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index e216b466..a3e680b3 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -27,7 +27,6 @@ lbl_805AF3A8: .section .sbss .balign 8 -.balign 4 .global salTimeOffset salTimeOffset: .skip 0x4 diff --git a/asm/musyx/hw_aramdma.s b/asm/musyx/hw_aramdma.s index 9e998be9..7e0e1680 100644 --- a/asm/musyx/hw_aramdma.s +++ b/asm/musyx/hw_aramdma.s @@ -11,7 +11,6 @@ aramStreamBuffers: .section .sbss, "wa" .balign 8 -.balign 4 .global aramIdleStreamBuffers aramIdleStreamBuffers: .skip 0x4 diff --git a/asm/musyx/hw_dolphin.s b/asm/musyx/hw_dolphin.s index ad568154..c78e4921 100644 --- a/asm/musyx/hw_dolphin.s +++ b/asm/musyx/hw_dolphin.s @@ -9,7 +9,6 @@ dram_image: .section .sbss, "wa" .balign 8 -.balign 4 .global oldState oldState: .skip 0x4 diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index 56410c4c..ff31750e 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -13,7 +13,6 @@ dspStudio: .section .sbss .balign 8 -.balign 4 .global dspARAMZeroBuffer dspARAMZeroBuffer: .skip 0x4 diff --git a/asm/musyx/s_data.s b/asm/musyx/s_data.s index f45a58da..9e0ea797 100644 --- a/asm/musyx/s_data.s +++ b/asm/musyx/s_data.s @@ -2,7 +2,6 @@ .section .sbss .balign 8 -.balign 4 .global sp sp: .skip 0x8 diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index 22dfd03f..513c2076 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -17,7 +17,6 @@ startListNum: .section .sbss .balign 8 -.balign 4 .global runListNum runListNum: .skip 0x1 diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index 522f2582..d08e7c27 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -8,7 +8,6 @@ streamInfo: .section .sbss .balign 8 -.balign 4 nextPublicID: .skip 0x4 streamCallDelay: diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index 0ebb4b17..e60417a0 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -114,7 +114,6 @@ inpAuxA: .section .sbss .balign 8 -.balign 4 .global sndActive sndActive: .skip 0x1 diff --git a/asm/musyx/synthdata.s b/asm/musyx/synthdata.s index c0b7c3ec..490a7580 100644 --- a/asm/musyx/synthdata.s +++ b/asm/musyx/synthdata.s @@ -35,7 +35,6 @@ dataMacSubTabmem: .section .sbss .balign 8 -.balign 4 "result$494": .skip 0x4 "result$768": diff --git a/asm/musyx/synthvoice.s b/asm/musyx/synthvoice.s index c531f06d..5bc36fe4 100644 --- a/asm/musyx/synthvoice.s +++ b/asm/musyx/synthvoice.s @@ -17,7 +17,6 @@ vs: .section .sbss .balign 8 -.balign 4 .global vidFree vidFree: .skip 0x4