2572 Commits

Author	SHA1	Message	Date
DizzyEggg	f87e68379c	match 2 field functions	2018-11-29 21:19:00 +01:00
Diegoisawesome	a7a317f6cc	Merge pull request #408 from DizzyEggg/pass_time ... Match 3 link rfu functions	2018-11-28 16:51:53 -06:00
DizzyEggg	f54f5b3531	Match 3 link rfu functions	2018-11-28 23:08:20 +01:00
DizzyEggg	0ed2f54d61	Use MAX_SPRITES define	2018-11-28 21:08:22 +01: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	50f00b0827	Merge remote-tracking branch 'upstream/master' into fldeff	2018-11-27 13:31:07 -05:00
garak	2707bd9b91	clean frontier data	2018-11-27 13:27:49 -05: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	c233dbb220	Merge pull request #400 from DizzyEggg/util ... Match sub_080F8970	2018-11-26 16:57:36 -06:00
Jefferson Steelflex	af08f3bb13	Update back_pic_coordinates.h	2018-11-26 16:55:37 -05:00
Jefferson Steelflex	8e5e4c2304	Fix labels, shifted off by one.	2018-11-26 16:51:08 -05:00
DizzyEggg	132a486169	Match 0x0F8970	2018-11-26 21:54:51 +01:00
DizzyEggg	c9b3f3e3cb	Fix indentation	2018-11-26 20:19:52 +01: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	9b1f2ccf5e	Decompile poison.c	2018-11-26 09:13:45 -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
DizzyEggg	a0699dba52	Add Aromatic Mist	2018-11-25 12:59:22 +01:00
Kurausukun	690f2671cb	oops, forgot Igglybuff	2018-11-25 05:54:32 -05:00
Kurausukun	13ea841e32	change pokemon types to use fairy type	2018-11-24 21:16:32 -05:00
DizzyEggg	434e257943	Add Acupressure	2018-11-24 21:06:53 +01:00
DizzyEggg	194139a35b	Add Move Effect - Feint	2018-11-24 19:37:10 +01:00
DizzyEggg	cc635c5e6d	Custom wild multi battles functionality	2018-11-24 17:31:45 +01:00
DizzyEggg	1c8e574646	Custom Multi Battles - fix defeat msg	2018-11-24 17:06:48 +01:00
DizzyEggg	d52016bc31	Mon creation in custom multi battles	2018-11-24 13:29:10 +01:00
DizzyEggg	539b05ff73	Begin working on custom multi battles	2018-11-24 01:02:02 +01:00
DizzyEggg	10671a4f32	Fix split icons - hm cant forget	2018-11-23 23:16:48 +01:00
DizzyEggg	5fea7e3216	Fix overworld weather	2018-11-23 23:07:02 +01:00
DizzyEggg	c6a207c37b	Fix Teleport in double wild battles	2018-11-23 22:26:36 +01:00
DizzyEggg	2216d49890	Merge branch 'master' into battle_engine_v2	2018-11-23 21:40:06 +01:00
Slawter666	3b501cb470	Document battle ui	2018-11-22 01:10:50 +00:00
DizzyEggg	a900a51a59	match DecompressGlyphTile nicer	2018-11-21 23:30:50 +01:00
DizzyEggg	d70c3a94c5	match DecompressGlyphTile nicer	2018-11-21 23:30:04 +01:00
DizzyEggg	c7ca38ccf3	Match DecompressGlyphTile	2018-11-21 21:58:35 +01:00
garak	f02cb667bb	first 4 functions in fldeff	2018-11-20 09:51:54 -05:00
DizzyEggg	a5df797804	Merge branch 'master' into battle_engine_v2	2018-11-19 20:42:07 +01:00
DizzyEggg	58a1bba059	tabs to spaces	2018-11-19 20:25:09 +01:00
DizzyEggg	f0ec68c058	add include	2018-11-19 18:14:28 +01:00
DizzyEggg	9f8bcadad5	apprentice and factory screen common symbols	2018-11-19 18:06:15 +01:00
DizzyEggg	37d49b34e0	Move vars to battle_main.c	2018-11-19 17:36:39 +01:00
DizzyEggg	5d5b4b853c	Merge branch 'master' into frontier	2018-11-19 17:32:32 +01:00
DizzyEggg	8a00334102	document mossdeep gym	2018-11-19 17:31:46 +01:00
DizzyEggg	d22c2110de	Decompile mossdeep hym	2018-11-19 17:16:01 +01:00
DizzyEggg	6a5b20ee8a	Fix fossil specials	2018-11-19 17:15:28 +01:00
Marcus Huderle	72f0a079a9	Decompile all of battle_anim_utility_funcs	2018-11-19 09:37:25 -06:00
DizzyEggg	95d3c180cc	clean up variables in files	2018-11-19 01:03:14 +01:00
DizzyEggg	b0c78065e5	Merge pull request #30 from Kurausukun/battle_engine_v2 ... Fix Aurora Veil's name, update Gen 1-3 moves to be consistent with Gen 7	2018-11-18 20:51:16 +01:00
DizzyEggg	623f1963b7	Merge with master	2018-11-18 20:49:52 +01:00
DizzyEggg	f58cc47e17	USE RGB constants in hall of fame	2018-11-18 20:32:27 +01:00
DizzyEggg	27ee7d567e	fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT	2018-11-18 20:19:10 +01:00
Diegoisawesome	0bbe03f170	Merge pull request #388 from DizzyEggg/clean_savve ... Clean up save related files	2018-11-18 13:13:56 -06:00
DizzyEggg	682e6c8512	Use RGB constants in save files	2018-11-18 20:09:11 +01:00
DizzyEggg	1b0cfb0757	Party Size and Num Stats	2018-11-18 20:00:36 +01:00
DizzyEggg	7ce3473b0e	Clean up save related files	2018-11-18 19:37:18 +01:00
DizzyEggg	4803a31b84	Fix unk5 field	2018-11-18 17:54:15 +01:00
DizzyEggg	4e37723288	Document Battle Pyramid	2018-11-18 17:52:22 +01:00
DizzyEggg	6cb262aa20	un-static a function	2018-11-18 11:09:40 +01:00
Kurausukun	3ef247ce56	Merge branch 'battle_engine_v2' of https://github.com/Kurausukun/pokeemerald	2018-11-17 21:33:54 -05:00
Kurausukun	febb4a612a	Update Gen 1-3 moves to be consistent with Gen 7	2018-11-17 21:32:03 -05:00
Kurausukun	98ebd7ef5a	fix indentation	2018-11-17 21:29:46 -05:00
Kurausukun	a98ecc08aa	fix Aurora Veil's name	2018-11-17 21:16:33 -05:00
DizzyEggg	c2a3cff814	Fix physical atk stat stage and third type	2018-11-17 23:47:35 +01:00
DizzyEggg	dff968d1f1	Merge pull request #26 from PALPATlNE/battle_engine_work ... Battle engine work	2018-11-17 23:04:00 +01:00
DizzyEggg	40a44a8508	more battle pytamid	2018-11-17 22:55:39 +01:00
Kurausukun	c798d0f1d1	mud-slap should be special, not physical	2018-11-17 16:48:22 -05:00
PALPATlNE	4284816d81	Fixed Createsprite command arguments	2018-11-17 21:16:48 +01:00
PALPATlNE	a5ba055814	Added new move animations	2018-11-17 20:15:38 +01:00
DizzyEggg	eb66b60f38	Begin battle pyramid	2018-11-17 15:30:34 +01:00
DizzyEggg	15b8046b2b	Add third type	2018-11-17 12:10:24 +01:00
DizzyEggg	65036b9a09	Merge with master	2018-11-15 21:53:32 +01:00
DizzyEggg	bb9dbc0c6d	Merge with master	2018-11-14 22:50:27 +01:00
Slawter666	4311fd8b89	Sort includes into alphabetical order	2018-11-14 00:01:50 +00:00
Slawter666	6fcf878e2f	Tidy up header files	2018-11-13 22:28:46 +00:00
Slawter666	1d46507110	Move field effects enum to defines	2018-11-13 14:19:04 +00:00
DizzyEggg	b5ea69cf74	Fix conflicts	2018-11-12 19:22:23 +01: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
DizzyEggg	01fdb01364	Diego pls	2018-11-07 21:09:54 +01:00
Diegoisawesome	9f50ba1ce3	Fix incorrect compressed types, part 2	2018-11-07 12:35:31 -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	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
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
DizzyEggg	c3eac92af8	fix protect	2018-11-03 23:32:18 +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	bc42de5f60	Aurora Veil, Revelation Dance, Diamond Storm	2018-11-03 14:35:45 +01:00
DizzyEggg	52a68f6f1c	Introduce ability pop-up define	2018-11-03 10:51:51 +01:00
DizzyEggg	68d94ad316	Implement trainer sliding	2018-11-03 01:17:16 +01:00
DizzyEggg	e9965dd341	merge with master	2018-11-02 22:55:32 +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	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
DizzyEggg	98d8dbfd8a	Up to sub_81a443c	2018-10-28 00:50:06 +02:00
DizzyEggg	e850517123	more battle frontier 2	2018-10-27 21:01:35 +02:00
DizzyEggg	269d7c2510	up to factory	2018-10-27 17:39:05 +02:00
DizzyEggg	826d0ea2ab	Begin frontier records	2018-10-27 15:44:29 +02:00
DizzyEggg	b252bd0292	Window priority to window bg	2018-10-27 00:53:07 +02:00
DizzyEggg	0e6fbbfe09	Make battle tower compile	2018-10-27 00:04:18 +02:00
DizzyEggg	52be8eeaf1	Merge branch 'master' into battle_tower	2018-10-26 23:55:36 +02:00
DizzyEggg	dc273cc19d	Battle tower - ewram variables	2018-10-26 23:54:41 +02:00
garak	7747a891a2	finish 80FE840 data (actually)	2018-10-25 18:59:05 -04:00
garak	de90ce9123	finish 80FE840 data (almost)	2018-10-25 17:46:23 -04:00
DizzyEggg	1efdaebe23	finish decompiling battle tower	2018-10-25 21:27:10 +02:00
garak	17c26fae1a	fire, electric, ice data	2018-10-24 20:01:40 -04:00
DizzyEggg	549b669f2a	battle tower, match sth and dumb loop instead of goto	2018-10-24 23:14:45 +02:00
garak	22a0b58e57	effects_2 and water data	2018-10-24 15:52:21 -04:00
garak	2f4b00e34b	finish effects_1 data	2018-10-23 12:17:31 -04:00
garak	68814c42de	begin 80FE840 data	2018-10-23 08:25:51 -04:00
DizzyEggg	b330bdba51	More and more battle tower	2018-10-22 19:22:57 +02:00
garak	d267fcbfb1	name remaining tags	2018-10-22 10:36:43 -04:00
garak	2b9fd18dd4	battle_anims.s data to C	2018-10-21 22:30:20 -04:00
garak	f2363f5982	more tag names	2018-10-21 19:30:27 -04:00
Diegoisawesome	32d2640dc7	Match GameClear (thanks Egg)	2018-10-21 16:24:43 -05:00
DizzyEggg	0ab27e44b1	more tower, fail	2018-10-21 20:13:12 +02:00
Diegoisawesome	8e7202ec3d	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
Diegoisawesome	97bbb326b8	GameClear nonsense	2018-10-20 19:53:41 -05:00
golem galvanize	ba3247d5cd	decompiled more, stuck on sub_81B1760	2018-10-20 20:25:28 -04:00
Slawter666	3d8874d919	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-10-21 00:20:09 +01:00
DizzyEggg	16026fe91d	More battle tower.	2018-10-21 00:06:42 +02:00
Slawter666	7a072d4527	Continue synchronising	2018-10-20 21:01:45 +01:00
Diegoisawesome	2a3ba78831	Merge pull request #369 from garakmon/pan-constants ... Use sound pan constants in data/battle_anim_scripts.s	2018-10-19 20:27:54 -05:00
DizzyEggg	f4e55999a5	begin porting and decomping battle tower	2018-10-20 00:33:51 +02:00
garak	38fcc46abb	Merge remote-tracking branch 'upstream/master' into pan-constants	2018-10-19 16:05:14 -04:00
garak	901f3ff557	use sound panning constants in battle_anim_scripts	2018-10-19 15:57:19 -04:00
Diegoisawesome	bf8fa23462	Merge pull request #365 from garakmon/event-flags ... [WIP] Event flags	2018-10-19 14:24:34 -05:00
garak	113a8d1efd	clean flags and remove temp macro	2018-10-19 14:59:18 -04:00
Diegoisawesome	95d8815721	Merge pull request #368 from Diegoisawesome/master ... Finish porting/decompiling field_player_avatar	2018-10-19 00:08:59 -05:00
Diegoisawesome	dd3689fdbf	Finish porting/decompiling field_player_avatar	2018-10-19 00:05:54 -05:00
garak	cb5981cdf2	name more event flags	2018-10-18 21:32:21 -04:00
garak	c27043bd3c	more event flags	2018-10-18 15:28:59 -04:00
DizzyEggg	dfee5deca8	Move Bitmap struct and clear sprite/text files	2018-10-18 21:24:37 +02:00
Diegoisawesome	b23dc9a123	Merge pull request #366 from Diegoisawesome/master ... Finish shop and fldeff_escalator	2018-10-18 12:08:38 -05:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
golem galvanize	dded980cde	fix building	2018-10-17 23:36:18 -04:00
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -04:00
golem galvanize	2c6d634acd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-10-17 20:03:31 -04:00
golem galvanize	65a0c48eec	decompiled some more of the file	2018-10-17 20:03:02 -04:00
garak	7d88b9647f	Merge branch 'master' into event-flags	2018-10-17 12:30:45 -04:00
garak	ff97873c30	label temp flags, test replace script	2018-10-17 12:25:12 -04:00
Slawter666	b7b1d609d0	More synchronisation	2018-10-17 13:52:26 +01:00
Diegoisawesome	f67bbbdaaa	Merge pull request #364 from Diegoisawesome/master ... Port/decompile field_control_avatar	2018-10-16 21:54:14 -05:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Slawter666	1435c96b41	Further synchronisation	2018-10-17 01:11:44 +01:00
DizzyEggg	1f358fbb07	Use constants	2018-10-16 22:34:53 +02:00
DizzyEggg	d3215ff96f	Fix wild double battle issues	2018-10-16 22:19:53 +02:00
Slawter666	3aff112127	Begin synchronising with pokeruby	2018-10-16 14:55:16 +01:00
DizzyEggg	67384c08be	Implement double wild battle functionality	2018-10-15 21:19:52 +02:00
Diegoisawesome	a9abb930aa	Merge pull request #352 from huderlem/shop ... [WIP] Shop	2018-10-14 19:03:48 -05:00
Diegoisawesome	7f211b2588	Merge pull request #359 from Slawter666/label_field_effect_helpers ... Label field_effect_helpers.c	2018-10-14 18:37:11 -05:00
Deokishisu	bf2063cc1a	Update All EVENT_OBJ_GFX References ... Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.	2018-10-14 19:09:18 -04:00
Slawter666	137f6549ff	label field_effect_helpers	2018-10-14 23:43:40 +01:00
DizzyEggg	ef11706dc7	Begin wild double battles	2018-10-14 22:37:07 +02:00
Deokishisu	94bec0b8db	Fix Double Underscores ... Whoops.	2018-10-14 16:14:01 -04:00
Deokishisu	d7ba8a306c	Rename OW Sprites ... Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed. Renamed: LittleBoy1 -> NinjaBoy LittleGirl1 -> Twin Woman2 -> PokefanF OldMan1 -> ExpertM OldWoman1 -> ExpertF Man3 -> PokefanM Woman6 -> LinkReceptionist Man7 -> DevonEmployee Boy4 -> RichBoy Boy5 -> GameboyKid (Consistent with pokecrystal) ContestOldMan -> ContestJudge Renamed Because of Numbering Changes: LittleBoy2 -> LittleBoy LittleGirl2 -> LittleGirl OldWoman2 -> OldWoman OldMan2 -> OldMan Man4 -> Man3 Man5 -> Man4 Man6 -> Man5 Woman3 -> Woman2 Woman4 -> Woman3 Woman5 -> Woman4 Woman7 -> Woman5	2018-10-14 15:49:55 -04:00
DizzyEggg	b3ad32bbe6	Merge with master	2018-10-14 20:51:34 +02:00
Deokishisu	a8afec762b	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:22:56 -04:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05:00
Deokishisu	c89b14f5ef	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:19:23 -04:00
Diegoisawesome	43316ffae8	Merge pull request #356 from DizzyEggg/clean_battlestruct ... Clean a couple of battlestructs' fields	2018-10-14 13:18:29 -05:00
Deokishisu	e129f4864f	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:16:07 -04:00
Diegoisawesome	0979ea91fb	Merge pull request #357 from DizzyEggg/move_heap ... Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 13:15:31 -05:00
DizzyEggg	c3113db931	Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 20:00:14 +02:00
Diegoisawesome	d40e737d52	Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers ... Decompile field effect helpers	2018-10-14 12:48:18 -05:00
Diegoisawesome	e0bc3fd59c	Merge pull request #355 from DizzyEggg/use_eos ... Use defines for text chars	2018-10-14 12:21:37 -05:00
DizzyEggg	ecdf0fd69d	Clean battle structs	2018-10-14 18:37:52 +02:00
Deokishisu	2bd86dad2f	Rename Boy4 to RichBoy	2018-10-14 12:26:48 -04:00
DizzyEggg	b73611bccb	clean battle structs	2018-10-14 18:10:54 +02:00
DizzyEggg	cd4f65ecef	Make apprentice compile	2018-10-14 17:06:47 +02:00
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	d60e4e23f8	Merge pull request #25 from Slawter666/apprentice-data ... Move apprentice data to C	2018-10-14 16:28:27 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +02:00
Slawter666	f08b56d645	Move apprentice data to C	2018-10-14 15:26:13 +01:00
DizzyEggg	af7aa624cd	make aprentice compile	2018-10-14 15:23:14 +02:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	541043a661	Use defines for text chars	2018-10-14 15:04:25 +02:00
DizzyEggg	7a008a944a	Move 'blend_palette'.c to util.c	2018-10-14 14:43:19 +02:00
DizzyEggg	145df49063	Document more of apprentice	2018-10-14 14:35:51 +02:00
DizzyEggg	b4a42a6832	Decompile apprentice	2018-10-14 11:37:44 +02:00
DizzyEggg	36b8a6a9a2	More apprentice work	2018-10-13 23:23:33 +02:00
DizzyEggg	a496a763ca	Merge record mixing, pokemon and global with apprentice	2018-10-13 20:38:46 +02:00
Diegoisawesome	32fbf67d47	Merge branch 'master' into shop	2018-10-13 12:55:06 -05:00
Diegoisawesome	a26380663c	Merge branch 'master' of github.com:pret/pokeemerald	2018-10-13 12:44:23 -05:00
Diegoisawesome	35c6938814	Port/decompile cable_club.s	2018-10-13 12:41:10 -05:00
Marcus Huderle	b24559d69b	Merge remote-tracking branch 'upstream/master' into shop ... # Conflicts: # asm/shop.s	2018-10-13 10:22:58 -05:00
DizzyEggg	74b81bf229	start apprentice	2018-10-13 00:48:26 +02:00
golem galvanize	d3d725cc83	decompiled up to sub_81B0948	2018-10-11 21:23:39 -04:00
Diegoisawesome	04836db167	Start porting cable_club.c	2018-10-11 16:02:58 -05:00
golem galvanize	803c2388ce	finish porting field_effect_helpers	2018-10-10 12:02:02 -04:00
golem galvanize	35ee9f67c0	ported some of field_effect_helpers	2018-10-09 17:32:39 -04:00
DizzyEggg	b80b94ee73	merge with master	2018-10-07 19:40:34 +02:00
Marcus Huderle	807050a048	Merge pull request #348 from DizzyEggg/anim_files ... Decompile/Port battle_anim_80A5C6C	2018-10-07 12:23:07 -05:00
DizzyEggg	dbb09aa445	get rid of SPRITE and TASK	2018-10-07 19:19:13 +02:00
DizzyEggg	413e26e83d	port 80d51ac	2018-10-07 17:45:37 +02:00
DizzyEggg	61343d5069	Decompile battle_anim_80A9C70	2018-10-07 15:39:46 +02:00
DizzyEggg	8c834b9ae8	battle anim 80a5c6c decompiled	2018-10-07 12:32:20 +02:00
DizzyEggg	54fc92bc92	Start porting ruby battle anim file	2018-10-06 23:04:53 +02:00
Diegoisawesome	7a7aeed5e8	Merge pull request #347 from Deokishisu/GamV ... Fill out VERSION_ enum with all possible values	2018-10-06 13:45:21 -05:00
DizzyEggg	7925000a54	merge with master	2018-10-06 16:05:58 +02:00
DizzyEggg	6b5c52e926	Flower Shield and protect moves	2018-10-06 15:50:35 +02:00
Marcus Huderle	b9e38a569e	Merge pull request #320 from DizzyEggg/anims ... Document battle animation scripts	2018-10-06 08:20:41 -05:00
Deokishisu	9f69ea1931	Update gGameVersion to use GAME_VERSION	2018-10-06 01:57:39 -04:00
Marcus Huderle	ec0d350137	Move metatile behavior constants to include/constants and sync closer to pokeruby	2018-10-04 17:57:07 -05:00
DizzyEggg	de9e9072fc	Rototiller and 2 turn moves	2018-09-30 14:04:46 +02:00
DizzyEggg	162c83fcff	Bestow	2018-09-30 12:27:51 +02:00
DizzyEggg	65a48e16ee	Merge pull request #19 from LOuroboros/patch-11 ... Update move_names.h	2018-09-30 11:43:57 +02:00
DizzyEggg	eb4a8b8748	Merge pull request #20 from LOuroboros/patch-12 ... Update battle_moves.h	2018-09-30 11:43:49 +02:00
DizzyEggg	7623eabdee	After you	2018-09-29 19:37:39 +02:00
DizzyEggg	b9cf1fdcfe	Psycho Shift, Power Trick, Flame Burst	2018-09-29 18:40:14 +02:00
LOuroboros	0621d5ceb7	Update battle_moves.h ... When I made the Gen. 7 moves data, I screwed up Spirit Shackle's effect. I should have gave it EFFECT_PLACEHOLDER as it will probably need a new effect.	2018-09-29 12:39:27 -03:00
DizzyEggg	dddefbb0e3	Full support for moves hitting all battlers	2018-09-29 16:41:25 +02:00
DizzyEggg	ada76cbe4f	Synchronoise and Smack Down	2018-09-29 15:43:56 +02:00
LOuroboros	258f1ea606	Update move_names.h ... Decapped move names and fixed U-Turn's,	2018-09-29 10:06:10 -03:00
DizzyEggg	597299136f	Add Pollen Puff effect	2018-09-29 14:10:53 +02:00
DizzyEggg	2ebffb9912	allow gen7 moves and abilities for debug	2018-09-29 13:53:37 +02:00
DizzyEggg	b8440f4a03	Merge pull request #17 from LOuroboros/patch-9 ... Update move_names.h	2018-09-29 13:49:58 +02:00
DizzyEggg	38fe5011ad	Merge pull request #18 from LOuroboros/patch-10 ... Update move_descriptions.h	2018-09-29 13:49:50 +02:00
DizzyEggg	cbaae44f9f	Add pop-up to battlescripts	2018-09-29 13:36:33 +02:00
DizzyEggg	731ff38067	Ability pop-up functionality is done	2018-09-29 12:47:35 +02:00
Diegoisawesome	25033ef311	Finish tileset_anims macroization	2018-09-23 14:58:36 -05:00
DizzyEggg	3f2beff554	Defog	2018-09-23 19:03:53 +02:00
DizzyEggg	6b7a171dbe	Ability pop-up fail, maybe will do something about it later	2018-09-23 14:24:06 +02:00
LOuroboros	aa7fab8b66	Update move_descriptions.h ... -Added 4 move descriptions that were missing (Darkest Lariat, Ice Hammer, Anchor Shot and Power Trip). -Added the table with the pointers for the Gen. 7 moves descriptions.	2018-09-23 01:41:12 -03:00
LOuroboros	80523b4257	Update move_names.h ... Gen. 7 moves' names	2018-09-23 01:01:57 -03:00
Diegoisawesome	584cad6c0b	Merge pull request #339 from Kermalis/master ... Rename voicegroups	2018-09-22 15:48:29 -05:00
Kermalis	e93f1182e6	Rename voicegroups	2018-09-22 16:42:34 -04:00
Diegoisawesome	58a5e4a261	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-22 15:39:34 -05:00
Diegoisawesome	9e840dc5fe	Merge remote-tracking branch 'Tetra/master'	2018-09-22 15:23:47 -05:00
Diegoisawesome	d50554bb8e	Use macros and defines in tileset_anims	2018-09-22 15:02:49 -05:00
DizzyEggg	37d8859404	random move to called move	2018-09-22 19:27:56 +02:00
DizzyEggg	60e8c80c4c	Merge branch 'master' into battle_engine_v2	2018-09-22 19:14:56 +02:00
DizzyEggg	611360c29e	calledattack to calledmove	2018-09-22 19:08:41 +02:00
DizzyEggg	e362c06aea	gRandomMove to gCalledMove	2018-09-22 18:41:00 +02:00
DizzyEggg	19e1606595	Add Copycat	2018-09-22 18:37:03 +02:00
DizzyEggg	fafcedc722	Clean gen7 moves data merge	2018-09-22 17:35:30 +02:00
DizzyEggg	ef4b74d934	Merge pull request #16 from LOuroboros/patch-8 ... Update battle_moves.h	2018-09-22 17:32:57 +02:00
DizzyEggg	cbaf2d6b86	Merge pull request #15 from LOuroboros/patch-7 ... Update move_descriptions.h	2018-09-22 17:28:53 +02:00
DizzyEggg	db44a7e25a	Techno Blast and Autotomize	2018-09-22 17:27:51 +02:00
LOuroboros	3c6b405dd8	Update battle_moves.h ... Gen. 7 moves data.	2018-09-22 12:24:47 -03:00
DizzyEggg	9474254e4d	Final Gambit, Dragon Tail	2018-09-22 16:15:00 +02:00
Tetrable	1f767e4c49	Document and make tileset_anims.c easier to use	2018-09-22 13:27:43 +01:00
DizzyEggg	fd15e23419	Placeholder entries for gen7 moves	2018-09-22 14:04:15 +02:00
DizzyEggg	bf11c35eaf	Add gen7 learsnets for pokemon	2018-09-22 13:52:38 +02:00
Tetrable	4d9c513e3e	Document and improve tileset_anims.c further	2018-09-22 12:50:24 +01:00
LOuroboros	fff4336a63	Update move_descriptions.h ... Fixed Magma Storm's description. Sorry, I didn't know that it was working like in Gen. 5+	2018-09-22 08:03:39 -03:00
DizzyEggg	c5831d5f3e	Merge pull request #14 from LOuroboros/patch-6 ... Update move_descriptions.h	2018-09-22 12:24:59 +02:00
DizzyEggg	ca9876b0b4	Updated Wrap Mechanics, Infestation, stat changing move effects	2018-09-22 12:20:33 +02:00
DizzyEggg	f455f663f4	Shell Smash move effect	2018-09-22 11:13:17 +02:00
DizzyEggg	1284bb94f1	Last Resort, Fangs and Flare Blitz/Volt Tackle	2018-09-22 10:45:43 +02:00
DizzyEggg	23a06c0836	Close combat effect	2018-09-22 01:12:27 +02:00
DizzyEggg	7b60a654b2	Growth gen6 effect	2018-09-22 01:01:13 +02:00
DizzyEggg	a69af8f2f5	Merge with master	2018-09-22 00:22:13 +02:00
DizzyEggg	66fd9b2ddf	Label trainer hill battle type	2018-09-20 22:00:00 +02:00
DizzyEggg	bf64333299	Give labels to healthbox gfx	2018-09-20 21:42:38 +02:00
DizzyEggg	d05875dd04	New mega trigger sprite	2018-09-20 20:59:00 +02:00
DizzyEggg	0755240fbc	link battles mega evo fix hopefully?????	2018-09-20 17:59:17 +02:00
DizzyEggg	2bae70a66b	Convert mega related struct fields to a seperate struct	2018-09-20 17:33:27 +02:00
DizzyEggg	13e434f874	Fix trainer name getter function	2018-09-20 17:22:16 +02:00
DizzyEggg	c7ca7b6e8e	Fix mega evolution allowing to evolve two mons in doubles	2018-09-20 12:55:12 +02:00
DizzyEggg	a181900141	Merge branch 'master' into battle_engine_v2	2018-09-20 11:58:23 +02:00
DizzyEggg	e4b7ba0977	Document some not labeled battle things	2018-09-20 11:55:35 +02:00
DizzyEggg	602c1322e4	almost full support for link battles mega evolution	2018-09-20 11:23:12 +02:00
DizzyEggg	facd838112	Add debug controller to all controllers	2018-09-18 21:51:10 +02:00
Diegoisawesome	8a05bf82ec	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-18 10:03:57 -05:00
Diegoisawesome	899ae7a59a	Add defines for tile, metatile, and palette count	2018-09-18 10:03:24 -05:00
LOuroboros	49cf3eb396	Update move_descriptions.h ... Descriptions for Roar of Time and Magma Storm. I think that I did things correctly, but please check before merging, just in case.	2018-09-18 00:26:22 -03:00
DizzyEggg	add1f4910c	Add mega trigger png	2018-09-17 22:40:49 +02:00
DizzyEggg	abebf479a6	Tweak mega evo to hopefully be compatibile with recorded battles.	2018-09-17 20:37:33 +02:00
DizzyEggg	1018b8f2a8	Merge pull request #13 from Tetrable/battle_engine_v2 ... Add periods to the end of ability descriptions.	2018-09-17 20:03:32 +02:00
Diegoisawesome	7f2d52d9e0	Merge pull request #332 from DizzyEggg/patch-5 ... Use defines for BattleAI_ChooseMoveOrAction	2018-09-17 10:11:25 -05:00
Diegoisawesome	6978a896d1	Merge pull request #331 from DizzyEggg/patch-3 ... Use pokeruby's formatting for move descriptions	2018-09-17 10:11:12 -05:00
DizzyEggg	2042788fdc	Mega Evolution done except sprites.	2018-09-16 21:08:49 +02:00
DizzyEggg	55f21c1776	Mega Evolution support is mostly done.	2018-09-16 18:55:32 +02:00
Tetrable	9397618d9d	Missed a description	2018-09-16 16:40:02 +01:00
Tetrable	8d4d5b501c	Add periods to the end of ability descriptions.	2018-09-16 16:36:47 +01:00
DizzyEggg	5164215c91	Use defines for BattleAI_ChooseMoveOrAction	2018-09-16 17:06:35 +02:00
DizzyEggg	33b6ec8c0a	Add move descriptions for moves	2018-09-16 15:59:17 +02:00
DizzyEggg	94bbfa7fa0	Use pokeruby's formatting for move descriptions	2018-09-16 15:58:13 +02:00
DizzyEggg	cd0934a399	Add Fairy Type icon	2018-09-16 10:45:22 +02:00
DizzyEggg	c3a5001945	Add Ability Descriptions: credits to BluRose :3	2018-09-16 10:18:35 +02:00
DizzyEggg	de65ddf4b6	Make it easier to edit ability text	2018-09-16 10:17:10 +02:00
DizzyEggg	0800a44f7a	Merge branch 'master' into battle_engine_v2	2018-09-16 09:22:05 +02:00
Diegoisawesome	6a8f27c1ac	Merge pull request #326 from DizzyEggg/cablecarutil ... Decompile cable_car_util.c	2018-09-16 01:06:33 -05:00
DizzyEggg	4d2637883a	Slot machine is decompiled.	2018-09-15 23:19:37 +02:00
DizzyEggg	db248dada2	slot machine is decompiled	2018-09-15 22:59:45 +02:00
DizzyEggg	0547e260a4	More of slot machine	2018-09-15 18:01:20 +02:00
DizzyEggg	ff13cb6352	decompile cable car util which has nothing to do with actual cable car	2018-09-15 13:50:23 +02:00
DizzyEggg	2a7811456a	Add anim tag sprite defines	2018-09-15 00:30:20 +02:00
Diegoisawesome	b8c9d9a980	Merge pull request #324 from Diegoisawesome/master ... Document main_menu	2018-09-14 12:17:11 -05:00
Diegoisawesome	b860d583e4	Document main_menu	2018-09-14 12:15:46 -05:00
DizzyEggg	a08d9dd451	Merge branch 'master' into anims	2018-09-12 22:59:04 +02:00
DizzyEggg	8a81bd1bce	Sync battle anim labels with pokeruby	2018-09-12 22:58:03 +02:00
Diegoisawesome	095cbbc5c2	Merge pull request #321 from Slawter666/data ... Move more data to C	2018-09-11 22:10:26 -05:00
Slawter666	f40fa37398	Move battle_bg data to C	2018-09-11 23:37:47 +01:00
Marcus Huderle	ba125b23fd	Remove transparency from event object spritesheets	2018-09-11 17:18:10 -05:00
Slawter666	991151f461	Move item_use data to C	2018-09-11 03:04:19 +01:00
Slawter666	3c16d8c598	Move braille_puzzles data to C	2018-09-11 02:17:21 +01:00
Slawter666	b6ee8823f0	Move field_special_scene data to C	2018-09-11 02:04:03 +01:00
Slawter666	bcea321494	Finish converting data2b data	2018-09-11 01:35:47 +01:00
DizzyEggg	10b479a3ca	Document battle animation scripts.	2018-09-10 21:19:19 +02:00
Diegoisawesome	d9941cd1a8	Standardize sprite visibility to boolean	2018-09-10 10:25:58 -05:00
Diegoisawesome	cb053b3a15	Merge pull request #312 from DizzyEggg/decompile_frontier_2 ... Decompile Battle Factory	2018-09-10 10:20:41 -05:00
DizzyEggg	d20189234e	Shyly begin move animations	2018-09-10 17:11:16 +02:00
DizzyEggg	ae24f7de41	Merge pull request #11 from LOuroboros/patch-5 ... Update pokemon_summary_screen.c	2018-09-10 14:51:42 +02:00
DizzyEggg	c6c8b7b0fd	Merge branch 'master' into battle_engine_v2	2018-09-10 14:49:24 +02:00
DizzyEggg	74cc2cf512	battle factory review changes	2018-09-10 10:18:30 +02:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02:00
Tetrable	044ef98309	Document trainer animations, correct unused table labelling	2018-09-09 22:35:07 +01:00
DizzyEggg	cf8898071d	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2	2018-09-09 20:31:56 +02:00
DizzyEggg	4d1df7ecbe	comm	2018-09-09 20:31:51 +02:00
Slawter666	135e98a824	Move battle factory data to C	2018-09-09 16:06:35 +01:00
Slawter666	1ba17e1666	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data	2018-09-09 15:51:13 +01:00
DizzyEggg	6454740587	More battle factory	2018-09-09 13:12:26 +02:00