Ok for real this time #34

andwn · Oct 9, 2016 · b3f50cd · b3f50cd
1 parent f49a2f9
commit b3f50cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ai/cemetery.c b/src/ai/cemetery.c
@@ -11,11 +11,12 @@
 void ai_pignon(Entity *e) {
 	e->timer++;
 	if(e->state < 3 && e->damage_time == 29) {
-		FACE_PLAYER(e);
+		//FACE_PLAYER(e);
 		e->state = 3;
 		e->timer = 0;
 		e->y_speed = -0x100;
-		MOVE_X(-0x120);
+		e->x_speed = e->x > player.x ? -0x100 : 0x100;
+		//MOVE_X(-0x120);
 		e->frame = 4;
 	}
 	switch(e->state) {
@@ -60,7 +61,7 @@ void ai_pignon(Entity *e) {
 		break;
 		case 3: // Hurt
 		{
-			e->x_speed += -0x4 + 0x8 * e->dir; // Decellerate
+			e->x_speed -= e->x_speed > 0 ? 4 : -4; // Decellerate
 			if(e->timer >= TIME(30)) {
 				e->state = 0;
 				e->timer = 0;

diff --git a/src/db/stage.c b/src/db/stage.c
@@ -19,7 +19,7 @@ const stage_info_def stage_info[STAGE_COUNT] = {
 	{ PXM_Barr,		PXE_Barr,	TSC_Barr,	&PAL_Regu,	14,	0,	"Shack" },
 	{ PXM_Pool,		PXE_Pool,	TSC_Pool,	&PAL_Regu,	14,	2,	"Reservoir" },
 	/* 0x10 (16) */
-	{ PXM_Cemet,	PXE_Cemet,	TSC_Cemet,	&PAL_Regu,	14,	2,	"Graveyard" },
+	{ PXM_Cemet,	PXE_Cemet,	TSC_Cemet,	&PAL_Regu,	14,	0,	"Graveyard" },
 	{ PXM_Plant,	PXE_Plant,	TSC_Plant,	&PAL_Plant,	14,	2,	"Yamashita Farm" },
 	{ PXM_Shelt,	PXE_Shelt,	TSC_Shelt,	&PAL_Regu,	19,	0,	"Shelter" },
 	{ PXM_Comu,		PXE_Comu,	TSC_Comu,	&PAL_Regu,	16,	0,	"Assembly Hall" },