2635 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DizzyEggg	7f167ca9f4	Update battle_script_commands.c	2018-08-11 23:00:16 +02:00
DizzyEggg	feee4751eb	Make event data look cleaner	2018-08-11 22:54:34 +02:00
DizzyEggg	537ebd36ac	Merge contests with master	2018-08-11 19:04:28 +02:00
DizzyEggg	0e0d103044	port more of slot machine	2018-08-11 18:47:56 +02:00
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02:00
garak	2fc3b7f171	change sUnknown_085A1E3C to sMapHealLocations	2018-08-11 10:28:13 -04:00
DizzyEggg	59d8d56868	merge easy chat with master	2018-08-11 14:14:51 +02:00
Diegoisawesome	1e0f3ec433	Continue decompiling field_specials	2018-08-10 14:07:23 -07:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04:00
Diegoisawesome	12ff59f9c1	Continue decompiling field_specials	2018-08-10 00:42:06 -07:00
Slawter666	bc42c5054c	Merge remaining overworld frames	2018-08-10 00:20:19 +01:00
Slawter666	877a80d3bc	Merge berry tree frames	2018-08-09 23:19:45 +01:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Slawter666	dea0bba64e	Merge "pokemon" frames	2018-08-09 00:55:32 +01:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -07:00
garak	45b730e474	copy heal_location changes from pokeruby	2018-08-07 23:05:48 -04:00
Garak	96ab357bed	Merge pull request #3 from pret/master ... syncing with source repo	2018-08-07 22:21:10 -04:00
Slawter666	704e3c7334	Merge https://github.com/pret/pokeemerald into spritesheet	2018-08-07 22:18:30 +01:00
Slawter666	ab2cc59629	Merge remaining "people" overworld frames	2018-08-07 22:16:03 +01:00
Diegoisawesome	85ebd76cd0	Fix fanfare constant to use define	2018-08-04 18:41:53 -07:00
Diegoisawesome	4070152b0e	Merge pull request #284 from DizzyEggg/patch-1 ... Use constant in a battle script.	2018-08-04 18:32:04 -07:00
Diegoisawesome	002016e764	Merge pull request #283 from DizzyEggg/battle_pr_again ... Battle code enums in switches	2018-08-04 18:31:49 -07:00
DizzyEggg	3d5f512aec	Use constant in a battle script.	2018-08-03 18:07:45 +02:00
DizzyEggg	eb4d9f6fed	Tabs to spaces	2018-08-03 00:24:10 +02:00
DizzyEggg	d6537c811b	Battle code enums in case switches	2018-08-03 00:13:44 +02:00
Diegoisawesome	759bc2671c	Merge pull request #280 from DizzyEggg/decompile_part_mon_summary ... Decompile a few pokemon summary screen functions	2018-08-02 08:27:05 -07:00
Diegoisawesome	722b07707c	Merge pull request #282 from DizzyEggg/stats_bits ... Add some more stat defines for battle scripts	2018-08-02 08:11:44 -07:00
Slawter666	5917f7d108	Merge frontier brains, team magma and team aqua frames	2018-08-02 00:34:28 +01:00
Slawter666	52aa9cedcf	Merge May frames into sprite sheets ... Plus fix Brendan's surfing and watering frame order.	2018-07-29 17:29:36 +01:00
DizzyEggg	9febcd3a0a	Document a bit of atk47	2018-07-29 15:51:08 +02:00
DizzyEggg	68145cd002	Document atk48	2018-07-29 15:33:16 +02:00
Diegoisawesome	df4c20f1f8	Merge pull request #281 from einstein95/master ... Port over preproc commit from pokeruby	2018-07-29 02:19:09 -07:00
einstein95	aeceecea3d	Port over 9d96147bbf	2018-07-29 20:11:04 +12:00
DizzyEggg	4080c6f831	Decompile a few pokemon summary screen functions	2018-07-28 23:26:19 +02:00
Slawter666	d5825230e5	Merge "brendan" frames into sprite sheets	2018-07-28 18:11:28 +01:00
Diegoisawesome	919e7b4387	Merge pull request #279 from Diegoisawesome/master ... Move strings to C, misc cleanup	2018-07-25 08:10:18 -07:00
MCboy	6c365fdc94	Update field_player_avatar.c	2018-07-25 17:47:04 +04:30
MCboy	3a15012085	Update field_player_avatar.c	2018-07-25 17:28:25 +04:30
MCboy	94a5f8d529	made file better ?	2018-07-25 17:18:49 +04:30
Diegoisawesome	7270e73fee	Move strings to C	2018-07-25 01:15:36 -07:00
Diegoisawesome	e92e2cb0aa	Merge branch 'master' of github.com:pret/pokeemerald	2018-07-24 21:18:36 -07:00
Diegoisawesome	156fb472e1	Clean up files and add entries to charmap	2018-07-24 21:18:23 -07:00
Diegoisawesome	5883f867f0	Merge pull request #278 from vblm12/trainer_data ... Move some trainer data into c structs	2018-07-24 18:58:56 -07:00
Diegoisawesome	c47aac3538	Merge pull request #260 from DizzyEggg/decompile_union_room ... Decompile part of union room	2018-07-24 18:48:23 -07:00
MCboy	1b3d7a5bef	Update field_player_avatar.s	2018-07-24 17:04:02 +04:30
MCboy	64f40bbfee	Add field_player_avatar to rodata	2018-07-24 17:03:16 +04:30
MCboy	ed3a698b98	Update field_player_avatar.s	2018-07-24 17:01:44 +04:30
MCboy	82d88479ce	decompiled a bunch of functions ... i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that	2018-07-24 16:59:52 +04:30
DizzyEggg	1e9143e0b2	merge union room with master	2018-07-22 13:14:58 +02:00
DizzyEggg	c9d486a5d3	make union room compile i guess	2018-07-22 12:49:49 +02:00