diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
| commit | 52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch) | |
| tree | ac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /src/battle_factory.c | |
| parent | dc273cc19d842e8831548a1342af857aae2886c9 (diff) | |
| parent | 2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff) | |
Merge branch 'master' into battle_tower
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 2c8ab1052..7ebcfe8b3 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -137,7 +137,7 @@ extern const u16 gBattleFrontierHeldItems[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct FacilityMon gSlateportBattleTentMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const u8 gUnknown_085B18AC[]; +extern const u32 gUnknown_085B18AC[]; extern void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 move, u8 moveSlot); extern u8 sub_81A6F70(u8 battleMode, u8 lvlMode); |