aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle
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/battle
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/battle')
-rw-r--r--engine/battle/animations.asm6
-rw-r--r--engine/battle/core.asm42
-rw-r--r--engine/battle/effects.asm2
-rw-r--r--engine/battle/link_battle_versus_text.asm4
-rw-r--r--engine/battle/misc.asm10
-rw-r--r--engine/battle/print_type.asm2
-rw-r--r--engine/battle/save_trainer_name.asm2
7 files changed, 34 insertions, 34 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 6f255dd6..40b2047b 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1603,7 +1603,7 @@ _AnimationSquishMonPic:
call AnimCopyRowRight
inc hl
.next
- ld [hl], " "
+ ld [hl], ' '
pop hl
ld de, SCREEN_WIDTH
add hl, de
@@ -1838,7 +1838,7 @@ _AnimationSlideMonOff:
; plus one instead.
cp $61
ret c
- ld a, " "
+ ld a, ' '
ret
.EnemyNextTile
@@ -1848,7 +1848,7 @@ _AnimationSlideMonOff:
; the lower right tile is in the first column to slide off the screen.
cp $30
ret c
- ld a, " "
+ ld a, ' '
ret
AnimationSlideMonHalfOff:
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 83a52c2a..87abf2e8 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -20,7 +20,7 @@ SlidePlayerAndEnemySilhouettesOnScreen:
ld hl, vBGMap0
ld bc, TILEMAP_AREA
.clearBackgroundLoop
- ld a, " "
+ ld a, ' '
ld [hli], a
dec bc
ld a, b
@@ -1984,11 +1984,11 @@ CenterMonName:
.loop
inc de
ld a, [de]
- cp "@"
+ cp '@'
jr z, .done
inc de
ld a, [de]
- cp "@"
+ cp '@'
jr z, .done
dec hl
dec b
@@ -2036,15 +2036,15 @@ DisplayBattleMenu::
call CopyData
; the following simulates the keystrokes by drawing menus on screen
hlcoord 9, 14
- ld [hl], "▶"
+ ld [hl], '▶'
ld c, 80
call DelayFrames
- ld [hl], " "
+ ld [hl], ' '
hlcoord 9, 16
- ld [hl], "▶"
+ ld [hl], '▶'
ld c, 50
call DelayFrames
- ld [hl], "▷"
+ ld [hl], '▷'
ld a, $2 ; select the "ITEM" menu
jp .upperLeftMenuItemWasNotSelected
.oldManName
@@ -2062,7 +2062,7 @@ DisplayBattleMenu::
.leftColumn ; put cursor in left column of menu
ld a, [wBattleType]
cp BATTLE_TYPE_SAFARI
- ld a, " "
+ ld a, ' '
jr z, .safariLeftColumn
; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle)
ldcoord_a 15, 14 ; clear upper cursor position in right column
@@ -2095,7 +2095,7 @@ DisplayBattleMenu::
.rightColumn ; put cursor in right column of menu
ld a, [wBattleType]
cp BATTLE_TYPE_SAFARI
- ld a, " "
+ ld a, ' '
jr z, .safariRightColumn
; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle)
ldcoord_a 9, 14 ; clear upper cursor position in left column
@@ -2328,7 +2328,7 @@ PartyMenuOrRockOrRun:
.partyMonDeselected
hlcoord 11, 11
ld bc, 6 * SCREEN_WIDTH + 9
- ld a, " "
+ ld a, ' '
call FillMemory
xor a ; NORMAL_PARTY_MENU
ld [wPartyMenuTypeOrMessageID], a
@@ -2495,9 +2495,9 @@ MoveSelectionMenu:
; so it is necessary to put the di ei block to not cause tearing
call TextBoxBorder
hlcoord 4, 12
- ld [hl], "─"
+ ld [hl], '─'
hlcoord 10, 12
- ld [hl], "┘"
+ ld [hl], '┘'
ei
hlcoord 6, 13
call .writemoves
@@ -2603,7 +2603,7 @@ SelectMenuItem:
dec a
ld bc, SCREEN_WIDTH
call AddNTimes
- ld [hl], "▷"
+ ld [hl], '▷'
.select
ld hl, hUILayoutFlags
set BIT_DOUBLE_SPACED_MENU, [hl]
@@ -2886,9 +2886,9 @@ PrintMenuItem:
ld de, TypeText
call PlaceString
hlcoord 7, 11
- ld [hl], "/"
+ ld [hl], '/'
hlcoord 5, 9
- ld [hl], "/"
+ ld [hl], '/'
hlcoord 5, 11
ld de, wBattleMenuCurrentPP
lb bc, 1, 2
@@ -6841,17 +6841,17 @@ InitWildBattle:
ld [hli], a ; write front sprite pointer
ld [hl], b
ld hl, wEnemyMonNick ; set name to "GHOST"
- ld a, "G"
+ ld a, 'G'
ld [hli], a
- ld a, "H"
+ ld a, 'H'
ld [hli], a
- ld a, "O"
+ ld a, 'O'
ld [hli], a
- ld a, "S"
+ ld a, 'S'
ld [hli], a
- ld a, "T"
+ ld a, 'T'
ld [hli], a
- ld [hl], "@"
+ ld [hl], '@'
ld a, [wCurPartySpecies]
push af
ld a, MON_GHOST
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index e111f783..413c34d9 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -743,7 +743,7 @@ FellText:
PrintStatText:
ld hl, StatModTextStrings
- ld c, "@"
+ ld c, '@'
.findStatName_outer
dec b
jr z, .foundStatName
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index 374dcabc..d37d40c7 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -13,9 +13,9 @@ DisplayLinkBattleVersusTextBox:
call PlaceString
; place bold "VS" tiles between the names
hlcoord 9, 8
- ld a, "<BOLD_V>"
+ ld a, '<BOLD_V>'
ld [hli], a
- ld [hl], "<BOLD_S>"
+ ld [hl], '<BOLD_S>'
xor a
ld [wUpdateSpritesEnabled], a
callfar SetupPlayerAndEnemyPokeballs
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 66675dbf..3deebc61 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -17,7 +17,7 @@ FormatMovesString:
ld hl, wNameBuffer
.copyNameLoop
ld a, [hli]
- cp "@"
+ cp '@'
jr z, .doneCopyingName
ld [de], a
inc de
@@ -26,7 +26,7 @@ FormatMovesString:
ld a, b
ld [wNumMovesMinusOne], a
inc b
- ld a, "<NEXT>"
+ ld a, '<NEXT>'
ld [de], a
inc de
pop hl
@@ -35,19 +35,19 @@ FormatMovesString:
jr z, .done
jr .printMoveNameLoop
.printDashLoop
- ld a, "-"
+ ld a, '-'
ld [de], a
inc de
inc b
ld a, b
cp NUM_MOVES
jr z, .done
- ld a, "<NEXT>"
+ ld a, '<NEXT>'
ld [de], a
inc de
jr .printDashLoop
.done
- ld a, "@"
+ ld a, '@'
ld [de], a
ret
diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
index e7c6729c..6ebd4189 100644
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -25,7 +25,7 @@ PrintType:
; erase "TYPE2/" if the mon only has 1 type
EraseType2Text:
- ld a, " "
+ ld a, ' '
ld bc, $13
add hl, bc
ld bc, $6
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index b25d5a11..08260029 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -14,7 +14,7 @@ SaveTrainerName::
ld a, [hli]
ld [de], a
inc de
- cp "@"
+ cp '@'
jr nz, .CopyCharacter
ret