diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-17 12:36:14 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-17 12:36:14 -0400 |
| commit | 704c854ece3eb459d373c57e7f3cee524bd1eac5 (patch) | |
| tree | c6c53c3cb892d1dd86b4b8d95aa492a87943f352 /main.asm | |
| parent | More home.asm documentation. (diff) | |
| parent | More home.asm documentation. (diff) | |
| download | pokeyellow-704c854ece3eb459d373c57e7f3cee524bd1eac5.tar.gz pokeyellow-704c854ece3eb459d373c57e7f3cee524bd1eac5.tar.xz pokeyellow-704c854ece3eb459d373c57e7f3cee524bd1eac5.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
home.asm
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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" |