1849 Commits

Author	SHA1	Message	Date
Meowsy	d3e32ab287	Rename Mauville Man text.	2018-12-10 15:50:10 -05:00
Meowsy	68017b531a	Rename UnknownPokemonStruct to BattleTowerPokemon.	2018-12-10 15:49:33 -05:00
DizzyEggg	c2d8876174	Document PSS functions	2018-12-10 21:36:52 +01:00
Diegoisawesome	58ca87accc	Merge pull request #441 from Meowsy/document-pockets ... Document bag pocket magic numbers.	2018-12-10 11:23:41 -06:00
Diegoisawesome	bfdfe367e8	Merge pull request #422 from garakmon/frontier_data_1 ... Battle tower data	2018-12-10 11:22:16 -06:00
Meowsy	2f008e866b	Document return locations.	2018-12-10 11:39:57 -05:00
garak	10237e8d13	move externs and remove comments	2018-12-10 09:52:36 -05:00
Meowsy	e143804af0	Document pocket magic numbers.	2018-12-10 04:33:29 -05:00
golem galvanize	a6db7b2419	decompiled up to brm_cancel_1	2018-12-10 02:38:23 -05:00
garak	62384e7a61	use facility class constants	2018-12-09 22:57:46 -05:00
garak	e1e2132a37	sync fldeff function names with pokeruby	2018-12-09 22:24:54 -05:00
garak	b4312648e2	decompile fldeff_80F9BCC with data	2018-12-09 19:22:59 -05:00
DizzyEggg	431e7e7e5c	More storage work	2018-12-09 21:06:43 +01:00
Marcus Huderle	a7722a0b93	Decompile cable_car.c (#438)	2018-12-09 13:41:52 -06:00
DizzyEggg	e0f3de0b74	Start pokemon storage system	2018-12-09 16:44:01 +01:00
Marcus Huderle	342d23e0ba	Merge pull request #436 from KDSKardabox/master ... Decompile ghost	2018-12-09 07:59:32 -06:00
DizzyEggg	180aa839c4	Fix conflicts	2018-12-09 13:12:02 +01:00
DizzyEggg	4683cdc30c	Merge branch 'master' into weather	2018-12-09 11:56:50 +01:00
KDSKardabox	8712757d24	Merge remote-tracking branch 'upstream/master'	2018-12-09 13:44:41 +05:30
KDSKardabox	f8838491f6	Initial commit for ghost	2018-12-09 13:44:07 +05:30
Diegoisawesome	0b91d2948a	Merge pull request #429 from nullableVoidPtr/master ... Various fixes and cleanups	2018-12-08 21:44:12 -06:00
DizzyEggg	b94ae8bb92	Merge branch 'master' into weather	2018-12-08 22:10:20 +01:00
DizzyEggg	4ec14b3d43	Finish field screen	2018-12-08 22:05:11 +01:00
DizzyEggg	58c4cec946	decompile field screen	2018-12-08 21:42:36 +01:00
DizzyEggg	5caca7a4d6	Clean up field weather	2018-12-08 19:43:21 +01:00
Marcus Huderle	88ffb09765	Merge pull request #432 from KDSKardabox/master ... De-compile fire	2018-12-08 12:41:08 -06:00
KDSKardabox	1357449d73	Merge remote-tracking branch 'upstream/master'	2018-12-09 00:01:45 +05:30
KDSKardabox	2dfbe75b05	Shift externs to header file	2018-12-08 23:52:52 +05:30
DizzyEggg	4c23adb5f5	Decompile field weather	2018-12-08 19:05:03 +01:00
Meowsy	6babb97182	Fix typo "ggText_DexSortSmallestDescription". (#433) ... Should be "gText_DexSortSmallestDescription".	2018-12-08 11:57:19 -06:00
Marcus Huderle	f3a25f83cf	Decompile roulette_util.c (#434)	2018-12-08 11:56:59 -06:00
DizzyEggg	b60915539d	Fix Phantom Force	2018-12-08 16:19:50 +01:00
nullableVoidPtr	8a8baaeaaa	Merge remote-tracking branch 'upstream/master'	2018-12-08 12:13:15 +08:00
DizzyEggg	6068495619	Document trainer battle scripts (#430)	2018-12-07 16:50:56 -06:00
DizzyEggg	470df386c9	Fix conflicts	2018-12-07 23:01:14 +01:00
golem galvanize	53fac4417b	fixing merge conflicts	2018-12-07 14:47:20 -05:00
nullableVoidPtr	f24584cd31	Tabs -> spaces & align in include/	2018-12-07 21:01:59 +08:00
golem galvanize	18124740a4	pushing so I can merge	2018-12-06 23:14:33 -05:00
nullableVoidPtr	f9ff7316d5	Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs	2018-12-06 10:38:28 +08:00
nullableVoidPtr	3909b6408c	Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 ... Some of the INVALID_ are likely erroneously placed, due to lack of documentation	2018-12-06 09:44:08 +08:00
DizzyEggg	a9e6154fa9	Finish porting battle frontier data	2018-12-05 22:21:26 +01:00
Melody	2347e36d60	document pokédex options	2018-12-05 10:10:33 -05:00
garak	d9287f3261	extern gTower trainer data	2018-12-04 12:15:13 -05:00
garak	80c3258504	finish battle tower data except sRubyFacilityClassToEmerald	2018-12-04 12:09:35 -05:00
garak	2c14d6ee6c	fix merge conflicts	2018-12-03 16:58:28 -05:00
DizzyEggg	0d122bc831	Fix merge conflicts	2018-12-03 17:56:36 +01:00
Diegoisawesome	ffa8655f4c	Merge pull request #423 from Slawter666/pokedex-doc ... Document some of pokedex.c	2018-12-03 10:53:21 -06:00
DizzyEggg	dcb1d78fa9	Add battle controllers var to src from sym_ewram	2018-12-03 16:20:39 +01:00
Slawter666	715fbb379e	Document some of pokedex.c	2018-12-03 14:58:25 +00:00
DizzyEggg	a83fc52a7e	Make data easier to edit	2018-12-03 14:49:16 +01:00
Melody	0e5e487b78	tweak alignment	2018-12-03 08:04:11 -05:00
Melody	2779421ad4	fix brendan/may/wally consistency issues	2018-12-03 08:01:52 -05:00
DizzyEggg	b9e711bbf4	Add Powder	2018-12-03 12:50:32 +01:00
Melody	52fa5137c9	tweak alignment	2018-12-03 00:31:15 -05:00
garak	462e7c8295	begin batle tower data	2018-12-02 23:22:42 -05:00
Melody	eeb6446da4	add more consistent names	2018-12-02 22:36:09 -05:00
DizzyEggg	52d1e69591	Add AI support for newly added moves	2018-12-02 23:50:51 +01:00
DizzyEggg	ad67f4f26f	Merge with master and REQ arguments	2018-12-02 22:05:23 +01:00
Melody	10725def8e	trainerbattle_normal → trainerbattle_single ... * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little	2018-12-02 15:08:19 -05:00
Melody	bad5323642	cleans up trainer battle scripts ... * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro	2018-12-02 15:08:19 -05:00
DizzyEggg	9828e0e97b	Merge with master	2018-12-02 19:38:05 +01:00
Diegoisawesome	ee05197eba	Merge pull request #418 from DizzyEggg/link_rfu ... Finish Link rfu	2018-12-02 12:29:31 -06:00
DizzyEggg	b87e6a4e57	Get rid of static functions in includes	2018-12-02 18:58:33 +01:00
DizzyEggg	d46c3ebe5b	Fix Future Sight	2018-12-02 18:47:39 +01:00
DizzyEggg	8f8e6fb88b	Merge branch 'master' into battle_engine_v2	2018-12-02 16:59:38 +01:00
DizzyEggg	d137ebc7a9	Some more rom 8011dc0 work	2018-12-02 13:59:55 +01:00
DizzyEggg	e17140536a	finish link rfu and fix rom 8011dc0	2018-12-02 11:58:50 +01:00
Melody	b9cf4f27b5	renames the winstrate graphics names to pokefan	2018-12-02 00:47:04 -05:00
DizzyEggg	b082f000af	Start working on link rfu	2018-12-01 18:54:59 +01:00
DizzyEggg	6ae949e360	Psychic Terrain blocks priority moves	2018-12-01 11:35:49 +01:00
DizzyEggg	3be070f0c3	Fix string overflowing issue	2018-12-01 11:12:31 +01:00
DizzyEggg	3934eac8d4	Merge branch 'master' into battle_engine_v2	2018-12-01 10:28:11 +01:00
Marcus Huderle	0e32a3adf3	Decompile normal.c (#414)	2018-11-30 17:29:55 -06:00
DizzyEggg	1a8859b1d8	Add Dazzling	2018-11-30 22:12:18 +01:00
DizzyEggg	0329175f06	Add Protean	2018-11-30 21:21:43 +01:00
DizzyEggg	7fa55704b2	merge with master	2018-11-30 20:46:09 +01:00
Marcus Huderle	9dd7f8f214	Decompile pokedex_area_screen.c (#412)	2018-11-30 10:41:03 -06: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	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	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	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
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	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	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	d70c3a94c5	match DecompressGlyphTile nicer	2018-11-21 23:30:04 +01:00
DizzyEggg	c7ca38ccf3	Match DecompressGlyphTile	2018-11-21 21:58:35 +01:00
DizzyEggg	a5df797804	Merge branch 'master' into battle_engine_v2	2018-11-19 20:42:07 +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
Marcus Huderle	72f0a079a9	Decompile all of battle_anim_utility_funcs	2018-11-19 09:37:25 -06:00
DizzyEggg	623f1963b7	Merge with master	2018-11-18 20:49:52 +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	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	4e37723288	Document Battle Pyramid	2018-11-18 17:52:22 +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
Diegoisawesome	032dd251e6	Merge pull request #383 from garakmon/createsprite ... Update createsprite macro and rename BANK to BATTLER	2018-11-15 14:45:13 -06:00
DizzyEggg	bb9dbc0c6d	Merge with master	2018-11-14 22:50:27 +01:00
Slawter666	6fcf878e2f	Tidy up header files	2018-11-13 22:28:46 +00:00
garak	c6833c903c	remove extra macro and shorten names	2018-11-13 16:19:52 -05:00
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
DizzyEggg	b5ea69cf74	Fix conflicts	2018-11-12 19:22:23 +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
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
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	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	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	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	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	6cf39e8a6e	clean up sprite tags	2018-10-22 10:51:40 -04: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
garak	7a9c7e5f06	Merge branch 'master' into sprite-tags	2018-10-21 15:12:18 -04:00
garak	2bb286ab4e	begin ANIM_TAG port	2018-10-21 15:07:10 -04: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
garak	1441ee6bc3	finish event object flags	2018-10-19 13:04:47 -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	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	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	d3215ff96f	Fix wild double battle issues	2018-10-16 22:19:53 +02:00
Deokishisu	78a912a039	Fix "Vigaroth" misspelling to "Vigoroth"	2018-10-16 12:06:38 -04: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
DizzyEggg	b3ad32bbe6	Merge with master	2018-10-14 20:51:34 +02:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05: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
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
DizzyEggg	b73611bccb	clean battle structs	2018-10-14 18:10:54 +02:00
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +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
Diegoisawesome	72c9abbb66	Remove invalid version entries	2018-10-07 23:28:36 -05: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	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	2070c246f9	Added new findings about invalid version IDs. ... After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment. Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.	2018-10-06 07:40:56 -04:00
DizzyEggg	17c5b4089a	Label most of the anim tags	2018-10-06 09:37:52 +02:00
Deokishisu	76a9cf0d54	Fix captitalization of HGSS in comment and match FRLG formatting in enum	2018-10-06 01:56:03 -04:00
Deokishisu	cc0d2288d5	Match comment formatting	2018-10-06 01:46:17 -04:00
Deokishisu	024700769a	Document all possible VERSION_ numbers and add them to the enum	2018-10-06 01:45:36 -04:00
Tetrable	61ab631dec	Fixed a small error	2018-10-05 23:02:04 +01:00
Tetrable	e80a53060b	Start anim tags	2018-10-05 23:00:07 +01: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	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
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
DizzyEggg	597299136f	Add Pollen Puff effect	2018-09-29 14:10:53 +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
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
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	60e8c80c4c	Merge branch 'master' into battle_engine_v2	2018-09-22 19:14:56 +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	db44a7e25a	Techno Blast and Autotomize	2018-09-22 17:27:51 +02:00
DizzyEggg	9474254e4d	Final Gambit, Dragon Tail	2018-09-22 16:15:00 +02: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
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	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
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
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
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	967eb2a276	Accidentally got rid of move defines, added them back	2018-09-16 16:41:52 +01: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	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	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
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
Slawter666	991151f461	Move item_use data to C	2018-09-11 03:04:19 +01:00
DizzyEggg	10b479a3ca	Document battle animation scripts.	2018-09-10 21:19:19 +02:00
DizzyEggg	c6c8b7b0fd	Merge branch 'master' into battle_engine_v2	2018-09-10 14:49:24 +02:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02: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	2f59df03ab	Standartize AddTextPrinterParametrized functions,	2018-09-08 23:38:30 +02:00
Diegoisawesome	e1834c9d7b	Change overworld_frame macro to use tiles	2018-09-08 03:07:44 -05:00
Diegoisawesome	12521fb1a8	Merge branch 'Slawter666-spritesheet'	2018-09-08 02:37:33 -05:00
Diegoisawesome	d945a8bf2f	Macroize main_menu and general cleanup	2018-09-07 19:24:33 -05:00
Slawter666	54d5a7ad97	Format event object pic tables	2018-09-07 14:14:52 +01:00
Marcus Huderle	fa9d1759bd	checkpoint	2018-09-06 11:37:45 -05:00
Diegoisawesome	8defc345f0	Merge pull request #313 from ultima-soul/overworld_and_mapping ... Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…	2018-09-05 16:50:25 -05:00
ultima-soul	857ac33adb	Fixed a typo.	2018-09-05 17:25:44 +00:00
ultima-soul	f505ba1bc7	Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent.	2018-09-05 01:13:17 +00:00
Slawter666	4c54212b1f	Bring labels for overworld.c over from pokeruby	2018-09-04 23:31:37 +01:00
DizzyEggg	24b9cd721f	More Battle Factory	2018-09-03 22:55:55 +02:00
Slawter666	5c66b8a7ef	Label event_object_movement.c	2018-09-02 23:20:45 +01:00
DizzyEggg	0238b1c8ec	More battle factory work	2018-09-02 19:41:33 +02:00
DizzyEggg	10eb952db5	Start battle factory	2018-09-02 18:10:36 +02:00
Marcus Huderle	8ecf3b2159	Start decompiling shop.c	2018-09-01 17:15:35 -05:00
DizzyEggg	f9af3bec9b	merge with master	2018-09-02 00:07:19 +02:00
DizzyEggg	e28ce3be78	Fix the strings length issue	2018-09-01 22:03:21 +02:00
DizzyEggg	44ba432dad	Label various battle scripts	2018-09-01 20:00:13 +02:00
DizzyEggg	ead21250a6	Label all battle ai scripts	2018-09-01 19:05:06 +02:00
DizzyEggg	38c89b9d0f	Bank to battler	2018-09-01 18:36:08 +02:00
DizzyEggg	ce949ba705	document move type variables in pss	2018-09-01 18:31:53 +02:00
DizzyEggg	490a4f993b	Merge with master	2018-09-01 12:38:38 +02:00
DizzyEggg	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00