3321 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
garak	269aebaca7	update createsprite macro and rename BANK to BATTLER	2018-11-13 15:35:46 -05:00
Slawter666	1d46507110	Move field effects enum to defines	2018-11-13 14:19:04 +00:00
Diegoisawesome	f639c7c309	Merge pull request #380 from DizzyEggg/frontier_2 ... More battle frontier	2018-11-12 14:05:40 -06:00
DizzyEggg	b5ea69cf74	Fix conflicts	2018-11-12 19:22:23 +01:00
Diegoisawesome	54ad6794bc	Merge pull request #361 from Slawter666/synchronise ... Synchronise with pokeruby	2018-11-12 11:37:18 -06:00
DizzyEggg	734403fdfa	Merge branch 'master' into frontier_2	2018-11-12 15:42:44 +01:00
DizzyEggg	69683f9572	Decompile Battle Palace	2018-11-12 15:41:19 +01:00
Slawter666	1b895ff52c	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-11-12 14:14:50 +00:00
Slawter666	be33878b94	Synchronise wallclock.c	2018-11-12 14:04:32 +00:00
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	3b3cffac44	Decompile battle pike	2018-11-12 14:07:31 +01:00
DizzyEggg	4fb463377c	Start battle pike	2018-11-12 00:46:02 +01:00
DizzyEggg	a4235c9ff8	Document battle arena	2018-11-11 18:33:16 +01:00
DizzyEggg	81410fee17	Factory done	2018-11-11 16:44:27 +01:00
DizzyEggg	1437755cdd	Start arena	2018-11-07 22:54:42 +01:00
Diegoisawesome	65f053fd89	Thanks Egg	2018-11-07 14:48:06 -06:00
Diegoisawesome	a052e45f27	Merge pull request #379 from DizzyEggg/derp ... ScriptMenu_MultichoiceGrid	2018-11-07 14:41:29 -06:00
DizzyEggg	01fdb01364	Diego pls	2018-11-07 21:09:54 +01:00
Diegoisawesome	7ab8ff0d81	Merge branch 'master' of github.com:pret/pokeemerald	2018-11-07 12:35:49 -06:00
Diegoisawesome	9f50ba1ce3	Fix incorrect compressed types, part 2	2018-11-07 12:35:31 -06:00
Diegoisawesome	1507a290d5	Merge pull request #378 from Diegoisawesome/script_menu ... [WIP] Decompile/port script_menu	2018-11-06 20:24:04 -06:00
Diegoisawesome	18839a4872	Merge remote-tracking branch 'pret/master' into script_menu	2018-11-06 20:20:56 -06:00
Diegoisawesome	054a015c95	Finish decompiling/porting script_menu	2018-11-06 20:13:40 -06:00
Slawter666	15117a8d09	Remove redundancy in berry.c	2018-11-06 23:15:57 +00:00
Diegoisawesome	93ff71fcfd	Merge pull request #377 from DizzyEggg/render_text ... Match Render text and attempt to clean up	2018-11-06 11:44:14 -06:00
Diegoisawesome	9afe7a896e	Merge remote-tracking branch 'pret/master' into render_text	2018-11-06 11:40:17 -06:00
Diegoisawesome	43a8534fce	Merge remote-tracking branch 'origin/master' into render_text	2018-11-06 11:33:21 -06:00
Diegoisawesome	f8d337e491	Finish cleaning up text.c	2018-11-06 11:30:21 -06:00
Diegoisawesome	6d38431c33	Begin cleaning text.c	2018-11-06 10:44:48 -06:00
Diegoisawesome	ccc5d27fcb	Merge pull request #376 from DizzyEggg/battle_frontier_2 ... Decompile part of battle_frontier_2	2018-11-06 10:06:21 -06:00
DizzyEggg	258ec3162f	frontier util review changes	2018-11-05 22:13:59 +01:00
Diegoisawesome	7dd4ed7060	r5/r6 swap on sub_80E2578	2018-11-05 14:45:54 -06:00
DizzyEggg	487a6c2b2c	this file is	2018-11-05 21:42:12 +01:00
DizzyEggg	6d0d69f3a5	Match Render Text	2018-11-04 23:09:10 +01:00
Slawter666	bd766b9049	Minor labelling of field effects	2018-11-03 20:20:28 +00:00
DizzyEggg	3159e958b8	Match a record mixing function	2018-11-03 18:21:33 +01:00
DizzyEggg	0bb51037d7	Finish frontier util	2018-11-01 21:31:10 +01:00
DizzyEggg	37d742cbd8	Document recorded battle	2018-11-01 15:06:50 +01:00
Diegoisawesome	645830624d	Continue script_menu.c	2018-10-31 23:03:41 -05:00
DizzyEggg	7de1c4bd14	Make frontier util compile	2018-10-30 22:17:03 +01:00
DizzyEggg	90ef269426	Merge branch 'master' into battle_frontier_2	2018-10-30 21:48:18 +01:00
DizzyEggg	0da7d7e6ae	why is this function so hard to match	2018-10-30 21:45:26 +01:00
Diegoisawesome	9adbb5d871	Merge pull request #375 from garakmon/animation-test-temp ... Back animation names	2018-10-30 12:00:37 -05:00
Diegoisawesome	2837859bdb	Merge pull request #373 from garakmon/battle-anim ... Split battle_anim_80FE840 and move data to C	2018-10-30 11:53:05 -05:00
garak	678156ff0e	remove linker script extra	2018-10-30 12:43:13 -04:00
garak	3cb7a33f42	label back animations	2018-10-30 12:37:53 -04:00
Diegoisawesome	c8ef69a00d	Merge pull request #372 from garakmon/sprite-tags ... Synchronize sprite tags	2018-10-30 11:26:44 -05:00
Diegoisawesome	f3af20d3cf	Merge pull request #370 from DizzyEggg/battle_tower ... Decompile Battle Tower	2018-10-30 11:18:24 -05:00
DizzyEggg	3a9eeef844	Frontier, finish ranking hall	2018-10-28 21:11:53 +01:00
Diegoisawesome	b1b97c1da9	Merge pull request #374 from DizzyEggg/win_name ... Rename struct Window' priority field to bg	2018-10-27 19:55:44 -05:00