The Ghost Ship (#46)

Makefile

@@ -13,6 +13,7 @@ OVL_CREDITS		:= credits
 OVL_DC			:= dc
 OVL_EE			:= ee
 OVL_GG			:= gg
+OVL_GS			:= gs
 OVL_GY1			:= gy1
 OVL_GY2			:= gy2
 OVL_LANDMAP		:= landmap
@@ -115,7 +116,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: ac ag cc ch cr credits dc ee gg gy1 gy2 landmap pg sf sv zl
+overlays: ac ag cc ch cr credits dc ee gg gs gy1 gy2 landmap pg sf sv zl
 
 ac: ovlac_dirs $(BUILD_DIR)/AC.BIN
 $(BUILD_DIR)/AC.BIN: $(BUILD_DIR)/ovlac.elf
@@ -153,6 +154,10 @@ gg: ovlgg_dirs $(BUILD_DIR)/GG.BIN
 $(BUILD_DIR)/GG.BIN: $(BUILD_DIR)/ovlgg.elf
 	$(OBJCOPY) -O binary $< $@
 
+gs: ovlgs_dirs $(BUILD_DIR)/GS.BIN
+$(BUILD_DIR)/GS.BIN: $(BUILD_DIR)/ovlgs.elf
+	$(OBJCOPY) -O binary $< $@
+
 gy1: ovlgy1_dirs $(BUILD_DIR)/GY1.BIN
 $(BUILD_DIR)/GY1.BIN: $(BUILD_DIR)/ovlgy1.elf
 	$(OBJCOPY) -O binary $< $@
@@ -208,7 +213,7 @@ expected: check
 
 
 # Assembly extraction
-extract: extract_main extract_game extract_ovlac extract_ovlag extract_ovlcc extract_ovlch extract_ovlcr extract_ovlcredits extract_ovldc extract_ovlee extract_ovlgg extract_ovlgy1 extract_ovlgy2 extract_ovllandmap extract_ovlpg extract_ovlsf extract_ovlsv extract_ovlzl
+extract: extract_main extract_game extract_ovlac extract_ovlag extract_ovlcc extract_ovlch extract_ovlcr extract_ovlcredits extract_ovldc extract_ovlee extract_ovlgg extract_ovlgs extract_ovlgy1 extract_ovlgy2 extract_ovllandmap extract_ovlpg extract_ovlsf extract_ovlsv extract_ovlzl
 
 ## Main
 extract_main:
@@ -244,6 +249,6 @@ checkformat:
 # Phony
 .PHONY: init, all, clean, format, checkformat, check, expected
 .PHONY: list_src_files, list_o_files, link
-.PHONY: main game ac ag cc ch cr credits dc ee gg gy1 gy2 landmap pg sf sv zl
+.PHONY: main game ac ag cc ch cr credits dc ee gg gs gy1 gy2 landmap pg sf sv zl
 .PHONY: %_dirs
 .PHONY: extract, extract_%

config/medievil.check.sha

@@ -9,6 +9,7 @@ b52e73eea027f2a517be47b6f2133e3a6ac73a15 build/CR.BIN
 9451b3cfe3be9930ebee96e6790e2e6ec4aa22c8 build/DC.BIN
 e299c0820fe47fb99bc706f54b5dff1429a5bfcc build/EE.BIN
 fe4dbcaec959c190509508f17f3876640d8279f5 build/GG.BIN
+d0e17f3e271e98c4b9ac0ff26e44a529a1f67182 build/GS.BIN
 8fc50a18dab3e4fc53fd6927ff00e4e9ead449e0 build/GY1.BIN
 0de8a92afb3823b56b7818083ba75b9f6d98e015 build/GY2.BIN
 021af3a550f58046073a75f6d4f9d0dd462748da build/LANDMAP.BIN

config/splat.ovlgs.yaml

@@ -0,0 +1,40 @@
+name: GS.BIN
+sha1: d0e17f3e271e98c4b9ac0ff26e44a529a1f67182
+options:
+  platform: psx
+  basename: ovls
+  base_path: ..
+  build_path: build/
+  target_path: disk/OVERLAYS/GS.BIN
+  asm_path: asm/ovl/gs
+  asset_path: assets/ovl/gs
+  src_path: src/ovl/gs
+  compiler: GCC
+  symbol_addrs_path: config/symbols.ovlgs.txt
+  undefined_funcs_auto_path: config/undefined_funcs_auto.ovlgs.txt
+  undefined_syms_auto_path: config/undefined_syms_auto.ovlgs.txt
+  ld_script_path: config/ld/ovlgs.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: ovlgs
+    type: code
+    start: 0x00000000
+    vram: 0x80010000
+    subsegments:
+      - [0x0, rodata]
+      - [0x158, c]
+      - [0x4F10, data]
+  - [0x8650]

src/ovl/gs/158.c

@@ -0,0 +1,171 @@
+#include "common.h"
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010158);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010250);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010290);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010340);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010388);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800103B8);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001059C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010918);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010B10);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010C58);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010D44);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010EA0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80010F88);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011124);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800114E4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001152C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011564);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001165C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011798);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011904);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011930);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001198C);
+
+void func_80011A30(void) {
+}
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011A38);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011A58);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011C34);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011E14);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80011FF0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800121D0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800123E4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800124F4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001253C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012584);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012624);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012698);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012944);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800129C0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012A8C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012B58);
+
+void func_80012B7C(void) {
+}
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012B84);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012C14);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012E08);
+
+void func_80012EB0(void) {
+}
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80012EB8);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013210);
+
+void func_80013234(void) {
+}
+
+void func_8001323C(void) {
+}
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013244);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800132C0);
+
+void func_8001349C(void) {
+}
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800134A4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013520);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013654);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001369C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013740);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800138D0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_8001394C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013A80);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013B28);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013C3C);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013CE4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013D80);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013DC0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013E08);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013E68);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013F10);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80013F60);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014148);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014220);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014328);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014530);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014610);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800147C8);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800148CC);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_800149D0);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014BE4);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014C34);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014C84);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014D40);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014DC8);
+
+INCLUDE_ASM("asm/ovl/gs/nonmatchings/158", func_80014E6C);