377 Commits

Author	SHA1	Message	Date
Phlosioneer	04db99bb0a	More misc event names	2019-02-24 10:10:18 -06:00
Phlosioneer	0de831fd29	Name some common single-entry movements	2019-02-24 10:10:18 -06:00
Phlosioneer	4582fd1545	Name a ton of commonly used event scripts	2019-02-24 10:10:18 -06:00
Phlosioneer	b2866fae21	Document the weather state functions ... All weather types are now documented (including WEATHER_15)	2019-02-22 22:20:42 -05:00
Phlosioneer	cea5696f23	Finish moving pokeruby vars	2019-02-22 04:18:43 -05:00
Phlosioneer	e12a7790cf	Start porting pokeruby vars to pokeemerald	2019-02-22 04:01:38 -05:00
Phlosioneer	eca329f9c5	Merge branch 'master' into multiplayer-stuff	2019-02-21 21:22:10 -05:00
Diegoisawesome	924cbe9ee4	Merge pull request #560 from Phlosioneer/regi-documentation ... Document the regi* code more	2019-02-18 13:23:19 -06:00
Phlosioneer	486cf449b8	Make flag names more consistent	2019-02-18 14:17:02 -05:00
Phlosioneer	fcb541189d	Rename some flags, and use map ID macros	2019-02-18 02:02:20 -05:00
Phlosioneer	0a7b97ee06	Merge branch 'master' into multiplayer-stuff	2019-02-18 01:19:16 -05:00
Phlosioneer	5695617d64	Merge branch 'master' into multiplayer-stuff	2019-02-18 01:12:47 -05:00
Phlosioneer	08579edbcd	Clean up mistakes and bad formatting	2019-02-18 01:03:44 -05:00
Marcus Huderle	19b76bffda	Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields	2019-02-16 16:56:41 -06:00
garak	0b1bb9e4e9	use strings for map json coord_event var_value	2019-02-16 16:14:43 -06:00
Phlosioneer	e90e3458cb	Document the regi* code more ... Fixed some confusing naming, named some unknown symbols, and fixed the names of some flags.	2019-02-15 18:24:55 -05:00
Diegoisawesome	dfb896356c	Merge branch 'master' of github.com:pret/pokeemerald	2019-02-12 00:40:42 -06:00
Diegoisawesome	449fb25f23	Clear up misnamed time-based flags and functions	2019-02-12 00:40:34 -06:00
Phlosioneer	e75f45dbcf	Reverse engineered many of the multiplayer events ... Some corrections to the way events are handled and identified.	2019-02-10 20:42:50 -05:00
Marcus Huderle	6f1d2b870c	Give proper names to dynamic map layouts	2019-02-09 09:57:30 -06:00
Marcus Huderle	3a88ab831d	Document more battle pyramid	2019-02-07 11:51:03 -06:00
Marcus Huderle	a1ad1bad3a	Document a bunch of battle pyramid	2019-02-06 21:14:28 -06:00
Marcus Huderle	d4125fef9b	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
Marcus Huderle	29d6221935	Convert map data to JSON	2019-01-31 15:51:20 -06:00
Marcus Huderle	5c1667b41a	Define layout constants	2019-01-29 16:55:25 -06:00
Marcus Huderle	14641e916e	Cleanup Rustboro City House layout label	2019-01-29 14:36:02 -06:00
Marcus Huderle	bd667102fa	Fix PetaburgCity map scripts label	2019-01-29 14:36:02 -06:00
Marcus Huderle	e43f341799	Cleanup link contest map scripts	2019-01-29 14:36:02 -06:00
Marcus Huderle	d2d44a97b8	Cleanup link contest map events	2019-01-29 14:36:02 -06:00
Marcus Huderle	36a1825bbe	Document trainer approach funcs, and use movement type constants in scripts	2019-01-29 14:36:02 -06:00
DizzyEggg	524db6068e	Merge branch 'master' into trainer_card	2019-01-22 21:59:32 +01:00
Diegoisawesome	900f294011	Add var const prefix for some missed var numbers	2019-01-21 22:34:01 -06:00
DizzyEggg	576d1b3474	Document and match somne trainer card	2019-01-19 23:04:33 +01:00
DizzyEggg	c0bc01d301	Move some vars to C	2019-01-13 13:15:23 +01:00
Tetrable	50aa222aff	Corrected typos	2019-01-03 01:54:55 +00:00
Tetrable	a3ebca4d81	Fix merge conflicts	2019-01-02 21:25:14 +00:00
Tetrable	1e3da62d24	Finish off labelling flags	2019-01-02 21:12:43 +00:00
Diegoisawesome	d004ce065c	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-31 02:30:30 -06:00
Diegoisawesome	2fb9f490fb	Almost done with trade	2018-12-29 12:46:15 -06:00
Melody	dc6c0ed17e	add event object var references	2018-12-29 11:56:53 -06:00
Marcus Huderle	67636b7c64	Document deoxys rock	2018-12-29 11:36:54 -06:00
Melody	6d556f8cf7	improve checkplayergender calls ... clean up constant definitions make tweaks from review	2018-12-28 08:22:21 -06:00
Marcus Huderle	a1ea3b5e39	Use map_header_flags macro (#483)	2018-12-26 12:20:15 -06:00
Marcus Huderle	dcbc8db6a3	Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)	2018-12-25 11:46:35 -06:00
Melody	c7971ecb20	improve event script object calls	2018-12-25 11:20:33 -06:00
Diegoisawesome	c2ca57e8ac	Merge pull request #477 from melthelesbian/object_script_commands ... use player constant in obj script commands	2018-12-24 16:09:42 -06:00
Melody	38293d4293	use player constant in obj script commands	2018-12-24 16:31:24 -05:00
Melody	1e87810414	document setweather calls	2018-12-24 16:23:58 -05:00
Melody	55005f1588	improve call_if macros	2018-12-21 21:32:45 -05:00
Melody	ac2e4adf2d	improve goto_if macros	2018-12-21 20:28:24 -05:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
Melody	5e6ceeb631	update applymovement to remove magic numbers	2018-12-19 14:08:01 -05:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05:00
garak	e1e2132a37	sync fldeff function names with pokeruby	2018-12-09 22:24:54 -05:00
Marcus Huderle	a7722a0b93	Decompile cable_car.c (#438)	2018-12-09 13:41:52 -06:00
DizzyEggg	6068495619	Document trainer battle scripts (#430)	2018-12-07 16:50:56 -06:00
Melody	2615ece23b	Use normal apostrophes like adults	2018-12-07 10:41:08 -05: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
Melody	862265b73a	defines register_matchcall macro	2018-12-02 06:04:59 -05:00
Melody	c557ac61ae	adds constants, cleans up callstd and msgbox code ... * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants	2018-12-02 03:37:46 -05:00
Marcus Huderle	fb6120da5b	Fixup some names	2018-11-25 15:50:54 -06:00
DizzyEggg	4e37723288	Document Battle Pyramid	2018-11-18 17:52:22 +01:00
DizzyEggg	69683f9572	Decompile Battle Palace	2018-11-12 15:41:19 +01:00
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	81410fee17	Factory done	2018-11-11 16:44:27 +01:00
DizzyEggg	0bb51037d7	Finish frontier util	2018-11-01 21:31:10 +01:00
DizzyEggg	3a9eeef844	Frontier, finish ranking hall	2018-10-28 21:11:53 +01:00
DizzyEggg	b330bdba51	More and more battle tower	2018-10-22 19:22:57 +02:00
DizzyEggg	0ab27e44b1	more tower, fail	2018-10-21 20:13:12 +02:00
DizzyEggg	16026fe91d	More battle tower.	2018-10-21 00:06:42 +02: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
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
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -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
garak	624a7552b6	use event flags in event scripts	2018-10-17 09:05:22 -04:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Deokishisu	b52b05368c	Fix "Vigaroth" misspelling in May's House 1F	2018-10-16 12:08:17 -04:00
Deokishisu	e377c323c4	Fix "Vigaroth" misspelling in Brendan's House 1F	2018-10-16 12:07:47 -04: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
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	b4a42a6832	Decompile apprentice	2018-10-14 11:37:44 +02:00
Diegoisawesome	35c6938814	Port/decompile cable_club.s	2018-10-13 12:41:10 -05:00
DizzyEggg	edcf04b665	Document battle dome.	2018-08-25 19:59:47 +02:00
Diegoisawesome	2dd5fc23d4	Prepare learn_move for merge	2018-08-12 12:54:07 -07:00
Diegoisawesome	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
Diegoisawesome	cb9127ccaf	Revert "Rename some specials" ... This reverts commit 658f9351fe.	2018-08-11 15:16:41 -07:00
Diegoisawesome	658f9351fe	Rename some specials	2018-08-11 14:59:43 -07:00
Diegoisawesome	b54793be91	Finish decompiling field_specials	2018-08-11 14:51:54 -07:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -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
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
Diegoisawesome	07ef762770	Merge pull request #275 from Diegoisawesome/master ... Document list_menu.c and main_menu.c	2018-07-15 04:43:03 -07:00
Diegoisawesome	731d6d59bc	Document list_menu.c and main_menu.c	2018-07-15 04:30:37 -07:00
Marcus Huderle	94650495c6	Use map battle scene constants in map headers	2018-07-12 22:45:41 -05:00
Marcus Huderle	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	d53e8137cd	Use weather constants in map headers	2018-07-12 22:15:35 -05:00
Marcus Huderle	d5eb94330a	Use region map section constants in map headers	2018-07-12 21:47:04 -05:00
Marcus Huderle	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
Marcus Huderle	8ffd7a70fc	Use movement type constants in object_event macros	2018-07-10 18:04:51 -05:00
Marcus Huderle	5e00c0bfcf	Fix map constants	2018-06-20 19:54:21 -05:00
Marcus Huderle	135a11e50e	Move events and scripts into map dirs	2018-06-20 19:54:21 -05:00
Marcus Huderle	89d35e82a2	Move 'map attributes' into 'layouts'	2018-06-20 19:54:21 -05:00
Marcus Huderle	f807eb1f2d	Split out movement radius in object_event macro	2018-06-15 07:49:21 -05:00
Marcus Huderle	2807abe3ba	Remove filler bytes from object_event macro	2018-06-15 07:49:21 -05:00
Marcus Huderle	acc1a5d446	Get all map constants from include/ rather than constants/	2018-06-15 07:49:21 -05:00
Marcus Huderle	aa9a45c16f	Rebrand 'map object' and 'field object' to 'event object'	2018-06-11 19:11:48 -05:00
DizzyEggg	0978cc60a1	change map event var names to pokeruby ones	2018-05-19 19:20:32 +02:00
sceptillion	96511dc214	use internal song names	2017-12-22 00:10:20 -08:00
Diegoisawesome	f497c1508b	Split files from event_scripts.s ... Also move maps/scripts to scripts/maps	2017-11-11 16:10:17 -06:00
Diegoisawesome	2e40384fa2	Extract baseroms from event_scripts	2017-11-10 18:12:18 -06:00
Diegoisawesome	a6c30ba951	More file organization	2017-11-10 13:20:27 -06:00
Diegoisawesome	6ecad1a59d	Organize map data	2017-11-10 12:39:00 -06:00
Diegoisawesome	a81deec3b3	Extract unused maps	2017-11-10 11:42:04 -06:00
Diegoisawesome	de8a058714	Extract more baseroms from maps	2017-11-10 02:52:05 -06:00
Diegoisawesome	29079c4b99	Dump numerous baseroms, begin moving data to proper files	2017-11-10 01:49:12 -06:00
Diegoisawesome	2d3044aaa6	Begin map dump cleanup	2017-11-09 19:38:57 -06:00
Diegoisawesome	455a979819	Add dummy Sootopolis map connections	2017-11-09 19:21:54 -06:00
Diegoisawesome	f61810a8f9	Dump maps	2017-11-09 19:21:31 -06:00