diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 16:45:34 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 16:45:34 -0500 |
| commit | f2ae74079fc917cbf7e1f640eb8beda0d4740887 (patch) | |
| tree | d1982b2f1c0c23e1b274ed84db330351d4f4806b /engine/battle/ai | |
| parent | c60f1331fef22b886adf3472d2b4f348832cfaf7 (diff) | |
Prefix wram labels with w, part 1.
Handle edge cases first.
Diffstat (limited to 'engine/battle/ai')
| -rwxr-xr-x | engine/battle/ai/redundant.asm | 6 | ||||
| -rw-r--r-- | engine/battle/ai/scoring.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm index 2e8f7c6df..68d7b0203 100755 --- a/engine/battle/ai/redundant.asm +++ b/engine/battle/ai/redundant.asm @@ -135,7 +135,7 @@ AI_Redundant: ; 2c41a ret .Sandstorm: ; 2c4f5 - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_SANDSTORM jr z, .Redundant jr .NotRedundant @@ -153,13 +153,13 @@ AI_Redundant: ; 2c41a ret .RainDance: ; 2c512 - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_RAIN jr z, .Redundant jr .NotRedundant .SunnyDay: ; 2c51b - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_SUN jr z, .Redundant jr .NotRedundant diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index 73284435a..2ea87cc82 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -2842,7 +2842,7 @@ AI_Smart_Solarbeam: ; 3920b ; 80% chance to encourage this move when it's sunny. ; 90% chance to discourage this move when it's raining. - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_SUN jr z, .asm_3921e @@ -2870,7 +2870,7 @@ AI_Smart_Solarbeam: ; 3920b AI_Smart_Thunder: ; 39225 ; 90% chance to discourage this move when it's sunny. - ld a, [Weather] + ld a, [wBattleWeather] cp WEATHER_SUN ret nz |