aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/core.asm12
-rw-r--r--engine/battle/link_battle_versus_text.asm4
-rw-r--r--engine/pokemon/status_ailments.asm30
3 files changed, 7 insertions, 39 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 0916176c..672bd416 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6841,17 +6841,7 @@ InitWildBattle:
ld [hli], a ; write front sprite pointer
ld [hl], b
ld hl, wEnemyMonNick ; set name to "GHOST"
- ld a, 'G'
- ld [hli], a
- ld a, 'H'
- ld [hli], a
- ld a, 'O'
- ld [hli], a
- ld a, 'S'
- ld [hli], a
- ld a, 'T'
- ld [hli], a
- ld [hl], '@'
+ ld_hli_a_string "GHOST@"
ld a, [wCurPartySpecies]
push af
ld a, MON_GHOST
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index d37d40c7..89201f4a 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -13,9 +13,7 @@ DisplayLinkBattleVersusTextBox:
call PlaceString
; place bold "VS" tiles between the names
hlcoord 9, 8
- ld a, '<BOLD_V>'
- ld [hli], a
- ld [hl], '<BOLD_S>'
+ ld_hli_a_string "<BOLD_V><BOLD_S>"
xor a
ld [wUpdateSpritesEnabled], a
callfar SetupPlayerAndEnemyPokeballs
diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm
index 2c5b3bcd..3cc2d490 100644
--- a/engine/pokemon/status_ailments.asm
+++ b/engine/pokemon/status_ailments.asm
@@ -10,37 +10,17 @@ PrintStatusAilment::
jr nz, .par
and SLP_MASK
ret z
- ld a, 'S'
- ld [hli], a
- ld a, 'L'
- ld [hli], a
- ld [hl], 'P'
+ ld_hli_a_string "SLP"
ret
.psn
- ld a, 'P'
- ld [hli], a
- ld a, 'S'
- ld [hli], a
- ld [hl], 'N'
+ ld_hli_a_string "PSN"
ret
.brn
- ld a, 'B'
- ld [hli], a
- ld a, 'R'
- ld [hli], a
- ld [hl], 'N'
+ ld_hli_a_string "BRN"
ret
.frz
- ld a, 'F'
- ld [hli], a
- ld a, 'R'
- ld [hli], a
- ld [hl], 'Z'
+ ld_hli_a_string "FRZ"
ret
.par
- ld a, 'P'
- ld [hli], a
- ld a, 'A'
- ld [hli], a
- ld [hl], 'R'
+ ld_hli_a_string "PAR"
ret