diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
| commit | 5ecda4d2741cc8f43a0b172aefc8299e44687832 (patch) | |
| tree | 7fbac7a8f1be0bcd6a877ea47ec73fd5dfbbc211 /engine/battle/trainer_pic_money_pointers.asm | |
| parent | Fix EOL to LF to make push requests more doable. (diff) | |
| parent | Fix a lot of bugs (diff) | |
| download | pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.gz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.xz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.zip | |
Merge git://github.com/dannye/pokeyellow into dannye-master
Conflicts:
constants/connection_constants.asm
constants/evolution_constants.asm
constants/list_constants.asm
constants/oam_constants.asm
constants/sprite_constants.asm
constants/type_constants.asm
engine/bank3d/random.asm
engine/bank3f/main.asm
home.asm
home/overworld.asm
home/serial.asm
macros.asm
main.asm
wram.asm
Diffstat (limited to 'engine/battle/trainer_pic_money_pointers.asm')
| -rwxr-xr-x[-rw-r--r--] | engine/battle/trainer_pic_money_pointers.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm index 3d32eb00..3f684db3 100644..100755 --- a/engine/battle/trainer_pic_money_pointers.asm +++ b/engine/battle/trainer_pic_money_pointers.asm @@ -140,4 +140,4 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914) money 9900 dw LancePic - money 9900
\ No newline at end of file + money 9900 |