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/effect_commands/attract.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/battle/effect_commands/attract.asm')
| -rwxr-xr-x | engine/battle/effect_commands/attract.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/battle/effect_commands/attract.asm b/engine/battle/effect_commands/attract.asm index 0a6d7c975..da6a9c0e9 100755 --- a/engine/battle/effect_commands/attract.asm +++ b/engine/battle/effect_commands/attract.asm @@ -1,6 +1,6 @@ BattleCommand_Attract: ; 377ce ; attract - ld a, [AttackMissed] + ld a, [wAttackMissed] and a jr nz, .failed call CheckOppositeGender @@ -28,12 +28,12 @@ CheckOppositeGender: ; 377f5 ld a, MON_SPECIES call BattlePartyAttr ld a, [hl] - ld [CurPartySpecies], a + ld [wCurPartySpecies], a - ld a, [CurBattleMon] - ld [CurPartyMon], a + ld a, [wCurBattleMon] + ld [wCurPartyMon], a xor a - ld [MonType], a + ld [wMonType], a farcall GetGender jr c, .genderless_samegender @@ -44,20 +44,20 @@ CheckOppositeGender: ; 377f5 .got_gender push bc - ld a, [TempEnemyMonSpecies] - ld [CurPartySpecies], a - ld hl, EnemyMonDVs - ld a, [EnemySubStatus5] + ld a, [wTempEnemyMonSpecies] + ld [wCurPartySpecies], a + ld hl, wEnemyMonDVs + ld a, [wEnemySubStatus5] bit SUBSTATUS_TRANSFORMED, a jr z, .not_transformed ld hl, wEnemyBackupDVs .not_transformed ld a, [hli] - ld [TempMonDVs], a + ld [wTempMonDVs], a ld a, [hl] - ld [TempMonDVs + 1], a + ld [wTempMonDVs + 1], a ld a, 3 - ld [MonType], a + ld [wMonType], a farcall GetGender pop bc jr c, .genderless_samegender |