diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
commit | 50350cc2e1c26082f9d852e97e1698f7254d4145 (patch) | |
tree | 3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/apprentice.c | |
parent | 1360b3a477f1107785900cd0c4e73ebf018f058c (diff) | |
parent | a4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff) |
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'src/apprentice.c')
-rw-r--r-- | src/apprentice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/apprentice.c b/src/apprentice.c index 27ff8e36e..ac2bba48f 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -2,7 +2,7 @@ #include "apprentice.h" #include "battle.h" #include "battle_tower.h" -#include "data2.h" +#include "data.h" #include "event_data.h" #include "event_object_movement.h" #include "field_player_avatar.h" |