summaryrefslogtreecommitdiff
path: root/scripts/mtmoon1.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
commit3330662296eabb6b3b7f0eed1c79003c8873c712 (patch)
treedae9a2f40425a236a3ef6ecce453cf16b4359c26 /scripts/mtmoon1.asm
parent5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff)
parentd00b70b33ee909ad163f2cb1c639ce799db118d0 (diff)
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'scripts/mtmoon1.asm')
-rwxr-xr-xscripts/mtmoon1.asm19
1 files changed, 7 insertions, 12 deletions
diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm
index 4a5eeae3..a649481c 100755
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@@ -97,42 +97,37 @@ MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
MtMoon1Text1: ; 49a52 (12:5a52)
TX_ASM
ld hl, MtMoon1TrainerHeader0
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text2: ; 49a5c (12:5a5c)
TX_ASM
ld hl, MtMoon1TrainerHeader2
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text3: ; 49a66 (12:5a66)
TX_ASM
ld hl, MtMoon1TrainerHeader3
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text4: ; 49a70 (12:5a70)
TX_ASM
ld hl, MtMoon1TrainerHeader4
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text5: ; 49a7a (12:5a7a)
TX_ASM
ld hl, MtMoon1TrainerHeader5
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text6: ; 49a84 (12:5a84)
TX_ASM
ld hl, MtMoon1TrainerHeader6
- call TalkToTrainer
- jp TextScriptEnd
+ jr MtMoon1TalkToTrainer
MtMoon1Text7: ; 49a8e (12:5a8e)
TX_ASM
ld hl, MtMoon1TrainerHeader7
+MtMoon1TalkToTrainer:
call TalkToTrainer
jp TextScriptEnd