d357394a7a
Merge branch 'master' into fix_file_modes
2018-01-14 17:25:07 -05:00
e79b3ce9ff
Fix file modes
2018-01-14 17:24:28 -05:00
58b71865c9
improve TM/HM constants and add macro for TM/HM learnsets
2018-01-14 13:41:50 -06:00
d34de50d34
Use descriptive name for the BLACK GLASSES hidden item flag
2017-12-27 09:23:30 -06:00
0eb231352a
Fully enumerate secret base constants
2017-12-26 22:24:06 -06:00
82230589d1
Add bg_secret_base_event macro, and define secret base id constants
2017-12-26 16:08:40 -06:00
80cddf0cd4
Add bg_hidden_item_event macro, and define hidden item flags
2017-12-26 16:08:40 -06:00
6000e19e94
Add coord_weather_event macro, and define COORD_EVENT_WEATHER_* constants
2017-12-26 16:08:39 -06:00
51247c3eb9
Name and use general purpose vars
2017-12-24 10:14:53 -06:00
2379a5b6eb
Name and use dynamic object gfx ids
2017-12-24 10:14:53 -06:00
4b5ad9de04
Name and use temp var constants
2017-12-24 10:13:52 -06:00
0a634a60c9
Label item flags
2017-12-15 13:25:19 -08:00
03c75cfd9c
Finish all regular hide-show flags
2017-12-15 10:49:58 -08:00
8d346b1bab
A few more flags
2017-12-14 20:10:36 -08:00
58bf5392b3
Label flags up to 973
2017-12-10 15:41:21 -08:00
65207e0366
Label all flags up to 901
2017-12-09 14:43:21 -08:00
8dd25bcad0
Start using constants for hide-show flags
2017-12-04 20:48:25 -08:00
861bd9292d
Use decoration flag constants
2017-12-03 16:44:29 -08:00
d1b967444e
Label flags up to flag 99.
2017-12-02 12:39:11 -08:00
82f8159152
Flag for buggy rock smash rock
2017-11-28 21:07:04 -08:00
4d93db09a3
Use constants for temporary map flags
2017-11-28 20:36:12 -08:00
2fea5bf7d8
convert data files to use constants/map.h
2017-11-27 22:12:09 -06:00
0d56f7654f
fix build
2017-11-27 21:17:36 -06:00
5e97fb8326
fix Route124 concatenation in map_events.s
2017-11-15 23:40:46 -05:00
270bd98d41
more labeling
2017-09-13 00:03:22 -05:00
3d4c2f73cb
FILE MODES BrokeBack
2017-06-14 22:54:42 -04:00
e919f9e0f9
rename extension of included .s files to .inc
2017-05-04 23:17:32 -05:00
d9e59a388c
included .s to .inc
2016-10-28 15:41:15 -07:00
0c7d1385e8
Add BGM_ROUTE_118.
2016-10-28 15:35:27 -04:00
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
1fda6f0f4b
remove zeros from connection macros
2016-10-01 09:08:16 -07:00
8de743b6ac
Split out groups of includes related to maps.
2016-09-09 01:14:32 -04:00
ad15d310b2
More gfx/pal and data2 work ( #27 )
2016-08-03 22:13:38 -07:00
86b7c74269
remove empty lines at eof
2016-07-05 01:43:01 -07:00
4623aa30a9
add unreferenced, empty Sootopolis map connections
2016-07-04 13:00:29 -07:00
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
b9762fbc83
Move data/maps/{text,scripts}/ to data/{text,scripts}/maps/.
2016-06-27 23:34:53 -04:00
c306d47045
More incbins in data/event_scripts.s.
2016-06-27 00:58:25 -04:00
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
5456d06855
Clean up the event script/text includes.
2016-06-20 02:46:51 -04:00
c21e746b2d
Merge remote-tracking branch 'origin/master'
...
Conflicts:
data/data1.s
data/maps/text/SootopolisCity.s
2016-06-20 01:06:46 -04:00
422215e184
berry tree script label
2016-06-19 21:53:55 -07:00
b2164a155c
organize scripts
2016-06-19 19:25:21 -07:00
f1ad91efc9
32781 to RESULT
2016-06-19 12:07:06 -07:00
b0193d981a
dump many more strings
2016-06-19 11:29:32 -07:00
437ddcb23c
dump mamy script strings
2016-06-19 10:48:31 -07:00
13e93ecbb4
Some version differences in scripts and text.
2016-06-19 05:23:10 -04:00
1c57bf698b
some Sapphire script differences
2016-06-17 20:56:57 -07:00
8de49d722c
Dump the maps.
2016-06-16 16:11:29 -04:00
PikalaxALT