diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/mon_stats.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/mon_stats.asm')
| -rw-r--r-- | home/mon_stats.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/home/mon_stats.asm b/home/mon_stats.asm index 3731a246f..318d32c9c 100644 --- a/home/mon_stats.asm +++ b/home/mon_stats.asm @@ -1,4 +1,4 @@ -IsAPokemon:: ; 3741 +IsAPokemon:: ; Return carry if species a is not a Pokemon. and a jr z, .NotAPokemon @@ -14,9 +14,8 @@ IsAPokemon:: ; 3741 .Pokemon: and a ret -; 3750 -DrawBattleHPBar:: ; 3750 +DrawBattleHPBar:: ; Draw an HP bar d tiles long at hl ; Fill it up to e pixels @@ -75,13 +74,12 @@ DrawBattleHPBar:: ; 3750 pop de pop hl ret -; 3786 -PrepMonFrontpic:: ; 3786 +PrepMonFrontpic:: ld a, $1 ld [wBoxAlignment], a -_PrepMonFrontpic:: ; 378b +_PrepMonFrontpic:: ld a, [wCurPartySpecies] call IsAPokemon jr c, .not_pokemon @@ -104,4 +102,3 @@ _PrepMonFrontpic:: ; 378b inc a ld [wCurPartySpecies], a ret -; 37b6 |