7270 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GriffinR	f554f09aed	Merge pull request #1582 from LOuroboros/patch-2 ... Update main_menu.c	2021-12-27 16:29:08 -05:00
LOuroboros	599ca58059	Update main_menu.c	2021-12-25 07:04:19 -03:00
GriffinR	84925a892b	Merge pull request #1576 from Kurausukun/aif2pcm16 ... Accept 16-bit AIFF Files and Convert to 8-bit	2021-12-24 02:48:48 -05:00
GriffinR	94c2b7f1c6	Merge pull request #1581 from LOuroboros/patch-2 ... Fixed typo in src/battle_script_commands.c	2021-12-24 00:07:24 -05:00
LOuroboros	03205c995d	Update battle_script_commands.c	2021-12-24 01:59:40 -03:00
GriffinR	f663e310b1	Merge pull request #1580 from LOuroboros/patch-2 ... Removed some commented out addresses	2021-12-21 20:55:41 -05:00
LOuroboros	d94dae18f7	Removed more commented out addresses ... I like to help.	2021-12-21 22:49:30 -03:00
LOuroboros	e28fa7f91c	Update event_scripts.s	2021-12-21 22:10:54 -03:00
ghoulslash	7839750d7e	Merge pull request #1926 from AsparagusEduardo/IE_itemDesc ... Update to item descriptions based on configured effect.	2021-12-21 09:39:11 -05:00
Eduardo Quezada D'Ottone	b21dc1e562	Merge pull request #2003 from LOuroboros/patch-2 ... Fixed a typo in the items' data	2021-12-19 20:37:40 -03:00
LOuroboros	211c8c684d	Update items.h	2021-12-19 20:30:03 -03:00
Kurausukun	39f493287f	one more lel	2021-12-17 23:03:09 -05:00
Kurausukun	f336acb3a9	fix indentation again	2021-12-17 23:00:03 -05:00
Kurausukun	efee1288a0	fix indentation	2021-12-17 22:56:20 -05:00
Kurausukun	0f6311b470	accept 16-bit aiff files and convert to 8-bit	2021-12-17 22:49:45 -05:00
GriffinR	32a9ac6eb1	Merge pull request #1575 from LOuroboros/benriBotan ... [LEAK INFORMED] Documented the unk19 item field	2021-12-17 22:27:45 -05:00
LOuroboros	4a74d288d4	Review corrections	2021-12-18 00:01:50 -03:00
LOuroboros	dbca24aa82	[LEAK INFORMED] Documented the unk19 item field	2021-12-17 19:41:39 -03:00
Eduardo Quezada D'Ottone	8422ad6ccd	Merge pull request #1997 from ultima-soul/ie/enigma_berry_2 ... Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data	2021-12-16 21:07:21 -03:00
ultima-soul	356cf96654	Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.	2021-12-15 19:33:35 -08:00
GriffinR	6e5520207f	Merge pull request #1573 from GriffinRichards/tilesetanim ... Clean up tileset_anims	2021-12-15 09:47:54 -05:00
GriffinR	961dbee5e3	Clean up tileset_anims	2021-12-14 21:41:07 -05:00
GriffinR	df371fdda5	Merge pull request #1572 from LOuroboros/patch-2 ... Update trade.c	2021-12-14 12:54:09 -05:00
LOuroboros	660a3df929	Update trade.c	2021-12-14 14:47:04 -03:00
ultima-soul	00b536f9ca	Merge branch 'pret/enigma_berry_2' into ie/enigma_berry_2	2021-12-11 18:54:18 -08:00
ultima-soul	f4af5ea206	Merge conflict resolution trick.	2021-12-11 18:52:39 -08:00
ultima-soul	26f29a04fd	Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" ... This reverts commit ac2bcece75, reversing changes made to 349262ebc3.	2021-12-10 09:41:54 -08:00
Eduardo Quezada D'Ottone	3c9074a867	Merge pull request #1931 from ultima-soul/item_expansion_sync ... Item Expansion Upstream Sync	2021-12-09 20:02:56 -03:00
ultima-soul	ac2bcece75	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync	2021-12-09 14:16:05 -08:00
GriffinR	d8e405c4f6	Merge pull request #1571 from GriffinRichards/fix-evergrandeflowers ... Fix incorrect ever grande flower animation palettes	2021-12-08 18:02:41 -05:00
GriffinR	cc05b08227	Fix incorrect ever grande flower animation palettes	2021-12-06 11:17:42 -05:00
ultima-soul	349262ebc3	Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync	2021-12-03 17:31:02 -08:00
GriffinR	888bb4ae9e	Merge pull request #1570 from GriffinRichards/fix-flag ... Fix incorrect flag animation palettes	2021-12-03 18:44:24 -05:00
GriffinR	8cbb207795	Merge pull request #1568 from GriffinRichards/fix-roamerstatus ... Add BUGFIX for roamer's status	2021-12-03 16:58:53 -05:00
GriffinR	d501636730	Fix incorrect flag animation palettes	2021-12-03 16:36:18 -05:00
Eduardo Quezada D'Ottone	37d784af31	Merge pull request #1964 from LOuroboros/enigma ... Renamed the Enigma Berries' constants	2021-12-02 21:48:37 -03:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
GriffinR	1a08d8fcb4	Add BUGFIX for roamer's status	2021-11-29 12:56:03 -05:00
GriffinR	83be1bfc8f	Remove sFiller from malloc.c	2021-11-29 11:19:30 -05:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40:08 -08:00
GriffinR	4c64863bc5	Merge pull request #1567 from LOuroboros/sBattleTerrainTable ... Renamed gBattleTerrainTable	2021-11-27 23:43:22 -05:00
GriffinR	01859a63ff	Merge pull request #1566 from cbt6/move-speed ... Rename speed parameter to distance in jump functions	2021-11-27 23:37:50 -05:00
LOuroboros	b042eb6436	gBattleTerrainTable -> sBattleTerrainTable	2021-11-28 01:22:27 -03:00
cbt6	c59c7b0518	Use enums for jump distances	2021-11-28 12:01:29 +08:00
cbt6	b6430098d4	Rename speed parameter to distance in jump functions	2021-11-28 12:01:29 +08:00
GriffinR	e677a00676	Merge pull request #1560 from GriffinRichards/retire-ok ... Retire OK bot	2021-11-27 21:27:14 -05:00
GriffinR	e0fae879da	Merge pull request #1558 from GriffinRichards/update-macros ... Update event macro comments	2021-11-22 19:10:49 -05:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
GriffinR	f81565163e	Retire OK bot	2021-11-21 11:48:50 -05:00