Harmonize engine/{phone, pokedex, pokegear, printer, rtc, tilesets} with pokegold

To do: engine/{menus, movie, overworld, pokemon}
This commit is contained in:
Rangi
2020-06-17 11:29:00 -04:00
parent 8019db3ea9
commit be93ab33a7
8 changed files with 123 additions and 125 deletions

View File

@@ -1055,8 +1055,8 @@ Pokedex_ListingPosChanged:
ret
Pokedex_FillColumn:
; Fills a column starting at HL, going downwards.
; B is the height of the column and A is the tile it's filled with.
; 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
@@ -2305,7 +2305,6 @@ Pokedex_FillBox:
jp FillBoxWithByte
Pokedex_BlackOutBG:
; Make BG palettes black so that the BG becomes all black.
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)

View File

@@ -52,7 +52,7 @@ DrawPokedexListWindow:
ld a, $51
hlcoord 11, 1
ld b, SCREEN_HEIGHT - 3
call Bank77_FillColumn
call Pokedex_FillColumn2
ld [hl], $52
jr .Done
@@ -63,7 +63,7 @@ DrawPokedexListWindow:
ld a, $67
hlcoord 11, 1
ld b, SCREEN_HEIGHT - 3
call Bank77_FillColumn
call Pokedex_FillColumn2
ld [hl], $68
.Done:
ret
@@ -86,7 +86,7 @@ DrawPokedexSearchResultsWindow:
ld a, $67
hlcoord 11, 1
ld b, SCREEN_HEIGHT / 2
call Bank77_FillColumn
call Pokedex_FillColumn2
ld [hl], $68
ld a, $34
hlcoord 0, 11
@@ -101,7 +101,7 @@ DrawPokedexSearchResultsWindow:
ld a, $67
hlcoord 11, 12
ld b, 5
call Bank77_FillColumn
call Pokedex_FillColumn2
ld [hl], $68
hlcoord 0, 12
lb bc, 5, 11
@@ -134,14 +134,14 @@ DrawDexEntryScreenRightEdge:
hlcoord 19, 1
ld a, $67
ld b, 15
call Bank77_FillColumn
call Pokedex_FillColumn2
ld [hl], $68
hlcoord 19, 17
ld [hl], $3c
xor a
ld b, SCREEN_HEIGHT
hlcoord 19, 0, wAttrmap
call Bank77_FillColumn
call Pokedex_FillColumn2
call WaitBGMap2
pop hl
ld a, l
@@ -150,7 +150,8 @@ DrawDexEntryScreenRightEdge:
ldh [hBGMapAddress + 1], a
ret
Bank77_FillColumn:
Pokedex_FillColumn2:
; A local duplicate of Pokedex_FillColumn.
push de
ld de, SCREEN_WIDTH
.loop