diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 15:28:57 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 15:28:57 +0200 |
| commit | c556358e47f7af50ba9b04fc1d7b359512c25b03 (patch) | |
| tree | 4d36126957f9ce8d2d278a3adb91a26a2ed64b66 /src/battle_main.c | |
| parent | f35c0abe80ce9ec91618b2237d68463100fa4afa (diff) | |
label multiuse sprite template functions
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 9bec15750..591c299d7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -300,6 +300,7 @@ u8 gNumberOfMovesToChoose; u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // rom const data +static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; // format: attacking type, defending type, damage multiplier // the multiplier is a (decimal) fixed-point number: @@ -307,9 +308,6 @@ u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // 10 is ×1.0 TYPE_MUL_NORMAL // 05 is ×0.5 TYPE_MUL_NOT_EFFECTIVE // 00 is ×0.0 TYPE_MUL_NO_EFFECT - -static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; - const u8 gTypeEffectiveness[336] = { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE, @@ -2808,7 +2806,7 @@ void sub_8039BB4(struct Sprite *sprite) static void oac_poke_ally_(struct Sprite *sprite) { - if ((gIntroSlideFlags & 1) == 0) + if (!(gIntroSlideFlags & 1)) { sprite->pos2.x -= 2; if (sprite->pos2.x == 0) |