Commit Graph

22 Commits

Author SHA1 Message Date
YamaArashi d9e59a388c included .s to .inc 2016-10-28 15:41:15 -07:00
yenatch 0c7d1385e8 Add BGM_ROUTE_118. 2016-10-28 15:35:27 -04:00
ProjectRevoTPP 38d28d2c91 Label battle AI script and update map BGM constants (#59)
* purge text label redundancy in data2

* revo you dummy dont commit experimental changes like that

* Map header music constants

* Declare CoordEvent and BgEvent structs

* start labeling AI labels

* more labels

* even more AI labels

* finish labeling battle AI

* change flee2 to watch

* egg nickname

* oops
2016-10-16 11:44:26 -07:00
YamaArashi 1fda6f0f4b remove zeros from connection macros 2016-10-01 09:08:16 -07:00
yenatch 8de743b6ac Split out groups of includes related to maps. 2016-09-09 01:14:32 -04:00
ProjectRevoTPP ad15d310b2 More gfx/pal and data2 work (#27) 2016-08-03 22:13:38 -07:00
YamaArashi 86b7c74269 remove empty lines at eof 2016-07-05 01:43:01 -07:00
YamaArashi 4623aa30a9 add unreferenced, empty Sootopolis map connections 2016-07-04 13:00:29 -07: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
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 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
yenatch 5456d06855 Clean up the event script/text includes. 2016-06-20 02:46:51 -04: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 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 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
yenatch 13e93ecbb4 Some version differences in scripts and text. 2016-06-19 05:23:10 -04:00
YamaArashi 1c57bf698b some Sapphire script differences 2016-06-17 20:56:57 -07:00
yenatch 8de49d722c Dump the maps. 2016-06-16 16:11:29 -04:00