diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
| commit | 711a345fd43da3edf0d1eed99e9df646c436ba16 (patch) | |
| tree | e8fa8e32ed217ccd7f8d46e333bedfdd9977a3d7 /src/evolution_scene.c | |
| parent | 70ec55386ce640b6844f7c0bf93a7a447888cb66 (diff) | |
| parent | ae214eca8b9086db64af3741aecaf05acf007b96 (diff) | |
fix conflicts
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 1b929c9bd..74eac32de 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -49,7 +49,6 @@ extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; extern bool8 gAffineAnimsDisabled; -extern u16 gMoveToLearn; extern const u8 gSpeciesNames[][11]; #define sEvoCursorPos gBattleCommunication[1] // when learning a new move @@ -59,11 +58,6 @@ extern const struct WindowTemplate gUnknown_0833900C; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; // strings -extern const u8 gText_PkmnIsEvolving[]; -extern const u8 gText_CongratsPkmnEvolved[]; -extern const u8 gText_BattleYesNoChoice[]; -extern const u8 gText_PkmnStoppedEvolving[]; -extern const u8 gText_EllipsisQuestionMark[]; extern const u8 gText_CommunicationStandby5[]; extern void sub_80356D0(void); |