add progress, fix makefile

Xeeynamo · Feb 13, 2025 · b963060 · b963060
1 parent 021b076
commit b963060
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -144,7 +144,7 @@ extract: extract_$(VERSION)
 
 build: ##@ build game files
 build: build_$(VERSION)
-build_us: main dra weapon ric cen chi dre lib mad no0 no1 no3 no4 np3 nz0 sel st0 wrp rwrp mar bobo4 rbo3 tt_000 tt_001 tt_002 tt_003 tt_004
+build_us: main dra weapon ric cen chi dre lib mad no0 no1 no3 no4 np3 nz0 sel st0 wrp rwrp mar bo4 rbo3 tt_000 tt_001 tt_002 tt_003 tt_004
 build_hd: dra cen wrp tt_000
 clean: ##@ clean extracted files, assets, and build artifacts
 	git clean -fdx assets/
@@ -382,7 +382,7 @@ $(BUILD_DIR)/MAR.BIN: $(BUILD_DIR)/bomar.elf
 $(BUILD_DIR)/F_MAR.BIN:
 	$(GFXSTAGE) e assets/boss/mar $@
 
-bo4: $(BUILD_DIR)/BIN.BIN $(BUILD_DIR)/F_BIN.BIN
+bo4: $(BUILD_DIR)/BO4.BIN $(BUILD_DIR)/F_BO4.BIN
 $(BUILD_DIR)/BO4.BIN: $(BUILD_DIR)/bobo4.elf
 	$(OBJCOPY) -O binary $< $@
 $(BUILD_DIR)/F_BO4.BIN:
@@ -694,10 +694,13 @@ disks/sotn.%.bin disks/sotn.%.cue:
 
 include tools/tools.mk
 
-.PHONY: all, clean, patch, check, build, expected
-.PHONY: format, ff, format-src, format-tools, format-symbols
-.PHONY: main, dra, ric, cen, chi, dre, lib, mad, no0, no1, no3, no4, np3, nz0, st0, wrp, rwrp, bomar, bobo4 borbo3, tt_000, tt_001, tt_002, tt_003, tt_004
+.PHONY: all clean patch check build expected
+.PHONY: format ff format-src format-tools format-symbols
+.PHONY: main dra ric weapon
+.PHONY: cen chi dre lib mad no0 no1 no3 no4 np3 nz0 st0 wrp rwrp
+.PHONY: mar bo4 rbo3
+.PHONY: tt_000 tt_001 tt_002 tt_003 tt_004
 .PHONY: %_dirs
-.PHONY: extract, extract_%
+.PHONY: extract extract_%
 .PHONY: update-dependencies python-dendencies
 .PHONY: dump_disk dump_disk_%
diff --git a/src/boss/bo4/doors.c b/src/boss/bo4/doors.c
@@ -7,6 +7,7 @@ INCLUDE_ASM("boss/bo4/nonmatchings/doors", func_us_801B5040);
 
 INCLUDE_ASM("boss/bo4/nonmatchings/doors", func_us_801B55DC);
 
+// light effects
 INCLUDE_ASM("boss/bo4/nonmatchings/doors", func_us_801B5774);
 
 INCLUDE_RODATA("boss/bo4/nonmatchings/doors", D_us_801B4168);

diff --git a/tools/progress.py b/tools/progress.py
@@ -430,6 +430,7 @@ def report_discord(progresses: dict[str, DecompProgressStats]):
     progress["stwrp"] = DecompProgressStats("stwrp", "st/wrp")
     progress["strwrp"] = DecompProgressStats("strwrp", "st/rwrp")
     progress["bomar"] = DecompProgressStats("bomar", "boss/mar")
+    progress["bobo4"] = DecompProgressStats("bobo4", "boss/bo4")
     progress["borbo3"] = DecompProgressStats("borbo3", "boss/rbo3")
     progress["tt_000"] = DecompProgressStats("tt_000", "servant/tt_000")
     progress["tt_001"] = DecompProgressStats("tt_001", "servant/tt_001")