hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

post-merge build fixes

Browse Source
This commit is contained in:
Yanis42
2024-08-28 13:23:54 +02:00
parent 30fa2a60c3
commit 447ecb52ee
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -439,7 +439,6 @@ O_FILES := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \
$(foreach f,$(ASSET_C_FILES_COMMITTED:.c=.o),$(BUILD_DIR)/$f) \
$(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o) \
$(BUILD_DIR)/src/code/z_message_z_game_over.o
$(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o)
UCODE_PATCHES := $(wildcard F3DEX3/*.bps)
UCODE_FILES := $(foreach f,$(UCODE_PATCHES:.bps=),$f)
@@ -662,7 +661,7 @@ else
endif
$(V)$(PYTHON) -m ipl3checksum sum --cic 6105 --update $@
$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(LDSCRIPT) $(BUILD_DIR)/undefined_syms.txt \
$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(UCODE_O_FILES) $(LDSCRIPT) $(BUILD_DIR)/undefined_syms.txt \
$(SAMPLEBANK_O_FILES) $(SOUNDFONT_O_FILES) \
$(BUILD_DIR)/assets/audio/audiobank_padding.o
$(call print,Linking:,,$@)

1
spec
View File

@@ -730,6 +730,7 @@ beginseg
include "$(BUILD_DIR)/src/debug/profiler.o"
#endif
endseg
#endif
#if PLATFORM_N64
beginseg

1
src/boot/cic6105.c
View File

@@ -42,7 +42,6 @@ void CIC6105_FaultClient(void) {
func_800AE258_unknown("ROM_F");
func_800AE258_unknown(" [Creator:%s]", gBuildTeam);
func_800AE1E0_unknown(56, 192);
func_800AE258_unknown("[Date:%s]", gBuildDate);
func_800AE1E0_unknown(96, 32);
func_800AE258_unknown("I LOVE YOU %08x", func_80001714());
}

1
src/code/sys_ucode.c
View File

@@ -1,4 +1,5 @@
#include "global.h"
#include "fault.h"
#if !ENABLE_F3DEX3
u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;

1
src/debug/collision_view.c
View File

@@ -1,5 +1,6 @@
#include "global.h"
#include "debug.h"
#include "fault.h"
static Gfx sPolyBuffer[MENU_BUFFER_SIZE];