2867 Commits

Author	SHA1	Message	Date
ExpoSeed	f50a406b18	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2022-03-22 12:56:23 -05:00
LOuroboros	387bf07e3c	Update battle_scripts_1.s	2022-03-20 19:00:21 -03:00
LOuroboros	aca51e843e	Update battle_scripts_1.s	2022-03-14 16:14:32 -03:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone	ed464a9e8d	Merge pull request #2068 from ghoulslash/be/strugglebug ... Fix struggle bug anim	2022-02-25 12:50:55 -03:00
ghoulslash	7c2bbf1df3	fix struggle bug anim	2022-02-25 08:54:35 -05:00
ghoulslash	e4ef3cc3b4	move glare effectiveness exception to code	2022-02-24 22:06:18 -05:00
cbt6	f826a5a82d	Use constants for PC locations	2022-02-23 15:07:22 +08:00
GriffinR	0710a5467b	Add some missing RGB constant usage	2022-02-15 21:55:51 -05:00
ghoulslash	209279c207	fix psycho shift string printing	2022-02-09 14:30:30 -05:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup ... Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	69759b2d12	Merge pull request #1601 from GriffinRichards/fix-decor-flag ... Fix FLAG_DECORATION_0 name	2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone	6aabe58649	Merge branch 'battle_engine' into magician	2022-01-15 13:06:13 -03:00
GriffinR	fd7457b05a	Remove berry fix	2022-01-13 15:26:20 -05:00
GriffinR	f899a02ac6	Use MON_GIVEN_TO_ constants for givemon	2022-01-12 18:34:26 -05:00
LOuroboros	69f678b3fc	Put the new B_WAIT_TIME_SHORTEST to use	2022-01-11 20:21:12 -03:00
LOuroboros	b2965e5522	Added a pause to BattleScript_ProteanActivates	2022-01-11 20:15:47 -03:00
GriffinR	49418f8c01	Add missing commas	2022-01-11 09:55:11 -05:00
GriffinR	3a6c633905	Add seteventmon	2022-01-11 02:16:25 -05:00
GriffinR	110fbc559c	Make item optional for givemon and setwildbattle	2022-01-11 02:08:14 -05:00
GriffinR	8b920691e6	Fix FLAG_DECORATION_0 name	2022-01-09 01:31:42 -05:00
Eduardo Quezada D'Ottone	97baedbd5e	Merge pull request #1923 from WiserVisor/battle_engine ... Added Sky Drop to Battle Engine	2022-01-07 18:14:40 -03:00
GriffinR	ce55e58ad8	Misc cleanup	2022-01-04 10:09:42 -05:00
GriffinR	23f5c9fd5c	Clean up pokedex_area_screen	2021-12-31 00:16:56 -05:00
Eduardo Quezada D'Ottone	5b54986e6b	Merge pull request #1980 from LOuroboros/multiBattles ... Multi battle updates	2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone	4d6f54e8d6	Merge pull request #2007 from ghoulslash/be/roleplay ... Update Role Play	2021-12-25 11:37:57 -03:00
ghoulslash	93a7e139ec	merge w be	2021-12-24 09:40:12 -05:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
ghoulslash	b6b5d862f4	update role play mechanics	2021-12-23 08:37:11 -05:00
LOuroboros	e28fa7f91c	Update event_scripts.s	2021-12-21 22:10:54 -03:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
ghoulslash	31bbc4ddde	prevent stat-raising damage effects if battle will end	2021-12-17 10:24:07 -05:00
ExpoSeed	65186b8c3a	Fix some style issues	2021-12-16 21:57:30 -06:00
ExpoSeed	d6747527da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-12-16 21:44:01 -06:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
GriffinR	cc05b08227	Fix incorrect ever grande flower animation palettes	2021-12-06 11:17:42 -05:00
ghoulslash	1e644c9d4c	fix spacing	2021-12-05 14:45:48 -05:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
GriffinR	d501636730	Fix incorrect flag animation palettes	2021-12-03 16:36:18 -05:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
ultima-soul	0312c5be8b	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-27 21:38:26 -08: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	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
GriffinR	23dd1dad7f	Fix incorrect palettes in Mauville flower tileset anims	2021-11-21 11:23:03 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
GriffinR	42a83ee50e	Use STR_VAR names for apprentice_buff and frontier_gettrainername	2021-11-18 23:20:05 -05:00
GriffinR	e66ea0cb99	Reformat compare + goto_if/call_if to single statements	2021-11-18 23:06:51 -05:00
GriffinR	6c6487dd7a	Missing spaces to tabs in scripts files	2021-11-18 21:02:22 -05:00