diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-05 20:13:34 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-05 20:13:34 +0200 |
| commit | b6661e7736138bb61c4d58e61add686cec9e7739 (patch) | |
| tree | 100511f746b70eb74756abcf09f79cddf5635936 /src/main.c | |
| parent | a7486afb4e28cc0bbd9856990c4af2c7b7140f2a (diff) | |
name some pokemon and battle labels
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 7da51c65a..15f1ec3eb 100644 --- a/src/main.c +++ b/src/main.c @@ -5,6 +5,7 @@ #include "rng.h" #include "dma3.h" #include "gba/flash_internal.h" +#include "battle.h" extern u16 GetGpuReg(u8); extern void SetGpuReg(u8, u16); @@ -359,7 +360,7 @@ static void VBlankIntr(void) m4aSoundMain(); sub_8033648(); - if (!gMain.inBattle || (gBattleTypeFlags & 0x013F0102) == 0) + if (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))) Random(); sub_800E174(); |