summaryrefslogtreecommitdiff
path: root/scripts/unknowndungeon3.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
commitec4c53559379f3bf7bd332905ba144e1d998f38b (patch)
treef8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/unknowndungeon3.asm
parentc43c338a5f7d90494b7e6e67c6533288bd28117d (diff)
parent5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff)
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/unknowndungeon3.asm')
-rwxr-xr-xscripts/unknowndungeon3.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm
index d2078916..055c9d0f 100755
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -22,22 +22,22 @@ UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
dw wd85f ; flag's byte
- dw UnknownDungeon3MewtwoText ; 0x5f26 TextBeforeBattle
- dw UnknownDungeon3MewtwoText ; 0x5f26 TextAfterBattle
- dw UnknownDungeon3MewtwoText ; 0x5f26 TextEndBattle
- dw UnknownDungeon3MewtwoText ; 0x5f26 TextEndBattle
+ dw UnknownDungeon3MewtwoText ; TextBeforeBattle
+ dw UnknownDungeon3MewtwoText ; TextAfterBattle
+ dw UnknownDungeon3MewtwoText ; TextEndBattle
+ dw UnknownDungeon3MewtwoText ; TextEndBattle
db $ff
UnknownDungeon3Text1: ; 45f1c (11:5f1c)
- db $08 ; asm
+ TX_ASM
ld hl, UnknownDungeon3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
UnknownDungeon3MewtwoText: ; 45f26 (11:5f26)
TX_FAR _UnknownDungeon3MewtwoText
- db $8
+ TX_ASM
ld a, MEWTWO
call PlayCry
call WaitForSoundToFinish