Sync coordinate macros with pokecrystal

This commit is contained in:
Rangi 2020-07-07 11:30:10 -04:00
parent 45ed05decf
commit 13129459f1
75 changed files with 675 additions and 661 deletions

View file

@ -22,7 +22,7 @@ CeladonPrizeMenu::
ld a, $01
ld [wTopMenuItemX], a
call PrintPrizePrice
coord hl, 0, 2
hlcoord 0, 2
ld b, 8
ld c, 16
call TextBoxBorder
@ -93,71 +93,71 @@ GetPrizeMenuId:
ld a, [wPrize1]
ld [wd11e], a
call GetItemName
coord hl, 2, 4
hlcoord 2, 4
call PlaceString
ld a, [wPrize2]
ld [wd11e], a
call GetItemName
coord hl, 2, 6
hlcoord 2, 6
call PlaceString
ld a, [wPrize3]
ld [wd11e], a
call GetItemName
coord hl, 2, 8
hlcoord 2, 8
call PlaceString
jr .putNoThanksText
.putMonName
ld a, [wPrize1]
ld [wd11e], a
call GetMonName
coord hl, 2, 4
hlcoord 2, 4
call PlaceString
ld a, [wPrize2]
ld [wd11e], a
call GetMonName
coord hl, 2, 6
hlcoord 2, 6
call PlaceString
ld a, [wPrize3]
ld [wd11e], a
call GetMonName
coord hl, 2, 8
hlcoord 2, 8
call PlaceString
.putNoThanksText
coord hl, 2, 10
hlcoord 2, 10
ld de, NoThanksText
call PlaceString
; put prices on the right side of the textbox
ld de, wPrize1Price
coord hl, 13, 5
hlcoord 13, 5
; reg. c:
; [low nybble] number of bytes
; [bits 765 = %100] space-padding (not zero-padding)
ld c, (1 << 7 | 2)
call PrintBCDNumber
ld de, wPrize2Price
coord hl, 13, 7
hlcoord 13, 7
ld c, (1 << 7 | 2)
call PrintBCDNumber
ld de, wPrize3Price
coord hl, 13, 9
hlcoord 13, 9
ld c, (1 << 7 | 2)
jp PrintBCDNumber
INCLUDE "data/events/prizes.asm"
PrintPrizePrice:
coord hl, 11, 0
hlcoord 11, 0
ld b, 1
ld c, 7
call TextBoxBorder
call UpdateSprites
coord hl, 12, 0
hlcoord 12, 0
ld de, .CoinString
call PlaceString
coord hl, 13, 1
hlcoord 13, 1
ld de, .SixSpacesString
call PlaceString
coord hl, 13, 1
hlcoord 13, 1
ld de, wPlayerCoins
ld c, %10000010
call PrintBCDNumber