summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-22 22:09:55 -0700
committeryenatch <yenatch@gmail.com>2014-07-22 22:09:55 -0700
commitb211cac35acd8e6e341a52febfb45ff77e16c119 (patch)
treef2ae9046eb67c0f944fb23d23d2c9ecefa34ec60 /main.asm
parent29d92fe79c5fd1051672798e5390fe12179a9cc5 (diff)
Separate phone scripts from std scripts.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm37
1 files changed, 1 insertions, 36 deletions
diff --git a/main.asm b/main.asm
index 8830f3b8d..a4f6a400f 100644
--- a/main.asm
+++ b/main.asm
@@ -89194,42 +89194,7 @@ SECTION "bank2F", ROMX, BANK[$2F]
INCLUDE "engine/std_scripts.asm"
-INCBIN "baserom.gbc",$bd0d0,$be66a - $bd0d0
-
-UnknownScript_0xbe66a:: ; 0xbe66a
- faceplayer
- trainerstatus $2
- iftrue UnknownScript_0xbe698
- loadtrainerdata
- playrammusic
- 2jump UnknownScript_0xbe68a
-; 0xbe675
-
-UnknownScript_0xbe675:: ; 0xbe675
- loadtrainerdata
- playrammusic
- showemote $0, $fe, 30
- 3callasm Function831e
- applymovement2 $d007
- writepersonxy $fe
- faceperson $0, $fe
- 2jump UnknownScript_0xbe68a
-; 0xbe68a
-
-UnknownScript_0xbe68a: ; 0xbe68a
- loadfont
- trainertext $0
- closetext
- loadmovesprites
- loadtrainerdata
- startbattle
- returnafterbattle
- trainerstatus $1
- loadvar $d04d, $ff
-
-UnknownScript_0xbe698:
- scripttalkafter
-; 0xbe699
+INCLUDE "engine/phone_scripts.asm"
SECTION "bank30", ROMX, BANK[$30]