Replace hardware_constants.asm with the community-standard hardware.inc 5.0 (#1186)
This commit is contained in:
@@ -219,7 +219,7 @@ Pokedex_InitMainScreen:
|
||||
call ClearSprites
|
||||
xor a
|
||||
hlcoord 0, 0, wAttrmap
|
||||
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
|
||||
ld bc, SCREEN_AREA
|
||||
call ByteFill
|
||||
farcall DrawPokedexListWindow
|
||||
hlcoord 0, 17
|
||||
@@ -721,7 +721,7 @@ Pokedex_InitSearchResultsScreen:
|
||||
ldh [hBGMapMode], a
|
||||
xor a
|
||||
hlcoord 0, 0, wAttrmap
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
ld bc, SCREEN_AREA
|
||||
call ByteFill
|
||||
call Pokedex_SetBGMapMode4
|
||||
call Pokedex_ResetBGMapMode
|
||||
@@ -1076,7 +1076,7 @@ Pokedex_DrawMainScreenBG:
|
||||
call Pokedex_PlaceString
|
||||
ld a, $32
|
||||
hlcoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
ld bc, SCREEN_AREA
|
||||
call ByteFill
|
||||
hlcoord 0, 0
|
||||
lb bc, 7, 7
|
||||
@@ -1379,7 +1379,7 @@ UnownModeLetterAndCursorCoords:
|
||||
Pokedex_FillBackgroundColor2:
|
||||
hlcoord 0, 0
|
||||
ld a, $32
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
ld bc, SCREEN_AREA
|
||||
call ByteFill
|
||||
ret
|
||||
|
||||
@@ -1995,24 +1995,24 @@ Pokedex_PutOldModeCursorOAM:
|
||||
dbsprite 11, 2, -1, 0, $32, 7
|
||||
dbsprite 12, 2, -1, 0, $32, 7
|
||||
dbsprite 13, 2, -1, 0, $33, 7
|
||||
dbsprite 16, 2, -2, 0, $33, 7 | X_FLIP
|
||||
dbsprite 17, 2, -2, 0, $32, 7 | X_FLIP
|
||||
dbsprite 18, 2, -2, 0, $32, 7 | X_FLIP
|
||||
dbsprite 19, 2, -2, 0, $32, 7 | X_FLIP
|
||||
dbsprite 20, 2, -2, 0, $31, 7 | X_FLIP
|
||||
dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP
|
||||
dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP
|
||||
dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP
|
||||
dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP
|
||||
dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 16, 2, -2, 0, $33, 7 | OAM_XFLIP
|
||||
dbsprite 17, 2, -2, 0, $32, 7 | OAM_XFLIP
|
||||
dbsprite 18, 2, -2, 0, $32, 7 | OAM_XFLIP
|
||||
dbsprite 19, 2, -2, 0, $32, 7 | OAM_XFLIP
|
||||
dbsprite 20, 2, -2, 0, $31, 7 | OAM_XFLIP
|
||||
dbsprite 20, 3, -2, 0, $30, 7 | OAM_XFLIP
|
||||
dbsprite 9, 4, -1, 0, $30, 7 | OAM_YFLIP
|
||||
dbsprite 9, 5, -1, 0, $31, 7 | OAM_YFLIP
|
||||
dbsprite 10, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 11, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 12, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 13, 5, -1, 0, $33, 7 | OAM_YFLIP
|
||||
dbsprite 16, 5, -2, 0, $33, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 17, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 18, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 19, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 5, -2, 0, $31, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 4, -2, 0, $30, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
db -1
|
||||
|
||||
.CursorAtTopOAM:
|
||||
@@ -2024,24 +2024,24 @@ Pokedex_PutOldModeCursorOAM:
|
||||
dbsprite 11, 2, -1, 0, $35, 7
|
||||
dbsprite 12, 2, -1, 0, $35, 7
|
||||
dbsprite 13, 2, -1, 0, $36, 7
|
||||
dbsprite 16, 2, -2, 0, $36, 7 | X_FLIP
|
||||
dbsprite 17, 2, -2, 0, $35, 7 | X_FLIP
|
||||
dbsprite 18, 2, -2, 0, $35, 7 | X_FLIP
|
||||
dbsprite 19, 2, -2, 0, $35, 7 | X_FLIP
|
||||
dbsprite 20, 2, -2, 0, $34, 7 | X_FLIP
|
||||
dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP
|
||||
dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP
|
||||
dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP
|
||||
dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP
|
||||
dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP
|
||||
dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 16, 2, -2, 0, $36, 7 | OAM_XFLIP
|
||||
dbsprite 17, 2, -2, 0, $35, 7 | OAM_XFLIP
|
||||
dbsprite 18, 2, -2, 0, $35, 7 | OAM_XFLIP
|
||||
dbsprite 19, 2, -2, 0, $35, 7 | OAM_XFLIP
|
||||
dbsprite 20, 2, -2, 0, $34, 7 | OAM_XFLIP
|
||||
dbsprite 20, 3, -2, 0, $30, 7 | OAM_XFLIP
|
||||
dbsprite 9, 4, -1, 0, $30, 7 | OAM_YFLIP
|
||||
dbsprite 9, 5, -1, 0, $31, 7 | OAM_YFLIP
|
||||
dbsprite 10, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 11, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 12, 5, -1, 0, $32, 7 | OAM_YFLIP
|
||||
dbsprite 13, 5, -1, 0, $33, 7 | OAM_YFLIP
|
||||
dbsprite 16, 5, -2, 0, $33, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 17, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 18, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 19, 5, -2, 0, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 5, -2, 0, $31, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 4, -2, 0, $30, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
db -1
|
||||
|
||||
Pokedex_PutNewModeABCModeCursorOAM:
|
||||
@@ -2055,21 +2055,21 @@ Pokedex_PutNewModeABCModeCursorOAM:
|
||||
dbsprite 10, 2, -1, 3, $32, 7
|
||||
dbsprite 11, 2, -1, 3, $32, 7
|
||||
dbsprite 12, 2, -1, 3, $33, 7
|
||||
dbsprite 16, 2, 0, 3, $33, 7 | X_FLIP
|
||||
dbsprite 17, 2, 0, 3, $32, 7 | X_FLIP
|
||||
dbsprite 18, 2, 0, 3, $32, 7 | X_FLIP
|
||||
dbsprite 19, 2, 0, 3, $31, 7 | X_FLIP
|
||||
dbsprite 19, 3, 0, 3, $30, 7 | X_FLIP
|
||||
dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP
|
||||
dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP
|
||||
dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP
|
||||
dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP
|
||||
dbsprite 12, 5, -1, 3, $33, 7 | Y_FLIP
|
||||
dbsprite 16, 5, 0, 3, $33, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 17, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 18, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 19, 5, 0, 3, $31, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 19, 4, 0, 3, $30, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 16, 2, 0, 3, $33, 7 | OAM_XFLIP
|
||||
dbsprite 17, 2, 0, 3, $32, 7 | OAM_XFLIP
|
||||
dbsprite 18, 2, 0, 3, $32, 7 | OAM_XFLIP
|
||||
dbsprite 19, 2, 0, 3, $31, 7 | OAM_XFLIP
|
||||
dbsprite 19, 3, 0, 3, $30, 7 | OAM_XFLIP
|
||||
dbsprite 9, 4, -1, 3, $30, 7 | OAM_YFLIP
|
||||
dbsprite 9, 5, -1, 3, $31, 7 | OAM_YFLIP
|
||||
dbsprite 10, 5, -1, 3, $32, 7 | OAM_YFLIP
|
||||
dbsprite 11, 5, -1, 3, $32, 7 | OAM_YFLIP
|
||||
dbsprite 12, 5, -1, 3, $33, 7 | OAM_YFLIP
|
||||
dbsprite 16, 5, 0, 3, $33, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 17, 5, 0, 3, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 18, 5, 0, 3, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 19, 5, 0, 3, $31, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 19, 4, 0, 3, $30, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
db -1
|
||||
|
||||
Pokedex_UpdateSearchResultsCursorOAM:
|
||||
@@ -2087,24 +2087,24 @@ Pokedex_UpdateSearchResultsCursorOAM:
|
||||
dbsprite 11, 2, -1, 3, $32, 7
|
||||
dbsprite 12, 2, -1, 3, $32, 7
|
||||
dbsprite 13, 2, -1, 3, $33, 7
|
||||
dbsprite 16, 2, -2, 3, $33, 7 | X_FLIP
|
||||
dbsprite 17, 2, -2, 3, $32, 7 | X_FLIP
|
||||
dbsprite 18, 2, -2, 3, $32, 7 | X_FLIP
|
||||
dbsprite 19, 2, -2, 3, $32, 7 | X_FLIP
|
||||
dbsprite 20, 2, -2, 3, $31, 7 | X_FLIP
|
||||
dbsprite 20, 3, -2, 3, $30, 7 | X_FLIP
|
||||
dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP
|
||||
dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP
|
||||
dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP
|
||||
dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP
|
||||
dbsprite 12, 5, -1, 3, $32, 7 | Y_FLIP
|
||||
dbsprite 13, 5, -1, 3, $33, 7 | Y_FLIP
|
||||
dbsprite 16, 5, -2, 3, $33, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 17, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 18, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 19, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 5, -2, 3, $31, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 20, 4, -2, 3, $30, 7 | X_FLIP | Y_FLIP
|
||||
dbsprite 16, 2, -2, 3, $33, 7 | OAM_XFLIP
|
||||
dbsprite 17, 2, -2, 3, $32, 7 | OAM_XFLIP
|
||||
dbsprite 18, 2, -2, 3, $32, 7 | OAM_XFLIP
|
||||
dbsprite 19, 2, -2, 3, $32, 7 | OAM_XFLIP
|
||||
dbsprite 20, 2, -2, 3, $31, 7 | OAM_XFLIP
|
||||
dbsprite 20, 3, -2, 3, $30, 7 | OAM_XFLIP
|
||||
dbsprite 9, 4, -1, 3, $30, 7 | OAM_YFLIP
|
||||
dbsprite 9, 5, -1, 3, $31, 7 | OAM_YFLIP
|
||||
dbsprite 10, 5, -1, 3, $32, 7 | OAM_YFLIP
|
||||
dbsprite 11, 5, -1, 3, $32, 7 | OAM_YFLIP
|
||||
dbsprite 12, 5, -1, 3, $32, 7 | OAM_YFLIP
|
||||
dbsprite 13, 5, -1, 3, $33, 7 | OAM_YFLIP
|
||||
dbsprite 16, 5, -2, 3, $33, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 17, 5, -2, 3, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 18, 5, -2, 3, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 19, 5, -2, 3, $32, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 5, -2, 3, $31, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
dbsprite 20, 4, -2, 3, $30, 7 | OAM_XFLIP | OAM_YFLIP
|
||||
db -1
|
||||
|
||||
Pokedex_LoadCursorOAM:
|
||||
@@ -2308,16 +2308,16 @@ Pokedex_FillBox:
|
||||
jp FillBoxWithByte
|
||||
|
||||
Pokedex_BlackOutBG:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wBGPals1)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld hl, wBGPals1
|
||||
ld bc, 8 palettes
|
||||
xor a
|
||||
call ByteFill
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
Pokedex_ApplyPrintPals:
|
||||
ld a, $ff
|
||||
|
Reference in New Issue
Block a user