Merge branch 'master' of https://github.com/cave-story-randomizer/cave-story-randomizer.git

# Conflicts: # pre-edited-cs/data/Stage/Hell2.pxe
2024-11-10 00:45:15 +00:00 · 2020-12-02 09:17:25 +01:00 · 2020-12-02 09:17:25 +01:00 · 4ca549f1e7
parent 900992db5f b71cf74e73
commit 4ca549f1e7
88 changed files with 0 additions and 0 deletions
--- a/pre-edited-cs/data/MyChar.bmp
+++ b/pre-edited-cs/data/MyChar.bmp
--- a/pre-edited-cs/data/Stage/Almond.pxe
+++ b/pre-edited-cs/data/Stage/Almond.pxe
--- a/pre-edited-cs/data/Stage/Ballo1.pxe
+++ b/pre-edited-cs/data/Stage/Ballo1.pxe
--- a/pre-edited-cs/data/Stage/Barr.pxe
+++ b/pre-edited-cs/data/Stage/Barr.pxe
--- a/pre-edited-cs/data/Stage/Blcny1.pxe
+++ b/pre-edited-cs/data/Stage/Blcny1.pxe
--- a/pre-edited-cs/data/Stage/Blcny2.pxe
+++ b/pre-edited-cs/data/Stage/Blcny2.pxe
--- a/pre-edited-cs/data/Stage/Cave.pxe
+++ b/pre-edited-cs/data/Stage/Cave.pxe
--- a/pre-edited-cs/data/Stage/Cemet.pxe
+++ b/pre-edited-cs/data/Stage/Cemet.pxe
--- a/pre-edited-cs/data/Stage/Cent.pxe
+++ b/pre-edited-cs/data/Stage/Cent.pxe
--- a/pre-edited-cs/data/Stage/CentW.pxe
+++ b/pre-edited-cs/data/Stage/CentW.pxe
--- a/pre-edited-cs/data/Stage/Chako.pxe
+++ b/pre-edited-cs/data/Stage/Chako.pxe
--- a/pre-edited-cs/data/Stage/Clock.pxe
+++ b/pre-edited-cs/data/Stage/Clock.pxe
--- a/pre-edited-cs/data/Stage/Comu.pxe
+++ b/pre-edited-cs/data/Stage/Comu.pxe
--- a/pre-edited-cs/data/Stage/Cthu.pxe
+++ b/pre-edited-cs/data/Stage/Cthu.pxe
--- a/pre-edited-cs/data/Stage/Cthu2.pxe
+++ b/pre-edited-cs/data/Stage/Cthu2.pxe
--- a/pre-edited-cs/data/Stage/Drain.pxe
+++ b/pre-edited-cs/data/Stage/Drain.pxe
--- a/pre-edited-cs/data/Stage/EgEnd1.pxe
+++ b/pre-edited-cs/data/Stage/EgEnd1.pxe
--- a/pre-edited-cs/data/Stage/EgEnd2.pxe
+++ b/pre-edited-cs/data/Stage/EgEnd2.pxe
--- a/pre-edited-cs/data/Stage/Egg1.pxe
+++ b/pre-edited-cs/data/Stage/Egg1.pxe
--- a/pre-edited-cs/data/Stage/Egg6.pxe
+++ b/pre-edited-cs/data/Stage/Egg6.pxe
--- a/pre-edited-cs/data/Stage/EggR.pxe
+++ b/pre-edited-cs/data/Stage/EggR.pxe
--- a/pre-edited-cs/data/Stage/EggR2.pxe
+++ b/pre-edited-cs/data/Stage/EggR2.pxe
--- a/pre-edited-cs/data/Stage/EggX.pxe
+++ b/pre-edited-cs/data/Stage/EggX.pxe
--- a/pre-edited-cs/data/Stage/EggX2.pxe
+++ b/pre-edited-cs/data/Stage/EggX2.pxe
--- a/pre-edited-cs/data/Stage/Eggs.pxe
+++ b/pre-edited-cs/data/Stage/Eggs.pxe
--- a/pre-edited-cs/data/Stage/Eggs2.pxe
+++ b/pre-edited-cs/data/Stage/Eggs2.pxe
--- a/pre-edited-cs/data/Stage/Frog.pxe
+++ b/pre-edited-cs/data/Stage/Frog.pxe
--- a/pre-edited-cs/data/Stage/Gard.pxe
+++ b/pre-edited-cs/data/Stage/Gard.pxe
--- a/pre-edited-cs/data/Stage/Hell1.pxe
+++ b/pre-edited-cs/data/Stage/Hell1.pxe
--- a/pre-edited-cs/data/Stage/Hell2.pxe
+++ b/pre-edited-cs/data/Stage/Hell2.pxe
--- a/pre-edited-cs/data/Stage/Hell3.pxe
+++ b/pre-edited-cs/data/Stage/Hell3.pxe
--- a/pre-edited-cs/data/Stage/Hell4.pxe
+++ b/pre-edited-cs/data/Stage/Hell4.pxe
--- a/pre-edited-cs/data/Stage/Hell42.pxe
+++ b/pre-edited-cs/data/Stage/Hell42.pxe
--- a/pre-edited-cs/data/Stage/Itoh.pxe
+++ b/pre-edited-cs/data/Stage/Itoh.pxe
--- a/pre-edited-cs/data/Stage/Jail1.pxe
+++ b/pre-edited-cs/data/Stage/Jail1.pxe
--- a/pre-edited-cs/data/Stage/Jail2.pxe
+++ b/pre-edited-cs/data/Stage/Jail2.pxe
--- a/pre-edited-cs/data/Stage/Jenka2.pxe
+++ b/pre-edited-cs/data/Stage/Jenka2.pxe
--- a/pre-edited-cs/data/Stage/Little.pxe
+++ b/pre-edited-cs/data/Stage/Little.pxe
--- a/pre-edited-cs/data/Stage/Lounge.pxe
+++ b/pre-edited-cs/data/Stage/Lounge.pxe
--- a/pre-edited-cs/data/Stage/Malco.pxe
+++ b/pre-edited-cs/data/Stage/Malco.pxe
--- a/pre-edited-cs/data/Stage/Mapi.pxe
+++ b/pre-edited-cs/data/Stage/Mapi.pxe
--- a/pre-edited-cs/data/Stage/MazeA.pxe
+++ b/pre-edited-cs/data/Stage/MazeA.pxe
--- a/pre-edited-cs/data/Stage/MazeB.pxe
+++ b/pre-edited-cs/data/Stage/MazeB.pxe
--- a/pre-edited-cs/data/Stage/MazeD.pxe
+++ b/pre-edited-cs/data/Stage/MazeD.pxe
--- a/pre-edited-cs/data/Stage/MazeH.pxe
+++ b/pre-edited-cs/data/Stage/MazeH.pxe
--- a/pre-edited-cs/data/Stage/MazeI.pxe
+++ b/pre-edited-cs/data/Stage/MazeI.pxe
--- a/pre-edited-cs/data/Stage/MazeM.pxe
+++ b/pre-edited-cs/data/Stage/MazeM.pxe
--- a/pre-edited-cs/data/Stage/MazeO.pxe
+++ b/pre-edited-cs/data/Stage/MazeO.pxe
--- a/pre-edited-cs/data/Stage/MazeS.pxe
+++ b/pre-edited-cs/data/Stage/MazeS.pxe
--- a/pre-edited-cs/data/Stage/MazeW.pxe
+++ b/pre-edited-cs/data/Stage/MazeW.pxe
--- a/pre-edited-cs/data/Stage/MiBox.pxe
+++ b/pre-edited-cs/data/Stage/MiBox.pxe
--- a/pre-edited-cs/data/Stage/Mimi.pxe
+++ b/pre-edited-cs/data/Stage/Mimi.pxe
--- a/pre-edited-cs/data/Stage/Momo.pxe
+++ b/pre-edited-cs/data/Stage/Momo.pxe
--- a/pre-edited-cs/data/Stage/Oside.pxe
+++ b/pre-edited-cs/data/Stage/Oside.pxe
--- a/pre-edited-cs/data/Stage/Ostep.pxe
+++ b/pre-edited-cs/data/Stage/Ostep.pxe
--- a/pre-edited-cs/data/Stage/Pens1.pxe
+++ b/pre-edited-cs/data/Stage/Pens1.pxe
--- a/pre-edited-cs/data/Stage/Pixel.pxe
+++ b/pre-edited-cs/data/Stage/Pixel.pxe
--- a/pre-edited-cs/data/Stage/Plant.pxe
+++ b/pre-edited-cs/data/Stage/Plant.pxe
--- a/pre-edited-cs/data/Stage/Pole.pxe
+++ b/pre-edited-cs/data/Stage/Pole.pxe
--- a/pre-edited-cs/data/Stage/Pool.pxe
+++ b/pre-edited-cs/data/Stage/Pool.pxe
--- a/pre-edited-cs/data/Stage/Prefa1.pxe
+++ b/pre-edited-cs/data/Stage/Prefa1.pxe
--- a/pre-edited-cs/data/Stage/Prefa2.pxe
+++ b/pre-edited-cs/data/Stage/Prefa2.pxe
--- a/pre-edited-cs/data/Stage/Priso1.pxe
+++ b/pre-edited-cs/data/Stage/Priso1.pxe
--- a/pre-edited-cs/data/Stage/Priso2.pxe
+++ b/pre-edited-cs/data/Stage/Priso2.pxe
--- a/pre-edited-cs/data/Stage/Ring1.pxe
+++ b/pre-edited-cs/data/Stage/Ring1.pxe
--- a/pre-edited-cs/data/Stage/Ring2.pxe
+++ b/pre-edited-cs/data/Stage/Ring2.pxe
--- a/pre-edited-cs/data/Stage/Ring3.pxe
+++ b/pre-edited-cs/data/Stage/Ring3.pxe
--- a/pre-edited-cs/data/Stage/River.pxe
+++ b/pre-edited-cs/data/Stage/River.pxe
--- a/pre-edited-cs/data/Stage/SandE.pxe
+++ b/pre-edited-cs/data/Stage/SandE.pxe
--- a/pre-edited-cs/data/Stage/Santa.pxe
+++ b/pre-edited-cs/data/Stage/Santa.pxe
--- a/pre-edited-cs/data/Stage/Shelt.pxe
+++ b/pre-edited-cs/data/Stage/Shelt.pxe
--- a/pre-edited-cs/data/Stage/Start.pxe
+++ b/pre-edited-cs/data/Stage/Start.pxe
--- a/pre-edited-cs/data/Stage/Statue.pxe
+++ b/pre-edited-cs/data/Stage/Statue.pxe
--- a/pre-edited-cs/data/Stage/Stream.pxe
+++ b/pre-edited-cs/data/Stage/Stream.pxe
--- a/pre-edited-cs/data/Stage/Weed.pxe
+++ b/pre-edited-cs/data/Stage/Weed.pxe
--- a/pre-edited-cs/data/Stage/WeedB.pxe
+++ b/pre-edited-cs/data/Stage/WeedB.pxe
--- a/pre-edited-cs/data/Stage/WeedD.pxe
+++ b/pre-edited-cs/data/Stage/WeedD.pxe
--- a/pre-edited-cs/data/Stage/WeedS.pxe
+++ b/pre-edited-cs/data/Stage/WeedS.pxe
--- a/pre-edited-cs/data/mrmap.bin
+++ b/pre-edited-cs/data/mrmap.bin
--- a/pre-edited-cs/data/npc.tbl
+++ b/pre-edited-cs/data/npc.tbl
--- a/src/assets/myChar/Curly.bmp
+++ b/src/assets/myChar/Curly.bmp
--- a/src/assets/myChar/Frog.bmp
+++ b/src/assets/myChar/Frog.bmp
--- a/src/assets/myChar/Kanpachi.bmp
+++ b/src/assets/myChar/Kanpachi.bmp
--- a/src/assets/myChar/King.bmp
+++ b/src/assets/myChar/King.bmp
--- a/src/assets/myChar/Misery.bmp
+++ b/src/assets/myChar/Misery.bmp
--- a/src/assets/myChar/Quote.bmp
+++ b/src/assets/myChar/Quote.bmp
--- a/src/assets/myChar/Sue.bmp
+++ b/src/assets/myChar/Sue.bmp
--- a/src/assets/myChar/Toroko.bmp
+++ b/src/assets/myChar/Toroko.bmp