diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-19 23:28:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-19 23:28:37 -0500 |
| commit | be8d1c80f476c2a48eafb0408afd412c8ab95195 (patch) | |
| tree | 6019b5f911b34e34101d4a521e4159a6e9012791 | |
| parent | 8a45169a9dd0c9e462d02bb772b4cd029ca04801 (diff) | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
| -rwxr-xr-x | engine/move_mon.asm | 7 | ||||
| -rw-r--r-- | engine/pokedex.asm | 13 | ||||
| -rw-r--r-- | main.asm | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 8bda52daa..0a8c340ed 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -287,17 +287,16 @@ endr dec a jr nz, .generatestats ld hl, EnemyMonMaxHP - ld bc, 2*6 ; MaxHP + 5 Stats + ld bc, 2 * 6 ; MaxHP + 5 Stats call CopyBytes pop hl jr .next3 .generatestats pop hl - ld bc, 2*5 ; 5 Stats + ld bc, MON_STAT_EXP - 1 add hl, bc - ld b, $0 ; if b = 1, then the Stats of the Pkmn are calculated - ; only the current HP aren't set to MaxHP after this + ld b, $0 ; if b = 1, then stat calculation takes stat exp into account. call CalcPkmnStats .next3 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index b7125d85a..0ba14cd79 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1053,8 +1053,9 @@ Pokedex_ListingPosChanged: ; 4073f (10:473f) scf ret -Pokedex_HLDownBRows: ; 40741 -; Moves the tilemap pointer in HL down by B rows. +Pokedex_FillColumn: ; 40741 +; Fills a column starting at HL, going downwards. +; B is the height of the column and A is the tile it's filled with. push de ld de, SCREEN_WIDTH .loop @@ -1107,11 +1108,11 @@ Pokedex_DrawMainScreenBG: ; 4074c (10:474c) hlcoord 8, 1 ld b, 7 ld a, $5a - call Pokedex_HLDownBRows + call Pokedex_FillColumn hlcoord 8, 10 ld b, 6 ld a, $5a - call Pokedex_HLDownBRows + call Pokedex_FillColumn hlcoord 8, 0 ld [hl], $59 hlcoord 8, 8 @@ -1142,7 +1143,7 @@ Pokedex_DrawDexEntryScreenBG: ; 407fd hlcoord 19, 1 ld a, " " ld b, 15 - call Pokedex_HLDownBRows + call Pokedex_FillColumn ld [hl], $39 hlcoord 1, 10 ld bc, 19 @@ -1265,7 +1266,7 @@ Pokedex_DrawSearchResultsScreenBG: ; 40962 (10:4962) hlcoord 8, 1 ld b, 7 ld a, $5a - call Pokedex_HLDownBRows + call Pokedex_FillColumn hlcoord 8, 8 ld [hl], $53 hlcoord 8, 9 @@ -6804,7 +6804,7 @@ DisplayDexEntry: ; 4424d ld d, h ld e, l hlcoord 12, 7 - lb bc, 2, 36 + lb bc, 2, PRINTNUM_MONEY | 4 call PrintNum hlcoord 14, 7 ld [hl], $5e ; ft symbol |