pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
PikalaxALT 2016-01-19 23:28:37 -05:00
commit be8d1c80f4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/move_mon.asm
View File

@ -294,10 +294,9 @@ endr
.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

13
engine/pokedex.asm
View File

@ -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

2
main.asm
View File

@ -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