From 0dea9d1ccc074196529728b1552a79d272929a7d Mon Sep 17 00:00:00 2001
From: root <182859762@qq.com>
Date: Mon, 13 Mar 2023 11:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/arm11/acf.c         |  3 ---
 source/arm11/filebrowser.c | 32 --------------------------------
 2 files changed, 35 deletions(-)

diff --git a/source/arm11/acf.c b/source/arm11/acf.c
index e67f9e2..0be4c1d 100644
--- a/source/arm11/acf.c
+++ b/source/arm11/acf.c
@@ -9,11 +9,8 @@
 #include "arm11/console.h"
 #include "fs.h"
 
-<<<<<<< HEAD
-=======
 extern Result fReadSize( FHandle file, void *buff, unsigned size, uint32_t *readout );
 
->>>>>>> dev_cheat
 typedef struct
 {
     uint16_t start;
diff --git a/source/arm11/filebrowser.c b/source/arm11/filebrowser.c
index cb31f34..a17121c 100644
--- a/source/arm11/filebrowser.c
+++ b/source/arm11/filebrowser.c
@@ -53,38 +53,6 @@ typedef struct
 	char *ptrs[MAX_DIR_ENTRIES];   // For fast sorting.
 } DirList;
 
-void set_screen_color( acf_callerdata_t data, acf_position_t tx, acf_position_t ty, acf_color_t b )
-{
-	if( b == 0 ) return;
-
-	int *draw_data = data;
-	u16 *frame = consoleGet()->frameBuffer;
-
-	int x = tx + draw_data[0];
-	int y = ty + draw_data[1];
-	if( 0 <= x && x < draw_data[2] && 0 <= y && y < draw_data[3] ){
-		frame[ x*draw_data[3] + (draw_data[3]-1-y) ] = (u16)draw_data[4];
-	}
-}
-
-const char *acf_draw(int x, int y, int width, int height, int maxwidth, u16 color, const char* text)
-{
-	uint8_t draw_data[sizeof(int)*5];
-	
-	int *draw_data_int = (int*)&draw_data;
-	draw_data_int[0] = x;
-	draw_data_int[1] = y;
-	draw_data_int[2] = width;
-	draw_data_int[3] = height;
-	draw_data_int[4] = color;
-	
-	const char *retval = text;
-	acf_canvas_t canvas = acf_get_canvas(maxwidth, text, NULL, NULL, &retval);
-        if( !canvas ) return retval;
-	acf_recycle( acf_use_canvas(canvas, set_screen_color, draw_data) );
-	return retval;
-}
-
 int dlistCompare(const void *a, const void *b)
 {
 	const char *entA = *(char**)a;