247 Commits

Author	SHA1	Message	Date
PikalaxALT	e2fbce996e	Use designated initializers (C99 feat)	2019-09-05 20:48:48 -05:00
PikalaxALT	f3bed6045e	Disassemble data/ereader_screen.s	2019-09-05 20:48:48 -05:00
PikalaxALT	a9918c3b89	Partial refactor of TryWriteTrainerHill_r	2019-09-05 20:48:48 -05:00
PikalaxALT	5c7eac7134	Merge pull request #744 from PikalaxALT/remove_tutor_casts ... Remove unnecessary tutor learnset casts	2019-09-04 16:51:06 -04:00
PikalaxALT	36723a235a	Merge pull request #735 from garakmon/encounter_json ... Add Different Field Info to Wild Encounters JSON	2019-09-04 16:50:39 -04:00
tustin2121	cdae0c1444	Change event object graphics pointer table to use explicit indexes ... - This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order. - Porymap will have to be updated, but I have some code for this already in a fork.	2019-08-29 16:44:10 -05:00
GriffinR	d931ba9602	document remaining funcs	2019-08-21 17:06:55 -05:00
GriffinR	771a7b25fa	move data, more contest lady funcs	2019-08-21 17:06:55 -05:00
garak	2580693ea5	INDEX to SLOT in encounter inja template	2019-07-29 13:12:20 -04:00
garak	b6483d7026	name match call messages by trainers	2019-07-29 12:58:15 -04:00
garak	dfa3e079c0	finish pokenav data decomp	2019-07-19 22:57:33 -04:00
garak	f6d55db535	decompile pokenav_unk_5 data	2019-07-19 21:05:55 -04:00
garak	c400d1dc7f	decompile pokenav_unk_3 data	2019-07-19 18:31:42 -04:00
PikalaxALT	71dff6dbf1	Remove unnecessary tutor learnset casts	2019-07-10 16:38:05 -04:00
garak	4594c955b4	create defines to support encounter index ratios	2019-07-01 23:47:45 -04:00
garak	adb0a44457	add field info to wild pokemon json	2019-06-30 12:05:45 -04:00
DizzyEggg	453be19670	change cooltrainer unused class name	2019-05-25 08:26:40 -05:00
DizzyEggg	a074f36766	USE PROTAG	2019-05-25 08:26:40 -05:00
DizzyEggg	e706280503	Rename PKMN TRAINER CALSS 4	2019-05-25 08:26:40 -05:00
Papa Cancer	e53ba4773d	Documenting bags, berries and graphics ... Bag graphics and berry graphics mostly documented item_menu.c significantly documented Bag structs documented and functions renamed to match formatting	2019-05-22 21:10:16 -05:00
DizzyEggg	ab421f1089	Use array count for trainer parties	2019-05-17 07:33:22 -05:00
DizzyEggg	188f2aa29e	ability random define for battle pyramind	2019-05-16 17:09:43 -05:00
DizzyEggg	4ae1e014bc	Change abilities in base stats to array	2019-05-16 17:09:43 -05:00
DizzyEggg	33979f0fa6	use ability num instead of alt ability	2019-05-16 17:09:43 -05:00
Marcus Huderle	0babaa8c07	Convert wild encounter data to JSON	2019-05-08 17:06:39 -05:00
DizzyEggg	912b87564f	Compact item data, make descriptions easier to read	2019-04-16 11:25:26 -05:00
DizzyEggg	b4e1375bb6	Document pokemon item effects	2019-04-16 11:23:09 -05:00
DizzyEggg	dc764698c9	Use implicilt berry indexes in arrays	2019-04-14 10:15:18 -05:00
Phlosioneer	50350cc2e1	Merge branch 'master' into contest-ai-cleanup	2019-04-07 20:20:22 -04:00
Marcus Huderle	033580da96	Document secret base	2019-04-05 16:24:57 -05:00
DizzyEggg	b0223f691f	Clean up data headers	2019-04-05 07:53:23 -05:00
DizzyEggg	c36476af85	Clean up data2b.c	2019-04-05 07:53:23 -05:00
Fontbane	9e74409bb2	Fix labels, label more scripts	2019-04-04 19:34:35 -05:00
Phlosioneer	845307b3a6	Rename contest AI stuff	2019-04-01 22:16:07 -04: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
Phlosioneer	9848f84b9e	Use constants for Oam .shape and .size fields ... Also some general formatting fixes for constants.	2019-03-16 12:37:04 -05:00
garak	d0115db565	move pokemon graphics to mon-specific directories	2019-03-16 12:21:47 -05:00
garak	14211fb495	fix incbin paths	2019-03-16 12:21:47 -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	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
Marcus Huderle	231355f84d	Decompile easy_chat data	2019-02-26 14:50:02 -06:00
Diegoisawesome	d64a905d65	Document trainer backsprites	2019-02-02 15:56:22 -06:00
garak	261955b6ed	trainer hill easy chat constants	2019-01-21 12:01:49 -05:00
DizzyEggg	f84b22fca4	Dump trainer hill trainers	2019-01-19 12:57:18 +01:00
Philipp AUER	55202eac24	rename coords to size in struct MonCoords	2019-01-04 19:59:55 -06:00
Diegoisawesome	17ac8e29ef	Merge pull request #497 from garakmon/rm_sec ... index gRegionMapEntries by map section constants	2018-12-31 11:51:12 -06:00
garak	ed25326140	fix formatting	2018-12-29 21:52:38 -05:00
garak	1baa17c632	index gRegionMapEntries by map section constants	2018-12-29 21:49:29 -05:00
DizzyEggg	8833004d41	space	2018-12-24 23:29:47 +01:00
DizzyEggg	44e5e82f67	clean up party menu	2018-12-24 23:27:20 +01:00
DizzyEggg	442b1826a2	asm party and fldeff clean-up	2018-12-24 21:59:05 +01:00
Rangi	78bab9ca0c	Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro	2018-12-23 17:24:10 -05:00
ShinyDragonHunter	c120a446ad	Moved macro to the top of base_stats.h	2018-12-21 10:37:35 +00:00
ShinyDragonHunter	c489bb88b7	Updated macro name to be less vague	2018-12-20 13:59:00 +00:00
ShinyDragonHunter	51e5be68de	Use a macro for OLD_UNOWN base stats	2018-12-20 11:28:19 +00:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
Deokishisu	a3543c9a34	Move data out of wild_encounter.c ... wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.	2018-12-19 22:50:54 -05:00
Meowsy	e92245ab06	Add macros to simplify defining front animations and still pics.	2018-12-17 12:29:35 -05:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05: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
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
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
nullableVoidPtr	f9ff7316d5	Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs	2018-12-06 10:38:28 +08:00
DizzyEggg	a9e6154fa9	Finish porting battle frontier data	2018-12-05 22:21:26 +01: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	ba1fc05558	tabs	2018-12-03 18:10:03 +01:00
DizzyEggg	0d122bc831	Fix merge conflicts	2018-12-03 17:56:36 +01:00
DizzyEggg	846b5d79e4	Get rid of headers in src/data	2018-12-03 16:10:41 +01: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
DizzyEggg	a42bfd7a0e	fix brackes n ne file	2018-12-02 19:27:56 +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	7cfe0342f0	Finish frontier data	2018-11-27 22:45:50 +01:00
garak	73cce79753	Merge remote-tracking branch 'upstream/master' into frontier-data	2018-11-27 11:35:19 -05:00
garak	091b5194e7	frontier pike and pyramid data	2018-11-27 11:21:48 -05:00
Slawter666	deb7adbad5	Convert pokédex data to C	2018-11-27 04:00:38 +00: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
Slawter666	1b895ff52c	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-11-12 14:14:50 +00:00
Slawter666	bd766b9049	Minor labelling of field effects	2018-11-03 20:20:28 +00:00
Diegoisawesome	8e7202ec3d	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
Slawter666	3d8874d919	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-10-21 00:20:09 +01:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Slawter666	3aff112127	Begin synchronising with pokeruby	2018-10-16 14:55:16 +01: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
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	2bd86dad2f	Rename Boy4 to RichBoy	2018-10-14 12:26:48 -04:00
DizzyEggg	54fc92bc92	Start porting ruby battle anim file	2018-10-06 23:04:53 +02: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	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	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
Marcus Huderle	ba125b23fd	Remove transparency from event object spritesheets	2018-09-11 17:18:10 -05:00
Tetrable	044ef98309	Document trainer animations, correct unused table labelling	2018-09-09 22:35:07 +01:00
Diegoisawesome	e1834c9d7b	Change overworld_frame macro to use tiles	2018-09-08 03:07:44 -05:00
Diegoisawesome	12521fb1a8	Merge branch 'Slawter666-spritesheet'	2018-09-08 02:37:33 -05:00
Diegoisawesome	f73807ea60	Add palette tags for event objects	2018-09-07 23:52:11 -05:00
Slawter666	291ac2cee9	Add build rules for overworld sprite sheets	2018-09-08 00:28:32 +01: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
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	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
DizzyEggg	5c7ca813e7	Add AI flags to trainers data	2018-09-01 21:25:19 +02:00
Slawter666	e30c2251ce	Convert more of data2b	2018-08-27 00:26:54 +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
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
Diegoisawesome	a07d69d7c2	Finish pokemon_summary_screen	2018-08-14 22:00:35 -07:00
DizzyEggg	0c7063c5ba	Make contest effect table easier to edit in the future	2018-08-14 23:50:58 +02: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	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04: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
Slawter666	dea0bba64e	Merge "pokemon" frames	2018-08-09 00:55:32 +01:00
Slawter666	ab2cc59629	Merge remaining "people" overworld frames	2018-08-07 22:16:03 +01: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
Slawter666	d5825230e5	Merge "brendan" frames into sprite sheets	2018-07-28 18:11:28 +01:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
DizzyEggg	7ea5dd7923	start fldeffect cut	2018-06-16 00:45:48 +02: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