Ninja fixups, add map5_s01 random bytes to postbuild

Author: emoose

Makefile

@@ -86,7 +86,7 @@ INSERT_OVLS_FLAGS   := -exe "$(ROM_DIR)/$(GAME_VERSION)/$(GAME_FILE_EXE)" -fs "$
 TARGET_PREBUILD  := main bodyprog screens/stream
 
 # Targets that will run tools/postbuild.py after being linked & extracted from ELF.
-TARGET_POSTBUILD := bodyprog screens/stream maps/map3_s06 maps/map4_s05
+TARGET_POSTBUILD := bodyprog screens/stream maps/map3_s06 maps/map4_s05 maps/map5_s01
 
 # Adjusts compiler and assembler flags based on source file location.
 # - Files under main executable paths use -G8; overlay files use -G0.

configs/USA/maps/map1_s04.yaml

@@ -59,6 +59,8 @@ segments:
       - [0x1050, .rodata, map1_s04]
 
       # .text section
+      - [0x13E4, c, map1_s04_anim_info]
+      - [0x13E4, c, map1_s04_header]
       - [0x13E4, c, map1_s04]
 
       # .data section

configs/USA/maps/map2_s01.yaml

@@ -62,6 +62,8 @@ segments:
       - [0x1178, .rodata, map2_s01_2]
 
       # .text section
+      - [0x1A98, c, map2_s01_anim_info]
+      - [0x1A98, c, map2_s01_header]
       - [0x1A98, c, map2_s01]
       - [0x3C94, c, Chara_Dahlia]
       - [0x4828, c, map2_s01_2]

configs/USA/maps/map2_s03.yaml

@@ -59,6 +59,8 @@ segments:
       - [0x1050, .rodata, map2_s03]
 
       # .text section
+      - [0x138C, c, map2_s03_anim_info]
+      - [0x138C, c, map2_s03_header]
       - [0x138C, c, map2_s03]
 
       # .data section

configs/USA/maps/map2_s04.yaml

@@ -59,6 +59,8 @@ segments:
       - [0x1050, .rodata, map2_s04]
 
       # .text section
+      - [0x1654, c, map2_s04_anim_info]
+      - [0x1654, c, map2_s04_header]
       - [0x1654, c, map2_s04]
 
       # .data section

configs/USA/maps/map5_s01.yaml

@@ -55,6 +55,7 @@ segments:
     subsegments:
       # .rodata section
       - [0x0, .rodata, map5_s01]
+      - [0x3515, rodata] # 3 random bytes, linker artifact, splat doesn't seem to write to .s so postbuild.py has to patch them back in.
 
       # .text section
       - [0x3518, c, map5_s01]

configs/USA/maps/map5_s03.yaml

@@ -62,6 +62,8 @@ segments:
       - [0x1468, .rodata, map5_s03_2]
 
       # .text section
+      - [0x237C, c, map5_s03_anim_info]
+      - [0x237C, c, map5_s03_header]
       - [0x237C, c, map5_s03]
       - [0x6364, c, Chara_Kaufmann]
       - [0x6FD4, c, map5_s03_2]

include/maps/map5/map5_s01.h

@@ -19,8 +19,6 @@ extern s_WorldObjectDescNoRot g_WorldObject0; // D_800F3E10
 extern s_WorldObjectDesc g_WorldObject1; // D_800F3E40
 extern s_WorldObjectPose  g_CommonWorldObjectPoses[5]; // 0x800F018C
 
-extern u8 D_800CCA84[]; // "HOOK_HID" + garbage after null byte
-extern SVECTOR3 D_800CC938; // Empty `SVECTOR3`, remove after all functions that use it are decompiled.
 extern u16 D_800F0174;
 extern s_FsImageDesc D_800F0178;
 extern VECTOR3 D_800F0180;

ninja_config.py

@@ -202,6 +202,8 @@ class YAML_INFO:
 AS_FLAGS      = f"{ENDIAN} {INCLUDE_FLAGS} {OPT_FLAGS} -march=r3000 -mtune=r3000 -no-pad-sections"
 OBJDUMP_FLAGS = f"--disassemble-all --reloc --disassemble-zeroes -Mreg-names=32"
 
+TARGETS_POSTBUILD = ["1ST/BODYPROG.BIN", "VIN/STREAM.BIN", "VIN/MAP3_S06.BIN", "VIN/MAP4_S05.BIN", "VIN/MAP5_S01.BIN"]
+
 def ninja_setup_list_add_source(target_path: str, source_path: str, ninja_file, objdiff_file, non_matching_enabled):
 
     skipAsm = ""
@@ -475,7 +477,7 @@ def ninja_setup_main(ninja_file_prefix: str, game_version_idx: int, split_entrie
             implicit=f"{output}.elf"
         )
 
-        if split_config.SPLIT_BASENAME == "1ST/BODYPROG.BIN" or split_config.SPLIT_BASENAME == "VIN/STREAM.BIN":
+        if split_config.SPLIT_BASENAME in TARGETS_POSTBUILD:
             ninja.build(
                 outputs=f"{output}.fix",
                 rule="postbuild",
@@ -804,7 +806,7 @@ def main():
     parser.add_argument(
         "-iso_e", "--iso_extract",
         help="Extract game files",
-        type=str
+        action="store_true"
     )
     parser.add_argument(
         "-set", "--setup",
@@ -863,7 +865,7 @@ def main():
         clean_working_files(False)
         return
 
-    if args.iso_extract != None:
+    if args.iso_extract:
         extract_files(gameVersionOption)
         return
 

src/maps/map5_s01/map5_s01.c

@@ -1045,8 +1045,7 @@ void func_800ECB58(void) // 0x800ECB58
 {
     WorldObjectNoRotInit(&g_WorldObject0, "RSRMAP_H", -46.5f, 0.0f, 2.5f);
 
-    // @hack D_800CCA84 = "HOOK_HID" with some garbage after the null byte.
-    WorldObjectInit(&g_WorldObject1, D_800CCA84, 52.15f, -1.359f, -57.925f, 0.0f, 0.0f, 5.8f);
+    WorldObjectInit(&g_WorldObject1, "FOOK_HID", 52.15f, -1.359f, -57.925f, 0.0f, 0.0f, 5.8f);
 
     if (g_SavegamePtr->gameDifficulty_260 == GameDifficulty_Easy)
     {
@@ -1130,5 +1129,3 @@ void func_800ECC8C(void) // 0x800ECC8C
         }
     }
 }
-
-INCLUDE_RODATA("asm/maps/map5_s01/nonmatchings/map5_s01", D_800CCA84);