From de6bf5209caaefb06b74d116f9b36a27902be676 Mon Sep 17 00:00:00 2001
From: cuckydev <cuckydev@users.noreply.github.com>
Date: Sun, 3 Feb 2019 13:41:15 -0500
Subject: [PATCH] whimsical star done

---
 ...Save Curly Booster v2 Spur Whimsical Star.dat | Bin 0 -> 1540 bytes
 src/Bullet.cpp                                   |  12 +++++++++++-
 src/MyChar.cpp                                   |   3 ++-
 src/Stage.cpp                                    |   3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 build/Save Curly Booster v2 Spur Whimsical Star.dat

diff --git a/build/Save Curly Booster v2 Spur Whimsical Star.dat b/build/Save Curly Booster v2 Spur Whimsical Star.dat
new file mode 100644
index 0000000000000000000000000000000000000000..42c36f85f95e49ff5b907d5c26dd92a786ce7f1d
GIT binary patch
literal 1540
zcmZ?CH!v|YGBRLfU|`?_VumUps{zDdV9;b>24V;R$!&wO-K4k}c!6w?9%R4;<S+v<
zh~|f45Fdm^fEWhYfeersD-fqZF(*_ENKpl_08Ih84`de;5UT<)$PSR(IDl9ghy{UI
z4v0m8SR9CjfmjWQsR2NC7Xl3h*<A#rLH;cU(ja%0fGiv2z|F_e9XWnKFad*8fZ-4u
z$ldIJzOn;jIN`u=W`+lh40{<2fPpQ-;K0Bj!Ek^9sKkMxjzIww$N~%urVIuL<QZ5l
zFoNR(7!V(tfvgRT3}FlxK;g3BKrT2`Kn9}&P-x)+SfuT6DVN42G3dmBVKxdzLx6rE
F007XK8@vDj

literal 0
HcmV?d00001

diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index 414d9ab8..8ec492aa 100644
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -1018,6 +1018,12 @@ void ActBullet_SuperBom(BULLET *bul, int level)
 	}
 }
 
+void ActBullet_Star(BULLET *bul)
+{
+	if (++bul->count1 > bul->life_count)
+		bul->cond = 0;
+}
+
 void ActBullet()
 {
 	for (int i = 0; i < BULLET_MAX; i++)
@@ -1092,7 +1098,11 @@ void ActBullet()
 					case 33:
 						ActBullet_SuperBom(&gBul[i], 3);
 						break;
-
+					case 45:
+						ActBullet_Star(&gBul[i]);
+						break;
+					default:
+						continue;
 				}
 			}
 			else
diff --git a/src/MyChar.cpp b/src/MyChar.cpp
index db5d6e78..9fa7f6fb 100644
--- a/src/MyChar.cpp
+++ b/src/MyChar.cpp
@@ -14,6 +14,7 @@
 #include "TextScr.h"
 #include "Flags.h"
 #include "Game.h"
+#include "Star.h"
 #include "Caret.h"
 
 MYCHAR gMC;
@@ -740,7 +741,7 @@ void SetMyCharPosition(int x, int y)
 	gMC.xm = 0;
 	gMC.ym = 0;
 	gMC.cond &= ~1;
-	//InitStar();
+	InitStar();
 }
 
 void MoveMyChar(int x, int y)
diff --git a/src/Stage.cpp b/src/Stage.cpp
index 7ce5143c..3c9968f3 100644
--- a/src/Stage.cpp
+++ b/src/Stage.cpp
@@ -8,6 +8,7 @@
 #include "Map.h"
 #include "MapName.h"
 #include "MyChar.h"
+#include "Bullet.h"
 #include "Boss.h"
 #include "Draw.h"
 #include "Tags.h"
@@ -192,7 +193,7 @@ bool TransferStage(int no, int w, int x, int y)
 		
 		StartTextScript(w);
 		SetFrameMyChar();
-		//ClearBullet();
+		ClearBullet();
 		InitCaret();
 		ClearValueView();
 		ResetQuake();