Commit Graph

7 Commits

Author SHA1 Message Date
yenatch
cc3da4cdc0 Merge pull request #358 from marijnvdwerf/sapphire
Build German Sapphire (1.0)
2017-07-17 19:52:52 -04:00
Marijn van der Werf
c6e9dd8a2a Build German Sapphire (1.0) 2017-07-09 13:54:21 +02:00
camthesaxman
1813939fa9 delete sub_80EB3FC from asm-de/easy_chat.s 2017-07-08 19:10:53 -05:00
yenatch
2cae14cf5a Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
	asm/battle_anim_8137220.s
	asm-de/battle_message.s
2017-06-25 00:26:50 -04:00
Marijn van der Werf
2b0e563282 update battle_message 2017-06-25 03:41:38 +02:00
Marijn van der Werf
677e197786 battle_message 2017-06-25 03:24:02 +02:00
Marijn van der Werf
68206d17de add alternative asm 2017-06-25 03:17:17 +02:00