diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/battle/effect_commands/sandstorm.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/battle/effect_commands/sandstorm.asm')
| -rw-r--r-- | engine/battle/effect_commands/sandstorm.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/effect_commands/sandstorm.asm b/engine/battle/effect_commands/sandstorm.asm index 27b8e8e2c..5aaa61deb 100644 --- a/engine/battle/effect_commands/sandstorm.asm +++ b/engine/battle/effect_commands/sandstorm.asm @@ -1,14 +1,14 @@ BattleCommand_StartSandstorm: ; 376f8 ; startsandstorm - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_SANDSTORM jr z, .failed ld a, WEATHER_SANDSTORM - ld [Weather], a + ld [wBattleWeather], a ld a, 5 - ld [WeatherCount], a + ld [wWeatherCount], a call AnimateCurrentMove ld hl, SandstormBrewedText jp StdBattleTextBox |