Merge pull request #2 from DniweTamp/main

update for latest compiler
TekkaGB · May 9, 2021 · b69a577 · b69a577
2 parents 985b02e + c9c86ef
commit b69a577
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 4,312 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+*.flow linguist-language=C#
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+
+AtlusScriptCompiler\.log
+build/**
+build_local.bat
+
+*.lnk
diff --git a/DATA/FIELD/ModMenu.flow b/DATA/FIELD/ModMenu.flow
@@ -180,9 +180,9 @@ void SetYen()
 	}
 	int current = GET_YEN();
 	if (yen < current)
-		REMOVE_YEN(current-yen);
+		REMOVE_YEN(current - yen);
 	else if (yen > current)
-		GIVE_YEN(yen-current);
+		GIVE_YEN(yen - current);
 }
 
 int Call_Menu_Display()

diff --git a/DATA/FIELD/PACK/f007.bf.flow b/DATA/FIELD/PACK/f007.bf.flow
@@ -21,84 +21,9 @@ import ( "f007.msg" );
 void save_point_hook()
 {
     OPEN_MSG_WIN();
-    MSG( 167 );
-
-    if ( FUNCTION_0083() != 6 || (GET_MONTH() == 1 && GET_DAY_OF_MONTH() == 31) )
-    {
-        SET_MASK( 2 );
-    }
-
-    SET_SEL_CHOICE_KEYBIND( 6, 2 );
-    int localVariable69 = SEL( ChangedPrompt );
-    CLOSE_MSG_WIN();
-
-    if ( localVariable69 == 0 )
-    {
+    int selection = SEL( ChangedPrompt );
+    if ( selection == 0 )
         ModMenuDisplay(2);
-    }
-    else if ( localVariable69 == 1 )
-    {
-
-        if ( BIT_CHK( 0 + 0x0400 + 0x0800 + 520 ) == 1 )
-        {
-            OPEN_MSG_WIN();
-            MSG( 127 );
-            CLOSE_MSG_WIN();
-            return;
-        }
-        else if ( GET_MONTH() == 4 && GET_DAY_OF_MONTH() == 7 || BIT_CHK( 0 + 0x0400 + 0x0800 + 14 ) == 0 )
-        {
-
-            if ( CHECK_TIME_SPAN( 4, 21, 1, 31 ) == 1 && BIT_CHK( 0 + 0x0400 + 0x0800 + 14 ) == 0 )
-            {
-                OPEN_MSG_WIN();
-                MSG( 121 );
-                CLOSE_MSG_WIN();
-                HELP_MSG( 122 );
-            }
-
-            OPEN_MSG_WIN();
-            MSG( 124 );
-            SET_SEL_CHOICE_KEYBIND( 6, 1 );
-
-            if ( SEL( 4 ) != 0 )
-            {
-                CLOSE_MSG_WIN();
-                return;
-            }
-
-            CLOSE_MSG_WIN();
-        }
-
-
-        if ( BIT_CHK( 0 + 0x0400 + 2021 ) == 0 && ((CHECK_TIME_SPAN( 4, 7, 4, 20 ) == 1 || CHECK_TIME_SPAN( 3, 1, 3, 5 ) == 1)) )
-        {
-            BIT_ON( 0 + 0x0400 + 1538 );
-            OPEN_MSG_WIN();
-
-            if ( CHECK_TIME_SPAN( 4, 7, 4, 20 ) == 1 )
-            {
-                MSG( 125 );
-            }
-            else if ( CHECK_TIME_SPAN( 3, 1, 3, 5 ) == 1 )
-            {
-
-                if ( BIT_CHK( 0 + 0x0400 + 1934 ) == 1 )
-                {
-                    MSG( 126 );
-                }
-                else 
-                {
-                    MSG( 125 );
-                }
-
-            }
-
-            CLOSE_MSG_WIN();
-        }
-
-        call_midnight_myroom();
-        return;
-    }
-
+    if ( selection == 1 )
+		save_point_unhooked();
 }
diff --git a/DATA/FIELD/PACK/f007.msg b/DATA/FIELD/PACK/f007.msg
@@ -1,4 +1,3 @@
 [sel ChangedPrompt]
 [f 0 8 -258][f 1 31]Open Mod Menu[e]
-[f 0 8 -258][f 1 31]Go back to your room.[e]
-[f 0 8 -258][f 1 31]Do nothing.[e]
+[f 0 8 -258][f 1 31]Use original function.[e]