From f666f4806b6ecb7bfb05be1972015a5512c122af Mon Sep 17 00:00:00 2001
From: ThirteenAG <thirteenag@gmail.com>
Date: Sun, 13 Oct 2024 12:28:24 +0800
Subject: [PATCH] update memalloc

---
 includes/pcsx2/memalloc.c | 2 +-
 makefile.lua              | 2 +-
 premake5.lua              | 2 +-
 source/makefile           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/pcsx2/memalloc.c b/includes/pcsx2/memalloc.c
index fc5a89b..86281e3 100644
--- a/includes/pcsx2/memalloc.c
+++ b/includes/pcsx2/memalloc.c
@@ -28,7 +28,7 @@ typedef struct {
 #define MEM_CUSTOM_TOTAL_SIZE 100000
 #endif
 
-static pmpa_memory_block master_memory_block[MEM_CUSTOM_TOTAL_SIZE] = { 1 };
+static pmpa_memory_block master_memory_block[MEM_CUSTOM_TOTAL_SIZE] = { { MEM_CUSTOM_TOTAL_SIZE - PMPA_MEMORY_BLOCK_HEADER_SIZE, false, 0 } };
 static pmpa_memory_int   master_memory_block_size = MEM_CUSTOM_TOTAL_SIZE;
 
 /*
diff --git a/makefile.lua b/makefile.lua
index 701db56..81be880 100644
--- a/makefile.lua
+++ b/makefile.lua
@@ -18,7 +18,7 @@ ASFLAGS = $(CFLAGS)
 BASE_ADDRESS = %s
 EE_LINKFILE = linkfile
 EE_LIBS += %s
-EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,--no-relax -Wl,-Map,../data/%s.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
+EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,-Map,../data/%s.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
 
 all: clean main-build
 
diff --git a/premake5.lua b/premake5.lua
index b83546c..7291e42 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -79,7 +79,7 @@ workspace "GTALCS.GTAVCS.PCSX2F.CLEO"
             debugdir (gamepath .. (dir or ""))
          end
       end
-      targetdir ("data/%{prj.name}/" .. scriptspath)
+      targetdir ("data/" .. scriptspath)
    end
 
    function add_ps2sdk()
diff --git a/source/makefile b/source/makefile
index 373e6ce..ba69a97 100644
--- a/source/makefile
+++ b/source/makefile
@@ -8,7 +8,7 @@ ASFLAGS = $(CFLAGS)
 BASE_ADDRESS = 0x05000000
 EE_LINKFILE = linkfile
 EE_LIBS += -l:libstdc++.a -l:libm.a
-EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,--no-relax -Wl,-Map,../data/PLUGINS/cleo.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
+EE_LDFLAGS = -Wl,--entry=init -Wl,--wrap,malloc -Wl,--wrap,calloc -Wl,--wrap,realloc -Wl,--wrap,free -Wl,--no-relax -Wl,-Map,../data/PLUGINS/cleo.map -Wl,'--defsym=BASE_ADDRESS=$(BASE_ADDRESS)'
 
 all: clean main-build