diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-30 19:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 19:39:07 -0400 |
| commit | 1a34a06758175b4d39ee0a81c3441ac958d005fd (patch) | |
| tree | 6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /src/pokemon.c | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
| parent | d4ace1162fd85d0531da5bf2296102bf1f503073 (diff) | |
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index b948e4033..6f1df249f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1621,7 +1621,7 @@ const u16 gLinkPlayerFacilityClasses[] = FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER, }; -const static struct OamData sOakSpeechNidoranFDummyOamData = +static const struct OamData sOakSpeechNidoranFDummyOamData = { .y = 0, .affineMode = 0, @@ -1637,7 +1637,7 @@ const static struct OamData sOakSpeechNidoranFDummyOamData = .paletteNum = 0, }; -const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = +static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, |