summaryrefslogtreecommitdiff
path: root/scripts/viridianforest.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/viridianforest.asm')
-rwxr-xr-xscripts/viridianforest.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm
index 4ec1c0aa..124d3184 100755
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -33,28 +33,28 @@ ViridianForestTrainerHeader0: ; 61142 (18:5142)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd7f3 ; flag's byte
- dw ViridianForestBattleText1 ; 0x518a TextBeforeBattle
- dw ViridianForestAfterBattleText1 ; 0x5194 TextAfterBattle
- dw ViridianForestEndBattleText1 ; 0x518f TextEndBattle
- dw ViridianForestEndBattleText1 ; 0x518f TextEndBattle
+ dw ViridianForestBattleText1 ; TextBeforeBattle
+ dw ViridianForestAfterBattleText1 ; TextAfterBattle
+ dw ViridianForestEndBattleText1 ; TextEndBattle
+ dw ViridianForestEndBattleText1 ; TextEndBattle
ViridianForestTrainerHeader1: ; 6114e (18:514e)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd7f3 ; flag's byte
- dw ViridianForestBattleText2 ; 0x5199 TextBeforeBattle
- dw ViridianForestAfterBattleText2 ; 0x51a3 TextAfterBattle
- dw ViridianForestEndBattleText2 ; 0x519e TextEndBattle
- dw ViridianForestEndBattleText2 ; 0x519e TextEndBattle
+ dw ViridianForestBattleText2 ; TextBeforeBattle
+ dw ViridianForestAfterBattleText2 ; TextAfterBattle
+ dw ViridianForestEndBattleText2 ; TextEndBattle
+ dw ViridianForestEndBattleText2 ; TextEndBattle
ViridianForestTrainerHeader2: ; 6115a (18:515a)
db $4 ; flag's bit
db ($1 << 4) ; trainer's view range
dw wd7f3 ; flag's byte
- dw ViridianForestBattleText3 ; 0x51a8 TextBeforeBattle
- dw ViridianForestAfterBattleText3 ; 0x51b2 TextAfterBattle
- dw ViridianForestEndBattleText3 ; 0x51ad TextEndBattle
- dw ViridianForestEndBattleText3 ; 0x51ad TextEndBattle
+ dw ViridianForestBattleText3 ; TextBeforeBattle
+ dw ViridianForestAfterBattleText3 ; TextAfterBattle
+ dw ViridianForestEndBattleText3 ; TextEndBattle
+ dw ViridianForestEndBattleText3 ; TextEndBattle
db $ff
@@ -63,19 +63,19 @@ ViridianForestText1: ; 61167 (18:5167)
db "@"
ViridianForestText2: ; 6116c (18:516c)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
ViridianForestText3: ; 61176 (18:5176)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
ViridianForestText4: ; 61180 (18:5180)
- db $08 ; asm
+ TX_ASM
ld hl, ViridianForestTrainerHeader2
call TalkToTrainer
jp TextScriptEnd