1500 Commits

Author	SHA1	Message	Date
DizzyEggg	470df386c9	Fix conflicts	2018-12-07 23:01:14 +01:00
Melody	2347e36d60	document pokédex options	2018-12-05 10:10:33 -05:00
DizzyEggg	0d122bc831	Fix merge conflicts	2018-12-03 17:56:36 +01:00
Diegoisawesome	ffa8655f4c	Merge pull request #423 from Slawter666/pokedex-doc ... Document some of pokedex.c	2018-12-03 10:53:21 -06:00
DizzyEggg	dcb1d78fa9	Add battle controllers var to src from sym_ewram	2018-12-03 16:20:39 +01:00
Slawter666	715fbb379e	Document some of pokedex.c	2018-12-03 14:58:25 +00:00
DizzyEggg	a83fc52a7e	Make data easier to edit	2018-12-03 14:49:16 +01:00
Melody	0e5e487b78	tweak alignment	2018-12-03 08:04:11 -05:00
Melody	2779421ad4	fix brendan/may/wally consistency issues	2018-12-03 08:01:52 -05:00
DizzyEggg	b9e711bbf4	Add Powder	2018-12-03 12:50:32 +01:00
Melody	52fa5137c9	tweak alignment	2018-12-03 00:31:15 -05:00
Melody	eeb6446da4	add more consistent names	2018-12-02 22:36:09 -05:00
DizzyEggg	52d1e69591	Add AI support for newly added moves	2018-12-02 23:50:51 +01:00
DizzyEggg	ad67f4f26f	Merge with master and REQ arguments	2018-12-02 22:05:23 +01:00
Melody	10725def8e	trainerbattle_normal → trainerbattle_single ... * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little	2018-12-02 15:08:19 -05:00
Melody	bad5323642	cleans up trainer battle scripts ... * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro	2018-12-02 15:08:19 -05:00
DizzyEggg	9828e0e97b	Merge with master	2018-12-02 19:38:05 +01:00
Diegoisawesome	ee05197eba	Merge pull request #418 from DizzyEggg/link_rfu ... Finish Link rfu	2018-12-02 12:29:31 -06:00
DizzyEggg	b87e6a4e57	Get rid of static functions in includes	2018-12-02 18:58:33 +01:00
DizzyEggg	d46c3ebe5b	Fix Future Sight	2018-12-02 18:47:39 +01:00
DizzyEggg	8f8e6fb88b	Merge branch 'master' into battle_engine_v2	2018-12-02 16:59:38 +01:00
DizzyEggg	d137ebc7a9	Some more rom 8011dc0 work	2018-12-02 13:59:55 +01:00
DizzyEggg	e17140536a	finish link rfu and fix rom 8011dc0	2018-12-02 11:58:50 +01:00
Melody	b9cf4f27b5	renames the winstrate graphics names to pokefan	2018-12-02 00:47:04 -05:00
DizzyEggg	b082f000af	Start working on link rfu	2018-12-01 18:54:59 +01:00
DizzyEggg	6ae949e360	Psychic Terrain blocks priority moves	2018-12-01 11:35:49 +01:00
DizzyEggg	3be070f0c3	Fix string overflowing issue	2018-12-01 11:12:31 +01:00
DizzyEggg	3934eac8d4	Merge branch 'master' into battle_engine_v2	2018-12-01 10:28:11 +01:00
Marcus Huderle	0e32a3adf3	Decompile normal.c (#414)	2018-11-30 17:29:55 -06:00
DizzyEggg	1a8859b1d8	Add Dazzling	2018-11-30 22:12:18 +01:00
DizzyEggg	0329175f06	Add Protean	2018-11-30 21:21:43 +01:00
DizzyEggg	7fa55704b2	merge with master	2018-11-30 20:46:09 +01:00
Marcus Huderle	9dd7f8f214	Decompile pokedex_area_screen.c (#412)	2018-11-30 10:41:03 -06:00
Marcus Huderle	0148e38973	Decompile pokedex_cry_screen.c (#406)	2018-11-28 10:14:32 -06:00
Marcus Huderle	9fafa63743	Finish decompiling internation_string_util.c	2018-11-27 17:21:23 -06:00
DizzyEggg	7cfe0342f0	Finish frontier data	2018-11-27 22:45:50 +01:00
garak	73cce79753	Merge remote-tracking branch 'upstream/master' into frontier-data	2018-11-27 11:35:19 -05:00
garak	091b5194e7	frontier pike and pyramid data	2018-11-27 11:21:48 -05:00
nullableVoidPtr	556bdd52e1	Clean up aligned variables in src/	2018-11-27 19:37:29 +08:00
Slawter666	deb7adbad5	Convert pokédex data to C	2018-11-27 04:00:38 +00:00
Marcus Huderle	382ff45452	Merge pull request #396 from DizzyEggg/attempt ... Match some functions	2018-11-26 16:58:19 -06:00
Marcus Huderle	2425a14b19	Decompile fight.c	2018-11-26 10:25:51 -06:00
Marcus Huderle	35c0fb5154	Decompile ground.c	2018-11-26 09:55:31 -06:00
Marcus Huderle	839c629d5b	Decompile dragon.c	2018-11-26 09:31:03 -06:00
Marcus Huderle	2c2431aa4c	Decopmile bug.c (#399)	2018-11-26 09:03:50 -06:00
Marcus Huderle	5947e0d229	Decompile rock	2018-11-25 17:00:18 -06:00
Marcus Huderle	19e235867a	Merge pull request #395 from Slawter666/battle-ui-doc ... Document some battle ui	2018-11-25 15:58:37 -06:00
Marcus Huderle	fb6120da5b	Fixup some names	2018-11-25 15:50:54 -06:00
Marcus Huderle	256bfc3caa	Decompile script_pokemon_util_80F87D8	2018-11-25 15:32:22 -06:00
DizzyEggg	8e10d7c0e5	Match some functions	2018-11-25 20:16:41 +01:00