diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/battle_transition.c | |
parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r-- | src/battle_transition.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 7edb1bd93..3e86fcf51 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -262,10 +262,10 @@ static bool8 sub_814842C(struct Sprite *sprite); static bool8 sub_8148458(struct Sprite *sprite); // iwram bss vars -IWRAM_DATA static s16 sUnusedRectangularSpiralVar; -IWRAM_DATA static u8 sTestingTransitionId; -IWRAM_DATA static u8 sTestingTransitionState; -IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4]; +static s16 sUnusedRectangularSpiralVar; +static u8 sTestingTransitionId; +static u8 sTestingTransitionState; +static struct StructRectangularSpiral sRectangularSpiralTransition[4]; // ewram vars EWRAM_DATA static struct TransitionData *sTransitionStructPtr = NULL; |