diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 21:38:41 -0500 |
| commit | 38065a744de1065cc021a4cafe22476f8425448d (patch) | |
| tree | a37a103d7c22f3cc5f62689e5062877961493caa /engine/menu/naming_screen.asm | |
| parent | 1ee9fb408c47c3a15a38b1bb407d86ed1a5d2fcc (diff) | |
No more W_
Diffstat (limited to 'engine/menu/naming_screen.asm')
| -rwxr-xr-x | engine/menu/naming_screen.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 703d570a..41f63095 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -2,7 +2,7 @@ AskName: ; 64eb (1:64eb) call SaveScreenTilesToBuffer1 call GetPredefRegisters push hl - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] dec a coord hl, 0, 0 ld b, 4 @@ -30,7 +30,7 @@ AskName: ; 64eb (1:64eb) ld a, NAME_MON_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jr nz, .inBattle call ReloadMapSpriteTilePatterns @@ -169,7 +169,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld [wAnimCounter], a ld hl, wd730 res 6, [hl] - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] and a jp z, LoadTextBoxTilePatterns jpab LoadHudTilePatterns |