camthesaxman e2ab2e50a0 fix merge conflicts

2017-07-17 20:15:15 -05:00

..

battle_tower

Add include data from German release

2017-06-23 21:52:36 +02:00

maps

Add German graphics

2017-04-30 14:09:33 +02:00

text

Merge pull request #358 from marijnvdwerf/sapphire

2017-07-17 19:52:52 -04:00

tilesets

Add German graphics

2017-04-30 14:09:33 +02:00

bard_music.inc

Add include data from German release

2017-06-23 21:52:36 +02:00

contest_opponents.inc

Add include data from German release

2017-06-23 21:52:36 +02:00

event_scripts.s

Add data files from German release

2017-06-23 21:52:37 +02:00

field_move_scripts.inc

Add include data from German release

2017-06-23 21:52:36 +02:00

ingame_trades.inc

Add include data from German release

2017-06-23 21:52:36 +02:00

menu_cursor.s

Build German Sapphire (1.0)

2017-07-09 13:54:21 +02:00

mystery_event_msg.s

Add data files from German release

2017-06-23 21:52:37 +02:00

strings2.s

Add data files from German release

2017-06-23 21:52:37 +02:00

trainers.inc

Add include data from German release

2017-06-23 21:52:36 +02:00