From 5c6a4ff57ddd7b59a3c3dc0e52b75cf9ca0ff7a9 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Sun, 9 Jul 2023 20:56:53 -0700
Subject: [PATCH] daaaaa

---
 .../editors/character/CharacterAnimScreen.hx      | 15 +++++----------
 .../funkin/editors/character/CharacterEditor.hx   |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/funkin/editors/character/CharacterAnimScreen.hx b/source/funkin/editors/character/CharacterAnimScreen.hx
index d4fdfd18..598f6209 100644
--- a/source/funkin/editors/character/CharacterAnimScreen.hx
+++ b/source/funkin/editors/character/CharacterAnimScreen.hx
@@ -2,22 +2,19 @@ package funkin.editors.character;
 
 import flixel.math.FlxPoint;
 import flixel.animation.FlxAnimation;
+import funkin.backend.utils.XMLUtil.AnimData;
 
 class CharacterAnimScreen extends UISubstateWindow {
 	public var animName:Null<String>;
-	public var offset:FlxPoint;
-	public var flxanim:FlxAnimation;
+	public var animData:AnimData;
 
 	public var saveButton:UIButton;
 	public var closeButton:UIButton;
 
-	private var onSave:(animName:Null<String>, offset:FlxPoint, flxanim:FlxAnimation) -> Void = null;
+	private var onSave:(animData:AnimData) -> Void = null;
 
-	public function new(animName:Null<String>, ?offset:FlxPoint, ?flxanim:FlxAnimation, ?onSave:(animName:Null<String>, offset:FlxPoint, flxanim:FlxAnimation) -> Void) {
+	public function new(animName:Null<String>, animData:AnimData) {
 		this.animName = animName;
-		this.offset = offset;
-		this.flxanim = flxanim;
-		this.onSave = onSave;
 		super();
 	}
 
@@ -26,8 +23,6 @@ class CharacterAnimScreen extends UISubstateWindow {
 
 		if (creatingAnim) {
 			animName = "";
-			offset = FlxPoint.get(0,0);
-			flxanim = new FlxAnimation(CharacterEditor.instance.character.animation, animName, []);
 		}
 
 		winTitle = creatingAnim ? 'Creating Animation' : 'Animation $animName properties';
@@ -48,7 +43,7 @@ class CharacterAnimScreen extends UISubstateWindow {
 		add(saveButton);
 
 		closeButton = new UIButton(saveButton.x - 20, saveButton.y, creatingAnim ? "Cancel" : "Close", function() {
-			if (creatingAnim) onSave(null, null, null);
+			if (creatingAnim) onSave(null);
 			close();
 		}, 125);
 		add(closeButton);
diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx
index 530e5c15..fa4fc990 100644
--- a/source/funkin/editors/character/CharacterEditor.hx
+++ b/source/funkin/editors/character/CharacterEditor.hx
@@ -338,7 +338,7 @@ class CharacterEditor extends UIState {
 	}
 
 	function _char_add_anim(_) {
-		FlxG.state.openSubState(new CharacterAnimScreen(null));
+		FlxG.state.openSubState(new CharacterAnimScreen(null, null));
 	}
 
 	function _char_update_anim(_) {
@@ -362,7 +362,7 @@ class CharacterEditor extends UIState {
 	}
 
 	public function deleteAnim(name:String, addtoUndo:Bool = true) {
-		playAnimation(character.animation.getNameList()[character.animation.getNameList().indexOf(name)-1]);
+		playAnimation(character.animation.getNameList()[Std.int(Math.abs(character.animation.getNameList().indexOf(name)-1))]);
 
 		@:privateAccess var flxanim:FlxAnimation = character.animation._animations.get(name);
 		var oldID:Int = character.animation.getNameList().indexOf(name);