MarNameRefGen

include/MoveBG/Item.hpp

@@ -32,7 +32,7 @@ class TItem : public TMapObjGeneral {
 
 class TCoin : public TItem {
 public:
-	TCoin(const char*);
+	TCoin(const char* name = "コイン");
 
 	virtual void loadAfter();
 	virtual void perform(u32, JDrama::TGraphics*);
@@ -50,7 +50,7 @@ class TCoin : public TItem {
 
 class TFlowerCoin : public TCoin {
 public:
-	TFlowerCoin();
+	TFlowerCoin(const char* name = "コイン(フラワー用)");
 
 	virtual void load(JSUMemoryInputStream&);
 
@@ -71,13 +71,13 @@ class TCoinEmpty : public TCoin {
 
 class TCoinRed : public TCoin {
 public:
-	TCoinRed(const char*);
+	TCoinRed(const char* name = "赤コイン");
 	virtual void taken(THitActor*);
 };
 
 class TCoinBlue : public TCoin {
 public:
-	TCoinBlue(const char*);
+	TCoinBlue(const char* name = "青コイン");
 
 	virtual void load(JSUMemoryInputStream&);
 	virtual void makeObjAppeared();
@@ -87,7 +87,7 @@ class TCoinBlue : public TCoin {
 
 class TShine : public TItem {
 public:
-	TShine(const char*);
+	TShine(const char* name = "シャイン");
 
 	virtual void loadAfter();
 	virtual void perform(u32, JDrama::TGraphics*);
@@ -147,7 +147,7 @@ class TShine : public TItem {
 
 class TEggYoshi : public TMapObjGeneral {
 public:
-	TEggYoshi(const char*);
+	TEggYoshi(const char* name = "ヨッシーの卵");
 
 	virtual void load(JSUMemoryInputStream&);
 	virtual void perform(u32, JDrama::TGraphics*);
@@ -180,7 +180,7 @@ class TItemNozzle : public TItem {
 
 class TNozzleBox : public TMapObjGeneral {
 public:
-	TNozzleBox(const char*);
+	TNozzleBox(const char* name = "ノズルボックス");
 
 	virtual void load(JSUMemoryInputStream&);
 	virtual void loadAfter();

include/MoveBG/MapObjBall.hpp

@@ -77,7 +77,7 @@ class TRandomFruit : public TResetFruit {
 
 class TCoverFruit : public TMapObjBase {
 public:
-	TCoverFruit();
+	TCoverFruit(const char*);
 	virtual void loadAfter();
 	virtual BOOL receiveMessage(THitActor* sender, u32 message);
 

include/MoveBG/MapObjBlock.hpp

@@ -18,7 +18,7 @@ class TBreakableBlock : public TMapObjGeneral {
 
 class TSandBlock : public TMapObjBase {
 public:
-	TSandBlock();
+	TSandBlock(const char* name = "砂ブロック");
 	void initMapObj();
 	void control();
 	void touchPlayer(THitActor*);
@@ -48,7 +48,7 @@ class TLeanBlock : public TMapObjBase {
 
 class TIceBlock : public TMapObjBase {
 public:
-	TIceBlock();
+	TIceBlock(const char*);
 	void initMapObj();
 	void calc();
 	void control();
@@ -59,7 +59,7 @@ class TIceBlock : public TMapObjBase {
 
 class TBrickBlock : public THideObjBase {
 public:
-	TBrickBlock();
+	TBrickBlock(const char*);
 	void initMapObj();
 	BOOL receiveMessage(THitActor* sender, u32 message);
 	void kill();
@@ -100,6 +100,7 @@ class TTelesaBlock : public TJuiceBlock {
 
 class TSuperHipDropBlock : public TBreakHideObj {
 public:
+	TSuperHipDropBlock(const char*);
 	void loadAfter();
 	BOOL receiveMessage(THitActor* sender, u32 message);
 };

include/MoveBG/MapObjEx.hpp

@@ -39,7 +39,7 @@ class TMapObjSteam : public THideObjBase {
 	virtual void load(JSUMemoryInputStream&);
 	virtual void control();
 
-	TMapObjSteam();
+	TMapObjSteam(const char*);
 };
 
 #endif

include/MoveBG/MapObjFence.hpp

@@ -24,7 +24,10 @@ class TRevolvingFenceOuter : public TFence {
 public:
 	BOOL receiveMessage(THitActor* sender, u32 message);
 	void initMapCollisionData();
-	TRevolvingFenceOuter();
+	TRevolvingFenceOuter(const char* name)
+	    : TFence(name)
+	{
+	}
 };
 
 class TRevolvingFenceInner : public TFence {
@@ -60,14 +63,21 @@ class TFenceWater : public TFence {
 	void control();
 	void initMapCollisionData();
 	void initMapObj();
-	TFenceWater();
+	TFenceWater(const char* name)
+	    : TFence(name)
+	{
+	}
 };
 
 class TFenceWaterH : public TFenceWater {
 public:
 	void control();
 	void changeStatusToGo();
 	void changeStatusToWait();
+	TFenceWaterH(const char* name)
+	    : TFenceWater(name)
+	{
+	}
 };
 
 class TRailFence : public TFence {
@@ -78,7 +88,10 @@ class TRailFence : public TFence {
 	void control();
 	void initMapCollisionData();
 	void load(JSUMemoryInputStream&);
-	TRailFence(const char*);
+	TRailFence(const char* name)
+	    : TFence(name)
+	{
+	}
 };
 
 #endif

include/MoveBG/MapObjHide.hpp

@@ -25,7 +25,7 @@ class THideObjBase : public TMapObjBase {
 
 class TBreakHideObj : public THideObjBase {
 public:
-	TBreakHideObj();
+	TBreakHideObj(const char*);
 	virtual BOOL receiveMessage(THitActor* sender, u32 message);
 	virtual void control();
 	virtual void kill();

include/MoveBG/MapObjMamma.hpp

@@ -32,7 +32,7 @@ class TSandLeafBase : public TSandBase {
 	void grow();
 	void control();
 	void initMapObj();
-	TSandLeafBase();
+	TSandLeafBase(const char*);
 };
 
 class TSandBomb : public TSandLeaf {
@@ -124,7 +124,7 @@ class TMammaYacht : public TMapObjBase {
 public:
 	void control();
 	void initMapObj();
-	TMammaYacht();
+	TMammaYacht(const char*);
 };
 
 class TSandBird : public TJointCoin {
@@ -158,7 +158,7 @@ class TMammaMirrorMapOperator : public JDrama::TViewObj {
 class TSandEgg : public TMapObjBase {
 public:
 	u32 getSDLModelFlag() const;
-	TSandEgg();
+	TSandEgg(const char*);
 };
 
 #endif

include/MoveBG/MapObjMare.hpp

@@ -32,7 +32,7 @@ class TMapObjElasticCode : public TMapObjBase {
 	void draw() const;
 	void control();
 	void initMapObj();
-	TMapObjElasticCode();
+	TMapObjElasticCode(const char*);
 };
 
 class TMapObjGrowTree : public TMapObjBase {
@@ -60,7 +60,7 @@ class TMapObjPuncher : public TMapObjBase {
 	void touchPlayer(THitActor*);
 	void control();
 	void load(JSUMemoryInputStream&);
-	TMapObjPuncher();
+	TMapObjPuncher(const char*);
 };
 
 class TMuddyBoat : public TMapObjBase {
@@ -83,7 +83,7 @@ class TMareFall : public TMapObjBase {
 public:
 	void calc();
 	void load(JSUMemoryInputStream&);
-	TMareFall();
+	TMareFall(const char*);
 };
 
 class TMareCork : public TMapObjBase {
@@ -93,14 +93,14 @@ class TMareCork : public TMapObjBase {
 	void calcRootMatrix();
 	MtxPtr getTakingMtx();
 	void drawObject(JDrama::TGraphics*);
-	TMareCork();
+	TMareCork(const char*);
 };
 
 class TMareEventPoint : public THitActor {
 public:
 	BOOL receiveMessage(THitActor* sender, u32 message);
 	void load(JSUMemoryInputStream&);
-	TMareEventPoint();
+	TMareEventPoint(const char*);
 };
 
 #endif

include/MoveBG/MapObjMonte.hpp

@@ -9,14 +9,14 @@
 class TMapObjMonteRoot : public TMapObjBase {
 public:
 	void initMapObj();
-	TMapObjMonteRoot();
+	TMapObjMonteRoot(const char*);
 };
 
 class TJumpMushroom : public TMapObjBase {
 public:
 	BOOL receiveMessage(THitActor*, unsigned long);
 	void load(JSUMemoryInputStream&);
-	TJumpMushroom();
+	TJumpMushroom(const char*);
 };
 
 class THangingBridgeBoard : public TLeanBlock {
@@ -68,7 +68,7 @@ class TGoalFlag : public TMapObjBase {
 	f32 getRadiusAtY(f32) const;
 	void touchActor(THitActor*);
 	void initMapObj();
-	TGoalFlag();
+	TGoalFlag(const char*);
 };
 
 class TFluff : public TMapObjBase {

include/MoveBG/MapObjPinna.hpp

@@ -85,19 +85,19 @@ class TBalloonKoopaJr : public TMapObjGeneral {
 	void touchActor(THitActor*);
 	void kill();
 	void load(JSUMemoryInputStream&);
-	TBalloonKoopaJr();
+	TBalloonKoopaJr(const char*);
 };
 
 class TPinnaEntrance : public TMapObjBase {
 public:
 	void loadAfter();
-	TPinnaEntrance();
+	TPinnaEntrance(const char*);
 };
 
 class TWaterRecoverObj : public TMapObjBase {
 public:
 	void touchPlayer(THitActor*);
-	TWaterRecoverObj();
+	TWaterRecoverObj(const char*);
 };
 
 class TAmiKing : public TMapObjBase {
@@ -109,7 +109,7 @@ class TAmiKing : public TMapObjBase {
 	void calcRootMatrix();
 	void bind();
 	void touchPlayer(THitActor*);
-	TAmiKing();
+	TAmiKing(const char*);
 };
 
 class TPinnaCoaster : public TMapObjBase {

include/MoveBG/MapObjPlane.hpp

@@ -52,14 +52,14 @@ class TMapObjPlane : public TLiveActor {
 	/* 0x11C */ u16 unk11C;
 };
 
-class TRockPlane : TMapObjPlane {
+class TRockPlane : public TMapObjPlane {
 public:
 	TRockPlane(const char*);
 
 	virtual void load(JSUMemoryInputStream&);
 };
 
-class TSandPlane : TMapObjPlane {
+class TSandPlane : public TMapObjPlane {
 public:
 	TSandPlane(const char*);
 

include/MoveBG/MapObjRicco.hpp

@@ -12,14 +12,14 @@ class TCraneRotY : public TMapObjBase {
 	void calc();
 	void control();
 	void load(JSUMemoryInputStream&);
-	TCraneRotY();
+	TCraneRotY(const char*);
 };
 
 class TCraneUpDown : public TMapObjBase {
 public:
 	void control();
 	void initMapObj();
-	TCraneUpDown();
+	TCraneUpDown(const char*);
 };
 
 class TCraneCargo : public TLeanBlock {
@@ -44,23 +44,23 @@ class TRiccoWatermill : public TMapObjBase {
 class TSurfGesoObj : public TItem {
 public:
 	void initMapObj();
-	TSurfGesoObj();
+	TSurfGesoObj(const char*);
 };
 
 class TFruitSwitch : public TMapObjBase {
 public:
 	void pullUp();
 	void pushDown();
 	BOOL receiveMessage(THitActor* sender, u32 message);
-	TFruitSwitch();
+	TFruitSwitch(const char*);
 };
 
 class TFruitLauncher : public TMapObjBase {
 public:
 	void appearFruit() const;
 	void fireObj();
 	void loadAfter();
-	TFruitLauncher();
+	TFruitLauncher(const char*);
 };
 
 #endif

include/MoveBG/MapObjSample.hpp

@@ -5,7 +5,7 @@
 
 class TGateShadow : public JDrama::TViewObj {
 public:
-	TGateShadow();
+	TGateShadow(const char* name = "シャドウ球");
 	void perform(u32, JDrama::TGraphics*);
 };