diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
| commit | 6fe56af2cd63abaf30040cc5031e3db5358cf638 (patch) | |
| tree | b024aa8480912ebf2667184068466ee7f354012c /engine/menus | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| download | pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.gz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.xz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.zip | |
Organize home and macro code
Diffstat (limited to 'engine/menus')
| -rwxr-xr-x | engine/menus/pokedex.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 874fe50f..315e4805 100755 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -205,9 +205,9 @@ HandlePokedexListMenu: jr z, .checkIfRightPressed .downPressed ; scroll down one row ld a, [wDexMaxSeenMon] - cp a, 7 + cp 7 jp c, .loop ; can't if the list is shorter than 7 - sub a, 7 + sub 7 ld b, a ld a, [wListScrollOffset] cp b @@ -221,12 +221,12 @@ HandlePokedexListMenu: jr z, .checkIfLeftPressed .rightPressed ; scroll down 7 rows ld a, [wDexMaxSeenMon] - cp a, 7 + cp 7 jp c, .loop ; can't if the list is shorter than 7 - sub a, 6 + sub 6 ld b, a ld a, [wListScrollOffset] - add a, 7 + add 7 ld [wListScrollOffset], a cp b jp c, .loop @@ -240,7 +240,7 @@ HandlePokedexListMenu: jr z, .buttonAPressed .leftPressed ld a, [wListScrollOffset] - sub a, 7 + sub 7 ld [wListScrollOffset], a jp nc, .loop xor a @@ -324,7 +324,7 @@ DrawPokedexVerticalLine: .loop ld [hl], a add hl, de - xor a, 1 ; toggle between vertical line tile and box tile + xor 1 ; toggle between vertical line tile and box tile dec c jr nz, .loop ret @@ -459,7 +459,7 @@ ShowPokedexDataInternal: .waitForButtonPress call JoypadLowSensitivity ldh a, [hJoy5] - and a, A_BUTTON | B_BUTTON + and A_BUTTON | B_BUTTON jr z, .waitForButtonPress pop af ldh [hTilesetType], a |
