Merge branch 'master' of https://git.touhou.dev/shaun_chaky/eastern-flames

2022-08-21 19:53:53 -07:00 · 2022-08-21 19:53:53 -07:00 · ff3ea9dcdf
parent 3a87c67e9e e5b26d5985
commit ff3ea9dcdf
29 changed files with 3 additions and 2 deletions
--- a/flames/datafiles/Forest
+++ b/flames/datafiles/Forest
--- a/Battle/forestbattle.dat
+++ b/Battle/forestbattle.dat
--- a/Battle/forestbattle.size
+++ b/Battle/forestbattle.size
@ -1 +0,0 @@
 21.73337745666504 , 17.503263473510742 , 16.766698837280273
--- a/flames/datafiles/Plains
+++ b/flames/datafiles/Plains
--- a/Battle/plainsbattle.dat
+++ b/Battle/plainsbattle.dat
--- a/Battle/plainsbattle.size
+++ b/Battle/plainsbattle.size
@ -1 +0,0 @@
 21.73337745666504 , 17.503263473510742 , 16.766698837280273
--- a/flames/datafiles/forestbattle/forestatlas.png
+++ b/flames/datafiles/forestbattle/forestatlas.png
--- a/flames/datafiles/forestbattle/forestbattle.dat
+++ b/flames/datafiles/forestbattle/forestbattle.dat
--- a/flames/datafiles/forestbattle/forestbattle.size
+++ b/flames/datafiles/forestbattle/forestbattle.size
@ -0,0 +1 @@
 20.457584381103516 , 8.400664329528809 , 16.608734130859375
--- a/flames/datafiles/map1/mapriver.png
+++ b/flames/datafiles/map1/mapriver.png
--- a/flames/datafiles/map1/water.dat
+++ b/flames/datafiles/map1/water.dat
--- a/flames/datafiles/map1/water.size
+++ b/flames/datafiles/map1/water.size
@ -0,0 +1 @@
 0.3134499788284302 , 1.098434567451477 , 0.0
--- a/flames/datafiles/plainsbattle/plainsatlas.png
+++ b/flames/datafiles/plainsbattle/plainsatlas.png
--- a/flames/datafiles/plainsbattle/plainsbattle.dat
+++ b/flames/datafiles/plainsbattle/plainsbattle.dat
--- a/flames/datafiles/plainsbattle/plainsbattle.size
+++ b/flames/datafiles/plainsbattle/plainsbattle.size
@ -0,0 +1 @@
 21.066211700439453 , 8.650588989257812 , 16.929763793945312
--- a/flames/sprites/aya/aya_idle_sheet.png
+++ b/flames/sprites/aya/aya_idle_sheet.png
--- a/flames/sprites/aya/aya_run_back_sheet.png
+++ b/flames/sprites/aya/aya_run_back_sheet.png
--- a/flames/sprites/aya/aya_run_sheet.png
+++ b/flames/sprites/aya/aya_run_sheet.png
--- a/flames/sprites/nitori/nitori_idle_sheet.png
+++ b/flames/sprites/nitori/nitori_idle_sheet.png
--- a/flames/sprites/nitori/nitori_run_back_sheet.png
+++ b/flames/sprites/nitori/nitori_run_back_sheet.png
--- a/flames/sprites/nitori/nitori_run_sheet.png
+++ b/flames/sprites/nitori/nitori_run_sheet.png
--- a/flames/sprites/portraits/aya_portrait_sheet.png
+++ b/flames/sprites/portraits/aya_portrait_sheet.png
--- a/flames/sprites/portraits/enemy_protrait_sheet.png
+++ b/flames/sprites/portraits/enemy_protrait_sheet.png
--- a/flames/sprites/portraits/nitori_portrait_sheet.png
+++ b/flames/sprites/portraits/nitori_portrait_sheet.png
--- a/flames/sprites/portraits/reisen_portrait_sheet.png
+++ b/flames/sprites/portraits/reisen_portrait_sheet.png
--- a/flames/sprites/portraits/robot_portrait_sheet.png
+++ b/flames/sprites/portraits/robot_portrait_sheet.png
--- a/flames/sprites/robot/robot_idle_sheet.png
+++ b/flames/sprites/robot/robot_idle_sheet.png
--- a/flames/sprites/robot/robot_run.png
+++ b/flames/sprites/robot/robot_run.png
--- a/flames/sprites/robot/robot_run_back.png
+++ b/flames/sprites/robot/robot_run_back.png
		`@ -1 +0,0 @@`
			`21.73337745666504 , 17.503263473510742 , 16.766698837280273`
		`@ -0,0 +1 @@`
							`20.457584381103516 , 8.400664329528809 , 16.608734130859375`
		`@ -0,0 +1 @@`
							`0.3134499788284302 , 1.098434567451477 , 0.0`
		`@ -0,0 +1 @@`
							`21.066211700439453 , 8.650588989257812 , 16.929763793945312`