From 456286d4dabc23697aedda737e114c9521dde8c6 Mon Sep 17 00:00:00 2001
From: TekkaGB <tekka.gb@gmail.com>
Date: Thu, 10 Jun 2021 14:50:40 -0700
Subject: [PATCH] Finalized merging and fixed bat

---
 DATA/FIELD/PACK/f007.bf.flow    | 29 +++++++++++++++++++
 DATA/FIELD/PACK/f007.msg        |  3 ++
 DATA/FIELD/SCRIPT/FIELD.BF.flow | 50 +--------------------------------
 build_aem.bat                   |  2 --
 build_mc.bat                    |  1 -
 5 files changed, 33 insertions(+), 52 deletions(-)
 create mode 100644 DATA/FIELD/PACK/f007.bf.flow
 create mode 100644 DATA/FIELD/PACK/f007.msg

diff --git a/DATA/FIELD/PACK/f007.bf.flow b/DATA/FIELD/PACK/f007.bf.flow
new file mode 100644
index 0000000..b3b8488
--- /dev/null
+++ b/DATA/FIELD/PACK/f007.bf.flow
@@ -0,0 +1,29 @@
+
+// 
+// FlowScript decompiled by AtlusScriptLib by TGE (2017)
+// In the unfortunate case of any bugs, please report them back to me.
+// 
+
+
+// 
+// Imports
+// 
+
+import( "BASE_f007.bf" );
+import ( "../ModMenu.flow" );
+import ( "f007.msg" );
+
+// 
+// Procedure declarations
+// 
+
+
+void save_point_hook()
+{
+    OPEN_MSG_WIN();
+    int selection = SEL( ChangedPrompt );
+    if ( selection == 0 )
+        ModMenuDisplay(2);
+    if ( selection == 1 )
+		save_point_unhooked();
+}
diff --git a/DATA/FIELD/PACK/f007.msg b/DATA/FIELD/PACK/f007.msg
new file mode 100644
index 0000000..e9db6b2
--- /dev/null
+++ b/DATA/FIELD/PACK/f007.msg
@@ -0,0 +1,3 @@
+[sel ChangedPrompt]
+[f 0 8 -258][f 1 31]Open Mod Menu[e]
+[f 0 8 -258][f 1 31]Use original function.[e]
\ No newline at end of file
diff --git a/DATA/FIELD/SCRIPT/FIELD.BF.flow b/DATA/FIELD/SCRIPT/FIELD.BF.flow
index aaf8698..2544607 100644
--- a/DATA/FIELD/SCRIPT/FIELD.BF.flow
+++ b/DATA/FIELD/SCRIPT/FIELD.BF.flow
@@ -29,59 +29,11 @@ void field_order_party_hook()
 	// Choose between mod menu and regular field menu
 	OPEN_MSG_WIN();
 	MSG( Choose );
-<<<<<<< HEAD
 	SEL_CHK_PAD(6,20);
-	int select = SEL( NewPrompt );
-	CLOSE_MSG_WIN();
-	if (select == 0)
-	{
-		ModMenuDisplay();
-	)
-	else if (select == 1)
-	{
-		if ( FUNCTION_01E9() == 1 && BIT_CHK( 0 + 0x0400 + 0x0800 + 498 ) == 1 )
-		{
-			fes_order_party();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 507 ) == 1 )
-		{
-			tutorial_order_party();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 572 ) == 1 )
-		{
-			f031_operation();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 610 ) == 1 )
-		{
-			f052_operation();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 702 ) == 1 )
-		{
-			f034_operation();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 799 ) == 1 )
-		{
-			f035_operation();
-			return;
-		}
-		else if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 498 ) == 1 )
-		{
-			tartaros_order_party();
-			return;
-		}
-	}
-=======
-	SET_SEL_CHOICE_KEYBIND(6,20);
 	int selection = SEL( NewPrompt );
 	CLOSE_MSG_WIN();
 	if (selection == 0)
-		ModMenuDisplay(0);
+		ModMenuDisplay();
 	if (selection == 1)
 		field_order_party_unhooked();
->>>>>>> refs/remotes/origin/main
 }
\ No newline at end of file
diff --git a/build_aem.bat b/build_aem.bat
index 32785cb..f120484 100644
--- a/build_aem.bat
+++ b/build_aem.bat
@@ -5,8 +5,6 @@ IF NOT EXIST "%OUTPUT_PATH%" MKDIR "%OUTPUT_PATH%"
 IF NOT EXIST "%OUTPUT_PATH%\DATA\FIELD\PACK\F008_003" MKDIR "%OUTPUT_PATH%\DATA\FIELD\PACK\F008_003"
 IF NOT EXIST "%OUTPUT_PATH%\DATA\FIELD\SCRIPT" MKDIR "%OUTPUT_PATH%\DATA\FIELD\SCRIPT"
 
-
-%COMPILER% DATA\FIELD\SCRIPT\NPCCOMU.BF.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out "%OUTPUT_PATH%\DATA\FIELD\SCRIPT\NPCCOMU.BF" -Hook
 %COMPILER% DATA\FIELD\SCRIPT\FIELD.BF.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out "%OUTPUT_PATH%\DATA\FIELD\SCRIPT\FIELD.BF" -Hook
 
 %COMPILER% DATA\FIELD\PACK\f008.bf.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out "%OUTPUT_PATH%\DATA\FIELD\PACK\F008_003\f008.bf" -Hook
\ No newline at end of file
diff --git a/build_mc.bat b/build_mc.bat
index 30b758e..cd6efbe 100644
--- a/build_mc.bat
+++ b/build_mc.bat
@@ -7,7 +7,6 @@ IF NOT EXIST "%OUTPUT_PATH%\Data" MKDIR "%OUTPUT_PATH%\Data"
 IF NOT EXIST "%OUTPUT_PATH%\Data\DATA\FIELD\PACK" MKDIR "%OUTPUT_PATH%\Data\DATA\FIELD\PACK"
 IF NOT EXIST "%OUTPUT_PATH%\Data\DATA\FIELD\SCRIPT" MKDIR "%OUTPUT_PATH%\Data\DATA\FIELD\SCRIPT"
 
-%COMPILER% DATA\FIELD\SCRIPT\NPCCOMU.BF.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out "%OUTPUT_PATH%\Data\DATA\FIELD\SCRIPT\NPCCOMU.BF" -Hook
 %COMPILER% DATA\FIELD\SCRIPT\FIELD.BF.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out "%OUTPUT_PATH%\Data\DATA\FIELD\SCRIPT\FIELD.BF" -Hook
 
 %COMPILER% DATA\FIELD\PACK\f008.bf.flow -Compile -OutFormat V1 -Library P3F -Encoding P3 -Out build\DATA\FIELD\PACK\F008_003\f008.bf -Hook