Merge 'Fix intermittent alignment error with resources' (#2334)

OoTRandomizer · Nov 19, 2024 · cc375d1 · cc375d1
2 parents c8ff887 + 7941d90
commit cc375d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ASM/Makefile b/ASM/Makefile
@@ -34,7 +34,7 @@ $(OBJDIR):
 	mkdir -p $@
 
 $(OBJDIR)/%_bin.o: $(RESOURCEDIR)/%.bin
-	$(OBJCOPY) -I binary -O elf32-bigmips --rename-section .data=.rodata,alloc,load,readonly,data,contents $< $@
+	$(OBJCOPY) -I binary -O elf32-bigmips --set-section-alignment .data=8 --rename-section .data=.rodata,alloc,load,readonly,data,contents $< $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_start=$(call UC,$*)_RESOURCE $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_end=$(call UC,$*)_RESOURCE_END $@
 	$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_size=$(call UC,$*)_RESOURCE_SIZE $@

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.2.26'
+__version__ = '8.2.27'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0