diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 15:39:21 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 16:03:06 -0500 |
commit | f2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch) | |
tree | d23050509231d1d9c6d1694b2755c93fdaf26a4e /src/scrcmd.c | |
parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) |
Merge master into sync-script
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index fad30a6a8..4eaea9cef 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -27,14 +27,13 @@ #include "data.h" #include "field_specials.h" #include "constants/items.h" -#include "script_pokemon_util_80A0058.h" +#include "script_pokemon_util.h" #include "pokemon_storage_system.h" #include "party_menu.h" #include "money.h" #include "coins.h" #include "battle_setup.h" #include "shop.h" -#include "script_pokemon_80F8.h" #include "slot_machine.h" #include "field_effect.h" #include "fieldmap.h" |