Commit Graph

221 Commits

Author SHA1 Message Date
YamaArashi b598914e7e alignment 2016-07-02 16:27:28 -07:00
YamaArashi b6dc11d8c0 all remaining ruby/sapphire code differences before scripts 2016-07-02 16:24:26 -07:00
YamaArashi a8af58d3bb more ruby/sapphire code differences 2016-07-02 15:33:49 -07:00
YamaArashi 272c484250 Merge pull request #21 from yenatch/master
More sapphire diffs, and no more graphics diffs.
2016-07-02 14:57:40 -07:00
yenatch 4be92ee7bb Some slot machine palettes also differ in Sapphire.
This looks like the last of the graphics diffs.
2016-07-02 17:27:28 -04:00
yenatch 5b388de8f5 The Pokemon logo is also different in Sapphire. 2016-07-02 17:02:50 -04:00
yenatch a83086a973 More Sapphire diffs. 2016-07-02 15:59:41 -04:00
YamaArashi 8f08ae6185 Merge pull request #20 from yenatch/master
Split a bunch of misc scripts and text.
2016-06-29 22:40:49 -07:00
yenatch bed5e78b43 Prevent a misleading error when .s files are missing. 2016-06-30 01:25:41 -04:00
yenatch bba3b9b53a Split a bunch of misc scripts and text. 2016-06-30 00:57:14 -04:00
YamaArashi 98e83e3599 battle animation BG table 2016-06-29 00:12:49 -07:00
YamaArashi cbf76bed9f labels for battle animation graphics 2016-06-29 00:03:53 -07:00
YamaArashi ab0e3e9aab fix misleading error when .bin files are missing 2016-06-28 22:56:48 -07:00
YamaArashi ee5baa05fd ignore .map files 2016-06-28 22:35:59 -07:00
YamaArashi 174036ebb4 Merge branch 'yenatch-master' 2016-06-28 22:34:22 -07:00
YamaArashi 8c55493c5a revert makefile change 2016-06-28 22:33:31 -07:00
yenatch e9e1b988f9 Merge remote-tracking branch 'origin/master'
Conflicts:
	data/data2.s
2016-06-28 23:46:18 -04:00
yenatch 2a4b3d91fd Ignore the generated ld_scripts. 2016-06-28 23:39:04 -04:00
yenatch 4dd89ed4f7 Create mapfiles. 2016-06-28 23:38:22 -04:00
yenatch c52657d12e Fix a makefile bug where a missing dependency would cancel out a rule. 2016-06-28 23:34:28 -04:00
yenatch 68504441f0 Accidentally included MaysHouse_{1,2}F scripts in BrendansHouse2F. 2016-06-28 23:33:36 -04:00
yenatch d6e352aff8 Remove the duplicate tileset headers, and include the real ones.
Also relabel some shared map assets.
2016-06-28 23:32:58 -04:00
YamaArashi f68fbc7b5e battle animation graphics 2016-06-28 18:57:18 -07:00
ProjectRevoTPP ded4bcc83f Dump more Gfx (#15) 2016-06-28 09:43:55 -07:00
YamaArashi 6bdb12064b Merge pull request #17 from yenatch/master
most of the incbins in data/event_scripts.s
2016-06-28 09:39:37 -07:00
yenatch b9762fbc83 Move data/maps/{text,scripts}/ to data/{text,scripts}/maps/. 2016-06-27 23:34:53 -04:00
yenatch c306d47045 More incbins in data/event_scripts.s. 2016-06-27 00:58:25 -04:00
yenatch b16d34c82e event_8a takes three args. 2016-06-27 00:55:08 -04:00
yenatch 1ccf4589f2 Dump some short scripts and unsplit some false positives.
There are groups of events/text related to several maps, instead of
just one. These fall outside of the big include block where map events
live. Some of them were erroneously matched to maps that had no other
events.
2016-06-25 23:46:36 -04:00
YamaArashi d7cc99458f Merge pull request #16 from yenatch/master
Dump the specials and std script tables.
2016-06-22 00:43:26 -07:00
yenatch 5025a7b3bb Dump the specials and std script tables.
Also split the braille text.
2016-06-22 02:44:29 -04:00
YamaArashi ff39234cf4 Merge pull request #14 from yenatch/master
Clean up map event includes and trainer text.
2016-06-19 23:57:42 -07:00
yenatch c8c8c6b4c9 Split out the trainer text. 2016-06-20 02:50:52 -04:00
yenatch 5456d06855 Clean up the event script/text includes. 2016-06-20 02:46:51 -04:00
YamaArashi 87a3e7bf06 Merge pull request #13 from yenatch/master
Version differences in event scripts.
2016-06-19 22:29:10 -07:00
yenatch c21e746b2d Merge remote-tracking branch 'origin/master'
Conflicts:
	data/data1.s
	data/maps/text/SootopolisCity.s
2016-06-20 01:06:46 -04:00
YamaArashi 422215e184 berry tree script label 2016-06-19 21:53:55 -07:00
YamaArashi b354442cfb delete rtc.s 2016-06-19 21:25:57 -07:00
YamaArashi b2164a155c organize scripts 2016-06-19 19:25:21 -07:00
YamaArashi f1ad91efc9 32781 to RESULT 2016-06-19 12:07:06 -07:00
YamaArashi 21a23190e5 another string 2016-06-19 11:58:17 -07:00
YamaArashi f768a38192 oops 2016-06-19 11:33:59 -07:00
YamaArashi b0193d981a dump many more strings 2016-06-19 11:29:32 -07:00
YamaArashi 437ddcb23c dump mamy script strings 2016-06-19 10:48:31 -07:00
YamaArashi bad704bfa6 test messages 2016-06-19 10:25:09 -07:00
yenatch 13e93ecbb4 Some version differences in scripts and text. 2016-06-19 05:23:10 -04:00
yenatch fdae8235cc Another makefile typo. 2016-06-19 04:59:28 -04:00
yenatch 7dbe20fda2 Forgot to add the version to the filename of intermediate files. 2016-06-19 03:56:16 -04:00
YamaArashi f1375c6169 use sed again 2016-06-18 23:50:35 -07:00
YamaArashi 09467843cf fuck sed 2016-06-18 23:18:32 -07:00