aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2025-11-12 15:44:07 -0500
committerGitHub <noreply@github.com>2025-11-12 15:44:07 -0500
commit5943b96cf6d5eda52df2ad689af0ac251e4e0841 (patch)
tree1e90b28cfce0c0876ad7f9886fb2ad405478fd39 /engine/pokemon
parentUse the same tools/make_patch.c as Gen 2 (diff)
downloadpokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.gz
pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.xz
pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.zip
Use features of RGBDS 1.0.0 (#537)
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc.asm14
-rw-r--r--engine/pokemon/evos_moves.asm2
-rw-r--r--engine/pokemon/status_ailments.asm30
-rw-r--r--engine/pokemon/status_screen.asm16
4 files changed, 31 insertions, 31 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 6d522377..0fcdedc6 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -157,11 +157,11 @@ BillsPCMenu:
; two digit box num
sub 9
hlcoord 17, 16
- ld [hl], "1"
- add "0"
+ ld [hl], '1'
+ add '0'
jr .next
.singleDigitBoxNum
- add "1"
+ add '1'
.next
ldcoord_a 18, 16
hlcoord 10, 16
@@ -240,15 +240,15 @@ BillsPCDeposit:
cp 9
jr c, .singleDigitBoxNum
sub 9
- ld [hl], "1"
+ ld [hl], '1'
inc hl
- add "0"
+ add '0'
jr .next
.singleDigitBoxNum
- add "1"
+ add '1'
.next
ld [hli], a
- ld [hl], "@"
+ ld [hl], '@'
ld hl, MonWasStoredText
call PrintText
jp BillsPCMenu
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index afae4396..1b92a093 100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -278,7 +278,7 @@ RenameEvolvedMon:
cp [hl]
inc hl
ret nz
- cp "@"
+ cp '@'
jr nz, .compareNamesLoop
ld a, [wWhichPokemon]
ld bc, NAME_LENGTH
diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm
index 05205a34..2c5b3bcd 100644
--- a/engine/pokemon/status_ailments.asm
+++ b/engine/pokemon/status_ailments.asm
@@ -10,37 +10,37 @@ PrintStatusAilment::
jr nz, .par
and SLP_MASK
ret z
- ld a, "S"
+ ld a, 'S'
ld [hli], a
- ld a, "L"
+ ld a, 'L'
ld [hli], a
- ld [hl], "P"
+ ld [hl], 'P'
ret
.psn
- ld a, "P"
+ ld a, 'P'
ld [hli], a
- ld a, "S"
+ ld a, 'S'
ld [hli], a
- ld [hl], "N"
+ ld [hl], 'N'
ret
.brn
- ld a, "B"
+ ld a, 'B'
ld [hli], a
- ld a, "R"
+ ld a, 'R'
ld [hli], a
- ld [hl], "N"
+ ld [hl], 'N'
ret
.frz
- ld a, "F"
+ ld a, 'F'
ld [hli], a
- ld a, "R"
+ ld a, 'R'
ld [hli], a
- ld [hl], "Z"
+ ld [hl], 'Z'
ret
.par
- ld a, "P"
+ ld a, 'P'
ld [hli], a
- ld a, "A"
+ ld a, 'A'
ld [hli], a
- ld [hl], "R"
+ ld [hl], 'R'
ret
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index 344e7802..80cdfb17 100644
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -52,7 +52,7 @@ DrawHP_:
ld de, wLoadedMonHP
lb bc, 2, 3
call PrintNumber
- ld a, "/"
+ ld a, '/'
ld [hli], a
ld de, wLoadedMonMaxHP
lb bc, 2, 3
@@ -110,9 +110,9 @@ StatusScreen:
call DrawLineBox ; Draws the box around name, HP and status
ld de, -6
add hl, de
- ld [hl], "<DOT>"
+ ld [hl], '<DOT>'
dec hl
- ld [hl], "№"
+ ld [hl], '№'
hlcoord 19, 9
lb bc, 8, 6
call DrawLineBox ; Draws the box around types, ID No. and OT
@@ -329,13 +329,13 @@ StatusScreen2:
ld b, a ; Number of moves ?
hlcoord 11, 10
ld de, SCREEN_WIDTH * 2
- ld a, "<BOLD_P>"
+ ld a, '<BOLD_P>'
call StatusScreen_PrintPP ; Print "PP"
ld a, b
and a
jr z, .InitPP
ld c, a
- ld a, "-"
+ ld a, '-'
call StatusScreen_PrintPP ; Fill the rest with --
.InitPP
ld hl, wLoadedMonMoves
@@ -372,7 +372,7 @@ StatusScreen2:
ld de, wStatusScreenCurrentPP
lb bc, 1, 2
call PrintNumber
- ld a, "/"
+ ld a, '/'
ld [hli], a
ld de, wMaxPP
lb bc, 1, 2
@@ -400,7 +400,7 @@ StatusScreen2:
ld [wLoadedMonLevel], a ; Increase temporarily if not 100
.Level100
hlcoord 14, 6
- ld [hl], "<to>"
+ ld [hl], '<to>'
inc hl
inc hl
call PrintLevel
@@ -469,7 +469,7 @@ StatusScreenExpText:
StatusScreen_ClearName:
ld bc, 10
- ld a, " "
+ ld a, ' '
jp FillMemory
StatusScreen_PrintPP: