5056 Commits

Author	SHA1	Message	Date
LOuroboros	f82c946ff3	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:26:27 -03:00
LOuroboros	af2f70e000	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:21:40 -03:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	328b925a08	Move trainer hill map data to bin files	2022-03-31 14:08:31 -04:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
GriffinR	66cbe29c14	Add bugfix for Battle Factory trainer IVs	2022-03-30 09:37:03 -04:00
LOuroboros	434f6cf5ad	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-03-26 08:43:55 -03:00
ExpoSeed	5fd468f507	Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns	2022-03-22 13:10:24 -05:00
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
ghoulslash	0036a4dc36	pc acccess	2022-03-18 13:30:08 -04:00
GriffinR	5160520639	Merge pull request #1642 from GriffinRichards/bstrings ... Add usage of battle strings table offset constant	2022-03-14 16:40:54 -04:00
Eduardo Quezada D'Ottone	ff9556cb44	Update include/constants/pokedex.h	2022-03-13 11:25:44 -03:00
Eduardo Quezada D'Ottone	8f34249ab2	Update include/constants/pokedex.h	2022-03-13 11:25:37 -03:00
GriffinR	d664135572	Add usage of battle strings table offset constant	2022-03-10 10:44:04 -05:00
ultima-soul	2d3ba500c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
ultima-soul	84a7f960c8	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2022-02-28 23:37:41 -08:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
GriffinR	a2ee0c8393	Merge pull request #1639 from GriffinRichards/typo-hoppy ... Fix bunny hoppy typo	2022-02-28 22:34:24 -05:00
GriffinR	5d58cdd297	Fix bunny hoppy typo	2022-02-28 13:34:39 -05:00
Eduardo Quezada D'Ottone	054f667446	Config for Kadabra ignoring Everstone upon evolving	2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone	ed1ea69759	Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone	2022-02-26 21:40:20 -03:00
Eduardo Quezada D'Ottone	755b31bee0	Enable form change for the Forces of Nature	2022-02-26 12:19:38 -03:00
ghoulslash	7c2bbf1df3	fix struggle bug anim	2022-02-25 08:54:35 -05:00
sphericalice	40efac0ddf	Rename GetBattlePyramindTrainerEncounterMusicId to fix typo	2022-02-22 19:13:17 +00:00
BuffelSaft	6a119c5a30	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone	dde65d5cea	Config for Sheer Cold being less accurate when not used by Ice type Pokémon	2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone	c849197a88	Config for Minimize raising 2 stages	2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone	d73e6faab8	Config for Growth being affected by sunlight	2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone	748ce99de3	Config for Ingrain grounding the user	2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone	76e0b38960	Config for Pokémon with Oblivious being affected by Taunt	2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone	389a38b3cd	Config for Facade being affected by burns	2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone	0dd2de988a	Merge branch 'battle_engine' into primalReversionTweaks	2022-02-12 23:08:12 -03:00
LOuroboros	92d8268603	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-02-12 00:18:24 -03:00
LOuroboros	b52233ec31	Updated Conversion's effect	2022-02-11 21:42:39 -03:00
GriffinR	7d2344c07b	Merge pull request #1616 from GriffinRichards/missing-req ... Add missing :req, remove old macros	2022-02-02 22:09:36 -05:00
BuffelSaft	9d1800f53e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-01-27 17:18:51 +13:00
LOuroboros	88b7326325	Ported the IE's flingPower item field and ItemId_GetFlingPower	2022-01-26 21:48:01 -03:00
LOuroboros	21244d6393	Modified and moved IsPinchBerryItemEffect	2022-01-26 21:45:24 -03:00
GriffinR	2efbd5f549	Merge pull request #1608 from GriffinRichards/fix-fieldmap ... Fix some incorrect fieldmap names	2022-01-26 17:51:56 -05:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
ghoulslash	bc94a2bb16	Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies ... Wild mon natural enemies in double wild battles	2022-01-23 18:43:12 -05:00
LOuroboros	8eaf0718ec	Review changes ... Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.	2022-01-23 19:13:04 -03:00
LOuroboros	a8a8c7e2fa	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone	e880e4afdd	Merge branch 'battle_engine' into be_recalc_turn_order_after_actions	2022-01-22 19:01:45 -03:00
LOuroboros	367ba2d5bf	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE	2022-01-22 05:39:48 -03:00
GriffinR	3d0326106e	Z coord / height -> elevation	2022-01-21 12:48:19 -05:00
GriffinR	79dfac92c9	Merge pull request #1604 from GriffinRichards/clean-spinda ... Document Spinda spot algorithm	2022-01-21 09:55:43 -05:00
GriffinR	fb81d9ad4a	Correct map data comment	2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone	7d75e16312	Small documentation and cleanup	2022-01-20 12:25:48 -03:00
GriffinR	062cdbe01c	Merge pull request #1599 from GriffinRichards/fix-tilemaps ... Break up graphics/interface and graphics/misc	2022-01-20 08:53:44 -05:00