ref: be8d1c80f476c2a48eafb0408afd412c8ab95195
parent: 8a45169a9dd0c9e462d02bb772b4cd029ca04801
parent: 289d3dea86b82c4ce7eb7268ef33980688306587
author: PikalaxALT <[email protected]>
date: Tue Jan 19 18:28:37 EST 2016
Merge branch 'master' of https://github.com/pret/pokecrystal
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -287,7 +287,7 @@
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
@@ -294,10 +294,9 @@
.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
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1053,8 +1053,9 @@
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 @@
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 @@
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 @@
hlcoord 8, 1
ld b, 7
ld a, $5a
- call Pokedex_HLDownBRows
+ call Pokedex_FillColumn
hlcoord 8, 8
ld [hl], $53
hlcoord 8, 9
--- a/main.asm
+++ b/main.asm
@@ -6804,7 +6804,7 @@
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