From f9b0a33abe0839115cd754ec97c54c37be463175 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 13 Apr 2022 21:22:21 -0700 Subject: [PATCH] Move text.s to Kyoto files Former-commit-id: 059d6ca0fd6d1bac194e3f9b5225c7662c9011cf --- Makefile | 2 +- obj_files.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 376af1b5..06611c62 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ endif O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \ $(KYOTO_CWD) $(RODATA_O_FILES) $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) \ - $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(TEXT_O_FILES) $(AI_FILES) \ + $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(AI_FILES) \ $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \ $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \ $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \ diff --git a/obj_files.mk b/obj_files.mk index 2f37f39e..62d5a886 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -224,6 +224,7 @@ KYOTO_CWD :=\ $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptTargetingPoint.o\ $(BUILD_DIR)/asm/Kyoto_CWD/BodyState/CBSWallHang.o\ $(BUILD_DIR)/asm/Kyoto_CWD/ScriptObjects/CScriptEMPulse.o\ + $(BUILD_DIR)/asm/text.o\ AI_FILES :=\ $(BUILD_DIR)/asm/Dolphin/ai.o @@ -446,9 +447,6 @@ GBA_FILES :=\ $(BUILD_DIR)/asm/Dolphin/GBA/GBAXfer.o\ $(BUILD_DIR)/asm/Dolphin/GBA/GBAKey.o -TEXT_O_FILES :=\ - $(BUILD_DIR)/asm/text.o - EXTAB_O_FILES :=\ $(BUILD_DIR)/asm/extab.o