# HG changeset patch
# User tkaito
# Date 1297907816 -32400
# Node ID f27a6af6514c9c959bc2c1e641fa69a04bb9a0a7
# Parent  b97628fca31793cb9195705aae3216dc736c059a
SchedRegister, game_task.h etc...

diff -r b97628fca317 -r f27a6af6514c Makefile.def
--- a/Makefile.def	Thu Feb 17 04:49:47 2011 +0900
+++ b/Makefile.def	Thu Feb 17 10:56:56 2011 +0900
@@ -7,7 +7,7 @@
 ABIBIT = 32
 ABI = -m$(ABIBIT)
 CC      = g++
-OPT = -O9
+OPT = -g #-O9
 CFLAGS  =  -Wall $(OPT) $(ABI)
 
 
diff -r b97628fca317 -r f27a6af6514c StateList.c
--- a/StateList.c	Thu Feb 17 04:49:47 2011 +0900
+++ b/StateList.c	Thu Feb 17 10:56:56 2011 +0900
@@ -28,51 +28,51 @@
 {
     SetTaskState(DELETE_CHARA, delete_chara, "delete_chara");
 
-    SetTaskState(STATE0, chara_state0, "chara_state0");
-    SetTaskState(STATE1, chara_state1, "chara_state1");
-    SetTaskState(STATE2, chara_state2, "chara_state2");
-    SetTaskState(STATE3, chara_state3, "chara_state3");
-    SetTaskState(STATE4, chara_state4, "chara_state4");
-    SetTaskState(STATE5, chara_state5, "chara_state5");
-    SetTaskState(STATE6, chara_state6, "chara_state6");
-    SetTaskState(STATE7, chara_state7, "chara_state7");
-    SetTaskState(STATE8, chara_state8, "chara_state8");
-    SetTaskState(STATE9, chara_state9, "chara_state9");
-    SetTaskState(STATE10, chara_state10, "chara_state10");
-    SetTaskState(STATE11, chara_state11, "chara_state11");
-    SetTaskState(STATE12, chara_state12, "chara_state12");
-    SetTaskState(STATE13, chara_state13, "chara_state13");
+    SetTaskState(State0, chara_state0, "chara_state0");
+    SetTaskState(State1, chara_state1, "chara_state1");
+    SetTaskState(State2, chara_state2, "chara_state2");
+    SetTaskState(State3, chara_state3, "chara_state3");
+    SetTaskState(State4, chara_state4, "chara_state4");
+    SetTaskState(State5, chara_state5, "chara_state5");
+    SetTaskState(State6, chara_state6, "chara_state6");
+    SetTaskState(State7, chara_state7, "chara_state7");
+    SetTaskState(State8, chara_state8, "chara_state8");
+    SetTaskState(State9, chara_state9, "chara_state9");
+    SetTaskState(State10, chara_state10, "chara_state10");
+    SetTaskState(State11, chara_state11, "chara_state11");
+    SetTaskState(State12, chara_state12, "chara_state12");
+    SetTaskState(State13, chara_state13, "chara_state13");
 
-    SetTaskState(STATE20, chara_state20, "chara_state20");
-    SetTaskState(STATE21, chara_state21, "chara_state21");
-    SetTaskState(STATE22, chara_state22, "chara_state22");
-    SetTaskState(STATE23, chara_state23, "chara_state23");
-    SetTaskState(STATE24, chara_state24, "chara_state24");
-    SetTaskState(STATE25, chara_state25, "chara_state25");
-    SetTaskState(STATE26, chara_state26, "chara_state26");
-    SetTaskState(STATE27, chara_state27, "chara_state27");
-    SetTaskState(STATE28, chara_state28, "chara_state28");
-    SetTaskState(STATE29, chara_state29, "chara_state29");
-    SetTaskState(STATE30, chara_state30, "chara_state30");
-    SetTaskState(STATE31, chara_state31, "chara_state31");
-    SetTaskState(STATE32, chara_state32, "chara_state32");
-    SetTaskState(STATE33, chara_state33, "chara_state33");
-    SetTaskState(STATE34, chara_state34, "chara_state34");
-    SetTaskState(STATE35, chara_state35, "chara_state35");
-    SetTaskState(STATE40, chara_state40, "chara_state40");
-    SetTaskState(STATE41, chara_state41, "chara_state41");
+    SetTaskState(State20, chara_state20, "chara_state20");
+    SetTaskState(State21, chara_state21, "chara_state21");
+    SetTaskState(State22, chara_state22, "chara_state22");
+    SetTaskState(State23, chara_state23, "chara_state23");
+    SetTaskState(State24, chara_state24, "chara_state24");
+    SetTaskState(State25, chara_state25, "chara_state25");
+    SetTaskState(State26, chara_state26, "chara_state26");
+    SetTaskState(State27, chara_state27, "chara_state27");
+    SetTaskState(State28, chara_state28, "chara_state28");
+    SetTaskState(State29, chara_state29, "chara_state29");
+    SetTaskState(State30, chara_state30, "chara_state30");
+    SetTaskState(State31, chara_state31, "chara_state31");
+    SetTaskState(State32, chara_state32, "chara_state32");
+    SetTaskState(State33, chara_state33, "chara_state33");
+    SetTaskState(State34, chara_state34, "chara_state34");
+    SetTaskState(State35, chara_state35, "chara_state35");
+    SetTaskState(State40, chara_state40, "chara_state40");
+    SetTaskState(State41, chara_state41, "chara_state41");
 
-    SetTaskState(STATE400, chara_state400, "chara_state400");
-    SetTaskState(STATE401, chara_state401, "chara_state401");
-    SetTaskState(STATE402, chara_state402, "chara_state402");
+    SetTaskState(State400, chara_state400, "chara_state400");
+    SetTaskState(State401, chara_state401, "chara_state401");
+    SetTaskState(State402, chara_state402, "chara_state402");
 
-    SetTaskState(STATE410, chara_state410, "chara_state410");
-    SetTaskState(STATE411, chara_state411, "chara_state411");
+    SetTaskState(State410, chara_state410, "chara_state410");
+    SetTaskState(State411, chara_state411, "chara_state411");
 
-    SetTaskState(STATE500, chara_state500, "chara_state500");
-    SetTaskState(STATE501, chara_state501, "chara_state501");
+    SetTaskState(State500, chara_state500, "chara_state500");
+    SetTaskState(State501, chara_state501, "chara_state501");
 
-    SetTaskState(STATE600, chara_state600, "chara_state600");
-    SetTaskState(STATE601, chara_state601, "chara_state601");
-    SetTaskState(STATE602, chara_state602, "chara_state602");
+    SetTaskState(State600, chara_state600, "chara_state600");
+    SetTaskState(State601, chara_state601, "chara_state601");
+    SetTaskState(State602, chara_state602, "chara_state602");
 }
diff -r b97628fca317 -r f27a6af6514c collision_task.cc
--- a/collision_task.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/collision_task.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -154,7 +154,7 @@
 HTaskPtr
 collision_reflect()
 {
-    reflect_task = tmanager->create_task(COLLDATA_REFLECT);
+  reflect_task = tmanager->create_task(CollDataReflect);
     CollisionPropertyPtr property = (CollisionPropertyPtr)tmanager->allocate(sizeof(CollisionProperty));
 
     reflect_task->set_param(0, (memaddr)COLLDATA);
@@ -210,7 +210,7 @@
     obj->flag = false;
     obj->length = 0;
 
-    HTaskPtr collision_task = tmanager->create_task(ATARI);
+    HTaskPtr collision_task = tmanager->create_task(Atari);
 
     collision_task->set_param(0,(memaddr)w);
     collision_task->set_param(1,(memaddr)h);
diff -r b97628fca317 -r f27a6af6514c game_task.h
--- a/game_task.h	Thu Feb 17 04:49:47 2011 +0900
+++ b/game_task.h	Thu Feb 17 10:56:56 2011 +0900
@@ -2,49 +2,49 @@
 
      DELETE_CHARA,
 
-     ATARI,
-     COLLDATA_REFLECT,
+     Atari,
+     CollDataReflect,
 
-     STATE0,
-     STATE1,
-     STATE2,
-     STATE3,
-     STATE4,
-     STATE5,
-     STATE6,
-     STATE7,
-     STATE8,
-     STATE9,
-     STATE10,
-     STATE11,
-     STATE12,
-     STATE13,
-     STATE20,
-     STATE21,
-     STATE22,
-     STATE23,
-     STATE24,
-     STATE25,
-     STATE26,
-     STATE27,
-     STATE28,
-     STATE29,
-     STATE30,
-     STATE31,
-     STATE32,
-     STATE33,
-     STATE34,
-     STATE35,
-     STATE40,
-     STATE41,
-     STATE400,
-     STATE401,
-     STATE402,
-     STATE410,
-     STATE411,
-     STATE500,
-     STATE501,
-     STATE600,
-     STATE601,
-     STATE602,
-     ASTEROID_TASK,
+     State0,
+     State1,
+     State2,
+     State3,
+     State4,
+     State5,
+     State6,
+     State7,
+     State8,
+     State9,
+     State10,
+     State11,
+     State12,
+     State13,
+     State20,
+     State21,
+     State22,
+     State23,
+     State24,
+     State25,
+     State26,
+     State27,
+     State28,
+     State29,
+     State30,
+     State31,
+     State32,
+     State33,
+     State34,
+     State35,
+     State40,
+     State41,
+     State400,
+     State401,
+     State402,
+     State410,
+     State411,
+     State500,
+     State501,
+     State600,
+     State601,
+     State602,
+     Asteroid,
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state0.cc
--- a/ppe/chara_state0.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state0.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -11,7 +11,7 @@
     p->x += p->vx;
     p->y += p->vy;
 
-    p->state_task = STATE0;
+    p->state_task = State0;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state1.cc
--- a/ppe/chara_state1.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state1.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -11,7 +11,7 @@
     p->x -= p->vx;
     p->y -= p->vy;
 
-    p->state_task = STATE1;
+    p->state_task = State1;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state10.cc
--- a/ppe/chara_state10.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state10.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -18,7 +18,7 @@
 	p->y += p->vy;
 	p->dt1++;
 
-	p->state_task = STATE10;
+	p->state_task = State10;
 	*q = *p;
 	return 0;
     }
@@ -28,7 +28,7 @@
     p->dt1 = rinkx;
     p->dt2 = rinky;
     
-    p->state_task = STATE10;
+    p->state_task = State10;
     *q = *p;
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state11.cc
--- a/ppe/chara_state11.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state11.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -27,7 +27,7 @@
 	DefSpriteEx(54, 16, 32, &sprite->data[0]);
 	PutSpriteEx(54, p->x, p->y, p->s, p->s, 1, &sprite->data[1]);
 
-	p->state_task = STATE11;
+	p->state_task = State11;
 	*w_count = count;	
 	*q = *p;
 	return 0;
@@ -37,7 +37,7 @@
     p->dt1 = 0;
     p->dt2 = 0;
 
-    p->state_task = STATE11;
+    p->state_task = State11;
     *q = *p;
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state12.cc
--- a/ppe/chara_state12.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state12.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -38,7 +38,7 @@
 	DefSpriteEx(54, 16, 32, &sprite->data[index_count]);
 	index_count++;
 	PutSpriteEx(54, p->x, p->y, 2, 2, 1, &sprite->data[index_count]);
-	p->state_task = STATE12;
+	p->state_task = State12;
 	
 	*w_rinky = rinky;
 	*w_count = count;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state2.cc
--- a/ppe/chara_state2.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state2.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -11,7 +11,7 @@
     p->vy -= 0.25;
     p->y += p->vy;
     
-    p->state_task = STATE2;
+    p->state_task = State2;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state20.cc
--- a/ppe/chara_state20.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state20.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -13,7 +13,7 @@
     p->vy -= 0.5;
     p->vy += 0.4;
 
-    p->state_task = STATE20;
+    p->state_task = State20;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state21.cc
--- a/ppe/chara_state21.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state21.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -13,7 +13,7 @@
     p->vx += 0.5;
     p->vy += 0.4;
 
-    p->state_task = STATE21;
+    p->state_task = State21;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state22.cc
--- a/ppe/chara_state22.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state22.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -20,7 +20,7 @@
 	  p->y = rand2 % (120 - 35);
 	  p->vx = (rand3 % 4 + 1);
 	  p->vy = rand4 % 3 + 1;
-	  p->state_task = STATE23;
+	  p->state_task = State23;
       }
       if((sf == 2))
       {
@@ -28,7 +28,7 @@
 	  p->y = -30;
 	  p->vx = rand3 % 3 - 1;
 	  p->vy = (rand4 % 4 + 1);
-	  p->state_task = STATE23;
+	  p->state_task = State23;
       }
       if(sf == 3)
       {
@@ -36,7 +36,7 @@
 	  p->y = rand2 % (120 - 35);
 	  p->vx = (rand3 % 4 + 1) * -1;
 	  p->vy = rand4 % 3 -1;
-	  p->state_task = STATE23;
+	  p->state_task = State23;
       }
 
       smanager->swap();
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state25.cc
--- a/ppe/chara_state25.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state25.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -44,12 +44,12 @@
     amari = rand % 160;
     if((amari == 1) && (part5_f == TRUE))
     {
-	p->state_task = STATE26;
+	p->state_task = State26;
 	*rinkf1 = 1;
     }
     if((amari == 2) && (part1_f == TRUE))
     {
-	p->state_task = STATE27;
+	p->state_task = State27;
 	*rinkf1 = 5;
 	*rinkx = 0;
 
@@ -58,7 +58,7 @@
     }
     if((part5_f == TRUE) && (part1_f != TRUE))
     {
-	p->state_task = STATE28;
+	p->state_task = State28;
     }
     p->dt1 += 3;
     if(p->dt1 == 720)
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state26.cc
--- a/ppe/chara_state26.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state26.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -40,7 +40,7 @@
 	p->dt2 = 0;
 	*rinkf1 = 0;
 
-	p->state_task = STATE25;
+	p->state_task = State25;
 	*q = *p;
 	return 0;
     }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state27.cc
--- a/ppe/chara_state27.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state27.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -71,7 +71,7 @@
 	rinkf1 = 0;
 	rinkx = 0;
 
-	p->state_task = STATE25;
+	p->state_task = State25;
 	*q = *p;
 	*w_count = count;
 	*w_rinkx = rinkx;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state28.cc
--- a/ppe/chara_state28.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state28.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -40,7 +40,7 @@
 		 (rand % 5 + 0.5) * (rand % 2 ==
 				       1 ? -1 : 1),
 		 (rand % 5 + 0.5) * (rand % 2 ==
-				       1 ? -1 : 1), STATE29, &sprite->data[1]);
+				       1 ? -1 : 1), State29, &sprite->data[1]);
     } else {
 	length = 1;
     }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state3.cc
--- a/ppe/chara_state3.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state3.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -28,7 +28,7 @@
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 
     p->dt1++;
-    p->state_task = STATE3;
+    p->state_task = State3;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state30.cc
--- a/ppe/chara_state30.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state30.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -11,7 +11,7 @@
     p->x = p->x - 32;
     p->y = p->y;
 
-    p->state_task = STATE30;
+    p->state_task = State30;
     smanager->swap();
     return 0;
 }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state31.cc
--- a/ppe/chara_state31.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state31.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -87,7 +87,7 @@
 	sprite->flag = true;
 	sprite->length = length;
 	
-	Putenemy(22, p->x + 14, p->y + 14, 0, 0, STATE40, &sprite->data[0]);
+	Putenemy(22, p->x + 14, p->y + 14, 0, 0, State40, &sprite->data[0]);
 	*q = *p;
 	return 0;
     }
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state32.cc
--- a/ppe/chara_state32.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state32.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -56,7 +56,7 @@
 	sprite->length = length;
 	
 	Putenemy(23, p->x + 14,
-		 p->y + 14, 0, 0, STATE41, &sprite->data[0]);
+		 p->y + 14, 0, 0, State41, &sprite->data[0]);
 	
 	*q = *p;
 	return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state4.cc
--- a/ppe/chara_state4.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state4.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -15,9 +15,9 @@
     if ((p->y < jiki->y) && (p->y + 16 > jiki->y)) {
 	p->vy = -2;
 	p->vx = ((jiki->x > p->x) ? 4 : -4);
-	p->state_task = STATE7;
+	p->state_task = State7;
     } else {
-	p->state_task = STATE4;
+	p->state_task = State4;
     }
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state400.cc
--- a/ppe/chara_state400.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state400.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -10,7 +10,7 @@
 
     p->vy++;
     p->y += p->vy / 4;
-    p->state_task = STATE400;
+    p->state_task = State400;
 
     smanager->swap();
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state411.cc
--- a/ppe/chara_state411.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state411.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -33,7 +33,7 @@
 		 (int) -Mycos(p->dt1 / 16) * 4 /
 		 SANKAKU,
 		 (int) -Mysin(p->dt1 / 16) * 4 /
-		 SANKAKU, STATE7, &sprite->data[0]);
+		 SANKAKU, State7, &sprite->data[0]);
     }
     if ((p->dt1) % 13 == 0) {
 	length = 1;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state5.cc
--- a/ppe/chara_state5.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state5.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -17,9 +17,9 @@
     {
 	p->vy = -2;
 	p->vx = ((jiki->x > p->x) ? 4 : -4);
-	p->state_task = STATE0;
+	p->state_task = State0;
     }
-    else p->state_task = STATE5;
+    else p->state_task = State5;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state500.cc
--- a/ppe/chara_state500.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state500.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -39,14 +39,14 @@
 			 (rand % 5 + 0.5) * (rand % 2 ==
 					     1 ? -1 : 1),
 			 (rand % 5 + 0.5) * (rand % 2 ==
-					     1 ? -1 : 1), STATE501, &sprite->data[2]);
+					     1 ? -1 : 1), State501, &sprite->data[2]);
 	    else
 		Putenemy(rand % 2 + 1, p->x,
 			 p->y,
 			 (int) Mycos(p->dt1 / 4) * 4 /
 			 SANKAKU,
 			 (int) -Mysin(p->dt1 / 4) * 4 /
-			 SANKAKU, STATE501, &sprite->data[2]);
+			 SANKAKU, State501, &sprite->data[2]);
 	}
 	if (p->dt1 == 50) {
 	    /*Putenemy(44,0,0,1,1,411); */
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state6.cc
--- a/ppe/chara_state6.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state6.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -17,9 +17,9 @@
     {
 	p->vy = 2;
 	p->vx = ((jiki->x > p->x) ? 4 : -4);
-	p->state_task = STATE0;
+	p->state_task = State0;
     }
-    else p->state_task = STATE6;
+    else p->state_task = State6;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state600.cc
--- a/ppe/chara_state600.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state600.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -27,7 +27,7 @@
     Puttama(11, p->x + 32, p->y + 48, &sprite->data[1]);
     Puttama(11, p->x + 48, p->y + 16, &sprite->data[2]);
     if (p->dt2 > 240)
-	p->state_task = STATE601;
+	p->state_task = State601;
     if (p->x < 0)
 	p->x = 0;
     if (p->x > 260)
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state601.cc
--- a/ppe/chara_state601.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state601.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -27,7 +27,7 @@
 	p->vx--;
     p->x += p->vx;
     Putenemy(6, p->x + 16 + rand1 % 32,
-	     p->y, 0, rand2 % 4, STATE400, &sprite->data[0]);
+	     p->y, 0, rand2 % 4, State400, &sprite->data[0]);
     if (p->x < 0)
 	p->x = 0;
     if (p->x > 260)
@@ -37,7 +37,7 @@
     if (p->y > 232)
 	p->y = 232;
     if (p->dt2 > 800) {
-	p->state_task = STATE602;
+	p->state_task = State602;
     }
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state602.cc
--- a/ppe/chara_state602.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state602.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -25,9 +25,9 @@
     Putenemy(24, p->x + 14, p->y + 14,
 	     (rand1 % 5 + 0.5) * (rand2 % 2 == 1 ? -1 : 1),
 	     (rand3 % 5 + 0.5) * (rand4 % 2 == 1 ? -1 : 1),
-	     STATE29, &sprite->data[0]);
+	     State29, &sprite->data[0]);
     if (p->dt2 > 1024) {
-	p->state_task = STATE600;
+	p->state_task = State600;
 	p->dt2 = 0;
     }
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state7.cc
--- a/ppe/chara_state7.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state7.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -27,7 +27,7 @@
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
 
     p->dt1++;
-    p->state_task = STATE7;
+    p->state_task = State7;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state8.cc
--- a/ppe/chara_state8.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state8.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -30,7 +30,7 @@
 
 	p->dt1 = 512;
 	p->s = 0.125;
-	p->state_task = STATE8;
+	p->state_task = State8;
 
 	*w_count = count;
 	*q = *p;
@@ -38,7 +38,7 @@
     }
 
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
-    p->state_task = STATE9;
+    p->state_task = State9;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/chara_state9.cc
--- a/ppe/chara_state9.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/chara_state9.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -31,7 +31,7 @@
 	DefSpriteEx(54, 16*4, 32*4, &sprite->data[0]);
 	PutSpriteEx(54, (p->x * 4), (p->y * 4), p->s, p->s, 1, &sprite->data[1]);
 
-	p->state_task = STATE9;
+	p->state_task = State9;
 	*q = *p;
 	return 0;
     }
@@ -53,11 +53,11 @@
     PutSpriteEx(54, p->x, p->y, p->s, p->s, 1, &sprite->data[1]);
     *w_rinkx = p->x;
     *w_rinky = p->y;
-    Putenemy(5, *w_rinkx - 16, *w_rinky - 16, 1, 0, STATE10, &sprite->data[2]);
-    Putenemy(5, *w_rinkx - 16, *w_rinky - 16, -1, 0, STATE10, &sprite->data[3]);
+    Putenemy(5, *w_rinkx - 16, *w_rinky - 16, 1, 0, State10, &sprite->data[2]);
+    Putenemy(5, *w_rinkx - 16, *w_rinky - 16, -1, 0, State10, &sprite->data[3]);
     p->dt1 = 8192;
 
-    p->state_task = STATE11;
+    p->state_task = State11;
 
     *q = *p;
     return 0;
diff -r b97628fca317 -r f27a6af6514c ppe/task_init.cc
--- a/ppe/task_init.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/ppe/task_init.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -62,55 +62,55 @@
 void
 task_init(void)
 {
-    SchedRegisterTask(ATARI, Atari);
+    SchedRegister(Atari);
 
-    SchedRegisterTask(COLLDATA_REFLECT, CollDataReflect);
+    SchedRegister(CollDataReflect);
 
-    SchedRegisterTask(STATE0, State0);
-    SchedRegisterTask(STATE1, State1);
-    SchedRegisterTask(STATE2, State2);
-    SchedRegisterTask(STATE3, State3);
-    SchedRegisterTask(STATE4, State4);
-    SchedRegisterTask(STATE5, State5);
-    SchedRegisterTask(STATE6, State6);
-    SchedRegisterTask(STATE7, State7);
-    SchedRegisterTask(STATE8, State8);
-    SchedRegisterTask(STATE9, State9);
-    SchedRegisterTask(STATE10, State10);
-    SchedRegisterTask(STATE11, State11);
-    SchedRegisterTask(STATE12, State12);
-    SchedRegisterTask(STATE13, State13);
+    SchedRegister(State0);
+    SchedRegister(State1);
+    SchedRegister(State2);
+    SchedRegister(State3);
+    SchedRegister(State4);
+    SchedRegister(State5);
+    SchedRegister(State6);
+    SchedRegister(State7);
+    SchedRegister(State8);
+    SchedRegister(State9);
+    SchedRegister(State10);
+    SchedRegister(State11);
+    SchedRegister(State12);
+    SchedRegister(State13);
 
-    SchedRegisterTask(STATE20, State20);
-    SchedRegisterTask(STATE21, State21);
-    SchedRegisterTask(STATE22, State22);
-    SchedRegisterTask(STATE25, State25);
-    SchedRegisterTask(STATE26, State26);
-    SchedRegisterTask(STATE27, State27);
-    SchedRegisterTask(STATE28, State28);
-    SchedRegisterTask(STATE29, State29);
-    SchedRegisterTask(STATE30, State30);
-    SchedRegisterTask(STATE31, State31);
-    SchedRegisterTask(STATE32, State32);
-    SchedRegisterTask(STATE33, State33);
-    SchedRegisterTask(STATE34, State34);
-    SchedRegisterTask(STATE35, State35);
+    SchedRegister(State20);
+    SchedRegister(State21);
+    SchedRegister(State22);
+    SchedRegister(State25);
+    SchedRegister(State26);
+    SchedRegister(State27);
+    SchedRegister(State28);
+    SchedRegister(State29);
+    SchedRegister(State30);
+    SchedRegister(State31);
+    SchedRegister(State32);
+    SchedRegister(State33);
+    SchedRegister(State34);
+    SchedRegister(State35);
 
-    SchedRegisterTask(STATE40, State40);
-    SchedRegisterTask(STATE41, State41);
+    SchedRegister(State40);
+    SchedRegister(State41);
 
-    SchedRegisterTask(STATE400, State400);
-    SchedRegisterTask(STATE401, State401);
-    SchedRegisterTask(STATE402, State402);
+    SchedRegister(State400);
+    SchedRegister(State401);
+    SchedRegister(State402);
 
-    SchedRegisterTask(STATE411, State411);
+    SchedRegister(State411);
 
-    SchedRegisterTask(STATE500, State500);
-    SchedRegisterTask(STATE501, State501);
+    SchedRegister(State500);
+    SchedRegister(State501);
 
-    SchedRegisterTask(STATE600, State600);
-    SchedRegisterTask(STATE601, State601);
-    SchedRegisterTask(STATE602, State602);
+    SchedRegister(State600);
+    SchedRegister(State601);
+    SchedRegister(State602);
 
-    SchedRegisterTask(ASTEROID_TASK, Asteroid);
+    SchedRegister(Asteroid);
 }
diff -r b97628fca317 -r f27a6af6514c state_task.cc
--- a/state_task.cc	Thu Feb 17 04:49:47 2011 +0900
+++ b/state_task.cc	Thu Feb 17 10:56:56 2011 +0900
@@ -320,7 +320,7 @@
 {
     asteroiddt[asteroidi] = p;
 
-    int task_num = ASTEROID_TASK;
+    int task_num = Asteroid;
     HTaskPtr state_task = tmanager->create_task(task_num);
     
     state_task->set_param(0, (memaddr)asteroidi);
@@ -880,7 +880,7 @@
 CHARACTER*
 chara_state0(CHARACTER *p)
 {
-    p->state_task = STATE0;
+    p->state_task = State0;
     return SimpleStateTask(p);
 }
 
@@ -888,7 +888,7 @@
 CHARACTER*
 chara_state1(CHARACTER *p)
 {
-    p->state_task = STATE1;
+    p->state_task = State1;
     return SimpleStateTask(p);
 }
 
@@ -896,7 +896,7 @@
 CHARACTER*
 chara_state2(CHARACTER *p)
 {
-    p->state_task = STATE2;
+    p->state_task = State2;
     return SimpleStateTask(p);
 }
 
@@ -904,7 +904,7 @@
 CHARACTER*
 chara_state3(CHARACTER *p)
 {
-    p->state_task = STATE3;
+    p->state_task = State3;
     return sendContainerTask(p);
 }
 
@@ -912,7 +912,7 @@
 CHARACTER*
 chara_state4(CHARACTER *p)
 {
-    p->state_task = STATE4;
+    p->state_task = State4;
     return withJikiTask(p);
 }
 
@@ -920,7 +920,7 @@
 CHARACTER*
 chara_state5(CHARACTER *p)
 {
-    p->state_task = STATE5;
+    p->state_task = State5;
     return withJikiTask(p);
 }
 
@@ -928,7 +928,7 @@
 CHARACTER*
 chara_state6(CHARACTER *p)
 {
-    p->state_task = STATE6;
+    p->state_task = State6;
     return withJikiTask(p);
 }
 
@@ -936,7 +936,7 @@
 CHARACTER*
 chara_state7(CHARACTER *p)
 {
-    p->state_task = STATE7;
+    p->state_task = State7;
     return sendContainerTask(p);
 }
 
@@ -948,7 +948,7 @@
     tekino0 = p;
     kyeenemyno = p;
 
-    p->state_task = STATE8;
+    p->state_task = State8;
     return Boss1Task1(p);
 }
 
@@ -956,7 +956,7 @@
 CHARACTER*
 chara_state9(CHARACTER *p)
 {
-    p->state_task = STATE9;    
+    p->state_task = State9;    
     return Boss1Task2(p);
 }
 
@@ -964,7 +964,7 @@
 CHARACTER*
 chara_state10(CHARACTER *p)
 {
-    p->state_task =STATE10;
+    p->state_task =State10;
     return Boss1Task3(p);
 }
 
@@ -972,7 +972,7 @@
 CHARACTER*
 chara_state11(CHARACTER *p)
 {
-    p->state_task = STATE11;
+    p->state_task = State11;
     return Boss1Task4(p);
 }
 
@@ -980,7 +980,7 @@
 CHARACTER*
 chara_state12(CHARACTER *p)
 {
-    p->state_task = STATE12;
+    p->state_task = State12;
     return Boss1Task5(p);
 }
 
@@ -988,7 +988,7 @@
 CHARACTER*
 chara_state13(CHARACTER *p)
 {
-    p->state_task = STATE13;
+    p->state_task = State13;
     return Boss1Task6(p);
 }
 
@@ -996,7 +996,7 @@
 CHARACTER*
 chara_state20(CHARACTER *p)
 {
-    p->state_task = STATE20;
+    p->state_task = State20;
     return SimpleStateTask(p);
 }
 
@@ -1004,7 +1004,7 @@
 CHARACTER*
 chara_state21(CHARACTER *p)
 {
-    p->state_task = STATE21;
+    p->state_task = State21;
     return SimpleStateTask(p);
 }
 //ここまでgetate boss
@@ -1013,7 +1013,7 @@
 CHARACTER*
 chara_state22(CHARACTER *p)
 {
-    p->state_task = STATE22;
+    p->state_task = State22;
     return sendRandomTask(p);
 }
 
@@ -1021,7 +1021,7 @@
 CHARACTER*
 chara_state23(CHARACTER *p)
 {
-    p->state_task = STATE23;
+    p->state_task = State23;
     return AsteroidTask(p);
 }
 
@@ -1040,7 +1040,7 @@
     rinky = 0;
     rinkf1 = 0;
     rinkf2 = 0;
-    p->state_task = STATE25;
+    p->state_task = State25;
 
     state_check(p);
     return p;
@@ -1049,27 +1049,27 @@
 CHARACTER*
 chara_state25(CHARACTER *p)
 {
-    p->state_task = STATE25;
+    p->state_task = State25;
     return Boss2Task1(p);
 }
 
 CHARACTER*
 chara_state26(CHARACTER *p)
 {
-    p->state_task = STATE26;
+    p->state_task = State26;
     return Boss2Task2(p);
 }
 
 CHARACTER*
 chara_state27(CHARACTER *p) //rocket punch
 {
-    p->state_task = STATE27;
+    p->state_task = State27;
     return Boss2Task2(p);
 }
 CHARACTER*
 chara_state28(CHARACTER *p)
 {
-    p->state_task = STATE28;
+    p->state_task = State28;
 //if many rand
     return Boss2Task3(p);
 }
@@ -1078,7 +1078,7 @@
 CHARACTER*
 chara_state29(CHARACTER *p)
 {
-    p->state_task = STATE29;
+    p->state_task = State29;
     return sendContainerTask(p);
 }
 
@@ -1086,7 +1086,7 @@
 CHARACTER*
 chara_state30(CHARACTER *p)
 {
-    p->state_task = STATE30;
+    p->state_task = State30;
     return SimpleStateTask(p);
 }
 
@@ -1094,7 +1094,7 @@
 CHARACTER*
 chara_state31(CHARACTER *p) //right hand
 {
-    p->state_task = STATE31;
+    p->state_task = State31;
     return Boss2Task4(p, 0, 0);
 }
 
@@ -1102,7 +1102,7 @@
 CHARACTER*
 chara_state32(CHARACTER *p) //left hand
 {
-    p->state_task = STATE32;
+    p->state_task = State32;
     return Boss2Task4(p, 14, 20);
 }
 
@@ -1111,7 +1111,7 @@
 CHARACTER*
 chara_state33(CHARACTER *p) // right shoulder
 {
-    p->state_task = STATE33;
+    p->state_task = State33;
     return Boss2Task4(p, 11, 19);
 }
 
@@ -1119,7 +1119,7 @@
 CHARACTER*
 chara_state34(CHARACTER *p) //left shoulder
 {
-    p->state_task = STATE34;
+    p->state_task = State34;
     return Boss2Task4(p, 12, 21);
 }
 
@@ -1127,7 +1127,7 @@
 CHARACTER*
 chara_state35(CHARACTER *p) // bust
 {
-    p->state_task = STATE35;
+    p->state_task = State35;
     return Boss2Task4(p, 15, 16);
 }
 
@@ -1136,7 +1136,7 @@
 CHARACTER*
 chara_state40(CHARACTER *p) //arm vulkan
 {
-    p->state_task = STATE40;
+    p->state_task = State40;
     return Boss2Task4(p, 0, 0);
 }
 
@@ -1144,7 +1144,7 @@
 CHARACTER*
 chara_state41(CHARACTER *p) //left arm up arm vulkan
 {
-    p->state_task = STATE41;
+    p->state_task = State41;
 //if rand
     return Boss2Task5(p, 0, 0);
 }
@@ -1153,7 +1153,7 @@
 CHARACTER*
 chara_state400(CHARACTER *p)
 {
-    p->state_task = STATE400;
+    p->state_task = State400;
     return SimpleStateTask(p);
 }
 
@@ -1161,7 +1161,7 @@
 CHARACTER*
 chara_state401(CHARACTER *p)
 {
-    p->state_task = STATE401;
+    p->state_task = State401;
     return JikiContainerTask(p);
 }
 
@@ -1169,7 +1169,7 @@
 CHARACTER*
 chara_state402(CHARACTER *p)
 {
-    p->state_task = STATE402;
+    p->state_task = State402;
     return JikiContainerTask(p);
 }
 
@@ -1178,7 +1178,7 @@
 chara_state410(CHARACTER *p)
 {
     kyeenemyno = p;
-    p->state_task = STATE411;
+    p->state_task = State411;
     
     state_check(p);
     return p;
@@ -1188,7 +1188,7 @@
 CHARACTER*
 chara_state411(CHARACTER *p)
 {
-    p->state_task = STATE411;
+    p->state_task = State411;
     return JikiContainerTask(p);
 }
 
@@ -1196,7 +1196,7 @@
 CHARACTER*
 chara_state500(CHARACTER *p)
 {
-    p->state_task = STATE500;
+    p->state_task = State500;
     return Boss4Task(p);
 }
 
@@ -1204,7 +1204,7 @@
 CHARACTER*
 chara_state501(CHARACTER *p)
 {
-    p->state_task = STATE501;
+    p->state_task = State501;
     return sendContainerTask(p);
 }
 
@@ -1213,7 +1213,7 @@
 chara_state600(CHARACTER *p)
 {
   kyeenemyno = p;
-  p->state_task = STATE600;
+  p->state_task = State600;
   return sendContainerTask(p);
 }
 
@@ -1221,7 +1221,7 @@
 CHARACTER*
 chara_state601(CHARACTER *p)
 {
-    p->state_task = STATE601;
+    p->state_task = State601;
     return Boss5Task1(p);
 }
 
@@ -1229,6 +1229,6 @@
 CHARACTER*
 chara_state602(CHARACTER *p)
 {
-    p->state_task = STATE602;
+    p->state_task = State602;
     return Boss5Task2(p);
 }