summaryrefslogtreecommitdiff
path: root/scripts/silphco10.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/silphco10.asm')
-rwxr-xr-xscripts/silphco10.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm
index 7d044aca..46630014 100755
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -13,7 +13,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f)
bit 5, [hl]
res 5, [hl]
ret z
- ld hl, DataTable_5a173 ; $6173
+ ld hl, DataTable_5a173
call SilphCo2Script_59d43
call SilphCo10Text_5a176
ld a, [wd836]
@@ -53,36 +53,36 @@ SilphCo10TrainerHeader0: ; 5a192 (16:6192)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
dw wd835 ; flag's byte
- dw SilphCo10BattleText1 ; 0x61dd TextBeforeBattle
- dw SilphCo10AfterBattleText1 ; 0x61e7 TextAfterBattle
- dw SilphCo10EndBattleText1 ; 0x61e2 TextEndBattle
- dw SilphCo10EndBattleText1 ; 0x61e2 TextEndBattle
+ dw SilphCo10BattleText1 ; TextBeforeBattle
+ dw SilphCo10AfterBattleText1 ; TextAfterBattle
+ dw SilphCo10EndBattleText1 ; TextEndBattle
+ dw SilphCo10EndBattleText1 ; TextEndBattle
SilphCo10TrainerHeader1: ; 5a19e (16:619e)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd835 ; flag's byte
- dw SilphCo10BattleText2 ; 0x61ec TextBeforeBattle
- dw SilphCo10AfterBattleText2 ; 0x61f6 TextAfterBattle
- dw SilphCo10EndBattleText2 ; 0x61f1 TextEndBattle
- dw SilphCo10EndBattleText2 ; 0x61f1 TextEndBattle
+ dw SilphCo10BattleText2 ; TextBeforeBattle
+ dw SilphCo10AfterBattleText2 ; TextAfterBattle
+ dw SilphCo10EndBattleText2 ; TextEndBattle
+ dw SilphCo10EndBattleText2 ; TextEndBattle
db $ff
SilphCo10Text1: ; 5a1ab (16:61ab)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text2: ; 5a1b5 (16:61b5)
- db $08 ; asm
+ TX_ASM
ld hl, SilphCo10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SilphCo10Text3: ; 5a1bf (16:61bf)
- db $08 ; asm
+ TX_ASM
ld a, [wd838]
bit 7, a
ld hl, SilphCo10Text_5a1d8