2217 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yenatch	bd4a6520ea	Merge pull request #355 from yenatch/fix-warnings ... Fix uncaught cpp warnings	2017-07-06 22:25:16 -04:00
yenatch	8f1190efd6	Error on tool warnings	2017-07-06 22:20:50 -04:00
yenatch	3e6d1757d0	Fix gbagfx warning	2017-07-06 22:12:34 -04:00
yenatch	5db79b8ff4	Error on cpp warnings	2017-07-06 22:12:16 -04:00
yenatch	a661bbf4ea	Fix battle_anim_80A7E7C warnings ... Use TASK from task.h	2017-07-06 22:11:33 -04:00
yenatch	343bf63601	Fix fldeff_softboiled warnings	2017-07-06 22:10:33 -04:00
yenatch	e39f55f550	Merge pull request #350 from PikalaxALT/use_pokeblock ... Use pokeblock	2017-07-05 21:50:45 -04:00
yenatch	06bf25405c	Merge remote-tracking branch 'origin/master' into merge-pika ... Conflicts: include/use_pokeblock.h	2017-07-05 21:37:14 -04:00
yenatch	be05c5bd52	Merge pull request #353 from yenatch/travis-allow-fail-formatting ... travis: allow formatting job to fail instead of falsely reporting passed	2017-07-05 21:33:22 -04:00
yenatch	1eacd4ee74	Merge pull request #351 from Touched/decompile/rotating_gate ... Decompile rotating_gate.s	2017-07-05 21:31:11 -04:00
yenatch	550333dd91	Merge pull request #349 from PikalaxALT/pokeblock ... Pokeblock	2017-07-05 19:39:43 -04:00
yenatch	eb778cac30	Merge pull request #348 from marijnvdwerf/clean/file-modes ... Make files non-executable	2017-07-05 18:45:38 -04:00
yenatch	792a2c6976	Merge pull request #347 from PikalaxALT/field_tasks ... Field tasks	2017-07-05 18:16:22 -04:00
yenatch	3b3eb45b91	Merge pull request #346 from ProjectRevoTPP/sound_check_menu ... Sound check menu	2017-07-05 18:11:34 -04:00
yenatch	5a93497093	Merge pull request #340 from DizzyEggg/master ... Battle header and moar labels	2017-07-05 18:01:17 -04:00
yenatch	124e2eb02c	Merge branch 'master' into master	2017-07-05 17:48:21 -04:00
yenatch	123d5cc8b2	Fix tab-aligned comments	2017-07-05 17:43:37 -04:00
yenatch	40347c124d	Fix STATUS2_FOCUS_ENERGRY	2017-07-05 17:41:44 -04:00
yenatch	813c1846c9	Merge pull request #344 from camthesaxman/decompile_battle_10 ... decompile battle_10	2017-07-04 21:06:42 -04:00
yenatch	d5f7232c1d	travis: allow formatting job to fail instead of falsely reporting passed	2017-07-04 20:55:59 -04:00
yenatch	b219b70250	battle_10 includes ... Addresses comments in #344	2017-07-04 20:49:25 -04:00
yenatch	86a4a2cd3b	Merge pull request #328 from PikalaxALT/pokemon_data ... Pokémon data	2017-07-03 22:58:47 -04:00
yenatch	d8bfc0998d	Restore double brackets in evolution data and flat indent	2017-07-03 22:30:16 -04:00
yenatch	39322db640	Use 0b for tm/hm learnsets	2017-07-03 22:17:33 -04:00
ProjectRevoTPP	2bedaf3824	oops	2017-07-01 22:03:40 -04:00
ProjectRevoTPP	3f3316e08f	i don't want to give this commit a name either	2017-07-01 22:03:20 -04:00
ProjectRevoTPP	5e1d6e8aab	i dont want to give this commit a name	2017-07-01 21:34:13 -04:00
ProjectRevoTPP	3725149f03	formatting	2017-07-01 21:16:28 -04:00
ProjectRevoTPP	87dc53438e	text defines	2017-07-01 21:15:03 -04:00
ProjectRevoTPP	6493e7bbc7	sizeof	2017-07-01 21:06:34 -04:00
ProjectRevoTPP	5f3d11e9de	button defines	2017-07-01 21:01:04 -04:00
ProjectRevoTPP	ab03d23dc5	win range macros	2017-07-01 20:57:29 -04:00
ProjectRevoTPP	8059cdb262	clean up memcpy size declares	2017-06-30 19:11:48 -04:00
ProjectRevoTPP	13d7308a8f	whoops 2 electric boogaloo	2017-06-30 19:04:38 -04:00
ProjectRevoTPP	90eaf7b902	whoops	2017-06-30 19:02:06 -04:00
ProjectRevoTPP	6607a00674	add data to C file	2017-06-30 18:59:17 -04:00
ProjectRevoTPP	1b9318d8af	label data locals and remove fake news	2017-06-30 15:53:41 -04:00
ProjectRevoTPP	d9878add7e	formatting	2017-06-30 15:40:19 -04:00
ProjectRevoTPP	22da2dfafc	finish decompiling sound_check_menu.c except for sub_80BAE78	2017-06-30 15:39:17 -04:00
Touched	c2daf4f6c9	Rename rotating gate exported functions	2017-06-30 21:34:15 +02:00
Touched	b3e72c0e28	Rename rotating gate global EWRAM variables	2017-06-30 21:30:57 +02:00
Touched	a27a90423d	Label rotating_gate.c	2017-06-30 21:25:45 +02:00
Touched	4ccd42ebf6	Decompile data/rotating_gate.s	2017-06-30 21:25:45 +02:00
Touched	a157df8399	Decompile asm/rotating_gate.s	2017-06-30 21:25:45 +02:00
scnorton	282cae4a9f	Address review items by Marijn vd Werf	2017-06-30 09:44:28 -04:00
PikalaxALT	a07701d4e1	Attempt to get German to build	2017-06-30 08:38:48 -04:00
PikalaxALT	5adf807274	Merge remote-tracking branch 'origin/master' into use_pokeblock	2017-06-29 23:09:31 -04:00
PikalaxALT	06f5a39601	Remaining functions in use_pokeblock	2017-06-29 22:42:28 -04:00
PikalaxALT	eee02552ca	Decompile use_pokeblock data	2017-06-29 22:32:23 -04:00
PikalaxALT	13cf6452be	Through sub_8137124	2017-06-29 22:22:56 -04:00