|
|
@ -136,7 +136,7 @@ namespace reasoncode{ |
|
|
|
#define ALPHA_SCREEN1 128 |
|
|
|
#define ALPHA_SCREEN1 128 |
|
|
|
#define ALPHA_SCREEN2 20 |
|
|
|
#define ALPHA_SCREEN2 20 |
|
|
|
#define FADE_SPD 6 |
|
|
|
#define FADE_SPD 6 |
|
|
|
#define MESSAGE_SCROLL_WAIT_SPD 2 //Number of frames to wait.
|
|
|
|
#define MESSAGE_SCROLL_WAIT_SPD 1 //Number of frames to wait.
|
|
|
|
#define BATTLE_CAMERA_SCROLL_SPD 0.05 //How fast to scroll over to the battle.
|
|
|
|
#define BATTLE_CAMERA_SCROLL_SPD 0.05 //How fast to scroll over to the battle.
|
|
|
|
|
|
|
|
|
|
|
|
class DisplayNumber{ |
|
|
|
class DisplayNumber{ |
|
|
@ -821,8 +821,8 @@ public: |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
messageBoxVisible=false; |
|
|
|
messageBoxVisible=false; |
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
if (!GetKey(W).bPressed&&!GetKey(A).bPressed&&!GetKey(S).bPressed&&!GetKey(D).bPressed&& |
|
|
|
if (!GetKey(W).bPressed&&!GetKey(A).bPressed&&!GetKey(S).bPressed&&!GetKey(D).bPressed&& |
|
|
|
!GetKey(UP).bPressed&&!GetKey(RIGHT).bPressed&&!GetKey(DOWN).bPressed&&!GetKey(LEFT).bPressed) { |
|
|
|
!GetKey(UP).bPressed&&!GetKey(RIGHT).bPressed&&!GetKey(DOWN).bPressed&&!GetKey(LEFT).bPressed) { |
|
|
@ -1624,7 +1624,7 @@ public: |
|
|
|
}break; |
|
|
|
}break; |
|
|
|
case battle::WAIT_TURN_ANIMATION2:{ |
|
|
|
case battle::WAIT_TURN_ANIMATION2:{ |
|
|
|
EFFECT_TIMER++; |
|
|
|
EFFECT_TIMER++; |
|
|
|
|
|
|
|
PIXEL_EFFECT_TRANSPARENCY=0.5*cos(M_PI/60*EFFECT_TIMER-M_PI)+0.5; |
|
|
|
if (EFFECT_TIMER==10) { |
|
|
|
if (EFFECT_TIMER==10) { |
|
|
|
switch (BATTLE_REASON_CODE) { |
|
|
|
switch (BATTLE_REASON_CODE) { |
|
|
|
case reasoncode::SEED_GROWTH:{ |
|
|
|
case reasoncode::SEED_GROWTH:{ |
|
|
|