diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-02 01:26:00 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-02 01:26:00 -0800 |
| commit | e1120f3a62097abb80bfa2f910d98ef53f1e5671 (patch) | |
| tree | 7794cd054e9eb88928951cc1ebd31c6bba63fc5d /src/pokemon_2.c | |
| parent | 145e90483b2a30698f917f62e585aa7fa4794588 (diff) | |
gBattleTypeFlags
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 28d1cd2bb..8b55baaba 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -17,7 +17,7 @@ extern struct Pokemon gEnemyParty[6]; extern u16 unk_20160BC[]; extern struct SecretBaseRecord gSecretBaseRecord; extern u32 dword_2017100[]; -extern u16 gUnknown_020239F8; +extern u16 gBattleTypeFlags; extern u8 gUnknown_02024A60; extern struct BattlePokemon gBattleMons[4]; extern u16 gUnknown_02024BE6; @@ -98,7 +98,7 @@ u8 sub_803C434(u8 a1) status = status_ ^ mask1; { - register u16 val_ asm("r1") = gUnknown_020239F8; + register u16 val_ asm("r1") = gBattleTypeFlags; u32 val = mask2; val &= val_; if (!val) @@ -154,7 +154,7 @@ u8 sub_803C434(u8 a1) { adds r0, r4, 0\n\ b _0803C4AA\n\ .align 2, 0\n\ -_0803C45C: .4byte gUnknown_020239F8\n\ +_0803C45C: .4byte gBattleTypeFlags\n\ _0803C460:\n\ movs r0, 0\n\ bl sub_803C348\n\ @@ -1187,7 +1187,7 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord) } } - gUnknown_020239F8 = 8; + gBattleTypeFlags = 8; gTrainerBattleOpponent = 1024; } |