Merge pull request #7 from jpmac26/master

Change output file locations to their proper layout, fix missing semicolons
ShrineFox · Jul 8, 2018 · 5c9955f · 5c9955f
2 parents b216174 + 4be15ca
commit 5c9955f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/ModMenu.flow b/ModMenu.flow
@@ -1274,7 +1274,7 @@ void Misc1()
             FLD_START_BOSS( 193 );
             break;
         case 11:
-            Misc2() //next
+            Misc2(); //next
             break;
     }
 }
@@ -1312,7 +1312,7 @@ void Misc2()
             FLD_START_BOSS( 190 );
             break;
         case 8:
-            Misc1() //previous
+            Misc1(); //previous
             break;
     }
 }

diff --git a/build.bat b/build.bat
@@ -7,16 +7,20 @@ set OUTPUT_PATH=%BUILD_PATH%\output
 if not exist %BUILD_PATH% mkdir %BUILD_PATH%
 if not exist %INPUT_PATH% mkdir %INPUT_PATH%
 if not exist %OUTPUT_PATH% mkdir %OUTPUT_PATH%
+if not exist %OUTPUT_PATH%\camp\shared mkdir %OUTPUT_PATH%\camp\shared
+if not exist %OUTPUT_PATH%\field mkdir %OUTPUT_PATH%\field
+if not exist %OUTPUT_PATH%\script\field mkdir %OUTPUT_PATH%\script\field
 
-%COMPILER% .\field\field.bf.flow     -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\field.bf"
-%COMPILER% .\dungeon\dungeon.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\dungeon.bf"
-%COMPILER% .\mementos\at_dng.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\at_dng.bf"
-%COMPILER% .\introduction\fscr0150_002_100.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\fscr0150_002_100.bf"
+copy .\camp\shared\sharedUI.spd "%OUTPUT_PATH%\camp\shared\sharedUI.spd"
+%COMPILER% .\field\field.bf.flow     -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\field\field.bf"
+%COMPILER% .\dungeon\dungeon.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\field\dungeon.bf"
+%COMPILER% .\mementos\at_dng.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\field\at_dng.bf"
+%COMPILER% .\introduction\fscr0150_002_100.bf.flow -Compile -OutFormat V3BE -Library P5 -Encoding P5 -Out "%OUTPUT_PATH%\script\field\fscr0150_002_100.bf"
 
-%PAKPACK% replace "%INPUT_PATH%\fldPack.pac"   etc/field.bf   "%OUTPUT_PATH%\field.bf"   "%OUTPUT_PATH%\fldPack.pac"
-%PAKPACK% replace "%INPUT_PATH%\dngPack.pac"   etc/dungeon.bf "%OUTPUT_PATH%\dungeon.bf" "%OUTPUT_PATH%\dngPack.pac"
-%PAKPACK% replace "%INPUT_PATH%\atDngPack.pac" etc/at_dng.bf  "%OUTPUT_PATH%\at_dng.bf"  "%OUTPUT_PATH%\atDngPack.pac"
+%PAKPACK% replace "%INPUT_PATH%\fldPack.pac"   etc/field.bf   "%OUTPUT_PATH%\field\field.bf"   "%OUTPUT_PATH%\field\fldPack.pac"
+%PAKPACK% replace "%INPUT_PATH%\dngPack.pac"   etc/dungeon.bf "%OUTPUT_PATH%\field\dungeon.bf" "%OUTPUT_PATH%\field\dngPack.pac"
+%PAKPACK% replace "%INPUT_PATH%\atDngPack.pac" etc/at_dng.bf  "%OUTPUT_PATH%\field\at_dng.bf"  "%OUTPUT_PATH%\field\atDngPack.pac"
 
-del "%OUTPUT_PATH%\field.bf"
-del "%OUTPUT_PATH%\dungeon.bf"
-del "%OUTPUT_PATH%\at_dng.bf"
+del "%OUTPUT_PATH%\field\field.bf"
+del "%OUTPUT_PATH%\field\dungeon.bf"
+del "%OUTPUT_PATH%\field\at_dng.bf"