Merge branch 'master' into fragment8

pret · Aug 19, 2024 · c52aea7 · c52aea7
2 parents 5d606ce + 6a26b5b
commit c52aea7
Show file tree

Hide file tree

Showing 4 changed files with 772 additions and 80 deletions.
diff --git a/include/sections.h b/include/sections.h
@@ -413,4 +413,6 @@ extern u8 _6C4E50_ROM_START[];
 
 extern u8 D_124570[];
 
+extern u32 fragment1_relocs_ROM_END[];
+
 #endif // _SECTIONS_H_
diff --git a/src/E1C0.c b/src/E1C0.c
@@ -84,7 +84,7 @@ void func_8000D738(struct UnkInputStruct8000D738* arg0) {
     D_800AA660 = main_pool_alloc(0x2210, 0);
     D_800AA664 = main_pool_alloc(0x21E0, 0);
     func_80004454(((u32)((u32)&fragment1_TEXT_START & 0x0FF00000) >> 0x14) - 0x10, &fragment1_ROM_START,
-                  &fragment1_ROM_END);
+                  &fragment1_relocs_ROM_END);
     temp_v0 = func_800044F4(&_3BA190_ROM_START, &_3CB130_ROM_START, 1, 1);
     D_800AA660->unk21FC = func_8000484C(temp_v0, 0);
     D_800AA660->unk2200 = func_8000484C(temp_v0, 1);

diff --git a/yamls/us/header.yaml b/yamls/us/header.yaml
@@ -52,5 +52,5 @@ options:
   segment_end_before_align: True
   ld_align_section_vram_end: False
   image_type_in_extension: true
-
+  check_consecutive_segment_types: False
 segments: