Heroine Anthem [master]
Update fonts to new Serif, fix scene name extractor, wrote scene name inserter to rebuild scene.slk
[1mdiff --git a/Makefile b/Makefile[m
[1mindex 941f646..799d0eb 100644[m
[1m--- a/Makefile[m
[1m+++ b/Makefile[m
[36m@@ -38,6 +38,8 @@[m [mha1:[m
@./toolchain/itminsert.php $(HA1PATH) ./working/$(HALANG)/ha1/data/item.txt ./build/ha1/data/item.ifo[m
@echo "Building magic STRUCT..."[m
@./toolchain/splinsert.php $(HA1PATH) ./working/$(HALANG)/ha1/data/spell.txt ./build/ha1/data/spell.spl[m
[32m+[m [32m@echo "Building scene names..."[m
[32m+[m [32m@./toolchain/sceneinsert.php $(HA1PATH) ./resources/ha1/scene.key ./working/$(HALANG)/ha1/scene.txt ./build/ha1/scene.slk[m
@rm -rf ./temp[m
[m
.PHONY: video[m
[36m@@ -47,8 +49,18 @@[m [mvideo:[m
ffmpeg -i $(HA1PATH)/AVI/mpg02.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg02.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg02.avi[m
ffmpeg -i $(HA1PATH)/AVI/mpg03.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg03.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg03.avi[m
ffmpeg -i $(HA1PATH)/AVI/mpg04.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg04.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg04.avi[m
[31m- ffmpeg -i $(HA1PATH)/AVI/mpg05.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg05.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg05.avi [m
[31m- ffmpeg -i $(HA1PATH)/AVI/mpg06.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg06.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg06.avi [m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg05.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg05.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg05.avi[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg06.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg06.ass" -c:v wmv2 -b:v 2048k -c:a wmav2 -b:a 256k ./build/ha1/avi/mpg06.avi[m
[32m+[m
[32m+[m[32m.PHONY: mp4[m
[32m+[m[32mmp4:[m
[32m+[m [32m@mkdir -p ./build/ha1/mp4[m
[32m+[m [32m@mkdir -p ./build/ha2/mp4[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg02.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg02.ass" ./build/ha1/avi/mpg02.mp4[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg03.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg03.ass" ./build/ha1/avi/mpg03.mp4[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg04.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg04.ass" ./build/ha1/avi/mpg04.mp4[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg05.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg05.ass" ./build/ha1/avi/mpg05.mp4[m
[32m+[m [32mffmpeg -i $(HA1PATH)/AVI/mpg06.avi -i resources/subtitle-mask.png -filter_complex "[0:v][1:v] overlay=0:0 [tmp_overlay]; [tmp_overlay] ass=./working/$(HALANG)/ha1/video/mpg06.ass" ./build/ha1/avi/mpg06.mp4[m
[m
.PHONY: dump[m
dump:[m
[36m@@ -122,7 +134,7 @@[m [mworking:[m
@echo "Extracting spells and descriptions..."[m
@./toolchain/spldump.php $(HA1PATH) ./working/new/ha1/data/spell.txt[m
@echo "Extracting scene names..."[m
[31m- @./toolchain/scenedump.php $(HA1PATH) ./resources/ha1/scene.txt ./working/new/ha1/scene.txt[m
[32m+[m [32m@./toolchain/scenedump.php $(HA1PATH) ./resources/ha1/scene.key ./working/new/ha1/scene.txt[m
@echo "Copying subtitles..."[m
@cp ./resources/ha1/video/* ./working/new/ha1/video/[m
@cp ./resources/ha2/video/* ./working/new/ha2/video/[m
[1mdiff --git a/resources/ha1/scene.key b/resources/ha1/scene.key[m
[1mnew file mode 100644[m
[1mindex 0000000..b826a5b[m
[1m--- /dev/null[m
[1m+++ b/resources/ha1/scene.key[m
[36m@@ -0,0 +1,482 @@[m
[32m+[m[32m152[m
[32m+[m[32m261[m
[32m+[m[32m422[m
[32m+[m[32m579[m
[32m+[m[32m736[m
[32m+[m[32m893[m
[32m+[m[32m1002[m
[32m+[m[32m1255[m
[32m+[m[32m1508[m
[32m+[m[32m1665[m
[32m+[m[32m1774[m
[32m+[m[32m2027[m
[32m+[m[32m2280[m
[32m+[m[32m2437[m
[32m+[m[32m2550[m
[32m+[m[32m2711[m
[32m+[m[32m2872[m
[32m+[m[32m2985[m
[32m+[m[32m3098[m
[32m+[m[32m3211[m
[32m+[m[32m3324[m
[32m+[m[32m3481[m
[32m+[m[32m3596[m
[32m+[m[32m3803[m
[32m+[m[32m4252[m
[32m+[m[32m4509[m
[32m+[m[32m4622[m
[32m+[m[32m4729[m
[32m+[m[32m4888[m
[32m+[m[32m5049[m
[32m+[m[32m5446[m
[32m+[m[32m5603[m
[32m+[m[32m5712[m
[32m+[m[32m5871[m
[32m+[m[32m5984[m
[32m+[m[32m6099[m
[32m+[m[32m6210[m
[32m+[m[32m6323[m
[32m+[m[32m6436[m
[32m+[m[32m6549[m
[32m+[m[32m6662[m
[32m+[m[32m6821[m
[32m+[m[32m6936[m
[32m+[m[32m7049[m
[32m+[m[32m7162[m
[32m+[m[32m7275[m
[32m+[m[32m7388[m
[32m+[m[32m7501[m
[32m+[m[32m7614[m
[32m+[m[32m7823[m
[32m+[m[32m7938[m
[32m+[m[32m8099[m
[32m+[m[32m8212[m
[32m+[m[32m8325[m
[32m+[m[32m8534[m
[32m+[m[32m8745[m
[32m+[m[32m8956[m
[32m+[m[32m9119[m
[32m+[m[32m9330[m
[32m+[m[32m9445[m
[32m+[m[32m9608[m
[32m+[m[32m9723[m
[32m+[m[32m9886[m
[32m+[m[32m10049[m
[32m+[m[32m10164[m
[32m+[m[32m10279[m
[32m+[m[32m10490[m
[32m+[m[32m10653[m
[32m+[m[32m10768[m
[32m+[m[32m10979[m
[32m+[m[32m11094[m
[32m+[m[32m11209[m
[32m+[m[32m11420[m
[32m+[m[32m11727[m
[32m+[m[32m11890[m
[32m+[m[32m12005[m
[32m+[m[32m12120[m
[32m+[m[32m12235[m
[32m+[m[32m12398[m
[32m+[m[32m12513[m
[32m+[m[32m12724[m
[32m+[m[32m12839[m
[32m+[m[32m12954[m
[32m+[m[32m13165[m
[32m+[m[32m13424[m
[32m+[m[32m13683[m
[32m+[m[32m13798[m
[32m+[m[32m13913[m
[32m+[m[32m14076[m
[32m+[m[32m14191[m
[32m+[m[32m14306[m
[32m+[m[32m14469[m
[32m+[m[32m14584[m
[32m+[m[32m14699[m
[32m+[m[32m15102[m
[32m+[m[32m15313[m
[32m+[m[32m15476[m
[32m+[m[32m15783[m
[32m+[m[32m15946[m
[32m+[m[32m16157[m
[32m+[m[32m16272[m
[32m+[m[32m16387[m
[32m+[m[32m16550[m
[32m+[m[32m16713[m
[32m+[m[32m16828[m
[32m+[m[32m16943[m
[32m+[m[32m17058[m
[32m+[m[32m17173[m
[32m+[m[32m17384[m
[32m+[m[32m17499[m
[32m+[m[32m17614[m
[32m+[m[32m17777[m
[32m+[m[32m17940[m
[32m+[m[32m18151[m
[32m+[m[32m18266[m
[32m+[m[32m18381[m
[32m+[m[32m18592[m
[32m+[m[32m18707[m
[32m+[m[32m18822[m
[32m+[m[32m18985[m
[32m+[m[32m19196[m
[32m+[m[32m19359[m
[32m+[m[32m19522[m
[32m+[m[32m19637[m
[32m+[m[32m19752[m
[32m+[m[32m20011[m
[32m+[m[32m20220[m
[32m+[m[32m20381[m
[32m+[m[32m20592[m
[32m+[m[32m20803[m
[32m+[m[32m21014[m
[32m+[m[32m21177[m
[32m+[m[32m21340[m
[32m+[m[32m21455[m
[32m+[m[32m21570[m
[32m+[m[32m21733[m
[32m+[m[32m21896[m
[32m+[m[32m22059[m
[32m+[m[32m22222[m
[32m+[m[32m22385[m
[32m+[m[32m22548[m
[32m+[m[32m22759[m
[32m+[m[32m22970[m
[32m+[m[32m23133[m
[32m+[m[32m23296[m
[32m+[m[32m23411[m
[32m+[m[32m23526[m
[32m+[m[32m23689[m
[32m+[m[32m23852[m
[32m+[m[32m24015[m
[32m+[m[32m24178[m
[32m+[m[32m24389[m
[32m+[m[32m24600[m
[32m+[m[32m24763[m
[32m+[m[32m24878[m
[32m+[m[32m24993[m
[32m+[m[32m25204[m
[32m+[m[32m25415[m
[32m+[m[32m25626[m
[32m+[m[32m25789[m
[32m+[m[32m25952[m
[32m+[m[32m26067[m
[32m+[m[32m26278[m
[32m+[m[32m26441[m
[32m+[m[32m26556[m
[32m+[m[32m26719[m
[32m+[m[32m26882[m
[32m+[m[32m27093[m
[32m+[m[32m27250[m
[32m+[m[32m27407[m
[32m+[m[32m27564[m
[32m+[m[32m27723[m
[32m+[m[32m27882[m
[32m+[m[32m28089[m
[32m+[m[32m28296[m
[32m+[m[32m28407[m
[32m+[m[32m28566[m
[32m+[m[32m28675[m
[32m+[m[32m28834[m
[32m+[m[32m28993[m
[32m+[m[32m29156[m
[32m+[m[32m29365[m
[32m+[m[32m29576[m
[32m+[m[32m29739[m
[32m+[m[32m29902[m
[32m+[m[32m30109[m
[32m+[m[32m30224[m
[32m+[m[32m30483[m
[32m+[m[32m30688[m
[32m+[m[32m30989[m
[32m+[m[32m31194[m
[32m+[m[32m31351[m
[32m+[m[32m31460[m
[32m+[m[32m31617[m
[32m+[m[32m31774[m
[32m+[m[32m31931[m
[32m+[m[32m32136[m
[32m+[m[32m32293[m
[32m+[m[32m32450[m
[32m+[m[32m32607[m
[32m+[m[32m32860[m
[32m+[m[32m32969[m
[32m+[m[32m33126[m
[32m+[m[32m33331[m
[32m+[m[32m33488[m
[32m+[m[32m33603[m
[32m+[m[32m33760[m
[32m+[m[32m33869[m
[32m+[m[32m34268[m
[32m+[m[32m34427[m
[32m+[m[32m34778[m
[32m+[m[32m34889[m
[32m+[m[32m35000[m
[32m+[m[32m35303[m
[32m+[m[32m35462[m
[32m+[m[32m35717[m
[32m+[m[32m35828[m
[32m+[m[32m36035[m
[32m+[m[32m36146[m
[32m+[m[32m36353[m
[32m+[m[32m36464[m
[32m+[m[32m36863[m
[32m+[m[32m36974[m
[32m+[m[32m37133[m
[32m+[m[32m37244[m
[32m+[m[32m37403[m
[32m+[m[32m37610[m
[32m+[m[32m37769[m
[32m+[m[32m37928[m
[32m+[m[32m38039[m
[32m+[m[32m38198[m
[32m+[m[32m38357[m
[32m+[m[32m38516[m
[32m+[m[32m38675[m
[32m+[m[32m38978[m
[32m+[m[32m39089[m
[32m+[m[32m39200[m
[32m+[m[32m39359[m
[32m+[m[32m39566[m
[32m+[m[32m39725[m
[32m+[m[32m39884[m
[32m+[m[32m40043[m
[32m+[m[32m40250[m
[32m+[m[32m40505[m
[32m+[m[32m40664[m
[32m+[m[32m40871[m
[32m+[m[32m41030[m
[32m+[m[32m41237[m
[32m+[m[32m41396[m
[32m+[m[32m41507[m
[32m+[m[32m41762[m
[32m+[m[32m41873[m
[32m+[m[32m42080[m
[32m+[m[32m42335[m
[32m+[m[32m42494[m
[32m+[m[32m42605[m
[32m+[m[32m42860[m
[32m+[m[32m43019[m
[32m+[m[32m43178[m
[32m+[m[32m43385[m
[32m+[m[32m43544[m
[32m+[m[32m43751[m
[32m+[m[32m44054[m
[32m+[m[32m44165[m
[32m+[m[32m44276[m
[32m+[m[32m44435[m
[32m+[m[32m44594[m
[32m+[m[32m44705[m
[32m+[m[32m44864[m
[32m+[m[32m45121[m
[32m+[m[32m45234[m
[32m+[m[32m45347[m
[32m+[m[32m45556[m
[32m+[m[32m45765[m
[32m+[m[32m45974[m
[32m+[m[32m46135[m
[32m+[m[32m46340[m
[32m+[m[32m46449[m
[32m+[m[32m46702[m
[32m+[m[32m46811[m
[32m+[m[32m47016[m
[32m+[m[32m47221[m
[32m+[m[32m47378[m
[32m+[m[32m47535[m
[32m+[m[32m47692[m
[32m+[m[32m47849[m
[32m+[m[32m48006[m
[32m+[m[32m48211[m
[32m+[m[32m48368[m
[32m+[m[32m48477[m
[32m+[m[32m48730[m
[32m+[m[32m48839[m
[32m+[m[32m48996[m
[32m+[m[32m49249[m
[32m+[m[32m49358[m
[32m+[m[32m49515[m
[32m+[m[32m49624[m
[32m+[m[32m49733[m
[32m+[m[32m49890[m
[32m+[m[32m50045[m
[32m+[m[32m50248[m
[32m+[m[32m50357[m
[32m+[m[32m50466[m
[32m+[m[32m50575[m
[32m+[m[32m50786[m
[32m+[m[32m50991[m
[32m+[m[32m51244[m
[32m+[m[32m51449[m
[32m+[m[32m51558[m
[32m+[m[32m51667[m
[32m+[m[32m51824[m
[32m+[m[32m51981[m
[32m+[m[32m52138[m
[32m+[m[32m52295[m
[32m+[m[32m52404[m
[32m+[m[32m52513[m
[32m+[m[32m52670[m
[32m+[m[32m52875[m
[32m+[m[32m52983[m
[32m+[m[32m53138[m
[32m+[m[32m53293[m
[32m+[m[32m53448[m
[32m+[m[32m53603[m
[32m+[m[32m53807[m
[32m+[m[32m54011[m
[32m+[m[32m54215[m
[32m+[m[32m54419[m
[32m+[m[32m54671[m
[32m+[m[32m54875[m
[32m+[m[32m55079[m
[32m+[m[32m55235[m
[32m+[m[32m55439[m
[32m+[m[32m55595[m
[32m+[m[32m55751[m
[32m+[m[32m55907[m
[32m+[m[32m56063[m
[32m+[m[32m56171[m
[32m+[m[32m56327[m
[32m+[m[32m56435[m
[32m+[m[32m56543[m
[32m+[m[32m56651[m
[32m+[m[32m56759[m
[32m+[m[32m56867[m
[32m+[m[32m56975[m
[32m+[m[32m57275[m
[32m+[m[32m57576[m
[32m+[m[32m57829[m
[32m+[m[32m58082[m
[32m+[m[32m58239[m
[32m+[m[32m58348[m
[32m+[m[32m58599[m
[32m+[m[32m58804[m
[32m+[m[32m58913[m
[32m+[m[32m59068[m
[32m+[m[32m59229[m
[32m+[m[32m59436[m
[32m+[m[32m59591[m
[32m+[m[32m59698[m
[32m+[m[32m59805[m
[32m+[m[32m59912[m
[32m+[m[32m59973[m
[32m+[m[32m60030[m
[32m+[m[32m60087[m
[32m+[m[32m60144[m
[32m+[m[32m60201[m
[32m+[m[32m60258[m
[32m+[m[32m60315[m
[32m+[m[32m60372[m
[32m+[m[32m60429[m
[32m+[m[32m60486[m
[32m+[m[32m60543[m
[32m+[m[32m60600[m
[32m+[m[32m60657[m
[32m+[m[32m60714[m
[32m+[m[32m60771[m
[32m+[m[32m60828[m
[32m+[m[32m60885[m
[32m+[m[32m60942[m
[32m+[m[32m60999[m
[32m+[m[32m61056[m
[32m+[m[32m61209[m
[32m+[m[32m61414[m
[32m+[m[32m61619[m
[32m+[m[32m61776[m
[32m+[m[32m62035[m
[32m+[m[32m62144[m
[32m+[m[32m62305[m
[32m+[m[32m62464[m
[32m+[m[32m62621[m
[32m+[m[32m62778[m
[32m+[m[32m62887[m
[32m+[m[32m63044[m
[32m+[m[32m63201[m
[32m+[m[32m63310[m
[32m+[m[32m63421[m
[32m+[m[32m63486[m
[32m+[m[32m63547[m
[32m+[m[32m63708[m
[32m+[m[32m63869[m
[32m+[m[32m64026[m
[32m+[m[32m64187[m
[32m+[m[32m64344[m
[32m+[m[32m64549[m
[32m+[m[32m64754[m
[32m+[m[32m64863[m
[32m+[m[32m65068[m
[32m+[m[32m65225[m
[32m+[m[32m65334[m
[32m+[m[32m65443[m
[32m+[m[32m65552[m
[32m+[m[32m65709[m
[32m+[m[32m65818[m
[32m+[m[32m65975[m
[32m+[m[32m66132[m
[32m+[m[32m66243[m
[32m+[m[32m66352[m
[32m+[m[32m66463[m
[32m+[m[32m66624[m
[32m+[m[32m66731[m
[32m+[m[32m66888[m
[32m+[m[32m66997[m
[32m+[m[32m67158[m
[32m+[m[32m67363[m
[32m+[m[32m67520[m
[32m+[m[32m67629[m
[32m+[m[32m67790[m
[32m+[m[32m67995[m
[32m+[m[32m68202[m
[32m+[m[32m68309[m
[32m+[m[32m68416[m
[32m+[m[32m68619[m
[32m+[m[32m68776[m
[32m+[m[32m68933[m
[32m+[m[32m69090[m
[32m+[m[32m69199[m
[32m+[m[32m69450[m
[32m+[m[32m69559[m
[32m+[m[32m69666[m
[32m+[m[32m69779[m
[32m+[m[32m70084[m
[32m+[m[32m70193[m
[32m+[m[32m70446[m
[32m+[m[32m70651[m
[32m+[m[32m70760[m
[32m+[m[32m70963[m
[32m+[m[32m71070[m
[32m+[m[32m71177[m
[32m+[m[32m71284[m
[32m+[m[32m71441[m
[32m+[m[32m71694[m
[32m+[m[32m71851[m
[32m+[m[32m71960[m
[32m+[m[32m72165[m
[32m+[m[32m72272[m
[32m+[m[32m72427[m
[32m+[m[32m72586[m
[32m+[m[32m72793[m
[32m+[m[32m72952[m
[32m+[m[32m73063[m
[32m+[m[32m73222[m
[32m+[m[32m73429[m
[32m+[m[32m73588[m
[32m+[m[32m73699[m
[32m+[m[32m73954[m
[32m+[m[32m74113[m
[32m+[m[32m74272[m
[32m+[m[32m74383[m
[32m+[m[32m74542[m
[32m+[m[32m74749[m
[32m+[m[32m74908[m
[32m+[m[32m75019[m
[32m+[m[32m75082[m
[32m+[m[32m75191[m
[32m+[m[32m75298[m
[32m+[m[32m75359[m
[32m+[m[32m75420[m
[32m+[m[32m75481[m
[32m+[m[32m75590[m
[32m+[m[32m75793[m
[32m+[m[32m75900[m
[32m+[m[32m76007[m
[32m+[m[32m76114[m
[1mdiff --git a/resources/ha1/scene.txt b/resources/ha1/scene.txt[m
[1mdeleted file mode 100644[m
[1mindex fcc48cc..0000000[m
[1m--- a/resources/ha1/scene.txt[m
[1m+++ /dev/null[m
[36m@@ -1,482 +0,0 @@[m
[31m-156[m
[31m-265[m
[31m-426[m
[31m-583[m
[31m-740[m
[31m-897[m
[31m-1006[m
[31m-1259[m
[31m-1512[m
[31m-1669[m
[31m-1778[m
[31m-2031[m
[31m-2284[m
[31m-2441[m
[31m-2554[m
[31m-2715[m
[31m-2876[m
[31m-2989[m
[31m-3102[m
[31m-3215[m
[31m-3328[m
[31m-3485[m
[31m-3600[m
[31m-3807[m
[31m-4256[m
[31m-4513[m
[31m-4626[m
[31m-4733[m
[31m-4892[m
[31m-5053[m
[31m-5450[m
[31m-5607[m
[31m-5716[m
[31m-5875[m
[31m-5988[m
[31m-6103[m
[31m-6214[m
[31m-6327[m
[31m-6440[m
[31m-6553[m
[31m-6666[m
[31m-6825[m
[31m-6940[m
[31m-7053[m
[31m-7166[m
[31m-7279[m
[31m-7392[m
[31m-7505[m
[31m-7618[m
[31m-7827[m
[31m-7942[m
[31m-8103[m
[31m-8216[m
[31m-8329[m
[31m-8538[m
[31m-8749[m
[31m-8960[m
[31m-9123[m
[31m-9334[m
[31m-9449[m
[31m-9612[m
[31m-9727[m
[31m-9890[m
[31m-10053[m
[31m-10168[m
[31m-10283[m
[31m-10494[m
[31m-10657[m
[31m-10772[m
[31m-10983[m
[31m-11098[m
[31m-11213[m
[31m-11424[m
[31m-11731[m
[31m-11894[m
[31m-12009[m
[31m-12124[m
[31m-12239[m
[31m-12402[m
[31m-12517[m
[31m-12728[m
[31m-12843[m
[31m-12958[m
[31m-13169[m
[31m-13428[m
[31m-13687[m
[31m-13802[m
[31m-13917[m
[31m-14080[m
[31m-14195[m
[31m-14310[m
[31m-14473[m
[31m-14588[m
[31m-14703[m
[31m-15106[m
[31m-15317[m
[31m-15480[m
[31m-15787[m
[31m-15950[m
[31m-16161[m
[31m-16276[m
[31m-16391[m
[31m-16554[m
[31m-16717[m
[31m-16832[m
[31m-16947[m
[31m-17062[m
[31m-17177[m
[31m-17388[m
[31m-17503[m
[31m-17618[m
[31m-17781[m
[31m-17944[m
[31m-18155[m
[31m-18270[m
[31m-18385[m
[31m-18596[m
[31m-18711[m
[31m-18826[m
[31m-18989[m
[31m-19200[m
[31m-19363[m
[31m-19526[m
[31m-19641[m
[31m-19756[m
[31m-20015[m
[31m-20224[m
[31m-20385[m
[31m-20596[m
[31m-20807[m
[31m-21018[m
[31m-21181[m
[31m-21344[m
[31m-21459[m
[31m-21574[m
[31m-21737[m
[31m-21900[m
[31m-22063[m
[31m-22226[m
[31m-22389[m
[31m-22552[m
[31m-22763[m
[31m-22974[m
[31m-23137[m
[31m-23300[m
[31m-23415[m
[31m-23530[m
[31m-23693[m
[31m-23856[m
[31m-24019[m
[31m-24182[m
[31m-24393[m
[31m-24604[m
[31m-24767[m
[31m-24882[m
[31m-24997[m
[31m-25208[m
[31m-25419[m
[31m-25630[m
[31m-25793[m
[31m-25956[m
[31m-26071[m
[31m-26282[m
[31m-26445[m
[31m-26560[m
[31m-26723[m
[31m-26886[m
[31m-27097[m
[31m-27254[m
[31m-27411[m
[31m-27568[m
[31m-27727[m
[31m-27886[m
[31m-28093[m
[31m-28300[m
[31m-28411[m
[31m-28570[m
[31m-28679[m
[31m-28838[m
[31m-28997[m
[31m-29160[m
[31m-29369[m
[31m-29580[m
[31m-29743[m
[31m-29906[m
[31m-30113[m
[31m-30228[m
[31m-30487[m
[31m-30692[m
[31m-30993[m
[31m-31198[m
[31m-31355[m
[31m-31464[m
[31m-31621[m
[31m-31778[m
[31m-31935[m
[31m-32140[m
[31m-32297[m
[31m-32454[m
[31m-32611[m
[31m-32864[m
[31m-32973[m
[31m-33130[m
[31m-33335[m
[31m-33492[m
[31m-33607[m
[31m-33764[m
[31m-33873[m
[31m-34272[m
[31m-34431[m
[31m-34782[m
[31m-34893[m
[31m-35004[m
[31m-35307[m
[31m-35466[m
[31m-35721[m
[31m-35832[m
[31m-36039[m
[31m-36150[m
[31m-36357[m
[31m-36468[m
[31m-36867[m
[31m-36978[m
[31m-37137[m
[31m-37248[m
[31m-37407[m
[31m-37614[m
[31m-37773[m
[31m-37932[m
[31m-38043[m
[31m-38202[m
[31m-38361[m
[31m-38520[m
[31m-38679[m
[31m-38982[m
[31m-39093[m
[31m-39204[m
[31m-39363[m
[31m-39570[m
[31m-39729[m
[31m-39888[m
[31m-40047[m
[31m-40254[m
[31m-40509[m
[31m-40668[m
[31m-40875[m
[31m-41034[m
[31m-41241[m
[31m-41400[m
[31m-41511[m
[31m-41766[m
[31m-41877[m
[31m-42084[m
[31m-42339[m
[31m-42498[m
[31m-42609[m
[31m-42864[m
[31m-43023[m
[31m-43182[m
[31m-43389[m
[31m-43548[m
[31m-43755[m
[31m-44058[m
[31m-44169[m
[31m-44280[m
[31m-44439[m
[31m-44598[m
[31m-44709[m
[31m-44868[m
[31m-45125[m
[31m-45238[m
[31m-45351[m
[31m-45560[m
[31m-45769[m
[31m-45978[m
[31m-46139[m
[31m-46344[m
[31m-46453[m
[31m-46706[m
[31m-46815[m
[31m-47020[m
[31m-47225[m
[31m-47382[m
[31m-47539[m
[31m-47696[m
[31m-47853[m
[31m-48010[m
[31m-48215[m
[31m-48372[m
[31m-48481[m
[31m-48734[m
[31m-48843[m
[31m-49000[m
[31m-49253[m
[31m-49362[m
[31m-49519[m
[31m-49628[m
[31m-49737[m
[31m-49894[m
[31m-50049[m
[31m-50252[m
[31m-50361[m
[31m-50470[m
[31m-50579[m
[31m-50790[m
[31m-50995[m
[31m-51248[m
[31m-51453[m
[31m-51562[m
[31m-51671[m
[31m-51828[m
[31m-51985[m
[31m-52142[m
[31m-52299[m
[31m-52408[m
[31m-52517[m
[31m-52674[m
[31m-52879[m
[31m-52987[m
[31m-53142[m
[31m-53297[m
[31m-53452[m
[31m-53607[m
[31m-53811[m
[31m-54015[m
[31m-54219[m
[31m-54423[m
[31m-54675[m
[31m-54879[m
[31m-55083[m
[31m-55239[m
[31m-55443[m
[31m-55599[m
[31m-55755[m
[31m-55911[m
[31m-56067[m
[31m-56175[m
[31m-56331[m
[31m-56439[m
[31m-56547[m
[31m-56655[m
[31m-56763[m
[31m-56871[m
[31m-56979[m
[31m-57279[m
[31m-57580[m
[31m-57833[m
[31m-58086[m
[31m-58243[m
[31m-58352[m
[31m-58603[m
[31m-58808[m
[31m-58917[m
[31m-59072[m
[31m-59233[m
[31m-59440[m
[31m-59595[m
[31m-59702[m
[31m-59809[m
[31m-59916[m
[31m-59977[m
[31m-60034[m
[31m-60091[m
[31m-60148[m
[31m-60205[m
[31m-60262[m
[31m-60319[m
[31m-60376[m
[31m-60433[m
[31m-60490[m
[31m-60547[m
[31m-60604[m
[31m-60661[m
[31m-60718[m
[31m-60775[m
[31m-60832[m
[31m-60889[m
[31m-60946[m
[31m-61003[m
[31m-61060[m
[31m-61213[m
[31m-61418[m
[31m-61623[m
[31m-61780[m
[31m-62039[m
[31m-62148[m
[31m-62309[m
[31m-62468[m
[31m-62625[m
[31m-62782[m
[31m-62891[m
[31m-63048[m
[31m-63205[m
[31m-63314[m
[31m-63425[m
[31m-63490[m
[31m-63551[m
[31m-63712[m
[31m-63873[m
[31m-64030[m
[31m-64191[m
[31m-64348[m
[31m-64553[m
[31m-64758[m
[31m-64867[m
[31m-65072[m
[31m-65229[m
[31m-65338[m
[31m-65447[m
[31m-65556[m
[31m-65713[m
[31m-65822[m
[31m-65979[m
[31m-66136[m
[31m-66247[m
[31m-66356[m
[31m-66467[m
[31m-66628[m
[31m-66735[m
[31m-66892[m
[31m-67001[m
[31m-67162[m
[31m-67367[m
[31m-67524[m
[31m-67633[m
[31m-67794[m
[31m-67999[m
[31m-68206[m
[31m-68313[m
[31m-68420[m
[31m-68623[m
[31m-68780[m
[31m-68937[m
[31m-69094[m
[31m-69203[m
[31m-69454[m
[31m-69563[m
[31m-69670[m
[31m-69783[m
[31m-70088[m
[31m-70197[m
[31m-70450[m
[31m-70655[m
[31m-70764[m
[31m-70967[m
[31m-71074[m
[31m-71181[m
[31m-71288[m
[31m-71445[m
[31m-71698[m
[31m-71855[m
[31m-71964[m
[31m-72169[m
[31m-72276[m
[31m-72431[m
[31m-72590[m
[31m-72797[m
[31m-72956[m
[31m-73067[m
[31m-73226[m
[31m-73433[m
[31m-73592[m
[31m-73703[m
[31m-73958[m
[31m-74117[m
[31m-74276[m
[31m-74387[m
[31m-74546[m
[31m-74753[m
[31m-74912[m
[31m-75023[m
[31m-75086[m
[31m-75195[m
[31m-75302[m
[31m-75363[m
[31m-75424[m
[31m-75485[m
[31m-75594[m
[31m-75797[m
[31m-75904[m
[31m-76011[m
[31m-76118[m
[1mdiff --git a/toolchain/scenedump.php b/toolchain/scenedump.php[m
[1mindex cf31707..2a3199a 100755[m
[1m--- a/toolchain/scenedump.php[m
[1m+++ b/toolchain/scenedump.php[m
[36m@@ -25,12 +25,8 @@[m [m$keys = explode("\n", rtrim(file_get_contents($key)));[m
[m
for($i=0; $i\n\n");[m
}[m
[1mdiff --git a/toolchain/sceneinsert.php b/toolchain/sceneinsert.php[m
[1mindex ce3c063..ca14f14 100755[m
[1m--- a/toolchain/sceneinsert.php[m
[1m+++ b/toolchain/sceneinsert.php[m
[36m@@ -7,23 +7,20 @@[m [mHeroine Anthem Scene Inserter v1.0[m
Inserts Unicode scene names from Heroine Anthem I&II.[m
[m
Syntax:[m
[31m- sceneinsert [game_path] [out_file][m
[31m-output_file will be created if it does not exist[m
[32m+[m[32m sceneinsert [game_path] [key_file] [in_file] [out_file][m
[32m+[m[32mout_file will be created if it does not exist[m
[m
*/[m
[m
[31m-echo "Heroine Anthem Scene Extractor v1.0 (cli)\n";[m
[32m+[m[32mecho "Heroine Anthem Scene Inserter v1.0 (cli)\n";[m
[m
include("tools.php");[m
[m
[31m-$regex = "/\[(.*?)\]/"; // Match [1][m
[31m-$regex2 = "/\\n[#].*/"; // Match #Comment[m
[32m+[m[32m$regex = "/[#].*/"; // Match #Comment[m
[m
if ($argc < 4) { DisplayOptions(); die; }[m
else { $path = $argv[1]; $key = $argv[2]; $scene = $argv[3]; $out_file = $argv[4]; }[m
[m
[31m-copy("$path/scene.slk", $out_file);[m
[31m-[m
$keys = explode("\n", rtrim(file_get_contents($key)));[m
$scene = explode("<>", rtrim(file_get_contents($scene)));[m
array_pop($scene);[m
[36m@@ -34,22 +31,33 @@[m [mfor($i=0; $i[m
[1mdiff --git a/working/en/ha1/Font_10.bmp b/working/en/ha1/Font_10.bmp[m
[1mindex 1e1e3a9..ef7a36a 100644[m
Binary files a/working/en/ha1/Font_10.bmp and b/working/en/ha1/Font_10.bmp differ
[1mdiff --git a/working/en/ha1/Font_14.bmp b/working/en/ha1/Font_14.bmp[m
[1mindex 53af6ad..5cee047 100644[m
Binary files a/working/en/ha1/Font_14.bmp and b/working/en/ha1/Font_14.bmp differ
[1mdiff --git a/working/en/ha1/scene.txt b/working/en/ha1/scene.txt[m
[1mindex 845557e..139f457 100644[m
[1m--- a/working/en/ha1/scene.txt[m
[1m+++ b/working/en/ha1/scene.txt[m
[36m@@ -89,16 +89,16 @@[m [mHunra's Home Outside<>[m
Hunra's Home<>[m
[m
# 螺之里01[m
[31m-螺之里01<>[m
[32m+[m[32mAmmonyta 01<>[m
[m
# 螺之里02[m
[31m-螺之里02<>[m
[32m+[m[32mAmmonyta 02<>[m
[m
# 三長老之家[m
Three Elders' Home<>[m
[m
# 螺之里大斷崖[m
[31m-螺之里The Deep<>[m
[32m+[m[32mAmmonyta: The Deep<>[m
[m
# 赫拉家外魔法陣[m
Hunra's Home Magic Circle<>[m
[36m@@ -107,19 +107,19 @@[m [mHunra's Home Magic Circle<>[m
Egyn Inn<>[m
[m
# 螺之里民房04[m
[31m-螺之里民房04<>[m
[32m+[m[32mAmmonyta Home 04<>[m
[m
# 亞紀恩民房02[m
Egyn Home 2<>[m
[m
# 三長老僕人房[m
[31m-三長老僕人房<>[m
[32m+[m[32mThree Elders Servant<>[m
[m
# 亞紀恩民房04[m
Egyn Home 4<>[m
[m
# 螺之里房間[m
[31m-螺之里房間<>[m
[32m+[m[32mAmmonyta Room<>[m
[m
# 亞紀恩旅館入口[m
Egyn Inn Entrance<>[m
[36m@@ -131,13 +131,13 @@[m [mEgyn Elder<>[m
Egyn Home 1<>[m
[m
# 螺之里旅館02[m
[31m-螺之里旅館02<>[m
[32m+[m[32mAmmonyta Hotel 02<>[m
[m
# 亞紀恩道具屋[m
Egyn Shop<>[m
[m
# 螺之里道具屋[m
[31m-螺之里道具屋<>[m
[32m+[m[32mAmmonyta Item Shop<>[m
[m
# 亞紀恩民房03[m
Egyn Home 3<>[m
[36m@@ -146,19 +146,19 @@[m [mEgyn Home 3<>[m
Egyn Home 5<>[m
[m
# 螺之里旅館入口[m
[31m-螺之里旅館入口<>[m
[32m+[m[32mAmmonyta Hotel Entrance<>[m
[m
# 螺之里旅館01[m
[31m-螺之里旅館01<>[m
[32m+[m[32mAmmonyta Hotel 01<>[m
[m
# 螺之里民房02[m
[31m-螺之里民房02<>[m
[32m+[m[32mAmmonyta Home 02<>[m
[m
# 螺之里民房03[m
[31m-螺之里民房03<>[m
[32m+[m[32mAmmonyta Home 03<>[m
[m
# 螺之里民房01[m
[31m-螺之里民房01<>[m
[32m+[m[32mAmmonyta Home 01<>[m
[m
# 拉飛多司南殿00[m
Laphentos South Hall 0<>[m
[36m@@ -560,55 +560,55 @@[m [mWest Lorica 9<>[m
West Lorica 11<>[m
[m
# 螺•森02[m
[31m-螺•森02<>[m
[32m+[m[32mAmmonyta Forest 02<>[m
[m
# 螺•森01[m
[31m-螺•森01<>[m
[32m+[m[32mAmmonyta Forest 01<>[m
[m
# 螺•森12[m
[31m-螺•森12<>[m
[32m+[m[32mAmmonyta Forest 12<>[m
[m
# 螺•森16[m
[31m-螺•森16<>[m
[32m+[m[32mAmmonyta Forest 16<>[m
[m
# 螺•森15[m
[31m-螺•森15<>[m
[32m+[m[32mAmmonyta Forest 15<>[m
[m
# 螺•森13[m
[31m-螺•森13<>[m
[32m+[m[32mAmmonyta Forest 13<>[m
[m
# 螺•森19[m
[31m-螺•森19<>[m
[32m+[m[32mAmmonyta Forest 19<>[m
[m
# 螺•森05[m
[31m-螺•森05<>[m
[32m+[m[32mAmmonyta Forest 05<>[m
[m
# 螺•森17[m
[31m-螺•森17<>[m
[32m+[m[32mAmmonyta Forest 17<>[m
[m
# 螺•森14[m
[31m-螺•森14<>[m
[32m+[m[32mAmmonyta Forest 14<>[m
[m
# 螺•森03[m
[31m-螺•森03<>[m
[32m+[m[32mAmmonyta Forest 03<>[m
[m
# 螺•森18[m
[31m-螺•森18<>[m
[32m+[m[32mAmmonyta Forest 18<>[m
[m
# 螺•森04[m
[31m-螺•森04<>[m
[32m+[m[32mAmmonyta Forest 04<>[m
[m
# 螺•森07[m
[31m-螺•森07<>[m
[32m+[m[32mAmmonyta Forest 07<>[m
[m
# 螺•森08[m
[31m-螺•森08<>[m
[32m+[m[32mAmmonyta Forest 08<>[m
[m
# 螺•森06[m
[31m-螺•森06<>[m
[32m+[m[32mAmmonyta Forest 06<>[m
[m
# 螺•森09[m
[31m-螺•森09<>[m
[32m+[m[32mAmmonyta Forest 09<>[m
[m
# 拉飛多司神殿外[m
Laphentos Temple Exterior<>[m
[36m@@ -617,7 +617,7 @@[m [mLaphentos Temple Exterior<>[m
Temple Puzzle<>[m
[m
# 螺•森20[m
[31m-螺•森20<>[m
[32m+[m[32mAmmonyta Forest 20<>[m
[m
# 長角森林06[m
Angula Forest 6<>[m
[36m@@ -851,10 +851,10 @@[m [mWest Forest 4<>[m
West Forest 10<>[m
[m
# 螺•森10[m
[31m-螺•森10<>[m
[32m+[m[32mAmmonyta Forest 10<>[m
[m
# 螺•森11[m
[31m-螺•森11<>[m
[32m+[m[32mAmmonyta Forest 11<>[m
[m
# 東森林04[m
East Forest 4<>[m
[36m@@ -908,7 +908,7 @@[m [mLake House<>[m
East Forest 11<>[m
[m
# 螺•森三長老家[m
[31m-螺•森三長老家<>[m
[32m+[m[32mAmmonyta Three Elders<>[m
[m
# 西森林11[m
West Forest 11<>[m