1534 Commits

Author	SHA1	Message	Date
GriffinR	d11cd5d217	Move text input strings to src	2020-02-13 14:48:19 -06:00
GriffinR	956090b05f	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-02-12 13:05:57 -05:00
GriffinR	689acd3613	Move slot machine data to src	2020-02-09 14:11:50 -06:00
GriffinR	faeb974c46	Minor berry fix data clean up	2020-02-08 14:23:41 -06:00
GriffinR	43ec11b92a	Move berry powder data to src	2020-02-08 14:22:53 -06:00
GriffinR	d1035f027e	Move contest_link_80F57C4 data to src	2020-02-08 14:22:53 -06:00
GriffinR	85dc8a528c	Move rotating tile puzzle data to src	2020-02-08 14:22:53 -06:00
DizzyEggg	153d2ac823	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2020-02-08 15:42:14 +01:00
DizzyEggg	834b7b52d3	Merge with master	2020-02-08 09:38:29 +01:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
GriffinR	8a96aa9e97	Name pokenav files	2020-02-04 08:02:28 -06:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
DizzyEggg	26e109d788	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2020-01-18 15:06:43 +01:00
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	46b00b11d4	match all the functions	2020-01-16 08:14:27 -06:00
DizzyEggg	a4a4132d26	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2019-12-23 16:41:44 +01:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
jiangzhengwenjz	5bec27aa34	nonmatch sub_8024604	2019-12-18 03:36:51 +08:00
GriffinR	1b30f0c973	Rename event_obj_lock to event_object_lock	2019-12-06 02:55:30 -05:00
DizzyEggg	b70cde8f1b	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2019-11-22 23:11:17 +01:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
Marcus Huderle	8e65f0188f	Rename contest_painting_effects to image_processing_effects	2019-11-10 16:37:26 -06:00
DizzyEggg	c65900b67a	merge	2019-11-10 14:13:23 +01:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
GriffinR	37bd93ec6c	Rename mystery event msg scripts	2019-11-06 16:38:02 -06:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
DizzyEggg	4bbbbdc50a	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2019-10-19 15:30:14 +02:00
GriffinR	90a05cf824	Finish Mossdeep Gym doc, beging documenting rotating tile puzzle	2019-10-15 05:06:13 -04:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
DizzyEggg	4c462a726e	Merge with master and learnsets	2019-10-06 15:57:33 +02:00
PikalaxALT	27aae9da9a	Fix modern	2019-09-08 21:41:40 -04:00
PikalaxALT	888cbd634c	libagbsyscall as an actual lib	2019-09-08 21:26:46 -04:00
PikalaxALT	306ce048ad	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
PikalaxALT	900a51932d	Don't look for src/crt0.c, it doesn't exist	2019-09-05 20:48:48 -05:00
PikalaxALT	f3bed6045e	Disassemble data/ereader_screen.s	2019-09-05 20:48:48 -05:00
PikalaxALT	b510100503	Port trainer hill sets to C objects	2019-09-05 20:48:48 -05:00
DizzyEggg	e96e98a8de	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-08-25 13:10:32 +02:00
DizzyEggg	58b313956d	Merge with master	2019-08-25 12:51:09 +02:00
PikalaxALT	a4d5624ad6	Move asm srcs to src	2019-08-21 17:08:40 -05:00
DizzyEggg	fabbc9ae31	Merge with master	2019-08-14 11:48:08 +02:00
DizzyEggg	0252270515	Merge with master	2019-08-12 11:25:05 +02:00
PikalaxALT	b05df0377e	Finish pokenav_unk_9	2019-08-05 17:17:05 -04:00
PikalaxALT	e2e667d4b5	Finish pokenav_unk_8	2019-08-05 13:47:04 -04:00
PikalaxALT	51d5ee771d	Merge branch 'master' into pokenav_unk_2	2019-08-05 08:33:45 -04:00
PikalaxALT	1fc64b8582	Merge pull request #767 from DizzyEggg/pokenav_8 ... More pokenav	2019-08-05 08:21:36 -04:00
PikalaxALT	299c3cf1dc	Finish pokenav_unk_2	2019-08-04 20:39:36 -04:00
DizzyEggg	4881e48994	Merge with master	2019-08-04 23:57:53 +02:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
PikalaxALT	cd876292d1	Merge branch 'master' into pokenav_unk_2	2019-08-04 15:35:35 -04:00
DizzyEggg	c8cc39cb57	More pokemav, massive clean-up, seriously who the left the file in this state???	2019-08-04 19:09:12 +02:00
PikalaxALT	fa5bfc1627	Merge pull request #766 from DizzyEggg/pokenav_10 ... Decompile pokenav 10	2019-08-04 11:07:10 -04:00
DizzyEggg	252df94bc1	Decompile pokenav 10	2019-08-04 13:53:00 +02:00
DizzyEggg	1641579297	Merge branch 'master' into pok_jump	2019-08-04 00:02:13 +02:00
PikalaxALT	9f50c4fa80	Merge pull request #760 from ultima-soul/use_pokeblock_data ... Decompile use_pokeblock data	2019-08-03 11:01:05 -04:00
DizzyEggg	9306c142b3	Merge dodrio with master	2019-08-02 00:45:49 +02:00
DizzyEggg	4d2d8779bf	Dodrio berry picking decompiled	2019-08-02 00:41:55 +02:00
ultima-soul	9a152f8fe6	Decompile data/use_pokeblock.s	2019-07-30 17:21:17 -07:00
garak	5b57c001f5	Merge branch 'master' into navdata	2019-07-29 13:06:45 -04:00
DizzyEggg	a4a382a004	Match sub_81D2278 and poke jump clean	2019-07-29 16:22:50 +02:00
DizzyEggg	e634e722cc	Decompile pokemon jump	2019-07-29 12:35:57 +02:00
DizzyEggg	56b124fdec	Some more pokenav	2019-07-25 21:41:02 +02:00
DizzyEggg	fd07c608fc	Decompile pokemon unk 6	2019-07-25 18:56:08 +02:00
DizzyEggg	33c036e7ff	Decompile pokemonav 7	2019-07-24 17:02:52 +02:00
garak	c39d25ff4d	Merge branch 'master' into navdata	2019-07-20 12:30:41 -04:00
PikalaxALT	8d0d5cfd55	Merge branch 'master' into modern_gcc	2019-07-20 11:51:22 -04:00
garak	dfa3e079c0	finish pokenav data decomp	2019-07-19 22:57:33 -04:00
garak	f9a9297d4f	decompile pokenav 7/8 data	2019-07-19 22:06:42 -04:00
garak	f6d55db535	decompile pokenav_unk_5 data	2019-07-19 21:05:55 -04:00
garak	690a0c4390	decompile pokenav_unk_4 rodata	2019-07-19 19:36:17 -04:00
garak	c400d1dc7f	decompile pokenav_unk_3 data	2019-07-19 18:31:42 -04:00
garak	b68ab6106d	pokenav unk 2 data decomp	2019-07-19 17:23:52 -04:00
PikalaxALT	20863ac85b	Resolve compile warnings in modern	2019-07-18 20:46:00 -04:00
DizzyEggg	fc84033e3d	Merge with master	2019-07-12 11:20:24 +02:00
aaaaaa123456789	f4a65dbb1c	Fix LD script to not contain huge gap sections	2019-07-10 05:01:15 -03:00
PikalaxALT	7a02a9ef36	Indentation fix in ld_scripts	2019-06-27 06:55:50 -04:00
PikalaxALT	fb06e4a3c9	Modernize code ... Can compile with arm-none-eabi-gcc 8.3.0 gbafix correctly handles ELF input	2019-06-26 12:12:10 -04:00
DizzyEggg	9e175c9f1b	Merge branch 'master' into battle_engine_v2	2019-06-10 11:21:16 +02:00
DizzyEggg	1c60387968	Merge with master, placeholder back anims	2019-06-03 11:24:10 +02:00
DizzyEggg	f64c1dfabf	Some pokenav work	2019-05-26 07:20:51 -05:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
DizzyEggg	dfb9a1fa16	Add all new cries	2019-05-14 10:58:11 +02:00
DizzyEggg	5682f98605	Merge branch 'master' into pokemon_expansion	2019-05-14 09:12:45 +02:00
PikalaxALT	539d472796	Merge branch 'master' into dodrio_berry_picking	2019-05-11 21:22:09 -04:00
PikalaxALT	9b40cdaeb9	through sub_81C99FC	2019-05-02 14:27:59 -04:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
DizzyEggg	0666da6145	Merge branch 'master' into pokemon_expansion	2019-04-22 14:12:18 +02:00
Marcus Huderle	9915a3fd7f	Decompile pokenav_unk_5.c	2019-04-16 14:29:00 -05:00
Marcus Huderle	f9f5f34b0c	Finish decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
Marcus Huderle	394c0f5546	Start decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
DizzyEggg	17cf13beef	Merge with master	2019-04-16 11:14:50 +02:00
Marcus Huderle	f40f2c5e9c	Decompile all of pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
Marcus Huderle	e3bdb08efa	Start decompiling pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
Marcus Huderle	1268691410	Finish decompiling pokenav_unk_1.c	2019-04-13 16:18:04 -05:00
Phlosioneer	ee2edb068a	Start decomp of pokenav_unk_1 ... Looks like it's the Ribbons menu, based on the first function.	2019-04-13 11:34:53 -05:00
DizzyEggg	c17dbbc47c	Merge branch 'master' into pokemon_expansion	2019-04-08 10:56:37 +02:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
huderlem	a4ea0ac816	Merge pull request #645 from Phlosioneer/pokenav-decomp-again ... Pokenav decomp again	2019-04-07 18:03:32 -05:00
Phlosioneer	0dc73b0b3a	Break up pokenav into subfiles ... The files are separated based on the pokenav resources substruct ID they use.	2019-04-07 14:40:35 -04:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
DizzyEggg	8213222337	Merge with master	2019-04-06 23:20:16 +02:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00
DizzyEggg	c36476af85	Clean up data2b.c	2019-04-05 07:53:23 -05:00
DizzyEggg	dd24597d52	Finish up menu specialised	2019-04-05 07:53:23 -05:00
PikalaxALT	a58d9a16dd	Merge branch 'master' into dodrio_berry_picking	2019-04-05 08:41:31 -04:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
PikalaxALT	53efbe2832	Finish decomp of union_room_chat	2019-04-04 19:26:45 -05:00
Diegoisawesome	8361ada4ba	Merge pull request #656 from ultima-soul/menu_specialized ... Decompile some of menu_specialized	2019-04-04 12:49:17 -05:00
PikalaxALT	d0384ee95e	mevent_server_ish --> mevent_client	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
DizzyEggg	de4722708b	Add Gen4 mon sprites	2019-04-03 17:39:08 +02:00
ultima-soul	02651f6177	Attempt to decompile menu_specialized. 2 NONMATCHING	2019-04-02 19:18:36 -07:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
PikalaxALT	4be97b2dc6	through sub_801A960	2019-04-01 22:08:50 -05:00
PikalaxALT	08f4d3e105	Rename these objects to union_room_battle	2019-04-01 14:41:37 -04:00
PikalaxALT	4ea8217f81	file split	2019-04-01 14:25:58 -04:00
PikalaxALT	1fe5208560	through sub_801A02C	2019-04-01 12:05:58 -04:00
DizzyEggg	944dc4f6bf	Merge with master	2019-04-01 13:40:42 +02:00
Phlosioneer	37c7441a15	Merge branch 'master' into contest-data	2019-03-31 20:22:47 -04:00
PikalaxALT	93c4e35d84	infer additional file split after task00_mystery_gift	2019-03-31 15:43:51 -05:00
PikalaxALT	f34cda3b52	Start decompiling mystery gift	2019-03-31 15:43:51 -05:00
Marcus Huderle	462b196abc	Give battle_anim files appropriate names	2019-03-31 12:15:39 -05:00
Marcus Huderle	500d009b5c	Start decompiling berry_crush.c	2019-03-31 09:13:19 -05:00
DizzyEggg	17e74756cb	Merge with master, add defines to atk49 and statbuffchange commands	2019-03-31 15:19:25 +02: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
Marcus Huderle	a978a6a624	Finish decompiling union_room_chat.c	2019-03-29 21:26:08 -05:00
PikalaxALT	7c45a7c443	port mevent_801BAAC from fire red	2019-03-28 07:32:25 -05:00
scnorton	c6c0c9582f	Port menews_jisan.c from FireRed	2019-03-27 07:40:08 -05:00
Marcus Huderle	af1baa89f1	Start decompiling union_room_chat.c	2019-03-26 21:58:20 -05:00
scnorton	708f128568	Merge branch 'master' into dodrio_berry_picking	2019-03-24 20:08:49 -04:00
Marcus Huderle	e6caf0ff10	Port mevent2.c from pokefirered	2019-03-24 18:29:00 -05:00
Kermalis	285608666b	Match se_w043.mid	2019-03-24 16:37:27 -05:00
Kermalis	7cb1345cba	Match se_w039.mid	2019-03-24 16:37:27 -05:00
Kermalis	f11ca86b46	Match se_w036.mid	2019-03-24 16:37:27 -05:00
Kermalis	85ec6ccf46	Match se_w030.mid	2019-03-24 16:37:27 -05:00
Kermalis	b6128b7e39	Match se_w029.mid	2019-03-24 16:37:27 -05:00
Kermalis	f40d36a564	Match se_w028.mid	2019-03-24 16:37:27 -05:00
Kermalis	08a565dadd	Match se_w026.mid	2019-03-24 16:37:27 -05:00
Kermalis	4f1ba2c1ad	Match se_w025b.mid	2019-03-24 16:37:27 -05:00
Kermalis	b949c7033d	Match se_w025.mid	2019-03-24 16:37:27 -05:00
Kermalis	f46156a98c	Match se_w020.mid	2019-03-24 16:37:27 -05:00
Kermalis	810cff0f21	Match se_w019.mid	2019-03-24 16:37:27 -05:00
Kermalis	3e53b505ee	Match se_w017.mid	2019-03-24 16:37:27 -05:00
Kermalis	0a581cf1c6	Match se_w016b.mid	2019-03-24 16:37:27 -05:00