diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/menu/party_menu.asm | |
| parent | rename hJoyHeldLast -> hJoyLast (diff) | |
| parent | Rename some labels (diff) | |
| download | pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/menu/party_menu.asm')
| -rwxr-xr-x | engine/menu/party_menu.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 10fc4182..97e520c2 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -83,19 +83,19 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) push hl ld bc,14 ; 14 columns to the right add hl,bc - ld de,wcf9c + ld de,wLoadedMonStatus call PrintStatusCondition pop hl push hl ld bc,20 + 1 ; down 1 row and right 1 column - ld a,[$FFF6] + ld a,[hFlags_0xFFF6] set 0,a - ld [$FFF6],a + ld [hFlags_0xFFF6],a add hl,bc - predef Func_128f6 ; draw HP bar and prints current / max HP - ld a,[$FFF6] + predef DrawHP2 ; draw HP bar and prints current / max HP + ld a,[hFlags_0xFFF6] res 0,a - ld [$FFF6],a + ld [hFlags_0xFFF6],a call SetPartyMenuHealthBarColor ; color the HP bar (on SGB) pop hl jr .printLevel @@ -134,7 +134,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) push hl ld hl,EvosMovesPointerTable ld b,0 - ld a,[wcf98] ; pokemon ID + ld a,[wLoadedMonSpecies] dec a add a rl b |