diff options
| author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
| commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
| tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/battle_factory.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
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); |