Sleeping Village (#36)

Makefile

@@ -11,6 +11,7 @@ OVL_GY1			:= gy1
 OVL_GY2			:= gy2
 OVL_LANDMAP		:= landmap
 OVL_SF			:= sf
+OVL_SV			:= sv
 
 # Compiler
 CC1PSX          := ./bin/cc1-2.8.1
@@ -106,7 +107,7 @@ $(BUILD_DIR)/$(GAME).elf: $(call list_o_files,game)
 	$(foreach dir,$(ASM_DIR)/$* $(ASM_DIR)/$*/data $(SRC_DIR)/$* $(ASSETS_DIR)/$*,$(shell mkdir -p $(BUILD_DIR)/$(dir)))
 
 ### Overlays ###
-overlays: ch cr dc gy1 gy2 landmap sf
+overlays: ch cr dc gy1 gy2 landmap sf sv
 
 ch: ovlch_dirs $(BUILD_DIR)/CH.BIN
 $(BUILD_DIR)/CH.BIN: $(BUILD_DIR)/ovlch.elf
@@ -136,6 +137,10 @@ sf: ovlsf_dirs $(BUILD_DIR)/SF.BIN
 $(BUILD_DIR)/SF.BIN: $(BUILD_DIR)/ovlsf.elf
 	$(OBJCOPY) -O binary $< $@
 
+sv: ovlsv_dirs $(BUILD_DIR)/SV.BIN
+$(BUILD_DIR)/SV.BIN: $(BUILD_DIR)/ovlsv.elf
+	$(OBJCOPY) -O binary $< $@
+
 ovl%_dirs:
 	$(foreach dir,$(ASM_DIR)/ovl/$* $(ASM_DIR)/ovl/$*/data $(SRC_DIR)/ovl/$* $(ASSETS_DIR)/ovl/$*,$(shell mkdir -p $(BUILD_DIR)/$(dir)))
 
@@ -163,7 +168,7 @@ expected: check
 
 
 # Assembly extraction
-extract: extract_main extract_game extract_ovlch extract_ovlcr extract_ovldc extract_ovlgy1 extract_ovlgy2 extract_ovllandmap extract_ovlsf
+extract: extract_main extract_game extract_ovlch extract_ovlcr extract_ovldc extract_ovlgy1 extract_ovlgy2 extract_ovllandmap extract_ovlsf extract_ovlsv
 
 ## Main
 extract_main:
@@ -199,6 +204,6 @@ checkformat:
 # Phony
 .PHONY: init, all, clean, format, checkformat, check, expected
 .PHONY: list_src_files, list_o_files, link
-.PHONY: main game ch cr dc gy1 gy2 landmap sf
+.PHONY: main game ch cr dc gy1 gy2 landmap sf sv
 .PHONY: %_dirs
 .PHONY: extract, extract_%

config/medievil.check.sha

@@ -6,4 +6,5 @@ b52e73eea027f2a517be47b6f2133e3a6ac73a15 build/CR.BIN
 8fc50a18dab3e4fc53fd6927ff00e4e9ead449e0 build/GY1.BIN
 0de8a92afb3823b56b7818083ba75b9f6d98e015 build/GY2.BIN
 021af3a550f58046073a75f6d4f9d0dd462748da build/LANDMAP.BIN
-3a9943f5922c2bcd8a5960bf29c738a705d15eac build/SF.BIN
+3a9943f5922c2bcd8a5960bf29c738a705d15eac build/SF.BIN
+7a5b3a3f15a61ebb69e1fe98893a7fa9e3289407 build/SV.BIN

config/splat.ovlsv.yaml

@@ -0,0 +1,40 @@
+name: SV.BIN
+sha1: 7a5b3a3f15a61ebb69e1fe98893a7fa9e3289407
+options:
+  platform: psx
+  basename: ovlsv
+  base_path: ..
+  build_path: build/
+  target_path: disk/OVERLAYS/SV.BIN
+  asm_path: asm/ovl/sv
+  asset_path: assets/ovl/sv
+  src_path: src/ovl/sv
+  compiler: GCC
+  symbol_addrs_path: config/symbols.ovlsv.txt
+  undefined_funcs_auto_path: config/undefined_funcs_auto.ovlsv.txt
+  undefined_syms_auto_path: config/undefined_syms_auto.ovlsv.txt
+  ld_script_path: config/ld/ovlsv.ld
+  find_file_boundaries: yes
+  use_legacy_include_asm: no
+  migrate_rodata_to_functions: yes
+  asm_jtbl_label_macro: jlabel
+  section_order:
+    - ".rodata"
+    - ".text"
+    - ".data"
+
+  subalign: 2
+
+  rodata_string_guesser_level: 2
+  data_string_guesser_level: 2
+
+segments:
+  - name: ovlsv
+    type: code
+    start: 0x00000000
+    vram: 0x80010000
+    subsegments:
+      - [0x0, rodata]
+      - [0xD8, c]
+      - [0x72D0, data]
+  - [0xD214]

src/ovl/sv/D8.c

@@ -0,0 +1,207 @@
+#include "common.h"
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800100D8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010164);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800102CC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001037C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800105FC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010644);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800106B0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010858);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010B68);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010BF4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010C70);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010CF8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80010F2C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011094);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011234);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011530);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011588);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011610);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011844);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800119F8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011DB0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011E74);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80011ED4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012144);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012230);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001250C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012588);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012604);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001274C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012870);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012C08);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012D94);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80012E7C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800133D8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013504);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013544);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013578);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013678);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013784);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800138E8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001393C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800139F0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013B5C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013D18);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013D58);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013DA0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013E44);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013E94);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80013FF4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014054);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800142F4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800143F8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014630);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800149D8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014AE8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014B4C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014C54);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014C80);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014CE0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014DD4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014F90);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80014FD0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001501C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015200);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001529C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800152E0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015330);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015630);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800156E8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015718);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800157BC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015820);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015900);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800159CC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015A9C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015B9C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015D74);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015DAC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015F1C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80015FF8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001606C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800161FC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001624C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001628C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800162E0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_8001638C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800163CC);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016408);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800164D0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016698);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800166B8);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800166E0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016718);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016768);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016870);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_800168E0);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016A40);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016C40);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016D64);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016DF4);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016E84);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80016F0C);
+
+INCLUDE_ASM("asm/ovl/sv/nonmatchings/D8", func_80017130);