You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
remove \@s from local labels
\@ is used for anonymous labels in rgbds macros. this has no effect on local labels.
This commit is contained in:
80
main.asm
80
main.asm
@@ -1168,7 +1168,7 @@ TextBoxBorder: ; ff1
|
|||||||
ld de, 20
|
ld de, 20
|
||||||
add hl, de ; skip the top row
|
add hl, de ; skip the top row
|
||||||
|
|
||||||
.PlaceRow\@
|
.PlaceRow
|
||||||
push hl
|
push hl
|
||||||
ld a, "│"
|
ld a, "│"
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
@@ -1180,7 +1180,7 @@ TextBoxBorder: ; ff1
|
|||||||
ld de, 20
|
ld de, 20
|
||||||
add hl, de ; move to next row
|
add hl, de ; move to next row
|
||||||
dec b
|
dec b
|
||||||
jr nz, .PlaceRow\@
|
jr nz, .PlaceRow
|
||||||
|
|
||||||
; bottom row
|
; bottom row
|
||||||
ld a, "└"
|
ld a, "└"
|
||||||
@@ -1195,10 +1195,10 @@ TextBoxBorder: ; ff1
|
|||||||
NPlaceChar: ; 101e
|
NPlaceChar: ; 101e
|
||||||
; place a row of width c of identical characters
|
; place a row of width c of identical characters
|
||||||
ld d,c
|
ld d,c
|
||||||
.loop\@
|
.loop
|
||||||
ld [hli],a
|
ld [hli],a
|
||||||
dec d
|
dec d
|
||||||
jr nz,.loop\@
|
jr nz,.loop
|
||||||
ret
|
ret
|
||||||
; 1024
|
; 1024
|
||||||
|
|
||||||
@@ -3445,19 +3445,19 @@ IsInArray: ; 30e1
|
|||||||
; if found, returns count in b and sets carry.
|
; if found, returns count in b and sets carry.
|
||||||
ld b,0
|
ld b,0
|
||||||
ld c,a
|
ld c,a
|
||||||
.loop\@
|
.loop
|
||||||
ld a,[hl]
|
ld a,[hl]
|
||||||
cp a, $FF
|
cp a, $FF
|
||||||
jr z,.NotInArray\@
|
jr z,.NotInArray
|
||||||
cp c
|
cp c
|
||||||
jr z,.InArray\@
|
jr z,.InArray
|
||||||
inc b
|
inc b
|
||||||
add hl,de
|
add hl,de
|
||||||
jr .loop\@
|
jr .loop
|
||||||
.NotInArray\@
|
.NotInArray
|
||||||
and a
|
and a
|
||||||
ret
|
ret
|
||||||
.InArray\@
|
.InArray
|
||||||
scf
|
scf
|
||||||
ret
|
ret
|
||||||
; 0x30f4
|
; 0x30f4
|
||||||
@@ -3824,19 +3824,19 @@ CountSetBits: ; 0x335f
|
|||||||
; OUTPUT:
|
; OUTPUT:
|
||||||
; [$d265] = number of set bits
|
; [$d265] = number of set bits
|
||||||
ld c, $0
|
ld c, $0
|
||||||
.loop\@
|
.loop
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, $8
|
ld d, $8
|
||||||
.innerLoop\@ ; count how many bits are set in the current byte
|
.innerLoop ; count how many bits are set in the current byte
|
||||||
srl e
|
srl e
|
||||||
ld a, $0
|
ld a, $0
|
||||||
adc c
|
adc c
|
||||||
ld c, a
|
ld c, a
|
||||||
dec d
|
dec d
|
||||||
jr nz, .innerLoop\@
|
jr nz, .innerLoop
|
||||||
dec b
|
dec b
|
||||||
jr nz, .loop\@
|
jr nz, .loop
|
||||||
ld a, c
|
ld a, c
|
||||||
ld [$d265], a
|
ld [$d265], a
|
||||||
ret
|
ret
|
||||||
@@ -4305,12 +4305,12 @@ PrintBCDNumber: ; 38bb
|
|||||||
res 6, c
|
res 6, c
|
||||||
res 5, c ; c now holds the length
|
res 5, c ; c now holds the length
|
||||||
bit 5, b
|
bit 5, b
|
||||||
jr z, .loop\@
|
jr z, .loop
|
||||||
bit 7, b
|
bit 7, b
|
||||||
jr nz, .loop\@
|
jr nz, .loop
|
||||||
ld [hl], "¥"
|
ld [hl], "¥"
|
||||||
inc hl
|
inc hl
|
||||||
.loop\@
|
.loop
|
||||||
ld a, [de]
|
ld a, [de]
|
||||||
swap a
|
swap a
|
||||||
call PrintBCDDigit ; print upper digit
|
call PrintBCDDigit ; print upper digit
|
||||||
@@ -4318,48 +4318,48 @@ PrintBCDNumber: ; 38bb
|
|||||||
call PrintBCDDigit ; print lower digit
|
call PrintBCDDigit ; print lower digit
|
||||||
inc de
|
inc de
|
||||||
dec c
|
dec c
|
||||||
jr nz, .loop\@
|
jr nz, .loop
|
||||||
bit 7, b ; were any non-zero digits printed?
|
bit 7, b ; were any non-zero digits printed?
|
||||||
jr z, .done\@ ; if so, we are done
|
jr z, .done ; if so, we are done
|
||||||
.numberEqualsZero\@ ; if every digit of the BCD number is zero
|
.numberEqualsZero ; if every digit of the BCD number is zero
|
||||||
bit 6, b ; left or right alignment?
|
bit 6, b ; left or right alignment?
|
||||||
jr nz, .skipRightAlignmentAdjustment\@
|
jr nz, .skipRightAlignmentAdjustment
|
||||||
dec hl ; if the string is right-aligned, it needs to be moved back one space
|
dec hl ; if the string is right-aligned, it needs to be moved back one space
|
||||||
.skipRightAlignmentAdjustment\@
|
.skipRightAlignmentAdjustment
|
||||||
bit 5, b
|
bit 5, b
|
||||||
jr z, .skipCurrencySymbol\@
|
jr z, .skipCurrencySymbol
|
||||||
ld [hl], "¥" ; currency symbol
|
ld [hl], "¥" ; currency symbol
|
||||||
inc hl
|
inc hl
|
||||||
.skipCurrencySymbol\@
|
.skipCurrencySymbol
|
||||||
ld [hl], "0"
|
ld [hl], "0"
|
||||||
call PrintLetterDelay
|
call PrintLetterDelay
|
||||||
inc hl
|
inc hl
|
||||||
.done\@
|
.done
|
||||||
ret
|
ret
|
||||||
; 0x38f2
|
; 0x38f2
|
||||||
|
|
||||||
PrintBCDDigit: ; 38f2
|
PrintBCDDigit: ; 38f2
|
||||||
and a, %00001111
|
and a, %00001111
|
||||||
and a
|
and a
|
||||||
jr z, .zeroDigit\@
|
jr z, .zeroDigit
|
||||||
.nonzeroDigit\@
|
.nonzeroDigit
|
||||||
bit 7, b ; have any non-space characters been printed?
|
bit 7, b ; have any non-space characters been printed?
|
||||||
jr z, .outputDigit\@
|
jr z, .outputDigit
|
||||||
; if bit 7 is set, then no numbers have been printed yet
|
; if bit 7 is set, then no numbers have been printed yet
|
||||||
bit 5, b ; print the currency symbol?
|
bit 5, b ; print the currency symbol?
|
||||||
jr z, .skipCurrencySymbol\@
|
jr z, .skipCurrencySymbol
|
||||||
ld [hl], "¥"
|
ld [hl], "¥"
|
||||||
inc hl
|
inc hl
|
||||||
res 5, b
|
res 5, b
|
||||||
.skipCurrencySymbol\@
|
.skipCurrencySymbol
|
||||||
res 7, b ; unset 7 to indicate that a nonzero digit has been reached
|
res 7, b ; unset 7 to indicate that a nonzero digit has been reached
|
||||||
.outputDigit\@
|
.outputDigit
|
||||||
add a, "0"
|
add a, "0"
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
jp PrintLetterDelay
|
jp PrintLetterDelay
|
||||||
.zeroDigit\@
|
.zeroDigit
|
||||||
bit 7, b ; either printing leading zeroes or already reached a nonzero digit?
|
bit 7, b ; either printing leading zeroes or already reached a nonzero digit?
|
||||||
jr z, .outputDigit\@ ; if so, print a zero digit
|
jr z, .outputDigit ; if so, print a zero digit
|
||||||
bit 6, b ; left or right alignment?
|
bit 6, b ; left or right alignment?
|
||||||
ret nz
|
ret nz
|
||||||
ld a, " "
|
ld a, " "
|
||||||
@@ -6247,13 +6247,13 @@ PrintNumber_AdvancePointer: ; c64a
|
|||||||
; increments the pointer unless leading zeroes are not being printed,
|
; increments the pointer unless leading zeroes are not being printed,
|
||||||
; the number is left-aligned, and no nonzero digits have been printed yet
|
; the number is left-aligned, and no nonzero digits have been printed yet
|
||||||
bit 7, d ; print leading zeroes?
|
bit 7, d ; print leading zeroes?
|
||||||
jr nz, .incrementPointer\@
|
jr nz, .incrementPointer
|
||||||
bit 6, d ; left alignment or right alignment?
|
bit 6, d ; left alignment or right alignment?
|
||||||
jr z, .incrementPointer\@
|
jr z, .incrementPointer
|
||||||
ld a, [hPastLeadingZeroes]
|
ld a, [hPastLeadingZeroes]
|
||||||
and a
|
and a
|
||||||
ret z
|
ret z
|
||||||
.incrementPointer\@
|
.incrementPointer
|
||||||
inc hl
|
inc hl
|
||||||
ret
|
ret
|
||||||
; 0xc658
|
; 0xc658
|
||||||
@@ -13077,18 +13077,18 @@ ClearScreenArea: ; 0x896ff
|
|||||||
; c = width
|
; c = width
|
||||||
ld a, $7f ; blank tile
|
ld a, $7f ; blank tile
|
||||||
ld de, 20 ; screen width
|
ld de, 20 ; screen width
|
||||||
.loop\@
|
.loop
|
||||||
push bc
|
push bc
|
||||||
push hl
|
push hl
|
||||||
.innerLoop\@
|
.innerLoop
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
dec c
|
dec c
|
||||||
jr nz, .innerLoop\@
|
jr nz, .innerLoop
|
||||||
pop hl
|
pop hl
|
||||||
pop bc
|
pop bc
|
||||||
add hl, de
|
add hl, de
|
||||||
dec b
|
dec b
|
||||||
jr nz, .loop\@
|
jr nz, .loop
|
||||||
dec hl
|
dec hl
|
||||||
inc c
|
inc c
|
||||||
inc c
|
inc c
|
||||||
|
Reference in New Issue
Block a user