Require RGBDS 1.0.0

and fix warnings

Author: dannye

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@master
         with:
           path: rgbds
-          ref: v0.9.3
+          ref: v1.0.0
           repository: gbdev/rgbds
 
       - name: Install rgbds

src/constants/text_constants.asm

@@ -27,7 +27,7 @@ DEF TX_HALFWIDTH  EQU $06 ; sets wFontWidth to HALF_WIDTH
 DEF TX_HALF2FULL  EQU $07 ; sets wFontWidth to FULL_WIDTH, and hJapaneseSyllabary to TX_KATAKANA
 
 DEF TX_RAM1       EQU $09 ; prints the player's name or, in a duel, the turn duelist's name
-DEF TX_LINE       EQU "\n" ; advances to a new line
+DEF TX_LINE       EQU '\n' ; advances to a new line
 DEF TX_RAM2       EQU $0b ; prints text from wTxRam2 or wTxRam2_b
 DEF TX_RAM3       EQU $0c ; prints a number from wTxRam3 or wTxRam3_b
 

src/engine/copy_card_name.asm

@@ -109,20 +109,20 @@ _CopyCardNameAndLevel_HalfwidthText:
 	or a
 	jr z, .level_done
 	ld c, a
-	ld a, " "
+	ld a, ' '
 	ld [hli], a
 	dec b
-	ld a, "L"
+	ld a, 'L'
 	ld [hli], a
 	dec b
-	ld a, "v"
+	ld a, 'v'
 	ld [hli], a
 	dec b
 	ld a, c
 	cp 10
 	jr c, .got_level
 	push bc
-	ld b, "0" - 1
+	ld b, '0' - 1
 .first_digit_loop
 	inc b
 	sub 10
@@ -135,12 +135,12 @@ _CopyCardNameAndLevel_HalfwidthText:
 	dec b
 .got_level
 	ld a, c
-	add "0"
+	add '0'
 	ld [hli], a ; last (or only) digit
 	dec b
 .level_done
 	push hl
-	ld a, " "
+	ld a, ' '
 .fill_spaces_loop
 	ld [hli], a
 	dec b

src/engine/menus/deck_selection.asm

@@ -354,15 +354,15 @@ InputCurDeckName:
 	ld hl, wCurDeckName
 	ld [hl], $6
 	inc hl
-	ld [hl], "D"
+	ld [hl], 'D'
 	inc hl
-	ld [hl], "e"
+	ld [hl], 'e'
 	inc hl
-	ld [hl], "c"
+	ld [hl], 'c'
 	inc hl
-	ld [hl], "k"
+	ld [hl], 'k'
 	inc hl
-	ld [hl], " "
+	ld [hl], ' '
 	inc hl
 	ld de, wDefaultText + 2
 	ld a, [de]

src/home/print_text.asm

@@ -67,7 +67,7 @@ CountLinesOfTextFromID::
 	jr nc, .char_loop
 	cp TX_HALFWIDTH
 	jr c, .skip
-	cp "\n"
+	cp '\n'
 	jr nz, .char_loop
 	inc c
 	jr .char_loop
@@ -410,7 +410,7 @@ TwoByteNumberToText_CountLeadingZeros::
 	ld c, 4
 .digit_loop
 	ld a, [hl]
-	cp "0"
+	cp '0'
 	ret nz
 	inc hl
 	dec c

src/home/process_text.asm

@@ -55,7 +55,7 @@ ProcessSpecialTextCharacter::
 	jr z, .set_syllabary
 	cp TX_KATAKANA
 	jr z, .set_syllabary
-	cp "\n"
+	cp '\n'
 	jr z, .end_of_line
 	cp TX_SYMBOL
 	jr z, .tx_symbol
@@ -270,7 +270,7 @@ TerminateHalfWidthText::
 	push hl
 	push de
 	push bc
-	ld e, " "
+	ld e, ' '
 	call Func_22ca
 	pop bc
 	pop de
@@ -400,7 +400,7 @@ CaseHalfWidthLetter::
 	ret c
 	cp $7b
 	ret nc
-	sub "a" - "A"
+	sub 'a' - 'A'
 	ld e, a
 	ret
 
@@ -498,7 +498,7 @@ CopyTextData::
 	jr c, .hw_text_done
 	push hl
 .fill_hw_loop
-	ld a, " "
+	ld a, ' '
 	ld [hli], a
 	dec d
 	jr nz, .fill_hw_loop

src/home/write_number.asm

@@ -77,8 +77,8 @@ WriteBCDNumberInTextFormat::
 ;  format to hl. numbers above 9 end up converted to half-width font tiles.
 WriteBCDDigitInTextFormat::
 	and $0f
-	add "0"
-	cp "9" + 1
+	add '0'
+	cp '9' + 1
 	jr c, .write_num
 	add $07
 .write_num
@@ -142,7 +142,7 @@ TwoByteNumberToText::
 	pop bc
 	ret
 .get_digit
-	ld a, "0" - 1
+	ld a, '0' - 1
 .subtract_loop
 	inc a
 	add hl, bc

src/macros/text.asm

@@ -73,7 +73,7 @@ MACRO ldfw
 	IF CHARSIZE(\2) > 1
 		ld \1, CHARVAL(\2, 0) << 8 + CHARVAL(\2, 1)
 	ELSE
-		ld \1, \2
+		ld \1, CHARVAL(\2)
 	ENDC
 	POPC
 ENDM

src/rgbdscheck.asm

@@ -1,6 +1,6 @@
-IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__)
-	fail "poketcg requires rgbds v0.9.3 or newer."
+IF !DEF(__RGBDS_MAJOR__)
+	fail "poketcg requires rgbds v1.0.0 or newer."
 ENDC
-IF __RGBDS_MAJOR__ == 0 && (__RGBDS_MINOR__ < 9 || (__RGBDS_MINOR__ == 9 && __RGBDS_PATCH__ < 3))
-	fail "poketcg requires rgbds v0.9.3 or newer."
+IF __RGBDS_MAJOR__ < 1
+	fail "poketcg requires rgbds v1.0.0 or newer."
 ENDC