yenatch e9e1b988f9 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	data/data2.s

2016-06-28 23:46:18 -04:00

..

battle_tower

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

experience_tables

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

graphics

sprite.c and updated preproc

2016-05-21 10:35:53 -07:00

maps

Remove the duplicate tileset headers, and include the real ones.

2016-06-28 23:32:58 -04:00

scripts/maps

Accidentally included MaysHouse_{1,2}F scripts in BrendansHouse2F.

2016-06-28 23:33:36 -04:00

text

Move data/maps/{text,scripts}/ to data/{text,scripts}/maps/.

2016-06-27 23:34:53 -04:00

tilesets

Dump the maps.

2016-06-16 16:11:29 -04:00

base_stats.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

battle_moves.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

berries.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

contest_effect_funcs.s

contest effect functions

2016-05-30 21:43:45 -07:00

contest_effects.s

contest effects

2016-05-30 20:52:30 -07:00

contest_moves.s

contest moves

2016-05-30 20:36:39 -07:00

contest_opponents.s

Dump most of the text from data2 (#4)

2016-05-30 11:54:21 -07:00

cry_id_table.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

data1.s

organize scripts

2016-06-19 19:25:21 -07:00

data2.s

Merge remote-tracking branch 'origin/master'

2016-06-28 23:46:18 -04:00

egg_moves.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

event_scripts.s

Accidentally included MaysHouse_{1,2}F scripts in BrendansHouse2F.

2016-06-28 23:33:36 -04:00

evolution_table.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

field_effect_scripts.s

organize scripts

2016-06-19 19:25:21 -07:00

field_move_scripts.s

organize scripts

2016-06-19 19:25:21 -07:00

graphics.s

battle animation graphics

2016-06-28 18:57:18 -07:00

item_ball_scripts.s

More incbins in data/event_scripts.s.

2016-06-27 00:58:25 -04:00

item_effects.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

items.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

level_up_learnset_pointers.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

level_up_learnsets.s

Initial commit

2016-01-23 12:25:42 -08:00

nature_stat_table.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

pokedex_entries.s

pokedex data

2016-05-17 04:43:13 -07:00

pokedex_order.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

region_map_locations.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

script_cmd_table.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

sound_data.s

Dump all pure pointer tables and label them (#6)

2016-06-05 17:52:38 -07:00

specials.s

Dump the specials and std script tables.

2016-06-22 02:44:29 -04:00

spinda_spot_graphics.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

tm_hm_learnsets.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

trainer_class_index_tables.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

trainer_parties.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

trainers.s

Prepare for switch to standard gas (with preprocessor)

2016-04-21 23:06:36 -07:00

wild_mons.s

Add macros for maps and scripts.

2016-06-15 16:38:19 -04:00