1733 Commits

Author	SHA1	Message	Date
Fontbane	9e74409bb2	Fix labels, label more scripts	2019-04-04 19:34:35 -05:00
Fontbane	8b88ef3e01	Document berry tree events	2019-04-04 19:34:35 -05:00
Fontbane	90e32f4ec5	Document landmark setting and item balls	2019-04-04 19:34:35 -05:00
PikalaxALT	c46f271f67	Documentation of ereader_helpers, 1	2019-04-04 19:26:45 -05:00
PikalaxALT	53efbe2832	Finish decomp of union_room_chat	2019-04-04 19:26:45 -05:00
PikalaxALT	a47abb3949	union_room_chat data, 1	2019-04-04 19:26:45 -05:00
Phlosioneer	3b3b2dd031	General cleanup of the second half of contest.c	2019-04-03 20:43:23 -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	28646ea64e	Decompile mevent server scripts	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
Phlosioneer	3a2ea40188	Rename and document more contest setup functions ... Also properly label the link contest flags variable, and label the contest window ID's.	2019-04-03 17:24:32 -04:00
Marcus Huderle	181baf9fe5	Merge remote-tracking branch 'upstream/master' into misc_docs ... # Conflicts: # src/field_weather_effect.c	2019-04-02 18:29:51 -05:00
Marcus Huderle	1241700b20	Finish documenting the other weather effects	2019-04-02 18:28:56 -05:00
DizzyEggg	baa187665b	Document a bit of script menu and battle anims	2019-04-02 16:28:38 -05:00
DizzyEggg	1aa95a1821	Document a bit of anims	2019-04-02 07:31:06 -05: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
Phlosioneer	845307b3a6	Rename contest AI stuff	2019-04-01 22:16:07 -04: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
PikalaxALT	1fe5208560	through sub_801A02C	2019-04-01 12:05:58 -04:00
huderlem	1e8e5af033	Merge pull request #607 from Phlosioneer/contest-data ... Contest data	2019-04-01 07:37:15 -05:00
Phlosioneer	37c7441a15	Merge branch 'master' into contest-data	2019-03-31 20:22:47 -04:00
Phlosioneer	207a54393c	Fix mistakes and use EVENT_OBJ_GFX_* macros	2019-03-31 20:07:24 -04:00
PikalaxALT	ade0183378	Document mystery_gift	2019-03-31 18:59:52 -04:00
PikalaxALT	93c4e35d84	infer additional file split after task00_mystery_gift	2019-03-31 15:43:51 -05:00
PikalaxALT	aafe9df454	through sub_8018798	2019-03-31 15:43:51 -05:00
PikalaxALT	f34cda3b52	Start decompiling mystery gift	2019-03-31 15:43:51 -05:00
PikalaxALT	5a0142da08	infer additional file split after task00_mystery_gift	2019-03-31 15:53:38 -04:00
PikalaxALT	db4e9505ad	Merge branch 'master' into mystery_gift	2019-03-31 10:39:11 -04:00
Marcus Huderle	500d009b5c	Start decompiling berry_crush.c	2019-03-31 09:13:19 -05:00
huderlem	b9bf3bf072	Merge pull request #637 from DizzyEggg/pokeblock_attempt ... Use Pokeblock clean-up and some menu_specialised decomp	2019-03-31 08:39:18 -05:00
DizzyEggg	aa7f69f067	Begin use pokeblock and menu specialised	2019-03-31 12:59:01 +02:00
PikalaxALT	5bf7886a70	through sub_8018798	2019-03-30 14:36:52 -04:00
PikalaxALT	ed53220be2	Start decompiling mystery gift	2019-03-30 13:15:48 -04:00
PikalaxALT	ccac4694cd	Merge branch 'master' into continue_union_room	2019-03-30 12:41:10 -04:00
DizzyEggg	35cffea987	Helpful macros for atk49	2019-03-30 08:29:56 -05:00
Marcus Huderle	accc5ae8dd	Merge remote-tracking branch 'upstream/master' into union_room_chat ... # Conflicts: # ld_script.txt	2019-03-29 21:27:08 -05:00
PikalaxALT	ae0e70d7bb	sub_80179D4 and rodata	2019-03-29 11:57:03 -04:00
PikalaxALT	7c45a7c443	port mevent_801BAAC from fire red	2019-03-28 07:32:25 -05:00
DizzyEggg	5dd653a89e	Use constants in atk89_statbuffchange	2019-03-27 07:47:01 -05:00
Marcus Huderle	af1baa89f1	Start decompiling union_room_chat.c	2019-03-26 21:58:20 -05:00
scnorton	2eba82b0fb	sub_8026634	2019-03-26 11:59:39 -04:00
Marcus Huderle	e6caf0ff10	Port mevent2.c from pokefirered	2019-03-24 18:29:00 -05:00
Marcus Huderle	cf917a8733	Decompile berry_powder.c	2019-03-24 14:50:16 -05:00
Marcus Huderle	456cc3a6f0	Split out the remaining wireless-related files	2019-03-24 13:15:37 -05:00
Marcus Huderle	a5ee2c14fd	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # include/menu_specialized.h	2019-03-23 10:14:31 -05:00
Fontbane	e8add87bf3	Document Field Effects and some related text ... Also VAR_TRICK_HOUSE_LEVEL	2019-03-23 09:57:37 -05:00
Fontbane	7d54c2b960	EventScript and Text Documentation ... In event_script.s. Also renamed a couple events for consistency/detail.	2019-03-23 09:57:37 -05:00
Marcus Huderle	65391a1eb2	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # src/use_pokeblock.c	2019-03-23 09:39:46 -05:00
Marcus Huderle	a7d5f032b1	Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c	2019-03-22 14:16:26 -05:00
Marcus Huderle	f4f666f5af	Finish decompiling ereader.c	2019-03-22 13:36:06 -05:00
Marcus Huderle	7118462b9f	Decompile ereader.c up to faraway island code	2019-03-21 18:28:44 -05:00
Marcus Huderle	e9a3cc6d51	Merge remote-tracking branch 'upstream/master' into move-tutor ... # Conflicts: # include/pokenav.h # src/battle_script_commands.c	2019-03-17 17:20:40 -05:00
Phlosioneer	092608aef6	Add a constant for "no music" on maps.	2019-03-16 12:31:29 -05:00
Phlosioneer	8cea949e6d	Move constant and EWRAM data into C.	2019-03-15 19:33:30 -04:00
Phlosioneer	8e1537fb57	Document map name popup flag	2019-03-10 09:23:58 -05:00
Phlosioneer	13c2f91b11	Moved last contest data into C	2019-03-09 23:51:39 -05:00
Phlosioneer	0c935a8bd5	Move the contest opponent filter to C	2019-03-09 22:54:17 -05:00
Phlosioneer	a32e8e7405	Move gContestOpponents into C ... 2,400 LOC by hand.	2019-03-09 20:56:36 -05:00
Phlosioneer	0e8f94a83e	Last bit of cleanup on contest_opponents	2019-03-09 02:49:57 -05:00
Phlosioneer	153499ed6f	Clean up contest_opponents.inc	2019-03-09 01:38:38 -05:00
Phlosioneer	5b4b0a245b	Move contest winner list to C	2019-03-09 00:01:49 -05:00
Phlosioneer	88c3781880	Move text pointer tables into C	2019-03-08 22:33:40 -05:00
Phlosioneer	b7cfa9d365	Move more contest constants into C	2019-03-08 21:39:51 -05:00
Phlosioneer	b93d923826	Merge branch 'master' into move-tutor	2019-03-08 02:27:20 -05:00
Phlosioneer	eac70acab6	Change filename to something more descriptive	2019-03-08 02:17:01 -05:00
Phlosioneer	aa7657a82a	Move constants into C ... Also figured out what one of the graphics files is for.	2019-03-06 22:58:05 -05:00
Phlosioneer	0da83abad2	Several nonmatching functions ... Huge and difficult.	2019-03-06 22:27:30 -05:00
Phlosioneer	4345ba8e6c	More decompiled and cleanup	2019-03-05 22:32:28 -05:00
DizzyEggg	b150091436	Rename an erroneously named battlescript	2019-03-05 17:06:29 +01:00
Phlosioneer	9bea9e1624	Start decompiling menu_unknown	2019-03-05 06:06:20 -05:00
Phlosioneer	0e3fc4956b	Rename asm file	2019-03-05 00:06:43 -05:00
Phlosioneer	907492fd6e	Split rom asm file in half ... The first half is ui/menu stuff, while the second half is link-related stuff.	2019-03-04 23:26:51 -05:00
Phlosioneer	cae63cf1c7	Rename move tutor to move relearner	2019-03-04 20:56:39 -05:00
Phlosioneer	4ea5e85bed	Fix typos ... This is an updated version of #554, since it hasn't been updated in two weeks.	2019-03-03 09:31:47 -06:00
Phlosioneer	27aa27a2e9	Fix tabs	2019-03-03 02:58:50 -05:00
Phlosioneer	4907ce6f7f	Fully document move_tutor (formerly learn_move)	2019-03-03 02:50:40 -05:00
huderlem	ee9694d9ba	Merge pull request #587 from Phlosioneer/document-all-event-vars ... Document all event vars	2019-03-02 08:24:46 -06:00
Phlosioneer	25050b9944	Fix tabs, do suggested rename	2019-03-02 04:13:27 -05:00
huderlem	3b04cfa437	Merge pull request #551 from Phlosioneer/multiplayer-stuff ... Document overworld.c and link stuff in general	2019-03-01 08:43:55 -06:00
Phlosioneer	a7e5852f1d	More minor fixes	2019-03-01 01:49:11 -05:00
Phlosioneer	459fd93b59	Fix minor errors	2019-03-01 01:18:58 -05:00
hondew	9ed0f77528	fixed issues in data and include dirs	2019-02-28 21:21:56 -06:00
hondew	5c8cc5225f	document slot machine	2019-02-28 21:21:56 -06:00
Phlosioneer	373d73eb3b	Fix last special var	2019-02-28 00:06:27 -05:00
Phlosioneer	bf45b83c65	Finish documenting event vars	2019-02-27 23:54:51 -05:00
Phlosioneer	782979f1fc	Finish documenting trainer hill ... Trainer hill isn't anywhere close to done, but I figured out enough to name the VAR. That's all this PR should do.	2019-02-27 22:16:01 -05:00
Phlosioneer	66f0616a2d	I guess I'm documenting Trainer Hill now	2019-02-27 21:31:05 -05:00
Phlosioneer	e77e7844ea	Name several vars, document some related events	2019-02-27 20:25:09 -05:00
Phlosioneer	648fc3d4f3	Name more unknown vars	2019-02-27 15:18:56 -05:00
Phlosioneer	4137dd7b0b	Identify unused, never read, and never written vars	2019-02-27 14:42:32 -05:00
Marcus Huderle	4b9e93850c	Document easy chat screen types	2019-02-27 12:55:29 -06:00
Phlosioneer	c1348d22f3	Name most event scripts related to unusual weather	2019-02-27 04:27:54 -05:00
Phlosioneer	fe55580fe1	Reverse engineer unusual weather events	2019-02-27 03:42:04 -05:00
Phlosioneer	b8a60b055b	Fix previous merge	2019-02-26 22:11:43 -05:00
Phlosioneer	3a44b090d1	Merge branch 'master' into multiplayer-stuff	2019-02-26 22:07:29 -05:00
Phlosioneer	accea672f1	Incorporate feedback	2019-02-26 22:04:44 -05:00
Marcus Huderle	231355f84d	Decompile easy_chat data	2019-02-26 14:50:02 -06:00
huderlem	b3a7a1278a	Merge pull request #577 from Phlosioneer/weather-15 ... Document the weather state functions	2019-02-25 08:03:22 -06:00
huderlem	84573f1774	Merge pull request #574 from Phlosioneer/event-vars ... Event vars	2019-02-25 08:02:28 -06:00
Phlosioneer	8816aa527d	Update map script files	2019-02-25 08:01:22 -06:00
Phlosioneer	5f7a971313	Source file part of map script renaming	2019-02-25 08:01:22 -06:00
Phlosioneer	1cd5cb09cf	Merge branch 'master' into weather-15	2019-02-25 02:30:35 -05:00
Phlosioneer	4e5fae0086	Merge branch 'master' into event-vars	2019-02-25 02:24:20 -05:00
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
Marcus Huderle	bb508ade64	Decompile more of easy_chat.c	2019-02-24 10:09:57 -06:00
ultima-soul	eb48cc2f7e	Decompile through sub_8167930.	2019-02-23 09:08:07 -08: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
Marcus Huderle	d3f66a98ff	Decompile more easy_chat	2019-02-22 11:46:05 -06: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
Marcus Huderle	b105d20d1e	Decompile chunk of easy_chat.c	2019-02-21 17:46:14 -06:00
Diegoisawesome	1b0079445d	Merge pull request #559 from Phlosioneer/finish-newgame-docs ... Finish and polish new_game.c	2019-02-18 13:28:50 -06: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
Diegoisawesome	047d8288cc	Merge pull request #557 from Phlosioneer/navgear-decompile ... Navgear decompile	2019-02-18 00:34:01 -06: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
Phlosioneer	be08a662a8	More data moved into C code	2019-02-17 23:14:14 -05:00
Phlosioneer	a4aaf279ac	Move more data into pokenav, name some strings	2019-02-17 23:14:14 -05:00
Phlosioneer	bf4c1a73c0	Start moving pokenav data into C files ... The types and usage of many of the globals are now known.	2019-02-17 23:14:14 -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
Phlosioneer	986d3d8b2f	Finish and polish new_game.c ... Only one function is left undocumented. I tried to go into the assembly to at least name it, but it clears fields in the save block that aren't even documented yet.	2019-02-15 03:40:57 -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
Phlosioneer	f2f1b1978b	Done documenting link code in overworld.c	2019-02-10 03:54:50 -05:00
Phlosioneer	3fd878483f	Start renaming symbols ... I finally figured out what the code is trying to do. I have a foothold; the rest should follow.	2019-02-10 00:50:46 -05:00
Marcus Huderle	6f1d2b870c	Give proper names to dynamic map layouts	2019-02-09 09:57:30 -06:00
Marcus Huderle	40dc6833c5	Fully document tileset animations	2019-02-08 15:07:42 -06:00
Marcus Huderle	6add3e1794	Document some battle dome stuff	2019-02-08 11:08:25 -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
huderlem	b0ee100975	Merge pull request #543 from pret/mapdata ... Convert map data to JSON	2019-02-04 21:36:18 -06:00
Marcus Huderle	d4125fef9b	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
DizzyEggg	a7f94bbeea	Dump last battle anim file	2019-02-02 11:55:11 +01: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
Marcus Huderle	e81838dba3	Misc. documentation and move some data into .c files	2019-01-29 14:36:02 -06:00
Diegoisawesome	183b6857ff	Merge pull request #458 from ultima-soul/contest ... Decompile more of contest	2019-01-27 23:08:24 -06:00
Diegoisawesome	6b2dda422b	Merge branch 'master' of github.com:pret/pokeemerald	2019-01-27 00:11:44 -06:00
Diegoisawesome	7a60f36954	Clean up variable numbers mistakenly written as decimal	2019-01-27 00:11:32 -06:00
DizzyEggg	01c3f3fc05	Document all of frontier pass	2019-01-26 20:56:06 +01:00
DizzyEggg	ebfaf3f6be	Merge branch 'master' into dump	2019-01-24 21:30:19 +01: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	4e396207d3	document more of trainer card	2019-01-20 18:24:35 +01:00
DizzyEggg	576d1b3474	Document and match somne trainer card	2019-01-19 23:04:33 +01:00
DizzyEggg	f84b22fca4	Dump trainer hill trainers	2019-01-19 12:57:18 +01:00
Diegoisawesome	6857b73ee3	Split pokenav so calcrom works properly	2019-01-14 15:25:29 -06:00
DizzyEggg	edddd847c5	Document and clean up trainer hill	2019-01-13 20:50:08 +01:00
DizzyEggg	c0bc01d301	Move some vars to C	2019-01-13 13:15:23 +01:00
ultima-soul	284751e761	Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.	2019-01-06 13:41:18 -08:00
Slawter666	f8c2fcb9b2	Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base	2019-01-05 19:54:26 +00:00
Tetrable	30e7ac0dca	Fix merge conflicts	2019-01-03 02:28:18 +00:00
Tetrable	50aa222aff	Corrected typos	2019-01-03 01:54:55 +00:00
Marcus Huderle	b471bba55e	Use better names for match call texts	2019-01-02 19:46:15 -06:00
Marcus Huderle	e1092028ec	Decompile match_call.c	2019-01-02 19:46:15 -06:00
Diegoisawesome	0053e61535	Merge pull request #504 from Diegoisawesome/roulette ... Port/decompile roulette	2019-01-02 17:00:33 -06:00
Diegoisawesome	6202ae1df0	Extract rodata from roulette	2019-01-02 16:40:40 -06: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	af1e44befe	Continue porting roulette	2018-12-31 18:07:29 -06:00
Marcus Huderle	fb2d1591c1	Document more battle anim effects	2018-12-31 16:53:38 -06:00
Diegoisawesome	d004ce065c	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-31 02:30:30 -06:00
Diegoisawesome	c5c6e437ec	Document, cleanup, extract data from trade	2018-12-31 01:23:27 -06:00
Marcus Huderle	58f130d007	Document some battle anims and helpers	2018-12-30 11:04:17 -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	6e7bdb3ca4	Document misc field_specials things	2018-12-29 11:36:54 -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	c3dde7353d	Add newline to Route111_NoMirageTower layout.inc ... To match all other layout.inc files.	2018-12-26 17:04:24 -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	a54aa03d20	Merge pull request #475 from DizzyEggg/learn ... asm party and fldeff clean-up	2018-12-24 16:50:14 -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
DizzyEggg	442b1826a2	asm party and fldeff clean-up	2018-12-24 21:59:05 +01:00
Diegoisawesome	81b38c00e4	Merge pull request #466 from melthelesbian/compare_macros ... improve compare macros	2018-12-23 11:17:30 -06:00
DizzyEggg	efa820469a	move data to c	2018-12-23 14:52:47 +01:00
DizzyEggg	6d57a9dfc8	start data converting	2018-12-23 13:52:53 +01:00
Diegoisawesome	ebbe826133	Merge pull request #437 from DizzyEggg/storage ... Pokemon Storage System	2018-12-22 16:12:27 -06: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
golem galvanize	314b718471	finish porting ice	2018-12-21 01:37:59 -05:00
DizzyEggg	ecee02816d	Merge with master	2018-12-20 22:53:08 +01:00
DizzyEggg	7dcb614cca	PSS is done	2018-12-20 22:14:36 +01:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
Marcus Huderle	b7ce383a96	Document a bunch of battle anims	2018-12-19 21:19:44 -06:00
Diegoisawesome	48d7c0a7a3	Merge pull request #454 from golemgalvanize/decompile_party_menu ... Decompile party menu	2018-12-19 19:57:31 -06:00
Melody	5e6ceeb631	update applymovement to remove magic numbers	2018-12-19 14:08:01 -05:00
Marcus Huderle	d2b5a0e83f	Convert battle_anim_815A0D4 data to .c	2018-12-18 19:15:59 -06:00
golem galvanize	8781d969ff	finish party_menu	2018-12-18 05:38:08 -05:00
Marcus Huderle	c74468fd11	Document a bunch of battle anim stuff	2018-12-17 22:16:17 -06:00
Marcus Huderle	c04ce0ee64	Decompile battle_anim_effects_2.c	2018-12-17 22:16:17 -06:00
DizzyEggg	9ffd0c7382	3.5 asm left	2018-12-17 23:00:08 +01:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05:00
DizzyEggg	aae36b5653	6k left	2018-12-16 21:10:01 +01:00
DizzyEggg	f1421d94c3	Up to sub 0x80ce580	2018-12-15 23:58:47 +01:00
Marcus Huderle	1ca3656d74	Decompile contest_painting.c (#447)	2018-12-15 13:07:07 -06:00
Marcus Huderle	5e92481f51	Merge pull request #443 from Meowsy/misc-renamings ... Misc renamings.	2018-12-13 21:35:36 -06:00
Marcus Huderle	2c6849bee8	Decompile battle_anim_8170478.c (#445)	2018-12-13 21:33:54 -06:00
Marcus Huderle	170b6ef449	Decompile battle_intro.c (#444)	2018-12-12 23:18:25 -06:00
DizzyEggg	59a69eb627	Storage up to icon palettes	2018-12-12 23:19:50 +01:00
DizzyEggg	c5b5f4bd77	More storage	2018-12-10 23:42:44 +01:00
Meowsy	d3e32ab287	Rename Mauville Man text.	2018-12-10 15:50:10 -05:00
DizzyEggg	c2d8876174	Document PSS functions	2018-12-10 21:36:52 +01:00
Diegoisawesome	bfdfe367e8	Merge pull request #422 from garakmon/frontier_data_1 ... Battle tower data	2018-12-10 11:22:16 -06: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
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
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
DizzyEggg	4c23adb5f5	Decompile field weather	2018-12-08 19:05:03 +01: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
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
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
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	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
DizzyEggg	7cfe0342f0	Finish frontier data	2018-11-27 22:45:50 +01:00
garak	f316d53c58	Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data	2018-11-27 13:28:44 -05:00
garak	2707bd9b91	clean frontier data	2018-11-27 13:27:49 -05:00
garak	a636005066	delete createsprite.py	2018-11-27 11:40:29 -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
Slawter666	deb7adbad5	Convert pokédex data to C	2018-11-27 04:00:38 +00:00
Marcus Huderle	fb6120da5b	Fixup some names	2018-11-25 15:50:54 -06:00
Marcus Huderle	72f0a079a9	Decompile all of battle_anim_utility_funcs	2018-11-19 09:37:25 -06: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
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
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	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	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
Diegoisawesome	7dd4ed7060	r5/r6 swap on sub_80E2578	2018-11-05 14:45:54 -06:00
DizzyEggg	0bb51037d7	Finish frontier util	2018-11-01 21:31:10 +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	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
Diegoisawesome	c8ef69a00d	Merge pull request #372 from garakmon/sprite-tags ... Synchronize sprite tags	2018-10-30 11:26:44 -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	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
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
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
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
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
garak	ecd482fa2c	fix merge conflicts in battle_anim_scripts	2018-10-19 16:19:36 -04: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
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
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05: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
Slawter666	1435c96b41	Further synchronisation	2018-10-17 01:11:44 +01: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
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
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05: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
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	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +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	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
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	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
Marcus Huderle	b9e38a569e	Merge pull request #320 from DizzyEggg/anims ... Document battle animation scripts	2018-10-06 08:20:41 -05:00
DizzyEggg	17c5b4089a	Label most of the anim tags	2018-10-06 09:37:52 +02:00
Tetrable	e80a53060b	Start anim tags	2018-10-05 23:00:07 +01: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	66fd9b2ddf	Label trainer hill battle type	2018-09-20 22:00:00 +02:00
Marcus Huderle	f2a76b54bd	Re-dump tileset images as RGB-indexed, rather than greyscale	2018-09-16 11:07:48 -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	2a7811456a	Add anim tag sprite defines	2018-09-15 00:30:20 +02: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
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
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +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
Diegoisawesome	cf8f73bde1	Merge pull request #314 from Slawter666/data ... Convert data to C	2018-09-07 11:39:07 -05:00
Marcus Huderle	fa9d1759bd	checkpoint	2018-09-06 11:37:45 -05:00
Slawter666	9ad7dc9fd7	Move remaining field_player_avatar data across	2018-09-06 12:02:37 +01:00
Slawter666	26c91f1502	Move field_player_avatar data to C	2018-09-06 03:11:33 +01:00
Diegoisawesome	f8f7a8e300	Merge pull request #304 from Slawter666/graphics ... Move data from graphics.s to C	2018-09-05 20:32:23 -05:00
Slawter666	9350ac0a74	Move battle_pyramid_bag data to C	2018-09-06 01:24:11 +01:00
Slawter666	07c2882390	Move starter_choose data to C	2018-09-06 00:47:29 +01:00
Slawter666	5656ceab6c	Move graphics to src/data/graphics	2018-09-05 23:53:54 +01:00
DizzyEggg	75384546b5	More factory decomp and documentation.	2018-09-05 23:30:15 +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	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00
Diegoisawesome	8e5c72766c	Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 ... Decompile battle_dome	2018-08-29 14:13:39 -05:00
Slawter666	e30c2251ce	Convert more of data2b	2018-08-27 00:26:54 +01:00
DizzyEggg	ddd4733de3	rename battle pyramid to battle pyramid bag	2018-08-26 17:54:58 +02:00
Slawter666	69c20f18ac	Convert battle dome data to C	2018-08-26 13:40:36 +01:00
DizzyEggg	2b7c138cbe	Some labels	2018-08-25 21:04:12 +02:00
DizzyEggg	447e65860c	Merge branch 'master' into decompile_battle_frontier_1	2018-08-25 20:02:09 +02:00
DizzyEggg	edcf04b665	Document battle dome.	2018-08-25 19:59:47 +02:00
Slawter666	6b145ed77c	Move data from graphics.s to C	2018-08-24 04:21:07 +01:00
Slawter666	ed24233274	Convert more of data2b.s to C	2018-08-22 23:03:44 +01:00
Slawter666	4db5ef3ae6	Convert more data	2018-08-22 21:41:34 +01:00
Slawter666	ef6a3c2278	Move some data from data2b.s to C	2018-08-22 14:34:36 +01:00
DizzyEggg	5da12f2b21	battle dome - more work	2018-08-19 22:26:07 +02:00
DizzyEggg	e4649245ba	this file is too much	2018-08-18 19:52:25 +02:00
DizzyEggg	0bfe894566	Merge with master	2018-08-16 22:53:01 +02:00
Diegoisawesome	13dc7a4170	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-15 16:22:54 -07:00
Diegoisawesome	ac3f4fd994	Continue documentation and cleanup of pokemon_summary_screen	2018-08-15 11:51:47 -07:00
DizzyEggg	92c4fc6345	Contest AI clean-up	2018-08-15 11:50:18 +02:00
Diegoisawesome	332a8bcb1d	Extract rodata for unk_pokedex_area_screen_helper	2018-08-14 22:37:59 -07:00
Diegoisawesome	a07d69d7c2	Finish pokemon_summary_screen	2018-08-14 22:00:35 -07:00
DizzyEggg	1a0e6f7aed	match contest effect	2018-08-13 21:24:11 +02:00
DizzyEggg	0d68af7f06	copy contest effect from ruby	2018-08-12 23:20:17 +02:00
Diegoisawesome	9a73a47ddd	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 12:55:21 -07:00
Diegoisawesome	2dd5fc23d4	Prepare learn_move for merge	2018-08-12 12:54:07 -07:00
Diegoisawesome	25832810f6	Merge pull request #288 from DizzyEggg/slot_machine ... Port a little bit of slot machine	2018-08-12 12:27:23 -07:00
Diegoisawesome	6bb761a711	Merge pull request #277 from atasro2/player_field_avatar ... decompile a portion of field_player_avatar.s	2018-08-12 12:09:09 -07:00
Diegoisawesome	26e18f2292	Merge pull request #289 from DizzyEggg/contests ... Pikalax's contests	2018-08-12 12:04:53 -07:00
MCboy	1bc93c5a66	Merge branch 'master' into player_field_avatar	2018-08-12 23:26:00 +04:30
DizzyEggg	7dac22314e	Decompile a bit of pokemon storarage system	2018-08-12 16:40:31 +02:00
DizzyEggg	957dcd01b3	merge with master	2018-08-12 12:11:35 +02:00
Diegoisawesome	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
Diegoisawesome	cf9518f237	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-11 16:32:03 -07:00
Diegoisawesome	cb9127ccaf	Revert "Rename some specials" ... This reverts commit 658f9351fe.	2018-08-11 15:16:41 -07:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02: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
DizzyEggg	537ebd36ac	Merge contests with master	2018-08-11 19:04:28 +02:00
DizzyEggg	0e0d103044	port more of slot machine	2018-08-11 18:47:56 +02:00
Diegoisawesome	1e0f3ec433	Continue decompiling field_specials	2018-08-10 14:07:23 -07:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04:00
Diegoisawesome	12ff59f9c1	Continue decompiling field_specials	2018-08-10 00:42:06 -07:00
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
DizzyEggg	3d5f512aec	Use constant in a battle script.	2018-08-03 18:07:45 +02:00
DizzyEggg	9febcd3a0a	Document a bit of atk47	2018-07-29 15:51:08 +02:00
DizzyEggg	68145cd002	Document atk48	2018-07-29 15:33:16 +02:00
Diegoisawesome	7270e73fee	Move strings to C	2018-07-25 01:15:36 -07:00
Diegoisawesome	e92e2cb0aa	Merge branch 'master' of github.com:pret/pokeemerald	2018-07-24 21:18:36 -07:00
Diegoisawesome	156fb472e1	Clean up files and add entries to charmap	2018-07-24 21:18:23 -07:00
Diegoisawesome	5883f867f0	Merge pull request #278 from vblm12/trainer_data ... Move some trainer data into c structs	2018-07-24 18:58:56 -07:00
MCboy	1b3d7a5bef	Update field_player_avatar.s	2018-07-24 17:04:02 +04:30
DizzyEggg	1e9143e0b2	merge union room with master	2018-07-22 13:14:58 +02:00
DizzyEggg	c9d486a5d3	make union room compile i guess	2018-07-22 12:49:49 +02:00
vblm12	3d04105488	Remove unnecessary files.	2018-07-21 01:51:44 -05:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
DizzyEggg	ea5ffa3375	Merge with master	2018-07-16 20:23:05 +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
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02:00
Diegoisawesome	5189442bcc	Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut	2018-07-05 20:32:12 -07:00
DizzyEggg	c556358e47	label multiuse sprite template functions	2018-07-01 15:28:57 +02:00
DizzyEggg	f35c0abe80	merge with battle tent update	2018-07-01 12:16:52 +02:00
DizzyEggg	d2e47323fe	document frontier related	2018-07-01 11:15:42 +02:00
DizzyEggg	2d0be91217	Move all trainer defines to trainers.h and identify frontier brain trainer id	2018-06-30 18:55:34 +02:00
DizzyEggg	15fe5a031b	Merge branch 'master' into decompile_battle_tent	2018-06-30 14:43:41 +02:00
DizzyEggg	30c85a5128	more battle documentation	2018-06-30 14:12:17 +02:00
DizzyEggg	272b98da6c	document party status summary	2018-06-28 21:06:32 +02:00
Marcus Huderle	91ee3221b3	Formatting	2018-06-20 19:54:21 -05:00
Marcus Huderle	5e00c0bfcf	Fix map constants	2018-06-20 19:54:21 -05:00
Marcus Huderle	ed8b006e67	Rename map-layout-related things	2018-06-20 19:54:21 -05:00