From 06269e95fd803e45b28e3d707e066397d256a205 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Mon, 18 Sep 2023 20:02:17 -0400
Subject: [PATCH] Fix to crash in freeplay (swapped two args oops!)

---
 source/funkin/data/song/SongRegistry.hx             | 2 +-
 source/funkin/play/song/Song.hx                     | 2 +-
 source/funkin/ui/debug/charting/ChartEditorState.hx | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/funkin/data/song/SongRegistry.hx b/source/funkin/data/song/SongRegistry.hx
index 5f2961c19..9bc1278c8 100644
--- a/source/funkin/data/song/SongRegistry.hx
+++ b/source/funkin/data/song/SongRegistry.hx
@@ -242,7 +242,7 @@ class SongRegistry extends BaseRegistry<Song, SongMetadata>
 
   public function fetchEntryChartVersion(id:String, variation:String = ''):Null<thx.semver.Version>
   {
-    var entryStr:String = loadEntryChartFile(id, variation).contents;
+    var entryStr:Null<String> = loadEntryChartFile(id, variation)?.contents;
     var entryVersion:thx.semver.Version = VersionUtil.getVersionFromJSON(entryStr);
     return entryVersion;
   }
diff --git a/source/funkin/play/song/Song.hx b/source/funkin/play/song/Song.hx
index b008f6a8e..e32eb8186 100644
--- a/source/funkin/play/song/Song.hx
+++ b/source/funkin/play/song/Song.hx
@@ -207,7 +207,7 @@ class Song implements IPlayStateScriptedClass implements IRegistryEntry<SongMeta
     {
       var version:Null<thx.semver.Version> = SongRegistry.instance.fetchEntryChartVersion(id, variation);
       if (version == null) continue;
-      var chart:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataWithMigration(id, version, variation);
+      var chart:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataWithMigration(id, variation, version);
       if (chart == null) continue;
       applyChartData(chart, variation);
     }
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index cb98ba68e..13450bece 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -2848,6 +2848,7 @@ class ChartEditorState extends HaxeUIState
     // If this gets too big, something needs to be optimized somewhere! -Eric
     FlxG.watch.addQuick("tapNotesRendered", renderedNotes.members.length);
     FlxG.watch.addQuick("holdNotesRendered", renderedHoldNotes.members.length);
+    FlxG.watch.addQuick("eventsRendered", renderedEvents.members.length);
   }
 
   function buildSelectionSquare():FlxSprite