909 Commits

Author	SHA1	Message	Date
DizzyEggg	4949411f3e	make battle bg compile	2017-12-19 17:41:05 +01:00
DizzyEggg	7581218569	Merge branch 'master' into decompile_battle1	2017-12-19 17:37:53 +01:00
Diegoisawesome	6a674e1e83	Merge remote-tracking branch 'Egg/decompile_mail_data'	2017-12-17 22:51:40 -06:00
DizzyEggg	720bd555bc	add constants trainers file	2017-12-17 21:19:08 +01:00
DizzyEggg	54dccc8512	give batter script command names	2017-12-17 20:38:01 +01:00
DizzyEggg	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +01:00
DizzyEggg	46fa2557d7	merge mail with master, fix conflicts	2017-12-17 20:22:56 +01:00
DizzyEggg	eb8055eb07	battle 1 is decompiled	2017-12-17 20:10:57 +01:00
PikalaxALT	6d73bb4b57	Import function labels from Ruby	2017-12-16 10:23:05 -05:00
PikalaxALT	da2e0dfe50	Merge branch 'master' into clock	2017-12-15 21:04:25 -05:00
DizzyEggg	930fea6fad	mail review changes	2017-12-16 01:18:31 +01:00
DizzyEggg	bb82032208	battle setup review changes	2017-12-16 01:15:19 +01:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
camthesaxman	c681b482c2	convert more constants	2017-12-11 12:27:51 -06:00
camthesaxman	19fbf024ff	fix merge conflicts	2017-12-05 12:42:30 -06:00
camthesaxman	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06:00
Cameron Hall	fd75493bc6	Merge pull request #129 from DizzyEggg/dumb_naming ... Name some battle labels	2017-12-05 12:05:06 -06:00
camthesaxman	caa13f8777	convert some constants to C headers	2017-12-05 11:55:48 -06:00
DizzyEggg	4faa442d5a	decompile and label mail	2017-12-03 19:19:11 +01:00
DizzyEggg	790df7159e	more battlescript labels	2017-12-03 00:47:21 +01:00
DizzyEggg	e10aea9a51	give some more labels to battle struct fields	2017-12-02 23:31:58 +01:00
DizzyEggg	ce6e97fa0b	sprite data fields to array	2017-12-02 21:44:50 +01:00
DizzyEggg	2fe25da65a	move pokeball data to rom	2017-12-02 21:27:00 +01:00
DizzyEggg	c2fdde3a49	pokeball file is decompiled	2017-12-02 20:38:26 +01:00
DizzyEggg	c27f7a8131	start working on pokeball	2017-12-02 19:39:07 +01:00
DizzyEggg	d75e7ace1d	label battle stuff	2017-12-02 14:08:55 +01:00
DizzyEggg	273474d57a	give names to some battlescripts	2017-12-02 00:03:46 +01:00
DizzyEggg	039c9f4bd8	merge with master	2017-12-01 21:27:29 +01:00
DizzyEggg	646664ff29	battle setup file is decompiled	2017-12-01 21:25:13 +01:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
PikalaxALT	921011592c	unsigned -> unsigned int; create header	2017-11-29 08:30:18 -05:00
PikalaxALT	10068b0345	Merge branch 'master' into field_poison	2017-11-29 08:19:54 -05:00
DizzyEggg	10470ef536	start working on battle setup	2017-11-28 23:02:09 +01:00
Diegoisawesome	54da963091	Merge pull request #122 from PikalaxALT/unk_81BAD84 ... Unk 81 bad84	2017-11-28 10:11:49 -06:00
PikalaxALT	88636dfc2a	Merge branch 'master' into clock	2017-11-27 20:09:53 -05:00
PikalaxALT	b9d08ed83b	Merge branch 'master' into unk_81BAD84	2017-11-27 20:08:34 -05:00
PikalaxALT	1ac177723d	Merge branch 'master' into field_poison	2017-11-27 20:07:33 -05:00
PikalaxALT	41eb2ed59e	Merge branch 'master' into coins	2017-11-27 20:06:38 -05:00
Diegoisawesome	18c6b8efc2	Merge pull request #120 from PikalaxALT/unk_text_util ... Decompile asm/unk_text_util.s	2017-11-27 18:39:50 -06:00
Diegoisawesome	db87e2db4c	Merge pull request #117 from ProjectRevoTPP/load_save ... finish load_save.c	2017-11-27 15:19:08 -06:00
DizzyEggg	7144b3b7af	fix flavour flavor not building, fuccing americans	2017-11-27 21:24:34 +01:00
ProjectRevoTPP	e6bcfee668	Encyprtion	2017-11-27 15:20:10 -05:00
Cameron Hall	6e317c6463	Merge pull request #124 from DizzyEggg/dump_battlescripts ... Dump Battle Scripts	2017-11-27 14:00:29 -06:00
DizzyEggg	237261e193	berry blender review changes	2017-11-27 20:03:41 +01:00
DizzyEggg	77a6c30bd4	make various macros	2017-11-26 21:04:00 +01:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
DizzyEggg	d48392e677	change battle variables names	2017-11-26 18:07:00 +01:00
DizzyEggg	59f64c622b	name more battlescripts	2017-11-26 17:26:11 +01:00
DizzyEggg	1bb5b1fd07	more battle labels	2017-11-26 17:15:28 +01:00
DizzyEggg	8c30c42c36	more labelling and changes	2017-11-26 14:17:02 +01:00