diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 11:13:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 11:13:02 -0600 |
| commit | 37ded1d150197b3784bc351eeeb0a8d9713c2e35 (patch) | |
| tree | fcb7bd8f3090cb9f7b47a76af7e474122efe36e4 /engine/menu/pc.asm | |
| parent | Merge pull request #174 from Rangi42/master (diff) | |
| parent | Add space between arguments in assembly instructions and remove redundant a i... (diff) | |
| download | pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.gz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.xz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.zip | |
Merge pull request #171 from xCrystal/master
Misc style fixes
Diffstat (limited to 'engine/menu/pc.asm')
| -rwxr-xr-x | engine/menu/pc.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm index c9e2cf08..5639bd99 100755 --- a/engine/menu/pc.asm +++ b/engine/menu/pc.asm @@ -17,34 +17,34 @@ PCMainMenu: bit 1, a ;if player pressed B jp nz, LogOff ld a, [wMaxMenuItem] - cp a, 2 + cp 2 jr nz, .next ;if not 2 menu items (not counting log off) (2 occurs before you get the pokedex) ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc jp LogOff ;otherwise, it's 2, and you're logging off .next - cp a, 3 + cp 3 jr nz, .next2 ;if not 3 menu items (not counting log off) (3 occurs after you get the pokedex, before you beat the pokemon league) ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc - cp a, 2 + cp 2 jp z, OaksPC ;if current menu item id is 2, it's oaks pc jp LogOff ;otherwise, it's 3, and you're logging off .next2 ld a, [wCurrentMenuItem] and a jp z, BillsPC ;if current menu item id is 0, it's bills pc - cp a, 1 + cp 1 jr z, .playersPC ;if current menu item id is 1, it's players pc - cp a, 2 + cp 2 jp z, OaksPC ;if current menu item id is 2, it's oaks pc - cp a, 3 + cp 3 jp z, PKMNLeague ;if current menu item id is 3, it's pkmnleague jp LogOff ;otherwise, it's 4, and you're logging off .playersPC |