diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/battle/ai/redundant.asm | |
parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/battle/ai/redundant.asm')
-rwxr-xr-x | engine/battle/ai/redundant.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm index 68d7b0203..d09b4da73 100755 --- a/engine/battle/ai/redundant.asm +++ b/engine/battle/ai/redundant.asm @@ -47,90 +47,90 @@ AI_Redundant: ; 2c41a db -1 .LightScreen: ; 2c487 - ld a, [EnemyScreens] + ld a, [wEnemyScreens] bit SCREENS_LIGHT_SCREEN, a ret .Mist: ; 2c48d - ld a, [EnemySubStatus4] + ld a, [wEnemySubStatus4] bit SUBSTATUS_MIST, a ret .FocusEnergy: ; 2c493 - ld a, [EnemySubStatus4] + ld a, [wEnemySubStatus4] bit SUBSTATUS_FOCUS_ENERGY, a ret .Confuse: ; 2c499 - ld a, [PlayerSubStatus3] + ld a, [wPlayerSubStatus3] bit SUBSTATUS_CONFUSED, a ret nz - ld a, [PlayerScreens] + ld a, [wPlayerScreens] bit SCREENS_SAFEGUARD, a ret .Transform: ; 2c4a5 - ld a, [EnemySubStatus5] + ld a, [wEnemySubStatus5] bit SUBSTATUS_TRANSFORMED, a ret .Reflect: ; 2c4ab - ld a, [EnemyScreens] + ld a, [wEnemyScreens] bit SCREENS_REFLECT, a ret .Substitute: ; 2c4b1 - ld a, [EnemySubStatus4] + ld a, [wEnemySubStatus4] bit SUBSTATUS_SUBSTITUTE, a ret .LeechSeed: ; 2c4b7 - ld a, [PlayerSubStatus4] + ld a, [wPlayerSubStatus4] bit SUBSTATUS_LEECH_SEED, a ret .Disable: ; 2c4bd - ld a, [PlayerDisableCount] + ld a, [wPlayerDisableCount] and a ret .Encore: ; 2c4c2 - ld a, [PlayerSubStatus5] + ld a, [wPlayerSubStatus5] bit SUBSTATUS_ENCORED, a ret .Snore: .SleepTalk: ; 2c4c8 - ld a, [EnemyMonStatus] + ld a, [wEnemyMonStatus] and SLP jr z, .Redundant jr .NotRedundant .MeanLook: ; 2c4d1 - ld a, [EnemySubStatus5] + ld a, [wEnemySubStatus5] bit SUBSTATUS_CANT_RUN, a ret .Nightmare: ; 2c4d7 - ld a, [BattleMonStatus] + ld a, [wBattleMonStatus] and a jr z, .Redundant - ld a, [PlayerSubStatus1] + ld a, [wPlayerSubStatus1] bit SUBSTATUS_NIGHTMARE, a ret .Spikes: ; 2c4e3 - ld a, [PlayerScreens] + ld a, [wPlayerScreens] bit SCREENS_SPIKES, a ret .Foresight: ; 2c4e9 - ld a, [PlayerSubStatus1] + ld a, [wPlayerSubStatus1] bit SUBSTATUS_IDENTIFIED, a ret .PerishSong: ; 2c4ef - ld a, [PlayerSubStatus1] + ld a, [wPlayerSubStatus1] bit SUBSTATUS_PERISH, a ret @@ -143,12 +143,12 @@ AI_Redundant: ; 2c41a .Attract: ; 2c4fe farcall CheckOppositeGender jr c, .Redundant - ld a, [PlayerSubStatus1] + ld a, [wPlayerSubStatus1] bit SUBSTATUS_IN_LOVE, a ret .Safeguard: ; 2c50c - ld a, [EnemyScreens] + ld a, [wEnemyScreens] bit SCREENS_SAFEGUARD, a ret @@ -165,18 +165,18 @@ AI_Redundant: ; 2c41a jr .NotRedundant .DreamEater: ; 2c524 - ld a, [BattleMonStatus] + ld a, [wBattleMonStatus] and SLP jr z, .Redundant jr .NotRedundant .Swagger: ; 2c52d - ld a, [PlayerSubStatus3] + ld a, [wPlayerSubStatus3] bit SUBSTATUS_CONFUSED, a ret .FutureSight: ; 2c533 - ld a, [EnemyScreens] + ld a, [wEnemyScreens] bit 5, a ret |