From e4ffcf7153ebc8cabe8427ad30629bc39bc11cbc Mon Sep 17 00:00:00 2001
From: Rangi42 <remy.oukaour+rangi42@gmail.com>
Date: Sun, 4 Aug 2024 21:52:57 -0400
Subject: [PATCH] Update the 'ucity' commit used for testing

This removes our need to patch it for compatibility
---
 test/fetch-test-deps.sh  |  2 +-
 test/patches/ucity.patch | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 test/patches/ucity.patch

diff --git a/test/fetch-test-deps.sh b/test/fetch-test-deps.sh
index f8c41123..2ea72a16 100755
--- a/test/fetch-test-deps.sh
+++ b/test/fetch-test-deps.sh
@@ -99,6 +99,6 @@ if "$nonfree"; then
 	action pret  pokered          2024-08-03 59202a2ab5f097262db25eb9b12c41d2389c5164
 	action zladx LADX-Disassembly 2024-07-31 3283fd6bf899eec9d307ac3a495a01c45f24ceec
 fi
-action AntonioND ucity   2024-07-08 1fe6b8b1208384f5eaa8e6b482528de7aa13db11
+action AntonioND ucity   2024-08-03 f3c6377f1fb1ea29644bcd90722abaaa5d478a74
 action pinobatch libbet  2024-06-15 ee60f0e4712a938589edd3e5d258e519a475d754
 action LIJI32    SameBoy 2024-08-01 47cdefd3d022b31d984ede91cd0f6965ff88d065
diff --git a/test/patches/ucity.patch b/test/patches/ucity.patch
deleted file mode 100644
index 6696569f..00000000
--- a/test/patches/ucity.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 244f179..fce4930 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,7 +51,7 @@ ASMFILES := $(foreach dir,$(SOURCE_ALL_DIRS),$(sort $(wildcard $(dir)/*.asm)))
- 
- # List of include directories: All source and data folders.
- # A '/' is appended to the path.
--INCLUDES := $(foreach dir,$(SOURCE_ALL_DIRS),-i$(dir)/)
-+INCLUDES := $(foreach dir,$(SOURCE_ALL_DIRS),-I$(dir)/)
- 
- # Prepare object paths from source files.
- OBJ := $(ASMFILES:.asm=.obj)
-@@ -72,10 +72,9 @@ clean:
- 	@echo rm $(OBJ) $(BIN) $(COMPAT_BIN) $(NAME).sym $(NAME).map
- 	@rm -f $(OBJ) $(BIN) $(COMPAT_BIN) $(NAME).sym $(NAME).map
- 
--# TODO: Remove the -h when RGBASM is updated to remove it
- %.obj : %.asm
- 	@echo rgbasm $<
--	@$(RGBASM) $(INCLUDES) -h -E -o$@ $<
-+	@$(RGBASM) $(INCLUDES) -E -o$@ $<
- 
- $(BIN): $(OBJ)
- 	@echo rgblink $(BIN)