diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/pokemon/mon_submenu.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/pokemon/mon_submenu.asm')
| -rw-r--r-- | engine/pokemon/mon_submenu.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pokemon/mon_submenu.asm b/engine/pokemon/mon_submenu.asm index 926c35f5d..39c2c86bc 100644 --- a/engine/pokemon/mon_submenu.asm +++ b/engine/pokemon/mon_submenu.asm @@ -2,7 +2,7 @@ INCLUDE "data/mon_menu.asm" MonSubmenu: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call GetMonSubmenuItems farcall FreezeMonIcons ld hl, .MenuHeader @@ -11,7 +11,7 @@ MonSubmenu: call PopulateMonMenu ld a, 1 - ld [hBGMapMode], a + ldh [hBGMapMode], a call MonMenuLoop ld [wMenuSelection], a @@ -49,7 +49,7 @@ MonMenuLoop: call StaticMenuJoypad ld de, SFX_READ_TEXT_2 call PlaySFX - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit A_BUTTON_F, a jr nz, .select bit B_BUTTON_F, a @@ -248,7 +248,7 @@ BattleMonMenu: ld hl, MenuHeader_0x24ed4 call CopyMenuHeader xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems @@ -263,7 +263,7 @@ BattleMonMenu: call StaticMenuJoypad ld de, SFX_READ_TEXT_2 call PlaySFX - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit B_BUTTON_F, a jr z, .clear_carry ret z |