diff options
author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
tree | bce0030d8901a6b84e705baca169989fff1a4f71 /src/berry_blender.c | |
parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) |
Merge branch 'master' into navdata
Diffstat (limited to 'src/berry_blender.c')
-rw-r--r-- | src/berry_blender.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index d6a7879f4..03764b2f8 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -194,10 +194,10 @@ EWRAM_DATA static s32 sUnknown_020322BC[5] = {0}; EWRAM_DATA static u32 sUnknown_020322D0 = 0; // IWRAM bss -IWRAM_DATA static s16 sUnknown_03000DE8[8]; -IWRAM_DATA static s16 sUnknown_03000DF8[6]; -IWRAM_DATA static s16 sUnknown_03000E04; -IWRAM_DATA static s16 sUnknown_03000E06; +static s16 sUnknown_03000DE8[8]; +static s16 sUnknown_03000DF8[6]; +static s16 sUnknown_03000E04; +static s16 sUnknown_03000E06; // IWRAM common u8 gInGameOpponentsNo; |