scr_get_inputs();

//Punch!
if (key_attack1)
{
	sprite_index = spr_mariya_jab;
	state = states.attacking;
}

// Calculate Movement
var move = key_right - key_left;

hsp = move * walksp;

vsp =  vsp + grv;


//Normal Jump
if (place_meeting(x, y+1,obj_wall)) and (key_jump)
{
	vsp = -jumpHeight;
	state = states.aerial;
}

// Horizontal Collision
if (place_meeting(x+hsp,y,obj_wall))
{
	while(!place_meeting(x+sign(hsp), y, obj_wall))
	{
		x = x+sign(hsp);
	}
	hsp = 0;
}

//Vertical Collision
if (place_meeting(x,y+vsp,obj_wall))
{
	while(!place_meeting(x, y+sign(vsp), obj_wall))
	{
		y = y + sign(vsp);
	}
	state = states.grounded;
	earthborn = true;
	vsp = 0;
	dbljump = true;
}
else
{
	state = states.aerial;
}

//Animation
if (place_meeting(x, y+1, obj_wall))
{
	image_speed = 1;
	if (hsp == 0)
	{
		sprite_index = spr_mariya;
	}
	else
	{
		sprite_index = spr_mariya_walk;
	}
}