summaryrefslogtreecommitdiff
path: root/scripts/PowerPlant.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /scripts/PowerPlant.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/PowerPlant.asm')
-rwxr-xr-xscripts/PowerPlant.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm
index f720b6f8..c5c0e0e9 100755
--- a/scripts/PowerPlant.asm
+++ b/scripts/PowerPlant.asm
@@ -118,57 +118,57 @@ InitVoltorbBattle:
jp TextScriptEnd
Voltorb0Text:
- TX_ASM
+ text_asm
ld hl, Voltorb0TrainerHeader
jr InitVoltorbBattle
Voltorb1Text:
- TX_ASM
+ text_asm
ld hl, Voltorb1TrainerHeader
jr InitVoltorbBattle
Voltorb2Text:
- TX_ASM
+ text_asm
ld hl, Voltorb2TrainerHeader
jr InitVoltorbBattle
Voltorb3Text:
- TX_ASM
+ text_asm
ld hl, Voltorb3TrainerHeader
jr InitVoltorbBattle
Voltorb4Text:
- TX_ASM
+ text_asm
ld hl, Voltorb4TrainerHeader
jr InitVoltorbBattle
Voltorb5Text:
- TX_ASM
+ text_asm
ld hl, Voltorb5TrainerHeader
jr InitVoltorbBattle
Voltorb6Text:
- TX_ASM
+ text_asm
ld hl, Voltorb6TrainerHeader
jr InitVoltorbBattle
Voltorb7Text:
- TX_ASM
+ text_asm
ld hl, Voltorb7TrainerHeader
jr InitVoltorbBattle
ZapdosText:
- TX_ASM
+ text_asm
ld hl, ZapdosTrainerHeader
jr InitVoltorbBattle
VoltorbBattleText:
- TX_FAR _VoltorbBattleText
- db "@"
+ text_far _VoltorbBattleText
+ text_end
ZapdosBattleText:
- TX_FAR _ZapdosBattleText
- TX_ASM
+ text_far _ZapdosBattleText
+ text_asm
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish