summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-06-17 12:36:14 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-06-17 12:36:14 -0400
commit704c854ece3eb459d373c57e7f3cee524bd1eac5 (patch)
treec6c53c3cb892d1dd86b4b8d95aa492a87943f352 /main.asm
parentc6146b6f3343654509b1e5eb5ded6de94c34ba45 (diff)
parent89ab60c6a9c5308291a169e6cbd6ffa90e0e7101 (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: home.asm
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm1
1 files changed, 1 insertions, 0 deletions
diff --git a/main.asm b/main.asm
index cfebad5e..f1876059 100755
--- a/main.asm
+++ b/main.asm
@@ -5817,6 +5817,7 @@ LoreleiPic:: INCBIN "pic/trainer/lorelei.pic"
ChannelerPic:: INCBIN "pic/trainer/channeler.pic"
AgathaPic:: INCBIN "pic/trainer/agatha.pic"
LancePic:: INCBIN "pic/trainer/lance.pic"
+JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic"
INCLUDE "data/mapHeaders/battlecenterm.asm"
INCLUDE "scripts/battlecenterm.asm"