DizzyEggg 180aa839c4 Fix conflicts

2018-12-09 13:12:02 +01:00

..

base_stats.h

Fix conflicts

2018-12-07 23:01:14 +01:00

cry_ids.h

Clean more tables

2018-12-08 14:10:30 +08:00

egg_moves.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

evolution.h

Fix conflicts

2018-12-07 23:01:14 +01:00

experience_tables.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

item_effects.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

level_up_learnset_pointers.h

Fix conflicts

2018-12-07 23:01:14 +01:00

level_up_learnsets.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

pokedex_entries.h

Make data easier to edit

2018-12-03 14:49:16 +01:00

pokedex_orders.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

pokedex_text.h

Use normal apostrophes like adults

2018-12-07 10:41:08 -05:00

tmhm_learnsets.h

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

trainer_class_lookups.h

Fix merge conflicts

2018-12-03 17:56:36 +01:00