2846 Commits

Author	SHA1	Message	Date
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
KDSKardabox	4233ae50c3	Finish decompile ghost	2018-12-09 18:38:15 +05:30
DizzyEggg	c46499b05c	field screen review changes	2018-12-09 12:16:01 +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
nullableVoidPtr	cceb8ac331	Remove trailing whitespace	2018-12-09 11:32:58 +08:00
DizzyEggg	4d2f1bad7f	fix header	2018-12-08 22:12:44 +01: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
KDSKardabox	5630ab2b1e	Fully decompile fire	2018-12-08 17:55:17 +05:30
KDSKardabox	0f82e5caf7	Intial commit for decomp fire	2018-12-08 15:15:52 +05:30
nullableVoidPtr	f50faac244	Clean more tables	2018-12-08 14:10:30 +08:00
nullableVoidPtr	8a8baaeaaa	Merge remote-tracking branch 'upstream/master'	2018-12-08 12:13:15 +08:00
nullableVoidPtr	907ed3f5f5	Format pokemon.c	2018-12-08 11:39:35 +08:00
nullableVoidPtr	4d307a6f63	Clean some more arrays	2018-12-08 11:33:41 +08:00
DizzyEggg	6068495619	Document trainer battle scripts (#430)	2018-12-07 16:50:56 -06:00
golem galvanize	53fac4417b	fixing merge conflicts	2018-12-07 14:47:20 -05:00
Melody	2615ece23b	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00
nullableVoidPtr	4fc3fa9e44	Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines	2018-12-07 20:18:24 +08:00
golem galvanize	18124740a4	pushing so I can merge	2018-12-06 23:14:33 -05:00
Diegoisawesome	6df2042b3b	Merge pull request #427 from Slawter666/pokedex ... Document some more of pokedex.c	2018-12-06 13:39:32 -06: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
DizzyEggg	fc806b966e	Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald into help_garak	2018-12-05 21:24:01 +01:00
Melody	2347e36d60	document pokédex options	2018-12-05 10:10:33 -05:00
Slawter666	9cfed81789	Document some more of pokedex.c	2018-12-05 00:15:22 +00: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	e69cb6b276	update frontier class names	2018-12-03 17:21:34 -05:00
garak	2c14d6ee6c	fix merge conflicts	2018-12-03 16:58:28 -05:00
DizzyEggg	bac1f1b6c9	Match and clean rotating_gate.c ... One more down, many more to go.	2018-12-03 21:44:47 +01:00
DizzyEggg	c7dd347bb1	Match battle_tower.c function ... For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO	2018-12-03 21:09:26 +01:00
DizzyEggg	ba1fc05558	tabs	2018-12-03 18:10:03 +01: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	e1829c40ab	Clean up safari zone	2018-12-03 17:31:34 +01:00
DizzyEggg	2821eafb99	Clean up roamer	2018-12-03 17:19:10 +01:00
DizzyEggg	dcb1d78fa9	Add battle controllers var to src from sym_ewram	2018-12-03 16:20:39 +01:00
DizzyEggg	846b5d79e4	Get rid of headers in src/data	2018-12-03 16:10:41 +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	44af811033	index trainer front anims ptr table	2018-12-03 08:36:10 -05:00
Melody	2779421ad4	fix brendan/may/wally consistency issues	2018-12-03 08:01:52 -05:00
DizzyEggg	d8b952f94c	Clean up items data	2018-12-03 13:37:32 +01: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	72bd670ba6	index trainer class lookups	2018-12-02 22:35:31 -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
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	a42bfd7a0e	fix brackes n ne file	2018-12-02 19:27:56 +01:00
DizzyEggg	b87e6a4e57	Get rid of static functions in includes	2018-12-02 18:58:33 +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
Melody	c7f52c4203	cleans up trainer name defines	2018-12-01 22:49:33 -05:00
DizzyEggg	b082f000af	Start working on link rfu	2018-12-01 18:54:59 +01:00
Marcus Huderle	0e32a3adf3	Decompile normal.c (#414)	2018-11-30 17:29:55 -06:00
DizzyEggg	0ad4795e69	Match 2 field effect functions	2018-11-30 23:16:15 +01:00
Marcus Huderle	9dd7f8f214	Decompile pokedex_area_screen.c (#412)	2018-11-30 10:41:03 -06:00
DizzyEggg	f87e68379c	match 2 field functions	2018-11-29 21:19:00 +01:00
Diegoisawesome	a7a317f6cc	Merge pull request #408 from DizzyEggg/pass_time ... Match 3 link rfu functions	2018-11-28 16:51:53 -06:00
DizzyEggg	f54f5b3531	Match 3 link rfu functions	2018-11-28 23:08:20 +01:00
DizzyEggg	0ed2f54d61	Use MAX_SPRITES define	2018-11-28 21:08:22 +01:00
Marcus Huderle	0148e38973	Decompile pokedex_cry_screen.c (#406)	2018-11-28 10:14:32 -06:00
Marcus Huderle	9fafa63743	Finish decompiling internation_string_util.c	2018-11-27 17:21:23 -06:00
DizzyEggg	7cfe0342f0	Finish frontier data	2018-11-27 22:45:50 +01:00
garak	50f00b0827	Merge remote-tracking branch 'upstream/master' into fldeff	2018-11-27 13:31:07 -05:00
garak	2707bd9b91	clean frontier data	2018-11-27 13:27:49 -05:00
garak	73cce79753	Merge remote-tracking branch 'upstream/master' into frontier-data	2018-11-27 11:35:19 -05:00
garak	091b5194e7	frontier pike and pyramid data	2018-11-27 11:21:48 -05:00
nullableVoidPtr	556bdd52e1	Clean up aligned variables in src/	2018-11-27 19:37:29 +08:00
Slawter666	deb7adbad5	Convert pokédex data to C	2018-11-27 04:00:38 +00:00
Marcus Huderle	382ff45452	Merge pull request #396 from DizzyEggg/attempt ... Match some functions	2018-11-26 16:58:19 -06:00
Marcus Huderle	c233dbb220	Merge pull request #400 from DizzyEggg/util ... Match sub_080F8970	2018-11-26 16:57:36 -06:00
Jefferson Steelflex	af08f3bb13	Update back_pic_coordinates.h	2018-11-26 16:55:37 -05:00
Jefferson Steelflex	8e5e4c2304	Fix labels, shifted off by one.	2018-11-26 16:51:08 -05:00
DizzyEggg	132a486169	Match 0x0F8970	2018-11-26 21:54:51 +01:00
DizzyEggg	c9b3f3e3cb	Fix indentation	2018-11-26 20:19:52 +01:00
Marcus Huderle	2425a14b19	Decompile fight.c	2018-11-26 10:25:51 -06:00
Marcus Huderle	35c0fb5154	Decompile ground.c	2018-11-26 09:55:31 -06:00
Marcus Huderle	839c629d5b	Decompile dragon.c	2018-11-26 09:31:03 -06:00
Marcus Huderle	9b1f2ccf5e	Decompile poison.c	2018-11-26 09:13:45 -06:00
Marcus Huderle	2c2431aa4c	Decopmile bug.c (#399)	2018-11-26 09:03:50 -06:00
Marcus Huderle	5947e0d229	Decompile rock	2018-11-25 17:00:18 -06:00
Marcus Huderle	19e235867a	Merge pull request #395 from Slawter666/battle-ui-doc ... Document some battle ui	2018-11-25 15:58:37 -06:00
Marcus Huderle	fb6120da5b	Fixup some names	2018-11-25 15:50:54 -06:00
Marcus Huderle	256bfc3caa	Decompile script_pokemon_util_80F87D8	2018-11-25 15:32:22 -06:00
DizzyEggg	8e10d7c0e5	Match some functions	2018-11-25 20:16:41 +01:00
Slawter666	3b501cb470	Document battle ui	2018-11-22 01:10:50 +00:00
DizzyEggg	a900a51a59	match DecompressGlyphTile nicer	2018-11-21 23:30:50 +01:00
DizzyEggg	d70c3a94c5	match DecompressGlyphTile nicer	2018-11-21 23:30:04 +01:00
DizzyEggg	c7ca38ccf3	Match DecompressGlyphTile	2018-11-21 21:58:35 +01:00
garak	f02cb667bb	first 4 functions in fldeff	2018-11-20 09:51:54 -05:00
DizzyEggg	58a1bba059	tabs to spaces	2018-11-19 20:25:09 +01:00
DizzyEggg	f0ec68c058	add include	2018-11-19 18:14:28 +01:00
DizzyEggg	9f8bcadad5	apprentice and factory screen common symbols	2018-11-19 18:06:15 +01:00
DizzyEggg	37d49b34e0	Move vars to battle_main.c	2018-11-19 17:36:39 +01:00
DizzyEggg	5d5b4b853c	Merge branch 'master' into frontier	2018-11-19 17:32:32 +01:00
DizzyEggg	8a00334102	document mossdeep gym	2018-11-19 17:31:46 +01:00
DizzyEggg	d22c2110de	Decompile mossdeep hym	2018-11-19 17:16:01 +01:00
DizzyEggg	6a5b20ee8a	Fix fossil specials	2018-11-19 17:15:28 +01:00
Marcus Huderle	72f0a079a9	Decompile all of battle_anim_utility_funcs	2018-11-19 09:37:25 -06:00
DizzyEggg	95d3c180cc	clean up variables in files	2018-11-19 01:03:14 +01:00
DizzyEggg	f58cc47e17	USE RGB constants in hall of fame	2018-11-18 20:32:27 +01:00
DizzyEggg	27ee7d567e	fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT	2018-11-18 20:19:10 +01:00
Diegoisawesome	0bbe03f170	Merge pull request #388 from DizzyEggg/clean_savve ... Clean up save related files	2018-11-18 13:13:56 -06:00
DizzyEggg	682e6c8512	Use RGB constants in save files	2018-11-18 20:09:11 +01:00
DizzyEggg	1b0cfb0757	Party Size and Num Stats	2018-11-18 20:00:36 +01:00
DizzyEggg	7ce3473b0e	Clean up save related files	2018-11-18 19:37:18 +01:00
DizzyEggg	4803a31b84	Fix unk5 field	2018-11-18 17:54:15 +01:00
DizzyEggg	4e37723288	Document Battle Pyramid	2018-11-18 17:52:22 +01:00
DizzyEggg	40a44a8508	more battle pytamid	2018-11-17 22:55:39 +01:00
DizzyEggg	eb66b60f38	Begin battle pyramid	2018-11-17 15:30:34 +01:00
Slawter666	4311fd8b89	Sort includes into alphabetical order	2018-11-14 00:01:50 +00:00
Slawter666	6fcf878e2f	Tidy up header files	2018-11-13 22:28:46 +00:00
Slawter666	1d46507110	Move field effects enum to defines	2018-11-13 14:19:04 +00:00
DizzyEggg	b5ea69cf74	Fix conflicts	2018-11-12 19:22:23 +01:00
DizzyEggg	734403fdfa	Merge branch 'master' into frontier_2	2018-11-12 15:42:44 +01:00
DizzyEggg	69683f9572	Decompile Battle Palace	2018-11-12 15:41:19 +01:00
Slawter666	1b895ff52c	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-11-12 14:14:50 +00:00
Slawter666	be33878b94	Synchronise wallclock.c	2018-11-12 14:04:32 +00:00
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	3b3cffac44	Decompile battle pike	2018-11-12 14:07:31 +01:00
DizzyEggg	4fb463377c	Start battle pike	2018-11-12 00:46:02 +01:00
DizzyEggg	a4235c9ff8	Document battle arena	2018-11-11 18:33:16 +01:00
DizzyEggg	81410fee17	Factory done	2018-11-11 16:44:27 +01:00
DizzyEggg	1437755cdd	Start arena	2018-11-07 22:54:42 +01:00
Diegoisawesome	65f053fd89	Thanks Egg	2018-11-07 14:48:06 -06:00
DizzyEggg	01fdb01364	Diego pls	2018-11-07 21:09:54 +01:00
Diegoisawesome	9f50ba1ce3	Fix incorrect compressed types, part 2	2018-11-07 12:35:31 -06:00
Diegoisawesome	18839a4872	Merge remote-tracking branch 'pret/master' into script_menu	2018-11-06 20:20:56 -06:00
Diegoisawesome	054a015c95	Finish decompiling/porting script_menu	2018-11-06 20:13:40 -06:00
Slawter666	15117a8d09	Remove redundancy in berry.c	2018-11-06 23:15:57 +00:00
Diegoisawesome	9afe7a896e	Merge remote-tracking branch 'pret/master' into render_text	2018-11-06 11:40:17 -06:00
Diegoisawesome	43a8534fce	Merge remote-tracking branch 'origin/master' into render_text	2018-11-06 11:33:21 -06:00
Diegoisawesome	f8d337e491	Finish cleaning up text.c	2018-11-06 11:30:21 -06:00
Diegoisawesome	6d38431c33	Begin cleaning text.c	2018-11-06 10:44:48 -06:00
DizzyEggg	258ec3162f	frontier util review changes	2018-11-05 22:13:59 +01:00
Diegoisawesome	7dd4ed7060	r5/r6 swap on sub_80E2578	2018-11-05 14:45:54 -06:00
DizzyEggg	487a6c2b2c	this file is	2018-11-05 21:42:12 +01:00
DizzyEggg	6d0d69f3a5	Match Render Text	2018-11-04 23:09:10 +01:00
Slawter666	bd766b9049	Minor labelling of field effects	2018-11-03 20:20:28 +00:00
DizzyEggg	3159e958b8	Match a record mixing function	2018-11-03 18:21:33 +01:00
DizzyEggg	0bb51037d7	Finish frontier util	2018-11-01 21:31:10 +01:00
DizzyEggg	37d742cbd8	Document recorded battle	2018-11-01 15:06:50 +01:00
Diegoisawesome	645830624d	Continue script_menu.c	2018-10-31 23:03:41 -05:00
DizzyEggg	7de1c4bd14	Make frontier util compile	2018-10-30 22:17:03 +01:00
DizzyEggg	90ef269426	Merge branch 'master' into battle_frontier_2	2018-10-30 21:48:18 +01:00
DizzyEggg	0da7d7e6ae	why is this function so hard to match	2018-10-30 21:45:26 +01:00
Diegoisawesome	9adbb5d871	Merge pull request #375 from garakmon/animation-test-temp ... Back animation names	2018-10-30 12:00:37 -05:00
Diegoisawesome	2837859bdb	Merge pull request #373 from garakmon/battle-anim ... Split battle_anim_80FE840 and move data to C	2018-10-30 11:53:05 -05:00
garak	3cb7a33f42	label back animations	2018-10-30 12:37:53 -04:00
Diegoisawesome	c8ef69a00d	Merge pull request #372 from garakmon/sprite-tags ... Synchronize sprite tags	2018-10-30 11:26:44 -05:00
Diegoisawesome	f3af20d3cf	Merge pull request #370 from DizzyEggg/battle_tower ... Decompile Battle Tower	2018-10-30 11:18:24 -05:00
DizzyEggg	3a9eeef844	Frontier, finish ranking hall	2018-10-28 21:11:53 +01:00
DizzyEggg	98d8dbfd8a	Up to sub_81a443c	2018-10-28 00:50:06 +02:00
DizzyEggg	e850517123	more battle frontier 2	2018-10-27 21:01:35 +02:00
DizzyEggg	269d7c2510	up to factory	2018-10-27 17:39:05 +02:00
DizzyEggg	826d0ea2ab	Begin frontier records	2018-10-27 15:44:29 +02:00
DizzyEggg	b252bd0292	Window priority to window bg	2018-10-27 00:53:07 +02:00
DizzyEggg	0e6fbbfe09	Make battle tower compile	2018-10-27 00:04:18 +02:00
DizzyEggg	52be8eeaf1	Merge branch 'master' into battle_tower	2018-10-26 23:55:36 +02:00
DizzyEggg	dc273cc19d	Battle tower - ewram variables	2018-10-26 23:54:41 +02:00
garak	7747a891a2	finish 80FE840 data (actually)	2018-10-25 18:59:05 -04:00
garak	de90ce9123	finish 80FE840 data (almost)	2018-10-25 17:46:23 -04:00
DizzyEggg	1efdaebe23	finish decompiling battle tower	2018-10-25 21:27:10 +02:00
garak	17c26fae1a	fire, electric, ice data	2018-10-24 20:01:40 -04:00
DizzyEggg	549b669f2a	battle tower, match sth and dumb loop instead of goto	2018-10-24 23:14:45 +02:00
garak	22a0b58e57	effects_2 and water data	2018-10-24 15:52:21 -04:00
garak	2f4b00e34b	finish effects_1 data	2018-10-23 12:17:31 -04:00
garak	68814c42de	begin 80FE840 data	2018-10-23 08:25:51 -04:00
DizzyEggg	b330bdba51	More and more battle tower	2018-10-22 19:22:57 +02:00
garak	d267fcbfb1	name remaining tags	2018-10-22 10:36:43 -04:00
garak	2b9fd18dd4	battle_anims.s data to C	2018-10-21 22:30:20 -04:00
garak	f2363f5982	more tag names	2018-10-21 19:30:27 -04:00
Diegoisawesome	32d2640dc7	Match GameClear (thanks Egg)	2018-10-21 16:24:43 -05:00
DizzyEggg	0ab27e44b1	more tower, fail	2018-10-21 20:13:12 +02:00
Diegoisawesome	8e7202ec3d	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
Diegoisawesome	97bbb326b8	GameClear nonsense	2018-10-20 19:53:41 -05:00
golem galvanize	ba3247d5cd	decompiled more, stuck on sub_81B1760	2018-10-20 20:25:28 -04:00
Slawter666	3d8874d919	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-10-21 00:20:09 +01:00
DizzyEggg	16026fe91d	More battle tower.	2018-10-21 00:06:42 +02:00
Slawter666	7a072d4527	Continue synchronising	2018-10-20 21:01:45 +01:00
Diegoisawesome	2a3ba78831	Merge pull request #369 from garakmon/pan-constants ... Use sound pan constants in data/battle_anim_scripts.s	2018-10-19 20:27:54 -05:00
DizzyEggg	f4e55999a5	begin porting and decomping battle tower	2018-10-20 00:33:51 +02:00
garak	38fcc46abb	Merge remote-tracking branch 'upstream/master' into pan-constants	2018-10-19 16:05:14 -04:00
garak	901f3ff557	use sound panning constants in battle_anim_scripts	2018-10-19 15:57:19 -04:00
Diegoisawesome	bf8fa23462	Merge pull request #365 from garakmon/event-flags ... [WIP] Event flags	2018-10-19 14:24:34 -05:00
garak	113a8d1efd	clean flags and remove temp macro	2018-10-19 14:59:18 -04:00
Diegoisawesome	95d8815721	Merge pull request #368 from Diegoisawesome/master ... Finish porting/decompiling field_player_avatar	2018-10-19 00:08:59 -05:00
Diegoisawesome	dd3689fdbf	Finish porting/decompiling field_player_avatar	2018-10-19 00:05:54 -05:00
garak	cb5981cdf2	name more event flags	2018-10-18 21:32:21 -04:00
garak	c27043bd3c	more event flags	2018-10-18 15:28:59 -04:00
DizzyEggg	dfee5deca8	Move Bitmap struct and clear sprite/text files	2018-10-18 21:24:37 +02:00
Diegoisawesome	b23dc9a123	Merge pull request #366 from Diegoisawesome/master ... Finish shop and fldeff_escalator	2018-10-18 12:08:38 -05:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
golem galvanize	dded980cde	fix building	2018-10-17 23:36:18 -04:00
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -04:00
golem galvanize	2c6d634acd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-10-17 20:03:31 -04:00
golem galvanize	65a0c48eec	decompiled some more of the file	2018-10-17 20:03:02 -04:00
garak	7d88b9647f	Merge branch 'master' into event-flags	2018-10-17 12:30:45 -04:00
garak	ff97873c30	label temp flags, test replace script	2018-10-17 12:25:12 -04:00
Slawter666	b7b1d609d0	More synchronisation	2018-10-17 13:52:26 +01:00
Diegoisawesome	f67bbbdaaa	Merge pull request #364 from Diegoisawesome/master ... Port/decompile field_control_avatar	2018-10-16 21:54:14 -05:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Slawter666	1435c96b41	Further synchronisation	2018-10-17 01:11:44 +01:00
DizzyEggg	1f358fbb07	Use constants	2018-10-16 22:34:53 +02:00
Slawter666	3aff112127	Begin synchronising with pokeruby	2018-10-16 14:55:16 +01: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
Deokishisu	94bec0b8db	Fix Double Underscores ... Whoops.	2018-10-14 16:14:01 -04:00
Deokishisu	d7ba8a306c	Rename OW Sprites ... Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed. Renamed: LittleBoy1 -> NinjaBoy LittleGirl1 -> Twin Woman2 -> PokefanF OldMan1 -> ExpertM OldWoman1 -> ExpertF Man3 -> PokefanM Woman6 -> LinkReceptionist Man7 -> DevonEmployee Boy4 -> RichBoy Boy5 -> GameboyKid (Consistent with pokecrystal) ContestOldMan -> ContestJudge Renamed Because of Numbering Changes: LittleBoy2 -> LittleBoy LittleGirl2 -> LittleGirl OldWoman2 -> OldWoman OldMan2 -> OldMan Man4 -> Man3 Man5 -> Man4 Man6 -> Man5 Woman3 -> Woman2 Woman4 -> Woman3 Woman5 -> Woman4 Woman7 -> Woman5	2018-10-14 15:49:55 -04:00
Deokishisu	a8afec762b	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:22:56 -04:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05:00
Deokishisu	c89b14f5ef	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:19:23 -04:00
Diegoisawesome	43316ffae8	Merge pull request #356 from DizzyEggg/clean_battlestruct ... Clean a couple of battlestructs' fields	2018-10-14 13:18:29 -05:00
Deokishisu	e129f4864f	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:16:07 -04:00
Diegoisawesome	0979ea91fb	Merge pull request #357 from DizzyEggg/move_heap ... Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 13:15:31 -05:00
DizzyEggg	c3113db931	Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 20:00:14 +02:00
Diegoisawesome	d40e737d52	Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers ... Decompile field effect helpers	2018-10-14 12:48:18 -05:00
Diegoisawesome	e0bc3fd59c	Merge pull request #355 from DizzyEggg/use_eos ... Use defines for text chars	2018-10-14 12:21:37 -05:00
DizzyEggg	ecdf0fd69d	Clean battle structs	2018-10-14 18:37:52 +02:00
Deokishisu	2bd86dad2f	Rename Boy4 to RichBoy	2018-10-14 12:26:48 -04:00
DizzyEggg	b73611bccb	clean battle structs	2018-10-14 18:10:54 +02:00
DizzyEggg	cd4f65ecef	Make apprentice compile	2018-10-14 17:06:47 +02:00
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	d60e4e23f8	Merge pull request #25 from Slawter666/apprentice-data ... Move apprentice data to C	2018-10-14 16:28:27 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +02:00
Slawter666	f08b56d645	Move apprentice data to C	2018-10-14 15:26:13 +01:00
DizzyEggg	af7aa624cd	make aprentice compile	2018-10-14 15:23:14 +02:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	541043a661	Use defines for text chars	2018-10-14 15:04:25 +02:00
DizzyEggg	7a008a944a	Move 'blend_palette'.c to util.c	2018-10-14 14:43:19 +02:00
DizzyEggg	145df49063	Document more of apprentice	2018-10-14 14:35:51 +02:00
DizzyEggg	b4a42a6832	Decompile apprentice	2018-10-14 11:37:44 +02:00
DizzyEggg	36b8a6a9a2	More apprentice work	2018-10-13 23:23:33 +02:00
DizzyEggg	a496a763ca	Merge record mixing, pokemon and global with apprentice	2018-10-13 20:38:46 +02:00
Diegoisawesome	32fbf67d47	Merge branch 'master' into shop	2018-10-13 12:55:06 -05:00
Diegoisawesome	a26380663c	Merge branch 'master' of github.com:pret/pokeemerald	2018-10-13 12:44:23 -05:00
Diegoisawesome	35c6938814	Port/decompile cable_club.s	2018-10-13 12:41:10 -05:00
Marcus Huderle	b24559d69b	Merge remote-tracking branch 'upstream/master' into shop ... # Conflicts: # asm/shop.s	2018-10-13 10:22:58 -05:00
DizzyEggg	74b81bf229	start apprentice	2018-10-13 00:48:26 +02:00
golem galvanize	d3d725cc83	decompiled up to sub_81B0948	2018-10-11 21:23:39 -04:00
Diegoisawesome	04836db167	Start porting cable_club.c	2018-10-11 16:02:58 -05:00
golem galvanize	803c2388ce	finish porting field_effect_helpers	2018-10-10 12:02:02 -04:00
golem galvanize	35ee9f67c0	ported some of field_effect_helpers	2018-10-09 17:32:39 -04:00
Marcus Huderle	807050a048	Merge pull request #348 from DizzyEggg/anim_files ... Decompile/Port battle_anim_80A5C6C	2018-10-07 12:23:07 -05:00
DizzyEggg	dbb09aa445	get rid of SPRITE and TASK	2018-10-07 19:19:13 +02:00
DizzyEggg	413e26e83d	port 80d51ac	2018-10-07 17:45:37 +02:00
DizzyEggg	61343d5069	Decompile battle_anim_80A9C70	2018-10-07 15:39:46 +02:00
DizzyEggg	8c834b9ae8	battle anim 80a5c6c decompiled	2018-10-07 12:32:20 +02:00
DizzyEggg	54fc92bc92	Start porting ruby battle anim file	2018-10-06 23:04:53 +02:00
Diegoisawesome	7a7aeed5e8	Merge pull request #347 from Deokishisu/GamV ... Fill out VERSION_ enum with all possible values	2018-10-06 13:45:21 -05:00
Marcus Huderle	b9e38a569e	Merge pull request #320 from DizzyEggg/anims ... Document battle animation scripts	2018-10-06 08:20:41 -05:00
Deokishisu	9f69ea1931	Update gGameVersion to use GAME_VERSION	2018-10-06 01:57:39 -04:00
Marcus Huderle	ec0d350137	Move metatile behavior constants to include/constants and sync closer to pokeruby	2018-10-04 17:57:07 -05:00
Diegoisawesome	25033ef311	Finish tileset_anims macroization	2018-09-23 14:58:36 -05: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	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
Tetrable	1f767e4c49	Document and make tileset_anims.c easier to use	2018-09-22 13:27:43 +01:00
Tetrable	4d9c513e3e	Document and improve tileset_anims.c further	2018-09-22 12:50:24 +01: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	e4b7ba0977	Document some not labeled battle things	2018-09-20 11:55:35 +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
Diegoisawesome	7f2d52d9e0	Merge pull request #332 from DizzyEggg/patch-5 ... Use defines for BattleAI_ChooseMoveOrAction	2018-09-17 10:11:25 -05:00
Diegoisawesome	6978a896d1	Merge pull request #331 from DizzyEggg/patch-3 ... Use pokeruby's formatting for move descriptions	2018-09-17 10:11:12 -05:00
DizzyEggg	5164215c91	Use defines for BattleAI_ChooseMoveOrAction	2018-09-16 17:06:35 +02:00
DizzyEggg	94bbfa7fa0	Use pokeruby's formatting for move descriptions	2018-09-16 15:58:13 +02:00
DizzyEggg	de65ddf4b6	Make it easier to edit ability text	2018-09-16 10:17:10 +02:00
Diegoisawesome	6a8f27c1ac	Merge pull request #326 from DizzyEggg/cablecarutil ... Decompile cable_car_util.c	2018-09-16 01:06:33 -05:00
DizzyEggg	4d2637883a	Slot machine is decompiled.	2018-09-15 23:19:37 +02:00
DizzyEggg	db248dada2	slot machine is decompiled	2018-09-15 22:59:45 +02:00
DizzyEggg	0547e260a4	More of slot machine	2018-09-15 18:01:20 +02:00
DizzyEggg	ff13cb6352	decompile cable car util which has nothing to do with actual cable car	2018-09-15 13:50:23 +02:00
DizzyEggg	2a7811456a	Add anim tag sprite defines	2018-09-15 00:30:20 +02:00
Diegoisawesome	b8c9d9a980	Merge pull request #324 from Diegoisawesome/master ... Document main_menu	2018-09-14 12:17:11 -05:00
Diegoisawesome	b860d583e4	Document main_menu	2018-09-14 12:15:46 -05:00
DizzyEggg	a08d9dd451	Merge branch 'master' into anims	2018-09-12 22:59:04 +02:00
DizzyEggg	8a81bd1bce	Sync battle anim labels with pokeruby	2018-09-12 22:58:03 +02:00
Diegoisawesome	095cbbc5c2	Merge pull request #321 from Slawter666/data ... Move more data to C	2018-09-11 22:10:26 -05:00
Slawter666	f40fa37398	Move battle_bg data to C	2018-09-11 23:37:47 +01:00
Marcus Huderle	ba125b23fd	Remove transparency from event object spritesheets	2018-09-11 17:18:10 -05:00
Slawter666	991151f461	Move item_use data to C	2018-09-11 03:04:19 +01:00
Slawter666	3c16d8c598	Move braille_puzzles data to C	2018-09-11 02:17:21 +01:00
Slawter666	b6ee8823f0	Move field_special_scene data to C	2018-09-11 02:04:03 +01:00
Slawter666	bcea321494	Finish converting data2b data	2018-09-11 01:35:47 +01:00
DizzyEggg	10b479a3ca	Document battle animation scripts.	2018-09-10 21:19:19 +02:00
Diegoisawesome	d9941cd1a8	Standardize sprite visibility to boolean	2018-09-10 10:25:58 -05:00
Diegoisawesome	cb053b3a15	Merge pull request #312 from DizzyEggg/decompile_frontier_2 ... Decompile Battle Factory	2018-09-10 10:20:41 -05:00
DizzyEggg	74cc2cf512	battle factory review changes	2018-09-10 10:18:30 +02:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02:00
Tetrable	044ef98309	Document trainer animations, correct unused table labelling	2018-09-09 22:35:07 +01:00
DizzyEggg	cf8898071d	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2	2018-09-09 20:31:56 +02:00
DizzyEggg	4d1df7ecbe	comm	2018-09-09 20:31:51 +02:00
Slawter666	135e98a824	Move battle factory data to C	2018-09-09 16:06:35 +01:00
Slawter666	1ba17e1666	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data	2018-09-09 15:51:13 +01:00
DizzyEggg	6454740587	More battle factory	2018-09-09 13:12:26 +02:00
DizzyEggg	2f59df03ab	Standartize AddTextPrinterParametrized functions,	2018-09-08 23:38:30 +02:00
DizzyEggg	1616c254d2	Swap_InitAllSprites done	2018-09-08 22:33:07 +02:00
Diegoisawesome	e1834c9d7b	Change overworld_frame macro to use tiles	2018-09-08 03:07:44 -05:00
Diegoisawesome	eb8b0ff0f7	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-08 02:43:19 -05:00
Diegoisawesome	12521fb1a8	Merge branch 'Slawter666-spritesheet'	2018-09-08 02:37:33 -05:00
Diegoisawesome	2b07588c02	Merge branch 'master' of github.com:Diegoisawesome/pokeemerald	2018-09-08 02:36:59 -05:00
Diegoisawesome	f73807ea60	Add palette tags for event objects	2018-09-07 23:52:11 -05:00
Diegoisawesome	d945a8bf2f	Macroize main_menu and general cleanup	2018-09-07 19:24:33 -05:00
Slawter666	291ac2cee9	Add build rules for overworld sprite sheets	2018-09-08 00:28:32 +01:00
Diegoisawesome	cf8f73bde1	Merge pull request #314 from Slawter666/data ... Convert data to C	2018-09-07 11:39:07 -05:00
Slawter666	54d5a7ad97	Format event object pic tables	2018-09-07 14:14:52 +01:00
Slawter666	9dec2bdef8	Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet	2018-09-07 11:50:23 +01:00
DizzyEggg	1283b87505	up to sub_819d064	2018-09-06 23:02:16 +02: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	0cd250a83e	Deleted accidently uploaded file	2018-09-06 00:00:29 +01:00
Slawter666	5656ceab6c	Move graphics to src/data/graphics	2018-09-05 23:53:54 +01: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
DizzyEggg	75384546b5	More factory decomp and documentation.	2018-09-05 23:30:15 +02:00
ultima-soul	857ac33adb	Fixed a typo.	2018-09-05 17:25:44 +00:00
Diegoisawesome	41fe72b95d	Merge pull request #310 from DizzyEggg/patch-1 ... Update item_menu.c	2018-09-05 01:36:40 -05: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
Slawter666	f74adc80c1	Format more templates	2018-09-02 17:53:52 +01:00
DizzyEggg	10eb952db5	Start battle factory	2018-09-02 18:10:36 +02:00
Slawter666	6106154801	Format WindowTemplate in battle_pyramid_bag.c	2018-09-02 16:26:23 +01:00
Slawter666	c1b3dfa15a	Format templates in wallclock.c	2018-09-02 16:10:06 +01:00
Slawter666	c9db9b7a59	Format WindowTemplate in berry_blender.c	2018-09-02 15:14:23 +01:00
Slawter666	3119aae4b2	Format WindowTemplate in berry_tag_screen.c	2018-09-02 15:02:39 +01:00
Slawter666	f45c9e75db	Format templates in item_menu.c	2018-09-02 14:49:29 +01:00
Slawter666	ef4695a72c	Minor labelling	2018-09-02 13:47:12 +01:00
DizzyEggg	23aab35b96	Update item_menu.c ... Don't use signed values for unsigned variables	2018-09-02 00:28:03 +02:00
Marcus Huderle	8ecf3b2159	Start decompiling shop.c	2018-09-01 17:15:35 -05:00
DizzyEggg	528a1e9ed0	Match CopySpriteTiles	2018-09-01 22:53:29 +02:00
DizzyEggg	e28ce3be78	Fix the strings length issue	2018-09-01 22:03:21 +02:00
DizzyEggg	5c7ca813e7	Add AI flags to trainers data	2018-09-01 21:25:19 +02:00
DizzyEggg	44ba432dad	Label various battle scripts	2018-09-01 20:00:13 +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	96f2b995dc	Pyramid bag review changes	2018-08-30 21:28:03 +02:00
DizzyEggg	43b74032fa	Make pyramid bag compile.	2018-08-30 20:25:57 +02:00
DizzyEggg	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00
DizzyEggg	bc9fe72c6e	Do some pyramid bag	2018-08-30 15:01:07 +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
DizzyEggg	3dea8fa265	battle tent review changes	2018-08-29 20:38:54 +02:00
Slawter666	e30c2251ce	Convert more of data2b	2018-08-27 00:26:54 +01:00
DizzyEggg	d65ebcd3dd	Label a dome functiion	2018-08-26 21:41:47 +02:00
DizzyEggg	ddd4733de3	rename battle pyramid to battle pyramid bag	2018-08-26 17:54:58 +02:00
Slawter666	ca07412686	Format SpriteTemplate	2018-08-26 15:45:08 +01:00
DizzyEggg	a8a2444f93	make battle dome compikle	2018-08-26 15:58:44 +02:00
DizzyEggg	df3af2d9e1	Clean up battle dome code a bit	2018-08-26 15:51:14 +02:00
DizzyEggg	71de20a159	Merge pull request #9 from Slawter666/frontier-data ... Convert battle dome data to C	2018-08-26 15:28:09 +02:00
DizzyEggg	78cad0dee5	try battle tent and fail	2018-08-26 15:27:06 +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	0d8c5b613e	make battle dome compile	2018-08-25 20:14:10 +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
DizzyEggg	62a645abaf	Up To CopyDomeTrainerName	2018-08-25 18:46:15 +02:00
DizzyEggg	91349324c6	up to CB2_BattleDome	2018-08-25 11:55:16 +02:00
Slawter666	709b63efa9	Split files	2018-08-24 21:21:19 +01:00
Slawter666	6b145ed77c	Move data from graphics.s to C	2018-08-24 04:21:07 +01:00
Diegoisawesome	96d744706d	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-08-23 02:42:45 -05:00
Diegoisawesome	26ef40553c	Move data from include to src	2018-08-23 02:32:34 -05: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	dea1de3fed	More battle dome	2018-08-21 23:36:59 +02:00
DizzyEggg	a12b69eae1	DisplayMatchInfoOnCard decompiled	2018-08-20 22:56:05 +02:00
DizzyEggg	5da12f2b21	battle dome - more work	2018-08-19 22:26:07 +02:00
DizzyEggg	4a0f7398ec	Cant believe Ive matched this	2018-08-19 20:21:37 +02:00
DizzyEggg	239c56496b	This is impossible	2018-08-19 17:13:05 +02:00
DizzyEggg	fb19a8fc59	battle dome cards sensibly renamed	2018-08-19 01:06:10 +02:00
DizzyEggg	e4649245ba	this file is too much	2018-08-18 19:52:25 +02:00
DizzyEggg	f7fd5ce75c	Match one of the hardest battle dome functions	2018-08-18 18:23:40 +02:00
DizzyEggg	63cbc8f3cc	battle dome - a couple more functions	2018-08-18 00:54:18 +02:00
DizzyEggg	5dd1afd383	contest effect review changes	2018-08-16 22:55:36 +02:00
DizzyEggg	0bfe894566	Merge with master	2018-08-16 22:53:01 +02:00
DizzyEggg	7669a94f0d	this function is driving me insane	2018-08-16 22:46:02 +02:00
Diegoisawesome	2b81db7ace	Fix Task_Truck1	2018-08-15 19:49:17 -07:00
Diegoisawesome	13dc7a4170	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-15 16:22:54 -07:00
Diegoisawesome	f65da613cf	Merge pull request #299 from DizzyEggg/contest_ai ... Decompile Contest ai	2018-08-15 16:19:18 -07:00
Diegoisawesome	e7da514382	Finish documenting and cleaning up summary_screen ... Also fix remaining nonmatchings	2018-08-15 15:58:41 -07:00
DizzyEggg	e2f5e73445	More battle dome	2018-08-15 23:04:46 +02:00
Tetrable	8896b54e8f	Add national/hoenn dex defines, update dex arrays	2018-08-15 20:10:28 +01:00
Diegoisawesome	ac3f4fd994	Continue documentation and cleanup of pokemon_summary_screen	2018-08-15 11:51:47 -07:00
DizzyEggg	a54fa23b5f	Begin battle frontier 1	2018-08-15 15:49:50 +02:00
DizzyEggg	dc6cf391ce	Make contest ai compile.	2018-08-15 12:06:23 +02:00
DizzyEggg	92c4fc6345	Contest AI clean-up	2018-08-15 11:50:18 +02:00
DizzyEggg	c806992cfc	Port contest ai from pokeruby	2018-08-15 11:43:57 +02:00
Diegoisawesome	0bc975bf57	Document and cleanup pokemon_summary_screen	2018-08-15 01:44:20 -07: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	ba225f8eaa	Fix fakematching in contest effect	2018-08-15 00:25:19 +02:00
DizzyEggg	0b22ad4ab5	make contest effect build	2018-08-15 00:01:43 +02:00
DizzyEggg	0c7063c5ba	Make contest effect table easier to edit in the future	2018-08-14 23:50:58 +02:00
DizzyEggg	c72b55a5c4	Match the worst function ever	2018-08-14 22:28:25 +02:00
DizzyEggg	1a0e6f7aed	match contest effect	2018-08-13 21:24:11 +02:00
Diegoisawesome	6dac87abfd	Cleanup and document learn_move	2018-08-12 14:28:15 -07:00
DizzyEggg	0d68af7f06	copy contest effect from ruby	2018-08-12 23:20:17 +02:00
Diegoisawesome	b40957c09b	Finish decompiling learn_move	2018-08-12 13:33:41 -07:00
Diegoisawesome	bd2b7beb07	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 13:17:51 -07:00
Diegoisawesome	335f4c1e81	Merge pull request #296 from DizzyEggg/event_data ... Event data	2018-08-12 13:17:36 -07:00
DizzyEggg	f1daf7442d	event data review changes	2018-08-12 22:04:49 +02:00
Diegoisawesome	9a73a47ddd	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 12:55:21 -07:00
DizzyEggg	577e6e7c1f	Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data	2018-08-12 21:55:20 +02: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	32b0e102cf	Merge pull request #287 from DizzyEggg/easy_chat ... Pikalax's Easy chat	2018-08-12 12:17: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
MCboy	2ddabca996	apply some changes	2018-08-12 22:31:58 +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
DizzyEggg	e787d5b602	Contest review changes	2018-08-12 12:08:51 +02:00
DizzyEggg	1229bead2e	slot machine review changes	2018-08-12 11:50:26 +02:00
DizzyEggg	3a72e6a80d	Easy chat review changes	2018-08-12 11:39:09 +02:00
Diegoisawesome	a000eb4f36	Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move	2018-08-11 19:03:38 -07: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	94eef0bfa5	Merge pull request #294 from DizzyEggg/learnsets ... Make learnsets easier to edit	2018-08-11 16:27:52 -07:00
Diegoisawesome	0c29447717	Merge pull request #292 from DizzyEggg/move_desc ... Move move descriptions to C	2018-08-11 16:26:16 -07:00
DizzyEggg	7b9a7765e0	Make learnsets easier to edit	2018-08-12 00:42:25 +02:00
Diegoisawesome	57b3393192	Fix compile error	2018-08-11 15:42:08 -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	7f167ca9f4	Update battle_script_commands.c	2018-08-11 23:00:16 +02:00
DizzyEggg	feee4751eb	Make event data look cleaner	2018-08-11 22:54:34 +02: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
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02:00
garak	2fc3b7f171	change sUnknown_085A1E3C to sMapHealLocations	2018-08-11 10:28:13 -04:00
DizzyEggg	59d8d56868	merge easy chat with master	2018-08-11 14:14:51 +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
Slawter666	bc42c5054c	Merge remaining overworld frames	2018-08-10 00:20:19 +01:00
Slawter666	877a80d3bc	Merge berry tree frames	2018-08-09 23:19:45 +01:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Slawter666	dea0bba64e	Merge "pokemon" frames	2018-08-09 00:55:32 +01:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -07:00
garak	45b730e474	copy heal_location changes from pokeruby	2018-08-07 23:05:48 -04:00
Slawter666	704e3c7334	Merge https://github.com/pret/pokeemerald into spritesheet	2018-08-07 22:18:30 +01:00
Slawter666	ab2cc59629	Merge remaining "people" overworld frames	2018-08-07 22:16:03 +01:00
Diegoisawesome	85ebd76cd0	Fix fanfare constant to use define	2018-08-04 18:41:53 -07:00
DizzyEggg	eb4d9f6fed	Tabs to spaces	2018-08-03 00:24:10 +02:00
DizzyEggg	d6537c811b	Battle code enums in case switches	2018-08-03 00:13:44 +02:00
Diegoisawesome	759bc2671c	Merge pull request #280 from DizzyEggg/decompile_part_mon_summary ... Decompile a few pokemon summary screen functions	2018-08-02 08:27:05 -07:00
Slawter666	5917f7d108	Merge frontier brains, team magma and team aqua frames	2018-08-02 00:34:28 +01:00
Slawter666	52aa9cedcf	Merge May frames into sprite sheets ... Plus fix Brendan's surfing and watering frame order.	2018-07-29 17:29:36 +01: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
DizzyEggg	4080c6f831	Decompile a few pokemon summary screen functions	2018-07-28 23:26:19 +02:00
Slawter666	d5825230e5	Merge "brendan" frames into sprite sheets	2018-07-28 18:11:28 +01:00
MCboy	6c365fdc94	Update field_player_avatar.c	2018-07-25 17:47:04 +04:30
MCboy	3a15012085	Update field_player_avatar.c	2018-07-25 17:28:25 +04:30
MCboy	94a5f8d529	made file better ?	2018-07-25 17:18:49 +04:30
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	82d88479ce	decompiled a bunch of functions ... i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that	2018-07-24 16:59:52 +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	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
MCboy	201fb6f818	ported code over from pokeruby	2018-07-21 03:06:40 +04:30
MCboy	43fa9da52a	decompile more code ... 1 non matching need help	2018-07-20 03:44:20 +04:30
MCboy	416db8e751	oops	2018-07-19 21:23:45 +04:30
MCboy	a8f9adeaf5	decompile player_field_avatar	2018-07-19 21:22:35 +04:30
MCboy	e3a82bd2c5	decompile player_field_avatar.s	2018-07-19 21:18:09 +04:30
DizzyEggg	118fa3afce	IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL	2018-07-16 22:00:27 +02:00
DizzyEggg	bf0178238a	Battle files - review changes	2018-07-16 20:47:30 +02: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	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
Marcus Huderle	d675b7578c	Move movement type constants into include/constants/event_object_movement_constants.h	2018-07-10 18:04:41 -05:00
Slawter666	08774bdd88	Merge https://github.com/pret/pokeemerald into pokedex-doc	2018-07-08 01:23:28 +01:00
Slawter666	dd228fae5a	Minor variable labelling	2018-07-08 01:20:01 +01:00
DizzyEggg	ee3d505b58	little touches for HandleTurnActionSelectionState	2018-07-07 21:14:41 +02:00
DizzyEggg	008d961b2a	add party menu defines	2018-07-07 19:57:09 +02:00
DizzyEggg	1c48e58574	small fixes	2018-07-07 14:24:19 +02:00
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02:00
Diegoisawesome	f79ac26ce3	Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer	2018-07-05 20:33:07 -07: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	e6d67c7c22	give labels to player controller functions	2018-07-01 15:45:47 +02: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	bfc64c9689	C vars sym ewram	2018-06-30 15:35:54 +02:00
DizzyEggg	97712ec931	change mapDataId to mapLayoutId	2018-06-30 14:52:13 +02:00
DizzyEggg	15fe5a031b	Merge branch 'master' into decompile_battle_tent	2018-06-30 14:43:41 +02:00
DizzyEggg	cdacc27714	change for loop in fldeff_cut	2018-06-30 14:26:33 +02:00
DizzyEggg	5434db2fc6	use region map constants	2018-06-30 14:22:09 +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	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
DizzyEggg	ab36efdaf4	document bounce effect	2018-06-20 23:07:51 +02:00
DizzyEggg	94752d4207	document battle bars	2018-06-19 00:43:15 +02:00
DizzyEggg	caa36b530a	label and document battle windows	2018-06-17 16:48:58 +02:00
DizzyEggg	9329ffc2bc	review cut changes	2018-06-17 12:39:58 +02:00
DizzyEggg	0fe3e612eb	battle tent start and create frontier struct in saveblock	2018-06-17 12:30:09 +02:00
DizzyEggg	3bcd30969a	cut field effect is decompiled and documented	2018-06-16 14:04:29 +02:00
DizzyEggg	7ea5dd7923	start fldeffect cut	2018-06-16 00:45:48 +02:00
Marcus Huderle	acc1a5d446	Get all map constants from include/ rather than constants/	2018-06-15 07:49:21 -05:00
Marcus Huderle	0c8cfc2297	Merge pull request #264 from Mother-Of-Dragons/master ... tileset_anims.c typo fix	2018-06-14 09:10:50 -05:00
Avara	7a9c9bee85	tileset_anims.c typo fix	2018-06-14 14:34:19 +01:00
Marcus Huderle	bebcea4029	Merge pull request #263 from huderlem/event_object_movement ... Sync event object movement with pokeruby	2018-06-14 08:08:51 -05:00
Marcus Huderle	4d13e3394a	Bring all movement function names up-to-date with pokeruby	2018-06-13 17:51:26 -05:00
Marcus Huderle	aa9a45c16f	Rebrand 'map object' and 'field object' to 'event object'	2018-06-11 19:11:48 -05:00
Marcus Huderle	ed245b677a	Add remaining rodata to event_object_movement.c	2018-06-11 18:17:31 -05:00
Marcus Huderle	89edf6d9e9	Move all field object data into src/data and event_object_movement.c	2018-06-11 17:33:50 -05:00
Avara	3bed36276d	updated label names	2018-06-11 21:57:22 +01:00
Avara	7de91ed6ae	updated label names	2018-06-11 21:22:41 +01:00
Marcus Huderle	eb8dbff4a7	Move event_object_movement_helpers into event_object_movement	2018-06-11 10:56:14 -05:00
Marcus Huderle	73327f0d44	Decompile field_ground_effect into event_object_movement.c	2018-06-11 10:23:14 -05:00
Marcus Huderle	4018acfae1	Update event object struct members	2018-06-11 09:19:17 -05:00
Marcus Huderle	38a126df66	Rename field_map_obj to event_object_movement	2018-06-11 08:46:33 -05:00
DizzyEggg	5526d980ec	union room is too hard	2018-06-10 18:28:37 +02:00
DizzyEggg	166295acc7	union room prepare for battle	2018-06-09 22:14:52 +02:00
DizzyEggg	7b72cfdc6c	through sub_80156C8	2018-06-04 23:32:28 +02:00
DizzyEggg	dbb9cdd424	more link stuff	2018-06-04 12:07:32 +02:00
DizzyEggg	e50f4b4999	still going	2018-06-03 22:39:10 +02:00
DizzyEggg	e95b1156d2	more progress	2018-06-03 09:37:01 +02:00
DizzyEggg	83cf2f50df	shabby beginnings	2018-06-01 23:08:25 +02:00
Diegoisawesome	0b09575fd4	Merge pull request #249 from golemgalvanize/decompile_pokedex ... Decompile pokedex	2018-06-01 00:02:46 -07:00
golem galvanize	94030c6b53	fixed as best I could	2018-05-31 07:08:24 -04:00
Diegoisawesome	dd28854a22	Merge pull request #255 from DizzyEggg/decomp_record_mixing ... Fix pika's Record Mixing PR Also closes #107.	2018-05-30 16:51:30 -07:00
DizzyEggg	42731e4b88	LANG_ENG to GAME_LANGUAGE	2018-05-30 20:28:31 +02:00
DizzyEggg	ff0c615870	decompile rom_8034C54	2018-05-27 23:26:01 +02:00
DizzyEggg	357afd91b5	start rom_8034C54 decomp	2018-05-27 17:42:48 +02:00
DizzyEggg	dd1c7c741a	make record mixing compile	2018-05-26 00:37:03 +02:00
DizzyEggg	9e7965fab0	document record mixing	2018-05-26 00:25:36 +02:00
DizzyEggg	b051cbaaab	more record mixing decomp	2018-05-25 21:00:41 +02:00
PikalaxALT	6ae395a636	Merge branch 'master' into contest	2018-05-24 10:26:55 -04:00
DizzyEggg	03b593d3c3	try my luck with record mixing	2018-05-22 21:54:57 +02:00
DizzyEggg	c8e1c80375	record mixing fix for real hopefully	2018-05-20 12:21:39 +02:00
DizzyEggg	4d5bfc149e	Merge branch 'master' into decomp_record_mixing	2018-05-20 12:16:45 +02:00
DizzyEggg	1a8d5132d6	fix record mixing for real	2018-05-20 10:51:09 +02:00
Diegoisawesome	de60bdf2fe	Merge pull request #256 from DizzyEggg/decompile_field_tasks ... Decompile field tasks	2018-05-19 23:34:30 -05:00
DizzyEggg	1307fde8ca	make field tasks compile	2018-05-19 18:13:48 +02:00
DizzyEggg	d1798d0ed9	decompile field tasks	2018-05-19 18:02:43 +02:00
DizzyEggg	11d8f489c4	failed attempt	2018-05-19 14:30:41 +02:00
DizzyEggg	e44f35c7b7	fix record mixing merge conflicts	2018-05-19 12:32:44 +02:00
DizzyEggg	9385036ff7	make menu indicators compile	2018-05-19 11:53:22 +02:00
DizzyEggg	4857757431	merge list menu and list indicators	2018-05-19 11:36:31 +02:00
DizzyEggg	1ead30ad40	decompile menu indicators	2018-05-19 10:54:02 +02:00
DizzyEggg	303c9f0917	start menu indicators decomp	2018-05-16 22:16:22 +02:00
DizzyEggg	0cf3836a03	decompile menu helpers	2018-05-15 20:22:19 +02:00
DizzyEggg	7735fb2ad3	start menu helpers decomp	2018-05-14 23:03:40 +02:00
Diegoisawesome	23b050a99e	Update naked attribute and ASM_DIRECT to NAKED macro	2018-05-11 17:24:32 -05:00
PikalaxALT	5539e282a3	through sub_80DB798	2018-05-11 10:51:38 -04:00
PikalaxALT	8d0da7d8e0	Propagate ASM_DIRECT --> NAKED renaming	2018-05-11 09:41:32 -04:00
PikalaxALT	4488bbe9e6	Merge branch 'master' into contest	2018-05-11 09:25:26 -04:00
PikalaxALT	c15b50ac68	through prints_contest_move_description	2018-05-11 08:44:21 -04:00
Diegoisawesome	4e2886db81	Use song constants	2018-05-11 00:33:32 -05:00
Diegoisawesome	2b6d2dfadd	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-05-10 18:38:24 -05:00
Diegoisawesome	416d67c832	Finish porting/decompiling field_effect.c	2018-05-10 18:36:57 -05:00
PikalaxALT	9bee601b16	through sub_80DB174	2018-05-10 19:28:52 -04:00
PikalaxALT	508a8e5182	through sub_80DAFA0	2018-05-10 18:16:58 -04:00
PikalaxALT	7fdebe0d15	through sub_80DAE0C	2018-05-10 17:54:30 -04:00
PikalaxALT	dfc83cf28f	Merge branch 'master' into contest	2018-05-10 09:47:12 -04:00
Diegoisawesome	80062972ae	Begin porting field_effect	2018-05-10 03:02:33 -05:00
golem galvanize	13efa1ef62	fixing conflicts	2018-05-10 03:34:36 -04:00
golem galvanize	d31600e70e	finish decompiling pokedex	2018-05-10 03:30:42 -04:00
PikalaxALT	4470f77b3d	Merge branch 'master' into mauville_old_man	2018-05-09 15:30:21 -04:00
Diegoisawesome	279276c539	Fix capitalization on filename	2018-05-09 05:14:24 -05:00
Diegoisawesome	b570f87152	Merge master from pret	2018-05-09 05:10:23 -05:00
Diegoisawesome	d66c1c642c	Port/decompile fieldmap.c	2018-05-09 05:07:56 -05:00
PikalaxALT	5efe8f3a0d	through sub_80DAB8C	2018-05-08 19:00:23 -04:00
PikalaxALT	f6fbecbc41	through sub_80DA874	2018-05-07 20:49:23 -04:00
PikalaxALT	e8bb464de9	through sub_80DA4F4	2018-05-07 19:46:48 -04:00
PikalaxALT	fd1d75ce37	Merge branch 'master' into mauville_old_man	2018-05-07 18:18:00 -04:00
PikalaxALT	61cc1d5574	Rename symbols using Ruby as a reference	2018-05-07 18:11:20 -04:00
PikalaxALT	0231ed13ee	Remaining functions in mauville_old_man	2018-05-07 16:35:29 -04:00
Slawter666	279a6e1ddc	Convert item_icon_table.inc to C	2018-05-06 13:37:28 +01:00
Slawter666	aab1238ec0	Revert "Convert item_graphics.inc to C" ... This reverts commit 546217d281.	2018-05-06 09:12:23 +01:00
Slawter666	546217d281	Convert item_graphics.inc to C ... I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.	2018-05-05 23:27:26 +01:00
Slawter666	22ec43a6ed	resolve merge conflicts	2018-05-05 18:50:26 +01:00
PikalaxALT	e6cca15232	sub_80D8B38	2018-05-04 18:59:59 -04:00
PikalaxALT	58200616d5	Merge branch 'master' into trader	2018-05-04 17:45:50 -04:00
PikalaxALT	f05acd88d5	sub_80D8A88	2018-05-03 22:29:53 -04:00
PikalaxALT	210cedd077	through sub_80D883C	2018-05-03 21:01:22 -04:00
PikalaxALT	8aa462cd74	through sub_8121178	2018-05-03 18:05:07 -04:00
PikalaxALT	876e1eb7cc	through sub_8121064	2018-05-03 17:51:14 -04:00
PikalaxALT	1943118a1e	through sub_8120D34	2018-05-03 17:26:02 -04:00
PikalaxALT	c6115a2fec	through sub_8120C0C	2018-05-03 17:03:52 -04:00
PikalaxALT	0bc7759f9b	through sub_8120748	2018-05-03 13:40:08 -04:00
Marcus Huderle	cdb5e9e314	Merge pull request #242 from DizzyEggg/decompile_battle_records ... Decompile battle records	2018-05-03 08:42:44 -07:00
PikalaxALT	7d446a9ef7	through sub_80D8490	2018-05-03 08:51:52 -04:00
PikalaxALT	f9230e80aa	through vblank_cb_battle	2018-05-02 19:59:00 -04:00
PikalaxALT	cae0fb8ec2	through sub_81203FC	2018-05-02 16:57:34 -04:00
PikalaxALT	21c3e7e8e5	through SetMauvilleOldMan	2018-05-02 11:31:58 -04:00
PikalaxALT	4bf0950421	through sub_80D7DE8	2018-05-02 08:43:27 -04:00
PikalaxALT	ef29d17c41	through sub_80D7B24	2018-05-01 21:27:24 -04:00
PikalaxALT	4b1e30434d	Through sub_80D787C	2018-05-01 19:47:11 -04:00
PikalaxALT	4acbcf5759	Port trader from Ruby	2018-05-01 15:19:24 -04:00
DizzyEggg	b80fb98d9a	make battle records compile	2018-05-01 16:35:38 +02:00
DizzyEggg	cc578fce18	battle records decompiled and documented	2018-05-01 15:54:31 +02:00
DizzyEggg	ae78786723	identify and name battle records things	2018-05-01 15:33:13 +02:00
DizzyEggg	95cf853762	battle records more decomp and subtle name changes	2018-05-01 14:01:54 +02:00
DizzyEggg	f9a2f6c4a2	start decompiling battle records	2018-05-01 12:38:55 +02:00
golem galvanize	f9331f15ef	decompiled up to sub_80BFCF4	2018-04-30 20:41:17 -04:00
DizzyEggg	9f97646724	make item compile	2018-04-29 15:34:14 +02:00
DizzyEggg	fd40e93cb5	clear item, save and load save files	2018-04-29 14:21:59 +02:00
DizzyEggg	25c669e36b	decompile item	2018-04-29 13:36:26 +02:00
golem galvanize	6a401b5386	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex	2018-04-25 00:28:57 -04:00
Slawter666	39fd42faea	convert data/items.inc to include/data/items.h ... OK	2018-04-25 02:33:55 +01:00
Slawter666	a49f80d552	Convert item_descriptions.inc to .h ... OK	2018-04-25 01:41:04 +01:00
Slawter666	a9d65ae6b6	Move files to include/data	2018-04-24 00:58:14 +01:00
Slawter666	2d4ab9f4ac	Updated items.c ... Working but non-matching	2018-04-23 23:25:03 +01:00
Slawter666	f56067bb63	Update items.c	2018-04-23 22:14:30 +01:00
Slawter666	a04f8f6ee3	Convert item data files to .c (not compiling)	2018-04-23 21:44:46 +01:00
DizzyEggg	dede2cc300	Use DMA large macro in option menu	2018-04-18 21:53:51 +02:00
Diegoisawesome	d10844f1fe	Merge pull request #237 from KDSKardabox/master ... Decompile mon markings, rotating_gate & field_camera	2018-04-18 14:12:51 -05:00
KDSKardabox	dc759a501b	add braces	2018-04-18 22:17:23 +05:30
KDSKardabox	0bab373f49	Perform requested changes	2018-04-18 22:10:26 +05:30
Diegoisawesome	4e63a52832	Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks ... decompile battle_anim_sound_tasks	2018-04-18 11:40:01 -05:00
DizzyEggg	3d12a02f3e	almost decomp sound tasks battle anim	2018-04-18 16:03:15 +02:00
KDSKardabox	7700fe61fe	Decompile field camera	2018-04-18 17:42:41 +05:30
KDSKardabox	b818924feb	Decompile rotating_rate & remove debug check	2018-04-18 14:09:50 +05:30
KDSKardabox	f5cbefc295	Decompile mon markings	2018-04-17 14:24:39 +05:30
KDSKardabox	936bb5925a	Decompile dewford trend	2018-04-16 16:22:13 +05:30
KDSKardabox	447afe4505	Decompile pokemon icon	2018-04-13 17:51:49 +05:30
KDSKardabox	ac7d69eb6e	Done requested changes	2018-04-12 22:36:07 +05:30
KDSKardabox	66e76d9633	Decompile script movement	2018-04-10 14:55:25 +05:30
KDSKardabox	a3d065d0bd	Decompile rom6	2018-04-10 12:17:29 +05:30
KDSKardabox	a18dc6aa80	Decompile map_name_popup	2018-04-09 12:52:28 +05:30
KDSKardabox	3948614bff	Decompile map_obj_lock	2018-04-03 16:22:31 +05:30
Edouard Veyrier	2f96282c7f	cleaner	2018-04-03 00:10:19 +02:00
Edouard Veyrier	b2e8ee836d	sub_81607EC and sub_816082C	2018-04-02 20:06:40 +02:00
Edouard Veyrier	09e29a5cf8	Fix three functions to have the right checksum	2018-04-01 18:22:09 +02:00
golem galvanize	069a7e71fc	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex	2018-03-30 16:49:08 -04:00
golem galvanize	3006ff177b	pushing so I can pull from master	2018-03-30 16:48:30 -04:00
Edouard Veyrier	17b9f5d892	Fix compile error	2018-03-29 15:46:10 +02:00
Edouard Veyrier	cfacd23248	Fix temporarily	2018-03-29 11:56:10 +02:00
KDSKardabox	b74b576418	Fix 2 non-matchings	2018-03-29 10:43:49 +05:30
Marcus Huderle	a5cd6e8ef4	Merge pull request #231 from KDSKardabox/master ... Player PC	2018-03-28 21:45:24 -07:00
Marcus Huderle	d4c6ef7ae6	Merge pull request #227 from PikalaxALT/pokenav_match_call ... Pokenav match call	2018-03-28 21:33:50 -07:00
Marcus Huderle	c5f99a723e	Remove s prefix from static functions	2018-03-28 21:26:52 -07:00
Anders Løvig	3f4c717d5c	Rename stuff for more consistency	2018-03-29 02:16:02 +02:00
Anders Løvig	df94a8a77c	Small changes and corrections	2018-03-28 22:43:25 +02:00
Edouard Veyrier	990784a6d9	Improve comments	2018-03-28 21:45:35 +02:00
Anders Løvig	57775a946d	Rename start menu functions	2018-03-28 21:09:27 +02:00
Edouard Veyrier	75b07292c9	Translate first functions of learn move	2018-03-28 19:20:20 +02:00
Anders Løvig	5bc8ee6465	Added static modifers	2018-03-28 15:45:35 +02:00
Anders Løvig	6cd590f4fd	Decompiled start_menu.s	2018-03-28 00:40:00 +02:00
KDSKardabox	f9f64fff42	Resolve conflicts	2018-03-19 16:15:13 +05:30
KDSKardabox	a24ffb1321	Finish decompiling player_pc rodata	2018-03-19 15:57:33 +05:30
KDSKardabox	a454bd98fa	Finish .text part of player_pc	2018-03-16 16:01:11 +05:30
KDSKardabox	1f7fb45d0f	Decompile more functions	2018-03-15 16:07:24 +05:30
KDSKardabox	f3b5ed0d12	Decompile more functions & rename some labels	2018-03-13 14:41:39 +05:30
KDSKardabox	e7cf8e5c17	Start decompile player_pc	2018-03-12 13:56:20 +05:30
DizzyEggg	711a345fd4	fix conflicts	2018-03-09 22:54:57 +01:00
Diegoisawesome	ae214eca8b	Merge pull request #226 from DizzyEggg/decompile_list_menu ... Decompile list menu	2018-03-09 15:49:36 -06:00
DizzyEggg	70ec55386c	if	2018-03-09 22:22:00 +01:00
DizzyEggg	db2839bd5b	curly brace	2018-03-09 22:18:58 +01:00
PikalaxALT	9b920bfec3	More renaming	2018-03-07 18:03:13 -05:00
PikalaxALT	b2d8ce10ce	Fix build crash	2018-03-06 21:51:25 -05:00
PikalaxALT	aa2cb6a974	Rename match call assets	2018-03-06 08:52:29 -05:00
DizzyEggg	18d8c9382a	Use EGG_HATCH_LEVEL define	2018-03-06 13:29:10 +01:00
PikalaxALT	b3fb7cfca5	Rename some struct fields	2018-03-04 17:30:59 -05:00
PikalaxALT	565b058545	Make visual alignment of structs more consistent	2018-03-04 17:08:10 -05:00
PikalaxALT	7b9930a0a2	Remaining data in match_call	2018-03-04 16:58:51 -05:00
PikalaxALT	1c67840652	Match call data, 2	2018-03-04 16:44:50 -05:00
PikalaxALT	9b25d02369	Match call data, 1	2018-03-04 16:14:56 -05:00
PikalaxALT	734375f101	Remaining functions in match_call	2018-03-04 15:47:54 -05:00
PikalaxALT	44fedd861d	nonmatching sub_81D1B40	2018-03-04 15:36:01 -05:00
DizzyEggg	1771e8b458	make it compile	2018-03-04 20:12:45 +01:00
DizzyEggg	62e849a5df	item menu is done	2018-03-04 20:03:11 +01:00
DizzyEggg	4c3f8ac6c6	start item menu icons decomp	2018-03-04 18:41:07 +01:00
PikalaxALT	30c20bbab6	through sub_81D1B00	2018-03-03 13:41:28 -05:00
PikalaxALT	19a89f2362	nonmatching sub_81D199C	2018-03-03 13:22:38 -05:00
DizzyEggg	18a92fdcc0	list menu is decompiled	2018-03-03 14:58:41 +01:00
PikalaxALT	df128cbfed	Merge branch 'master' into pokenav_match_call	2018-03-02 21:49:09 -05:00
PikalaxALT	e3b078d08f	through sub_81D1914	2018-03-02 21:43:18 -05:00
DizzyEggg	87274b9eed	more list menu work	2018-03-03 01:02:07 +01:00
PikalaxALT	d25a9ffe16	through sub_81D1898	2018-03-02 18:12:23 -05:00
DizzyEggg	ae29f35afd	start decompiling list menu	2018-03-02 16:34:31 +01:00
PikalaxALT	89847427e4	match_call_t; through sub_81D17E4	2018-03-02 08:44:33 -05:00
DizzyEggg	1f052cc08d	unnecessary externs	2018-03-02 10:21:12 +01:00
DizzyEggg	a2458d966c	match hidden power calc	2018-03-01 15:02:44 +01:00
DizzyEggg	edf2ea45b1	merge with master	2018-03-01 10:12:35 +01:00
PikalaxALT	988be1ab86	Carve out Match Call functions	2018-02-28 22:47:50 -05:00
KDSKardabox	85492c0dac	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-03-01 09:13:29 +05:30
KDSKardabox	2f9d69f67f	use free_and_set_null macros	2018-03-01 09:11:26 +05:30
PikalaxALT	9abc121fa2	through sub_81D16DC	2018-02-28 22:09:28 -05:00
DizzyEggg	20baa1bc7a	battle tv review changes	2018-03-01 01:05:34 +01:00
DizzyEggg	988f0b7e19	Merge branch 'master' into decompile_battle_link_817C95C	2018-03-01 01:01:18 +01:00
DizzyEggg	b846015343	more battle files cleaning	2018-03-01 00:59:52 +01:00
DizzyEggg	a28dfd6da4	Merge branch 'master' into clear_battle_files	2018-02-28 23:58:29 +01:00
DizzyEggg	fed5f03097	get rid of unnecessary externs	2018-02-28 23:57:08 +01:00
Diegoisawesome	bcef4e7d1c	Merge pull request #221 from DizzyEggg/data_to_c ... Move some data to C	2018-02-28 16:55:45 -06:00
DizzyEggg	e93da9b1f9	make strings in battle message static	2018-02-28 23:50:25 +01:00
Diegoisawesome	a57e04e14d	Merge pull request #220 from PikalaxALT/trainer_rematch ... Decompile trainer_rematch	2018-02-28 16:41:54 -06:00
Diegoisawesome	0cd9ba36ce	Merge pull request #224 from DizzyEggg/another_try ... Fix two nonmatching functions	2018-02-28 13:05:05 -06:00
DizzyEggg	305a4fa744	match two functions	2018-02-28 19:37:48 +01:00
DizzyEggg	85a959f321	clean up files	2018-02-28 13:07:58 +01:00
DizzyEggg	edf9f706c4	decomp blit	2018-02-28 12:56:01 +01:00
DizzyEggg	d29b9d268f	make it compile	2018-02-28 00:18:59 +01:00
DizzyEggg	59ff4aec9b	decompile and document battle tv	2018-02-27 20:40:09 +01:00
DizzyEggg	a9212eeb66	battle file more done and clean up tv	2018-02-27 18:13:28 +01:00
PikalaxALT	7f7b182ca4	sub_81D1574	2018-02-27 08:47:47 -05:00
KDSKardabox	99630e954c	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-27 10:35:17 +05:30
KDSKardabox	835777dec2	Decompile fleff_flash rodata	2018-02-27 10:33:23 +05:30
DizzyEggg	2fa00d01ee	make it compile	2018-02-26 15:56:59 +01:00
DizzyEggg	1972303792	type and ability names to C	2018-02-26 14:29:17 +01:00
PikalaxALT	f46e941f30	Name functions, variables, and that one flag constant	2018-02-26 08:23:17 -05:00
KDSKardabox	2d7d686cc1	Decompile fldeff_flash	2018-02-26 17:54:54 +05:30
DizzyEggg	919f803214	correct move target defines	2018-02-26 13:24:46 +01:00
DizzyEggg	8821d6396a	move battle moves to C	2018-02-26 12:59:52 +01:00
DizzyEggg	8ff9cb0ede	give up for now	2018-02-26 11:45:47 +01:00
PikalaxALT	80906f022b	Cleanup; create enums for trainer rematches	2018-02-25 22:33:58 -05:00
PikalaxALT	6bfc8579ad	Decompile trainer_rematch	2018-02-25 21:56:09 -05:00