diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
| commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
| tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /include/battle_transition.h | |
| parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
| parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'include/battle_transition.h')
| -rw-r--r-- | include/battle_transition.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h index 0d6ef3c83..db06a5638 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -13,7 +13,7 @@ extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; enum // TRANSITION_MUGSHOT { - MUGSHOT_SYDNEY, + MUGSHOT_SIDNEY, MUGSHOT_PHOEBE, MUGSHOT_GLACIA, MUGSHOT_DRAKE, @@ -36,7 +36,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_WHITEFADE 9 #define B_TRANSITION_GRID_SQUARES 10 #define B_TRANSITION_SHARDS 11 -#define B_TRANSITION_SYDNEY 12 +#define B_TRANSITION_SIDNEY 12 #define B_TRANSITION_PHOEBE 13 #define B_TRANSITION_GLACIA 14 #define B_TRANSITION_DRAKE 15 |