Pumpkin Gorge (#37)

This commit is contained in:
Allison Mackenzie 2023-10-09 18:41:55 -05:00 committed by GitHub
parent cd83bd1752
commit 8454bf1090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 190 additions and 3 deletions

View File

@ -10,6 +10,7 @@ OVL_DC := dc
OVL_GY1 := gy1
OVL_GY2 := gy2
OVL_LANDMAP := landmap
OVL_PG := pg
OVL_SF := sf
OVL_SV := sv
@ -107,7 +108,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 sv
overlays: ch cr dc gy1 gy2 landmap pg sf sv
ch: ovlch_dirs $(BUILD_DIR)/CH.BIN
$(BUILD_DIR)/CH.BIN: $(BUILD_DIR)/ovlch.elf
@ -133,6 +134,10 @@ landmap: ovllandmap_dirs $(BUILD_DIR)/LANDMAP.BIN
$(BUILD_DIR)/LANDMAP.BIN: $(BUILD_DIR)/ovllandmap.elf
$(OBJCOPY) -O binary $< $@
pg: ovlpg_dirs $(BUILD_DIR)/PG.BIN
$(BUILD_DIR)/PG.BIN: $(BUILD_DIR)/ovlpg.elf
$(OBJCOPY) -O binary $< $@
sf: ovlsf_dirs $(BUILD_DIR)/SF.BIN
$(BUILD_DIR)/SF.BIN: $(BUILD_DIR)/ovlsf.elf
$(OBJCOPY) -O binary $< $@
@ -168,7 +173,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_ovlsv
extract: extract_main extract_game extract_ovlch extract_ovlcr extract_ovldc extract_ovlgy1 extract_ovlgy2 extract_ovllandmap extract_ovlpg extract_ovlsf extract_ovlsv
## Main
extract_main:
@ -204,6 +209,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 sv
.PHONY: main game ch cr dc gy1 gy2 landmap pg sf sv
.PHONY: %_dirs
.PHONY: extract, extract_%

View File

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

40
config/splat.ovlpg.yaml Normal file
View File

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

0
config/symbols.ovlpg.txt Normal file
View File

141
src/ovl/pg/C8.c Normal file
View File

@ -0,0 +1,141 @@
#include "common.h"
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800100C8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80010340);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80010544);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001065C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80010718);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80010804);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001084C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800109A8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80010DB0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011070);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001129C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011460);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011694);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800118B8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800118EC);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011A18);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011B40);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011D98);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80011FF0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80012260);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800124F8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80012844);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800128FC);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800129B4);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80012DA0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80012EC0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80012EE0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013000);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800131A8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800131E0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013234);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001330C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013618);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800137AC);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013820);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013C8C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80013F88);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001429C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800142E8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014324);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800143EC);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001473C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800148D0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014950);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014B2C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014BFC);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014C4C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80014F10);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800150D8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015138);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015388);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015574);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800155E0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015660);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800156C4);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800158A8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_800158E8);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015938);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015BE0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015C78);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80015DB0);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001612C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001617C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80016230);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001655C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80016844);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80016B94);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_80016D98);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001712C);
INCLUDE_ASM("asm/ovl/pg/nonmatchings/C8", func_8001721C);