diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
| commit | 9457679af8d36a140db7b8832df595e8310e6bb4 (patch) | |
| tree | d3bf8b1b424582f66add4f2b8d95f409cfafecb2 /engine/battle | |
| parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) | |
Prefix engine_flags wram addresses with w
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/battle/misc.asm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a62b70d72..d9f660a41 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6695,7 +6695,7 @@ CheckSleepingTreeMon: ; 3eb38 CheckUnownLetter: ; 3eb75 ; Return carry if the Unown letter hasn't been unlocked yet - ld a, [UnlockedUnowns] + ld a, [wUnlockedUnowns] ld c, a ld de, 0 @@ -7074,7 +7074,7 @@ BadgeStatBoosts: ; 3ed45 and a ret nz - ld a, [JohtoBadges] + ld a, [wJohtoBadges] ; Swap badges 3 (PlainBadge) and 5 (MineralBadge). ld d, a @@ -9349,7 +9349,7 @@ GetTrainerBackpic: ; 3fbff ld a, [wPlayerSpriteSetupFlags] bit 2, a ; transformed to male jr nz, .Chris - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr z, .Chris diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 5922afea3..f86f90479 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -726,7 +726,7 @@ BattleCommand_CheckObedience: ; 343db .obeylevel ; The maximum obedience level is constrained by owned badges: - ld hl, JohtoBadges + ld hl, wJohtoBadges ; risingbadge bit RISINGBADGE, [hl] diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index b05dc8071..c78e9fd84 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -176,9 +176,9 @@ DoBadgeTypeBoosts: ; fbe24 ld hl, .BadgeTypes - ld a, [KantoBadges] + ld a, [wKantoBadges] ld b, a - ld a, [JohtoBadges] + ld a, [wJohtoBadges] ld c, a .CheckBadge: |