Merge branch 'master' into pr/progress

doldecomp · Feb 20, 2024 · f9f4e73 · f9f4e73
2 parents 120e045 + b94bf1e
commit f9f4e73
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 402 deletions.
diff --git a/asm/melee/it/items/itpippi.s b/asm/melee/it/items/itpippi.s
diff --git a/configure.py b/configure.py
@@ -988,7 +988,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itlugia.c"),
             Object(NonMatching, "melee/it/items/ithouou.c"),
             Object(Matching, "melee/it/items/itmetamon.c"),
-            Object(NonMatching, "melee/it/items/itpippi.c"),
+            Object(Matching, "melee/it/items/itpippi.c"),
             Object(NonMatching, "melee/it/items/ittogepy.c"),
             Object(NonMatching, "melee/it/items/itmew.c"),
             Object(Matching, "melee/it/items/itcerebi.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -688,7 +688,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itlugia.s.o\
     $(BUILD_DIR)/asm/melee/it/items/ithouou.s.o\
     $(BUILD_DIR)/src/melee/it/items/itmetamon.c.o\
-    $(BUILD_DIR)/asm/melee/it/items/itpippi.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itpippi.c.o\
     $(BUILD_DIR)/asm/melee/it/items/ittogepy.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itmew.s.o\
     $(BUILD_DIR)/src/melee/it/items/itcerebi.c.o\