2419 Commits

Author	SHA1	Message	Date
PikalaxALT	91dd7f5cc3	Port librfu from firered	2020-02-16 13:49:36 -05:00
DizzyEggg	017f65de59	Add easy to use macros for custom multi battles	2020-02-16 15:45:54 +01:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
jiangzhengwenjz	46b00b11d4	match all the functions	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	8a5f292618	document symbols	2020-01-16 08:14:27 -06:00
GriffinR	e92cc7752b	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-01-13 20:41:57 -05:00
huderlem	6d6c57f383	Merge pull request #953 from GriffinRichards/sync-script ... Port some macro/script fixes from pokefirered	2020-01-13 19:33:47 -06:00
GriffinR	c19289596d	Give/Take to Add/Remove for silent script macros	2020-01-12 23:24:52 -05:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
GriffinR	e497fc64e3	if_undefeated macro to if_not_defeated	2020-01-12 20:20:02 -05:00
GriffinR	f2e7b1507e	Port some macro/script fixes from pokefirered	2020-01-11 14:12:31 -05:00
GriffinR	ef67f2d33b	Merge master into ObjEvent rename and prune accidental inclusions	2020-01-08 05:43:06 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
DizzyEggg	39e3b0b740	Form changes layout and Stance Change Aegi	2019-12-31 19:11:53 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
DizzyEggg	e4a9a228c5	Merge pull request #210 from ultima-soul/battle_engine ... Implement Leaf Guard.	2019-12-23 17:15:51 +01:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05:00
Diegoisawesome	026e1108b2	Merge pull request #935 from GriffinRichards/doc-warp ... Document some warp/field screen effect	2019-12-20 23:44:56 -08:00
Diegoisawesome	d42ea06dc5	Merge pull request #939 from GriffinRichards/fix-compare ... Use constants in compare macro	2019-12-20 23:40:12 -08:00
GriffinR	324a81ed5d	Reword yesnobox comment	2019-12-20 18:53:58 -05:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
GriffinR	7628019952	Remove references to LASTRESULT	2019-12-20 08:51:58 -05:00
GriffinR	9e08cfe55f	Remove uses of compare_var_to	2019-12-18 19:22:39 -05:00
GriffinR	d137a1a0c1	Use constants in compare macro	2019-12-18 19:12:09 -05:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
GriffinR	23f952b34e	Merge master into doc-tower	2019-12-17 21:17:46 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
huderlem	f8cef9a6a8	Merge pull request #932 from jiangzhengwenjz/berry_crush ... berry crush	2019-12-17 19:35:00 -06:00
jiangzhengwenjz	5bec27aa34	nonmatch sub_8024604	2019-12-18 03:36:51 +08:00
jiangzhengwenjz	67690df65f	sub_8023CAC	2019-12-17 23:12:01 +08:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
jiangzhengwenjz	50c48d7ef6	sub_8023BC0	2019-12-17 14:49:57 +08:00
ultima-soul	029ab67ff4	Implement Leaf Guard.	2019-12-16 00:29:20 -08:00
jiangzhengwenjz	3f858c1c26	sub_8022F04	2019-12-16 14:17:29 +08:00
GriffinR	96ec5e1b84	Use fadescreen constants	2019-12-15 11:42:50 -05:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	6967caefb2	Split finditem_std from giveitem_std	2019-12-14 08:41:46 -06:00
GriffinR	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	aa72c0ada3	Document Battle Factory scripts	2019-12-14 08:32:32 -06:00
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	49c6ae1ac6	Add some macro comments	2019-12-05 21:11:17 -06:00
GriffinR	467a103bcc	Set up Battle Tent macros	2019-12-05 21:11:17 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	9fcfbdbef5	Set up Battle Factory macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
GriffinR	9b3d1cfab6	Set up Battle Dome and Tower macros	2019-12-05 21:11:17 -06:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
DizzyEggg	dcb5d16cb3	Merge with master	2019-11-29 21:47:31 +01:00
GriffinR	cb90f22c5e	Merge master into ObjEvent rename	2019-11-27 12:51:10 -05:00
GriffinR	70d1f54ab9	Remove TODO comment for battle arena macros	2019-11-26 18:47:48 -06:00
GriffinR	8d870d94c9	Document Battle Arena scripts	2019-11-26 18:47:48 -06:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	cc81b5032b	Split frontier macros and comment frontier_util.inc	2019-11-25 18:37:48 -06:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	08a8dc46e3	Use macros for Trainer Hill	2019-11-25 18:37:48 -06:00
GriffinR	4dfa959fa2	Begin documenting Battle Pike and Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	2bf1e0600e	Consolidate apprentice_buff macros	2019-11-23 08:09:25 -05:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	4e6a69c297	WIP Document Apprentice	2019-11-19 11:36:38 -05:00
GriffinR	6ac7efb54f	Document Scotts House and begin frontier macros	2019-11-17 08:16:28 -06:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
GriffinR	c0ae1cbc1c	Document Lilycove scripts	2019-11-13 18:20:55 -06:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
DizzyEggg	ea6736cd8d	merge	2019-11-10 12:09:14 +01:00
GriffinR	a38bff8c17	Document Slateport scripts	2019-11-09 08:37:06 -06:00
GriffinR	702ef745d9	Add comments to hidemoneybox macro	2019-11-07 11:07:49 -05:00
GriffinR	d5685db19a	Fold nops into hidemoneybox	2019-11-07 10:37:15 -05:00
GriffinR	dba94e3971	Update fldeff sparkle macro	2019-11-06 16:41:56 -06:00
GriffinR	6730df2321	Document Abandoned Ship scripts	2019-11-06 16:41:56 -06:00
GriffinR	58dcd6d99d	Clean up mystery event msg	2019-11-06 16:38:02 -06:00
huderlem	a4b4ecd470	Merge pull request #787 from GriffinRichards/rename-tablecmds ... Rename table cmds	2019-11-04 16:31:27 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	8055548fa4	Document legendary scripts	2019-10-31 18:28:34 -05:00
GriffinR	a4d6ce417d	Fix resetintimidatetracebits typo	2019-10-22 15:54:11 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
GriffinR	b4a9298205	Merge branch 'master' into document-gyms2	2019-10-16 04:22:34 -04:00
GriffinR	0f15264595	Document rotating_tile_puzzle	2019-10-16 04:09:30 -04:00
GriffinR	90a05cf824	Finish Mossdeep Gym doc, beging documenting rotating tile puzzle	2019-10-15 05:06:13 -04:00
Marcus Huderle	e47b3efdfe	Unify showmonpic and hidemonpic script command names with their function names	2019-10-12 18:58:54 -05:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
Marcus Huderle	799edaf3e6	Document hide/show reflection movement actions	2019-10-06 14:17:34 -05:00
GriffinR	3bf8129396	Clean up new Cmd macro names	2019-09-27 02:54:28 -04:00
GriffinR	b6dffcf8b7	Clean up script_menu documentation	2019-09-19 19:23:24 -04:00
GriffinR	06af24bce5	Use misc ScrCmd constants	2019-09-16 19:44:47 -05:00
DizzyEggg	a41ecf7101	more ai stuff, baton pass perish song strats	2019-08-30 17:57:19 +02:00
DizzyEggg	e96e98a8de	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-08-25 13:10:32 +02:00
PikalaxALT	a4d5624ad6	Move asm srcs to src	2019-08-21 17:08:40 -05:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
Tustin2121	18dee14170	Review fixes	2019-08-17 23:26:46 -04:00
Tustin2121	f4d4424618	Folded nops into hidemoneybox and updatemoneybox ... The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.	2019-08-17 13:25:36 -04:00
Tustin2121	6508469259	Rename movobjectoffscreen to copyobjectxytoperm ... Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.	2019-08-17 13:18:56 -04:00
DizzyEggg	fabbc9ae31	Merge with master	2019-08-14 11:48:08 +02:00
DizzyEggg	c9de753ecc	Illusion	2019-08-08 13:06:55 +02:00
PikalaxALT	b05df0377e	Finish pokenav_unk_9	2019-08-05 17:17:05 -04:00
PikalaxALT	e2e667d4b5	Finish pokenav_unk_8	2019-08-05 13:47:04 -04:00
PikalaxALT	330fc46df8	through sub_81CF3F8	2019-08-05 12:21:45 -04:00
PikalaxALT	18f29c566a	through sub_81CF278	2019-08-05 10:54:56 -04:00
PikalaxALT	51d5ee771d	Merge branch 'master' into pokenav_unk_2	2019-08-05 08:33:45 -04:00
PikalaxALT	1fc64b8582	Merge pull request #767 from DizzyEggg/pokenav_8 ... More pokenav	2019-08-05 08:21:36 -04:00
DizzyEggg	2863045241	Fix switch-in abilities text/pop-up	2019-08-05 11:24:49 +02:00
PikalaxALT	299c3cf1dc	Finish pokenav_unk_2	2019-08-04 20:39:36 -04:00
PikalaxALT	2dee42dbaf	through sub_81CA474	2019-08-04 18:15:02 -04:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
PikalaxALT	cd876292d1	Merge branch 'master' into pokenav_unk_2	2019-08-04 15:35:35 -04:00
DizzyEggg	c8cc39cb57	More pokemav, massive clean-up, seriously who the left the file in this state???	2019-08-04 19:09:12 +02:00
PikalaxALT	fa5bfc1627	Merge pull request #766 from DizzyEggg/pokenav_10 ... Decompile pokenav 10	2019-08-04 11:07:10 -04:00
DizzyEggg	252df94bc1	Decompile pokenav 10	2019-08-04 13:53:00 +02:00
DizzyEggg	1641579297	Merge branch 'master' into pok_jump	2019-08-04 00:02:13 +02:00
DizzyEggg	9306c142b3	Merge dodrio with master	2019-08-02 00:45:49 +02:00
DizzyEggg	4d2d8779bf	Dodrio berry picking decompiled	2019-08-02 00:41:55 +02:00
DizzyEggg	02cadbee60	MORE DODRIO BERRY PICKINGgit status!	2019-08-01 19:01:50 +02:00
PikalaxALT	a08cbaee0a	pokenav_unk_2 staging	2019-07-30 19:46:56 -04:00
DizzyEggg	ba1a70419a	Start dodrio magic	2019-07-31 00:27:30 +02:00
garak	5b57c001f5	Merge branch 'master' into navdata	2019-07-29 13:06:45 -04:00
DizzyEggg	e634e722cc	Decompile pokemon jump	2019-07-29 12:35:57 +02:00
DizzyEggg	56b124fdec	Some more pokenav	2019-07-25 21:41:02 +02:00
DizzyEggg	fd07c608fc	Decompile pokemon unk 6	2019-07-25 18:56:08 +02:00
DizzyEggg	33c036e7ff	Decompile pokemonav 7	2019-07-24 17:02:52 +02:00
garak	b68ab6106d	pokenav unk 2 data decomp	2019-07-19 17:23:52 -04:00
DizzyEggg	fc84033e3d	Merge with master	2019-07-12 11:20:24 +02:00
DizzyEggg	c3733f4b95	Decompile 4 berry crush functions	2019-07-09 16:39:29 -05:00
DizzyEggg	11fb13d635	Some pokemon jump work	2019-07-09 16:39:29 -05:00
DizzyEggg	3e476adf4a	Stockpile gen4 effect and fixed spit up	2019-07-09 19:06:12 +02:00
DizzyEggg	10c27ac6a6	Fix a typo that crashes the gamae	2019-06-25 12:26:27 +02:00
DizzyEggg	9e175c9f1b	Merge branch 'master' into battle_engine_v2	2019-06-10 11:21:16 +02:00
DizzyEggg	f64c1dfabf	Some pokenav work	2019-05-26 07:20:51 -05:00
DizzyEggg	32aeba21e0	Some AI tweaking	2019-05-23 11:41:35 +02:00
DizzyEggg	e1ea4b62e9	Natural Gift	2019-05-20 12:03:00 +02:00
DizzyEggg	269f573297	Fix powder and resist berry string	2019-05-20 10:10:00 +02:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
PikalaxALT	539d472796	Merge branch 'master' into dodrio_berry_picking	2019-05-11 21:22:09 -04:00
PikalaxALT	f13e1c78b2	through sub_81CA0EC	2019-05-02 17:53:00 -04:00
DizzyEggg	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +02:00
PikalaxALT	a14162eb9f	through sub_81C9F28	2019-05-02 16:43:32 -04:00
PikalaxALT	518865d8d9	sub_81C9A10	2019-05-02 16:19:25 -04:00
PikalaxALT	9b40cdaeb9	through sub_81C99FC	2019-05-02 14:27:59 -04:00
DizzyEggg	a7f2fa67ef	Merge pull request #142 from thechurchofcage/beta ... Magnetic Flux + Gear Up	2019-05-01 11:11:46 +02:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
Papa Cancer	3cde800bd0	Magnetic Flux + Gear Up ... Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.	2019-04-20 20:17:56 +01:00
Papa Cancer	b50007e861	Instruct ... Re-PR'd due to excess "merges"	2019-04-20 20:11:49 +01:00
Marcus Huderle	9915a3fd7f	Decompile pokenav_unk_5.c	2019-04-16 14:29:00 -05:00
Marcus Huderle	f9f5f34b0c	Finish decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
Marcus Huderle	c7954e1212	Decompile pokenav_unk_4.c through sub_81CB678()	2019-04-16 11:21:13 -05:00
Marcus Huderle	394c0f5546	Start decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
Marcus Huderle	f40f2c5e9c	Decompile all of pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
Marcus Huderle	e3bdb08efa	Start decompiling pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
Marcus Huderle	065c60544d	Cleanup some pokenav code	2019-04-13 16:18:04 -05:00
Marcus Huderle	1268691410	Finish decompiling pokenav_unk_1.c	2019-04-13 16:18:04 -05:00
Marcus Huderle	cb9d471a2a	Decompile pokemon_jump through sub_802CE48()	2019-04-13 11:37:50 -05:00
Phlosioneer	8338e29279	Pokenav unk 1 almost done	2019-04-13 11:34:53 -05:00
Phlosioneer	2b740b46e8	About halfway done with pokenav_unk_1.s	2019-04-13 11:34:53 -05:00
Phlosioneer	ee2edb068a	Start decomp of pokenav_unk_1 ... Looks like it's the Ribbons menu, based on the first function.	2019-04-13 11:34:53 -05:00
DizzyEggg	2646f3b26a	Merge with master	2019-04-13 13:42:44 +02:00
Marcus Huderle	a65cffef42	Decompile more pokemon_jump.c	2019-04-10 20:34:17 -05:00
Marcus Huderle	8a617c3d94	Decompile more pokemon_jump.c	2019-04-09 19:48:21 -05:00
DizzyEggg	382a29ad40	Update battle_anim_script.inc	2019-04-09 07:19:03 -05:00
DizzyEggg	91aafa2ebc	Heal Block anim with volume change task	2019-04-09 12:49:50 +02:00
huderlem	ce93d3ab9a	Merge pull request #661 from Phlosioneer/contest-ai-cleanup ... contest & contest_ai cleanup	2019-04-08 17:30:28 -05:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
Marcus Huderle	a518810c17	Decompile more pokemon_jump.c	2019-04-07 19:23:14 -05:00
Phlosioneer	50350cc2e1	Merge branch 'master' into contest-ai-cleanup	2019-04-07 20:20:22 -04:00
huderlem	a4ea0ac816	Merge pull request #645 from Phlosioneer/pokenav-decomp-again ... Pokenav decomp again	2019-04-07 18:03:32 -05:00
Phlosioneer	d352999cd8	Change "navgear" to "pokenav"	2019-04-07 18:10:53 -04:00
Phlosioneer	0dc73b0b3a	Break up pokenav into subfiles ... The files are separated based on the pokenav resources substruct ID they use.	2019-04-07 14:40:35 -04:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
Phlosioneer	d84d94e29a	Merge branch 'master' into pokenav-decomp-again	2019-04-07 01:56:36 -04:00
Phlosioneer	ad2a97935e	Document left header system	2019-04-07 01:32:42 -04:00
Phlosioneer	ddfe0f91cf	Document decompiled parts of the pokenav main menu	2019-04-06 23:34:30 -04:00
Phlosioneer	3b45f37517	Significant documentatioon progress	2019-04-06 16:25:08 -04:00
Phlosioneer	bc50686158	Decomp everything onvolving UnknownSubStruct_81C81D4 ... Now I can start cleaning up the fields and substructs	2019-04-06 03:42:14 -04:00
PikalaxALT	a58d9a16dd	Merge branch 'master' into dodrio_berry_picking	2019-04-05 08:41:31 -04:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
Fontbane	90e32f4ec5	Document landmark setting and item balls	2019-04-04 19:34:35 -05:00
PikalaxALT	b3a4509b9a	Move m4a BSS syms to m4a_1.s	2019-04-04 19:26:45 -05:00
Phlosioneer	1360b3a477	RGB Constants	2019-04-04 17:05:46 -04:00
Diegoisawesome	8361ada4ba	Merge pull request #656 from ultima-soul/menu_specialized ... Decompile some of menu_specialized	2019-04-04 12:49:17 -05:00
Phlosioneer	83b6210dcb	Forgot to add asm files	2019-04-03 20:56:47 -04:00
PikalaxALT	4fadbaf161	Minor fixes ... gotoram --> returnram cmdCF/execram --> gotoram fix indentation in sym_ewram.txt fix mevent_client.h guard name	2019-04-03 17:04:42 -05:00
PikalaxALT	6c12d154e7	Reformat mevent server and client scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	03badd9c40	mevent_server_ish	2019-04-03 17:04:42 -05:00
PikalaxALT	dabd1f6177	finish mevent_server.s	2019-04-03 17:04:42 -05:00
PikalaxALT	a455d98385	start porting mevent_server from firered	2019-04-03 17:04:42 -05:00
ultima-soul	02651f6177	Attempt to decompile menu_specialized. 2 NONMATCHING	2019-04-02 19:18:36 -07:00
DizzyEggg	1aa95a1821	Document a bit of anims	2019-04-02 07:31:06 -05:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
PikalaxALT	4be97b2dc6	through sub_801A960	2019-04-01 22:08:50 -05:00
PikalaxALT	08f4d3e105	Rename these objects to union_room_battle	2019-04-01 14:41:37 -04:00
PikalaxALT	4ea8217f81	file split	2019-04-01 14:25:58 -04:00